From 362a4f084345b496ab6b155db3ec50cad3939d0e Mon Sep 17 00:00:00 2001
From: Szymon Olewniczak <szymon.olewniczak@rid.pl>
Date: Tue, 10 Dec 2013 09:19:46 +0100
Subject: add TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY basing
 on Starter template

---
 inc/template.php                | 19 +++++++++++++++++++
 lib/tpl/dokuwiki/tpl_header.php | 19 ++++++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 60e178d1a..fb468d041 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1786,5 +1786,24 @@ function tpl_classes() {
     return join(' ', $classes);
 }
 
+/**
+ * Create event for tools menues
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+function tpl_toolsevent($toolsname, $items, $view='main') {
+    $data = array(
+        'view'  => $view,
+        'items' => $items
+    );
+
+    $hook = 'TEMPLATE_'.strtoupper($toolsname).'_DISPLAY';
+    $evt = new Doku_Event($hook, $data);
+    if($evt->advise_before()){
+        foreach($evt->data['items'] as $k => $html) echo $html;
+    }
+    $evt->advise_after();
+}
+
 //Setup VIM: ex: et ts=4 :
 
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index a2bfd4346..547dd1401 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -46,10 +46,13 @@ if (!defined('DOKU_INC')) die();
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '</li>';
                         }
-                        tpl_action('admin', 1, 'li');
-                        tpl_action('profile', 1, 'li');
-                        tpl_action('register', 1, 'li');
-                        tpl_action('login', 1, 'li');
+
+						tpl_toolsevent('usertools', array(
+							'admin'     => tpl_action('admin', 1, 'li', 1),
+							'profile'   => tpl_action('profile', 1, 'li', 1),
+							'register'  => tpl_action('register', 1, 'li', 1),
+							'login'     => tpl_action('login', 1, 'li', 1),
+						));
                     ?>
                 </ul>
             </div>
@@ -64,9 +67,11 @@ if (!defined('DOKU_INC')) die();
             </div>
             <ul>
                 <?php
-                    tpl_action('recent', 1, 'li');
-                    tpl_action('media', 1, 'li');
-                    tpl_action('index', 1, 'li');
+					tpl_toolsevent('sitetools', array(
+						'recent'    => tpl_action('recent', 1, 'li', 1),
+						'media'     => tpl_action('media', 1, 'li', 1),
+						'index'     => tpl_action('index', 1, 'li', 1),
+					));
                 ?>
             </ul>
         </div>
-- 
cgit v1.2.3


From 1858e4d7685782550789fd8c228e55ae319bc37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Mon, 30 Jun 2014 09:13:10 +0200
Subject: Check for basedir and baseurl

If these configuration values are not set php will throw an unnecessary
NOTICE.
---
 inc/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/init.php b/inc/init.php
index a937b934d..7340f4191 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -411,7 +411,7 @@ function getBaseURL($abs=null){
     //if canonical url enabled always return absolute
     if(is_null($abs)) $abs = $conf['canonical'];
 
-    if($conf['basedir']){
+    if(!empty($conf['basedir'])){
         $dir = $conf['basedir'];
     }elseif(substr($_SERVER['SCRIPT_NAME'],-4) == '.php'){
         $dir = dirname($_SERVER['SCRIPT_NAME']);
@@ -438,7 +438,7 @@ function getBaseURL($abs=null){
     if(!$abs) return $dir;
 
     //use config option if available, trim any slash from end of baseurl to avoid multiple consecutive slashes in the path
-    if($conf['baseurl']) return rtrim($conf['baseurl'],'/').$dir;
+    if(!empty($conf['baseurl'])) return rtrim($conf['baseurl'],'/').$dir;
 
     //split hostheader into host and port
     if(isset($_SERVER['HTTP_HOST'])){
-- 
cgit v1.2.3


From 04585e6c37e0352a5bc568fc8c938aeafa1c160e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Fri, 29 Aug 2014 11:53:19 +0200
Subject: rfc2231 compatible encoding for header()

This is only used in the filename header field and ensures correct
interpretation of an encoded filename. This is will be needed
especially for download of files with umlauts with an Internet Explorer.
---
 inc/fetch.functions.php | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index c61c54503..55b31a454 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -71,9 +71,9 @@ function sendFile($file, $mime, $dl, $cache, $public = false, $orig = null) {
 
     //download or display?
     if($dl) {
-        header('Content-Disposition: attachment; filename="'.utf8_basename($orig).'";');
+        header('Content-Disposition: attachment;'.rfc2231_encode('filename', utf8_basename($orig)).';');
     } else {
-        header('Content-Disposition: inline; filename="'.utf8_basename($orig).'";');
+        header('Content-Disposition: inline;'.rfc2231_encode('filename', utf8_basename($orig)).';');
     }
 
     //use x-sendfile header to pass the delivery to compatible webservers
@@ -89,6 +89,31 @@ function sendFile($file, $mime, $dl, $cache, $public = false, $orig = null) {
     }
 }
 
+/**
+ * Try an rfc2231 compatible encoding. This ensures correct
+ * interpretation of filenames outside of the ASCII set.
+ * This seems to be needed for file names with e.g. umlauts that
+ * would otherwise decode wrongly in IE.
+ *
+ * There is no additional checking, just the encoding and setting the key=value for usage in headers
+ *
+ * @author Gerry Weissbach <gerry.w@gammaproduction.de>
+ * @param string $name      name of the field to be set in the header() call
+ * @param string $value     value of the field to be set in the header() call
+ * @param string $charset   used charset for the encoding of value
+ * @param string $lang      language used.
+ * @return string           in the format " name=value" for values WITHOUT special characters
+ * @return string           in the format " name*=charset'lang'value" for values WITH special characters
+ */
+function rfc2231_encode($name, $value, $charset='utf-8', $lang='en') {
+    $internal = preg_replace_callback('/[\x00-\x20*\'%()<>@,;:\\\\"\/[\]?=\x80-\xFF]/', function($match) { return rawurlencode($match[0]); }, $value);
+    if ( $value != $internal ) {
+        return ' '.$name.'*='.$charset."'".$lang."'".$internal;
+    } else {
+        return ' '.$name.'="'.$value.'"';
+    }
+}
+
 /**
  * Check for media for preconditions and return correct status code
  *
-- 
cgit v1.2.3


From de4634ec87b1a277c1686990d993dafc43db05ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Fri, 12 Sep 2014 08:41:57 +0200
Subject: Additionally allow more media types

They are generated from the default ones and any additional one given
by the template. This allows to e.g. split admin styles from end user
styles in a closed wiki. You can then deliver only the user styles
using the metaheaders plugin.
---
 lib/exe/css.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 6c1d60751..902996062 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -32,24 +32,25 @@ function css_out(){
     global $config_cascade;
     global $INPUT;
 
+    // decide from where to get the template
+    $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
+    if(!$tpl) $tpl = $conf['template'];
+
+    // load styl.ini
+    $styleini = css_styleini($tpl);
+    
+    // find mediatypes
     if ($INPUT->str('s') == 'feed') {
         $mediatypes = array('feed');
         $type = 'feed';
     } else {
-        $mediatypes = array('screen', 'all', 'print');
+        $mediatypes = array_unique(array_merge(array('screen', 'all', 'print'), array_keys($styleini['stylesheets'])));
         $type = '';
     }
 
-    // decide from where to get the template
-    $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
-    if(!$tpl) $tpl = $conf['template'];
-
     // The generated script depends on some dynamic options
     $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl.$type,'.css');
 
-    // load styl.ini
-    $styleini = css_styleini($tpl);
-
     // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
     if (isset($config_cascade['userstyle']['default'])) {
         $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
-- 
cgit v1.2.3


From ece4159b488ee81a13b9122239c88d82ec1aa59c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 27 Sep 2014 14:08:37 +0200
Subject: Send CRLF to Windows UAs for code blocks #863

---
 inc/parser/code.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/parser/code.php b/inc/parser/code.php
index 00b956c27..2353e0dfa 100644
--- a/inc/parser/code.php
+++ b/inc/parser/code.php
@@ -21,6 +21,11 @@ class Doku_Renderer_code extends Doku_Renderer {
         $filename = utf8_basename($filename);
         $filename = utf8_stripspecials($filename, '_');
 
+        // send CRLF to Windows clients
+        if(strpos($INPUT->server->str('HTTP_USER_AGENT'), 'Windows') !== false) {
+            $text = str_replace("\n", "\r\n", $text);
+        }
+
         if($this->_codeblock == $INPUT->str('codeblock')) {
             header("Content-Type: text/plain; charset=utf-8");
             header("Content-Disposition: attachment; filename=$filename");
-- 
cgit v1.2.3


From e0c26282a603881e8d2f839d94c28dbbfc57d71b Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 29 Sep 2014 03:34:17 +0200
Subject: scrutinizer documentations issues

---
 feed.php                                    |   6 +-
 inc/HTTPClient.php                          |   8 ++-
 inc/Sitemapper.php                          |   2 +-
 inc/actions.php                             |   2 +-
 inc/cache.php                               |   4 +-
 inc/common.php                              |   2 +-
 inc/html.php                                |   5 +-
 inc/media.php                               | 108 +++++++++++++++++++++++++---
 inc/pageutils.php                           |   2 +-
 inc/parser/metadata.php                     |   2 +-
 inc/parser/xhtml.php                        |   2 +-
 inc/plugincontroller.class.php              |   2 +-
 inc/subscription.php                        |   2 +-
 inc/template.php                            |  39 +++++++---
 lib/exe/indexer.php                         |   5 +-
 lib/plugins/authldap/auth.php               |  16 ++---
 lib/plugins/authmysql/auth.php              |   5 +-
 lib/plugins/authpgsql/auth.php              |   2 +-
 lib/plugins/info/syntax.php                 |   2 +-
 lib/tpl/dokuwiki/detail.php                 |   4 +-
 lib/tpl/dokuwiki/images/pagetools-build.php |   2 +-
 lib/tpl/dokuwiki/main.php                   |  14 ++--
 lib/tpl/dokuwiki/tpl_header.php             |  14 ++--
 23 files changed, 181 insertions(+), 69 deletions(-)

diff --git a/feed.php b/feed.php
index a63e22164..aa00063a1 100644
--- a/feed.php
+++ b/feed.php
@@ -306,7 +306,7 @@ function rss_buildItems(&$rss, &$data, $opt) {
                         $src_r = '';
                         $src_l = '';
 
-                        if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)), 300)) {
+                        if($size = media_image_preview_size($id, '', new JpegMeta(mediaFN($id)), 300)) {
                             $more  = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id));
                             $src_r = ml($id, $more, true, '&amp;', true);
                         }
@@ -355,7 +355,7 @@ function rss_buildItems(&$rss, &$data, $opt) {
                     break;
                 case 'html':
                     if($ditem['media']) {
-                        if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) {
+                        if($size = media_image_preview_size($id, '', new JpegMeta(mediaFN($id)))) {
                             $more    = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id));
                             $src     = ml($id, $more, true, '&amp;', true);
                             $content = '<img src="'.$src.'" alt="'.$id.'" />';
@@ -386,7 +386,7 @@ function rss_buildItems(&$rss, &$data, $opt) {
                 case 'abstract':
                 default:
                     if($ditem['media']) {
-                        if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) {
+                        if($size = media_image_preview_size($id, '', new JpegMeta(mediaFN($id)))) {
                             $more    = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id));
                             $src     = ml($id, $more, true, '&amp;', true);
                             $content = '<img src="'.$src.'" alt="'.$id.'" />';
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index cd4c7c4c5..ea20e3e56 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -57,6 +57,12 @@ class DokuHTTPClient extends HTTPClient {
      * @triggers HTTPCLIENT_REQUEST_SEND
      * @author   Andreas Gohr <andi@splitbrain.org>
      */
+    /**
+     * @param string $url
+     * @param string|array $data the post data either as array or raw data
+     * @param string $method
+     * @return bool
+     */
     function sendRequest($url,$data='',$method='GET'){
         $httpdata = array('url'    => $url,
                           'data'   => $data,
@@ -104,7 +110,7 @@ class HTTPClient {
     var $header_regexp; // if set this RE must match against the headers, else abort
     var $headers;
     var $debug;
-    var $start = 0; // for timings
+    var $start = 0.0; // for timings
     var $keep_alive = true; // keep alive rocks
 
     // don't set these, read on error
diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php
index 6332746a6..33f6d7a36 100644
--- a/inc/Sitemapper.php
+++ b/inc/Sitemapper.php
@@ -53,7 +53,7 @@ class Sitemapper {
         foreach($pages as $id){
             //skip hidden, non existing and restricted files
             if(isHiddenPage($id)) continue;
-            if(auth_aclcheck($id,'','') < AUTH_READ) continue;
+            if(auth_aclcheck($id,'',array()) < AUTH_READ) continue;
             $item = SitemapItem::createFromID($id);
             if ($item !== null)
                 $items[] = $item;
diff --git a/inc/actions.php b/inc/actions.php
index ef09a0dc7..2b819a0d6 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -394,7 +394,7 @@ function act_save($act){
         return 'conflict';
 
     //save it
-    saveWikiText($ID,con($PRE,$TEXT,$SUF,1),$SUM,$INPUT->bool('minor')); //use pretty mode for con
+    saveWikiText($ID,con($PRE,$TEXT,$SUF,true),$SUM,$INPUT->bool('minor')); //use pretty mode for con
     //unlock it
     unlock($ID);
 
diff --git a/inc/cache.php b/inc/cache.php
index 6817e771b..191d54e45 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -316,7 +316,7 @@ class cache_instructions extends cache_parser {
      * retrieve the cached data
      *
      * @param   bool   $clean   true to clean line endings, false to leave line endings alone
-     * @return  string          cache contents
+     * @return  array          cache contents
      */
     public function retrieveCache($clean=true) {
         $contents = io_readFile($this->cache, false);
@@ -326,7 +326,7 @@ class cache_instructions extends cache_parser {
     /**
      * cache $instructions
      *
-     * @param   string $instructions  the instruction to be cached
+     * @param   array $instructions  the instruction to be cached
      * @return  bool                  true on success, false otherwise
      */
     public function storeCache($instructions) {
diff --git a/inc/common.php b/inc/common.php
index e56285f62..95ea4e72d 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -968,7 +968,7 @@ function rawLocale($id, $ext = 'txt') {
  * @author Andreas Gohr <andi@splitbrain.org>
  *
  * @param string $id   page id
- * @param string $rev  timestamp when a revision of wikitext is desired
+ * @param string|int $rev  timestamp when a revision of wikitext is desired
  * @return string
  */
 function rawWiki($id, $rev = '') {
diff --git a/inc/html.php b/inc/html.php
index bda6fb398..dd4a3d8da 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -422,6 +422,9 @@ function html_locked(){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param int $first skip the first n changelog lines
+ * @param bool|string $media_id id of media, or false for current page
  */
 function html_revisions($first=0, $media_id = false){
     global $ID;
@@ -926,7 +929,7 @@ function html_li_default($item){
  * @param array    $data  array with item arrays
  * @param string   $class class of ul wrapper
  * @param callable $func  callback to print an list item
- * @param string   $lifunc callback to the opening li tag
+ * @param callable $lifunc callback to the opening li tag
  * @param bool     $forcewrapper Trigger building a wrapper ul if the first level is
                                  0 (we have a root object) or 1 (just the root content)
  * @return string html of an unordered list
diff --git a/inc/media.php b/inc/media.php
index 9022858e1..2b802a0ae 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -41,6 +41,11 @@ function media_filesinuse($data,$id){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $id media id
+ * @param int $auth permission level
+ * @param array $data
+ * @return bool
  */
 function media_metasave($id,$auth,$data){
     if($auth < AUTH_UPLOAD) return false;
@@ -113,6 +118,10 @@ function media_ispublic($id){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $id media id
+ * @param int $auth permission level
+ * @return bool
  */
 function media_metaform($id,$auth){
     global $lang;
@@ -175,6 +184,9 @@ function media_metaform($id,$auth){
  * Convenience function to check if a media file is still in use
  *
  * @author Michael Klier <chi@chimeric.de>
+ *
+ * @param string $id media id
+ * @return array|bool
  */
 function media_inuse($id) {
     global $conf;
@@ -367,9 +379,18 @@ function copy_uploaded_file($from, $to){
  * $data[2]     id: the future directory id of the uploaded file
  * $data[3]     imime: the mimetype of the uploaded file
  * $data[4]     overwrite: if an existing file is going to be overwritten
+ * $data[5]     move:
  *
  * @triggers MEDIA_UPLOAD_FINISH
  */
+/**
+ * @param array $file
+ * @param string $id
+ * @param bool $ow
+ * @param int $auth permission level
+ * @param string $move function name
+ * @return array|mixed
+ */
 function media_save($file, $id, $ow, $auth, $move) {
     if($auth < AUTH_UPLOAD) {
         return array("You don't have permissions to upload files.", -1);
@@ -817,8 +838,13 @@ function media_tab_search($ns,$auth=null) {
  * Prints tab that displays mediafile details
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string     $image media id
+ * @param string     $ns
+ * @param null|int   $auth permission level
+ * @param string|int $rev
  */
-function media_tab_view($image, $ns, $auth=null, $rev=false) {
+function media_tab_view($image, $ns, $auth=null, $rev='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
@@ -837,6 +863,10 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
  * Prints tab that displays form for editing mediafile metadata
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string     $image media id
+ * @param string     $ns
+ * @param null|int   $auth permission level
  */
 function media_tab_edit($image, $ns, $auth=null) {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
@@ -851,6 +881,10 @@ function media_tab_edit($image, $ns, $auth=null) {
  * Prints tab that displays mediafile revisions
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string     $image media id
+ * @param string     $ns
+ * @param null|int   $auth permission level
  */
 function media_tab_history($image, $ns, $auth=null) {
     global $lang;
@@ -875,7 +909,7 @@ function media_tab_history($image, $ns, $auth=null) {
  * Prints mediafile details
  *
  * @param string        $image media id
- * @param               $auth
+ * @param int           $auth permission level
  * @param int|bool      $rev
  * @param JpegMeta|bool $meta
  * @author Kate Arzamastseva <pshns@ukr.net>
@@ -912,8 +946,12 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
  * Prints mediafile action buttons
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string     $image media id
+ * @param int        $auth permission level
+ * @param string|int $rev revision timestamp, or empty string
  */
-function media_preview_buttons($image, $auth, $rev=false) {
+function media_preview_buttons($image, $auth, $rev='') {
     global $lang, $conf;
 
     echo '<ul class="actions">'.NL;
@@ -962,7 +1000,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  * @param string   $image
- * @param int      $rev
+ * @param int|string $rev
  * @param JpegMeta $meta
  * @param int      $size
  * @return array
@@ -986,9 +1024,10 @@ function media_image_preview_size($image, $rev, $meta, $size = 500) {
  * Returns the requested EXIF/IPTC tag from the image meta
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- * @param array $tags
+ *
+ * @param array    $tags
  * @param JpegMeta $meta
- * @param string $alt
+ * @param string   $alt
  * @return string
  */
 function media_getTag($tags,$meta,$alt=''){
@@ -1002,6 +1041,7 @@ function media_getTag($tags,$meta,$alt=''){
  * Returns mediafile tags
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
  * @param JpegMeta $meta
  * @return array
  */
@@ -1033,7 +1073,13 @@ function media_file_tags($meta) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_details($image, $auth, $rev=false, $meta=false) {
+/**
+ * @param string        $image image id
+ * @param int           $auth  permission level
+ * @param string|int    $rev   revision timestamp, or empty string
+ * @param bool|JpegMeta $meta  image object, or create one if false
+ */
+function media_details($image, $auth, $rev='', $meta=false) {
     global $lang;
 
     if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
@@ -1057,6 +1103,13 @@ function media_details($image, $auth, $rev=false, $meta=false) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
+/**
+ * @param string $image  image id
+ * @param string $ns
+ * @param int $auth permission level
+ * @param bool $fromajax
+ * @return void|bool|string
+ */
 function media_diff($image, $ns, $auth, $fromajax = false) {
     global $conf;
     global $INPUT;
@@ -1135,6 +1188,13 @@ function _media_file_diff($data) {
  * Shows difference between two revisions of image
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $image
+ * @param string|int $l_rev revision timestamp, or empty string
+ * @param string|int $r_rev revision timestamp, or empty string
+ * @param string $ns
+ * @param int $auth permission level
+ * @param bool $fromajax
  */
 function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     global $lang;
@@ -1256,8 +1316,8 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  * @param string $image
- * @param int $l_rev
- * @param int $r_rev
+ * @param int $l_rev revision timestamp, or empty string
+ * @param int $r_rev revision timestamp, or empty string
  * @param array $l_size
  * @param array $r_size
  * @param string $type
@@ -1325,6 +1385,12 @@ function media_restore($image, $rev, $auth){
  * @author Andreas Gohr <gohr@cosmocode.de>
  * @author Kate Arzamastseva <pshns@ukr.net>
  * @triggers MEDIA_SEARCH
+ *
+ * @param string $query
+ * @param string $ns
+ * @param null|int $auth
+ * @param bool $fullscreen
+ * @param string $sort
  */
 function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort='natural'){
     global $conf;
@@ -1375,10 +1441,14 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort='natural
 
 /**
  * Formats and prints one file in the list
+ *
+ * @param array $item
+ * @param int $auth permission level
+ * @param string $jump item id
+ * @param bool $display_namespace
  */
 function media_printfile($item,$auth,$jump,$display_namespace=false){
     global $lang;
-    global $conf;
 
     // Prepare zebra coloring
     // I always wanted to use this variable name :-D
@@ -1472,6 +1542,11 @@ function media_printicon($filename, $size=''){
  * Formats and prints one file in the list in the thumbnails view
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param array       $item
+ * @param int         $auth
+ * @param bool|string $jump
+ * @param bool        $display_namespace
  */
 function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false){
 
@@ -1519,6 +1594,9 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
 
 /**
  * Prints a thumbnail and metainfo
+ *
+ * @param array $item
+ * @param bool $fullscreen
  */
 function media_printimgdetail($item, $fullscreen=false){
     // prepare thumbnail
@@ -1621,6 +1699,10 @@ function media_managerURL($params=false, $amp='&amp;', $abs=false, $params_array
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $ns
+ * @param int $auth permission level
+ * @param bool $fullscreen
  */
 function media_uploadform($ns, $auth, $fullscreen = false){
     global $lang;
@@ -1708,6 +1790,10 @@ function media_getuploadsize(){
  *
  * @author Tobias Sarnowski <sarnowski@cosmocode.de>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $ns
+ * @param string $query
+ * @param bool $fullscreen
  */
 function media_searchform($ns,$query='',$fullscreen=false){
     global $lang;
@@ -1735,6 +1821,8 @@ function media_searchform($ns,$query='',$fullscreen=false){
  * Build a tree outline of available media namespaces
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $ns
  */
 function media_nstree($ns){
     global $conf;
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 5f62926e4..adfb10cc7 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -265,7 +265,7 @@ function page_exists($id,$rev='',$clean=true) {
  * The filename is URL encoded to protect Unicode chars
  *
  * @param  $raw_id  string   id of wikipage
- * @param  $rev     string   page revision, empty string for current
+ * @param  $rev     int|string   page revision, empty string for current
  * @param  $clean   bool     flag indicating that $raw_id should be cleaned.  Only set to false
  *                           when $id is guaranteed to have been cleaned already.
  * @return string full path
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 25bf3fe3d..4619c24ce 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -165,7 +165,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
         if(!isset($this->meta['title'])) $this->meta['title'] = $text;
 
         // add the header to the TOC
-        $hid = $this->_headerToLink($text, 'true');
+        $hid = $this->_headerToLink($text, true);
         $this->toc_additem($hid, $text, $level);
 
         // add to summary
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 44ead9d45..cd4b3d6e5 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1571,7 +1571,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * Returns HTML code for images used in link titles
      *
      * @author Andreas Gohr <andi@splitbrain.org>
-     * @param string $img
+     * @param array $img
      * @return string HTML img tag or similar
      */
     function _imageTitle($img) {
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index d80cd4c9e..999f32937 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -66,7 +66,7 @@ class Doku_Plugin_Controller {
      * @param  $name     string name of the plugin to load
      * @param  $new      bool   true to return a new instance of the plugin, false to use an already loaded instance
      * @param  $disabled bool   true to load even disabled plugins
-     * @return DokuWiki_Plugin|DokuWiki_Syntax_Plugin|null  the plugin object or null on failure
+     * @return DokuWiki_Plugin|DokuWiki_Syntax_Plugin|DokuWiki_Auth_Plugin|DokuWiki_Admin_Plugin|DokuWiki_Action_Plugin|DokuWiki_Remote_Plugin|null  the plugin object or null on failure
      */
     public function load($type,$name,$new=false,$disabled=false){
 
diff --git a/inc/subscription.php b/inc/subscription.php
index aab6de926..dbbcbe16a 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -515,7 +515,7 @@ class Subscription {
      * @author Adrian Lang <lang@cosmocode.de>
      *
      * @param string $subscriber_mail The target mail address
-     * @param array  $id              The ID
+     * @param string $id              The ID
      * @param int    $lastupdate      Time of the last notification
      * @return bool
      */
diff --git a/inc/template.php b/inc/template.php
index 7f3c68534..667e3db1c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -204,7 +204,7 @@ function tpl_toc($return = false) {
         $toc = $TOC;
     } elseif(($ACT == 'show' || substr($ACT, 0, 6) == 'export') && !$REV && $INFO['exists']) {
         // get TOC from metadata, render if neccessary
-        $meta = p_get_metadata($ID, false, METADATA_RENDER_USING_CACHE);
+        $meta = p_get_metadata($ID, '', METADATA_RENDER_USING_CACHE);
         if(isset($meta['internal']['toc'])) {
             $tocok = $meta['internal']['toc'];
         } else {
@@ -503,6 +503,10 @@ function tpl_getparent($id) {
  *
  * @author Adrian Lang <mail@adrianlang.de>
  * @see    tpl_get_action
+ *
+ * @param string $type
+ * @param bool $return
+ * @return bool|string html, or false if no data, true if printed
  */
 function tpl_button($type, $return = false) {
     $data = tpl_get_action($type);
@@ -534,6 +538,13 @@ function tpl_button($type, $return = false) {
  *
  * @author Adrian Lang <mail@adrianlang.de>
  * @see    tpl_get_action
+ *
+ * @param string $type
+ * @param string $pre prefix of link
+ * @param string $suf suffix of link
+ * @param string $inner innerHML of link
+ * @param bool $return
+ * @return bool|string html or false if no data, true if printed
  */
 function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = false) {
     global $lang;
@@ -571,7 +582,7 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals
             $linktarget, $pre.(($inner) ? $inner : $caption).$suf,
             'class="action '.$type.'" '.
                 $akey.$rel.
-                'title="'.hsc($caption).$addTitle.'"', 1
+                'title="'.hsc($caption).$addTitle.'"', true
         );
     }
     if($return) return $out;
@@ -599,6 +610,7 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
  * @author Adrian Lang <mail@adrianlang.de>
+ *
  * @param string $type
  * @return array|bool|string
  */
@@ -757,20 +769,20 @@ function tpl_get_action($type) {
  *
  * @author Anika Henke <anika@selfthinker.org>
  * @param
- * @param bool   $link link or form button?
- * @param bool   $wrapper HTML element wrapper
- * @param bool   $return return or print
- * @param string $pre prefix for links
- * @param string $suf suffix for links
- * @param string $inner inner HTML for links
+ * @param bool          $link link or form button?
+ * @param string|bool   $wrapper HTML element wrapper
+ * @param bool          $return return or print
+ * @param string        $pre prefix for links
+ * @param string        $suf suffix for links
+ * @param string        $inner inner HTML for links
  * @return bool|string
  */
 function tpl_action($type, $link = false, $wrapper = false, $return = false, $pre = '', $suf = '', $inner = '') {
     $out = '';
     if($link) {
-        $out .= tpl_actionlink($type, $pre, $suf, $inner, 1);
+        $out .= tpl_actionlink($type, $pre, $suf, $inner, true);
     } else {
-        $out .= tpl_button($type, 1);
+        $out .= tpl_button($type, true);
     }
     if($out && $wrapper) $out = "<$wrapper>$out</$wrapper>";
 
@@ -1029,7 +1041,7 @@ function tpl_pagetitle($id = null, $ret = false) {
  * @author Andreas Gohr <andi@splitbrain.org>
  * @param array  $tags tags to try
  * @param string $alt alternative output if no data was found
- * @param null   $src the image src, uses global $SRC if not given
+ * @param null|string   $src the image src, uses global $SRC if not given
  * @return string
  */
 function tpl_img_getTag($tags, $alt = '', $src = null) {
@@ -1613,6 +1625,11 @@ function tpl_license($img = 'badge', $imgonly = false, $return = false, $wrap =
  *
  * This function is useful to populate sidebars or similar features in a
  * template
+ *
+ * @param string $pageid
+ * @param bool $print
+ * @param bool $propagate
+ * @return bool|null|string
  */
 function tpl_include_page($pageid, $print = true, $propagate = false) {
     if (!$pageid) return false;
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 3ab117736..d0a5e0463 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -51,8 +51,9 @@ exit;
 /**
  * Trims the recent changes cache (or imports the old changelog) as needed.
  *
- * @param media_changes If the media changelog shall be trimmed instead of
- * the page changelog
+ * @param bool $media_changes If the media changelog shall be trimmed instead of
+ *                              the page changelog
+ * @return bool
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
  */
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index b22b82ecc..a94c7a357 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -564,15 +564,13 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
      * Wraps around ldap_search, ldap_list or ldap_read depending on $scope
      *
      * @author Andreas Gohr <andi@splitbrain.org>
-     * @param resource $link_identifier
-     * @param string   $base_dn
-     * @param string   $filter
-     * @param string   $scope can be 'base', 'one' or 'sub'
-     * @param null     $attributes
-     * @param int      $attrsonly
-     * @param int      $sizelimit
-     * @param int      $timelimit
-     * @param int      $deref
+     * @param resource   $link_identifier
+     * @param string     $base_dn
+     * @param string     $filter
+     * @param string     $scope can be 'base', 'one' or 'sub'
+     * @param null|array $attributes
+     * @param int        $attrsonly
+     * @param int        $sizelimit
      * @return resource
      */
     protected function _ldapsearch($link_identifier, $base_dn, $filter, $scope = 'sub', $attributes = null,
diff --git a/lib/plugins/authmysql/auth.php b/lib/plugins/authmysql/auth.php
index 95c62f636..176eac679 100644
--- a/lib/plugins/authmysql/auth.php
+++ b/lib/plugins/authmysql/auth.php
@@ -284,7 +284,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
                 $grpdel = array_diff($groups, $changes['grps']);
 
                 foreach($grpadd as $group) {
-                    if(($this->_addUserToGroup($user, $group, 1)) == false) {
+                    if(($this->_addUserToGroup($user, $group, true)) == false) {
                         $rc = false;
                     }
                 }
@@ -612,7 +612,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
 
             if($uid) {
                 foreach($grps as $group) {
-                    $gid = $this->_addUserToGroup($user, $group, 1);
+                    $gid = $this->_addUserToGroup($user, $group, true);
                     if($gid === false) break;
                 }
 
@@ -777,7 +777,6 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      *
      * @param  string $user    user's nick being updated
      * @param  array $changes  array of items to change as pairs of item and value
-     * @param  mixed $uid      user id of dataset to change, must be unique in DB
      * @return bool true on success or false on error
      *
      * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
diff --git a/lib/plugins/authpgsql/auth.php b/lib/plugins/authpgsql/auth.php
index 99f3ed443..4f5e3346f 100644
--- a/lib/plugins/authpgsql/auth.php
+++ b/lib/plugins/authpgsql/auth.php
@@ -265,7 +265,7 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
 
             if($uid) {
                 foreach($grps as $group) {
-                    $gid = $this->_addUserToGroup($user, $group, 1);
+                    $gid = $this->_addUserToGroup($user, $group, true);
                     if($gid === false) break;
                 }
 
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 9265f44d5..3e3f6b733 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -255,7 +255,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
 
         if (($level >= $conf['toptoclevel']) && ($level <= $conf['maxtoclevel'])){
             /** @var $renderer Doku_Renderer_xhtml */
-            $hid  = $renderer->_headerToLink($text, 'true');
+            $hid  = $renderer->_headerToLink($text, true);
             $renderer->toc[] = array(
                 'hid'   => $hid,
                 'title' => $text,
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 8fe2c88a2..4d0e984b1 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -82,8 +82,8 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                                 $data = array(
                                     'view' => 'detail',
                                     'items' => array(
-                                        'mediaManager' => tpl_action('mediaManager', 1, 'li', 1, '<span>', '</span>'),
-                                        'img_backto' =>   tpl_action('img_backto',   1, 'li', 1, '<span>', '</span>'),
+                                        'mediaManager' => tpl_action('mediaManager', true, 'li', true, '<span>', '</span>'),
+                                        'img_backto' =>   tpl_action('img_backto',   true, 'li', true, '<span>', '</span>'),
                                     )
                                 );
 
diff --git a/lib/tpl/dokuwiki/images/pagetools-build.php b/lib/tpl/dokuwiki/images/pagetools-build.php
index 1b7262ad5..3cf35b2ea 100644
--- a/lib/tpl/dokuwiki/images/pagetools-build.php
+++ b/lib/tpl/dokuwiki/images/pagetools-build.php
@@ -92,7 +92,7 @@ function hex2rgb($hex) {
 /**
  * Scale (darken/lighten) a given image
  *
- * @param ressource $img    The truetype GD image to work on
+ * @param resource $img    The truetype GD image to work on
  * @param float     $scale  Scale the colors by this value ( <1 darkens, >1 lightens)
  */
 function imagecolorscale(&$img, $scale){
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 44fef81eb..10c0bf91e 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -41,7 +41,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <div class="content">
                         <?php tpl_flush() ?>
                         <?php tpl_includeFile('sidebarheader.html') ?>
-                        <?php tpl_include_page($conf['sidebar'], 1, 1) ?>
+                        <?php tpl_include_page($conf['sidebar'], true, true) ?>
                         <?php tpl_includeFile('sidebarfooter.html') ?>
                     </div>
                 </div></div><!-- /aside -->
@@ -77,12 +77,12 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                             $data = array(
                                 'view'  => 'main',
                                 'items' => array(
-                                    'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
-                                    'revert'    => tpl_action('revert',    1, 'li', 1, '<span>', '</span>'),
-                                    'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
-                                    'backlink'  => tpl_action('backlink',  1, 'li', 1, '<span>', '</span>'),
-                                    'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
-                                    'top'       => tpl_action('top',       1, 'li', 1, '<span>', '</span>')
+                                    'edit'      => tpl_action('edit',      true, 'li', true, '<span>', '</span>'),
+                                    'revert'    => tpl_action('revert',    true, 'li', true, '<span>', '</span>'),
+                                    'revisions' => tpl_action('revisions', true, 'li', true, '<span>', '</span>'),
+                                    'backlink'  => tpl_action('backlink',  true, 'li', true, '<span>', '</span>'),
+                                    'subscribe' => tpl_action('subscribe', true, 'li', true, '<span>', '</span>'),
+                                    'top'       => tpl_action('top',       true, 'li', true, '<span>', '</span>')
                                 )
                             );
 
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index a2bfd4346..7d9c88347 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -46,10 +46,10 @@ if (!defined('DOKU_INC')) die();
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '</li>';
                         }
-                        tpl_action('admin', 1, 'li');
-                        tpl_action('profile', 1, 'li');
-                        tpl_action('register', 1, 'li');
-                        tpl_action('login', 1, 'li');
+                        tpl_action('admin', true, 'li');
+                        tpl_action('profile', true, 'li');
+                        tpl_action('register', true, 'li');
+                        tpl_action('login', true, 'li');
                     ?>
                 </ul>
             </div>
@@ -64,9 +64,9 @@ if (!defined('DOKU_INC')) die();
             </div>
             <ul>
                 <?php
-                    tpl_action('recent', 1, 'li');
-                    tpl_action('media', 1, 'li');
-                    tpl_action('index', 1, 'li');
+                    tpl_action('recent', true, 'li');
+                    tpl_action('media', true, 'li');
+                    tpl_action('index', true, 'li');
                 ?>
             </ul>
         </div>
-- 
cgit v1.2.3


From 59bc3b48fdffb76ee65a4b630be3ffa1f6c20c80 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 29 Sep 2014 21:45:27 +0200
Subject: more scrutinizer issue improvements

---
 inc/IXR_Library.php                          |  3 ++-
 inc/JpegMeta.php                             | 10 ++++----
 inc/Mailer.class.php                         | 10 ++++----
 inc/RemoteAPICore.php                        |  1 +
 inc/Tar.class.php                            |  1 +
 inc/ZipLib.class.php                         |  7 ++++--
 inc/actions.php                              |  1 -
 inc/auth.php                                 |  1 +
 inc/common.php                               |  3 +++
 inc/fulltext.php                             |  1 +
 inc/html.php                                 |  1 +
 inc/infoutils.php                            |  3 ++-
 inc/media.php                                | 34 ++++++++++++++++------------
 inc/parser/lexer.php                         | 25 ++++++++++++--------
 inc/parser/metadata.php                      | 14 ++++++------
 inc/parser/xhtml.php                         |  7 ++++--
 inc/plugincontroller.class.php               |  2 +-
 inc/remote.php                               |  2 +-
 inc/search.php                               |  1 +
 inc/subscription.php                         |  2 +-
 inc/template.php                             |  1 -
 lib/exe/indexer.php                          |  2 +-
 lib/plugins/acl/admin.php                    |  6 ++---
 lib/plugins/acl/remote.php                   |  2 ++
 lib/plugins/auth.php                         |  5 +++-
 lib/plugins/authad/adLDAP/adLDAP.php         |  2 --
 lib/plugins/authad/auth.php                  |  1 +
 lib/plugins/authldap/auth.php                |  1 +
 lib/plugins/authmysql/auth.php               |  2 +-
 lib/plugins/config/settings/config.class.php |  4 +++-
 lib/plugins/config/settings/extra.class.php  |  7 +++---
 lib/plugins/info/syntax.php                  | 13 +++++++----
 lib/plugins/usermanager/admin.php            |  6 +++--
 33 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 979dc4d16..2becf4a54 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -15,6 +15,7 @@
 
 
 class IXR_Value {
+    /** @var  IXR_Value[]|IXR_Date|IXR_Base64|int|bool|double|string */
     var $data;
     var $type;
     function IXR_Value ($data, $type = false) {
@@ -177,7 +178,7 @@ class IXR_Message {
         return true;
     }
     function tag_open($parser, $tag, $attr) {
-        $this->currentTag = $tag;
+        $this->_currentTag = $tag;
         $this->_currentTagContents = '';
         switch($tag) {
             case 'methodCall':
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index a35ec3ed0..3b6c6694c 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -42,6 +42,7 @@
 class JpegMeta {
     var $_fileName;
     var $_fp = null;
+    var $_fpout = null;
     var $_type = 'unknown';
 
     var $_markers;
@@ -527,12 +528,12 @@ class JpegMeta {
     /**
      * Get the image's title, tries various fields
      *
-     * @param int $max  maximum number chars (keeps words)
+     * @param int $max maximum number chars (keeps words)
+     * @return bool|mixed|string
+     *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
     function getTitle($max=80){
-        $cap = '';
-
         // try various fields
         $cap = $this->getField(array('Iptc.Headline',
                     'Iptc.Caption',
@@ -560,6 +561,7 @@ class JpegMeta {
         $this->_parseAll();
         if ($this->_markers == null) {
             if (@isset($this->_info['file']['UnixTime'])) {
+                $dates = array();
                 $dates['FileModified'] = $this->_info['file']['UnixTime'];
                 $dates['Time'] = $this->_info['file']['UnixTime'];
                 $dates['TimeSource'] = 'FileModified';
@@ -1334,7 +1336,6 @@ class JpegMeta {
             return false;
         }
 
-        $pos = 0;
         $this->_info['jfif'] = array();
 
         $vmaj = $this->_getByte($data, 5);
@@ -1420,7 +1421,6 @@ class JpegMeta {
                 break;
             default:
                 return false;
-                break;
         }
 
         $this->_info['sof']['Format']          = $format;
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index e90b45f99..fb9ed460c 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -130,7 +130,7 @@ class Mailer {
      * If an empy value is passed, the header is removed
      *
      * @param string $header the header name (no trailing colon!)
-     * @param string $value  the value of the header
+     * @param string|string[] $value  the value of the header
      * @param bool   $clean  remove all non-ASCII chars and line feeds?
      */
     public function setHeader($header, $value, $clean = true) {
@@ -177,7 +177,7 @@ class Mailer {
      * @param string $text     plain text body
      * @param array  $textrep  replacements to apply on the text part
      * @param array  $htmlrep  replacements to apply on the HTML part, leave null to use $textrep
-     * @param array  $html     the HTML body, leave null to create it from $text
+     * @param string $html     the HTML body, leave null to create it from $text
      * @param bool   $wrap     wrap the HTML in the default header/Footer
      */
     public function setBody($text, $textrep = null, $htmlrep = null, $html = null, $wrap = true) {
@@ -283,7 +283,7 @@ class Mailer {
      * Add the To: recipients
      *
      * @see cleanAddress
-     * @param string|array  $address Multiple adresses separated by commas or as array
+     * @param string|string[]  $address Multiple adresses separated by commas or as array
      */
     public function to($address) {
         $this->setHeader('To', $address, false);
@@ -293,7 +293,7 @@ class Mailer {
      * Add the Cc: recipients
      *
      * @see cleanAddress
-     * @param string|array  $address Multiple adresses separated by commas or as array
+     * @param string|string[]  $address Multiple adresses separated by commas or as array
      */
     public function cc($address) {
         $this->setHeader('Cc', $address, false);
@@ -303,7 +303,7 @@ class Mailer {
      * Add the Bcc: recipients
      *
      * @see cleanAddress
-     * @param string|array  $address Multiple adresses separated by commas or as array
+     * @param string|string[]  $address Multiple adresses separated by commas or as array
      */
     public function bcc($address) {
         $this->setHeader('Bcc', $address, false);
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index ffa03ee93..8c7a0e846 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -681,6 +681,7 @@ class RemoteAPICore {
                     $pagelog->setChunkSize(1024);
                     $info = $pagelog->getRevisionInfo($time);
                     if(!empty($info)) {
+                        $data = array();
                         $data['user'] = $info['user'];
                         $data['ip']   = $info['ip'];
                         $data['type'] = $info['type'];
diff --git a/inc/Tar.class.php b/inc/Tar.class.php
index 903f7f35c..8c7d33fc1 100644
--- a/inc/Tar.class.php
+++ b/inc/Tar.class.php
@@ -536,6 +536,7 @@ class Tar {
         $header = @unpack("a100filename/a8perm/a8uid/a8gid/a12size/a12mtime/a8checksum/a1typeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor/a155prefix", $block);
         if(!$header) return false;
 
+        $return = array();
         $return['checksum'] = OctDec(trim($header['checksum']));
         if($return['checksum'] != $chks) return false;
 
diff --git a/inc/ZipLib.class.php b/inc/ZipLib.class.php
index 918d38579..cec518b05 100644
--- a/inc/ZipLib.class.php
+++ b/inc/ZipLib.class.php
@@ -24,10 +24,12 @@ class ZipLib {
         @rewind($zip);
         @fseek($zip, $centd['offset']);
 
+        $ret = array();
         for ($i=0; $i<$centd['entries']; $i++) {
             $header = $this->ReadCentralFileHeaders($zip);
             $header['index'] = $i;
 
+            $info = array();
             $info['filename']        = $header['filename'];
             $info['stored_filename'] = $header['stored_filename'];
             $info['size']            = $header['size'];
@@ -48,6 +50,7 @@ class ZipLib {
     function Add($files,$compact) {
         if(!is_array($files[0])) $files=Array($files);
 
+        $ret = array();
         for($i=0;$files[$i];$i++){
             $fn = $files[$i];
             if(!in_Array(dirname($fn[0]),$this->dirs))
@@ -189,7 +192,6 @@ class ZipLib {
      */
     function Extract ( $zn, $to, $index = Array(-1) ) {
         if(!@is_dir($to)) $this->_mkdir($to);
-        $ok = 0;
         $zip = @fopen($zn,'rb');
         if(!$zip) return(-1);
         $cdir = $this->ReadCentralDir($zip,$zn);
@@ -203,6 +205,7 @@ class ZipLib {
                 return(-1);
         }
 
+        $stat = array();
         for ($i=0; $i<$cdir['entries']; $i++) {
             @fseek($zip, $pos_entry);
             $header = $this->ReadCentralFileHeaders($zip);
@@ -320,6 +323,7 @@ class ZipLib {
         $data=unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size',
                 fread($zip, 18));
 
+        $centd = array();
         if ($data['comment_size'] != 0){
             $centd['comment'] = fread($zip, $data['comment_size']);
         } else {
@@ -421,7 +425,6 @@ class ZipLib {
 
 
     function ExtractStr($zn, $name) {
-        $ok = 0;
         $zip = @fopen($zn,'rb');
         if(!$zip) return(null);
         $cdir = $this->ReadCentralDir($zip,$zn);
diff --git a/inc/actions.php b/inc/actions.php
index 2b819a0d6..5cf63a6ca 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -600,7 +600,6 @@ function act_export($act){
 
     $pre = '';
     $post = '';
-    $output = '';
     $headers = array();
 
     // search engines: never cache exported docs! (Google only currently)
diff --git a/inc/auth.php b/inc/auth.php
index e938830ef..dc2b6cad8 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -1129,6 +1129,7 @@ function auth_deleteprofile(){
         }
     }
 
+    $deleted = array();
     $deleted[] = $INPUT->server->str('REMOTE_USER');
     if($auth->triggerUserMod('delete', array($deleted))) {
         // force and immediate logout including removing the sticky cookie
diff --git a/inc/common.php b/inc/common.php
index 95ea4e72d..91a068bb0 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -120,6 +120,7 @@ function basicinfo($id, $htmlClient=true){
     global $INPUT;
 
     // set info about manager/admin status.
+    $info = array();
     $info['isadmin']   = false;
     $info['ismanager'] = false;
     if($INPUT->server->has('REMOTE_USER')) {
@@ -685,6 +686,7 @@ function checkwordblock($text = '') {
         }
         if(count($re) && preg_match('#('.join('|', $re).')#si', $text, $matches)) {
             // prepare event data
+            $data = array();
             $data['matches']        = $matches;
             $data['userinfo']['ip'] = $INPUT->server->str('REMOTE_ADDR');
             if($INPUT->server->str('REMOTE_USER')) {
@@ -1119,6 +1121,7 @@ function rawWikiSlices($range, $id, $rev = '') {
     $from = !$from ? 0 : ($from - 1);
     $to   = !$to ? strlen($text) : ($to - 1);
 
+    $slices = array();
     $slices[0] = substr($text, 0, $from);
     $slices[1] = substr($text, $from, $to - $from);
     $slices[2] = substr($text, $to);
diff --git a/inc/fulltext.php b/inc/fulltext.php
index aaef090e1..c1dc16e47 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -23,6 +23,7 @@ if(!defined('FT_SNIPPET_NUMBER')) define('FT_SNIPPET_NUMBER',15);
  */
 function ft_pageSearch($query,&$highlight){
 
+    $data = array();
     $data['query'] = $query;
     $data['highlight'] =& $highlight;
 
diff --git a/inc/html.php b/inc/html.php
index dd4a3d8da..ce6360175 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1902,6 +1902,7 @@ function html_debug(){
     print '</pre>';
 
     if (function_exists('apache_get_version')) {
+        $apache = array();
         $apache['version'] = apache_get_version();
 
         if (function_exists('apache_get_modules')) {
diff --git a/inc/infoutils.php b/inc/infoutils.php
index f9ba11560..9c297a28d 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -296,6 +296,7 @@ define('MSG_ADMINS_ONLY',4);
  */
 function msg($message,$lvl=0,$line='',$file='',$allow=MSG_PUBLIC){
     global $MSG, $MSG_shown;
+    $errors = array();
     $errors[-1] = 'error';
     $errors[0]  = 'info';
     $errors[1]  = 'success';
@@ -452,7 +453,7 @@ function dbg_backtrace(){
                 }elseif(is_array($arg)){
                     $params[] = '[Array]';
                 }elseif(is_null($arg)){
-                    $param[] = '[NULL]';
+                    $params[] = '[NULL]';
                 }else{
                     $params[] = (string) '"'.$arg.'"';
                 }
diff --git a/inc/media.php b/inc/media.php
index 2b802a0ae..7770d3cc9 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -231,6 +231,7 @@ function media_delete($id,$auth){
     $file = mediaFN($id);
 
     // trigger an event - MEDIA_DELETE_FILE
+    $data = array();
     $data['id']   = $id;
     $data['name'] = utf8_basename($file);
     $data['path'] = $file;
@@ -439,6 +440,7 @@ function media_save($file, $id, $ow, $auth, $move) {
     }
 
     // prepare event data
+    $data = array();
     $data[0] = $file['name'];
     $data[1] = $fn;
     $data[2] = $id;
@@ -910,11 +912,11 @@ function media_tab_history($image, $ns, $auth=null) {
  *
  * @param string        $image media id
  * @param int           $auth permission level
- * @param int|bool      $rev
+ * @param int|string    $rev revision timestamp or empty string
  * @param JpegMeta|bool $meta
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_preview($image, $auth, $rev=false, $meta=false) {
+function media_preview($image, $auth, $rev='', $meta=false) {
 
     $size = media_image_preview_size($image, $rev, $meta);
 
@@ -999,11 +1001,11 @@ function media_preview_buttons($image, $auth, $rev='') {
  * Returns image width and height for mediamanager preview panel
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string   $image
- * @param int|string $rev
- * @param JpegMeta $meta
- * @param int      $size
- * @return array
+ * @param string         $image
+ * @param int|string     $rev
+ * @param JpegMeta|bool $meta
+ * @param int            $size
+ * @return array|bool
  */
 function media_image_preview_size($image, $rev, $meta, $size = 500) {
     if (!preg_match("/\.(jpe?g|gif|png)$/", $image) || !file_exists(mediaFN($image, $rev))) return false;
@@ -1158,6 +1160,7 @@ function media_diff($image, $ns, $auth, $fromajax = false) {
     }
 
     // prepare event data
+    $data = array();
     $data[0] = $image;
     $data[1] = $l_rev;
     $data[2] = $r_rev;
@@ -1397,13 +1400,12 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort='natural
     global $lang;
 
     $ns = cleanID($ns);
-
+    $evdata = array(
+        'ns'    => $ns,
+        'data'  => array(),
+        'query' => $query
+    );
     if ($query) {
-        $evdata = array(
-                'ns'    => $ns,
-                'data'  => array(),
-                'query' => $query
-                );
         $evt = new Doku_Event('MEDIA_SEARCH', $evdata);
         if ($evt->advise_before()) {
             $dir = utf8_encodeFN(str_replace(':','/',$evdata['ns']));
@@ -2169,6 +2171,7 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
     }
 
     // create an image of the given filetype
+    $image = false;
     if ($ext == 'jpg' || $ext == 'jpeg'){
         if(!function_exists("imagecreatefromjpeg")) return false;
         $image = @imagecreatefromjpeg($from);
@@ -2182,6 +2185,7 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
     }
     if(!$image) return false;
 
+    $newimg = false;
     if(($conf['gdlib']>1) && function_exists("imagecreatetruecolor") && $ext != 'gif'){
         $newimg = @imagecreatetruecolor ($to_w, $to_h);
     }
@@ -2266,14 +2270,14 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
 function media_alternativefiles($src, $exts){
 
     $files = array();
-    list($srcExt, $srcMime) = mimetype($src);
+    list($srcExt, /* $srcMime */) = mimetype($src);
     $filebase = substr($src, 0, -1 * (strlen($srcExt)+1));
 
     foreach($exts as $ext) {
         $fileid = $filebase.'.'.$ext;
         $file = mediaFN($fileid);
         if(file_exists($file)) {
-            list($fileExt, $fileMime) = mimetype($file);
+            list(/* $fileExt */, $fileMime) = mimetype($file);
             $files[$fileMime] = $fileid;
         }
     }
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 2e84eca7c..b46a5f505 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -56,12 +56,12 @@ class Doku_LexerParallelRegex {
     /**
      * Adds a pattern with an optional label.
      *
-     * @param mixed $pattern       Perl style regex. Must be UTF-8
+     * @param mixed       $pattern Perl style regex. Must be UTF-8
      *                             encoded. If its a string, the (, )
      *                             lose their meaning unless they
      *                             form part of a lookahead or
      *                             lookbehind assertation.
-     * @param string $label        Label of regex to be returned
+     * @param bool|string $label   Label of regex to be returned
      *                             on a match. Label must be ASCII
      * @access public
      */
@@ -151,7 +151,8 @@ class Doku_LexerParallelRegex {
      * "or" operator. Caches the regex.
      * Will automatically escape (, ) and / tokens.
      *
-     * @param array $patterns    List of patterns in order.
+     * @internal array $_patterns List of patterns in order.
+     * @return null|string
      * @access private
      */
     function _getCompoundedRegex() {
@@ -297,6 +298,7 @@ class Doku_Lexer {
      */
     function Doku_Lexer(&$parser, $start = "accept", $case = false) {
         $this->_case = $case;
+        /** @var Doku_LexerParallelRegex[] _regexes */
         $this->_regexes = array();
         $this->_parser = &$parser;
         $this->_mode = new Doku_LexerStateStack($start);
@@ -425,11 +427,13 @@ class Doku_Lexer {
      * Sends the matched token and any leading unmatched
      * text to the parser changing the lexer to a new
      * mode if one is listed.
-     * @param string $unmatched    Unmatched leading portion.
-     * @param string $matched      Actual token match.
-     * @param string $mode         Mode after match. A boolean
+     * @param string $unmatched Unmatched leading portion.
+     * @param string $matched Actual token match.
+     * @param bool|string $mode Mode after match. A boolean
      *                             false mode causes no change.
-     * @param int $pos             Current byte index location in raw doc
+     * @param int $initialPos
+     * @param int $matchPos
+     *                             Current byte index location in raw doc
      *                             thats being parsed
      * @return boolean             False if there was any error
      *                             from the parser.
@@ -498,11 +502,12 @@ class Doku_Lexer {
      * Calls the parser method named after the current
      * mode. Empty content will be ignored. The lexer
      * has a parser handler for each mode in the lexer.
-     * @param string $content        Text parsed.
-     * @param boolean $is_match      Token is recognised rather
+     * @param string $content Text parsed.
+     * @param boolean $is_match Token is recognised rather
      *                               than unparsed data.
-     * @param int $pos         Current byte index location in raw doc
+     * @param int $pos Current byte index location in raw doc
      *                             thats being parsed
+     * @return bool
      * @access private
      */
     function _invokeParser($content, $is_match, $pos) {
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 4619c24ce..3fc5d1c9a 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -421,8 +421,8 @@ class Doku_Renderer_metadata extends Doku_Renderer {
     /**
      * keep track of internal links in $this->meta['relation']['references']
      *
-     * @param string       $id   page ID to link to. eg. 'wiki:syntax'
-     * @param string|array $name name for the link, array for media file
+     * @param string            $id   page ID to link to. eg. 'wiki:syntax'
+     * @param string|array|null $name name for the link, array for media file
      */
     function internallink($id, $name = null) {
         global $ID;
@@ -458,8 +458,8 @@ class Doku_Renderer_metadata extends Doku_Renderer {
     /**
      * Render an external link
      *
-     * @param string       $url  full URL with scheme
-     * @param string|array $name name for the link, array for media file
+     * @param string            $url  full URL with scheme
+     * @param string|array|null $name name for the link, array for media file
      */
     function externallink($url, $name = null) {
         if(is_array($name)) {
@@ -628,9 +628,9 @@ class Doku_Renderer_metadata extends Doku_Renderer {
      * Construct a title and handle images in titles
      *
      * @author Harry Fuecks <hfuecks@gmail.com>
-     * @param string|array $title    either string title or media array
-     * @param string       $default  default title if nothing else is found
-     * @param null|string  $id       linked page id (used to extract title from first heading)
+     * @param string|array|null $title    either string title or media array
+     * @param string            $default  default title if nothing else is found
+     * @param null|string       $id       linked page id (used to extract title from first heading)
      * @return string title text
      */
     function _getLinkTitle($title, $default, $id = null) {
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index cd4b3d6e5..aa09058df 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -820,6 +820,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         // now first resolve and clean up the $id
         resolve_pageid(getNS($ID), $id, $exists);
 
+        $link = array();
         $name = $this->_getLinkTitle($name, $default, $isImage, $id, $linktype);
         if(!$isImage) {
             if($exists) {
@@ -904,6 +905,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
 
         //prepare for formating
+        $link = array();
         $link['target'] = $conf['target']['extern'];
         $link['style']  = '';
         $link['pre']    = '';
@@ -981,6 +983,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         global $conf;
 
         //simple setup
+        $link = array();
         $link['target'] = $conf['target']['windows'];
         $link['pre']    = '';
         $link['suf']    = '';
@@ -1656,7 +1659,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             // prepare alternative formats
             $extensions   = array('webm', 'ogv', 'mp4');
             $files        = media_alternativefiles($src, $extensions);
-            $poster       = media_alternativefiles($src, array('jpg', 'png'), true);
+            $poster       = media_alternativefiles($src, array('jpg', 'png'));
             if(!empty($poster)) {
                 $posterUrl = ml(reset($poster), '', true, '&');
             }
@@ -1700,7 +1703,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * @param array  $atts      - additional attributes for the <audio> tag
      * @return string
      */
-    function _audio($src, $atts = null) {
+    function _audio($src, $atts = array()) {
         $files = array();
         $isExternal = media_isexternal($src);
 
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 999f32937..86c10585e 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -73,7 +73,7 @@ class Doku_Plugin_Controller {
         //we keep all loaded plugins available in global scope for reuse
         global $DOKU_PLUGINS;
 
-        list($plugin,$component) = $this->_splitName($name);
+        list($plugin, /* $component */) = $this->_splitName($name);
 
         // check if disabled
         if(!$disabled && $this->isdisabled($plugin)){
diff --git a/inc/remote.php b/inc/remote.php
index e27aa74f8..a21ef1e25 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -85,7 +85,7 @@ class RemoteAPI {
         if ($args === null) {
             $args = array();
         }
-        list($type, $pluginName, $call) = explode('.', $method, 3);
+        list($type, $pluginName, /* $call */) = explode('.', $method, 3);
         if ($type === 'plugin') {
             return $this->callPlugin($pluginName, $method, $args);
         }
diff --git a/inc/search.php b/inc/search.php
index 5489dc2c0..79d930149 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -258,6 +258,7 @@ function search_allpages(&$data,$base,$file,$type,$lvl,$opts){
     //only search txt files
     if(substr($file,-4) != '.txt') return true;
 
+    $item = array();
     $item['id']   = pathID($file);
     if(!$opts['skipacl'] && auth_quickaclcheck($item['id']) < AUTH_READ){
         return false;
diff --git a/inc/subscription.php b/inc/subscription.php
index dbbcbe16a..bad98cf6c 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -454,7 +454,7 @@ class Subscription {
         global $conf;
 
         $file = mediaFN($id);
-        list($mime, $ext) = mimetype($id);
+        list($mime, /* $ext */) = mimetype($id);
 
         $trep = array(
             'MIME'  => $mime,
diff --git a/inc/template.php b/inc/template.php
index 667e3db1c..49f6986fd 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -759,7 +759,6 @@ function tpl_get_action($type) {
             break;
         default:
             return '[unknown %s type]';
-            break;
     }
     return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow', 'replacement');
 }
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index d0a5e0463..89c4b7cd0 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -84,7 +84,7 @@ function runTrimRecentChanges($media_changes = false) {
             io_saveFile($fn.'_tmp', '');          // presave tmp as 2nd lock
             $trim_time = time() - $conf['recent_days']*86400;
             $out_lines = array();
-
+            $old_lines = array();
             for ($i=0; $i<count($lines); $i++) {
                 $log = parseChangelogLine($lines[$i]);
                 if ($log === false) continue;                      // discard junk
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index ebb097a04..814bbfe9c 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -762,6 +762,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      */
     function _html_select(){
         $inlist = false;
+        $usel = '';
+        $gsel = '';
 
         if($this->who &&
            !in_array($this->who,$this->usersgroups) &&
@@ -770,11 +772,9 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             if($this->who{0} == '@'){
                 $gsel = ' selected="selected"';
             }else{
-                $usel   = ' selected="selected"';
+                $usel = ' selected="selected"';
             }
         }else{
-            $usel = '';
-            $gsel = '';
             $inlist = true;
         }
 
diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 6d5201cf6..2fdc697db 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -18,11 +18,13 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
     }
 
     function addAcl($scope, $user, $level){
+        /** @var admin_plugin_acl $apa */
         $apa = plugin_load('admin', 'acl');
         return $apa->_acl_add($scope, $user, $level);
     }
 
     function delAcl($scope, $user){
+        /** @var admin_plugin_acl $apa */
         $apa = plugin_load('admin', 'acl');
         return $apa->_acl_del($scope, $user);
     }
diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index b38b591a3..0d6ea2fa3 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -124,8 +124,11 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
             'modify' => 'modifyUser',
             'delete' => 'deleteUsers'
         );
-        if(empty($validTypes[$type]))
+        if(empty($validTypes[$type])) {
             return false;
+        }
+
+        $result = false;
         $eventdata = array('type' => $type, 'params' => $params, 'modification_result' => null);
         $evt       = new Doku_Event('AUTH_USER_CHANGE', $eventdata);
         if($evt->advise_before(true)) {
diff --git a/lib/plugins/authad/adLDAP/adLDAP.php b/lib/plugins/authad/adLDAP/adLDAP.php
index c1f92abe2..5563e4fe9 100644
--- a/lib/plugins/authad/adLDAP/adLDAP.php
+++ b/lib/plugins/authad/adLDAP/adLDAP.php
@@ -947,5 +947,3 @@ class adLDAP {
 * }
 */
 class adLDAPException extends Exception {}
-
-?>
\ No newline at end of file
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index a3119dda6..65f0b1647 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -203,6 +203,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         }
 
         //general user info
+        $info = array();
         $info['name'] = $result[0]['displayname'][0];
         $info['mail'] = $result[0]['mail'][0];
         $info['uid']  = $result[0]['samaccountname'][0];
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index a94c7a357..fd4729331 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -181,6 +181,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
             }
         }
 
+        $info = array();
         $info['user']   = $user;
         $info['server'] = $this->getConf('server');
 
diff --git a/lib/plugins/authmysql/auth.php b/lib/plugins/authmysql/auth.php
index 176eac679..0605a3bf1 100644
--- a/lib/plugins/authmysql/auth.php
+++ b/lib/plugins/authmysql/auth.php
@@ -366,7 +366,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      *
      * @param  int          $first  index of first user to be returned
      * @param  int          $limit  max number of users to be returned
-     * @param  array|string $filter array of field/pattern pairs
+     * @param  array $filter array of field/pattern pairs
      * @return  array userinfo (refer getUserData for internal userinfo details)
      */
     public function retrieveUsers($first = 0, $limit = 0, $filter = array()) {
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 8dae23110..30e7a2133 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -775,6 +775,7 @@ if (!class_exists('setting_email')) {
          * update setting with user provided value $input
          * if value fails error check, save it
          *
+         * @param mixed $input
          * @return boolean true if changed, false otherwise (incl. on error)
          */
         function update($input) {
@@ -925,6 +926,7 @@ if (!class_exists('setting_onoff')) {
 if (!class_exists('setting_multichoice')) {
     class setting_multichoice extends setting_string {
         var $_choices = array();
+        var $lang; //some custom language strings are stored in setting
 
         function html(&$plugin, $echo = false) {
             $value = '';
@@ -1125,7 +1127,7 @@ if (!class_exists('setting_multicheckbox')) {
             // handle any remaining values
             $other = join(',',$value);
 
-            $class = (count($default == count($value)) && (count($value) == count(array_intersect($value,$default)))) ?
+            $class = ((count($default) == count($value)) && (count($value) == count(array_intersect($value,$default)))) ?
                             " selectiondefault" : "";
 
             $input .= '<div class="other'.$class.'">'."\n";
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 83de802a3..02171fb77 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -122,7 +122,7 @@ if (!class_exists('setting_disableactions')) {
 
             // make some language adjustments (there must be a better way)
             // transfer some DokuWiki language strings to the plugin
-            if (!$plugin->localised) $this->setupLocale();
+            if (!$plugin->localised) $plugin->setupLocale();
             $plugin->lang[$this->_key.'_revisions'] = $lang['btn_revs'];
 
             foreach ($this->_choices as $choice)
@@ -159,7 +159,7 @@ if (!class_exists('setting_license')) {
 
             foreach($license as $key => $data){
                 $this->_choices[] = $key;
-                $this->lang[$this->_key.'_o_'.$key] = $data['name'];
+                $this->lang[$this->_key.'_o_'.$key] = $data['name']; // stored in setting
             }
 
             parent::initialize($default,$local,$protected);
@@ -171,6 +171,7 @@ if (!class_exists('setting_license')) {
 if (!class_exists('setting_renderer')) {
     class setting_renderer extends setting_multichoice {
         var $_prompts = array();
+        var $_format = null;
 
         function initialize($default,$local,$protected) {
             $format = $this->_format;
@@ -192,7 +193,7 @@ if (!class_exists('setting_renderer')) {
 
             // make some language adjustments (there must be a better way)
             // transfer some plugin names to the config plugin
-            if (!$plugin->localised) $this->setupLocale();
+            if (!$plugin->localised) $plugin->setupLocale();
 
             foreach ($this->_choices as $choice) {
                 if (!isset($plugin->lang[$this->_key.'_o_'.$choice])) {
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 3e3f6b733..fc0e1af9d 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -104,7 +104,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      *
      * uses some of the original renderer methods
      */
-    function _plugins_xhtml($type, Doku_Renderer &$renderer){
+    function _plugins_xhtml($type, Doku_Renderer_xhtml $renderer){
         global $lang;
         $renderer->doc .= '<ul>';
 
@@ -142,7 +142,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      *
      * uses some of the original renderer methods
      */
-    function _helpermethods_xhtml(Doku_Renderer &$renderer){
+    function _helpermethods_xhtml(Doku_Renderer_xhtml $renderer){
         $plugins = plugin_list('helper');
         foreach($plugins as $p){
             if (!$po = plugin_load('helper',$p)) continue;
@@ -249,12 +249,17 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
 
     /**
      * Adds a TOC item
+     *
+     * @param string $text
+     * @param int $level
+     * @param Doku_Renderer_xhtml $renderer
+     * @return string
      */
-    function _addToTOC($text, $level, Doku_Renderer &$renderer){
+    protected function _addToTOC($text, $level, Doku_Renderer_xhtml $renderer){
         global $conf;
 
+        $hid = '';
         if (($level >= $conf['toptoclevel']) && ($level <= $conf['maxtoclevel'])){
-            /** @var $renderer Doku_Renderer_xhtml */
             $hid  = $renderer->_headerToLink($text, true);
             $renderer->toc[] = array(
                 'hid'   => $hid,
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index b67d91b36..c568469a7 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -738,6 +738,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         global $auth;
         global $INPUT;
 
+        $user = array();
         $user[0] = ($clean) ? $auth->cleanUser($INPUT->str('userid')) : $INPUT->str('userid');
         $user[1] = $INPUT->str('userpass');
         $user[2] = $INPUT->str('username');
@@ -764,7 +765,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $this->_filter = array();
 
         if ($op == 'new') {
-            list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser(false);
+            list($user,/* $pass */,$name,$mail,$grps) = $this->_retrieveUser(false);
 
             if (!empty($user)) $this->_filter['user'] = $user;
             if (!empty($name)) $this->_filter['name'] = $name;
@@ -816,6 +817,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         $disabled = 'disabled="disabled"';
 
+        $buttons = array();
         $buttons['start'] = $buttons['prev'] = ($this->_start == 0) ? $disabled : '';
 
         if ($this->_user_total == -1) {
@@ -951,7 +953,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $INPUT->set('usergroups', $candidate[4]);
 
         $cleaned = $this->_retrieveUser();
-        list($user,$pass,$name,$mail,$grps) = $cleaned;
+        list($user,/* $pass */,$name,$mail,/* $grps */) = $cleaned;
         if (empty($user)) {
             $error = $this->lang['import_error_baduserid'];
             return false;
-- 
cgit v1.2.3


From 9d7d72dc83bc9b2cb23ec14fdc83c0c665e8039d Mon Sep 17 00:00:00 2001
From: Davor Turkalj <turki.bsc@gmail.com>
Date: Tue, 30 Sep 2014 22:26:03 +0200
Subject: translation update

---
 inc/lang/hr/lang.php                     | 16 +++++++++-------
 lib/plugins/extension/lang/hr/lang.php   | 20 ++++++++++----------
 lib/plugins/usermanager/lang/hr/lang.php |  4 ++--
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index d7c20b413..c3cf6d822 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -62,7 +62,7 @@ $lang['oldpass']               = 'Potvrdi trenutnu lozinku';
 $lang['passchk']               = 'još jednom';
 $lang['remember']              = 'Zapamti me';
 $lang['fullname']              = 'Ime i prezime';
-$lang['email']                 = 'Email';
+$lang['email']                 = 'E-pošta';
 $lang['profile']               = 'Korisnički profil';
 $lang['badlogin']              = 'Ne ispravno korisničko ime ili lozinka.';
 $lang['badpassconfirm']        = 'Nažalost, lozinka nije ispravna';
@@ -100,8 +100,8 @@ $lang['license']               = 'Osim na mjestima gdje je naznačeno drugačije
 $lang['licenseok']             = 'Pažnja: promjenom ovog dokumenta pristajete licencirati sadržaj sljedećom licencom: ';
 $lang['searchmedia']           = 'Traži naziv datoteke:';
 $lang['searchmedia_in']        = 'Traži u %s';
-$lang['txt_upload']            = 'Odaberite datoteku za postavljanje:';
-$lang['txt_filename']          = 'Postaviti kao (nije obavezno):';
+$lang['txt_upload']            = 'Odaberite datoteku za učitavanje:';
+$lang['txt_filename']          = 'Učitaj kao (nije obavezno):';
 $lang['txt_overwrt']           = 'Prepiši postojeću datoteku';
 $lang['maxuploadsize']         = 'Moguće je učitati maks. %s po datoteci.';
 $lang['lockedby']              = 'Trenutno zaključao:';
@@ -156,7 +156,7 @@ $lang['uploadsucc']            = 'Učitavanje uspješno';
 $lang['uploadfail']            = 'Neuspješno učitavanje. Možda dozvole na poslužitelju nisu ispravne?';
 $lang['uploadwrong']           = 'Učitavanje nije dopušteno. Nastavak datoteke je zabranjen!';
 $lang['uploadexist']           = 'Datoteka već postoji.';
-$lang['uploadbadcontent']      = 'Postavljeni sadržaj ne odgovara ekstenziji %s datoteke.';
+$lang['uploadbadcontent']      = 'Učitani sadržaj ne odgovara ekstenziji %s datoteke.';
 $lang['uploadspam']            = 'Učitavanje je spriječeno od spam crne liste.';
 $lang['uploadxss']             = 'Učitavanje je spriječeno zbog mogućeg zlonamjernog sadržaja.';
 $lang['uploadsize']            = 'Učitana datoteka je prevelika (max. %s)';
@@ -191,7 +191,7 @@ $lang['difflastrev']           = 'Zadnja izmjena';
 $lang['diffbothprevrev']       = 'Starije izmjene na obje strane';
 $lang['diffbothnextrev']       = 'Novije izmjene na obje strane';
 $lang['line']                  = 'Redak';
-$lang['breadcrumb']            = 'Putanja:';
+$lang['breadcrumb']            = 'Zadnje viđeno:';
 $lang['youarehere']            = 'Vi ste ovdje:';
 $lang['lastmod']               = 'Zadnja izmjena:';
 $lang['by']                    = 'od';
@@ -212,7 +212,7 @@ $lang['mail_newpage']          = 'stranica dodana:';
 $lang['mail_changed']          = 'stranica izmjenjena:';
 $lang['mail_subscribe_list']   = 'stranice promijenjene u imenskom prostoru:';
 $lang['mail_new_user']         = 'novi korisnik:';
-$lang['mail_upload']           = 'datoteka postavljena:';
+$lang['mail_upload']           = 'datoteka učitana:';
 $lang['changes_type']          = 'Vidi promjene od';
 $lang['pages_changes']         = 'Stranice';
 $lang['media_changes']         = 'Datoteke';
@@ -277,7 +277,7 @@ $lang['subscr_style_list']     = 'listu promijenjenih stranica od zadnje primlje
 $lang['authtempfail']          = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.';
 $lang['authpwdexpire']         = 'Vaša lozinka će isteći za %d dana, trebate ju promijeniti.';
 $lang['i_chooselang']          = 'Izaberite vaš jezik';
-$lang['i_installer']           = 'DokuWiki instalacija';
+$lang['i_installer']           = 'DokuWiki postavljanje';
 $lang['i_wikiname']            = 'Naziv Wikija';
 $lang['i_enableacl']           = 'Omogući ACL (preporučeno)';
 $lang['i_superuser']           = 'Superkorisnik';
@@ -340,3 +340,5 @@ $lang['currentns']             = 'Tekući imenički prostor';
 $lang['searchresult']          = 'Rezultati pretraživanja';
 $lang['plainhtml']             = 'Čisti HTML';
 $lang['wikimarkup']            = 'Wiki kod';
+$lang['page_nonexist_rev']     = 'Stranica ne postoji na %s. Ona je naknadno napravljena na <a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'Ne mogu analizirati parametar "%s".';
diff --git a/lib/plugins/extension/lang/hr/lang.php b/lib/plugins/extension/lang/hr/lang.php
index 4905fe864..f43defcb1 100644
--- a/lib/plugins/extension/lang/hr/lang.php
+++ b/lib/plugins/extension/lang/hr/lang.php
@@ -6,24 +6,24 @@
  * @author Davor Turkalj <turki.bsc@gmail.com>
  */
 $lang['menu']                  = 'Upravitelj dodataka';
-$lang['tab_plugins']           = 'Instalirani dodatci';
-$lang['tab_templates']         = 'Instalirani predlošci';
-$lang['tab_search']            = 'Potraži i instaliraj';
-$lang['tab_install']           = 'Ručno instaliranje';
+$lang['tab_plugins']           = 'Ugrađeni dodatci';
+$lang['tab_templates']         = 'Ugrađeni predlošci';
+$lang['tab_search']            = 'Potraži i ugradi';
+$lang['tab_install']           = 'Ručna ugradnja';
 $lang['notimplemented']        = 'Ova mogućnost još nije napravljena';
-$lang['notinstalled']          = 'Dodatak nije instaliran';
+$lang['notinstalled']          = 'Dodatak nije ugrađen';
 $lang['alreadyenabled']        = 'Ovaj dodatak je već omogućen';
 $lang['alreadydisabled']       = 'Ovaj dodatak je već onemogućen';
 $lang['pluginlistsaveerror']   = 'Dogodila se greška pri snimanju liste dodataka';
 $lang['unknownauthor']         = 'Nepoznat autor';
 $lang['unknownversion']        = 'Nepoznata inačica';
 $lang['btn_info']              = 'Prikaži više informacija';
-$lang['btn_update']            = 'Dopuni';
+$lang['btn_update']            = 'Dogradi';
 $lang['btn_uninstall']         = 'Ukloni';
 $lang['btn_enable']            = 'Omogući';
 $lang['btn_disable']           = 'Onemogući';
-$lang['btn_install']           = 'Postavi';
-$lang['btn_reinstall']         = 'Ponovno postavi';
+$lang['btn_install']           = 'Ugradi';
+$lang['btn_reinstall']         = 'Ponovno ugradi';
 $lang['js']['reallydel']       = 'Zaista ukloniti ovo proširenje?';
 $lang['search_for']            = 'Pretraži proširenja';
 $lang['search']                = 'Pretraži';
@@ -34,11 +34,11 @@ $lang['homepage_link']         = 'Upute';
 $lang['bugs_features']         = 'Greške';
 $lang['tags']                  = 'Oznake:';
 $lang['author_hint']           = 'Potraži dodatke od ovog autora';
-$lang['installed']             = 'Postavljeno:';
+$lang['installed']             = 'Ugrađeno:';
 $lang['downloadurl']           = 'URL adresa preuzimanja:';
 $lang['repository']            = 'Repozitorij:';
 $lang['unknown']               = '<em>nepoznat</em>';
-$lang['installed_version']     = 'Postavljena inačica:';
+$lang['installed_version']     = 'Ugrađena inačica:';
 $lang['install_date']          = 'Vaše zadnje osvježavanje:';
 $lang['available_version']     = 'Dostupna inačica';
 $lang['compatible']            = 'Kompatibilan s:';
diff --git a/lib/plugins/usermanager/lang/hr/lang.php b/lib/plugins/usermanager/lang/hr/lang.php
index 80613ed6f..a71afb60a 100644
--- a/lib/plugins/usermanager/lang/hr/lang.php
+++ b/lib/plugins/usermanager/lang/hr/lang.php
@@ -33,7 +33,7 @@ $lang['line']                  = 'Linija br.';
 $lang['error']                 = 'Poruka o grešci';
 $lang['summary']               = 'Prikaz korisnika %1$d-%2$d od %3$d nađenih. Ukupno %4$d korisnika.';
 $lang['nonefound']             = 'Nema korisnika koji odgovaraju filtru.Ukupno %d korisnika.';
-$lang['delete_ok']             = '%d korisnik obrisano';
+$lang['delete_ok']             = '%d korisnika obrisano';
 $lang['delete_fail']           = '%d neuspjelih brisanja.';
 $lang['update_ok']             = 'Korisnik uspješno izmijenjen';
 $lang['update_fail']           = 'Neuspjela izmjena korisnika';
@@ -49,7 +49,7 @@ $lang['note_group']            = 'Novi korisnik biti će dodijeljen u podrazumij
 $lang['note_pass']             = 'Lozinka će biti generirana ako se polje ostavi prazno i obavješćivanje korisnika je omogućeno.';
 $lang['add_ok']                = 'Korisnik uspješno dodan';
 $lang['add_fail']              = 'Neuspješno dodavanje korisnika';
-$lang['notify_ok']             = 'Obavijest korisniku poslana';
+$lang['notify_ok']             = 'Poslana obavijest korisniku';
 $lang['notify_fail']           = 'Obavijest korisniku ne može biti poslana';
 $lang['import_userlistcsv']    = 'Datoteka s popisom korisnika (CSV):';
 $lang['import_header']         = 'Zadnje greške pri uvozu';
-- 
cgit v1.2.3


From 42ea7f447f39fbc2f79eaaec31f8c10ede59c5d0 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 1 Oct 2014 11:30:27 +0200
Subject: Many PHPDocs, some unused and dyn declared vars

many PHPDocs
some unused variables
some dynamically declared variables declared
---
 bin/gittool.php                |   6 +-
 bin/wantedpages.php            |  20 ++++
 inc/DifferenceEngine.php       |  80 ++++++++++---
 inc/HTTPClient.php             |  39 ++++--
 inc/IXR_Library.php            |  11 ++
 inc/Input.class.php            |   7 +-
 inc/JpegMeta.php               |  76 +++++++++++-
 inc/Mailer.class.php           |  21 +++-
 inc/PassHash.class.php         |  23 ++--
 inc/RemoteAPICore.php          | 135 ++++++++++++++++++++-
 inc/Sitemapper.php             |  18 ++-
 inc/Tar.class.php              |  14 ++-
 inc/actions.php                |  45 ++++++-
 inc/auth.php                   |  27 ++++-
 inc/blowfish.php               |  15 +--
 inc/changelog.php              |   6 +-
 inc/cli.php                    |  23 ++--
 inc/common.php                 |  17 +--
 inc/confutils.php              |   4 +
 inc/events.php                 |  24 ++--
 inc/fetch.functions.php        |   7 +-
 inc/form.php                   |  98 ++++++++++++++-
 inc/fulltext.php               |  47 ++++++++
 inc/html.php                   |  68 ++++++++++-
 inc/httputils.php              |  11 ++
 inc/indexer.php                |  69 ++++++++++-
 inc/io.php                     |  71 ++++++++++-
 inc/media.php                  | 264 +++++++++++++++++++++++++++++------------
 inc/pageutils.php              |   8 +-
 inc/parser/handler.php         |   5 +-
 inc/parser/renderer.php        |  10 +-
 inc/parser/xhtml.php           |  13 +-
 inc/parserutils.php            |  49 +++++++-
 inc/plugin.php                 |  45 +++++--
 inc/plugincontroller.class.php |  17 ++-
 inc/remote.php                 | 105 +++++++++++++++-
 inc/search.php                 |   5 +
 inc/subscription.php           |   3 +-
 inc/template.php               |  59 +++++++--
 lib/exe/xmlrpc.php             |   8 ++
 lib/plugins/acl/remote.php     |  30 ++++-
 41 files changed, 1354 insertions(+), 249 deletions(-)

diff --git a/bin/gittool.php b/bin/gittool.php
index 6944dde57..7991a9997 100755
--- a/bin/gittool.php
+++ b/bin/gittool.php
@@ -101,7 +101,7 @@ class GitToolCLI extends DokuCLI {
     /**
      * Tries to install the given extensions using git clone
      *
-     * @param       $extensions
+     * @param array      $extensions
      */
     public function cmd_clone($extensions) {
         $errors    = array();
@@ -130,7 +130,7 @@ class GitToolCLI extends DokuCLI {
     /**
      * Tries to install the given extensions using git clone with fallback to install
      *
-     * @param       $extensions
+     * @param array      $extensions
      */
     public function cmd_install($extensions) {
         $errors    = array();
@@ -291,7 +291,7 @@ class GitToolCLI extends DokuCLI {
      * Returns the repository for the given extension
      *
      * @param $extension
-     * @return bool|string
+     * @return false|string
      */
     private function getSourceRepo($extension) {
         /** @var helper_plugin_extension_extension $ext */
diff --git a/bin/wantedpages.php b/bin/wantedpages.php
index 8fc4ba74f..54bfd4755 100755
--- a/bin/wantedpages.php
+++ b/bin/wantedpages.php
@@ -61,6 +61,13 @@ class WantedPagesCLI extends DokuCLI {
         }
     }
 
+    /**
+     * Determine directions of the search loop
+     *
+     * @param string $entry
+     * @param string $basepath
+     * @return int
+     */
     protected function dir_filter($entry, $basepath) {
         if($entry == '.' || $entry == '..') {
             return WantedPagesCLI::DIR_CONTINUE;
@@ -77,6 +84,13 @@ class WantedPagesCLI extends DokuCLI {
         return WantedPagesCLI::DIR_CONTINUE;
     }
 
+    /**
+     * Collects recursively the pages in a namespace
+     *
+     * @param string $dir
+     * @return array
+     * @throws DokuCLI_Exception
+     */
     protected function get_pages($dir) {
         static $trunclen = null;
         if(!$trunclen) {
@@ -108,6 +122,12 @@ class WantedPagesCLI extends DokuCLI {
         return $pages;
     }
 
+    /**
+     * Parse instructions and returns the non-existing links
+     *
+     * @param array $page array with page id and file path
+     * @return array
+     */
     function internal_links($page) {
         global $conf;
         $instructions = p_get_instructions(file_get_contents($page['file']));
diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php
index 3c955cf88..210d1c0eb 100644
--- a/inc/DifferenceEngine.php
+++ b/inc/DifferenceEngine.php
@@ -14,6 +14,9 @@ class _DiffOp {
     var $orig;
     var $closing;
 
+    /**
+     * @return _DiffOp
+     */
     function reverse() {
         trigger_error("pure virtual", E_USER_ERROR);
     }
@@ -104,6 +107,21 @@ class _DiffOp_Change extends _DiffOp {
  */
 class _DiffEngine {
 
+    var $xchanged = array();
+    var $ychanged = array();
+    var $xv = array();
+    var $yv = array();
+    var $xind = array();
+    var $yind = array();
+    var $seq;
+    var $in_seq;
+    var $lcs;
+
+    /**
+     * @param array $from_lines
+     * @param array $to_lines
+     * @return _DiffOp[]
+     */
     function diff($from_lines, $to_lines) {
         $n_from = count($from_lines);
         $n_to = count($to_lines);
@@ -495,9 +513,9 @@ class Diff {
      * Constructor.
      * Computes diff between sequences of strings.
      *
-     * @param $from_lines array An array of strings.
-     *      (Typically these are lines from a file.)
-     * @param $to_lines array An array of strings.
+     * @param array $from_lines An array of strings.
+     *                          (Typically these are lines from a file.)
+     * @param array $to_lines   An array of strings.
      */
     function __construct($from_lines, $to_lines) {
         $eng = new _DiffEngine;
@@ -512,8 +530,9 @@ class Diff {
      *
      *  $diff = new Diff($lines1, $lines2);
      *  $rev = $diff->reverse();
-     * @return object A Diff object representing the inverse of the
-     *          original diff.
+     *
+     * @return Diff  A Diff object representing the inverse of the
+     *               original diff.
      */
     function reverse() {
         $rev = $this;
@@ -631,19 +650,19 @@ class MappedDiff extends Diff {
      * case-insensitve diffs, or diffs which ignore
      * changes in white-space.
      *
-     * @param $from_lines array An array of strings.
-     *  (Typically these are lines from a file.)
+     * @param string[] $from_lines         An array of strings.
+     *                                     (Typically these are lines from a file.)
      *
-     * @param $to_lines array An array of strings.
+     * @param string[] $to_lines           An array of strings.
      *
-     * @param $mapped_from_lines array This array should
-     *  have the same size number of elements as $from_lines.
-     *  The elements in $mapped_from_lines and
-     *  $mapped_to_lines are what is actually compared
-     *  when computing the diff.
+     * @param string[] $mapped_from_lines  This array should
+     *                                     have the same size number of elements as $from_lines.
+     *                                     The elements in $mapped_from_lines and
+     *                                     $mapped_to_lines are what is actually compared
+     *                                     when computing the diff.
      *
-     * @param $mapped_to_lines array This array should
-     *  have the same number of elements as $to_lines.
+     * @param string[] $mapped_to_lines    This array should
+     *                                     have the same number of elements as $to_lines.
      */
     function __construct($from_lines, $to_lines, $mapped_from_lines, $mapped_to_lines) {
 
@@ -697,12 +716,13 @@ class DiffFormatter {
     /**
      * Format a diff.
      *
-     * @param $diff object A Diff object.
+     * @param Diff $diff A Diff object.
      * @return string The formatted output.
      */
     function format($diff) {
 
         $xi = $yi = 1;
+        $x0 = $y0 = 0;
         $block = false;
         $context = array();
 
@@ -752,6 +772,13 @@ class DiffFormatter {
         return $this->_end_diff();
     }
 
+    /**
+     * @param int $xbeg
+     * @param int $xlen
+     * @param int $ybeg
+     * @param int $ylen
+     * @param array $edits
+     */
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
         $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
         foreach ($edits as $edit) {
@@ -779,6 +806,13 @@ class DiffFormatter {
         return $val;
     }
 
+    /**
+     * @param int $xbeg
+     * @param int $xlen
+     * @param int $ybeg
+     * @param int $ylen
+     * @return string
+     */
     function _block_header($xbeg, $xlen, $ybeg, $ylen) {
         if ($xlen > 1)
             $xbeg .= "," . ($xbeg + $xlen - 1);
@@ -788,6 +822,9 @@ class DiffFormatter {
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
+    /**
+     * @param string $header
+     */
     function _start_block($header) {
         echo $header;
     }
@@ -896,6 +933,9 @@ class _HWLDF_WordAccumulator {
         $this->_tag = $new_tag;
     }
 
+    /**
+     * @param string $new_tag
+     */
     function _flushLine($new_tag) {
         $this->_flushGroup($new_tag);
         if ($this->_line != '')
@@ -1055,6 +1095,10 @@ class TableDiffFormatter extends DiffFormatter {
         $this->trailing_context_lines = 2;
     }
 
+    /**
+     * @param Diff $diff
+     * @return string
+     */
     function format($diff) {
         // Preserve whitespaces by converting some to non-breaking spaces.
         // Do not convert all of them to allow word-wrap.
@@ -1165,6 +1209,10 @@ class InlineDiffFormatter extends DiffFormatter {
         $this->trailing_context_lines = 2;
     }
 
+    /**
+     * @param Diff $diff
+     * @return string
+     */
     function format($diff) {
         // Preserve whitespaces by converting some to non-breaking spaces.
         // Do not convert all of them to allow word-wrap.
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index ea20e3e56..2e991b52f 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -172,7 +172,8 @@ class HTTPClient {
      *
      * @param  string $url       The URL to fetch
      * @param  bool   $sloppy304 Return body on 304 not modified
-     * @return bool|string  response body, false on error
+     * @return false|string  response body, false on error
+     *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
     function get($url,$sloppy304=false){
@@ -193,7 +194,8 @@ class HTTPClient {
      * @param  string $url       The URL to fetch
      * @param  array  $data      Associative array of parameters
      * @param  bool   $sloppy304 Return body on 304 not modified
-     * @return bool|string  response body, false on error
+     * @return false|string  response body, false on error
+     *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
     function dget($url,$data,$sloppy304=false){
@@ -213,7 +215,7 @@ class HTTPClient {
      *
      * @param  string $url       The URL to fetch
      * @param  array  $data      Associative array of parameters
-     * @return bool|string  response body, false on error
+     * @return false|string  response body, false on error
      * @author Andreas Gohr <andi@splitbrain.org>
      */
     function post($url,$data){
@@ -235,6 +237,7 @@ class HTTPClient {
      * @param  mixed  $data   - the post data either as array or raw data
      * @param  string $method - HTTP Method usually GET or POST.
      * @return bool - true on success
+     *
      * @author Andreas Goetz <cpuidle@gmx.de>
      * @author Andreas Gohr <andi@splitbrain.org>
      */
@@ -602,6 +605,7 @@ class HTTPClient {
      * @param  string   $data       The data to write
      * @param  string   $message    Description of what is being read
      * @throws HTTPClientException
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     function _sendData($socket, $data, $message) {
@@ -646,6 +650,7 @@ class HTTPClient {
      * @param  bool     $ignore_eof End-of-file is not an error if this is set
      * @throws HTTPClientException
      * @return string
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     function _readData($socket, $nbytes, $message, $ignore_eof = false) {
@@ -695,6 +700,7 @@ class HTTPClient {
      * @param  string   $message    Description of what is being read
      * @throws HTTPClientException
      * @return string
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     function _readLine($socket, $message) {
@@ -729,6 +735,9 @@ class HTTPClient {
      * Uses _debug_text or _debug_html depending on the SAPI name
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $info
+     * @param mixed  $var
      */
     function _debug($info,$var=null){
         if(!$this->debug) return;
@@ -742,8 +751,8 @@ class HTTPClient {
     /**
      * print debug info as HTML
      *
-     * @param      $info
-     * @param null $var
+     * @param string $info
+     * @param mixed  $var
      */
     function _debug_html($info, $var=null){
         print '<b>'.$info.'</b> '.($this->_time() - $this->start).'s<br />';
@@ -759,8 +768,8 @@ class HTTPClient {
     /**
      * prints debug info as plain text
      *
-     * @param      $info
-     * @param null $var
+     * @param string $info
+     * @param mixed  $var
      */
     function _debug_text($info, $var=null){
         print '*'.$info.'* '.($this->_time() - $this->start)."s\n";
@@ -770,6 +779,8 @@ class HTTPClient {
 
     /**
      * Return current timestamp in microsecond resolution
+     *
+     * @return float
      */
     static function _time(){
         list($usec, $sec) = explode(" ", microtime());
@@ -782,6 +793,9 @@ class HTTPClient {
      * All Keys are lowercased.
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $string
+     * @return array
      */
     function _parseHeaders($string){
         $headers = array();
@@ -810,6 +824,9 @@ class HTTPClient {
      * convert given header array to header string
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param array $headers
+     * @return string
      */
     function _buildHeaders($headers){
         $string = '';
@@ -824,6 +841,8 @@ class HTTPClient {
      * get cookies as http header string
      *
      * @author Andreas Goetz <cpuidle@gmx.de>
+     *
+     * @return string
      */
     function _getCookies(){
         $headers = '';
@@ -839,6 +858,9 @@ class HTTPClient {
      * Encode data for posting
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param array $data
+     * @return string
      */
     function _postEncode($data){
         return http_build_query($data,'','&');
@@ -849,6 +871,9 @@ class HTTPClient {
      *
      * @fixme use of urlencode might be wrong here
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param array $data
+     * @return string
      */
     function _postMultipartEncode($data){
         $boundary = '--'.$this->boundary;
diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 2becf4a54..6ec397894 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -140,6 +140,10 @@ class IXR_Message {
     var $_lastseen;
     // The XML parser
     var $_parser;
+
+    /**
+     * @param string $message
+     */
     function IXR_Message ($message) {
         $this->message = $message;
     }
@@ -684,6 +688,13 @@ class IXR_IntrospectionServer extends IXR_Server {
             'Returns a documentation string for the specified method'
         );
     }
+
+    /**
+     * @param string   $method
+     * @param string   $callback
+     * @param string[] $args
+     * @param string   $help
+     */
     function addCallback($method, $callback, $args, $help) {
         $this->callbacks[$method] = $callback;
         $this->signatures[$method] = $args;
diff --git a/inc/Input.class.php b/inc/Input.class.php
index 94da2a10e..f4a4612df 100644
--- a/inc/Input.class.php
+++ b/inc/Input.class.php
@@ -83,7 +83,6 @@ class Input {
      *
      * @see isset
      * @param string $name Parameter name
-     * @return bool
      */
     public function remove($name) {
         if(isset($this->access[$name])) {
@@ -146,7 +145,7 @@ class Input {
      * Access a request parameter as int
      *
      * @param string    $name     Parameter name
-     * @param mixed     $default  Default to return if parameter isn't set or is an array
+     * @param int       $default  Default to return if parameter isn't set or is an array
      * @param bool      $nonempty Return $default if parameter is set but empty()
      * @return int
      */
@@ -164,7 +163,7 @@ class Input {
      * Access a request parameter as string
      *
      * @param string    $name     Parameter name
-     * @param mixed     $default  Default to return if parameter isn't set or is an array
+     * @param string    $default  Default to return if parameter isn't set or is an array
      * @param bool      $nonempty Return $default if parameter is set but empty()
      * @return string
      */
@@ -246,7 +245,7 @@ class Input {
      *
      * This function returns the $INPUT object itself for easy chaining
      *
-     * @param $name
+     * @param string $name
      * @return Input
      */
     public function extract($name){
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index 3b6c6694c..d50bad9b7 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -133,6 +133,9 @@ class JpegMeta {
      * through one function
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param array|string $fields field name or array with field names
+     * @return bool|string
      */
     function getField($fields) {
         if(!is_array($fields)) $fields = array($fields);
@@ -178,6 +181,10 @@ class JpegMeta {
      * through one function
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $field field name
+     * @param string $value
+     * @return bool success or fail
      */
     function setField($field, $value) {
         if(strtolower(substr($field,0,5)) == 'iptc.'){
@@ -194,6 +201,9 @@ class JpegMeta {
      * through one function
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $field field name
+     * @return bool
      */
     function deleteField($field) {
         if(strtolower(substr($field,0,5)) == 'iptc.'){
@@ -209,6 +219,9 @@ class JpegMeta {
      * Return a date field
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $field
+     * @return false|string
      */
     function getDateField($field) {
         if (!isset($this->_info['dates'])) {
@@ -226,6 +239,9 @@ class JpegMeta {
      * Return a file info field
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $field field name
+     * @return false|string
      */
     function getFileField($field) {
         if (!isset($this->_info['file'])) {
@@ -244,6 +260,8 @@ class JpegMeta {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @todo   handle makernotes
+     *
+     * @return false|string
      */
     function getCamera(){
         $make  = $this->getField(array('Exif.Make','Exif.TIFFMake'));
@@ -257,6 +275,8 @@ class JpegMeta {
      * Return shutter speed as a ratio
      *
      * @author Joe Lapp <joe.lapp@pobox.com>
+     *
+     * @return string
      */
     function getShutterSpeed() {
         if (!isset($this->_info['exif'])) {
@@ -275,6 +295,9 @@ class JpegMeta {
      * Return an EXIF field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @return false|string
      */
     function getExifField($field) {
         if (!isset($this->_info['exif'])) {
@@ -296,6 +319,9 @@ class JpegMeta {
      * Return an XMP field
      *
      * @author Hakan Sandell <hakan.sandell@mydata.se>
+     *
+     * @param string $field field name
+     * @return false|string
      */
     function getXmpField($field) {
         if (!isset($this->_info['xmp'])) {
@@ -317,6 +343,9 @@ class JpegMeta {
      * Return an Adobe Field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @return false|string
      */
     function getAdobeField($field) {
         if (!isset($this->_info['adobe'])) {
@@ -338,6 +367,9 @@ class JpegMeta {
      * Return an IPTC field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @return false|string
      */
     function getIPTCField($field) {
         if (!isset($this->_info['iptc'])) {
@@ -360,6 +392,10 @@ class JpegMeta {
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
      * @author Joe Lapp <joe.lapp@pobox.com>
+     *
+     * @param string $field field name
+     * @param string $value
+     * @return bool
      */
     function setExifField($field, $value) {
         if (!isset($this->_info['exif'])) {
@@ -390,6 +426,10 @@ class JpegMeta {
      * Set an Adobe Field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @param string $value
+     * @return bool
      */
     function setAdobeField($field, $value) {
         if (!isset($this->_info['adobe'])) {
@@ -414,6 +454,10 @@ class JpegMeta {
      * dimensions
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param int $maxwidth
+     * @param int $maxheight
+     * @return float|int
      */
     function getResizeRatio($maxwidth,$maxheight=0){
         if(!$maxheight) $maxheight = $maxwidth;
@@ -443,6 +487,10 @@ class JpegMeta {
      * Set an IPTC field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @param string $value
+     * @return bool
      */
     function setIPTCField($field, $value) {
         if (!isset($this->_info['iptc'])) {
@@ -466,6 +514,9 @@ class JpegMeta {
      * Delete an EXIF field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @return bool
      */
     function deleteExifField($field) {
         if (!isset($this->_info['exif'])) {
@@ -487,6 +538,9 @@ class JpegMeta {
      * Delete an Adobe field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @return bool
      */
     function deleteAdobeField($field) {
         if (!isset($this->_info['adobe'])) {
@@ -508,6 +562,9 @@ class JpegMeta {
      * Delete an IPTC field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $field field name
+     * @return bool
      */
     function deleteIPTCField($field) {
         if (!isset($this->_info['iptc'])) {
@@ -529,7 +586,7 @@ class JpegMeta {
      * Get the image's title, tries various fields
      *
      * @param int $max maximum number chars (keeps words)
-     * @return bool|mixed|string
+     * @return false|string
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
@@ -556,6 +613,8 @@ class JpegMeta {
      * Gather various date fields
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @return array|bool
      */
     function getDates() {
         $this->_parseAll();
@@ -692,6 +751,8 @@ class JpegMeta {
      * Get the image width, tries various fields
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @return false|string
      */
     function getWidth() {
         if (!isset($this->_info['sof'])) {
@@ -721,6 +782,8 @@ class JpegMeta {
      * Get the image height, tries various fields
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @return false|string
      */
     function getHeight() {
         if (!isset($this->_info['sof'])) {
@@ -750,6 +813,8 @@ class JpegMeta {
      * Get an dimension string for use in img tag
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @return false|string
      */
     function getDimStr() {
         if ($this->_markers == null) {
@@ -766,6 +831,9 @@ class JpegMeta {
      * Checks for an embedded thumbnail
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $which possible values: 'any', 'exif' or 'adobe'
+     * @return false|string
      */
     function hasThumbnail($which = 'any') {
         if (($which == 'any') || ($which == 'exif')) {
@@ -807,6 +875,9 @@ class JpegMeta {
      * Send embedded thumbnail to browser
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     *
+     * @param string $which possible values: 'any', 'exif' or 'adobe'
+     * @return bool
      */
     function sendThumbnail($which = 'any') {
         $data = null;
@@ -857,6 +928,9 @@ class JpegMeta {
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $fileName file name or empty string for a random name
+     * @return bool
      */
     function save($fileName = "") {
         if ($fileName == "") {
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index fb9ed460c..087d82c99 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -108,6 +108,9 @@ class Mailer {
 
     /**
      * Callback function to automatically embed images referenced in HTML templates
+     *
+     * @param array $matches
+     * @return string placeholder
      */
     protected function autoembed_cb($matches) {
         static $embeds = 0;
@@ -160,6 +163,8 @@ class Mailer {
      *
      * Whatever is set here is directly passed to PHP's mail() command as last
      * parameter. Depending on the PHP setup this might break mailing alltogether
+     *
+     * @param string $param
      */
     public function setParameters($param) {
         $this->sendparam = $param;
@@ -265,6 +270,8 @@ class Mailer {
      * Placeholders can be used to reference embedded attachments
      *
      * You probably want to use setBody() instead
+     *
+     * @param string $html
      */
     public function setHTML($html) {
         $this->html = $html;
@@ -274,6 +281,8 @@ class Mailer {
      * Set the plain text part of the mail
      *
      * You probably want to use setBody() instead
+     *
+     * @param string $text
      */
     public function setText($text) {
         $this->text = $text;
@@ -340,8 +349,8 @@ class Mailer {
      * Example:
      *   cc("föö <foo@bar.com>, me@somewhere.com","TBcc");
      *
-     * @param string|array  $addresses Multiple adresses separated by commas or as array
-     * @return bool|string  the prepared header (can contain multiple lines)
+     * @param string|string[]  $addresses Multiple adresses separated by commas or as array
+     * @return false|string  the prepared header (can contain multiple lines)
      */
     public function cleanAddress($addresses) {
         // No named recipients for To: in Windows (see FS#652)
@@ -418,6 +427,8 @@ class Mailer {
      * Prepare the mime multiparts for all attachments
      *
      * Replaces placeholders in the HTML with the correct CIDs
+     *
+     * @return string mime multiparts
      */
     protected function prepareAttachments() {
         $mime = '';
@@ -565,9 +576,9 @@ class Mailer {
     /**
      * Returns a complete, EOL terminated header line, wraps it if necessary
      *
-     * @param $key
-     * @param $val
-     * @return string
+     * @param string $key
+     * @param string $val
+     * @return string line
      */
     protected function wrappedHeaderLine($key, $val){
         return wordwrap("$key: $val", 78, MAILHEADER_EOL.'  ').MAILHEADER_EOL;
diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index db6a3a77c..15f896dcf 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -16,8 +16,9 @@ class PassHash {
      * match true is is returned else false
      *
      * @author  Andreas Gohr <andi@splitbrain.org>
-     * @param $clear string Clear-Text password
-     * @param $hash  string Hash to compare against
+     *
+     * @param string $clear Clear-Text password
+     * @param string $hash  Hash to compare against
      * @return  bool
      */
     function verify_hash($clear, $hash) {
@@ -109,9 +110,9 @@ class PassHash {
      * If $salt is not null, the value is kept, but the lenght restriction is
      * applied (unless, $cut is false).
      *
-     * @param string &$salt The salt, pass null if you want one generated
-     * @param int    $len   The length of the salt
-     * @param bool   $cut   Apply length restriction to existing salt?
+     * @param string|null &$salt  The salt, pass null if you want one generated
+     * @param int          $len   The length of the salt
+     * @param bool         $cut   Apply length restriction to existing salt?
      */
     public function init_salt(&$salt, $len = 32, $cut = true) {
         if(is_null($salt)) {
@@ -135,6 +136,7 @@ class PassHash {
      * @author Andreas Gohr <andi@splitbrain.org>
      * @author <mikey_nich at hotmail dot com>
      * @link   http://de.php.net/manual/en/function.crypt.php#73619
+     *
      * @param string $clear The clear text to hash
      * @param string $salt  The salt to use, null for random
      * @return string Hashed password
@@ -175,6 +177,7 @@ class PassHash {
      *
      * @author <mikey_nich at hotmail dot com>
      * @link   http://de.php.net/manual/en/function.crypt.php#73619
+     *
      * @param string $clear The clear text to hash
      * @param string $salt  The salt to use, null for random
      * @param string $magic The hash identifier (apr1 or 1)
@@ -337,6 +340,7 @@ class PassHash {
      * an exception.
      *
      * @link  http://www.openwall.com/phpass/
+     *
      * @param string $clear   The clear text to hash
      * @param string $salt    The salt to use, null for random
      * @param string $magic   The hash identifier (P or H)
@@ -404,6 +408,7 @@ class PassHash {
      * This is used by the Django Python framework
      *
      * @link http://docs.djangoproject.com/en/dev/topics/auth/#passwords
+     *
      * @param string $clear The clear text to hash
      * @param string $salt  The salt to use, null for random
      * @return string Hashed password
@@ -420,6 +425,7 @@ class PassHash {
      * This is used by the Django Python framework
      *
      * @link http://docs.djangoproject.com/en/dev/topics/auth/#passwords
+     *
      * @param string $clear The clear text to hash
      * @param string $salt  The salt to use, null for random
      * @return string Hashed password
@@ -486,6 +492,7 @@ class PassHash {
      * method 'A' is not supported.
      *
      * @link  http://www.mediawiki.org/wiki/Manual_talk:User_table#user_password_column
+     *
      * @param string $clear The clear text to hash
      * @param string $salt  The salt to use, null for random
      * @return string Hashed password
@@ -511,7 +518,6 @@ class PassHash {
      * @param string $data Message to be hashed.
      * @param string $key  Shared secret key used for generating the HMAC variant of the message digest.
      * @param bool $raw_output When set to TRUE, outputs raw binary data. FALSE outputs lowercase hexits.
-     *
      * @return string
      */
     public static function hmac($algo, $data, $key, $raw_output = false) {
@@ -545,9 +551,8 @@ class PassHash {
     /**
      * Use DokuWiki's secure random generator if available
      *
-     * @param $min
-     * @param $max
-     *
+     * @param int $min
+     * @param int $max
      * @return int
      */
     protected function random($min, $max){
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index 8c7a0e846..b34fe7f20 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -13,6 +13,11 @@ class RemoteAPICore {
         $this->api = $api;
     }
 
+    /**
+     * Returns details about the core methods
+     *
+     * @return array
+     */
     function __getRemoteInfo() {
         return array(
             'dokuwiki.getVersion' => array(
@@ -158,19 +163,27 @@ class RemoteAPICore {
         );
     }
 
+    /**
+     * @return string
+     */
     function getVersion() {
         return getVersion();
     }
 
+    /**
+     * @return int unix timestamp
+     */
     function getTime() {
         return time();
     }
 
     /**
      * Return a raw wiki page
+     *
      * @param string $id wiki page id
-     * @param string $rev revision number of the page
-     * @return page text.
+     * @param int|string $rev revision timestamp of the page or empty string
+     * @return string page text.
+     * @throws RemoteAccessDeniedException if no permission for page
      */
     function rawPage($id,$rev=''){
         $id = $this->resolvePageId($id);
@@ -189,8 +202,11 @@ class RemoteAPICore {
      * Return a media file
      *
      * @author Gina Haeussge <osd@foosel.net>
+     *
      * @param string $id file id
-     * @return media file
+     * @return mixed media file
+     * @throws RemoteAccessDeniedException no permission for media
+     * @throws RemoteException not exist
      */
     function getAttachment($id){
         $id = cleanID($id);
@@ -211,6 +227,9 @@ class RemoteAPICore {
      * Return info about a media file
      *
      * @author Gina Haeussge <osd@foosel.net>
+     *
+     * @param string $id page id
+     * @return array
      */
     function getAttachmentInfo($id){
         $id = cleanID($id);
@@ -230,6 +249,11 @@ class RemoteAPICore {
 
     /**
      * Return a wiki page rendered to html
+     *
+     * @param string     $id  page id
+     * @param string|int $rev revision timestamp or empty string
+     * @return null|string html
+     * @throws RemoteAccessDeniedException no access to page
      */
     function htmlPage($id,$rev=''){
         $id = $this->resolvePageId($id);
@@ -241,6 +265,8 @@ class RemoteAPICore {
 
     /**
      * List all pages - we use the indexer list here
+     *
+     * @return array
      */
     function listPages(){
         $list  = array();
@@ -265,6 +291,12 @@ class RemoteAPICore {
 
     /**
      * List all pages in the given namespace (and below)
+     *
+     * @param string $ns
+     * @param array  $opts
+     *    $opts['depth']   recursion level, 0 for all
+     *    $opts['hash']    do md5 sum of content?
+     * @return array
      */
     function readNamespace($ns,$opts){
         global $conf;
@@ -281,6 +313,9 @@ class RemoteAPICore {
 
     /**
      * List all pages in the given namespace (and below)
+     *
+     * @param string $query
+     * @return array
      */
     function search($query){
         $regex = '';
@@ -314,6 +349,8 @@ class RemoteAPICore {
 
     /**
      * Returns the wiki title.
+     *
+     * @return string
      */
     function getTitle(){
         global $conf;
@@ -328,6 +365,15 @@ class RemoteAPICore {
      * a regular expression matching their name.
      *
      * @author Gina Haeussge <osd@foosel.net>
+     *
+     * @param string $ns
+     * @param array  $options
+     *   $options['depth']     recursion level, 0 for all
+     *   $options['showmsg']   shows message if invalid media id is used
+     *   $options['pattern']   check given pattern
+     *   $options['hash']      add hashes to result list
+     * @return array
+     * @throws RemoteAccessDeniedException no access to the media files
      */
     function listAttachments($ns, $options = array()) {
         global $conf;
@@ -359,6 +405,9 @@ class RemoteAPICore {
 
     /**
      * Return a list of backlinks
+     *
+     * @param string $id page id
+     * @return array
      */
     function listBackLinks($id){
         return ft_backlinks($this->resolvePageId($id));
@@ -366,6 +415,12 @@ class RemoteAPICore {
 
     /**
      * Return some basic data about a page
+     *
+     * @param string     $id page id
+     * @param string|int $rev revision timestamp or empty string
+     * @return array
+     * @throws RemoteAccessDeniedException no access for page
+     * @throws RemoteException page not exist
      */
     function pageInfo($id,$rev=''){
         $id = $this->resolvePageId($id);
@@ -395,6 +450,13 @@ class RemoteAPICore {
      * Save a wiki page
      *
      * @author Michael Klier <chi@chimeric.de>
+     *
+     * @param string $id page id
+     * @param string $text wiki text
+     * @param array $params parameters: summary, minor edit
+     * @return bool
+     * @throws RemoteAccessDeniedException no write access for page
+     * @throws RemoteException no id, empty new page or locked
      */
     function putPage($id, $text, $params) {
         global $TEXT;
@@ -451,6 +513,11 @@ class RemoteAPICore {
 
     /**
      * Appends text to a wiki page.
+     *
+     * @param string $id page id
+     * @param string $text wiki text
+     * @param array $params such as summary,minor
+     * @return bool|string
      */
     function appendPage($id, $text, $params) {
         $currentpage = $this->rawPage($id);
@@ -464,6 +531,12 @@ class RemoteAPICore {
      * Uploads a file to the wiki.
      *
      * Michael Klier <chi@chimeric.de>
+     *
+     * @param string $id page id
+     * @param string $file
+     * @param array $params such as overwrite
+     * @return false|string
+     * @throws RemoteException
      */
     function putAttachment($id, $file, $params) {
         $id = cleanID($id);
@@ -493,6 +566,11 @@ class RemoteAPICore {
      * Deletes a file from the wiki.
      *
      * @author Gina Haeussge <osd@foosel.net>
+     *
+     * @param string $id page id
+     * @return int
+     * @throws RemoteAccessDeniedException no permissions
+     * @throws RemoteException file in use or not deleted
      */
     function deleteAttachment($id){
         $id = cleanID($id);
@@ -511,6 +589,9 @@ class RemoteAPICore {
 
     /**
      * Returns the permissions of a given wiki page
+     *
+     * @param string $id page id
+     * @return int permission level
      */
     function aclCheck($id) {
         $id = $this->resolvePageId($id);
@@ -521,6 +602,10 @@ class RemoteAPICore {
      * Lists all links contained in a wiki page
      *
      * @author Michael Klier <chi@chimeric.de>
+     *
+     * @param string $id page id
+     * @return array
+     * @throws RemoteAccessDeniedException  no read access for page
      */
     function listLinks($id) {
         $id = $this->resolvePageId($id);
@@ -571,6 +656,10 @@ class RemoteAPICore {
      *
      * @author Michael Hamann <michael@content-space.de>
      * @author Michael Klier <chi@chimeric.de>
+     *
+     * @param int $timestamp unix timestamp
+     * @return array
+     * @throws RemoteException no valid timestamp
      */
     function getRecentChanges($timestamp) {
         if(strlen($timestamp) != 10) {
@@ -596,7 +685,7 @@ class RemoteAPICore {
             return $changes;
         } else {
             // in case we still have nothing at this point
-            return new RemoteException('There are no changes in the specified timeframe', 321);
+            throw new RemoteException('There are no changes in the specified timeframe', 321);
         }
     }
 
@@ -605,6 +694,10 @@ class RemoteAPICore {
      *
      * @author Michael Hamann <michael@content-space.de>
      * @author Michael Klier <chi@chimeric.de>
+     *
+     * @param int $timestamp unix timestamp
+     * @return array
+     * @throws RemoteException no valid timestamp
      */
     function getRecentMediaChanges($timestamp) {
         if(strlen($timestamp) != 10)
@@ -637,6 +730,12 @@ class RemoteAPICore {
      * Returns a list of available revisions of a given wiki page
      *
      * @author Michael Klier <chi@chimeric.de>
+     *
+     * @param string $id    page id
+     * @param int    $first skip the first n changelog lines
+     * @return array
+     * @throws RemoteAccessDeniedException no read access for page
+     * @throws RemoteException empty id
      */
     function pageVersions($id, $first) {
         $id = $this->resolvePageId($id);
@@ -714,6 +813,9 @@ class RemoteAPICore {
      *
      * Returns an associative array with the keys locked, lockfail, unlocked and
      * unlockfail, each containing lists of pages.
+     *
+     * @param array[] $set list pages with array('lock' => array, 'unlock' => array)
+     * @return array
      */
     function setLocks($set){
         $locked     = array();
@@ -748,13 +850,27 @@ class RemoteAPICore {
         );
     }
 
+    /**
+     * Return API version
+     *
+     * @return int
+     */
     function getAPIVersion(){
         return DOKU_API_VERSION;
     }
 
+    /**
+     * Login
+     *
+     * @param string $user
+     * @param string $pass
+     * @return int
+     */
     function login($user,$pass){
         global $conf;
+        /** @var DokuWiki_Auth_Plugin $auth */
         global $auth;
+
         if(!$conf['useacl']) return 0;
         if(!$auth) return 0;
 
@@ -775,6 +891,11 @@ class RemoteAPICore {
         return $ok;
     }
 
+    /**
+     * Log off
+     *
+     * @return int
+     */
     function logoff(){
         global $conf;
         global $auth;
@@ -786,6 +907,12 @@ class RemoteAPICore {
         return 1;
     }
 
+    /**
+     * Resolve page id
+     *
+     * @param string $id page id
+     * @return string
+     */
     private function resolvePageId($id) {
         $id = cleanID($id);
         if(empty($id)) {
diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php
index 33f6d7a36..0325f6d44 100644
--- a/inc/Sitemapper.php
+++ b/inc/Sitemapper.php
@@ -24,6 +24,8 @@ class Sitemapper {
      * @author Andreas Gohr
      * @link   https://www.google.com/webmasters/sitemaps/docs/en/about.html
      * @link   http://www.sitemaps.org/
+     *
+     * @return bool
      */
     public static function generate(){
         global $conf;
@@ -75,6 +77,7 @@ class Sitemapper {
      *
      * @param $items array The SitemapItems that shall be included in the sitemap.
      * @return string The sitemap XML.
+     *
      * @author Michael Hamann
      */
     private static function getXML($items) {
@@ -95,6 +98,7 @@ class Sitemapper {
      * Helper function for getting the path to the sitemap file.
      *
      * @return string The path to the sitemap file.
+     *
      * @author Michael Hamann
      */
     public static function getFilePath() {
@@ -123,6 +127,8 @@ class Sitemapper {
      * urls to ping using the SITEMAP_PING event.
      *
      * @author Michael Hamann
+     *
+     * @return bool
      */
     public static function pingSearchEngines() {
         //ping search engines...
@@ -168,9 +174,9 @@ class SitemapItem {
     /**
      * Create a new item.
      *
-     * @param $url string The url of the item
-     * @param $lastmod int Timestamp of the last modification
-     * @param $changefreq string How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never.
+     * @param string $url        The url of the item
+     * @param int    $lastmod    Timestamp of the last modification
+     * @param string $changefreq How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never.
      * @param $priority float|string The priority of the item relative to other URLs on your site. Valid values range from 0.0 to 1.0.
      */
     public function __construct($url, $lastmod, $changefreq = null, $priority = null) {
@@ -183,9 +189,9 @@ class SitemapItem {
     /**
      * Helper function for creating an item for a wikipage id.
      *
-     * @param $id string A wikipage id.
-     * @param $changefreq string How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never.
-     * @param $priority float|string The priority of the item relative to other URLs on your site. Valid values     range from 0.0 to 1.0.
+     * @param string       $id         A wikipage id.
+     * @param string       $changefreq How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never.
+     * @param float|string $priority   The priority of the item relative to other URLs on your site. Valid values     range from 0.0 to 1.0.
      * @return SitemapItem The sitemap item.
      */
     public static function createFromID($id, $changefreq = null, $priority = null) {
diff --git a/inc/Tar.class.php b/inc/Tar.class.php
index 8c7d33fc1..05831df58 100644
--- a/inc/Tar.class.php
+++ b/inc/Tar.class.php
@@ -105,6 +105,9 @@ class Tar {
      *
      * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams.
      * Reopen the file with open() again if you want to do additional operations
+     *
+     * @return array
+     * @throws TarIOException
      */
     public function contents() {
         if($this->closed || !$this->file) throw new TarIOException('Can not read from a closed archive');
@@ -270,6 +273,7 @@ class Tar {
      * Add a file to the current TAR archive using an existing file in the filesystem
      *
      * @todo handle directory adding
+     *
      * @param string $file the original file
      * @param string $name the name to use for the file in the archive
      * @throws TarIOException
@@ -377,6 +381,10 @@ class Tar {
      * Returns the created in-memory archive data
      *
      * This implicitly calls close() on the Archive
+     *
+     * @param int $comptype
+     * @param int $complevel
+     * @return mixed|string
      */
     public function getArchive($comptype = Tar::COMPRESS_AUTO, $complevel = 9) {
         $this->close();
@@ -395,7 +403,7 @@ class Tar {
      * Note: It more memory effective to specify the filename in the create() function and
      * let the library work on the new file directly.
      *
-     * @param     $file
+     * @param string $file
      * @param int $comptype
      * @param int $complevel
      * @throws TarIOException
@@ -571,7 +579,7 @@ class Tar {
     /**
      * Cleans up a path and removes relative parts, also strips leading slashes
      *
-     * @param string $p_dir
+     * @param string $path
      * @return string
      */
     public function cleanPath($path) {
@@ -591,7 +599,7 @@ class Tar {
     /**
      * Checks if the given compression type is available and throws an exception if not
      *
-     * @param $comptype
+     * @param int $comptype
      * @throws TarIllegalCompressionException
      */
     protected function compressioncheck($comptype) {
diff --git a/inc/actions.php b/inc/actions.php
index 5cf63a6ca..68b71a36a 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -221,6 +221,9 @@ function act_sendheaders($headers) {
  * Sanitize the action command
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array|string $act
+ * @return string
  */
 function act_clean($act){
     // check if the action was given as array key
@@ -245,6 +248,9 @@ function act_clean($act){
  * Add all allowed commands here.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array|string $act
+ * @return string
  */
 function act_validate($act) {
     global $conf;
@@ -284,10 +290,12 @@ function act_validate($act) {
  * Run permissionchecks
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_permcheck($act){
     global $INFO;
-    global $conf;
 
     if(in_array($act,array('save','preview','edit','recover'))){
         if($INFO['exists']){
@@ -330,6 +338,9 @@ function act_permcheck($act){
  * Handle 'draftdel'
  *
  * Deletes the draft for the current page and user
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_draftdel($act){
     global $INFO;
@@ -342,6 +353,9 @@ function act_draftdel($act){
  * Saves a draft on preview
  *
  * @todo this currently duplicates code from ajax.php :-/
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_draftsave($act){
     global $INFO;
@@ -372,6 +386,9 @@ function act_draftsave($act){
  * returns a new action.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_save($act){
     global $ID;
@@ -410,6 +427,9 @@ function act_save($act){
  * Revert to a certain revision
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_revert($act){
     global $ID;
@@ -457,6 +477,9 @@ function act_revert($act){
  * Do a redirect after receiving post data
  *
  * Tries to add the section id as hash mark after section editing
+ *
+ * @param string $id page id
+ * @param string $preact action command before redirect
  */
 function act_redirect($id,$preact){
     global $PRE;
@@ -478,7 +501,7 @@ function act_redirect($id,$preact){
 /**
  * Execute the redirect
  *
- * @param array $opts id and fragment for the redirect
+ * @param array $opts id and fragment for the redirect and the preact
  */
 function act_redirect_execute($opts){
     $go = wl($opts['id'],'',true);
@@ -492,6 +515,9 @@ function act_redirect_execute($opts){
  * Handle 'login', 'logout'
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_auth($act){
     global $ID;
@@ -527,6 +553,9 @@ function act_auth($act){
  * Handle 'edit', 'preview', 'recover'
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_edit($act){
     global $ID;
@@ -591,6 +620,9 @@ function act_edit($act){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
+ *
+ * @param string $act action command
+ * @return string action command
  */
 function act_export($act){
     global $ID;
@@ -671,6 +703,8 @@ function act_export($act){
  * Handle sitemap delivery
  *
  * @author Michael Hamann <michael@content-space.de>
+ *
+ * @param string $act action command
  */
 function act_sitemap($act) {
     global $conf;
@@ -719,6 +753,10 @@ function act_sitemap($act) {
  * Throws exception on error.
  *
  * @author Adrian Lang <lang@cosmocode.de>
+ *
+ * @param string $act action command
+ * @return string action command
+ * @throws Exception if (un)subscribing fails
  */
 function act_subscription($act){
     global $lang;
@@ -778,6 +816,9 @@ function act_subscription($act){
  * default action for the event ACTION_HANDLE_SUBSCRIBE.
  *
  * @author Adrian Lang <lang@cosmocode.de>
+ *
+ * @param array &$params the parameters: target, style and action
+ * @throws Exception
  */
 function subscription_handle_post(&$params) {
     global $INFO;
diff --git a/inc/auth.php b/inc/auth.php
index dc2b6cad8..3a6a2f65a 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -127,6 +127,7 @@ function auth_setup() {
  * Loads the ACL setup and handle user wildcards
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @return array
  */
 function auth_loadACL() {
@@ -173,7 +174,7 @@ function auth_loadACL() {
 /**
  * Event hook callback for AUTH_LOGIN_CHECK
  *
- * @param $evdata
+ * @param array $evdata
  * @return bool
  */
 function auth_login_wrapper($evdata) {
@@ -280,6 +281,7 @@ function auth_login($user, $pass, $sticky = false, $silent = false) {
  * token is correct. Will exit with a 401 Status if not.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param  string $token The authentication token
  * @return boolean true (or will exit on failure)
  */
@@ -307,6 +309,7 @@ function auth_validateToken($token) {
  * NOTE: this is completely unrelated to the getSecurityToken() function
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @return string The auth token
  */
 function auth_createToken() {
@@ -351,6 +354,7 @@ function auth_browseruid() {
  * and stored in this file.
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
  * @param   bool $addsession if true, the sessionid is added to the salt
  * @param   bool $secure     if security is more important than keeping the old value
  * @return  string
@@ -378,6 +382,7 @@ function auth_cookiesalt($addsession = false, $secure = false) {
  * @author Mark Seecof
  * @author Michael Hamann <michael@content-space.de>
  * @link   http://www.php.net/manual/de/function.mt-rand.php#83655
+ *
  * @param int $length number of bytes to get
  * @return string binary random strings
  */
@@ -444,6 +449,7 @@ function auth_randombytes($length) {
  *
  * @author Michael Samuel
  * @author Michael Hamann <michael@content-space.de>
+ *
  * @param int $min
  * @param int $max
  * @return int
@@ -515,6 +521,7 @@ function auth_decrypt($ciphertext, $secret) {
  * off. It also clears session data.
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
  * @param bool $keepbc - when true, the breadcrumb data is not cleared
  */
 function auth_logoff($keepbc = false) {
@@ -555,6 +562,7 @@ function auth_logoff($keepbc = false) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @see    auth_isadmin
+ *
  * @param  string $user       Username
  * @param  array  $groups     List of groups the user is in
  * @param  bool   $adminonly  when true checks if user is admin
@@ -599,6 +607,7 @@ function auth_ismanager($user = null, $groups = null, $adminonly = false) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @see auth_ismanager()
+ *
  * @param  string $user       Username
  * @param  array  $groups     List of groups the user is in
  * @return bool
@@ -613,9 +622,9 @@ function auth_isadmin($user = null, $groups = null) {
  *
  * Note: all input should NOT be nameencoded.
  *
- * @param $memberlist string commaseparated list of allowed users and groups
- * @param $user       string user to match against
- * @param $groups     array  groups the user is member of
+ * @param string $memberlist commaseparated list of allowed users and groups
+ * @param string $user       user to match against
+ * @param array  $groups     groups the user is member of
  * @return bool       true for membership acknowledged
  */
 function auth_isMember($memberlist, $user, array $groups) {
@@ -678,6 +687,7 @@ function auth_quickaclcheck($id) {
  * Returns the maximum rights a user has for the given ID or its namespace
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
  * @triggers AUTH_ACL_CHECK
  * @param  string       $id     page ID (needs to be resolved and cleaned)
  * @param  string       $user   Username
@@ -700,6 +710,7 @@ function auth_aclcheck($id, $user, $groups) {
  * DO NOT CALL DIRECTLY, use auth_aclcheck() instead
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
  * @param  array $data event data
  * @return int   permission level
  */
@@ -832,6 +843,10 @@ function auth_aclcheck_cb($data) {
  *
  * @author Andreas Gohr <gohr@cosmocode.de>
  * @see rawurldecode()
+ *
+ * @param string $name
+ * @param bool $skip_group
+ * @return string
  */
 function auth_nameencode($name, $skip_group = false) {
     global $cache_authname;
@@ -913,6 +928,7 @@ function auth_pwgen($foruser = '') {
  * Sends a password to the given user
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $user Login name of the user
  * @param string $password The new password in clear text
  * @return bool  true on success
@@ -948,6 +964,7 @@ function auth_sendPassword($user, $password) {
  * This registers a new user - Data is read directly from $_POST
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
  * @return bool  true on success, false on any error
  */
 function register() {
@@ -1280,6 +1297,7 @@ function act_resendpwd() {
  * is chosen.
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $clear The clear text password
  * @param string $method The hashing method
  * @param string $salt A salt, null for random
@@ -1304,6 +1322,7 @@ function auth_cryptPassword($clear, $method = '', $salt = null) {
  * Verifies a cleartext password against a crypted hash
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param  string $clear The clear text password
  * @param  string $crypt The hash to compare with
  * @return bool true if both match
diff --git a/inc/blowfish.php b/inc/blowfish.php
index bcf5804a2..7499515bc 100644
--- a/inc/blowfish.php
+++ b/inc/blowfish.php
@@ -356,7 +356,7 @@ class Horde_Cipher_blowfish
      * Encrypt a block on data.
      *
      * @param String $block         The data to encrypt
-     * @param optional String $key  The key to use
+     * @param String $key  optional The key to use
      *
      * @return String the encrypted output
      */
@@ -404,8 +404,8 @@ class Horde_Cipher_blowfish
     /**
      * Decrypt a block on data.
      *
-     * @param String $block         The data to decrypt
-     * @param optional String $key  The key to use
+     * @param String $block          The data to decrypt
+     * @param String $key   optional The key to use
      *
      * @return String the decrypted output
      */
@@ -452,6 +452,7 @@ class Horde_Cipher_blowfish
     /**
      * Converts a text key into an array.
      *
+     * @param string $key
      * @return array  The key.
      */
     function _formatKey($key) {
@@ -464,8 +465,8 @@ class Horde_Cipher_blowfish
 /**
  * Encryption using blowfish algorithm
  *
- * @param   string  original data
- * @param   string  the secret
+ * @param   string  $data   original data
+ * @param   string  $secret the secret
  *
  * @return  string  the encrypted result
  *
@@ -493,8 +494,8 @@ function PMA_blowfish_encrypt($data, $secret) {
 /**
  * Decryption using blowfish algorithm
  *
- * @param   string  encrypted data
- * @param   string  the secret
+ * @param   string  $encdata encrypted data
+ * @param   string  $secret  the secret
  *
  * @return  string  original data
  *
diff --git a/inc/changelog.php b/inc/changelog.php
index 8c14f21b0..e2826e4b3 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -725,8 +725,10 @@ abstract class ChangeLog {
      * If file larger than $chuncksize, only chunck is read that could contain $rev.
      *
      * @param int $rev   revision timestamp
-     * @return array(fp, array(changeloglines), $head, $tail, $eof)|bool
-     *     returns false when not succeed. fp only defined for chuck reading, needs closing.
+     * @return array|false
+     *     if success returns array(fp, array(changeloglines), $head, $tail, $eof)
+     *     where fp only defined for chuck reading, needs closing.
+     *     otherwise false
      */
     protected function readloglines($rev) {
         $file = $this->getChangelogFilename();
diff --git a/inc/cli.php b/inc/cli.php
index 25bfddf7d..29d76ece1 100644
--- a/inc/cli.php
+++ b/inc/cli.php
@@ -108,7 +108,7 @@ abstract class DokuCLI {
     /**
      * Print an error message
      *
-     * @param $string
+     * @param string $string
      */
     public function error($string) {
         $this->colors->ptln("E: $string", 'red', STDERR);
@@ -117,7 +117,7 @@ abstract class DokuCLI {
     /**
      * Print a success message
      *
-     * @param $string
+     * @param string $string
      */
     public function success($string) {
         $this->colors->ptln("S: $string", 'green', STDERR);
@@ -126,7 +126,7 @@ abstract class DokuCLI {
     /**
      * Print an info message
      *
-     * @param $string
+     * @param string $string
      */
     public function info($string) {
         $this->colors->ptln("I: $string", 'cyan', STDERR);
@@ -199,8 +199,8 @@ class DokuCLI_Colors {
     /**
      * Convenience function to print a line in a given color
      *
-     * @param          $line
-     * @param          $color
+     * @param string   $line
+     * @param string   $color
      * @param resource $channel
      */
     public function ptln($line, $color, $channel = STDOUT) {
@@ -470,8 +470,8 @@ class DokuCLI_Options {
      * Can only be used after parseOptions() has been run
      *
      * @param string $option
-     * @param mixed  $default what to return if the option was not set
-     * @return mixed
+     * @param bool|string $default what to return if the option was not set
+     * @return false|string
      */
     public function getOpt($option, $default = false) {
         if(isset($this->options[$option])) return $this->options[$option];
@@ -593,8 +593,8 @@ class DokuCLI_Options {
     /**
      * Displays text in multiple word wrapped columns
      *
-     * @param array $widths list of column widths (in characters)
-     * @param array $texts  list of texts for each column
+     * @param int[]    $widths list of column widths (in characters)
+     * @param string[] $texts  list of texts for each column
      * @return string
      */
     private function tableFormat($widths, $texts) {
@@ -640,6 +640,11 @@ class DokuCLI_Exception extends Exception {
     const E_OPT_ABIGUOUS = 4; //Option abiguous
     const E_ARG_READ = 5; //Could not read argv
 
+    /**
+     * @param string    $message     The Exception message to throw.
+     * @param int       $code        The Exception code
+     * @param Exception $previous    The previous exception used for the exception chaining.
+     */
     public function __construct($message = "", $code = 0, Exception $previous = null) {
         if(!$code) $code = DokuCLI_Exception::E_ANY;
         parent::__construct($message, $code, $previous);
diff --git a/inc/common.php b/inc/common.php
index 91a068bb0..444e90198 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -49,7 +49,7 @@ function ptln($string, $indent = 0) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  *
- * @param $string string being stripped
+ * @param string $string being stripped
  * @return string
  */
 function stripctl($string) {
@@ -62,6 +62,7 @@ function stripctl($string) {
  * @author  Andreas Gohr <andi@splitbrain.org>
  * @link    http://en.wikipedia.org/wiki/Cross-site_request_forgery
  * @link    http://christ1an.blogspot.com/2007/04/preventing-csrf-efficiently.html
+ *
  * @return  string
  */
 function getSecurityToken() {
@@ -95,7 +96,7 @@ function checkSecurityToken($token = null) {
  * @author  Andreas Gohr <andi@splitbrain.org>
  *
  * @param bool $print  if true print the field, otherwise html of the field is returned
- * @return void|string html of hidden form field
+ * @return string html of hidden form field
  */
 function formSecurityToken($print = true) {
     $ret = '<div class="no"><input type="hidden" name="sectok" value="'.getSecurityToken().'" /></div>'."\n";
@@ -336,7 +337,7 @@ function buildAttributes($params, $skipempty = false) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  *
- * @return array(pageid=>name, ... )
+ * @return string[string] with the data: array(pageid=>name, ... )
  */
 function breadcrumbs() {
     // we prepare the breadcrumbs early for quick session closing
@@ -1110,7 +1111,7 @@ function parsePageTemplate(&$data) {
  * @param string $range in form "from-to"
  * @param string $id    page id
  * @param string $rev   optional, the revision timestamp
- * @return array with three slices
+ * @return string[] with three slices
  */
 function rawWikiSlices($range, $id, $rev = '') {
     $text = io_readWikiPage(wikiFN($id, $rev), $id, $rev);
@@ -1296,7 +1297,7 @@ function saveOldRevision($id) {
  * @param int|string $rev Old page revision
  * @param string     $summary  What changed
  * @param boolean    $minor    Is this a minor edit?
- * @param array      $replace  Additional string substitutions, @KEY@ to be replaced by value
+ * @param string[]   $replace  Additional string substitutions, @KEY@ to be replaced by value
  * @return bool
  *
  * @author Andreas Gohr <andi@splitbrain.org>
@@ -1376,8 +1377,8 @@ function getGoogleQuery() {
 /**
  * Return the human readable size of a file
  *
- * @param       int $size A file size
- * @param       int $dec A number of decimal places
+ * @param int $size A file size
+ * @param int $dec A number of decimal places
  * @return string human readable size
  *
  * @author      Martin Benjamin <b.martin@cybernet.ch>
@@ -1914,7 +1915,7 @@ function set_doku_pref($pref, $val) {
 /**
  * Strips source mapping declarations from given text #601
  *
- * @param &string $text reference to the CSS or JavaScript code to clean
+ * @param string &$text reference to the CSS or JavaScript code to clean
  */
 function stripsourcemaps(&$text){
     $text = preg_replace('/^(\/\/|\/\*)[@#]\s+sourceMappingURL=.*?(\*\/)?$/im', '\\1\\2', $text);
diff --git a/inc/confutils.php b/inc/confutils.php
index 31371d41f..85bf5128c 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -14,6 +14,10 @@
  * are returned.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file file name
+ * @param bool   $knownonly
+ * @return array with extension, mimetype and if it should be downloaded
  */
 function mimetype($file, $knownonly=true){
     $mtypes = getMimeTypes();     // known mimetypes
diff --git a/inc/events.php b/inc/events.php
index 318a7617e..4cd06b9f9 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -165,13 +165,13 @@ class Doku_Event_Handler {
      *
      * register a hook for an event
      *
-     * @param  $event   string   name used by the event, (incl '_before' or '_after' for triggers)
-     * @param  $advise  string
-     * @param  $obj     object   object in whose scope method is to be executed,
+     * @param  string   $event   string   name used by the event, (incl '_before' or '_after' for triggers)
+     * @param  string   $advise
+     * @param  object   $obj     object in whose scope method is to be executed,
      *                             if NULL, method is assumed to be a globally available function
-     * @param  $method  string   event handler function
-     * @param  $param   mixed    data passed to the event handler
-     * @param  $seq     int      sequence number for ordering hook execution (ascending)
+     * @param  string   $method  event handler function
+     * @param  mixed    $param   data passed to the event handler
+     * @param  int      $seq     sequence number for ordering hook execution (ascending)
      */
     function register_hook($event, $advise, $obj, $method, $param=null, $seq=0) {
         $seq = (int)$seq;
@@ -216,14 +216,14 @@ class Doku_Event_Handler {
  *
  * function wrapper to process (create, trigger and destroy) an event
  *
- * @param  $name               string   name for the event
- * @param  $data               mixed    event data
- * @param  $action             callback (optional, default=NULL) default action, a php callback function
- * @param  $canPreventDefault  bool     (optional, default=true) can hooks prevent the default action
+ * @param  string   $name               name for the event
+ * @param  mixed    $data               event data
+ * @param  callback $action             (optional, default=NULL) default action, a php callback function
+ * @param  bool     $canPreventDefault  (optional, default=true) can hooks prevent the default action
  *
  * @return mixed                        the event results value after all event processing is complete
- *                                         by default this is the return value of the default action however
- *                                         it can be set or modified by event handler hooks
+ *                                      by default this is the return value of the default action however
+ *                                      it can be set or modified by event handler hooks
  */
 function trigger_event($name, &$data, $action=null, $canPreventDefault=true) {
 
diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index c61c54503..70becc01e 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -16,6 +16,7 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
  * @author Gerry Weissbach <dokuwiki@gammaproduction.de>
+ *
  * @param string $file   local file to send
  * @param string $mime   mime type of the file
  * @param bool   $dl     set to true to force a browser download
@@ -96,12 +97,13 @@ function sendFile($file, $mime, $dl, $cache, $public = false, $orig = null) {
  * WRITE: MEDIA, FILE, array( STATUS, STATUSMESSAGE )
  *
  * @author Gerry Weissbach <gerry.w@gammaproduction.de>
+ *
  * @param string $media  reference to the media id
  * @param string $file   reference to the file variable
  * @param string $rev
  * @param int    $width
  * @param int    $height
- * @return array(STATUS, STATUSMESSAGE)
+ * @return array as array(STATUS, STATUSMESSAGE)
  */
 function checkFileStatus(&$media, &$file, $rev = '', $width=0, $height=0) {
     global $MIME, $EXT, $CACHE, $INPUT;
@@ -149,6 +151,9 @@ function checkFileStatus(&$media, &$file, $rev = '', $width=0, $height=0) {
  * Resolves named constants
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $cache
+ * @return int cachetime in seconds
  */
 function calc_cache($cache) {
     global $conf;
diff --git a/inc/form.php b/inc/form.php
index fadc71d3e..00eea9b3a 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -52,6 +52,7 @@ class Doku_Form {
      * @param bool|string $action  (optional, deprecated) submit URL, defaults to current page
      * @param bool|string $method  (optional, deprecated) 'POST' or 'GET', default is POST
      * @param bool|string $enctype (optional, deprecated) Encoding type of the data
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function Doku_Form($params, $action=false, $method=false, $enctype=false) {
@@ -84,6 +85,7 @@ class Doku_Form {
      * Usually results in a border drawn around the form.
      *
      * @param   string  $legend Label that will be printed with the border.
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function startFieldset($legend) {
@@ -115,6 +117,7 @@ class Doku_Form {
      *
      * @param   string  $name   Field name.
      * @param   string  $value  Field value. If null, remove a previously added field.
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function addHidden($name, $value) {
@@ -132,6 +135,7 @@ class Doku_Form {
      * If string, it is printed without escaping special chars.   *
      *
      * @param   string|array  $elem   Pseudo-tag or string to add to the form.
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function addElement($elem) {
@@ -145,6 +149,7 @@ class Doku_Form {
      *
      * @param   string       $pos  0-based index where the element will be inserted.
      * @param   string|array $elem Pseudo-tag or string to add to the form.
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function insertElement($pos, $elem) {
@@ -158,6 +163,7 @@ class Doku_Form {
      *
      * @param   int          $pos  0-based index the element will be placed at.
      * @param   string|array $elem Pseudo-tag or string to add to the form.
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function replaceElement($pos, $elem) {
@@ -172,7 +178,8 @@ class Doku_Form {
      * Gets the position of the first of a type of element.
      *
      * @param   string  $type   Element type to look for.
-     * @return  int     position of element if found, otherwise false
+     * @return  int|false     position of element if found, otherwise false
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function findElementByType($type) {
@@ -189,7 +196,8 @@ class Doku_Form {
      * Gets the position of the element with an ID attribute.
      *
      * @param   string  $id     ID of the element to find.
-     * @return  int     position of element if found, otherwise false
+     * @return  int|false     position of element if found, otherwise false
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function findElementById($id) {
@@ -207,7 +215,8 @@ class Doku_Form {
      *
      * @param   string  $name   Attribute name.
      * @param   string  $value  Attribute value.
-     * @return  int     position of element if found, otherwise false
+     * @return  int|false     position of element if found, otherwise false
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function findElementByAttribute($name, $value) {
@@ -227,6 +236,7 @@ class Doku_Form {
      *
      * @param   int     $pos    0-based index
      * @return  array reference  pseudo-element
+     *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
     function &getElementAt($pos) {
@@ -243,6 +253,8 @@ class Doku_Form {
      * 'form_$type'. The function should return the HTML to be printed.
      *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
+     *
+     * @return string html of the form
      */
     function getForm() {
         global $lang;
@@ -310,6 +322,7 @@ class Doku_Form {
  * @param   string  $tag    Tag name.
  * @param   array   $attrs  Optional attributes.
  * @return  array   pseudo-tag
+ *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_makeTag($tag, $attrs=array()) {
@@ -326,6 +339,7 @@ function form_makeTag($tag, $attrs=array()) {
  * @param   string  $tag    Tag name.
  * @param   array   $attrs  Optional attributes.
  * @return  array   pseudo-tag
+ *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_makeOpenTag($tag, $attrs=array()) {
@@ -341,6 +355,7 @@ function form_makeOpenTag($tag, $attrs=array()) {
  *
  * @param   string  $tag    Tag name.
  * @return  array   pseudo-tag
+ *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_makeCloseTag($tag) {
@@ -358,6 +373,7 @@ function form_makeCloseTag($tag) {
  * @param   string  $text   Text to fill the field with.
  * @param   array   $attrs  Optional attributes.
  * @return  array   pseudo-tag
+ *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_makeWikiText($text, $attrs=array()) {
@@ -378,6 +394,7 @@ function form_makeWikiText($text, $attrs=array()) {
  * @param   string  $value  (optional) Displayed label. Uses $act if not provided.
  * @param   array   $attrs  Optional attributes.
  * @return  array   pseudo-tag
+ *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_makeButton($type, $act, $value='', $attrs=array()) {
@@ -406,6 +423,7 @@ function form_makeButton($type, $act, $value='', $attrs=array()) {
  *                          reference it with a 'for' attribute.
  * @param   array   $attrs  Optional attributes.
  * @return  array   pseudo-tag
+ *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_makeField($type, $name, $value='', $label=null, $id='', $class='', $attrs=array()) {
@@ -522,6 +540,18 @@ function form_makeRadioField($name, $value='1', $label=null, $id='', $class='',
  * a string.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param string           $name     Name attribute of the input.
+ * @param string[]|array[] $values   The list of values can be strings, arrays of (value,text),
+ *                                   or an associative array with the values as keys and labels as values.
+ * @param string|int       $selected default selected value, string or index number
+ * @param string           $class    Class attribute of the label. If this is 'block',
+ *                                   then a line break will be added after the field.
+ * @param string           $label    Label that will be printed before the input.
+ * @param string           $id       ID attribute of the input. If set, the label will
+ *                                   reference it with a 'for' attribute.
+ * @param array            $attrs    Optional attributes.
+ * @return array   pseudo-tag
  */
 function form_makeMenuField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
     if (is_null($label)) $label = $name;
@@ -556,6 +586,18 @@ function form_makeMenuField($name, $values, $selected='', $label=null, $id='', $
  * Items are selected by supplying its value or an array of values.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param string           $name     Name attribute of the input.
+ * @param string[]|array[] $values   The list of values can be strings, arrays of (value,text),
+ *                                   or an associative array with the values as keys and labels as values.
+ * @param array|string     $selected value or array of values of the items that need to be selected
+ * @param string           $class    Class attribute of the label. If this is 'block',
+ *                                   then a line break will be added after the field.
+ * @param string           $label    Label that will be printed before the input.
+ * @param string           $id       ID attribute of the input. If set, the label will
+ *                                   reference it with a 'for' attribute.
+ * @param array            $attrs    Optional attributes.
+ * @return array   pseudo-tag
  */
 function form_makeListboxField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
     if (is_null($label)) $label = $name;
@@ -595,6 +637,9 @@ function form_makeListboxField($name, $values, $selected='', $label=null, $id=''
  * Attributes are passed to buildAttributes()
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html of tag
  */
 function form_tag($attrs) {
     return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'/>';
@@ -608,6 +653,9 @@ function form_tag($attrs) {
  * Attributes are passed to buildAttributes()
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html of tag
  */
 function form_opentag($attrs) {
     return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'>';
@@ -621,6 +669,9 @@ function form_opentag($attrs) {
  * There are no attributes.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html of tag
  */
 function form_closetag($attrs) {
     return '</'.$attrs['_tag'].'>';
@@ -634,6 +685,9 @@ function form_closetag($attrs) {
  * Attributes are passed to buildAttributes()
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_openfieldset($attrs) {
     $s = '<fieldset '.buildAttributes($attrs,true).'>';
@@ -648,6 +702,8 @@ function form_openfieldset($attrs) {
  * There are no attributes.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @return string html
  */
 function form_closefieldset() {
     return '</fieldset>';
@@ -661,6 +717,9 @@ function form_closefieldset() {
  * Value is passed to formText()
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_hidden($attrs) {
     return '<input type="hidden" name="'.$attrs['name'].'" value="'.formText($attrs['value']).'" />';
@@ -674,6 +733,9 @@ function form_hidden($attrs) {
  * Text will be passed to formText(), attributes to buildAttributes()
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_wikitext($attrs) {
     // mandatory attributes
@@ -693,6 +755,9 @@ function form_wikitext($attrs) {
  * Other attributes are passed to buildAttributes()
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_button($attrs) {
     $p = (!empty($attrs['_action'])) ? 'name="do['.$attrs['_action'].']" ' : '';
@@ -708,6 +773,9 @@ function form_button($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_field($attrs) {
     $s = '<label';
@@ -729,6 +797,9 @@ function form_field($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_fieldright($attrs) {
     $s = '<label';
@@ -750,6 +821,9 @@ function form_fieldright($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_textfield($attrs) {
     // mandatory attributes
@@ -773,6 +847,9 @@ function form_textfield($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_passwordfield($attrs) {
     // mandatory attributes
@@ -798,6 +875,9 @@ function form_passwordfield($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag
  *
  * @author  Michael Klier <chi@chimeric.de>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_filefield($attrs) {
     $s = '<label';
@@ -824,6 +904,9 @@ function form_filefield($attrs) {
  * $attrs['value'][1] is constructed as well.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_checkboxfield($attrs) {
     // mandatory attributes
@@ -853,6 +936,9 @@ function form_checkboxfield($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_radiofield($attrs) {
     // mandatory attributes
@@ -879,6 +965,9 @@ function form_radiofield($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_menufield($attrs) {
     $attrs['size'] = '1';
@@ -924,6 +1013,9 @@ function form_menufield($attrs) {
  * Other attributes are passed to buildAttributes() for the input tag.
  *
  * @author  Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param array $attrs attributes
+ * @return string html
  */
 function form_listboxfield($attrs) {
     $s = '<label';
diff --git a/inc/fulltext.php b/inc/fulltext.php
index c1dc16e47..d6cddc566 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -20,6 +20,9 @@ if(!defined('FT_SNIPPET_NUMBER')) define('FT_SNIPPET_NUMBER',15);
  *
  * refactored into ft_pageSearch(), _ft_pageSearch() and trigger_event()
  *
+ * @param string $query
+ * @param array $highlight
+ * @return array
  */
 function ft_pageSearch($query,&$highlight){
 
@@ -35,6 +38,9 @@ function ft_pageSearch($query,&$highlight){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ *
+ * @param array $data event data
+ * @return array matching documents
  */
 function _ft_pageSearch(&$data) {
     $Indexer = idx_get_indexer();
@@ -206,6 +212,11 @@ function ft_mediause($id, $ignore_perms = false){
  * @triggers SEARCH_QUERY_PAGELOOKUP
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Adrian Lang <lang@cosmocode.de>
+ *
+ * @param string $id        page id
+ * @param bool   $in_ns     match against namespace as well?
+ * @param bool   $in_title  search in title?
+ * @return string[]
  */
 function ft_pageLookup($id, $in_ns=false, $in_title=false){
     $data = compact('id', 'in_ns', 'in_title');
@@ -213,6 +224,12 @@ function ft_pageLookup($id, $in_ns=false, $in_title=false){
     return trigger_event('SEARCH_QUERY_PAGELOOKUP', $data, '_ft_pageLookup');
 }
 
+/**
+ * Returns list of pages as array(pageid => First Heading)
+ *
+ * @param array &$data event data
+ * @return string[]
+ */
 function _ft_pageLookup(&$data){
     // split out original parameters
     $id = $data['id'];
@@ -270,6 +287,10 @@ function _ft_pageLookup(&$data){
  * Tiny helper function for comparing the searched title with the title
  * from the search index. This function is a wrapper around stripos with
  * adapted argument order and return value.
+ *
+ * @param string $search searched title
+ * @param string $title  title from index
+ * @return bool
  */
 function _ft_pageLookupTitleCompare($search, $title) {
     return stripos($title, $search) !== false;
@@ -279,6 +300,10 @@ function _ft_pageLookupTitleCompare($search, $title) {
  * Sort pages based on their namespace level first, then on their string
  * values. This makes higher hierarchy pages rank higher than lower hierarchy
  * pages.
+ *
+ * @param string $a
+ * @param string $b
+ * @return int Returns < 0 if $a is less than $b; > 0 if $a is greater than $b, and 0 if they are equal.
  */
 function ft_pagesorter($a, $b){
     $ac = count(explode(':',$a));
@@ -296,6 +321,10 @@ function ft_pagesorter($a, $b){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @triggers FULLTEXT_SNIPPET_CREATE
+ *
+ * @param string $id page id
+ * @param array $highlight
+ * @return mixed
  */
 function ft_snippet($id,$highlight){
     $text = rawWiki($id);
@@ -390,6 +419,9 @@ function ft_snippet($id,$highlight){
 
 /**
  * Wraps a search term in regex boundary checks.
+ *
+ * @param string $term
+ * @return string
  */
 function ft_snippet_re_preprocess($term) {
     // do not process asian terms where word boundaries are not explicit
@@ -433,6 +465,7 @@ function ft_snippet_re_preprocess($term) {
  * based upon PEAR's PHP_Compat function for array_intersect_key()
  *
  * @param array $args An array of page arrays
+ * @return array
  */
 function ft_resultCombine($args){
     $array_count = count($args);
@@ -462,6 +495,8 @@ function ft_resultCombine($args){
  * based upon ft_resultCombine() function
  *
  * @param array $args An array of page arrays
+ * @return array
+ *
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
  */
 function ft_resultUnite($args) {
@@ -485,6 +520,8 @@ function ft_resultUnite($args) {
  * nearly identical to PHP5's array_diff_key()
  *
  * @param array $args An array of page arrays
+ * @return array
+ *
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
  */
 function ft_resultComplement($args) {
@@ -507,6 +544,10 @@ function ft_resultComplement($args) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ *
+ * @param Doku_Indexer $Indexer
+ * @param string $query search query
+ * @return array of search formulas
  */
 function ft_queryParser($Indexer, $query){
     /**
@@ -737,6 +778,12 @@ function ft_queryParser($Indexer, $query){
  * This function is used in ft_queryParser() and not for general purpose use.
  *
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ *
+ * @param Doku_Indexer $Indexer
+ * @param string       $term
+ * @param bool         $consider_asian
+ * @param bool         $phrase_mode
+ * @return string
  */
 function ft_termParser($Indexer, $term, $consider_asian = true, $phrase_mode = false) {
     $parsed = '';
diff --git a/inc/html.php b/inc/html.php
index ce6360175..adcd212ed 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -83,6 +83,10 @@ function html_denied() {
  * inserts section edit buttons if wanted or removes the markers
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $text
+ * @param bool   $show show section edit buttons?
+ * @return string
  */
 function html_secedit($text,$show=true){
     global $INFO;
@@ -101,8 +105,11 @@ function html_secedit($text,$show=true){
  * prepares section edit button data for event triggering
  * used as a callback in html_secedit
  *
- * @triggers HTML_SECEDIT_BUTTON
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $matches matches with regexp
+ * @return string
+ * @triggers HTML_SECEDIT_BUTTON
  */
 function html_secedit_button($matches){
     $data = array('secid'  => $matches[1],
@@ -121,6 +128,9 @@ function html_secedit_button($matches){
  * used as default action form HTML_SECEDIT_BUTTON
  *
  * @author Adrian Lang <lang@cosmocode.de>
+ *
+ * @param array $data name, section id and target
+ * @return string html
  */
 function html_secedit_get_button($data) {
     global $ID;
@@ -147,6 +157,8 @@ function html_secedit_get_button($data) {
  * Just the back to top button (in its own form)
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return string html
  */
 function html_topbtn(){
     global $lang;
@@ -161,6 +173,15 @@ function html_topbtn(){
  * If tooltip exists, the access key tooltip is replaced.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string         $name
+ * @param string         $id
+ * @param string         $akey   access key
+ * @param string[string] $params key-value pairs added as hidden inputs
+ * @param string         $method
+ * @param string         $tooltip
+ * @param bool|string    $label  label text, false: lookup btn_$name in localization
+ * @return string
  */
 function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false){
     global $conf;
@@ -213,9 +234,11 @@ function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false
 }
 
 /**
- * show a wiki page
+ * Show a wiki page
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param null|string $txt wiki text or null for showing $ID
  */
 function html_show($txt=null){
     global $ID;
@@ -281,6 +304,10 @@ function html_draft(){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Harry Fuecks <hfuecks@gmail.com>
+ *
+ * @param string $html
+ * @param array|string $phrases
+ * @return string html
  */
 function html_hilight($html,$phrases){
     $phrases = (array) $phrases;
@@ -299,6 +326,9 @@ function html_hilight($html,$phrases){
  * Callback used by html_hilight()
  *
  * @author Harry Fuecks <hfuecks@gmail.com>
+ *
+ * @param array $m matches
+ * @return string html
  */
 function html_hilight_callback($m) {
     $hlight = unslash($m[0]);
@@ -646,6 +676,9 @@ function html_revisions($first=0, $media_id = false){
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
  * @author Ben Coburn <btcoburn@silicodon.net>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param int $first
+ * @param string $show_changes
  */
 function html_recent($first=0, $show_changes='both'){
     global $conf;
@@ -833,6 +866,8 @@ function html_recent($first=0, $show_changes='both'){
  * Display page index
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $ns
  */
 function html_index($ns){
     global $conf;
@@ -861,6 +896,9 @@ function html_index($ns){
  * User function for html_buildlist()
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $item
+ * @return string
  */
 function html_list_index($item){
     global $ID, $conf;
@@ -891,6 +929,9 @@ function html_list_index($item){
  * it gives different classes to opened or closed "folders"
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $item
+ * @return string html
  */
 function html_li_index($item){
     if($item['type'] == "f"){
@@ -906,6 +947,9 @@ function html_li_index($item){
  * Default List item
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $item
+ * @return string html
  */
 function html_li_default($item){
     return '<li class="level'.$item['level'].'">';
@@ -1021,12 +1065,13 @@ function html_backlinks(){
 
 /**
  * Get header of diff HTML
+ *
  * @param string $l_rev   Left revisions
  * @param string $r_rev   Right revision
  * @param string $id      Page id, if null $ID is used
  * @param bool   $media   If it is for media files
  * @param bool   $inline  Return the header on a single line
- * @return array HTML snippets for diff header
+ * @return string[] HTML snippets for diff header
  */
 function html_diff_head($l_rev, $r_rev, $id = null, $media = false, $inline = false) {
     global $lang;
@@ -1482,7 +1527,7 @@ function html_diff_navigationlink($difftype, $linktype, $lrev, $rrev = null) {
 /**
  * Insert soft breaks in diff html
  *
- * @param $diffhtml
+ * @param string $diffhtml
  * @return string
  */
 function html_insert_softbreaks($diffhtml) {
@@ -1521,6 +1566,9 @@ REGEX;
  * show warning on conflict detection
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $text
+ * @param string $summary
  */
 function html_conflict($text,$summary){
     global $ID;
@@ -1681,7 +1729,6 @@ function html_edit(){
     global $lang;
     global $conf;
     global $TEXT;
-    global $RANGE;
 
     if ($INPUT->has('changecheck')) {
         $check = $INPUT->str('changecheck');
@@ -1783,6 +1830,7 @@ function html_edit(){
  * Display the default edit form
  *
  * Is the default action for HTML_EDIT_FORMSELECTION.
+ *
  * @param mixed[] $param
  */
 function html_edit_form($param) {
@@ -1802,6 +1850,8 @@ function html_edit_form($param) {
  * Adds a checkbox for minor edits for logged in users
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return array|bool
  */
 function html_minoredit(){
     global $conf;
@@ -2081,6 +2131,9 @@ function html_resendpwd() {
  * Return the TOC rendered to XHTML
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $toc
+ * @return string html
  */
 function html_TOC($toc){
     if(!count($toc)) return '';
@@ -2099,6 +2152,9 @@ function html_TOC($toc){
 
 /**
  * Callback for html_buildlist
+ *
+ * @param array $item
+ * @return string html
  */
 function html_list_toc($item){
     if(isset($item['hid'])){
@@ -2133,6 +2189,7 @@ function html_mktocitem($link, $text, $level, $hash='#'){
  * Triggers an event with the form name: HTML_{$name}FORM_OUTPUT
  *
  * @author Tom N Harris <tnharris@whoopdedo.org>
+ *
  * @param string     $name The name of the form
  * @param Doku_Form  $form The form
  */
@@ -2145,6 +2202,7 @@ function html_form($name, &$form) {
 /**
  * Form print function.
  * Just calls printForm() on the data object.
+ *
  * @param Doku_Form $data The form
  */
 function html_form_output($data) {
diff --git a/inc/httputils.php b/inc/httputils.php
index efeb2a56c..ac79aa176 100644
--- a/inc/httputils.php
+++ b/inc/httputils.php
@@ -15,6 +15,7 @@ define('HTTP_CHUNK_SIZE',16*1024);
  *
  * @author   Simon Willison <swillison@gmail.com>
  * @link     http://simonwillison.net/2003/Apr/23/conditionalGet/
+ *
  * @param    int $timestamp lastmodified time of the cache file
  * @returns  void or exits with previously header() commands executed
  */
@@ -64,6 +65,7 @@ function http_conditionalRequest($timestamp){
  * Let the webserver send the given file via x-sendfile method
  *
  * @author Chris Smith <chris@jalakai.co.uk>
+ *
  * @param string $file absolute path of file to send
  * @returns  void or exits with previous header() commands executed
  */
@@ -190,6 +192,9 @@ function http_rangeRequest($fh,$size,$mime){
  * (samepath/samefilename.sameext.gz) created after the uncompressed file
  *
  * @author Chris Smith <chris.eureka@jalakai.co.uk>
+ *
+ * @param string $uncompressed_file
+ * @return bool
  */
 function http_gzip_valid($uncompressed_file) {
     $gzip = $uncompressed_file.'.gz';
@@ -206,6 +211,9 @@ function http_gzip_valid($uncompressed_file) {
  * This function handles output of cacheable resource files. It ses the needed
  * HTTP headers. If a useable cache is present, it is passed to the web server
  * and the script is terminated.
+ *
+ * @param string $cache cache file name
+ * @param bool   $cache_ok    if cache can be used
  */
 function http_cached($cache, $cache_ok) {
     global $conf;
@@ -235,6 +243,9 @@ function http_cached($cache, $cache_ok) {
 
 /**
  * Cache content and print it
+ *
+ * @param string $file file name
+ * @param string $content
  */
 function http_cached_finish($file, $content) {
     global $conf;
diff --git a/inc/indexer.php b/inc/indexer.php
index 5ca2f0bb1..ec0c523e0 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -61,6 +61,8 @@ define('IDX_ASIAN', '(?:'.IDX_ASIAN1.'|'.IDX_ASIAN2.'|'.IDX_ASIAN3.')');
  *
  * @author Tom N Harris <tnharris@whoopdedo.org>
  * @author Michael Hamann <michael@content-space.de>
+ *
+ * @return int|string
  */
 function idx_get_version(){
     static $indexer_version = null;
@@ -84,6 +86,9 @@ function idx_get_version(){
  * Differs from strlen in handling of asian characters.
  *
  * @author Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param string $w
+ * @return int
  */
 function wordlen($w){
     $l = strlen($w);
@@ -115,7 +120,8 @@ class Doku_Indexer {
      *
      * @param string    $page   a page name
      * @param string    $text   the body of the page
-     * @return boolean          the function completed successfully
+     * @return string|boolean  the function completed successfully
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      * @author Andreas Gohr <andi@splitbrain.org>
      */
@@ -190,6 +196,7 @@ class Doku_Indexer {
      *
      * @param string    $text   content of the page
      * @return array            list of word IDs and number of times used
+     *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @author Christopher Smith <chris@jalakai.co.uk>
      * @author Tom N Harris <tnharris@whoopdedo.org>
@@ -245,7 +252,8 @@ class Doku_Indexer {
      * @param string    $page   a page name
      * @param mixed     $key    a key string or array of key=>value pairs
      * @param mixed     $value  the value or list of values
-     * @return boolean          the function completed successfully
+     * @return boolean|string     the function completed successfully
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      * @author Michael Hamann <michael@content-space.de>
      */
@@ -453,7 +461,8 @@ class Doku_Indexer {
      * Erases entries in all known indexes.
      *
      * @param string    $page   a page name
-     * @return boolean          the function completed successfully
+     * @return string|boolean  the function completed successfully
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     public function deletePage($page) {
@@ -474,6 +483,7 @@ class Doku_Indexer {
      *
      * @param string    $page   a page name
      * @return boolean          the function completed successfully
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function deletePageNoLock($page) {
@@ -568,6 +578,7 @@ class Doku_Indexer {
      * @param string    $text   plain text
      * @param boolean   $wc     are wildcards allowed?
      * @return array            list of words in the text
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      * @author Andreas Gohr <andi@splitbrain.org>
      */
@@ -676,6 +687,7 @@ class Doku_Indexer {
      *
      * @param array  $tokens list of words to search for
      * @return array         list of page names with usage counts
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      * @author Andreas Gohr <andi@splitbrain.org>
      */
@@ -730,6 +742,7 @@ class Doku_Indexer {
      * @param string    $value  search term to look for, must be a string or array of strings
      * @param callback  $func   comparison function
      * @return array            lists with page names, keys are query values if $value is array
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      * @author Michael Hamann <michael@content-space.de>
      */
@@ -829,6 +842,7 @@ class Doku_Indexer {
      * @param array  $words  The query terms.
      * @param array  $result Set to word => array("length*id" ...)
      * @return array         Set to length => array(id ...)
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function getIndexWords(&$words, &$result) {
@@ -909,6 +923,7 @@ class Doku_Indexer {
      *
      * @param string    $key    list only pages containing the metadata key (optional)
      * @return array            list of page names
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     public function getPages($key=null) {
@@ -942,6 +957,7 @@ class Doku_Indexer {
      * @param int       $minlen minimum length of words to count
      * @param string    $key    metadata key to list. Uses the fulltext index if not given
      * @return array            list of words as the keys and frequency as values
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     public function histogram($min=1, $max=0, $minlen=3, $key=null) {
@@ -1002,6 +1018,8 @@ class Doku_Indexer {
      * Lock the indexer.
      *
      * @author Tom N Harris <tnharris@whoopdedo.org>
+     *
+     * @return bool|string
      */
     protected function lock() {
         global $conf;
@@ -1033,6 +1051,8 @@ class Doku_Indexer {
      * Release the indexer lock.
      *
      * @author Tom N Harris <tnharris@whoopdedo.org>
+     *
+     * @return bool
      */
     protected function unlock() {
         global $conf;
@@ -1050,6 +1070,7 @@ class Doku_Indexer {
      * @param string    $idx    name of the index
      * @param string    $suffix subpart identifier
      * @return array            list of lines without CR or LF
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function getIndex($idx, $suffix) {
@@ -1066,6 +1087,7 @@ class Doku_Indexer {
      * @param string    $suffix subpart identifier
      * @param array     $lines  list of lines without LF
      * @return bool             If saving succeeded
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function saveIndex($idx, $suffix, &$lines) {
@@ -1090,6 +1112,7 @@ class Doku_Indexer {
      * @param string    $suffix subpart identifier
      * @param int       $id     the line number
      * @return string           a line with trailing whitespace removed
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function getIndexKey($idx, $suffix, $id) {
@@ -1114,6 +1137,7 @@ class Doku_Indexer {
      * @param int       $id     the line number
      * @param string    $line   line to write
      * @return bool             If saving succeeded
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function saveIndexKey($idx, $suffix, $id, $line) {
@@ -1155,6 +1179,7 @@ class Doku_Indexer {
      * @param string    $suffix subpart identifier
      * @param string    $value  line to find in the index
      * @return int|bool          line number of the value in the index or false if writing the index failed
+     *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      */
     protected function addIndexKey($idx, $suffix, $value) {
@@ -1178,6 +1203,8 @@ class Doku_Indexer {
      * a sorted array of lengths of the words used in the wiki.
      *
      * @author YoBoY <yoboy.leguesh@gmail.com>
+     *
+     * @return array
      */
     protected function listIndexLengths() {
         return idx_listIndexLengths();
@@ -1190,6 +1217,9 @@ class Doku_Indexer {
      * that there are indices for.
      *
      * @author YoBoY <yoboy.leguesh@gmail.com>
+     *
+     * @param array|int $filter
+     * @return array
      */
     protected function indexLengths($filter) {
         global $conf;
@@ -1216,6 +1246,11 @@ class Doku_Indexer {
      * Insert or replace a tuple in a line.
      *
      * @author Tom N Harris <tnharris@whoopdedo.org>
+     *
+     * @param string $line
+     * @param string $id
+     * @param int    $count
+     * @return string
      */
     protected function updateTuple($line, $id, $count) {
         if ($line != ''){
@@ -1237,6 +1272,10 @@ class Doku_Indexer {
      *
      * @author Tom N Harris <tnharris@whoopdedo.org>
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param array $keys
+     * @param string $line
+     * @return array
      */
     protected function parseTuples(&$keys, $line) {
         $result = array();
@@ -1257,13 +1296,16 @@ class Doku_Indexer {
      * Sum the counts in a list of tuples.
      *
      * @author Tom N Harris <tnharris@whoopdedo.org>
+     *
+     * @param string $line
+     * @return int
      */
     protected function countTuples($line) {
         $freq = 0;
         $parts = explode(':', $line);
         foreach ($parts as $tuple) {
             if ($tuple === '') continue;
-            list($pid, $cnt) = explode('*', $tuple);
+            list(/* $pid */, $cnt) = explode('*', $tuple);
             $freq += (int)$cnt;
         }
         return $freq;
@@ -1273,7 +1315,8 @@ class Doku_Indexer {
 /**
  * Create an instance of the indexer.
  *
- * @return Doku_Indexer               a Doku_Indexer
+ * @return Doku_Indexer    a Doku_Indexer
+ *
  * @author Tom N Harris <tnharris@whoopdedo.org>
  */
 function idx_get_indexer() {
@@ -1288,6 +1331,7 @@ function idx_get_indexer() {
  * Returns words that will be ignored.
  *
  * @return array                list of stop words
+ *
  * @author Tom N Harris <tnharris@whoopdedo.org>
  */
 function & idx_get_stopwords() {
@@ -1312,7 +1356,8 @@ function & idx_get_stopwords() {
  * @param string        $page   name of the page to index
  * @param boolean       $verbose    print status messages
  * @param boolean       $force  force reindexing even when the index is up to date
- * @return boolean              the function completed successfully
+ * @return string|boolean  the function completed successfully
+ *
  * @author Tom N Harris <tnharris@whoopdedo.org>
  */
 function idx_addPage($page, $verbose=false, $force=false) {
@@ -1441,6 +1486,10 @@ function idx_tokenizer($string, $wc=false) {
  * Read the list of words in an index (if it exists).
  *
  * @author Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param string $idx
+ * @param string $suffix
+ * @return array
  */
 function idx_getIndex($idx, $suffix) {
     global $conf;
@@ -1456,6 +1505,8 @@ function idx_getIndex($idx, $suffix) {
  * a sorted array of lengths of the words used in the wiki.
  *
  * @author YoBoY <yoboy.leguesh@gmail.com>
+ *
+ * @return array
  */
 function idx_listIndexLengths() {
     global $conf;
@@ -1510,6 +1561,9 @@ function idx_listIndexLengths() {
  * that there are indices for.
  *
  * @author YoBoY <yoboy.leguesh@gmail.com>
+ *
+ * @param array|int $filter
+ * @return array
  */
 function idx_indexLengths($filter) {
     global $conf;
@@ -1539,6 +1593,9 @@ function idx_indexLengths($filter) {
  * not a letter, number, or underscore.
  *
  * @author Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param string $name
+ * @return string
  */
 function idx_cleanName($name) {
     $name = utf8_romanize(trim((string)$name));
diff --git a/inc/io.php b/inc/io.php
index 27a34b045..bfa394a17 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -20,6 +20,7 @@ if(!defined('DOKU_INC')) die('meh.');
  * @param string $id      - a pageid, the namespace of that id will be tried to deleted
  * @param string $basedir - the config name of the type to delete (datadir or mediadir usally)
  * @return bool - true if at least one namespace was deleted
+ *
  * @author  Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
  */
@@ -60,6 +61,11 @@ function io_sweepNS($id,$basedir='datadir'){
  * $data[3]    rev: The page revision, false for current wiki pages.
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param string   $file filename
+ * @param string   $id page id
+ * @param bool|int $rev revision timestamp
+ * @return string
  */
 function io_readWikiPage($file, $id, $rev=false) {
     if (empty($rev)) { $rev = false; }
@@ -69,7 +75,11 @@ function io_readWikiPage($file, $id, $rev=false) {
 
 /**
  * Callback adapter for io_readFile().
+ *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param array $data event data
+ * @return string
  */
 function _io_readWikiPage_action($data) {
     if (is_array($data) && is_array($data[0]) && count($data[0])===2) {
@@ -88,6 +98,10 @@ function _io_readWikiPage_action($data) {
  * be sure to set $clean to false!
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file  filename
+ * @param bool   $clean
+ * @return string
  */
 function io_readFile($file,$clean=true){
     $ret = '';
@@ -108,9 +122,12 @@ function io_readFile($file,$clean=true){
 }
 /**
  * Returns the content of a .bz2 compressed file as string
+ *
  * @author marcel senf <marcel@rucksackreinigung.de>
+ *
+ * @param string $file filename
+ * @return string content
  */
-
 function bzfile($file){
     $bz = bzopen($file,"r");
     $str = '';
@@ -138,6 +155,12 @@ function bzfile($file){
  * $data[3]    rev: The page revision, false for current wiki pages.
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param string $file      filename
+ * @param string $content
+ * @param string $id        page id
+ * @param int|bool $rev timestamp of revision
+ * @return bool
  */
 function io_writeWikiPage($file, $content, $id, $rev=false) {
     if (empty($rev)) { $rev = false; }
@@ -149,6 +172,9 @@ function io_writeWikiPage($file, $content, $id, $rev=false) {
 /**
  * Callback adapter for io_saveFile().
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param array $data event data
+ * @return bool
  */
 function _io_writeWikiPage_action($data) {
     if (is_array($data) && is_array($data[0]) && count($data[0])===3) {
@@ -168,7 +194,11 @@ function _io_writeWikiPage_action($data) {
  * and bz2 if extension is .bz2
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
- * @return bool true on success
+ *
+ * @param string $file filename path to file
+ * @param string $content
+ * @param bool   $append
+ * @return bool true on success, otherwise false
  */
 function io_saveFile($file,$content,$append=false){
     global $conf;
@@ -221,6 +251,10 @@ function io_saveFile($file,$content,$append=false){
  * 2005-10-14 : added regex option -- Christopher Smith <chris@jalakai.co.uk>
  *
  * @author Steven Danz <steven-danz@kc.rr.com>
+ *
+ * @param string $file    filename
+ * @param string $badline exact linematch to remove
+ * @param bool   $regex   use regexp?
  * @return bool true on success
  */
 function io_deleteFromFile($file,$badline,$regex=false){
@@ -285,6 +319,8 @@ function io_deleteFromFile($file,$badline,$regex=false){
  * the lock is assumed to be stale and the function goes on
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file filename
  */
 function io_lock($file){
     global $conf;
@@ -311,6 +347,8 @@ function io_lock($file){
  * Unlocks a file
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file filename
  */
 function io_unlock($file){
     global $conf;
@@ -331,6 +369,9 @@ function io_unlock($file){
  * $data[1]    ns_type: 'pages' or 'media' namespace tree.
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ *
+ * @param string $id page id
+ * @param string $ns_type 'pages' or 'media'
  */
 function io_createNamespace($id, $ns_type='pages') {
     // verify ns_type
@@ -365,6 +406,8 @@ function io_createNamespace($id, $ns_type='pages') {
  * Create the directory needed for the given file
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file file name
  */
 function io_makeFileDir($file){
     $dir = dirname($file);
@@ -379,6 +422,9 @@ function io_makeFileDir($file){
  * @link    http://www.php.net/manual/en/function.mkdir.php
  * @author  <saint@corenova.com>
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $target filename
+ * @return bool|int|string
  */
 function io_mkdir_p($target){
     global $conf;
@@ -454,6 +500,9 @@ function io_rmdir($path, $removefiles = false) {
  * This is used when the safemode workaround is enabled
  *
  * @author <andi@splitbrain.org>
+ *
+ * @param string $dir name of the new directory
+ * @return false|string
  */
 function io_mkdir_ftp($dir){
     global $conf;
@@ -488,6 +537,8 @@ function io_mkdir_ftp($dir){
  * its path.
  *
  * @author Michael Klier <chi@chimeric.de>
+ *
+ * @return false|string path to new directory or false
  */
 function io_mktmpdir() {
     global $conf;
@@ -516,6 +567,13 @@ function io_mktmpdir() {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param string $url           url to download
+ * @param string $file          path to file or directory where to save
+ * @param bool   $useAttachment if true: try to use name of download, uses otherwise $defaultName, false: uses $file as path to file
+ * @param string $defaultName   fallback for if using $useAttachment
+ * @param int    $maxSize       maximum file size
+ * @return bool|string          if failed false, otherwise true or the name of the file in the given dir
  */
 function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=2097152){
     global $conf;
@@ -563,6 +621,10 @@ function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=20
  *
  * rename() can not overwrite existing files on Windows
  * this function will use copy/unlink instead
+ *
+ * @param string $from
+ * @param string $to
+ * @return bool succes or fail
  */
 function io_rename($from,$to){
     global $conf;
@@ -582,6 +644,11 @@ function io_rename($from,$to){
  * Returns the exit code from the process.
  *
  * @author Tom N Harris <tnharris@whoopdedo.org>
+ *
+ * @param string $cmd
+ * @param string $input  input pipe
+ * @param string $output output pipe
+ * @return int exit code from process
  */
 function io_exec($cmd, $input, &$output){
     $descspec = array(
diff --git a/inc/media.php b/inc/media.php
index 7770d3cc9..4ad67369d 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -16,6 +16,9 @@ if(!defined('NL')) define('NL',"\n");
  * their CSS tags except pagenames won't be links.
  *
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ *
+ * @param array $data
+ * @param string $id
  */
 function media_filesinuse($data,$id){
     global $lang;
@@ -45,7 +48,7 @@ function media_filesinuse($data,$id){
  * @param string $id media id
  * @param int $auth permission level
  * @param array $data
- * @return bool
+ * @return false|string
  */
 function media_metasave($id,$auth,$data){
     if($auth < AUTH_UPLOAD) return false;
@@ -91,6 +94,7 @@ function media_metasave($id,$auth,$data){
  * check if a media is external source
  *
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
+ *
  * @param string $id the media ID or URL
  * @return bool
  */
@@ -103,6 +107,7 @@ function media_isexternal($id){
  * Check if a media item is public (eg, external URL or readable by @ALL)
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $id  the media ID or URL
  * @return bool
  */
@@ -214,6 +219,7 @@ define('DOKU_MEDIA_EMPTY_NS', 8);
  * If configured, checks for media references before deletion
  *
  * @author             Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $id media id
  * @param int $auth no longer used
  * @return int One of: 0,
@@ -266,9 +272,9 @@ function media_delete($id,$auth){
 /**
  * Handle file uploads via XMLHttpRequest
  *
- * @param string $ns target namespace
- * @param int $auth current auth check result
- * @return mixed false on error, id of the new file on success
+ * @param string $ns   target namespace
+ * @param int    $auth current auth check result
+ * @return false|string false on error, id of the new file on success
  */
 function media_upload_xhr($ns,$auth){
     if(!checkSecurityToken()) return false;
@@ -311,10 +317,11 @@ function media_upload_xhr($ns,$auth){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
- * @param string $ns target namespace
- * @param int $auth current auth check result
- * @param bool|array $file $_FILES member, $_FILES['upload'] if false
- * @return mixed false on error, id of the new file on success
+ *
+ * @param string     $ns    target namespace
+ * @param int        $auth  current auth check result
+ * @param bool|array $file  $_FILES member, $_FILES['upload'] if false
+ * @return false|string false on error, id of the new file on success
  */
 function media_upload($ns,$auth,$file=false){
     if(!checkSecurityToken()) return false;
@@ -358,6 +365,7 @@ function media_upload($ns,$auth,$file=false){
  * Using copy, makes sure any setgid bits on the media directory are honored
  *
  * @see   move_uploaded_file()
+ *
  * @param string $from
  * @param string $to
  * @return bool
@@ -383,14 +391,13 @@ function copy_uploaded_file($from, $to){
  * $data[5]     move:
  *
  * @triggers MEDIA_UPLOAD_FINISH
- */
-/**
- * @param array $file
+ *
+ * @param array  $file
  * @param string $id
- * @param bool $ow
- * @param int $auth permission level
+ * @param bool   $ow   overwrite?
+ * @param int    $auth permission level
  * @param string $move function name
- * @return array|mixed
+ * @return false|array|string
  */
 function media_save($file, $id, $ow, $auth, $move) {
     if($auth < AUTH_UPLOAD) {
@@ -453,8 +460,12 @@ function media_save($file, $id, $ow, $auth, $move) {
 }
 
 /**
- * Callback adapter for media_upload_finish()
+ * Callback adapter for media_upload_finish() triggered by MEDIA_UPLOAD_FINISH
+ *
  * @author Michael Klier <chi@chimeric.de>
+ *
+ * @param array $data event data
+ * @return false|array|string
  */
 function _media_upload_action($data) {
     // fixme do further sanity tests of given data?
@@ -471,6 +482,14 @@ function _media_upload_action($data) {
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $fn_tmp
+ * @param string $fn
+ * @param string $id        media id
+ * @param string $imime     mime type
+ * @param bool   $overwrite overwrite existing?
+ * @param string $move      function name
+ * @return array|string
  */
 function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'move_uploaded_file') {
     global $conf;
@@ -514,6 +533,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
  * directory
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
  * @param string $id
  * @return int - revision date
  */
@@ -557,6 +577,10 @@ function media_saveOldRevision($id){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @link   http://www.splitbrain.org/blog/2007-02/12-internet_explorer_facilitates_cross_site_scripting
  * @fixme  check all 26 magic IE filetypes here?
+ *
+ * @param string $file path to file
+ * @param string $mime mimetype
+ * @return int
  */
 function media_contentcheck($file,$mime){
     global $conf;
@@ -566,14 +590,14 @@ function media_contentcheck($file,$mime){
             $bytes = fread($fh, 256);
             fclose($fh);
             if(preg_match('/<(script|a|img|html|body|iframe)[\s>]/i',$bytes)){
-                return -3;
+                return -3; //XSS: possibly malicious content
             }
         }
     }
     if(substr($mime,0,6) == 'image/'){
         $info = @getimagesize($file);
         if($mime == 'image/gif' && $info[2] != 1){
-            return -1;
+            return -1; // uploaded content did not match the file extension
         }elseif($mime == 'image/jpeg' && $info[2] != 2){
             return -1;
         }elseif($mime == 'image/png' && $info[2] != 3){
@@ -584,7 +608,7 @@ function media_contentcheck($file,$mime){
         global $TEXT;
         $TEXT = io_readFile($file);
         if(checkwordblock()){
-            return -2;
+            return -2; //blocked by the spam blacklist
         }
     }
     return 0;
@@ -594,6 +618,12 @@ function media_contentcheck($file,$mime){
  * Send a notify mail on uploads
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string   $id      media id
+ * @param string   $file    path to file
+ * @param string   $mime    mime type
+ * @param bool|int $old_rev revision timestamp or false
+ * @return bool
  */
 function media_notify($id,$file,$mime,$old_rev=false){
     global $conf;
@@ -605,6 +635,12 @@ function media_notify($id,$file,$mime,$old_rev=false){
 
 /**
  * List all files in a given Media namespace
+ *
+ * @param string      $ns
+ * @param null|int    $auth           permission level
+ * @param string      $jump           id
+ * @param bool        $fullscreenview
+ * @param bool|string $sort           sorting order
  */
 function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=false){
     global $conf;
@@ -747,6 +783,7 @@ function media_tab_files_options(){
  * Returns type of sorting for the list of files in media manager
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
  * @return string - sort type
  */
 function _media_get_sort_type() {
@@ -757,6 +794,7 @@ function _media_get_sort_type() {
  * Returns type of listing for the list of files in media manager
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
  * @return string - list type
  */
 function _media_get_list_type() {
@@ -788,6 +826,10 @@ function _media_get_display_param($param, $values) {
  * Prints tab that displays a list of all files
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string    $ns
+ * @param null|int  $auth permission level
+ * @param string    $jump item id
  */
 function media_tab_files($ns,$auth=null,$jump='') {
     global $lang;
@@ -804,6 +846,10 @@ function media_tab_files($ns,$auth=null,$jump='') {
  * Prints tab that displays uploading form
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string   $ns
+ * @param null|int $auth permission level
+ * @param string   $jump item id
  */
 function media_tab_upload($ns,$auth=null,$jump='') {
     global $lang;
@@ -821,6 +867,9 @@ function media_tab_upload($ns,$auth=null,$jump='') {
  * Prints tab that displays search form
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $ns
+ * @param null|int $auth permission level
  */
 function media_tab_search($ns,$auth=null) {
     global $INPUT;
@@ -843,8 +892,8 @@ function media_tab_search($ns,$auth=null) {
  *
  * @param string     $image media id
  * @param string     $ns
- * @param null|int   $auth permission level
- * @param string|int $rev
+ * @param null|int   $auth  permission level
+ * @param string|int $rev   revision timestamp or empty string
  */
 function media_tab_view($image, $ns, $auth=null, $rev='') {
     global $lang;
@@ -910,10 +959,11 @@ function media_tab_history($image, $ns, $auth=null) {
 /**
  * Prints mediafile details
  *
- * @param string        $image media id
- * @param int           $auth permission level
- * @param int|string    $rev revision timestamp or empty string
- * @param JpegMeta|bool $meta
+ * @param string         $image media id
+ * @param int            $auth permission level
+ * @param int|string     $rev revision timestamp or empty string
+ * @param JpegMeta|bool  $meta
+ *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_preview($image, $auth, $rev='', $meta=false) {
@@ -950,8 +1000,8 @@ function media_preview($image, $auth, $rev='', $meta=false) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  *
  * @param string     $image media id
- * @param int        $auth permission level
- * @param string|int $rev revision timestamp, or empty string
+ * @param int        $auth  permission level
+ * @param string|int $rev   revision timestamp, or empty string
  */
 function media_preview_buttons($image, $auth, $rev='') {
     global $lang, $conf;
@@ -1003,9 +1053,9 @@ function media_preview_buttons($image, $auth, $rev='') {
  * @author Kate Arzamastseva <pshns@ukr.net>
  * @param string         $image
  * @param int|string     $rev
- * @param JpegMeta|bool $meta
+ * @param JpegMeta|bool  $meta
  * @param int            $size
- * @return array|bool
+ * @return array|false
  */
 function media_image_preview_size($image, $rev, $meta, $size = 500) {
     if (!preg_match("/\.(jpe?g|gif|png)$/", $image) || !file_exists(mediaFN($image, $rev))) return false;
@@ -1027,9 +1077,9 @@ function media_image_preview_size($image, $rev, $meta, $size = 500) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  *
- * @param array    $tags
+ * @param array    $tags array with tags, first existing is returned
  * @param JpegMeta $meta
- * @param string   $alt
+ * @param string   $alt  alternative value
  * @return string
  */
 function media_getTag($tags,$meta,$alt=''){
@@ -1045,7 +1095,7 @@ function media_getTag($tags,$meta,$alt=''){
  * @author Kate Arzamastseva <pshns@ukr.net>
  *
  * @param JpegMeta $meta
- * @return array
+ * @return array list of tags of the mediafile
  */
 function media_file_tags($meta) {
     // load the field descriptions
@@ -1074,8 +1124,7 @@ function media_file_tags($meta) {
  * Prints mediafile tags
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- */
-/**
+ *
  * @param string        $image image id
  * @param int           $auth  permission level
  * @param string|int    $rev   revision timestamp, or empty string
@@ -1104,13 +1153,12 @@ function media_details($image, $auth, $rev='', $meta=false) {
  * Shows difference between two revisions of file
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- */
-/**
+ *
  * @param string $image  image id
  * @param string $ns
  * @param int $auth permission level
  * @param bool $fromajax
- * @return void|bool|string
+ * @return false|null|string
  */
 function media_diff($image, $ns, $auth, $fromajax = false) {
     global $conf;
@@ -1170,14 +1218,13 @@ function media_diff($image, $ns, $auth, $fromajax = false) {
 
     // trigger event
     return trigger_event('MEDIA_DIFF', $data, '_media_file_diff', true);
-
 }
 
 /**
  * Callback for media file diff
  *
- * @param $data
- * @return bool|void
+ * @param array $data event data
+ * @return false|null
  */
 function _media_file_diff($data) {
     if(is_array($data) && count($data)===6) {
@@ -1318,11 +1365,12 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
  * and slider
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $image
- * @param int $l_rev revision timestamp, or empty string
- * @param int $r_rev revision timestamp, or empty string
- * @param array $l_size
- * @param array $r_size
+ *
+ * @param string $image   image id
+ * @param int    $l_rev   revision timestamp, or empty string
+ * @param int    $r_rev   revision timestamp, or empty string
+ * @param array  $l_size  array with width and height
+ * @param array  $r_size  array with width and height
  * @param string $type
  */
 function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
@@ -1355,10 +1403,11 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
 /**
  * Restores an old revision of a media file
  *
- * @param string $image
- * @param int $rev
- * @param int $auth
+ * @param string $image media id
+ * @param int    $rev   revision timestamp or empty string
+ * @param int    $auth
  * @return string - file's id
+ *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_restore($image, $rev, $auth){
@@ -1444,10 +1493,10 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort='natural
 /**
  * Formats and prints one file in the list
  *
- * @param array $item
- * @param int $auth permission level
- * @param string $jump item id
- * @param bool $display_namespace
+ * @param array     $item
+ * @param int       $auth              permission level
+ * @param string    $jump              item id
+ * @param bool      $display_namespace
  */
 function media_printfile($item,$auth,$jump,$display_namespace=false){
     global $lang;
@@ -1524,9 +1573,9 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
 /**
  * Display a media icon
  *
- * @param $filename
- * @param string $size the size subfolder, if not specified 16x16 is used
- * @return string
+ * @param string $filename media id
+ * @param string $size     the size subfolder, if not specified 16x16 is used
+ * @return string html
  */
 function media_printicon($filename, $size=''){
     list($ext) = mimetype(mediaFN($filename),false);
@@ -1546,8 +1595,8 @@ function media_printicon($filename, $size=''){
  * @author Kate Arzamastseva <pshns@ukr.net>
  *
  * @param array       $item
- * @param int         $auth
- * @param bool|string $jump
+ * @param int         $auth              permission level
+ * @param bool|string $jump              item id
  * @param bool        $display_namespace
  */
 function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false){
@@ -1598,7 +1647,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
  * Prints a thumbnail and metainfo
  *
  * @param array $item
- * @param bool $fullscreen
+ * @param bool  $fullscreen
  */
 function media_printimgdetail($item, $fullscreen=false){
     // prepare thumbnail
@@ -1662,15 +1711,15 @@ function media_printimgdetail($item, $fullscreen=false){
 }
 
 /**
- * Build link based on the current, adding/rewriting
- * parameters
+ * Build link based on the current, adding/rewriting parameters
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
  * @param array|bool $params
- * @param string     $amp - separator
- * @param bool       $abs
- * @param bool       $params_array
- * @return string|array - link
+ * @param string     $amp           separator
+ * @param bool       $abs           absolute url?
+ * @param bool       $params_array  return the parmeters array?
+ * @return string|array - link or link parameters
  */
 function media_managerURL($params=false, $amp='&amp;', $abs=false, $params_array=false) {
     global $ID;
@@ -1703,8 +1752,8 @@ function media_managerURL($params=false, $amp='&amp;', $abs=false, $params_array
  * @author Kate Arzamastseva <pshns@ukr.net>
  *
  * @param string $ns
- * @param int $auth permission level
- * @param bool $fullscreen
+ * @param int    $auth permission level
+ * @param bool  $fullscreen
  */
 function media_uploadform($ns, $auth, $fullscreen = false){
     global $lang;
@@ -1873,6 +1922,9 @@ function media_nstree($ns){
  * Prints a media namespace tree item
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $item
+ * @return string html
  */
 function media_nstree_item($item){
     global $INPUT;
@@ -1896,6 +1948,9 @@ function media_nstree_item($item){
  * Prints a media namespace tree item opener
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $item
+ * @return string html
  */
 function media_nstree_li($item){
     $class='media level'.$item['level'];
@@ -1917,6 +1972,12 @@ function media_nstree_li($item){
  * Resizes the given image to the given size
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file filename, path to file
+ * @param string $ext  extension
+ * @param int    $w    desired width
+ * @param int    $h    desired height
+ * @return string path to resized or original size if failed
  */
 function media_resize_image($file, $ext, $w, $h=0){
     global $conf;
@@ -1937,9 +1998,10 @@ function media_resize_image($file, $ext, $w, $h=0){
     $local = getCacheName($file,'.media.'.$w.'x'.$h.'.'.$ext);
     $mtime = @filemtime($local); // 0 if not exists
 
-    if( $mtime > filemtime($file) ||
-            media_resize_imageIM($ext,$file,$info[0],$info[1],$local,$w,$h) ||
-            media_resize_imageGD($ext,$file,$info[0],$info[1],$local,$w,$h) ){
+    if($mtime > filemtime($file) ||
+        media_resize_imageIM($ext, $file, $info[0], $info[1], $local, $w, $h) ||
+        media_resize_imageGD($ext, $file, $info[0], $info[1], $local, $w, $h)
+    ) {
         if(!empty($conf['fperm'])) @chmod($local, $conf['fperm']);
         return $local;
     }
@@ -1955,6 +2017,12 @@ function media_resize_image($file, $ext, $w, $h=0){
  * image because most pics are more interesting in that area (rule of thirds)
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file filename, path to file
+ * @param string $ext  extension
+ * @param int    $w    desired width
+ * @param int    $h    desired height
+ * @return string path to resized or original size if failed
  */
 function media_crop_image($file, $ext, $w, $h=0){
     global $conf;
@@ -2019,7 +2087,7 @@ function media_crop_image($file, $ext, $w, $h=0){
  * @param string  $id    id of the image
  * @param int     $w     resize/crop width
  * @param int     $h     resize/crop height
- * @return string
+ * @return string token or empty string if no token required
  */
 function media_get_token($id,$w,$h){
     // token is only required for modified images
@@ -2042,6 +2110,11 @@ function media_get_token($id,$w,$h){
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
  * @author  Pavel Vitis <Pavel.Vitis@seznam.cz>
+ *
+ * @param string $url
+ * @param string $ext   extension
+ * @param int    $cache cachetime in seconds
+ * @return false|string path to cached file
  */
 function media_get_from_URL($url,$ext,$cache){
     global $conf;
@@ -2054,12 +2127,12 @@ function media_get_from_URL($url,$ext,$cache){
     $mtime = @filemtime($local); // 0 if not exists
 
     //decide if download needed:
-    if( ($mtime == 0) ||                           // cache does not exist
-            ($cache != -1 && $mtime < time()-$cache)   // 'recache' and cache has expired
-      ){
-        if(media_image_download($url,$local)){
+    if(($mtime == 0) || // cache does not exist
+        ($cache != -1 && $mtime < time() - $cache) // 'recache' and cache has expired
+    ) {
+        if(media_image_download($url, $local)) {
             return $local;
-        }else{
+        } else {
             return false;
         }
     }
@@ -2075,6 +2148,10 @@ function media_get_from_URL($url,$ext,$cache){
  * Download image files
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $url
+ * @param string $file path to file in which to put the downloaded content
+ * @return bool
  */
 function media_image_download($url,$file){
     global $conf;
@@ -2110,6 +2187,15 @@ function media_image_download($url,$file){
  *
  * @author Pavel Vitis <Pavel.Vitis@seznam.cz>
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $ext     extension
+ * @param string $from    filename path to file
+ * @param int    $from_w  original width
+ * @param int    $from_h  original height
+ * @param string $to      path to resized file
+ * @param int    $to_w    desired width
+ * @param int    $to_h    desired height
+ * @return bool
  */
 function media_resize_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h){
     global $conf;
@@ -2134,6 +2220,17 @@ function media_resize_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h){
  * crop images using external ImageMagick convert program
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $ext     extension
+ * @param string $from    filename path to file
+ * @param int    $from_w  original width
+ * @param int    $from_h  original height
+ * @param string $to      path to resized file
+ * @param int    $to_w    desired width
+ * @param int    $to_h    desired height
+ * @param int    $ofs_x   offset of crop centre
+ * @param int    $ofs_y   offset of crop centre
+ * @return bool
  */
 function media_crop_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x,$ofs_y){
     global $conf;
@@ -2159,6 +2256,17 @@ function media_crop_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x,$o
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Sebastian Wienecke <s_wienecke@web.de>
+ *
+ * @param string $ext     extension
+ * @param string $from    filename path to file
+ * @param int    $from_w  original width
+ * @param int    $from_h  original height
+ * @param string $to      path to resized file
+ * @param int    $to_w    desired width
+ * @param int    $to_h    desired height
+ * @param int    $ofs_x   offset of crop centre
+ * @param int    $ofs_y   offset of crop centre
+ * @return bool
  */
 function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=0,$ofs_y=0){
     global $conf;
@@ -2261,9 +2369,9 @@ function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=
  * Return other media files with the same base name
  * but different extensions.
  *
- * @param string $src       - ID of media file
- * @param array $exts       - alternative extensions to find other files for
- * @return array            - mime type => file ID
+ * @param string   $src     - ID of media file
+ * @param string[] $exts    - alternative extensions to find other files for
+ * @return array            - array(mime type => file ID)
  *
  * @author Anika Henke <anika@selfthinker.org>
  */
@@ -2288,7 +2396,7 @@ function media_alternativefiles($src, $exts){
  * Check if video/audio is supported to be embedded.
  *
  * @param string $mime      - mimetype of media file
- * @param string $type      - type of media files to check ('video', 'audio', or none)
+ * @param string $type      - type of media files to check ('video', 'audio', or null for all)
  * @return boolean
  *
  * @author Anika Henke <anika@selfthinker.org>
diff --git a/inc/pageutils.php b/inc/pageutils.php
index adfb10cc7..b9c6418e2 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -20,7 +20,7 @@
  *
  * @param string $param  the $_REQUEST variable name, default 'id'
  * @param bool   $clean  if true, ID is cleaned
- * @return mixed|string
+ * @return string
  */
 function getID($param='id',$clean=true){
     /** @var Input $INPUT */
@@ -97,6 +97,7 @@ function getID($param='id',$clean=true){
  * converted to unaccented ones
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param  string  $raw_id    The pageid to clean
  * @param  boolean $ascii     Force ASCII
  * @return string cleaned id
@@ -152,7 +153,7 @@ function cleanID($raw_id,$ascii=false){
  * @author Andreas Gohr <andi@splitbrain.org>
  *
  * @param string $id
- * @return string|bool the namespace part or false if the given ID has no namespace (root)
+ * @return string|false the namespace part or false if the given ID has no namespace (root)
  */
 function getNS($id){
     $pos = strrpos((string)$id,':');
@@ -435,7 +436,7 @@ function localeFN($id,$ext='txt'){
  * @param string $ns     namespace which is context of id
  * @param string $id     relative id
  * @param bool   $clean  flag indicating that id should be cleaned
- * @return mixed|string
+ * @return string
  */
 function resolve_id($ns,$id,$clean=true){
     global $conf;
@@ -718,6 +719,7 @@ function utf8_decodeFN($file){
  * Used for sidebars, but can be used other stuff as well
  *
  * @todo   add event hook
+ *
  * @param  string $page the pagename you're looking for
  * @return string|false the full page id of the found page, false if any
  */
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index a1040d12e..0e7b294e5 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -711,6 +711,9 @@ class Doku_Handler_CallWriter {
 
     var $Handler;
 
+    /**
+     * @param Doku_Handler $Handler
+     */
     function Doku_Handler_CallWriter(& $Handler) {
         $this->Handler = & $Handler;
     }
@@ -747,7 +750,7 @@ class Doku_Handler_Nest {
     /**
      * constructor
      *
-     * @param  object     $CallWriter     the renderers current call writer
+     * @param  Doku_Handler_CallWriter $CallWriter     the renderers current call writer
      * @param  string     $close          closing instruction name, this is required to properly terminate the
      *                                    syntax mode if the document ends without a closing pattern
      */
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 09294539e..6c074e43e 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -190,7 +190,7 @@ class Doku_Renderer extends DokuWiki_Plugin {
     /**
      * Render plain text data
      *
-     * @param $text
+     * @param string $text
      */
     function cdata($text) {
     }
@@ -759,6 +759,9 @@ class Doku_Renderer extends DokuWiki_Plugin {
      * casing and special chars
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $name
+     * @return string
      */
     function _simpleTitle($name) {
         global $conf;
@@ -778,6 +781,11 @@ class Doku_Renderer extends DokuWiki_Plugin {
 
     /**
      * Resolve an interwikilink
+     *
+     * @param string    $shortcut  identifier for the interwiki link
+     * @param string    $reference fragment that refers the content
+     * @param null|bool $exists    reference which returns if an internal page exists
+     * @return string interwikilink
      */
     function _resolveInterWiki(&$shortcut, $reference, &$exists = null) {
         //get interwiki URL
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index aa09058df..c17c984d6 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -58,10 +58,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     /**
      * Register a new edit section range
      *
-     * @param $type  string The section type identifier
-     * @param $title string The section title
-     * @param $start int    The byte position for the edit start
-     * @return string A marker class for the starting HTML element
+     * @param string $type   The section type identifier
+     * @param string $title  The section title
+     * @param int    $start  The byte position for the edit start
+     * @return string  A marker class for the starting HTML element
+     *
      * @author Adrian Lang <lang@cosmocode.de>
      */
     public function startSectionEdit($start, $type, $title = null) {
@@ -72,8 +73,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     /**
      * Finish an edit section range
      *
-     * @param $end     int The byte position for the edit end; null for the rest of
-     *                 the page
+     * @param int  $end     The byte position for the edit end; null for the rest of the page
+     *
      * @author Adrian Lang <lang@cosmocode.de>
      */
     public function finishSectionEdit($end = null) {
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 9c2a0b570..791033e63 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -55,6 +55,11 @@ define('METADATA_RENDER_UNLIMITED', 4);
  * wasn't found
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id page id
+ * @param string|int $rev revision timestamp or empty string
+ * @param bool $excuse
+ * @return null|string
  */
 function p_wiki_xhtml($id, $rev='', $excuse=true){
     $file = wikiFN($id,$rev);
@@ -89,6 +94,9 @@ function p_wiki_xhtml($id, $rev='', $excuse=true){
  * Returns the specified local text in parsed format
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id page id
+ * @return null|string
  */
 function p_locale_xhtml($id){
     //fetch parsed locale
@@ -101,6 +109,11 @@ function p_locale_xhtml($id){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param string $file filename, path to file
+ * @param string $format
+ * @param string $id page id
+ * @return null|string
  */
 function p_cached_output($file, $format='xhtml', $id='') {
     global $conf;
@@ -129,6 +142,11 @@ function p_cached_output($file, $format='xhtml', $id='') {
  * Uses and creates a serialized cache file
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file      filename, path to file
+ * @param bool   $cacheonly
+ * @param string $id        page id
+ * @return array|null
  */
 function p_cached_instructions($file,$cacheonly=false,$id='') {
     static $run = null;
@@ -157,7 +175,8 @@ function p_cached_instructions($file,$cacheonly=false,$id='') {
  *
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Andreas Gohr <andi@splitbrain.org>
- * @param string $text raw wiki syntax text
+ *
+ * @param string $text  raw wiki syntax text
  * @return array a list of instruction arrays
  */
 function p_get_instructions($text){
@@ -185,9 +204,9 @@ function p_get_instructions($text){
 /**
  * returns the metadata of a page
  *
- * @param string $id The id of the page the metadata should be returned from
- * @param string $key The key of the metdata value that shall be read (by default everything) - separate hierarchies by " " like "date created"
- * @param int $render If the page should be rendererd - possible values:
+ * @param string $id      The id of the page the metadata should be returned from
+ * @param string $key     The key of the metdata value that shall be read (by default everything) - separate hierarchies by " " like "date created"
+ * @param int    $render  If the page should be rendererd - possible values:
  *     METADATA_DONT_RENDER, METADATA_RENDER_USING_SIMPLE_CACHE, METADATA_RENDER_USING_CACHE
  *     METADATA_RENDER_UNLIMITED (also combined with the previous two options),
  *     default: METADATA_RENDER_USING_CACHE
@@ -360,6 +379,9 @@ function p_set_metadata($id, $data, $render=false, $persistent=true){
  * used on page deletion
  *
  * @author Michael Klier <chi@chimeric.de>
+ *
+ * @param string $id page id
+ * @return bool  success / fail
  */
 function p_purge_metadata($id) {
     $meta = p_read_metadata($id);
@@ -423,6 +445,10 @@ function p_save_metadata($id, $meta) {
  * renders the metadata of a page
  *
  * @author Esther Brunner <esther@kaffeehaus.ch>
+ *
+ * @param string $id    page id
+ * @param array  $orig  the original metadata
+ * @return array|null array('current'=> array,'persistent'=> array);
  */
 function p_render_metadata($id, $orig){
     // make sure the correct ID is in global ID
@@ -477,6 +503,8 @@ function p_render_metadata($id, $orig){
  * returns all available parser syntax modes in correct order
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return array[] with for each plugin the array('sort' => sortnumber, 'mode' => mode string, 'obj'  => plugin object)
  */
 function p_get_parsermodes(){
     global $conf;
@@ -569,6 +597,10 @@ function p_get_parsermodes(){
  * Callback function for usort
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $a
+ * @param array $b
+ * @return int $a is lower/equal/higher than $b
  */
 function p_sort_modes($a, $b){
     if($a['sort'] == $b['sort']) return 0;
@@ -582,6 +614,11 @@ function p_sort_modes($a, $b){
  *
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $mode
+ * @param array  $instructions
+ * @param array  $info returns render info like enabled toc and cache
+ * @return null|string rendered output
  */
 function p_render($mode,$instructions,&$info){
     if(is_null($instructions)) return '';
@@ -673,8 +710,8 @@ function p_get_renderer($mode) {
  *                                              METADATA_RENDER_USING_SIMPLE_CACHE,
  *                                              METADATA_RENDER_USING_CACHE,
  *                                              METADATA_RENDER_UNLIMITED
- *
  * @return string|null The first heading
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Hamann <michael@content-space.de>
  */
@@ -688,8 +725,8 @@ function p_get_first_heading($id, $render=METADATA_RENDER_USING_SIMPLE_CACHE){
  * @param  string   $code       source code to be highlighted
  * @param  string   $language   language to provide highlighting
  * @param  string   $wrapper    html element to wrap the returned highlighted text
- *
  * @return string xhtml code
+ *
  * @author Christopher Smith <chris@jalakai.co.uk>
  * @author Andreas Gohr <andi@splitbrain.org>
  */
diff --git a/inc/plugin.php b/inc/plugin.php
index fbfc0325f..8432b21b2 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -48,14 +48,25 @@ class DokuWiki_Plugin {
 
     // plugin introspection methods
     // extract from class name, format = <plugin type>_plugin_<name>[_<component name>]
+    /**
+     * @return string  plugin type
+     */
     function getPluginType() {
         list($t) = explode('_', get_class($this), 2);
         return $t;
     }
+
+    /**
+     * @return string  plugin name
+     */
     function getPluginName() {
         list($t, $p, $n) = explode('_', get_class($this), 4);
         return $n;
     }
+
+    /**
+     * @return string  component name
+     */
     function getPluginComponent() {
         list($t, $p, $n, $c) = explode('_', get_class($this), 4);
         return (isset($c)?$c:'');
@@ -91,9 +102,11 @@ class DokuWiki_Plugin {
     }
 
     /**
-     * localFN($id)
-     * prepends appropriate path for a language dependent filename
+     * Prepends appropriate path for a language dependent filename
      * plugin equivalent of localFN()
+     *
+     * @param string $id id of localization file
+     * @return string wiki text
      */
     function localFN($id) {
         global $conf;
@@ -110,9 +123,8 @@ class DokuWiki_Plugin {
     }
 
     /**
-     *  setupLocale()
-     *  reads all the plugins language dependent strings into $this->lang
-     *  this function is automatically called by getLang()
+     * Reads all the plugins language dependent strings into $this->lang
+     * this function is automatically called by getLang()
      */
     function setupLocale() {
         if ($this->localised) return;
@@ -196,8 +208,7 @@ class DokuWiki_Plugin {
      *
      * @param   string $name   name of plugin to load
      * @param   bool   $msg    if a message should be displayed in case the plugin is not available
-     *
-     * @return  object  helper plugin object
+     * @return  DokuWiki_Plugin|null helper plugin object
      */
     function loadHelper($name, $msg = true){
         $obj = plugin_load('helper',$name);
@@ -211,6 +222,12 @@ class DokuWiki_Plugin {
     /**
      * email
      * standardised function to generate an email link according to obfuscation settings
+     *
+     * @param string $email
+     * @param string $name
+     * @param string $class
+     * @param string $more
+     * @return string html
      */
     function email($email, $name='', $class='', $more='') {
         if (!$email) return $name;
@@ -223,6 +240,13 @@ class DokuWiki_Plugin {
     /**
      * external_link
      * standardised function to generate an external link according to conf settings
+     *
+     * @param string $link
+     * @param string $title
+     * @param string $class
+     * @param string $target
+     * @param string $more
+     * @return string
      */
     function external_link($link, $title='', $class='', $target='', $more='') {
         global $conf;
@@ -247,8 +271,9 @@ class DokuWiki_Plugin {
      * Instead use render_text()
      *
      * @deprecated 2014-01-22
-     * @param $name
-     * @param $arguments
+     *
+     * @param string $name
+     * @param array  $arguments
      * @return null|string
      */
     function __call($name, $arguments) {
@@ -265,7 +290,7 @@ class DokuWiki_Plugin {
      * output text string through the parser, allows dokuwiki markup to be used
      * very ineffecient for small pieces of data - try not to use
      *
-     * @param string $text wiki markup to parse
+     * @param string $text   wiki markup to parse
      * @param string $format output format
      * @return null|string
      */
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 86c10585e..21d227ee4 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -114,7 +114,7 @@ class Doku_Plugin_Controller {
      * Whether plugin is disabled
      *
      * @param string $plugin name of plugin
-     * @return bool; true disabled, false enabled
+     * @return bool  true disabled, false enabled
      */
     public function isdisabled($plugin) {
         return empty($this->tmp_plugins[$plugin]);
@@ -124,7 +124,7 @@ class Doku_Plugin_Controller {
      * Disable the plugin
      *
      * @param string $plugin name of plugin
-     * @return bool; true saving succeed, false saving failed
+     * @return bool  true saving succeed, false saving failed
      */
     public function disable($plugin) {
         if(array_key_exists($plugin,$this->plugin_cascade['protected'])) return false;
@@ -136,7 +136,7 @@ class Doku_Plugin_Controller {
      * Enable the plugin
      *
      * @param string $plugin name of plugin
-     * @return bool; true saving succeed, false saving failed
+     * @return bool  true saving succeed, false saving failed
      */
     public function enable($plugin) {
         if(array_key_exists($plugin,$this->plugin_cascade['protected'])) return false;
@@ -227,7 +227,7 @@ class Doku_Plugin_Controller {
      * @param bool $forceSave;
      *              false to save only when config changed
      *              true to always save
-     * @return bool; true saving succeed, false saving failed
+     * @return bool  true saving succeed, false saving failed
      */
     protected function saveList($forceSave = false) {
         global $conf;
@@ -300,12 +300,9 @@ class Doku_Plugin_Controller {
     /**
      * Returns a list of available plugin components of given type
      *
-     * @param string $type, plugin_type name;
-     *                      the type of plugin to return,
-     * @param bool   $enabled;
-     *                      true to return enabled plugins,
-     *                      false to return disabled plugins
-     *
+     * @param string $type      plugin_type name; the type of plugin to return,
+     * @param bool   $enabled   true to return enabled plugins,
+     *                          false to return disabled plugins
      * @return array of plugin components of requested type
      */
     protected function _getListByType($type, $enabled) {
diff --git a/inc/remote.php b/inc/remote.php
index a21ef1e25..861353a19 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -60,6 +60,9 @@ class RemoteAPI {
     private $dateTransformation;
     private $fileTransformation;
 
+    /**
+     * constructor
+     */
     public function __construct() {
         $this->dateTransformation = array($this, 'dummyTransformation');
         $this->fileTransformation = array($this, 'dummyTransformation');
@@ -75,7 +78,7 @@ class RemoteAPI {
     }
 
     /**
-     * call a method via remote api.
+     * Call a method via remote api.
      *
      * @param string $method name of the method to call.
      * @param array $args arguments to pass to the given method
@@ -95,11 +98,25 @@ class RemoteAPI {
         return $this->callCustomCallPlugin($method, $args);
     }
 
+    /**
+     * Check existance of core methods
+     *
+     * @param string $name name of the method
+     * @return bool if method exists
+     */
     private function coreMethodExist($name) {
         $coreMethods = $this->getCoreMethods();
         return array_key_exists($name, $coreMethods);
     }
 
+    /**
+     * Try to call custom methods provided by plugins
+     *
+     * @param string $method name of method
+     * @param array  $args
+     * @return mixed
+     * @throws RemoteException if method not exists
+     */
     private function  callCustomCallPlugin($method, $args) {
         $customCalls = $this->getCustomCallPlugins();
         if (!array_key_exists($method, $customCalls)) {
@@ -109,6 +126,12 @@ class RemoteAPI {
         return $this->callPlugin($customCall[0], $customCall[1], $args);
     }
 
+    /**
+     * Returns plugin calls that are registered via RPC_CALL_ADD action
+     *
+     * @return array with pairs of custom plugin calls
+     * @triggers RPC_CALL_ADD
+     */
     private function getCustomCallPlugins() {
         if ($this->pluginCustomCalls === null) {
             $data = array();
@@ -118,6 +141,15 @@ class RemoteAPI {
         return $this->pluginCustomCalls;
     }
 
+    /**
+     * Call a plugin method
+     *
+     * @param string $pluginName
+     * @param string $method method name
+     * @param array  $args
+     * @return mixed return of custom method
+     * @throws RemoteException
+     */
     private function callPlugin($pluginName, $method, $args) {
         $plugin = plugin_load('remote', $pluginName);
         $methods = $this->getPluginMethods();
@@ -129,6 +161,14 @@ class RemoteAPI {
         return call_user_func_array(array($plugin, $name), $args);
     }
 
+    /**
+     * Call a core method
+     *
+     * @param string $method name of method
+     * @param array  $args
+     * @return mixed
+     * @throws RemoteException if method not exist
+     */
     private function callCoreMethod($method, $args) {
         $coreMethods = $this->getCoreMethods();
         $this->checkAccess($coreMethods[$method]);
@@ -139,6 +179,11 @@ class RemoteAPI {
         return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args);
     }
 
+    /**
+     * Check if access should be checked
+     *
+     * @param array $methodMeta data about the method
+     */
     private function checkAccess($methodMeta) {
         if (!isset($methodMeta['public'])) {
             $this->forceAccess();
@@ -149,12 +194,26 @@ class RemoteAPI {
         }
     }
 
-    private function checkArgumentLength($method, $args) {
-        if (count($method['args']) < count($args)) {
+    /**
+     * Check the number of parameters
+     *
+     * @param array $methodMeta data about the method
+     * @param array $args
+     * @throws RemoteException if wrong parameter count
+     */
+    private function checkArgumentLength($methodMeta, $args) {
+        if (count($methodMeta['args']) < count($args)) {
             throw new RemoteException('Method does not exist - wrong parameter count.', -32603);
         }
     }
 
+    /**
+     * Determine the name of the real method
+     *
+     * @param array $methodMeta list of data of the methods
+     * @param string $method name of method
+     * @return string
+     */
     private function getMethodName($methodMeta, $method) {
         if (isset($methodMeta[$method]['name'])) {
             return $methodMeta[$method]['name'];
@@ -164,6 +223,8 @@ class RemoteAPI {
     }
 
     /**
+     * Perform access check for current user
+     *
      * @return bool true if the current user has access to remote api.
      */
     public function hasAccess() {
@@ -186,8 +247,10 @@ class RemoteAPI {
     }
 
     /**
-     * @throws RemoteException On denied access.
+     * Requests access
+     *
      * @return void
+     * @throws RemoteException On denied access.
      */
     public function forceAccess() {
         if (!$this->hasAccess()) {
@@ -196,7 +259,10 @@ class RemoteAPI {
     }
 
     /**
+     * Collects all the methods of the enabled Remote Plugins
+     *
      * @return array all plugin methods.
+     * @throws RemoteException if not implemented
      */
     public function getPluginMethods() {
         if ($this->pluginMethods === null) {
@@ -204,6 +270,7 @@ class RemoteAPI {
             $plugins = plugin_list('remote');
 
             foreach ($plugins as $pluginName) {
+                /** @var DokuWiki_Remote_Plugin $plugin */
                 $plugin = plugin_load('remote', $pluginName);
                 if (!is_subclass_of($plugin, 'DokuWiki_Remote_Plugin')) {
                     throw new RemoteException("Plugin $pluginName does not implement DokuWiki_Remote_Plugin");
@@ -219,6 +286,8 @@ class RemoteAPI {
     }
 
     /**
+     * Collects all the core methods
+     *
      * @param RemoteAPICore $apiCore this parameter is used for testing. Here you can pass a non-default RemoteAPICore
      *                               instance. (for mocking)
      * @return array all core methods.
@@ -234,22 +303,50 @@ class RemoteAPI {
         return $this->coreMethods->__getRemoteInfo();
     }
 
+    /**
+     * Transform file to xml
+     *
+     * @param mixed $data
+     * @return mixed
+     */
     public function toFile($data) {
         return call_user_func($this->fileTransformation, $data);
     }
 
+    /**
+     * Transform date to xml
+     *
+     * @param mixed $data
+     * @return mixed
+     */
     public function toDate($data) {
         return call_user_func($this->dateTransformation, $data);
     }
 
+    /**
+     * A simple transformation
+     *
+     * @param mixed $data
+     * @return mixed
+     */
     public function dummyTransformation($data) {
         return $data;
     }
 
+    /**
+     * Set the transformer function
+     *
+     * @param callback $dateTransformation
+     */
     public function setDateTransformation($dateTransformation) {
         $this->dateTransformation = $dateTransformation;
     }
 
+    /**
+     * Set the transformer function
+     *
+     * @param callback $fileTransformation
+     */
     public function setFileTransformation($fileTransformation) {
         $this->fileTransformation = $fileTransformation;
     }
diff --git a/inc/search.php b/inc/search.php
index 79d930149..935969d3f 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -134,6 +134,11 @@ function search_namespaces(&$data,$base,$file,$type,$lvl,$opts){
 
 /**
  * List all mediafiles in a namespace
+ *   $opts['depth']     recursion level, 0 for all
+ *   $opts['showmsg']   shows message if invalid media id is used
+ *   $opts['skipacl']   skip acl checking
+ *   $opts['pattern']   check given pattern
+ *   $opts['hash']      add hashes to result list
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
diff --git a/inc/subscription.php b/inc/subscription.php
index bad98cf6c..58376f2ec 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -444,11 +444,11 @@ class Subscription {
      * Send the diff for some media change
      *
      * @fixme this should embed thumbnails of images in HTML version
+     *
      * @param string   $subscriber_mail The target mail address
      * @param string   $template        Mail template ('uploadmail', ...)
      * @param string   $id              Media file for which the notification is
      * @param int|bool $rev             Old revision if any
-     * @return bool                     true if successfully sent
      */
     public function send_media_diff($subscriber_mail, $template, $id, $rev = false) {
         global $conf;
@@ -619,6 +619,7 @@ class Subscription {
 
     /**
      * Get a valid message id for a certain $id and revision (or the current revision)
+     *
      * @param string $id  The id of the page (or media file) the message id should be for
      * @param string $rev The revision of the page, set to the current revision of the page $id if not set
      * @return string
diff --git a/inc/template.php b/inc/template.php
index 49f6986fd..98ea9df82 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -68,6 +68,7 @@ function tpl_basedir($tpl='') {
  * handled by this function. ACL stuff is not done here either.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @triggers TPL_ACT_RENDER
  * @triggers TPL_CONTENT_DISPLAY
  * @param bool $prependTOC should the TOC be displayed here?
@@ -186,6 +187,7 @@ function tpl_content_core() {
  * a false argument
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param bool $return Should the TOC be returned instead to be printed?
  * @return string
  */
@@ -243,6 +245,8 @@ function tpl_toc($return = false) {
  * Handle the admin page contents
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return bool
  */
 function tpl_admin() {
     global $INFO;
@@ -277,6 +281,7 @@ function tpl_admin() {
  * This has to go into the head section of your template.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @triggers TPL_METAHEADER_OUTPUT
  * @param  bool $alt Should feeds and alternative format links be added?
  * @return bool
@@ -426,10 +431,12 @@ function tpl_metaheaders($alt = true) {
  * instances. Attributes are given as key value pairs. Values will be HTML
  * encoded automatically so they should be provided as is in the $data array.
  *
- * For tags having a body attribute specify the the body data in the special
+ * For tags having a body attribute specify the body data in the special
  * attribute '_data'. This field will NOT BE ESCAPED automatically.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $data
  */
 function _tpl_metaheaders_action($data) {
     foreach($data as $tag => $inst) {
@@ -456,6 +463,12 @@ function _tpl_metaheaders_action($data) {
  * Just builds a link.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $url
+ * @param string $name
+ * @param string $more
+ * @param bool $return return html
+ * @return bool|string html or true
  */
 function tpl_link($url, $name, $more = '', $return = false) {
     $out = '<a href="'.$url.'" ';
@@ -472,6 +485,10 @@ function tpl_link($url, $name, $more = '', $return = false) {
  * Wrapper around html_wikilink
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string      $id   page id
+ * @param string|null $name the name of the link
+ * @return bool
  */
 function tpl_pagelink($id, $name = null) {
     print '<bdi>'.html_wikilink($id, $name).'</bdi>';
@@ -485,6 +502,9 @@ function tpl_pagelink($id, $name = null) {
  * returns false if none is available
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $id page id
+ * @return false|string
  */
 function tpl_getparent($id) {
     $parent = getNS($id).':';
@@ -539,7 +559,7 @@ function tpl_button($type, $return = false) {
  * @author Adrian Lang <mail@adrianlang.de>
  * @see    tpl_get_action
  *
- * @param string $type
+ * @param string $type action command
  * @param string $pre prefix of link
  * @param string $suf suffix of link
  * @param string $inner innerHML of link
@@ -767,7 +787,8 @@ function tpl_get_action($type) {
  * Wrapper around tpl_button() and tpl_actionlink()
  *
  * @author Anika Henke <anika@selfthinker.org>
- * @param
+ *
+ * @param string        $type action command
  * @param bool          $link link or form button?
  * @param string|bool   $wrapper HTML element wrapper
  * @param bool          $return return or print
@@ -801,6 +822,7 @@ function tpl_action($type, $link = false, $wrapper = false, $return = false, $pr
  * autocompletion feature (MSIE and Firefox)
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param bool $ajax
  * @param bool $autocomplete
  * @return bool
@@ -829,6 +851,7 @@ function tpl_searchform($ajax = true, $autocomplete = true) {
  * Print the breadcrumbs trace
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $sep Separator between entries
  * @return bool
  */
@@ -870,6 +893,7 @@ function tpl_breadcrumbs($sep = '•') {
  * @author Sean Coates <sean@caedmon.net>
  * @author <fredrik@averpil.com>
  * @todo   May behave strangely in RTL languages
+ *
  * @param string $sep Separator between entries
  * @return bool
  */
@@ -920,6 +944,7 @@ function tpl_youarehere($sep = ' » ') {
  * Could be enhanced with a profile link in future?
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @return bool
  */
 function tpl_userinfo() {
@@ -938,6 +963,7 @@ function tpl_userinfo() {
  * Print some info about the current page
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param bool $ret return content instead of printing it
  * @return bool|string
  */
@@ -1001,6 +1027,7 @@ function tpl_pageinfo($ret = false) {
  * the given ID is used.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $id page id
  * @param bool   $ret return content instead of printing
  * @return bool|string
@@ -1038,6 +1065,7 @@ function tpl_pagetitle($id = null, $ret = false) {
  * Only allowed in: detail.php
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param array  $tags tags to try
  * @param string $alt alternative output if no data was found
  * @param null|string   $src the image src, uses global $SRC if not given
@@ -1128,7 +1156,7 @@ function tpl_get_img_meta() {
  * @param $maxheight int - maximal height of the image
  * @param $link bool     - link to the orginal size?
  * @param $params array  - additional image attributes
- * @return mixed Result of TPL_IMG_DISPLAY
+ * @return bool Result of TPL_IMG_DISPLAY
  */
 function tpl_img($maxwidth = 0, $maxheight = 0, $link = true, $params = null) {
     global $IMG;
@@ -1280,6 +1308,9 @@ function tpl_loadConfig() {
  * tpl_getLang($id)
  *
  * use this function to access template language variables
+ *
+ * @param string $id key of language string
+ * @return string
  */
 function tpl_getLang($id) {
     static $lang = array();
@@ -1311,6 +1342,9 @@ function tpl_locale_xhtml($id) {
 
 /**
  * Prepends appropriate path for a language dependent filename
+ *
+ * @param string $id id of localized text
+ * @return string wiki text
  */
 function tpl_localeFN($id) {
     $path = tpl_incdir().'lang/';
@@ -1337,6 +1371,8 @@ function tpl_localeFN($id) {
  *
  * @triggers MEDIAMANAGER_CONTENT_OUTPUT
  * @param bool $fromajax - set true when calling this function via ajax
+ * @param string $sort
+
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function tpl_mediaContent($fromajax = false, $sort='natural') {
@@ -1511,6 +1547,9 @@ function tpl_mediaTree() {
  * Note: this will not use any pretty URLs
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $empty empty option label
+ * @param string $button submit button label
  */
 function tpl_actiondropdown($empty = '', $button = '&gt;') {
     global $ID;
@@ -1737,10 +1776,11 @@ function tpl_flush() {
  * If a given location starts with a colon it is assumed to be a media
  * file, otherwise it is assumed to be relative to the current template
  *
- * @param  array $search       locations to look at
- * @param  bool  $abs           if to use absolute URL
- * @param  array &$imginfo   filled with getimagesize()
+ * @param  string[] $search       locations to look at
+ * @param  bool     $abs           if to use absolute URL
+ * @param  array   &$imginfo   filled with getimagesize()
  * @return string
+ *
  * @author Andreas  Gohr <andi@splitbrain.org>
  */
 function tpl_getMediaFile($search, $abs = false, &$imginfo = null) {
@@ -1791,6 +1831,8 @@ function tpl_getMediaFile($search, $abs = false, &$imginfo = null) {
  *
  * @author Anika Henke <anika@selfthinker.org>
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file
  */
 function tpl_includeFile($file) {
     global $config_cascade;
@@ -1816,6 +1858,7 @@ function tpl_includeFile($file) {
  * Returns <link> tag for various icon types (favicon|mobile|generic)
  *
  * @author Anika Henke <anika@selfthinker.org>
+ *
  * @param  array $types - list of icon types to display (favicon|mobile|generic)
  * @return string
  */
@@ -1891,6 +1934,8 @@ function tpl_media() {
  * Return useful layout classes
  *
  * @author Anika Henke <anika@selfthinker.org>
+ *
+ * @return string
  */
 function tpl_classes() {
     global $ACT, $conf, $ID, $INFO;
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index c09daa17c..3a878ebe4 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -40,10 +40,18 @@ class dokuwiki_xmlrpc_server extends IXR_Server {
         }
     }
 
+    /**
+     * @param string|int $data iso date(yyyy[-]mm[-]dd[ hh:mm[:ss]]) or timestamp
+     * @return IXR_Date
+     */
     function toDate($data) {
         return new IXR_Date($data);
     }
 
+    /**
+     * @param string $data
+     * @return IXR_Base64
+     */
     function toFile($data) {
         return new IXR_Base64($data);
     }
diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 2fdc697db..b10c544ee 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -1,7 +1,16 @@
 <?php
 
+/**
+ * Class remote_plugin_acl
+ */
 class remote_plugin_acl extends DokuWiki_Remote_Plugin {
-    function _getMethods() {
+
+    /**
+     * Returns details about the remote plugin methods
+     *
+     * @return array
+     */
+    public function _getMethods() {
         return array(
             'addAcl' => array(
                 'args' => array('string','string','int'),
@@ -17,13 +26,28 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
         );
     }
 
-    function addAcl($scope, $user, $level){
+    /**
+     * Add a new entry to ACL config
+     *
+     * @param string $scope
+     * @param string $user
+     * @param int    $level see also inc/auth.php
+     * @return bool
+     */
+    public function addAcl($scope, $user, $level){
         /** @var admin_plugin_acl $apa */
         $apa = plugin_load('admin', 'acl');
         return $apa->_acl_add($scope, $user, $level);
     }
 
-    function delAcl($scope, $user){
+    /**
+     * Remove an entry from ACL config
+     *
+     * @param string $scope
+     * @param string $user
+     * @return bool
+     */
+    public function delAcl($scope, $user){
         /** @var admin_plugin_acl $apa */
         $apa = plugin_load('admin', 'acl');
         return $apa->_acl_del($scope, $user);
-- 
cgit v1.2.3


From aecab027b93163e5323c66056fa5da665beef091 Mon Sep 17 00:00:00 2001
From: Rainbow Spike <Rainbow_Spike@derpy.ru>
Date: Wed, 1 Oct 2014 21:06:29 +1100
Subject: Update lang.php

Microfix
---
 lib/plugins/extension/lang/ru/lang.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index fa1625f28..7fb39b3e9 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -25,7 +25,7 @@ $lang['js']['reallydel']       = 'Действительно удалить эт
 $lang['search_for']            = 'Поиск дополнения:';
 $lang['search']                = 'Найти';
 $lang['extensionby']           = '<strong>%s</strong> — %s';
-$lang['popularity']            = 'Попоулярность: %s%%';
+$lang['popularity']            = 'Популярность: %s%%';
 $lang['bugs_features']         = 'Ошибки';
 $lang['tags']                  = 'Метки:';
 $lang['author_hint']           = 'Найти дополнения этого автора';
@@ -46,23 +46,23 @@ $lang['repo_retry']            = 'Повторить';
 $lang['status_installed']      = 'установлено';
 $lang['status_not_installed']  = 'не установлено';
 $lang['status_protected']      = 'защищено';
-$lang['status_enabled']        = 'включен';
+$lang['status_enabled']        = 'включён';
 $lang['status_disabled']       = 'отключено';
 $lang['status_unmodifiable']   = 'неизменяемо';
 $lang['status_plugin']         = 'плагин';
 $lang['status_template']       = 'шаблон';
 $lang['status_bundled']        = 'в комплекте';
-$lang['msg_enabled']           = 'Плагин %s включен';
-$lang['msg_disabled']          = 'Плагин %s отключен';
+$lang['msg_enabled']           = 'Плагин %s включён';
+$lang['msg_disabled']          = 'Плагин %s отключён';
 $lang['msg_delete_success']    = 'Дополнение удалено';
 $lang['msg_template_install_success'] = 'Шаблон %s успешно установлен';
 $lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён';
 $lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен';
 $lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён';
-$lang['noperms']               = 'Папка для расширений не доступна на запись';
-$lang['notplperms']            = 'Папка для шаблонов не доступна на запись';
-$lang['nopluginperms']         = 'Папка плагинов не доступна на запись';
+$lang['noperms']               = 'Папка для расширений не доступна для записи';
+$lang['notplperms']            = 'Папка для шаблонов не доступна для записи';
+$lang['nopluginperms']         = 'Папка плагинов не доступна для записи';
 $lang['git']                   = 'Это расширение было установлено через git, Вы не можете обновить его тут.';
 $lang['install_url']           = 'Установить с адреса URL:';
 $lang['install_upload']        = 'Скачать расширение:';
-$lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org и также проверьте настройки соединения прокси.';
+$lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернет.';
-- 
cgit v1.2.3


From c9ed469e27be4a4219828772ce868b8273f09183 Mon Sep 17 00:00:00 2001
From: Rainbow Spike <Rainbow_Spike@derpy.ru>
Date: Wed, 1 Oct 2014 21:27:35 +1100
Subject: Update index.php

1 typo
---
 lib/images/smileys/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/images/smileys/index.php b/lib/images/smileys/index.php
index 9a2905b33..4167eda5b 100644
--- a/lib/images/smileys/index.php
+++ b/lib/images/smileys/index.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
-    <title>simleys</title>
+    <title>smileys</title>
 
     <style type="text/css">
         body {
-- 
cgit v1.2.3


From 253d4b48ec708eb42033862dc15c8576f44a48ed Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 1 Oct 2014 15:32:05 +0200
Subject: more PHPDocs, unused var, small bit code reformatting

---
 inc/ZipLib.class.php                         |  72 +++++++++-
 inc/utf8.php                                 |  95 +++++++++---
 install.php                                  |  20 +++
 lib/exe/css.php                              |  30 +++-
 lib/exe/js.php                               |  16 +++
 lib/plugins/auth.php                         |   4 +-
 lib/plugins/authad/auth.php                  |   7 +-
 lib/plugins/authmysql/auth.php               |  12 +-
 lib/plugins/authpgsql/auth.php               |   9 +-
 lib/plugins/authplain/auth.php               |   2 +-
 lib/plugins/config/admin.php                 |  45 +++++-
 lib/plugins/config/settings/config.class.php | 208 ++++++++++++++++++++++++---
 lib/plugins/config/settings/extra.class.php  |  96 +++++++++++++
 lib/plugins/extension/helper/extension.php   |   8 +-
 lib/plugins/extension/helper/list.php        |   1 -
 lib/plugins/info/syntax.php                  |  23 ++-
 lib/plugins/popularity/helper.php            |  13 ++
 lib/plugins/syntax.php                       |   7 +-
 lib/plugins/usermanager/admin.php            |  28 +++-
 19 files changed, 625 insertions(+), 71 deletions(-)

diff --git a/inc/ZipLib.class.php b/inc/ZipLib.class.php
index cec518b05..0b7bfa05e 100644
--- a/inc/ZipLib.class.php
+++ b/inc/ZipLib.class.php
@@ -16,6 +16,10 @@ class ZipLib {
     var $old_offset = 0;
     var $dirs = Array(".");
 
+    /**
+     * @param string $zip_name filename path to file
+     * @return array|int
+     */
     function get_List($zip_name) {
         $zip = @fopen($zip_name, 'rb');
         if(!$zip) return(0);
@@ -47,6 +51,11 @@ class ZipLib {
         return $ret;
     }
 
+    /**
+     * @param array $files   array filled with array(string filename, string data)
+     * @param bool  $compact
+     * @return array
+     */
     function Add($files,$compact) {
         if(!is_array($files[0])) $files=Array($files);
 
@@ -63,6 +72,10 @@ class ZipLib {
 
     /**
      * Zips recursively the $folder directory, from the $basedir directory
+     *
+     * @param string $folder filename path to file
+     * @param string|null $basedir
+     * @param string|null $parent
      */
     function Compress($folder, $basedir=null, $parent=null) {
         $full_path = $basedir."/".$parent.$folder;
@@ -73,6 +86,7 @@ class ZipLib {
         }
         $dir = new DirectoryIterator($full_path);
         foreach($dir as $file) {
+            /** @var DirectoryIterator $file */
             if(!$file->isDot()) {
                 $filename = $file->getFilename();
                 if($file->isDir()) {
@@ -87,6 +101,8 @@ class ZipLib {
 
     /**
      * Returns the Zip file
+     *
+     * @return string
      */
     function get_file() {
         $data = implode('', $this -> datasec);
@@ -97,6 +113,9 @@ class ZipLib {
             pack('V', strlen($ctrldir)) . pack('V', strlen($data)) . "\x00\x00";
     }
 
+    /**
+     * @param string $name the name of the directory
+     */
     function add_dir($name) {
         $name = str_replace("\\", "/", $name);
         $fr = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00";
@@ -120,6 +139,11 @@ class ZipLib {
 
     /**
      * Add a file named $name from a string $data
+     *
+     * @param string $data
+     * @param string $name filename
+     * @param int $compact
+     * @return bool
      */
     function add_File($data, $name, $compact = 1) {
         $name     = str_replace('\\', '/', $name);
@@ -169,6 +193,9 @@ class ZipLib {
         return true;
     }
 
+    /**
+     * @return int
+     */
     function DosTime() {
         $timearray = getdate();
         if ($timearray['year'] < 1980) {
@@ -189,6 +216,11 @@ class ZipLib {
 
     /**
      * Extract a zip file $zn to the $to directory
+     *
+     * @param string $zn filename
+     * @param string $to filename path to file
+     * @param array $index
+     * @return array|int
      */
     function Extract ( $zn, $to, $index = Array(-1) ) {
         if(!@is_dir($to)) $this->_mkdir($to);
@@ -221,6 +253,11 @@ class ZipLib {
         return $stat;
     }
 
+    /**
+     * @param resource $zip
+     * @param array $header
+     * @return array
+     */
     function ReadFileHeader($zip, $header) {
         $binary_data = fread($zip, 30);
         $data = unpack('vchk/vid/vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $binary_data);
@@ -257,6 +294,10 @@ class ZipLib {
         return $header;
     }
 
+    /**
+     * @param resource $zip
+     * @return array
+     */
     function ReadCentralFileHeaders($zip){
         $binary_data = fread($zip, 46);
         $header = unpack('vchkid/vid/vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $binary_data);
@@ -298,6 +339,11 @@ class ZipLib {
         return $header;
     }
 
+    /**
+     * @param resource $zip
+     * @param string   $zip_name filename path to file
+     * @return array
+     */
     function ReadCentralDir($zip,$zip_name) {
         $size = filesize($zip_name);
         if ($size < 277){
@@ -338,6 +384,12 @@ class ZipLib {
         return $centd;
     }
 
+    /**
+     * @param array    $header
+     * @param string   $to     filename path to file
+     * @param resource $zip
+     * @return bool|int
+     */
     function ExtractFile($header,$to,$zip) {
         $header = $this->readfileheader($zip, $header);
 
@@ -418,12 +470,19 @@ class ZipLib {
      * centralize mkdir calls and use dokuwiki io functions
      *
      * @author Christopher Smith <chris@jalakai.co.uk>
+     *
+     * @param string $d filename path to file
+     * @return bool|int|string
      */
     function _mkdir($d) {
         return io_mkdir_p($d);
     }
 
-
+    /**
+     * @param string $zn
+     * @param string $name
+     * @return null|string
+     */
     function ExtractStr($zn, $name) {
         $zip = @fopen($zn,'rb');
         if(!$zip) return(null);
@@ -448,8 +507,13 @@ class ZipLib {
         return null;
     }
 
+    /**
+     * @param array $header
+     * @param resource $zip
+     * @return null|string
+     */
     function ExtractStrFile($header,$zip) {
-        $hdr = $this->readfileheader($zip);
+        $hdr = $this->readfileheader($zip, $header);
         $binary_data = '';
         if (!($header['external']==0x41FF0010) && !($header['external']==16)) {
             if ($header['compression']==0) {
@@ -487,6 +551,10 @@ class ZipLib {
         return null;
     }
 
+    /**
+     * @param string $val
+     * @return int|string
+     */
     function _ret_bytes($val) {
         $val = trim($val);
         $last = $val{strlen($val)-1};
diff --git a/inc/utf8.php b/inc/utf8.php
index c944667f7..b3f2b5fe8 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -43,6 +43,9 @@ if(!function_exists('utf8_isASCII')){
      * Checks if a string contains 7bit ASCII only
      *
      * @author Andreas Haerter <andreas.haerter@dev.mail-node.com>
+     *
+     * @param string $str
+     * @return bool
      */
     function utf8_isASCII($str){
         return (preg_match('/(?:[^\x00-\x7F])/', $str) !== 1);
@@ -56,6 +59,9 @@ if(!function_exists('utf8_strip')){
      * Returns a pure ASCII7 string
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $str
+     * @return string
      */
     function utf8_strip($str){
         $ascii = '';
@@ -75,6 +81,9 @@ if(!function_exists('utf8_check')){
      *
      * @author <bmorel@ssi.fr>
      * @link   http://www.php.net/manual/en/function.utf8-encode.php
+     *
+     * @param string $Str
+     * @return bool
      */
     function utf8_check($Str) {
         $len = strlen($Str);
@@ -105,6 +114,7 @@ if(!function_exists('utf8_basename')){
      *
      * @see basename()
      * @link   https://bugs.php.net/bug.php?id=37738
+     *
      * @param string $path     A path
      * @param string $suffix   If the name component ends in suffix this will also be cut off
      * @return string
@@ -134,6 +144,9 @@ if(!function_exists('utf8_strlen')){
      * @author <chernyshevsky at hotmail dot com>
      * @see    strlen()
      * @see    utf8_decode()
+     *
+     * @param string $string
+     * @return int
      */
     function utf8_strlen($string){
         return strlen(utf8_decode($string));
@@ -148,10 +161,11 @@ if(!function_exists('utf8_substr')){
      *
      * @author Harry Fuecks <hfuecks@gmail.com>
      * @author Chris Smith <chris@jalakai.co.uk>
+     *
      * @param string $str
      * @param int $offset number of UTF-8 characters offset (from left)
      * @param int $length (optional) length in UTF-8 characters from offset
-     * @return mixed string or false if failure
+     * @return string
      */
     function utf8_substr($str, $offset, $length = null) {
         if(UTF8_MBSTRING){
@@ -250,6 +264,14 @@ if(!function_exists('utf8_substr_replace')){
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @see    substr_replace()
+     *
+     * @param string $string      input string
+     * @param string $replacement the replacement
+     * @param int    $start       the replacing will begin at the start'th offset into string.
+     * @param int    $length      If given and is positive, it represents the length of the portion of string which is
+     *                            to be replaced. If length is zero then this function will have the effect of inserting
+     *                            replacement into string at the given start offset.
+     * @return string
      */
     function utf8_substr_replace($string, $replacement, $start , $length=0 ){
         $ret = '';
@@ -266,6 +288,7 @@ if(!function_exists('utf8_ltrim')){
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @see    ltrim()
+     *
      * @param  string $str
      * @param  string $charlist
      * @return string
@@ -286,6 +309,7 @@ if(!function_exists('utf8_rtrim')){
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @see    rtrim()
+     *
      * @param  string $str
      * @param  string $charlist
      * @return string
@@ -306,6 +330,7 @@ if(!function_exists('utf8_trim')){
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @see    trim()
+     *
      * @param  string $str
      * @param  string $charlist
      * @return string
@@ -326,6 +351,9 @@ if(!function_exists('utf8_strtolower')){
      * @author Leo Feyer <leo@typolight.org>
      * @see    strtolower()
      * @see    utf8_strtoupper()
+     *
+     * @param string $string
+     * @return string
      */
     function utf8_strtolower($string){
         if(UTF8_MBSTRING) return mb_strtolower($string,'utf-8');
@@ -344,6 +372,9 @@ if(!function_exists('utf8_strtoupper')){
      * @author Leo Feyer <leo@typolight.org>
      * @see    strtoupper()
      * @see    utf8_strtoupper()
+     *
+     * @param string $string
+     * @return string
      */
     function utf8_strtoupper($string){
         if(UTF8_MBSTRING) return mb_strtoupper($string,'utf-8');
@@ -359,7 +390,8 @@ if(!function_exists('utf8_ucfirst')){
      * Make a string's first character uppercase
      *
      * @author Harry Fuecks
-     * @param string
+     *
+     * @param string $str
      * @return string with first character as upper case (if applicable)
      */
     function utf8_ucfirst($str){
@@ -381,9 +413,10 @@ if(!function_exists('utf8_ucwords')){
      * Uppercase the first character of each word in a string
      *
      * @author Harry Fuecks
-     * @param string
-     * @return string with first char of each word uppercase
      * @see http://www.php.net/ucwords
+     *
+     * @param string $str
+     * @return string with first char of each word uppercase
      */
     function utf8_ucwords($str) {
         // Note: [\x0c\x09\x0b\x0a\x0d\x20] matches;
@@ -399,10 +432,11 @@ if(!function_exists('utf8_ucwords')){
      * You don't need to call this yourself
      *
      * @author Harry Fuecks
-     * @param  array $matches matches corresponding to a single word
-     * @return string with first char of the word in uppercase
      * @see utf8_ucwords
      * @see utf8_strtoupper
+     *
+     * @param  array $matches matches corresponding to a single word
+     * @return string with first char of the word in uppercase
      */
     function utf8_ucwords_callback($matches) {
         $leadingws = $matches[2];
@@ -420,6 +454,10 @@ if(!function_exists('utf8_deaccent')){
      * letters. Default is to deaccent both cases ($case = 0)
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $string
+     * @param int $case
+     * @return string
      */
     function utf8_deaccent($string,$case=0){
         if($case <= 0){
@@ -439,6 +477,9 @@ if(!function_exists('utf8_romanize')){
      * Romanize a non-latin string
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $string
+     * @return string
      */
     function utf8_romanize($string){
         if(utf8_isASCII($string)) return $string; //nothing to do
@@ -456,6 +497,7 @@ if(!function_exists('utf8_stripspecials')){
      * stripped chars (they are not included in $UTF8_SPECIAL_CHARS)
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
      * @param  string $string     The UTF8 string to strip of special chars
      * @param  string $repl       Replace special with this string
      * @param  string $additional Additional chars to strip (used in regexp char class)
@@ -480,9 +522,10 @@ if(!function_exists('utf8_strpos')){
      *
      * @author Leo Feyer <leo@typolight.org>
      * @see    strpos()
-     * @param  string
-     * @param  string
-     * @param  integer
+     *
+     * @param  string  $haystack
+     * @param  string  $needle
+     * @param  integer $offset
      * @return integer
      */
     function utf8_strpos($haystack, $needle, $offset=0){
@@ -512,6 +555,9 @@ if(!function_exists('utf8_tohtml')){
      * @author Tom N Harris <tnharris@whoopdedo.org>
      * @author <vpribish at shopping dot com>
      * @link   http://www.php.net/manual/en/function.utf8-decode.php
+     *
+     * @param string $str
+     * @return string
      */
     function utf8_tohtml ($str) {
         $ret = '';
@@ -542,6 +588,7 @@ if(!function_exists('utf8_unhtml')){
      * what it should be                   -> "&#38;&amp#38;"
      *
      * @author Tom N Harris <tnharris@whoopdedo.org>
+     *
      * @param  string  $str      UTF-8 encoded string
      * @param  boolean $entities Flag controlling decoding of named entities.
      * @return string  UTF-8 encoded string with numeric (and named) entities replaced.
@@ -597,10 +644,10 @@ if(!class_exists('utf8_entity_decoder')){
         }
 
         /**
-         * Wrapper aorund unicode_to_utf8()
+         * Wrapper around unicode_to_utf8()
          *
-         * @param $c string
-         * @return mixed
+         * @param string $c
+         * @return string|false
          */
         function makeutf8($c) {
             return unicode_to_utf8(array(ord($c)));
@@ -609,7 +656,7 @@ if(!class_exists('utf8_entity_decoder')){
         /**
          * Decodes any HTML entity to it's correct UTF-8 char equivalent
          *
-         * @param $ent string An entity
+         * @param string $ent An entity
          * @return string
          */
         function decode($ent) {
@@ -640,12 +687,13 @@ if(!function_exists('utf8_to_unicode')){
      *
      * @author <hsivonen@iki.fi>
      * @author Harry Fuecks <hfuecks@gmail.com>
-     * @param  string  $str UTF-8 encoded string
-     * @param  boolean $strict Check for invalid sequences?
-     * @return mixed array of unicode code points or false if UTF-8 invalid
      * @see    unicode_to_utf8
      * @link   http://hsivonen.iki.fi/php-utf8/
      * @link   http://sourceforge.net/projects/phputf8/
+     *
+     * @param  string  $str UTF-8 encoded string
+     * @param  boolean $strict Check for invalid sequences?
+     * @return mixed array of unicode code points or false if UTF-8 invalid
      */
     function utf8_to_unicode($str,$strict=false) {
         $mState = 0;     // cached expected number of octets after the current octet
@@ -815,7 +863,8 @@ if(!function_exists('unicode_to_utf8')){
      *
      * @param  array $arr of unicode code points representing a string
      * @param  boolean $strict Check for invalid sequences?
-     * @return mixed UTF-8 string or false if array contains invalid code points
+     * @return string|false UTF-8 string or false if array contains invalid code points
+     *
      * @author <hsivonen@iki.fi>
      * @author Harry Fuecks <hfuecks@gmail.com>
      * @see    utf8_to_unicode
@@ -896,6 +945,10 @@ if(!function_exists('utf8_to_utf16be')){
      * UTF-8 to UTF-16BE conversion.
      *
      * Maybe really UCS-2 without mb_string due to utf8_to_unicode limits
+     *
+     * @param string $str
+     * @param bool $bom
+     * @return string
      */
     function utf8_to_utf16be(&$str, $bom = false) {
         $out = $bom ? "\xFE\xFF" : '';
@@ -914,6 +967,9 @@ if(!function_exists('utf16be_to_utf8')){
      * UTF-8 to UTF-16BE conversion.
      *
      * Maybe really UCS-2 without mb_string due to utf8_to_unicode limits
+     *
+     * @param string $str
+     * @return false|string
      */
     function utf16be_to_utf8(&$str) {
         $uni = unpack('n*',$str);
@@ -933,6 +989,7 @@ if(!function_exists('utf8_bad_replace')){
      *
      * @author Harry Fuecks <hfuecks@gmail.com>
      * @see http://www.w3.org/International/questions/qa-forms-utf-8
+     *
      * @param string $str to search
      * @param string $replace to replace bad bytes with (defaults to '?') - use ASCII
      * @return string
@@ -967,8 +1024,8 @@ if(!function_exists('utf8_correctIdx')){
     /**
      * adjust a byte index into a utf8 string to a utf8 character boundary
      *
-     * @param $str   string   utf8 character string
-     * @param $i     int      byte index into $str
+     * @param string $str   utf8 character string
+     * @param int    $i     byte index into $str
      * @param $next  bool     direction to search for boundary,
      *                           false = up (current character)
      *                           true = down (next character)
diff --git a/install.php b/install.php
index 767dd332f..71c2457dc 100644
--- a/install.php
+++ b/install.php
@@ -160,6 +160,8 @@ header('Content-Type: text/html; charset=utf-8');
 
 /**
  * Print the input form
+ *
+ * @param array $d submitted entry 'd' of request data
  */
 function print_form($d){
     global $lang;
@@ -265,6 +267,9 @@ function print_retry() {
  * Check validity of data
  *
  * @author Andreas Gohr
+ *
+ * @param array $d
+ * @return bool ok?
  */
 function check_data(&$d){
     static $form_default = array(
@@ -334,6 +339,9 @@ function check_data(&$d){
  * Writes the data to the config files
  *
  * @author  Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param array $d
+ * @return bool
  */
 function store_data($d){
     global $LC;
@@ -438,6 +446,10 @@ EOT;
  * Write the given content to a file
  *
  * @author  Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param string $filename
+ * @param string $data
+ * @return bool
  */
 function fileWrite($filename, $data) {
     global $error;
@@ -460,6 +472,8 @@ function fileWrite($filename, $data) {
  * unmodified main config file
  *
  * @author      Chris Smith <chris@jalakai.co.uk>
+ *
+ * @return bool
  */
 function check_configs(){
     global $error;
@@ -498,6 +512,8 @@ function check_configs(){
  * Check other installation dir/file permission requirements
  *
  * @author      Chris Smith <chris@jalakai.co.uk>
+ *
+ * @return bool
  */
 function check_permissions(){
     global $error;
@@ -533,6 +549,8 @@ function check_permissions(){
  * Check the availability of functions used in DokuWiki and the PHP version
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return bool
  */
 function check_functions(){
     global $error;
@@ -626,6 +644,8 @@ function print_errors(){
  * remove magic quotes recursivly
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $array
  */
 function remove_magic_quotes(&$array) {
     foreach (array_keys($array) as $key) {
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 6c1d60751..2212656d2 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -162,7 +162,7 @@ function css_out(){
  * most of this function is error handling to show a nice useful error when
  * LESS compilation fails
  *
- * @param $css
+ * @param string $css
  * @return string
  */
 function css_parseless($css) {
@@ -222,6 +222,10 @@ function css_parseless($css) {
  * (sans the surrounding __ and with a ini_ prefix)
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $css
+ * @param array $replacements  array(placeholder => value)
+ * @return string
  */
 function css_applystyle($css, $replacements) {
     // we convert ini replacements to LESS variable names
@@ -250,6 +254,7 @@ function css_applystyle($css, $replacements) {
  * the stylesheet modes
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
  * @param string $tpl the used template
  * @return array with keys 'stylesheets' and 'replacements'
  */
@@ -320,6 +325,10 @@ function css_styleini($tpl) {
  * Amend paths used in replacement relative urls, refer FS#2879
  *
  * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param array $replacements with key-value pairs
+ * @param string $location
+ * @return array
  */
 function css_fixreplacementurls($replacements, $location) {
     foreach($replacements as $key => $value) {
@@ -403,6 +412,10 @@ function css_filetypes(){
 /**
  * Loads a given file and fixes relative URLs with the
  * given location prefix
+ *
+ * @param string $file file system path
+ * @param string $location
+ * @return string
  */
 function css_loadfile($file,$location=''){
     $css_file = new DokuCssFile($file);
@@ -501,6 +514,9 @@ class DokuCssFile {
  * Convert local image URLs to data URLs if the filesize is small
  *
  * Callback for preg_replace_callback
+ *
+ * @param array $match
+ * @return string
  */
 function css_datauri($match){
     global $conf;
@@ -528,9 +544,11 @@ function css_datauri($match){
  * Returns a list of possible Plugin Styles (no existance check here)
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $mediatype
+ * @return array
  */
 function css_pluginstyles($mediatype='screen'){
-    global $lang;
     $list = array();
     $plugins = plugin_list();
     foreach ($plugins as $p){
@@ -549,6 +567,9 @@ function css_pluginstyles($mediatype='screen'){
  * Very simple CSS optimizer
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $css
+ * @return string
  */
 function css_compress($css){
     //strip comments through a callback
@@ -585,6 +606,9 @@ function css_compress($css){
  * Keeps short comments (< 5 chars) to maintain typical browser hacks
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param array $matches
+ * @return string
  */
 function css_comment_cb($matches){
     if(strlen($matches[2]) > 4) return '';
@@ -596,7 +620,7 @@ function css_comment_cb($matches){
  *
  * Strips one line comments but makes sure it will not destroy url() constructs with slashes
  *
- * @param $matches
+ * @param array $matches
  * @return string
  */
 function css_onelinecomment_cb($matches) {
diff --git a/lib/exe/js.php b/lib/exe/js.php
index bec12ef7a..97f2b52c3 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -154,6 +154,8 @@ function js_out(){
  * Load the given file, handle include calls and print it
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $file filename path to file
  */
 function js_load($file){
     if(!@file_exists($file)) return;
@@ -189,6 +191,8 @@ function js_load($file){
  * Returns a list of possible Plugin Scripts (no existance check here)
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return array
  */
 function js_pluginscripts(){
     $list = array();
@@ -206,6 +210,8 @@ function js_pluginscripts(){
  * - Nothing is returned for plugins without an entry for $lang['js']
  *
  * @author Gabriel Birke <birke@d-scribe.de>
+ *
+ * @return array
  */
 function js_pluginstrings() {
     global $conf;
@@ -231,6 +237,8 @@ function js_pluginstrings() {
  *
  * - $lang['js'] must be an array.
  * - Nothing is returned for template without an entry for $lang['js']
+ *
+ * @return array
  */
 function js_templatestrings() {
     global $conf;
@@ -252,6 +260,9 @@ function js_templatestrings() {
  * as newline
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $string
+ * @return string
  */
 function js_escape($string){
     return str_replace('\\\\n','\\n',addslashes($string));
@@ -261,6 +272,8 @@ function js_escape($string){
  * Adds the given JavaScript code to the window.onload() event
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $func
  */
 function js_runonstart($func){
     echo "jQuery(function(){ $func; });".NL;
@@ -275,6 +288,9 @@ function js_runonstart($func){
  * @author Nick Galbreath <nickg@modp.com>
  * @author Andreas Gohr <andi@splitbrain.org>
  * @link   http://code.google.com/p/jsstrip/
+ *
+ * @param string $s
+ * @return string
  */
 function js_compress($s){
     $s = ltrim($s);     // strip all initial whitespace
diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index 0d6ea2fa3..021bc5d4b 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -116,7 +116,7 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
      * @author Gabriel Birke <birke@d-scribe.de>
      * @param string $type   Modification type ('create', 'modify', 'delete')
      * @param array  $params Parameters for the createUser, modifyUser or deleteUsers method. The content of this array depends on the modification type
-     * @return mixed Result from the modification function or false if an event handler has canceled the action
+     * @return bool|null|int Result from the modification function or false if an event handler has canceled the action
      */
     public function triggerUserMod($type, $params) {
         $validTypes = array(
@@ -238,7 +238,7 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
      * @author  Andreas Gohr <andi@splitbrain.org>
      * @param   string $user the user name
      * @param   bool $requireGroups whether or not the returned data must include groups
-     * @return  array containing user data or false
+     * @return  false|array containing user data or false
      */
     public function getUserData($user, $requireGroups=true) {
         if(!$this->cando['external']) msg("no valid authorisation system in use", -1);
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 65f0b1647..88b56046c 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -329,6 +329,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * Bulk retrieval of user data
      *
      * @author  Dominik Eckelmann <dokuwiki@cosmocode.de>
+     *
      * @param   int   $start     index of first user to be returned
      * @param   int   $limit     max number of users to be returned
      * @param   array $filter    array of field/pattern pairs, null for no filter
@@ -447,7 +448,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     /**
      * Get the domain part from a user
      *
-     * @param $user
+     * @param string $user
      * @return string
      */
     public function _userDomain($user) {
@@ -458,7 +459,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     /**
      * Get the user part from a user
      *
-     * @param $user
+     * @param string $user
      * @return string
      */
     public function _userName($user) {
@@ -544,6 +545,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * The patterns are set up with $this->_constructPattern()
      *
      * @author Chris Smith <chris@jalakai.co.uk>
+     *
      * @param string $user
      * @param array  $info
      * @return bool
@@ -565,6 +567,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * Create a pattern for $this->_filter()
      *
      * @author Chris Smith <chris@jalakai.co.uk>
+     *
      * @param array $filter
      */
     protected function _constructPattern($filter) {
diff --git a/lib/plugins/authmysql/auth.php b/lib/plugins/authmysql/auth.php
index 0605a3bf1..0d423b6c9 100644
--- a/lib/plugins/authmysql/auth.php
+++ b/lib/plugins/authmysql/auth.php
@@ -115,7 +115,8 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      * Check if the given config strings are set
      *
      * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
-     * @param   array $keys
+     *
+     * @param   string[] $keys
      * @param   bool  $wop is this a check for a write operation?
      * @return  bool
      */
@@ -668,7 +669,6 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      *
      * @param  string  $user username of the user whose data is to be removed from the cache
      *                       if null, empty the whole cache
-     * @return none
      */
     protected function _flushUserInfoCache($user=null) {
         if (is_null($user)) {
@@ -750,7 +750,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
      *
      * @param  string $user  user's nick to get data for
-     * @return bool|array false on error, user info on success
+     * @return false|array false on error, user info on success
      */
     protected function _retrieveUserInfo($user) {
         $sql    = str_replace('%{user}', $this->_escape($user), $this->getConf('getUserInfo'));
@@ -837,7 +837,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
      *
      * @param  string $group   group name which id is desired
-     * @return mixed group id
+     * @return false|string group id
      */
     protected function _getGroupID($group) {
         if($this->dbcon) {
@@ -910,7 +910,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
      *
      * @param string $query  SQL string that contains the query
-     * @return array with the result table
+     * @return array|false with the result table
      */
     protected function _queryDB($query) {
         if($this->getConf('debug') >= 2) {
@@ -1001,6 +1001,8 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
      * abrogated.
      *
      * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     *
+     * @return bool
      */
     protected function _unlockTables() {
         if($this->dbcon) {
diff --git a/lib/plugins/authpgsql/auth.php b/lib/plugins/authpgsql/auth.php
index 4f5e3346f..06590fedd 100644
--- a/lib/plugins/authpgsql/auth.php
+++ b/lib/plugins/authpgsql/auth.php
@@ -104,7 +104,7 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
      *
      * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
      *
-     * @param   array $keys
+     * @param   string[] $keys
      * @param   bool  $wop
      * @return  bool
      */
@@ -340,7 +340,7 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
      * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
      *
      * @param  string $query  SQL string that contains the query
-     * @return array the result table
+     * @return array|false the result table
      */
     protected function _queryDB($query) {
         $resultarray = array();
@@ -363,6 +363,9 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
      * MySQL one because it does NOT return the last insertID
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param string $query
+     * @return bool
      */
     protected function _modifyDB($query) {
         if($this->dbcon) {
@@ -396,6 +399,8 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql {
      * Commit a transaction
      *
      * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     *
+     * @return bool
      */
     protected function _unlockTables() {
         if($this->dbcon) {
diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php
index b3ca988b9..1ea75b100 100644
--- a/lib/plugins/authplain/auth.php
+++ b/lib/plugins/authplain/auth.php
@@ -77,7 +77,7 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
      * @author  Andreas Gohr <andi@splitbrain.org>
      * @param string $user
      * @param bool $requireGroups  (optional) ignored by this plugin, grps info always supplied
-     * @return array|bool
+     * @return array|false
      */
     public function getUserData($user, $requireGroups=true) {
         if($this->users === null) $this->_loadUserData();
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 835d27775..9202a221b 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -32,6 +32,9 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
     var $_session_started = false;
     var $_localised_prompts = false;
 
+    /**
+     * @return int
+     */
     function getMenuSort() { return 100; }
 
     /**
@@ -40,14 +43,20 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
     function handle() {
         global $ID, $INPUT;
 
-        if (!$this->_restore_session()) return $this->_close_session();
-        if ($INPUT->int('save') != 1) return $this->_close_session();
-        if (!checkSecurityToken()) return $this->_close_session();
+        if(!$this->_restore_session() || $INPUT->int('save') != 1 || !checkSecurityToken()) {
+            $this->_close_session();
+            return;
+        }
 
-        if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
+        if(is_null($this->_config)) {
+            $this->_config = new configuration($this->_file);
+        }
 
         // don't go any further if the configuration is locked
-        if ($this->_config->_locked) return $this->_close_session();
+        if($this->_config->locked) {
+            $this->_close_session();
+            return;
+        }
 
         $this->_input = $INPUT->arr('config');
 
@@ -104,6 +113,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         formSecurityToken();
         $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));
 
+        /** @var setting[] $undefined_settings */
         $undefined_settings = array();
         $in_fieldset = false;
         $first_plugin_fieldset = true;
@@ -162,7 +172,17 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
 
         // show undefined settings list
         if ($allow_debug && !empty($undefined_settings)) {
-            function _setting_natural_comparison($a, $b) { return strnatcmp($a->_key, $b->_key); }
+            /**
+             * Callback for sorting settings
+             *
+             * @param setting $a
+             * @param setting $b
+             * @return int if $a is lower/equal/higher than $b
+             */
+            function _setting_natural_comparison($a, $b) {
+                return strnatcmp($a->_key, $b->_key);
+            }
+
             usort($undefined_settings, '_setting_natural_comparison');
             $this->_print_h1('undefined_settings', $this->getLang('_header_undefined'));
             ptln('<fieldset>');
@@ -235,6 +255,9 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       if ($this->_session_started) session_write_close();
     }
 
+    /**
+     * @param bool $prompts
+     */
     function setupLocale($prompts=false) {
 
         parent::setupLocale();
@@ -245,6 +268,9 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
 
     }
 
+    /**
+     * @return bool
+     */
     function _setup_localised_plugin_prompts() {
         global $conf;
 
@@ -299,6 +325,8 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
      * Generates a two-level table of contents for the config plugin.
      *
      * @author Ben Coburn <btcoburn@silicodon.net>
+     *
+     * @return array
      */
     function getTOC() {
         if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
@@ -328,6 +356,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
 
         $t[] = html_mktocitem('configuration_manager', $this->getLang('_configuration_manager'), 1);
         $t[] = html_mktocitem('dokuwiki_settings', $this->getLang('_header_dokuwiki'), 1);
+        /** @var setting $setting */
         foreach($toc['conf'] as $setting) {
             $name = $setting->prompt($this);
             $t[] = html_mktocitem($setting->_key, $name, 2);
@@ -352,6 +381,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         return $t;
     }
 
+    /**
+     * @param string $id
+     * @param string $text
+     */
     function _print_h1($id, $text) {
         ptln('<h1 id="'.$id.'">'.$text.'</h1>');
     }
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 30e7a2133..cbf6ea452 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -10,7 +10,9 @@
 if(!defined('CM_KEYMARKER')) define('CM_KEYMARKER','____');
 
 if (!class_exists('configuration')) {
-
+    /**
+     * Class configuration
+     */
     class configuration {
 
         var $_name = 'conf';           // name of the config variable found in the files (overridden by $config['varname'])
@@ -151,6 +153,8 @@ if (!class_exists('configuration')) {
 
         /**
          * Update last modified time stamp of the config file
+         *
+         * @return bool
          */
         public function touch_settings(){
             if ($this->locked) return false;
@@ -285,6 +289,10 @@ if (!class_exists('configuration')) {
         /**
          * not used ... conf's contents are an array!
          * reduce any multidimensional settings to one dimension using CM_KEYMARKER
+         *
+         * @param $conf
+         * @param string $prefix
+         * @return array
          */
         protected function _flatten($conf,$prefix='') {
 
@@ -403,6 +411,9 @@ if (!class_exists('configuration')) {
 }
 
 if (!class_exists('setting')) {
+    /**
+     * Class setting
+     */
     class setting {
 
         var $_key = '';
@@ -452,7 +463,7 @@ if (!class_exists('setting')) {
          * - if changed value passes error check, set $this->_local to the new value
          *
          * @param  mixed   $input   the new value
-         * @return boolean          true if changed, false otherwise (incl. on error)
+         * @return boolean          true if changed, false otherwise (also on error)
          */
         public function update($input) {
             if (is_null($input)) return false;
@@ -476,10 +487,9 @@ if (!class_exists('setting')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array(string $label_html, string $input_html)
+         * @return array with content array(string $label_html, string $input_html)
          */
         public function html(&$plugin, $echo=false) {
-            $value = '';
             $disable = '';
 
             if ($this->is_protected()) {
@@ -503,6 +513,10 @@ if (!class_exists('setting')) {
 
         /**
          * Generate string to save setting value to file according to $fmt
+         *
+         * @param string $var name of variable
+         * @param string $fmt save format
+         * @return string
          */
         public function out($var, $fmt='php') {
 
@@ -603,12 +617,15 @@ if (!class_exists('setting')) {
 
 
 if (!class_exists('setting_array')) {
+    /**
+     * Class setting_array
+     */
     class setting_array extends setting {
 
         /**
          * Create an array from a string
          *
-         * @param $string
+         * @param string $string
          * @return array
          */
         protected function _from_string($string){
@@ -622,7 +639,7 @@ if (!class_exists('setting_array')) {
         /**
          * Create a string from an array
          *
-         * @param $array
+         * @param array $array
          * @return string
          */
         protected function _from_array($array){
@@ -657,13 +674,23 @@ if (!class_exists('setting_array')) {
             return true;
         }
 
+        /**
+         * Escaping
+         *
+         * @param string $string
+         * @return string
+         */
         protected function _escape($string) {
             $tr = array("\\" => '\\\\', "'" => '\\\'');
             return "'".strtr( cleanText($string), $tr)."'";
         }
 
         /**
-         * generate string to save setting value to file according to $fmt
+         * Generate string to save setting value to file according to $fmt
+         *
+         * @param string $var name of variable
+         * @param string $fmt save format
+         * @return string
          */
         function out($var, $fmt='php') {
 
@@ -680,8 +707,14 @@ if (!class_exists('setting_array')) {
             return $out;
         }
 
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo=false) {
-            $value = '';
             $disable = '';
 
             if ($this->is_protected()) {
@@ -706,9 +739,18 @@ if (!class_exists('setting_array')) {
 }
 
 if (!class_exists('setting_string')) {
+    /**
+     * Class setting_string
+     */
     class setting_string extends setting {
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo=false) {
-            $value = '';
             $disable = '';
 
             if ($this->is_protected()) {
@@ -733,10 +775,21 @@ if (!class_exists('setting_string')) {
 }
 
 if (!class_exists('setting_password')) {
+    /**
+     * Class setting_password
+     */
     class setting_password extends setting_string {
 
         var $_code = 'plain';  // mechanism to be used to obscure passwords
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             if ($this->is_protected()) return false;
             if (!$input) return false;
@@ -751,9 +804,15 @@ if (!class_exists('setting_password')) {
             return true;
         }
 
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo=false) {
 
-            $value = '';
             $disable = $this->is_protected() ? 'disabled="disabled"' : '';
 
             $key = htmlspecialchars($this->_key);
@@ -766,7 +825,9 @@ if (!class_exists('setting_password')) {
 }
 
 if (!class_exists('setting_email')) {
-
+    /**
+     * Class setting_email
+     */
     class setting_email extends setting_string {
         var $_multiple = false;
         var $_placeholders = false;
@@ -830,7 +891,17 @@ if (!class_exists('setting_email')) {
  * @deprecated 2013-02-16
  */
 if (!class_exists('setting_richemail')) {
+    /**
+     * Class setting_richemail
+     */
     class setting_richemail extends setting_email {
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             $this->_placeholders = true;
             return parent::update($input);
@@ -840,6 +911,9 @@ if (!class_exists('setting_richemail')) {
 
 
 if (!class_exists('setting_numeric')) {
+    /**
+     * Class setting_numeric
+     */
     class setting_numeric extends setting_string {
         // This allows for many PHP syntax errors...
         // var $_pattern = '/^[-+\/*0-9 ]*$/';
@@ -848,6 +922,14 @@ if (!class_exists('setting_numeric')) {
         var $_min = null;
         var $_max = null;
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             $local = $this->_local;
             $valid = parent::update($input);
@@ -864,6 +946,13 @@ if (!class_exists('setting_numeric')) {
             return $valid;
         }
 
+        /**
+         * Generate string to save setting value to file according to $fmt
+         *
+         * @param string $var name of variable
+         * @param string $fmt save format
+         * @return string
+         */
         function out($var, $fmt='php') {
 
             if ($this->is_protected()) return '';
@@ -882,6 +971,9 @@ if (!class_exists('setting_numeric')) {
 }
 
 if (!class_exists('setting_numericopt')) {
+    /**
+     * Class setting_numericopt
+     */
     class setting_numericopt extends setting_numeric {
         // just allow an empty config
         var $_pattern = '/^(|[-]?[0-9]+(?:[-+*][0-9]+)*)$/';
@@ -889,10 +981,18 @@ if (!class_exists('setting_numericopt')) {
 }
 
 if (!class_exists('setting_onoff')) {
+    /**
+     * Class setting_onoff
+     */
     class setting_onoff extends setting_numeric {
-
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo = false) {
-            $value = '';
             $disable = '';
 
             if ($this->is_protected()) {
@@ -910,6 +1010,14 @@ if (!class_exists('setting_onoff')) {
             return array($label,$input);
         }
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             if ($this->is_protected()) return false;
 
@@ -924,12 +1032,21 @@ if (!class_exists('setting_onoff')) {
 }
 
 if (!class_exists('setting_multichoice')) {
+    /**
+     * Class setting_multichoice
+     */
     class setting_multichoice extends setting_string {
         var $_choices = array();
         var $lang; //some custom language strings are stored in setting
 
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo = false) {
-            $value = '';
             $disable = '';
             $nochoice = '';
 
@@ -972,6 +1089,14 @@ if (!class_exists('setting_multichoice')) {
             return array($label,$input);
         }
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             if (is_null($input)) return false;
             if ($this->is_protected()) return false;
@@ -989,10 +1114,20 @@ if (!class_exists('setting_multichoice')) {
 
 
 if (!class_exists('setting_dirchoice')) {
+    /**
+     * Class setting_dirchoice
+     */
     class setting_dirchoice extends setting_multichoice {
 
         var $_dir = '';
 
+        /**
+         * Receives current values for the setting $key
+         *
+         * @param mixed $default   default setting value
+         * @param mixed $local     local setting value
+         * @param mixed $protected protected setting value
+         */
         function initialize($default,$local,$protected) {
 
             // populate $this->_choices with a list of directories
@@ -1018,12 +1153,18 @@ if (!class_exists('setting_dirchoice')) {
 
 
 if (!class_exists('setting_hidden')) {
+    /**
+     * Class setting_hidden
+     */
     class setting_hidden extends setting {
         // Used to explicitly ignore a setting in the configuration manager.
     }
 }
 
 if (!class_exists('setting_fieldset')) {
+    /**
+     * Class setting_fieldset
+     */
     class setting_fieldset extends setting {
         // A do-nothing class used to detect the 'fieldset' type.
         // Used to start a new settings "display-group".
@@ -1031,6 +1172,9 @@ if (!class_exists('setting_fieldset')) {
 }
 
 if (!class_exists('setting_undefined')) {
+    /**
+     * Class setting_undefined
+     */
     class setting_undefined extends setting_hidden {
         // A do-nothing class used to detect settings with no metadata entry.
         // Used internaly to hide undefined settings, and generate the undefined settings list.
@@ -1038,6 +1182,9 @@ if (!class_exists('setting_undefined')) {
 }
 
 if (!class_exists('setting_no_class')) {
+    /**
+     * Class setting_no_class
+     */
     class setting_no_class extends setting_undefined {
         // A do-nothing class used to detect settings with a missing setting class.
         // Used internaly to hide undefined settings, and generate the undefined settings list.
@@ -1045,6 +1192,9 @@ if (!class_exists('setting_no_class')) {
 }
 
 if (!class_exists('setting_no_default')) {
+    /**
+     * Class setting_no_default
+     */
     class setting_no_default extends setting_undefined {
         // A do-nothing class used to detect settings with no default value.
         // Used internaly to hide undefined settings, and generate the undefined settings list.
@@ -1052,11 +1202,22 @@ if (!class_exists('setting_no_default')) {
 }
 
 if (!class_exists('setting_multicheckbox')) {
+    /**
+     * Class setting_multicheckbox
+     */
     class setting_multicheckbox extends setting_string {
 
         var $_choices = array();
         var $_combine = array();
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             if ($this->is_protected()) return false;
 
@@ -1077,9 +1238,15 @@ if (!class_exists('setting_multicheckbox')) {
             return true;
         }
 
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo=false) {
 
-            $value = '';
             $disable = '';
 
             if ($this->is_protected()) {
@@ -1141,6 +1308,9 @@ if (!class_exists('setting_multicheckbox')) {
 
         /**
          * convert comma separated list to an array and combine any complimentary values
+         *
+         * @param string $str
+         * @return array
          */
         function _str2array($str) {
             $array = explode(',',$str);
@@ -1164,6 +1334,9 @@ if (!class_exists('setting_multicheckbox')) {
 
         /**
          * convert array of values + other back to a comma separated list, incl. splitting any combined values
+         *
+         * @param array $input
+         * @return string
          */
         function _array2str($input) {
 
@@ -1192,6 +1365,9 @@ if (!class_exists('setting_multicheckbox')) {
 }
 
 if (!class_exists('setting_regex')){
+    /**
+     * Class setting_regex
+     */
     class setting_regex extends setting_string {
 
         var $_delimiter = '/';    // regex delimiter to be used in testing input
@@ -1215,7 +1391,7 @@ if (!class_exists('setting_regex')){
             // see if the regex compiles and runs (we don't check for effectiveness)
             $regex = $this->_delimiter . $input . $this->_delimiter . $this->_pregflags;
             $lastError = error_get_last();
-            $ok = @preg_match($regex,'testdata');
+            @preg_match($regex,'testdata');
             if (preg_last_error() != PREG_NO_ERROR || error_get_last() != $lastError) {
                 $this->_input = $input;
                 $this->_error = true;
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 02171fb77..232a8177f 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -6,8 +6,15 @@
  */
 
 if (!class_exists('setting_sepchar')) {
+    /**
+     * Class setting_sepchar
+     */
     class setting_sepchar extends setting_multichoice {
 
+        /**
+         * @param string $key
+         * @param array|null $param array with metadata of setting
+         */
         function setting_sepchar($key,$param=null) {
             $str = '_-.';
             for ($i=0;$i<strlen($str);$i++) $this->_choices[] = $str{$i};
@@ -19,8 +26,19 @@ if (!class_exists('setting_sepchar')) {
 }
 
 if (!class_exists('setting_savedir')) {
+    /**
+     * Class setting_savedir
+     */
     class setting_savedir extends setting_string {
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             if ($this->is_protected()) return false;
 
@@ -40,9 +58,20 @@ if (!class_exists('setting_savedir')) {
 }
 
 if (!class_exists('setting_authtype')) {
+    /**
+     * Class setting_authtype
+     */
     class setting_authtype extends setting_multichoice {
 
+        /**
+         * Receives current values for the setting $key
+         *
+         * @param mixed $default   default setting value
+         * @param mixed $local     local setting value
+         * @param mixed $protected protected setting value
+         */
         function initialize($default,$local,$protected) {
+            /** @var $plugin_controller Doku_Plugin_Controller */
             global $plugin_controller;
 
             // retrieve auth types provided by plugins
@@ -53,7 +82,16 @@ if (!class_exists('setting_authtype')) {
             parent::initialize($default,$local,$protected);
         }
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
+            /** @var $plugin_controller Doku_Plugin_Controller */
             global $plugin_controller;
 
             // is an update possible/requested?
@@ -92,8 +130,19 @@ if (!class_exists('setting_authtype')) {
 }
 
 if (!class_exists('setting_im_convert')) {
+    /**
+     * Class setting_im_convert
+     */
     class setting_im_convert extends setting_string {
 
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (also on error)
+         */
         function update($input) {
             if ($this->is_protected()) return false;
 
@@ -115,8 +164,18 @@ if (!class_exists('setting_im_convert')) {
 }
 
 if (!class_exists('setting_disableactions')) {
+    /**
+     * Class setting_disableactions
+     */
     class setting_disableactions extends setting_multicheckbox {
 
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo=false) {
             global $lang;
 
@@ -134,10 +193,20 @@ if (!class_exists('setting_disableactions')) {
 }
 
 if (!class_exists('setting_compression')) {
+    /**
+     * Class setting_compression
+     */
     class setting_compression extends setting_multichoice {
 
         var $_choices = array('0');      // 0 = no compression, always supported
 
+        /**
+         * Receives current values for the setting $key
+         *
+         * @param mixed $default   default setting value
+         * @param mixed $local     local setting value
+         * @param mixed $protected protected setting value
+         */
         function initialize($default,$local,$protected) {
 
             // populate _choices with the compression methods supported by this php installation
@@ -150,10 +219,20 @@ if (!class_exists('setting_compression')) {
 }
 
 if (!class_exists('setting_license')) {
+    /**
+     * Class setting_license
+     */
     class setting_license extends setting_multichoice {
 
         var $_choices = array('');      // none choosen
 
+        /**
+         * Receives current values for the setting $key
+         *
+         * @param mixed $default   default setting value
+         * @param mixed $local     local setting value
+         * @param mixed $protected protected setting value
+         */
         function initialize($default,$local,$protected) {
             global $license;
 
@@ -169,10 +248,20 @@ if (!class_exists('setting_license')) {
 
 
 if (!class_exists('setting_renderer')) {
+    /**
+     * Class setting_renderer
+     */
     class setting_renderer extends setting_multichoice {
         var $_prompts = array();
         var $_format = null;
 
+        /**
+         * Receives current values for the setting $key
+         *
+         * @param mixed $default   default setting value
+         * @param mixed $local     local setting value
+         * @param mixed $protected protected setting value
+         */
         function initialize($default,$local,$protected) {
             $format = $this->_format;
 
@@ -189,6 +278,13 @@ if (!class_exists('setting_renderer')) {
             parent::initialize($default,$local,$protected);
         }
 
+        /**
+         * Build html for label and input of setting
+         *
+         * @param DokuWiki_Plugin $plugin object of config plugin
+         * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
+         * @return array with content array(string $label_html, string $input_html)
+         */
         function html(&$plugin, $echo=false) {
 
             // make some language adjustments (there must be a better way)
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 2aca0e218..dfa624907 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -799,7 +799,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      *
      * The directory is registered for cleanup when the class is destroyed
      *
-     * @return bool|string
+     * @return false|string
      */
     protected function mkTmpDir(){
         $dir = io_mktmpdir();
@@ -1079,7 +1079,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @param string $file The file to analyze
-     * @return string|bool false if the file can't be read, otherwise an "extension"
+     * @return string|false false if the file can't be read, otherwise an "extension"
      */
     private function guess_archive($file) {
         $fh = fopen($file, 'rb');
@@ -1095,6 +1095,10 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
     /**
      * Copy with recursive sub-directory support
+     *
+     * @param string $src filename path to file
+     * @param string $dst filename path to file
+     * @return bool|int|string
      */
     private function dircopy($src, $dst) {
         global $conf;
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 9b1988d84..6fc8c63b1 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -333,7 +333,6 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * Shortens the URL for display
      *
      * @param string $url
-     *
      * @return string  HTML link
      */
     function shortlink($url){
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index fc0e1af9d..773256faf 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -44,9 +44,14 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
         $this->Lexer->addSpecialPattern('~~INFO:\w+~~',$mode,'plugin_info');
     }
 
-
     /**
      * Handle the match
+     *
+     * @param   string       $match   The text matched by the patterns
+     * @param   int          $state   The lexer state for the match
+     * @param   int          $pos     The character position of the matched text
+     * @param   Doku_Handler $handler The Doku_Handler object
+     * @return  array Return an array with all data you want to use in render
      */
     function handle($match, $state, $pos, Doku_Handler $handler){
         $match = substr($match,7,-2); //strip ~~INFO: from start and ~~ from end
@@ -55,6 +60,11 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
 
     /**
      * Create output
+     *
+     * @param string $format   string     output format being rendered
+     * @param Doku_Renderer    $renderer  the current renderer object
+     * @param array            $data      data created by handler()
+     * @return  boolean                 rendered correctly?
      */
     function render($format, Doku_Renderer $renderer, $data) {
         if($format == 'xhtml'){
@@ -103,6 +113,9 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      * list all installed plugins
      *
      * uses some of the original renderer methods
+     *
+     * @param string $type
+     * @param Doku_Renderer_xhtml $renderer
      */
     function _plugins_xhtml($type, Doku_Renderer_xhtml $renderer){
         global $lang;
@@ -114,7 +127,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
         // remove subparts
         foreach($plugins as $p){
             if (!$po = plugin_load($type,$p)) continue;
-            list($name,$part) = explode('_',$p,2);
+            list($name,/* $part */) = explode('_',$p,2);
             $plginfo[$name] = $po->getInfo();
         }
 
@@ -141,6 +154,8 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
      * list all installed plugins
      *
      * uses some of the original renderer methods
+     *
+     * @param Doku_Renderer_xhtml $renderer
      */
     function _helpermethods_xhtml(Doku_Renderer_xhtml $renderer){
         $plugins = plugin_list('helper');
@@ -189,6 +204,8 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
 
     /**
      * lists all known syntax types and their registered modes
+     *
+     * @return string
      */
     function _syntaxtypes_xhtml(){
         global $PARSER_MODES;
@@ -211,6 +228,8 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
 
     /**
      * lists all known syntax modes and their sorting value
+     *
+     * @return string
      */
     function _syntaxmodes_xhtml(){
         $modes = p_get_parsermodes();
diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index eacde06d0..b4fb33b90 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -74,6 +74,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     /**
      * Check if autosubmit is enabled
+     *
      * @return boolean TRUE if we should send data once a month, FALSE otherwise
      */
     function isAutoSubmitEnabled(){
@@ -82,6 +83,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     /**
      * Send the data, to the submit url
+     *
      * @param string $data The popularity data
      * @return string An empty string if everything worked fine, a string describing the error otherwise
      */
@@ -97,6 +99,8 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     /**
      * Compute the last time the data was sent. If it has never been sent, we return 0.
+     *
+     * @return int
      */
     function lastSentTime(){
         $manualSubmission = @filemtime($this->popularityLastSubmitFile);
@@ -107,6 +111,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     /**
      * Gather all information
+     *
      * @return string The popularity data as a string
      */
     function gatherAsString(){
@@ -124,6 +129,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     /**
      * Gather all information
+     *
      * @return array The popularity data as an array
      */
     function _gather(){
@@ -288,17 +294,24 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
      *
      * @author <gilthans dot NO dot SPAM at gmail dot com>
      * @link   http://de3.php.net/manual/en/ini.core.php#79564
+     *
+     * @param string $v
+     * @return int|string
      */
     function _to_byte($v){
         $l = substr($v, -1);
         $ret = substr($v, 0, -1);
         switch(strtoupper($l)){
+            /** @noinspection PhpMissingBreakStatementInspection */
             case 'P':
                 $ret *= 1024;
+            /** @noinspection PhpMissingBreakStatementInspection */
             case 'T':
                 $ret *= 1024;
+            /** @noinspection PhpMissingBreakStatementInspection */
             case 'G':
                 $ret *= 1024;
+            /** @noinspection PhpMissingBreakStatementInspection */
             case 'M':
                 $ret *= 1024;
             case 'K':
diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
index 4a301f927..7acf681e4 100644
--- a/lib/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -52,6 +52,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * 'stack'  - Special case. Plugin wraps other paragraphs.
      *
      * @see Doku_Handler_Block
+     *
      * @return string
      */
     function getPType(){
@@ -94,9 +95,9 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * The contents of the $data array depends on what the handler() function above
      * created
      *
-     * @param   $format   string        output format being rendered
-     * @param   $renderer Doku_Renderer the current renderer object
-     * @param   $data     array         data created by handler()
+     * @param string          $format   output format being rendered
+     * @param Doku_Renderer   $renderer the current renderer object
+     * @param array           $data     data created by handler()
      * @return  boolean                 rendered correctly?
      */
     function render($format, Doku_Renderer $renderer, $data) {
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index c568469a7..86562f1dd 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -58,9 +58,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         }
     }
 
-     /**
-      * Return prompt for admin menu
-      */
+    /**
+     * Return prompt for admin menu
+     *
+     * @param string $language
+     * @return string
+     */
     public function getMenuText($language) {
 
         if (!is_null($this->_auth))
@@ -71,6 +74,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
     /**
      * return sort order for position in admin menu
+     *
+     * @return int
      */
     public function getMenuSort() {
         return 2;
@@ -78,6 +83,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
     /**
      * Handle user request
+     *
+     * @return bool
      */
     public function handle() {
         global $INPUT;
@@ -128,6 +135,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
     /**
      * Output appropriate html
+     *
+     * @return bool
      */
     public function html() {
         global $ID;
@@ -939,8 +948,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * Returns cleaned user data
      *
      * @param array $candidate raw values of line from input file
-     * @param $error
-     * @return array|bool cleaned data or false
+     * @param string $error
+     * @return array|false cleaned data or false
      */
     protected function _cleanImportUser($candidate, & $error){
         global $INPUT;
@@ -1023,6 +1032,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
     /**
      * wrapper for is_uploaded_file to facilitate overriding by test suite
+     *
+     * @param string $file filename
+     * @return bool
      */
     protected function _isUploadedFile($file) {
         return is_uploaded_file($file);
@@ -1033,6 +1045,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      *
      * @deprecated    remove when dokuwiki php requirement increases to 5.3+
      *                also associated unit test & mock access method
+     *
+     * @param string $csv string to parse
+     * @return array
      */
     protected function _getcsv($csv) {
         return function_exists('str_getcsv') ? str_getcsv($csv) : $this->str_getcsv($csv);
@@ -1043,6 +1058,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      * loosely based on www.php.net/str_getcsv#88311
      *
      * @deprecated    remove when dokuwiki php requirement increases to 5.3+
+     *
+     * @param string $str string to parse
+     * @return array
      */
     protected function str_getcsv($str) {
         $fp = fopen("php://temp/maxmemory:1048576", 'r+');    // 1MiB
-- 
cgit v1.2.3


From e3710957c6b7e12293805a15d0624be7c7054092 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 1 Oct 2014 17:05:40 +0200
Subject: more phpdocs and minor check

---
 inc/Input.class.php   | 2 +-
 inc/RemoteAPICore.php | 2 +-
 inc/Tar.class.php     | 2 +-
 inc/cli.php           | 2 +-
 inc/cliopts.php       | 2 +-
 inc/common.php        | 2 +-
 inc/html.php          | 2 +-
 inc/indexer.php       | 2 +-
 inc/parserutils.php   | 3 ++-
 inc/pluginutils.php   | 6 +++---
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/inc/Input.class.php b/inc/Input.class.php
index f4a4612df..199994d8d 100644
--- a/inc/Input.class.php
+++ b/inc/Input.class.php
@@ -131,7 +131,7 @@ class Input {
      * @param string    $name Parameter name
      * @param mixed     $default If parameter is not set, initialize with this value
      * @param bool      $nonempty Init with $default if parameter is set but empty()
-     * @return &mixed
+     * @return mixed (reference)
      */
     public function &ref($name, $default = '', $nonempty = false) {
         if(!isset($this->access[$name]) || ($nonempty && empty($this->access[$name]))) {
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index b34fe7f20..c0e6869f1 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -318,7 +318,7 @@ class RemoteAPICore {
      * @return array
      */
     function search($query){
-        $regex = '';
+        $regex = array();
         $data  = ft_pageSearch($query,$regex);
         $pages = array();
 
diff --git a/inc/Tar.class.php b/inc/Tar.class.php
index 05831df58..04246846e 100644
--- a/inc/Tar.class.php
+++ b/inc/Tar.class.php
@@ -530,7 +530,7 @@ class Tar {
      * Decode the given tar file header
      *
      * @param string $block a 512 byte block containign the header data
-     * @return array|bool
+     * @return array|false
      */
     protected function parseHeader($block) {
         if(!$block || strlen($block) != 512) return false;
diff --git a/inc/cli.php b/inc/cli.php
index 29d76ece1..14e2c0c8d 100644
--- a/inc/cli.php
+++ b/inc/cli.php
@@ -471,7 +471,7 @@ class DokuCLI_Options {
      *
      * @param string $option
      * @param bool|string $default what to return if the option was not set
-     * @return false|string
+     * @return bool|string
      */
     public function getOpt($option, $default = false) {
         if(isset($this->options[$option])) return $this->options[$option];
diff --git a/inc/cliopts.php b/inc/cliopts.php
index c75a5a93b..f2782a465 100644
--- a/inc/cliopts.php
+++ b/inc/cliopts.php
@@ -78,7 +78,7 @@ class Doku_Cli_Opts {
      * @param string $bin_file      executing file name - this MUST be passed the __FILE__ constant
      * @param string $short_options short options
      * @param array  $long_options  (optional) long options
-     * @return Doku_Cli_Opts_Container or Doku_Cli_Opts_Error
+     * @return Doku_Cli_Opts_Container|Doku_Cli_Opts_Error
      */
     function & getOptions($bin_file, $short_options, $long_options = null) {
         $args = Doku_Cli_Opts::readPHPArgv();
diff --git a/inc/common.php b/inc/common.php
index 444e90198..7932fc9f0 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -337,7 +337,7 @@ function buildAttributes($params, $skipempty = false) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  *
- * @return string[string] with the data: array(pageid=>name, ... )
+ * @return string[] with the data: array(pageid=>name, ... )
  */
 function breadcrumbs() {
     // we prepare the breadcrumbs early for quick session closing
diff --git a/inc/html.php b/inc/html.php
index adcd212ed..754e08edf 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -177,7 +177,7 @@ function html_topbtn(){
  * @param string         $name
  * @param string         $id
  * @param string         $akey   access key
- * @param string[string] $params key-value pairs added as hidden inputs
+ * @param string[] $params key-value pairs added as hidden inputs
  * @param string         $method
  * @param string         $tooltip
  * @param bool|string    $label  label text, false: lookup btn_$name in localization
diff --git a/inc/indexer.php b/inc/indexer.php
index ec0c523e0..014c5c5eb 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -1248,7 +1248,7 @@ class Doku_Indexer {
      * @author Tom N Harris <tnharris@whoopdedo.org>
      *
      * @param string $line
-     * @param string $id
+     * @param string|int $id
      * @param int    $count
      * @return string
      */
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 791033e63..ef62c8e49 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -616,12 +616,13 @@ function p_sort_modes($a, $b){
  * @author Andreas Gohr <andi@splitbrain.org>
  *
  * @param string $mode
- * @param array  $instructions
+ * @param array|null|false  $instructions
  * @param array  $info returns render info like enabled toc and cache
  * @return null|string rendered output
  */
 function p_render($mode,$instructions,&$info){
     if(is_null($instructions)) return '';
+    if($instructions === false) return '';
 
     $Renderer = p_get_renderer($mode);
     if (is_null($Renderer)) return null;
diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 911c4e5c0..4d591869d 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -49,7 +49,7 @@ function plugin_load($type,$name,$new=false,$disabled=false) {
  * Whether plugin is disabled
  *
  * @param string $plugin name of plugin
- * @return bool; true disabled, false enabled
+ * @return bool true disabled, false enabled
  */
 function plugin_isdisabled($plugin) {
     /** @var $plugin_controller Doku_Plugin_Controller */
@@ -61,7 +61,7 @@ function plugin_isdisabled($plugin) {
  * Enable the plugin
  *
  * @param string $plugin name of plugin
- * @return bool; true saving succeed, false saving failed
+ * @return bool true saving succeed, false saving failed
  */
 function plugin_enable($plugin) {
     /** @var $plugin_controller Doku_Plugin_Controller */
@@ -73,7 +73,7 @@ function plugin_enable($plugin) {
  * Disable the plugin
  *
  * @param string $plugin name of plugin
- * @return bool; true saving succeed, false saving failed
+ * @return bool  true saving succeed, false saving failed
  */
 function plugin_disable($plugin) {
     /** @var $plugin_controller Doku_Plugin_Controller */
-- 
cgit v1.2.3


From 7e8500eea1e53b1de0e0f70400664afa442cd08d Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 2 Oct 2014 14:55:24 +0200
Subject: PHPDocs and some improvements

---
 bin/gittool.php                               |  4 +++-
 inc/Tar.class.php                             |  9 ++++++++-
 inc/ZipLib.class.php                          |  4 ++--
 inc/auth.php                                  |  2 +-
 inc/common.php                                |  2 +-
 inc/events.php                                | 11 +++++++++--
 inc/parserutils.php                           |  2 +-
 inc/plugin.php                                |  4 ++--
 inc/template.php                              |  4 ++--
 inc/utf8.php                                  |  4 ++--
 lib/exe/xmlrpc.php                            |  5 +++++
 lib/plugins/admin.php                         | 14 ++++++++++++++
 lib/plugins/authplain/_test/escaping.test.php |  5 +++--
 lib/plugins/config/settings/config.class.php  |  2 +-
 lib/plugins/extension/admin.php               |  6 +++---
 lib/plugins/extension/helper/repository.php   |  6 +++---
 lib/plugins/extension/lang/en/lang.php        |  3 ++-
 lib/plugins/extension/lang/nl/lang.php        |  2 +-
 18 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/bin/gittool.php b/bin/gittool.php
index 7991a9997..cbadb5bfa 100755
--- a/bin/gittool.php
+++ b/bin/gittool.php
@@ -206,12 +206,13 @@ class GitToolCLI extends DokuCLI {
      * Install extension from the given download URL
      *
      * @param string $ext
-     * @return bool
+     * @return bool|null
      */
     private function downloadExtension($ext) {
         /** @var helper_plugin_extension_extension $plugin */
         $plugin = plugin_load('helper', 'extension_extension');
         if(!$ext) die("extension plugin not available, can't continue");
+
         $plugin->setExtension($ext);
 
         $url = $plugin->getDownloadURL();
@@ -297,6 +298,7 @@ class GitToolCLI extends DokuCLI {
         /** @var helper_plugin_extension_extension $ext */
         $ext = plugin_load('helper', 'extension_extension');
         if(!$ext) die("extension plugin not available, can't continue");
+
         $ext->setExtension($extension);
 
         $repourl = $ext->getSourcerepoURL();
diff --git a/inc/Tar.class.php b/inc/Tar.class.php
index 04246846e..0dc7dace2 100644
--- a/inc/Tar.class.php
+++ b/inc/Tar.class.php
@@ -53,6 +53,7 @@ class Tar {
 
     protected $file = '';
     protected $comptype = Tar::COMPRESS_AUTO;
+    /** @var  resource|int */
     protected $fh;
     protected $memory = '';
     protected $closed = true;
@@ -530,7 +531,7 @@ class Tar {
      * Decode the given tar file header
      *
      * @param string $block a 512 byte block containign the header data
-     * @return array|false
+     * @return false|array
      */
     protected function parseHeader($block) {
         if(!$block || strlen($block) != 512) return false;
@@ -633,8 +634,14 @@ class Tar {
     }
 }
 
+/**
+ * Class TarIOException
+ */
 class TarIOException extends Exception {
 }
 
+/**
+ * Class TarIllegalCompressionException
+ */
 class TarIllegalCompressionException extends Exception {
 }
diff --git a/inc/ZipLib.class.php b/inc/ZipLib.class.php
index 0b7bfa05e..5b524c4ab 100644
--- a/inc/ZipLib.class.php
+++ b/inc/ZipLib.class.php
@@ -142,10 +142,10 @@ class ZipLib {
      *
      * @param string $data
      * @param string $name filename
-     * @param int $compact
+     * @param bool $compact
      * @return bool
      */
-    function add_File($data, $name, $compact = 1) {
+    function add_File($data, $name, $compact = true) {
         $name     = str_replace('\\', '/', $name);
         $dtime    = dechex($this->DosTime());
 
diff --git a/inc/auth.php b/inc/auth.php
index 3a6a2f65a..0342de7be 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -283,7 +283,7 @@ function auth_login($user, $pass, $sticky = false, $silent = false) {
  * @author Andreas Gohr <andi@splitbrain.org>
  *
  * @param  string $token The authentication token
- * @return boolean true (or will exit on failure)
+ * @return boolean|null true (or will exit on failure)
  */
 function auth_validateToken($token) {
     if(!$token || $token != $_SESSION[DOKU_COOKIE]['auth']['token']) {
diff --git a/inc/common.php b/inc/common.php
index 7932fc9f0..d628ab6b2 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1461,7 +1461,7 @@ function dformat($dt = null, $format = '') {
  * @author <ungu at terong dot com>
  * @link http://www.php.net/manual/en/function.date.php#54072
  *
- * @param int $int_date: current date in UNIX timestamp
+ * @param int $int_date current date in UNIX timestamp
  * @return string
  */
 function date_iso8601($int_date) {
diff --git a/inc/events.php b/inc/events.php
index 4cd06b9f9..256fb561e 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -27,6 +27,9 @@ class Doku_Event {
 
     /**
      * event constructor
+     *
+     * @param string $name
+     * @param mixed $data
      */
     function Doku_Event($name, &$data) {
 
@@ -120,14 +123,18 @@ class Doku_Event {
      * stop any further processing of the event by event handlers
      * this function does not prevent the default action taking place
      */
-    function stopPropagation() { $this->_continue = false;  }
+    function stopPropagation() {
+        $this->_continue = false;
+    }
 
     /**
      * preventDefault
      *
      * prevent the default action taking place
      */
-    function preventDefault() { $this->_default = false;  }
+    function preventDefault() {
+        $this->_default = false;
+    }
 }
 
 /**
diff --git a/inc/parserutils.php b/inc/parserutils.php
index ef62c8e49..4371f1928 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -655,7 +655,7 @@ function p_render($mode,$instructions,&$info){
  * Figure out the correct renderer class to use for $mode,
  * instantiate and return it
  *
- * @param $mode string Mode of the renderer to get
+ * @param string $mode Mode of the renderer to get
  * @return null|Doku_Renderer The renderer
  *
  * @author Christopher Smith <chris@jalakai.co.uk>
diff --git a/inc/plugin.php b/inc/plugin.php
index 8432b21b2..3bab560cb 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -60,7 +60,7 @@ class DokuWiki_Plugin {
      * @return string  plugin name
      */
     function getPluginName() {
-        list($t, $p, $n) = explode('_', get_class($this), 4);
+        list(/* $t */, /* $p */, $n) = explode('_', get_class($this), 4);
         return $n;
     }
 
@@ -68,7 +68,7 @@ class DokuWiki_Plugin {
      * @return string  component name
      */
     function getPluginComponent() {
-        list($t, $p, $n, $c) = explode('_', get_class($this), 4);
+        list(/* $t */, /* $p */, /* $n */, $c) = explode('_', get_class($this), 4);
         return (isset($c)?$c:'');
     }
 
diff --git a/inc/template.php b/inc/template.php
index 98ea9df82..6bb6275f3 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1066,8 +1066,8 @@ function tpl_pagetitle($id = null, $ret = false) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  *
- * @param array  $tags tags to try
- * @param string $alt alternative output if no data was found
+ * @param array|string $tags tags to try
+ * @param string       $alt  alternative output if no data was found
  * @param null|string   $src the image src, uses global $SRC if not given
  * @return string
  */
diff --git a/inc/utf8.php b/inc/utf8.php
index b3f2b5fe8..f86217686 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -611,7 +611,7 @@ if(!function_exists('utf8_decode_numeric')){
      * Decodes numeric HTML entities to their correct UTF-8 characters
      *
      * @param $ent string A numeric entity
-     * @return string
+     * @return string|false
      */
     function utf8_decode_numeric($ent) {
         switch ($ent[2]) {
@@ -657,7 +657,7 @@ if(!class_exists('utf8_entity_decoder')){
          * Decodes any HTML entity to it's correct UTF-8 char equivalent
          *
          * @param string $ent An entity
-         * @return string
+         * @return string|false
          */
         function decode($ent) {
             if ($ent[1] == '#') {
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index 3a878ebe4..61a68281f 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -23,6 +23,11 @@ class dokuwiki_xmlrpc_server extends IXR_Server {
         $this->IXR_Server();
     }
 
+    /**
+     * @param string $methodname
+     * @param array $args
+     * @return IXR_Error|mixed
+     */
     function call($methodname, $args){
         try {
             $result = $this->remote->call($methodname, $args);
diff --git a/lib/plugins/admin.php b/lib/plugins/admin.php
index 9a1fb9fdc..d063af612 100644
--- a/lib/plugins/admin.php
+++ b/lib/plugins/admin.php
@@ -14,6 +14,10 @@ if(!defined('DOKU_INC')) die();
  */
 class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
 
+    /**
+     * @param string $language language code
+     * @return string
+     */
     function getMenuText($language) {
         $menutext = $this->getLang('menu');
         if (!$menutext) {
@@ -23,10 +27,14 @@ class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
         return $menutext;
     }
 
+    /**
+     * @return int
+     */
     function getMenuSort() {
         return 1000;
     }
 
+
     function handle() {
         trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
     }
@@ -35,10 +43,16 @@ class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
         trigger_error('html() not implemented in '.get_class($this), E_USER_WARNING);
     }
 
+    /**
+     * @return bool
+     */
     function forAdminOnly() {
         return true;
     }
 
+    /**
+     * @return array
+     */
     function getTOC(){
         return array();
     }
diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php
index cd5294157..5cf631508 100644
--- a/lib/plugins/authplain/_test/escaping.test.php
+++ b/lib/plugins/authplain/_test/escaping.test.php
@@ -12,10 +12,11 @@
  * @group plugins
  */
 class helper_plugin_authplain_escaping_test extends DokuWikiTest {
- 
+
     protected $pluginsEnabled = array('authplain');
+    /** @var  auth_plugin_authplain */
     protected $auth;
- 
+
     protected function reloadUsers() {
         /* auth caches data loaded from file, but recreated object forces reload */
         $this->auth = new auth_plugin_authplain();
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index cbf6ea452..590631dae 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -570,7 +570,7 @@ if (!class_exists('setting')) {
         /**
          * Returns caution
          *
-         * @return bool|string caution string, otherwise false for invalid caution
+         * @return false|string caution string, otherwise false for invalid caution
          */
         public function caution() {
             if (!empty($this->_caution)) {
diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index 99c74848b..de4992937 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -75,10 +75,10 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
                             case 'uninstall':
                                 $extension->setExtension($extname);
                                 $status = $extension->uninstall();
-                                if($status !== true) {
-                                    msg($status, -1);
-                                } else {
+                                if($status) {
                                     msg(sprintf($this->getLang('msg_delete_success'), hsc($extension->getDisplayName())), 1);
+                                } else {
+                                    msg(sprintf($this->getLang('msg_delete_failed'), hsc($extension->getDisplayName())), -1);
                                 }
                                 break;
                             case 'enable';
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 6ffe89eb7..5dc2707cf 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -32,7 +32,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
             $request_needed = false;
             foreach ($list as $name) {
                 $cache = new cache('##extension_manager##'.$name, '.repo');
-                $result = null;
+
                 if (!isset($this->loaded_extensions[$name]) && $this->hasAccess() && !$cache->useCache(array('age' => 3600 * 24))) {
                     $this->loaded_extensions[$name] = true;
                     $request_data['ext'][] = $name;
@@ -64,7 +64,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
     public function hasAccess() {
         if ($this->has_access === null) {
             $cache = new cache('##extension_manager###hasAccess', '.repo');
-            $result = null;
+
             if (!$cache->useCache(array('age' => 3600 * 24, 'purge'=>1))) {
                 $httpclient = new DokuHTTPClient();
                 $httpclient->timeout = 5;
@@ -91,7 +91,7 @@ class helper_plugin_extension_repository extends DokuWiki_Plugin {
      */
     public function getData($name) {
         $cache = new cache('##extension_manager##'.$name, '.repo');
-        $result = null;
+
         if (!isset($this->loaded_extensions[$name]) && $this->hasAccess() && !$cache->useCache(array('age' => 3600 * 24))) {
             $this->loaded_extensions[$name] = true;
             $httpclient = new DokuHTTPClient();
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 72c9b9e2d..4da41a2fd 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -69,7 +69,8 @@ $lang['status_bundled']               = 'bundled';
 
 $lang['msg_enabled']                  = 'Plugin %s enabled';
 $lang['msg_disabled']                 = 'Plugin %s disabled';
-$lang['msg_delete_success']           = 'Extension uninstalled';
+$lang['msg_delete_success']           = 'Extension %s uninstalled';
+$lang['msg_delete_failed']            = 'Uninstalling Extension %s failed';
 $lang['msg_template_install_success'] = 'Template %s installed successfully';
 $lang['msg_template_update_success']  = 'Template %s updated successfully';
 $lang['msg_plugin_install_success']   = 'Plugin %s installed successfully';
diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
index a54924e93..f75f78121 100644
--- a/lib/plugins/extension/lang/nl/lang.php
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -63,7 +63,7 @@ $lang['status_template']       = 'template';
 $lang['status_bundled']        = 'Gebundeld';
 $lang['msg_enabled']           = 'Plugin %s ingeschakeld';
 $lang['msg_disabled']          = 'Plugin %s uitgeschakeld';
-$lang['msg_delete_success']    = 'Uitbreiding gedeinstalleerd';
+$lang['msg_delete_success']    = 'Uitbreiding %s gedeinstalleerd';
 $lang['msg_template_install_success'] = 'Template %s werd succesvol geïnstalleerd';
 $lang['msg_template_update_success'] = 'Template %s werd succesvol geüpdatet';
 $lang['msg_plugin_install_success'] = 'Plugin %s werd succesvol geïnstalleerd';
-- 
cgit v1.2.3


From 67b5a1455c2585e08f87cc622641b843ad4f2171 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 2 Oct 2014 14:55:56 +0200
Subject: PHPDocs

---
 inc/IXR_Library.php | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 230 insertions(+), 9 deletions(-)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 6ec397894..c11c959b6 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -13,11 +13,20 @@
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
 
-
+/**
+ * Class IXR_Value
+ */
 class IXR_Value {
+
     /** @var  IXR_Value[]|IXR_Date|IXR_Base64|int|bool|double|string */
     var $data;
+    /** @var string  */
     var $type;
+
+    /**
+     * @param mixed $data
+     * @param bool $type
+     */
     function IXR_Value ($data, $type = false) {
         $this->data = $data;
         if (!$type) {
@@ -36,6 +45,10 @@ class IXR_Value {
             }
         }
     }
+
+    /**
+     * @return string
+     */
     function calculateType() {
         if ($this->data === true || $this->data === false) {
             return 'boolean';
@@ -69,6 +82,10 @@ class IXR_Value {
             return 'array';
         }
     }
+
+    /**
+     * @return bool|string
+     */
     function getXml() {
         /* Return XML for this value */
         switch ($this->type) {
@@ -108,6 +125,11 @@ class IXR_Value {
         }
         return false;
     }
+
+    /**
+     * @param array $array
+     * @return bool
+     */
     function isStruct($array) {
         /* Nasty function to check if an array is a struct or not */
         $expected = 0;
@@ -121,7 +143,9 @@ class IXR_Value {
     }
 }
 
-
+/**
+ * Class IXR_Message
+ */
 class IXR_Message {
     var $message;
     var $messageType;  // methodCall / methodResponse / fault
@@ -147,6 +171,10 @@ class IXR_Message {
     function IXR_Message ($message) {
         $this->message = $message;
     }
+
+    /**
+     * @return bool
+     */
     function parse() {
         // first remove the XML declaration
         $this->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $this->message);
@@ -181,6 +209,12 @@ class IXR_Message {
         }
         return true;
     }
+
+    /**
+     * @param $parser
+     * @param string $tag
+     * @param $attr
+     */
     function tag_open($parser, $tag, $attr) {
         $this->_currentTag = $tag;
         $this->_currentTagContents = '';
@@ -202,9 +236,19 @@ class IXR_Message {
         }
         $this->_lastseen = $tag;
     }
+
+    /**
+     * @param $parser
+     * @param string $cdata
+     */
     function cdata($parser, $cdata) {
         $this->_currentTagContents .= $cdata;
     }
+
+    /**
+     * @param $parser
+     * @param $tag
+     */
     function tag_close($parser, $tag) {
         $valueFlag = false;
         switch($tag) {
@@ -291,12 +335,21 @@ class IXR_Message {
     }
 }
 
-
+/**
+ * Class IXR_Server
+ */
 class IXR_Server {
     var $data;
+    /** @var array  */
     var $callbacks = array();
     var $message;
+    /** @var array  */
     var $capabilities;
+
+    /**
+     * @param array|bool $callbacks
+     * @param bool $data
+     */
     function IXR_Server($callbacks = false, $data = false) {
         $this->setCapabilities();
         if ($callbacks) {
@@ -305,6 +358,10 @@ class IXR_Server {
         $this->setCallbacks();
         $this->serve($data);
     }
+
+    /**
+     * @param bool|string $data
+     */
     function serve($data = false) {
         if (!$data) {
 
@@ -345,6 +402,12 @@ EOD;
         // Send it
         $this->output($xml);
     }
+
+    /**
+     * @param string $methodname
+     * @param array  $args
+     * @return IXR_Error|mixed
+     */
     function call($methodname, $args) {
         if (!$this->hasMethod($methodname)) {
             return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
@@ -393,6 +456,10 @@ EOD;
         return $result;
     }
 
+    /**
+     * @param int $error
+     * @param string|bool $message
+     */
     function error($error, $message = false) {
         // Accepts either an error object or an error code and message
         if ($message && !is_object($error)) {
@@ -400,11 +467,20 @@ EOD;
         }
         $this->output($error->getXml());
     }
+
+    /**
+     * @param $xml
+     */
     function output($xml) {
         header('Content-Type: text/xml; charset=utf-8');
         echo '<?xml version="1.0"?>', "\n", $xml;
         exit;
     }
+
+    /**
+     * @param string $method
+     * @return bool
+     */
     function hasMethod($method) {
         return in_array($method, array_keys($this->callbacks));
     }
@@ -425,6 +501,10 @@ EOD;
             ),
         );
     }
+
+    /**
+     * @return mixed
+     */
     function getCapabilities() {
         return $this->capabilities;
     }
@@ -433,11 +513,20 @@ EOD;
         $this->callbacks['system.listMethods'] = 'this:listMethods';
         $this->callbacks['system.multicall'] = 'this:multiCall';
     }
+
+    /**
+     * @return array
+     */
     function listMethods() {
         // Returns a list of methods - uses array_reverse to ensure user defined
         // methods are listed before server defined methods
         return array_reverse(array_keys($this->callbacks));
     }
+
+    /**
+     * @param array $methodcalls
+     * @return array
+     */
     function multiCall($methodcalls) {
         // See http://www.xmlrpc.com/discuss/msgReader$1208
         $return = array();
@@ -462,10 +551,21 @@ EOD;
     }
 }
 
+/**
+ * Class IXR_Request
+ */
 class IXR_Request {
+    /** @var string  */
     var $method;
+    /** @var array  */
     var $args;
+    /** @var string  */
     var $xml;
+
+    /**
+     * @param string $method
+     * @param array  $args
+     */
     function IXR_Request($method, $args) {
         $this->method = $method;
         $this->args = $args;
@@ -484,9 +584,17 @@ EOD;
         }
         $this->xml .= '</params></methodCall>';
     }
+
+    /**
+     * @return int
+     */
     function getLength() {
         return strlen($this->xml);
     }
+
+    /**
+     * @return string
+     */
     function getXml() {
         return $this->xml;
     }
@@ -503,9 +611,16 @@ EOD;
  */
 class IXR_Client extends DokuHTTPClient {
     var $posturl = '';
+    /** @var IXR_Message|bool  */
     var $message = false;
+    /** @var IXR_Error|bool */
     var $xmlerror = false;
 
+    /**
+     * @param string $server
+     * @param string|bool $path
+     * @param int $port
+     */
     function IXR_Client($server, $path = false, $port = 80) {
         parent::__construct();
         if (!$path) {
@@ -516,6 +631,10 @@ class IXR_Client extends DokuHTTPClient {
         }
     }
 
+    /**
+     * parameters: method and arguments
+     * @return bool success or error
+     */
     function query() {
         $args = func_get_args();
         $method = array_shift($args);
@@ -549,29 +668,56 @@ class IXR_Client extends DokuHTTPClient {
         // Message must be OK
         return true;
     }
+
+    /**
+     * @return mixed
+     */
     function getResponse() {
         // methodResponses can only have one param - return that
         return $this->message->params[0];
     }
+
+    /**
+     * @return bool
+     */
     function isError() {
         return (is_object($this->xmlerror));
     }
+
+    /**
+     * @return int
+     */
     function getErrorCode() {
         return $this->xmlerror->code;
     }
+
+    /**
+     * @return string
+     */
     function getErrorMessage() {
         return $this->xmlerror->message;
     }
 }
 
-
+/**
+ * Class IXR_Error
+ */
 class IXR_Error {
     var $code;
     var $message;
+
+    /**
+     * @param int $code
+     * @param string $message
+     */
     function IXR_Error($code, $message) {
         $this->code = $code;
         $this->message = $message;
     }
+
+    /**
+     * @return string
+     */
     function getXml() {
         $xml = <<<EOD
 <methodResponse>
@@ -596,7 +742,9 @@ EOD;
     }
 }
 
-
+/**
+ * Class IXR_Date
+ */
 class IXR_Date {
     var $year;
     var $month;
@@ -604,6 +752,10 @@ class IXR_Date {
     var $hour;
     var $minute;
     var $second;
+
+    /**
+     * @param int|string $time
+     */
     function IXR_Date($time) {
         // $time can be a PHP timestamp or an ISO one
         if (is_numeric($time)) {
@@ -612,6 +764,10 @@ class IXR_Date {
             $this->parseIso($time);
         }
     }
+
+    /**
+     * @param int $timestamp
+     */
     function parseTimestamp($timestamp) {
         $this->year = gmdate('Y', $timestamp);
         $this->month = gmdate('m', $timestamp);
@@ -620,6 +776,10 @@ class IXR_Date {
         $this->minute = gmdate('i', $timestamp);
         $this->second = gmdate('s', $timestamp);
     }
+
+    /**
+     * @param string $iso
+     */
     function parseIso($iso) {
         if(preg_match('/^(\d\d\d\d)-?(\d\d)-?(\d\d)([T ](\d\d):(\d\d)(:(\d\d))?)?/',$iso,$match)){
             $this->year   = (int) $match[1];
@@ -630,32 +790,59 @@ class IXR_Date {
             $this->second = (int) $match[8];
         }
     }
+
+    /**
+     * @return string
+     */
     function getIso() {
         return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second;
     }
+
+    /**
+     * @return string
+     */
     function getXml() {
         return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
     }
+
+    /**
+     * @return int
+     */
     function getTimestamp() {
         return gmmktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
     }
 }
 
-
+/**
+ * Class IXR_Base64
+ */
 class IXR_Base64 {
     var $data;
+
+    /**
+     * @param string $data
+     */
     function IXR_Base64($data) {
         $this->data = $data;
     }
+
+    /**
+     * @return string
+     */
     function getXml() {
         return '<base64>'.base64_encode($this->data).'</base64>';
     }
 }
 
-
+/**
+ * Class IXR_IntrospectionServer
+ */
 class IXR_IntrospectionServer extends IXR_Server {
-    var $signatures;
+    /** @var array[]  */
+    var $signatures
+    /** @var string[]  */;
     var $help;
+
     function IXR_IntrospectionServer() {
         $this->setCallbacks();
         $this->setCapabilities();
@@ -700,6 +887,12 @@ class IXR_IntrospectionServer extends IXR_Server {
         $this->signatures[$method] = $args;
         $this->help[$method] = $help;
     }
+
+    /**
+     * @param string $methodname
+     * @param array $args
+     * @return IXR_Error|mixed
+     */
     function call($methodname, $args) {
         // Make sure it's in an array
         if ($args && !is_array($args)) {
@@ -762,6 +955,11 @@ class IXR_IntrospectionServer extends IXR_Server {
         // It passed the test - run the "real" method call
         return parent::call($methodname, $argsbackup);
     }
+
+    /**
+     * @param string $method
+     * @return array|IXR_Error
+     */
     function methodSignature($method) {
         if (!$this->hasMethod($method)) {
             return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
@@ -800,18 +998,37 @@ class IXR_IntrospectionServer extends IXR_Server {
         }
         return $return;
     }
+
+    /**
+     * @param string $method
+     * @return mixed
+     */
     function methodHelp($method) {
         return $this->help[$method];
     }
 }
 
-
+/**
+ * Class IXR_ClientMulticall
+ */
 class IXR_ClientMulticall extends IXR_Client {
+
+    /** @var array[] */
     var $calls = array();
+
+    /**
+     * @param string $server
+     * @param string|bool $path
+     * @param int $port
+     */
     function IXR_ClientMulticall($server, $path = false, $port = 80) {
         parent::IXR_Client($server, $path, $port);
         //$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
     }
+
+    /**
+     * Add a call
+     */
     function addCall() {
         $args = func_get_args();
         $methodName = array_shift($args);
@@ -821,6 +1038,10 @@ class IXR_ClientMulticall extends IXR_Client {
         );
         $this->calls[] = $struct;
     }
+
+    /**
+     * @return bool
+     */
     function query() {
         // Prepare multicall, then call the parent::query() method
         return parent::query('system.multicall', $this->calls);
-- 
cgit v1.2.3


From a6eab1402c41508e5406f4b8e635d012fa684247 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 2 Oct 2014 15:06:45 +0200
Subject: Reformatting IXR library

---
 inc/IXR_Library.php | 236 ++++++++++++++++++++++++++--------------------------
 1 file changed, 119 insertions(+), 117 deletions(-)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index c11c959b6..699f8baa8 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -20,27 +20,27 @@ class IXR_Value {
 
     /** @var  IXR_Value[]|IXR_Date|IXR_Base64|int|bool|double|string */
     var $data;
-    /** @var string  */
+    /** @var string */
     var $type;
 
     /**
      * @param mixed $data
      * @param bool $type
      */
-    function IXR_Value ($data, $type = false) {
+    function IXR_Value($data, $type = false) {
         $this->data = $data;
-        if (!$type) {
+        if(!$type) {
             $type = $this->calculateType();
         }
         $this->type = $type;
-        if ($type == 'struct') {
+        if($type == 'struct') {
             /* Turn all the values in the array in to new IXR_Value objects */
-            foreach ($this->data as $key => $value) {
+            foreach($this->data as $key => $value) {
                 $this->data[$key] = new IXR_Value($value);
             }
         }
-        if ($type == 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; $i++) {
+        if($type == 'array') {
+            for($i = 0, $j = count($this->data); $i < $j; $i++) {
                 $this->data[$i] = new IXR_Value($this->data[$i]);
             }
         }
@@ -50,33 +50,33 @@ class IXR_Value {
      * @return string
      */
     function calculateType() {
-        if ($this->data === true || $this->data === false) {
+        if($this->data === true || $this->data === false) {
             return 'boolean';
         }
-        if (is_integer($this->data)) {
+        if(is_integer($this->data)) {
             return 'int';
         }
-        if (is_double($this->data)) {
+        if(is_double($this->data)) {
             return 'double';
         }
         // Deal with IXR object types base64 and date
-        if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
+        if(is_object($this->data) && is_a($this->data, 'IXR_Date')) {
             return 'date';
         }
-        if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
+        if(is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
             return 'base64';
         }
         // If it is a normal PHP object convert it in to a struct
-        if (is_object($this->data)) {
+        if(is_object($this->data)) {
 
             $this->data = get_object_vars($this->data);
             return 'struct';
         }
-        if (!is_array($this->data)) {
+        if(!is_array($this->data)) {
             return 'string';
         }
         /* We have an array - is it an array or a struct ? */
-        if ($this->isStruct($this->data)) {
+        if($this->isStruct($this->data)) {
             return 'struct';
         } else {
             return 'array';
@@ -88,32 +88,32 @@ class IXR_Value {
      */
     function getXml() {
         /* Return XML for this value */
-        switch ($this->type) {
+        switch($this->type) {
             case 'boolean':
-                return '<boolean>'.(($this->data) ? '1' : '0').'</boolean>';
+                return '<boolean>' . (($this->data) ? '1' : '0') . '</boolean>';
                 break;
             case 'int':
-                return '<int>'.$this->data.'</int>';
+                return '<int>' . $this->data . '</int>';
                 break;
             case 'double':
-                return '<double>'.$this->data.'</double>';
+                return '<double>' . $this->data . '</double>';
                 break;
             case 'string':
-                return '<string>'.htmlspecialchars($this->data).'</string>';
+                return '<string>' . htmlspecialchars($this->data) . '</string>';
                 break;
             case 'array':
-                $return = '<array><data>'."\n";
-                foreach ($this->data as $item) {
-                    $return .= '  <value>'.$item->getXml()."</value>\n";
+                $return = '<array><data>' . "\n";
+                foreach($this->data as $item) {
+                    $return .= '  <value>' . $item->getXml() . "</value>\n";
                 }
                 $return .= '</data></array>';
                 return $return;
                 break;
             case 'struct':
-                $return = '<struct>'."\n";
-                foreach ($this->data as $name => $value) {
+                $return = '<struct>' . "\n";
+                foreach($this->data as $name => $value) {
                     $return .= "  <member><name>$name</name><value>";
-                    $return .= $value->getXml()."</value></member>\n";
+                    $return .= $value->getXml() . "</value></member>\n";
                 }
                 $return .= '</struct>';
                 return $return;
@@ -133,8 +133,8 @@ class IXR_Value {
     function isStruct($array) {
         /* Nasty function to check if an array is a struct or not */
         $expected = 0;
-        foreach ($array as $key => $value) {
-            if ((string)$key != (string)$expected) {
+        foreach($array as $key => $value) {
+            if((string) $key != (string) $expected) {
                 return true;
             }
             $expected++;
@@ -148,15 +148,15 @@ class IXR_Value {
  */
 class IXR_Message {
     var $message;
-    var $messageType;  // methodCall / methodResponse / fault
+    var $messageType; // methodCall / methodResponse / fault
     var $faultCode;
     var $faultString;
     var $methodName;
     var $params;
     // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+    var $_arraystructs = array(); // The stack used to keep track of the current array/struct
     var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
+    var $_currentStructName = array(); // A stack as well
     var $_param;
     var $_value;
     var $_currentTag;
@@ -168,7 +168,7 @@ class IXR_Message {
     /**
      * @param string $message
      */
-    function IXR_Message ($message) {
+    function IXR_Message($message) {
         $this->message = $message;
     }
 
@@ -177,7 +177,7 @@ class IXR_Message {
      */
     function parse() {
         // first remove the XML declaration
-        $this->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $this->message);
+        $this->message = preg_replace('/<\?xml(.*)?\?' . '>/', '', $this->message);
         // workaround for a bug in PHP/libxml2, see http://bugs.php.net/bug.php?id=45996
         $this->message = str_replace('&lt;', '&#60;', $this->message);
         $this->message = str_replace('&gt;', '&#62;', $this->message);
@@ -185,7 +185,7 @@ class IXR_Message {
         $this->message = str_replace('&apos;', '&#39;', $this->message);
         $this->message = str_replace('&quot;', '&#34;', $this->message);
         $this->message = str_replace("\x0b", ' ', $this->message); //vertical tab
-        if (trim($this->message) == '') {
+        if(trim($this->message) == '') {
             return false;
         }
         $this->_parser = xml_parser_create();
@@ -195,7 +195,7 @@ class IXR_Message {
         xml_set_object($this->_parser, $this);
         xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
         xml_set_character_data_handler($this->_parser, 'cdata');
-        if (!xml_parse($this->_parser, $this->message)) {
+        if(!xml_parse($this->_parser, $this->message)) {
             /* die(sprintf('XML error: %s at line %d',
                 xml_error_string(xml_get_error_code($this->_parser)),
                 xml_get_current_line_number($this->_parser))); */
@@ -203,7 +203,7 @@ class IXR_Message {
         }
         xml_parser_free($this->_parser);
         // Grab the error messages, if any
-        if ($this->messageType == 'fault') {
+        if($this->messageType == 'fault') {
             $this->faultCode = $this->params[0]['faultCode'];
             $this->faultString = $this->params[0]['faultString'];
         }
@@ -225,7 +225,7 @@ class IXR_Message {
                 $this->messageType = $tag;
                 break;
             /* Deal with stacks of arrays and structs */
-            case 'data':    // data is to all intents and puposes more interesting than array
+            case 'data': // data is to all intents and puposes more interesting than array
                 $this->_arraystructstypes[] = 'array';
                 $this->_arraystructs[] = array();
                 break;
@@ -254,17 +254,17 @@ class IXR_Message {
         switch($tag) {
             case 'int':
             case 'i4':
-                $value = (int)trim($this->_currentTagContents);
+                $value = (int) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'double':
-                $value = (double)trim($this->_currentTagContents);
+                $value = (double) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'string':
-                $value = (string)$this->_currentTagContents;
+                $value = (string) $this->_currentTagContents;
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
@@ -276,14 +276,14 @@ class IXR_Message {
                 break;
             case 'value':
                 // "If no type is indicated, the type is string."
-                if($this->_lastseen == 'value'){
-                    $value = (string)$this->_currentTagContents;
+                if($this->_lastseen == 'value') {
+                    $value = (string) $this->_currentTagContents;
                     $this->_currentTagContents = '';
                     $valueFlag = true;
                 }
                 break;
             case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
+                $value = (boolean) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
@@ -311,20 +311,20 @@ class IXR_Message {
                 $this->_currentTagContents = '';
                 break;
         }
-        if ($valueFlag) {
+        if($valueFlag) {
             /*
             if (!is_array($value) && !is_object($value)) {
                 $value = trim($value);
             }
             */
-            if (count($this->_arraystructs) > 0) {
+            if(count($this->_arraystructs) > 0) {
                 // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
+                if($this->_arraystructstypes[count($this->_arraystructstypes) - 1] == 'struct') {
                     // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
+                    $this->_arraystructs[count($this->_arraystructs) - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
                 } else {
                     // Add to array
-                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
+                    $this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
                 }
             } else {
                 // Just add as a paramater
@@ -340,10 +340,10 @@ class IXR_Message {
  */
 class IXR_Server {
     var $data;
-    /** @var array  */
+    /** @var array */
     var $callbacks = array();
     var $message;
-    /** @var array  */
+    /** @var array */
     var $capabilities;
 
     /**
@@ -352,7 +352,7 @@ class IXR_Server {
      */
     function IXR_Server($callbacks = false, $data = false) {
         $this->setCapabilities();
-        if ($callbacks) {
+        if($callbacks) {
             $this->callbacks = $callbacks;
         }
         $this->setCallbacks();
@@ -363,24 +363,24 @@ class IXR_Server {
      * @param bool|string $data
      */
     function serve($data = false) {
-        if (!$data) {
+        if(!$data) {
 
             $postData = trim(http_get_raw_post_data());
-            if (!$postData) {
+            if(!$postData) {
                 die('XML-RPC server accepts POST requests only.');
             }
             $data = $postData;
         }
         $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
+        if(!$this->message->parse()) {
             $this->error(-32700, 'parse error. not well formed');
         }
-        if ($this->message->messageType != 'methodCall') {
+        if($this->message->messageType != 'methodCall') {
             $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
         }
         $result = $this->call($this->message->methodName, $this->message->params);
         // Is the result an error?
-        if (is_a($result, 'IXR_Error')) {
+        if(is_a($result, 'IXR_Error')) {
             $this->error($result);
         }
         // Encode the result
@@ -405,12 +405,12 @@ EOD;
 
     /**
      * @param string $methodname
-     * @param array  $args
+     * @param array $args
      * @return IXR_Error|mixed
      */
     function call($methodname, $args) {
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
+        if(!$this->hasMethod($methodname)) {
+            return new IXR_Error(-32601, 'server error. requested method ' . $methodname . ' does not exist.');
         }
         $method = $this->callbacks[$methodname];
         // Perform the callback and send the response
@@ -427,16 +427,16 @@ EOD;
         $args = (array) $args;
 
         // Are we dealing with a function or a method?
-        if (substr($method, 0, 5) == 'this:') {
+        if(substr($method, 0, 5) == 'this:') {
             // It's a class method - check it exists
             $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
+            if(!method_exists($this, $method)) {
+                return new IXR_Error(-32601, 'server error. requested class method "' . $method . '" does not exist.');
             }
             // Call the method
             #$result = $this->$method($args);
-            $result = call_user_func_array(array(&$this,$method),$args);
-        } elseif (substr($method, 0, 7) == 'plugin:') {
+            $result = call_user_func_array(array(&$this, $method), $args);
+        } elseif(substr($method, 0, 7) == 'plugin:') {
             list($pluginname, $callback) = explode(':', substr($method, 7), 2);
             if(!plugin_isdisabled($pluginname)) {
                 $plugin = plugin_load('action', $pluginname);
@@ -446,12 +446,12 @@ EOD;
             }
         } else {
             // It's a function - does it exist?
-            if (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
+            if(!function_exists($method)) {
+                return new IXR_Error(-32601, 'server error. requested function "' . $method . '" does not exist.');
             }
             // Call the function
             #$result = $method($args);
-            $result = call_user_func_array($method,$args);
+            $result = call_user_func_array($method, $args);
         }
         return $result;
     }
@@ -462,7 +462,7 @@ EOD;
      */
     function error($error, $message = false) {
         // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
+        if($message && !is_object($error)) {
             $error = new IXR_Error($error, $message);
         }
         $this->output($error->getXml());
@@ -484,6 +484,7 @@ EOD;
     function hasMethod($method) {
         return in_array($method, array_keys($this->callbacks));
     }
+
     function setCapabilities() {
         // Initialises capabilities array
         $this->capabilities = array(
@@ -508,6 +509,7 @@ EOD;
     function getCapabilities() {
         return $this->capabilities;
     }
+
     function setCallbacks() {
         $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
         $this->callbacks['system.listMethods'] = 'this:listMethods';
@@ -530,15 +532,15 @@ EOD;
     function multiCall($methodcalls) {
         // See http://www.xmlrpc.com/discuss/msgReader$1208
         $return = array();
-        foreach ($methodcalls as $call) {
+        foreach($methodcalls as $call) {
             $method = $call['methodName'];
             $params = $call['params'];
-            if ($method == 'system.multicall') {
+            if($method == 'system.multicall') {
                 $result = new IXR_Error(-32800, 'Recursive calls to system.multicall are forbidden');
             } else {
                 $result = $this->call($method, $params);
             }
-            if (is_a($result, 'IXR_Error')) {
+            if(is_a($result, 'IXR_Error')) {
                 $return[] = array(
                     'faultCode' => $result->code,
                     'faultString' => $result->message
@@ -555,16 +557,16 @@ EOD;
  * Class IXR_Request
  */
 class IXR_Request {
-    /** @var string  */
+    /** @var string */
     var $method;
-    /** @var array  */
+    /** @var array */
     var $args;
-    /** @var string  */
+    /** @var string */
     var $xml;
 
     /**
      * @param string $method
-     * @param array  $args
+     * @param array $args
      */
     function IXR_Request($method, $args) {
         $this->method = $method;
@@ -576,7 +578,7 @@ class IXR_Request {
 <params>
 
 EOD;
-        foreach ($this->args as $arg) {
+        foreach($this->args as $arg) {
             $this->xml .= '<param><value>';
             $v = new IXR_Value($arg);
             $this->xml .= $v->getXml();
@@ -611,7 +613,7 @@ EOD;
  */
 class IXR_Client extends DokuHTTPClient {
     var $posturl = '';
-    /** @var IXR_Message|bool  */
+    /** @var IXR_Message|bool */
     var $message = false;
     /** @var IXR_Error|bool */
     var $xmlerror = false;
@@ -623,11 +625,11 @@ class IXR_Client extends DokuHTTPClient {
      */
     function IXR_Client($server, $path = false, $port = 80) {
         parent::__construct();
-        if (!$path) {
+        if(!$path) {
             // Assume we have been given a URL instead
             $this->posturl = $server;
-        }else{
-            $this->posturl = 'http://'.$server.':'.$port.$path;
+        } else {
+            $this->posturl = 'http://' . $server . ':' . $port . $path;
         }
     }
 
@@ -642,26 +644,26 @@ class IXR_Client extends DokuHTTPClient {
         $xml = $request->getXml();
 
         $this->headers['Content-Type'] = 'text/xml';
-        if(!$this->sendRequest($this->posturl,$xml,'POST')){
-            $this->xmlerror = new IXR_Error(-32300, 'transport error - '.$this->error);
+        if(!$this->sendRequest($this->posturl, $xml, 'POST')) {
+            $this->xmlerror = new IXR_Error(-32300, 'transport error - ' . $this->error);
             return false;
         }
 
         // Check HTTP Response code
-        if($this->status < 200 || $this->status > 206){
-            $this->xmlerror = new IXR_Error(-32300, 'transport error - HTTP status '.$this->status);
+        if($this->status < 200 || $this->status > 206) {
+            $this->xmlerror = new IXR_Error(-32300, 'transport error - HTTP status ' . $this->status);
             return false;
         }
 
         // Now parse what we've got back
         $this->message = new IXR_Message($this->resp_body);
-        if (!$this->message->parse()) {
+        if(!$this->message->parse()) {
             // XML error
             $this->xmlerror = new IXR_Error(-32700, 'parse error. not well formed');
             return false;
         }
         // Is the message a fault?
-        if ($this->message->messageType == 'fault') {
+        if($this->message->messageType == 'fault') {
             $this->xmlerror = new IXR_Error($this->message->faultCode, $this->message->faultString);
             return false;
         }
@@ -758,7 +760,7 @@ class IXR_Date {
      */
     function IXR_Date($time) {
         // $time can be a PHP timestamp or an ISO one
-        if (is_numeric($time)) {
+        if(is_numeric($time)) {
             $this->parseTimestamp($time);
         } else {
             $this->parseIso($time);
@@ -781,11 +783,11 @@ class IXR_Date {
      * @param string $iso
      */
     function parseIso($iso) {
-        if(preg_match('/^(\d\d\d\d)-?(\d\d)-?(\d\d)([T ](\d\d):(\d\d)(:(\d\d))?)?/',$iso,$match)){
-            $this->year   = (int) $match[1];
-            $this->month  = (int) $match[2];
-            $this->day    = (int) $match[3];
-            $this->hour   = (int) $match[5];
+        if(preg_match('/^(\d\d\d\d)-?(\d\d)-?(\d\d)([T ](\d\d):(\d\d)(:(\d\d))?)?/', $iso, $match)) {
+            $this->year = (int) $match[1];
+            $this->month = (int) $match[2];
+            $this->day = (int) $match[3];
+            $this->hour = (int) $match[5];
             $this->minute = (int) $match[6];
             $this->second = (int) $match[8];
         }
@@ -795,14 +797,14 @@ class IXR_Date {
      * @return string
      */
     function getIso() {
-        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second;
+        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second;
     }
 
     /**
      * @return string
      */
     function getXml() {
-        return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
+        return '<dateTime.iso8601>' . $this->getIso() . '</dateTime.iso8601>';
     }
 
     /**
@@ -830,7 +832,7 @@ class IXR_Base64 {
      * @return string
      */
     function getXml() {
-        return '<base64>'.base64_encode($this->data).'</base64>';
+        return '<base64>' . base64_encode($this->data) . '</base64>';
     }
 }
 
@@ -838,9 +840,9 @@ class IXR_Base64 {
  * Class IXR_IntrospectionServer
  */
 class IXR_IntrospectionServer extends IXR_Server {
-    /** @var array[]  */
-    var $signatures
-    /** @var string[]  */;
+    /** @var array[] */
+    var $signatures/** @var string[] */
+    ;
     var $help;
 
     function IXR_IntrospectionServer() {
@@ -877,10 +879,10 @@ class IXR_IntrospectionServer extends IXR_Server {
     }
 
     /**
-     * @param string   $method
-     * @param string   $callback
+     * @param string $method
+     * @param string $callback
      * @param string[] $args
-     * @param string   $help
+     * @param string $help
      */
     function addCallback($method, $callback, $args, $help) {
         $this->callbacks[$method] = $callback;
@@ -895,60 +897,60 @@ class IXR_IntrospectionServer extends IXR_Server {
      */
     function call($methodname, $args) {
         // Make sure it's in an array
-        if ($args && !is_array($args)) {
+        if($args && !is_array($args)) {
             $args = array($args);
         }
         // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
+        if(!$this->hasMethod($methodname)) {
+            return new IXR_Error(-32601, 'server error. requested method "' . $this->message->methodName . '" not specified.');
         }
         $method = $this->callbacks[$methodname];
         $signature = $this->signatures[$methodname];
         $returnType = array_shift($signature);
         // Check the number of arguments. Check only, if the minimum count of parameters is specified. More parameters are possible.
         // This is a hack to allow optional parameters...
-        if (count($args) < count($signature)) {
+        if(count($args) < count($signature)) {
             // print 'Num of args: '.count($args).' Num in signature: '.count($signature);
             return new IXR_Error(-32602, 'server error. wrong number of method parameters');
         }
         // Check the argument types
         $ok = true;
         $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; $i++) {
+        for($i = 0, $j = count($args); $i < $j; $i++) {
             $arg = array_shift($args);
             $type = array_shift($signature);
-            switch ($type) {
+            switch($type) {
                 case 'int':
                 case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
+                    if(is_array($arg) || !is_int($arg)) {
                         $ok = false;
                     }
                     break;
                 case 'base64':
                 case 'string':
-                    if (!is_string($arg)) {
+                    if(!is_string($arg)) {
                         $ok = false;
                     }
                     break;
                 case 'boolean':
-                    if ($arg !== false && $arg !== true) {
+                    if($arg !== false && $arg !== true) {
                         $ok = false;
                     }
                     break;
                 case 'float':
                 case 'double':
-                    if (!is_float($arg)) {
+                    if(!is_float($arg)) {
                         $ok = false;
                     }
                     break;
                 case 'date':
                 case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
+                    if(!is_a($arg, 'IXR_Date')) {
                         $ok = false;
                     }
                     break;
             }
-            if (!$ok) {
+            if(!$ok) {
                 return new IXR_Error(-32602, 'server error. invalid method parameters');
             }
         }
@@ -961,14 +963,14 @@ class IXR_IntrospectionServer extends IXR_Server {
      * @return array|IXR_Error
      */
     function methodSignature($method) {
-        if (!$this->hasMethod($method)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
+        if(!$this->hasMethod($method)) {
+            return new IXR_Error(-32601, 'server error. requested method "' . $method . '" not specified.');
         }
         // We should be returning an array of types
         $types = $this->signatures[$method];
         $return = array();
-        foreach ($types as $type) {
-            switch ($type) {
+        foreach($types as $type) {
+            switch($type) {
                 case 'string':
                     $return[] = 'string';
                     break;
-- 
cgit v1.2.3


From 0a8880f674dca9ad836481eb6d5403510bf886f5 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 3 Oct 2014 00:46:37 +0200
Subject: Update IXR lib from 1.61 to 1.7.4 + WP improvements

Update to latest Incutio XML-RPC Library
include also some Wordpress improvements
(see for more details the log of the lib as included in WP:
https://core.trac.wordpress.org/log/trunk/src/wp-includes/class-IXR.php )
---
 inc/IXR_Library.php | 211 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 147 insertions(+), 64 deletions(-)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 699f8baa8..839298680 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -1,21 +1,46 @@
 <?php
+
 /**
- * IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002
+ * IXR - The Incutio XML-RPC Library
+ *
+ * Copyright (c) 2010, Incutio Ltd.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Incutio Ltd. nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * @version 1.61
- * @author  Simon Willison
- * @date    11th July 2003
- * @link    http://scripts.incutio.com/xmlrpc/
- * @link    http://scripts.incutio.com/xmlrpc/manual.php
- * @license Artistic License http://www.opensource.org/licenses/artistic-license.php
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package IXR
+ * @since 1.5
+ *
+ * @copyright  Incutio Ltd 2010 (http://www.incutio.com)
+ * @version    1.7.4 7th September 2010
+ * @author     Simon Willison
+ * @link       http://scripts.incutio.com/xmlrpc/ Site/manual
  *
  * Modified for DokuWiki
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-
-/**
- * Class IXR_Value
- */
 class IXR_Value {
 
     /** @var  IXR_Value[]|IXR_Date|IXR_Base64|int|bool|double|string */
@@ -34,7 +59,7 @@ class IXR_Value {
         }
         $this->type = $type;
         if($type == 'struct') {
-            /* Turn all the values in the array in to new IXR_Value objects */
+            // Turn all the values in the array in to new IXR_Value objects
             foreach($this->data as $key => $value) {
                 $this->data[$key] = new IXR_Value($value);
             }
@@ -59,6 +84,7 @@ class IXR_Value {
         if(is_double($this->data)) {
             return 'double';
         }
+
         // Deal with IXR object types base64 and date
         if(is_object($this->data) && is_a($this->data, 'IXR_Date')) {
             return 'date';
@@ -66,16 +92,17 @@ class IXR_Value {
         if(is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
             return 'base64';
         }
+
         // If it is a normal PHP object convert it in to a struct
         if(is_object($this->data)) {
-
             $this->data = get_object_vars($this->data);
             return 'struct';
         }
         if(!is_array($this->data)) {
             return 'string';
         }
-        /* We have an array - is it an array or a struct ? */
+
+        // We have an array - is it an array or a struct?
         if($this->isStruct($this->data)) {
             return 'struct';
         } else {
@@ -87,7 +114,7 @@ class IXR_Value {
      * @return bool|string
      */
     function getXml() {
-        /* Return XML for this value */
+        // Return XML for this value
         switch($this->type) {
             case 'boolean':
                 return '<boolean>' . (($this->data) ? '1' : '0') . '</boolean>';
@@ -127,11 +154,12 @@ class IXR_Value {
     }
 
     /**
+     * Checks whether or not the supplied array is a struct or not
+     *
      * @param array $array
-     * @return bool
+     * @return boolean
      */
     function isStruct($array) {
-        /* Nasty function to check if an array is a struct or not */
         $expected = 0;
         foreach($array as $key => $value) {
             if((string) $key != (string) $expected) {
@@ -144,7 +172,11 @@ class IXR_Value {
 }
 
 /**
- * Class IXR_Message
+ * IXR_MESSAGE
+ *
+ * @package IXR
+ * @since 1.5
+ *
  */
 class IXR_Message {
     var $message;
@@ -153,6 +185,7 @@ class IXR_Message {
     var $faultString;
     var $methodName;
     var $params;
+
     // Current variable stacks
     var $_arraystructs = array(); // The stack used to keep track of the current array/struct
     var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
@@ -169,7 +202,7 @@ class IXR_Message {
      * @param string $message
      */
     function IXR_Message($message) {
-        $this->message = $message;
+        $this->message =& $message;
     }
 
     /**
@@ -177,7 +210,10 @@ class IXR_Message {
      */
     function parse() {
         // first remove the XML declaration
-        $this->message = preg_replace('/<\?xml(.*)?\?' . '>/', '', $this->message);
+        // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
+        $header = preg_replace('/<\?xml.*?\?' . '>/', '', substr($this->message, 0, 100), 1);
+        $this->message = substr_replace($this->message, $header, 0, 100);
+
         // workaround for a bug in PHP/libxml2, see http://bugs.php.net/bug.php?id=45996
         $this->message = str_replace('&lt;', '&#60;', $this->message);
         $this->message = str_replace('&gt;', '&#62;', $this->message);
@@ -195,13 +231,23 @@ class IXR_Message {
         xml_set_object($this->_parser, $this);
         xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
         xml_set_character_data_handler($this->_parser, 'cdata');
-        if(!xml_parse($this->_parser, $this->message)) {
-            /* die(sprintf('XML error: %s at line %d',
-                xml_error_string(xml_get_error_code($this->_parser)),
-                xml_get_current_line_number($this->_parser))); */
-            return false;
-        }
+        $chunk_size = 262144; // 256Kb, parse in chunks to avoid the RAM usage on very large messages
+        $final = false;
+        do {
+            if(strlen($this->message) <= $chunk_size) {
+                $final = true;
+            }
+            $part = substr($this->message, 0, $chunk_size);
+            $this->message = substr($this->message, $chunk_size);
+            if(!xml_parse($this->_parser, $part, $final)) {
+                return false;
+            }
+            if($final) {
+                break;
+            }
+        } while(true);
         xml_parser_free($this->_parser);
+
         // Grab the error messages, if any
         if($this->messageType == 'fault') {
             $this->faultCode = $this->params[0]['faultCode'];
@@ -216,8 +262,9 @@ class IXR_Message {
      * @param $attr
      */
     function tag_open($parser, $tag, $attr) {
-        $this->_currentTag = $tag;
         $this->_currentTagContents = '';
+        $this->_currentTag = $tag;
+
         switch($tag) {
             case 'methodCall':
             case 'methodResponse':
@@ -225,7 +272,7 @@ class IXR_Message {
                 $this->messageType = $tag;
                 break;
             /* Deal with stacks of arrays and structs */
-            case 'data': // data is to all intents and puposes more interesting than array
+            case 'data': // data is to all intents and purposes more interesting than array
                 $this->_arraystructstypes[] = 'array';
                 $this->_arraystructs[] = array();
                 break;
@@ -255,41 +302,33 @@ class IXR_Message {
             case 'int':
             case 'i4':
                 $value = (int) trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'double':
                 $value = (double) trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'string':
                 $value = (string) $this->_currentTagContents;
-                $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'dateTime.iso8601':
                 $value = new IXR_Date(trim($this->_currentTagContents));
-                // $value = $iso->getTimestamp();
-                $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'value':
                 // "If no type is indicated, the type is string."
                 if($this->_lastseen == 'value') {
                     $value = (string) $this->_currentTagContents;
-                    $this->_currentTagContents = '';
                     $valueFlag = true;
                 }
                 break;
             case 'boolean':
                 $value = (boolean) trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'base64':
                 $value = base64_decode($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             /* Deal with stacks of arrays and structs */
@@ -304,19 +343,13 @@ class IXR_Message {
                 break;
             case 'name':
                 $this->_currentStructName[] = trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 break;
             case 'methodName':
                 $this->methodName = trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 break;
         }
+
         if($valueFlag) {
-            /*
-            if (!is_array($value) && !is_object($value)) {
-                $value = trim($value);
-            }
-            */
             if(count($this->_arraystructs) > 0) {
                 // Add value to struct or array
                 if($this->_arraystructstypes[count($this->_arraystructstypes) - 1] == 'struct') {
@@ -327,16 +360,20 @@ class IXR_Message {
                     $this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
                 }
             } else {
-                // Just add as a paramater
+                // Just add as a parameter
                 $this->params[] = $value;
             }
         }
+        $this->_currentTagContents = '';
         $this->_lastseen = $tag;
     }
 }
 
 /**
- * Class IXR_Server
+ * IXR_Server
+ *
+ * @package IXR
+ * @since 1.5
  */
 class IXR_Server {
     var $data;
@@ -349,14 +386,18 @@ class IXR_Server {
     /**
      * @param array|bool $callbacks
      * @param bool $data
+     * @param bool $wait
      */
-    function IXR_Server($callbacks = false, $data = false) {
+    function IXR_Server($callbacks = false, $data = false, $wait = false) {
         $this->setCapabilities();
         if($callbacks) {
             $this->callbacks = $callbacks;
         }
         $this->setCallbacks();
-        $this->serve($data);
+
+        if(!$wait) {
+            $this->serve($data);
+        }
     }
 
     /**
@@ -367,6 +408,7 @@ class IXR_Server {
 
             $postData = trim(http_get_raw_post_data());
             if(!$postData) {
+                header('Content-Type: text/plain'); // merged from WP #9093
                 die('XML-RPC server accepts POST requests only.');
             }
             $data = $postData;
@@ -379,13 +421,16 @@ class IXR_Server {
             $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
         }
         $result = $this->call($this->message->methodName, $this->message->params);
+
         // Is the result an error?
         if(is_a($result, 'IXR_Error')) {
             $this->error($result);
         }
+
         // Encode the result
         $r = new IXR_Value($result);
         $resultxml = $r->getXml();
+
         // Create the XML
         $xml = <<<EOD
 <methodResponse>
@@ -413,11 +458,12 @@ EOD;
             return new IXR_Error(-32601, 'server error. requested method ' . $methodname . ' does not exist.');
         }
         $method = $this->callbacks[$methodname];
+
         // Perform the callback and send the response
 
         # Removed for DokuWiki to have a more consistent interface
         #        if (count($args) == 1) {
-        #            // If only one paramater just send that instead of the whole array
+        #            // If only one parameter just send that instead of the whole array
         #            $args = $args[0];
         #        }
 
@@ -427,7 +473,7 @@ EOD;
         $args = (array) $args;
 
         // Are we dealing with a function or a method?
-        if(substr($method, 0, 5) == 'this:') {
+        if(is_string($method) && substr($method, 0, 5) == 'this:') {
             // It's a class method - check it exists
             $method = substr($method, 5);
             if(!method_exists($this, $method)) {
@@ -446,12 +492,16 @@ EOD;
             }
         } else {
             // It's a function - does it exist?
-            if(!function_exists($method)) {
+            if(is_array($method)) {
+                if(!is_callable(array($method[0], $method[1]))) {
+                    return new IXR_Error(-32601, 'server error. requested object method "' . $method[1] . '" does not exist.');
+                }
+            } else if(!function_exists($method)) {
                 return new IXR_Error(-32601, 'server error. requested function "' . $method . '" does not exist.');
             }
+
             // Call the function
-            #$result = $method($args);
-            $result = call_user_func_array($method, $args);
+            $result = call_user_func($method, $args);
         }
         return $result;
     }
@@ -469,7 +519,7 @@ EOD;
     }
 
     /**
-     * @param $xml
+     * @param string $xml
      */
     function output($xml) {
         header('Content-Type: text/xml; charset=utf-8');
@@ -554,7 +604,10 @@ EOD;
 }
 
 /**
- * Class IXR_Request
+ * IXR_Request
+ *
+ * @package IXR
+ * @since 1.5
  */
 class IXR_Request {
     /** @var string */
@@ -603,6 +656,11 @@ EOD;
 }
 
 /**
+ * IXR_Client
+ *
+ * @package IXR
+ * @since 1.5
+ *
  * Changed for DokuWiki to use DokuHTTPClient
  *
  * This should be compatible to the original class, but uses DokuWiki's
@@ -615,6 +673,8 @@ class IXR_Client extends DokuHTTPClient {
     var $posturl = '';
     /** @var IXR_Message|bool */
     var $message = false;
+
+    // Storage place for an error message
     /** @var IXR_Error|bool */
     var $xmlerror = false;
 
@@ -622,8 +682,9 @@ class IXR_Client extends DokuHTTPClient {
      * @param string $server
      * @param string|bool $path
      * @param int $port
+     * @param int $timeout
      */
-    function IXR_Client($server, $path = false, $port = 80) {
+    function IXR_Client($server, $path = false, $port = 80, $timeout = 15) {
         parent::__construct();
         if(!$path) {
             // Assume we have been given a URL instead
@@ -631,6 +692,7 @@ class IXR_Client extends DokuHTTPClient {
         } else {
             $this->posturl = 'http://' . $server . ':' . $port . $path;
         }
+        $this->timeout = $timeout;
     }
 
     /**
@@ -662,11 +724,13 @@ class IXR_Client extends DokuHTTPClient {
             $this->xmlerror = new IXR_Error(-32700, 'parse error. not well formed');
             return false;
         }
+
         // Is the message a fault?
         if($this->message->messageType == 'fault') {
             $this->xmlerror = new IXR_Error($this->message->faultCode, $this->message->faultString);
             return false;
         }
+
         // Message must be OK
         return true;
     }
@@ -702,7 +766,10 @@ class IXR_Client extends DokuHTTPClient {
 }
 
 /**
- * Class IXR_Error
+ * IXR_Error
+ *
+ * @package IXR
+ * @since 1.5
  */
 class IXR_Error {
     var $code;
@@ -714,7 +781,7 @@ class IXR_Error {
      */
     function IXR_Error($code, $message) {
         $this->code = $code;
-        $this->message = $message;
+        $this->message = htmlspecialchars($message);
     }
 
     /**
@@ -745,7 +812,10 @@ EOD;
 }
 
 /**
- * Class IXR_Date
+ * IXR_Date
+ *
+ * @package IXR
+ * @since 1.5
  */
 class IXR_Date {
     var $year;
@@ -754,6 +824,7 @@ class IXR_Date {
     var $hour;
     var $minute;
     var $second;
+    var $timezone;
 
     /**
      * @param int|string $time
@@ -777,6 +848,7 @@ class IXR_Date {
         $this->hour = gmdate('H', $timestamp);
         $this->minute = gmdate('i', $timestamp);
         $this->second = gmdate('s', $timestamp);
+        $this->timezone = '';
     }
 
     /**
@@ -797,7 +869,7 @@ class IXR_Date {
      * @return string
      */
     function getIso() {
-        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second;
+        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second . $this->timezone;
     }
 
     /**
@@ -816,7 +888,10 @@ class IXR_Date {
 }
 
 /**
- * Class IXR_Base64
+ * IXR_Base64
+ *
+ * @package IXR
+ * @since 1.5
  */
 class IXR_Base64 {
     var $data;
@@ -837,12 +912,15 @@ class IXR_Base64 {
 }
 
 /**
- * Class IXR_IntrospectionServer
+ * IXR_IntrospectionServer
+ *
+ * @package IXR
+ * @since 1.5
  */
 class IXR_IntrospectionServer extends IXR_Server {
     /** @var array[] */
-    var $signatures/** @var string[] */
-    ;
+    var $signatures;
+    /** @var string[] */
     var $help;
 
     function IXR_IntrospectionServer() {
@@ -900,6 +978,7 @@ class IXR_IntrospectionServer extends IXR_Server {
         if($args && !is_array($args)) {
             $args = array($args);
         }
+
         // Over-rides default call method, adds signature check
         if(!$this->hasMethod($methodname)) {
             return new IXR_Error(-32601, 'server error. requested method "' . $this->message->methodName . '" not specified.');
@@ -913,6 +992,7 @@ class IXR_IntrospectionServer extends IXR_Server {
             // print 'Num of args: '.count($args).' Num in signature: '.count($signature);
             return new IXR_Error(-32602, 'server error. wrong number of method parameters');
         }
+
         // Check the argument types
         $ok = true;
         $argsbackup = $args;
@@ -1011,7 +1091,10 @@ class IXR_IntrospectionServer extends IXR_Server {
 }
 
 /**
- * Class IXR_ClientMulticall
+ * IXR_ClientMulticall
+ *
+ * @package IXR
+ * @since 1.5
  */
 class IXR_ClientMulticall extends IXR_Client {
 
-- 
cgit v1.2.3


From 1cc82e5c76ae7fcd646e448404afdc0fd458bf55 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 3 Oct 2014 15:56:15 +0200
Subject: scrutiner issues

---
 inc/actions.php | 1 +
 inc/cliopts.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/actions.php b/inc/actions.php
index 68b71a36a..766c3cd0b 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -200,6 +200,7 @@ function act_dispatch(){
     global $license;
 
     //call template FIXME: all needed vars available?
+    $headers = array();
     $headers[] = 'Content-Type: text/html; charset=utf-8';
     trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders');
 
diff --git a/inc/cliopts.php b/inc/cliopts.php
index f2782a465..7d71c7dc9 100644
--- a/inc/cliopts.php
+++ b/inc/cliopts.php
@@ -36,9 +36,9 @@ if (version_compare(phpversion(), '4.3.0', '<') || php_sapi_name() == 'cgi') {
 
     // PHP ini settings
     set_time_limit(0);
-    ini_set('track_errors', true);
-    ini_set('html_errors', false);
-    ini_set('magic_quotes_runtime', false);
+    ini_set('track_errors', "1");
+    ini_set('html_errors', "0");
+    ini_set('magic_quotes_runtime', "0");
 
     // Define stream constants
     define('STDIN', fopen('php://stdin', 'r'));
-- 
cgit v1.2.3


From b78360221dcfb32d0070009cfea00c256f174222 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Wed, 8 Oct 2014 14:31:19 +0200
Subject: translation update

---
 inc/lang/ko/lang.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 3cedf021a..61bb58350 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -74,7 +74,7 @@ $lang['badpassconfirm']        = '죄송하지만 비밀번호가 잘못되었
 $lang['minoredit']             = '사소한 바뀜';
 $lang['draftdate']             = '초안 자동 저장 시간';
 $lang['nosecedit']             = '한 동안 문서가 바뀌었으며, 문단 정보가 오래되어 문서 전체를 대신 열었습니다.';
-$lang['searchcreatepage']      = "만약 원하는 문서를 찾지 못했다면, ''문서 만들기''나 ''문서 편집''을 사용해 검색어와 같은 이름의 문서를 만들거나 편집할 수 있습니다.";
+$lang['searchcreatepage']      = '만약 원하는 문서를 찾지 못했다면, \'\'문서 만들기\'\'나 \'\'문서 편집\'\'을 사용해 검색어와 같은 이름의 문서를 만들거나 편집할 수 있습니다.';
 $lang['regmissing']            = '죄송하지만 모든 필드를 채워야 합니다.';
 $lang['reguexists']            = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.';
 $lang['regsuccess']            = '사용자를 만들었으며 비밀번호는 이메일로 보냈습니다.';
@@ -344,3 +344,5 @@ $lang['currentns']             = '현재 이름공간';
 $lang['searchresult']          = '검색 결과';
 $lang['plainhtml']             = '일반 HTML';
 $lang['wikimarkup']            = '위키 문법';
+$lang['page_nonexist_rev']     = '문서가 %s에 존재하지 않았습니다. 그 뒤로 <a href="%s">%s</a>에 만들어졌습니다.';
+$lang['unable_to_parse_date']  = '"%s" 변수에서 구문 분석할 수 없습니다.';
-- 
cgit v1.2.3


From 86c04d87ee7a9a39ec8838fd53e3797f51949719 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Sat, 11 Oct 2014 12:06:30 +1100
Subject: Fix for update messages never completely going away

The existing logic for messages.txt requires some valid update
response (ending in %) to the messages update check before it clears
the current messages.

However update.dokuwiki.org appears to return an empty string response
if everything is up to date. (ie http://update.dokuwiki.org/check/46.1 )

As a result if there are update messages in messages.txt they don't
automatically go away after updating to the current version. The only
time they change is when a newer release comes out. The upgrade plugin
has logic in it to force a re-download of messages.txt, but currently
this just re-downloads the old update messages.

This change explicitly allows for "" as a valid "no messages"
indicator (distinct from false, which is the HTTP error indicator.)
---
 inc/infoutils.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/inc/infoutils.php b/inc/infoutils.php
index f9ba11560..e2b64d3ca 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -29,18 +29,19 @@ function checkUpdateMessages(){
         dbglog("checkUpdateMessages(): downloading messages.txt");
         $http = new DokuHTTPClient();
         $http->timeout = 12;
-        $data = $http->get(DOKU_MESSAGEURL.$updateVersion);
-        if(substr(trim($data), -1) != '%') {
-            // this doesn't look like one of our messages, maybe some WiFi login interferred
-            $data = '';
-        }else {
-            io_saveFile($cf,$data);
+        $resp = $http->get(DOKU_MESSAGEURL.$updateVersion);
+        if(is_string($resp) && ($resp == "" || substr(trim($resp), -1) == '%')) {
+            // basic sanity check that this is either an empty string response (ie "no messages")
+            // or it looks like one of our messages, not WiFi login or other interposed response
+            io_saveFile($cf,$resp);
+        } else {
+            dbglog("checkUpdateMessages(): unexpected HTTP response received");
         }
     }else{
         dbglog("checkUpdateMessages(): messages.txt up to date");
-        $data = io_readFile($cf);
     }
 
+    $data = io_readFile($cf);
     // show messages through the usual message mechanism
     $msgs = explode("\n%\n",$data);
     foreach($msgs as $msg){
-- 
cgit v1.2.3


From 7d247a3cecc7d9f7d6e3c84a3589c591d7ed09c0 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 11 Oct 2014 10:41:57 +0200
Subject: preserve comments in less if 'compress' config disabled

Otherwise comments are never visible in css.php
---
 lib/exe/css.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 6c1d60751..f7235fd4e 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -166,8 +166,11 @@ function css_out(){
  * @return string
  */
 function css_parseless($css) {
+    global $conf;
+
     $less = new lessc();
     $less->importDir[] = DOKU_INC;
+    $less->setPreserveComments(!$conf['compress']);
 
     if (defined('DOKU_UNITTEST')){
         $less->importDir[] = TMP_DIR;
-- 
cgit v1.2.3


From 9c03f73b0f57a7e1bf6a3108813a4004bf66d307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <xm.koutny@gmail.com>
Date: Mon, 13 Oct 2014 02:12:55 +0200
Subject: AUTH_USER_CHANGE handler can modify passed data

Originally AUTH_USER_CHANGE handler could modify the user data, however,
auth plugin consequently worked with different copy of the array thus
effectively preventing any changes by the AUTH_USER_CHANGE implementer.
---
 lib/plugins/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index b38b591a3..02e0613dd 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -129,7 +129,7 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
         $eventdata = array('type' => $type, 'params' => $params, 'modification_result' => null);
         $evt       = new Doku_Event('AUTH_USER_CHANGE', $eventdata);
         if($evt->advise_before(true)) {
-            $result                           = call_user_func_array(array($this, $validTypes[$type]), $params);
+            $result                           = call_user_func_array(array($this, $validTypes[$type]), $evt->data['params']);
             $evt->data['modification_result'] = $result;
         }
         $evt->advise_after();
-- 
cgit v1.2.3


From 70daee86e69783928d3da887a3a3e26b8ab74734 Mon Sep 17 00:00:00 2001
From: LarsDW223 <lars_paulsen@web.de>
Date: Tue, 14 Oct 2014 16:12:08 +0200
Subject: Corrected compression for ++ and -- operator. Partially fixes #897.

---
 _test/tests/lib/exe/js_js_compress.test.php | 60 +++++++++++++++++++++++++++++
 lib/exe/js.php                              | 34 ++++++++++------
 2 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/_test/tests/lib/exe/js_js_compress.test.php b/_test/tests/lib/exe/js_js_compress.test.php
index b1ae2a84f..78e089d89 100644
--- a/_test/tests/lib/exe/js_js_compress.test.php
+++ b/_test/tests/lib/exe/js_js_compress.test.php
@@ -145,6 +145,66 @@ EOF;
         $this->assertEquals($out, js_compress($text));
     }
 
+    function test_plusplus1(){
+        $text = 'a = 5 + ++b;';
+        $this->assertEquals('a=5+ ++b;',js_compress($text));
+    }
+
+    function test_plusplus2(){
+        $text = 'a = 5+ ++b;';
+        $this->assertEquals('a=5+ ++b;',js_compress($text));
+    }
+
+    function test_plusplus3(){
+        $text = 'a = 5++ + b;';
+        $this->assertEquals('a=5++ +b;',js_compress($text));
+    }
+
+    function test_plusplus4(){
+        $text = 'a = 5++ +b;';
+        $this->assertEquals('a=5++ +b;',js_compress($text));
+    }
+
+    function test_minusminus1(){
+        $text = 'a = 5 - --b;';
+        $this->assertEquals('a=5- --b;',js_compress($text));
+    }
+
+    function test_minusminus2(){
+        $text = 'a = 5- --b;';
+        $this->assertEquals('a=5- --b;',js_compress($text));
+    }
+
+    function test_minusminus3(){
+        $text = 'a = 5-- - b;';
+        $this->assertEquals('a=5-- -b;',js_compress($text));
+    }
+
+    function test_minusminus4(){
+        $text = 'a = 5-- -b;';
+        $this->assertEquals('a=5-- -b;',js_compress($text));
+    }
+
+    function test_minusplus1(){
+        $text = 'a = 5-- +b;';
+        $this->assertEquals('a=5--+b;',js_compress($text));
+    }
+
+    function test_minusplus2(){
+        $text = 'a = 5-- + b;';
+        $this->assertEquals('a=5--+b;',js_compress($text));
+    }
+
+    function test_plusminus1(){
+        $text = 'a = 5++ - b;';
+        $this->assertEquals('a=5++-b;',js_compress($text));
+    }
+
+    function test_plusminus2(){
+        $text = 'a = 5++ -b;';
+        $this->assertEquals('a=5++-b;',js_compress($text));
+    }
+
     /**
      * Test the files provided with the original JsStrip
      */
diff --git a/lib/exe/js.php b/lib/exe/js.php
index bec12ef7a..2ab78dfc3 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -289,6 +289,10 @@ function js_compress($s){
     // items that don't need spaces next to them
     $chars = "^&|!+\-*\/%=\?:;,{}()<>% \t\n\r'\"[]";
 
+    // items which need a space if the sign before and after whitespace is equal.
+    // E.g. '+ ++' may not be compressed to '+++' --> syntax error.
+    $ops = "+-";
+
     $regex_starters = array("(", "=", "[", "," , ":", "!");
 
     $whitespaces_chars = array(" ", "\t", "\n", "\r", "\0", "\x0B");
@@ -389,19 +393,27 @@ function js_compress($s){
 
         // whitespaces
         if( $ch == ' ' || $ch == "\r" || $ch == "\n" || $ch == "\t" ){
-            // leading spaces
-            if($i+1 < $slen && (strpos($chars,$s[$i+1]) !== false)){
-                $i = $i + 1;
-                continue;
-            }
-            // trailing spaces
-            //  if this ch is space AND the last char processed
-            //  is special, then skip the space
             $lch = substr($result,-1);
-            if($lch && (strpos($chars,$lch) !== false)){
-                $i = $i + 1;
-                continue;
+
+            // Only consider deleting whitespace if the signs before and after
+            // are not equal and are not an operator which may not follow itself.
+            if ((!$lch || $s[$i+1] == ' ')
+                || $lch != $s[$i+1]
+                || strpos($ops,$s[$i+1]) === false) {
+                // leading spaces
+                if($i+1 < $slen && (strpos($chars,$s[$i+1]) !== false)){
+                    $i = $i + 1;
+                    continue;
+                }
+                // trailing spaces
+                //  if this ch is space AND the last char processed
+                //  is special, then skip the space
+                if($lch && (strpos($chars,$lch) !== false)){
+                    $i = $i + 1;
+                    continue;
+                }
             }
+
             // else after all of this convert the "whitespace" to
             // a single space.  It will get appended below
             $ch = ' ';
-- 
cgit v1.2.3


From 37b21a1b15c01de8390be3af74d1cf08f4676313 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 14 Oct 2014 19:55:45 +0200
Subject: use its own cache file per versions

this ensures there will be never, ever an outdated update message shown
after upgrade.
---
 inc/infoutils.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/infoutils.php b/inc/infoutils.php
index e2b64d3ca..8fe344093 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -20,13 +20,13 @@ function checkUpdateMessages(){
     if(!$conf['updatecheck']) return;
     if($conf['useacl'] && !$INFO['ismanager']) return;
 
-    $cf = $conf['cachedir'].'/messages.txt';
+    $cf = getCacheName($updateVersion, '.updmsg');
     $lm = @filemtime($cf);
 
     // check if new messages needs to be fetched
     if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_INC.DOKU_SCRIPT)){
         @touch($cf);
-        dbglog("checkUpdateMessages(): downloading messages.txt");
+        dbglog("checkUpdateMessages(): downloading messages to ".$cf);
         $http = new DokuHTTPClient();
         $http->timeout = 12;
         $resp = $http->get(DOKU_MESSAGEURL.$updateVersion);
@@ -38,7 +38,7 @@ function checkUpdateMessages(){
             dbglog("checkUpdateMessages(): unexpected HTTP response received");
         }
     }else{
-        dbglog("checkUpdateMessages(): messages.txt up to date");
+        dbglog("checkUpdateMessages(): messages up to date");
     }
 
     $data = io_readFile($cf);
-- 
cgit v1.2.3


From 8457f8cee42b57b7f708f23cbbfc50b1939de30d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 14 Oct 2014 21:04:54 +0200
Subject: another fix for broken gzlib linking #865

---
 inc/compatibility.php | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/inc/compatibility.php b/inc/compatibility.php
index 2738c9bb1..cb865a2d7 100644
--- a/inc/compatibility.php
+++ b/inc/compatibility.php
@@ -41,12 +41,42 @@ if(!function_exists('gzopen') && function_exists('gzopen64')) {
      *
      * @link http://stackoverflow.com/questions/23417519/php-zlib-gzopen-not-exists
      *
-     * @param string    $filename
-     * @param string    $mode
-     * @param int $use_include_path
+     * @param string $filename
+     * @param string $mode
+     * @param int    $use_include_path
      * @return mixed
      */
     function gzopen($filename, $mode, $use_include_path = 0) {
         return gzopen64($filename, $mode, $use_include_path);
     }
+}
+
+if(!function_exists('gzseek') && function_exists('gzseek64')) {
+    /**
+     * work around for PHP compiled against certain zlib versions #865
+     *
+     * @link http://stackoverflow.com/questions/23417519/php-zlib-gzopen-not-exists
+     *
+     * @param resource $zp
+     * @param int      $offset
+     * @param int      $whence
+     * @return int
+     */
+    function gzseek($zp, $offset, $whence = SEEK_SET) {
+        return gzseek64($zp, $offset, $whence);
+    }
+}
+
+if(!function_exists('gztell') && function_exists('gztell64')) {
+    /**
+     * work around for PHP compiled against certain zlib versions #865
+     *
+     * @link   http://stackoverflow.com/questions/23417519/php-zlib-gzopen-not-exists
+     *
+     * @param resource $zp
+     * @return int
+     */
+    function gztell($zp) {
+        return gztell64($zp);
+    }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 001d05eda158fd1c33cd0e6580a28241af69226c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 14 Oct 2014 21:32:54 +0200
Subject: new PHP minimum requirement is now 5.3.3

that's the version in Debian old stable
---
 inc/infoutils.php | 6 +++---
 install.php       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/infoutils.php b/inc/infoutils.php
index 8fe344093..06e03e90f 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -114,13 +114,13 @@ function check(){
     if ($INFO['isadmin'] || $INFO['ismanager']){
         msg('DokuWiki version: '.getVersion(),1);
 
-        if(version_compare(phpversion(),'5.2.0','<')){
-            msg('Your PHP version is too old ('.phpversion().' vs. 5.2.0+ needed)',-1);
+        if(version_compare(phpversion(),'5.3.3','<')){
+            msg('Your PHP version is too old ('.phpversion().' vs. 5.3.3+ needed)',-1);
         }else{
             msg('PHP version '.phpversion(),1);
         }
     } else {
-        if(version_compare(phpversion(),'5.2.0','<')){
+        if(version_compare(phpversion(),'5.3.3','<')){
             msg('Your PHP version is too old',-1);
         }
     }
diff --git a/install.php b/install.php
index c8bc68ef9..d13a5eaab 100644
--- a/install.php
+++ b/install.php
@@ -538,8 +538,8 @@ function check_functions(){
     global $lang;
     $ok = true;
 
-    if(version_compare(phpversion(),'5.2.0','<')){
-        $error[] = sprintf($lang['i_phpver'],phpversion(),'5.2.0');
+    if(version_compare(phpversion(),'5.3.3','<')){
+        $error[] = sprintf($lang['i_phpver'],phpversion(),'5.3.3');
         $ok = false;
     }
 
-- 
cgit v1.2.3


From 5c5b52fd17bf855ab64656790b39ff43450902c9 Mon Sep 17 00:00:00 2001
From: LarsDW223 <lars_paulsen@web.de>
Date: Wed, 15 Oct 2014 10:48:15 +0200
Subject: Fixed JavaScript compression. The compressor did not recognize a
 regular expression after a '&&' ot '||' operator. So it could happen that
 code had been cut off if the regular expression included '\//' (which was
 treated as a single line comment because of the regular expression not being
 recognized). Finally fixes #897.

---
 lib/exe/js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 2ab78dfc3..545ba7b23 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -293,7 +293,7 @@ function js_compress($s){
     // E.g. '+ ++' may not be compressed to '+++' --> syntax error.
     $ops = "+-";
 
-    $regex_starters = array("(", "=", "[", "," , ":", "!");
+    $regex_starters = array("(", "=", "[", "," , ":", "!", "&", "|");
 
     $whitespaces_chars = array(" ", "\t", "\n", "\r", "\0", "\x0B");
 
-- 
cgit v1.2.3


From 6275d9067f8a0a7216fece2d49ba2064967bc194 Mon Sep 17 00:00:00 2001
From: LarsDW223 <lars_paulsen@web.de>
Date: Wed, 15 Oct 2014 10:57:00 +0200
Subject: Ooops...forgot to commit test cases for #897.

---
 _test/tests/lib/exe/js_js_compress.test.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/_test/tests/lib/exe/js_js_compress.test.php b/_test/tests/lib/exe/js_js_compress.test.php
index 78e089d89..648ede07e 100644
--- a/_test/tests/lib/exe/js_js_compress.test.php
+++ b/_test/tests/lib/exe/js_js_compress.test.php
@@ -58,6 +58,18 @@ class js_js_compress_test extends DokuWikiTest {
         $this->assertEquals(js_compress($text), 'text.replace(/"/,"//")');
     }
 
+    function test_regex_after_and_with_slashes_outside_string(){
+        $text = 'if ( peng == bla && /pattern\//.test(url)) request = new Something();';
+        $this->assertEquals(js_compress($text),
+                            'if(peng==bla&&/pattern\//.test(url))request=new Something();');
+    }
+
+    function test_regex_after_or_with_slashes_outside_string(){
+        $text = 'if ( peng == bla || /pattern\//.test(url)) request = new Something();';
+        $this->assertEquals(js_compress($text),
+                            'if(peng==bla||/pattern\//.test(url))request=new Something();');
+    }
+
     function test_dquot1(){
         $text = 'var foo="Now what \\" \'do we//get /*here*/ ?";';
         $this->assertEquals(js_compress($text), $text);
@@ -205,6 +217,12 @@ EOF;
         $this->assertEquals('a=5++-b;',js_compress($text));
     }
 
+    function test_unusual_signs(){
+        $text='var π = Math.PI, τ = 2 * π, halfπ = π / 2, ε = 1e-6, ε2 = ε * ε, radians = π / 180, degrees = 180 / π;';
+        $this->assertEquals(js_compress($text),
+                            'var π=Math.PI,τ=2*π,halfπ=π/2,ε=1e-6,ε2=ε*ε,radians=π/180,degrees=180/π;');
+    }
+
     /**
      * Test the files provided with the original JsStrip
      */
-- 
cgit v1.2.3


From dfc5e46cbee86f9c2f44b5bc5f72505dd8847352 Mon Sep 17 00:00:00 2001
From: Yadav Gowda <yadav.gowda@gmail.com>
Date: Wed, 15 Oct 2014 21:35:58 +0200
Subject: translation update

---
 inc/lang/eu/lang.php                     | 13 ++++++++-----
 lib/plugins/acl/lang/eu/lang.php         |  5 +++--
 lib/plugins/popularity/lang/eu/lang.php  |  5 +++--
 lib/plugins/revert/lang/eu/lang.php      |  6 ++++--
 lib/plugins/usermanager/lang/eu/lang.php |  5 +++--
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 457c2a496..fcf45b946 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -1,11 +1,12 @@
 <?php
+
 /**
- * Basque language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Xabi Ezpeleta <xezpeleta@mendikute.com>
  * @author Inko Illarramendi <inko.i.a@gmail.com>
  * @author Zigor Astarbe <astarbe@gmail.com>
+ * @author Yadav Gowda <yadav.gowda@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -49,6 +50,9 @@ $lang['btn_revert']            = 'Berrezarri';
 $lang['btn_register']          = 'Erregistratu';
 $lang['btn_apply']             = 'Baieztatu';
 $lang['btn_media']             = 'Media Kudeatzailea';
+$lang['btn_deleteuser']        = 'Nire kontua kendu';
+$lang['btn_img_backto']        = 'Atzera hona %s';
+$lang['btn_mediaManager']      = 'Media kudeatzailean ikusi';
 $lang['loggedinas']            = 'Erabiltzailea:';
 $lang['user']                  = 'Erabiltzailea';
 $lang['pass']                  = 'Pasahitza';
@@ -63,7 +67,7 @@ $lang['badlogin']              = 'Barkatu, prozesuak huts egin du; saiatu berriz
 $lang['minoredit']             = 'Aldaketa Txikiak';
 $lang['draftdate']             = 'Zirriborroa automatikoki gorde da hemen:';
 $lang['nosecedit']             = 'Orria aldatua izan da bitartean, info atala zaharkituta geratu da, orri osoa kargatu da horren ordez.';
-$lang['searchcreatepage']      = "Bilatzen zabiltzana aurkitu ez baduzu, zuk zeuk sortu dezakezu orri berri bat bilaketa ostean ''Sortu orri hau'' erabiliz.";
+$lang['searchcreatepage']      = 'Bilatzen zabiltzana aurkitu ez baduzu, zuk zeuk sortu dezakezu orri berri bat bilaketa ostean \'\'Sortu orri hau\'\' erabiliz.';
 $lang['regmissing']            = 'Barkatu, hutsune guztiak bete behar dituzu.';
 $lang['reguexists']            = 'Barkatu, izen bereko erabiltzailea existitzen da.';
 $lang['regsuccess']            = 'Erabiltzailea sortu da. Pasahitza mailez bidaliko zaizu.';
@@ -77,6 +81,7 @@ $lang['profna']                = 'Wiki honek ez du profilaren aldaketa ahalbidet
 $lang['profnochange']          = 'Aldaketarik ez, ez dago egiteko ezer.';
 $lang['profnoempty']           = 'Izen edota e-posta hutsa ez dago onartua.';
 $lang['profchanged']           = 'Erabiltzaile profila arrakastaz eguneratua.';
+$lang['profdeleteuser']        = 'Kontua ezabatu';
 $lang['pwdforget']             = 'Pasahitza ahaztu duzu? Eskuratu berri bat';
 $lang['resendna']              = 'Wiki honek ez du pasahitz berbidalketa onartzen.';
 $lang['resendpwd']             = '-entzat pasahitza berria ezarri';
@@ -228,7 +233,6 @@ $lang['admin_register']        = 'Erabiltzaile berria gehitu';
 $lang['metaedit']              = 'Metadatua Aldatu';
 $lang['metasaveerr']           = 'Metadatuaren idazketak huts egin du';
 $lang['metasaveok']            = 'Metadatua gordea';
-$lang['btn_img_backto']            = 'Atzera hona %s';
 $lang['img_title']             = 'Izenburua:';
 $lang['img_caption']           = 'Epigrafea:';
 $lang['img_date']              = 'Data:';
@@ -241,7 +245,6 @@ $lang['img_camera']            = 'Kamera:';
 $lang['img_keywords']          = 'Hitz-gakoak:';
 $lang['img_width']             = 'Zabalera:';
 $lang['img_height']            = 'Altuera:';
-$lang['btn_mediaManager']           = 'Media kudeatzailean ikusi';
 $lang['subscr_subscribe_success'] = '%s gehitua %s-ren harpidetza zerrendara';
 $lang['subscr_subscribe_error'] = 'Errorea %s gehitzen %s-ren harpidetza zerrendara';
 $lang['subscr_subscribe_noaddress'] = 'Ez dago helbiderik zure login-arekin lotuta, ezin zara harpidetza zerrendara gehitua izan.';
diff --git a/lib/plugins/acl/lang/eu/lang.php b/lib/plugins/acl/lang/eu/lang.php
index f051523d9..bb6ab964a 100644
--- a/lib/plugins/acl/lang/eu/lang.php
+++ b/lib/plugins/acl/lang/eu/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Basque language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Inko Illarramendi <inko.i.a@gmail.com>
  * @author Zigor Astarbe <astarbe@gmail.com>
  */
diff --git a/lib/plugins/popularity/lang/eu/lang.php b/lib/plugins/popularity/lang/eu/lang.php
index b52ccaee1..b5b80357c 100644
--- a/lib/plugins/popularity/lang/eu/lang.php
+++ b/lib/plugins/popularity/lang/eu/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Basque language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Inko Illarramendi <inko.i.a@gmail.com>
  * @author Zigor Astarbe <astarbe@gmail.com>
  */
diff --git a/lib/plugins/revert/lang/eu/lang.php b/lib/plugins/revert/lang/eu/lang.php
index d3532c070..40be3e382 100644
--- a/lib/plugins/revert/lang/eu/lang.php
+++ b/lib/plugins/revert/lang/eu/lang.php
@@ -1,9 +1,11 @@
 <?php
+
 /**
- * Basque language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Inko Illarramendi <inko.i.a@gmail.com>
  * @author Zigor Astarbe <astarbe@gmail.com>
+ * @author Yadav Gowda <yadav.gowda@gmail.com>
  */
 $lang['menu']                  = 'Berrezartze Kudeatzailea';
 $lang['filter']                = 'Bilatu spam duten orriak';
diff --git a/lib/plugins/usermanager/lang/eu/lang.php b/lib/plugins/usermanager/lang/eu/lang.php
index 5d3a01fc7..1fbe13739 100644
--- a/lib/plugins/usermanager/lang/eu/lang.php
+++ b/lib/plugins/usermanager/lang/eu/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Basque language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Inko Illarramendi <inko.i.a@gmail.com>
  * @author Zigor Astarbe <astarbe@gmail.com>
  */
-- 
cgit v1.2.3


From 8838b30bde9771aec64facd9c61cd53d4dcfc3a0 Mon Sep 17 00:00:00 2001
From: Rainer Rillke <rillke@wikipedia.de>
Date: Fri, 17 Oct 2014 02:58:10 +0200
Subject: Accept some new gTLD e-Mail addresses

by allowing longer TLDs (up to 63 characters, which is the DN maximum: https://tools.ietf.org/html/rfc1034):
"Each node has a label, which is zero to 63 octets in length."

For an up-to-date-length, see http://stackoverflow.com/a/22038535
---
 inc/mail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/mail.php b/inc/mail.php
index 9994ac63e..9f1b1f3d6 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -27,7 +27,7 @@ if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
  * Check if a given mail address is valid
  */
 if (!defined('RFC2822_ATEXT')) define('RFC2822_ATEXT',"0-9a-zA-Z!#$%&'*+/=?^_`{|}~-");
-if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,4}|museum|travel)');
+if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,63})');
 
 /**
  * Prepare mailfrom replacement patterns
-- 
cgit v1.2.3


From 47914fdf9a86d3ce2b75fc6f7743bc604711e6aa Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 17 Oct 2014 17:25:20 +0200
Subject: -k requires parameter. fixes #902

---
 bin/striplangs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/striplangs.php b/bin/striplangs.php
index 6335bc84c..82d27d462 100755
--- a/bin/striplangs.php
+++ b/bin/striplangs.php
@@ -26,7 +26,8 @@ class StripLangsCLI extends DokuCLI {
         $options->registerOption(
             'keep',
             'Comma separated list of languages to keep in addition to English.',
-            'k'
+            'k',
+            'langcodes'
         );
         $options->registerOption(
             'english-only',
-- 
cgit v1.2.3


From a1298aeaa8cf1dc3bba3fb7ecadb0d989afc42cf Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Sat, 18 Oct 2014 18:25:58 +0200
Subject: translation update

---
 inc/lang/ru/lang.php                       | 20 ++++++++++----------
 inc/lang/ru/mailtext.txt                   |  2 +-
 inc/lang/ru/password.txt                   |  2 +-
 inc/lang/ru/pwconfirm.txt                  |  2 +-
 inc/lang/ru/registermail.txt               |  2 +-
 inc/lang/ru/revisions.txt                  |  2 +-
 inc/lang/ru/uploadmail.txt                 |  2 +-
 lib/plugins/authad/lang/ru/settings.php    |  3 ++-
 lib/plugins/authpgsql/lang/ru/settings.php |  2 +-
 lib/plugins/extension/lang/ru/lang.php     | 17 +++++++++++------
 lib/plugins/usermanager/lang/ru/import.txt |  3 +--
 lib/plugins/usermanager/lang/ru/lang.php   |  3 ++-
 12 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index ddc244a2f..f491fcaa9 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -73,7 +73,7 @@ $lang['btn_media']             = 'Управление медиафайлами'
 $lang['btn_deleteuser']        = 'Удалить мой аккаунт';
 $lang['btn_img_backto']        = 'Вернуться к %s';
 $lang['btn_mediaManager']      = 'Просмотр в «управлении медиафайлами»';
-$lang['loggedinas']            = 'Зашли как:';
+$lang['loggedinas']            = 'Зашли как';
 $lang['user']                  = 'Логин';
 $lang['pass']                  = 'Пароль';
 $lang['newpass']               = 'Новый пароль';
@@ -188,7 +188,7 @@ $lang['mediausage']            = 'Для ссылки на этот файл и
 $lang['mediaview']             = 'Посмотреть исходный файл';
 $lang['mediaroot']             = 'корень';
 $lang['mediaupload']           = 'Здесь можно загрузить файл в текущий каталог («пространство имён»). Чтобы создать подкаталоги, добавьте их к началу имени файла («Загрузить как»). Имена подкаталогов разделяются двоеточиями. ';
-$lang['mediaextchange']        = 'Расширение изменилось: с .%s на .%s!';
+$lang['mediaextchange']        = 'Расширение изменилось с .%s на .%s!';
 $lang['reference']             = 'Ссылки для';
 $lang['ref_inuse']             = 'Этот файл не может быть удалён, так как он используется на следующих страницах:';
 $lang['ref_hidden']            = 'Некоторые ссылки находятся на страницах, на чтение которых у вас нет прав доступа';
@@ -204,7 +204,7 @@ $lang['diff_type']             = 'Посмотреть отличия';
 $lang['diff_inline']           = 'встроенный';
 $lang['diff_side']             = 'бок о бок';
 $lang['diffprevrev']           = 'Предыдущая версия';
-$lang['diffnextrev']           = 'Следущая версия';
+$lang['diffnextrev']           = 'Следующая версия';
 $lang['difflastrev']           = 'Последняя версия';
 $lang['line']                  = 'Строка';
 $lang['breadcrumb']            = 'Вы посетили:';
@@ -288,8 +288,8 @@ $lang['subscr_m_unsubscribe']  = 'Отменить подписку';
 $lang['subscr_m_subscribe']    = 'Подписаться';
 $lang['subscr_m_receive']      = 'Получить';
 $lang['subscr_style_every']    = 'уведомлять о каждом изменении';
-$lang['subscr_style_digest']   = 'информационное электронное письмо со списком изменений для каждой страницы (каждые %.2f дней)';
-$lang['subscr_style_list']     = 'список изменённых страниц со времени последнего отправленного электронного письма (каждые %.2f дней)';
+$lang['subscr_style_digest']   = 'информационное электронное письмо со списком изменений для каждой страницы (каждые %.2f дн.)';
+$lang['subscr_style_list']     = 'список изменённых страниц со времени последнего отправленного электронного письма (каждые %.2f дн.)';
 $lang['authtempfail']          = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.';
 $lang['authpwdexpire']         = 'Действие вашего пароля истекает через %d дней. Вы должны изменить его как можно скорее';
 $lang['i_chooselang']          = 'Выберите свой язык/Choose your language';
@@ -312,7 +312,7 @@ $lang['i_success']             = 'Конфигурация прошла успе
                                  <a href="doku.php?id=wiki:welcome">своей новой «Докувики»</a>.';
 $lang['i_failure']             = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придётся исправить их вручную, прежде чем вы сможете использовать <a href="doku.php?id=wiki:welcome">свою новую «Докувики»</a>.';
 $lang['i_policy']              = 'Исходная политика прав доступа';
-$lang['i_pol0']                = 'Открытая вики (чтение, запись, закачка файлов для всех)';
+$lang['i_pol0']                = 'Открытая вики (чтение, запись, загрузка файлов для всех)';
 $lang['i_pol1']                = 'Общедоступная вики (чтение для всех, запись и загрузка файлов для зарегистрированных пользователей)';
 $lang['i_pol2']                = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)';
 $lang['i_allowreg']            = 'Разрешить пользователям самостоятельно регистрироваться';
@@ -323,10 +323,10 @@ $lang['i_pop_field']           = 'Пожалуйста, помогите нам
 $lang['i_pop_label']           = 'Отправлять раз в месяц анонимную пользовательскую информацию разработчикам «Докувики»';
 $lang['recent_global']         = 'Вы просматриваете изменения в пространстве имён <b>%s</b>. Вы можете также <a href="%s">просмотреть недавние изменения во всей вики</a>.';
 $lang['years']                 = '%d лет назад';
-$lang['months']                = '%d месяц(ев) назад';
+$lang['months']                = '%d месяц (-ев) назад';
 $lang['weeks']                 = '%d недель назад';
 $lang['days']                  = '%d дней назад';
-$lang['hours']                 = '%d час(ов) назад';
+$lang['hours']                 = '%d час (-ов) назад';
 $lang['minutes']               = '%d минут назад';
 $lang['seconds']               = '%d секунд назад';
 $lang['wordblock']             = 'Ваши изменения не сохранены, поскольку они содержат блокируемые слова (спам).';
@@ -342,8 +342,8 @@ $lang['media_sort_name']       = 'Сортировка по имени';
 $lang['media_sort_date']       = 'Сортировка по дате';
 $lang['media_namespaces']      = 'Выберите каталог';
 $lang['media_files']           = 'Файлы в %s';
-$lang['media_upload']          = 'Загрузка в пространство имён <strong>%s</strong>.';
-$lang['media_search']          = 'Поиск в пространстве имён <strong>%s</strong>.';
+$lang['media_upload']          = 'Загрузка в пространство имён %s';
+$lang['media_search']          = 'Поиск в пространстве имён %s';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s в %s
 ';
diff --git a/inc/lang/ru/mailtext.txt b/inc/lang/ru/mailtext.txt
index 953daddf2..929174910 100644
--- a/inc/lang/ru/mailtext.txt
+++ b/inc/lang/ru/mailtext.txt
@@ -13,5 +13,5 @@ IP-адрес: @IPADDRESS@
 
 
 -- 
-Это письмо было сгенерировано «Докувики» по адресу
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/password.txt b/inc/lang/ru/password.txt
index fabdf2b68..360201bd9 100644
--- a/inc/lang/ru/password.txt
+++ b/inc/lang/ru/password.txt
@@ -6,5 +6,5 @@
 Пароль: @PASSWORD@
 
 -- 
-Это письмо было сгенерировано «Докувики» по адресу
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/pwconfirm.txt b/inc/lang/ru/pwconfirm.txt
index 954c75dfe..de31aa9a8 100644
--- a/inc/lang/ru/pwconfirm.txt
+++ b/inc/lang/ru/pwconfirm.txt
@@ -9,5 +9,5 @@
 @CONFIRM@
 
 -- 
-Это сообщение было сгенерировано «Докувики» по адресу
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/registermail.txt b/inc/lang/ru/registermail.txt
index 86ef11e8c..d55296558 100644
--- a/inc/lang/ru/registermail.txt
+++ b/inc/lang/ru/registermail.txt
@@ -10,5 +10,5 @@
 Хост: @HOSTNAME@
 
 -- 
-Это сообщение было сгенерировано «Докувики» по адресу
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
diff --git a/inc/lang/ru/revisions.txt b/inc/lang/ru/revisions.txt
index 55072cd8a..40fbedf0e 100644
--- a/inc/lang/ru/revisions.txt
+++ b/inc/lang/ru/revisions.txt
@@ -1,3 +1,3 @@
 ====== История страницы ======
 
-Перед вами — история правок текущего документа. Чтобы вернуться к одной из предыдущих версий, выберите нужную, нажмите «Править страницу» и сохраните.
+Перед вами история правок текущего документа. Чтобы вернуться к одной из предыдущих версий, выберите нужную, нажмите «Править страницу» и сохраните.
diff --git a/inc/lang/ru/uploadmail.txt b/inc/lang/ru/uploadmail.txt
index 84103b45a..1cc5c6a5a 100644
--- a/inc/lang/ru/uploadmail.txt
+++ b/inc/lang/ru/uploadmail.txt
@@ -11,5 +11,5 @@
 Пользователь: @USER@
 
 -- 
-Это письмо было сгенерировано «Докувики» по адресу
+Это письмо создано «Докувики» с сайта
 @DOKUWIKIURL@
diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index c9c6d9f88..0212589d7 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -8,8 +8,9 @@
  * @author Artur <ncuxxx@gmail.com>
  * @author Erli Moen <evseev.jr@gmail.com>
  * @author Владимир <id37736@yandex.ru>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
-$lang['account_suffix']        = 'Суффикс вашего аккаунта типа  <code>@my.domain.org</code>';
+$lang['account_suffix']        = 'Суффикс вашего аккаунта. Например, <code>@my.domain.org</code>';
 $lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php
index 65cbce8df..668ba4ef6 100644
--- a/lib/plugins/authpgsql/lang/ru/settings.php
+++ b/lib/plugins/authpgsql/lang/ru/settings.php
@@ -10,7 +10,7 @@
 $lang['server']                = 'Ваш PostgreSQL-сервер';
 $lang['port']                  = 'Порт вашего PostgreSQL-сервера';
 $lang['user']                  = 'Имя пользователя PostgreSQL';
-$lang['password']              = 'Пароль для указанного пользователя.';
+$lang['password']              = 'Пароль для указанного пользователя';
 $lang['database']              = 'Имя базы данных';
 $lang['debug']                 = 'Отображать дополнительную отладочную информацию';
 $lang['checkPass']             = 'Выражение SQL, осуществляющее проверку пароля';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index 7fb39b3e9..24e6fe224 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -26,7 +26,8 @@ $lang['search_for']            = 'Поиск дополнения:';
 $lang['search']                = 'Найти';
 $lang['extensionby']           = '<strong>%s</strong> — %s';
 $lang['popularity']            = 'Популярность: %s%%';
-$lang['bugs_features']         = 'Ошибки';
+$lang['homepage_link']         = 'Описание';
+$lang['bugs_features']         = 'Баг-трекер';
 $lang['tags']                  = 'Метки:';
 $lang['author_hint']           = 'Найти дополнения этого автора';
 $lang['installed']             = 'Установлено:';
@@ -43,6 +44,8 @@ $lang['conflicts']             = 'Конфликтует с:';
 $lang['donate']                = 'Нравится?';
 $lang['donate_action']         = 'Купить автору кофе!';
 $lang['repo_retry']            = 'Повторить';
+$lang['provides']              = 'Предоставляет:';
+$lang['status']                = 'Статус:';
 $lang['status_installed']      = 'установлено';
 $lang['status_not_installed']  = 'не установлено';
 $lang['status_protected']      = 'защищено';
@@ -59,10 +62,12 @@ $lang['msg_template_install_success'] = 'Шаблон %s успешно уста
 $lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён';
 $lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен';
 $lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён';
-$lang['noperms']               = 'Папка для расширений не доступна для записи';
-$lang['notplperms']            = 'Папка для шаблонов не доступна для записи';
-$lang['nopluginperms']         = 'Папка плагинов не доступна для записи';
-$lang['git']                   = 'Это расширение было установлено через git, Вы не можете обновить его тут.';
+$lang['update_available']      = '<strong>Обновление:</strong> доступна новая версия %s.';
+$lang['error_badurl']          = 'Ссылки должны начинаться с http или https';
+$lang['noperms']               = 'Папка для расширений недоступна для записи';
+$lang['notplperms']            = 'Папка для шаблонов недоступна для записи';
+$lang['nopluginperms']         = 'Папка плагинов недоступна для записи';
+$lang['git']                   = 'Это расширение было установлено через git. Вы не можете обновить его тут.';
 $lang['install_url']           = 'Установить с адреса URL:';
 $lang['install_upload']        = 'Скачать расширение:';
-$lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернет.';
+$lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернетом.';
diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt
index f2049dd0c..c92e47b4c 100644
--- a/lib/plugins/usermanager/lang/ru/import.txt
+++ b/lib/plugins/usermanager/lang/ru/import.txt
@@ -3,7 +3,6 @@
 Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
 Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. 
 Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (%%""%%). Обратный слэш используется как прерывание.
-В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». 
-Повторяющиеся идентификаторы user-id будут игнорироваться.
+В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». Повторяющиеся идентификаторы user-id будут игнорироваться.
 
 Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю. 
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 8bbfa639c..515de5186 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -68,6 +68,7 @@ $lang['add_ok']                = 'Пользователь успешно доб
 $lang['add_fail']              = 'Не удалось добавить пользователя';
 $lang['notify_ok']             = 'Письмо с уведомлением отправлено';
 $lang['notify_fail']           = 'Не удалось отправить письмо с уведомлением';
+$lang['import_userlistcsv']    = 'Файл со списком пользователей (CSV):';
 $lang['import_success_count']  = 'Импорт пользователей: %d пользователей найдено, %d импортировано успешно.';
 $lang['import_failure_count']  = 'Импорт пользователей: %d не удалось. Список ошибок прочтите ниже.';
 $lang['import_error_fields']   = 'Не все поля заполнены. Найдено %d, а нужно 4.';
@@ -78,4 +79,4 @@ $lang['import_error_upload']   = 'Импорт не удался. CSV-файл 
 $lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.';
 $lang['import_error_create']   = 'Невозможно создать пользователя';
 $lang['import_notify_fail']    = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.';
-$lang['import_downloadfailures'] = 'Скачать Ошибки в формате CSV для исправления';
+$lang['import_downloadfailures'] = 'Скачать ошибки в формате CSV для исправления';
-- 
cgit v1.2.3


From fb15cab611b9b03bfde1bd3d64906c08fb443f3b Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 21 Oct 2014 14:47:21 +0200
Subject: use phpdocs deprecated notation

---
 inc/plugincontroller.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index d80cd4c9e..4f0cd58e6 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -178,8 +178,10 @@ class Doku_Plugin_Controller {
                     // to keep everything simple we just skip the plugin completely
                     continue;
                 } elseif (@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
-                    // treat this as a default disabled plugin(over-rideable by the plugin manager)
-                    // deprecated 2011-09-10 (usage of disabled files)
+                    /**
+                     * treat this as a default disabled plugin(over-rideable by the plugin manager)
+                     * @deprecated 2011-09-10 (usage of disabled files)
+                     */
                     if (empty($this->plugin_cascade['local'][$plugin])) {
                         $all_plugins[$plugin] = 0;
                     } else {
-- 
cgit v1.2.3


From fd18b5f4e227c2b114d961b81feecce658597226 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 22 Oct 2014 11:07:46 +0200
Subject: visibility from private to protected for DokuCssFile

---
 lib/exe/css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/exe/css.php b/lib/exe/css.php
index f7235fd4e..9645b96bc 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -421,7 +421,7 @@ class DokuCssFile {
 
     protected $filepath;             // file system path to the CSS/Less file
     protected $location;             // base url location of the CSS/Less file
-    private   $relative_path = null;
+    protected $relative_path = null;
 
     public function __construct($file) {
         $this->filepath = $file;
@@ -454,7 +454,7 @@ class DokuCssFile {
      *
      * @return string   relative file system path
      */
-    private function getRelativePath(){
+    protected function getRelativePath(){
 
         if (is_null($this->relative_path)) {
             $basedir = array(DOKU_INC);
-- 
cgit v1.2.3


From 17bc1e4f530dbbc74ad4ba9067782f248d003045 Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Wed, 22 Oct 2014 13:01:09 +0200
Subject: translation update

---
 inc/lang/cs/lang.php                   | 2 +-
 lib/plugins/extension/lang/cs/lang.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index fd0820b13..168c1e403 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -80,7 +80,7 @@ $lang['badpassconfirm']        = 'Bohužel špatné heslo';
 $lang['minoredit']             = 'Drobné změny';
 $lang['draftdate']             = 'Koncept automaticky uložen v';
 $lang['nosecedit']             = 'Stránka byla v mezičase změněna. Informace o sekci již nebylo platné, byla načtena celá stránka.';
-$lang['searchcreatepage']      = "Pokud jste nenašli, co hledáte, zkuste požadovanou stránku sami vytvořit stisknutím tlačítka ''Vytvořit stránku''.";
+$lang['searchcreatepage']      = 'Pokud jste nenašli, co hledáte, zkuste požadovanou stránku sami vytvořit stisknutím tlačítka \'\'Vytvořit stránku\'\'.';
 $lang['regmissing']            = 'Musíte vyplnit všechny údaje.';
 $lang['reguexists']            = 'Uživatel se stejným jménem už je zaregistrován.';
 $lang['regsuccess']            = 'Uživatelský účet byl vytvořen a heslo zasláno mailem.';
diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php
index 27b3a94a3..783b488ea 100644
--- a/lib/plugins/extension/lang/cs/lang.php
+++ b/lib/plugins/extension/lang/cs/lang.php
@@ -55,3 +55,5 @@ $lang['status_unmodifiable']   = 'neměnný';
 $lang['status_plugin']         = 'zásuvný modul';
 $lang['status_template']       = 'šablona';
 $lang['msg_delete_success']    = 'Rozšíření odinstalováno';
+$lang['msg_plugin_install_success'] = 'Zásuvný modul %s úspěšně nainstalován.';
+$lang['msg_plugin_update_success'] = 'Zásuvný modul %s úspěšně aktualizován.';
-- 
cgit v1.2.3


From ae6f2c31087f39c5c677957200a306b1911c990c Mon Sep 17 00:00:00 2001
From: lioujheyu <lioujheyu@gmail.com>
Date: Mon, 27 Oct 2014 04:16:14 +0100
Subject: translation update

---
 inc/lang/zh-tw/lang.php                            |  1 +
 lib/plugins/extension/lang/zh-tw/intro_plugins.txt |  1 +
 lib/plugins/extension/lang/zh-tw/lang.php          | 30 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 lib/plugins/extension/lang/zh-tw/intro_plugins.txt

diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 57c0d03e9..c5e7da000 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -15,6 +15,7 @@
  * @author Danny Lin <danny0838@gmail.com>
  * @author Stan <talktostan@gmail.com>
  * @author June-Hao Hou <junehao@gmail.com>
+ * @author lioujheyu <lioujheyu@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/extension/lang/zh-tw/intro_plugins.txt b/lib/plugins/extension/lang/zh-tw/intro_plugins.txt
new file mode 100644
index 000000000..b5b77a267
--- /dev/null
+++ b/lib/plugins/extension/lang/zh-tw/intro_plugins.txt
@@ -0,0 +1 @@
+已經有一些外掛套件被安裝在你的DokuWiki之中。你可以在這裡啟用、禁用，甚至是完全移除它們。如外掛可更新也同時會顯示在這裡，請確保在更新前先閱讀過該套件之文件。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh-tw/lang.php b/lib/plugins/extension/lang/zh-tw/lang.php
index a86364d7a..79657ffeb 100644
--- a/lib/plugins/extension/lang/zh-tw/lang.php
+++ b/lib/plugins/extension/lang/zh-tw/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Stan <talktostan@gmail.com>
  * @author June-Hao Hou <junehao@gmail.com>
+ * @author lioujheyu <lioujheyu@gmail.com>
  */
 $lang['menu']                  = '延伸功能管理';
 $lang['tab_plugins']           = '已安裝外掛';
@@ -28,20 +29,49 @@ $lang['btn_reinstall']         = '重新安裝';
 $lang['js']['reallydel']       = '確定要移除此延伸功能？';
 $lang['search_for']            = '搜尋延伸功能：';
 $lang['search']                = '搜尋';
+$lang['homepage_link']         = '文件';
 $lang['tags']                  = '標籤：';
 $lang['author_hint']           = '搜尋相同作者的延伸功能';
 $lang['installed']             = '已安裝：';
 $lang['downloadurl']           = '下載網址：';
+$lang['unknown']               = '<em>未知</em>';
 $lang['installed_version']     = '已安裝版本：';
+$lang['install_date']          = '你最後一次更新: ';
 $lang['available_version']     = '可用版本：';
 $lang['compatible']            = '相容於：';
+$lang['depends']               = '依賴於: ';
+$lang['similar']               = '類似於: ';
+$lang['conflicts']             = '相衝突於: ';
+$lang['donate']                = '像這樣？';
+$lang['donate_action']         = '請作者一杯咖啡！';
 $lang['repo_retry']            = '再試一次';
 $lang['status']                = '狀態：';
 $lang['status_installed']      = '已安裝';
 $lang['status_not_installed']  = '未安裝';
+$lang['status_protected']      = '已保護';
 $lang['status_enabled']        = '作用中';
 $lang['status_disabled']       = '停用中';
+$lang['status_unmodifiable']   = '不可更動';
 $lang['status_plugin']         = '外掛';
+$lang['status_template']       = '模板';
+$lang['status_bundled']        = '已綑綁內附';
+$lang['msg_enabled']           = '外掛 %s 已啟用';
+$lang['msg_disabled']          = '外掛 %s 已禁用';
+$lang['msg_delete_success']    = '附加元件已移除';
+$lang['msg_template_install_success'] = '模板 %s 以成功安裝';
+$lang['msg_template_update_success'] = '模板 %s 以成功更新';
+$lang['msg_plugin_install_success'] = '外掛 %s 以成功安裝';
+$lang['msg_plugin_update_success'] = '外掛 %s 以成功更新';
+$lang['msg_upload_failed']     = '上傳檔案失敗';
+$lang['missing_dependency']    = '<strong>遺失或禁用相依性套件:</strong> %s';
+$lang['security_issue']        = '<strong>安全性問題:</strong> %s';
+$lang['security_warning']      = '<strong>安全問題警告:</strong> %s';
+$lang['update_available']      = '<strong>更新:</strong> 已可取得 %s 的新版本';
+$lang['wrong_folder']          = '<strong>外掛安裝不正確:</strong> 將外掛資料夾從 "%s" 更名至 "%s"。';
+$lang['url_change']            = '<strong>網址已變更:</strong> 自從上次下載後下載網址已變更。在更新延伸功能前請先檢查新網址是否可用。<br />新: %s<br />舊: %s';
+$lang['error_download']        = '無法下載檔案：%s';
+$lang['error_decompress']      = '無法解壓縮檔案。這可能是下載品質不佳所致，在這個情況下你應該再試一次；也有可能是因為無法辨識的壓縮格式，在這個情況下你應該自行下載並手動安裝';
+$lang['error_findfolder']      = '無法辨認延伸功能資料夾，你必須自行下載並手動安裝';
 $lang['noperms']               = '延伸功能資料夾無法寫入';
 $lang['notplperms']            = '版型資料夾無法寫入';
 $lang['nopluginperms']         = '外掛資料夾無法寫入';
-- 
cgit v1.2.3


From 731669d686f6c4d90db8b75918f51091947f1fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Schr=C3=B6der?= <Pascal1802@gmail.com>
Date: Mon, 27 Oct 2014 07:21:30 +0100
Subject: translation update

---
 inc/lang/de/lang.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 2886b84d5..2725c247a 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -27,6 +27,7 @@
  * @author Simon <st103267@stud.uni-stuttgart.de>
  * @author Hoisl <hoisl@gmx.at>
  * @author Marcel Eickhoff <eickhoff.marcel@gmail.com>
+ * @author Pascal Schröder <Pascal1802@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -88,7 +89,7 @@ $lang['badpassconfirm']        = 'Das Passwort war falsch.';
 $lang['minoredit']             = 'kleine Änderung';
 $lang['draftdate']             = 'Entwurf gespeichert am';
 $lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
-$lang['searchcreatepage']      = "Falls der gesuchte Begriff nicht gefunden wurde, können Sie direkt eine neue Seite für den Suchbegriff anlegen, indem Sie auf den **''[Seite anlegen]''** Knopf drücken.";
+$lang['searchcreatepage']      = 'Falls der gesuchte Begriff nicht gefunden wurde, können Sie direkt eine neue Seite für den Suchbegriff anlegen, indem Sie auf den **\'\'[Seite anlegen]\'\'** Knopf drücken.';
 $lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden.';
 $lang['reguexists']            = 'Der Benutzername existiert leider schon.';
 $lang['regsuccess']            = 'Der neue Benutzer wurde angelegt und das Passwort per E-Mail versandt.';
@@ -206,6 +207,8 @@ $lang['diff_side']             = 'Side by Side';
 $lang['diffprevrev']           = 'Vorhergehende Überarbeitung';
 $lang['diffnextrev']           = 'Nächste  Überarbeitung';
 $lang['difflastrev']           = 'Letzte  Überarbeitung';
+$lang['diffbothprevrev']       = 'Beide Seiten der vorigen Revision';
+$lang['diffbothnextrev']       = 'Beide Seiten der Revision';
 $lang['line']                  = 'Zeile';
 $lang['breadcrumb']            = 'Zuletzt angesehen:';
 $lang['youarehere']            = 'Sie befinden sich hier:';
@@ -355,3 +358,5 @@ $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnisse';
 $lang['plainhtml']             = 'HTML Klartext';
 $lang['wikimarkup']            = 'Wiki Markup';
+$lang['page_nonexist_rev']     = 'DIe Seite exitiert nicht unter %s. Sie wurde aber unter <a herf="%s">%s</a>';
+$lang['unable_to_parse_date']  = 'Parameter "%s" kann nicht geparsed werden.';
-- 
cgit v1.2.3


From 0f8f7aaa42dc1e95a0d7a1cac126263bdb17686b Mon Sep 17 00:00:00 2001
From: Danny Lin <danny0838@gmail.com>
Date: Fri, 31 Oct 2014 18:40:52 +0800
Subject: Move check after libraries are loaded, so that $conf['compression']
 is not turned off in the case that gzopen doesn't exist while gzopen64 does
 exist, as inc/compatibility.php ought to have fixed.

---
 inc/init.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/init.php b/inc/init.php
index 24920a17d..d0d9101e6 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -178,14 +178,6 @@ $_REQUEST = array_merge($_GET,$_POST);
 // we don't want a purge URL to be digged
 if(isset($_REQUEST['purge']) && !empty($_SERVER['HTTP_REFERER'])) unset($_REQUEST['purge']);
 
-// disable gzip if not available
-if($conf['compression'] == 'bz2' && !function_exists('bzopen')){
-    $conf['compression'] = 'gz';
-}
-if($conf['compression'] == 'gz' && !function_exists('gzopen')){
-    $conf['compression'] = 0;
-}
-
 // precalculate file creation modes
 init_creationmodes();
 
@@ -201,6 +193,14 @@ if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Con
 // load libraries
 require_once(DOKU_INC.'inc/load.php');
 
+// disable gzip if not available
+if($conf['compression'] == 'bz2' && !function_exists('bzopen')){
+    $conf['compression'] = 'gz';
+}
+if($conf['compression'] == 'gz' && !function_exists('gzopen')){
+    $conf['compression'] = 0;
+}
+
 // input handle class
 global $INPUT;
 $INPUT = new Input();
-- 
cgit v1.2.3


From fed2ee900d012e5ebccad2796d0850034ac7729b Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 6 Nov 2014 21:12:10 +0100
Subject: Make addLogEntry independent of global var INFO

In stead use the type as provided to the function. Fixes #920
---
 inc/changelog.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/inc/changelog.php b/inc/changelog.php
index 6af336fc2..9642cf9cd 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -83,17 +83,19 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr
             'extra' => str_replace($strip, '', $extra)
             );
 
+    $wasCreated = ($type===DOKU_CHANGE_TYPE_CREATE);
+    $wasReverted = ($type===DOKU_CHANGE_TYPE_REVERT);
     // update metadata
     if (!$wasRemoved) {
         $oldmeta = p_read_metadata($id);
         $meta    = array();
-        if (!$INFO['exists'] && empty($oldmeta['persistent']['date']['created'])){ // newly created
+        if ($wasCreated && empty($oldmeta['persistent']['date']['created'])){ // newly created
             $meta['date']['created'] = $created;
             if ($user){
                 $meta['creator'] = $INFO['userinfo']['name'];
                 $meta['user']    = $user;
             }
-        } elseif (!$INFO['exists'] && !empty($oldmeta['persistent']['date']['created'])) { // re-created / restored
+        } elseif (($wasCreated || $wasReverted) && !empty($oldmeta['persistent']['date']['created'])) { // re-created / restored
             $meta['date']['created']  = $oldmeta['persistent']['date']['created'];
             $meta['date']['modified'] = $created; // use the files ctime here
             $meta['creator'] = $oldmeta['persistent']['creator'];
-- 
cgit v1.2.3


From 83b7e38df41d6f1c41ee6818b4838addfbf95e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <mic.grosse+github@googlemail.com>
Date: Tue, 11 Nov 2014 11:16:37 +0100
Subject: Trim unnecessary / at start of windowssharelink

---
 inc/parser/xhtml.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 5627a0353..3a2e49155 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -999,6 +999,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         $link['title'] = $this->_xmlEntities($url);
         $url           = str_replace('\\', '/', $url);
+        $url           = ltrim($url,'/');
         $url           = 'file:///'.$url;
         $link['url']   = $url;
 
-- 
cgit v1.2.3


From 52ec63bf12e618947c2ee9f558db04932d0a1ae4 Mon Sep 17 00:00:00 2001
From: christian studer <christian.studer@meteotest.ch>
Date: Wed, 12 Nov 2014 12:25:47 +0100
Subject: Handles CTRL-Enter event to save in the editor

---
 lib/scripts/editor.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js
index 74919cb98..f4143f0bc 100644
--- a/lib/scripts/editor.js
+++ b/lib/scripts/editor.js
@@ -124,14 +124,15 @@ var dw_editor = {
      * Listens to all key inputs and handle indentions
      * of lists and code blocks
      *
-     * Currently handles space, backspce and enter presses
+     * Currently handles space, backspace, enter and
+     * ctrl-enter presses
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @fixme handle tabs
      * @param event e - the key press event object
      */
     keyHandler: function(e){
-        if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) {
+        if(jQuery.inArray(e.keyCode,[8, 10, 13, 32]) === -1) {
             return;
         }
         var selection = DWgetSelection(this);
@@ -143,7 +144,12 @@ var dw_editor = {
                                  search.lastIndexOf("\r")); //IE workaround
         search = search.substr(linestart);
 
-        if(e.keyCode == 13){ // Enter
+        if((e.keyCode == 13 || e.keyCode == 10) && e.ctrlKey) { // Ctrl-Enter (With Chrome workaround)
+            // Submit current edit
+            jQuery('input#edbtn__save').click();
+            e.preventDefault(); // prevent enter key
+            return false;
+        }else if(e.keyCode == 13){ // Enter
             // keep current indention for lists and code
             var match = search.match(/(\n  +([\*-] ?)?)/);
             if(match){
-- 
cgit v1.2.3


From 5f2aaab2b263262d2b166bb4c3d4ecb6c8f1662a Mon Sep 17 00:00:00 2001
From: james <j.mccann@celcat.com>
Date: Wed, 19 Nov 2014 16:16:20 +0100
Subject: translation update

---
 inc/lang/fr/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index dfaa8df2e..7a9b82158 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -35,6 +35,7 @@
  * @author Caillot <remicaillot5@gmail.com>
  * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
  * @author YoBoY <yoboy@ubuntu-fr.org>
+ * @author james <j.mccann@celcat.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -77,7 +78,7 @@ $lang['btn_draftdel']          = 'Effacer le brouillon';
 $lang['btn_revert']            = 'Restaurer';
 $lang['btn_register']          = 'Créer un compte';
 $lang['btn_apply']             = 'Appliquer';
-$lang['btn_media']             = 'Gestionnaire de médias';
+$lang['btn_media']             = 'Gestionnaire Multimédia';
 $lang['btn_deleteuser']        = 'Supprimer mon compte';
 $lang['btn_img_backto']        = 'Retour vers %s';
 $lang['btn_mediaManager']      = 'Voir dans le gestionnaire de médias';
-- 
cgit v1.2.3


From 2ec6a92c13ed276111bbe099aadab33a885397cb Mon Sep 17 00:00:00 2001
From: Patrick <spill.p@hotmail.com>
Date: Wed, 19 Nov 2014 19:20:55 +0100
Subject: translation update

---
 inc/lang/no/lang.php                       |  4 +++-
 lib/plugins/authad/lang/no/lang.php        |  8 ++++++++
 lib/plugins/authad/lang/no/settings.php    |  2 ++
 lib/plugins/authldap/lang/no/settings.php  |  2 ++
 lib/plugins/authmysql/lang/no/settings.php | 14 ++++++++++++++
 lib/plugins/revert/lang/no/lang.php        |  1 +
 6 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/authad/lang/no/lang.php
 create mode 100644 lib/plugins/authmysql/lang/no/settings.php

diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index aeea982f2..ecf10ff5b 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -21,6 +21,7 @@
  * @author Thomas Juberg <Thomas.Juberg@Gmail.com>
  * @author Boris <boris@newton-media.no>
  * @author Christopher Schive <chschive@frisurf.no>
+ * @author Patrick <spill.p@hotmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -82,7 +83,7 @@ $lang['badpassconfirm']        = 'Beklager, passordet var feil';
 $lang['minoredit']             = 'Mindre endringer';
 $lang['draftdate']             = 'Kladd autolagret';
 $lang['nosecedit']             = 'Siden ble endret i mellomtiden, seksjonsinfo har blitt foreldet - lastet full side istedet.';
-$lang['searchcreatepage']      = "Hvis du ikke finner det du leter etter, så kan du skape en ny side med samme navn som ditt søk ved å klikke på ''**Lag denne siden**''-knappen.";
+$lang['searchcreatepage']      = 'Hvis du ikke finner det du leter etter, så kan du skape en ny side med samme navn som ditt søk ved å klikke på \'\'**Lag denne siden**\'\'-knappen.';
 $lang['regmissing']            = 'Vennligst fyll ut alle felt.';
 $lang['reguexists']            = 'Det finnes allerede en konto med dette brukernavnet.';
 $lang['regsuccess']            = 'Brukerkonto har blitt laget og passord har blitt sendt via e-post.';
@@ -356,3 +357,4 @@ $lang['currentns']             = 'gjeldende navnemellomrom';
 $lang['searchresult']          = 'Søk i resultat';
 $lang['plainhtml']             = 'Enkel HTML';
 $lang['wikimarkup']            = 'wiki-format';
+$lang['page_nonexist_rev']     = 'Finnes ingen side på %s. Den er derfor laget på <a href="%s">%s</a>';
diff --git a/lib/plugins/authad/lang/no/lang.php b/lib/plugins/authad/lang/no/lang.php
new file mode 100644
index 000000000..a1c9c7e8a
--- /dev/null
+++ b/lib/plugins/authad/lang/no/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Patrick <spill.p@hotmail.com>
+ */
+$lang['domain']                = 'Loggpå-domene';
diff --git a/lib/plugins/authad/lang/no/settings.php b/lib/plugins/authad/lang/no/settings.php
index bab5ce67d..f309ead50 100644
--- a/lib/plugins/authad/lang/no/settings.php
+++ b/lib/plugins/authad/lang/no/settings.php
@@ -4,6 +4,8 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Christopher Schive <chschive@frisurf.no>
+ * @author Patrick <spill.p@hotmail.com>
  */
+$lang['account_suffix']        = 'Ditt konto-suffiks F. Eks. <code>@my.domain.org</code>';
 $lang['admin_password']        = 'Passordet til brukeren over.';
 $lang['expirywarn']            = 'Antall dager på forhånd brukeren varsles om at passordet utgår. 0 for å deaktivere.';
diff --git a/lib/plugins/authldap/lang/no/settings.php b/lib/plugins/authldap/lang/no/settings.php
index 6bedb2991..61671ed46 100644
--- a/lib/plugins/authldap/lang/no/settings.php
+++ b/lib/plugins/authldap/lang/no/settings.php
@@ -4,6 +4,8 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Christopher Schive <chschive@frisurf.no>
+ * @author Patrick <spill.p@hotmail.com>
  */
 $lang['port']                  = 'LDAP serverport dersom ingen full URL var gitt over.';
 $lang['starttls']              = 'Bruke TLS-forbindelser?';
+$lang['bindpw']                = 'Passord til brukeren over';
diff --git a/lib/plugins/authmysql/lang/no/settings.php b/lib/plugins/authmysql/lang/no/settings.php
new file mode 100644
index 000000000..45ab09819
--- /dev/null
+++ b/lib/plugins/authmysql/lang/no/settings.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Patrick <spill.p@hotmail.com>
+ */
+$lang['server']                = 'Din MySQL-server';
+$lang['user']                  = 'Ditt MySQL-brukernavn';
+$lang['password']              = 'Passord til brukeren';
+$lang['database']              = 'Database som skal brukes';
+$lang['debug_o_0']             = 'ingen';
+$lang['debug_o_1']             = 'bare ved feil';
+$lang['debug_o_2']             = 'alle SQL-forespørsler';
diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php
index 6806dcd93..76da8ca9c 100644
--- a/lib/plugins/revert/lang/no/lang.php
+++ b/lib/plugins/revert/lang/no/lang.php
@@ -19,6 +19,7 @@
  * @author Thomas Juberg <Thomas.Juberg@Gmail.com>
  * @author Boris <boris@newton-media.no>
  * @author Christopher Schive <chschive@frisurf.no>
+ * @author Patrick <spill.p@hotmail.com>
  */
 $lang['menu']                  = 'Tilbakestillingsbehandler';
 $lang['filter']                = 'Søk etter søppelmeldinger';
-- 
cgit v1.2.3


From 52f0afd3e452404cf4792276479346237787e636 Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Fri, 21 Nov 2014 21:56:39 +0100
Subject: translation update

---
 inc/lang/cs/lang.php                              |  5 +++++
 lib/plugins/extension/lang/cs/intro_templates.txt |  1 +
 lib/plugins/extension/lang/cs/lang.php            | 24 +++++++++++++++++++++++
 lib/plugins/usermanager/lang/cs/lang.php          |  3 +++
 4 files changed, 33 insertions(+)
 create mode 100644 lib/plugins/extension/lang/cs/intro_templates.txt

diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 168c1e403..ad889f858 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -200,6 +200,8 @@ $lang['diff_side']             = 'Přidané';
 $lang['diffprevrev']           = 'Předchozí verze';
 $lang['diffnextrev']           = 'Následující verze';
 $lang['difflastrev']           = 'Poslední revize';
+$lang['diffbothprevrev']       = 'Obě strany předchozí revize';
+$lang['diffbothnextrev']       = 'Obě strany příští revize';
 $lang['line']                  = 'Řádek';
 $lang['breadcrumb']            = 'Historie:';
 $lang['youarehere']            = 'Umístění:';
@@ -295,6 +297,7 @@ $lang['i_problems']            = 'Instalátor narazil na níže popsané problé
 $lang['i_modified']            = 'Instalátor bude z bezpečnostních důvodů pracovat pouze s čistou a ještě neupravenou instalací DokuWiki. Buď znovu rozbalte soubory z instalačního balíčku, nebo zkuste prostudovat <a href="http://dokuwiki.org/install">instrukce pro instalaci DokuWiki</a>.';
 $lang['i_funcna']              = 'PHP funkce <code>%s</code> není dostupná. Váš webhosting ji možná z nějakého důvodu vypnul.';
 $lang['i_phpver']              = 'Verze vaší instalace PHP <code>%s</code> je nižší než požadovaná <code>%s</code>. Budete muset aktualizovat svou instalaci PHP.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload musí být vypnut v php.ini pro běh DokuWiki.';
 $lang['i_permfail']            = 'DokuWiki nemůže zapisovat do <code>%s</code>. Budete muset opravit práva k tomuto adresáři.';
 $lang['i_confexists']          = '<code>%s</code> již existuje';
 $lang['i_writeerr']            = 'Nelze vytvořit <code>%s</code>. Budete muset zkontrolovat práva k souborům či adresářům a vytvořit tento soubor ručně.';
@@ -348,3 +351,5 @@ $lang['currentns']             = 'Aktuální jmenný prostor';
 $lang['searchresult']          = 'Výsledek hledání';
 $lang['plainhtml']             = 'Čisté HTML';
 $lang['wikimarkup']            = 'Wiki jazyk';
+$lang['page_nonexist_rev']     = 'Stránka neexistovala na %s. Byla vytvořena dodatečne na <a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'Nelze rozebrat parametr "%s".';
diff --git a/lib/plugins/extension/lang/cs/intro_templates.txt b/lib/plugins/extension/lang/cs/intro_templates.txt
new file mode 100644
index 000000000..45abe952c
--- /dev/null
+++ b/lib/plugins/extension/lang/cs/intro_templates.txt
@@ -0,0 +1 @@
+Toto jsou šablony, které jsou momentálně nainstalovány v této DokuWiki. Aktuálně používanu šablonu lze vybrat ve [[?do=admin&page=config|Správci rozšíření]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php
index 783b488ea..f6db2b153 100644
--- a/lib/plugins/extension/lang/cs/lang.php
+++ b/lib/plugins/extension/lang/cs/lang.php
@@ -15,6 +15,7 @@ $lang['notimplemented']        = 'Tato vychytávka není dosud implementována';
 $lang['notinstalled']          = 'Toto rozšíření není instalováno';
 $lang['alreadyenabled']        = 'Toto rozšíření je již povoleno';
 $lang['alreadydisabled']       = 'Toto rozšíření je již vypnuto';
+$lang['pluginlistsaveerror']   = 'Došlo k chybě při ukládání seznamu zásuvných modulů';
 $lang['unknownauthor']         = 'Neznámý autor';
 $lang['unknownversion']        = 'Neznámá verze';
 $lang['btn_info']              = 'Zobrazit více informací';
@@ -27,12 +28,15 @@ $lang['btn_reinstall']         = 'Přeinstalovat';
 $lang['js']['reallydel']       = 'Opravdu odinstalovat toto rozšíření?';
 $lang['search_for']            = 'Hledat rozšíření:';
 $lang['search']                = 'Hledat';
+$lang['extensionby']           = '<strong>%s</strong> od %s';
+$lang['screenshot']            = 'Screenshot %s';
 $lang['popularity']            = 'Popularita: %s%%';
 $lang['homepage_link']         = 'Dokumenty';
 $lang['bugs_features']         = 'Chyby';
 $lang['tags']                  = 'Štítky:';
 $lang['author_hint']           = 'Vyhledat rozšíření podle tohoto autora';
 $lang['installed']             = 'Nainstalováno:';
+$lang['downloadurl']           = 'URL stahování:';
 $lang['repository']            = 'Repozitář:';
 $lang['unknown']               = '<em>neznámý</em>';
 $lang['installed_version']     = 'Nainstalovaná verze:';
@@ -41,6 +45,7 @@ $lang['available_version']     = 'Dostupná verze:';
 $lang['compatible']            = 'Kompatibilní s:';
 $lang['depends']               = 'Závisí na:';
 $lang['similar']               = 'Podobný jako:';
+$lang['conflicts']             = 'Koliduje s:';
 $lang['donate']                = 'Líbí se ti to?';
 $lang['donate_action']         = 'Kup autorovi kávu!';
 $lang['repo_retry']            = 'Opakovat';
@@ -54,6 +59,25 @@ $lang['status_disabled']       = 'zakázaný';
 $lang['status_unmodifiable']   = 'neměnný';
 $lang['status_plugin']         = 'zásuvný modul';
 $lang['status_template']       = 'šablona';
+$lang['status_bundled']        = 'svázaný';
+$lang['msg_enabled']           = 'Zásuvný modul %s povolen';
+$lang['msg_disabled']          = 'Zásuvný modul %s zakázán';
 $lang['msg_delete_success']    = 'Rozšíření odinstalováno';
+$lang['msg_template_install_success'] = 'Šablona %s úspěšně nainstalována';
+$lang['msg_template_update_success'] = 'Šablona %s úspěšně aktualizována';
 $lang['msg_plugin_install_success'] = 'Zásuvný modul %s úspěšně nainstalován.';
 $lang['msg_plugin_update_success'] = 'Zásuvný modul %s úspěšně aktualizován.';
+$lang['msg_upload_failed']     = 'Nahrávání souboru selhalo';
+$lang['missing_dependency']    = '<strong>Chybějící nebo zakázaná závislost:</strong> %s';
+$lang['security_issue']        = '<strong>Bezpečnostní problém:</strong> %s';
+$lang['security_warning']      = '<strong>Bezpečnostní varování:</strong> %s';
+$lang['update_available']      = '<strong>Aktualizace:</strong> Je dostupná nová verze %s.';
+$lang['wrong_folder']          = '<strong>Zásuvný modul nesprávně nainstalován:</strong> Přejmenujte adresár modulu "%s" na "%s".';
+$lang['error_badurl']          = 'Adresy URL by měly začínat s http nebo https';
+$lang['error_dircreate']       = 'Nelze vytvořit dočasný adresář pro přijetí stahování';
+$lang['error_download']        = 'Nelze stáhnout soubor: %s';
+$lang['error_findfolder']      = 'Nelze rozpoznat adresář pro rozšíření, je třeba stáhnout a instalovat ručně';
+$lang['noperms']               = 'Nelze zapisovat do adresáře pro rozšíření';
+$lang['notplperms']            = 'Nelze zapisovat do odkládacího adresáře';
+$lang['nopluginperms']         = 'Nelze zapisovat do adresáře se zásuvnými moduly';
+$lang['git']                   = 'Toto rozšíření bylo nainstalováno přes git, nejspíš ho tady aktualizovat nechcete.';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index bbb560679..6fbfe8535 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -15,6 +15,7 @@
  * @author Jakub A. Těšínský (j@kub.cz)
  * @author mkucera66@seznam.cz
  * @author Zbyněk Křivka <krivka@fit.vutbr.cz>
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
 $lang['menu']                  = 'Správa uživatelů';
 $lang['noauth']                = '(autentizace uživatelů není k dispozici)';
@@ -62,6 +63,8 @@ $lang['add_ok']                = 'Uživatel úspěšně vytvořen';
 $lang['add_fail']              = 'Vytvoření uživatele selhalo';
 $lang['notify_ok']             = 'Odeslán mail s upozorněním';
 $lang['notify_fail']           = 'Mail s upozorněním nebylo možno odeslat';
+$lang['import_userlistcsv']    = 'Seznam uživatelů (CSV):';
+$lang['import_header']         = 'Poslední selhání importu';
 $lang['import_success_count']  = 'Import uživatelů: nalezeno %d uživatelů, %d úspěšně importováno.';
 $lang['import_failure_count']  = 'Import uživatelů: %d selhalo. Seznam chybných je níže.';
 $lang['import_error_fields']   = 'Nedostatek položek, nalezena/y %d, požadovány 4.';
-- 
cgit v1.2.3


From 044a73b5792a48ef181c0bcdfcef5317d78798b4 Mon Sep 17 00:00:00 2001
From: Mohammad Sadegh <msdn2013@gmail.com>
Date: Thu, 27 Nov 2014 12:06:03 +0100
Subject: translation update

---
 inc/lang/fa/lang.php                      | 1 +
 lib/plugins/authldap/lang/fa/settings.php | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/fa/settings.php

diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index fea8fa210..b62acfc62 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -13,6 +13,7 @@
  * @author reza_khn <reza_khn@yahoo.com>
  * @author Hamid <zarrabi@sharif.edu>
  * @author Mohamad Mehdi Habibi <habibi.esf@gmail.com>
+ * @author Mohammad Sadegh <msdn2013@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
diff --git a/lib/plugins/authldap/lang/fa/settings.php b/lib/plugins/authldap/lang/fa/settings.php
new file mode 100644
index 000000000..1b48da7f5
--- /dev/null
+++ b/lib/plugins/authldap/lang/fa/settings.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mohammad Sadegh <msdn2013@gmail.com>
+ */
+$lang['bindpw']                = 'رمزعبور کاربر بالا';
-- 
cgit v1.2.3


From 912be8f66fc77a0999250f2f494ddaeed4b3fa08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <mic.grosse+github@googlemail.com>
Date: Thu, 27 Nov 2014 18:12:02 +0100
Subject: Add tests: known and unknown external video files

---
 _test/tests/inc/parser/parser_media.test.php | 78 ++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 _test/tests/inc/parser/parser_media.test.php

diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php
new file mode 100644
index 000000000..0b62473f8
--- /dev/null
+++ b/_test/tests/inc/parser/parser_media.test.php
@@ -0,0 +1,78 @@
+<?php
+require_once 'parser.inc.php';
+
+/**
+ * Tests for the implementation of audio and video files
+ *
+ * @author  Michael Große <grosse@cosmocode.de>
+*/
+class TestOfDoku_Parser_Media extends TestOfDoku_Parser {
+
+    function testVideoOGVExternal() {
+        $file = 'http://some.where.far/away.ogv';
+        $parser_response = p_get_instructions('{{' . $file . '}}');
+
+        $calls = array (
+            array('document_start',array()),
+            array('p_open',array()),
+            array('externalmedia',array($file,null,null,null,null,'cache','details')),
+            array('cdata',array(null)),
+            array('p_close',array()),
+            array('document_end',array()),
+        );
+        $this->assertEquals(array_map('stripbyteindex',$parser_response),$calls);
+
+        $Renderer = new Doku_Renderer_xhtml();
+        $url = $Renderer->externalmedia($file,null,null,null,null,'cache','details',true);
+        //print_r("url: " . $url);
+        $video = '<video class="media" width="320" height="240" controls="controls">';
+        $this->assertEquals(substr($url,0,66),$video);
+        $source = '<source src="http://some.where.far/away.ogv" type="video/ogg" />';
+        $this->assertEquals(substr($url,67,64),$source);
+        // work around random token
+        $a_first_part = '<a href="/./lib/exe/fetch.php?cache=&amp;tok=';
+        $a_second_part = '&amp;media=http%3A%2F%2Fsome.where.far%2Faway.ogv" class="media mediafile mf_ogv" title="http://some.where.far/away.ogv">';
+        $this->assertEquals(substr($url,132,45),$a_first_part);
+        $this->assertEquals(substr($url,183,121),$a_second_part);
+        $rest = 'away.ogv</a></video>'."\n";
+        $this->assertEquals(substr($url,304),$rest);
+    }
+
+    /**
+     * unknown extension of external media file
+     */
+    function testVideoVIDExternal() {
+        $file = 'http://some.where.far/away.vid';
+        $parser_response = p_get_instructions('{{' . $file . '}}');
+
+        $calls = array(
+            array('document_start', array()),
+            array('p_open', array()),
+            array('externalmedia', array($file, null, null, null, null, 'cache', 'details')),
+            array('cdata', array(null)),
+            array('p_close', array()),
+            array('document_end', array()),
+        );
+        $this->assertEquals(array_map('stripbyteindex', $parser_response), $calls);
+
+        $Renderer = new Doku_Renderer_xhtml();
+        $url = $Renderer->externalmedia($file, null, null, null, null, 'cache', 'details', true);
+        // work around random token
+        $a_first_part = '<a href="/./lib/exe/fetch.php?tok=';
+        $a_second_part = '&amp;media=http%3A%2F%2Fsome.where.far%2Faway.vid" class="media mediafile mf_vid" title="http://some.where.far/away.vid">';
+        $this->assertEquals(substr($url,0,34),$a_first_part);
+        $this->assertEquals(substr($url,40,121),$a_second_part);
+        $rest = 'away.vid</a>';
+        $this->assertEquals(substr($url,161),$rest);
+    }
+}
+
+/**
+ * .oga:
+ * http://upload.wikimedia.org/wikipedia/commons/6/6b/Meow_of_a_pleading_cat.oga
+ *
+ * .wav:
+ * http://upload.wikimedia.org/wikipedia/commons/8/81/Meow_of_a_Siamese_cat_-_freemaster2.wav
+ *
+ *
+ */
-- 
cgit v1.2.3


From 10bcc8aaa0f8014e1c5e2d059ea674fc0063233d Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 1 Dec 2014 17:01:23 +0000
Subject: provide node/leaf state data in listitem_open instruction parameter

---
 inc/parser/handler.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index a1040d12e..5e0aa6ff4 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -805,6 +805,8 @@ class Doku_Handler_List {
     var $listCalls = array();
     var $listStack = array();
 
+    const NODE = 1;
+
     function Doku_Handler_List(& $CallWriter) {
         $this->CallWriter = & $CallWriter;
     }
@@ -856,7 +858,8 @@ class Doku_Handler_List {
         $depth = $this->interpretSyntax($call[1][0], $listType);
 
         $this->initialDepth = $depth;
-        $this->listStack[] = array($listType, $depth);
+        //                   array(list type, current depth, index of current listitem_open)
+        $this->listStack[] = array($listType, $depth, 1);
 
         $this->listCalls[] = array('list'.$listType.'_open',array(),$call[2]);
         $this->listCalls[] = array('listitem_open',array(1),$call[2]);
@@ -881,6 +884,7 @@ class Doku_Handler_List {
     function listOpen($call) {
         $depth = $this->interpretSyntax($call[1][0], $listType);
         $end = end($this->listStack);
+        $key = key($this->listStack);
 
         // Not allowed to be shallower than initialDepth
         if ( $depth < $this->initialDepth ) {
@@ -897,6 +901,9 @@ class Doku_Handler_List {
                 $this->listCalls[] = array('listitem_open',array($depth-1),$call[2]);
                 $this->listCalls[] = array('listcontent_open',array(),$call[2]);
 
+                // new list item, update list stack's index into current listitem_open
+                $this->listStack[$key][2] = count($this->listCalls) - 2;
+
             // Switched list type...
             } else {
 
@@ -908,7 +915,7 @@ class Doku_Handler_List {
                 $this->listCalls[] = array('listcontent_open',array(),$call[2]);
 
                 array_pop($this->listStack);
-                $this->listStack[] = array($listType, $depth);
+                $this->listStack[] = array($listType, $depth, count($this->listCalls) - 2);
             }
 
         //------------------------------------------------------------------------
@@ -920,7 +927,10 @@ class Doku_Handler_List {
             $this->listCalls[] = array('listitem_open', array($depth-1), $call[2]);
             $this->listCalls[] = array('listcontent_open',array(),$call[2]);
 
-            $this->listStack[] = array($listType, $depth);
+            // set the node/leaf state of this item's parent listitem_open to NODE
+            $this->listCalls[$this->listStack[$key][2]][1][1] = self::NODE;
+
+            $this->listStack[] = array($listType, $depth, count($this->listCalls) - 2);
 
         //------------------------------------------------------------------------
         // Getting shallower ( $depth < $end[1] )
@@ -934,6 +944,7 @@ class Doku_Handler_List {
 
             while (1) {
                 $end = end($this->listStack);
+                $key = key($this->listStack);
 
                 if ( $end[1] <= $depth ) {
 
@@ -946,6 +957,9 @@ class Doku_Handler_List {
                         $this->listCalls[] = array('listitem_open',array($depth-1),$call[2]);
                         $this->listCalls[] = array('listcontent_open',array(),$call[2]);
 
+                        // new list item, update list stack's index into current listitem_open
+                        $this->listStack[$key][2] = count($this->listCalls) - 2;
+
                     } else {
                         // Switching list type...
                         $this->listCalls[] = array('list'.$end[0].'_close', array(), $call[2]);
@@ -954,7 +968,7 @@ class Doku_Handler_List {
                         $this->listCalls[] = array('listcontent_open',array(),$call[2]);
 
                         array_pop($this->listStack);
-                        $this->listStack[] = array($listType, $depth);
+                        $this->listStack[] = array($listType, $depth, count($this->listCalls) - 2);
                     }
 
                     break;
-- 
cgit v1.2.3


From e3a24861f53db7293b2b17f05d5821871b85b2f6 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 1 Dec 2014 17:02:56 +0000
Subject: Update inbuilt renderers for node/leaf state in listitem_open -
 includes, xhtml renderer adding 'node' class to <li> when it contains   child
 list(s)

---
 inc/parser/metadata.php | 3 ++-
 inc/parser/renderer.php | 3 ++-
 inc/parser/xhtml.php    | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 25bf3fe3d..313b70df5 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -251,8 +251,9 @@ class Doku_Renderer_metadata extends Doku_Renderer {
      * Open a list item
      *
      * @param int $level the nesting level
+     * @param bool $node true when a node; false when a leaf
      */
-    function listitem_open($level) {
+    function listitem_open($level,$node=false) {
         $this->cdata(str_repeat(DOKU_TAB, $level).'* ');
     }
 
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 09294539e..668b617d1 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -343,8 +343,9 @@ class Doku_Renderer extends DokuWiki_Plugin {
      * Open a list item
      *
      * @param int $level the nesting level
+     * @param bool $node true when a node; false when a leaf
      */
-    function listitem_open($level) {
+    function listitem_open($level,$node=false) {
     }
 
     /**
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 3a2e49155..b73e3a881 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -456,9 +456,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * Open a list item
      *
      * @param int $level the nesting level
+     * @param bool $node true when a node; false when a leaf
      */
-    function listitem_open($level) {
-        $this->doc .= '<li class="level'.$level.'">';
+    function listitem_open($level, $node=false) {
+        $branching = $node ? ' node' : '';
+        $this->doc .= '<li class="level'.$level.$branching.'">';
     }
 
     /**
-- 
cgit v1.2.3


From d47f74a0328452bed21867aa4e20557b7d4564e4 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 1 Dec 2014 17:05:26 +0000
Subject: update parser tests for change in listitem_open instruction

---
 _test/tests/inc/parser/parser_footnote.test.php |  2 +-
 _test/tests/inc/parser/parser_lists.test.php    | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/_test/tests/inc/parser/parser_footnote.test.php b/_test/tests/inc/parser/parser_footnote.test.php
index b47a575de..2457fb031 100644
--- a/_test/tests/inc/parser/parser_footnote.test.php
+++ b/_test/tests/inc/parser/parser_footnote.test.php
@@ -303,7 +303,7 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
             array('nest', array ( array (
               array('footnote_open',array()),
               array('listu_open',array()),
-              array('listitem_open',array(1)),
+              array('listitem_open',array(1,Doku_Handler_List::NODE)),
               array('listcontent_open',array()),
               array('cdata',array("A")),
               array('listcontent_close',array()),
diff --git a/_test/tests/inc/parser/parser_lists.test.php b/_test/tests/inc/parser/parser_lists.test.php
index e4ef1f83e..6acaff637 100644
--- a/_test/tests/inc/parser/parser_lists.test.php
+++ b/_test/tests/inc/parser/parser_lists.test.php
@@ -13,7 +13,7 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('listu_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('cdata',array("A")),
             array('listcontent_close',array()),
@@ -46,7 +46,7 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('listo_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('cdata',array("A")),
             array('listcontent_close',array()),
@@ -80,7 +80,7 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('listo_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('cdata',array("A")),
             array('listcontent_close',array()),
@@ -109,7 +109,7 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('listu_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('cdata',array("A")),
             array('listcontent_close',array()),
@@ -138,7 +138,7 @@ class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
         $calls = array (
             array('document_start',array()),
             array('listo_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('cdata',array("A")),
             array('listcontent_close',array()),
@@ -188,7 +188,7 @@ Bar');
             array('cdata',array("Foo")),
             array('p_close',array()),
             array('listu_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('cdata',array("A")),
             array('listcontent_close',array()),
@@ -227,7 +227,7 @@ Bar');
         $calls = array (
             array('document_start',array()),
             array('listu_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('strong_open',array()),
             array('cdata',array("A")),
@@ -262,7 +262,7 @@ Bar');
         $calls = array (
             array('document_start',array()),
             array('listu_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('unformatted',array("A")),
             array('listcontent_close',array()),
@@ -291,7 +291,7 @@ Bar');
         $calls = array (
             array('document_start',array()),
             array('listu_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('cdata',array("A")),
             array('linebreak',array()),
@@ -355,7 +355,7 @@ Bar');
         $calls = array (
             array('document_start',array()),
             array('listu_open',array()),
-            array('listitem_open',array(1)),
+            array('listitem_open',array(1,Doku_Handler_List::NODE)),
             array('listcontent_open',array()),
             array('nest', array( array(
                 array('footnote_open',array()),
-- 
cgit v1.2.3


From b30dd803e3c33cfc9508b0516744b0bb95be4d09 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 2 Dec 2014 16:18:26 +0100
Subject: disable flash uploading by default

Thanks to Kacper Szurek for reporting this
---
 conf/mime.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/mime.conf b/conf/mime.conf
index 2a50fab10..c2e03b775 100644
--- a/conf/mime.conf
+++ b/conf/mime.conf
@@ -9,7 +9,6 @@ gif     image/gif
 png     image/png
 ico     image/vnd.microsoft.icon
 
-swf     application/x-shockwave-flash
 mp3     audio/mpeg
 ogg     audio/ogg
 wav     audio/wav
@@ -66,3 +65,7 @@ odt     !application/vnd.oasis.opendocument.text
 #xml     text/xml
 #csv     text/csv
 
+# Also flash may be able to execute arbitrary scripts in the website's
+# context
+#swf     application/x-shockwave-flash
+
-- 
cgit v1.2.3


From 8fed17ed0ecc7e7c3b51762e09d88280a17a33cd Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 3 Dec 2014 00:06:18 +0100
Subject: code formatting cache

---
 inc/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/cache.php b/inc/cache.php
index 6817e771b..064174fc7 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -50,7 +50,7 @@ class cache {
         $this->_addDependencies();
 
         if ($this->_event) {
-            return $this->_stats(trigger_event($this->_event,$this,array($this,'_useCache')));
+            return $this->_stats(trigger_event($this->_event, $this, array($this,'_useCache')));
         } else {
             return $this->_stats($this->_useCache());
         }
-- 
cgit v1.2.3


From b814e978ddb3bb9f05058fb684e2394dd2bf8eb5 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 3 Dec 2014 00:08:14 +0100
Subject: provide also $ID in other export modes to renderer

Simplifies modifying the cache via an action plugin
---
 inc/actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/actions.php b/inc/actions.php
index ef09a0dc7..2953c0e79 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -644,7 +644,7 @@ function act_export($act){
             $output = p_wiki_xhtml($ID,$REV,false);
             break;
         default:
-            $output = p_cached_output(wikiFN($ID,$REV), $mode);
+            $output = p_cached_output(wikiFN($ID,$REV), $mode, $ID);
             $headers = p_get_metadata($ID,"format $mode");
             break;
     }
-- 
cgit v1.2.3


From 51a883ed288fd1a0a93fc2723019a334d104b179 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 3 Dec 2014 00:08:35 +0100
Subject: phpdocs handler

---
 inc/parser/handler.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index a1040d12e..8efaa2cc1 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -71,6 +71,7 @@ class Doku_Handler {
      */
     function plugin($match, $state, $pos, $pluginname){
         $data = array($match);
+        /** @var DokuWiki_Syntax_Plugin $plugin */
         $plugin = plugin_load('syntax',$pluginname);
         if($plugin != null){
             $data = $plugin->handle($match, $state, $pos, $this);
-- 
cgit v1.2.3


From a85f63dedee1c8ddf15757e204a170bf000d89dc Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 3 Dec 2014 00:09:04 +0100
Subject: code reformatting tpl_content_core()

---
 inc/template.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/template.php b/inc/template.php
index 31a65ce61..eb88732c4 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -170,8 +170,9 @@ function tpl_content_core() {
             break;
         default:
             $evt = new Doku_Event('TPL_ACT_UNKNOWN', $ACT);
-            if($evt->advise_before())
+            if($evt->advise_before()) {
                 msg("Failed to handle command: ".hsc($ACT), -1);
+            }
             $evt->advise_after();
             unset($evt);
             return false;
-- 
cgit v1.2.3


From cded11250d495f6039a20f1036c64ea7b230ceb2 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 3 Dec 2014 00:09:45 +0100
Subject: phpdocs syntax plugin base class

---
 lib/plugins/syntax.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
index 4a301f927..7d2daa70d 100644
--- a/lib/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -70,7 +70,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * @param   int          $state   The lexer state for the match
      * @param   int          $pos     The character position of the matched text
      * @param   Doku_Handler $handler The Doku_Handler object
-     * @return  array Return an array with all data you want to use in render
+     * @return  bool|array Return an array with all data you want to use in render, false don't add an instruction
      */
     function handle($match, $state, $pos, Doku_Handler $handler){
         trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
@@ -97,7 +97,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin {
      * @param   $format   string        output format being rendered
      * @param   $renderer Doku_Renderer the current renderer object
      * @param   $data     array         data created by handler()
-     * @return  boolean                 rendered correctly?
+     * @return  boolean                 rendered correctly? (however, returned value is not used at the moment)
      */
     function render($format, Doku_Renderer $renderer, $data) {
         trigger_error('render() not implemented in '.get_class($this), E_USER_WARNING);
-- 
cgit v1.2.3


From 48b5d5e92851161ee3b3ebc7bf5b6ae6d1f0914d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 3 Dec 2014 16:50:16 +0100
Subject: warn about enabled, but not used auth plugins

---
 lib/plugins/extension/helper/list.php  | 5 +++++
 lib/plugins/extension/lang/en/lang.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 9b1988d84..f7e6eb2ca 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -461,6 +461,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @return string The HTML code
      */
     function make_actions(helper_plugin_extension_extension $extension) {
+        global $conf;
         $return = '';
         $errors = '';
 
@@ -492,6 +493,10 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 $errors .= '<p class="permerror">'.$this->getLang('git').'</p>';
             }
 
+            if ($extension->isEnabled() && in_array('Auth', $extension->getTypes()) && $conf['auth'] != $extension->getID()) {
+                $errors .= '<p class="permerror">'.$this->getLang('auth').'</p>';
+            }
+
         }else{
             if (($canmod = $extension->canModify()) === true) {
                 if ($extension->getDownloadURL()) {
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 72c9b9e2d..fc8860c5d 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -94,6 +94,7 @@ $lang['noperms']                      = 'Extension directory is not writable';
 $lang['notplperms']                   = 'Template directory is not writable';
 $lang['nopluginperms']                = 'Plugin directory is not writable';
 $lang['git']                          = 'This extension was installed via git, you may not want to update it here.';
+$lang['auth']                         = 'This auth plugin is not enabled in configuration, consider disabling it.';
 
 $lang['install_url']                  = 'Install from URL:';
 $lang['install_upload']               = 'Upload Extension:';
-- 
cgit v1.2.3


From a638d6de09edffc29a4fd522b0a62584a29c51ef Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Thu, 4 Dec 2014 15:26:02 +0100
Subject: Increase updateVersion for master to sync with stable hotfix

---
 doku.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doku.php b/doku.php
index 71eee564e..1477f806c 100644
--- a/doku.php
+++ b/doku.php
@@ -9,7 +9,7 @@
  */
 
 // update message version
-$updateVersion = 46.1;
+$updateVersion = 46.2;
 
 //  xdebug_start_profiling();
 
-- 
cgit v1.2.3


From f76dd4f5e20fba6666b01fa85e451bc7404cb86a Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Sat, 6 Dec 2014 23:48:32 +0100
Subject: Increasing master branch updateVersion number

---
 doku.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doku.php b/doku.php
index 1477f806c..7cb92cffa 100644
--- a/doku.php
+++ b/doku.php
@@ -9,7 +9,7 @@
  */
 
 // update message version
-$updateVersion = 46.2;
+$updateVersion = 47;
 
 //  xdebug_start_profiling();
 
-- 
cgit v1.2.3


From 29eba4294ec095d7a6fe677fb8b8e64e98655bcc Mon Sep 17 00:00:00 2001
From: Omid Hezaveh <hezpublic@gmail.com>
Date: Mon, 8 Dec 2014 17:21:12 +0100
Subject: translation update

---
 inc/lang/fa/lang.php                      |  1 +
 lib/plugins/authad/lang/fa/settings.php   | 10 ++++++++++
 lib/plugins/authldap/lang/fa/settings.php |  2 ++
 3 files changed, 13 insertions(+)
 create mode 100644 lib/plugins/authad/lang/fa/settings.php

diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index b62acfc62..25de5c92e 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -14,6 +14,7 @@
  * @author Hamid <zarrabi@sharif.edu>
  * @author Mohamad Mehdi Habibi <habibi.esf@gmail.com>
  * @author Mohammad Sadegh <msdn2013@gmail.com>
+ * @author Omid Hezaveh <hezpublic@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
diff --git a/lib/plugins/authad/lang/fa/settings.php b/lib/plugins/authad/lang/fa/settings.php
new file mode 100644
index 000000000..161479afb
--- /dev/null
+++ b/lib/plugins/authad/lang/fa/settings.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Omid Hezaveh <hezpublic@gmail.com>
+ */
+$lang['admin_password']        = 'رمز کاربر بالایی ';
+$lang['use_ssl']               = 'از اس‌اس‌ال استفاده می‌کنید؟ در این صورت تی‌ال‌اس را در پایین فعال نکنید. ';
+$lang['use_tls']               = 'از تی‌ال‌اس استفاده می‌کنید؟ در این صورت اس‌اس‌ال را در بالا فعال نکنید. ';
diff --git a/lib/plugins/authldap/lang/fa/settings.php b/lib/plugins/authldap/lang/fa/settings.php
index 1b48da7f5..49d485afd 100644
--- a/lib/plugins/authldap/lang/fa/settings.php
+++ b/lib/plugins/authldap/lang/fa/settings.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Mohammad Sadegh <msdn2013@gmail.com>
+ * @author Omid Hezaveh <hezpublic@gmail.com>
  */
+$lang['starttls']              = 'از تی‌ال‌اس (TLS) استفاده می‌کنید؟';
 $lang['bindpw']                = 'رمزعبور کاربر بالا';
-- 
cgit v1.2.3


From 4b5834378cc09b182f926aa21a58b50842719f77 Mon Sep 17 00:00:00 2001
From: Torpedo <dgtorpedo@gmail.com>
Date: Tue, 9 Dec 2014 23:16:25 +0100
Subject: translation update

---
 inc/lang/it/lang.php                       |  8 +++++++-
 lib/plugins/authpgsql/lang/it/settings.php |  2 ++
 lib/plugins/extension/lang/it/lang.php     | 21 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 9cde9d28e..c6b99d5b5 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -20,6 +20,7 @@
  * @author Mirko <malisan.mirko@gmail.com>
  * @author Francesco <francesco.cavalli@hotmail.com>
  * @author Fabio <fabioslurp@yahoo.it>
+ * @author Torpedo <dgtorpedo@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -81,7 +82,7 @@ $lang['badpassconfirm']        = 'La password è errata';
 $lang['minoredit']             = 'Modifiche minori';
 $lang['draftdate']             = 'Bozza salvata in automatico il';
 $lang['nosecedit']             = 'La pagina è stata modificata nel frattempo; è impossibile modificare solo la sezione scelta, quindi è stata caricata la pagina intera.';
-$lang['searchcreatepage']      = "Se non hai trovato quello che cercavi, puoi creare una nuova pagina con questo titolo usando il pulsante ''Crea questa pagina''.";
+$lang['searchcreatepage']      = 'Se non hai trovato quello che cercavi, puoi creare una nuova pagina con questo titolo usando il pulsante \'\'Crea questa pagina\'\'.';
 $lang['regmissing']            = 'Devi riempire tutti i campi.';
 $lang['reguexists']            = 'Il nome utente inserito esiste già.';
 $lang['regsuccess']            = 'L\'utente è stato creato. La password è stata spedita via email.';
@@ -152,6 +153,7 @@ $lang['js']['del_confirm']     = 'Eliminare veramente questa voce?';
 $lang['js']['restore_confirm'] = 'Vuoi davvero ripristinare questa versione?';
 $lang['js']['media_diff']      = 'Guarda le differenze:';
 $lang['js']['media_diff_both'] = 'Fianco a Fianco';
+$lang['js']['media_diff_opacity'] = 'Trasparire';
 $lang['js']['media_diff_portions'] = 'rubare';
 $lang['js']['media_select']    = 'Seleziona files..';
 $lang['js']['media_upload_btn'] = 'Upload';
@@ -199,6 +201,8 @@ $lang['diff_side']             = 'Fianco a Fianco';
 $lang['diffprevrev']           = 'Revisione precedente';
 $lang['diffnextrev']           = 'Prossima revisione';
 $lang['difflastrev']           = 'Ultima revisione';
+$lang['diffbothprevrev']       = 'Entrambe le parti precedenti la revisione';
+$lang['diffbothnextrev']       = 'Entrambe le parti successive la revisione';
 $lang['line']                  = 'Linea';
 $lang['breadcrumb']            = 'Traccia:';
 $lang['youarehere']            = 'Ti trovi qui:';
@@ -296,6 +300,7 @@ Prova a estrarre di nuovo i file dal pacchetto scaricato oppure consulta le
 <a href="http://dokuwiki.org/install">istruzioni per l\'installazione di Dokuwiki</a>';
 $lang['i_funcna']              = 'La funzione PHP <code>%s</code> non è disponibile. Forse è stata disabilitata dal tuo provider per qualche motivo?';
 $lang['i_phpver']              = 'La versione di PHP <code>%s</code> è inferiore a quella richiesta <code>%s</code>. Devi aggiornare l\'installazione di PHP.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload deve essere disabilitato in php.ini per eseguire DokuWiki.';
 $lang['i_permfail']            = 'DokuWiki non può scrivere <code>%s</code>. E\' necessario correggere i permessi per questa directory!';
 $lang['i_confexists']          = '<code>%s</code> esiste già';
 $lang['i_writeerr']            = 'Impossibile creare <code>%s</code>. E\' necessario verificare i permessi della directory o del file oppure creare il file manualmente.';
@@ -348,3 +353,4 @@ $lang['media_restore']         = 'Ripristina questa versione';
 $lang['currentns']             = 'Namespace corrente';
 $lang['searchresult']          = 'Risultati della ricerca';
 $lang['plainhtml']             = 'HTML';
+$lang['page_nonexist_rev']     = 'Pagina non esistente a %s. E\' stata creata successivamente a <a href="%s">%s</a>.';
diff --git a/lib/plugins/authpgsql/lang/it/settings.php b/lib/plugins/authpgsql/lang/it/settings.php
index baf40a468..e8a40dcb2 100644
--- a/lib/plugins/authpgsql/lang/it/settings.php
+++ b/lib/plugins/authpgsql/lang/it/settings.php
@@ -4,8 +4,10 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Francesco <francesco.cavalli@hotmail.com>
+ * @author Torpedo <dgtorpedo@gmail.com>
  */
 $lang['server']                = 'Il tuo server PostgreSQL ';
 $lang['port']                  = 'La porta del tuo server PostgreSQL ';
 $lang['user']                  = 'Lo username PostgreSQL';
 $lang['database']              = 'Database da usare';
+$lang['getUsers']              = 'Dichiarazione SQL per elencare tutti gli utenti';
diff --git a/lib/plugins/extension/lang/it/lang.php b/lib/plugins/extension/lang/it/lang.php
index 7dff6c5b2..1aa658e0f 100644
--- a/lib/plugins/extension/lang/it/lang.php
+++ b/lib/plugins/extension/lang/it/lang.php
@@ -5,11 +5,18 @@
  * 
  * @author Francesco <francesco.cavalli@hotmail.com>
  * @author Fabio <fabioslurp@yahoo.it>
+ * @author Torpedo <dgtorpedo@gmail.com>
  */
+$lang['unknownauthor']         = 'Autore sconosciuto';
+$lang['unknownversion']        = 'Revisione sconosciuta';
+$lang['btn_info']              = 'Mostra maggiori informazioni';
+$lang['btn_update']            = 'Aggiorna';
+$lang['btn_uninstall']         = 'Disinstalla';
 $lang['btn_enable']            = 'Abilita';
 $lang['btn_disable']           = 'Disabilita';
 $lang['btn_install']           = 'Installa';
 $lang['btn_reinstall']         = 'Reinstalla';
+$lang['js']['reallydel']       = 'Sicuro di disinstallare questa estensione?';
 $lang['search']                = 'Cerca';
 $lang['homepage_link']         = 'Documenti';
 $lang['bugs_features']         = 'Bug';
@@ -18,13 +25,18 @@ $lang['author_hint']           = 'Cerca estensioni per questo autore';
 $lang['installed']             = 'Installato:';
 $lang['downloadurl']           = 'URL download:';
 $lang['repository']            = 'Repository';
+$lang['unknown']               = '<em>sconosciuto</em>';
 $lang['installed_version']     = 'Versione installata';
 $lang['install_date']          = 'Il tuo ultimo aggiornamento:';
 $lang['available_version']     = 'Versione disponibile:';
 $lang['compatible']            = 'Compatibile con:';
+$lang['depends']               = 'Dipende da:';
 $lang['similar']               = 'Simile a:';
+$lang['conflicts']             = 'Conflitto con:';
 $lang['donate']                = 'Simile a questo?';
+$lang['donate_action']         = 'Paga un caffè all\'autore!';
 $lang['repo_retry']            = 'Riprova';
+$lang['provides']              = 'Fornisce:';
 $lang['status']                = 'Status:';
 $lang['status_installed']      = 'installato';
 $lang['status_not_installed']  = 'non installato';
@@ -34,6 +46,15 @@ $lang['status_disabled']       = 'disabilitato';
 $lang['status_unmodifiable']   = 'inmodificabile';
 $lang['status_plugin']         = 'plugin';
 $lang['status_template']       = 'modello';
+$lang['msg_enabled']           = 'Plugin %s abilitato';
+$lang['msg_disabled']          = 'Plugin %s disabilitato';
+$lang['msg_delete_success']    = 'Estensione %s disinstallata';
+$lang['msg_plugin_install_success'] = 'Plugin %s installato con successo';
+$lang['msg_plugin_update_success'] = 'Plugin %s aggiornato con successo';
+$lang['msg_upload_failed']     = 'Caricamento del file fallito';
+$lang['missing_dependency']    = '<strong>Dipendenza mancante o disabilitata: </strong> %s';
+$lang['update_available']      = '<strong>Aggiornamento:</strong> Nuova versione %s disponibile.';
+$lang['wrong_folder']          = '<strong>Plugin non installato correttamente:</strong> rinomina la directory del plugin "%s" in "%s".';
 $lang['error_badurl']          = 'URLs deve iniziare con http o https';
 $lang['error_dircreate']       = 'Impossibile creare una cartella temporanea per ricevere il download';
 $lang['error_download']        = 'Impossibile scaricare il file: %s';
-- 
cgit v1.2.3


From 2cabdb626a8a94795a6579cdbb0f6eef0cd8dc67 Mon Sep 17 00:00:00 2001
From: Rainbow Spike <Rainbow_Spike@derpy.ru>
Date: Wed, 10 Dec 2014 11:42:56 +1000
Subject: Update mysql.conf.php.example

Fix some typos
---
 conf/mysql.conf.php.example | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/mysql.conf.php.example b/conf/mysql.conf.php.example
index c67e77c45..8337f51b4 100644
--- a/conf/mysql.conf.php.example
+++ b/conf/mysql.conf.php.example
@@ -56,7 +56,7 @@ $conf['plugin']['authmysql']['TablesToLock']= array("users", "users AS u","group
  * of the user. If the result table is empty or contains more than one
  * row, access will be denied.
  *
- * The plugin accesses the password as 'pass' so a alias might be necessary.
+ * The plugin accesses the password as 'pass' so an alias might be necessary.
  *
  * Following patters will be replaced:
  *   %{user}    user name
@@ -107,10 +107,10 @@ $conf['plugin']['authmysql']['getGroups']   = "SELECT name as `group`
 /* This statement should return a table containing all user login names
  * that meet certain filter criteria. The filter expressions will be added
  * case dependend by the plugin. At the end a sort expression will be added.
- * Important is that this list contains no double entries fo a user. Each
+ * Important is that this list contains no double entries for a user. Each
  * user name is only allowed once in the table.
  *
- * The login name will be accessed as 'user' to a alias might be neseccary.
+ * The login name will be accessed as 'user' to an alias might be neseccary.
  * No patterns will be replaced in this statement but following patters
  * will be replaced in the filter expressions:
  *   %{user}    in FilterLogin  user's login name
@@ -174,7 +174,7 @@ $conf['plugin']['authmysql']['delGroup']    = "DELETE FROM groups
                                                WHERE gid='%{gid}'";
 
 /* This statement should return the database index of a given user name.
- * The plugin will access the index with the name 'id' so a alias might be
+ * The plugin will access the index with the name 'id' so an alias might be
  * necessary.
  * following patters will be replaced:
  *   %{user}    user name
@@ -240,7 +240,7 @@ $conf['plugin']['authmysql']['delUserGroup']= "DELETE FROM usergroup
                                                AND gid='%{gid}'";
 
 /* This statement should return the database index of a given group name.
- * The plugin will access the index with the name 'id' so a alias might
+ * The plugin will access the index with the name 'id' so an alias might
  * be necessary.
  *
  * Following patters will be replaced:
-- 
cgit v1.2.3


From 7c3df9b4f9d2f084b649907bf1f6c3a71454cf9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Birk?= <sbi@eucl.dk>
Date: Wed, 10 Dec 2014 09:31:28 +0100
Subject: translation update

---
 inc/lang/da/lang.php                       | 21 ++++++++++++++++++---
 lib/plugins/authmysql/lang/da/settings.php |  4 ++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index d27f0aa39..6c169695b 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -17,6 +17,7 @@
  * @author Soren Birk <soer9648@hotmail.com>
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
  * @author soer9648 <soer9648@eucl.dk>
+ * @author Søren Birk <sbi@eucl.dk>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -61,6 +62,8 @@ $lang['btn_register']          = 'Registrér';
 $lang['btn_apply']             = 'Anvend';
 $lang['btn_media']             = 'Media Manager';
 $lang['btn_deleteuser']        = 'Fjern Min Konto';
+$lang['btn_img_backto']        = 'Tilbage til %s';
+$lang['btn_mediaManager']      = 'Vis i Media Manager';
 $lang['loggedinas']            = 'Logget ind som:';
 $lang['user']                  = 'Brugernavn';
 $lang['pass']                  = 'Adgangskode';
@@ -76,7 +79,7 @@ $lang['badpassconfirm']        = 'Kodeordet var desværre forkert';
 $lang['minoredit']             = 'Mindre ændringer';
 $lang['draftdate']             = 'Kladde automatisk gemt d.';
 $lang['nosecedit']             = 'Siden blev ændret i mellemtiden, sektions information var for gammel, hentede hele siden i stedet.';
-$lang['searchcreatepage']      = "Hvis resultaterne ikke indeholder det du søgte efter kan du oprette et nyt dokument med samme navn som søgningen ved at trykke på knappen **''[Opret dette dokument]''**.";
+$lang['searchcreatepage']      = 'Hvis resultaterne ikke indeholder det du søgte efter kan du oprette et nyt dokument med samme navn som søgningen ved at trykke på knappen **\'\'[Opret dette dokument]\'\'**.';
 $lang['regmissing']            = 'Du skal udfylde alle felter.';
 $lang['reguexists']            = 'Dette brugernavn er allerede i brug.';
 $lang['regsuccess']            = 'Du er nu oprettet som bruger. Dit adgangskode bliver sendt til dig i en e-mail.';
@@ -148,6 +151,7 @@ $lang['js']['restore_confirm'] = 'Vil du virkeligt genskabe denne version?';
 $lang['js']['media_diff']      = 'Vis forskelle:';
 $lang['js']['media_diff_both'] = 'Side ved Side';
 $lang['js']['media_diff_opacity'] = 'Skin-igennem';
+$lang['js']['media_diff_portions'] = 'Skub';
 $lang['js']['media_select']    = 'Vælg filer...';
 $lang['js']['media_upload_btn'] = 'Upload';
 $lang['js']['media_done_btn']  = 'Færdig';
@@ -191,6 +195,11 @@ $lang['difflink']              = 'Link til denne sammenlinings vising';
 $lang['diff_type']             = 'Vis forskelle:';
 $lang['diff_inline']           = 'Indeni';
 $lang['diff_side']             = 'Side ved Side';
+$lang['diffprevrev']           = 'Forrige revision';
+$lang['diffnextrev']           = 'Næste revision';
+$lang['difflastrev']           = 'Sidste revision';
+$lang['diffbothprevrev']       = 'Begge sider forrige revision';
+$lang['diffbothnextrev']       = 'Begge sider næste revision';
 $lang['line']                  = 'Linje';
 $lang['breadcrumb']            = 'Sti:';
 $lang['youarehere']            = 'Du er her:';
@@ -247,7 +256,6 @@ $lang['admin_register']        = 'Tilføj ny bruger';
 $lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Skrivning af metadata fejlede';
 $lang['metasaveok']            = 'Metadata gemt';
-$lang['btn_img_backto']            = 'Tilbage til %s';
 $lang['img_title']             = 'Titel:';
 $lang['img_caption']           = 'Billedtekst:';
 $lang['img_date']              = 'Dato:';
@@ -260,7 +268,6 @@ $lang['img_camera']            = 'Kamera:';
 $lang['img_keywords']          = 'Emneord:';
 $lang['img_width']             = 'Bredde:';
 $lang['img_height']            = 'Højde:';
-$lang['btn_mediaManager']           = 'Vis i Media Manager';
 $lang['subscr_subscribe_success'] = 'Tilføjede %s til abonnement listen for %s';
 $lang['subscr_subscribe_error'] = 'Fejl ved tilføjelse af %s til abonnement listen for %s';
 $lang['subscr_subscribe_noaddress'] = 'Der er ikke nogen addresse forbundet til din bruger, så du kan ikke blive tilføjet til abonnement listen';
@@ -290,6 +297,7 @@ Du burde enten gen-udpakke filerne fra den hentede pakke eller tjekke den fuldst
 <a href="http://dokuwiki.org/install">DokuWiki installations instruktioner</a>';
 $lang['i_funcna']              = 'PHP funtionen <code>%s</code> er ikke tilgængelig. Måske har din udbyder slået det fra af en eller anden grund?';
 $lang['i_phpver']              = 'Din PHP version <code>%s</code> er mindre en den nødvendige <code>%s</code>. Du er nød til at opgradere din PHP installation.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload skal være deaktiveret i php.ini for at køre DokuWiki.';
 $lang['i_permfail']            = 'DokuWiki kan ikke skrive til <code>%s</code>. Du er nød til at rette tilladelses indstillingerne for denne mappe!';
 $lang['i_confexists']          = '<code>%s</code> eksisterer allerede';
 $lang['i_writeerr']            = 'Kunne ikke oprette <code>%s</code>. Du bliver nød til at tjekke mappe/fil- tilladelserne og oprette filen manuelt.';
@@ -301,10 +309,12 @@ $lang['i_policy']              = 'Begyndende ACL politik';
 $lang['i_pol0']                = 'Åben Wiki (alle kan læse, skrive og uploade)';
 $lang['i_pol1']                = 'Offentlig Wiki (alle kan læse, kun registrerede brugere kan skrive og overføre)';
 $lang['i_pol2']                = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og overføre)';
+$lang['i_allowreg']            = 'Tillad at brugere kan registrere sig selv';
 $lang['i_retry']               = 'Forsøg igen';
 $lang['i_license']             = 'Vælg venligst licensen du vil tilføje dit indhold under:';
 $lang['i_license_none']        = 'Vis ikke licensinformationer';
 $lang['i_pop_field']           = 'Hjælp os venligst med at forbedre oplevelsen af DokuWiki:';
+$lang['i_pop_label']           = 'Send anonymt brugsdata til DokuWikis udviklere, én gang om måneden';
 $lang['recent_global']         = 'Du ser lige nu ændringerne i <b>%s</b> navnerummet. Du kan også <a href="%s">se de sidste ændringer for hele wiki siden </a>';
 $lang['years']                 = '%d år siden';
 $lang['months']                = '%d måned siden';
@@ -337,3 +347,8 @@ $lang['media_perm_read']       = 'Du har ikke nok rettigheder til at læse filer
 $lang['media_perm_upload']     = 'Du har ikke nok rettigheder til at uploade filer.';
 $lang['media_update']          = 'Upload ny version';
 $lang['media_restore']         = 'Genskab denne version';
+$lang['currentns']             = 'Nuværende navnerum';
+$lang['searchresult']          = 'Søgsresultat';
+$lang['plainhtml']             = 'Ren HTML';
+$lang['wikimarkup']            = 'Wiki Opmærkning';
+$lang['page_nonexist_rev']     = 'Siden blev ikke fundet ved %s. Den blev efterfølgende oprettet ved <a href="%s">%s</a>.';
diff --git a/lib/plugins/authmysql/lang/da/settings.php b/lib/plugins/authmysql/lang/da/settings.php
index 1e38cb6b4..ed21201fb 100644
--- a/lib/plugins/authmysql/lang/da/settings.php
+++ b/lib/plugins/authmysql/lang/da/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
  * @author soer9648 <soer9648@eucl.dk>
  */
@@ -11,6 +11,7 @@ $lang['user']                  = 'MySQL brugernavn';
 $lang['password']              = 'Kodeord til ovenstående bruger';
 $lang['database']              = 'Database der skal benyttes';
 $lang['charset']               = 'Tegnsæt benyttet i database';
+$lang['debug']                 = 'Vis yderligere debug output';
 $lang['checkPass']             = 'SQL-sætning til at kontrollere kodeord';
 $lang['getUserInfo']           = 'SQL-sætning til at hente brugerinformation';
 $lang['getUsers']              = 'SQL-sætning til at liste alle brugere';
@@ -21,7 +22,6 @@ $lang['delGroup']              = 'SQL-sætning til at fjerne en gruppe';
 $lang['delUser']               = 'SQL-sætning til at slette en bruger';
 $lang['delUserRefs']           = 'SQL-sætning til at fjerne en bruger fra alle grupper';
 $lang['updateUser']            = 'SQL-sætning til at opdatere en brugerprofil';
-$lang['debug']                 = 'Vis yderligere debug output';
 $lang['debug_o_0']             = 'ingen';
 $lang['debug_o_1']             = 'kun ved fejl';
 $lang['debug_o_2']             = 'alle SQL forespørgsler';
-- 
cgit v1.2.3


From 52a281e8549d1a9269ce7ced1336a567086962c5 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 10 Dec 2014 12:49:43 +0100
Subject: Some PHPDocs media and admin plugin

---
 inc/media.php         | 14 +++++++-------
 lib/plugins/admin.php | 34 ++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/inc/media.php b/inc/media.php
index c77f3f952..09bfc99ac 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -383,20 +383,20 @@ function copy_uploaded_file($from, $to){
  * (The triggered event is preventable.)
  *
  * Event data:
- * $data[0]     fn_tmp: the temporary file name (read from $_FILES)
- * $data[1]     fn: the file name of the uploaded file
- * $data[2]     id: the future directory id of the uploaded file
- * $data[3]     imime: the mimetype of the uploaded file
+ * $data[0]     fn_tmp:    the temporary file name (read from $_FILES)
+ * $data[1]     fn:        the file name of the uploaded file
+ * $data[2]     id:        the future directory id of the uploaded file
+ * $data[3]     imime:     the mimetype of the uploaded file
  * $data[4]     overwrite: if an existing file is going to be overwritten
- * $data[5]     move:
+ * $data[5]     move:      name of function that performs move/copy/..
  *
  * @triggers MEDIA_UPLOAD_FINISH
  *
  * @param array  $file
- * @param string $id
+ * @param string $id   media id
  * @param bool   $ow   overwrite?
  * @param int    $auth permission level
- * @param string $move function name
+ * @param string $move name of functions that performs move/copy/..
  * @return false|array|string
  */
 function media_save($file, $id, $ow, $auth, $move) {
diff --git a/lib/plugins/admin.php b/lib/plugins/admin.php
index d063af612..39dece453 100644
--- a/lib/plugins/admin.php
+++ b/lib/plugins/admin.php
@@ -15,10 +15,13 @@ if(!defined('DOKU_INC')) die();
 class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
 
     /**
+     * Return the text that is displayed at the main admin menu
+     * (Default localized language string 'menu' is returned, override this function for setting another name)
+     *
      * @param string $language language code
-     * @return string
+     * @return string menu string
      */
-    function getMenuText($language) {
+    public function getMenuText($language) {
         $menutext = $this->getLang('menu');
         if (!$menutext) {
             $info = $this->getInfo();
@@ -28,32 +31,47 @@ class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
     }
 
     /**
+     * Determine position in list in admin window
+     * Lower values are sorted up
+     *
      * @return int
      */
-    function getMenuSort() {
+    public function getMenuSort() {
         return 1000;
     }
 
-
-    function handle() {
+    /**
+     * Carry out required processing
+     */
+    public function handle() {
         trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
     }
 
-    function html() {
+    /**
+     * Output html of the admin page
+     */
+    public function html() {
         trigger_error('html() not implemented in '.get_class($this), E_USER_WARNING);
     }
 
     /**
+     * Return true for access only by admins (config:superuser) or false if managers are allowed as well
+     *
      * @return bool
      */
-    function forAdminOnly() {
+    public function forAdminOnly() {
         return true;
     }
 
     /**
+     * Return array with ToC items. Items can be created with the html_mktocitem()
+     *
+     * @see html_mktocitem()
+     * @see tpl_toc()
+     *
      * @return array
      */
-    function getTOC(){
+    public function getTOC(){
         return array();
     }
 }
-- 
cgit v1.2.3


From 7b909d5e68cfee08dd85a3f28a2bdc9d6f41aaff Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 10 Dec 2014 21:24:29 +0100
Subject: Extendable config cascade for userstyles and userscript

Added user*.less files to config
---
 inc/config_cascade.php | 10 +++++-----
 lib/exe/css.php        |  8 +++++---
 lib/exe/js.php         |  6 ++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index 1d9f67edb..a6dfadc80 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -49,13 +49,13 @@ $config_cascade = array_merge(
             'local'     => array(DOKU_CONF . 'wordblock.local.conf'),
         ),
         'userstyle' => array(
-            'screen'    => DOKU_CONF . 'userstyle.css',
-            'print'     => DOKU_CONF . 'userprint.css',
-            'feed'      => DOKU_CONF . 'userfeed.css',
-            'all'       => DOKU_CONF . 'userall.css',
+            'screen'    => array(DOKU_CONF . 'userstyle.css', DOKU_CONF . 'userstyle.less'),
+            'print'     => array(DOKU_CONF . 'userprint.css', DOKU_CONF . 'userprint.less'),
+            'feed'      => array(DOKU_CONF . 'userfeed.css', DOKU_CONF . 'userfeed.less'),
+            'all'       => array(DOKU_CONF . 'userall.css', DOKU_CONF . 'userall.less')
         ),
         'userscript' => array(
-            'default'   => DOKU_CONF . 'userscript.js'
+            'default'   => array(DOKU_CONF . 'userscript.js')
         ),
         'acl' => array(
             'default'   => DOKU_CONF . 'acl.auth.php',
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 77674d251..b1065f518 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -52,7 +52,7 @@ function css_out(){
 
     // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
     if (isset($config_cascade['userstyle']['default'])) {
-        $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
+        $config_cascade['userstyle']['screen'] = array($config_cascade['userstyle']['default']);
     }
 
     // cache influencers
@@ -82,8 +82,10 @@ function css_out(){
             $files[$mediatype] = array_merge($files[$mediatype], $styleini['stylesheets'][$mediatype]);
         }
         // load user styles
-        if(isset($config_cascade['userstyle'][$mediatype])){
-            $files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE;
+        if(!empty($config_cascade['userstyle'][$mediatype])) {
+            foreach($config_cascade['userstyle'][$mediatype] as $userstyle) {
+                $files[$mediatype][$userstyle] = DOKU_BASE;
+            }
         }
 
         $cache_files = array_merge($cache_files, array_keys($files[$mediatype]));
diff --git a/lib/exe/js.php b/lib/exe/js.php
index ec236e98f..793104e81 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -72,8 +72,10 @@ function js_out(){
 
     // add possible plugin scripts and userscript
     $files   = array_merge($files,js_pluginscripts());
-    if(isset($config_cascade['userscript']['default'])){
-        $files[] = $config_cascade['userscript']['default'];
+    if(!empty($config_cascade['userscript']['default'])) {
+        foreach($config_cascade['userscript']['default'] as $userscript) {
+            $files[] = $userscript;
+        }
     }
 
     $cache_files = array_merge($files, getConfigFiles('main'));
-- 
cgit v1.2.3


From 85c59bdbad852d23519e5f77c0e2d7f7ec60121f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Birk?= <soer9648@eucl.dk>
Date: Thu, 11 Dec 2014 11:15:57 +0100
Subject: translation update

---
 inc/lang/da/lang.php                       |  1 +
 lib/plugins/extension/lang/da/lang.php     | 24 ++++++++++++++++++++++++
 lib/plugins/usermanager/lang/da/import.txt |  9 +++++++++
 lib/plugins/usermanager/lang/da/lang.php   |  2 ++
 4 files changed, 36 insertions(+)
 create mode 100644 lib/plugins/extension/lang/da/lang.php
 create mode 100644 lib/plugins/usermanager/lang/da/import.txt

diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 6c169695b..3b353d50c 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -18,6 +18,7 @@
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
  * @author soer9648 <soer9648@eucl.dk>
  * @author Søren Birk <sbi@eucl.dk>
+ * @author Søren Birk <soer9648@eucl.dk>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/extension/lang/da/lang.php b/lib/plugins/extension/lang/da/lang.php
new file mode 100644
index 000000000..c341bc5f9
--- /dev/null
+++ b/lib/plugins/extension/lang/da/lang.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Søren Birk <soer9648@eucl.dk>
+ */
+$lang['update_available']      = '<strong>Opdatering:</strong> Ny version %s er tilgængelig.';
+$lang['wrong_folder']          = '<strong>Plugin ikke installeret korrekt:</strong> Omdøb plugin-mappe "%s" til "%s".';
+$lang['url_change']            = '<strong>URL ændret:</strong> Download-URL er blevet ændret siden sidste download. Kontrollér om den nye URL er valid, inden udvidelsen opdateres.<br />Ny: %s<br />Gammel: %s';
+$lang['error_badurl']          = 'URL\'er skal starte med http eller https';
+$lang['error_dircreate']       = 'Ikke i stand til at oprette midlertidig mappe til modtagelse af download';
+$lang['error_download']        = 'Ikke i stand til at downloade filen: %s';
+$lang['error_decompress']      = 'Ikke i stand til at dekomprimere den downloadede fil. Dette kan være et resultat af en dårlig download, hvor du i så fald bør du prøve igen; eller komprimeringsformatet kan være ukendt, hvor du i så fald bliver nød til at downloade og installere manuelt.';
+$lang['error_findfolder']      = 'Ikke i stand til at identificere udvidelsesmappe - du bliver nød til at downloade og installere manuelt.';
+$lang['error_copy']            = 'Der opstod en kopieringsfejl under installation af filer til mappen <em>%s</em>: disken kan være fuld, eller mangel på fil-tilladelser. Dette kan have resulteret i et delvist installeret plugin, og efterladt din wiki-installation ustabil.';
+$lang['noperms']               = 'Udvidelsesmappe er ikke skrivbar';
+$lang['notplperms']            = 'Skabelonmappe er ikke skrivbar';
+$lang['nopluginperms']         = 'Pluginmappe er ikke skrivbar';
+$lang['git']                   = 'Udvidelsen blev installeret via git - du vil muligvis ikke opdatere herfra.';
+$lang['auth']                  = 'Auth-plugin er ikke aktiveret i konfigurationen - overvej at deaktivere den.';
+$lang['install_url']           = 'Installér fra URL:';
+$lang['install_upload']        = 'Upload Udvidelse:';
+$lang['repo_error']            = 'Plugin-arkivet kunne ikke kontaktes. Kontrollér at din server kan kontakte www.dokuwiki.org kontrollér dine proxy-indstillinger.';
diff --git a/lib/plugins/usermanager/lang/da/import.txt b/lib/plugins/usermanager/lang/da/import.txt
new file mode 100644
index 000000000..8ff1946b8
--- /dev/null
+++ b/lib/plugins/usermanager/lang/da/import.txt
@@ -0,0 +1,9 @@
+===== Samling af Brugere Import =====
+
+Kræver en CSV-fil med brugere på mindst fire kolonner.
+Kolonnerne skal indeholde, i denne orden: bruger-id, fulde navn, email-adresse og grupper.
+CSV-felterne skal separeres af kommaer (,) og strengafgrænser med anførelsestegn (%%""%%). Backslash (\) kan benyttes som "escape character".
+For et eksempel på en brugbar fil, kan du prøve "Eksportér Brugere"-funktionen her over.  
+Overlappende bruger-id'er bliver ignoreret.
+
+En adgangskode vil blive genereret og sendt til hver succesfuldt importeret bruger.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/da/lang.php b/lib/plugins/usermanager/lang/da/lang.php
index 47d7efea2..795024f89 100644
--- a/lib/plugins/usermanager/lang/da/lang.php
+++ b/lib/plugins/usermanager/lang/da/lang.php
@@ -13,6 +13,7 @@
  * @author Michael Pedersen subben@gmail.com
  * @author Mikael Lyngvig <mikael@lyngvig.org>
  * @author soer9648 <soer9648@eucl.dk>
+ * @author Søren Birk <soer9648@eucl.dk>
  */
 $lang['menu']                  = 'Brugerstyring';
 $lang['noauth']                = '(Brugervalidering er ikke tilgængelig)';
@@ -72,3 +73,4 @@ $lang['import_error_upload']   = 'Import Fejlet. CSV-filen kunne ikke uploades e
 $lang['import_error_readfail'] = 'Import Fejlet. Ikke muligt at læse uploadede fil.';
 $lang['import_error_create']   = 'Ikke muligt at oprette brugeren';
 $lang['import_notify_fail']    = 'Notifikationsmeddelelse kunne ikke sendes for importerede bruger %s, med emailen %s.';
+$lang['import_downloadfailures'] = 'Download Fejl som CSV til rettelser';
-- 
cgit v1.2.3


From f7dbf1759d3f9a578d8d84bda58bda7777ee7365 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 20:21:44 +0100
Subject: scroll to current page when opening the sitemap

---
 inc/html.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/inc/html.php b/inc/html.php
index 711cd8db6..cdcd166d9 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -937,8 +937,14 @@ function html_list_index($item){
  * @return string html
  */
 function html_li_index($item){
+    global $INFO;
+
     if($item['type'] == "f"){
-        return '<li class="level'.$item['level'].'">';
+        // scroll to the current item
+        if($item['id'] == $INFO['id']) {
+            $id = ' id="scroll__here"';
+        }
+        return '<li class="level'.$item['level'].'" '.$id.'>';
     }elseif($item['open']){
         return '<li class="open">';
     }else{
-- 
cgit v1.2.3


From 5d08913b298bd6d6e96941214d048e58f9dcf1b2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 20:22:03 +0100
Subject: animate automatic scrolls and don't scroll to border

This adds a subtle animation effect when scrolling to the #scroll__here
behaviour ID. It also adds a 100px offset to make the object not stick
to the browser border.
---
 lib/scripts/behaviour.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index 6b46add07..707f1c185 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -64,7 +64,9 @@ var dw_behaviour = {
     scrollToMarker: function(){
         var $obj = jQuery('#scroll__here');
         if($obj.length) {
-            $obj[0].scrollIntoView();
+            jQuery('html, body').animate({
+                scrollTop: $obj.offset().top - 100
+            }, 500);
         }
     },
 
-- 
cgit v1.2.3


From 7326f9142d48853ebe5d362541c0eaa78d4c34e1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 20:27:07 +0100
Subject: fade out search hit colorization

---
 lib/scripts/behaviour.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index 707f1c185..16676959e 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -79,13 +79,11 @@ var dw_behaviour = {
 
     /**
      * Remove all search highlighting when clicking on a highlighted term
-     *
-     * @FIXME would be nice to have it fade out
      */
     removeHighlightOnClick: function(){
         jQuery('span.search_hit').click(
             function(e){
-                jQuery(e.target).removeClass('search_hit');
+                jQuery(e.target).removeClass('search_hit', 1000);
             }
         );
     },
-- 
cgit v1.2.3


From 4063422b2ff7e6a9d56d7335cfdd2a8c87f49132 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 20:41:46 +0100
Subject: offsets are not available for hidden elements

---
 lib/scripts/behaviour.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index 16676959e..9a2cbaf13 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -64,9 +64,14 @@ var dw_behaviour = {
     scrollToMarker: function(){
         var $obj = jQuery('#scroll__here');
         if($obj.length) {
-            jQuery('html, body').animate({
-                scrollTop: $obj.offset().top - 100
-            }, 500);
+            if($obj.offset().top != 0) {
+                jQuery('html, body').animate({
+                    scrollTop: $obj.offset().top - 100
+                }, 500);
+            } else {
+                // hidden object have no offset but can still be scrolled into view
+                $obj[0].scrollIntoView();
+            }
         }
     },
 
-- 
cgit v1.2.3


From 6fa4721ac57074f958b12cf2cf28a489f24e89e1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 20:51:55 +0100
Subject: add new behaviour: bounce

Add the class .bounce to any element to let it bounce slightly for 2
seconds. This is useful to make the user aware of some element. Can be
combined with #scroll__here when a long list auto scrolls to a certain
item.
---
 inc/html.php             | 6 +++++-
 lib/scripts/behaviour.js | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/inc/html.php b/inc/html.php
index cdcd166d9..87affd47b 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -939,12 +939,16 @@ function html_list_index($item){
 function html_li_index($item){
     global $INFO;
 
+    $class = '';
+    $id = '';
+
     if($item['type'] == "f"){
         // scroll to the current item
         if($item['id'] == $INFO['id']) {
             $id = ' id="scroll__here"';
+            $class = ' bounce';
         }
-        return '<li class="level'.$item['level'].'" '.$id.'>';
+        return '<li class="level'.$item['level'].$class.'" '.$id.'>';
     }elseif($item['open']){
         return '<li class="open">';
     }else{
diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index 9a2cbaf13..fb61f6e48 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -56,6 +56,8 @@ var dw_behaviour = {
         jQuery(document).on('click','#page__revisions input[type=checkbox]',
             dw_behaviour.revisionBoxHandler
         );
+
+        jQuery('.bounce').effect('bounce', {times:10}, 2000 );
     },
 
     /**
-- 
cgit v1.2.3


From 1ec86040f8d873bffe71d0acacf7e9750804f0f4 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 21:19:10 +0100
Subject: check for SSL support in the extension manager

---
 lib/plugins/extension/admin.php        | 4 ++++
 lib/plugins/extension/lang/en/lang.php | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php
index de4992937..71257cf43 100644
--- a/lib/plugins/extension/admin.php
+++ b/lib/plugins/extension/admin.php
@@ -54,6 +54,10 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin {
             msg($this->getLang('repo_error').' [<a href="'.$url.'">'.$this->getLang('repo_retry').'</a>]', -1);
         }
 
+        if(!in_array('ssl', stream_get_transports())) {
+            msg($this->getLang('nossl'), -1);
+        }
+
         /* @var helper_plugin_extension_extension $extension */
         $extension = $this->loadHelper('extension_extension');
 
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index d7541b422..f545b6da3 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -100,4 +100,5 @@ $lang['auth']                         = 'This auth plugin is not enabled in conf
 $lang['install_url']                  = 'Install from URL:';
 $lang['install_upload']               = 'Upload Extension:';
 
-$lang['repo_error']                   = 'The plugin repository could not be contacted. Make sure your server is allowed to contact www.dokuwiki.org and check your proxy settings.';
\ No newline at end of file
+$lang['repo_error']                   = 'The plugin repository could not be contacted. Make sure your server is allowed to contact www.dokuwiki.org and check your proxy settings.';
+$lang['nossl']                        = 'Your PHP seems to miss SSL support. Downloading will not work for many DokuWiki extensions.';
\ No newline at end of file
-- 
cgit v1.2.3


From dc193bd914e6c9cd3d0d1df7e171d38e8da407e5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 21:35:04 +0100
Subject: prefer TLS for SSL Tunnel connections #915

---
 inc/HTTPClient.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 2e991b52f..4112932c4 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -589,7 +589,13 @@ class HTTPClient {
 
         $this->_debug('SSL Tunnel Response',$r_headers);
         if(preg_match('/^HTTP\/1\.[01] 200/i',$r_headers)){
-            if (stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) {
+            // Try a TLS connection first
+            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+                $requesturl = $requestinfo['path'];
+                return true;
+            }
+            // Fall back to SSLv3
+            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) {
                 $requesturl = $requestinfo['path'];
                 return true;
             }
-- 
cgit v1.2.3


From 4343d40d6272b3148e99369d2f16d60f90c835a5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 23:39:21 +0100
Subject: set correct peer name when connecting through a SSL tunnel proxy

---
 inc/HTTPClient.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 4112932c4..c791b7f4a 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -589,6 +589,9 @@ class HTTPClient {
 
         $this->_debug('SSL Tunnel Response',$r_headers);
         if(preg_match('/^HTTP\/1\.[01] 200/i',$r_headers)){
+            // set correct peer name for verification (enabled since PHP 5.6)
+            stream_context_set_option($socket, 'ssl', 'peer_name', $requestinfo['host']);
+
             // Try a TLS connection first
             if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
                 $requesturl = $requestinfo['path'];
-- 
cgit v1.2.3


From 998b0963abafd76df93b4faad0b54fe396e01abd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 11 Dec 2014 23:55:49 +0100
Subject: use phpunit 4.3.5 until bug is fixed

See here for upstream report:
https://github.com/sebastianbergmann/phpunit/issues/1523
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9c3193d19..b5953fd44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,4 +14,7 @@ notifications:
         - "chat.freenode.net#dokuwiki"
     on_success: change
     on_failure: change
-script: cd _test && phpunit --verbose --stderr
+install:
+  - wget https://phar.phpunit.de/phpunit-4.3.5.phar -O _test/phpunit
+  - chmod 755 _test/phpunit
+script: cd _test && ./phpunit --verbose --stderr
-- 
cgit v1.2.3


From db0a9e62656f4b0ceff83c6b8fd55e306e496a1b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 12 Dec 2014 00:06:08 +0100
Subject: travis config. 5.6 is released and test is fixed

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b5953fd44..0bef94048 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,6 @@ php:
   - "5.5"
   - "5.4"
   - "5.3"
-# PHP 5.6 is not yet released, allow failures
-matrix:
-  allow_failures:
-    - php: "5.6"
 notifications:
   irc:
     channels:
-- 
cgit v1.2.3


From c05ef534171135f4252fa0feed5466a75435b97a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 12 Dec 2014 01:30:38 +0100
Subject: seems we need to do SSL/TLS checks the other way round

---
 inc/HTTPClient.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index c791b7f4a..76d973c38 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -592,13 +592,15 @@ class HTTPClient {
             // set correct peer name for verification (enabled since PHP 5.6)
             stream_context_set_option($socket, 'ssl', 'peer_name', $requestinfo['host']);
 
-            // Try a TLS connection first
-            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+            // Because of older PHP versions having trouble with TLS (enable_crypto returns true, but
+            // the conection still borks) we try SSLv3 first
+            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) {
                 $requesturl = $requestinfo['path'];
                 return true;
             }
-            // Fall back to SSLv3
-            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) {
+
+            // If the proxy does not support SSLv3 we try TLS
+            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
                 $requesturl = $requestinfo['path'];
                 return true;
             }
-- 
cgit v1.2.3


From 903f0494e8d0b7fbbda7072ee9fa8aef2ea72cb1 Mon Sep 17 00:00:00 2001
From: Satoshi Sahara <sahara.satoshi@gmail.com>
Date: Fri, 12 Dec 2014 11:41:28 +0100
Subject: translation update

---
 inc/lang/ja/lang.php                   | 2 ++
 lib/plugins/extension/lang/ja/lang.php | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 30068d782..3a5f169e7 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -344,3 +344,5 @@ $lang['currentns']             = '現在の名前空間';
 $lang['searchresult']          = '検索結果';
 $lang['plainhtml']             = 'プレーンHTML';
 $lang['wikimarkup']            = 'Wikiマークアップ';
+$lang['page_nonexist_rev']     = '指定ページ %s はありません。このリンク <a href="%s">%s</a> から作成できます。';
+$lang['unable_to_parse_date']  = 'パラメータ "%s" を処理できません。';
diff --git a/lib/plugins/extension/lang/ja/lang.php b/lib/plugins/extension/lang/ja/lang.php
index dec46d629..5264bfb09 100644
--- a/lib/plugins/extension/lang/ja/lang.php
+++ b/lib/plugins/extension/lang/ja/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Hideaki SAWADA <chuno@live.jp>
  * @author PzF_X <jp_minecraft@yahoo.co.jp>
+ * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  */
 $lang['menu']                  = '拡張機能管理';
 $lang['tab_plugins']           = 'インストール済プラグイン';
@@ -63,6 +64,7 @@ $lang['status_bundled']        = '同梱';
 $lang['msg_enabled']           = '%s プラグインを有効化しました。';
 $lang['msg_disabled']          = '%s プラグインを無効化しました。';
 $lang['msg_delete_success']    = '拡張機能をアンインストールしました。';
+$lang['msg_delete_failed']     = '拡張機能 %s のアンインストールに失敗しました。';
 $lang['msg_template_install_success'] = '%s テンプレートをインストールできました。';
 $lang['msg_template_update_success'] = '%s テンプレートを更新できました。';
 $lang['msg_plugin_install_success'] = '%s プラグインをインストールできました。';
@@ -84,6 +86,8 @@ $lang['noperms']               = '拡張機能ディレクトリが書き込み
 $lang['notplperms']            = 'テンプレートディレクトリが書き込み不可です。';
 $lang['nopluginperms']         = 'プラグインディレクトリが書き込み不可です。';
 $lang['git']                   = 'この拡張機能は Git 経由でインストールされており、ここで更新すべきでないかもしれません。';
+$lang['auth']                  = 'この認証プラグインは設定管理画面で無効化されています。';
 $lang['install_url']           = 'URL からインストール：';
 $lang['install_upload']        = '拡張機能をアップロード：';
 $lang['repo_error']            = 'プラグインのリポジトリに接続できません。サーバーが www.dokuwiki.org に接続できることやプロキシの設定を確認して下さい。';
+$lang['nossl']                 = 'PHP機能がSSLをサポートしていないため、拡張機能のダウンロードが正常に動作しません。';
-- 
cgit v1.2.3


From ab6ac843b05c4030087d58182c1bcea3dcc4e0af Mon Sep 17 00:00:00 2001
From: Jussi Takala <jussi.takala@live.fi>
Date: Fri, 12 Dec 2014 12:15:55 +0100
Subject: translation update

---
 inc/lang/fi/lang.php                       |  7 +++---
 lib/plugins/authmysql/lang/fi/settings.php | 11 +++++++++
 lib/plugins/extension/lang/fi/lang.php     | 37 ++++++++++++++++++++++++++++++
 lib/plugins/usermanager/lang/fi/lang.php   | 10 ++++++++
 4 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 lib/plugins/authmysql/lang/fi/settings.php
 create mode 100644 lib/plugins/extension/lang/fi/lang.php

diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 4856efe33..6202ca5b4 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -9,6 +9,7 @@
  * @author Teemu Mattila <ghcsystems@gmail.com>
  * @author Sami Olmari <sami@olmari.fi>
  * @author Rami Lehti <rammer@ipi.fi>
+ * @author Jussi Takala <jussi.takala@live.fi>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -53,6 +54,8 @@ $lang['btn_register']          = 'Rekisteröidy';
 $lang['btn_apply']             = 'Toteuta';
 $lang['btn_media']             = 'Media manager';
 $lang['btn_deleteuser']        = 'Poista tilini';
+$lang['btn_img_backto']        = 'Takaisin %s';
+$lang['btn_mediaManager']      = 'Näytä mediamanagerissa';
 $lang['loggedinas']            = 'Kirjautunut nimellä:';
 $lang['user']                  = 'Käyttäjänimi';
 $lang['pass']                  = 'Salasana';
@@ -68,7 +71,7 @@ $lang['badpassconfirm']        = 'Valitan. Salasana oli väärin';
 $lang['minoredit']             = 'Pieni muutos';
 $lang['draftdate']             = 'Luonnos tallennettu automaattisesti';
 $lang['nosecedit']             = 'Sivu on muuttunut välillä ja kappaleen tiedot olivat vanhentuneet. Koko sivu ladattu.';
-$lang['searchcreatepage']      = "Jos et löytänyt etsimääsi voit luoda uuden sivun tiedustelusi pohjalta käyttämällä ''Muokkaa tätä sivua'' -napilla.";
+$lang['searchcreatepage']      = 'Jos et löytänyt etsimääsi voit luoda uuden sivun tiedustelusi pohjalta käyttämällä \'\'Muokkaa tätä sivua\'\' -napilla.';
 $lang['regmissing']            = 'Kaikki kentät tulee täyttää.';
 $lang['reguexists']            = 'Käyttäjä tällä käyttäjänimellä on jo olemassa.';
 $lang['regsuccess']            = 'Käyttäjä luotiin ja salasana lähetettiin sähköpostilla.';
@@ -241,7 +244,6 @@ $lang['admin_register']        = 'Lisää uusi käyttäjä';
 $lang['metaedit']              = 'Muokkaa metadataa';
 $lang['metasaveerr']           = 'Metadatan kirjoittaminen epäonnistui';
 $lang['metasaveok']            = 'Metadata tallennettu';
-$lang['btn_img_backto']            = 'Takaisin %s';
 $lang['img_title']             = 'Otsikko:';
 $lang['img_caption']           = 'Kuvateksti:';
 $lang['img_date']              = 'Päivämäärä:';
@@ -254,7 +256,6 @@ $lang['img_camera']            = 'Kamera:';
 $lang['img_keywords']          = 'Avainsanat:';
 $lang['img_width']             = 'Leveys:';
 $lang['img_height']            = 'Korkeus:';
-$lang['btn_mediaManager']           = 'Näytä mediamanagerissa';
 $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle';
 $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s';
 $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen';
diff --git a/lib/plugins/authmysql/lang/fi/settings.php b/lib/plugins/authmysql/lang/fi/settings.php
new file mode 100644
index 000000000..32517957b
--- /dev/null
+++ b/lib/plugins/authmysql/lang/fi/settings.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Jussi Takala <jussi.takala@live.fi>
+ */
+$lang['server']                = 'Sinun MySQL-serveri';
+$lang['user']                  = 'MySQL-käyttäjänimi';
+$lang['password']              = 'Salasana yläolevalle käyttäjälle';
+$lang['charset']               = 'Käytetty merkistö tietokannassa';
diff --git a/lib/plugins/extension/lang/fi/lang.php b/lib/plugins/extension/lang/fi/lang.php
new file mode 100644
index 000000000..a154f2563
--- /dev/null
+++ b/lib/plugins/extension/lang/fi/lang.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Jussi Takala <jussi.takala@live.fi>
+ */
+$lang['tab_plugins']           = 'Asennetut liitännäiset';
+$lang['tab_search']            = 'Etsi ja asenna';
+$lang['tab_install']           = 'Manuaalinen asennus';
+$lang['notimplemented']        = 'Tätä ominaisuutta ei ole vielä toteutettu';
+$lang['notinstalled']          = 'Tätä laajennusta ei ole asennettu';
+$lang['alreadyenabled']        = 'Tämä laajennus on jo käytössä';
+$lang['alreadydisabled']       = 'Tämä laajennus on jo otettu pois käytöstä';
+$lang['pluginlistsaveerror']   = 'Tapahtui virhe tallentaessa liitännäislistaa';
+$lang['unknownauthor']         = 'Tuntematon tekijä';
+$lang['unknownversion']        = 'Tuntematon versio';
+$lang['btn_info']              = 'Näytä lisää tietoa';
+$lang['btn_update']            = 'Päivitä';
+$lang['btn_enable']            = 'Ota käyttöön';
+$lang['btn_disable']           = 'Poista käytöstä';
+$lang['btn_install']           = 'Asenna';
+$lang['btn_reinstall']         = 'Uudelleenasenna';
+$lang['js']['reallydel']       = 'Haluatko varmasti poistaa tämän laajennuksen?';
+$lang['search_for']            = 'Etsi laajennusta:';
+$lang['search']                = 'Etsi';
+$lang['downloadurl']           = 'Lataa URL-osoite';
+$lang['installed_version']     = 'Asennettu versio';
+$lang['install_date']          = 'Sinun viimeinen päivitys:';
+$lang['available_version']     = 'Saatavissa oleva versio:';
+$lang['status_installed']      = 'asennettu';
+$lang['status_protected']      = 'suojattu';
+$lang['status_enabled']        = 'otettu käyttöön';
+$lang['status_disabled']       = 'otettu pois käytöstä';
+$lang['status_plugin']         = 'liitännäinen';
+$lang['install_url']           = 'Asenna URL-osoitteesta:';
+$lang['install_upload']        = 'Ladattu laajennus:';
diff --git a/lib/plugins/usermanager/lang/fi/lang.php b/lib/plugins/usermanager/lang/fi/lang.php
index de243133a..dba67fb61 100644
--- a/lib/plugins/usermanager/lang/fi/lang.php
+++ b/lib/plugins/usermanager/lang/fi/lang.php
@@ -7,6 +7,7 @@
  * @author Otto Vainio <otto@valjakko.net>
  * @author Teemu Mattila <ghcsystems@gmail.com>
  * @author Sami Olmari <sami@olmari.fi>
+ * @author Jussi Takala <jussi.takala@live.fi>
  */
 $lang['menu']                  = 'Käyttäjähallinta';
 $lang['noauth']                = '(autentikointi ei ole käytössä)';
@@ -29,6 +30,9 @@ $lang['search']                = 'Hae';
 $lang['search_prompt']         = 'Tee haku';
 $lang['clear']                 = 'Tyhjennä hakusuodatin';
 $lang['filter']                = 'Suodatin';
+$lang['import']                = 'Tuo uusia käyttäjiä';
+$lang['line']                  = 'Rivi nro.';
+$lang['error']                 = 'Vikailmoitus';
 $lang['summary']               = 'Näytetään käyttäjät %1$d-%2$d / %3$d löytynyttä. %4$d käyttäjää yhteensä.';
 $lang['nonefound']             = 'Ei löytynyt käyttäjiä. %d käyttäjää yhteensä.';
 $lang['delete_ok']             = '%d käyttäjää poistettu';
@@ -49,3 +53,9 @@ $lang['add_ok']                = 'Käyttäjä lisätty onnistuneesti';
 $lang['add_fail']              = 'Käyttäjän lisäys epäonnistui';
 $lang['notify_ok']             = 'Ilmoitus sähköpostilla lähetetty';
 $lang['notify_fail']           = 'Ilmoitusta sähköpostilla ei voitu lähettää';
+$lang['import_error_baduserid'] = 'Käyttäjätunnus puuttuu';
+$lang['import_error_badname']  = 'Epäkelpo nimi';
+$lang['import_error_badmail']  = 'Epäkelpo sähköpostiosoite';
+$lang['import_error_upload']   = 'Tuonti epäonnistui. CSV-tiedostoa ei voitu ladata tai se on tyhjä.';
+$lang['import_error_readfail'] = 'Tuonti epäonnistui. Ladattua tiedostoa ei voida lukea.';
+$lang['import_error_create']   = 'Käyttäjää ei voida luoda.';
-- 
cgit v1.2.3


From a4e7bbef96590a3ecf21203e7d67f2cff0da4484 Mon Sep 17 00:00:00 2001
From: Jussi Takala <jussi.takala@live.fi>
Date: Fri, 12 Dec 2014 12:20:53 +0100
Subject: translation update

---
 inc/lang/fi/lang.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 4856efe33..9bf4aad19 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -9,6 +9,7 @@
  * @author Teemu Mattila <ghcsystems@gmail.com>
  * @author Sami Olmari <sami@olmari.fi>
  * @author Rami Lehti <rammer@ipi.fi>
+ * @author Jussi Takala <jussi.takala@live.fi>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -53,6 +54,8 @@ $lang['btn_register']          = 'Rekisteröidy';
 $lang['btn_apply']             = 'Toteuta';
 $lang['btn_media']             = 'Media manager';
 $lang['btn_deleteuser']        = 'Poista tilini';
+$lang['btn_img_backto']        = 'Takaisin %s';
+$lang['btn_mediaManager']      = 'Näytä mediamanagerissa';
 $lang['loggedinas']            = 'Kirjautunut nimellä:';
 $lang['user']                  = 'Käyttäjänimi';
 $lang['pass']                  = 'Salasana';
@@ -68,7 +71,7 @@ $lang['badpassconfirm']        = 'Valitan. Salasana oli väärin';
 $lang['minoredit']             = 'Pieni muutos';
 $lang['draftdate']             = 'Luonnos tallennettu automaattisesti';
 $lang['nosecedit']             = 'Sivu on muuttunut välillä ja kappaleen tiedot olivat vanhentuneet. Koko sivu ladattu.';
-$lang['searchcreatepage']      = "Jos et löytänyt etsimääsi voit luoda uuden sivun tiedustelusi pohjalta käyttämällä ''Muokkaa tätä sivua'' -napilla.";
+$lang['searchcreatepage']      = 'Jos et löytänyt etsimääsi voit luoda uuden sivun tiedustelusi pohjalta käyttämällä \'\'Muokkaa tätä sivua\'\' -napilla.';
 $lang['regmissing']            = 'Kaikki kentät tulee täyttää.';
 $lang['reguexists']            = 'Käyttäjä tällä käyttäjänimellä on jo olemassa.';
 $lang['regsuccess']            = 'Käyttäjä luotiin ja salasana lähetettiin sähköpostilla.';
@@ -185,6 +188,9 @@ $lang['difflink']              = 'Linkki vertailunäkymään';
 $lang['diff_type']             = 'Näytä eroavaisuudet:';
 $lang['diff_inline']           = 'Sisäkkäin';
 $lang['diff_side']             = 'Vierekkäin';
+$lang['diffprevrev']           = 'Edellinen revisio';
+$lang['diffnextrev']           = 'Seuraava revisio';
+$lang['difflastrev']           = 'Viimeisin revisio';
 $lang['line']                  = 'Rivi';
 $lang['breadcrumb']            = 'Jäljet:';
 $lang['youarehere']            = 'Olet täällä:';
@@ -241,7 +247,6 @@ $lang['admin_register']        = 'Lisää uusi käyttäjä';
 $lang['metaedit']              = 'Muokkaa metadataa';
 $lang['metasaveerr']           = 'Metadatan kirjoittaminen epäonnistui';
 $lang['metasaveok']            = 'Metadata tallennettu';
-$lang['btn_img_backto']            = 'Takaisin %s';
 $lang['img_title']             = 'Otsikko:';
 $lang['img_caption']           = 'Kuvateksti:';
 $lang['img_date']              = 'Päivämäärä:';
@@ -254,7 +259,6 @@ $lang['img_camera']            = 'Kamera:';
 $lang['img_keywords']          = 'Avainsanat:';
 $lang['img_width']             = 'Leveys:';
 $lang['img_height']            = 'Korkeus:';
-$lang['btn_mediaManager']           = 'Näytä mediamanagerissa';
 $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle';
 $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s';
 $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen';
@@ -282,6 +286,7 @@ $lang['i_problems']            = 'Asennusohjelma löysi alla listattuja ongelmia
 $lang['i_modified']            = 'Turvallisuussyistä tämä ohjelma toimii vain uusien ja muokkaamattomien Dokuwiki-asennusten kanssa. Pura tiedostot uudestaan asennuspaketista, tai lue <a href="http://dokuwiki.org/install">Dokuwikin asennusohje (englanniksi)</a>';
 $lang['i_funcna']              = 'PHP:n funktio <code>%s</code> ei ole käytettävissä. Palveluntarjoajasi on saattanut poistaa sen jostain syystä.';
 $lang['i_phpver']              = 'Käyttämäsi PHP-ohjelmiston versio <code>%s</code> on pienempi, kuin tarvitaan <code>%s</code>. PHP-asennuksesi pitää päivittää.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload pitää ottaa pois käytöstä php.ini -tiedostosta käyttääksesi DokuWikiä';
 $lang['i_permfail']            = '<code>%s</code> ei ole DokuWikin kirjoitettavissa. Muokkaa hakemiston oikeuksia!';
 $lang['i_confexists']          = '<code>%s</code> on jo olemassa';
 $lang['i_writeerr']            = '<code>%s</code>n luonti epäonnistui. Tarkista hakemiston/tiedoston oikeudet ja luo tiedosto käsin.';
@@ -335,3 +340,4 @@ $lang['currentns']             = 'Nykyinen nimiavaruus';
 $lang['searchresult']          = 'Haun tulokset';
 $lang['plainhtml']             = 'pelkkä HTML';
 $lang['wikimarkup']            = 'Wiki markup';
+$lang['unable_to_parse_date']  = 'Parametrin "%s" jäsennys ei onnistu.';
-- 
cgit v1.2.3


From 4645078a2700c1e5e5fe989d5e45ca4d79bc5279 Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Fri, 12 Dec 2014 13:16:14 +0100
Subject: translation update

---
 inc/lang/cs/lang.php                     | 2 +-
 lib/plugins/extension/lang/cs/lang.php   | 7 +++++++
 lib/plugins/usermanager/lang/cs/lang.php | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index ad889f858..7e082ce33 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -70,7 +70,7 @@ $lang['user']                  = 'Uživatelské jméno';
 $lang['pass']                  = 'Heslo';
 $lang['newpass']               = 'Nové heslo';
 $lang['oldpass']               = 'Současné heslo';
-$lang['passchk']               = 'ještě jednou';
+$lang['passchk']               = 'Zopakovat';
 $lang['remember']              = 'Přihlásit se nastálo';
 $lang['fullname']              = 'Celé jméno';
 $lang['email']                 = 'E-mail';
diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php
index f6db2b153..c8fd583c4 100644
--- a/lib/plugins/extension/lang/cs/lang.php
+++ b/lib/plugins/extension/lang/cs/lang.php
@@ -63,6 +63,7 @@ $lang['status_bundled']        = 'svázaný';
 $lang['msg_enabled']           = 'Zásuvný modul %s povolen';
 $lang['msg_disabled']          = 'Zásuvný modul %s zakázán';
 $lang['msg_delete_success']    = 'Rozšíření odinstalováno';
+$lang['msg_delete_failed']     = 'Odinstalování rozšíření %s selhalo';
 $lang['msg_template_install_success'] = 'Šablona %s úspěšně nainstalována';
 $lang['msg_template_update_success'] = 'Šablona %s úspěšně aktualizována';
 $lang['msg_plugin_install_success'] = 'Zásuvný modul %s úspěšně nainstalován.';
@@ -73,6 +74,7 @@ $lang['security_issue']        = '<strong>Bezpečnostní problém:</strong> %s';
 $lang['security_warning']      = '<strong>Bezpečnostní varování:</strong> %s';
 $lang['update_available']      = '<strong>Aktualizace:</strong> Je dostupná nová verze %s.';
 $lang['wrong_folder']          = '<strong>Zásuvný modul nesprávně nainstalován:</strong> Přejmenujte adresár modulu "%s" na "%s".';
+$lang['url_change']            = '<strong>URL se změnila:</strong> URL pro stahování se změnila od poslední aktualizace. Před další aktualizací tohoto rozšíření ověřte správnost nové URL.<br />Nová: %s<br />Stará: %s';
 $lang['error_badurl']          = 'Adresy URL by měly začínat s http nebo https';
 $lang['error_dircreate']       = 'Nelze vytvořit dočasný adresář pro přijetí stahování';
 $lang['error_download']        = 'Nelze stáhnout soubor: %s';
@@ -81,3 +83,8 @@ $lang['noperms']               = 'Nelze zapisovat do adresáře pro rozšířen
 $lang['notplperms']            = 'Nelze zapisovat do odkládacího adresáře';
 $lang['nopluginperms']         = 'Nelze zapisovat do adresáře se zásuvnými moduly';
 $lang['git']                   = 'Toto rozšíření bylo nainstalováno přes git, nejspíš ho tady aktualizovat nechcete.';
+$lang['auth']                  = 'Tento ověřovací zásuvný modul není povolen v nastavení, zvažte jeho deaktivaci.';
+$lang['install_url']           = 'Nainstalovat z URL:';
+$lang['install_upload']        = 'Nahrát rozšíření:';
+$lang['repo_error']            = 'Nelze kontaktovat repozitář se zásuvnými moduly. Ujistěte se, že váš server může kontaktovat www.dokuwiki.org a zkontrolujte nastavení proxy.';
+$lang['nossl']                 = 'Použité PHP pravděpodobně nepodporuje SSL. Stažení mnoha DokuWiki rozšíření nebude fungovat.';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index 6fbfe8535..d715d1dfb 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -75,3 +75,4 @@ $lang['import_error_upload']   = 'Import selhal. CSV soubor nemohl být nahrán
 $lang['import_error_readfail'] = 'Import selhal. Nelze číst nahraný soubor.';
 $lang['import_error_create']   = 'Nelze vytvořit uživatele';
 $lang['import_notify_fail']    = 'Importovanému uživateli %s s emailem %s nemohlo být zasláno upozornění.';
+$lang['import_downloadfailures'] = 'Stáhnout chyby pro nápravu jako CVS';
-- 
cgit v1.2.3


From 4ac117924853a8fb3d2826fa814eec444df97323 Mon Sep 17 00:00:00 2001
From: Type-kun <workwork-1@yandex.ru>
Date: Fri, 12 Dec 2014 20:06:31 +0100
Subject: translation update

---
 inc/lang/ru/lang.php                    | 8 ++++++--
 lib/plugins/authad/lang/ru/settings.php | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index f491fcaa9..aa1cbd341 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -27,6 +27,7 @@
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Владимир <id37736@yandex.ru>
  * @author Igor Degraf <igordegraf@gmail.com>
+ * @author Type-kun <workwork-1@yandex.ru>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
@@ -197,7 +198,7 @@ $lang['quickhits']             = 'Соответствия в названиях
 $lang['toc']                   = 'Содержание';
 $lang['current']               = 'текущий';
 $lang['yours']                 = 'Ваша версия';
-$lang['diff']                  = 'показать отличия от текущей версии';
+$lang['diff']                  = 'Показать отличия от текущей версии';
 $lang['diff2']                 = 'Показать различия между ревизиями  ';
 $lang['difflink']              = 'Ссылка на это сравнение';
 $lang['diff_type']             = 'Посмотреть отличия';
@@ -206,6 +207,8 @@ $lang['diff_side']             = 'бок о бок';
 $lang['diffprevrev']           = 'Предыдущая версия';
 $lang['diffnextrev']           = 'Следующая версия';
 $lang['difflastrev']           = 'Последняя версия';
+$lang['diffbothprevrev']       = 'Предыдущая версия справа и слева';
+$lang['diffbothnextrev']       = 'Следующая версия справа и слева';
 $lang['line']                  = 'Строка';
 $lang['breadcrumb']            = 'Вы посетили:';
 $lang['youarehere']            = 'Вы находитесь здесь:';
@@ -213,7 +216,7 @@ $lang['lastmod']               = 'Последние изменения:';
 $lang['by']                    = ' —';
 $lang['deleted']               = 'удалено';
 $lang['created']               = 'создано';
-$lang['restored']              = 'старая ревизия восстановлена (%s)';
+$lang['restored']              = 'старая версия восстановлена (%s)';
 $lang['external_edit']         = 'внешнее изменение';
 $lang['summary']               = 'Сводка изменений';
 $lang['noflash']               = 'Для просмотра этого содержимого требуется <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
@@ -303,6 +306,7 @@ $lang['i_modified']            = 'Из соображений безопасно
                                   <a href="http://www.dokuwiki.org/install">инструкции по установке «Докувики»</a>';
 $lang['i_funcna']              = 'Функция PHP <code>%s</code> недоступна. Может быть, она по какой-то причине заблокирована вашим хостером?';
 $lang['i_phpver']              = 'Ваша версия PHP (<code>%s</code>) ниже требуемой (<code>%s</code>). Вам необходимо обновить установленную версию PHP.';
+$lang['i_mbfuncoverload']      = 'Для запуска "Докувики" необходимо отключить параметр mbstring.func_overload в php.ini';
 $lang['i_permfail']            = '<code>%s</code> недоступна для записи «Докувики». Вам необходимо исправить системные права доступа для этой директории!';
 $lang['i_confexists']          = '<code>%s</code> уже существует';
 $lang['i_writeerr']            = 'Не удалось создать <code>%s</code>. Вам необходимо проверить системные права доступа к файлу и директориям, и создать файл вручную. ';
diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 0212589d7..6d92bb163 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -9,11 +9,13 @@
  * @author Erli Moen <evseev.jr@gmail.com>
  * @author Владимир <id37736@yandex.ru>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ * @author Type-kun <workwork-1@yandex.ru>
  */
 $lang['account_suffix']        = 'Суффикс вашего аккаунта. Например, <code>@my.domain.org</code>';
 $lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
+$lang['sso_charset']           = 'Кодировка, в которой веб-сервер передаёт имя пользователя Kerberos или NTLM. Для UTF-8 или latin-1 остаётся пустым. Требует расширение iconv.';
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
-- 
cgit v1.2.3


From d52dfa3a1a992c5cbc5517cc2fc9e947d3a54ee4 Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Sat, 13 Dec 2014 12:56:08 +0100
Subject: translation update

---
 inc/lang/cs/lang.php                       | 24 ++++++++++++------------
 inc/lang/cs/mailtext.txt                   |  2 +-
 inc/lang/cs/password.txt                   |  4 ++--
 inc/lang/cs/pwconfirm.txt                  |  6 +++---
 inc/lang/cs/registermail.txt               |  2 +-
 inc/lang/cs/resendpwd.txt                  |  2 +-
 inc/lang/cs/subscr_digest.txt              |  6 +++---
 inc/lang/cs/subscr_list.txt                |  4 ++--
 inc/lang/cs/subscr_single.txt              |  6 +++---
 inc/lang/cs/uploadmail.txt                 |  4 ++--
 lib/plugins/acl/lang/cs/help.txt           | 13 +++++--------
 lib/plugins/authmysql/lang/cs/settings.php |  5 +++--
 lib/plugins/authpgsql/lang/cs/settings.php |  5 +++--
 lib/plugins/extension/lang/cs/lang.php     |  6 ++++--
 lib/plugins/usermanager/lang/cs/lang.php   | 10 +++++-----
 15 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 7e082ce33..1dd4def5a 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -51,7 +51,7 @@ $lang['btn_delete']            = 'Vymazat';
 $lang['btn_back']              = 'Zpět';
 $lang['btn_backlink']          = 'Zpětné odkazy';
 $lang['btn_backtomedia']       = 'Zpět do Výběru dokumentu';
-$lang['btn_subscribe']         = 'Odebírat emailem změny stránky';
+$lang['btn_subscribe']         = 'Odebírat e-mailem změny stránky';
 $lang['btn_profile']           = 'Upravit profil';
 $lang['btn_reset']             = 'Reset';
 $lang['btn_resendpwd']         = 'Nastavit nové heslo';
@@ -83,16 +83,16 @@ $lang['nosecedit']             = 'Stránka byla v mezičase změněna. Informace
 $lang['searchcreatepage']      = 'Pokud jste nenašli, co hledáte, zkuste požadovanou stránku sami vytvořit stisknutím tlačítka \'\'Vytvořit stránku\'\'.';
 $lang['regmissing']            = 'Musíte vyplnit všechny údaje.';
 $lang['reguexists']            = 'Uživatel se stejným jménem už je zaregistrován.';
-$lang['regsuccess']            = 'Uživatelský účet byl vytvořen a heslo zasláno mailem.';
+$lang['regsuccess']            = 'Uživatelský účet byl vytvořen a heslo zasláno e-mailem.';
 $lang['regsuccess2']           = 'Uživatelský účet byl vytvořen.';
 $lang['regmailfail']           = 'Zdá se, že nastala chyba při posílání mailu s heslem. Zkuste kontaktovat správce.';
-$lang['regbadmail']            = 'Zadaná mailová adresa není platná. Pokud si myslíte, že to je špatně, zkuste kontaktovat správce.';
+$lang['regbadmail']            = 'Zadaná e-mailová adresa není platná. Pokud si myslíte, že to je špatně, zkuste kontaktovat správce.';
 $lang['regbadpass']            = 'Heslo nebylo zadáno dvakrát stejně, zkuste to prosím znovu.';
 $lang['regpwmail']             = 'Vaše heslo do systému DokuWiki';
 $lang['reghere']               = 'Nemáte uživatelský účet? Zřiďte si ho';
 $lang['profna']                = 'Tato wiki neumožňuje změnu profilu';
 $lang['profnochange']          = 'Žádné změny nebyly provedeny.';
-$lang['profnoempty']           = 'Nelze zadat prázdné jméno nebo mailová adresa.';
+$lang['profnoempty']           = 'Nelze vynechat jméno nebo e-mailovou adresu.';
 $lang['profchanged']           = 'Uživatelský profil změněn.';
 $lang['profnodelete']          = 'Tato wiki nepodporuje mazání uživatelů';
 $lang['profdeleteuser']        = 'Smazat účet';
@@ -105,8 +105,8 @@ $lang['resendpwd']             = 'Nastavit nové heslo pro';
 $lang['resendpwdmissing']      = 'Musíte vyplnit všechny položky.';
 $lang['resendpwdnouser']       = 'Bohužel takový uživatel v systému není.';
 $lang['resendpwdbadauth']      = 'Autorizační kód není platný. Zadali jste opravdu celý odkaz na potvrzovací stránku?';
-$lang['resendpwdconfirm']      = 'Odkaz na potvrzovací stránku byl odeslán mailem.';
-$lang['resendpwdsuccess']      = 'Vaše nové heslo bylo odesláno emailem.';
+$lang['resendpwdconfirm']      = 'Odkaz na potvrzovací stránku byl odeslán e-mailem.';
+$lang['resendpwdsuccess']      = 'Vaše nové heslo bylo odesláno e-mailem.';
 $lang['license']               = 'Kromě míst, kde je explicitně uvedeno jinak, je obsah této wiki licencován pod následující licencí:';
 $lang['licenseok']             = 'Poznámka: Tím, že editujete tuto stránku, souhlasíte, aby váš obsah byl licencován pod následující licencí:';
 $lang['searchmedia']           = 'Hledat jméno souboru:';
@@ -278,14 +278,14 @@ $lang['subscr_unsubscribe_error'] = 'Došlo k chybě při odhlašování %s ze s
 $lang['subscr_already_subscribed'] = '%s již je přihlášen do seznamu odběratelů %s';
 $lang['subscr_not_subscribed'] = '%s není přihlášen do seznamu odběratelů %s';
 $lang['subscr_m_not_subscribed'] = 'V současné době neodebíráte změny na aktuální stránce nebo ve jmenném prostoru.';
-$lang['subscr_m_new_header']   = 'Přihlásit k odebírání změn emailem';
+$lang['subscr_m_new_header']   = 'Přihlásit k odebírání změn e-mailem';
 $lang['subscr_m_current_header'] = 'Aktuální odběratelé změn';
-$lang['subscr_m_unsubscribe']  = 'Odhlásit z odběru změn emailem';
-$lang['subscr_m_subscribe']    = 'Přihlásit se k odběru změn emailem';
+$lang['subscr_m_unsubscribe']  = 'Odhlásit z odběru změn e-mailem';
+$lang['subscr_m_subscribe']    = 'Přihlásit se k odběru změn e-mailem';
 $lang['subscr_m_receive']      = 'Přejete si dostávat';
-$lang['subscr_style_every']    = 'email pro každou změnu';
-$lang['subscr_style_digest']   = 'souhrnný email změn pro každou stránku (každé %.2f dny/dní)';
-$lang['subscr_style_list']     = 'seznam změněných stránek od posledního emailu (každé %.2f dny/dní)';
+$lang['subscr_style_every']    = 'e-mail pro každou změnu';
+$lang['subscr_style_digest']   = 'souhrnný e-mail změn pro každou stránku (každé %.2f dny/dní)';
+$lang['subscr_style_list']     = 'seznam změněných stránek od posledního e-mailu (každé %.2f dny/dní)';
 $lang['authtempfail']          = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.';
 $lang['authpwdexpire']         = 'Platnost vašeho hesla vyprší za %d dní, měli byste ho změnit co nejdříve.';
 $lang['i_chooselang']          = 'Vyberte si jazyk';
diff --git a/inc/lang/cs/mailtext.txt b/inc/lang/cs/mailtext.txt
index f235a299b..443fc3e98 100644
--- a/inc/lang/cs/mailtext.txt
+++ b/inc/lang/cs/mailtext.txt
@@ -13,5 +13,5 @@ Uživatel    : @USER@
 
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
diff --git a/inc/lang/cs/password.txt b/inc/lang/cs/password.txt
index 18f21f1b1..1b9f77778 100644
--- a/inc/lang/cs/password.txt
+++ b/inc/lang/cs/password.txt
@@ -1,4 +1,4 @@
-Dobrý den,
+Dobrý den!
 
 Zde jsou přihlašovací informace pro wiki @TITLE@ (@DOKUWIKIURL@)
 
@@ -7,5 +7,5 @@ Uživatelské jméno : @LOGIN@
 Heslo             : @PASSWORD@
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
diff --git a/inc/lang/cs/pwconfirm.txt b/inc/lang/cs/pwconfirm.txt
index aa37b3b84..4fcc0ab26 100644
--- a/inc/lang/cs/pwconfirm.txt
+++ b/inc/lang/cs/pwconfirm.txt
@@ -1,13 +1,13 @@
-Dobrý den,
+Dobrý den!
 
 Někdo požádal o nové heslo k vašemu uživatelskému účtu na wiki @TITLE@ (@DOKUWIKIURL@)
 
-Pokud jste o nové heslo nežádali, ignorujte prosím tento email.
+Pokud jste o nové heslo nežádali, ignorujte prosím tento e-mail.
 
 Pro potvrzení, že jste tento požadavek poslali opravdu vy, prosím otevřete následující odkaz.
 
 @CONFIRM@
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/registermail.txt b/inc/lang/cs/registermail.txt
index 201e7b779..f44189941 100644
--- a/inc/lang/cs/registermail.txt
+++ b/inc/lang/cs/registermail.txt
@@ -10,5 +10,5 @@ IP adresa : @IPADDRESS@
 Hostitel : @HOSTNAME@
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/resendpwd.txt b/inc/lang/cs/resendpwd.txt
index 1d2aa0d97..0820f287b 100644
--- a/inc/lang/cs/resendpwd.txt
+++ b/inc/lang/cs/resendpwd.txt
@@ -1,3 +1,3 @@
 ====== Zaslat nové heslo ======
 
-Abyste získali nové heslo k vašemu učtu v této wiki, vyplňte všechny níže uvedené informace . Vaše nové heslo bude zasláno na emailovou adresu, kterou jste zadali při registraci. Uživatelské jméno by mělo být stejné jako vaše uživatelské jméno, s nímž se přihlašujete do této wiki.
+Abyste získali nové heslo ke svému účtu v této wiki, vyplňte všechny níže uvedené informace. Nové heslo bude zasláno na e-mailovou adresu, kterou jste zadali při registraci. Uživatelské jméno by mělo být stejné jako vaše uživatelské jméno, s nímž se přihlašujete do této wiki.
diff --git a/inc/lang/cs/subscr_digest.txt b/inc/lang/cs/subscr_digest.txt
index 1b1770965..128d91931 100644
--- a/inc/lang/cs/subscr_digest.txt
+++ b/inc/lang/cs/subscr_digest.txt
@@ -11,12 +11,12 @@ Stará revize: @OLDPAGE@
 Nová revize: @NEWPAGE@
 
 Pro odhlášení z odebírání změn na této webové stránce
-se prosím příhlašte do wiki na adrese 
+se prosím přihlašte do wiki na adrese 
 @DOKUWIKIURL@, pak navštivte 
 @SUBSCRIBE@ 
-a odhlaště se z odebírání změn na stránce či 
+a odhlaste se z odebírání změn na stránce či 
 ve jmenném prostoru.
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/subscr_list.txt b/inc/lang/cs/subscr_list.txt
index f85be8a9f..81b344dc8 100644
--- a/inc/lang/cs/subscr_list.txt
+++ b/inc/lang/cs/subscr_list.txt
@@ -11,9 +11,9 @@ Pro odhlášení z odebírání změn
 se prosím příhlašte do wiki na adrese 
 @DOKUWIKIURL@, pak navštivte 
 @SUBSCRIBE@ 
-a odhlaště se z odebírání změn na stránce či 
+a odhlaste se z odebírání změn na stránce či 
 ve jmenném prostoru.
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/subscr_single.txt b/inc/lang/cs/subscr_single.txt
index 1ee33da09..6f3774cd9 100644
--- a/inc/lang/cs/subscr_single.txt
+++ b/inc/lang/cs/subscr_single.txt
@@ -14,12 +14,12 @@ Stará revize: @OLDPAGE@
 Nová revize: @NEWPAGE@
 
 Pro odhlášení z odebírání změn na této webové stránce
-se prosím příhlašte do wiki na adrese 
+se prosím přihlašte do wiki na adrese 
 @DOKUWIKIURL@, pak navštivte 
 @SUBSCRIBE@ 
-a odhlaště se z odebírání změn na stránce či 
+a odhlaste se z odebírání změn na stránce či 
 ve jmenném prostoru.
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/cs/uploadmail.txt b/inc/lang/cs/uploadmail.txt
index b19b0bf7e..28f4e2895 100644
--- a/inc/lang/cs/uploadmail.txt
+++ b/inc/lang/cs/uploadmail.txt
@@ -1,4 +1,4 @@
-Do vaší DokuWiki byl nahrán nový dokument. Tady jsou detaily:
+Do DokuWiki byl nahrán nový dokument. Tady jsou detaily:
 
 Soubor : @MEDIA@
 Datum : @DATE@
@@ -10,5 +10,5 @@ MIME typ : @MIME@
 Uživatel : @USER@
 
 -- 
-Tento email byl automaticky vygenerován systémem DokuWiki
+Tento e-mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/cs/help.txt b/lib/plugins/acl/lang/cs/help.txt
index 1dbc88ad0..1b6fa1eac 100644
--- a/lib/plugins/acl/lang/cs/help.txt
+++ b/lib/plugins/acl/lang/cs/help.txt
@@ -1,11 +1,8 @@
 === Nápověda: ===
 
-Na této stránce můžete přidávat a odebírat oprávnění na jmenné prostory a stránky Vaší wiki.
+Na této stránce můžete přidávat a odebírat oprávnění pro jmenné prostory a stránky svojí wiki.
+* Levý panel zobrazuje všechny dostupné jmenné prostory a stránky.
+* Formulář výše umožňuje vidět a modifikovat oprávnění vybraného uživatele nebo skupiny.
+* V tabulce uvedené níže jsou zobrazeny všechna aktuální pravidla pro řízení přístupu (oprávnění). Zde můžete rychle odebírat a měnit více položek (oprávnění) najednou.
 
-Levý panel zobrazuje všechny dostupné jmenné prostory a stránky.
-
-Formulář výše umožňuje vidět a modifikovat oprávnění vybraného uživatele nebo skupiny.
-
-V tabulce uvedené níže jsou zobrazeny všechny aktuální pravidla pro řízení přístupu (oprávnění). Zde můžete rychle odebírat a měnit více položek (oprávnění) najednou.
-
-Pro detailnější nápovědu si přečtěte stránku [[doku>acl|oficiální dokumentaci ACL]], která Vám může pomoci plně pochopit princip, jak řízení přístupu na DokuWiki funguje.
+Pro detailnější nápovědu si přečtěte stránku [[doku>acl|oficiální dokumentace ACL]], která Vám může pomoci plně pochopit princip, na kterém řízení přístupu na DokuWiki funguje.
diff --git a/lib/plugins/authmysql/lang/cs/settings.php b/lib/plugins/authmysql/lang/cs/settings.php
index 350c3236b..09146a451 100644
--- a/lib/plugins/authmysql/lang/cs/settings.php
+++ b/lib/plugins/authmysql/lang/cs/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author mkucera66@seznam.cz
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
 $lang['server']                = 'Váš server MySQL';
 $lang['user']                  = 'Uživatelské jméno pro MySQL';
@@ -19,7 +20,7 @@ $lang['getGroups']             = 'Příkaz SQL pro získání uživatelovy skupi
 $lang['getUsers']              = 'Příkaz SQL pro seznam všech uživatelů';
 $lang['FilterLogin']           = 'Příkaz SQL pro filtrování uživatelů podle přihlašovacího jména';
 $lang['FilterName']            = 'Příkaz SQL pro filtrování uživatelů podle celého jména';
-$lang['FilterEmail']           = 'Příkaz SQL pro filtrování uživatelů podle adres emailů';
+$lang['FilterEmail']           = 'Příkaz SQL pro filtrování uživatelů podle adres e-mailů';
 $lang['FilterGroup']           = 'Příkaz SQL pro filtrování uživatelů podle členství ve skupinách';
 $lang['SortOrder']             = 'Příkaz SQL pro řazení uživatelů';
 $lang['addUser']               = 'Příkaz SQL pro přidání nového uživatele';
@@ -32,7 +33,7 @@ $lang['delUserRefs']           = 'Příkaz SQL pro odstranění členství uživ
 $lang['updateUser']            = 'Příkaz SQL pro aktualizaci uživatelského profilu';
 $lang['UpdateLogin']           = 'Klauzule pro aktualizaci přihlačovacího jména uživatele';
 $lang['UpdatePass']            = 'Klauzule pro aktualizaci hesla uživatele';
-$lang['UpdateEmail']           = 'Klauzule pro aktualizaci emailové adresy uživatele';
+$lang['UpdateEmail']           = 'Klauzule pro aktualizaci e-mailové adresy uživatele';
 $lang['UpdateName']            = 'Klauzule pro aktualizaci celého jména uživatele';
 $lang['UpdateTarget']          = 'Omezující klauzule pro identifikaci uživatele při aktualizaci';
 $lang['delUserGroup']          = 'Příkaz SQL pro zrušení členství uživatele v dané skupině';
diff --git a/lib/plugins/authpgsql/lang/cs/settings.php b/lib/plugins/authpgsql/lang/cs/settings.php
index aec7eecf1..ad135e241 100644
--- a/lib/plugins/authpgsql/lang/cs/settings.php
+++ b/lib/plugins/authpgsql/lang/cs/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author mkucera66@seznam.cz
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
 $lang['server']                = 'Váš server PostgreSQL';
 $lang['port']                  = 'Port vašeho serveru PostgreSQL';
@@ -18,7 +19,7 @@ $lang['getGroups']             = 'Příkaz SQL pro získání členství uživat
 $lang['getUsers']              = 'Příkaz SQL pro seznam všech uživatelů';
 $lang['FilterLogin']           = 'Příkaz SQL pro filtrování uživatelů podle přihlašovacího jména';
 $lang['FilterName']            = 'Příkaz SQL pro filtrování uživatelů podle celého jména';
-$lang['FilterEmail']           = 'Příkaz SQL pro filtrování uživatelů podle adres emailů';
+$lang['FilterEmail']           = 'Příkaz SQL pro filtrování uživatelů podle adres e-mailů';
 $lang['FilterGroup']           = 'Příkaz SQL pro filtrování uživatelů podle členství ve skupinách';
 $lang['SortOrder']             = 'Příkaz SQL pro řazení uživatelů';
 $lang['addUser']               = 'Příkaz SQL pro řazení uživatelů';
@@ -31,7 +32,7 @@ $lang['delUserRefs']           = 'Příkaz SQL pro odstranění členství uživ
 $lang['updateUser']            = 'Příkaz SQL pro aktualizaci uživatelského profilu';
 $lang['UpdateLogin']           = 'Klauzule pro aktualizaci přihlačovacího jména uživatele';
 $lang['UpdatePass']            = 'Klauzule pro aktualizaci hesla uživatele';
-$lang['UpdateEmail']           = 'Klauzule pro aktualizaci emailové adresy uživatele';
+$lang['UpdateEmail']           = 'Klauzule pro aktualizaci e-mailové adresy uživatele';
 $lang['UpdateName']            = 'Klauzule pro aktualizaci celého jména uživatele';
 $lang['UpdateTarget']          = 'Omezující klauzule pro identifikaci uživatele při aktualizaci';
 $lang['delUserGroup']          = 'Příkaz SQL pro zrušení členství uživatele v dané skupině';
diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php
index c8fd583c4..dc38afd52 100644
--- a/lib/plugins/extension/lang/cs/lang.php
+++ b/lib/plugins/extension/lang/cs/lang.php
@@ -73,16 +73,18 @@ $lang['missing_dependency']    = '<strong>Chybějící nebo zakázaná závislos
 $lang['security_issue']        = '<strong>Bezpečnostní problém:</strong> %s';
 $lang['security_warning']      = '<strong>Bezpečnostní varování:</strong> %s';
 $lang['update_available']      = '<strong>Aktualizace:</strong> Je dostupná nová verze %s.';
-$lang['wrong_folder']          = '<strong>Zásuvný modul nesprávně nainstalován:</strong> Přejmenujte adresár modulu "%s" na "%s".';
+$lang['wrong_folder']          = '<strong>Zásuvný modul nesprávně nainstalován:</strong> Přejmenujte adresář modulu "%s" na "%s".';
 $lang['url_change']            = '<strong>URL se změnila:</strong> URL pro stahování se změnila od poslední aktualizace. Před další aktualizací tohoto rozšíření ověřte správnost nové URL.<br />Nová: %s<br />Stará: %s';
 $lang['error_badurl']          = 'Adresy URL by měly začínat s http nebo https';
 $lang['error_dircreate']       = 'Nelze vytvořit dočasný adresář pro přijetí stahování';
 $lang['error_download']        = 'Nelze stáhnout soubor: %s';
+$lang['error_decompress']      = 'Selhalo rozbalení staženého souboru. Toto je nejspíš důsledek poškození souboru při přenosu, zkuste soubor stáhnout znovu; případně nemusel být rozpoznán formát sbaleného souboru a bude třeba přistoupit k ruční instalaci. ';
 $lang['error_findfolder']      = 'Nelze rozpoznat adresář pro rozšíření, je třeba stáhnout a instalovat ručně';
+$lang['error_copy']            = 'Došlo k chybě kopírování souborů při pokusu nainstalovat soubory do adresáře <em>%s</em>: může být plný disk nebo špatně nastavena přístupová práva. Tato chyba mohla zapříčinit pouze částečnou instalaci zásuvného modulu a uvést wiki do nestabilního stavu.';
 $lang['noperms']               = 'Nelze zapisovat do adresáře pro rozšíření';
 $lang['notplperms']            = 'Nelze zapisovat do odkládacího adresáře';
 $lang['nopluginperms']         = 'Nelze zapisovat do adresáře se zásuvnými moduly';
-$lang['git']                   = 'Toto rozšíření bylo nainstalováno přes git, nejspíš ho tady aktualizovat nechcete.';
+$lang['git']                   = 'Toto rozšíření bylo nainstalováno přes git. Touto cestou ho nejspíš tady aktualizovat nechcete.';
 $lang['auth']                  = 'Tento ověřovací zásuvný modul není povolen v nastavení, zvažte jeho deaktivaci.';
 $lang['install_url']           = 'Nainstalovat z URL:';
 $lang['install_upload']        = 'Nahrát rozšíření:';
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index d715d1dfb..6130fccd8 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -56,13 +56,13 @@ $lang['next']                  = 'další';
 $lang['last']                  = 'poslední';
 $lang['edit_usermissing']      = 'Vybraný uživatel nebyl nalezen, zadané uživatelského mohlo být smazáno nebo změněno.';
 $lang['user_notify']           = 'Upozornit uživatele';
-$lang['note_notify']           = 'Maily s upozorněním se budou posílat pouze, když uživatel dostává nové heslo.';
+$lang['note_notify']           = 'E-maily s upozorněním se budou posílat pouze, když uživatel dostává nové heslo.';
 $lang['note_group']            = 'Noví uživatelé budou přidáváni do této výchozí skupiny (%s), pokud pro ně není uvedena žádná skupina.';
 $lang['note_pass']             = 'Heslo bude automaticky vygenerováno, pokud je pole ponecháno prázdné a je zapnuto upozornění uživatele.';
 $lang['add_ok']                = 'Uživatel úspěšně vytvořen';
 $lang['add_fail']              = 'Vytvoření uživatele selhalo';
-$lang['notify_ok']             = 'Odeslán mail s upozorněním';
-$lang['notify_fail']           = 'Mail s upozorněním nebylo možno odeslat';
+$lang['notify_ok']             = 'Odeslán e-mail s upozorněním';
+$lang['notify_fail']           = 'E-mail s upozorněním nebylo možno odeslat';
 $lang['import_userlistcsv']    = 'Seznam uživatelů (CSV):';
 $lang['import_header']         = 'Poslední selhání importu';
 $lang['import_success_count']  = 'Import uživatelů: nalezeno %d uživatelů, %d úspěšně importováno.';
@@ -70,9 +70,9 @@ $lang['import_failure_count']  = 'Import uživatelů: %d selhalo. Seznam chybný
 $lang['import_error_fields']   = 'Nedostatek položek, nalezena/y %d, požadovány 4.';
 $lang['import_error_baduserid'] = 'Chybí User-id';
 $lang['import_error_badname']  = 'Špatné jméno';
-$lang['import_error_badmail']  = 'Špatná emailová adresa';
+$lang['import_error_badmail']  = 'Špatná e-mailová adresa';
 $lang['import_error_upload']   = 'Import selhal. CSV soubor nemohl být nahrán nebo je prázdný.';
 $lang['import_error_readfail'] = 'Import selhal. Nelze číst nahraný soubor.';
 $lang['import_error_create']   = 'Nelze vytvořit uživatele';
-$lang['import_notify_fail']    = 'Importovanému uživateli %s s emailem %s nemohlo být zasláno upozornění.';
+$lang['import_notify_fail']    = 'Importovanému uživateli %s s e-mailem %s nemohlo být zasláno upozornění.';
 $lang['import_downloadfailures'] = 'Stáhnout chyby pro nápravu jako CVS';
-- 
cgit v1.2.3


From e9e4d4669dcc75b110847c78bdf6b80a0f47628b Mon Sep 17 00:00:00 2001
From: Type-kun <workwork-1@yandex.ru>
Date: Sat, 13 Dec 2014 17:20:59 +0100
Subject: translation update

---
 inc/lang/ru/lang.php                    |  1 +
 lib/plugins/authad/lang/ru/settings.php |  1 +
 lib/plugins/extension/lang/ru/lang.php  | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index aa1cbd341..be6bdc0a4 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -362,3 +362,4 @@ $lang['currentns']             = 'Текущее пространство имё
 $lang['searchresult']          = 'Результаты поиска';
 $lang['plainhtml']             = 'Простой HTML';
 $lang['wikimarkup']            = 'вики-разметка';
+$lang['page_nonexist_rev']     = 'Эта страница ещё не существовала %s. Она была создана <a href="%s">%s</a>.';
diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 6d92bb163..bb8197765 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -19,3 +19,4 @@ $lang['sso_charset']           = 'Кодировка, в которой веб-
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
+$lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль. 0 - отключить.';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index 24e6fe224..8e9e10b95 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Igor Degraf <igordegraf@gmail.com>
+ * @author Type-kun <workwork-1@yandex.ru>
  */
 $lang['menu']                  = 'Управление дополнениями';
 $lang['tab_plugins']           = 'Установленные плагины';
@@ -12,6 +13,9 @@ $lang['tab_templates']         = 'Установленные шаблоны';
 $lang['tab_search']            = 'Поиск и установка';
 $lang['tab_install']           = 'Ручная установка';
 $lang['notinstalled']          = 'Это дополнение не установлено';
+$lang['alreadyenabled']        = 'Это расширение уже включено';
+$lang['alreadydisabled']       = 'Это расширение уже выключено';
+$lang['pluginlistsaveerror']   = 'Ошибка при сохранении списка плагинов';
 $lang['unknownauthor']         = 'Автор неизвестен';
 $lang['unknownversion']        = 'Версия неизвестна';
 $lang['btn_info']              = 'Отобразить доп. информацию';
@@ -25,6 +29,7 @@ $lang['js']['reallydel']       = 'Действительно удалить эт
 $lang['search_for']            = 'Поиск дополнения:';
 $lang['search']                = 'Найти';
 $lang['extensionby']           = '<strong>%s</strong> — %s';
+$lang['screenshot']            = 'Скриншот: %s';
 $lang['popularity']            = 'Популярность: %s%%';
 $lang['homepage_link']         = 'Описание';
 $lang['bugs_features']         = 'Баг-трекер';
@@ -58,12 +63,21 @@ $lang['status_bundled']        = 'в комплекте';
 $lang['msg_enabled']           = 'Плагин %s включён';
 $lang['msg_disabled']          = 'Плагин %s отключён';
 $lang['msg_delete_success']    = 'Дополнение удалено';
+$lang['msg_delete_failed']     = 'Не удалось удалить расширение %s';
 $lang['msg_template_install_success'] = 'Шаблон %s успешно установлен';
 $lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён';
 $lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен';
 $lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён';
+$lang['msg_upload_failed']     = 'Не удалось загрузить файл';
 $lang['update_available']      = '<strong>Обновление:</strong> доступна новая версия %s.';
+$lang['wrong_folder']          = '<strong>Плагин установлен неправильно:</strong> Переименуйте директорию "%s" в "%s".';
+$lang['url_change']            = '<strong>Ссылка изменилась:</strong> Ссылка для загрузки изменилась с прошлого раза. Проверьте новую ссылку прежде чем обновлять расширение.<br />Новая: %s<br />Старая: %s';
 $lang['error_badurl']          = 'Ссылки должны начинаться с http или https';
+$lang['error_dircreate']       = 'Не удалось создать временную директорию для загрузки';
+$lang['error_download']        = 'Не удалось загрузить файл: %s';
+$lang['error_decompress']      = 'Не удалось распаковать загруженный файл. Возможно, файл был повреждён при загрузке - тогда нужно попробовать ещё раз. Либо неизвестен формат архива - тогда загрузку и установку надо произвести вручную.';
+$lang['error_findfolder']      = 'Не удалось определить директорию для расширения, загрузку и установку надо произвести вручную.';
+$lang['error_copy']            = 'Возникла ошибка копирования файлов в директорию <em>%s</em>: возможно, диск переполнен, или неверно выставлены права доступа. Это могло привести к неполной установке плагина и нарушить работу вашей вики.';
 $lang['noperms']               = 'Папка для расширений недоступна для записи';
 $lang['notplperms']            = 'Папка для шаблонов недоступна для записи';
 $lang['nopluginperms']         = 'Папка плагинов недоступна для записи';
-- 
cgit v1.2.3


From d3b0952c873788602821d953e654ba66008117f2 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sun, 14 Dec 2014 14:21:03 +0100
Subject: translation update

---
 inc/lang/ko/lang.php                     | 12 +++++++-----
 lib/plugins/extension/lang/ko/lang.php   |  9 ++++++---
 lib/plugins/revert/lang/ko/lang.php      |  2 +-
 lib/plugins/usermanager/lang/ko/lang.php |  8 ++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 61bb58350..877c43de3 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -137,7 +137,7 @@ $lang['js']['medialeft']       = '왼쪽으로 그림 배치';
 $lang['js']['mediaright']      = '오른쪽으로 그림 배치';
 $lang['js']['mediacenter']     = '가운데으로 그림 배치';
 $lang['js']['medianoalign']    = '배치하지 않음';
-$lang['js']['nosmblinks']      = '윈도우 공유 파일과의 연결은 마이크로소프트 인터넷 익스플로러에서만 동작합니다.\n그러나 링크를 복사하거나 붙여넣기를 할 수 있습니다.';
+$lang['js']['nosmblinks']      = 'Windows 공유 파일과의 연결은 Microsoft Internet Explorer에서만 동작합니다.\n그러나 링크를 복사하거나 붙여넣기를 할 수 있습니다.';
 $lang['js']['linkwiz']         = '링크 마법사';
 $lang['js']['linkto']          = '다음으로 연결:';
 $lang['js']['del_confirm']     = '정말 선택된 항목을 삭제하겠습니까?';
@@ -281,11 +281,11 @@ $lang['subscr_style_list']     = '마지막 이메일 이후 바뀐 문서의 
 $lang['authtempfail']          = '사용자 인증을 일시적으로 사용할 수 없습니다. 만약 계속해서 문제가 발생한다면 위키 관리자에게 문의하시기 바랍니다.';
 $lang['authpwdexpire']         = '비밀번호를 바꾼지 %d일이 지났으며, 비밀번호를 곧 바꿔야 합니다.';
 $lang['i_chooselang']          = '사용할 언어를 선택하세요';
-$lang['i_installer']           = '도쿠위키 설치';
+$lang['i_installer']           = '도쿠위키 설치 관리자';
 $lang['i_wikiname']            = '위키 이름';
 $lang['i_enableacl']           = 'ACL 활성화 (권장)';
 $lang['i_superuser']           = '슈퍼 사용자';
-$lang['i_problems']            = '설치하는 동안 아래와 같은 문제가 발생했습니다. 문제를 해결한 후 설치를 계속할 수 있습니다.';
+$lang['i_problems']            = '설치 관리자가 아래에 나와 있는 몇 가지 문제를 찾았습니다. 문제를 해결하지 전까지 설치를 계속할 수 없습니다.';
 $lang['i_modified']            = '보안 상의 이유로 이 스크립트는 수정되지 않은 새 도쿠위키 설치에서만 동작됩니다.
 다운로드한 압축 패키지를 다시 설치하거나 <a href="http://dokuwiki.org/ko:install">도쿠위키 설치 과정</a>을 참고해서 설치하세요.';
 $lang['i_funcna']              = '<code>%s</code> PHP 함수를 사용할 수 없습니다. 호스트 제공자가 어떤 이유에서인지 막아 놓았을지 모릅니다.';
@@ -296,8 +296,10 @@ $lang['i_confexists']          = '<code>%s</code>(은)는 이미 존재합니다
 $lang['i_writeerr']            = '<code>%s</code>(을)를 만들 수 없습니다. 먼저 디렉터리/파일 권한을 확인하고 파일을 수동으로 만드세요.';
 $lang['i_badhash']             = 'dokuwiki.php를 인식할 수 없거나 원본 파일이 아닙니다 (해시=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - 잘못되었거나 빈 값입니다';
-$lang['i_success']             = '환경 설정이 성공적으로 끝났습니다. 지금 install.php를 지워도 상관없습니다. <a href="doku.php?id=wiki:welcome">새 도쿠위키</a>로 들어가세요.';
-$lang['i_failure']             = '환경 설정 파일에 쓰는 도중에 오류가 발생했습니다. <a href="doku.php?id=wiki:welcome">새 도쿠위키</a>를 사용하기 전에 수동으로 문제를 해결해야 합니다.';
+$lang['i_success']             = '환경 설정이 성공적으로 끝났습니다. 지금 install.php를 지워도 상관없습니다.
+<a href="doku.php?id=wiki:welcome">새 도쿠위키</a>로 들어가세요.';
+$lang['i_failure']             = '환경 설정 파일에 쓰는 도중에 오류가 발생했습니다.
+<a href="doku.php?id=wiki:welcome">새 도쿠위키</a>를 사용하기 전에 수동으로 문제를 해결해야 합니다.';
 $lang['i_policy']              = '초기 ACL 정책';
 $lang['i_pol0']                = '열린 위키 (누구나 읽기, 쓰기, 올리기가 가능합니다)';
 $lang['i_pol1']                = '공개 위키 (누구나 읽을 수 있지만, 등록된 사용자만 쓰기와 올리기가 가능합니다)';
diff --git a/lib/plugins/extension/lang/ko/lang.php b/lib/plugins/extension/lang/ko/lang.php
index 53c9b4481..5dc5d8269 100644
--- a/lib/plugins/extension/lang/ko/lang.php
+++ b/lib/plugins/extension/lang/ko/lang.php
@@ -62,7 +62,8 @@ $lang['status_template']       = '템플릿';
 $lang['status_bundled']        = '포함';
 $lang['msg_enabled']           = '%s 플러그인이 활성화되었습니다';
 $lang['msg_disabled']          = '%s 플러그인이 비활성화되었습니다';
-$lang['msg_delete_success']    = '확장 기능이 제거되었습니다';
+$lang['msg_delete_success']    = '%s 확장 기능이 제거되었습니다';
+$lang['msg_delete_failed']     = '%s 확장 기능 제거에 실패했습니다';
 $lang['msg_template_install_success'] = '%s 템플릿을 성공적으로 설치했습니다';
 $lang['msg_template_update_success'] = '%s 템플릿을 성공적으로 업데이트했습니다';
 $lang['msg_plugin_install_success'] = '%s 플러그인을 성공적으로 설치했습니다';
@@ -79,11 +80,13 @@ $lang['error_dircreate']       = '다운로드를 받을 임시 폴더를 만들
 $lang['error_download']        = '파일을 다운로드할 수 없습니다: %s';
 $lang['error_decompress']      = '다운로드한 파일의 압축을 풀 수 없습니다. 이는 아마도 잘못된 다운로드의 결과로, 이럴 경우 다시 시도해야 합니다; 또는 압축 형식을 알 수 없으며, 이럴 경우 수동으로 다운로드하고 설치해야 합니다.';
 $lang['error_findfolder']      = '확장 기능 디렉터리를 식별할 수 없습니다, 수동으로 다운로드하고 설치해야 합니다';
-$lang['error_copy']            = '<em>%s</em> 디렉터리에 파일을 설치하는 동안 파일 복사 오류가 발생했습니다: 디스크가 꽉 찼거나 파일 접근 권한이 잘못되었을 수도 있습니다. 플러그인 설치가 부분적으로 되었거나 불안정하게 위키 설치가 되었을 수 있습니다.';
+$lang['error_copy']            = '<em>%s</em> 디렉터리에 파일을 설치하는 동안 파일 복사 오류가 발생했습니다: 디스크가 꽉 찼거나 파일 접근 권한이 잘못되었을 수도 있습니다. 플러그인이 부분적으로 설치되어 위키가 불안정할지도 모릅니다';
 $lang['noperms']               = '확장 기능 디렉터리에 쓸 수 없습니다';
 $lang['notplperms']            = '임시 디렉터리에 쓸 수 없습니다';
 $lang['nopluginperms']         = '플러그인 디렉터리에 쓸 수 없습니다';
-$lang['git']                   = '이 확장 기능은 git을 통해 설치되었으며, 여기에서 업데이트할 수 없을 수 있습니다.';
+$lang['git']                   = '이 확장 기능은 git를 통해 설치되었으며, 여기에서 업데이트할 수 없을 수 있습니다.';
+$lang['auth']                  = '이 인증 플러그인은 환경 설정에서 활성화할 수 없습니다, 그것을 비활성화하는 것을 고려하세요.';
 $lang['install_url']           = 'URL에서 설치:';
 $lang['install_upload']        = '확장 기능 올리기:';
 $lang['repo_error']            = '플러그인 저장소에 연결할 수 없습니다. 서버가 www.dokuwiki.org에 연결할 수 있는지 확인하고 프록시 설정을 확인하세요.';
+$lang['nossl']                 = 'PHP가 SSL 지원을 하지 않는 것으로 보입니다. 많은 도쿠위키 확장 기능의 다운로드가 작동하지 않을 것입니다.';
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index 5666100e9..df4b271b1 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -18,4 +18,4 @@ $lang['removed']               = '%s 제거됨';
 $lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 되돌리시기 바랍니다.';
 $lang['revstop']               = '되돌리기 작업이 성공적으로 끝났습니다.';
 $lang['note1']                 = '참고: 대소문자를 구별해 찾습니다';
-$lang['note2']                 = '참고: 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최신 판으로 되돌립니다. ';
+$lang['note2']                 = '참고: 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최신 판으로 되돌립니다.';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index 70e3d94f0..bc76470e8 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -13,7 +13,7 @@
  * @author Garam <rowain8@gmail.com>
  */
 $lang['menu']                  = '사용자 관리자';
-$lang['noauth']                = '(사용자 인증이 불가능합니다)';
+$lang['noauth']                = '(사용자 인증을 사용할 수 없습니다)';
 $lang['nosupport']             = '(사용자 관리가 지원되지 않습니다)';
 $lang['badauth']               = '인증 메커니즘이 잘못되었습니다';
 $lang['user_id']               = '사용자';
@@ -35,10 +35,10 @@ $lang['clear']                 = '검색 필터 재설정';
 $lang['filter']                = '필터';
 $lang['export_all']            = '모든 사용자 목록 내보내기 (CSV)';
 $lang['export_filtered']       = '필터된 사용자 목록 내보내기 (CSV)';
-$lang['import']                = '새 사용자 목록 가져오기';
+$lang['import']                = '새 사용자 가져오기';
 $lang['line']                  = '줄 번호';
 $lang['error']                 = '오류 메시지';
-$lang['summary']               = '찾은 사용자 %3$d 중 %1$d-%2$d을(를) 봅니다. 전체 사용자는 %4$d명입니다.';
+$lang['summary']               = '찾은 사용자 %3$d명 중 %1$d-%2$d을(를) 봅니다. 전체 사용자는 %4$d명입니다.';
 $lang['nonefound']             = '찾은 사용자가 없습니다. 전체 사용자는 %d명입니다.';
 $lang['delete_ok']             = '사용자 %d명이 삭제되었습니다';
 $lang['delete_fail']           = '사용자 %d명을 삭제하는 데 실패했습니다.';
@@ -68,6 +68,6 @@ $lang['import_error_badname']  = '잘못된 이름';
 $lang['import_error_badmail']  = '잘못된 이메일 주소';
 $lang['import_error_upload']   = '가져오기를 실패했습니다. csv 파일을 올릴 수 없거나 비어 있습니다.';
 $lang['import_error_readfail'] = '가져오기를 실패했습니다. 올린 파일을 읽을 수 없습니다.';
-$lang['import_error_create']   = '사용자를 만들 수 없습니다.';
+$lang['import_error_create']   = '사용자를 만들 수 없습니다';
 $lang['import_notify_fail']    = '알림 메시지를 가져온 %s (이메일: %s) 사용자에게 보낼 수 없습니다.';
 $lang['import_downloadfailures'] = '교정을 위한 CSV로 다운로드 실패';
-- 
cgit v1.2.3


From e88b0b78dca1024132a36f217b59c9e73a9cc338 Mon Sep 17 00:00:00 2001
From: Vitaly Filatenko <kot@hacktest.net>
Date: Mon, 15 Dec 2014 22:36:37 +0100
Subject: translation update

---
 inc/lang/ru/lang.php                              |  2 ++
 lib/plugins/authad/lang/ru/settings.php           |  5 +++++
 lib/plugins/authldap/lang/ru/settings.php         | 10 ++++++++++
 lib/plugins/authpgsql/lang/ru/settings.php        |  4 ++++
 lib/plugins/extension/lang/ru/intro_install.txt   |  1 +
 lib/plugins/extension/lang/ru/intro_plugins.txt   |  1 +
 lib/plugins/extension/lang/ru/intro_search.txt    |  1 +
 lib/plugins/extension/lang/ru/intro_templates.txt |  1 +
 lib/plugins/extension/lang/ru/lang.php            |  5 +++++
 lib/plugins/usermanager/lang/ru/lang.php          |  2 ++
 10 files changed, 32 insertions(+)
 create mode 100644 lib/plugins/extension/lang/ru/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/ru/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/ru/intro_search.txt
 create mode 100644 lib/plugins/extension/lang/ru/intro_templates.txt

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index be6bdc0a4..ffe513386 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -28,6 +28,7 @@
  * @author Владимир <id37736@yandex.ru>
  * @author Igor Degraf <igordegraf@gmail.com>
  * @author Type-kun <workwork-1@yandex.ru>
+ * @author Vitaly Filatenko <kot@hacktest.net>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
@@ -363,3 +364,4 @@ $lang['searchresult']          = 'Результаты поиска';
 $lang['plainhtml']             = 'Простой HTML';
 $lang['wikimarkup']            = 'вики-разметка';
 $lang['page_nonexist_rev']     = 'Эта страница ещё не существовала %s. Она была создана <a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'Невозможно обработать параметр "%s".';
diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index bb8197765..99c916b44 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -10,13 +10,18 @@
  * @author Владимир <id37736@yandex.ru>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Type-kun <workwork-1@yandex.ru>
+ * @author Vitaly Filatenko <kot@hacktest.net>
  */
 $lang['account_suffix']        = 'Суффикс вашего аккаунта. Например, <code>@my.domain.org</code>';
+$lang['base_dn']               = 'Ваш базовый DN. Например: <code>DC=my,DC=domain,DC=org</code>';
 $lang['domain_controllers']    = 'Список DNS-серверов, разделенных запятой. Например:<code>srv1.domain.org,srv2.domain.org</code>';
+$lang['admin_username']        = 'Привилегированный пользователь Active Directory с доступом ко всем остальным пользовательским данным. Необязательно, однако необходимо для определённых действий вроде отправки почтовой подписки.';
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
 $lang['sso_charset']           = 'Кодировка, в которой веб-сервер передаёт имя пользователя Kerberos или NTLM. Для UTF-8 или latin-1 остаётся пустым. Требует расширение iconv.';
+$lang['real_primarygroup']     = 'Должна ли использоваться настоящая первичная группа вместо "Domain Users" (медленнее)';
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
 $lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль. 0 - отключить.';
+$lang['additional']            = 'Дополнительные AD атрибуты, разделённые запятой, для выборки из данных пользователя. Используется некоторыми плагинами.';
diff --git a/lib/plugins/authldap/lang/ru/settings.php b/lib/plugins/authldap/lang/ru/settings.php
index 5677e06a3..534990648 100644
--- a/lib/plugins/authldap/lang/ru/settings.php
+++ b/lib/plugins/authldap/lang/ru/settings.php
@@ -8,10 +8,20 @@
  * @author Erli Moen <evseev.jr@gmail.com>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Владимир <id37736@yandex.ru>
+ * @author Vitaly Filatenko <kot@hacktest.net>
  */
+$lang['server']                = 'Ваш LDAP сервер. Либо имя хоста (<code>localhost</code>), либо полный URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'Порт LDAP сервера, если выше не был указан полный URL';
+$lang['usertree']              = 'Где искать аккаунты пользователей. Например: <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Где искать группы пользователей. Например: <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP фильтр для поиска аккаунтов пользователей. Например: <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP фильтр для поиска групп. Например: <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Версия протокола. Возможно вам нужно указать <code>3</code>';
 $lang['starttls']              = 'Использовать TLS подключения?';
 $lang['deref']                 = 'Как расшифровывать псевдонимы?';
 $lang['bindpw']                = 'Пароль для указанного пользователя.';
+$lang['userscope']             = 'Ограничить область поиска при поиске пользователей';
+$lang['groupscope']            = 'Ограничить область поиска при поиске групп';
 $lang['debug']                 = 'Показывать дополнительную отладочную информацию при ошибках';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php
index 668ba4ef6..416ea0ec9 100644
--- a/lib/plugins/authpgsql/lang/ru/settings.php
+++ b/lib/plugins/authpgsql/lang/ru/settings.php
@@ -6,6 +6,7 @@
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ * @author Vitaly Filatenko <kot@hacktest.net>
  */
 $lang['server']                = 'Ваш PostgreSQL-сервер';
 $lang['port']                  = 'Порт вашего PostgreSQL-сервера';
@@ -30,5 +31,8 @@ $lang['getUserID']             = 'Выражение SQL, обеспечиваю
 $lang['delUser']               = 'Выражение SQL, осуществляющее удаление пользователя';
 $lang['delUserRefs']           = 'Выражение SQL, осуществляющее удаление пользователя из всех группы';
 $lang['updateUser']            = 'Выражение SQL, осуществляющее обновление профиля пользователя';
+$lang['UpdateLogin']           = 'Измените условие для обновления логина';
+$lang['UpdatePass']            = 'Измените условие для обновления пароля';
+$lang['UpdateEmail']           = 'Измените условие для обновления email';
 $lang['delUserGroup']          = 'Выражение SQL, осуществляющее удаление пользователя из указанной группы';
 $lang['getGroupID']            = 'Выражение SQL, обеспечивающее получение первичного ключа указанной группы';
diff --git a/lib/plugins/extension/lang/ru/intro_install.txt b/lib/plugins/extension/lang/ru/intro_install.txt
new file mode 100644
index 000000000..7b8ac661b
--- /dev/null
+++ b/lib/plugins/extension/lang/ru/intro_install.txt
@@ -0,0 +1 @@
+Здесь вы можете самостоятельно установить плагины и шаблоны, загрузив их или предоставив прямой URL для скачивания.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ru/intro_plugins.txt b/lib/plugins/extension/lang/ru/intro_plugins.txt
new file mode 100644
index 000000000..7262516db
--- /dev/null
+++ b/lib/plugins/extension/lang/ru/intro_plugins.txt
@@ -0,0 +1 @@
+Плагины, установленные в вашей DokuWiki. Здесь вы можете их включить или выключить, или даже полностью удалить. Также здесь показываются обновления плагинов, обязательно прочтите документацию плагина перед обновлением.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ru/intro_search.txt b/lib/plugins/extension/lang/ru/intro_search.txt
new file mode 100644
index 000000000..a8486eab6
--- /dev/null
+++ b/lib/plugins/extension/lang/ru/intro_search.txt
@@ -0,0 +1 @@
+Эта вкладка дает вам доступ ко всем имеющимся сторонним плагинам и шаблонам для DokuWiki. Имейте в виду, что установка стороннего кода может представлять **угрозу безопасности**, возможно вам нужно сперва прочитать о [[doku>security#plugin_security|безопасности плагинов]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ru/intro_templates.txt b/lib/plugins/extension/lang/ru/intro_templates.txt
new file mode 100644
index 000000000..2d0b74256
--- /dev/null
+++ b/lib/plugins/extension/lang/ru/intro_templates.txt
@@ -0,0 +1 @@
+Это шаблоны, установленные в вашей DokuWiki. Вы можете выбрать шаблон, который нужно использовать в [[?do=admin&page=config|Менеджере Конфигурации]]
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index 8e9e10b95..64db39b78 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -6,12 +6,14 @@
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Igor Degraf <igordegraf@gmail.com>
  * @author Type-kun <workwork-1@yandex.ru>
+ * @author Vitaly Filatenko <kot@hacktest.net>
  */
 $lang['menu']                  = 'Управление дополнениями';
 $lang['tab_plugins']           = 'Установленные плагины';
 $lang['tab_templates']         = 'Установленные шаблоны';
 $lang['tab_search']            = 'Поиск и установка';
 $lang['tab_install']           = 'Ручная установка';
+$lang['notimplemented']        = 'Эта возможность ещё не реализована';
 $lang['notinstalled']          = 'Это дополнение не установлено';
 $lang['alreadyenabled']        = 'Это расширение уже включено';
 $lang['alreadydisabled']       = 'Это расширение уже выключено';
@@ -69,6 +71,9 @@ $lang['msg_template_update_success'] = 'Шаблон %s успешно обно
 $lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен';
 $lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён';
 $lang['msg_upload_failed']     = 'Не удалось загрузить файл';
+$lang['missing_dependency']    = '<strong>Отсутствует или отключена зависимость:</strong> %s';
+$lang['security_issue']        = '<strong>Проблема безопасности:</strong> %s';
+$lang['security_warning']      = '<strong>Предупреждение безопасности:</strong> %s';
 $lang['update_available']      = '<strong>Обновление:</strong> доступна новая версия %s.';
 $lang['wrong_folder']          = '<strong>Плагин установлен неправильно:</strong> Переименуйте директорию "%s" в "%s".';
 $lang['url_change']            = '<strong>Ссылка изменилась:</strong> Ссылка для загрузки изменилась с прошлого раза. Проверьте новую ссылку прежде чем обновлять расширение.<br />Новая: %s<br />Старая: %s';
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 515de5186..0914d7b49 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -21,6 +21,7 @@
  * @author Pavel <ivanovtsk@mail.ru>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Igor Degraf <igordegraf@gmail.com>
+ * @author Vitaly Filatenko <kot@hacktest.net>
  */
 $lang['menu']                  = 'Управление пользователями';
 $lang['noauth']                = '(авторизация пользователей недоступна)';
@@ -69,6 +70,7 @@ $lang['add_fail']              = 'Не удалось добавить поль
 $lang['notify_ok']             = 'Письмо с уведомлением отправлено';
 $lang['notify_fail']           = 'Не удалось отправить письмо с уведомлением';
 $lang['import_userlistcsv']    = 'Файл со списком пользователей (CSV):';
+$lang['import_header']         = 'Последний импорт - список ошибок';
 $lang['import_success_count']  = 'Импорт пользователей: %d пользователей найдено, %d импортировано успешно.';
 $lang['import_failure_count']  = 'Импорт пользователей: %d не удалось. Список ошибок прочтите ниже.';
 $lang['import_error_fields']   = 'Не все поля заполнены. Найдено %d, а нужно 4.';
-- 
cgit v1.2.3


From 90394abd2d0fc66a994a3f81c76e265d0707b351 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 17 Dec 2014 13:14:02 +0100
Subject: fix global environment during test requests

---
 _test/core/TestRequest.php | 2 --
 doku.php                   | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/_test/core/TestRequest.php b/_test/core/TestRequest.php
index 060e37d28..dad2060e5 100644
--- a/_test/core/TestRequest.php
+++ b/_test/core/TestRequest.php
@@ -45,8 +45,6 @@ class TestRequest {
      */
     public function execute($uri='/doku.php') {
         global $INPUT;
-        global $ID;
-        global $INFO;
 
         // save old environment
         $server = $_SERVER;
diff --git a/doku.php b/doku.php
index 7cb92cffa..f5aa6cfa4 100644
--- a/doku.php
+++ b/doku.php
@@ -15,6 +15,11 @@ $updateVersion = 47;
 
 if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/');
 
+// define all DokuWiki globals here (needed within test requests but also helps to keep track)
+global  $ACT,  $INPUT, $QUERY, $ID, $REV, $DATE_AT, $IDX,
+        $DATE, $RANGE, $HIGH, $TEXT, $PRE, $SUF, $SUM, $INFO, $JSINFO;
+
+
 if(isset($_SERVER['HTTP_X_DOKUWIKI_DO'])) {
     $ACT = trim(strtolower($_SERVER['HTTP_X_DOKUWIKI_DO']));
 } elseif(!empty($_REQUEST['idx'])) {
-- 
cgit v1.2.3


From 81781cb6b4211de42700790b0f4968f39feababd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 17 Dec 2014 13:14:29 +0100
Subject: never exit during test runs

---
 inc/common.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/common.php b/inc/common.php
index b5fdd1ea5..2c9359a0c 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1828,6 +1828,8 @@ function send_redirect($url) {
     } else {
         header('Location: '.$url);
     }
+
+    if(defined('DOKU_UNITTEST')) return; // no exits during unit tests
     exit;
 }
 
-- 
cgit v1.2.3


From b13d4fce1d858898efc88147b9a2da344119128f Mon Sep 17 00:00:00 2001
From: Satoshi Sahara <sahara.satoshi@gmail.com>
Date: Wed, 17 Dec 2014 14:36:28 +0100
Subject: translation update

---
 lib/plugins/extension/lang/ja/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/extension/lang/ja/lang.php b/lib/plugins/extension/lang/ja/lang.php
index 5264bfb09..ce6ed2b97 100644
--- a/lib/plugins/extension/lang/ja/lang.php
+++ b/lib/plugins/extension/lang/ja/lang.php
@@ -63,7 +63,7 @@ $lang['status_template']       = 'テンプレート';
 $lang['status_bundled']        = '同梱';
 $lang['msg_enabled']           = '%s プラグインを有効化しました。';
 $lang['msg_disabled']          = '%s プラグインを無効化しました。';
-$lang['msg_delete_success']    = '拡張機能をアンインストールしました。';
+$lang['msg_delete_success']    = '拡張機能 %s をアンインストールしました。';
 $lang['msg_delete_failed']     = '拡張機能 %s のアンインストールに失敗しました。';
 $lang['msg_template_install_success'] = '%s テンプレートをインストールできました。';
 $lang['msg_template_update_success'] = '%s テンプレートを更新できました。';
-- 
cgit v1.2.3


From 3940c519db432ec22e8c587504d86191631f9bfb Mon Sep 17 00:00:00 2001
From: Mark <mc.prins@gmail.com>
Date: Wed, 8 Jan 2014 11:56:06 +0100
Subject: use nav+ul element for "you are here"

As described in the common idioms of the HTML5 spec, mark up navigation as a list inside a `nav` element for better semantics and accessibility.

see:

  * http://www.w3.org/html/wg/drafts/html/master/common-idioms.html#rel-up
  * http://lists.w3.org/Archives/Public/public-html/2013Nov/thread.html#msg6
  * https://dl.dropboxusercontent.com/u/377471/breadcrumb.html

for discussion and background.
---
 inc/template.php                    | 41 ++++++++++++++++++++++++-------------
 lib/tpl/dokuwiki/css/mixins.less    | 15 +++++++++++++-
 lib/tpl/dokuwiki/css/structure.less | 15 ++++++++++++++
 3 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 3bccb0bd8..1fad18271 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -893,12 +893,12 @@ function tpl_breadcrumbs($sep = '•') {
  * @author Nigel McNie <oracle.shinoda@gmail.com>
  * @author Sean Coates <sean@caedmon.net>
  * @author <fredrik@averpil.com>
- * @todo   May behave strangely in RTL languages
+ * @author Mark C. Prins <mprins@users.sf.net>
  *
  * @param string $sep Separator between entries
  * @return bool
  */
-function tpl_youarehere($sep = ' » ') {
+function tpl_youarehere($sep = ' → ') {
     global $conf;
     global $ID;
     global $lang;
@@ -909,12 +909,15 @@ function tpl_youarehere($sep = ' » ') {
     $parts = explode(':', $ID);
     $count = count($parts);
 
-    echo '<span class="bchead">'.$lang['youarehere'].' </span>';
-
+    echo '<nav><h2 class="bchead">'.$lang['youarehere'].': </h2>';
+    echo '<ul class="navlist">';
     // always print the startpage
-    echo '<span class="home">';
-    tpl_pagelink(':'.$conf['start']);
-    echo '</span>';
+    if ($count > 1) {
+        echo '<li class="home">'.html_wikilink(':'.$conf['start']).$sep.'</li>';
+    } else {
+        echo '<li class="home">'.$conf['start'].'</li>';
+    }
+
 
     // print intermediate namespace links
     $part = '';
@@ -923,18 +926,28 @@ function tpl_youarehere($sep = ' » ') {
         $page = $part;
         if($page == $conf['start']) continue; // Skip startpage
 
-        // output
-        echo $sep;
-        tpl_pagelink($page);
+        echo '<li>'.html_wikilink($page);
+        if ($i < $count - 2) {
+            echo $sep.'</li>';
+        } else {
+            echo '</li>';
+        }
     }
 
     // print current page, skipping start page, skipping for namespace index
     resolve_pageid('', $page, $exists);
-    if(isset($page) && $page == $part.$parts[$i]) return true;
+    if(isset($page) && $page == $part.$parts[$i]) {
+        echo '</li></ul></nav>';
+        return true;
+    }
+
     $page = $part.$parts[$i];
-    if($page == $conf['start']) return true;
-    echo $sep;
-    tpl_pagelink($page);
+    if($page == $conf['start']) {
+        echo '</li></ul></nav>';
+        return true;
+    }
+
+    echo $sep.'</li><li class="curid">'.noNSorNS($page).'</li></ul></nav>';
     return true;
 }
 
diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less
index a88767e97..4b15bb600 100644
--- a/lib/tpl/dokuwiki/css/mixins.less
+++ b/lib/tpl/dokuwiki/css/mixins.less
@@ -7,4 +7,17 @@
     background: -o-linear-gradient(     @declaration);
     background: -ms-linear-gradient(    @declaration);
     background: linear-gradient(        @declaration);
-}
\ No newline at end of file
+}
+
+/**
+ * provides inline list styling.
+ */
+.inline-list(){
+    list-style-type: none;
+    
+    & li {
+        margin: 0;
+        padding: 0;
+        display: inline;
+    }
+}
diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less
index 3ea2f83eb..f7dea3948 100644
--- a/lib/tpl/dokuwiki/css/structure.less
+++ b/lib/tpl/dokuwiki/css/structure.less
@@ -87,3 +87,18 @@ body {
 #dokuwiki__footer {
     clear: both;
 }
+
+.dokuwiki .navlist {
+    display: inline;
+    padding: 0;
+    .inline-list;
+}
+
+.bchead {
+    display: inline;
+    font-size: inherit;
+}
+
+.curid {
+    font-weight: bold;
+}
-- 
cgit v1.2.3


From db42b6f8860359481248e9bc847b111497511d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 18 Dec 2014 10:50:08 +0100
Subject: Add test for internal video files

---
 _test/data/media/wiki/kind_zu_katze.ogv      | Bin 0 -> 45883 bytes
 _test/data/media/wiki/kind_zu_katze.png      | Bin 0 -> 970 bytes
 _test/data/media/wiki/kind_zu_katze.webm     | Bin 0 -> 101529 bytes
 _test/tests/inc/parser/parser_media.test.php |  35 +++++++++++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 _test/data/media/wiki/kind_zu_katze.ogv
 create mode 100644 _test/data/media/wiki/kind_zu_katze.png
 create mode 100644 _test/data/media/wiki/kind_zu_katze.webm

diff --git a/_test/data/media/wiki/kind_zu_katze.ogv b/_test/data/media/wiki/kind_zu_katze.ogv
new file mode 100644
index 000000000..1ad3732dc
Binary files /dev/null and b/_test/data/media/wiki/kind_zu_katze.ogv differ
diff --git a/_test/data/media/wiki/kind_zu_katze.png b/_test/data/media/wiki/kind_zu_katze.png
new file mode 100644
index 000000000..a5c151e3f
Binary files /dev/null and b/_test/data/media/wiki/kind_zu_katze.png differ
diff --git a/_test/data/media/wiki/kind_zu_katze.webm b/_test/data/media/wiki/kind_zu_katze.webm
new file mode 100644
index 000000000..2973ff833
Binary files /dev/null and b/_test/data/media/wiki/kind_zu_katze.webm differ
diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php
index 0b62473f8..195b95991 100644
--- a/_test/tests/inc/parser/parser_media.test.php
+++ b/_test/tests/inc/parser/parser_media.test.php
@@ -65,6 +65,41 @@ class TestOfDoku_Parser_Media extends TestOfDoku_Parser {
         $rest = 'away.vid</a>';
         $this->assertEquals(substr($url,161),$rest);
     }
+
+
+    function testVideoOGVInternal() {
+        $file = 'wiki:kind_zu_katze.ogv';
+        $parser_response = p_get_instructions('{{' . $file . '}}');
+
+        $calls = array (
+            array('document_start',array()),
+            array('p_open',array()),
+            array('internalmedia',array($file,null,null,null,null,'cache','details')),
+            array('cdata',array(null)),
+            array('p_close',array()),
+            array('document_end',array()),
+        );
+        $this->assertEquals(array_map('stripbyteindex',$parser_response),$calls);
+
+        $Renderer = new Doku_Renderer_xhtml();
+        $url = $Renderer->externalmedia($file,null,null,null,null,'cache','details',true);
+
+        $video = '<video class="media" width="320" height="240" controls="controls" poster="/./lib/exe/fetch.php?media=wiki:kind_zu_katze.png">';
+        $this->assertEquals(substr($url,0,125),$video);
+
+        $source_webm = '<source src="/./lib/exe/fetch.php?media=wiki:kind_zu_katze.webm" type="video/webm" />';
+        $this->assertEquals(substr($url,126,85),$source_webm);
+        $source_ogv = '<source src="/./lib/exe/fetch.php?media=wiki:kind_zu_katze.ogv" type="video/ogg" />';
+        $this->assertEquals(substr($url,212,83),$source_ogv);
+
+        $a_webm = '<a href="/./lib/exe/fetch.php?id=&amp;cache=&amp;media=wiki:kind_zu_katze.webm" class="media mediafile mf_webm" title="wiki:kind_zu_katze.webm (99.2 KB)">kind_zu_katze.webm</a>';
+        $a_ogv = '<a href="/./lib/exe/fetch.php?id=&amp;cache=&amp;media=wiki:kind_zu_katze.ogv" class="media mediafile mf_ogv" title="wiki:kind_zu_katze.ogv (44.8 KB)">kind_zu_katze.ogv</a>';
+        $this->assertEquals(substr($url,296,176),$a_webm);
+        $this->assertEquals(substr($url,472,172),$a_ogv);
+
+        $rest = '</video>'."\n";
+        $this->assertEquals(substr($url,644),$rest);
+    }
 }
 
 /**
-- 
cgit v1.2.3


From 50e07413f6c62d6593a89dcf070dffd413170aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 18 Dec 2014 11:02:40 +0100
Subject: Fix file size

---
 _test/tests/inc/parser/parser_media.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php
index 195b95991..e124b85e2 100644
--- a/_test/tests/inc/parser/parser_media.test.php
+++ b/_test/tests/inc/parser/parser_media.test.php
@@ -92,7 +92,7 @@ class TestOfDoku_Parser_Media extends TestOfDoku_Parser {
         $source_ogv = '<source src="/./lib/exe/fetch.php?media=wiki:kind_zu_katze.ogv" type="video/ogg" />';
         $this->assertEquals(substr($url,212,83),$source_ogv);
 
-        $a_webm = '<a href="/./lib/exe/fetch.php?id=&amp;cache=&amp;media=wiki:kind_zu_katze.webm" class="media mediafile mf_webm" title="wiki:kind_zu_katze.webm (99.2 KB)">kind_zu_katze.webm</a>';
+        $a_webm = '<a href="/./lib/exe/fetch.php?id=&amp;cache=&amp;media=wiki:kind_zu_katze.webm" class="media mediafile mf_webm" title="wiki:kind_zu_katze.webm (99.1 KB)">kind_zu_katze.webm</a>';
         $a_ogv = '<a href="/./lib/exe/fetch.php?id=&amp;cache=&amp;media=wiki:kind_zu_katze.ogv" class="media mediafile mf_ogv" title="wiki:kind_zu_katze.ogv (44.8 KB)">kind_zu_katze.ogv</a>';
         $this->assertEquals(substr($url,296,176),$a_webm);
         $this->assertEquals(substr($url,472,172),$a_ogv);
-- 
cgit v1.2.3


From 7268f44f1b278bafced8e85930ba3dd0c92b8900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 18 Dec 2014 11:39:15 +0100
Subject: Remove stray comment block

---
 _test/tests/inc/parser/parser_media.test.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/_test/tests/inc/parser/parser_media.test.php b/_test/tests/inc/parser/parser_media.test.php
index e124b85e2..d9a0626f5 100644
--- a/_test/tests/inc/parser/parser_media.test.php
+++ b/_test/tests/inc/parser/parser_media.test.php
@@ -101,13 +101,3 @@ class TestOfDoku_Parser_Media extends TestOfDoku_Parser {
         $this->assertEquals(substr($url,644),$rest);
     }
 }
-
-/**
- * .oga:
- * http://upload.wikimedia.org/wikipedia/commons/6/6b/Meow_of_a_pleading_cat.oga
- *
- * .wav:
- * http://upload.wikimedia.org/wikipedia/commons/8/81/Meow_of_a_Siamese_cat_-_freemaster2.wav
- *
- *
- */
-- 
cgit v1.2.3


From 2fd1f790dae5f89a60537f9b80b9c5a10312f595 Mon Sep 17 00:00:00 2001
From: Guido Salatino <guidorafael23@gmail.com>
Date: Thu, 18 Dec 2014 21:26:34 +0100
Subject: translation update

---
 inc/lang/pt/conflict.txt                          |  10 +-
 inc/lang/pt/denied.txt                            |   2 +-
 inc/lang/pt/lang.php                              |  12 +-
 inc/lang/pt/resetpwd.txt                          |   3 +
 lib/plugins/authad/lang/pt/settings.php           |   6 +
 lib/plugins/authldap/lang/pt/settings.php         |  10 ++
 lib/plugins/authmysql/lang/pt/settings.php        |  20 ++++
 lib/plugins/authpgsql/lang/pt/settings.php        |  17 +++
 lib/plugins/extension/lang/pt/intro_install.txt   |   1 +
 lib/plugins/extension/lang/pt/intro_plugins.txt   |   1 +
 lib/plugins/extension/lang/pt/intro_search.txt    |   1 +
 lib/plugins/extension/lang/pt/intro_templates.txt |   1 +
 lib/plugins/extension/lang/pt/lang.php            | 132 ++++++++++++++++++++++
 lib/plugins/usermanager/lang/pt/lang.php          |   9 ++
 14 files changed, 215 insertions(+), 10 deletions(-)
 create mode 100644 inc/lang/pt/resetpwd.txt
 create mode 100644 lib/plugins/extension/lang/pt/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/pt/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/pt/intro_search.txt
 create mode 100644 lib/plugins/extension/lang/pt/intro_templates.txt
 create mode 100644 lib/plugins/extension/lang/pt/lang.php

diff --git a/inc/lang/pt/conflict.txt b/inc/lang/pt/conflict.txt
index d2af1fe11..b6d7319b0 100644
--- a/inc/lang/pt/conflict.txt
+++ b/inc/lang/pt/conflict.txt
@@ -1,9 +1,5 @@
-====== Conflito de Edição ======
+====== Uma versão mais recente existe ======
 
-**Atenção**: Existe uma versão mais recente do que a versão usada no começo da sua edição. Isto acontece quando outra pessoa editou este documento entretanto e já gravou as alterações efectuadas.
+Existe uma versão mais recente do documento editado. Isso acontece quando um outro usuário alterou o documento enquanto você estava editando.
 
-Por favor, examine todas as diferenças mostradas abaixo com atenção, e decida qual a versão que deverá ser tornada a mais actual:   * Se escolher <Gravar> a sua versão será sobreposta à versão editada pela outra pessoa, que será perdida.   * Se escolher <Cancelar> a versão editada pela outra pessoa será a versão final, e a sua será perdida.
-
-**Nota**: Sem que efectue a consolidação das alterações de ambas as revisões ao documento irá sempre perder uma das versões.
-
-----
+Examine cuidadosamente as diferenças mostradas abaixo, em seguida, decida qual versão manter. Se você escolher ''salvar '', sua versão será salva. Clique ''cancelar '' para manter a versão atual.
diff --git a/inc/lang/pt/denied.txt b/inc/lang/pt/denied.txt
index 3af816666..84c3a9406 100644
--- a/inc/lang/pt/denied.txt
+++ b/inc/lang/pt/denied.txt
@@ -1,4 +1,4 @@
 ====== Permissão Negada ======
 
-Não possui direitos e permissões suficientes para continuar.
+Desculpe, você não possui direitos e permissões suficientes para continuar.
 
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 54f56f8e3..5d462e198 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -11,6 +11,7 @@
  * @author José Campos zecarlosdecampos@gmail.com
  * @author Murilo <muriloricci@hotmail.com>
  * @author Paulo Silva <paulotsilva@yahoo.com>
+ * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -24,12 +25,12 @@ $lang['btn_source']            = 'Ver fonte';
 $lang['btn_show']              = 'Ver página';
 $lang['btn_create']            = 'Criar página';
 $lang['btn_search']            = 'Pesquisar';
-$lang['btn_save']              = 'Gravar';
+$lang['btn_save']              = 'Salvar';
 $lang['btn_preview']           = 'Prever';
 $lang['btn_top']               = 'Voltar ao topo';
 $lang['btn_newer']             = '<< mais recente';
 $lang['btn_older']             = 'menos recente >>';
-$lang['btn_revs']              = 'Revisões';
+$lang['btn_revs']              = 'Revisões antigas';
 $lang['btn_recent']            = 'Alt. Recentes';
 $lang['btn_upload']            = 'Carregar';
 $lang['btn_cancel']            = 'Cancelar';
@@ -106,6 +107,7 @@ $lang['searchmedia_in']        = 'Procurar em %s';
 $lang['txt_upload']            = 'Escolha ficheiro para carregar:';
 $lang['txt_filename']          = 'Carregar como (opcional):';
 $lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
+$lang['maxuploadsize']         = 'Publique max. %s por arquivo.';
 $lang['lockedby']              = 'Bloqueado por:';
 $lang['lockexpire']            = 'Expira em:';
 $lang['js']['willexpire']      = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos use o botão Prever para re-iniciar o temporizador de bloqueio.';
@@ -190,6 +192,8 @@ $lang['diff_side']             = 'Lado a lado';
 $lang['diffprevrev']           = 'Revisão anterior';
 $lang['diffnextrev']           = 'Próxima revisão';
 $lang['difflastrev']           = 'Última revisão';
+$lang['diffbothprevrev']       = 'Ambos os lados da revisão anterior';
+$lang['diffbothnextrev']       = 'Ambos os lados da próxima revisão';
 $lang['line']                  = 'Linha';
 $lang['breadcrumb']            = 'Está em:';
 $lang['youarehere']            = 'Está aqui:';
@@ -285,6 +289,7 @@ $lang['i_problems']            = 'O instalador encontrou alguns problemas, indic
 $lang['i_modified']            = 'Por razões de segurança, este script só funciona em novas e não-modificadas instalações do Dokuwiki. Deve por isso re-extrair os ficheiros do pacote que descarregou ou então deve consultar as completas <a href="http://dokuwiki.org/install">instruções de instalação do Dokuwiki installation instructions</a>';
 $lang['i_funcna']              = 'A função PHP <code>%s</code> não está disponível. Terá o serviço de alojamento desactivado-a por alguma razão?';
 $lang['i_phpver']              = 'A versão de PHP actual <code>%s</code> é inferior à versão mínima <code>%s</code>. É preciso actualizar a instalação PHP.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload deve ser desabilitada no php.ini para executar DokuWiki.';
 $lang['i_permfail']            = '<code>%s</code> não permite que o DokuWiki escreva nela. É preciso corrigir as permissões desta pasta!';
 $lang['i_confexists']          = '<code>%s</code> já existe';
 $lang['i_writeerr']            = 'Não foi possível criar <code>%s</code>. É preciso verificar as permissões e criar o ficheiro manualmente.';
@@ -326,6 +331,7 @@ $lang['media_files']           = 'Ficheiros em %s';
 $lang['media_upload']          = 'Enviar para o grupo <strong>%s</strong>.';
 $lang['media_search']          = 'Procurar no grupo <strong>%s</strong>.';
 $lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s em %s';
 $lang['media_edit']            = 'Editar %s';
 $lang['media_history']         = 'Histórico do %s';
 $lang['media_meta_edited']     = 'metadata editada';
@@ -337,3 +343,5 @@ $lang['currentns']             = 'Namespace actual';
 $lang['searchresult']          = 'Resultado da pesquisa';
 $lang['plainhtml']             = 'HTML simples';
 $lang['wikimarkup']            = 'Markup de Wiki';
+$lang['page_nonexist_rev']     = 'Página não existia no %s. Posteriormente, foi criado em <a href="%s">% s </a>.';
+$lang['unable_to_parse_date']  = 'Não é possível analisar o parâmetro "%s".';
diff --git a/inc/lang/pt/resetpwd.txt b/inc/lang/pt/resetpwd.txt
new file mode 100644
index 000000000..898772a23
--- /dev/null
+++ b/inc/lang/pt/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Definir nova senha ======
+
+Digite uma nova senha para a sua conta nesta wiki.
\ No newline at end of file
diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php
index dc60d7259..6256eb597 100644
--- a/lib/plugins/authad/lang/pt/settings.php
+++ b/lib/plugins/authad/lang/pt/settings.php
@@ -6,12 +6,18 @@
  * @author André Neves <drakferion@gmail.com>
  * @author Murilo <muriloricci@hotmail.com>
  * @author Paulo Silva <paulotsilva@yahoo.com>
+ * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['account_suffix']        = 'O sufixo da sua conta. Por exemplo, <code>@my.domain.org</code>';
+$lang['base_dn']               = 'Sua base DN. Eg. <code> DC=meu, DC=dominio, DC=org </ code>';
 $lang['domain_controllers']    = 'Uma lista separada por vírgulas de Controladores de Domínio (AD DC). Ex.: <code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_username']        = 'Um utilizador com privilégios na Active Directory que tenha acesso aos dados de todos os outros utilizadores. Opcional, mas necessário para certas ações como enviar emails de subscrição.';
 $lang['admin_password']        = 'A senha para o utilizador acima.';
 $lang['sso']                   = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?';
+$lang['sso_charset']           = 'O charset do seu servidor web vai passar o nome de usuário Kerberos ou NTLM  vazio para UTF-8 ou latin-1. Requer a extensão iconv.';
+$lang['real_primarygroup']     = 'Deveria ser resolvido, de fato, o grupo primário ao invés de assumir "Usuários de Domínio" (mais lento).';
 $lang['use_ssl']               = 'Usar ligação SSL? Se usada, não ative TLS abaixo.';
 $lang['use_tls']               = 'Usar ligação TLS? Se usada, não ative SSL abaixo.';
+$lang['debug']                 = 'Deve-se mostrar saída adicional de depuração de erros?';
 $lang['expirywarn']            = 'Número de dias de avanço para avisar o utilizador da expiração da senha. 0 para desativar.';
+$lang['additional']            = 'Uma lista separada por vírgula de atributos adicionais de AD para buscar a partir de dados do usuário. Usado por alguns plugins.';
diff --git a/lib/plugins/authldap/lang/pt/settings.php b/lib/plugins/authldap/lang/pt/settings.php
index a2ccf87ad..b54f2a1bc 100644
--- a/lib/plugins/authldap/lang/pt/settings.php
+++ b/lib/plugins/authldap/lang/pt/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author André Neves <drakferion@gmail.com>
+ * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['server']                = 'O seu servidor de LDAP. Ou hostname (<code>localhost</code>) ou URL qualificado completo (<code>ldap://servidor.tld:389</code>)';
 $lang['port']                  = 'Porta de servidor de LDAP se o URL completo não foi fornecido acima';
@@ -14,5 +15,14 @@ $lang['groupfilter']           = 'Filtro LDAP para procurar por grupos. Por exem
 $lang['version']               = 'A versão do protocolo a utilizar. Pode precisar de alterar isto para <code>3</code>';
 $lang['starttls']              = 'Usar ligações TLS?';
 $lang['referrals']             = 'Referrals devem ser seguidos?';
+$lang['deref']                 = 'Como desreferenciar aliases?';
+$lang['binddn']                = 'DN de um usuário de ligação opcional, quando a ligação é anônima não é suficiente. Eg. <code> cn = admin, dc = my, dc = home </code>';
 $lang['bindpw']                = 'Senha do utilizador acima';
+$lang['userscope']             = 'Escopo de pesquisa Limite para pesquisa de usuário';
+$lang['groupscope']            = 'Escopo de pesquisa Limite para pesquisa de grupo';
+$lang['groupkey']              = 'A participação no grupo a partir de qualquer atributo de usuário (em vez de AD padrão de grupos) exemplo: grupo de departamento ou número de telefone';
 $lang['debug']                 = 'Mostrar informação adicional de debug aquando de erros';
+$lang['deref_o_0']             = 'LDAP_DEREF_NUNCA';
+$lang['deref_o_1']             = 'LDAP_DEREF_PESQUISANDO';
+$lang['deref_o_2']             = 'LDAP_DEREF_BUSCANDO';
+$lang['deref_o_3']             = 'LDAP_DEREF_SEMPRE';
diff --git a/lib/plugins/authmysql/lang/pt/settings.php b/lib/plugins/authmysql/lang/pt/settings.php
index 0c7f303e7..821dcf802 100644
--- a/lib/plugins/authmysql/lang/pt/settings.php
+++ b/lib/plugins/authmysql/lang/pt/settings.php
@@ -4,20 +4,40 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author André Neves <drakferion@gmail.com>
+ * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['server']                = 'O seu servidor de MySQL';
 $lang['user']                  = 'Utilizador MySQL';
 $lang['password']              = 'Senha para o utilizador acima';
 $lang['database']              = 'Base de dados a usar';
+$lang['charset']               = 'Conjunto de caracteres usado na base de dados';
 $lang['debug']                 = 'Mostrar informação adicional de debug';
+$lang['forwardClearPass']      = 'Passe as senhas do usuário como texto puro para as instruções SQL abaixo, em vez de usar a opção passcrypt';
+$lang['TablesToLock']          = 'Lista de tabelas, separadas por virgula, que devem ser bloqueadas em operações de escrita';
+$lang['checkPass']             = 'Instrução SQL para verificar senhas';
+$lang['getUserInfo']           = 'Instrução SQL para recuperar informações do usuário';
+$lang['getGroups']             = 'Instrução SQL para recuperar os usuários participantes de um grupo';
+$lang['getUsers']              = 'Instrução SQL para listar todos usuários';
 $lang['FilterLogin']           = 'Cláusula SQL para filtrar utilizadores por tipo de login';
 $lang['FilterName']            = 'Cláusula SQL para filtrar utilizadores por nome completo';
 $lang['FilterEmail']           = 'Cláusula SQL para filtrar utilizadores por endereço de email';
 $lang['FilterGroup']           = 'Cláusula SQL para filtrar utilizadores por pertença a grupo';
 $lang['SortOrder']             = 'Cláusula SQL para ordenar utilizadores';
+$lang['addUser']               = 'Instrução SQL para adicionar novo usuário';
+$lang['addGroup']              = 'Instrução SQL para adicionar um novo grupo';
+$lang['addUserGroup']          = 'Instrução SQL para adicionar um usuário a um grupo existente';
+$lang['delGroup']              = 'Instrução SQL para remover um grupo';
+$lang['getUserID']             = 'Instrução SQL para obter a chave principal de um usuário';
+$lang['delUser']               = 'Instrução SQL para excluir um usuário';
+$lang['delUserRefs']           = 'Instrução SQL para excluir um usuário de todos os grupos';
+$lang['updateUser']            = 'Instrução SQL para atualizar um perfil de usuário';
 $lang['UpdateLogin']           = 'Cláusula de atualização para atualizar o nome de login do utilizador';
 $lang['UpdatePass']            = 'Cláusula de atualização para atualizar a senha do utilizador';
 $lang['UpdateEmail']           = 'Cláusula de atualização para atualizar o endereço de email do utilizador';
 $lang['UpdateName']            = 'Cláusula de atualização para atualizar o nome completo do utilizador';
+$lang['UpdateTarget']          = 'Cláusula limite para identificar o usuário ao atualizar';
+$lang['delUserGroup']          = 'Instrução SQL para remover um usuário de um determinado grupo';
+$lang['getGroupID']            = 'Instrução SQL para obter a chave principal de um determinado grupo';
 $lang['debug_o_0']             = 'nenhum';
 $lang['debug_o_1']             = 'só aquando de erros';
+$lang['debug_o_2']             = 'todas as consultas SQL';
diff --git a/lib/plugins/authpgsql/lang/pt/settings.php b/lib/plugins/authpgsql/lang/pt/settings.php
index b33b81141..f81ec22dc 100644
--- a/lib/plugins/authpgsql/lang/pt/settings.php
+++ b/lib/plugins/authpgsql/lang/pt/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author André Neves <drakferion@gmail.com>
+ * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['server']                = 'O seu servidor PostgreSQL';
 $lang['port']                  = 'A porta do seu servidor PostgreSQL';
@@ -11,12 +12,28 @@ $lang['user']                  = 'Nome de utilizador PostgreSQL';
 $lang['password']              = 'Senha do utilizador acima';
 $lang['database']              = 'Base de dados a usar';
 $lang['debug']                 = 'Mostrar informação adicional de debug';
+$lang['forwardClearPass']      = 'Passe as senhas do usuário como texto puro para as instruções SQL abaixo, em vez de usar a opção passcrypt';
+$lang['checkPass']             = 'Instrução SQL para verificar senhas';
+$lang['getUserInfo']           = 'Instrução SQL para recuperar informações de um usuário';
+$lang['getGroups']             = 'Instrução SQL para recuperar os usuários participantes de um grupo';
+$lang['getUsers']              = 'Instrução SQL para listar todos usuários';
 $lang['FilterLogin']           = 'Cláusula SQL para filtrar utilizadores por nome de login';
 $lang['FilterName']            = 'Cláusula SQL para filtrar utilizadores por nome completo';
 $lang['FilterEmail']           = 'Cláusula SQL para filtrar utilizadores por endereço de email';
 $lang['FilterGroup']           = 'Cláusula SQL para filtrar utilizadores por pertença a grupo';
 $lang['SortOrder']             = 'Cláusula SQL para ordenar utilizadores';
+$lang['addUser']               = 'Instrução SQL para adicionar um novo usuário';
+$lang['addGroup']              = 'Instrução SQL para adicionar um novo grupo';
+$lang['addUserGroup']          = 'Instrução SQL para adicionar um usuário a um grupo existente';
+$lang['delGroup']              = 'Instrução SQL para remover um grupo';
+$lang['getUserID']             = 'Instrução SQL para obter a chave principal de um usuário';
+$lang['delUser']               = 'Instrução SQL para remover um usuário';
+$lang['delUserRefs']           = 'Instrução SQL para remover um usuário de todos os grupos';
+$lang['updateUser']            = 'Instrução SQL para atualizar um perfil de usuário';
 $lang['UpdateLogin']           = 'Cláusula de atualização para atualizar o nome de login do utilizador';
 $lang['UpdatePass']            = 'Cláusula de atualização para atualizar a senha do utilizador';
 $lang['UpdateEmail']           = 'Cláusula de atualização para atualizar o endereço de email do utilizador';
 $lang['UpdateName']            = 'Cláusula de atualização para atualizar o nome completo do utilizador';
+$lang['UpdateTarget']          = 'Cláusula limite para identificar o usuário ao atualizar';
+$lang['delUserGroup']          = 'Instrução SQL para remover um usuário de um determinado grupo';
+$lang['getGroupID']            = 'Instrução SQL para obter a chave principal de um determinado grupo';
diff --git a/lib/plugins/extension/lang/pt/intro_install.txt b/lib/plugins/extension/lang/pt/intro_install.txt
new file mode 100644
index 000000000..5e5871391
--- /dev/null
+++ b/lib/plugins/extension/lang/pt/intro_install.txt
@@ -0,0 +1 @@
+Aqui você pode instalar manualmente plugins e modelos ou enviando-os (upload) ou fornecendo uma URL de download direto.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt/intro_plugins.txt b/lib/plugins/extension/lang/pt/intro_plugins.txt
new file mode 100644
index 000000000..fcfaa5cea
--- /dev/null
+++ b/lib/plugins/extension/lang/pt/intro_plugins.txt
@@ -0,0 +1 @@
+Estes são os plugins instalados atualmente em seu DokuWiki. Você pode ativar ou desativar ou desinstala-los completamente aqui. Atualizações de plugins também são mostradas aqui, não se esqueça de ler a documentação do plug-in antes de atualizar.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt/intro_search.txt b/lib/plugins/extension/lang/pt/intro_search.txt
new file mode 100644
index 000000000..be39a9860
--- /dev/null
+++ b/lib/plugins/extension/lang/pt/intro_search.txt
@@ -0,0 +1 @@
+Esta guia lhe dá acesso a todos os plugins e modelos de terceiros disponíveis DokuWiki. Por favor, esteja ciente de que a instalação de componentes de terceiros pode representar um risco de segurança ** **, você pode querer ler sobre [[doku> segurança # plugin_security | segurança plug-in]] antes de realizar a instalação de módulos de terceiros.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt/intro_templates.txt b/lib/plugins/extension/lang/pt/intro_templates.txt
new file mode 100644
index 000000000..ecdf99f17
--- /dev/null
+++ b/lib/plugins/extension/lang/pt/intro_templates.txt
@@ -0,0 +1 @@
+Estes são os modelos atualmente instalados em seu DokuWiki. Você pode selecionar o modelo a ser usado no [[Do = admin & page = configuração |? Configuration Manager]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/pt/lang.php b/lib/plugins/extension/lang/pt/lang.php
new file mode 100644
index 000000000..c7b4f29c2
--- /dev/null
+++ b/lib/plugins/extension/lang/pt/lang.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Guido Salatino <guidorafael23@gmail.com>
+ */
+$lang['menu']                  = 'Gerenciador de Extensões';
+$lang['tab_plugins']           = 'Plugins Instalados';
+$lang['tab_templates']         = 'Modelos Instalados';
+$lang['tab_search']            = 'Pesquisar e Instalar';
+$lang['tab_install']           = 'Instalação Manual';
+$lang['notimplemented']        = 'Este recurso não foi implementado ainda';
+$lang['notinstalled']          = 'Esta extensão não está instalada';
+$lang['alreadyenabled']        = 'Esta extensão já foi ativada';
+$lang['alreadydisabled']       = 'Esta extensão já foi desativada';
+$lang['pluginlistsaveerror']   = 'Houve um erro ao salvar a lista de plugins';
+$lang['unknownauthor']         = 'Autor desconhecido';
+$lang['unknownversion']        = 'Versão desconhecida';
+$lang['btn_info']              = 'Mostrar mais informações';
+$lang['btn_update']            = 'Atualizar';
+$lang['btn_uninstall']         = 'Desinstalar';
+$lang['btn_enable']            = 'Habilitar';
+$lang['btn_disable']           = 'Desabilitar';
+$lang['btn_install']           = 'Instalar';
+$lang['btn_reinstall']         = 'Reinstalar';
+$lang['js']['reallydel']       = 'Confirma a desinstalação desta extensão?';
+$lang['search_for']            = 'Pesquisar Extensão:';
+$lang['search']                = 'Pesquisar';
+$lang['extensionby']           = '<strong>%s</strong> by %s';
+$lang['screenshot']            = 'Screenshot of %s';
+$lang['popularity']            = 'Popularidade: %s%%';
+$lang['homepage_link']         = 'Documentos';
+$lang['bugs_features']         = 'Erros';
+$lang['tags']                  = 'Tags:';
+$lang['author_hint']           = 'Pesquisar extensões deste autor';
+$lang['installed']             = 'Instalado:
+';
+$lang['downloadurl']           = 'Baixar URL:
+';
+$lang['repository']            = 'Repositório:
+';
+$lang['unknown']               = '<em> desconhecido </ em>
+';
+$lang['installed_version']     = 'Versão instalada:';
+$lang['install_date']          = 'Sua última atualização:';
+$lang['available_version']     = 'Versão disponível:
+';
+$lang['compatible']            = 'Compatível com:';
+$lang['depends']               = 'Depende de:
+';
+$lang['similar']               = 'Semelhante a:
+';
+$lang['conflicts']             = 'Conflitos com:
+';
+$lang['donate']                = 'Assim?
+';
+$lang['donate_action']         = 'Pague um café para o autor!';
+$lang['repo_retry']            = 'Tentar novamente
+';
+$lang['provides']              = 'Fornece:
+';
+$lang['status']                = 'Status:
+';
+$lang['status_installed']      = 'instalado
+';
+$lang['status_not_installed']  = 'não instalado
+';
+$lang['status_protected']      = 'protegido
+';
+$lang['status_enabled']        = 'habilitado';
+$lang['status_disabled']       = 'desabilitado';
+$lang['status_unmodifiable']   = 'imodificável
+';
+$lang['status_plugin']         = 'plugin
+';
+$lang['status_template']       = 'modelo
+';
+$lang['status_bundled']        = 'empacotado
+';
+$lang['msg_enabled']           = 'Plugin %s habilitado
+';
+$lang['msg_disabled']          = 'Plugin %s desabilitado';
+$lang['msg_delete_success']    = 'Extensão %s desinstalada';
+$lang['msg_delete_failed']     = 'Desinstalar Extensão %s falhou
+';
+$lang['msg_template_install_success'] = 'Modelo %s instalado com sucesso';
+$lang['msg_template_update_success'] = 'Modelo %s atualizado com sucesso
+';
+$lang['msg_plugin_install_success'] = 'Plugin %s instalado com sucesso
+';
+$lang['msg_plugin_update_success'] = 'Plugin %s atualizado com sucesso
+';
+$lang['msg_upload_failed']     = 'Enviando o arquivo falhou
+';
+$lang['missing_dependency']    = '<strong>dependência ausente ou desabilitada:</strong> %s
+';
+$lang['security_issue']        = '<strong> Questão de segurança:</strong> %s
+';
+$lang['security_warning']      = '<strong> Aviso de segurança:</strong> %s';
+$lang['update_available']      = '<strong>Atualização:</strong> Nova versão %s está disponível.
+';
+$lang['wrong_folder']          = '<strong>Plugin instalado incorretamente: </strong> Renomear pasta de plugins de "%s" para "%s".
+';
+$lang['url_change']            = '<strong>URL mudou: </strong> URL para download mudou desde o último download. Verifique se a nova URL é válida antes de atualizar a extensão <br/> Nova:%s<br/>Antiga:%s
+';
+$lang['error_badurl']          = 'URLs deve começar com http ou https
+';
+$lang['error_dircreate']       = 'Não é possível criar pasta temporária para receber o download
+';
+$lang['error_download']        = 'Não é possível baixar o arquivo:%s
+';
+$lang['error_decompress']      = 'Não é possível descompactar o arquivo baixado. Talvez seja resultado de um download ruim, nesse caso, você deve tentar novamente; ou o formato de compressão pode ser desconhecido, nesse caso, você precisará baixar e instalar manualmente.';
+$lang['error_findfolder']      = 'Não foi possível identificar diretório de extensão, você precisa baixar e instalar manualmente
+';
+$lang['error_copy']            = 'Houve um erro na cópia do arquivo durante a tentativa de instalar os arquivos para o diretório <em>%s </em>: o disco pode estar cheio ou as permissões de acesso ao arquivo podem estar incorretas. Isso pode ter resultado em um plugin parcialmente instalado e tornar instável a sua instalação wiki
+';
+$lang['noperms']               = 'Diretório da extensão não é gravável
+';
+$lang['notplperms']            = 'Diretório do modelo não é gravável
+';
+$lang['nopluginperms']         = 'Diretório do plugin não é gravável
+';
+$lang['git']                   = 'Esta extensão foi instalada via git, você não pode querer atualizá-la aqui.
+';
+$lang['auth']                  = 'Este plugin não está habilitado na configuração, considere desabilita-lo.';
+$lang['install_url']           = 'Instalar a partir da URL:';
+$lang['install_upload']        = 'Publique a Extensão:';
+$lang['repo_error']            = 'O repositório do plugin não pôde ser conectado. Verifique se o seu servidor está autorizado a conectar com www.dokuwiki.org e verifique as configurações de proxy do servidor.
+';
+$lang['nossl']                 = 'Seu PHP parece que perdeu o suporte a SSL. O download não vai funcionar para muitas extensões DokuWiki.
+';
diff --git a/lib/plugins/usermanager/lang/pt/lang.php b/lib/plugins/usermanager/lang/pt/lang.php
index b59649aa1..43ea69e53 100644
--- a/lib/plugins/usermanager/lang/pt/lang.php
+++ b/lib/plugins/usermanager/lang/pt/lang.php
@@ -8,6 +8,7 @@
  * @author Fil <fil@meteopt.com>
  * @author André Neves <drakferion@gmail.com>
  * @author José Campos zecarlosdecampos@gmail.com
+ * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['menu']                  = 'Gestor de Perfis';
 $lang['noauth']                = '(autenticação indisponível)';
@@ -33,6 +34,8 @@ $lang['filter']                = 'Filtro';
 $lang['export_all']            = 'Exportar Todos os Utilizadores (CSV)';
 $lang['export_filtered']       = 'Exportar a lista de utilizadores filtrada (CSV)';
 $lang['import']                = 'Importar Novos Utilizadores';
+$lang['line']                  = 'Linha nº
+';
 $lang['error']                 = 'Mensagem de erro';
 $lang['summary']               = 'Apresentar utilizadores %1$d-%2$d de %3$d encontrados. %4$d inscritos.';
 $lang['nonefound']             = 'Nenhum utilizador encontrado. %d inscritos.';
@@ -54,11 +57,17 @@ $lang['add_ok']                = 'Utilizador adicionado.';
 $lang['add_fail']              = 'Utilizador não adicionado.';
 $lang['notify_ok']             = 'Mensagem de notificação enviada.';
 $lang['notify_fail']           = 'Não foi possível enviar mensagem de notificação';
+$lang['import_userlistcsv']    = 'Arquivo de lista do usuário (CSV):
+';
+$lang['import_header']         = 'Mais Recentes Importações - Falhas';
 $lang['import_success_count']  = 'Importar Utilizadores: %d utiliyadores encontrados, %d importados com sucesso.';
 $lang['import_failure_count']  = 'Importar Utilizadores: %d falharam. As falhas estão listadas abaixo.';
 $lang['import_error_fields']   = 'Campos insuficientes, encontrados %d mas requeridos 4.';
 $lang['import_error_baduserid'] = 'Falta id de utilizador';
+$lang['import_error_badname']  = 'Nome inválido';
+$lang['import_error_badmail']  = 'E-Mail inválido';
 $lang['import_error_upload']   = 'Falhou a importação. O ficheiro csv não pôde ser importado ou está vazio.';
 $lang['import_error_readfail'] = 'Falhou a importação. Não foi possível ler o ficheiro submetido.';
 $lang['import_error_create']   = 'Não foi possível criar o utilizador.';
 $lang['import_notify_fail']    = 'A mensagem de notificação não pôde ser enviada para o utilizador importado, %s com email %s.';
+$lang['import_downloadfailures'] = 'Baixe Falhas como CSV para a correção';
-- 
cgit v1.2.3


From 443fd3ed95c4f3dedaf26d2d2ce8583f13b6e808 Mon Sep 17 00:00:00 2001
From: Yves Grandvalet <Yves.Grandvalet@laposte.net>
Date: Sat, 20 Dec 2014 15:47:16 +0100
Subject: translation update

---
 lib/plugins/extension/lang/fr/lang.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/extension/lang/fr/lang.php b/lib/plugins/extension/lang/fr/lang.php
index 88234efd0..6955155e9 100644
--- a/lib/plugins/extension/lang/fr/lang.php
+++ b/lib/plugins/extension/lang/fr/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
+ * @author Yves Grandvalet <Yves.Grandvalet@laposte.net>
  */
 $lang['menu']                  = 'Gestionnaire d\'extension';
 $lang['tab_plugins']           = 'Greffons installés';
@@ -62,6 +63,7 @@ $lang['status_bundled']        = 'fourni';
 $lang['msg_enabled']           = 'Greffon %s activé';
 $lang['msg_disabled']          = 'Greffon %s désactivé';
 $lang['msg_delete_success']    = 'Extension désinstallée';
+$lang['msg_delete_failed']     = 'Echec de la désinstallation de l\'extension %s';
 $lang['msg_template_install_success'] = 'Thème %s installée avec succès';
 $lang['msg_template_update_success'] = 'Thème %s mis à jour avec succès';
 $lang['msg_plugin_install_success'] = 'Greffon %s installé avec succès';
-- 
cgit v1.2.3


From f398f541a2823c1e99e5cc8683be760e9aea0c18 Mon Sep 17 00:00:00 2001
From: Type-kun <workwork-1@yandex.ru>
Date: Sun, 21 Dec 2014 14:51:02 +0100
Subject: translation update

---
 lib/plugins/authmysql/lang/ru/settings.php | 3 ++-
 lib/plugins/authpgsql/lang/ru/settings.php | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/authmysql/lang/ru/settings.php b/lib/plugins/authmysql/lang/ru/settings.php
index 2d8f4788e..eefec065b 100644
--- a/lib/plugins/authmysql/lang/ru/settings.php
+++ b/lib/plugins/authmysql/lang/ru/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
+ * @author Type-kun <workwork-1@yandex.ru>
  */
 $lang['server']                = 'Ваш MySQL-сервер';
 $lang['user']                  = 'Имя пользователя MySQL';
@@ -35,7 +36,7 @@ $lang['UpdateLogin']           = 'Условие для обновления и
 $lang['UpdatePass']            = 'Условие для обновления пароля пользователя';
 $lang['UpdateEmail']           = 'Условие для обновления адреса электронной почты пользователя';
 $lang['UpdateName']            = 'Условие для обновления полного имени пользователя';
-$lang['UpdateTarget']          = 'Условие для идентификации пользователя при обновлении';
+$lang['UpdateTarget']          = 'Выражение \'LIMIT\' для идентификации пользователя при обновлении';
 $lang['delUserGroup']          = 'Выражение SQL, осуществляющее удаление пользователя из указанной группы';
 $lang['getGroupID']            = 'Выражение SQL, обеспечивающее получение первичного ключа указанной группы';
 $lang['debug_o_0']             = 'ни один из вариантов';
diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php
index 416ea0ec9..2af299172 100644
--- a/lib/plugins/authpgsql/lang/ru/settings.php
+++ b/lib/plugins/authpgsql/lang/ru/settings.php
@@ -7,6 +7,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
+ * @author Type-kun <workwork-1@yandex.ru>
  */
 $lang['server']                = 'Ваш PostgreSQL-сервер';
 $lang['port']                  = 'Порт вашего PostgreSQL-сервера';
@@ -34,5 +35,7 @@ $lang['updateUser']            = 'Выражение SQL, осуществляю
 $lang['UpdateLogin']           = 'Измените условие для обновления логина';
 $lang['UpdatePass']            = 'Измените условие для обновления пароля';
 $lang['UpdateEmail']           = 'Измените условие для обновления email';
+$lang['UpdateName']            = 'Условие для обновления полного имени пользователя';
+$lang['UpdateTarget']          = 'Выражение \'LIMIT\' для идентификации пользователя при обновлении';
 $lang['delUserGroup']          = 'Выражение SQL, осуществляющее удаление пользователя из указанной группы';
 $lang['getGroupID']            = 'Выражение SQL, обеспечивающее получение первичного ключа указанной группы';
-- 
cgit v1.2.3


From ead851a84b96ca8b022e8980362b248ec2712dfa Mon Sep 17 00:00:00 2001
From: Marian Banica <banica.marian@gmail.com>
Date: Tue, 30 Dec 2014 06:31:38 +0100
Subject: translation update

---
 inc/lang/ro/lang.php                     | 17 +++++++++++------
 lib/plugins/acl/lang/ro/lang.php         |  5 +++--
 lib/plugins/popularity/lang/ro/lang.php  |  5 +++--
 lib/plugins/revert/lang/ro/lang.php      |  5 +++--
 lib/plugins/usermanager/lang/ro/lang.php |  5 +++--
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index e8d8c4af2..452a93ed0 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -1,15 +1,15 @@
 <?php
+
 /**
- * romanian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Tiberiu Micu <tibimicu@gmx.net>
  * @author Sergiu Baltariu <s_baltariu@yahoo.com>
  * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
  * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
  * @author Marius Olar <olarmariusalex@yahoo.com>
- * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
+ * @author Marian Banica <banica.marian@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -53,6 +53,9 @@ $lang['btn_revert']            = 'Revenire';
 $lang['btn_register']          = 'Înregistrează';
 $lang['btn_apply']             = 'Aplică';
 $lang['btn_media']             = 'Administrare media';
+$lang['btn_deleteuser']        = 'Sterge-mi contul';
+$lang['btn_img_backto']        = 'Înapoi la %s';
+$lang['btn_mediaManager']      = 'Vizualizează în administratorul media';
 $lang['loggedinas']            = 'Autentificat ca:';
 $lang['user']                  = 'Utilizator';
 $lang['pass']                  = 'Parola';
@@ -64,10 +67,11 @@ $lang['fullname']              = 'Nume complet';
 $lang['email']                 = 'E-mail';
 $lang['profile']               = 'Profil utilizator';
 $lang['badlogin']              = 'Ne pare rău, utilizatorul și/sau parola au fost greșite.';
+$lang['badpassconfirm']        = 'Ne pare rau, parola este gresita';
 $lang['minoredit']             = 'Modificare minoră';
 $lang['draftdate']             = 'Schiță salvată automat la';
 $lang['nosecedit']             = 'Pagina s-a modificat între timp, secțiunea info a expirat, s-a încărcat pagina întreagă în loc.';
-$lang['searchcreatepage']      = "Dacă nu ai găsit ce ai căutat, poți crea o pagină nouă prin folosirea butonului ''Editează această pagină''.";
+$lang['searchcreatepage']      = 'Dacă nu ai găsit ce ai căutat, poți crea o pagină nouă prin folosirea butonului \'\'Editează această pagină\'\'.';
 $lang['regmissing']            = 'Ne pare rău, trebuie să completezi toate cîmpurile.';
 $lang['reguexists']            = 'Ne pare rău, un utilizator cu acest nume este deja autentificat.';
 $lang['regsuccess']            = 'Utilizatorul a fost creat. Parola a fost trimisă prin e-mail.';
@@ -81,6 +85,9 @@ $lang['profna']                = 'Acest wiki nu permite modificarea profilului';
 $lang['profnochange']          = 'Nici o modificare; nimic de făcut.';
 $lang['profnoempty']           = 'Nu sunt permise numele sau adresa de e-mail necompletate.';
 $lang['profchanged']           = 'Profilul de utilizator a fost actualizat cu succes.';
+$lang['profnodelete']          = 'Acest wiki nu accepta stergerea conturilor utilizatorilor';
+$lang['profdeleteuser']        = 'Sterge cont';
+$lang['profdeleted']           = 'Contul tau a fost sters de pe acest wiki';
 $lang['pwdforget']             = 'Parolă uitată? Obține una nouă!';
 $lang['resendna']              = 'Acest wiki nu permite retrimiterea parolei.';
 $lang['resendpwd']             = 'Configurează o parolă nouă pentru';
@@ -233,7 +240,6 @@ $lang['admin_register']        = 'Adaugă utilizator nou';
 $lang['metaedit']              = 'Editează metadata';
 $lang['metasaveerr']           = 'Scrierea metadatelor a eșuat';
 $lang['metasaveok']            = 'Metadatele au fost salvate';
-$lang['btn_img_backto']            = 'Înapoi la %s';
 $lang['img_title']             = 'Titlu:';
 $lang['img_caption']           = 'Legendă:';
 $lang['img_date']              = 'Dată:';
@@ -246,7 +252,6 @@ $lang['img_camera']            = 'Camera:';
 $lang['img_keywords']          = 'Cuvinte cheie:';
 $lang['img_width']             = 'Lățime:';
 $lang['img_height']            = 'Înălțime:';
-$lang['btn_mediaManager']           = 'Vizualizează în administratorul media';
 $lang['subscr_subscribe_success'] = 'Adăugat %s la lista de abonare pentru %s';
 $lang['subscr_subscribe_error'] = 'Eroare la adăugarea %s la lista de abonare pentru %s';
 $lang['subscr_subscribe_noaddress'] = 'Nu există adresă de e-mail asociată autentificării curente, nu poți fi adăugat la lista de abonare';
diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index 0d281f049..418e63ab3 100644
--- a/lib/plugins/acl/lang/ro/lang.php
+++ b/lib/plugins/acl/lang/ro/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Romanian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Sergiu Baltariu <s_baltariu@yahoo.com>
  * @author s_baltariu@yahoo.com
  * @author Emanuel-Emeric Andrasi <n30@mandrivausers.ro>
diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php
index 8ba119dcb..5be528bac 100644
--- a/lib/plugins/popularity/lang/ro/lang.php
+++ b/lib/plugins/popularity/lang/ro/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Romanian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Emanuel-Emeric Andrasi <n30@mandrivausers.ro>
  * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php
index 5ea802575..3d0ca7957 100644
--- a/lib/plugins/revert/lang/ro/lang.php
+++ b/lib/plugins/revert/lang/ro/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Romanian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Sergiu Baltariu <s_baltariu@yahoo.com>
  * @author s_baltariu@yahoo.com
  * @author Emanuel-Emeric Andrasi <n30@mandrivausers.ro>
diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php
index 1b33cc4f8..55cbbed04 100644
--- a/lib/plugins/usermanager/lang/ro/lang.php
+++ b/lib/plugins/usermanager/lang/ro/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Romanian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Sergiu Baltariu <s_baltariu@yahoo.com>
  * @author s_baltariu@yahoo.com
  * @author Emanuel-Emeric Andrasi <n30@mandrivausers.ro>
-- 
cgit v1.2.3


From a71e810b700800fc0b7a599971dc05354df40a81 Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Wed, 31 Dec 2014 15:21:02 +0100
Subject: translation update

---
 inc/lang/cs/adminplugins.txt                    | 2 +-
 lib/plugins/authad/lang/cs/settings.php         | 2 ++
 lib/plugins/authldap/lang/cs/settings.php       | 6 ++++++
 lib/plugins/extension/lang/cs/intro_plugins.txt | 1 +
 lib/plugins/extension/lang/cs/intro_search.txt  | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/extension/lang/cs/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/cs/intro_search.txt

diff --git a/inc/lang/cs/adminplugins.txt b/inc/lang/cs/adminplugins.txt
index 005f8f2df..88e547abf 100644
--- a/inc/lang/cs/adminplugins.txt
+++ b/inc/lang/cs/adminplugins.txt
@@ -1 +1 @@
-===== Další pluginy =====
\ No newline at end of file
+===== Další zásuvné moduly =====
\ No newline at end of file
diff --git a/lib/plugins/authad/lang/cs/settings.php b/lib/plugins/authad/lang/cs/settings.php
index 28222d332..92b2d0f13 100644
--- a/lib/plugins/authad/lang/cs/settings.php
+++ b/lib/plugins/authad/lang/cs/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author mkucera66@seznam.cz
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
 $lang['account_suffix']        = 'Přípona vašeho účtu, tj. <code>@moje.domena.org</code>';
 $lang['base_dn']               = 'Vaše doménové jméno DN. tj. <code>DC=moje,DC=domena,DC=org</code>';
@@ -11,6 +12,7 @@ $lang['domain_controllers']    = 'Čárkou oddělenových kontrol=rů, tj. <code
 $lang['admin_username']        = 'Privilegovaný uživatel Active Directory s přístupem ke všem datům. Volitelně, ale nutné pro určité akce typu zasílání mailů.';
 $lang['admin_password']        = 'Heslo uživatele výše';
 $lang['sso']                   = 'Chcete přihlašování Single-Sign-On pomocí jádra Kerberos nebo NTLM ( autentizační protokol obvyklý ve Windows)?';
+$lang['sso_charset']           = 'Znaková sada kterou bude webserverem přenášeno uživatelské jméno pro Kerberos nebo NTLM. Prázdné pro UTF-8 nebo latin-1. Vyžaduje rozšíření iconv.';
 $lang['real_primarygroup']     = 'Má být zjištěna primární skupina namísto vyhodnocení hodnoty "doménoví uživatelé" (pomalejší)';
 $lang['use_ssl']               = 'Použít spojení SSL? Pokud ano, nevyužívejte TLS níže.';
 $lang['use_tls']               = 'Použít spojení TLS? Pokud ano, nevyužívejte SSL výše.';
diff --git a/lib/plugins/authldap/lang/cs/settings.php b/lib/plugins/authldap/lang/cs/settings.php
index 20491f1fb..a5aad5981 100644
--- a/lib/plugins/authldap/lang/cs/settings.php
+++ b/lib/plugins/authldap/lang/cs/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author mkucera66@seznam.cz
+ * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
 $lang['server']                = 'Váš server LDAP. Buď jméno hosta (<code>localhost</code>) nebo plně kvalifikovaný popis URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'Port serveru LDAP. Pokud není, bude využito URL výše';
@@ -14,9 +15,14 @@ $lang['groupfilter']           = 'Filter LDAPu pro vyhledávání uživatelskýc
 $lang['version']               = 'Verze použitého protokolu. Můžete potřebovat jej nastavit na <code>3</code>';
 $lang['starttls']              = 'Využít spojení TLS?';
 $lang['referrals']             = 'Přeposílat odkazy?';
+$lang['deref']                 = 'Jak rozlišovat aliasy?';
 $lang['binddn']                = 'Doménový název DN volitelně připojeného uživatele, pokus anonymní připojení není vyhovující, tj.  <code>cn=admin, dc=muj, dc=domov</code>';
 $lang['bindpw']                = 'Heslo uživatele výše';
 $lang['userscope']             = 'Omezení rozsahu vyhledávání uživatele';
 $lang['groupscope']            = 'Omezení rozsahu vyhledávání skupiny';
 $lang['groupkey']              = 'Atribut šlenství uživatele ve skupinách (namísto standardních AD skupin), tj. skupina z oddělení nebo telefonní číslo';
 $lang['debug']                 = 'Zobrazit dodatečné debugovací informace';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/extension/lang/cs/intro_plugins.txt b/lib/plugins/extension/lang/cs/intro_plugins.txt
new file mode 100644
index 000000000..a6f62746a
--- /dev/null
+++ b/lib/plugins/extension/lang/cs/intro_plugins.txt
@@ -0,0 +1 @@
+Toto je seznam momentálně nainstalovaných zásuvných modulů vaší DokuWiki. V tomto seznamu je lze zapínat, vypínat nebo kompletně odinstalovat. Jsou zde také vidět dostupné aktualizace pro moduly, ale před jejich případným aktualizováním si vždy přečtěte jejich dokumentaci.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/cs/intro_search.txt b/lib/plugins/extension/lang/cs/intro_search.txt
new file mode 100644
index 000000000..4258ac4f2
--- /dev/null
+++ b/lib/plugins/extension/lang/cs/intro_search.txt
@@ -0,0 +1 @@
+Tato záložka poskytuje náhled na všechny dostupné moduly a šablony třetích stran pro DokuWiki. Jejich instalací se múžete vystavit **bezpečnostním rizikům** o kterých se můžete více dočíst v oddíle [[doku>security#plugin_security|plugin security]].
\ No newline at end of file
-- 
cgit v1.2.3


From e8b8a4027e0150f75db5ab381b7fee4ed959ea2f Mon Sep 17 00:00:00 2001
From: Yurii Korotia <y.korotia@hotmail.com>
Date: Sat, 3 Jan 2015 13:28:56 +0200
Subject: fixes FASTCGI_UNEXPECTED_EXIT (error 0xff) in FastCGI/IIS for
 PHP5.6.x 64bit

---
 inc/plugincontroller.class.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index dfd4d0a29..f8ba58563 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -309,25 +309,30 @@ class Doku_Plugin_Controller {
      */
     protected function _getListByType($type, $enabled) {
         $master_list = $enabled ? array_keys(array_filter($this->tmp_plugins)) : array_keys(array_filter($this->tmp_plugins,array($this,'negate')));
-
         $plugins = array();
+        
         foreach ($master_list as $plugin) {
+        	
             $dir = $this->get_directory($plugin);
-
             if (@file_exists(DOKU_PLUGIN."$dir/$type.php")){
                 $plugins[] = $plugin;
-            } else {
-                if ($dp = @opendir(DOKU_PLUGIN."$dir/$type/")) {
+                continue;
+            }
+            
+            $dir2 = DOKU_PLUGIN."$dir/$type/";
+            if (is_dir($dir2)) {
+                if ($dp = opendir($dir2)) {
                     while (false !== ($component = readdir($dp))) {
                         if (substr($component,0,1) == '.' || strtolower(substr($component, -4)) != ".php") continue;
-                        if (is_file(DOKU_PLUGIN."$dir/$type/$component")) {
+                        if (is_file($dir2.$component)) {
                             $plugins[] = $plugin.'_'.substr($component, 0, -4);
                         }
                     }
                     closedir($dp);
                 }
             }
-        }
+            
+        }//foreach
 
         return $plugins;
     }
-- 
cgit v1.2.3


From 6f864f4299df0435149a889891bf686b4b17249a Mon Sep 17 00:00:00 2001
From: Maciej Helt <geraldziu@gmail.com>
Date: Mon, 5 Jan 2015 13:36:18 +0100
Subject: translation update

---
 inc/lang/pl/lang.php                       |  2 ++
 lib/plugins/authad/lang/pl/settings.php    |  1 +
 lib/plugins/authldap/lang/pl/settings.php  |  6 ++++++
 lib/plugins/authmysql/lang/pl/settings.php | 10 ++++++++++
 4 files changed, 19 insertions(+)

diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index baf3c28a9..fa70db06c 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -17,6 +17,7 @@
  * @author Tomasz Bosak <bosak.tomasz@gmail.com>
  * @author Paweł Jan Czochański <czochanski@gmail.com>
  * @author Mati <mackosa@wp.pl>
+ * @author Maciej Helt <geraldziu@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -294,6 +295,7 @@ $lang['i_modified']            = 'Ze względów bezpieczeństwa, ten skrypt dzia
 Aby uruchomić instalator ponownie, rozpakuj archiwum DokuWiki lub zapoznaj się z <a href="http://dokuwiki.org/install">instrukcją instalacji Dokuwiki</a>';
 $lang['i_funcna']              = 'Funkcja PHP <code>%s</code> jest niedostępna.';
 $lang['i_phpver']              = 'Wersja PHP <code>%s</code> jest niższa od wymaganej <code>%s</code>. Zaktualizuj instalację PHP.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload musi zostać wyłączone w pliku php.ini aby móc uruchomić DokuWiki.';
 $lang['i_permfail']            = 'DokuWiki nie ma prawa zapisu w katalogu <code>%s</code>. Zmień uprawnienia zapisu dla tego katalogu!';
 $lang['i_confexists']          = '<code>%s</code> już istnieje';
 $lang['i_writeerr']            = 'Nie można utworzyć <code>%s</code>. Sprawdź uprawnienia do katalogu lub pliku i stwórz plik ręcznie.';
diff --git a/lib/plugins/authad/lang/pl/settings.php b/lib/plugins/authad/lang/pl/settings.php
index 91cadca6f..537bae7ea 100644
--- a/lib/plugins/authad/lang/pl/settings.php
+++ b/lib/plugins/authad/lang/pl/settings.php
@@ -6,6 +6,7 @@
  * @author Tomasz Bosak <bosak.tomasz@gmail.com>
  * @author Paweł Jan Czochański <czochanski@gmail.com>
  * @author Mati <mackosa@wp.pl>
+ * @author Maciej Helt <geraldziu@gmail.com>
  */
 $lang['account_suffix']        = 'Przyrostek twojej nazwy konta np. <code>@my.domain.org</code>';
 $lang['base_dn']               = 'Twoje bazowe DN. Na przykład: <code>DC=my,DC=domain,DC=org</code>';
diff --git a/lib/plugins/authldap/lang/pl/settings.php b/lib/plugins/authldap/lang/pl/settings.php
index 7010988e6..0f5281b13 100644
--- a/lib/plugins/authldap/lang/pl/settings.php
+++ b/lib/plugins/authldap/lang/pl/settings.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Paweł Jan Czochański <czochanski@gmail.com>
+ * @author Maciej Helt <geraldziu@gmail.com>
  */
 $lang['server']                = 'Twój serwer LDAP. Podaj nazwę hosta (<code>localhost</code>) albo pełen adres URL (<code>ldap://server.tld:389</code>).';
 $lang['port']                  = 'Port serwera LDAP jeżeli nie podano pełnego adresu URL wyżej.';
@@ -14,3 +15,8 @@ $lang['groupfilter']           = 'Filtr LDAP wykorzystany przy szukaniu grup uż
 $lang['version']               = 'Wykorzystywana wersja protokołu. Być może konieczne jest ustawienie tego na <code>3</code>.';
 $lang['starttls']              = 'Użyć połączeń TLS?';
 $lang['bindpw']                = 'Hasło powyższego użytkownika';
+$lang['debug']                 = 'Przy błędach wyświetl dodatkowe informacje debugujące.';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/lib/plugins/authmysql/lang/pl/settings.php b/lib/plugins/authmysql/lang/pl/settings.php
index 9dc798ee0..68b5c6c22 100644
--- a/lib/plugins/authmysql/lang/pl/settings.php
+++ b/lib/plugins/authmysql/lang/pl/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Paweł Jan Czochański <czochanski@gmail.com>
  * @author Mati <mackosa@wp.pl>
+ * @author Maciej Helt <geraldziu@gmail.com>
  */
 $lang['server']                = 'Twój server MySQL';
 $lang['user']                  = 'Nazwa użytkownika MySQL';
@@ -13,4 +14,13 @@ $lang['database']              = 'Używana baza danych';
 $lang['charset']               = 'Zestaw znaków uzyty w bazie danych';
 $lang['debug']                 = 'Wyświetlaj dodatkowe informacje do debugowania.';
 $lang['checkPass']             = 'Zapytanie SQL wykorzystywane do sprawdzania haseł.';
+$lang['getUserInfo']           = 'Zapytanie SQL zwracające informacje o użytkowniku';
+$lang['getGroups']             = 'Zapytanie SQL przynależność do grup danego użytkownika';
+$lang['getUsers']              = 'Zapytanie SQL zwracające listę wszystkich użytkowników';
+$lang['FilterLogin']           = 'Klauzula SQL używana do filtrowania użytkowników na podstawie ich loginu';
+$lang['FilterName']            = 'Klauzula SQL używana do filtrowania użytkowników na podstawie ich pełnej nazwy';
+$lang['FilterEmail']           = 'Klauzula SQL używana do filtrowania użytkowników na podstawie ich adresu email';
+$lang['FilterGroup']           = 'Klauzula SQL używana do filtrowania użytkowników na podstawie ich przynależności do grup';
+$lang['SortOrder']             = 'Klauzula SQL używana do sortowania użytkowników';
+$lang['addUser']               = 'Zapytanie SQL dodające nowego użytkownika';
 $lang['debug_o_2']             = 'wszystkie zapytania SQL';
-- 
cgit v1.2.3


From 3d03c3499919b3ef39eb7e162d53a52dcb3abeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Schplurtz=20le=20D=C3=A9boulonn=C3=A9?=
 <schplurtz@laposte.net>
Date: Mon, 5 Jan 2015 23:31:11 +0100
Subject: translation update

---
 inc/lang/fr/lang.php                   | 2 ++
 lib/plugins/extension/lang/fr/lang.php | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 7a9b82158..9deff1220 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -366,3 +366,5 @@ $lang['currentns']             = 'Catégorie courante';
 $lang['searchresult']          = 'Résultat de la recherche';
 $lang['plainhtml']             = 'HTML brut';
 $lang['wikimarkup']            = 'Wiki balise';
+$lang['page_nonexist_rev']     = 'La page n\'existait pas le %s. Elle a été créée le <a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'Ne peut analyser le paramètre date "%s".';
diff --git a/lib/plugins/extension/lang/fr/lang.php b/lib/plugins/extension/lang/fr/lang.php
index 6955155e9..44d403847 100644
--- a/lib/plugins/extension/lang/fr/lang.php
+++ b/lib/plugins/extension/lang/fr/lang.php
@@ -6,7 +6,7 @@
  * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
  * @author Yves Grandvalet <Yves.Grandvalet@laposte.net>
  */
-$lang['menu']                  = 'Gestionnaire d\'extension';
+$lang['menu']                  = 'Gestionnaire d\'extensions';
 $lang['tab_plugins']           = 'Greffons installés';
 $lang['tab_templates']         = 'Thèmes installés';
 $lang['tab_search']            = 'Rechercher et installer';
@@ -62,7 +62,7 @@ $lang['status_template']       = 'thème';
 $lang['status_bundled']        = 'fourni';
 $lang['msg_enabled']           = 'Greffon %s activé';
 $lang['msg_disabled']          = 'Greffon %s désactivé';
-$lang['msg_delete_success']    = 'Extension désinstallée';
+$lang['msg_delete_success']    = 'Extension %s désinstallée.';
 $lang['msg_delete_failed']     = 'Echec de la désinstallation de l\'extension %s';
 $lang['msg_template_install_success'] = 'Thème %s installée avec succès';
 $lang['msg_template_update_success'] = 'Thème %s mis à jour avec succès';
@@ -85,6 +85,8 @@ $lang['noperms']               = 'Impossible d\'écrire dans le dossier des exte
 $lang['notplperms']            = 'Impossible d\'écrire dans le dossier des thèmes.';
 $lang['nopluginperms']         = 'Impossible d\'écrire dans le dossier des greffons.';
 $lang['git']                   = 'Cette extension a été installé via git, vous voudrez peut-être ne pas la mettre à jour ici.';
+$lang['auth']                  = 'Votre configuration n\'utilise pas ce greffon d\'authentification. Vous devriez songer à le désactiver.';
 $lang['install_url']           = 'Installez depuis l\'URL :';
 $lang['install_upload']        = 'Téléversez l\'extension :';
 $lang['repo_error']            = 'L\'entrepôt d\'extensions est injoignable. Veuillez vous assurer que le server web est autorisé à contacter www.dokuwiki.org et vérifier les réglages de proxy.';
+$lang['nossl']                 = 'Votre version de PHP semble ne pas prendre en charge SSL. Le téléchargement de nombreuses extensions va échouer.';
-- 
cgit v1.2.3


From 79e79377626799a77c11aa7849cb9c64305590c8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 7 Jan 2015 10:47:45 +0100
Subject: Remove error supression for file_exists()

In an older version of PHP a file_exists() call would issue a warning
when the file did not exist. This was fixed in later PHP releases. Since
we require PHP 5.3 now, there's no need to supress any error here
anymore. This might even give a minor performance boost.
---
 _test/core/DokuWikiTest.php                  |  4 ++--
 feed.php                                     |  2 +-
 inc/JpegMeta.php                             |  2 +-
 inc/Sitemapper.php                           |  2 +-
 inc/auth.php                                 |  2 +-
 inc/cache.php                                |  2 +-
 inc/changelog.php                            |  8 ++++----
 inc/common.php                               | 24 ++++++++++++------------
 inc/confutils.php                            |  2 +-
 inc/fetch.functions.php                      |  2 +-
 inc/html.php                                 |  6 +++---
 inc/indexer.php                              | 20 ++++++++++----------
 inc/infoutils.php                            | 12 ++++++------
 inc/init.php                                 | 24 ++++++++++++------------
 inc/io.php                                   | 12 ++++++------
 inc/load.php                                 |  2 +-
 inc/media.php                                | 28 ++++++++++++++--------------
 inc/pageutils.php                            | 14 +++++++-------
 inc/parserutils.php                          | 10 +++++-----
 inc/plugin.php                               | 12 ++++++------
 inc/plugincontroller.class.php               |  8 ++++----
 inc/subscription.php                         |  2 +-
 inc/template.php                             | 12 ++++++------
 install.php                                  |  8 ++++----
 lib/exe/css.php                              |  6 +++---
 lib/exe/detail.php                           |  2 +-
 lib/exe/indexer.php                          |  4 ++--
 lib/exe/js.php                               | 12 ++++++------
 lib/plugins/authplain/auth.php               |  2 +-
 lib/plugins/config/admin.php                 |  4 ++--
 lib/plugins/config/settings/config.class.php | 16 ++++++++--------
 lib/plugins/config/settings/extra.class.php  |  2 +-
 lib/plugins/extension/helper/extension.php   |  8 ++++----
 lib/plugins/popularity/admin.php             |  2 +-
 lib/plugins/popularity/helper.php            |  2 +-
 35 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/_test/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php
index f4521256a..4e40d510a 100644
--- a/_test/core/DokuWikiTest.php
+++ b/_test/core/DokuWikiTest.php
@@ -54,7 +54,7 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase {
         foreach (array('default','local','protected') as $config_group) {
             if (empty($config_cascade['main'][$config_group])) continue;
             foreach ($config_cascade['main'][$config_group] as $config_file) {
-                if (@file_exists($config_file)) {
+                if (file_exists($config_file)) {
                     include($config_file);
                 }
             }
@@ -68,7 +68,7 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase {
         foreach (array('default','local') as $config_group) {
             if (empty($config_cascade['license'][$config_group])) continue;
             foreach ($config_cascade['license'][$config_group] as $config_file) {
-                if(@file_exists($config_file)){
+                if(file_exists($config_file)){
                     include($config_file);
                 }
             }
diff --git a/feed.php b/feed.php
index aa00063a1..7ea2e235e 100644
--- a/feed.php
+++ b/feed.php
@@ -218,7 +218,7 @@ function rss_buildItems(&$rss, &$data, $opt) {
                 $date = $ditem['date'];
             } elseif ($ditem['media']) {
                 $date = @filemtime(mediaFN($id));
-            } elseif (@file_exists(wikiFN($id))) {
+            } elseif (file_exists(wikiFN($id))) {
                 $date = @filemtime(wikiFN($id));
             } elseif($meta['date']['modified']) {
                 $date = $meta['date']['modified'];
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index d50bad9b7..4cdebcc36 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -936,7 +936,7 @@ class JpegMeta {
         if ($fileName == "") {
             $tmpName = tempnam(dirname($this->_fileName),'_metatemp_');
             $this->_writeJPEG($tmpName);
-            if (@file_exists($tmpName)) {
+            if (file_exists($tmpName)) {
                 return io_rename($tmpName, $this->_fileName);
             }
         } else {
diff --git a/inc/Sitemapper.php b/inc/Sitemapper.php
index 0325f6d44..037990e96 100644
--- a/inc/Sitemapper.php
+++ b/inc/Sitemapper.php
@@ -33,7 +33,7 @@ class Sitemapper {
 
         $sitemap = Sitemapper::getFilePath();
 
-        if(@file_exists($sitemap)){
+        if(file_exists($sitemap)){
             if(!is_writable($sitemap)) return false;
         }else{
             if(!is_writable(dirname($sitemap))) return false;
diff --git a/inc/auth.php b/inc/auth.php
index d51534e67..17923ba2a 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -1189,7 +1189,7 @@ function act_resendpwd() {
         // we're in token phase - get user info from token
 
         $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth';
-        if(!@file_exists($tfile)) {
+        if(!file_exists($tfile)) {
             msg($lang['resendpwdbadauth'], -1);
             $INPUT->remove('pwauth');
             return false;
diff --git a/inc/cache.php b/inc/cache.php
index edf394134..68f64eaa2 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -203,7 +203,7 @@ class cache_parser extends cache {
      */
     public function _useCache() {
 
-        if (!@file_exists($this->file)) return false;                   // source exists?
+        if (!file_exists($this->file)) return false;                   // source exists?
         return parent::_useCache();
     }
 
diff --git a/inc/changelog.php b/inc/changelog.php
index c2d3cb489..d1ef7973e 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -351,7 +351,7 @@ function _handleRecent($line,$ns,$flags,&$seen){
     // check existance
     if($flags & RECENTS_SKIP_DELETED){
         $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
-        if(!@file_exists($fn)) return false;
+        if(!file_exists($fn)) return false;
     }
 
     return $recent;
@@ -498,14 +498,14 @@ abstract class ChangeLog {
 
         if($first < 0) {
             $first = 0;
-        } else if(@file_exists($this->getFilename())) {
+        } else if(file_exists($this->getFilename())) {
             // skip current revision if the page exists
             $first = max($first + 1, 0);
         }
 
         $file = $this->getChangelogFilename();
 
-        if(!@file_exists($file)) {
+        if(!file_exists($file)) {
             return $revs;
         }
         if(filesize($file) < $this->chunk_size || $this->chunk_size == 0) {
@@ -735,7 +735,7 @@ abstract class ChangeLog {
     protected function readloglines($rev) {
         $file = $this->getChangelogFilename();
 
-        if(!@file_exists($file)) {
+        if(!file_exists($file)) {
             return false;
         }
 
diff --git a/inc/common.php b/inc/common.php
index 2c9359a0c..9b330000b 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -188,7 +188,7 @@ function pageinfo() {
 
     $info['locked']     = checklock($ID);
     $info['filepath']   = fullpath(wikiFN($ID));
-    $info['exists']     = @file_exists($info['filepath']);
+    $info['exists']     = file_exists($info['filepath']);
     $info['currentrev'] = @filemtime($info['filepath']);
     if($REV) {
         //check if current revision was meant
@@ -202,7 +202,7 @@ function pageinfo() {
         } else {
             //really use old revision
             $info['filepath'] = fullpath(wikiFN($ID, $REV));
-            $info['exists']   = @file_exists($info['filepath']);
+            $info['exists']   = file_exists($info['filepath']);
         }
     }
     $info['rev'] = $REV;
@@ -256,7 +256,7 @@ function pageinfo() {
 
     // draft
     $draft = getCacheName($info['client'].$ID, '.draft');
-    if(@file_exists($draft)) {
+    if(file_exists($draft)) {
         if(@filemtime($draft) < @filemtime(wikiFN($ID))) {
             // remove stale draft
             @unlink($draft);
@@ -352,7 +352,7 @@ function breadcrumbs() {
     $crumbs = isset($_SESSION[DOKU_COOKIE]['bc']) ? $_SESSION[DOKU_COOKIE]['bc'] : array();
     //we only save on show and existing wiki documents
     $file = wikiFN($ID);
-    if($ACT != 'show' || !@file_exists($file)) {
+    if($ACT != 'show' || !file_exists($file)) {
         $_SESSION[DOKU_COOKIE]['bc'] = $crumbs;
         return $crumbs;
     }
@@ -853,7 +853,7 @@ function checklock($id) {
     $lock = wikiLockFN($id);
 
     //no lockfile
-    if(!@file_exists($lock)) return false;
+    if(!file_exists($lock)) return false;
 
     //lockfile expired
     if((time() - filemtime($lock)) > $conf['locktime']) {
@@ -907,7 +907,7 @@ function unlock($id) {
     global $INPUT;
 
     $lock = wikiLockFN($id);
-    if(@file_exists($lock)) {
+    if(file_exists($lock)) {
         @list($ip, $session) = explode("\n", io_readFile($lock));
         if($ip == $INPUT->server->str('REMOTE_USER') || $ip == clientIP() || $session == session_id()) {
             @unlink($lock);
@@ -1010,13 +1010,13 @@ function pageTemplate($id) {
             // if the before event did not set a template file, try to find one
             if(empty($data['tplfile'])) {
                 $path = dirname(wikiFN($id));
-                if(@file_exists($path.'/_template.txt')) {
+                if(file_exists($path.'/_template.txt')) {
                     $data['tplfile'] = $path.'/_template.txt';
                 } else {
                     // search upper namespaces for templates
                     $len = strlen(rtrim($conf['datadir'], '/'));
                     while(strlen($path) >= $len) {
-                        if(@file_exists($path.'/__template.txt')) {
+                        if(file_exists($path.'/__template.txt')) {
                             $data['tplfile'] = $path.'/__template.txt';
                             break;
                         }
@@ -1197,13 +1197,13 @@ function saveWikiText($id, $text, $summary, $minor = false) {
     $file        = wikiFN($id);
     $old         = @filemtime($file); // from page
     $wasRemoved  = (trim($text) == ''); // check for empty or whitespace only
-    $wasCreated  = !@file_exists($file);
+    $wasCreated  = !file_exists($file);
     $wasReverted = ($REV == true);
     $pagelog     = new PageChangeLog($id, 1024);
     $newRev      = false;
     $oldRev      = $pagelog->getRevisions(-1, 1); // from changelog
     $oldRev      = (int) (empty($oldRev) ? 0 : $oldRev[0]);
-    if(!@file_exists(wikiFN($id, $old)) && @file_exists($file) && $old >= $oldRev) {
+    if(!file_exists(wikiFN($id, $old)) && file_exists($file) && $old >= $oldRev) {
         // add old revision to the attic if missing
         saveOldRevision($id);
         // add a changelog entry if this edit came from outside dokuwiki
@@ -1285,7 +1285,7 @@ function saveWikiText($id, $text, $summary, $minor = false) {
  */
 function saveOldRevision($id) {
     $oldf = wikiFN($id);
-    if(!@file_exists($oldf)) return '';
+    if(!file_exists($oldf)) return '';
     $date = filemtime($oldf);
     $newf = wikiFN($id, $date);
     io_writeWikiPage($newf, rawWiki($id), $id, $date);
@@ -1743,7 +1743,7 @@ function license_img($type) {
         $try[] = 'lib/images/license/'.$type.'/cc.png';
     }
     foreach($try as $src) {
-        if(@file_exists(DOKU_INC.$src)) return $src;
+        if(file_exists(DOKU_INC.$src)) return $src;
     }
     return '';
 }
diff --git a/inc/confutils.php b/inc/confutils.php
index 85bf5128c..8643a056c 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -206,7 +206,7 @@ function retrieveConfig($type,$fn,$params=null) {
     foreach (array('default','local','protected') as $config_group) {
         if (empty($config_cascade[$type][$config_group])) continue;
         foreach ($config_cascade[$type][$config_group] as $file) {
-            if (@file_exists($file)) {
+            if (file_exists($file)) {
                 $config = call_user_func_array($fn,array_merge(array($file),$params));
                 $combined = array_merge($combined, $config);
             }
diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index 3c5bdfeee..c99fbf20a 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -163,7 +163,7 @@ function checkFileStatus(&$media, &$file, $rev = '', $width=0, $height=0) {
     }
 
     //check file existance
-    if(!@file_exists($file)) {
+    if(!file_exists($file)) {
         return array(404, 'Not Found');
     }
 
diff --git a/inc/html.php b/inc/html.php
index 87affd47b..3a93a6604 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -501,7 +501,7 @@ function html_revisions($first=0, $media_id = false){
     $form->addElement(form_makeOpenTag('ul'));
 
     if (!$media_id) $exists = $INFO['exists'];
-    else $exists = @file_exists(mediaFN($id));
+    else $exists = file_exists(mediaFN($id));
 
     $display_name = (!$media_id && useHeading('navigation')) ? hsc(p_get_first_heading($id)) : $id;
     if (!$display_name) $display_name = $id;
@@ -568,7 +568,7 @@ function html_revisions($first=0, $media_id = false){
         $date = dformat($rev);
         $info = $changelog->getRevisionInfo($rev);
         if($media_id) {
-            $exists = @file_exists(mediaFN($id, $rev));
+            $exists = file_exists(mediaFN($id, $rev));
         } else {
             $exists = page_exists($id, $rev);
         }
@@ -765,7 +765,7 @@ function html_recent($first=0, $show_changes='both'){
         $href = '';
 
         if (!empty($recent['media'])) {
-            $diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && @file_exists(mediaFN($recent['id'])));
+            $diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && file_exists(mediaFN($recent['id'])));
             if ($diff) {
                 $href = media_managerURL(array('tab_details' => 'history',
                     'mediado' => 'diff', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
diff --git a/inc/indexer.php b/inc/indexer.php
index 014c5c5eb..a86bfc656 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -1076,7 +1076,7 @@ class Doku_Indexer {
     protected function getIndex($idx, $suffix) {
         global $conf;
         $fn = $conf['indexdir'].'/'.$idx.$suffix.'.idx';
-        if (!@file_exists($fn)) return array();
+        if (!file_exists($fn)) return array();
         return file($fn, FILE_IGNORE_NEW_LINES);
     }
 
@@ -1118,7 +1118,7 @@ class Doku_Indexer {
     protected function getIndexKey($idx, $suffix, $id) {
         global $conf;
         $fn = $conf['indexdir'].'/'.$idx.$suffix.'.idx';
-        if (!@file_exists($fn)) return '';
+        if (!file_exists($fn)) return '';
         $fh = @fopen($fn, 'r');
         if (!$fh) return '';
         $ln = -1;
@@ -1228,7 +1228,7 @@ class Doku_Indexer {
             // testing if index files exist only
             $path = $conf['indexdir']."/i";
             foreach ($filter as $key => $value) {
-                if (@file_exists($path.$key.'.idx'))
+                if (file_exists($path.$key.'.idx'))
                     $idx[] = $key;
             }
         } else {
@@ -1339,7 +1339,7 @@ function & idx_get_stopwords() {
     if (is_null($stopwords)) {
         global $conf;
         $swfile = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
-        if(@file_exists($swfile)){
+        if(file_exists($swfile)){
             $stopwords = file($swfile, FILE_IGNORE_NEW_LINES);
         }else{
             $stopwords = array();
@@ -1364,7 +1364,7 @@ function idx_addPage($page, $verbose=false, $force=false) {
     $idxtag = metaFN($page,'.indexed');
     // check if page was deleted but is still in the index
     if (!page_exists($page)) {
-        if (!@file_exists($idxtag)) {
+        if (!file_exists($idxtag)) {
             if ($verbose) print("Indexer: $page does not exist, ignoring".DOKU_LF);
             return false;
         }
@@ -1379,7 +1379,7 @@ function idx_addPage($page, $verbose=false, $force=false) {
     }
 
     // check if indexing needed
-    if(!$force && @file_exists($idxtag)){
+    if(!$force && file_exists($idxtag)){
         if(trim(io_readFile($idxtag)) == idx_get_version()){
             $last = @filemtime($idxtag);
             if($last > @filemtime(wikiFN($page))){
@@ -1392,7 +1392,7 @@ function idx_addPage($page, $verbose=false, $force=false) {
     $indexenabled = p_get_metadata($page, 'internal index', METADATA_RENDER_UNLIMITED);
     if ($indexenabled === false) {
         $result = false;
-        if (@file_exists($idxtag)) {
+        if (file_exists($idxtag)) {
             $Indexer = idx_get_indexer();
             $result = $Indexer->deletePage($page);
             if ($result === "locked") {
@@ -1494,7 +1494,7 @@ function idx_tokenizer($string, $wc=false) {
 function idx_getIndex($idx, $suffix) {
     global $conf;
     $fn = $conf['indexdir'].'/'.$idx.$suffix.'.idx';
-    if (!@file_exists($fn)) return array();
+    if (!file_exists($fn)) return array();
     return file($fn);
 }
 
@@ -1515,7 +1515,7 @@ function idx_listIndexLengths() {
         $docache = false;
     } else {
         clearstatcache();
-        if (@file_exists($conf['indexdir'].'/lengths.idx')
+        if (file_exists($conf['indexdir'].'/lengths.idx')
         && (time() < @filemtime($conf['indexdir'].'/lengths.idx') + $conf['readdircache'])) {
             if (($lengths = @file($conf['indexdir'].'/lengths.idx', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) !== false) {
                 $idx = array();
@@ -1572,7 +1572,7 @@ function idx_indexLengths($filter) {
         // testing if index files exist only
         $path = $conf['indexdir']."/i";
         foreach ($filter as $key => $value) {
-            if (@file_exists($path.$key.'.idx'))
+            if (file_exists($path.$key.'.idx'))
                 $idx[] = $key;
         }
     } else {
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 399963176..fe312d13f 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -58,7 +58,7 @@ function checkUpdateMessages(){
 function getVersionData(){
     $version = array();
     //import version string
-    if(@file_exists(DOKU_INC.'VERSION')){
+    if(file_exists(DOKU_INC.'VERSION')){
         //official release
         $version['date'] = trim(io_readfile(DOKU_INC.'VERSION'));
         $version['type'] = 'Release';
@@ -141,20 +141,20 @@ function check(){
     if(is_writable($conf['changelog'])){
         msg('Changelog is writable',1);
     }else{
-        if (@file_exists($conf['changelog'])) {
+        if (file_exists($conf['changelog'])) {
             msg('Changelog is not writable',-1);
         }
     }
 
-    if (isset($conf['changelog_old']) && @file_exists($conf['changelog_old'])) {
+    if (isset($conf['changelog_old']) && file_exists($conf['changelog_old'])) {
         msg('Old changelog exists', 0);
     }
 
-    if (@file_exists($conf['changelog'].'_failed')) {
+    if (file_exists($conf['changelog'].'_failed')) {
         msg('Importing old changelog failed', -1);
-    } else if (@file_exists($conf['changelog'].'_importing')) {
+    } else if (file_exists($conf['changelog'].'_importing')) {
         msg('Importing old changelog now.', 0);
-    } else if (@file_exists($conf['changelog'].'_import_ok')) {
+    } else if (file_exists($conf['changelog'].'_import_ok')) {
         msg('Old changelog imported', 1);
         if (!plugin_isdisabled('importoldchangelog')) {
             msg('Importoldchangelog plugin not disabled after import', -1);
diff --git a/inc/init.php b/inc/init.php
index 12bb6f588..91bc77f98 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -16,7 +16,7 @@ $config_cascade = array();
 
 // if available load a preload config file
 $preload = fullpath(dirname(__FILE__)).'/preload.php';
-if (@file_exists($preload)) include($preload);
+if (file_exists($preload)) include($preload);
 
 // define the include path
 if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
@@ -28,7 +28,7 @@ if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
 if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
 
 // check for error reporting override or set error reporting to sane values
-if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
+if (!defined('DOKU_E_LEVEL') && file_exists(DOKU_CONF.'report_e_all')) {
     define('DOKU_E_LEVEL', E_ALL);
 }
 if (!defined('DOKU_E_LEVEL')) {
@@ -65,7 +65,7 @@ $conf = array();
 foreach (array('default','local','protected') as $config_group) {
     if (empty($config_cascade['main'][$config_group])) continue;
     foreach ($config_cascade['main'][$config_group] as $config_file) {
-        if (@file_exists($config_file)) {
+        if (file_exists($config_file)) {
             include($config_file);
         }
     }
@@ -79,7 +79,7 @@ $license = array();
 foreach (array('default','local') as $config_group) {
     if (empty($config_cascade['license'][$config_group])) continue;
     foreach ($config_cascade['license'][$config_group] as $config_file) {
-        if(@file_exists($config_file)){
+        if(file_exists($config_file)){
             include($config_file);
         }
     }
@@ -272,7 +272,7 @@ function init_lang($langCode) {
     //load the language files
     require(DOKU_INC.'inc/lang/en/lang.php');
     foreach ($config_cascade['lang']['core'] as $config_file) {
-        if (@file_exists($config_file . 'en/lang.php')) {
+        if (file_exists($config_file . 'en/lang.php')) {
             include($config_file . 'en/lang.php');
         }
     }
@@ -282,7 +282,7 @@ function init_lang($langCode) {
             require(DOKU_INC."inc/lang/$langCode/lang.php");
         }
         foreach ($config_cascade['lang']['core'] as $config_file) {
-            if (@file_exists($config_file . "$langCode/lang.php")) {
+            if (file_exists($config_file . "$langCode/lang.php")) {
                 include($config_file . "$langCode/lang.php");
             }
         }
@@ -298,7 +298,7 @@ function init_files(){
     $files = array($conf['indexdir'].'/page.idx');
 
     foreach($files as $file){
-        if(!@file_exists($file)){
+        if(!file_exists($file)){
             $fh = @fopen($file,'a');
             if($fh){
                 fclose($fh);
@@ -312,7 +312,7 @@ function init_files(){
     # create title index (needs to have same length as page.idx)
     /*
     $file = $conf['indexdir'].'/title.idx';
-    if(!@file_exists($file)){
+    if(!file_exists($file)){
         $pages = file($conf['indexdir'].'/page.idx');
         $pages = count($pages);
         $fh = @fopen($file,'a');
@@ -339,9 +339,9 @@ function init_files(){
 function init_path($path){
     // check existence
     $p = fullpath($path);
-    if(!@file_exists($p)){
+    if(!file_exists($p)){
         $p = fullpath(DOKU_INC.$path);
-        if(!@file_exists($p)){
+        if(!file_exists($p)){
             return '';
         }
     }
@@ -352,7 +352,7 @@ function init_path($path){
     }
 
     // check accessability (execute bit) for directories
-    if(@is_dir($p) && !@file_exists("$p/.")){
+    if(@is_dir($p) && !file_exists("$p/.")){
         return '';
     }
 
@@ -593,7 +593,7 @@ function fullpath($path,$exists=false){
     $finalpath = $root.implode('/', $newpath);
 
     // check for existence when needed (except when unit testing)
-    if($exists && !defined('DOKU_UNITTEST') && !@file_exists($finalpath)) {
+    if($exists && !defined('DOKU_UNITTEST') && !file_exists($finalpath)) {
         return false;
     }
     return $finalpath;
diff --git a/inc/io.php b/inc/io.php
index bfa394a17..3ed227162 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -105,7 +105,7 @@ function _io_readWikiPage_action($data) {
  */
 function io_readFile($file,$clean=true){
     $ret = '';
-    if(@file_exists($file)){
+    if(file_exists($file)){
         if(substr($file,-3) == '.gz'){
             $ret = join('',gzfile($file));
         }else if(substr($file,-4) == '.bz2'){
@@ -204,7 +204,7 @@ function io_saveFile($file,$content,$append=false){
     global $conf;
     $mode = ($append) ? 'ab' : 'wb';
 
-    $fileexists = @file_exists($file);
+    $fileexists = file_exists($file);
     io_makeFileDir($file);
     io_lock($file);
     if(substr($file,-3) == '.gz'){
@@ -258,7 +258,7 @@ function io_saveFile($file,$content,$append=false){
  * @return bool true on success
  */
 function io_deleteFromFile($file,$badline,$regex=false){
-    if (!@file_exists($file)) return true;
+    if (!file_exists($file)) return true;
 
     io_lock($file);
 
@@ -385,7 +385,7 @@ function io_createNamespace($id, $ns_type='pages') {
     $ns_stack = explode(':', $id);
     $ns = $id;
     $tmp = dirname( $file = call_user_func($types[$ns_type], $ns) );
-    while (!@is_dir($tmp) && !(@file_exists($tmp) && !is_dir($tmp))) {
+    while (!@is_dir($tmp) && !(file_exists($tmp) && !is_dir($tmp))) {
         array_pop($ns_stack);
         $ns = implode(':', $ns_stack);
         if (strlen($ns)==0) { break; }
@@ -429,7 +429,7 @@ function io_makeFileDir($file){
 function io_mkdir_p($target){
     global $conf;
     if (@is_dir($target)||empty($target)) return 1; // best case check first
-    if (@file_exists($target) && !is_dir($target)) return 0;
+    if (file_exists($target) && !is_dir($target)) return 0;
     //recursion
     if (io_mkdir_p(substr($target,0,strrpos($target,'/')))){
         if($conf['safemodehack']){
@@ -606,7 +606,7 @@ function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=20
         $file = $file.$name;
     }
 
-    $fileexists = @file_exists($file);
+    $fileexists = file_exists($file);
     $fp = @fopen($file,"w");
     if(!$fp) return false;
     fwrite($fp,$data);
diff --git a/inc/load.php b/inc/load.php
index ac2812a0b..18786dc79 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -119,7 +119,7 @@ function load_autoload($name){
         // try to load the wanted plugin file
         $c = ((count($m) === 4) ? "/{$m[3]}" : '');
         $plg = DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
-        if(@file_exists($plg)){
+        if(file_exists($plg)){
             include_once DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
         }
         return;
diff --git a/inc/media.php b/inc/media.php
index 09bfc99ac..81081d5dc 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -70,7 +70,7 @@ function media_metasave($id,$auth,$data){
     }
 
     $old = @filemtime($src);
-    if(!@file_exists(mediaFN($id, $old)) && @file_exists($src)) {
+    if(!file_exists(mediaFN($id, $old)) && file_exists($src)) {
         // add old revision to the attic
         media_saveOldRevision($id);
     }
@@ -141,7 +141,7 @@ function media_metaform($id,$auth){
     if(is_null($fields)){
         $config_files = getConfigFiles('mediameta');
         foreach ($config_files as $config_file) {
-            if(@file_exists($config_file)) include($config_file);
+            if(file_exists($config_file)) include($config_file);
         }
     }
 
@@ -241,14 +241,14 @@ function media_delete($id,$auth){
     $data['id']   = $id;
     $data['name'] = utf8_basename($file);
     $data['path'] = $file;
-    $data['size'] = (@file_exists($file)) ? filesize($file) : 0;
+    $data['size'] = (file_exists($file)) ? filesize($file) : 0;
 
     $data['unl'] = false;
     $data['del'] = false;
     $evt = new Doku_Event('MEDIA_DELETE_FILE',$data);
     if ($evt->advise_before()) {
         $old = @filemtime($file);
-        if(!@file_exists(mediaFN($id, $old)) && @file_exists($file)) {
+        if(!file_exists(mediaFN($id, $old)) && file_exists($file)) {
             // add old revision to the attic
             media_saveOldRevision($id);
         }
@@ -431,7 +431,7 @@ function media_save($file, $id, $ow, $auth, $move) {
     }
 
     //check for overwrite
-    $overwrite = @file_exists($fn);
+    $overwrite = file_exists($fn);
     $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
     if($overwrite && (!$ow || $auth < $auth_ow)) {
         return array($lang['uploadexist'], 0);
@@ -497,7 +497,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
     global $REV;
 
     $old = @filemtime($fn);
-    if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn)) {
+    if(!file_exists(mediaFN($id, $old)) && file_exists($fn)) {
         // add old revision to the attic if missing
         media_saveOldRevision($id);
     }
@@ -541,7 +541,7 @@ function media_saveOldRevision($id){
     global $conf, $lang;
 
     $oldf = mediaFN($id);
-    if(!@file_exists($oldf)) return '';
+    if(!file_exists($oldf)) return '';
     $date = filemtime($oldf);
     if (!$conf['mediarevisions']) return $date;
 
@@ -549,7 +549,7 @@ function media_saveOldRevision($id){
     if (!$medialog->getRevisionInfo($date)) {
         // there was an external edit,
         // there is no log entry for current version of file
-        if (!@file_exists(mediaMetaFN($id,'.changes'))) {
+        if (!file_exists(mediaMetaFN($id,'.changes'))) {
             addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']);
         } else {
             addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_EDIT);
@@ -721,7 +721,7 @@ function media_tabs_details($image, $selected_tab = ''){
                           'caption' => $lang['media_viewtab']);
 
     list(, $mime) = mimetype($image);
-    if ($mime == 'image/jpeg' && @file_exists(mediaFN($image))) {
+    if ($mime == 'image/jpeg' && file_exists(mediaFN($image))) {
         $tabs['edit'] = array('href'    => media_managerURL(array('tab_details' => 'edit'), '&'),
                               'caption' => $lang['media_edittab']);
     }
@@ -1008,7 +1008,7 @@ function media_preview_buttons($image, $auth, $rev='') {
 
     echo '<ul class="actions">'.NL;
 
-    if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
+    if($auth >= AUTH_DELETE && !$rev && file_exists(mediaFN($image))){
 
         // delete button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
@@ -1031,7 +1031,7 @@ function media_preview_buttons($image, $auth, $rev='') {
         echo '</li>'.NL;
     }
 
-    if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
+    if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && file_exists(mediaFN($image, $rev))){
 
         // restore button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
@@ -1103,7 +1103,7 @@ function media_file_tags($meta) {
     if(is_null($fields)){
         $config_files = getConfigFiles('mediameta');
         foreach ($config_files as $config_file) {
-            if(@file_exists($config_file)) include($config_file);
+            if(file_exists($config_file)) include($config_file);
         }
     }
 
@@ -1580,7 +1580,7 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
 function media_printicon($filename, $size=''){
     list($ext) = mimetype(mediaFN($filename),false);
 
-    if (@file_exists(DOKU_INC.'lib/images/fileicons/'.$size.'/'.$ext.'.png')) {
+    if (file_exists(DOKU_INC.'lib/images/fileicons/'.$size.'/'.$ext.'.png')) {
         $icon = DOKU_BASE.'lib/images/fileicons/'.$size.'/'.$ext.'.png';
     } else {
         $icon = DOKU_BASE.'lib/images/fileicons/'.$size.'/file.png';
@@ -2165,7 +2165,7 @@ function media_image_download($url,$file){
     $data = $http->get($url);
     if(!$data) return false;
 
-    $fileexists = @file_exists($file);
+    $fileexists = file_exists($file);
     $fp = @fopen($file,"w");
     if(!$fp) return false;
     fwrite($fp,$data);
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 2fbcbfd1f..375712661 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -263,7 +263,7 @@ function page_exists($id,$rev='',$clean=true, $date_at=false) {
         if($pagelog_rev !== false)
             $rev = $pagelog_rev;
     }
-    return @file_exists(wikiFN($id,$rev,$clean));
+    return file_exists(wikiFN($id,$rev,$clean));
 }
 
 /**
@@ -299,9 +299,9 @@ function wikiFN($raw_id,$rev='',$clean=true){
         $fn = $conf['olddir'].'/'.utf8_encodeFN($id).'.'.$rev.'.txt';
         if($conf['compression']){
             //test for extensions here, we want to read both compressions
-            if (@file_exists($fn . '.gz')){
+            if (file_exists($fn . '.gz')){
                 $fn .= '.gz';
-            }else if(@file_exists($fn . '.bz2')){
+            }else if(file_exists($fn . '.bz2')){
                 $fn .= '.bz2';
             }else{
                 //file doesnt exist yet, so we take the configured extension
@@ -418,9 +418,9 @@ function mediaFN($id, $rev=''){
 function localeFN($id,$ext='txt'){
     global $conf;
     $file = DOKU_CONF.'lang/'.$conf['lang'].'/'.$id.'.'.$ext;
-    if(!@file_exists($file)){
+    if(!file_exists($file)){
         $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.'.$ext;
-        if(!@file_exists($file)){
+        if(!file_exists($file)){
             //fall back to english
             $file = DOKU_INC.'inc/lang/en/'.$id.'.'.$ext;
         }
@@ -504,7 +504,7 @@ function resolve_mediaid($ns,&$page,&$exists,$rev='',$date_at=false){
     }
     
     $file   = mediaFN($page,$rev);
-    $exists = @file_exists($file);
+    $exists = file_exists($file);
 }
 
 /**
@@ -565,7 +565,7 @@ function resolve_pageid($ns,&$page,&$exists,$rev='',$date_at=false ){
         }
     }else{
         //check alternative plural/nonplural form
-        if(!@file_exists($file)){
+        if(!file_exists($file)){
             if( $conf['autoplural'] ){
                 if(substr($page,-1) == 's'){
                     $try = substr($page,0,-1);
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 3ef8138a7..17c331ef5 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -71,13 +71,13 @@ function p_wiki_xhtml($id, $rev='', $excuse=true,$date_at=''){
     $ID   = $id;
 
     if($rev || $date_at){
-        if(@file_exists($file)){
+        if(file_exists($file)){
             $ret = p_render('xhtml',p_get_instructions(io_readWikiPage($file,$id,$rev)),$info,$date_at); //no caching on old revisions
         }elseif($excuse){
             $ret = p_locale_xhtml('norev');
         }
     }else{
-        if(@file_exists($file)){
+        if(file_exists($file)){
             $ret = p_cached_output($file,'xhtml',$id);
         }elseif($excuse){
             $ret = p_locale_xhtml('newpage');
@@ -156,7 +156,7 @@ function p_cached_instructions($file,$cacheonly=false,$id='') {
 
     if ($cacheonly || $cache->useCache() || (isset($run[$file]) && !defined('DOKU_UNITTEST'))) {
         return $cache->retrieveCache();
-    } else if (@file_exists($file)) {
+    } else if (file_exists($file)) {
         // no cache - do some work
         $ins = p_get_instructions(io_readWikiPage($file,$id));
         if ($cache->storeCache($ins)) {
@@ -248,7 +248,7 @@ function p_get_metadata($id, $key='', $render=METADATA_RENDER_USING_CACHE){
             if ($render & METADATA_RENDER_USING_SIMPLE_CACHE) {
                 $pagefn = wikiFN($id);
                 $metafn = metaFN($id, '.meta');
-                if (!@file_exists($metafn) || @filemtime($pagefn) > @filemtime($cachefile->cache)) {
+                if (!file_exists($metafn) || @filemtime($pagefn) > @filemtime($cachefile->cache)) {
                     $do_render = true;
                 }
             } elseif (!$cachefile->useCache()){
@@ -414,7 +414,7 @@ function p_read_metadata($id,$cache=false) {
     if (isset($cache_metadata[(string)$id])) return $cache_metadata[(string)$id];
 
     $file = metaFN($id, '.meta');
-    $meta = @file_exists($file) ? unserialize(io_readFile($file, false)) : array('current'=>array(),'persistent'=>array());
+    $meta = file_exists($file) ? unserialize(io_readFile($file, false)) : array('current'=>array(),'persistent'=>array());
 
     if ($cache) {
         $cache_metadata[(string)$id] = $meta;
diff --git a/inc/plugin.php b/inc/plugin.php
index 9d9b2044c..f2ad95e2e 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -33,7 +33,7 @@ class DokuWiki_Plugin {
     public function getInfo(){
         $parts = explode('_', get_class($this));
         $info = DOKU_PLUGIN . '/' . $parts[2] . '/plugin.info.txt';
-        if(@file_exists($info)) return confToHash($info);
+        if(file_exists($info)) return confToHash($info);
 
         msg(
             'getInfo() not implemented in ' . get_class($this) . ' and ' . $info . ' not found.<br />' .
@@ -112,9 +112,9 @@ class DokuWiki_Plugin {
         global $conf;
         $plugin = $this->getPluginName();
         $file = DOKU_CONF.'plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt';
-        if (!@file_exists($file)){
+        if (!file_exists($file)){
             $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt';
-            if(!@file_exists($file)){
+            if(!file_exists($file)){
                 //fall back to english
                 $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt';
             }
@@ -137,7 +137,7 @@ class DokuWiki_Plugin {
         // don't include once, in case several plugin components require the same language file
         @include($path . 'en/lang.php');
         foreach($config_cascade['lang']['plugin'] as $config_file) {
-            if(@file_exists($config_file . $this->getPluginName() . '/en/lang.php')) {
+            if(file_exists($config_file . $this->getPluginName() . '/en/lang.php')) {
                 include($config_file . $this->getPluginName() . '/en/lang.php');
             }
         }
@@ -145,7 +145,7 @@ class DokuWiki_Plugin {
         if($conf['lang'] != 'en') {
             @include($path . $conf['lang'] . '/lang.php');
             foreach($config_cascade['lang']['plugin'] as $config_file) {
-                if(@file_exists($config_file . $this->getPluginName() . '/' . $conf['lang'] . '/lang.php')) {
+                if(file_exists($config_file . $this->getPluginName() . '/' . $conf['lang'] . '/lang.php')) {
                     include($config_file . $this->getPluginName() . '/' . $conf['lang'] . '/lang.php');
                 }
             }
@@ -207,7 +207,7 @@ class DokuWiki_Plugin {
         $path = DOKU_PLUGIN.$this->getPluginName().'/conf/';
         $conf = array();
 
-        if (@file_exists($path.'default.php')) {
+        if (file_exists($path.'default.php')) {
             include($path.'default.php');
         }
 
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index dfd4d0a29..ad73e1528 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -177,7 +177,7 @@ class Doku_Plugin_Controller {
                     // disabling mechanism was changed back very soon again
                     // to keep everything simple we just skip the plugin completely
                     continue;
-                } elseif (@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
+                } elseif (file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
                     /**
                      * treat this as a default disabled plugin(over-rideable by the plugin manager)
                      * @deprecated 2011-09-10 (usage of disabled files)
@@ -247,9 +247,9 @@ class Doku_Plugin_Controller {
                 $out .= "\$plugins['$plugin'] = $value;\n";
             }
             // backup current file (remove any existing backup)
-            if (@file_exists($file)) {
+            if (file_exists($file)) {
                 $backup = $file.'.bak';
-                if (@file_exists($backup)) @unlink($backup);
+                if (file_exists($backup)) @unlink($backup);
                 if (!@copy($file,$backup)) return false;
                 if (!empty($conf['fperm'])) chmod($backup, $conf['fperm']);
             }
@@ -314,7 +314,7 @@ class Doku_Plugin_Controller {
         foreach ($master_list as $plugin) {
             $dir = $this->get_directory($plugin);
 
-            if (@file_exists(DOKU_PLUGIN."$dir/$type.php")){
+            if (file_exists(DOKU_PLUGIN."$dir/$type.php")){
                 $plugins[] = $plugin;
             } else {
                 if ($dp = @opendir(DOKU_PLUGIN."$dir/$type/")) {
diff --git a/inc/subscription.php b/inc/subscription.php
index 58376f2ec..8b6dcb27e 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -166,7 +166,7 @@ class Subscription {
         // Handle files.
         $result = array();
         foreach($files as $target => $file) {
-            if(!@file_exists($file)) continue;
+            if(!file_exists($file)) continue;
 
             $lines = file($file);
             foreach($lines as $line) {
diff --git a/inc/template.php b/inc/template.php
index 3bccb0bd8..646f0873a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1124,7 +1124,7 @@ function tpl_get_img_meta() {
 
     $config_files = getConfigFiles('mediameta');
     foreach ($config_files as $config_file) {
-        if(@file_exists($config_file)) {
+        if(file_exists($config_file)) {
             include($config_file);
         }
     }
@@ -1297,7 +1297,7 @@ function tpl_loadConfig() {
     $file = tpl_incdir().'/conf/default.php';
     $conf = array();
 
-    if(!@file_exists($file)) return false;
+    if(!file_exists($file)) return false;
 
     // load default config file
     include($file);
@@ -1327,7 +1327,7 @@ function tpl_getLang($id) {
         // don't include once
         @include($path . 'en/lang.php');
         foreach($config_cascade['lang']['template'] as $config_file) {
-            if(@file_exists($config_file . $conf['template'] . '/en/lang.php')) {
+            if(file_exists($config_file . $conf['template'] . '/en/lang.php')) {
                 include($config_file . $conf['template'] . '/en/lang.php');
             }
         }
@@ -1335,7 +1335,7 @@ function tpl_getLang($id) {
         if($conf['lang'] != 'en') {
             @include($path . $conf['lang'] . '/lang.php');
             foreach($config_cascade['lang']['template'] as $config_file) {
-                if(@file_exists($config_file . $conf['template'] . '/' . $conf['lang'] . '/lang.php')) {
+                if(file_exists($config_file . $conf['template'] . '/' . $conf['lang'] . '/lang.php')) {
                     include($config_file . $conf['template'] . '/' . $conf['lang'] . '/lang.php');
                 }
             }
@@ -1365,9 +1365,9 @@ function tpl_localeFN($id) {
     $path = tpl_incdir().'lang/';
     global $conf;
     $file = DOKU_CONF.'template_lang/'.$conf['template'].'/'.$conf['lang'].'/'.$id.'.txt';
-    if (!@file_exists($file)){
+    if (!file_exists($file)){
         $file = $path.$conf['lang'].'/'.$id.'.txt';
-        if(!@file_exists($file)){
+        if(!file_exists($file)){
             //fall back to english
             $file = $path.'en/'.$id.'.txt';
         }
diff --git a/install.php b/install.php
index d031cb3d9..1a2d03dff 100644
--- a/install.php
+++ b/install.php
@@ -110,7 +110,7 @@ header('Content-Type: text/html; charset=utf-8');
 
     <div style="float: right; width: 34%;">
         <?php
-            if(@file_exists(DOKU_INC.'inc/lang/'.$LC.'/install.html')){
+            if(file_exists(DOKU_INC.'inc/lang/'.$LC.'/install.html')){
                 include(DOKU_INC.'inc/lang/'.$LC.'/install.html');
             }else{
                 print "<div lang=\"en\" dir=\"ltr\">\n";
@@ -497,7 +497,7 @@ function check_configs(){
 
     // configs shouldn't exist
     foreach ($config_files as $file) {
-        if (@file_exists($file) && filesize($file)) {
+        if (file_exists($file) && filesize($file)) {
             $file    = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}/', $file);
             $error[] = sprintf($lang['i_confexists'],$file);
             $ok      = false;
@@ -535,7 +535,7 @@ function check_permissions(){
 
     $ok = true;
     foreach($dirs as $dir){
-        if(!@file_exists("$dir/.") || !@is_writable($dir)){
+        if(!file_exists("$dir/.") || !is_writable($dir)){
             $dir     = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}', $dir);
             $error[] = sprintf($lang['i_permfail'],$dir);
             $ok      = false;
@@ -604,7 +604,7 @@ function langsel(){
     $langs = array();
     while (($file = readdir($dh)) !== false) {
         if(preg_match('/^[\._]/',$file)) continue;
-        if(is_dir($dir.'/'.$file) && @file_exists($dir.'/'.$file.'/lang.php')){
+        if(is_dir($dir.'/'.$file) && file_exists($dir.'/'.$file.'/lang.php')){
             $langs[] = $file;
         }
     }
diff --git a/lib/exe/css.php b/lib/exe/css.php
index b1065f518..e0bc68312 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -365,11 +365,11 @@ function css_interwiki(){
     $iwlinks = getInterwiki();
     foreach(array_keys($iwlinks) as $iw){
         $class = preg_replace('/[^_\-a-z0-9]+/i','_',$iw);
-        if(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.png')){
+        if(file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.png')){
             echo "a.iw_$class {";
             echo '  background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$iw.'.png)';
             echo '}';
-        }elseif(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.gif')){
+        }elseif(file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.gif')){
             echo "a.iw_$class {";
             echo '  background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$iw.'.gif)';
             echo '}';
@@ -451,7 +451,7 @@ class DokuCssFile {
      * @return  string               the CSS/Less contents of the file
      */
     public function load($location='') {
-        if (!@file_exists($this->filepath)) return '';
+        if (!file_exists($this->filepath)) return '';
 
         $css = io_readFile($this->filepath);
         if (!$location) return $css;
diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index cc29d5b87..ec1a9b874 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -37,7 +37,7 @@ $AUTH = auth_quickaclcheck($IMG);
 if($AUTH >= AUTH_READ){
     // check if image exists
     $SRC = mediaFN($IMG,$REV); 
-    if(!@file_exists($SRC)){
+    if(!file_exists($SRC)){
         //doesn't exist!
         http_status(404);
         $ERROR = 'File not found';
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 89c4b7cd0..330b8498d 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -68,9 +68,9 @@ function runTrimRecentChanges($media_changes = false) {
     // Trims the recent changes cache to the last $conf['changes_days'] recent
     // changes or $conf['recent'] items, which ever is larger.
     // The trimming is only done once a day.
-    if (@file_exists($fn) &&
+    if (file_exists($fn) &&
         (@filemtime($fn.'.trimmed')+86400)<time() &&
-        !@file_exists($fn.'_tmp')) {
+        !file_exists($fn.'_tmp')) {
             @touch($fn.'.trimmed');
             io_lock($fn);
             $lines = file($fn);
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 793104e81..3f9781e34 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -160,7 +160,7 @@ function js_out(){
  * @param string $file filename path to file
  */
 function js_load($file){
-    if(!@file_exists($file)) return;
+    if(!file_exists($file)) return;
     static $loaded = array();
 
     $data = io_readFile($file);
@@ -179,7 +179,7 @@ function js_load($file){
 
         if($ifile{0} != '/') $ifile = dirname($file).'/'.$ifile;
 
-        if(@file_exists($ifile)){
+        if(file_exists($ifile)){
             $idata = io_readFile($ifile);
         }else{
             $idata = '';
@@ -221,10 +221,10 @@ function js_pluginstrings() {
     $plugins = plugin_list();
     foreach ($plugins as $p){
         if (isset($lang)) unset($lang);
-        if (@file_exists(DOKU_PLUGIN."$p/lang/en/lang.php")) {
+        if (file_exists(DOKU_PLUGIN."$p/lang/en/lang.php")) {
             include DOKU_PLUGIN."$p/lang/en/lang.php";
         }
-        if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php")) {
+        if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php")) {
             include DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php";
         }
         if (isset($lang['js'])) {
@@ -245,10 +245,10 @@ function js_pluginstrings() {
 function js_templatestrings() {
     global $conf;
     $templatestrings = array();
-    if (@file_exists(tpl_incdir()."lang/en/lang.php")) {
+    if (file_exists(tpl_incdir()."lang/en/lang.php")) {
         include tpl_incdir()."lang/en/lang.php";
     }
-    if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
+    if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
         include tpl_incdir()."lang/".$conf['lang']."/lang.php";
     }
     if (isset($lang['js'])) {
diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php
index fd2d0b249..b31c02fc8 100644
--- a/lib/plugins/authplain/auth.php
+++ b/lib/plugins/authplain/auth.php
@@ -325,7 +325,7 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
 
         $this->users = array();
 
-        if(!@file_exists($config_cascade['plainauth.users']['default'])) return;
+        if(!file_exists($config_cascade['plainauth.users']['default'])) return;
 
         $lines = file($config_cascade['plainauth.users']['default']);
         foreach($lines as $line) {
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 9202a221b..2ef570b68 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -282,7 +282,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
                 if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp' || $plugin == 'config') continue;
                 if (is_file(DOKU_PLUGIN.$plugin)) continue;
 
-                if (@file_exists(DOKU_PLUGIN.$plugin.$enlangfile)){
+                if (file_exists(DOKU_PLUGIN.$plugin.$enlangfile)){
                     $lang = array();
                     @include(DOKU_PLUGIN.$plugin.$enlangfile);
                     if ($conf['lang'] != 'en') @include(DOKU_PLUGIN.$plugin.$langfile);
@@ -303,7 +303,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         // the same for the active template
         $tpl = $conf['template'];
 
-        if (@file_exists(tpl_incdir().$enlangfile)){
+        if (file_exists(tpl_incdir().$enlangfile)){
             $lang = array();
             @include(tpl_incdir().$enlangfile);
             if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile);
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 590631dae..56b9a918d 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -40,7 +40,7 @@ if (!class_exists('configuration')) {
         public function configuration($datafile) {
             global $conf, $config_cascade;
 
-            if (!@file_exists($datafile)) {
+            if (!file_exists($datafile)) {
                 msg('No configuration metadata found at - '.htmlspecialchars($datafile),-1);
                 return;
             }
@@ -125,8 +125,8 @@ if (!class_exists('configuration')) {
             $file = end($this->_local_files);
 
             // backup current file (remove any existing backup)
-            if (@file_exists($file) && $backup) {
-                if (@file_exists($file.'.bak')) @unlink($file.'.bak');
+            if (@file_exists$file) && $backup) {
+                if (@ffile_existsfile.'.bak')) @unlink($file.'.bak');
                 if (!io_rename($file, $file.'.bak')) return false;
             }
 
@@ -191,7 +191,7 @@ if (!class_exists('configuration')) {
 
             if ($this->_format == 'php') {
 
-                if(@file_exists($file)){
+                if(@fifile_existsile)){
                     $contents = @php_strip_whitespace($file);
                 }else{
                     $contents = '';
@@ -281,7 +281,7 @@ if (!class_exists('configuration')) {
             $local = $this->_local_files[0];
 
             if (!is_writable(dirname($local))) return true;
-            if (@file_exists($local) && !is_writable($local)) return true;
+            if (@filfile_existscal) && !is_writable($local)) return true;
 
             return false;
         }
@@ -345,7 +345,7 @@ if (!class_exists('configuration')) {
 
             foreach ($this->get_plugin_list() as $plugin) {
                 $plugin_dir = plugin_directory($plugin);
-                if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
+                if (@filefile_exists_PLUGIN.$plugin_dir.$file)){
                     $meta = array();
                     @include(DOKU_PLUGIN.$plugin_dir.$file);
                     @include(DOKU_PLUGIN.$plugin_dir.$class);
@@ -360,7 +360,7 @@ if (!class_exists('configuration')) {
             }
 
             // the same for the active template
-            if (@file_exists(tpl_incdir().$file)){
+            if (@file_file_existsncdir().$file)){
                 $meta = array();
                 @include(tpl_incdir().$file);
                 @include(tpl_incdir().$class);
@@ -388,7 +388,7 @@ if (!class_exists('configuration')) {
 
             foreach ($this->get_plugin_list() as $plugin) {
                 $plugin_dir = plugin_directory($plugin);
-                if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
+                if (@file_efile_existsLUGIN.$plugin_dir.$file)){
                     $conf = $this->_read_config(DOKU_PLUGIN.$plugin_dir.$file);
                     foreach ($conf as $key => $value){
                         $default['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 232a8177f..fd3a90e28 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -151,7 +151,7 @@ if (!class_exists('setting_im_convert')) {
             $value = is_null($this->_local) ? $this->_default : $this->_local;
             if ($value == $input) return false;
 
-            if ($input && !@file_exists($input)) {
+            if ($input && !file_exists($input)) {
                 $this->_error = true;
                 $this->_input = $input;
                 return false;
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index dfa624907..6c0946b09 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -707,7 +707,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $plugin     = null;
 
             foreach($plugin_types as $type) {
-                if(@file_exists($path.$type.'.php')) {
+                if(file_exists($path.$type.'.php')) {
                     $plugin = plugin_load($type, $this->base);
                     if ($plugin) break;
                 }
@@ -907,12 +907,12 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
             // check to make sure we aren't overwriting anything
             $target = $target_base_dir.$item['base'];
-            if(!$overwrite && @file_exists($target)) {
+            if(!$overwrite && file_exists($target)) {
                 // TODO remember our settings, ask the user to confirm overwrite
                 continue;
             }
 
-            $action = @file_exists($target) ? 'update' : 'install';
+            $action = file_exists($target) ? 'update' : 'install';
 
             // copy action
             if($this->dircopy($item['tmp'], $target)) {
@@ -1117,7 +1117,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             return $ok;
 
         } else {
-            $exists = @file_exists($dst);
+            $exists = file_exists($dst);
 
             if(!@copy($src, $dst)) return false;
             if(!$exists && !empty($conf['fperm'])) chmod($dst, $conf['fperm']);
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index bd2d090e1..ab569b8b4 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -87,7 +87,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
 
             //If there was an error the last time we tried to autosubmit, warn the user
             if ( $this->helper->isAutoSubmitEnabled() ){
-                if ( @file_exists($this->helper->autosubmitErrorFile) ){
+                if ( file_exists($this->helper->autosubmitErrorFile) ){
                     echo $this->getLang('autosubmitError');
                     echo io_readFile( $this->helper->autosubmitErrorFile );
                 }
diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index b4fb33b90..8673fb5af 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -78,7 +78,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
      * @return boolean TRUE if we should send data once a month, FALSE otherwise
      */
     function isAutoSubmitEnabled(){
-        return @file_exists($this->autosubmitFile);
+        return file_exists($this->autosubmitFile);
     }
 
     /**
-- 
cgit v1.2.3


From 326dd43a06ec0806d8771d08a0733d63090e126f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 7 Jan 2015 10:56:28 +0100
Subject: Remove IE6 workaround for redirects with hashes

We no longer support IE6, so hashes in URLs no longer need to be
protected when redirecting.
---
 inc/common.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/inc/common.php b/inc/common.php
index 9b330000b..5a8b5c900 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1807,17 +1807,6 @@ function send_redirect($url) {
     // always close the session
     session_write_close();
 
-    // work around IE bug
-    // http://www.ianhoar.com/2008/11/16/internet-explorer-6-and-redirected-anchor-links/
-    @list($url, $hash) = explode('#', $url);
-    if($hash) {
-        if(strpos($url, '?')) {
-            $url = $url.'&#'.$hash;
-        } else {
-            $url = $url.'?&#'.$hash;
-        }
-    }
-
     // check if running on IIS < 6 with CGI-PHP
     if($INPUT->server->has('SERVER_SOFTWARE') && $INPUT->server->has('GATEWAY_INTERFACE') &&
         (strpos($INPUT->server->str('GATEWAY_INTERFACE'), 'CGI') !== false) &&
-- 
cgit v1.2.3


From 51b257b6019e01c05118fc3c93cb3ca60152076d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 7 Jan 2015 11:53:40 +0100
Subject: fixed search'and'replace fuckup in config plugin

---
 lib/plugins/config/settings/config.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 56b9a918d..378b93880 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -125,8 +125,8 @@ if (!class_exists('configuration')) {
             $file = end($this->_local_files);
 
             // backup current file (remove any existing backup)
-            if (@file_exists$file) && $backup) {
-                if (@ffile_existsfile.'.bak')) @unlink($file.'.bak');
+            if (file_exists($file) && $backup) {
+                if (file_exists($file.'.bak')) @unlink($file.'.bak');
                 if (!io_rename($file, $file.'.bak')) return false;
             }
 
@@ -191,7 +191,7 @@ if (!class_exists('configuration')) {
 
             if ($this->_format == 'php') {
 
-                if(@fifile_existsile)){
+                if(file_exists($file)){
                     $contents = @php_strip_whitespace($file);
                 }else{
                     $contents = '';
@@ -281,7 +281,7 @@ if (!class_exists('configuration')) {
             $local = $this->_local_files[0];
 
             if (!is_writable(dirname($local))) return true;
-            if (@filfile_existscal) && !is_writable($local)) return true;
+            if (file_exists($local) && !is_writable($local)) return true;
 
             return false;
         }
@@ -345,7 +345,7 @@ if (!class_exists('configuration')) {
 
             foreach ($this->get_plugin_list() as $plugin) {
                 $plugin_dir = plugin_directory($plugin);
-                if (@filefile_exists_PLUGIN.$plugin_dir.$file)){
+                if (file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
                     $meta = array();
                     @include(DOKU_PLUGIN.$plugin_dir.$file);
                     @include(DOKU_PLUGIN.$plugin_dir.$class);
@@ -360,7 +360,7 @@ if (!class_exists('configuration')) {
             }
 
             // the same for the active template
-            if (@file_file_existsncdir().$file)){
+            if (file_exists(tpl_incdir().$file)){
                 $meta = array();
                 @include(tpl_incdir().$file);
                 @include(tpl_incdir().$class);
@@ -388,7 +388,7 @@ if (!class_exists('configuration')) {
 
             foreach ($this->get_plugin_list() as $plugin) {
                 $plugin_dir = plugin_directory($plugin);
-                if (@file_efile_existsLUGIN.$plugin_dir.$file)){
+                if (file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
                     $conf = $this->_read_config(DOKU_PLUGIN.$plugin_dir.$file);
                     foreach ($conf as $key => $value){
                         $default['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
@@ -397,7 +397,7 @@ if (!class_exists('configuration')) {
             }
 
             // the same for the active template
-            if (@file_exists(tpl_incdir().$file)){
+            if (file_exists(tpl_incdir().$file)){
                 $conf = $this->_read_config(tpl_incdir().$file);
                 foreach ($conf as $key => $value){
                     $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
-- 
cgit v1.2.3


From 48c11be06e2cde2557957efc5571c9754ebf188f Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Wed, 7 Jan 2015 11:18:12 +0000
Subject: Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 lib/plugins/config/settings/config.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 378b93880..316cc2c59 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -487,7 +487,7 @@ if (!class_exists('setting')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array with content array(string $label_html, string $input_html)
+         * @return string[] with content array(string $label_html, string $input_html)
          */
         public function html(&$plugin, $echo=false) {
             $disable = '';
@@ -712,7 +712,7 @@ if (!class_exists('setting_array')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array with content array(string $label_html, string $input_html)
+         * @return string[] with content array(string $label_html, string $input_html)
          */
         function html(&$plugin, $echo=false) {
             $disable = '';
@@ -748,7 +748,7 @@ if (!class_exists('setting_string')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array with content array(string $label_html, string $input_html)
+         * @return string[] with content array(string $label_html, string $input_html)
          */
         function html(&$plugin, $echo=false) {
             $disable = '';
@@ -809,7 +809,7 @@ if (!class_exists('setting_password')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array with content array(string $label_html, string $input_html)
+         * @return string[] with content array(string $label_html, string $input_html)
          */
         function html(&$plugin, $echo=false) {
 
@@ -990,7 +990,7 @@ if (!class_exists('setting_onoff')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array with content array(string $label_html, string $input_html)
+         * @return string[] with content array(string $label_html, string $input_html)
          */
         function html(&$plugin, $echo = false) {
             $disable = '';
@@ -1044,7 +1044,7 @@ if (!class_exists('setting_multichoice')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array with content array(string $label_html, string $input_html)
+         * @return string[] with content array(string $label_html, string $input_html)
          */
         function html(&$plugin, $echo = false) {
             $disable = '';
@@ -1243,7 +1243,7 @@ if (!class_exists('setting_multicheckbox')) {
          *
          * @param DokuWiki_Plugin $plugin object of config plugin
          * @param bool            $echo   true: show inputted value, when error occurred, otherwise the stored setting
-         * @return array with content array(string $label_html, string $input_html)
+         * @return string[] with content array(string $label_html, string $input_html)
          */
         function html(&$plugin, $echo=false) {
 
-- 
cgit v1.2.3


From 38c6f603e006f27fd6194d1d2c14d3087d0e0cc9 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Wed, 7 Jan 2015 21:53:22 -0800
Subject: Optionally render RSS unsorted.

By default, SimplePie sorts RSS entries by the the date on each entry.

If some cases, mostly where RSS is used as a input format for another
service, rendering the order as-is is better than having it sorted.

This patch adds a new parameter for the rss keyword, 'nosort', which can
be used to disable SimplePie's sorting.

This makes it possible to correctly display RSS feeds from "Remember The
Milk", which have a complex order from the system.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---
 inc/parser/handler.php | 1 +
 inc/parser/xhtml.php   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index d96a01a60..731c19828 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -526,6 +526,7 @@ class Doku_Handler {
         $p['author']  = (preg_match('/\b(by|author)/',$params));
         $p['date']    = (preg_match('/\b(date)/',$params));
         $p['details'] = (preg_match('/\b(desc|detail)/',$params));
+        $p['nosort']  = (preg_match('/\b(nosort)\b/',$params));
 
         if (preg_match('/\b(\d+)([dhm])\b/',$params,$match)) {
             $period = array('d' => 86400, 'h' => 3600, 'm' => 60);
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index f1703111e..c68d206be 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1178,6 +1178,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             error_reporting($elvl);
         }
 
+        if($params['nosort']) $feed->enable_order_by_date(false);
+
         //decide on start and end
         if($params['reverse']) {
             $mod   = -1;
-- 
cgit v1.2.3


From c85bb997ff7d1af302b93348c38ad4b2b2914290 Mon Sep 17 00:00:00 2001
From: Mijndert <mijndert@mijndertstuij.nl>
Date: Thu, 8 Jan 2015 16:11:16 +0100
Subject: translation update

---
 inc/lang/nl/lang.php                   | 4 +++-
 lib/plugins/extension/lang/nl/lang.php | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index aa0087718..4c668557d 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -24,6 +24,7 @@
  * @author gicalle <gicalle@hotmail.com>
  * @author Rene <wllywlnt@yahoo.com>
  * @author Johan Vervloet <johan.vervloet@gmail.com>
+ * @author Mijndert <mijndert@mijndertstuij.nl>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -85,7 +86,7 @@ $lang['badpassconfirm']        = 'Sorry, het wachtwoord was onjuist';
 $lang['minoredit']             = 'Kleine wijziging';
 $lang['draftdate']             = 'Concept automatisch opgeslagen op';
 $lang['nosecedit']             = 'De pagina is tussentijds veranderd, sectie-informatie was verouderd, volledige pagina geladen.';
-$lang['searchcreatepage']      = "Niks gevonden? Maak een nieuwe pagina met als naam je zoekopdracht. Klik hiervoor op ''Maak deze pagina aan''.";
+$lang['searchcreatepage']      = 'Niks gevonden? Maak een nieuwe pagina met als naam je zoekopdracht. Klik hiervoor op \'\'Maak deze pagina aan\'\'.';
 $lang['regmissing']            = 'Vul alle velden in';
 $lang['reguexists']            = 'Er bestaat al een gebruiker met deze loginnaam.';
 $lang['regsuccess']            = 'De gebruiker is aangemaakt. Het wachtwoord is per e-mail verzonden.';
@@ -302,6 +303,7 @@ $lang['i_problems']            = 'De installer vond problemen, hieronder aangege
 $lang['i_modified']            = 'Uit veiligheidsoverwegingen werkt dit script alleen met nieuwe en onveranderde DokuWiki-installaties. Pak de bestanden opnieuw uit of raadpleeg de <a href="http://dokuwiki.org/install">Dokuwiki installatie-instructies</a>';
 $lang['i_funcna']              = 'PHP functie <code>%s</code> is niet beschikbaar. Wellicht heeft je hosting provider deze uitgeschakeld?';
 $lang['i_phpver']              = 'PHP-versie <code>%s</code> is lager dan de vereiste <code>%s</code>. Upgrade PHP.';
+$lang['i_mbfuncoverload']      = 'Om DokuWiki te draaien moet mbstring.func_overload uitgeschakeld zijn in php.ini.';
 $lang['i_permfail']            = '<code>%s</code> is niet schrijfbaar voor DokuWiki. Pas de permissie-instellingen van deze directory aan.';
 $lang['i_confexists']          = '<code>%s</code> bestaat reeds';
 $lang['i_writeerr']            = 'Niet mogelijk om <code>%s</code> aan te maken. Controleer de directory/bestandspermissies en maak het bestand handmatig aan.';
diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
index f75f78121..194b4b3e1 100644
--- a/lib/plugins/extension/lang/nl/lang.php
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -6,6 +6,7 @@
  * @author Rene <wllywlnt@yahoo.com>
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
  * @author Johan Vervloet <johan.vervloet@gmail.com>
+ * @author Mijndert <mijndert@mijndertstuij.nl>
  */
 $lang['menu']                  = 'Uitbreidingen';
 $lang['tab_plugins']           = 'Geïnstalleerde Plugins';
@@ -64,6 +65,7 @@ $lang['status_bundled']        = 'Gebundeld';
 $lang['msg_enabled']           = 'Plugin %s ingeschakeld';
 $lang['msg_disabled']          = 'Plugin %s uitgeschakeld';
 $lang['msg_delete_success']    = 'Uitbreiding %s gedeinstalleerd';
+$lang['msg_delete_failed']     = 'Het deïnstalleren van de extensie %s is mislukt.';
 $lang['msg_template_install_success'] = 'Template %s werd succesvol geïnstalleerd';
 $lang['msg_template_update_success'] = 'Template %s werd succesvol geüpdatet';
 $lang['msg_plugin_install_success'] = 'Plugin %s werd succesvol geïnstalleerd';
-- 
cgit v1.2.3


From cc813bdf0cffdf8fa58fb516548cca9c6fbcef19 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Thu, 8 Jan 2015 18:12:39 -0800
Subject: Document the nosort parameter.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---
 data/pages/wiki/syntax.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 86ad815e4..09a077aa0 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -481,10 +481,13 @@ echo '</tr></table>';
 | author     | show item authors names |
 | date       | show item dates |
 | description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped |
+| nosort     | do not sort the items in the feed |
 | //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). |
 
 The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered.
 
+By default, SimplePie if all of the items in the feed contain dates, SimplePie will sort the items in the feed so that the newest are displayed first. You can reverse this with the ''reverse'' parameter, or disable it entirely with ''nosort''.
+
 **Example:**
 
   {{rss>http://slashdot.org/index.rss 5 author date 1h }}
-- 
cgit v1.2.3


From 5c7812a8e4b376643062b85088143c265e5ffb4b Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Fri, 9 Jan 2015 09:01:12 -0800
Subject: Clean up RSS sort wording per
 https://github.com/splitbrain/dokuwiki/pull/999#discussion_r22706527.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---
 data/pages/wiki/syntax.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 09a077aa0..7b453efa2 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -486,7 +486,7 @@ echo '</tr></table>';
 
 The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered.
 
-By default, SimplePie if all of the items in the feed contain dates, SimplePie will sort the items in the feed so that the newest are displayed first. You can reverse this with the ''reverse'' parameter, or disable it entirely with ''nosort''.
+By default the feed will be sorted by date, newest items first. You can sort it by oldest first using the ''reverse'' parameter, or display the feed as is with ''nosort''.
 
 **Example:**
 
-- 
cgit v1.2.3


From 276820f70d7e96ee375735c1a15bdc0a8331a5a7 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Sat, 10 Jan 2015 14:47:51 +0000
Subject: Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 inc/JpegMeta.php                              | 52 +++++++++++++++++++++++++++
 inc/parser/handler.php                        |  6 ++++
 inc/parser/parser.php                         |  9 +++++
 lib/plugins/authplain/_test/escaping.test.php |  6 ++++
 4 files changed, 73 insertions(+)

diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index 4cdebcc36..cd082cbba 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -1106,6 +1106,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param string $outputName
+     */
     function _writeJPEG($outputName) {
         $this->_parseAll();
 
@@ -1238,6 +1242,12 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $marker
+     * @param integer $length
+     * @param integer $origLength
+     */
     function _writeJPEGMarker($marker, $length, &$data, $origLength) {
         if ($length <= 0) {
             return false;
@@ -1565,6 +1575,7 @@ class JpegMeta {
      * Parses XMP nodes by recursion
      *
      * @author  Hakan Sandell <hakan.sandell@mydata.se>
+     * @param integer $count
      */
     function _parseXmpNode($values, &$i, &$meta, $count) {
         if ($values[$i]['type'] == 'close') return;
@@ -1668,6 +1679,12 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $base
+     * @param boolean $isBigEndian
+     * @param string $mode
+     */
     function _readIFD($data, $base, $offset, $isBigEndian, $mode) {
         $EXIFTags = $this->_exifTagNames($mode);
 
@@ -1923,6 +1940,12 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $offsetBase
+     * @param boolean $isBigEndian
+     * @param boolean $hasNext
+     */
     function _writeIFD(&$data, $pos, $offsetBase, &$entries, $isBigEndian, $hasNext) {
         $tiffData = null;
         $tiffDataOffsetPos = -1;
@@ -1979,6 +2002,11 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param boolean $isBigEndian
+     * @param string $mode
+     */
     function & _getIFDEntries($isBigEndian, $mode) {
         $EXIFNames = $this->_exifTagNames($mode);
         $EXIFTags = $this->_exifNameTags($mode);
@@ -2487,6 +2515,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _write8BIM(&$data, $pos, $type, $header, &$value) {
         $signature = "8BIM";
 
@@ -2547,6 +2579,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _writeIPTCEntry(&$data, $pos, $type, &$value) {
         $pos = $this->_putShort($data, $pos, 0x1C02);
         $pos = $this->_putByte($data, $pos, $type);
@@ -2907,11 +2943,19 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _getByte(&$data, $pos) {
         return ord($data{$pos});
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _putByte(&$data, $pos, $val) {
         $val = intval($val);
 
@@ -2947,6 +2991,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _getLong(&$data, $pos, $bigEndian = true) {
         if ($bigEndian) {
             return (ord($data{$pos}) << 24)
@@ -2962,6 +3010,10 @@ class JpegMeta {
     }
 
     /*************************************************************/
+
+    /**
+     * @param integer $pos
+     */
     function _putLong(&$data, $pos, $val, $bigEndian = true) {
         $val = intval($val);
 
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 731c19828..b8e2de82a 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -21,6 +21,9 @@ class Doku_Handler {
         $this->CallWriter = new Doku_Handler_CallWriter($this);
     }
 
+    /**
+     * @param string $handler
+     */
     function _addCall($handler, $args, $pos) {
         $call = array($handler,$args, $pos);
         $this->CallWriter->writeCall($call);
@@ -133,6 +136,9 @@ class Doku_Handler {
         return true;
     }
 
+    /**
+     * @param string $name
+     */
     function _nestingTag($match, $state, $pos, $name) {
         switch ( $state ) {
             case DOKU_LEXER_ENTER:
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index df01f3302..5f86cf5c4 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -61,6 +61,9 @@ class Doku_Parser {
 
     var $connected = false;
 
+    /**
+     * @param Doku_Parser_Mode_base $BaseMode
+     */
     function addBaseMode(& $BaseMode) {
         $this->modes['base'] =& $BaseMode;
         if ( !$this->Lexer ) {
@@ -139,6 +142,7 @@ interface Doku_Parser_Mode_Interface {
 
     /**
      * Called before any calls to connectTo
+     * @return void
      */
     function preConnect();
 
@@ -146,11 +150,13 @@ interface Doku_Parser_Mode_Interface {
      * Connects the mode
      *
      * @param string $mode
+     * @return void
      */
     function connectTo($mode);
 
     /**
      * Called after all calls to connectTo
+     * @return void
      */
     function postConnect();
 
@@ -407,6 +413,9 @@ class Doku_Parser_Mode_formatting extends Doku_Parser_Mode {
             ),
         );
 
+    /**
+     * @param string $type
+     */
     function Doku_Parser_Mode_formatting($type) {
         global $PARSER_MODES;
 
diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php
index 9df96389a..e1eade8d4 100644
--- a/lib/plugins/authplain/_test/escaping.test.php
+++ b/lib/plugins/authplain/_test/escaping.test.php
@@ -106,6 +106,9 @@ class helper_plugin_authplain_escaping_test extends DokuWikiTest {
 
 class auth_plugin_authplainharness extends auth_plugin_authplain {
 
+    /**
+     * @param boolean $bool
+     */
     public function setPregsplit_safe($bool) {
         $this->_pregsplit_safe = $bool;
     }
@@ -114,6 +117,9 @@ class auth_plugin_authplainharness extends auth_plugin_authplain {
         return $this->_pregsplit_safe;
     }
 
+    /**
+     * @param string $line
+     */
     public function splitUserData($line){
         return $this->_splitUserData($line);
     }
-- 
cgit v1.2.3


From 7f253bcd8205f51a47f75fd97a45b1c573633c4c Mon Sep 17 00:00:00 2001
From: Rainbow Spike <Dr-Yukon@users.noreply.github.com>
Date: Mon, 12 Jan 2015 22:06:45 +1000
Subject: Update css.php

1 little fix
---
 lib/exe/css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 3b8bc80bc..701cebaed 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -36,7 +36,7 @@ function css_out(){
     $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
     if(!$tpl) $tpl = $conf['template'];
 
-    // load styl.ini
+    // load style.ini
     $styleini = css_styleini($tpl);
     
     // find mediatypes
-- 
cgit v1.2.3


From dca6aaca5c13a4a9f3fd386d65cb44122cedaaf7 Mon Sep 17 00:00:00 2001
From: Gilles-Philippe Morin <gphmorin@gmail.com>
Date: Tue, 13 Jan 2015 22:10:21 -0500
Subject: "Recent changes" becomes "Recent Changes"

To improve consistency: it is surrounded by "Update Profile" and "Media Manager".
---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index fb455f85f..92eb636ed 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -27,7 +27,7 @@ $lang['btn_top']               = 'Back to top';
 $lang['btn_newer']             = '<< more recent';
 $lang['btn_older']             = 'less recent >>';
 $lang['btn_revs']              = 'Old revisions';
-$lang['btn_recent']            = 'Recent changes';
+$lang['btn_recent']            = 'Recent Changes';
 $lang['btn_upload']            = 'Upload';
 $lang['btn_cancel']            = 'Cancel';
 $lang['btn_index']             = 'Sitemap';
-- 
cgit v1.2.3


From 5af3d1cd434f85882bb29253a3757cacc5c5338a Mon Sep 17 00:00:00 2001
From: KeenRivals <KeenRivals@users.noreply.github.com>
Date: Wed, 14 Jan 2015 16:14:41 -0500
Subject: Losslessly reduced PNG images with optipng -o7 -strip all, advdef -z4
 -i60, and advpng -z4 -i60.

---
 _test/data/media/wiki/dokuwiki-128.png              | Bin 33615 -> 27895 bytes
 _test/data/media/wiki/kind_zu_katze.png             | Bin 970 -> 437 bytes
 data/media/wiki/dokuwiki-128.png                    | Bin 33615 -> 27895 bytes
 data/security.png                                   | Bin 7917 -> 6516 bytes
 lib/images/admin/acl.png                            | Bin 1074 -> 1065 bytes
 lib/images/admin/config.png                         | Bin 1496 -> 1484 bytes
 lib/images/admin/plugin.png                         | Bin 1127 -> 1115 bytes
 lib/images/admin/popularity.png                     | Bin 1189 -> 1172 bytes
 lib/images/admin/revert.png                         | Bin 1295 -> 1295 bytes
 lib/images/admin/usermanager.png                    | Bin 1467 -> 1460 bytes
 lib/images/bullet.png                               | Bin 112 -> 101 bytes
 lib/images/closed-rtl.png                           | Bin 118 -> 111 bytes
 lib/images/closed.png                               | Bin 119 -> 110 bytes
 lib/images/diff.png                                 | Bin 206 -> 190 bytes
 lib/images/email.png                                | Bin 659 -> 370 bytes
 lib/images/error.png                                | Bin 648 -> 637 bytes
 lib/images/external-link.png                        | Bin 816 -> 431 bytes
 lib/images/fileicons/32x32/7z.png                   | Bin 992 -> 911 bytes
 lib/images/fileicons/32x32/asm.png                  | Bin 989 -> 955 bytes
 lib/images/fileicons/32x32/bash.png                 | Bin 993 -> 966 bytes
 lib/images/fileicons/32x32/bz2.png                  | Bin 1001 -> 920 bytes
 lib/images/fileicons/32x32/c.png                    | Bin 945 -> 929 bytes
 lib/images/fileicons/32x32/cc.png                   | Bin 955 -> 933 bytes
 lib/images/fileicons/32x32/conf.png                 | Bin 832 -> 666 bytes
 lib/images/fileicons/32x32/cpp.png                  | Bin 960 -> 943 bytes
 lib/images/fileicons/32x32/cs.png                   | Bin 960 -> 944 bytes
 lib/images/fileicons/32x32/csh.png                  | Bin 981 -> 952 bytes
 lib/images/fileicons/32x32/css.png                  | Bin 969 -> 952 bytes
 lib/images/fileicons/32x32/csv.png                  | Bin 819 -> 663 bytes
 lib/images/fileicons/32x32/deb.png                  | Bin 991 -> 914 bytes
 lib/images/fileicons/32x32/diff.png                 | Bin 975 -> 942 bytes
 lib/images/fileicons/32x32/doc.png                  | Bin 1034 -> 956 bytes
 lib/images/fileicons/32x32/docx.png                 | Bin 1078 -> 970 bytes
 lib/images/fileicons/32x32/file.png                 | Bin 605 -> 543 bytes
 lib/images/fileicons/32x32/gif.png                  | Bin 944 -> 873 bytes
 lib/images/fileicons/32x32/gz.png                   | Bin 994 -> 914 bytes
 lib/images/fileicons/32x32/h.png                    | Bin 941 -> 884 bytes
 lib/images/fileicons/32x32/hpp.png                  | Bin 974 -> 942 bytes
 lib/images/fileicons/32x32/htm.png                  | Bin 983 -> 945 bytes
 lib/images/fileicons/32x32/html.png                 | Bin 983 -> 945 bytes
 lib/images/fileicons/32x32/ico.png                  | Bin 941 -> 865 bytes
 lib/images/fileicons/32x32/java.png                 | Bin 992 -> 961 bytes
 lib/images/fileicons/32x32/jpeg.png                 | Bin 948 -> 877 bytes
 lib/images/fileicons/32x32/jpg.png                  | Bin 948 -> 877 bytes
 lib/images/fileicons/32x32/js.png                   | Bin 960 -> 937 bytes
 lib/images/fileicons/32x32/json.png                 | Bin 996 -> 966 bytes
 lib/images/fileicons/32x32/lua.png                  | Bin 979 -> 941 bytes
 lib/images/fileicons/32x32/mp3.png                  | Bin 947 -> 896 bytes
 lib/images/fileicons/32x32/mp4.png                  | Bin 1197 -> 1116 bytes
 lib/images/fileicons/32x32/odc.png                  | Bin 1061 -> 946 bytes
 lib/images/fileicons/32x32/odf.png                  | Bin 1059 -> 951 bytes
 lib/images/fileicons/32x32/odg.png                  | Bin 1066 -> 949 bytes
 lib/images/fileicons/32x32/odi.png                  | Bin 1058 -> 944 bytes
 lib/images/fileicons/32x32/odp.png                  | Bin 1060 -> 949 bytes
 lib/images/fileicons/32x32/ods.png                  | Bin 1063 -> 955 bytes
 lib/images/fileicons/32x32/odt.png                  | Bin 1060 -> 949 bytes
 lib/images/fileicons/32x32/ogg.png                  | Bin 950 -> 885 bytes
 lib/images/fileicons/32x32/ogv.png                  | Bin 1187 -> 1106 bytes
 lib/images/fileicons/32x32/pas.png                  | Bin 976 -> 945 bytes
 lib/images/fileicons/32x32/pdf.png                  | Bin 1076 -> 1003 bytes
 lib/images/fileicons/32x32/php.png                  | Bin 974 -> 952 bytes
 lib/images/fileicons/32x32/pl.png                   | Bin 951 -> 936 bytes
 lib/images/fileicons/32x32/png.png                  | Bin 957 -> 877 bytes
 lib/images/fileicons/32x32/ppt.png                  | Bin 871 -> 850 bytes
 lib/images/fileicons/32x32/pptx.png                 | Bin 924 -> 866 bytes
 lib/images/fileicons/32x32/ps.png                   | Bin 1086 -> 996 bytes
 lib/images/fileicons/32x32/py.png                   | Bin 966 -> 942 bytes
 lib/images/fileicons/32x32/rar.png                  | Bin 1000 -> 914 bytes
 lib/images/fileicons/32x32/rb.png                   | Bin 953 -> 936 bytes
 lib/images/fileicons/32x32/rpm.png                  | Bin 1001 -> 920 bytes
 lib/images/fileicons/32x32/rtf.png                  | Bin 867 -> 738 bytes
 lib/images/fileicons/32x32/sh.png                   | Bin 962 -> 941 bytes
 lib/images/fileicons/32x32/sql.png                  | Bin 827 -> 664 bytes
 lib/images/fileicons/32x32/swf.png                  | Bin 1268 -> 1173 bytes
 lib/images/fileicons/32x32/sxc.png                  | Bin 1078 -> 964 bytes
 lib/images/fileicons/32x32/sxd.png                  | Bin 1079 -> 965 bytes
 lib/images/fileicons/32x32/sxi.png                  | Bin 1067 -> 962 bytes
 lib/images/fileicons/32x32/sxw.png                  | Bin 1086 -> 968 bytes
 lib/images/fileicons/32x32/tar.png                  | Bin 987 -> 914 bytes
 lib/images/fileicons/32x32/tgz.png                  | Bin 999 -> 919 bytes
 lib/images/fileicons/32x32/txt.png                  | Bin 836 -> 661 bytes
 lib/images/fileicons/32x32/wav.png                  | Bin 944 -> 888 bytes
 lib/images/fileicons/32x32/webm.png                 | Bin 1232 -> 1210 bytes
 lib/images/fileicons/32x32/xls.png                  | Bin 1137 -> 1124 bytes
 lib/images/fileicons/32x32/xlsx.png                 | Bin 1182 -> 1131 bytes
 lib/images/fileicons/32x32/xml.png                  | Bin 615 -> 560 bytes
 lib/images/fileicons/32x32/zip.png                  | Bin 987 -> 914 bytes
 lib/images/fileicons/7z.png                         | Bin 415 -> 375 bytes
 lib/images/fileicons/asm.png                        | Bin 427 -> 379 bytes
 lib/images/fileicons/bash.png                       | Bin 433 -> 378 bytes
 lib/images/fileicons/bz2.png                        | Bin 419 -> 378 bytes
 lib/images/fileicons/c.png                          | Bin 412 -> 369 bytes
 lib/images/fileicons/cc.png                         | Bin 411 -> 369 bytes
 lib/images/fileicons/conf.png                       | Bin 402 -> 370 bytes
 lib/images/fileicons/cpp.png                        | Bin 430 -> 377 bytes
 lib/images/fileicons/cs.png                         | Bin 419 -> 374 bytes
 lib/images/fileicons/csh.png                        | Bin 427 -> 378 bytes
 lib/images/fileicons/css.png                        | Bin 427 -> 374 bytes
 lib/images/fileicons/csv.png                        | Bin 409 -> 371 bytes
 lib/images/fileicons/deb.png                        | Bin 421 -> 376 bytes
 lib/images/fileicons/diff.png                       | Bin 425 -> 376 bytes
 lib/images/fileicons/doc.png                        | Bin 410 -> 372 bytes
 lib/images/fileicons/docx.png                       | Bin 415 -> 375 bytes
 lib/images/fileicons/file.png                       | Bin 319 -> 249 bytes
 lib/images/fileicons/gif.png                        | Bin 407 -> 374 bytes
 lib/images/fileicons/gz.png                         | Bin 417 -> 374 bytes
 lib/images/fileicons/h.png                          | Bin 411 -> 368 bytes
 lib/images/fileicons/hpp.png                        | Bin 417 -> 376 bytes
 lib/images/fileicons/htm.png                        | Bin 417 -> 375 bytes
 lib/images/fileicons/html.png                       | Bin 417 -> 375 bytes
 lib/images/fileicons/ico.png                        | Bin 405 -> 372 bytes
 lib/images/fileicons/java.png                       | Bin 420 -> 376 bytes
 lib/images/fileicons/jpeg.png                       | Bin 412 -> 376 bytes
 lib/images/fileicons/jpg.png                        | Bin 412 -> 376 bytes
 lib/images/fileicons/js.png                         | Bin 420 -> 374 bytes
 lib/images/fileicons/json.png                       | Bin 435 -> 379 bytes
 lib/images/fileicons/lua.png                        | Bin 418 -> 374 bytes
 lib/images/fileicons/mp3.png                        | Bin 415 -> 378 bytes
 lib/images/fileicons/mp4.png                        | Bin 419 -> 377 bytes
 lib/images/fileicons/odc.png                        | Bin 407 -> 369 bytes
 lib/images/fileicons/odf.png                        | Bin 411 -> 373 bytes
 lib/images/fileicons/odg.png                        | Bin 411 -> 370 bytes
 lib/images/fileicons/odi.png                        | Bin 398 -> 371 bytes
 lib/images/fileicons/odp.png                        | Bin 404 -> 374 bytes
 lib/images/fileicons/ods.png                        | Bin 416 -> 373 bytes
 lib/images/fileicons/odt.png                        | Bin 403 -> 372 bytes
 lib/images/fileicons/ogg.png                        | Bin 408 -> 373 bytes
 lib/images/fileicons/ogv.png                        | Bin 412 -> 376 bytes
 lib/images/fileicons/pas.png                        | Bin 435 -> 380 bytes
 lib/images/fileicons/pdf.png                        | Bin 425 -> 377 bytes
 lib/images/fileicons/php.png                        | Bin 424 -> 376 bytes
 lib/images/fileicons/pl.png                         | Bin 418 -> 372 bytes
 lib/images/fileicons/png.png                        | Bin 417 -> 375 bytes
 lib/images/fileicons/ppt.png                        | Bin 412 -> 375 bytes
 lib/images/fileicons/pptx.png                       | Bin 414 -> 375 bytes
 lib/images/fileicons/ps.png                         | Bin 424 -> 377 bytes
 lib/images/fileicons/py.png                         | Bin 426 -> 374 bytes
 lib/images/fileicons/rar.png                        | Bin 418 -> 377 bytes
 lib/images/fileicons/rb.png                         | Bin 421 -> 375 bytes
 lib/images/fileicons/rpm.png                        | Bin 415 -> 374 bytes
 lib/images/fileicons/rtf.png                        | Bin 418 -> 376 bytes
 lib/images/fileicons/sh.png                         | Bin 422 -> 375 bytes
 lib/images/fileicons/sql.png                        | Bin 410 -> 373 bytes
 lib/images/fileicons/swf.png                        | Bin 416 -> 379 bytes
 lib/images/fileicons/sxc.png                        | Bin 420 -> 377 bytes
 lib/images/fileicons/sxd.png                        | Bin 424 -> 377 bytes
 lib/images/fileicons/sxi.png                        | Bin 414 -> 377 bytes
 lib/images/fileicons/sxw.png                        | Bin 417 -> 376 bytes
 lib/images/fileicons/tar.png                        | Bin 417 -> 377 bytes
 lib/images/fileicons/tgz.png                        | Bin 417 -> 377 bytes
 lib/images/fileicons/txt.png                        | Bin 407 -> 371 bytes
 lib/images/fileicons/wav.png                        | Bin 415 -> 375 bytes
 lib/images/fileicons/webm.png                       | Bin 412 -> 378 bytes
 lib/images/fileicons/xls.png                        | Bin 415 -> 378 bytes
 lib/images/fileicons/xlsx.png                       | Bin 425 -> 379 bytes
 lib/images/fileicons/xml.png                        | Bin 400 -> 376 bytes
 lib/images/fileicons/zip.png                        | Bin 418 -> 377 bytes
 lib/images/history.png                              | Bin 149 -> 149 bytes
 lib/images/icon-list.png                            | Bin 3342 -> 584 bytes
 lib/images/icon-sort.png                            | Bin 316 -> 211 bytes
 lib/images/info.png                                 | Bin 725 -> 721 bytes
 lib/images/interwiki.png                            | Bin 443 -> 442 bytes
 lib/images/interwiki/user.png                       | Bin 741 -> 684 bytes
 lib/images/license/badge/cc-by-nc-nd.png            | Bin 1475 -> 1456 bytes
 lib/images/license/badge/cc-by-nc-sa.png            | Bin 1587 -> 1567 bytes
 lib/images/license/badge/cc-by-nc.png               | Bin 1421 -> 1401 bytes
 lib/images/license/badge/cc-by-nd.png               | Bin 1283 -> 1261 bytes
 lib/images/license/badge/cc-by-sa.png               | Bin 1421 -> 1407 bytes
 lib/images/license/badge/cc-by.png                  | Bin 1204 -> 1186 bytes
 lib/images/license/badge/cc-zero.png                | Bin 1202 -> 1182 bytes
 lib/images/license/badge/cc.png                     | Bin 898 -> 846 bytes
 lib/images/license/badge/gnufdl.png                 | Bin 1667 -> 1649 bytes
 lib/images/license/badge/publicdomain.png           | Bin 1345 -> 1326 bytes
 lib/images/license/button/cc-by-nc-nd.png           | Bin 396 -> 391 bytes
 lib/images/license/button/cc-by-nc-sa.png           | Bin 403 -> 396 bytes
 lib/images/license/button/cc-by-nc.png              | Bin 388 -> 381 bytes
 lib/images/license/button/cc-by-nd.png              | Bin 386 -> 382 bytes
 lib/images/license/button/cc-by-sa.png              | Bin 386 -> 379 bytes
 lib/images/license/button/cc-by.png                 | Bin 369 -> 364 bytes
 lib/images/license/button/cc-zero.png               | Bin 386 -> 381 bytes
 lib/images/license/button/cc.png                    | Bin 399 -> 391 bytes
 lib/images/license/button/gnufdl.png                | Bin 509 -> 497 bytes
 lib/images/license/button/publicdomain.png          | Bin 368 -> 364 bytes
 lib/images/magnifier.png                            | Bin 569 -> 565 bytes
 lib/images/media_align_center.png                   | Bin 250 -> 249 bytes
 lib/images/media_align_left.png                     | Bin 251 -> 247 bytes
 lib/images/media_align_noalign.png                  | Bin 220 -> 218 bytes
 lib/images/media_align_right.png                    | Bin 252 -> 250 bytes
 lib/images/media_link_direct.png                    | Bin 720 -> 714 bytes
 lib/images/media_link_displaylnk.png                | Bin 306 -> 304 bytes
 lib/images/media_link_lnk.png                       | Bin 580 -> 578 bytes
 lib/images/media_link_nolnk.png                     | Bin 464 -> 452 bytes
 lib/images/media_size_large.png                     | Bin 102 -> 100 bytes
 lib/images/media_size_medium.png                    | Bin 231 -> 226 bytes
 lib/images/media_size_original.png                  | Bin 212 -> 210 bytes
 lib/images/media_size_small.png                     | Bin 210 -> 206 bytes
 lib/images/mediamanager.png                         | Bin 507 -> 455 bytes
 lib/images/notify.png                               | Bin 736 -> 735 bytes
 lib/images/ns.png                                   | Bin 800 -> 799 bytes
 lib/images/open.png                                 | Bin 118 -> 107 bytes
 lib/images/resizecol.png                            | Bin 158 -> 148 bytes
 lib/images/success.png                              | Bin 728 -> 725 bytes
 lib/images/toolbar/bold.png                         | Bin 251 -> 249 bytes
 lib/images/toolbar/chars.png                        | Bin 496 -> 493 bytes
 lib/images/toolbar/h.png                            | Bin 258 -> 257 bytes
 lib/images/toolbar/h1.png                           | Bin 290 -> 287 bytes
 lib/images/toolbar/h2.png                           | Bin 328 -> 319 bytes
 lib/images/toolbar/h3.png                           | Bin 322 -> 320 bytes
 lib/images/toolbar/h4.png                           | Bin 310 -> 310 bytes
 lib/images/toolbar/h5.png                           | Bin 325 -> 318 bytes
 lib/images/toolbar/hequal.png                       | Bin 311 -> 306 bytes
 lib/images/toolbar/hminus.png                       | Bin 409 -> 403 bytes
 lib/images/toolbar/hplus.png                        | Bin 396 -> 391 bytes
 lib/images/toolbar/hr.png                           | Bin 254 -> 251 bytes
 lib/images/toolbar/image.png                        | Bin 554 -> 539 bytes
 lib/images/toolbar/italic.png                       | Bin 241 -> 239 bytes
 lib/images/toolbar/link.png                         | Bin 405 -> 402 bytes
 lib/images/toolbar/linkextern.png                   | Bin 904 -> 902 bytes
 lib/images/toolbar/mono.png                         | Bin 296 -> 293 bytes
 lib/images/toolbar/ol.png                           | Bin 304 -> 302 bytes
 lib/images/toolbar/smiley.png                       | Bin 684 -> 680 bytes
 lib/images/toolbar/strike.png                       | Bin 318 -> 316 bytes
 lib/images/toolbar/ul.png                           | Bin 291 -> 288 bytes
 lib/images/toolbar/underline.png                    | Bin 317 -> 297 bytes
 lib/images/unc.png                                  | Bin 553 -> 290 bytes
 lib/images/up.png                                   | Bin 248 -> 248 bytes
 lib/plugins/acl/pix/group.png                       | Bin 700 -> 699 bytes
 lib/plugins/acl/pix/ns.png                          | Bin 800 -> 799 bytes
 lib/plugins/acl/pix/user.png                        | Bin 653 -> 650 bytes
 lib/plugins/config/images/danger.png                | Bin 648 -> 637 bytes
 lib/plugins/config/images/security.png              | Bin 706 -> 682 bytes
 lib/plugins/config/images/warning.png               | Bin 613 -> 606 bytes
 lib/plugins/extension/images/disabled.png           | Bin 1396 -> 1163 bytes
 lib/plugins/extension/images/donate.png             | Bin 724 -> 677 bytes
 lib/plugins/extension/images/down.png               | Bin 280 -> 197 bytes
 lib/plugins/extension/images/enabled.png            | Bin 1398 -> 1172 bytes
 lib/plugins/extension/images/overlay.png            | Bin 109 -> 68 bytes
 lib/plugins/extension/images/plugin.png             | Bin 6824 -> 4054 bytes
 lib/plugins/extension/images/tag.png                | Bin 753 -> 341 bytes
 lib/plugins/extension/images/template.png           | Bin 7547 -> 5206 bytes
 lib/plugins/extension/images/up.png                 | Bin 281 -> 197 bytes
 lib/plugins/extension/images/warning.png            | Bin 613 -> 606 bytes
 lib/plugins/usermanager/images/search.png           | Bin 550 -> 549 bytes
 .../images/ui-bg_flat_0_aaaaaa_40x100.png           | Bin 251 -> 78 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png          | Bin 247 -> 74 bytes
 .../images/ui-bg_glass_55_fbf9ee_1x400.png          | Bin 374 -> 184 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin 246 -> 73 bytes
 .../images/ui-bg_glass_75_dadada_1x400.png          | Bin 301 -> 126 bytes
 .../images/ui-bg_glass_75_e6e6e6_1x400.png          | Bin 301 -> 121 bytes
 .../images/ui-bg_glass_95_fef1ec_1x400.png          | Bin 371 -> 186 bytes
 .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 319 -> 122 bytes
 .../images/ui-icons_222222_256x240.png              | Bin 7006 -> 3778 bytes
 .../images/ui-icons_2e83ff_256x240.png              | Bin 4599 -> 3778 bytes
 .../images/ui-icons_454545_256x240.png              | Bin 7071 -> 3778 bytes
 .../images/ui-icons_888888_256x240.png              | Bin 7092 -> 3778 bytes
 .../images/ui-icons_cd0a0a_256x240.png              | Bin 4599 -> 3778 bytes
 lib/tpl/dokuwiki/images/apple-touch-icon.png        | Bin 6399 -> 6336 bytes
 lib/tpl/dokuwiki/images/button-css.png              | Bin 299 -> 297 bytes
 lib/tpl/dokuwiki/images/button-html5.png            | Bin 354 -> 305 bytes
 lib/tpl/dokuwiki/images/button-rss.png              | Bin 180 -> 178 bytes
 lib/tpl/dokuwiki/images/logo.png                    | Bin 3820 -> 3744 bytes
 lib/tpl/dokuwiki/images/page-gradient.png           | Bin 280 -> 209 bytes
 lib/tpl/dokuwiki/images/pagetools-sprite.png        | Bin 11325 -> 7759 bytes
 lib/tpl/dokuwiki/images/pagetools/00_default.png    | Bin 616 -> 494 bytes
 lib/tpl/dokuwiki/images/pagetools/01_edit.png       | Bin 740 -> 519 bytes
 lib/tpl/dokuwiki/images/pagetools/02_create.png     | Bin 808 -> 580 bytes
 lib/tpl/dokuwiki/images/pagetools/03_draft.png      | Bin 828 -> 592 bytes
 lib/tpl/dokuwiki/images/pagetools/04_show.png       | Bin 458 -> 321 bytes
 lib/tpl/dokuwiki/images/pagetools/05_source.png     | Bin 753 -> 478 bytes
 lib/tpl/dokuwiki/images/pagetools/06_revert.png     | Bin 752 -> 462 bytes
 lib/tpl/dokuwiki/images/pagetools/07_revisions.png  | Bin 1144 -> 769 bytes
 lib/tpl/dokuwiki/images/pagetools/08_backlink.png   | Bin 844 -> 527 bytes
 lib/tpl/dokuwiki/images/pagetools/09_subscribe.png  | Bin 589 -> 374 bytes
 lib/tpl/dokuwiki/images/pagetools/10_top.png        | Bin 465 -> 297 bytes
 .../dokuwiki/images/pagetools/11_mediamanager.png   | Bin 441 -> 320 bytes
 lib/tpl/dokuwiki/images/pagetools/12_back.png       | Bin 483 -> 288 bytes
 lib/tpl/dokuwiki/images/search.png                  | Bin 316 -> 307 bytes
 lib/tpl/dokuwiki/images/toc-bullet.png              | Bin 121 -> 113 bytes
 lib/tpl/dokuwiki/images/usertools.png               | Bin 1541 -> 1428 bytes
 279 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/_test/data/media/wiki/dokuwiki-128.png b/_test/data/media/wiki/dokuwiki-128.png
index b2306ac95..f3f1d66bd 100644
Binary files a/_test/data/media/wiki/dokuwiki-128.png and b/_test/data/media/wiki/dokuwiki-128.png differ
diff --git a/_test/data/media/wiki/kind_zu_katze.png b/_test/data/media/wiki/kind_zu_katze.png
index a5c151e3f..e0eee61bc 100644
Binary files a/_test/data/media/wiki/kind_zu_katze.png and b/_test/data/media/wiki/kind_zu_katze.png differ
diff --git a/data/media/wiki/dokuwiki-128.png b/data/media/wiki/dokuwiki-128.png
index b2306ac95..f3f1d66bd 100644
Binary files a/data/media/wiki/dokuwiki-128.png and b/data/media/wiki/dokuwiki-128.png differ
diff --git a/data/security.png b/data/security.png
index c4f1a9771..cea639eca 100644
Binary files a/data/security.png and b/data/security.png differ
diff --git a/lib/images/admin/acl.png b/lib/images/admin/acl.png
index c8f610c12..542e10899 100644
Binary files a/lib/images/admin/acl.png and b/lib/images/admin/acl.png differ
diff --git a/lib/images/admin/config.png b/lib/images/admin/config.png
index 3ec3923d1..679a67372 100644
Binary files a/lib/images/admin/config.png and b/lib/images/admin/config.png differ
diff --git a/lib/images/admin/plugin.png b/lib/images/admin/plugin.png
index f71124e5c..27bd15410 100644
Binary files a/lib/images/admin/plugin.png and b/lib/images/admin/plugin.png differ
diff --git a/lib/images/admin/popularity.png b/lib/images/admin/popularity.png
index 19392367a..e18a8cb44 100644
Binary files a/lib/images/admin/popularity.png and b/lib/images/admin/popularity.png differ
diff --git a/lib/images/admin/revert.png b/lib/images/admin/revert.png
index 5304f1b76..c74c7928b 100644
Binary files a/lib/images/admin/revert.png and b/lib/images/admin/revert.png differ
diff --git a/lib/images/admin/usermanager.png b/lib/images/admin/usermanager.png
index 898544ce9..e6f72e077 100644
Binary files a/lib/images/admin/usermanager.png and b/lib/images/admin/usermanager.png differ
diff --git a/lib/images/bullet.png b/lib/images/bullet.png
index 5e557b334..b8ec60c74 100644
Binary files a/lib/images/bullet.png and b/lib/images/bullet.png differ
diff --git a/lib/images/closed-rtl.png b/lib/images/closed-rtl.png
index caa027e34..016a3c370 100644
Binary files a/lib/images/closed-rtl.png and b/lib/images/closed-rtl.png differ
diff --git a/lib/images/closed.png b/lib/images/closed.png
index e3bd0f9e9..927bfc57f 100644
Binary files a/lib/images/closed.png and b/lib/images/closed.png differ
diff --git a/lib/images/diff.png b/lib/images/diff.png
index 657b10999..04fab07b7 100644
Binary files a/lib/images/diff.png and b/lib/images/diff.png differ
diff --git a/lib/images/email.png b/lib/images/email.png
index d1d4a5fd5..575b83142 100644
Binary files a/lib/images/email.png and b/lib/images/email.png differ
diff --git a/lib/images/error.png b/lib/images/error.png
index 7bd84f7a3..da0692429 100644
Binary files a/lib/images/error.png and b/lib/images/error.png differ
diff --git a/lib/images/external-link.png b/lib/images/external-link.png
index a4d5de17c..fecac61c9 100644
Binary files a/lib/images/external-link.png and b/lib/images/external-link.png differ
diff --git a/lib/images/fileicons/32x32/7z.png b/lib/images/fileicons/32x32/7z.png
index 9ba7da94a..2537cb96d 100644
Binary files a/lib/images/fileicons/32x32/7z.png and b/lib/images/fileicons/32x32/7z.png differ
diff --git a/lib/images/fileicons/32x32/asm.png b/lib/images/fileicons/32x32/asm.png
index f1a1f322b..17e74d0b2 100644
Binary files a/lib/images/fileicons/32x32/asm.png and b/lib/images/fileicons/32x32/asm.png differ
diff --git a/lib/images/fileicons/32x32/bash.png b/lib/images/fileicons/32x32/bash.png
index c28404ed1..a31ee688b 100644
Binary files a/lib/images/fileicons/32x32/bash.png and b/lib/images/fileicons/32x32/bash.png differ
diff --git a/lib/images/fileicons/32x32/bz2.png b/lib/images/fileicons/32x32/bz2.png
index 7be9b7c06..c78031652 100644
Binary files a/lib/images/fileicons/32x32/bz2.png and b/lib/images/fileicons/32x32/bz2.png differ
diff --git a/lib/images/fileicons/32x32/c.png b/lib/images/fileicons/32x32/c.png
index 0a01f8f3a..d8032d075 100644
Binary files a/lib/images/fileicons/32x32/c.png and b/lib/images/fileicons/32x32/c.png differ
diff --git a/lib/images/fileicons/32x32/cc.png b/lib/images/fileicons/32x32/cc.png
index b09b3357f..241ebd4e8 100644
Binary files a/lib/images/fileicons/32x32/cc.png and b/lib/images/fileicons/32x32/cc.png differ
diff --git a/lib/images/fileicons/32x32/conf.png b/lib/images/fileicons/32x32/conf.png
index 91a8a10de..9797c2ad8 100644
Binary files a/lib/images/fileicons/32x32/conf.png and b/lib/images/fileicons/32x32/conf.png differ
diff --git a/lib/images/fileicons/32x32/cpp.png b/lib/images/fileicons/32x32/cpp.png
index 1ce35422c..128906528 100644
Binary files a/lib/images/fileicons/32x32/cpp.png and b/lib/images/fileicons/32x32/cpp.png differ
diff --git a/lib/images/fileicons/32x32/cs.png b/lib/images/fileicons/32x32/cs.png
index d300f7551..6c2aae272 100644
Binary files a/lib/images/fileicons/32x32/cs.png and b/lib/images/fileicons/32x32/cs.png differ
diff --git a/lib/images/fileicons/32x32/csh.png b/lib/images/fileicons/32x32/csh.png
index 72ecbcc52..e43584c7e 100644
Binary files a/lib/images/fileicons/32x32/csh.png and b/lib/images/fileicons/32x32/csh.png differ
diff --git a/lib/images/fileicons/32x32/css.png b/lib/images/fileicons/32x32/css.png
index 638957637..786f30471 100644
Binary files a/lib/images/fileicons/32x32/css.png and b/lib/images/fileicons/32x32/css.png differ
diff --git a/lib/images/fileicons/32x32/csv.png b/lib/images/fileicons/32x32/csv.png
index 3ee42f047..e5cdbf940 100644
Binary files a/lib/images/fileicons/32x32/csv.png and b/lib/images/fileicons/32x32/csv.png differ
diff --git a/lib/images/fileicons/32x32/deb.png b/lib/images/fileicons/32x32/deb.png
index 8d625ccf2..e2828a347 100644
Binary files a/lib/images/fileicons/32x32/deb.png and b/lib/images/fileicons/32x32/deb.png differ
diff --git a/lib/images/fileicons/32x32/diff.png b/lib/images/fileicons/32x32/diff.png
index 4dd98e7cc..9e413cb6e 100644
Binary files a/lib/images/fileicons/32x32/diff.png and b/lib/images/fileicons/32x32/diff.png differ
diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png
index 8369c1f73..43ec35416 100644
Binary files a/lib/images/fileicons/32x32/doc.png and b/lib/images/fileicons/32x32/doc.png differ
diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png
index ce5dfb3d3..a25f260c6 100644
Binary files a/lib/images/fileicons/32x32/docx.png and b/lib/images/fileicons/32x32/docx.png differ
diff --git a/lib/images/fileicons/32x32/file.png b/lib/images/fileicons/32x32/file.png
index 52318f6e2..7f6d51a09 100644
Binary files a/lib/images/fileicons/32x32/file.png and b/lib/images/fileicons/32x32/file.png differ
diff --git a/lib/images/fileicons/32x32/gif.png b/lib/images/fileicons/32x32/gif.png
index e39af08cc..dde2d8414 100644
Binary files a/lib/images/fileicons/32x32/gif.png and b/lib/images/fileicons/32x32/gif.png differ
diff --git a/lib/images/fileicons/32x32/gz.png b/lib/images/fileicons/32x32/gz.png
index 573ce7afd..5bddffb6d 100644
Binary files a/lib/images/fileicons/32x32/gz.png and b/lib/images/fileicons/32x32/gz.png differ
diff --git a/lib/images/fileicons/32x32/h.png b/lib/images/fileicons/32x32/h.png
index 27c8ceaf3..5c169a33b 100644
Binary files a/lib/images/fileicons/32x32/h.png and b/lib/images/fileicons/32x32/h.png differ
diff --git a/lib/images/fileicons/32x32/hpp.png b/lib/images/fileicons/32x32/hpp.png
index 04876a5d5..128110d5b 100644
Binary files a/lib/images/fileicons/32x32/hpp.png and b/lib/images/fileicons/32x32/hpp.png differ
diff --git a/lib/images/fileicons/32x32/htm.png b/lib/images/fileicons/32x32/htm.png
index ec4f15ac6..79096dc7e 100644
Binary files a/lib/images/fileicons/32x32/htm.png and b/lib/images/fileicons/32x32/htm.png differ
diff --git a/lib/images/fileicons/32x32/html.png b/lib/images/fileicons/32x32/html.png
index ec4f15ac6..79096dc7e 100644
Binary files a/lib/images/fileicons/32x32/html.png and b/lib/images/fileicons/32x32/html.png differ
diff --git a/lib/images/fileicons/32x32/ico.png b/lib/images/fileicons/32x32/ico.png
index 0a219e6f2..60f73bd38 100644
Binary files a/lib/images/fileicons/32x32/ico.png and b/lib/images/fileicons/32x32/ico.png differ
diff --git a/lib/images/fileicons/32x32/java.png b/lib/images/fileicons/32x32/java.png
index ee9cc4ccb..1d8694996 100644
Binary files a/lib/images/fileicons/32x32/java.png and b/lib/images/fileicons/32x32/java.png differ
diff --git a/lib/images/fileicons/32x32/jpeg.png b/lib/images/fileicons/32x32/jpeg.png
index 5fb71dd73..4b5c425ad 100644
Binary files a/lib/images/fileicons/32x32/jpeg.png and b/lib/images/fileicons/32x32/jpeg.png differ
diff --git a/lib/images/fileicons/32x32/jpg.png b/lib/images/fileicons/32x32/jpg.png
index 5fb71dd73..4b5c425ad 100644
Binary files a/lib/images/fileicons/32x32/jpg.png and b/lib/images/fileicons/32x32/jpg.png differ
diff --git a/lib/images/fileicons/32x32/js.png b/lib/images/fileicons/32x32/js.png
index 9bbbfb709..5a8dabe81 100644
Binary files a/lib/images/fileicons/32x32/js.png and b/lib/images/fileicons/32x32/js.png differ
diff --git a/lib/images/fileicons/32x32/json.png b/lib/images/fileicons/32x32/json.png
index 583ece683..e4a55e634 100644
Binary files a/lib/images/fileicons/32x32/json.png and b/lib/images/fileicons/32x32/json.png differ
diff --git a/lib/images/fileicons/32x32/lua.png b/lib/images/fileicons/32x32/lua.png
index 9e8fc9517..c8e0bf208 100644
Binary files a/lib/images/fileicons/32x32/lua.png and b/lib/images/fileicons/32x32/lua.png differ
diff --git a/lib/images/fileicons/32x32/mp3.png b/lib/images/fileicons/32x32/mp3.png
index 1acd83276..9bf169553 100644
Binary files a/lib/images/fileicons/32x32/mp3.png and b/lib/images/fileicons/32x32/mp3.png differ
diff --git a/lib/images/fileicons/32x32/mp4.png b/lib/images/fileicons/32x32/mp4.png
index 03db6f450..071abc324 100644
Binary files a/lib/images/fileicons/32x32/mp4.png and b/lib/images/fileicons/32x32/mp4.png differ
diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png
index 9a34f2129..3ad6a3c2d 100644
Binary files a/lib/images/fileicons/32x32/odc.png and b/lib/images/fileicons/32x32/odc.png differ
diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png
index e3b4333ad..8dd89eac6 100644
Binary files a/lib/images/fileicons/32x32/odf.png and b/lib/images/fileicons/32x32/odf.png differ
diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png
index c3b192b2d..7020d1396 100644
Binary files a/lib/images/fileicons/32x32/odg.png and b/lib/images/fileicons/32x32/odg.png differ
diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png
index 6baa69407..9a08a426a 100644
Binary files a/lib/images/fileicons/32x32/odi.png and b/lib/images/fileicons/32x32/odi.png differ
diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png
index 8e09dd6e4..e6b538d27 100644
Binary files a/lib/images/fileicons/32x32/odp.png and b/lib/images/fileicons/32x32/odp.png differ
diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png
index 90892f3d4..cf4a226ff 100644
Binary files a/lib/images/fileicons/32x32/ods.png and b/lib/images/fileicons/32x32/ods.png differ
diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png
index 22ec1fffb..1eae19cc7 100644
Binary files a/lib/images/fileicons/32x32/odt.png and b/lib/images/fileicons/32x32/odt.png differ
diff --git a/lib/images/fileicons/32x32/ogg.png b/lib/images/fileicons/32x32/ogg.png
index f988fabc3..d7b0553f6 100644
Binary files a/lib/images/fileicons/32x32/ogg.png and b/lib/images/fileicons/32x32/ogg.png differ
diff --git a/lib/images/fileicons/32x32/ogv.png b/lib/images/fileicons/32x32/ogv.png
index 1083455fb..4fdedbaee 100644
Binary files a/lib/images/fileicons/32x32/ogv.png and b/lib/images/fileicons/32x32/ogv.png differ
diff --git a/lib/images/fileicons/32x32/pas.png b/lib/images/fileicons/32x32/pas.png
index c2c05d2d1..8d2999e98 100644
Binary files a/lib/images/fileicons/32x32/pas.png and b/lib/images/fileicons/32x32/pas.png differ
diff --git a/lib/images/fileicons/32x32/pdf.png b/lib/images/fileicons/32x32/pdf.png
index 0efa0dc31..09ae62e6a 100644
Binary files a/lib/images/fileicons/32x32/pdf.png and b/lib/images/fileicons/32x32/pdf.png differ
diff --git a/lib/images/fileicons/32x32/php.png b/lib/images/fileicons/32x32/php.png
index 8f3c84e32..1f4cabf6f 100644
Binary files a/lib/images/fileicons/32x32/php.png and b/lib/images/fileicons/32x32/php.png differ
diff --git a/lib/images/fileicons/32x32/pl.png b/lib/images/fileicons/32x32/pl.png
index 88aa2723f..038e9f3a7 100644
Binary files a/lib/images/fileicons/32x32/pl.png and b/lib/images/fileicons/32x32/pl.png differ
diff --git a/lib/images/fileicons/32x32/png.png b/lib/images/fileicons/32x32/png.png
index 0ecd29691..e3ea1c3a0 100644
Binary files a/lib/images/fileicons/32x32/png.png and b/lib/images/fileicons/32x32/png.png differ
diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png
index 84b523a23..acee94571 100644
Binary files a/lib/images/fileicons/32x32/ppt.png and b/lib/images/fileicons/32x32/ppt.png differ
diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png
index 1446cf4de..b57b09173 100644
Binary files a/lib/images/fileicons/32x32/pptx.png and b/lib/images/fileicons/32x32/pptx.png differ
diff --git a/lib/images/fileicons/32x32/ps.png b/lib/images/fileicons/32x32/ps.png
index e1a74988d..523a0be30 100644
Binary files a/lib/images/fileicons/32x32/ps.png and b/lib/images/fileicons/32x32/ps.png differ
diff --git a/lib/images/fileicons/32x32/py.png b/lib/images/fileicons/32x32/py.png
index cf6e412f0..ae6e06ad5 100644
Binary files a/lib/images/fileicons/32x32/py.png and b/lib/images/fileicons/32x32/py.png differ
diff --git a/lib/images/fileicons/32x32/rar.png b/lib/images/fileicons/32x32/rar.png
index 4af2a4d46..5b1cfcbee 100644
Binary files a/lib/images/fileicons/32x32/rar.png and b/lib/images/fileicons/32x32/rar.png differ
diff --git a/lib/images/fileicons/32x32/rb.png b/lib/images/fileicons/32x32/rb.png
index b0dfd8980..398f20802 100644
Binary files a/lib/images/fileicons/32x32/rb.png and b/lib/images/fileicons/32x32/rb.png differ
diff --git a/lib/images/fileicons/32x32/rpm.png b/lib/images/fileicons/32x32/rpm.png
index 2ec5f4e1b..c66a90741 100644
Binary files a/lib/images/fileicons/32x32/rpm.png and b/lib/images/fileicons/32x32/rpm.png differ
diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png
index 82add4fd7..43182f349 100644
Binary files a/lib/images/fileicons/32x32/rtf.png and b/lib/images/fileicons/32x32/rtf.png differ
diff --git a/lib/images/fileicons/32x32/sh.png b/lib/images/fileicons/32x32/sh.png
index 93c093ea4..52e3f952c 100644
Binary files a/lib/images/fileicons/32x32/sh.png and b/lib/images/fileicons/32x32/sh.png differ
diff --git a/lib/images/fileicons/32x32/sql.png b/lib/images/fileicons/32x32/sql.png
index f6436e725..bb23e56b9 100644
Binary files a/lib/images/fileicons/32x32/sql.png and b/lib/images/fileicons/32x32/sql.png differ
diff --git a/lib/images/fileicons/32x32/swf.png b/lib/images/fileicons/32x32/swf.png
index b43642905..be8f5460e 100644
Binary files a/lib/images/fileicons/32x32/swf.png and b/lib/images/fileicons/32x32/swf.png differ
diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png
index 50676be6a..cc45ffa8e 100644
Binary files a/lib/images/fileicons/32x32/sxc.png and b/lib/images/fileicons/32x32/sxc.png differ
diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png
index f715a8ff0..26f44c215 100644
Binary files a/lib/images/fileicons/32x32/sxd.png and b/lib/images/fileicons/32x32/sxd.png differ
diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png
index 3d9f31d3b..62e90bc97 100644
Binary files a/lib/images/fileicons/32x32/sxi.png and b/lib/images/fileicons/32x32/sxi.png differ
diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png
index bd8ab1436..5196307df 100644
Binary files a/lib/images/fileicons/32x32/sxw.png and b/lib/images/fileicons/32x32/sxw.png differ
diff --git a/lib/images/fileicons/32x32/tar.png b/lib/images/fileicons/32x32/tar.png
index 4a420a22a..8eb0ef489 100644
Binary files a/lib/images/fileicons/32x32/tar.png and b/lib/images/fileicons/32x32/tar.png differ
diff --git a/lib/images/fileicons/32x32/tgz.png b/lib/images/fileicons/32x32/tgz.png
index 8cf6af41a..77faacb92 100644
Binary files a/lib/images/fileicons/32x32/tgz.png and b/lib/images/fileicons/32x32/tgz.png differ
diff --git a/lib/images/fileicons/32x32/txt.png b/lib/images/fileicons/32x32/txt.png
index d9ff7d595..5d09e3c93 100644
Binary files a/lib/images/fileicons/32x32/txt.png and b/lib/images/fileicons/32x32/txt.png differ
diff --git a/lib/images/fileicons/32x32/wav.png b/lib/images/fileicons/32x32/wav.png
index c39a8445f..37b871be4 100644
Binary files a/lib/images/fileicons/32x32/wav.png and b/lib/images/fileicons/32x32/wav.png differ
diff --git a/lib/images/fileicons/32x32/webm.png b/lib/images/fileicons/32x32/webm.png
index 99b9c87b2..9044845b9 100644
Binary files a/lib/images/fileicons/32x32/webm.png and b/lib/images/fileicons/32x32/webm.png differ
diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png
index 7447d9cdf..1c21a6ed3 100644
Binary files a/lib/images/fileicons/32x32/xls.png and b/lib/images/fileicons/32x32/xls.png differ
diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png
index 920217267..cba5937ab 100644
Binary files a/lib/images/fileicons/32x32/xlsx.png and b/lib/images/fileicons/32x32/xlsx.png differ
diff --git a/lib/images/fileicons/32x32/xml.png b/lib/images/fileicons/32x32/xml.png
index 4ea3b1f6c..8eee58398 100644
Binary files a/lib/images/fileicons/32x32/xml.png and b/lib/images/fileicons/32x32/xml.png differ
diff --git a/lib/images/fileicons/32x32/zip.png b/lib/images/fileicons/32x32/zip.png
index f07d18e2c..0ce83b6bc 100644
Binary files a/lib/images/fileicons/32x32/zip.png and b/lib/images/fileicons/32x32/zip.png differ
diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png
index 037cd73a0..fa6abe35b 100644
Binary files a/lib/images/fileicons/7z.png and b/lib/images/fileicons/7z.png differ
diff --git a/lib/images/fileicons/asm.png b/lib/images/fileicons/asm.png
index 1281e12b8..c22c451a1 100644
Binary files a/lib/images/fileicons/asm.png and b/lib/images/fileicons/asm.png differ
diff --git a/lib/images/fileicons/bash.png b/lib/images/fileicons/bash.png
index 257584649..f352cfdb1 100644
Binary files a/lib/images/fileicons/bash.png and b/lib/images/fileicons/bash.png differ
diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png
index a4bcc70a1..a1b048fc2 100644
Binary files a/lib/images/fileicons/bz2.png and b/lib/images/fileicons/bz2.png differ
diff --git a/lib/images/fileicons/c.png b/lib/images/fileicons/c.png
index f0d4e9aa1..51d9c7f15 100644
Binary files a/lib/images/fileicons/c.png and b/lib/images/fileicons/c.png differ
diff --git a/lib/images/fileicons/cc.png b/lib/images/fileicons/cc.png
index e6f4c6457..8aeae79eb 100644
Binary files a/lib/images/fileicons/cc.png and b/lib/images/fileicons/cc.png differ
diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png
index 94ace02cf..c845d4962 100644
Binary files a/lib/images/fileicons/conf.png and b/lib/images/fileicons/conf.png differ
diff --git a/lib/images/fileicons/cpp.png b/lib/images/fileicons/cpp.png
index 4027e4beb..1a04c3291 100644
Binary files a/lib/images/fileicons/cpp.png and b/lib/images/fileicons/cpp.png differ
diff --git a/lib/images/fileicons/cs.png b/lib/images/fileicons/cs.png
index 31b7f7661..740725a30 100644
Binary files a/lib/images/fileicons/cs.png and b/lib/images/fileicons/cs.png differ
diff --git a/lib/images/fileicons/csh.png b/lib/images/fileicons/csh.png
index cc21e7995..c0131c5f4 100644
Binary files a/lib/images/fileicons/csh.png and b/lib/images/fileicons/csh.png differ
diff --git a/lib/images/fileicons/css.png b/lib/images/fileicons/css.png
index abd16fa8e..89ac36470 100644
Binary files a/lib/images/fileicons/css.png and b/lib/images/fileicons/css.png differ
diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png
index af37ba577..837ae295f 100644
Binary files a/lib/images/fileicons/csv.png and b/lib/images/fileicons/csv.png differ
diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png
index 9eb29019b..1db6fa5b8 100644
Binary files a/lib/images/fileicons/deb.png and b/lib/images/fileicons/deb.png differ
diff --git a/lib/images/fileicons/diff.png b/lib/images/fileicons/diff.png
index 1775da014..03e9af94d 100644
Binary files a/lib/images/fileicons/diff.png and b/lib/images/fileicons/diff.png differ
diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png
index 925494576..dcc070f49 100644
Binary files a/lib/images/fileicons/doc.png and b/lib/images/fileicons/doc.png differ
diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png
index 5bae13f9e..1a98a8d4f 100644
Binary files a/lib/images/fileicons/docx.png and b/lib/images/fileicons/docx.png differ
diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png
index 8f31d38ac..54fe8abda 100644
Binary files a/lib/images/fileicons/file.png and b/lib/images/fileicons/file.png differ
diff --git a/lib/images/fileicons/gif.png b/lib/images/fileicons/gif.png
index bcbb8366b..38bdbf2dc 100644
Binary files a/lib/images/fileicons/gif.png and b/lib/images/fileicons/gif.png differ
diff --git a/lib/images/fileicons/gz.png b/lib/images/fileicons/gz.png
index 0a0a4b94f..422693a39 100644
Binary files a/lib/images/fileicons/gz.png and b/lib/images/fileicons/gz.png differ
diff --git a/lib/images/fileicons/h.png b/lib/images/fileicons/h.png
index 4afe8f84f..d65f2f507 100644
Binary files a/lib/images/fileicons/h.png and b/lib/images/fileicons/h.png differ
diff --git a/lib/images/fileicons/hpp.png b/lib/images/fileicons/hpp.png
index 3ee7583d2..6d314f5c9 100644
Binary files a/lib/images/fileicons/hpp.png and b/lib/images/fileicons/hpp.png differ
diff --git a/lib/images/fileicons/htm.png b/lib/images/fileicons/htm.png
index 02e81932b..f45847f7e 100644
Binary files a/lib/images/fileicons/htm.png and b/lib/images/fileicons/htm.png differ
diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png
index 02e81932b..f45847f7e 100644
Binary files a/lib/images/fileicons/html.png and b/lib/images/fileicons/html.png differ
diff --git a/lib/images/fileicons/ico.png b/lib/images/fileicons/ico.png
index 93343717c..38aa34b2c 100644
Binary files a/lib/images/fileicons/ico.png and b/lib/images/fileicons/ico.png differ
diff --git a/lib/images/fileicons/java.png b/lib/images/fileicons/java.png
index cf6f5b4f5..0c62347f5 100644
Binary files a/lib/images/fileicons/java.png and b/lib/images/fileicons/java.png differ
diff --git a/lib/images/fileicons/jpeg.png b/lib/images/fileicons/jpeg.png
index 29dea5761..e446dd410 100644
Binary files a/lib/images/fileicons/jpeg.png and b/lib/images/fileicons/jpeg.png differ
diff --git a/lib/images/fileicons/jpg.png b/lib/images/fileicons/jpg.png
index 29dea5761..e446dd410 100644
Binary files a/lib/images/fileicons/jpg.png and b/lib/images/fileicons/jpg.png differ
diff --git a/lib/images/fileicons/js.png b/lib/images/fileicons/js.png
index 16e3f9538..bee428f20 100644
Binary files a/lib/images/fileicons/js.png and b/lib/images/fileicons/js.png differ
diff --git a/lib/images/fileicons/json.png b/lib/images/fileicons/json.png
index 96611cb53..4d0a3cfb5 100644
Binary files a/lib/images/fileicons/json.png and b/lib/images/fileicons/json.png differ
diff --git a/lib/images/fileicons/lua.png b/lib/images/fileicons/lua.png
index 81fdeea40..fcebe3d02 100644
Binary files a/lib/images/fileicons/lua.png and b/lib/images/fileicons/lua.png differ
diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png
index 7c6d37184..2be976f9c 100644
Binary files a/lib/images/fileicons/mp3.png and b/lib/images/fileicons/mp3.png differ
diff --git a/lib/images/fileicons/mp4.png b/lib/images/fileicons/mp4.png
index ee5b91150..dc6fd0022 100644
Binary files a/lib/images/fileicons/mp4.png and b/lib/images/fileicons/mp4.png differ
diff --git a/lib/images/fileicons/odc.png b/lib/images/fileicons/odc.png
index 331140552..bf3b3a104 100644
Binary files a/lib/images/fileicons/odc.png and b/lib/images/fileicons/odc.png differ
diff --git a/lib/images/fileicons/odf.png b/lib/images/fileicons/odf.png
index eccae9e20..fcfc58f76 100644
Binary files a/lib/images/fileicons/odf.png and b/lib/images/fileicons/odf.png differ
diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png
index 5224425e6..0a8196cbf 100644
Binary files a/lib/images/fileicons/odg.png and b/lib/images/fileicons/odg.png differ
diff --git a/lib/images/fileicons/odi.png b/lib/images/fileicons/odi.png
index b57fd974d..0fc8508ad 100644
Binary files a/lib/images/fileicons/odi.png and b/lib/images/fileicons/odi.png differ
diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png
index 81d1023c0..75b1db8e1 100644
Binary files a/lib/images/fileicons/odp.png and b/lib/images/fileicons/odp.png differ
diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png
index 77e6d5366..2017426bd 100644
Binary files a/lib/images/fileicons/ods.png and b/lib/images/fileicons/ods.png differ
diff --git a/lib/images/fileicons/odt.png b/lib/images/fileicons/odt.png
index 8490eec74..6f8fae438 100644
Binary files a/lib/images/fileicons/odt.png and b/lib/images/fileicons/odt.png differ
diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png
index 38f615c99..8bb50800e 100644
Binary files a/lib/images/fileicons/ogg.png and b/lib/images/fileicons/ogg.png differ
diff --git a/lib/images/fileicons/ogv.png b/lib/images/fileicons/ogv.png
index a937dfc4c..e6b65ac60 100644
Binary files a/lib/images/fileicons/ogv.png and b/lib/images/fileicons/ogv.png differ
diff --git a/lib/images/fileicons/pas.png b/lib/images/fileicons/pas.png
index 0c14372d0..19f0a3c6c 100644
Binary files a/lib/images/fileicons/pas.png and b/lib/images/fileicons/pas.png differ
diff --git a/lib/images/fileicons/pdf.png b/lib/images/fileicons/pdf.png
index 1bc154641..42fbfd2bb 100644
Binary files a/lib/images/fileicons/pdf.png and b/lib/images/fileicons/pdf.png differ
diff --git a/lib/images/fileicons/php.png b/lib/images/fileicons/php.png
index 2deb5d3b1..de0d8eeb9 100644
Binary files a/lib/images/fileicons/php.png and b/lib/images/fileicons/php.png differ
diff --git a/lib/images/fileicons/pl.png b/lib/images/fileicons/pl.png
index a4fa92203..d95513d25 100644
Binary files a/lib/images/fileicons/pl.png and b/lib/images/fileicons/pl.png differ
diff --git a/lib/images/fileicons/png.png b/lib/images/fileicons/png.png
index 007270532..273476daf 100644
Binary files a/lib/images/fileicons/png.png and b/lib/images/fileicons/png.png differ
diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png
index 3355c2712..a03d3c0a6 100644
Binary files a/lib/images/fileicons/ppt.png and b/lib/images/fileicons/ppt.png differ
diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png
index 269cdb8fc..9b5c6332b 100644
Binary files a/lib/images/fileicons/pptx.png and b/lib/images/fileicons/pptx.png differ
diff --git a/lib/images/fileicons/ps.png b/lib/images/fileicons/ps.png
index e61d1aa7e..3b7848c8e 100644
Binary files a/lib/images/fileicons/ps.png and b/lib/images/fileicons/ps.png differ
diff --git a/lib/images/fileicons/py.png b/lib/images/fileicons/py.png
index f0ed0258c..893019ee6 100644
Binary files a/lib/images/fileicons/py.png and b/lib/images/fileicons/py.png differ
diff --git a/lib/images/fileicons/rar.png b/lib/images/fileicons/rar.png
index f15d4ce5b..091a635b7 100644
Binary files a/lib/images/fileicons/rar.png and b/lib/images/fileicons/rar.png differ
diff --git a/lib/images/fileicons/rb.png b/lib/images/fileicons/rb.png
index 0e59207fc..9b58db030 100644
Binary files a/lib/images/fileicons/rb.png and b/lib/images/fileicons/rb.png differ
diff --git a/lib/images/fileicons/rpm.png b/lib/images/fileicons/rpm.png
index 831424ff5..75da50e0c 100644
Binary files a/lib/images/fileicons/rpm.png and b/lib/images/fileicons/rpm.png differ
diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png
index bbc425ca3..2e5a6e53e 100644
Binary files a/lib/images/fileicons/rtf.png and b/lib/images/fileicons/rtf.png differ
diff --git a/lib/images/fileicons/sh.png b/lib/images/fileicons/sh.png
index 256067106..bc4835414 100644
Binary files a/lib/images/fileicons/sh.png and b/lib/images/fileicons/sh.png differ
diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png
index 6697943e2..c36f3a812 100644
Binary files a/lib/images/fileicons/sql.png and b/lib/images/fileicons/sql.png differ
diff --git a/lib/images/fileicons/swf.png b/lib/images/fileicons/swf.png
index b45a72cc9..5c8838778 100644
Binary files a/lib/images/fileicons/swf.png and b/lib/images/fileicons/swf.png differ
diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png
index c96cf303f..3b5c71f59 100644
Binary files a/lib/images/fileicons/sxc.png and b/lib/images/fileicons/sxc.png differ
diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png
index 124b928e1..15390cd0c 100644
Binary files a/lib/images/fileicons/sxd.png and b/lib/images/fileicons/sxd.png differ
diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png
index 8a5e23033..a0fb65431 100644
Binary files a/lib/images/fileicons/sxi.png and b/lib/images/fileicons/sxi.png differ
diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png
index 9a903791c..865dc0c6e 100644
Binary files a/lib/images/fileicons/sxw.png and b/lib/images/fileicons/sxw.png differ
diff --git a/lib/images/fileicons/tar.png b/lib/images/fileicons/tar.png
index e57029adc..8f9fd0f08 100644
Binary files a/lib/images/fileicons/tar.png and b/lib/images/fileicons/tar.png differ
diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png
index 25ef9e15a..8423ef087 100644
Binary files a/lib/images/fileicons/tgz.png and b/lib/images/fileicons/tgz.png differ
diff --git a/lib/images/fileicons/txt.png b/lib/images/fileicons/txt.png
index 4fd921655..1619cc497 100644
Binary files a/lib/images/fileicons/txt.png and b/lib/images/fileicons/txt.png differ
diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png
index c8880c62e..80eac9783 100644
Binary files a/lib/images/fileicons/wav.png and b/lib/images/fileicons/wav.png differ
diff --git a/lib/images/fileicons/webm.png b/lib/images/fileicons/webm.png
index 55db61914..cec3e6d5b 100644
Binary files a/lib/images/fileicons/webm.png and b/lib/images/fileicons/webm.png differ
diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png
index 5ac56f20d..be9b42fff 100644
Binary files a/lib/images/fileicons/xls.png and b/lib/images/fileicons/xls.png differ
diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png
index 89c84c522..fd5d4f117 100644
Binary files a/lib/images/fileicons/xlsx.png and b/lib/images/fileicons/xlsx.png differ
diff --git a/lib/images/fileicons/xml.png b/lib/images/fileicons/xml.png
index 4480a6385..2a96d8b31 100644
Binary files a/lib/images/fileicons/xml.png and b/lib/images/fileicons/xml.png differ
diff --git a/lib/images/fileicons/zip.png b/lib/images/fileicons/zip.png
index 4a36a35ff..4ce08bf7d 100644
Binary files a/lib/images/fileicons/zip.png and b/lib/images/fileicons/zip.png differ
diff --git a/lib/images/history.png b/lib/images/history.png
index 82a418d44..f6af0f6f1 100644
Binary files a/lib/images/history.png and b/lib/images/history.png differ
diff --git a/lib/images/icon-list.png b/lib/images/icon-list.png
index ecfeed92d..4ae738a07 100644
Binary files a/lib/images/icon-list.png and b/lib/images/icon-list.png differ
diff --git a/lib/images/icon-sort.png b/lib/images/icon-sort.png
index c6403dd3c..190397eb6 100644
Binary files a/lib/images/icon-sort.png and b/lib/images/icon-sort.png differ
diff --git a/lib/images/info.png b/lib/images/info.png
index 121c7336d..5e2336435 100644
Binary files a/lib/images/info.png and b/lib/images/info.png differ
diff --git a/lib/images/interwiki.png b/lib/images/interwiki.png
index f957e71e5..10a2bbe1e 100644
Binary files a/lib/images/interwiki.png and b/lib/images/interwiki.png differ
diff --git a/lib/images/interwiki/user.png b/lib/images/interwiki/user.png
index 79f35ccbd..da84e3ddc 100644
Binary files a/lib/images/interwiki/user.png and b/lib/images/interwiki/user.png differ
diff --git a/lib/images/license/badge/cc-by-nc-nd.png b/lib/images/license/badge/cc-by-nc-nd.png
index 94aae9e09..c84aff104 100644
Binary files a/lib/images/license/badge/cc-by-nc-nd.png and b/lib/images/license/badge/cc-by-nc-nd.png differ
diff --git a/lib/images/license/badge/cc-by-nc-sa.png b/lib/images/license/badge/cc-by-nc-sa.png
index 51141f5ec..e7b57845b 100644
Binary files a/lib/images/license/badge/cc-by-nc-sa.png and b/lib/images/license/badge/cc-by-nc-sa.png differ
diff --git a/lib/images/license/badge/cc-by-nc.png b/lib/images/license/badge/cc-by-nc.png
index aeb8cdc8c..b422cdcfd 100644
Binary files a/lib/images/license/badge/cc-by-nc.png and b/lib/images/license/badge/cc-by-nc.png differ
diff --git a/lib/images/license/badge/cc-by-nd.png b/lib/images/license/badge/cc-by-nd.png
index 6a2e59a68..18322992c 100644
Binary files a/lib/images/license/badge/cc-by-nd.png and b/lib/images/license/badge/cc-by-nd.png differ
diff --git a/lib/images/license/badge/cc-by-sa.png b/lib/images/license/badge/cc-by-sa.png
index f0aa4aaf0..5749f65b8 100644
Binary files a/lib/images/license/badge/cc-by-sa.png and b/lib/images/license/badge/cc-by-sa.png differ
diff --git a/lib/images/license/badge/cc-by.png b/lib/images/license/badge/cc-by.png
index c7389b2f6..700679a13 100644
Binary files a/lib/images/license/badge/cc-by.png and b/lib/images/license/badge/cc-by.png differ
diff --git a/lib/images/license/badge/cc-zero.png b/lib/images/license/badge/cc-zero.png
index fd3dff422..e6d82bfab 100644
Binary files a/lib/images/license/badge/cc-zero.png and b/lib/images/license/badge/cc-zero.png differ
diff --git a/lib/images/license/badge/cc.png b/lib/images/license/badge/cc.png
index 8ac73aa4e..e28f32c79 100644
Binary files a/lib/images/license/badge/cc.png and b/lib/images/license/badge/cc.png differ
diff --git a/lib/images/license/badge/gnufdl.png b/lib/images/license/badge/gnufdl.png
index e92910128..635de2bd3 100644
Binary files a/lib/images/license/badge/gnufdl.png and b/lib/images/license/badge/gnufdl.png differ
diff --git a/lib/images/license/badge/publicdomain.png b/lib/images/license/badge/publicdomain.png
index 8148d037a..fd742cc9d 100644
Binary files a/lib/images/license/badge/publicdomain.png and b/lib/images/license/badge/publicdomain.png differ
diff --git a/lib/images/license/button/cc-by-nc-nd.png b/lib/images/license/button/cc-by-nc-nd.png
index ac58d8627..994025f15 100644
Binary files a/lib/images/license/button/cc-by-nc-nd.png and b/lib/images/license/button/cc-by-nc-nd.png differ
diff --git a/lib/images/license/button/cc-by-nc-sa.png b/lib/images/license/button/cc-by-nc-sa.png
index a9d23c0b6..3b896bd52 100644
Binary files a/lib/images/license/button/cc-by-nc-sa.png and b/lib/images/license/button/cc-by-nc-sa.png differ
diff --git a/lib/images/license/button/cc-by-nc.png b/lib/images/license/button/cc-by-nc.png
index d936464ad..d5be8f803 100644
Binary files a/lib/images/license/button/cc-by-nc.png and b/lib/images/license/button/cc-by-nc.png differ
diff --git a/lib/images/license/button/cc-by-nd.png b/lib/images/license/button/cc-by-nd.png
index 3fc490870..e1918b0cd 100644
Binary files a/lib/images/license/button/cc-by-nd.png and b/lib/images/license/button/cc-by-nd.png differ
diff --git a/lib/images/license/button/cc-by-sa.png b/lib/images/license/button/cc-by-sa.png
index 3c6270a0d..9b9b522ab 100644
Binary files a/lib/images/license/button/cc-by-sa.png and b/lib/images/license/button/cc-by-sa.png differ
diff --git a/lib/images/license/button/cc-by.png b/lib/images/license/button/cc-by.png
index 867daaee4..53b1dea0f 100644
Binary files a/lib/images/license/button/cc-by.png and b/lib/images/license/button/cc-by.png differ
diff --git a/lib/images/license/button/cc-zero.png b/lib/images/license/button/cc-zero.png
index 251efcd1c..e6a1a5bf2 100644
Binary files a/lib/images/license/button/cc-zero.png and b/lib/images/license/button/cc-zero.png differ
diff --git a/lib/images/license/button/cc.png b/lib/images/license/button/cc.png
index 9c492950f..e04958a8b 100644
Binary files a/lib/images/license/button/cc.png and b/lib/images/license/button/cc.png differ
diff --git a/lib/images/license/button/gnufdl.png b/lib/images/license/button/gnufdl.png
index 0b52ea12e..b0e0793de 100644
Binary files a/lib/images/license/button/gnufdl.png and b/lib/images/license/button/gnufdl.png differ
diff --git a/lib/images/license/button/publicdomain.png b/lib/images/license/button/publicdomain.png
index 54ea38b64..b301baf97 100644
Binary files a/lib/images/license/button/publicdomain.png and b/lib/images/license/button/publicdomain.png differ
diff --git a/lib/images/magnifier.png b/lib/images/magnifier.png
index 89febff10..014fa921b 100644
Binary files a/lib/images/magnifier.png and b/lib/images/magnifier.png differ
diff --git a/lib/images/media_align_center.png b/lib/images/media_align_center.png
index 807f9d9a8..8b30a051b 100644
Binary files a/lib/images/media_align_center.png and b/lib/images/media_align_center.png differ
diff --git a/lib/images/media_align_left.png b/lib/images/media_align_left.png
index fa6cf33ca..d32bbc235 100644
Binary files a/lib/images/media_align_left.png and b/lib/images/media_align_left.png differ
diff --git a/lib/images/media_align_noalign.png b/lib/images/media_align_noalign.png
index 263e090fe..e6ce85790 100644
Binary files a/lib/images/media_align_noalign.png and b/lib/images/media_align_noalign.png differ
diff --git a/lib/images/media_align_right.png b/lib/images/media_align_right.png
index 33539dbdb..32a5cb0a3 100644
Binary files a/lib/images/media_align_right.png and b/lib/images/media_align_right.png differ
diff --git a/lib/images/media_link_direct.png b/lib/images/media_link_direct.png
index 4350b803d..13d24ad7c 100644
Binary files a/lib/images/media_link_direct.png and b/lib/images/media_link_direct.png differ
diff --git a/lib/images/media_link_displaylnk.png b/lib/images/media_link_displaylnk.png
index 53927566a..102834e7b 100644
Binary files a/lib/images/media_link_displaylnk.png and b/lib/images/media_link_displaylnk.png differ
diff --git a/lib/images/media_link_lnk.png b/lib/images/media_link_lnk.png
index 5ff4ee182..5db14ad03 100644
Binary files a/lib/images/media_link_lnk.png and b/lib/images/media_link_lnk.png differ
diff --git a/lib/images/media_link_nolnk.png b/lib/images/media_link_nolnk.png
index c9378c7fd..d277ac955 100644
Binary files a/lib/images/media_link_nolnk.png and b/lib/images/media_link_nolnk.png differ
diff --git a/lib/images/media_size_large.png b/lib/images/media_size_large.png
index 012a418c3..c4f745e4d 100644
Binary files a/lib/images/media_size_large.png and b/lib/images/media_size_large.png differ
diff --git a/lib/images/media_size_medium.png b/lib/images/media_size_medium.png
index 1469f519f..580c63ed5 100644
Binary files a/lib/images/media_size_medium.png and b/lib/images/media_size_medium.png differ
diff --git a/lib/images/media_size_original.png b/lib/images/media_size_original.png
index f58d056aa..60d1925f5 100644
Binary files a/lib/images/media_size_original.png and b/lib/images/media_size_original.png differ
diff --git a/lib/images/media_size_small.png b/lib/images/media_size_small.png
index a0aafa4a7..8d5a6293b 100644
Binary files a/lib/images/media_size_small.png and b/lib/images/media_size_small.png differ
diff --git a/lib/images/mediamanager.png b/lib/images/mediamanager.png
index 822b8458a..5093381b6 100644
Binary files a/lib/images/mediamanager.png and b/lib/images/mediamanager.png differ
diff --git a/lib/images/notify.png b/lib/images/notify.png
index c18ef1001..f6c56ee55 100644
Binary files a/lib/images/notify.png and b/lib/images/notify.png differ
diff --git a/lib/images/ns.png b/lib/images/ns.png
index c35e832da..77e03b19e 100644
Binary files a/lib/images/ns.png and b/lib/images/ns.png differ
diff --git a/lib/images/open.png b/lib/images/open.png
index 5f2d408c5..b9e4fdf97 100644
Binary files a/lib/images/open.png and b/lib/images/open.png differ
diff --git a/lib/images/resizecol.png b/lib/images/resizecol.png
index b5aeec004..91ad7d15a 100644
Binary files a/lib/images/resizecol.png and b/lib/images/resizecol.png differ
diff --git a/lib/images/success.png b/lib/images/success.png
index 9241adbb2..200142f94 100644
Binary files a/lib/images/success.png and b/lib/images/success.png differ
diff --git a/lib/images/toolbar/bold.png b/lib/images/toolbar/bold.png
index 51ddb8880..8f425e9d0 100644
Binary files a/lib/images/toolbar/bold.png and b/lib/images/toolbar/bold.png differ
diff --git a/lib/images/toolbar/chars.png b/lib/images/toolbar/chars.png
index bad37e503..a906bc861 100644
Binary files a/lib/images/toolbar/chars.png and b/lib/images/toolbar/chars.png differ
diff --git a/lib/images/toolbar/h.png b/lib/images/toolbar/h.png
index 6a48cbbc0..7e43d6421 100644
Binary files a/lib/images/toolbar/h.png and b/lib/images/toolbar/h.png differ
diff --git a/lib/images/toolbar/h1.png b/lib/images/toolbar/h1.png
index 85bd06e6c..9f1970f4e 100644
Binary files a/lib/images/toolbar/h1.png and b/lib/images/toolbar/h1.png differ
diff --git a/lib/images/toolbar/h2.png b/lib/images/toolbar/h2.png
index be2c60031..adec9ec01 100644
Binary files a/lib/images/toolbar/h2.png and b/lib/images/toolbar/h2.png differ
diff --git a/lib/images/toolbar/h3.png b/lib/images/toolbar/h3.png
index 350da88b6..a758b8914 100644
Binary files a/lib/images/toolbar/h3.png and b/lib/images/toolbar/h3.png differ
diff --git a/lib/images/toolbar/h4.png b/lib/images/toolbar/h4.png
index bc1b7038f..9cd606133 100644
Binary files a/lib/images/toolbar/h4.png and b/lib/images/toolbar/h4.png differ
diff --git a/lib/images/toolbar/h5.png b/lib/images/toolbar/h5.png
index b6c263dfb..86b725991 100644
Binary files a/lib/images/toolbar/h5.png and b/lib/images/toolbar/h5.png differ
diff --git a/lib/images/toolbar/hequal.png b/lib/images/toolbar/hequal.png
index da4e921ff..869a2ddb3 100644
Binary files a/lib/images/toolbar/hequal.png and b/lib/images/toolbar/hequal.png differ
diff --git a/lib/images/toolbar/hminus.png b/lib/images/toolbar/hminus.png
index c00f70223..1a99ee4b9 100644
Binary files a/lib/images/toolbar/hminus.png and b/lib/images/toolbar/hminus.png differ
diff --git a/lib/images/toolbar/hplus.png b/lib/images/toolbar/hplus.png
index 6124b5c33..92efcdbd1 100644
Binary files a/lib/images/toolbar/hplus.png and b/lib/images/toolbar/hplus.png differ
diff --git a/lib/images/toolbar/hr.png b/lib/images/toolbar/hr.png
index de3a8a55b..40ae21026 100644
Binary files a/lib/images/toolbar/hr.png and b/lib/images/toolbar/hr.png differ
diff --git a/lib/images/toolbar/image.png b/lib/images/toolbar/image.png
index 70b12fcc2..5cc7afa69 100644
Binary files a/lib/images/toolbar/image.png and b/lib/images/toolbar/image.png differ
diff --git a/lib/images/toolbar/italic.png b/lib/images/toolbar/italic.png
index d69e66070..b37dc2d52 100644
Binary files a/lib/images/toolbar/italic.png and b/lib/images/toolbar/italic.png differ
diff --git a/lib/images/toolbar/link.png b/lib/images/toolbar/link.png
index 01105b0d3..3d2180a63 100644
Binary files a/lib/images/toolbar/link.png and b/lib/images/toolbar/link.png differ
diff --git a/lib/images/toolbar/linkextern.png b/lib/images/toolbar/linkextern.png
index acc0c6fc5..e854572a9 100644
Binary files a/lib/images/toolbar/linkextern.png and b/lib/images/toolbar/linkextern.png differ
diff --git a/lib/images/toolbar/mono.png b/lib/images/toolbar/mono.png
index b91ad2e0d..a6f56d6dc 100644
Binary files a/lib/images/toolbar/mono.png and b/lib/images/toolbar/mono.png differ
diff --git a/lib/images/toolbar/ol.png b/lib/images/toolbar/ol.png
index 186f1fad4..c12229a97 100644
Binary files a/lib/images/toolbar/ol.png and b/lib/images/toolbar/ol.png differ
diff --git a/lib/images/toolbar/smiley.png b/lib/images/toolbar/smiley.png
index 85036c1a8..54f1e6fb4 100644
Binary files a/lib/images/toolbar/smiley.png and b/lib/images/toolbar/smiley.png differ
diff --git a/lib/images/toolbar/strike.png b/lib/images/toolbar/strike.png
index e532d1f07..5adbba402 100644
Binary files a/lib/images/toolbar/strike.png and b/lib/images/toolbar/strike.png differ
diff --git a/lib/images/toolbar/ul.png b/lib/images/toolbar/ul.png
index 008820722..39e5d342e 100644
Binary files a/lib/images/toolbar/ul.png and b/lib/images/toolbar/ul.png differ
diff --git a/lib/images/toolbar/underline.png b/lib/images/toolbar/underline.png
index fa271517c..57bf3e25a 100644
Binary files a/lib/images/toolbar/underline.png and b/lib/images/toolbar/underline.png differ
diff --git a/lib/images/unc.png b/lib/images/unc.png
index a552d6e6f..145b728bb 100644
Binary files a/lib/images/unc.png and b/lib/images/unc.png differ
diff --git a/lib/images/up.png b/lib/images/up.png
index b1eac912d..dbacf3f23 100644
Binary files a/lib/images/up.png and b/lib/images/up.png differ
diff --git a/lib/plugins/acl/pix/group.png b/lib/plugins/acl/pix/group.png
index d80eb2606..348d4e55c 100644
Binary files a/lib/plugins/acl/pix/group.png and b/lib/plugins/acl/pix/group.png differ
diff --git a/lib/plugins/acl/pix/ns.png b/lib/plugins/acl/pix/ns.png
index c35e832da..77e03b19e 100644
Binary files a/lib/plugins/acl/pix/ns.png and b/lib/plugins/acl/pix/ns.png differ
diff --git a/lib/plugins/acl/pix/user.png b/lib/plugins/acl/pix/user.png
index 7b4a507a0..8d5d1c2e9 100644
Binary files a/lib/plugins/acl/pix/user.png and b/lib/plugins/acl/pix/user.png differ
diff --git a/lib/plugins/config/images/danger.png b/lib/plugins/config/images/danger.png
index 7bd84f7a3..da0692429 100644
Binary files a/lib/plugins/config/images/danger.png and b/lib/plugins/config/images/danger.png differ
diff --git a/lib/plugins/config/images/security.png b/lib/plugins/config/images/security.png
index 1800f8e56..3ee8476ac 100644
Binary files a/lib/plugins/config/images/security.png and b/lib/plugins/config/images/security.png differ
diff --git a/lib/plugins/config/images/warning.png b/lib/plugins/config/images/warning.png
index c5e482f84..c1af79f0f 100644
Binary files a/lib/plugins/config/images/warning.png and b/lib/plugins/config/images/warning.png differ
diff --git a/lib/plugins/extension/images/disabled.png b/lib/plugins/extension/images/disabled.png
index 93a813642..9c18b0452 100644
Binary files a/lib/plugins/extension/images/disabled.png and b/lib/plugins/extension/images/disabled.png differ
diff --git a/lib/plugins/extension/images/donate.png b/lib/plugins/extension/images/donate.png
index 9e234da1c..a76dfaaec 100644
Binary files a/lib/plugins/extension/images/donate.png and b/lib/plugins/extension/images/donate.png differ
diff --git a/lib/plugins/extension/images/down.png b/lib/plugins/extension/images/down.png
index df7beda4e..8e399a97d 100644
Binary files a/lib/plugins/extension/images/down.png and b/lib/plugins/extension/images/down.png differ
diff --git a/lib/plugins/extension/images/enabled.png b/lib/plugins/extension/images/enabled.png
index 92d958802..edbbb5b3c 100644
Binary files a/lib/plugins/extension/images/enabled.png and b/lib/plugins/extension/images/enabled.png differ
diff --git a/lib/plugins/extension/images/overlay.png b/lib/plugins/extension/images/overlay.png
index 8f92c2fe7..5414206c5 100644
Binary files a/lib/plugins/extension/images/overlay.png and b/lib/plugins/extension/images/overlay.png differ
diff --git a/lib/plugins/extension/images/plugin.png b/lib/plugins/extension/images/plugin.png
index e4a2d3be6..62424b2c7 100644
Binary files a/lib/plugins/extension/images/plugin.png and b/lib/plugins/extension/images/plugin.png differ
diff --git a/lib/plugins/extension/images/tag.png b/lib/plugins/extension/images/tag.png
index 155dbb3dd..1b1dd750c 100644
Binary files a/lib/plugins/extension/images/tag.png and b/lib/plugins/extension/images/tag.png differ
diff --git a/lib/plugins/extension/images/template.png b/lib/plugins/extension/images/template.png
index ee74bc1d5..67240d1eb 100644
Binary files a/lib/plugins/extension/images/template.png and b/lib/plugins/extension/images/template.png differ
diff --git a/lib/plugins/extension/images/up.png b/lib/plugins/extension/images/up.png
index ec9337715..531b2dd7b 100644
Binary files a/lib/plugins/extension/images/up.png and b/lib/plugins/extension/images/up.png differ
diff --git a/lib/plugins/extension/images/warning.png b/lib/plugins/extension/images/warning.png
index c5e482f84..c1af79f0f 100644
Binary files a/lib/plugins/extension/images/warning.png and b/lib/plugins/extension/images/warning.png differ
diff --git a/lib/plugins/usermanager/images/search.png b/lib/plugins/usermanager/images/search.png
index e9dabc11e..3f2a0b53b 100644
Binary files a/lib/plugins/usermanager/images/search.png and b/lib/plugins/usermanager/images/search.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
index 4b8c26b72..f5c2d583d 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png
index 718a40454..e36540bbf 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
index 9e3de4335..8225e3e18 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png
index 18fd8b166..3e56dbdca 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png
index 8f31ae15d..d5265f4dd 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
index a6effc68e..1d509f45a 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png
index c50038aff..38349845c 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index f08378e9f..a374f7501 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png
index 8deb23b9d..a13f9b4dd 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png
index aa2ddc3b5..945c3d704 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png
index ef231bb25..60ec1c692 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png
index 8bfb68534..48de3ed6b 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png
index d72d6906d..b987966e0 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/lib/tpl/dokuwiki/images/apple-touch-icon.png b/lib/tpl/dokuwiki/images/apple-touch-icon.png
index fb5f108c0..87c99a919 100644
Binary files a/lib/tpl/dokuwiki/images/apple-touch-icon.png and b/lib/tpl/dokuwiki/images/apple-touch-icon.png differ
diff --git a/lib/tpl/dokuwiki/images/button-css.png b/lib/tpl/dokuwiki/images/button-css.png
index 706325e1c..5c0f5a993 100644
Binary files a/lib/tpl/dokuwiki/images/button-css.png and b/lib/tpl/dokuwiki/images/button-css.png differ
diff --git a/lib/tpl/dokuwiki/images/button-html5.png b/lib/tpl/dokuwiki/images/button-html5.png
index 5885a331b..f7b068811 100644
Binary files a/lib/tpl/dokuwiki/images/button-html5.png and b/lib/tpl/dokuwiki/images/button-html5.png differ
diff --git a/lib/tpl/dokuwiki/images/button-rss.png b/lib/tpl/dokuwiki/images/button-rss.png
index b7cddadec..aa6b7fca8 100644
Binary files a/lib/tpl/dokuwiki/images/button-rss.png and b/lib/tpl/dokuwiki/images/button-rss.png differ
diff --git a/lib/tpl/dokuwiki/images/logo.png b/lib/tpl/dokuwiki/images/logo.png
index 35640279c..a1f499569 100644
Binary files a/lib/tpl/dokuwiki/images/logo.png and b/lib/tpl/dokuwiki/images/logo.png differ
diff --git a/lib/tpl/dokuwiki/images/page-gradient.png b/lib/tpl/dokuwiki/images/page-gradient.png
index 8e16a2805..38c74198a 100644
Binary files a/lib/tpl/dokuwiki/images/page-gradient.png and b/lib/tpl/dokuwiki/images/page-gradient.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png
index b6e808717..8e7f7f876 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/00_default.png b/lib/tpl/dokuwiki/images/pagetools/00_default.png
index 95d122e17..bcb2de0f8 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/00_default.png and b/lib/tpl/dokuwiki/images/pagetools/00_default.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/01_edit.png b/lib/tpl/dokuwiki/images/pagetools/01_edit.png
index ad4a737d8..99f3093ee 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/01_edit.png and b/lib/tpl/dokuwiki/images/pagetools/01_edit.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/02_create.png b/lib/tpl/dokuwiki/images/pagetools/02_create.png
index e4fc5d3b1..57fa68d42 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/02_create.png and b/lib/tpl/dokuwiki/images/pagetools/02_create.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/03_draft.png b/lib/tpl/dokuwiki/images/pagetools/03_draft.png
index a13d8c3b4..ce1c6cf14 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/03_draft.png and b/lib/tpl/dokuwiki/images/pagetools/03_draft.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/04_show.png b/lib/tpl/dokuwiki/images/pagetools/04_show.png
index 6f64b1bd1..1ced340dd 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/04_show.png and b/lib/tpl/dokuwiki/images/pagetools/04_show.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/05_source.png b/lib/tpl/dokuwiki/images/pagetools/05_source.png
index bcc4fa21f..dffe1931a 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/05_source.png and b/lib/tpl/dokuwiki/images/pagetools/05_source.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/06_revert.png b/lib/tpl/dokuwiki/images/pagetools/06_revert.png
index 7b8457e5e..18c644474 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/06_revert.png and b/lib/tpl/dokuwiki/images/pagetools/06_revert.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/07_revisions.png b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png
index d918bce05..e599d016c 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/07_revisions.png and b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/08_backlink.png b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png
index 2c0823a72..aa34e2775 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/08_backlink.png and b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png
index 30e039dbc..36254ff53 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png and b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/10_top.png b/lib/tpl/dokuwiki/images/pagetools/10_top.png
index e4bf1d49d..b930fd25f 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/10_top.png and b/lib/tpl/dokuwiki/images/pagetools/10_top.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png
index 36116802f..71b5a3372 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png and b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png differ
diff --git a/lib/tpl/dokuwiki/images/pagetools/12_back.png b/lib/tpl/dokuwiki/images/pagetools/12_back.png
index d154651ec..6d6093ed6 100644
Binary files a/lib/tpl/dokuwiki/images/pagetools/12_back.png and b/lib/tpl/dokuwiki/images/pagetools/12_back.png differ
diff --git a/lib/tpl/dokuwiki/images/search.png b/lib/tpl/dokuwiki/images/search.png
index 1ab7866fb..a07a721df 100644
Binary files a/lib/tpl/dokuwiki/images/search.png and b/lib/tpl/dokuwiki/images/search.png differ
diff --git a/lib/tpl/dokuwiki/images/toc-bullet.png b/lib/tpl/dokuwiki/images/toc-bullet.png
index fc771b97e..a2dfa47e9 100644
Binary files a/lib/tpl/dokuwiki/images/toc-bullet.png and b/lib/tpl/dokuwiki/images/toc-bullet.png differ
diff --git a/lib/tpl/dokuwiki/images/usertools.png b/lib/tpl/dokuwiki/images/usertools.png
index e99b6596e..68102271f 100644
Binary files a/lib/tpl/dokuwiki/images/usertools.png and b/lib/tpl/dokuwiki/images/usertools.png differ
-- 
cgit v1.2.3


From 208f4580295554c94e23377a4e02288bd5251908 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Thu, 15 Jan 2015 12:06:09 +0100
Subject: fixed wrong config check in extension manager #1006

---
 lib/plugins/extension/helper/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 872cccc8c..8bcd00ec6 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -492,7 +492,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 $errors .= '<p class="permerror">'.$this->getLang('git').'</p>';
             }
 
-            if ($extension->isEnabled() && in_array('Auth', $extension->getTypes()) && $conf['auth'] != $extension->getID()) {
+            if ($extension->isEnabled() && in_array('Auth', $extension->getTypes()) && $conf['authtype'] != $extension->getID()) {
                 $errors .= '<p class="permerror">'.$this->getLang('auth').'</p>';
             }
 
-- 
cgit v1.2.3


From 51cc540cb2e5c3cb76827d83253b5824a74e93ec Mon Sep 17 00:00:00 2001
From: Gilles-Philippe Morin <gphmorin@gmail.com>
Date: Sun, 18 Jan 2015 11:56:10 -0500
Subject: "Login" and "Logout" become "Log In" and "Log Out"

This change improves consistency with neighboring links such as "Update Profile" and "Register", which are two action verbs. "Login" and "Logout" were nouns and not verbs. Title case capitalization is applied because of "Update Profile".
---
 inc/lang/en/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 92eb636ed..a5347e026 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -32,8 +32,8 @@ $lang['btn_upload']            = 'Upload';
 $lang['btn_cancel']            = 'Cancel';
 $lang['btn_index']             = 'Sitemap';
 $lang['btn_secedit']           = 'Edit';
-$lang['btn_login']             = 'Login';
-$lang['btn_logout']            = 'Logout';
+$lang['btn_login']             = 'Log In';
+$lang['btn_logout']            = 'Log Out';
 $lang['btn_admin']             = 'Admin';
 $lang['btn_update']            = 'Update';
 $lang['btn_delete']            = 'Delete';
-- 
cgit v1.2.3


From 9b505d59adc0f5dd5a481c7a9a2e9d1f4f6780f3 Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@yandex.ru>
Date: Sun, 25 Jan 2015 20:56:05 +0100
Subject: translation update

---
 inc/lang/ru/index.txt                             |  2 +-
 inc/lang/ru/lang.php                              |  6 ++---
 lib/plugins/authad/lang/ru/settings.php           |  6 ++---
 lib/plugins/authldap/lang/ru/settings.php         | 18 +++++++--------
 lib/plugins/authmysql/lang/ru/settings.php        |  3 ++-
 lib/plugins/extension/lang/ru/intro_plugins.txt   |  2 +-
 lib/plugins/extension/lang/ru/intro_search.txt    |  2 +-
 lib/plugins/extension/lang/ru/intro_templates.txt |  2 +-
 lib/plugins/extension/lang/ru/lang.php            | 28 +++++++++++------------
 lib/plugins/usermanager/lang/ru/import.txt        |  5 ++--
 lib/plugins/usermanager/lang/ru/lang.php          |  4 ++--
 11 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/inc/lang/ru/index.txt b/inc/lang/ru/index.txt
index fc42f87ff..ab669918a 100644
--- a/inc/lang/ru/index.txt
+++ b/inc/lang/ru/index.txt
@@ -1,4 +1,4 @@
 ====== Содержание ======
 
-Перед вами список доступных страниц, упорядоченный по ([[doku>namespaces|пространствам имён]]).
+Перед вами список доступных страниц, упорядоченный по [[doku>namespaces|пространствам имён]].
 
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index ffe513386..96278d53b 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -107,7 +107,7 @@ $lang['profchanged']           = 'Профиль пользователя усп
 $lang['profnodelete']          = 'Удалённый пользователь не может работать с этим документом';
 $lang['profdeleteuser']        = 'Удалить аккаунт';
 $lang['profdeleted']           = 'Ваш аккаунт был удален из этой вики';
-$lang['profconfdelete']        = 'Я хочу удалить мой аккаунт из этой вики.<br />Это действие необратимо.';
+$lang['profconfdelete']        = 'Я хочу удалить свой аккаунт из этой вики. <br /> Это действие необратимо.';
 $lang['profconfdeletemissing'] = 'Флажок подтверждения не установлен';
 $lang['pwdforget']             = 'Забыли пароль? Получите новый';
 $lang['resendna']              = 'Данная вики не поддерживает повторную отправку пароля.';
@@ -179,7 +179,7 @@ $lang['uploadexist']           = 'Файл с таким именем сущес
 $lang['uploadbadcontent']      = 'Содержание файла не соответствует расширению %s.';
 $lang['uploadspam']            = 'Загрузка заблокирована спам-фильтром.';
 $lang['uploadxss']             = 'Загрузка заблокирована по соображениям безопасности.';
-$lang['uploadsize']            = 'Загруженный файл был слишком большой. (макс. %s)';
+$lang['uploadsize']            = 'Загруженный файл был слишком большой. (Макс. %s)';
 $lang['deletesucc']            = 'Файл «%s» был удалён.';
 $lang['deletefail']            = 'Невозможно удалить файл «%s». Проверьте права доступа к файлу.';
 $lang['mediainuse']            = 'Файл «%s» не был удалён — файл всё ещё используется.';
@@ -307,7 +307,7 @@ $lang['i_modified']            = 'Из соображений безопасно
                                   <a href="http://www.dokuwiki.org/install">инструкции по установке «Докувики»</a>';
 $lang['i_funcna']              = 'Функция PHP <code>%s</code> недоступна. Может быть, она по какой-то причине заблокирована вашим хостером?';
 $lang['i_phpver']              = 'Ваша версия PHP (<code>%s</code>) ниже требуемой (<code>%s</code>). Вам необходимо обновить установленную версию PHP.';
-$lang['i_mbfuncoverload']      = 'Для запуска "Докувики" необходимо отключить параметр mbstring.func_overload в php.ini';
+$lang['i_mbfuncoverload']      = 'Для запуска «Докувики» необходимо отключить параметр mbstring.func_overload в php.ini';
 $lang['i_permfail']            = '<code>%s</code> недоступна для записи «Докувики». Вам необходимо исправить системные права доступа для этой директории!';
 $lang['i_confexists']          = '<code>%s</code> уже существует';
 $lang['i_writeerr']            = 'Не удалось создать <code>%s</code>. Вам необходимо проверить системные права доступа к файлу и директориям, и создать файл вручную. ';
diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php
index 99c916b44..c791bd791 100644
--- a/lib/plugins/authad/lang/ru/settings.php
+++ b/lib/plugins/authad/lang/ru/settings.php
@@ -19,9 +19,9 @@ $lang['admin_username']        = 'Привилегированный польз
 $lang['admin_password']        = 'Пароль для указанного пользователя.';
 $lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
 $lang['sso_charset']           = 'Кодировка, в которой веб-сервер передаёт имя пользователя Kerberos или NTLM. Для UTF-8 или latin-1 остаётся пустым. Требует расширение iconv.';
-$lang['real_primarygroup']     = 'Должна ли использоваться настоящая первичная группа вместо "Domain Users" (медленнее)';
+$lang['real_primarygroup']     = 'Должна ли использоваться настоящая первичная группа вместо “Domain Users” (медленнее)';
 $lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
 $lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
 $lang['debug']                 = 'Выводить дополнительную информацию при ошибках?';
-$lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль. 0 - отключить.';
-$lang['additional']            = 'Дополнительные AD атрибуты, разделённые запятой, для выборки из данных пользователя. Используется некоторыми плагинами.';
+$lang['expirywarn']            = 'За сколько дней нужно предупреждать пользователя о необходимости изменить пароль? Для отключения укажите 0 (ноль).';
+$lang['additional']            = 'Дополнительные AD-атрибуты, разделённые запятой, для выборки из данных пользователя. Используется некоторыми плагинами.';
diff --git a/lib/plugins/authldap/lang/ru/settings.php b/lib/plugins/authldap/lang/ru/settings.php
index 534990648..1e5391644 100644
--- a/lib/plugins/authldap/lang/ru/settings.php
+++ b/lib/plugins/authldap/lang/ru/settings.php
@@ -10,16 +10,16 @@
  * @author Владимир <id37736@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
  */
-$lang['server']                = 'Ваш LDAP сервер. Либо имя хоста (<code>localhost</code>), либо полный URL (<code>ldap://server.tld:389</code>)';
-$lang['port']                  = 'Порт LDAP сервера, если выше не был указан полный URL';
-$lang['usertree']              = 'Где искать аккаунты пользователей. Например: <code>ou=People, dc=server, dc=tld</code>';
-$lang['grouptree']             = 'Где искать группы пользователей. Например: <code>ou=Group, dc=server, dc=tld</code>';
-$lang['userfilter']            = 'LDAP фильтр для поиска аккаунтов пользователей. Например: <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
-$lang['groupfilter']           = 'LDAP фильтр для поиска групп. Например: <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
-$lang['version']               = 'Версия протокола. Возможно вам нужно указать <code>3</code>';
-$lang['starttls']              = 'Использовать TLS подключения?';
+$lang['server']                = 'Ваш LDAP-сервер. Либо имя хоста (<code>localhost</code>), либо полный URL (<code>ldap://server.tld:389</code>)';
+$lang['port']                  = 'Порт LDAP-сервера, если выше не был указан полный URL';
+$lang['usertree']              = 'Где искать аккаунты пользователей? Например: <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Где искать группы пользователей? Например: <code>ou=Group, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP-фильтр для поиска аккаунтов пользователей. Например: <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP-фильтр для поиска групп. Например: <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Версия протокола. Возможно, вам нужно указать <code>3</code>';
+$lang['starttls']              = 'Использовать TLS-подключения?';
 $lang['deref']                 = 'Как расшифровывать псевдонимы?';
-$lang['bindpw']                = 'Пароль для указанного пользователя.';
+$lang['bindpw']                = 'Пароль для указанного пользователя';
 $lang['userscope']             = 'Ограничить область поиска при поиске пользователей';
 $lang['groupscope']            = 'Ограничить область поиска при поиске групп';
 $lang['debug']                 = 'Показывать дополнительную отладочную информацию при ошибках';
diff --git a/lib/plugins/authmysql/lang/ru/settings.php b/lib/plugins/authmysql/lang/ru/settings.php
index eefec065b..d9afa14e6 100644
--- a/lib/plugins/authmysql/lang/ru/settings.php
+++ b/lib/plugins/authmysql/lang/ru/settings.php
@@ -6,6 +6,7 @@
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Type-kun <workwork-1@yandex.ru>
+ * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
 $lang['server']                = 'Ваш MySQL-сервер';
 $lang['user']                  = 'Имя пользователя MySQL';
@@ -14,7 +15,7 @@ $lang['database']              = 'Имя базы данных';
 $lang['charset']               = 'Используемый набор символов в базе данных';
 $lang['debug']                 = 'Отображение дополнительной отладочной информации';
 $lang['forwardClearPass']      = 'Передача пароля пользователя открытым текстом, вместо зашифрованной формы в используемом выражении SQL';
-$lang['TablesToLock']          = 'Имена таблиц (через запятую), которые необходимо ограничение для записи';
+$lang['TablesToLock']          = 'Имена таблиц (через запятую), которым необходимо ограничение для записи';
 $lang['checkPass']             = 'Выражение SQL, осуществляющее проверку пароля';
 $lang['getUserInfo']           = 'Выражение SQL, осуществляющее извлечение информации о пользователе';
 $lang['getGroups']             = 'Выражение SQL, осуществляющее извлечение информации о членстве пользователе в группах';
diff --git a/lib/plugins/extension/lang/ru/intro_plugins.txt b/lib/plugins/extension/lang/ru/intro_plugins.txt
index 7262516db..c5ea9e0ec 100644
--- a/lib/plugins/extension/lang/ru/intro_plugins.txt
+++ b/lib/plugins/extension/lang/ru/intro_plugins.txt
@@ -1 +1 @@
-Плагины, установленные в вашей DokuWiki. Здесь вы можете их включить или выключить, или даже полностью удалить. Также здесь показываются обновления плагинов, обязательно прочтите документацию плагина перед обновлением.
\ No newline at end of file
+Плагины, установленные в вашей «Докувики». Здесь вы можете их включить или выключить, или даже полностью удалить. Также здесь показываются обновления плагинов; обязательно прочтите документацию плагина перед обновлением.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ru/intro_search.txt b/lib/plugins/extension/lang/ru/intro_search.txt
index a8486eab6..3c16748ba 100644
--- a/lib/plugins/extension/lang/ru/intro_search.txt
+++ b/lib/plugins/extension/lang/ru/intro_search.txt
@@ -1 +1 @@
-Эта вкладка дает вам доступ ко всем имеющимся сторонним плагинам и шаблонам для DokuWiki. Имейте в виду, что установка стороннего кода может представлять **угрозу безопасности**, возможно вам нужно сперва прочитать о [[doku>security#plugin_security|безопасности плагинов]].
\ No newline at end of file
+Вкладка даёт вам доступ ко всем имеющимся сторонним плагинам и шаблонам для «Докувики». Имейте ввиду, что установка стороннего кода может представлять **угрозу безопасности,** возможно вам нужно сперва прочитать о [[doku>security#plugin_security|безопасности плагинов]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ru/intro_templates.txt b/lib/plugins/extension/lang/ru/intro_templates.txt
index 2d0b74256..787b32fa3 100644
--- a/lib/plugins/extension/lang/ru/intro_templates.txt
+++ b/lib/plugins/extension/lang/ru/intro_templates.txt
@@ -1 +1 @@
-Это шаблоны, установленные в вашей DokuWiki. Вы можете выбрать шаблон, который нужно использовать в [[?do=admin&page=config|Менеджере Конфигурации]]
\ No newline at end of file
+Шаблоны (темы оформления), установленные в вашей «Докувики». Шаблон, который нужно использовать, выбирается в [[?do=admin&page=config|настройках вики]]
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index 64db39b78..381d84500 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -36,18 +36,18 @@ $lang['popularity']            = 'Популярность: %s%%';
 $lang['homepage_link']         = 'Описание';
 $lang['bugs_features']         = 'Баг-трекер';
 $lang['tags']                  = 'Метки:';
-$lang['author_hint']           = 'Найти дополнения этого автора';
+$lang['author_hint']           = 'Найти дополнения автора';
 $lang['installed']             = 'Установлено:';
-$lang['downloadurl']           = 'Ссылка для скачивания:';
+$lang['downloadurl']           = 'Скачать:';
 $lang['repository']            = 'Репозиторий:';
 $lang['unknown']               = '<em>неизвестно</em>';
-$lang['installed_version']     = 'Установленная версия:';
-$lang['install_date']          = 'Последнее обновление:';
+$lang['installed_version']     = 'Уст. версия:';
+$lang['install_date']          = 'Посл. обновление:';
 $lang['available_version']     = 'Доступная версия:';
-$lang['compatible']            = 'Совместим с:';
-$lang['depends']               = 'Зависит от:';
-$lang['similar']               = 'Похож на:';
-$lang['conflicts']             = 'Конфликтует с:';
+$lang['compatible']            = 'Совместим с';
+$lang['depends']               = 'Зависит от';
+$lang['similar']               = 'Похож на';
+$lang['conflicts']             = 'Конфликтует с';
 $lang['donate']                = 'Нравится?';
 $lang['donate_action']         = 'Купить автору кофе!';
 $lang['repo_retry']            = 'Повторить';
@@ -64,7 +64,7 @@ $lang['status_template']       = 'шаблон';
 $lang['status_bundled']        = 'в комплекте';
 $lang['msg_enabled']           = 'Плагин %s включён';
 $lang['msg_disabled']          = 'Плагин %s отключён';
-$lang['msg_delete_success']    = 'Дополнение удалено';
+$lang['msg_delete_success']    = 'Дополнение %s удалено';
 $lang['msg_delete_failed']     = 'Не удалось удалить расширение %s';
 $lang['msg_template_install_success'] = 'Шаблон %s успешно установлен';
 $lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён';
@@ -75,18 +75,18 @@ $lang['missing_dependency']    = '<strong>Отсутствует или откл
 $lang['security_issue']        = '<strong>Проблема безопасности:</strong> %s';
 $lang['security_warning']      = '<strong>Предупреждение безопасности:</strong> %s';
 $lang['update_available']      = '<strong>Обновление:</strong> доступна новая версия %s.';
-$lang['wrong_folder']          = '<strong>Плагин установлен неправильно:</strong> Переименуйте директорию "%s" в "%s".';
-$lang['url_change']            = '<strong>Ссылка изменилась:</strong> Ссылка для загрузки изменилась с прошлого раза. Проверьте новую ссылку прежде чем обновлять расширение.<br />Новая: %s<br />Старая: %s';
+$lang['wrong_folder']          = '<strong>Плагин установлен неправильно:</strong> переименуйте папку плагина из %s в %s.';
+$lang['url_change']            = '<strong>Ссылка изменилась:</strong> ссылка для загрузки изменилась с прошлого раза. Проверьте новую ссылку прежде, чем обновлять расширение.<br />Новая: %s<br />Старая: %s';
 $lang['error_badurl']          = 'Ссылки должны начинаться с http или https';
 $lang['error_dircreate']       = 'Не удалось создать временную директорию для загрузки';
 $lang['error_download']        = 'Не удалось загрузить файл: %s';
-$lang['error_decompress']      = 'Не удалось распаковать загруженный файл. Возможно, файл был повреждён при загрузке - тогда нужно попробовать ещё раз. Либо неизвестен формат архива - тогда загрузку и установку надо произвести вручную.';
+$lang['error_decompress']      = 'Не удалось распаковать загруженный файл. Возможно, файл был повреждён при загрузке — тогда нужно попробовать ещё раз. Либо неизвестен формат архива — тогда загрузку и установку надо произвести вручную.';
 $lang['error_findfolder']      = 'Не удалось определить директорию для расширения, загрузку и установку надо произвести вручную.';
 $lang['error_copy']            = 'Возникла ошибка копирования файлов в директорию <em>%s</em>: возможно, диск переполнен, или неверно выставлены права доступа. Это могло привести к неполной установке плагина и нарушить работу вашей вики.';
 $lang['noperms']               = 'Папка для расширений недоступна для записи';
 $lang['notplperms']            = 'Папка для шаблонов недоступна для записи';
 $lang['nopluginperms']         = 'Папка плагинов недоступна для записи';
 $lang['git']                   = 'Это расширение было установлено через git. Вы не можете обновить его тут.';
-$lang['install_url']           = 'Установить с адреса URL:';
-$lang['install_upload']        = 'Скачать расширение:';
+$lang['install_url']           = 'Установить с адреса URL';
+$lang['install_upload']        = 'Скачать расширение';
 $lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернетом.';
diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt
index c92e47b4c..22372c254 100644
--- a/lib/plugins/usermanager/lang/ru/import.txt
+++ b/lib/plugins/usermanager/lang/ru/import.txt
@@ -2,7 +2,8 @@
 
 Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
 Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. 
-Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (%%""%%). Обратный слэш используется как прерывание.
-В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». Повторяющиеся идентификаторы user-id будут игнорироваться.
+Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (%%""%%). Обратный слэш (\) используется как прерывание.  
+В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей».  
+Повторяющиеся идентификаторы user-id будут игнорироваться.
 
 Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю. 
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php
index 0914d7b49..de650d681 100644
--- a/lib/plugins/usermanager/lang/ru/lang.php
+++ b/lib/plugins/usermanager/lang/ru/lang.php
@@ -70,10 +70,10 @@ $lang['add_fail']              = 'Не удалось добавить поль
 $lang['notify_ok']             = 'Письмо с уведомлением отправлено';
 $lang['notify_fail']           = 'Не удалось отправить письмо с уведомлением';
 $lang['import_userlistcsv']    = 'Файл со списком пользователей (CSV):';
-$lang['import_header']         = 'Последний импорт - список ошибок';
+$lang['import_header']         = 'Последний импорт — список ошибок';
 $lang['import_success_count']  = 'Импорт пользователей: %d пользователей найдено, %d импортировано успешно.';
 $lang['import_failure_count']  = 'Импорт пользователей: %d не удалось. Список ошибок прочтите ниже.';
-$lang['import_error_fields']   = 'Не все поля заполнены. Найдено %d, а нужно 4.';
+$lang['import_error_fields']   = 'Не все поля заполнены. Найдено %d, а нужно: 4.';
 $lang['import_error_baduserid'] = 'Отсутствует идентификатор пользователя';
 $lang['import_error_badname']  = 'Имя не годится';
 $lang['import_error_badmail']  = 'Адрес электронной почты не годится';
-- 
cgit v1.2.3


From c85cbe690d7a58d7835f92aa71252cf2d25d40a2 Mon Sep 17 00:00:00 2001
From: Davor Turkalj <turki.bsc@gmail.com>
Date: Wed, 28 Jan 2015 09:26:11 +0100
Subject: translation update

---
 inc/lang/hr/lang.php                   |  2 +-
 lib/plugins/extension/lang/hr/lang.php | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index c3cf6d822..6e4e48e36 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -64,7 +64,7 @@ $lang['remember']              = 'Zapamti me';
 $lang['fullname']              = 'Ime i prezime';
 $lang['email']                 = 'E-pošta';
 $lang['profile']               = 'Korisnički profil';
-$lang['badlogin']              = 'Ne ispravno korisničko ime ili lozinka.';
+$lang['badlogin']              = 'Neispravno korisničko ime ili lozinka.';
 $lang['badpassconfirm']        = 'Nažalost, lozinka nije ispravna';
 $lang['minoredit']             = 'Manje izmjene';
 $lang['draftdate']             = 'Nacrt promjena automatski spremljen u';
diff --git a/lib/plugins/extension/lang/hr/lang.php b/lib/plugins/extension/lang/hr/lang.php
index f43defcb1..e51d8cba3 100644
--- a/lib/plugins/extension/lang/hr/lang.php
+++ b/lib/plugins/extension/lang/hr/lang.php
@@ -5,20 +5,20 @@
  * 
  * @author Davor Turkalj <turki.bsc@gmail.com>
  */
-$lang['menu']                  = 'Upravitelj dodataka';
+$lang['menu']                  = 'Upravitelj proširenja';
 $lang['tab_plugins']           = 'Ugrađeni dodatci';
 $lang['tab_templates']         = 'Ugrađeni predlošci';
 $lang['tab_search']            = 'Potraži i ugradi';
 $lang['tab_install']           = 'Ručna ugradnja';
 $lang['notimplemented']        = 'Ova mogućnost još nije napravljena';
-$lang['notinstalled']          = 'Dodatak nije ugrađen';
-$lang['alreadyenabled']        = 'Ovaj dodatak je već omogućen';
-$lang['alreadydisabled']       = 'Ovaj dodatak je već onemogućen';
+$lang['notinstalled']          = 'Proširenje nije ugrađeno';
+$lang['alreadyenabled']        = 'Ovo proširenje je već omogućeno';
+$lang['alreadydisabled']       = 'Ovo proširenje je već onemogućeno';
 $lang['pluginlistsaveerror']   = 'Dogodila se greška pri snimanju liste dodataka';
 $lang['unknownauthor']         = 'Nepoznat autor';
 $lang['unknownversion']        = 'Nepoznata inačica';
 $lang['btn_info']              = 'Prikaži više informacija';
-$lang['btn_update']            = 'Dogradi';
+$lang['btn_update']            = 'Ažuriraj';
 $lang['btn_uninstall']         = 'Ukloni';
 $lang['btn_enable']            = 'Omogući';
 $lang['btn_disable']           = 'Onemogući';
@@ -33,7 +33,7 @@ $lang['popularity']            = 'Popularnost: %s%%';
 $lang['homepage_link']         = 'Upute';
 $lang['bugs_features']         = 'Greške';
 $lang['tags']                  = 'Oznake:';
-$lang['author_hint']           = 'Potraži dodatke od ovog autora';
+$lang['author_hint']           = 'Potraži proširenja od ovog autora';
 $lang['installed']             = 'Ugrađeno:';
 $lang['downloadurl']           = 'URL adresa preuzimanja:';
 $lang['repository']            = 'Repozitorij:';
@@ -61,7 +61,8 @@ $lang['status_template']       = 'predložak';
 $lang['status_bundled']        = 'ugrađen';
 $lang['msg_enabled']           = 'Dodatak %s omogućen';
 $lang['msg_disabled']          = 'Dodatak %s onemogućen';
-$lang['msg_delete_success']    = 'Proširenje uklonjeno';
+$lang['msg_delete_success']    = 'Proširenje %s uklonjeno';
+$lang['msg_delete_failed']     = 'Uklanjanje proširenja %s nije uspjelo';
 $lang['msg_template_install_success'] = 'Predložak %s uspješno ugrađen';
 $lang['msg_template_update_success'] = 'Predložak %s uspješno nadograđen';
 $lang['msg_plugin_install_success'] = 'Dodatak %s uspješno ugrađen';
@@ -83,6 +84,8 @@ $lang['noperms']               = 'Nije moguće pisati u mapu proširanja';
 $lang['notplperms']            = 'Nije moguće pisati u mapu predloška';
 $lang['nopluginperms']         = 'Nije moguće pisati u mapu dodatka';
 $lang['git']                   = 'Proširenje je ugrađeno preko Git-a, možda ga ne želite nadograđivati ovdje.';
+$lang['auth']                  = 'Autorizacijski dodatak nije podešen, razmotrite njegovo onemogućavanje kao dodatka.';
 $lang['install_url']           = 'Ugradi s URL-a:';
 $lang['install_upload']        = 'Učitaj proširenje:';
 $lang['repo_error']            = 'Repozitorij dodataka nije dostupan. Budite sigurni da server može pristupiti www.dokuwiki.org i provjerite proxy postavke.';
+$lang['nossl']                 = 'Izgleda da korišteni PHP ne podržava SSL. Učitavanje neće raditi na mnogim DokuWiki dodatcima.';
-- 
cgit v1.2.3


From 090f83d33e04d9dfa5a75e6229b19bfab29b7b51 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 1 Feb 2015 13:59:41 +0100
Subject: Fix farm config cascade for extendable user style and scripts #954

---
 inc/farm.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/farm.php b/inc/farm.php
index cee61816c..87fcdade8 100644
--- a/inc/farm.php
+++ b/inc/farm.php
@@ -135,12 +135,12 @@ $config_cascade = array(
         ),
     ),
     'userstyle' => array(
-        'screen'  => DOKU_CONF.'userstyle.css',
-        'print'   => DOKU_CONF.'userprint.css',
-        'feed'    => DOKU_CONF.'userfeed.css',
-        'all'     => DOKU_CONF.'userall.css',
+        'screen'    => array(DOKU_CONF . 'userstyle.css', DOKU_CONF . 'userstyle.less'),
+        'print'     => array(DOKU_CONF . 'userprint.css', DOKU_CONF . 'userprint.less'),
+        'feed'      => array(DOKU_CONF . 'userfeed.css', DOKU_CONF . 'userfeed.less'),
+        'all'       => array(DOKU_CONF . 'userall.css', DOKU_CONF . 'userall.less')
     ),
     'userscript' => array(
-        'default' => DOKU_CONF.'userscript.js'
+        'default'   => array(DOKU_CONF . 'userscript.js')
     ),
 );
-- 
cgit v1.2.3


From ea0c142784dedbbc3e93b84bea865a40ccb6dc94 Mon Sep 17 00:00:00 2001
From: Christoph Dwertmann <cdwertmann@gmail.com>
Date: Thu, 5 Feb 2015 15:37:31 +1100
Subject: Add ob_flush() to sendGIF

I'm running this dokuwiki docker container: https://registry.hub.docker.com/u/mprasil/dokuwiki/

It uses lighttpd and fastcgi. For some reason, the ignore_user_abort() feature where the browser should close the connection after the GIF has been received is not working on lighty. The browser keeps loading the page until the indexer run is complete, which leads to extremely slow load times with a larger page index.

Adding ob_flush() to sendGIF fixes the issue.
---
 lib/exe/indexer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 330b8498d..2de178caa 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -199,6 +199,7 @@ function sendGIF(){
     header('Content-Length: '.strlen($img));
     header('Connection: Close');
     print $img;
+    ob_flush();
     flush();
     // Browser should drop connection after this
     // Thinks it's got the whole image
-- 
cgit v1.2.3


From 4c32d8dc4120e5a2667564b4108b3708986ea47e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 9 Feb 2015 09:17:32 +0100
Subject: fixed method signature #1024

---
 lib/plugins/authad/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/authad/action.php b/lib/plugins/authad/action.php
index 97be9897e..bc0f90c7e 100644
--- a/lib/plugins/authad/action.php
+++ b/lib/plugins/authad/action.php
@@ -17,7 +17,7 @@ class action_plugin_authad extends DokuWiki_Action_Plugin {
     /**
      * Registers a callback function for a given event
      */
-    public function register(Doku_Event_Handler &$controller) {
+    public function register(Doku_Event_Handler $controller) {
 
         $controller->register_hook('AUTH_LOGIN_CHECK', 'BEFORE', $this, 'handle_auth_login_check');
         $controller->register_hook('HTML_LOGINFORM_OUTPUT', 'BEFORE', $this, 'handle_html_loginform_output');
-- 
cgit v1.2.3


From d75d76b237162cf89dcc8f56703ec0607ed27fdb Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 9 Feb 2015 09:40:24 +0100
Subject: fix referral settings in AuthLDAP. closes #1023

---
 lib/plugins/authldap/auth.php             | 4 ++--
 lib/plugins/authldap/conf/default.php     | 2 +-
 lib/plugins/authldap/conf/metadata.php    | 2 +-
 lib/plugins/authldap/lang/en/settings.php | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index fd4729331..50735882f 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -516,13 +516,13 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
                         }
                     }
                     // needs version 3
-                    if($this->getConf('referrals')) {
+                    if($this->getConf('referrals') > -1) {
                         if(!@ldap_set_option(
                             $this->con, LDAP_OPT_REFERRALS,
                             $this->getConf('referrals')
                         )
                         ) {
-                            msg('Setting LDAP referrals to off failed', -1);
+                            msg('Setting LDAP referrals failed', -1);
                             $this->_debug('LDAP referal set: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
                         }
                     }
diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
index 2c295eeeb..c2e462c5c 100644
--- a/lib/plugins/authldap/conf/default.php
+++ b/lib/plugins/authldap/conf/default.php
@@ -8,7 +8,7 @@ $conf['userfilter']  = '';
 $conf['groupfilter'] = '';
 $conf['version']     = 2;
 $conf['starttls']    = 0;
-$conf['referrals']   = 0;
+$conf['referrals']   = -1;
 $conf['deref']       = 0;
 $conf['binddn']      = '';
 $conf['bindpw']      = '';
diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index 6aa53c40d..4649ba5bf 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -7,7 +7,7 @@ $meta['userfilter']  = array('string','_caution' => 'danger');
 $meta['groupfilter'] = array('string','_caution' => 'danger');
 $meta['version']     = array('numeric','_caution' => 'danger');
 $meta['starttls']    = array('onoff','_caution' => 'danger');
-$meta['referrals']   = array('onoff','_caution' => 'danger');
+$meta['referrals']   = array('multichoice','_choices' => array(-1,0,1),'_caution' => 'danger');
 $meta['deref']       = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'danger');
 $meta['binddn']      = array('string','_caution' => 'danger');
 $meta['bindpw']      = array('password','_caution' => 'danger');
diff --git a/lib/plugins/authldap/lang/en/settings.php b/lib/plugins/authldap/lang/en/settings.php
index b73166ab2..951901ccc 100644
--- a/lib/plugins/authldap/lang/en/settings.php
+++ b/lib/plugins/authldap/lang/en/settings.php
@@ -21,3 +21,7 @@ $lang['deref_o_0']   = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']   = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']   = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']   = 'LDAP_DEREF_ALWAYS';
+
+$lang['referrals_o_-1'] = 'use default';
+$lang['referrals_o_0']  = 'don\'t follow referrals';
+$lang['referrals_o_1']  = 'follow referrals';
\ No newline at end of file
-- 
cgit v1.2.3


From bf00b3965f373b9497752ef97b25d9f29be35ca0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 9 Feb 2015 10:22:12 +0100
Subject: fix username handling in dwpage CLI tool. closes #1019

---
 bin/dwpage.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/dwpage.php b/bin/dwpage.php
index a777fd3e1..d7f6e9bb8 100755
--- a/bin/dwpage.php
+++ b/bin/dwpage.php
@@ -28,7 +28,8 @@ class PageCLI extends DokuCLI {
         $options->registerOption(
             'user',
             'work as this user. defaults to current CLI user',
-            'u'
+            'u',
+            'username'
         );
         $options->setHelp(
             'Utility to help command line Dokuwiki page editing, allow '.
@@ -239,6 +240,7 @@ class PageCLI extends DokuCLI {
         if($this->force) $this->deleteLock($wiki_id);
 
         $_SERVER['REMOTE_USER'] = $this->username;
+
         if(checklock($wiki_id)) {
             $this->error("Page $wiki_id is already locked by another user");
             exit(1);
@@ -246,7 +248,6 @@ class PageCLI extends DokuCLI {
 
         lock($wiki_id);
 
-        $_SERVER['REMOTE_USER'] = '_'.$this->username.'_';
         if(checklock($wiki_id) != $this->username) {
             $this->error("Unable to obtain lock for $wiki_id ");
             var_dump(checklock($wiki_id));
-- 
cgit v1.2.3


From eba389bb2fd1174360c5d255bbf53e1d40ab8712 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 9 Feb 2015 17:03:34 +0100
Subject: avoid messages pushing down page tools. fixes #1011

This moves the message area into content div. The pageid is now aligned
by floating instead of absolute positioning.
---
 lib/tpl/dokuwiki/css/design.less | 16 +++++++++-------
 lib/tpl/dokuwiki/detail.php      |  1 +
 lib/tpl/dokuwiki/main.php        |  1 +
 lib/tpl/dokuwiki/tpl_header.php  |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 66607b5e9..3ded73581 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -11,7 +11,7 @@
 ********************************************************************/
 
 #dokuwiki__header {
-    padding: 2em 0 1.5em;
+    padding: 2em 0 0;
 
     .headings,
     .tools {
@@ -349,11 +349,11 @@ form.search {
 ********************************************************************/
 
 .dokuwiki .pageId {
-    position: absolute;
-    top: -2.3em;
-    right: -1em;
+    float: right;
+    margin-right: -1em;
+    margin-bottom: -1px;
     overflow: hidden;
-    padding: 1em 1em 0;
+    padding: 0.5em 1em 0;
 
     span {
         font-size: 0.875em;
@@ -370,6 +370,7 @@ form.search {
 }
 
 .dokuwiki div.page {
+    clear: both;
     background: @ini_background;
     color: inherit;
     border: 1px solid @ini_background_alt;
@@ -396,8 +397,9 @@ form.search {
 }
 
 [dir=rtl] .dokuwiki .pageId {
-    right: auto;
-    left: -1em;
+    float: left;
+    margin-left: -1em;
+    margin-right: 0;
 }
 
 /* footer
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index d4f9c39d1..b27567987 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -36,6 +36,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 
             <!-- ********** CONTENT ********** -->
             <div id="dokuwiki__content"><div class="pad group">
+                <?php html_msgarea() ?>
 
                 <?php if(!$ERROR): ?>
                     <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG)); ?></span></div>
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 10c0bf91e..165230e8a 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -49,6 +49,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 
             <!-- ********** CONTENT ********** -->
             <div id="dokuwiki__content"><div class="pad group">
+                <?php html_msgarea() ?>
 
                 <div class="pageId"><span><?php echo hsc($ID) ?></span></div>
 
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 7d9c88347..ee51cbd01 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -85,7 +85,7 @@ if (!defined('DOKU_INC')) die();
         </div>
     <?php endif ?>
 
-    <?php html_msgarea() ?>
+
 
     <hr class="a11y" />
 </div></div><!-- /header -->
-- 
cgit v1.2.3


From 0a4266d4abdf928b71e0eb0164595ce5d3f162f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Tue, 10 Feb 2015 14:48:08 +0200
Subject: consistency: failure exit with status code 1

---
 inc/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/init.php b/inc/init.php
index 91bc77f98..bc9ab6d70 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -535,7 +535,7 @@ function nice_die($msg){
 </body>
 </html>
 EOT;
-    exit;
+    exit(1);
 }
 
 /**
-- 
cgit v1.2.3


From cbb4a6817d10faf5d8376e07a26e2030a2335d78 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Thu, 12 Feb 2015 08:51:36 +0100
Subject: translation update

---
 inc/lang/zh/lang.php                      | 2 ++
 lib/plugins/authldap/lang/zh/settings.php | 3 +++
 lib/plugins/extension/lang/zh/lang.php    | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index d960eb799..6f55834d0 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -360,3 +360,5 @@ $lang['currentns']             = '当前命名空间';
 $lang['searchresult']          = '搜索结果';
 $lang['plainhtml']             = '纯HTML';
 $lang['wikimarkup']            = 'Wiki Markup 语言';
+$lang['page_nonexist_rev']     = '页面在 %s 不存在。它曾创建于 <a href="%s">%s</a>。';
+$lang['unable_to_parse_date']  = '无法解析参数 "%s"。';
diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index cdaf3dc64..d4ea5c615 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -26,3 +26,6 @@ $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = '默认';
+$lang['referrals_o_0']         = '不要跟随参照(referral)';
+$lang['referrals_o_1']         = '跟随参照(referral)';
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
index 0264f3e9c..5ab3d77ba 100644
--- a/lib/plugins/extension/lang/zh/lang.php
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -65,6 +65,7 @@ $lang['status_bundled']        = '内建';
 $lang['msg_enabled']           = '插件 %s 已启用';
 $lang['msg_disabled']          = '插件 %s 已禁用';
 $lang['msg_delete_success']    = '插件已经卸载';
+$lang['msg_delete_failed']     = '卸载扩展 %s 失败';
 $lang['msg_template_install_success'] = '模板 %s 安装成功';
 $lang['msg_template_update_success'] = '模板 %s 更新成功';
 $lang['msg_plugin_install_success'] = '插件 %s 安装成功';
@@ -86,6 +87,8 @@ $lang['noperms']               = '扩展目录不可写';
 $lang['notplperms']            = '模板目录不可写';
 $lang['nopluginperms']         = '插件目录不可写';
 $lang['git']                   = '这个扩展是通过 git 安装的，您可能不想在这里升级它';
+$lang['auth']                  = '这个认证插件没有在配置中启用，请考虑禁用它。';
 $lang['install_url']           = '从 URL 安装：';
 $lang['install_upload']        = '上传扩展：';
 $lang['repo_error']            = '无法连接到插件仓库。请确定您的服务器可以连接 www.dokuwiki.org 并检查您的代理设置。';
+$lang['nossl']                 = '您的 PHP 似乎没有 SSL 支持。很多 Dokuwiki 扩展将无法下载。';
-- 
cgit v1.2.3


From 25839a4134376bdcf24d224bea967ee79ec85a40 Mon Sep 17 00:00:00 2001
From: chang-zhao <chang-zhao@users.noreply.github.com>
Date: Thu, 12 Feb 2015 15:09:51 +0300
Subject: Update wordblock.conf

 wordblock.conf too restrictive #1021 - removed fetish, bi...sex & gay...sex
---
 conf/wordblock.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/wordblock.conf b/conf/wordblock.conf
index fc939a4d4..f877f26d7 100644
--- a/conf/wordblock.conf
+++ b/conf/wordblock.conf
@@ -2,14 +2,11 @@
 # patches welcome
 #
 https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine)
-gay\s*sex
-bi\s*sex
 incest
 zoosex
 gang\s*bang
 facials
 ladyboy
-fetish
 \btits\b
 \brape\b
 bolea\.com
-- 
cgit v1.2.3


From fb45dc56a0cf91f2a0d7126e846580666a6755b7 Mon Sep 17 00:00:00 2001
From: Tim222 <tim.weinhold@gmail.com>
Date: Thu, 12 Feb 2015 13:56:22 +0100
Subject: Update interwiki.conf

Support for the URI scheme tel: #643
---
 conf/interwiki.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index d961912e5..4857e27f3 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -32,6 +32,6 @@ google.de http://www.google.de/search?q=
 go        http://www.google.com/search?q={URL}&amp;btnI=lucky
 user      :user:{NAME}
 
-# To support VoIP/SIP links
+# To support VoIP/SIP/TEL links
 callto    callto://{NAME}
-
+tel       tel:{NAME}
-- 
cgit v1.2.3


From 2a3c155cbaa1367e7dfaa067621e9535cb2ad880 Mon Sep 17 00:00:00 2001
From: Tim222 <tim.weinhold@gmail.com>
Date: Thu, 12 Feb 2015 14:15:57 +0100
Subject: Added icon for interwiki.conf

Support for the URI scheme tel: #643
---
 lib/images/interwiki/tel.gif | Bin 0 -> 177 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lib/images/interwiki/tel.gif

diff --git a/lib/images/interwiki/tel.gif b/lib/images/interwiki/tel.gif
new file mode 100644
index 000000000..60158c565
Binary files /dev/null and b/lib/images/interwiki/tel.gif differ
-- 
cgit v1.2.3


From 8b7f89f548e7fdb4a84eb98f638fe5f49529d829 Mon Sep 17 00:00:00 2001
From: chang-zhao <chang-zhao@users.noreply.github.com>
Date: Thu, 12 Feb 2015 19:51:22 +0300
Subject: Update wordblock.conf

---
 conf/wordblock.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf/wordblock.conf b/conf/wordblock.conf
index f877f26d7..f2ff15942 100644
--- a/conf/wordblock.conf
+++ b/conf/wordblock.conf
@@ -2,13 +2,12 @@
 # patches welcome
 #
 https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine)
-incest
+https?:\/\/(\S*?)(bi\s*sex|gay\s*sex|fetish|incest|\brape\b)
 zoosex
 gang\s*bang
 facials
 ladyboy
 \btits\b
-\brape\b
 bolea\.com
 52crystal
 baida\.org
-- 
cgit v1.2.3


From c9f9ddf9a8e1f6113df3844ed45bb1f6d9012f4f Mon Sep 17 00:00:00 2001
From: chang-zhao <chang-zhao@users.noreply.github.com>
Date: Fri, 13 Feb 2015 12:56:51 +0300
Subject: Update wordblock.conf

moved those keywords to http & added penis
---
 conf/wordblock.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/wordblock.conf b/conf/wordblock.conf
index f2ff15942..3040fa08f 100644
--- a/conf/wordblock.conf
+++ b/conf/wordblock.conf
@@ -2,7 +2,7 @@
 # patches welcome
 #
 https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine)
-https?:\/\/(\S*?)(bi\s*sex|gay\s*sex|fetish|incest|\brape\b)
+https?:\/\/(\S*?)(bi\s*sex|gay\s*sex|fetish|incest|penis|\brape\b)
 zoosex
 gang\s*bang
 facials
-- 
cgit v1.2.3


From c2a2396e45a7ec8a14d573c89719463e765b1074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Iradier?= <airadier@gmail.com>
Date: Fri, 13 Feb 2015 16:01:39 +0100
Subject: translation update

---
 inc/lang/es/lang.php                   | 4 +++-
 lib/plugins/extension/lang/es/lang.php | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 8f4cb2977..865110ab9 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -37,6 +37,7 @@
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author Jonathan Hernández <me@jhalicea.com>
  * @author pokesakura <pokesakura@gmail.com>
+ * @author Álvaro Iradier <airadier@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -98,7 +99,7 @@ $lang['badpassconfirm']        = 'Lo siento, la contraseña es errónea';
 $lang['minoredit']             = 'Cambios menores';
 $lang['draftdate']             = 'Borrador guardado automáticamente:';
 $lang['nosecedit']             = 'La página ha cambiado en el lapso, la información de sección estaba anticuada, en su lugar se cargó la página completa.';
-$lang['searchcreatepage']      = "Si no has encontrado lo que buscabas, puedes crear una nueva página con tu consulta utilizando el botón  ''Crea esta página''.";
+$lang['searchcreatepage']      = 'Si no has encontrado lo que buscabas, puedes crear una nueva página con tu consulta utilizando el botón  \'\'Crea esta página\'\'.';
 $lang['regmissing']            = 'Lo siento, tienes que completar todos los campos.';
 $lang['reguexists']            = 'Lo siento, ya existe un usuario con este nombre.';
 $lang['regsuccess']            = 'El usuario ha sido creado y la contraseña se ha enviado por correo.';
@@ -369,3 +370,4 @@ $lang['currentns']             = 'Espacio de nombres actual';
 $lang['searchresult']          = 'Resultado de la búsqueda';
 $lang['plainhtml']             = 'HTML sencillo';
 $lang['wikimarkup']            = 'Etiquetado Wiki';
+$lang['page_nonexist_rev']     = 'La página no existía en %s. Por tanto fue creada en <a href="%s">%s</a>.';
diff --git a/lib/plugins/extension/lang/es/lang.php b/lib/plugins/extension/lang/es/lang.php
index 63742c3b3..a835cb630 100644
--- a/lib/plugins/extension/lang/es/lang.php
+++ b/lib/plugins/extension/lang/es/lang.php
@@ -6,6 +6,7 @@
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author Jonathan Hernández <me@jhalicea.com>
+ * @author Álvaro Iradier <airadier@gmail.com>
  */
 $lang['menu']                  = 'Administrador de Extensiones ';
 $lang['tab_plugins']           = 'Plugins instalados';
@@ -64,6 +65,7 @@ $lang['status_bundled']        = 'agrupado';
 $lang['msg_enabled']           = 'Plugin %s activado';
 $lang['msg_disabled']          = 'Plugin %s desactivado';
 $lang['msg_delete_success']    = 'Extensión desinstalada';
+$lang['msg_delete_failed']     = 'La desinstalación de la extensión %s ha fallado';
 $lang['msg_template_install_success'] = 'Plantilla %s instalada con éxito';
 $lang['msg_template_update_success'] = 'Plantilla %s actualizada con éxito';
 $lang['msg_plugin_install_success'] = 'Plugin %s instalado con éxito';
@@ -78,6 +80,9 @@ $lang['url_change']            = '<strong>URL actualizada:</strong> El Download
 $lang['error_badurl']          = 'URLs deberían empezar con http o https';
 $lang['error_dircreate']       = 'No es posible de crear un directorio temporero para poder recibir el download';
 $lang['error_download']        = 'No es posible descargar el documento: %s';
+$lang['error_decompress']      = 'No se pudo descomprimir el fichero descargado. Puede ser a causa de una descarga incorrecta, en cuyo caso puedes intentarlo de nuevo; o puede que el formato de compresión sea desconocido, en cuyo caso necesitarás descargar e instalar manualmente.';
+$lang['noperms']               = 'El directorio de extensiones no tiene permiso de escritura.';
+$lang['notplperms']            = 'El directorio de plantillas no tiene permiso de escritura.';
 $lang['git']                   = 'Esta extensión fue instalada a través de git, quizás usted no quiera actualizarla aquí mismo.';
 $lang['install_url']           = 'Instalar desde URL:';
 $lang['install_upload']        = 'Subir Extensión:';
-- 
cgit v1.2.3


From 001ea14e1ab1f02f7715f2baba75ab563da5236e Mon Sep 17 00:00:00 2001
From: Rainbow Spike <Dr-Yukon@users.noreply.github.com>
Date: Mon, 16 Feb 2015 21:41:15 +1000
Subject: Update template.php

Added placeholder in search textarea
---
 inc/template.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/template.php b/inc/template.php
index ec8de44f3..a4ace1a63 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -840,6 +840,7 @@ function tpl_searchform($ajax = true, $autocomplete = true) {
     print '<input type="hidden" name="do" value="search" />';
     print '<input type="text" ';
     if($ACT == 'search') print 'value="'.htmlspecialchars($QUERY).'" ';
+    print 'placeholder="'.$lang['btn_search'].'" ';
     if(!$autocomplete) print 'autocomplete="off" ';
     print 'id="qsearch__in" accesskey="f" name="id" class="edit" title="[F]" />';
     print '<input type="submit" value="'.$lang['btn_search'].'" class="button" title="'.$lang['btn_search'].'" />';
-- 
cgit v1.2.3


From d6dc28be40fb3202a3df69458db164e20999ac2b Mon Sep 17 00:00:00 2001
From: ghi <dokuwiki@imz.re>
Date: Tue, 17 Feb 2015 11:07:57 +0100
Subject: Revert "add TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY
 basing on Starter template"

This reverts commit 362a4f084345b496ab6b155db3ec50cad3939d0e.
---
 inc/template.php                | 19 -------------------
 lib/tpl/dokuwiki/tpl_header.php | 19 +++++++------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index fb468d041..60e178d1a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1786,24 +1786,5 @@ function tpl_classes() {
     return join(' ', $classes);
 }
 
-/**
- * Create event for tools menues
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-function tpl_toolsevent($toolsname, $items, $view='main') {
-    $data = array(
-        'view'  => $view,
-        'items' => $items
-    );
-
-    $hook = 'TEMPLATE_'.strtoupper($toolsname).'_DISPLAY';
-    $evt = new Doku_Event($hook, $data);
-    if($evt->advise_before()){
-        foreach($evt->data['items'] as $k => $html) echo $html;
-    }
-    $evt->advise_after();
-}
-
 //Setup VIM: ex: et ts=4 :
 
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 547dd1401..a2bfd4346 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -46,13 +46,10 @@ if (!defined('DOKU_INC')) die();
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '</li>';
                         }
-
-						tpl_toolsevent('usertools', array(
-							'admin'     => tpl_action('admin', 1, 'li', 1),
-							'profile'   => tpl_action('profile', 1, 'li', 1),
-							'register'  => tpl_action('register', 1, 'li', 1),
-							'login'     => tpl_action('login', 1, 'li', 1),
-						));
+                        tpl_action('admin', 1, 'li');
+                        tpl_action('profile', 1, 'li');
+                        tpl_action('register', 1, 'li');
+                        tpl_action('login', 1, 'li');
                     ?>
                 </ul>
             </div>
@@ -67,11 +64,9 @@ if (!defined('DOKU_INC')) die();
             </div>
             <ul>
                 <?php
-					tpl_toolsevent('sitetools', array(
-						'recent'    => tpl_action('recent', 1, 'li', 1),
-						'media'     => tpl_action('media', 1, 'li', 1),
-						'index'     => tpl_action('index', 1, 'li', 1),
-					));
+                    tpl_action('recent', 1, 'li');
+                    tpl_action('media', 1, 'li');
+                    tpl_action('index', 1, 'li');
                 ?>
             </ul>
         </div>
-- 
cgit v1.2.3


From 0747f5d729d43516c67c5240a662a68dfb446437 Mon Sep 17 00:00:00 2001
From: ghi <dokuwiki@imz.re>
Date: Tue, 17 Feb 2015 11:38:10 +0100
Subject: event HTML_SHOWREV_OUTPUT

---
 inc/html.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/inc/html.php b/inc/html.php
index 3a93a6604..c87d0ea87 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -232,6 +232,14 @@ function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false
 
     return $ret;
 }
+/**
+ * show a revision warning
+ *
+ * @author Szymon Olewniczak <dokuwiki@imz.re>
+ */
+function html_showrev($data) {
+    print p_locale_xhtml($data);
+}
 
 /**
  * Show a wiki page
@@ -265,7 +273,10 @@ function html_show($txt=null){
         echo '</div></div>';
 
     }else{
-        if ($REV||$DATE_AT) print p_locale_xhtml('showrev');
+        if ($REV||$DATE_AT){
+            $data = 'showrev';
+            trigger_event('HTML_SHOWREV_OUTPUT', $data, 'html_showrev');
+        }
         $html = p_wiki_xhtml($ID,$REV,true,$DATE_AT);
         $html = html_secedit($html,$secedit);
         if($INFO['prependTOC']) $html = tpl_toc(true).$html;
-- 
cgit v1.2.3


From a500e62c4c074fa156db9a5096adee2133176543 Mon Sep 17 00:00:00 2001
From: SC Yoo <dryoo@live.com>
Date: Tue, 17 Feb 2015 23:02:15 +0900
Subject: Normalization is required to manage multibyte characters.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The OSX uses Unicode-NFD so normalization is required to manage multibyte characters.

( http://unicode.org/reports/tr15/ )

If don't do that, DokuWiki can't find the file uploaded from OS X with multibyte filename like '도쿠위키.jpg'
---
 inc/utf8.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/inc/utf8.php b/inc/utf8.php
index f86217686..c6a189490 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -356,7 +356,7 @@ if(!function_exists('utf8_strtolower')){
      * @return string
      */
     function utf8_strtolower($string){
-        if(UTF8_MBSTRING) return mb_strtolower($string,'utf-8');
+        if(UTF8_MBSTRING) return normalizer::normalize(mb_strtolower($string,'utf-8'));
 
         global $UTF8_UPPER_TO_LOWER;
         return strtr($string,$UTF8_UPPER_TO_LOWER);
@@ -1066,11 +1066,11 @@ if(!UTF8_MBSTRING){
             "ｚ"=>"Ｚ","ｙ"=>"Ｙ","ｘ"=>"Ｘ","ｗ"=>"Ｗ","ｖ"=>"Ｖ","ｕ"=>"Ｕ","ｔ"=>"Ｔ","ｓ"=>"Ｓ","ｒ"=>"Ｒ","ｑ"=>"Ｑ",
             "ｐ"=>"Ｐ","ｏ"=>"Ｏ","ｎ"=>"Ｎ","ｍ"=>"Ｍ","ｌ"=>"Ｌ","ｋ"=>"Ｋ","ｊ"=>"Ｊ","ｉ"=>"Ｉ","ｈ"=>"Ｈ","ｇ"=>"Ｇ",
             "ｆ"=>"Ｆ","ｅ"=>"Ｅ","ｄ"=>"Ｄ","ｃ"=>"Ｃ","ｂ"=>"Ｂ","ａ"=>"Ａ","ῳ"=>"ῼ","ῥ"=>"Ῥ","ῡ"=>"Ῡ","ῑ"=>"Ῑ",
-            "ῐ"=>"Ῐ","ῃ"=>"ῌ","ι"=>"Ι","ᾳ"=>"ᾼ","ᾱ"=>"Ᾱ","ᾰ"=>"Ᾰ","ᾧ"=>"ᾯ","ᾦ"=>"ᾮ","ᾥ"=>"ᾭ","ᾤ"=>"ᾬ",
+            "ῐ"=>"Ῐ","ῃ"=>"ῌ","ι"=>"Ι","ᾳ"=>"ᾼ","ᾱ"=>"Ᾱ","ᾰ"=>"Ᾰ","ᾧ"=>"ᾯ","ᾦ"=>"ᾮ","ᾥ"=>"ᾭ","ᾤ"=>"ᾬ",
             "ᾣ"=>"ᾫ","ᾢ"=>"ᾪ","ᾡ"=>"ᾩ","ᾗ"=>"ᾟ","ᾖ"=>"ᾞ","ᾕ"=>"ᾝ","ᾔ"=>"ᾜ","ᾓ"=>"ᾛ","ᾒ"=>"ᾚ","ᾑ"=>"ᾙ",
-            "ᾐ"=>"ᾘ","ᾇ"=>"ᾏ","ᾆ"=>"ᾎ","ᾅ"=>"ᾍ","ᾄ"=>"ᾌ","ᾃ"=>"ᾋ","ᾂ"=>"ᾊ","ᾁ"=>"ᾉ","ᾀ"=>"ᾈ","ώ"=>"Ώ",
-            "ὼ"=>"Ὼ","ύ"=>"Ύ","ὺ"=>"Ὺ","ό"=>"Ό","ὸ"=>"Ὸ","ί"=>"Ί","ὶ"=>"Ὶ","ή"=>"Ή","ὴ"=>"Ὴ","έ"=>"Έ",
-            "ὲ"=>"Ὲ","ά"=>"Ά","ὰ"=>"Ὰ","ὧ"=>"Ὧ","ὦ"=>"Ὦ","ὥ"=>"Ὥ","ὤ"=>"Ὤ","ὣ"=>"Ὣ","ὢ"=>"Ὢ","ὡ"=>"Ὡ",
+            "ᾐ"=>"ᾘ","ᾇ"=>"ᾏ","ᾆ"=>"ᾎ","ᾅ"=>"ᾍ","ᾄ"=>"ᾌ","ᾃ"=>"ᾋ","ᾂ"=>"ᾊ","ᾁ"=>"ᾉ","ᾀ"=>"ᾈ","ώ"=>"Ώ",
+            "ὼ"=>"Ὼ","ύ"=>"Ύ","ὺ"=>"Ὺ","ό"=>"Ό","ὸ"=>"Ὸ","ί"=>"Ί","ὶ"=>"Ὶ","ή"=>"Ή","ὴ"=>"Ὴ","έ"=>"Έ",
+            "ὲ"=>"Ὲ","ά"=>"Ά","ὰ"=>"Ὰ","ὧ"=>"Ὧ","ὦ"=>"Ὦ","ὥ"=>"Ὥ","ὤ"=>"Ὤ","ὣ"=>"Ὣ","ὢ"=>"Ὢ","ὡ"=>"Ὡ",
             "ὗ"=>"Ὗ","ὕ"=>"Ὕ","ὓ"=>"Ὓ","ὑ"=>"Ὑ","ὅ"=>"Ὅ","ὄ"=>"Ὄ","ὃ"=>"Ὃ","ὂ"=>"Ὂ","ὁ"=>"Ὁ","ὀ"=>"Ὀ",
             "ἷ"=>"Ἷ","ἶ"=>"Ἶ","ἵ"=>"Ἵ","ἴ"=>"Ἴ","ἳ"=>"Ἳ","ἲ"=>"Ἲ","ἱ"=>"Ἱ","ἰ"=>"Ἰ","ἧ"=>"Ἧ","ἦ"=>"Ἦ",
             "ἥ"=>"Ἥ","ἤ"=>"Ἤ","ἣ"=>"Ἣ","ἢ"=>"Ἢ","ἡ"=>"Ἡ","ἕ"=>"Ἕ","ἔ"=>"Ἔ","ἓ"=>"Ἓ","ἒ"=>"Ἒ","ἑ"=>"Ἑ",
@@ -1145,11 +1145,11 @@ if(!UTF8_MBSTRING){
             "Ｚ"=>"ｚ","Ｙ"=>"ｙ","Ｘ"=>"ｘ","Ｗ"=>"ｗ","Ｖ"=>"ｖ","Ｕ"=>"ｕ","Ｔ"=>"ｔ","Ｓ"=>"ｓ","Ｒ"=>"ｒ","Ｑ"=>"ｑ",
             "Ｐ"=>"ｐ","Ｏ"=>"ｏ","Ｎ"=>"ｎ","Ｍ"=>"ｍ","Ｌ"=>"ｌ","Ｋ"=>"ｋ","Ｊ"=>"ｊ","Ｉ"=>"ｉ","Ｈ"=>"ｈ","Ｇ"=>"ｇ",
             "Ｆ"=>"ｆ","Ｅ"=>"ｅ","Ｄ"=>"ｄ","Ｃ"=>"ｃ","Ｂ"=>"ｂ","Ａ"=>"ａ","ῼ"=>"ῳ","Ῥ"=>"ῥ","Ῡ"=>"ῡ","Ῑ"=>"ῑ",
-            "Ῐ"=>"ῐ","ῌ"=>"ῃ","Ι"=>"ι","ᾼ"=>"ᾳ","Ᾱ"=>"ᾱ","Ᾰ"=>"ᾰ","ᾯ"=>"ᾧ","ᾮ"=>"ᾦ","ᾭ"=>"ᾥ","ᾬ"=>"ᾤ",
+            "Ῐ"=>"ῐ","ῌ"=>"ῃ","Ι"=>"ι","ᾼ"=>"ᾳ","Ᾱ"=>"ᾱ","Ᾰ"=>"ᾰ","ᾯ"=>"ᾧ","ᾮ"=>"ᾦ","ᾭ"=>"ᾥ","ᾬ"=>"ᾤ",
             "ᾫ"=>"ᾣ","ᾪ"=>"ᾢ","ᾩ"=>"ᾡ","ᾟ"=>"ᾗ","ᾞ"=>"ᾖ","ᾝ"=>"ᾕ","ᾜ"=>"ᾔ","ᾛ"=>"ᾓ","ᾚ"=>"ᾒ","ᾙ"=>"ᾑ",
-            "ᾘ"=>"ᾐ","ᾏ"=>"ᾇ","ᾎ"=>"ᾆ","ᾍ"=>"ᾅ","ᾌ"=>"ᾄ","ᾋ"=>"ᾃ","ᾊ"=>"ᾂ","ᾉ"=>"ᾁ","ᾈ"=>"ᾀ","Ώ"=>"ώ",
-            "Ὼ"=>"ὼ","Ύ"=>"ύ","Ὺ"=>"ὺ","Ό"=>"ό","Ὸ"=>"ὸ","Ί"=>"ί","Ὶ"=>"ὶ","Ή"=>"ή","Ὴ"=>"ὴ","Έ"=>"έ",
-            "Ὲ"=>"ὲ","Ά"=>"ά","Ὰ"=>"ὰ","Ὧ"=>"ὧ","Ὦ"=>"ὦ","Ὥ"=>"ὥ","Ὤ"=>"ὤ","Ὣ"=>"ὣ","Ὢ"=>"ὢ","Ὡ"=>"ὡ",
+            "ᾘ"=>"ᾐ","ᾏ"=>"ᾇ","ᾎ"=>"ᾆ","ᾍ"=>"ᾅ","ᾌ"=>"ᾄ","ᾋ"=>"ᾃ","ᾊ"=>"ᾂ","ᾉ"=>"ᾁ","ᾈ"=>"ᾀ","Ώ"=>"ώ",
+            "Ὼ"=>"ὼ","Ύ"=>"ύ","Ὺ"=>"ὺ","Ό"=>"ό","Ὸ"=>"ὸ","Ί"=>"ί","Ὶ"=>"ὶ","Ή"=>"ή","Ὴ"=>"ὴ","Έ"=>"έ",
+            "Ὲ"=>"ὲ","Ά"=>"ά","Ὰ"=>"ὰ","Ὧ"=>"ὧ","Ὦ"=>"ὦ","Ὥ"=>"ὥ","Ὤ"=>"ὤ","Ὣ"=>"ὣ","Ὢ"=>"ὢ","Ὡ"=>"ὡ",
             "Ὗ"=>"ὗ","Ὕ"=>"ὕ","Ὓ"=>"ὓ","Ὑ"=>"ὑ","Ὅ"=>"ὅ","Ὄ"=>"ὄ","Ὃ"=>"ὃ","Ὂ"=>"ὂ","Ὁ"=>"ὁ","Ὀ"=>"ὀ",
             "Ἷ"=>"ἷ","Ἶ"=>"ἶ","Ἵ"=>"ἵ","Ἴ"=>"ἴ","Ἳ"=>"ἳ","Ἲ"=>"ἲ","Ἱ"=>"ἱ","Ἰ"=>"ἰ","Ἧ"=>"ἧ","Ἦ"=>"ἦ",
             "Ἥ"=>"ἥ","Ἤ"=>"ἤ","Ἣ"=>"ἣ","Ἢ"=>"ἢ","Ἡ"=>"ἡ","Ἕ"=>"ἕ","Ἔ"=>"ἔ","Ἓ"=>"ἓ","Ἒ"=>"ἒ","Ἑ"=>"ἑ",
@@ -1355,11 +1355,11 @@ global $UTF8_SPECIAL_CHARS2;
 if(empty($UTF8_SPECIAL_CHARS2)) $UTF8_SPECIAL_CHARS2 =
     "\x1A".' !"#$%&\'()+,/;<=>?@[\]^`{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•�'.
     '�—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½�'.
-    '�¿×÷ˇ˘˙˚˛˜˝̣̀́̃̉΄΅·ϖְֱֲֳִֵֶַָֹֻּֽ־ֿ�'.
+    '�¿×÷ˇ˘˙˚˛˜˝̣̀́̃̉΄΅·ϖְֱֲֳִֵֶַָֹֻּֽ־ֿ�'.
     '�ׁׂ׃׳״،؛؟ـًٌٍَُِّْ٪฿‌‍‎‏–—―‗‘’‚“”�'.
-    '��†‡•…‰′″‹›⁄₧₪₫€№℘™Ωℵ←↑→↓↔↕↵'.
+    '��†‡•…‰′″‹›⁄₧₪₫€№℘™Ωℵ←↑→↓↔↕↵'.
     '⇐⇑⇒⇓⇔∀∂∃∅∆∇∈∉∋∏∑−∕∗∙√∝∞∠∧∨�'.
-    '�∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌐⌠⌡〈〉⑩─�'.
+    '�∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌐⌠⌡〈〉⑩─�'.
     '��┌┐└┘├┤┬┴┼═║╒╓╔╕╖╗╘╙╚╛╜╝╞╟╠'.
     '╡╢╣╤╥╦╧╨╩╪╫╬▀▄█▌▐░▒▓■▲▼◆◊●�'.
     '�★☎☛☞♠♣♥♦✁✂✃✄✆✇✈✉✌✍✎✏✐✑✒✓✔✕�'.
-- 
cgit v1.2.3


From c8556525035212e8abf05907e8cfdf290bb6dcd6 Mon Sep 17 00:00:00 2001
From: ghi <dokuwiki@imz.re>
Date: Wed, 18 Feb 2015 10:47:05 +0100
Subject: passing rev and date_at to the event

---
 inc/html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/html.php b/inc/html.php
index c87d0ea87..4bf784502 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -237,8 +237,8 @@ function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false
  *
  * @author Szymon Olewniczak <dokuwiki@imz.re>
  */
-function html_showrev($data) {
-    print p_locale_xhtml($data);
+function html_showrev() {
+    print p_locale_xhtml('showrev');
 }
 
 /**
@@ -274,7 +274,7 @@ function html_show($txt=null){
 
     }else{
         if ($REV||$DATE_AT){
-            $data = 'showrev';
+            $data = array('rev' => &$REV, 'date_at' => &$DATE_AT);
             trigger_event('HTML_SHOWREV_OUTPUT', $data, 'html_showrev');
         }
         $html = p_wiki_xhtml($ID,$REV,true,$DATE_AT);
-- 
cgit v1.2.3


From 5a93f8690b91ddfa9a37a081f72d245833b4aefa Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@zopa.com>
Date: Thu, 19 Feb 2015 20:10:45 +0000
Subject: add missing tabletbody_open|close() to renderer

---
 inc/parser/renderer.php | 12 ++++++++++++
 inc/parser/xhtml.php    | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index e1d28267a..35bdd0e3f 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -707,6 +707,18 @@ class Doku_Renderer extends DokuWiki_Plugin {
     function tablethead_close() {
     }
 
+    /**
+     * Open a table body
+     */
+    function tabletbody_open() {
+    }
+
+    /**
+     * Close a table body
+     */
+    function tabletbody_close() {
+    }
+
     /**
      * Open a table row
      */
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index c68d206be..d1bf91a02 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1289,6 +1289,20 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $this->doc .= DOKU_TAB.'</thead>'.DOKU_LF;
     }
 
+    /**
+     * Open a table body
+     */
+    function tabletbody_open() {
+        $this->doc .= DOKU_TAB.'<tbody>'.DOKU_LF;
+    }
+
+    /**
+     * Close a table body
+     */
+    function tabletbody_close() {
+        $this->doc .= DOKU_TAB.'</tbody>'.DOKU_LF;
+    }
+
     /**
      * Open a table row
      */
@@ -1753,7 +1767,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $out .= '</audio>'.NL;
         return $out;
     }
-    
+
     /**
      * _getLastMediaRevisionAt is a helperfunction to internalmedia() and _media()
      * which returns an existing media revision less or equal to rev or date_at
-- 
cgit v1.2.3


From 8a8104b258a296c2710caf2911b87403c9ef3d97 Mon Sep 17 00:00:00 2001
From: SC Yoo <dryoo@live.com>
Date: Fri, 20 Feb 2015 12:14:07 +0900
Subject: Added class-exitsts

---
 inc/utf8.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/utf8.php b/inc/utf8.php
index c6a189490..2b6a0c498 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -356,8 +356,12 @@ if(!function_exists('utf8_strtolower')){
      * @return string
      */
     function utf8_strtolower($string){
-        if(UTF8_MBSTRING) return normalizer::normalize(mb_strtolower($string,'utf-8'));
-
+        if(UTF8_MBSTRING) {
+            if (class_exists("Normalizer", $autoload = false)) 
+                return normalizer::normalize(mb_strtolower($string,'utf-8'));
+            else
+                return (mb_strtolower($string,'utf-8'));
+        }
         global $UTF8_UPPER_TO_LOWER;
         return strtr($string,$UTF8_UPPER_TO_LOWER);
     }
-- 
cgit v1.2.3


From 15a61525c6586054213c7f64cc6e686d7dc8eed0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 24 Feb 2015 09:48:55 +0100
Subject: add bottom margin to tables in print. fixes #1052

---
 lib/tpl/dokuwiki/css/print.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index 86e686b69..7197ac1c1 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -111,6 +111,9 @@ blockquote {
 }
 
 /* tables */
+.dokuwiki div.table {
+    margin-bottom: 1.4em;
+}
 table {
     border-collapse: collapse;
     empty-cells: show;
-- 
cgit v1.2.3


From 30c466355a6686ac20edc1f23d87a3a8c8ec6081 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 24 Feb 2015 09:57:10 +0100
Subject: fixed the margin for the sidebar

---
 lib/tpl/dokuwiki/css/design.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 3ded73581..548ba7228 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -11,7 +11,7 @@
 ********************************************************************/
 
 #dokuwiki__header {
-    padding: 2em 0 0;
+    padding: 2em 0 1.5em;
 
     .headings,
     .tools {
@@ -352,6 +352,7 @@ form.search {
     float: right;
     margin-right: -1em;
     margin-bottom: -1px;
+    margin-top: -1.5em;
     overflow: hidden;
     padding: 0.5em 1em 0;
 
-- 
cgit v1.2.3


From 757f6ddab0add1026d4b4afb980fbd244df05f02 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 24 Feb 2015 11:51:36 +0100
Subject: simple fix for pageID clash with sidebar in mobile view

Since the pageid is no longer positioned absolute it clashed with the
sidebar since #1027. this introduces a very simplisitc fix.
---
 lib/tpl/dokuwiki/css/mobile.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index c3e517795..ac7c46456 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -23,6 +23,7 @@
 #dokuwiki__aside {
     width: 100%;
     float: none;
+    margin-bottom: 1.5em;
 }
 
 #dokuwiki__aside > .pad,
-- 
cgit v1.2.3


From 9cbf80e627322dee19852b953ef242b4e0ad514a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 24 Feb 2015 19:45:03 +0100
Subject: check permissions in ACL plugin's RPC API component. #1056

Security Fix

Severity: Medium
Type:     Remote Priviledge Escalation
Remote:   yes

Vulnerability Details:

This fixes a security hole in the ACL plugins remote API component. The
plugin failed to check for superuser permissions before executing ACL
addition or deletion. This means everybody with permissions to call the
XMLRPC API also had permissions to set up their own ACL rules and thus
circumventing any existing rules.

Risk Assessment:

The XMLRPC API in DokuWiki is marked experimental and off by default. It
also implements an additional safeguard by giving access to a configured
circle of users and groups only. So only a minor number of DokuWiki
installations will be affected at all.
For affected installations the risk is high if users with access to the
API are not to be trusted.
Thus the overall severity of medium.

Resolution:

Installations applying this commit are safe. A hotfix is about to be
released. Meanwhile users are advised to disable the XMLRPC API in the
config manager.
---
 lib/plugins/acl/remote.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index b10c544ee..42449428f 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -32,9 +32,14 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
      * @param string $scope
      * @param string $user
      * @param int    $level see also inc/auth.php
+     * @throws RemoteAccessDeniedException
      * @return bool
      */
     public function addAcl($scope, $user, $level){
+        if(!auth_isadmin()) {
+            throw new RemoteAccessDeniedException('You are not allowed to access ACLs, superuser permission is required', 114);
+        }
+
         /** @var admin_plugin_acl $apa */
         $apa = plugin_load('admin', 'acl');
         return $apa->_acl_add($scope, $user, $level);
@@ -45,9 +50,14 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
      *
      * @param string $scope
      * @param string $user
+     * @throws RemoteAccessDeniedException
      * @return bool
      */
     public function delAcl($scope, $user){
+        if(!auth_isadmin()) {
+            throw new RemoteAccessDeniedException('You are not allowed to access ACLs, superuser permission is required', 114);
+        }
+
         /** @var admin_plugin_acl $apa */
         $apa = plugin_load('admin', 'acl');
         return $apa->_acl_del($scope, $user);
-- 
cgit v1.2.3


From 6401de3d8cba9f2c76724a2c2c68c7d3fc97d2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Schplurtz=20le=20D=C3=A9boulonn=C3=A9?=
 <schplurtz@laposte.net>
Date: Tue, 24 Feb 2015 22:16:02 +0100
Subject: translation update

---
 inc/lang/fr/lang.php                      | 2 +-
 lib/plugins/authldap/lang/fr/settings.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 9deff1220..fb3890c9e 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -228,7 +228,7 @@ $lang['restored']              = 'ancienne révision (%s) restaurée';
 $lang['external_edit']         = 'modification externe';
 $lang['summary']               = 'Résumé';
 $lang['noflash']               = 'L\'<a href="http://www.adobe.com/products/flashplayer/">extension Adobe Flash</a> est nécessaire pour afficher ce contenu.';
-$lang['download']              = 'Télécharger un extrait';
+$lang['download']              = 'Télécharger cet extrait';
 $lang['tools']                 = 'Outils';
 $lang['user_tools']            = 'Outils pour utilisateurs';
 $lang['site_tools']            = 'Outils du site';
diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php
index dc475071e..aa75105cf 100644
--- a/lib/plugins/authldap/lang/fr/settings.php
+++ b/lib/plugins/authldap/lang/fr/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  * @author schplurtz <Schplurtz@laposte.net>
+ * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
  */
 $lang['server']                = 'Votre serveur LDAP. Soit le nom d\'hôte (<code>localhost</code>) ou l\'URL complète (<code>ldap://serveur.dom:389</code>)';
 $lang['port']                  = 'Port du serveur LDAP si l\'URL complète n\'a pas été indiquée ci-dessus';
@@ -26,3 +27,6 @@ $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'comportement par défaut';
+$lang['referrals_o_0']         = 'ne pas suivre les références';
+$lang['referrals_o_1']         = 'suivre les références';
-- 
cgit v1.2.3


From a2e737c4fece56318728021edca1cc40c1d1adb6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 25 Feb 2015 09:41:15 +0100
Subject: remove additional sidebar bottom margin in phone mode

---
 lib/tpl/dokuwiki/css/mobile.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index ac7c46456..e5e13e221 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -159,6 +159,11 @@ body {
         padding: 0 .5em;
     }
 }
+
+#dokuwiki__aside {
+    margin-bottom: 0;
+}
+
 #dokuwiki__header {
     padding: .5em 0;
 }
-- 
cgit v1.2.3


From 6619ddf4b04390e1d1273dd79bd16bfb9eb6cf89 Mon Sep 17 00:00:00 2001
From: Sascha Klopp <klopp@rrzn.uni-hannover.de>
Date: Tue, 3 Mar 2015 11:09:21 +0100
Subject: Two new authldap config options: 'userkey' denotes the LDAP attribute
 holding the username, 'modPass' allows to disable password changing by the
 user.

---
 lib/plugins/authldap/auth.php             | 5 +++--
 lib/plugins/authldap/conf/default.php     | 4 +++-
 lib/plugins/authldap/conf/metadata.php    | 4 +++-
 lib/plugins/authldap/lang/de/settings.php | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index 50735882f..9d031c049 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -37,7 +37,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
         }
 
         // Add the capabilities to change the password
-        $this->cando['modPass'] = true;
+        $this->cando['modPass'] = $this->getConf('modPass');
     }
 
     /**
@@ -360,8 +360,9 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
             $sr          = ldap_search($this->con, $this->getConf('usertree'), $all_filter);
             $entries     = ldap_get_entries($this->con, $sr);
             $users_array = array();
+            $userkey     = $this->getConf('userkey');
             for($i = 0; $i < $entries["count"]; $i++) {
-                array_push($users_array, $entries[$i]["uid"][0]);
+                array_push($users_array, $entries[$i][$userkey][0]);
             }
             asort($users_array);
             $result = $users_array;
diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
index c2e462c5c..116cb9d3f 100644
--- a/lib/plugins/authldap/conf/default.php
+++ b/lib/plugins/authldap/conf/default.php
@@ -16,5 +16,7 @@ $conf['bindpw']      = '';
 //$conf['mapping']['grps']  unsupported in config manager
 $conf['userscope']  = 'sub';
 $conf['groupscope'] = 'sub';
+$conf['userkey']    = 'uid';
 $conf['groupkey']   = 'cn';
-$conf['debug']      = 0;
\ No newline at end of file
+$conf['debug']      = 0;
+$conf['modPass']    = 1;
diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index 4649ba5bf..a67b11ca6 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -15,5 +15,7 @@ $meta['bindpw']      = array('password','_caution' => 'danger');
 //$meta['mapping']['grps']  unsupported in config manager
 $meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
 $meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['userkey']     = array('string','_caution' => 'danger');
 $meta['groupkey']    = array('string','_caution' => 'danger');
-$meta['debug']       = array('onoff','_caution' => 'security');
\ No newline at end of file
+$meta['debug']       = array('onoff','_caution' => 'security');
+$meta['modPass']     = array('onoff');
diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index d788da876..ecb407820 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -20,6 +20,7 @@ $lang['binddn']                = 'DN eines optionalen Benutzers, wenn der anonym
 $lang['bindpw']                = 'Passwort des angegebenen Benutzers.';
 $lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
 $lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
+$lang['userkey']               = 'Attribut, das den Benutzernamen enthält; muss konsistent zum userfilter sein.';
 $lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
 $lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
-- 
cgit v1.2.3


From 138a9500555ab0f27ce3fd67d3ea3ab17f8e9e3b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 3 Mar 2015 17:19:43 +0100
Subject: send JavaScript with correct mimetype

While Browsers (IE of course) still fail to accept the correct
application/javascript mimetype in the type attribute of the script
element, we should serve the scripts with the correct Content-Type
header at least. This is especially important as the default
configuration of mod_deflate expects application/javascript and will not
compress text/javascript.
---
 lib/exe/js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 3f9781e34..06d0dda55 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -14,7 +14,7 @@ require_once(DOKU_INC.'inc/init.php');
 
 // Main (don't run when UNIT test)
 if(!defined('SIMPLE_TEST')){
-    header('Content-Type: text/javascript; charset=utf-8');
+    header('Content-Type: application/javascript; charset=utf-8');
     js_out();
 }
 
-- 
cgit v1.2.3


From 25f80763dd71190679289de2b8d29f28021aedb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Wed, 11 Mar 2015 19:49:14 +0100
Subject: Get total number of users in ad, needed for paging

---
 lib/plugins/authad/auth.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 88b56046c..a0a1143db 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -116,6 +116,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         // other can do's are changed in $this->_loadServerConfig() base on domain setup
         $this->cando['modName'] = true;
         $this->cando['modMail'] = true;
+        $this->cando['getUserCount'] = true;
     }
 
     /**
@@ -325,6 +326,26 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         return false;
     }
 
+    /**
+     * @param array $filter
+     * @return int
+     */
+    public function getUserCount($filter = array()) {
+
+        $adldap = $this->_adldap(null);
+        if(!$adldap) {
+            dbglog("authad/auth.php: _adldap not set.");
+            return -1;
+        }
+
+        $result = $adldap->user()->all();
+        if (!$result) {
+            dbglog("authad/auth.php: getting all users failed.");
+            return -1;
+        }
+        return count($result);
+    }
+
     /**
      * Bulk retrieval of user data
      *
-- 
cgit v1.2.3


From 67a31a83dd6c8a3ff9e87da0c2070a2783aec44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 12 Mar 2015 13:09:08 +0100
Subject: Create and use ad search for user, name and email

---
 lib/plugins/authad/auth.php       | 68 ++++++++++++++++++++++++++++++++-------
 lib/plugins/usermanager/admin.php | 14 ++++++++
 2 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index a0a1143db..f1f34245e 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -326,19 +326,63 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         return false;
     }
 
+    protected function _constructSearchString($filter){
+        if (!$filter){
+            return '*';
+        }
+        $result = '*';
+        if (isset($filter['name'])) {
+            $result .= ')(displayname=*' . $filter['name'] . '*';
+            unset($filter['name']);
+        }
+        if (isset($filter['user'])) {
+            $result .= ')(samAccountName=*' . $filter['user'] . '*';
+            unset($filter['user']);
+        }
+
+        if (isset($filter['mail'])) {
+            $result .= ')(mail=*' . $filter['mail'] . '*';
+            unset($filter['mail']);
+        }
+        dbglog($result);
+        return $result;
+    }
+
     /**
      * @param array $filter
      * @return int
      */
     public function getUserCount($filter = array()) {
+        if ($filter == array()) {
+            $adldap = $this->_adldap(null);
+            if(!$adldap) {
+                dbglog("authad/auth.php getUserCount(): _adldap not set.");
+                return -1;
+            }
+            $result = $adldap->user()->all();
+            $start = 0;
+        } else {/*
+            dbglog('_startcache: ' . $this->_startcache);
+            $usermanager = plugin_load("admin", "usermanager", false);
+            if ($this->_startcache < $usermanager->getStart()) {
+                $start = $usermanager->getStart();
+                $this->_startcache = $start;
+            } else {
+                $start = $this->_startcache;
+            }
+            $pagesize = $usermanager->getPagesize();
+            $result = $this->retrieveUsers($start, 3*$pagesize,$filter,false);*/
+            $adldap = $this->_adldap(null);
+            if(!$adldap) {
+                dbglog("authad/auth.php getUserCount(): _adldap not set.");
+                return -1;
+            }
+            dbglog($filter);
+            $searchString = $this->_constructSearchString($filter);
+            $result = $adldap->user()->all(false, $searchString);
 
-        $adldap = $this->_adldap(null);
-        if(!$adldap) {
-            dbglog("authad/auth.php: _adldap not set.");
-            return -1;
         }
 
-        $result = $adldap->user()->all();
         if (!$result) {
             dbglog("authad/auth.php: getting all users failed.");
             return -1;
@@ -351,18 +395,20 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      *
      * @author  Dominik Eckelmann <dokuwiki@cosmocode.de>
      *
-     * @param   int   $start     index of first user to be returned
-     * @param   int   $limit     max number of users to be returned
-     * @param   array $filter    array of field/pattern pairs, null for no filter
-     * @return  array userinfo (refer getUserData for internal userinfo details)
+     * @param   int $start index of first user to be returned
+     * @param   int $limit max number of users to be returned
+     * @param   array $filter array of field/pattern pairs, null for no filter
+     * @param   bool $setStart
+     * @return array userinfo (refer getUserData for internal userinfo details)
      */
-    public function retrieveUsers($start = 0, $limit = 0, $filter = array()) {
+    public function retrieveUsers($start = 0, $limit = 0, $filter = array(), $setStart = true) {
+        dbglog("start: " . $start . "; limit: " . $limit);
         $adldap = $this->_adldap(null);
         if(!$adldap) return false;
 
         if(!$this->users) {
             //get info for given user
-            $result = $adldap->user()->all();
+            $result = $adldap->user()->all(false, $this->_constructSearchString($filter));
             if (!$result) return array();
             $this->users = array_fill_keys($result, false);
         }
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 86562f1dd..b1f5c4023 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -81,6 +81,20 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return 2;
     }
 
+    /**
+     * @return int current start value for pageination
+     */
+    public function getStart() {
+        return $this->_start;
+    }
+
+    /**
+     * @return int number of users per page
+     */
+    public function getPagesize() {
+        return $this->_pagesize;
+    }
+
     /**
      * Handle user request
      *
-- 
cgit v1.2.3


From c52f6cd2bf68bccfbc665f376f68c93861a99837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 12 Mar 2015 14:50:23 +0100
Subject: When filtering for group implement prefetching

---
 lib/plugins/authad/auth.php | 82 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index f1f34245e..2710d6a17 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -67,6 +67,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      */
     protected $_pattern = array();
 
+    protected $_actualstart = 0;
+
+    protected $_grpsusers = array();
+
     /**
      * Constructor
      */
@@ -380,6 +384,16 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
             dbglog($filter);
             $searchString = $this->_constructSearchString($filter);
             $result = $adldap->user()->all(false, $searchString);
+            if (isset($filter['grps'])) {
+                $this->users = array_fill_keys($result, false);
+                $usermanager = plugin_load("admin", "usermanager", false);
+                if (!isset($this->_grpsusers[$this->_filterToString($filter)])){
+                    $this->_fillGroupUserArray($filter,$usermanager->getStart() + 3*$usermanager->getPagesize());
+                } elseif (count($this->_grpsusers[$this->_filterToString($filter)]) < getStart() + 3*$usermanager->getPagesize()) {
+                    $this->_fillGroupUserArray($filter,$usermanager->getStart() + 3*$usermanager->getPagesize() - count($this->_grpsusers[$this->_filterToString($filter)]));
+                }
+                $result = $this->_grpsusers[$this->_filterToString($filter)];
+            }
 
         }
 
@@ -390,6 +404,44 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         return count($result);
     }
 
+    protected function _filterToString ($filter) {
+        $result = '';
+        if (isset($filter['user'])) {
+            $result .= 'user-' . $filter['user'];
+        }
+        if (isset($filter['name'])) {
+            $result .= 'name-' . $filter['name'];
+        }
+        if (isset($filter['mail'])) {
+            $result .= 'mail-' . $filter['mail'];
+        }
+        if (isset($filter['grps'])) {
+            $result .= 'grps-' . $filter['grps'];
+        }
+        return $result;
+    }
+
+    protected function _fillGroupUserArray($filter, $numberOfAdds){
+        $this->_grpsusers[$this->_filterToString($filter)];
+        $i = 0;
+        $count = 0;
+        $this->_constructPattern($filter);
+        foreach ($this->users as $user => &$info) {
+            if($i++ < $this->_actualstart) {
+                continue;
+            }
+            if($info === false) {
+                $info = $this->getUserData($user);
+            }
+            if($this->_filter($user, $info)) {
+                $this->_grpsusers[$this->_filterToString($filter)][$user] = $info;
+                if(($numberOfAdds > 0) && (++$count >= $numberOfAdds)) break;
+            }
+        }
+        $this->_actualstart = $i;
+        return $count;
+    }
+
     /**
      * Bulk retrieval of user data
      *
@@ -398,10 +450,9 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * @param   int $start index of first user to be returned
      * @param   int $limit max number of users to be returned
      * @param   array $filter array of field/pattern pairs, null for no filter
-     * @param   bool $setStart
      * @return array userinfo (refer getUserData for internal userinfo details)
      */
-    public function retrieveUsers($start = 0, $limit = 0, $filter = array(), $setStart = true) {
+    public function retrieveUsers($start = 0, $limit = 0, $filter = array()) {
         dbglog("start: " . $start . "; limit: " . $limit);
         $adldap = $this->_adldap(null);
         if(!$adldap) return false;
@@ -418,17 +469,32 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         $this->_constructPattern($filter);
         $result = array();
 
-        foreach($this->users as $user => &$info) {
-            if($i++ < $start) {
-                continue;
+        if (!isset($filter['grps'])) {
+            foreach($this->users as $user => &$info) {
+                if($i++ < $start) {
+                    continue;
+                }
+                if($info === false) {
+                    $info = $this->getUserData($user);
+                }
+                if($this->_filter($user, $info)) {
+                    $result[$user] = $info;
+                    if(($limit > 0) && (++$count >= $limit)) break;
+                }
             }
-            if($info === false) {
-                $info = $this->getUserData($user);
+        } else {
+            if (!isset($this->_grpsusers[$this->_filterToString($filter)]) || count($this->_grpsusers[$this->_filterToString($filter)]) < ($start+$limit)) {
+                $this->_fillGroupUserArray($filter,$start+$limit - count($this->_grpsusers[$this->_filterToString($filter)]) +1);
             }
-            if($this->_filter($user, $info)) {
+            foreach($this->_grpsusers[$this->_filterToString($filter)] as $user => &$info) {
+                dbglog($this->_grpsusers[$this->_filterToString($filter)]);
+                if($i++ < $start) {
+                    continue;
+                }
                 $result[$user] = $info;
                 if(($limit > 0) && (++$count >= $limit)) break;
             }
+
         }
         return $result;
     }
-- 
cgit v1.2.3


From 462e9e37f38d6de9ec19ad1476b64bac3b851fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 12 Mar 2015 15:06:26 +0100
Subject: Disable the ``last`` button when filtering groups

Since we cannot effectively filter for groups and have to work with
incremental prefetching, the ``last`` button is mostly broken/buggy.
Hence it is disabled in this usecase.
---
 lib/plugins/authad/auth.php       |  8 ++++++++
 lib/plugins/usermanager/admin.php | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 2710d6a17..4022cd68f 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -387,12 +387,16 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
             if (isset($filter['grps'])) {
                 $this->users = array_fill_keys($result, false);
                 $usermanager = plugin_load("admin", "usermanager", false);
+                $usermanager->setLastdisabled(true);
                 if (!isset($this->_grpsusers[$this->_filterToString($filter)])){
                     $this->_fillGroupUserArray($filter,$usermanager->getStart() + 3*$usermanager->getPagesize());
                 } elseif (count($this->_grpsusers[$this->_filterToString($filter)]) < getStart() + 3*$usermanager->getPagesize()) {
                     $this->_fillGroupUserArray($filter,$usermanager->getStart() + 3*$usermanager->getPagesize() - count($this->_grpsusers[$this->_filterToString($filter)]));
                 }
                 $result = $this->_grpsusers[$this->_filterToString($filter)];
+            } else {
+                $usermanager = plugin_load("admin", "usermanager", false);
+                $usermanager->setLastdisabled(false);
             }
 
         }
@@ -470,6 +474,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         $result = array();
 
         if (!isset($filter['grps'])) {
+            $usermanager = plugin_load("admin", "usermanager", false);
+            $usermanager->setLastdisabled(false);
             foreach($this->users as $user => &$info) {
                 if($i++ < $start) {
                     continue;
@@ -483,6 +489,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
                 }
             }
         } else {
+            $usermanager = plugin_load("admin", "usermanager", false);
+            $usermanager->setLastdisabled(true);
             if (!isset($this->_grpsusers[$this->_filterToString($filter)]) || count($this->_grpsusers[$this->_filterToString($filter)]) < ($start+$limit)) {
                 $this->_fillGroupUserArray($filter,$start+$limit - count($this->_grpsusers[$this->_filterToString($filter)]) +1);
             }
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index b1f5c4023..cc4c4ae47 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -31,6 +31,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     protected $_edit_userdata = array();
     protected $_disabled = '';      // if disabled set to explanatory string
     protected $_import_failures = array();
+    protected $_lastdisabled = false; // set to true if last user is unknown and last button is hence buggy
 
     /**
      * Constructor
@@ -95,6 +96,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         return $this->_pagesize;
     }
 
+    /**
+     * @param boolean $lastdisabled
+     */
+    public function setLastdisabled($lastdisabled) {
+        $this->_lastdisabled = $lastdisabled;
+    }
+
     /**
      * Handle user request
      *
@@ -850,6 +858,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             $buttons['last'] = $buttons['next'] = (($this->_start + $this->_pagesize) >= $this->_user_total) ? $disabled : '';
         }
 
+        if ($this->_lastdisabled) {
+            $buttons['last'] = $disabled;
+        }
+
         return $buttons;
     }
 
-- 
cgit v1.2.3


From 6fcf992c3420a8904add8169cfd672407a7c38d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 12 Mar 2015 16:00:26 +0100
Subject: Clean up code, add phpdoc comments, some refactoring, etc.

---
 lib/plugins/authad/auth.php | 62 ++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 4022cd68f..bcf01ff21 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -330,6 +330,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         return false;
     }
 
+    /**
+     * @param array $filter
+     * @return string
+     */
     protected function _constructSearchString($filter){
         if (!$filter){
             return '*';
@@ -348,7 +352,6 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
             $result .= ')(mail=*' . $filter['mail'] . '*';
             unset($filter['mail']);
         }
-        dbglog($result);
         return $result;
     }
 
@@ -357,31 +360,14 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * @return int
      */
     public function getUserCount($filter = array()) {
+        $adldap = $this->_adldap(null);
+        if(!$adldap) {
+            dbglog("authad/auth.php getUserCount(): _adldap not set.");
+            return -1;
+        }
         if ($filter == array()) {
-            $adldap = $this->_adldap(null);
-            if(!$adldap) {
-                dbglog("authad/auth.php getUserCount(): _adldap not set.");
-                return -1;
-            }
             $result = $adldap->user()->all();
-            $start = 0;
-        } else {/*
-            dbglog('_startcache: ' . $this->_startcache);
-            $usermanager = plugin_load("admin", "usermanager", false);
-            if ($this->_startcache < $usermanager->getStart()) {
-                $start = $usermanager->getStart();
-                $this->_startcache = $start;
-            } else {
-                $start = $this->_startcache;
-            }
-            $pagesize = $usermanager->getPagesize();
-            $result = $this->retrieveUsers($start, 3*$pagesize,$filter,false);*/
-            $adldap = $this->_adldap(null);
-            if(!$adldap) {
-                dbglog("authad/auth.php getUserCount(): _adldap not set.");
-                return -1;
-            }
-            dbglog($filter);
+        } else {
             $searchString = $this->_constructSearchString($filter);
             $result = $adldap->user()->all(false, $searchString);
             if (isset($filter['grps'])) {
@@ -390,7 +376,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
                 $usermanager->setLastdisabled(true);
                 if (!isset($this->_grpsusers[$this->_filterToString($filter)])){
                     $this->_fillGroupUserArray($filter,$usermanager->getStart() + 3*$usermanager->getPagesize());
-                } elseif (count($this->_grpsusers[$this->_filterToString($filter)]) < getStart() + 3*$usermanager->getPagesize()) {
+                } elseif (count($this->_grpsusers[$this->_filterToString($filter)]) < $usermanager->getStart() + 3*$usermanager->getPagesize()) {
                     $this->_fillGroupUserArray($filter,$usermanager->getStart() + 3*$usermanager->getPagesize() - count($this->_grpsusers[$this->_filterToString($filter)]));
                 }
                 $result = $this->_grpsusers[$this->_filterToString($filter)];
@@ -402,12 +388,18 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         }
 
         if (!$result) {
-            dbglog("authad/auth.php: getting all users failed.");
-            return -1;
+            return 0;
         }
         return count($result);
     }
 
+    /**
+     *
+     * create a unique string for each filter used with a group
+     *
+     * @param array $filter
+     * @return string
+     */
     protected function _filterToString ($filter) {
         $result = '';
         if (isset($filter['user'])) {
@@ -425,6 +417,11 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         return $result;
     }
 
+    /**
+     * @param array $filter
+     * @param int $numberOfAdds additional number of users requested
+     * @return int number of Users actually add to Array
+     */
     protected function _fillGroupUserArray($filter, $numberOfAdds){
         $this->_grpsusers[$this->_filterToString($filter)];
         $i = 0;
@@ -457,7 +454,6 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * @return array userinfo (refer getUserData for internal userinfo details)
      */
     public function retrieveUsers($start = 0, $limit = 0, $filter = array()) {
-        dbglog("start: " . $start . "; limit: " . $limit);
         $adldap = $this->_adldap(null);
         if(!$adldap) return false;
 
@@ -470,12 +466,12 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
 
         $i     = 0;
         $count = 0;
-        $this->_constructPattern($filter);
         $result = array();
 
         if (!isset($filter['grps'])) {
             $usermanager = plugin_load("admin", "usermanager", false);
             $usermanager->setLastdisabled(false);
+            $this->_constructPattern($filter);
             foreach($this->users as $user => &$info) {
                 if($i++ < $start) {
                     continue;
@@ -483,10 +479,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
                 if($info === false) {
                     $info = $this->getUserData($user);
                 }
-                if($this->_filter($user, $info)) {
-                    $result[$user] = $info;
-                    if(($limit > 0) && (++$count >= $limit)) break;
-                }
+                $result[$user] = $info;
+                if(($limit > 0) && (++$count >= $limit)) break;
             }
         } else {
             $usermanager = plugin_load("admin", "usermanager", false);
@@ -494,8 +488,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
             if (!isset($this->_grpsusers[$this->_filterToString($filter)]) || count($this->_grpsusers[$this->_filterToString($filter)]) < ($start+$limit)) {
                 $this->_fillGroupUserArray($filter,$start+$limit - count($this->_grpsusers[$this->_filterToString($filter)]) +1);
             }
+            if (!$this->_grpsusers[$this->_filterToString($filter)]) return false;
             foreach($this->_grpsusers[$this->_filterToString($filter)] as $user => &$info) {
-                dbglog($this->_grpsusers[$this->_filterToString($filter)]);
                 if($i++ < $start) {
                     continue;
                 }
-- 
cgit v1.2.3


From 7910cbbbce7fd803f3ee4f458d5426eac51bfd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 12 Mar 2015 16:34:45 +0100
Subject: Explain functions in docstrings

---
 lib/plugins/authad/auth.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index bcf01ff21..321a60f24 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -331,6 +331,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     }
 
     /**
+     * Create a Search-String useable by adLDAPUsers::all($includeDescription = false, $search = "*", $sorted = true)
+     *
      * @param array $filter
      * @return string
      */
@@ -343,6 +345,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
             $result .= ')(displayname=*' . $filter['name'] . '*';
             unset($filter['name']);
         }
+
         if (isset($filter['user'])) {
             $result .= ')(samAccountName=*' . $filter['user'] . '*';
             unset($filter['user']);
@@ -356,8 +359,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     }
 
     /**
-     * @param array $filter
-     * @return int
+     * Return a count of the number of user which meet $filter criteria
+     *
+     * @param array $filter  $filter array of field/pattern pairs, empty array for no filter
+     * @return int number of users
      */
     public function getUserCount($filter = array()) {
         $adldap = $this->_adldap(null);
@@ -418,6 +423,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     }
 
     /**
+     * Create an array of $numberOfAdds users passing a certain $filter, including belonging
+     * to a certain group and save them to a object-wide array. If the array
+     * already exists try to add $numberOfAdds further users to it.
+     *
      * @param array $filter
      * @param int $numberOfAdds additional number of users requested
      * @return int number of Users actually add to Array
-- 
cgit v1.2.3


From 07aec0297354ce1a2bb273def8173ff0a524f852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 12 Mar 2015 16:57:13 +0100
Subject: Escape user strings given to adLDAP

---
 lib/plugins/authad/auth.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 321a60f24..400a5efee 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -3,6 +3,7 @@
 if(!defined('DOKU_INC')) die();
 
 require_once(DOKU_PLUGIN.'authad/adLDAP/adLDAP.php');
+require_once(DOKU_PLUGIN.'authad/adLDAP/classes/adLDAPUtils.php');
 
 /**
  * Active Directory authentication backend for DokuWiki
@@ -340,19 +341,20 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
         if (!$filter){
             return '*';
         }
+        $adldapUtils = new adLDAPUtils($this->_adldap(null));
         $result = '*';
         if (isset($filter['name'])) {
-            $result .= ')(displayname=*' . $filter['name'] . '*';
+            $result .= ')(displayname=*' . $adldapUtils->ldapSlashes($filter['name']) . '*';
             unset($filter['name']);
         }
 
         if (isset($filter['user'])) {
-            $result .= ')(samAccountName=*' . $filter['user'] . '*';
+            $result .= ')(samAccountName=*' . $adldapUtils->ldapSlashes($filter['user']) . '*';
             unset($filter['user']);
         }
 
         if (isset($filter['mail'])) {
-            $result .= ')(mail=*' . $filter['mail'] . '*';
+            $result .= ')(mail=*' . $adldapUtils->ldapSlashes($filter['mail']) . '*';
             unset($filter['mail']);
         }
         return $result;
-- 
cgit v1.2.3


From 00378d4a8382cafb49f5ca4b25941289e110f14a Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Thu, 12 Mar 2015 18:12:26 +0100
Subject: Added file-in-use reference to page

Added german translation for file-in-use reference
---
 inc/lang/de/lang.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 2725c247a..ff5a27713 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -360,3 +360,4 @@ $lang['plainhtml']             = 'HTML Klartext';
 $lang['wikimarkup']            = 'Wiki Markup';
 $lang['page_nonexist_rev']     = 'DIe Seite exitiert nicht unter %s. Sie wurde aber unter <a herf="%s">%s</a>';
 $lang['unable_to_parse_date']  = 'Parameter "%s" kann nicht geparsed werden.';
+$lang['media_acl_warning']     = 'Diese Liste ist möglicherweise nicht vollständig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.';
-- 
cgit v1.2.3


From 22d18504ad2eb28dbf7d12a645c6335198bac256 Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Thu, 12 Mar 2015 18:13:50 +0100
Subject: Added file-in-use reference to page

Added german translation for file-in-use reference
---
 inc/lang/de-informal/lang.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 1a1491f6b..43dca61f1 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -344,3 +344,4 @@ $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
 $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnis';
+$lang['media_acl_warning']     = 'Diese Liste ist möglicherweise nicht vollständig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.';
-- 
cgit v1.2.3


From e605e04172dda4a182be04c15e8f4cc9f5f17093 Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Thu, 12 Mar 2015 18:15:20 +0100
Subject: Added file-in-use reference to page

Added english translation for file-in-use reference
---
 inc/lang/en/lang.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index a5347e026..8fff8037f 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -363,6 +363,7 @@ $lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read f
 $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
 $lang['media_update']          = 'Upload new version';
 $lang['media_restore']         = 'Restore this version';
+$lang['media_acl_warning']     = 'This list might not be complete due to ACL restrictions and hidden pages.';
 
 $lang['currentns']             = 'Current namespace';
 $lang['searchresult']          = 'Search Result';
-- 
cgit v1.2.3


From 5f4088b86d534f85182523ee560c2104f5317266 Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Thu, 12 Mar 2015 18:21:29 +0100
Subject: Added file-in-use reference to page

Added file-in-use reference to page
---
 lib/tpl/dokuwiki/detail.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index b27567987..ada2a6644 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -57,6 +57,20 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 
                         <div class="img_detail">
                             <?php tpl_img_meta(); ?>
+                            <dl>
+                            <?php
+                            echo '<dt>'.$lang['reference'].':</dt>';
+                            $media_usage = ft_mediause($IMG,true);
+                            if(count($media_usage) > 0){
+                                foreach($media_usage as $path){
+                                    echo '<dd>'.html_wikilink($path).'</a></dd>';
+                                }
+                            }else{
+                                echo '<dd>'.$lang['nothingfound'].'</dd>';
+                            }
+                            ?>
+                            </dl>
+                            <p><?php echo $lang['media_acl_warning']; ?></p>
                         </div>
                         <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
                     <?php endif; ?>
-- 
cgit v1.2.3


From 1014a348a1826737c9df8a9edaed3f756d0058f2 Mon Sep 17 00:00:00 2001
From: Sascha Klopp <klopp@rrzn.uni-hannover.de>
Date: Fri, 13 Mar 2015 12:01:51 +0100
Subject: Add description for modPass-Option

---
 lib/plugins/authldap/lang/de/settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index ecb407820..933189c40 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -22,6 +22,7 @@ $lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
 $lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
 $lang['userkey']               = 'Attribut, das den Benutzernamen enthält; muss konsistent zum userfilter sein.';
 $lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
+$lang['modPass']               = 'Darf über Dokuwiki das LDAP-Passwort geändert werden?';
 $lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
-- 
cgit v1.2.3


From 84f66e9f97ebf4d78ffaaad7a0b44f5c0180bfc9 Mon Sep 17 00:00:00 2001
From: Sascha Klopp <klopp@rrzn.uni-hannover.de>
Date: Mon, 16 Mar 2015 16:50:38 +0100
Subject: Add english description for new authldap options

---
 lib/plugins/authldap/lang/en/settings.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/authldap/lang/en/settings.php b/lib/plugins/authldap/lang/en/settings.php
index 951901ccc..a4194b00a 100644
--- a/lib/plugins/authldap/lang/en/settings.php
+++ b/lib/plugins/authldap/lang/en/settings.php
@@ -13,7 +13,9 @@ $lang['binddn']      = 'DN of an optional bind user if anonymous bind is not suf
 $lang['bindpw']      = 'Password of above user';
 $lang['userscope']   = 'Limit search scope for user search';
 $lang['groupscope']  = 'Limit search scope for group search';
+$lang['userkey']     = 'Attribute denoting the username; must be consistent to userfilter.';
 $lang['groupkey']    = 'Group membership from any user attribute (instead of standard AD groups) e.g. group from department or telephone number';
+$lang['modPass']     = 'Can the LDAP password be changed via dokuwiki?';
 $lang['debug']       = 'Display additional debug information on errors';
 
 
-- 
cgit v1.2.3


From 2f505bf9a889ddaf530fe975967589f6c6993e39 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 16 Mar 2015 22:49:47 +0100
Subject: use correct host in proxy tests

---
 _test/tests/inc/httpclient_https_proxy.test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_test/tests/inc/httpclient_https_proxy.test.php b/_test/tests/inc/httpclient_https_proxy.test.php
index 9402e91af..7a54bb92e 100644
--- a/_test/tests/inc/httpclient_https_proxy.test.php
+++ b/_test/tests/inc/httpclient_https_proxy.test.php
@@ -2,7 +2,7 @@
 require_once dirname(__FILE__).'/httpclient_http_proxy.test.php';
 
 class httpclient_https_proxy_test extends httpclient_http_proxy_test {
-    protected $url = 'https://www.dokuwiki.org/README';
+    protected $url = 'https://test.dokuwiki.org/README';
 
     public function setUp(){
         // skip tests when this PHP has no SSL support
@@ -27,4 +27,4 @@ class httpclient_https_proxy_test extends httpclient_http_proxy_test {
         $this->assertFalse($data);
         $this->assertEquals(-150, $http->status);
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From e13bd5dcd000cc82ed5f1379dac0d674789d3a0c Mon Sep 17 00:00:00 2001
From: Christoph Dwertmann <cdwertmann@gmail.com>
Date: Tue, 17 Mar 2015 18:22:29 +1100
Subject: Speed up indexer on lighttpd by using tpl_flush()

---
 lib/exe/indexer.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 2de178caa..d2a4d45f7 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -199,8 +199,7 @@ function sendGIF(){
     header('Content-Length: '.strlen($img));
     header('Connection: Close');
     print $img;
-    ob_flush();
-    flush();
+    tpl_flush();
     // Browser should drop connection after this
     // Thinks it's got the whole image
 }
-- 
cgit v1.2.3


From abb2621b95a47515d8223fcc52b5d62ca61b3e07 Mon Sep 17 00:00:00 2001
From: Jacob Palm <mail@jacobpalm.dk>
Date: Tue, 17 Mar 2015 15:01:44 +0100
Subject: translation update

---
 inc/lang/da/denied.txt                            |   2 +-
 inc/lang/da/lang.php                              | 101 +++++++++++-----------
 lib/plugins/authad/lang/da/lang.php               |   8 ++
 lib/plugins/authldap/lang/da/settings.php         |   5 ++
 lib/plugins/authmysql/lang/da/settings.php        |   4 +
 lib/plugins/extension/lang/da/intro_install.txt   |   1 +
 lib/plugins/extension/lang/da/intro_plugins.txt   |   1 +
 lib/plugins/extension/lang/da/intro_templates.txt |   1 +
 lib/plugins/extension/lang/da/lang.php            |  56 ++++++++++++
 9 files changed, 128 insertions(+), 51 deletions(-)
 create mode 100644 lib/plugins/authad/lang/da/lang.php
 create mode 100644 lib/plugins/extension/lang/da/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/da/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/da/intro_templates.txt

diff --git a/inc/lang/da/denied.txt b/inc/lang/da/denied.txt
index 7bf3b8b9b..217d8937e 100644
--- a/inc/lang/da/denied.txt
+++ b/inc/lang/da/denied.txt
@@ -1,3 +1,3 @@
-====== Adgang nægtet! ======
+====== Adgang nægtet ======
 
 Du har ikke rettigheder til at fortsætte.
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 3b353d50c..e7c597f2b 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -19,6 +19,7 @@
  * @author soer9648 <soer9648@eucl.dk>
  * @author Søren Birk <sbi@eucl.dk>
  * @author Søren Birk <soer9648@eucl.dk>
+ * @author Jacob Palm <mail@jacobpalm.dk>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -58,7 +59,7 @@ $lang['btn_resendpwd']         = 'Vælg ny adgangskode';
 $lang['btn_draft']             = 'Redigér kladde';
 $lang['btn_recover']           = 'Gendan kladde';
 $lang['btn_draftdel']          = 'Slet kladde';
-$lang['btn_revert']            = 'Reetablér';
+$lang['btn_revert']            = 'Gendan';
 $lang['btn_register']          = 'Registrér';
 $lang['btn_apply']             = 'Anvend';
 $lang['btn_media']             = 'Media Manager';
@@ -76,7 +77,7 @@ $lang['fullname']              = 'Fulde navn';
 $lang['email']                 = 'E-mail';
 $lang['profile']               = 'Brugerprofil';
 $lang['badlogin']              = 'Brugernavn eller adgangskode var forkert.';
-$lang['badpassconfirm']        = 'Kodeordet var desværre forkert';
+$lang['badpassconfirm']        = 'Adgangkode var desværre forkert';
 $lang['minoredit']             = 'Mindre ændringer';
 $lang['draftdate']             = 'Kladde automatisk gemt d.';
 $lang['nosecedit']             = 'Siden blev ændret i mellemtiden, sektions information var for gammel, hentede hele siden i stedet.';
@@ -88,26 +89,26 @@ $lang['regsuccess2']           = 'Du er nu oprettet som bruger.';
 $lang['regmailfail']           = 'Dit adgangskode blev ikke sendt. Kontakt venligst administratoren.';
 $lang['regbadmail']            = 'E-mail-adressen er ugyldig. Kontakt venligst administratoren, hvis du mener dette er en fejl.';
 $lang['regbadpass']            = 'De to adgangskoder er ikke ens, vær venlig at prøve igen.';
-$lang['regpwmail']             = 'Dit DokuWiki password';
+$lang['regpwmail']             = 'Dit adgangskode til DokuWiki';
 $lang['reghere']               = 'Opret en DokuWiki-konto her';
 $lang['profna']                = 'Denne wiki understøtter ikke ændring af profiler';
 $lang['profnochange']          = 'Ingen ændringer, intet modificeret.';
 $lang['profnoempty']           = 'Tomt navn eller e-mail adresse er ikke tilladt.';
 $lang['profchanged']           = 'Brugerprofil opdateret korrekt.';
-$lang['profnodelete']          = 'Denne wiki supporterer ikke sletning af brugere';
-$lang['profdeleteuser']        = 'Slet Konto';
+$lang['profnodelete']          = 'Denne wiki understøtter ikke sletning af brugere';
+$lang['profdeleteuser']        = 'Slet konto';
 $lang['profdeleted']           = 'Din brugerkonto er blevet slettet fra denne wiki';
 $lang['profconfdelete']        = 'Jeg ønsker at slette min konto fra denne wiki. <br/> Denne handling kan ikke fortrydes.';
-$lang['pwdforget']             = 'Har du glemt dit adgangskode? Få et nyt';
-$lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.';
-$lang['resendpwd']             = 'Vælg ny adgangskode for';
+$lang['pwdforget']             = 'Har du glemt dit adgangskode? Få en ny';
+$lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af ny adgangskode.';
+$lang['resendpwd']             = 'Vælg en ny adgangskode for';
 $lang['resendpwdmissing']      = 'Du skal udfylde alle felter.';
 $lang['resendpwdnouser']       = 'Vi kan ikke finde denne bruger i vores database.';
 $lang['resendpwdbadauth']      = 'Beklager, denne autoriseringskode er ikke gyldig. Kontroller venligst at du benyttede det fulde link til bekræftelse.';
-$lang['resendpwdconfirm']      = 'Et henvisning med bekræftelse er blevet sendt med email.';
-$lang['resendpwdsuccess']      = 'Dit nye adgangskode er blevet sendt med e-mail.';
-$lang['license']               = 'Med mindre andet angivet, vil indhold på denne wiki blive frigjort under følgende licens:';
-$lang['licenseok']             = 'Note: ved at ændre denne side, acceptere du at dit indhold bliver frigivet under følgende licens:';
+$lang['resendpwdconfirm']      = 'En e-mail med et link til bekræftelse er blevet sendt.';
+$lang['resendpwdsuccess']      = 'Din nye adgangskode er blevet sendt med e-mail.';
+$lang['license']               = 'Med mindre andet angivet, vil indhold på denne wiki blive udgivet under følgende licens:';
+$lang['licenseok']             = 'Bemærk - ved at redigere denne side, accepterer du at dit indhold bliver frigivet under følgende licens:';
 $lang['searchmedia']           = 'Søg filnavn';
 $lang['searchmedia_in']        = 'Søg i %s';
 $lang['txt_upload']            = 'Vælg den fil der skal overføres:';
@@ -117,76 +118,76 @@ $lang['maxuploadsize']         = 'Upload max. %s pr. fil.';
 $lang['lockedby']              = 'Midlertidig låst af:';
 $lang['lockexpire']            = 'Lås udløber kl:.';
 $lang['js']['willexpire']      = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
-$lang['js']['notsavedyet']     = 'Ugemte ændringer vil blive mistet
+$lang['js']['notsavedyet']     = 'Ugemte ændringer vil blive mistet.
 Fortsæt alligevel?';
 $lang['js']['searchmedia']     = 'Søg efter filer';
 $lang['js']['keepopen']        = 'Hold vindue åbent ved valg';
 $lang['js']['hidedetails']     = 'Skjul detaljer';
 $lang['js']['mediatitle']      = 'Link indstillinger';
 $lang['js']['mediadisplay']    = 'Link type';
-$lang['js']['mediaalign']      = 'Juster';
+$lang['js']['mediaalign']      = 'Justering';
 $lang['js']['mediasize']       = 'Billede størrelse';
-$lang['js']['mediatarget']     = 'Link mål';
+$lang['js']['mediatarget']     = 'Link destination';
 $lang['js']['mediaclose']      = 'Luk';
 $lang['js']['mediainsert']     = 'Indsæt';
 $lang['js']['mediadisplayimg'] = 'Vis billedet';
 $lang['js']['mediadisplaylnk'] = 'Vis kun linket';
 $lang['js']['mediasmall']      = 'Lille version';
-$lang['js']['mediamedium']     = 'Medium version';
+$lang['js']['mediamedium']     = 'Mellem version';
 $lang['js']['medialarge']      = 'Stor version';
 $lang['js']['mediaoriginal']   = 'Original version';
 $lang['js']['medialnk']        = 'Link til detajle side';
 $lang['js']['mediadirect']     = 'Direkte link til originalen';
 $lang['js']['medianolnk']      = 'Intet link';
-$lang['js']['medianolink']     = 'Link ikke billedet';
+$lang['js']['medianolink']     = 'Link ikke til billedet';
 $lang['js']['medialeft']       = 'Juster billedet til venstre';
 $lang['js']['mediaright']      = 'Juster billedet til højre';
 $lang['js']['mediacenter']     = 'Centreret';
 $lang['js']['medianoalign']    = 'Brug ingen justering';
 $lang['js']['nosmblinks']      = 'Henvisninger til Windows shares virker kun i Microsoft Internet Explorer.
 Du kan stadig kopiere og indsætte linket.';
-$lang['js']['linkwiz']         = 'guiden til henvisninger';
-$lang['js']['linkto']          = 'Henvise til:';
+$lang['js']['linkwiz']         = 'Guiden til henvisninger';
+$lang['js']['linkto']          = 'Henvis til:';
 $lang['js']['del_confirm']     = 'Slet valgte post(er)?';
-$lang['js']['restore_confirm'] = 'Vil du virkeligt genskabe denne version?';
+$lang['js']['restore_confirm'] = 'Er du sikker på at du vil genskabe denne version?';
 $lang['js']['media_diff']      = 'Vis forskelle:';
 $lang['js']['media_diff_both'] = 'Side ved Side';
-$lang['js']['media_diff_opacity'] = 'Skin-igennem';
+$lang['js']['media_diff_opacity'] = 'Skin igennem';
 $lang['js']['media_diff_portions'] = 'Skub';
 $lang['js']['media_select']    = 'Vælg filer...';
-$lang['js']['media_upload_btn'] = 'Upload';
+$lang['js']['media_upload_btn'] = 'Overfør';
 $lang['js']['media_done_btn']  = 'Færdig';
-$lang['js']['media_drop']      = 'Drop filer her for at uploade';
+$lang['js']['media_drop']      = 'Træk filer hertil for at overføre';
 $lang['js']['media_cancel']    = 'fjern';
 $lang['js']['media_overwrt']   = 'Overskriv eksisterende filer';
-$lang['rssfailed']             = 'Der opstod en fejl ved indhentning af: ';
+$lang['rssfailed']             = 'Der opstod en fejl ved hentning af dette feed: ';
 $lang['nothingfound']          = 'Søgningen gav intet resultat.';
 $lang['mediaselect']           = 'Vælg mediefil';
-$lang['fileupload']            = 'Overføre mediefil';
-$lang['uploadsucc']            = 'Overførelse var en succes';
-$lang['uploadfail']            = 'Overførelse fejlede. Der er muligvis problemer med rettighederne.';
-$lang['uploadwrong']           = 'Overførelse afvist. Filtypen er ikke tilladt.';
+$lang['fileupload']            = 'Overfør mediefil';
+$lang['uploadsucc']            = 'Overførels blev fuldført';
+$lang['uploadfail']            = 'Overførslen fejlede. Der er muligvis problemer med rettighederne.';
+$lang['uploadwrong']           = 'Overførslen blev afvist. Filtypen er ikke tilladt.';
 $lang['uploadexist']           = 'Filen eksisterer allerede.';
-$lang['uploadbadcontent']      = 'Overføret indhold tilsvaret ikke til %s fil-endelsen.';
+$lang['uploadbadcontent']      = 'Det overført indhold svarer ikke til %s fil-endelsen.';
 $lang['uploadspam']            = 'Overførelsen blev blokeret af spam sortlisten.';
 $lang['uploadxss']             = 'Overførelsen blev blokeret på grund af mulig skadeligt indhold.';
-$lang['uploadsize']            = 'Den overføret fil var for stor (max. %s)';
+$lang['uploadsize']            = 'Den overførte fil var for stor (maksimal størrelse %s)';
 $lang['deletesucc']            = 'Filen "%s" er blevet slettet.';
-$lang['deletefail']            = '"%s" kunne ikke slettes - check rettighederne.';
-$lang['mediainuse']            = 'Filen "%s" er ikke slettet - den er stadig i brug.';
+$lang['deletefail']            = '"%s" kunne ikke slettes - kontroller rettighederne.';
+$lang['mediainuse']            = 'Filen "%s" kan ikke slettes - den er stadig i brug.';
 $lang['namespaces']            = 'Navnerum';
 $lang['mediafiles']            = 'Tilgængelige filer i';
-$lang['accessdenied']          = 'Du har ikke tilladelse til at se denne side';
+$lang['accessdenied']          = 'Du har ikke tilladelse til at se denne side.';
 $lang['mediausage']            = 'Brug den følgende syntaks til at henvise til denne fil:';
 $lang['mediaview']             = 'Vis oprindelig fil';
 $lang['mediaroot']             = 'rod';
 $lang['mediaupload']           = 'Overføre en fil til det nuværende navnerum her. For at oprette under-navnerum, tilføj dem til "Overføre som" filnavnet, adskilt af kolontegn.';
-$lang['mediaextchange']        = 'Filudvidelse ændret fra .%s til .%s!';
+$lang['mediaextchange']        = 'Filtype ændret fra .%s til .%s!';
 $lang['reference']             = 'Henvisning til';
 $lang['ref_inuse']             = 'Filen kan ikke slettes, da den stadig er i brug på følgende sider:';
-$lang['ref_hidden']            = 'Nogle henvisninger er i dokumenter du ikke har læserettigheder til';
+$lang['ref_hidden']            = 'Nogle henvisninger er på sider du ikke har læserettigheder til';
 $lang['hits']                  = 'Besøg';
-$lang['quickhits']             = 'Tilsvarende dokumentnavne';
+$lang['quickhits']             = 'Tilsvarende sidenavne';
 $lang['toc']                   = 'Indholdsfortegnelse';
 $lang['current']               = 'nuværende';
 $lang['yours']                 = 'Din version';
@@ -195,7 +196,7 @@ $lang['diff2']                 = 'Vis forskelle i forhold til de valgte revision
 $lang['difflink']              = 'Link til denne sammenlinings vising';
 $lang['diff_type']             = 'Vis forskelle:';
 $lang['diff_inline']           = 'Indeni';
-$lang['diff_side']             = 'Side ved Side';
+$lang['diff_side']             = 'Side ved side';
 $lang['diffprevrev']           = 'Forrige revision';
 $lang['diffnextrev']           = 'Næste revision';
 $lang['difflastrev']           = 'Sidste revision';
@@ -208,26 +209,26 @@ $lang['lastmod']               = 'Sidst ændret:';
 $lang['by']                    = 'af';
 $lang['deleted']               = 'slettet';
 $lang['created']               = 'oprettet';
-$lang['restored']              = 'gammel udgave reetableret (%s)';
+$lang['restored']              = 'gammel udgave gendannet (%s)';
 $lang['external_edit']         = 'ekstern redigering';
-$lang['summary']               = 'Redigerings resumé';
-$lang['noflash']               = 'Den <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> er nødvendig til at vise denne indehold.';
-$lang['download']              = 'Hente kodestykke';
+$lang['summary']               = 'Resumé af ændrigner';
+$lang['noflash']               = 'Du skal installere <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Player</a> for at kunne se dette indhold.';
+$lang['download']              = 'Hent kodestykke';
 $lang['tools']                 = 'Værktøjer';
 $lang['user_tools']            = 'Brugerværktøjer';
 $lang['site_tools']            = 'Webstedsværktøjer';
 $lang['page_tools']            = 'Sideværktøjer';
 $lang['skip_to_content']       = 'hop til indhold';
 $lang['sidebar']               = 'Sidebjælke';
-$lang['mail_newpage']          = 'dokument tilføjet:';
-$lang['mail_changed']          = 'dokument ændret:';
-$lang['mail_subscribe_list']   = 'sider ændret i navnerum';
+$lang['mail_newpage']          = 'side tilføjet:';
+$lang['mail_changed']          = 'side ændret:';
+$lang['mail_subscribe_list']   = 'sider ændret i navnerum:';
 $lang['mail_new_user']         = 'Ny bruger';
-$lang['mail_upload']           = 'fil overføret:';
+$lang['mail_upload']           = 'fil overført:';
 $lang['changes_type']          = 'Vis ændringer af';
 $lang['pages_changes']         = 'Sider';
-$lang['media_changes']         = 'Media filer';
-$lang['both_changes']          = 'Både sider og media filer';
+$lang['media_changes']         = 'Mediefiler';
+$lang['both_changes']          = 'Både sider og medie filer';
 $lang['qb_bold']               = 'Fed';
 $lang['qb_italic']             = 'Kursiv';
 $lang['qb_underl']             = 'Understregning';
@@ -239,7 +240,7 @@ $lang['qb_h3']                 = 'Niveau 3 overskrift';
 $lang['qb_h4']                 = 'Niveau 4 overskrift';
 $lang['qb_h5']                 = 'Niveau 5 overskrift';
 $lang['qb_h']                  = 'Overskrift';
-$lang['qb_hs']                 = 'Vælg overskriften';
+$lang['qb_hs']                 = 'Vælg overskrift';
 $lang['qb_hplus']              = 'Højere overskriftsniveau';
 $lang['qb_hminus']             = 'Lavere overskriftsniveau';
 $lang['qb_hequal']             = 'Samme overskriftsniveau';
@@ -247,7 +248,7 @@ $lang['qb_link']               = 'Intern henvisning';
 $lang['qb_extlink']            = 'Ekstern henvisning';
 $lang['qb_hr']                 = 'Vandret linje';
 $lang['qb_ol']                 = 'Nummereret liste';
-$lang['qb_ul']                 = 'Unummereret liste';
+$lang['qb_ul']                 = 'Punktopstilling';
 $lang['qb_media']              = 'Tilføj billeder og andre filer';
 $lang['qb_sig']                = 'Indsæt signatur';
 $lang['qb_smileys']            = 'Smileys';
@@ -255,7 +256,7 @@ $lang['qb_chars']              = 'Specialtegn';
 $lang['upperns']               = 'Gå til overordnet navnerum';
 $lang['admin_register']        = 'Tilføj ny bruger';
 $lang['metaedit']              = 'Rediger metadata';
-$lang['metasaveerr']           = 'Skrivning af metadata fejlede';
+$lang['metasaveerr']           = 'Fejl under skrivning af metadata';
 $lang['metasaveok']            = 'Metadata gemt';
 $lang['img_title']             = 'Titel:';
 $lang['img_caption']           = 'Billedtekst:';
diff --git a/lib/plugins/authad/lang/da/lang.php b/lib/plugins/authad/lang/da/lang.php
new file mode 100644
index 000000000..8fc7db775
--- /dev/null
+++ b/lib/plugins/authad/lang/da/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Jacob Palm <mail@jacobpalm.dk>
+ */
+$lang['domain']                = 'Logondomæne';
diff --git a/lib/plugins/authldap/lang/da/settings.php b/lib/plugins/authldap/lang/da/settings.php
index b736504a5..a9fce3a8c 100644
--- a/lib/plugins/authldap/lang/da/settings.php
+++ b/lib/plugins/authldap/lang/da/settings.php
@@ -5,11 +5,16 @@
  * 
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
  * @author soer9648 <soer9648@eucl.dk>
+ * @author Jacob Palm <mail@jacobpalm.dk>
  */
 $lang['server']                = 'Din LDAP server. Enten værtsnavn (<code>localhost</code>) eller fuld kvalificeret URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'LDAP server port, hvis der ikke er angivet en komplet URL ovenfor.';
 $lang['usertree']              = 'Hvor findes brugerkonti. F.eks. <code>ou=Personer, dc=server, dc=tld</code>';
 $lang['grouptree']             = 'Hvor findes brugergrupper. F.eks. <code>ou=Grupper, dc=server, dc=tld</code>';
+$lang['userfilter']            = 'LDAP filter der benyttes til at søge efter brugerkonti. F.eks. <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = 'LDAP filter tder benyttes til at søge efter grupper. F.eks. <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['version']               = 'Protokol version der skal benyttes. Det er muligvis nødvendigt at sætte denne til <code>3</code>';
 $lang['starttls']              = 'Benyt TLS forbindelser?';
 $lang['bindpw']                = 'Kodeord til ovenstående bruger';
+$lang['modPass']               = 'Kan LDAP adgangskoden skiftes via DokuWiki?';
 $lang['debug']                 = 'Vis yderligere debug output ved fejl';
diff --git a/lib/plugins/authmysql/lang/da/settings.php b/lib/plugins/authmysql/lang/da/settings.php
index ed21201fb..5fd66dbad 100644
--- a/lib/plugins/authmysql/lang/da/settings.php
+++ b/lib/plugins/authmysql/lang/da/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
  * @author soer9648 <soer9648@eucl.dk>
+ * @author Jacob Palm <mail@jacobpalm.dk>
  */
 $lang['server']                = 'Din MySQL server';
 $lang['user']                  = 'MySQL brugernavn';
@@ -12,8 +13,11 @@ $lang['password']              = 'Kodeord til ovenstående bruger';
 $lang['database']              = 'Database der skal benyttes';
 $lang['charset']               = 'Tegnsæt benyttet i database';
 $lang['debug']                 = 'Vis yderligere debug output';
+$lang['forwardClearPass']      = 'Videregiv bruger adgangskoder i klar tekst til nedenstående SQL statement, i stedet for at benytte passcrypt';
+$lang['TablesToLock']          = 'Kommasepareret liste over tabeller der skal låses under skrivning';
 $lang['checkPass']             = 'SQL-sætning til at kontrollere kodeord';
 $lang['getUserInfo']           = 'SQL-sætning til at hente brugerinformation';
+$lang['getGroups']             = 'SQL statement til at bestemme en brugers medlemskab af grupper';
 $lang['getUsers']              = 'SQL-sætning til at liste alle brugere';
 $lang['addUser']               = 'SQL-sætning til at tilføje en ny bruger';
 $lang['addGroup']              = 'SQL-sætning til at tilføje en ny gruppe';
diff --git a/lib/plugins/extension/lang/da/intro_install.txt b/lib/plugins/extension/lang/da/intro_install.txt
new file mode 100644
index 000000000..e5657f218
--- /dev/null
+++ b/lib/plugins/extension/lang/da/intro_install.txt
@@ -0,0 +1 @@
+Her kan du installerer plugins eller templates manuelt, ved enten at uploade dem eller angive en direkte URL til download.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/da/intro_plugins.txt b/lib/plugins/extension/lang/da/intro_plugins.txt
new file mode 100644
index 000000000..5d9deaf1e
--- /dev/null
+++ b/lib/plugins/extension/lang/da/intro_plugins.txt
@@ -0,0 +1 @@
+Dette er de plugins du aktuelt har installeret i din DokuWiki. Du kan aktivere, deaktiver eller fjerne plugins fra denne side. Opdateringer til plugins vises også her - husk at læse dokumentationen til et plugin inden du opdaterer det.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/da/intro_templates.txt b/lib/plugins/extension/lang/da/intro_templates.txt
new file mode 100644
index 000000000..1914500b1
--- /dev/null
+++ b/lib/plugins/extension/lang/da/intro_templates.txt
@@ -0,0 +1 @@
+Dette er de templates du aktuelt har installeret i din DokuWiki. Du kan vælge det template du vil benytte under [[?do=admin&page=config|Opsætningsstyring]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/da/lang.php b/lib/plugins/extension/lang/da/lang.php
index c341bc5f9..17cb3b57c 100644
--- a/lib/plugins/extension/lang/da/lang.php
+++ b/lib/plugins/extension/lang/da/lang.php
@@ -4,7 +4,62 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Søren Birk <soer9648@eucl.dk>
+ * @author Jacob Palm <mail@jacobpalm.dk>
  */
+$lang['tab_plugins']           = 'Installerede plugins';
+$lang['tab_templates']         = 'Installerede templates';
+$lang['tab_search']            = 'Søg og installer';
+$lang['tab_install']           = 'Manuel installation';
+$lang['notimplemented']        = 'Denne funktion er ikke implementeret endnu';
+$lang['unknownauthor']         = 'Ukendt udgiver';
+$lang['unknownversion']        = 'Ukendt version';
+$lang['btn_info']              = 'Vis mere information';
+$lang['btn_update']            = 'Opdater';
+$lang['btn_uninstall']         = 'Afinstaller';
+$lang['btn_enable']            = 'Aktiver';
+$lang['btn_disable']           = 'Deaktiver';
+$lang['btn_install']           = 'Installer';
+$lang['btn_reinstall']         = 'Geninstaller';
+$lang['js']['reallydel']       = 'Er du sikker på at du vil afinstallere denne udvidelse?';
+$lang['search_for']            = 'Søg efter udvidelse:';
+$lang['search']                = 'Søg';
+$lang['extensionby']           = '<strong>%s</strong> af %s';
+$lang['screenshot']            = 'Skærmbillede af %s';
+$lang['popularity']            = 'Popularitet: %s%%';
+$lang['homepage_link']         = 'Dokumenter';
+$lang['bugs_features']         = 'Fejl';
+$lang['tags']                  = 'Tags:';
+$lang['author_hint']           = 'Søg efter udvidelse af denne udgiver';
+$lang['installed']             = 'Installeret:';
+$lang['downloadurl']           = 'Download URL:';
+$lang['unknown']               = '<em>ukendt</em>';
+$lang['installed_version']     = 'Installeret version:';
+$lang['install_date']          = 'Din sidste opdatering:';
+$lang['available_version']     = 'Tilgængelig version:';
+$lang['compatible']            = 'Kompatibel med:';
+$lang['depends']               = 'Afhængig af:';
+$lang['similar']               = 'Ligner:';
+$lang['donate']                = 'Synes du om denne?';
+$lang['donate_action']         = 'Køb en kop kaffe til udvikleren!';
+$lang['repo_retry']            = 'Førsøg igen';
+$lang['status']                = 'Status:';
+$lang['status_installed']      = 'installeret';
+$lang['status_not_installed']  = 'ikke installeret';
+$lang['status_protected']      = 'beskyttet';
+$lang['status_enabled']        = 'aktiveret';
+$lang['status_disabled']       = 'deaktiveret';
+$lang['status_unmodifiable']   = 'låst for ændringer';
+$lang['status_plugin']         = 'plugin';
+$lang['status_template']       = 'template';
+$lang['msg_enabled']           = 'Plugin %s aktiveret';
+$lang['msg_disabled']          = 'Plugin %s deaktiveret';
+$lang['msg_delete_success']    = 'Udvidelse %s afinstalleret';
+$lang['msg_delete_failed']     = 'Kunne ikke afinstallere udvidelsen %s';
+$lang['msg_template_install_success'] = 'Template %s blev installeret';
+$lang['msg_template_update_success'] = 'Template %s blev opdateret';
+$lang['msg_plugin_install_success'] = 'Plugin %s blev installeret';
+$lang['msg_plugin_update_success'] = 'Plugin %s blev opdateret';
+$lang['msg_upload_failed']     = 'Kunne ikke uploade filen';
 $lang['update_available']      = '<strong>Opdatering:</strong> Ny version %s er tilgængelig.';
 $lang['wrong_folder']          = '<strong>Plugin ikke installeret korrekt:</strong> Omdøb plugin-mappe "%s" til "%s".';
 $lang['url_change']            = '<strong>URL ændret:</strong> Download-URL er blevet ændret siden sidste download. Kontrollér om den nye URL er valid, inden udvidelsen opdateres.<br />Ny: %s<br />Gammel: %s';
@@ -22,3 +77,4 @@ $lang['auth']                  = 'Auth-plugin er ikke aktiveret i konfiguratione
 $lang['install_url']           = 'Installér fra URL:';
 $lang['install_upload']        = 'Upload Udvidelse:';
 $lang['repo_error']            = 'Plugin-arkivet kunne ikke kontaktes. Kontrollér at din server kan kontakte www.dokuwiki.org kontrollér dine proxy-indstillinger.';
+$lang['nossl']                 = 'Din PHP lader til at mangle understøttelse for SSL. Mange DokuWiki udvidelser vil ikke kunne downloades.';
-- 
cgit v1.2.3


From 09513545a4776e31b5fb113bd8741df1df878816 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 18 Mar 2015 11:19:04 +0100
Subject: give better error message in HTTPClient for failed crypto setup

---
 _test/tests/inc/httpclient_http_proxy.test.php | 2 +-
 inc/HTTPClient.php                             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index c44dc7ed7..79b8f8e5e 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -15,7 +15,7 @@ class httpclient_http_proxy_test extends DokuWikiTest {
         $http->proxy_port = 8080;
 
         $data = $http->get($this->url);
-        $this->assertFalse($data === false, 'HTTP response '.$http->error);
+        $this->assertFalse($data === false, 'HTTP response: '.$http->error.' ['.$this->url.']');
         $this->assertTrue(strpos($data,'DokuWiki') !== false, 'response content');
     }
 }
\ No newline at end of file
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 76d973c38..24b3a8d78 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -604,6 +604,8 @@ class HTTPClient {
                 $requesturl = $requestinfo['path'];
                 return true;
             }
+
+            throw new HTTPClientException('Failed to set up crypto for secure proxy connection', -151);
         }
 
         throw new HTTPClientException('Failed to establish secure proxy connection', -150);
-- 
cgit v1.2.3


From 8e455cddd749f1ea627e47e5ff5b910b7443d561 Mon Sep 17 00:00:00 2001
From: itsho <itsho.itsho@gmail.com>
Date: Wed, 18 Mar 2015 15:05:49 +0100
Subject: translation update

---
 inc/lang/he/lang.php     | 26 ++++++++++++++++++++++++--
 inc/lang/he/resetpwd.txt |  3 +++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 inc/lang/he/resetpwd.txt

diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 5e2ecbdff..1b8710df9 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -13,6 +13,7 @@
  * @author alex <ralexay@gmail.com>
  * @author matt carroll <matt.carroll@gmail.com>
  * @author tomer <tomercarolldergicz@gmail.com>
+ * @author itsho <itsho.itsho@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -57,6 +58,8 @@ $lang['btn_register']          = 'הרשמה';
 $lang['btn_apply']             = 'ליישם';
 $lang['btn_media']             = 'מנהל המדיה';
 $lang['btn_deleteuser']        = 'להסיר את החשבון שלי';
+$lang['btn_img_backto']        = 'חזרה אל %s';
+$lang['btn_mediaManager']      = 'צפה במנהל מדיה';
 $lang['loggedinas']            = 'נכנסת בשם:';
 $lang['user']                  = 'שם משתמש';
 $lang['pass']                  = 'ססמה';
@@ -188,6 +191,11 @@ $lang['difflink']              = 'קישור לתצוגה השוואה זו';
 $lang['diff_type']             = 'הצגת הבדלים:';
 $lang['diff_inline']           = 'באותה השורה';
 $lang['diff_side']             = 'זה לצד זה';
+$lang['diffprevrev']           = 'הגירסה הקודמת';
+$lang['diffnextrev']           = 'הגירסה הבאה';
+$lang['difflastrev']           = 'הגירסה האחרונה';
+$lang['diffbothprevrev']       = 'גירסה קודמת בשני הצדדים';
+$lang['diffbothnextrev']       = 'הגירסה הבאה בשני הצדדים';
 $lang['line']                  = 'שורה';
 $lang['breadcrumb']            = 'ביקורים אחרונים:';
 $lang['youarehere']            = 'זהו מיקומך:';
@@ -244,7 +252,6 @@ $lang['admin_register']        = 'הוספת משתמש חדש';
 $lang['metaedit']              = 'עריכת נתוני העל';
 $lang['metasaveerr']           = 'אירע כשל בשמירת נתוני העל';
 $lang['metasaveok']            = 'נתוני העל נשמרו';
-$lang['btn_img_backto']            = 'חזרה אל %s';
 $lang['img_title']             = 'שם:';
 $lang['img_caption']           = 'כותרת:';
 $lang['img_date']              = 'תאריך:';
@@ -257,7 +264,6 @@ $lang['img_camera']            = 'מצלמה:';
 $lang['img_keywords']          = 'מילות מפתח:';
 $lang['img_width']             = 'רוחב:';
 $lang['img_height']            = 'גובה:';
-$lang['btn_mediaManager']           = 'צפה במנהל מדיה';
 $lang['subscr_subscribe_success'] = '%s נוסף לרשימת המינויים לדף %s';
 $lang['subscr_subscribe_error'] = 'אירעה שגיאה בהוספת %s לרשימת המינויים לדף %s';
 $lang['subscr_subscribe_noaddress'] = 'אין כתובת המשויכת עם הכניסה שלך, נא ניתן להוסיף אותך לרשימת המינויים';
@@ -287,6 +293,7 @@ $lang['i_modified']            = 'משיקולי אבטחה סקריפט זה י
                          <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
 $lang['i_funcna']              = 'פונקציית ה-PHP&rlm; <code>%s</code> אינה זמינה. יתכן כי מארח האתר חסם אותה מסיבה כלשהי?';
 $lang['i_phpver']              = 'גרסת PHP שלך <code>%s</code> נמוכה מ <code>%s</code> הצורך. אתה צריך לשדרג PHP שלך להתקין.';
+$lang['i_mbfuncoverload']      = 'יש לבטל את mbstring.func_overload בphp.ini בכדי להריץ את DokuWiki';
 $lang['i_permfail']            = '<code>%s</code> אינה ניתנת לכתיבה על ידי DokuWiki. עליך לשנות הרשאות תיקייה זו!';
 $lang['i_confexists']          = '<code>%s</code> כבר קיים';
 $lang['i_writeerr']            = 'אין אפשרות ליצור את <code>%s</code>. נא לבדוק את הרשאות הקובץ/תיקייה וליצור את הקובץ ידנית.';
@@ -326,3 +333,18 @@ $lang['media_sort_date']       = 'תאריך';
 $lang['media_namespaces']      = 'בחר מרחב שמות';
 $lang['media_files']           = 'קבצים ב s%';
 $lang['media_upload']          = 'להעלות s%';
+$lang['media_search']          = 'חיפוש ב%s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s ב %s';
+$lang['media_edit']            = 'ערוך %s';
+$lang['media_history']         = 'היסטוריה של %s';
+$lang['media_meta_edited']     = 'metadata נערך';
+$lang['media_perm_read']       = 'מצטערים, אין לך הרשאות לקרוא קבצים.';
+$lang['media_perm_upload']     = 'מצטערים, אין לך הרשאות להעלות קבצים.';
+$lang['media_update']          = 'העלה גירסה חדשה';
+$lang['media_restore']         = 'שחזר גירסה זו';
+$lang['currentns']             = 'שם מרחב נוכחי';
+$lang['searchresult']          = 'תוצאות חיפוש';
+$lang['plainhtml']             = 'HTML פשוט';
+$lang['page_nonexist_rev']     = 'העמוד לא קיים ב%s. העמוד נוצר במקום זאת ב<a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'לא ניתן לפענח פרמטר "%s".';
diff --git a/inc/lang/he/resetpwd.txt b/inc/lang/he/resetpwd.txt
new file mode 100644
index 000000000..bd7b5ace4
--- /dev/null
+++ b/inc/lang/he/resetpwd.txt
@@ -0,0 +1,3 @@
+====== קבע סיסמה חדשה ======
+
+אנא הכנס סיסמה חדשה לחשבון שלך בויקי זה.
\ No newline at end of file
-- 
cgit v1.2.3


From d387bf5e958e9d25a7192d1f5e5280ac0eb82da7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 18 Mar 2015 20:27:10 +0100
Subject: correct error checking for bz2 file reading

The code reading .bz2 compressed files did not correctly check for
possible read errors. In case of a corrupted file this could have led to
an infinite loop.

Thanks to Filippo Cavallarin from www.segment.technology for dicovering
this bug.
---
 _test/tests/inc/io_readfile.test.php        |  53 ++++++++++++++++++++++++++++
 _test/tests/inc/io_readfile/corrupt.txt.bz2 |   1 +
 _test/tests/inc/io_readfile/corrupt.txt.gz  | Bin 0 -> 31 bytes
 _test/tests/inc/io_readfile/test.txt.bz2    | Bin 0 -> 49 bytes
 _test/tests/inc/io_readfile/test.txt.gz     | Bin 0 -> 31 bytes
 inc/io.php                                  |  16 ++++++---
 6 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 _test/tests/inc/io_readfile.test.php
 create mode 100644 _test/tests/inc/io_readfile/corrupt.txt.bz2
 create mode 100644 _test/tests/inc/io_readfile/corrupt.txt.gz
 create mode 100644 _test/tests/inc/io_readfile/test.txt.bz2
 create mode 100644 _test/tests/inc/io_readfile/test.txt.gz

diff --git a/_test/tests/inc/io_readfile.test.php b/_test/tests/inc/io_readfile.test.php
new file mode 100644
index 000000000..e3e90cd8d
--- /dev/null
+++ b/_test/tests/inc/io_readfile.test.php
@@ -0,0 +1,53 @@
+<?php
+
+class io_readfile_test extends DokuWikiTest {
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_zlib() {
+        if (!extension_loaded('zlib')) {
+            $this->markTestSkipped('skipping all zlib tests.  Need zlib extension');
+        }
+    }
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_bz2() {
+        if (!extension_loaded('bz2')) {
+            $this->markTestSkipped('skipping all bzip2 tests.  Need bz2 extension');
+        }
+    }
+
+    function test_plain(){
+        // since git converts line endings, we can't check in this test file but have to create it ourselves
+        $plain = TMP_DIR.'/test.txt';
+        file_put_contents($plain, "The\015\012Test\015\012");
+
+        $this->assertEquals("The\012Test\012", io_readFile($plain));
+        $this->assertEquals("The\015\012Test\015\012", io_readFile($plain, false));
+        $this->assertEquals(false, io_readFile(__DIR__.'/io_readfile/nope.txt'));
+    }
+
+    /**
+     * @depends test_ext_zlib
+     */
+    function test_gzfiles(){
+        $this->assertEquals("The\012Test\012", io_readFile(__DIR__.'/io_readfile/test.txt.gz'));
+        $this->assertEquals("The\015\012Test\015\012", io_readFile(__DIR__.'/io_readfile/test.txt.gz', false));
+        $this->assertEquals(false, io_readFile(__DIR__.'/io_readfile/nope.txt.gz'));
+        $this->assertEquals(false, io_readFile(__DIR__.'/io_readfile/corrupt.txt.gz'));
+    }
+
+    /**
+     * @depends test_ext_bz2
+     */
+    function test_bzfiles(){
+        $this->assertEquals("The\012Test\012", io_readFile(__DIR__.'/io_readfile/test.txt.bz2'));
+        $this->assertEquals("The\015\012Test\015\012", io_readFile(__DIR__.'/io_readfile/test.txt.bz2', false));
+        $this->assertEquals(false, io_readFile(__DIR__.'/io_readfile/nope.txt.bz2'));
+        $this->assertEquals(false, io_readFile(__DIR__.'/io_readfile/corrupt.txt.bz2'));
+    }
+
+}
\ No newline at end of file
diff --git a/_test/tests/inc/io_readfile/corrupt.txt.bz2 b/_test/tests/inc/io_readfile/corrupt.txt.bz2
new file mode 100644
index 000000000..97f742919
--- /dev/null
+++ b/_test/tests/inc/io_readfile/corrupt.txt.bz2
@@ -0,0 +1 @@
+BZh91AY&SYXHd�
\ No newline at end of file
diff --git a/_test/tests/inc/io_readfile/corrupt.txt.gz b/_test/tests/inc/io_readfile/corrupt.txt.gz
new file mode 100644
index 000000000..f7f5d3397
Binary files /dev/null and b/_test/tests/inc/io_readfile/corrupt.txt.gz differ
diff --git a/_test/tests/inc/io_readfile/test.txt.bz2 b/_test/tests/inc/io_readfile/test.txt.bz2
new file mode 100644
index 000000000..3d4e1b226
Binary files /dev/null and b/_test/tests/inc/io_readfile/test.txt.bz2 differ
diff --git a/_test/tests/inc/io_readfile/test.txt.gz b/_test/tests/inc/io_readfile/test.txt.gz
new file mode 100644
index 000000000..8ac8f7d40
Binary files /dev/null and b/_test/tests/inc/io_readfile/test.txt.gz differ
diff --git a/inc/io.php b/inc/io.php
index 3ed227162..0636a4b62 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -101,7 +101,7 @@ function _io_readWikiPage_action($data) {
  *
  * @param string $file  filename
  * @param bool   $clean
- * @return string
+ * @return string|bool the file contents or false on error
  */
 function io_readFile($file,$clean=true){
     $ret = '';
@@ -114,7 +114,7 @@ function io_readFile($file,$clean=true){
             $ret = file_get_contents($file);
         }
     }
-    if($clean){
+    if($ret !== false && $clean){
         return cleanText($ret);
     }else{
         return $ret;
@@ -124,22 +124,28 @@ function io_readFile($file,$clean=true){
  * Returns the content of a .bz2 compressed file as string
  *
  * @author marcel senf <marcel@rucksackreinigung.de>
+ * @author  Andreas Gohr <andi@splitbrain.org>
  *
  * @param string $file filename
- * @return string content
+ * @return string|bool content or false on error
  */
 function bzfile($file){
     $bz = bzopen($file,"r");
+    if($bz === false) return false;
+
     $str = '';
     while (!feof($bz)){
         //8192 seems to be the maximum buffersize?
-        $str = $str . bzread($bz,8192);
+        $buffer = bzread($bz,8192);
+        if(($buffer === false) || (bzerrno($bz) !== 0)) {
+            return false;
+        }
+        $str = $str . $buffer;
     }
     bzclose($bz);
     return $str;
 }
 
-
 /**
  * Used to write out a DokuWiki page to file, and send IO_WIKIPAGE_WRITE events.
  *
-- 
cgit v1.2.3


From 6abea1c0be56a2cb5575c8921c3e6661ed565697 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 18 Mar 2015 21:55:59 +0100
Subject: fixed HTTPS proxy tests, our tests now run on httpbin.org

This also reverses the order of crypto protocols tried again. Using TLS
first again. related to #915
---
 _test/tests/inc/httpclient_http_proxy.test.php  |  2 +-
 _test/tests/inc/httpclient_https_proxy.test.php |  2 +-
 inc/HTTPClient.php                              | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index 79b8f8e5e..dae801dbd 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -3,7 +3,7 @@
 require_once (__DIR__ . '/httpclient_mock.php');
 
 class httpclient_http_proxy_test extends DokuWikiTest {
-    protected $url = 'http://test.dokuwiki.org/README';
+    protected $url = 'http://httpbin.org/user-agent';
 
     /**
      * @group internet
diff --git a/_test/tests/inc/httpclient_https_proxy.test.php b/_test/tests/inc/httpclient_https_proxy.test.php
index 7a54bb92e..cf5b9a8b9 100644
--- a/_test/tests/inc/httpclient_https_proxy.test.php
+++ b/_test/tests/inc/httpclient_https_proxy.test.php
@@ -2,7 +2,7 @@
 require_once dirname(__FILE__).'/httpclient_http_proxy.test.php';
 
 class httpclient_https_proxy_test extends httpclient_http_proxy_test {
-    protected $url = 'https://test.dokuwiki.org/README';
+    protected $url = 'https://httpbin.org/user-agent';
 
     public function setUp(){
         // skip tests when this PHP has no SSL support
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 24b3a8d78..092216c57 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -592,20 +592,22 @@ class HTTPClient {
             // set correct peer name for verification (enabled since PHP 5.6)
             stream_context_set_option($socket, 'ssl', 'peer_name', $requestinfo['host']);
 
-            // Because of older PHP versions having trouble with TLS (enable_crypto returns true, but
-            // the conection still borks) we try SSLv3 first
-            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) {
+            // because SSLv3 is mostly broken, we try TLS connections here first.
+            // according to  https://github.com/splitbrain/dokuwiki/commit/c05ef534 we had problems with certain
+            // setups with this solution before, but we have no usable test for that and TLS should be the more
+            // common crypto by now
+            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
                 $requesturl = $requestinfo['path'];
                 return true;
             }
 
-            // If the proxy does not support SSLv3 we try TLS
-            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+            // if the above failed, this will most probably not work either, but we can try
+            if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) {
                 $requesturl = $requestinfo['path'];
                 return true;
             }
 
-            throw new HTTPClientException('Failed to set up crypto for secure proxy connection', -151);
+            throw new HTTPClientException('Failed to set up crypto for secure connection to '.$requestinfo['host'], -151);
         }
 
         throw new HTTPClientException('Failed to establish secure proxy connection', -150);
-- 
cgit v1.2.3


From f23f95941a400702f525923973f3612df6da82cb Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 18 Mar 2015 22:16:34 +0100
Subject: SECURITY escape user properties in user manager #1081

The user properties (login, real name, etc) where not properly escaped
in the user manager's edit form. This allowed a XSS attack on the
superuser by registered users.

Thanks to Filippo Cavallarin from www.segment.technology for discovering
this bug.
---
 lib/plugins/usermanager/admin.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index cc4c4ae47..9cb9b0c40 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -222,9 +222,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
                  */
                 $groups = join(', ',$grps);
                 ptln("    <tr class=\"user_info\">");
-                ptln("      <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".$user."]\" ".$delete_disable." /></td>");
+                ptln("      <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".hsc($user)."]\" ".$delete_disable." /></td>");
                 if ($editable) {
-                    ptln("    <td><a href=\"".wl($ID,array('fn[edit]['.hsc($user).']' => 1,
+                    ptln("    <td><a href=\"".wl($ID,array('fn[edit]['.$user.']' => 1,
                                                            'do' => 'admin',
                                                            'page' => 'usermanager',
                                                            'sectok' => getSecurityToken())).
@@ -356,7 +356,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         // save current $user, we need this to access details if the name is changed
         if ($user)
-          ptln("          <input type=\"hidden\" name=\"userid_old\"  value=\"".$user."\" />",$indent);
+          ptln("          <input type=\"hidden\" name=\"userid_old\"  value=\"".hsc($user)."\" />",$indent);
 
         $this->_htmlFilterSettings($indent+10);
 
@@ -401,6 +401,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             $fieldtype = 'text';
             $autocomp  = '';
         }
+        $value = hsc($value);
 
         echo "<tr $class>";
         echo "<td><label for=\"$id\" >$label: </label></td>";
-- 
cgit v1.2.3


From 8599a179b08d4cdcf1c8895bacde82aad9df101f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 18 Mar 2015 22:43:45 +0100
Subject: corrupted the gz test file more

it seems that different zlib versions behave different with corrupted files.
Some return false, some return whatever they still can read from the
file. the file now should no longer be readable by any version.
---
 _test/tests/inc/io_readfile/corrupt.txt.gz | Bin 31 -> 31 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/_test/tests/inc/io_readfile/corrupt.txt.gz b/_test/tests/inc/io_readfile/corrupt.txt.gz
index f7f5d3397..9d7666f47 100644
Binary files a/_test/tests/inc/io_readfile/corrupt.txt.gz and b/_test/tests/inc/io_readfile/corrupt.txt.gz differ
-- 
cgit v1.2.3


From e738f3a729522b648b5148e3f3e0bbf15165b9a9 Mon Sep 17 00:00:00 2001
From: chang-zhao <chang-zhao@users.noreply.github.com>
Date: Sat, 21 Mar 2015 15:57:33 +0300
Subject: Update toolbar.js

When the picker button is near the border of the screen, then an opening panel of picker buttons can go over the screen edge. That's not convenient. So we should add a check in a `function pickerToggle()` and shift picker buttons position if needed.
---
 lib/scripts/toolbar.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 1bb02b406..a5f831ade 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -243,7 +243,20 @@ function pickerToggle(pickerid,$btn){
     } else {
         $picker.addClass('a11y').attr('aria-hidden', 'true');
     }
-    $picker.offset({left: pos.left+3, top: pos.top+$btn[0].offsetHeight+3});
+    var picker_left = pos.left + 3,
+        picker_width = $picker.width(),
+        window_width = jQuery(window).width();
+    if (picker_width > 300) {
+        $picker.css("max-width", "300");
+        picker_width = 300;
+    }
+    if ((picker_left + picker_width + 40) > window_width) {
+        picker_left = window_width - picker_width - 40;
+    }
+    if (picker_left < 0) {
+        picker_left = 0;
+    }
+    $picker.offset({left: picker_left, top: pos.top+$btn[0].offsetHeight+3});
 }
 
 /**
-- 
cgit v1.2.3


From 4d1e8edfed1d8b8025e900215ae05d0633b2a27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=B8=E0=A4=B0=E0=A5=8B=E0=A4=9C=20=E0=A4=A2=E0=A4=95?=
 =?UTF-8?q?=E0=A4=BE=E0=A4=B2?= <lotusnagarkot@gmail.com>
Date: Tue, 24 Mar 2015 11:15:33 +0100
Subject: translation update

---
 inc/lang/ne/adminplugins.txt |  1 +
 inc/lang/ne/lang.php         | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 inc/lang/ne/adminplugins.txt

diff --git a/inc/lang/ne/adminplugins.txt b/inc/lang/ne/adminplugins.txt
new file mode 100644
index 000000000..93eff63fb
--- /dev/null
+++ b/inc/lang/ne/adminplugins.txt
@@ -0,0 +1 @@
+===== थप प्लगिनहरू =====
\ No newline at end of file
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index d4efc89bd..88fb2a690 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -2,9 +2,10 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author Saroj Kumar Dhakal <lotusnagarkot@yahoo.com>
+ * @author सरोज ढकाल <lotusnagarkot@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -40,10 +41,17 @@ $lang['btn_backtomedia']       = 'मिडिया छनौटमा फर
 $lang['btn_subscribe']         = 'पृष्ठ परिवर्तन ग्राह्य गर्नुहोस्';
 $lang['btn_profile']           = 'प्रोफाइल अध्यावधिक गर्नुहोस् ';
 $lang['btn_reset']             = 'पूर्वरुपमा फर्काउनुहोस';
+$lang['btn_resendpwd']         = 'नयाँ पासवर्ड राख्नुहोस';
 $lang['btn_draft']             = ' ड्राफ्ट सम्पादन गर्नुहोस् ';
 $lang['btn_recover']           = 'पहिलेको ड्राफ्ट हासिल गर्नुहोस ';
 $lang['btn_draftdel']          = ' ड्राफ्ट मेटाउनुहोस् ';
+$lang['btn_revert']            = 'पूर्वरूपमा फर्काउने';
 $lang['btn_register']          = 'दर्ता  गर्नुहोस्';
+$lang['btn_apply']             = 'लागु गर्ने';
+$lang['btn_media']             = 'मेडिया व्यवस्थापक';
+$lang['btn_deleteuser']        = 'खाता हटाउने';
+$lang['btn_img_backto']        = 'फिर्ता%s';
+$lang['btn_mediaManager']      = 'मेडिया व्यवस्थापकमा हेर्ने';
 $lang['loggedinas']            = 'प्रवेश गर्नुहोस् :';
 $lang['user']                  = 'प्रयोगकर्ता ';
 $lang['pass']                  = 'प्रवेशशव्द';
@@ -55,6 +63,7 @@ $lang['fullname']              = 'पूरा नाम';
 $lang['email']                 = 'इमेल';
 $lang['profile']               = 'प्रयोगकर्ताको प्रोफाइल';
 $lang['badlogin']              = 'माफ गर्नुहोस् , प्रयोगकर्तानाम वा प्रवेशशव्द गलत भयो  ';
+$lang['badpassconfirm']        = 'माफ गर्नुहोस् , पासवर्ड गलत छ ';
 $lang['minoredit']             = 'सामान्य परिवर्तन';
 $lang['draftdate']             = 'ड्राफ्ट स्वचालित रुपमा वचत भएको';
 $lang['nosecedit']             = 'यो पृष्ठ यसै बखतमा परिवर्तन भयो, खण्ड जानकारी अध्यावधिक हुन सकेन र पूरै पृष्ठ लोड भयो । ';
@@ -72,6 +81,8 @@ $lang['profna']                = 'यो विकिले यो प्रो
 $lang['profnochange']          = 'केहि  परिवर्तन छैन , केहि गर्नु छैन ।';
 $lang['profnoempty']           = 'खाली नाम वा इमेल ठेगानालाई अनुमति छैन ।';
 $lang['profchanged']           = 'प्रयोगकर्ताको प्रफाइल सफलरुपमा परिवर्तन भयो ।';
+$lang['profnodelete']          = 'यो विकिले प्रयोगकर्ताहरू हटाउन समर्थन गर्दैन';
+$lang['profdeleteuser']        = 'खाता मेट्नुहोस';
 $lang['pwdforget']             = 'आफ्नो पासवर्ड भुल्नु भयो ? नयाँ हासिल गर्नुहोस् ';
 $lang['resendna']              = 'यो विकिबाट प्रवेशशव्द पठाउन समर्थित छैन ।';
 $lang['resendpwd']             = 'नयाँ  प्रवेशशव्द पठाउनुहोस् ';
@@ -90,6 +101,7 @@ $lang['js']['willexpire']      = 'तपाईलले यो पृष्ठ 
 $lang['js']['notsavedyet']     = 'तपाईले वचन गर्नु नभएको परिवर्रन हराउने छ। \n साच्चै जारी गर्नुहुन्छ ।';
 $lang['js']['keepopen']        = 'छनौटमा विन्डो खुला राख्नुहोस् ';
 $lang['js']['hidedetails']     = 'जानकारी लुकाउनु होस् ';
+$lang['js']['mediaclose']      = 'बन्द गर्ने';
 $lang['js']['nosmblinks']      = 'विन्डोहरु लिङ्क गर्दा माइक्रो सफ्ट एक्सप्लोररमामात्र  काम साझा हुन्छ । तर कपि गर्न र टास्न मिल्छ।   ';
 $lang['js']['del_confirm']     = 'साच्चै छानिएका वस्तुहरु मेट्ने हो ?';
 $lang['rssfailed']             = 'यो फिड लिइ आउदा गल्ति भयो ।';
@@ -159,7 +171,6 @@ $lang['admin_register']        = 'नयाँ प्रयोगकर्ता
 $lang['metaedit']              = 'मेटाडेटा सम्पादन गर्नुहोस्';
 $lang['metasaveerr']           = 'मेटाडाटा लेखन असफल';
 $lang['metasaveok']            = 'मेटाडाटा वचत भयो ';
-$lang['btn_img_backto']            = 'फिर्ता%s';
 $lang['img_title']             = 'शिर्षक:';
 $lang['img_caption']           = 'निम्न लेख:';
 $lang['img_date']              = 'मिति:';
-- 
cgit v1.2.3


From b07866dc2ca50e9cfd667c38641e1b93c0f88cd9 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 28 Mar 2015 02:16:11 +0100
Subject: translation update

---
 lib/plugins/authldap/lang/ko/settings.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/plugins/authldap/lang/ko/settings.php b/lib/plugins/authldap/lang/ko/settings.php
index e663ba063..d3e93ff51 100644
--- a/lib/plugins/authldap/lang/ko/settings.php
+++ b/lib/plugins/authldap/lang/ko/settings.php
@@ -19,9 +19,14 @@ $lang['binddn']                = '익명 바인드가 충분하지 않으면 선
 $lang['bindpw']                = '위 사용자의 비밀번호';
 $lang['userscope']             = '사용자 검색에 대한 검색 범위 제한';
 $lang['groupscope']            = '그룹 검색에 대한 검색 범위 제한';
+$lang['userkey']               = '사용자 이름을 나타내는 특성; 사용자 필터에 일관성이 있어야 합니다.';
 $lang['groupkey']              = '(표준 AD 그룹 대신) 사용자 속성에서 그룹 구성원. 예를 들어 부서나 전화에서 그룹';
+$lang['modPass']               = 'LDAP 비밀번호를 도쿠위키를 통해 바꿀 수 있습니까?';
 $lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이기';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = '기본값 사용';
+$lang['referrals_o_0']         = '참조 (referral)를 따르지 않음';
+$lang['referrals_o_1']         = '참조 (referral)를 따름';
-- 
cgit v1.2.3


From 605af2f6069a04742a008b2a08a601fdd2a7505e Mon Sep 17 00:00:00 2001
From: Jaroslav Lichtblau <jlichtblau@seznam.cz>
Date: Sat, 28 Mar 2015 07:36:33 +0100
Subject: translation update

---
 lib/plugins/authldap/lang/cs/settings.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/plugins/authldap/lang/cs/settings.php b/lib/plugins/authldap/lang/cs/settings.php
index a5aad5981..08c5c6a16 100644
--- a/lib/plugins/authldap/lang/cs/settings.php
+++ b/lib/plugins/authldap/lang/cs/settings.php
@@ -21,8 +21,12 @@ $lang['bindpw']                = 'Heslo uživatele výše';
 $lang['userscope']             = 'Omezení rozsahu vyhledávání uživatele';
 $lang['groupscope']            = 'Omezení rozsahu vyhledávání skupiny';
 $lang['groupkey']              = 'Atribut šlenství uživatele ve skupinách (namísto standardních AD skupin), tj. skupina z oddělení nebo telefonní číslo';
+$lang['modPass']               = 'Může být LDAP heslo změněno přes dokuwiki?';
 $lang['debug']                 = 'Zobrazit dodatečné debugovací informace';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'použít výchozí';
+$lang['referrals_o_0']         = 'nenásledovat odkazy';
+$lang['referrals_o_1']         = 'následovat odkazy';
-- 
cgit v1.2.3


From ecd3aee0583064e4805c3df7a94cf80495af12e9 Mon Sep 17 00:00:00 2001
From: Alejandro Nunez <nunez.alejandro@gmail.com>
Date: Tue, 31 Mar 2015 03:51:09 +0200
Subject: translation update

---
 inc/lang/es/lang.php                       | 2 ++
 lib/plugins/authldap/lang/es/settings.php  | 5 +++++
 lib/plugins/authmysql/lang/es/settings.php | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 865110ab9..cd81b834b 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -38,6 +38,7 @@
  * @author Jonathan Hernández <me@jhalicea.com>
  * @author pokesakura <pokesakura@gmail.com>
  * @author Álvaro Iradier <airadier@gmail.com>
+ * @author Alejandro Nunez <nunez.alejandro@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -371,3 +372,4 @@ $lang['searchresult']          = 'Resultado de la búsqueda';
 $lang['plainhtml']             = 'HTML sencillo';
 $lang['wikimarkup']            = 'Etiquetado Wiki';
 $lang['page_nonexist_rev']     = 'La página no existía en %s. Por tanto fue creada en <a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'Incapaz de evaluar el parámetro "%s".';
diff --git a/lib/plugins/authldap/lang/es/settings.php b/lib/plugins/authldap/lang/es/settings.php
index 6991546d3..8e1d0b4e1 100644
--- a/lib/plugins/authldap/lang/es/settings.php
+++ b/lib/plugins/authldap/lang/es/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Eloy <ej.perezgomez@gmail.com>
+ * @author Alejandro Nunez <nunez.alejandro@gmail.com>
  */
 $lang['server']                = 'Tu servidor LDAP. Puede ser el nombre del host  (<code>localhost</code>) o una URL completa (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'Servidor LDAP en caso de que no se diera la URL completa anteriormente.';
@@ -20,8 +21,12 @@ $lang['bindpw']                = 'Contraseña del usuario de arriba.';
 $lang['userscope']             = 'Limitar ámbito de búsqueda para búsqueda de usuarios';
 $lang['groupscope']            = 'Limitar ámbito de búsqueda para búsqueda de grupos';
 $lang['groupkey']              = 'Pertenencia al grupo desde cualquier atributo de usuario (en lugar de grupos AD estándar) p.e., grupo a partir departamento o número de teléfono';
+$lang['modPass']               = 'Puede ser cambiara via dokuwiki la password LDAP?';
 $lang['debug']                 = 'Mostrar información adicional para depuración de errores';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'usar default';
+$lang['referrals_o_0']         = 'no seguir referencias';
+$lang['referrals_o_1']         = 'seguir referencias';
diff --git a/lib/plugins/authmysql/lang/es/settings.php b/lib/plugins/authmysql/lang/es/settings.php
index b82620fc6..cda3c23f8 100644
--- a/lib/plugins/authmysql/lang/es/settings.php
+++ b/lib/plugins/authmysql/lang/es/settings.php
@@ -6,6 +6,7 @@
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Eloy <ej.perezgomez@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
+ * @author Alejandro Nunez <nunez.alejandro@gmail.com>
  */
 $lang['server']                = 'Tu servidor MySQL';
 $lang['user']                  = 'Nombre de usuario MySQL';
@@ -32,6 +33,10 @@ $lang['getUserID']             = 'Sentencia SQL para obtener la clave primaria d
 $lang['delUser']               = 'Sentencia SQL para eliminar un usuario';
 $lang['delUserRefs']           = 'Sentencia SQL para eliminar un usuario de todos los grupos';
 $lang['updateUser']            = 'Sentencia SQL para actualizar un perfil de usuario';
+$lang['UpdateLogin']           = 'Cláusula de actualización para actualizar el login del usuario';
+$lang['UpdatePass']            = 'Cláusula de actualización para actualizar la contraseña del usuario';
+$lang['UpdateEmail']           = 'Cláusula de actualización para actualizar la dirección de correo del usuario';
+$lang['UpdateName']            = 'Cláusula de actualización para actualizar el nomblre completo del usuario';
 $lang['delUserGroup']          = 'Sentencia SQL para eliminar un usuario de un grupo dado';
 $lang['getGroupID']            = 'Sentencia SQL para obtener la clave principal de un grupo dado';
 $lang['debug_o_0']             = 'ninguno';
-- 
cgit v1.2.3


From fa4038c7f40f348e1335253ce6fb5600106b0233 Mon Sep 17 00:00:00 2001
From: Romulo Pereira <romuloccomp@gmail.com>
Date: Tue, 31 Mar 2015 21:52:22 +0200
Subject: translation update

---
 inc/lang/pt/lang.php                      | 1 +
 lib/plugins/authldap/lang/pt/settings.php | 4 ++++
 lib/plugins/extension/lang/pt/lang.php    | 1 +
 lib/plugins/usermanager/lang/pt/lang.php  | 1 +
 4 files changed, 7 insertions(+)

diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 5d462e198..cfb85a91c 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -12,6 +12,7 @@
  * @author Murilo <muriloricci@hotmail.com>
  * @author Paulo Silva <paulotsilva@yahoo.com>
  * @author Guido Salatino <guidorafael23@gmail.com>
+ * @author Romulo Pereira <romuloccomp@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/authldap/lang/pt/settings.php b/lib/plugins/authldap/lang/pt/settings.php
index b54f2a1bc..d9d1b7f11 100644
--- a/lib/plugins/authldap/lang/pt/settings.php
+++ b/lib/plugins/authldap/lang/pt/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author André Neves <drakferion@gmail.com>
  * @author Guido Salatino <guidorafael23@gmail.com>
+ * @author Romulo Pereira <romuloccomp@gmail.com>
  */
 $lang['server']                = 'O seu servidor de LDAP. Ou hostname (<code>localhost</code>) ou URL qualificado completo (<code>ldap://servidor.tld:389</code>)';
 $lang['port']                  = 'Porta de servidor de LDAP se o URL completo não foi fornecido acima';
@@ -26,3 +27,6 @@ $lang['deref_o_0']             = 'LDAP_DEREF_NUNCA';
 $lang['deref_o_1']             = 'LDAP_DEREF_PESQUISANDO';
 $lang['deref_o_2']             = 'LDAP_DEREF_BUSCANDO';
 $lang['deref_o_3']             = 'LDAP_DEREF_SEMPRE';
+$lang['referrals_o_-1']        = 'usar padrão';
+$lang['referrals_o_0']         = 'não seguir as referências';
+$lang['referrals_o_1']         = 'seguir as referências';
diff --git a/lib/plugins/extension/lang/pt/lang.php b/lib/plugins/extension/lang/pt/lang.php
index c7b4f29c2..c9ca8d976 100644
--- a/lib/plugins/extension/lang/pt/lang.php
+++ b/lib/plugins/extension/lang/pt/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Guido Salatino <guidorafael23@gmail.com>
+ * @author Romulo Pereira <romuloccomp@gmail.com>
  */
 $lang['menu']                  = 'Gerenciador de Extensões';
 $lang['tab_plugins']           = 'Plugins Instalados';
diff --git a/lib/plugins/usermanager/lang/pt/lang.php b/lib/plugins/usermanager/lang/pt/lang.php
index 43ea69e53..ee6eaf4f5 100644
--- a/lib/plugins/usermanager/lang/pt/lang.php
+++ b/lib/plugins/usermanager/lang/pt/lang.php
@@ -9,6 +9,7 @@
  * @author André Neves <drakferion@gmail.com>
  * @author José Campos zecarlosdecampos@gmail.com
  * @author Guido Salatino <guidorafael23@gmail.com>
+ * @author Romulo Pereira <romuloccomp@gmail.com>
  */
 $lang['menu']                  = 'Gestor de Perfis';
 $lang['noauth']                = '(autenticação indisponível)';
-- 
cgit v1.2.3


From 5b795a651d514c6889ad05abc4e58de67c7af92e Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Tue, 31 Mar 2015 21:53:01 -0400
Subject: Move language string to authad plugin

---
 lib/plugins/authad/auth.php                  | 2 +-
 lib/plugins/authad/lang/ar/lang.php          | 2 ++
 lib/plugins/authad/lang/bg/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/ca/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/cs/lang.php          | 2 ++
 lib/plugins/authad/lang/da/lang.php          | 2 ++
 lib/plugins/authad/lang/de-informal/lang.php | 8 ++++++++
 lib/plugins/authad/lang/de/lang.php          | 1 +
 lib/plugins/authad/lang/el/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/en/lang.php          | 2 ++
 lib/plugins/authad/lang/eo/lang.php          | 1 +
 lib/plugins/authad/lang/es/lang.php          | 2 ++
 lib/plugins/authad/lang/et/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/eu/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/fa/lang.php          | 2 ++
 lib/plugins/authad/lang/fi/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/fr/lang.php          | 2 ++
 lib/plugins/authad/lang/gl/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/he/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/hr/lang.php          | 1 +
 lib/plugins/authad/lang/hu/lang.php          | 1 +
 lib/plugins/authad/lang/it/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/ja/lang.php          | 2 ++
 lib/plugins/authad/lang/ka/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/ko/lang.php          | 1 +
 lib/plugins/authad/lang/lv/lang.php          | 1 +
 lib/plugins/authad/lang/nl/lang.php          | 2 ++
 lib/plugins/authad/lang/no/lang.php          | 2 ++
 lib/plugins/authad/lang/pl/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/pt-br/lang.php       | 2 ++
 lib/plugins/authad/lang/pt/lang.php          | 2 ++
 lib/plugins/authad/lang/ro/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/ru/lang.php          | 1 +
 lib/plugins/authad/lang/sk/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/sl/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/sv/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/tr/lang.php          | 8 ++++++++
 lib/plugins/authad/lang/zh-tw/lang.php       | 2 ++
 lib/plugins/authad/lang/zh/lang.php          | 1 +
 39 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/authad/lang/bg/lang.php
 create mode 100644 lib/plugins/authad/lang/ca/lang.php
 create mode 100644 lib/plugins/authad/lang/de-informal/lang.php
 create mode 100644 lib/plugins/authad/lang/el/lang.php
 create mode 100644 lib/plugins/authad/lang/et/lang.php
 create mode 100644 lib/plugins/authad/lang/eu/lang.php
 create mode 100644 lib/plugins/authad/lang/fi/lang.php
 create mode 100644 lib/plugins/authad/lang/gl/lang.php
 create mode 100644 lib/plugins/authad/lang/he/lang.php
 create mode 100644 lib/plugins/authad/lang/it/lang.php
 create mode 100644 lib/plugins/authad/lang/ka/lang.php
 create mode 100644 lib/plugins/authad/lang/pl/lang.php
 create mode 100644 lib/plugins/authad/lang/ro/lang.php
 create mode 100644 lib/plugins/authad/lang/sk/lang.php
 create mode 100644 lib/plugins/authad/lang/sl/lang.php
 create mode 100644 lib/plugins/authad/lang/sv/lang.php
 create mode 100644 lib/plugins/authad/lang/tr/lang.php

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 400a5efee..40c56ef09 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -258,7 +258,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
                     ($info['expiresin'] <= $this->conf['expirywarn']) &&
                     !$this->msgshown
                 ) {
-                    $msg = sprintf($lang['authpwdexpire'], $info['expiresin']);
+                    $msg = sprintf($this->getLang('authpwdexpire'), $info['expiresin']);
                     if($this->canDo('modPass')) {
                         $url = wl($ID, array('do'=> 'profile'));
                         $msg .= ' <a href="'.$url.'">'.$lang['btn_profile'].'</a>';
diff --git a/lib/plugins/authad/lang/ar/lang.php b/lib/plugins/authad/lang/ar/lang.php
index e0ba7681a..173c80f0c 100644
--- a/lib/plugins/authad/lang/ar/lang.php
+++ b/lib/plugins/authad/lang/ar/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Mohamed Belhsine <b.mohamed897@gmail.com>
+ * @author Usama Akkad <uahello@gmail.com>
  */
 $lang['domain']                = 'مجال تسجيل الدخول';
+$lang['authpwdexpire']         = 'ستنتهي صلاحية كلمة السر في %d . عليك بتغييرها سريعا.';
diff --git a/lib/plugins/authad/lang/bg/lang.php b/lib/plugins/authad/lang/bg/lang.php
new file mode 100644
index 000000000..3de5df65f
--- /dev/null
+++ b/lib/plugins/authad/lang/bg/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Kiril <neohidra@gmail.com>
+ */
+$lang['authpwdexpire']         = 'Срока на паролата ви ще изтече след %d дни. Препоръчително е да я смените по-скоро.';
diff --git a/lib/plugins/authad/lang/ca/lang.php b/lib/plugins/authad/lang/ca/lang.php
new file mode 100644
index 000000000..abe25a5f2
--- /dev/null
+++ b/lib/plugins/authad/lang/ca/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Daniel López Prat <daniel@6temes.cat>
+ */
+$lang['authpwdexpire']         = 'La vostra contrasenya caducarà en %d dies, l\'hauríeu de canviar aviat.';
diff --git a/lib/plugins/authad/lang/cs/lang.php b/lib/plugins/authad/lang/cs/lang.php
index 8119d208a..ad141153f 100644
--- a/lib/plugins/authad/lang/cs/lang.php
+++ b/lib/plugins/authad/lang/cs/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
+ * @author Miroslav Svoboda <msv@email.cz>
  */
 $lang['domain']                = 'Přihlašovací doména';
+$lang['authpwdexpire']         = 'Platnost vašeho hesla vyprší za %d dní, měli byste ho změnit co nejdříve.';
diff --git a/lib/plugins/authad/lang/da/lang.php b/lib/plugins/authad/lang/da/lang.php
index 8fc7db775..3d0730216 100644
--- a/lib/plugins/authad/lang/da/lang.php
+++ b/lib/plugins/authad/lang/da/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Jacob Palm <mail@jacobpalm.dk>
+ * @author Mikael Lyngvig <mikael@lyngvig.org>
  */
 $lang['domain']                = 'Logondomæne';
+$lang['authpwdexpire']         = 'Din adgangskode vil udløbe om %d dage, du bør ændre det snart.';
diff --git a/lib/plugins/authad/lang/de-informal/lang.php b/lib/plugins/authad/lang/de-informal/lang.php
new file mode 100644
index 000000000..e9361d5fe
--- /dev/null
+++ b/lib/plugins/authad/lang/de-informal/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+$lang['authpwdexpire']         = 'Dein Passwort läuft in %d Tag(en) ab. Du solltest es es frühzeitig ändern.';
diff --git a/lib/plugins/authad/lang/de/lang.php b/lib/plugins/authad/lang/de/lang.php
index eea511d1b..11f52a414 100644
--- a/lib/plugins/authad/lang/de/lang.php
+++ b/lib/plugins/authad/lang/de/lang.php
@@ -6,3 +6,4 @@
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
 $lang['domain']                = 'Anmelde-Domäne';
+$lang['authpwdexpire']         = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es frühzeitig ändern.';
diff --git a/lib/plugins/authad/lang/el/lang.php b/lib/plugins/authad/lang/el/lang.php
new file mode 100644
index 000000000..39e3283cc
--- /dev/null
+++ b/lib/plugins/authad/lang/el/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ */
+$lang['authpwdexpire']         = 'Ο κωδικός πρόσβασης θα λήξει σε %d ημέρες. Προτείνουμε να τον αλλάξετε σύντομα.';
diff --git a/lib/plugins/authad/lang/en/lang.php b/lib/plugins/authad/lang/en/lang.php
index e2967d662..4f96a71fd 100644
--- a/lib/plugins/authad/lang/en/lang.php
+++ b/lib/plugins/authad/lang/en/lang.php
@@ -1,10 +1,12 @@
 <?php
 /**
  * English language file for addomain plugin
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
 
 $lang['domain'] = 'Logon Domain';
+$lang['authpwdexpire']         = 'Your password will expire in %d days, you should change it soon.';
 
 //Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/authad/lang/eo/lang.php b/lib/plugins/authad/lang/eo/lang.php
index be4abc123..e738323da 100644
--- a/lib/plugins/authad/lang/eo/lang.php
+++ b/lib/plugins/authad/lang/eo/lang.php
@@ -6,3 +6,4 @@
  * @author Robert Bogenschneider <bogi@uea.org>
  */
 $lang['domain']                = 'Ensaluta domajno';
+$lang['authpwdexpire']         = 'Via pasvorto malvalidos post %d tagoj, prefere ŝanĝu ĝin baldaũ.';
diff --git a/lib/plugins/authad/lang/es/lang.php b/lib/plugins/authad/lang/es/lang.php
index c5b242cba..ffbff49a1 100644
--- a/lib/plugins/authad/lang/es/lang.php
+++ b/lib/plugins/authad/lang/es/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Juan De La Cruz <juann.dlc@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['domain']                = 'Dominio de inicio';
+$lang['authpwdexpire']         = 'Su contraseña caducara en %d días, debería cambiarla lo antes posible';
diff --git a/lib/plugins/authad/lang/et/lang.php b/lib/plugins/authad/lang/et/lang.php
new file mode 100644
index 000000000..6dda19360
--- /dev/null
+++ b/lib/plugins/authad/lang/et/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Janar Leas <janar.leas@eesti.ee>
+ */
+$lang['authpwdexpire']         = 'Sinu salasõna aegub %päeva pärast, võiksid seda peatselt muuta.';
diff --git a/lib/plugins/authad/lang/eu/lang.php b/lib/plugins/authad/lang/eu/lang.php
new file mode 100644
index 000000000..454e3be34
--- /dev/null
+++ b/lib/plugins/authad/lang/eu/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Zigor Astarbe <astarbe@gmail.com>
+ */
+$lang['authpwdexpire']         = 'Zure pasahitza %d egun barru iraungiko da, laster aldatu beharko zenuke.';
diff --git a/lib/plugins/authad/lang/fa/lang.php b/lib/plugins/authad/lang/fa/lang.php
index 1ea73cfdb..646142331 100644
--- a/lib/plugins/authad/lang/fa/lang.php
+++ b/lib/plugins/authad/lang/fa/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Hamid <zarrabi@sharif.edu>
+ * @author Milad DZand <M.DastanZand@gmail.com>
  */
 $lang['domain']                = 'دامنه‌ی ورود';
+$lang['authpwdexpire']         = 'کلمه عبور شما در %d روز منقضی خواهد شد ، شما باید آن را زود تغییر دهید';
diff --git a/lib/plugins/authad/lang/fi/lang.php b/lib/plugins/authad/lang/fi/lang.php
new file mode 100644
index 000000000..650d44f7a
--- /dev/null
+++ b/lib/plugins/authad/lang/fi/lang.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Jussi Takala <jussi.takala@live.fi>
+ */
+
+$lang['authpwdexpire']         = 'Salasanasi vanhenee %d pv:n päästä, vaihda salasanasi pikaisesti.';
diff --git a/lib/plugins/authad/lang/fr/lang.php b/lib/plugins/authad/lang/fr/lang.php
index 2de362e41..4999967dc 100644
--- a/lib/plugins/authad/lang/fr/lang.php
+++ b/lib/plugins/authad/lang/fr/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author ggallon <gwenael.gallon@mac.com>
+ * @author Yannick Aure <yannick.aure@gmail.com>
  */
 $lang['domain']                = 'Domaine de connexion';
+$lang['authpwdexpire']         = 'Votre mot de passe expirera dans %d jours, vous devriez le changer bientôt.';
diff --git a/lib/plugins/authad/lang/gl/lang.php b/lib/plugins/authad/lang/gl/lang.php
new file mode 100644
index 000000000..b10126a88
--- /dev/null
+++ b/lib/plugins/authad/lang/gl/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Rodrigo Rega <rodrigorega@gmail.com>
+ */
+$lang['authpwdexpire']         = 'A túa contrasinal expirará en %d días, deberías cambiala pronto.';
diff --git a/lib/plugins/authad/lang/he/lang.php b/lib/plugins/authad/lang/he/lang.php
new file mode 100644
index 000000000..21fd98aef
--- /dev/null
+++ b/lib/plugins/authad/lang/he/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author tomer <tomercarolldergicz@gmail.com>
+ */
+$lang['authpwdexpire']         = 'הסיסמה שלך תפוג ב% d ימים, אתה צריך לשנות את זה בקרוב.';
diff --git a/lib/plugins/authad/lang/hr/lang.php b/lib/plugins/authad/lang/hr/lang.php
index f750c91b5..8652c69ed 100644
--- a/lib/plugins/authad/lang/hr/lang.php
+++ b/lib/plugins/authad/lang/hr/lang.php
@@ -6,3 +6,4 @@
  * @author Davor Turkalj <turki.bsc@gmail.com>
  */
 $lang['domain']                = 'Domena za prijavu';
+$lang['authpwdexpire']         = 'Vaša lozinka će isteći za %d dana, trebate ju promijeniti.';
diff --git a/lib/plugins/authad/lang/hu/lang.php b/lib/plugins/authad/lang/hu/lang.php
index 7bb6084b0..f5692de04 100644
--- a/lib/plugins/authad/lang/hu/lang.php
+++ b/lib/plugins/authad/lang/hu/lang.php
@@ -6,3 +6,4 @@
  * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['domain']                = 'Bejelentkezési tartomány';
+$lang['authpwdexpire']         = 'A jelszavad %d nap múlva lejár, hamarosan meg kell változtatnod.';
diff --git a/lib/plugins/authad/lang/it/lang.php b/lib/plugins/authad/lang/it/lang.php
new file mode 100644
index 000000000..5f1a03cd4
--- /dev/null
+++ b/lib/plugins/authad/lang/it/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Matteo Pasotti <matteo@xquiet.eu>
+ */
+$lang['authpwdexpire']         = 'La tua password scadrà in %d giorni, dovresti cambiarla quanto prima.';
diff --git a/lib/plugins/authad/lang/ja/lang.php b/lib/plugins/authad/lang/ja/lang.php
index b40aa5da3..91c4f046a 100644
--- a/lib/plugins/authad/lang/ja/lang.php
+++ b/lib/plugins/authad/lang/ja/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author PzF_X <jp_minecraft@yahoo.co.jp>
+ * @author Osaka <mr.osaka@gmail.com>
  */
 $lang['domain']                = 'ログオン時のドメイン';
+$lang['authpwdexpire']         = 'あなたのパスワードは、あと%d日で有効期限が切れます。パスワードを変更してください。';
diff --git a/lib/plugins/authad/lang/ka/lang.php b/lib/plugins/authad/lang/ka/lang.php
new file mode 100644
index 000000000..ab0c86902
--- /dev/null
+++ b/lib/plugins/authad/lang/ka/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Luka Lejava <luka.lejava@gmail.com>
+ */
+$lang['authpwdexpire']         = 'თქვენს პაროლს ვადა გაუვა %d დღეში, მალე შეცვლა მოგიწევთ.';
diff --git a/lib/plugins/authad/lang/ko/lang.php b/lib/plugins/authad/lang/ko/lang.php
index 5a2416b2c..c119fabc5 100644
--- a/lib/plugins/authad/lang/ko/lang.php
+++ b/lib/plugins/authad/lang/ko/lang.php
@@ -6,3 +6,4 @@
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['domain']                = '로그온 도메인';
+$lang['authpwdexpire']         = '비밀번호를 바꾼지 %d일이 지났으며, 비밀번호를 곧 바꿔야 합니다.';
diff --git a/lib/plugins/authad/lang/lv/lang.php b/lib/plugins/authad/lang/lv/lang.php
index 74becf756..a208ac949 100644
--- a/lib/plugins/authad/lang/lv/lang.php
+++ b/lib/plugins/authad/lang/lv/lang.php
@@ -6,3 +6,4 @@
  * @author Aivars Miška <allefm@gmail.com>
  */
 $lang['domain']                = 'Iežurnālēšanās domēns';
+$lang['authpwdexpire']         = 'Tavai parolei pēc %d dienām biegsies termiņš, tā drīzumā jānomaina.';
diff --git a/lib/plugins/authad/lang/nl/lang.php b/lib/plugins/authad/lang/nl/lang.php
index ea8419069..bd241a0a9 100644
--- a/lib/plugins/authad/lang/nl/lang.php
+++ b/lib/plugins/authad/lang/nl/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Rene <wllywlnt@yahoo.com>
+ * @author Dion Nicolaas <dion@nicolaas.net>
  */
 $lang['domain']                = 'Inlog Domein';
+$lang['authpwdexpire']         = 'Je wachtwoord verloopt in %d dagen, je moet het binnenkort veranderen';
diff --git a/lib/plugins/authad/lang/no/lang.php b/lib/plugins/authad/lang/no/lang.php
index a1c9c7e8a..f8dbb0b08 100644
--- a/lib/plugins/authad/lang/no/lang.php
+++ b/lib/plugins/authad/lang/no/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Patrick <spill.p@hotmail.com>
+ * @author Thomas Juberg <Thomas.Juberg@Gmail.com>
  */
 $lang['domain']                = 'Loggpå-domene';
+$lang['authpwdexpire']         = 'Ditt passord går ut om %d dager, du bør endre det snarest.';
diff --git a/lib/plugins/authad/lang/pl/lang.php b/lib/plugins/authad/lang/pl/lang.php
new file mode 100644
index 000000000..645b46afa
--- /dev/null
+++ b/lib/plugins/authad/lang/pl/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Aoi Karasu <aoikarasu@gmail.com>
+ */
+$lang['authpwdexpire']         = 'Twoje hasło wygaśnie za %d dni. Należy je zmienić w krótkim czasie.';
diff --git a/lib/plugins/authad/lang/pt-br/lang.php b/lib/plugins/authad/lang/pt-br/lang.php
index 5fa963d4e..9dc731b05 100644
--- a/lib/plugins/authad/lang/pt-br/lang.php
+++ b/lib/plugins/authad/lang/pt-br/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Felipe Castro <fefcas@gmail.com>
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  */
 $lang['domain']                = 'Domínio de "Logon"';
+$lang['authpwdexpire']         = 'Sua senha vai expirar em %d dias. Você deve mudá-la assim que for possível.';
diff --git a/lib/plugins/authad/lang/pt/lang.php b/lib/plugins/authad/lang/pt/lang.php
index f307bc901..919534231 100644
--- a/lib/plugins/authad/lang/pt/lang.php
+++ b/lib/plugins/authad/lang/pt/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Paulo Silva <paulotsilva@yahoo.com>
+ * @author André Neves <drakferion@gmail.com>
  */
 $lang['domain']                = 'Domínio de Início de Sessão';
+$lang['authpwdexpire']         = 'A sua senha expirará dentro de %d dias, deve mudá-la em breve.';
diff --git a/lib/plugins/authad/lang/ro/lang.php b/lib/plugins/authad/lang/ro/lang.php
new file mode 100644
index 000000000..28a0e1e64
--- /dev/null
+++ b/lib/plugins/authad/lang/ro/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Razvan Deaconescu <razvan.deaconescu@cs.pub.ro>
+ */
+$lang['authpwdexpire']         = 'Parola va expira în %d zile, ar trebui să o schimbi în curând.';
diff --git a/lib/plugins/authad/lang/ru/lang.php b/lib/plugins/authad/lang/ru/lang.php
index 6f3c03e39..6a3f6e995 100644
--- a/lib/plugins/authad/lang/ru/lang.php
+++ b/lib/plugins/authad/lang/ru/lang.php
@@ -6,3 +6,4 @@
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  */
 $lang['domain']                = 'Домен';
+$lang['authpwdexpire']         = 'Действие вашего пароля истекает через %d дней. Вы должны изменить его как можно скорее';
diff --git a/lib/plugins/authad/lang/sk/lang.php b/lib/plugins/authad/lang/sk/lang.php
new file mode 100644
index 000000000..cb0698f46
--- /dev/null
+++ b/lib/plugins/authad/lang/sk/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Martin Michalek <michalek.dev@gmail.com>
+ */
+$lang['authpwdexpire']         = 'Platnosť hesla vyprší za %d dní, mali by ste ho zmeniť čo najskôr.';
diff --git a/lib/plugins/authad/lang/sl/lang.php b/lib/plugins/authad/lang/sl/lang.php
new file mode 100644
index 000000000..dc7b3567a
--- /dev/null
+++ b/lib/plugins/authad/lang/sl/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author matej <mateju@svn.gnome.org>
+ */
+$lang['authpwdexpire']         = 'Geslo bo poteklo v %d dneh. Priporočljivo ga je zamenjati.';
diff --git a/lib/plugins/authad/lang/sv/lang.php b/lib/plugins/authad/lang/sv/lang.php
new file mode 100644
index 000000000..f253ae7fe
--- /dev/null
+++ b/lib/plugins/authad/lang/sv/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['authpwdexpire']         = 'Ditt lösenord kommer att bli ogiltigt om %d dagar, du bör ändra det snart.';
diff --git a/lib/plugins/authad/lang/tr/lang.php b/lib/plugins/authad/lang/tr/lang.php
new file mode 100644
index 000000000..2336e0f0c
--- /dev/null
+++ b/lib/plugins/authad/lang/tr/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author farukerdemoncel@gmail.com
+ */
+$lang['authpwdexpire']         = 'Şifreniz %d gün sonra geçersiz hale gelecek, yakın bir zamanda değiştirmelisiniz.';
diff --git a/lib/plugins/authad/lang/zh-tw/lang.php b/lib/plugins/authad/lang/zh-tw/lang.php
index 6ad0947a2..b2ce48535 100644
--- a/lib/plugins/authad/lang/zh-tw/lang.php
+++ b/lib/plugins/authad/lang/zh-tw/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author June-Hao Hou <junehao@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
 $lang['domain']                = '登入網域';
+$lang['authpwdexpire']         = '您的密碼將在 %d 天內到期，請馬上更換新密碼。';
diff --git a/lib/plugins/authad/lang/zh/lang.php b/lib/plugins/authad/lang/zh/lang.php
index 2a05aa168..4f3794999 100644
--- a/lib/plugins/authad/lang/zh/lang.php
+++ b/lib/plugins/authad/lang/zh/lang.php
@@ -6,3 +6,4 @@
  * @author lainme <lainme993@gmail.com>
  */
 $lang['domain']                = '登录域';
+$lang['authpwdexpire']         = '您的密码将在 %d 天内过期，请尽快更改';
-- 
cgit v1.2.3


From f8095446e4d8d2bca535087d6e9dbcd20106d21d Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 1 Apr 2015 19:48:03 +0100
Subject: add more plugin groups to authplain test

---
 lib/plugins/authplain/_test/escaping.test.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php
index e1eade8d4..7139aa99b 100644
--- a/lib/plugins/authplain/_test/escaping.test.php
+++ b/lib/plugins/authplain/_test/escaping.test.php
@@ -9,7 +9,9 @@
  * authplain won't get unexpectedly surprised.)
  *
  * @group plugin_authplain
+ * @group auth_plugins
  * @group plugins
+ * @group bundled_plugins
  */
 class helper_plugin_authplain_escaping_test extends DokuWikiTest {
 
-- 
cgit v1.2.3


From 0bfc5a9124c0a505f64434061076c8da4d89d186 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 1 Apr 2015 19:48:26 +0100
Subject: add plugin groups to config plugin test

---
 lib/plugins/config/_test/configuration.test.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/plugins/config/_test/configuration.test.php b/lib/plugins/config/_test/configuration.test.php
index b808ad505..6e9eb0cc6 100644
--- a/lib/plugins/config/_test/configuration.test.php
+++ b/lib/plugins/config/_test/configuration.test.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * @group plugin_config
+ * @group admin_plugins
+ * @group plugins
+ * @group bundled_plugins
+ */
 
 class plugin_config_configuration_test extends DokuWikiTest {
 
-- 
cgit v1.2.3


From 247faa0e1e35a1aea8f23606e74a3d667333ae6b Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Fri, 3 Apr 2015 21:56:27 -0400
Subject: Remove unused language strings

---
 inc/lang/af/lang.php          | 2 --
 inc/lang/ar/lang.php          | 3 ---
 inc/lang/az/lang.php          | 3 ---
 inc/lang/bg/lang.php          | 3 ---
 inc/lang/bn/lang.php          | 2 --
 inc/lang/ca-valencia/lang.php | 3 ---
 inc/lang/ca/lang.php          | 3 ---
 inc/lang/cs/lang.php          | 3 ---
 inc/lang/da/lang.php          | 3 ---
 inc/lang/de-informal/lang.php | 3 ---
 inc/lang/de/lang.php          | 3 ---
 inc/lang/el/lang.php          | 3 ---
 inc/lang/en/lang.php          | 4 ----
 inc/lang/eo/lang.php          | 3 ---
 inc/lang/es/lang.php          | 3 ---
 inc/lang/et/lang.php          | 3 ---
 inc/lang/eu/lang.php          | 3 ---
 inc/lang/fa/lang.php          | 3 ---
 inc/lang/fi/lang.php          | 3 ---
 inc/lang/fo/lang.php          | 3 ---
 inc/lang/fr/lang.php          | 3 ---
 inc/lang/gl/lang.php          | 3 ---
 inc/lang/he/lang.php          | 3 ---
 inc/lang/hi/lang.php          | 2 --
 inc/lang/hr/lang.php          | 3 ---
 inc/lang/hu/lang.php          | 3 ---
 inc/lang/ia/lang.php          | 3 ---
 inc/lang/id-ni/lang.php       | 1 -
 inc/lang/id/lang.php          | 3 ---
 inc/lang/is/lang.php          | 3 ---
 inc/lang/it/lang.php          | 3 ---
 inc/lang/ja/lang.php          | 3 ---
 inc/lang/ka/lang.php          | 3 ---
 inc/lang/kk/lang.php          | 1 -
 inc/lang/km/lang.php          | 3 ---
 inc/lang/ko/lang.php          | 3 ---
 inc/lang/ku/lang.php          | 4 ----
 inc/lang/la/lang.php          | 3 ---
 inc/lang/lb/lang.php          | 3 ---
 inc/lang/lt/lang.php          | 3 ---
 inc/lang/lv/lang.php          | 3 ---
 inc/lang/mg/lang.php          | 3 ---
 inc/lang/mk/lang.php          | 3 ---
 inc/lang/mr/lang.php          | 3 ---
 inc/lang/ms/lang.php          | 2 --
 inc/lang/ne/lang.php          | 3 ---
 inc/lang/nl/lang.php          | 3 ---
 inc/lang/no/lang.php          | 3 ---
 inc/lang/pl/lang.php          | 3 ---
 inc/lang/pt-br/lang.php       | 3 ---
 inc/lang/pt/lang.php          | 3 ---
 inc/lang/ro/lang.php          | 3 ---
 inc/lang/ru/lang.php          | 3 ---
 inc/lang/sk/lang.php          | 3 ---
 inc/lang/sl/lang.php          | 3 ---
 inc/lang/sq/lang.php          | 3 ---
 inc/lang/sr/lang.php          | 3 ---
 inc/lang/sv/lang.php          | 3 ---
 inc/lang/th/lang.php          | 3 ---
 inc/lang/tr/lang.php          | 3 ---
 inc/lang/uk/lang.php          | 3 ---
 inc/lang/vi/lang.php          | 1 -
 inc/lang/zh-tw/lang.php       | 3 ---
 inc/lang/zh/lang.php          | 3 ---
 64 files changed, 184 deletions(-)

diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php
index 70672fbdd..f71964719 100644
--- a/inc/lang/af/lang.php
+++ b/inc/lang/af/lang.php
@@ -44,7 +44,6 @@ $lang['profnoempty']           = 'Jy moet \'n name en a e-posadres in sit';
 $lang['resendpwdmissing']      = 'Jammer, jy moet ales in fil';
 $lang['resendpwdconfirm']      = '\'n Bevestigingpos is gestuur na die gekose e-posadres.';
 $lang['resendpwdsuccess']      = 'Jou nuive wagwoord was deur e-pos gesteur';
-$lang['fileupload']            = 'Laai lêer';
 $lang['uploadsucc']            = 'Laai suksesvol';
 $lang['uploadfail']            = 'Laai fout';
 $lang['js']['hidedetails']     = 'Steek weg';
@@ -62,7 +61,6 @@ $lang['qb_link']               = 'Interne skakel';
 $lang['qb_extlink']            = 'Eksterne skakel';
 $lang['qb_hr']                 = 'Horisontale streep';
 $lang['qb_sig']                = 'Handtekening met datum';
-$lang['admin_register']        = 'Skep gerus \'n rekening';
 $lang['btn_img_backto']        = 'Terug na %s';
 $lang['img_date']              = 'Datem:';
 $lang['img_camera']            = 'Camera:';
diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 50984e630..52e9bc5cf 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -41,7 +41,6 @@ $lang['btn_update']            = 'حدّث';
 $lang['btn_delete']            = 'احذف';
 $lang['btn_back']              = 'ارجع';
 $lang['btn_backlink']          = 'ارتباطات';
-$lang['btn_backtomedia']       = 'ارجع إلى اختيار ملف الوسائط';
 $lang['btn_subscribe']         = 'ادر الاشتراكات';
 $lang['btn_profile']           = 'حدث الملف الشخصي';
 $lang['btn_reset']             = 'صفّر';
@@ -154,7 +153,6 @@ $lang['js']['media_overwrt']   = 'أكتب فوق الملفات الموجود
 $lang['rssfailed']             = 'خطأ ما حدث أثناء جلب ملف التغذية:';
 $lang['nothingfound']          = 'لا يوجد شيء';
 $lang['mediaselect']           = 'ملفات الوسائط';
-$lang['fileupload']            = 'تحميل ملف وسائط';
 $lang['uploadsucc']            = 'تم الرفع بنجاح';
 $lang['uploadfail']            = 'فشل الرفع، ربما خطأ تراخيص؟';
 $lang['uploadwrong']           = 'الرفع ممنوع، نوع الملف مرفوض!';
@@ -245,7 +243,6 @@ $lang['qb_sig']                = 'أدرج التوقيع';
 $lang['qb_smileys']            = 'الإبتسامات';
 $lang['qb_chars']              = 'محارف خاصة';
 $lang['upperns']               = 'انتقل للنطاق الأب';
-$lang['admin_register']        = 'أضف مستخدما جديدا';
 $lang['metaedit']              = 'تحرير البيانات الشمولية ';
 $lang['metasaveerr']           = 'فشلت كتابة البيانات الشمولية';
 $lang['metasaveok']            = 'حُفظت البيانات الشمولية';
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index bcec31dae..26b177ee6 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -35,7 +35,6 @@ $lang['btn_update']            = 'Yenilə';
 $lang['btn_delete']            = 'Sil';
 $lang['btn_back']              = 'Geri';
 $lang['btn_backlink']          = 'Bura olan link-lər';
-$lang['btn_backtomedia']       = 'media-fayl seçiminə qayıt';
 $lang['btn_subscribe']         = 'Abunə ol (bütün dəyişiklər)';
 $lang['btn_profile']           = 'Profil';
 $lang['btn_reset']             = 'Boşalt';
@@ -92,7 +91,6 @@ $lang['js']['willexpire']            = 'Sizin bu səhifədə dəyişik etmək ü
 $lang['rssfailed']             = 'Aşağıda göstərilmiş xəbər lentini əldə edən zaman xəta baş verdi: ';
 $lang['nothingfound']          = 'Heçnə tapılmadı.';
 $lang['mediaselect']           = 'Mediya-faylın seçilməsi';
-$lang['fileupload']            = 'Mediya-faylın serverə yüklənməsi';
 $lang['uploadsucc']            = 'Yüklənmə uğur ilə başa çatdı';
 $lang['uploadfail']            = 'Yüklənmə zamanı xəta baş veri. Bəlkə giriş haqları ilə problem var?';
 $lang['uploadwrong']           = 'Yuklənməyə qadağa qoyuldu. Belə növlu faylları serverə yükləmək olmaz. ';
@@ -169,7 +167,6 @@ $lang['qb_sig']                = 'İmza at';
 $lang['qb_smileys']            = 'Smayllar';
 $lang['qb_chars']              = 'Xüsusi simvollar';
 $lang['upperns']               = 'Ana namespace-ə keç';
-$lang['admin_register']        = 'İstifadəçi əlavə et';
 $lang['metaedit']              = 'Meta-məlumatlarda düzəliş et';
 $lang['metasaveerr']           = 'Meta-məlumatları yazan zamanı xəta';
 $lang['metasaveok']            = 'Meta-məlumatlar yadda saxlandı';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index cfacd09aa..1b10f2d10 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -38,7 +38,6 @@ $lang['btn_update']            = 'Актуализиране';
 $lang['btn_delete']            = 'Изтриване';
 $lang['btn_back']              = 'Назад';
 $lang['btn_backlink']          = 'Какво сочи насам';
-$lang['btn_backtomedia']       = 'Назад към избора на файл';
 $lang['btn_subscribe']         = 'Абонаменти';
 $lang['btn_profile']           = 'Профил';
 $lang['btn_reset']             = 'Изчистване';
@@ -147,7 +146,6 @@ $lang['js']['media_overwrt']   = 'Презапиши съществуващит
 $lang['rssfailed']             = 'Възникна грешка при получаването на емисията: ';
 $lang['nothingfound']          = 'Нищо не е открито.';
 $lang['mediaselect']           = 'Файлове';
-$lang['fileupload']            = 'Качване на файлове';
 $lang['uploadsucc']            = 'Качването е успешно';
 $lang['uploadfail']            = 'Качването се провали. Може би поради грешни права?';
 $lang['uploadwrong']           = 'Качването е отказано. Файлово разширение е забранено!';
@@ -233,7 +231,6 @@ $lang['qb_sig']                = 'Вмъкване на подпис';
 $lang['qb_smileys']            = 'Усмивчици';
 $lang['qb_chars']              = 'Специални знаци';
 $lang['upperns']               = 'към майчиното именно пространство';
-$lang['admin_register']        = 'Добавяне на нов потребител';
 $lang['metaedit']              = 'Редактиране на метаданни';
 $lang['metasaveerr']           = 'Записването на метаданните се провали';
 $lang['metasaveok']            = 'Метаданните са запазени успешно';
diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php
index 0995bc478..3550a2336 100644
--- a/inc/lang/bn/lang.php
+++ b/inc/lang/bn/lang.php
@@ -37,7 +37,6 @@ $lang['btn_update']            = 'আধুনিক করা';
 $lang['btn_delete']            = 'মুছে ফেলা';
 $lang['btn_back']              = 'পিছনে';
 $lang['btn_backlink']          = 'ব্যাকলিঙ্কগুলি';
-$lang['btn_backtomedia']       = 'পিছনে Mediafile নির্বাচনে যান';
 $lang['btn_subscribe']         = 'সাবস্ক্রিপশন পরিচালনা করুন';
 $lang['btn_profile']           = 'প্রোফাইল আপডেট করুন';
 $lang['btn_reset']             = 'রিসেট করুন';
@@ -148,7 +147,6 @@ $lang['js']['media_overwrt']   = 'বর্তমান ফাইল ওভা
 $lang['rssfailed']             = 'ফিডটি জোগাড় করতে গিয়ে একটি ত্রুটি ঘটেছে:';
 $lang['nothingfound']          = 'কিছু পাওয়া যায়নি।';
 $lang['mediaselect']           = 'মিডিয়া ফাইল';
-$lang['fileupload']            = 'মিডিয়া ফাইল আপলোড';
 $lang['uploadsucc']            = 'আপলোড সফল';
 $lang['uploadfail']            = 'আপলোড ব্যর্থ। অনুমতি জনিত ত্রুটি কী?';
 $lang['uploadwrong']           = 'আপলোড প্রত্যাখ্যাত। এই ফাইল এক্সটেনশন অননুমোদিত।';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index 3a4e30923..862ed2886 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -36,7 +36,6 @@ $lang['btn_update']            = 'Actualisar';
 $lang['btn_delete']            = 'Borrar';
 $lang['btn_back']              = 'Arrere';
 $lang['btn_backlink']          = 'Vínculs remitents';
-$lang['btn_backtomedia']       = 'Tornar a la selecció d\'archius de mijos';
 $lang['btn_subscribe']         = 'Subscriure\'s a la pàgina';
 $lang['btn_profile']           = 'Actualisar perfil';
 $lang['btn_reset']             = 'Reiniciar';
@@ -94,7 +93,6 @@ $lang['js']['notsavedyet']     = 'Els canvis no guardats es perdran.\n¿Segur qu
 $lang['rssfailed']             = 'Ha ocorregut un erro al solicitar este canal: ';
 $lang['nothingfound']          = 'No s\'ha trobat res.';
 $lang['mediaselect']           = 'Archius de mijos';
-$lang['fileupload']            = 'Enviar archius de mijos';
 $lang['uploadsucc']            = 'Enviament correcte';
 $lang['uploadfail']            = 'Enviament fallit. ¿Potser no tinga els permissos necessaris?';
 $lang['uploadwrong']           = 'Enviament denegat. ¡Esta extensió d\'archiu està prohibida!';
@@ -171,7 +169,6 @@ $lang['qb_sig']                = 'Afegir firma';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Caràcters especials';
 $lang['upperns']               = 'anar a l\'espai de noms superior';
-$lang['admin_register']        = 'Afegir nou usuari';
 $lang['metaedit']              = 'Editar meta-senyes';
 $lang['metasaveerr']           = 'Erro escrivint meta-senyes';
 $lang['metasaveok']            = 'Meta-senyes guardades';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 31c16ee23..df5a3c92b 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -37,7 +37,6 @@ $lang['btn_update']            = 'Actualitza';
 $lang['btn_delete']            = 'Suprimeix';
 $lang['btn_back']              = 'Enrere';
 $lang['btn_backlink']          = 'Què hi enllaça';
-$lang['btn_backtomedia']       = 'Torna a la selecció de fitxers';
 $lang['btn_subscribe']         = 'Subscripció a canvis d\'aquesta pàgina';
 $lang['btn_profile']           = 'Actualització del perfil';
 $lang['btn_reset']             = 'Reinicia';
@@ -140,7 +139,6 @@ $lang['js']['media_overwrt']   = 'Sobreescriu els arxius existents';
 $lang['rssfailed']             = 'S\'ha produït un error en recollir aquesta alimentació: ';
 $lang['nothingfound']          = 'No s\'ha trobat res.';
 $lang['mediaselect']           = 'Selecció de fitxers';
-$lang['fileupload']            = 'Càrrega de fitxers';
 $lang['uploadsucc']            = 'S\'ha penjat el fitxer';
 $lang['uploadfail']            = 'No es pot penjar el fitxer. Potser no teniu prou permisos?';
 $lang['uploadwrong']           = 'No es pot penjar el fitxer. Aquesta extensió està prohibida.';
@@ -225,7 +223,6 @@ $lang['qb_sig']                = 'Insereix signatura';
 $lang['qb_smileys']            = 'Emoticones';
 $lang['qb_chars']              = 'Caràcters especials';
 $lang['upperns']               = 'Salta a l\'espai superior';
-$lang['admin_register']        = 'Afegeix nou usuari';
 $lang['metaedit']              = 'Edita metadades';
 $lang['metasaveerr']           = 'No s\'han pogut escriure les metadades';
 $lang['metasaveok']            = 'S\'han desat les metadades';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 1dd4def5a..ffd81eada 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -50,7 +50,6 @@ $lang['btn_update']            = 'Aktualizovat';
 $lang['btn_delete']            = 'Vymazat';
 $lang['btn_back']              = 'Zpět';
 $lang['btn_backlink']          = 'Zpětné odkazy';
-$lang['btn_backtomedia']       = 'Zpět do Výběru dokumentu';
 $lang['btn_subscribe']         = 'Odebírat e-mailem změny stránky';
 $lang['btn_profile']           = 'Upravit profil';
 $lang['btn_reset']             = 'Reset';
@@ -163,7 +162,6 @@ $lang['js']['media_overwrt']   = 'Přepsat existující soubory';
 $lang['rssfailed']             = 'Nastala chyba při vytváření tohoto RSS: ';
 $lang['nothingfound']          = 'Nic nenalezeno.';
 $lang['mediaselect']           = 'Výběr dokumentu';
-$lang['fileupload']            = 'Načtení dokumentu';
 $lang['uploadsucc']            = 'Přenos proběhl v pořádku';
 $lang['uploadfail']            = 'Chyba při načítání. Možná kvůli špatně nastaveným právům?';
 $lang['uploadwrong']           = 'Načtení souboru s takovouto příponou není dovoleno.';
@@ -254,7 +252,6 @@ $lang['qb_sig']                = 'Vložit podpis';
 $lang['qb_smileys']            = 'Emotikony';
 $lang['qb_chars']              = 'Speciální znaky';
 $lang['upperns']               = 'skočit do nadřazeného jmenného prostoru';
-$lang['admin_register']        = 'Přidat nového uživatele';
 $lang['metaedit']              = 'Upravit Metadata';
 $lang['metasaveerr']           = 'Chyba při zápisu metadat';
 $lang['metasaveok']            = 'Metadata uložena';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index e7c597f2b..3b344ea3b 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -51,7 +51,6 @@ $lang['btn_update']            = 'Opdatér';
 $lang['btn_delete']            = 'Slet';
 $lang['btn_back']              = 'Tilbage';
 $lang['btn_backlink']          = 'Henvisninger bagud';
-$lang['btn_backtomedia']       = 'Tilbage til valg af mediefil';
 $lang['btn_subscribe']         = 'Abonnér på ændringer';
 $lang['btn_profile']           = 'Opdatér profil';
 $lang['btn_reset']             = 'Nulstil';
@@ -163,7 +162,6 @@ $lang['js']['media_overwrt']   = 'Overskriv eksisterende filer';
 $lang['rssfailed']             = 'Der opstod en fejl ved hentning af dette feed: ';
 $lang['nothingfound']          = 'Søgningen gav intet resultat.';
 $lang['mediaselect']           = 'Vælg mediefil';
-$lang['fileupload']            = 'Overfør mediefil';
 $lang['uploadsucc']            = 'Overførels blev fuldført';
 $lang['uploadfail']            = 'Overførslen fejlede. Der er muligvis problemer med rettighederne.';
 $lang['uploadwrong']           = 'Overførslen blev afvist. Filtypen er ikke tilladt.';
@@ -254,7 +252,6 @@ $lang['qb_sig']                = 'Indsæt signatur';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Specialtegn';
 $lang['upperns']               = 'Gå til overordnet navnerum';
-$lang['admin_register']        = 'Tilføj ny bruger';
 $lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Fejl under skrivning af metadata';
 $lang['metasaveok']            = 'Metadata gemt';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 1a1491f6b..6e1f77559 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -53,7 +53,6 @@ $lang['btn_update']            = 'Updaten';
 $lang['btn_delete']            = 'Löschen';
 $lang['btn_back']              = 'Zurück';
 $lang['btn_backlink']          = 'Links hierher';
-$lang['btn_backtomedia']       = 'Zurück zur Dateiauswahl';
 $lang['btn_subscribe']         = 'Aboverwaltung';
 $lang['btn_profile']           = 'Benutzerprofil';
 $lang['btn_reset']             = 'Zurücksetzen';
@@ -162,7 +161,6 @@ $lang['js']['media_overwrt']   = 'Existierende Dateien überschreiben';
 $lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
 $lang['nothingfound']          = 'Nichts gefunden.';
 $lang['mediaselect']           = 'Dateiauswahl';
-$lang['fileupload']            = 'Datei hochladen';
 $lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
 $lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
 $lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
@@ -248,7 +246,6 @@ $lang['qb_sig']                = 'Unterschrift einfügen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sonderzeichen';
 $lang['upperns']               = 'Gehe zum übergeordneten Namensraum';
-$lang['admin_register']        = 'Neuen Benutzer anmelden';
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 2725c247a..fec0647e0 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -59,7 +59,6 @@ $lang['btn_update']            = 'Updaten';
 $lang['btn_delete']            = 'Löschen';
 $lang['btn_back']              = 'Zurück';
 $lang['btn_backlink']          = 'Links hierher';
-$lang['btn_backtomedia']       = 'Zurück zur Dateiauswahl';
 $lang['btn_subscribe']         = 'Aboverwaltung';
 $lang['btn_profile']           = 'Benutzerprofil';
 $lang['btn_reset']             = 'Zurücksetzen';
@@ -170,7 +169,6 @@ $lang['js']['media_overwrt']   = 'Existierende Dateien überschreiben';
 $lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
 $lang['nothingfound']          = 'Nichts gefunden.';
 $lang['mediaselect']           = 'Dateiauswahl';
-$lang['fileupload']            = 'Datei hochladen';
 $lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
 $lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
 $lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
@@ -261,7 +259,6 @@ $lang['qb_sig']                = 'Unterschrift einfügen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sonderzeichen';
 $lang['upperns']               = 'zum übergeordneten Namensraum springen';
-$lang['admin_register']        = 'Neuen Benutzer anmelden';
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index e5371c9f3..b6ccfd617 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -43,7 +43,6 @@ $lang['btn_update']            = 'Ενημέρωση';
 $lang['btn_delete']            = 'Σβήσιμο';
 $lang['btn_back']              = 'Πίσω';
 $lang['btn_backlink']          = 'Σύνδεσμοι προς αυτή τη σελίδα';
-$lang['btn_backtomedia']       = 'Επιστροφή στην επιλογή αρχείων';
 $lang['btn_subscribe']         = 'Εγγραφή σε λήψη ενημερώσεων σελίδας';
 $lang['btn_profile']           = 'Επεξεργασία προφίλ';
 $lang['btn_reset']             = 'Ακύρωση';
@@ -152,7 +151,6 @@ $lang['js']['media_overwrt']   = 'Αντικατάσταση υπάρχοντω
 $lang['rssfailed']             = 'Παρουσιάστηκε κάποιο σφάλμα κατά την ανάγνωση αυτού του feed: ';
 $lang['nothingfound']          = 'Δεν βρέθηκαν σχετικά αποτελέσματα.';
 $lang['mediaselect']           = 'Επιλογή Αρχείων';
-$lang['fileupload']            = 'Φόρτωση αρχείου';
 $lang['uploadsucc']            = 'Επιτυχής φόρτωση';
 $lang['uploadfail']            = 'Η μεταφόρτωση απέτυχε. Πιθανόν αυτό να οφείλεται στις ρυθμίσεις πρόσβασης του αρχείου.';
 $lang['uploadwrong']           = 'Η μεταφόρτωση δεν έγινε δεκτή. Δεν επιτρέπονται αρχεία αυτού του τύπου!';
@@ -237,7 +235,6 @@ $lang['qb_sig']                = 'Προσθήκη Υπογραφής';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Ειδικοί Χαρακτήρες';
 $lang['upperns']               = 'πήγαινε στον μητρικό φάκελο';
-$lang['admin_register']        = 'Προσθήκη νέου χρήστη';
 $lang['metaedit']              = 'Τροποποίηση metadata';
 $lang['metasaveerr']           = 'Η αποθήκευση των metadata απέτυχε';
 $lang['metasaveok']            = 'Επιτυχής αποθήκευση metadata';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index a5347e026..81d8a94bf 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -39,7 +39,6 @@ $lang['btn_update']            = 'Update';
 $lang['btn_delete']            = 'Delete';
 $lang['btn_back']              = 'Back';
 $lang['btn_backlink']          = 'Backlinks';
-$lang['btn_backtomedia']       = 'Back to Mediafile Selection';
 $lang['btn_subscribe']         = 'Manage Subscriptions';
 $lang['btn_profile']           = 'Update Profile';
 $lang['btn_reset']             = 'Reset';
@@ -159,7 +158,6 @@ $lang['rssfailed']             = 'An error occurred while fetching this feed: ';
 $lang['nothingfound']          = 'Nothing was found.';
 
 $lang['mediaselect']           = 'Media Files';
-$lang['fileupload']            = 'Media File Upload';
 $lang['uploadsucc']            = 'Upload successful';
 $lang['uploadfail']            = 'Upload failed. Maybe wrong permissions?';
 $lang['uploadwrong']           = 'Upload denied. This file extension is forbidden!';
@@ -256,8 +254,6 @@ $lang['qb_chars']              = 'Special Chars';
 
 $lang['upperns']               = 'jump to parent namespace';
 
-$lang['admin_register']        = 'Add new user';
-
 $lang['metaedit']              = 'Edit Metadata';
 $lang['metasaveerr']           = 'Writing metadata failed';
 $lang['metasaveok']            = 'Metadata saved';
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 0cb84a2de..c7ad4b498 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -41,7 +41,6 @@ $lang['btn_update']            = 'Aktualigi';
 $lang['btn_delete']            = 'Forigi';
 $lang['btn_back']              = 'Retroiri';
 $lang['btn_backlink']          = 'Retroligoj';
-$lang['btn_backtomedia']       = 'Retroiri al elekto de dosiero';
 $lang['btn_subscribe']         = 'Aliĝi al paĝaj modifoj';
 $lang['btn_profile']           = 'Aktualigi profilon';
 $lang['btn_reset']             = 'Rekomenci';
@@ -153,7 +152,6 @@ $lang['js']['media_overwrt']   = 'Anstataûi ekzistantajn dosierojn';
 $lang['rssfailed']             = 'Okazis eraro dum ricevado de la novaĵ-fluo: ';
 $lang['nothingfound']          = 'Ankoraŭ nenio troviĝas tie ĉi.';
 $lang['mediaselect']           = 'Elekto de aŭdvidaĵa dosiero';
-$lang['fileupload']            = 'Alŝuto de aŭdvidaĵa dosiero';
 $lang['uploadsucc']            = 'Alŝuto sukcesis';
 $lang['uploadfail']            = 'Alŝuto malsukcesis. Ĉu eble estas problemoj pro permes-atributoj?';
 $lang['uploadwrong']           = 'Rifuzita alŝuto. Tiu ĉi dosiersufikso estas malpermesata!';
@@ -244,7 +242,6 @@ $lang['qb_sig']                = 'Inkluzivi subskribon';
 $lang['qb_smileys']            = 'Ridetuloj';
 $lang['qb_chars']              = 'Specialaj signaĵoj';
 $lang['upperns']               = 'saltu al la parenca nomspaco';
-$lang['admin_register']        = 'Aldoni novan uzanton';
 $lang['metaedit']              = 'Redakti metadatumaron';
 $lang['metasaveerr']           = 'La konservo de metadatumaro malsukcesis';
 $lang['metasaveok']            = 'La metadatumaro konserviĝis';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index cd81b834b..a27fbd1b2 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -70,7 +70,6 @@ $lang['btn_update']            = 'Actualizar';
 $lang['btn_delete']            = 'Borrar';
 $lang['btn_back']              = 'Atrás';
 $lang['btn_backlink']          = 'Enlaces a esta página';
-$lang['btn_backtomedia']       = 'Volver a la selección de archivos multimedia';
 $lang['btn_subscribe']         = 'Suscribirse a cambios de la página';
 $lang['btn_profile']           = 'Actualizar perfil';
 $lang['btn_reset']             = 'Restablecer';
@@ -183,7 +182,6 @@ $lang['js']['media_overwrt']   = 'Sobreescribir ficheros exitentes';
 $lang['rssfailed']             = 'Se ha producido un error mientras se leían los datos de este feed: ';
 $lang['nothingfound']          = 'No se ha encontrado nada.';
 $lang['mediaselect']           = 'Archivos Multimedia';
-$lang['fileupload']            = 'Subida de archivos multimedia';
 $lang['uploadsucc']            = 'El archivo se ha subido satisfactoriamente';
 $lang['uploadfail']            = 'La subida del fichero ha fallado. ¿Permisos equivocados?';
 $lang['uploadwrong']           = 'Subida de fichero denegada. ¡Los ficheros con esta extensión están prohibidos!';
@@ -274,7 +272,6 @@ $lang['qb_sig']                = 'Insertar firma';
 $lang['qb_smileys']            = 'Sonrisas';
 $lang['qb_chars']              = 'Caracteres especiales';
 $lang['upperns']               = 'Saltar al espacio de nombres superior';
-$lang['admin_register']        = 'Añadir nuevo usuario';
 $lang['metaedit']              = 'Editar metadatos';
 $lang['metasaveerr']           = 'La escritura de los metadatos ha fallado';
 $lang['metasaveok']            = 'Los metadatos han sido guardados';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index d3c510c43..7b4de11e3 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -41,7 +41,6 @@ $lang['btn_update']            = 'Uuenda';
 $lang['btn_delete']            = 'Kustuta';
 $lang['btn_back']              = 'Tagasi';
 $lang['btn_backlink']          = 'Tagasilingid';
-$lang['btn_backtomedia']       = 'Tagasi faili valikusse';
 $lang['btn_subscribe']         = 'Jälgi seda lehte (teated meilile)';
 $lang['btn_profile']           = 'Minu info';
 $lang['btn_reset']             = 'Taasta';
@@ -154,7 +153,6 @@ $lang['js']['media_overwrt']   = 'Asenda olemasolevad failid';
 $lang['rssfailed']             = 'Sinu soovitud info ammutamisel tekkis viga: ';
 $lang['nothingfound']          = 'Oops, aga mitte muhvigi ei leitud.';
 $lang['mediaselect']           = 'Hunnik faile';
-$lang['fileupload']            = 'Faili üleslaadimine';
 $lang['uploadsucc']            = 'Üleslaadimine läks ootuspäraselt hästi';
 $lang['uploadfail']            = 'Üleslaadimine läks nässu. Äkki pole Sa selleks lihtsalt piisavalt võimukas tegija?';
 $lang['uploadwrong']           = 'Ei saa Sa midagi üles laadida. Oops, aga seda tüüpi faili sul lihtsalt ei lubata üles laadida';
@@ -239,7 +237,6 @@ $lang['qb_sig']                = 'Lisa allkiri!';
 $lang['qb_smileys']            = 'Emotikonid';
 $lang['qb_chars']              = 'Erisümbolid';
 $lang['upperns']               = 'mine ülemisse nimeruumi';
-$lang['admin_register']        = 'Lisa kasutaja';
 $lang['metaedit']              = 'Muuda lisainfot';
 $lang['metasaveerr']           = 'Lisainfo salvestamine läks untsu.';
 $lang['metasaveok']            = 'Lisainfo salvestatud';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index fcf45b946..73af3e70a 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -38,7 +38,6 @@ $lang['btn_update']            = 'Eguneratu';
 $lang['btn_delete']            = 'Ezabatu';
 $lang['btn_back']              = 'Atzera';
 $lang['btn_backlink']          = 'Itzulera estekak';
-$lang['btn_backtomedia']       = 'Atzera Multimedia Fitxategiaren Aukeraketara';
 $lang['btn_subscribe']         = 'Harpidetu Orri Aldaketetara';
 $lang['btn_profile']           = 'Eguneratu Profila ';
 $lang['btn_reset']             = 'Aldaketak Desegin';
@@ -143,7 +142,6 @@ $lang['js']['media_overwrt']   = 'Dauden fitxategiak berridatzi';
 $lang['rssfailed']             = 'Errorea gertatu da feed hau irakurtzean:';
 $lang['nothingfound']          = 'Ez da ezer aurkitu.';
 $lang['mediaselect']           = 'Aukeratu Multimedia fitxategia';
-$lang['fileupload']            = 'Igo Multimedia Fitxategia';
 $lang['uploadsucc']            = 'Igoera arrakastatsua';
 $lang['uploadfail']            = 'Igoerak huts egin du. Baimen arazoengatik agian?';
 $lang['uploadwrong']           = 'Fitxategi igoera ukatua. Fitxategi-luzapen hau debekatua dago!';
@@ -229,7 +227,6 @@ $lang['qb_sig']                = 'Gehitu sinadura';
 $lang['qb_smileys']            = 'Irrifartxoak';
 $lang['qb_chars']              = 'Karaktere Bereziak';
 $lang['upperns']               = 'Jauzi izen-espazio gurasora';
-$lang['admin_register']        = 'Erabiltzaile berria gehitu';
 $lang['metaedit']              = 'Metadatua Aldatu';
 $lang['metasaveerr']           = 'Metadatuaren idazketak huts egin du';
 $lang['metasaveok']            = 'Metadatua gordea';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 25de5c92e..7a3577862 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -46,7 +46,6 @@ $lang['btn_update']            = 'به‌روزرسانی';
 $lang['btn_delete']            = 'حذف';
 $lang['btn_back']              = 'عقب';
 $lang['btn_backlink']          = 'پیوندهای به این صفحه';
-$lang['btn_backtomedia']       = 'بازگشت به انتخاب فایل';
 $lang['btn_subscribe']         = 'عضویت در تغییرات صفحه';
 $lang['btn_profile']           = 'به‌روزرسانی پروفایل';
 $lang['btn_reset']             = 'بازنشاندن';
@@ -159,7 +158,6 @@ $lang['js']['media_overwrt']   = 'جاینوشت فایل های موجود';
 $lang['rssfailed']             = 'بروز خطا در هنگام واکشی';
 $lang['nothingfound']          = 'چیزی پیدا نشد';
 $lang['mediaselect']           = 'فایل‌ها';
-$lang['fileupload']            = 'ارسال پرونده';
 $lang['uploadsucc']            = 'ارسال با موفقیت انجام شد';
 $lang['uploadfail']            = 'خطا در ارسال';
 $lang['uploadwrong']           = 'ارسال متوقف شد. این توسعه‌ی فایل ممنوع می‌باشد.';
@@ -250,7 +248,6 @@ $lang['qb_sig']                = 'افزودن امضا';
 $lang['qb_smileys']            = 'شکلک';
 $lang['qb_chars']              = 'حروف ویژه';
 $lang['upperns']               = 'پرش به فضای‌نام بالا';
-$lang['admin_register']        = 'یک حساب جدید بسازید';
 $lang['metaedit']              = 'ویرایش داده‌های متا';
 $lang['metasaveerr']           = 'نوشتن داده‌نما با مشکل مواجه شد';
 $lang['metasaveok']            = 'داده‌نما ذخیره شد';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 9bf4aad19..1ad782e53 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -41,7 +41,6 @@ $lang['btn_update']            = 'Päivitä';
 $lang['btn_delete']            = 'Poista';
 $lang['btn_back']              = 'Takaisin';
 $lang['btn_backlink']          = 'Paluulinkit';
-$lang['btn_backtomedia']       = 'Takaisin mediatiedostojen valintaan';
 $lang['btn_subscribe']         = 'Tilaa muutokset';
 $lang['btn_profile']           = 'Päivitä profiili';
 $lang['btn_reset']             = 'Tyhjennä';
@@ -154,7 +153,6 @@ $lang['js']['media_overwrt']   = 'Ylikirjoita olemassa olevat tiedostot';
 $lang['rssfailed']             = 'Virhe tapahtui noudettaessa tätä syötettä: ';
 $lang['nothingfound']          = 'Mitään ei löytynyt.';
 $lang['mediaselect']           = 'Mediatiedoston valinta';
-$lang['fileupload']            = 'Mediatiedoston lähetys';
 $lang['uploadsucc']            = 'Tiedoston lähetys onnistui';
 $lang['uploadfail']            = 'Tiedoston lähetys epäonnistui. Syynä ehkä väärät oikeudet?';
 $lang['uploadwrong']           = 'Tiedoston lähetys evätty. Tämä tiedostopääte on kielletty';
@@ -243,7 +241,6 @@ $lang['qb_sig']                = 'Lisää allekirjoitus';
 $lang['qb_smileys']            = 'Hymiöt';
 $lang['qb_chars']              = 'Erikoismerkit';
 $lang['upperns']               = 'Hyppää edelliseen nimiavaruuteen';
-$lang['admin_register']        = 'Lisää uusi käyttäjä';
 $lang['metaedit']              = 'Muokkaa metadataa';
 $lang['metasaveerr']           = 'Metadatan kirjoittaminen epäonnistui';
 $lang['metasaveok']            = 'Metadata tallennettu';
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index 0aee76e01..f3f462272 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -36,7 +36,6 @@ $lang['btn_update']            = 'Dagfør';
 $lang['btn_delete']            = 'Strika';
 $lang['btn_back']              = 'Aftur';
 $lang['btn_backlink']          = 'Ávísingar afturúr';
-$lang['btn_backtomedia']       = 'Aftur til val av miðlafílu';
 $lang['btn_subscribe']         = 'Tilmelda broytingar';
 $lang['btn_profile']           = 'Dagføra vangamynd';
 $lang['btn_reset']             = 'Nullstilla';
@@ -105,7 +104,6 @@ $lang['js']['del_confirm']     = 'Strika post(ar)?';
 $lang['rssfailed']             = 'Eitt brek koma fyri tá roynt var at fáa: ';
 $lang['nothingfound']          = 'Leiting gav onki úrslit.';
 $lang['mediaselect']           = 'Vel miðlafílu';
-$lang['fileupload']            = 'Legg miðla fílu upp';
 $lang['uploadsucc']            = 'Upp legg av fílu var væl eydna';
 $lang['uploadfail']            = 'Brek við upp legg av fílu. Tað er møguliga trupuleikar við rættindunum';
 $lang['uploadwrong']           = 'Upp legg av fílu víst burtur. Fíluslag er ikki loyvt';
@@ -154,7 +152,6 @@ $lang['qb_media']              = 'Leggja myndir og aðrar fílur afturat';
 $lang['qb_sig']                = 'Set inn undirskrift';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sertekn';
-$lang['admin_register']        = 'Upprætta nýggjan brúkara';
 $lang['metaedit']              = 'Rætta metadáta';
 $lang['metasaveerr']           = 'Brek við skriving av metadáta';
 $lang['metasaveok']            = 'Metadáta goymt';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index fb3890c9e..1cc5cf468 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -67,7 +67,6 @@ $lang['btn_update']            = 'Mettre à jour';
 $lang['btn_delete']            = 'Effacer';
 $lang['btn_back']              = 'Retour';
 $lang['btn_backlink']          = 'Liens de retour';
-$lang['btn_backtomedia']       = 'Retour à la sélection du fichier média';
 $lang['btn_subscribe']         = 'Gérer souscriptions';
 $lang['btn_profile']           = 'Mettre à jour le profil';
 $lang['btn_reset']             = 'Réinitialiser';
@@ -178,7 +177,6 @@ $lang['js']['media_overwrt']   = 'Écraser les fichiers existants';
 $lang['rssfailed']             = 'Une erreur s\'est produite en récupérant ce flux : ';
 $lang['nothingfound']          = 'Pas de réponse.';
 $lang['mediaselect']           = 'Sélection de fichiers';
-$lang['fileupload']            = 'Envoi de fichier';
 $lang['uploadsucc']            = 'Envoi réussi';
 $lang['uploadfail']            = 'L\'envoi a échoué. Les autorisations sont-elles correctes ?';
 $lang['uploadwrong']           = 'Envoi refusé. Cette extension de fichier est interdite !';
@@ -269,7 +267,6 @@ $lang['qb_sig']                = 'Insérer une signature';
 $lang['qb_smileys']            = 'Émoticones';
 $lang['qb_chars']              = 'Caractères spéciaux';
 $lang['upperns']               = 'Aller à la catégorie parente';
-$lang['admin_register']        = 'Ajouter un nouvel utilisateur';
 $lang['metaedit']              = 'Modifier les métadonnées';
 $lang['metasaveerr']           = 'Erreur lors de l\'enregistrement des métadonnées';
 $lang['metasaveok']            = 'Métadonnées enregistrées';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 82cbbbfab..2711e76e1 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -37,7 +37,6 @@ $lang['btn_update']            = 'Actualizar';
 $lang['btn_delete']            = 'Borrar';
 $lang['btn_back']              = 'Atrás';
 $lang['btn_backlink']          = 'Ligazóns con isto';
-$lang['btn_backtomedia']       = 'Volver á Selección de Arquivos-Media';
 $lang['btn_subscribe']         = 'Avísame dos trocos na páxina';
 $lang['btn_profile']           = 'Actualizar Perfil';
 $lang['btn_reset']             = 'Reiniciar';
@@ -141,7 +140,6 @@ $lang['js']['media_overwrt']   = 'Sobreescribir os arquivos existentes';
 $lang['rssfailed']             = 'Houbo un erro ao tentar obter esta corrente RSS: ';
 $lang['nothingfound']          = 'Non se atopou nada.';
 $lang['mediaselect']           = 'Arquivos-Media';
-$lang['fileupload']            = 'Subida de Arquivos-Media';
 $lang['uploadsucc']            = 'Subida correcta';
 $lang['uploadfail']            = 'Erra na subida. Pode que sexa un problema de permisos?';
 $lang['uploadwrong']           = 'Subida denegada. Esta extensión de arquivo non está permitida!';
@@ -227,7 +225,6 @@ $lang['qb_sig']                = 'Inserir Sinatura';
 $lang['qb_smileys']            = 'Risoños';
 $lang['qb_chars']              = 'Caracteres Especiais';
 $lang['upperns']               = 'choutar ao nome de espazo pai';
-$lang['admin_register']        = 'Engadir novo usuario';
 $lang['metaedit']              = 'Editar Metadatos';
 $lang['metasaveerr']           = 'Non se puideron escribir os metadatos';
 $lang['metasaveok']            = 'Metadatos gardados';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 1b8710df9..5d72130ab 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -45,7 +45,6 @@ $lang['btn_update']            = 'עדכון';
 $lang['btn_delete']            = 'מחיקה';
 $lang['btn_back']              = 'חזרה';
 $lang['btn_backlink']          = 'קישורים לכאן';
-$lang['btn_backtomedia']       = 'חזרה לבחירת קובץ מדיה';
 $lang['btn_subscribe']         = 'מעקב אחרי שינוים';
 $lang['btn_profile']           = 'עדכון הפרופיל';
 $lang['btn_reset']             = 'איפוס';
@@ -157,7 +156,6 @@ $lang['js']['media_overwrt']   = 'שכתב קבצים קיימים';
 $lang['rssfailed']             = 'אירע כשל בעת קבלת הזנה זו:';
 $lang['nothingfound']          = 'לא נמצאו תוצאות.';
 $lang['mediaselect']           = 'קובצי מדיה';
-$lang['fileupload']            = 'העלאת קובצי מדיה';
 $lang['uploadsucc']            = 'ההעלאה הושלמה בהצלחה';
 $lang['uploadfail']            = 'אירעה שגיאה בעת העלאת הקובץ. היתכן שתקלה זו נוצרה עקב הרשאות שגיות?';
 $lang['uploadwrong']           = 'ההעלאה לא אושרה. קבצים בסיומת זו אסורים!';
@@ -248,7 +246,6 @@ $lang['qb_sig']                = 'הוספת חתימה';
 $lang['qb_smileys']            = 'חייכנים';
 $lang['qb_chars']              = 'תווים מיוחדים';
 $lang['upperns']               = 'מעבר למרחב השם שברמה שמעל הנוכחית';
-$lang['admin_register']        = 'הוספת משתמש חדש';
 $lang['metaedit']              = 'עריכת נתוני העל';
 $lang['metasaveerr']           = 'אירע כשל בשמירת נתוני העל';
 $lang['metasaveok']            = 'נתוני העל נשמרו';
diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php
index 71795191c..79bc0a1ab 100644
--- a/inc/lang/hi/lang.php
+++ b/inc/lang/hi/lang.php
@@ -37,7 +37,6 @@ $lang['btn_update']            = 'अद्यतन करना';
 $lang['btn_delete']            = 'मिटाना';
 $lang['btn_back']              = 'पीछे';
 $lang['btn_backlink']          = 'पिछली कड़ियाँ';
-$lang['btn_backtomedia']       = 'मीडिया फाइल चयन पर पीछे जायें';
 $lang['btn_subscribe']         = 'सदस्यता प्रबंधन';
 $lang['btn_profile']           = 'परिचय संपादित करें';
 $lang['btn_resendpwd']         = 'नया पासवर्ड सेट करें';
@@ -102,7 +101,6 @@ $lang['qb_link']               = 'आंतरिक कड़ी';
 $lang['qb_extlink']            = 'बाह्य कड़ी';
 $lang['qb_hr']                 = 'खड़ी रेखा';
 $lang['qb_sig']                = 'हस्ताक्षर डालें';
-$lang['admin_register']        = 'नया उपयोगकर्ता जोड़ें';
 $lang['btn_img_backto']            = 'वापस जाना %s';
 $lang['img_title']             = 'शीर्षक:';
 $lang['img_caption']           = 'सहशीर्षक:';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index 6e4e48e36..0436412ed 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -39,7 +39,6 @@ $lang['btn_update']            = 'Dopuni';
 $lang['btn_delete']            = 'Obriši';
 $lang['btn_back']              = 'Nazad';
 $lang['btn_backlink']          = 'Povratni linkovi';
-$lang['btn_backtomedia']       = 'Natrag na odabir datoteka';
 $lang['btn_subscribe']         = 'Uređivanje pretplata';
 $lang['btn_profile']           = 'Dopuni profil';
 $lang['btn_reset']             = 'Poništi';
@@ -151,7 +150,6 @@ $lang['js']['media_overwrt']   = 'Prepiši preko postojeće datoteke';
 $lang['rssfailed']             = 'Došlo je do greške prilikom preuzimanja feed-a: ';
 $lang['nothingfound']          = 'Traženi dokumetni nisu pronađeni.';
 $lang['mediaselect']           = 'Datoteke';
-$lang['fileupload']            = 'Učitavanje datoteka';
 $lang['uploadsucc']            = 'Učitavanje uspješno';
 $lang['uploadfail']            = 'Neuspješno učitavanje. Možda dozvole na poslužitelju nisu ispravne?';
 $lang['uploadwrong']           = 'Učitavanje nije dopušteno. Nastavak datoteke je zabranjen!';
@@ -242,7 +240,6 @@ $lang['qb_sig']                = 'Ubaci potpis';
 $lang['qb_smileys']            = 'Smiješkići';
 $lang['qb_chars']              = 'Posebni znakovi';
 $lang['upperns']               = 'Skoči u nadređeni imenski prostor';
-$lang['admin_register']        = 'Dodaj novog korisnika';
 $lang['metaedit']              = 'Uredi metapodatake';
 $lang['metasaveerr']           = 'Neuspješno zapisivanje metapodataka';
 $lang['metasaveok']            = 'Spremljeni metapdaci';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index bdc78f68d..75c22813f 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -45,7 +45,6 @@ $lang['btn_update']            = 'Frissítés';
 $lang['btn_delete']            = 'Törlés';
 $lang['btn_back']              = 'Vissza';
 $lang['btn_backlink']          = 'Hivatkozások';
-$lang['btn_backtomedia']       = 'Vissza a médiafájlok kezeléséhez';
 $lang['btn_subscribe']         = 'Feliratkozás az oldalváltozásokra';
 $lang['btn_profile']           = 'Személyes beállítások';
 $lang['btn_reset']             = 'Alaphelyzet';
@@ -157,7 +156,6 @@ $lang['js']['media_overwrt']   = 'Meglévő fájlok felülírása';
 $lang['rssfailed']             = 'Hiba történt a hírfolyam betöltésekor: ';
 $lang['nothingfound']          = 'Üres mappa.';
 $lang['mediaselect']           = 'Médiafájl kiválasztása';
-$lang['fileupload']            = 'Médiafájl feltöltése';
 $lang['uploadsucc']            = 'Sikeres feltöltés';
 $lang['uploadfail']            = 'A feltöltés nem sikerült. Talán rosszak a jogosultságok?';
 $lang['uploadwrong']           = 'A feltöltés megtagadva. Ez a fájlkiterjesztés tiltott.';
@@ -248,7 +246,6 @@ $lang['qb_sig']                = 'Aláírás beszúrása';
 $lang['qb_smileys']            = 'Smiley-k';
 $lang['qb_chars']              = 'Speciális karakterek';
 $lang['upperns']               = 'ugrás a tartalmazó névtérhez';
-$lang['admin_register']        = 'Új felhasználó';
 $lang['metaedit']              = 'Metaadatok szerkesztése';
 $lang['metasaveerr']           = 'A metaadatok írása nem sikerült';
 $lang['metasaveok']            = 'Metaadatok elmentve';
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index a533883b6..3585d716d 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -41,7 +41,6 @@ $lang['btn_update']            = 'Actualisar';
 $lang['btn_delete']            = 'Deler';
 $lang['btn_back']              = 'Retornar';
 $lang['btn_backlink']          = 'Retroligamines';
-$lang['btn_backtomedia']       = 'Retornar al selection de files multimedia';
 $lang['btn_subscribe']         = 'Gerer subscriptiones';
 $lang['btn_profile']           = 'Actualisar profilo';
 $lang['btn_reset']             = 'Reinitialisar';
@@ -99,7 +98,6 @@ $lang['js']['notsavedyet']     = 'Le modificationes non salveguardate essera per
 $lang['rssfailed']             = 'Un error occurreva durante le obtention de iste syndication:';
 $lang['nothingfound']          = 'Nihil ha essite trovate.';
 $lang['mediaselect']           = 'Files multimedia';
-$lang['fileupload']            = 'Incargar file multimedia';
 $lang['uploadsucc']            = 'Incargamento succedite';
 $lang['uploadfail']            = 'Incargamento fallite. Pote esser que le permissiones es incorrecte.';
 $lang['uploadwrong']           = 'Incargamento refusate. Iste typo de file es prohibite!';
@@ -199,7 +197,6 @@ $lang['qb_sig']                = 'Inserer signatura';
 $lang['qb_smileys']            = 'Emoticones     ';
 $lang['qb_chars']              = 'Characteres special';
 $lang['upperns']               = 'Saltar al spatio de nomines superior';
-$lang['admin_register']        = 'Adder nove usator';
 $lang['metaedit']              = 'Modificar metadatos';
 $lang['metasaveerr']           = 'Scriptura de metadatos fallite';
 $lang['metasaveok']            = 'Metadatos salveguardate';
diff --git a/inc/lang/id-ni/lang.php b/inc/lang/id-ni/lang.php
index 1ff714f3e..9bd495c66 100644
--- a/inc/lang/id-ni/lang.php
+++ b/inc/lang/id-ni/lang.php
@@ -35,7 +35,6 @@ $lang['btn_update']            = 'Bohouni';
 $lang['btn_delete']            = 'Heta';
 $lang['btn_back']              = 'Fulifuri';
 $lang['btn_backlink']          = 'Link fangawuli';
-$lang['btn_backtomedia']       = 'Angawuli ba filianö Mediafile';
 $lang['btn_profile']           = 'Famohouni pörofile';
 $lang['btn_reset']             = 'Fawu\'a';
 $lang['btn_draft']             = 'Fawu\'a wanura';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index dc4ca00e0..514c63871 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -40,7 +40,6 @@ $lang['btn_update']            = 'Ubah';
 $lang['btn_delete']            = 'Hapus';
 $lang['btn_back']              = 'Kembali';
 $lang['btn_backlink']          = 'Backlinks';
-$lang['btn_backtomedia']       = 'Kembali ke Pilihan Mediafile';
 $lang['btn_subscribe']         = 'Ikuti Perubahan';
 $lang['btn_profile']           = 'Ubah Profil';
 $lang['btn_reset']             = 'Reset';
@@ -151,7 +150,6 @@ $lang['js']['media_overwrt']   = 'Timpa berkas yang ada';
 $lang['rssfailed']             = 'Error terjadi saat mengambil feed: ';
 $lang['nothingfound']          = 'Tidak menemukan samasekali.';
 $lang['mediaselect']           = 'Pilihan Mediafile';
-$lang['fileupload']            = 'Mediafile Upload';
 $lang['uploadsucc']            = 'Upload sukses';
 $lang['uploadfail']            = 'Upload gagal. Apakah hak ijinnya salah?';
 $lang['uploadwrong']           = 'Upload ditolak. Ekstensi file ini tidak diperbolehkan!';
@@ -239,7 +237,6 @@ $lang['qb_sig']                = 'Sisipkan tanda tangan';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Karakter Khusus';
 $lang['upperns']               = 'lompat ke namespace induk';
-$lang['admin_register']        = 'Tambah user baru';
 $lang['metaedit']              = 'Edit Metadata';
 $lang['metasaveerr']           = 'Gagal menulis metadata';
 $lang['metasaveok']            = 'Metadata tersimpan';
diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php
index de1a01ed5..0af4c57a6 100644
--- a/inc/lang/is/lang.php
+++ b/inc/lang/is/lang.php
@@ -42,7 +42,6 @@ $lang['btn_update']            = 'Uppfæra';
 $lang['btn_delete']            = 'Eyða';
 $lang['btn_back']              = 'Til baka';
 $lang['btn_backlink']          = 'Hvað tengist hingað';
-$lang['btn_backtomedia']       = 'Aftur til miðlaskrá';
 $lang['btn_subscribe']         = 'Vakta';
 $lang['btn_profile']           = 'Uppfæra notanda';
 $lang['btn_reset']             = 'Endurstilla';
@@ -96,7 +95,6 @@ $lang['lockedby']              = 'Læstur af:';
 $lang['lockexpire']            = 'Læsing rennur út eftir:';
 $lang['nothingfound']          = 'Ekkert fannst';
 $lang['mediaselect']           = 'Miðlaskrá';
-$lang['fileupload']            = 'Hlaða inn miðlaskrá';
 $lang['uploadsucc']            = 'Innhlaðning tókst';
 $lang['uploadfail']            = 'Villa í innhlaðningu';
 $lang['uploadwrong']           = 'Innhleðslu neitað. Skrár með þessari endingu eru ekki leyfðar.';
@@ -166,7 +164,6 @@ $lang['qb_media']              = 'Bæta inn myndum og öðrum skrám';
 $lang['qb_sig']                = 'Undirskrift þín auk tímasetningu';
 $lang['qb_smileys']            = 'Broskallar';
 $lang['qb_chars']              = 'Sértækir stafir';
-$lang['admin_register']        = 'Setja nýjan notenda inn';
 $lang['metaedit']              = 'Breyta lýsigögnum';
 $lang['metasaveerr']           = 'Vistun lýsigagna mistókst';
 $lang['metasaveok']            = 'Lýsigögn vistuð';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index c6b99d5b5..465822d0a 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -52,7 +52,6 @@ $lang['btn_update']            = 'Aggiorna';
 $lang['btn_delete']            = 'Elimina';
 $lang['btn_back']              = 'Indietro';
 $lang['btn_backlink']          = 'Puntano qui';
-$lang['btn_backtomedia']       = 'Torna alla selezione file';
 $lang['btn_subscribe']         = 'Sottoscrivi modifiche';
 $lang['btn_profile']           = 'Aggiorna profilo';
 $lang['btn_reset']             = 'Annulla';
@@ -164,7 +163,6 @@ $lang['js']['media_overwrt']   = 'Sovrascrivi i file esistenti';
 $lang['rssfailed']             = 'Si è verificato un errore cercando questo feed: ';
 $lang['nothingfound']          = 'Nessun risultato trovato.';
 $lang['mediaselect']           = 'Selezione dei file';
-$lang['fileupload']            = 'File caricato';
 $lang['uploadsucc']            = 'Invio riuscito';
 $lang['uploadfail']            = 'Invio fallito. È possibile che si tratti di un problema di permessi.';
 $lang['uploadwrong']           = 'Invio rifiutato. Questa estensione di file non è ammessa';
@@ -255,7 +253,6 @@ $lang['qb_sig']                = 'Inserisci la firma';
 $lang['qb_smileys']            = 'Smiley';
 $lang['qb_chars']              = 'Caratteri speciali';
 $lang['upperns']               = 'vai alla categoria principale';
-$lang['admin_register']        = 'Aggiungi un nuovo utente';
 $lang['metaedit']              = 'Modifica metadati';
 $lang['metasaveerr']           = 'Scrittura metadati fallita';
 $lang['metasaveok']            = 'Metadati salvati';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 3a5f169e7..dd076f86f 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -43,7 +43,6 @@ $lang['btn_update']            = '更新';
 $lang['btn_delete']            = '削除';
 $lang['btn_back']              = '戻る';
 $lang['btn_backlink']          = 'バックリンク';
-$lang['btn_backtomedia']       = 'メディアファイル選択に戻る';
 $lang['btn_subscribe']         = '変更履歴配信の登録';
 $lang['btn_profile']           = 'ユーザー情報の更新';
 $lang['btn_reset']             = 'リセット';
@@ -154,7 +153,6 @@ $lang['js']['media_overwrt']   = '既存のファイルを上書きする';
 $lang['rssfailed']             = 'RSSの取得に失敗しました：';
 $lang['nothingfound']          = '該当文書はありませんでした。';
 $lang['mediaselect']           = 'メディアファイル';
-$lang['fileupload']            = 'メディアファイルをアップロード';
 $lang['uploadsucc']            = 'アップロード完了';
 $lang['uploadfail']            = 'アップロードに失敗しました。権限がありません。';
 $lang['uploadwrong']           = 'アップロードは拒否されました。この拡張子は許可されていません。';
@@ -245,7 +243,6 @@ $lang['qb_sig']                = '署名の挿入';
 $lang['qb_smileys']            = 'スマイリー';
 $lang['qb_chars']              = '特殊文字';
 $lang['upperns']               = '上の階層の名前空間へ';
-$lang['admin_register']        = '新規ユーザー作成';
 $lang['metaedit']              = 'メタデータ編集';
 $lang['metasaveerr']           = 'メタデータの書き込みに失敗しました';
 $lang['metasaveok']            = 'メタデータは保存されました';
diff --git a/inc/lang/ka/lang.php b/inc/lang/ka/lang.php
index 28ca11e45..871f3ec44 100644
--- a/inc/lang/ka/lang.php
+++ b/inc/lang/ka/lang.php
@@ -35,7 +35,6 @@ $lang['btn_update']            = 'განახლება';
 $lang['btn_delete']            = 'წაშლა';
 $lang['btn_back']              = 'უკან';
 $lang['btn_backlink']          = 'გადმომისამართებული ბმულები';
-$lang['btn_backtomedia']       = 'მედიაფაილების არჩევა';
 $lang['btn_subscribe']         = 'Manage Subscriptions';
 $lang['btn_profile']           = 'პროფილის განახლება';
 $lang['btn_reset']             = 'წაშლა';
@@ -146,7 +145,6 @@ $lang['js']['media_overwrt']   = 'გადაწერა ზემოდან
 $lang['rssfailed']             = 'დაფიქსირდა შეცდომა:';
 $lang['nothingfound']          = 'ნაპოვნი არ არის';
 $lang['mediaselect']           = 'მედია ფაილები';
-$lang['fileupload']            = 'მედია ფაილების ატვირთვა';
 $lang['uploadsucc']            = 'ატვირთვა დასრულებულია';
 $lang['uploadfail']            = 'შეფერხება ატვირთვისას';
 $lang['uploadwrong']           = 'ატვირთვა შეუძლებელია';
@@ -236,7 +234,6 @@ $lang['qb_sig']                = 'ხელმოწერა';
 $lang['qb_smileys']            = 'სმაილები';
 $lang['qb_chars']              = 'Special Chars';
 $lang['upperns']               = 'jump to parent namespace';
-$lang['admin_register']        = 'ახალი მომხმარებლის დამატება';
 $lang['metaedit']              = 'Edit Metadata';
 $lang['metasaveerr']           = 'Writing metadata failed';
 $lang['metasaveok']            = 'Metadata saved';
diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php
index 74afa24e5..5536d48d3 100644
--- a/inc/lang/kk/lang.php
+++ b/inc/lang/kk/lang.php
@@ -34,7 +34,6 @@ $lang['btn_update']            = 'Жаңарту';
 $lang['btn_delete']            = 'Жою';
 $lang['btn_back']              = 'Артқа';
 $lang['btn_backlink']          = 'Кері сілтемелері';
-$lang['btn_backtomedia']       = 'Медиафайлды таңдауға қайту';
 $lang['btn_subscribe']         = 'Жазылуларды басқару';
 $lang['btn_profile']           = 'Профильді жаңарту';
 $lang['btn_reset']             = 'Түсіру';
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 749fa419c..87ac30936 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -34,7 +34,6 @@ $lang['btn_update'] = 'កែឡើង';
 $lang['btn_delete'] = 'លុបចោល';
 $lang['btn_back']   = 'ត្រឡប់';
 $lang['btn_backlink']    = 'ខ្សែចំណងក្រោយ';
-$lang['btn_backtomedia'] = 'ទៅប្រព័នឯកសាវិញ';
 $lang['btn_subscribe']   = 'ដាក់ដំណឹងផ្លស់ប្តូរ';
 $lang['btn_profile']     = 'កែប្រវត្តិរូប';
 $lang['btn_reset']       = 'កមណត់ឡើងរិញ';
@@ -92,7 +91,6 @@ $lang['rssfailed']   = 'មានកំហុសពេលទៅ​ប្រម
 $lang['nothingfound']= 'រកមិនឃើញអ្វីទេ។';
 
 $lang['mediaselect'] = 'ឯកសារមីឌៀ';
-$lang['fileupload']  = 'រុញឯកសារមីឌៀឡើង';
 $lang['uploadsucc']  = 'រុញចូលមានជ័យ';
 $lang['uploadfail']  = 'រុញឡើងបរាជ័យ។ ប្រហែលខុសសិទ្ឋានុញ្ញាត?';
 $lang['uploadwrong'] = 'រុញឡើងត្រូវ​បាន​បដិសេធ។ ឯកសារ';
@@ -160,7 +158,6 @@ $lang['qb_smileys'] = 'សញ្ញាអារម្មណ៍';
 $lang['qb_chars']   = 'អក្ខរៈពិសេស';
 
 $lang['js']['del_confirm']= 'លុប';
-$lang['admin_register']= 'តែមអ្នកប្រើ';//'Add new user';
 
 $lang['metaedit']    = 'កែទិន្នន័យអរូប';//'Edit Metadata';
 $lang['metasaveerr'] = 'ពំអាចកត់រទិន្នន័យអរូប';//'Writing metadata failed';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 877c43de3..ca2a35cb7 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -44,7 +44,6 @@ $lang['btn_update']            = '바꾸기';
 $lang['btn_delete']            = '삭제';
 $lang['btn_back']              = '뒤로';
 $lang['btn_backlink']          = '백링크';
-$lang['btn_backtomedia']       = '미디어 파일 선택으로 돌아가기';
 $lang['btn_subscribe']         = '구독 관리';
 $lang['btn_profile']           = '프로필 바꾸기';
 $lang['btn_reset']             = '재설정';
@@ -155,7 +154,6 @@ $lang['js']['media_overwrt']   = '기존 파일에 덮어쓰기';
 $lang['rssfailed']             = '이 피드를 가져오는 동안 오류가 발생했습니다:';
 $lang['nothingfound']          = '아무 것도 없습니다.';
 $lang['mediaselect']           = '미디어 파일';
-$lang['fileupload']            = '미디어 파일 올리기';
 $lang['uploadsucc']            = '올리기 성공';
 $lang['uploadfail']            = '올리기가 실패되었습니다. 잘못된 권한 때문일지도 모릅니다.';
 $lang['uploadwrong']           = '올리기가 거부되었습니다. 금지된 파일 확장자입니다!';
@@ -246,7 +244,6 @@ $lang['qb_sig']                = '서명 넣기';
 $lang['qb_smileys']            = '이모티콘';
 $lang['qb_chars']              = '특수 문자';
 $lang['upperns']               = '상위 이름공간으로 이동';
-$lang['admin_register']        = '새 사용자 추가';
 $lang['metaedit']              = '메타데이터 편집';
 $lang['metasaveerr']           = '메타데이터 쓰기 실패';
 $lang['metasaveok']            = '메타데이터 저장됨';
diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php
index a3c91eee8..7e21b5ba7 100644
--- a/inc/lang/ku/lang.php
+++ b/inc/lang/ku/lang.php
@@ -31,7 +31,6 @@ $lang['btn_update'] = 'Rojanekirin';
 $lang['btn_delete'] = 'Jê bibe';
 $lang['btn_back']   = 'Paş';
 $lang['btn_backlink']    = 'Girêdanên paş';
-$lang['btn_backtomedia'] = 'Back to Mediafile Selection';
 $lang['btn_subscribe']   = 'Subscribe Changes';
 $lang['btn_register'] = 'Register';
 
@@ -67,7 +66,6 @@ $lang['rssfailed']   = 'An error occured while fetching this feed: ';
 $lang['nothingfound']= 'Tiştek nehat dîtin.';
 
 $lang['mediaselect'] = 'Mediafile Selection';
-$lang['fileupload']  = 'Mediafile Upload';
 $lang['uploadsucc']  = 'Upload successful';
 $lang['uploadfail']  = 'Upload failed. Maybe wrong permissions?';
 $lang['uploadwrong'] = 'Upload denied. This file extension is forbidden!';
@@ -122,8 +120,6 @@ $lang['qb_sig']     = 'Insert Signature';
 
 $lang['js']['del_confirm']= 'Delete this entry?';
 
-$lang['admin_register']= 'Add new user...';
-
 $lang['metaedit']    = 'Edit Metadata';
 $lang['metasaveerr'] = 'Writing metadata failed';
 $lang['metasaveok']  = 'Metadata saved';
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index 66cd13967..35f8308d0 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -40,7 +40,6 @@ $lang['btn_update']            = 'Nouare';
 $lang['btn_delete']            = 'Delere';
 $lang['btn_back']              = 'Redire';
 $lang['btn_backlink']          = 'Nexus ad paginam';
-$lang['btn_backtomedia']       = 'Ad media redire';
 $lang['btn_subscribe']         = 'Custodire';
 $lang['btn_profile']           = 'Tabellam nouare';
 $lang['btn_reset']             = 'Abrogare';
@@ -126,7 +125,6 @@ $lang['js']['del_confirm']     = 'Delere electas res uin?';
 $lang['rssfailed']             = 'Error in restituendo ';
 $lang['nothingfound']          = 'Nihil inuentum est.';
 $lang['mediaselect']           = 'Documenta uisiua:';
-$lang['fileupload']            = 'Documentum uisiuom onerare';
 $lang['uploadsucc']            = 'Oneratum perfectum';
 $lang['uploadfail']            = 'Error onerandi.';
 $lang['uploadwrong']           = 'Onerare non potest. Genus documenti non legitimum!';
@@ -198,7 +196,6 @@ $lang['qb_sig']                = 'Subscriptio tua cum indicatione temporis';
 $lang['qb_smileys']            = 'Pupuli';
 $lang['qb_chars']              = 'Signa singularia';
 $lang['upperns']               = 'I ad anterius genus';
-$lang['admin_register']        = 'Nouom Sodalem creare';
 $lang['metaedit']              = 'Res codicis mutare';
 $lang['metasaveerr']           = 'Res codicis non scribitur.';
 $lang['metasaveok']            = 'Res codicis seruatae.';
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index 1090878e2..a48ab4e4c 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -34,7 +34,6 @@ $lang['btn_update']            = 'Update';
 $lang['btn_delete']            = 'Läschen';
 $lang['btn_back']              = 'Zeréck';
 $lang['btn_backlink']          = 'Linker zeréck';
-$lang['btn_backtomedia']       = 'Zeréck bei d\'Auswiel vun de Mediadateien';
 $lang['btn_profile']           = 'Profil aktualiséieren';
 $lang['btn_reset']             = 'Zerécksetzen';
 $lang['btn_draft']             = 'Entworf änneren';
@@ -88,7 +87,6 @@ $lang['js']['notsavedyet']     = 'Net gespäicher Ännerunge gi verluer.\nWierkl
 $lang['rssfailed']             = 'Et ass e Feeler virkomm beim erofluede vun dësem Feed: ';
 $lang['nothingfound']          = 'Näischt fond.';
 $lang['mediaselect']           = 'Mediadateien';
-$lang['fileupload']            = 'Mediadateien eroplueden';
 $lang['uploadsucc']            = 'Upload erfollegräich';
 $lang['uploadfail']            = 'Feeler beim Upload. Vläicht falsch Rechter?';
 $lang['uploadwrong']           = 'Eroplueden net erlaabt. Dës Dateiendung ass verbueden!';
@@ -159,7 +157,6 @@ $lang['qb_sig']                = 'Ënnerschrëft afügen';
 $lang['qb_smileys']            = 'Smilien';
 $lang['qb_chars']              = 'Spezialzeechen';
 $lang['upperns']               = 'An de Namespace uewendriwwer sprangen';
-$lang['admin_register']        = 'Neie Benotzer bäisetzen';
 $lang['metaedit']              = 'Metadaten änneren';
 $lang['metasaveerr']           = 'Feeler beim Schreiwe vun de Metadaten';
 $lang['metasaveok']            = 'Metadate gespäichert';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index d53a117f4..2de85644e 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -38,7 +38,6 @@ $lang['btn_update']            = 'Atnaujinti';
 $lang['btn_delete']            = 'Ištrinti';
 $lang['btn_back']              = 'Atgal';
 $lang['btn_backlink']          = 'Atgalinės nuorodos';
-$lang['btn_backtomedia']       = 'Atgal į Mediabylos išsirinkimą';
 $lang['btn_subscribe']         = 'Užsisakyti keitimų prenumeratą';
 $lang['btn_profile']           = 'Atnaujinti profilį';
 $lang['btn_reset']             = 'Atstata';
@@ -93,7 +92,6 @@ $lang['js']['notsavedyet']     = 'Pakeitimai nebus išsaugoti.\nTikrai tęsti?';
 $lang['rssfailed']             = 'Siunčiant šį feed\'ą įvyko klaida: ';
 $lang['nothingfound']          = 'Paieškos rezultatų nėra.';
 $lang['mediaselect']           = 'Mediabylos išsirinkimas';
-$lang['fileupload']            = 'Mediabylos atsiuntimas';
 $lang['uploadsucc']            = 'Atsiuntimas pavyko';
 $lang['uploadfail']            = 'Atsiuntimas nepavyko. Blogi priėjimo leidimai??';
 $lang['uploadwrong']           = 'Atsiuntimas atmestas. Bylos tipas neleistinas';
@@ -160,7 +158,6 @@ $lang['qb_sig']                = 'Įterpti parašą';
 $lang['qb_smileys']            = 'Šypsenėlės';
 $lang['qb_chars']              = 'Specialūs simboliai';
 $lang['js']['del_confirm']           = 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?';
-$lang['admin_register']        = 'Sukurti naują vartotoją';
 $lang['metaedit']              = 'Redaguoti metaduomenis';
 $lang['metasaveerr']           = 'Nepavyko išsaugoti metaduomenų';
 $lang['metasaveok']            = 'Metaduomenys išsaugoti';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index ddc97fa89..dff2d9b28 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -35,7 +35,6 @@ $lang['btn_update']            = 'Atjaunot';
 $lang['btn_delete']            = 'Dzēst';
 $lang['btn_back']              = 'Atpakaļ';
 $lang['btn_backlink']          = 'Norādes uz lapu';
-$lang['btn_backtomedia']       = 'Atpakaļ uz mēdiju failu izvēli';
 $lang['btn_subscribe']         = 'Abonēt izmaiņu paziņojumus';
 $lang['btn_profile']           = 'Labot savu profilu';
 $lang['btn_reset']             = 'Atsaukt izmaiņas';
@@ -148,7 +147,6 @@ $lang['js']['media_overwrt']   = 'Rakstīt pāri esošajiem failiem';
 $lang['rssfailed']             = 'Kļūda saņemot saturu no ';
 $lang['nothingfound']          = 'Nekas nav atrasts.';
 $lang['mediaselect']           = 'Mēdiju faila izvēle';
-$lang['fileupload']            = 'Mēdiju faila augšupielāde';
 $lang['uploadsucc']            = 'Veiksmīgi ielādēts';
 $lang['uploadfail']            = 'Ielādes kļūme. Varbūt aplamas tiesības?';
 $lang['uploadwrong']           = 'Ielāde aizliegta. Neatļauts faila paplašinājums';
@@ -239,7 +237,6 @@ $lang['qb_sig']                = 'Ievietot parakstu';
 $lang['qb_smileys']            = 'Emotikoni';
 $lang['qb_chars']              = 'Īpašās zīmes';
 $lang['upperns']               = 'vienu nodaļu līmeni augstāk';
-$lang['admin_register']        = 'Pievienot jaunu lietotāju';
 $lang['metaedit']              = 'Labot metadatus';
 $lang['metasaveerr']           = 'Metadati nav saglabāti';
 $lang['metasaveok']            = 'Metadati saglabāti';
diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php
index b6e0cc6e0..5b406ed70 100644
--- a/inc/lang/mg/lang.php
+++ b/inc/lang/mg/lang.php
@@ -27,7 +27,6 @@ $lang['btn_admin']  = 'Admin';
 $lang['btn_update'] = 'Update';
 $lang['btn_delete'] = 'Fafao';
 $lang['btn_back']   = 'Miverina';
-$lang['btn_backtomedia'] = 'Fitsongana fichier Media';
 $lang['btn_register'] = 'Hisoratra';
 
 $lang['loggedinas'] = 'Anaranao:';
@@ -61,7 +60,6 @@ $lang['rssfailed']   = 'An error occured while fetching this feed: ';
 $lang['nothingfound']= 'Tsy nahitana n\'inon\'inona.';
 
 $lang['mediaselect'] = 'Safidy rakitra Media';
-$lang['fileupload']  = 'Fandefasana rakitra Media';
 $lang['uploadsucc']  = 'Voalefa soa aman-tsara';
 $lang['uploadfail']  = 'Tsy lasa ilay izy. Mety tsy fananana alalana?';
 $lang['uploadwrong'] = 'Nolavina ny lefa. Voarara io extension-na rakitra io!';
@@ -116,6 +114,5 @@ $lang['qb_sig']     = 'Manisy sonia';
 
 $lang['js']['del_confirm']= 'Hofafana ilay andalana?';
 
-$lang['admin_register']= 'Ampio mpampiasa vaovao...';
 $lang['searchcreatepage']      = "Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.";
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
index ddfae15c4..5621fe9c0 100644
--- a/inc/lang/mk/lang.php
+++ b/inc/lang/mk/lang.php
@@ -38,7 +38,6 @@ $lang['btn_update']            = 'Ажурирај';
 $lang['btn_delete']            = 'Избриши';
 $lang['btn_back']              = 'Назад';
 $lang['btn_backlink']          = 'Повратни врски';
-$lang['btn_backtomedia']       = 'Назад до изборот за медиа-датотека';
 $lang['btn_subscribe']         = 'Менаџирај претплати';
 $lang['btn_profile']           = 'Ажурирај профил';
 $lang['btn_reset']             = 'Ресет';
@@ -95,7 +94,6 @@ $lang['js']['notsavedyet']     = 'Незачуваните промени ќе 
 $lang['rssfailed']             = 'Се појави грешка при повлекувањето на овој канал:';
 $lang['nothingfound']          = 'Ништо не е пронајдено.';
 $lang['mediaselect']           = 'Медиа датотеки';
-$lang['fileupload']            = 'Качување на медиа датотеки';
 $lang['uploadsucc']            = 'Качувањето е успешно';
 $lang['uploadfail']            = 'Качувањето не е успешно. Можеби има погрешни пермисии?';
 $lang['uploadwrong']           = 'Качувањето е одбиено. Наставката на датотеката е забранета!';
@@ -167,7 +165,6 @@ $lang['qb_media']              = 'Додај слики и други датот
 $lang['qb_sig']                = 'Внеси потпис';
 $lang['qb_smileys']            = 'Смајлиња';
 $lang['qb_chars']              = 'Специјални знаци';
-$lang['admin_register']        = 'Додај нов корисник';
 $lang['metaedit']              = 'Уреди мета-податоци';
 $lang['metasaveerr']           = 'Запишување на мета-податоците не успеа';
 $lang['metasaveok']            = 'Мета-податоците се зачувани';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index 7ebb14b93..62274e127 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -42,7 +42,6 @@ $lang['btn_update']            = 'अद्ययावत';
 $lang['btn_delete']            = 'नष्ट';
 $lang['btn_back']              = 'मागॆ';
 $lang['btn_backlink']          = 'येथे काय जोडले आहे';
-$lang['btn_backtomedia']       = 'परत माध्यम फाइल निवडीकड़े';
 $lang['btn_subscribe']         = 'पृष्ठाच्या बदलांची पुरवणी (फीड) लावा ';
 $lang['btn_profile']           = 'प्रोफाइल अद्ययावत करा';
 $lang['btn_reset']             = 'रिसेट';
@@ -140,7 +139,6 @@ $lang['js']['media_cancel']    = 'काढा';
 $lang['rssfailed']             = 'ही पुरवणी आणण्यात काही चूक झाली:';
 $lang['nothingfound']          = 'काही सापडला नाही.';
 $lang['mediaselect']           = 'दृकश्राव्य फाइल';
-$lang['fileupload']            = 'दृकश्राव्य फाइल अपलोड';
 $lang['uploadsucc']            = 'अपलोड यशस्वी';
 $lang['uploadfail']            = 'अपलोड अयशस्वी.कदाचित चुकीच्या परवानग्या असतील ?';
 $lang['uploadwrong']           = 'अपलोड नाकारण्यात आला. हे फाइल एक्सटेंशन अवैध आहे!';
@@ -224,7 +222,6 @@ $lang['qb_sig']                = 'स्वाक्षरी टाका';
 $lang['qb_smileys']            = 'स्माइली';
 $lang['qb_chars']              = 'ख़ास चिन्ह';
 $lang['upperns']               = 'ह्यावरच्या नेमस्पेसकडे उडी मारा';
-$lang['admin_register']        = 'नवीन सदस्य';
 $lang['metaedit']              = 'मेटाडेटा बदला';
 $lang['metasaveerr']           = 'मेटाडेटा सुरक्षित झाला नाही';
 $lang['metasaveok']            = 'मेटाडेटा सुरक्षित झाला';
diff --git a/inc/lang/ms/lang.php b/inc/lang/ms/lang.php
index 303116429..14cb94ebd 100644
--- a/inc/lang/ms/lang.php
+++ b/inc/lang/ms/lang.php
@@ -35,7 +35,6 @@ $lang['btn_update']            = 'Kemaskini';
 $lang['btn_delete']            = 'Hapus';
 $lang['btn_back']              = 'Balik';
 $lang['btn_backlink']          = 'Pautan ke halaman ini';
-$lang['btn_backtomedia']       = 'Balik ke rangkaian pilihan fail media';
 $lang['btn_subscribe']         = 'Pantau';
 $lang['btn_profile']           = 'Kemaskinikan profil';
 $lang['btn_reset']             = 'Batalkan suntingan';
@@ -87,7 +86,6 @@ $lang['txt_upload']            = 'Pilih fail untuk diunggah:';
 $lang['txt_filename']          = 'Unggah fail dengan nama (tidak wajib):';
 $lang['txt_overwrt']           = 'Timpa fail sekarang';
 $lang['lockedby']              = 'Halaman ini telah di:';
-$lang['fileupload']            = 'Muat naik fail';
 $lang['uploadsucc']            = 'Pemuatan naik berjaya';
 $lang['uploadfail']            = 'Ralat muat naik';
 $lang['uploadxss']             = 'Fail ini mengandungi kod HTML atau kod skrip yang mungkin boleh disalah tafsir oleh pelayar web.';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 88fb2a690..46074d020 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -37,7 +37,6 @@ $lang['btn_update']            = 'अध्यावधिक गर्नुह
 $lang['btn_delete']            = 'मेटाउनुहोस् ';
 $lang['btn_back']              = 'पछाडि';
 $lang['btn_backlink']          = 'पछाडिका लिङ्कहरु ';
-$lang['btn_backtomedia']       = 'मिडिया छनौटमा फर्कनुहोस्';
 $lang['btn_subscribe']         = 'पृष्ठ परिवर्तन ग्राह्य गर्नुहोस्';
 $lang['btn_profile']           = 'प्रोफाइल अध्यावधिक गर्नुहोस् ';
 $lang['btn_reset']             = 'पूर्वरुपमा फर्काउनुहोस';
@@ -107,7 +106,6 @@ $lang['js']['del_confirm']     = 'साच्चै छानिएका व
 $lang['rssfailed']             = 'यो फिड लिइ आउदा गल्ति भयो ।';
 $lang['nothingfound']          = 'केहि पनि भेटिएन ।';
 $lang['mediaselect']           = 'मिडिया फाइलहरू ';
-$lang['fileupload']            = 'मिडिया फाइल अपलोड ';
 $lang['uploadsucc']            = 'अपलोड सफल ';
 $lang['uploadfail']            = 'अपलोड असफल । सायद गलत अनुमति । ';
 $lang['uploadwrong']           = 'अपलोड असमर्थित । फाइल एक्सटेन्सन अमान्य।  ';
@@ -167,7 +165,6 @@ $lang['qb_media']              = 'तस्विर र अरु फाइल
 $lang['qb_sig']                = 'हस्ताक्षर थप्नुहोस् ';
 $lang['qb_smileys']            = 'स्माइलीहरु ';
 $lang['qb_chars']              = 'विशेष वर्णहरु ';
-$lang['admin_register']        = 'नयाँ प्रयोगकर्ता थप्नुहोस् ';
 $lang['metaedit']              = 'मेटाडेटा सम्पादन गर्नुहोस्';
 $lang['metasaveerr']           = 'मेटाडाटा लेखन असफल';
 $lang['metasaveok']            = 'मेटाडाटा वचत भयो ';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 4c668557d..b94202475 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -56,7 +56,6 @@ $lang['btn_update']            = 'Bijwerken';
 $lang['btn_delete']            = 'Verwijder';
 $lang['btn_back']              = 'Terug';
 $lang['btn_backlink']          = 'Referenties';
-$lang['btn_backtomedia']       = 'Terug naar Bestandsselectie';
 $lang['btn_subscribe']         = 'Inschrijven wijzigingen';
 $lang['btn_profile']           = 'Profiel aanpassen';
 $lang['btn_reset']             = 'Wissen';
@@ -169,7 +168,6 @@ $lang['js']['media_overwrt']   = 'Bestaande bestanden overschrijven';
 $lang['rssfailed']             = 'Er is een fout opgetreden bij het ophalen van de feed: ';
 $lang['nothingfound']          = 'Er werd niets gevonden.';
 $lang['mediaselect']           = 'Bestandsselectie';
-$lang['fileupload']            = 'Bestandsupload';
 $lang['uploadsucc']            = 'Upload geslaagd';
 $lang['uploadfail']            = 'Upload mislukt. Misschien verkeerde permissies?';
 $lang['uploadwrong']           = 'Upload mislukt. Deze bestandsextensie is verboden!';
@@ -260,7 +258,6 @@ $lang['qb_sig']                = 'Handtekening invoegen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Speciale tekens';
 $lang['upperns']               = 'Spring naar bovenliggende namespace';
-$lang['admin_register']        = 'Nieuwe gebruiker toevoegen';
 $lang['metaedit']              = 'Metadata wijzigen';
 $lang['metasaveerr']           = 'Schrijven van metadata mislukt';
 $lang['metasaveok']            = 'Metadata bewaard';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index ecf10ff5b..5659286c3 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -53,7 +53,6 @@ $lang['btn_update']            = 'Oppdater';
 $lang['btn_delete']            = 'Slett';
 $lang['btn_back']              = 'Tilbake';
 $lang['btn_backlink']          = 'Tilbakelenker';
-$lang['btn_backtomedia']       = 'Tilbake til valg av mediafil';
 $lang['btn_subscribe']         = 'Abonnér på endringer';
 $lang['btn_profile']           = 'Oppdater profil';
 $lang['btn_reset']             = 'Tilbakestill';
@@ -166,7 +165,6 @@ $lang['js']['media_overwrt']   = 'Erstatt eksisterende filer';
 $lang['rssfailed']             = 'En feil oppstod da denne kilden skulle hentes:';
 $lang['nothingfound']          = 'Ingen data funnet.';
 $lang['mediaselect']           = 'Valg av mediafil';
-$lang['fileupload']            = 'Mediafil Opplasting';
 $lang['uploadsucc']            = 'Opplastingen var vellykket';
 $lang['uploadfail']            = 'Opplastingen var mislykket. Kanskje feil rettigheter?';
 $lang['uploadwrong']           = 'Opplastingen ble nektet. Denne filendelsen er ikke tillatt!';
@@ -257,7 +255,6 @@ $lang['qb_sig']                = 'Føy til signatur';
 $lang['qb_smileys']            = 'Smilefjes';
 $lang['qb_chars']              = 'Spesialtegn';
 $lang['upperns']               = 'gå til overordnet navnerom';
-$lang['admin_register']        = 'Legg til ny bruker';
 $lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Skriving av metadata feilet';
 $lang['metasaveok']            = 'Metadata lagret';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index fa70db06c..16375aab3 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -49,7 +49,6 @@ $lang['btn_update']            = 'Aktualizuj';
 $lang['btn_delete']            = 'Usuń';
 $lang['btn_back']              = 'Wstecz';
 $lang['btn_backlink']          = 'Odnośniki';
-$lang['btn_backtomedia']       = 'Powrót do wyboru pliku';
 $lang['btn_subscribe']         = 'Subskrybuj zmiany';
 $lang['btn_profile']           = 'Aktualizuj profil';
 $lang['btn_reset']             = 'Resetuj';
@@ -162,7 +161,6 @@ $lang['js']['media_overwrt']   = 'Nadpisz istniejące pliki';
 $lang['rssfailed']             = 'Wystąpił błąd przy pobieraniu tych danych: ';
 $lang['nothingfound']          = 'Nic nie znaleziono.';
 $lang['mediaselect']           = 'Wysyłanie pliku';
-$lang['fileupload']            = 'Wysyłanie pliku';
 $lang['uploadsucc']            = 'Wysyłanie powiodło się!';
 $lang['uploadfail']            = 'Błąd wysyłania pliku. Czy prawa do katalogów są poprawne?';
 $lang['uploadwrong']           = 'Wysyłanie zabronione. Nie można wysłać plików z takim rozszerzeniem';
@@ -251,7 +249,6 @@ $lang['qb_sig']                = 'Wstaw podpis';
 $lang['qb_smileys']            = 'Emotikony';
 $lang['qb_chars']              = 'Znaki specjalne';
 $lang['upperns']               = 'Skok piętro wyżej';
-$lang['admin_register']        = 'Dodawanie użytkownika';
 $lang['metaedit']              = 'Edytuj metadane';
 $lang['metasaveerr']           = 'Zapis metadanych nie powiódł się';
 $lang['metasaveok']            = 'Metadane zapisano';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index be62af6fe..5d3afc4fc 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -55,7 +55,6 @@ $lang['btn_update']            = 'Atualizar';
 $lang['btn_delete']            = 'Excluir';
 $lang['btn_back']              = 'Voltar';
 $lang['btn_backlink']          = 'Links reversos';
-$lang['btn_backtomedia']       = 'Voltar à seleção do arquivo de mídia';
 $lang['btn_subscribe']         = 'Monitorar alterações';
 $lang['btn_profile']           = 'Atualizar o perfil';
 $lang['btn_reset']             = 'Limpar';
@@ -168,7 +167,6 @@ $lang['js']['media_overwrt']   = 'Sobrescrever arquivos existentes';
 $lang['rssfailed']             = 'Ocorreu um erro durante a atualização dessa fonte: ';
 $lang['nothingfound']          = 'Não foi encontrado nada.';
 $lang['mediaselect']           = 'Arquivos de mídia';
-$lang['fileupload']            = 'Envio de arquivo de mídia';
 $lang['uploadsucc']            = 'O envio foi efetuado com sucesso';
 $lang['uploadfail']            = 'Não foi possível enviar o arquivo. Será algum problema com as permissões?';
 $lang['uploadwrong']           = 'O envio foi bloqueado. Essa extensão de arquivo é proibida!';
@@ -259,7 +257,6 @@ $lang['qb_sig']                = 'Inserir assinatura';
 $lang['qb_smileys']            = 'Carinhas';
 $lang['qb_chars']              = 'Caracteres especiais';
 $lang['upperns']               = 'Pular para espaço de nomes acima';
-$lang['admin_register']        = 'Adicionar novo usuário';
 $lang['metaedit']              = 'Editar metadados';
 $lang['metasaveerr']           = 'Não foi possível escrever os metadados';
 $lang['metasaveok']            = 'Os metadados foram salvos';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index cfb85a91c..defb21954 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -44,7 +44,6 @@ $lang['btn_update']            = 'Actualizar';
 $lang['btn_delete']            = 'Apagar';
 $lang['btn_back']              = 'Voltar';
 $lang['btn_backlink']          = 'Backlinks';
-$lang['btn_backtomedia']       = 'Voltar à Selecção de Media';
 $lang['btn_subscribe']         = 'Subscrever Alterações';
 $lang['btn_profile']           = 'Actualizar Perfil';
 $lang['btn_reset']             = 'Limpar';
@@ -156,7 +155,6 @@ $lang['js']['media_overwrt']   = 'Escrever por cima de ficheiros existentes';
 $lang['rssfailed']             = 'Ocorreu um erro neste canal RSS: ';
 $lang['nothingfound']          = 'Nada foi encontrado.';
 $lang['mediaselect']           = 'Selecção de ficheiros';
-$lang['fileupload']            = 'Carregamento de ficheiros';
 $lang['uploadsucc']            = 'Carregamento com sucesso';
 $lang['uploadfail']            = 'Falhou o carregamento. Talvez por não ter permissões?';
 $lang['uploadwrong']           = 'Carregamento negado. Esta extensão está proibida.';
@@ -247,7 +245,6 @@ $lang['qb_sig']                = 'Inserir Assinatura';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Caracteres Especiais';
 $lang['upperns']               = 'Ir para o espaço de nomes parente';
-$lang['admin_register']        = 'Registar Novo Utilizador';
 $lang['metaedit']              = 'Editar Metadata';
 $lang['metasaveerr']           = 'Falhou a escrita de Metadata';
 $lang['metasaveok']            = 'Metadata gravada';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 452a93ed0..7c7d55098 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -41,7 +41,6 @@ $lang['btn_update']            = 'Actualizează';
 $lang['btn_delete']            = 'Șterge';
 $lang['btn_back']              = 'Înapoi';
 $lang['btn_backlink']          = 'Legătură anterioară';
-$lang['btn_backtomedia']       = 'Înapoi la selecția mediafile';
 $lang['btn_subscribe']         = 'Subscrie modificarea paginii';
 $lang['btn_profile']           = 'Actualizează profil';
 $lang['btn_reset']             = 'Resetează';
@@ -151,7 +150,6 @@ $lang['js']['media_overwrt']   = 'Suprascrie fișierele deja existente';
 $lang['rssfailed']             = 'A apărut o eroare in timpul descărcării acestui câmp: ';
 $lang['nothingfound']          = 'Nu am găsit nimic.';
 $lang['mediaselect']           = 'Fișiere media';
-$lang['fileupload']            = 'Încarcare fișier media';
 $lang['uploadsucc']            = 'Încărcare reușită';
 $lang['uploadfail']            = 'Încărcare eșuată. Poate din cauza permisiunilor?';
 $lang['uploadwrong']           = 'Încărcare nepermisă. Extensia fișierului e nepermisă';
@@ -236,7 +234,6 @@ $lang['qb_sig']                = 'Inserează semnătură';
 $lang['qb_smileys']            = 'Smiley-uri';
 $lang['qb_chars']              = 'Caractere speciale';
 $lang['upperns']               = 'Accesează spațiul de nume părinte';
-$lang['admin_register']        = 'Adaugă utilizator nou';
 $lang['metaedit']              = 'Editează metadata';
 $lang['metasaveerr']           = 'Scrierea metadatelor a eșuat';
 $lang['metasaveok']            = 'Metadatele au fost salvate';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 96278d53b..c40e1ee20 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -60,7 +60,6 @@ $lang['btn_update']            = 'Обновить';
 $lang['btn_delete']            = 'Удалить';
 $lang['btn_back']              = 'Назад';
 $lang['btn_backlink']          = 'Ссылки сюда';
-$lang['btn_backtomedia']       = 'Вернуться к выбору медиафайла';
 $lang['btn_subscribe']         = 'Подписаться (все правки)';
 $lang['btn_profile']           = 'Профиль';
 $lang['btn_reset']             = 'Сброс';
@@ -171,7 +170,6 @@ $lang['js']['media_overwrt']   = 'Перезаписать существующ
 $lang['rssfailed']             = 'Произошла ошибка при получении следующей новостной ленты: ';
 $lang['nothingfound']          = 'Ничего не найдено.';
 $lang['mediaselect']           = 'Выбор медиафайла';
-$lang['fileupload']            = 'Загрузка медиафайла';
 $lang['uploadsucc']            = 'Загрузка произведена успешно';
 $lang['uploadfail']            = 'Загрузка не удалась. Возможно, проблемы с правами доступа?';
 $lang['uploadwrong']           = 'В загрузке отказано. Файлы с таким расширением запрещены. ';
@@ -262,7 +260,6 @@ $lang['qb_sig']                = 'Вставить подпись';
 $lang['qb_smileys']            = 'Смайлики';
 $lang['qb_chars']              = 'Специальные символы';
 $lang['upperns']               = 'Перейти в родительское пространство имён';
-$lang['admin_register']        = 'Добавить пользователя';
 $lang['metaedit']              = 'Править метаданные';
 $lang['metasaveerr']           = 'Ошибка записи метаданных';
 $lang['metasaveok']            = 'Метаданные сохранены';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index afbf79503..f2d3a90bd 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -38,7 +38,6 @@ $lang['btn_update']            = 'Aktualizovať';
 $lang['btn_delete']            = 'Zmazať';
 $lang['btn_back']              = 'Späť';
 $lang['btn_backlink']          = 'Spätné odkazy';
-$lang['btn_backtomedia']       = 'Späť na výber súboru';
 $lang['btn_subscribe']         = 'Sledovať zmeny';
 $lang['btn_profile']           = 'Aktualizovať profil';
 $lang['btn_reset']             = 'Zrušiť';
@@ -149,7 +148,6 @@ $lang['js']['media_overwrt']   = 'Prepísať existujúce súbory';
 $lang['rssfailed']             = 'Nastala chyba pri vytváraní tohto RSS: ';
 $lang['nothingfound']          = 'Nič nenájdené.';
 $lang['mediaselect']           = 'Výber súboru';
-$lang['fileupload']            = 'Nahrávanie súboru';
 $lang['uploadsucc']            = 'Prenos prebehol v poriadku';
 $lang['uploadfail']            = 'Chyba pri nahrávaní. Možno kvôli zle nastaveným právam?';
 $lang['uploadwrong']           = 'Prenos súboru s takouto príponou nie je dovolený.';
@@ -235,7 +233,6 @@ $lang['qb_sig']                = 'Vložiť podpis';
 $lang['qb_smileys']            = 'Smajlíky';
 $lang['qb_chars']              = 'Špeciálne znaky';
 $lang['upperns']               = 'návrat do nadradeného menného priestoru';
-$lang['admin_register']        = 'Pridaj nového užívateľa';
 $lang['metaedit']              = 'Upraviť metainformácie';
 $lang['metasaveerr']           = 'Zápis metainformácií zlyhal';
 $lang['metasaveok']            = 'Metainformácie uložené';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index b649d08cb..0361393c9 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -42,7 +42,6 @@ $lang['btn_update']            = 'Posodobi';
 $lang['btn_delete']            = 'Izbriši';
 $lang['btn_back']              = 'Nazaj';
 $lang['btn_backlink']          = 'Povratne povezave';
-$lang['btn_backtomedia']       = 'Nazaj na izbiro predstavnih datotek';
 $lang['btn_subscribe']         = 'Urejanje naročnin';
 $lang['btn_profile']           = 'Posodobi profil';
 $lang['btn_reset']             = 'Ponastavi';
@@ -150,7 +149,6 @@ $lang['js']['media_overwrt']   = 'Prepiši obstoječe datoteke';
 $lang['rssfailed']             = 'Prišlo je do napake med pridobivanjem vira: ';
 $lang['nothingfound']          = 'Ni najdenih predmetov.';
 $lang['mediaselect']           = 'Predstavne datoteke';
-$lang['fileupload']            = 'Pošiljanje predstavnih datotek';
 $lang['uploadsucc']            = 'Pošiljanje je bilo uspešno končano.';
 $lang['uploadfail']            = 'Pošiljanje je spodletelo. Morda so uporabljena neustrezna dovoljenja.';
 $lang['uploadwrong']           = 'Pošiljanje je zavrnjeno. Uporabljena pripona datoteke je prepovedana.';
@@ -239,7 +237,6 @@ $lang['qb_sig']                = 'Vstavi podpis';
 $lang['qb_smileys']            = 'Smeški';
 $lang['qb_chars']              = 'Posebni znaki';
 $lang['upperns']               = 'skoči na nadrejeni imenski prostor';
-$lang['admin_register']        = 'Dodaj novega uporabnika';
 $lang['metaedit']              = 'Uredi metapodatke';
 $lang['metasaveerr']           = 'Zapisovanje metapodatkov je spodletelo';
 $lang['metasaveok']            = 'Metapodatki so shranjeni';
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 4c61b6a70..3d2146394 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -40,7 +40,6 @@ $lang['btn_update']            = 'Përditëso';
 $lang['btn_delete']            = 'Fshi';
 $lang['btn_back']              = 'Mbrapa';
 $lang['btn_backlink']          = 'Lidhjet këtu';
-$lang['btn_backtomedia']       = 'Mbrapa tek Përzgjedhja e Media-ve';
 $lang['btn_subscribe']         = 'Menaxho Abonimet';
 $lang['btn_profile']           = 'Përditëso Profilin';
 $lang['btn_reset']             = 'Rivendos';
@@ -98,7 +97,6 @@ $lang['js']['notsavedyet']     = 'Ndryshimet e paruajtura do të humbasin.\nVazh
 $lang['rssfailed']             = 'Ndoshi një gabim gjatë kapjes së këtij lajmi:';
 $lang['nothingfound']          = 'Nuk u gjet asgjë.';
 $lang['mediaselect']           = 'Skedarët e Medias';
-$lang['fileupload']            = 'Ngarkoje';
 $lang['uploadsucc']            = 'Ngarkim i suksesshëm';
 $lang['uploadfail']            = 'Ngarkimi dështoi. Ndoshta leje të gabuara?';
 $lang['uploadwrong']           = 'Ngarkimi u refuzua! Prapashtesa e skedarit është e ndaluar!';
@@ -176,7 +174,6 @@ $lang['qb_sig']                = 'Fut Firmën';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Karaktere Speciale';
 $lang['upperns']               = 'kërce tek hapësira e emrit prind';
-$lang['admin_register']        = 'Shto Përdorues të Ri';
 $lang['metaedit']              = 'Redakto Metadata';
 $lang['metasaveerr']           = 'Shkrimi i metadata-ve dështoi';
 $lang['metasaveok']            = 'Metadata u ruajt';
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index 37a36c82b..46088dca8 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -37,7 +37,6 @@ $lang['btn_update']            = 'Ажурирај';
 $lang['btn_delete']            = 'Избриши';
 $lang['btn_back']              = 'Натраг';
 $lang['btn_backlink']          = 'Повратне везе';
-$lang['btn_backtomedia']       = 'Врати се на избор медијске датотеке';
 $lang['btn_subscribe']         = 'Пријави се на измене';
 $lang['btn_profile']           = 'Ажурирај профил';
 $lang['btn_reset']             = 'Поништи';
@@ -125,7 +124,6 @@ $lang['js']['del_confirm']     = 'Обриши овај унос?';
 $lang['rssfailed']             = 'Дошло је до грешке приликом преузимања овог довода: ';
 $lang['nothingfound']          = 'Ништа није нађено.';
 $lang['mediaselect']           = 'Избор медијске датотеке';
-$lang['fileupload']            = 'Слање медијске датотеке';
 $lang['uploadsucc']            = 'Успешно слање';
 $lang['uploadfail']            = 'Неуспешно слање. Можда немате дозволу?';
 $lang['uploadwrong']           = 'Слање је забрањено. Овај наставак датотеке је забрањен!';
@@ -198,7 +196,6 @@ $lang['qb_sig']                = 'Убаци потпис';
 $lang['qb_smileys']            = 'Смешко';
 $lang['qb_chars']              = 'Посебни карактери';
 $lang['upperns']               = 'Скочи на виши именски простор';
-$lang['admin_register']        = 'Додај новог корисника';
 $lang['metaedit']              = 'Измени мета-податке';
 $lang['metasaveerr']           = 'Записивање мета-података није било успешно';
 $lang['metasaveok']            = 'Мета-подаци су сачувани';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index f22491db1..d343d0339 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -52,7 +52,6 @@ $lang['btn_update']            = 'Uppdatera';
 $lang['btn_delete']            = 'Radera';
 $lang['btn_back']              = 'Tillbaka';
 $lang['btn_backlink']          = 'Tillbakalänkar';
-$lang['btn_backtomedia']       = 'Tillbaka till val av Mediafil';
 $lang['btn_subscribe']         = 'Prenumerera på ändringar';
 $lang['btn_profile']           = 'Uppdatera profil';
 $lang['btn_reset']             = 'Återställ';
@@ -164,7 +163,6 @@ $lang['js']['media_overwrt']   = 'Skriv över existerande filer';
 $lang['rssfailed']             = 'Ett fel uppstod när detta RSS-flöde skulle hämtas: ';
 $lang['nothingfound']          = 'Inga filer hittades.';
 $lang['mediaselect']           = 'Mediafiler';
-$lang['fileupload']            = 'Ladda upp mediafiler';
 $lang['uploadsucc']            = 'Uppladdningen lyckades';
 $lang['uploadfail']            = 'Uppladdningen misslyckades, fel filskydd?';
 $lang['uploadwrong']           = 'Uppladdning nekad. Filändelsen är inte tillåten!';
@@ -249,7 +247,6 @@ $lang['qb_sig']                = 'Infoga signatur';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Specialtecken';
 $lang['upperns']               = 'hoppa till föräldernamnrymd';
-$lang['admin_register']        = 'Lägg till ny användare';
 $lang['metaedit']              = 'Redigera metadata';
 $lang['metasaveerr']           = 'Skrivning av metadata misslyckades';
 $lang['metasaveok']            = 'Metadata sparad';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index 113431276..e40b69454 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -39,7 +39,6 @@ $lang['btn_update']            = 'ปรับปรุง';
 $lang['btn_delete']            = 'ลบ';
 $lang['btn_back']              = 'ย้อนกลับ';
 $lang['btn_backlink']          = 'หน้าที่ลิงก์มา';
-$lang['btn_backtomedia']       = 'กลับไปยังหน้าเลือกไฟล์สื่อ';
 $lang['btn_subscribe']         = 'เฝ้าดู';
 $lang['btn_profile']           = 'แก้ข้อมูลผู้ใช้';
 $lang['btn_reset']             = 'เริ่มใหม่';
@@ -114,7 +113,6 @@ $lang['js']['del_confirm']     = 'ต้องการลบรายการ
 $lang['rssfailed']             = 'มีข้อผิดพลาดขณะดูดฟีดนี้';
 $lang['nothingfound']          = 'ไม่พบสิ่งใด';
 $lang['mediaselect']           = 'ไฟล์สื่อ';
-$lang['fileupload']            = 'อัปโหลด';
 $lang['uploadsucc']            = 'อัปโหลดสำเร็จ';
 $lang['uploadfail']            = 'เกิดความขัดข้องในการอัปโหลด';
 $lang['uploadwrong']           = 'การอัพโหลดถูกปฏิเสธ ส่วนขยายไฟล์นี้ต้องห้าม!';
@@ -184,7 +182,6 @@ $lang['qb_sig']                = 'ลายเซ็นพร้อมลงเ
 $lang['qb_smileys']            = 'ภาพแสดงอารมณ์';
 $lang['qb_chars']              = 'อักขระพิเศษ';
 $lang['upperns']               = 'กระโดดขึ้นไปยังเนมสเปซแม่';
-$lang['admin_register']        = 'สร้างบัญชีผู้ใช้';
 $lang['metaedit']              = 'แก้ไขข้อมูลเมต้า';
 $lang['metasaveerr']           = 'มีข้อผิดพลาดในการเขียนข้อมูลเมต้า';
 $lang['metasaveok']            = 'บันทึกเมต้าดาต้าแล้ว';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 1676256a5..48d364320 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -44,7 +44,6 @@ $lang['btn_update']            = 'Güncelle';
 $lang['btn_delete']            = 'Sil';
 $lang['btn_back']              = 'Geri';
 $lang['btn_backlink']          = 'Geri linkler';
-$lang['btn_backtomedia']       = 'Çokluortam dosyası seçimine dön';
 $lang['btn_subscribe']         = 'Sayfa Değişikliklerini Bildir';
 $lang['btn_profile']           = 'Kullanıcı Bilgilerini Güncelle';
 $lang['btn_reset']             = 'Sıfırla';
@@ -154,7 +153,6 @@ $lang['js']['media_overwrt']   = 'Var olan dosyaların üzerine yaz';
 $lang['rssfailed']             = 'Bu beslemeyi çekerken hata oluştu: ';
 $lang['nothingfound']          = 'Hiçbir şey yok.';
 $lang['mediaselect']           = 'Çokluortam dosyası seçimi';
-$lang['fileupload']            = 'Çokluortam dosyası yükleme';
 $lang['uploadsucc']            = 'Yükleme tamam';
 $lang['uploadfail']            = 'Yükleme başarısız. Yetki hatası olabilir!';
 $lang['uploadwrong']           = 'Yükleme engellendi. Bu dosya uzantısına izin verilmiyor!';
@@ -244,7 +242,6 @@ $lang['qb_sig']                = 'İmza Ekle';
 $lang['qb_smileys']            = 'Gülen Yüzler';
 $lang['qb_chars']              = 'Özel Karakterler';
 $lang['upperns']               = 'ebeveyn isimalanına atla';
-$lang['admin_register']        = 'Yeni kullanıcı ekle...';
 $lang['metaedit']              = 'Metaverileri Değiştir';
 $lang['metasaveerr']           = 'Metaveri yazma başarısız ';
 $lang['metasaveok']            = 'Metaveri kaydedildi';
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index a6b08c905..d03750579 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -41,7 +41,6 @@ $lang['btn_update']            = 'Оновити';
 $lang['btn_delete']            = 'Видалити';
 $lang['btn_back']              = 'Назад';
 $lang['btn_backlink']          = 'Посилання сюди';
-$lang['btn_backtomedia']       = 'Назад до вибору медіа-файлу';
 $lang['btn_subscribe']         = 'Підписатися';
 $lang['btn_profile']           = 'Оновити профіль';
 $lang['btn_reset']             = 'Очистити';
@@ -138,7 +137,6 @@ $lang['js']['media_cancel']    = 'видалити';
 $lang['rssfailed']             = 'Виникла помилка під час отримання RSS-стрічки: ';
 $lang['nothingfound']          = 'Нічого не знайдено.';
 $lang['mediaselect']           = 'Вибір медіа-файлу';
-$lang['fileupload']            = 'Завантаження медіа-файлу';
 $lang['uploadsucc']            = 'Завантаження пройшло успішно';
 $lang['uploadfail']            = 'Помилка при завантаженні. Можливо неправильні права?';
 $lang['uploadwrong']           = 'Завантаження заборонено. Таке розширення файлу не дозволяється!';
@@ -220,7 +218,6 @@ $lang['qb_sig']                = 'Додати підпис';
 $lang['qb_smileys']            = 'Посмішки';
 $lang['qb_chars']              = 'Спеціальні символи';
 $lang['upperns']               = 'Перейти до батьківського простору імен';
-$lang['admin_register']        = 'Додати нового користувача';
 $lang['metaedit']              = 'Редагувати метадані';
 $lang['metasaveerr']           = 'Помилка запису метаданих';
 $lang['metasaveok']            = 'Метадані збережено';
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 41a7d590f..944a9e5d6 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -130,7 +130,6 @@ $lang['js']['media_overwrt']   = 'Ghi đè các file trùng';
 $lang['rssfailed']             = 'Nguồn này gặp phải lỗi';
 $lang['nothingfound']          = 'Không tìm được gì';
 $lang['mediaselect']           = 'Xem';
-$lang['fileupload']            = 'Tải lên tệp media';
 $lang['uploadsucc']            = 'Tải lên thành công';
 $lang['uploadfail']            = 'Tải lên thất bại. Có thể vì không đủ quyền?';
 $lang['uploadwrong']           = 'Tải lên bị từ chối. Cấm tải loại tệp này';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index c5e7da000..bda7bb32c 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -47,7 +47,6 @@ $lang['btn_update']            = '更新設定';
 $lang['btn_delete']            = '刪除';
 $lang['btn_back']              = '回上一步';
 $lang['btn_backlink']          = '反向連結';
-$lang['btn_backtomedia']       = '重新選擇圖檔';
 $lang['btn_subscribe']         = '訂閱更動通知';
 $lang['btn_profile']           = '更新個人資料';
 $lang['btn_reset']             = '資料重設';
@@ -159,7 +158,6 @@ $lang['js']['media_overwrt']   = '覆蓋已存在的檔案';
 $lang['rssfailed']             = '擷取 RSS 饋送檔時發生錯誤：';
 $lang['nothingfound']          = '沒找到任何結果。';
 $lang['mediaselect']           = '媒體檔案';
-$lang['fileupload']            = '上傳媒體檔案';
 $lang['uploadsucc']            = '已上傳';
 $lang['uploadfail']            = '無法上傳。是否因權限錯誤？';
 $lang['uploadwrong']           = '拒絕上傳。這個副檔名被禁止了！';
@@ -250,7 +248,6 @@ $lang['qb_sig']                = '插入簽名';
 $lang['qb_smileys']            = '表情符號';
 $lang['qb_chars']              = '特殊字元';
 $lang['upperns']               = '前往父分類名稱';
-$lang['admin_register']        = '新增使用者';
 $lang['metaedit']              = '編輯後設資料';
 $lang['metasaveerr']           = '後設資料無法寫入';
 $lang['metasaveok']            = '後設資料已儲存';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 6f55834d0..df55a99e6 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -55,7 +55,6 @@ $lang['btn_update']            = '更新';
 $lang['btn_delete']            = '删除';
 $lang['btn_back']              = '返回';
 $lang['btn_backlink']          = '反向链接';
-$lang['btn_backtomedia']       = '返回到媒体文件选择工具';
 $lang['btn_subscribe']         = '订阅本页更改';
 $lang['btn_profile']           = '更新个人信息';
 $lang['btn_reset']             = '重设';
@@ -168,7 +167,6 @@ $lang['js']['media_overwrt']   = '覆盖已存在的文件';
 $lang['rssfailed']             = '获取该 RSS 信息时产生错误：';
 $lang['nothingfound']          = '什么都没有找到。';
 $lang['mediaselect']           = '媒体文件';
-$lang['fileupload']            = '上传媒体文件';
 $lang['uploadsucc']            = '上传成功';
 $lang['uploadfail']            = '上传失败。也许是上传权限错误。';
 $lang['uploadwrong']           = '上传失败。该扩展名被禁止。';
@@ -259,7 +257,6 @@ $lang['qb_sig']                = '插入签名';
 $lang['qb_smileys']            = '表情符号';
 $lang['qb_chars']              = '特殊字符';
 $lang['upperns']               = '跳转到父级名空间';
-$lang['admin_register']        = '添加新用户';
 $lang['metaedit']              = '编辑元数据';
 $lang['metasaveerr']           = '写入元数据失败';
 $lang['metasaveok']            = '元数据已保存';
-- 
cgit v1.2.3


From 45bd9f1311427a53e57b1f46d2c6fc7de1caa6e2 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Fri, 3 Apr 2015 22:24:39 -0400
Subject: Delete unused div (Fixes #1098)

---
 inc/media.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/inc/media.php b/inc/media.php
index 81081d5dc..e9fff1489 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1860,7 +1860,6 @@ function media_searchform($ns,$query='',$fullscreen=false){
     $form->addHidden('ns', $ns);
     $form->addHidden($fullscreen ? 'mediado' : 'do', 'searchlist');
 
-    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>'.NL);
     $form->addElement(form_makeOpenTag('p'));
     $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
     $form->addElement(form_makeButton('submit', '', $lang['btn_search']));
-- 
cgit v1.2.3


From d49d4260ee0fed5eabc3773440fc1073a87c56dd Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Sat, 4 Apr 2015 00:34:33 -0400
Subject: Remove no longer needed language string

---
 inc/lang/ar/lang.php          | 1 -
 inc/lang/bg/lang.php          | 1 -
 inc/lang/ca/lang.php          | 1 -
 inc/lang/cs/lang.php          | 1 -
 inc/lang/da/lang.php          | 1 -
 inc/lang/de-informal/lang.php | 1 -
 inc/lang/de/lang.php          | 1 -
 inc/lang/el/lang.php          | 1 -
 inc/lang/en/lang.php          | 1 -
 inc/lang/eo/lang.php          | 1 -
 inc/lang/es/lang.php          | 1 -
 inc/lang/et/lang.php          | 1 -
 inc/lang/eu/lang.php          | 1 -
 inc/lang/fa/lang.php          | 1 -
 inc/lang/fi/lang.php          | 1 -
 inc/lang/fr/lang.php          | 1 -
 inc/lang/gl/lang.php          | 1 -
 inc/lang/he/lang.php          | 1 -
 inc/lang/hr/lang.php          | 1 -
 inc/lang/hu/lang.php          | 1 -
 inc/lang/it/lang.php          | 1 -
 inc/lang/ja/lang.php          | 1 -
 inc/lang/ka/lang.php          | 1 -
 inc/lang/ko/lang.php          | 1 -
 inc/lang/lv/lang.php          | 1 -
 inc/lang/nl/lang.php          | 1 -
 inc/lang/no/lang.php          | 1 -
 inc/lang/pl/lang.php          | 1 -
 inc/lang/pt-br/lang.php       | 1 -
 inc/lang/pt/lang.php          | 1 -
 inc/lang/ro/lang.php          | 1 -
 inc/lang/ru/lang.php          | 1 -
 inc/lang/sk/lang.php          | 1 -
 inc/lang/sl/lang.php          | 1 -
 inc/lang/sv/lang.php          | 1 -
 inc/lang/tr/lang.php          | 1 -
 inc/lang/zh-tw/lang.php       | 1 -
 inc/lang/zh/lang.php          | 1 -
 38 files changed, 38 deletions(-)

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 52e9bc5cf..2d21fc8f0 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -275,7 +275,6 @@ $lang['subscr_style_every']    = 'بريدا على كل تغيير';
 $lang['subscr_style_digest']   = 'البريد الإلكتروني, ملخص للتغييرات لكل صفحة (كل يوم %.2f)';
 $lang['subscr_style_list']     = 'قائمة بالصفحات التي تم تغييرها منذ آخر بريد الإلكتروني (كل يوم %.2f)';
 $lang['authtempfail']          = 'تصريح المشترك غير متوفر مؤقتاً، إن استمرت هذه الحالة يرجى مراسلة المدير';
-$lang['authpwdexpire']         = 'ستنتهي صلاحية كلمة السر في %d . عليك بتغييرها سريعا.';
 $lang['i_chooselang']          = 'اختر لغتك';
 $lang['i_installer']           = 'برنامج تنصيب دوكو ويكي';
 $lang['i_wikiname']            = 'اسم الويكي';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 1b10f2d10..9176cee56 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -265,7 +265,6 @@ $lang['subscr_style_every']    = 'на имейл при всяка промян
 $lang['subscr_style_digest']   = 'на имейл с обобщение на промените във всяка страница (всеки %.2f дни)';
 $lang['subscr_style_list']     = 'на списък с променените страници от последния имейл (всеки %.2f дни)';
 $lang['authtempfail']          = 'Удостоверяването на потребители не е възможно за момента. Ако продължи дълго, моля уведомете администратора на Wiki страницата.';
-$lang['authpwdexpire']         = 'Срока на паролата ви ще изтече след %d дни. Препоръчително е да я смените по-скоро.';
 $lang['i_chooselang']          = 'Изберете вашия език';
 $lang['i_installer']           = 'Инсталатор на DokuWiki';
 $lang['i_wikiname']            = 'Име на Wiki-то';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index df5a3c92b..2287ca001 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -256,7 +256,6 @@ $lang['subscr_style_every']    = 'Envia\'m un correu electrònic per a cada canv
 $lang['subscr_style_digest']   = 'Envia\'m un correu electrònic amb un resum dels canvis per a cada pàgina (cada %.2f dies)';
 $lang['subscr_style_list']     = 'llistat de pàgines canviades des de l\'últim correu electrònic  (cada %.2f dies)';
 $lang['authtempfail']          = 'L\'autenticació d\'usuaris no està disponible temporalment. Si aquesta situació persisteix, si us plau informeu els administradors del wiki.';
-$lang['authpwdexpire']         = 'La vostra contrasenya caducarà en %d dies, l\'hauríeu de canviar aviat.';
 $lang['i_chooselang']          = 'Trieu l\'idioma';
 $lang['i_installer']           = 'Instal·lador de DokuWiki';
 $lang['i_wikiname']            = 'Nom del wiki';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index ffd81eada..d6b50fb97 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -284,7 +284,6 @@ $lang['subscr_style_every']    = 'e-mail pro každou změnu';
 $lang['subscr_style_digest']   = 'souhrnný e-mail změn pro každou stránku (každé %.2f dny/dní)';
 $lang['subscr_style_list']     = 'seznam změněných stránek od posledního e-mailu (každé %.2f dny/dní)';
 $lang['authtempfail']          = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.';
-$lang['authpwdexpire']         = 'Platnost vašeho hesla vyprší za %d dní, měli byste ho změnit co nejdříve.';
 $lang['i_chooselang']          = 'Vyberte si jazyk';
 $lang['i_installer']           = 'Instalace DokuWiki';
 $lang['i_wikiname']            = 'Název wiki';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 3b344ea3b..ee8a92cf0 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -284,7 +284,6 @@ $lang['subscr_style_every']    = 'email på hver ændring';
 $lang['subscr_style_digest']   = 'opsummeringsmail med ændringer for hver side (hver %.2f dage)';
 $lang['subscr_style_list']     = 'list af ændrede sider siden sidste email (hver %.2f dage)';
 $lang['authtempfail']          = 'Brugervalidering er midlertidigt ude af drift. Hvis dette er vedvarende, kontakt venligst wikiens administrator.';
-$lang['authpwdexpire']         = 'Din adgangskode vil udløbe om %d dage, du bør ændre det snart.';
 $lang['i_chooselang']          = 'Vælg dit sprog';
 $lang['i_installer']           = 'DokuWiki Installer';
 $lang['i_wikiname']            = 'Wiki Navn';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 6e1f77559..c23614511 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -280,7 +280,6 @@ $lang['subscr_style_every']    = 'E-Mail bei jeder Änderung';
 $lang['subscr_style_digest']   = 'E-Mail mit zusammengefasster Übersicht der Seitenänderungen (alle %.2f Tage)';
 $lang['subscr_style_list']     = 'Auflistung aller geänderten Seiten seit der letzten E-Mail (alle %.2f Tage)';
 $lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Admin.';
-$lang['authpwdexpire']         = 'Dein Passwort läuft in %d Tag(en) ab. Du solltest es es frühzeitig ändern.';
 $lang['i_chooselang']          = 'Wähle deine Sprache';
 $lang['i_installer']           = 'DokuWiki-Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index fec0647e0..848c5ae7b 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -291,7 +291,6 @@ $lang['subscr_style_every']    = 'E-Mail bei jeder Bearbeitung';
 $lang['subscr_style_digest']   = 'Zusammenfassung der Änderungen für jede veränderte Seite (Alle %.2f Tage)';
 $lang['subscr_style_list']     = 'Liste der geänderten Seiten (Alle %.2f Tage)';
 $lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Admin.';
-$lang['authpwdexpire']         = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es frühzeitig ändern.';
 $lang['i_chooselang']          = 'Wählen Sie Ihre Sprache';
 $lang['i_installer']           = 'DokuWiki Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index b6ccfd617..21a854b30 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -269,7 +269,6 @@ $lang['subscr_style_every']    = 'email σε κάθε αλλαγή';
 $lang['subscr_style_digest']   = 'συνοπτικό email αλλαγών της σελίδας (κάθε %.2f μέρες)';
 $lang['subscr_style_list']     = 'λίστα σελίδων με αλλαγές μετά από το τελευταίο email (κάθε %.2f μέρες)';
 $lang['authtempfail']          = 'Η συνδεση χρηστών είναι απενεργοποιημένη αυτή την στιγμή. Αν αυτό διαρκέσει για πολύ, παρακαλούμε ενημερώστε τον διαχειριστή του wiki.';
-$lang['authpwdexpire']         = 'Ο κωδικός πρόσβασης θα λήξει σε %d ημέρες. Προτείνουμε να τον αλλάξετε σύντομα.';
 $lang['i_chooselang']          = 'Επιλογή γλώσσας';
 $lang['i_installer']           = 'Οδηγός εγκατάστασης DokuWiki';
 $lang['i_wikiname']            = 'Ονομασία wiki';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 81d8a94bf..3f11a1ee4 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -290,7 +290,6 @@ $lang['subscr_style_list']          = 'list of changed pages since last email (e
 
 /* auth.class language support */
 $lang['authtempfail']          = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
-$lang['authpwdexpire']         = 'Your password will expire in %d days, you should change it soon.';
 
 /* installer strings */
 $lang['i_chooselang']          = 'Choose your language';
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index c7ad4b498..24df39dc7 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -274,7 +274,6 @@ $lang['subscr_style_every']    = 'retpoŝtaĵo pro ĉiu ŝanĝo';
 $lang['subscr_style_digest']   = 'resuma retpoŝtaĵo de ŝanĝoj por ĉiu paĝo (je %.2f tagoj)';
 $lang['subscr_style_list']     = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo (je %.2f tagoj)';
 $lang['authtempfail']          = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.';
-$lang['authpwdexpire']         = 'Via pasvorto malvalidos post %d tagoj, prefere ŝanĝu ĝin baldaũ.';
 $lang['i_chooselang']          = 'Elektu vian lingvon';
 $lang['i_installer']           = 'Instalilo de DokuWiki';
 $lang['i_wikiname']            = 'Nomo de la vikio';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index a27fbd1b2..e10a29a0f 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -304,7 +304,6 @@ $lang['subscr_style_every']    = 'enviar correo en cada cambio';
 $lang['subscr_style_digest']   = 'Resumen de correo electrónico de cambios por cada página (cada %.2f días)';
 $lang['subscr_style_list']     = 'lista de páginas modificadas desde el último correo electrónico (cada %.2f días)';
 $lang['authtempfail']          = 'La autenticación de usuarios no está disponible temporalmente. Si esta situación persiste, por favor avisa al administrador del wiki.';
-$lang['authpwdexpire']         = 'Su contraseña caducara en %d días, debería cambiarla lo antes posible';
 $lang['i_chooselang']          = 'Elija su idioma';
 $lang['i_installer']           = 'Instalador de DokuWiki';
 $lang['i_wikiname']            = 'Nombre del wiki';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 7b4de11e3..2372482c3 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -270,7 +270,6 @@ $lang['subscr_style_every']    = 'igast toimetamisest teavitab ekiri';
 $lang['subscr_style_digest']   = 'kokkuvõte ekirjaga toimetamistest igal leheküljel (iga %.2f päeva järel)';
 $lang['subscr_style_list']     = 'Peale viimast ekirja (iga %.2f päeva järel) toimetaud lehekülgede loend.';
 $lang['authtempfail']          = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.';
-$lang['authpwdexpire']         = 'Sinu salasõna aegub %päeva pärast, võiksid seda peatselt muuta.';
 $lang['i_chooselang']          = 'Vali keel';
 $lang['i_installer']           = 'DokuWiki paigaldaja';
 $lang['i_wikiname']            = 'Wiki nimi';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 73af3e70a..f66cda04c 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -259,7 +259,6 @@ $lang['subscr_style_every']    = 'e-posta aldaketa bakoitzean';
 $lang['subscr_style_digest']   = 'e-posta laburbildua orri bakoitzeko aldaketentzat (%.2f egunero)';
 $lang['subscr_style_list']     = 'aldatutako orrien zerrenda azken e-postatik (%.2f egunero)';
 $lang['authtempfail']          = 'Erabiltzaile kautotzea denboraldi batez ez dago erabilgarri. Egoerak hala jarraitzen badu, mesedez, eman honen berri Wiki administratzaileari';
-$lang['authpwdexpire']         = 'Zure pasahitza %d egun barru iraungiko da, laster aldatu beharko zenuke.';
 $lang['i_chooselang']          = 'Hautatu zure hizkuntza';
 $lang['i_installer']           = 'DokuWiki instalatzailea';
 $lang['i_wikiname']            = 'Wiki Izena';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 7a3577862..7b45b3137 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -280,7 +280,6 @@ $lang['subscr_style_every']    = 'ارسال رای‌نامه در تمامی 
 $lang['subscr_style_digest']   = 'ایمیل خلاصه‌ی تغییرات هر روز (هر %.2f روز)';
 $lang['subscr_style_list']     = 'فهرست صفحات تغییریافته از آخرین ایمیل (هر %.2f روز)';
 $lang['authtempfail']          = 'معتبرسازی کابران موقتن مسدود می‌باشد. اگر این حالت پایدار بود، مدیر ویکی را باخبر سازید.';
-$lang['authpwdexpire']         = 'کلمه عبور شما در %d روز منقضی خواهد شد ، شما باید آن را زود تغییر دهید';
 $lang['i_chooselang']          = 'انتخاب زبان';
 $lang['i_installer']           = 'نصب کننده‌ی Dokuwiki';
 $lang['i_wikiname']            = 'نام ویکی';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 1ad782e53..0f70efa5c 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -273,7 +273,6 @@ $lang['subscr_style_every']    = 'Sähköposti joka muutoksesta';
 $lang['subscr_style_digest']   = 'yhteenveto-sähköposti joka sivusta (joka %.2f. päivä)';
 $lang['subscr_style_list']     = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen (joka %.2f. päivä)';
 $lang['authtempfail']          = 'Käyttäjien autentikointi ei tällä hetkellä onnistu. Jos ongelma jatkuu, ota yhteyttä wikin ylläpitäjään.';
-$lang['authpwdexpire']         = 'Salasanasi vanhenee %d pv:n päästä, vaihda salasanasi pikaisesti.';
 $lang['i_chooselang']          = 'Valitse kieli';
 $lang['i_installer']           = 'DokuWikin asentaja';
 $lang['i_wikiname']            = 'Wikin nimi';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 1cc5cf468..ba3158125 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -299,7 +299,6 @@ $lang['subscr_style_every']    = 'Recevoir un courriel à chaque modification';
 $lang['subscr_style_digest']   = 'Courriel, tous les %.2f jours, résumant les modifications de chaque page';
 $lang['subscr_style_list']     = 'Liste des pages modifiées depuis le dernier courriel (tous les %.2f jours)';
 $lang['authtempfail']          = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'en informer l\'administrateur du wiki.';
-$lang['authpwdexpire']         = 'Votre mot de passe expirera dans %d jours, vous devriez le changer bientôt.';
 $lang['i_chooselang']          = 'Choisissez votre langue';
 $lang['i_installer']           = 'Installateur DokuWiki';
 $lang['i_wikiname']            = 'Nom du wiki';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 2711e76e1..9cc460b58 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -257,7 +257,6 @@ $lang['subscr_m_subscribe']    = 'Subscribir';
 $lang['subscr_m_receive']      = 'Recibir';
 $lang['subscr_style_every']    = 'correo-e en cada troco';
 $lang['authtempfail']          = 'A autenticación de usuario non está dispoñible de xeito temporal. De persistir esta situación, por favor, informa ao Administrador do teu Wiki.';
-$lang['authpwdexpire']         = 'A túa contrasinal expirará en %d días, deberías cambiala pronto.';
 $lang['i_chooselang']          = 'Escolle o teu idioma';
 $lang['i_installer']           = 'Instalador do DokuWiki';
 $lang['i_wikiname']            = 'Nome do Wiki';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 5d72130ab..a75a0e9bb 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -278,7 +278,6 @@ $lang['subscr_style_every']    = 'דוא״ל עם כל שינוי';
 $lang['subscr_style_digest']   = 'הודעת דוא״ל המציגה את כל השינויים בכל עמוד (בכל %.2f ימים)';
 $lang['subscr_style_list']     = 'רשימת השינויים בדפים מאז הודעת הדוא״ל האחרונה (בכל %.2f ימים)';
 $lang['authtempfail']          = 'אימות משתמשים אינו זמין כרגע. אם מצב זה נמשך נא ליידע את מנהל הוויקי.';
-$lang['authpwdexpire']         = 'הסיסמה שלך תפוג ב% d ימים, אתה צריך לשנות את זה בקרוב.';
 $lang['i_chooselang']          = 'נא לבחור שפה';
 $lang['i_installer']           = 'תכנית ההתקנה של DokuWiki';
 $lang['i_wikiname']            = 'שם הוויקי';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index 0436412ed..e3e35b5c4 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -272,7 +272,6 @@ $lang['subscr_style_every']    = 'e-pošta za svaku promjenu';
 $lang['subscr_style_digest']   = 'e-pošta s kratakim prikazom promjena za svaku stranicu (svaka %.2f dana)';
 $lang['subscr_style_list']     = 'listu promijenjenih stranica od zadnje primljene e-pošte (svaka %.2f dana)';
 $lang['authtempfail']          = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.';
-$lang['authpwdexpire']         = 'Vaša lozinka će isteći za %d dana, trebate ju promijeniti.';
 $lang['i_chooselang']          = 'Izaberite vaš jezik';
 $lang['i_installer']           = 'DokuWiki postavljanje';
 $lang['i_wikiname']            = 'Naziv Wikija';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 75c22813f..37c23e892 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -278,7 +278,6 @@ $lang['subscr_style_every']    = 'e-mailt minden változásról';
 $lang['subscr_style_digest']   = 'összefoglaló e-mailt oldalanként (minden %.2f nap)';
 $lang['subscr_style_list']     = 'egy listát a módosított oldalakról a legutóbbi e-mail óta (minden %.2f nap)';
 $lang['authtempfail']          = 'A felhasználó azonosítás átmenetileg nem működik. Ha sokáig így lenne, légy szíves értesítsd az Adminisztrátorokat!';
-$lang['authpwdexpire']         = 'A jelszavad %d nap múlva lejár, hamarosan meg kell változtatnod.';
 $lang['i_chooselang']          = 'Válassz nyelvet';
 $lang['i_installer']           = 'DokuWiki Beállító Varázsló';
 $lang['i_wikiname']            = 'A Wiki neve';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 465822d0a..a7da52935 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -285,7 +285,6 @@ $lang['subscr_style_every']    = 'email per ogni modifica';
 $lang['subscr_style_digest']   = 'email di riassunto dei cambiamenti per ogni pagina (ogni %.2f giorni)';
 $lang['subscr_style_list']     = 'lista delle pagine cambiate dall\'ultima email (ogni %.2f giorni)';
 $lang['authtempfail']          = 'L\'autenticazione è temporaneamente non disponibile. Se questa situazione persiste, informa l\'amministratore di questo wiki.';
-$lang['authpwdexpire']         = 'La tua password scadrà in %d giorni, dovresti cambiarla quanto prima.';
 $lang['i_chooselang']          = 'Scegli la lingua';
 $lang['i_installer']           = 'Installazione di DokuWiki';
 $lang['i_wikiname']            = 'Nome Wiki';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index dd076f86f..67a69c3de 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -275,7 +275,6 @@ $lang['subscr_style_every']    = '全ての変更にメールを送信';
 $lang['subscr_style_digest']   = 'それぞれのページへの変更の要約をメールする（%.2f 日毎）';
 $lang['subscr_style_list']     = '前回のメールから変更されたページをリスト（%.2f 日毎）';
 $lang['authtempfail']          = 'ユーザー認証が一時的に使用できなくなっています。この状態が続いているようであれば、Wikiの管理者に連絡して下さい。';
-$lang['authpwdexpire']         = 'あなたのパスワードは、あと%d日で有効期限が切れます。パスワードを変更してください。';
 $lang['i_chooselang']          = '使用言語を選択してください';
 $lang['i_installer']           = 'DokuWiki インストーラー';
 $lang['i_wikiname']            = 'Wiki名';
diff --git a/inc/lang/ka/lang.php b/inc/lang/ka/lang.php
index 871f3ec44..0b2d60e4e 100644
--- a/inc/lang/ka/lang.php
+++ b/inc/lang/ka/lang.php
@@ -266,7 +266,6 @@ $lang['subscr_style_every']    = 'ფოსტა ყოველ ცვლი
 $lang['subscr_style_digest']   = 'ფოსტა ყოველი გვერდის შეცვლაზე ';
 $lang['subscr_style_list']     = 'ფოსტა ყოველი გვერდის შეცვლაზე ';
 $lang['authtempfail']          = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
-$lang['authpwdexpire']         = 'თქვენს პაროლს ვადა გაუვა %d დღეში, მალე შეცვლა მოგიწევთ.';
 $lang['i_chooselang']          = 'ენსი არჩევა';
 $lang['i_installer']           = 'DokuWiki დამყენებელი';
 $lang['i_wikiname']            = 'Wiki სახელი';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index ca2a35cb7..c9b72197b 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -276,7 +276,6 @@ $lang['subscr_style_every']    = '모든 바뀜을 이메일로 받기';
 $lang['subscr_style_digest']   = '각 문서의 바뀜을 요약 (매 %.2f일 마다)';
 $lang['subscr_style_list']     = '마지막 이메일 이후 바뀐 문서의 목록 (매 %.2f일 마다)';
 $lang['authtempfail']          = '사용자 인증을 일시적으로 사용할 수 없습니다. 만약 계속해서 문제가 발생한다면 위키 관리자에게 문의하시기 바랍니다.';
-$lang['authpwdexpire']         = '비밀번호를 바꾼지 %d일이 지났으며, 비밀번호를 곧 바꿔야 합니다.';
 $lang['i_chooselang']          = '사용할 언어를 선택하세요';
 $lang['i_installer']           = '도쿠위키 설치 관리자';
 $lang['i_wikiname']            = '위키 이름';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index dff2d9b28..cb7091e50 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -269,7 +269,6 @@ $lang['subscr_style_every']    = 'vēstuli par katru izmaiņu';
 $lang['subscr_style_digest']   = 'kopsavilkumu par katru lapu (reizi %.2f dienās)';
 $lang['subscr_style_list']     = 'kopš pēdējās vēstules notikušo labojumu sarakstu (reizi %.2f dienās)';
 $lang['authtempfail']          = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.';
-$lang['authpwdexpire']         = 'Tavai parolei pēc %d dienām biegsies termiņš, tā drīzumā jānomaina.';
 $lang['i_chooselang']          = 'Izvēlies valodu';
 $lang['i_installer']           = 'DokuWiki instalētājs';
 $lang['i_wikiname']            = 'Wiki vārds';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index b94202475..f0a235d67 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -290,7 +290,6 @@ $lang['subscr_style_every']    = 'Email bij iedere wijziging';
 $lang['subscr_style_digest']   = 'Samenvattings-email met wijzigingen per pagina (elke %.2f dagen)';
 $lang['subscr_style_list']     = 'Lijst van veranderde pagina\'s sinds laatste email (elke %.2f dagen)';
 $lang['authtempfail']          = 'Gebruikersauthenticatie is tijdelijk niet beschikbaar. Als deze situatie zich blijft voordoen, informeer dan de wikibeheerder.';
-$lang['authpwdexpire']         = 'Je wachtwoord verloopt in %d dagen, je moet het binnenkort veranderen';
 $lang['i_chooselang']          = 'Kies je taal';
 $lang['i_installer']           = 'DokuWiki Installer';
 $lang['i_wikiname']            = 'Wikinaam';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 5659286c3..2aa8cdcda 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -287,7 +287,6 @@ $lang['subscr_style_every']    = 'e-post for alle endringer';
 $lang['subscr_style_digest']   = 'e-post med sammendrag av endringer for hver side (%.2f dager mellom hver)';
 $lang['subscr_style_list']     = 'liste med sider som er endra siden forrige e-post (%.2f dager mellom hver)';
 $lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
-$lang['authpwdexpire']         = 'Ditt passord går ut om %d dager, du bør endre det snarest.';
 $lang['i_chooselang']          = 'Velg språk';
 $lang['i_installer']           = 'DokuWiki-installasjon';
 $lang['i_wikiname']            = 'Wikinavn';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 16375aab3..5c9acfa17 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -281,7 +281,6 @@ $lang['subscr_style_every']    = 'email przy każdej zmianie';
 $lang['subscr_style_digest']   = 'e-mailowy wyciąg zmian dla każdej strony (co %.2f dni)';
 $lang['subscr_style_list']     = 'lista zmienionych stron od ostatniego e-maila (co %.2f dni)';
 $lang['authtempfail']          = 'Uwierzytelnienie użytkownika jest w tej chwili niemożliwe. Jeśli ta sytuacja się powtórzy, powiadom administratora tego wiki.';
-$lang['authpwdexpire']         = 'Twoje hasło wygaśnie za %d dni. Należy je zmienić w krótkim czasie.';
 $lang['i_chooselang']          = 'Wybierz język';
 $lang['i_installer']           = 'Instalator DokuWiki';
 $lang['i_wikiname']            = 'Nazwa Wiki';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 5d3afc4fc..23df083d0 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -289,7 +289,6 @@ $lang['subscr_style_every']    = 'um e-mail a cada modificação';
 $lang['subscr_style_digest']   = 'um agrupamento de e-mails com as mudanças para cada página (a cada %.2f dias)';
 $lang['subscr_style_list']     = 'uma lista de páginas modificadas desde o último e-mail (a cada %.2f dias)';
 $lang['authtempfail']          = 'A autenticação de usuários está temporariamente desabilitada. Se essa situação persistir, por favor, informe ao administrador do Wiki.';
-$lang['authpwdexpire']         = 'Sua senha vai expirar em %d dias. Você deve mudá-la assim que for possível.';
 $lang['i_chooselang']          = 'Selecione o seu idioma';
 $lang['i_installer']           = 'Instalador do DokuWiki';
 $lang['i_wikiname']            = 'Nome do Wiki';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index defb21954..7c6395b4b 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -277,7 +277,6 @@ $lang['subscr_style_every']    = 'email em qualquer alteração';
 $lang['subscr_style_digest']   = '"digest email" de alterações em cada página (cada %.2f dias)';
 $lang['subscr_style_list']     = 'lista de páginas alteradas desde o último email (cada %.2f dias)';
 $lang['authtempfail']          = 'Autenticação temporariamente indisponível. Se a situação persistir, por favor informe o Wiki Admin.';
-$lang['authpwdexpire']         = 'A sua senha expirará dentro de %d dias, deve mudá-la em breve.';
 $lang['i_chooselang']          = 'Escolha a linguagem';
 $lang['i_installer']           = 'Instalador do DokuWiki';
 $lang['i_wikiname']            = 'Nome Wiki';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 7c7d55098..5953fccda 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -266,7 +266,6 @@ $lang['subscr_style_every']    = 'e-mail la ficare schimbare';
 $lang['subscr_style_digest']   = 'e-mail cu sumar al modificărilor pentru fiecare pagină (la fiecare %.2f zile)';
 $lang['subscr_style_list']     = 'lista paginilor modificate de la ultimul e-mail (la fiecare %.2f zile)';
 $lang['authtempfail']          = 'Autentificarea utilizatorului este temporar indisponibilă. Contactează administratorul.';
-$lang['authpwdexpire']         = 'Parola va expira în %d zile, ar trebui să o schimbi în curând.';
 $lang['i_chooselang']          = 'Alege limba';
 $lang['i_installer']           = 'Installer DokuWiki';
 $lang['i_wikiname']            = 'Numele acestui wiki';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index c40e1ee20..51285258c 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -292,7 +292,6 @@ $lang['subscr_style_every']    = 'уведомлять о каждом изме
 $lang['subscr_style_digest']   = 'информационное электронное письмо со списком изменений для каждой страницы (каждые %.2f дн.)';
 $lang['subscr_style_list']     = 'список изменённых страниц со времени последнего отправленного электронного письма (каждые %.2f дн.)';
 $lang['authtempfail']          = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.';
-$lang['authpwdexpire']         = 'Действие вашего пароля истекает через %d дней. Вы должны изменить его как можно скорее';
 $lang['i_chooselang']          = 'Выберите свой язык/Choose your language';
 $lang['i_installer']           = 'Установка «Докувики»';
 $lang['i_wikiname']            = 'Название вики';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index f2d3a90bd..a78989ce0 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -267,7 +267,6 @@ $lang['subscr_style_every']    = 'email pri každej zmene';
 $lang['subscr_style_digest']   = 'email so zhrnutím zmien pre každú stránku (perióda %.2f dňa)';
 $lang['subscr_style_list']     = 'zoznam zmenených stránok od posledného emailu (perióda %.2f dňa)';
 $lang['authtempfail']          = 'Užívateľská autentifikácia je dočasne nedostupná. Ak táto situácia pretrváva, prosím informujte správcu systému.';
-$lang['authpwdexpire']         = 'Platnosť hesla vyprší za %d dní, mali by ste ho zmeniť čo najskôr.';
 $lang['i_chooselang']          = 'Zvoľte váš jazyk';
 $lang['i_installer']           = 'DokuWiki inštalátor';
 $lang['i_wikiname']            = 'Názov Wiki';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index 0361393c9..6f7a081ff 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -269,7 +269,6 @@ $lang['subscr_style_every']    = 'elektronsko sporočilo ob vsaki spremembi';
 $lang['subscr_style_digest']   = 'strnjeno elektronsko sporočilo sprememb za vsako stran (vsakih %.2f dni)';
 $lang['subscr_style_list']     = 'seznam spremenjenih strani od zadnjega elektronskega sporočila (vsakih %.2f dni)';
 $lang['authtempfail']          = 'Potrditev uporabnika je trenutno nedostopna. Stopite v stik s skrbnikom sistema wiki.';
-$lang['authpwdexpire']         = 'Geslo bo poteklo v %d dneh. Priporočljivo ga je zamenjati.';
 $lang['i_chooselang']          = 'Izberite jezik';
 $lang['i_installer']           = 'DokuWiki namestitev';
 $lang['i_wikiname']            = 'Ime Wiki spletišča';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index d343d0339..0d1f30a7a 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -277,7 +277,6 @@ $lang['subscr_m_receive']      = 'Ta emot';
 $lang['subscr_style_every']    = 'skicka epost vid varje ändring';
 $lang['subscr_style_list']     = 'lista över ändrade sidor sedan senaste e-post (varje %.2f dag)';
 $lang['authtempfail']          = 'Tillfälligt fel på användarautentisering. Om felet kvarstår, var vänlig meddela wikiadministratören.';
-$lang['authpwdexpire']         = 'Ditt lösenord kommer att bli ogiltigt om %d dagar, du bör ändra det snart.';
 $lang['i_chooselang']          = 'Välj språk';
 $lang['i_installer']           = 'Installation av DokuWiki';
 $lang['i_wikiname']            = 'Wikins namn';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 48d364320..ff7a73eea 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -264,7 +264,6 @@ $lang['subscr_m_subscribe']    = 'Kayıt ol';
 $lang['subscr_m_receive']      = 'Al';
 $lang['subscr_style_every']    = 'her değişiklikte e-posta gönder';
 $lang['authtempfail']          = 'Kullanıcı doğrulama geçici olarak yapılamıyor. Eğer bu durum devam ederse lütfen Wiki yöneticine haber veriniz.';
-$lang['authpwdexpire']         = 'Şifreniz %d gün sonra geçersiz hale gelecek, yakın bir zamanda değiştirmelisiniz.';
 $lang['i_chooselang']          = 'Dili seçiniz';
 $lang['i_installer']           = 'Dokuwiki Kurulum Sihirbazı';
 $lang['i_wikiname']            = 'Wiki Adı';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index bda7bb32c..bfe38b920 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -280,7 +280,6 @@ $lang['subscr_style_every']    = '每次更改都發送信件';
 $lang['subscr_style_digest']   = '對每個頁面發送更改的摘要信件 (每 %.2f 天)';
 $lang['subscr_style_list']     = '自上次發信以來更改的頁面的列表 (每 %.2f 天)';
 $lang['authtempfail']          = '暫不提供帳號認證。若本狀況持續，請通知本 wiki 管理員。';
-$lang['authpwdexpire']         = '您的密碼將在 %d 天內到期，請馬上更換新密碼。';
 $lang['i_chooselang']          = '選擇您的語系';
 $lang['i_installer']           = 'DokuWiki 安裝工具';
 $lang['i_wikiname']            = '本 wiki 的名稱';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index df55a99e6..8f3a7bbf4 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -289,7 +289,6 @@ $lang['subscr_style_every']    = '对每次更改发送邮件';
 $lang['subscr_style_digest']   = '对每个页面发送更改的摘要邮件（每 %.2f 天）';
 $lang['subscr_style_list']     = '自上封邮件以来更改的页面的列表（每 %.2f 天）';
 $lang['authtempfail']          = '用户认证暂时无法使用。如果该状态一直存在，请通知维基管理员。';
-$lang['authpwdexpire']         = '您的密码将在 %d 天内过期，请尽快更改';
 $lang['i_chooselang']          = '选择您的语言';
 $lang['i_installer']           = 'DokuWiki 安装工具';
 $lang['i_wikiname']            = '维基名称';
-- 
cgit v1.2.3


From 96e99986cc6e7b7f08cacbdeede74c3154f92e1b Mon Sep 17 00:00:00 2001
From: Tim Ruffing <tim@timruffing.de>
Date: Sat, 4 Apr 2015 23:44:32 +0200
Subject: make PHP_CodeSniffer rules compatible with v2

---
 _cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php  | 2 +-
 _cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php b/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php
index c5d14377b..c15a5be02 100644
--- a/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php
+++ b/_cs/DokuWiki/Sniffs/PHP/DeprecatedFunctionsSniff.php
@@ -39,7 +39,7 @@ class DokuWiki_Sniffs_PHP_DeprecatedFunctionsSniff extends Generic_Sniffs_PHP_Fo
      *
      * @var array(string => string|null)
      */
-    protected $forbiddenFunctions = array(
+    public $forbiddenFunctions = array(
         'setCorrectLocale'     => null,
         'html_attbuild'        => 'buildAttributes',
         'io_runcmd'            => null,
diff --git a/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php b/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
index 9cd9a7d36..bd51b1166 100644
--- a/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
+++ b/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
@@ -39,7 +39,7 @@ class DokuWiki_Sniffs_PHP_DiscouragedFunctionsSniff extends Generic_Sniffs_PHP_F
      *
      * @var array(string => string|null)
      */
-    protected $forbiddenFunctions = array(
+    public $forbiddenFunctions = array(
                                      'date' => 'dformat',
                                      'strftime'   => 'dformat',
                                     );
-- 
cgit v1.2.3


From f93b5aaf5a90e6bdf153596fc4dfa77bc4cde3e8 Mon Sep 17 00:00:00 2001
From: Ninetailz <ninetailz1125@gmail.com>
Date: Wed, 8 Apr 2015 02:45:25 +0200
Subject: translation update

---
 inc/lang/bn/lang.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php
index 0995bc478..07e888e2a 100644
--- a/inc/lang/bn/lang.php
+++ b/inc/lang/bn/lang.php
@@ -6,6 +6,7 @@
  * @author Foysol <ragebot1125@gmail.com>
  * @author ninetailz <ninetailz1125@gmail.com>
  * @author Khan M. B. Asad <muhammad2017@gmail.com>
+ * @author Ninetailz <ninetailz1125@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'itr';
@@ -198,3 +199,31 @@ $lang['restored']              = 'পুরানো সংস্করণের
 $lang['external_edit']         = 'বাহ্যিক সম্পাদনা';
 $lang['summary']               = 'সম্পাদনা সারাংশ';
 $lang['noflash']               = 'এ href="http://www.adobe.com/products/flashplayer/"> অ্যাডোবি ফ্ল্যাশ প্লাগইন </ a> এই সামগ্রী প্রদর্শন করার জন্য প্রয়োজন হয়.';
+$lang['download']              = 'ডাউনলোড স্নিপেট ';
+$lang['tools']                 = 'সরঞ্জামসমূহ';
+$lang['user_tools']            = 'ব্যবহারকারীর সরঞ্জামসমূহ';
+$lang['site_tools']            = 'সাইটের সরঞ্জামসমূহ';
+$lang['page_tools']            = 'পৃষ্ঠার সরঞ্জামসমূহ';
+$lang['skip_to_content']       = 'বিষয়ে এড়িয়ে যান';
+$lang['sidebar']               = 'সাইডবার';
+$lang['mail_newpage']          = 'পৃষ্ঠা যোগ করা হয়েছে:';
+$lang['mail_changed']          = 'পৃষ্ঠা পরিবর্তন করা হয়েছে:';
+$lang['mail_subscribe_list']   = 'পৃষ্ঠাগুলির নামস্থান পরিবর্তন:';
+$lang['mail_new_user']         = 'নতুন ব্যবহারকারী:';
+$lang['mail_upload']           = 'ফাইল আপলোড করেছেন:';
+$lang['changes_type']          = 'দেখুন পরিবর্তনসমূহ';
+$lang['pages_changes']         = 'পৃষ্ঠাগুলি';
+$lang['media_changes']         = 'মিডিয়া ফাইলগুলি';
+$lang['both_changes']          = 'পেজ এবং মিডিয়া ফাইল উভয়েই';
+$lang['qb_bold']               = 'গাঢ় লেখা';
+$lang['qb_italic']             = 'বাঁকা লেখা';
+$lang['qb_underl']             = 'আন্ডারলাইন টেক্সট';
+$lang['qb_code']               = 'মোনোস্কেপ লেখা';
+$lang['qb_strike']             = 'স্ট্রাইক মাধ্যমে টেক্সট';
+$lang['qb_h1']                 = 'স্তর 1 শিরোনাম';
+$lang['qb_h2']                 = 'স্তর 2 শিরোনাম';
+$lang['qb_h3']                 = 'স্তর 3 শিরোনাম';
+$lang['qb_h4']                 = 'স্তর 4 শিরোনাম';
+$lang['qb_h5']                 = 'স্তর 5 শিরোনাম';
+$lang['qb_h']                  = 'শিরোনাম';
+$lang['qb_hs']                 = 'নির্বাচন করুন শিরোনাম';
-- 
cgit v1.2.3


From 0a71e551221e2019670f92b416f0b42cd111618b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 9 Apr 2015 13:19:12 +0200
Subject: Add deprecated tag to mail_send, _mail_send_action,
 mail_encode_address

These functions are already deprecated and replaced by the Mailer::
class. The deprecated tag was simply missing.
---
 inc/mail.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/inc/mail.php b/inc/mail.php
index 9f1b1f3d6..e4d06fd86 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -96,15 +96,23 @@ function mail_setup(){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @see    mail()
+ *
+ * @deprecated User the Mailer:: class instead
  */
 function mail_send($to, $subject, $body, $from='', $cc='', $bcc='', $headers=null, $params=null){
-
+    dbg_deprecated('class Mailer::');
     $message = compact('to','subject','body','from','cc','bcc','headers','params');
     return trigger_event('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
 }
 
+/**
+ * @param $data
+ * @return bool
+ *
+ * @deprecated User the Mailer:: class instead
+ */
 function _mail_send_action($data) {
-
+    dbg_deprecated('class Mailer::');
     // retrieve parameters from event data, $to, $subject, $body, $from, $cc, $bcc, $headers, $params
     $to = $data['to'];
     $subject = $data['subject'];
@@ -177,8 +185,11 @@ function _mail_send_action($data) {
  * @param string  $string Multiple adresses separated by commas
  * @param string  $header Name of the header (To,Bcc,Cc,...)
  * @param boolean $names  Allow named Recipients?
+ *
+ * @deprecated User the Mailer:: class instead
  */
 function mail_encode_address($string,$header='',$names=true){
+    dbg_deprecated('class Mailer::');
     $headers = '';
     $parts = explode(',',$string);
     foreach ($parts as $part){
-- 
cgit v1.2.3


From 39c0ce3e22447366ab7adc4ef053c899752aa6bc Mon Sep 17 00:00:00 2001
From: Mohammad Anini <mohd.anini@gmail.com>
Date: Sun, 12 Apr 2015 15:24:32 +0300
Subject: Update register.txt (Arabic) - Fix spilling mistake

---
 inc/lang/ar/register.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/lang/ar/register.txt b/inc/lang/ar/register.txt
index 57406ddd4..10a7fa202 100644
--- a/inc/lang/ar/register.txt
+++ b/inc/lang/ar/register.txt
@@ -1,3 +1,3 @@
 ====== سجل كمستخدم جديد ======
 
-أملئ البيانات التالية لتسجيل حساب جديد على الويكي. تأكد من كتابة **بريد إلكترونى صحيح** - سترسل اليك كلمة سر جديدة. أسم الدخول يجب أن يكون [[doku>pagename|أسم صفحة]] صحيح.
+املئ البيانات التالية لتسجيل حساب جديد على الويكي. تأكد من كتابة **بريد إلكتروني صحيح** - سترسل إليك كلمة سر جديدة. اسم الدخول يجب أن يكون [[doku>pagename|أسم صفحة]] صحيح.
-- 
cgit v1.2.3


From 796c611069dba09e1c7bb8471242195c14a93412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Schplurtz=20le=20D=C3=A9boulonn=C3=A9?=
 <schplurtz@laposte.net>
Date: Tue, 14 Apr 2015 02:36:02 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/fr/settings.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/authldap/lang/fr/settings.php b/lib/plugins/authldap/lang/fr/settings.php
index aa75105cf..619aee3d3 100644
--- a/lib/plugins/authldap/lang/fr/settings.php
+++ b/lib/plugins/authldap/lang/fr/settings.php
@@ -21,7 +21,9 @@ $lang['binddn']                = 'Nom de domaine d\'un utilisateur de connexion
 $lang['bindpw']                = 'Mot de passe de l\'utilisateur ci-dessus.';
 $lang['userscope']             = 'Limiter la portée de recherche d\'utilisateurs';
 $lang['groupscope']            = 'Limiter la portée de recherche de groupes';
+$lang['userkey']               = 'Attribut indiquant le nom d\'utilisateur. Doit être en accord avec le filtre d\'utilisateur.';
 $lang['groupkey']              = 'Affiliation aux groupes à partir de n\'importe quel attribut utilisateur (au lieu des groupes AD standards), p. ex. groupes par département ou numéro de téléphone';
+$lang['modPass']               = 'Peut-on changer le mot de passe LDAP depuis DokiWiki ?';
 $lang['debug']                 = 'Afficher des informations de bégogage supplémentaires pour les erreurs';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
-- 
cgit v1.2.3


From a7ec353091498e86d606c27f5ca7a808c2d096c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Tue, 14 Apr 2015 10:12:02 +0200
Subject: Add display options to extension manger

Allows tho show/hide extensions that are: enabled, disabled, updatable
---
 lib/plugins/extension/helper/gui.php   |  9 +++++++++
 lib/plugins/extension/helper/list.php  |  1 +
 lib/plugins/extension/lang/en/lang.php |  7 ++++++-
 lib/plugins/extension/script.js        |  8 +++++++-
 lib/plugins/extension/style.less       | 13 +++++++++++++
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 3a0f0c589..2dbb3d5e5 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -38,6 +38,15 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
         echo '<div class="panelHeader">';
         echo $this->locale_xhtml('intro_plugins');
+
+        $options = new Doku_Form( "viewoptions" );
+        $options->addElement( form_makeOpenTag( "p" ) );
+        $options->addElement( $this->getLang('display_viewoptions') );
+        $options->addElement( form_makeCheckboxField( "enabled", 1, $this->getLang('display_enabled') ) );
+        $options->addElement( form_makeCheckboxField( "disabled", 1, $this->getLang('display_disabled') ) );
+        $options->addElement( form_makeCheckboxField( "updatable", 1, $this->getLang('display_updatable') ) );
+        $options->addElement( form_makeCloseTag( "p" ) );
+        $options->printForm();
         echo '</div>';
 
         $pluginlist = $plugin_controller->getList('', true);
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 8bcd00ec6..11aea1d0e 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -151,6 +151,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         if($extension->isInstalled()) {
             $class.=' installed';
             $class.= ($extension->isEnabled()) ? ' enabled':' disabled';
+            if($extension->updateAvailable()) $class .= ' updatable';
         }
         if(!$extension->canModify()) $class.= ' notselect';
         if($extension->isProtected()) $class.=  ' protected';
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index f545b6da3..907f91c23 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -101,4 +101,9 @@ $lang['install_url']                  = 'Install from URL:';
 $lang['install_upload']               = 'Upload Extension:';
 
 $lang['repo_error']                   = 'The plugin repository could not be contacted. Make sure your server is allowed to contact www.dokuwiki.org and check your proxy settings.';
-$lang['nossl']                        = 'Your PHP seems to miss SSL support. Downloading will not work for many DokuWiki extensions.';
\ No newline at end of file
+$lang['nossl']                        = 'Your PHP seems to miss SSL support. Downloading will not work for many DokuWiki extensions.';
+
+$lang['display_viewoptions']          = 'View Options:';
+$lang['display_enabled']              = 'enabled';
+$lang['display_disabled']             = 'disabled';
+$lang['display_updatable']            = 'updatable';
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index fab88162d..43af21ee1 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -110,4 +110,10 @@ jQuery(function(){
         );
     });
 
-});
\ No newline at end of file
+    /**
+     * Enable all plugin types
+     */    
+    $extmgr.find( '#viewoptions :checkbox' ).change(function(){
+        jQuery('#extension__list').toggleClass( this.name );
+    }).click();
+});
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index d20689099..fe15da16a 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -281,6 +281,15 @@
  * Enabled/Disabled overrides
  */
 #extension__list {
+    
+    .enabled, .disabled, .updatable {
+        display: none;
+    }
+    
+    &.enabled .enabled, &.disabled .disabled, &.updatable .updatable {
+        display: block;
+    }
+    
     .enabled div.screenshot span {
         background: transparent url(images/enabled.png) no-repeat 2px 2px;
     }
@@ -361,3 +370,7 @@
     display: block;
     width: 60%;
 }
+
+#viewoptions label {
+    margin-left: 1em;
+}
-- 
cgit v1.2.3


From d15f7f88b28a5b4daba129f4f5e2dfcfe83ac856 Mon Sep 17 00:00:00 2001
From: Tomas Darius Davainis <tomasdd@gmail.com>
Date: Fri, 17 Apr 2015 03:25:59 +0200
Subject: translation update

---
 inc/lang/lt/lang.php                     | 19 ++++++++++---------
 lib/plugins/acl/lang/lt/lang.php         |  4 ++--
 lib/plugins/popularity/lang/lt/lang.php  |  5 +++--
 lib/plugins/usermanager/lang/lt/lang.php |  5 +++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index d53a117f4..c356e3898 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
- * lithuanian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Linas Valiukas <shirshegsm@gmail.com>
  * @author Edmondas Girkantas <eg@zemaitija.net>
  * @author Arūnas Vaitekūnas <aras@fan.lt>
  * @author audrius.klevas@gmail.com
+ * @author Tomas Darius Davainis <tomasdd@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -46,6 +47,7 @@ $lang['btn_draft']             = 'Redaguoti juodraštį';
 $lang['btn_recover']           = 'Atkurti juodraštį';
 $lang['btn_draftdel']          = 'Šalinti juodraštį';
 $lang['btn_register']          = 'Registruotis';
+$lang['btn_img_backto']        = 'Atgal į %s';
 $lang['loggedinas']            = 'Prisijungęs kaip:';
 $lang['user']                  = 'Vartotojo vardas';
 $lang['pass']                  = 'Slaptažodis';
@@ -88,8 +90,13 @@ $lang['txt_filename']          = 'Įveskite wikivardą (nebūtina):';
 $lang['txt_overwrt']           = 'Perrašyti egzistuojančią bylą';
 $lang['lockedby']              = 'Užrakintas vartotojo:';
 $lang['lockexpire']            = 'Užraktas bus nuimtas:';
-$lang['js']['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
+$lang['js']['willexpire']      = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
 $lang['js']['notsavedyet']     = 'Pakeitimai nebus išsaugoti.\nTikrai tęsti?';
+$lang['js']['keepopen']        = 'Pažymėjus palikti langą atvertą';
+$lang['js']['hidedetails']     = 'Paslėpti Detales';
+$lang['js']['nosmblinks']      = 'Nurodos į "Windows shares" veikia tik su Microsoft Internet Explorer naršykle.
+Vis dėlto, jūs galite nukopijuoti šią nuorodą.';
+$lang['js']['del_confirm']     = 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?';
 $lang['rssfailed']             = 'Siunčiant šį feed\'ą įvyko klaida: ';
 $lang['nothingfound']          = 'Paieškos rezultatų nėra.';
 $lang['mediaselect']           = 'Mediabylos išsirinkimas';
@@ -107,10 +114,6 @@ $lang['deletefail']            = 'Byla "%s" negali būti ištrinta - patikrinkit
 $lang['mediainuse']            = 'Byla "%s" nebuvo ištrinta - ji vis dar naudojama.';
 $lang['namespaces']            = 'Pavadinimai';
 $lang['mediafiles']            = 'Prieinamos bylos';
-$lang['js']['keepopen']        = 'Pažymėjus palikti langą atvertą';
-$lang['js']['hidedetails']     = 'Paslėpti Detales';
-$lang['js']['nosmblinks']      = 'Nurodos į "Windows shares" veikia tik su Microsoft Internet Explorer naršykle.
-Vis dėlto, jūs galite nukopijuoti šią nuorodą.';
 $lang['mediausage']            = 'Failo nuorodai užrašyti naudokite tokią sintaksę:';
 $lang['mediaview']             = 'Žiūrėti pirminį failą';
 $lang['mediaroot']             = 'pradžia (root)';
@@ -159,12 +162,10 @@ $lang['qb_media']              = 'Paveikslėliai ir kitos bylos';
 $lang['qb_sig']                = 'Įterpti parašą';
 $lang['qb_smileys']            = 'Šypsenėlės';
 $lang['qb_chars']              = 'Specialūs simboliai';
-$lang['js']['del_confirm']           = 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?';
 $lang['admin_register']        = 'Sukurti naują vartotoją';
 $lang['metaedit']              = 'Redaguoti metaduomenis';
 $lang['metasaveerr']           = 'Nepavyko išsaugoti metaduomenų';
 $lang['metasaveok']            = 'Metaduomenys išsaugoti';
-$lang['btn_img_backto']            = 'Atgal į %s';
 $lang['img_title']             = 'Pavadinimas:';
 $lang['img_caption']           = 'Antraštė:';
 $lang['img_date']              = 'Data:';
diff --git a/lib/plugins/acl/lang/lt/lang.php b/lib/plugins/acl/lang/lt/lang.php
index ef339177b..2a1748abc 100644
--- a/lib/plugins/acl/lang/lt/lang.php
+++ b/lib/plugins/acl/lang/lt/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * lithuanian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Linas Valiukas <shirshegsm@gmail.com>
  * @author audrius.klevas@gmail.com
  * @author Arunas Vaitekunas <aras@fan.lt>
diff --git a/lib/plugins/popularity/lang/lt/lang.php b/lib/plugins/popularity/lang/lt/lang.php
index 88df29c50..dca350475 100644
--- a/lib/plugins/popularity/lang/lt/lang.php
+++ b/lib/plugins/popularity/lang/lt/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Lithuanian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author audrius.klevas@gmail.com
  * @author Arunas Vaitekunas <aras@fan.lt>
  */
diff --git a/lib/plugins/usermanager/lang/lt/lang.php b/lib/plugins/usermanager/lang/lt/lang.php
index db3cf2d32..3c0029303 100644
--- a/lib/plugins/usermanager/lang/lt/lang.php
+++ b/lib/plugins/usermanager/lang/lt/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Lithuanian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author grawity <grawity@gmail.com>
  * @author audrius.klevas@gmail.com
  * @author Arunas Vaitekunas <aras@fan.lt>
-- 
cgit v1.2.3


From a07baef5da34434feecc952410ab3cbc37a0f428 Mon Sep 17 00:00:00 2001
From: Mohammad Anini <mohd.anini@gmail.com>
Date: Sun, 19 Apr 2015 00:44:02 +0300
Subject: Adding Arabic Stopwords

Adding Arabic stopwords and keeping Engish stopwords as well, since most of the Arabic wikis contain a lot of English words.
---
 inc/lang/ar/stopwords.txt | 163 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)

diff --git a/inc/lang/ar/stopwords.txt b/inc/lang/ar/stopwords.txt
index bc6eb48ae..1a885988a 100644
--- a/inc/lang/ar/stopwords.txt
+++ b/inc/lang/ar/stopwords.txt
@@ -2,6 +2,169 @@
 # When you edit this file be sure to use UNIX line endings (single newline)
 # No need to include words shorter than 3 chars - these are ignored anyway
 # This list is based upon the ones found at http://www.ranks.nl/stopwords/
+ب
+ا
+،
+عشر
+عدد
+عدة
+عشرة
+عدم
+عام
+عاما
+عن
+عند
+عندما
+على
+عليه
+عليها
+زيارة
+سنة
+سنوات
+تم
+ضد
+بعد
+بعض
+اعادة
+اعلنت
+بسبب
+حتى
+اذا
+احد
+اثر
+برس
+باسم
+غدا
+شخصا
+صباح
+اطار
+اربعة
+اخرى
+بان
+اجل
+غير
+بشكل
+حاليا
+بن
+به
+ثم
+اف
+ان
+او
+اي
+بها
+صفر
+حيث
+اكد
+الا
+اما
+امس
+السابق
+التى
+التي
+اكثر
+ايار
+ايضا
+ثلاثة
+الذاتي
+الاخيرة
+الثاني
+الثانية
+الذى
+الذي
+الان
+امام
+ايام
+خلال
+حوالى
+الذين
+الاول
+الاولى
+بين
+ذلك
+دون
+حول
+حين
+الف
+الى
+انه
+اول
+ضمن
+انها
+جميع
+الماضي
+الوقت
+المقبل
+اليوم
+ـ
+ف
+و
+و6
+قد
+لا
+ما
+مع
+مساء
+هذا
+واحد
+واضاف
+واضافت
+فان
+قبل
+قال
+كان
+لدى
+نحو
+هذه
+وان
+واكد
+كانت
+واوضح
+مايو
+فى
+في
+كل
+لم
+لن
+له
+من
+هو
+هي
+قوة
+كما
+لها
+منذ
+وقد
+ولا
+نفسه
+لقاء
+مقابل
+هناك
+وقال
+وكان
+نهاية
+وقالت
+وكانت
+للامم
+فيه
+كلم
+لكن
+وفي
+وقف
+ولم
+ومن
+وهو
+وهي
+يوم
+فيها
+منها
+مليار
+لوكالة
+يكون
+يمكن
+مليون
+فى
+أم
 about
 are
 and
-- 
cgit v1.2.3


From c71cd01ad950af15dec56b96ebd5884b9b897cfd Mon Sep 17 00:00:00 2001
From: Max Lyashuk <m_lyashuk@ukr.net>
Date: Sun, 19 Apr 2015 14:00:50 +0200
Subject: translation update

---
 inc/lang/uk/lang.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index a6b08c905..0b628055f 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -2,14 +2,15 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Oleksiy Voronin <ovoronin@gmail.com>
  * @author serg_stetsuk@ukr.net
  * @author Oleksandr Kunytsia <okunia@gmail.com>
  * @author Uko <uko@uar.net>
- * @author Ulrikhe Lukoie  <lukoie@gmail.com>
+ * @author Ulrikhe Lukoie <lukoie@gmail.com>
  * @author Kate Arzamastseva pshns@ukr.net
  * @author Egor Smkv <egorsmkv@gmail.com>
+ * @author Max Lyashuk <m_lyashuk@ukr.net>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -52,7 +53,9 @@ $lang['btn_draftdel']          = 'Знищити чернетку';
 $lang['btn_revert']            = 'Відновити';
 $lang['btn_register']          = 'Реєстрація';
 $lang['btn_apply']             = 'Застосувати';
+$lang['btn_media']             = 'Керування медіа-файлами';
 $lang['btn_deleteuser']        = 'Видалити мій аккаунт';
+$lang['btn_img_backto']        = 'Повернутися до %s';
 $lang['loggedinas']            = 'Ви:';
 $lang['user']                  = 'Користувач';
 $lang['pass']                  = 'Пароль';
@@ -98,6 +101,7 @@ $lang['searchmedia_in']        = 'Шукати у %s';
 $lang['txt_upload']            = 'Виберіть файл для завантаження:';
 $lang['txt_filename']          = 'Завантажити як (не обов\'язкове):';
 $lang['txt_overwrt']           = 'Перезаписати існуючий файл';
+$lang['maxuploadsize']         = 'Відвантаження максимум %s на файл.';
 $lang['lockedby']              = 'Заблоковано:';
 $lang['lockexpire']            = 'Блокування завершується в:';
 $lang['js']['willexpire']      = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
@@ -132,9 +136,14 @@ $lang['js']['nosmblinks']      = 'Посилання на мережеві па
 $lang['js']['linkwiz']         = 'Чарівник посилань';
 $lang['js']['linkto']          = 'Посилання на:';
 $lang['js']['del_confirm']     = 'Дійсно знищити обрані елементи?';
+$lang['js']['restore_confirm'] = 'Дійсно відновити цю версію?';
+$lang['js']['media_diff']      = 'Переглянути різницю:';
+$lang['js']['media_select']    = 'Оберіть файли';
 $lang['js']['media_upload_btn'] = 'Завантажити';
 $lang['js']['media_done_btn']  = 'Успішно';
+$lang['js']['media_drop']      = 'Перетягніть сюди файли для відвантаження';
 $lang['js']['media_cancel']    = 'видалити';
+$lang['js']['media_overwrt']   = 'Перезаписати існуючі файли';
 $lang['rssfailed']             = 'Виникла помилка під час отримання RSS-стрічки: ';
 $lang['nothingfound']          = 'Нічого не знайдено.';
 $lang['mediaselect']           = 'Вибір медіа-файлу';
@@ -172,6 +181,9 @@ $lang['difflink']              = 'Посилання на цей список з
 $lang['diff_type']             = 'Переглянути відмінності:';
 $lang['diff_inline']           = 'Вбудувати';
 $lang['diff_side']             = 'Поряд';
+$lang['diffprevrev']           = 'Попередня ревізія';
+$lang['diffnextrev']           = 'Наступна ревізія';
+$lang['difflastrev']           = 'Остання ревізія';
 $lang['line']                  = 'Рядок';
 $lang['breadcrumb']            = 'Відвідано:';
 $lang['youarehere']            = 'Ви тут:';
@@ -194,7 +206,9 @@ $lang['mail_changed']          = 'сторінку змінено:';
 $lang['mail_subscribe_list']   = 'сторінки, що змінено у просторі імен:';
 $lang['mail_new_user']         = 'новий користувач:';
 $lang['mail_upload']           = 'завантажено файл:';
+$lang['changes_type']          = 'Переглянути зміни ';
 $lang['pages_changes']         = 'Сторінок';
+$lang['media_changes']         = 'Медіа-файли';
 $lang['qb_bold']               = 'Напівжирний текст';
 $lang['qb_italic']             = 'Курсив';
 $lang['qb_underl']             = 'Підкреслений текст';
@@ -224,7 +238,6 @@ $lang['admin_register']        = 'Додати нового користувач
 $lang['metaedit']              = 'Редагувати метадані';
 $lang['metasaveerr']           = 'Помилка запису метаданих';
 $lang['metasaveok']            = 'Метадані збережено';
-$lang['btn_img_backto']            = 'Повернутися до %s';
 $lang['img_title']             = 'Назва:';
 $lang['img_caption']           = 'Підпис:';
 $lang['img_date']              = 'Дата:';
@@ -235,6 +248,8 @@ $lang['img_copyr']             = 'Авторські права:';
 $lang['img_format']            = 'Формат:';
 $lang['img_camera']            = 'Камера:';
 $lang['img_keywords']          = 'Ключові слова:';
+$lang['img_width']             = 'Ширини:';
+$lang['img_height']            = 'Висота:';
 $lang['subscr_subscribe_success'] = 'Додано %s до списку підписки для %s';
 $lang['subscr_subscribe_error'] = 'Помилка при додавані %s до списку підписки для %s';
 $lang['subscr_subscribe_noaddress'] = 'Немає адреси, асоційованої з Вашим логіном, тому Ви не можете бути додані до списку підписки.';
-- 
cgit v1.2.3


From 153dee4f7146278cd96d2240e3b1749ec3f2488a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 19 Apr 2015 18:15:29 +0100
Subject: increased copyright year in wiki:dokuwiki

---
 data/pages/wiki/dokuwiki.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index 0e08fdcd3..29843e5c6 100644
--- a/data/pages/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -57,7 +57,7 @@ All documentation and additional information besides the [[syntax|syntax descrip
 
 ===== Copyright =====
 
-2004-2013 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community
+2004-2015 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community
 
 The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-).
 
-- 
cgit v1.2.3


From bf43fe7bbab79116830152b2d2326dc1e7457536 Mon Sep 17 00:00:00 2001
From: Yoven <epy@free.fr>
Date: Sun, 19 Apr 2015 19:28:43 +0200
Subject: 2 typo fixes

---
 lib/plugins/extension/lang/fr/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/extension/lang/fr/lang.php b/lib/plugins/extension/lang/fr/lang.php
index 44d403847..1a5e469f8 100644
--- a/lib/plugins/extension/lang/fr/lang.php
+++ b/lib/plugins/extension/lang/fr/lang.php
@@ -64,7 +64,7 @@ $lang['msg_enabled']           = 'Greffon %s activé';
 $lang['msg_disabled']          = 'Greffon %s désactivé';
 $lang['msg_delete_success']    = 'Extension %s désinstallée.';
 $lang['msg_delete_failed']     = 'Echec de la désinstallation de l\'extension %s';
-$lang['msg_template_install_success'] = 'Thème %s installée avec succès';
+$lang['msg_template_install_success'] = 'Thème %s installé avec succès';
 $lang['msg_template_update_success'] = 'Thème %s mis à jour avec succès';
 $lang['msg_plugin_install_success'] = 'Greffon %s installé avec succès';
 $lang['msg_plugin_update_success'] = 'Greffon %s mis à jour avec succès';
@@ -79,7 +79,7 @@ $lang['error_badurl']          = 'Les URL doivent commencer par http ou https';
 $lang['error_dircreate']       = 'Impossible de créer le dossier temporaire pour le téléchargement.';
 $lang['error_download']        = 'Impossible de télécharger le fichier : %s';
 $lang['error_decompress']      = 'Impossible de décompresser le fichier téléchargé. C\'est peut être le résultat d\'une erreur de téléchargement, auquel cas vous devriez réessayer. Le format de compression est peut-être inconnu. Dans ce cas il vous faudra procéder à une installation manuelle.';
-$lang['error_findfolder']      = 'Impossible d\'idnetifier le dossier de l\'extension. vous devez procéder à une installation manuelle.';
+$lang['error_findfolder']      = 'Impossible d\'identifier le dossier de l\'extension. vous devez procéder à une installation manuelle.';
 $lang['error_copy']            = 'Une erreur de copie de fichier s\'est produite lors de l\'installation des fichiers dans le dossier <em>%s</em>. Il se peut que le disque soit plein, ou que les permissions d\'accès aux fichiers soient incorrectes. Il est possible que le greffon soit partiellement installé et que cela laisse votre installation de DoluWiki instable.';
 $lang['noperms']               = 'Impossible d\'écrire dans le dossier des extensions.';
 $lang['notplperms']            = 'Impossible d\'écrire dans le dossier des thèmes.';
-- 
cgit v1.2.3


From 703509f636f39a80b681e76b4998973c952803a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 23 Apr 2015 14:33:00 +0200
Subject: Move cursor to the end of the text in input

---
 lib/scripts/linkwiz.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index e8191dbcb..752e12187 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -299,6 +299,9 @@ var dw_linkwiz = {
         dw_linkwiz.$wiz.show();
         dw_linkwiz.$entry.focus();
         dw_linkwiz.autocomplete();
+        var temp = dw_linkwiz.$entry.val();
+        dw_linkwiz.$entry.val('');
+        dw_linkwiz.$entry.val(temp);
     },
 
     /**
-- 
cgit v1.2.3


From fcf506ee6d1ecd6e676d7bd8daa334964ef46265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Thu, 23 Apr 2015 14:53:31 +0200
Subject: Add comment to explain purpose of folliwing lines

---
 lib/scripts/linkwiz.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 752e12187..7c383ffe4 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -299,6 +299,8 @@ var dw_linkwiz = {
         dw_linkwiz.$wiz.show();
         dw_linkwiz.$entry.focus();
         dw_linkwiz.autocomplete();
+
+        // Move the cursor to the end of the input
         var temp = dw_linkwiz.$entry.val();
         dw_linkwiz.$entry.val('');
         dw_linkwiz.$entry.val(temp);
-- 
cgit v1.2.3


From e40f7042b86e8670dc1dbe18d297eb5c1adb701e Mon Sep 17 00:00:00 2001
From: Alex P <alexander@lanos.co.uk>
Date: Fri, 24 Apr 2015 16:41:16 +0200
Subject: translation update

---
 inc/lang/ru/lang.php                       | 1 +
 lib/plugins/authldap/lang/ru/settings.php  | 9 +++++++++
 lib/plugins/authpgsql/lang/ru/settings.php | 2 ++
 lib/plugins/extension/lang/ru/lang.php     | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 96278d53b..516eb01c7 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -29,6 +29,7 @@
  * @author Igor Degraf <igordegraf@gmail.com>
  * @author Type-kun <workwork-1@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
+ * @author Alex P <alexander@lanos.co.uk>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/authldap/lang/ru/settings.php b/lib/plugins/authldap/lang/ru/settings.php
index 1e5391644..067ec9de4 100644
--- a/lib/plugins/authldap/lang/ru/settings.php
+++ b/lib/plugins/authldap/lang/ru/settings.php
@@ -9,6 +9,7 @@
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Владимир <id37736@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
+ * @author Alex P <alexander@lanos.co.uk>
  */
 $lang['server']                = 'Ваш LDAP-сервер. Либо имя хоста (<code>localhost</code>), либо полный URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'Порт LDAP-сервера, если выше не был указан полный URL';
@@ -18,12 +19,20 @@ $lang['userfilter']            = 'LDAP-фильтр для поиска акка
 $lang['groupfilter']           = 'LDAP-фильтр для поиска групп. Например: <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = 'Версия протокола. Возможно, вам нужно указать <code>3</code>';
 $lang['starttls']              = 'Использовать TLS-подключения?';
+$lang['referrals']             = 'Следовать за referrals ?';
 $lang['deref']                 = 'Как расшифровывать псевдонимы?';
+$lang['binddn']                = 'DN вторичного bind пользователя, если anonymous bind недостаточно. Например: <code>cn=admin, dc=my, dc=home</code>';
 $lang['bindpw']                = 'Пароль для указанного пользователя';
 $lang['userscope']             = 'Ограничить область поиска при поиске пользователей';
 $lang['groupscope']            = 'Ограничить область поиска при поиске групп';
+$lang['userkey']               = 'Атрибут означающий имя пользователя; должен быть таким же как в userfilter';
+$lang['groupkey']              = 'Использовать любой атрибут пользователя для включения в группу (вместо стандартного AD groups) Например из атрибута department или telephone number';
+$lang['modPass']               = 'Может ли LDAP пароль быть поменян через dokuwiki?';
 $lang['debug']                 = 'Показывать дополнительную отладочную информацию при ошибках';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'исользовать по умолчанию';
+$lang['referrals_o_0']         = 'не следовать за referrals';
+$lang['referrals_o_1']         = 'Следовать за referrals';
diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php
index 2af299172..a74296ab8 100644
--- a/lib/plugins/authpgsql/lang/ru/settings.php
+++ b/lib/plugins/authpgsql/lang/ru/settings.php
@@ -8,6 +8,7 @@
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
  * @author Type-kun <workwork-1@yandex.ru>
+ * @author Alex P <alexander@lanos.co.uk>
  */
 $lang['server']                = 'Ваш PostgreSQL-сервер';
 $lang['port']                  = 'Порт вашего PostgreSQL-сервера';
@@ -15,6 +16,7 @@ $lang['user']                  = 'Имя пользователя PostgreSQL';
 $lang['password']              = 'Пароль для указанного пользователя';
 $lang['database']              = 'Имя базы данных';
 $lang['debug']                 = 'Отображать дополнительную отладочную информацию';
+$lang['forwardClearPass']      = 'Передать чистым текстом ползовательские пароли в SQL запросы ниже, вместо использование опции passcrypt';
 $lang['checkPass']             = 'Выражение SQL, осуществляющее проверку пароля';
 $lang['getUserInfo']           = 'Выражение SQL, осуществляющее извлечение информации о пользователе';
 $lang['getGroups']             = 'Выражение SQL, осуществляющее извлечение информации о членстве пользователе в группах';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index 381d84500..4b2542420 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -7,6 +7,7 @@
  * @author Igor Degraf <igordegraf@gmail.com>
  * @author Type-kun <workwork-1@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
+ * @author Alex P <alexander@lanos.co.uk>
  */
 $lang['menu']                  = 'Управление дополнениями';
 $lang['tab_plugins']           = 'Установленные плагины';
@@ -87,6 +88,8 @@ $lang['noperms']               = 'Папка для расширений нед
 $lang['notplperms']            = 'Папка для шаблонов недоступна для записи';
 $lang['nopluginperms']         = 'Папка плагинов недоступна для записи';
 $lang['git']                   = 'Это расширение было установлено через git. Вы не можете обновить его тут.';
+$lang['auth']                  = 'Этот auth плагин не включен в конфигурации, подумайте о его отключении';
 $lang['install_url']           = 'Установить с адреса URL';
 $lang['install_upload']        = 'Скачать расширение';
 $lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернетом.';
+$lang['nossl']                 = 'Ваша PHP конфигурация не имеет SSL поддержки. Это поломает скачивание для многих DokuWiki плагинов и расширений.';
-- 
cgit v1.2.3


From 7d986b28c67e25c25b73625af13967137a426d0f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 25 Apr 2015 08:54:02 +0200
Subject: new travis config

test (but allow fails) against hhvm and PHP nightly (PHP7) builds
remove phpunit pinning
---
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0bef94048..0f9d2331a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,17 @@ php:
   - "5.5"
   - "5.4"
   - "5.3"
+  - "hhvm"
+  - "nightly"
+matrix:
+  allow_failures:
+    - php:
+      - "hhvm"
+      - "nightly"
 notifications:
   irc:
     channels:
         - "chat.freenode.net#dokuwiki"
     on_success: change
     on_failure: change
-install:
-  - wget https://phar.phpunit.de/phpunit-4.3.5.phar -O _test/phpunit
-  - chmod 755 _test/phpunit
-script: cd _test && ./phpunit --verbose --stderr
+script: cd _test && phpunit --verbose --stderr
-- 
cgit v1.2.3


From bd8c2ebfb888520b80db00d3c1c6288be289862c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 25 Apr 2015 10:20:14 +0200
Subject: introduce new "flaky" test group

this group is skipped by default
---
 _test/phpunit.xml                        |  6 ++++++
 _test/tests/inc/cache_use.test.php       | 19 +++++++------------
 _test/tests/inc/httpclient_http.test.php |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/_test/phpunit.xml b/_test/phpunit.xml
index 25506b1ae..6e2509749 100644
--- a/_test/phpunit.xml
+++ b/_test/phpunit.xml
@@ -18,6 +18,12 @@
         </testsuite>
     </testsuites>
 
+    <groups>
+        <exclude>
+            <group>flaky</group>
+        </exclude>
+    </groups>
+
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="false">
             <directory suffix=".php">../</directory>
diff --git a/_test/tests/inc/cache_use.test.php b/_test/tests/inc/cache_use.test.php
index 3ea212d50..c0c12580a 100644
--- a/_test/tests/inc/cache_use.test.php
+++ b/_test/tests/inc/cache_use.test.php
@@ -4,6 +4,8 @@
  * Class cache_use_test
  *
  * Tests if caching can actually be used
+ *
+ * @todo tests marked as flaky until Ticket #694 has been fixed
  */
 class cache_use_test extends DokuWikiTest {
     /** @var cache_renderer $cache */
@@ -28,18 +30,11 @@ class cache_use_test extends DokuWikiTest {
         touch($this->cache->cache, $time);
     }
 
-    function test_use() {
-        $this->markTestSkipped('Disabled until Ticket #694 has been fixed');
-        return;
-
-        $this->assertTrue($this->cache->useCache());
-    }
-
     /**
      * In all the following tests the cache should not be usable
      * as such, they are meaningless if test_use didn't pass.
      *
-     * @depends test_use
+     * @group flaky
      */
     function test_purge() {
         /* @var Input $INPUT */
@@ -51,7 +46,7 @@ class cache_use_test extends DokuWikiTest {
     }
 
     /**
-     * @depends test_use
+     * @group flaky
      */
     function test_filedependency() {
         // give the dependent src file the same mtime as the cache
@@ -60,7 +55,7 @@ class cache_use_test extends DokuWikiTest {
     }
 
     /**
-     * @depends test_use
+     * @group flaky
      */
     function test_age() {
         // need to age both our source file & the cache
@@ -74,7 +69,7 @@ class cache_use_test extends DokuWikiTest {
     }
 
     /**
-     * @depends test_use
+     * @group flaky
      */
     function test_confnocaching() {
         global $conf;
@@ -83,4 +78,4 @@ class cache_use_test extends DokuWikiTest {
         $this->assertFalse($this->cache->useCache());
         $this->assertNotEmpty($this->cache->_nocache);
     }
-}
\ No newline at end of file
+}
diff --git a/_test/tests/inc/httpclient_http.test.php b/_test/tests/inc/httpclient_http.test.php
index 3446e1184..94b8e1bc1 100644
--- a/_test/tests/inc/httpclient_http.test.php
+++ b/_test/tests/inc/httpclient_http.test.php
@@ -289,6 +289,7 @@ class httpclient_http_test extends DokuWikiTest {
      * This address caused trouble with stream_select()
      *
      * @group internet
+     * @group flaky
      */
     function test_wikimatrix(){
         $http = new HTTPMockClient();
-- 
cgit v1.2.3


From d8dd70c79c912e00e4d7e71cbb4aca3e791cab0d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 25 Apr 2015 10:38:15 +0200
Subject: fixed allow_failures syntax

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0f9d2331a..edca80e0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,8 @@ php:
   - "nightly"
 matrix:
   allow_failures:
-    - php:
-      - "hhvm"
-      - "nightly"
+    - php: "hhvm"
+    - php: "nightly"
 notifications:
   irc:
     channels:
-- 
cgit v1.2.3


From 79a3bed0a23b6bef35eb12c6ccbb1f3301f6c621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Mon, 27 Apr 2015 08:00:12 +0200
Subject: Generate display options via JS

Since it is a JS function only, the form will be generated by it too.
---
 lib/plugins/extension/helper/gui.php   |  9 ---------
 lib/plugins/extension/lang/en/lang.php |  8 ++++----
 lib/plugins/extension/script.js        | 18 ++++++++++++++----
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 2dbb3d5e5..3a0f0c589 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -38,15 +38,6 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
 
         echo '<div class="panelHeader">';
         echo $this->locale_xhtml('intro_plugins');
-
-        $options = new Doku_Form( "viewoptions" );
-        $options->addElement( form_makeOpenTag( "p" ) );
-        $options->addElement( $this->getLang('display_viewoptions') );
-        $options->addElement( form_makeCheckboxField( "enabled", 1, $this->getLang('display_enabled') ) );
-        $options->addElement( form_makeCheckboxField( "disabled", 1, $this->getLang('display_disabled') ) );
-        $options->addElement( form_makeCheckboxField( "updatable", 1, $this->getLang('display_updatable') ) );
-        $options->addElement( form_makeCloseTag( "p" ) );
-        $options->printForm();
         echo '</div>';
 
         $pluginlist = $plugin_controller->getList('', true);
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 907f91c23..79f643629 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -103,7 +103,7 @@ $lang['install_upload']               = 'Upload Extension:';
 $lang['repo_error']                   = 'The plugin repository could not be contacted. Make sure your server is allowed to contact www.dokuwiki.org and check your proxy settings.';
 $lang['nossl']                        = 'Your PHP seems to miss SSL support. Downloading will not work for many DokuWiki extensions.';
 
-$lang['display_viewoptions']          = 'View Options:';
-$lang['display_enabled']              = 'enabled';
-$lang['display_disabled']             = 'disabled';
-$lang['display_updatable']            = 'updatable';
+$lang['js']['display_viewoptions']    = 'View Options:';
+$lang['js']['display_enabled']        = 'enabled';
+$lang['js']['display_disabled']       = 'disabled';
+$lang['js']['display_updatable']      = 'updatable';
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index 43af21ee1..825bcc928 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -111,9 +111,19 @@ jQuery(function(){
     });
 
     /**
-     * Enable all plugin types
-     */    
-    $extmgr.find( '#viewoptions :checkbox' ).change(function(){
+        Create section for enabling/disabling viewing options
+     */
+    var $displayOpts = jQuery('<p>', { id: 'viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
+    $displayOpts.append(LANG.plugins.extension.display_viewoptions);
+    
+    var displayOptionsHandler = function(){
         jQuery('#extension__list').toggleClass( this.name );
-    }).click();
+    };
+    
+    jQuery(['enabled', 'disabled', 'updatable']).each(function(index, chkName){
+        
+        var $label = jQuery( '<label></label>' ).appendTo($displayOpts);
+        jQuery( '<input />', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click();
+        jQuery( '<span/>' ).append(LANG.plugins.extension['display_'+chkName]).appendTo($label);
+    });
 });
-- 
cgit v1.2.3


From b857f6cb524f22ed48a5a08553b2a370969dda38 Mon Sep 17 00:00:00 2001
From: Hudson FAS <hudsonfas@gmail.com>
Date: Tue, 28 Apr 2015 16:21:21 +0200
Subject: translation update

---
 inc/lang/pt-br/lang.php                       |  3 +++
 lib/plugins/authldap/lang/pt-br/settings.php  |  6 ++++++
 lib/plugins/extension/lang/pt-br/lang.php     | 17 +++++++++++++++++
 lib/plugins/usermanager/lang/pt-br/import.txt |  9 +++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 lib/plugins/usermanager/lang/pt-br/import.txt

diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index be62af6fe..590e95480 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -24,6 +24,7 @@
  * @author Dário Estevão <darioems@gmail.com>
  * @author Juliano Marconi Lanigra <juliano.marconi@gmail.com>
  * @author Ednei <leuloch@gmail.com>
+ * @author Hudson FAS <hudsonfas@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -357,3 +358,5 @@ $lang['currentns']             = 'Domínio atual';
 $lang['searchresult']          = 'Resultado da Busca';
 $lang['plainhtml']             = 'HTML simples';
 $lang['wikimarkup']            = 'Marcação wiki';
+$lang['page_nonexist_rev']     = 'Página não encontrada em %s. Foi criada posteriormente em <a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'Impossível analisar em "%s".';
diff --git a/lib/plugins/authldap/lang/pt-br/settings.php b/lib/plugins/authldap/lang/pt-br/settings.php
index 6ad6b4862..f35ed8eb8 100644
--- a/lib/plugins/authldap/lang/pt-br/settings.php
+++ b/lib/plugins/authldap/lang/pt-br/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Victor Westmann <victor.westmann@gmail.com>
  * @author Frederico Guimarães <frederico@teia.bio.br>
+ * @author Hudson FAS <hudsonfas@gmail.com>
  */
 $lang['server']                = 'Seu servidor LDAP. Ou hostname (<code>localhost</code>) ou uma URL completa (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'Porta LDAP do servidor se nenhuma URL completa tiver sido fornecida acima';
@@ -20,9 +21,14 @@ $lang['binddn']                = 'DN de um vínculo opcional de usuário se vín
 $lang['bindpw']                = 'Senha do usuário acima';
 $lang['userscope']             = 'Limitar escopo da busca para busca de usuário';
 $lang['groupscope']            = 'Limitar escopo da busca para busca de grupo';
+$lang['userkey']               = 'Atributo que indica o nome do usuário; deve ser consistente com userfilter.';
 $lang['groupkey']              = 'Membro de grupo vem de qualquer atributo do usuário (ao invés de grupos padrões AD) e.g. departamento de grupo ou número de telefone';
+$lang['modPass']               = 'A senha LDAP pode ser alterada pelo dokuwiki ?';
 $lang['debug']                 = 'Mostrar informações adicionais de depuração em erros';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'use o padr&atilde;o';
+$lang['referrals_o_0']         = 'não seguem refer&ecirc;ncias';
+$lang['referrals_o_1']         = 'seguem refer&ecirc;ncias';
diff --git a/lib/plugins/extension/lang/pt-br/lang.php b/lib/plugins/extension/lang/pt-br/lang.php
index 0d897616a..47286389f 100644
--- a/lib/plugins/extension/lang/pt-br/lang.php
+++ b/lib/plugins/extension/lang/pt-br/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Felipe Castro <fefcas@gmail.com>
+ * @author Hudson FAS <hudsonfas@gmail.com>
  */
 $lang['menu']                  = 'Gerenciador de extensões';
 $lang['tab_plugins']           = 'Extensões instaladas';
@@ -62,6 +63,7 @@ $lang['status_bundled']        = 'agrupado';
 $lang['msg_enabled']           = 'Extensão %s habilitada';
 $lang['msg_disabled']          = 'Extensão %s desabilitada';
 $lang['msg_delete_success']    = 'Extensão desinstalada';
+$lang['msg_delete_failed']     = 'Falha na desinstala&ccedil;&atilde;o da extens&atilde;o';
 $lang['msg_template_install_success'] = 'Modelo %s instalado com sucesso';
 $lang['msg_template_update_success'] = 'Modelo %s atualizado com sucesso';
 $lang['msg_plugin_install_success'] = 'Extensão %s instalada com sucesso';
@@ -73,3 +75,18 @@ $lang['security_warning']      = '<strong>Aviso sobre segurança:</strong> %s';
 $lang['update_available']      = '<strong>Atualização:</strong> Nova versão %s está disponível.';
 $lang['wrong_folder']          = '<strong>Extensão instalada incorretamente:</strong> Renomeie o diretório de extensões "%s" para "%s".';
 $lang['url_change']            = '<strong>URL mudou:</strong> A URL para baixar mudou desde a última baixada. Verifique se a nova URL é válida antes de atualizar a extensão.<br />Novo: %s<br />Velho: %s';
+$lang['error_badurl']          = 'O URL deve come&ccedil;ar com http ou https';
+$lang['error_dircreate']       = 'Imposs&iacute;vel criar pasta tempor&aacute;ria para receber o download';
+$lang['error_download']        = 'Imposs&aacute;vel baixar o arquivo: %s';
+$lang['error_decompress']      = 'Imposs&aacute;vel descompimir o arquivo baixado. Isso pode ser resultado de um download ruim que neste caso pode ser tentado novamente; ou o formato da compress&atilde;o pode ser desconhecido, neste caso baixe e instale manualmente.';
+$lang['error_findfolder']      = 'Imposs&iacute;l identificar a extens&atilde;o do diret&oacute;rio, voc&ecirc; deve baixar e instalar manualmente.';
+$lang['error_copy']            = 'Houve um erro de c&oacute;pia de arquivo durante a tentativa de instalar os arquivos para o diret&oacute;rio <em>%s</ em> : o disco pode estar cheio ou as permiss&otilde;es de acesso ao arquivo podem estar incorreta. Isso pode ter resultado em um plugin parcialmente instalado e deixar a sua instala&ccedil;&atilde;o wiki inst&aacute;vel';
+$lang['noperms']               = 'Diret&oacute;rio de extens&atilde;o n&atilde;o &eacute; grav&aacute;vel';
+$lang['notplperms']            = 'Diret&oacute;rio de modelo (Template) n&atilde;o &eacute; grav&aacute;vel';
+$lang['nopluginperms']         = 'Diret&oacute;rio de plugin n&atilde;o &eacute; grav&aacute;vel';
+$lang['git']                   = 'A extens&atilde;o foi instalada via git, voc&ecirc; talvez n&atilde;o queira atualiz&aacute;-lo aqui.';
+$lang['auth']                  = 'O plugin auth n&atilde;o est&aacute; ativado na configura&ccedil;&atilde;o, considere desativ&aacute-lo.';
+$lang['install_url']           = 'Instale a partir do URL:';
+$lang['install_upload']        = 'Publicar Extens&atilde;o:';
+$lang['repo_error']            = 'O repositório de plugin não pode ser contactado. Certifique-se de que o servidor pode acessar www.dokuwiki.org e confira suas configurações de proxy.';
+$lang['nossl']                 = 'Sua instalação PHP parece que não suporta SSL. Algumas extensões DokuWiki não serão baixadas.';
diff --git a/lib/plugins/usermanager/lang/pt-br/import.txt b/lib/plugins/usermanager/lang/pt-br/import.txt
new file mode 100644
index 000000000..d692bb364
--- /dev/null
+++ b/lib/plugins/usermanager/lang/pt-br/import.txt
@@ -0,0 +1,9 @@
+===== Importação de Usuários em Massa =====
+
+Requer um arquivo CSV de usuários com pelo menos quatro colunas.
+As colunas devem conter, nesta ordem: id-usuário, nome completo, endereço de e-mail e grupos.
+Os campos CSV devem ser separados por vírgulas ( , ) e nomes delimitados por aspas (). Barra invertida (\ ) pode ser usado para escapar nomes.
+Para um exemplo de um arquivo adequado , tente a função Exportar usuários acima.
+Usuário ids duplicados serão ignorados.
+
+A senha será gerada e enviada para cada usuário importado com sucesso.
\ No newline at end of file
-- 
cgit v1.2.3


From 421c22ae13e8de7f63d1fe6ed683ee4b8a48a8ee Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 2 May 2015 11:01:06 +0200
Subject: use string for version number. closes #1100

PHP will localize floats (eg. a 45.5 becomes 45,5 in a German locale).
Using a string will prevent that. A fix has been applied on the server end,
but it makes sense to always send the correct message.
---
 doku.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doku.php b/doku.php
index f5aa6cfa4..0f4557fd0 100644
--- a/doku.php
+++ b/doku.php
@@ -8,8 +8,8 @@
  * @global Input $INPUT
  */
 
-// update message version
-$updateVersion = 47;
+// update message version - always use a string to avoid localized floats!
+$updateVersion = "47";
 
 //  xdebug_start_profiling();
 
@@ -77,7 +77,7 @@ if($DATE_AT) {
         $DATE_AT = null;
     } else if ($rev_t === false) { //page did not exist
         $rev_n = $pagelog->getRelativeRevision($DATE_AT,+1);
-        msg(sprintf($lang['page_nonexist_rev'], 
+        msg(sprintf($lang['page_nonexist_rev'],
             strftime($conf['dformat'],$DATE_AT),
             wl($ID, array('rev' => $rev_n)),
             strftime($conf['dformat'],$rev_n)));
-- 
cgit v1.2.3


From 08d7a57554e606109805d4e663759d31ac40df96 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 2 May 2015 11:24:54 +0200
Subject: Revert "use nav+ul element for "you are here""

This reverts commit 3940c519db432ec22e8c587504d86191631f9bfb as
discussed in #1082.
---
 inc/template.php                    | 41 +++++++++++++------------------------
 lib/tpl/dokuwiki/css/mixins.less    | 15 +-------------
 lib/tpl/dokuwiki/css/structure.less | 15 --------------
 3 files changed, 15 insertions(+), 56 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index a4ace1a63..88b6b14b8 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -894,12 +894,12 @@ function tpl_breadcrumbs($sep = '•') {
  * @author Nigel McNie <oracle.shinoda@gmail.com>
  * @author Sean Coates <sean@caedmon.net>
  * @author <fredrik@averpil.com>
- * @author Mark C. Prins <mprins@users.sf.net>
+ * @todo   May behave strangely in RTL languages
  *
  * @param string $sep Separator between entries
  * @return bool
  */
-function tpl_youarehere($sep = ' → ') {
+function tpl_youarehere($sep = ' » ') {
     global $conf;
     global $ID;
     global $lang;
@@ -910,15 +910,12 @@ function tpl_youarehere($sep = ' → ') {
     $parts = explode(':', $ID);
     $count = count($parts);
 
-    echo '<nav><h2 class="bchead">'.$lang['youarehere'].': </h2>';
-    echo '<ul class="navlist">';
-    // always print the startpage
-    if ($count > 1) {
-        echo '<li class="home">'.html_wikilink(':'.$conf['start']).$sep.'</li>';
-    } else {
-        echo '<li class="home">'.$conf['start'].'</li>';
-    }
+    echo '<span class="bchead">'.$lang['youarehere'].' </span>';
 
+    // always print the startpage
+    echo '<span class="home">';
+    tpl_pagelink(':'.$conf['start']);
+    echo '</span>';
 
     // print intermediate namespace links
     $part = '';
@@ -927,28 +924,18 @@ function tpl_youarehere($sep = ' → ') {
         $page = $part;
         if($page == $conf['start']) continue; // Skip startpage
 
-        echo '<li>'.html_wikilink($page);
-        if ($i < $count - 2) {
-            echo $sep.'</li>';
-        } else {
-            echo '</li>';
-        }
+        // output
+        echo $sep;
+        tpl_pagelink($page);
     }
 
     // print current page, skipping start page, skipping for namespace index
     resolve_pageid('', $page, $exists);
-    if(isset($page) && $page == $part.$parts[$i]) {
-        echo '</li></ul></nav>';
-        return true;
-    }
-
+    if(isset($page) && $page == $part.$parts[$i]) return true;
     $page = $part.$parts[$i];
-    if($page == $conf['start']) {
-        echo '</li></ul></nav>';
-        return true;
-    }
-
-    echo $sep.'</li><li class="curid">'.noNSorNS($page).'</li></ul></nav>';
+    if($page == $conf['start']) return true;
+    echo $sep;
+    tpl_pagelink($page);
     return true;
 }
 
diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less
index 4b15bb600..a88767e97 100644
--- a/lib/tpl/dokuwiki/css/mixins.less
+++ b/lib/tpl/dokuwiki/css/mixins.less
@@ -7,17 +7,4 @@
     background: -o-linear-gradient(     @declaration);
     background: -ms-linear-gradient(    @declaration);
     background: linear-gradient(        @declaration);
-}
-
-/**
- * provides inline list styling.
- */
-.inline-list(){
-    list-style-type: none;
-    
-    & li {
-        margin: 0;
-        padding: 0;
-        display: inline;
-    }
-}
+}
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less
index f7dea3948..3ea2f83eb 100644
--- a/lib/tpl/dokuwiki/css/structure.less
+++ b/lib/tpl/dokuwiki/css/structure.less
@@ -87,18 +87,3 @@ body {
 #dokuwiki__footer {
     clear: both;
 }
-
-.dokuwiki .navlist {
-    display: inline;
-    padding: 0;
-    .inline-list;
-}
-
-.bchead {
-    display: inline;
-    font-size: inherit;
-}
-
-.curid {
-    font-weight: bold;
-}
-- 
cgit v1.2.3


From dfe7cc3f3bfbfccec6a38a94ac0f2242e8bc59e7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 2 May 2015 11:45:27 +0200
Subject: another year

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 35de49ab1..1611a6df1 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ at http://www.dokuwiki.org/
 For Installation Instructions see
 http://www.dokuwiki.org/install
 
-DokuWiki - 2004-2014 (c) Andreas Gohr <andi@splitbrain.org>
+DokuWiki - 2004-2015 (c) Andreas Gohr <andi@splitbrain.org>
                          and the DokuWiki Community
 See COPYING and file headers for license info
 
-- 
cgit v1.2.3


From 3a97088971109f1611a03329d12e5296a8c3c515 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 3 May 2015 11:25:06 +0100
Subject: make it possible to remove entries from DOKU_PREFS cookie

---
 inc/common.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/inc/common.php b/inc/common.php
index 5a8b5c900..e14bd7af4 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1875,6 +1875,7 @@ function get_doku_pref($pref, $default) {
 /**
  * Add a preference to the DokuWiki cookie
  * (remembering $_COOKIE['DOKU_PREFS'] is urlencoded)
+ * Remove it by setting $val to false
  *
  * @param string $pref  preference key
  * @param string $val   preference value
@@ -1891,12 +1892,17 @@ function set_doku_pref($pref, $val) {
         $enc_pref = rawurlencode($pref);
         for($i = 0; $i < $cnt; $i += 2) {
             if($parts[$i] == $enc_pref) {
-                $parts[$i + 1] = rawurlencode($val);
+                if ($val !== false) {
+                    $parts[$i + 1] = rawurlencode($val);
+                } else {
+                    unset($parts[$i]);
+                    unset($parts[$i + 1]);
+                }
                 break;
             }
         }
         $cookieVal = implode('#', $parts);
-    } else if (!$orig) {
+    } else if (!$orig && $val !== false) {
         $cookieVal = ($_COOKIE['DOKU_PREFS'] ? $_COOKIE['DOKU_PREFS'].'#' : '').rawurlencode($pref).'#'.rawurlencode($val);
     }
 
-- 
cgit v1.2.3


From abf17633a7157acf33d1cf76985b9221089d3fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Mon, 4 May 2015 07:57:33 +0200
Subject: Add selection for the Installed Plugins tab

The viewing options should only be visible on the first tab - which is
the installed Plugins tab. (There seems to be no more direct way to
address this tab.)
---
 lib/plugins/extension/script.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index 825bcc928..db6a95e51 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -113,7 +113,9 @@ jQuery(function(){
     /**
         Create section for enabling/disabling viewing options
      */
+    if ( $extmgr.find('.tabs li:first-child').hasClass('active') ) {
     var $displayOpts = jQuery('<p>', { id: 'viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
+
     $displayOpts.append(LANG.plugins.extension.display_viewoptions);
     
     var displayOptionsHandler = function(){
@@ -126,4 +128,5 @@ jQuery(function(){
         jQuery( '<input />', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click();
         jQuery( '<span/>' ).append(LANG.plugins.extension['display_'+chkName]).appendTo($label);
     });
+    }
 });
-- 
cgit v1.2.3


From c85bc60fd47287238689cca5a2c32b9253cf0b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Mon, 4 May 2015 07:58:47 +0200
Subject: Prettify Code.

---
 lib/plugins/extension/script.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index db6a95e51..06ad6ff20 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -114,19 +114,19 @@ jQuery(function(){
         Create section for enabling/disabling viewing options
      */
     if ( $extmgr.find('.tabs li:first-child').hasClass('active') ) {
-    var $displayOpts = jQuery('<p>', { id: 'viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
+        var $displayOpts = jQuery('<p>', { id: 'viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
 
-    $displayOpts.append(LANG.plugins.extension.display_viewoptions);
+        $displayOpts.append(LANG.plugins.extension.display_viewoptions);
     
-    var displayOptionsHandler = function(){
-        jQuery('#extension__list').toggleClass( this.name );
-    };
+        var displayOptionsHandler = function(){
+            jQuery('#extension__list').toggleClass( this.name );
+        };
     
-    jQuery(['enabled', 'disabled', 'updatable']).each(function(index, chkName){
+        jQuery(['enabled', 'disabled', 'updatable']).each(function(index, chkName){
         
-        var $label = jQuery( '<label></label>' ).appendTo($displayOpts);
-        jQuery( '<input />', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click();
-        jQuery( '<span/>' ).append(LANG.plugins.extension['display_'+chkName]).appendTo($label);
-    });
+            var $label = jQuery( '<label></label>' ).appendTo($displayOpts);
+            jQuery( '<input />', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click();
+            jQuery( '<span/>' ).append(LANG.plugins.extension['display_'+chkName]).appendTo($label);
+        });
     }
 });
-- 
cgit v1.2.3


From 957202777a4d14ec2b5601d36010542f38b4740c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Mon, 4 May 2015 08:03:46 +0200
Subject: Allow Viewing Options for templates as well.

---
 lib/plugins/extension/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index 06ad6ff20..1a0af4e0d 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -113,7 +113,7 @@ jQuery(function(){
     /**
         Create section for enabling/disabling viewing options
      */
-    if ( $extmgr.find('.tabs li:first-child').hasClass('active') ) {
+    if ( $extmgr.find('.tabs li:first-child, .tabs li:nth-child(2)').hasClass('active') ) {
         var $displayOpts = jQuery('<p>', { id: 'viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
 
         $displayOpts.append(LANG.plugins.extension.display_viewoptions);
-- 
cgit v1.2.3


From 5fc6f52e0a12f737afab24869c01076585fdcc69 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 May 2015 19:30:30 +0100
Subject: cache JavaScript per template

---
 inc/template.php |  2 +-
 lib/exe/js.php   | 26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 88b6b14b8..d6436e416 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -417,7 +417,7 @@ function tpl_metaheaders($alt = true) {
     // load external javascript
     $head['script'][] = array(
         'type'=> 'text/javascript', 'charset'=> 'utf-8', '_data'=> '',
-        'src' => DOKU_BASE.'lib/exe/js.php'.'?tseed='.$tseed
+        'src' => DOKU_BASE.'lib/exe/js.php'.'?t='.$conf['template'].'&tseed='.$tseed
     );
 
     // trigger event here
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 06d0dda55..2df2d0ba6 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -30,9 +30,14 @@ function js_out(){
     global $conf;
     global $lang;
     global $config_cascade;
+    global $INPUT;
+
+    // decide from where to get the template
+    $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
+    if(!$tpl) $tpl = $conf['template'];
 
     // The generated script depends on some dynamic options
-    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js');
+    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl,'.js');
     $cache->_event = 'JS_CACHE_USE';
 
     // load minified version for some files
@@ -67,7 +72,7 @@ function js_out(){
 # disabled for FS#1958                DOKU_INC.'lib/scripts/hotkeys.js',
                 DOKU_INC.'lib/scripts/behaviour.js',
                 DOKU_INC.'lib/scripts/page.js',
-                tpl_incdir().'script.js',
+                tpl_incdir($tpl).'script.js',
             );
 
     // add possible plugin scripts and userscript
@@ -92,7 +97,7 @@ function js_out(){
     $json = new JSON();
     // add some global variables
     print "var DOKU_BASE   = '".DOKU_BASE."';";
-    print "var DOKU_TPL    = '".tpl_basedir()."';";
+    print "var DOKU_TPL    = '".tpl_basedir($tpl)."';";
     print "var DOKU_COOKIE_PARAM = " . $json->encode(
             array(
                  'path' => empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'],
@@ -104,7 +109,7 @@ function js_out(){
 
     // load JS specific translations
     $lang['js']['plugins'] = js_pluginstrings();
-    $templatestrings = js_templatestrings();
+    $templatestrings = js_templatestrings($tpl);
     if(!empty($templatestrings)) {
         $lang['js']['template'] = $templatestrings;
     }
@@ -240,19 +245,20 @@ function js_pluginstrings() {
  * - $lang['js'] must be an array.
  * - Nothing is returned for template without an entry for $lang['js']
  *
+ * @param string $tpl
  * @return array
  */
-function js_templatestrings() {
+function js_templatestrings($tpl) {
     global $conf;
     $templatestrings = array();
-    if (file_exists(tpl_incdir()."lang/en/lang.php")) {
-        include tpl_incdir()."lang/en/lang.php";
+    if (file_exists(tpl_incdir($tpl)."lang/en/lang.php")) {
+        include tpl_incdir($tpl)."lang/en/lang.php";
     }
-    if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
-        include tpl_incdir()."lang/".$conf['lang']."/lang.php";
+    if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(tpl_incdir($tpl)."lang/".$conf['lang']."/lang.php")) {
+        include tpl_incdir($tpl)."lang/".$conf['lang']."/lang.php";
     }
     if (isset($lang['js'])) {
-        $templatestrings[$conf['template']] = $lang['js'];
+        $templatestrings[$tpl] = $lang['js'];
     }
     return $templatestrings;
 }
-- 
cgit v1.2.3


From b43a17acf599c3be018aa413a6e44ab61baf90ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Tue, 5 May 2015 10:14:19 +0200
Subject: Add pipe to end of link pasted w/o title

It is helpful if the pipe is still inserted by the linkwizard when there
is no title. This increases usability for beginners.
---
 lib/scripts/linkwiz.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 7c383ffe4..bc850226f 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -244,9 +244,10 @@ var dw_linkwiz = {
                 so += dw_linkwiz.val.open.length;
                 link = dw_linkwiz.val.open+link;
             }
+            link += '|';
+            so += 1;
             if(stxt) {
-                link += '|'+stxt;
-                so += 1;
+                link += stxt;
             }
             if(dw_linkwiz.val.close) {
                 link += dw_linkwiz.val.close;
-- 
cgit v1.2.3


From 5d10131eb45e428874a022fd272d408bcc36e600 Mon Sep 17 00:00:00 2001
From: flammy <flamabelde@yahoo.de>
Date: Tue, 5 May 2015 10:48:22 +0200
Subject: Update detail.php

removed </a>
---
 lib/tpl/dokuwiki/detail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index ada2a6644..6755bdce5 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -63,7 +63,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                             $media_usage = ft_mediause($IMG,true);
                             if(count($media_usage) > 0){
                                 foreach($media_usage as $path){
-                                    echo '<dd>'.html_wikilink($path).'</a></dd>';
+                                    echo '<dd>'.html_wikilink($path).'</dd>';
                                 }
                             }else{
                                 echo '<dd>'.$lang['nothingfound'].'</dd>';
-- 
cgit v1.2.3


From c93edcafa17e4189ce3be461b6374a62664d2d51 Mon Sep 17 00:00:00 2001
From: Johan Wijnker <johan@wijnker.eu>
Date: Tue, 5 May 2015 16:31:25 +0200
Subject: translation update

---
 inc/lang/nl/lang.php                      | 3 +++
 lib/plugins/authldap/lang/nl/settings.php | 6 ++++++
 lib/plugins/extension/lang/nl/lang.php    | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index f0a235d67..e7d82af19 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -25,6 +25,7 @@
  * @author Rene <wllywlnt@yahoo.com>
  * @author Johan Vervloet <johan.vervloet@gmail.com>
  * @author Mijndert <mijndert@mijndertstuij.nl>
+ * @author Johan Wijnker <johan@wijnker.eu>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -353,3 +354,5 @@ $lang['currentns']             = 'Huidige namespace';
 $lang['searchresult']          = 'Zoekresultaat';
 $lang['plainhtml']             = 'Alleen HTML';
 $lang['wikimarkup']            = 'Wiki Opmaak';
+$lang['page_nonexist_rev']     = 'Pagina bestaat niet bij %s. Het is vervolgens aangemaakt bij <a href="%s">%s</a>.';
+$lang['unable_to_parse_date']  = 'Begrijp het niet bij parameter "% s".';
diff --git a/lib/plugins/authldap/lang/nl/settings.php b/lib/plugins/authldap/lang/nl/settings.php
index 193d1a386..41fcce2cd 100644
--- a/lib/plugins/authldap/lang/nl/settings.php
+++ b/lib/plugins/authldap/lang/nl/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
  * @author Remon <no@email.local>
+ * @author Johan Wijnker <johan@wijnker.eu>
  */
 $lang['server']                = 'Je LDAP server. Of de servernaam (<code>localhost</code>) of de volledige URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'LDAP server poort als bij de entry hierboven geen volledige URL is opgegeven';
@@ -20,9 +21,14 @@ $lang['binddn']                = 'DN van een optionele bind gebruiker als anonie
 $lang['bindpw']                = 'Wachtwoord van bovenstaande gebruiker';
 $lang['userscope']             = 'Beperken scope van zoekfuncties voor gebruikers';
 $lang['groupscope']            = 'Beperken scope van zoekfuncties voor groepen';
+$lang['userkey']               = 'Attribuut aanduiding van de gebruikersnaam; moet consistent zijn met userfilter.';
 $lang['groupkey']              = 'Groepslidmaatschap van enig gebruikersattribuut (in plaats van standaard AD groepen), bijv. groep van afdeling of telefoonnummer';
+$lang['modPass']               = 'Kan het LDAP wachtwoord worden gewijzigd met DokuWiki?';
 $lang['debug']                 = 'Tonen van aanvullende debuginformatie bij fouten';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'gebruik standaard';
+$lang['referrals_o_0']         = 'volg verwijzing niet';
+$lang['referrals_o_1']         = 'volg verwijzing';
diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
index 194b4b3e1..3fed9f4a3 100644
--- a/lib/plugins/extension/lang/nl/lang.php
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -7,6 +7,7 @@
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
  * @author Johan Vervloet <johan.vervloet@gmail.com>
  * @author Mijndert <mijndert@mijndertstuij.nl>
+ * @author Johan Wijnker <johan@wijnker.eu>
  */
 $lang['menu']                  = 'Uitbreidingen';
 $lang['tab_plugins']           = 'Geïnstalleerde Plugins';
@@ -87,6 +88,8 @@ $lang['noperms']               = 'Uitbreidings directory is niet schrijfbaar';
 $lang['notplperms']            = 'Template directory is niet schrijfbaar';
 $lang['nopluginperms']         = 'Plugin directory is niet schrijfbaar';
 $lang['git']                   = 'De uitbreiding werd geïnstalleerd via git, u wilt deze hier wellicht niet aanpassen.';
+$lang['auth']                  = 'Deze auth plugin is niet geactiveerd in de configuratie, overweeg het om uit te schakelen.';
 $lang['install_url']           = 'Installeer vanaf URL:';
 $lang['install_upload']        = 'Upload Uitbreiding:';
 $lang['repo_error']            = 'Er kon geen verbinding worden gemaakt met de centrale plugin opslag. Controleer of de server verbinding mag maken met www.dokuwiki.org en controleer de proxy instellingen.';
+$lang['nossl']                 = 'Je PHP mist SSL ondersteuning. Downloaden werkt niet met veel DokuWiki extensies.';
-- 
cgit v1.2.3


From db9faf025cf129d15a086a803e8056e977975d76 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Wed, 6 May 2015 01:30:59 -0400
Subject: Report more meaningful errors when an auth backend fails. closes
 #1093

---
 inc/auth.php                                    | 25 ++++++++++---------
 inc/lang/en/lang.php                            |  2 ++
 lib/plugins/authplain/auth.php                  | 33 +++++++++++++++----------
 lib/plugins/authplain/lang/af/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ar/lang.php          |  6 +++++
 lib/plugins/authplain/lang/az/lang.php          |  6 +++++
 lib/plugins/authplain/lang/bg/lang.php          |  6 +++++
 lib/plugins/authplain/lang/bn/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ca-valencia/lang.php |  6 +++++
 lib/plugins/authplain/lang/ca/lang.php          |  6 +++++
 lib/plugins/authplain/lang/cs/lang.php          |  6 +++++
 lib/plugins/authplain/lang/da/lang.php          |  6 +++++
 lib/plugins/authplain/lang/de-informal/lang.php |  6 +++++
 lib/plugins/authplain/lang/de/lang.php          |  6 +++++
 lib/plugins/authplain/lang/el/lang.php          |  6 +++++
 lib/plugins/authplain/lang/en/lang.php          |  8 ++++++
 lib/plugins/authplain/lang/eo/lang.php          |  6 +++++
 lib/plugins/authplain/lang/es/lang.php          |  6 +++++
 lib/plugins/authplain/lang/et/lang.php          |  6 +++++
 lib/plugins/authplain/lang/eu/lang.php          |  6 +++++
 lib/plugins/authplain/lang/fa/lang.php          |  6 +++++
 lib/plugins/authplain/lang/fi/lang.php          |  6 +++++
 lib/plugins/authplain/lang/fo/lang.php          |  6 +++++
 lib/plugins/authplain/lang/fr/lang.php          |  6 +++++
 lib/plugins/authplain/lang/gl/lang.php          |  6 +++++
 lib/plugins/authplain/lang/he/lang.php          |  6 +++++
 lib/plugins/authplain/lang/hr/lang.php          |  6 +++++
 lib/plugins/authplain/lang/hu/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ia/lang.php          |  6 +++++
 lib/plugins/authplain/lang/id-ni/lang.php       |  6 +++++
 lib/plugins/authplain/lang/id/lang.php          |  6 +++++
 lib/plugins/authplain/lang/is/lang.php          |  6 +++++
 lib/plugins/authplain/lang/it/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ja/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ka/lang.php          |  6 +++++
 lib/plugins/authplain/lang/kk/lang.php          |  6 +++++
 lib/plugins/authplain/lang/km/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ko/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ku/lang.php          |  6 +++++
 lib/plugins/authplain/lang/la/lang.php          |  6 +++++
 lib/plugins/authplain/lang/lb/lang.php          |  6 +++++
 lib/plugins/authplain/lang/lt/lang.php          |  6 +++++
 lib/plugins/authplain/lang/lv/lang.php          |  6 +++++
 lib/plugins/authplain/lang/mg/lang.php          |  6 +++++
 lib/plugins/authplain/lang/mk/lang.php          |  6 +++++
 lib/plugins/authplain/lang/mr/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ms/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ne/lang.php          |  6 +++++
 lib/plugins/authplain/lang/nl/lang.php          |  6 +++++
 lib/plugins/authplain/lang/no/lang.php          |  6 +++++
 lib/plugins/authplain/lang/pl/lang.php          |  6 +++++
 lib/plugins/authplain/lang/pt-br/lang.php       |  6 +++++
 lib/plugins/authplain/lang/pt/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ro/lang.php          |  6 +++++
 lib/plugins/authplain/lang/ru/lang.php          |  6 +++++
 lib/plugins/authplain/lang/sk/lang.php          |  6 +++++
 lib/plugins/authplain/lang/sl/lang.php          |  6 +++++
 lib/plugins/authplain/lang/sq/lang.php          |  6 +++++
 lib/plugins/authplain/lang/sr/lang.php          |  6 +++++
 lib/plugins/authplain/lang/sv/lang.php          |  6 +++++
 lib/plugins/authplain/lang/th/lang.php          |  6 +++++
 lib/plugins/authplain/lang/tr/lang.php          |  6 +++++
 lib/plugins/authplain/lang/uk/lang.php          |  6 +++++
 lib/plugins/authplain/lang/vi/lang.php          |  6 +++++
 lib/plugins/authplain/lang/zh-tw/lang.php       |  6 +++++
 lib/plugins/authplain/lang/zh/lang.php          |  6 +++++
 66 files changed, 415 insertions(+), 25 deletions(-)
 create mode 100644 lib/plugins/authplain/lang/af/lang.php
 create mode 100644 lib/plugins/authplain/lang/ar/lang.php
 create mode 100644 lib/plugins/authplain/lang/az/lang.php
 create mode 100644 lib/plugins/authplain/lang/bg/lang.php
 create mode 100644 lib/plugins/authplain/lang/bn/lang.php
 create mode 100644 lib/plugins/authplain/lang/ca-valencia/lang.php
 create mode 100644 lib/plugins/authplain/lang/ca/lang.php
 create mode 100644 lib/plugins/authplain/lang/cs/lang.php
 create mode 100644 lib/plugins/authplain/lang/da/lang.php
 create mode 100644 lib/plugins/authplain/lang/de-informal/lang.php
 create mode 100644 lib/plugins/authplain/lang/de/lang.php
 create mode 100644 lib/plugins/authplain/lang/el/lang.php
 create mode 100644 lib/plugins/authplain/lang/en/lang.php
 create mode 100644 lib/plugins/authplain/lang/eo/lang.php
 create mode 100644 lib/plugins/authplain/lang/es/lang.php
 create mode 100644 lib/plugins/authplain/lang/et/lang.php
 create mode 100644 lib/plugins/authplain/lang/eu/lang.php
 create mode 100644 lib/plugins/authplain/lang/fa/lang.php
 create mode 100644 lib/plugins/authplain/lang/fi/lang.php
 create mode 100644 lib/plugins/authplain/lang/fo/lang.php
 create mode 100644 lib/plugins/authplain/lang/fr/lang.php
 create mode 100644 lib/plugins/authplain/lang/gl/lang.php
 create mode 100644 lib/plugins/authplain/lang/he/lang.php
 create mode 100644 lib/plugins/authplain/lang/hr/lang.php
 create mode 100644 lib/plugins/authplain/lang/hu/lang.php
 create mode 100644 lib/plugins/authplain/lang/ia/lang.php
 create mode 100644 lib/plugins/authplain/lang/id-ni/lang.php
 create mode 100644 lib/plugins/authplain/lang/id/lang.php
 create mode 100644 lib/plugins/authplain/lang/is/lang.php
 create mode 100644 lib/plugins/authplain/lang/it/lang.php
 create mode 100644 lib/plugins/authplain/lang/ja/lang.php
 create mode 100644 lib/plugins/authplain/lang/ka/lang.php
 create mode 100644 lib/plugins/authplain/lang/kk/lang.php
 create mode 100644 lib/plugins/authplain/lang/km/lang.php
 create mode 100644 lib/plugins/authplain/lang/ko/lang.php
 create mode 100644 lib/plugins/authplain/lang/ku/lang.php
 create mode 100644 lib/plugins/authplain/lang/la/lang.php
 create mode 100644 lib/plugins/authplain/lang/lb/lang.php
 create mode 100644 lib/plugins/authplain/lang/lt/lang.php
 create mode 100644 lib/plugins/authplain/lang/lv/lang.php
 create mode 100644 lib/plugins/authplain/lang/mg/lang.php
 create mode 100644 lib/plugins/authplain/lang/mk/lang.php
 create mode 100644 lib/plugins/authplain/lang/mr/lang.php
 create mode 100644 lib/plugins/authplain/lang/ms/lang.php
 create mode 100644 lib/plugins/authplain/lang/ne/lang.php
 create mode 100644 lib/plugins/authplain/lang/nl/lang.php
 create mode 100644 lib/plugins/authplain/lang/no/lang.php
 create mode 100644 lib/plugins/authplain/lang/pl/lang.php
 create mode 100644 lib/plugins/authplain/lang/pt-br/lang.php
 create mode 100644 lib/plugins/authplain/lang/pt/lang.php
 create mode 100644 lib/plugins/authplain/lang/ro/lang.php
 create mode 100644 lib/plugins/authplain/lang/ru/lang.php
 create mode 100644 lib/plugins/authplain/lang/sk/lang.php
 create mode 100644 lib/plugins/authplain/lang/sl/lang.php
 create mode 100644 lib/plugins/authplain/lang/sq/lang.php
 create mode 100644 lib/plugins/authplain/lang/sr/lang.php
 create mode 100644 lib/plugins/authplain/lang/sv/lang.php
 create mode 100644 lib/plugins/authplain/lang/th/lang.php
 create mode 100644 lib/plugins/authplain/lang/tr/lang.php
 create mode 100644 lib/plugins/authplain/lang/uk/lang.php
 create mode 100644 lib/plugins/authplain/lang/vi/lang.php
 create mode 100644 lib/plugins/authplain/lang/zh-tw/lang.php
 create mode 100644 lib/plugins/authplain/lang/zh/lang.php

diff --git a/inc/auth.php b/inc/auth.php
index 17923ba2a..dd0fc35b3 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -1006,7 +1006,7 @@ function register() {
 
     //okay try to create the user
     if(!$auth->triggerUserMod('create', array($login, $pass, $fullname, $email))) {
-        msg($lang['reguexists'], -1);
+        msg($lang['regfail'], -1);
         return false;
     }
 
@@ -1098,17 +1098,18 @@ function updateprofile() {
         }
     }
 
-    if($result = $auth->triggerUserMod('modify', array($INPUT->server->str('REMOTE_USER'), &$changes))) {
-        // update cookie and session with the changed data
-        if($changes['pass']) {
-            list( /*user*/, $sticky, /*pass*/) = auth_getCookie();
-            $pass = auth_encrypt($changes['pass'], auth_cookiesalt(!$sticky, true));
-            auth_setCookie($INPUT->server->str('REMOTE_USER'), $pass, (bool) $sticky);
-        }
-        return true;
+    if(!($result = $auth->triggerUserMod('modify', array($INPUT->server->str('REMOTE_USER'), &$changes)))) {
+        msg($lang['proffail'], -1);
+        return false;
     }
 
-    return false;
+    // update cookie and session with the changed data
+    if($changes['pass']) {
+        list( /*user*/, $sticky, /*pass*/) = auth_getCookie();
+        $pass = auth_encrypt($changes['pass'], auth_cookiesalt(!$sticky, true));
+        auth_setCookie($INPUT->server->str('REMOTE_USER'), $pass, (bool) $sticky);
+    }
+    return true;
 }
 
 /**
@@ -1221,7 +1222,7 @@ function act_resendpwd() {
 
             // change it
             if(!$auth->triggerUserMod('modify', array($user, array('pass' => $pass)))) {
-                msg('error modifying user data', -1);
+                msg($lang['proffail'], -1);
                 return false;
             }
 
@@ -1229,7 +1230,7 @@ function act_resendpwd() {
 
             $pass = auth_pwgen($user);
             if(!$auth->triggerUserMod('modify', array($user, array('pass' => $pass)))) {
-                msg('error modifying user data', -1);
+                msg($lang['proffail'], -1);
                 return false;
             }
 
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 3f11a1ee4..2bbf61000 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -75,6 +75,7 @@ $lang['regmissing']            = 'Sorry, you must fill in all fields.';
 $lang['reguexists']            = 'Sorry, a user with this login already exists.';
 $lang['regsuccess']            = 'The user has been created and the password was sent by email.';
 $lang['regsuccess2']           = 'The user has been created.';
+$lang['regfail']               = 'The user could not be created.';
 $lang['regmailfail']           = 'Looks like there was an error on sending the password mail. Please contact the admin!';
 $lang['regbadmail']            = 'The given email address looks invalid - if you think this is an error, contact the admin';
 $lang['regbadpass']            = 'The two given passwords are not identical, please try again.';
@@ -90,6 +91,7 @@ $lang['profdeleteuser']        = 'Delete Account';
 $lang['profdeleted']           = 'Your user account has been deleted from this wiki';
 $lang['profconfdelete']        = 'I wish to remove my account from this wiki. <br/> This action can not be undone.';
 $lang['profconfdeletemissing'] = 'Confirmation check box not ticked';
+$lang['proffail']              = 'User profile was not updated.';
 
 $lang['pwdforget']             = 'Forgotten your password? Get a new one';
 $lang['resendna']              = 'This wiki does not support password resending.';
diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php
index b31c02fc8..bd46c61a7 100644
--- a/lib/plugins/authplain/auth.php
+++ b/lib/plugins/authplain/auth.php
@@ -134,7 +134,10 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
         global $config_cascade;
 
         // user mustn't already exist
-        if($this->getUserData($user) !== false) return false;
+        if($this->getUserData($user) !== false) {
+            msg($this->getLang('userexists'), -1);
+            return false;
+        }
 
         $pass = auth_cryptPassword($pwd);
 
@@ -144,16 +147,13 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
         // prepare user line
         $userline = $this->_createUserLine($user, $pass, $name, $mail, $grps);
 
-        if(io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) {
-            $this->users[$user] = compact('pass', 'name', 'mail', 'grps');
-            return $pwd;
+        if(!io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) {
+            msg($this->getLang('writefail'), -1);
+            return null;
         }
 
-        msg(
-            'The '.$config_cascade['plainauth.users']['default'].
-                ' file is not writable. Please inform the Wiki-Admin', -1
-        );
-        return null;
+        $this->users[$user] = compact('pass', 'name', 'mail', 'grps');
+        return $pwd;
     }
 
     /**
@@ -169,7 +169,10 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
         global $config_cascade;
 
         // sanity checks, user must already exist and there must be something to change
-        if(($userinfo = $this->getUserData($user)) === false) return false;
+        if(($userinfo = $this->getUserData($user)) === false) {
+            msg($this->getLang('usernotexists'), -1);
+            return false;
+        }
         if(!is_array($changes) || !count($changes)) return true;
 
         // update userinfo with new data, remembering to encrypt any password
@@ -186,13 +189,14 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
         $userline = $this->_createUserLine($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $userinfo['grps']);
 
         if(!$this->deleteUsers(array($user))) {
-            msg('Unable to modify user data. Please inform the Wiki-Admin', -1);
+            msg($this->getLang('writefail'), -1);
             return false;
         }
 
         if(!io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) {
             msg('There was an error modifying your user data. You should register again.', -1);
             // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page
+            // Should replace the delete/save hybrid modify with an atomic io_replaceInFile
             $ACT = 'register';
             return false;
         }
@@ -223,7 +227,10 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
         if(empty($deleted)) return 0;
 
         $pattern = '/^('.join('|', $deleted).'):/';
-        io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true);
+        if (!io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true)) {
+            msg($this->getLang('writefail'), -1);
+            return 0;
+        }
 
         // reload the user list and count the difference
         $count = count($this->users);
@@ -407,4 +414,4 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
             $this->_pattern[$item] = '/'.str_replace('/', '\/', $pattern).'/i'; // allow regex characters
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/plugins/authplain/lang/af/lang.php b/lib/plugins/authplain/lang/af/lang.php
new file mode 100644
index 000000000..29742cfd2
--- /dev/null
+++ b/lib/plugins/authplain/lang/af/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Die gebruikersnaam wat jy gebruik het, is alreeds gebruik. Kies asseblief \'n ander gebruikersnaam.';
diff --git a/lib/plugins/authplain/lang/ar/lang.php b/lib/plugins/authplain/lang/ar/lang.php
new file mode 100644
index 000000000..16d59f397
--- /dev/null
+++ b/lib/plugins/authplain/lang/ar/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'عذرا، يوجد مشترك بنفس الاسم.';
diff --git a/lib/plugins/authplain/lang/az/lang.php b/lib/plugins/authplain/lang/az/lang.php
new file mode 100644
index 000000000..f98eccde1
--- /dev/null
+++ b/lib/plugins/authplain/lang/az/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Təssüf ki bu ad ilə istifadəçi artıq mövcuddur.';
diff --git a/lib/plugins/authplain/lang/bg/lang.php b/lib/plugins/authplain/lang/bg/lang.php
new file mode 100644
index 000000000..5b8e6bc37
--- /dev/null
+++ b/lib/plugins/authplain/lang/bg/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Вече съществува потребител с избраното име.';
diff --git a/lib/plugins/authplain/lang/bn/lang.php b/lib/plugins/authplain/lang/bn/lang.php
new file mode 100644
index 000000000..43fe4ca6e
--- /dev/null
+++ b/lib/plugins/authplain/lang/bn/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'দুঃখিত, এই লগইন সঙ্গে একটি ব্যবহারকারী ইতিমধ্যেই বিদ্যমান.';
diff --git a/lib/plugins/authplain/lang/ca-valencia/lang.php b/lib/plugins/authplain/lang/ca-valencia/lang.php
new file mode 100644
index 000000000..3e973beae
--- /dev/null
+++ b/lib/plugins/authplain/lang/ca-valencia/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Disculpe, pero ya existix un usuari en este nom.';
diff --git a/lib/plugins/authplain/lang/ca/lang.php b/lib/plugins/authplain/lang/ca/lang.php
new file mode 100644
index 000000000..5a675639d
--- /dev/null
+++ b/lib/plugins/authplain/lang/ca/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Ja existeix un altre usuari amb aquest nom.';
diff --git a/lib/plugins/authplain/lang/cs/lang.php b/lib/plugins/authplain/lang/cs/lang.php
new file mode 100644
index 000000000..8128d45a3
--- /dev/null
+++ b/lib/plugins/authplain/lang/cs/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Uživatel se stejným jménem už je zaregistrován.';
diff --git a/lib/plugins/authplain/lang/da/lang.php b/lib/plugins/authplain/lang/da/lang.php
new file mode 100644
index 000000000..c7dd376c1
--- /dev/null
+++ b/lib/plugins/authplain/lang/da/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Dette brugernavn er allerede i brug.';
diff --git a/lib/plugins/authplain/lang/de-informal/lang.php b/lib/plugins/authplain/lang/de-informal/lang.php
new file mode 100644
index 000000000..f1d484947
--- /dev/null
+++ b/lib/plugins/authplain/lang/de-informal/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Der Benutzername existiert leider schon.';
diff --git a/lib/plugins/authplain/lang/de/lang.php b/lib/plugins/authplain/lang/de/lang.php
new file mode 100644
index 000000000..f1d484947
--- /dev/null
+++ b/lib/plugins/authplain/lang/de/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Der Benutzername existiert leider schon.';
diff --git a/lib/plugins/authplain/lang/el/lang.php b/lib/plugins/authplain/lang/el/lang.php
new file mode 100644
index 000000000..7f7e4e76d
--- /dev/null
+++ b/lib/plugins/authplain/lang/el/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Αυτός ο λογαριασμός υπάρχει ήδη.';
diff --git a/lib/plugins/authplain/lang/en/lang.php b/lib/plugins/authplain/lang/en/lang.php
new file mode 100644
index 000000000..6f8abfdb6
--- /dev/null
+++ b/lib/plugins/authplain/lang/en/lang.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Sorry, a user with this login already exists.';
+$lang['usernotexists']  = 'Sorry, that user doesn\'t exist.';
+$lang['writefail']      = 'Unable to modify user data. Please inform the Wiki-Admin';
diff --git a/lib/plugins/authplain/lang/eo/lang.php b/lib/plugins/authplain/lang/eo/lang.php
new file mode 100644
index 000000000..ab7655e81
--- /dev/null
+++ b/lib/plugins/authplain/lang/eo/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Pardonu, ĉi tiu uzanto-nomo jam ekzistas.';
diff --git a/lib/plugins/authplain/lang/es/lang.php b/lib/plugins/authplain/lang/es/lang.php
new file mode 100644
index 000000000..8f03e79cb
--- /dev/null
+++ b/lib/plugins/authplain/lang/es/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Lo siento, ya existe un usuario con este nombre.';
diff --git a/lib/plugins/authplain/lang/et/lang.php b/lib/plugins/authplain/lang/et/lang.php
new file mode 100644
index 000000000..7f9f7771b
--- /dev/null
+++ b/lib/plugins/authplain/lang/et/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Tegelikult on sellise nimega kasutaja juba olemas.';
diff --git a/lib/plugins/authplain/lang/eu/lang.php b/lib/plugins/authplain/lang/eu/lang.php
new file mode 100644
index 000000000..09ca4d3b7
--- /dev/null
+++ b/lib/plugins/authplain/lang/eu/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Barkatu, izen bereko erabiltzailea existitzen da.';
diff --git a/lib/plugins/authplain/lang/fa/lang.php b/lib/plugins/authplain/lang/fa/lang.php
new file mode 100644
index 000000000..49083ad60
--- /dev/null
+++ b/lib/plugins/authplain/lang/fa/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'نام کاربری‌ای که وارد کردید قبلن استفاده شده است. خواهشمندیم یک نام دیگر انتخاب کنید.';
diff --git a/lib/plugins/authplain/lang/fi/lang.php b/lib/plugins/authplain/lang/fi/lang.php
new file mode 100644
index 000000000..3a77f3e3a
--- /dev/null
+++ b/lib/plugins/authplain/lang/fi/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Käyttäjä tällä käyttäjänimellä on jo olemassa.';
diff --git a/lib/plugins/authplain/lang/fo/lang.php b/lib/plugins/authplain/lang/fo/lang.php
new file mode 100644
index 000000000..a9654664b
--- /dev/null
+++ b/lib/plugins/authplain/lang/fo/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Hetta brúkaranavn er upptiki.';
diff --git a/lib/plugins/authplain/lang/fr/lang.php b/lib/plugins/authplain/lang/fr/lang.php
new file mode 100644
index 000000000..9316836e4
--- /dev/null
+++ b/lib/plugins/authplain/lang/fr/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Désolé, ce nom d\'utilisateur est déjà pris.';
diff --git a/lib/plugins/authplain/lang/gl/lang.php b/lib/plugins/authplain/lang/gl/lang.php
new file mode 100644
index 000000000..35138d378
--- /dev/null
+++ b/lib/plugins/authplain/lang/gl/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Sentímolo, mais xa existe un usuario con ese nome.';
diff --git a/lib/plugins/authplain/lang/he/lang.php b/lib/plugins/authplain/lang/he/lang.php
new file mode 100644
index 000000000..01d877b62
--- /dev/null
+++ b/lib/plugins/authplain/lang/he/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'משתמש בשם זה כבר נרשם, עמך הסליחה.';
diff --git a/lib/plugins/authplain/lang/hr/lang.php b/lib/plugins/authplain/lang/hr/lang.php
new file mode 100644
index 000000000..ffcbf5f61
--- /dev/null
+++ b/lib/plugins/authplain/lang/hr/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Korisnik s tim korisničkim imenom već postoji.';
diff --git a/lib/plugins/authplain/lang/hu/lang.php b/lib/plugins/authplain/lang/hu/lang.php
new file mode 100644
index 000000000..6de5db772
--- /dev/null
+++ b/lib/plugins/authplain/lang/hu/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Sajnáljuk, ilyen azonosítójú felhasználónk már van.';
diff --git a/lib/plugins/authplain/lang/ia/lang.php b/lib/plugins/authplain/lang/ia/lang.php
new file mode 100644
index 000000000..7596f3f4c
--- /dev/null
+++ b/lib/plugins/authplain/lang/ia/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Regrettabilemente, un usator con iste nomine ja existe.';
diff --git a/lib/plugins/authplain/lang/id-ni/lang.php b/lib/plugins/authplain/lang/id-ni/lang.php
new file mode 100644
index 000000000..729c9f9dc
--- /dev/null
+++ b/lib/plugins/authplain/lang/id-ni/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Bologö dödöu, no so zangoguna\'ö töi da\'a.';
diff --git a/lib/plugins/authplain/lang/id/lang.php b/lib/plugins/authplain/lang/id/lang.php
new file mode 100644
index 000000000..5e6a99830
--- /dev/null
+++ b/lib/plugins/authplain/lang/id/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Maaf, user dengan user login ini telah ada.';
diff --git a/lib/plugins/authplain/lang/is/lang.php b/lib/plugins/authplain/lang/is/lang.php
new file mode 100644
index 000000000..21392ee5e
--- /dev/null
+++ b/lib/plugins/authplain/lang/is/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Afsakið, notandi með þessu nafni er þegar skráður inn.';
diff --git a/lib/plugins/authplain/lang/it/lang.php b/lib/plugins/authplain/lang/it/lang.php
new file mode 100644
index 000000000..716041ffb
--- /dev/null
+++ b/lib/plugins/authplain/lang/it/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Il nome utente inserito esiste già.';
diff --git a/lib/plugins/authplain/lang/ja/lang.php b/lib/plugins/authplain/lang/ja/lang.php
new file mode 100644
index 000000000..aad08a8bd
--- /dev/null
+++ b/lib/plugins/authplain/lang/ja/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'このユーザー名は既に存在しています。';
diff --git a/lib/plugins/authplain/lang/ka/lang.php b/lib/plugins/authplain/lang/ka/lang.php
new file mode 100644
index 000000000..8983791c9
--- /dev/null
+++ b/lib/plugins/authplain/lang/ka/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'მსგავსი ლოგინი უკვე არსებობს';
diff --git a/lib/plugins/authplain/lang/kk/lang.php b/lib/plugins/authplain/lang/kk/lang.php
new file mode 100644
index 000000000..95fe53204
--- /dev/null
+++ b/lib/plugins/authplain/lang/kk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Кешіріңіз, бұл түпнұскамен де пайдаланушы бар.';
diff --git a/lib/plugins/authplain/lang/km/lang.php b/lib/plugins/authplain/lang/km/lang.php
new file mode 100644
index 000000000..322e454e5
--- /dev/null
+++ b/lib/plugins/authplain/lang/km/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'សុំអាទោស​ នាមប្រើនេះមានរួចហើ។';
diff --git a/lib/plugins/authplain/lang/ko/lang.php b/lib/plugins/authplain/lang/ko/lang.php
new file mode 100644
index 000000000..de5a7c02f
--- /dev/null
+++ b/lib/plugins/authplain/lang/ko/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.';
diff --git a/lib/plugins/authplain/lang/ku/lang.php b/lib/plugins/authplain/lang/ku/lang.php
new file mode 100644
index 000000000..64cb834f3
--- /dev/null
+++ b/lib/plugins/authplain/lang/ku/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Sorry, a user with this login already exists.';
diff --git a/lib/plugins/authplain/lang/la/lang.php b/lib/plugins/authplain/lang/la/lang.php
new file mode 100644
index 000000000..5f2eecfd8
--- /dev/null
+++ b/lib/plugins/authplain/lang/la/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Nomen Sodalis ab aliquo iam elegitur.';
diff --git a/lib/plugins/authplain/lang/lb/lang.php b/lib/plugins/authplain/lang/lb/lang.php
new file mode 100644
index 000000000..4c760dfe4
--- /dev/null
+++ b/lib/plugins/authplain/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Et get schonn e Benotzer mat deem Numm.';
diff --git a/lib/plugins/authplain/lang/lt/lang.php b/lib/plugins/authplain/lang/lt/lang.php
new file mode 100644
index 000000000..5ad435a04
--- /dev/null
+++ b/lib/plugins/authplain/lang/lt/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Vartotojas su pasirinktu prisijungimo vardu jau egzistuoja.';
diff --git a/lib/plugins/authplain/lang/lv/lang.php b/lib/plugins/authplain/lang/lv/lang.php
new file mode 100644
index 000000000..3a9d4d3e5
--- /dev/null
+++ b/lib/plugins/authplain/lang/lv/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Atvaino, tāds lietotājs jau ir.';
diff --git a/lib/plugins/authplain/lang/mg/lang.php b/lib/plugins/authplain/lang/mg/lang.php
new file mode 100644
index 000000000..8472161b7
--- /dev/null
+++ b/lib/plugins/authplain/lang/mg/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Indrisy fa efa nisy namandrika io anarana io.';
diff --git a/lib/plugins/authplain/lang/mk/lang.php b/lib/plugins/authplain/lang/mk/lang.php
new file mode 100644
index 000000000..8ebb9fab8
--- /dev/null
+++ b/lib/plugins/authplain/lang/mk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Жалам, корисник со ова корисничко име веќе постои.';
diff --git a/lib/plugins/authplain/lang/mr/lang.php b/lib/plugins/authplain/lang/mr/lang.php
new file mode 100644
index 000000000..15dcf18a0
--- /dev/null
+++ b/lib/plugins/authplain/lang/mr/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'या नावाने सदस्याची नोंदणी झालेली आहे, कृपया दुसरे सदस्य नाव निवडा.';
diff --git a/lib/plugins/authplain/lang/ms/lang.php b/lib/plugins/authplain/lang/ms/lang.php
new file mode 100644
index 000000000..14c3b11af
--- /dev/null
+++ b/lib/plugins/authplain/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Maaf, nama pengguna yang dimasukkan telah diguna. Sila pilih nama yang lain.';
diff --git a/lib/plugins/authplain/lang/ne/lang.php b/lib/plugins/authplain/lang/ne/lang.php
new file mode 100644
index 000000000..942757855
--- /dev/null
+++ b/lib/plugins/authplain/lang/ne/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'यो नामको प्रयोगकर्ता पहिले देखि रहेको छ।';
diff --git a/lib/plugins/authplain/lang/nl/lang.php b/lib/plugins/authplain/lang/nl/lang.php
new file mode 100644
index 000000000..1a5397234
--- /dev/null
+++ b/lib/plugins/authplain/lang/nl/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Er bestaat al een gebruiker met deze loginnaam.';
diff --git a/lib/plugins/authplain/lang/no/lang.php b/lib/plugins/authplain/lang/no/lang.php
new file mode 100644
index 000000000..981881369
--- /dev/null
+++ b/lib/plugins/authplain/lang/no/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Det finnes allerede en konto med dette brukernavnet.';
diff --git a/lib/plugins/authplain/lang/pl/lang.php b/lib/plugins/authplain/lang/pl/lang.php
new file mode 100644
index 000000000..9a61b0047
--- /dev/null
+++ b/lib/plugins/authplain/lang/pl/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Użytkownik o tej nazwie już istnieje.';
diff --git a/lib/plugins/authplain/lang/pt-br/lang.php b/lib/plugins/authplain/lang/pt-br/lang.php
new file mode 100644
index 000000000..3a9b67218
--- /dev/null
+++ b/lib/plugins/authplain/lang/pt-br/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Desculpe, mas já existe um usuário com esse nome.';
diff --git a/lib/plugins/authplain/lang/pt/lang.php b/lib/plugins/authplain/lang/pt/lang.php
new file mode 100644
index 000000000..c49649d4e
--- /dev/null
+++ b/lib/plugins/authplain/lang/pt/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
diff --git a/lib/plugins/authplain/lang/ro/lang.php b/lib/plugins/authplain/lang/ro/lang.php
new file mode 100644
index 000000000..eb243a12f
--- /dev/null
+++ b/lib/plugins/authplain/lang/ro/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Ne pare rău, un utilizator cu acest nume este deja autentificat.';
diff --git a/lib/plugins/authplain/lang/ru/lang.php b/lib/plugins/authplain/lang/ru/lang.php
new file mode 100644
index 000000000..8a40852d6
--- /dev/null
+++ b/lib/plugins/authplain/lang/ru/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Извините, пользователь с таким логином уже существует.';
diff --git a/lib/plugins/authplain/lang/sk/lang.php b/lib/plugins/authplain/lang/sk/lang.php
new file mode 100644
index 000000000..5153fc1c9
--- /dev/null
+++ b/lib/plugins/authplain/lang/sk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Užívateľ s rovnakým menom je už zaregistrovaný.';
diff --git a/lib/plugins/authplain/lang/sl/lang.php b/lib/plugins/authplain/lang/sl/lang.php
new file mode 100644
index 000000000..d4ee30fda
--- /dev/null
+++ b/lib/plugins/authplain/lang/sl/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Uporabnik s tem imenom že obstaja.';
diff --git a/lib/plugins/authplain/lang/sq/lang.php b/lib/plugins/authplain/lang/sq/lang.php
new file mode 100644
index 000000000..e3a93502f
--- /dev/null
+++ b/lib/plugins/authplain/lang/sq/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Na vjen keq, ekziston një përdorues tjetër me të njëjtin emër.';
diff --git a/lib/plugins/authplain/lang/sr/lang.php b/lib/plugins/authplain/lang/sr/lang.php
new file mode 100644
index 000000000..2d85ca42a
--- /dev/null
+++ b/lib/plugins/authplain/lang/sr/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Извините, корисник са истим именом већ постоји.';
diff --git a/lib/plugins/authplain/lang/sv/lang.php b/lib/plugins/authplain/lang/sv/lang.php
new file mode 100644
index 000000000..fb80df956
--- /dev/null
+++ b/lib/plugins/authplain/lang/sv/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Det finns redan en användare med det användarnamnet.';
diff --git a/lib/plugins/authplain/lang/th/lang.php b/lib/plugins/authplain/lang/th/lang.php
new file mode 100644
index 000000000..c7aaf68dd
--- /dev/null
+++ b/lib/plugins/authplain/lang/th/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'ชื่อบัญชีที่ใส่นั้นมีผู้อื่นได้ใช้แล้ว กรุณาเลือกชื่อผู้ใช้อื่น';
diff --git a/lib/plugins/authplain/lang/tr/lang.php b/lib/plugins/authplain/lang/tr/lang.php
new file mode 100644
index 000000000..d7064e8bf
--- /dev/null
+++ b/lib/plugins/authplain/lang/tr/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Üzgünüz, bu isime sahip bir kullanıcı zaten mevcut.';
diff --git a/lib/plugins/authplain/lang/uk/lang.php b/lib/plugins/authplain/lang/uk/lang.php
new file mode 100644
index 000000000..d8f0a32b2
--- /dev/null
+++ b/lib/plugins/authplain/lang/uk/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Користувач з таким іменем вже існує.';
diff --git a/lib/plugins/authplain/lang/vi/lang.php b/lib/plugins/authplain/lang/vi/lang.php
new file mode 100644
index 000000000..7ecb0a27c
--- /dev/null
+++ b/lib/plugins/authplain/lang/vi/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = 'Bạn khác đã dùng username này rồi.';
diff --git a/lib/plugins/authplain/lang/zh-tw/lang.php b/lib/plugins/authplain/lang/zh-tw/lang.php
new file mode 100644
index 000000000..8a5d290e5
--- /dev/null
+++ b/lib/plugins/authplain/lang/zh-tw/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = '很抱歉，有人已使用了這個帳號。';
diff --git a/lib/plugins/authplain/lang/zh/lang.php b/lib/plugins/authplain/lang/zh/lang.php
new file mode 100644
index 000000000..03542fe72
--- /dev/null
+++ b/lib/plugins/authplain/lang/zh/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['userexists']     = '对不起，该用户名已经存在。';
-- 
cgit v1.2.3


From 8f03c311f28eaffe92893ec1a4d0b78581926e13 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Wed, 6 May 2015 15:31:08 -0400
Subject: Error reporting for database auth plugins

---
 lib/plugins/authad/auth.php            |  8 ++++++--
 lib/plugins/authad/lang/en/lang.php    |  6 ++++--
 lib/plugins/authldap/auth.php          |  8 ++++----
 lib/plugins/authldap/lang/en/lang.php  | 11 +++++++++++
 lib/plugins/authmysql/auth.php         | 19 +++++++++++++++++--
 lib/plugins/authmysql/lang/en/lang.php | 13 +++++++++++++
 6 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/en/lang.php
 create mode 100644 lib/plugins/authmysql/lang/en/lang.php

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index 40c56ef09..60c68efc4 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -522,7 +522,10 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
     public function modifyUser($user, $changes) {
         $return = true;
         $adldap = $this->_adldap($this->_userDomain($user));
-        if(!$adldap) return false;
+        if(!$adldap) {
+            msg($this->getLang('connectfail'), -1);
+            return false;
+        }
 
         // password changing
         if(isset($changes['pass'])) {
@@ -532,7 +535,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
                 if ($this->conf['debug']) msg('AD Auth: '.$e->getMessage(), -1);
                 $return = false;
             }
-            if(!$return) msg('AD Auth: failed to change the password. Maybe the password policy was not met?', -1);
+            if(!$return) msg($this->getLang('passchangefail'), -1);
         }
 
         // changing user data
@@ -554,6 +557,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
                 if ($this->conf['debug']) msg('AD Auth: '.$e->getMessage(), -1);
                 $return = false;
             }
+            if(!$return) msg($this->getLang('userchangefail'), -1);
         }
 
         return $return;
diff --git a/lib/plugins/authad/lang/en/lang.php b/lib/plugins/authad/lang/en/lang.php
index 4f96a71fd..751aa9f47 100644
--- a/lib/plugins/authad/lang/en/lang.php
+++ b/lib/plugins/authad/lang/en/lang.php
@@ -6,7 +6,9 @@
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
 
-$lang['domain'] = 'Logon Domain';
-$lang['authpwdexpire']         = 'Your password will expire in %d days, you should change it soon.';
+$lang['domain']          = 'Logon Domain';
+$lang['authpwdexpire']   = 'Your password will expire in %d days, you should change it soon.';
+$lang['passchangefail']  = 'Failed to change the password. Maybe the password policy was not met?';
+$lang['connectfail']     = 'Failed to connect to Active Directory server.';
 
 //Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php
index 9d031c049..247a0fec2 100644
--- a/lib/plugins/authldap/auth.php
+++ b/lib/plugins/authldap/auth.php
@@ -281,14 +281,14 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
 
         // open the connection to the ldap
         if(!$this->_openLDAP()){
-            msg('LDAP cannot connect: '. htmlspecialchars(ldap_error($this->con)));
+            $this->_debug('LDAP cannot connect: '. htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
             return false;
         }
 
         // find the information about the user, in particular the "dn"
         $info = $this->getUserData($user,true);
         if(empty($info['dn'])) {
-            msg('LDAP cannot find your user dn');
+            $this->_debug('LDAP cannot find your user dn', 0, __LINE__, __FILE__);
             return false;
         }
         $dn = $info['dn'];
@@ -301,7 +301,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
 
             // bind with the ldap
             if(!@ldap_bind($this->con, $dn, $pass)){
-                msg('LDAP user bind failed: '. htmlspecialchars($dn) .': '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                $this->_debug('LDAP user bind failed: '. htmlspecialchars($dn) .': '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
                 return false;
             }
         } elseif ($this->getConf('binddn') && $this->getConf('bindpw')) {
@@ -322,7 +322,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
 
         // change the password
         if(!@ldap_mod_replace($this->con, $dn,array('userpassword' => $hash))){
-            msg('LDAP mod replace failed: '. htmlspecialchars($dn) .': '.htmlspecialchars(ldap_error($this->con)));
+            $this->_debug('LDAP mod replace failed: '. htmlspecialchars($dn) .': '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
             return false;
         }
 
diff --git a/lib/plugins/authldap/lang/en/lang.php b/lib/plugins/authldap/lang/en/lang.php
new file mode 100644
index 000000000..db06efb4c
--- /dev/null
+++ b/lib/plugins/authldap/lang/en/lang.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * English language file for authldap plugin
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+
+$lang['connectfail']     = 'LDAP cannot connect: %s';
+$lang['domainfail'       = 'LDAP cannot find your user dn';
+
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/authmysql/auth.php b/lib/plugins/authmysql/auth.php
index 0d423b6c9..1b7d0bfa4 100644
--- a/lib/plugins/authmysql/auth.php
+++ b/lib/plugins/authmysql/auth.php
@@ -222,6 +222,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
 
         if($this->_openDB()) {
             if(($info = $this->_getUserInfo($user)) !== false) {
+                msg($this->getLang('userexists'), -1);
                 return false; // user already exists
             }
 
@@ -235,7 +236,13 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
             $rc  = $this->_addUser($user, $pwd, $name, $mail, $grps);
             $this->_unlockTables();
             $this->_closeDB();
-            if($rc) return true;
+            if(!$rc) {
+                msg($this->getLang('writefail'));
+                return null;
+            }
+            return true;
+        } else {
+            msg($this->getLang('connectfail'), -1);
         }
         return null; // return error
     }
@@ -279,7 +286,9 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
 
             $rc = $this->_updateUserInfo($user, $changes);
 
-            if($rc && isset($changes['grps']) && $this->cando['modGroups']) {
+            if(!$rc) {
+                msg($this->getLang('usernotexists'), -1);
+            } elseif(isset($changes['grps']) && $this->cando['modGroups']) {
                 $groups = $this->_getGroups($user);
                 $grpadd = array_diff($changes['grps'], $groups);
                 $grpdel = array_diff($groups, $changes['grps']);
@@ -295,10 +304,14 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
                         $rc = false;
                     }
                 }
+
+                if(!$rc) msg($this->getLang('writefail'));
             }
 
             $this->_unlockTables();
             $this->_closeDB();
+        } else {
+            msg($this->getLang('connectfail'), -1);
         }
         return $rc;
     }
@@ -328,6 +341,8 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
                 $this->_unlockTables();
             }
             $this->_closeDB();
+        } else {
+            msg($this->getLang('connectfail'), -1);
         }
         return $count;
     }
diff --git a/lib/plugins/authmysql/lang/en/lang.php b/lib/plugins/authmysql/lang/en/lang.php
new file mode 100644
index 000000000..8313616c6
--- /dev/null
+++ b/lib/plugins/authmysql/lang/en/lang.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * English language file for authmysql plugin
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+
+$lang['connectfail']    = 'Failed to connect to database.';
+$lang['userexists']     = 'Sorry, a user with this login already exists.';
+$lang['usernotexists']  = 'Sorry, that user doesn\'t exist.';
+$lang['writefail']      = 'Unable to modify user data. Please inform the Wiki-Admin';
+
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 99a5b03f106be4dd58ea09dd0613e4a496f9c06a Mon Sep 17 00:00:00 2001
From: TLed <tled@ledderboge.de>
Date: Wed, 6 May 2015 22:53:43 +0200
Subject: 2y is also used for bcryt

---
 inc/PassHash.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index 15f896dcf..0701c4116 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -50,7 +50,7 @@ class PassHash {
         } elseif(preg_match('/^md5\$(.{5})\$/', $hash, $m)) {
             $method = 'djangomd5';
             $salt   = $m[1];
-        } elseif(preg_match('/^\$2a\$(.{2})\$/', $hash, $m)) {
+        } elseif(preg_match('/^\$2(a|y)\$(.{2})\$/', $hash, $m)) {
             $method = 'bcrypt';
             $salt   = $hash;
         } elseif(substr($hash, 0, 6) == '{SSHA}') {
-- 
cgit v1.2.3


From 369075828e13e37a65a2f8062a74e89f98dd3fac Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Wed, 6 May 2015 18:21:17 -0400
Subject: Append to BZip2 files. Unit tests for writing files.

---
 _test/tests/inc/io_deletefromfile.test.php | 42 +++++++++++++++++++++++++
 _test/tests/inc/io_savefile.test.php       | 49 ++++++++++++++++++++++++++++++
 inc/io.php                                 | 11 ++++++-
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 _test/tests/inc/io_deletefromfile.test.php
 create mode 100644 _test/tests/inc/io_savefile.test.php

diff --git a/_test/tests/inc/io_deletefromfile.test.php b/_test/tests/inc/io_deletefromfile.test.php
new file mode 100644
index 000000000..361c82214
--- /dev/null
+++ b/_test/tests/inc/io_deletefromfile.test.php
@@ -0,0 +1,42 @@
+<?php
+
+class io_deletefromfile_test extends DokuWikiTest {
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_zlib() {
+        if (!extension_loaded('zlib')) {
+            $this->markTestSkipped('skipping all zlib tests.  Need zlib extension');
+        }
+    }
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_bz2() {
+        if (!extension_loaded('bz2')) {
+            $this->markTestSkipped('skipping all bzip2 tests.  Need bz2 extension');
+        }
+    }
+
+    function _write($file){
+        $contents = "The\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012";
+        io_saveFile($file, $contents);
+        $this->assertTrue(io_deleteFromFile($file, "Delete\012"));
+        $this->assertEquals("The\012Delete01\012Delete02\012DeleteX\012Test\012", io_readFile($file));
+        $this->assertTrue(io_deleteFromFile($file, "#Delete\\d+\012#", true));
+        $this->assertEquals("The\012DeleteX\012Test\012", io_readFile($file));
+    }
+
+    function test_delete(){
+        $this->_write(TMP_DIR.'/test.txt');
+    }
+
+//    /**
+//     * @depends test_ext_zlib
+//     */
+//    function test_gzwrite(){
+//    }
+
+}
diff --git a/_test/tests/inc/io_savefile.test.php b/_test/tests/inc/io_savefile.test.php
new file mode 100644
index 000000000..4a4d4671d
--- /dev/null
+++ b/_test/tests/inc/io_savefile.test.php
@@ -0,0 +1,49 @@
+<?php
+
+class io_savefile_test extends DokuWikiTest {
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_zlib() {
+        if (!extension_loaded('zlib')) {
+            $this->markTestSkipped('skipping all zlib tests.  Need zlib extension');
+        }
+    }
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_bz2() {
+        if (!extension_loaded('bz2')) {
+            $this->markTestSkipped('skipping all bzip2 tests.  Need bz2 extension');
+        }
+    }
+
+    function _write($file){
+        $contents = "The\012Write\012Test\012";
+        $this->assertTrue(io_saveFile($file, $contents));
+        $this->assertEquals($contents, io_readFile($file));
+        $this->assertTrue(io_saveFile($file, $contents, true));
+        $this->assertEquals($contents.$contents, io_readFile($file));
+    }
+
+    function test_write(){
+        $this->_write(TMP_DIR.'/test.txt');
+    }
+
+    /**
+     * @depends test_ext_zlib
+     */
+    function test_gzwrite(){
+        $this->_write(TMP_DIR.'/test.txt.gz');
+    }
+
+    /**
+     * @depends test_ext_bz2
+     */
+    function test_bzwrite(){
+        $this->_write(TMP_DIR.'/test.txt.bz2');
+    }
+
+}
diff --git a/inc/io.php b/inc/io.php
index 0636a4b62..8846b7e56 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -223,7 +223,16 @@ function io_saveFile($file,$content,$append=false){
         gzwrite($fh, $content);
         gzclose($fh);
     }else if(substr($file,-4) == '.bz2'){
-        $fh = @bzopen($file,$mode{0});
+        if($append) {
+            $bzcontent = bzfile($file);
+            if($bzcontent === false) {
+                msg("Writing $file failed", -1);
+                io_unlock($file);
+                return false;
+            }
+            $content = $bzcontent.$content;
+        }
+        $fh = @bzopen($file,'w');
         if(!$fh){
             msg("Writing $file failed", -1);
             io_unlock($file);
-- 
cgit v1.2.3


From cfb71e37ca8859c4ad9a1db73de0a293ffc7a902 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Wed, 6 May 2015 23:31:39 -0400
Subject: Deleting lines works with BZ2 files.

---
 _test/tests/inc/io_deletefromfile.test.php |  18 ++++++++++++-----
 _test/tests/inc/io_readfile.test.php       |   7 ++++++-
 _test/tests/inc/io_readfile/large.txt.bz2  | Bin 0 -> 47 bytes
 _test/tests/inc/io_readfile/long.txt.bz2   | Bin 0 -> 53 bytes
 inc/io.php                                 |  31 ++++++++++++++++++++++++++---
 5 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 _test/tests/inc/io_readfile/large.txt.bz2
 create mode 100644 _test/tests/inc/io_readfile/long.txt.bz2

diff --git a/_test/tests/inc/io_deletefromfile.test.php b/_test/tests/inc/io_deletefromfile.test.php
index 361c82214..63951f548 100644
--- a/_test/tests/inc/io_deletefromfile.test.php
+++ b/_test/tests/inc/io_deletefromfile.test.php
@@ -33,10 +33,18 @@ class io_deletefromfile_test extends DokuWikiTest {
         $this->_write(TMP_DIR.'/test.txt');
     }
 
-//    /**
-//     * @depends test_ext_zlib
-//     */
-//    function test_gzwrite(){
-//    }
+    /**
+     * @depends test_ext_zlib
+     */
+    function test_gzwrite(){
+        $this->_write(TMP_DIR.'/test.txt.gz');
+    }
+
+    /**
+     * @depends test_ext_bz2
+     */
+    function test_bzwrite(){
+        $this->_write(TMP_DIR.'/test.txt.bz2');
+    }
 
 }
diff --git a/_test/tests/inc/io_readfile.test.php b/_test/tests/inc/io_readfile.test.php
index e3e90cd8d..700c1902b 100644
--- a/_test/tests/inc/io_readfile.test.php
+++ b/_test/tests/inc/io_readfile.test.php
@@ -48,6 +48,11 @@ class io_readfile_test extends DokuWikiTest {
         $this->assertEquals("The\015\012Test\015\012", io_readFile(__DIR__.'/io_readfile/test.txt.bz2', false));
         $this->assertEquals(false, io_readFile(__DIR__.'/io_readfile/nope.txt.bz2'));
         $this->assertEquals(false, io_readFile(__DIR__.'/io_readfile/corrupt.txt.bz2'));
+        // internal bzfile function
+        $this->assertEquals(array("The\015\012","Test\015\012"), bzfile(__DIR__.'/io_readfile/test.txt.bz2', true));
+        $this->assertEquals(array_fill(0, 120, str_repeat('a', 80)."\012"), bzfile(__DIR__.'/io_readfile/large.txt.bz2', true));
+        $line = str_repeat('a', 8888)."\012";
+        $this->assertEquals(array($line,"\012",$line,"!"), bzfile(__DIR__.'/io_readfile/long.txt.bz2', true));
     }
 
-}
\ No newline at end of file
+}
diff --git a/_test/tests/inc/io_readfile/large.txt.bz2 b/_test/tests/inc/io_readfile/large.txt.bz2
new file mode 100644
index 000000000..3135435f8
Binary files /dev/null and b/_test/tests/inc/io_readfile/large.txt.bz2 differ
diff --git a/_test/tests/inc/io_readfile/long.txt.bz2 b/_test/tests/inc/io_readfile/long.txt.bz2
new file mode 100644
index 000000000..fb40759e6
Binary files /dev/null and b/_test/tests/inc/io_readfile/long.txt.bz2 differ
diff --git a/inc/io.php b/inc/io.php
index 8846b7e56..b8a77b730 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -127,22 +127,36 @@ function io_readFile($file,$clean=true){
  * @author  Andreas Gohr <andi@splitbrain.org>
  *
  * @param string $file filename
- * @return string|bool content or false on error
+ * @param bool   $array return array of lines
+ * @return string|array|bool content or false on error
  */
-function bzfile($file){
+function bzfile($file, $array=false) {
     $bz = bzopen($file,"r");
     if($bz === false) return false;
 
+    if($array) $lines = array();
     $str = '';
-    while (!feof($bz)){
+    while (!feof($bz)) {
         //8192 seems to be the maximum buffersize?
         $buffer = bzread($bz,8192);
         if(($buffer === false) || (bzerrno($bz) !== 0)) {
             return false;
         }
         $str = $str . $buffer;
+        if($array) {
+            $pos = strpos($str, "\n");
+            while($pos !== false) {
+                $lines[] = substr($str, 0, $pos+1);
+                $str = substr($str, $pos+1);
+                $pos = strpos($str, "\n");
+            }
+        }
     }
     bzclose($bz);
+    if($array) {
+        if($str !== '') $lines[] = $str;
+        return $lines;
+    }
     return $str;
 }
 
@@ -280,6 +294,8 @@ function io_deleteFromFile($file,$badline,$regex=false){
     // load into array
     if(substr($file,-3) == '.gz'){
         $lines = gzfile($file);
+    }else if(substr($file,-4) == '.bz2'){
+        $lines = bzfile($file, true);
     }else{
         $lines = file($file);
     }
@@ -306,6 +322,15 @@ function io_deleteFromFile($file,$badline,$regex=false){
             }
             gzwrite($fh, $content);
             gzclose($fh);
+        }else if(substr($file,-4) == '.bz2'){
+            $fh = @bzopen($file,'w');
+            if(!$fh){
+                msg("Removing content from $file failed",-1);
+                io_unlock($file);
+                return false;
+            }
+            bzwrite($fh, $content);
+            bzclose($fh);
         }else{
             $fh = @fopen($file,'wb');
             if(!$fh){
-- 
cgit v1.2.3


From 1bd6bbdebc26f9cd916f8f287cd2cabc07bee8d1 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Thu, 7 May 2015 01:37:11 -0400
Subject: Add io_replaceInFile

---
 inc/io.php | 158 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 86 insertions(+), 72 deletions(-)

diff --git a/inc/io.php b/inc/io.php
index b8a77b730..11a3fa77f 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -205,13 +205,7 @@ function _io_writeWikiPage_action($data) {
 }
 
 /**
- * Saves $content to $file.
- *
- * If the third parameter is set to true the given content
- * will be appended.
- *
- * Uses gzip if extension is .gz
- * and bz2 if extension is .bz2
+ * Internal function to save contents to a file.
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
  *
@@ -220,73 +214,90 @@ function _io_writeWikiPage_action($data) {
  * @param bool   $append
  * @return bool true on success, otherwise false
  */
-function io_saveFile($file,$content,$append=false){
+function _io_saveFile($file, $content, $append) {
     global $conf;
     $mode = ($append) ? 'ab' : 'wb';
-
     $fileexists = file_exists($file);
-    io_makeFileDir($file);
-    io_lock($file);
+
     if(substr($file,-3) == '.gz'){
         $fh = @gzopen($file,$mode.'9');
-        if(!$fh){
-            msg("Writing $file failed",-1);
-            io_unlock($file);
-            return false;
-        }
+        if(!$fh) return false;
         gzwrite($fh, $content);
         gzclose($fh);
     }else if(substr($file,-4) == '.bz2'){
         if($append) {
             $bzcontent = bzfile($file);
-            if($bzcontent === false) {
-                msg("Writing $file failed", -1);
-                io_unlock($file);
-                return false;
-            }
+            if($bzcontent === false) return false;
             $content = $bzcontent.$content;
         }
         $fh = @bzopen($file,'w');
-        if(!$fh){
-            msg("Writing $file failed", -1);
-            io_unlock($file);
-            return false;
-        }
+        if(!$fh) return false;
         bzwrite($fh, $content);
         bzclose($fh);
     }else{
         $fh = @fopen($file,$mode);
-        if(!$fh){
-            msg("Writing $file failed",-1);
-            io_unlock($file);
-            return false;
-        }
+        if(!$fh) return false;
         fwrite($fh, $content);
         fclose($fh);
     }
 
     if(!$fileexists and !empty($conf['fperm'])) chmod($file, $conf['fperm']);
-    io_unlock($file);
     return true;
 }
 
 /**
- * Delete exact linematch for $badline from $file.
+ * Saves $content to $file.
  *
- * Be sure to include the trailing newline in $badline
+ * If the third parameter is set to true the given content
+ * will be appended.
  *
  * Uses gzip if extension is .gz
+ * and bz2 if extension is .bz2
  *
- * 2005-10-14 : added regex option -- Christopher Smith <chris@jalakai.co.uk>
+ * @author  Andreas Gohr <andi@splitbrain.org>
  *
- * @author Steven Danz <steven-danz@kc.rr.com>
+ * @param string $file filename path to file
+ * @param string $content
+ * @param bool   $append
+ * @return bool true on success, otherwise false
+ */
+function io_saveFile($file, $content, $append=false) {
+    io_makeFileDir($file);
+    io_lock($file);
+    if(!_io_saveFile($file, $content, $append)) {
+        msg("Writing $file failed",-1);
+        io_unlock($file);
+        return false;
+    }
+    io_unlock($file);
+    return true;
+}
+
+/**
+ * Replace one or more occurrences of a line in a file.
  *
- * @param string $file    filename
- * @param string $badline exact linematch to remove
- * @param bool   $regex   use regexp?
+ * The default, when $maxlines is 0 is to delete all matches then append a single line.
+ * If $maxlines is -1, then every $oldline will be replaced with $newline, and $regex is true
+ * then preg captures are used. If $maxlines is greater than 0 then the first $maxlines
+ * matches are replaced with $newline.
+ *
+ * Be sure to include the trailing newline in $oldline
+ *
+ * Uses gzip if extension is .gz
+ * and bz2 if extension is .bz2
+ *
+ * @author Steven Danz <steven-danz@kc.rr.com>
+ * @author Christopher Smith <chris@jalakai.co.uk>
+ * @author Patrick Brown <ptbrown@whoopdedo.org>
+ *
+ * @param string $file     filename
+ * @param string $oldline  exact linematch to remove
+ * @param string $newline  new line to insert
+ * @param bool   $regex    use regexp?
+ * @param int    $maxlines number of occurrences of the line to replace
  * @return bool true on success
  */
-function io_deleteFromFile($file,$badline,$regex=false){
+function io_replaceInFile($file, $oldline, $newline, $regex=false, $maxlines=0) {
     if (!file_exists($file)) return true;
 
     io_lock($file);
@@ -302,44 +313,31 @@ function io_deleteFromFile($file,$badline,$regex=false){
 
     // remove all matching lines
     if ($regex) {
-        $lines = preg_grep($badline,$lines,PREG_GREP_INVERT);
+        if($maxlines == 0) {
+            $lines = preg_grep($oldline, $lines, PREG_GREP_INVERT);
+        } else {
+            $lines = preg_replace($oldline, $newline, $lines, $maxlines);
+        }
     } else {
-        $pos = array_search($badline,$lines); //return null or false if not found
+        $count = 0;
+        $replaceline = $maxlines == 0 ? '' : $newline;
+        $pos = array_search($oldline,$lines); //return null or false if not found
         while(is_int($pos)){
-            unset($lines[$pos]);
-            $pos = array_search($badline,$lines);
+            $lines[$pos] = $replaceline;
+            if($maxlines > 0 && ++$count >= $maxlines) break;
+            $pos = array_search($oldline,$lines);
         }
     }
 
+    if($maxlines == 0 && ((string)$newline) !== '') {
+        $lines[] = $newline;
+    }
+
     if(count($lines)){
-        $content = join('',$lines);
-        if(substr($file,-3) == '.gz'){
-            $fh = @gzopen($file,'wb9');
-            if(!$fh){
-                msg("Removing content from $file failed",-1);
-                io_unlock($file);
-                return false;
-            }
-            gzwrite($fh, $content);
-            gzclose($fh);
-        }else if(substr($file,-4) == '.bz2'){
-            $fh = @bzopen($file,'w');
-            if(!$fh){
-                msg("Removing content from $file failed",-1);
-                io_unlock($file);
-                return false;
-            }
-            bzwrite($fh, $content);
-            bzclose($fh);
-        }else{
-            $fh = @fopen($file,'wb');
-            if(!$fh){
-                msg("Removing content from $file failed",-1);
-                io_unlock($file);
-                return false;
-            }
-            fwrite($fh, $content);
-            fclose($fh);
+        if(!_io_saveFile($file, join('',$lines), false)) {
+            msg("Removing content from $file failed",-1);
+            io_unlock($file);
+            return false;
         }
     }else{
         @unlink($file);
@@ -349,6 +347,22 @@ function io_deleteFromFile($file,$badline,$regex=false){
     return true;
 }
 
+/**
+ * Delete lines that match $badline from $file.
+ *
+ * Be sure to include the trailing newline in $badline
+ *
+ * @author Patrick Brown <ptbrown@whoopdedo.org>
+ *
+ * @param string $file    filename
+ * @param string $badline exact linematch to remove
+ * @param bool   $regex   use regexp?
+ * @return bool true on success
+ */
+function io_deleteFromFile($file,$badline,$regex=false){
+    return io_replaceInFile($file,$badline,null,$regex,0);
+}
+
 /**
  * Tries to lock a file
  *
-- 
cgit v1.2.3


From e6c4392f11bb5a668be8e874560af910b71d72f8 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Thu, 7 May 2015 01:43:32 -0400
Subject: Fix scrutinizer issues with auth

---
 inc/auth.php                          | 2 +-
 lib/plugins/auth.php                  | 2 +-
 lib/plugins/authldap/lang/en/lang.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/auth.php b/inc/auth.php
index dd0fc35b3..60b8c7c78 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -1098,7 +1098,7 @@ function updateprofile() {
         }
     }
 
-    if(!($result = $auth->triggerUserMod('modify', array($INPUT->server->str('REMOTE_USER'), &$changes)))) {
+    if(!$auth->triggerUserMod('modify', array($INPUT->server->str('REMOTE_USER'), &$changes))) {
         msg($lang['proffail'], -1);
         return false;
     }
diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index 4799b3a38..036cb0d77 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -295,7 +295,7 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
      */
     public function deleteUsers($users) {
         msg("authorisation method does not allow deleting of users", -1);
-        return false;
+        return 0;
     }
 
     /**
diff --git a/lib/plugins/authldap/lang/en/lang.php b/lib/plugins/authldap/lang/en/lang.php
index db06efb4c..8185a84fa 100644
--- a/lib/plugins/authldap/lang/en/lang.php
+++ b/lib/plugins/authldap/lang/en/lang.php
@@ -6,6 +6,6 @@
  */
 
 $lang['connectfail']     = 'LDAP cannot connect: %s';
-$lang['domainfail'       = 'LDAP cannot find your user dn';
+$lang['domainfail']       = 'LDAP cannot find your user dn';
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 95e3f389247c53b580d3dc59b26d4bf89ef6ae3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Thu, 7 May 2015 11:29:07 +0200
Subject: Change ID name

---
 lib/plugins/extension/script.js  | 1 +
 lib/plugins/extension/style.less | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index 1a0af4e0d..ddd668a76 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -115,6 +115,7 @@ jQuery(function(){
      */
     if ( $extmgr.find('.tabs li:first-child, .tabs li:nth-child(2)').hasClass('active') ) {
         var $displayOpts = jQuery('<p>', { id: 'viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
+        var $displayOpts = jQuery('<p>', { id: 'extension__viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
 
         $displayOpts.append(LANG.plugins.extension.display_viewoptions);
     
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index fe15da16a..baeb40db1 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -371,6 +371,6 @@
     width: 60%;
 }
 
-#viewoptions label {
+#extension__viewoptions label {
     margin-left: 1em;
 }
-- 
cgit v1.2.3


From c594265e447bf705dae05f5e59560ea4c3afea0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Thu, 7 May 2015 11:30:00 +0200
Subject: Add class name using tab name

---
 lib/plugins/extension/helper/gui.php | 4 ++--
 lib/plugins/extension/script.js      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 3a0f0c589..4ec6fec85 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -144,11 +144,11 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
         foreach($this->tabs as $tab) {
             $url = $this->tabURL($tab);
             if($this->currentTab() == $tab) {
-                $class = 'class="active"';
+                $class = ' active';
             } else {
                 $class = '';
             }
-            echo '<li '.$class.'><a href="'.$url.'">'.$this->getLang('tab_'.$tab).'</a></li>';
+            echo '<li class="'.$tab.$class.'"><a href="'.$url.'">'.$this->getLang('tab_'.$tab).'</a></li>';
         }
         echo '</ul>';
     }
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index ddd668a76..bc1bf8b12 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -113,8 +113,7 @@ jQuery(function(){
     /**
         Create section for enabling/disabling viewing options
      */
-    if ( $extmgr.find('.tabs li:first-child, .tabs li:nth-child(2)').hasClass('active') ) {
-        var $displayOpts = jQuery('<p>', { id: 'viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
+    if ( $extmgr.find('.plugins, .templates').hasClass('active') ) {
         var $displayOpts = jQuery('<p>', { id: 'extension__viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
 
         $displayOpts.append(LANG.plugins.extension.display_viewoptions);
-- 
cgit v1.2.3


From c9a3a44ccbcf2ff1ed427df5f6911a1028989e43 Mon Sep 17 00:00:00 2001
From: Danny Buckhof <daniel.raknes@hotmail.no>
Date: Thu, 7 May 2015 14:45:55 +0200
Subject: translation update

---
 inc/lang/no/lang.php                    | 5 +++++
 lib/plugins/authad/lang/no/lang.php     | 3 +++
 lib/plugins/authad/lang/no/settings.php | 3 +++
 lib/plugins/revert/lang/no/lang.php     | 1 +
 4 files changed, 12 insertions(+)

diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 2aa8cdcda..fddbf1419 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -22,6 +22,7 @@
  * @author Boris <boris@newton-media.no>
  * @author Christopher Schive <chschive@frisurf.no>
  * @author Patrick <spill.p@hotmail.com>
+ * @author Danny Buckhof <daniel.raknes@hotmail.no>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -87,6 +88,7 @@ $lang['regmissing']            = 'Vennligst fyll ut alle felt.';
 $lang['reguexists']            = 'Det finnes allerede en konto med dette brukernavnet.';
 $lang['regsuccess']            = 'Brukerkonto har blitt laget og passord har blitt sendt via e-post.';
 $lang['regsuccess2']           = 'Brukeren har blitt laget.';
+$lang['regfail']               = 'Brukeren kan ikke opprettes';
 $lang['regmailfail']           = 'En feil oppstod da passordet ditt skulle sendes via e-post. Vennligst kontakt administratoren!';
 $lang['regbadmail']            = 'Den angitte e-post adressen ser ut til å være ugyldig. Vennligst kontakt administratoren om du anser dette som feilaktig.';
 $lang['regbadpass']            = 'De to angitte passordene er ikke like, vennligst forsøk igjen.';
@@ -101,6 +103,7 @@ $lang['profdeleteuser']        = 'Slett konto';
 $lang['profdeleted']           = 'Din brukerkonto har blitt slettet fra denne wikien';
 $lang['profconfdelete']        = 'Jeg ønsker å fjerne min konto fra denne wikien. <br/> Denne handlingen kan ikke omgjøres.';
 $lang['profconfdeletemissing'] = 'Boks for bekreftelse ikke avkrysset';
+$lang['proffail']              = 'Brukerprofilen ble ikke oppdatert';
 $lang['pwdforget']             = 'Glemt passordet ditt? Få deg et nytt';
 $lang['resendna']              = 'Denne wikien støtter ikke nyutsending av passord.';
 $lang['resendpwd']             = 'Sett nytt passord for';
@@ -298,6 +301,7 @@ $lang['i_modified']            = 'For sikkerhets skyld vil dette skriptet bare v
                          <a href="http://dokuwiki.org/install">Dokuwiki-installasjonsinstruksen</a>';
 $lang['i_funcna']              = 'PHP-funksjonen <code>%s</code> er ikke tilgjengelig. Kanskje din leverandør har deaktivert den av noen grunn?';
 $lang['i_phpver']              = 'Din PHP versjon <code>%s</code> er lavere enn kravet <code>%s</code>. Du må oppgradere PHP installasjonen. ';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload må deaktiveres i php.ini for å kjøre DokuWiki.';
 $lang['i_permfail']            = '<code>%s</code> er ikke skrivbar for DokuWiki. Du må fikse rettighetene for denne mappen!';
 $lang['i_confexists']          = '<code>%s</code> eksisterer allerede';
 $lang['i_writeerr']            = 'Kunne ikke opprette <code>%s</code>. Du må sjekke mappe-/filrettigheter og opprette filen manuelt.';
@@ -354,3 +358,4 @@ $lang['searchresult']          = 'Søk i resultat';
 $lang['plainhtml']             = 'Enkel HTML';
 $lang['wikimarkup']            = 'wiki-format';
 $lang['page_nonexist_rev']     = 'Finnes ingen side på %s. Den er derfor laget på <a href="%s">%s</a>';
+$lang['unable_to_parse_date']  = 'Ikke mulig å tolke "%s".';
diff --git a/lib/plugins/authad/lang/no/lang.php b/lib/plugins/authad/lang/no/lang.php
index f8dbb0b08..b497c4719 100644
--- a/lib/plugins/authad/lang/no/lang.php
+++ b/lib/plugins/authad/lang/no/lang.php
@@ -5,6 +5,9 @@
  * 
  * @author Patrick <spill.p@hotmail.com>
  * @author Thomas Juberg <Thomas.Juberg@Gmail.com>
+ * @author Danny Buckhof <daniel.raknes@hotmail.no>
  */
 $lang['domain']                = 'Loggpå-domene';
 $lang['authpwdexpire']         = 'Ditt passord går ut om %d dager, du bør endre det snarest.';
+$lang['passchangefail']        = 'Feil ved endring av passord. Det kan være at passordet ikke er i tråd med passordpolicyen ';
+$lang['connectfail']           = 'Feil ved kontakt med Active Directory serveren.';
diff --git a/lib/plugins/authad/lang/no/settings.php b/lib/plugins/authad/lang/no/settings.php
index f309ead50..727f6611d 100644
--- a/lib/plugins/authad/lang/no/settings.php
+++ b/lib/plugins/authad/lang/no/settings.php
@@ -5,7 +5,10 @@
  * 
  * @author Christopher Schive <chschive@frisurf.no>
  * @author Patrick <spill.p@hotmail.com>
+ * @author Danny Buckhof <daniel.raknes@hotmail.no>
  */
 $lang['account_suffix']        = 'Ditt konto-suffiks F. Eks. <code>@my.domain.org</code>';
 $lang['admin_password']        = 'Passordet til brukeren over.';
+$lang['use_ssl']               = 'Bruk SSL tilknytning? Hvis denne brukes, ikke aktiver TLS nedenfor.';
+$lang['use_tls']               = 'Bruk TLS tilknytning? Hvis denne brukes, ikke aktiver SSL over.';
 $lang['expirywarn']            = 'Antall dager på forhånd brukeren varsles om at passordet utgår. 0 for å deaktivere.';
diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php
index 76da8ca9c..d5307c7ca 100644
--- a/lib/plugins/revert/lang/no/lang.php
+++ b/lib/plugins/revert/lang/no/lang.php
@@ -20,6 +20,7 @@
  * @author Boris <boris@newton-media.no>
  * @author Christopher Schive <chschive@frisurf.no>
  * @author Patrick <spill.p@hotmail.com>
+ * @author Danny Buckhof <daniel.raknes@hotmail.no>
  */
 $lang['menu']                  = 'Tilbakestillingsbehandler';
 $lang['filter']                = 'Søk etter søppelmeldinger';
-- 
cgit v1.2.3


From 699e3c4900f2d6cc860a3587a05798cd23b7944d Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Thu, 7 May 2015 14:27:00 -0400
Subject: Use io_replaceInFile for updating auth

---
 lib/plugins/acl/admin.php      | 11 ++---------
 lib/plugins/authplain/auth.php | 11 +++--------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 814bbfe9c..2dfdbbda5 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -682,7 +682,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      */
     function _acl_add($acl_scope, $acl_user, $acl_level){
         global $config_cascade;
-        $acl_config = file_get_contents($config_cascade['acl']['default']);
         $acl_user = auth_nameencode($acl_user,true);
 
         // max level for pagenames is edit
@@ -692,9 +691,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
         $new_acl = "$acl_scope\t$acl_user\t$acl_level\n";
 
-        $new_config = $acl_config.$new_acl;
-
-        return io_saveFile($config_cascade['acl']['default'], $new_config);
+        return io_saveFile($config_cascade['acl']['default'], $new_config, true);
     }
 
     /**
@@ -704,15 +701,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      */
     function _acl_del($acl_scope, $acl_user){
         global $config_cascade;
-        $acl_config = file($config_cascade['acl']['default']);
         $acl_user = auth_nameencode($acl_user,true);
 
         $acl_pattern = '^'.preg_quote($acl_scope,'/').'[ \t]+'.$acl_user.'[ \t]+[0-8].*$';
 
-        // save all non!-matching
-        $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT);
-
-        return io_saveFile($config_cascade['acl']['default'], join('',$new_config));
+        return io_deleteFromFile($config_cascade['acl']['default'], "/$acl_pattern/", true);
     }
 
     /**
diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php
index b31c02fc8..35cf7a802 100644
--- a/lib/plugins/authplain/auth.php
+++ b/lib/plugins/authplain/auth.php
@@ -185,14 +185,9 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
 
         $userline = $this->_createUserLine($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $userinfo['grps']);
 
-        if(!$this->deleteUsers(array($user))) {
-            msg('Unable to modify user data. Please inform the Wiki-Admin', -1);
-            return false;
-        }
-
-        if(!io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) {
-            msg('There was an error modifying your user data. You should register again.', -1);
-            // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page
+        if(!io_replaceInFile($config_cascade['plainauth.users']['default'], '/^'.$user.':/', $userline, true)) {
+            msg('There was an error modifying your user data. You may need to register again.', -1);
+            // FIXME, io functions should be fail-safe so existing data isn't lost
             $ACT = 'register';
             return false;
         }
-- 
cgit v1.2.3


From e283bd6c307c6538f4d5447a938266b5e414c159 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 8 May 2015 11:32:48 +0100
Subject: urlencode t param value in css and js calls

---
 inc/template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index d6436e416..3859065bc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -402,7 +402,7 @@ function tpl_metaheaders($alt = true) {
     // load stylesheets
     $head['link'][] = array(
         'rel' => 'stylesheet', 'type'=> 'text/css',
-        'href'=> DOKU_BASE.'lib/exe/css.php?t='.$conf['template'].'&tseed='.$tseed
+        'href'=> DOKU_BASE.'lib/exe/css.php?t='.rawurlencode($conf['template']).'&tseed='.$tseed
     );
 
     // make $INFO and other vars available to JavaScripts
@@ -417,7 +417,7 @@ function tpl_metaheaders($alt = true) {
     // load external javascript
     $head['script'][] = array(
         'type'=> 'text/javascript', 'charset'=> 'utf-8', '_data'=> '',
-        'src' => DOKU_BASE.'lib/exe/js.php'.'?t='.$conf['template'].'&tseed='.$tseed
+        'src' => DOKU_BASE.'lib/exe/js.php'.'?t='.rawurlencode($conf['template']).'&tseed='.$tseed
     );
 
     // trigger event here
-- 
cgit v1.2.3


From 526e5abda6d7ab051bb2819eaffbe81af04e6c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Fri, 8 May 2015 13:15:31 +0200
Subject: Adhere to CSS style guide

---
 lib/plugins/extension/style.less | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index baeb40db1..38b2d65d0 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -282,11 +282,14 @@
  */
 #extension__list {
     
-    .enabled, .disabled, .updatable {
+    .enabled, .disabled,
+    .updatable {
         display: none;
     }
     
-    &.enabled .enabled, &.disabled .disabled, &.updatable .updatable {
+    &.enabled .enabled,
+    &.disabled .disabled,
+    &.updatable .updatable {
         display: block;
     }
     
-- 
cgit v1.2.3


From 12a4e4d1ed827c59290838d5a11d75ad32aa28f1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 8 May 2015 16:15:16 +0200
Subject: start of rewriting the form handling

This is jsut a small beginning. Not all elements are there, yet. It's
also completely untested so far.
---
 inc/Form/CheckableElement.php |  62 ++++++++++++++++
 inc/Form/Element.php          | 142 +++++++++++++++++++++++++++++++++++
 inc/Form/Form.php             | 167 ++++++++++++++++++++++++++++++++++++++++++
 inc/Form/InputElement.php     | 145 ++++++++++++++++++++++++++++++++++++
 inc/Form/Label.php            |  46 ++++++++++++
 inc/Form/TextareaElement.php  |  50 +++++++++++++
 6 files changed, 612 insertions(+)
 create mode 100644 inc/Form/CheckableElement.php
 create mode 100644 inc/Form/Element.php
 create mode 100644 inc/Form/Form.php
 create mode 100644 inc/Form/InputElement.php
 create mode 100644 inc/Form/Label.php
 create mode 100644 inc/Form/TextareaElement.php

diff --git a/inc/Form/CheckableElement.php b/inc/Form/CheckableElement.php
new file mode 100644
index 000000000..a57bbc1f6
--- /dev/null
+++ b/inc/Form/CheckableElement.php
@@ -0,0 +1,62 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class CheckableElement
+ *
+ * For Radio- and Checkboxes
+ *
+ * @package DokuForm
+ */
+class CheckableElement extends InputElement {
+
+    /**
+     * @param string $type The type of this element
+     * @param string $name The name of this form element
+     * @param string $label The label text for this element
+     */
+    public function __construct($type, $name, $label) {
+        parent::__construct($type, $name, $label);
+        // default value is 1
+        $this->attr('value', 1);
+    }
+
+    /**
+     * Handles the useInput flag and sets the checked attribute accordingly
+     */
+    protected function prefillInput() {
+        global $INPUT;
+        list($name, $key) = $this->getInputName();
+        $myvalue = $this->val();
+
+        if(!$INPUT->has($name)) return;
+
+        if($key === null) {
+            // no key - single value
+            $value = $INPUT->str($name);
+            if($value == $myvalue) {
+                $this->attr('checked', 'checked');
+            } else {
+                $this->rmattr('checked');
+            }
+        } else {
+            // we have an array, there might be several values in it
+            $input = $INPUT->arr($name);
+            if(isset($input[$key])) {
+                $this->rmattr('checked');
+
+                // values seem to be in another sub array
+                if(is_array($input[$key])) {
+                    $input = $input[$key];
+                }
+
+                foreach($input as $value) {
+                    if($value == $myvalue) {
+                        $this->attr('checked', 'checked');
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/inc/Form/Element.php b/inc/Form/Element.php
new file mode 100644
index 000000000..6f23e2631
--- /dev/null
+++ b/inc/Form/Element.php
@@ -0,0 +1,142 @@
+<?php
+namespace dokuwiki\Form;
+
+
+/**
+ * Class Element
+ *
+ * The basic building block of a form
+ *
+ * @package dokuwiki\Form
+ */
+abstract class Element {
+
+    /**
+     * @var array the attributes of this element
+     */
+    protected $attributes = array();
+
+    /**
+     * @var string The type of this element
+     */
+    protected $type;
+
+    /**
+     * @param string $type The type of this element
+     * @param array $attributes
+     */
+    public function __construct($type, $attributes = array()) {
+        $this->type = $type;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * Gets or sets an attribute
+     *
+     * When no $value is given, the current content of the attribute is returned.
+     * An empty string is returned for unset attributes.
+     *
+     * When a $value is given, the content is set to that value and the Element
+     * itself is returned for easy chaining
+     *
+     * @param string $name Name of the attribute to access
+     * @param null|string $value New value to set
+     * @return string|$this
+     */
+    public function attr($name, $value = null) {
+        // set
+        if($value !== null) {
+            $this->attributes[$name] = $value;
+            return $this;
+        }
+
+        // get
+        if(isset($this->attributes[$name])) {
+            return $this->attributes[$name];
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Removes the given attribute if it exists
+     *
+     * @param $name
+     * @return $this
+     */
+    public function rmattr($name) {
+        if(isset($this->attributes[$name])) {
+            unset($this->attributes[$name]);
+        }
+        return $this;
+    }
+
+    /**
+     * Gets or adds a all given attributes at once
+     *
+     * @param array|null $attributes
+     * @return array|$this
+     */
+    public function attrs($attributes = null) {
+        // set
+        if($attributes) {
+            foreach((array) $attributes as $key => $val) {
+                $this->attr($key, $val);
+            }
+            return $this;
+        }
+        // get
+        return $this->attributes;
+    }
+
+    /**
+     * Adds a class to the class attribute
+     *
+     * This is the preferred method of setting the element's class
+     *
+     * @param string $class the new class to add
+     * @return $this
+     */
+    public function addClass($class) {
+        $classes = explode(' ', $this->attr('class'));
+        $classes[] = $class;
+        $classes = array_unique($classes);
+        $this->attr('class', join(' ', $classes));
+        return $this;
+    }
+
+    /**
+     * Get or set the element's ID
+     *
+     * This is the preferred way of setting the element's ID
+     *
+     * @param null|string $id
+     * @return string|$this
+     */
+    public function id($id = null) {
+        if(strpos($id, '__') === false) {
+            throw new \InvalidArgumentException('IDs in DokuWiki have to contain two subsequent underscores');
+        }
+
+        return $this->attr('id', $id);
+    }
+
+    /**
+     * Get or set the element's value
+     *
+     * This is the preferred way of setting the element's value
+     *
+     * @param null|string $value
+     * @return string|$this
+     */
+    public function val($value = null) {
+        return $this->attr('value', $value);
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    abstract public function toHTML();
+}
diff --git a/inc/Form/Form.php b/inc/Form/Form.php
new file mode 100644
index 000000000..3a8b590e7
--- /dev/null
+++ b/inc/Form/Form.php
@@ -0,0 +1,167 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class Form
+ *
+ * Represents the whole Form. This is what you work on, and add Elements to
+ *
+ * @package dokuwiki\Form
+ */
+class Form extends Element {
+
+    /**
+     * @var array name value pairs for hidden values
+     */
+    protected $hidden = array();
+
+    /**
+     * @var Element[] the elements of the form
+     */
+    protected $elements = array();
+
+    /**
+     * Creates a new, empty form with some default attributes
+     *
+     * @param array $attributes
+     */
+    public function __construct($attributes = array()) {
+        global $ID;
+
+        parent::__construct('form', $attributes);
+
+        // use the current URL as default action
+        if(!$this->attr('action')) {
+            $get = $_GET;
+            if(isset($get['id'])) unset($get['id']);
+            $self = wl($ID, $get);
+            $this->attr('action', $self);
+        }
+
+        // post is default
+        if(!$this->attr('method')) {
+            $this->attr('method', 'post');
+        }
+
+        // we like UTF-8
+        if(!$this->attr('accept-charset')) {
+            $this->attr('accept-charset', 'utf-8');
+        }
+
+        // add the security token by default
+        $this->setHiddenField('sectok', getSecurityToken());
+
+        // identify this as a form2 based form in HTML
+        $this->addClass('doku_form2');
+    }
+
+    /**
+     * Sets a hidden field
+     *
+     * @param $name
+     * @param $value
+     * @return $this
+     */
+    public function setHiddenField($name, $value) {
+        $this->hidden[$name] = $value;
+        return $this;
+    }
+
+    /**
+     * Adds an element to the end of the form
+     *
+     * @param Element $element
+     * @param int $pos 0-based position in the form, -1 for at the end
+     * @return Element
+     */
+    public function addElement(Element $element, $pos = -1) {
+        if(is_a($element, 'Doku_Form2')) throw new \InvalidArgumentException('You can\'t add a form to a form');
+        if($pos < 0) {
+            $this->elements[] = $element;
+        } else {
+            array_splice($this->elements, $pos, 0, array($element));
+        }
+        return $element;
+    }
+
+    /**
+     * Adds a text input field
+     *
+     * @param $name
+     * @param $label
+     * @param int $pos
+     * @return InputElement
+     */
+    public function addTextInput($name, $label, $pos = -1) {
+        return $this->addElement(new InputElement('text', $name, $label), $pos);
+    }
+
+    /**
+     * Adds a password input field
+     *
+     * @param $name
+     * @param $label
+     * @param int $pos
+     * @return InputElement
+     */
+    public function addPasswordInput($name, $label, $pos = -1) {
+        return $this->addElement(new InputElement('password', $name, $label), $pos);
+    }
+
+    /**
+     * Adds a radio button field
+     *
+     * @param $name
+     * @param $label
+     * @param int $pos
+     * @return CheckableElement
+     */
+    public function addRadioButton($name, $label, $pos = -1) {
+        return $this->addElement(new CheckableElement('radio', $name, $label), $pos);
+    }
+
+    /**
+     * Adds a checkbox field
+     *
+     * @param $name
+     * @param $label
+     * @param int $pos
+     * @return CheckableElement
+     */
+    public function addCheckbox($name, $label, $pos = -1) {
+        return $this->addElement(new CheckableElement('checkbox', $name, $label), $pos);
+    }
+
+    /**
+     * Adds a textarea field
+     *
+     * @param $name
+     * @param $label
+     * @param int $pos
+     * @return TextareaElement
+     */
+    public function addTextarea($name, $label, $pos = -1) {
+        return $this->addElement(new TextareaElement($name, $label), $pos);
+    }
+
+    /**
+     * The HTML representation of the whole form
+     *
+     * @return string
+     */
+    public function toHTML() {
+        $html = '<form ' . buildAttributes($this->attrs()) . '>' . DOKU_LF;
+
+        foreach($this->hidden as $name => $value) {
+            $html .= '<input type="hidden" name="' . $name . '" value="' . formText($value) . '" />' . DOKU_LF;
+        }
+
+        foreach($this->elements as $element) {
+            $html .= $element->toHTML() . DOKU_LF;
+        }
+
+        $html .= '</form>' . DOKU_LF;
+
+        return $html;
+    }
+}
diff --git a/inc/Form/InputElement.php b/inc/Form/InputElement.php
new file mode 100644
index 000000000..59310174e
--- /dev/null
+++ b/inc/Form/InputElement.php
@@ -0,0 +1,145 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class InputElement
+ *
+ * Base class for all input elements. Uses a wrapping label.
+ *
+ * @todo figure out how to make wrapping or related label configurable
+ * @package dokuwiki\Form
+ */
+class InputElement extends Element {
+    /**
+     * @var Label
+     */
+    protected $label;
+
+    /**
+     * @var bool if the element should reflect posted values
+     */
+    protected $useInput = true;
+
+    /**
+     * @param string $type The type of this element
+     * @param string $name The name of this form element
+     * @param string $label The label text for this element
+     */
+    public function __construct($type, $name, $label) {
+        parent::__construct($type, array('name' => $name));
+        $this->attr('name', $name);
+    }
+
+    /**
+     * Should the user sent input be used to initialize the input field
+     *
+     * The default is true. Any set values will be overwritten by the INPUT
+     * provided values.
+     *
+     * @param bool $useinput
+     * @return $this
+     */
+    public function useInput($useinput) {
+        $this->useInput = (bool) $useinput;
+        return $this;
+    }
+
+    /**
+     * Get or set the element's ID
+     *
+     * @param null|string $id
+     * @return string|$this
+     */
+    public function id($id = null) {
+        $this->label->attr('for', $id);
+        return parent::id($id);
+    }
+
+    /**
+     * Adds a class to the class attribute
+     *
+     * This is the preferred method of setting the element's class
+     *
+     * @param string $class the new class to add
+     * @return $this
+     */
+    public function addClass($class) {
+        $this->label->addClass($class);
+        return parent::addClass($class);
+    }
+
+    /**
+     * Figures out how to access the value for this field from INPUT data
+     *
+     * The element's name could have been given as a simple string ('foo')
+     * or in array notation ('foo[bar]').
+     *
+     * Note: this function only handles one level of arrays. If your data
+     * is nested deeper, you should call useInput(false) and set the
+     * correct value yourself
+     *
+     * @return array name and array key (null if not an array)
+     */
+    protected function getInputName() {
+        $name = $this->attr('name');
+        parse_str("$name=1", $parsed);
+
+        $name = array_keys($parsed);
+        $name = array_shift($name);
+
+        if(is_array($parsed[$name])) {
+            $key = array_keys($parsed[$name]);
+            $key = array_shift($key);
+        } else {
+            $key = null;
+        }
+
+        return array($name, $key);
+    }
+
+    /**
+     * Handles the useInput flag and set the value attribute accordingly
+     */
+    protected function prefillInput() {
+        global $INPUT;
+
+        list($name, $key) = $this->getInputName();
+        if(!$INPUT->has($name)) return;
+
+        if($key === null) {
+            $value = $INPUT->str($name);
+        } else {
+            $value = $INPUT->arr($name);
+            if(isset($value[$key])) {
+                $value = $value[$key];
+            } else {
+                $value = '';
+            }
+        }
+        if($value !== '') {
+            $this->val($value);
+        }
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    protected function mainElementHTML() {
+        if($this->useInput) $this->prefillInput();
+        return '<input ' . buildAttributes($this->attrs()) . ' />';
+    }
+
+    /**
+     * The HTML representation of this element wrapped in a label
+     *
+     * @return string
+     */
+    public function toHTML() {
+        return '<label ' . buildAttributes($this->label->attrs()) . '>' . DOKU_LF .
+        '<span>' . hsc($this->label->label) . '</span>' . DOKU_LF .
+        $this->mainElementHTML() . DOKU_LF .
+        '</label>';
+    }
+}
diff --git a/inc/Form/Label.php b/inc/Form/Label.php
new file mode 100644
index 000000000..c8a862613
--- /dev/null
+++ b/inc/Form/Label.php
@@ -0,0 +1,46 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class Label
+ * @package dokuwiki\Form
+ */
+class Label extends Element {
+    /**
+     * @var string the actual label text
+     */
+    public $label = '';
+
+    /**
+     * Creates a new Label
+     *
+     * @param string $label
+     */
+    public function __construct($label) {
+        parent::__construct('label');
+        $this->label = $label;
+    }
+
+    /**
+     * Get or set the element's label text
+     *
+     * @param null|string $value
+     * @return string|$this
+     */
+    public function val($value = null) {
+        if($value !== null) {
+            $this->label = $value;
+            return $this;
+        }
+        return $this->label;
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    public function toHTML() {
+        return '<label ' . buildAttributes($this->attrs()) . '>' . hsc($this->label) . '</label>';
+    }
+}
diff --git a/inc/Form/TextareaElement.php b/inc/Form/TextareaElement.php
new file mode 100644
index 000000000..a8486266f
--- /dev/null
+++ b/inc/Form/TextareaElement.php
@@ -0,0 +1,50 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class TextareaElement
+ * @package dokuwiki\Form
+ */
+class TextareaElement extends InputElement {
+
+    /**
+     * @var string the actual text within the area
+     */
+    protected $text;
+
+    /**
+     * @param string $name The name of this form element
+     * @param string $label The label text for this element
+     */
+    public function __construct($name, $label) {
+        parent::__construct('textarea', $name, $label);
+    }
+
+    /**
+     * Get or set the element's value
+     *
+     * This is the preferred way of setting the element's value
+     *
+     * @param null|string $value
+     * @return string|$this
+     */
+    public function val($value = null) {
+        if($value !== null) {
+            $this->text = $value;
+            return $this;
+        }
+        return $this->text;
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    protected function mainElementHTML() {
+        if($this->useInput) $this->prefillInput();
+        return '<textarea ' . buildAttributes($this->attrs()) . '>' .
+        formText($this->val()) . '</textarea>';
+    }
+
+}
-- 
cgit v1.2.3


From e7a32b176701c088bab045437819448bb9adad41 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 8 May 2015 16:27:17 +0200
Subject: added autoloading for namespaced classes

---
 _test/tests/inc/form/form.test.php | 0
 inc/load.php                       | 6 ++++++
 2 files changed, 6 insertions(+)
 create mode 100644 _test/tests/inc/form/form.test.php

diff --git a/_test/tests/inc/form/form.test.php b/_test/tests/inc/form/form.test.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/inc/load.php b/inc/load.php
index 18786dc79..19a8caa85 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -113,6 +113,12 @@ function load_autoload($name){
         return;
     }
 
+    // our own namespace
+    $name = str_replace('\\', '/', $name);
+    if(substr($name, 0, 9) == 'dokuwiki/') {
+        require_once(substr($name, 9) . '.php');
+    }
+
     // Plugin loading
     if(preg_match('/^(auth|helper|syntax|action|admin|renderer|remote)_plugin_('.DOKU_PLUGIN_NAME_REGEX.')(?:_([^_]+))?$/',
                   $name, $m)) {
-- 
cgit v1.2.3


From 6d0ceaf93ca31dfb83fd4325ef2eecd9cef733c0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 8 May 2015 17:26:11 +0200
Subject: added a first few tests.

this is far from comprehensible, but should give an idea how the new
library works and how to write tests
---
 _test/tests/inc/form/checkableelement.test.php | 49 ++++++++++++++++++++++++++
 _test/tests/inc/form/form.test.php             | 28 +++++++++++++++
 _test/tests/inc/form/inputelement.test.php     | 41 +++++++++++++++++++++
 inc/Form/Element.php                           |  1 +
 inc/Form/Form.php                              |  6 ++--
 inc/Form/InputElement.php                      |  1 +
 6 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 _test/tests/inc/form/checkableelement.test.php
 create mode 100644 _test/tests/inc/form/inputelement.test.php

diff --git a/_test/tests/inc/form/checkableelement.test.php b/_test/tests/inc/form/checkableelement.test.php
new file mode 100644
index 000000000..a0e4173e8
--- /dev/null
+++ b/_test/tests/inc/form/checkableelement.test.php
@@ -0,0 +1,49 @@
+<?php
+
+use dokuwiki\Form;
+
+class form_checkableelement_test extends DokuWikiTest {
+
+    function test_defaults() {
+        $form = new Form\Form();
+        $form->addRadioButton('foo', 'label text first')->val('first')->attr('checked', 'checked');
+        $form->addRadioButton('foo', 'label text second')->val('second');
+
+        $html = $form->toHTML();
+        $pq = phpQuery::newDocumentXHTML($html);
+
+        $input = $pq->find('input[name=foo]');
+        $this->assertTrue($input->length == 2);
+
+        $label = $pq->find('label');
+        $this->assertTrue($label->length == 2);
+
+        $inputs = $pq->find('input[name=foo]');
+        $this->assertEquals('first', pq($inputs->elements[0])->val());
+        $this->assertEquals('second', pq($inputs->elements[1])->val());
+        $this->assertEquals('checked', pq($inputs->elements[0])->attr('checked'));
+        $this->assertEquals('', pq($inputs->elements[1])->attr('checked'));
+    }
+
+    /**
+     * check that posted values overwrite preset default
+     */
+    function test_prefill() {
+        global $INPUT;
+        $INPUT->post->set('foo', 'second');
+
+
+        $form = new Form\Form();
+        $form->addRadioButton('foo', 'label text first')->val('first')->attr('checked', 'checked');
+        $form->addRadioButton('foo', 'label text second')->val('second');
+
+        $html = $form->toHTML();
+        $pq = phpQuery::newDocumentXHTML($html);
+
+        $inputs = $pq->find('input[name=foo]');
+        $this->assertEquals('first', pq($inputs->elements[0])->val());
+        $this->assertEquals('second', pq($inputs->elements[1])->val());
+        $this->assertEquals('', pq($inputs->elements[0])->attr('checked'));
+        $this->assertEquals('checked', pq($inputs->elements[1])->attr('checked'));
+    }
+}
diff --git a/_test/tests/inc/form/form.test.php b/_test/tests/inc/form/form.test.php
index e69de29bb..cdf3e5a3a 100644
--- a/_test/tests/inc/form/form.test.php
+++ b/_test/tests/inc/form/form.test.php
@@ -0,0 +1,28 @@
+<?php
+
+use dokuwiki\Form;
+
+class form_form_test extends DokuWikiTest {
+
+    /**
+     * checks that an empty form is initialized correctly
+     */
+    function test_defaults() {
+        global $INPUT;
+        global $ID;
+        $ID = 'some:test';
+        $INPUT->get->set('id', $ID);
+        $INPUT->get->set('foo', 'bar');
+
+        $form = new Form\Form();
+        $html = $form->toHTML();
+        $pq = phpQuery::newDocumentXHTML($html);
+
+        $this->assertTrue($pq->find('form')->hasClass('doku_form'));
+        $this->assertEquals(wl($ID, array('foo' => 'bar'), false, '&'), $pq->find('form')->attr('action'));
+        $this->assertEquals('post', $pq->find('form')->attr('method'));
+
+        $this->assertTrue($pq->find('input[name=sectok]')->length == 1);
+    }
+
+}
diff --git a/_test/tests/inc/form/inputelement.test.php b/_test/tests/inc/form/inputelement.test.php
new file mode 100644
index 000000000..7a5e6d2ea
--- /dev/null
+++ b/_test/tests/inc/form/inputelement.test.php
@@ -0,0 +1,41 @@
+<?php
+
+use dokuwiki\Form;
+
+class form_inputelement_test extends DokuWikiTest {
+
+    function test_defaults() {
+        $form = new Form\Form();
+        $form->addTextInput('foo', 'label text')->val('this is text');
+
+        $html = $form->toHTML();
+        $pq = phpQuery::newDocumentXHTML($html);
+
+        $input = $pq->find('input[name=foo]');
+        $this->assertTrue($input->length == 1);
+        $this->assertEquals('this is text', $input->val());
+
+        $label = $pq->find('label');
+        $this->assertTrue($label->length == 1);
+        $this->assertEquals('label text', $label->find('span')->text());
+    }
+
+    /**
+     * check that posted values overwrite preset default
+     */
+    function test_prefill() {
+        global $INPUT;
+        $INPUT->post->set('foo', 'a new text');
+
+        $form = new Form\Form();
+        $form->addTextInput('foo', 'label text')->val('this is text');
+
+        $html = $form->toHTML();
+        $pq = phpQuery::newDocumentXHTML($html);
+
+        $input = $pq->find('input[name=foo]');
+        $this->assertTrue($input->length == 1);
+        $this->assertEquals('a new text', $input->val());
+    }
+
+}
diff --git a/inc/Form/Element.php b/inc/Form/Element.php
index 6f23e2631..3fd170a80 100644
--- a/inc/Form/Element.php
+++ b/inc/Form/Element.php
@@ -101,6 +101,7 @@ abstract class Element {
         $classes = explode(' ', $this->attr('class'));
         $classes[] = $class;
         $classes = array_unique($classes);
+        $classes = array_filter($classes);
         $this->attr('class', join(' ', $classes));
         return $this;
     }
diff --git a/inc/Form/Form.php b/inc/Form/Form.php
index 3a8b590e7..dc502e021 100644
--- a/inc/Form/Form.php
+++ b/inc/Form/Form.php
@@ -34,7 +34,7 @@ class Form extends Element {
         if(!$this->attr('action')) {
             $get = $_GET;
             if(isset($get['id'])) unset($get['id']);
-            $self = wl($ID, $get);
+            $self = wl($ID, $get, false, '&'); //attributes are escaped later
             $this->attr('action', $self);
         }
 
@@ -51,8 +51,8 @@ class Form extends Element {
         // add the security token by default
         $this->setHiddenField('sectok', getSecurityToken());
 
-        // identify this as a form2 based form in HTML
-        $this->addClass('doku_form2');
+        // identify this as a new form based form in HTML
+        $this->addClass('doku_form');
     }
 
     /**
diff --git a/inc/Form/InputElement.php b/inc/Form/InputElement.php
index 59310174e..4f644c0f1 100644
--- a/inc/Form/InputElement.php
+++ b/inc/Form/InputElement.php
@@ -28,6 +28,7 @@ class InputElement extends Element {
     public function __construct($type, $name, $label) {
         parent::__construct($type, array('name' => $name));
         $this->attr('name', $name);
+        $this->label = new Label($label);
     }
 
     /**
-- 
cgit v1.2.3


From de19515f04567db78bd41d5bff68a88bfb8c2a22 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 8 May 2015 19:12:21 +0200
Subject: started with the compatibility layer

---
 inc/Form/Element.php         |  10 ++-
 inc/Form/Form.php            |  27 ++++++--
 inc/Form/HTMLElement.php     |  48 +++++++++++++
 inc/Form/InputElement.php    |  34 +++++++---
 inc/Form/LegacyForm.php      | 156 +++++++++++++++++++++++++++++++++++++++++++
 inc/Form/TextareaElement.php |   1 +
 6 files changed, 260 insertions(+), 16 deletions(-)
 create mode 100644 inc/Form/HTMLElement.php
 create mode 100644 inc/Form/LegacyForm.php

diff --git a/inc/Form/Element.php b/inc/Form/Element.php
index 3fd170a80..7938ee009 100644
--- a/inc/Form/Element.php
+++ b/inc/Form/Element.php
@@ -1,7 +1,6 @@
 <?php
 namespace dokuwiki\Form;
 
-
 /**
  * Class Element
  *
@@ -30,6 +29,15 @@ abstract class Element {
         $this->attributes = $attributes;
     }
 
+    /**
+     * Type of this element
+     *
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
+
     /**
      * Gets or sets an attribute
      *
diff --git a/inc/Form/Form.php b/inc/Form/Form.php
index dc502e021..19cc05065 100644
--- a/inc/Form/Form.php
+++ b/inc/Form/Form.php
@@ -92,7 +92,7 @@ class Form extends Element {
      * @param int $pos
      * @return InputElement
      */
-    public function addTextInput($name, $label, $pos = -1) {
+    public function addTextInput($name, $label = '', $pos = -1) {
         return $this->addElement(new InputElement('text', $name, $label), $pos);
     }
 
@@ -104,7 +104,7 @@ class Form extends Element {
      * @param int $pos
      * @return InputElement
      */
-    public function addPasswordInput($name, $label, $pos = -1) {
+    public function addPasswordInput($name, $label = '', $pos = -1) {
         return $this->addElement(new InputElement('password', $name, $label), $pos);
     }
 
@@ -116,7 +116,7 @@ class Form extends Element {
      * @param int $pos
      * @return CheckableElement
      */
-    public function addRadioButton($name, $label, $pos = -1) {
+    public function addRadioButton($name, $label = '', $pos = -1) {
         return $this->addElement(new CheckableElement('radio', $name, $label), $pos);
     }
 
@@ -128,7 +128,7 @@ class Form extends Element {
      * @param int $pos
      * @return CheckableElement
      */
-    public function addCheckbox($name, $label, $pos = -1) {
+    public function addCheckbox($name, $label = '', $pos = -1) {
         return $this->addElement(new CheckableElement('checkbox', $name, $label), $pos);
     }
 
@@ -140,16 +140,33 @@ class Form extends Element {
      * @param int $pos
      * @return TextareaElement
      */
-    public function addTextarea($name, $label, $pos = -1) {
+    public function addTextarea($name, $label = '', $pos = -1) {
         return $this->addElement(new TextareaElement($name, $label), $pos);
     }
 
+    /**
+     * Add fixed HTML to the form
+     *
+     * @param $html
+     * @param int $pos
+     * @return Element
+     */
+    public function addHTML($html, $pos = -1) {
+        return $this->addElement(new HTMLElement($html), $pos);
+    }
+
+    protected function balanceFieldsets() {
+        //todo implement!
+    }
+
     /**
      * The HTML representation of the whole form
      *
      * @return string
      */
     public function toHTML() {
+        $this->balanceFieldsets();
+
         $html = '<form ' . buildAttributes($this->attrs()) . '>' . DOKU_LF;
 
         foreach($this->hidden as $name => $value) {
diff --git a/inc/Form/HTMLElement.php b/inc/Form/HTMLElement.php
new file mode 100644
index 000000000..06f27d736
--- /dev/null
+++ b/inc/Form/HTMLElement.php
@@ -0,0 +1,48 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class HTMLElement
+ *
+ * Holds arbitrary HTML that is added as is to the Form
+ *
+ * @package dokuwiki\Form
+ */
+class HTMLElement extends Element {
+
+    /**
+     * @var string the raw HTML held by this element
+     */
+    protected $html = '';
+
+    /**
+     * @param string $html
+     */
+    public function __construct($html) {
+        parent::__construct('html');
+        $this->val($html);
+    }
+
+    /**
+     * Get or set the element's content
+     *
+     * @param null|string $html
+     * @return string|$this
+     */
+    public function val($html = null) {
+        if($html !== null) {
+            $this->html = $html;
+            return $this;
+        }
+        return $this->html;
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    public function toHTML() {
+        return $this->val();
+    }
+}
diff --git a/inc/Form/InputElement.php b/inc/Form/InputElement.php
index 4f644c0f1..939d911c1 100644
--- a/inc/Form/InputElement.php
+++ b/inc/Form/InputElement.php
@@ -4,7 +4,8 @@ namespace dokuwiki\Form;
 /**
  * Class InputElement
  *
- * Base class for all input elements. Uses a wrapping label.
+ * Base class for all input elements. Uses a wrapping label when label
+ * text is given.
  *
  * @todo figure out how to make wrapping or related label configurable
  * @package dokuwiki\Form
@@ -13,7 +14,7 @@ class InputElement extends Element {
     /**
      * @var Label
      */
-    protected $label;
+    protected $label = null;
 
     /**
      * @var bool if the element should reflect posted values
@@ -25,10 +26,19 @@ class InputElement extends Element {
      * @param string $name The name of this form element
      * @param string $label The label text for this element
      */
-    public function __construct($type, $name, $label) {
+    public function __construct($type, $name, $label = '') {
         parent::__construct($type, array('name' => $name));
         $this->attr('name', $name);
-        $this->label = new Label($label);
+        if($label) $this->label = new Label($label);
+    }
+
+    /**
+     * Returns the label element if there's one set
+     *
+     * @return Label|null
+     */
+    public function getLabel() {
+        return $this->label;
     }
 
     /**
@@ -52,7 +62,7 @@ class InputElement extends Element {
      * @return string|$this
      */
     public function id($id = null) {
-        $this->label->attr('for', $id);
+        if($this->label) $this->label->attr('for', $id);
         return parent::id($id);
     }
 
@@ -65,7 +75,7 @@ class InputElement extends Element {
      * @return $this
      */
     public function addClass($class) {
-        $this->label->addClass($class);
+        if($this->label) $this->label->addClass($class);
         return parent::addClass($class);
     }
 
@@ -138,9 +148,13 @@ class InputElement extends Element {
      * @return string
      */
     public function toHTML() {
-        return '<label ' . buildAttributes($this->label->attrs()) . '>' . DOKU_LF .
-        '<span>' . hsc($this->label->label) . '</span>' . DOKU_LF .
-        $this->mainElementHTML() . DOKU_LF .
-        '</label>';
+        if($this->label) {
+            return '<label ' . buildAttributes($this->label->attrs()) . '>' . DOKU_LF .
+            '<span>' . hsc($this->label->label) . '</span>' . DOKU_LF .
+            $this->mainElementHTML() . DOKU_LF .
+            '</label>';
+        } else {
+            return $this->mainElementHTML();
+        }
     }
 }
diff --git a/inc/Form/LegacyForm.php b/inc/Form/LegacyForm.php
new file mode 100644
index 000000000..edd263ee7
--- /dev/null
+++ b/inc/Form/LegacyForm.php
@@ -0,0 +1,156 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class LegacyForm
+ *
+ * Provides a compatibility layer to the old Doku_Form API
+ *
+ * This can be used to work with the modern API on forms provided by old events for
+ * example. When you start new forms, just use Form\Form
+ *
+ * @package dokuwiki\Form
+ */
+class LegacyForm extends Form {
+
+    /**
+     * Creates a new modern form from an old legacy Doku_Form
+     *
+     * @param \Doku_Form $oldform
+     */
+    public function __construct(\Doku_Form $oldform) {
+        parent::__construct($oldform->params);
+
+        $this->hidden = $oldform->_hidden;
+
+        foreach($oldform->_content as $element) {
+            list($ctl, $attr) = $this->parseLegacyAttr($element);
+
+            if(is_array($element)) {
+                switch($ctl['elem']) {
+                    case 'wikitext':
+                        $this->addTextarea('wikitext')
+                             ->attrs($attr)
+                             ->id('wiki__text')
+                             ->val($ctl['text'])
+                             ->addClass($ctl['class']);
+                        break;
+                    case 'textfield':
+                        $this->addTextInput($ctl['name'], $ctl['text'])
+                             ->attrs($attr)
+                             ->id($ctl['id'])
+                             ->addClass($ctl['class']);
+                        break;
+                    case 'passwordfield':
+                        $this->addPasswordInput($ctl['name'], $ctl['text'])
+                             ->attrs($attr)
+                             ->id($ctl['id'])
+                             ->addClass($ctl['class']);
+                        break;
+                    case 'checkboxfield':
+                        $this->addCheckbox($ctl['name'], $ctl['text'])
+                             ->attrs($attr)
+                             ->id($ctl['id'])
+                             ->addClass($ctl['class']);
+                        break;
+                    case 'radiofield':
+                        $this->addRadioButton($ctl['name'], $ctl['text'])
+                             ->attrs($attr)
+                             ->id($ctl['id'])
+                             ->addClass($ctl['class']);
+                        break;
+
+                    case 'tag':
+                    case 'opentag':
+                    case 'closetag':
+                    case 'openfieldset':
+                    case 'closefieldset':
+                    case 'button':
+                    case 'field':
+                    case 'fieldright':
+                    case 'filefield':
+                    case 'menufield':
+                    case 'listboxfield':
+                        throw new \UnexpectedValueException('Unsupported legacy field ' . $ctl['elem']);
+                        break;
+                    default:
+                        throw new \UnexpectedValueException('Unknown legacy field ' . $ctl['elem']);
+
+                }
+            } else {
+                $this->addHTML($element);
+            }
+        }
+
+    }
+
+    /**
+     * Parses out what is the elements attributes and what is control info
+     *
+     * @param array $legacy
+     * @return array
+     */
+    protected function parseLegacyAttr($legacy) {
+        $attributes = array();
+        $control = array();
+
+        foreach($legacy as $key => $val) {
+            if($key{0} == '_') {
+                $control[substr($key, 1)] = $val;
+            } elseif($key == 'name') {
+                $control[$key] = $val;
+            } elseif($key == 'id') {
+                $control[$key] = $val;
+            } else {
+                $attributes[$key] = $val;
+            }
+        }
+
+        return array($control, $attributes);
+    }
+
+    /**
+     * Translates our types to the legacy types
+     *
+     * @param string $type
+     * @return string
+     */
+    protected function legacyType($type) {
+        static $types = array(
+            'text' => 'textfield',
+            'password' => 'passwordfield',
+            'checkbox' => 'checkboxfield',
+            'radio' => 'radiofield',
+        );
+        if(isset($types[$type])) return $types[$type];
+        return $type;
+    }
+
+    /**
+     * Creates an old legacy form from this modern form's data
+     *
+     * @return \Doku_Form
+     */
+    public function toLegacy() {
+        $this->balanceFieldsets();
+
+        $legacy = new \Doku_Form($this->attrs());
+        $legacy->_hidden = $this->hidden;
+        foreach($this->elements as $element) {
+            if(is_a($element, 'dokuwiki\Form\HTMLElement')) {
+                $legacy->_content[] = $element->toHTML();
+            } elseif(is_a($element, 'dokuwiki\Form\InputElement')) {
+                /** @var InputElement $element */
+                $data = $element->attrs();
+                $data['_elem'] = $this->legacyType($element->getType());
+                $label = $element->getLabel();
+                if($label) {
+                    $data['_class'] = $label->attr('class');
+                }
+                $legacy->_content[] = $data;
+            }
+        }
+
+        return $legacy;
+    }
+}
diff --git a/inc/Form/TextareaElement.php b/inc/Form/TextareaElement.php
index a8486266f..9d461fdf5 100644
--- a/inc/Form/TextareaElement.php
+++ b/inc/Form/TextareaElement.php
@@ -18,6 +18,7 @@ class TextareaElement extends InputElement {
      */
     public function __construct($name, $label) {
         parent::__construct('textarea', $name, $label);
+        $this->attr('dir', 'auto');
     }
 
     /**
-- 
cgit v1.2.3


From 64744a10c5578602141ae2977274eec3fcff1f44 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 8 May 2015 20:37:06 +0200
Subject: more elements and work on the legacy support

---
 inc/Form/FieldsetCloseElement.php | 64 ++++++++++++++++++++++++++++++++++++++
 inc/Form/FieldsetOpenElement.php  | 36 ++++++++++++++++++++++
 inc/Form/Form.php                 | 65 ++++++++++++++++++++++++++++++++++++++-
 inc/Form/HTMLElement.php          | 23 ++------------
 inc/Form/Label.php                | 25 ++-------------
 inc/Form/LegacyForm.php           | 27 +++++++++++++++-
 inc/Form/TagCloseElement.php      | 30 ++++++++++++++++++
 inc/Form/TagElement.php           | 29 +++++++++++++++++
 inc/Form/TagOpenElement.php       | 30 ++++++++++++++++++
 inc/Form/ValueElement.php         | 45 +++++++++++++++++++++++++++
 10 files changed, 329 insertions(+), 45 deletions(-)
 create mode 100644 inc/Form/FieldsetCloseElement.php
 create mode 100644 inc/Form/FieldsetOpenElement.php
 create mode 100644 inc/Form/TagCloseElement.php
 create mode 100644 inc/Form/TagElement.php
 create mode 100644 inc/Form/TagOpenElement.php
 create mode 100644 inc/Form/ValueElement.php

diff --git a/inc/Form/FieldsetCloseElement.php b/inc/Form/FieldsetCloseElement.php
new file mode 100644
index 000000000..0de84e251
--- /dev/null
+++ b/inc/Form/FieldsetCloseElement.php
@@ -0,0 +1,64 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class FieldsetCloseElement
+ *
+ * Closes an open Fieldset
+ *
+ * @package dokuwiki\Form
+ */
+class FieldsetCloseElement extends TagCloseElement {
+
+    /**
+     * @param array $attributes
+     */
+    public function __construct($attributes = array()) {
+        parent::__construct('tagclose', $attributes);
+    }
+
+    /**
+     * do not call this
+     *
+     * @param $class
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function addClass($class) {
+        throw new \BadMethodCallException('You can\t add classes to closing tag');
+    }
+
+    /**
+     * do not call this
+     *
+     * @param $id
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function id($id = null) {
+        throw new \BadMethodCallException('You can\t add ID to closing tag');
+    }
+
+    /**
+     * do not call this
+     *
+     * @param $name
+     * @param $value
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function attr($name, $value = null) {
+        throw new \BadMethodCallException('You can\t add attributes to closing tag');
+    }
+
+    /**
+     * do not call this
+     *
+     * @param $attributes
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function attrs($attributes = null) {
+        throw new \BadMethodCallException('You can\t add attributes to closing tag');
+    }
+}
diff --git a/inc/Form/FieldsetOpenElement.php b/inc/Form/FieldsetOpenElement.php
new file mode 100644
index 000000000..a7de461fa
--- /dev/null
+++ b/inc/Form/FieldsetOpenElement.php
@@ -0,0 +1,36 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class FieldsetOpenElement
+ *
+ * Opens a Fieldset with an optional legend
+ *
+ * @package dokuwiki\Form
+ */
+class FieldsetOpenElement extends TagOpenElement {
+
+    /**
+     * @param string $legend
+     * @param array $attributes
+     */
+    public function __construct($legend='', $attributes = array()) {
+        // this is a bit messy and we just do it for the nicer class hierarchy
+        // the parent would expect the tag in $value but we're storing the
+        // legend there, so we have to set the type manually
+        parent::__construct($legend, $attributes);
+        $this->type = 'fieldsetopen';
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    public function toHTML() {
+        $html = '<fieldset '.buildAttributes($this->attrs()).'>';
+        $legend = $this->val();
+        if($legend) $html .= DOKU_LF.'<legend>'.hsc($legend).'</legend>';
+        return $html;
+    }
+}
diff --git a/inc/Form/Form.php b/inc/Form/Form.php
index 19cc05065..420399fb1 100644
--- a/inc/Form/Form.php
+++ b/inc/Form/Form.php
@@ -67,6 +67,8 @@ class Form extends Element {
         return $this;
     }
 
+    #region Element adding functions
+
     /**
      * Adds an element to the end of the form
      *
@@ -149,12 +151,73 @@ class Form extends Element {
      *
      * @param $html
      * @param int $pos
-     * @return Element
+     * @return HTMLElement
      */
     public function addHTML($html, $pos = -1) {
         return $this->addElement(new HTMLElement($html), $pos);
     }
 
+    /**
+     * Add a closed HTML tag to the form
+     *
+     * @param $tag
+     * @param int $pos
+     * @return TagElement
+     */
+    public function addTag($tag, $pos = -1) {
+        return $this->addElement(new TagElement($tag), $pos);
+    }
+
+    /**
+     * Add an open HTML tag to the form
+     *
+     * Be sure to close it again!
+     *
+     * @param $tag
+     * @param int $pos
+     * @return TagOpenElement
+     */
+    public function addTagOpen($tag, $pos = -1) {
+        return $this->addElement(new TagOpenElement($tag), $pos);
+    }
+
+    /**
+     * Add a closing HTML tag to the form
+     *
+     * Be sure it had been opened before
+     *
+     * @param $tag
+     * @param int $pos
+     * @return TagCloseElement
+     */
+    public function addTagClose($tag, $pos = -1) {
+        return $this->addElement(new TagCloseElement($tag), $pos);
+    }
+
+
+    /**
+     * Open a Fieldset
+     *
+     * @param $legend
+     * @param int $pos
+     * @return FieldsetOpenElement
+     */
+    public function addFieldsetOpen($legend='', $pos = -1) {
+        return $this->addElement(new FieldsetOpenElement($legend), $pos);
+    }
+
+    /**
+     * Close a fieldset
+     *
+     * @param int $pos
+     * @return TagCloseElement
+     */
+    public function addFieldsetClose($pos = -1) {
+        return $this->addElement(new FieldsetCloseElement(), $pos);
+    }
+
+    #endregion
+
     protected function balanceFieldsets() {
         //todo implement!
     }
diff --git a/inc/Form/HTMLElement.php b/inc/Form/HTMLElement.php
index 06f27d736..591cf472f 100644
--- a/inc/Form/HTMLElement.php
+++ b/inc/Form/HTMLElement.php
@@ -8,33 +8,14 @@ namespace dokuwiki\Form;
  *
  * @package dokuwiki\Form
  */
-class HTMLElement extends Element {
+class HTMLElement extends ValueElement {
 
-    /**
-     * @var string the raw HTML held by this element
-     */
-    protected $html = '';
 
     /**
      * @param string $html
      */
     public function __construct($html) {
-        parent::__construct('html');
-        $this->val($html);
-    }
-
-    /**
-     * Get or set the element's content
-     *
-     * @param null|string $html
-     * @return string|$this
-     */
-    public function val($html = null) {
-        if($html !== null) {
-            $this->html = $html;
-            return $this;
-        }
-        return $this->html;
+        parent::__construct('html', $html);
     }
 
     /**
diff --git a/inc/Form/Label.php b/inc/Form/Label.php
index c8a862613..8dcd7cd5f 100644
--- a/inc/Form/Label.php
+++ b/inc/Form/Label.php
@@ -5,11 +5,7 @@ namespace dokuwiki\Form;
  * Class Label
  * @package dokuwiki\Form
  */
-class Label extends Element {
-    /**
-     * @var string the actual label text
-     */
-    public $label = '';
+class Label extends ValueElement {
 
     /**
      * Creates a new Label
@@ -17,22 +13,7 @@ class Label extends Element {
      * @param string $label
      */
     public function __construct($label) {
-        parent::__construct('label');
-        $this->label = $label;
-    }
-
-    /**
-     * Get or set the element's label text
-     *
-     * @param null|string $value
-     * @return string|$this
-     */
-    public function val($value = null) {
-        if($value !== null) {
-            $this->label = $value;
-            return $this;
-        }
-        return $this->label;
+        parent::__construct('label', $label);
     }
 
     /**
@@ -41,6 +22,6 @@ class Label extends Element {
      * @return string
      */
     public function toHTML() {
-        return '<label ' . buildAttributes($this->attrs()) . '>' . hsc($this->label) . '</label>';
+        return '<label ' . buildAttributes($this->attrs()) . '>' . hsc($this->val()) . '</label>';
     }
 }
diff --git a/inc/Form/LegacyForm.php b/inc/Form/LegacyForm.php
index edd263ee7..1b47ba204 100644
--- a/inc/Form/LegacyForm.php
+++ b/inc/Form/LegacyForm.php
@@ -59,12 +59,33 @@ class LegacyForm extends Form {
                              ->id($ctl['id'])
                              ->addClass($ctl['class']);
                         break;
-
                     case 'tag':
+                        $this->addTag($ctl['tag'])
+                             ->attrs($attr)
+                             ->attr('name', $ctl['name'])
+                             ->id($ctl['id'])
+                             ->addClass($ctl['class']);
+                        break;
                     case 'opentag':
+                        $this->addTagOpen($ctl['tag'])
+                             ->attrs($attr)
+                             ->attr('name', $ctl['name'])
+                             ->id($ctl['id'])
+                             ->addClass($ctl['class']);
+                        break;
                     case 'closetag':
+                        $this->addTagClose($ctl['tag']);
+                        break;
                     case 'openfieldset':
+                        $this->addFieldsetOpen($ctl['legend'])
+                            ->attrs($attr)
+                            ->attr('name', $ctl['name'])
+                            ->id($ctl['id'])
+                            ->addClass($ctl['class']);
+                        break;
                     case 'closefieldset':
+                        $this->addFieldsetClose();
+                        break;
                     case 'button':
                     case 'field':
                     case 'fieldright':
@@ -121,6 +142,10 @@ class LegacyForm extends Form {
             'password' => 'passwordfield',
             'checkbox' => 'checkboxfield',
             'radio' => 'radiofield',
+            'tagopen' => 'opentag',
+            'tagclose' => 'closetag',
+            'fieldsetopen' => 'openfieldset',
+            'fieldsetclose' => 'closefieldset',
         );
         if(isset($types[$type])) return $types[$type];
         return $type;
diff --git a/inc/Form/TagCloseElement.php b/inc/Form/TagCloseElement.php
new file mode 100644
index 000000000..896945b97
--- /dev/null
+++ b/inc/Form/TagCloseElement.php
@@ -0,0 +1,30 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class TagCloseElement
+ *
+ * Creates an HTML close tag. You have to make sure it has been opened
+ * before or this will produce invalid HTML
+ *
+ * @package dokuwiki\Form
+ */
+class TagCloseElement extends ValueElement {
+
+    /**
+     * @param string $tag
+     * @param array $attributes
+     */
+    public function __construct($tag, $attributes = array()) {
+        parent::__construct('tagclose', $tag, $attributes);
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    public function toHTML() {
+        return '</'.$this->val().'>';
+    }
+}
diff --git a/inc/Form/TagElement.php b/inc/Form/TagElement.php
new file mode 100644
index 000000000..ea5144c9c
--- /dev/null
+++ b/inc/Form/TagElement.php
@@ -0,0 +1,29 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class TagElement
+ *
+ * Creates a self closing HTML tag
+ *
+ * @package dokuwiki\Form
+ */
+class TagElement extends ValueElement {
+
+    /**
+     * @param string $tag
+     * @param array $attributes
+     */
+    public function __construct($tag, $attributes = array()) {
+        parent::__construct('tag', $tag, $attributes);
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    public function toHTML() {
+        return '<'.$this->val().' '.buildAttributes($this->attrs()).' />';
+    }
+}
diff --git a/inc/Form/TagOpenElement.php b/inc/Form/TagOpenElement.php
new file mode 100644
index 000000000..0afe97b45
--- /dev/null
+++ b/inc/Form/TagOpenElement.php
@@ -0,0 +1,30 @@
+<?php
+namespace dokuwiki\Form;
+
+/**
+ * Class TagOpenElement
+ *
+ * Creates an open HTML tag. You have to make sure you close it
+ * again or this will produce invalid HTML
+ *
+ * @package dokuwiki\Form
+ */
+class TagOpenElement extends ValueElement {
+
+    /**
+     * @param string $tag
+     * @param array $attributes
+     */
+    public function __construct($tag, $attributes = array()) {
+        parent::__construct('tagopen', $tag, $attributes);
+    }
+
+    /**
+     * The HTML representation of this element
+     *
+     * @return string
+     */
+    public function toHTML() {
+        return '<'.$this->val().' '.buildAttributes($this->attrs()).'>';
+    }
+}
diff --git a/inc/Form/ValueElement.php b/inc/Form/ValueElement.php
new file mode 100644
index 000000000..753704c70
--- /dev/null
+++ b/inc/Form/ValueElement.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace dokuwiki\Form;
+
+/**
+ * Class ValueElement
+ *
+ * Just like an Element but it's value is not part of its attributes
+ *
+ * What the value is (tag name, content, etc) is defined by the actual implementations
+ *
+ * @package dokuwiki\Form
+ */
+abstract class ValueElement extends Element {
+
+    /**
+     * @var string holds the element's value
+     */
+    protected $value = '';
+
+    /**
+     * @param string $type
+     * @param array $value
+     * @param array $attributes
+     */
+    public function __construct($type, $value, $attributes = array()) {
+        parent::__construct($type, $attributes);
+        $this->val($value);
+    }
+
+    /**
+     * Get or set the element's value
+     *
+     * @param null|string $value
+     * @return string|$this
+     */
+    public function val($value = null) {
+        if($value !== null) {
+            $this->value = $value;
+            return $this;
+        }
+        return $this->value;
+    }
+
+}
-- 
cgit v1.2.3


From 6c0002048504e43b399abece0668afa2b5c87a07 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Fri, 8 May 2015 17:11:44 -0400
Subject: Limit number of lines to replace.

---
 _test/tests/inc/io_replaceinfile.test.php | 58 +++++++++++++++++++++++++++++++
 inc/io.php                                | 12 +++++--
 2 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 _test/tests/inc/io_replaceinfile.test.php

diff --git a/_test/tests/inc/io_replaceinfile.test.php b/_test/tests/inc/io_replaceinfile.test.php
new file mode 100644
index 000000000..98f21868f
--- /dev/null
+++ b/_test/tests/inc/io_replaceinfile.test.php
@@ -0,0 +1,58 @@
+<?php
+
+class io_replaceinfile_test extends DokuWikiTest {
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_zlib() {
+        if (!extension_loaded('zlib')) {
+            $this->markTestSkipped('skipping all zlib tests.  Need zlib extension');
+        }
+    }
+
+    /*
+     * dependency for tests needing zlib extension to pass
+     */
+    public function test_ext_bz2() {
+        if (!extension_loaded('bz2')) {
+            $this->markTestSkipped('skipping all bzip2 tests.  Need bz2 extension');
+        }
+    }
+
+    function _write($file){
+        $contents = "The\012Delete\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012";
+        io_saveFile($file, $contents);
+        // Replace one, no regex
+        $this->assertTrue(io_replaceInFile($file, "Delete\012", "Delete00\012", false, 1));
+        $this->assertEquals("The\012Delete00\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012", io_readFile($file));
+        // Replace all, no regex
+        $this->assertTrue(io_replaceInFile($file, "Delete\012", "DeleteX\012", false, -1));
+        $this->assertEquals("The\012Delete00\012DeleteX\012Delete01\012Delete02\012DeleteX\012DeleteX\012Test\012", io_readFile($file));
+        // Replace two, regex and backreference
+        $this->assertTrue(io_replaceInFile($file, "#Delete(\\d+)\012#", "\\1\012", true, 2));
+        $this->assertEquals("The\01200\012DeleteX\01201\012Delete02\012DeleteX\012DeleteX\012Test\012", io_readFile($file));
+        // Delete and insert, no regex
+        $this->assertTrue(io_replaceInFile($file, "DeleteX\012", "Replace\012", false, 0));
+        $this->assertEquals("The\01200\01201\012Delete02\012Test\012Replace\012", io_readFile($file));
+    }
+
+    function test_replace(){
+        $this->_write(TMP_DIR.'/test.txt');
+    }
+
+    /**
+     * @depends test_ext_zlib
+     */
+    function test_gzwrite(){
+        $this->_write(TMP_DIR.'/test.txt.gz');
+    }
+
+    /**
+     * @depends test_ext_bz2
+     */
+    function test_bzwrite(){
+        $this->_write(TMP_DIR.'/test.txt.bz2');
+    }
+
+}
diff --git a/inc/io.php b/inc/io.php
index 11a3fa77f..dbb42114b 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -313,10 +313,16 @@ function io_replaceInFile($file, $oldline, $newline, $regex=false, $maxlines=0)
 
     // remove all matching lines
     if ($regex) {
-        if($maxlines == 0) {
-            $lines = preg_grep($oldline, $lines, PREG_GREP_INVERT);
+        if($maxlines > 0) {
+            $matches = preg_grep($oldline, $lines);
+            $count = 0;
+            foreach($matches as $ix=>$m) {
+                $lines[$ix] = preg_replace($oldline, $newline, $m);
+                if(++$count >= $maxlines) break;
+            }
         } else {
-            $lines = preg_replace($oldline, $newline, $lines, $maxlines);
+            $lines = ($maxlines == 0) ? preg_grep($oldline, $lines, PREG_GREP_INVERT)
+                                      : preg_replace($oldline, $newline, $lines, $maxlines);
         }
     } else {
         $count = 0;
-- 
cgit v1.2.3


From 0c26fb18171bc6264c1b0b2dbdfddc34de5d579e Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Fri, 8 May 2015 17:13:32 -0400
Subject: Don't run redundant tests

io_deleteFromFile is a special case of io_replaceInFile. Since
the io_replace tests check compressed files, it doesn't have to
be done in the io_delete test.
---
 _test/tests/inc/io_deletefromfile.test.php | 39 ++----------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/_test/tests/inc/io_deletefromfile.test.php b/_test/tests/inc/io_deletefromfile.test.php
index 63951f548..e86150aac 100644
--- a/_test/tests/inc/io_deletefromfile.test.php
+++ b/_test/tests/inc/io_deletefromfile.test.php
@@ -2,25 +2,8 @@
 
 class io_deletefromfile_test extends DokuWikiTest {
 
-    /*
-     * dependency for tests needing zlib extension to pass
-     */
-    public function test_ext_zlib() {
-        if (!extension_loaded('zlib')) {
-            $this->markTestSkipped('skipping all zlib tests.  Need zlib extension');
-        }
-    }
-
-    /*
-     * dependency for tests needing zlib extension to pass
-     */
-    public function test_ext_bz2() {
-        if (!extension_loaded('bz2')) {
-            $this->markTestSkipped('skipping all bzip2 tests.  Need bz2 extension');
-        }
-    }
-
-    function _write($file){
+    function test_delete(){
+        $file = TMP_DIR.'/test.txt';
         $contents = "The\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012";
         io_saveFile($file, $contents);
         $this->assertTrue(io_deleteFromFile($file, "Delete\012"));
@@ -29,22 +12,4 @@ class io_deletefromfile_test extends DokuWikiTest {
         $this->assertEquals("The\012DeleteX\012Test\012", io_readFile($file));
     }
 
-    function test_delete(){
-        $this->_write(TMP_DIR.'/test.txt');
-    }
-
-    /**
-     * @depends test_ext_zlib
-     */
-    function test_gzwrite(){
-        $this->_write(TMP_DIR.'/test.txt.gz');
-    }
-
-    /**
-     * @depends test_ext_bz2
-     */
-    function test_bzwrite(){
-        $this->_write(TMP_DIR.'/test.txt.bz2');
-    }
-
 }
-- 
cgit v1.2.3


From 2b71c2eece46d1e977fa596ed57b74e04a9aaf6b Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Fri, 8 May 2015 17:57:02 -0400
Subject: Fix variable name typo

---
 lib/plugins/acl/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 2dfdbbda5..cdd96be56 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -691,7 +691,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
         $new_acl = "$acl_scope\t$acl_user\t$acl_level\n";
 
-        return io_saveFile($config_cascade['acl']['default'], $new_config, true);
+        return io_saveFile($config_cascade['acl']['default'], $new_acl, true);
     }
 
     /**
-- 
cgit v1.2.3


From 370c645068595c6750cee2b38eb96aeaac3a9dbb Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 11 May 2015 19:52:12 +0200
Subject: fixed label output

---
 inc/Form/InputElement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/Form/InputElement.php b/inc/Form/InputElement.php
index 939d911c1..5908f7d11 100644
--- a/inc/Form/InputElement.php
+++ b/inc/Form/InputElement.php
@@ -150,7 +150,7 @@ class InputElement extends Element {
     public function toHTML() {
         if($this->label) {
             return '<label ' . buildAttributes($this->label->attrs()) . '>' . DOKU_LF .
-            '<span>' . hsc($this->label->label) . '</span>' . DOKU_LF .
+            '<span>' . hsc($this->label->val()) . '</span>' . DOKU_LF .
             $this->mainElementHTML() . DOKU_LF .
             '</label>';
         } else {
-- 
cgit v1.2.3


From 1f5d8b65a983fe0914971ee0bb4e5e58cbf8c8a7 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 11 May 2015 20:31:16 +0200
Subject: balance fieldsets

---
 _test/tests/inc/form/form.test.php | 87 ++++++++++++++++++++++++++++++++++++++
 inc/Form/FieldsetCloseElement.php  | 46 +++-----------------
 inc/Form/Form.php                  | 39 +++++++++++++++--
 inc/Form/TagCloseElement.php       | 46 ++++++++++++++++++++
 4 files changed, 175 insertions(+), 43 deletions(-)

diff --git a/_test/tests/inc/form/form.test.php b/_test/tests/inc/form/form.test.php
index cdf3e5a3a..3ae832b2c 100644
--- a/_test/tests/inc/form/form.test.php
+++ b/_test/tests/inc/form/form.test.php
@@ -2,6 +2,25 @@
 
 use dokuwiki\Form;
 
+/**
+ * makes form internals accessible for testing
+ */
+class TestForm extends Form\Form {
+    /**
+     * @return array list of element types
+     */
+    function getElementTypeList() {
+        $list = array();
+        foreach($this->elements as $element) $list[] = $element->getType();
+        return $list;
+    }
+
+    public function balanceFieldsets() {
+        parent::balanceFieldsets();
+    }
+
+}
+
 class form_form_test extends DokuWikiTest {
 
     /**
@@ -25,4 +44,72 @@ class form_form_test extends DokuWikiTest {
         $this->assertTrue($pq->find('input[name=sectok]')->length == 1);
     }
 
+
+    function test_fieldsetbalance() {
+        $form = new TestForm();
+        $form->addFieldsetOpen();
+        $form->addHTML('ignored');
+        $form->addFieldsetClose();
+        $form->balanceFieldsets();
+
+        $this->assertEquals(
+            array(
+                'fieldsetopen',
+                'html',
+                'fieldsetclose'
+            ),
+            $form->getElementTypeList()
+        );
+
+        $form = new TestForm();
+        $form->addHTML('ignored');
+        $form->addFieldsetClose();
+        $form->balanceFieldsets();
+
+        $this->assertEquals(
+            array(
+                'fieldsetopen',
+                'html',
+                'fieldsetclose'
+            ),
+            $form->getElementTypeList()
+        );
+
+
+        $form = new TestForm();
+        $form->addFieldsetOpen();
+        $form->addHTML('ignored');
+        $form->balanceFieldsets();
+
+        $this->assertEquals(
+            array(
+                'fieldsetopen',
+                'html',
+                'fieldsetclose'
+            ),
+            $form->getElementTypeList()
+        );
+
+        $form = new TestForm();
+        $form->addHTML('ignored');
+        $form->addFieldsetClose();
+        $form->addHTML('ignored');
+        $form->addFieldsetOpen();
+        $form->addHTML('ignored');
+        $form->balanceFieldsets();
+
+        $this->assertEquals(
+            array(
+                'fieldsetopen',
+                'html',
+                'fieldsetclose',
+                'html',
+                'fieldsetopen',
+                'html',
+                'fieldsetclose'
+            ),
+            $form->getElementTypeList()
+        );
+    }
+
 }
diff --git a/inc/Form/FieldsetCloseElement.php b/inc/Form/FieldsetCloseElement.php
index 0de84e251..8f26717aa 100644
--- a/inc/Form/FieldsetCloseElement.php
+++ b/inc/Form/FieldsetCloseElement.php
@@ -14,51 +14,17 @@ class FieldsetCloseElement extends TagCloseElement {
      * @param array $attributes
      */
     public function __construct($attributes = array()) {
-        parent::__construct('tagclose', $attributes);
+        parent::__construct('', $attributes);
+        $this->type = 'fieldsetclose';
     }
 
-    /**
-     * do not call this
-     *
-     * @param $class
-     * @return void
-     * @throws \BadMethodCallException
-     */
-    public function addClass($class) {
-        throw new \BadMethodCallException('You can\t add classes to closing tag');
-    }
-
-    /**
-     * do not call this
-     *
-     * @param $id
-     * @return void
-     * @throws \BadMethodCallException
-     */
-    public function id($id = null) {
-        throw new \BadMethodCallException('You can\t add ID to closing tag');
-    }
-
-    /**
-     * do not call this
-     *
-     * @param $name
-     * @param $value
-     * @return void
-     * @throws \BadMethodCallException
-     */
-    public function attr($name, $value = null) {
-        throw new \BadMethodCallException('You can\t add attributes to closing tag');
-    }
 
     /**
-     * do not call this
+     * The HTML representation of this element
      *
-     * @param $attributes
-     * @return void
-     * @throws \BadMethodCallException
+     * @return string
      */
-    public function attrs($attributes = null) {
-        throw new \BadMethodCallException('You can\t add attributes to closing tag');
+    public function toHTML() {
+        return '</fieldset>';
     }
 }
diff --git a/inc/Form/Form.php b/inc/Form/Form.php
index 420399fb1..30e16615c 100644
--- a/inc/Form/Form.php
+++ b/inc/Form/Form.php
@@ -194,7 +194,6 @@ class Form extends Element {
         return $this->addElement(new TagCloseElement($tag), $pos);
     }
 
-
     /**
      * Open a Fieldset
      *
@@ -202,7 +201,7 @@ class Form extends Element {
      * @param int $pos
      * @return FieldsetOpenElement
      */
-    public function addFieldsetOpen($legend='', $pos = -1) {
+    public function addFieldsetOpen($legend = '', $pos = -1) {
         return $this->addElement(new FieldsetOpenElement($legend), $pos);
     }
 
@@ -218,8 +217,42 @@ class Form extends Element {
 
     #endregion
 
+    /**
+     * Adjust the elements so that fieldset open and closes are matching
+     */
     protected function balanceFieldsets() {
-        //todo implement!
+        $lastclose = 0;
+        $isopen = false;
+        $len = count($this->elements);
+
+        for($pos = 0; $pos < $len; $pos++) {
+            $type = $this->elements[$pos]->getType();
+            if($type == 'fieldsetopen') {
+                if($isopen) {
+                    //close previous feldset
+                    $this->addFieldsetClose($pos);
+                    $lastclose = $pos + 1;
+                    $pos++;
+                    $len++;
+                }
+                $isopen = true;
+            } else if($type == 'fieldsetclose') {
+                if(!$isopen) {
+                    // make sure there was a fieldsetopen
+                    // either right after the last close or at the begining
+                    $this->addFieldsetOpen('', $lastclose);
+                    $len++;
+                    $pos++;
+                }
+                $lastclose = $pos;
+                $isopen = false;
+            }
+        }
+
+        // close open fieldset at the end
+        if($isopen) {
+            $this->addFieldsetClose();
+        }
     }
 
     /**
diff --git a/inc/Form/TagCloseElement.php b/inc/Form/TagCloseElement.php
index 896945b97..dc0264c21 100644
--- a/inc/Form/TagCloseElement.php
+++ b/inc/Form/TagCloseElement.php
@@ -19,6 +19,51 @@ class TagCloseElement extends ValueElement {
         parent::__construct('tagclose', $tag, $attributes);
     }
 
+    /**
+     * do not call this
+     *
+     * @param $class
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function addClass($class) {
+        throw new \BadMethodCallException('You can\t add classes to closing tag');
+    }
+
+    /**
+     * do not call this
+     *
+     * @param $id
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function id($id = null) {
+        throw new \BadMethodCallException('You can\t add ID to closing tag');
+    }
+
+    /**
+     * do not call this
+     *
+     * @param $name
+     * @param $value
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function attr($name, $value = null) {
+        throw new \BadMethodCallException('You can\t add attributes to closing tag');
+    }
+
+    /**
+     * do not call this
+     *
+     * @param $attributes
+     * @return void
+     * @throws \BadMethodCallException
+     */
+    public function attrs($attributes = null) {
+        throw new \BadMethodCallException('You can\t add attributes to closing tag');
+    }
+
     /**
      * The HTML representation of this element
      *
@@ -27,4 +72,5 @@ class TagCloseElement extends ValueElement {
     public function toHTML() {
         return '</'.$this->val().'>';
     }
+
 }
-- 
cgit v1.2.3


From ef0c211b2ac87b8e3c6e85b600021389be6209bf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 11 May 2015 20:51:58 +0200
Subject: added element query functions

---
 inc/Form/Form.php | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 3 deletions(-)

diff --git a/inc/Form/Form.php b/inc/Form/Form.php
index 30e16615c..2c893fbbc 100644
--- a/inc/Form/Form.php
+++ b/inc/Form/Form.php
@@ -67,17 +67,80 @@ class Form extends Element {
         return $this;
     }
 
-    #region Element adding functions
+    #region element query function
+
+    /**
+     * Returns the numbers of elements in the form
+     *
+     * @return int
+     */
+    public function elementCount() {
+        return count($this->elements);
+    }
+
+    /**
+     * Returns a reference to the element at a position.
+     * A position out-of-bounds will return either the
+     * first (underflow) or last (overflow) element.
+     *
+     * @param $pos
+     * @return Element
+     */
+    public function getElementAt($pos) {
+        if($pos < 0) $pos = count($this->elements) + $pos;
+        if($pos < 0) $pos = 0;
+        if($pos >= count($this->elements)) $pos = count($this->elements) - 1;
+        return $this->elements[$pos];
+    }
 
     /**
-     * Adds an element to the end of the form
+     * Gets the position of the first of a type of element
+     *
+     * @param string $type Element type to look for.
+     * @param int $offset search from this position onward
+     * @return false|int position of element if found, otherwise false
+     */
+    public function findPositionByType($type, $offset = 0) {
+        $len = $this->elementCount();
+        for($pos = $offset; $pos < $len; $pos++) {
+            if($this->elements[$pos]->getType() == $type) {
+                return $pos;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Gets the position of the first element matching the attribute
+     *
+     * @param string $name Name of the attribute
+     * @param string $value Value the attribute should have
+     * @param int $offset search from this position onward
+     * @return false|int position of element if found, otherwise false
+     */
+    public function findPositionByAttribute($name, $value, $offset = 0) {
+        $len = $this->elementCount();
+        for($pos = $offset; $pos < $len; $pos++) {
+            if($this->elements[$pos]->attr($name) == $value) {
+                return $pos;
+            }
+        }
+        return false;
+    }
+
+    #endregion
+
+    #region Element positioning functions
+
+    /**
+     * Adds or inserts an element to the form
      *
      * @param Element $element
      * @param int $pos 0-based position in the form, -1 for at the end
      * @return Element
      */
     public function addElement(Element $element, $pos = -1) {
-        if(is_a($element, 'Doku_Form2')) throw new \InvalidArgumentException('You can\'t add a form to a form');
+        if(is_a($element, '\dokuwiki\Form')) throw new \InvalidArgumentException('You can\'t add a form to a form');
         if($pos < 0) {
             $this->elements[] = $element;
         } else {
@@ -86,6 +149,30 @@ class Form extends Element {
         return $element;
     }
 
+    /**
+     * Replaces an existing element with a new one
+     *
+     * @param Element $element the new element
+     * @param $pos 0-based position of the element to replace
+     */
+    public function replaceElement(Element $element, $pos) {
+        if(is_a($element, '\dokuwiki\Form')) throw new \InvalidArgumentException('You can\'t add a form to a form');
+        array_splice($this->elements, $pos, 1, array($element));
+    }
+
+    /**
+     * Remove an element from the form completely
+     *
+     * @param $pos 0-based position of the element to remove
+     */
+    public function removeElement($pos) {
+        array_splice($this->elements, $pos, 1);
+    }
+
+    #endregion
+
+    #region Element adding functions
+
     /**
      * Adds a text input field
      *
-- 
cgit v1.2.3


From c99a571951a32b7b0499cf969fd5e874ad354ff3 Mon Sep 17 00:00:00 2001
From: Pietroni <pietroni@informatique.univ-paris-diderot.fr>
Date: Wed, 13 May 2015 17:31:08 +0200
Subject: translation update

---
 inc/lang/fr/lang.php                   |  4 ++++
 lib/plugins/authad/lang/fr/lang.php    |  3 +++
 lib/plugins/authldap/lang/fr/lang.php  |  9 +++++++++
 lib/plugins/authmysql/lang/fr/lang.php | 11 +++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/fr/lang.php
 create mode 100644 lib/plugins/authmysql/lang/fr/lang.php

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index ba3158125..74b1edd19 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -36,6 +36,7 @@
  * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
  * @author YoBoY <yoboy@ubuntu-fr.org>
  * @author james <j.mccann@celcat.com>
+ * @author Pietroni <pietroni@informatique.univ-paris-diderot.fr>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -101,6 +102,7 @@ $lang['regmissing']            = 'Désolé, vous devez remplir tous les champs.'
 $lang['reguexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris.';
 $lang['regsuccess']            = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
 $lang['regsuccess2']           = 'L\'utilisateur a été créé.';
+$lang['regfail']               = 'L\'utilisateur n\'a pu être crée.';
 $lang['regmailfail']           = 'On dirait qu\'il y a eu une erreur lors de l\'envoi du mot de passe de messagerie. Veuillez contacter l\'administrateur !';
 $lang['regbadmail']            = 'L\'adresse de courriel semble incorrecte. Si vous pensez que c\'est une erreur, contactez l\'administrateur.';
 $lang['regbadpass']            = 'Les deux mots de passe fournis sont différents, veuillez recommencez.';
@@ -115,6 +117,7 @@ $lang['profdeleteuser']        = 'Supprimer le compte';
 $lang['profdeleted']           = 'Votre compte utilisateur a été supprimé de ce wiki';
 $lang['profconfdelete']        = 'Je veux supprimer mon compte sur ce wiki. </br> Cette action est irréversible.';
 $lang['profconfdeletemissing'] = 'La case de confirmation n\'est pas cochée';
+$lang['proffail']              = 'Le profil utilisateur n\'a pas été mis à jour.';
 $lang['pwdforget']             = 'Mot de passe oublié ? Obtenez-en un nouveau';
 $lang['resendna']              = 'Ce wiki ne permet pas le renvoi de mot de passe.';
 $lang['resendpwd']             = 'Définir un nouveau mot de passe pour';
@@ -358,6 +361,7 @@ $lang['media_perm_read']       = 'Désolé, vous n\'avez pas l\'autorisation de
 $lang['media_perm_upload']     = 'Désolé, vous n\'avez pas l\'autorisation d\'envoyer des fichiers.';
 $lang['media_update']          = 'Envoyer une nouvelle version';
 $lang['media_restore']         = 'Restaurer cette version';
+$lang['media_acl_warning']     = 'En raison des restrictions dans les ACL et de pages cachées, cette liste peut ne pas être complète.';
 $lang['currentns']             = 'Catégorie courante';
 $lang['searchresult']          = 'Résultat de la recherche';
 $lang['plainhtml']             = 'HTML brut';
diff --git a/lib/plugins/authad/lang/fr/lang.php b/lib/plugins/authad/lang/fr/lang.php
index 4999967dc..8b3b95b54 100644
--- a/lib/plugins/authad/lang/fr/lang.php
+++ b/lib/plugins/authad/lang/fr/lang.php
@@ -5,6 +5,9 @@
  * 
  * @author ggallon <gwenael.gallon@mac.com>
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Pietroni <pietroni@informatique.univ-paris-diderot.fr>
  */
 $lang['domain']                = 'Domaine de connexion';
 $lang['authpwdexpire']         = 'Votre mot de passe expirera dans %d jours, vous devriez le changer bientôt.';
+$lang['passchangefail']        = 'Impossible de changer le mot de passe. Il est possible que les règles de sécurité des mots de passe n\'aient pas été respectées.';
+$lang['connectfail']           = 'Impossible de se connecter au serveur Active Directory.';
diff --git a/lib/plugins/authldap/lang/fr/lang.php b/lib/plugins/authldap/lang/fr/lang.php
new file mode 100644
index 000000000..5797bda42
--- /dev/null
+++ b/lib/plugins/authldap/lang/fr/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Pietroni <pietroni@informatique.univ-paris-diderot.fr>
+ */
+$lang['connectfail']           = 'LDAP ne peux se connecter : %s';
+$lang['domainfail']            = 'LDAP ne trouve pas l\'utilisateur dn';
diff --git a/lib/plugins/authmysql/lang/fr/lang.php b/lib/plugins/authmysql/lang/fr/lang.php
new file mode 100644
index 000000000..d5a1e1209
--- /dev/null
+++ b/lib/plugins/authmysql/lang/fr/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Pietroni <pietroni@informatique.univ-paris-diderot.fr>
+ */
+$lang['connectfail']           = 'Impossible de se connecter à la base de données.';
+$lang['userexists']            = 'Désolé, un utilisateur avec cet identifiant existe déjà.';
+$lang['usernotexists']         = 'Désolé, cet utilisateur n\'existe pas.';
+$lang['writefail']             = 'Impossible de modifier les données utilisateur. Veuillez en informer l\'administrateur du Wiki.';
-- 
cgit v1.2.3


From dfd8384e1bf3b38ff9f6f077905b4270aef0b020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard=20D=C3=ADaz?= <edudiaz@scopia.es>
Date: Thu, 14 May 2015 14:05:56 +0200
Subject: translation update

---
 inc/lang/ca/lang.php                     | 9 +++++----
 inc/lang/ca/subscr_form.txt              | 2 +-
 lib/plugins/acl/lang/ca/lang.php         | 4 ++--
 lib/plugins/popularity/lang/ca/lang.php  | 5 +++--
 lib/plugins/revert/lang/ca/lang.php      | 5 +++--
 lib/plugins/usermanager/lang/ca/lang.php | 5 +++--
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 2287ca001..220600dec 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -1,11 +1,12 @@
 <?php
+
 /**
- * catalan language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Carles Bellver <carles.bellver@cent.uji.es>
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author daniel@6temes.cat
+ * @author Eduard Díaz <edudiaz@scopia.es>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -47,6 +48,7 @@ $lang['btn_draftdel']          = 'Suprimeix esborrany';
 $lang['btn_revert']            = 'Restaura';
 $lang['btn_register']          = 'Registra\'m';
 $lang['btn_apply']             = 'Aplica';
+$lang['btn_img_backto']        = 'Torna a %s';
 $lang['loggedinas']            = 'Heu entrat com:';
 $lang['user']                  = 'Nom d\'usuari';
 $lang['pass']                  = 'Contrasenya';
@@ -61,7 +63,7 @@ $lang['badlogin']              = 'Nom d\'usuari o contrasenya incorrectes.';
 $lang['minoredit']             = 'Canvis menors';
 $lang['draftdate']             = 'L\'esborrany s\'ha desat automàticament';
 $lang['nosecedit']             = 'Mentrestant la pàgina ha estat modificada. La informació de seccions estava obsoleta i ha calgut carregar la pàgina sencera.';
-$lang['searchcreatepage']      = "Si no trobeu allò que buscàveu, podeu crear una pàgina nova per mitjà del botó ''Edita aquesta pàgina''.";
+$lang['searchcreatepage']      = 'Si no trobeu allò que buscàveu, podeu crear una pàgina nova per mitjà del botó \'\'Edita aquesta pàgina\'\'.';
 $lang['regmissing']            = 'Heu d\'omplir tots els camps.';
 $lang['reguexists']            = 'Ja existeix un altre usuari amb aquest nom.';
 $lang['regsuccess']            = 'S\'ha creat l\'usuari. La contrasenya s\'ha enviat per correu.';
@@ -226,7 +228,6 @@ $lang['upperns']               = 'Salta a l\'espai superior';
 $lang['metaedit']              = 'Edita metadades';
 $lang['metasaveerr']           = 'No s\'han pogut escriure les metadades';
 $lang['metasaveok']            = 'S\'han desat les metadades';
-$lang['btn_img_backto']        = 'Torna a %s';
 $lang['img_title']             = 'Títol:';
 $lang['img_caption']           = 'Peu d\'imatge:';
 $lang['img_date']              = 'Data:';
diff --git a/inc/lang/ca/subscr_form.txt b/inc/lang/ca/subscr_form.txt
index d3679454f..3c63ce66d 100644
--- a/inc/lang/ca/subscr_form.txt
+++ b/inc/lang/ca/subscr_form.txt
@@ -1,3 +1,3 @@
 ===== Gestió de les Subscripcions =====
 
-Aquesta pàgina podeu gestiona les vostres subscripcions per a les pàgines i els espais actuals.
\ No newline at end of file
+Des d'aquesta pàgina, podeu gestionar les vostres subscripcions per a les pàgines i els espais que seleccioneu. 
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/ca/lang.php b/lib/plugins/acl/lang/ca/lang.php
index bead981f0..18a4a3602 100644
--- a/lib/plugins/acl/lang/ca/lang.php
+++ b/lib/plugins/acl/lang/ca/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * catalan language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Carles Bellver <carles.bellver@cent.uji.es>
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author carles.bellver@gmail.com
diff --git a/lib/plugins/popularity/lang/ca/lang.php b/lib/plugins/popularity/lang/ca/lang.php
index b30846118..9eb1655d2 100644
--- a/lib/plugins/popularity/lang/ca/lang.php
+++ b/lib/plugins/popularity/lang/ca/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Catalan language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Carles Bellver <carles.bellver@cent.uji.es>
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author carles.bellver@cent.uji.es
diff --git a/lib/plugins/revert/lang/ca/lang.php b/lib/plugins/revert/lang/ca/lang.php
index 4f4d518ea..e2755f8d3 100644
--- a/lib/plugins/revert/lang/ca/lang.php
+++ b/lib/plugins/revert/lang/ca/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Catalan language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author carles.bellver@gmail.com
  * @author carles.bellver@cent.uji.es
diff --git a/lib/plugins/usermanager/lang/ca/lang.php b/lib/plugins/usermanager/lang/ca/lang.php
index 6debd73ca..4b07326ab 100644
--- a/lib/plugins/usermanager/lang/ca/lang.php
+++ b/lib/plugins/usermanager/lang/ca/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Catalan language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author carles.bellver@gmail.com
  * @author carles.bellver@cent.uji.es
-- 
cgit v1.2.3


From 1e8a4c188b45c2566c27caaf30e7e952e2337bb6 Mon Sep 17 00:00:00 2001
From: Menashe Tomer <menashesite@gmail.com>
Date: Thu, 14 May 2015 14:50:51 +0200
Subject: translation update

---
 inc/lang/he/lang.php                      | 1 +
 lib/plugins/authldap/lang/he/settings.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index a75a0e9bb..b834ad775 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -14,6 +14,7 @@
  * @author matt carroll <matt.carroll@gmail.com>
  * @author tomer <tomercarolldergicz@gmail.com>
  * @author itsho <itsho.itsho@gmail.com>
+ * @author Menashe Tomer <menashesite@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
diff --git a/lib/plugins/authldap/lang/he/settings.php b/lib/plugins/authldap/lang/he/settings.php
index 357a58c56..10af7010d 100644
--- a/lib/plugins/authldap/lang/he/settings.php
+++ b/lib/plugins/authldap/lang/he/settings.php
@@ -4,5 +4,9 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author matt carroll <matt.carroll@gmail.com>
+ * @author Menashe Tomer <menashesite@gmail.com>
  */
 $lang['starttls']              = 'השתמש בחיבורי TLS';
+$lang['modPass']               = 'האם dokuwiki יכול ליצור סיסמאות LDAP?';
+$lang['debug']                 = 'הצג מידע נוסף על שגיאות';
+$lang['referrals_o_-1']        = 'ברירת מחדל';
-- 
cgit v1.2.3


From d596b86466164e7110a8a9a318048c8feb16ec7f Mon Sep 17 00:00:00 2001
From: Menashe Tomer <menashesite@gmail.com>
Date: Thu, 14 May 2015 14:56:16 +0200
Subject: translation update

---
 inc/lang/he/lang.php                       |  2 ++
 lib/plugins/authad/lang/he/lang.php        |  2 ++
 lib/plugins/authad/lang/he/settings.php    |  8 ++++++++
 lib/plugins/authmysql/lang/he/settings.php | 12 ++++++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 lib/plugins/authad/lang/he/settings.php
 create mode 100644 lib/plugins/authmysql/lang/he/settings.php

diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index a75a0e9bb..37ea704da 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -14,6 +14,7 @@
  * @author matt carroll <matt.carroll@gmail.com>
  * @author tomer <tomercarolldergicz@gmail.com>
  * @author itsho <itsho.itsho@gmail.com>
+ * @author Menashe Tomer <menashesite@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -79,6 +80,7 @@ $lang['regmissing']            = 'עליך למלא את כל השדות, עמך
 $lang['reguexists']            = 'משתמש בשם זה כבר נרשם, עמך הסליחה.';
 $lang['regsuccess']            = 'ההרשמה הצליחה, המשתמש נרשם והודעה נשלחה בדוא״ל.';
 $lang['regsuccess2']           = 'ההרשמה הצליחה, המשתמש נוצר.';
+$lang['regfail']               = 'אין אפשרות ליצור את המשתמש';
 $lang['regmailfail']           = 'שליחת הודעת הדוא״ל כשלה, נא ליצור קשר עם מנהל האתר!';
 $lang['regbadmail']            = 'יתכן כי כתובת הדוא״ל אינה תקפה, אם לא כך הדבר ליצור קשר עם מנהל האתר';
 $lang['regbadpass']            = 'שתי הססמאות אינן זהות זו לזו, נא לנסות שוב.';
diff --git a/lib/plugins/authad/lang/he/lang.php b/lib/plugins/authad/lang/he/lang.php
index 21fd98aef..616d1ab4b 100644
--- a/lib/plugins/authad/lang/he/lang.php
+++ b/lib/plugins/authad/lang/he/lang.php
@@ -4,5 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author tomer <tomercarolldergicz@gmail.com>
+ * @author Menashe Tomer <menashesite@gmail.com>
  */
 $lang['authpwdexpire']         = 'הסיסמה שלך תפוג ב% d ימים, אתה צריך לשנות את זה בקרוב.';
+$lang['passchangefail']        = 'שגיאה בשינוי סיסמה. האם הסיסמה תואמת למדיניות המערכת?';
diff --git a/lib/plugins/authad/lang/he/settings.php b/lib/plugins/authad/lang/he/settings.php
new file mode 100644
index 000000000..b14368130
--- /dev/null
+++ b/lib/plugins/authad/lang/he/settings.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Menashe Tomer <menashesite@gmail.com>
+ */
+$lang['admin_password']        = 'סיסמת המשתמש המוזכן';
diff --git a/lib/plugins/authmysql/lang/he/settings.php b/lib/plugins/authmysql/lang/he/settings.php
new file mode 100644
index 000000000..3671b1bb9
--- /dev/null
+++ b/lib/plugins/authmysql/lang/he/settings.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Menashe Tomer <menashesite@gmail.com>
+ */
+$lang['getUserID']             = 'שאילתת SQL לקבלת מפתח ראשי של המשתמש';
+$lang['UpdateLogin']           = 'שאילתת SQL לעדכון שם המשתמש';
+$lang['UpdatePass']            = 'שאילתת SQL לעדכון סיסמת המשתמש';
+$lang['UpdateEmail']           = 'שאילתת SQL לעדכון כתובת הדוא"ל של המשתמש';
+$lang['UpdateName']            = 'שאילתת SQL לעדכון שם המשתמש';
-- 
cgit v1.2.3


From 9c9643569e11748094bd63810a3d805df0d3e9bf Mon Sep 17 00:00:00 2001
From: Davor Turkalj <turki.bsc@gmail.com>
Date: Thu, 14 May 2015 15:51:29 +0200
Subject: translation update

---
 inc/lang/hr/lang.php                              |  5 ++++-
 lib/plugins/authad/lang/hr/lang.php               |  2 ++
 lib/plugins/authldap/lang/hr/lang.php             |  9 +++++++++
 lib/plugins/authldap/lang/hr/settings.php         |  5 +++++
 lib/plugins/authmysql/lang/hr/lang.php            | 11 +++++++++++
 lib/plugins/extension/lang/hr/intro_install.txt   |  2 +-
 lib/plugins/extension/lang/hr/intro_plugins.txt   |  2 +-
 lib/plugins/extension/lang/hr/intro_search.txt    |  2 +-
 lib/plugins/extension/lang/hr/intro_templates.txt |  2 +-
 9 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/hr/lang.php
 create mode 100644 lib/plugins/authmysql/lang/hr/lang.php

diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index e3e35b5c4..39eaa18c0 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -35,7 +35,7 @@ $lang['btn_secedit']           = 'Uredi';
 $lang['btn_login']             = 'Prijavi se';
 $lang['btn_logout']            = 'Odjavi se';
 $lang['btn_admin']             = 'Administriranje';
-$lang['btn_update']            = 'Dopuni';
+$lang['btn_update']            = 'Nadogradi';
 $lang['btn_delete']            = 'Obriši';
 $lang['btn_back']              = 'Nazad';
 $lang['btn_backlink']          = 'Povratni linkovi';
@@ -73,6 +73,7 @@ $lang['regmissing']            = 'Morate popuniti sva polja.';
 $lang['reguexists']            = 'Korisnik s tim korisničkim imenom već postoji.';
 $lang['regsuccess']            = 'Korisnik je uspješno stvoren i poslana je lozinka emailom.';
 $lang['regsuccess2']           = 'Korisnik je uspješno stvoren.';
+$lang['regfail']               = 'Korisnik ne može biti kreiran.';
 $lang['regmailfail']           = 'Pojavila se greška prilikom slanja lozinke emailom. Kontaktirajte administratora!';
 $lang['regbadmail']            = 'Email adresa nije ispravna, ukoliko ovo smatrate greškom, kontaktirajte administratora.';
 $lang['regbadpass']            = 'Unesene lozinke nisu jednake, pokušajte ponovno.';
@@ -87,6 +88,7 @@ $lang['profdeleteuser']        = 'Obriši korisnika';
 $lang['profdeleted']           = 'Vaš korisnik je obrisan s ovog wiki-a';
 $lang['profconfdelete']        = 'Želim ukloniti mojeg korisnika s ovog wiki-a. <br/> Ova akcija se ne može poništiti.';
 $lang['profconfdeletemissing'] = 'Kvačica za potvrdu nije označena';
+$lang['proffail']              = 'Profil korisnika nije izmijenjen.';
 $lang['pwdforget']             = 'Izgubili ste lozinku? Zatražite novu';
 $lang['resendna']              = 'Ovaj wiki ne podržava ponovno slanje lozinke e-poštom.';
 $lang['resendpwd']             = 'Postavi novu lozinku za';
@@ -332,6 +334,7 @@ $lang['media_perm_read']       = 'Nažalost, nemate prava za čitanje datoteka.'
 $lang['media_perm_upload']     = 'Nažalost, nemate prava za učitavanje datoteka.';
 $lang['media_update']          = 'Učitaj novu verziju';
 $lang['media_restore']         = 'Vrati ovu verziju';
+$lang['media_acl_warning']     = 'Ova lista moguće da nije kompletna zbog ACL ograničenja i skrivenih stranica.';
 $lang['currentns']             = 'Tekući imenički prostor';
 $lang['searchresult']          = 'Rezultati pretraživanja';
 $lang['plainhtml']             = 'Čisti HTML';
diff --git a/lib/plugins/authad/lang/hr/lang.php b/lib/plugins/authad/lang/hr/lang.php
index 8652c69ed..99c5c1623 100644
--- a/lib/plugins/authad/lang/hr/lang.php
+++ b/lib/plugins/authad/lang/hr/lang.php
@@ -7,3 +7,5 @@
  */
 $lang['domain']                = 'Domena za prijavu';
 $lang['authpwdexpire']         = 'Vaša lozinka će isteći za %d dana, trebate ju promijeniti.';
+$lang['passchangefail']        = 'Ne mogu izmijeniti lozinku. Možda nije zadovoljen set pravila za lozinke?';
+$lang['connectfail']           = 'Ne mogu se povezati s Active Directory poslužiteljem.';
diff --git a/lib/plugins/authldap/lang/hr/lang.php b/lib/plugins/authldap/lang/hr/lang.php
new file mode 100644
index 000000000..5e13d1b05
--- /dev/null
+++ b/lib/plugins/authldap/lang/hr/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Davor Turkalj <turki.bsc@gmail.com>
+ */
+$lang['connectfail']           = 'LDAP se ne može spojiti: %s';
+$lang['domainfail']            = 'LDAP ne može pronaći Vaš korisnički dn';
diff --git a/lib/plugins/authldap/lang/hr/settings.php b/lib/plugins/authldap/lang/hr/settings.php
index cb8df7218..5c306d84b 100644
--- a/lib/plugins/authldap/lang/hr/settings.php
+++ b/lib/plugins/authldap/lang/hr/settings.php
@@ -19,9 +19,14 @@ $lang['binddn']                = 'DN opcionalnog korisnika ako anonimni korisnik
 $lang['bindpw']                = 'Lozinka gore navedenog korisnika';
 $lang['userscope']             = 'Ograniči područje za pretragu korisnika';
 $lang['groupscope']            = 'Ograniči područje za pretragu grupa';
+$lang['userkey']               = 'Atribut označava ime; mora biti u skladu s korisničkim filterom.';
 $lang['groupkey']              = 'Članstvo grupa iz svih atributa korisnika (umjesto standardnih AD grupa) npr. grupa iz odjela ili telefonskog broja';
+$lang['modPass']               = 'Da li LDAP lozinka može biti izmijenjena kroz dokuwiki?';
 $lang['debug']                 = 'Prikaži dodatne informacije u slučaju greške';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'koristi podrazumijevano';
+$lang['referrals_o_0']         = 'ne slijedi preporuke';
+$lang['referrals_o_1']         = 'slijedi preporuke';
diff --git a/lib/plugins/authmysql/lang/hr/lang.php b/lib/plugins/authmysql/lang/hr/lang.php
new file mode 100644
index 000000000..3f5dc5d60
--- /dev/null
+++ b/lib/plugins/authmysql/lang/hr/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Davor Turkalj <turki.bsc@gmail.com>
+ */
+$lang['connectfail']           = 'Ne mogu se spojiti na bazu.';
+$lang['userexists']            = 'Oprostite ali korisnik s ovom prijavom već postoji.';
+$lang['usernotexists']         = 'Oprostite ali ovaj korisnik ne postoji.';
+$lang['writefail']             = 'Ne mogu izmijeniti podatke. Molim obavijestite Wiki administratora';
diff --git a/lib/plugins/extension/lang/hr/intro_install.txt b/lib/plugins/extension/lang/hr/intro_install.txt
index fc2d22f52..f3274b0f7 100644
--- a/lib/plugins/extension/lang/hr/intro_install.txt
+++ b/lib/plugins/extension/lang/hr/intro_install.txt
@@ -1 +1 @@
-Ovdje možete ručno instalirati dodatak (plugin) i predložak (template) bilo učitavanjem ili specificiranjem URL-a za direktno učitavanje.
\ No newline at end of file
+Ovdje možete ručno postaviti dodatak (plugin) i predložak (template) bilo učitavanjem ili navođenjem URL adrese za direktno učitavanje.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hr/intro_plugins.txt b/lib/plugins/extension/lang/hr/intro_plugins.txt
index fdc629d62..0c458ee43 100644
--- a/lib/plugins/extension/lang/hr/intro_plugins.txt
+++ b/lib/plugins/extension/lang/hr/intro_plugins.txt
@@ -1 +1 @@
-Ovo su dodaci (plugin) trenutno instalirani na Vašem DokuWiku-u. Možete ih omogućiti, onemogućiti ili u potpunosti deinstalirati. Nadogradnje dodataka su također prikazane, obavezno pročitajte dokumentaciju  dodatka prije nadogradnje.
\ No newline at end of file
+Ovo su dodaci (plugin) trenutno postavljeni na Vašem DokuWiku-u. Možete ih omogućiti, onemogućiti ili u potpunosti ukloniti. Nadogradnje dodataka su također prikazane, obavezno pročitajte dokumentaciju  dodatka prije nadogradnje.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hr/intro_search.txt b/lib/plugins/extension/lang/hr/intro_search.txt
index 93bf4b000..405690581 100644
--- a/lib/plugins/extension/lang/hr/intro_search.txt
+++ b/lib/plugins/extension/lang/hr/intro_search.txt
@@ -1 +1 @@
-Ovaj tab vam pruža pristup dostupnim dodatcima i predlošcima za DokuWiki od treće strane. Molimo budite svjesni da instaliranje koda od treće strane može biti **sigurnosni rizik**, možda želite prvo pročitati o [[doku>security#plugin_security|sigurnosti dodataka]].
\ No newline at end of file
+Ovdje možete potražiti i druge dostupne dodatke i predloške za DokuWiki. Molimo budite svjesni da postavljanje koda razvijenog od treće strane može biti **sigurnosni rizik**, možda želite prvo pročitati o [[doku>security#plugin_security|sigurnosti dodataka]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/hr/intro_templates.txt b/lib/plugins/extension/lang/hr/intro_templates.txt
index 968906cf9..76dafe6b7 100644
--- a/lib/plugins/extension/lang/hr/intro_templates.txt
+++ b/lib/plugins/extension/lang/hr/intro_templates.txt
@@ -1 +1 @@
-Ovo su predlošci trenutno instalirani na Vašem DokuWiki-u. Možete odabrati koji se predložak koristi na [[?do=admin&page=config|Upravitelju postavki]].
\ No newline at end of file
+Ovo su predlošci trenutno postavljeni na Vašem DokuWiki-u. Koji se predložak koristi možete odabrati na [[?do=admin&page=config|Upravitelju postavki]].
\ No newline at end of file
-- 
cgit v1.2.3


From 605f8e8d0e501057749c50581087ce05089c1af3 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 15 May 2015 15:17:39 +0200
Subject: added composer setup and the first composer package php-archive

---
 .gitignore                                     |   7 +
 composer.json                                  |   5 +
 composer.lock                                  |  65 +++
 inc/init.php                                   |   1 +
 lib/plugins/extension/helper/extension.php     |  27 +-
 vendor/autoload.php                            |   7 +
 vendor/composer/ClassLoader.php                | 413 ++++++++++++++++
 vendor/composer/autoload_classmap.php          |   9 +
 vendor/composer/autoload_namespaces.php        |   9 +
 vendor/composer/autoload_psr4.php              |  10 +
 vendor/composer/autoload_real.php              |  50 ++
 vendor/composer/installed.json                 |  51 ++
 vendor/splitbrain/php-archive/.gitignore       |   7 +
 vendor/splitbrain/php-archive/.travis.yml      |  13 +
 vendor/splitbrain/php-archive/LICENSE          |  19 +
 vendor/splitbrain/php-archive/README.md        |  61 +++
 vendor/splitbrain/php-archive/composer.json    |  26 +
 vendor/splitbrain/php-archive/phpunit.xml      |  17 +
 vendor/splitbrain/php-archive/src/Archive.php  | 128 +++++
 vendor/splitbrain/php-archive/src/FileInfo.php | 342 +++++++++++++
 vendor/splitbrain/php-archive/src/Tar.php      | 635 ++++++++++++++++++++++++
 vendor/splitbrain/php-archive/src/Zip.php      | 654 +++++++++++++++++++++++++
 22 files changed, 2538 insertions(+), 18 deletions(-)
 create mode 100644 composer.json
 create mode 100644 composer.lock
 create mode 100644 vendor/autoload.php
 create mode 100644 vendor/composer/ClassLoader.php
 create mode 100644 vendor/composer/autoload_classmap.php
 create mode 100644 vendor/composer/autoload_namespaces.php
 create mode 100644 vendor/composer/autoload_psr4.php
 create mode 100644 vendor/composer/autoload_real.php
 create mode 100644 vendor/composer/installed.json
 create mode 100644 vendor/splitbrain/php-archive/.gitignore
 create mode 100644 vendor/splitbrain/php-archive/.travis.yml
 create mode 100644 vendor/splitbrain/php-archive/LICENSE
 create mode 100644 vendor/splitbrain/php-archive/README.md
 create mode 100644 vendor/splitbrain/php-archive/composer.json
 create mode 100644 vendor/splitbrain/php-archive/phpunit.xml
 create mode 100644 vendor/splitbrain/php-archive/src/Archive.php
 create mode 100644 vendor/splitbrain/php-archive/src/FileInfo.php
 create mode 100644 vendor/splitbrain/php-archive/src/Tar.php
 create mode 100644 vendor/splitbrain/php-archive/src/Zip.php

diff --git a/.gitignore b/.gitignore
index bb39ba7cf..5698e9d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,10 @@
 !/lib/plugins/remote.php
 !/lib/plugins/syntax.php
 lib/images/*/local/*
+
+# composer default ignores
+vendor/*/*/tests/*
+vendor/*/*/test/*
+vendor/*/*/doc/*
+vendor/*/*/docs/*
+
diff --git a/composer.json b/composer.json
new file mode 100644
index 000000000..14ae94ad7
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "splitbrain/php-archive": "~1.0"
+    }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000000000..753d5c9c0
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,65 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "de1f49aad78674b8d56a7f93fb633f65",
+    "packages": [
+        {
+            "name": "splitbrain/php-archive",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/splitbrain/php-archive.git",
+                "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
+                "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.5.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "splitbrain\\PHPArchive\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andreas Gohr",
+                    "email": "andi@splitbrain.org"
+                }
+            ],
+            "description": "Pure-PHP implementation to read and write TAR and ZIP archives",
+            "keywords": [
+                "archive",
+                "extract",
+                "tar",
+                "unpack",
+                "unzip",
+                "zip"
+            ],
+            "time": "2015-02-25 20:15:02"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/inc/init.php b/inc/init.php
index bc9ab6d70..6d271dfb0 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -191,6 +191,7 @@ global $plugin_controller_class, $plugin_controller;
 if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Controller';
 
 // load libraries
+require_once(DOKU_INC.'vendor/autoload.php');
 require_once(DOKU_INC.'inc/load.php');
 
 // disable gzip if not available
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 6c0946b09..d089245b5 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -1035,33 +1035,24 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
         $ext = $this->guess_archive($file);
         if(in_array($ext, array('tar', 'bz', 'gz'))) {
-            switch($ext) {
-                case 'bz':
-                    $compress_type = Tar::COMPRESS_BZIP;
-                    break;
-                case 'gz':
-                    $compress_type = Tar::COMPRESS_GZIP;
-                    break;
-                default:
-                    $compress_type = Tar::COMPRESS_NONE;
-            }
 
-            $tar = new Tar();
             try {
-                $tar->open($file, $compress_type);
+                $tar = new \splitbrain\PHPArchive\Tar();
+                $tar->open($file);
                 $tar->extract($target);
-            } catch (Exception $e) {
+            } catch (\splitbrain\PHPArchive\ArchiveIOException $e) {
                 throw new Exception($this->getLang('error_decompress').' '.$e->getMessage());
             }
 
             return true;
         } elseif($ext == 'zip') {
 
-            $zip = new ZipLib();
-            $ok  = $zip->Extract($file, $target);
-
-            if($ok == -1){
-                throw new Exception($this->getLang('error_decompress').' Error extracting the zip archive');
+            try {
+                $zip = new \splitbrain\PHPArchive\Zip();
+                $zip->open($file);
+                $zip->extract($target);
+            } catch (\splitbrain\PHPArchive\ArchiveIOException $e) {
+                throw new Exception($this->getLang('error_decompress').' '.$e->getMessage());
             }
 
             return true;
diff --git a/vendor/autoload.php b/vendor/autoload.php
new file mode 100644
index 000000000..88c7fd93b
--- /dev/null
+++ b/vendor/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInita19a915ee98347a0c787119619d2ff9b::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
new file mode 100644
index 000000000..5e1469e83
--- /dev/null
+++ b/vendor/composer/ClassLoader.php
@@ -0,0 +1,413 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+
+    private $classMapAuthoritative = false;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-0 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+        if ('\\' == $class[0]) {
+            $class = substr($class, 1);
+        }
+
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative) {
+            return false;
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if ($file === null && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if ($file === null) {
+            // Remember that this class does not exist.
+            return $this->classMap[$class] = false;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
new file mode 100644
index 000000000..7a91153b0
--- /dev/null
+++ b/vendor/composer/autoload_classmap.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
new file mode 100644
index 000000000..b7fc0125d
--- /dev/null
+++ b/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
new file mode 100644
index 000000000..e4d713270
--- /dev/null
+++ b/vendor/composer/autoload_psr4.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'splitbrain\\PHPArchive\\' => array($vendorDir . '/splitbrain/php-archive/src'),
+);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
new file mode 100644
index 000000000..fee79daed
--- /dev/null
+++ b/vendor/composer/autoload_real.php
@@ -0,0 +1,50 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInita19a915ee98347a0c787119619d2ff9b
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInita19a915ee98347a0c787119619d2ff9b', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInita19a915ee98347a0c787119619d2ff9b', 'loadClassLoader'));
+
+        $map = require __DIR__ . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->set($namespace, $path);
+        }
+
+        $map = require __DIR__ . '/autoload_psr4.php';
+        foreach ($map as $namespace => $path) {
+            $loader->setPsr4($namespace, $path);
+        }
+
+        $classMap = require __DIR__ . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
+        }
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
+
+function composerRequirea19a915ee98347a0c787119619d2ff9b($file)
+{
+    require $file;
+}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
new file mode 100644
index 000000000..769865f79
--- /dev/null
+++ b/vendor/composer/installed.json
@@ -0,0 +1,51 @@
+[
+    {
+        "name": "splitbrain/php-archive",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/splitbrain/php-archive.git",
+            "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
+            "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "4.5.*"
+        },
+        "time": "2015-02-25 20:15:02",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "splitbrain\\PHPArchive\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Andreas Gohr",
+                "email": "andi@splitbrain.org"
+            }
+        ],
+        "description": "Pure-PHP implementation to read and write TAR and ZIP archives",
+        "keywords": [
+            "archive",
+            "extract",
+            "tar",
+            "unpack",
+            "unzip",
+            "zip"
+        ]
+    }
+]
diff --git a/vendor/splitbrain/php-archive/.gitignore b/vendor/splitbrain/php-archive/.gitignore
new file mode 100644
index 000000000..39b851b56
--- /dev/null
+++ b/vendor/splitbrain/php-archive/.gitignore
@@ -0,0 +1,7 @@
+*.iml
+.idea/
+composer.phar
+vendor/
+composer.lock
+
+
diff --git a/vendor/splitbrain/php-archive/.travis.yml b/vendor/splitbrain/php-archive/.travis.yml
new file mode 100644
index 000000000..21124ce5d
--- /dev/null
+++ b/vendor/splitbrain/php-archive/.travis.yml
@@ -0,0 +1,13 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+before_script:
+  - composer self-update
+  - composer install --prefer-source --no-interaction --dev
+
+script: phpunit
\ No newline at end of file
diff --git a/vendor/splitbrain/php-archive/LICENSE b/vendor/splitbrain/php-archive/LICENSE
new file mode 100644
index 000000000..66d08e433
--- /dev/null
+++ b/vendor/splitbrain/php-archive/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015 Andreas Gohr <gohr@cosmocode.de>
+
+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.
\ No newline at end of file
diff --git a/vendor/splitbrain/php-archive/README.md b/vendor/splitbrain/php-archive/README.md
new file mode 100644
index 000000000..4fb673259
--- /dev/null
+++ b/vendor/splitbrain/php-archive/README.md
@@ -0,0 +1,61 @@
+PHPArchive - Pure PHP ZIP and TAR handling
+==========================================
+
+This library allows to handle new ZIP and TAR archives without the need for any special PHP extensions (gz and bzip are
+needed for compression). It can create new files or extract existing ones.
+
+To keep things simple, the modification (adding or removing files) of existing archives is not supported.
+
+[![Build Status](https://travis-ci.org/splitbrain/php-archive.svg)](https://travis-ci.org/splitbrain/php-archive)
+
+Install
+-------
+
+Use composer:
+
+```php composer.phar require splitbrain/php-archive```
+
+Usage
+-----
+
+The usage for the Zip and Tar classes are basically the same. Here are some examples for working with TARs to get
+you started. Check the source code comments for more info
+
+```php
+use splitbrain\PHPArchive\Tar;
+
+// To list the contents of an existing TAR archive, open() it and use contents() on it:
+$tar = new Tar();
+$tar->open('myfile.tgz');
+$toc = $tar->contents();
+print_r($toc); // array of FileInfo objects
+
+// To extract the contents of an existing TAR archive, open() it and use extract() on it:
+$tar = new Tar();
+$tar->open('myfile.tgz');
+$tar->extract('/tmp');
+
+// To create a new TAR archive directly on the filesystem (low memory requirements), create() it,
+$tar = new Tar();
+$tar->create('myfile.tgz');
+$tar->addFile(...);
+$tar->addData(...);
+...
+$tar->close();
+
+// To create a TAR archive directly in memory, create() it, add*() files and then either save()
+// or getData() it:
+$tar = new Tar();
+$tar->create();
+$tar->addFile(...);
+$tar->addData(...);
+...
+$tar->save('myfile.tgz'); // compresses and saves it
+echo $tar->getArchive(Archive::COMPRESS_GZIP); // compresses and returns it
+```
+
+Differences between Tar and Zip: Tars are compressed as a whole while Zips compress each file individually. Therefore
+you can call ```setCompression``` before each ```addFile()``` and ```addData()``` functions.
+
+The FileInfo class can be used to specify additional info like ownership or permissions when adding a file to
+an archive. 
\ No newline at end of file
diff --git a/vendor/splitbrain/php-archive/composer.json b/vendor/splitbrain/php-archive/composer.json
new file mode 100644
index 000000000..5ad41a8c4
--- /dev/null
+++ b/vendor/splitbrain/php-archive/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "splitbrain/php-archive",
+    "description": "Pure-PHP implementation to read and write TAR and ZIP archives",
+    "keywords": ["zip", "tar", "archive", "unpack", "extract", "unzip"],
+    "authors": [
+        {
+            "name": "Andreas Gohr",
+            "email": "andi@splitbrain.org"
+        }
+    ],
+    "license": "MIT",
+
+    "require": {
+        "php": ">=5.3.0"
+    },
+
+    "require-dev": {
+        "phpunit/phpunit": "4.5.*"
+    },
+
+    "autoload": {
+        "psr-4": {
+            "splitbrain\\PHPArchive\\": "src"
+        }
+    }
+}
diff --git a/vendor/splitbrain/php-archive/phpunit.xml b/vendor/splitbrain/php-archive/phpunit.xml
new file mode 100644
index 000000000..d7e1f2428
--- /dev/null
+++ b/vendor/splitbrain/php-archive/phpunit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false">
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/vendor/splitbrain/php-archive/src/Archive.php b/vendor/splitbrain/php-archive/src/Archive.php
new file mode 100644
index 000000000..c60fea777
--- /dev/null
+++ b/vendor/splitbrain/php-archive/src/Archive.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace splitbrain\PHPArchive;
+
+abstract class Archive
+{
+
+    const COMPRESS_AUTO = -1;
+    const COMPRESS_NONE = 0;
+    const COMPRESS_GZIP = 1;
+    const COMPRESS_BZIP = 2;
+
+    /**
+     * Set the compression level and type
+     *
+     * @param int $level Compression level (0 to 9)
+     * @param int $type  Type of compression to use (use COMPRESS_* constants)
+     * @return mixed
+     */
+    abstract public function setCompression($level = 9, $type = Archive::COMPRESS_AUTO);
+
+    /**
+     * Open an existing archive file for reading
+     *
+     * @param string $file
+     * @throws ArchiveIOException
+     */
+    abstract public function open($file);
+
+    /**
+     * Read the contents of an archive
+     *
+     * This function lists the files stored in the archive, and returns an indexed array of FileInfo objects
+     *
+     * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams.
+     * Reopen the file with open() again if you want to do additional operations
+     *
+     * @return FileInfo[]
+     */
+    abstract public function contents();
+
+    /**
+     * Extract an existing archive
+     *
+     * The $strip parameter allows you to strip a certain number of path components from the filenames
+     * found in the archive file, similar to the --strip-components feature of GNU tar. This is triggered when
+     * an integer is passed as $strip.
+     * Alternatively a fixed string prefix may be passed in $strip. If the filename matches this prefix,
+     * the prefix will be stripped. It is recommended to give prefixes with a trailing slash.
+     *
+     * By default this will extract all files found in the archive. You can restrict the output using the $include
+     * and $exclude parameter. Both expect a full regular expression (including delimiters and modifiers). If
+     * $include is set, only files that match this expression will be extracted. Files that match the $exclude
+     * expression will never be extracted. Both parameters can be used in combination. Expressions are matched against
+     * stripped filenames as described above.
+     *
+     * The archive is closed afterwards. Reopen the file with open() again if you want to do additional operations
+     *
+     * @param string     $outdir  the target directory for extracting
+     * @param int|string $strip   either the number of path components or a fixed prefix to strip
+     * @param string     $exclude a regular expression of files to exclude
+     * @param string     $include a regular expression of files to include
+     * @throws ArchiveIOException
+     * @return array
+     */
+    abstract public function extract($outdir, $strip = '', $exclude = '', $include = '');
+
+    /**
+     * Create a new archive file
+     *
+     * If $file is empty, the archive file will be created in memory
+     *
+     * @param string $file
+     */
+    abstract public function create($file = '');
+
+    /**
+     * Add a file to the current archive using an existing file in the filesystem
+     *
+     * @param string          $file     path to the original file
+     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data, empty to take from original
+     * @throws ArchiveIOException
+     */
+    abstract public function addFile($file, $fileinfo = '');
+
+    /**
+     * Add a file to the current archive using the given $data as content
+     *
+     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data
+     * @param string          $data     binary content of the file to add
+     * @throws ArchiveIOException
+     */
+    abstract public function addData($fileinfo, $data);
+
+    /**
+     * Close the archive, close all file handles
+     *
+     * After a call to this function no more data can be added to the archive, for
+     * read access no reading is allowed anymore
+     */
+    abstract public function close();
+
+    /**
+     * Returns the created in-memory archive data
+     *
+     * This implicitly calls close() on the Archive
+     */
+    abstract public function getArchive();
+
+    /**
+     * Save the created in-memory archive data
+     *
+     * Note: It is more memory effective to specify the filename in the create() function and
+     * let the library work on the new file directly.
+     *
+     * @param string $file
+     */
+    abstract public function save($file);
+
+}
+
+class ArchiveIOException extends \Exception
+{
+}
+
+class ArchiveIllegalCompressionException extends \Exception
+{
+}
diff --git a/vendor/splitbrain/php-archive/src/FileInfo.php b/vendor/splitbrain/php-archive/src/FileInfo.php
new file mode 100644
index 000000000..c443aa977
--- /dev/null
+++ b/vendor/splitbrain/php-archive/src/FileInfo.php
@@ -0,0 +1,342 @@
+<?php
+
+namespace splitbrain\PHPArchive;
+
+/**
+ * Class FileInfo
+ *
+ * stores meta data about a file in an Archive
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @package splitbrain\PHPArchive
+ * @license MIT
+ */
+class FileInfo
+{
+
+    protected $isdir = false;
+    protected $path = '';
+    protected $size = 0;
+    protected $csize = 0;
+    protected $mtime = 0;
+    protected $mode = 0664;
+    protected $owner = '';
+    protected $group = '';
+    protected $uid = 0;
+    protected $gid = 0;
+    protected $comment = '';
+
+    /**
+     * initialize dynamic defaults
+     *
+     * @param string $path The path of the file, can also be set later through setPath()
+     */
+    public function __construct($path = '')
+    {
+        $this->mtime = time();
+        $this->setPath($path);
+    }
+
+    /**
+     * Factory to build FileInfo from existing file or directory
+     *
+     * @param string $path path to a file on the local file system
+     * @param string $as   optional path to use inside the archive
+     * @throws FileInfoException
+     * @return FileInfo
+     */
+    public static function fromPath($path, $as = '')
+    {
+        clearstatcache(false, $path);
+
+        if (!file_exists($path)) {
+            throw new FileInfoException("$path does not exist");
+        }
+
+        $stat = stat($path);
+        $file = new FileInfo();
+
+        $file->setPath($path);
+        $file->setIsdir(is_dir($path));
+        $file->setMode(fileperms($path));
+        $file->setOwner(fileowner($path));
+        $file->setGroup(filegroup($path));
+        $file->setUid($stat['uid']);
+        $file->setGid($stat['gid']);
+        $file->setMtime($stat['mtime']);
+
+        if ($as) {
+            $file->setPath($as);
+        }
+
+        return $file;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    /**
+     * @param int $size
+     */
+    public function setSize($size)
+    {
+        $this->size = $size;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompressedSize()
+    {
+        return $this->csize;
+    }
+
+    /**
+     * @param int $csize
+     */
+    public function setCompressedSize($csize)
+    {
+        $this->csize = $csize;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMtime()
+    {
+        return $this->mtime;
+    }
+
+    /**
+     * @param int $mtime
+     */
+    public function setMtime($mtime)
+    {
+        $this->mtime = $mtime;
+    }
+
+    /**
+     * @return int
+     */
+    public function getGid()
+    {
+        return $this->gid;
+    }
+
+    /**
+     * @param int $gid
+     */
+    public function setGid($gid)
+    {
+        $this->gid = $gid;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid()
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     */
+    public function setUid($uid)
+    {
+        $this->uid = $uid;
+    }
+
+    /**
+     * @return string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * @param string $comment
+     */
+    public function setComment($comment)
+    {
+        $this->comment = $comment;
+    }
+
+    /**
+     * @return string
+     */
+    public function getGroup()
+    {
+        return $this->group;
+    }
+
+    /**
+     * @param string $group
+     */
+    public function setGroup($group)
+    {
+        $this->group = $group;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getIsdir()
+    {
+        return $this->isdir;
+    }
+
+    /**
+     * @param boolean $isdir
+     */
+    public function setIsdir($isdir)
+    {
+        // default mode for directories
+        if ($isdir && $this->mode === 0664) {
+            $this->mode = 0775;
+        }
+        $this->isdir = $isdir;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMode()
+    {
+        return $this->mode;
+    }
+
+    /**
+     * @param int $mode
+     */
+    public function setMode($mode)
+    {
+        $this->mode = $mode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOwner()
+    {
+        return $this->owner;
+    }
+
+    /**
+     * @param string $owner
+     */
+    public function setOwner($owner)
+    {
+        $this->owner = $owner;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * @param string $path
+     */
+    public function setPath($path)
+    {
+        $this->path = $this->cleanPath($path);
+    }
+
+    /**
+     * Cleans up a path and removes relative parts, also strips leading slashes
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function cleanPath($path)
+    {
+        $path    = str_replace('\\', '/', $path);
+        $path    = explode('/', $path);
+        $newpath = array();
+        foreach ($path as $p) {
+            if ($p === '' || $p === '.') {
+                continue;
+            }
+            if ($p === '..') {
+                array_pop($newpath);
+                continue;
+            }
+            array_push($newpath, $p);
+        }
+        return trim(implode('/', $newpath), '/');
+    }
+
+    /**
+     * Strip given prefix or number of path segments from the filename
+     *
+     * The $strip parameter allows you to strip a certain number of path components from the filenames
+     * found in the tar file, similar to the --strip-components feature of GNU tar. This is triggered when
+     * an integer is passed as $strip.
+     * Alternatively a fixed string prefix may be passed in $strip. If the filename matches this prefix,
+     * the prefix will be stripped. It is recommended to give prefixes with a trailing slash.
+     *
+     * @param  int|string $strip
+     * @return FileInfo
+     */
+    public function strip($strip)
+    {
+        $filename = $this->getPath();
+        $striplen = strlen($strip);
+        if (is_int($strip)) {
+            // if $strip is an integer we strip this many path components
+            $parts = explode('/', $filename);
+            if (!$this->getIsdir()) {
+                $base = array_pop($parts); // keep filename itself
+            } else {
+                $base = '';
+            }
+            $filename = join('/', array_slice($parts, $strip));
+            if ($base) {
+                $filename .= "/$base";
+            }
+        } else {
+            // if strip is a string, we strip a prefix here
+            if (substr($filename, 0, $striplen) == $strip) {
+                $filename = substr($filename, $striplen);
+            }
+        }
+
+        $this->setPath($filename);
+    }
+
+    /**
+     * Does the file match the given include and exclude expressions?
+     *
+     * Exclude rules take precedence over include rules
+     *
+     * @param string $include Regular expression of files to include
+     * @param string $exclude Regular expression of files to exclude
+     * @return bool
+     */
+    public function match($include = '', $exclude = '')
+    {
+        $extract = true;
+        if ($include && !preg_match($include, $this->getPath())) {
+            $extract = false;
+        }
+        if ($exclude && preg_match($exclude, $this->getPath())) {
+            $extract = false;
+        }
+
+        return $extract;
+    }
+}
+
+class FileInfoException extends \Exception
+{
+}
\ No newline at end of file
diff --git a/vendor/splitbrain/php-archive/src/Tar.php b/vendor/splitbrain/php-archive/src/Tar.php
new file mode 100644
index 000000000..bd78136da
--- /dev/null
+++ b/vendor/splitbrain/php-archive/src/Tar.php
@@ -0,0 +1,635 @@
+<?php
+
+namespace splitbrain\PHPArchive;
+
+/**
+ * Class Tar
+ *
+ * Creates or extracts Tar archives. Supports gz and bzip compression
+ *
+ * Long pathnames (>100 chars) are supported in POSIX ustar and GNU longlink formats.
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @package splitbrain\PHPArchive
+ * @license MIT
+ */
+class Tar extends Archive
+{
+
+    protected $file = '';
+    protected $comptype = Archive::COMPRESS_AUTO;
+    protected $complevel = 9;
+    protected $fh;
+    protected $memory = '';
+    protected $closed = true;
+    protected $writeaccess = false;
+
+    /**
+     * Sets the compression to use
+     *
+     * @param int $level Compression level (0 to 9)
+     * @param int $type  Type of compression to use (use COMPRESS_* constants)
+     * @return mixed
+     */
+    public function setCompression($level = 9, $type = Archive::COMPRESS_AUTO)
+    {
+        $this->compressioncheck($type);
+        $this->comptype  = $type;
+        $this->complevel = $level;
+    }
+
+    /**
+     * Open an existing TAR file for reading
+     *
+     * @param string $file
+     * @throws ArchiveIOException
+     */
+    public function open($file)
+    {
+        $this->file = $file;
+
+        // update compression to mach file
+        if ($this->comptype == Tar::COMPRESS_AUTO) {
+            $this->setCompression($this->complevel, $this->filetype($file));
+        }
+
+        // open file handles
+        if ($this->comptype === Archive::COMPRESS_GZIP) {
+            $this->fh = @gzopen($this->file, 'rb');
+        } elseif ($this->comptype === Archive::COMPRESS_BZIP) {
+            $this->fh = @bzopen($this->file, 'r');
+        } else {
+            $this->fh = @fopen($this->file, 'rb');
+        }
+
+        if (!$this->fh) {
+            throw new ArchiveIOException('Could not open file for reading: '.$this->file);
+        }
+        $this->closed = false;
+    }
+
+    /**
+     * Read the contents of a TAR archive
+     *
+     * This function lists the files stored in the archive
+     *
+     * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams.
+     * Reopen the file with open() again if you want to do additional operations
+     *
+     * @throws ArchiveIOException
+     * @returns FileInfo[]
+     */
+    public function contents()
+    {
+        if ($this->closed || !$this->file) {
+            throw new ArchiveIOException('Can not read from a closed archive');
+        }
+
+        $result = array();
+        while ($read = $this->readbytes(512)) {
+            $header = $this->parseHeader($read);
+            if (!is_array($header)) {
+                continue;
+            }
+
+            $this->skipbytes(ceil($header['size'] / 512) * 512);
+            $result[] = $this->header2fileinfo($header);
+        }
+
+        $this->close();
+        return $result;
+    }
+
+    /**
+     * Extract an existing TAR archive
+     *
+     * The $strip parameter allows you to strip a certain number of path components from the filenames
+     * found in the tar file, similar to the --strip-components feature of GNU tar. This is triggered when
+     * an integer is passed as $strip.
+     * Alternatively a fixed string prefix may be passed in $strip. If the filename matches this prefix,
+     * the prefix will be stripped. It is recommended to give prefixes with a trailing slash.
+     *
+     * By default this will extract all files found in the archive. You can restrict the output using the $include
+     * and $exclude parameter. Both expect a full regular expression (including delimiters and modifiers). If
+     * $include is set only files that match this expression will be extracted. Files that match the $exclude
+     * expression will never be extracted. Both parameters can be used in combination. Expressions are matched against
+     * stripped filenames as described above.
+     *
+     * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams.
+     * Reopen the file with open() again if you want to do additional operations
+     *
+     * @param string     $outdir  the target directory for extracting
+     * @param int|string $strip   either the number of path components or a fixed prefix to strip
+     * @param string     $exclude a regular expression of files to exclude
+     * @param string     $include a regular expression of files to include
+     * @throws ArchiveIOException
+     * @return FileInfo[]
+     */
+    public function extract($outdir, $strip = '', $exclude = '', $include = '')
+    {
+        if ($this->closed || !$this->file) {
+            throw new ArchiveIOException('Can not read from a closed archive');
+        }
+
+        $outdir = rtrim($outdir, '/');
+        @mkdir($outdir, 0777, true);
+        if (!is_dir($outdir)) {
+            throw new ArchiveIOException("Could not create directory '$outdir'");
+        }
+
+        $extracted = array();
+        while ($dat = $this->readbytes(512)) {
+            // read the file header
+            $header = $this->parseHeader($dat);
+            if (!is_array($header)) {
+                continue;
+            }
+            $fileinfo = $this->header2fileinfo($header);
+
+            // apply strip rules
+            $fileinfo->strip($strip);
+
+            // skip unwanted files
+            if (!strlen($fileinfo->getPath()) || !$fileinfo->match($include, $exclude)) {
+                $this->skipbytes(ceil($header['size'] / 512) * 512);
+                continue;
+            }
+
+            // create output directory
+            $output    = $outdir.'/'.$fileinfo->getPath();
+            $directory = ($fileinfo->getIsdir()) ? $output : dirname($output);
+            @mkdir($directory, 0777, true);
+
+            // extract data
+            if (!$fileinfo->getIsdir()) {
+                $fp = fopen($output, "wb");
+                if (!$fp) {
+                    throw new ArchiveIOException('Could not open file for writing: '.$output);
+                }
+
+                $size = floor($header['size'] / 512);
+                for ($i = 0; $i < $size; $i++) {
+                    fwrite($fp, $this->readbytes(512), 512);
+                }
+                if (($header['size'] % 512) != 0) {
+                    fwrite($fp, $this->readbytes(512), $header['size'] % 512);
+                }
+
+                fclose($fp);
+                touch($output, $fileinfo->getMtime());
+                chmod($output, $fileinfo->getMode());
+            } else {
+                $this->skipbytes(ceil($header['size'] / 512) * 512); // the size is usually 0 for directories
+            }
+
+            $extracted[] = $fileinfo;
+        }
+
+        $this->close();
+        return $extracted;
+    }
+
+    /**
+     * Create a new TAR file
+     *
+     * If $file is empty, the tar file will be created in memory
+     *
+     * @param string $file
+     * @throws ArchiveIOException
+     */
+    public function create($file = '')
+    {
+        $this->file   = $file;
+        $this->memory = '';
+        $this->fh     = 0;
+
+        if ($this->file) {
+            // determine compression
+            if ($this->comptype == Archive::COMPRESS_AUTO) {
+                $this->setCompression($this->complevel, $this->filetype($file));
+            }
+
+            if ($this->comptype === Archive::COMPRESS_GZIP) {
+                $this->fh = @gzopen($this->file, 'wb'.$this->complevel);
+            } elseif ($this->comptype === Archive::COMPRESS_BZIP) {
+                $this->fh = @bzopen($this->file, 'w');
+            } else {
+                $this->fh = @fopen($this->file, 'wb');
+            }
+
+            if (!$this->fh) {
+                throw new ArchiveIOException('Could not open file for writing: '.$this->file);
+            }
+        }
+        $this->writeaccess = true;
+        $this->closed      = false;
+    }
+
+    /**
+     * Add a file to the current TAR archive using an existing file in the filesystem
+     *
+     * @param string          $file     path to the original file
+     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data, empty to take from original
+     * @throws ArchiveIOException
+     */
+    public function addFile($file, $fileinfo = '')
+    {
+        if (is_string($fileinfo)) {
+            $fileinfo = FileInfo::fromPath($file, $fileinfo);
+        }
+
+        if ($this->closed) {
+            throw new ArchiveIOException('Archive has been closed, files can no longer be added');
+        }
+
+        $fp = fopen($file, 'rb');
+        if (!$fp) {
+            throw new ArchiveIOException('Could not open file for reading: '.$file);
+        }
+
+        // create file header
+        $this->writeFileHeader($fileinfo);
+
+        // write data
+        while (!feof($fp)) {
+            $data = fread($fp, 512);
+            if ($data === false) {
+                break;
+            }
+            if ($data === '') {
+                break;
+            }
+            $packed = pack("a512", $data);
+            $this->writebytes($packed);
+        }
+        fclose($fp);
+    }
+
+    /**
+     * Add a file to the current TAR archive using the given $data as content
+     *
+     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data
+     * @param string          $data     binary content of the file to add
+     * @throws ArchiveIOException
+     */
+    public function addData($fileinfo, $data)
+    {
+        if (is_string($fileinfo)) {
+            $fileinfo = new FileInfo($fileinfo);
+        }
+
+        if ($this->closed) {
+            throw new ArchiveIOException('Archive has been closed, files can no longer be added');
+        }
+
+        $len = strlen($data);
+        $fileinfo->setSize($len);
+        $this->writeFileHeader($fileinfo);
+
+        for ($s = 0; $s < $len; $s += 512) {
+            $this->writebytes(pack("a512", substr($data, $s, 512)));
+        }
+    }
+
+    /**
+     * Add the closing footer to the archive if in write mode, close all file handles
+     *
+     * After a call to this function no more data can be added to the archive, for
+     * read access no reading is allowed anymore
+     *
+     * "Physically, an archive consists of a series of file entries terminated by an end-of-archive entry, which
+     * consists of two 512 blocks of zero bytes"
+     *
+     * @link http://www.gnu.org/software/tar/manual/html_chapter/tar_8.html#SEC134
+     */
+    public function close()
+    {
+        if ($this->closed) {
+            return;
+        } // we did this already
+
+        // write footer
+        if ($this->writeaccess) {
+            $this->writebytes(pack("a512", ""));
+            $this->writebytes(pack("a512", ""));
+        }
+
+        // close file handles
+        if ($this->file) {
+            if ($this->comptype === Archive::COMPRESS_GZIP) {
+                gzclose($this->fh);
+            } elseif ($this->comptype === Archive::COMPRESS_BZIP) {
+                bzclose($this->fh);
+            } else {
+                fclose($this->fh);
+            }
+
+            $this->file = '';
+            $this->fh   = 0;
+        }
+
+        $this->writeaccess = false;
+        $this->closed      = true;
+    }
+
+    /**
+     * Returns the created in-memory archive data
+     *
+     * This implicitly calls close() on the Archive
+     */
+    public function getArchive()
+    {
+        $this->close();
+
+        if ($this->comptype === Archive::COMPRESS_AUTO) {
+            $this->comptype = Archive::COMPRESS_NONE;
+        }
+
+        if ($this->comptype === Archive::COMPRESS_GZIP) {
+            return gzcompress($this->memory, $this->complevel);
+        }
+        if ($this->comptype === Archive::COMPRESS_BZIP) {
+            return bzcompress($this->memory);
+        }
+        return $this->memory;
+    }
+
+    /**
+     * Save the created in-memory archive data
+     *
+     * Note: It more memory effective to specify the filename in the create() function and
+     * let the library work on the new file directly.
+     *
+     * @param string $file
+     * @throws ArchiveIOException
+     */
+    public function save($file)
+    {
+        if ($this->comptype === Archive::COMPRESS_AUTO) {
+            $this->setCompression($this->filetype($this->complevel, $file));
+        }
+
+        if (!file_put_contents($file, $this->getArchive())) {
+            throw new ArchiveIOException('Could not write to file: '.$file);
+        }
+    }
+
+    /**
+     * Read from the open file pointer
+     *
+     * @param int $length bytes to read
+     * @return string
+     */
+    protected function readbytes($length)
+    {
+        if ($this->comptype === Archive::COMPRESS_GZIP) {
+            return @gzread($this->fh, $length);
+        } elseif ($this->comptype === Archive::COMPRESS_BZIP) {
+            return @bzread($this->fh, $length);
+        } else {
+            return @fread($this->fh, $length);
+        }
+    }
+
+    /**
+     * Write to the open filepointer or memory
+     *
+     * @param string $data
+     * @throws ArchiveIOException
+     * @return int number of bytes written
+     */
+    protected function writebytes($data)
+    {
+        if (!$this->file) {
+            $this->memory .= $data;
+            $written = strlen($data);
+        } elseif ($this->comptype === Archive::COMPRESS_GZIP) {
+            $written = @gzwrite($this->fh, $data);
+        } elseif ($this->comptype === Archive::COMPRESS_BZIP) {
+            $written = @bzwrite($this->fh, $data);
+        } else {
+            $written = @fwrite($this->fh, $data);
+        }
+        if ($written === false) {
+            throw new ArchiveIOException('Failed to write to archive stream');
+        }
+        return $written;
+    }
+
+    /**
+     * Skip forward in the open file pointer
+     *
+     * This is basically a wrapper around seek() (and a workaround for bzip2)
+     *
+     * @param int $bytes seek to this position
+     */
+    function skipbytes($bytes)
+    {
+        if ($this->comptype === Archive::COMPRESS_GZIP) {
+            @gzseek($this->fh, $bytes, SEEK_CUR);
+        } elseif ($this->comptype === Archive::COMPRESS_BZIP) {
+            // there is no seek in bzip2, we simply read on
+            @bzread($this->fh, $bytes);
+        } else {
+            @fseek($this->fh, $bytes, SEEK_CUR);
+        }
+    }
+
+    /**
+     * Write the given file metat data as header
+     *
+     * @param FileInfo $fileinfo
+     */
+    protected function writeFileHeader(FileInfo $fileinfo)
+    {
+        $this->writeRawFileHeader(
+            $fileinfo->getPath(),
+            $fileinfo->getUid(),
+            $fileinfo->getGid(),
+            $fileinfo->getMode(),
+            $fileinfo->getSize(),
+            $fileinfo->getMtime(),
+            $fileinfo->getIsdir() ? '5' : '0'
+        );
+    }
+
+    /**
+     * Write a file header to the stream
+     *
+     * @param string $name
+     * @param int    $uid
+     * @param int    $gid
+     * @param int    $perm
+     * @param int    $size
+     * @param int    $mtime
+     * @param string $typeflag Set to '5' for directories
+     */
+    protected function writeRawFileHeader($name, $uid, $gid, $perm, $size, $mtime, $typeflag = '')
+    {
+        // handle filename length restrictions
+        $prefix  = '';
+        $namelen = strlen($name);
+        if ($namelen > 100) {
+            $file = basename($name);
+            $dir  = dirname($name);
+            if (strlen($file) > 100 || strlen($dir) > 155) {
+                // we're still too large, let's use GNU longlink
+                $this->writeRawFileHeader('././@LongLink', 0, 0, 0, $namelen, 0, 'L');
+                for ($s = 0; $s < $namelen; $s += 512) {
+                    $this->writebytes(pack("a512", substr($name, $s, 512)));
+                }
+                $name = substr($name, 0, 100); // cut off name
+            } else {
+                // we're fine when splitting, use POSIX ustar
+                $prefix = $dir;
+                $name   = $file;
+            }
+        }
+
+        // values are needed in octal
+        $uid   = sprintf("%6s ", decoct($uid));
+        $gid   = sprintf("%6s ", decoct($gid));
+        $perm  = sprintf("%6s ", decoct($perm));
+        $size  = sprintf("%11s ", decoct($size));
+        $mtime = sprintf("%11s", decoct($mtime));
+
+        $data_first = pack("a100a8a8a8a12A12", $name, $perm, $uid, $gid, $size, $mtime);
+        $data_last  = pack("a1a100a6a2a32a32a8a8a155a12", $typeflag, '', 'ustar', '', '', '', '', '', $prefix, "");
+
+        for ($i = 0, $chks = 0; $i < 148; $i++) {
+            $chks += ord($data_first[$i]);
+        }
+
+        for ($i = 156, $chks += 256, $j = 0; $i < 512; $i++, $j++) {
+            $chks += ord($data_last[$j]);
+        }
+
+        $this->writebytes($data_first);
+
+        $chks = pack("a8", sprintf("%6s ", decoct($chks)));
+        $this->writebytes($chks.$data_last);
+    }
+
+    /**
+     * Decode the given tar file header
+     *
+     * @param string $block a 512 byte block containign the header data
+     * @return array|bool
+     */
+    protected function parseHeader($block)
+    {
+        if (!$block || strlen($block) != 512) {
+            return false;
+        }
+
+        for ($i = 0, $chks = 0; $i < 148; $i++) {
+            $chks += ord($block[$i]);
+        }
+
+        for ($i = 156, $chks += 256; $i < 512; $i++) {
+            $chks += ord($block[$i]);
+        }
+
+        $header = @unpack(
+            "a100filename/a8perm/a8uid/a8gid/a12size/a12mtime/a8checksum/a1typeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor/a155prefix",
+            $block
+        );
+        if (!$header) {
+            return false;
+        }
+
+        $return['checksum'] = OctDec(trim($header['checksum']));
+        if ($return['checksum'] != $chks) {
+            return false;
+        }
+
+        $return['filename'] = trim($header['filename']);
+        $return['perm']     = OctDec(trim($header['perm']));
+        $return['uid']      = OctDec(trim($header['uid']));
+        $return['gid']      = OctDec(trim($header['gid']));
+        $return['size']     = OctDec(trim($header['size']));
+        $return['mtime']    = OctDec(trim($header['mtime']));
+        $return['typeflag'] = $header['typeflag'];
+        $return['link']     = trim($header['link']);
+        $return['uname']    = trim($header['uname']);
+        $return['gname']    = trim($header['gname']);
+
+        // Handle ustar Posix compliant path prefixes
+        if (trim($header['prefix'])) {
+            $return['filename'] = trim($header['prefix']).'/'.$return['filename'];
+        }
+
+        // Handle Long-Link entries from GNU Tar
+        if ($return['typeflag'] == 'L') {
+            // following data block(s) is the filename
+            $filename = trim($this->readbytes(ceil($header['size'] / 512) * 512));
+            // next block is the real header
+            $block  = $this->readbytes(512);
+            $return = $this->parseHeader($block);
+            // overwrite the filename
+            $return['filename'] = $filename;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Creates a FileInfo object from the given parsed header
+     *
+     * @param $header
+     * @return FileInfo
+     */
+    protected function header2fileinfo($header)
+    {
+        $fileinfo = new FileInfo();
+        $fileinfo->setPath($header['filename']);
+        $fileinfo->setMode($header['perm']);
+        $fileinfo->setUid($header['uid']);
+        $fileinfo->setGid($header['gid']);
+        $fileinfo->setSize($header['size']);
+        $fileinfo->setMtime($header['mtime']);
+        $fileinfo->setOwner($header['uname']);
+        $fileinfo->setGroup($header['gname']);
+        $fileinfo->setIsdir((bool) $header['typeflag']);
+
+        return $fileinfo;
+    }
+
+    /**
+     * Checks if the given compression type is available and throws an exception if not
+     *
+     * @param $comptype
+     * @throws ArchiveIllegalCompressionException
+     */
+    protected function compressioncheck($comptype)
+    {
+        if ($comptype === Archive::COMPRESS_GZIP && !function_exists('gzopen')) {
+            throw new ArchiveIllegalCompressionException('No gzip support available');
+        }
+
+        if ($comptype === Archive::COMPRESS_BZIP && !function_exists('bzopen')) {
+            throw new ArchiveIllegalCompressionException('No bzip2 support available');
+        }
+    }
+
+    /**
+     * Guesses the wanted compression from the given filename extension
+     *
+     * You don't need to call this yourself. It's used when you pass Archive::COMPRESS_AUTO somewhere
+     *
+     * @param string $file
+     * @return int
+     */
+    public function filetype($file)
+    {
+        $file = strtolower($file);
+        if (substr($file, -3) == '.gz' || substr($file, -4) == '.tgz') {
+            $comptype = Archive::COMPRESS_GZIP;
+        } elseif (substr($file, -4) == '.bz2' || substr($file, -4) == '.tbz') {
+            $comptype = Archive::COMPRESS_BZIP;
+        } else {
+            $comptype = Archive::COMPRESS_NONE;
+        }
+        return $comptype;
+    }
+}
diff --git a/vendor/splitbrain/php-archive/src/Zip.php b/vendor/splitbrain/php-archive/src/Zip.php
new file mode 100644
index 000000000..c2ff36575
--- /dev/null
+++ b/vendor/splitbrain/php-archive/src/Zip.php
@@ -0,0 +1,654 @@
+<?php
+
+namespace splitbrain\PHPArchive;
+
+/**
+ * Class Zip
+ *
+ * Creates or extracts Zip archives
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @package splitbrain\PHPArchive
+ * @license MIT
+ */
+class Zip extends Archive
+{
+
+    protected $file = '';
+    protected $fh;
+    protected $memory = '';
+    protected $closed = true;
+    protected $writeaccess = false;
+    protected $ctrl_dir;
+    protected $complevel = 9;
+
+    /**
+     * Set the compression level.
+     *
+     * Compression Type is ignored for ZIP
+     *
+     * You can call this function before adding each file to set differen compression levels
+     * for each file.
+     *
+     * @param int $level Compression level (0 to 9)
+     * @param int $type  Type of compression to use ignored for ZIP
+     * @return mixed
+     */
+    public function setCompression($level = 9, $type = Archive::COMPRESS_AUTO)
+    {
+        $this->complevel = $level;
+    }
+
+    /**
+     * Open an existing ZIP file for reading
+     *
+     * @param string $file
+     * @throws ArchiveIOException
+     */
+    public function open($file)
+    {
+        $this->file = $file;
+        $this->fh   = @fopen($this->file, 'rb');
+        if (!$this->fh) {
+            throw new ArchiveIOException('Could not open file for reading: '.$this->file);
+        }
+        $this->closed = false;
+    }
+
+    /**
+     * Read the contents of a ZIP archive
+     *
+     * This function lists the files stored in the archive, and returns an indexed array of FileInfo objects
+     *
+     * The archive is closed afer reading the contents, for API compatibility with TAR files
+     * Reopen the file with open() again if you want to do additional operations
+     *
+     * @throws ArchiveIOException
+     * @return FileInfo[]
+     */
+    public function contents()
+    {
+        if ($this->closed || !$this->file) {
+            throw new ArchiveIOException('Can not read from a closed archive');
+        }
+
+        $result = array();
+
+        $centd = $this->readCentralDir();
+
+        @rewind($this->fh);
+        @fseek($this->fh, $centd['offset']);
+
+        for ($i = 0; $i < $centd['entries']; $i++) {
+            $result[] = $this->header2fileinfo($this->readCentralFileHeader());
+        }
+
+        $this->close();
+        return $result;
+    }
+
+    /**
+     * Extract an existing ZIP archive
+     *
+     * The $strip parameter allows you to strip a certain number of path components from the filenames
+     * found in the tar file, similar to the --strip-components feature of GNU tar. This is triggered when
+     * an integer is passed as $strip.
+     * Alternatively a fixed string prefix may be passed in $strip. If the filename matches this prefix,
+     * the prefix will be stripped. It is recommended to give prefixes with a trailing slash.
+     *
+     * By default this will extract all files found in the archive. You can restrict the output using the $include
+     * and $exclude parameter. Both expect a full regular expression (including delimiters and modifiers). If
+     * $include is set only files that match this expression will be extracted. Files that match the $exclude
+     * expression will never be extracted. Both parameters can be used in combination. Expressions are matched against
+     * stripped filenames as described above.
+     *
+     * @param string     $outdir  the target directory for extracting
+     * @param int|string $strip   either the number of path components or a fixed prefix to strip
+     * @param string     $exclude a regular expression of files to exclude
+     * @param string     $include a regular expression of files to include
+     * @throws ArchiveIOException
+     * @return FileInfo[]
+     */
+    function extract($outdir, $strip = '', $exclude = '', $include = '')
+    {
+        if ($this->closed || !$this->file) {
+            throw new ArchiveIOException('Can not read from a closed archive');
+        }
+
+        $outdir = rtrim($outdir, '/');
+        @mkdir($outdir, 0777, true);
+
+        $extracted = array();
+
+        $cdir      = $this->readCentralDir();
+        $pos_entry = $cdir['offset']; // begin of the central file directory
+
+        for ($i = 0; $i < $cdir['entries']; $i++) {
+            // read file header
+            @fseek($this->fh, $pos_entry);
+            $header          = $this->readCentralFileHeader();
+            $header['index'] = $i;
+            $pos_entry       = ftell($this->fh); // position of the next file in central file directory
+            fseek($this->fh, $header['offset']); // seek to beginning of file header
+            $header   = $this->readFileHeader($header);
+            $fileinfo = $this->header2fileinfo($header);
+
+            // apply strip rules
+            $fileinfo->strip($strip);
+
+            // skip unwanted files
+            if (!strlen($fileinfo->getPath()) || !$fileinfo->match($include, $exclude)) {
+                continue;
+            }
+
+            $extracted[] = $fileinfo;
+
+            // create output directory
+            $output    = $outdir.'/'.$fileinfo->getPath();
+            $directory = ($header['folder']) ? $output : dirname($output);
+            @mkdir($directory, 0777, true);
+
+            // nothing more to do for directories
+            if ($fileinfo->getIsdir()) {
+                continue;
+            }
+
+            // compressed files are written to temporary .gz file first
+            if ($header['compression'] == 0) {
+                $extractto = $output;
+            } else {
+                $extractto = $output.'.gz';
+            }
+
+            // open file for writing
+            $fp = fopen($extractto, "wb");
+            if (!$fp) {
+                throw new ArchiveIOException('Could not open file for writing: '.$extractto);
+            }
+
+            // prepend compression header
+            if ($header['compression'] != 0) {
+                $binary_data = pack(
+                    'va1a1Va1a1',
+                    0x8b1f,
+                    chr($header['compression']),
+                    chr(0x00),
+                    time(),
+                    chr(0x00),
+                    chr(3)
+                );
+                fwrite($fp, $binary_data, 10);
+            }
+
+            // read the file and store it on disk
+            $size = $header['compressed_size'];
+            while ($size != 0) {
+                $read_size   = ($size < 2048 ? $size : 2048);
+                $buffer      = fread($this->fh, $read_size);
+                $binary_data = pack('a'.$read_size, $buffer);
+                fwrite($fp, $binary_data, $read_size);
+                $size -= $read_size;
+            }
+
+            // finalize compressed file
+            if ($header['compression'] != 0) {
+                $binary_data = pack('VV', $header['crc'], $header['size']);
+                fwrite($fp, $binary_data, 8);
+            }
+
+            // close file
+            fclose($fp);
+
+            // unpack compressed file
+            if ($header['compression'] != 0) {
+                $gzp = @gzopen($extractto, 'rb');
+                if (!$gzp) {
+                    @unlink($extractto);
+                    throw new ArchiveIOException('Failed file extracting. gzip support missing?');
+                }
+                $fp = @fopen($output, 'wb');
+                if (!$fp) {
+                    throw new ArchiveIOException('Could not open file for writing: '.$extractto);
+                }
+
+                $size = $header['size'];
+                while ($size != 0) {
+                    $read_size   = ($size < 2048 ? $size : 2048);
+                    $buffer      = gzread($gzp, $read_size);
+                    $binary_data = pack('a'.$read_size, $buffer);
+                    @fwrite($fp, $binary_data, $read_size);
+                    $size -= $read_size;
+                }
+                fclose($fp);
+                gzclose($gzp);
+            }
+
+            touch($output, $fileinfo->getMtime());
+            //FIXME what about permissions?
+        }
+
+        $this->close();
+        return $extracted;
+    }
+
+    /**
+     * Create a new ZIP file
+     *
+     * If $file is empty, the zip file will be created in memory
+     *
+     * @param string $file
+     * @throws ArchiveIOException
+     */
+    public function create($file = '')
+    {
+        $this->file   = $file;
+        $this->memory = '';
+        $this->fh     = 0;
+
+        if ($this->file) {
+            $this->fh = @fopen($this->file, 'wb');
+
+            if (!$this->fh) {
+                throw new ArchiveIOException('Could not open file for writing: '.$this->file);
+            }
+        }
+        $this->writeaccess = true;
+        $this->closed      = false;
+        $this->ctrl_dir    = array();
+    }
+
+    /**
+     * Add a file to the current ZIP archive using an existing file in the filesystem
+     *
+     * @param string          $file     path to the original file
+     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data, empty to take from original
+     * @throws ArchiveIOException
+     */
+
+    /**
+     * Add a file to the current archive using an existing file in the filesystem
+     *
+     * @param string          $file     path to the original file
+     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data, empty to take from original
+     * @throws ArchiveIOException
+     */
+    public function addFile($file, $fileinfo = '')
+    {
+        if (is_string($fileinfo)) {
+            $fileinfo = FileInfo::fromPath($file, $fileinfo);
+        }
+
+        if ($this->closed) {
+            throw new ArchiveIOException('Archive has been closed, files can no longer be added');
+        }
+
+        $data = @file_get_contents($file);
+        if ($data === false) {
+            throw new ArchiveIOException('Could not open file for reading: '.$file);
+        }
+
+        // FIXME could we stream writing compressed data? gzwrite on a fopen handle?
+        $this->addData($fileinfo, $data);
+    }
+
+    /**
+     * Add a file to the current TAR archive using the given $data as content
+     *
+     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with all meta data
+     * @param string          $data     binary content of the file to add
+     * @throws ArchiveIOException
+     */
+    public function addData($fileinfo, $data)
+    {
+        if (is_string($fileinfo)) {
+            $fileinfo = new FileInfo($fileinfo);
+        }
+
+        if ($this->closed) {
+            throw new ArchiveIOException('Archive has been closed, files can no longer be added');
+        }
+
+        // prepare the various header infos
+        $dtime    = dechex($this->makeDosTime($fileinfo->getMtime()));
+        $hexdtime = pack(
+            'H*',
+            $dtime[6].$dtime[7].
+            $dtime[4].$dtime[5].
+            $dtime[2].$dtime[3].
+            $dtime[0].$dtime[1]
+        );
+        $size     = strlen($data);
+        $crc      = crc32($data);
+        if ($this->complevel) {
+            $fmagic = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00";
+            $cmagic = "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00";
+            $data   = gzcompress($data, $this->complevel);
+            $data   = substr($data, 2, -4); // strip compression headers
+        } else {
+            $fmagic = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00";
+            $cmagic = "\x50\x4b\x01\x02\x14\x00\x0a\x00\x00\x00\x00\x00";
+        }
+        $csize  = strlen($data);
+        $offset = $this->dataOffset();
+        $name   = $fileinfo->getPath();
+
+        // write data
+        $this->writebytes($fmagic);
+        $this->writebytes($hexdtime);
+        $this->writebytes(pack('V', $crc).pack('V', $csize).pack('V', $size)); //pre header
+        $this->writebytes(pack('v', strlen($name)).pack('v', 0).$name.$data); //file data
+        $this->writebytes(pack('V', $crc).pack('V', $csize).pack('V', $size)); //post header
+
+        // add info to central file directory
+        $cdrec = $cmagic;
+        $cdrec .= $hexdtime.pack('V', $crc).pack('V', $csize).pack('V', $size);
+        $cdrec .= pack('v', strlen($name)).pack('v', 0).pack('v', 0);
+        $cdrec .= pack('v', 0).pack('v', 0).pack('V', 32);
+        $cdrec .= pack('V', $offset);
+        $cdrec .= $name;
+        $this->ctrl_dir[] = $cdrec;
+    }
+
+    /**
+     * Add the closing footer to the archive if in write mode, close all file handles
+     *
+     * After a call to this function no more data can be added to the archive, for
+     * read access no reading is allowed anymore
+     */
+    public function close()
+    {
+        if ($this->closed) {
+            return;
+        } // we did this already
+
+        // write footer
+        if ($this->writeaccess) {
+            $offset  = $this->dataOffset();
+            $ctrldir = join('', $this->ctrl_dir);
+            $this->writebytes($ctrldir);
+            $this->writebytes("\x50\x4b\x05\x06\x00\x00\x00\x00"); // EOF CTRL DIR
+            $this->writebytes(pack('v', count($this->ctrl_dir)).pack('v', count($this->ctrl_dir)));
+            $this->writebytes(pack('V', strlen($ctrldir)).pack('V', strlen($offset))."\x00\x00");
+            $this->ctrl_dir = array();
+        }
+
+        // close file handles
+        if ($this->file) {
+            fclose($this->fh);
+            $this->file = '';
+            $this->fh   = 0;
+        }
+
+        $this->writeaccess = false;
+        $this->closed      = true;
+    }
+
+    /**
+     * Returns the created in-memory archive data
+     *
+     * This implicitly calls close() on the Archive
+     */
+    public function getArchive()
+    {
+        $this->close();
+
+        return $this->memory;
+    }
+
+    /**
+     * Save the created in-memory archive data
+     *
+     * Note: It's more memory effective to specify the filename in the create() function and
+     * let the library work on the new file directly.
+     *
+     * @param     $file
+     * @throws ArchiveIOException
+     */
+    public function save($file)
+    {
+        if (!file_put_contents($file, $this->getArchive())) {
+            throw new ArchiveIOException('Could not write to file: '.$file);
+        }
+    }
+
+    /**
+     * Read the central directory
+     *
+     * This key-value list contains general information about the ZIP file
+     *
+     * @return array
+     */
+    protected function readCentralDir()
+    {
+        $size = filesize($this->file);
+        if ($size < 277) {
+            $maximum_size = $size;
+        } else {
+            $maximum_size = 277;
+        }
+
+        @fseek($this->fh, $size - $maximum_size);
+        $pos   = ftell($this->fh);
+        $bytes = 0x00000000;
+
+        while ($pos < $size) {
+            $byte  = @fread($this->fh, 1);
+            $bytes = (($bytes << 8) & 0xFFFFFFFF) | ord($byte);
+            if ($bytes == 0x504b0506) {
+                break;
+            }
+            $pos++;
+        }
+
+        $data = unpack(
+            'vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size',
+            fread($this->fh, 18)
+        );
+
+        if ($data['comment_size'] != 0) {
+            $centd['comment'] = fread($this->fh, $data['comment_size']);
+        } else {
+            $centd['comment'] = '';
+        }
+        $centd['entries']      = $data['entries'];
+        $centd['disk_entries'] = $data['disk_entries'];
+        $centd['offset']       = $data['offset'];
+        $centd['disk_start']   = $data['disk_start'];
+        $centd['size']         = $data['size'];
+        $centd['disk']         = $data['disk'];
+        return $centd;
+    }
+
+    /**
+     * Read the next central file header
+     *
+     * Assumes the current file pointer is pointing at the right position
+     *
+     * @return array
+     */
+    protected function readCentralFileHeader()
+    {
+        $binary_data = fread($this->fh, 46);
+        $header      = unpack(
+            'vchkid/vid/vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset',
+            $binary_data
+        );
+
+        if ($header['filename_len'] != 0) {
+            $header['filename'] = fread($this->fh, $header['filename_len']);
+        } else {
+            $header['filename'] = '';
+        }
+
+        if ($header['extra_len'] != 0) {
+            $header['extra'] = fread($this->fh, $header['extra_len']);
+        } else {
+            $header['extra'] = '';
+        }
+
+        if ($header['comment_len'] != 0) {
+            $header['comment'] = fread($this->fh, $header['comment_len']);
+        } else {
+            $header['comment'] = '';
+        }
+
+        if ($header['mdate'] && $header['mtime']) {
+            $hour            = ($header['mtime'] & 0xF800) >> 11;
+            $minute          = ($header['mtime'] & 0x07E0) >> 5;
+            $seconde         = ($header['mtime'] & 0x001F) * 2;
+            $year            = (($header['mdate'] & 0xFE00) >> 9) + 1980;
+            $month           = ($header['mdate'] & 0x01E0) >> 5;
+            $day             = $header['mdate'] & 0x001F;
+            $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year);
+        } else {
+            $header['mtime'] = time();
+        }
+
+        $header['stored_filename'] = $header['filename'];
+        $header['status']          = 'ok';
+        if (substr($header['filename'], -1) == '/') {
+            $header['external'] = 0x41FF0010;
+        }
+        $header['folder'] = ($header['external'] == 0x41FF0010 || $header['external'] == 16) ? 1 : 0;
+
+        return $header;
+    }
+
+    /**
+     * Reads the local file header
+     *
+     * This header precedes each individual file inside the zip file. Assumes the current file pointer is pointing at
+     * the right position already. Enhances this given central header with the data found at the local header.
+     *
+     * @param array $header the central file header read previously (see above)
+     * @return array
+     */
+    function readFileHeader($header)
+    {
+        $binary_data = fread($this->fh, 30);
+        $data        = unpack(
+            'vchk/vid/vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len',
+            $binary_data
+        );
+
+        $header['filename'] = fread($this->fh, $data['filename_len']);
+        if ($data['extra_len'] != 0) {
+            $header['extra'] = fread($this->fh, $data['extra_len']);
+        } else {
+            $header['extra'] = '';
+        }
+
+        $header['compression'] = $data['compression'];
+        foreach (array(
+                     'size',
+                     'compressed_size',
+                     'crc'
+                 ) as $hd) { // On ODT files, these headers are 0. Keep the previous value.
+            if ($data[$hd] != 0) {
+                $header[$hd] = $data[$hd];
+            }
+        }
+        $header['flag']  = $data['flag'];
+        $header['mdate'] = $data['mdate'];
+        $header['mtime'] = $data['mtime'];
+
+        if ($header['mdate'] && $header['mtime']) {
+            $hour            = ($header['mtime'] & 0xF800) >> 11;
+            $minute          = ($header['mtime'] & 0x07E0) >> 5;
+            $seconde         = ($header['mtime'] & 0x001F) * 2;
+            $year            = (($header['mdate'] & 0xFE00) >> 9) + 1980;
+            $month           = ($header['mdate'] & 0x01E0) >> 5;
+            $day             = $header['mdate'] & 0x001F;
+            $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year);
+        } else {
+            $header['mtime'] = time();
+        }
+
+        $header['stored_filename'] = $header['filename'];
+        $header['status']          = "ok";
+        $header['folder']          = ($header['external'] == 0x41FF0010 || $header['external'] == 16) ? 1 : 0;
+        return $header;
+    }
+
+    /**
+     * Create fileinfo object from header data
+     *
+     * @param $header
+     * @return FileInfo
+     */
+    protected function header2fileinfo($header)
+    {
+        $fileinfo = new FileInfo();
+        $fileinfo->setPath($header['filename']);
+        $fileinfo->setSize($header['size']);
+        $fileinfo->setCompressedSize($header['compressed_size']);
+        $fileinfo->setMtime($header['mtime']);
+        $fileinfo->setComment($header['comment']);
+        $fileinfo->setIsdir($header['external'] == 0x41FF0010 || $header['external'] == 16);
+        return $fileinfo;
+    }
+
+    /**
+     * Write to the open filepointer or memory
+     *
+     * @param string $data
+     * @throws ArchiveIOException
+     * @return int number of bytes written
+     */
+    protected function writebytes($data)
+    {
+        if (!$this->file) {
+            $this->memory .= $data;
+            $written = strlen($data);
+        } else {
+            $written = @fwrite($this->fh, $data);
+        }
+        if ($written === false) {
+            throw new ArchiveIOException('Failed to write to archive stream');
+        }
+        return $written;
+    }
+
+    /**
+     * Current data pointer position
+     *
+     * @fixme might need a -1
+     * @return int
+     */
+    protected function dataOffset()
+    {
+        if ($this->file) {
+            return ftell($this->fh);
+        } else {
+            return strlen($this->memory);
+        }
+    }
+
+    /**
+     * Create a DOS timestamp from a UNIX timestamp
+     *
+     * DOS timestamps start at 1980-01-01, earlier UNIX stamps will be set to this date
+     *
+     * @param $time
+     * @return int
+     */
+    protected function makeDosTime($time)
+    {
+        $timearray = getdate($time);
+        if ($timearray['year'] < 1980) {
+            $timearray['year']    = 1980;
+            $timearray['mon']     = 1;
+            $timearray['mday']    = 1;
+            $timearray['hours']   = 0;
+            $timearray['minutes'] = 0;
+            $timearray['seconds'] = 0;
+        }
+        return (($timearray['year'] - 1980) << 25) |
+        ($timearray['mon'] << 21) |
+        ($timearray['mday'] << 16) |
+        ($timearray['hours'] << 11) |
+        ($timearray['minutes'] << 5) |
+        ($timearray['seconds'] >> 1);
+    }
+
+}
-- 
cgit v1.2.3


From 1bf2f04f1149da9ed13450ac33cbc6289d3d4f54 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 15 May 2015 15:45:32 +0200
Subject: remove tests that are now in upstream

---
 _test/tests/inc/tar.test.php             | 454 -------------------------------
 _test/tests/inc/tar/block.txt            |   1 -
 _test/tests/inc/tar/foobar/testdata2.txt |   1 -
 _test/tests/inc/tar/longpath-gnu.tgz     | Bin 413 -> 0 bytes
 _test/tests/inc/tar/longpath-ustar.tgz   | Bin 311 -> 0 bytes
 _test/tests/inc/tar/tarbomb.tgz          | Bin 183 -> 0 bytes
 _test/tests/inc/tar/test.tar             | Bin 10240 -> 0 bytes
 _test/tests/inc/tar/test.tbz             | Bin 217 -> 0 bytes
 _test/tests/inc/tar/test.tgz             | Bin 220 -> 0 bytes
 _test/tests/inc/tar/testdata1.txt        |   1 -
 _test/tests/inc/tar/zero.txt             |   0
 11 files changed, 457 deletions(-)
 delete mode 100644 _test/tests/inc/tar.test.php
 delete mode 100644 _test/tests/inc/tar/block.txt
 delete mode 100644 _test/tests/inc/tar/foobar/testdata2.txt
 delete mode 100644 _test/tests/inc/tar/longpath-gnu.tgz
 delete mode 100644 _test/tests/inc/tar/longpath-ustar.tgz
 delete mode 100644 _test/tests/inc/tar/tarbomb.tgz
 delete mode 100644 _test/tests/inc/tar/test.tar
 delete mode 100644 _test/tests/inc/tar/test.tbz
 delete mode 100644 _test/tests/inc/tar/test.tgz
 delete mode 100644 _test/tests/inc/tar/testdata1.txt
 delete mode 100644 _test/tests/inc/tar/zero.txt

diff --git a/_test/tests/inc/tar.test.php b/_test/tests/inc/tar.test.php
deleted file mode 100644
index 15453b16d..000000000
--- a/_test/tests/inc/tar.test.php
+++ /dev/null
@@ -1,454 +0,0 @@
-<?php
-
-class Tar_TestCase extends DokuWikiTest {
-    /**
-     * file extensions that several tests use
-     */
-    protected $extensions = array('tar');
-
-    public function setUp() {
-        parent::setUp();
-        if (extension_loaded('zlib')) {
-            $this->extensions[] = 'tgz';
-        }
-        if (extension_loaded('bz2')) {
-            $this->extensions[] = 'tbz';
-        }
-    }
-
-    /*
-     * dependency for tests needing zlib extension to pass
-     */
-    public function test_ext_zlib() {
-        if (!extension_loaded('zlib')) {
-            $this->markTestSkipped('skipping all zlib tests.  Need zlib extension');
-        }
-    }
-
-    /*
-     * dependency for tests needing zlib extension to pass
-     */
-    public function test_ext_bz2() {
-        if (!extension_loaded('bz2')) {
-            $this->markTestSkipped('skipping all bzip2 tests.  Need bz2 extension');
-        }
-    }
-
-    /**
-     * simple test that checks that the given filenames and contents can be grepped from
-     * the uncompressed tar stream
-     *
-     * No check for format correctness
-     */
-    public function test_createdynamic() {
-        $tar = new Tar();
-
-        $dir  = dirname(__FILE__).'/tar';
-        $tdir = ltrim($dir,'/');
-
-        $tar->create();
-        $tar->AddFile("$dir/testdata1.txt");
-        $tar->AddFile("$dir/foobar/testdata2.txt", 'noway/testdata2.txt');
-        $tar->addData('another/testdata3.txt', 'testcontent3');
-
-        $data = $tar->getArchive();
-
-        $this->assertTrue(strpos($data, 'testcontent1') !== false, 'Content in TAR');
-        $this->assertTrue(strpos($data, 'testcontent2') !== false, 'Content in TAR');
-        $this->assertTrue(strpos($data, 'testcontent3') !== false, 'Content in TAR');
-
-        // fullpath might be too long to be stored as full path FS#2802
-        $this->assertTrue(strpos($data, "$tdir") !== false, 'Path in TAR');
-        $this->assertTrue(strpos($data, "testdata1.txt") !== false, 'File in TAR');
-
-        $this->assertTrue(strpos($data, 'noway/testdata2.txt') !== false, 'Path in TAR');
-        $this->assertTrue(strpos($data, 'another/testdata3.txt') !== false, 'Path in TAR');
-
-        // fullpath might be too long to be stored as full path FS#2802
-        $this->assertTrue(strpos($data, "$tdir/foobar") === false, 'Path not in TAR');
-        $this->assertTrue(strpos($data, "foobar.txt") === false, 'File not in TAR');
-
-        $this->assertTrue(strpos($data, "foobar") === false, 'Path not in TAR');
-    }
-
-    /**
-     * simple test that checks that the given filenames and contents can be grepped from the
-     * uncompressed tar file
-     *
-     * No check for format correctness
-     */
-    public function test_createfile() {
-        $tar = new Tar();
-
-        $dir = dirname(__FILE__).'/tar';
-        $tdir = ltrim($dir,'/');
-        $tmp = tempnam(sys_get_temp_dir(), 'dwtartest');
-
-        $tar->create($tmp, Tar::COMPRESS_NONE);
-        $tar->AddFile("$dir/testdata1.txt");
-        $tar->AddFile("$dir/foobar/testdata2.txt", 'noway/testdata2.txt');
-        $tar->addData('another/testdata3.txt', 'testcontent3');
-        $tar->close();
-
-        $this->assertTrue(filesize($tmp) > 30); //arbitrary non-zero number
-        $data = file_get_contents($tmp);
-
-        $this->assertTrue(strpos($data, 'testcontent1') !== false, 'Content in TAR');
-        $this->assertTrue(strpos($data, 'testcontent2') !== false, 'Content in TAR');
-        $this->assertTrue(strpos($data, 'testcontent3') !== false, 'Content in TAR');
-
-        // fullpath might be too long to be stored as full path FS#2802
-        $this->assertTrue(strpos($data, "$tdir") !== false, "Path in TAR '$tdir'");
-        $this->assertTrue(strpos($data, "testdata1.txt") !== false, 'File in TAR');
-
-        $this->assertTrue(strpos($data, 'noway/testdata2.txt') !== false, 'Path in TAR');
-        $this->assertTrue(strpos($data, 'another/testdata3.txt') !== false, 'Path in TAR');
-
-        // fullpath might be too long to be stored as full path FS#2802
-        $this->assertTrue(strpos($data, "$tdir/foobar") === false, 'Path not in TAR');
-        $this->assertTrue(strpos($data, "foobar.txt") === false, 'File not in TAR');
-
-        $this->assertTrue(strpos($data, "foobar") === false, 'Path not in TAR');
-
-        @unlink($tmp);
-    }
-
-    /**
-     * List the contents of the prebuilt TAR files
-     */
-    public function test_tarcontent() {
-        $dir = dirname(__FILE__).'/tar';
-
-        foreach($this->extensions as $ext) {
-            $tar  = new Tar();
-            $file = "$dir/test.$ext";
-
-            $tar->open($file);
-            $content = $tar->contents();
-
-            $this->assertCount(4, $content, "Contents of $file");
-            $this->assertEquals('tar/testdata1.txt', $content[1]['filename'], "Contents of $file");
-            $this->assertEquals(13, $content[1]['size'], "Contents of $file");
-
-            $this->assertEquals('tar/foobar/testdata2.txt', $content[3]['filename'], "Contents of $file");
-            $this->assertEquals(13, $content[1]['size'], "Contents of $file");
-        }
-    }
-
-    /**
-     * Extract the prebuilt tar files
-     */
-    public function test_tarextract() {
-        $dir = dirname(__FILE__).'/tar';
-        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
-
-        foreach($this->extensions as $ext) {
-            $tar  = new Tar();
-            $file = "$dir/test.$ext";
-
-            $tar->open($file);
-            $tar->extract($out);
-
-            clearstatcache();
-
-            $this->assertFileExists($out.'/tar/testdata1.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/tar/testdata1.txt'), "Extracted $file");
-
-            $this->assertFileExists($out.'/tar/foobar/testdata2.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/tar/foobar/testdata2.txt'), "Extracted $file");
-
-            TestUtils::rdelete($out);
-        }
-    }
-
-    /**
-     * Extract the prebuilt tar files with component stripping
-     */
-    public function test_compstripextract() {
-        $dir = dirname(__FILE__).'/tar';
-        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
-
-        foreach($this->extensions as $ext) {
-            $tar  = new Tar();
-            $file = "$dir/test.$ext";
-
-            $tar->open($file);
-            $tar->extract($out, 1);
-
-            clearstatcache();
-
-            $this->assertFileExists($out.'/testdata1.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/testdata1.txt'), "Extracted $file");
-
-            $this->assertFileExists($out.'/foobar/testdata2.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/foobar/testdata2.txt'), "Extracted $file");
-
-            TestUtils::rdelete($out);
-        }
-    }
-
-    /**
-     * Extract the prebuilt tar files with prefix stripping
-     */
-    public function test_prefixstripextract() {
-        $dir = dirname(__FILE__).'/tar';
-        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
-
-        foreach($this->extensions as $ext) {
-            $tar  = new Tar();
-            $file = "$dir/test.$ext";
-
-            $tar->open($file);
-            $tar->extract($out, 'tar/foobar/');
-
-            clearstatcache();
-
-            $this->assertFileExists($out.'/tar/testdata1.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/tar/testdata1.txt'), "Extracted $file");
-
-            $this->assertFileExists($out.'/testdata2.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/testdata2.txt'), "Extracted $file");
-
-            TestUtils::rdelete($out);
-        }
-    }
-
-    /**
-     * Extract the prebuilt tar files with include regex
-     */
-    public function test_includeextract() {
-        $dir = dirname(__FILE__).'/tar';
-        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
-
-        foreach($this->extensions as $ext) {
-            $tar  = new Tar();
-            $file = "$dir/test.$ext";
-
-            $tar->open($file);
-            $tar->extract($out, '', '', '/\/foobar\//');
-
-            clearstatcache();
-
-            $this->assertFileNotExists($out.'/tar/testdata1.txt', "Extracted $file");
-
-            $this->assertFileExists($out.'/tar/foobar/testdata2.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/tar/foobar/testdata2.txt'), "Extracted $file");
-
-            TestUtils::rdelete($out);
-        }
-    }
-
-    /**
-     * Extract the prebuilt tar files with exclude regex
-     */
-    public function test_excludeextract() {
-        $dir = dirname(__FILE__).'/tar';
-        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
-
-        foreach($this->extensions as $ext) {
-            $tar  = new Tar();
-            $file = "$dir/test.$ext";
-
-            $tar->open($file);
-            $tar->extract($out, '', '/\/foobar\//');
-
-            clearstatcache();
-
-            $this->assertFileExists($out.'/tar/testdata1.txt', "Extracted $file");
-            $this->assertEquals(13, filesize($out.'/tar/testdata1.txt'), "Extracted $file");
-
-            $this->assertFileNotExists($out.'/tar/foobar/testdata2.txt', "Extracted $file");
-
-            TestUtils::rdelete($out);
-        }
-    }
-
-    /**
-     * Check the extension to compression guesser
-     */
-    public function test_filetype() {
-        $tar = new Tar();
-        $this->assertEquals(Tar::COMPRESS_NONE, $tar->filetype('foo'));
-        $this->assertEquals(Tar::COMPRESS_GZIP, $tar->filetype('foo.tgz'));
-        $this->assertEquals(Tar::COMPRESS_GZIP, $tar->filetype('foo.tGZ'));
-        $this->assertEquals(Tar::COMPRESS_GZIP, $tar->filetype('foo.tar.GZ'));
-        $this->assertEquals(Tar::COMPRESS_GZIP, $tar->filetype('foo.tar.gz'));
-        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tbz'));
-        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tBZ'));
-        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.BZ2'));
-        $this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.bz2'));
-    }
-
-    /**
-     * @depends test_ext_zlib
-     */
-    public function test_longpathextract() {
-        $dir = dirname(__FILE__).'/tar';
-        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
-
-        foreach(array('ustar', 'gnu') as $format) {
-            $tar = new Tar();
-            $tar->open("$dir/longpath-$format.tgz");
-            $tar->extract($out);
-
-            $this->assertFileExists($out.'/1234567890/1234567890/1234567890/1234567890/1234567890/1234567890/1234567890/1234567890/1234567890/1234567890/1234567890/1234567890/test.txt');
-
-            TestUtils::rdelete($out);
-        }
-    }
-
-    // FS#1442
-    public function test_createlongfile() {
-        $tar = new Tar();
-        $tmp = tempnam(sys_get_temp_dir(), 'dwtartest');
-
-        $path = '0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789.txt';
-
-        $tar->create($tmp, Tar::COMPRESS_NONE);
-        $tar->addData($path, 'testcontent1');
-        $tar->close();
-
-        $this->assertTrue(filesize($tmp) > 30); //arbitrary non-zero number
-        $data = file_get_contents($tmp);
-
-        // We should find the complete path and a longlink entry
-        $this->assertTrue(strpos($data, 'testcontent1') !== false, 'content in TAR');
-        $this->assertTrue(strpos($data, $path) !== false, 'path in TAR');
-        $this->assertTrue(strpos($data, '@LongLink') !== false, '@LongLink in TAR');
-
-        @unlink($tmp);
-    }
-
-    public function test_createlongpathustar() {
-        $tar = new Tar();
-        $tmp = tempnam(sys_get_temp_dir(), 'dwtartest');
-
-        $path = '';
-        for($i=0; $i<11; $i++) $path .= '1234567890/';
-        $path = rtrim($path,'/');
-
-        $tar->create($tmp, Tar::COMPRESS_NONE);
-        $tar->addData("$path/test.txt", 'testcontent1');
-        $tar->close();
-
-        $this->assertTrue(filesize($tmp) > 30); //arbitrary non-zero number
-        $data = file_get_contents($tmp);
-
-        // We should find the path and filename separated, no longlink entry
-        $this->assertTrue(strpos($data, 'testcontent1') !== false, 'content in TAR');
-        $this->assertTrue(strpos($data, 'test.txt') !== false, 'filename in TAR');
-        $this->assertTrue(strpos($data, $path) !== false, 'path in TAR');
-        $this->assertFalse(strpos($data, "$path/test.txt") !== false, 'full filename in TAR');
-        $this->assertFalse(strpos($data, '@LongLink') !== false, '@LongLink in TAR');
-
-        @unlink($tmp);
-    }
-
-    public function test_createlongpathgnu() {
-        $tar = new Tar();
-        $tmp = tempnam(sys_get_temp_dir(), 'dwtartest');
-
-        $path = '';
-        for($i=0; $i<20; $i++) $path .= '1234567890/';
-        $path = rtrim($path,'/');
-
-        $tar->create($tmp, Tar::COMPRESS_NONE);
-        $tar->addData("$path/test.txt", 'testcontent1');
-        $tar->close();
-
-        $this->assertTrue(filesize($tmp) > 30); //arbitrary non-zero number
-        $data = file_get_contents($tmp);
-
-        // We should find the complete path/filename and a longlink entry
-        $this->assertTrue(strpos($data, 'testcontent1') !== false, 'content in TAR');
-        $this->assertTrue(strpos($data, 'test.txt') !== false, 'filename in TAR');
-        $this->assertTrue(strpos($data, $path) !== false, 'path in TAR');
-        $this->assertTrue(strpos($data, "$path/test.txt") !== false, 'full filename in TAR');
-        $this->assertTrue(strpos($data, '@LongLink') !== false, '@LongLink in TAR');
-
-        @unlink($tmp);
-    }
-
-    /**
-     * Extract a tarbomomb
-     * @depends test_ext_zlib
-     */
-    public function test_tarbomb() {
-        $dir = dirname(__FILE__).'/tar';
-        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
-
-        $tar  = new Tar();
-
-        $tar->open("$dir/tarbomb.tgz");
-        $tar->extract($out);
-
-        clearstatcache();
-
-        $this->assertFileExists($out.'/AAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB.txt');
-
-        TestUtils::rdelete($out);
-    }
-
-    /**
-     * A single zero file should be just a header block + the footer
-     */
-    public function test_zerofile(){
-        $dir = dirname(__FILE__).'/tar';
-        $tar = new Tar();
-        $tar->create();
-        $tar->addFile("$dir/zero.txt", 'zero.txt');
-        $file = $tar->getArchive(Tar::COMPRESS_NONE);
-
-        $this->assertEquals(512*3, strlen($file)); // 1 header block + 2 footer blocks
-    }
-
-    public function test_zerodata(){
-        $tar = new Tar();
-        $tar->create();
-        $tar->addData('zero.txt','');
-        $file = $tar->getArchive(Tar::COMPRESS_NONE);
-
-        $this->assertEquals(512*3, strlen($file)); // 1 header block + 2 footer blocks
-    }
-
-    /**
-     * A file of exactly one block should be just a header block + data block + the footer
-     */
-    public function test_blockfile(){
-        $dir = dirname(__FILE__).'/tar';
-        $tar = new Tar();
-        $tar->create();
-        $tar->addFile("$dir/block.txt", 'block.txt');
-        $file = $tar->getArchive(Tar::COMPRESS_NONE);
-
-        $this->assertEquals(512*4, strlen($file)); // 1 header block + data block + 2 footer blocks
-    }
-
-    public function test_blockdata(){
-        $tar = new Tar();
-        $tar->create();
-        $tar->addData('block.txt', str_pad('', 512, 'x'));
-        $file = $tar->getArchive(Tar::COMPRESS_NONE);
-
-        $this->assertEquals(512*4, strlen($file)); // 1 header block + data block + 2 footer blocks
-    }
-
-
-    public function test_cleanPath(){
-        $tar = new Tar();
-        $tests = array (
-            '/foo/bar' => 'foo/bar',
-            '/foo/bar/' => 'foo/bar',
-            'foo//bar' => 'foo/bar',
-            'foo/0/bar' => 'foo/0/bar',
-            'foo/../bar' => 'bar',
-            'foo/bang/bang/../../bar' => 'foo/bar',
-            'foo/../../bar' => 'bar',
-            'foo/.././../bar' => 'bar',
-        );
-
-        foreach($tests as $in => $out){
-            $this->assertEquals($out, $tar->cleanPath($in), "Input: $in");
-        }
-    }
-}
diff --git a/_test/tests/inc/tar/block.txt b/_test/tests/inc/tar/block.txt
deleted file mode 100644
index 9b2f53080..000000000
--- a/_test/tests/inc/tar/block.txt
+++ /dev/null
@@ -1 +0,0 @@
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
\ No newline at end of file
diff --git a/_test/tests/inc/tar/foobar/testdata2.txt b/_test/tests/inc/tar/foobar/testdata2.txt
deleted file mode 100644
index a7db15771..000000000
--- a/_test/tests/inc/tar/foobar/testdata2.txt
+++ /dev/null
@@ -1 +0,0 @@
-testcontent2
diff --git a/_test/tests/inc/tar/longpath-gnu.tgz b/_test/tests/inc/tar/longpath-gnu.tgz
deleted file mode 100644
index 6c937c8fe..000000000
Binary files a/_test/tests/inc/tar/longpath-gnu.tgz and /dev/null differ
diff --git a/_test/tests/inc/tar/longpath-ustar.tgz b/_test/tests/inc/tar/longpath-ustar.tgz
deleted file mode 100644
index 59efbff66..000000000
Binary files a/_test/tests/inc/tar/longpath-ustar.tgz and /dev/null differ
diff --git a/_test/tests/inc/tar/tarbomb.tgz b/_test/tests/inc/tar/tarbomb.tgz
deleted file mode 100644
index 8418d4073..000000000
Binary files a/_test/tests/inc/tar/tarbomb.tgz and /dev/null differ
diff --git a/_test/tests/inc/tar/test.tar b/_test/tests/inc/tar/test.tar
deleted file mode 100644
index 931866b0b..000000000
Binary files a/_test/tests/inc/tar/test.tar and /dev/null differ
diff --git a/_test/tests/inc/tar/test.tbz b/_test/tests/inc/tar/test.tbz
deleted file mode 100644
index 5a7374019..000000000
Binary files a/_test/tests/inc/tar/test.tbz and /dev/null differ
diff --git a/_test/tests/inc/tar/test.tgz b/_test/tests/inc/tar/test.tgz
deleted file mode 100644
index b00319649..000000000
Binary files a/_test/tests/inc/tar/test.tgz and /dev/null differ
diff --git a/_test/tests/inc/tar/testdata1.txt b/_test/tests/inc/tar/testdata1.txt
deleted file mode 100644
index ac65bb32e..000000000
--- a/_test/tests/inc/tar/testdata1.txt
+++ /dev/null
@@ -1 +0,0 @@
-testcontent1
diff --git a/_test/tests/inc/tar/zero.txt b/_test/tests/inc/tar/zero.txt
deleted file mode 100644
index e69de29bb..000000000
-- 
cgit v1.2.3


From 9283184c402b592f2ed8d8a99c3809ece7d87e7a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 15 May 2015 15:49:27 +0200
Subject: added rudimentary README to vendor dir

---
 vendor/README | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 vendor/README

diff --git a/vendor/README b/vendor/README
new file mode 100644
index 000000000..e4027f419
--- /dev/null
+++ b/vendor/README
@@ -0,0 +1,6 @@
+====== composer managed libraries ======
+
+All file within here are manged through composer and should not be
+edited directly. Instead provide upstream patches.
+
+Learn more about Composer at http://getcomposer.org
-- 
cgit v1.2.3


From 41d51802a4f1d52aced2f2960bc919c9739cf775 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 15 May 2015 16:26:00 +0200
Subject: switched geshi higlighter to composer based repository

---
 .gitignore                                    |    2 +-
 composer.json                                 |    3 +-
 composer.lock                                 |   48 +-
 inc/geshi.php                                 | 4775 -------------------------
 inc/geshi/4cs.php                             |  139 -
 inc/geshi/6502acme.php                        |  230 --
 inc/geshi/6502kickass.php                     |  241 --
 inc/geshi/6502tasm.php                        |  189 -
 inc/geshi/68000devpac.php                     |  168 -
 inc/geshi/abap.php                            | 1409 --------
 inc/geshi/actionscript-french.php             |  957 -----
 inc/geshi/actionscript.php                    |  197 -
 inc/geshi/actionscript3.php                   |  473 ---
 inc/geshi/ada.php                             |  135 -
 inc/geshi/algol68.php                         |  329 --
 inc/geshi/apache.php                          |  483 ---
 inc/geshi/applescript.php                     |  157 -
 inc/geshi/apt_sources.php                     |  148 -
 inc/geshi/arm.php                             | 3318 -----------------
 inc/geshi/asm.php                             |  603 ----
 inc/geshi/asp.php                             |  164 -
 inc/geshi/asymptote.php                       |  194 -
 inc/geshi/autoconf.php                        |  512 ---
 inc/geshi/autohotkey.php                      |  373 --
 inc/geshi/autoit.php                          | 1175 ------
 inc/geshi/avisynth.php                        |  194 -
 inc/geshi/awk.php                             |  158 -
 inc/geshi/bascomavr.php                       |  185 -
 inc/geshi/bash.php                            |  440 ---
 inc/geshi/basic4gl.php                        |  341 --
 inc/geshi/bf.php                              |  115 -
 inc/geshi/bibtex.php                          |  183 -
 inc/geshi/blitzbasic.php                      |  185 -
 inc/geshi/bnf.php                             |  119 -
 inc/geshi/boo.php                             |  217 --
 inc/geshi/c.php                               |  281 --
 inc/geshi/c_loadrunner.php                    |  323 --
 inc/geshi/c_mac.php                           |  227 --
 inc/geshi/caddcl.php                          |  126 -
 inc/geshi/cadlisp.php                         |  186 -
 inc/geshi/cfdg.php                            |  124 -
 inc/geshi/cfm.php                             |  299 --
 inc/geshi/chaiscript.php                      |  140 -
 inc/geshi/cil.php                             |  196 -
 inc/geshi/clojure.php                         |  134 -
 inc/geshi/cmake.php                           |  181 -
 inc/geshi/cobol.php                           |  244 --
 inc/geshi/coffeescript.php                    |  146 -
 inc/geshi/cpp-qt.php                          |  564 ---
 inc/geshi/cpp.php                             |  240 --
 inc/geshi/csharp.php                          |  256 --
 inc/geshi/css.php                             |  226 --
 inc/geshi/cuesheet.php                        |  138 -
 inc/geshi/d.php                               |  252 --
 inc/geshi/dcl.php                             |  192 -
 inc/geshi/dcpu16.php                          |  131 -
 inc/geshi/dcs.php                             |  182 -
 inc/geshi/delphi.php                          |  301 --
 inc/geshi/diff.php                            |  196 -
 inc/geshi/div.php                             |  126 -
 inc/geshi/dos.php                             |  227 --
 inc/geshi/dot.php                             |  164 -
 inc/geshi/e.php                               |  208 --
 inc/geshi/ecmascript.php                      |  210 --
 inc/geshi/eiffel.php                          |  395 --
 inc/geshi/email.php                           |  222 --
 inc/geshi/epc.php                             |  154 -
 inc/geshi/erlang.php                          |  441 ---
 inc/geshi/euphoria.php                        |  140 -
 inc/geshi/f1.php                              |  151 -
 inc/geshi/falcon.php                          |  218 --
 inc/geshi/fo.php                              |  327 --
 inc/geshi/fortran.php                         |  160 -
 inc/geshi/freebasic.php                       |  141 -
 inc/geshi/freeswitch.php                      |  168 -
 inc/geshi/fsharp.php                          |  213 --
 inc/geshi/gambas.php                          |  214 --
 inc/geshi/gdb.php                             |  198 -
 inc/geshi/genero.php                          |  463 ---
 inc/geshi/genie.php                           |  157 -
 inc/geshi/gettext.php                         |   97 -
 inc/geshi/glsl.php                            |  205 --
 inc/geshi/gml.php                             |  506 ---
 inc/geshi/gnuplot.php                         |  296 --
 inc/geshi/go.php                              |  375 --
 inc/geshi/groovy.php                          | 1011 ------
 inc/geshi/gwbasic.php                         |  153 -
 inc/geshi/haskell.php                         |  202 --
 inc/geshi/haxe.php                            |  161 -
 inc/geshi/hicest.php                          |  108 -
 inc/geshi/hq9plus.php                         |  104 -
 inc/geshi/html4strict.php                     |  190 -
 inc/geshi/html5.php                           |  212 --
 inc/geshi/icon.php                            |  212 --
 inc/geshi/idl.php                             |  123 -
 inc/geshi/ini.php                             |  128 -
 inc/geshi/inno.php                            |  212 --
 inc/geshi/intercal.php                        |  122 -
 inc/geshi/io.php                              |  138 -
 inc/geshi/j.php                               |  190 -
 inc/geshi/java.php                            |  983 -----
 inc/geshi/java5.php                           | 1037 ------
 inc/geshi/javascript.php                      |  174 -
 inc/geshi/jquery.php                          |  238 --
 inc/geshi/kixtart.php                         |  329 --
 inc/geshi/klonec.php                          |  282 --
 inc/geshi/klonecpp.php                        |  310 --
 inc/geshi/latex.php                           |  223 --
 inc/geshi/lb.php                              |  162 -
 inc/geshi/ldif.php                            |  116 -
 inc/geshi/lisp.php                            |  144 -
 inc/geshi/llvm.php                            |  385 --
 inc/geshi/locobasic.php                       |  130 -
 inc/geshi/logtalk.php                         |  345 --
 inc/geshi/lolcode.php                         |  152 -
 inc/geshi/lotusformulas.php                   |  318 --
 inc/geshi/lotusscript.php                     |  191 -
 inc/geshi/lscript.php                         |  387 --
 inc/geshi/lsl2.php                            |  898 -----
 inc/geshi/lua.php                             |  177 -
 inc/geshi/m68k.php                            |  143 -
 inc/geshi/magiksf.php                         |  193 -
 inc/geshi/make.php                            |  151 -
 inc/geshi/mapbasic.php                        |  908 -----
 inc/geshi/matlab.php                          |  227 --
 inc/geshi/mirc.php                            |  171 -
 inc/geshi/mmix.php                            |  193 -
 inc/geshi/modula2.php                         |  136 -
 inc/geshi/modula3.php                         |  135 -
 inc/geshi/mpasm.php                           |  164 -
 inc/geshi/mxml.php                            |  145 -
 inc/geshi/mysql.php                           |  475 ---
 inc/geshi/nagios.php                          |  225 --
 inc/geshi/netrexx.php                         |  163 -
 inc/geshi/newlisp.php                         |  191 -
 inc/geshi/nsis.php                            |  351 --
 inc/geshi/oberon2.php                         |  135 -
 inc/geshi/objc.php                            |  358 --
 inc/geshi/objeck.php                          |  116 -
 inc/geshi/ocaml-brief.php                     |  112 -
 inc/geshi/ocaml.php                           |  187 -
 inc/geshi/octave.php                          |  515 ---
 inc/geshi/oobas.php                           |  135 -
 inc/geshi/oorexx.php                          |  171 -
 inc/geshi/oracle11.php                        |  614 ----
 inc/geshi/oracle8.php                         |  496 ---
 inc/geshi/oxygene.php                         |  154 -
 inc/geshi/oz.php                              |  144 -
 inc/geshi/parasail.php                        |  133 -
 inc/geshi/parigp.php                          |  277 --
 inc/geshi/pascal.php                          |  165 -
 inc/geshi/pcre.php                            |  188 -
 inc/geshi/per.php                             |  302 --
 inc/geshi/perl.php                            |  213 --
 inc/geshi/perl6.php                           |  197 -
 inc/geshi/pf.php                              |  178 -
 inc/geshi/php-brief.php                       |  222 --
 inc/geshi/php.php                             | 1117 ------
 inc/geshi/pic16.php                           |  141 -
 inc/geshi/pike.php                            |  103 -
 inc/geshi/pixelbender.php                     |  176 -
 inc/geshi/pli.php                             |  200 --
 inc/geshi/plsql.php                           |  256 --
 inc/geshi/postgresql.php                      |  288 --
 inc/geshi/povray.php                          |  199 --
 inc/geshi/powerbuilder.php                    |  418 ---
 inc/geshi/powershell.php                      |  277 --
 inc/geshi/proftpd.php                         |  374 --
 inc/geshi/progress.php                        |  485 ---
 inc/geshi/prolog.php                          |  143 -
 inc/geshi/properties.php                      |  127 -
 inc/geshi/providex.php                        |  299 --
 inc/geshi/purebasic.php                       |  303 --
 inc/geshi/pycon.php                           |   64 -
 inc/geshi/pys60.php                           |  273 --
 inc/geshi/python.php                          |  244 --
 inc/geshi/q.php                               |  149 -
 inc/geshi/qbasic.php                          |  162 -
 inc/geshi/rails.php                           |  406 ---
 inc/geshi/rebol.php                           |  196 -
 inc/geshi/reg.php                             |  233 --
 inc/geshi/rexx.php                            |  162 -
 inc/geshi/robots.php                          |  100 -
 inc/geshi/rpmspec.php                         |  133 -
 inc/geshi/rsplus.php                          |  483 ---
 inc/geshi/ruby.php                            |  231 --
 inc/geshi/sas.php                             |  290 --
 inc/geshi/scala.php                           |  138 -
 inc/geshi/scheme.php                          |  170 -
 inc/geshi/scilab.php                          |  295 --
 inc/geshi/sdlbasic.php                        |  165 -
 inc/geshi/smalltalk.php                       |  154 -
 inc/geshi/smarty.php                          |  192 -
 inc/geshi/spark.php                           |  132 -
 inc/geshi/sparql.php                          |  155 -
 inc/geshi/sql.php                             |  165 -
 inc/geshi/stonescript.php                     |  307 --
 inc/geshi/systemverilog.php                   |  317 --
 inc/geshi/tcl.php                             |  194 -
 inc/geshi/teraterm.php                        |  354 --
 inc/geshi/text.php                            |   84 -
 inc/geshi/thinbasic.php                       |  868 -----
 inc/geshi/tsql.php                            |  375 --
 inc/geshi/typoscript.php                      |  300 --
 inc/geshi/unicon.php                          |  210 --
 inc/geshi/upc.php                             |  270 --
 inc/geshi/urbi.php                            |  200 --
 inc/geshi/uscript.php                         |  299 --
 inc/geshi/vala.php                            |  151 -
 inc/geshi/vb.php                              |  157 -
 inc/geshi/vbnet.php                           |  182 -
 inc/geshi/vedit.php                           |  103 -
 inc/geshi/verilog.php                         |  173 -
 inc/geshi/vhdl.php                            |  183 -
 inc/geshi/vim.php                             |  420 ---
 inc/geshi/visualfoxpro.php                    |  456 ---
 inc/geshi/visualprolog.php                    |  129 -
 inc/geshi/whitespace.php                      |  121 -
 inc/geshi/whois.php                           |  181 -
 inc/geshi/winbatch.php                        |  369 --
 inc/geshi/xbasic.php                          |  143 -
 inc/geshi/xml.php                             |  157 -
 inc/geshi/xorg_conf.php                       |  124 -
 inc/geshi/xpp.php                             |  436 ---
 inc/geshi/yaml.php                            |  150 -
 inc/geshi/z80.php                             |  144 -
 inc/geshi/zxbasic.php                         |  150 -
 inc/load.php                                  |    1 -
 inc/parserutils.php                           |    5 +-
 vendor/composer/autoload_classmap.php         |    1 +
 vendor/composer/installed.json                |   48 +
 vendor/easybook/geshi/README.md               |   10 +
 vendor/easybook/geshi/composer.json           |   24 +
 vendor/easybook/geshi/geshi.php               | 4775 +++++++++++++++++++++++++
 vendor/easybook/geshi/geshi/4cs.php           |  137 +
 vendor/easybook/geshi/geshi/6502acme.php      |  230 ++
 vendor/easybook/geshi/geshi/6502kickass.php   |  241 ++
 vendor/easybook/geshi/geshi/6502tasm.php      |  189 +
 vendor/easybook/geshi/geshi/68000devpac.php   |  168 +
 vendor/easybook/geshi/geshi/abap.php          | 1409 ++++++++
 vendor/easybook/geshi/geshi/actionscript.php  |  197 +
 vendor/easybook/geshi/geshi/actionscript3.php |  473 +++
 vendor/easybook/geshi/geshi/ada.php           |  135 +
 vendor/easybook/geshi/geshi/aimms.php         |  316 ++
 vendor/easybook/geshi/geshi/algol68.php       |  329 ++
 vendor/easybook/geshi/geshi/apache.php        |  483 +++
 vendor/easybook/geshi/geshi/applescript.php   |  157 +
 vendor/easybook/geshi/geshi/apt_sources.php   |  155 +
 vendor/easybook/geshi/geshi/arm.php           | 3318 +++++++++++++++++
 vendor/easybook/geshi/geshi/asm.php           |  603 ++++
 vendor/easybook/geshi/geshi/asp.php           |  164 +
 vendor/easybook/geshi/geshi/asymptote.php     |  192 +
 vendor/easybook/geshi/geshi/autoconf.php      |  512 +++
 vendor/easybook/geshi/geshi/autohotkey.php    |  373 ++
 vendor/easybook/geshi/geshi/autoit.php        | 1175 ++++++
 vendor/easybook/geshi/geshi/avisynth.php      |  194 +
 vendor/easybook/geshi/geshi/awk.php           |  156 +
 vendor/easybook/geshi/geshi/bascomavr.php     |  185 +
 vendor/easybook/geshi/geshi/bash.php          |  474 +++
 vendor/easybook/geshi/geshi/basic4gl.php      |  339 ++
 vendor/easybook/geshi/geshi/batch.php         |  138 +
 vendor/easybook/geshi/geshi/bf.php            |  115 +
 vendor/easybook/geshi/geshi/bibtex.php        |  183 +
 vendor/easybook/geshi/geshi/blitzbasic.php    |  183 +
 vendor/easybook/geshi/geshi/bnf.php           |  119 +
 vendor/easybook/geshi/geshi/boo.php           |  215 ++
 vendor/easybook/geshi/geshi/c.php             |  281 ++
 vendor/easybook/geshi/geshi/c_loadrunner.php  |  323 ++
 vendor/easybook/geshi/geshi/c_mac.php         |  227 ++
 vendor/easybook/geshi/geshi/c_winapi.php      |  870 +++++
 vendor/easybook/geshi/geshi/caddcl.php        |  124 +
 vendor/easybook/geshi/geshi/cadlisp.php       |  184 +
 vendor/easybook/geshi/geshi/cfdg.php          |  122 +
 vendor/easybook/geshi/geshi/cfm.php           |  299 ++
 vendor/easybook/geshi/geshi/chaiscript.php    |  140 +
 vendor/easybook/geshi/geshi/chapel.php        |  169 +
 vendor/easybook/geshi/geshi/cil.php           |  194 +
 vendor/easybook/geshi/geshi/clojure.php       |  134 +
 vendor/easybook/geshi/geshi/cmake.php         |  181 +
 vendor/easybook/geshi/geshi/cobol.php         |  457 +++
 vendor/easybook/geshi/geshi/coffeescript.php  |  146 +
 vendor/easybook/geshi/geshi/cpp-qt.php        |  570 +++
 vendor/easybook/geshi/geshi/cpp-winapi.php    |  836 +++++
 vendor/easybook/geshi/geshi/cpp.php           |  246 ++
 vendor/easybook/geshi/geshi/csharp.php        |  259 ++
 vendor/easybook/geshi/geshi/css.php           |  226 ++
 vendor/easybook/geshi/geshi/cuesheet.php      |  138 +
 vendor/easybook/geshi/geshi/d.php             |  252 ++
 vendor/easybook/geshi/geshi/dart.php          |  159 +
 vendor/easybook/geshi/geshi/dcl.php           |  192 +
 vendor/easybook/geshi/geshi/dcpu16.php        |  131 +
 vendor/easybook/geshi/geshi/dcs.php           |  182 +
 vendor/easybook/geshi/geshi/delphi.php        |  299 ++
 vendor/easybook/geshi/geshi/diff.php          |  196 +
 vendor/easybook/geshi/geshi/div.php           |  124 +
 vendor/easybook/geshi/geshi/dos.php           |  227 ++
 vendor/easybook/geshi/geshi/dot.php           |  164 +
 vendor/easybook/geshi/geshi/e.php             |  208 ++
 vendor/easybook/geshi/geshi/ecmascript.php    |  210 ++
 vendor/easybook/geshi/geshi/eiffel.php        |  393 ++
 vendor/easybook/geshi/geshi/email.php         |  222 ++
 vendor/easybook/geshi/geshi/epc.php           |  154 +
 vendor/easybook/geshi/geshi/erlang.php        |  441 +++
 vendor/easybook/geshi/geshi/euphoria.php      |  140 +
 vendor/easybook/geshi/geshi/ezt.php           |  134 +
 vendor/easybook/geshi/geshi/f1.php            |  151 +
 vendor/easybook/geshi/geshi/falcon.php        |  218 ++
 vendor/easybook/geshi/geshi/fo.php            |  327 ++
 vendor/easybook/geshi/geshi/fortran.php       |  158 +
 vendor/easybook/geshi/geshi/freebasic.php     |  139 +
 vendor/easybook/geshi/geshi/freeswitch.php    |  166 +
 vendor/easybook/geshi/geshi/fsharp.php        |  213 ++
 vendor/easybook/geshi/geshi/gambas.php        |  214 ++
 vendor/easybook/geshi/geshi/gdb.php           |  196 +
 vendor/easybook/geshi/geshi/genero.php        |  461 +++
 vendor/easybook/geshi/geshi/genie.php         |  155 +
 vendor/easybook/geshi/geshi/gettext.php       |   95 +
 vendor/easybook/geshi/geshi/glsl.php          |  205 ++
 vendor/easybook/geshi/geshi/gml.php           |  504 +++
 vendor/easybook/geshi/geshi/gnuplot.php       |  296 ++
 vendor/easybook/geshi/geshi/go.php            |  375 ++
 vendor/easybook/geshi/geshi/groovy.php        | 1011 ++++++
 vendor/easybook/geshi/geshi/gwbasic.php       |  153 +
 vendor/easybook/geshi/geshi/haskell.php       |  202 ++
 vendor/easybook/geshi/geshi/haxe.php          |  161 +
 vendor/easybook/geshi/geshi/hicest.php        |  108 +
 vendor/easybook/geshi/geshi/hq9plus.php       |  102 +
 vendor/easybook/geshi/geshi/html4strict.php   |  190 +
 vendor/easybook/geshi/geshi/html5.php         |  212 ++
 vendor/easybook/geshi/geshi/icon.php          |  212 ++
 vendor/easybook/geshi/geshi/idl.php           |  121 +
 vendor/easybook/geshi/geshi/ini.php           |  127 +
 vendor/easybook/geshi/geshi/inno.php          |  210 ++
 vendor/easybook/geshi/geshi/intercal.php      |  122 +
 vendor/easybook/geshi/geshi/io.php            |  136 +
 vendor/easybook/geshi/geshi/ispfpanel.php     |  165 +
 vendor/easybook/geshi/geshi/j.php             |  188 +
 vendor/easybook/geshi/geshi/java.php          |  981 +++++
 vendor/easybook/geshi/geshi/java5.php         | 1035 ++++++
 vendor/easybook/geshi/geshi/javascript.php    |  174 +
 vendor/easybook/geshi/geshi/jcl.php           |  155 +
 vendor/easybook/geshi/geshi/jquery.php        |  238 ++
 vendor/easybook/geshi/geshi/kixtart.php       |  327 ++
 vendor/easybook/geshi/geshi/klonec.php        |  280 ++
 vendor/easybook/geshi/geshi/klonecpp.php      |  308 ++
 vendor/easybook/geshi/geshi/latex.php         |  223 ++
 vendor/easybook/geshi/geshi/lb.php            |  162 +
 vendor/easybook/geshi/geshi/ldif.php          |  116 +
 vendor/easybook/geshi/geshi/lisp.php          |  147 +
 vendor/easybook/geshi/geshi/llvm.php          |  385 ++
 vendor/easybook/geshi/geshi/locobasic.php     |  130 +
 vendor/easybook/geshi/geshi/logtalk.php       |  345 ++
 vendor/easybook/geshi/geshi/lolcode.php       |  152 +
 vendor/easybook/geshi/geshi/lotusformulas.php |  316 ++
 vendor/easybook/geshi/geshi/lotusscript.php   |  189 +
 vendor/easybook/geshi/geshi/lscript.php       |  387 ++
 vendor/easybook/geshi/geshi/lsl2.php          | 1257 +++++++
 vendor/easybook/geshi/geshi/lua.php           |  175 +
 vendor/easybook/geshi/geshi/m68k.php          |  141 +
 vendor/easybook/geshi/geshi/magiksf.php       |  193 +
 vendor/easybook/geshi/geshi/make.php          |  151 +
 vendor/easybook/geshi/geshi/mapbasic.php      |  908 +++++
 vendor/easybook/geshi/geshi/matlab.php        |  227 ++
 vendor/easybook/geshi/geshi/mirc.php          |  171 +
 vendor/easybook/geshi/geshi/mmix.php          |  193 +
 vendor/easybook/geshi/geshi/modula2.php       |  136 +
 vendor/easybook/geshi/geshi/modula3.php       |  135 +
 vendor/easybook/geshi/geshi/mpasm.php         |  162 +
 vendor/easybook/geshi/geshi/mxml.php          |  143 +
 vendor/easybook/geshi/geshi/mysql.php         |  475 +++
 vendor/easybook/geshi/geshi/nagios.php        |  223 ++
 vendor/easybook/geshi/geshi/netrexx.php       |  161 +
 vendor/easybook/geshi/geshi/newlisp.php       |  191 +
 vendor/easybook/geshi/geshi/nginx.php         |  868 +++++
 vendor/easybook/geshi/geshi/nsis.php          |  349 ++
 vendor/easybook/geshi/geshi/oberon2.php       |  135 +
 vendor/easybook/geshi/geshi/objc.php          |  356 ++
 vendor/easybook/geshi/geshi/objeck.php        |  116 +
 vendor/easybook/geshi/geshi/ocaml-brief.php   |  110 +
 vendor/easybook/geshi/geshi/ocaml.php         |  187 +
 vendor/easybook/geshi/geshi/octave.php        |  513 +++
 vendor/easybook/geshi/geshi/oobas.php         |  133 +
 vendor/easybook/geshi/geshi/oorexx.php        |  169 +
 vendor/easybook/geshi/geshi/oracle11.php      |  612 ++++
 vendor/easybook/geshi/geshi/oracle8.php       |  494 +++
 vendor/easybook/geshi/geshi/oxygene.php       |  154 +
 vendor/easybook/geshi/geshi/oz.php            |  144 +
 vendor/easybook/geshi/geshi/parasail.php      |  133 +
 vendor/easybook/geshi/geshi/parigp.php        |  293 ++
 vendor/easybook/geshi/geshi/pascal.php        |  165 +
 vendor/easybook/geshi/geshi/pcre.php          |  188 +
 vendor/easybook/geshi/geshi/per.php           |  300 ++
 vendor/easybook/geshi/geshi/perl.php          |  219 ++
 vendor/easybook/geshi/geshi/perl6.php         |  197 +
 vendor/easybook/geshi/geshi/pf.php            |  178 +
 vendor/easybook/geshi/geshi/php-brief.php     |  222 ++
 vendor/easybook/geshi/geshi/php.php           | 1115 ++++++
 vendor/easybook/geshi/geshi/pic16.php         |  139 +
 vendor/easybook/geshi/geshi/pike.php          |  101 +
 vendor/easybook/geshi/geshi/pixelbender.php   |  174 +
 vendor/easybook/geshi/geshi/pli.php           |  200 ++
 vendor/easybook/geshi/geshi/plsql.php         |  254 ++
 vendor/easybook/geshi/geshi/postgresql.php    |  288 ++
 vendor/easybook/geshi/geshi/povray.php        |  199 ++
 vendor/easybook/geshi/geshi/powerbuilder.php  |  418 +++
 vendor/easybook/geshi/geshi/powershell.php    |  277 ++
 vendor/easybook/geshi/geshi/proftpd.php       |  374 ++
 vendor/easybook/geshi/geshi/progress.php      |  485 +++
 vendor/easybook/geshi/geshi/prolog.php        |  143 +
 vendor/easybook/geshi/geshi/properties.php    |  127 +
 vendor/easybook/geshi/geshi/providex.php      |  297 ++
 vendor/easybook/geshi/geshi/purebasic.php     |  303 ++
 vendor/easybook/geshi/geshi/pycon.php         |   64 +
 vendor/easybook/geshi/geshi/pys60.php         |  271 ++
 vendor/easybook/geshi/geshi/python.php        |  244 ++
 vendor/easybook/geshi/geshi/q.php             |  149 +
 vendor/easybook/geshi/geshi/qbasic.php        |  162 +
 vendor/easybook/geshi/geshi/racket.php        |  964 +++++
 vendor/easybook/geshi/geshi/rails.php         |  404 +++
 vendor/easybook/geshi/geshi/rbs.php           |  224 ++
 vendor/easybook/geshi/geshi/rebol.php         |  196 +
 vendor/easybook/geshi/geshi/reg.php           |  231 ++
 vendor/easybook/geshi/geshi/rexx.php          |  160 +
 vendor/easybook/geshi/geshi/robots.php        |  100 +
 vendor/easybook/geshi/geshi/rpmspec.php       |  133 +
 vendor/easybook/geshi/geshi/rsplus.php        |  483 +++
 vendor/easybook/geshi/geshi/ruby.php          |  231 ++
 vendor/easybook/geshi/geshi/rust.php          |  228 ++
 vendor/easybook/geshi/geshi/sas.php           |  290 ++
 vendor/easybook/geshi/geshi/sass.php          |  248 ++
 vendor/easybook/geshi/geshi/scala.php         |  138 +
 vendor/easybook/geshi/geshi/scheme.php        |  168 +
 vendor/easybook/geshi/geshi/scilab.php        |  295 ++
 vendor/easybook/geshi/geshi/scl.php           |  148 +
 vendor/easybook/geshi/geshi/sdlbasic.php      |  163 +
 vendor/easybook/geshi/geshi/smalltalk.php     |  154 +
 vendor/easybook/geshi/geshi/smarty.php        |  190 +
 vendor/easybook/geshi/geshi/spark.php         |  132 +
 vendor/easybook/geshi/geshi/sparql.php        |  155 +
 vendor/easybook/geshi/geshi/sql.php           |  170 +
 vendor/easybook/geshi/geshi/stonescript.php   |  307 ++
 vendor/easybook/geshi/geshi/systemverilog.php |  317 ++
 vendor/easybook/geshi/geshi/tcl.php           |  194 +
 vendor/easybook/geshi/geshi/teraterm.php      |  354 ++
 vendor/easybook/geshi/geshi/text.php          |   82 +
 vendor/easybook/geshi/geshi/thinbasic.php     |  866 +++++
 vendor/easybook/geshi/geshi/tsql.php          |  375 ++
 vendor/easybook/geshi/geshi/twig.php          |  190 +
 vendor/easybook/geshi/geshi/typoscript.php    |  298 ++
 vendor/easybook/geshi/geshi/unicon.php        |  210 ++
 vendor/easybook/geshi/geshi/upc.php           |  270 ++
 vendor/easybook/geshi/geshi/urbi.php          |  198 +
 vendor/easybook/geshi/geshi/uscript.php       |  297 ++
 vendor/easybook/geshi/geshi/vala.php          |  149 +
 vendor/easybook/geshi/geshi/vb.php            |  157 +
 vendor/easybook/geshi/geshi/vbnet.php         |  182 +
 vendor/easybook/geshi/geshi/vbscript.php      |  153 +
 vendor/easybook/geshi/geshi/vedit.php         |  103 +
 vendor/easybook/geshi/geshi/verilog.php       |  193 +
 vendor/easybook/geshi/geshi/vhdl.php          |  181 +
 vendor/easybook/geshi/geshi/vim.php           |  418 +++
 vendor/easybook/geshi/geshi/visualfoxpro.php  |  456 +++
 vendor/easybook/geshi/geshi/visualprolog.php  |  127 +
 vendor/easybook/geshi/geshi/whitespace.php    |  119 +
 vendor/easybook/geshi/geshi/whois.php         |  181 +
 vendor/easybook/geshi/geshi/winbatch.php      |  369 ++
 vendor/easybook/geshi/geshi/xbasic.php        |  143 +
 vendor/easybook/geshi/geshi/xml.php           |  155 +
 vendor/easybook/geshi/geshi/xojo.php          |  166 +
 vendor/easybook/geshi/geshi/xorg_conf.php     |  122 +
 vendor/easybook/geshi/geshi/xpp.php           |  434 +++
 vendor/easybook/geshi/geshi/yaml.php          |  150 +
 vendor/easybook/geshi/geshi/z80.php           |  144 +
 vendor/easybook/geshi/geshi/zxbasic.php       |  150 +
 474 files changed, 72340 insertions(+), 66509 deletions(-)
 delete mode 100644 inc/geshi.php
 delete mode 100644 inc/geshi/4cs.php
 delete mode 100644 inc/geshi/6502acme.php
 delete mode 100644 inc/geshi/6502kickass.php
 delete mode 100644 inc/geshi/6502tasm.php
 delete mode 100644 inc/geshi/68000devpac.php
 delete mode 100644 inc/geshi/abap.php
 delete mode 100644 inc/geshi/actionscript-french.php
 delete mode 100644 inc/geshi/actionscript.php
 delete mode 100644 inc/geshi/actionscript3.php
 delete mode 100644 inc/geshi/ada.php
 delete mode 100644 inc/geshi/algol68.php
 delete mode 100644 inc/geshi/apache.php
 delete mode 100644 inc/geshi/applescript.php
 delete mode 100644 inc/geshi/apt_sources.php
 delete mode 100644 inc/geshi/arm.php
 delete mode 100644 inc/geshi/asm.php
 delete mode 100644 inc/geshi/asp.php
 delete mode 100644 inc/geshi/asymptote.php
 delete mode 100644 inc/geshi/autoconf.php
 delete mode 100644 inc/geshi/autohotkey.php
 delete mode 100644 inc/geshi/autoit.php
 delete mode 100644 inc/geshi/avisynth.php
 delete mode 100644 inc/geshi/awk.php
 delete mode 100644 inc/geshi/bascomavr.php
 delete mode 100644 inc/geshi/bash.php
 delete mode 100644 inc/geshi/basic4gl.php
 delete mode 100644 inc/geshi/bf.php
 delete mode 100644 inc/geshi/bibtex.php
 delete mode 100644 inc/geshi/blitzbasic.php
 delete mode 100644 inc/geshi/bnf.php
 delete mode 100644 inc/geshi/boo.php
 delete mode 100644 inc/geshi/c.php
 delete mode 100644 inc/geshi/c_loadrunner.php
 delete mode 100644 inc/geshi/c_mac.php
 delete mode 100644 inc/geshi/caddcl.php
 delete mode 100644 inc/geshi/cadlisp.php
 delete mode 100644 inc/geshi/cfdg.php
 delete mode 100644 inc/geshi/cfm.php
 delete mode 100644 inc/geshi/chaiscript.php
 delete mode 100644 inc/geshi/cil.php
 delete mode 100644 inc/geshi/clojure.php
 delete mode 100644 inc/geshi/cmake.php
 delete mode 100644 inc/geshi/cobol.php
 delete mode 100644 inc/geshi/coffeescript.php
 delete mode 100644 inc/geshi/cpp-qt.php
 delete mode 100644 inc/geshi/cpp.php
 delete mode 100644 inc/geshi/csharp.php
 delete mode 100644 inc/geshi/css.php
 delete mode 100644 inc/geshi/cuesheet.php
 delete mode 100644 inc/geshi/d.php
 delete mode 100644 inc/geshi/dcl.php
 delete mode 100644 inc/geshi/dcpu16.php
 delete mode 100644 inc/geshi/dcs.php
 delete mode 100644 inc/geshi/delphi.php
 delete mode 100644 inc/geshi/diff.php
 delete mode 100644 inc/geshi/div.php
 delete mode 100644 inc/geshi/dos.php
 delete mode 100644 inc/geshi/dot.php
 delete mode 100644 inc/geshi/e.php
 delete mode 100644 inc/geshi/ecmascript.php
 delete mode 100644 inc/geshi/eiffel.php
 delete mode 100644 inc/geshi/email.php
 delete mode 100644 inc/geshi/epc.php
 delete mode 100644 inc/geshi/erlang.php
 delete mode 100644 inc/geshi/euphoria.php
 delete mode 100644 inc/geshi/f1.php
 delete mode 100644 inc/geshi/falcon.php
 delete mode 100644 inc/geshi/fo.php
 delete mode 100644 inc/geshi/fortran.php
 delete mode 100644 inc/geshi/freebasic.php
 delete mode 100644 inc/geshi/freeswitch.php
 delete mode 100644 inc/geshi/fsharp.php
 delete mode 100644 inc/geshi/gambas.php
 delete mode 100644 inc/geshi/gdb.php
 delete mode 100644 inc/geshi/genero.php
 delete mode 100644 inc/geshi/genie.php
 delete mode 100644 inc/geshi/gettext.php
 delete mode 100644 inc/geshi/glsl.php
 delete mode 100644 inc/geshi/gml.php
 delete mode 100644 inc/geshi/gnuplot.php
 delete mode 100644 inc/geshi/go.php
 delete mode 100644 inc/geshi/groovy.php
 delete mode 100644 inc/geshi/gwbasic.php
 delete mode 100644 inc/geshi/haskell.php
 delete mode 100644 inc/geshi/haxe.php
 delete mode 100644 inc/geshi/hicest.php
 delete mode 100644 inc/geshi/hq9plus.php
 delete mode 100644 inc/geshi/html4strict.php
 delete mode 100644 inc/geshi/html5.php
 delete mode 100644 inc/geshi/icon.php
 delete mode 100644 inc/geshi/idl.php
 delete mode 100644 inc/geshi/ini.php
 delete mode 100644 inc/geshi/inno.php
 delete mode 100644 inc/geshi/intercal.php
 delete mode 100644 inc/geshi/io.php
 delete mode 100644 inc/geshi/j.php
 delete mode 100644 inc/geshi/java.php
 delete mode 100644 inc/geshi/java5.php
 delete mode 100644 inc/geshi/javascript.php
 delete mode 100644 inc/geshi/jquery.php
 delete mode 100644 inc/geshi/kixtart.php
 delete mode 100644 inc/geshi/klonec.php
 delete mode 100644 inc/geshi/klonecpp.php
 delete mode 100644 inc/geshi/latex.php
 delete mode 100644 inc/geshi/lb.php
 delete mode 100644 inc/geshi/ldif.php
 delete mode 100644 inc/geshi/lisp.php
 delete mode 100644 inc/geshi/llvm.php
 delete mode 100644 inc/geshi/locobasic.php
 delete mode 100644 inc/geshi/logtalk.php
 delete mode 100644 inc/geshi/lolcode.php
 delete mode 100644 inc/geshi/lotusformulas.php
 delete mode 100644 inc/geshi/lotusscript.php
 delete mode 100644 inc/geshi/lscript.php
 delete mode 100644 inc/geshi/lsl2.php
 delete mode 100644 inc/geshi/lua.php
 delete mode 100644 inc/geshi/m68k.php
 delete mode 100644 inc/geshi/magiksf.php
 delete mode 100644 inc/geshi/make.php
 delete mode 100644 inc/geshi/mapbasic.php
 delete mode 100644 inc/geshi/matlab.php
 delete mode 100644 inc/geshi/mirc.php
 delete mode 100644 inc/geshi/mmix.php
 delete mode 100644 inc/geshi/modula2.php
 delete mode 100644 inc/geshi/modula3.php
 delete mode 100644 inc/geshi/mpasm.php
 delete mode 100644 inc/geshi/mxml.php
 delete mode 100644 inc/geshi/mysql.php
 delete mode 100644 inc/geshi/nagios.php
 delete mode 100644 inc/geshi/netrexx.php
 delete mode 100644 inc/geshi/newlisp.php
 delete mode 100644 inc/geshi/nsis.php
 delete mode 100644 inc/geshi/oberon2.php
 delete mode 100644 inc/geshi/objc.php
 delete mode 100644 inc/geshi/objeck.php
 delete mode 100644 inc/geshi/ocaml-brief.php
 delete mode 100644 inc/geshi/ocaml.php
 delete mode 100644 inc/geshi/octave.php
 delete mode 100644 inc/geshi/oobas.php
 delete mode 100644 inc/geshi/oorexx.php
 delete mode 100644 inc/geshi/oracle11.php
 delete mode 100644 inc/geshi/oracle8.php
 delete mode 100644 inc/geshi/oxygene.php
 delete mode 100644 inc/geshi/oz.php
 delete mode 100644 inc/geshi/parasail.php
 delete mode 100644 inc/geshi/parigp.php
 delete mode 100644 inc/geshi/pascal.php
 delete mode 100644 inc/geshi/pcre.php
 delete mode 100644 inc/geshi/per.php
 delete mode 100644 inc/geshi/perl.php
 delete mode 100644 inc/geshi/perl6.php
 delete mode 100644 inc/geshi/pf.php
 delete mode 100644 inc/geshi/php-brief.php
 delete mode 100644 inc/geshi/php.php
 delete mode 100644 inc/geshi/pic16.php
 delete mode 100644 inc/geshi/pike.php
 delete mode 100644 inc/geshi/pixelbender.php
 delete mode 100644 inc/geshi/pli.php
 delete mode 100644 inc/geshi/plsql.php
 delete mode 100644 inc/geshi/postgresql.php
 delete mode 100644 inc/geshi/povray.php
 delete mode 100644 inc/geshi/powerbuilder.php
 delete mode 100644 inc/geshi/powershell.php
 delete mode 100644 inc/geshi/proftpd.php
 delete mode 100644 inc/geshi/progress.php
 delete mode 100644 inc/geshi/prolog.php
 delete mode 100644 inc/geshi/properties.php
 delete mode 100644 inc/geshi/providex.php
 delete mode 100644 inc/geshi/purebasic.php
 delete mode 100644 inc/geshi/pycon.php
 delete mode 100644 inc/geshi/pys60.php
 delete mode 100644 inc/geshi/python.php
 delete mode 100644 inc/geshi/q.php
 delete mode 100644 inc/geshi/qbasic.php
 delete mode 100644 inc/geshi/rails.php
 delete mode 100644 inc/geshi/rebol.php
 delete mode 100644 inc/geshi/reg.php
 delete mode 100644 inc/geshi/rexx.php
 delete mode 100644 inc/geshi/robots.php
 delete mode 100644 inc/geshi/rpmspec.php
 delete mode 100644 inc/geshi/rsplus.php
 delete mode 100644 inc/geshi/ruby.php
 delete mode 100644 inc/geshi/sas.php
 delete mode 100644 inc/geshi/scala.php
 delete mode 100644 inc/geshi/scheme.php
 delete mode 100644 inc/geshi/scilab.php
 delete mode 100644 inc/geshi/sdlbasic.php
 delete mode 100644 inc/geshi/smalltalk.php
 delete mode 100644 inc/geshi/smarty.php
 delete mode 100644 inc/geshi/spark.php
 delete mode 100644 inc/geshi/sparql.php
 delete mode 100644 inc/geshi/sql.php
 delete mode 100644 inc/geshi/stonescript.php
 delete mode 100644 inc/geshi/systemverilog.php
 delete mode 100644 inc/geshi/tcl.php
 delete mode 100644 inc/geshi/teraterm.php
 delete mode 100644 inc/geshi/text.php
 delete mode 100644 inc/geshi/thinbasic.php
 delete mode 100644 inc/geshi/tsql.php
 delete mode 100644 inc/geshi/typoscript.php
 delete mode 100644 inc/geshi/unicon.php
 delete mode 100644 inc/geshi/upc.php
 delete mode 100644 inc/geshi/urbi.php
 delete mode 100644 inc/geshi/uscript.php
 delete mode 100644 inc/geshi/vala.php
 delete mode 100644 inc/geshi/vb.php
 delete mode 100644 inc/geshi/vbnet.php
 delete mode 100644 inc/geshi/vedit.php
 delete mode 100644 inc/geshi/verilog.php
 delete mode 100644 inc/geshi/vhdl.php
 delete mode 100644 inc/geshi/vim.php
 delete mode 100644 inc/geshi/visualfoxpro.php
 delete mode 100644 inc/geshi/visualprolog.php
 delete mode 100644 inc/geshi/whitespace.php
 delete mode 100644 inc/geshi/whois.php
 delete mode 100644 inc/geshi/winbatch.php
 delete mode 100644 inc/geshi/xbasic.php
 delete mode 100644 inc/geshi/xml.php
 delete mode 100644 inc/geshi/xorg_conf.php
 delete mode 100644 inc/geshi/xpp.php
 delete mode 100644 inc/geshi/yaml.php
 delete mode 100644 inc/geshi/z80.php
 delete mode 100644 inc/geshi/zxbasic.php
 create mode 100644 vendor/easybook/geshi/README.md
 create mode 100644 vendor/easybook/geshi/composer.json
 create mode 100755 vendor/easybook/geshi/geshi.php
 create mode 100755 vendor/easybook/geshi/geshi/4cs.php
 create mode 100755 vendor/easybook/geshi/geshi/6502acme.php
 create mode 100755 vendor/easybook/geshi/geshi/6502kickass.php
 create mode 100755 vendor/easybook/geshi/geshi/6502tasm.php
 create mode 100755 vendor/easybook/geshi/geshi/68000devpac.php
 create mode 100755 vendor/easybook/geshi/geshi/abap.php
 create mode 100755 vendor/easybook/geshi/geshi/actionscript.php
 create mode 100755 vendor/easybook/geshi/geshi/actionscript3.php
 create mode 100755 vendor/easybook/geshi/geshi/ada.php
 create mode 100644 vendor/easybook/geshi/geshi/aimms.php
 create mode 100755 vendor/easybook/geshi/geshi/algol68.php
 create mode 100755 vendor/easybook/geshi/geshi/apache.php
 create mode 100755 vendor/easybook/geshi/geshi/applescript.php
 create mode 100755 vendor/easybook/geshi/geshi/apt_sources.php
 create mode 100755 vendor/easybook/geshi/geshi/arm.php
 create mode 100755 vendor/easybook/geshi/geshi/asm.php
 create mode 100755 vendor/easybook/geshi/geshi/asp.php
 create mode 100755 vendor/easybook/geshi/geshi/asymptote.php
 create mode 100755 vendor/easybook/geshi/geshi/autoconf.php
 create mode 100755 vendor/easybook/geshi/geshi/autohotkey.php
 create mode 100755 vendor/easybook/geshi/geshi/autoit.php
 create mode 100755 vendor/easybook/geshi/geshi/avisynth.php
 create mode 100755 vendor/easybook/geshi/geshi/awk.php
 create mode 100755 vendor/easybook/geshi/geshi/bascomavr.php
 create mode 100755 vendor/easybook/geshi/geshi/bash.php
 create mode 100755 vendor/easybook/geshi/geshi/basic4gl.php
 create mode 100644 vendor/easybook/geshi/geshi/batch.php
 create mode 100755 vendor/easybook/geshi/geshi/bf.php
 create mode 100755 vendor/easybook/geshi/geshi/bibtex.php
 create mode 100755 vendor/easybook/geshi/geshi/blitzbasic.php
 create mode 100755 vendor/easybook/geshi/geshi/bnf.php
 create mode 100755 vendor/easybook/geshi/geshi/boo.php
 create mode 100755 vendor/easybook/geshi/geshi/c.php
 create mode 100755 vendor/easybook/geshi/geshi/c_loadrunner.php
 create mode 100755 vendor/easybook/geshi/geshi/c_mac.php
 create mode 100644 vendor/easybook/geshi/geshi/c_winapi.php
 create mode 100755 vendor/easybook/geshi/geshi/caddcl.php
 create mode 100755 vendor/easybook/geshi/geshi/cadlisp.php
 create mode 100755 vendor/easybook/geshi/geshi/cfdg.php
 create mode 100755 vendor/easybook/geshi/geshi/cfm.php
 create mode 100755 vendor/easybook/geshi/geshi/chaiscript.php
 create mode 100644 vendor/easybook/geshi/geshi/chapel.php
 create mode 100755 vendor/easybook/geshi/geshi/cil.php
 create mode 100755 vendor/easybook/geshi/geshi/clojure.php
 create mode 100755 vendor/easybook/geshi/geshi/cmake.php
 create mode 100755 vendor/easybook/geshi/geshi/cobol.php
 create mode 100755 vendor/easybook/geshi/geshi/coffeescript.php
 create mode 100755 vendor/easybook/geshi/geshi/cpp-qt.php
 create mode 100644 vendor/easybook/geshi/geshi/cpp-winapi.php
 create mode 100755 vendor/easybook/geshi/geshi/cpp.php
 create mode 100755 vendor/easybook/geshi/geshi/csharp.php
 create mode 100755 vendor/easybook/geshi/geshi/css.php
 create mode 100755 vendor/easybook/geshi/geshi/cuesheet.php
 create mode 100755 vendor/easybook/geshi/geshi/d.php
 create mode 100644 vendor/easybook/geshi/geshi/dart.php
 create mode 100755 vendor/easybook/geshi/geshi/dcl.php
 create mode 100755 vendor/easybook/geshi/geshi/dcpu16.php
 create mode 100755 vendor/easybook/geshi/geshi/dcs.php
 create mode 100755 vendor/easybook/geshi/geshi/delphi.php
 create mode 100755 vendor/easybook/geshi/geshi/diff.php
 create mode 100755 vendor/easybook/geshi/geshi/div.php
 create mode 100755 vendor/easybook/geshi/geshi/dos.php
 create mode 100755 vendor/easybook/geshi/geshi/dot.php
 create mode 100755 vendor/easybook/geshi/geshi/e.php
 create mode 100755 vendor/easybook/geshi/geshi/ecmascript.php
 create mode 100755 vendor/easybook/geshi/geshi/eiffel.php
 create mode 100755 vendor/easybook/geshi/geshi/email.php
 create mode 100755 vendor/easybook/geshi/geshi/epc.php
 create mode 100755 vendor/easybook/geshi/geshi/erlang.php
 create mode 100755 vendor/easybook/geshi/geshi/euphoria.php
 create mode 100644 vendor/easybook/geshi/geshi/ezt.php
 create mode 100755 vendor/easybook/geshi/geshi/f1.php
 create mode 100755 vendor/easybook/geshi/geshi/falcon.php
 create mode 100755 vendor/easybook/geshi/geshi/fo.php
 create mode 100755 vendor/easybook/geshi/geshi/fortran.php
 create mode 100755 vendor/easybook/geshi/geshi/freebasic.php
 create mode 100755 vendor/easybook/geshi/geshi/freeswitch.php
 create mode 100755 vendor/easybook/geshi/geshi/fsharp.php
 create mode 100755 vendor/easybook/geshi/geshi/gambas.php
 create mode 100755 vendor/easybook/geshi/geshi/gdb.php
 create mode 100755 vendor/easybook/geshi/geshi/genero.php
 create mode 100755 vendor/easybook/geshi/geshi/genie.php
 create mode 100755 vendor/easybook/geshi/geshi/gettext.php
 create mode 100755 vendor/easybook/geshi/geshi/glsl.php
 create mode 100755 vendor/easybook/geshi/geshi/gml.php
 create mode 100755 vendor/easybook/geshi/geshi/gnuplot.php
 create mode 100755 vendor/easybook/geshi/geshi/go.php
 create mode 100755 vendor/easybook/geshi/geshi/groovy.php
 create mode 100755 vendor/easybook/geshi/geshi/gwbasic.php
 create mode 100755 vendor/easybook/geshi/geshi/haskell.php
 create mode 100755 vendor/easybook/geshi/geshi/haxe.php
 create mode 100755 vendor/easybook/geshi/geshi/hicest.php
 create mode 100755 vendor/easybook/geshi/geshi/hq9plus.php
 create mode 100755 vendor/easybook/geshi/geshi/html4strict.php
 create mode 100755 vendor/easybook/geshi/geshi/html5.php
 create mode 100755 vendor/easybook/geshi/geshi/icon.php
 create mode 100755 vendor/easybook/geshi/geshi/idl.php
 create mode 100755 vendor/easybook/geshi/geshi/ini.php
 create mode 100755 vendor/easybook/geshi/geshi/inno.php
 create mode 100755 vendor/easybook/geshi/geshi/intercal.php
 create mode 100755 vendor/easybook/geshi/geshi/io.php
 create mode 100644 vendor/easybook/geshi/geshi/ispfpanel.php
 create mode 100755 vendor/easybook/geshi/geshi/j.php
 create mode 100755 vendor/easybook/geshi/geshi/java.php
 create mode 100755 vendor/easybook/geshi/geshi/java5.php
 create mode 100755 vendor/easybook/geshi/geshi/javascript.php
 create mode 100644 vendor/easybook/geshi/geshi/jcl.php
 create mode 100755 vendor/easybook/geshi/geshi/jquery.php
 create mode 100755 vendor/easybook/geshi/geshi/kixtart.php
 create mode 100755 vendor/easybook/geshi/geshi/klonec.php
 create mode 100755 vendor/easybook/geshi/geshi/klonecpp.php
 create mode 100755 vendor/easybook/geshi/geshi/latex.php
 create mode 100755 vendor/easybook/geshi/geshi/lb.php
 create mode 100755 vendor/easybook/geshi/geshi/ldif.php
 create mode 100755 vendor/easybook/geshi/geshi/lisp.php
 create mode 100755 vendor/easybook/geshi/geshi/llvm.php
 create mode 100755 vendor/easybook/geshi/geshi/locobasic.php
 create mode 100755 vendor/easybook/geshi/geshi/logtalk.php
 create mode 100755 vendor/easybook/geshi/geshi/lolcode.php
 create mode 100755 vendor/easybook/geshi/geshi/lotusformulas.php
 create mode 100755 vendor/easybook/geshi/geshi/lotusscript.php
 create mode 100755 vendor/easybook/geshi/geshi/lscript.php
 create mode 100755 vendor/easybook/geshi/geshi/lsl2.php
 create mode 100755 vendor/easybook/geshi/geshi/lua.php
 create mode 100755 vendor/easybook/geshi/geshi/m68k.php
 create mode 100755 vendor/easybook/geshi/geshi/magiksf.php
 create mode 100755 vendor/easybook/geshi/geshi/make.php
 create mode 100755 vendor/easybook/geshi/geshi/mapbasic.php
 create mode 100755 vendor/easybook/geshi/geshi/matlab.php
 create mode 100755 vendor/easybook/geshi/geshi/mirc.php
 create mode 100755 vendor/easybook/geshi/geshi/mmix.php
 create mode 100755 vendor/easybook/geshi/geshi/modula2.php
 create mode 100755 vendor/easybook/geshi/geshi/modula3.php
 create mode 100755 vendor/easybook/geshi/geshi/mpasm.php
 create mode 100755 vendor/easybook/geshi/geshi/mxml.php
 create mode 100755 vendor/easybook/geshi/geshi/mysql.php
 create mode 100755 vendor/easybook/geshi/geshi/nagios.php
 create mode 100755 vendor/easybook/geshi/geshi/netrexx.php
 create mode 100755 vendor/easybook/geshi/geshi/newlisp.php
 create mode 100644 vendor/easybook/geshi/geshi/nginx.php
 create mode 100755 vendor/easybook/geshi/geshi/nsis.php
 create mode 100755 vendor/easybook/geshi/geshi/oberon2.php
 create mode 100755 vendor/easybook/geshi/geshi/objc.php
 create mode 100755 vendor/easybook/geshi/geshi/objeck.php
 create mode 100755 vendor/easybook/geshi/geshi/ocaml-brief.php
 create mode 100755 vendor/easybook/geshi/geshi/ocaml.php
 create mode 100755 vendor/easybook/geshi/geshi/octave.php
 create mode 100755 vendor/easybook/geshi/geshi/oobas.php
 create mode 100755 vendor/easybook/geshi/geshi/oorexx.php
 create mode 100755 vendor/easybook/geshi/geshi/oracle11.php
 create mode 100755 vendor/easybook/geshi/geshi/oracle8.php
 create mode 100755 vendor/easybook/geshi/geshi/oxygene.php
 create mode 100755 vendor/easybook/geshi/geshi/oz.php
 create mode 100755 vendor/easybook/geshi/geshi/parasail.php
 create mode 100755 vendor/easybook/geshi/geshi/parigp.php
 create mode 100755 vendor/easybook/geshi/geshi/pascal.php
 create mode 100755 vendor/easybook/geshi/geshi/pcre.php
 create mode 100755 vendor/easybook/geshi/geshi/per.php
 create mode 100755 vendor/easybook/geshi/geshi/perl.php
 create mode 100755 vendor/easybook/geshi/geshi/perl6.php
 create mode 100755 vendor/easybook/geshi/geshi/pf.php
 create mode 100755 vendor/easybook/geshi/geshi/php-brief.php
 create mode 100755 vendor/easybook/geshi/geshi/php.php
 create mode 100755 vendor/easybook/geshi/geshi/pic16.php
 create mode 100755 vendor/easybook/geshi/geshi/pike.php
 create mode 100755 vendor/easybook/geshi/geshi/pixelbender.php
 create mode 100755 vendor/easybook/geshi/geshi/pli.php
 create mode 100755 vendor/easybook/geshi/geshi/plsql.php
 create mode 100755 vendor/easybook/geshi/geshi/postgresql.php
 create mode 100755 vendor/easybook/geshi/geshi/povray.php
 create mode 100755 vendor/easybook/geshi/geshi/powerbuilder.php
 create mode 100755 vendor/easybook/geshi/geshi/powershell.php
 create mode 100755 vendor/easybook/geshi/geshi/proftpd.php
 create mode 100755 vendor/easybook/geshi/geshi/progress.php
 create mode 100755 vendor/easybook/geshi/geshi/prolog.php
 create mode 100755 vendor/easybook/geshi/geshi/properties.php
 create mode 100755 vendor/easybook/geshi/geshi/providex.php
 create mode 100755 vendor/easybook/geshi/geshi/purebasic.php
 create mode 100755 vendor/easybook/geshi/geshi/pycon.php
 create mode 100755 vendor/easybook/geshi/geshi/pys60.php
 create mode 100755 vendor/easybook/geshi/geshi/python.php
 create mode 100755 vendor/easybook/geshi/geshi/q.php
 create mode 100755 vendor/easybook/geshi/geshi/qbasic.php
 create mode 100644 vendor/easybook/geshi/geshi/racket.php
 create mode 100755 vendor/easybook/geshi/geshi/rails.php
 create mode 100644 vendor/easybook/geshi/geshi/rbs.php
 create mode 100755 vendor/easybook/geshi/geshi/rebol.php
 create mode 100755 vendor/easybook/geshi/geshi/reg.php
 create mode 100755 vendor/easybook/geshi/geshi/rexx.php
 create mode 100755 vendor/easybook/geshi/geshi/robots.php
 create mode 100755 vendor/easybook/geshi/geshi/rpmspec.php
 create mode 100755 vendor/easybook/geshi/geshi/rsplus.php
 create mode 100755 vendor/easybook/geshi/geshi/ruby.php
 create mode 100644 vendor/easybook/geshi/geshi/rust.php
 create mode 100755 vendor/easybook/geshi/geshi/sas.php
 create mode 100644 vendor/easybook/geshi/geshi/sass.php
 create mode 100755 vendor/easybook/geshi/geshi/scala.php
 create mode 100755 vendor/easybook/geshi/geshi/scheme.php
 create mode 100755 vendor/easybook/geshi/geshi/scilab.php
 create mode 100644 vendor/easybook/geshi/geshi/scl.php
 create mode 100755 vendor/easybook/geshi/geshi/sdlbasic.php
 create mode 100755 vendor/easybook/geshi/geshi/smalltalk.php
 create mode 100755 vendor/easybook/geshi/geshi/smarty.php
 create mode 100755 vendor/easybook/geshi/geshi/spark.php
 create mode 100755 vendor/easybook/geshi/geshi/sparql.php
 create mode 100755 vendor/easybook/geshi/geshi/sql.php
 create mode 100755 vendor/easybook/geshi/geshi/stonescript.php
 create mode 100755 vendor/easybook/geshi/geshi/systemverilog.php
 create mode 100755 vendor/easybook/geshi/geshi/tcl.php
 create mode 100755 vendor/easybook/geshi/geshi/teraterm.php
 create mode 100755 vendor/easybook/geshi/geshi/text.php
 create mode 100755 vendor/easybook/geshi/geshi/thinbasic.php
 create mode 100755 vendor/easybook/geshi/geshi/tsql.php
 create mode 100644 vendor/easybook/geshi/geshi/twig.php
 create mode 100755 vendor/easybook/geshi/geshi/typoscript.php
 create mode 100755 vendor/easybook/geshi/geshi/unicon.php
 create mode 100755 vendor/easybook/geshi/geshi/upc.php
 create mode 100755 vendor/easybook/geshi/geshi/urbi.php
 create mode 100755 vendor/easybook/geshi/geshi/uscript.php
 create mode 100755 vendor/easybook/geshi/geshi/vala.php
 create mode 100755 vendor/easybook/geshi/geshi/vb.php
 create mode 100755 vendor/easybook/geshi/geshi/vbnet.php
 create mode 100644 vendor/easybook/geshi/geshi/vbscript.php
 create mode 100755 vendor/easybook/geshi/geshi/vedit.php
 create mode 100755 vendor/easybook/geshi/geshi/verilog.php
 create mode 100755 vendor/easybook/geshi/geshi/vhdl.php
 create mode 100755 vendor/easybook/geshi/geshi/vim.php
 create mode 100755 vendor/easybook/geshi/geshi/visualfoxpro.php
 create mode 100755 vendor/easybook/geshi/geshi/visualprolog.php
 create mode 100755 vendor/easybook/geshi/geshi/whitespace.php
 create mode 100755 vendor/easybook/geshi/geshi/whois.php
 create mode 100755 vendor/easybook/geshi/geshi/winbatch.php
 create mode 100755 vendor/easybook/geshi/geshi/xbasic.php
 create mode 100755 vendor/easybook/geshi/geshi/xml.php
 create mode 100644 vendor/easybook/geshi/geshi/xojo.php
 create mode 100755 vendor/easybook/geshi/geshi/xorg_conf.php
 create mode 100755 vendor/easybook/geshi/geshi/xpp.php
 create mode 100755 vendor/easybook/geshi/geshi/yaml.php
 create mode 100755 vendor/easybook/geshi/geshi/z80.php
 create mode 100755 vendor/easybook/geshi/geshi/zxbasic.php

diff --git a/.gitignore b/.gitignore
index 5698e9d1f..d28991d9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,4 +62,4 @@ vendor/*/*/tests/*
 vendor/*/*/test/*
 vendor/*/*/doc/*
 vendor/*/*/docs/*
-
+vendor/*/*/contrib/*
diff --git a/composer.json b/composer.json
index 14ae94ad7..3fe00cc92 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
     "require": {
-        "splitbrain/php-archive": "~1.0"
+        "splitbrain/php-archive": "~1.0",
+        "easybook/geshi": "~1.0"
     }
 }
diff --git a/composer.lock b/composer.lock
index 753d5c9c0..8b6424244 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,54 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "de1f49aad78674b8d56a7f93fb633f65",
+    "hash": "23ee0dd06136e2301c930e75055300d5",
     "packages": [
+        {
+            "name": "easybook/geshi",
+            "version": "v1.0.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/easybook/geshi.git",
+                "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/easybook/geshi/zipball/af589a67bf308791bb13e54bddd9aa3544b7dff8",
+                "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">4.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Nigel McNie",
+                    "email": "nigel@geshi.org"
+                },
+                {
+                    "name": "Benny Baumann",
+                    "email": "BenBE@geshi.org"
+                }
+            ],
+            "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.",
+            "homepage": "http://qbnz.com/highlighter",
+            "keywords": [
+                "highlight",
+                "highlighter",
+                "syntax"
+            ],
+            "time": "2015-04-15 13:21:45"
+        },
         {
             "name": "splitbrain/php-archive",
             "version": "1.0.0",
diff --git a/inc/geshi.php b/inc/geshi.php
deleted file mode 100644
index c6ff9ef77..000000000
--- a/inc/geshi.php
+++ /dev/null
@@ -1,4775 +0,0 @@
-<?php
-/**
- * GeSHi - Generic Syntax Highlighter
- *
- * The GeSHi class for Generic Syntax Highlighting. Please refer to the
- * documentation at http://qbnz.com/highlighter/documentation.php for more
- * information about how to use this class.
- *
- * For changes, release notes, TODOs etc, see the relevant files in the docs/
- * directory.
- *
- *   This file is part of GeSHi.
- *
- *  GeSHi is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  GeSHi is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GeSHi; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package    geshi
- * @subpackage core
- * @author     Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
- * @copyright  (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann
- * @license    http://gnu.org/copyleft/gpl.html GNU GPL
- *
- */
-
-//
-// GeSHi Constants
-// You should use these constant names in your programs instead of
-// their values - you never know when a value may change in a future
-// version
-//
-
-/** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.8.11');
-
-// Define the root directory for the GeSHi code tree
-if (!defined('GESHI_ROOT')) {
-    /** The root directory for GeSHi */
-    define('GESHI_ROOT', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-}
-/** The language file directory for GeSHi
-    @access private */
-define('GESHI_LANG_ROOT', GESHI_ROOT . 'geshi' . DIRECTORY_SEPARATOR);
-
-// Define if GeSHi should be paranoid about security
-if (!defined('GESHI_SECURITY_PARANOID')) {
-    /** Tells GeSHi to be paranoid about security settings */
-    define('GESHI_SECURITY_PARANOID', false);
-}
-
-// Line numbers - use with enable_line_numbers()
-/** Use no line numbers when building the result */
-define('GESHI_NO_LINE_NUMBERS', 0);
-/** Use normal line numbers when building the result */
-define('GESHI_NORMAL_LINE_NUMBERS', 1);
-/** Use fancy line numbers when building the result */
-define('GESHI_FANCY_LINE_NUMBERS', 2);
-
-// Container HTML type
-/** Use nothing to surround the source */
-define('GESHI_HEADER_NONE', 0);
-/** Use a "div" to surround the source */
-define('GESHI_HEADER_DIV', 1);
-/** Use a "pre" to surround the source */
-define('GESHI_HEADER_PRE', 2);
-/** Use a pre to wrap lines when line numbers are enabled or to wrap the whole code. */
-define('GESHI_HEADER_PRE_VALID', 3);
-/**
- * Use a "table" to surround the source:
- *
- *  <table>
- *    <thead><tr><td colspan="2">$header</td></tr></thead>
- *    <tbody><tr><td><pre>$linenumbers</pre></td><td><pre>$code></pre></td></tr></tbody>
- *    <tfooter><tr><td colspan="2">$footer</td></tr></tfoot>
- *  </table>
- *
- * this is essentially only a workaround for Firefox, see sf#1651996 or take a look at
- * https://bugzilla.mozilla.org/show_bug.cgi?id=365805
- * @note when linenumbers are disabled this is essentially the same as GESHI_HEADER_PRE
- */
-define('GESHI_HEADER_PRE_TABLE', 4);
-
-// Capatalisation constants
-/** Lowercase keywords found */
-define('GESHI_CAPS_NO_CHANGE', 0);
-/** Uppercase keywords found */
-define('GESHI_CAPS_UPPER', 1);
-/** Leave keywords found as the case that they are */
-define('GESHI_CAPS_LOWER', 2);
-
-// Link style constants
-/** Links in the source in the :link state */
-define('GESHI_LINK', 0);
-/** Links in the source in the :hover state */
-define('GESHI_HOVER', 1);
-/** Links in the source in the :active state */
-define('GESHI_ACTIVE', 2);
-/** Links in the source in the :visited state */
-define('GESHI_VISITED', 3);
-
-// Important string starter/finisher
-// Note that if you change these, they should be as-is: i.e., don't
-// write them as if they had been run through htmlentities()
-/** The starter for important parts of the source */
-define('GESHI_START_IMPORTANT', '<BEGIN GeSHi>');
-/** The ender for important parts of the source */
-define('GESHI_END_IMPORTANT', '<END GeSHi>');
-
-/**#@+
- *  @access private
- */
-// When strict mode applies for a language
-/** Strict mode never applies (this is the most common) */
-define('GESHI_NEVER', 0);
-/** Strict mode *might* apply, and can be enabled or
-    disabled by {@link GeSHi->enable_strict_mode()} */
-define('GESHI_MAYBE', 1);
-/** Strict mode always applies */
-define('GESHI_ALWAYS', 2);
-
-// Advanced regexp handling constants, used in language files
-/** The key of the regex array defining what to search for */
-define('GESHI_SEARCH', 0);
-/** The key of the regex array defining what bracket group in a
-    matched search to use as a replacement */
-define('GESHI_REPLACE', 1);
-/** The key of the regex array defining any modifiers to the regular expression */
-define('GESHI_MODIFIERS', 2);
-/** The key of the regex array defining what bracket group in a
-    matched search to put before the replacement */
-define('GESHI_BEFORE', 3);
-/** The key of the regex array defining what bracket group in a
-    matched search to put after the replacement */
-define('GESHI_AFTER', 4);
-/** The key of the regex array defining a custom keyword to use
-    for this regexp's html tag class */
-define('GESHI_CLASS', 5);
-
-/** Used in language files to mark comments */
-define('GESHI_COMMENTS', 0);
-
-/** Used to work around missing PHP features **/
-define('GESHI_PHP_PRE_433', !(version_compare(PHP_VERSION, '4.3.3') === 1));
-
-/** make sure we can call stripos **/
-if (!function_exists('stripos')) {
-    // the offset param of preg_match is not supported below PHP 4.3.3
-    if (GESHI_PHP_PRE_433) {
-        /**
-         * @ignore
-         */
-        function stripos($haystack, $needle, $offset = null) {
-            if (!is_null($offset)) {
-                $haystack = substr($haystack, $offset);
-            }
-            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE)) {
-                return $match[0][1];
-            }
-            return false;
-        }
-    }
-    else {
-        /**
-         * @ignore
-         */
-        function stripos($haystack, $needle, $offset = null) {
-            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE, $offset)) {
-                return $match[0][1];
-            }
-            return false;
-        }
-    }
-}
-
-/** some old PHP / PCRE subpatterns only support up to xxx subpatterns in
-    regular expressions. Set this to false if your PCRE lib is up to date
-    @see GeSHi->optimize_regexp_list()
-    **/
-define('GESHI_MAX_PCRE_SUBPATTERNS', 500);
-/** it's also important not to generate too long regular expressions
-    be generous here... but keep in mind, that when reaching this limit we
-    still have to close open patterns. 12k should do just fine on a 16k limit.
-    @see GeSHi->optimize_regexp_list()
-    **/
-define('GESHI_MAX_PCRE_LENGTH', 12288);
-
-//Number format specification
-/** Basic number format for integers */
-define('GESHI_NUMBER_INT_BASIC', 1);        //Default integers \d+
-/** Enhanced number format for integers like seen in C */
-define('GESHI_NUMBER_INT_CSTYLE', 2);       //Default C-Style \d+[lL]?
-/** Number format to highlight binary numbers with a suffix "b" */
-define('GESHI_NUMBER_BIN_SUFFIX', 16);           //[01]+[bB]
-/** Number format to highlight binary numbers with a prefix % */
-define('GESHI_NUMBER_BIN_PREFIX_PERCENT', 32);   //%[01]+
-/** Number format to highlight binary numbers with a prefix 0b (C) */
-define('GESHI_NUMBER_BIN_PREFIX_0B', 64);        //0b[01]+
-/** Number format to highlight octal numbers with a leading zero */
-define('GESHI_NUMBER_OCT_PREFIX', 256);           //0[0-7]+
-/** Number format to highlight octal numbers with a prefix 0o (logtalk) */
-define('GESHI_NUMBER_OCT_PREFIX_0O', 512);           //0[0-7]+
-/** Number format to highlight octal numbers with a leading @ (Used in HiSofts Devpac series). */
-define('GESHI_NUMBER_OCT_PREFIX_AT', 1024);           //@[0-7]+
-/** Number format to highlight octal numbers with a suffix of o */
-define('GESHI_NUMBER_OCT_SUFFIX', 2048);           //[0-7]+[oO]
-/** Number format to highlight hex numbers with a prefix 0x */
-define('GESHI_NUMBER_HEX_PREFIX', 4096);           //0x[0-9a-fA-F]+
-/** Number format to highlight hex numbers with a prefix $ */
-define('GESHI_NUMBER_HEX_PREFIX_DOLLAR', 8192);           //$[0-9a-fA-F]+
-/** Number format to highlight hex numbers with a suffix of h */
-define('GESHI_NUMBER_HEX_SUFFIX', 16384);           //[0-9][0-9a-fA-F]*h
-/** Number format to highlight floating-point numbers without support for scientific notation */
-define('GESHI_NUMBER_FLT_NONSCI', 65536);          //\d+\.\d+
-/** Number format to highlight floating-point numbers without support for scientific notation */
-define('GESHI_NUMBER_FLT_NONSCI_F', 131072);       //\d+(\.\d+)?f
-/** Number format to highlight floating-point numbers with support for scientific notation (E) and optional leading zero */
-define('GESHI_NUMBER_FLT_SCI_SHORT', 262144);      //\.\d+e\d+
-/** Number format to highlight floating-point numbers with support for scientific notation (E) and required leading digit */
-define('GESHI_NUMBER_FLT_SCI_ZERO', 524288);       //\d+(\.\d+)?e\d+
-//Custom formats are passed by RX array
-
-// Error detection - use these to analyse faults
-/** No sourcecode to highlight was specified
- * @deprecated
- */
-define('GESHI_ERROR_NO_INPUT', 1);
-/** The language specified does not exist */
-define('GESHI_ERROR_NO_SUCH_LANG', 2);
-/** GeSHi could not open a file for reading (generally a language file) */
-define('GESHI_ERROR_FILE_NOT_READABLE', 3);
-/** The header type passed to {@link GeSHi->set_header_type()} was invalid */
-define('GESHI_ERROR_INVALID_HEADER_TYPE', 4);
-/** The line number type passed to {@link GeSHi->enable_line_numbers()} was invalid */
-define('GESHI_ERROR_INVALID_LINE_NUMBER_TYPE', 5);
-/**#@-*/
-
-
-/**
- * The GeSHi Class.
- *
- * Please refer to the documentation for GeSHi 1.0.X that is available
- * at http://qbnz.com/highlighter/documentation.php for more information
- * about how to use this class.
- *
- * @package   geshi
- * @author    Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
- * @copyright (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann
- */
-class GeSHi {
-    /**#@+
-     * @access private
-     */
-    /**
-     * The source code to highlight
-     * @var string
-     */
-    var $source = '';
-
-    /**
-     * The language to use when highlighting
-     * @var string
-     */
-    var $language = '';
-
-    /**
-     * The data for the language used
-     * @var array
-     */
-    var $language_data = array();
-
-    /**
-     * The path to the language files
-     * @var string
-     */
-    var $language_path = GESHI_LANG_ROOT;
-
-    /**
-     * The error message associated with an error
-     * @var string
-     * @todo check err reporting works
-     */
-    var $error = false;
-
-    /**
-     * Possible error messages
-     * @var array
-     */
-    var $error_messages = array(
-        GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})',
-        GESHI_ERROR_FILE_NOT_READABLE => 'The file specified for load_from_file was not readable',
-        GESHI_ERROR_INVALID_HEADER_TYPE => 'The header type specified is invalid',
-        GESHI_ERROR_INVALID_LINE_NUMBER_TYPE => 'The line number type specified is invalid'
-    );
-
-    /**
-     * Whether highlighting is strict or not
-     * @var boolean
-     */
-    var $strict_mode = false;
-
-    /**
-     * Whether to use CSS classes in output
-     * @var boolean
-     */
-    var $use_classes = false;
-
-    /**
-     * The type of header to use. Can be one of the following
-     * values:
-     *
-     * - GESHI_HEADER_PRE: Source is outputted in a "pre" HTML element.
-     * - GESHI_HEADER_DIV: Source is outputted in a "div" HTML element.
-     * - GESHI_HEADER_NONE: No header is outputted.
-     *
-     * @var int
-     */
-    var $header_type = GESHI_HEADER_PRE;
-
-    /**
-     * Array of permissions for which lexics should be highlighted
-     * @var array
-     */
-    var $lexic_permissions = array(
-        'KEYWORDS' =>    array(),
-        'COMMENTS' =>    array('MULTI' => true),
-        'REGEXPS' =>     array(),
-        'ESCAPE_CHAR' => true,
-        'BRACKETS' =>    true,
-        'SYMBOLS' =>     false,
-        'STRINGS' =>     true,
-        'NUMBERS' =>     true,
-        'METHODS' =>     true,
-        'SCRIPT' =>      true
-    );
-
-    /**
-     * The time it took to parse the code
-     * @var double
-     */
-    var $time = 0;
-
-    /**
-     * The content of the header block
-     * @var string
-     */
-    var $header_content = '';
-
-    /**
-     * The content of the footer block
-     * @var string
-     */
-    var $footer_content = '';
-
-    /**
-     * The style of the header block
-     * @var string
-     */
-    var $header_content_style = '';
-
-    /**
-     * The style of the footer block
-     * @var string
-     */
-    var $footer_content_style = '';
-
-    /**
-     * Tells if a block around the highlighted source should be forced
-     * if not using line numbering
-     * @var boolean
-     */
-    var $force_code_block = false;
-
-    /**
-     * The styles for hyperlinks in the code
-     * @var array
-     */
-    var $link_styles = array();
-
-    /**
-     * Whether important blocks should be recognised or not
-     * @var boolean
-     * @deprecated
-     * @todo REMOVE THIS FUNCTIONALITY!
-     */
-    var $enable_important_blocks = false;
-
-    /**
-     * Styles for important parts of the code
-     * @var string
-     * @deprecated
-     * @todo As above - rethink the whole idea of important blocks as it is buggy and
-     * will be hard to implement in 1.2
-     */
-    var $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code
-
-    /**
-     * Whether CSS IDs should be added to the code
-     * @var boolean
-     */
-    var $add_ids = false;
-
-    /**
-     * Lines that should be highlighted extra
-     * @var array
-     */
-    var $highlight_extra_lines = array();
-
-    /**
-     * Styles of lines that should be highlighted extra
-     * @var array
-     */
-    var $highlight_extra_lines_styles = array();
-
-    /**
-     * Styles of extra-highlighted lines
-     * @var string
-     */
-    var $highlight_extra_lines_style = 'background-color: #ffc;';
-
-    /**
-     * The line ending
-     * If null, nl2br() will be used on the result string.
-     * Otherwise, all instances of \n will be replaced with $line_ending
-     * @var string
-     */
-    var $line_ending = null;
-
-    /**
-     * Number at which line numbers should start at
-     * @var int
-     */
-    var $line_numbers_start = 1;
-
-    /**
-     * The overall style for this code block
-     * @var string
-     */
-    var $overall_style = 'font-family:monospace;';
-
-    /**
-     *  The style for the actual code
-     * @var string
-     */
-    var $code_style = 'font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;';
-
-    /**
-     * The overall class for this code block
-     * @var string
-     */
-    var $overall_class = '';
-
-    /**
-     * The overall ID for this code block
-     * @var string
-     */
-    var $overall_id = '';
-
-    /**
-     * Line number styles
-     * @var string
-     */
-    var $line_style1 = 'font-weight: normal; vertical-align:top;';
-
-    /**
-     * Line number styles for fancy lines
-     * @var string
-     */
-    var $line_style2 = 'font-weight: bold; vertical-align:top;';
-
-    /**
-     * Style for line numbers when GESHI_HEADER_PRE_TABLE is chosen
-     * @var string
-     */
-    var $table_linenumber_style = 'width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;';
-
-    /**
-     * Flag for how line numbers are displayed
-     * @var boolean
-     */
-    var $line_numbers = GESHI_NO_LINE_NUMBERS;
-
-    /**
-     * Flag to decide if multi line spans are allowed. Set it to false to make sure
-     * each tag is closed before and reopened after each linefeed.
-     * @var boolean
-     */
-    var $allow_multiline_span = true;
-
-    /**
-     * The "nth" value for fancy line highlighting
-     * @var int
-     */
-    var $line_nth_row = 0;
-
-    /**
-     * The size of tab stops
-     * @var int
-     */
-    var $tab_width = 8;
-
-    /**
-     * Should we use language-defined tab stop widths?
-     * @var int
-     */
-    var $use_language_tab_width = false;
-
-    /**
-     * Default target for keyword links
-     * @var string
-     */
-    var $link_target = '';
-
-    /**
-     * The encoding to use for entity encoding
-     * NOTE: Used with Escape Char Sequences to fix UTF-8 handling (cf. SF#2037598)
-     * @var string
-     */
-    var $encoding = 'utf-8';
-
-    /**
-     * Should keywords be linked?
-     * @var boolean
-     */
-    var $keyword_links = true;
-
-    /**
-     * Currently loaded language file
-     * @var string
-     * @since 1.0.7.22
-     */
-    var $loaded_language = '';
-
-    /**
-     * Wether the caches needed for parsing are built or not
-     *
-     * @var bool
-     * @since 1.0.8
-     */
-    var $parse_cache_built = false;
-
-    /**
-     * Work around for Suhosin Patch with disabled /e modifier
-     *
-     * Note from suhosins author in config file:
-     * <blockquote>
-     *   The /e modifier inside <code>preg_replace()</code> allows code execution.
-     *   Often it is the cause for remote code execution exploits. It is wise to
-     *   deactivate this feature and test where in the application it is used.
-     *   The developer using the /e modifier should be made aware that he should
-     *   use <code>preg_replace_callback()</code> instead
-     * </blockquote>
-     *
-     * @var array
-     * @since 1.0.8
-     */
-    var $_kw_replace_group = 0;
-    var $_rx_key = 0;
-
-    /**
-     * some "callback parameters" for handle_multiline_regexps
-     *
-     * @since 1.0.8
-     * @access private
-     * @var string
-     */
-    var $_hmr_before = '';
-    var $_hmr_replace = '';
-    var $_hmr_after = '';
-    var $_hmr_key = 0;
-
-    /**#@-*/
-
-    /**
-     * Creates a new GeSHi object, with source and language
-     *
-     * @param string The source code to highlight
-     * @param string The language to highlight the source with
-     * @param string The path to the language file directory. <b>This
-     *               is deprecated!</b> I've backported the auto path
-     *               detection from the 1.1.X dev branch, so now it
-     *               should be automatically set correctly. If you have
-     *               renamed the language directory however, you will
-     *               still need to set the path using this parameter or
-     *               {@link GeSHi->set_language_path()}
-     * @since 1.0.0
-     */
-    function GeSHi($source = '', $language = '', $path = '') {
-        if (!empty($source)) {
-            $this->set_source($source);
-        }
-        if (!empty($language)) {
-            $this->set_language($language);
-        }
-        $this->set_language_path($path);
-    }
-
-    /**
-     * Returns the version of GeSHi
-     *
-     * @return string
-     * @since 1 0.8.11
-     */
-    function get_version()
-    {
-        return GESHI_VERSION;
-    }
-
-    /**
-     * Returns an error message associated with the last GeSHi operation,
-     * or false if no error has occured
-     *
-     * @return string|false An error message if there has been an error, else false
-     * @since  1.0.0
-     */
-    function error() {
-        if ($this->error) {
-            //Put some template variables for debugging here ...
-            $debug_tpl_vars = array(
-                '{LANGUAGE}' => $this->language,
-                '{PATH}' => $this->language_path
-            );
-            $msg = str_replace(
-                array_keys($debug_tpl_vars),
-                array_values($debug_tpl_vars),
-                $this->error_messages[$this->error]);
-
-            return "<br /><strong>GeSHi Error:</strong> $msg (code {$this->error})<br />";
-        }
-        return false;
-    }
-
-    /**
-     * Gets a human-readable language name (thanks to Simon Patterson
-     * for the idea :))
-     *
-     * @return string The name for the current language
-     * @since  1.0.2
-     */
-    function get_language_name() {
-        if (GESHI_ERROR_NO_SUCH_LANG == $this->error) {
-            return $this->language_data['LANG_NAME'] . ' (Unknown Language)';
-        }
-        return $this->language_data['LANG_NAME'];
-    }
-
-    /**
-     * Sets the source code for this object
-     *
-     * @param string The source code to highlight
-     * @since 1.0.0
-     */
-    function set_source($source) {
-        $this->source = $source;
-        $this->highlight_extra_lines = array();
-    }
-
-    /**
-     * Sets the language for this object
-     *
-     * @note since 1.0.8 this function won't reset language-settings by default anymore!
-     *       if you need this set $force_reset = true
-     *
-     * @param string The name of the language to use
-     * @since 1.0.0
-     */
-    function set_language($language, $force_reset = false) {
-        if ($force_reset) {
-            $this->loaded_language = false;
-        }
-
-        //Clean up the language name to prevent malicious code injection
-        $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language);
-
-        $language = strtolower($language);
-
-        //Retreive the full filename
-        $file_name = $this->language_path . $language . '.php';
-        if ($file_name == $this->loaded_language) {
-            // this language is already loaded!
-            return;
-        }
-
-        $this->language = $language;
-
-        $this->error = false;
-        $this->strict_mode = GESHI_NEVER;
-
-        //Check if we can read the desired file
-        if (!is_readable($file_name)) {
-            $this->error = GESHI_ERROR_NO_SUCH_LANG;
-            return;
-        }
-
-        // Load the language for parsing
-        $this->load_language($file_name);
-    }
-
-    /**
-     * Sets the path to the directory containing the language files. Note
-     * that this path is relative to the directory of the script that included
-     * geshi.php, NOT geshi.php itself.
-     *
-     * @param string The path to the language directory
-     * @since 1.0.0
-     * @deprecated The path to the language files should now be automatically
-     *             detected, so this method should no longer be needed. The
-     *             1.1.X branch handles manual setting of the path differently
-     *             so this method will disappear in 1.2.0.
-     */
-    function set_language_path($path) {
-        if(strpos($path,':')) {
-            //Security Fix to prevent external directories using fopen wrappers.
-            if(DIRECTORY_SEPARATOR == "\\") {
-                if(!preg_match('#^[a-zA-Z]:#', $path) || false !== strpos($path, ':', 2)) {
-                    return;
-                }
-            } else {
-                return;
-            }
-        }
-        if(preg_match('#[^/a-zA-Z0-9_\.\-\\\s:]#', $path)) {
-            //Security Fix to prevent external directories using fopen wrappers.
-            return;
-        }
-        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '/.')) {
-            //Security Fix to prevent external directories using fopen wrappers.
-            return;
-        }
-        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '..')) {
-            //Security Fix to prevent external directories using fopen wrappers.
-            return;
-        }
-        if ($path) {
-            $this->language_path = ('/' == $path[strlen($path) - 1]) ? $path : $path . '/';
-            $this->set_language($this->language); // otherwise set_language_path has no effect
-        }
-    }
-
-    /**
-     * Get supported langs or an associative array lang=>full_name.
-     * @param boolean $longnames
-     * @return array
-     */
-    function get_supported_languages($full_names=false)
-    {
-        // return array
-        $back = array();
-
-        // we walk the lang root
-        $dir = dir($this->language_path);
-
-        // foreach entry
-        while (false !== ($entry = $dir->read()))
-        {
-            $full_path = $this->language_path.$entry;
-
-            // Skip all dirs
-            if (is_dir($full_path)) {
-                continue;
-            }
-
-            // we only want lang.php files
-            if (!preg_match('/^([^.]+)\.php$/', $entry, $matches)) {
-                continue;
-            }
-
-            // Raw lang name is here
-            $langname = $matches[1];
-
-            // We want the fullname too?
-            if ($full_names === true)
-            {
-                if (false !== ($fullname = $this->get_language_fullname($langname)))
-                {
-                    $back[$langname] = $fullname; // we go associative
-                }
-            }
-            else
-            {
-                // just store raw langname
-                $back[] = $langname;
-            }
-        }
-
-        $dir->close();
-
-        return $back;
-    }
-
-    /**
-     * Get full_name for a lang or false.
-     * @param string $language short langname (html4strict for example)
-     * @return mixed
-     */
-    function get_language_fullname($language)
-    {
-        //Clean up the language name to prevent malicious code injection
-        $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language);
-
-        $language = strtolower($language);
-
-        // get fullpath-filename for a langname
-        $fullpath = $this->language_path.$language.'.php';
-
-        // we need to get contents :S
-        if (false === ($data = file_get_contents($fullpath))) {
-            $this->error = sprintf('Geshi::get_lang_fullname() Unknown Language: %s', $language);
-            return false;
-        }
-
-        // match the langname
-        if (!preg_match('/\'LANG_NAME\'\s*=>\s*\'((?:[^\']|\\\')+?)\'/', $data, $matches)) {
-            $this->error = sprintf('Geshi::get_lang_fullname(%s): Regex can not detect language', $language);
-            return false;
-        }
-
-        // return fullname for langname
-        return stripcslashes($matches[1]);
-    }
-
-    /**
-     * Sets the type of header to be used.
-     *
-     * If GESHI_HEADER_DIV is used, the code is surrounded in a "div".This
-     * means more source code but more control over tab width and line-wrapping.
-     * GESHI_HEADER_PRE means that a "pre" is used - less source, but less
-     * control. Default is GESHI_HEADER_PRE.
-     *
-     * From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code
-     * should be outputted.
-     *
-     * @param int The type of header to be used
-     * @since 1.0.0
-     */
-    function set_header_type($type) {
-        //Check if we got a valid header type
-        if (!in_array($type, array(GESHI_HEADER_NONE, GESHI_HEADER_DIV,
-            GESHI_HEADER_PRE, GESHI_HEADER_PRE_VALID, GESHI_HEADER_PRE_TABLE))) {
-            $this->error = GESHI_ERROR_INVALID_HEADER_TYPE;
-            return;
-        }
-
-        //Set that new header type
-        $this->header_type = $type;
-    }
-
-    /**
-     * Sets the styles for the code that will be outputted
-     * when this object is parsed. The style should be a
-     * string of valid stylesheet declarations
-     *
-     * @param string  The overall style for the outputted code block
-     * @param boolean Whether to merge the styles with the current styles or not
-     * @since 1.0.0
-     */
-    function set_overall_style($style, $preserve_defaults = false) {
-        if (!$preserve_defaults) {
-            $this->overall_style = $style;
-        } else {
-            $this->overall_style .= $style;
-        }
-    }
-
-    /**
-     * Sets the overall classname for this block of code. This
-     * class can then be used in a stylesheet to style this object's
-     * output
-     *
-     * @param string The class name to use for this block of code
-     * @since 1.0.0
-     */
-    function set_overall_class($class) {
-        $this->overall_class = $class;
-    }
-
-    /**
-     * Sets the overall id for this block of code. This id can then
-     * be used in a stylesheet to style this object's output
-     *
-     * @param string The ID to use for this block of code
-     * @since 1.0.0
-     */
-    function set_overall_id($id) {
-        $this->overall_id = $id;
-    }
-
-    /**
-     * Sets whether CSS classes should be used to highlight the source. Default
-     * is off, calling this method with no arguments will turn it on
-     *
-     * @param boolean Whether to turn classes on or not
-     * @since 1.0.0
-     */
-    function enable_classes($flag = true) {
-        $this->use_classes = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the style for the actual code. This should be a string
-     * containing valid stylesheet declarations. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * Note: Use this method to override any style changes you made to
-     * the line numbers if you are using line numbers, else the line of
-     * code will have the same style as the line number! Consult the
-     * GeSHi documentation for more information about this.
-     *
-     * @param string  The style to use for actual code
-     * @param boolean Whether to merge the current styles with the new styles
-     * @since 1.0.2
-     */
-    function set_code_style($style, $preserve_defaults = false) {
-        if (!$preserve_defaults) {
-            $this->code_style = $style;
-        } else {
-            $this->code_style .= $style;
-        }
-    }
-
-    /**
-     * Sets the styles for the line numbers.
-     *
-     * @param string The style for the line numbers that are "normal"
-     * @param string|boolean If a string, this is the style of the line
-     *        numbers that are "fancy", otherwise if boolean then this
-     *        defines whether the normal styles should be merged with the
-     *        new normal styles or not
-     * @param boolean If set, is the flag for whether to merge the "fancy"
-     *        styles with the current styles or not
-     * @since 1.0.2
-     */
-    function set_line_style($style1, $style2 = '', $preserve_defaults = false) {
-        //Check if we got 2 or three parameters
-        if (is_bool($style2)) {
-            $preserve_defaults = $style2;
-            $style2 = '';
-        }
-
-        //Actually set the new styles
-        if (!$preserve_defaults) {
-            $this->line_style1 = $style1;
-            $this->line_style2 = $style2;
-        } else {
-            $this->line_style1 .= $style1;
-            $this->line_style2 .= $style2;
-        }
-    }
-
-    /**
-     * Sets whether line numbers should be displayed.
-     *
-     * Valid values for the first parameter are:
-     *
-     *  - GESHI_NO_LINE_NUMBERS: Line numbers will not be displayed
-     *  - GESHI_NORMAL_LINE_NUMBERS: Line numbers will be displayed
-     *  - GESHI_FANCY_LINE_NUMBERS: Fancy line numbers will be displayed
-     *
-     * For fancy line numbers, the second parameter is used to signal which lines
-     * are to be fancy. For example, if the value of this parameter is 5 then every
-     * 5th line will be fancy.
-     *
-     * @param int How line numbers should be displayed
-     * @param int Defines which lines are fancy
-     * @since 1.0.0
-     */
-    function enable_line_numbers($flag, $nth_row = 5) {
-        if (GESHI_NO_LINE_NUMBERS != $flag && GESHI_NORMAL_LINE_NUMBERS != $flag
-            && GESHI_FANCY_LINE_NUMBERS != $flag) {
-            $this->error = GESHI_ERROR_INVALID_LINE_NUMBER_TYPE;
-        }
-        $this->line_numbers = $flag;
-        $this->line_nth_row = $nth_row;
-    }
-
-    /**
-     * Sets wether spans and other HTML markup generated by GeSHi can
-     * span over multiple lines or not. Defaults to true to reduce overhead.
-     * Set it to false if you want to manipulate the output or manually display
-     * the code in an ordered list.
-     *
-     * @param boolean Wether multiline spans are allowed or not
-     * @since 1.0.7.22
-     */
-    function enable_multiline_span($flag) {
-        $this->allow_multiline_span = (bool) $flag;
-    }
-
-    /**
-     * Get current setting for multiline spans, see GeSHi->enable_multiline_span().
-     *
-     * @see enable_multiline_span
-     * @return bool
-     */
-    function get_multiline_span() {
-        return $this->allow_multiline_span;
-    }
-
-    /**
-     * Sets the style for a keyword group. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param int     The key of the keyword group to change the styles of
-     * @param string  The style to make the keywords
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @since 1.0.0
-     */
-    function set_keyword_group_style($key, $style, $preserve_defaults = false) {
-        //Set the style for this keyword group
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['KEYWORDS'][$key] = $style;
-        } else {
-            $this->language_data['STYLES']['KEYWORDS'][$key] .= $style;
-        }
-
-        //Update the lexic permissions
-        if (!isset($this->lexic_permissions['KEYWORDS'][$key])) {
-            $this->lexic_permissions['KEYWORDS'][$key] = true;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for a keyword group
-     *
-     * @param int     The key of the keyword group to turn on or off
-     * @param boolean Whether to turn highlighting for that group on or off
-     * @since 1.0.0
-     */
-    function set_keyword_group_highlighting($key, $flag = true) {
-        $this->lexic_permissions['KEYWORDS'][$key] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the styles for comment groups.  If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param int     The key of the comment group to change the styles of
-     * @param string  The style to make the comments
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @since 1.0.0
-     */
-    function set_comments_style($key, $style, $preserve_defaults = false) {
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['COMMENTS'][$key] = $style;
-        } else {
-            $this->language_data['STYLES']['COMMENTS'][$key] .= $style;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for comment groups
-     *
-     * @param int     The key of the comment group to turn on or off
-     * @param boolean Whether to turn highlighting for that group on or off
-     * @since 1.0.0
-     */
-    function set_comments_highlighting($key, $flag = true) {
-        $this->lexic_permissions['COMMENTS'][$key] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the styles for escaped characters. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param string  The style to make the escape characters
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @since 1.0.0
-     */
-    function set_escape_characters_style($style, $preserve_defaults = false, $group = 0) {
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] = $style;
-        } else {
-            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] .= $style;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for escaped characters
-     *
-     * @param boolean Whether to turn highlighting for escape characters on or off
-     * @since 1.0.0
-     */
-    function set_escape_characters_highlighting($flag = true) {
-        $this->lexic_permissions['ESCAPE_CHAR'] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the styles for brackets. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * This method is DEPRECATED: use set_symbols_style instead.
-     * This method will be removed in 1.2.X
-     *
-     * @param string  The style to make the brackets
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @since 1.0.0
-     * @deprecated In favour of set_symbols_style
-     */
-    function set_brackets_style($style, $preserve_defaults = false) {
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['BRACKETS'][0] = $style;
-        } else {
-            $this->language_data['STYLES']['BRACKETS'][0] .= $style;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for brackets
-     *
-     * This method is DEPRECATED: use set_symbols_highlighting instead.
-     * This method will be remove in 1.2.X
-     *
-     * @param boolean Whether to turn highlighting for brackets on or off
-     * @since 1.0.0
-     * @deprecated In favour of set_symbols_highlighting
-     */
-    function set_brackets_highlighting($flag) {
-        $this->lexic_permissions['BRACKETS'] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the styles for symbols. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param string  The style to make the symbols
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of symbols for which style should be set.
-     * @since 1.0.1
-     */
-    function set_symbols_style($style, $preserve_defaults = false, $group = 0) {
-        // Update the style of symbols
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['SYMBOLS'][$group] = $style;
-        } else {
-            $this->language_data['STYLES']['SYMBOLS'][$group] .= $style;
-        }
-
-        // For backward compatibility
-        if (0 == $group) {
-            $this->set_brackets_style ($style, $preserve_defaults);
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for symbols
-     *
-     * @param boolean Whether to turn highlighting for symbols on or off
-     * @since 1.0.0
-     */
-    function set_symbols_highlighting($flag) {
-        // Update lexic permissions for this symbol group
-        $this->lexic_permissions['SYMBOLS'] = ($flag) ? true : false;
-
-        // For backward compatibility
-        $this->set_brackets_highlighting ($flag);
-    }
-
-    /**
-     * Sets the styles for strings. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param string  The style to make the escape characters
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of strings for which style should be set.
-     * @since 1.0.0
-     */
-    function set_strings_style($style, $preserve_defaults = false, $group = 0) {
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['STRINGS'][$group] = $style;
-        } else {
-            $this->language_data['STYLES']['STRINGS'][$group] .= $style;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for strings
-     *
-     * @param boolean Whether to turn highlighting for strings on or off
-     * @since 1.0.0
-     */
-    function set_strings_highlighting($flag) {
-        $this->lexic_permissions['STRINGS'] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the styles for strict code blocks. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param string  The style to make the script blocks
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of script blocks for which style should be set.
-     * @since 1.0.8.4
-     */
-    function set_script_style($style, $preserve_defaults = false, $group = 0) {
-        // Update the style of symbols
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['SCRIPT'][$group] = $style;
-        } else {
-            $this->language_data['STYLES']['SCRIPT'][$group] .= $style;
-        }
-    }
-
-    /**
-     * Sets the styles for numbers. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param string  The style to make the numbers
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @param int     Tells the group of numbers for which style should be set.
-     * @since 1.0.0
-     */
-    function set_numbers_style($style, $preserve_defaults = false, $group = 0) {
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['NUMBERS'][$group] = $style;
-        } else {
-            $this->language_data['STYLES']['NUMBERS'][$group] .= $style;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for numbers
-     *
-     * @param boolean Whether to turn highlighting for numbers on or off
-     * @since 1.0.0
-     */
-    function set_numbers_highlighting($flag) {
-        $this->lexic_permissions['NUMBERS'] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the styles for methods. $key is a number that references the
-     * appropriate "object splitter" - see the language file for the language
-     * you are highlighting to get this number. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param int     The key of the object splitter to change the styles of
-     * @param string  The style to make the methods
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @since 1.0.0
-     */
-    function set_methods_style($key, $style, $preserve_defaults = false) {
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['METHODS'][$key] = $style;
-        } else {
-            $this->language_data['STYLES']['METHODS'][$key] .= $style;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for methods
-     *
-     * @param boolean Whether to turn highlighting for methods on or off
-     * @since 1.0.0
-     */
-    function set_methods_highlighting($flag) {
-        $this->lexic_permissions['METHODS'] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets the styles for regexps. If $preserve_defaults is
-     * true, then styles are merged with the default styles, with the
-     * user defined styles having priority
-     *
-     * @param string  The style to make the regular expression matches
-     * @param boolean Whether to merge the new styles with the old or just
-     *                to overwrite them
-     * @since 1.0.0
-     */
-    function set_regexps_style($key, $style, $preserve_defaults = false) {
-        if (!$preserve_defaults) {
-            $this->language_data['STYLES']['REGEXPS'][$key] = $style;
-        } else {
-            $this->language_data['STYLES']['REGEXPS'][$key] .= $style;
-        }
-    }
-
-    /**
-     * Turns highlighting on/off for regexps
-     *
-     * @param int     The key of the regular expression group to turn on or off
-     * @param boolean Whether to turn highlighting for the regular expression group on or off
-     * @since 1.0.0
-     */
-    function set_regexps_highlighting($key, $flag) {
-        $this->lexic_permissions['REGEXPS'][$key] = ($flag) ? true : false;
-    }
-
-    /**
-     * Sets whether a set of keywords are checked for in a case sensitive manner
-     *
-     * @param int The key of the keyword group to change the case sensitivity of
-     * @param boolean Whether to check in a case sensitive manner or not
-     * @since 1.0.0
-     */
-    function set_case_sensitivity($key, $case) {
-        $this->language_data['CASE_SENSITIVE'][$key] = ($case) ? true : false;
-    }
-
-    /**
-     * Sets the case that keywords should use when found. Use the constants:
-     *
-     *  - GESHI_CAPS_NO_CHANGE: leave keywords as-is
-     *  - GESHI_CAPS_UPPER: convert all keywords to uppercase where found
-     *  - GESHI_CAPS_LOWER: convert all keywords to lowercase where found
-     *
-     * @param int A constant specifying what to do with matched keywords
-     * @since 1.0.1
-     */
-    function set_case_keywords($case) {
-        if (in_array($case, array(
-            GESHI_CAPS_NO_CHANGE, GESHI_CAPS_UPPER, GESHI_CAPS_LOWER))) {
-            $this->language_data['CASE_KEYWORDS'] = $case;
-        }
-    }
-
-    /**
-     * Sets how many spaces a tab is substituted for
-     *
-     * Widths below zero are ignored
-     *
-     * @param int The tab width
-     * @since 1.0.0
-     */
-    function set_tab_width($width) {
-        $this->tab_width = intval($width);
-
-        //Check if it fit's the constraints:
-        if ($this->tab_width < 1) {
-            //Return it to the default
-            $this->tab_width = 8;
-        }
-    }
-
-    /**
-     * Sets whether or not to use tab-stop width specifed by language
-     *
-     * @param boolean Whether to use language-specific tab-stop widths
-     * @since 1.0.7.20
-     */
-    function set_use_language_tab_width($use) {
-        $this->use_language_tab_width = (bool) $use;
-    }
-
-    /**
-     * Returns the tab width to use, based on the current language and user
-     * preference
-     *
-     * @return int Tab width
-     * @since 1.0.7.20
-     */
-    function get_real_tab_width() {
-        if (!$this->use_language_tab_width ||
-            !isset($this->language_data['TAB_WIDTH'])) {
-            return $this->tab_width;
-        } else {
-            return $this->language_data['TAB_WIDTH'];
-        }
-    }
-
-    /**
-     * Enables/disables strict highlighting. Default is off, calling this
-     * method without parameters will turn it on. See documentation
-     * for more details on strict mode and where to use it.
-     *
-     * @param boolean Whether to enable strict mode or not
-     * @since 1.0.0
-     */
-    function enable_strict_mode($mode = true) {
-        if (GESHI_MAYBE == $this->language_data['STRICT_MODE_APPLIES']) {
-            $this->strict_mode = ($mode) ? GESHI_ALWAYS : GESHI_NEVER;
-        }
-    }
-
-    /**
-     * Disables all highlighting
-     *
-     * @since 1.0.0
-     * @todo  Rewrite with array traversal
-     * @deprecated In favour of enable_highlighting
-     */
-    function disable_highlighting() {
-        $this->enable_highlighting(false);
-    }
-
-    /**
-     * Enables all highlighting
-     *
-     * The optional flag parameter was added in version 1.0.7.21 and can be used
-     * to enable (true) or disable (false) all highlighting.
-     *
-     * @since 1.0.0
-     * @param boolean A flag specifying whether to enable or disable all highlighting
-     * @todo  Rewrite with array traversal
-     */
-    function enable_highlighting($flag = true) {
-        $flag = $flag ? true : false;
-        foreach ($this->lexic_permissions as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $k => $v) {
-                    $this->lexic_permissions[$key][$k] = $flag;
-                }
-            } else {
-                $this->lexic_permissions[$key] = $flag;
-            }
-        }
-
-        // Context blocks
-        $this->enable_important_blocks = $flag;
-    }
-
-    /**
-     * Given a file extension, this method returns either a valid geshi language
-     * name, or the empty string if it couldn't be found
-     *
-     * @param string The extension to get a language name for
-     * @param array  A lookup array to use instead of the default one
-     * @since 1.0.5
-     * @todo Re-think about how this method works (maybe make it private and/or make it
-     *       a extension->lang lookup?)
-     * @todo static?
-     */
-    function get_language_name_from_extension( $extension, $lookup = array() ) {
-        $extension = strtolower($extension);
-
-        if ( !is_array($lookup) || empty($lookup)) {
-            $lookup = array(
-                '6502acme' => array( 'a', 's', 'asm', 'inc' ),
-                '6502tasm' => array( 'a', 's', 'asm', 'inc' ),
-                '6502kickass' => array( 'a', 's', 'asm', 'inc' ),
-                '68000devpac' => array( 'a', 's', 'asm', 'inc' ),
-                'abap' => array('abap'),
-                'actionscript' => array('as'),
-                'ada' => array('a', 'ada', 'adb', 'ads'),
-                'apache' => array('conf'),
-                'asm' => array('ash', 'asm', 'inc'),
-                'asp' => array('asp'),
-                'bash' => array('sh'),
-                'bf' => array('bf'),
-                'c' => array('c', 'h'),
-                'c_mac' => array('c', 'h'),
-                'caddcl' => array(),
-                'cadlisp' => array(),
-                'cdfg' => array('cdfg'),
-                'cobol' => array('cbl'),
-                'cpp' => array('cpp', 'hpp', 'C', 'H', 'CPP', 'HPP'),
-                'csharp' => array('cs'),
-                'css' => array('css'),
-                'd' => array('d'),
-                'delphi' => array('dpk', 'dpr', 'pp', 'pas'),
-                'diff' => array('diff', 'patch'),
-                'dos' => array('bat', 'cmd'),
-                'gdb' => array('kcrash', 'crash', 'bt'),
-                'gettext' => array('po', 'pot'),
-                'gml' => array('gml'),
-                'gnuplot' => array('plt'),
-                'groovy' => array('groovy'),
-                'haskell' => array('hs'),
-                'haxe' => array('hx'),
-                'html4strict' => array('html', 'htm'),
-                'ini' => array('ini', 'desktop'),
-                'java' => array('java'),
-                'javascript' => array('js'),
-                'klonec' => array('kl1'),
-                'klonecpp' => array('klx'),
-                'latex' => array('tex'),
-                'lisp' => array('lisp'),
-                'lua' => array('lua'),
-                'matlab' => array('m'),
-                'mpasm' => array(),
-                'mysql' => array('sql'),
-                'nsis' => array(),
-                'objc' => array(),
-                'oobas' => array(),
-                'oracle8' => array(),
-                'oracle10' => array(),
-                'pascal' => array('pas'),
-                'perl' => array('pl', 'pm'),
-                'php' => array('php', 'php5', 'phtml', 'phps'),
-                'povray' => array('pov'),
-                'providex' => array('pvc', 'pvx'),
-                'prolog' => array('pl'),
-                'python' => array('py'),
-                'qbasic' => array('bi'),
-                'reg' => array('reg'),
-                'ruby' => array('rb'),
-                'sas' => array('sas'),
-                'scala' => array('scala'),
-                'scheme' => array('scm'),
-                'scilab' => array('sci'),
-                'smalltalk' => array('st'),
-                'smarty' => array(),
-                'tcl' => array('tcl'),
-                'text' => array('txt'),
-                'vb' => array('bas'),
-                'vbnet' => array(),
-                'visualfoxpro' => array(),
-                'whitespace' => array('ws'),
-                'xml' => array('xml', 'svg', 'xrc'),
-                'z80' => array('z80', 'asm', 'inc')
-            );
-        }
-
-        foreach ($lookup as $lang => $extensions) {
-            if (in_array($extension, $extensions)) {
-                return $lang;
-            }
-        }
-
-        return 'text';
-    }
-
-    /**
-     * Given a file name, this method loads its contents in, and attempts
-     * to set the language automatically. An optional lookup table can be
-     * passed for looking up the language name. If not specified a default
-     * table is used
-     *
-     * The language table is in the form
-     * <pre>array(
-     *   'lang_name' => array('extension', 'extension', ...),
-     *   'lang_name' ...
-     * );</pre>
-     *
-     * @param string The filename to load the source from
-     * @param array  A lookup array to use instead of the default one
-     * @todo Complete rethink of this and above method
-     * @since 1.0.5
-     */
-    function load_from_file($file_name, $lookup = array()) {
-        if (is_readable($file_name)) {
-            $this->set_source(file_get_contents($file_name));
-            $this->set_language($this->get_language_name_from_extension(substr(strrchr($file_name, '.'), 1), $lookup));
-        } else {
-            $this->error = GESHI_ERROR_FILE_NOT_READABLE;
-        }
-    }
-
-    /**
-     * Adds a keyword to a keyword group for highlighting
-     *
-     * @param int    The key of the keyword group to add the keyword to
-     * @param string The word to add to the keyword group
-     * @since 1.0.0
-     */
-    function add_keyword($key, $word) {
-        if (!is_array($this->language_data['KEYWORDS'][$key])) {
-            $this->language_data['KEYWORDS'][$key] = array();
-        }
-        if (!in_array($word, $this->language_data['KEYWORDS'][$key])) {
-            $this->language_data['KEYWORDS'][$key][] = $word;
-
-            //NEW in 1.0.8 don't recompile the whole optimized regexp, simply append it
-            if ($this->parse_cache_built) {
-                $subkey = count($this->language_data['CACHED_KEYWORD_LISTS'][$key]) - 1;
-                $this->language_data['CACHED_KEYWORD_LISTS'][$key][$subkey] .= '|' . preg_quote($word, '/');
-            }
-        }
-    }
-
-    /**
-     * Removes a keyword from a keyword group
-     *
-     * @param int    The key of the keyword group to remove the keyword from
-     * @param string The word to remove from the keyword group
-     * @param bool   Wether to automatically recompile the optimized regexp list or not.
-     *               Note: if you set this to false and @see GeSHi->parse_code() was already called once,
-     *               for the current language, you have to manually call @see GeSHi->optimize_keyword_group()
-     *               or the removed keyword will stay in cache and still be highlighted! On the other hand
-     *               it might be too expensive to recompile the regexp list for every removal if you want to
-     *               remove a lot of keywords.
-     * @since 1.0.0
-     */
-    function remove_keyword($key, $word, $recompile = true) {
-        $key_to_remove = array_search($word, $this->language_data['KEYWORDS'][$key]);
-        if ($key_to_remove !== false) {
-            unset($this->language_data['KEYWORDS'][$key][$key_to_remove]);
-
-            //NEW in 1.0.8, optionally recompile keyword group
-            if ($recompile && $this->parse_cache_built) {
-                $this->optimize_keyword_group($key);
-            }
-        }
-    }
-
-    /**
-     * Creates a new keyword group
-     *
-     * @param int    The key of the keyword group to create
-     * @param string The styles for the keyword group
-     * @param boolean Whether the keyword group is case sensitive ornot
-     * @param array  The words to use for the keyword group
-     * @since 1.0.0
-     */
-    function add_keyword_group($key, $styles, $case_sensitive = true, $words = array()) {
-        $words = (array) $words;
-        if  (empty($words)) {
-            // empty word lists mess up highlighting
-            return false;
-        }
-
-        //Add the new keyword group internally
-        $this->language_data['KEYWORDS'][$key] = $words;
-        $this->lexic_permissions['KEYWORDS'][$key] = true;
-        $this->language_data['CASE_SENSITIVE'][$key] = $case_sensitive;
-        $this->language_data['STYLES']['KEYWORDS'][$key] = $styles;
-
-        //NEW in 1.0.8, cache keyword regexp
-        if ($this->parse_cache_built) {
-            $this->optimize_keyword_group($key);
-        }
-    }
-
-    /**
-     * Removes a keyword group
-     *
-     * @param int    The key of the keyword group to remove
-     * @since 1.0.0
-     */
-    function remove_keyword_group ($key) {
-        //Remove the keyword group internally
-        unset($this->language_data['KEYWORDS'][$key]);
-        unset($this->lexic_permissions['KEYWORDS'][$key]);
-        unset($this->language_data['CASE_SENSITIVE'][$key]);
-        unset($this->language_data['STYLES']['KEYWORDS'][$key]);
-
-        //NEW in 1.0.8
-        unset($this->language_data['CACHED_KEYWORD_LISTS'][$key]);
-    }
-
-    /**
-     * compile optimized regexp list for keyword group
-     *
-     * @param int   The key of the keyword group to compile & optimize
-     * @since 1.0.8
-     */
-    function optimize_keyword_group($key) {
-        $this->language_data['CACHED_KEYWORD_LISTS'][$key] =
-            $this->optimize_regexp_list($this->language_data['KEYWORDS'][$key]);
-        $space_as_whitespace = false;
-        if(isset($this->language_data['PARSER_CONTROL'])) {
-            if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
-                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'])) {
-                    $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'];
-                }
-                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
-                    if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
-                        $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'];
-                    }
-                }
-            }
-        }
-        if($space_as_whitespace) {
-            foreach($this->language_data['CACHED_KEYWORD_LISTS'][$key] as $rxk => $rxv) {
-                $this->language_data['CACHED_KEYWORD_LISTS'][$key][$rxk] =
-                    str_replace(" ", "\\s+", $rxv);
-            }
-        }
-    }
-
-    /**
-     * Sets the content of the header block
-     *
-     * @param string The content of the header block
-     * @since 1.0.2
-     */
-    function set_header_content($content) {
-        $this->header_content = $content;
-    }
-
-    /**
-     * Sets the content of the footer block
-     *
-     * @param string The content of the footer block
-     * @since 1.0.2
-     */
-    function set_footer_content($content) {
-        $this->footer_content = $content;
-    }
-
-    /**
-     * Sets the style for the header content
-     *
-     * @param string The style for the header content
-     * @since 1.0.2
-     */
-    function set_header_content_style($style) {
-        $this->header_content_style = $style;
-    }
-
-    /**
-     * Sets the style for the footer content
-     *
-     * @param string The style for the footer content
-     * @since 1.0.2
-     */
-    function set_footer_content_style($style) {
-        $this->footer_content_style = $style;
-    }
-
-    /**
-     * Sets whether to force a surrounding block around
-     * the highlighted code or not
-     *
-     * @param boolean Tells whether to enable or disable this feature
-     * @since 1.0.7.20
-     */
-    function enable_inner_code_block($flag) {
-        $this->force_code_block = (bool)$flag;
-    }
-
-    /**
-     * Sets the base URL to be used for keywords
-     *
-     * @param int The key of the keyword group to set the URL for
-     * @param string The URL to set for the group. If {FNAME} is in
-     *               the url somewhere, it is replaced by the keyword
-     *               that the URL is being made for
-     * @since 1.0.2
-     */
-    function set_url_for_keyword_group($group, $url) {
-        $this->language_data['URLS'][$group] = $url;
-    }
-
-    /**
-     * Sets styles for links in code
-     *
-     * @param int A constant that specifies what state the style is being
-     *            set for - e.g. :hover or :visited
-     * @param string The styles to use for that state
-     * @since 1.0.2
-     */
-    function set_link_styles($type, $styles) {
-        $this->link_styles[$type] = $styles;
-    }
-
-    /**
-     * Sets the target for links in code
-     *
-     * @param string The target for links in the code, e.g. _blank
-     * @since 1.0.3
-     */
-    function set_link_target($target) {
-        if (!$target) {
-            $this->link_target = '';
-        } else {
-            $this->link_target = ' target="' . $target . '"';
-        }
-    }
-
-    /**
-     * Sets styles for important parts of the code
-     *
-     * @param string The styles to use on important parts of the code
-     * @since 1.0.2
-     */
-    function set_important_styles($styles) {
-        $this->important_styles = $styles;
-    }
-
-    /**
-     * Sets whether context-important blocks are highlighted
-     *
-     * @param boolean Tells whether to enable or disable highlighting of important blocks
-     * @todo REMOVE THIS SHIZ FROM GESHI!
-     * @deprecated
-     * @since 1.0.2
-     */
-    function enable_important_blocks($flag) {
-        $this->enable_important_blocks = ( $flag ) ? true : false;
-    }
-
-    /**
-     * Whether CSS IDs should be added to each line
-     *
-     * @param boolean If true, IDs will be added to each line.
-     * @since 1.0.2
-     */
-    function enable_ids($flag = true) {
-        $this->add_ids = ($flag) ? true : false;
-    }
-
-    /**
-     * Specifies which lines to highlight extra
-     *
-     * The extra style parameter was added in 1.0.7.21.
-     *
-     * @param mixed An array of line numbers to highlight, or just a line
-     *              number on its own.
-     * @param string A string specifying the style to use for this line.
-     *              If null is specified, the default style is used.
-     *              If false is specified, the line will be removed from
-     *              special highlighting
-     * @since 1.0.2
-     * @todo  Some data replication here that could be cut down on
-     */
-    function highlight_lines_extra($lines, $style = null) {
-        if (is_array($lines)) {
-            //Split up the job using single lines at a time
-            foreach ($lines as $line) {
-                $this->highlight_lines_extra($line, $style);
-            }
-        } else {
-            //Mark the line as being highlighted specially
-            $lines = intval($lines);
-            $this->highlight_extra_lines[$lines] = $lines;
-
-            //Decide on which style to use
-            if ($style === null) { //Check if we should use default style
-                unset($this->highlight_extra_lines_styles[$lines]);
-            } elseif ($style === false) { //Check if to remove this line
-                unset($this->highlight_extra_lines[$lines]);
-                unset($this->highlight_extra_lines_styles[$lines]);
-            } else {
-                $this->highlight_extra_lines_styles[$lines] = $style;
-            }
-        }
-    }
-
-    /**
-     * Sets the style for extra-highlighted lines
-     *
-     * @param string The style for extra-highlighted lines
-     * @since 1.0.2
-     */
-    function set_highlight_lines_extra_style($styles) {
-        $this->highlight_extra_lines_style = $styles;
-    }
-
-    /**
-     * Sets the line-ending
-     *
-     * @param string The new line-ending
-     * @since 1.0.2
-     */
-    function set_line_ending($line_ending) {
-        $this->line_ending = (string)$line_ending;
-    }
-
-    /**
-     * Sets what number line numbers should start at. Should
-     * be a positive integer, and will be converted to one.
-     *
-     * <b>Warning:</b> Using this method will add the "start"
-     * attribute to the &lt;ol&gt; that is used for line numbering.
-     * This is <b>not</b> valid XHTML strict, so if that's what you
-     * care about then don't use this method. Firefox is getting
-     * support for the CSS method of doing this in 1.1 and Opera
-     * has support for the CSS method, but (of course) IE doesn't
-     * so it's not worth doing it the CSS way yet.
-     *
-     * @param int The number to start line numbers at
-     * @since 1.0.2
-     */
-    function start_line_numbers_at($number) {
-        $this->line_numbers_start = abs(intval($number));
-    }
-
-    /**
-     * Sets the encoding used for htmlspecialchars(), for international
-     * support.
-     *
-     * NOTE: This is not needed for now because htmlspecialchars() is not
-     * being used (it has a security hole in PHP4 that has not been patched).
-     * Maybe in a future version it may make a return for speed reasons, but
-     * I doubt it.
-     *
-     * @param string The encoding to use for the source
-     * @since 1.0.3
-     */
-    function set_encoding($encoding) {
-        if ($encoding) {
-          $this->encoding = strtolower($encoding);
-        }
-    }
-
-    /**
-     * Turns linking of keywords on or off.
-     *
-     * @param boolean If true, links will be added to keywords
-     * @since 1.0.2
-     */
-    function enable_keyword_links($enable = true) {
-        $this->keyword_links = (bool) $enable;
-    }
-
-    /**
-     * Setup caches needed for styling. This is automatically called in
-     * parse_code() and get_stylesheet() when appropriate. This function helps
-     * stylesheet generators as they rely on some style information being
-     * preprocessed
-     *
-     * @since 1.0.8
-     * @access private
-     */
-    function build_style_cache() {
-        //Build the style cache needed to highlight numbers appropriate
-        if($this->lexic_permissions['NUMBERS']) {
-            //First check what way highlighting information for numbers are given
-            if(!isset($this->language_data['NUMBERS'])) {
-                $this->language_data['NUMBERS'] = 0;
-            }
-
-            if(is_array($this->language_data['NUMBERS'])) {
-                $this->language_data['NUMBERS_CACHE'] = $this->language_data['NUMBERS'];
-            } else {
-                $this->language_data['NUMBERS_CACHE'] = array();
-                if(!$this->language_data['NUMBERS']) {
-                    $this->language_data['NUMBERS'] =
-                        GESHI_NUMBER_INT_BASIC |
-                        GESHI_NUMBER_FLT_NONSCI;
-                }
-
-                for($i = 0, $j = $this->language_data['NUMBERS']; $j > 0; ++$i, $j>>=1) {
-                    //Rearrange style indices if required ...
-                    if(isset($this->language_data['STYLES']['NUMBERS'][1<<$i])) {
-                        $this->language_data['STYLES']['NUMBERS'][$i] =
-                            $this->language_data['STYLES']['NUMBERS'][1<<$i];
-                        unset($this->language_data['STYLES']['NUMBERS'][1<<$i]);
-                    }
-
-                    //Check if this bit is set for highlighting
-                    if($j&1) {
-                        //So this bit is set ...
-                        //Check if it belongs to group 0 or the actual stylegroup
-                        if(isset($this->language_data['STYLES']['NUMBERS'][$i])) {
-                            $this->language_data['NUMBERS_CACHE'][$i] = 1 << $i;
-                        } else {
-                            if(!isset($this->language_data['NUMBERS_CACHE'][0])) {
-                                $this->language_data['NUMBERS_CACHE'][0] = 0;
-                            }
-                            $this->language_data['NUMBERS_CACHE'][0] |= 1 << $i;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Setup caches needed for parsing. This is automatically called in parse_code() when appropriate.
-     * This function makes stylesheet generators much faster as they do not need these caches.
-     *
-     * @since 1.0.8
-     * @access private
-     */
-    function build_parse_cache() {
-        // cache symbol regexp
-        //As this is a costy operation, we avoid doing it for multiple groups ...
-        //Instead we perform it for all symbols at once.
-        //
-        //For this to work, we need to reorganize the data arrays.
-        if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) {
-            $this->language_data['MULTIPLE_SYMBOL_GROUPS'] = count($this->language_data['STYLES']['SYMBOLS']) > 1;
-
-            $this->language_data['SYMBOL_DATA'] = array();
-            $symbol_preg_multi = array(); // multi char symbols
-            $symbol_preg_single = array(); // single char symbols
-            foreach ($this->language_data['SYMBOLS'] as $key => $symbols) {
-                if (is_array($symbols)) {
-                    foreach ($symbols as $sym) {
-                        $sym = $this->hsc($sym);
-                        if (!isset($this->language_data['SYMBOL_DATA'][$sym])) {
-                            $this->language_data['SYMBOL_DATA'][$sym] = $key;
-                            if (isset($sym[1])) { // multiple chars
-                                $symbol_preg_multi[] = preg_quote($sym, '/');
-                            } else { // single char
-                                if ($sym == '-') {
-                                    // don't trigger range out of order error
-                                    $symbol_preg_single[] = '\-';
-                                } else {
-                                    $symbol_preg_single[] = preg_quote($sym, '/');
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    $symbols = $this->hsc($symbols);
-                    if (!isset($this->language_data['SYMBOL_DATA'][$symbols])) {
-                        $this->language_data['SYMBOL_DATA'][$symbols] = 0;
-                        if (isset($symbols[1])) { // multiple chars
-                            $symbol_preg_multi[] = preg_quote($symbols, '/');
-                        } elseif ($symbols == '-') {
-                            // don't trigger range out of order error
-                            $symbol_preg_single[] = '\-';
-                        } else { // single char
-                            $symbol_preg_single[] = preg_quote($symbols, '/');
-                        }
-                    }
-                }
-            }
-
-            //Now we have an array with each possible symbol as the key and the style as the actual data.
-            //This way we can set the correct style just the moment we highlight ...
-            //
-            //Now we need to rewrite our array to get a search string that
-            $symbol_preg = array();
-            if (!empty($symbol_preg_multi)) {
-                rsort($symbol_preg_multi);
-                $symbol_preg[] = implode('|', $symbol_preg_multi);
-            }
-            if (!empty($symbol_preg_single)) {
-                rsort($symbol_preg_single);
-                $symbol_preg[] = '[' . implode('', $symbol_preg_single) . ']';
-            }
-            $this->language_data['SYMBOL_SEARCH'] = implode("|", $symbol_preg);
-        }
-
-        // cache optimized regexp for keyword matching
-        // remove old cache
-        $this->language_data['CACHED_KEYWORD_LISTS'] = array();
-        foreach (array_keys($this->language_data['KEYWORDS']) as $key) {
-            if (!isset($this->lexic_permissions['KEYWORDS'][$key]) ||
-                    $this->lexic_permissions['KEYWORDS'][$key]) {
-                $this->optimize_keyword_group($key);
-            }
-        }
-
-        // brackets
-        if ($this->lexic_permissions['BRACKETS']) {
-            $this->language_data['CACHE_BRACKET_MATCH'] = array('[', ']', '(', ')', '{', '}');
-            if (!$this->use_classes && isset($this->language_data['STYLES']['BRACKETS'][0])) {
-                $this->language_data['CACHE_BRACKET_REPLACE'] = array(
-                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#91;|>',
-                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#93;|>',
-                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#40;|>',
-                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#41;|>',
-                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#123;|>',
-                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#125;|>',
-                );
-            }
-            else {
-                $this->language_data['CACHE_BRACKET_REPLACE'] = array(
-                    '<| class="br0">&#91;|>',
-                    '<| class="br0">&#93;|>',
-                    '<| class="br0">&#40;|>',
-                    '<| class="br0">&#41;|>',
-                    '<| class="br0">&#123;|>',
-                    '<| class="br0">&#125;|>',
-                );
-            }
-        }
-
-        //Build the parse cache needed to highlight numbers appropriate
-        if($this->lexic_permissions['NUMBERS']) {
-            //Check if the style rearrangements have been processed ...
-            //This also does some preprocessing to check which style groups are useable ...
-            if(!isset($this->language_data['NUMBERS_CACHE'])) {
-                $this->build_style_cache();
-            }
-
-            //Number format specification
-            //All this formats are matched case-insensitively!
-            static $numbers_format = array(
-                GESHI_NUMBER_INT_BASIC =>
-                    '(?:(?<![0-9a-z_\.%$@])|(?<=\.\.))(?<![\d\.]e[+\-])([1-9]\d*?|0)(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_INT_CSTYLE =>
-                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])([1-9]\d*?|0)l(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_BIN_SUFFIX =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])[01]+?[bB](?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_BIN_PREFIX_PERCENT =>
-                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])%[01]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_BIN_PREFIX_0B =>
-                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])0b[01]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_OCT_PREFIX =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])0[0-7]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_OCT_PREFIX_0O =>
-                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])0o[0-7]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_OCT_PREFIX_AT =>
-                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])\@[0-7]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_OCT_SUFFIX =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])[0-7]+?o(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_HEX_PREFIX =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])0x[0-9a-fA-F]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_HEX_PREFIX_DOLLAR =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\$[0-9a-fA-F]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_HEX_SUFFIX =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\d[0-9a-fA-F]*?[hH](?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_FLT_NONSCI =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\d+?\.\d+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_FLT_NONSCI_F =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])(?:\d+?(?:\.\d*?)?|\.\d+?)f(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_FLT_SCI_SHORT =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\.\d+?(?:e[+\-]?\d+?)?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
-                GESHI_NUMBER_FLT_SCI_ZERO =>
-                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])(?:\d+?(?:\.\d*?)?|\.\d+?)(?:e[+\-]?\d+?)?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)'
-                );
-
-            //At this step we have an associative array with flag groups for a
-            //specific style or an string denoting a regexp given its index.
-            $this->language_data['NUMBERS_RXCACHE'] = array();
-            foreach($this->language_data['NUMBERS_CACHE'] as $key => $rxdata) {
-                if(is_string($rxdata)) {
-                    $regexp = $rxdata;
-                } else {
-                    //This is a bitfield of number flags to highlight:
-                    //Build an array, implode them together and make this the actual RX
-                    $rxuse = array();
-                    for($i = 1; $i <= $rxdata; $i<<=1) {
-                        if($rxdata & $i) {
-                            $rxuse[] = $numbers_format[$i];
-                        }
-                    }
-                    $regexp = implode("|", $rxuse);
-                }
-
-                $this->language_data['NUMBERS_RXCACHE'][$key] =
-                    "/(?<!<\|\/)(?<!<\|!REG3XP)(?<!<\|\/NUM!)(?<!\d\/>)($regexp)(?!(?:<DOT>|(?>[^\<]))+>)(?![^<]*>)(?!\|>)(?!\/>)/i"; //
-            }
-
-            if(!isset($this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'])) {
-                $this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'] = '#\d#';
-            }
-        }
-
-        $this->parse_cache_built = true;
-    }
-
-    /**
-     * Returns the code in $this->source, highlighted and surrounded by the
-     * nessecary HTML.
-     *
-     * This should only be called ONCE, cos it's SLOW! If you want to highlight
-     * the same source multiple times, you're better off doing a whole lot of
-     * str_replaces to replace the &lt;span&gt;s
-     *
-     * @since 1.0.0
-     */
-    function parse_code () {
-        // Start the timer
-        $start_time = microtime();
-
-        // Replace all newlines to a common form.
-        $code = str_replace("\r\n", "\n", $this->source);
-        $code = str_replace("\r", "\n", $code);
-
-        // Firstly, if there is an error, we won't highlight
-        if ($this->error) {
-            //Escape the source for output
-            $result = $this->hsc($this->source);
-
-            //This fix is related to SF#1923020, but has to be applied regardless of
-            //actually highlighting symbols.
-            $result = str_replace(array('<SEMI>', '<PIPE>'), array(';', '|'), $result);
-
-            // Timing is irrelevant
-            $this->set_time($start_time, $start_time);
-            $this->finalise($result);
-            return $result;
-        }
-
-        // make sure the parse cache is up2date
-        if (!$this->parse_cache_built) {
-            $this->build_parse_cache();
-        }
-
-        // Initialise various stuff
-        $length           = strlen($code);
-        $COMMENT_MATCHED  = false;
-        $stuff_to_parse   = '';
-        $endresult        = '';
-
-        // "Important" selections are handled like multiline comments
-        // @todo GET RID OF THIS SHIZ
-        if ($this->enable_important_blocks) {
-            $this->language_data['COMMENT_MULTI'][GESHI_START_IMPORTANT] = GESHI_END_IMPORTANT;
-        }
-
-        if ($this->strict_mode) {
-            // Break the source into bits. Each bit will be a portion of the code
-            // within script delimiters - for example, HTML between < and >
-            $k = 0;
-            $parts = array();
-            $matches = array();
-            $next_match_pointer = null;
-            // we use a copy to unset delimiters on demand (when they are not found)
-            $delim_copy = $this->language_data['SCRIPT_DELIMITERS'];
-            $i = 0;
-            while ($i < $length) {
-                $next_match_pos = $length + 1; // never true
-                foreach ($delim_copy as $dk => $delimiters) {
-                    if(is_array($delimiters)) {
-                        foreach ($delimiters as $open => $close) {
-                            // make sure the cache is setup properly
-                            if (!isset($matches[$dk][$open])) {
-                                $matches[$dk][$open] = array(
-                                    'next_match' => -1,
-                                    'dk' => $dk,
-
-                                    'open' => $open, // needed for grouping of adjacent code blocks (see below)
-                                    'open_strlen' => strlen($open),
-
-                                    'close' => $close,
-                                    'close_strlen' => strlen($close),
-                                );
-                            }
-                            // Get the next little bit for this opening string
-                            if ($matches[$dk][$open]['next_match'] < $i) {
-                                // only find the next pos if it was not already cached
-                                $open_pos = strpos($code, $open, $i);
-                                if ($open_pos === false) {
-                                    // no match for this delimiter ever
-                                    unset($delim_copy[$dk][$open]);
-                                    continue;
-                                }
-                                $matches[$dk][$open]['next_match'] = $open_pos;
-                            }
-                            if ($matches[$dk][$open]['next_match'] < $next_match_pos) {
-                                //So we got a new match, update the close_pos
-                                $matches[$dk][$open]['close_pos'] =
-                                    strpos($code, $close, $matches[$dk][$open]['next_match']+1);
-
-                                $next_match_pointer =& $matches[$dk][$open];
-                                $next_match_pos = $matches[$dk][$open]['next_match'];
-                            }
-                        }
-                    } else {
-                        //So we should match an RegExp as Strict Block ...
-                        /**
-                         * The value in $delimiters is expected to be an RegExp
-                         * containing exactly 2 matching groups:
-                         *  - Group 1 is the opener
-                         *  - Group 2 is the closer
-                         */
-                        if(!GESHI_PHP_PRE_433 && //Needs proper rewrite to work with PHP >=4.3.0; 4.3.3 is guaranteed to work.
-                            preg_match($delimiters, $code, $matches_rx, PREG_OFFSET_CAPTURE, $i)) {
-                            //We got a match ...
-                            if(isset($matches_rx['start']) && isset($matches_rx['end']))
-                            {
-                                $matches[$dk] = array(
-                                    'next_match' => $matches_rx['start'][1],
-                                    'dk' => $dk,
-
-                                    'close_strlen' => strlen($matches_rx['end'][0]),
-                                    'close_pos' => $matches_rx['end'][1],
-                                    );
-                            } else {
-                                $matches[$dk] = array(
-                                    'next_match' => $matches_rx[1][1],
-                                    'dk' => $dk,
-
-                                    'close_strlen' => strlen($matches_rx[2][0]),
-                                    'close_pos' => $matches_rx[2][1],
-                                    );
-                            }
-                        } else {
-                            // no match for this delimiter ever
-                            unset($delim_copy[$dk]);
-                            continue;
-                        }
-
-                        if ($matches[$dk]['next_match'] <= $next_match_pos) {
-                            $next_match_pointer =& $matches[$dk];
-                            $next_match_pos = $matches[$dk]['next_match'];
-                        }
-                    }
-                }
-
-                // non-highlightable text
-                $parts[$k] = array(
-                    1 => substr($code, $i, $next_match_pos - $i)
-                );
-                ++$k;
-
-                if ($next_match_pos > $length) {
-                    // out of bounds means no next match was found
-                    break;
-                }
-
-                // highlightable code
-                $parts[$k][0] = $next_match_pointer['dk'];
-
-                //Only combine for non-rx script blocks
-                if(is_array($delim_copy[$next_match_pointer['dk']])) {
-                    // group adjacent script blocks, e.g. <foobar><asdf> should be one block, not three!
-                    $i = $next_match_pos + $next_match_pointer['open_strlen'];
-                    while (true) {
-                        $close_pos = strpos($code, $next_match_pointer['close'], $i);
-                        if ($close_pos == false) {
-                            break;
-                        }
-                        $i = $close_pos + $next_match_pointer['close_strlen'];
-                        if ($i == $length) {
-                            break;
-                        }
-                        if ($code[$i] == $next_match_pointer['open'][0] && ($next_match_pointer['open_strlen'] == 1 ||
-                            substr($code, $i, $next_match_pointer['open_strlen']) == $next_match_pointer['open'])) {
-                            // merge adjacent but make sure we don't merge things like <tag><!-- comment -->
-                            foreach ($matches as $submatches) {
-                                foreach ($submatches as $match) {
-                                    if ($match['next_match'] == $i) {
-                                        // a different block already matches here!
-                                        break 3;
-                                    }
-                                }
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                } else {
-                    $close_pos = $next_match_pointer['close_pos'] + $next_match_pointer['close_strlen'];
-                    $i = $close_pos;
-                }
-
-                if ($close_pos === false) {
-                    // no closing delimiter found!
-                    $parts[$k][1] = substr($code, $next_match_pos);
-                    ++$k;
-                    break;
-                } else {
-                    $parts[$k][1] = substr($code, $next_match_pos, $i - $next_match_pos);
-                    ++$k;
-                }
-            }
-            unset($delim_copy, $next_match_pointer, $next_match_pos, $matches);
-            $num_parts = $k;
-
-            if ($num_parts == 1 && $this->strict_mode == GESHI_MAYBE) {
-                // when we have only one part, we don't have anything to highlight at all.
-                // if we have a "maybe" strict language, this should be handled as highlightable code
-                $parts = array(
-                    0 => array(
-                        0 => '',
-                        1 => ''
-                    ),
-                    1 => array(
-                        0 => null,
-                        1 => $parts[0][1]
-                    )
-                );
-                $num_parts = 2;
-            }
-
-        } else {
-            // Not strict mode - simply dump the source into
-            // the array at index 1 (the first highlightable block)
-            $parts = array(
-                0 => array(
-                    0 => '',
-                    1 => ''
-                ),
-                1 => array(
-                    0 => null,
-                    1 => $code
-                )
-            );
-            $num_parts = 2;
-        }
-
-        //Unset variables we won't need any longer
-        unset($code);
-
-        //Preload some repeatedly used values regarding hardquotes ...
-        $hq = isset($this->language_data['HARDQUOTE']) ? $this->language_data['HARDQUOTE'][0] : false;
-        $hq_strlen = strlen($hq);
-
-        //Preload if line numbers are to be generated afterwards
-        //Added a check if line breaks should be forced even without line numbers, fixes SF#1727398
-        $check_linenumbers = $this->line_numbers != GESHI_NO_LINE_NUMBERS ||
-            !empty($this->highlight_extra_lines) || !$this->allow_multiline_span;
-
-        //preload the escape char for faster checking ...
-        $escaped_escape_char = $this->hsc($this->language_data['ESCAPE_CHAR']);
-
-        // this is used for single-line comments
-        $sc_disallowed_before = "";
-        $sc_disallowed_after = "";
-
-        if (isset($this->language_data['PARSER_CONTROL'])) {
-            if (isset($this->language_data['PARSER_CONTROL']['COMMENTS'])) {
-                if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE'])) {
-                    $sc_disallowed_before = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE'];
-                }
-                if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER'])) {
-                    $sc_disallowed_after = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER'];
-                }
-            }
-        }
-
-        //Fix for SF#1932083: Multichar Quotemarks unsupported
-        $is_string_starter = array();
-        if ($this->lexic_permissions['STRINGS']) {
-            foreach ($this->language_data['QUOTEMARKS'] as $quotemark) {
-                if (!isset($is_string_starter[$quotemark[0]])) {
-                    $is_string_starter[$quotemark[0]] = (string)$quotemark;
-                } elseif (is_string($is_string_starter[$quotemark[0]])) {
-                    $is_string_starter[$quotemark[0]] = array(
-                        $is_string_starter[$quotemark[0]],
-                        $quotemark);
-                } else {
-                    $is_string_starter[$quotemark[0]][] = $quotemark;
-                }
-            }
-        }
-
-        // Now we go through each part. We know that even-indexed parts are
-        // code that shouldn't be highlighted, and odd-indexed parts should
-        // be highlighted
-        for ($key = 0; $key < $num_parts; ++$key) {
-            $STRICTATTRS = '';
-
-            // If this block should be highlighted...
-            if (!($key & 1)) {
-                // Else not a block to highlight
-                $endresult .= $this->hsc($parts[$key][1]);
-                unset($parts[$key]);
-                continue;
-            }
-
-            $result = '';
-            $part = $parts[$key][1];
-
-            $highlight_part = true;
-            if ($this->strict_mode && !is_null($parts[$key][0])) {
-                // get the class key for this block of code
-                $script_key = $parts[$key][0];
-                $highlight_part = $this->language_data['HIGHLIGHT_STRICT_BLOCK'][$script_key];
-                if ($this->language_data['STYLES']['SCRIPT'][$script_key] != '' &&
-                    $this->lexic_permissions['SCRIPT']) {
-                    // Add a span element around the source to
-                    // highlight the overall source block
-                    if (!$this->use_classes &&
-                        $this->language_data['STYLES']['SCRIPT'][$script_key] != '') {
-                        $attributes = ' style="' . $this->language_data['STYLES']['SCRIPT'][$script_key] . '"';
-                    } else {
-                        $attributes = ' class="sc' . $script_key . '"';
-                    }
-                    $result .= "<span$attributes>";
-                    $STRICTATTRS = $attributes;
-                }
-            }
-
-            if ($highlight_part) {
-                // Now, highlight the code in this block. This code
-                // is really the engine of GeSHi (along with the method
-                // parse_non_string_part).
-
-                // cache comment regexps incrementally
-                $next_comment_regexp_key = '';
-                $next_comment_regexp_pos = -1;
-                $next_comment_multi_pos = -1;
-                $next_comment_single_pos = -1;
-                $comment_regexp_cache_per_key = array();
-                $comment_multi_cache_per_key = array();
-                $comment_single_cache_per_key = array();
-                $next_open_comment_multi = '';
-                $next_comment_single_key = '';
-                $escape_regexp_cache_per_key = array();
-                $next_escape_regexp_key = '';
-                $next_escape_regexp_pos = -1;
-
-                $length = strlen($part);
-                for ($i = 0; $i < $length; ++$i) {
-                    // Get the next char
-                    $char = $part[$i];
-                    $char_len = 1;
-
-                    // update regexp comment cache if needed
-                    if (isset($this->language_data['COMMENT_REGEXP']) && $next_comment_regexp_pos < $i) {
-                        $next_comment_regexp_pos = $length;
-                        foreach ($this->language_data['COMMENT_REGEXP'] as $comment_key => $regexp) {
-                            $match_i = false;
-                            if (isset($comment_regexp_cache_per_key[$comment_key]) &&
-                                ($comment_regexp_cache_per_key[$comment_key]['pos'] >= $i ||
-                                 $comment_regexp_cache_per_key[$comment_key]['pos'] === false)) {
-                                // we have already matched something
-                                if ($comment_regexp_cache_per_key[$comment_key]['pos'] === false) {
-                                    // this comment is never matched
-                                    continue;
-                                }
-                                $match_i = $comment_regexp_cache_per_key[$comment_key]['pos'];
-                            } elseif (
-                                //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
-                                (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $i), $match, PREG_OFFSET_CAPTURE)) ||
-                                (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $i))
-                                ) {
-                                $match_i = $match[0][1];
-                                if (GESHI_PHP_PRE_433) {
-                                    $match_i += $i;
-                                }
-
-                                $comment_regexp_cache_per_key[$comment_key] = array(
-                                    'key' => $comment_key,
-                                    'length' => strlen($match[0][0]),
-                                    'pos' => $match_i
-                                );
-                            } else {
-                                $comment_regexp_cache_per_key[$comment_key]['pos'] = false;
-                                continue;
-                            }
-
-                            if ($match_i !== false && $match_i < $next_comment_regexp_pos) {
-                                $next_comment_regexp_pos = $match_i;
-                                $next_comment_regexp_key = $comment_key;
-                                if ($match_i === $i) {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    $string_started = false;
-
-                    if (isset($is_string_starter[$char])) {
-                        // Possibly the start of a new string ...
-
-                        //Check which starter it was ...
-                        //Fix for SF#1932083: Multichar Quotemarks unsupported
-                        if (is_array($is_string_starter[$char])) {
-                            $char_new = '';
-                            foreach ($is_string_starter[$char] as $testchar) {
-                                if ($testchar === substr($part, $i, strlen($testchar)) &&
-                                    strlen($testchar) > strlen($char_new)) {
-                                    $char_new = $testchar;
-                                    $string_started = true;
-                                }
-                            }
-                            if ($string_started) {
-                                $char = $char_new;
-                            }
-                        } else {
-                            $testchar = $is_string_starter[$char];
-                            if ($testchar === substr($part, $i, strlen($testchar))) {
-                                $char = $testchar;
-                                $string_started = true;
-                            }
-                        }
-                        $char_len = strlen($char);
-                    }
-
-                    if ($string_started && ($i != $next_comment_regexp_pos)) {
-                        // Hand out the correct style information for this string
-                        $string_key = array_search($char, $this->language_data['QUOTEMARKS']);
-                        if (!isset($this->language_data['STYLES']['STRINGS'][$string_key]) ||
-                            !isset($this->language_data['STYLES']['ESCAPE_CHAR'][$string_key])) {
-                            $string_key = 0;
-                        }
-
-                        // parse the stuff before this
-                        $result .= $this->parse_non_string_part($stuff_to_parse);
-                        $stuff_to_parse = '';
-
-                        if (!$this->use_classes) {
-                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][$string_key] . '"';
-                        } else {
-                            $string_attributes = ' class="st'.$string_key.'"';
-                        }
-
-                        // now handle the string
-                        $string = "<span$string_attributes>" . GeSHi::hsc($char);
-                        $start = $i + $char_len;
-                        $string_open = true;
-
-                        if(empty($this->language_data['ESCAPE_REGEXP'])) {
-                            $next_escape_regexp_pos = $length;
-                        }
-
-                        do {
-                            //Get the regular ending pos ...
-                            $close_pos = strpos($part, $char, $start);
-                            if(false === $close_pos) {
-                                $close_pos = $length;
-                            }
-
-                            if($this->lexic_permissions['ESCAPE_CHAR']) {
-                                // update escape regexp cache if needed
-                                if (isset($this->language_data['ESCAPE_REGEXP']) && $next_escape_regexp_pos < $start) {
-                                    $next_escape_regexp_pos = $length;
-                                    foreach ($this->language_data['ESCAPE_REGEXP'] as $escape_key => $regexp) {
-                                        $match_i = false;
-                                        if (isset($escape_regexp_cache_per_key[$escape_key]) &&
-                                            ($escape_regexp_cache_per_key[$escape_key]['pos'] >= $start ||
-                                             $escape_regexp_cache_per_key[$escape_key]['pos'] === false)) {
-                                            // we have already matched something
-                                            if ($escape_regexp_cache_per_key[$escape_key]['pos'] === false) {
-                                                // this comment is never matched
-                                                continue;
-                                            }
-                                            $match_i = $escape_regexp_cache_per_key[$escape_key]['pos'];
-                                        } elseif (
-                                            //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
-                                            (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $start), $match, PREG_OFFSET_CAPTURE)) ||
-                                            (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $start))
-                                            ) {
-                                            $match_i = $match[0][1];
-                                            if (GESHI_PHP_PRE_433) {
-                                                $match_i += $start;
-                                            }
-
-                                            $escape_regexp_cache_per_key[$escape_key] = array(
-                                                'key' => $escape_key,
-                                                'length' => strlen($match[0][0]),
-                                                'pos' => $match_i
-                                            );
-                                        } else {
-                                            $escape_regexp_cache_per_key[$escape_key]['pos'] = false;
-                                            continue;
-                                        }
-
-                                        if ($match_i !== false && $match_i < $next_escape_regexp_pos) {
-                                            $next_escape_regexp_pos = $match_i;
-                                            $next_escape_regexp_key = $escape_key;
-                                            if ($match_i === $start) {
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-
-                                //Find the next simple escape position
-                                if('' != $this->language_data['ESCAPE_CHAR']) {
-                                    $simple_escape = strpos($part, $this->language_data['ESCAPE_CHAR'], $start);
-                                    if(false === $simple_escape) {
-                                        $simple_escape = $length;
-                                    }
-                                } else {
-                                    $simple_escape = $length;
-                                }
-                            } else {
-                                $next_escape_regexp_pos = $length;
-                                $simple_escape = $length;
-                            }
-
-                            if($simple_escape < $next_escape_regexp_pos &&
-                                $simple_escape < $length &&
-                                $simple_escape < $close_pos) {
-                                //The nexxt escape sequence is a simple one ...
-                                $es_pos = $simple_escape;
-
-                                //Add the stuff not in the string yet ...
-                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
-
-                                //Get the style for this escaped char ...
-                                if (!$this->use_classes) {
-                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][0] . '"';
-                                } else {
-                                    $escape_char_attributes = ' class="es0"';
-                                }
-
-                                //Add the style for the escape char ...
-                                $string .= "<span$escape_char_attributes>" .
-                                    GeSHi::hsc($this->language_data['ESCAPE_CHAR']);
-
-                                //Get the byte AFTER the ESCAPE_CHAR we just found
-                                $es_char = $part[$es_pos + 1];
-                                if ($es_char == "\n") {
-                                    // don't put a newline around newlines
-                                    $string .= "</span>\n";
-                                    $start = $es_pos + 2;
-                                } elseif (ord($es_char) >= 128) {
-                                    //This is an non-ASCII char (UTF8 or single byte)
-                                    //This code tries to work around SF#2037598 ...
-                                    if(function_exists('mb_substr')) {
-                                        $es_char_m = mb_substr(substr($part, $es_pos+1, 16), 0, 1, $this->encoding);
-                                        $string .= $es_char_m . '</span>';
-                                    } elseif (!GESHI_PHP_PRE_433 && 'utf-8' == $this->encoding) {
-                                        if(preg_match("/[\xC2-\xDF][\x80-\xBF]".
-                                            "|\xE0[\xA0-\xBF][\x80-\xBF]".
-                                            "|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}".
-                                            "|\xED[\x80-\x9F][\x80-\xBF]".
-                                            "|\xF0[\x90-\xBF][\x80-\xBF]{2}".
-                                            "|[\xF1-\xF3][\x80-\xBF]{3}".
-                                            "|\xF4[\x80-\x8F][\x80-\xBF]{2}/s",
-                                            $part, $es_char_m, null, $es_pos + 1)) {
-                                            $es_char_m = $es_char_m[0];
-                                        } else {
-                                            $es_char_m = $es_char;
-                                        }
-                                        $string .= $this->hsc($es_char_m) . '</span>';
-                                    } else {
-                                        $es_char_m = $this->hsc($es_char);
-                                    }
-                                    $start = $es_pos + strlen($es_char_m) + 1;
-                                } else {
-                                    $string .= $this->hsc($es_char) . '</span>';
-                                    $start = $es_pos + 2;
-                                }
-                            } elseif ($next_escape_regexp_pos < $length &&
-                                $next_escape_regexp_pos < $close_pos) {
-                                $es_pos = $next_escape_regexp_pos;
-                                //Add the stuff not in the string yet ...
-                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
-
-                                //Get the key and length of this match ...
-                                $escape = $escape_regexp_cache_per_key[$next_escape_regexp_key];
-                                $escape_str = substr($part, $es_pos, $escape['length']);
-                                $escape_key = $escape['key'];
-
-                                //Get the style for this escaped char ...
-                                if (!$this->use_classes) {
-                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][$escape_key] . '"';
-                                } else {
-                                    $escape_char_attributes = ' class="es' . $escape_key . '"';
-                                }
-
-                                //Add the style for the escape char ...
-                                $string .= "<span$escape_char_attributes>" .
-                                    $this->hsc($escape_str) . '</span>';
-
-                                $start = $es_pos + $escape['length'];
-                            } else {
-                                //Copy the remainder of the string ...
-                                $string .= $this->hsc(substr($part, $start, $close_pos - $start + $char_len)) . '</span>';
-                                $start = $close_pos + $char_len;
-                                $string_open = false;
-                            }
-                        } while($string_open);
-
-                        if ($check_linenumbers) {
-                            // Are line numbers used? If, we should end the string before
-                            // the newline and begin it again (so when <li>s are put in the source
-                            // remains XHTML compliant)
-                            // note to self: This opens up possibility of config files specifying
-                            // that languages can/cannot have multiline strings???
-                            $string = str_replace("\n", "</span>\n<span$string_attributes>", $string);
-                        }
-
-                        $result .= $string;
-                        $string = '';
-                        $i = $start - 1;
-                        continue;
-                    } elseif ($this->lexic_permissions['STRINGS'] && $hq && $hq[0] == $char &&
-                        substr($part, $i, $hq_strlen) == $hq && ($i != $next_comment_regexp_pos)) {
-                        // The start of a hard quoted string
-                        if (!$this->use_classes) {
-                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS']['HARD'] . '"';
-                            $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR']['HARD'] . '"';
-                        } else {
-                            $string_attributes = ' class="st_h"';
-                            $escape_char_attributes = ' class="es_h"';
-                        }
-                        // parse the stuff before this
-                        $result .= $this->parse_non_string_part($stuff_to_parse);
-                        $stuff_to_parse = '';
-
-                        // now handle the string
-                        $string = '';
-
-                        // look for closing quote
-                        $start = $i + $hq_strlen;
-                        while ($close_pos = strpos($part, $this->language_data['HARDQUOTE'][1], $start)) {
-                            $start = $close_pos + 1;
-                            if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['HARDCHAR'] &&
-                                (($i + $hq_strlen) != ($close_pos))) { //Support empty string for HQ escapes if Starter = Escape
-                                // make sure this quote is not escaped
-                                foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
-                                    if (substr($part, $close_pos - 1, strlen($hardescape)) == $hardescape) {
-                                        // check wether this quote is escaped or if it is something like '\\'
-                                        $escape_char_pos = $close_pos - 1;
-                                        while ($escape_char_pos > 0
-                                                && $part[$escape_char_pos - 1] == $this->language_data['HARDCHAR']) {
-                                            --$escape_char_pos;
-                                        }
-                                        if (($close_pos - $escape_char_pos) & 1) {
-                                            // uneven number of escape chars => this quote is escaped
-                                            continue 2;
-                                        }
-                                    }
-                                }
-                            }
-
-                            // found closing quote
-                            break;
-                        }
-
-                        //Found the closing delimiter?
-                        if (!$close_pos) {
-                            // span till the end of this $part when no closing delimiter is found
-                            $close_pos = $length;
-                        }
-
-                        //Get the actual string
-                        $string = substr($part, $i, $close_pos - $i + 1);
-                        $i = $close_pos;
-
-                        // handle escape chars and encode html chars
-                        // (special because when we have escape chars within our string they may not be escaped)
-                        if ($this->lexic_permissions['ESCAPE_CHAR'] && $this->language_data['ESCAPE_CHAR']) {
-                            $start = 0;
-                            $new_string = '';
-                            while ($es_pos = strpos($string, $this->language_data['ESCAPE_CHAR'], $start)) {
-                                // hmtl escape stuff before
-                                $new_string .= $this->hsc(substr($string, $start, $es_pos - $start));
-                                // check if this is a hard escape
-                                foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
-                                    if (substr($string, $es_pos, strlen($hardescape)) == $hardescape) {
-                                        // indeed, this is a hardescape
-                                        $new_string .= "<span$escape_char_attributes>" .
-                                            $this->hsc($hardescape) . '</span>';
-                                        $start = $es_pos + strlen($hardescape);
-                                        continue 2;
-                                    }
-                                }
-                                // not a hard escape, but a normal escape
-                                // they come in pairs of two
-                                $c = 0;
-                                while (isset($string[$es_pos + $c]) && isset($string[$es_pos + $c + 1])
-                                    && $string[$es_pos + $c] == $this->language_data['ESCAPE_CHAR']
-                                    && $string[$es_pos + $c + 1] == $this->language_data['ESCAPE_CHAR']) {
-                                    $c += 2;
-                                }
-                                if ($c) {
-                                    $new_string .= "<span$escape_char_attributes>" .
-                                        str_repeat($escaped_escape_char, $c) .
-                                        '</span>';
-                                    $start = $es_pos + $c;
-                                } else {
-                                    // this is just a single lonely escape char...
-                                    $new_string .= $escaped_escape_char;
-                                    $start = $es_pos + 1;
-                                }
-                            }
-                            $string = $new_string . $this->hsc(substr($string, $start));
-                        } else {
-                            $string = $this->hsc($string);
-                        }
-
-                        if ($check_linenumbers) {
-                            // Are line numbers used? If, we should end the string before
-                            // the newline and begin it again (so when <li>s are put in the source
-                            // remains XHTML compliant)
-                            // note to self: This opens up possibility of config files specifying
-                            // that languages can/cannot have multiline strings???
-                            $string = str_replace("\n", "</span>\n<span$string_attributes>", $string);
-                        }
-
-                        $result .= "<span$string_attributes>" . $string . '</span>';
-                        $string = '';
-                        continue;
-                    } else {
-                        //Have a look for regexp comments
-                        if ($i == $next_comment_regexp_pos) {
-                            $COMMENT_MATCHED = true;
-                            $comment = $comment_regexp_cache_per_key[$next_comment_regexp_key];
-                            $test_str = $this->hsc(substr($part, $i, $comment['length']));
-
-                            //@todo If remove important do remove here
-                            if ($this->lexic_permissions['COMMENTS']['MULTI']) {
-                                if (!$this->use_classes) {
-                                    $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment['key']] . '"';
-                                } else {
-                                    $attributes = ' class="co' . $comment['key'] . '"';
-                                }
-
-                                $test_str = "<span$attributes>" . $test_str . "</span>";
-
-                                // Short-cut through all the multiline code
-                                if ($check_linenumbers) {
-                                    // strreplace to put close span and open span around multiline newlines
-                                    $test_str = str_replace(
-                                        "\n", "</span>\n<span$attributes>",
-                                        str_replace("\n ", "\n&nbsp;", $test_str)
-                                    );
-                                }
-                            }
-
-                            $i += $comment['length'] - 1;
-
-                            // parse the rest
-                            $result .= $this->parse_non_string_part($stuff_to_parse);
-                            $stuff_to_parse = '';
-                        }
-
-                        // If we haven't matched a regexp comment, try multi-line comments
-                        if (!$COMMENT_MATCHED) {
-                            // Is this a multiline comment?
-                            if (!empty($this->language_data['COMMENT_MULTI']) && $next_comment_multi_pos < $i) {
-                                $next_comment_multi_pos = $length;
-                                foreach ($this->language_data['COMMENT_MULTI'] as $open => $close) {
-                                    $match_i = false;
-                                    if (isset($comment_multi_cache_per_key[$open]) &&
-                                        ($comment_multi_cache_per_key[$open] >= $i ||
-                                         $comment_multi_cache_per_key[$open] === false)) {
-                                        // we have already matched something
-                                        if ($comment_multi_cache_per_key[$open] === false) {
-                                            // this comment is never matched
-                                            continue;
-                                        }
-                                        $match_i = $comment_multi_cache_per_key[$open];
-                                    } elseif (($match_i = stripos($part, $open, $i)) !== false) {
-                                        $comment_multi_cache_per_key[$open] = $match_i;
-                                    } else {
-                                        $comment_multi_cache_per_key[$open] = false;
-                                        continue;
-                                    }
-                                    if ($match_i !== false && $match_i < $next_comment_multi_pos) {
-                                        $next_comment_multi_pos = $match_i;
-                                        $next_open_comment_multi = $open;
-                                        if ($match_i === $i) {
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                            if ($i == $next_comment_multi_pos) {
-                                $open = $next_open_comment_multi;
-                                $close = $this->language_data['COMMENT_MULTI'][$open];
-                                $open_strlen = strlen($open);
-                                $close_strlen = strlen($close);
-                                $COMMENT_MATCHED = true;
-                                $test_str_match = $open;
-                                //@todo If remove important do remove here
-                                if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
-                                    $open == GESHI_START_IMPORTANT) {
-                                    if ($open != GESHI_START_IMPORTANT) {
-                                        if (!$this->use_classes) {
-                                            $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS']['MULTI'] . '"';
-                                        } else {
-                                            $attributes = ' class="coMULTI"';
-                                        }
-                                        $test_str = "<span$attributes>" . $this->hsc($open);
-                                    } else {
-                                        if (!$this->use_classes) {
-                                            $attributes = ' style="' . $this->important_styles . '"';
-                                        } else {
-                                            $attributes = ' class="imp"';
-                                        }
-
-                                        // We don't include the start of the comment if it's an
-                                        // "important" part
-                                        $test_str = "<span$attributes>";
-                                    }
-                                } else {
-                                    $test_str = $this->hsc($open);
-                                }
-
-                                $close_pos = strpos( $part, $close, $i + $open_strlen );
-
-                                if ($close_pos === false) {
-                                    $close_pos = $length;
-                                }
-
-                                // Short-cut through all the multiline code
-                                $rest_of_comment = $this->hsc(substr($part, $i + $open_strlen, $close_pos - $i - $open_strlen + $close_strlen));
-                                if (($this->lexic_permissions['COMMENTS']['MULTI'] ||
-                                    $test_str_match == GESHI_START_IMPORTANT) &&
-                                    $check_linenumbers) {
-
-                                    // strreplace to put close span and open span around multiline newlines
-                                    $test_str .= str_replace(
-                                        "\n", "</span>\n<span$attributes>",
-                                        str_replace("\n ", "\n&nbsp;", $rest_of_comment)
-                                    );
-                                } else {
-                                    $test_str .= $rest_of_comment;
-                                }
-
-                                if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
-                                    $test_str_match == GESHI_START_IMPORTANT) {
-                                    $test_str .= '</span>';
-                                }
-
-                                $i = $close_pos + $close_strlen - 1;
-
-                                // parse the rest
-                                $result .= $this->parse_non_string_part($stuff_to_parse);
-                                $stuff_to_parse = '';
-                            }
-                        }
-
-                        // If we haven't matched a multiline comment, try single-line comments
-                        if (!$COMMENT_MATCHED) {
-                            // cache potential single line comment occurances
-                            if (!empty($this->language_data['COMMENT_SINGLE']) && $next_comment_single_pos < $i) {
-                                $next_comment_single_pos = $length;
-                                foreach ($this->language_data['COMMENT_SINGLE'] as $comment_key => $comment_mark) {
-                                    $match_i = false;
-                                    if (isset($comment_single_cache_per_key[$comment_key]) &&
-                                        ($comment_single_cache_per_key[$comment_key] >= $i ||
-                                         $comment_single_cache_per_key[$comment_key] === false)) {
-                                        // we have already matched something
-                                        if ($comment_single_cache_per_key[$comment_key] === false) {
-                                            // this comment is never matched
-                                            continue;
-                                        }
-                                        $match_i = $comment_single_cache_per_key[$comment_key];
-                                    } elseif (
-                                        // case sensitive comments
-                                        ($this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] &&
-                                        ($match_i = stripos($part, $comment_mark, $i)) !== false) ||
-                                        // non case sensitive
-                                        (!$this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] &&
-                                          (($match_i = strpos($part, $comment_mark, $i)) !== false))) {
-                                        $comment_single_cache_per_key[$comment_key] = $match_i;
-                                    } else {
-                                        $comment_single_cache_per_key[$comment_key] = false;
-                                        continue;
-                                    }
-                                    if ($match_i !== false && $match_i < $next_comment_single_pos) {
-                                        $next_comment_single_pos = $match_i;
-                                        $next_comment_single_key = $comment_key;
-                                        if ($match_i === $i) {
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                            if ($next_comment_single_pos == $i) {
-                                $comment_key = $next_comment_single_key;
-                                $comment_mark = $this->language_data['COMMENT_SINGLE'][$comment_key];
-                                $com_len = strlen($comment_mark);
-
-                                // This check will find special variables like $# in bash
-                                // or compiler directives of Delphi beginning {$
-                                if ((empty($sc_disallowed_before) || ($i == 0) ||
-                                    (false === strpos($sc_disallowed_before, $part[$i-1]))) &&
-                                    (empty($sc_disallowed_after) || ($length <= $i + $com_len) ||
-                                    (false === strpos($sc_disallowed_after, $part[$i + $com_len]))))
-                                {
-                                    // this is a valid comment
-                                    $COMMENT_MATCHED = true;
-                                    if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
-                                        if (!$this->use_classes) {
-                                            $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment_key] . '"';
-                                        } else {
-                                            $attributes = ' class="co' . $comment_key . '"';
-                                        }
-                                        $test_str = "<span$attributes>" . $this->hsc($this->change_case($comment_mark));
-                                    } else {
-                                        $test_str = $this->hsc($comment_mark);
-                                    }
-
-                                    //Check if this comment is the last in the source
-                                    $close_pos = strpos($part, "\n", $i);
-                                    $oops = false;
-                                    if ($close_pos === false) {
-                                        $close_pos = $length;
-                                        $oops = true;
-                                    }
-                                    $test_str .= $this->hsc(substr($part, $i + $com_len, $close_pos - $i - $com_len));
-                                    if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
-                                        $test_str .= "</span>";
-                                    }
-
-                                    // Take into account that the comment might be the last in the source
-                                    if (!$oops) {
-                                      $test_str .= "\n";
-                                    }
-
-                                    $i = $close_pos;
-
-                                    // parse the rest
-                                    $result .= $this->parse_non_string_part($stuff_to_parse);
-                                    $stuff_to_parse = '';
-                                }
-                            }
-                        }
-                    }
-
-                    // Where are we adding this char?
-                    if (!$COMMENT_MATCHED) {
-                        $stuff_to_parse .= $char;
-                    } else {
-                        $result .= $test_str;
-                        unset($test_str);
-                        $COMMENT_MATCHED = false;
-                    }
-                }
-                // Parse the last bit
-                $result .= $this->parse_non_string_part($stuff_to_parse);
-                $stuff_to_parse = '';
-            } else {
-                $result .= $this->hsc($part);
-            }
-            // Close the <span> that surrounds the block
-            if ($STRICTATTRS != '') {
-                $result = str_replace("\n", "</span>\n<span$STRICTATTRS>", $result);
-                $result .= '</span>';
-            }
-
-            $endresult .= $result;
-            unset($part, $parts[$key], $result);
-        }
-
-        //This fix is related to SF#1923020, but has to be applied regardless of
-        //actually highlighting symbols.
-        /** NOTE: memorypeak #3 */
-        $endresult = str_replace(array('<SEMI>', '<PIPE>'), array(';', '|'), $endresult);
-
-//        // Parse the last stuff (redundant?)
-//        $result .= $this->parse_non_string_part($stuff_to_parse);
-
-        // Lop off the very first and last spaces
-//        $result = substr($result, 1, -1);
-
-        // We're finished: stop timing
-        $this->set_time($start_time, microtime());
-
-        $this->finalise($endresult);
-        return $endresult;
-    }
-
-    /**
-     * Swaps out spaces and tabs for HTML indentation. Not needed if
-     * the code is in a pre block...
-     *
-     * @param  string The source to indent (reference!)
-     * @since  1.0.0
-     * @access private
-     */
-    function indent(&$result) {
-        /// Replace tabs with the correct number of spaces
-        if (false !== strpos($result, "\t")) {
-            $lines = explode("\n", $result);
-            $result = null;//Save memory while we process the lines individually
-            $tab_width = $this->get_real_tab_width();
-            $tab_string = '&nbsp;' . str_repeat(' ', $tab_width);
-
-            for ($key = 0, $n = count($lines); $key < $n; $key++) {
-                $line = $lines[$key];
-                if (false === strpos($line, "\t")) {
-                    continue;
-                }
-
-                $pos = 0;
-                $length = strlen($line);
-                $lines[$key] = ''; // reduce memory
-
-                $IN_TAG = false;
-                for ($i = 0; $i < $length; ++$i) {
-                    $char = $line[$i];
-                    // Simple engine to work out whether we're in a tag.
-                    // If we are we modify $pos. This is so we ignore HTML
-                    // in the line and only workout the tab replacement
-                    // via the actual content of the string
-                    // This test could be improved to include strings in the
-                    // html so that < or > would be allowed in user's styles
-                    // (e.g. quotes: '<' '>'; or similar)
-                    if ($IN_TAG) {
-                        if ('>' == $char) {
-                            $IN_TAG = false;
-                        }
-                        $lines[$key] .= $char;
-                    } elseif ('<' == $char) {
-                        $IN_TAG = true;
-                        $lines[$key] .= '<';
-                    } elseif ('&' == $char) {
-                        $substr = substr($line, $i + 3, 5);
-                        $posi = strpos($substr, ';');
-                        if (false === $posi) {
-                            ++$pos;
-                        } else {
-                            $pos -= $posi+2;
-                        }
-                        $lines[$key] .= $char;
-                    } elseif ("\t" == $char) {
-                        $str = '';
-                        // OPTIMISE - move $strs out. Make an array:
-                        // $tabs = array(
-                        //  1 => '&nbsp;',
-                        //  2 => '&nbsp; ',
-                        //  3 => '&nbsp; &nbsp;' etc etc
-                        // to use instead of building a string every time
-                        $tab_end_width = $tab_width - ($pos % $tab_width); //Moved out of the look as it doesn't change within the loop
-                        if (($pos & 1) || 1 == $tab_end_width) {
-                            $str .= substr($tab_string, 6, $tab_end_width);
-                        } else {
-                            $str .= substr($tab_string, 0, $tab_end_width+5);
-                        }
-                        $lines[$key] .= $str;
-                        $pos += $tab_end_width;
-
-                        if (false === strpos($line, "\t", $i + 1)) {
-                            $lines[$key] .= substr($line, $i + 1);
-                            break;
-                        }
-                    } elseif (0 == $pos && ' ' == $char) {
-                        $lines[$key] .= '&nbsp;';
-                        ++$pos;
-                    } else {
-                        $lines[$key] .= $char;
-                        ++$pos;
-                    }
-                }
-            }
-            $result = implode("\n", $lines);
-            unset($lines);//We don't need the lines separated beyond this --- free them!
-        }
-        // Other whitespace
-        // BenBE: Fix to reduce the number of replacements to be done
-        $result = preg_replace('/^ /m', '&nbsp;', $result);
-        $result = str_replace('  ', ' &nbsp;', $result);
-
-        if ($this->line_numbers == GESHI_NO_LINE_NUMBERS && $this->header_type != GESHI_HEADER_PRE_TABLE) {
-            if ($this->line_ending === null) {
-                $result = nl2br($result);
-            } else {
-                $result = str_replace("\n", $this->line_ending, $result);
-            }
-        }
-    }
-
-    /**
-     * Changes the case of a keyword for those languages where a change is asked for
-     *
-     * @param  string The keyword to change the case of
-     * @return string The keyword with its case changed
-     * @since  1.0.0
-     * @access private
-     */
-    function change_case($instr) {
-        switch ($this->language_data['CASE_KEYWORDS']) {
-            case GESHI_CAPS_UPPER:
-                return strtoupper($instr);
-            case GESHI_CAPS_LOWER:
-                return strtolower($instr);
-            default:
-                return $instr;
-        }
-    }
-
-    /**
-     * Handles replacements of keywords to include markup and links if requested
-     *
-     * @param  string The keyword to add the Markup to
-     * @return The HTML for the match found
-     * @since  1.0.8
-     * @access private
-     *
-     * @todo   Get rid of ender in keyword links
-     */
-    function handle_keyword_replace($match) {
-        $k = $this->_kw_replace_group;
-        $keyword = $match[0];
-        $keyword_match = $match[1];
-
-        $before = '';
-        $after = '';
-
-        if ($this->keyword_links) {
-            // Keyword links have been ebabled
-
-            if (isset($this->language_data['URLS'][$k]) &&
-                $this->language_data['URLS'][$k] != '') {
-                // There is a base group for this keyword
-
-                // Old system: strtolower
-                //$keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword);
-                // New system: get keyword from language file to get correct case
-                if (!$this->language_data['CASE_SENSITIVE'][$k] &&
-                    strpos($this->language_data['URLS'][$k], '{FNAME}') !== false) {
-                    foreach ($this->language_data['KEYWORDS'][$k] as $word) {
-                        if (strcasecmp($word, $keyword_match) == 0) {
-                            break;
-                        }
-                    }
-                } else {
-                    $word = $keyword_match;
-                }
-
-                $before = '<|UR1|"' .
-                    str_replace(
-                        array(
-                            '{FNAME}',
-                            '{FNAMEL}',
-                            '{FNAMEU}',
-                            '.'),
-                        array(
-                            str_replace('+', '%20', urlencode($this->hsc($word))),
-                            str_replace('+', '%20', urlencode($this->hsc(strtolower($word)))),
-                            str_replace('+', '%20', urlencode($this->hsc(strtoupper($word)))),
-                            '<DOT>'),
-                        $this->language_data['URLS'][$k]
-                    ) . '">';
-                $after = '</a>';
-            }
-        }
-
-        return $before . '<|/'. $k .'/>' . $this->change_case($keyword) . '|>' . $after;
-    }
-
-    /**
-     * handles regular expressions highlighting-definitions with callback functions
-     *
-     * @note this is a callback, don't use it directly
-     *
-     * @param array the matches array
-     * @return The highlighted string
-     * @since 1.0.8
-     * @access private
-     */
-    function handle_regexps_callback($matches) {
-        // before: "' style=\"' . call_user_func(\"$func\", '\\1') . '\"\\1|>'",
-        return  ' style="' . call_user_func($this->language_data['STYLES']['REGEXPS'][$this->_rx_key], $matches[1]) . '"'. $matches[1] . '|>';
-    }
-
-    /**
-     * handles newlines in REGEXPS matches. Set the _hmr_* vars before calling this
-     *
-     * @note this is a callback, don't use it directly
-     *
-     * @param array the matches array
-     * @return string
-     * @since 1.0.8
-     * @access private
-     */
-    function handle_multiline_regexps($matches) {
-        $before = $this->_hmr_before;
-        $after = $this->_hmr_after;
-        if ($this->_hmr_replace) {
-            $replace = $this->_hmr_replace;
-            $search = array();
-
-            foreach (array_keys($matches) as $k) {
-                $search[] = '\\' . $k;
-            }
-
-            $before = str_replace($search, $matches, $before);
-            $after = str_replace($search, $matches, $after);
-            $replace = str_replace($search, $matches, $replace);
-        } else {
-            $replace = $matches[0];
-        }
-        return $before
-                    . '<|!REG3XP' . $this->_hmr_key .'!>'
-                        . str_replace("\n", "|>\n<|!REG3XP" . $this->_hmr_key . '!>', $replace)
-                    . '|>'
-              . $after;
-    }
-
-    /**
-     * Takes a string that has no strings or comments in it, and highlights
-     * stuff like keywords, numbers and methods.
-     *
-     * @param string The string to parse for keyword, numbers etc.
-     * @since 1.0.0
-     * @access private
-     * @todo BUGGY! Why? Why not build string and return?
-     */
-    function parse_non_string_part($stuff_to_parse) {
-        $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse);
-
-        // Highlight keywords
-        $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#|^&";
-        $disallowed_after = "(?![a-zA-Z0-9_\|%\\-&;";
-        if ($this->lexic_permissions['STRINGS']) {
-            $quotemarks = preg_quote(implode($this->language_data['QUOTEMARKS']), '/');
-            $disallowed_before .= $quotemarks;
-            $disallowed_after .= $quotemarks;
-        }
-        $disallowed_before .= "])";
-        $disallowed_after .= "])";
-
-        $parser_control_pergroup = false;
-        if (isset($this->language_data['PARSER_CONTROL'])) {
-            if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
-                $x = 0; // check wether per-keyword-group parser_control is enabled
-                if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) {
-                    $disallowed_before = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'];
-                    ++$x;
-                }
-                if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'])) {
-                    $disallowed_after = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'];
-                    ++$x;
-                }
-                $parser_control_pergroup = (count($this->language_data['PARSER_CONTROL']['KEYWORDS']) - $x) > 0;
-            }
-        }
-
-        foreach (array_keys($this->language_data['KEYWORDS']) as $k) {
-            if (!isset($this->lexic_permissions['KEYWORDS'][$k]) ||
-                $this->lexic_permissions['KEYWORDS'][$k]) {
-
-                $case_sensitive = $this->language_data['CASE_SENSITIVE'][$k];
-                $modifiers = $case_sensitive ? '' : 'i';
-
-                // NEW in 1.0.8 - per-keyword-group parser control
-                $disallowed_before_local = $disallowed_before;
-                $disallowed_after_local = $disallowed_after;
-                if ($parser_control_pergroup && isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k])) {
-                    if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE'])) {
-                        $disallowed_before_local =
-                            $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE'];
-                    }
-
-                    if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER'])) {
-                        $disallowed_after_local =
-                            $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER'];
-                    }
-                }
-
-                $this->_kw_replace_group = $k;
-
-                //NEW in 1.0.8, the cached regexp list
-                // since we don't want PHP / PCRE to crash due to too large patterns we split them into smaller chunks
-                for ($set = 0, $set_length = count($this->language_data['CACHED_KEYWORD_LISTS'][$k]); $set <  $set_length; ++$set) {
-                    $keywordset =& $this->language_data['CACHED_KEYWORD_LISTS'][$k][$set];
-                    // Might make a more unique string for putting the number in soon
-                    // Basically, we don't put the styles in yet because then the styles themselves will
-                    // get highlighted if the language has a CSS keyword in it (like CSS, for example ;))
-                    $stuff_to_parse = preg_replace_callback(
-                        "/$disallowed_before_local({$keywordset})(?!\<DOT\>(?:htm|php|aspx?))$disallowed_after_local/$modifiers",
-                        array($this, 'handle_keyword_replace'),
-                        $stuff_to_parse
-                        );
-                }
-            }
-        }
-
-        // Regular expressions
-        foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
-            if ($this->lexic_permissions['REGEXPS'][$key]) {
-                if (is_array($regexp)) {
-                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                        // produce valid HTML when we match multiple lines
-                        $this->_hmr_replace = $regexp[GESHI_REPLACE];
-                        $this->_hmr_before = $regexp[GESHI_BEFORE];
-                        $this->_hmr_key = $key;
-                        $this->_hmr_after = $regexp[GESHI_AFTER];
-                        $stuff_to_parse = preg_replace_callback(
-                            "/" . $regexp[GESHI_SEARCH] . "/{$regexp[GESHI_MODIFIERS]}",
-                            array($this, 'handle_multiline_regexps'),
-                            $stuff_to_parse);
-                        $this->_hmr_replace = false;
-                        $this->_hmr_before = '';
-                        $this->_hmr_after = '';
-                    } else {
-                        $stuff_to_parse = preg_replace(
-                            '/' . $regexp[GESHI_SEARCH] . '/' . $regexp[GESHI_MODIFIERS],
-                            $regexp[GESHI_BEFORE] . '<|!REG3XP'. $key .'!>' . $regexp[GESHI_REPLACE] . '|>' . $regexp[GESHI_AFTER],
-                            $stuff_to_parse);
-                    }
-                } else {
-                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                        // produce valid HTML when we match multiple lines
-                        $this->_hmr_key = $key;
-                        $stuff_to_parse = preg_replace_callback( "/(" . $regexp . ")/",
-                                              array($this, 'handle_multiline_regexps'), $stuff_to_parse);
-                        $this->_hmr_key = '';
-                    } else {
-                        $stuff_to_parse = preg_replace( "/(" . $regexp . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
-                    }
-                }
-            }
-        }
-
-        // Highlight numbers. As of 1.0.8 we support different types of numbers
-        $numbers_found = false;
-
-        if ($this->lexic_permissions['NUMBERS'] && preg_match($this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'], $stuff_to_parse )) {
-            $numbers_found = true;
-
-            //For each of the formats ...
-            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
-                //Check if it should be highlighted ...
-                $stuff_to_parse = preg_replace($regexp, "<|/NUM!$id/>\\1|>", $stuff_to_parse);
-            }
-        }
-
-        //
-        // Now that's all done, replace /[number]/ with the correct styles
-        //
-        foreach (array_keys($this->language_data['KEYWORDS']) as $k) {
-            if (!$this->use_classes) {
-                $attributes = ' style="' .
-                    (isset($this->language_data['STYLES']['KEYWORDS'][$k]) ?
-                    $this->language_data['STYLES']['KEYWORDS'][$k] : "") . '"';
-            } else {
-                $attributes = ' class="kw' . $k . '"';
-            }
-            $stuff_to_parse = str_replace("<|/$k/>", "<|$attributes>", $stuff_to_parse);
-        }
-
-        if ($numbers_found) {
-            // Put number styles in
-            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
-                //Commented out for now, as this needs some review ...
-                //                if ($numbers_permissions & $id) {
-                //Get the appropriate style ...
-                //Checking for unset styles is done by the style cache builder ...
-                if (!$this->use_classes) {
-                    $attributes = ' style="' . $this->language_data['STYLES']['NUMBERS'][$id] . '"';
-                } else {
-                    $attributes = ' class="nu'.$id.'"';
-                }
-
-                //Set in the correct styles ...
-                $stuff_to_parse = str_replace("/NUM!$id/", $attributes, $stuff_to_parse);
-                //                }
-            }
-        }
-
-        // Highlight methods and fields in objects
-        if ($this->lexic_permissions['METHODS'] && $this->language_data['OOLANG']) {
-            $oolang_spaces = "[\s]*";
-            $oolang_before = "";
-            $oolang_after = "[a-zA-Z][a-zA-Z0-9_]*";
-            if (isset($this->language_data['PARSER_CONTROL'])) {
-                if (isset($this->language_data['PARSER_CONTROL']['OOLANG'])) {
-                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE'])) {
-                        $oolang_before = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE'];
-                    }
-                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER'])) {
-                        $oolang_after = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER'];
-                    }
-                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES'])) {
-                        $oolang_spaces = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES'];
-                    }
-                }
-            }
-
-            foreach ($this->language_data['OBJECT_SPLITTERS'] as $key => $splitter) {
-                if (false !== strpos($stuff_to_parse, $splitter)) {
-                    if (!$this->use_classes) {
-                        $attributes = ' style="' . $this->language_data['STYLES']['METHODS'][$key] . '"';
-                    } else {
-                        $attributes = ' class="me' . $key . '"';
-                    }
-                    $stuff_to_parse = preg_replace("/($oolang_before)(" . preg_quote($this->language_data['OBJECT_SPLITTERS'][$key], '/') . ")($oolang_spaces)($oolang_after)/", "\\1\\2\\3<|$attributes>\\4|>", $stuff_to_parse);
-                }
-            }
-        }
-
-        //
-        // Highlight brackets. Yes, I've tried adding a semi-colon to this list.
-        // You try it, and see what happens ;)
-        // TODO: Fix lexic permissions not converting entities if shouldn't
-        // be highlighting regardless
-        //
-        if ($this->lexic_permissions['BRACKETS']) {
-            $stuff_to_parse = str_replace( $this->language_data['CACHE_BRACKET_MATCH'],
-                              $this->language_data['CACHE_BRACKET_REPLACE'], $stuff_to_parse );
-        }
-
-
-        //FIX for symbol highlighting ...
-        if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) {
-            //Get all matches and throw away those witin a block that is already highlighted... (i.e. matched by a regexp)
-            $n_symbols = preg_match_all("/<\|(?:<DOT>|[^>])+>(?:(?!\|>).*?)\|>|<\/a>|(?:" . $this->language_data['SYMBOL_SEARCH'] . ")+(?![^<]+?>)/", $stuff_to_parse, $pot_symbols, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-            $global_offset = 0;
-            for ($s_id = 0; $s_id < $n_symbols; ++$s_id) {
-                $symbol_match = $pot_symbols[$s_id][0][0];
-                if (strpos($symbol_match, '<') !== false || strpos($symbol_match, '>') !== false) {
-                    // already highlighted blocks _must_ include either < or >
-                    // so if this conditional applies, we have to skip this match
-                    // BenBE: UNLESS the block contains <SEMI> or <PIPE>
-                    if(strpos($symbol_match, '<SEMI>') === false &&
-                        strpos($symbol_match, '<PIPE>') === false) {
-                        continue;
-                    }
-                }
-
-                // if we reach this point, we have a valid match which needs to be highlighted
-
-                $symbol_length = strlen($symbol_match);
-                $symbol_offset = $pot_symbols[$s_id][0][1];
-                unset($pot_symbols[$s_id]);
-                $symbol_end = $symbol_length + $symbol_offset;
-                $symbol_hl = "";
-
-                // if we have multiple styles, we have to handle them properly
-                if ($this->language_data['MULTIPLE_SYMBOL_GROUPS']) {
-                    $old_sym = -1;
-                    // Split the current stuff to replace into its atomic symbols ...
-                    preg_match_all("/" . $this->language_data['SYMBOL_SEARCH'] . "/", $symbol_match, $sym_match_syms, PREG_PATTERN_ORDER);
-                    foreach ($sym_match_syms[0] as $sym_ms) {
-                        //Check if consequtive symbols belong to the same group to save output ...
-                        if (isset($this->language_data['SYMBOL_DATA'][$sym_ms])
-                            && ($this->language_data['SYMBOL_DATA'][$sym_ms] != $old_sym)) {
-                            if (-1 != $old_sym) {
-                                $symbol_hl .= "|>";
-                            }
-                            $old_sym = $this->language_data['SYMBOL_DATA'][$sym_ms];
-                            if (!$this->use_classes) {
-                                $symbol_hl .= '<| style="' . $this->language_data['STYLES']['SYMBOLS'][$old_sym] . '">';
-                            } else {
-                                $symbol_hl .= '<| class="sy' . $old_sym . '">';
-                            }
-                        }
-                        $symbol_hl .= $sym_ms;
-                    }
-                    unset($sym_match_syms);
-
-                    //Close remaining tags and insert the replacement at the right position ...
-                    //Take caution if symbol_hl is empty to avoid doubled closing spans.
-                    if (-1 != $old_sym) {
-                        $symbol_hl .= "|>";
-                    }
-                } else {
-                    if (!$this->use_classes) {
-                        $symbol_hl = '<| style="' . $this->language_data['STYLES']['SYMBOLS'][0] . '">';
-                    } else {
-                        $symbol_hl = '<| class="sy0">';
-                    }
-                    $symbol_hl .= $symbol_match . '|>';
-                }
-
-                $stuff_to_parse = substr_replace($stuff_to_parse, $symbol_hl, $symbol_offset + $global_offset, $symbol_length);
-
-                // since we replace old text with something of different size,
-                // we'll have to keep track of the differences
-                $global_offset += strlen($symbol_hl) - $symbol_length;
-            }
-        }
-        //FIX for symbol highlighting ...
-
-        // Add class/style for regexps
-        foreach (array_keys($this->language_data['REGEXPS']) as $key) {
-            if ($this->lexic_permissions['REGEXPS'][$key]) {
-                if (is_callable($this->language_data['STYLES']['REGEXPS'][$key])) {
-                    $this->_rx_key = $key;
-                    $stuff_to_parse = preg_replace_callback("/!REG3XP$key!(.*)\|>/U",
-                        array($this, 'handle_regexps_callback'),
-                        $stuff_to_parse);
-                } else {
-                    if (!$this->use_classes) {
-                        $attributes = ' style="' . $this->language_data['STYLES']['REGEXPS'][$key] . '"';
-                    } else {
-                        if (is_array($this->language_data['REGEXPS'][$key]) &&
-                            array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$key])) {
-                            $attributes = ' class="' .
-                                $this->language_data['REGEXPS'][$key][GESHI_CLASS] . '"';
-                        } else {
-                           $attributes = ' class="re' . $key . '"';
-                        }
-                    }
-                    $stuff_to_parse = str_replace("!REG3XP$key!", "$attributes", $stuff_to_parse);
-                }
-            }
-        }
-
-        // Replace <DOT> with . for urls
-        $stuff_to_parse = str_replace('<DOT>', '.', $stuff_to_parse);
-        // Replace <|UR1| with <a href= for urls also
-        if (isset($this->link_styles[GESHI_LINK])) {
-            if ($this->use_classes) {
-                $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' href=', $stuff_to_parse);
-            } else {
-                $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' style="' . $this->link_styles[GESHI_LINK] . '" href=', $stuff_to_parse);
-            }
-        } else {
-            $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' href=', $stuff_to_parse);
-        }
-
-        //
-        // NOW we add the span thingy ;)
-        //
-
-        $stuff_to_parse = str_replace('<|', '<span', $stuff_to_parse);
-        $stuff_to_parse = str_replace ( '|>', '</span>', $stuff_to_parse );
-        return substr($stuff_to_parse, 1);
-    }
-
-    /**
-     * Sets the time taken to parse the code
-     *
-     * @param microtime The time when parsing started
-     * @param microtime The time when parsing ended
-     * @since 1.0.2
-     * @access private
-     */
-    function set_time($start_time, $end_time) {
-        $start = explode(' ', $start_time);
-        $end = explode(' ', $end_time);
-        $this->time = $end[0] + $end[1] - $start[0] - $start[1];
-    }
-
-    /**
-     * Gets the time taken to parse the code
-     *
-     * @return double The time taken to parse the code
-     * @since  1.0.2
-     */
-    function get_time() {
-        return $this->time;
-    }
-
-    /**
-     * Merges arrays recursively, overwriting values of the first array with values of later arrays
-     *
-     * @since 1.0.8
-     * @access private
-     */
-    function merge_arrays() {
-        $arrays = func_get_args();
-        $narrays = count($arrays);
-
-        // check arguments
-        // comment out if more performance is necessary (in this case the foreach loop will trigger a warning if the argument is not an array)
-        for ($i = 0; $i < $narrays; $i ++) {
-            if (!is_array($arrays[$i])) {
-                // also array_merge_recursive returns nothing in this case
-                trigger_error('Argument #' . ($i+1) . ' is not an array - trying to merge array with scalar! Returning false!', E_USER_WARNING);
-                return false;
-            }
-        }
-
-        // the first array is in the output set in every case
-        $ret = $arrays[0];
-
-        // merege $ret with the remaining arrays
-        for ($i = 1; $i < $narrays; $i ++) {
-            foreach ($arrays[$i] as $key => $value) {
-                if (is_array($value) && isset($ret[$key])) {
-                    // if $ret[$key] is not an array you try to merge an scalar value with an array - the result is not defined (incompatible arrays)
-                    // in this case the call will trigger an E_USER_WARNING and the $ret[$key] will be false.
-                    $ret[$key] = $this->merge_arrays($ret[$key], $value);
-                } else {
-                    $ret[$key] = $value;
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Gets language information and stores it for later use
-     *
-     * @param string The filename of the language file you want to load
-     * @since 1.0.0
-     * @access private
-     * @todo Needs to load keys for lexic permissions for keywords, regexps etc
-     */
-    function load_language($file_name) {
-        if ($file_name == $this->loaded_language) {
-            // this file is already loaded!
-            return;
-        }
-
-        //Prepare some stuff before actually loading the language file
-        $this->loaded_language = $file_name;
-        $this->parse_cache_built = false;
-        $this->enable_highlighting();
-        $language_data = array();
-
-        //Load the language file
-        require $file_name;
-
-        // Perhaps some checking might be added here later to check that
-        // $language data is a valid thing but maybe not
-        $this->language_data = $language_data;
-
-        // Set strict mode if should be set
-        $this->strict_mode = $this->language_data['STRICT_MODE_APPLIES'];
-
-        // Set permissions for all lexics to true
-        // so they'll be highlighted by default
-        foreach (array_keys($this->language_data['KEYWORDS']) as $key) {
-            if (!empty($this->language_data['KEYWORDS'][$key])) {
-                $this->lexic_permissions['KEYWORDS'][$key] = true;
-            } else {
-                $this->lexic_permissions['KEYWORDS'][$key] = false;
-            }
-        }
-
-        foreach (array_keys($this->language_data['COMMENT_SINGLE']) as $key) {
-            $this->lexic_permissions['COMMENTS'][$key] = true;
-        }
-        foreach (array_keys($this->language_data['REGEXPS']) as $key) {
-            $this->lexic_permissions['REGEXPS'][$key] = true;
-        }
-
-        // for BenBE and future code reviews:
-        // we can use empty here since we only check for existance and emptiness of an array
-        // if it is not an array at all but rather false or null this will work as intended as well
-        // even if $this->language_data['PARSER_CONTROL'] is undefined this won't trigger a notice
-        if (!empty($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'])) {
-            foreach ($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'] as $flag => $value) {
-                // it's either true or false and maybe is true as well
-                $perm = $value !== GESHI_NEVER;
-                if ($flag == 'ALL') {
-                    $this->enable_highlighting($perm);
-                    continue;
-                }
-                if (!isset($this->lexic_permissions[$flag])) {
-                    // unknown lexic permission
-                    continue;
-                }
-                if (is_array($this->lexic_permissions[$flag])) {
-                    foreach ($this->lexic_permissions[$flag] as $key => $val) {
-                        $this->lexic_permissions[$flag][$key] = $perm;
-                    }
-                } else {
-                    $this->lexic_permissions[$flag] = $perm;
-                }
-            }
-            unset($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS']);
-        }
-
-        //Fix: Problem where hardescapes weren't handled if no ESCAPE_CHAR was given
-        //You need to set one for HARDESCAPES only in this case.
-        if(!isset($this->language_data['HARDCHAR'])) {
-            $this->language_data['HARDCHAR'] = $this->language_data['ESCAPE_CHAR'];
-        }
-
-        //NEW in 1.0.8: Allow styles to be loaded from a separate file to override defaults
-        $style_filename = substr($file_name, 0, -4) . '.style.php';
-        if (is_readable($style_filename)) {
-            //Clear any style_data that could have been set before ...
-            if (isset($style_data)) {
-                unset($style_data);
-            }
-
-            //Read the Style Information from the style file
-            include $style_filename;
-
-            //Apply the new styles to our current language styles
-            if (isset($style_data) && is_array($style_data)) {
-                $this->language_data['STYLES'] =
-                    $this->merge_arrays($this->language_data['STYLES'], $style_data);
-            }
-        }
-    }
-
-    /**
-     * Takes the parsed code and various options, and creates the HTML
-     * surrounding it to make it look nice.
-     *
-     * @param  string The code already parsed (reference!)
-     * @since  1.0.0
-     * @access private
-     */
-    function finalise(&$parsed_code) {
-        // Remove end parts of important declarations
-        // This is BUGGY!! My fault for bad code: fix coming in 1.2
-        // @todo Remove this crap
-        if ($this->enable_important_blocks &&
-            (strpos($parsed_code, $this->hsc(GESHI_START_IMPORTANT)) === false)) {
-            $parsed_code = str_replace($this->hsc(GESHI_END_IMPORTANT), '', $parsed_code);
-        }
-
-        // Add HTML whitespace stuff if we're using the <div> header
-        if ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) {
-            $this->indent($parsed_code);
-        }
-
-        // purge some unnecessary stuff
-        /** NOTE: memorypeak #1 */
-        $parsed_code = preg_replace('#<span[^>]+>(\s*)</span>#', '\\1', $parsed_code);
-
-        // If we are using IDs for line numbers, there needs to be an overall
-        // ID set to prevent collisions.
-        if ($this->add_ids && !$this->overall_id) {
-            $this->overall_id = 'geshi-' . substr(md5(microtime()), 0, 4);
-        }
-
-        // Get code into lines
-        /** NOTE: memorypeak #2 */
-        $code = explode("\n", $parsed_code);
-        $parsed_code = $this->header();
-
-        // If we're using line numbers, we insert <li>s and appropriate
-        // markup to style them (otherwise we don't need to do anything)
-        if ($this->line_numbers != GESHI_NO_LINE_NUMBERS && $this->header_type != GESHI_HEADER_PRE_TABLE) {
-            // If we're using the <pre> header, we shouldn't add newlines because
-            // the <pre> will line-break them (and the <li>s already do this for us)
-            $ls = ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) ? "\n" : '';
-
-            // Set vars to defaults for following loop
-            $i = 0;
-
-            // Foreach line...
-            for ($i = 0, $n = count($code); $i < $n;) {
-                //Reset the attributes for a new line ...
-                $attrs = array();
-
-                // Make lines have at least one space in them if they're empty
-                // BenBE: Checking emptiness using trim instead of relying on blanks
-                if ('' == trim($code[$i])) {
-                    $code[$i] = '&nbsp;';
-                }
-
-                // If this is a "special line"...
-                if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
-                    $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
-                    // Set the attributes to style the line
-                    if ($this->use_classes) {
-                        //$attr = ' class="li2"';
-                        $attrs['class'][] = 'li2';
-                        $def_attr = ' class="de2"';
-                    } else {
-                        //$attr = ' style="' . $this->line_style2 . '"';
-                        $attrs['style'][] = $this->line_style2;
-                        // This style "covers up" the special styles set for special lines
-                        // so that styles applied to special lines don't apply to the actual
-                        // code on that line
-                        $def_attr = ' style="' . $this->code_style . '"';
-                    }
-                } else {
-                    if ($this->use_classes) {
-                        //$attr = ' class="li1"';
-                        $attrs['class'][] = 'li1';
-                        $def_attr = ' class="de1"';
-                    } else {
-                        //$attr = ' style="' . $this->line_style1 . '"';
-                        $attrs['style'][] = $this->line_style1;
-                        $def_attr = ' style="' . $this->code_style . '"';
-                    }
-                }
-
-                //Check which type of tag to insert for this line
-                if ($this->header_type == GESHI_HEADER_PRE_VALID) {
-                    $start = "<pre$def_attr>";
-                    $end = '</pre>';
-                } else {
-                    // Span or div?
-                    $start = "<div$def_attr>";
-                    $end = '</div>';
-                }
-
-                ++$i;
-
-                // Are we supposed to use ids? If so, add them
-                if ($this->add_ids) {
-                    $attrs['id'][] = "$this->overall_id-$i";
-                }
-
-                //Is this some line with extra styles???
-                if (in_array($i, $this->highlight_extra_lines)) {
-                    if ($this->use_classes) {
-                        if (isset($this->highlight_extra_lines_styles[$i])) {
-                            $attrs['class'][] = "lx$i";
-                        } else {
-                            $attrs['class'][] = "ln-xtra";
-                        }
-                    } else {
-                        array_push($attrs['style'], $this->get_line_style($i));
-                    }
-                }
-
-                // Add in the line surrounded by appropriate list HTML
-                $attr_string = '';
-                foreach ($attrs as $key => $attr) {
-                    $attr_string .= ' ' . $key . '="' . implode(' ', $attr) . '"';
-                }
-
-                $parsed_code .= "<li$attr_string>$start{$code[$i-1]}$end</li>$ls";
-                unset($code[$i - 1]);
-            }
-        } else {
-            $n = count($code);
-            if ($this->use_classes) {
-                $attributes = ' class="de1"';
-            } else {
-                $attributes = ' style="'. $this->code_style .'"';
-            }
-            if ($this->header_type == GESHI_HEADER_PRE_VALID) {
-                $parsed_code .= '<pre'. $attributes .'>';
-            } elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
-                if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                    if ($this->use_classes) {
-                        $attrs = ' class="ln"';
-                    } else {
-                        $attrs = ' style="'. $this->table_linenumber_style .'"';
-                    }
-                    $parsed_code .= '<td'.$attrs.'><pre'.$attributes.'>';
-                    // get linenumbers
-                    // we don't merge it with the for below, since it should be better for
-                    // memory consumption this way
-                    // @todo: but... actually it would still be somewhat nice to merge the two loops
-                    //        the mem peaks are at different positions
-                    for ($i = 0; $i < $n; ++$i) {
-                        $close = 0;
-                        // fancy lines
-                        if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
-                            $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
-                            // Set the attributes to style the line
-                            if ($this->use_classes) {
-                                $parsed_code .= '<span class="xtra li2"><span class="de2">';
-                            } else {
-                                // This style "covers up" the special styles set for special lines
-                                // so that styles applied to special lines don't apply to the actual
-                                // code on that line
-                                $parsed_code .= '<span style="display:block;' . $this->line_style2 . '">'
-                                                  .'<span style="' . $this->code_style .'">';
-                            }
-                            $close += 2;
-                        }
-                        //Is this some line with extra styles???
-                        if (in_array($i + 1, $this->highlight_extra_lines)) {
-                            if ($this->use_classes) {
-                                if (isset($this->highlight_extra_lines_styles[$i])) {
-                                    $parsed_code .= "<span class=\"xtra lx$i\">";
-                                } else {
-                                    $parsed_code .= "<span class=\"xtra ln-xtra\">";
-                                }
-                            } else {
-                                $parsed_code .= "<span style=\"display:block;" . $this->get_line_style($i) . "\">";
-                            }
-                            ++$close;
-                        }
-                        $parsed_code .= $this->line_numbers_start + $i;
-                        if ($close) {
-                            $parsed_code .= str_repeat('</span>', $close);
-                        } elseif ($i != $n) {
-                            $parsed_code .= "\n";
-                        }
-                    }
-                    $parsed_code .= '</pre></td><td'.$attributes.'>';
-                }
-                $parsed_code .= '<pre'. $attributes .'>';
-            }
-            // No line numbers, but still need to handle highlighting lines extra.
-            // Have to use divs so the full width of the code is highlighted
-            $close = 0;
-            for ($i = 0; $i < $n; ++$i) {
-                // Make lines have at least one space in them if they're empty
-                // BenBE: Checking emptiness using trim instead of relying on blanks
-                if ('' == trim($code[$i])) {
-                    $code[$i] = '&nbsp;';
-                }
-                // fancy lines
-                if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
-                    $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
-                    // Set the attributes to style the line
-                    if ($this->use_classes) {
-                        $parsed_code .= '<span class="xtra li2"><span class="de2">';
-                    } else {
-                        // This style "covers up" the special styles set for special lines
-                        // so that styles applied to special lines don't apply to the actual
-                        // code on that line
-                        $parsed_code .= '<span style="display:block;' . $this->line_style2 . '">'
-                                          .'<span style="' . $this->code_style .'">';
-                    }
-                    $close += 2;
-                }
-                //Is this some line with extra styles???
-                if (in_array($i + 1, $this->highlight_extra_lines)) {
-                    if ($this->use_classes) {
-                        if (isset($this->highlight_extra_lines_styles[$i])) {
-                            $parsed_code .= "<span class=\"xtra lx$i\">";
-                        } else {
-                            $parsed_code .= "<span class=\"xtra ln-xtra\">";
-                        }
-                    } else {
-                        $parsed_code .= "<span style=\"display:block;" . $this->get_line_style($i) . "\">";
-                    }
-                    ++$close;
-                }
-
-                $parsed_code .= $code[$i];
-
-                if ($close) {
-                  $parsed_code .= str_repeat('</span>', $close);
-                  $close = 0;
-                }
-                elseif ($i + 1 < $n) {
-                    $parsed_code .= "\n";
-                }
-                unset($code[$i]);
-            }
-
-            if ($this->header_type == GESHI_HEADER_PRE_VALID || $this->header_type == GESHI_HEADER_PRE_TABLE) {
-                $parsed_code .= '</pre>';
-            }
-            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                $parsed_code .= '</td>';
-            }
-        }
-
-        $parsed_code .= $this->footer();
-    }
-
-    /**
-     * Creates the header for the code block (with correct attributes)
-     *
-     * @return string The header for the code block
-     * @since  1.0.0
-     * @access private
-     */
-    function header() {
-        // Get attributes needed
-        /**
-         * @todo   Document behaviour change - class is outputted regardless of whether
-         *         we're using classes or not. Same with style
-         */
-        $attributes = ' class="' . $this->_genCSSName($this->language);
-        if ($this->overall_class != '') {
-            $attributes .= " ".$this->_genCSSName($this->overall_class);
-        }
-        $attributes .= '"';
-
-        if ($this->overall_id != '') {
-            $attributes .= " id=\"{$this->overall_id}\"";
-        }
-        if ($this->overall_style != '' && !$this->use_classes) {
-            $attributes .= ' style="' . $this->overall_style . '"';
-        }
-
-        $ol_attributes = '';
-
-        if ($this->line_numbers_start != 1) {
-            $ol_attributes .= ' start="' . $this->line_numbers_start . '"';
-        }
-
-        // Get the header HTML
-        $header = $this->header_content;
-        if ($header) {
-            if ($this->header_type == GESHI_HEADER_PRE || $this->header_type == GESHI_HEADER_PRE_VALID) {
-                $header = str_replace("\n", '', $header);
-            }
-            $header = $this->replace_keywords($header);
-
-            if ($this->use_classes) {
-                $attr = ' class="head"';
-            } else {
-                $attr = " style=\"{$this->header_content_style}\"";
-            }
-            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                $header = "<thead><tr><td colspan=\"2\" $attr>$header</td></tr></thead>";
-            } else {
-                $header = "<div$attr>$header</div>";
-            }
-        }
-
-        if (GESHI_HEADER_NONE == $this->header_type) {
-            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                return "$header<ol$attributes$ol_attributes>";
-            }
-            return $header . ($this->force_code_block ? '<div>' : '');
-        }
-
-        // Work out what to return and do it
-        if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-            if ($this->header_type == GESHI_HEADER_PRE) {
-                return "<pre$attributes>$header<ol$ol_attributes>";
-            } elseif ($this->header_type == GESHI_HEADER_DIV ||
-                $this->header_type == GESHI_HEADER_PRE_VALID) {
-                return "<div$attributes>$header<ol$ol_attributes>";
-            } elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
-                return "<table$attributes>$header<tbody><tr class=\"li1\">";
-            }
-        } else {
-            if ($this->header_type == GESHI_HEADER_PRE) {
-                return "<pre$attributes>$header"  .
-                    ($this->force_code_block ? '<div>' : '');
-            } else {
-                return "<div$attributes>$header" .
-                    ($this->force_code_block ? '<div>' : '');
-            }
-        }
-    }
-
-    /**
-     * Returns the footer for the code block.
-     *
-     * @return string The footer for the code block
-     * @since  1.0.0
-     * @access private
-     */
-    function footer() {
-        $footer = $this->footer_content;
-        if ($footer) {
-            if ($this->header_type == GESHI_HEADER_PRE) {
-                $footer = str_replace("\n", '', $footer);;
-            }
-            $footer = $this->replace_keywords($footer);
-
-            if ($this->use_classes) {
-                $attr = ' class="foot"';
-            } else {
-                $attr = " style=\"{$this->footer_content_style}\"";
-            }
-            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                $footer = "<tfoot><tr><td colspan=\"2\">$footer</td></tr></tfoot>";
-            } else {
-                $footer = "<div$attr>$footer</div>";
-            }
-        }
-
-        if (GESHI_HEADER_NONE == $this->header_type) {
-            return ($this->line_numbers != GESHI_NO_LINE_NUMBERS) ? '</ol>' . $footer : $footer;
-        }
-
-        if ($this->header_type == GESHI_HEADER_DIV || $this->header_type == GESHI_HEADER_PRE_VALID) {
-            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                return "</ol>$footer</div>";
-            }
-            return ($this->force_code_block ? '</div>' : '') .
-                "$footer</div>";
-        }
-        elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
-            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                return "</tr></tbody>$footer</table>";
-            }
-            return ($this->force_code_block ? '</div>' : '') .
-                "$footer</div>";
-        }
-        else {
-            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                return "</ol>$footer</pre>";
-            }
-            return ($this->force_code_block ? '</div>' : '') .
-                "$footer</pre>";
-        }
-    }
-
-    /**
-     * Replaces certain keywords in the header and footer with
-     * certain configuration values
-     *
-     * @param  string The header or footer content to do replacement on
-     * @return string The header or footer with replaced keywords
-     * @since  1.0.2
-     * @access private
-     */
-    function replace_keywords($instr) {
-        $keywords = $replacements = array();
-
-        $keywords[] = '<TIME>';
-        $keywords[] = '{TIME}';
-        $replacements[] = $replacements[] = number_format($time = $this->get_time(), 3);
-
-        $keywords[] = '<LANGUAGE>';
-        $keywords[] = '{LANGUAGE}';
-        $replacements[] = $replacements[] = $this->language_data['LANG_NAME'];
-
-        $keywords[] = '<VERSION>';
-        $keywords[] = '{VERSION}';
-        $replacements[] = $replacements[] = GESHI_VERSION;
-
-        $keywords[] = '<SPEED>';
-        $keywords[] = '{SPEED}';
-        if ($time <= 0) {
-            $speed = 'N/A';
-        } else {
-            $speed = strlen($this->source) / $time;
-            if ($speed >= 1024) {
-                $speed = sprintf("%.2f KB/s", $speed / 1024.0);
-            } else {
-                $speed = sprintf("%.0f B/s", $speed);
-            }
-        }
-        $replacements[] = $replacements[] = $speed;
-
-        return str_replace($keywords, $replacements, $instr);
-    }
-
-    /**
-     * Secure replacement for PHP built-in function htmlspecialchars().
-     *
-     * See ticket #427 (http://wush.net/trac/wikka/ticket/427) for the rationale
-     * for this replacement function.
-     *
-     * The INTERFACE for this function is almost the same as that for
-     * htmlspecialchars(), with the same default for quote style; however, there
-     * is no 'charset' parameter. The reason for this is as follows:
-     *
-     * The PHP docs say:
-     *      "The third argument charset defines character set used in conversion."
-     *
-     * I suspect PHP's htmlspecialchars() is working at the byte-value level and
-     * thus _needs_ to know (or asssume) a character set because the special
-     * characters to be replaced could exist at different code points in
-     * different character sets. (If indeed htmlspecialchars() works at
-     * byte-value level that goes some  way towards explaining why the
-     * vulnerability would exist in this function, too, and not only in
-     * htmlentities() which certainly is working at byte-value level.)
-     *
-     * This replacement function however works at character level and should
-     * therefore be "immune" to character set differences - so no charset
-     * parameter is needed or provided. If a third parameter is passed, it will
-     * be silently ignored.
-     *
-     * In the OUTPUT there is a minor difference in that we use '&#39;' instead
-     * of PHP's '&#039;' for a single quote: this provides compatibility with
-     *      get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES)
-     * (see comment by mikiwoz at yahoo dot co dot uk on
-     * http://php.net/htmlspecialchars); it also matches the entity definition
-     * for XML 1.0
-     * (http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_Special_characters).
-     * Like PHP we use a numeric character reference instead of '&apos;' for the
-     * single quote. For the other special characters we use the named entity
-     * references, as PHP is doing.
-     *
-     * @author      {@link http://wikkawiki.org/JavaWoman Marjolein Katsma}
-     *
-     * @license     http://www.gnu.org/copyleft/lgpl.html
-     *              GNU Lesser General Public License
-     * @copyright   Copyright 2007, {@link http://wikkawiki.org/CreditsPage
-     *              Wikka Development Team}
-     *
-     * @access      private
-     * @param       string  $string string to be converted
-     * @param       integer $quote_style
-     *                      - ENT_COMPAT:   escapes &, <, > and double quote (default)
-     *                      - ENT_NOQUOTES: escapes only &, < and >
-     *                      - ENT_QUOTES:   escapes &, <, >, double and single quotes
-     * @return      string  converted string
-     * @since       1.0.7.18
-     */
-    function hsc($string, $quote_style = ENT_COMPAT) {
-        // init
-        static $aTransSpecchar = array(
-            '&' => '&amp;',
-            '"' => '&quot;',
-            '<' => '&lt;',
-            '>' => '&gt;',
-
-            //This fix is related to SF#1923020, but has to be applied
-            //regardless of actually highlighting symbols.
-
-            //Circumvent a bug with symbol highlighting
-            //This is required as ; would produce undesirable side-effects if it
-            //was not to be processed as an entity.
-            ';' => '<SEMI>', // Force ; to be processed as entity
-            '|' => '<PIPE>' // Force | to be processed as entity
-            );                      // ENT_COMPAT set
-
-        switch ($quote_style) {
-            case ENT_NOQUOTES: // don't convert double quotes
-                unset($aTransSpecchar['"']);
-                break;
-            case ENT_QUOTES: // convert single quotes as well
-                $aTransSpecchar["'"] = '&#39;'; // (apos) htmlspecialchars() uses '&#039;'
-                break;
-        }
-
-        // return translated string
-        return strtr($string, $aTransSpecchar);
-    }
-
-    function _genCSSName($name){
-        return (is_numeric($name[0]) ? '_' : '') . $name;
-    }
-
-    /**
-     * Returns a stylesheet for the highlighted code. If $economy mode
-     * is true, we only return the stylesheet declarations that matter for
-     * this code block instead of the whole thing
-     *
-     * @param  boolean Whether to use economy mode or not
-     * @return string A stylesheet built on the data for the current language
-     * @since  1.0.0
-     */
-    function get_stylesheet($economy_mode = true) {
-        // If there's an error, chances are that the language file
-        // won't have populated the language data file, so we can't
-        // risk getting a stylesheet...
-        if ($this->error) {
-            return '';
-        }
-
-        //Check if the style rearrangements have been processed ...
-        //This also does some preprocessing to check which style groups are useable ...
-        if(!isset($this->language_data['NUMBERS_CACHE'])) {
-            $this->build_style_cache();
-        }
-
-        // First, work out what the selector should be. If there's an ID,
-        // that should be used, the same for a class. Otherwise, a selector
-        // of '' means that these styles will be applied anywhere
-        if ($this->overall_id) {
-            $selector = '#' . $this->_genCSSName($this->overall_id);
-        } else {
-            $selector = '.' . $this->_genCSSName($this->language);
-            if ($this->overall_class) {
-                $selector .= '.' . $this->_genCSSName($this->overall_class);
-            }
-        }
-        $selector .= ' ';
-
-        // Header of the stylesheet
-        if (!$economy_mode) {
-            $stylesheet = "/**\n".
-                " * GeSHi Dynamically Generated Stylesheet\n".
-                " * --------------------------------------\n".
-                " * Dynamically generated stylesheet for {$this->language}\n".
-                " * CSS class: {$this->overall_class}, CSS id: {$this->overall_id}\n".
-                " * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann\n" .
-                " * (http://qbnz.com/highlighter/ and http://geshi.org/)\n".
-                " * --------------------------------------\n".
-                " */\n";
-        } else {
-            $stylesheet = "/**\n".
-                " * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann\n" .
-                " * (http://qbnz.com/highlighter/ and http://geshi.org/)\n".
-                " */\n";
-        }
-
-        // Set the <ol> to have no effect at all if there are line numbers
-        // (<ol>s have margins that should be destroyed so all layout is
-        // controlled by the set_overall_style method, which works on the
-        // <pre> or <div> container). Additionally, set default styles for lines
-        if (!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-            //$stylesheet .= "$selector, {$selector}ol, {$selector}ol li {margin: 0;}\n";
-            $stylesheet .= "$selector.de1, $selector.de2 {{$this->code_style}}\n";
-        }
-
-        // Add overall styles
-        // note: neglect economy_mode, empty styles are meaningless
-        if ($this->overall_style != '') {
-            $stylesheet .= "$selector {{$this->overall_style}}\n";
-        }
-
-        // Add styles for links
-        // note: economy mode does not make _any_ sense here
-        //       either the style is empty and thus no selector is needed
-        //       or the appropriate key is given.
-        foreach ($this->link_styles as $key => $style) {
-            if ($style != '') {
-                switch ($key) {
-                    case GESHI_LINK:
-                        $stylesheet .= "{$selector}a:link {{$style}}\n";
-                        break;
-                    case GESHI_HOVER:
-                        $stylesheet .= "{$selector}a:hover {{$style}}\n";
-                        break;
-                    case GESHI_ACTIVE:
-                        $stylesheet .= "{$selector}a:active {{$style}}\n";
-                        break;
-                    case GESHI_VISITED:
-                        $stylesheet .= "{$selector}a:visited {{$style}}\n";
-                        break;
-                }
-            }
-        }
-
-        // Header and footer
-        // note: neglect economy_mode, empty styles are meaningless
-        if ($this->header_content_style != '') {
-            $stylesheet .= "$selector.head {{$this->header_content_style}}\n";
-        }
-        if ($this->footer_content_style != '') {
-            $stylesheet .= "$selector.foot {{$this->footer_content_style}}\n";
-        }
-
-        // Styles for important stuff
-        // note: neglect economy_mode, empty styles are meaningless
-        if ($this->important_styles != '') {
-            $stylesheet .= "$selector.imp {{$this->important_styles}}\n";
-        }
-
-        // Simple line number styles
-        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->line_style1 != '') {
-            $stylesheet .= "{$selector}li, {$selector}.li1 {{$this->line_style1}}\n";
-        }
-        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->table_linenumber_style != '') {
-            $stylesheet .= "{$selector}.ln {{$this->table_linenumber_style}}\n";
-        }
-        // If there is a style set for fancy line numbers, echo it out
-        if ((!$economy_mode || $this->line_numbers == GESHI_FANCY_LINE_NUMBERS) && $this->line_style2 != '') {
-            $stylesheet .= "{$selector}.li2 {{$this->line_style2}}\n";
-        }
-
-        // note: empty styles are meaningless
-        foreach ($this->language_data['STYLES']['KEYWORDS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode ||
-                (isset($this->lexic_permissions['KEYWORDS'][$group]) &&
-                $this->lexic_permissions['KEYWORDS'][$group]))) {
-                $stylesheet .= "$selector.kw$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['COMMENTS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode ||
-                (isset($this->lexic_permissions['COMMENTS'][$group]) &&
-                $this->lexic_permissions['COMMENTS'][$group]) ||
-                (!empty($this->language_data['COMMENT_REGEXP']) &&
-                !empty($this->language_data['COMMENT_REGEXP'][$group])))) {
-                $stylesheet .= "$selector.co$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['ESCAPE_CHAR'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['ESCAPE_CHAR'])) {
-                // NEW: since 1.0.8 we have to handle hardescapes
-                if ($group === 'HARD') {
-                    $group = '_h';
-                }
-                $stylesheet .= "$selector.es$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['BRACKETS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['BRACKETS'])) {
-                $stylesheet .= "$selector.br$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['SYMBOLS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['SYMBOLS'])) {
-                $stylesheet .= "$selector.sy$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['STRINGS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['STRINGS'])) {
-                // NEW: since 1.0.8 we have to handle hardquotes
-                if ($group === 'HARD') {
-                    $group = '_h';
-                }
-                $stylesheet .= "$selector.st$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['NUMBERS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['NUMBERS'])) {
-                $stylesheet .= "$selector.nu$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['METHODS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['METHODS'])) {
-                $stylesheet .= "$selector.me$group {{$styles}}\n";
-            }
-        }
-        // note: neglect economy_mode, empty styles are meaningless
-        foreach ($this->language_data['STYLES']['SCRIPT'] as $group => $styles) {
-            if ($styles != '') {
-                $stylesheet .= "$selector.sc$group {{$styles}}\n";
-            }
-        }
-        foreach ($this->language_data['STYLES']['REGEXPS'] as $group => $styles) {
-            if ($styles != '' && (!$economy_mode ||
-                (isset($this->lexic_permissions['REGEXPS'][$group]) &&
-                $this->lexic_permissions['REGEXPS'][$group]))) {
-                if (is_array($this->language_data['REGEXPS'][$group]) &&
-                    array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$group])) {
-                    $stylesheet .= "$selector.";
-                    $stylesheet .= $this->language_data['REGEXPS'][$group][GESHI_CLASS];
-                    $stylesheet .= " {{$styles}}\n";
-                } else {
-                    $stylesheet .= "$selector.re$group {{$styles}}\n";
-                }
-            }
-        }
-        // Styles for lines being highlighted extra
-        if (!$economy_mode || (count($this->highlight_extra_lines)!=count($this->highlight_extra_lines_styles))) {
-            $stylesheet .= "{$selector}.ln-xtra, {$selector}li.ln-xtra, {$selector}div.ln-xtra {{$this->highlight_extra_lines_style}}\n";
-        }
-        $stylesheet .= "{$selector}span.xtra { display:block; }\n";
-        foreach ($this->highlight_extra_lines_styles as $lineid => $linestyle) {
-            $stylesheet .= "{$selector}.lx$lineid, {$selector}li.lx$lineid, {$selector}div.lx$lineid {{$linestyle}}\n";
-        }
-
-        return $stylesheet;
-    }
-
-    /**
-     * Get's the style that is used for the specified line
-     *
-     * @param int The line number information is requested for
-     * @access private
-     * @since 1.0.7.21
-     */
-    function get_line_style($line) {
-        //$style = null;
-        $style = null;
-        if (isset($this->highlight_extra_lines_styles[$line])) {
-            $style = $this->highlight_extra_lines_styles[$line];
-        } else { // if no "extra" style assigned
-            $style = $this->highlight_extra_lines_style;
-        }
-
-        return $style;
-    }
-
-    /**
-    * this functions creates an optimized regular expression list
-    * of an array of strings.
-    *
-    * Example:
-    * <code>$list = array('faa', 'foo', 'foobar');
-    *          => string 'f(aa|oo(bar)?)'</code>
-    *
-    * @param $list array of (unquoted) strings
-    * @param $regexp_delimiter your regular expression delimiter, @see preg_quote()
-    * @return string for regular expression
-    * @author Milian Wolff <mail@milianw.de>
-    * @since 1.0.8
-    * @access private
-    */
-    function optimize_regexp_list($list, $regexp_delimiter = '/') {
-        $regex_chars = array('.', '\\', '+', '-', '*', '?', '[', '^', ']', '$',
-            '(', ')', '{', '}', '=', '!', '<', '>', '|', ':', $regexp_delimiter);
-        sort($list);
-        $regexp_list = array('');
-        $num_subpatterns = 0;
-        $list_key = 0;
-
-        // the tokens which we will use to generate the regexp list
-        $tokens = array();
-        $prev_keys = array();
-        // go through all entries of the list and generate the token list
-        $cur_len = 0;
-        for ($i = 0, $i_max = count($list); $i < $i_max; ++$i) {
-            if ($cur_len > GESHI_MAX_PCRE_LENGTH) {
-                // seems like the length of this pcre is growing exorbitantly
-                $regexp_list[++$list_key] = $this->_optimize_regexp_list_tokens_to_string($tokens);
-                $num_subpatterns = substr_count($regexp_list[$list_key], '(?:');
-                $tokens = array();
-                $cur_len = 0;
-            }
-            $level = 0;
-            $entry = preg_quote((string) $list[$i], $regexp_delimiter);
-            $pointer = &$tokens;
-            // properly assign the new entry to the correct position in the token array
-            // possibly generate smaller common denominator keys
-            while (true) {
-                // get the common denominator
-                if (isset($prev_keys[$level])) {
-                    if ($prev_keys[$level] == $entry) {
-                        // this is a duplicate entry, skip it
-                        continue 2;
-                    }
-                    $char = 0;
-                    while (isset($entry[$char]) && isset($prev_keys[$level][$char])
-                            && $entry[$char] == $prev_keys[$level][$char]) {
-                        ++$char;
-                    }
-                    if ($char > 0) {
-                        // this entry has at least some chars in common with the current key
-                        if ($char == strlen($prev_keys[$level])) {
-                            // current key is totally matched, i.e. this entry has just some bits appended
-                            $pointer = &$pointer[$prev_keys[$level]];
-                        } else {
-                            // only part of the keys match
-                            $new_key_part1 = substr($prev_keys[$level], 0, $char);
-                            $new_key_part2 = substr($prev_keys[$level], $char);
-
-                            if (in_array($new_key_part1[0], $regex_chars)
-                                || in_array($new_key_part2[0], $regex_chars)) {
-                                // this is bad, a regex char as first character
-                                $pointer[$entry] = array('' => true);
-                                array_splice($prev_keys, $level, count($prev_keys), $entry);
-                                $cur_len += strlen($entry);
-                                continue;
-                            } else {
-                                // relocate previous tokens
-                                $pointer[$new_key_part1] = array($new_key_part2 => $pointer[$prev_keys[$level]]);
-                                unset($pointer[$prev_keys[$level]]);
-                                $pointer = &$pointer[$new_key_part1];
-                                // recreate key index
-                                array_splice($prev_keys, $level, count($prev_keys), array($new_key_part1, $new_key_part2));
-                                $cur_len += strlen($new_key_part2);
-                            }
-                        }
-                        ++$level;
-                        $entry = substr($entry, $char);
-                        continue;
-                    }
-                    // else: fall trough, i.e. no common denominator was found
-                }
-                if ($level == 0 && !empty($tokens)) {
-                    // we can dump current tokens into the string and throw them away afterwards
-                    $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
-                    $new_subpatterns = substr_count($new_entry, '(?:');
-                    if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + $new_subpatterns > GESHI_MAX_PCRE_SUBPATTERNS) {
-                        $regexp_list[++$list_key] = $new_entry;
-                        $num_subpatterns = $new_subpatterns;
-                    } else {
-                        if (!empty($regexp_list[$list_key])) {
-                            $new_entry = '|' . $new_entry;
-                        }
-                        $regexp_list[$list_key] .= $new_entry;
-                        $num_subpatterns += $new_subpatterns;
-                    }
-                    $tokens = array();
-                    $cur_len = 0;
-                }
-                // no further common denominator found
-                $pointer[$entry] = array('' => true);
-                array_splice($prev_keys, $level, count($prev_keys), $entry);
-
-                $cur_len += strlen($entry);
-                break;
-            }
-            unset($list[$i]);
-        }
-        // make sure the last tokens get converted as well
-        $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
-        if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + substr_count($new_entry, '(?:') > GESHI_MAX_PCRE_SUBPATTERNS) {
-            if ( !empty($regexp_list[$list_key]) ) {
-              ++$list_key;
-            }
-            $regexp_list[$list_key] = $new_entry;
-        } else {
-            if (!empty($regexp_list[$list_key])) {
-                $new_entry = '|' . $new_entry;
-            }
-            $regexp_list[$list_key] .= $new_entry;
-        }
-        return $regexp_list;
-    }
-    /**
-    * this function creates the appropriate regexp string of an token array
-    * you should not call this function directly, @see $this->optimize_regexp_list().
-    *
-    * @param &$tokens array of tokens
-    * @param $recursed bool to know wether we recursed or not
-    * @return string
-    * @author Milian Wolff <mail@milianw.de>
-    * @since 1.0.8
-    * @access private
-    */
-    function _optimize_regexp_list_tokens_to_string(&$tokens, $recursed = false) {
-        $list = '';
-        foreach ($tokens as $token => $sub_tokens) {
-            $list .= $token;
-            $close_entry = isset($sub_tokens['']);
-            unset($sub_tokens['']);
-            if (!empty($sub_tokens)) {
-                $list .= '(?:' . $this->_optimize_regexp_list_tokens_to_string($sub_tokens, true) . ')';
-                if ($close_entry) {
-                    // make sub_tokens optional
-                    $list .= '?';
-                }
-            }
-            $list .= '|';
-        }
-        if (!$recursed) {
-            // do some optimizations
-            // common trailing strings
-            // BUGGY!
-            //$list = preg_replace_callback('#(?<=^|\:|\|)\w+?(\w+)(?:\|.+\1)+(?=\|)#', create_function(
-            //    '$matches', 'return "(?:" . preg_replace("#" . preg_quote($matches[1], "#") . "(?=\||$)#", "", $matches[0]) . ")" . $matches[1];'), $list);
-            // (?:p)? => p?
-            $list = preg_replace('#\(\?\:(.)\)\?#', '\1?', $list);
-            // (?:a|b|c|d|...)? => [abcd...]?
-            // TODO: a|bb|c => [ac]|bb
-            static $callback_2;
-            if (!isset($callback_2)) {
-                $callback_2 = create_function('$matches', 'return "[" . str_replace("|", "", $matches[1]) . "]";');
-            }
-            $list = preg_replace_callback('#\(\?\:((?:.\|)+.)\)#', $callback_2, $list);
-        }
-        // return $list without trailing pipe
-        return substr($list, 0, -1);
-    }
-} // End Class GeSHi
-
-
-if (!function_exists('geshi_highlight')) {
-    /**
-     * Easy way to highlight stuff. Behaves just like highlight_string
-     *
-     * @param string The code to highlight
-     * @param string The language to highlight the code in
-     * @param string The path to the language files. You can leave this blank if you need
-     *               as from version 1.0.7 the path should be automatically detected
-     * @param boolean Whether to return the result or to echo
-     * @return string The code highlighted (if $return is true)
-     * @since 1.0.2
-     */
-    function geshi_highlight($string, $language, $path = null, $return = false) {
-        $geshi = new GeSHi($string, $language, $path);
-        $geshi->set_header_type(GESHI_HEADER_NONE);
-
-        if ($return) {
-            return '<code>' . $geshi->parse_code() . '</code>';
-        }
-
-        echo '<code>' . $geshi->parse_code() . '</code>';
-
-        if ($geshi->error()) {
-            return false;
-        }
-        return true;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/4cs.php b/inc/geshi/4cs.php
deleted file mode 100644
index 5209c51e8..000000000
--- a/inc/geshi/4cs.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/*************************************************************************************
- * 4cs.php
- * ------
- * Author: Jason Curl (jason.curl@continental-corporation.com)
- * Copyright: (c) 2009 Jason Curl
- * Release Version: 1.0.8.11
- * Date Started: 2009/09/05
- *
- * 4CS language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/09/05
- *   -  First Release
- *
- * TODO (updated 2009/09/01)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GADV 4CS',
-    'COMMENT_SINGLE' => array(1 => "//"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'All', 'AllMatches', 'And', 'And_Filters', 'As', 'Asc', 'BasedOn',
-            'BestMatch', 'Block', 'Buffer', 'ByRef', 'ByVal', 'Call', 'Channel',
-            'Chr', 'Clear', 'Close', 'Confirm', 'Const', 'Continue', 'Cos',
-            'Critical', 'Declare', 'Default', 'DefaultChannel', 'DefaultDelayTime',
-            'DefaultReceiveMode', 'DefaultResponseTime', '#Define', 'DelayTime',
-            'Delete', 'Div', 'Else', '#Else', 'ElseIf', '#ElseIf', 'End', 'EndCritical',
-            'EndInlineC', 'EndFunction', 'EndIf', '#EndIf', 'EndInputList',
-            'EndLocalChannel', 'EndScenario', 'EndSub', 'EndWhile', 'Error',
-            'ErrorLevelOff', 'ErrorLevelOn', 'ErrorLevelSet', 'ErrorLevelSetRaw',
-            'Event', 'EventMode', 'EventOff', 'EventOn', 'EventSet', 'EventSetRaw',
-            'Execute', 'Exit', 'Exp', 'FileClose', 'FilterClear', 'FileEOF', 'FileOpen',
-            'FileRead', 'FileSize', 'FileWrite', 'FilterAdd', 'FilterMode',
-            'FilterOff', 'FilterOn', 'For', 'Format', 'Function', 'GoOnline', 'GoTo',
-            'Handle', 'Hide', 'If', '#If', '#IfDef', '#IfNDef', 'Ignore', '#Include',
-            'InlineC', 'Input', 'InputItem', 'InputList', 'Kill', 'LBound', 'LocalChannel',
-            'Local', 'Log', 'Log10', 'LogOff', 'LogOn', 'Loop', 'Message', 'Mod',
-            'MonitorChannel', 'MostFormat', 'MostMessage', 'Named', 'Never', 'Next',
-            'NoOrder', 'Not', 'Nothing', 'NoWait', 'Numeric', 'OnError', 'OnEvent',
-            'Or', 'Or_Filters', 'Order', 'Pass', 'Pow', 'Prototype', 'Quit', 'Raise',
-            'Random', 'Receive', 'ReceiveMode', 'ReceiveRaw', 'Redim', 'Remote', 'Repeat',
-            'Repeated', 'ResponseTime', 'Resume', 'ResumeCritical', 'RT_Common',
-            'RT_Dll_Call', 'RT_FILEIO', 'RT_General', 'RT_HardwareAccess',
-            'RT_MessageVariableAccess', 'RT_Scenario', 'RT_VariableAccess', 'Runtime',
-            'Scenario', 'ScenarioEnd', 'ScenarioStart', 'ScenarioStatus', 'ScenarioTerminate',
-            'Send', 'SendRaw', 'Set', 'SetError', 'Sin', 'Single', 'Show', 'Start',
-            'StartCritical', 'Starts', 'Static', 'Step', 'Stop', 'String', 'Sub',
-            'System_Error', 'TerminateAllChilds', 'Terminates', 'Then', 'Throw', 'TimeOut',
-            'To', 'TooLate', 'Trunc', 'UBound', 'Unexpected', 'Until', 'User_Error',
-            'View', 'Wait', 'Warning', 'While', 'XOr'
-            ),
-        2 => array(
-            'alias', 'winapi', 'long', 'char', 'double', 'float', 'int', 'short', 'lib'
-            )
-        ),
-    'SYMBOLS' => array(
-        '=', ':=', '<', '>', '<>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000C0; font-weight: bold;',
-            2 => 'color: #808080;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000080;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #800080;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #66cc66;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000080;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/6502acme.php b/inc/geshi/6502acme.php
deleted file mode 100644
index 203e04dfa..000000000
--- a/inc/geshi/6502acme.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/*************************************************************************************
- * 6502acme.php
- * -------
- * Author: Warren Willmey
- * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.11
- * Date Started: 2010/05/26
- *
- * MOS 6502 (more specifically 6510) ACME Cross Assembler 0.93 by Marco Baye language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/22
- *  -  First Release
- *
- * TODO (updated 2010/07/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'MOS 6502 (6510) ACME Cross Assembler format',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* 6502/6510 Opcodes. */
-        1 => array(
-            'adc', 'and', 'asl', 'bcc', 'bcs', 'beq', 'bit', 'bmi',
-            'bne', 'bpl', 'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli',
-            'clv', 'cmp', 'cpx', 'cpy', 'dec', 'dex', 'dey', 'eor',
-            'inc', 'inx', 'iny', 'jmp', 'jsr', 'lda', 'ldx', 'ldy',
-            'lsr', 'nop', 'ora', 'pha', 'php', 'pla', 'plp', 'rol',
-            'ror', 'rti', 'rts', 'sbc', 'sec', 'sed', 'sei', 'sta',
-            'stx', 'sty', 'tax', 'tay', 'tsx', 'txa', 'txs', 'tya',
-            ),
-        /* Index Registers, yes the 6502 has other registers by they are only
-        * accessable by specific opcodes. The 65816 also has access to the stack pointer S. */
-        2 => array(
-            'x', 'y', 's'
-            ),
-        /* Directives or "pseudo opcodes" as defined by ACME 0.93 file AllPOs.txt. */
-        3 => array(
-            '!8', '!08', '!by', '!byte',
-            '!16', '!wo', '!word',
-            '!24', '!32',
-            '!fi', '!fill',
-            '!align',
-            '!ct', '!convtab',
-            '!tx', '!text',
-            '!pet',
-            '!raw',
-            '!scrxor',
-            '!to',
-            '!source',
-            '!bin', '!binary',
-            '!zn', '!zone',
-            '!sl',
-            '!svl',
-            '!sal',
-            '!if', '!ifdef',
-            '!for',
-            '!set',
-            '!do', 'while', 'until',
-            '!eof', '!endoffile',
-            '!warn', '!error', '!serious',
-            '!macro',
-//            , '*='        // Not a valid keyword (uses both * and = signs) moved to symbols instead.
-            '!initmem',
-            '!pseudopc',
-            '!cpu',
-            '!al', '!as', '!rl', '!rs',
-            ),
-
-        /* 6502/6510 undocumented opcodes (often referred to as illegal instructions).
-        *  These are present in the 6502/6510 but NOT in the newer CMOS revisions of the 65C02 or 65816.
-        *  As they are undocumented instructions there are no "official" names for them, there are also
-        *  several more that mainly perform various forms of crash and are not supported by ACME 0.93.
-        */
-        4 => array(
-            'anc', 'arr', 'asr', 'dcp', 'dop', 'isc', 'jam', 'lax',
-            'rla', 'rra', 'sax', 'sbx', 'slo', 'sre', 'top',
-            ),
-        /* 65c02 instructions, MOS added a few (much needed) instructions in the CMOS version of the 6502, but stupidly removed the undocumented/illegal opcodes.
-        *  ACME 0.93 does not support the rmb0-7 and smb0-7 instructions (they are currently rem'ed out).  */
-        5 => array(
-            'bra', 'phx', 'phy', 'plx', 'ply', 'stz', 'trb', 'tsb'
-            ),
-        /* 65816 instructions. */
-        6 => array(
-            'brl', 'cop', 'jml', 'jsl', 'mvn', 'mvp', 'pea', 'pei',
-            'per', 'phb', 'phd', 'phk', 'plb', 'pld', 'rep', 'rtl',
-            'sep', 'tcd', 'tcs', 'tdc', 'tsc', 'txy', 'tyx', 'wdm',
-            'xba', 'xce',
-            ),
-        /* Deprecated directives or "pseudo opcodes" as defined by ACME 0.93 file AllPOs.txt. */
-        7 => array(
-            '!cbm',
-            '!sz', '!subzone',
-            '!realpc',
-            ),
-        /* Math functions, some are aliases for the symbols. */
-        8 => array(
-            'not', 'div', 'mod', 'xor', 'or', 'sin', 'cos', 'tan',
-            'arcsin', 'arccos', 'arctan', 'int', 'float',
-
-            ),
-
-        ),
-    'SYMBOLS' => array(
-//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
-        '*=', '#', '!', '^', '-', '*', '/',
-        '%', '+', '-', '<<', '>>', '>>>',
-        '<', '>', '^', '<=', '<', '>=', '>', '!=',
-        '=', '&', '|', '<>',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00f; font-weight:bold;',
-            2 => 'color: #00f; font-weight:bold;',
-            3 => 'color: #080; font-weight:bold;',
-            4 => 'color: #f00; font-weight:bold;',
-            5 => 'color: #80f; font-weight:bold;',
-            6 => 'color: #f08; font-weight:bold;',
-            7 => 'color: #a04; font-weight:bold; font-style: italic;',
-            8 => 'color: #000;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #999; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #009; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #080;'
-            ),
-        'NUMBERS' => array(
-            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
-            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
-            GESHI_NUMBER_HEX_PREFIX         => 'color: #f00;',
-            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
-            GESHI_NUMBER_FLT_NONSCI         => 'color: #f00;',
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #080;'
-            ),
-        'REGEXPS' => array(
-            0   => 'color: #f00;'
-            , 1 => 'color: #933;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_BIN_PREFIX_PERCENT,
-        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
-    'REGEXPS' => array(
-        //ACME .# Binary number format. e.g. %..##..##..##
-        0 => '\%[\.\#]{1,64}',
-        //ACME Local Labels
-        1 => '\.[_a-zA-Z][_a-zA-Z0-9]*',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8,
-    'PARSER_CONTROL' => array(
-        'NUMBERS' => array(
-            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/6502kickass.php b/inc/geshi/6502kickass.php
deleted file mode 100644
index 804282629..000000000
--- a/inc/geshi/6502kickass.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/*************************************************************************************
- * 6502kickass.php
- * -------
- * Author: Warren Willmey
- * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.11
- * Date Started: 2010/06/07
- *
- * MOS 6502 (6510) Kick Assembler 3.13 language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/22
- *  -  First Release
- *
- * TODO (updated 2010/07/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'MOS 6502 (6510) Kick Assembler format',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* 6502/6510 Opcodes including undocumented opcodes as Kick Assembler 3.13 does not make a distinction - they are ALL valid. */
-        1 => array(
-            'adc', 'ahx', 'alr', 'anc', 'anc2', 'and', 'arr', 'asl',
-            'axs', 'bcc', 'bcs', 'beq', 'bit', 'bmi', 'bne', 'bpl',
-            'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli', 'clv', 'cmp',
-            'cpx', 'cpy', 'dcp', 'dec', 'dex', 'dey', 'eor', 'inc',
-            'inx', 'iny', 'isc', 'jmp', 'jsr', 'las', 'lax', 'lda',
-            'ldx', 'ldy', 'lsr', 'nop', 'ora', 'pha', 'php', 'pla',
-            'plp', 'rla', 'rol', 'ror', 'rra', 'rti', 'rts', 'sax',
-            'sbc', 'sbc2', 'sec', 'sed', 'sei', 'shx', 'shy', 'slo',
-            'sre', 'sta', 'stx', 'sty', 'tas', 'tax', 'tay', 'tsx',
-            'txa', 'txs', 'tya', 'xaa',
-            ),
-        /* DTV additional Opcodes. */
-        2 => array(
-            'bra', 'sac', 'sir'
-            ),
-        /* Index Registers, yes the 6502 has other registers by they are only
-        * accessable by specific opcodes. */
-        3 => array(
-            'x', 'y'
-            ),
-        /* Directives. */
-        4 => array(
-            '.pc', '.pseudopc', 'virtual', '.align', '.byte', '.word', '.text', '.fill',
-            '.import source', '.import binary', '.import c64', '.import text', '.import', '.print', '.printnow',
-            '.error', '.var', '.eval', '.const', '.eval const', '.enum', '.label', '.define', '.struct',
-            'if', '.for', '.macro', '.function', '.return', '.pseudocommand', '.namespace', '.filenamespace',
-            '.assert', '.asserterror',
-            ),
-        /* Kick Assembler 3.13 Functions/Operators. */
-        5 => array(
-            'size', 'charAt', 'substring', 'asNumber', 'asBoolean', 'toIntString', 'toBinaryString', 'toOctalString',
-            'toHexString', 'lock',                                       // String functions/operators.
-            'get', 'set', 'add', 'remove', 'shuffle',                    // List functions.
-            'put', 'keys',                                               // Hashtable functions.
-            'getType', 'getValue', 'CmdArgument',                        // Pseudo Commands functions.
-            'asmCommandSize',                                            // Opcode Constants functions.
-            'LoadBinary', 'getSize',
-            'LoadSid', 'getData',
-            'LoadPicture', 'width', 'height', 'getPixel', 'getSinglecolorByte', 'getMulticolorByte',
-            'createFile', 'writeln',
-            'cmdLineVars',
-            'getX', 'getY', 'getZ',                                             // Vector functions.
-            'RotationMatrix', 'ScaleMatrix', 'MoveMatrix', 'PerspectiveMatrix', // Matrix functions.
-
-            ),
-
-        /* Kick Assembler 3.13 Math Functions. */
-        6 => array(
-            'abs', 'acos', 'asin', 'atan', 'atan2', 'cbrt', 'ceil', 'cos', 'cosh',
-            'exp', 'expm1', 'floor', 'hypot', 'IEEEremainder', 'log', 'log10',
-            'log1p', 'max', 'min', 'pow', 'mod', 'random', 'round', 'signum',
-            'sin', 'sinh', 'sqrt', 'tan', 'tanh', 'toDegrees', 'toRadians',
-            ),
-
-        /* Kick Assembler 3.13 Objects/Data Types. */
-        7 => array(
-            'List',          // List() Object.
-            'Hashtable',     // Hashtable() Object.
-            'Vector',        // Vector() Object.
-            'Matrix',        // Matrix() Object.
-            ),
-
-        /* Kick Assembler 3.13 Constants. */
-        8 => array(
-            'PI', 'E',                                                         // Math Constants.
-            'AT_ABSOLUTE' , 'AT_ABSOLUTEX' , 'AT_ABSOLUTEY' , 'AT_IMMEDIATE',  // Pseudo Commands Constants.
-            'AT_INDIRECT' , 'AT_IZEROPAGEX' , 'AT_IZEROPAGEY' , 'AT_NONE',
-            'BLACK', 'WHITE', 'RED', 'CYAN', 'PURPLE', 'GREEN', 'BLUE',        // Colour Constants.
-            'YELLOW', 'ORANGE', 'BROWN', 'LIGHT_RED', 'DARK_GRAY', 'GRAY',
-            'LIGHT_GREEN', 'LIGHT_BLUE', 'LIGHT_GRAY',
-            'C64FILE',                                                         // Template Tag names.
-            'BF_C64FILE', 'BF_BITMAP_SINGLECOLOR', 'BF_KOALA' , 'BF_FLI',      // Binary format constant
-            ),
-
-        ),
-    'SYMBOLS' => array(
-//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
-        '-', '+', '-', '*', '/', '>', '<', '<<', '>>', '&', '|', '^', '=', '==',
-        '!=', '>=', '<=', '!', '&&', '||', '#',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00f; font-weight:bold;',
-            2 => 'color: #00f; font-weight:bold;',
-            3 => 'color: #00f; font-weight:bold;',
-            4 => 'color: #080; font-weight:bold;',
-            5 => 'color: #80f; font-weight:bold;',
-            6 => 'color: #f08; font-weight:bold;',
-            7 => 'color: #a04; font-weight:bold; font-style: italic;',
-            8 => 'color: #f08; font-weight:bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #999; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #009; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #080;'
-            ),
-        'NUMBERS' => array(
-            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
-            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
-            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
-            GESHI_NUMBER_FLT_NONSCI         => 'color: #f00;',
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #080;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #933;',
-            1 => 'color: #933;',
-            2 => 'color: #933;',
-            3 => 'color: #00f; font-weight:bold;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
-        GESHI_NUMBER_BIN_PREFIX_PERCENT,
-        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
-    'REGEXPS' => array(
-        //Labels end with a collon.
-        0 => '[!]{0,1}[_a-zA-Z][_a-zA-Z0-9]*\:',
-        //Multi Labels (local labels) references start with ! and end with + or - for forward/backward reference.
-        1 => '![_a-zA-Z][_a-zA-Z0-9]*[+-]',
-        //Macros start with a colon :Macro.
-        2 => ':[_a-zA-Z][_a-zA-Z0-9]*',
-        // Opcode Constants, such as LDA_IMM, STA_IZPY are basically all 6502 opcodes
-        // in UPPER case followed by _underscore_ and the ADDRESS MODE.
-        // As you might imagine that is rather a lot ( 78 supported Opcodes * 12 Addressing modes = 936 variations)
-        // So I thought it better and easier to maintain as a regular expression.
-        // NOTE: The order of the Address Modes must be maintained or it wont work properly (eg. place ZP first and find out!)
-        3 => '[A-Z]{3}[2]?_(?:IMM|IND|IZPX|IZPY|ZPX|ZPY|ABSX|ABSY|REL|ABS|ZP)',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8,
-    'PARSER_CONTROL' => array(
-        'NUMBERS'  => array(
-            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
-            ),
-        'KEYWORDS' => array(
-            5 => array (
-                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\;>|^&'\"])"
-                ),
-            6 => array (
-                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\;>|^&'\"])"
-                ),
-            8 => array (
-                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\;>|^&'\"])"
-                )
-            )
-        ),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/6502tasm.php b/inc/geshi/6502tasm.php
deleted file mode 100644
index 86aa479df..000000000
--- a/inc/geshi/6502tasm.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/*************************************************************************************
- * 6502tasm.php
- * -------
- * Author: Warren Willmey
- * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.11
- * Date Started: 2010/06/02
- *
- * MOS 6502 (6510) TASM/64TASS (64TASS being the super set of TASM) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/22
- *  -  First Release
- *
- * TODO (updated 2010/07/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'MOS 6502 (6510) TASM/64TASS 1.46 Assembler format',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* 6502/6510 Opcodes. */
-        1 => array(
-            'adc', 'and', 'asl', 'bcc', 'bcs', 'beq', 'bit', 'bmi',
-            'bne', 'bpl', 'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli',
-            'clv', 'cmp', 'cpx', 'cpy', 'dec', 'dex', 'dey', 'eor',
-            'inc', 'inx', 'iny', 'jmp', 'jsr', 'lda', 'ldx', 'ldy',
-            'lsr', 'nop', 'ora', 'pha', 'php', 'pla', 'plp', 'rol',
-            'ror', 'rti', 'rts', 'sbc', 'sec', 'sed', 'sei', 'sta',
-            'stx', 'sty', 'tax', 'tay', 'tsx', 'txa', 'txs', 'tya',
-            ),
-        /* Index Registers, yes the 6502 has other registers by they are only
-        * accessable by specific opcodes. The 65816 also has access to the stack pointer S. */
-        2 => array(
-            'x', 'y', 's'
-            ),
-        /* Directives. */
-        3 => array(
-            '.al', '.align', '.as', '.assert', '.binary', '.byte', '.cerror', '.char',
-            '.comment', '.cpu', '.cwarn', '.databank', '.dpage', '.else', '.elsif',
-            '.enc', '.endc', '.endif', '.endm', '.endp', '.error', '.fi', '.fill',
-            '.for', '.here', '.if', '.ifeq', '.ifmi', '.ifne', '.ifpl',
-            '.include', '.int', '.logical', '.long', '.macro', '.next', '.null', '.offs',
-            '.page', '.pend', '.proc', '.rept', '.rta', '.shift', '.text', '.warn', '.word',
-            '.xl', '.xs',
-//            , '*='        // Not a valid keyword (uses both * and = signs) moved to symbols instead.
-            ),
-
-        /* 6502/6510 undocumented opcodes (often referred to as illegal instructions).
-        *  These are present in the 6502/6510 but NOT in the newer CMOS revisions of the 65C02 or 65816.
-        *  As they are undocumented instructions there are no "official" names for them, these are the names
-        *  used by 64TASS V1.46.
-        */
-        4 => array(
-            'ahx', 'alr', 'anc', 'ane', 'arr', 'asr', 'axs', 'dcm',
-            'dcp', 'ins', 'isb', 'isc', 'jam', 'lae', 'las', 'lax',
-            'lds', 'lxa', 'rla', 'rra', 'sax', 'sbx', 'sha', 'shs',
-            'shx', 'shy', 'slo', 'sre', 'tas', 'xaa',
-            ),
-        /* 65c02 instructions, MOS added a few (much needed) instructions in the
-        *  CMOS version of the 6502, but stupidly removed the undocumented/illegal opcodes.  */
-        5 => array(
-            'bra', 'dea', 'gra', 'ina', 'phx', 'phy', 'plx', 'ply',
-            'stz', 'trb', 'tsb',
-            ),
-        /* 65816 instructions. */
-        6 => array(
-            'brl', 'cop', 'jml', 'jsl', 'mvn', 'mvp', 'pea', 'pei',
-            'per', 'phb', 'phd', 'phk', 'plb', 'pld', 'rep', 'rtl',
-            'sep', 'stp', 'swa', 'tad', 'tcd', 'tcs', 'tda',
-            'tdc', 'tsa', 'tsc', 'txy', 'tyx', 'wai', 'xba', 'xce',
-            ),
-        /* Deprecated directives (or yet to be implemented). */
-        7 => array(
-            '.global', '.check'
-            ),
-        ),
-    'SYMBOLS' => array(
-//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
-        '*=', '#', '<', '>', '`', '=', '<', '>',
-        '!=', '>=', '<=', '+', '-', '*', '/', '//', '|',
-        '^', '&', '<<', '>>', '-', '~', '!',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00f; font-weight:bold;',
-            2 => 'color: #00f; font-weight:bold;',
-            3 => 'color: #080; font-weight:bold;',
-            4 => 'color: #f00; font-weight:bold;',
-            5 => 'color: #80f; font-weight:bold;',
-            6 => 'color: #f08; font-weight:bold;',
-            7 => 'color: #a04; font-weight:bold; font-style: italic;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #999; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #009; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #080;'
-            ),
-        'NUMBERS' => array(
-            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
-            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
-            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #080;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
-        GESHI_NUMBER_BIN_PREFIX_PERCENT,
-        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8,
-    'PARSER_CONTROL' => array(
-        'NUMBERS' => array(
-            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/68000devpac.php b/inc/geshi/68000devpac.php
deleted file mode 100644
index f46387ae9..000000000
--- a/inc/geshi/68000devpac.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/*************************************************************************************
- * 68000devpac.php
- * -------
- * Author: Warren Willmey
- * Copyright: (c) 2010 Warren Willmey.
- * Release Version: 1.0.8.11
- * Date Started: 2010/06/09
- *
- * Motorola 68000 - HiSoft Devpac ST 2 Assembler language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/22
- *  -  First Release
- *
- * TODO (updated 2010/07/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Motorola 68000 - HiSoft Devpac ST 2 Assembler format',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* Directives. */
-        1 => array(
-            'end', 'include', 'incbin', 'opt', 'even', 'cnop', 'dc.b', 'dc.w',
-            'dc.l', 'ds.b', 'ds.w', 'ds.l', 'dcb.b', 'dcb.w', 'dcb.l',
-            'fail', 'output', '__g2', 'rept', 'endr', 'list', 'nolist', 'plen',
-            'llen', 'ttl', 'subttl', 'spc', 'page', 'listchar', 'format',
-            'equ', 'equr', 'set', 'reg', 'rs.b', 'rs.w', 'rs.l', 'rsreset',
-            'rsset', '__rs', 'ifeq', 'ifne', 'ifgt', 'ifge', 'iflt', 'ifle', 'endc',
-            'ifd', 'ifnd', 'ifc', 'ifnc', 'elseif', 'iif', 'macro', 'endm', 'mexit',
-            'narg', '\@', 'section', 'text', 'data', 'bss', 'xdef', 'xref', 'org',
-            'offset', '__lk', 'comment',
-            ),
-        /* 68000 Opcodes. */
-        2 => array(
-            'abcd',    'add', 'adda', 'addi', 'addq', 'addx',  'and', 'andi',
-            'asl',     'asr',  'bcc', 'bchg', 'bclr',  'bcs',  'beq',  'bge',
-            'bgt',     'bhi',  'ble',  'bls',  'blt',  'bmi',  'bne',  'bpl',
-            'bra',    'bset',  'bsr', 'btst',  'bvc',  'bvs',  'chk',  'clr',
-            'cmp',    'cmpa', 'cmpi', 'cmpm', 'dbcc', 'dbcs', 'dbeq',  'dbf',
-            'dbge',   'dbgt', 'dbhi', 'dble', 'dbls', 'dblt', 'dbmi', 'dbne',
-            'dbpl',   'dbra',  'dbt', 'dbvc', 'dbvs', 'divs', 'divu',  'eor',
-            'eori',    'exg',  'ext','illegal','jmp',  'jsr',  'lea', 'link',
-            'lsl',     'lsr', 'move','movea','movem','movep','moveq', 'muls',
-            'mulu',   'nbcd',  'neg', 'negx',  'nop',  'not',   'or',  'ori',
-            'pea',   'reset',  'rol',  'ror', 'roxl', 'roxr',  'rte',  'rtr',
-            'rts',    'sbcd',  'scc',  'scs',  'seq',   'sf',  'sge',  'sgt',
-            'shi',     'sle',  'sls',  'slt',  'smi',  'sne',  'spl',   'st',
-            'stop',    'sub', 'suba', 'subi', 'subq', 'subx',  'svc',  'svs',
-            'swap',    'tas', 'trap','trapv',  'tst', 'unlk',
-            ),
-        /* oprand sizes. */
-        3 => array(
-            'b', 'w', 'l' , 's'
-            ),
-        /* 68000 Registers. */
-        4 => array(
-            'd0', 'd1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7',
-            'a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'sp', 'usp', 'ssp',
-            'pc', 'ccr', 'sr',
-            ),
-        ),
-    'SYMBOLS' => array(
-//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
-        '+', '-', '~', '<<', '>>', '&',
-        '!', '^', '*', '/', '=', '<', '>',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #f08; font-weight:bold;',
-            2 => 'color: #00f; font-weight:bold;',
-            3 => 'color: #00f; font-weight:bold;',
-            4 => 'color: #080; font-weight:bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #999; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #009; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #080;'
-            ),
-        'NUMBERS' => array(
-            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
-            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
-            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
-            GESHI_NUMBER_OCT_PREFIX_AT      => 'color: #f00;',
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #080;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #933;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
-        GESHI_NUMBER_OCT_PREFIX_AT |
-        GESHI_NUMBER_BIN_PREFIX_PERCENT,
-    'REGEXPS' => array(
-        //Labels may end in a colon.
-        0 => '(?<=\A\x20|\r|\n|^)[\._a-zA-Z][\._a-zA-Z0-9]*[\:]?[\s]'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8,
-    'PARSER_CONTROL' => array(
-        'NUMBERS' => array(
-            'PRECHECK_RX' => '/[\da-fA-F\.\$\%\@]/'
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/abap.php b/inc/geshi/abap.php
deleted file mode 100644
index 5acd261c6..000000000
--- a/inc/geshi/abap.php
+++ /dev/null
@@ -1,1409 +0,0 @@
-<?php
-/*************************************************************************************
- * abap.php
- * --------
- * Author: Andres Picazo (andres@andrespicazo.com)
- * Contributors:
- *  - Sandra Rossi (sandra.rossi@gmail.com)
- *  - Jacob Laursen (jlu@kmd.dk)
- * Copyright: (c) 2007 Andres Picazo
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * ABAP language file for GeSHi.
- *
- * Reference abap language documentation (abap 7.1) : http://help.sap.com/abapdocu/en/ABENABAP_INDEX.htm
- *
- * ABAP syntax is highly complex, several problems could not be addressed, see TODO below if you dare ;-)
- * Be aware that in ABAP language, keywords may be composed of several tokens,
- *    separated by one or more spaces or carriage returns
- *    (for example CONCATENATE 'hello' 'world' INTO string SEPARATED  BY ' ')
- *    it's why we must decode them with REGEXPS. As there are many keywords with several tokens,
- *    I had to create a separate section in the code to simplify the reading.
- * Be aware that some words may be highlighted several times like for "ref to data", which is first
- *    highlighted for "ref to data", then secondly for "ref to". It is very important to
- *    position "ref to" after "ref to data" otherwise "data" wouldn't be highlighted because
- *    of the previous highlight.
- * Control, declarative and other statements are assigned URLs to sap documentation website:
- *    http://help.sap.com/abapdocu/en/ABAP<statement_name>.htm
- *
- * CHANGES
- * -------
- * 2009/02/25 (1.0.8.3)
- *   -  Some more rework of the language file
- * 2009/01/04 (1.0.8.2)
- *   -  Major Release, more than 1000 statements and keywords added = whole abap 7.1 (Sandra Rossi)
- * 2007/06/27 (1.0.0)
- *   -  First Release
- *
- * TODO
- * ----
- *   - in DATA data TYPE type, 2nd "data" and 2nd "type" are highlighted with data
- *     style, but should be ignored. Same problem for all words!!! This is quite impossible to
- *     solve it as we should define syntaxes of all statements (huge effort!) and use a lex
- *     or something like that instead of regexp I guess.
- *   - Some words are considered as being statement names (report, tables, etc.) though they
- *     are used as keyword in some statements. For example: FORM xxxx TABLES itab. It was
- *     arbitrary decided to define them as statement instead of keyword, because it may be
- *     useful to have the URL to SAP help for some of them.
- *   - if a comment is between 2 words of a keyword (for example SEPARATED "comment \n BY),
- *     it is not considered as a keyword, but it should!
- *   - for statements like "READ DATASET", GeSHi does not allow to set URLs because these
- *     statements are determined by REGEXPS. For "READ DATASET", the URL should be
- *     ABAPREAD_DATASET.htm. If a technical solution is found, be careful : URLs
- *     are sometimes not valid because the URL does not exist. For example, for "AT NEW"
- *     statement, the URL should be ABAPAT_ITAB.htm (not ABAPAT_NEW.htm).
- *     There are many other exceptions.
- *     Note: for adding this functionality within your php program, you can execute this code:
- *       function add_urls_to_multi_tokens( $matches ) {
- *           $url = preg_replace( "/[ \n]+/" , "_" , $matches[3] );
- *           if( $url == $matches[3] ) return $matches[0] ;
- *           else return $matches[1]."<a href=\"http://help.sap.com/abapdocu/en/ABAP".strtoupper($url).".htm\">".$matches[3]."</a>".$matches[4];
- *           }
- *       $html = $geshi->parse_code();
- *       $html = preg_replace_callback( "£(zzz:(control|statement|data);\">)(.+?)(</span>)£s", "add_urls_to_multi_tokens", $html );
- *       echo $html;
- *   - Numbers followed by a dot terminating the statement are not properly recognized
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'ABAP',
-    'COMMENT_SINGLE' => array(
-        1 => '"'
-        ),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        // lines beginning with star at 1st position are comments
-        // (star anywhere else is not a comment, especially be careful with
-        // "assign dref->* to <fs>" statement)
-        2 => '/^\*.*?$/m'
-        ),
-    'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array(
-        1 => "'",
-        2 => "`"
-        ),
-    'ESCAPE_CHAR' => '',
-
-    'KEYWORDS' => array(
-        //***********************************************
-        // Section 2 : process sequences of several tokens
-        //***********************************************
-
-        7 => array(
-            'at new',
-            'at end of',
-            'at first',
-            'at last',
-            'loop at',
-            'loop at screen',
-            ),
-
-        8 => array(
-            'private section',
-            'protected section',
-            'public section',
-            'at line-selection',
-            'at selection-screen',
-            'at user-command',
-            'assign component',
-            'assign table field',
-            'call badi',
-            'call customer-function',
-            'call customer subscreen',
-            'call dialog',
-            'call function',
-            'call method',
-            'call screen',
-            'call selection-screen',
-            'call transaction',
-            'call transformation',
-            'close cursor',
-            'close dataset',
-            'commit work',
-            'convert date',
-            'convert text',
-            'convert time stamp',
-            'create data',
-            'create object',
-            'delete dataset',
-            'delete from',
-            'describe distance',
-            'describe field',
-            'describe list',
-            'describe table',
-            'exec sql',
-            'exit from sql',
-            'exit from step-loop',
-            'export dynpro',
-            'export nametab',
-            'free memory',
-            'generate subroutine-pool',
-            'get badi',
-            'get bit',
-            'get cursor',
-            'get dataset',
-            'get locale',
-            'get parameter',
-            'get pf-status',
-            'get property',
-            'get reference',
-            'get run time',
-            'get time',
-            'get time stamp',
-            'import directory',
-            'insert report',
-            'insert text-pool',
-            'leave list-processing',
-            'leave program',
-            'leave screen',
-            'leave to list-processing',
-            'leave to transaction',
-            'modify line',
-            'modify screen',
-            'move percentage',
-            'open cursor',
-            'open dataset',
-            'raise event',
-            'raise exception',
-            'read dataset',
-            'read line',
-            'read report',
-            'read table',
-            'read textpool',
-            'receive results from function',
-            'refresh control',
-            'rollback work',
-            'set bit',
-            'set blank lines',
-            'set country',
-            'set cursor',
-            'set dataset',
-            'set extended check',
-            'set handler',
-            'set hold data',
-            'set language',
-            'set left scroll-boundary',
-            'set locale',
-            'set margin',
-            'set parameter',
-            'set pf-status',
-            'set property',
-            'set run time analyzer',
-            'set run time clock',
-            'set screen',
-            'set titlebar',
-            'set update task',
-            'set user-command',
-            'suppress dialog',
-            'truncate dataset',
-            'wait until',
-            'wait up to',
-            ),
-
-        9 => array(
-            'accepting duplicate keys',
-            'accepting padding',
-            'accepting truncation',
-            'according to',
-            'actual length',
-            'adjacent duplicates',
-            'after input',
-            'all blob columns',
-            'all clob columns',
-            'all fields',
-            'all methods',
-            'all other columns',
-            'and mark',
-            'and return to screen',
-            'and return',
-            'and skip first screen',
-            'and wait',
-            'any table',
-            'appendage type',
-            'archive mode',
-            'archiving parameters',
-            'area handle',
-            'as checkbox',
-            'as icon',
-            'as line',
-            'as listbox',
-            'as person table',
-            'as search patterns',
-            'as separate unit',
-            'as subscreen',
-            'as symbol',
-            'as text',
-            'as window',
-            'at cursor-selection',
-            'at exit-command',
-            'at next application statement',
-            'at position',
-
-            'backup into',
-            'before output',
-            'before unwind',
-            'begin of block',
-            'begin of common part',
-            'begin of line',
-            'begin of screen',
-            'begin of tabbed block',
-            'begin of version',
-            'begin of',
-            'big endian',
-            'binary mode',
-            'binary search',
-            'by kernel module',
-            'bypassing buffer',
-
-            'client specified',
-            'code page',
-            'code page hint',
-            'code page into',
-            'color black',
-            'color blue',
-            'color green',
-            'color pink',
-            'color red',
-            'color yellow',
-            'compression off',
-            'compression on',
-            'connect to',
-            'corresponding fields of table',
-            'corresponding fields of',
-            'cover page',
-            'cover text',
-            'create package',
-            'create private',
-            'create protected',
-            'create public',
-            'current position',
-
-            'data buffer',
-            'data values',
-            'dataset expiration',
-            'daylight saving time',
-            'default key',
-            'default program',
-            'default screen',
-            'defining database',
-            'deleting leading',
-            'deleting trailing',
-            'directory entry',
-            'display like',
-            'display offset',
-            'during line-selection',
-            'dynamic selections',
-
-            'edit mask',
-            'end of block',
-            'end of common part',
-            'end of file',
-            'end of line',
-            'end of screen',
-            'end of tabbed block',
-            'end of version',
-            'end of',
-            'endian into',
-            'ending at',
-            'enhancement options into',
-            'enhancement into',
-            'environment time format',
-            'execute procedure',
-            'exporting list to memory',
-            'extension type',
-
-            'field format',
-            'field selection',
-            'field value into',
-            'final methods',
-            'first occurrence of',
-            'fixed-point arithmetic',
-            'for all entries',
-            'for all instances',
-            'for appending',
-            'for columns',
-            'for event of',
-            'for field',
-            'for high',
-            'for input',
-            'for lines',
-            'for low',
-            'for node',
-            'for output',
-            'for select',
-            'for table',
-            'for testing',
-            'for update',
-            'for user',
-            'frame entry',
-            'frame program from',
-            'from code page',
-            'from context',
-            'from database',
-            'from logfile id',
-            'from number format',
-            'from screen',
-            'from table',
-            'function key',
-
-            'get connection',
-            'global friends',
-            'group by',
-
-            'hashed table of',
-            'hashed table',
-
-            'if found',
-            'ignoring case',
-            'ignoring conversion errors',
-            'ignoring structure boundaries',
-            'implementations from',
-            'in background',
-            'in background task',
-            'in background unit',
-            'in binary mode',
-            'in byte mode',
-            'in char-to-hex mode',
-            'in character mode',
-            'in group',
-            'in legacy binary mode',
-            'in legacy text mode',
-            'in program',
-            'in remote task',
-            'in text mode',
-            'in table',
-            'in update task',
-            'include bound',
-            'include into',
-            'include program from',
-            'include structure',
-            'include type',
-            'including gaps',
-            'index table',
-            'inheriting from',
-            'init destination',
-            'initial line of',
-            'initial line',
-            'initial size',
-            'internal table',
-            'into sortable code',
-
-            'keep in spool',
-            'keeping directory entry',
-            'keeping logical unit of work',
-            'keeping task',
-            'keywords from',
-
-            'left margin',
-            'left outer',
-            'levels into',
-            'line format',
-            'line into',
-            'line of',
-            'line page',
-            'line value from',
-            'line value into',
-            'lines of',
-            'list authority',
-            'list dataset',
-            'list name',
-            'little endian',
-            'lob handle for',
-            'local friends',
-            'locator for',
-            'lower case',
-
-            'main table field',
-            'match count',
-            'match length',
-            'match line',
-            'match offset',
-            'matchcode object',
-            'maximum length',
-            'maximum width into',
-            'memory id',
-            'message into',
-            'messages into',
-            'modif id',
-
-            'nesting level',
-            'new list identification',
-            'next cursor',
-            'no database selection',
-            'no dialog',
-            'no end of line',
-            'no fields',
-            'no flush',
-            'no intervals',
-            'no intervals off',
-            'no standard page heading',
-            'no-extension off',
-            'non-unique key',
-            'non-unique sorted key',
-            'not at end of mode',
-            'number of lines',
-            'number of pages',
-
-            'object key',
-            'obligatory off',
-            'of current page',
-            'of page',
-            'of program',
-            'offset into',
-            'on block',
-            'on commit',
-            'on end of task',
-            'on end of',
-            'on exit-command',
-            'on help-request for',
-            'on radiobutton group',
-            'on rollback',
-            'on value-request for',
-            'open for package',
-            'option class-coding',
-            'option class',
-            'option coding',
-            'option expand',
-            'option syncpoints',
-            'options from',
-            'order by',
-            'overflow into',
-
-            'package section',
-            'package size',
-            'preferred parameter',
-            'preserving identifier escaping',
-            'primary key',
-            'print off',
-            'print on',
-            'program from',
-            'program type',
-
-            'radiobutton groups',
-            'radiobutton group',
-            'range of',
-            'reader for',
-            'receive buffer',
-            'reduced functionality',
-            'ref to data',
-            'ref to object',
-            'ref to',
-
-            'reference into',
-            'renaming with suffix',
-            'replacement character',
-            'replacement count',
-            'replacement length',
-            'replacement line',
-            'replacement offset',
-            'respecting blanks',
-            'respecting case',
-            'result into',
-            'risk level',
-
-            'sap cover page',
-            'search fkeq',
-            'search fkge',
-            'search gkeq',
-            'search gkge',
-            'section of',
-            'send buffer',
-            'separated by',
-            'shared buffer',
-            'shared memory',
-            'shared memory enabled',
-            'skipping byte-order mark',
-            'sorted by',
-            'sorted table of',
-            'sorted table',
-            'spool parameters',
-            'standard table of',
-            'standard table',
-            'starting at',
-            'starting new task',
-            'statements into',
-            'structure default',
-            'structures into',
-
-            'table field',
-            'table of',
-            'text mode',
-            'time stamp',
-            'time zone',
-            'to code page',
-            'to column',
-            'to context',
-            'to first page',
-            'to last page',
-            'to last line',
-            'to line',
-            'to lower case',
-            'to number format',
-            'to page',
-            'to sap spool',
-            'to upper case',
-            'tokens into',
-            'transporting no fields',
-            'type tableview',
-            'type tabstrip',
-
-            'unicode enabling',
-            'up to',
-            'upper case',
-            'using edit mask',
-            'using key',
-            'using no edit mask',
-            'using screen',
-            'using selection-screen',
-            'using selection-set',
-            'using selection-sets of program',
-
-            'valid between',
-            'valid from',
-            'value check',
-            'via job',
-            'via selection-screen',
-            'visible length',
-
-            'whenever found',
-            'with analysis',
-            'with byte-order mark',
-            'with comments',
-            'with current switchstates',
-            'with explicit enhancements',
-            'with frame',
-            'with free selections',
-            'with further secondary keys',
-            'with header line',
-            'with hold',
-            'with implicit enhancements',
-            'with inactive enhancements',
-            'with includes',
-            'with key',
-            'with linefeed',
-            'with list tokenization',
-            'with native linefeed',
-            'with non-unique key',
-            'with null',
-            'with pragmas',
-            'with precompiled headers',
-            'with selection-table',
-            'with smart linefeed',
-            'with table key',
-            'with test code',
-            'with type-pools',
-            'with unique key',
-            'with unix linefeed',
-            'with windows linefeed',
-            'without further secondary keys',
-            'without selection-screen',
-            'without spool dynpro',
-            'without trmac',
-            'word into',
-            'writer for'
-            ),
-
-        //**********************************************************
-        // Other abap statements
-        //**********************************************************
-        3 => array(
-            'add',
-            'add-corresponding',
-            'aliases',
-            'append',
-            'assign',
-            'at',
-            'authority-check',
-
-            'break-point',
-
-            'clear',
-            'collect',
-            'compute',
-            'concatenate',
-            'condense',
-            'class',
-            'class-events',
-            'class-methods',
-            'class-pool',
-
-            'define',
-            'delete',
-            'demand',
-            'detail',
-            'divide',
-            'divide-corresponding',
-
-            'editor-call',
-            'end-of-file',
-            'end-enhancement-section',
-            'end-of-definition',
-            'end-of-page',
-            'end-of-selection',
-            'endclass',
-            'endenhancement',
-            'endexec',
-            'endform',
-            'endfunction',
-            'endinterface',
-            'endmethod',
-            'endmodule',
-            'endon',
-            'endprovide',
-            'endselect',
-            'enhancement',
-            'enhancement-point',
-            'enhancement-section',
-            'export',
-            'extract',
-            'events',
-
-            'fetch',
-            'field-groups',
-            'find',
-            'format',
-            'form',
-            'free',
-            'function-pool',
-            'function',
-
-            'get',
-
-            'hide',
-
-            'import',
-            'infotypes',
-            'input',
-            'insert',
-            'include',
-            'initialization',
-            'interface',
-            'interface-pool',
-            'interfaces',
-
-            'leave',
-            'load-of-program',
-            'log-point',
-
-            'maximum',
-            'message',
-            'methods',
-            'method',
-            'minimum',
-            'modify',
-            'move',
-            'move-corresponding',
-            'multiply',
-            'multiply-corresponding',
-
-            'new-line',
-            'new-page',
-            'new-section',
-
-            'overlay',
-
-            'pack',
-            'perform',
-            'position',
-            'print-control',
-            'program',
-            'provide',
-            'put',
-
-            'raise',
-            'refresh',
-            'reject',
-            'replace',
-            'report',
-            'reserve',
-
-            'scroll',
-            'search',
-            'select',
-            'selection-screen',
-            'shift',
-            'skip',
-            'sort',
-            'split',
-            'start-of-selection',
-            'submit',
-            'subtract',
-            'subtract-corresponding',
-            'sum',
-            'summary',
-            'summing',
-            'supply',
-            'syntax-check',
-
-            'top-of-page',
-            'transfer',
-            'translate',
-            'type-pool',
-
-            'uline',
-            'unpack',
-            'update',
-
-            'window',
-            'write'
-
-            ),
-
-        //**********************************************************
-        // keywords
-        //**********************************************************
-
-        4 => array(
-            'abbreviated',
-            'abstract',
-            'accept',
-            'acos',
-            'activation',
-            'alias',
-            'align',
-            'all',
-            'allocate',
-            'and',
-            'assigned',
-            'any',
-            'appending',
-            'area',
-            'as',
-            'ascending',
-            'asin',
-            'assigning',
-            'atan',
-            'attributes',
-            'avg',
-
-            'backward',
-            'between',
-            'bit-and',
-            'bit-not',
-            'bit-or',
-            'bit-set',
-            'bit-xor',
-            'boolc',
-            'boolx',
-            'bound',
-            'bt',
-            'blocks',
-            'bounds',
-            'boxed',
-            'by',
-            'byte-ca',
-            'byte-cn',
-            'byte-co',
-            'byte-cs',
-            'byte-na',
-            'byte-ns',
-
-            'ca',
-            'calling',
-            'casting',
-            'ceil',
-            'center',
-            'centered',
-            'changing',
-            'char_off',
-            'charlen',
-            'circular',
-            'class_constructor',
-            'client',
-            'clike',
-            'close',
-            'cmax',
-            'cmin',
-            'cn',
-            'cnt',
-            'co',
-            'col_background',
-            'col_group',
-            'col_heading',
-            'col_key',
-            'col_negative',
-            'col_normal',
-            'col_positive',
-            'col_total',
-            'color',
-            'column',
-            'comment',
-            'comparing',
-            'components',
-            'condition',
-            'context',
-            'copies',
-            'count',
-            'country',
-            'cpi',
-            'creating',
-            'critical',
-            'concat_lines_of',
-            'cos',
-            'cosh',
-            'count_any_not_of',
-            'count_any_of',
-            'cp',
-            'cs',
-            'csequence',
-            'currency',
-            'current',
-            'cx_static_check',
-            'cx_root',
-            'cx_dynamic_check',
-
-            'dangerous',
-            'database',
-            'datainfo',
-            'date',
-            'dbmaxlen',
-            'dd/mm/yy',
-            'dd/mm/yyyy',
-            'ddmmyy',
-            'deallocate',
-            'decfloat',
-            'decfloat16',
-            'decfloat34',
-            'decimals',
-            'default',
-            'deferred',
-            'definition',
-            'department',
-            'descending',
-            'destination',
-            'disconnect',
-            'display-mode',
-            'distance',
-            'distinct',
-            'div',
-            'dummy',
-
-            'encoding',
-            'end-lines',
-            'engineering',
-            'environment',
-            'eq',
-            'equiv',
-            'error_message',
-            'errormessage',
-            'escape',
-            'exact',
-            'exception-table',
-            'exceptions',
-            'exclude',
-            'excluding',
-            'exists',
-            'exp',
-            'exponent',
-            'exporting',
-            'extended_monetary',
-
-            'field',
-            'filter-table',
-            'filters',
-            'filter',
-            'final',
-            'find_any_not_of',
-            'find_any_of',
-            'find_end',
-            'floor',
-            'first-line',
-            'font',
-            'forward',
-            'for',
-            'frac',
-            'from_mixed',
-            'friends',
-            'from',
-
-            'giving',
-            'ge',
-            'gt',
-
-            'handle',
-            'harmless',
-            'having',
-            'head-lines',
-            'help-id',
-            'help-request',
-            'high',
-            'hold',
-            'hotspot',
-
-            'id',
-            'ids',
-            'immediately',
-            'implementation',
-            'importing',
-            'in',
-            'initial',
-            'incl',
-            'including',
-            'increment',
-            'index',
-            'index-line',
-            'inner',
-            'inout',
-            'intensified',
-            'into',
-            'inverse',
-            'is',
-            'iso',
-
-            'join',
-
-            'key',
-            'kind',
-
-            'log10',
-            'language',
-            'late',
-            'layout',
-            'le',
-            'lt',
-            'left-justified',
-            'leftplus',
-            'leftspace',
-            'left',
-            'length',
-            'level',
-            'like',
-            'line-count',
-            'line-size',
-            'lines',
-            'line',
-            'load',
-            'long',
-            'lower',
-            'low',
-            'lpi',
-
-            'matches',
-            'match',
-            'mail',
-            'major-id',
-            'max',
-            'medium',
-            'memory',
-            'message-id',
-            'module',
-            'minor-id',
-            'min',
-            'mm/dd/yyyy',
-            'mm/dd/yy',
-            'mmddyy',
-            'mode',
-            'modifier',
-            'mod',
-            'monetary',
-
-            'name',
-            'nb',
-            'ne',
-            'next',
-            'no-display',
-            'no-extension',
-            'no-gap',
-            'no-gaps',
-            'no-grouping',
-            'no-heading',
-            'no-scrolling',
-            'no-sign',
-            'no-title',
-            'no-topofpage',
-            'no-zero',
-            'nodes',
-            'non-unicode',
-            'no',
-            'number',
-            'nmax',
-            'nmin',
-            'not',
-            'null',
-            'numeric',
-            'numofchar',
-
-            'o',
-            'objects',
-            'obligatory',
-            'occurs',
-            'offset',
-            'off',
-            'of',
-            'only',
-            'open',
-            'option',
-            'optional',
-            'options',
-            'output-length',
-            'output',
-            'out',
-            'on change of',
-            'or',
-            'others',
-
-            'pad',
-            'page',
-            'pages',
-            'parameter-table',
-            'part',
-            'performing',
-            'pos_high',
-            'pos_low',
-            'priority',
-            'public',
-            'pushbutton',
-
-            'queue-only',
-            'quickinfo',
-
-            'raising',
-            'range',
-            'read-only',
-            'received',
-            'receiver',
-            'receiving',
-            'redefinition',
-            'reference',
-            'regex',
-            'replacing',
-            'reset',
-            'responsible',
-            'result',
-            'results',
-            'resumable',
-            'returncode',
-            'returning',
-            'right',
-            'right-specified',
-            'rightplus',
-            'rightspace',
-            'round',
-            'rows',
-            'repeat',
-            'requested',
-            'rescale',
-            'reverse',
-
-            'scale_preserving',
-            'scale_preserving_scientific',
-            'scientific',
-            'scientific_with_leading_zero',
-            'screen',
-            'scrolling',
-            'seconds',
-            'segment',
-            'shift_left',
-            'shift_right',
-            'sign',
-            'simple',
-            'sin',
-            'sinh',
-            'short',
-            'shortdump-id',
-            'sign_as_postfix',
-            'single',
-            'size',
-            'some',
-            'source',
-            'space',
-            'spots',
-            'stable',
-            'state',
-            'static',
-            'statusinfo',
-            'sqrt',
-            'string',
-            'strlen',
-            'structure',
-            'style',
-            'subkey',
-            'submatches',
-            'substring',
-            'substring_after',
-            'substring_before',
-            'substring_from',
-            'substring_to',
-            'super',
-            'supplied',
-            'switch',
-
-            'tan',
-            'tanh',
-            'table_line',
-            'table',
-            'tab',
-            'then',
-            'timestamp',
-            'times',
-            'time',
-            'timezone',
-            'title-lines',
-            'title',
-            'top-lines',
-            'to',
-            'to_lower',
-            'to_mixed',
-            'to_upper',
-            'trace-file',
-            'trace-table',
-            'transporting',
-            'trunc',
-            'type',
-
-            'under',
-            'unique',
-            'unit',
-            'user-command',
-            'using',
-            'utf-8',
-
-            'valid',
-            'value',
-            'value-request',
-            'values',
-            'vary',
-            'varying',
-            'version',
-
-            'warning',
-            'where',
-            'width',
-            'with',
-            'word',
-            'with-heading',
-            'with-title',
-
-            'xsequence',
-            'xstring',
-            'xstrlen',
-
-            'yes',
-            'yymmdd',
-
-            'z',
-            'zero'
-
-            ),
-
-        //**********************************************************
-        // screen statements
-        //**********************************************************
-
-        5 => array(
-            'call subscreen',
-            'chain',
-            'endchain',
-            'on chain-input',
-            'on chain-request',
-            'on help-request',
-            'on input',
-            'on request',
-            'on value-request',
-            'process'
-            ),
-
-        //**********************************************************
-        // internal statements
-        //**********************************************************
-
-        6 => array(
-            'generate dynpro',
-            'generate report',
-            'import dynpro',
-            'import nametab',
-            'include methods',
-            'load report',
-            'scan abap-source',
-            'scan and check abap-source',
-            'syntax-check for dynpro',
-            'syntax-check for program',
-            'syntax-trace',
-            'system-call',
-            'system-exit',
-            'verification-message'
-            ),
-
-        //**********************************************************
-        // Control statements
-        //**********************************************************
-
-        1 => array(
-            'assert',
-            'case',
-            'catch',
-            'check',
-            'cleanup',
-            'continue',
-            'do',
-            'else',
-            'elseif',
-            'endat',
-            'endcase',
-            'endcatch',
-            'endif',
-            'enddo',
-            'endloop',
-            'endtry',
-            'endwhile',
-            'exit',
-            'if',
-            'loop',
-            'resume',
-            'retry',
-            'return',
-            'stop',
-            'try',
-            'when',
-            'while'
-
-            ),
-
-        //**********************************************************
-        // variable declaration statements
-        //**********************************************************
-
-        2 => array(
-            'class-data',
-            'controls',
-            'constants',
-            'data',
-            'field-symbols',
-            'fields',
-            'local',
-            'parameters',
-            'ranges',
-            'select-options',
-            'statics',
-            'tables',
-            'type-pools',
-            'types'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '->*', '->', '=>',
-            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', '.'
-            ),
-        1 => array(
-            '>=', '<=', '<', '>', '='
-            ),
-        2 => array(
-            '?='
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        9 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;', //control statements
-            2 => 'color: #cc4050; text-transform: uppercase; font-weight: bold; zzz:data;', //data statements
-            3 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;', //first token of other statements
-            4 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;', // next tokens of other statements ("keywords")
-            5 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
-            6 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
-            7 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
-            8 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
-            9 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #339933;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #808080;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #4da619;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #3399ff;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #808080;',
-            1 => 'color: #800080;',
-            2 => 'color: #0000ff;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
-        2 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
-        3 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        9 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '-&gt;',
-        2 => '=&gt;'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            7 => array(
-                'SPACE_AS_WHITESPACE' => true
-                ),
-            8 => array(
-                'SPACE_AS_WHITESPACE' => true
-                ),
-            9 => array(
-                'SPACE_AS_WHITESPACE' => true
-                )
-            )
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/actionscript-french.php b/inc/geshi/actionscript-french.php
deleted file mode 100644
index e81605098..000000000
--- a/inc/geshi/actionscript-french.php
+++ /dev/null
@@ -1,957 +0,0 @@
-<?php
-/*************************************************************************************
- * actionscript.php
- * ----------------
- * Author: Steffen Krause (Steffen.krause@muse.de)
- * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.9
- * CVS Revision Version: $Revision: 1.9 $
- * Date Started: 2004/06/20
- * Last Modified: $Date: 2006/04/23 01:14:41 $
- *
- * Actionscript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/08/25 (1.0.2)
- * Author [ NikO ] - http://niko.informatif.org
- * - add full link for myInstance.methods to http://wiki.media-box.net/documentation/flash
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-	'LANG_NAME' => 'Actionscript',
-	'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-	'COMMENT_MULTI' => array('/*' => '*/'),
-	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-	'QUOTEMARKS' => array("'", '"'),
-	'ESCAPE_CHAR' => '\\',
-	'KEYWORDS' => array(
-		1 => array(
-			'#include', 
-			'for', 
-			'foreach', 
-			'if', 
-			'elseif', 
-			'else', 
-			'while', 
-			'do', 
-			'dowhile',
-			'endwhile', 
-			'endif', 
-			'switch', 
-			'case', 
-			'endswitch', 
-			'break', 
-			'continue', 
-			'in',
-			'null', 
-			'false', 
-			'true', 
-			'var',
-			'default',
-			'new', 
-			'_global',
-			'undefined',
-			'super'	
-			),
-		2 => array(
-			'static',
-			'private',
-			'public',
-			'class',
-			'extends',
-			'implements',
-			'import',
-			'return',
-			'trace',
-			'_quality',
-			'_root',
-			'set',
-			'setInterval',
-			'setProperty',
-			'stopAllSounds',
-			'targetPath',
-			'this',
-			'typeof',
-			'unescape',
-			'updateAfterEvent'
-			),
-		3 => array (
-			'Accessibility',
-			'Array',
-			'Boolean',
-			'Button',
-			'Camera',
-			'Color',
-			'ContextMenuItem',
-			'ContextMenu',
-			'Cookie',
-			'Date',
-			'Error',
-			'function',
-			'FWEndCommand',
-			'FWJavascript',
-			'Key',
-			'LoadMovieNum',
-			'LoadMovie',
-			'LoadVariablesNum',
-			'LoadVariables',
-			'LoadVars',
-			'LocalConnection',
-			'Math',
-			'Microphone',
-			'MMExecute',
-			'MMEndCommand',
-			'MMSave',
-			'Mouse',
-			'MovieClipLoader',
-			'MovieClip',
-			'NetConnexion',
-			'NetStream',
-			'Number',
-			'Object',
-			'printAsBitmapNum',
-			'printNum',
-			'printAsBitmap',
-			'printJob',
-			'print',
-			'Selection',
-			'SharedObject',
-			'Sound',
-			'Stage',
-			'String',
-			'System',
-			'TextField',
-			'TextFormat',
-			'Tween',
-			'Video',
-			'XMLUI',
-			'XMLNode',
-			'XMLSocket',
-			'XML'
-			),
-		4 => array (	
-			'isactive',
-			'updateProperties'
-			),
-		5 => array (	
-			'callee',
-			'caller',
-			),
-		6 => array (	
-			'concat',
-			'join',
-			'pop',
-			'push',
-			'reverse',
-			'shift',
-			'slice',
-			'sort',
-			'sortOn',
-			'splice',
-			'toString',
-			'unshift'
-			),
-		7 => array (
-			'valueOf'
-			),
-		8 => array (	
-			'onDragOut',
-			'onDragOver',
-			'onKeyUp',
-			'onKillFocus',
-			'onPress',
-			'onRelease',
-			'onReleaseOutside',
-			'onRollOut',
-			'onRollOver',
-			'onSetFocus'
-			),
-		9 => array (	
-			'setMode',
-			'setMotionLevel',
-			'setQuality',
-			'activityLevel',
-			'bandwidth',
-			'currentFps',
-			'fps',
-			'index',
-			'motionLevel',
-			'motionTimeOut',
-			'muted',
-			'names',
-			'quality',
-			'onActivity',
-			'onStatus'
-			),
-		10 => array (	
-			'getRGB',
-			'setRGB',
-			'getTransform',
-			'setTransform'
-			),
-		11 => array (	
-			'caption',
-			'enabled',
-			'separatorBefore',
-			'visible',
-			'onSelect'
-			),
-		12 => array (	
-			'setCookie',
-			'getcookie'
-			),	
-		13 => array (	
-			'hideBuiltInItems',
-			'builtInItems',
-			'customItems',
-			'onSelect'
-			),
-		14 => array (	
-			'CustomActions.get',
-			'CustomActions.install',
-			'CustomActions.list',
-			'CustomActions.uninstall',
-			),		
-		15 => array (	
-			'getDate',
-			'getDay',
-			'getFullYear',
-			'getHours',
-			'getMilliseconds',
-			'getMinutes',
-			'getMonth',
-			'getSeconds',
-			'getTime',
-			'getTimezoneOffset',
-			'getUTCDate',
-			'getUTCDay',
-			'getUTCFullYear',
-			'getUTCHours',
-			'getUTCMinutes',
-			'getUTCMilliseconds',
-			'getUTCMonth',
-			'getUTCSeconds',
-			'getYear',
-			'setDate',
-			'setFullYear',
-			'setHours',
-			'setMilliseconds',
-			'setMinutes',
-			'setMonth',
-			'setSeconds',
-			'setTime',
-			'setUTCDate',
-			'setUTCDay',
-			'setUTCFullYear',
-			'setUTCHours',
-			'setUTCMinutes',
-			'setUTCMilliseconds',
-			'setUTCMonth',
-			'setUTCSeconds',
-			'setYear',
-			'UTC'
-			),	
-		16 => array (	
-			'message',
-			'name',
-			'throw',
-			'try',
-			'catch',
-			'finally'
-			),
-		17 => array (	
-			'apply',
-			'call'
-			),
-		18 => array (	
-			'BACKSPACE',
-			'CAPSLOCK',
-			'CONTROL',
-			'DELETEKEY',
-			'DOWN',
-			'END',
-			'ENTER',
-			'ESCAPE',
-			'getAscii',
-			'getCode',
-			'HOME',
-			'INSERT',
-			'isDown',
-			'isToggled',
-			'LEFT',
-			'onKeyDown',
-			'onKeyUp',
-			'PGDN',
-			'PGUP',
-			'RIGHT',
-			'SPACE',
-			'TAB',
-			'UP'
-			),
-		19 => array (
-			'addRequestHeader',
-			'contentType',
-			'decode'
-			),
-		20 => array (
-			'allowDomain',
-			'allowInsecureDomain',
-			'close',
-			'domain'
-			),
-		21 => array (
-			'abs',
-			'acos',
-			'asin',
-			'atan',
-			'atan2',
-			'ceil',
-			'cos',
-			'exp',
-			'floor',
-			'log',
-			'LN2',
-			'LN10',
-			'LOG2E',
-			'LOG10E',
-			'max',
-			'min',
-			'PI',
-			'pow',
-			'random',
-			'sin',
-			'SQRT1_2',
-			'sqrt',
-			'tan',
-			'round',
-			'SQRT2'
-			),
-		22 => array (
-			'activityLevel',
-			'muted',
-			'names',
-			'onActivity',
-			'onStatus',
-			'setRate',
-			'setGain',
-			'gain',
-			'rate',
-			'setSilenceLevel',
-			'setUseEchoSuppression',
-			'silenceLevel',
-			'silenceTimeOut',
-			'useEchoSuppression'
-			),
-		23 => array (
-			'hide',
-			'onMouseDown',
-			'onMouseMove',
-			'onMouseUp',
-			'onMouseWeel',
-			'show'
-			),
-		24 => array (
-			'_alpha',
-			'attachAudio',
-			'attachMovie',
-			'beginFill',
-			'beginGradientFill',
-			'clear',
-			'createEmptyMovieClip',
-			'createTextField',
-			'_current',
-			'curveTo',
-			'_dropTarget',
-			'duplicateMovieClip',
-			'endFill',
-			'focusEnabled',
-			'enabled',
-			'_focusrec',
-			'_framesLoaded',
-			'getBounds',
-			'getBytesLoaded',
-			'getBytesTotal',
-			'getDepth',
-			'getInstanceAtDepth',
-			'getNextHighestDepth',
-			'getSWFVersion',
-			'getTextSnapshot',
-			'getURL',
-			'globalToLocal',
-			'gotoAndPlay',
-			'gotoAndStop',
-			'_height',
-			'hitArea',
-			'hitTest',
-			'lineStyle',
-			'lineTo',
-			'localToGlobal',
-			'_lockroot',
-			'menu',
-			'onUnload',
-			'_parent',
-			'play',
-			'prevFrame',
-			'_quality',
-			'removeMovieClip',
-			'_rotation',
-			'setMask',
-			'_soundbuftime',
-			'startDrag',
-			'stopDrag',
-			'stop',
-			'swapDepths',
-			'tabChildren',
-			'_target',
-			'_totalFrames',
-			'trackAsMenu',
-			'unloadMovie',
-			'useHandCursor',
-			'_visible',
-			'_width',
-			'_xmouse',
-			'_xscale',
-			'_x',
-			'_ymouse',
-			'_yscale',
-			'_y'
-			),
-		25 => array (
-			'getProgress',
-			'loadClip',
-			'onLoadComplete',
-			'onLoadError',
-			'onLoadInit',
-			'onLoadProgress',
-			'onLoadStart'
-			),
-		26 => array (
-			'bufferLength',
-			'currentFps',
-			'seek',
-			'setBufferTime',
-			'bufferTime',
-			'time',
-			'pause'
-			),
-		27 => array (
-			'MAX_VALUE',
-			'MIN_VALUE',
-			'NEGATIVE_INFINITY',
-			'POSITIVE_INFINITY'
-			),
-		28 => array (
-			'addProperty',
-			'constructor',
-			'__proto__',
-			'registerClass',
-			'__resolve',
-			'unwatch',
-			'watch',
-			'onUpDate'
-			),
-		29 => array (
-			'addPage'
-			),
-		30 => array (
-			'getBeginIndex',
-			'getCaretIndex',
-			'getEndIndex',
-			'setSelection'
-			),
-		31 => array (
-			'flush',
-			'getLocal',
-			'getSize'
-			),
-		32 => array (
-			'attachSound',
-			'duration',
-			'getPan',
-			'getVolume',
-			'onID3',
-			'loadSound',
-			'id3',
-			'onSoundComplete',
-			'position',
-			'setPan',
-			'setVolume'
-			),
-		33 => array (
-			'getBeginIndex',
-			'getCaretIndex',
-			'getEndIndex',
-			'setSelection'
-			),
-		34 => array (
-			'getEndIndex',
-			),
-		35 => array (
-			'align',
-			'height',
-			'width',
-			'onResize',
-			'scaleMode',
-			'showMenu'
-			),
-		36 => array (
-			'charAt',
-			'charCodeAt',
-			'concat',
-			'fromCharCode',
-			'indexOf',
-			'lastIndexOf',
-			'substr',
-			'substring',
-			'toLowerCase',
-			'toUpperCase'
-			),
-		37 => array (
-			'avHardwareDisable',
-			'hasAccessibility',
-			'hasAudioEncoder',
-			'hasAudio',
-			'hasEmbeddedVideo',
-			'hasMP3',
-			'hasPrinting',
-			'hasScreenBroadcast',
-			'hasScreenPlayback',
-			'hasStreamingAudio',
-			'hasStreamingVideo',
-			'hasVideoEncoder',
-			'isDebugger',
-			'language',
-			'localFileReadDisable',
-			'manufacturer',
-			'os',
-			'pixelAspectRatio',
-			'playerType',
-			'screenColor',
-			'screenDPI',
-			'screenResolutionX',
-			'screenResolutionY',
-			'serverString',
-			'version'
-			),
-		38 => array (
-			'allowDomain',
-			'allowInsecureDomain',
-			'loadPolicyFile'
-			),
-		39 => array (
-			'exactSettings',
-			'setClipboard',
-			'showSettings',
-			'useCodepage'
-			),
-		40 => array (
-			'getStyle',
-			'getStyleNames',
-			'parseCSS',
-			'setStyle',
-			'transform'
-			),
-		41 => array (
-			'autoSize',
-			'background',
-			'backgroundColor',
-			'border',
-			'borderColor',
-			'bottomScroll',
-			'condenseWhite',
-			'embedFonts',
-			'getFontList',
-			'getNewTextFormat',
-			'getTextFormat',
-			'hscroll',
-			'htmlText',
-			'html',
-			'maxChars',
-			'maxhscroll',
-			'maxscroll',
-			'mouseWheelEnabled',
-			'multiline',
-			'onScroller',
-			'password',
-			'removeTextField',
-			'replaceSel',
-			'replaceText',
-			'restrict',
-			'scroll',
-			'selectable',
-			'setNewTextFormat',
-			'setTextFormat',
-			'styleSheet',
-			'tabEnabled',
-			'tabIndex',
-			'textColor',
-			'textHeight',
-			'textWidth',
-			'text',
-			'type',
-			'_url',
-			'variable',
-			'wordWrap'
-			),
-		42 => array (	
-			'blockIndent',
-			'bold',
-			'bullet',
-			'font',
-			'getTextExtent',
-			'indent',
-			'italic',
-			'leading',
-			'leftMargin',
-			'rightMargin',
-			'size',
-			'tabStops',
-			'underline'
-			),
-		43 => array (	
-			'findText',
-			'getCount',
-			'getSelected',
-			'getSelectedText',
-			'getText',
-			'hitTestTextNearPos',
-			'setSelectColor',
-			'setSelected'
-			),
-		44 => array (	
-			'begin',
-			'change',
-			'continueTo',
-			'fforward',
-			'finish',
-			'func',
-			'FPS',
-			'getPosition',
-			'isPlaying',
-			'looping',
-			'obj',
-			'onMotionChanged',
-			'onMotionFinished',
-			'onMotionLooped',
-			'onMotionStarted',
-			'onMotionResumed',
-			'onMotionStopped',
-			'prop',
-			'rewind',
-			'resume',
-			'setPosition',
-			'time',
-			'userSeconds',
-			'yoyo'
-			),
-		45 => array (	
-			'attachVideo',
-			'deblocking',
-			'smoothing'
-			),
-		46 => array (	
-			'addRequestHeader',
-			'appendChild',
-			'attributes',
-			'childNodes',
-			'cloneNode',
-			'contentType',
-			'createElement',
-			'createTextNode',
-			'docTypeDecl',
-			'firstChild',
-			'hasChildNodes',
-			'ignoreWhite',
-			'insertBefore',
-			'lastChild',
-			'nextSibling',
-			'nodeName',
-			'nodeType',
-			'nodeValue',
-			'parentNode',
-			'parseXML',
-			'previousSibling',
-			'removeNode',
-			'xmlDecl'
-			),
-		47 => array (	
-			'onClose',
-			'onXML'
-			),
-		48 => array (	
-			'add',
-			'and',
-			'_highquality',
-			'chr',
-			'eq',
-			'ge',
-			'ifFrameLoaded',
-			'int',
-			'le',
-			'it',
-			'mbchr',
-			'mblength',
-			'mbord',
-			'ne',
-			'not',
-			'or',
-			'ord',
-			'tellTarget',
-			'toggleHighQuality'
-			),
-		49 => array (
-			'ASSetPropFlags',
-			'ASnative',
-			'ASconstructor',
-			'AsSetupError',
-			'FWEndCommand',
-			'FWJavascript',
-			'MMEndCommand',
-			'MMSave',
-			'XMLUI'
-		), 
-		50 => array (
-			'System.capabilities'
-		),
-		51 => array (
-			'System.security'
-		),
-		52 => array (
-			'TextField.StyleSheet'
-		)
-		),
-	'SYMBOLS' => array(
-		'(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>','='
-		),
-	'CASE_SENSITIVE' => array(
-		GESHI_COMMENTS => false,
-		1 => true,
-		2 => true,
-		3 => true,
-		4 => true,
-		5 => true,
-		6 => true,
-		7 => true,
-		8 => true,
-		9 => true,
-		10 => true,
-		11 => true,
-		12 => true,
-		13 => true,
-		14 => true,
-		15 => true,
-		16 => true,
-		17 => true,
-		18 => true,
-		19 => true,
-		20 => true,
-		21 => true,
-		22 => true,
-		23 => true,
-		24 => true,
-		25 => true,
-		26 => true,
-		27 => true,
-		28 => true,
-		29 => true,
-		30 => true,
-		31 => true,
-		32 => true,
-		33 => true,
-		34 => true,
-		35 => true,
-		36 => true,
-		37 => true,
-		38 => true,
-		39 => true,
-		40 => true,
-		41 => true,
-		42 => true,
-		43 => true,
-		44 => true,
-		45 => true,
-		46 => true,
-		47 => true,
-		48 => true,
-		49 => true,
-		50 => true,
-		51 => true,
-		52 => true
-		),
-	'STYLES' => array(
-		'KEYWORDS' => array(
-			1 => 'color: #0000ff;',
-			2 => 'color: #006600;',
-			3 => 'color: #000080;',
-			4 => 'color: #006600;',
-			5 => 'color: #006600;',
-			6 => 'color: #006600;',
-			7 => 'color: #006600;',
-			8 => 'color: #006600;',
-			9 => 'color: #006600;',
-			10 => 'color: #006600;',
-			11 => 'color: #006600;',
-			12 => 'color: #006600;',
-			13 => 'color: #006600;',
-			14 => 'color: #006600;',
-			15 => 'color: #006600;',
-			16 => 'color: #006600;',
-			17 => 'color: #006600;',
-			18 => 'color: #006600;',
-			19 => 'color: #006600;',
-			20 => 'color: #006600;',
-			21 => 'color: #006600;',
-			22 => 'color: #006600;',
-			23 => 'color: #006600;',
-			24 => 'color: #006600;',
-			25 => 'color: #006600;',
-			26 => 'color: #006600;',
-			27 => 'color: #006600;',
-			28 => 'color: #006600;',
-			29 => 'color: #006600;',
-			30 => 'color: #006600;',
-			31 => 'color: #006600;',
-			32 => 'color: #006600;',
-			33 => 'color: #006600;',
-			34 => 'color: #006600;',
-			35 => 'color: #006600;',
-			36 => 'color: #006600;',
-			37 => 'color: #006600;',
-			38 => 'color: #006600;',
-			39 => 'color: #006600;',
-			40 => 'color: #006600;',
-			41 => 'color: #006600;',
-			42 => 'color: #006600;',
-			43 => 'color: #006600;',
-			44 => 'color: #006600;',
-			45 => 'color: #006600;',
-			46 => 'color: #006600;',
-			47 => 'color: #006600;',
-			48 => 'color: #CC0000;',
-			49 => 'color: #5700d1;',
-			50 => 'color: #006600;',
-			51 => 'color: #006600;',
-			52 => 'color: #CC0000;'
-			),
-		'COMMENTS' => array(
-			1 => 'color: #ff8000; font-style: italic;',
-			2 => 'color: #ff8000; font-style: italic;',
-			'MULTI' => 'color: #ff8000; font-style: italic;'
-			),
-		'ESCAPE_CHAR' => array(
-			0 => 'color: #000099; font-weight: bold;'
-			),
-		'BRACKETS' => array(
-			0 => 'color: #333333;'
-			),
-		'STRINGS' => array(
-			0 => 'color: #333333; background-color: #eeeeee;'
-			),
-		'NUMBERS' => array(
-			0 => 'color: #c50000;'
-			),
-
-		'SYMBOLS' => array(
-			0 => 'color: #000000;'
-			),
-		'METHODS' => array(
-			1 => 'color: #006600;'
-			),
-		'REGEXPS' => array(
-			),
-		'SCRIPT' => array(
-			)
-		),
-	'URLS' => array(
-		1 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
-		2 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
-		3 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
-		4 => 'http://wiki.media-box.net/documentation/flash/accessibility/{FNAME}',
-		5 => 'http://wiki.media-box.net/documentation/flash/arguments/{FNAME}',
-		6 => 'http://wiki.media-box.net/documentation/flash/array/{FNAME}',
-		7 => 'http://wiki.media-box.net/documentation/flash/boolean/{FNAME}',
-		8 => 'http://wiki.media-box.net/documentation/flash/button/{FNAME}',
-		9 => 'http://wiki.media-box.net/documentation/flash/camera/{FNAME}',
-		10 => 'http://wiki.media-box.net/documentation/flash/color/{FNAME}',
-		11 => 'http://wiki.media-box.net/documentation/flash/contextmenuitem/{FNAME}',
-		12 => 'http://wiki.media-box.net/documentation/flash/contextmenu/{FNAME}',
-		13 => 'http://wiki.media-box.net/documentation/flash/cookie/{FNAME}',
-		14 => 'http://wiki.media-box.net/documentation/flash/customactions/{FNAME}',
-		15 => 'http://wiki.media-box.net/documentation/flash/date/{FNAME}',
-		16 => 'http://wiki.media-box.net/documentation/flash/error/{FNAME}',
-		17 => 'http://wiki.media-box.net/documentation/flash/function/{FNAME}',
-		18 => 'http://wiki.media-box.net/documentation/flash/key/{FNAME}',
-		19 => 'http://wiki.media-box.net/documentation/flash/loadvars/{FNAME}',
-		20 => 'http://wiki.media-box.net/documentation/flash/localconnection/{FNAME}',
-		21 => 'http://wiki.media-box.net/documentation/flash/math/{FNAME}',
-		22 => 'http://wiki.media-box.net/documentation/flash/microphone/{FNAME}',
-		23 => 'http://wiki.media-box.net/documentation/flash/mouse/{FNAME}',
-		24 => 'http://wiki.media-box.net/documentation/flash/movieclip/{FNAME}',
-		25 => 'http://wiki.media-box.net/documentation/flash/moviecliploader/{FNAME}',
-		26 => 'http://wiki.media-box.net/documentation/flash/netstream/{FNAME}',
-		27 => 'http://wiki.media-box.net/documentation/flash/number/{FNAME}',
-		28 => 'http://wiki.media-box.net/documentation/flash/object/{FNAME}',
-		29 => 'http://wiki.media-box.net/documentation/flash/printJob/{FNAME}',
-		30 => 'http://wiki.media-box.net/documentation/flash/selection/{FNAME}',
-		31 => 'http://wiki.media-box.net/documentation/flash/sharedobject/{FNAME}',
-		32 => 'http://wiki.media-box.net/documentation/flash/sound/{FNAME}',
-		33 => 'http://wiki.media-box.net/documentation/flash/selection/{FNAME}',
-		34 => 'http://wiki.media-box.net/documentation/flash/sharedobject/{FNAME}',
-		35 => 'http://wiki.media-box.net/documentation/flash/stage/{FNAME}',
-		36 => 'http://wiki.media-box.net/documentation/flash/string/{FNAME}',
-		37 => 'http://wiki.media-box.net/documentation/flash/system/capabilities/{FNAME}',
-		38 => 'http://wiki.media-box.net/documentation/flash/system/security/{FNAME}',
-		39 => 'http://wiki.media-box.net/documentation/flash/system/{FNAME}',
-		40 => 'http://wiki.media-box.net/documentation/flash/textfield/stylesheet/{FNAME}',
-		41 => 'http://wiki.media-box.net/documentation/flash/textfield/{FNAME}',
-		42 => 'http://wiki.media-box.net/documentation/flash/textformat/{FNAME}',
-		43 => 'http://wiki.media-box.net/documentation/flash/textsnapshot/{FNAME}',
-		44 => 'http://wiki.media-box.net/documentation/flash/tween/{FNAME}',
-		45 => 'http://wiki.media-box.net/documentation/flash/video/{FNAME}',
-		46 => 'http://wiki.media-box.net/documentation/flash/xml/{FNAME}',
-		47 => 'http://wiki.media-box.net/documentation/flash/xmlsocket/{FNAME}',
-		48 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
-		49 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
-		50 => 'http://wiki.media-box.net/documentation/flash/system/capabilities',
-		51 => 'http://wiki.media-box.net/documentation/flash/system/security',
-		52 => 'http://wiki.media-box.net/documentation/flash/textfield/stylesheet'
-		),
-	'OOLANG' => true,
-	'OBJECT_SPLITTERS' => array(
-		1 => '.'
-		),
-	'REGEXPS' => array(
-		),
-	'STRICT_MODE_APPLIES' => GESHI_NEVER,
-	'SCRIPT_DELIMITERS' => array(),
-	'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
diff --git a/inc/geshi/actionscript.php b/inc/geshi/actionscript.php
deleted file mode 100644
index 08e5b49ac..000000000
--- a/inc/geshi/actionscript.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/*************************************************************************************
- * actionscript.php
- * ----------------
- * Author: Steffen Krause (Steffen.krause@muse.de)
- * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/20
- *
- * Actionscript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ActionScript',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            '#include', 'for', 'foreach', 'each', 'if', 'elseif', 'else', 'while', 'do', 'dowhile',
-            'endwhile', 'endif', 'switch', 'case', 'endswitch', 'return', 'break', 'continue', 'in'
-            ),
-        2 => array(
-            'null', 'false', 'true', 'var',
-            'default', 'function', 'class',
-            'new', '_global'
-            ),
-        3 => array(
-            '#endinitclip', '#initclip', '__proto__', '_accProps', '_alpha', '_currentframe',
-            '_droptarget', '_focusrect', '_framesloaded', '_height', '_highquality', '_lockroot',
-            '_name', '_parent', '_quality', '_root', '_rotation', '_soundbuftime', '_target', '_totalframes',
-            '_url', '_visible', '_width', '_x', '_xmouse', '_xscale', '_y', '_ymouse', '_yscale', 'abs',
-            'Accessibility', 'acos', 'activityLevel', 'add', 'addListener', 'addPage', 'addProperty',
-            'addRequestHeader', 'align', 'allowDomain', 'allowInsecureDomain', 'and', 'appendChild',
-            'apply', 'Arguments', 'Array', 'asfunction', 'asin', 'atan', 'atan2', 'attachAudio', 'attachMovie',
-            'attachSound', 'attachVideo', 'attributes', 'autosize', 'avHardwareDisable', 'background',
-            'backgroundColor', 'BACKSPACE', 'bandwidth', 'beginFill', 'beginGradientFill', 'blockIndent',
-            'bold', 'Boolean', 'border', 'borderColor', 'bottomScroll', 'bufferLength', 'bufferTime',
-            'builtInItems', 'bullet', 'Button', 'bytesLoaded', 'bytesTotal', 'call', 'callee', 'caller',
-            'Camera', 'capabilities', 'CAPSLOCK', 'caption', 'catch', 'ceil', 'charAt', 'charCodeAt',
-            'childNodes', 'chr', 'clear', 'clearInterval', 'cloneNode', 'close', 'Color', 'concat',
-            'connect', 'condenseWhite', 'constructor', 'contentType', 'ContextMenu', 'ContextMenuItem',
-            'CONTROL', 'copy', 'cos', 'createElement', 'createEmptyMovieClip', 'createTextField',
-            'createTextNode', 'currentFps', 'curveTo', 'CustomActions', 'customItems', 'data', 'Date',
-            'deblocking', 'delete', 'DELETEKEY', 'docTypeDecl', 'domain', 'DOWN',
-            'duplicateMovieClip', 'duration', 'dynamic', 'E', 'embedFonts', 'enabled',
-            'END', 'endFill', 'ENTER', 'eq', 'Error', 'ESCAPE(Konstante)', 'escape(Funktion)', 'eval',
-            'exactSettings', 'exp', 'extends', 'finally', 'findText', 'firstChild', 'floor',
-            'flush', 'focusEnabled', 'font', 'fps', 'fromCharCode', 'fscommand',
-            'gain', 'ge', 'get', 'getAscii', 'getBeginIndex', 'getBounds', 'getBytesLoaded', 'getBytesTotal',
-            'getCaretIndex', 'getCode', 'getCount', 'getDate', 'getDay', 'getDepth', 'getEndIndex', 'getFocus',
-            'getFontList', 'getFullYear', 'getHours', 'getInstanceAtDepth', 'getLocal', 'getMilliseconds',
-            'getMinutes', 'getMonth', 'getNewTextFormat', 'getNextHighestDepth', 'getPan', 'getProgress',
-            'getProperty', 'getRGB', 'getSeconds', 'getSelected', 'getSelectedText', 'getSize', 'getStyle',
-            'getStyleNames', 'getSWFVersion', 'getText', 'getTextExtent', 'getTextFormat', 'getTextSnapshot',
-            'getTime', 'getTimer', 'getTimezoneOffset', 'getTransform', 'getURL', 'getUTCDate', 'getUTCDay',
-            'getUTCFullYear', 'getUTCHours', 'getUTCMilliseconds', 'getUTCMinutes', 'getUTCMonth', 'getUTCSeconds',
-            'getVersion', 'getVolume', 'getYear', 'globalToLocal', 'goto', 'gotoAndPlay', 'gotoAndStop',
-            'hasAccessibility', 'hasAudio', 'hasAudioEncoder', 'hasChildNodes', 'hasEmbeddedVideo', 'hasMP3',
-            'hasPrinting', 'hasScreenBroadcast', 'hasScreenPlayback', 'hasStreamingAudio', 'hasStreamingVideo',
-            'hasVideoEncoder', 'height', 'hide', 'hideBuiltInItems', 'hitArea', 'hitTest', 'hitTestTextNearPos',
-            'HOME', 'hscroll', 'html', 'htmlText', 'ID3', 'ifFrameLoaded', 'ignoreWhite', 'implements',
-            'import', 'indent', 'index', 'indexOf', 'Infinity', '-Infinity', 'INSERT', 'insertBefore', 'install',
-            'instanceof', 'int', 'interface', 'isActive', 'isDebugger', 'isDown', 'isFinite', 'isNaN', 'isToggled',
-            'italic', 'join', 'Key', 'language', 'lastChild', 'lastIndexOf', 'le', 'leading', 'LEFT', 'leftMargin',
-            'length', 'level', 'lineStyle', 'lineTo', 'list', 'LN10', 'LN2', 'load', 'loadClip', 'loaded', 'loadMovie',
-            'loadMovieNum', 'loadSound', 'loadVariables', 'loadVariablesNum', 'LoadVars', 'LocalConnection',
-            'localFileReadDisable', 'localToGlobal', 'log', 'LOG10E', 'LOG2E', 'manufacturer', 'Math', 'max',
-            'MAX_VALUE', 'maxChars', 'maxhscroll', 'maxscroll', 'mbchr', 'mblength', 'mbord', 'mbsubstring', 'menu',
-            'message', 'Microphone', 'min', 'MIN_VALUE', 'MMExecute', 'motionLevel', 'motionTimeOut', 'Mouse',
-            'mouseWheelEnabled', 'moveTo', 'Movieclip', 'MovieClipLoader', 'multiline', 'muted', 'name', 'names', 'NaN',
-            'ne', 'NEGATIVE_INFINITY', 'NetConnection', 'NetStream', 'newline', 'nextFrame',
-            'nextScene', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue', 'not', 'Number', 'Object',
-            'on', 'onActivity', 'onChanged', 'onClipEvent', 'onClose', 'onConnect', 'onData', 'onDragOut',
-            'onDragOver', 'onEnterFrame', 'onID3', 'onKeyDown', 'onKeyUp', 'onKillFocus', 'onLoad', 'onLoadComplete',
-            'onLoadError', 'onLoadInit', 'onLoadProgress', 'onLoadStart', 'onMouseDown', 'onMouseMove', 'onMouseUp',
-            'onMouseWheel', 'onPress', 'onRelease', 'onReleaseOutside', 'onResize', 'onRollOut', 'onRollOver',
-            'onScroller', 'onSelect', 'onSetFocus', 'onSoundComplete', 'onStatus', 'onUnload', 'onUpdate', 'onXML',
-            'or(logischesOR)', 'ord', 'os', 'parentNode', 'parseCSS', 'parseFloat', 'parseInt', 'parseXML', 'password',
-            'pause', 'PGDN', 'PGUP', 'PI', 'pixelAspectRatio', 'play', 'playerType', 'pop', 'position',
-            'POSITIVE_INFINITY', 'pow', 'prevFrame', 'previousSibling', 'prevScene', 'print', 'printAsBitmap',
-            'printAsBitmapNum', 'PrintJob', 'printNum', 'private', 'prototype', 'public', 'push', 'quality',
-            'random', 'rate', 'registerClass', 'removeListener', 'removeMovieClip', 'removeNode', 'removeTextField',
-            'replaceSel', 'replaceText', 'resolutionX', 'resolutionY', 'restrict', 'reverse', 'RIGHT',
-            'rightMargin', 'round', 'scaleMode', 'screenColor', 'screenDPI', 'screenResolutionX', 'screenResolutionY',
-            'scroll', 'seek', 'selectable', 'Selection', 'send', 'sendAndLoad', 'separatorBefore', 'serverString',
-            'set', 'setvariable', 'setBufferTime', 'setClipboard', 'setDate', 'setFocus', 'setFullYear', 'setGain',
-            'setHours', 'setInterval', 'setMask', 'setMilliseconds', 'setMinutes', 'setMode', 'setMonth',
-            'setMotionLevel', 'setNewTextFormat', 'setPan', 'setProperty', 'setQuality', 'setRate', 'setRGB',
-            'setSeconds', 'setSelectColor', 'setSelected', 'setSelection', 'setSilenceLevel', 'setStyle',
-            'setTextFormat', 'setTime', 'setTransform', 'setUseEchoSuppression', 'setUTCDate', 'setUTCFullYear',
-            'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds', 'setVolume',
-            'setYear', 'SharedObject', 'SHIFT(Konstante)', 'shift(Methode)', 'show', 'showMenu', 'showSettings',
-            'silenceLevel', 'silenceTimeout', 'sin', 'size', 'slice', 'smoothing', 'sort', 'sortOn', 'Sound', 'SPACE',
-            'splice', 'split', 'sqrt', 'SQRT1_2', 'SQRT2', 'Stage', 'start', 'startDrag', 'static', 'status', 'stop',
-            'stopAllSounds', 'stopDrag', 'String', 'StyleSheet(Klasse)', 'styleSheet(Eigenschaft)', 'substr',
-            'substring', 'super', 'swapDepths', 'System', 'TAB', 'tabChildren', 'tabEnabled', 'tabIndex',
-            'tabStops', 'tan', 'target', 'targetPath', 'tellTarget', 'text', 'textColor', 'TextField', 'TextFormat',
-            'textHeight', 'TextSnapshot', 'textWidth', 'this', 'throw', 'time', 'toggleHighQuality', 'toLowerCase',
-            'toString', 'toUpperCase', 'trace', 'trackAsMenu', 'try', 'type', 'typeof', 'undefined',
-            'underline', 'unescape', 'uninstall', 'unloadClip', 'unloadMovie', 'unLoadMovieNum', 'unshift', 'unwatch',
-            'UP', 'updateAfterEvent', 'updateProperties', 'url', 'useCodePage', 'useEchoSuppression', 'useHandCursor',
-            'UTC', 'valueOf', 'variable', 'version', 'Video', 'visible', 'void', 'watch', 'width',
-            'with', 'wordwrap', 'XML', 'xmlDecl', 'XMLNode', 'XMLSocket'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #0066CC;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/actionscript3.php b/inc/geshi/actionscript3.php
deleted file mode 100644
index 189d714b3..000000000
--- a/inc/geshi/actionscript3.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/*************************************************************************************
- * actionscript3.php
- * ----------------
- * Author: Jordi Boggiano (j.boggiano@seld.be)
- * Copyright: (c) 2007 Jordi Boggiano (http://www.seld.be/), Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2007/11/26
- *
- * ActionScript3 language file for GeSHi.
- *
- * All keywords scraped from the Flex 2.0.1 Documentation
- *
- * The default style is based on FlexBuilder2 coloring, with the addition of class, package, method and
- * constant names that are highlighted to help identifying problem when used on public pastebins.
- *
- * For styling, keywords data from 0 to 1 (accessible through .kw1, etc.) are described here :
- *
- *   1 : operators
- *   2 : 'var' keyword
- *   3 : 'function' keyword
- *   4 : 'class' and 'package' keywords
- *   5 : all flash.* class names plus Top Level classes, mx are excluded
- *   6 : all flash.* package names, mx are excluded
- *   7 : valid flash method names and properties (there is no type checks sadly, for example String().x will be highlighted as 'x' is valid, but obviously strings don't have a x property)
- *   8 : valid flash constant names (again, no type check)
- *
- *
- * CHANGES
- * -------
- * 2007/12/06 (1.0.7.22)
- *  -  Added the 'this' keyword (oops)
- *
- * TODO (updated 2007/11/30)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ActionScript 3',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Regular expressions
-        2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])*(?<!\s)\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'with', 'while', 'void', 'undefined', 'typeof', 'try', 'true',
-            'throw', 'this', 'switch', 'super', 'set', 'return', 'public', 'protected',
-            'private', 'null', 'new', 'is', 'internal', 'instanceof', 'in',
-            'import', 'if', 'get', 'for', 'false', 'else', 'each', 'do',
-            'delete', 'default', 'continue', 'catch', 'case', 'break', 'as',
-            'extends', 'override'
-            ),
-        2 => array(
-            'var'
-            ),
-        3 => array(
-            'function'
-            ),
-        4 => array(
-            'class', 'package'
-            ),
-        6 => array(
-            'flash.xml', 'flash.utils', 'flash.ui', 'flash.text',
-            'flash.system', 'flash.profiler', 'flash.printing', 'flash.net',
-            'flash.media', 'flash.geom', 'flash.filters', 'flash.external',
-            'flash.events', 'flash.errors', 'flash.display',
-            'flash.accessibility'
-            ),
-        7 => array(
-            'zoom', 'year', 'y', 'xmlDecl', 'x', 'writeUnsignedInt',
-            'writeUTFBytes', 'writeUTF', 'writeShort', 'writeObject',
-            'writeMultiByte', 'writeInt', 'writeFloat', 'writeExternal',
-            'writeDynamicProperty', 'writeDynamicProperties', 'writeDouble',
-            'writeBytes', 'writeByte', 'writeBoolean', 'wordWrap',
-            'willTrigger', 'width', 'volume', 'visible', 'videoWidth',
-            'videoHeight', 'version', 'valueOf', 'value', 'usingTLS',
-            'useRichTextClipboard', 'useHandCursor', 'useEchoSuppression',
-            'useCodePage', 'url', 'uri', 'uploadCompleteData', 'upload',
-            'updateProperties', 'updateAfterEvent', 'upState', 'unshift',
-            'unlock', 'unload', 'union', 'unescapeMultiByte', 'unescape',
-            'underline', 'uncompress', 'type', 'ty', 'tx', 'transparent',
-            'translate', 'transformPoint', 'transform', 'trackAsMenu', 'track',
-            'trace', 'totalMemory', 'totalFrames', 'topLeft', 'top',
-            'togglePause', 'toXMLString', 'toUpperCase', 'toUTCString',
-            'toTimeString', 'toString', 'toPrecision', 'toLowerCase',
-            'toLocaleUpperCase', 'toLocaleTimeString', 'toLocaleString',
-            'toLocaleLowerCase', 'toLocaleDateString', 'toFixed',
-            'toExponential', 'toDateString', 'timezoneOffset', 'timerComplete',
-            'timer', 'time', 'threshold', 'thickness', 'textWidth',
-            'textSnapshot', 'textInput', 'textHeight', 'textColor', 'text',
-            'test', 'target', 'tan', 'tabStops', 'tabIndexChange', 'tabIndex',
-            'tabEnabledChange', 'tabEnabled', 'tabChildrenChange',
-            'tabChildren', 'sync', 'swfVersion', 'swapChildrenAt',
-            'swapChildren', 'subtract', 'substring', 'substr', 'styleSheet',
-            'styleNames', 'strength', 'stopPropagation',
-            'stopImmediatePropagation', 'stopDrag', 'stopAll', 'stop', 'status',
-            'startDrag', 'start', 'stageY', 'stageX', 'stageWidth',
-            'stageHeight', 'stageFocusRect', 'stage', 'sqrt', 'split', 'splice',
-            'source', 'soundTransform', 'soundComplete', 'sortOn', 'sort',
-            'songName', 'some', 'socketData', 'smoothing', 'slice', 'size',
-            'sin', 'silent', 'silenceTimeout', 'silenceLevel', 'showSettings',
-            'showRedrawRegions', 'showDefaultContextMenu', 'show', 'shortcut',
-            'shiftKey', 'shift', 'sharpness', 'sharedEvents', 'shadowColor',
-            'shadowAlpha', 'settings', 'setUseEchoSuppression', 'setUTCSeconds',
-            'setUTCMonth', 'setUTCMinutes', 'setUTCMilliseconds', 'setUTCHours',
-            'setUTCFullYear', 'setUTCDate', 'setTimeout', 'setTime',
-            'setTextFormat', 'setStyle', 'setSilenceLevel', 'setSettings',
-            'setSelection', 'setSelected', 'setSelectColor', 'setSeconds',
-            'setQuality', 'setPropertyIsEnumerable', 'setProperty', 'setPixels',
-            'setPixel32', 'setPixel', 'setNamespace', 'setName',
-            'setMotionLevel', 'setMonth', 'setMode', 'setMinutes',
-            'setMilliseconds', 'setLoopback', 'setLoopBack', 'setLocalName',
-            'setKeyFrameInterval', 'setInterval', 'setHours', 'setFullYear',
-            'setEmpty', 'setDirty', 'setDate', 'setCompositionString',
-            'setClipboard', 'setChildren', 'setChildIndex',
-            'setAdvancedAntiAliasingTable', 'serverString', 'separatorBefore',
-            'sendToURL', 'send', 'selectionEndIndex', 'selectionBeginIndex',
-            'selectable', 'select', 'seek', 'securityError', 'securityDomain',
-            'secondsUTC', 'seconds', 'search', 'scrollV', 'scrollRect',
-            'scrollH', 'scroll', 'screenResolutionY', 'screenResolutionX',
-            'screenDPI', 'screenColor', 'scenes', 'scaleY', 'scaleX',
-            'scaleMode', 'scale9Grid', 'scale', 'save', 'sandboxType',
-            'sameDomain', 'running', 'round', 'rotation', 'rotate', 'root',
-            'rollOver', 'rollOut', 'rightToRight', 'rightToLeft', 'rightPeak',
-            'rightMargin', 'right', 'rewind', 'reverse', 'resume', 'restrict',
-            'resize', 'reset', 'requestHeaders', 'replaceText',
-            'replaceSelectedText', 'replace', 'repeatCount', 'render',
-            'removedFromStage', 'removed', 'removeNode', 'removeNamespace',
-            'removeEventListener', 'removeChildAt', 'removeChild',
-            'relatedObject', 'registerFont', 'registerClassAlias', 'redOffset',
-            'redMultiplier', 'rect', 'receiveVideo', 'receiveAudio',
-            'readUnsignedShort', 'readUnsignedInt', 'readUnsignedByte',
-            'readUTFBytes', 'readUTF', 'readShort', 'readObject',
-            'readMultiByte', 'readInt', 'readFloat', 'readExternal',
-            'readDouble', 'readBytes', 'readByte', 'readBoolean', 'ratios',
-            'rate', 'random', 'quality', 'push', 'publish', 'proxyType',
-            'prototype', 'propertyIsEnumerable', 'progress',
-            'processingInstructions', 'printAsBitmap', 'print',
-            'previousSibling', 'preventDefault', 'prevScene', 'prevFrame',
-            'prettyPrinting', 'prettyIndent', 'preserveAlpha', 'prependChild',
-            'prefix', 'pow', 'position', 'pop', 'polar', 'playerType', 'play',
-            'pixelSnapping', 'pixelDissolve', 'pixelBounds', 'pixelAspectRatio',
-            'perlinNoise', 'pause', 'parseXML', 'parseInt', 'parseFloat',
-            'parseCSS', 'parse', 'parentNode', 'parentDomain',
-            'parentAllowsChild', 'parent', 'parameters', 'paperWidth',
-            'paperHeight', 'pan', 'paletteMap', 'pageWidth', 'pageHeight',
-            'overState', 'outsideCutoff', 'os', 'orientation', 'open',
-            'opaqueBackground', 'onPlayStatus', 'onMetaData', 'onCuePoint',
-            'offsetPoint', 'offset', 'objectID', 'objectEncoding', 'numLock',
-            'numLines', 'numFrames', 'numChildren', 'normalize', 'noise',
-            'nodeValue', 'nodeType', 'nodeName', 'nodeKind', 'noAutoLabeling',
-            'nextValue', 'nextSibling', 'nextScene', 'nextNameIndex',
-            'nextName', 'nextFrame', 'netStatus', 'navigateToURL',
-            'namespaceURI', 'namespaceDeclarations', 'namespace', 'names',
-            'name', 'muted', 'multiline', 'moveTo', 'mouseY', 'mouseX',
-            'mouseWheelEnabled', 'mouseWheel', 'mouseUp', 'mouseTarget',
-            'mouseOver', 'mouseOut', 'mouseMove', 'mouseLeave',
-            'mouseFocusChange', 'mouseEnabled', 'mouseDown', 'mouseChildren',
-            'motionTimeout', 'motionLevel', 'monthUTC', 'month',
-            'modificationDate', 'mode', 'minutesUTC', 'minutes', 'min',
-            'millisecondsUTC', 'milliseconds', 'method', 'message', 'merge',
-            'menuSelect', 'menuItemSelect', 'maxScrollV', 'maxScrollH',
-            'maxLevel', 'maxChars', 'max', 'matrixY', 'matrixX', 'matrix',
-            'match', 'mask', 'mapPoint', 'mapBitmap', 'map', 'manufacturer',
-            'macType', 'loopback', 'loop', 'log', 'lock', 'localeCompare',
-            'localY', 'localX', 'localToGlobal', 'localName',
-            'localFileReadDisable', 'loaderURL', 'loaderInfo', 'loader',
-            'loadPolicyFile', 'loadBytes', 'load', 'liveDelay', 'link',
-            'lineTo', 'lineStyle', 'lineGradientStyle', 'level',
-            'letterSpacing', 'length', 'leftToRight', 'leftToLeft', 'leftPeak',
-            'leftMargin', 'left', 'leading', 'lastIndexOf', 'lastIndex',
-            'lastChild', 'language', 'labels', 'knockout', 'keyUp',
-            'keyLocation', 'keyFrameInterval', 'keyFocusChange', 'keyDown',
-            'keyCode', 'kerning', 'join', 'italic', 'isXMLName',
-            'isPrototypeOf', 'isNaN', 'isFocusInaccessible', 'isFinite',
-            'isEmpty', 'isDefaultPrevented', 'isDebugger', 'isBuffering',
-            'isAttribute', 'isAccessible', 'ioError', 'invert', 'invalidate',
-            'intersects', 'intersection', 'interpolate', 'insideCutoff',
-            'insertChildBefore', 'insertChildAfter', 'insertBefore', 'inner',
-            'init', 'info', 'inflatePoint', 'inflate', 'indexOf', 'index',
-            'indent', 'inScopeNamespaces', 'imeComposition', 'ime',
-            'ignoreWhitespace', 'ignoreWhite', 'ignoreProcessingInstructions',
-            'ignoreComments', 'ignoreCase', 'identity', 'idMap', 'id3',
-            'httpStatus', 'htmlText', 'hoursUTC', 'hours', 'hitTestTextNearPos',
-            'hitTestState', 'hitTestPoint', 'hitTestObject', 'hitTest',
-            'hitArea', 'highlightColor', 'highlightAlpha', 'hideObject',
-            'hideBuiltInItems', 'hide', 'height', 'hasVideoEncoder', 'hasTLS',
-            'hasStreamingVideo', 'hasStreamingAudio', 'hasSimpleContent',
-            'hasScreenPlayback', 'hasScreenBroadcast', 'hasProperty',
-            'hasPrinting', 'hasOwnProperty', 'hasMP3', 'hasIME', 'hasGlyphs',
-            'hasEventListener', 'hasEmbeddedVideo', 'hasDefinition',
-            'hasComplexContent', 'hasChildNodes', 'hasAudioEncoder', 'hasAudio',
-            'hasAccessibility', 'gridFitType', 'greenOffset', 'greenMultiplier',
-            'graphics', 'gotoAndStop', 'gotoAndPlay', 'globalToLocal', 'global',
-            'getUTCSeconds', 'getUTCMonth', 'getUTCMinutes',
-            'getUTCMilliseconds', 'getUTCHours', 'getUTCFullYear', 'getUTCDay',
-            'getUTCDate', 'getTimezoneOffset', 'getTimer', 'getTime',
-            'getTextRunInfo', 'getTextFormat', 'getText', 'getStyle',
-            'getStackTrace', 'getSelectedText', 'getSelected', 'getSeconds',
-            'getRemote', 'getRect', 'getQualifiedSuperclassName',
-            'getQualifiedClassName', 'getProperty', 'getPrefixForNamespace',
-            'getPixels', 'getPixel32', 'getPixel', 'getParagraphLength',
-            'getObjectsUnderPoint', 'getNamespaceForPrefix', 'getMonth',
-            'getMinutes', 'getMilliseconds', 'getMicrophone', 'getLocal',
-            'getLineText', 'getLineOffset', 'getLineMetrics', 'getLineLength',
-            'getLineIndexOfChar', 'getLineIndexAtPoint', 'getImageReference',
-            'getHours', 'getFullYear', 'getFirstCharInParagraph',
-            'getDescendants', 'getDefinitionByName', 'getDefinition', 'getDay',
-            'getDate', 'getColorBoundsRect', 'getClassByAlias', 'getChildIndex',
-            'getChildByName', 'getChildAt', 'getCharIndexAtPoint',
-            'getCharBoundaries', 'getCamera', 'getBounds', 'genre',
-            'generateFilterRect', 'gain', 'fullYearUTC', 'fullYear',
-            'fullScreen', 'fscommand', 'fromCharCode', 'framesLoaded',
-            'frameRate', 'frame', 'fps', 'forwardAndBack', 'formatToString',
-            'forceSimple', 'forEach', 'fontType', 'fontStyle', 'fontSize',
-            'fontName', 'font', 'focusRect', 'focusOut', 'focusIn', 'focus',
-            'flush', 'floor', 'floodFill', 'firstChild', 'findText', 'filters',
-            'filter', 'fillRect', 'fileList', 'extension', 'extended', 'exp',
-            'exec', 'exactSettings', 'every', 'eventPhase', 'escapeMultiByte',
-            'escape', 'errorID', 'error', 'equals', 'enumerateFonts',
-            'enterFrame', 'endian', 'endFill', 'encodeURIComponent',
-            'encodeURI', 'enabled', 'embedFonts', 'elements',
-            'dynamicPropertyWriter', 'dropTarget', 'drawRoundRect', 'drawRect',
-            'drawEllipse', 'drawCircle', 'draw', 'download', 'downState',
-            'doubleClickEnabled', 'doubleClick', 'dotall', 'domain',
-            'docTypeDecl', 'doConversion', 'divisor', 'distance', 'dispose',
-            'displayState', 'displayMode', 'displayAsPassword', 'dispatchEvent',
-            'description', 'describeType', 'descent', 'descendants',
-            'deltaTransformPoint', 'delta', 'deleteProperty', 'delay',
-            'defaultTextFormat', 'defaultSettings', 'defaultObjectEncoding',
-            'decodeURIComponent', 'decodeURI', 'decode', 'deblocking',
-            'deactivate', 'dayUTC', 'day', 'dateUTC', 'date', 'dataFormat',
-            'data', 'd', 'customItems', 'curveTo', 'currentTarget',
-            'currentScene', 'currentLabels', 'currentLabel', 'currentFrame',
-            'currentFPS', 'currentDomain', 'currentCount', 'ctrlKey', 'creator',
-            'creationDate', 'createTextNode', 'createGradientBox',
-            'createElement', 'createBox', 'cos', 'copyPixels', 'copyChannel',
-            'copy', 'conversionMode', 'contextMenuOwner', 'contextMenu',
-            'contentType', 'contentLoaderInfo', 'content', 'containsRect',
-            'containsPoint', 'contains', 'constructor', 'connectedProxyType',
-            'connected', 'connect', 'condenseWhite', 'concatenatedMatrix',
-            'concatenatedColorTransform', 'concat', 'computeSpectrum',
-            'compress', 'componentY', 'componentX', 'complete', 'compare',
-            'comments', 'comment', 'colors', 'colorTransform', 'color', 'code',
-            'close', 'cloneNode', 'clone', 'client', 'click', 'clearTimeout',
-            'clearInterval', 'clear', 'clamp', 'children', 'childNodes',
-            'childIndex', 'childAllowsParent', 'child', 'checkPolicyFile',
-            'charCount', 'charCodeAt', 'charCode', 'charAt', 'changeList',
-            'change', 'ceil', 'caretIndex', 'caption', 'capsLock', 'cancelable',
-            'cancel', 'callee', 'callProperty', 'call', 'cacheAsBitmap', 'c',
-            'bytesTotal', 'bytesLoaded', 'bytesAvailable', 'buttonMode',
-            'buttonDown', 'bullet', 'builtInItems', 'bufferTime',
-            'bufferLength', 'bubbles', 'browse', 'bottomScrollV', 'bottomRight',
-            'bottom', 'borderColor', 'border', 'bold', 'blurY', 'blurX',
-            'blueOffset', 'blueMultiplier', 'blockIndent', 'blendMode',
-            'bitmapData', 'bias', 'beginGradientFill', 'beginFill',
-            'beginBitmapFill', 'bandwidth', 'backgroundColor', 'background',
-            'b', 'available', 'avHardwareDisable', 'autoSize', 'attributes',
-            'attribute', 'attachNetStream', 'attachCamera', 'attachAudio',
-            'atan2', 'atan', 'asyncError', 'asin', 'ascent', 'artist',
-            'areSoundsInaccessible', 'areInaccessibleObjectsUnderPoint',
-            'applyFilter', 'apply', 'applicationDomain', 'appendText',
-            'appendChild', 'antiAliasType', 'angle', 'alwaysShowSelection',
-            'altKey', 'alphas', 'alphaOffset', 'alphaMultiplier', 'alpha',
-            'allowInsecureDomain', 'allowDomain', 'align', 'album',
-            'addedToStage', 'added', 'addPage', 'addNamespace', 'addHeader',
-            'addEventListener', 'addChildAt', 'addChild', 'addCallback', 'add',
-            'activityLevel', 'activity', 'active', 'activating', 'activate',
-            'actionScriptVersion', 'acos', 'accessibilityProperties', 'abs'
-            ),
-        8 => array(
-            'WRAP', 'VERTICAL', 'VARIABLES',
-            'UTC', 'UPLOAD_COMPLETE_DATA', 'UP', 'UNLOAD', 'UNKNOWN',
-            'UNIQUESORT', 'TOP_RIGHT', 'TOP_LEFT', 'TOP', 'TIMER_COMPLETE',
-            'TIMER', 'TEXT_NODE', 'TEXT_INPUT', 'TEXT', 'TAB_INDEX_CHANGE',
-            'TAB_ENABLED_CHANGE', 'TAB_CHILDREN_CHANGE', 'TAB', 'SYNC',
-            'SUBTRACT', 'SUBPIXEL', 'STATUS', 'STANDARD', 'SQUARE', 'SQRT2',
-            'SQRT1_2', 'SPACE', 'SOUND_COMPLETE', 'SOCKET_DATA', 'SHOW_ALL',
-            'SHIFT', 'SETTINGS_MANAGER', 'SELECT', 'SECURITY_ERROR', 'SCROLL',
-            'SCREEN', 'ROUND', 'ROLL_OVER', 'ROLL_OUT', 'RIGHT', 'RGB',
-            'RETURNINDEXEDARRAY', 'RESIZE', 'REPEAT', 'RENDER',
-            'REMOVED_FROM_STAGE', 'REMOVED', 'REMOTE', 'REGULAR', 'REFLECT',
-            'RED', 'RADIAL', 'PROGRESS', 'PRIVACY', 'POST', 'POSITIVE_INFINITY',
-            'PORTRAIT', 'PIXEL', 'PI', 'PENDING', 'PAGE_UP', 'PAGE_DOWN', 'PAD',
-            'OVERLAY', 'OUTER', 'OPEN', 'NaN', 'NUM_PAD', 'NUMPAD_SUBTRACT',
-            'NUMPAD_MULTIPLY', 'NUMPAD_ENTER', 'NUMPAD_DIVIDE',
-            'NUMPAD_DECIMAL', 'NUMPAD_ADD', 'NUMPAD_9', 'NUMPAD_8', 'NUMPAD_7',
-            'NUMPAD_6', 'NUMPAD_5', 'NUMPAD_4', 'NUMPAD_3', 'NUMPAD_2',
-            'NUMPAD_1', 'NUMPAD_0', 'NUMERIC', 'NO_SCALE', 'NO_BORDER',
-            'NORMAL', 'NONE', 'NEVER', 'NET_STATUS', 'NEGATIVE_INFINITY',
-            'MULTIPLY', 'MOUSE_WHEEL', 'MOUSE_UP', 'MOUSE_OVER', 'MOUSE_OUT',
-            'MOUSE_MOVE', 'MOUSE_LEAVE', 'MOUSE_FOCUS_CHANGE', 'MOUSE_DOWN',
-            'MITER', 'MIN_VALUE', 'MICROPHONE', 'MENU_SELECT',
-            'MENU_ITEM_SELECT', 'MEDIUM', 'MAX_VALUE', 'LOW', 'LOG2E', 'LOG10E',
-            'LOCAL_WITH_NETWORK', 'LOCAL_WITH_FILE', 'LOCAL_TRUSTED',
-            'LOCAL_STORAGE', 'LN2', 'LN10', 'LITTLE_ENDIAN', 'LINK',
-            'LINEAR_RGB', 'LINEAR', 'LIGHT_COLOR', 'LIGHTEN', 'LEFT', 'LCD',
-            'LAYER', 'LANDSCAPE', 'KOREAN', 'KEY_UP', 'KEY_FOCUS_CHANGE',
-            'KEY_DOWN', 'JUSTIFY', 'JAPANESE_KATAKANA_HALF',
-            'JAPANESE_KATAKANA_FULL', 'JAPANESE_HIRAGANA', 'Infinity', 'ITALIC',
-            'IO_ERROR', 'INVERT', 'INSERT', 'INPUT', 'INNER', 'INIT',
-            'IME_COMPOSITION', 'IGNORE', 'ID3', 'HTTP_STATUS', 'HORIZONTAL',
-            'HOME', 'HIGH', 'HARDLIGHT', 'GREEN', 'GET', 'FULLSCREEN', 'FULL',
-            'FOCUS_OUT', 'FOCUS_IN', 'FLUSHED', 'FLASH9', 'FLASH8', 'FLASH7',
-            'FLASH6', 'FLASH5', 'FLASH4', 'FLASH3', 'FLASH2', 'FLASH1', 'F9',
-            'F8', 'F7', 'F6', 'F5', 'F4', 'F3', 'F2', 'F15', 'F14', 'F13',
-            'F12', 'F11', 'F10', 'F1', 'EXACT_FIT', 'ESCAPE', 'ERROR', 'ERASE',
-            'ENTER_FRAME', 'ENTER', 'END', 'EMBEDDED', 'ELEMENT_NODE', 'E',
-            'DYNAMIC', 'DOWN', 'DOUBLE_CLICK', 'DIFFERENCE', 'DEVICE',
-            'DESCENDING', 'DELETE', 'DEFAULT', 'DEACTIVATE', 'DATA',
-            'DARK_COLOR', 'DARKEN', 'CRT', 'CONTROL', 'CONNECT', 'COMPLETE',
-            'COLOR', 'CLOSE', 'CLICK', 'CLAMP', 'CHINESE', 'CHANGE', 'CENTER',
-            'CASEINSENSITIVE', 'CAPTURING_PHASE', 'CAPS_LOCK', 'CANCEL',
-            'CAMERA', 'BUBBLING_PHASE', 'BOTTOM_RIGHT', 'BOTTOM_LEFT', 'BOTTOM',
-            'BOLD_ITALIC', 'BOLD', 'BLUE', 'BINARY', 'BIG_ENDIAN', 'BEVEL',
-            'BEST', 'BACKSPACE', 'AUTO', 'AT_TARGET', 'ASYNC_ERROR', 'AMF3',
-            'AMF0', 'ALWAYS', 'ALPHANUMERIC_HALF', 'ALPHANUMERIC_FULL', 'ALPHA',
-            'ADVANCED', 'ADDED_TO_STAGE', 'ADDED', 'ADD', 'ACTIVITY',
-            'ACTIONSCRIPT3', 'ACTIONSCRIPT2'
-            ),
-        //FIX: Must be last in order to avoid conflicts with keywords present
-        //in other keyword groups, that might get highlighted as part of the URL.
-        //I know this is not a proper work-around, but should do just fine.
-        5 => array(
-            'uint', 'int', 'arguments', 'XMLSocket', 'XMLNodeType', 'XMLNode',
-            'XMLList', 'XMLDocument', 'XML', 'Video', 'VerifyError',
-            'URLVariables', 'URLStream', 'URLRequestMethod', 'URLRequestHeader',
-            'URLRequest', 'URLLoaderDataFormat', 'URLLoader', 'URIError',
-            'TypeError', 'Transform', 'TimerEvent', 'Timer', 'TextSnapshot',
-            'TextRenderer', 'TextLineMetrics', 'TextFormatAlign', 'TextFormat',
-            'TextFieldType', 'TextFieldAutoSize', 'TextField', 'TextEvent',
-            'TextDisplayMode', 'TextColorType', 'System', 'SyntaxError',
-            'SyncEvent', 'StyleSheet', 'String', 'StatusEvent', 'StaticText',
-            'StageScaleMode', 'StageQuality', 'StageAlign', 'Stage',
-            'StackOverflowError', 'Sprite', 'SpreadMethod', 'SoundTransform',
-            'SoundMixer', 'SoundLoaderContext', 'SoundChannel', 'Sound',
-            'Socket', 'SimpleButton', 'SharedObjectFlushStatus', 'SharedObject',
-            'Shape', 'SecurityPanel', 'SecurityErrorEvent', 'SecurityError',
-            'SecurityDomain', 'Security', 'ScriptTimeoutError', 'Scene',
-            'SWFVersion', 'Responder', 'RegExp', 'ReferenceError', 'Rectangle',
-            'RangeError', 'QName', 'Proxy', 'ProgressEvent',
-            'PrintJobOrientation', 'PrintJobOptions', 'PrintJob', 'Point',
-            'PixelSnapping', 'ObjectEncoding', 'Object', 'Number', 'NetStream',
-            'NetStatusEvent', 'NetConnection', 'Namespace', 'MovieClip',
-            'MouseEvent', 'Mouse', 'MorphShape', 'Microphone', 'MemoryError',
-            'Matrix', 'Math', 'LocalConnection', 'LoaderInfo', 'LoaderContext',
-            'Loader', 'LineScaleMode', 'KeyboardEvent', 'Keyboard',
-            'KeyLocation', 'JointStyle', 'InvalidSWFError',
-            'InterpolationMethod', 'InteractiveObject', 'IllegalOperationError',
-            'IOErrorEvent', 'IOError', 'IMEEvent', 'IMEConversionMode', 'IME',
-            'IExternalizable', 'IEventDispatcher', 'IDynamicPropertyWriter',
-            'IDynamicPropertyOutput', 'IDataOutput', 'IDataInput', 'ID3Info',
-            'IBitmapDrawable', 'HTTPStatusEvent', 'GridFitType', 'Graphics',
-            'GradientType', 'GradientGlowFilter', 'GradientBevelFilter',
-            'GlowFilter', 'Function', 'FrameLabel', 'FontType', 'FontStyle',
-            'Font', 'FocusEvent', 'FileReferenceList', 'FileReference',
-            'FileFilter', 'ExternalInterface', 'EventPhase', 'EventDispatcher',
-            'Event', 'EvalError', 'ErrorEvent', 'Error', 'Endian', 'EOFError',
-            'DropShadowFilter', 'DisplayObjectContainer', 'DisplayObject',
-            'DisplacementMapFilterMode', 'DisplacementMapFilter', 'Dictionary',
-            'DefinitionError', 'Date', 'DataEvent', 'ConvolutionFilter',
-            'ContextMenuItem', 'ContextMenuEvent', 'ContextMenuBuiltInItems',
-            'ContextMenu', 'ColorTransform', 'ColorMatrixFilter', 'Class',
-            'CapsStyle', 'Capabilities', 'Camera', 'CSMSettings', 'ByteArray',
-            'Boolean', 'BlurFilter', 'BlendMode', 'BitmapFilterType',
-            'BitmapFilterQuality', 'BitmapFilter', 'BitmapDataChannel',
-            'BitmapData', 'Bitmap', 'BevelFilter', 'AsyncErrorEvent', 'Array',
-            'ArgumentError', 'ApplicationDomain', 'AntiAliasType',
-            'ActivityEvent', 'ActionScriptVersion', 'AccessibilityProperties',
-            'Accessibility', 'AVM1Movie'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>', '^', '-', '+', '~', '?', ':', ';', '.', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0033ff; font-weight: bold;',
-            2 => 'color: #6699cc; font-weight: bold;',
-            3 => 'color: #339966; font-weight: bold;',
-            4 => 'color: #9900cc; font-weight: bold;',
-            5 => 'color: #004993;',
-            6 => 'color: #004993;',
-            7 => 'color: #004993;',
-            8 => 'color: #004993;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #009900; font-style: italic;',
-            2 => 'color: #009966; font-style: italic;',
-            'MULTI' => 'color: #3f5fbf;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #990000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000; font-weight:bold;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #000000;',
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => 'http://www.google.com/search?q={FNAMEL}%20inurl:http://livedocs.adobe.com/flex/201/langref/%20inurl:{FNAMEL}.html',
-        6 => '',
-        7 => '',
-        8 => ''
-        ),
-    'OOLANG' => false,//Save some time as OO identifiers aren't used
-    'OBJECT_SPLITTERS' => array(
-        // commented out because it's not very relevant for AS, as all properties, methods and constants are dot-accessed.
-        // I believe it's preferable to have package highlighting for example, which is not possible with this enabled.
-        // 0 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/ada.php b/inc/geshi/ada.php
deleted file mode 100644
index c4ef2c395..000000000
--- a/inc/geshi/ada.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*************************************************************************************
- * ada.php
- * -------
- * Author: Tux (tux@inmail.cz)
- * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/29
- *
- * Ada language file for GeSHi.
- * Words are from SciTe configuration file
- *
- * CHANGES
- * -------
- * 2004/11/27 (1.0.2)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.1)
- *   -  Removed apostrophe as string delimiter
- *   -  Added URL support
- * 2004/08/05 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Ada',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'begin', 'declare', 'do', 'else', 'elsif', 'exception', 'for', 'if',
-            'is', 'loop', 'while', 'then', 'end', 'select', 'case', 'until',
-            'goto', 'return'
-            ),
-        2 => array(
-            'abs', 'and', 'at', 'mod', 'not', 'or', 'rem', 'xor'
-            ),
-        3 => array(
-            'abort', 'abstract', 'accept', 'access', 'aliased', 'all', 'array',
-            'body', 'constant', 'delay', 'delta', 'digits', 'entry', 'exit',
-            'function', 'generic', 'in', 'interface', 'limited', 'new', 'null',
-            'of', 'others', 'out', 'overriding', 'package', 'pragma', 'private',
-            'procedure', 'protected', 'raise', 'range', 'record', 'renames',
-            'requeue', 'reverse', 'separate', 'subtype', 'synchronized',
-            'tagged', 'task', 'terminate', 'type', 'use', 'when', 'with'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #46aa03; font-weight:bold;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/algol68.php b/inc/geshi/algol68.php
deleted file mode 100644
index 5b1e5aa7f..000000000
--- a/inc/geshi/algol68.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/*************************************************************************************
- * algol68.php
- * --------
- * Author: Neville Dempsey (NevilleD.sourceforge@sgr-a.net)
- * Copyright: (c) 2010 Neville Dempsey (https://sourceforge.net/projects/algol68/files/)
- * Release Version: 1.0.8.11
- * Date Started: 2010/04/24
- *
- * ALGOL 68 language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/04/24 (1.0.8.8.0)
- *   - First Release - machine generated by http://rosettacode.org/geshi/
- * 2010/05/24 (1.0.8.8.1)
- *   - #2324 - converted comment detection to RegEx
- * 2010/06/16 (1.0.8.8.2)
- *   - separate symbols from keywords - quick fix
- * 2010/06/16 (1.0.8.8.3)
- *   - reverse length order symbols
- *   - Add RegEx for BITS and REAL literals (INT to do)
- *   - recognise LONG and SHORT prefixes to literals
- * 2010/07/23 (1.0.8.8.4)
- *   - fix errors detected by langcheck.php, eg rm tab, fix indenting, rm duplicate keywords, fix symbols as keywords etc
- *   - removed bulk of local variables from name space.
- *   - unfolded arrays
- *
- * TODO (updated yyyy/mm/dd)
- * -------------------------
- *   - Use "Parser Control" to fix KEYWORD parsing, eg: (INT minus one= -1; print(ABSminus one))
- *   - Parse $FORMATS$ more fully - if possible.
- *   - Pull reserved words from the source of A68G and A68RS
- *   - Pull stdlib PROC/OP/MODE symbols from the soruce of A68G and A68RS
- *   - Pull PROC/OP/MODE extensions from the soruce of A68G and A68RS
- *   - Use RegEx to detect extended precision PROC names, eg 'long long sin' etc
- *   - Use RegEx to detect white space std PROC names, eg 'new line'
- *   - Use RegEx to detect white space ext PROC names, eg 'cgs speed of light'
- *   - Use RegEx to detect BOLD symbols, eg userdefined MODEs and OPs
- *   - Add REgEx for INT literals - Adding INT breaks formatting...
- *   - Adding PIPE as a key word breaks formatting of "|" symbols!!
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-if(!function_exists('geshi_langfile_algol68_vars')) {
-    function geshi_langfile_algol68_vars(){
-        $pre='(?<![0-9a-z_\.])';
-        $post='?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)';
-        $post=""; # assuming the RegEx is greedy #
-
-        $_="\s*";
-
-        $srad="Rr";        $rrad="[".$srad."]";  # either one digit, OR opt-space in digits #
-        $sbin="0-1";       $rbin="[".$sbin."]";  $_bin=$rbin."(?:[".$sbin."\s]*".$rbin."|)";
-        $snib="0-3";       $rnib="[".$snib."]";  $_nib=$rnib."(?:[".$snib."\s]*".$rnib."|)";
-        $soct="0-7";       $roct="[".$soct."]";  $_oct=$roct."(?:[".$soct."\s]*".$roct."|)";
-        $sdec="0-9";       $rdec="[".$sdec."]";  $_dec=$rdec."(?:[".$sdec."\s]*".$rdec."|)";
-        $shex="0-9A-Fa-f"; $rhex="[".$shex."]";  $_hex=$rhex."(?:[".$shex."\s]*".$rhex."|)";
-
-        # Define BITS: #
-        $prebits=$pre; $postbits=$post;
-        $bl="2".$_.$rrad.$_.$_bin;
-        $bl=$bl."|"."2".$_.$rrad.$_.$_bin;
-        $bl=$bl."|"."4".$_.$rrad.$_.$_nib;
-        $bl=$bl."|"."8".$_.$rrad.$_.$_oct;
-        $bl=$bl."|"."1".$_."0".$_.$rrad.$_.$_dec;
-        $bl=$bl."|"."1".$_."6".$_.$rrad.$_.$_hex;
-
-        # Define INT: #
-        $preint=$pre; $postint=$post;
-        # for some reason ".0 e - 2" is not recognised, but ".0 e + 2" IS!
-        # work around: remove spaces between sign and digits! Maybe because
-        # of the Unary '-' Operator
-        $sign_="(?:-|\-|[-]|[\-]|\+|)";  # attempts #
-
-        $sign_="(?:-\s*|\+\s*|)"; # n.b. sign is followed by white space #
-
-        $_int=$sign_.$_dec;
-        $il=          $_int;                      # +_9           #
-
-        $GESHI_NUMBER_INT_BASIC='(?:(?<![0-9a-z_\.%])|(?<=\.\.))(?<![\d\.]e[+\-])([1-9]\d*?|0)(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)';
-
-        # Define REAL: #
-        $prereal=$pre; $postreal=$post;
-        $sexp="Ee\\\\";   $_exp="(?:⏨|[".$sexp."])".$_.$_int;
-        $_decimal="[.]".$_.$_dec;
-
-        # Add permitted permutations of various parts #
-        $rl=        $_int.$_.$_decimal.$_.$_exp; # +_9_._9_e_+_9 #
-        $rl=$rl."|".$_int.$_."[.]".$_.$_exp;     # +_9_.___e_+_9 #
-        $rl=$rl."|".$_int.$_.$_exp;              # +_9_____e_+_9 #
-        $rl=$rl."|".$sign_.$_decimal.$_.$_exp;   # +___._9_e_+_9 #
-
-        $rl=$rl."|".$_int.$_.$_decimal;          # +_9_._9       #
-        $rl=$rl."|".$sign_.$_decimal;            # +___._9       #
-
-        # The following line damaged formatting...
-        #$rl=$rl."|".$_int;                       # +_9           #
-
-        # Apparently Algol68 does not support '2.', c.f. Algol 68G
-        #$rl=$rl."|".$_int.$_."[.]";             # +_9_.         #
-
-        # Literal prefixes are overridden by KEYWORDS :-(
-        $LONGS="(?:(?:(LONG\s+)*|(SHORT\s+))*|)";
-
-        return array(
-            "BITS" => $prebits.$LONGS."(?:".$bl.")".$postbits,
-            "INT" => $preint.$LONGS."(?:".$il.")".$postint,
-            "REAL" => $prereal.$LONGS."(?:".$rl.")".$postreal,
-
-            "BOLD" => 'color: #b1b100; font-weight: bold;',
-            "ITALIC" => 'color: #b1b100;', # procedures traditionally italic #
-            "NONSTD" => 'color: #FF0000; font-weight: bold;', # RED #
-            "COMMENT" => 'color: #666666; font-style: italic;'
-        );
-    }
-}
-$a68=geshi_langfile_algol68_vars();
-
-$language_data = array(
-    'LANG_NAME' => 'ALGOL 68',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(
-        '¢' => '¢',
-        '£' => '£',
-        '#' => '#',
-        ),
-    'COMMENT_REGEXP' => array(
-        1 => '/\bCO((?:MMENT)?)\b.*?\bCO\\1\b/i',
-        2 => '/\bPR((?:AGMAT)?)\b.*?\bPR\\1\b/i',
-        3 => '/\bQUOTE\b.*?\bQUOTE\b/i'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '"',
-    'NUMBERS' => GESHI_NUMBER_HEX_SUFFIX,  # Warning: Feature!! #
-#                GESHI_NUMBER_HEX_SUFFIX, # Attempt ignore default #
-    'KEYWORDS' => array(
-# Extensions
-        1 => array('KEEP', 'FINISH', 'USE', 'SYSPROCS', 'IOSTATE', 'USING', 'ENVIRON', 'PROGRAM', 'CONTEXT'),
-#        2 => array('CASE', 'IN', 'OUSE', 'IN', 'OUT', 'ESAC', '(', '|', '|:', ')', 'FOR', 'FROM', 'TO', 'BY', 'WHILE', 'DO', 'OD', 'IF', 'THEN', 'ELIF', 'THEN', 'ELSE', 'FI', 'PAR', 'BEGIN', 'EXIT', 'END', 'GO', 'GOTO', 'FORALL', 'UPTO', 'DOWNTO', 'FOREACH', 'ASSERT'), #
-        2 => array('CASE', 'IN', 'OUSE', /* 'IN',*/ 'OUT', 'ESAC', 'PAR', 'BEGIN', 'EXIT', 'END', 'GO TO', 'GOTO', 'FOR', 'FROM', 'TO', 'BY', 'WHILE', 'DO', 'OD', 'IF', 'THEN', 'ELIF', /* 'THEN',*/ 'ELSE', 'FI' ),
-        3 => array('BITS', 'BOOL', 'BYTES', 'CHAR', 'COMPL', 'INT', 'REAL', 'SEMA', 'STRING', 'VOID'),
-        4 => array('MODE', 'OP', 'PRIO', 'PROC', 'FLEX', 'HEAP', 'LOC', 'REF', 'LONG', 'SHORT', 'EITHER'),
-# Extensions or deprecated keywords
-# 'PIPE': keyword somehow interferes with the internal operation of GeSHi
-        5 => array('FORALL', 'UPTO', 'DOWNTO', 'FOREACH', 'ASSERT', 'CTB', 'CT', 'CTAB', 'COMPLEX', 'VECTOR', 'SOUND' /*, 'PIPE'*/),
-        6 => array('CHANNEL', 'FILE', 'FORMAT', 'STRUCT', 'UNION', 'OF'),
-# '(', '|', '|:', ')',  #
-#        7 => array('OF', 'AT', '@', 'IS', ':=:', 'ISNT', ':/=:', ':≠:', 'CTB', 'CT', '::', 'CTAB', '::=', 'TRUE', 'FALSE', 'EMPTY', 'NIL', '○', 'SKIP', '~'),
-        7 => array('AT', 'IS', 'ISNT', 'TRUE', 'FALSE', 'EMPTY', 'NIL', 'SKIP'),
-        8 => array('NOT', 'UP', 'DOWN', 'LWB', 'UPB', /* '-',*/ 'ABS', 'ARG', 'BIN', 'ENTIER', 'LENG', 'LEVEL', 'ODD', 'REPR', 'ROUND', 'SHORTEN', 'CONJ', 'SIGN'),
-# OPERATORS ordered roughtly by PRIORITY #
-#       9 => array('¬', '↑', '↓', '⌊', '⌈', '~', '⎩', '⎧'),
-#        10 => array('+*', 'I', '+×', '⊥', '!', '⏨'),
-        10 => array('I'),
-#        11 => array('SHL', 'SHR', '**', 'UP', 'DOWN', 'LWB', 'UPB', '↑', '↓', '⌊', '⌈', '⎩', '⎧'),
-        11 => array('SHL', 'SHR', /*'UP', 'DOWN', 'LWB', 'UPB'*/),
-#        12 => array('*', '/', '%', 'OVER', '%*', 'MOD', 'ELEM', '×', '÷', '÷×', '÷*', '%×', '□', '÷:'),
-        12 => array('OVER', 'MOD', 'ELEM'),
-#        13 => array('-', '+'),
-#        14 => array('<', 'LT', '<=', 'LE', '>=', 'GE', '>', 'GT', '≤', '≥'),
-        14 => array('LT', 'LE', 'GE', 'GT'),
-#        15 => array('=', 'EQ', '/=', 'NE', '≠', '~='),
-        15 => array('EQ', 'NE'),
-#        16 => array('&', 'AND', '∧', 'OR', '∨', '/\\', '\\/'),
-        16 => array('AND', 'OR'),
-        17 => array('MINUSAB', 'PLUSAB', 'TIMESAB', 'DIVAB', 'OVERAB', 'MODAB', 'PLUSTO'),
-#        18 => array('-:=', '+:=', '*:=', '/:=', '%:=', '%*:=', '+=:', '×:=', '÷:=', '÷×:=', '÷*:=', '%×:=', '÷::=', 'MINUS', 'PLUS', 'DIV', 'MOD', 'PRUS'),
-# Extensions or deprecated keywords
-        18 => array('MINUS', 'PLUS', 'DIV', /* 'MOD',*/ 'PRUS', 'IS NOT'),
-# Extensions or deprecated keywords
-        19 => array('THEF', 'ANDF', 'ORF', 'ANDTH', 'OREL', 'ANDTHEN', 'ORELSE'),
-# Built in procedures - from standard prelude #
-        20 => array('int lengths', 'intlengths', 'int shorths', 'intshorths', 'max int', 'maxint', 'real lengths', 'reallengths', 'real shorths', 'realshorths', 'bits lengths', 'bitslengths', 'bits shorths', 'bitsshorths', 'bytes lengths', 'byteslengths', 'bytes shorths', 'bytesshorths', 'max abs char', 'maxabschar', 'int width', 'intwidth', 'long int width', 'longintwidth', 'long long int width', 'longlongintwidth', 'real width', 'realwidth', 'long real width', 'longrealwidth', 'long long real width', 'longlongrealwidth', 'exp width', 'expwidth', 'long exp width', 'longexpwidth', 'long long exp width', 'longlongexpwidth', 'bits width', 'bitswidth', 'long bits width', 'longbitswidth', 'long long bits width', 'longlongbitswidth', 'bytes width', 'byteswidth', 'long bytes width', 'longbyteswidth', 'max real', 'maxreal', 'small real', 'smallreal', 'long max int', 'longmaxint', 'long long max int', 'longlongmaxint', 'long max real', 'longmaxreal', 'long small real', 'longsmallreal', 'long long max real', 'longlongmaxreal', 'long long small real', 'longlongsmallreal', 'long max bits', 'longmaxbits', 'long long max bits', 'longlongmaxbits', 'null character', 'nullcharacter', 'blank', 'flip', 'flop', 'error char', 'errorchar', 'exp char', 'expchar', 'newline char', 'newlinechar', 'formfeed char', 'formfeedchar', 'tab char', 'tabchar'),
-        21 => array('stand in channel', 'standinchannel', 'stand out channel', 'standoutchannel', 'stand back channel', 'standbackchannel', 'stand draw channel', 'standdrawchannel', 'stand error channel', 'standerrorchannel'),
-        22 => array('put possible', 'putpossible', 'get possible', 'getpossible', 'bin possible', 'binpossible', 'set possible', 'setpossible', 'reset possible', 'resetpossible', 'reidf possible', 'reidfpossible', 'draw possible', 'drawpossible', 'compressible', 'on logical file end', 'onlogicalfileend', 'on physical file end', 'onphysicalfileend', 'on line end', 'onlineend', 'on page end', 'onpageend', 'on format end', 'onformatend', 'on value error', 'onvalueerror', 'on open error', 'onopenerror', 'on transput error', 'ontransputerror', 'on format error', 'onformaterror', 'open', 'establish', 'create', 'associate', 'close', 'lock', 'scratch', 'space', 'new line', 'newline', 'print', 'write f', 'writef', 'print f', 'printf', 'write bin', 'writebin', 'print bin', 'printbin', 'read f', 'readf', 'read bin', 'readbin', 'put f', 'putf', 'get f', 'getf', 'make term', 'maketerm', 'make device', 'makedevice', 'idf', 'term', 'read int', 'readint', 'read long int', 'readlongint', 'read long long int', 'readlonglongint', 'read real', 'readreal', 'read long real', 'readlongreal', 'read long long real', 'readlonglongreal', 'read complex', 'readcomplex', 'read long complex', 'readlongcomplex', 'read long long complex', 'readlonglongcomplex', 'read bool', 'readbool', 'read bits', 'readbits', 'read long bits', 'readlongbits', 'read long long bits', 'readlonglongbits', 'read char', 'readchar', 'read string', 'readstring', 'print int', 'printint', 'print long int', 'printlongint', 'print long long int', 'printlonglongint', 'print real', 'printreal', 'print long real', 'printlongreal', 'print long long real', 'printlonglongreal', 'print complex', 'printcomplex', 'print long complex', 'printlongcomplex', 'print long long complex', 'printlonglongcomplex', 'print bool', 'printbool', 'print bits', 'printbits', 'print long bits', 'printlongbits', 'print long long bits', 'printlonglongbits', 'print char', 'printchar', 'print string', 'printstring', 'whole', 'fixed', 'float'),
-        23 => array('pi', 'long pi', 'longpi', 'long long pi', 'longlongpi'),
-        24 => array('sqrt', 'curt', 'cbrt', 'exp', 'ln', 'log', 'sin', 'arc sin', 'arcsin', 'cos', 'arc cos', 'arccos', 'tan', 'arc tan', 'arctan', 'long sqrt', 'longsqrt', 'long curt', 'longcurt', 'long cbrt', 'longcbrt', 'long exp', 'longexp', 'long ln', 'longln', 'long log', 'longlog', 'long sin', 'longsin', 'long arc sin', 'longarcsin', 'long cos', 'longcos', 'long arc cos', 'longarccos', 'long tan', 'longtan', 'long arc tan', 'longarctan', 'long long sqrt', 'longlongsqrt', 'long long curt', 'longlongcurt', 'long long cbrt', 'longlongcbrt', 'long long exp', 'longlongexp', 'long long ln', 'longlongln', 'long long log', 'longlonglog', 'long long sin', 'longlongsin', 'long long arc sin', 'longlongarcsin', 'long long cos', 'longlongcos', 'long long arc cos', 'longlongarccos', 'long long tan', 'longlongtan', 'long long arc tan', 'longlongarctan'),
-        25 => array('first random', 'firstrandom', 'next random', 'nextrandom', 'long next random', 'longnextrandom', 'long long next random', 'longlongnextrandom'),
-        26 => array('real', 'bits pack', 'bitspack', 'long bits pack', 'longbitspack', 'long long bits pack', 'longlongbitspack', 'bytes pack', 'bytespack', 'long bytes pack', 'longbytespack', 'char in string', 'charinstring', 'last char in string', 'lastcharinstring', 'string in string', 'stringinstring'),
-        27 => array('utc time', 'utctime', 'local time', 'localtime', 'argc', 'argv', 'get env', 'getenv', 'reset errno', 'reseterrno', 'errno', 'strerror'),
-        28 => array('sinh', 'long sinh', 'longsinh', 'long long sinh', 'longlongsinh', 'arc sinh', 'arcsinh', 'long arc sinh', 'longarcsinh', 'long long arc sinh', 'longlongarcsinh', 'cosh', 'long cosh', 'longcosh', 'long long cosh', 'longlongcosh', 'arc cosh', 'arccosh', 'long arc cosh', 'longarccosh', 'long long arc cosh', 'longlongarccosh', 'tanh', 'long tanh', 'longtanh', 'long long tanh', 'longlongtanh', 'arc tanh', 'arctanh', 'long arc tanh', 'longarctanh', 'long long arc tanh', 'longlongarctanh', 'arc tan2', 'arctan2', 'long arc tan2', 'longarctan2', 'long long arc tan2', 'longlongarctan2'),
-        29 => array('complex sqrt', 'complexsqrt', 'long complex sqrt', 'longcomplexsqrt', 'long long complex sqrt', 'longlongcomplexsqrt', 'complex exp', 'complexexp', 'long complex exp', 'longcomplexexp', 'long long complex exp', 'longlongcomplexexp', 'complex ln', 'complexln', 'long complex ln', 'longcomplexln', 'long long complex ln', 'longlongcomplexln', 'complex sin', 'complexsin', 'long complex sin', 'longcomplexsin', 'long long complex sin', 'longlongcomplexsin', 'complex arc sin', 'complexarcsin', 'long complex arc sin', 'longcomplexarcsin', 'long long complex arc sin', 'longlongcomplexarcsin', 'complex cos', 'complexcos', 'long complex cos', 'longcomplexcos', 'long long complex cos', 'longlongcomplexcos', 'complex arc cos', 'complexarccos', 'long complex arc cos', 'longcomplexarccos', 'long long complex arc cos', 'longlongcomplexarccos', 'complex tan', 'complextan', 'long complex tan', 'longcomplextan', 'long long complex tan', 'longlongcomplextan', 'complex arc tan', 'complexarctan', 'long complex arc tan', 'longcomplexarctan', 'long long complex arc tan', 'longlongcomplexarctan', 'complex sinh', 'complexsinh', 'complex arc sinh', 'complexarcsinh', 'complex cosh', 'complexcosh', 'complex arc cosh', 'complexarccosh', 'complex tanh', 'complextanh', 'complex arc tanh', 'complexarctanh')
-        ),
-    'SYMBOLS' => array(
-        1 => array( /* reverse length sorted... */ '÷×:=', '%×:=', ':≠:', '÷*:=', '÷::=', '%*:=', ':/=:', '×:=', '÷:=', '÷×', '%:=', '%×', '*:=', '+:=', '+=:', '+×', '-:=', '/:=', '::=', ':=:', '÷*', '÷:', '↑', '↓', '∧', '∨', '≠', '≤', '≥', '⊥', '⌈', '⌊', '⎧', '⎩', /* '⏨', */ '□', '○', '%*', '**', '+*', '/=', '::', '/\\', '\\/', '<=', '>=', '|:', '~=', '¬', '×', '÷', '!', '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '=', '>', '?', '@', '[', ']', '^', '{', '|', '}', '~')
-    ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-#        9 => true,
-        10 => true,
-        11 => true,
-        12 => true,
-#        13 => true,
-        14 => true,
-        15 => true,
-        16 => true,
-        17 => true,
-        18 => true,
-        19 => true,
-        20 => true,
-        21 => true,
-        22 => true,
-        23 => true,
-        24 => true,
-        25 => true,
-        26 => true,
-        27 => true,
-        28 => true,
-        29 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => $a68['NONSTD'], 2 => $a68['BOLD'], 3 => $a68['BOLD'], 4 => $a68['BOLD'],
-            5 => $a68['NONSTD'], 6 => $a68['BOLD'], 7 => $a68['BOLD'], 8 => $a68['BOLD'],
-            /* 9 => $a68['BOLD'],*/ 10 => $a68['BOLD'], 11 => $a68['BOLD'], 12 => $a68['BOLD'],
-            /* 13 => $a68['BOLD'],*/ 14 => $a68['BOLD'], 15 => $a68['BOLD'], 16 => $a68['BOLD'], 17 => $a68['BOLD'],
-            18 => $a68['NONSTD'], 19 => $a68['NONSTD'],
-            20 => $a68['ITALIC'], 21 => $a68['ITALIC'], 22 => $a68['ITALIC'], 23 => $a68['ITALIC'],
-            24 => $a68['ITALIC'], 25 => $a68['ITALIC'], 26 => $a68['ITALIC'], 27 => $a68['ITALIC'],
-            28 => $a68['ITALIC'], 29 => $a68['ITALIC']
-            ),
-        'COMMENTS' => array(
-            1 => $a68['COMMENT'], 2 => $a68['COMMENT'], 3 => $a68['COMMENT'], /* 4 => $a68['COMMENT'],
-            5 => $a68['COMMENT'],*/ 'MULTI' => $a68['COMMENT']
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;',
-            1 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            0  => 'color: #cc66cc;',   # BITS #
-            1  => 'color: #cc66cc;',   # REAL #
-            /* 2  => 'color: #cc66cc;',   # INT # */
-            ),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-#        9 => '',
-        10 => '',
-        11 => '',
-        12 => '',
-#        13 => '',
-        14 => '',
-        15 => '',
-        16 => '',
-        17 => '',
-        18 => '',
-        19 => '',
-        20 => '',
-        21 => '',
-        22 => '',
-        23 => '',
-        24 => '',
-        25 => '',
-        26 => '',
-        27 => '',
-        28 => '',
-        29 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        0 => '→',
-        1 => 'OF'
-        ),
-    'REGEXPS' => array(
-        0 => $a68['BITS'],
-        1 => $a68['REAL']
-        # 2 => $a68['INT'], # Breaks formatting for some reason #
-        # 2 => $GESHI_NUMBER_INT_BASIC # Also breaks formatting  #
-    ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-unset($a68);
-?>
\ No newline at end of file
diff --git a/inc/geshi/apache.php b/inc/geshi/apache.php
deleted file mode 100644
index c944443c7..000000000
--- a/inc/geshi/apache.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-/*************************************************************************************
- * apache.php
- * ----------
- * Author: Tux (tux@inmail.cz)
- * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/29/07
- *
- * Apache language file for GeSHi.
- * Words are from SciTe configuration file
- *
- * CHANGES
- * -------
- * 2008/17/06 (1.0.8)
- *  -  Added support for apache configuration sections (milian)
- *  -  Added missing php keywords (milian)
- *  -  Added some more keywords
- *  -  Disabled highlighting of brackets by default
- * 2004/11/27 (1.0.2)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.1)
- *   -  Added support for URLs
- * 2004/08/05 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/07/29)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Apache configuration',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /*keywords*/
-        1 => array(
-            //core.c
-            'AcceptFilter','AcceptPathInfo','AccessConfig','AccessFileName',
-            'AddDefaultCharset','AddOutputFilterByType','AllowEncodedSlashes',
-            'AllowOverride','AuthName','AuthType','ContentDigest',
-            'CoreDumpDirectory','DefaultType','DocumentRoot','EnableMMAP',
-            'EnableSendfile','ErrorDocument','ErrorLog','FileETag','ForceType',
-            'HostnameLookups','Include','LimitInternalRecursion',
-            'LimitRequestBody','LimitRequestFields','LimitRequestFieldsize',
-            'LimitRequestLine','LimitXMLRequestBody','LogLevel','MaxMemFree',
-            'MaxRequestsPerChild','NameVirtualHost','Options','PidFile','Port',
-            'Protocol','Require','RLimitCPU','RLimitMEM','RLimitNPROC',
-            'Satisfy','ScoreBoardFile','ServerAdmin','ServerAlias','ServerName',
-            'ServerPath','ServerRoot','ServerSignature','ServerTokens',
-            'SetHandler','SetInputFilter','SetOutputFilter','ThreadStackSize',
-            'Timeout','TraceEnable','UseCanonicalName',
-            'UseCanonicalPhysicalPort',
-
-            //http_core.c
-            'KeepAlive','KeepAliveTimeout','MaxKeepAliveRequests',
-
-            //mod_actions.c
-            'Action','Script',
-
-            //mod_alias.c
-            'Alias','AliasMatch','Redirect','RedirectMatch','RedirectPermanent',
-            'RedirectTemp','ScriptAlias','ScriptAliasMatch',
-
-            //mod_asis.c
-
-            //mod_auth_basic.c
-            'AuthBasicAuthoritative','AuthBasicProvider',
-
-            //mod_auth_digest.c
-            'AuthDigestAlgorithm','AuthDigestDomain','AuthDigestNcCheck',
-            'AuthDigestNonceFormat','AuthDigestNonceLifetime',
-            'AuthDigestProvider','AuthDigestQop','AuthDigestShmemSize',
-
-            //mod_authn_alias.c
-
-            //mod_authn_anon.c
-            'Anonymous','Anonymous_LogEmail','Anonymous_MustGiveEmail',
-            'Anonymous_NoUserId','Anonymous_VerifyEmail',
-
-            //mod_authn_dbd.c
-            'AuthDBDUserPWQuery','AuthDBDUserRealmQuery',
-
-            //mod_authn_dbm.c
-            'AuthDBMType','AuthDBMUserFile',
-
-            //mod_authn_default.c
-            'AuthDefaultAuthoritative',
-
-            //mod_authn_file.c
-            'AuthUserFile',
-
-            //mod_authnz_ldap.c
-            'AuthLDAPBindDN','AuthLDAPBindPassword','AuthLDAPCharsetConfig',
-            'AuthLDAPCompareDNOnServer','AuthLDAPDereferenceAliases',
-            'AuthLDAPGroupAttribute','AuthLDAPGroupAttributeIsDN',
-            'AuthLDAPRemoteUserAttribute','AuthLDAPRemoteUserIsDN',
-            'AuthLDAPURL','AuthzLDAPAuthoritative',
-
-            //mod_authz_dbm.c
-            'AuthDBMGroupFile','AuthzDBMAuthoritative','AuthzDBMType',
-
-            //mod_authz_default.c
-            'AuthzDefaultAuthoritative',
-
-            //mod_authz_groupfile.c
-            'AuthGroupFile','AuthzGroupFileAuthoritative',
-
-            //mod_authz_host.c
-            'Allow','Deny','Order',
-
-            //mod_authz_owner.c
-            'AuthzOwnerAuthoritative',
-
-            //mod_authz_svn.c
-            'AuthzForceUsernameCase','AuthzSVNAccessFile','AuthzSVNAnonymous',
-            'AuthzSVNAuthoritative','AuthzSVNNoAuthWhenAnonymousAllowed',
-
-            //mod_authz_user.c
-            'AuthzUserAuthoritative',
-
-            //mod_autoindex.c
-            'AddAlt','AddAltByEncoding','AddAltByType','AddDescription',
-            'AddIcon','AddIconByEncoding','AddIconByType','DefaultIcon',
-            'FancyIndexing','HeaderName','IndexHeadInsert','IndexIgnore',
-            'IndexOptions','IndexOrderDefault','IndexStyleSheet','ReadmeName',
-
-            //mod_bt.c
-            'Tracker','TrackerDetailURL','TrackerFlags','TrackerHashMaxAge',
-            'TrackerHashMinAge','TrackerHashWatermark','TrackerHome',
-            'TrackerReturnInterval','TrackerReturnMax',
-            'TrackerReturnPeerFactor','TrackerReturnPeers','TrackerRootInclude',
-            'TrackerStyleSheet',
-
-            //mod_bw.c
-            'BandWidth','BandWidthError','BandWidthModule','BandWidthPacket',
-            'ForceBandWidthModule','LargeFileLimit','MaxConnection',
-            'MinBandWidth',
-
-            //mod_cache.c
-            'CacheDefaultExpire','CacheDisable','CacheEnable',
-            'CacheIgnoreCacheControl','CacheIgnoreHeaders',
-            'CacheIgnoreNoLastMod','CacheIgnoreQueryString',
-            'CacheLastModifiedFactor','CacheMaxExpire','CacheStoreNoStore',
-            'CacheStorePrivate',
-
-            //mod_cern_meta.c
-            'MetaDir','MetaFiles','MetaSuffix',
-
-            //mod_cgi.c
-            'ScriptLog','ScriptLogBuffer','ScriptLogLength',
-
-            //mod_charset_lite.c
-            'CharsetDefault','CharsetOptions','CharsetSourceEnc',
-
-            //mod_dav.c
-            'DAV','DAVDepthInfinity','DAVMinTimeout',
-
-            //mod_dav_fs.c
-            'DAVLockDB',
-
-            //mod_dav_lock.c
-            'DAVGenericLockDB',
-
-            //mod_dav_svn.c
-            'SVNActivitiesDB','SVNAllowBulkUpdates','SVNAutoversioning',
-            'SVNIndexXSLT','SVNListParentPath','SVNMasterURI','SVNParentPath',
-            'SVNPath','SVNPathAuthz','SVNReposName','SVNSpecialURI',
-
-            //mod_dbd.c
-            'DBDExptime','DBDKeep','DBDMax','DBDMin','DBDParams','DBDPersist',
-            'DBDPrepareSQL','DBDriver',
-
-            //mod_deflate.c
-            'DeflateBufferSize','DeflateCompressionLevel','DeflateFilterNote',
-            'DeflateMemLevel','DeflateWindowSize',
-
-            //mod_dir.c
-            'DirectoryIndex','DirectorySlash',
-
-            //mod_disk_cache.c
-            'CacheDirLength','CacheDirLevels','CacheMaxFileSize',
-            'CacheMinFileSize','CacheRoot',
-
-            //mod_dumpio.c
-            'DumpIOInput','DumpIOLogLevel','DumpIOOutput',
-
-            //mod_env.c
-            'PassEnv','SetEnv','UnsetEnv',
-
-            //mod_expires.c
-            'ExpiresActive','ExpiresByType','ExpiresDefault',
-
-            //mod_ext_filter.c
-            'ExtFilterDefine','ExtFilterOptions',
-
-            //mod_file_cache.c
-            'cachefile','mmapfile',
-
-            //mod_filter.c
-            'FilterChain','FilterDeclare','FilterProtocol','FilterProvider',
-            'FilterTrace',
-
-            //mod_gnutls.c
-            'GnuTLSCache','GnuTLSCacheTimeout','GnuTLSCertificateFile',
-            'GnuTLSKeyFile','GnuTLSPGPCertificateFile','GnuTLSPGPKeyFile',
-            'GnuTLSClientVerify','GnuTLSClientCAFile','GnuTLSPGPKeyringFile',
-            'GnuTLSEnable','GnuTLSDHFile','GnuTLSRSAFile','GnuTLSSRPPasswdFile',
-            'GnuTLSSRPPasswdConfFile','GnuTLSPriorities',
-            'GnuTLSExportCertificates',
-
-            //mod_headers.c
-            'Header','RequestHeader',
-
-            //mod_imagemap.c
-            'ImapBase','ImapDefault','ImapMenu',
-
-            //mod_include.c
-            'SSIAccessEnable','SSIEndTag','SSIErrorMsg','SSIStartTag',
-            'SSITimeFormat','SSIUndefinedEcho','XBitHack',
-
-            //mod_ident.c
-            'IdentityCheck','IdentityCheckTimeout',
-
-            //mod_info.c
-            'AddModuleInfo',
-
-            //mod_isapi.c
-            'ISAPIAppendLogToErrors','ISAPIAppendLogToQuery','ISAPICacheFile',
-            'ISAPIFakeAsync','ISAPILogNotSupported','ISAPIReadAheadBuffer',
-
-            //mod_log_config.c
-            'BufferedLogs','CookieLog','CustomLog','LogFormat','TransferLog',
-
-            //mod_log_forensic.c
-            'ForensicLog',
-
-            //mod_log_rotate.c
-            'RotateInterval','RotateLogs','RotateLogsLocalTime',
-
-            //mod_logio.c
-
-            //mod_mem_cache.c
-            'MCacheMaxObjectCount','MCacheMaxObjectSize',
-            'MCacheMaxStreamingBuffer','MCacheMinObjectSize',
-            'MCacheRemovalAlgorithm','MCacheSize',
-
-            //mod_mime.c
-            'AddCharset','AddEncoding','AddHandler','AddInputFilter',
-            'AddLanguage','AddOutputFilter','AddType','DefaultLanguage',
-            'ModMimeUsePathInfo','MultiviewsMatch','RemoveCharset',
-            'RemoveEncoding','RemoveHandler','RemoveInputFilter',
-            'RemoveLanguage','RemoveOutputFilter','RemoveType','TypesConfig',
-
-            //mod_mime_magic.c
-            'MimeMagicFile',
-
-            //mod_negotiation.c
-            'CacheNegotiatedDocs','ForceLanguagePriority','LanguagePriority',
-
-            //mod_php5.c
-            'php_admin_flag','php_admin_value','php_flag','php_value',
-            'PHPINIDir',
-
-            //mod_proxy.c
-            'AllowCONNECT','BalancerMember','NoProxy','ProxyBadHeader',
-            'ProxyBlock','ProxyDomain','ProxyErrorOverride',
-            'ProxyFtpDirCharset','ProxyIOBufferSize','ProxyMaxForwards',
-            'ProxyPass','ProxyPassInterpolateEnv','ProxyPassMatch',
-            'ProxyPassReverse','ProxyPassReverseCookieDomain',
-            'ProxyPassReverseCookiePath','ProxyPreserveHost',
-            'ProxyReceiveBufferSize','ProxyRemote','ProxyRemoteMatch',
-            'ProxyRequests','ProxySet','ProxyStatus','ProxyTimeout','ProxyVia',
-
-            //mod_proxy_ajp.c
-
-            //mod_proxy_balancer.c
-
-            //mod_proxy_connect.c
-
-            //mod_proxy_ftp.c
-
-            //mod_proxy_http.c
-
-            //mod_rewrite.c
-            'RewriteBase','RewriteCond','RewriteEngine','RewriteLock',
-            'RewriteLog','RewriteLogLevel','RewriteMap','RewriteOptions',
-            'RewriteRule',
-
-            //mod_setenvif.c
-            'BrowserMatch','BrowserMatchNoCase','SetEnvIf','SetEnvIfNoCase',
-
-            //mod_so.c
-            'LoadFile','LoadModule',
-
-            //mod_speling.c
-            'CheckCaseOnly','CheckSpelling',
-
-            //mod_ssl.c
-            'SSLCACertificateFile','SSLCACertificatePath','SSLCADNRequestFile',
-            'SSLCADNRequestPath','SSLCARevocationFile','SSLCARevocationPath',
-            'SSLCertificateChainFile','SSLCertificateFile',
-            'SSLCertificateKeyFile','SSLCipherSuite','SSLCryptoDevice',
-            'SSLEngine','SSLHonorCipherOrder','SSLMutex','SSLOptions',
-            'SSLPassPhraseDialog','SSLProtocol','SSLProxyCACertificateFile',
-            'SSLProxyCACertificatePath','SSLProxyCARevocationFile',
-            'SSLProxyCARevocationPath','SSLProxyCipherSuite','SSLProxyEngine',
-            'SSLProxyMachineCertificateFile','SSLProxyMachineCertificatePath',
-            'SSLProxyProtocol','SSLProxyVerify','SSLProxyVerifyDepth',
-            'SSLRandomSeed','SSLRenegBufferSize','SSLRequire','SSLRequireSSL',
-            'SSLSessionCache','SSLSessionCacheTimeout','SSLUserName',
-            'SSLVerifyClient','SSLVerifyDepth',
-
-            //mod_status.c
-            'ExtendedStatus','SeeRequestTail',
-
-            //mod_substitute.c
-            'Substitute',
-
-            //mod_suexec.c
-            'SuexecUserGroup',
-
-            //mod_unique_id.c
-
-            //mod_upload_progress
-            'ReportUploads', 'TrackUploads', 'UploadProgressSharedMemorySize',
-
-            //mod_userdir.c
-            'UserDir',
-
-            //mod_usertrack.c
-            'CookieDomain','CookieExpires','CookieName','CookieStyle',
-            'CookieTracking',
-
-            //mod_version.c
-
-            //mod_vhost_alias.c
-            'VirtualDocumentRoot','VirtualDocumentRootIP',
-            'VirtualScriptAlias','VirtualScriptAliasIP',
-
-            //mod_view.c
-            'ViewEnable',
-
-            //mod_win32.c
-            'ScriptInterpreterSource',
-
-            //mpm_winnt.c
-            'Listen','ListenBacklog','ReceiveBufferSize','SendBufferSize',
-            'ThreadLimit','ThreadsPerChild','Win32DisableAcceptEx',
-
-            //mpm_common.c
-            'AcceptMutex','AddModule','ClearModuleList','EnableExceptionHook',
-            'Group','LockFile','MaxClients','MaxSpareServers','MaxSpareThreads',
-            'MinSpareServers','MinSpareThreads','ServerLimit','StartServers',
-            'StartThreads','User',
-
-            //util_ldap.c
-            'LDAPCacheEntries','LDAPCacheTTL','LDAPConnectionTimeout',
-            'LDAPOpCacheEntries','LDAPOpCacheTTL','LDAPSharedCacheFile',
-            'LDAPSharedCacheSize','LDAPTrustedClientCert',
-            'LDAPTrustedGlobalCert','LDAPTrustedMode','LDAPVerifyServerCert',
-
-            //Unknown Mods ...
-            'AgentLog','BindAddress','bs2000account','CacheForceCompletion',
-            'CacheGCInterval','CacheSize','NoCache','qsc','RefererIgnore',
-            'RefererLog','Resourceconfig','ServerType','SingleListen'
-            ),
-        /*keywords 2*/
-        2 => array(
-            'all','on','off','standalone','inetd','indexes',
-            'force-response-1.0','downgrade-1.0','nokeepalive',
-            'includes','followsymlinks','none',
-            'x-compress','x-gzip'
-        ),
-        /*keywords 3*/
-        3 => array(
-            //core.c
-            'Directory','DirectoryMatch','Files','FilesMatch','IfDefine',
-            'IfModule','Limit','LimitExcept','Location','LocationMatch',
-            'VirtualHost',
-
-            //mod_authn_alias.c
-            'AuthnProviderAlias',
-
-            //mod_proxy.c
-            'Proxy','ProxyMatch',
-
-            //mod_version.c
-            'IfVersion'
-        )
-    ),
-    'SYMBOLS' => array(
-        '+', '-'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #000000; font-weight:bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #339933;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'SYMBOLS' => GESHI_NEVER
-        ),
-        'KEYWORDS' => array(
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-            )
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/applescript.php b/inc/geshi/applescript.php
deleted file mode 100644
index 603fa4a3e..000000000
--- a/inc/geshi/applescript.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*************************************************************************************
- * applescript.php
- * --------
- * Author: Stephan Klimek (http://www.initware.org)
- * Copyright: Stephan Klimek (http://www.initware.org)
- * Release Version: 1.0.8.11
- * Date Started: 2005/07/20
- *
- * AppleScript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- *
- * TODO
- * -------------------------
- * URL settings to references
- *
- **************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'AppleScript',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array( '(*' => '*)'),
-    'COMMENT_REGEXP' => array(
-        2 => '/(?<=[a-z])\'/i',
-        3 => '/(?<![a-z])\'.*?\'/i',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'application','close','count','delete','duplicate','exists','launch','make','move','open',
-            'print','quit','reopen','run','save','saving', 'idle', 'path to', 'number', 'alias', 'list', 'text', 'string',
-            'integer', 'it','me','version','pi','result','space','tab','anything','case','diacriticals','expansion',
-            'hyphens','punctuation','bold','condensed','expanded','hidden','italic','outline','plain',
-            'shadow','strikethrough','subscript','superscript','underline','ask','no','yes','false', 'id',
-            'true','weekday','monday','mon','tuesday','tue','wednesday','wed','thursday','thu','friday',
-            'fri','saturday','sat','sunday','sun','month','january','jan','february','feb','march',
-            'mar','april','apr','may','june','jun','july','jul','august','aug','september', 'quote', 'do JavaScript',
-            'sep','october','oct','november','nov','december','dec','minutes','hours', 'name', 'default answer',
-            'days','weeks', 'folder', 'folders', 'file', 'files', 'window', 'eject', 'disk', 'reveal', 'sleep',
-            'shut down', 'restart', 'display dialog', 'buttons', 'invisibles', 'item', 'items', 'delimiters', 'offset of',
-            'AppleScript\'s', 'choose file', 'choose folder', 'choose from list', 'beep', 'contents', 'do shell script',
-            'paragraph', 'paragraphs', 'missing value', 'quoted form', 'desktop', 'POSIX path', 'POSIX file',
-            'activate', 'document', 'adding', 'receiving', 'content', 'new', 'properties', 'info for', 'bounds',
-            'selection', 'extension', 'into', 'onto', 'by', 'between', 'against', 'set the clipboard to', 'the clipboard'
-            ),
-        2 => array(
-            'each','some','every','whose','where','index','first','second','third','fourth',
-            'fifth','sixth','seventh','eighth','ninth','tenth','last','front','back','st','nd',
-            'rd','th','middle','named','through','thru','before','after','beginning','the', 'as',
-            'div','mod','and','not','or','contains','equal','equals','isnt', 'less', 'greater'
-            ),
-        3 => array(
-            'script','property','prop','end','to','set','global','local','on','of',
-            'in','given','with','without','return','continue','tell','if','then','else','repeat',
-            'times','while','until','from','exit','try','error','considering','ignoring','timeout',
-            'transaction','my','get','put','is', 'copy'
-            )
-        ),
-    'SYMBOLS' => array(
-        ')','+','-','^','*','/','&','<','>=','<','<=','=','�'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0066ff;',
-            2 => 'color: #ff0033;',
-            3 => 'color: #ff0033; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => '',
-            3 => 'color: #ff0000;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #009900;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #339933;',
-            4 => 'color: #0066ff;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => ',+-=&lt;&gt;/?^&amp;*'
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
-        //File descriptors
-        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'SPACE_AS_WHITESPACE' => true
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/apt_sources.php b/inc/geshi/apt_sources.php
deleted file mode 100644
index 9f1ed045e..000000000
--- a/inc/geshi/apt_sources.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/*************************************************************************************
- * apt_sources.php
- * ----------
- * Author: Milian Wolff (mail@milianw.de)
- * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.11
- * Date Started: 2008/06/17
- *
- * Apt sources.list language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/06/17 (1.0.8)
- *  -  Initial import
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Apt sources',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /*keywords*/
-        1 => array(
-            'deb-src', 'deb'
-            ),
-        2 => array(
-            //Generic
-            'stable', 'old-stable', 'testing', 'testing-proposed-updates',
-            'unstable', 'unstable-proposed-updates', 'experimental',
-            'non-US', 'security', 'volatile', 'volatile-sloppy',
-            'apt-build',
-            'stable/updates',
-            //Debian
-            'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge',
-            'etch', 'lenny', 'wheezy', 'sid',
-            //Ubuntu
-            'warty', 'warty-updates', 'warty-security', 'warty-proposed', 'warty-backports',
-            'hoary', 'hoary-updates', 'hoary-security', 'hoary-proposed', 'hoary-backports',
-            'breezy', 'breezy-updates', 'breezy-security', 'breezy-proposed', 'breezy-backports',
-            'dapper', 'dapper-updates', 'dapper-security', 'dapper-proposed', 'dapper-backports',
-            'edgy', 'edgy-updates', 'edgy-security', 'edgy-proposed', 'edgy-backports',
-            'feisty', 'feisty-updates', 'feisty-security', 'feisty-proposed', 'feisty-backports',
-            'gutsy', 'gutsy-updates', 'gutsy-security', 'gutsy-proposed', 'gutsy-backports',
-            'hardy', 'hardy-updates', 'hardy-security', 'hardy-proposed', 'hardy-backports',
-            'intrepid', 'intrepid-updates', 'intrepid-security', 'intrepid-proposed', 'intrepid-backports',
-            'jaunty', 'jaunty-updates', 'jaunty-security', 'jaunty-proposed', 'jaunty-backports',
-            'karmic', 'karmic-updates', 'karmic-security', 'karmic-proposed', 'karmic-backports',
-            'lucid', 'lucid-updates', 'lucid-security', 'lucid-proposed', 'lucid-backports',
-            'maverick', 'maverick-updates', 'maverick-security', 'maverick-proposed', 'maverick-backports'
-            ),
-        3 => array(
-            'main', 'restricted', 'preview', 'contrib', 'non-free',
-            'commercial', 'universe', 'multiverse'
-            )
-    ),
-    'REGEXPS' => array(
-        0 => "(((http|ftp):\/\/|file:\/)[^\s]+)|(cdrom:\[[^\]]*\][^\s]*)",
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => true,
-        3 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f;',
-            2 => 'color: #b1b100;',
-            3 => 'color: #b16000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            ),
-        'STRINGS' => array(
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #009900;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER,
-            'METHODS' => GESHI_NEVER,
-            'SCRIPT' => GESHI_NEVER,
-            'SYMBOLS' => GESHI_NEVER,
-            'ESCAPE_CHAR' => GESHI_NEVER,
-            'BRACKETS' => GESHI_NEVER,
-            'STRINGS' => GESHI_NEVER,
-        ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#;>|^\/])',
-            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\.])'
-        )
-    ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/arm.php b/inc/geshi/arm.php
deleted file mode 100644
index 8e3c0a37e..000000000
--- a/inc/geshi/arm.php
+++ /dev/null
@@ -1,3318 +0,0 @@
-<?php
-/*************************************************************************************
- * arm.php
- * -------
- * Author: Marat Dukhan (mdukhan3.at.gatech.dot.edu)
- * Copyright: (c) Marat Dukhan (mdukhan3.at.gatech.dot.edu)
- * Release Version: 1.0.8.11
- * Date Started: 2011/10/06
- *
- * ARM Assembler language file for GeSHi.
- * Based on the following documents:
- *   - "ARM Architecture Reference Manual: ARMv7-A and ARMv7-R edition"
- *   - "Intel XScale Technology: Intel Wireless MMX2 Coprocessor",
- *       Revision 1.5, July 2006
- *
- * CHANGES
- * -------
- * 2011/10/06
- *   -  First Release (supported UAL syntax for up to ARMv7 A/R, VFPv3, NEON, WMMX/WMMX2)
- *
- * TODO (updated 2011/10/06)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ARM ASSEMBLER',
-    'COMMENT_SINGLE' => array(
-        1 => ';'
-        ),
-    'COMMENT_MULTI' => array(),
-    //Line address prefix suppression
-    'COMMENT_REGEXP' => array(
-        2 => "/^(?:[0-9a-f]{0,4}:)?[0-9a-f]{4}(?:[0-9a-f]{4})?/mi"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* Unconditional Data Processing Instructions */
-        1 => array(
-            /* Data Processing: Unconditional Addition & Subtraction */
-            'adc.w','adcal.w',
-            'adc','adcal',
-            'add.w','addal.w',
-            'add','addal',
-            'addw','addwal',
-            'rsb.w','rsbal.w',
-            'rsb','rsbal',
-            'rsc','rscal',
-            'sbc.w','sbcal.w',
-            'sbc','sbcal',
-            'sub.w','subal.w',
-            'sub','subal',
-            'neg.w','negal.w',
-            'neg','negal',
-            'adr.w','adral.w',
-            'adr','adral',
-            /* Data Processing: Unconditional Logical */
-            'and.w','andal.w',
-            'and','andal',
-            'bic.w','bical.w',
-            'bic','bical',
-            'orr.w','orral.w',
-            'orr','orral',
-            'orn.w','ornal.w',
-            'orn','ornal',
-            'eor.w','eoral.w',
-            'eor','eoral',
-            'mov.w','moval.w',
-            'mov','moval',
-            'movw','movwal',
-            'movt','movtal',
-            'cpy','cpyal',
-            'mvn.w','mvnal.w',
-            'mvn','mvnal',
-            /* Data Processing: Unconditional Shifts and Rotates */
-            'asr.w','asral.w',
-            'asr','asral',
-            'lsl.w','lslal.w',
-            'lsl','lslal',
-            'lsr.w','lsral.w',
-            'lsr','lsral',
-            'ror.w','roral.w',
-            'ror','roral',
-            'rrx','rrxal',
-            /* Data Processing: Unconditional Word Multiply and Multiply-Add */
-            'mul','mulal',
-            'mla','mlaal',
-            'mls','mlsal',
-            'smull','smullal',
-            'muls','mulsal',
-            'umull','umullal',
-            'smlal','smlalal',
-            'umlal','umlalal',
-            /* Data Processing: Unconditional Halfword Multiply and Multiply-Add (ARMv5TE) */
-            'smulbb','smulbbal',
-            'smulbt','smulbtal',
-            'smultb','smultbal',
-            'smultt','smulttal',
-            'smulwb','smulwbal',
-            'smulwt','smulwtal',
-            'smlalbb','smlalbbal',
-            'smlalbt','smlalbtal',
-            'smlaltb','smlaltbal',
-            'smlaltt','smlalttal',
-            'smlabb','smlabbal',
-            'smlabt','smlabtal',
-            'smlatb','smlatbal',
-            'smlatt','smlattal',
-            'smlawb','smlawbal',
-            'smlawt','smlawtal',
-            /* Data Processing: Unconditional Bit Operations */
-            'ubfx','ubfxal',
-            'sbfx','sbfxal',
-            'bfc','bfcal',
-            'bfi','bfial',
-            'clz','clzal',
-            /* Data Processing: Unconditional Divide (ARMv7-R) */
-            'sdiv','sdival',
-            'udiv','udival'
-            ),
-        /* Conditional Data Processing Instructions */
-        2 => array(
-            /* Data Processing: Conditional Addition & Subtraction */
-            'adceq.w','adcne.w','adccs.w','adchs.w','adccc.w','adclo.w','adcmi.w','adcpl.w','adcvs.w','adcvc.w','adchi.w','adcls.w','adcge.w','adclt.w','adcgt.w','adcle.w',
-            'adceq','adcne','adccs','adchs','adccc','adclo','adcmi','adcpl','adcvs','adcvc','adchi','adcls','adcge','adclt','adcgt','adcle',
-            'addeq.w','addne.w','addcs.w','addhs.w','addcc.w','addlo.w','addmi.w','addpl.w','addvs.w','addvc.w','addhi.w','addls.w','addge.w','addlt.w','addgt.w','addle.w',
-            'addeq','addne','addcs','addhs','addcc','addlo','addmi','addpl','addvs','addvc','addhi','addls','addge','addlt','addgt','addle',
-            'addweq','addwne','addwcs','addwhs','addwcc','addwlo','addwmi','addwpl','addwvs','addwvc','addwhi','addwls','addwge','addwlt','addwgt','addwle',
-            'rsbeq.w','rsbne.w','rsbcs.w','rsbhs.w','rsbcc.w','rsblo.w','rsbmi.w','rsbpl.w','rsbvs.w','rsbvc.w','rsbhi.w','rsbls.w','rsbge.w','rsblt.w','rsbgt.w','rsble.w',
-            'rsbeq','rsbne','rsbcs','rsbhs','rsbcc','rsblo','rsbmi','rsbpl','rsbvs','rsbvc','rsbhi','rsbls','rsbge','rsblt','rsbgt','rsble',
-            'rsceq','rscne','rsccs','rschs','rsccc','rsclo','rscmi','rscpl','rscvs','rscvc','rschi','rscls','rscge','rsclt','rscgt','rscle',
-            'sbceq.w','sbcne.w','sbccs.w','sbchs.w','sbccc.w','sbclo.w','sbcmi.w','sbcpl.w','sbcvs.w','sbcvc.w','sbchi.w','sbcls.w','sbcge.w','sbclt.w','sbcgt.w','sbcle.w',
-            'sbceq','sbcne','sbccs','sbchs','sbccc','sbclo','sbcmi','sbcpl','sbcvs','sbcvc','sbchi','sbcls','sbcge','sbclt','sbcgt','sbcle',
-            'subeq.w','subne.w','subcs.w','subhs.w','subcc.w','sublo.w','submi.w','subpl.w','subvs.w','subvc.w','subhi.w','subls.w','subge.w','sublt.w','subgt.w','suble.w',
-            'subeq','subne','subcs','subhs','subcc','sublo','submi','subpl','subvs','subvc','subhi','subls','subge','sublt','subgt','suble',
-            'negeq.w','negne.w','negcs.w','neghs.w','negcc.w','neglo.w','negmi.w','negpl.w','negvs.w','negvc.w','neghi.w','negls.w','negge.w','neglt.w','neggt.w','negle.w',
-            'negeq','negne','negcs','neghs','negcc','neglo','negmi','negpl','negvs','negvc','neghi','negls','negge','neglt','neggt','negle',
-            'adreq.w','adrne.w','adrcs.w','adrhs.w','adrcc.w','adrlo.w','adrmi.w','adrpl.w','adrvs.w','adrvc.w','adrhi.w','adrls.w','adrge.w','adrlt.w','adrgt.w','adrle.w',
-            'adreq','adrne','adrcs','adrhs','adrcc','adrlo','adrmi','adrpl','adrvs','adrvc','adrhi','adrls','adrge','adrlt','adrgt','adrle',
-            /* Data Processing: Conditional Logical */
-            'andeq.w','andne.w','andcs.w','andhs.w','andcc.w','andlo.w','andmi.w','andpl.w','andvs.w','andvc.w','andhi.w','andls.w','andge.w','andlt.w','andgt.w','andle.w',
-            'andeq','andne','andcs','andhs','andcc','andlo','andmi','andpl','andvs','andvc','andhi','andls','andge','andlt','andgt','andle',
-            'biceq.w','bicne.w','biccs.w','bichs.w','biccc.w','biclo.w','bicmi.w','bicpl.w','bicvs.w','bicvc.w','bichi.w','bicls.w','bicge.w','biclt.w','bicgt.w','bicle.w',
-            'biceq','bicne','biccs','bichs','biccc','biclo','bicmi','bicpl','bicvs','bicvc','bichi','bicls','bicge','biclt','bicgt','bicle',
-            'orreq.w','orrne.w','orrcs.w','orrhs.w','orrcc.w','orrlo.w','orrmi.w','orrpl.w','orrvs.w','orrvc.w','orrhi.w','orrls.w','orrge.w','orrlt.w','orrgt.w','orrle.w',
-            'orreq','orrne','orrcs','orrhs','orrcc','orrlo','orrmi','orrpl','orrvs','orrvc','orrhi','orrls','orrge','orrlt','orrgt','orrle',
-            'orneq.w','ornne.w','orncs.w','ornhs.w','orncc.w','ornlo.w','ornmi.w','ornpl.w','ornvs.w','ornvc.w','ornhi.w','ornls.w','ornge.w','ornlt.w','orngt.w','ornle.w',
-            'orneq','ornne','orncs','ornhs','orncc','ornlo','ornmi','ornpl','ornvs','ornvc','ornhi','ornls','ornge','ornlt','orngt','ornle',
-            'eoreq.w','eorne.w','eorcs.w','eorhs.w','eorcc.w','eorlo.w','eormi.w','eorpl.w','eorvs.w','eorvc.w','eorhi.w','eorls.w','eorge.w','eorlt.w','eorgt.w','eorle.w',
-            'eoreq','eorne','eorcs','eorhs','eorcc','eorlo','eormi','eorpl','eorvs','eorvc','eorhi','eorls','eorge','eorlt','eorgt','eorle',
-            'moveq.w','movne.w','movcs.w','movhs.w','movcc.w','movlo.w','movmi.w','movpl.w','movvs.w','movvc.w','movhi.w','movls.w','movge.w','movlt.w','movgt.w','movle.w',
-            'moveq','movne','movcs','movhs','movcc','movlo','movmi','movpl','movvs','movvc','movhi','movls','movge','movlt','movgt','movle',
-            'movweq','movwne','movwcs','movwhs','movwcc','movwlo','movwmi','movwpl','movwvs','movwvc','movwhi','movwls','movwge','movwlt','movwgt','movwle',
-            'movteq','movtne','movtcs','movths','movtcc','movtlo','movtmi','movtpl','movtvs','movtvc','movthi','movtls','movtge','movtlt','movtgt','movtle',
-            'cpyeq','cpyne','cpycs','cpyhs','cpycc','cpylo','cpymi','cpypl','cpyvs','cpyvc','cpyhi','cpyls','cpyge','cpylt','cpygt','cpyle',
-            'mvneq.w','mvnne.w','mvncs.w','mvnhs.w','mvncc.w','mvnlo.w','mvnmi.w','mvnpl.w','mvnvs.w','mvnvc.w','mvnhi.w','mvnls.w','mvnge.w','mvnlt.w','mvngt.w','mvnle.w',
-            'mvneq','mvnne','mvncs','mvnhs','mvncc','mvnlo','mvnmi','mvnpl','mvnvs','mvnvc','mvnhi','mvnls','mvnge','mvnlt','mvngt','mvnle',
-            /* Data Processing: Conditional Shifts and Rotates */
-            'asreq.w','asrne.w','asrcs.w','asrhs.w','asrcc.w','asrlo.w','asrmi.w','asrpl.w','asrvs.w','asrvc.w','asrhi.w','asrls.w','asrge.w','asrlt.w','asrgt.w','asrle.w',
-            'asreq','asrne','asrcs','asrhs','asrcc','asrlo','asrmi','asrpl','asrvs','asrvc','asrhi','asrls','asrge','asrlt','asrgt','asrle',
-            'lsleq.w','lslne.w','lslcs.w','lslhs.w','lslcc.w','lsllo.w','lslmi.w','lslpl.w','lslvs.w','lslvc.w','lslhi.w','lslls.w','lslge.w','lsllt.w','lslgt.w','lslle.w',
-            'lsleq','lslne','lslcs','lslhs','lslcc','lsllo','lslmi','lslpl','lslvs','lslvc','lslhi','lslls','lslge','lsllt','lslgt','lslle',
-            'lsreq.w','lsrne.w','lsrcs.w','lsrhs.w','lsrcc.w','lsrlo.w','lsrmi.w','lsrpl.w','lsrvs.w','lsrvc.w','lsrhi.w','lsrls.w','lsrge.w','lsrlt.w','lsrgt.w','lsrle.w',
-            'lsreq','lsrne','lsrcs','lsrhs','lsrcc','lsrlo','lsrmi','lsrpl','lsrvs','lsrvc','lsrhi','lsrls','lsrge','lsrlt','lsrgt','lsrle',
-            'roreq.w','rorne.w','rorcs.w','rorhs.w','rorcc.w','rorlo.w','rormi.w','rorpl.w','rorvs.w','rorvc.w','rorhi.w','rorls.w','rorge.w','rorlt.w','rorgt.w','rorle.w',
-            'roreq','rorne','rorcs','rorhs','rorcc','rorlo','rormi','rorpl','rorvs','rorvc','rorhi','rorls','rorge','rorlt','rorgt','rorle',
-            'rrxeq','rrxne','rrxcs','rrxhs','rrxcc','rrxlo','rrxmi','rrxpl','rrxvs','rrxvc','rrxhi','rrxls','rrxge','rrxlt','rrxgt','rrxle',
-            /* Data Processing: Conditional Word Multiply and Multiply-Add */
-            'muleq','mulne','mulcs','mulhs','mulcc','mullo','mulmi','mulpl','mulvs','mulvc','mulhi','mulls','mulge','mullt','mulgt','mulle',
-            'mlaeq','mlane','mlacs','mlahs','mlacc','mlalo','mlami','mlapl','mlavs','mlavc','mlahi','mlals','mlage','mlalt','mlagt','mlale',
-            'mlseq','mlsne','mlscs','mlshs','mlscc','mlslo','mlsmi','mlspl','mlsvs','mlsvc','mlshi','mlsls','mlsge','mlslt','mlsgt','mlsle',
-            'smulleq','smullne','smullcs','smullhs','smullcc','smulllo','smullmi','smullpl','smullvs','smullvc','smullhi','smullls','smullge','smulllt','smullgt','smullle',
-            'mulseq','mulsne','mulscs','mulshs','mulscc','mulslo','mulsmi','mulspl','mulsvs','mulsvc','mulshi','mulsls','mulsge','mulslt','mulsgt','mulsle',
-            'umulleq','umullne','umullcs','umullhs','umullcc','umulllo','umullmi','umullpl','umullvs','umullvc','umullhi','umullls','umullge','umulllt','umullgt','umullle',
-            'smlaleq','smlalne','smlalcs','smlalhs','smlalcc','smlallo','smlalmi','smlalpl','smlalvs','smlalvc','smlalhi','smlalls','smlalge','smlallt','smlalgt','smlalle',
-            'umlaleq','umlalne','umlalcs','umlalhs','umlalcc','umlallo','umlalmi','umlalpl','umlalvs','umlalvc','umlalhi','umlalls','umlalge','umlallt','umlalgt','umlalle',
-            /* Data Processing: Conditional Halfword Multiply and Multiply-Add (ARMv5TE) */
-            'smulbbeq','smulbbne','smulbbcs','smulbbhs','smulbbcc','smulbblo','smulbbmi','smulbbpl','smulbbvs','smulbbvc','smulbbhi','smulbbls','smulbbge','smulbblt','smulbbgt','smulbble',
-            'smulbteq','smulbtne','smulbtcs','smulbths','smulbtcc','smulbtlo','smulbtmi','smulbtpl','smulbtvs','smulbtvc','smulbthi','smulbtls','smulbtge','smulbtlt','smulbtgt','smulbtle',
-            'smultbeq','smultbne','smultbcs','smultbhs','smultbcc','smultblo','smultbmi','smultbpl','smultbvs','smultbvc','smultbhi','smultbls','smultbge','smultblt','smultbgt','smultble',
-            'smultteq','smulttne','smulttcs','smultths','smulttcc','smulttlo','smulttmi','smulttpl','smulttvs','smulttvc','smultthi','smulttls','smulttge','smulttlt','smulttgt','smulttle',
-            'smulwbeq','smulwbne','smulwbcs','smulwbhs','smulwbcc','smulwblo','smulwbmi','smulwbpl','smulwbvs','smulwbvc','smulwbhi','smulwbls','smulwbge','smulwblt','smulwbgt','smulwble',
-            'smulwteq','smulwtne','smulwtcs','smulwths','smulwtcc','smulwtlo','smulwtmi','smulwtpl','smulwtvs','smulwtvc','smulwthi','smulwtls','smulwtge','smulwtlt','smulwtgt','smulwtle',
-            'smlalbbeq','smlalbbne','smlalbbcs','smlalbbhs','smlalbbcc','smlalbblo','smlalbbmi','smlalbbpl','smlalbbvs','smlalbbvc','smlalbbhi','smlalbbls','smlalbbge','smlalbblt','smlalbbgt','smlalbble',
-            'smlalbteq','smlalbtne','smlalbtcs','smlalbths','smlalbtcc','smlalbtlo','smlalbtmi','smlalbtpl','smlalbtvs','smlalbtvc','smlalbthi','smlalbtls','smlalbtge','smlalbtlt','smlalbtgt','smlalbtle',
-            'smlaltbeq','smlaltbne','smlaltbcs','smlaltbhs','smlaltbcc','smlaltblo','smlaltbmi','smlaltbpl','smlaltbvs','smlaltbvc','smlaltbhi','smlaltbls','smlaltbge','smlaltblt','smlaltbgt','smlaltble',
-            'smlaltteq','smlalttne','smlalttcs','smlaltths','smlalttcc','smlalttlo','smlalttmi','smlalttpl','smlalttvs','smlalttvc','smlaltthi','smlalttls','smlalttge','smlalttlt','smlalttgt','smlalttle',
-            'smlabbeq','smlabbne','smlabbcs','smlabbhs','smlabbcc','smlabblo','smlabbmi','smlabbpl','smlabbvs','smlabbvc','smlabbhi','smlabbls','smlabbge','smlabblt','smlabbgt','smlabble',
-            'smlabteq','smlabtne','smlabtcs','smlabths','smlabtcc','smlabtlo','smlabtmi','smlabtpl','smlabtvs','smlabtvc','smlabthi','smlabtls','smlabtge','smlabtlt','smlabtgt','smlabtle',
-            'smlatbeq','smlatbne','smlatbcs','smlatbhs','smlatbcc','smlatblo','smlatbmi','smlatbpl','smlatbvs','smlatbvc','smlatbhi','smlatbls','smlatbge','smlatblt','smlatbgt','smlatble',
-            'smlatteq','smlattne','smlattcs','smlatths','smlattcc','smlattlo','smlattmi','smlattpl','smlattvs','smlattvc','smlatthi','smlattls','smlattge','smlattlt','smlattgt','smlattle',
-            'smlawbeq','smlawbne','smlawbcs','smlawbhs','smlawbcc','smlawblo','smlawbmi','smlawbpl','smlawbvs','smlawbvc','smlawbhi','smlawbls','smlawbge','smlawblt','smlawbgt','smlawble',
-            'smlawteq','smlawtne','smlawtcs','smlawths','smlawtcc','smlawtlo','smlawtmi','smlawtpl','smlawtvs','smlawtvc','smlawthi','smlawtls','smlawtge','smlawtlt','smlawtgt','smlawtle',
-            /* Data Processing: Conditional Bit Operations */
-            'ubfxeq','ubfxne','ubfxcs','ubfxhs','ubfxcc','ubfxlo','ubfxmi','ubfxpl','ubfxvs','ubfxvc','ubfxhi','ubfxls','ubfxge','ubfxlt','ubfxgt','ubfxle',
-            'sbfxeq','sbfxne','sbfxcs','sbfxhs','sbfxcc','sbfxlo','sbfxmi','sbfxpl','sbfxvs','sbfxvc','sbfxhi','sbfxls','sbfxge','sbfxlt','sbfxgt','sbfxle',
-            'bfceq','bfcne','bfccs','bfchs','bfccc','bfclo','bfcmi','bfcpl','bfcvs','bfcvc','bfchi','bfcls','bfcge','bfclt','bfcgt','bfcle',
-            'bfieq','bfine','bfics','bfihs','bficc','bfilo','bfimi','bfipl','bfivs','bfivc','bfihi','bfils','bfige','bfilt','bfigt','bfile',
-            'clzeq','clzne','clzcs','clzhs','clzcc','clzlo','clzmi','clzpl','clzvs','clzvc','clzhi','clzls','clzge','clzlt','clzgt','clzle',
-            /* ARMv7-R: Conditional Divide */
-            'sdiveq','sdivne','sdivcs','sdivhs','sdivcc','sdivlo','sdivmi','sdivpl','sdivvs','sdivvc','sdivhi','sdivls','sdivge','sdivlt','sdivgt','sdivle',
-            'udiveq','udivne','udivcs','udivhs','udivcc','udivlo','udivmi','udivpl','udivvs','udivvc','udivhi','udivls','udivge','udivlt','udivgt','udivle'
-            ),
-        /* Unconditional Memory Access */
-        3 => array(
-            /* Memory Access: Unconditional Memory Loads and Prefetches */
-            'ldm.w','ldmal.w',
-            'ldm','ldmal',
-            'ldmda','ldmdaal',
-            'ldmdb','ldmdbal',
-            'ldmib','ldmibal',
-            'ldmia','ldmiaal',
-            'ldmea','ldmeaal',
-            'ldmed','ldmedal',
-            'ldmfa','ldmfaal',
-            'ldmfd','ldmfdal',
-            'ldrd','ldrdal',
-            'ldr.w','ldral.w',
-            'ldr','ldral',
-            'ldrh.w','ldrhal.w',
-            'ldrh','ldrhal',
-            'ldrb.w','ldrbal.w',
-            'ldrb','ldrbal',
-            'ldrsh.w','ldrshal.w',
-            'ldrsh','ldrshal',
-            'ldrsb.w','ldrsbal.w',
-            'ldrsb','ldrsbal',
-            'ldrt','ldrtal',
-            'ldrht','ldrhtal',
-            'ldrbt','ldrbtal',
-            'ldrsht','ldrshtal',
-            'ldrsbt','ldrsbtal',
-            'pop.w','popal.w',
-            'pop','popal',
-            'pld','pldal',
-            'pldw','pldwal',
-            'pli','plial',
-            /* Memory Access: Unconditional Memory Stores */
-            'stm.w','stmal.w',
-            'stm','stmal',
-            'stmda','stmdaal',
-            'stmdb','stmdbal',
-            'stmib','stmibal',
-            'stmia','stmiaal',
-            'stmea','stmeaal',
-            'stmed','stmedal',
-            'stdfa','stdfaal',
-            'stdfd','stdfdal',
-            'strd','strdal',
-            'str.w','stral.w',
-            'str','stral',
-            'strh.w','strhal.w',
-            'strh','strhal',
-            'strb.w','strbal.w',
-            'strb','strbal',
-            'strt','strtal',
-            'strht','strhtal',
-            'strbt','strbtal',
-            'push.w','pushal.w',
-            'push','pushal'
-            ),
-        /* Conditional Memory Access */
-        4 => array(
-            /* Memory Access: Conditional Memory Loads and Prefetches */
-            'ldmeq.w','ldmne.w','ldmcs.w','ldmhs.w','ldmcc.w','ldmlo.w','ldmmi.w','ldmpl.w','ldmvs.w','ldmvc.w','ldmhi.w','ldmls.w','ldmge.w','ldmlt.w','ldmgt.w','ldmle.w',
-            'ldmeq','ldmne','ldmcs','ldmhs','ldmcc','ldmlo','ldmmi','ldmpl','ldmvs','ldmvc','ldmhi','ldmls','ldmge','ldmlt','ldmgt','ldmle',
-            'ldmdaeq','ldmdane','ldmdacs','ldmdahs','ldmdacc','ldmdalo','ldmdami','ldmdapl','ldmdavs','ldmdavc','ldmdahi','ldmdals','ldmdage','ldmdalt','ldmdagt','ldmdale',
-            'ldmdbeq','ldmdbne','ldmdbcs','ldmdbhs','ldmdbcc','ldmdblo','ldmdbmi','ldmdbpl','ldmdbvs','ldmdbvc','ldmdbhi','ldmdbls','ldmdbge','ldmdblt','ldmdbgt','ldmdble',
-            'ldmibeq','ldmibne','ldmibcs','ldmibhs','ldmibcc','ldmiblo','ldmibmi','ldmibpl','ldmibvs','ldmibvc','ldmibhi','ldmibls','ldmibge','ldmiblt','ldmibgt','ldmible',
-            'ldmiaeq','ldmiane','ldmiacs','ldmiahs','ldmiacc','ldmialo','ldmiami','ldmiapl','ldmiavs','ldmiavc','ldmiahi','ldmials','ldmiage','ldmialt','ldmiagt','ldmiale',
-            'ldmeaeq','ldmeane','ldmeacs','ldmeahs','ldmeacc','ldmealo','ldmeami','ldmeapl','ldmeavs','ldmeavc','ldmeahi','ldmeals','ldmeage','ldmealt','ldmeagt','ldmeale',
-            'ldmedeq','ldmedne','ldmedcs','ldmedhs','ldmedcc','ldmedlo','ldmedmi','ldmedpl','ldmedvs','ldmedvc','ldmedhi','ldmedls','ldmedge','ldmedlt','ldmedgt','ldmedle',
-            'ldmfaeq','ldmfane','ldmfacs','ldmfahs','ldmfacc','ldmfalo','ldmfami','ldmfapl','ldmfavs','ldmfavc','ldmfahi','ldmfals','ldmfage','ldmfalt','ldmfagt','ldmfale',
-            'ldmfdeq','ldmfdne','ldmfdcs','ldmfdhs','ldmfdcc','ldmfdlo','ldmfdmi','ldmfdpl','ldmfdvs','ldmfdvc','ldmfdhi','ldmfdls','ldmfdge','ldmfdlt','ldmfdgt','ldmfdle',
-            'ldrdeq','ldrdne','ldrdcs','ldrdhs','ldrdcc','ldrdlo','ldrdmi','ldrdpl','ldrdvs','ldrdvc','ldrdhi','ldrdls','ldrdge','ldrdlt','ldrdgt','ldrdle',
-            'ldreq.w','ldrne.w','ldrcs.w','ldrhs.w','ldrcc.w','ldrlo.w','ldrmi.w','ldrpl.w','ldrvs.w','ldrvc.w','ldrhi.w','ldrls.w','ldrge.w','ldrlt.w','ldrgt.w','ldrle.w',
-            'ldreq','ldrne','ldrcs','ldrhs','ldrcc','ldrlo','ldrmi','ldrpl','ldrvs','ldrvc','ldrhi','ldrls','ldrge','ldrlt','ldrgt','ldrle',
-            'ldrheq.w','ldrhne.w','ldrhcs.w','ldrhhs.w','ldrhcc.w','ldrhlo.w','ldrhmi.w','ldrhpl.w','ldrhvs.w','ldrhvc.w','ldrhhi.w','ldrhls.w','ldrhge.w','ldrhlt.w','ldrhgt.w','ldrhle.w',
-            'ldrheq','ldrhne','ldrhcs','ldrhhs','ldrhcc','ldrhlo','ldrhmi','ldrhpl','ldrhvs','ldrhvc','ldrhhi','ldrhls','ldrhge','ldrhlt','ldrhgt','ldrhle',
-            'ldrbeq.w','ldrbne.w','ldrbcs.w','ldrbhs.w','ldrbcc.w','ldrblo.w','ldrbmi.w','ldrbpl.w','ldrbvs.w','ldrbvc.w','ldrbhi.w','ldrbls.w','ldrbge.w','ldrblt.w','ldrbgt.w','ldrble.w',
-            'ldrbeq','ldrbne','ldrbcs','ldrbhs','ldrbcc','ldrblo','ldrbmi','ldrbpl','ldrbvs','ldrbvc','ldrbhi','ldrbls','ldrbge','ldrblt','ldrbgt','ldrble',
-            'ldrsheq.w','ldrshne.w','ldrshcs.w','ldrshhs.w','ldrshcc.w','ldrshlo.w','ldrshmi.w','ldrshpl.w','ldrshvs.w','ldrshvc.w','ldrshhi.w','ldrshls.w','ldrshge.w','ldrshlt.w','ldrshgt.w','ldrshle.w',
-            'ldrsheq','ldrshne','ldrshcs','ldrshhs','ldrshcc','ldrshlo','ldrshmi','ldrshpl','ldrshvs','ldrshvc','ldrshhi','ldrshls','ldrshge','ldrshlt','ldrshgt','ldrshle',
-            'ldrsbeq.w','ldrsbne.w','ldrsbcs.w','ldrsbhs.w','ldrsbcc.w','ldrsblo.w','ldrsbmi.w','ldrsbpl.w','ldrsbvs.w','ldrsbvc.w','ldrsbhi.w','ldrsbls.w','ldrsbge.w','ldrsblt.w','ldrsbgt.w','ldrsble.w',
-            'ldrsbeq','ldrsbne','ldrsbcs','ldrsbhs','ldrsbcc','ldrsblo','ldrsbmi','ldrsbpl','ldrsbvs','ldrsbvc','ldrsbhi','ldrsbls','ldrsbge','ldrsblt','ldrsbgt','ldrsble',
-            'ldrteq','ldrtne','ldrtcs','ldrths','ldrtcc','ldrtlo','ldrtmi','ldrtpl','ldrtvs','ldrtvc','ldrthi','ldrtls','ldrtge','ldrtlt','ldrtgt','ldrtle',
-            'ldrhteq','ldrhtne','ldrhtcs','ldrhths','ldrhtcc','ldrhtlo','ldrhtmi','ldrhtpl','ldrhtvs','ldrhtvc','ldrhthi','ldrhtls','ldrhtge','ldrhtlt','ldrhtgt','ldrhtle',
-            'ldrbteq','ldrbtne','ldrbtcs','ldrbths','ldrbtcc','ldrbtlo','ldrbtmi','ldrbtpl','ldrbtvs','ldrbtvc','ldrbthi','ldrbtls','ldrbtge','ldrbtlt','ldrbtgt','ldrbtle',
-            'ldrshteq','ldrshtne','ldrshtcs','ldrshths','ldrshtcc','ldrshtlo','ldrshtmi','ldrshtpl','ldrshtvs','ldrshtvc','ldrshthi','ldrshtls','ldrshtge','ldrshtlt','ldrshtgt','ldrshtle',
-            'ldrsbteq','ldrsbtne','ldrsbtcs','ldrsbths','ldrsbtcc','ldrsbtlo','ldrsbtmi','ldrsbtpl','ldrsbtvs','ldrsbtvc','ldrsbthi','ldrsbtls','ldrsbtge','ldrsbtlt','ldrsbtgt','ldrsbtle',
-            'popeq.w','popne.w','popcs.w','pophs.w','popcc.w','poplo.w','popmi.w','poppl.w','popvs.w','popvc.w','pophi.w','popls.w','popge.w','poplt.w','popgt.w','pople.w',
-            'popeq','popne','popcs','pophs','popcc','poplo','popmi','poppl','popvs','popvc','pophi','popls','popge','poplt','popgt','pople',
-            'pldeq','pldne','pldcs','pldhs','pldcc','pldlo','pldmi','pldpl','pldvs','pldvc','pldhi','pldls','pldge','pldlt','pldgt','pldle',
-            'pldweq','pldwne','pldwcs','pldwhs','pldwcc','pldwlo','pldwmi','pldwpl','pldwvs','pldwvc','pldwhi','pldwls','pldwge','pldwlt','pldwgt','pldwle',
-            'plieq','pline','plics','plihs','plicc','plilo','plimi','plipl','plivs','plivc','plihi','plils','plige','plilt','pligt','plile',
-            /* Memory Access: Conditional Memory Stores */
-            'stmeq.w','stmne.w','stmcs.w','stmhs.w','stmcc.w','stmlo.w','stmmi.w','stmpl.w','stmvs.w','stmvc.w','stmhi.w','stmls.w','stmge.w','stmlt.w','stmgt.w','stmle.w',
-            'stmeq','stmne','stmcs','stmhs','stmcc','stmlo','stmmi','stmpl','stmvs','stmvc','stmhi','stmls','stmge','stmlt','stmgt','stmle',
-            'stmdaeq','stmdane','stmdacs','stmdahs','stmdacc','stmdalo','stmdami','stmdapl','stmdavs','stmdavc','stmdahi','stmdals','stmdage','stmdalt','stmdagt','stmdale',
-            'stmdbeq','stmdbne','stmdbcs','stmdbhs','stmdbcc','stmdblo','stmdbmi','stmdbpl','stmdbvs','stmdbvc','stmdbhi','stmdbls','stmdbge','stmdblt','stmdbgt','stmdble',
-            'stmibeq','stmibne','stmibcs','stmibhs','stmibcc','stmiblo','stmibmi','stmibpl','stmibvs','stmibvc','stmibhi','stmibls','stmibge','stmiblt','stmibgt','stmible',
-            'stmiaeq','stmiane','stmiacs','stmiahs','stmiacc','stmialo','stmiami','stmiapl','stmiavs','stmiavc','stmiahi','stmials','stmiage','stmialt','stmiagt','stmiale',
-            'stmeaeq','stmeane','stmeacs','stmeahs','stmeacc','stmealo','stmeami','stmeapl','stmeavs','stmeavc','stmeahi','stmeals','stmeage','stmealt','stmeagt','stmeale',
-            'stmedeq','stmedne','stmedcs','stmedhs','stmedcc','stmedlo','stmedmi','stmedpl','stmedvs','stmedvc','stmedhi','stmedls','stmedge','stmedlt','stmedgt','stmedle',
-            'stdfaeq','stdfane','stdfacs','stdfahs','stdfacc','stdfalo','stdfami','stdfapl','stdfavs','stdfavc','stdfahi','stdfals','stdfage','stdfalt','stdfagt','stdfale',
-            'stdfdeq','stdfdne','stdfdcs','stdfdhs','stdfdcc','stdfdlo','stdfdmi','stdfdpl','stdfdvs','stdfdvc','stdfdhi','stdfdls','stdfdge','stdfdlt','stdfdgt','stdfdle',
-            'strdeq','strdne','strdcs','strdhs','strdcc','strdlo','strdmi','strdpl','strdvs','strdvc','strdhi','strdls','strdge','strdlt','strdgt','strdle',
-            'streq.w','strne.w','strcs.w','strhs.w','strcc.w','strlo.w','strmi.w','strpl.w','strvs.w','strvc.w','strhi.w','strls.w','strge.w','strlt.w','strgt.w','strle.w',
-            'streq','strne','strcs','strhs','strcc','strlo','strmi','strpl','strvs','strvc','strhi','strls','strge','strlt','strgt','strle',
-            'strheq.w','strhne.w','strhcs.w','strhhs.w','strhcc.w','strhlo.w','strhmi.w','strhpl.w','strhvs.w','strhvc.w','strhhi.w','strhls.w','strhge.w','strhlt.w','strhgt.w','strhle.w',
-            'strheq','strhne','strhcs','strhhs','strhcc','strhlo','strhmi','strhpl','strhvs','strhvc','strhhi','strhls','strhge','strhlt','strhgt','strhle',
-            'strbeq.w','strbne.w','strbcs.w','strbhs.w','strbcc.w','strblo.w','strbmi.w','strbpl.w','strbvs.w','strbvc.w','strbhi.w','strbls.w','strbge.w','strblt.w','strbgt.w','strble.w',
-            'strbeq','strbne','strbcs','strbhs','strbcc','strblo','strbmi','strbpl','strbvs','strbvc','strbhi','strbls','strbge','strblt','strbgt','strble',
-            'strteq','strtne','strtcs','strths','strtcc','strtlo','strtmi','strtpl','strtvs','strtvc','strthi','strtls','strtge','strtlt','strtgt','strtle',
-            'strhteq','strhtne','strhtcs','strhths','strhtcc','strhtlo','strhtmi','strhtpl','strhtvs','strhtvc','strhthi','strhtls','strhtge','strhtlt','strhtgt','strhtle',
-            'strbteq','strbtne','strbtcs','strbths','strbtcc','strbtlo','strbtmi','strbtpl','strbtvs','strbtvc','strbthi','strbtls','strbtge','strbtlt','strbtgt','strbtle',
-            'pusheq.w','pushne.w','pushcs.w','pushhs.w','pushcc.w','pushlo.w','pushmi.w','pushpl.w','pushvs.w','pushvc.w','pushhi.w','pushls.w','pushge.w','pushlt.w','pushgt.w','pushle.w',
-            'pusheq','pushne','pushcs','pushhs','pushcc','pushlo','pushmi','pushpl','pushvs','pushvc','pushhi','pushls','pushge','pushlt','pushgt','pushle'
-            ),
-        /* Unconditional Flags-Affecting Instructions */
-        5 => array(
-            /* Set Flags: Unconditional Addition and Subtraction */
-            'adds.w','addsal.w',
-            'adds','addsal',
-            'subs.w','subsal.w',
-            'subs','subsal',
-            'rsbs.w','rsbsal.w',
-            'rsbs','rsbsal',
-            'negs.w','negsal.w',
-            'negs','negsal',
-            'adcs.w','adcsal.w',
-            'adcs','adcsal',
-            'sbcs.w','sbcsal.w',
-            'sbcs','sbcsal',
-            'rscs','rscsal',
-            'cmp.w','cmpal.w',
-            'cmp','cmpal',
-            'cmn.w','cmnal.w',
-            'cmn','cmnal',
-            /* Set Flags: Unconditional Logical */
-            'ands.w','andsal.w',
-            'ands','andsal',
-            'bics.w','bicsal.w',
-            'bics','bicsal',
-            'orrs.w','orrsal.w',
-            'orrs','orrsal',
-            'orns.w','ornsal.w',
-            'orns','ornsal',
-            'eors.w','eorsal.w',
-            'eors','eorsal',
-            'mvns.w','mvnsal.w',
-            'mvns','mvnsal',
-            'movs.w','movsal.w',
-            'movs','movsal',
-            'teq','teqal',
-            'tst.w','tstal.w',
-            'tst','tstal',
-            'mrs','mrsal',
-            'msr','msral',
-            /* Set Flags: Unconditional Shifts and Rotates */
-            'asrs.w','asrsal.w',
-            'asrs','asrsal',
-            'lsls.w','lslsal.w',
-            'lsls','lslsal',
-            'lsrs.w','lsrsal.w',
-            'lsrs','lsrsal',
-            'rors.w','rorsal.w',
-            'rors','rorsal',
-            'rrxs','rrxsal',
-            /* Set Flags: Unconditional Multiply and Multiply-Add */
-            'mlas','mlasal',
-            'smulls','smullsal',
-            'umulls','umullsal',
-            'smlals','smlalsal',
-            'umlals','umlalsal'
-            ),
-        /* Conditional Flags-Affecting Instructions */
-        6 => array(
-            /* Set Flags: Conditional Addition and Subtraction */
-            'addseq.w','addsne.w','addscs.w','addshs.w','addscc.w','addslo.w','addsmi.w','addspl.w','addsvs.w','addsvc.w','addshi.w','addsls.w','addsge.w','addslt.w','addsgt.w','addsle.w',
-            'addseq','addsne','addscs','addshs','addscc','addslo','addsmi','addspl','addsvs','addsvc','addshi','addsls','addsge','addslt','addsgt','addsle',
-            'subseq.w','subsne.w','subscs.w','subshs.w','subscc.w','subslo.w','subsmi.w','subspl.w','subsvs.w','subsvc.w','subshi.w','subsls.w','subsge.w','subslt.w','subsgt.w','subsle.w',
-            'subseq','subsne','subscs','subshs','subscc','subslo','subsmi','subspl','subsvs','subsvc','subshi','subsls','subsge','subslt','subsgt','subsle',
-            'rsbseq.w','rsbsne.w','rsbscs.w','rsbshs.w','rsbscc.w','rsbslo.w','rsbsmi.w','rsbspl.w','rsbsvs.w','rsbsvc.w','rsbshi.w','rsbsls.w','rsbsge.w','rsbslt.w','rsbsgt.w','rsbsle.w',
-            'rsbseq','rsbsne','rsbscs','rsbshs','rsbscc','rsbslo','rsbsmi','rsbspl','rsbsvs','rsbsvc','rsbshi','rsbsls','rsbsge','rsbslt','rsbsgt','rsbsle',
-            'negseq.w','negsne.w','negscs.w','negshs.w','negscc.w','negslo.w','negsmi.w','negspl.w','negsvs.w','negsvc.w','negshi.w','negsls.w','negsge.w','negslt.w','negsgt.w','negsle.w',
-            'negseq','negsne','negscs','negshs','negscc','negslo','negsmi','negspl','negsvs','negsvc','negshi','negsls','negsge','negslt','negsgt','negsle',
-            'adcseq.w','adcsne.w','adcscs.w','adcshs.w','adcscc.w','adcslo.w','adcsmi.w','adcspl.w','adcsvs.w','adcsvc.w','adcshi.w','adcsls.w','adcsge.w','adcslt.w','adcsgt.w','adcsle.w',
-            'adcseq','adcsne','adcscs','adcshs','adcscc','adcslo','adcsmi','adcspl','adcsvs','adcsvc','adcshi','adcsls','adcsge','adcslt','adcsgt','adcsle',
-            'sbcseq.w','sbcsne.w','sbcscs.w','sbcshs.w','sbcscc.w','sbcslo.w','sbcsmi.w','sbcspl.w','sbcsvs.w','sbcsvc.w','sbcshi.w','sbcsls.w','sbcsge.w','sbcslt.w','sbcsgt.w','sbcsle.w',
-            'sbcseq','sbcsne','sbcscs','sbcshs','sbcscc','sbcslo','sbcsmi','sbcspl','sbcsvs','sbcsvc','sbcshi','sbcsls','sbcsge','sbcslt','sbcsgt','sbcsle',
-            'rscseq','rscsne','rscscs','rscshs','rscscc','rscslo','rscsmi','rscspl','rscsvs','rscsvc','rscshi','rscsls','rscsge','rscslt','rscsgt','rscsle',
-            'cmpeq.w','cmpne.w','cmpcs.w','cmphs.w','cmpcc.w','cmplo.w','cmpmi.w','cmppl.w','cmpvs.w','cmpvc.w','cmphi.w','cmpls.w','cmpge.w','cmplt.w','cmpgt.w','cmple.w',
-            'cmpeq','cmpne','cmpcs','cmphs','cmpcc','cmplo','cmpmi','cmppl','cmpvs','cmpvc','cmphi','cmpls','cmpge','cmplt','cmpgt','cmple',
-            'cmneq.w','cmnne.w','cmncs.w','cmnhs.w','cmncc.w','cmnlo.w','cmnmi.w','cmnpl.w','cmnvs.w','cmnvc.w','cmnhi.w','cmnls.w','cmnge.w','cmnlt.w','cmngt.w','cmnle.w',
-            'cmneq','cmnne','cmncs','cmnhs','cmncc','cmnlo','cmnmi','cmnpl','cmnvs','cmnvc','cmnhi','cmnls','cmnge','cmnlt','cmngt','cmnle',
-            /* Set Flags: Conditional Logical */
-            'andseq.w','andsne.w','andscs.w','andshs.w','andscc.w','andslo.w','andsmi.w','andspl.w','andsvs.w','andsvc.w','andshi.w','andsls.w','andsge.w','andslt.w','andsgt.w','andsle.w',
-            'andseq','andsne','andscs','andshs','andscc','andslo','andsmi','andspl','andsvs','andsvc','andshi','andsls','andsge','andslt','andsgt','andsle',
-            'bicseq.w','bicsne.w','bicscs.w','bicshs.w','bicscc.w','bicslo.w','bicsmi.w','bicspl.w','bicsvs.w','bicsvc.w','bicshi.w','bicsls.w','bicsge.w','bicslt.w','bicsgt.w','bicsle.w',
-            'bicseq','bicsne','bicscs','bicshs','bicscc','bicslo','bicsmi','bicspl','bicsvs','bicsvc','bicshi','bicsls','bicsge','bicslt','bicsgt','bicsle',
-            'orrseq.w','orrsne.w','orrscs.w','orrshs.w','orrscc.w','orrslo.w','orrsmi.w','orrspl.w','orrsvs.w','orrsvc.w','orrshi.w','orrsls.w','orrsge.w','orrslt.w','orrsgt.w','orrsle.w',
-            'orrseq','orrsne','orrscs','orrshs','orrscc','orrslo','orrsmi','orrspl','orrsvs','orrsvc','orrshi','orrsls','orrsge','orrslt','orrsgt','orrsle',
-            'ornseq.w','ornsne.w','ornscs.w','ornshs.w','ornscc.w','ornslo.w','ornsmi.w','ornspl.w','ornsvs.w','ornsvc.w','ornshi.w','ornsls.w','ornsge.w','ornslt.w','ornsgt.w','ornsle.w',
-            'ornseq','ornsne','ornscs','ornshs','ornscc','ornslo','ornsmi','ornspl','ornsvs','ornsvc','ornshi','ornsls','ornsge','ornslt','ornsgt','ornsle',
-            'eorseq.w','eorsne.w','eorscs.w','eorshs.w','eorscc.w','eorslo.w','eorsmi.w','eorspl.w','eorsvs.w','eorsvc.w','eorshi.w','eorsls.w','eorsge.w','eorslt.w','eorsgt.w','eorsle.w',
-            'eorseq','eorsne','eorscs','eorshs','eorscc','eorslo','eorsmi','eorspl','eorsvs','eorsvc','eorshi','eorsls','eorsge','eorslt','eorsgt','eorsle',
-            'mvnseq.w','mvnsne.w','mvnscs.w','mvnshs.w','mvnscc.w','mvnslo.w','mvnsmi.w','mvnspl.w','mvnsvs.w','mvnsvc.w','mvnshi.w','mvnsls.w','mvnsge.w','mvnslt.w','mvnsgt.w','mvnsle.w',
-            'mvnseq','mvnsne','mvnscs','mvnshs','mvnscc','mvnslo','mvnsmi','mvnspl','mvnsvs','mvnsvc','mvnshi','mvnsls','mvnsge','mvnslt','mvnsgt','mvnsle',
-            'movseq.w','movsne.w','movscs.w','movshs.w','movscc.w','movslo.w','movsmi.w','movspl.w','movsvs.w','movsvc.w','movshi.w','movsls.w','movsge.w','movslt.w','movsgt.w','movsle.w',
-            'movseq','movsne','movscs','movshs','movscc','movslo','movsmi','movspl','movsvs','movsvc','movshi','movsls','movsge','movslt','movsgt','movsle',
-            'teqeq','teqne','teqcs','teqhs','teqcc','teqlo','teqmi','teqpl','teqvs','teqvc','teqhi','teqls','teqge','teqlt','teqgt','teqle',
-            'tsteq.w','tstne.w','tstcs.w','tsths.w','tstcc.w','tstlo.w','tstmi.w','tstpl.w','tstvs.w','tstvc.w','tsthi.w','tstls.w','tstge.w','tstlt.w','tstgt.w','tstle.w',
-            'tsteq','tstne','tstcs','tsths','tstcc','tstlo','tstmi','tstpl','tstvs','tstvc','tsthi','tstls','tstge','tstlt','tstgt','tstle',
-            'mrseq','mrsne','mrscs','mrshs','mrscc','mrslo','mrsmi','mrspl','mrsvs','mrsvc','mrshi','mrsls','mrsge','mrslt','mrsgt','mrsle',
-            'msreq','msrne','msrcs','msrhs','msrcc','msrlo','msrmi','msrpl','msrvs','msrvc','msrhi','msrls','msrge','msrlt','msrgt','msrle',
-            /* Set Flags: Conditional Shifts and Rotates */
-            'asrseq.w','asrsne.w','asrscs.w','asrshs.w','asrscc.w','asrslo.w','asrsmi.w','asrspl.w','asrsvs.w','asrsvc.w','asrshi.w','asrsls.w','asrsge.w','asrslt.w','asrsgt.w','asrsle.w',
-            'asrseq','asrsne','asrscs','asrshs','asrscc','asrslo','asrsmi','asrspl','asrsvs','asrsvc','asrshi','asrsls','asrsge','asrslt','asrsgt','asrsle',
-            'lslseq.w','lslsne.w','lslscs.w','lslshs.w','lslscc.w','lslslo.w','lslsmi.w','lslspl.w','lslsvs.w','lslsvc.w','lslshi.w','lslsls.w','lslsge.w','lslslt.w','lslsgt.w','lslsle.w',
-            'lslseq','lslsne','lslscs','lslshs','lslscc','lslslo','lslsmi','lslspl','lslsvs','lslsvc','lslshi','lslsls','lslsge','lslslt','lslsgt','lslsle',
-            'lsrseq.w','lsrsne.w','lsrscs.w','lsrshs.w','lsrscc.w','lsrslo.w','lsrsmi.w','lsrspl.w','lsrsvs.w','lsrsvc.w','lsrshi.w','lsrsls.w','lsrsge.w','lsrslt.w','lsrsgt.w','lsrsle.w',
-            'lsrseq','lsrsne','lsrscs','lsrshs','lsrscc','lsrslo','lsrsmi','lsrspl','lsrsvs','lsrsvc','lsrshi','lsrsls','lsrsge','lsrslt','lsrsgt','lsrsle',
-            'rorseq.w','rorsne.w','rorscs.w','rorshs.w','rorscc.w','rorslo.w','rorsmi.w','rorspl.w','rorsvs.w','rorsvc.w','rorshi.w','rorsls.w','rorsge.w','rorslt.w','rorsgt.w','rorsle.w',
-            'rorseq','rorsne','rorscs','rorshs','rorscc','rorslo','rorsmi','rorspl','rorsvs','rorsvc','rorshi','rorsls','rorsge','rorslt','rorsgt','rorsle',
-            'rrxseq','rrxsne','rrxscs','rrxshs','rrxscc','rrxslo','rrxsmi','rrxspl','rrxsvs','rrxsvc','rrxshi','rrxsls','rrxsge','rrxslt','rrxsgt','rrxsle',
-            /* Set Flags: Conditional Multiply and Multiply-Add */
-            'mlaseq','mlasne','mlascs','mlashs','mlascc','mlaslo','mlasmi','mlaspl','mlasvs','mlasvc','mlashi','mlasls','mlasge','mlaslt','mlasgt','mlasle',
-            'smullseq','smullsne','smullscs','smullshs','smullscc','smullslo','smullsmi','smullspl','smullsvs','smullsvc','smullshi','smullsls','smullsge','smullslt','smullsgt','smullsle',
-            'umullseq','umullsne','umullscs','umullshs','umullscc','umullslo','umullsmi','umullspl','umullsvs','umullsvc','umullshi','umullsls','umullsge','umullslt','umullsgt','umullsle',
-            'smlalseq','smlalsne','smlalscs','smlalshs','smlalscc','smlalslo','smlalsmi','smlalspl','smlalsvs','smlalsvc','smlalshi','smlalsls','smlalsge','smlalslt','smlalsgt','smlalsle',
-            'umlalseq','umlalsne','umlalscs','umlalshs','umlalscc','umlalslo','umlalsmi','umlalspl','umlalsvs','umlalsvc','umlalshi','umlalsls','umlalsge','umlalslt','umlalsgt','umlalsle'
-            ),
-        /* Unconditional Flow Control Instructions */
-        7 => array(
-            /* Flow Control: Unconditional Branch and If-Then-Else */
-            'b.w','bal.w',
-            'b','bal',
-            'bl','blal',
-            'bx','bxal',
-            'blx','blxal',
-            'bxj','bxjal',
-            'cbnz',
-            'cbz',
-            'tbb','tbbal',
-            'tbh','tbhal',
-            'it',
-            'itt',
-            'ite',
-            'ittt',
-            'itet',
-            'itte',
-            'itee',
-            'itttt',
-            'itett',
-            'ittet',
-            'iteet',
-            'ittte',
-            'itete',
-            'ittee',
-            'iteee'
-            ),
-        /* Conditional Flow Control Instructions */
-        8 => array(
-            /* Flow Control: Conditional Branch and If-Then-Else */
-            'beq.w','bne.w','bcs.w','bhs.w','bcc.w','blo.w','bmi.w','bpl.w','bvs.w','bvc.w','bhi.w','bls.w','bge.w','blt.w','bgt.w','ble.w',
-            'beq','bne','bcs','bhs','bcc','blo','bmi','bpl','bvs','bvc','bhi','bls','bge','blt','bgt','ble',
-            'bleq','blne','blcs','blhs','blcc','bllo','blmi','blpl','blvs','blvc','blhi','blls','blge','bllt','blgt','blle',
-            'bxeq','bxne','bxcs','bxhs','bxcc','bxlo','bxmi','bxpl','bxvs','bxvc','bxhi','bxls','bxge','bxlt','bxgt','bxle',
-            'blxeq','blxne','blxcs','blxhs','blxcc','blxlo','blxmi','blxpl','blxvs','blxvc','blxhi','blxls','blxge','blxlt','blxgt','blxle',
-            'bxjeq','bxjne','bxjcs','bxjhs','bxjcc','bxjlo','bxjmi','bxjpl','bxjvs','bxjvc','bxjhi','bxjls','bxjge','bxjlt','bxjgt','bxjle',
-            'tbbeq','tbbne','tbbcs','tbbhs','tbbcc','tbblo','tbbmi','tbbpl','tbbvs','tbbvc','tbbhi','tbbls','tbbge','tbblt','tbbgt','tbble',
-            'tbheq','tbhne','tbhcs','tbhhs','tbhcc','tbhlo','tbhmi','tbhpl','tbhvs','tbhvc','tbhhi','tbhls','tbhge','tbhlt','tbhgt','tbhle'
-            ),
-        /* Unconditional Syncronization Instructions */
-        9 => array(
-            /* Synchronization: Unconditional Loads, Stores and Barriers */
-            'ldrexd','ldrexdal',
-            'ldrex','ldrexal',
-            'ldrexh','ldrexhal',
-            'ldrexb','ldrexbal',
-            'strexd','strexdal',
-            'strex','strexal',
-            'strexh','strexhal',
-            'strexb','strexbal',
-            'clrex','clrexal',
-            'swp','swpal',
-            'swpb','swpbal',
-            'dbc','dbcal',
-            'dsb','dsbal',
-            'isb','isbal',
-            'yield.w','yieldal.w',
-            'yield','yieldal',
-            'nop.w','nopal.w',
-            'nop','nopal'
-            ),
-        /* Conditional Syncronization Instructions */
-        10 => array(
-            /* Synchronization: Conditional Loads, Stores and Barriers */
-            'ldrexdeq','ldrexdne','ldrexdcs','ldrexdhs','ldrexdcc','ldrexdlo','ldrexdmi','ldrexdpl','ldrexdvs','ldrexdvc','ldrexdhi','ldrexdls','ldrexdge','ldrexdlt','ldrexdgt','ldrexdle',
-            'ldrexeq','ldrexne','ldrexcs','ldrexhs','ldrexcc','ldrexlo','ldrexmi','ldrexpl','ldrexvs','ldrexvc','ldrexhi','ldrexls','ldrexge','ldrexlt','ldrexgt','ldrexle',
-            'ldrexheq','ldrexhne','ldrexhcs','ldrexhhs','ldrexhcc','ldrexhlo','ldrexhmi','ldrexhpl','ldrexhvs','ldrexhvc','ldrexhhi','ldrexhls','ldrexhge','ldrexhlt','ldrexhgt','ldrexhle',
-            'ldrexbeq','ldrexbne','ldrexbcs','ldrexbhs','ldrexbcc','ldrexblo','ldrexbmi','ldrexbpl','ldrexbvs','ldrexbvc','ldrexbhi','ldrexbls','ldrexbge','ldrexblt','ldrexbgt','ldrexble',
-            'strexdeq','strexdne','strexdcs','strexdhs','strexdcc','strexdlo','strexdmi','strexdpl','strexdvs','strexdvc','strexdhi','strexdls','strexdge','strexdlt','strexdgt','strexdle',
-            'strexeq','strexne','strexcs','strexhs','strexcc','strexlo','strexmi','strexpl','strexvs','strexvc','strexhi','strexls','strexge','strexlt','strexgt','strexle',
-            'strexheq','strexhne','strexhcs','strexhhs','strexhcc','strexhlo','strexhmi','strexhpl','strexhvs','strexhvc','strexhhi','strexhls','strexhge','strexhlt','strexhgt','strexhle',
-            'strexbeq','strexbne','strexbcs','strexbhs','strexbcc','strexblo','strexbmi','strexbpl','strexbvs','strexbvc','strexbhi','strexbls','strexbge','strexblt','strexbgt','strexble',
-            'clrexeq','clrexne','clrexcs','clrexhs','clrexcc','clrexlo','clrexmi','clrexpl','clrexvs','clrexvc','clrexhi','clrexls','clrexge','clrexlt','clrexgt','clrexle',
-            'swpeq','swpne','swpcs','swphs','swpcc','swplo','swpmi','swppl','swpvs','swpvc','swphi','swpls','swpge','swplt','swpgt','swple',
-            'swpbeq','swpbne','swpbcs','swpbhs','swpbcc','swpblo','swpbmi','swpbpl','swpbvs','swpbvc','swpbhi','swpbls','swpbge','swpblt','swpbgt','swpble',
-            'dbceq','dbcne','dbccs','dbchs','dbccc','dbclo','dbcmi','dbcpl','dbcvs','dbcvc','dbchi','dbcls','dbcge','dbclt','dbcgt','dbcle',
-            'dsbeq','dsbne','dsbcs','dsbhs','dsbcc','dsblo','dsbmi','dsbpl','dsbvs','dsbvc','dsbhi','dsbls','dsbge','dsblt','dsbgt','dsble',
-            'isbeq','isbne','isbcs','isbhs','isbcc','isblo','isbmi','isbpl','isbvs','isbvc','isbhi','isbls','isbge','isblt','isbgt','isble',
-            'yieldeq.w','yieldne.w','yieldcs.w','yieldhs.w','yieldcc.w','yieldlo.w','yieldmi.w','yieldpl.w','yieldvs.w','yieldvc.w','yieldhi.w','yieldls.w','yieldge.w','yieldlt.w','yieldgt.w','yieldle.w',
-            'yieldeq','yieldne','yieldcs','yieldhs','yieldcc','yieldlo','yieldmi','yieldpl','yieldvs','yieldvc','yieldhi','yieldls','yieldge','yieldlt','yieldgt','yieldle',
-            'nopeq.w','nopne.w','nopcs.w','nophs.w','nopcc.w','noplo.w','nopmi.w','noppl.w','nopvs.w','nopvc.w','nophi.w','nopls.w','nopge.w','noplt.w','nopgt.w','nople.w',
-            'nopeq','nopne','nopcs','nophs','nopcc','noplo','nopmi','noppl','nopvs','nopvc','nophi','nopls','nopge','noplt','nopgt','nople'
-            ),
-        /* Unconditional ARMv6 SIMD */
-        11 => array(
-            /* ARMv6 SIMD: Unconditional Addition, Subtraction & Saturation */
-            'sadd16','sadd16al',
-            'sadd8','sadd8al',
-            'uadd16','uadd16al',
-            'uadd8','uadd8al',
-            'ssub16','ssub16al',
-            'ssub8','ssub8al',
-            'usub16','usub16al',
-            'usub8','usub8al',
-            'sasx','sasxal',
-            'ssax','ssaxal',
-            'uasx','uasxal',
-            'usax','usaxal',
-            'usad8','usad8al',
-            'usada8','usada8al',
-            /* ARMv6 SIMD: Unconditional Halving Addition & Subtraction */
-            'shadd16','shadd16al',
-            'shadd8','shadd8al',
-            'uhadd16','uhadd16al',
-            'uhadd8','uhadd8al',
-            'shsub16','shsub16al',
-            'shsub8','shsub8al',
-            'uhsub16','uhsub16al',
-            'uhsub8','uhsub8al',
-            'shasx','shasxal',
-            'shsax','shsaxal',
-            'uhasx','uhasxal',
-            'uhsax','uhsaxal',
-            /* ARMv6 SIMD: Unconditional Saturating Operations */
-            'qadd','qaddal',
-            'qadd16','qadd16al',
-            'qadd8','qadd8al',
-            'uqadd16','uqadd16al',
-            'uqadd8','uqadd8al',
-            'qsub','qsubal',
-            'qsub16','qsub16al',
-            'qsub8','qsub8al',
-            'uqsub16','uqsub16al',
-            'uqsub8','uqsub8al',
-            'qasx','qasxal',
-            'qsax','qsaxal',
-            'uqasx','uqasxal',
-            'uqsax','uqsaxal',
-            'qdadd','qdaddal',
-            'qdsub','qdsubal',
-            'ssat','ssatal',
-            'ssat16','ssat16al',
-            'usat','usatal',
-            'usat16','usat16al',
-            /* ARMv6 SIMD: Unconditional Permutation and Combine Operations */
-            'sxtah','sxtahal',
-            'sxtab','sxtabal',
-            'sxtab16','sxtab16al',
-            'uxtah','uxtahal',
-            'uxtab','uxtabal',
-            'uxtab16','uxtab16al',
-            'sxth.w','sxthal.w',
-            'sxth','sxthal',
-            'sxtb.w','sxtbal.w',
-            'sxtb','sxtbal',
-            'sxtb16','sxtb16al',
-            'uxth.w','uxthal.w',
-            'uxth','uxthal',
-            'uxtb.w','uxtbal.w',
-            'uxtb','uxtbal',
-            'uxtb16','uxtb16al',
-            'pkhbt','pkhbtal',
-            'pkhtb','pkhtbal',
-            'rbit','rbital',
-            'rev.w','reval.w',
-            'rev','reval',
-            'rev16.w','rev16al.w',
-            'rev16','rev16al',
-            'revsh.w','revshal.w',
-            'revsh','revshal',
-            'sel','selal',
-            /* ARMv6 SIMD: Unconditional Multiply and Multiply-Add */
-            'smlad','smladal',
-            'smladx','smladxal',
-            'smlsd','smlsdal',
-            'smlsdx','smlsdxal',
-            'smlald','smlaldal',
-            'smlaldx','smlaldxal',
-            'smlsld','smlsldal',
-            'smlsldx','smlsldxal',
-            'smmul','smmulal',
-            'smmulr','smmulral',
-            'smmla','smmlaal',
-            'smmlar','smmlaral',
-            'smmls','smmlsal',
-            'smmlsr','smmlsral',
-            'smuad','smuadal',
-            'smuadx','smuadxal',
-            'smusd','smusdal',
-            'smusdx','smusdxal',
-            'umaal','umaalal'
-            ),
-        /* Conditional ARMv6 SIMD */
-        12 => array(
-            /* ARMv6 SIMD: Conditional Addition, Subtraction & Saturation */
-            'sadd16eq','sadd16ne','sadd16cs','sadd16hs','sadd16cc','sadd16lo','sadd16mi','sadd16pl','sadd16vs','sadd16vc','sadd16hi','sadd16ls','sadd16ge','sadd16lt','sadd16gt','sadd16le',
-            'sadd8eq','sadd8ne','sadd8cs','sadd8hs','sadd8cc','sadd8lo','sadd8mi','sadd8pl','sadd8vs','sadd8vc','sadd8hi','sadd8ls','sadd8ge','sadd8lt','sadd8gt','sadd8le',
-            'uadd16eq','uadd16ne','uadd16cs','uadd16hs','uadd16cc','uadd16lo','uadd16mi','uadd16pl','uadd16vs','uadd16vc','uadd16hi','uadd16ls','uadd16ge','uadd16lt','uadd16gt','uadd16le',
-            'uadd8eq','uadd8ne','uadd8cs','uadd8hs','uadd8cc','uadd8lo','uadd8mi','uadd8pl','uadd8vs','uadd8vc','uadd8hi','uadd8ls','uadd8ge','uadd8lt','uadd8gt','uadd8le',
-            'ssub16eq','ssub16ne','ssub16cs','ssub16hs','ssub16cc','ssub16lo','ssub16mi','ssub16pl','ssub16vs','ssub16vc','ssub16hi','ssub16ls','ssub16ge','ssub16lt','ssub16gt','ssub16le',
-            'ssub8eq','ssub8ne','ssub8cs','ssub8hs','ssub8cc','ssub8lo','ssub8mi','ssub8pl','ssub8vs','ssub8vc','ssub8hi','ssub8ls','ssub8ge','ssub8lt','ssub8gt','ssub8le',
-            'usub16eq','usub16ne','usub16cs','usub16hs','usub16cc','usub16lo','usub16mi','usub16pl','usub16vs','usub16vc','usub16hi','usub16ls','usub16ge','usub16lt','usub16gt','usub16le',
-            'usub8eq','usub8ne','usub8cs','usub8hs','usub8cc','usub8lo','usub8mi','usub8pl','usub8vs','usub8vc','usub8hi','usub8ls','usub8ge','usub8lt','usub8gt','usub8le',
-            'sasxeq','sasxne','sasxcs','sasxhs','sasxcc','sasxlo','sasxmi','sasxpl','sasxvs','sasxvc','sasxhi','sasxls','sasxge','sasxlt','sasxgt','sasxle',
-            'ssaxeq','ssaxne','ssaxcs','ssaxhs','ssaxcc','ssaxlo','ssaxmi','ssaxpl','ssaxvs','ssaxvc','ssaxhi','ssaxls','ssaxge','ssaxlt','ssaxgt','ssaxle',
-            'uasxeq','uasxne','uasxcs','uasxhs','uasxcc','uasxlo','uasxmi','uasxpl','uasxvs','uasxvc','uasxhi','uasxls','uasxge','uasxlt','uasxgt','uasxle',
-            'usaxeq','usaxne','usaxcs','usaxhs','usaxcc','usaxlo','usaxmi','usaxpl','usaxvs','usaxvc','usaxhi','usaxls','usaxge','usaxlt','usaxgt','usaxle',
-            'usad8eq','usad8ne','usad8cs','usad8hs','usad8cc','usad8lo','usad8mi','usad8pl','usad8vs','usad8vc','usad8hi','usad8ls','usad8ge','usad8lt','usad8gt','usad8le',
-            'usada8eq','usada8ne','usada8cs','usada8hs','usada8cc','usada8lo','usada8mi','usada8pl','usada8vs','usada8vc','usada8hi','usada8ls','usada8ge','usada8lt','usada8gt','usada8le',
-            /* ARMv6 SIMD: Conditional Halving Addition & Subtraction */
-            'shadd16eq','shadd16ne','shadd16cs','shadd16hs','shadd16cc','shadd16lo','shadd16mi','shadd16pl','shadd16vs','shadd16vc','shadd16hi','shadd16ls','shadd16ge','shadd16lt','shadd16gt','shadd16le',
-            'shadd8eq','shadd8ne','shadd8cs','shadd8hs','shadd8cc','shadd8lo','shadd8mi','shadd8pl','shadd8vs','shadd8vc','shadd8hi','shadd8ls','shadd8ge','shadd8lt','shadd8gt','shadd8le',
-            'uhadd16eq','uhadd16ne','uhadd16cs','uhadd16hs','uhadd16cc','uhadd16lo','uhadd16mi','uhadd16pl','uhadd16vs','uhadd16vc','uhadd16hi','uhadd16ls','uhadd16ge','uhadd16lt','uhadd16gt','uhadd16le',
-            'uhadd8eq','uhadd8ne','uhadd8cs','uhadd8hs','uhadd8cc','uhadd8lo','uhadd8mi','uhadd8pl','uhadd8vs','uhadd8vc','uhadd8hi','uhadd8ls','uhadd8ge','uhadd8lt','uhadd8gt','uhadd8le',
-            'shsub16eq','shsub16ne','shsub16cs','shsub16hs','shsub16cc','shsub16lo','shsub16mi','shsub16pl','shsub16vs','shsub16vc','shsub16hi','shsub16ls','shsub16ge','shsub16lt','shsub16gt','shsub16le',
-            'shsub8eq','shsub8ne','shsub8cs','shsub8hs','shsub8cc','shsub8lo','shsub8mi','shsub8pl','shsub8vs','shsub8vc','shsub8hi','shsub8ls','shsub8ge','shsub8lt','shsub8gt','shsub8le',
-            'uhsub16eq','uhsub16ne','uhsub16cs','uhsub16hs','uhsub16cc','uhsub16lo','uhsub16mi','uhsub16pl','uhsub16vs','uhsub16vc','uhsub16hi','uhsub16ls','uhsub16ge','uhsub16lt','uhsub16gt','uhsub16le',
-            'uhsub8eq','uhsub8ne','uhsub8cs','uhsub8hs','uhsub8cc','uhsub8lo','uhsub8mi','uhsub8pl','uhsub8vs','uhsub8vc','uhsub8hi','uhsub8ls','uhsub8ge','uhsub8lt','uhsub8gt','uhsub8le',
-            'shasxeq','shasxne','shasxcs','shasxhs','shasxcc','shasxlo','shasxmi','shasxpl','shasxvs','shasxvc','shasxhi','shasxls','shasxge','shasxlt','shasxgt','shasxle',
-            'shsaxeq','shsaxne','shsaxcs','shsaxhs','shsaxcc','shsaxlo','shsaxmi','shsaxpl','shsaxvs','shsaxvc','shsaxhi','shsaxls','shsaxge','shsaxlt','shsaxgt','shsaxle',
-            'uhasxeq','uhasxne','uhasxcs','uhasxhs','uhasxcc','uhasxlo','uhasxmi','uhasxpl','uhasxvs','uhasxvc','uhasxhi','uhasxls','uhasxge','uhasxlt','uhasxgt','uhasxle',
-            'uhsaxeq','uhsaxne','uhsaxcs','uhsaxhs','uhsaxcc','uhsaxlo','uhsaxmi','uhsaxpl','uhsaxvs','uhsaxvc','uhsaxhi','uhsaxls','uhsaxge','uhsaxlt','uhsaxgt','uhsaxle',
-            /* ARMv6 SIMD: Conditional Saturating Operations */
-            'qaddeq','qaddne','qaddcs','qaddhs','qaddcc','qaddlo','qaddmi','qaddpl','qaddvs','qaddvc','qaddhi','qaddls','qaddge','qaddlt','qaddgt','qaddle',
-            'qadd16eq','qadd16ne','qadd16cs','qadd16hs','qadd16cc','qadd16lo','qadd16mi','qadd16pl','qadd16vs','qadd16vc','qadd16hi','qadd16ls','qadd16ge','qadd16lt','qadd16gt','qadd16le',
-            'qadd8eq','qadd8ne','qadd8cs','qadd8hs','qadd8cc','qadd8lo','qadd8mi','qadd8pl','qadd8vs','qadd8vc','qadd8hi','qadd8ls','qadd8ge','qadd8lt','qadd8gt','qadd8le',
-            'uqadd16eq','uqadd16ne','uqadd16cs','uqadd16hs','uqadd16cc','uqadd16lo','uqadd16mi','uqadd16pl','uqadd16vs','uqadd16vc','uqadd16hi','uqadd16ls','uqadd16ge','uqadd16lt','uqadd16gt','uqadd16le',
-            'uqadd8eq','uqadd8ne','uqadd8cs','uqadd8hs','uqadd8cc','uqadd8lo','uqadd8mi','uqadd8pl','uqadd8vs','uqadd8vc','uqadd8hi','uqadd8ls','uqadd8ge','uqadd8lt','uqadd8gt','uqadd8le',
-            'qsubeq','qsubne','qsubcs','qsubhs','qsubcc','qsublo','qsubmi','qsubpl','qsubvs','qsubvc','qsubhi','qsubls','qsubge','qsublt','qsubgt','qsuble',
-            'qsub16eq','qsub16ne','qsub16cs','qsub16hs','qsub16cc','qsub16lo','qsub16mi','qsub16pl','qsub16vs','qsub16vc','qsub16hi','qsub16ls','qsub16ge','qsub16lt','qsub16gt','qsub16le',
-            'qsub8eq','qsub8ne','qsub8cs','qsub8hs','qsub8cc','qsub8lo','qsub8mi','qsub8pl','qsub8vs','qsub8vc','qsub8hi','qsub8ls','qsub8ge','qsub8lt','qsub8gt','qsub8le',
-            'uqsub16eq','uqsub16ne','uqsub16cs','uqsub16hs','uqsub16cc','uqsub16lo','uqsub16mi','uqsub16pl','uqsub16vs','uqsub16vc','uqsub16hi','uqsub16ls','uqsub16ge','uqsub16lt','uqsub16gt','uqsub16le',
-            'uqsub8eq','uqsub8ne','uqsub8cs','uqsub8hs','uqsub8cc','uqsub8lo','uqsub8mi','uqsub8pl','uqsub8vs','uqsub8vc','uqsub8hi','uqsub8ls','uqsub8ge','uqsub8lt','uqsub8gt','uqsub8le',
-            'qasxeq','qasxne','qasxcs','qasxhs','qasxcc','qasxlo','qasxmi','qasxpl','qasxvs','qasxvc','qasxhi','qasxls','qasxge','qasxlt','qasxgt','qasxle',
-            'qsaxeq','qsaxne','qsaxcs','qsaxhs','qsaxcc','qsaxlo','qsaxmi','qsaxpl','qsaxvs','qsaxvc','qsaxhi','qsaxls','qsaxge','qsaxlt','qsaxgt','qsaxle',
-            'uqasxeq','uqasxne','uqasxcs','uqasxhs','uqasxcc','uqasxlo','uqasxmi','uqasxpl','uqasxvs','uqasxvc','uqasxhi','uqasxls','uqasxge','uqasxlt','uqasxgt','uqasxle',
-            'uqsaxeq','uqsaxne','uqsaxcs','uqsaxhs','uqsaxcc','uqsaxlo','uqsaxmi','uqsaxpl','uqsaxvs','uqsaxvc','uqsaxhi','uqsaxls','uqsaxge','uqsaxlt','uqsaxgt','uqsaxle',
-            'qdaddeq','qdaddne','qdaddcs','qdaddhs','qdaddcc','qdaddlo','qdaddmi','qdaddpl','qdaddvs','qdaddvc','qdaddhi','qdaddls','qdaddge','qdaddlt','qdaddgt','qdaddle',
-            'qdsubeq','qdsubne','qdsubcs','qdsubhs','qdsubcc','qdsublo','qdsubmi','qdsubpl','qdsubvs','qdsubvc','qdsubhi','qdsubls','qdsubge','qdsublt','qdsubgt','qdsuble',
-            'ssateq','ssatne','ssatcs','ssaths','ssatcc','ssatlo','ssatmi','ssatpl','ssatvs','ssatvc','ssathi','ssatls','ssatge','ssatlt','ssatgt','ssatle',
-            'ssat16eq','ssat16ne','ssat16cs','ssat16hs','ssat16cc','ssat16lo','ssat16mi','ssat16pl','ssat16vs','ssat16vc','ssat16hi','ssat16ls','ssat16ge','ssat16lt','ssat16gt','ssat16le',
-            'usateq','usatne','usatcs','usaths','usatcc','usatlo','usatmi','usatpl','usatvs','usatvc','usathi','usatls','usatge','usatlt','usatgt','usatle',
-            'usat16eq','usat16ne','usat16cs','usat16hs','usat16cc','usat16lo','usat16mi','usat16pl','usat16vs','usat16vc','usat16hi','usat16ls','usat16ge','usat16lt','usat16gt','usat16le',
-            /* ARMv6 SIMD: Conditional Permutation and Combine Operations */
-            'sxtaheq','sxtahne','sxtahcs','sxtahhs','sxtahcc','sxtahlo','sxtahmi','sxtahpl','sxtahvs','sxtahvc','sxtahhi','sxtahls','sxtahge','sxtahlt','sxtahgt','sxtahle',
-            'sxtabeq','sxtabne','sxtabcs','sxtabhs','sxtabcc','sxtablo','sxtabmi','sxtabpl','sxtabvs','sxtabvc','sxtabhi','sxtabls','sxtabge','sxtablt','sxtabgt','sxtable',
-            'sxtab16eq','sxtab16ne','sxtab16cs','sxtab16hs','sxtab16cc','sxtab16lo','sxtab16mi','sxtab16pl','sxtab16vs','sxtab16vc','sxtab16hi','sxtab16ls','sxtab16ge','sxtab16lt','sxtab16gt','sxtab16le',
-            'uxtaheq','uxtahne','uxtahcs','uxtahhs','uxtahcc','uxtahlo','uxtahmi','uxtahpl','uxtahvs','uxtahvc','uxtahhi','uxtahls','uxtahge','uxtahlt','uxtahgt','uxtahle',
-            'uxtabeq','uxtabne','uxtabcs','uxtabhs','uxtabcc','uxtablo','uxtabmi','uxtabpl','uxtabvs','uxtabvc','uxtabhi','uxtabls','uxtabge','uxtablt','uxtabgt','uxtable',
-            'uxtab16eq','uxtab16ne','uxtab16cs','uxtab16hs','uxtab16cc','uxtab16lo','uxtab16mi','uxtab16pl','uxtab16vs','uxtab16vc','uxtab16hi','uxtab16ls','uxtab16ge','uxtab16lt','uxtab16gt','uxtab16le',
-            'sxtheq.w','sxthne.w','sxthcs.w','sxthhs.w','sxthcc.w','sxthlo.w','sxthmi.w','sxthpl.w','sxthvs.w','sxthvc.w','sxthhi.w','sxthls.w','sxthge.w','sxthlt.w','sxthgt.w','sxthle.w',
-            'sxtheq','sxthne','sxthcs','sxthhs','sxthcc','sxthlo','sxthmi','sxthpl','sxthvs','sxthvc','sxthhi','sxthls','sxthge','sxthlt','sxthgt','sxthle',
-            'sxtbeq.w','sxtbne.w','sxtbcs.w','sxtbhs.w','sxtbcc.w','sxtblo.w','sxtbmi.w','sxtbpl.w','sxtbvs.w','sxtbvc.w','sxtbhi.w','sxtbls.w','sxtbge.w','sxtblt.w','sxtbgt.w','sxtble.w',
-            'sxtbeq','sxtbne','sxtbcs','sxtbhs','sxtbcc','sxtblo','sxtbmi','sxtbpl','sxtbvs','sxtbvc','sxtbhi','sxtbls','sxtbge','sxtblt','sxtbgt','sxtble',
-            'sxtb16eq','sxtb16ne','sxtb16cs','sxtb16hs','sxtb16cc','sxtb16lo','sxtb16mi','sxtb16pl','sxtb16vs','sxtb16vc','sxtb16hi','sxtb16ls','sxtb16ge','sxtb16lt','sxtb16gt','sxtb16le',
-            'uxtheq.w','uxthne.w','uxthcs.w','uxthhs.w','uxthcc.w','uxthlo.w','uxthmi.w','uxthpl.w','uxthvs.w','uxthvc.w','uxthhi.w','uxthls.w','uxthge.w','uxthlt.w','uxthgt.w','uxthle.w',
-            'uxtheq','uxthne','uxthcs','uxthhs','uxthcc','uxthlo','uxthmi','uxthpl','uxthvs','uxthvc','uxthhi','uxthls','uxthge','uxthlt','uxthgt','uxthle',
-            'uxtbeq.w','uxtbne.w','uxtbcs.w','uxtbhs.w','uxtbcc.w','uxtblo.w','uxtbmi.w','uxtbpl.w','uxtbvs.w','uxtbvc.w','uxtbhi.w','uxtbls.w','uxtbge.w','uxtblt.w','uxtbgt.w','uxtble.w',
-            'uxtbeq','uxtbne','uxtbcs','uxtbhs','uxtbcc','uxtblo','uxtbmi','uxtbpl','uxtbvs','uxtbvc','uxtbhi','uxtbls','uxtbge','uxtblt','uxtbgt','uxtble',
-            'uxtb16eq','uxtb16ne','uxtb16cs','uxtb16hs','uxtb16cc','uxtb16lo','uxtb16mi','uxtb16pl','uxtb16vs','uxtb16vc','uxtb16hi','uxtb16ls','uxtb16ge','uxtb16lt','uxtb16gt','uxtb16le',
-            'pkhbteq','pkhbtne','pkhbtcs','pkhbths','pkhbtcc','pkhbtlo','pkhbtmi','pkhbtpl','pkhbtvs','pkhbtvc','pkhbthi','pkhbtls','pkhbtge','pkhbtlt','pkhbtgt','pkhbtle',
-            'pkhtbeq','pkhtbne','pkhtbcs','pkhtbhs','pkhtbcc','pkhtblo','pkhtbmi','pkhtbpl','pkhtbvs','pkhtbvc','pkhtbhi','pkhtbls','pkhtbge','pkhtblt','pkhtbgt','pkhtble',
-            'rbiteq','rbitne','rbitcs','rbiths','rbitcc','rbitlo','rbitmi','rbitpl','rbitvs','rbitvc','rbithi','rbitls','rbitge','rbitlt','rbitgt','rbitle',
-            'reveq.w','revne.w','revcs.w','revhs.w','revcc.w','revlo.w','revmi.w','revpl.w','revvs.w','revvc.w','revhi.w','revls.w','revge.w','revlt.w','revgt.w','revle.w',
-            'reveq','revne','revcs','revhs','revcc','revlo','revmi','revpl','revvs','revvc','revhi','revls','revge','revlt','revgt','revle',
-            'rev16eq.w','rev16ne.w','rev16cs.w','rev16hs.w','rev16cc.w','rev16lo.w','rev16mi.w','rev16pl.w','rev16vs.w','rev16vc.w','rev16hi.w','rev16ls.w','rev16ge.w','rev16lt.w','rev16gt.w','rev16le.w',
-            'rev16eq','rev16ne','rev16cs','rev16hs','rev16cc','rev16lo','rev16mi','rev16pl','rev16vs','rev16vc','rev16hi','rev16ls','rev16ge','rev16lt','rev16gt','rev16le',
-            'revsheq.w','revshne.w','revshcs.w','revshhs.w','revshcc.w','revshlo.w','revshmi.w','revshpl.w','revshvs.w','revshvc.w','revshhi.w','revshls.w','revshge.w','revshlt.w','revshgt.w','revshle.w',
-            'revsheq','revshne','revshcs','revshhs','revshcc','revshlo','revshmi','revshpl','revshvs','revshvc','revshhi','revshls','revshge','revshlt','revshgt','revshle',
-            'seleq','selne','selcs','selhs','selcc','sello','selmi','selpl','selvs','selvc','selhi','sells','selge','sellt','selgt','selle',
-            /* ARMv6 SIMD: Conditional Multiply and Multiply-Add */
-            'smladeq','smladne','smladcs','smladhs','smladcc','smladlo','smladmi','smladpl','smladvs','smladvc','smladhi','smladls','smladge','smladlt','smladgt','smladle',
-            'smladxeq','smladxne','smladxcs','smladxhs','smladxcc','smladxlo','smladxmi','smladxpl','smladxvs','smladxvc','smladxhi','smladxls','smladxge','smladxlt','smladxgt','smladxle',
-            'smlsdeq','smlsdne','smlsdcs','smlsdhs','smlsdcc','smlsdlo','smlsdmi','smlsdpl','smlsdvs','smlsdvc','smlsdhi','smlsdls','smlsdge','smlsdlt','smlsdgt','smlsdle',
-            'smlsdxeq','smlsdxne','smlsdxcs','smlsdxhs','smlsdxcc','smlsdxlo','smlsdxmi','smlsdxpl','smlsdxvs','smlsdxvc','smlsdxhi','smlsdxls','smlsdxge','smlsdxlt','smlsdxgt','smlsdxle',
-            'smlaldeq','smlaldne','smlaldcs','smlaldhs','smlaldcc','smlaldlo','smlaldmi','smlaldpl','smlaldvs','smlaldvc','smlaldhi','smlaldls','smlaldge','smlaldlt','smlaldgt','smlaldle',
-            'smlaldxeq','smlaldxne','smlaldxcs','smlaldxhs','smlaldxcc','smlaldxlo','smlaldxmi','smlaldxpl','smlaldxvs','smlaldxvc','smlaldxhi','smlaldxls','smlaldxge','smlaldxlt','smlaldxgt','smlaldxle',
-            'smlsldeq','smlsldne','smlsldcs','smlsldhs','smlsldcc','smlsldlo','smlsldmi','smlsldpl','smlsldvs','smlsldvc','smlsldhi','smlsldls','smlsldge','smlsldlt','smlsldgt','smlsldle',
-            'smlsldxeq','smlsldxne','smlsldxcs','smlsldxhs','smlsldxcc','smlsldxlo','smlsldxmi','smlsldxpl','smlsldxvs','smlsldxvc','smlsldxhi','smlsldxls','smlsldxge','smlsldxlt','smlsldxgt','smlsldxle',
-            'smmuleq','smmulne','smmulcs','smmulhs','smmulcc','smmullo','smmulmi','smmulpl','smmulvs','smmulvc','smmulhi','smmulls','smmulge','smmullt','smmulgt','smmulle',
-            'smmulreq','smmulrne','smmulrcs','smmulrhs','smmulrcc','smmulrlo','smmulrmi','smmulrpl','smmulrvs','smmulrvc','smmulrhi','smmulrls','smmulrge','smmulrlt','smmulrgt','smmulrle',
-            'smmlaeq','smmlane','smmlacs','smmlahs','smmlacc','smmlalo','smmlami','smmlapl','smmlavs','smmlavc','smmlahi','smmlals','smmlage','smmlalt','smmlagt','smmlale',
-            'smmlareq','smmlarne','smmlarcs','smmlarhs','smmlarcc','smmlarlo','smmlarmi','smmlarpl','smmlarvs','smmlarvc','smmlarhi','smmlarls','smmlarge','smmlarlt','smmlargt','smmlarle',
-            'smmlseq','smmlsne','smmlscs','smmlshs','smmlscc','smmlslo','smmlsmi','smmlspl','smmlsvs','smmlsvc','smmlshi','smmlsls','smmlsge','smmlslt','smmlsgt','smmlsle',
-            'smmlsreq','smmlsrne','smmlsrcs','smmlsrhs','smmlsrcc','smmlsrlo','smmlsrmi','smmlsrpl','smmlsrvs','smmlsrvc','smmlsrhi','smmlsrls','smmlsrge','smmlsrlt','smmlsrgt','smmlsrle',
-            'smuadeq','smuadne','smuadcs','smuadhs','smuadcc','smuadlo','smuadmi','smuadpl','smuadvs','smuadvc','smuadhi','smuadls','smuadge','smuadlt','smuadgt','smuadle',
-            'smuadxeq','smuadxne','smuadxcs','smuadxhs','smuadxcc','smuadxlo','smuadxmi','smuadxpl','smuadxvs','smuadxvc','smuadxhi','smuadxls','smuadxge','smuadxlt','smuadxgt','smuadxle',
-            'smusdeq','smusdne','smusdcs','smusdhs','smusdcc','smusdlo','smusdmi','smusdpl','smusdvs','smusdvc','smusdhi','smusdls','smusdge','smusdlt','smusdgt','smusdle',
-            'smusdxeq','smusdxne','smusdxcs','smusdxhs','smusdxcc','smusdxlo','smusdxmi','smusdxpl','smusdxvs','smusdxvc','smusdxhi','smusdxls','smusdxge','smusdxlt','smusdxgt','smusdxle',
-            'umaaleq','umaalne','umaalcs','umaalhs','umaalcc','umaallo','umaalmi','umaalpl','umaalvs','umaalvc','umaalhi','umaalls','umaalge','umaallt','umaalgt','umaalle'
-            ),
-        /* Unconditional Coprocessor Instructions */
-        13 => array(
-            /* Data Processing: Unconditional Coprocessor Instructions */
-            'cdp','cdpal',
-            'cdp2','cdp2al',
-            'ldc','ldcal',
-            'ldcl','ldclal',
-            'ldc2','ldc2al',
-            'ldc2l','ldc2lal',
-            'stc','stcal',
-            'stcl','stclal',
-            'stc2','stc2al',
-            'stc2l','stc2lal',
-            'mcr','mcral',
-            'mcr2','mcr2al',
-            'mcrr','mcrral',
-            'mcrr2','mcrr2al',
-            'mrc','mrcal',
-            'mrc2','mrc2al',
-            'mrrc','mrrcal',
-            'mrrc2','mrrc2al'
-            ),
-        /* Conditional Coprocessor Instructions */
-        14 => array(
-            /* Data Processing: Conditional Coprocessor Instructions */
-            'cdpeq','cdpne','cdpcs','cdphs','cdpcc','cdplo','cdpmi','cdppl','cdpvs','cdpvc','cdphi','cdpls','cdpge','cdplt','cdpgt','cdple',
-            'cdp2eq','cdp2ne','cdp2cs','cdp2hs','cdp2cc','cdp2lo','cdp2mi','cdp2pl','cdp2vs','cdp2vc','cdp2hi','cdp2ls','cdp2ge','cdp2lt','cdp2gt','cdp2le',
-            'ldceq','ldcne','ldccs','ldchs','ldccc','ldclo','ldcmi','ldcpl','ldcvs','ldcvc','ldchi','ldcls','ldcge','ldclt','ldcgt','ldcle',
-            'ldcleq','ldclne','ldclcs','ldclhs','ldclcc','ldcllo','ldclmi','ldclpl','ldclvs','ldclvc','ldclhi','ldclls','ldclge','ldcllt','ldclgt','ldclle',
-            'ldc2eq','ldc2ne','ldc2cs','ldc2hs','ldc2cc','ldc2lo','ldc2mi','ldc2pl','ldc2vs','ldc2vc','ldc2hi','ldc2ls','ldc2ge','ldc2lt','ldc2gt','ldc2le',
-            'ldc2leq','ldc2lne','ldc2lcs','ldc2lhs','ldc2lcc','ldc2llo','ldc2lmi','ldc2lpl','ldc2lvs','ldc2lvc','ldc2lhi','ldc2lls','ldc2lge','ldc2llt','ldc2lgt','ldc2lle',
-            'stceq','stcne','stccs','stchs','stccc','stclo','stcmi','stcpl','stcvs','stcvc','stchi','stcls','stcge','stclt','stcgt','stcle',
-            'stcleq','stclne','stclcs','stclhs','stclcc','stcllo','stclmi','stclpl','stclvs','stclvc','stclhi','stclls','stclge','stcllt','stclgt','stclle',
-            'stc2eq','stc2ne','stc2cs','stc2hs','stc2cc','stc2lo','stc2mi','stc2pl','stc2vs','stc2vc','stc2hi','stc2ls','stc2ge','stc2lt','stc2gt','stc2le',
-            'stc2leq','stc2lne','stc2lcs','stc2lhs','stc2lcc','stc2llo','stc2lmi','stc2lpl','stc2lvs','stc2lvc','stc2lhi','stc2lls','stc2lge','stc2llt','stc2lgt','stc2lle',
-            'mcreq','mcrne','mcrcs','mcrhs','mcrcc','mcrlo','mcrmi','mcrpl','mcrvs','mcrvc','mcrhi','mcrls','mcrge','mcrlt','mcrgt','mcrle',
-            'mcr2eq','mcr2ne','mcr2cs','mcr2hs','mcr2cc','mcr2lo','mcr2mi','mcr2pl','mcr2vs','mcr2vc','mcr2hi','mcr2ls','mcr2ge','mcr2lt','mcr2gt','mcr2le',
-            'mcrreq','mcrrne','mcrrcs','mcrrhs','mcrrcc','mcrrlo','mcrrmi','mcrrpl','mcrrvs','mcrrvc','mcrrhi','mcrrls','mcrrge','mcrrlt','mcrrgt','mcrrle',
-            'mcrr2eq','mcrr2ne','mcrr2cs','mcrr2hs','mcrr2cc','mcrr2lo','mcrr2mi','mcrr2pl','mcrr2vs','mcrr2vc','mcrr2hi','mcrr2ls','mcrr2ge','mcrr2lt','mcrr2gt','mcrr2le',
-            'mrceq','mrcne','mrccs','mrchs','mrccc','mrclo','mrcmi','mrcpl','mrcvs','mrcvc','mrchi','mrcls','mrcge','mrclt','mrcgt','mrcle',
-            'mrc2eq','mrc2ne','mrc2cs','mrc2hs','mrc2cc','mrc2lo','mrc2mi','mrc2pl','mrc2vs','mrc2vc','mrc2hi','mrc2ls','mrc2ge','mrc2lt','mrc2gt','mrc2le',
-            'mrrceq','mrrcne','mrrccs','mrrchs','mrrccc','mrrclo','mrrcmi','mrrcpl','mrrcvs','mrrcvc','mrrchi','mrrcls','mrrcge','mrrclt','mrrcgt','mrrcle',
-            'mrrc2eq','mrrc2ne','mrrc2cs','mrrc2hs','mrrc2cc','mrrc2lo','mrrc2mi','mrrc2pl','mrrc2vs','mrrc2vc','mrrc2hi','mrrc2ls','mrrc2ge','mrrc2lt','mrrc2gt','mrrc2le'
-            ),
-        /* Unconditional System Instructions */
-        15 => array(
-            /* System: Unconditional Debug and State-Change Instructions */
-            'bkpt',
-            'dbg','dbgal',
-            'setend',
-            'svc','svcal',
-            'sev.w','seval.w',
-            'sev','seval',
-            'wfe.w','wfeal.w',
-            'wfe','wfeal',
-            'wfi.w','wfial.w',
-            'wfi','wfial',
-            /* System: Unconditional ThumbEE Instructions */
-            'enterx',
-            'leavex',
-            'chka.n','chkaal.n',
-            'chka','chkaal',
-            'hb.n','hbal.n',
-            'hb','hbal',
-            'hbl.n','hblal.n',
-            'hbl','hblal',
-            'hblp.n','hblpal.n',
-            'hblp','hblpal',
-            'hbp.n','hbpal.n',
-            'hbp','hbpal',
-            /* System: Unconditional Privileged Instructions */
-            'cpsie.n',
-            'cpsie.w',
-            'cpsie',
-            'cpsid.n',
-            'cpsid.w',
-            'cpsid',
-            'smc','smcal',
-            'rfeda','rfedaal',
-            'rfedb','rfedbal',
-            'rfeia','rfeiaal',
-            'rfeib','rfeibal',
-            'srsda','srsdaal',
-            'srsdb','srsdbal',
-            'srsia','srsiaal',
-            'srsib','srsibal'
-            ),
-        /* Conditional System Instructions */
-        16 => array(
-            /* System: Conditional Debug and State-Change Instructions */
-            'dbgeq','dbgne','dbgcs','dbghs','dbgcc','dbglo','dbgmi','dbgpl','dbgvs','dbgvc','dbghi','dbgls','dbgge','dbglt','dbggt','dbgle',
-            'svceq','svcne','svccs','svchs','svccc','svclo','svcmi','svcpl','svcvs','svcvc','svchi','svcls','svcge','svclt','svcgt','svcle',
-            'seveq.w','sevne.w','sevcs.w','sevhs.w','sevcc.w','sevlo.w','sevmi.w','sevpl.w','sevvs.w','sevvc.w','sevhi.w','sevls.w','sevge.w','sevlt.w','sevgt.w','sevle.w',
-            'seveq','sevne','sevcs','sevhs','sevcc','sevlo','sevmi','sevpl','sevvs','sevvc','sevhi','sevls','sevge','sevlt','sevgt','sevle',
-            'wfeeq.w','wfene.w','wfecs.w','wfehs.w','wfecc.w','wfelo.w','wfemi.w','wfepl.w','wfevs.w','wfevc.w','wfehi.w','wfels.w','wfege.w','wfelt.w','wfegt.w','wfele.w',
-            'wfeeq','wfene','wfecs','wfehs','wfecc','wfelo','wfemi','wfepl','wfevs','wfevc','wfehi','wfels','wfege','wfelt','wfegt','wfele',
-            'wfieq.w','wfine.w','wfics.w','wfihs.w','wficc.w','wfilo.w','wfimi.w','wfipl.w','wfivs.w','wfivc.w','wfihi.w','wfils.w','wfige.w','wfilt.w','wfigt.w','wfile.w',
-            'wfieq','wfine','wfics','wfihs','wficc','wfilo','wfimi','wfipl','wfivs','wfivc','wfihi','wfils','wfige','wfilt','wfigt','wfile',
-            /* System: Conditional ThumbEE Instructions */
-            'chkaeq.n','chkane.n','chkacs.n','chkahs.n','chkacc.n','chkalo.n','chkami.n','chkapl.n','chkavs.n','chkavc.n','chkahi.n','chkals.n','chkage.n','chkalt.n','chkagt.n','chkale.n',
-            'chkaeq','chkane','chkacs','chkahs','chkacc','chkalo','chkami','chkapl','chkavs','chkavc','chkahi','chkals','chkage','chkalt','chkagt','chkale',
-            'hbeq.n','hbne.n','hbcs.n','hbhs.n','hbcc.n','hblo.n','hbmi.n','hbpl.n','hbvs.n','hbvc.n','hbhi.n','hbls.n','hbge.n','hblt.n','hbgt.n','hble.n',
-            'hbeq','hbne','hbcs','hbhs','hbcc','hblo','hbmi','hbpl','hbvs','hbvc','hbhi','hbls','hbge','hblt','hbgt','hble',
-            'hbleq.n','hblne.n','hblcs.n','hblhs.n','hblcc.n','hbllo.n','hblmi.n','hblpl.n','hblvs.n','hblvc.n','hblhi.n','hblls.n','hblge.n','hbllt.n','hblgt.n','hblle.n',
-            'hbleq','hblne','hblcs','hblhs','hblcc','hbllo','hblmi','hblpl','hblvs','hblvc','hblhi','hblls','hblge','hbllt','hblgt','hblle',
-            'hblpeq.n','hblpne.n','hblpcs.n','hblphs.n','hblpcc.n','hblplo.n','hblpmi.n','hblppl.n','hblpvs.n','hblpvc.n','hblphi.n','hblpls.n','hblpge.n','hblplt.n','hblpgt.n','hblple.n',
-            'hblpeq','hblpne','hblpcs','hblphs','hblpcc','hblplo','hblpmi','hblppl','hblpvs','hblpvc','hblphi','hblpls','hblpge','hblplt','hblpgt','hblple',
-            'hbpeq.n','hbpne.n','hbpcs.n','hbphs.n','hbpcc.n','hbplo.n','hbpmi.n','hbppl.n','hbpvs.n','hbpvc.n','hbphi.n','hbpls.n','hbpge.n','hbplt.n','hbpgt.n','hbple.n',
-            'hbpeq','hbpne','hbpcs','hbphs','hbpcc','hbplo','hbpmi','hbppl','hbpvs','hbpvc','hbphi','hbpls','hbpge','hbplt','hbpgt','hbple',
-            /* System: Conditional Privileged Instructions */
-            'smceq','smcne','smccs','smchs','smccc','smclo','smcmi','smcpl','smcvs','smcvc','smchi','smcls','smcge','smclt','smcgt','smcle',
-            'rfedaeq','rfedane','rfedacs','rfedahs','rfedacc','rfedalo','rfedami','rfedapl','rfedavs','rfedavc','rfedahi','rfedals','rfedage','rfedalt','rfedagt','rfedale',
-            'rfedbeq','rfedbne','rfedbcs','rfedbhs','rfedbcc','rfedblo','rfedbmi','rfedbpl','rfedbvs','rfedbvc','rfedbhi','rfedbls','rfedbge','rfedblt','rfedbgt','rfedble',
-            'rfeiaeq','rfeiane','rfeiacs','rfeiahs','rfeiacc','rfeialo','rfeiami','rfeiapl','rfeiavs','rfeiavc','rfeiahi','rfeials','rfeiage','rfeialt','rfeiagt','rfeiale',
-            'rfeibeq','rfeibne','rfeibcs','rfeibhs','rfeibcc','rfeiblo','rfeibmi','rfeibpl','rfeibvs','rfeibvc','rfeibhi','rfeibls','rfeibge','rfeiblt','rfeibgt','rfeible',
-            'srsdaeq','srsdane','srsdacs','srsdahs','srsdacc','srsdalo','srsdami','srsdapl','srsdavs','srsdavc','srsdahi','srsdals','srsdage','srsdalt','srsdagt','srsdale',
-            'srsdbeq','srsdbne','srsdbcs','srsdbhs','srsdbcc','srsdblo','srsdbmi','srsdbpl','srsdbvs','srsdbvc','srsdbhi','srsdbls','srsdbge','srsdblt','srsdbgt','srsdble',
-            'srsiaeq','srsiane','srsiacs','srsiahs','srsiacc','srsialo','srsiami','srsiapl','srsiavs','srsiavc','srsiahi','srsials','srsiage','srsialt','srsiagt','srsiale',
-            'srsibeq','srsibne','srsibcs','srsibhs','srsibcc','srsiblo','srsibmi','srsibpl','srsibvs','srsibvc','srsibhi','srsibls','srsibge','srsiblt','srsibgt','srsible'
-            ),
-        /* Unconditional WMMX/WMMX2 instructions */
-        17 => array(
-            /* Unconditional WMMX/WMMX2 SIMD Instructions */
-            'tandcb','tandcbal',
-            'tandch','tandchal',
-            'tandcw','tandcwal',
-            'tbcstb','tbcstbal',
-            'tbcsth','tbcsthal',
-            'tbcstw','tbcstwal',
-            'textrcb','textrcbal',
-            'textrch','textrchal',
-            'textrcw','textrcwal',
-            'textrmsb','textrmsbal',
-            'textrmsh','textrmshal',
-            'textrmsw','textrmswal',
-            'textrmub','textrmubal',
-            'textrmuh','textrmuhal',
-            'textrmuw','textrmuwal',
-            'tinsrb','tinsrbal',
-            'tinsrh','tinsrhal',
-            'tinsrw','tinsrwal',
-            'tmcr','tmcral',
-            'tmcrr','tmcrral',
-            'tmia','tmiaal',
-            'tmiaph','tmiaphal',
-            'tmiabb','tmiabbal',
-            'tmiabt','tmiabtal',
-            'tmiatb','tmiatbal',
-            'tmiatt','tmiattal',
-            'tmovmskb','tmovmskbal',
-            'tmovmskh','tmovmskhal',
-            'tmovmskw','tmovmskwal',
-            'tmrc','tmrcal',
-            'tmrrc','tmrrcal',
-            'torcb','torcbal',
-            'torch','torchal',
-            'torcw','torcwal',
-            'torvscb','torvscbal',
-            'torvsch','torvschal',
-            'torvscw','torvscwal',
-            'wabsb','wabsbal',
-            'wabsh','wabshal',
-            'wabsw','wabswal',
-            'wabsdiffb','wabsdiffbal',
-            'wabsdiffh','wabsdiffhal',
-            'wabsdiffw','wabsdiffwal',
-            'waccb','waccbal',
-            'wacch','wacchal',
-            'waccw','waccwal',
-            'waddb','waddbal',
-            'waddh','waddhal',
-            'waddw','waddwal',
-            'waddbc','waddbcal',
-            'waddhc','waddhcal',
-            'waddwc','waddwcal',
-            'waddbss','waddbssal',
-            'waddhss','waddhssal',
-            'waddwss','waddwssal',
-            'waddbus','waddbusal',
-            'waddhus','waddhusal',
-            'waddwus','waddwusal',
-            'waddsubhx','waddsubhxal',
-            'waligni','walignial',
-            'walignr0','walignr0al',
-            'walignr1','walignr1al',
-            'walignr2','walignr2al',
-            'walignr3','walignr3al',
-            'wand','wandal',
-            'wandn','wandnal',
-            'wavg2b','wavg2bal',
-            'wavg2h','wavg2hal',
-            'wavg2br','wavg2bral',
-            'wavg2hr','wavg2hral',
-            'wavg4','wavg4al',
-            'wavg4r','wavg4ral',
-            'wcmpeqb','wcmpeqbal',
-            'wcmpeqh','wcmpeqhal',
-            'wcmpeqw','wcmpeqwal',
-            'wcmpgtsb','wcmpgtsbal',
-            'wcmpgtsh','wcmpgtshal',
-            'wcmpgtsw','wcmpgtswal',
-            'wcmpgtub','wcmpgtubal',
-            'wcmpgtuh','wcmpgtuhal',
-            'wcmpgtuw','wcmpgtuwal',
-            'wldrb','wldrbal',
-            'wldrh','wldrhal',
-            'wldrw','wldrwal',
-            'wldrd','wldrdal',
-            'wmacs','wmacsal',
-            'wmacu','wmacual',
-            'wmacsz','wmacszal',
-            'wmacuz','wmacuzal',
-            'wmadds','wmaddsal',
-            'wmaddu','wmaddual',
-            'wmaddsx','wmaddsxal',
-            'wmaddux','wmadduxal',
-            'wmaddsn','wmaddsnal',
-            'wmaddun','wmaddunal',
-            'wmaxsb','wmaxsbal',
-            'wmaxsh','wmaxshal',
-            'wmaxsw','wmaxswal',
-            'wmaxub','wmaxubal',
-            'wmaxuh','wmaxuhal',
-            'wmaxuw','wmaxuwal',
-            'wmerge','wmergeal',
-            'wmiabb','wmiabbal',
-            'wmiabt','wmiabtal',
-            'wmiatb','wmiatbal',
-            'wmiatt','wmiattal',
-            'wmiabbn','wmiabbnal',
-            'wmiabtn','wmiabtnal',
-            'wmiatbn','wmiatbnal',
-            'wmiattn','wmiattnal',
-            'wmiawbb','wmiawbbal',
-            'wmiawbt','wmiawbtal',
-            'wmiawtb','wmiawtbal',
-            'wmiawtt','wmiawttal',
-            'wmiawbbn','wmiawbbnal',
-            'wmiawbtn','wmiawbtnal',
-            'wmiawtbn','wmiawtbnal',
-            'wmiawttn','wmiawttnal',
-            'wminsb','wminsbal',
-            'wminsh','wminshal',
-            'wminsw','wminswal',
-            'wminub','wminubal',
-            'wminuh','wminuhal',
-            'wminuw','wminuwal',
-            'wmov','wmoval',
-            'wmulsm','wmulsmal',
-            'wmulsl','wmulslal',
-            'wmulum','wmulumal',
-            'wmulul','wmululal',
-            'wmulsmr','wmulsmral',
-            'wmulslr','wmulslral',
-            'wmulumr','wmulumral',
-            'wmululr','wmululral',
-            'wmulwum','wmulwumal',
-            'wmulwsm','wmulwsmal',
-            'wmulwl','wmulwlal',
-            'wmulwumr','wmulwumral',
-            'wmulwsmr','wmulwsmral',
-            'wor','woral',
-            'wpackhss','wpackhssal',
-            'wpackwss','wpackwssal',
-            'wpackdss','wpackdssal',
-            'wpackhus','wpackhusal',
-            'wpackwus','wpackwusal',
-            'wpackdus','wpackdusal',
-            'wqmiabb','wqmiabbal',
-            'wqmiabt','wqmiabtal',
-            'wqmiatb','wqmiatbal',
-            'wqmiatt','wqmiattal',
-            'wqmiabbn','wqmiabbnal',
-            'wqmiabtn','wqmiabtnal',
-            'wqmiatbn','wqmiatbnal',
-            'wqmiattn','wqmiattnal',
-            'wqmulm','wqmulmal',
-            'wqmulmr','wqmulmral',
-            'wqmulwm','wqmulwmal',
-            'wqmulwmr','wqmulwmral',
-            'wrorh','wrorhal',
-            'wrorw','wrorwal',
-            'wrord','wrordal',
-            'wrorhg','wrorhgal',
-            'wrorwg','wrorwgal',
-            'wrordg','wrordgal',
-            'wsadb','wsadbal',
-            'wsadh','wsadhal',
-            'wsadbz','wsadbzal',
-            'wsadhz','wsadhzal',
-            'wshufh','wshufhal',
-            'wsllh','wsllhal',
-            'wsllw','wsllwal',
-            'wslld','wslldal',
-            'wsllhg','wsllhgal',
-            'wsllwg','wsllwgal',
-            'wslldg','wslldgal',
-            'wsrah','wsrahal',
-            'wsraw','wsrawal',
-            'wsrad','wsradal',
-            'wsrahg','wsrahgal',
-            'wsrawg','wsrawgal',
-            'wsradg','wsradgal',
-            'wsrlh','wsrlhal',
-            'wsrlw','wsrlwal',
-            'wsrld','wsrldal',
-            'wsrlhg','wsrlhgal',
-            'wsrlwg','wsrlwgal',
-            'wsrldg','wsrldgal',
-            'wstrb','wstrbal',
-            'wstrh','wstrhal',
-            'wstrw','wstrwal',
-            'wstrd','wstrdal',
-            'wsubb','wsubbal',
-            'wsubh','wsubhal',
-            'wsubw','wsubwal',
-            'wsubbss','wsubbssal',
-            'wsubhss','wsubhssal',
-            'wsubwss','wsubwssal',
-            'wsubbus','wsubbusal',
-            'wsubhus','wsubhusal',
-            'wsubwus','wsubwusal',
-            'wsubaddhx','wsubaddhxal',
-            'wunpckehsb','wunpckehsbal',
-            'wunpckehsh','wunpckehshal',
-            'wunpckehsw','wunpckehswal',
-            'wunpckehub','wunpckehubal',
-            'wunpckehuh','wunpckehuhal',
-            'wunpckehuw','wunpckehuwal',
-            'wunpckihb','wunpckihbal',
-            'wunpckihh','wunpckihhal',
-            'wunpckihw','wunpckihwal',
-            'wunpckelsb','wunpckelsbal',
-            'wunpckelsh','wunpckelshal',
-            'wunpckelsw','wunpckelswal',
-            'wunpckelub','wunpckelubal',
-            'wunpckeluh','wunpckeluhal',
-            'wunpckeluw','wunpckeluwal',
-            'wunpckilb','wunpckilbal',
-            'wunpckilh','wunpckilhal',
-            'wunpckilw','wunpckilwal',
-            'wxor','wxoral',
-            'wzero','wzeroal'
-            ),
-        /* Conditional WMMX/WMMX2 SIMD Instructions */
-        18 => array(
-            /* Conditional WMMX/WMMX2 SIMD Instructions */
-            'tandcbeq','tandcbne','tandcbcs','tandcbhs','tandcbcc','tandcblo','tandcbmi','tandcbpl','tandcbvs','tandcbvc','tandcbhi','tandcbls','tandcbge','tandcblt','tandcbgt','tandcble',
-            'tandcheq','tandchne','tandchcs','tandchhs','tandchcc','tandchlo','tandchmi','tandchpl','tandchvs','tandchvc','tandchhi','tandchls','tandchge','tandchlt','tandchgt','tandchle',
-            'tandcweq','tandcwne','tandcwcs','tandcwhs','tandcwcc','tandcwlo','tandcwmi','tandcwpl','tandcwvs','tandcwvc','tandcwhi','tandcwls','tandcwge','tandcwlt','tandcwgt','tandcwle',
-            'tbcstbeq','tbcstbne','tbcstbcs','tbcstbhs','tbcstbcc','tbcstblo','tbcstbmi','tbcstbpl','tbcstbvs','tbcstbvc','tbcstbhi','tbcstbls','tbcstbge','tbcstblt','tbcstbgt','tbcstble',
-            'tbcstheq','tbcsthne','tbcsthcs','tbcsthhs','tbcsthcc','tbcsthlo','tbcsthmi','tbcsthpl','tbcsthvs','tbcsthvc','tbcsthhi','tbcsthls','tbcsthge','tbcsthlt','tbcsthgt','tbcsthle',
-            'tbcstweq','tbcstwne','tbcstwcs','tbcstwhs','tbcstwcc','tbcstwlo','tbcstwmi','tbcstwpl','tbcstwvs','tbcstwvc','tbcstwhi','tbcstwls','tbcstwge','tbcstwlt','tbcstwgt','tbcstwle',
-            'textrcbeq','textrcbne','textrcbcs','textrcbhs','textrcbcc','textrcblo','textrcbmi','textrcbpl','textrcbvs','textrcbvc','textrcbhi','textrcbls','textrcbge','textrcblt','textrcbgt','textrcble',
-            'textrcheq','textrchne','textrchcs','textrchhs','textrchcc','textrchlo','textrchmi','textrchpl','textrchvs','textrchvc','textrchhi','textrchls','textrchge','textrchlt','textrchgt','textrchle',
-            'textrcweq','textrcwne','textrcwcs','textrcwhs','textrcwcc','textrcwlo','textrcwmi','textrcwpl','textrcwvs','textrcwvc','textrcwhi','textrcwls','textrcwge','textrcwlt','textrcwgt','textrcwle',
-            'textrmsbeq','textrmsbne','textrmsbcs','textrmsbhs','textrmsbcc','textrmsblo','textrmsbmi','textrmsbpl','textrmsbvs','textrmsbvc','textrmsbhi','textrmsbls','textrmsbge','textrmsblt','textrmsbgt','textrmsble',
-            'textrmsheq','textrmshne','textrmshcs','textrmshhs','textrmshcc','textrmshlo','textrmshmi','textrmshpl','textrmshvs','textrmshvc','textrmshhi','textrmshls','textrmshge','textrmshlt','textrmshgt','textrmshle',
-            'textrmsweq','textrmswne','textrmswcs','textrmswhs','textrmswcc','textrmswlo','textrmswmi','textrmswpl','textrmswvs','textrmswvc','textrmswhi','textrmswls','textrmswge','textrmswlt','textrmswgt','textrmswle',
-            'textrmubeq','textrmubne','textrmubcs','textrmubhs','textrmubcc','textrmublo','textrmubmi','textrmubpl','textrmubvs','textrmubvc','textrmubhi','textrmubls','textrmubge','textrmublt','textrmubgt','textrmuble',
-            'textrmuheq','textrmuhne','textrmuhcs','textrmuhhs','textrmuhcc','textrmuhlo','textrmuhmi','textrmuhpl','textrmuhvs','textrmuhvc','textrmuhhi','textrmuhls','textrmuhge','textrmuhlt','textrmuhgt','textrmuhle',
-            'textrmuweq','textrmuwne','textrmuwcs','textrmuwhs','textrmuwcc','textrmuwlo','textrmuwmi','textrmuwpl','textrmuwvs','textrmuwvc','textrmuwhi','textrmuwls','textrmuwge','textrmuwlt','textrmuwgt','textrmuwle',
-            'tinsrbeq','tinsrbne','tinsrbcs','tinsrbhs','tinsrbcc','tinsrblo','tinsrbmi','tinsrbpl','tinsrbvs','tinsrbvc','tinsrbhi','tinsrbls','tinsrbge','tinsrblt','tinsrbgt','tinsrble',
-            'tinsrheq','tinsrhne','tinsrhcs','tinsrhhs','tinsrhcc','tinsrhlo','tinsrhmi','tinsrhpl','tinsrhvs','tinsrhvc','tinsrhhi','tinsrhls','tinsrhge','tinsrhlt','tinsrhgt','tinsrhle',
-            'tinsrweq','tinsrwne','tinsrwcs','tinsrwhs','tinsrwcc','tinsrwlo','tinsrwmi','tinsrwpl','tinsrwvs','tinsrwvc','tinsrwhi','tinsrwls','tinsrwge','tinsrwlt','tinsrwgt','tinsrwle',
-            'tmcreq','tmcrne','tmcrcs','tmcrhs','tmcrcc','tmcrlo','tmcrmi','tmcrpl','tmcrvs','tmcrvc','tmcrhi','tmcrls','tmcrge','tmcrlt','tmcrgt','tmcrle',
-            'tmcrreq','tmcrrne','tmcrrcs','tmcrrhs','tmcrrcc','tmcrrlo','tmcrrmi','tmcrrpl','tmcrrvs','tmcrrvc','tmcrrhi','tmcrrls','tmcrrge','tmcrrlt','tmcrrgt','tmcrrle',
-            'tmiaeq','tmiane','tmiacs','tmiahs','tmiacc','tmialo','tmiami','tmiapl','tmiavs','tmiavc','tmiahi','tmials','tmiage','tmialt','tmiagt','tmiale',
-            'tmiapheq','tmiaphne','tmiaphcs','tmiaphhs','tmiaphcc','tmiaphlo','tmiaphmi','tmiaphpl','tmiaphvs','tmiaphvc','tmiaphhi','tmiaphls','tmiaphge','tmiaphlt','tmiaphgt','tmiaphle',
-            'tmiabbeq','tmiabbne','tmiabbcs','tmiabbhs','tmiabbcc','tmiabblo','tmiabbmi','tmiabbpl','tmiabbvs','tmiabbvc','tmiabbhi','tmiabbls','tmiabbge','tmiabblt','tmiabbgt','tmiabble',
-            'tmiabteq','tmiabtne','tmiabtcs','tmiabths','tmiabtcc','tmiabtlo','tmiabtmi','tmiabtpl','tmiabtvs','tmiabtvc','tmiabthi','tmiabtls','tmiabtge','tmiabtlt','tmiabtgt','tmiabtle',
-            'tmiatbeq','tmiatbne','tmiatbcs','tmiatbhs','tmiatbcc','tmiatblo','tmiatbmi','tmiatbpl','tmiatbvs','tmiatbvc','tmiatbhi','tmiatbls','tmiatbge','tmiatblt','tmiatbgt','tmiatble',
-            'tmiatteq','tmiattne','tmiattcs','tmiatths','tmiattcc','tmiattlo','tmiattmi','tmiattpl','tmiattvs','tmiattvc','tmiatthi','tmiattls','tmiattge','tmiattlt','tmiattgt','tmiattle',
-            'tmovmskbeq','tmovmskbne','tmovmskbcs','tmovmskbhs','tmovmskbcc','tmovmskblo','tmovmskbmi','tmovmskbpl','tmovmskbvs','tmovmskbvc','tmovmskbhi','tmovmskbls','tmovmskbge','tmovmskblt','tmovmskbgt','tmovmskble',
-            'tmovmskheq','tmovmskhne','tmovmskhcs','tmovmskhhs','tmovmskhcc','tmovmskhlo','tmovmskhmi','tmovmskhpl','tmovmskhvs','tmovmskhvc','tmovmskhhi','tmovmskhls','tmovmskhge','tmovmskhlt','tmovmskhgt','tmovmskhle',
-            'tmovmskweq','tmovmskwne','tmovmskwcs','tmovmskwhs','tmovmskwcc','tmovmskwlo','tmovmskwmi','tmovmskwpl','tmovmskwvs','tmovmskwvc','tmovmskwhi','tmovmskwls','tmovmskwge','tmovmskwlt','tmovmskwgt','tmovmskwle',
-            'tmrceq','tmrcne','tmrccs','tmrchs','tmrccc','tmrclo','tmrcmi','tmrcpl','tmrcvs','tmrcvc','tmrchi','tmrcls','tmrcge','tmrclt','tmrcgt','tmrcle',
-            'tmrrceq','tmrrcne','tmrrccs','tmrrchs','tmrrccc','tmrrclo','tmrrcmi','tmrrcpl','tmrrcvs','tmrrcvc','tmrrchi','tmrrcls','tmrrcge','tmrrclt','tmrrcgt','tmrrcle',
-            'torcbeq','torcbne','torcbcs','torcbhs','torcbcc','torcblo','torcbmi','torcbpl','torcbvs','torcbvc','torcbhi','torcbls','torcbge','torcblt','torcbgt','torcble',
-            'torcheq','torchne','torchcs','torchhs','torchcc','torchlo','torchmi','torchpl','torchvs','torchvc','torchhi','torchls','torchge','torchlt','torchgt','torchle',
-            'torcweq','torcwne','torcwcs','torcwhs','torcwcc','torcwlo','torcwmi','torcwpl','torcwvs','torcwvc','torcwhi','torcwls','torcwge','torcwlt','torcwgt','torcwle',
-            'torvscbeq','torvscbne','torvscbcs','torvscbhs','torvscbcc','torvscblo','torvscbmi','torvscbpl','torvscbvs','torvscbvc','torvscbhi','torvscbls','torvscbge','torvscblt','torvscbgt','torvscble',
-            'torvscheq','torvschne','torvschcs','torvschhs','torvschcc','torvschlo','torvschmi','torvschpl','torvschvs','torvschvc','torvschhi','torvschls','torvschge','torvschlt','torvschgt','torvschle',
-            'torvscweq','torvscwne','torvscwcs','torvscwhs','torvscwcc','torvscwlo','torvscwmi','torvscwpl','torvscwvs','torvscwvc','torvscwhi','torvscwls','torvscwge','torvscwlt','torvscwgt','torvscwle',
-            'wabsbeq','wabsbne','wabsbcs','wabsbhs','wabsbcc','wabsblo','wabsbmi','wabsbpl','wabsbvs','wabsbvc','wabsbhi','wabsbls','wabsbge','wabsblt','wabsbgt','wabsble',
-            'wabsheq','wabshne','wabshcs','wabshhs','wabshcc','wabshlo','wabshmi','wabshpl','wabshvs','wabshvc','wabshhi','wabshls','wabshge','wabshlt','wabshgt','wabshle',
-            'wabsweq','wabswne','wabswcs','wabswhs','wabswcc','wabswlo','wabswmi','wabswpl','wabswvs','wabswvc','wabswhi','wabswls','wabswge','wabswlt','wabswgt','wabswle',
-            'wabsdiffbeq','wabsdiffbne','wabsdiffbcs','wabsdiffbhs','wabsdiffbcc','wabsdiffblo','wabsdiffbmi','wabsdiffbpl','wabsdiffbvs','wabsdiffbvc','wabsdiffbhi','wabsdiffbls','wabsdiffbge','wabsdiffblt','wabsdiffbgt','wabsdiffble',
-            'wabsdiffheq','wabsdiffhne','wabsdiffhcs','wabsdiffhhs','wabsdiffhcc','wabsdiffhlo','wabsdiffhmi','wabsdiffhpl','wabsdiffhvs','wabsdiffhvc','wabsdiffhhi','wabsdiffhls','wabsdiffhge','wabsdiffhlt','wabsdiffhgt','wabsdiffhle',
-            'wabsdiffweq','wabsdiffwne','wabsdiffwcs','wabsdiffwhs','wabsdiffwcc','wabsdiffwlo','wabsdiffwmi','wabsdiffwpl','wabsdiffwvs','wabsdiffwvc','wabsdiffwhi','wabsdiffwls','wabsdiffwge','wabsdiffwlt','wabsdiffwgt','wabsdiffwle',
-            'waccbeq','waccbne','waccbcs','waccbhs','waccbcc','waccblo','waccbmi','waccbpl','waccbvs','waccbvc','waccbhi','waccbls','waccbge','waccblt','waccbgt','waccble',
-            'waccheq','wacchne','wacchcs','wacchhs','wacchcc','wacchlo','wacchmi','wacchpl','wacchvs','wacchvc','wacchhi','wacchls','wacchge','wacchlt','wacchgt','wacchle',
-            'waccweq','waccwne','waccwcs','waccwhs','waccwcc','waccwlo','waccwmi','waccwpl','waccwvs','waccwvc','waccwhi','waccwls','waccwge','waccwlt','waccwgt','waccwle',
-            'waddbeq','waddbne','waddbcs','waddbhs','waddbcc','waddblo','waddbmi','waddbpl','waddbvs','waddbvc','waddbhi','waddbls','waddbge','waddblt','waddbgt','waddble',
-            'waddheq','waddhne','waddhcs','waddhhs','waddhcc','waddhlo','waddhmi','waddhpl','waddhvs','waddhvc','waddhhi','waddhls','waddhge','waddhlt','waddhgt','waddhle',
-            'waddweq','waddwne','waddwcs','waddwhs','waddwcc','waddwlo','waddwmi','waddwpl','waddwvs','waddwvc','waddwhi','waddwls','waddwge','waddwlt','waddwgt','waddwle',
-            'waddbceq','waddbcne','waddbccs','waddbchs','waddbccc','waddbclo','waddbcmi','waddbcpl','waddbcvs','waddbcvc','waddbchi','waddbcls','waddbcge','waddbclt','waddbcgt','waddbcle',
-            'waddhceq','waddhcne','waddhccs','waddhchs','waddhccc','waddhclo','waddhcmi','waddhcpl','waddhcvs','waddhcvc','waddhchi','waddhcls','waddhcge','waddhclt','waddhcgt','waddhcle',
-            'waddwceq','waddwcne','waddwccs','waddwchs','waddwccc','waddwclo','waddwcmi','waddwcpl','waddwcvs','waddwcvc','waddwchi','waddwcls','waddwcge','waddwclt','waddwcgt','waddwcle',
-            'waddbsseq','waddbssne','waddbsscs','waddbsshs','waddbsscc','waddbsslo','waddbssmi','waddbsspl','waddbssvs','waddbssvc','waddbsshi','waddbssls','waddbssge','waddbsslt','waddbssgt','waddbssle',
-            'waddhsseq','waddhssne','waddhsscs','waddhsshs','waddhsscc','waddhsslo','waddhssmi','waddhsspl','waddhssvs','waddhssvc','waddhsshi','waddhssls','waddhssge','waddhsslt','waddhssgt','waddhssle',
-            'waddwsseq','waddwssne','waddwsscs','waddwsshs','waddwsscc','waddwsslo','waddwssmi','waddwsspl','waddwssvs','waddwssvc','waddwsshi','waddwssls','waddwssge','waddwsslt','waddwssgt','waddwssle',
-            'waddbuseq','waddbusne','waddbuscs','waddbushs','waddbuscc','waddbuslo','waddbusmi','waddbuspl','waddbusvs','waddbusvc','waddbushi','waddbusls','waddbusge','waddbuslt','waddbusgt','waddbusle',
-            'waddhuseq','waddhusne','waddhuscs','waddhushs','waddhuscc','waddhuslo','waddhusmi','waddhuspl','waddhusvs','waddhusvc','waddhushi','waddhusls','waddhusge','waddhuslt','waddhusgt','waddhusle',
-            'waddwuseq','waddwusne','waddwuscs','waddwushs','waddwuscc','waddwuslo','waddwusmi','waddwuspl','waddwusvs','waddwusvc','waddwushi','waddwusls','waddwusge','waddwuslt','waddwusgt','waddwusle',
-            'waddsubhxeq','waddsubhxne','waddsubhxcs','waddsubhxhs','waddsubhxcc','waddsubhxlo','waddsubhxmi','waddsubhxpl','waddsubhxvs','waddsubhxvc','waddsubhxhi','waddsubhxls','waddsubhxge','waddsubhxlt','waddsubhxgt','waddsubhxle',
-            'walignieq','walignine','walignics','walignihs','walignicc','walignilo','walignimi','walignipl','walignivs','walignivc','walignihi','walignils','walignige','walignilt','walignigt','walignile',
-            'walignr0eq','walignr0ne','walignr0cs','walignr0hs','walignr0cc','walignr0lo','walignr0mi','walignr0pl','walignr0vs','walignr0vc','walignr0hi','walignr0ls','walignr0ge','walignr0lt','walignr0gt','walignr0le',
-            'walignr1eq','walignr1ne','walignr1cs','walignr1hs','walignr1cc','walignr1lo','walignr1mi','walignr1pl','walignr1vs','walignr1vc','walignr1hi','walignr1ls','walignr1ge','walignr1lt','walignr1gt','walignr1le',
-            'walignr2eq','walignr2ne','walignr2cs','walignr2hs','walignr2cc','walignr2lo','walignr2mi','walignr2pl','walignr2vs','walignr2vc','walignr2hi','walignr2ls','walignr2ge','walignr2lt','walignr2gt','walignr2le',
-            'walignr3eq','walignr3ne','walignr3cs','walignr3hs','walignr3cc','walignr3lo','walignr3mi','walignr3pl','walignr3vs','walignr3vc','walignr3hi','walignr3ls','walignr3ge','walignr3lt','walignr3gt','walignr3le',
-            'wandeq','wandne','wandcs','wandhs','wandcc','wandlo','wandmi','wandpl','wandvs','wandvc','wandhi','wandls','wandge','wandlt','wandgt','wandle',
-            'wandneq','wandnne','wandncs','wandnhs','wandncc','wandnlo','wandnmi','wandnpl','wandnvs','wandnvc','wandnhi','wandnls','wandnge','wandnlt','wandngt','wandnle',
-            'wavg2beq','wavg2bne','wavg2bcs','wavg2bhs','wavg2bcc','wavg2blo','wavg2bmi','wavg2bpl','wavg2bvs','wavg2bvc','wavg2bhi','wavg2bls','wavg2bge','wavg2blt','wavg2bgt','wavg2ble',
-            'wavg2heq','wavg2hne','wavg2hcs','wavg2hhs','wavg2hcc','wavg2hlo','wavg2hmi','wavg2hpl','wavg2hvs','wavg2hvc','wavg2hhi','wavg2hls','wavg2hge','wavg2hlt','wavg2hgt','wavg2hle',
-            'wavg2breq','wavg2brne','wavg2brcs','wavg2brhs','wavg2brcc','wavg2brlo','wavg2brmi','wavg2brpl','wavg2brvs','wavg2brvc','wavg2brhi','wavg2brls','wavg2brge','wavg2brlt','wavg2brgt','wavg2brle',
-            'wavg2hreq','wavg2hrne','wavg2hrcs','wavg2hrhs','wavg2hrcc','wavg2hrlo','wavg2hrmi','wavg2hrpl','wavg2hrvs','wavg2hrvc','wavg2hrhi','wavg2hrls','wavg2hrge','wavg2hrlt','wavg2hrgt','wavg2hrle',
-            'wavg4eq','wavg4ne','wavg4cs','wavg4hs','wavg4cc','wavg4lo','wavg4mi','wavg4pl','wavg4vs','wavg4vc','wavg4hi','wavg4ls','wavg4ge','wavg4lt','wavg4gt','wavg4le',
-            'wavg4req','wavg4rne','wavg4rcs','wavg4rhs','wavg4rcc','wavg4rlo','wavg4rmi','wavg4rpl','wavg4rvs','wavg4rvc','wavg4rhi','wavg4rls','wavg4rge','wavg4rlt','wavg4rgt','wavg4rle',
-            'wcmpeqbeq','wcmpeqbne','wcmpeqbcs','wcmpeqbhs','wcmpeqbcc','wcmpeqblo','wcmpeqbmi','wcmpeqbpl','wcmpeqbvs','wcmpeqbvc','wcmpeqbhi','wcmpeqbls','wcmpeqbge','wcmpeqblt','wcmpeqbgt','wcmpeqble',
-            'wcmpeqheq','wcmpeqhne','wcmpeqhcs','wcmpeqhhs','wcmpeqhcc','wcmpeqhlo','wcmpeqhmi','wcmpeqhpl','wcmpeqhvs','wcmpeqhvc','wcmpeqhhi','wcmpeqhls','wcmpeqhge','wcmpeqhlt','wcmpeqhgt','wcmpeqhle',
-            'wcmpeqweq','wcmpeqwne','wcmpeqwcs','wcmpeqwhs','wcmpeqwcc','wcmpeqwlo','wcmpeqwmi','wcmpeqwpl','wcmpeqwvs','wcmpeqwvc','wcmpeqwhi','wcmpeqwls','wcmpeqwge','wcmpeqwlt','wcmpeqwgt','wcmpeqwle',
-            'wcmpgtsbeq','wcmpgtsbne','wcmpgtsbcs','wcmpgtsbhs','wcmpgtsbcc','wcmpgtsblo','wcmpgtsbmi','wcmpgtsbpl','wcmpgtsbvs','wcmpgtsbvc','wcmpgtsbhi','wcmpgtsbls','wcmpgtsbge','wcmpgtsblt','wcmpgtsbgt','wcmpgtsble',
-            'wcmpgtsheq','wcmpgtshne','wcmpgtshcs','wcmpgtshhs','wcmpgtshcc','wcmpgtshlo','wcmpgtshmi','wcmpgtshpl','wcmpgtshvs','wcmpgtshvc','wcmpgtshhi','wcmpgtshls','wcmpgtshge','wcmpgtshlt','wcmpgtshgt','wcmpgtshle',
-            'wcmpgtsweq','wcmpgtswne','wcmpgtswcs','wcmpgtswhs','wcmpgtswcc','wcmpgtswlo','wcmpgtswmi','wcmpgtswpl','wcmpgtswvs','wcmpgtswvc','wcmpgtswhi','wcmpgtswls','wcmpgtswge','wcmpgtswlt','wcmpgtswgt','wcmpgtswle',
-            'wcmpgtubeq','wcmpgtubne','wcmpgtubcs','wcmpgtubhs','wcmpgtubcc','wcmpgtublo','wcmpgtubmi','wcmpgtubpl','wcmpgtubvs','wcmpgtubvc','wcmpgtubhi','wcmpgtubls','wcmpgtubge','wcmpgtublt','wcmpgtubgt','wcmpgtuble',
-            'wcmpgtuheq','wcmpgtuhne','wcmpgtuhcs','wcmpgtuhhs','wcmpgtuhcc','wcmpgtuhlo','wcmpgtuhmi','wcmpgtuhpl','wcmpgtuhvs','wcmpgtuhvc','wcmpgtuhhi','wcmpgtuhls','wcmpgtuhge','wcmpgtuhlt','wcmpgtuhgt','wcmpgtuhle',
-            'wcmpgtuweq','wcmpgtuwne','wcmpgtuwcs','wcmpgtuwhs','wcmpgtuwcc','wcmpgtuwlo','wcmpgtuwmi','wcmpgtuwpl','wcmpgtuwvs','wcmpgtuwvc','wcmpgtuwhi','wcmpgtuwls','wcmpgtuwge','wcmpgtuwlt','wcmpgtuwgt','wcmpgtuwle',
-            'wldrbeq','wldrbne','wldrbcs','wldrbhs','wldrbcc','wldrblo','wldrbmi','wldrbpl','wldrbvs','wldrbvc','wldrbhi','wldrbls','wldrbge','wldrblt','wldrbgt','wldrble',
-            'wldrheq','wldrhne','wldrhcs','wldrhhs','wldrhcc','wldrhlo','wldrhmi','wldrhpl','wldrhvs','wldrhvc','wldrhhi','wldrhls','wldrhge','wldrhlt','wldrhgt','wldrhle',
-            'wldrweq','wldrwne','wldrwcs','wldrwhs','wldrwcc','wldrwlo','wldrwmi','wldrwpl','wldrwvs','wldrwvc','wldrwhi','wldrwls','wldrwge','wldrwlt','wldrwgt','wldrwle',
-            'wldrdeq','wldrdne','wldrdcs','wldrdhs','wldrdcc','wldrdlo','wldrdmi','wldrdpl','wldrdvs','wldrdvc','wldrdhi','wldrdls','wldrdge','wldrdlt','wldrdgt','wldrdle',
-            'wmacseq','wmacsne','wmacscs','wmacshs','wmacscc','wmacslo','wmacsmi','wmacspl','wmacsvs','wmacsvc','wmacshi','wmacsls','wmacsge','wmacslt','wmacsgt','wmacsle',
-            'wmacueq','wmacune','wmacucs','wmacuhs','wmacucc','wmaculo','wmacumi','wmacupl','wmacuvs','wmacuvc','wmacuhi','wmaculs','wmacuge','wmacult','wmacugt','wmacule',
-            'wmacszeq','wmacszne','wmacszcs','wmacszhs','wmacszcc','wmacszlo','wmacszmi','wmacszpl','wmacszvs','wmacszvc','wmacszhi','wmacszls','wmacszge','wmacszlt','wmacszgt','wmacszle',
-            'wmacuzeq','wmacuzne','wmacuzcs','wmacuzhs','wmacuzcc','wmacuzlo','wmacuzmi','wmacuzpl','wmacuzvs','wmacuzvc','wmacuzhi','wmacuzls','wmacuzge','wmacuzlt','wmacuzgt','wmacuzle',
-            'wmaddseq','wmaddsne','wmaddscs','wmaddshs','wmaddscc','wmaddslo','wmaddsmi','wmaddspl','wmaddsvs','wmaddsvc','wmaddshi','wmaddsls','wmaddsge','wmaddslt','wmaddsgt','wmaddsle',
-            'wmaddueq','wmaddune','wmadducs','wmadduhs','wmadducc','wmaddulo','wmaddumi','wmaddupl','wmadduvs','wmadduvc','wmadduhi','wmadduls','wmadduge','wmaddult','wmaddugt','wmaddule',
-            'wmaddsxeq','wmaddsxne','wmaddsxcs','wmaddsxhs','wmaddsxcc','wmaddsxlo','wmaddsxmi','wmaddsxpl','wmaddsxvs','wmaddsxvc','wmaddsxhi','wmaddsxls','wmaddsxge','wmaddsxlt','wmaddsxgt','wmaddsxle',
-            'wmadduxeq','wmadduxne','wmadduxcs','wmadduxhs','wmadduxcc','wmadduxlo','wmadduxmi','wmadduxpl','wmadduxvs','wmadduxvc','wmadduxhi','wmadduxls','wmadduxge','wmadduxlt','wmadduxgt','wmadduxle',
-            'wmaddsneq','wmaddsnne','wmaddsncs','wmaddsnhs','wmaddsncc','wmaddsnlo','wmaddsnmi','wmaddsnpl','wmaddsnvs','wmaddsnvc','wmaddsnhi','wmaddsnls','wmaddsnge','wmaddsnlt','wmaddsngt','wmaddsnle',
-            'wmadduneq','wmaddunne','wmadduncs','wmaddunhs','wmadduncc','wmaddunlo','wmaddunmi','wmaddunpl','wmaddunvs','wmaddunvc','wmaddunhi','wmaddunls','wmaddunge','wmaddunlt','wmaddungt','wmaddunle',
-            'wmaxsbeq','wmaxsbne','wmaxsbcs','wmaxsbhs','wmaxsbcc','wmaxsblo','wmaxsbmi','wmaxsbpl','wmaxsbvs','wmaxsbvc','wmaxsbhi','wmaxsbls','wmaxsbge','wmaxsblt','wmaxsbgt','wmaxsble',
-            'wmaxsheq','wmaxshne','wmaxshcs','wmaxshhs','wmaxshcc','wmaxshlo','wmaxshmi','wmaxshpl','wmaxshvs','wmaxshvc','wmaxshhi','wmaxshls','wmaxshge','wmaxshlt','wmaxshgt','wmaxshle',
-            'wmaxsweq','wmaxswne','wmaxswcs','wmaxswhs','wmaxswcc','wmaxswlo','wmaxswmi','wmaxswpl','wmaxswvs','wmaxswvc','wmaxswhi','wmaxswls','wmaxswge','wmaxswlt','wmaxswgt','wmaxswle',
-            'wmaxubeq','wmaxubne','wmaxubcs','wmaxubhs','wmaxubcc','wmaxublo','wmaxubmi','wmaxubpl','wmaxubvs','wmaxubvc','wmaxubhi','wmaxubls','wmaxubge','wmaxublt','wmaxubgt','wmaxuble',
-            'wmaxuheq','wmaxuhne','wmaxuhcs','wmaxuhhs','wmaxuhcc','wmaxuhlo','wmaxuhmi','wmaxuhpl','wmaxuhvs','wmaxuhvc','wmaxuhhi','wmaxuhls','wmaxuhge','wmaxuhlt','wmaxuhgt','wmaxuhle',
-            'wmaxuweq','wmaxuwne','wmaxuwcs','wmaxuwhs','wmaxuwcc','wmaxuwlo','wmaxuwmi','wmaxuwpl','wmaxuwvs','wmaxuwvc','wmaxuwhi','wmaxuwls','wmaxuwge','wmaxuwlt','wmaxuwgt','wmaxuwle',
-            'wmergeeq','wmergene','wmergecs','wmergehs','wmergecc','wmergelo','wmergemi','wmergepl','wmergevs','wmergevc','wmergehi','wmergels','wmergege','wmergelt','wmergegt','wmergele',
-            'wmiabbeq','wmiabbne','wmiabbcs','wmiabbhs','wmiabbcc','wmiabblo','wmiabbmi','wmiabbpl','wmiabbvs','wmiabbvc','wmiabbhi','wmiabbls','wmiabbge','wmiabblt','wmiabbgt','wmiabble',
-            'wmiabteq','wmiabtne','wmiabtcs','wmiabths','wmiabtcc','wmiabtlo','wmiabtmi','wmiabtpl','wmiabtvs','wmiabtvc','wmiabthi','wmiabtls','wmiabtge','wmiabtlt','wmiabtgt','wmiabtle',
-            'wmiatbeq','wmiatbne','wmiatbcs','wmiatbhs','wmiatbcc','wmiatblo','wmiatbmi','wmiatbpl','wmiatbvs','wmiatbvc','wmiatbhi','wmiatbls','wmiatbge','wmiatblt','wmiatbgt','wmiatble',
-            'wmiatteq','wmiattne','wmiattcs','wmiatths','wmiattcc','wmiattlo','wmiattmi','wmiattpl','wmiattvs','wmiattvc','wmiatthi','wmiattls','wmiattge','wmiattlt','wmiattgt','wmiattle',
-            'wmiabbneq','wmiabbnne','wmiabbncs','wmiabbnhs','wmiabbncc','wmiabbnlo','wmiabbnmi','wmiabbnpl','wmiabbnvs','wmiabbnvc','wmiabbnhi','wmiabbnls','wmiabbnge','wmiabbnlt','wmiabbngt','wmiabbnle',
-            'wmiabtneq','wmiabtnne','wmiabtncs','wmiabtnhs','wmiabtncc','wmiabtnlo','wmiabtnmi','wmiabtnpl','wmiabtnvs','wmiabtnvc','wmiabtnhi','wmiabtnls','wmiabtnge','wmiabtnlt','wmiabtngt','wmiabtnle',
-            'wmiatbneq','wmiatbnne','wmiatbncs','wmiatbnhs','wmiatbncc','wmiatbnlo','wmiatbnmi','wmiatbnpl','wmiatbnvs','wmiatbnvc','wmiatbnhi','wmiatbnls','wmiatbnge','wmiatbnlt','wmiatbngt','wmiatbnle',
-            'wmiattneq','wmiattnne','wmiattncs','wmiattnhs','wmiattncc','wmiattnlo','wmiattnmi','wmiattnpl','wmiattnvs','wmiattnvc','wmiattnhi','wmiattnls','wmiattnge','wmiattnlt','wmiattngt','wmiattnle',
-            'wmiawbbeq','wmiawbbne','wmiawbbcs','wmiawbbhs','wmiawbbcc','wmiawbblo','wmiawbbmi','wmiawbbpl','wmiawbbvs','wmiawbbvc','wmiawbbhi','wmiawbbls','wmiawbbge','wmiawbblt','wmiawbbgt','wmiawbble',
-            'wmiawbteq','wmiawbtne','wmiawbtcs','wmiawbths','wmiawbtcc','wmiawbtlo','wmiawbtmi','wmiawbtpl','wmiawbtvs','wmiawbtvc','wmiawbthi','wmiawbtls','wmiawbtge','wmiawbtlt','wmiawbtgt','wmiawbtle',
-            'wmiawtbeq','wmiawtbne','wmiawtbcs','wmiawtbhs','wmiawtbcc','wmiawtblo','wmiawtbmi','wmiawtbpl','wmiawtbvs','wmiawtbvc','wmiawtbhi','wmiawtbls','wmiawtbge','wmiawtblt','wmiawtbgt','wmiawtble',
-            'wmiawtteq','wmiawttne','wmiawttcs','wmiawtths','wmiawttcc','wmiawttlo','wmiawttmi','wmiawttpl','wmiawttvs','wmiawttvc','wmiawtthi','wmiawttls','wmiawttge','wmiawttlt','wmiawttgt','wmiawttle',
-            'wmiawbbneq','wmiawbbnne','wmiawbbncs','wmiawbbnhs','wmiawbbncc','wmiawbbnlo','wmiawbbnmi','wmiawbbnpl','wmiawbbnvs','wmiawbbnvc','wmiawbbnhi','wmiawbbnls','wmiawbbnge','wmiawbbnlt','wmiawbbngt','wmiawbbnle',
-            'wmiawbtneq','wmiawbtnne','wmiawbtncs','wmiawbtnhs','wmiawbtncc','wmiawbtnlo','wmiawbtnmi','wmiawbtnpl','wmiawbtnvs','wmiawbtnvc','wmiawbtnhi','wmiawbtnls','wmiawbtnge','wmiawbtnlt','wmiawbtngt','wmiawbtnle',
-            'wmiawtbneq','wmiawtbnne','wmiawtbncs','wmiawtbnhs','wmiawtbncc','wmiawtbnlo','wmiawtbnmi','wmiawtbnpl','wmiawtbnvs','wmiawtbnvc','wmiawtbnhi','wmiawtbnls','wmiawtbnge','wmiawtbnlt','wmiawtbngt','wmiawtbnle',
-            'wmiawttneq','wmiawttnne','wmiawttncs','wmiawttnhs','wmiawttncc','wmiawttnlo','wmiawttnmi','wmiawttnpl','wmiawttnvs','wmiawttnvc','wmiawttnhi','wmiawttnls','wmiawttnge','wmiawttnlt','wmiawttngt','wmiawttnle',
-            'wminsbeq','wminsbne','wminsbcs','wminsbhs','wminsbcc','wminsblo','wminsbmi','wminsbpl','wminsbvs','wminsbvc','wminsbhi','wminsbls','wminsbge','wminsblt','wminsbgt','wminsble',
-            'wminsheq','wminshne','wminshcs','wminshhs','wminshcc','wminshlo','wminshmi','wminshpl','wminshvs','wminshvc','wminshhi','wminshls','wminshge','wminshlt','wminshgt','wminshle',
-            'wminsweq','wminswne','wminswcs','wminswhs','wminswcc','wminswlo','wminswmi','wminswpl','wminswvs','wminswvc','wminswhi','wminswls','wminswge','wminswlt','wminswgt','wminswle',
-            'wminubeq','wminubne','wminubcs','wminubhs','wminubcc','wminublo','wminubmi','wminubpl','wminubvs','wminubvc','wminubhi','wminubls','wminubge','wminublt','wminubgt','wminuble',
-            'wminuheq','wminuhne','wminuhcs','wminuhhs','wminuhcc','wminuhlo','wminuhmi','wminuhpl','wminuhvs','wminuhvc','wminuhhi','wminuhls','wminuhge','wminuhlt','wminuhgt','wminuhle',
-            'wminuweq','wminuwne','wminuwcs','wminuwhs','wminuwcc','wminuwlo','wminuwmi','wminuwpl','wminuwvs','wminuwvc','wminuwhi','wminuwls','wminuwge','wminuwlt','wminuwgt','wminuwle',
-            'wmoveq','wmovne','wmovcs','wmovhs','wmovcc','wmovlo','wmovmi','wmovpl','wmovvs','wmovvc','wmovhi','wmovls','wmovge','wmovlt','wmovgt','wmovle',
-            'wmulsmeq','wmulsmne','wmulsmcs','wmulsmhs','wmulsmcc','wmulsmlo','wmulsmmi','wmulsmpl','wmulsmvs','wmulsmvc','wmulsmhi','wmulsmls','wmulsmge','wmulsmlt','wmulsmgt','wmulsmle',
-            'wmulsleq','wmulslne','wmulslcs','wmulslhs','wmulslcc','wmulsllo','wmulslmi','wmulslpl','wmulslvs','wmulslvc','wmulslhi','wmulslls','wmulslge','wmulsllt','wmulslgt','wmulslle',
-            'wmulumeq','wmulumne','wmulumcs','wmulumhs','wmulumcc','wmulumlo','wmulummi','wmulumpl','wmulumvs','wmulumvc','wmulumhi','wmulumls','wmulumge','wmulumlt','wmulumgt','wmulumle',
-            'wmululeq','wmululne','wmululcs','wmululhs','wmululcc','wmulullo','wmululmi','wmululpl','wmululvs','wmululvc','wmululhi','wmululls','wmululge','wmulullt','wmululgt','wmululle',
-            'wmulsmreq','wmulsmrne','wmulsmrcs','wmulsmrhs','wmulsmrcc','wmulsmrlo','wmulsmrmi','wmulsmrpl','wmulsmrvs','wmulsmrvc','wmulsmrhi','wmulsmrls','wmulsmrge','wmulsmrlt','wmulsmrgt','wmulsmrle',
-            'wmulslreq','wmulslrne','wmulslrcs','wmulslrhs','wmulslrcc','wmulslrlo','wmulslrmi','wmulslrpl','wmulslrvs','wmulslrvc','wmulslrhi','wmulslrls','wmulslrge','wmulslrlt','wmulslrgt','wmulslrle',
-            'wmulumreq','wmulumrne','wmulumrcs','wmulumrhs','wmulumrcc','wmulumrlo','wmulumrmi','wmulumrpl','wmulumrvs','wmulumrvc','wmulumrhi','wmulumrls','wmulumrge','wmulumrlt','wmulumrgt','wmulumrle',
-            'wmululreq','wmululrne','wmululrcs','wmululrhs','wmululrcc','wmululrlo','wmululrmi','wmululrpl','wmululrvs','wmululrvc','wmululrhi','wmululrls','wmululrge','wmululrlt','wmululrgt','wmululrle',
-            'wmulwumeq','wmulwumne','wmulwumcs','wmulwumhs','wmulwumcc','wmulwumlo','wmulwummi','wmulwumpl','wmulwumvs','wmulwumvc','wmulwumhi','wmulwumls','wmulwumge','wmulwumlt','wmulwumgt','wmulwumle',
-            'wmulwsmeq','wmulwsmne','wmulwsmcs','wmulwsmhs','wmulwsmcc','wmulwsmlo','wmulwsmmi','wmulwsmpl','wmulwsmvs','wmulwsmvc','wmulwsmhi','wmulwsmls','wmulwsmge','wmulwsmlt','wmulwsmgt','wmulwsmle',
-            'wmulwleq','wmulwlne','wmulwlcs','wmulwlhs','wmulwlcc','wmulwllo','wmulwlmi','wmulwlpl','wmulwlvs','wmulwlvc','wmulwlhi','wmulwlls','wmulwlge','wmulwllt','wmulwlgt','wmulwlle',
-            'wmulwumreq','wmulwumrne','wmulwumrcs','wmulwumrhs','wmulwumrcc','wmulwumrlo','wmulwumrmi','wmulwumrpl','wmulwumrvs','wmulwumrvc','wmulwumrhi','wmulwumrls','wmulwumrge','wmulwumrlt','wmulwumrgt','wmulwumrle',
-            'wmulwsmreq','wmulwsmrne','wmulwsmrcs','wmulwsmrhs','wmulwsmrcc','wmulwsmrlo','wmulwsmrmi','wmulwsmrpl','wmulwsmrvs','wmulwsmrvc','wmulwsmrhi','wmulwsmrls','wmulwsmrge','wmulwsmrlt','wmulwsmrgt','wmulwsmrle',
-            'woreq','worne','worcs','worhs','worcc','worlo','wormi','worpl','worvs','worvc','worhi','worls','worge','worlt','worgt','worle',
-            'wpackhsseq','wpackhssne','wpackhsscs','wpackhsshs','wpackhsscc','wpackhsslo','wpackhssmi','wpackhsspl','wpackhssvs','wpackhssvc','wpackhsshi','wpackhssls','wpackhssge','wpackhsslt','wpackhssgt','wpackhssle',
-            'wpackwsseq','wpackwssne','wpackwsscs','wpackwsshs','wpackwsscc','wpackwsslo','wpackwssmi','wpackwsspl','wpackwssvs','wpackwssvc','wpackwsshi','wpackwssls','wpackwssge','wpackwsslt','wpackwssgt','wpackwssle',
-            'wpackdsseq','wpackdssne','wpackdsscs','wpackdsshs','wpackdsscc','wpackdsslo','wpackdssmi','wpackdsspl','wpackdssvs','wpackdssvc','wpackdsshi','wpackdssls','wpackdssge','wpackdsslt','wpackdssgt','wpackdssle',
-            'wpackhuseq','wpackhusne','wpackhuscs','wpackhushs','wpackhuscc','wpackhuslo','wpackhusmi','wpackhuspl','wpackhusvs','wpackhusvc','wpackhushi','wpackhusls','wpackhusge','wpackhuslt','wpackhusgt','wpackhusle',
-            'wpackwuseq','wpackwusne','wpackwuscs','wpackwushs','wpackwuscc','wpackwuslo','wpackwusmi','wpackwuspl','wpackwusvs','wpackwusvc','wpackwushi','wpackwusls','wpackwusge','wpackwuslt','wpackwusgt','wpackwusle',
-            'wpackduseq','wpackdusne','wpackduscs','wpackdushs','wpackduscc','wpackduslo','wpackdusmi','wpackduspl','wpackdusvs','wpackdusvc','wpackdushi','wpackdusls','wpackdusge','wpackduslt','wpackdusgt','wpackdusle',
-            'wqmiabbeq','wqmiabbne','wqmiabbcs','wqmiabbhs','wqmiabbcc','wqmiabblo','wqmiabbmi','wqmiabbpl','wqmiabbvs','wqmiabbvc','wqmiabbhi','wqmiabbls','wqmiabbge','wqmiabblt','wqmiabbgt','wqmiabble',
-            'wqmiabteq','wqmiabtne','wqmiabtcs','wqmiabths','wqmiabtcc','wqmiabtlo','wqmiabtmi','wqmiabtpl','wqmiabtvs','wqmiabtvc','wqmiabthi','wqmiabtls','wqmiabtge','wqmiabtlt','wqmiabtgt','wqmiabtle',
-            'wqmiatbeq','wqmiatbne','wqmiatbcs','wqmiatbhs','wqmiatbcc','wqmiatblo','wqmiatbmi','wqmiatbpl','wqmiatbvs','wqmiatbvc','wqmiatbhi','wqmiatbls','wqmiatbge','wqmiatblt','wqmiatbgt','wqmiatble',
-            'wqmiatteq','wqmiattne','wqmiattcs','wqmiatths','wqmiattcc','wqmiattlo','wqmiattmi','wqmiattpl','wqmiattvs','wqmiattvc','wqmiatthi','wqmiattls','wqmiattge','wqmiattlt','wqmiattgt','wqmiattle',
-            'wqmiabbneq','wqmiabbnne','wqmiabbncs','wqmiabbnhs','wqmiabbncc','wqmiabbnlo','wqmiabbnmi','wqmiabbnpl','wqmiabbnvs','wqmiabbnvc','wqmiabbnhi','wqmiabbnls','wqmiabbnge','wqmiabbnlt','wqmiabbngt','wqmiabbnle',
-            'wqmiabtneq','wqmiabtnne','wqmiabtncs','wqmiabtnhs','wqmiabtncc','wqmiabtnlo','wqmiabtnmi','wqmiabtnpl','wqmiabtnvs','wqmiabtnvc','wqmiabtnhi','wqmiabtnls','wqmiabtnge','wqmiabtnlt','wqmiabtngt','wqmiabtnle',
-            'wqmiatbneq','wqmiatbnne','wqmiatbncs','wqmiatbnhs','wqmiatbncc','wqmiatbnlo','wqmiatbnmi','wqmiatbnpl','wqmiatbnvs','wqmiatbnvc','wqmiatbnhi','wqmiatbnls','wqmiatbnge','wqmiatbnlt','wqmiatbngt','wqmiatbnle',
-            'wqmiattneq','wqmiattnne','wqmiattncs','wqmiattnhs','wqmiattncc','wqmiattnlo','wqmiattnmi','wqmiattnpl','wqmiattnvs','wqmiattnvc','wqmiattnhi','wqmiattnls','wqmiattnge','wqmiattnlt','wqmiattngt','wqmiattnle',
-            'wqmulmeq','wqmulmne','wqmulmcs','wqmulmhs','wqmulmcc','wqmulmlo','wqmulmmi','wqmulmpl','wqmulmvs','wqmulmvc','wqmulmhi','wqmulmls','wqmulmge','wqmulmlt','wqmulmgt','wqmulmle',
-            'wqmulmreq','wqmulmrne','wqmulmrcs','wqmulmrhs','wqmulmrcc','wqmulmrlo','wqmulmrmi','wqmulmrpl','wqmulmrvs','wqmulmrvc','wqmulmrhi','wqmulmrls','wqmulmrge','wqmulmrlt','wqmulmrgt','wqmulmrle',
-            'wqmulwmeq','wqmulwmne','wqmulwmcs','wqmulwmhs','wqmulwmcc','wqmulwmlo','wqmulwmmi','wqmulwmpl','wqmulwmvs','wqmulwmvc','wqmulwmhi','wqmulwmls','wqmulwmge','wqmulwmlt','wqmulwmgt','wqmulwmle',
-            'wqmulwmreq','wqmulwmrne','wqmulwmrcs','wqmulwmrhs','wqmulwmrcc','wqmulwmrlo','wqmulwmrmi','wqmulwmrpl','wqmulwmrvs','wqmulwmrvc','wqmulwmrhi','wqmulwmrls','wqmulwmrge','wqmulwmrlt','wqmulwmrgt','wqmulwmrle',
-            'wrorheq','wrorhne','wrorhcs','wrorhhs','wrorhcc','wrorhlo','wrorhmi','wrorhpl','wrorhvs','wrorhvc','wrorhhi','wrorhls','wrorhge','wrorhlt','wrorhgt','wrorhle',
-            'wrorweq','wrorwne','wrorwcs','wrorwhs','wrorwcc','wrorwlo','wrorwmi','wrorwpl','wrorwvs','wrorwvc','wrorwhi','wrorwls','wrorwge','wrorwlt','wrorwgt','wrorwle',
-            'wrordeq','wrordne','wrordcs','wrordhs','wrordcc','wrordlo','wrordmi','wrordpl','wrordvs','wrordvc','wrordhi','wrordls','wrordge','wrordlt','wrordgt','wrordle',
-            'wrorhgeq','wrorhgne','wrorhgcs','wrorhghs','wrorhgcc','wrorhglo','wrorhgmi','wrorhgpl','wrorhgvs','wrorhgvc','wrorhghi','wrorhgls','wrorhgge','wrorhglt','wrorhggt','wrorhgle',
-            'wrorwgeq','wrorwgne','wrorwgcs','wrorwghs','wrorwgcc','wrorwglo','wrorwgmi','wrorwgpl','wrorwgvs','wrorwgvc','wrorwghi','wrorwgls','wrorwgge','wrorwglt','wrorwggt','wrorwgle',
-            'wrordgeq','wrordgne','wrordgcs','wrordghs','wrordgcc','wrordglo','wrordgmi','wrordgpl','wrordgvs','wrordgvc','wrordghi','wrordgls','wrordgge','wrordglt','wrordggt','wrordgle',
-            'wsadbeq','wsadbne','wsadbcs','wsadbhs','wsadbcc','wsadblo','wsadbmi','wsadbpl','wsadbvs','wsadbvc','wsadbhi','wsadbls','wsadbge','wsadblt','wsadbgt','wsadble',
-            'wsadheq','wsadhne','wsadhcs','wsadhhs','wsadhcc','wsadhlo','wsadhmi','wsadhpl','wsadhvs','wsadhvc','wsadhhi','wsadhls','wsadhge','wsadhlt','wsadhgt','wsadhle',
-            'wsadbzeq','wsadbzne','wsadbzcs','wsadbzhs','wsadbzcc','wsadbzlo','wsadbzmi','wsadbzpl','wsadbzvs','wsadbzvc','wsadbzhi','wsadbzls','wsadbzge','wsadbzlt','wsadbzgt','wsadbzle',
-            'wsadhzeq','wsadhzne','wsadhzcs','wsadhzhs','wsadhzcc','wsadhzlo','wsadhzmi','wsadhzpl','wsadhzvs','wsadhzvc','wsadhzhi','wsadhzls','wsadhzge','wsadhzlt','wsadhzgt','wsadhzle',
-            'wshufheq','wshufhne','wshufhcs','wshufhhs','wshufhcc','wshufhlo','wshufhmi','wshufhpl','wshufhvs','wshufhvc','wshufhhi','wshufhls','wshufhge','wshufhlt','wshufhgt','wshufhle',
-            'wsllheq','wsllhne','wsllhcs','wsllhhs','wsllhcc','wsllhlo','wsllhmi','wsllhpl','wsllhvs','wsllhvc','wsllhhi','wsllhls','wsllhge','wsllhlt','wsllhgt','wsllhle',
-            'wsllweq','wsllwne','wsllwcs','wsllwhs','wsllwcc','wsllwlo','wsllwmi','wsllwpl','wsllwvs','wsllwvc','wsllwhi','wsllwls','wsllwge','wsllwlt','wsllwgt','wsllwle',
-            'wslldeq','wslldne','wslldcs','wslldhs','wslldcc','wslldlo','wslldmi','wslldpl','wslldvs','wslldvc','wslldhi','wslldls','wslldge','wslldlt','wslldgt','wslldle',
-            'wsllhgeq','wsllhgne','wsllhgcs','wsllhghs','wsllhgcc','wsllhglo','wsllhgmi','wsllhgpl','wsllhgvs','wsllhgvc','wsllhghi','wsllhgls','wsllhgge','wsllhglt','wsllhggt','wsllhgle',
-            'wsllwgeq','wsllwgne','wsllwgcs','wsllwghs','wsllwgcc','wsllwglo','wsllwgmi','wsllwgpl','wsllwgvs','wsllwgvc','wsllwghi','wsllwgls','wsllwgge','wsllwglt','wsllwggt','wsllwgle',
-            'wslldgeq','wslldgne','wslldgcs','wslldghs','wslldgcc','wslldglo','wslldgmi','wslldgpl','wslldgvs','wslldgvc','wslldghi','wslldgls','wslldgge','wslldglt','wslldggt','wslldgle',
-            'wsraheq','wsrahne','wsrahcs','wsrahhs','wsrahcc','wsrahlo','wsrahmi','wsrahpl','wsrahvs','wsrahvc','wsrahhi','wsrahls','wsrahge','wsrahlt','wsrahgt','wsrahle',
-            'wsraweq','wsrawne','wsrawcs','wsrawhs','wsrawcc','wsrawlo','wsrawmi','wsrawpl','wsrawvs','wsrawvc','wsrawhi','wsrawls','wsrawge','wsrawlt','wsrawgt','wsrawle',
-            'wsradeq','wsradne','wsradcs','wsradhs','wsradcc','wsradlo','wsradmi','wsradpl','wsradvs','wsradvc','wsradhi','wsradls','wsradge','wsradlt','wsradgt','wsradle',
-            'wsrahgeq','wsrahgne','wsrahgcs','wsrahghs','wsrahgcc','wsrahglo','wsrahgmi','wsrahgpl','wsrahgvs','wsrahgvc','wsrahghi','wsrahgls','wsrahgge','wsrahglt','wsrahggt','wsrahgle',
-            'wsrawgeq','wsrawgne','wsrawgcs','wsrawghs','wsrawgcc','wsrawglo','wsrawgmi','wsrawgpl','wsrawgvs','wsrawgvc','wsrawghi','wsrawgls','wsrawgge','wsrawglt','wsrawggt','wsrawgle',
-            'wsradgeq','wsradgne','wsradgcs','wsradghs','wsradgcc','wsradglo','wsradgmi','wsradgpl','wsradgvs','wsradgvc','wsradghi','wsradgls','wsradgge','wsradglt','wsradggt','wsradgle',
-            'wsrlheq','wsrlhne','wsrlhcs','wsrlhhs','wsrlhcc','wsrlhlo','wsrlhmi','wsrlhpl','wsrlhvs','wsrlhvc','wsrlhhi','wsrlhls','wsrlhge','wsrlhlt','wsrlhgt','wsrlhle',
-            'wsrlweq','wsrlwne','wsrlwcs','wsrlwhs','wsrlwcc','wsrlwlo','wsrlwmi','wsrlwpl','wsrlwvs','wsrlwvc','wsrlwhi','wsrlwls','wsrlwge','wsrlwlt','wsrlwgt','wsrlwle',
-            'wsrldeq','wsrldne','wsrldcs','wsrldhs','wsrldcc','wsrldlo','wsrldmi','wsrldpl','wsrldvs','wsrldvc','wsrldhi','wsrldls','wsrldge','wsrldlt','wsrldgt','wsrldle',
-            'wsrlhgeq','wsrlhgne','wsrlhgcs','wsrlhghs','wsrlhgcc','wsrlhglo','wsrlhgmi','wsrlhgpl','wsrlhgvs','wsrlhgvc','wsrlhghi','wsrlhgls','wsrlhgge','wsrlhglt','wsrlhggt','wsrlhgle',
-            'wsrlwgeq','wsrlwgne','wsrlwgcs','wsrlwghs','wsrlwgcc','wsrlwglo','wsrlwgmi','wsrlwgpl','wsrlwgvs','wsrlwgvc','wsrlwghi','wsrlwgls','wsrlwgge','wsrlwglt','wsrlwggt','wsrlwgle',
-            'wsrldgeq','wsrldgne','wsrldgcs','wsrldghs','wsrldgcc','wsrldglo','wsrldgmi','wsrldgpl','wsrldgvs','wsrldgvc','wsrldghi','wsrldgls','wsrldgge','wsrldglt','wsrldggt','wsrldgle',
-            'wstrbeq','wstrbne','wstrbcs','wstrbhs','wstrbcc','wstrblo','wstrbmi','wstrbpl','wstrbvs','wstrbvc','wstrbhi','wstrbls','wstrbge','wstrblt','wstrbgt','wstrble',
-            'wstrheq','wstrhne','wstrhcs','wstrhhs','wstrhcc','wstrhlo','wstrhmi','wstrhpl','wstrhvs','wstrhvc','wstrhhi','wstrhls','wstrhge','wstrhlt','wstrhgt','wstrhle',
-            'wstrweq','wstrwne','wstrwcs','wstrwhs','wstrwcc','wstrwlo','wstrwmi','wstrwpl','wstrwvs','wstrwvc','wstrwhi','wstrwls','wstrwge','wstrwlt','wstrwgt','wstrwle',
-            'wstrdeq','wstrdne','wstrdcs','wstrdhs','wstrdcc','wstrdlo','wstrdmi','wstrdpl','wstrdvs','wstrdvc','wstrdhi','wstrdls','wstrdge','wstrdlt','wstrdgt','wstrdle',
-            'wsubbeq','wsubbne','wsubbcs','wsubbhs','wsubbcc','wsubblo','wsubbmi','wsubbpl','wsubbvs','wsubbvc','wsubbhi','wsubbls','wsubbge','wsubblt','wsubbgt','wsubble',
-            'wsubheq','wsubhne','wsubhcs','wsubhhs','wsubhcc','wsubhlo','wsubhmi','wsubhpl','wsubhvs','wsubhvc','wsubhhi','wsubhls','wsubhge','wsubhlt','wsubhgt','wsubhle',
-            'wsubweq','wsubwne','wsubwcs','wsubwhs','wsubwcc','wsubwlo','wsubwmi','wsubwpl','wsubwvs','wsubwvc','wsubwhi','wsubwls','wsubwge','wsubwlt','wsubwgt','wsubwle',
-            'wsubbsseq','wsubbssne','wsubbsscs','wsubbsshs','wsubbsscc','wsubbsslo','wsubbssmi','wsubbsspl','wsubbssvs','wsubbssvc','wsubbsshi','wsubbssls','wsubbssge','wsubbsslt','wsubbssgt','wsubbssle',
-            'wsubhsseq','wsubhssne','wsubhsscs','wsubhsshs','wsubhsscc','wsubhsslo','wsubhssmi','wsubhsspl','wsubhssvs','wsubhssvc','wsubhsshi','wsubhssls','wsubhssge','wsubhsslt','wsubhssgt','wsubhssle',
-            'wsubwsseq','wsubwssne','wsubwsscs','wsubwsshs','wsubwsscc','wsubwsslo','wsubwssmi','wsubwsspl','wsubwssvs','wsubwssvc','wsubwsshi','wsubwssls','wsubwssge','wsubwsslt','wsubwssgt','wsubwssle',
-            'wsubbuseq','wsubbusne','wsubbuscs','wsubbushs','wsubbuscc','wsubbuslo','wsubbusmi','wsubbuspl','wsubbusvs','wsubbusvc','wsubbushi','wsubbusls','wsubbusge','wsubbuslt','wsubbusgt','wsubbusle',
-            'wsubhuseq','wsubhusne','wsubhuscs','wsubhushs','wsubhuscc','wsubhuslo','wsubhusmi','wsubhuspl','wsubhusvs','wsubhusvc','wsubhushi','wsubhusls','wsubhusge','wsubhuslt','wsubhusgt','wsubhusle',
-            'wsubwuseq','wsubwusne','wsubwuscs','wsubwushs','wsubwuscc','wsubwuslo','wsubwusmi','wsubwuspl','wsubwusvs','wsubwusvc','wsubwushi','wsubwusls','wsubwusge','wsubwuslt','wsubwusgt','wsubwusle',
-            'wsubaddhxeq','wsubaddhxne','wsubaddhxcs','wsubaddhxhs','wsubaddhxcc','wsubaddhxlo','wsubaddhxmi','wsubaddhxpl','wsubaddhxvs','wsubaddhxvc','wsubaddhxhi','wsubaddhxls','wsubaddhxge','wsubaddhxlt','wsubaddhxgt','wsubaddhxle',
-            'wunpckehsbeq','wunpckehsbne','wunpckehsbcs','wunpckehsbhs','wunpckehsbcc','wunpckehsblo','wunpckehsbmi','wunpckehsbpl','wunpckehsbvs','wunpckehsbvc','wunpckehsbhi','wunpckehsbls','wunpckehsbge','wunpckehsblt','wunpckehsbgt','wunpckehsble',
-            'wunpckehsheq','wunpckehshne','wunpckehshcs','wunpckehshhs','wunpckehshcc','wunpckehshlo','wunpckehshmi','wunpckehshpl','wunpckehshvs','wunpckehshvc','wunpckehshhi','wunpckehshls','wunpckehshge','wunpckehshlt','wunpckehshgt','wunpckehshle',
-            'wunpckehsweq','wunpckehswne','wunpckehswcs','wunpckehswhs','wunpckehswcc','wunpckehswlo','wunpckehswmi','wunpckehswpl','wunpckehswvs','wunpckehswvc','wunpckehswhi','wunpckehswls','wunpckehswge','wunpckehswlt','wunpckehswgt','wunpckehswle',
-            'wunpckehubeq','wunpckehubne','wunpckehubcs','wunpckehubhs','wunpckehubcc','wunpckehublo','wunpckehubmi','wunpckehubpl','wunpckehubvs','wunpckehubvc','wunpckehubhi','wunpckehubls','wunpckehubge','wunpckehublt','wunpckehubgt','wunpckehuble',
-            'wunpckehuheq','wunpckehuhne','wunpckehuhcs','wunpckehuhhs','wunpckehuhcc','wunpckehuhlo','wunpckehuhmi','wunpckehuhpl','wunpckehuhvs','wunpckehuhvc','wunpckehuhhi','wunpckehuhls','wunpckehuhge','wunpckehuhlt','wunpckehuhgt','wunpckehuhle',
-            'wunpckehuweq','wunpckehuwne','wunpckehuwcs','wunpckehuwhs','wunpckehuwcc','wunpckehuwlo','wunpckehuwmi','wunpckehuwpl','wunpckehuwvs','wunpckehuwvc','wunpckehuwhi','wunpckehuwls','wunpckehuwge','wunpckehuwlt','wunpckehuwgt','wunpckehuwle',
-            'wunpckihbeq','wunpckihbne','wunpckihbcs','wunpckihbhs','wunpckihbcc','wunpckihblo','wunpckihbmi','wunpckihbpl','wunpckihbvs','wunpckihbvc','wunpckihbhi','wunpckihbls','wunpckihbge','wunpckihblt','wunpckihbgt','wunpckihble',
-            'wunpckihheq','wunpckihhne','wunpckihhcs','wunpckihhhs','wunpckihhcc','wunpckihhlo','wunpckihhmi','wunpckihhpl','wunpckihhvs','wunpckihhvc','wunpckihhhi','wunpckihhls','wunpckihhge','wunpckihhlt','wunpckihhgt','wunpckihhle',
-            'wunpckihweq','wunpckihwne','wunpckihwcs','wunpckihwhs','wunpckihwcc','wunpckihwlo','wunpckihwmi','wunpckihwpl','wunpckihwvs','wunpckihwvc','wunpckihwhi','wunpckihwls','wunpckihwge','wunpckihwlt','wunpckihwgt','wunpckihwle',
-            'wunpckelsbeq','wunpckelsbne','wunpckelsbcs','wunpckelsbhs','wunpckelsbcc','wunpckelsblo','wunpckelsbmi','wunpckelsbpl','wunpckelsbvs','wunpckelsbvc','wunpckelsbhi','wunpckelsbls','wunpckelsbge','wunpckelsblt','wunpckelsbgt','wunpckelsble',
-            'wunpckelsheq','wunpckelshne','wunpckelshcs','wunpckelshhs','wunpckelshcc','wunpckelshlo','wunpckelshmi','wunpckelshpl','wunpckelshvs','wunpckelshvc','wunpckelshhi','wunpckelshls','wunpckelshge','wunpckelshlt','wunpckelshgt','wunpckelshle',
-            'wunpckelsweq','wunpckelswne','wunpckelswcs','wunpckelswhs','wunpckelswcc','wunpckelswlo','wunpckelswmi','wunpckelswpl','wunpckelswvs','wunpckelswvc','wunpckelswhi','wunpckelswls','wunpckelswge','wunpckelswlt','wunpckelswgt','wunpckelswle',
-            'wunpckelubeq','wunpckelubne','wunpckelubcs','wunpckelubhs','wunpckelubcc','wunpckelublo','wunpckelubmi','wunpckelubpl','wunpckelubvs','wunpckelubvc','wunpckelubhi','wunpckelubls','wunpckelubge','wunpckelublt','wunpckelubgt','wunpckeluble',
-            'wunpckeluheq','wunpckeluhne','wunpckeluhcs','wunpckeluhhs','wunpckeluhcc','wunpckeluhlo','wunpckeluhmi','wunpckeluhpl','wunpckeluhvs','wunpckeluhvc','wunpckeluhhi','wunpckeluhls','wunpckeluhge','wunpckeluhlt','wunpckeluhgt','wunpckeluhle',
-            'wunpckeluweq','wunpckeluwne','wunpckeluwcs','wunpckeluwhs','wunpckeluwcc','wunpckeluwlo','wunpckeluwmi','wunpckeluwpl','wunpckeluwvs','wunpckeluwvc','wunpckeluwhi','wunpckeluwls','wunpckeluwge','wunpckeluwlt','wunpckeluwgt','wunpckeluwle',
-            'wunpckilbeq','wunpckilbne','wunpckilbcs','wunpckilbhs','wunpckilbcc','wunpckilblo','wunpckilbmi','wunpckilbpl','wunpckilbvs','wunpckilbvc','wunpckilbhi','wunpckilbls','wunpckilbge','wunpckilblt','wunpckilbgt','wunpckilble',
-            'wunpckilheq','wunpckilhne','wunpckilhcs','wunpckilhhs','wunpckilhcc','wunpckilhlo','wunpckilhmi','wunpckilhpl','wunpckilhvs','wunpckilhvc','wunpckilhhi','wunpckilhls','wunpckilhge','wunpckilhlt','wunpckilhgt','wunpckilhle',
-            'wunpckilweq','wunpckilwne','wunpckilwcs','wunpckilwhs','wunpckilwcc','wunpckilwlo','wunpckilwmi','wunpckilwpl','wunpckilwvs','wunpckilwvc','wunpckilwhi','wunpckilwls','wunpckilwge','wunpckilwlt','wunpckilwgt','wunpckilwle',
-            'wxoreq','wxorne','wxorcs','wxorhs','wxorcc','wxorlo','wxormi','wxorpl','wxorvs','wxorvc','wxorhi','wxorls','wxorge','wxorlt','wxorgt','wxorle',
-            'wzeroeq','wzerone','wzerocs','wzerohs','wzerocc','wzerolo','wzeromi','wzeropl','wzerovs','wzerovc','wzerohi','wzerols','wzeroge','wzerolt','wzerogt','wzerole'
-            ),
-        /* Unconditional VFPv3 & NEON SIMD Memory Access Instructions */
-        19 => array(
-            /* Unconditional VFPv3 & NEON SIMD Memory Access: Loads */
-            'vld.8','vldal.8',
-            'vld.16','vldal.16',
-            'vld.32','vldal.32',
-            'vld.64','vldal.64',
-
-            'vld1.8','vld1al.8',
-            'vld1.16','vld1al.16',
-            'vld1.32','vld1al.32',
-
-            'vld2.8','vld2al.8',
-            'vld2.16','vld2al.16',
-            'vld2.32','vld2al.32',
-
-            'vld3.8','vld3al.8',
-            'vld3.16','vld3al.16',
-            'vld3.32','vld3al.32',
-
-            'vld4.8','vld4al.8',
-            'vld4.16','vld4al.16',
-            'vld4.32','vld4al.32',
-
-            'vldm','vldmal',
-            'vldm.32','vldmal.32',
-            'vldm.64','vldmal.64',
-
-            'vldmia','vldmiaal',
-            'vldmia.32','vldmiaal.32',
-            'vldmia.64','vldmiaal.64',
-
-            'vldmdb','vldmdbal',
-            'vldmdb.32','vldmdbal.32',
-            'vldmdb.64','vldmdbal.64',
-
-            'vldr','vldral',
-            'vldr.32','vldral.32',
-            'vldr.64','vldral.64',
-
-            'vpop','vpopal',
-            'vpop.32','vpopal.32',
-            'vpop.64','vpopal.64',
-
-            /* Unconditional VFPv3 & NEON SIMD Memory Access: Stores */
-            'vst1.8','vst1al.8',
-            'vst1.16','vst1al.16',
-            'vst1.32','vst1al.32',
-            'vst1.64','vst1al.64',
-
-            'vst2.8','vst2al.8',
-            'vst2.16','vst2al.16',
-            'vst2.32','vst2al.32',
-
-            'vst3.8','vst3al.8',
-            'vst3.16','vst3al.16',
-            'vst3.32','vst3al.32',
-
-            'vst4.8','vst4al.8',
-            'vst4.16','vst4al.16',
-            'vst4.32','vst4al.32',
-
-            'vstm','vstmal',
-            'vstm.32','vstmal.32',
-            'vstm.64','vstmal.64',
-
-            'vstmia','vstmiaal',
-            'vstmia.32','vstmiaal.32',
-            'vstmia.64','vstmiaal.64',
-
-            'vstmdb','vstmdbal',
-            'vstmdb.32','vstmdbal.32',
-            'vstmdb.64','vstmdbal.64',
-
-            'vstr','vstral',
-            'vstr.32','vstral.32',
-            'vstr.64','vstral.64',
-
-            'vpush','vpushal',
-            'vpush.32','vpushal.32',
-            'vpush.64','vpushal.64'
-            ),
-        /* Unconditional NEON SIMD Logical Instructions */
-        20 => array(
-            'vand','vandal',
-            'vand.i8','vandal.i8',
-            'vand.i16','vandal.i16',
-            'vand.i32','vandal.i32',
-            'vand.i64','vandal.i64',
-            'vand.s8','vandal.s8',
-            'vand.s16','vandal.s16',
-            'vand.s32','vandal.s32',
-            'vand.s64','vandal.s64',
-            'vand.u8','vandal.u8',
-            'vand.u16','vandal.u16',
-            'vand.u32','vandal.u32',
-            'vand.u64','vandal.u64',
-            'vand.f32','vandal.f32',
-            'vand.f64','vandal.f64',
-
-            'vbic','vbical',
-            'vbic.i8','vbical.i8',
-            'vbic.i16','vbical.i16',
-            'vbic.i32','vbical.i32',
-            'vbic.i64','vbical.i64',
-            'vbic.s8','vbical.s8',
-            'vbic.s16','vbical.s16',
-            'vbic.s32','vbical.s32',
-            'vbic.s64','vbical.s64',
-            'vbic.u8','vbical.u8',
-            'vbic.u16','vbical.u16',
-            'vbic.u32','vbical.u32',
-            'vbic.u64','vbical.u64',
-            'vbic.f32','vbical.f32',
-            'vbic.f64','vbical.f64',
-
-            'vbif','vbifal',
-            'vbif.i8','vbifal.i8',
-            'vbif.i16','vbifal.i16',
-            'vbif.i32','vbifal.i32',
-            'vbif.i64','vbifal.i64',
-            'vbif.s8','vbifal.s8',
-            'vbif.s16','vbifal.s16',
-            'vbif.s32','vbifal.s32',
-            'vbif.s64','vbifal.s64',
-            'vbif.u8','vbifal.u8',
-            'vbif.u16','vbifal.u16',
-            'vbif.u32','vbifal.u32',
-            'vbif.u64','vbifal.u64',
-            'vbif.f32','vbifal.f32',
-            'vbif.f64','vbifal.f64',
-
-            'vbit','vbital',
-            'vbit.i8','vbital.i8',
-            'vbit.i16','vbital.i16',
-            'vbit.i32','vbital.i32',
-            'vbit.i64','vbital.i64',
-            'vbit.s8','vbital.s8',
-            'vbit.s16','vbital.s16',
-            'vbit.s32','vbital.s32',
-            'vbit.s64','vbital.s64',
-            'vbit.u8','vbital.u8',
-            'vbit.u16','vbital.u16',
-            'vbit.u32','vbital.u32',
-            'vbit.u64','vbital.u64',
-            'vbit.f32','vbital.f32',
-            'vbit.f64','vbital.f64',
-
-            'vbsl','vbslal',
-            'vbsl.i8','vbslal.i8',
-            'vbsl.i16','vbslal.i16',
-            'vbsl.i32','vbslal.i32',
-            'vbsl.i64','vbslal.i64',
-            'vbsl.s8','vbslal.s8',
-            'vbsl.s16','vbslal.s16',
-            'vbsl.s32','vbslal.s32',
-            'vbsl.s64','vbslal.s64',
-            'vbsl.u8','vbslal.u8',
-            'vbsl.u16','vbslal.u16',
-            'vbsl.u32','vbslal.u32',
-            'vbsl.u64','vbslal.u64',
-            'vbsl.f32','vbslal.f32',
-            'vbsl.f64','vbslal.f64',
-
-            'veor','veoral',
-            'veor.i8','veoral.i8',
-            'veor.i16','veoral.i16',
-            'veor.i32','veoral.i32',
-            'veor.i64','veoral.i64',
-            'veor.s8','veoral.s8',
-            'veor.s16','veoral.s16',
-            'veor.s32','veoral.s32',
-            'veor.s64','veoral.s64',
-            'veor.u8','veoral.u8',
-            'veor.u16','veoral.u16',
-            'veor.u32','veoral.u32',
-            'veor.u64','veoral.u64',
-            'veor.f32','veoral.f32',
-            'veor.f64','veoral.f64',
-
-            'vmov','vmoval',
-            'vmov.8','vmoval.8',
-            'vmov.16','vmoval.16',
-            'vmov.32','vmoval.32',
-            'vmov.i8','vmoval.i8',
-            'vmov.i16','vmoval.i16',
-            'vmov.i32','vmoval.i32',
-            'vmov.i64','vmoval.i64',
-            'vmov.f32','vmoval.f32',
-            'vmov.f64','vmoval.f64',
-
-            'vmvn','vmvnal',
-            'vmvn.s8','vmvnal.s8',
-            'vmvn.s16','vmvnal.s16',
-            'vmvn.s32','vmvnal.s32',
-            'vmvn.s64','vmvnal.s64',
-            'vmvn.u8','vmvnal.u8',
-            'vmvn.u16','vmvnal.u16',
-            'vmvn.u32','vmvnal.u32',
-            'vmvn.u64','vmvnal.u64',
-            'vmvn.i8','vmvnal.i8',
-            'vmvn.i16','vmvnal.i16',
-            'vmvn.i32','vmvnal.i32',
-            'vmvn.i64','vmvnal.i64',
-            'vmvn.f32','vmvnal.f32',
-            'vmvn.f64','vmvnal.f64',
-
-            'vorn','vornal',
-            'vorn.s8','vornal.s8',
-            'vorn.s16','vornal.s16',
-            'vorn.s32','vornal.s32',
-            'vorn.s64','vornal.s64',
-            'vorn.u8','vornal.u8',
-            'vorn.u16','vornal.u16',
-            'vorn.u32','vornal.u32',
-            'vorn.u64','vornal.u64',
-            'vorn.i8','vornal.i8',
-            'vorn.i16','vornal.i16',
-            'vorn.i32','vornal.i32',
-            'vorn.i64','vornal.i64',
-            'vorn.f32','vornal.f32',
-            'vorn.f64','vornal.f64',
-
-            'vorr','vorral',
-            'vorr.s8','vorral.s8',
-            'vorr.s16','vorral.s16',
-            'vorr.s32','vorral.s32',
-            'vorr.s64','vorral.s64',
-            'vorr.u8','vorral.u8',
-            'vorr.u16','vorral.u16',
-            'vorr.u32','vorral.u32',
-            'vorr.u64','vorral.u64',
-            'vorr.i8','vorral.i8',
-            'vorr.i16','vorral.i16',
-            'vorr.i32','vorral.i32',
-            'vorr.i64','vorral.i64',
-            'vorr.f32','vorral.f32',
-            'vorr.f64','vorral.f64',
-
-            'vswp','vswpal',
-            'vswp.s8','vswpal.s8',
-            'vswp.s16','vswpal.s16',
-            'vswp.s32','vswpal.s32',
-            'vswp.s64','vswpal.s64',
-            'vswp.u8','vswpal.u8',
-            'vswp.u16','vswpal.u16',
-            'vswp.u32','vswpal.u32',
-            'vswp.u64','vswpal.u64',
-            'vswp.i8','vswpal.i8',
-            'vswp.i16','vswpal.i16',
-            'vswp.i32','vswpal.i32',
-            'vswp.i64','vswpal.i64',
-            'vswp.f32','vswpal.f32',
-            'vswp.f64','vswpal.f64'
-            ),
-        /* Unconditional NEON SIMD ARM Registers Interop Instructions */
-        21 => array(
-            'vmrs','vmrsal',
-            'vmsr','vmsral'
-            ),
-        /* Unconditional NEON SIMD Bit/Byte-Level Instructions */
-        22 => array(
-            'vcnt.8','vcntal.8',
-            'vdup.8','vdupal.8',
-
-            'vdup.16','vdupal.16',
-            'vdup.32','vdupal.32',
-
-            'vext.8','vextal.8',
-            'vext.16','vextal.16',
-
-            'vext.32','vextal.32',
-            'vext.64','vextal.64',
-
-            'vrev16.8','vrev16al.8',
-            'vrev32.8','vrev32al.8',
-            'vrev32.16','vrev32al.16',
-            'vrev64.8','vrev64al.8',
-            'vrev64.16','vrev64al.16',
-            'vrev64.32','vrev64al.32',
-
-            'vsli.8','vslial.8',
-            'vsli.16','vslial.16',
-            'vsli.32','vslial.32',
-            'vsli.64','vslial.64',
-
-            'vsri.8','vsrial.8',
-            'vsri.16','vsrial.16',
-            'vsri.32','vsrial.32',
-            'vsri.64','vsrial.64',
-
-            'vtbl.8','vtblal.8',
-
-            'vtbx','vtbxal',
-
-            'vtrn.8','vtrnal.8',
-            'vtrn.16','vtrnal.16',
-            'vtrn.32','vtrnal.32',
-
-            'vtst.8','vtstal.8',
-            'vtst.16','vtstal.16',
-            'vtst.32','vtstal.32',
-
-            'vuzp.8','vuzpal.8',
-            'vuzp.16','vuzpal.16',
-            'vuzp.32','vuzpal.32',
-
-            'vzip.8','vzipal.8',
-            'vzip.16','vzipal.16',
-            'vzip.32','vzipal.32',
-
-            'vmull.p8','vmullal.p8'
-            ),
-        /* Unconditional NEON SIMD Universal Integer Instructions */
-        23 => array(
-            'vadd.i8','vaddal.i8',
-            'vadd.i16','vaddal.i16',
-            'vadd.i32','vaddal.i32',
-            'vadd.i64','vaddal.i64',
-
-            'vsub.i8','vsubal.i8',
-            'vsub.i16','vsubal.i16',
-            'vsub.i32','vsubal.i32',
-            'vsub.i64','vsubal.i64',
-
-            'vaddhn.i16','vaddhnal.i16',
-            'vaddhn.i32','vaddhnal.i32',
-            'vaddhn.i64','vaddhnal.i64',
-
-            'vsubhn.i16','vsubhnal.i16',
-            'vsubhn.i32','vsubhnal.i32',
-            'vsubhn.i64','vsubhnal.i64',
-
-            'vraddhn.i16','vraddhnal.i16',
-            'vraddhn.i32','vraddhnal.i32',
-            'vraddhn.i64','vraddhnal.i64',
-
-            'vrsubhn.i16','vrsubhnal.i16',
-            'vrsubhn.i32','vrsubhnal.i32',
-            'vrsubhn.i64','vrsubhnal.i64',
-
-            'vpadd.i8','vpaddal.i8',
-            'vpadd.i16','vpaddal.i16',
-            'vpadd.i32','vpaddal.i32',
-
-            'vceq.i8','vceqal.i8',
-            'vceq.i16','vceqal.i16',
-            'vceq.i32','vceqal.i32',
-
-            'vclz.i8','vclzal.i8',
-            'vclz.i16','vclzal.i16',
-            'vclz.i32','vclzal.i32',
-
-            'vmovn.i16','vmovnal.i16',
-            'vmovn.i32','vmovnal.i32',
-            'vmovn.i64','vmovnal.i64',
-
-            'vmla.s8','vmlaal.s8',
-            'vmla.s16','vmlaal.s16',
-            'vmla.s32','vmlaal.s32',
-            'vmla.u8','vmlaal.u8',
-            'vmla.u16','vmlaal.u16',
-            'vmla.u32','vmlaal.u32',
-            'vmla.i8','vmlaal.i8',
-            'vmla.i16','vmlaal.i16',
-            'vmla.i32','vmlaal.i32',
-
-            'vmls.s8','vmlsal.s8',
-            'vmls.s16','vmlsal.s16',
-            'vmls.s32','vmlsal.s32',
-            'vmls.u8','vmlsal.u8',
-            'vmls.u16','vmlsal.u16',
-            'vmls.u32','vmlsal.u32',
-            'vmls.i8','vmlsal.i8',
-            'vmls.i16','vmlsal.i16',
-            'vmls.i32','vmlsal.i32',
-
-            'vmul.s8','vmulal.s8',
-            'vmul.s16','vmulal.s16',
-            'vmul.s32','vmulal.s32',
-            'vmul.u8','vmulal.u8',
-            'vmul.u16','vmulal.u16',
-            'vmul.u32','vmulal.u32',
-            'vmul.i8','vmulal.i8',
-            'vmul.i16','vmulal.i16',
-            'vmul.i32','vmulal.i32',
-            'vmul.p8','vmulal.p8',
-
-            'vrshrn.i16','vrshrnal.i16',
-            'vrshrn.i32','vrshrnal.i32',
-            'vrshrn.i64','vrshrnal.i64',
-
-            'vshrn.i16','vshrnal.i16',
-            'vshrn.i32','vshrnal.i32',
-            'vshrn.i64','vshrnal.i64',
-
-            'vshl.i8','vshlal.i8',
-            'vshl.i16','vshlal.i16',
-            'vshl.i32','vshlal.i32',
-            'vshl.i64','vshlal.i64',
-
-            'vshll.i8','vshllal.i8',
-            'vshll.i16','vshllal.i16',
-            'vshll.i32','vshllal.i32'
-            ),
-        /* Unconditional NEON SIMD Signed Integer Instructions */
-        24 => array(
-            'vaba.s8','vabaal.s8',
-            'vaba.s16','vabaal.s16',
-            'vaba.s32','vabaal.s32',
-
-            'vabal.s8','vabalal.s8',
-            'vabal.s16','vabalal.s16',
-            'vabal.s32','vabalal.s32',
-
-            'vabd.s8','vabdal.s8',
-            'vabd.s16','vabdal.s16',
-            'vabd.s32','vabdal.s32',
-
-            'vabs.s8','vabsal.s8',
-            'vabs.s16','vabsal.s16',
-            'vabs.s32','vabsal.s32',
-
-            'vaddl.s8','vaddlal.s8',
-            'vaddl.s16','vaddlal.s16',
-            'vaddl.s32','vaddlal.s32',
-
-            'vcge.s8','vcgeal.s8',
-            'vcge.s16','vcgeal.s16',
-            'vcge.s32','vcgeal.s32',
-
-            'vcle.s8','vcleal.s8',
-            'vcle.s16','vcleal.s16',
-            'vcle.s32','vcleal.s32',
-
-            'vcgt.s8','vcgtal.s8',
-            'vcgt.s16','vcgtal.s16',
-            'vcgt.s32','vcgtal.s32',
-
-            'vclt.s8','vcltal.s8',
-            'vclt.s16','vcltal.s16',
-            'vclt.s32','vcltal.s32',
-
-            'vcls.s8','vclsal.s8',
-            'vcls.s16','vclsal.s16',
-            'vcls.s32','vclsal.s32',
-
-            'vaddw.s8','vaddwal.s8',
-            'vaddw.s16','vaddwal.s16',
-            'vaddw.s32','vaddwal.s32',
-
-            'vhadd.s8','vhaddal.s8',
-            'vhadd.s16','vhaddal.s16',
-            'vhadd.s32','vhaddal.s32',
-
-            'vhsub.s8','vhsubal.s8',
-            'vhsub.s16','vhsubal.s16',
-            'vhsub.s32','vhsubal.s32',
-
-            'vmax.s8','vmaxal.s8',
-            'vmax.s16','vmaxal.s16',
-            'vmax.s32','vmaxal.s32',
-
-            'vmin.s8','vminal.s8',
-            'vmin.s16','vminal.s16',
-            'vmin.s32','vminal.s32',
-
-            'vmlal.s8','vmlalal.s8',
-            'vmlal.s16','vmlalal.s16',
-            'vmlal.s32','vmlalal.s32',
-
-            'vmlsl.s8','vmlslal.s8',
-            'vmlsl.s16','vmlslal.s16',
-            'vmlsl.s32','vmlslal.s32',
-
-            'vneg.s8','vnegal.s8',
-            'vneg.s16','vnegal.s16',
-            'vneg.s32','vnegal.s32',
-
-            'vpadal.s8','vpadalal.s8',
-            'vpadal.s16','vpadalal.s16',
-            'vpadal.s32','vpadalal.s32',
-
-            'vmovl.s8','vmovlal.s8',
-            'vmovl.s16','vmovlal.s16',
-            'vmovl.s32','vmovlal.s32',
-
-            'vmull.s8','vmullal.s8',
-            'vmull.s16','vmullal.s16',
-            'vmull.s32','vmullal.s32',
-
-            'vpaddl.s8','vpaddlal.s8',
-            'vpaddl.s16','vpaddlal.s16',
-            'vpaddl.s32','vpaddlal.s32',
-
-            'vpmax.s8','vpmaxal.s8',
-            'vpmax.s16','vpmaxal.s16',
-            'vpmax.s32','vpmaxal.s32',
-
-            'vpmin.s8','vpminal.s8',
-            'vpmin.s16','vpminal.s16',
-            'vpmin.s32','vpminal.s32',
-
-            'vqabs.s8','vqabsal.s8',
-            'vqabs.s16','vqabsal.s16',
-            'vqabs.s32','vqabsal.s32',
-
-            'vqadd.s8','vqaddal.s8',
-            'vqadd.s16','vqaddal.s16',
-            'vqadd.s32','vqaddal.s32',
-            'vqadd.s64','vqaddal.s64',
-
-            'vqdmlal.s16','vqdmlalal.s16',
-            'vqdmlal.s32','vqdmlalal.s32',
-
-            'vqdmlsl.s16','vqdmlslal.s16',
-            'vqdmlsl.s32','vqdmlslal.s32',
-
-            'vqdmulh.s16','vqdmulhal.s16',
-            'vqdmulh.s32','vqdmulhal.s32',
-
-            'vqdmull.s16','vqdmullal.s16',
-            'vqdmull.s32','vqdmullal.s32',
-
-            'vqmovn.s16','vqmovnal.s16',
-            'vqmovn.s32','vqmovnal.s32',
-            'vqmovn.s64','vqmovnal.s64',
-
-            'vqmovun.s16','vqmovunal.s16',
-            'vqmovun.s32','vqmovunal.s32',
-            'vqmovun.s64','vqmovunal.s64',
-
-            'vqneg.s8','vqnegal.s8',
-            'vqneg.s16','vqnegal.s16',
-            'vqneg.s32','vqnegal.s32',
-
-            'vqrdmulh.s16','vqrdmulhal.s16',
-            'vqrdmulh.s32','vqrdmulhal.s32',
-
-            'vqrshl.s8','vqrshlal.s8',
-            'vqrshl.s16','vqrshlal.s16',
-            'vqrshl.s32','vqrshlal.s32',
-            'vqrshl.s64','vqrshlal.s64',
-
-            'vqrshrn.s16','vqrshrnal.s16',
-            'vqrshrn.s32','vqrshrnal.s32',
-            'vqrshrn.s64','vqrshrnal.s64',
-
-            'vqrshrun.s16','vqrshrunal.s16',
-            'vqrshrun.s32','vqrshrunal.s32',
-            'vqrshrun.s64','vqrshrunal.s64',
-
-            'vqshl.s8','vqshlal.s8',
-            'vqshl.s16','vqshlal.s16',
-            'vqshl.s32','vqshlal.s32',
-            'vqshl.s64','vqshlal.s64',
-
-            'vqshlu.s8','vqshlual.s8',
-            'vqshlu.s16','vqshlual.s16',
-            'vqshlu.s32','vqshlual.s32',
-            'vqshlu.s64','vqshlual.s64',
-
-            'vqshrn.s16','vqshrnal.s16',
-            'vqshrn.s32','vqshrnal.s32',
-            'vqshrn.s64','vqshrnal.s64',
-
-            'vqshrun.s16','vqshrunal.s16',
-            'vqshrun.s32','vqshrunal.s32',
-            'vqshrun.s64','vqshrunal.s64',
-
-            'vqsub.s8','vqsubal.s8',
-            'vqsub.s16','vqsubal.s16',
-            'vqsub.s32','vqsubal.s32',
-            'vqsub.s64','vqsubal.s64',
-
-            'vrhadd.s8','vrhaddal.s8',
-            'vrhadd.s16','vrhaddal.s16',
-            'vrhadd.s32','vrhaddal.s32',
-
-            'vrshl.s8','vrshlal.s8',
-            'vrshl.s16','vrshlal.s16',
-            'vrshl.s32','vrshlal.s32',
-            'vrshl.s64','vrshlal.s64',
-
-            'vrshr.s8','vrshral.s8',
-            'vrshr.s16','vrshral.s16',
-            'vrshr.s32','vrshral.s32',
-            'vrshr.s64','vrshral.s64',
-
-            'vrsra.s8','vrsraal.s8',
-            'vrsra.s16','vrsraal.s16',
-            'vrsra.s32','vrsraal.s32',
-            'vrsra.s64','vrsraal.s64',
-
-            'vshl.s8','vshlal.s8',
-            'vshl.s16','vshlal.s16',
-            'vshl.s32','vshlal.s32',
-            'vshl.s64','vshlal.s64',
-
-            'vshll.s8','vshllal.s8',
-            'vshll.s16','vshllal.s16',
-            'vshll.s32','vshllal.s32',
-
-            'vshr.s8','vshral.s8',
-            'vshr.s16','vshral.s16',
-            'vshr.s32','vshral.s32',
-            'vshr.s64','vshral.s64',
-
-            'vsra.s8','vsraal.s8',
-            'vsra.s16','vsraal.s16',
-            'vsra.s32','vsraal.s32',
-            'vsra.s64','vsraal.s64',
-
-            'vsubl.s8','vsublal.s8',
-            'vsubl.s16','vsublal.s16',
-            'vsubl.s32','vsublal.s32',
-
-            'vsubh.s8','vsubhal.s8',
-            'vsubh.s16','vsubhal.s16',
-            'vsubh.s32','vsubhal.s32'
-            ),
-        /* Unconditional NEON SIMD Unsigned Integer Instructions */
-        25 => array(
-            'vaba.u8','vabaal.u8',
-            'vaba.u16','vabaal.u16',
-            'vaba.u32','vabaal.u32',
-
-            'vabal.u8','vabalal.u8',
-            'vabal.u16','vabalal.u16',
-            'vabal.u32','vabalal.u32',
-
-            'vabd.u8','vabdal.u8',
-            'vabd.u16','vabdal.u16',
-            'vabd.u32','vabdal.u32',
-
-            'vaddl.u8','vaddlal.u8',
-            'vaddl.u16','vaddlal.u16',
-            'vaddl.u32','vaddlal.u32',
-
-            'vsubl.u8','vsublal.u8',
-            'vsubl.u16','vsublal.u16',
-            'vsubl.u32','vsublal.u32',
-
-            'vaddw.u8','vaddwal.u8',
-            'vaddw.u16','vaddwal.u16',
-            'vaddw.u32','vaddwal.u32',
-
-            'vsubh.u8','vsubhal.u8',
-            'vsubh.u16','vsubhal.u16',
-            'vsubh.u32','vsubhal.u32',
-
-            'vhadd.u8','vhaddal.u8',
-            'vhadd.u16','vhaddal.u16',
-            'vhadd.u32','vhaddal.u32',
-
-            'vhsub.u8','vhsubal.u8',
-            'vhsub.u16','vhsubal.u16',
-            'vhsub.u32','vhsubal.u32',
-
-            'vpadal.u8','vpadalal.u8',
-            'vpadal.u16','vpadalal.u16',
-            'vpadal.u32','vpadalal.u32',
-
-            'vpaddl.u8','vpaddlal.u8',
-            'vpaddl.u16','vpaddlal.u16',
-            'vpaddl.u32','vpaddlal.u32',
-
-            'vcge.u8','vcgeal.u8',
-            'vcge.u16','vcgeal.u16',
-            'vcge.u32','vcgeal.u32',
-
-            'vcle.u8','vcleal.u8',
-            'vcle.u16','vcleal.u16',
-            'vcle.u32','vcleal.u32',
-
-            'vcgt.u8','vcgtal.u8',
-            'vcgt.u16','vcgtal.u16',
-            'vcgt.u32','vcgtal.u32',
-
-            'vclt.u8','vcltal.u8',
-            'vclt.u16','vcltal.u16',
-            'vclt.u32','vcltal.u32',
-
-            'vmax.u8','vmaxal.u8',
-            'vmax.u16','vmaxal.u16',
-            'vmax.u32','vmaxal.u32',
-
-            'vmin.u8','vminal.u8',
-            'vmin.u16','vminal.u16',
-            'vmin.u32','vminal.u32',
-
-            'vmlal.u8','vmlalal.u8',
-            'vmlal.u16','vmlalal.u16',
-            'vmlal.u32','vmlalal.u32',
-
-            'vmlsl.u8','vmlslal.u8',
-            'vmlsl.u16','vmlslal.u16',
-            'vmlsl.u32','vmlslal.u32',
-
-            'vmull.u8','vmullal.u8',
-            'vmull.u16','vmullal.u16',
-            'vmull.u32','vmullal.u32',
-
-            'vmovl.u8','vmovlal.u8',
-            'vmovl.u16','vmovlal.u16',
-            'vmovl.u32','vmovlal.u32',
-
-            'vshl.u8','vshlal.u8',
-            'vshl.u16','vshlal.u16',
-            'vshl.u32','vshlal.u32',
-            'vshl.u64','vshlal.u64',
-
-            'vshll.u8','vshllal.u8',
-            'vshll.u16','vshllal.u16',
-            'vshll.u32','vshllal.u32',
-
-            'vshr.u8','vshral.u8',
-            'vshr.u16','vshral.u16',
-            'vshr.u32','vshral.u32',
-            'vshr.u64','vshral.u64',
-
-            'vsra.u8','vsraal.u8',
-            'vsra.u16','vsraal.u16',
-            'vsra.u32','vsraal.u32',
-            'vsra.u64','vsraal.u64',
-
-            'vpmax.u8','vpmaxal.u8',
-            'vpmax.u16','vpmaxal.u16',
-            'vpmax.u32','vpmaxal.u32',
-
-            'vpmin.u8','vpminal.u8',
-            'vpmin.u16','vpminal.u16',
-            'vpmin.u32','vpminal.u32',
-
-            'vqadd.u8','vqaddal.u8',
-            'vqadd.u16','vqaddal.u16',
-            'vqadd.u32','vqaddal.u32',
-            'vqadd.u64','vqaddal.u64',
-
-            'vqsub.u8','vqsubal.u8',
-            'vqsub.u16','vqsubal.u16',
-            'vqsub.u32','vqsubal.u32',
-            'vqsub.u64','vqsubal.u64',
-
-            'vqmovn.u16','vqmovnal.u16',
-            'vqmovn.u32','vqmovnal.u32',
-            'vqmovn.u64','vqmovnal.u64',
-
-            'vqshl.u8','vqshlal.u8',
-            'vqshl.u16','vqshlal.u16',
-            'vqshl.u32','vqshlal.u32',
-            'vqshl.u64','vqshlal.u64',
-
-            'vqshrn.u16','vqshrnal.u16',
-            'vqshrn.u32','vqshrnal.u32',
-            'vqshrn.u64','vqshrnal.u64',
-
-            'vqrshl.u8','vqrshlal.u8',
-            'vqrshl.u16','vqrshlal.u16',
-            'vqrshl.u32','vqrshlal.u32',
-            'vqrshl.u64','vqrshlal.u64',
-
-            'vqrshrn.u16','vqrshrnal.u16',
-            'vqrshrn.u32','vqrshrnal.u32',
-            'vqrshrn.u64','vqrshrnal.u64',
-
-            'vrhadd.u8','vrhaddal.u8',
-            'vrhadd.u16','vrhaddal.u16',
-            'vrhadd.u32','vrhaddal.u32',
-
-            'vrshl.u8','vrshlal.u8',
-            'vrshl.u16','vrshlal.u16',
-            'vrshl.u32','vrshlal.u32',
-            'vrshl.u64','vrshlal.u64',
-
-            'vrshr.u8','vrshral.u8',
-            'vrshr.u16','vrshral.u16',
-            'vrshr.u32','vrshral.u32',
-            'vrshr.u64','vrshral.u64',
-
-            'vrsra.u8','vrsraal.u8',
-            'vrsra.u16','vrsraal.u16',
-            'vrsra.u32','vrsraal.u32',
-            'vrsra.u64','vrsraal.u64'
-            ),
-        /* Unconditional VFPv3 & NEON SIMD Floating-Point Instructions */
-        26 => array(
-            'vabd.f32','vabdal.f32',
-
-            'vabs.f32','vabsal.f32',
-            'vabs.f64','vabsal.f64',
-
-            'vacge.f32','vacgeal.f32',
-            'vacgt.f32','vacgtal.f32',
-            'vacle.f32','vacleal.f32',
-            'vaclt.f32','vacltal.f32',
-
-            'vadd.f32','vaddal.f32',
-            'vadd.f64','vaddal.f64',
-
-            'vceq.f32','vceqal.f32',
-            'vcge.f32','vcgeal.f32',
-            'vcle.f32','vcleal.f32',
-            'vcgt.f32','vcgtal.f32',
-            'vclt.f32','vcltal.f32',
-
-            'vcmp.f32','vcmpal.f32',
-            'vcmp.f64','vcmpal.f64',
-
-            'vcmpe.f32','vcmpeal.f32',
-            'vcmpe.f64','vcmpeal.f64',
-
-            'vcvt.s16.f32','vcvtal.s16.f32',
-            'vcvt.s16.f64','vcvtal.s16.f64',
-            'vcvt.s32.f32','vcvtal.s32.f32',
-            'vcvt.s32.f64','vcvtal.s32.f64',
-            'vcvt.u16.f32','vcvtal.u16.f32',
-            'vcvt.u16.f64','vcvtal.u16.f64',
-            'vcvt.u32.f32','vcvtal.u32.f32',
-            'vcvt.u32.f64','vcvtal.u32.f64',
-            'vcvt.f16.f32','vcvtal.f16.f32',
-            'vcvt.f32.s32','vcvtal.f32.s32',
-            'vcvt.f32.u32','vcvtal.f32.u32',
-            'vcvt.f32.f16','vcvtal.f32.f16',
-            'vcvt.f32.f64','vcvtal.f32.f64',
-            'vcvt.f64.s32','vcvtal.f64.s32',
-            'vcvt.f64.u32','vcvtal.f64.u32',
-            'vcvt.f64.f32','vcvtal.f64.f32',
-
-            'vcvtr.s32.f32','vcvtral.s32.f32',
-            'vcvtr.s32.f64','vcvtral.s32.f64',
-            'vcvtr.u32.f32','vcvtral.u32.f32',
-            'vcvtr.u32.f64','vcvtral.u32.f64',
-
-            'vcvtb.f16.f32','vcvtbal.f16.f32',
-            'vcvtb.f32.f16','vcvtbal.f32.f16',
-
-            'vcvtt.f16.f32','vcvttal.f16.f32',
-            'vcvtt.f32.f16','vcvttal.f32.f16',
-
-            'vdiv.f32','vdival.f32',
-            'vdiv.f64','vdival.f64',
-
-            'vmax.f32','vmaxal.f32',
-            'vmin.f32','vminal.f32',
-
-            'vmla.f32','vmlaal.f32',
-            'vmla.f64','vmlaal.f64',
-
-            'vmls.f32','vmlsal.f32',
-            'vmls.f64','vmlsal.f64',
-
-            'vmul.f32','vmulal.f32',
-            'vmul.f64','vmulal.f64',
-
-            'vneg.f32','vnegal.f32',
-            'vneg.f64','vnegal.f64',
-
-            'vnmla.f32','vnmlaal.f32',
-            'vnmla.f64','vnmlaal.f64',
-
-            'vnmls.f32','vnmlsal.f32',
-            'vnmls.f64','vnmlsal.f64',
-
-            'vnmul.f64','vnmulal.f64',
-            'vnmul.f32','vnmulal.f32',
-
-            'vpadd.f32','vpaddal.f32',
-
-            'vpmax.f32','vpmaxal.f32',
-            'vpmin.f32','vpminal.f32',
-
-            'vrecpe.u32','vrecpeal.u32',
-            'vrecpe.f32','vrecpeal.f32',
-            'vrecps.f32','vrecpsal.f32',
-
-            'vrsqrte.u32','vrsqrteal.u32',
-            'vrsqrte.f32','vrsqrteal.f32',
-            'vrsqrts.f32','vrsqrtsal.f32',
-
-            'vsqrt.f32','vsqrtal.f32',
-            'vsqrt.f64','vsqrtal.f64',
-
-            'vsub.f32','vsubal.f32',
-            'vsub.f64','vsubal.f64'
-            ),
-        /* Conditional VFPv3 & NEON SIMD Memory Access Instructions */
-        27 => array(
-            /* Conditional VFPv3 & NEON SIMD Memory Access: Loads */
-            'vldeq.8','vldne.8','vldcs.8','vldhs.8','vldcc.8','vldlo.8','vldmi.8','vldpl.8','vldvs.8','vldvc.8','vldhi.8','vldls.8','vldge.8','vldlt.8','vldgt.8','vldle.8',
-            'vldeq.16','vldne.16','vldcs.16','vldhs.16','vldcc.16','vldlo.16','vldmi.16','vldpl.16','vldvs.16','vldvc.16','vldhi.16','vldls.16','vldge.16','vldlt.16','vldgt.16','vldle.16',
-            'vldeq.32','vldne.32','vldcs.32','vldhs.32','vldcc.32','vldlo.32','vldmi.32','vldpl.32','vldvs.32','vldvc.32','vldhi.32','vldls.32','vldge.32','vldlt.32','vldgt.32','vldle.32',
-            'vldeq.64','vldne.64','vldcs.64','vldhs.64','vldcc.64','vldlo.64','vldmi.64','vldpl.64','vldvs.64','vldvc.64','vldhi.64','vldls.64','vldge.64','vldlt.64','vldgt.64','vldle.64',
-
-            'vld1eq.8','vld1ne.8','vld1cs.8','vld1hs.8','vld1cc.8','vld1lo.8','vld1mi.8','vld1pl.8','vld1vs.8','vld1vc.8','vld1hi.8','vld1ls.8','vld1ge.8','vld1lt.8','vld1gt.8','vld1le.8',
-            'vld1eq.16','vld1ne.16','vld1cs.16','vld1hs.16','vld1cc.16','vld1lo.16','vld1mi.16','vld1pl.16','vld1vs.16','vld1vc.16','vld1hi.16','vld1ls.16','vld1ge.16','vld1lt.16','vld1gt.16','vld1le.16',
-            'vld1eq.32','vld1ne.32','vld1cs.32','vld1hs.32','vld1cc.32','vld1lo.32','vld1mi.32','vld1pl.32','vld1vs.32','vld1vc.32','vld1hi.32','vld1ls.32','vld1ge.32','vld1lt.32','vld1gt.32','vld1le.32',
-
-            'vld2eq.8','vld2ne.8','vld2cs.8','vld2hs.8','vld2cc.8','vld2lo.8','vld2mi.8','vld2pl.8','vld2vs.8','vld2vc.8','vld2hi.8','vld2ls.8','vld2ge.8','vld2lt.8','vld2gt.8','vld2le.8',
-            'vld2eq.16','vld2ne.16','vld2cs.16','vld2hs.16','vld2cc.16','vld2lo.16','vld2mi.16','vld2pl.16','vld2vs.16','vld2vc.16','vld2hi.16','vld2ls.16','vld2ge.16','vld2lt.16','vld2gt.16','vld2le.16',
-            'vld2eq.32','vld2ne.32','vld2cs.32','vld2hs.32','vld2cc.32','vld2lo.32','vld2mi.32','vld2pl.32','vld2vs.32','vld2vc.32','vld2hi.32','vld2ls.32','vld2ge.32','vld2lt.32','vld2gt.32','vld2le.32',
-
-            'vld3eq.8','vld3ne.8','vld3cs.8','vld3hs.8','vld3cc.8','vld3lo.8','vld3mi.8','vld3pl.8','vld3vs.8','vld3vc.8','vld3hi.8','vld3ls.8','vld3ge.8','vld3lt.8','vld3gt.8','vld3le.8',
-            'vld3eq.16','vld3ne.16','vld3cs.16','vld3hs.16','vld3cc.16','vld3lo.16','vld3mi.16','vld3pl.16','vld3vs.16','vld3vc.16','vld3hi.16','vld3ls.16','vld3ge.16','vld3lt.16','vld3gt.16','vld3le.16',
-            'vld3eq.32','vld3ne.32','vld3cs.32','vld3hs.32','vld3cc.32','vld3lo.32','vld3mi.32','vld3pl.32','vld3vs.32','vld3vc.32','vld3hi.32','vld3ls.32','vld3ge.32','vld3lt.32','vld3gt.32','vld3le.32',
-
-            'vld4eq.8','vld4ne.8','vld4cs.8','vld4hs.8','vld4cc.8','vld4lo.8','vld4mi.8','vld4pl.8','vld4vs.8','vld4vc.8','vld4hi.8','vld4ls.8','vld4ge.8','vld4lt.8','vld4gt.8','vld4le.8',
-            'vld4eq.16','vld4ne.16','vld4cs.16','vld4hs.16','vld4cc.16','vld4lo.16','vld4mi.16','vld4pl.16','vld4vs.16','vld4vc.16','vld4hi.16','vld4ls.16','vld4ge.16','vld4lt.16','vld4gt.16','vld4le.16',
-            'vld4eq.32','vld4ne.32','vld4cs.32','vld4hs.32','vld4cc.32','vld4lo.32','vld4mi.32','vld4pl.32','vld4vs.32','vld4vc.32','vld4hi.32','vld4ls.32','vld4ge.32','vld4lt.32','vld4gt.32','vld4le.32',
-
-            'vldmeq','vldmne','vldmcs','vldmhs','vldmcc','vldmlo','vldmmi','vldmpl','vldmvs','vldmvc','vldmhi','vldmls','vldmge','vldmlt','vldmgt','vldmle',
-            'vldmeq.32','vldmne.32','vldmcs.32','vldmhs.32','vldmcc.32','vldmlo.32','vldmmi.32','vldmpl.32','vldmvs.32','vldmvc.32','vldmhi.32','vldmls.32','vldmge.32','vldmlt.32','vldmgt.32','vldmle.32',
-            'vldmeq.64','vldmne.64','vldmcs.64','vldmhs.64','vldmcc.64','vldmlo.64','vldmmi.64','vldmpl.64','vldmvs.64','vldmvc.64','vldmhi.64','vldmls.64','vldmge.64','vldmlt.64','vldmgt.64','vldmle.64',
-
-            'vldmiaeq','vldmiane','vldmiacs','vldmiahs','vldmiacc','vldmialo','vldmiami','vldmiapl','vldmiavs','vldmiavc','vldmiahi','vldmials','vldmiage','vldmialt','vldmiagt','vldmiale',
-            'vldmiaeq.32','vldmiane.32','vldmiacs.32','vldmiahs.32','vldmiacc.32','vldmialo.32','vldmiami.32','vldmiapl.32','vldmiavs.32','vldmiavc.32','vldmiahi.32','vldmials.32','vldmiage.32','vldmialt.32','vldmiagt.32','vldmiale.32',
-            'vldmiaeq.64','vldmiane.64','vldmiacs.64','vldmiahs.64','vldmiacc.64','vldmialo.64','vldmiami.64','vldmiapl.64','vldmiavs.64','vldmiavc.64','vldmiahi.64','vldmials.64','vldmiage.64','vldmialt.64','vldmiagt.64','vldmiale.64',
-
-            'vldmdbeq','vldmdbne','vldmdbcs','vldmdbhs','vldmdbcc','vldmdblo','vldmdbmi','vldmdbpl','vldmdbvs','vldmdbvc','vldmdbhi','vldmdbls','vldmdbge','vldmdblt','vldmdbgt','vldmdble',
-            'vldmdbeq.32','vldmdbne.32','vldmdbcs.32','vldmdbhs.32','vldmdbcc.32','vldmdblo.32','vldmdbmi.32','vldmdbpl.32','vldmdbvs.32','vldmdbvc.32','vldmdbhi.32','vldmdbls.32','vldmdbge.32','vldmdblt.32','vldmdbgt.32','vldmdble.32',
-            'vldmdbeq.64','vldmdbne.64','vldmdbcs.64','vldmdbhs.64','vldmdbcc.64','vldmdblo.64','vldmdbmi.64','vldmdbpl.64','vldmdbvs.64','vldmdbvc.64','vldmdbhi.64','vldmdbls.64','vldmdbge.64','vldmdblt.64','vldmdbgt.64','vldmdble.64',
-
-            'vldreq','vldrne','vldrcs','vldrhs','vldrcc','vldrlo','vldrmi','vldrpl','vldrvs','vldrvc','vldrhi','vldrls','vldrge','vldrlt','vldrgt','vldrle',
-            'vldreq.32','vldrne.32','vldrcs.32','vldrhs.32','vldrcc.32','vldrlo.32','vldrmi.32','vldrpl.32','vldrvs.32','vldrvc.32','vldrhi.32','vldrls.32','vldrge.32','vldrlt.32','vldrgt.32','vldrle.32',
-            'vldreq.64','vldrne.64','vldrcs.64','vldrhs.64','vldrcc.64','vldrlo.64','vldrmi.64','vldrpl.64','vldrvs.64','vldrvc.64','vldrhi.64','vldrls.64','vldrge.64','vldrlt.64','vldrgt.64','vldrle.64',
-
-            'vpopeq','vpopne','vpopcs','vpophs','vpopcc','vpoplo','vpopmi','vpoppl','vpopvs','vpopvc','vpophi','vpopls','vpopge','vpoplt','vpopgt','vpople',
-            'vpopeq.32','vpopne.32','vpopcs.32','vpophs.32','vpopcc.32','vpoplo.32','vpopmi.32','vpoppl.32','vpopvs.32','vpopvc.32','vpophi.32','vpopls.32','vpopge.32','vpoplt.32','vpopgt.32','vpople.32',
-            'vpopeq.64','vpopne.64','vpopcs.64','vpophs.64','vpopcc.64','vpoplo.64','vpopmi.64','vpoppl.64','vpopvs.64','vpopvc.64','vpophi.64','vpopls.64','vpopge.64','vpoplt.64','vpopgt.64','vpople.64',
-
-            /* Conditional VFPv3 & NEON SIMD Memory Access: Stores */
-            'vst1eq.8','vst1ne.8','vst1cs.8','vst1hs.8','vst1cc.8','vst1lo.8','vst1mi.8','vst1pl.8','vst1vs.8','vst1vc.8','vst1hi.8','vst1ls.8','vst1ge.8','vst1lt.8','vst1gt.8','vst1le.8',
-            'vst1eq.16','vst1ne.16','vst1cs.16','vst1hs.16','vst1cc.16','vst1lo.16','vst1mi.16','vst1pl.16','vst1vs.16','vst1vc.16','vst1hi.16','vst1ls.16','vst1ge.16','vst1lt.16','vst1gt.16','vst1le.16',
-            'vst1eq.32','vst1ne.32','vst1cs.32','vst1hs.32','vst1cc.32','vst1lo.32','vst1mi.32','vst1pl.32','vst1vs.32','vst1vc.32','vst1hi.32','vst1ls.32','vst1ge.32','vst1lt.32','vst1gt.32','vst1le.32',
-            'vst1eq.64','vst1ne.64','vst1cs.64','vst1hs.64','vst1cc.64','vst1lo.64','vst1mi.64','vst1pl.64','vst1vs.64','vst1vc.64','vst1hi.64','vst1ls.64','vst1ge.64','vst1lt.64','vst1gt.64','vst1le.64',
-
-            'vst2eq.8','vst2ne.8','vst2cs.8','vst2hs.8','vst2cc.8','vst2lo.8','vst2mi.8','vst2pl.8','vst2vs.8','vst2vc.8','vst2hi.8','vst2ls.8','vst2ge.8','vst2lt.8','vst2gt.8','vst2le.8',
-            'vst2eq.16','vst2ne.16','vst2cs.16','vst2hs.16','vst2cc.16','vst2lo.16','vst2mi.16','vst2pl.16','vst2vs.16','vst2vc.16','vst2hi.16','vst2ls.16','vst2ge.16','vst2lt.16','vst2gt.16','vst2le.16',
-            'vst2eq.32','vst2ne.32','vst2cs.32','vst2hs.32','vst2cc.32','vst2lo.32','vst2mi.32','vst2pl.32','vst2vs.32','vst2vc.32','vst2hi.32','vst2ls.32','vst2ge.32','vst2lt.32','vst2gt.32','vst2le.32',
-
-            'vst3eq.8','vst3ne.8','vst3cs.8','vst3hs.8','vst3cc.8','vst3lo.8','vst3mi.8','vst3pl.8','vst3vs.8','vst3vc.8','vst3hi.8','vst3ls.8','vst3ge.8','vst3lt.8','vst3gt.8','vst3le.8',
-            'vst3eq.16','vst3ne.16','vst3cs.16','vst3hs.16','vst3cc.16','vst3lo.16','vst3mi.16','vst3pl.16','vst3vs.16','vst3vc.16','vst3hi.16','vst3ls.16','vst3ge.16','vst3lt.16','vst3gt.16','vst3le.16',
-            'vst3eq.32','vst3ne.32','vst3cs.32','vst3hs.32','vst3cc.32','vst3lo.32','vst3mi.32','vst3pl.32','vst3vs.32','vst3vc.32','vst3hi.32','vst3ls.32','vst3ge.32','vst3lt.32','vst3gt.32','vst3le.32',
-
-            'vst4eq.8','vst4ne.8','vst4cs.8','vst4hs.8','vst4cc.8','vst4lo.8','vst4mi.8','vst4pl.8','vst4vs.8','vst4vc.8','vst4hi.8','vst4ls.8','vst4ge.8','vst4lt.8','vst4gt.8','vst4le.8',
-            'vst4eq.16','vst4ne.16','vst4cs.16','vst4hs.16','vst4cc.16','vst4lo.16','vst4mi.16','vst4pl.16','vst4vs.16','vst4vc.16','vst4hi.16','vst4ls.16','vst4ge.16','vst4lt.16','vst4gt.16','vst4le.16',
-            'vst4eq.32','vst4ne.32','vst4cs.32','vst4hs.32','vst4cc.32','vst4lo.32','vst4mi.32','vst4pl.32','vst4vs.32','vst4vc.32','vst4hi.32','vst4ls.32','vst4ge.32','vst4lt.32','vst4gt.32','vst4le.32',
-
-            'vstmeq','vstmne','vstmcs','vstmhs','vstmcc','vstmlo','vstmmi','vstmpl','vstmvs','vstmvc','vstmhi','vstmls','vstmge','vstmlt','vstmgt','vstmle',
-            'vstmeq.32','vstmne.32','vstmcs.32','vstmhs.32','vstmcc.32','vstmlo.32','vstmmi.32','vstmpl.32','vstmvs.32','vstmvc.32','vstmhi.32','vstmls.32','vstmge.32','vstmlt.32','vstmgt.32','vstmle.32',
-            'vstmeq.64','vstmne.64','vstmcs.64','vstmhs.64','vstmcc.64','vstmlo.64','vstmmi.64','vstmpl.64','vstmvs.64','vstmvc.64','vstmhi.64','vstmls.64','vstmge.64','vstmlt.64','vstmgt.64','vstmle.64',
-
-            'vstmiaeq','vstmiane','vstmiacs','vstmiahs','vstmiacc','vstmialo','vstmiami','vstmiapl','vstmiavs','vstmiavc','vstmiahi','vstmials','vstmiage','vstmialt','vstmiagt','vstmiale',
-            'vstmiaeq.32','vstmiane.32','vstmiacs.32','vstmiahs.32','vstmiacc.32','vstmialo.32','vstmiami.32','vstmiapl.32','vstmiavs.32','vstmiavc.32','vstmiahi.32','vstmials.32','vstmiage.32','vstmialt.32','vstmiagt.32','vstmiale.32',
-            'vstmiaeq.64','vstmiane.64','vstmiacs.64','vstmiahs.64','vstmiacc.64','vstmialo.64','vstmiami.64','vstmiapl.64','vstmiavs.64','vstmiavc.64','vstmiahi.64','vstmials.64','vstmiage.64','vstmialt.64','vstmiagt.64','vstmiale.64',
-
-            'vstmdbeq','vstmdbne','vstmdbcs','vstmdbhs','vstmdbcc','vstmdblo','vstmdbmi','vstmdbpl','vstmdbvs','vstmdbvc','vstmdbhi','vstmdbls','vstmdbge','vstmdblt','vstmdbgt','vstmdble',
-            'vstmdbeq.32','vstmdbne.32','vstmdbcs.32','vstmdbhs.32','vstmdbcc.32','vstmdblo.32','vstmdbmi.32','vstmdbpl.32','vstmdbvs.32','vstmdbvc.32','vstmdbhi.32','vstmdbls.32','vstmdbge.32','vstmdblt.32','vstmdbgt.32','vstmdble.32',
-            'vstmdbeq.64','vstmdbne.64','vstmdbcs.64','vstmdbhs.64','vstmdbcc.64','vstmdblo.64','vstmdbmi.64','vstmdbpl.64','vstmdbvs.64','vstmdbvc.64','vstmdbhi.64','vstmdbls.64','vstmdbge.64','vstmdblt.64','vstmdbgt.64','vstmdble.64',
-
-            'vstreq','vstrne','vstrcs','vstrhs','vstrcc','vstrlo','vstrmi','vstrpl','vstrvs','vstrvc','vstrhi','vstrls','vstrge','vstrlt','vstrgt','vstrle',
-            'vstreq.32','vstrne.32','vstrcs.32','vstrhs.32','vstrcc.32','vstrlo.32','vstrmi.32','vstrpl.32','vstrvs.32','vstrvc.32','vstrhi.32','vstrls.32','vstrge.32','vstrlt.32','vstrgt.32','vstrle.32',
-            'vstreq.64','vstrne.64','vstrcs.64','vstrhs.64','vstrcc.64','vstrlo.64','vstrmi.64','vstrpl.64','vstrvs.64','vstrvc.64','vstrhi.64','vstrls.64','vstrge.64','vstrlt.64','vstrgt.64','vstrle.64',
-
-            'vpusheq','vpushne','vpushcs','vpushhs','vpushcc','vpushlo','vpushmi','vpushpl','vpushvs','vpushvc','vpushhi','vpushls','vpushge','vpushlt','vpushgt','vpushle',
-            'vpusheq.32','vpushne.32','vpushcs.32','vpushhs.32','vpushcc.32','vpushlo.32','vpushmi.32','vpushpl.32','vpushvs.32','vpushvc.32','vpushhi.32','vpushls.32','vpushge.32','vpushlt.32','vpushgt.32','vpushle.32',
-            'vpusheq.64','vpushne.64','vpushcs.64','vpushhs.64','vpushcc.64','vpushlo.64','vpushmi.64','vpushpl.64','vpushvs.64','vpushvc.64','vpushhi.64','vpushls.64','vpushge.64','vpushlt.64','vpushgt.64','vpushle.64'
-            ),
-        /* Conditional NEON SIMD Logical Instructions */
-        28 => array(
-            'vandeq','vandne','vandcs','vandhs','vandcc','vandlo','vandmi','vandpl','vandvs','vandvc','vandhi','vandls','vandge','vandlt','vandgt','vandle',
-            'vandeq.i8','vandne.i8','vandcs.i8','vandhs.i8','vandcc.i8','vandlo.i8','vandmi.i8','vandpl.i8','vandvs.i8','vandvc.i8','vandhi.i8','vandls.i8','vandge.i8','vandlt.i8','vandgt.i8','vandle.i8',
-            'vandeq.i16','vandne.i16','vandcs.i16','vandhs.i16','vandcc.i16','vandlo.i16','vandmi.i16','vandpl.i16','vandvs.i16','vandvc.i16','vandhi.i16','vandls.i16','vandge.i16','vandlt.i16','vandgt.i16','vandle.i16',
-            'vandeq.i32','vandne.i32','vandcs.i32','vandhs.i32','vandcc.i32','vandlo.i32','vandmi.i32','vandpl.i32','vandvs.i32','vandvc.i32','vandhi.i32','vandls.i32','vandge.i32','vandlt.i32','vandgt.i32','vandle.i32',
-            'vandeq.i64','vandne.i64','vandcs.i64','vandhs.i64','vandcc.i64','vandlo.i64','vandmi.i64','vandpl.i64','vandvs.i64','vandvc.i64','vandhi.i64','vandls.i64','vandge.i64','vandlt.i64','vandgt.i64','vandle.i64',
-            'vandeq.s8','vandne.s8','vandcs.s8','vandhs.s8','vandcc.s8','vandlo.s8','vandmi.s8','vandpl.s8','vandvs.s8','vandvc.s8','vandhi.s8','vandls.s8','vandge.s8','vandlt.s8','vandgt.s8','vandle.s8',
-            'vandeq.s16','vandne.s16','vandcs.s16','vandhs.s16','vandcc.s16','vandlo.s16','vandmi.s16','vandpl.s16','vandvs.s16','vandvc.s16','vandhi.s16','vandls.s16','vandge.s16','vandlt.s16','vandgt.s16','vandle.s16',
-            'vandeq.s32','vandne.s32','vandcs.s32','vandhs.s32','vandcc.s32','vandlo.s32','vandmi.s32','vandpl.s32','vandvs.s32','vandvc.s32','vandhi.s32','vandls.s32','vandge.s32','vandlt.s32','vandgt.s32','vandle.s32',
-            'vandeq.s64','vandne.s64','vandcs.s64','vandhs.s64','vandcc.s64','vandlo.s64','vandmi.s64','vandpl.s64','vandvs.s64','vandvc.s64','vandhi.s64','vandls.s64','vandge.s64','vandlt.s64','vandgt.s64','vandle.s64',
-            'vandeq.u8','vandne.u8','vandcs.u8','vandhs.u8','vandcc.u8','vandlo.u8','vandmi.u8','vandpl.u8','vandvs.u8','vandvc.u8','vandhi.u8','vandls.u8','vandge.u8','vandlt.u8','vandgt.u8','vandle.u8',
-            'vandeq.u16','vandne.u16','vandcs.u16','vandhs.u16','vandcc.u16','vandlo.u16','vandmi.u16','vandpl.u16','vandvs.u16','vandvc.u16','vandhi.u16','vandls.u16','vandge.u16','vandlt.u16','vandgt.u16','vandle.u16',
-            'vandeq.u32','vandne.u32','vandcs.u32','vandhs.u32','vandcc.u32','vandlo.u32','vandmi.u32','vandpl.u32','vandvs.u32','vandvc.u32','vandhi.u32','vandls.u32','vandge.u32','vandlt.u32','vandgt.u32','vandle.u32',
-            'vandeq.u64','vandne.u64','vandcs.u64','vandhs.u64','vandcc.u64','vandlo.u64','vandmi.u64','vandpl.u64','vandvs.u64','vandvc.u64','vandhi.u64','vandls.u64','vandge.u64','vandlt.u64','vandgt.u64','vandle.u64',
-            'vandeq.f32','vandne.f32','vandcs.f32','vandhs.f32','vandcc.f32','vandlo.f32','vandmi.f32','vandpl.f32','vandvs.f32','vandvc.f32','vandhi.f32','vandls.f32','vandge.f32','vandlt.f32','vandgt.f32','vandle.f32',
-            'vandeq.f64','vandne.f64','vandcs.f64','vandhs.f64','vandcc.f64','vandlo.f64','vandmi.f64','vandpl.f64','vandvs.f64','vandvc.f64','vandhi.f64','vandls.f64','vandge.f64','vandlt.f64','vandgt.f64','vandle.f64',
-
-            'vbiceq','vbicne','vbiccs','vbichs','vbiccc','vbiclo','vbicmi','vbicpl','vbicvs','vbicvc','vbichi','vbicls','vbicge','vbiclt','vbicgt','vbicle',
-            'vbiceq.i8','vbicne.i8','vbiccs.i8','vbichs.i8','vbiccc.i8','vbiclo.i8','vbicmi.i8','vbicpl.i8','vbicvs.i8','vbicvc.i8','vbichi.i8','vbicls.i8','vbicge.i8','vbiclt.i8','vbicgt.i8','vbicle.i8',
-            'vbiceq.i16','vbicne.i16','vbiccs.i16','vbichs.i16','vbiccc.i16','vbiclo.i16','vbicmi.i16','vbicpl.i16','vbicvs.i16','vbicvc.i16','vbichi.i16','vbicls.i16','vbicge.i16','vbiclt.i16','vbicgt.i16','vbicle.i16',
-            'vbiceq.i32','vbicne.i32','vbiccs.i32','vbichs.i32','vbiccc.i32','vbiclo.i32','vbicmi.i32','vbicpl.i32','vbicvs.i32','vbicvc.i32','vbichi.i32','vbicls.i32','vbicge.i32','vbiclt.i32','vbicgt.i32','vbicle.i32',
-            'vbiceq.i64','vbicne.i64','vbiccs.i64','vbichs.i64','vbiccc.i64','vbiclo.i64','vbicmi.i64','vbicpl.i64','vbicvs.i64','vbicvc.i64','vbichi.i64','vbicls.i64','vbicge.i64','vbiclt.i64','vbicgt.i64','vbicle.i64',
-            'vbiceq.s8','vbicne.s8','vbiccs.s8','vbichs.s8','vbiccc.s8','vbiclo.s8','vbicmi.s8','vbicpl.s8','vbicvs.s8','vbicvc.s8','vbichi.s8','vbicls.s8','vbicge.s8','vbiclt.s8','vbicgt.s8','vbicle.s8',
-            'vbiceq.s16','vbicne.s16','vbiccs.s16','vbichs.s16','vbiccc.s16','vbiclo.s16','vbicmi.s16','vbicpl.s16','vbicvs.s16','vbicvc.s16','vbichi.s16','vbicls.s16','vbicge.s16','vbiclt.s16','vbicgt.s16','vbicle.s16',
-            'vbiceq.s32','vbicne.s32','vbiccs.s32','vbichs.s32','vbiccc.s32','vbiclo.s32','vbicmi.s32','vbicpl.s32','vbicvs.s32','vbicvc.s32','vbichi.s32','vbicls.s32','vbicge.s32','vbiclt.s32','vbicgt.s32','vbicle.s32',
-            'vbiceq.s64','vbicne.s64','vbiccs.s64','vbichs.s64','vbiccc.s64','vbiclo.s64','vbicmi.s64','vbicpl.s64','vbicvs.s64','vbicvc.s64','vbichi.s64','vbicls.s64','vbicge.s64','vbiclt.s64','vbicgt.s64','vbicle.s64',
-            'vbiceq.u8','vbicne.u8','vbiccs.u8','vbichs.u8','vbiccc.u8','vbiclo.u8','vbicmi.u8','vbicpl.u8','vbicvs.u8','vbicvc.u8','vbichi.u8','vbicls.u8','vbicge.u8','vbiclt.u8','vbicgt.u8','vbicle.u8',
-            'vbiceq.u16','vbicne.u16','vbiccs.u16','vbichs.u16','vbiccc.u16','vbiclo.u16','vbicmi.u16','vbicpl.u16','vbicvs.u16','vbicvc.u16','vbichi.u16','vbicls.u16','vbicge.u16','vbiclt.u16','vbicgt.u16','vbicle.u16',
-            'vbiceq.u32','vbicne.u32','vbiccs.u32','vbichs.u32','vbiccc.u32','vbiclo.u32','vbicmi.u32','vbicpl.u32','vbicvs.u32','vbicvc.u32','vbichi.u32','vbicls.u32','vbicge.u32','vbiclt.u32','vbicgt.u32','vbicle.u32',
-            'vbiceq.u64','vbicne.u64','vbiccs.u64','vbichs.u64','vbiccc.u64','vbiclo.u64','vbicmi.u64','vbicpl.u64','vbicvs.u64','vbicvc.u64','vbichi.u64','vbicls.u64','vbicge.u64','vbiclt.u64','vbicgt.u64','vbicle.u64',
-            'vbiceq.f32','vbicne.f32','vbiccs.f32','vbichs.f32','vbiccc.f32','vbiclo.f32','vbicmi.f32','vbicpl.f32','vbicvs.f32','vbicvc.f32','vbichi.f32','vbicls.f32','vbicge.f32','vbiclt.f32','vbicgt.f32','vbicle.f32',
-            'vbiceq.f64','vbicne.f64','vbiccs.f64','vbichs.f64','vbiccc.f64','vbiclo.f64','vbicmi.f64','vbicpl.f64','vbicvs.f64','vbicvc.f64','vbichi.f64','vbicls.f64','vbicge.f64','vbiclt.f64','vbicgt.f64','vbicle.f64',
-
-            'vbifeq','vbifne','vbifcs','vbifhs','vbifcc','vbiflo','vbifmi','vbifpl','vbifvs','vbifvc','vbifhi','vbifls','vbifge','vbiflt','vbifgt','vbifle',
-            'vbifeq.i8','vbifne.i8','vbifcs.i8','vbifhs.i8','vbifcc.i8','vbiflo.i8','vbifmi.i8','vbifpl.i8','vbifvs.i8','vbifvc.i8','vbifhi.i8','vbifls.i8','vbifge.i8','vbiflt.i8','vbifgt.i8','vbifle.i8',
-            'vbifeq.i16','vbifne.i16','vbifcs.i16','vbifhs.i16','vbifcc.i16','vbiflo.i16','vbifmi.i16','vbifpl.i16','vbifvs.i16','vbifvc.i16','vbifhi.i16','vbifls.i16','vbifge.i16','vbiflt.i16','vbifgt.i16','vbifle.i16',
-            'vbifeq.i32','vbifne.i32','vbifcs.i32','vbifhs.i32','vbifcc.i32','vbiflo.i32','vbifmi.i32','vbifpl.i32','vbifvs.i32','vbifvc.i32','vbifhi.i32','vbifls.i32','vbifge.i32','vbiflt.i32','vbifgt.i32','vbifle.i32',
-            'vbifeq.i64','vbifne.i64','vbifcs.i64','vbifhs.i64','vbifcc.i64','vbiflo.i64','vbifmi.i64','vbifpl.i64','vbifvs.i64','vbifvc.i64','vbifhi.i64','vbifls.i64','vbifge.i64','vbiflt.i64','vbifgt.i64','vbifle.i64',
-            'vbifeq.s8','vbifne.s8','vbifcs.s8','vbifhs.s8','vbifcc.s8','vbiflo.s8','vbifmi.s8','vbifpl.s8','vbifvs.s8','vbifvc.s8','vbifhi.s8','vbifls.s8','vbifge.s8','vbiflt.s8','vbifgt.s8','vbifle.s8',
-            'vbifeq.s16','vbifne.s16','vbifcs.s16','vbifhs.s16','vbifcc.s16','vbiflo.s16','vbifmi.s16','vbifpl.s16','vbifvs.s16','vbifvc.s16','vbifhi.s16','vbifls.s16','vbifge.s16','vbiflt.s16','vbifgt.s16','vbifle.s16',
-            'vbifeq.s32','vbifne.s32','vbifcs.s32','vbifhs.s32','vbifcc.s32','vbiflo.s32','vbifmi.s32','vbifpl.s32','vbifvs.s32','vbifvc.s32','vbifhi.s32','vbifls.s32','vbifge.s32','vbiflt.s32','vbifgt.s32','vbifle.s32',
-            'vbifeq.s64','vbifne.s64','vbifcs.s64','vbifhs.s64','vbifcc.s64','vbiflo.s64','vbifmi.s64','vbifpl.s64','vbifvs.s64','vbifvc.s64','vbifhi.s64','vbifls.s64','vbifge.s64','vbiflt.s64','vbifgt.s64','vbifle.s64',
-            'vbifeq.u8','vbifne.u8','vbifcs.u8','vbifhs.u8','vbifcc.u8','vbiflo.u8','vbifmi.u8','vbifpl.u8','vbifvs.u8','vbifvc.u8','vbifhi.u8','vbifls.u8','vbifge.u8','vbiflt.u8','vbifgt.u8','vbifle.u8',
-            'vbifeq.u16','vbifne.u16','vbifcs.u16','vbifhs.u16','vbifcc.u16','vbiflo.u16','vbifmi.u16','vbifpl.u16','vbifvs.u16','vbifvc.u16','vbifhi.u16','vbifls.u16','vbifge.u16','vbiflt.u16','vbifgt.u16','vbifle.u16',
-            'vbifeq.u32','vbifne.u32','vbifcs.u32','vbifhs.u32','vbifcc.u32','vbiflo.u32','vbifmi.u32','vbifpl.u32','vbifvs.u32','vbifvc.u32','vbifhi.u32','vbifls.u32','vbifge.u32','vbiflt.u32','vbifgt.u32','vbifle.u32',
-            'vbifeq.u64','vbifne.u64','vbifcs.u64','vbifhs.u64','vbifcc.u64','vbiflo.u64','vbifmi.u64','vbifpl.u64','vbifvs.u64','vbifvc.u64','vbifhi.u64','vbifls.u64','vbifge.u64','vbiflt.u64','vbifgt.u64','vbifle.u64',
-            'vbifeq.f32','vbifne.f32','vbifcs.f32','vbifhs.f32','vbifcc.f32','vbiflo.f32','vbifmi.f32','vbifpl.f32','vbifvs.f32','vbifvc.f32','vbifhi.f32','vbifls.f32','vbifge.f32','vbiflt.f32','vbifgt.f32','vbifle.f32',
-            'vbifeq.f64','vbifne.f64','vbifcs.f64','vbifhs.f64','vbifcc.f64','vbiflo.f64','vbifmi.f64','vbifpl.f64','vbifvs.f64','vbifvc.f64','vbifhi.f64','vbifls.f64','vbifge.f64','vbiflt.f64','vbifgt.f64','vbifle.f64',
-
-            'vbiteq','vbitne','vbitcs','vbiths','vbitcc','vbitlo','vbitmi','vbitpl','vbitvs','vbitvc','vbithi','vbitls','vbitge','vbitlt','vbitgt','vbitle',
-            'vbiteq.i8','vbitne.i8','vbitcs.i8','vbiths.i8','vbitcc.i8','vbitlo.i8','vbitmi.i8','vbitpl.i8','vbitvs.i8','vbitvc.i8','vbithi.i8','vbitls.i8','vbitge.i8','vbitlt.i8','vbitgt.i8','vbitle.i8',
-            'vbiteq.i16','vbitne.i16','vbitcs.i16','vbiths.i16','vbitcc.i16','vbitlo.i16','vbitmi.i16','vbitpl.i16','vbitvs.i16','vbitvc.i16','vbithi.i16','vbitls.i16','vbitge.i16','vbitlt.i16','vbitgt.i16','vbitle.i16',
-            'vbiteq.i32','vbitne.i32','vbitcs.i32','vbiths.i32','vbitcc.i32','vbitlo.i32','vbitmi.i32','vbitpl.i32','vbitvs.i32','vbitvc.i32','vbithi.i32','vbitls.i32','vbitge.i32','vbitlt.i32','vbitgt.i32','vbitle.i32',
-            'vbiteq.i64','vbitne.i64','vbitcs.i64','vbiths.i64','vbitcc.i64','vbitlo.i64','vbitmi.i64','vbitpl.i64','vbitvs.i64','vbitvc.i64','vbithi.i64','vbitls.i64','vbitge.i64','vbitlt.i64','vbitgt.i64','vbitle.i64',
-            'vbiteq.s8','vbitne.s8','vbitcs.s8','vbiths.s8','vbitcc.s8','vbitlo.s8','vbitmi.s8','vbitpl.s8','vbitvs.s8','vbitvc.s8','vbithi.s8','vbitls.s8','vbitge.s8','vbitlt.s8','vbitgt.s8','vbitle.s8',
-            'vbiteq.s16','vbitne.s16','vbitcs.s16','vbiths.s16','vbitcc.s16','vbitlo.s16','vbitmi.s16','vbitpl.s16','vbitvs.s16','vbitvc.s16','vbithi.s16','vbitls.s16','vbitge.s16','vbitlt.s16','vbitgt.s16','vbitle.s16',
-            'vbiteq.s32','vbitne.s32','vbitcs.s32','vbiths.s32','vbitcc.s32','vbitlo.s32','vbitmi.s32','vbitpl.s32','vbitvs.s32','vbitvc.s32','vbithi.s32','vbitls.s32','vbitge.s32','vbitlt.s32','vbitgt.s32','vbitle.s32',
-            'vbiteq.s64','vbitne.s64','vbitcs.s64','vbiths.s64','vbitcc.s64','vbitlo.s64','vbitmi.s64','vbitpl.s64','vbitvs.s64','vbitvc.s64','vbithi.s64','vbitls.s64','vbitge.s64','vbitlt.s64','vbitgt.s64','vbitle.s64',
-            'vbiteq.u8','vbitne.u8','vbitcs.u8','vbiths.u8','vbitcc.u8','vbitlo.u8','vbitmi.u8','vbitpl.u8','vbitvs.u8','vbitvc.u8','vbithi.u8','vbitls.u8','vbitge.u8','vbitlt.u8','vbitgt.u8','vbitle.u8',
-            'vbiteq.u16','vbitne.u16','vbitcs.u16','vbiths.u16','vbitcc.u16','vbitlo.u16','vbitmi.u16','vbitpl.u16','vbitvs.u16','vbitvc.u16','vbithi.u16','vbitls.u16','vbitge.u16','vbitlt.u16','vbitgt.u16','vbitle.u16',
-            'vbiteq.u32','vbitne.u32','vbitcs.u32','vbiths.u32','vbitcc.u32','vbitlo.u32','vbitmi.u32','vbitpl.u32','vbitvs.u32','vbitvc.u32','vbithi.u32','vbitls.u32','vbitge.u32','vbitlt.u32','vbitgt.u32','vbitle.u32',
-            'vbiteq.u64','vbitne.u64','vbitcs.u64','vbiths.u64','vbitcc.u64','vbitlo.u64','vbitmi.u64','vbitpl.u64','vbitvs.u64','vbitvc.u64','vbithi.u64','vbitls.u64','vbitge.u64','vbitlt.u64','vbitgt.u64','vbitle.u64',
-            'vbiteq.f32','vbitne.f32','vbitcs.f32','vbiths.f32','vbitcc.f32','vbitlo.f32','vbitmi.f32','vbitpl.f32','vbitvs.f32','vbitvc.f32','vbithi.f32','vbitls.f32','vbitge.f32','vbitlt.f32','vbitgt.f32','vbitle.f32',
-            'vbiteq.f64','vbitne.f64','vbitcs.f64','vbiths.f64','vbitcc.f64','vbitlo.f64','vbitmi.f64','vbitpl.f64','vbitvs.f64','vbitvc.f64','vbithi.f64','vbitls.f64','vbitge.f64','vbitlt.f64','vbitgt.f64','vbitle.f64',
-
-            'vbsleq','vbslne','vbslcs','vbslhs','vbslcc','vbsllo','vbslmi','vbslpl','vbslvs','vbslvc','vbslhi','vbslls','vbslge','vbsllt','vbslgt','vbslle',
-            'vbsleq.i8','vbslne.i8','vbslcs.i8','vbslhs.i8','vbslcc.i8','vbsllo.i8','vbslmi.i8','vbslpl.i8','vbslvs.i8','vbslvc.i8','vbslhi.i8','vbslls.i8','vbslge.i8','vbsllt.i8','vbslgt.i8','vbslle.i8',
-            'vbsleq.i16','vbslne.i16','vbslcs.i16','vbslhs.i16','vbslcc.i16','vbsllo.i16','vbslmi.i16','vbslpl.i16','vbslvs.i16','vbslvc.i16','vbslhi.i16','vbslls.i16','vbslge.i16','vbsllt.i16','vbslgt.i16','vbslle.i16',
-            'vbsleq.i32','vbslne.i32','vbslcs.i32','vbslhs.i32','vbslcc.i32','vbsllo.i32','vbslmi.i32','vbslpl.i32','vbslvs.i32','vbslvc.i32','vbslhi.i32','vbslls.i32','vbslge.i32','vbsllt.i32','vbslgt.i32','vbslle.i32',
-            'vbsleq.i64','vbslne.i64','vbslcs.i64','vbslhs.i64','vbslcc.i64','vbsllo.i64','vbslmi.i64','vbslpl.i64','vbslvs.i64','vbslvc.i64','vbslhi.i64','vbslls.i64','vbslge.i64','vbsllt.i64','vbslgt.i64','vbslle.i64',
-            'vbsleq.s8','vbslne.s8','vbslcs.s8','vbslhs.s8','vbslcc.s8','vbsllo.s8','vbslmi.s8','vbslpl.s8','vbslvs.s8','vbslvc.s8','vbslhi.s8','vbslls.s8','vbslge.s8','vbsllt.s8','vbslgt.s8','vbslle.s8',
-            'vbsleq.s16','vbslne.s16','vbslcs.s16','vbslhs.s16','vbslcc.s16','vbsllo.s16','vbslmi.s16','vbslpl.s16','vbslvs.s16','vbslvc.s16','vbslhi.s16','vbslls.s16','vbslge.s16','vbsllt.s16','vbslgt.s16','vbslle.s16',
-            'vbsleq.s32','vbslne.s32','vbslcs.s32','vbslhs.s32','vbslcc.s32','vbsllo.s32','vbslmi.s32','vbslpl.s32','vbslvs.s32','vbslvc.s32','vbslhi.s32','vbslls.s32','vbslge.s32','vbsllt.s32','vbslgt.s32','vbslle.s32',
-            'vbsleq.s64','vbslne.s64','vbslcs.s64','vbslhs.s64','vbslcc.s64','vbsllo.s64','vbslmi.s64','vbslpl.s64','vbslvs.s64','vbslvc.s64','vbslhi.s64','vbslls.s64','vbslge.s64','vbsllt.s64','vbslgt.s64','vbslle.s64',
-            'vbsleq.u8','vbslne.u8','vbslcs.u8','vbslhs.u8','vbslcc.u8','vbsllo.u8','vbslmi.u8','vbslpl.u8','vbslvs.u8','vbslvc.u8','vbslhi.u8','vbslls.u8','vbslge.u8','vbsllt.u8','vbslgt.u8','vbslle.u8',
-            'vbsleq.u16','vbslne.u16','vbslcs.u16','vbslhs.u16','vbslcc.u16','vbsllo.u16','vbslmi.u16','vbslpl.u16','vbslvs.u16','vbslvc.u16','vbslhi.u16','vbslls.u16','vbslge.u16','vbsllt.u16','vbslgt.u16','vbslle.u16',
-            'vbsleq.u32','vbslne.u32','vbslcs.u32','vbslhs.u32','vbslcc.u32','vbsllo.u32','vbslmi.u32','vbslpl.u32','vbslvs.u32','vbslvc.u32','vbslhi.u32','vbslls.u32','vbslge.u32','vbsllt.u32','vbslgt.u32','vbslle.u32',
-            'vbsleq.u64','vbslne.u64','vbslcs.u64','vbslhs.u64','vbslcc.u64','vbsllo.u64','vbslmi.u64','vbslpl.u64','vbslvs.u64','vbslvc.u64','vbslhi.u64','vbslls.u64','vbslge.u64','vbsllt.u64','vbslgt.u64','vbslle.u64',
-            'vbsleq.f32','vbslne.f32','vbslcs.f32','vbslhs.f32','vbslcc.f32','vbsllo.f32','vbslmi.f32','vbslpl.f32','vbslvs.f32','vbslvc.f32','vbslhi.f32','vbslls.f32','vbslge.f32','vbsllt.f32','vbslgt.f32','vbslle.f32',
-            'vbsleq.f64','vbslne.f64','vbslcs.f64','vbslhs.f64','vbslcc.f64','vbsllo.f64','vbslmi.f64','vbslpl.f64','vbslvs.f64','vbslvc.f64','vbslhi.f64','vbslls.f64','vbslge.f64','vbsllt.f64','vbslgt.f64','vbslle.f64',
-
-            'veoreq','veorne','veorcs','veorhs','veorcc','veorlo','veormi','veorpl','veorvs','veorvc','veorhi','veorls','veorge','veorlt','veorgt','veorle',
-            'veoreq.i8','veorne.i8','veorcs.i8','veorhs.i8','veorcc.i8','veorlo.i8','veormi.i8','veorpl.i8','veorvs.i8','veorvc.i8','veorhi.i8','veorls.i8','veorge.i8','veorlt.i8','veorgt.i8','veorle.i8',
-            'veoreq.i16','veorne.i16','veorcs.i16','veorhs.i16','veorcc.i16','veorlo.i16','veormi.i16','veorpl.i16','veorvs.i16','veorvc.i16','veorhi.i16','veorls.i16','veorge.i16','veorlt.i16','veorgt.i16','veorle.i16',
-            'veoreq.i32','veorne.i32','veorcs.i32','veorhs.i32','veorcc.i32','veorlo.i32','veormi.i32','veorpl.i32','veorvs.i32','veorvc.i32','veorhi.i32','veorls.i32','veorge.i32','veorlt.i32','veorgt.i32','veorle.i32',
-            'veoreq.i64','veorne.i64','veorcs.i64','veorhs.i64','veorcc.i64','veorlo.i64','veormi.i64','veorpl.i64','veorvs.i64','veorvc.i64','veorhi.i64','veorls.i64','veorge.i64','veorlt.i64','veorgt.i64','veorle.i64',
-            'veoreq.s8','veorne.s8','veorcs.s8','veorhs.s8','veorcc.s8','veorlo.s8','veormi.s8','veorpl.s8','veorvs.s8','veorvc.s8','veorhi.s8','veorls.s8','veorge.s8','veorlt.s8','veorgt.s8','veorle.s8',
-            'veoreq.s16','veorne.s16','veorcs.s16','veorhs.s16','veorcc.s16','veorlo.s16','veormi.s16','veorpl.s16','veorvs.s16','veorvc.s16','veorhi.s16','veorls.s16','veorge.s16','veorlt.s16','veorgt.s16','veorle.s16',
-            'veoreq.s32','veorne.s32','veorcs.s32','veorhs.s32','veorcc.s32','veorlo.s32','veormi.s32','veorpl.s32','veorvs.s32','veorvc.s32','veorhi.s32','veorls.s32','veorge.s32','veorlt.s32','veorgt.s32','veorle.s32',
-            'veoreq.s64','veorne.s64','veorcs.s64','veorhs.s64','veorcc.s64','veorlo.s64','veormi.s64','veorpl.s64','veorvs.s64','veorvc.s64','veorhi.s64','veorls.s64','veorge.s64','veorlt.s64','veorgt.s64','veorle.s64',
-            'veoreq.u8','veorne.u8','veorcs.u8','veorhs.u8','veorcc.u8','veorlo.u8','veormi.u8','veorpl.u8','veorvs.u8','veorvc.u8','veorhi.u8','veorls.u8','veorge.u8','veorlt.u8','veorgt.u8','veorle.u8',
-            'veoreq.u16','veorne.u16','veorcs.u16','veorhs.u16','veorcc.u16','veorlo.u16','veormi.u16','veorpl.u16','veorvs.u16','veorvc.u16','veorhi.u16','veorls.u16','veorge.u16','veorlt.u16','veorgt.u16','veorle.u16',
-            'veoreq.u32','veorne.u32','veorcs.u32','veorhs.u32','veorcc.u32','veorlo.u32','veormi.u32','veorpl.u32','veorvs.u32','veorvc.u32','veorhi.u32','veorls.u32','veorge.u32','veorlt.u32','veorgt.u32','veorle.u32',
-            'veoreq.u64','veorne.u64','veorcs.u64','veorhs.u64','veorcc.u64','veorlo.u64','veormi.u64','veorpl.u64','veorvs.u64','veorvc.u64','veorhi.u64','veorls.u64','veorge.u64','veorlt.u64','veorgt.u64','veorle.u64',
-            'veoreq.f32','veorne.f32','veorcs.f32','veorhs.f32','veorcc.f32','veorlo.f32','veormi.f32','veorpl.f32','veorvs.f32','veorvc.f32','veorhi.f32','veorls.f32','veorge.f32','veorlt.f32','veorgt.f32','veorle.f32',
-            'veoreq.f64','veorne.f64','veorcs.f64','veorhs.f64','veorcc.f64','veorlo.f64','veormi.f64','veorpl.f64','veorvs.f64','veorvc.f64','veorhi.f64','veorls.f64','veorge.f64','veorlt.f64','veorgt.f64','veorle.f64',
-
-            'vmoveq','vmovne','vmovcs','vmovhs','vmovcc','vmovlo','vmovmi','vmovpl','vmovvs','vmovvc','vmovhi','vmovls','vmovge','vmovlt','vmovgt','vmovle',
-            'vmoveq.8','vmovne.8','vmovcs.8','vmovhs.8','vmovcc.8','vmovlo.8','vmovmi.8','vmovpl.8','vmovvs.8','vmovvc.8','vmovhi.8','vmovls.8','vmovge.8','vmovlt.8','vmovgt.8','vmovle.8',
-            'vmoveq.16','vmovne.16','vmovcs.16','vmovhs.16','vmovcc.16','vmovlo.16','vmovmi.16','vmovpl.16','vmovvs.16','vmovvc.16','vmovhi.16','vmovls.16','vmovge.16','vmovlt.16','vmovgt.16','vmovle.16',
-            'vmoveq.32','vmovne.32','vmovcs.32','vmovhs.32','vmovcc.32','vmovlo.32','vmovmi.32','vmovpl.32','vmovvs.32','vmovvc.32','vmovhi.32','vmovls.32','vmovge.32','vmovlt.32','vmovgt.32','vmovle.32',
-            'vmoveq.i8','vmovne.i8','vmovcs.i8','vmovhs.i8','vmovcc.i8','vmovlo.i8','vmovmi.i8','vmovpl.i8','vmovvs.i8','vmovvc.i8','vmovhi.i8','vmovls.i8','vmovge.i8','vmovlt.i8','vmovgt.i8','vmovle.i8',
-            'vmoveq.i16','vmovne.i16','vmovcs.i16','vmovhs.i16','vmovcc.i16','vmovlo.i16','vmovmi.i16','vmovpl.i16','vmovvs.i16','vmovvc.i16','vmovhi.i16','vmovls.i16','vmovge.i16','vmovlt.i16','vmovgt.i16','vmovle.i16',
-            'vmoveq.i32','vmovne.i32','vmovcs.i32','vmovhs.i32','vmovcc.i32','vmovlo.i32','vmovmi.i32','vmovpl.i32','vmovvs.i32','vmovvc.i32','vmovhi.i32','vmovls.i32','vmovge.i32','vmovlt.i32','vmovgt.i32','vmovle.i32',
-            'vmoveq.i64','vmovne.i64','vmovcs.i64','vmovhs.i64','vmovcc.i64','vmovlo.i64','vmovmi.i64','vmovpl.i64','vmovvs.i64','vmovvc.i64','vmovhi.i64','vmovls.i64','vmovge.i64','vmovlt.i64','vmovgt.i64','vmovle.i64',
-            'vmoveq.f32','vmovne.f32','vmovcs.f32','vmovhs.f32','vmovcc.f32','vmovlo.f32','vmovmi.f32','vmovpl.f32','vmovvs.f32','vmovvc.f32','vmovhi.f32','vmovls.f32','vmovge.f32','vmovlt.f32','vmovgt.f32','vmovle.f32',
-            'vmoveq.f64','vmovne.f64','vmovcs.f64','vmovhs.f64','vmovcc.f64','vmovlo.f64','vmovmi.f64','vmovpl.f64','vmovvs.f64','vmovvc.f64','vmovhi.f64','vmovls.f64','vmovge.f64','vmovlt.f64','vmovgt.f64','vmovle.f64',
-
-            'vmvneq','vmvnne','vmvncs','vmvnhs','vmvncc','vmvnlo','vmvnmi','vmvnpl','vmvnvs','vmvnvc','vmvnhi','vmvnls','vmvnge','vmvnlt','vmvngt','vmvnle',
-            'vmvneq.s8','vmvnne.s8','vmvncs.s8','vmvnhs.s8','vmvncc.s8','vmvnlo.s8','vmvnmi.s8','vmvnpl.s8','vmvnvs.s8','vmvnvc.s8','vmvnhi.s8','vmvnls.s8','vmvnge.s8','vmvnlt.s8','vmvngt.s8','vmvnle.s8',
-            'vmvneq.s16','vmvnne.s16','vmvncs.s16','vmvnhs.s16','vmvncc.s16','vmvnlo.s16','vmvnmi.s16','vmvnpl.s16','vmvnvs.s16','vmvnvc.s16','vmvnhi.s16','vmvnls.s16','vmvnge.s16','vmvnlt.s16','vmvngt.s16','vmvnle.s16',
-            'vmvneq.s32','vmvnne.s32','vmvncs.s32','vmvnhs.s32','vmvncc.s32','vmvnlo.s32','vmvnmi.s32','vmvnpl.s32','vmvnvs.s32','vmvnvc.s32','vmvnhi.s32','vmvnls.s32','vmvnge.s32','vmvnlt.s32','vmvngt.s32','vmvnle.s32',
-            'vmvneq.s64','vmvnne.s64','vmvncs.s64','vmvnhs.s64','vmvncc.s64','vmvnlo.s64','vmvnmi.s64','vmvnpl.s64','vmvnvs.s64','vmvnvc.s64','vmvnhi.s64','vmvnls.s64','vmvnge.s64','vmvnlt.s64','vmvngt.s64','vmvnle.s64',
-            'vmvneq.u8','vmvnne.u8','vmvncs.u8','vmvnhs.u8','vmvncc.u8','vmvnlo.u8','vmvnmi.u8','vmvnpl.u8','vmvnvs.u8','vmvnvc.u8','vmvnhi.u8','vmvnls.u8','vmvnge.u8','vmvnlt.u8','vmvngt.u8','vmvnle.u8',
-            'vmvneq.u16','vmvnne.u16','vmvncs.u16','vmvnhs.u16','vmvncc.u16','vmvnlo.u16','vmvnmi.u16','vmvnpl.u16','vmvnvs.u16','vmvnvc.u16','vmvnhi.u16','vmvnls.u16','vmvnge.u16','vmvnlt.u16','vmvngt.u16','vmvnle.u16',
-            'vmvneq.u32','vmvnne.u32','vmvncs.u32','vmvnhs.u32','vmvncc.u32','vmvnlo.u32','vmvnmi.u32','vmvnpl.u32','vmvnvs.u32','vmvnvc.u32','vmvnhi.u32','vmvnls.u32','vmvnge.u32','vmvnlt.u32','vmvngt.u32','vmvnle.u32',
-            'vmvneq.u64','vmvnne.u64','vmvncs.u64','vmvnhs.u64','vmvncc.u64','vmvnlo.u64','vmvnmi.u64','vmvnpl.u64','vmvnvs.u64','vmvnvc.u64','vmvnhi.u64','vmvnls.u64','vmvnge.u64','vmvnlt.u64','vmvngt.u64','vmvnle.u64',
-            'vmvneq.i8','vmvnne.i8','vmvncs.i8','vmvnhs.i8','vmvncc.i8','vmvnlo.i8','vmvnmi.i8','vmvnpl.i8','vmvnvs.i8','vmvnvc.i8','vmvnhi.i8','vmvnls.i8','vmvnge.i8','vmvnlt.i8','vmvngt.i8','vmvnle.i8',
-            'vmvneq.i16','vmvnne.i16','vmvncs.i16','vmvnhs.i16','vmvncc.i16','vmvnlo.i16','vmvnmi.i16','vmvnpl.i16','vmvnvs.i16','vmvnvc.i16','vmvnhi.i16','vmvnls.i16','vmvnge.i16','vmvnlt.i16','vmvngt.i16','vmvnle.i16',
-            'vmvneq.i32','vmvnne.i32','vmvncs.i32','vmvnhs.i32','vmvncc.i32','vmvnlo.i32','vmvnmi.i32','vmvnpl.i32','vmvnvs.i32','vmvnvc.i32','vmvnhi.i32','vmvnls.i32','vmvnge.i32','vmvnlt.i32','vmvngt.i32','vmvnle.i32',
-            'vmvneq.i64','vmvnne.i64','vmvncs.i64','vmvnhs.i64','vmvncc.i64','vmvnlo.i64','vmvnmi.i64','vmvnpl.i64','vmvnvs.i64','vmvnvc.i64','vmvnhi.i64','vmvnls.i64','vmvnge.i64','vmvnlt.i64','vmvngt.i64','vmvnle.i64',
-            'vmvneq.f32','vmvnne.f32','vmvncs.f32','vmvnhs.f32','vmvncc.f32','vmvnlo.f32','vmvnmi.f32','vmvnpl.f32','vmvnvs.f32','vmvnvc.f32','vmvnhi.f32','vmvnls.f32','vmvnge.f32','vmvnlt.f32','vmvngt.f32','vmvnle.f32',
-            'vmvneq.f64','vmvnne.f64','vmvncs.f64','vmvnhs.f64','vmvncc.f64','vmvnlo.f64','vmvnmi.f64','vmvnpl.f64','vmvnvs.f64','vmvnvc.f64','vmvnhi.f64','vmvnls.f64','vmvnge.f64','vmvnlt.f64','vmvngt.f64','vmvnle.f64',
-
-            'vorneq','vornne','vorncs','vornhs','vorncc','vornlo','vornmi','vornpl','vornvs','vornvc','vornhi','vornls','vornge','vornlt','vorngt','vornle',
-            'vorneq.s8','vornne.s8','vorncs.s8','vornhs.s8','vorncc.s8','vornlo.s8','vornmi.s8','vornpl.s8','vornvs.s8','vornvc.s8','vornhi.s8','vornls.s8','vornge.s8','vornlt.s8','vorngt.s8','vornle.s8',
-            'vorneq.s16','vornne.s16','vorncs.s16','vornhs.s16','vorncc.s16','vornlo.s16','vornmi.s16','vornpl.s16','vornvs.s16','vornvc.s16','vornhi.s16','vornls.s16','vornge.s16','vornlt.s16','vorngt.s16','vornle.s16',
-            'vorneq.s32','vornne.s32','vorncs.s32','vornhs.s32','vorncc.s32','vornlo.s32','vornmi.s32','vornpl.s32','vornvs.s32','vornvc.s32','vornhi.s32','vornls.s32','vornge.s32','vornlt.s32','vorngt.s32','vornle.s32',
-            'vorneq.s64','vornne.s64','vorncs.s64','vornhs.s64','vorncc.s64','vornlo.s64','vornmi.s64','vornpl.s64','vornvs.s64','vornvc.s64','vornhi.s64','vornls.s64','vornge.s64','vornlt.s64','vorngt.s64','vornle.s64',
-            'vorneq.u8','vornne.u8','vorncs.u8','vornhs.u8','vorncc.u8','vornlo.u8','vornmi.u8','vornpl.u8','vornvs.u8','vornvc.u8','vornhi.u8','vornls.u8','vornge.u8','vornlt.u8','vorngt.u8','vornle.u8',
-            'vorneq.u16','vornne.u16','vorncs.u16','vornhs.u16','vorncc.u16','vornlo.u16','vornmi.u16','vornpl.u16','vornvs.u16','vornvc.u16','vornhi.u16','vornls.u16','vornge.u16','vornlt.u16','vorngt.u16','vornle.u16',
-            'vorneq.u32','vornne.u32','vorncs.u32','vornhs.u32','vorncc.u32','vornlo.u32','vornmi.u32','vornpl.u32','vornvs.u32','vornvc.u32','vornhi.u32','vornls.u32','vornge.u32','vornlt.u32','vorngt.u32','vornle.u32',
-            'vorneq.u64','vornne.u64','vorncs.u64','vornhs.u64','vorncc.u64','vornlo.u64','vornmi.u64','vornpl.u64','vornvs.u64','vornvc.u64','vornhi.u64','vornls.u64','vornge.u64','vornlt.u64','vorngt.u64','vornle.u64',
-            'vorneq.i8','vornne.i8','vorncs.i8','vornhs.i8','vorncc.i8','vornlo.i8','vornmi.i8','vornpl.i8','vornvs.i8','vornvc.i8','vornhi.i8','vornls.i8','vornge.i8','vornlt.i8','vorngt.i8','vornle.i8',
-            'vorneq.i16','vornne.i16','vorncs.i16','vornhs.i16','vorncc.i16','vornlo.i16','vornmi.i16','vornpl.i16','vornvs.i16','vornvc.i16','vornhi.i16','vornls.i16','vornge.i16','vornlt.i16','vorngt.i16','vornle.i16',
-            'vorneq.i32','vornne.i32','vorncs.i32','vornhs.i32','vorncc.i32','vornlo.i32','vornmi.i32','vornpl.i32','vornvs.i32','vornvc.i32','vornhi.i32','vornls.i32','vornge.i32','vornlt.i32','vorngt.i32','vornle.i32',
-            'vorneq.i64','vornne.i64','vorncs.i64','vornhs.i64','vorncc.i64','vornlo.i64','vornmi.i64','vornpl.i64','vornvs.i64','vornvc.i64','vornhi.i64','vornls.i64','vornge.i64','vornlt.i64','vorngt.i64','vornle.i64',
-            'vorneq.f32','vornne.f32','vorncs.f32','vornhs.f32','vorncc.f32','vornlo.f32','vornmi.f32','vornpl.f32','vornvs.f32','vornvc.f32','vornhi.f32','vornls.f32','vornge.f32','vornlt.f32','vorngt.f32','vornle.f32',
-            'vorneq.f64','vornne.f64','vorncs.f64','vornhs.f64','vorncc.f64','vornlo.f64','vornmi.f64','vornpl.f64','vornvs.f64','vornvc.f64','vornhi.f64','vornls.f64','vornge.f64','vornlt.f64','vorngt.f64','vornle.f64',
-
-            'vorreq','vorrne','vorrcs','vorrhs','vorrcc','vorrlo','vorrmi','vorrpl','vorrvs','vorrvc','vorrhi','vorrls','vorrge','vorrlt','vorrgt','vorrle',
-            'vorreq.s8','vorrne.s8','vorrcs.s8','vorrhs.s8','vorrcc.s8','vorrlo.s8','vorrmi.s8','vorrpl.s8','vorrvs.s8','vorrvc.s8','vorrhi.s8','vorrls.s8','vorrge.s8','vorrlt.s8','vorrgt.s8','vorrle.s8',
-            'vorreq.s16','vorrne.s16','vorrcs.s16','vorrhs.s16','vorrcc.s16','vorrlo.s16','vorrmi.s16','vorrpl.s16','vorrvs.s16','vorrvc.s16','vorrhi.s16','vorrls.s16','vorrge.s16','vorrlt.s16','vorrgt.s16','vorrle.s16',
-            'vorreq.s32','vorrne.s32','vorrcs.s32','vorrhs.s32','vorrcc.s32','vorrlo.s32','vorrmi.s32','vorrpl.s32','vorrvs.s32','vorrvc.s32','vorrhi.s32','vorrls.s32','vorrge.s32','vorrlt.s32','vorrgt.s32','vorrle.s32',
-            'vorreq.s64','vorrne.s64','vorrcs.s64','vorrhs.s64','vorrcc.s64','vorrlo.s64','vorrmi.s64','vorrpl.s64','vorrvs.s64','vorrvc.s64','vorrhi.s64','vorrls.s64','vorrge.s64','vorrlt.s64','vorrgt.s64','vorrle.s64',
-            'vorreq.u8','vorrne.u8','vorrcs.u8','vorrhs.u8','vorrcc.u8','vorrlo.u8','vorrmi.u8','vorrpl.u8','vorrvs.u8','vorrvc.u8','vorrhi.u8','vorrls.u8','vorrge.u8','vorrlt.u8','vorrgt.u8','vorrle.u8',
-            'vorreq.u16','vorrne.u16','vorrcs.u16','vorrhs.u16','vorrcc.u16','vorrlo.u16','vorrmi.u16','vorrpl.u16','vorrvs.u16','vorrvc.u16','vorrhi.u16','vorrls.u16','vorrge.u16','vorrlt.u16','vorrgt.u16','vorrle.u16',
-            'vorreq.u32','vorrne.u32','vorrcs.u32','vorrhs.u32','vorrcc.u32','vorrlo.u32','vorrmi.u32','vorrpl.u32','vorrvs.u32','vorrvc.u32','vorrhi.u32','vorrls.u32','vorrge.u32','vorrlt.u32','vorrgt.u32','vorrle.u32',
-            'vorreq.u64','vorrne.u64','vorrcs.u64','vorrhs.u64','vorrcc.u64','vorrlo.u64','vorrmi.u64','vorrpl.u64','vorrvs.u64','vorrvc.u64','vorrhi.u64','vorrls.u64','vorrge.u64','vorrlt.u64','vorrgt.u64','vorrle.u64',
-            'vorreq.i8','vorrne.i8','vorrcs.i8','vorrhs.i8','vorrcc.i8','vorrlo.i8','vorrmi.i8','vorrpl.i8','vorrvs.i8','vorrvc.i8','vorrhi.i8','vorrls.i8','vorrge.i8','vorrlt.i8','vorrgt.i8','vorrle.i8',
-            'vorreq.i16','vorrne.i16','vorrcs.i16','vorrhs.i16','vorrcc.i16','vorrlo.i16','vorrmi.i16','vorrpl.i16','vorrvs.i16','vorrvc.i16','vorrhi.i16','vorrls.i16','vorrge.i16','vorrlt.i16','vorrgt.i16','vorrle.i16',
-            'vorreq.i32','vorrne.i32','vorrcs.i32','vorrhs.i32','vorrcc.i32','vorrlo.i32','vorrmi.i32','vorrpl.i32','vorrvs.i32','vorrvc.i32','vorrhi.i32','vorrls.i32','vorrge.i32','vorrlt.i32','vorrgt.i32','vorrle.i32',
-            'vorreq.i64','vorrne.i64','vorrcs.i64','vorrhs.i64','vorrcc.i64','vorrlo.i64','vorrmi.i64','vorrpl.i64','vorrvs.i64','vorrvc.i64','vorrhi.i64','vorrls.i64','vorrge.i64','vorrlt.i64','vorrgt.i64','vorrle.i64',
-            'vorreq.f32','vorrne.f32','vorrcs.f32','vorrhs.f32','vorrcc.f32','vorrlo.f32','vorrmi.f32','vorrpl.f32','vorrvs.f32','vorrvc.f32','vorrhi.f32','vorrls.f32','vorrge.f32','vorrlt.f32','vorrgt.f32','vorrle.f32',
-            'vorreq.f64','vorrne.f64','vorrcs.f64','vorrhs.f64','vorrcc.f64','vorrlo.f64','vorrmi.f64','vorrpl.f64','vorrvs.f64','vorrvc.f64','vorrhi.f64','vorrls.f64','vorrge.f64','vorrlt.f64','vorrgt.f64','vorrle.f64',
-
-            'vswpeq','vswpne','vswpcs','vswphs','vswpcc','vswplo','vswpmi','vswppl','vswpvs','vswpvc','vswphi','vswpls','vswpge','vswplt','vswpgt','vswple',
-            'vswpeq.s8','vswpne.s8','vswpcs.s8','vswphs.s8','vswpcc.s8','vswplo.s8','vswpmi.s8','vswppl.s8','vswpvs.s8','vswpvc.s8','vswphi.s8','vswpls.s8','vswpge.s8','vswplt.s8','vswpgt.s8','vswple.s8',
-            'vswpeq.s16','vswpne.s16','vswpcs.s16','vswphs.s16','vswpcc.s16','vswplo.s16','vswpmi.s16','vswppl.s16','vswpvs.s16','vswpvc.s16','vswphi.s16','vswpls.s16','vswpge.s16','vswplt.s16','vswpgt.s16','vswple.s16',
-            'vswpeq.s32','vswpne.s32','vswpcs.s32','vswphs.s32','vswpcc.s32','vswplo.s32','vswpmi.s32','vswppl.s32','vswpvs.s32','vswpvc.s32','vswphi.s32','vswpls.s32','vswpge.s32','vswplt.s32','vswpgt.s32','vswple.s32',
-            'vswpeq.s64','vswpne.s64','vswpcs.s64','vswphs.s64','vswpcc.s64','vswplo.s64','vswpmi.s64','vswppl.s64','vswpvs.s64','vswpvc.s64','vswphi.s64','vswpls.s64','vswpge.s64','vswplt.s64','vswpgt.s64','vswple.s64',
-            'vswpeq.u8','vswpne.u8','vswpcs.u8','vswphs.u8','vswpcc.u8','vswplo.u8','vswpmi.u8','vswppl.u8','vswpvs.u8','vswpvc.u8','vswphi.u8','vswpls.u8','vswpge.u8','vswplt.u8','vswpgt.u8','vswple.u8',
-            'vswpeq.u16','vswpne.u16','vswpcs.u16','vswphs.u16','vswpcc.u16','vswplo.u16','vswpmi.u16','vswppl.u16','vswpvs.u16','vswpvc.u16','vswphi.u16','vswpls.u16','vswpge.u16','vswplt.u16','vswpgt.u16','vswple.u16',
-            'vswpeq.u32','vswpne.u32','vswpcs.u32','vswphs.u32','vswpcc.u32','vswplo.u32','vswpmi.u32','vswppl.u32','vswpvs.u32','vswpvc.u32','vswphi.u32','vswpls.u32','vswpge.u32','vswplt.u32','vswpgt.u32','vswple.u32',
-            'vswpeq.u64','vswpne.u64','vswpcs.u64','vswphs.u64','vswpcc.u64','vswplo.u64','vswpmi.u64','vswppl.u64','vswpvs.u64','vswpvc.u64','vswphi.u64','vswpls.u64','vswpge.u64','vswplt.u64','vswpgt.u64','vswple.u64',
-            'vswpeq.i8','vswpne.i8','vswpcs.i8','vswphs.i8','vswpcc.i8','vswplo.i8','vswpmi.i8','vswppl.i8','vswpvs.i8','vswpvc.i8','vswphi.i8','vswpls.i8','vswpge.i8','vswplt.i8','vswpgt.i8','vswple.i8',
-            'vswpeq.i16','vswpne.i16','vswpcs.i16','vswphs.i16','vswpcc.i16','vswplo.i16','vswpmi.i16','vswppl.i16','vswpvs.i16','vswpvc.i16','vswphi.i16','vswpls.i16','vswpge.i16','vswplt.i16','vswpgt.i16','vswple.i16',
-            'vswpeq.i32','vswpne.i32','vswpcs.i32','vswphs.i32','vswpcc.i32','vswplo.i32','vswpmi.i32','vswppl.i32','vswpvs.i32','vswpvc.i32','vswphi.i32','vswpls.i32','vswpge.i32','vswplt.i32','vswpgt.i32','vswple.i32',
-            'vswpeq.i64','vswpne.i64','vswpcs.i64','vswphs.i64','vswpcc.i64','vswplo.i64','vswpmi.i64','vswppl.i64','vswpvs.i64','vswpvc.i64','vswphi.i64','vswpls.i64','vswpge.i64','vswplt.i64','vswpgt.i64','vswple.i64',
-            'vswpeq.f32','vswpne.f32','vswpcs.f32','vswphs.f32','vswpcc.f32','vswplo.f32','vswpmi.f32','vswppl.f32','vswpvs.f32','vswpvc.f32','vswphi.f32','vswpls.f32','vswpge.f32','vswplt.f32','vswpgt.f32','vswple.f32',
-            'vswpeq.f64','vswpne.f64','vswpcs.f64','vswphs.f64','vswpcc.f64','vswplo.f64','vswpmi.f64','vswppl.f64','vswpvs.f64','vswpvc.f64','vswphi.f64','vswpls.f64','vswpge.f64','vswplt.f64','vswpgt.f64','vswple.f64'
-            ),
-        /* Conditional NEON SIMD ARM Registers Interop Instructions */
-        29 => array(
-            'vmrseq','vmrsne','vmrscs','vmrshs','vmrscc','vmrslo','vmrsmi','vmrspl','vmrsvs','vmrsvc','vmrshi','vmrsls','vmrsge','vmrslt','vmrsgt','vmrsle',
-            'vmsreq','vmsrne','vmsrcs','vmsrhs','vmsrcc','vmsrlo','vmsrmi','vmsrpl','vmsrvs','vmsrvc','vmsrhi','vmsrls','vmsrge','vmsrlt','vmsrgt','vmsrle'
-            ),
-        /* Conditional NEON SIMD Bit/Byte-Level Instructions */
-        30 => array(
-            'vcnteq.8','vcntne.8','vcntcs.8','vcnths.8','vcntcc.8','vcntlo.8','vcntmi.8','vcntpl.8','vcntvs.8','vcntvc.8','vcnthi.8','vcntls.8','vcntge.8','vcntlt.8','vcntgt.8','vcntle.8',
-            'vdupeq.8','vdupne.8','vdupcs.8','vduphs.8','vdupcc.8','vduplo.8','vdupmi.8','vduppl.8','vdupvs.8','vdupvc.8','vduphi.8','vdupls.8','vdupge.8','vduplt.8','vdupgt.8','vduple.8',
-
-            'vdupeq.16','vdupne.16','vdupcs.16','vduphs.16','vdupcc.16','vduplo.16','vdupmi.16','vduppl.16','vdupvs.16','vdupvc.16','vduphi.16','vdupls.16','vdupge.16','vduplt.16','vdupgt.16','vduple.16',
-            'vdupeq.32','vdupne.32','vdupcs.32','vduphs.32','vdupcc.32','vduplo.32','vdupmi.32','vduppl.32','vdupvs.32','vdupvc.32','vduphi.32','vdupls.32','vdupge.32','vduplt.32','vdupgt.32','vduple.32',
-
-            'vexteq.8','vextne.8','vextcs.8','vexths.8','vextcc.8','vextlo.8','vextmi.8','vextpl.8','vextvs.8','vextvc.8','vexthi.8','vextls.8','vextge.8','vextlt.8','vextgt.8','vextle.8',
-            'vexteq.16','vextne.16','vextcs.16','vexths.16','vextcc.16','vextlo.16','vextmi.16','vextpl.16','vextvs.16','vextvc.16','vexthi.16','vextls.16','vextge.16','vextlt.16','vextgt.16','vextle.16',
-
-            'vexteq.32','vextne.32','vextcs.32','vexths.32','vextcc.32','vextlo.32','vextmi.32','vextpl.32','vextvs.32','vextvc.32','vexthi.32','vextls.32','vextge.32','vextlt.32','vextgt.32','vextle.32',
-            'vexteq.64','vextne.64','vextcs.64','vexths.64','vextcc.64','vextlo.64','vextmi.64','vextpl.64','vextvs.64','vextvc.64','vexthi.64','vextls.64','vextge.64','vextlt.64','vextgt.64','vextle.64',
-
-            'vrev16eq.8','vrev16ne.8','vrev16cs.8','vrev16hs.8','vrev16cc.8','vrev16lo.8','vrev16mi.8','vrev16pl.8','vrev16vs.8','vrev16vc.8','vrev16hi.8','vrev16ls.8','vrev16ge.8','vrev16lt.8','vrev16gt.8','vrev16le.8',
-            'vrev32eq.8','vrev32ne.8','vrev32cs.8','vrev32hs.8','vrev32cc.8','vrev32lo.8','vrev32mi.8','vrev32pl.8','vrev32vs.8','vrev32vc.8','vrev32hi.8','vrev32ls.8','vrev32ge.8','vrev32lt.8','vrev32gt.8','vrev32le.8',
-            'vrev32eq.16','vrev32ne.16','vrev32cs.16','vrev32hs.16','vrev32cc.16','vrev32lo.16','vrev32mi.16','vrev32pl.16','vrev32vs.16','vrev32vc.16','vrev32hi.16','vrev32ls.16','vrev32ge.16','vrev32lt.16','vrev32gt.16','vrev32le.16',
-            'vrev64eq.8','vrev64ne.8','vrev64cs.8','vrev64hs.8','vrev64cc.8','vrev64lo.8','vrev64mi.8','vrev64pl.8','vrev64vs.8','vrev64vc.8','vrev64hi.8','vrev64ls.8','vrev64ge.8','vrev64lt.8','vrev64gt.8','vrev64le.8',
-            'vrev64eq.16','vrev64ne.16','vrev64cs.16','vrev64hs.16','vrev64cc.16','vrev64lo.16','vrev64mi.16','vrev64pl.16','vrev64vs.16','vrev64vc.16','vrev64hi.16','vrev64ls.16','vrev64ge.16','vrev64lt.16','vrev64gt.16','vrev64le.16',
-            'vrev64eq.32','vrev64ne.32','vrev64cs.32','vrev64hs.32','vrev64cc.32','vrev64lo.32','vrev64mi.32','vrev64pl.32','vrev64vs.32','vrev64vc.32','vrev64hi.32','vrev64ls.32','vrev64ge.32','vrev64lt.32','vrev64gt.32','vrev64le.32',
-
-            'vslieq.8','vsline.8','vslics.8','vslihs.8','vslicc.8','vslilo.8','vslimi.8','vslipl.8','vslivs.8','vslivc.8','vslihi.8','vslils.8','vslige.8','vslilt.8','vsligt.8','vslile.8',
-            'vslieq.16','vsline.16','vslics.16','vslihs.16','vslicc.16','vslilo.16','vslimi.16','vslipl.16','vslivs.16','vslivc.16','vslihi.16','vslils.16','vslige.16','vslilt.16','vsligt.16','vslile.16',
-            'vslieq.32','vsline.32','vslics.32','vslihs.32','vslicc.32','vslilo.32','vslimi.32','vslipl.32','vslivs.32','vslivc.32','vslihi.32','vslils.32','vslige.32','vslilt.32','vsligt.32','vslile.32',
-            'vslieq.64','vsline.64','vslics.64','vslihs.64','vslicc.64','vslilo.64','vslimi.64','vslipl.64','vslivs.64','vslivc.64','vslihi.64','vslils.64','vslige.64','vslilt.64','vsligt.64','vslile.64',
-
-            'vsrieq.8','vsrine.8','vsrics.8','vsrihs.8','vsricc.8','vsrilo.8','vsrimi.8','vsripl.8','vsrivs.8','vsrivc.8','vsrihi.8','vsrils.8','vsrige.8','vsrilt.8','vsrigt.8','vsrile.8',
-            'vsrieq.16','vsrine.16','vsrics.16','vsrihs.16','vsricc.16','vsrilo.16','vsrimi.16','vsripl.16','vsrivs.16','vsrivc.16','vsrihi.16','vsrils.16','vsrige.16','vsrilt.16','vsrigt.16','vsrile.16',
-            'vsrieq.32','vsrine.32','vsrics.32','vsrihs.32','vsricc.32','vsrilo.32','vsrimi.32','vsripl.32','vsrivs.32','vsrivc.32','vsrihi.32','vsrils.32','vsrige.32','vsrilt.32','vsrigt.32','vsrile.32',
-            'vsrieq.64','vsrine.64','vsrics.64','vsrihs.64','vsricc.64','vsrilo.64','vsrimi.64','vsripl.64','vsrivs.64','vsrivc.64','vsrihi.64','vsrils.64','vsrige.64','vsrilt.64','vsrigt.64','vsrile.64',
-
-            'vtbleq.8','vtblne.8','vtblcs.8','vtblhs.8','vtblcc.8','vtbllo.8','vtblmi.8','vtblpl.8','vtblvs.8','vtblvc.8','vtblhi.8','vtblls.8','vtblge.8','vtbllt.8','vtblgt.8','vtblle.8',
-
-            'vtbxeq','vtbxne','vtbxcs','vtbxhs','vtbxcc','vtbxlo','vtbxmi','vtbxpl','vtbxvs','vtbxvc','vtbxhi','vtbxls','vtbxge','vtbxlt','vtbxgt','vtbxle',
-
-            'vtrneq.8','vtrnne.8','vtrncs.8','vtrnhs.8','vtrncc.8','vtrnlo.8','vtrnmi.8','vtrnpl.8','vtrnvs.8','vtrnvc.8','vtrnhi.8','vtrnls.8','vtrnge.8','vtrnlt.8','vtrngt.8','vtrnle.8',
-            'vtrneq.16','vtrnne.16','vtrncs.16','vtrnhs.16','vtrncc.16','vtrnlo.16','vtrnmi.16','vtrnpl.16','vtrnvs.16','vtrnvc.16','vtrnhi.16','vtrnls.16','vtrnge.16','vtrnlt.16','vtrngt.16','vtrnle.16',
-            'vtrneq.32','vtrnne.32','vtrncs.32','vtrnhs.32','vtrncc.32','vtrnlo.32','vtrnmi.32','vtrnpl.32','vtrnvs.32','vtrnvc.32','vtrnhi.32','vtrnls.32','vtrnge.32','vtrnlt.32','vtrngt.32','vtrnle.32',
-
-            'vtsteq.8','vtstne.8','vtstcs.8','vtsths.8','vtstcc.8','vtstlo.8','vtstmi.8','vtstpl.8','vtstvs.8','vtstvc.8','vtsthi.8','vtstls.8','vtstge.8','vtstlt.8','vtstgt.8','vtstle.8',
-            'vtsteq.16','vtstne.16','vtstcs.16','vtsths.16','vtstcc.16','vtstlo.16','vtstmi.16','vtstpl.16','vtstvs.16','vtstvc.16','vtsthi.16','vtstls.16','vtstge.16','vtstlt.16','vtstgt.16','vtstle.16',
-            'vtsteq.32','vtstne.32','vtstcs.32','vtsths.32','vtstcc.32','vtstlo.32','vtstmi.32','vtstpl.32','vtstvs.32','vtstvc.32','vtsthi.32','vtstls.32','vtstge.32','vtstlt.32','vtstgt.32','vtstle.32',
-
-            'vuzpeq.8','vuzpne.8','vuzpcs.8','vuzphs.8','vuzpcc.8','vuzplo.8','vuzpmi.8','vuzppl.8','vuzpvs.8','vuzpvc.8','vuzphi.8','vuzpls.8','vuzpge.8','vuzplt.8','vuzpgt.8','vuzple.8',
-            'vuzpeq.16','vuzpne.16','vuzpcs.16','vuzphs.16','vuzpcc.16','vuzplo.16','vuzpmi.16','vuzppl.16','vuzpvs.16','vuzpvc.16','vuzphi.16','vuzpls.16','vuzpge.16','vuzplt.16','vuzpgt.16','vuzple.16',
-            'vuzpeq.32','vuzpne.32','vuzpcs.32','vuzphs.32','vuzpcc.32','vuzplo.32','vuzpmi.32','vuzppl.32','vuzpvs.32','vuzpvc.32','vuzphi.32','vuzpls.32','vuzpge.32','vuzplt.32','vuzpgt.32','vuzple.32',
-
-            'vzipeq.8','vzipne.8','vzipcs.8','vziphs.8','vzipcc.8','vziplo.8','vzipmi.8','vzippl.8','vzipvs.8','vzipvc.8','vziphi.8','vzipls.8','vzipge.8','vziplt.8','vzipgt.8','vziple.8',
-            'vzipeq.16','vzipne.16','vzipcs.16','vziphs.16','vzipcc.16','vziplo.16','vzipmi.16','vzippl.16','vzipvs.16','vzipvc.16','vziphi.16','vzipls.16','vzipge.16','vziplt.16','vzipgt.16','vziple.16',
-            'vzipeq.32','vzipne.32','vzipcs.32','vziphs.32','vzipcc.32','vziplo.32','vzipmi.32','vzippl.32','vzipvs.32','vzipvc.32','vziphi.32','vzipls.32','vzipge.32','vziplt.32','vzipgt.32','vziple.32',
-
-            'vmulleq.p8','vmullne.p8','vmullcs.p8','vmullhs.p8','vmullcc.p8','vmulllo.p8','vmullmi.p8','vmullpl.p8','vmullvs.p8','vmullvc.p8','vmullhi.p8','vmullls.p8','vmullge.p8','vmulllt.p8','vmullgt.p8','vmullle.p8'
-            ),
-        /* Conditional NEON SIMD Universal Integer Instructions */
-        31 => array(
-            'vaddeq.i8','vaddne.i8','vaddcs.i8','vaddhs.i8','vaddcc.i8','vaddlo.i8','vaddmi.i8','vaddpl.i8','vaddvs.i8','vaddvc.i8','vaddhi.i8','vaddls.i8','vaddge.i8','vaddlt.i8','vaddgt.i8','vaddle.i8',
-            'vaddeq.i16','vaddne.i16','vaddcs.i16','vaddhs.i16','vaddcc.i16','vaddlo.i16','vaddmi.i16','vaddpl.i16','vaddvs.i16','vaddvc.i16','vaddhi.i16','vaddls.i16','vaddge.i16','vaddlt.i16','vaddgt.i16','vaddle.i16',
-            'vaddeq.i32','vaddne.i32','vaddcs.i32','vaddhs.i32','vaddcc.i32','vaddlo.i32','vaddmi.i32','vaddpl.i32','vaddvs.i32','vaddvc.i32','vaddhi.i32','vaddls.i32','vaddge.i32','vaddlt.i32','vaddgt.i32','vaddle.i32',
-            'vaddeq.i64','vaddne.i64','vaddcs.i64','vaddhs.i64','vaddcc.i64','vaddlo.i64','vaddmi.i64','vaddpl.i64','vaddvs.i64','vaddvc.i64','vaddhi.i64','vaddls.i64','vaddge.i64','vaddlt.i64','vaddgt.i64','vaddle.i64',
-
-            'vsubeq.i8','vsubne.i8','vsubcs.i8','vsubhs.i8','vsubcc.i8','vsublo.i8','vsubmi.i8','vsubpl.i8','vsubvs.i8','vsubvc.i8','vsubhi.i8','vsubls.i8','vsubge.i8','vsublt.i8','vsubgt.i8','vsuble.i8',
-            'vsubeq.i16','vsubne.i16','vsubcs.i16','vsubhs.i16','vsubcc.i16','vsublo.i16','vsubmi.i16','vsubpl.i16','vsubvs.i16','vsubvc.i16','vsubhi.i16','vsubls.i16','vsubge.i16','vsublt.i16','vsubgt.i16','vsuble.i16',
-            'vsubeq.i32','vsubne.i32','vsubcs.i32','vsubhs.i32','vsubcc.i32','vsublo.i32','vsubmi.i32','vsubpl.i32','vsubvs.i32','vsubvc.i32','vsubhi.i32','vsubls.i32','vsubge.i32','vsublt.i32','vsubgt.i32','vsuble.i32',
-            'vsubeq.i64','vsubne.i64','vsubcs.i64','vsubhs.i64','vsubcc.i64','vsublo.i64','vsubmi.i64','vsubpl.i64','vsubvs.i64','vsubvc.i64','vsubhi.i64','vsubls.i64','vsubge.i64','vsublt.i64','vsubgt.i64','vsuble.i64',
-
-            'vaddhneq.i16','vaddhnne.i16','vaddhncs.i16','vaddhnhs.i16','vaddhncc.i16','vaddhnlo.i16','vaddhnmi.i16','vaddhnpl.i16','vaddhnvs.i16','vaddhnvc.i16','vaddhnhi.i16','vaddhnls.i16','vaddhnge.i16','vaddhnlt.i16','vaddhngt.i16','vaddhnle.i16',
-            'vaddhneq.i32','vaddhnne.i32','vaddhncs.i32','vaddhnhs.i32','vaddhncc.i32','vaddhnlo.i32','vaddhnmi.i32','vaddhnpl.i32','vaddhnvs.i32','vaddhnvc.i32','vaddhnhi.i32','vaddhnls.i32','vaddhnge.i32','vaddhnlt.i32','vaddhngt.i32','vaddhnle.i32',
-            'vaddhneq.i64','vaddhnne.i64','vaddhncs.i64','vaddhnhs.i64','vaddhncc.i64','vaddhnlo.i64','vaddhnmi.i64','vaddhnpl.i64','vaddhnvs.i64','vaddhnvc.i64','vaddhnhi.i64','vaddhnls.i64','vaddhnge.i64','vaddhnlt.i64','vaddhngt.i64','vaddhnle.i64',
-
-            'vsubhneq.i16','vsubhnne.i16','vsubhncs.i16','vsubhnhs.i16','vsubhncc.i16','vsubhnlo.i16','vsubhnmi.i16','vsubhnpl.i16','vsubhnvs.i16','vsubhnvc.i16','vsubhnhi.i16','vsubhnls.i16','vsubhnge.i16','vsubhnlt.i16','vsubhngt.i16','vsubhnle.i16',
-            'vsubhneq.i32','vsubhnne.i32','vsubhncs.i32','vsubhnhs.i32','vsubhncc.i32','vsubhnlo.i32','vsubhnmi.i32','vsubhnpl.i32','vsubhnvs.i32','vsubhnvc.i32','vsubhnhi.i32','vsubhnls.i32','vsubhnge.i32','vsubhnlt.i32','vsubhngt.i32','vsubhnle.i32',
-            'vsubhneq.i64','vsubhnne.i64','vsubhncs.i64','vsubhnhs.i64','vsubhncc.i64','vsubhnlo.i64','vsubhnmi.i64','vsubhnpl.i64','vsubhnvs.i64','vsubhnvc.i64','vsubhnhi.i64','vsubhnls.i64','vsubhnge.i64','vsubhnlt.i64','vsubhngt.i64','vsubhnle.i64',
-
-            'vraddhneq.i16','vraddhnne.i16','vraddhncs.i16','vraddhnhs.i16','vraddhncc.i16','vraddhnlo.i16','vraddhnmi.i16','vraddhnpl.i16','vraddhnvs.i16','vraddhnvc.i16','vraddhnhi.i16','vraddhnls.i16','vraddhnge.i16','vraddhnlt.i16','vraddhngt.i16','vraddhnle.i16',
-            'vraddhneq.i32','vraddhnne.i32','vraddhncs.i32','vraddhnhs.i32','vraddhncc.i32','vraddhnlo.i32','vraddhnmi.i32','vraddhnpl.i32','vraddhnvs.i32','vraddhnvc.i32','vraddhnhi.i32','vraddhnls.i32','vraddhnge.i32','vraddhnlt.i32','vraddhngt.i32','vraddhnle.i32',
-            'vraddhneq.i64','vraddhnne.i64','vraddhncs.i64','vraddhnhs.i64','vraddhncc.i64','vraddhnlo.i64','vraddhnmi.i64','vraddhnpl.i64','vraddhnvs.i64','vraddhnvc.i64','vraddhnhi.i64','vraddhnls.i64','vraddhnge.i64','vraddhnlt.i64','vraddhngt.i64','vraddhnle.i64',
-
-            'vrsubhneq.i16','vrsubhnne.i16','vrsubhncs.i16','vrsubhnhs.i16','vrsubhncc.i16','vrsubhnlo.i16','vrsubhnmi.i16','vrsubhnpl.i16','vrsubhnvs.i16','vrsubhnvc.i16','vrsubhnhi.i16','vrsubhnls.i16','vrsubhnge.i16','vrsubhnlt.i16','vrsubhngt.i16','vrsubhnle.i16',
-            'vrsubhneq.i32','vrsubhnne.i32','vrsubhncs.i32','vrsubhnhs.i32','vrsubhncc.i32','vrsubhnlo.i32','vrsubhnmi.i32','vrsubhnpl.i32','vrsubhnvs.i32','vrsubhnvc.i32','vrsubhnhi.i32','vrsubhnls.i32','vrsubhnge.i32','vrsubhnlt.i32','vrsubhngt.i32','vrsubhnle.i32',
-            'vrsubhneq.i64','vrsubhnne.i64','vrsubhncs.i64','vrsubhnhs.i64','vrsubhncc.i64','vrsubhnlo.i64','vrsubhnmi.i64','vrsubhnpl.i64','vrsubhnvs.i64','vrsubhnvc.i64','vrsubhnhi.i64','vrsubhnls.i64','vrsubhnge.i64','vrsubhnlt.i64','vrsubhngt.i64','vrsubhnle.i64',
-
-            'vpaddeq.i8','vpaddne.i8','vpaddcs.i8','vpaddhs.i8','vpaddcc.i8','vpaddlo.i8','vpaddmi.i8','vpaddpl.i8','vpaddvs.i8','vpaddvc.i8','vpaddhi.i8','vpaddls.i8','vpaddge.i8','vpaddlt.i8','vpaddgt.i8','vpaddle.i8',
-            'vpaddeq.i16','vpaddne.i16','vpaddcs.i16','vpaddhs.i16','vpaddcc.i16','vpaddlo.i16','vpaddmi.i16','vpaddpl.i16','vpaddvs.i16','vpaddvc.i16','vpaddhi.i16','vpaddls.i16','vpaddge.i16','vpaddlt.i16','vpaddgt.i16','vpaddle.i16',
-            'vpaddeq.i32','vpaddne.i32','vpaddcs.i32','vpaddhs.i32','vpaddcc.i32','vpaddlo.i32','vpaddmi.i32','vpaddpl.i32','vpaddvs.i32','vpaddvc.i32','vpaddhi.i32','vpaddls.i32','vpaddge.i32','vpaddlt.i32','vpaddgt.i32','vpaddle.i32',
-
-            'vceqeq.i8','vceqne.i8','vceqcs.i8','vceqhs.i8','vceqcc.i8','vceqlo.i8','vceqmi.i8','vceqpl.i8','vceqvs.i8','vceqvc.i8','vceqhi.i8','vceqls.i8','vceqge.i8','vceqlt.i8','vceqgt.i8','vceqle.i8',
-            'vceqeq.i16','vceqne.i16','vceqcs.i16','vceqhs.i16','vceqcc.i16','vceqlo.i16','vceqmi.i16','vceqpl.i16','vceqvs.i16','vceqvc.i16','vceqhi.i16','vceqls.i16','vceqge.i16','vceqlt.i16','vceqgt.i16','vceqle.i16',
-            'vceqeq.i32','vceqne.i32','vceqcs.i32','vceqhs.i32','vceqcc.i32','vceqlo.i32','vceqmi.i32','vceqpl.i32','vceqvs.i32','vceqvc.i32','vceqhi.i32','vceqls.i32','vceqge.i32','vceqlt.i32','vceqgt.i32','vceqle.i32',
-
-            'vclzeq.i8','vclzne.i8','vclzcs.i8','vclzhs.i8','vclzcc.i8','vclzlo.i8','vclzmi.i8','vclzpl.i8','vclzvs.i8','vclzvc.i8','vclzhi.i8','vclzls.i8','vclzge.i8','vclzlt.i8','vclzgt.i8','vclzle.i8',
-            'vclzeq.i16','vclzne.i16','vclzcs.i16','vclzhs.i16','vclzcc.i16','vclzlo.i16','vclzmi.i16','vclzpl.i16','vclzvs.i16','vclzvc.i16','vclzhi.i16','vclzls.i16','vclzge.i16','vclzlt.i16','vclzgt.i16','vclzle.i16',
-            'vclzeq.i32','vclzne.i32','vclzcs.i32','vclzhs.i32','vclzcc.i32','vclzlo.i32','vclzmi.i32','vclzpl.i32','vclzvs.i32','vclzvc.i32','vclzhi.i32','vclzls.i32','vclzge.i32','vclzlt.i32','vclzgt.i32','vclzle.i32',
-
-            'vmovneq.i16','vmovnne.i16','vmovncs.i16','vmovnhs.i16','vmovncc.i16','vmovnlo.i16','vmovnmi.i16','vmovnpl.i16','vmovnvs.i16','vmovnvc.i16','vmovnhi.i16','vmovnls.i16','vmovnge.i16','vmovnlt.i16','vmovngt.i16','vmovnle.i16',
-            'vmovneq.i32','vmovnne.i32','vmovncs.i32','vmovnhs.i32','vmovncc.i32','vmovnlo.i32','vmovnmi.i32','vmovnpl.i32','vmovnvs.i32','vmovnvc.i32','vmovnhi.i32','vmovnls.i32','vmovnge.i32','vmovnlt.i32','vmovngt.i32','vmovnle.i32',
-            'vmovneq.i64','vmovnne.i64','vmovncs.i64','vmovnhs.i64','vmovncc.i64','vmovnlo.i64','vmovnmi.i64','vmovnpl.i64','vmovnvs.i64','vmovnvc.i64','vmovnhi.i64','vmovnls.i64','vmovnge.i64','vmovnlt.i64','vmovngt.i64','vmovnle.i64',
-
-            'vmlaeq.s8','vmlane.s8','vmlacs.s8','vmlahs.s8','vmlacc.s8','vmlalo.s8','vmlami.s8','vmlapl.s8','vmlavs.s8','vmlavc.s8','vmlahi.s8','vmlals.s8','vmlage.s8','vmlalt.s8','vmlagt.s8','vmlale.s8',
-            'vmlaeq.s16','vmlane.s16','vmlacs.s16','vmlahs.s16','vmlacc.s16','vmlalo.s16','vmlami.s16','vmlapl.s16','vmlavs.s16','vmlavc.s16','vmlahi.s16','vmlals.s16','vmlage.s16','vmlalt.s16','vmlagt.s16','vmlale.s16',
-            'vmlaeq.s32','vmlane.s32','vmlacs.s32','vmlahs.s32','vmlacc.s32','vmlalo.s32','vmlami.s32','vmlapl.s32','vmlavs.s32','vmlavc.s32','vmlahi.s32','vmlals.s32','vmlage.s32','vmlalt.s32','vmlagt.s32','vmlale.s32',
-            'vmlaeq.u8','vmlane.u8','vmlacs.u8','vmlahs.u8','vmlacc.u8','vmlalo.u8','vmlami.u8','vmlapl.u8','vmlavs.u8','vmlavc.u8','vmlahi.u8','vmlals.u8','vmlage.u8','vmlalt.u8','vmlagt.u8','vmlale.u8',
-            'vmlaeq.u16','vmlane.u16','vmlacs.u16','vmlahs.u16','vmlacc.u16','vmlalo.u16','vmlami.u16','vmlapl.u16','vmlavs.u16','vmlavc.u16','vmlahi.u16','vmlals.u16','vmlage.u16','vmlalt.u16','vmlagt.u16','vmlale.u16',
-            'vmlaeq.u32','vmlane.u32','vmlacs.u32','vmlahs.u32','vmlacc.u32','vmlalo.u32','vmlami.u32','vmlapl.u32','vmlavs.u32','vmlavc.u32','vmlahi.u32','vmlals.u32','vmlage.u32','vmlalt.u32','vmlagt.u32','vmlale.u32',
-            'vmlaeq.i8','vmlane.i8','vmlacs.i8','vmlahs.i8','vmlacc.i8','vmlalo.i8','vmlami.i8','vmlapl.i8','vmlavs.i8','vmlavc.i8','vmlahi.i8','vmlals.i8','vmlage.i8','vmlalt.i8','vmlagt.i8','vmlale.i8',
-            'vmlaeq.i16','vmlane.i16','vmlacs.i16','vmlahs.i16','vmlacc.i16','vmlalo.i16','vmlami.i16','vmlapl.i16','vmlavs.i16','vmlavc.i16','vmlahi.i16','vmlals.i16','vmlage.i16','vmlalt.i16','vmlagt.i16','vmlale.i16',
-            'vmlaeq.i32','vmlane.i32','vmlacs.i32','vmlahs.i32','vmlacc.i32','vmlalo.i32','vmlami.i32','vmlapl.i32','vmlavs.i32','vmlavc.i32','vmlahi.i32','vmlals.i32','vmlage.i32','vmlalt.i32','vmlagt.i32','vmlale.i32',
-
-            'vmlseq.s8','vmlsne.s8','vmlscs.s8','vmlshs.s8','vmlscc.s8','vmlslo.s8','vmlsmi.s8','vmlspl.s8','vmlsvs.s8','vmlsvc.s8','vmlshi.s8','vmlsls.s8','vmlsge.s8','vmlslt.s8','vmlsgt.s8','vmlsle.s8',
-            'vmlseq.s16','vmlsne.s16','vmlscs.s16','vmlshs.s16','vmlscc.s16','vmlslo.s16','vmlsmi.s16','vmlspl.s16','vmlsvs.s16','vmlsvc.s16','vmlshi.s16','vmlsls.s16','vmlsge.s16','vmlslt.s16','vmlsgt.s16','vmlsle.s16',
-            'vmlseq.s32','vmlsne.s32','vmlscs.s32','vmlshs.s32','vmlscc.s32','vmlslo.s32','vmlsmi.s32','vmlspl.s32','vmlsvs.s32','vmlsvc.s32','vmlshi.s32','vmlsls.s32','vmlsge.s32','vmlslt.s32','vmlsgt.s32','vmlsle.s32',
-            'vmlseq.u8','vmlsne.u8','vmlscs.u8','vmlshs.u8','vmlscc.u8','vmlslo.u8','vmlsmi.u8','vmlspl.u8','vmlsvs.u8','vmlsvc.u8','vmlshi.u8','vmlsls.u8','vmlsge.u8','vmlslt.u8','vmlsgt.u8','vmlsle.u8',
-            'vmlseq.u16','vmlsne.u16','vmlscs.u16','vmlshs.u16','vmlscc.u16','vmlslo.u16','vmlsmi.u16','vmlspl.u16','vmlsvs.u16','vmlsvc.u16','vmlshi.u16','vmlsls.u16','vmlsge.u16','vmlslt.u16','vmlsgt.u16','vmlsle.u16',
-            'vmlseq.u32','vmlsne.u32','vmlscs.u32','vmlshs.u32','vmlscc.u32','vmlslo.u32','vmlsmi.u32','vmlspl.u32','vmlsvs.u32','vmlsvc.u32','vmlshi.u32','vmlsls.u32','vmlsge.u32','vmlslt.u32','vmlsgt.u32','vmlsle.u32',
-            'vmlseq.i8','vmlsne.i8','vmlscs.i8','vmlshs.i8','vmlscc.i8','vmlslo.i8','vmlsmi.i8','vmlspl.i8','vmlsvs.i8','vmlsvc.i8','vmlshi.i8','vmlsls.i8','vmlsge.i8','vmlslt.i8','vmlsgt.i8','vmlsle.i8',
-            'vmlseq.i16','vmlsne.i16','vmlscs.i16','vmlshs.i16','vmlscc.i16','vmlslo.i16','vmlsmi.i16','vmlspl.i16','vmlsvs.i16','vmlsvc.i16','vmlshi.i16','vmlsls.i16','vmlsge.i16','vmlslt.i16','vmlsgt.i16','vmlsle.i16',
-            'vmlseq.i32','vmlsne.i32','vmlscs.i32','vmlshs.i32','vmlscc.i32','vmlslo.i32','vmlsmi.i32','vmlspl.i32','vmlsvs.i32','vmlsvc.i32','vmlshi.i32','vmlsls.i32','vmlsge.i32','vmlslt.i32','vmlsgt.i32','vmlsle.i32',
-
-            'vmuleq.s8','vmulne.s8','vmulcs.s8','vmulhs.s8','vmulcc.s8','vmullo.s8','vmulmi.s8','vmulpl.s8','vmulvs.s8','vmulvc.s8','vmulhi.s8','vmulls.s8','vmulge.s8','vmullt.s8','vmulgt.s8','vmulle.s8',
-            'vmuleq.s16','vmulne.s16','vmulcs.s16','vmulhs.s16','vmulcc.s16','vmullo.s16','vmulmi.s16','vmulpl.s16','vmulvs.s16','vmulvc.s16','vmulhi.s16','vmulls.s16','vmulge.s16','vmullt.s16','vmulgt.s16','vmulle.s16',
-            'vmuleq.s32','vmulne.s32','vmulcs.s32','vmulhs.s32','vmulcc.s32','vmullo.s32','vmulmi.s32','vmulpl.s32','vmulvs.s32','vmulvc.s32','vmulhi.s32','vmulls.s32','vmulge.s32','vmullt.s32','vmulgt.s32','vmulle.s32',
-            'vmuleq.u8','vmulne.u8','vmulcs.u8','vmulhs.u8','vmulcc.u8','vmullo.u8','vmulmi.u8','vmulpl.u8','vmulvs.u8','vmulvc.u8','vmulhi.u8','vmulls.u8','vmulge.u8','vmullt.u8','vmulgt.u8','vmulle.u8',
-            'vmuleq.u16','vmulne.u16','vmulcs.u16','vmulhs.u16','vmulcc.u16','vmullo.u16','vmulmi.u16','vmulpl.u16','vmulvs.u16','vmulvc.u16','vmulhi.u16','vmulls.u16','vmulge.u16','vmullt.u16','vmulgt.u16','vmulle.u16',
-            'vmuleq.u32','vmulne.u32','vmulcs.u32','vmulhs.u32','vmulcc.u32','vmullo.u32','vmulmi.u32','vmulpl.u32','vmulvs.u32','vmulvc.u32','vmulhi.u32','vmulls.u32','vmulge.u32','vmullt.u32','vmulgt.u32','vmulle.u32',
-            'vmuleq.i8','vmulne.i8','vmulcs.i8','vmulhs.i8','vmulcc.i8','vmullo.i8','vmulmi.i8','vmulpl.i8','vmulvs.i8','vmulvc.i8','vmulhi.i8','vmulls.i8','vmulge.i8','vmullt.i8','vmulgt.i8','vmulle.i8',
-            'vmuleq.i16','vmulne.i16','vmulcs.i16','vmulhs.i16','vmulcc.i16','vmullo.i16','vmulmi.i16','vmulpl.i16','vmulvs.i16','vmulvc.i16','vmulhi.i16','vmulls.i16','vmulge.i16','vmullt.i16','vmulgt.i16','vmulle.i16',
-            'vmuleq.i32','vmulne.i32','vmulcs.i32','vmulhs.i32','vmulcc.i32','vmullo.i32','vmulmi.i32','vmulpl.i32','vmulvs.i32','vmulvc.i32','vmulhi.i32','vmulls.i32','vmulge.i32','vmullt.i32','vmulgt.i32','vmulle.i32',
-            'vmuleq.p8','vmulne.p8','vmulcs.p8','vmulhs.p8','vmulcc.p8','vmullo.p8','vmulmi.p8','vmulpl.p8','vmulvs.p8','vmulvc.p8','vmulhi.p8','vmulls.p8','vmulge.p8','vmullt.p8','vmulgt.p8','vmulle.p8',
-
-            'vrshrneq.i16','vrshrnne.i16','vrshrncs.i16','vrshrnhs.i16','vrshrncc.i16','vrshrnlo.i16','vrshrnmi.i16','vrshrnpl.i16','vrshrnvs.i16','vrshrnvc.i16','vrshrnhi.i16','vrshrnls.i16','vrshrnge.i16','vrshrnlt.i16','vrshrngt.i16','vrshrnle.i16',
-            'vrshrneq.i32','vrshrnne.i32','vrshrncs.i32','vrshrnhs.i32','vrshrncc.i32','vrshrnlo.i32','vrshrnmi.i32','vrshrnpl.i32','vrshrnvs.i32','vrshrnvc.i32','vrshrnhi.i32','vrshrnls.i32','vrshrnge.i32','vrshrnlt.i32','vrshrngt.i32','vrshrnle.i32',
-            'vrshrneq.i64','vrshrnne.i64','vrshrncs.i64','vrshrnhs.i64','vrshrncc.i64','vrshrnlo.i64','vrshrnmi.i64','vrshrnpl.i64','vrshrnvs.i64','vrshrnvc.i64','vrshrnhi.i64','vrshrnls.i64','vrshrnge.i64','vrshrnlt.i64','vrshrngt.i64','vrshrnle.i64',
-
-            'vshrneq.i16','vshrnne.i16','vshrncs.i16','vshrnhs.i16','vshrncc.i16','vshrnlo.i16','vshrnmi.i16','vshrnpl.i16','vshrnvs.i16','vshrnvc.i16','vshrnhi.i16','vshrnls.i16','vshrnge.i16','vshrnlt.i16','vshrngt.i16','vshrnle.i16',
-            'vshrneq.i32','vshrnne.i32','vshrncs.i32','vshrnhs.i32','vshrncc.i32','vshrnlo.i32','vshrnmi.i32','vshrnpl.i32','vshrnvs.i32','vshrnvc.i32','vshrnhi.i32','vshrnls.i32','vshrnge.i32','vshrnlt.i32','vshrngt.i32','vshrnle.i32',
-            'vshrneq.i64','vshrnne.i64','vshrncs.i64','vshrnhs.i64','vshrncc.i64','vshrnlo.i64','vshrnmi.i64','vshrnpl.i64','vshrnvs.i64','vshrnvc.i64','vshrnhi.i64','vshrnls.i64','vshrnge.i64','vshrnlt.i64','vshrngt.i64','vshrnle.i64',
-
-            'vshleq.i8','vshlne.i8','vshlcs.i8','vshlhs.i8','vshlcc.i8','vshllo.i8','vshlmi.i8','vshlpl.i8','vshlvs.i8','vshlvc.i8','vshlhi.i8','vshlls.i8','vshlge.i8','vshllt.i8','vshlgt.i8','vshlle.i8',
-            'vshleq.i16','vshlne.i16','vshlcs.i16','vshlhs.i16','vshlcc.i16','vshllo.i16','vshlmi.i16','vshlpl.i16','vshlvs.i16','vshlvc.i16','vshlhi.i16','vshlls.i16','vshlge.i16','vshllt.i16','vshlgt.i16','vshlle.i16',
-            'vshleq.i32','vshlne.i32','vshlcs.i32','vshlhs.i32','vshlcc.i32','vshllo.i32','vshlmi.i32','vshlpl.i32','vshlvs.i32','vshlvc.i32','vshlhi.i32','vshlls.i32','vshlge.i32','vshllt.i32','vshlgt.i32','vshlle.i32',
-            'vshleq.i64','vshlne.i64','vshlcs.i64','vshlhs.i64','vshlcc.i64','vshllo.i64','vshlmi.i64','vshlpl.i64','vshlvs.i64','vshlvc.i64','vshlhi.i64','vshlls.i64','vshlge.i64','vshllt.i64','vshlgt.i64','vshlle.i64',
-
-            'vshlleq.i8','vshllne.i8','vshllcs.i8','vshllhs.i8','vshllcc.i8','vshlllo.i8','vshllmi.i8','vshllpl.i8','vshllvs.i8','vshllvc.i8','vshllhi.i8','vshllls.i8','vshllge.i8','vshlllt.i8','vshllgt.i8','vshllle.i8',
-            'vshlleq.i16','vshllne.i16','vshllcs.i16','vshllhs.i16','vshllcc.i16','vshlllo.i16','vshllmi.i16','vshllpl.i16','vshllvs.i16','vshllvc.i16','vshllhi.i16','vshllls.i16','vshllge.i16','vshlllt.i16','vshllgt.i16','vshllle.i16',
-            'vshlleq.i32','vshllne.i32','vshllcs.i32','vshllhs.i32','vshllcc.i32','vshlllo.i32','vshllmi.i32','vshllpl.i32','vshllvs.i32','vshllvc.i32','vshllhi.i32','vshllls.i32','vshllge.i32','vshlllt.i32','vshllgt.i32','vshllle.i32'
-            ),
-        /* Conditional NEON SIMD Signed Integer Instructions */
-        32 => array(
-            'vabaeq.s8','vabane.s8','vabacs.s8','vabahs.s8','vabacc.s8','vabalo.s8','vabami.s8','vabapl.s8','vabavs.s8','vabavc.s8','vabahi.s8','vabals.s8','vabage.s8','vabalt.s8','vabagt.s8','vabale.s8',
-            'vabaeq.s16','vabane.s16','vabacs.s16','vabahs.s16','vabacc.s16','vabalo.s16','vabami.s16','vabapl.s16','vabavs.s16','vabavc.s16','vabahi.s16','vabals.s16','vabage.s16','vabalt.s16','vabagt.s16','vabale.s16',
-            'vabaeq.s32','vabane.s32','vabacs.s32','vabahs.s32','vabacc.s32','vabalo.s32','vabami.s32','vabapl.s32','vabavs.s32','vabavc.s32','vabahi.s32','vabals.s32','vabage.s32','vabalt.s32','vabagt.s32','vabale.s32',
-
-            'vabaleq.s8','vabalne.s8','vabalcs.s8','vabalhs.s8','vabalcc.s8','vaballo.s8','vabalmi.s8','vabalpl.s8','vabalvs.s8','vabalvc.s8','vabalhi.s8','vaballs.s8','vabalge.s8','vaballt.s8','vabalgt.s8','vaballe.s8',
-            'vabaleq.s16','vabalne.s16','vabalcs.s16','vabalhs.s16','vabalcc.s16','vaballo.s16','vabalmi.s16','vabalpl.s16','vabalvs.s16','vabalvc.s16','vabalhi.s16','vaballs.s16','vabalge.s16','vaballt.s16','vabalgt.s16','vaballe.s16',
-            'vabaleq.s32','vabalne.s32','vabalcs.s32','vabalhs.s32','vabalcc.s32','vaballo.s32','vabalmi.s32','vabalpl.s32','vabalvs.s32','vabalvc.s32','vabalhi.s32','vaballs.s32','vabalge.s32','vaballt.s32','vabalgt.s32','vaballe.s32',
-
-            'vabdeq.s8','vabdne.s8','vabdcs.s8','vabdhs.s8','vabdcc.s8','vabdlo.s8','vabdmi.s8','vabdpl.s8','vabdvs.s8','vabdvc.s8','vabdhi.s8','vabdls.s8','vabdge.s8','vabdlt.s8','vabdgt.s8','vabdle.s8',
-            'vabdeq.s16','vabdne.s16','vabdcs.s16','vabdhs.s16','vabdcc.s16','vabdlo.s16','vabdmi.s16','vabdpl.s16','vabdvs.s16','vabdvc.s16','vabdhi.s16','vabdls.s16','vabdge.s16','vabdlt.s16','vabdgt.s16','vabdle.s16',
-            'vabdeq.s32','vabdne.s32','vabdcs.s32','vabdhs.s32','vabdcc.s32','vabdlo.s32','vabdmi.s32','vabdpl.s32','vabdvs.s32','vabdvc.s32','vabdhi.s32','vabdls.s32','vabdge.s32','vabdlt.s32','vabdgt.s32','vabdle.s32',
-
-            'vabseq.s8','vabsne.s8','vabscs.s8','vabshs.s8','vabscc.s8','vabslo.s8','vabsmi.s8','vabspl.s8','vabsvs.s8','vabsvc.s8','vabshi.s8','vabsls.s8','vabsge.s8','vabslt.s8','vabsgt.s8','vabsle.s8',
-            'vabseq.s16','vabsne.s16','vabscs.s16','vabshs.s16','vabscc.s16','vabslo.s16','vabsmi.s16','vabspl.s16','vabsvs.s16','vabsvc.s16','vabshi.s16','vabsls.s16','vabsge.s16','vabslt.s16','vabsgt.s16','vabsle.s16',
-            'vabseq.s32','vabsne.s32','vabscs.s32','vabshs.s32','vabscc.s32','vabslo.s32','vabsmi.s32','vabspl.s32','vabsvs.s32','vabsvc.s32','vabshi.s32','vabsls.s32','vabsge.s32','vabslt.s32','vabsgt.s32','vabsle.s32',
-
-            'vaddleq.s8','vaddlne.s8','vaddlcs.s8','vaddlhs.s8','vaddlcc.s8','vaddllo.s8','vaddlmi.s8','vaddlpl.s8','vaddlvs.s8','vaddlvc.s8','vaddlhi.s8','vaddlls.s8','vaddlge.s8','vaddllt.s8','vaddlgt.s8','vaddlle.s8',
-            'vaddleq.s16','vaddlne.s16','vaddlcs.s16','vaddlhs.s16','vaddlcc.s16','vaddllo.s16','vaddlmi.s16','vaddlpl.s16','vaddlvs.s16','vaddlvc.s16','vaddlhi.s16','vaddlls.s16','vaddlge.s16','vaddllt.s16','vaddlgt.s16','vaddlle.s16',
-            'vaddleq.s32','vaddlne.s32','vaddlcs.s32','vaddlhs.s32','vaddlcc.s32','vaddllo.s32','vaddlmi.s32','vaddlpl.s32','vaddlvs.s32','vaddlvc.s32','vaddlhi.s32','vaddlls.s32','vaddlge.s32','vaddllt.s32','vaddlgt.s32','vaddlle.s32',
-
-            'vcgeeq.s8','vcgene.s8','vcgecs.s8','vcgehs.s8','vcgecc.s8','vcgelo.s8','vcgemi.s8','vcgepl.s8','vcgevs.s8','vcgevc.s8','vcgehi.s8','vcgels.s8','vcgege.s8','vcgelt.s8','vcgegt.s8','vcgele.s8',
-            'vcgeeq.s16','vcgene.s16','vcgecs.s16','vcgehs.s16','vcgecc.s16','vcgelo.s16','vcgemi.s16','vcgepl.s16','vcgevs.s16','vcgevc.s16','vcgehi.s16','vcgels.s16','vcgege.s16','vcgelt.s16','vcgegt.s16','vcgele.s16',
-            'vcgeeq.s32','vcgene.s32','vcgecs.s32','vcgehs.s32','vcgecc.s32','vcgelo.s32','vcgemi.s32','vcgepl.s32','vcgevs.s32','vcgevc.s32','vcgehi.s32','vcgels.s32','vcgege.s32','vcgelt.s32','vcgegt.s32','vcgele.s32',
-
-            'vcleeq.s8','vclene.s8','vclecs.s8','vclehs.s8','vclecc.s8','vclelo.s8','vclemi.s8','vclepl.s8','vclevs.s8','vclevc.s8','vclehi.s8','vclels.s8','vclege.s8','vclelt.s8','vclegt.s8','vclele.s8',
-            'vcleeq.s16','vclene.s16','vclecs.s16','vclehs.s16','vclecc.s16','vclelo.s16','vclemi.s16','vclepl.s16','vclevs.s16','vclevc.s16','vclehi.s16','vclels.s16','vclege.s16','vclelt.s16','vclegt.s16','vclele.s16',
-            'vcleeq.s32','vclene.s32','vclecs.s32','vclehs.s32','vclecc.s32','vclelo.s32','vclemi.s32','vclepl.s32','vclevs.s32','vclevc.s32','vclehi.s32','vclels.s32','vclege.s32','vclelt.s32','vclegt.s32','vclele.s32',
-
-            'vcgteq.s8','vcgtne.s8','vcgtcs.s8','vcgths.s8','vcgtcc.s8','vcgtlo.s8','vcgtmi.s8','vcgtpl.s8','vcgtvs.s8','vcgtvc.s8','vcgthi.s8','vcgtls.s8','vcgtge.s8','vcgtlt.s8','vcgtgt.s8','vcgtle.s8',
-            'vcgteq.s16','vcgtne.s16','vcgtcs.s16','vcgths.s16','vcgtcc.s16','vcgtlo.s16','vcgtmi.s16','vcgtpl.s16','vcgtvs.s16','vcgtvc.s16','vcgthi.s16','vcgtls.s16','vcgtge.s16','vcgtlt.s16','vcgtgt.s16','vcgtle.s16',
-            'vcgteq.s32','vcgtne.s32','vcgtcs.s32','vcgths.s32','vcgtcc.s32','vcgtlo.s32','vcgtmi.s32','vcgtpl.s32','vcgtvs.s32','vcgtvc.s32','vcgthi.s32','vcgtls.s32','vcgtge.s32','vcgtlt.s32','vcgtgt.s32','vcgtle.s32',
-
-            'vclteq.s8','vcltne.s8','vcltcs.s8','vclths.s8','vcltcc.s8','vcltlo.s8','vcltmi.s8','vcltpl.s8','vcltvs.s8','vcltvc.s8','vclthi.s8','vcltls.s8','vcltge.s8','vcltlt.s8','vcltgt.s8','vcltle.s8',
-            'vclteq.s16','vcltne.s16','vcltcs.s16','vclths.s16','vcltcc.s16','vcltlo.s16','vcltmi.s16','vcltpl.s16','vcltvs.s16','vcltvc.s16','vclthi.s16','vcltls.s16','vcltge.s16','vcltlt.s16','vcltgt.s16','vcltle.s16',
-            'vclteq.s32','vcltne.s32','vcltcs.s32','vclths.s32','vcltcc.s32','vcltlo.s32','vcltmi.s32','vcltpl.s32','vcltvs.s32','vcltvc.s32','vclthi.s32','vcltls.s32','vcltge.s32','vcltlt.s32','vcltgt.s32','vcltle.s32',
-
-            'vclseq.s8','vclsne.s8','vclscs.s8','vclshs.s8','vclscc.s8','vclslo.s8','vclsmi.s8','vclspl.s8','vclsvs.s8','vclsvc.s8','vclshi.s8','vclsls.s8','vclsge.s8','vclslt.s8','vclsgt.s8','vclsle.s8',
-            'vclseq.s16','vclsne.s16','vclscs.s16','vclshs.s16','vclscc.s16','vclslo.s16','vclsmi.s16','vclspl.s16','vclsvs.s16','vclsvc.s16','vclshi.s16','vclsls.s16','vclsge.s16','vclslt.s16','vclsgt.s16','vclsle.s16',
-            'vclseq.s32','vclsne.s32','vclscs.s32','vclshs.s32','vclscc.s32','vclslo.s32','vclsmi.s32','vclspl.s32','vclsvs.s32','vclsvc.s32','vclshi.s32','vclsls.s32','vclsge.s32','vclslt.s32','vclsgt.s32','vclsle.s32',
-
-            'vaddweq.s8','vaddwne.s8','vaddwcs.s8','vaddwhs.s8','vaddwcc.s8','vaddwlo.s8','vaddwmi.s8','vaddwpl.s8','vaddwvs.s8','vaddwvc.s8','vaddwhi.s8','vaddwls.s8','vaddwge.s8','vaddwlt.s8','vaddwgt.s8','vaddwle.s8',
-            'vaddweq.s16','vaddwne.s16','vaddwcs.s16','vaddwhs.s16','vaddwcc.s16','vaddwlo.s16','vaddwmi.s16','vaddwpl.s16','vaddwvs.s16','vaddwvc.s16','vaddwhi.s16','vaddwls.s16','vaddwge.s16','vaddwlt.s16','vaddwgt.s16','vaddwle.s16',
-            'vaddweq.s32','vaddwne.s32','vaddwcs.s32','vaddwhs.s32','vaddwcc.s32','vaddwlo.s32','vaddwmi.s32','vaddwpl.s32','vaddwvs.s32','vaddwvc.s32','vaddwhi.s32','vaddwls.s32','vaddwge.s32','vaddwlt.s32','vaddwgt.s32','vaddwle.s32',
-
-            'vhaddeq.s8','vhaddne.s8','vhaddcs.s8','vhaddhs.s8','vhaddcc.s8','vhaddlo.s8','vhaddmi.s8','vhaddpl.s8','vhaddvs.s8','vhaddvc.s8','vhaddhi.s8','vhaddls.s8','vhaddge.s8','vhaddlt.s8','vhaddgt.s8','vhaddle.s8',
-            'vhaddeq.s16','vhaddne.s16','vhaddcs.s16','vhaddhs.s16','vhaddcc.s16','vhaddlo.s16','vhaddmi.s16','vhaddpl.s16','vhaddvs.s16','vhaddvc.s16','vhaddhi.s16','vhaddls.s16','vhaddge.s16','vhaddlt.s16','vhaddgt.s16','vhaddle.s16',
-            'vhaddeq.s32','vhaddne.s32','vhaddcs.s32','vhaddhs.s32','vhaddcc.s32','vhaddlo.s32','vhaddmi.s32','vhaddpl.s32','vhaddvs.s32','vhaddvc.s32','vhaddhi.s32','vhaddls.s32','vhaddge.s32','vhaddlt.s32','vhaddgt.s32','vhaddle.s32',
-
-            'vhsubeq.s8','vhsubne.s8','vhsubcs.s8','vhsubhs.s8','vhsubcc.s8','vhsublo.s8','vhsubmi.s8','vhsubpl.s8','vhsubvs.s8','vhsubvc.s8','vhsubhi.s8','vhsubls.s8','vhsubge.s8','vhsublt.s8','vhsubgt.s8','vhsuble.s8',
-            'vhsubeq.s16','vhsubne.s16','vhsubcs.s16','vhsubhs.s16','vhsubcc.s16','vhsublo.s16','vhsubmi.s16','vhsubpl.s16','vhsubvs.s16','vhsubvc.s16','vhsubhi.s16','vhsubls.s16','vhsubge.s16','vhsublt.s16','vhsubgt.s16','vhsuble.s16',
-            'vhsubeq.s32','vhsubne.s32','vhsubcs.s32','vhsubhs.s32','vhsubcc.s32','vhsublo.s32','vhsubmi.s32','vhsubpl.s32','vhsubvs.s32','vhsubvc.s32','vhsubhi.s32','vhsubls.s32','vhsubge.s32','vhsublt.s32','vhsubgt.s32','vhsuble.s32',
-
-            'vmaxeq.s8','vmaxne.s8','vmaxcs.s8','vmaxhs.s8','vmaxcc.s8','vmaxlo.s8','vmaxmi.s8','vmaxpl.s8','vmaxvs.s8','vmaxvc.s8','vmaxhi.s8','vmaxls.s8','vmaxge.s8','vmaxlt.s8','vmaxgt.s8','vmaxle.s8',
-            'vmaxeq.s16','vmaxne.s16','vmaxcs.s16','vmaxhs.s16','vmaxcc.s16','vmaxlo.s16','vmaxmi.s16','vmaxpl.s16','vmaxvs.s16','vmaxvc.s16','vmaxhi.s16','vmaxls.s16','vmaxge.s16','vmaxlt.s16','vmaxgt.s16','vmaxle.s16',
-            'vmaxeq.s32','vmaxne.s32','vmaxcs.s32','vmaxhs.s32','vmaxcc.s32','vmaxlo.s32','vmaxmi.s32','vmaxpl.s32','vmaxvs.s32','vmaxvc.s32','vmaxhi.s32','vmaxls.s32','vmaxge.s32','vmaxlt.s32','vmaxgt.s32','vmaxle.s32',
-
-            'vmineq.s8','vminne.s8','vmincs.s8','vminhs.s8','vmincc.s8','vminlo.s8','vminmi.s8','vminpl.s8','vminvs.s8','vminvc.s8','vminhi.s8','vminls.s8','vminge.s8','vminlt.s8','vmingt.s8','vminle.s8',
-            'vmineq.s16','vminne.s16','vmincs.s16','vminhs.s16','vmincc.s16','vminlo.s16','vminmi.s16','vminpl.s16','vminvs.s16','vminvc.s16','vminhi.s16','vminls.s16','vminge.s16','vminlt.s16','vmingt.s16','vminle.s16',
-            'vmineq.s32','vminne.s32','vmincs.s32','vminhs.s32','vmincc.s32','vminlo.s32','vminmi.s32','vminpl.s32','vminvs.s32','vminvc.s32','vminhi.s32','vminls.s32','vminge.s32','vminlt.s32','vmingt.s32','vminle.s32',
-
-            'vmlaleq.s8','vmlalne.s8','vmlalcs.s8','vmlalhs.s8','vmlalcc.s8','vmlallo.s8','vmlalmi.s8','vmlalpl.s8','vmlalvs.s8','vmlalvc.s8','vmlalhi.s8','vmlalls.s8','vmlalge.s8','vmlallt.s8','vmlalgt.s8','vmlalle.s8',
-            'vmlaleq.s16','vmlalne.s16','vmlalcs.s16','vmlalhs.s16','vmlalcc.s16','vmlallo.s16','vmlalmi.s16','vmlalpl.s16','vmlalvs.s16','vmlalvc.s16','vmlalhi.s16','vmlalls.s16','vmlalge.s16','vmlallt.s16','vmlalgt.s16','vmlalle.s16',
-            'vmlaleq.s32','vmlalne.s32','vmlalcs.s32','vmlalhs.s32','vmlalcc.s32','vmlallo.s32','vmlalmi.s32','vmlalpl.s32','vmlalvs.s32','vmlalvc.s32','vmlalhi.s32','vmlalls.s32','vmlalge.s32','vmlallt.s32','vmlalgt.s32','vmlalle.s32',
-
-            'vmlsleq.s8','vmlslne.s8','vmlslcs.s8','vmlslhs.s8','vmlslcc.s8','vmlsllo.s8','vmlslmi.s8','vmlslpl.s8','vmlslvs.s8','vmlslvc.s8','vmlslhi.s8','vmlslls.s8','vmlslge.s8','vmlsllt.s8','vmlslgt.s8','vmlslle.s8',
-            'vmlsleq.s16','vmlslne.s16','vmlslcs.s16','vmlslhs.s16','vmlslcc.s16','vmlsllo.s16','vmlslmi.s16','vmlslpl.s16','vmlslvs.s16','vmlslvc.s16','vmlslhi.s16','vmlslls.s16','vmlslge.s16','vmlsllt.s16','vmlslgt.s16','vmlslle.s16',
-            'vmlsleq.s32','vmlslne.s32','vmlslcs.s32','vmlslhs.s32','vmlslcc.s32','vmlsllo.s32','vmlslmi.s32','vmlslpl.s32','vmlslvs.s32','vmlslvc.s32','vmlslhi.s32','vmlslls.s32','vmlslge.s32','vmlsllt.s32','vmlslgt.s32','vmlslle.s32',
-
-            'vnegeq.s8','vnegne.s8','vnegcs.s8','vneghs.s8','vnegcc.s8','vneglo.s8','vnegmi.s8','vnegpl.s8','vnegvs.s8','vnegvc.s8','vneghi.s8','vnegls.s8','vnegge.s8','vneglt.s8','vneggt.s8','vnegle.s8',
-            'vnegeq.s16','vnegne.s16','vnegcs.s16','vneghs.s16','vnegcc.s16','vneglo.s16','vnegmi.s16','vnegpl.s16','vnegvs.s16','vnegvc.s16','vneghi.s16','vnegls.s16','vnegge.s16','vneglt.s16','vneggt.s16','vnegle.s16',
-            'vnegeq.s32','vnegne.s32','vnegcs.s32','vneghs.s32','vnegcc.s32','vneglo.s32','vnegmi.s32','vnegpl.s32','vnegvs.s32','vnegvc.s32','vneghi.s32','vnegls.s32','vnegge.s32','vneglt.s32','vneggt.s32','vnegle.s32',
-
-            'vpadaleq.s8','vpadalne.s8','vpadalcs.s8','vpadalhs.s8','vpadalcc.s8','vpadallo.s8','vpadalmi.s8','vpadalpl.s8','vpadalvs.s8','vpadalvc.s8','vpadalhi.s8','vpadalls.s8','vpadalge.s8','vpadallt.s8','vpadalgt.s8','vpadalle.s8',
-            'vpadaleq.s16','vpadalne.s16','vpadalcs.s16','vpadalhs.s16','vpadalcc.s16','vpadallo.s16','vpadalmi.s16','vpadalpl.s16','vpadalvs.s16','vpadalvc.s16','vpadalhi.s16','vpadalls.s16','vpadalge.s16','vpadallt.s16','vpadalgt.s16','vpadalle.s16',
-            'vpadaleq.s32','vpadalne.s32','vpadalcs.s32','vpadalhs.s32','vpadalcc.s32','vpadallo.s32','vpadalmi.s32','vpadalpl.s32','vpadalvs.s32','vpadalvc.s32','vpadalhi.s32','vpadalls.s32','vpadalge.s32','vpadallt.s32','vpadalgt.s32','vpadalle.s32',
-
-            'vmovleq.s8','vmovlne.s8','vmovlcs.s8','vmovlhs.s8','vmovlcc.s8','vmovllo.s8','vmovlmi.s8','vmovlpl.s8','vmovlvs.s8','vmovlvc.s8','vmovlhi.s8','vmovlls.s8','vmovlge.s8','vmovllt.s8','vmovlgt.s8','vmovlle.s8',
-            'vmovleq.s16','vmovlne.s16','vmovlcs.s16','vmovlhs.s16','vmovlcc.s16','vmovllo.s16','vmovlmi.s16','vmovlpl.s16','vmovlvs.s16','vmovlvc.s16','vmovlhi.s16','vmovlls.s16','vmovlge.s16','vmovllt.s16','vmovlgt.s16','vmovlle.s16',
-            'vmovleq.s32','vmovlne.s32','vmovlcs.s32','vmovlhs.s32','vmovlcc.s32','vmovllo.s32','vmovlmi.s32','vmovlpl.s32','vmovlvs.s32','vmovlvc.s32','vmovlhi.s32','vmovlls.s32','vmovlge.s32','vmovllt.s32','vmovlgt.s32','vmovlle.s32',
-
-            'vmulleq.s8','vmullne.s8','vmullcs.s8','vmullhs.s8','vmullcc.s8','vmulllo.s8','vmullmi.s8','vmullpl.s8','vmullvs.s8','vmullvc.s8','vmullhi.s8','vmullls.s8','vmullge.s8','vmulllt.s8','vmullgt.s8','vmullle.s8',
-            'vmulleq.s16','vmullne.s16','vmullcs.s16','vmullhs.s16','vmullcc.s16','vmulllo.s16','vmullmi.s16','vmullpl.s16','vmullvs.s16','vmullvc.s16','vmullhi.s16','vmullls.s16','vmullge.s16','vmulllt.s16','vmullgt.s16','vmullle.s16',
-            'vmulleq.s32','vmullne.s32','vmullcs.s32','vmullhs.s32','vmullcc.s32','vmulllo.s32','vmullmi.s32','vmullpl.s32','vmullvs.s32','vmullvc.s32','vmullhi.s32','vmullls.s32','vmullge.s32','vmulllt.s32','vmullgt.s32','vmullle.s32',
-
-            'vpaddleq.s8','vpaddlne.s8','vpaddlcs.s8','vpaddlhs.s8','vpaddlcc.s8','vpaddllo.s8','vpaddlmi.s8','vpaddlpl.s8','vpaddlvs.s8','vpaddlvc.s8','vpaddlhi.s8','vpaddlls.s8','vpaddlge.s8','vpaddllt.s8','vpaddlgt.s8','vpaddlle.s8',
-            'vpaddleq.s16','vpaddlne.s16','vpaddlcs.s16','vpaddlhs.s16','vpaddlcc.s16','vpaddllo.s16','vpaddlmi.s16','vpaddlpl.s16','vpaddlvs.s16','vpaddlvc.s16','vpaddlhi.s16','vpaddlls.s16','vpaddlge.s16','vpaddllt.s16','vpaddlgt.s16','vpaddlle.s16',
-            'vpaddleq.s32','vpaddlne.s32','vpaddlcs.s32','vpaddlhs.s32','vpaddlcc.s32','vpaddllo.s32','vpaddlmi.s32','vpaddlpl.s32','vpaddlvs.s32','vpaddlvc.s32','vpaddlhi.s32','vpaddlls.s32','vpaddlge.s32','vpaddllt.s32','vpaddlgt.s32','vpaddlle.s32',
-
-            'vpmaxeq.s8','vpmaxne.s8','vpmaxcs.s8','vpmaxhs.s8','vpmaxcc.s8','vpmaxlo.s8','vpmaxmi.s8','vpmaxpl.s8','vpmaxvs.s8','vpmaxvc.s8','vpmaxhi.s8','vpmaxls.s8','vpmaxge.s8','vpmaxlt.s8','vpmaxgt.s8','vpmaxle.s8',
-            'vpmaxeq.s16','vpmaxne.s16','vpmaxcs.s16','vpmaxhs.s16','vpmaxcc.s16','vpmaxlo.s16','vpmaxmi.s16','vpmaxpl.s16','vpmaxvs.s16','vpmaxvc.s16','vpmaxhi.s16','vpmaxls.s16','vpmaxge.s16','vpmaxlt.s16','vpmaxgt.s16','vpmaxle.s16',
-            'vpmaxeq.s32','vpmaxne.s32','vpmaxcs.s32','vpmaxhs.s32','vpmaxcc.s32','vpmaxlo.s32','vpmaxmi.s32','vpmaxpl.s32','vpmaxvs.s32','vpmaxvc.s32','vpmaxhi.s32','vpmaxls.s32','vpmaxge.s32','vpmaxlt.s32','vpmaxgt.s32','vpmaxle.s32',
-
-            'vpmineq.s8','vpminne.s8','vpmincs.s8','vpminhs.s8','vpmincc.s8','vpminlo.s8','vpminmi.s8','vpminpl.s8','vpminvs.s8','vpminvc.s8','vpminhi.s8','vpminls.s8','vpminge.s8','vpminlt.s8','vpmingt.s8','vpminle.s8',
-            'vpmineq.s16','vpminne.s16','vpmincs.s16','vpminhs.s16','vpmincc.s16','vpminlo.s16','vpminmi.s16','vpminpl.s16','vpminvs.s16','vpminvc.s16','vpminhi.s16','vpminls.s16','vpminge.s16','vpminlt.s16','vpmingt.s16','vpminle.s16',
-            'vpmineq.s32','vpminne.s32','vpmincs.s32','vpminhs.s32','vpmincc.s32','vpminlo.s32','vpminmi.s32','vpminpl.s32','vpminvs.s32','vpminvc.s32','vpminhi.s32','vpminls.s32','vpminge.s32','vpminlt.s32','vpmingt.s32','vpminle.s32',
-
-            'vqabseq.s8','vqabsne.s8','vqabscs.s8','vqabshs.s8','vqabscc.s8','vqabslo.s8','vqabsmi.s8','vqabspl.s8','vqabsvs.s8','vqabsvc.s8','vqabshi.s8','vqabsls.s8','vqabsge.s8','vqabslt.s8','vqabsgt.s8','vqabsle.s8',
-            'vqabseq.s16','vqabsne.s16','vqabscs.s16','vqabshs.s16','vqabscc.s16','vqabslo.s16','vqabsmi.s16','vqabspl.s16','vqabsvs.s16','vqabsvc.s16','vqabshi.s16','vqabsls.s16','vqabsge.s16','vqabslt.s16','vqabsgt.s16','vqabsle.s16',
-            'vqabseq.s32','vqabsne.s32','vqabscs.s32','vqabshs.s32','vqabscc.s32','vqabslo.s32','vqabsmi.s32','vqabspl.s32','vqabsvs.s32','vqabsvc.s32','vqabshi.s32','vqabsls.s32','vqabsge.s32','vqabslt.s32','vqabsgt.s32','vqabsle.s32',
-
-            'vqaddeq.s8','vqaddne.s8','vqaddcs.s8','vqaddhs.s8','vqaddcc.s8','vqaddlo.s8','vqaddmi.s8','vqaddpl.s8','vqaddvs.s8','vqaddvc.s8','vqaddhi.s8','vqaddls.s8','vqaddge.s8','vqaddlt.s8','vqaddgt.s8','vqaddle.s8',
-            'vqaddeq.s16','vqaddne.s16','vqaddcs.s16','vqaddhs.s16','vqaddcc.s16','vqaddlo.s16','vqaddmi.s16','vqaddpl.s16','vqaddvs.s16','vqaddvc.s16','vqaddhi.s16','vqaddls.s16','vqaddge.s16','vqaddlt.s16','vqaddgt.s16','vqaddle.s16',
-            'vqaddeq.s32','vqaddne.s32','vqaddcs.s32','vqaddhs.s32','vqaddcc.s32','vqaddlo.s32','vqaddmi.s32','vqaddpl.s32','vqaddvs.s32','vqaddvc.s32','vqaddhi.s32','vqaddls.s32','vqaddge.s32','vqaddlt.s32','vqaddgt.s32','vqaddle.s32',
-            'vqaddeq.s64','vqaddne.s64','vqaddcs.s64','vqaddhs.s64','vqaddcc.s64','vqaddlo.s64','vqaddmi.s64','vqaddpl.s64','vqaddvs.s64','vqaddvc.s64','vqaddhi.s64','vqaddls.s64','vqaddge.s64','vqaddlt.s64','vqaddgt.s64','vqaddle.s64',
-
-            'vqdmlaleq.s16','vqdmlalne.s16','vqdmlalcs.s16','vqdmlalhs.s16','vqdmlalcc.s16','vqdmlallo.s16','vqdmlalmi.s16','vqdmlalpl.s16','vqdmlalvs.s16','vqdmlalvc.s16','vqdmlalhi.s16','vqdmlalls.s16','vqdmlalge.s16','vqdmlallt.s16','vqdmlalgt.s16','vqdmlalle.s16',
-            'vqdmlaleq.s32','vqdmlalne.s32','vqdmlalcs.s32','vqdmlalhs.s32','vqdmlalcc.s32','vqdmlallo.s32','vqdmlalmi.s32','vqdmlalpl.s32','vqdmlalvs.s32','vqdmlalvc.s32','vqdmlalhi.s32','vqdmlalls.s32','vqdmlalge.s32','vqdmlallt.s32','vqdmlalgt.s32','vqdmlalle.s32',
-
-            'vqdmlsleq.s16','vqdmlslne.s16','vqdmlslcs.s16','vqdmlslhs.s16','vqdmlslcc.s16','vqdmlsllo.s16','vqdmlslmi.s16','vqdmlslpl.s16','vqdmlslvs.s16','vqdmlslvc.s16','vqdmlslhi.s16','vqdmlslls.s16','vqdmlslge.s16','vqdmlsllt.s16','vqdmlslgt.s16','vqdmlslle.s16',
-            'vqdmlsleq.s32','vqdmlslne.s32','vqdmlslcs.s32','vqdmlslhs.s32','vqdmlslcc.s32','vqdmlsllo.s32','vqdmlslmi.s32','vqdmlslpl.s32','vqdmlslvs.s32','vqdmlslvc.s32','vqdmlslhi.s32','vqdmlslls.s32','vqdmlslge.s32','vqdmlsllt.s32','vqdmlslgt.s32','vqdmlslle.s32',
-
-            'vqdmulheq.s16','vqdmulhne.s16','vqdmulhcs.s16','vqdmulhhs.s16','vqdmulhcc.s16','vqdmulhlo.s16','vqdmulhmi.s16','vqdmulhpl.s16','vqdmulhvs.s16','vqdmulhvc.s16','vqdmulhhi.s16','vqdmulhls.s16','vqdmulhge.s16','vqdmulhlt.s16','vqdmulhgt.s16','vqdmulhle.s16',
-            'vqdmulheq.s32','vqdmulhne.s32','vqdmulhcs.s32','vqdmulhhs.s32','vqdmulhcc.s32','vqdmulhlo.s32','vqdmulhmi.s32','vqdmulhpl.s32','vqdmulhvs.s32','vqdmulhvc.s32','vqdmulhhi.s32','vqdmulhls.s32','vqdmulhge.s32','vqdmulhlt.s32','vqdmulhgt.s32','vqdmulhle.s32',
-
-            'vqdmulleq.s16','vqdmullne.s16','vqdmullcs.s16','vqdmullhs.s16','vqdmullcc.s16','vqdmulllo.s16','vqdmullmi.s16','vqdmullpl.s16','vqdmullvs.s16','vqdmullvc.s16','vqdmullhi.s16','vqdmullls.s16','vqdmullge.s16','vqdmulllt.s16','vqdmullgt.s16','vqdmullle.s16',
-            'vqdmulleq.s32','vqdmullne.s32','vqdmullcs.s32','vqdmullhs.s32','vqdmullcc.s32','vqdmulllo.s32','vqdmullmi.s32','vqdmullpl.s32','vqdmullvs.s32','vqdmullvc.s32','vqdmullhi.s32','vqdmullls.s32','vqdmullge.s32','vqdmulllt.s32','vqdmullgt.s32','vqdmullle.s32',
-
-            'vqmovneq.s16','vqmovnne.s16','vqmovncs.s16','vqmovnhs.s16','vqmovncc.s16','vqmovnlo.s16','vqmovnmi.s16','vqmovnpl.s16','vqmovnvs.s16','vqmovnvc.s16','vqmovnhi.s16','vqmovnls.s16','vqmovnge.s16','vqmovnlt.s16','vqmovngt.s16','vqmovnle.s16',
-            'vqmovneq.s32','vqmovnne.s32','vqmovncs.s32','vqmovnhs.s32','vqmovncc.s32','vqmovnlo.s32','vqmovnmi.s32','vqmovnpl.s32','vqmovnvs.s32','vqmovnvc.s32','vqmovnhi.s32','vqmovnls.s32','vqmovnge.s32','vqmovnlt.s32','vqmovngt.s32','vqmovnle.s32',
-            'vqmovneq.s64','vqmovnne.s64','vqmovncs.s64','vqmovnhs.s64','vqmovncc.s64','vqmovnlo.s64','vqmovnmi.s64','vqmovnpl.s64','vqmovnvs.s64','vqmovnvc.s64','vqmovnhi.s64','vqmovnls.s64','vqmovnge.s64','vqmovnlt.s64','vqmovngt.s64','vqmovnle.s64',
-
-            'vqmovuneq.s16','vqmovunne.s16','vqmovuncs.s16','vqmovunhs.s16','vqmovuncc.s16','vqmovunlo.s16','vqmovunmi.s16','vqmovunpl.s16','vqmovunvs.s16','vqmovunvc.s16','vqmovunhi.s16','vqmovunls.s16','vqmovunge.s16','vqmovunlt.s16','vqmovungt.s16','vqmovunle.s16',
-            'vqmovuneq.s32','vqmovunne.s32','vqmovuncs.s32','vqmovunhs.s32','vqmovuncc.s32','vqmovunlo.s32','vqmovunmi.s32','vqmovunpl.s32','vqmovunvs.s32','vqmovunvc.s32','vqmovunhi.s32','vqmovunls.s32','vqmovunge.s32','vqmovunlt.s32','vqmovungt.s32','vqmovunle.s32',
-            'vqmovuneq.s64','vqmovunne.s64','vqmovuncs.s64','vqmovunhs.s64','vqmovuncc.s64','vqmovunlo.s64','vqmovunmi.s64','vqmovunpl.s64','vqmovunvs.s64','vqmovunvc.s64','vqmovunhi.s64','vqmovunls.s64','vqmovunge.s64','vqmovunlt.s64','vqmovungt.s64','vqmovunle.s64',
-
-            'vqnegeq.s8','vqnegne.s8','vqnegcs.s8','vqneghs.s8','vqnegcc.s8','vqneglo.s8','vqnegmi.s8','vqnegpl.s8','vqnegvs.s8','vqnegvc.s8','vqneghi.s8','vqnegls.s8','vqnegge.s8','vqneglt.s8','vqneggt.s8','vqnegle.s8',
-            'vqnegeq.s16','vqnegne.s16','vqnegcs.s16','vqneghs.s16','vqnegcc.s16','vqneglo.s16','vqnegmi.s16','vqnegpl.s16','vqnegvs.s16','vqnegvc.s16','vqneghi.s16','vqnegls.s16','vqnegge.s16','vqneglt.s16','vqneggt.s16','vqnegle.s16',
-            'vqnegeq.s32','vqnegne.s32','vqnegcs.s32','vqneghs.s32','vqnegcc.s32','vqneglo.s32','vqnegmi.s32','vqnegpl.s32','vqnegvs.s32','vqnegvc.s32','vqneghi.s32','vqnegls.s32','vqnegge.s32','vqneglt.s32','vqneggt.s32','vqnegle.s32',
-
-            'vqrdmulheq.s16','vqrdmulhne.s16','vqrdmulhcs.s16','vqrdmulhhs.s16','vqrdmulhcc.s16','vqrdmulhlo.s16','vqrdmulhmi.s16','vqrdmulhpl.s16','vqrdmulhvs.s16','vqrdmulhvc.s16','vqrdmulhhi.s16','vqrdmulhls.s16','vqrdmulhge.s16','vqrdmulhlt.s16','vqrdmulhgt.s16','vqrdmulhle.s16',
-            'vqrdmulheq.s32','vqrdmulhne.s32','vqrdmulhcs.s32','vqrdmulhhs.s32','vqrdmulhcc.s32','vqrdmulhlo.s32','vqrdmulhmi.s32','vqrdmulhpl.s32','vqrdmulhvs.s32','vqrdmulhvc.s32','vqrdmulhhi.s32','vqrdmulhls.s32','vqrdmulhge.s32','vqrdmulhlt.s32','vqrdmulhgt.s32','vqrdmulhle.s32',
-
-            'vqrshleq.s8','vqrshlne.s8','vqrshlcs.s8','vqrshlhs.s8','vqrshlcc.s8','vqrshllo.s8','vqrshlmi.s8','vqrshlpl.s8','vqrshlvs.s8','vqrshlvc.s8','vqrshlhi.s8','vqrshlls.s8','vqrshlge.s8','vqrshllt.s8','vqrshlgt.s8','vqrshlle.s8',
-            'vqrshleq.s16','vqrshlne.s16','vqrshlcs.s16','vqrshlhs.s16','vqrshlcc.s16','vqrshllo.s16','vqrshlmi.s16','vqrshlpl.s16','vqrshlvs.s16','vqrshlvc.s16','vqrshlhi.s16','vqrshlls.s16','vqrshlge.s16','vqrshllt.s16','vqrshlgt.s16','vqrshlle.s16',
-            'vqrshleq.s32','vqrshlne.s32','vqrshlcs.s32','vqrshlhs.s32','vqrshlcc.s32','vqrshllo.s32','vqrshlmi.s32','vqrshlpl.s32','vqrshlvs.s32','vqrshlvc.s32','vqrshlhi.s32','vqrshlls.s32','vqrshlge.s32','vqrshllt.s32','vqrshlgt.s32','vqrshlle.s32',
-            'vqrshleq.s64','vqrshlne.s64','vqrshlcs.s64','vqrshlhs.s64','vqrshlcc.s64','vqrshllo.s64','vqrshlmi.s64','vqrshlpl.s64','vqrshlvs.s64','vqrshlvc.s64','vqrshlhi.s64','vqrshlls.s64','vqrshlge.s64','vqrshllt.s64','vqrshlgt.s64','vqrshlle.s64',
-
-            'vqrshrneq.s16','vqrshrnne.s16','vqrshrncs.s16','vqrshrnhs.s16','vqrshrncc.s16','vqrshrnlo.s16','vqrshrnmi.s16','vqrshrnpl.s16','vqrshrnvs.s16','vqrshrnvc.s16','vqrshrnhi.s16','vqrshrnls.s16','vqrshrnge.s16','vqrshrnlt.s16','vqrshrngt.s16','vqrshrnle.s16',
-            'vqrshrneq.s32','vqrshrnne.s32','vqrshrncs.s32','vqrshrnhs.s32','vqrshrncc.s32','vqrshrnlo.s32','vqrshrnmi.s32','vqrshrnpl.s32','vqrshrnvs.s32','vqrshrnvc.s32','vqrshrnhi.s32','vqrshrnls.s32','vqrshrnge.s32','vqrshrnlt.s32','vqrshrngt.s32','vqrshrnle.s32',
-            'vqrshrneq.s64','vqrshrnne.s64','vqrshrncs.s64','vqrshrnhs.s64','vqrshrncc.s64','vqrshrnlo.s64','vqrshrnmi.s64','vqrshrnpl.s64','vqrshrnvs.s64','vqrshrnvc.s64','vqrshrnhi.s64','vqrshrnls.s64','vqrshrnge.s64','vqrshrnlt.s64','vqrshrngt.s64','vqrshrnle.s64',
-
-            'vqrshruneq.s16','vqrshrunne.s16','vqrshruncs.s16','vqrshrunhs.s16','vqrshruncc.s16','vqrshrunlo.s16','vqrshrunmi.s16','vqrshrunpl.s16','vqrshrunvs.s16','vqrshrunvc.s16','vqrshrunhi.s16','vqrshrunls.s16','vqrshrunge.s16','vqrshrunlt.s16','vqrshrungt.s16','vqrshrunle.s16',
-            'vqrshruneq.s32','vqrshrunne.s32','vqrshruncs.s32','vqrshrunhs.s32','vqrshruncc.s32','vqrshrunlo.s32','vqrshrunmi.s32','vqrshrunpl.s32','vqrshrunvs.s32','vqrshrunvc.s32','vqrshrunhi.s32','vqrshrunls.s32','vqrshrunge.s32','vqrshrunlt.s32','vqrshrungt.s32','vqrshrunle.s32',
-            'vqrshruneq.s64','vqrshrunne.s64','vqrshruncs.s64','vqrshrunhs.s64','vqrshruncc.s64','vqrshrunlo.s64','vqrshrunmi.s64','vqrshrunpl.s64','vqrshrunvs.s64','vqrshrunvc.s64','vqrshrunhi.s64','vqrshrunls.s64','vqrshrunge.s64','vqrshrunlt.s64','vqrshrungt.s64','vqrshrunle.s64',
-
-            'vqshleq.s8','vqshlne.s8','vqshlcs.s8','vqshlhs.s8','vqshlcc.s8','vqshllo.s8','vqshlmi.s8','vqshlpl.s8','vqshlvs.s8','vqshlvc.s8','vqshlhi.s8','vqshlls.s8','vqshlge.s8','vqshllt.s8','vqshlgt.s8','vqshlle.s8',
-            'vqshleq.s16','vqshlne.s16','vqshlcs.s16','vqshlhs.s16','vqshlcc.s16','vqshllo.s16','vqshlmi.s16','vqshlpl.s16','vqshlvs.s16','vqshlvc.s16','vqshlhi.s16','vqshlls.s16','vqshlge.s16','vqshllt.s16','vqshlgt.s16','vqshlle.s16',
-            'vqshleq.s32','vqshlne.s32','vqshlcs.s32','vqshlhs.s32','vqshlcc.s32','vqshllo.s32','vqshlmi.s32','vqshlpl.s32','vqshlvs.s32','vqshlvc.s32','vqshlhi.s32','vqshlls.s32','vqshlge.s32','vqshllt.s32','vqshlgt.s32','vqshlle.s32',
-            'vqshleq.s64','vqshlne.s64','vqshlcs.s64','vqshlhs.s64','vqshlcc.s64','vqshllo.s64','vqshlmi.s64','vqshlpl.s64','vqshlvs.s64','vqshlvc.s64','vqshlhi.s64','vqshlls.s64','vqshlge.s64','vqshllt.s64','vqshlgt.s64','vqshlle.s64',
-
-            'vqshlueq.s8','vqshlune.s8','vqshlucs.s8','vqshluhs.s8','vqshlucc.s8','vqshlulo.s8','vqshlumi.s8','vqshlupl.s8','vqshluvs.s8','vqshluvc.s8','vqshluhi.s8','vqshluls.s8','vqshluge.s8','vqshlult.s8','vqshlugt.s8','vqshlule.s8',
-            'vqshlueq.s16','vqshlune.s16','vqshlucs.s16','vqshluhs.s16','vqshlucc.s16','vqshlulo.s16','vqshlumi.s16','vqshlupl.s16','vqshluvs.s16','vqshluvc.s16','vqshluhi.s16','vqshluls.s16','vqshluge.s16','vqshlult.s16','vqshlugt.s16','vqshlule.s16',
-            'vqshlueq.s32','vqshlune.s32','vqshlucs.s32','vqshluhs.s32','vqshlucc.s32','vqshlulo.s32','vqshlumi.s32','vqshlupl.s32','vqshluvs.s32','vqshluvc.s32','vqshluhi.s32','vqshluls.s32','vqshluge.s32','vqshlult.s32','vqshlugt.s32','vqshlule.s32',
-            'vqshlueq.s64','vqshlune.s64','vqshlucs.s64','vqshluhs.s64','vqshlucc.s64','vqshlulo.s64','vqshlumi.s64','vqshlupl.s64','vqshluvs.s64','vqshluvc.s64','vqshluhi.s64','vqshluls.s64','vqshluge.s64','vqshlult.s64','vqshlugt.s64','vqshlule.s64',
-
-            'vqshrneq.s16','vqshrnne.s16','vqshrncs.s16','vqshrnhs.s16','vqshrncc.s16','vqshrnlo.s16','vqshrnmi.s16','vqshrnpl.s16','vqshrnvs.s16','vqshrnvc.s16','vqshrnhi.s16','vqshrnls.s16','vqshrnge.s16','vqshrnlt.s16','vqshrngt.s16','vqshrnle.s16',
-            'vqshrneq.s32','vqshrnne.s32','vqshrncs.s32','vqshrnhs.s32','vqshrncc.s32','vqshrnlo.s32','vqshrnmi.s32','vqshrnpl.s32','vqshrnvs.s32','vqshrnvc.s32','vqshrnhi.s32','vqshrnls.s32','vqshrnge.s32','vqshrnlt.s32','vqshrngt.s32','vqshrnle.s32',
-            'vqshrneq.s64','vqshrnne.s64','vqshrncs.s64','vqshrnhs.s64','vqshrncc.s64','vqshrnlo.s64','vqshrnmi.s64','vqshrnpl.s64','vqshrnvs.s64','vqshrnvc.s64','vqshrnhi.s64','vqshrnls.s64','vqshrnge.s64','vqshrnlt.s64','vqshrngt.s64','vqshrnle.s64',
-
-            'vqshruneq.s16','vqshrunne.s16','vqshruncs.s16','vqshrunhs.s16','vqshruncc.s16','vqshrunlo.s16','vqshrunmi.s16','vqshrunpl.s16','vqshrunvs.s16','vqshrunvc.s16','vqshrunhi.s16','vqshrunls.s16','vqshrunge.s16','vqshrunlt.s16','vqshrungt.s16','vqshrunle.s16',
-            'vqshruneq.s32','vqshrunne.s32','vqshruncs.s32','vqshrunhs.s32','vqshruncc.s32','vqshrunlo.s32','vqshrunmi.s32','vqshrunpl.s32','vqshrunvs.s32','vqshrunvc.s32','vqshrunhi.s32','vqshrunls.s32','vqshrunge.s32','vqshrunlt.s32','vqshrungt.s32','vqshrunle.s32',
-            'vqshruneq.s64','vqshrunne.s64','vqshruncs.s64','vqshrunhs.s64','vqshruncc.s64','vqshrunlo.s64','vqshrunmi.s64','vqshrunpl.s64','vqshrunvs.s64','vqshrunvc.s64','vqshrunhi.s64','vqshrunls.s64','vqshrunge.s64','vqshrunlt.s64','vqshrungt.s64','vqshrunle.s64',
-
-            'vqsubeq.s8','vqsubne.s8','vqsubcs.s8','vqsubhs.s8','vqsubcc.s8','vqsublo.s8','vqsubmi.s8','vqsubpl.s8','vqsubvs.s8','vqsubvc.s8','vqsubhi.s8','vqsubls.s8','vqsubge.s8','vqsublt.s8','vqsubgt.s8','vqsuble.s8',
-            'vqsubeq.s16','vqsubne.s16','vqsubcs.s16','vqsubhs.s16','vqsubcc.s16','vqsublo.s16','vqsubmi.s16','vqsubpl.s16','vqsubvs.s16','vqsubvc.s16','vqsubhi.s16','vqsubls.s16','vqsubge.s16','vqsublt.s16','vqsubgt.s16','vqsuble.s16',
-            'vqsubeq.s32','vqsubne.s32','vqsubcs.s32','vqsubhs.s32','vqsubcc.s32','vqsublo.s32','vqsubmi.s32','vqsubpl.s32','vqsubvs.s32','vqsubvc.s32','vqsubhi.s32','vqsubls.s32','vqsubge.s32','vqsublt.s32','vqsubgt.s32','vqsuble.s32',
-            'vqsubeq.s64','vqsubne.s64','vqsubcs.s64','vqsubhs.s64','vqsubcc.s64','vqsublo.s64','vqsubmi.s64','vqsubpl.s64','vqsubvs.s64','vqsubvc.s64','vqsubhi.s64','vqsubls.s64','vqsubge.s64','vqsublt.s64','vqsubgt.s64','vqsuble.s64',
-
-            'vrhaddeq.s8','vrhaddne.s8','vrhaddcs.s8','vrhaddhs.s8','vrhaddcc.s8','vrhaddlo.s8','vrhaddmi.s8','vrhaddpl.s8','vrhaddvs.s8','vrhaddvc.s8','vrhaddhi.s8','vrhaddls.s8','vrhaddge.s8','vrhaddlt.s8','vrhaddgt.s8','vrhaddle.s8',
-            'vrhaddeq.s16','vrhaddne.s16','vrhaddcs.s16','vrhaddhs.s16','vrhaddcc.s16','vrhaddlo.s16','vrhaddmi.s16','vrhaddpl.s16','vrhaddvs.s16','vrhaddvc.s16','vrhaddhi.s16','vrhaddls.s16','vrhaddge.s16','vrhaddlt.s16','vrhaddgt.s16','vrhaddle.s16',
-            'vrhaddeq.s32','vrhaddne.s32','vrhaddcs.s32','vrhaddhs.s32','vrhaddcc.s32','vrhaddlo.s32','vrhaddmi.s32','vrhaddpl.s32','vrhaddvs.s32','vrhaddvc.s32','vrhaddhi.s32','vrhaddls.s32','vrhaddge.s32','vrhaddlt.s32','vrhaddgt.s32','vrhaddle.s32',
-
-            'vrshleq.s8','vrshlne.s8','vrshlcs.s8','vrshlhs.s8','vrshlcc.s8','vrshllo.s8','vrshlmi.s8','vrshlpl.s8','vrshlvs.s8','vrshlvc.s8','vrshlhi.s8','vrshlls.s8','vrshlge.s8','vrshllt.s8','vrshlgt.s8','vrshlle.s8',
-            'vrshleq.s16','vrshlne.s16','vrshlcs.s16','vrshlhs.s16','vrshlcc.s16','vrshllo.s16','vrshlmi.s16','vrshlpl.s16','vrshlvs.s16','vrshlvc.s16','vrshlhi.s16','vrshlls.s16','vrshlge.s16','vrshllt.s16','vrshlgt.s16','vrshlle.s16',
-            'vrshleq.s32','vrshlne.s32','vrshlcs.s32','vrshlhs.s32','vrshlcc.s32','vrshllo.s32','vrshlmi.s32','vrshlpl.s32','vrshlvs.s32','vrshlvc.s32','vrshlhi.s32','vrshlls.s32','vrshlge.s32','vrshllt.s32','vrshlgt.s32','vrshlle.s32',
-            'vrshleq.s64','vrshlne.s64','vrshlcs.s64','vrshlhs.s64','vrshlcc.s64','vrshllo.s64','vrshlmi.s64','vrshlpl.s64','vrshlvs.s64','vrshlvc.s64','vrshlhi.s64','vrshlls.s64','vrshlge.s64','vrshllt.s64','vrshlgt.s64','vrshlle.s64',
-
-            'vrshreq.s8','vrshrne.s8','vrshrcs.s8','vrshrhs.s8','vrshrcc.s8','vrshrlo.s8','vrshrmi.s8','vrshrpl.s8','vrshrvs.s8','vrshrvc.s8','vrshrhi.s8','vrshrls.s8','vrshrge.s8','vrshrlt.s8','vrshrgt.s8','vrshrle.s8',
-            'vrshreq.s16','vrshrne.s16','vrshrcs.s16','vrshrhs.s16','vrshrcc.s16','vrshrlo.s16','vrshrmi.s16','vrshrpl.s16','vrshrvs.s16','vrshrvc.s16','vrshrhi.s16','vrshrls.s16','vrshrge.s16','vrshrlt.s16','vrshrgt.s16','vrshrle.s16',
-            'vrshreq.s32','vrshrne.s32','vrshrcs.s32','vrshrhs.s32','vrshrcc.s32','vrshrlo.s32','vrshrmi.s32','vrshrpl.s32','vrshrvs.s32','vrshrvc.s32','vrshrhi.s32','vrshrls.s32','vrshrge.s32','vrshrlt.s32','vrshrgt.s32','vrshrle.s32',
-            'vrshreq.s64','vrshrne.s64','vrshrcs.s64','vrshrhs.s64','vrshrcc.s64','vrshrlo.s64','vrshrmi.s64','vrshrpl.s64','vrshrvs.s64','vrshrvc.s64','vrshrhi.s64','vrshrls.s64','vrshrge.s64','vrshrlt.s64','vrshrgt.s64','vrshrle.s64',
-
-            'vrsraeq.s8','vrsrane.s8','vrsracs.s8','vrsrahs.s8','vrsracc.s8','vrsralo.s8','vrsrami.s8','vrsrapl.s8','vrsravs.s8','vrsravc.s8','vrsrahi.s8','vrsrals.s8','vrsrage.s8','vrsralt.s8','vrsragt.s8','vrsrale.s8',
-            'vrsraeq.s16','vrsrane.s16','vrsracs.s16','vrsrahs.s16','vrsracc.s16','vrsralo.s16','vrsrami.s16','vrsrapl.s16','vrsravs.s16','vrsravc.s16','vrsrahi.s16','vrsrals.s16','vrsrage.s16','vrsralt.s16','vrsragt.s16','vrsrale.s16',
-            'vrsraeq.s32','vrsrane.s32','vrsracs.s32','vrsrahs.s32','vrsracc.s32','vrsralo.s32','vrsrami.s32','vrsrapl.s32','vrsravs.s32','vrsravc.s32','vrsrahi.s32','vrsrals.s32','vrsrage.s32','vrsralt.s32','vrsragt.s32','vrsrale.s32',
-            'vrsraeq.s64','vrsrane.s64','vrsracs.s64','vrsrahs.s64','vrsracc.s64','vrsralo.s64','vrsrami.s64','vrsrapl.s64','vrsravs.s64','vrsravc.s64','vrsrahi.s64','vrsrals.s64','vrsrage.s64','vrsralt.s64','vrsragt.s64','vrsrale.s64',
-
-            'vshleq.s8','vshlne.s8','vshlcs.s8','vshlhs.s8','vshlcc.s8','vshllo.s8','vshlmi.s8','vshlpl.s8','vshlvs.s8','vshlvc.s8','vshlhi.s8','vshlls.s8','vshlge.s8','vshllt.s8','vshlgt.s8','vshlle.s8',
-            'vshleq.s16','vshlne.s16','vshlcs.s16','vshlhs.s16','vshlcc.s16','vshllo.s16','vshlmi.s16','vshlpl.s16','vshlvs.s16','vshlvc.s16','vshlhi.s16','vshlls.s16','vshlge.s16','vshllt.s16','vshlgt.s16','vshlle.s16',
-            'vshleq.s32','vshlne.s32','vshlcs.s32','vshlhs.s32','vshlcc.s32','vshllo.s32','vshlmi.s32','vshlpl.s32','vshlvs.s32','vshlvc.s32','vshlhi.s32','vshlls.s32','vshlge.s32','vshllt.s32','vshlgt.s32','vshlle.s32',
-            'vshleq.s64','vshlne.s64','vshlcs.s64','vshlhs.s64','vshlcc.s64','vshllo.s64','vshlmi.s64','vshlpl.s64','vshlvs.s64','vshlvc.s64','vshlhi.s64','vshlls.s64','vshlge.s64','vshllt.s64','vshlgt.s64','vshlle.s64',
-
-            'vshlleq.s8','vshllne.s8','vshllcs.s8','vshllhs.s8','vshllcc.s8','vshlllo.s8','vshllmi.s8','vshllpl.s8','vshllvs.s8','vshllvc.s8','vshllhi.s8','vshllls.s8','vshllge.s8','vshlllt.s8','vshllgt.s8','vshllle.s8',
-            'vshlleq.s16','vshllne.s16','vshllcs.s16','vshllhs.s16','vshllcc.s16','vshlllo.s16','vshllmi.s16','vshllpl.s16','vshllvs.s16','vshllvc.s16','vshllhi.s16','vshllls.s16','vshllge.s16','vshlllt.s16','vshllgt.s16','vshllle.s16',
-            'vshlleq.s32','vshllne.s32','vshllcs.s32','vshllhs.s32','vshllcc.s32','vshlllo.s32','vshllmi.s32','vshllpl.s32','vshllvs.s32','vshllvc.s32','vshllhi.s32','vshllls.s32','vshllge.s32','vshlllt.s32','vshllgt.s32','vshllle.s32',
-
-            'vshreq.s8','vshrne.s8','vshrcs.s8','vshrhs.s8','vshrcc.s8','vshrlo.s8','vshrmi.s8','vshrpl.s8','vshrvs.s8','vshrvc.s8','vshrhi.s8','vshrls.s8','vshrge.s8','vshrlt.s8','vshrgt.s8','vshrle.s8',
-            'vshreq.s16','vshrne.s16','vshrcs.s16','vshrhs.s16','vshrcc.s16','vshrlo.s16','vshrmi.s16','vshrpl.s16','vshrvs.s16','vshrvc.s16','vshrhi.s16','vshrls.s16','vshrge.s16','vshrlt.s16','vshrgt.s16','vshrle.s16',
-            'vshreq.s32','vshrne.s32','vshrcs.s32','vshrhs.s32','vshrcc.s32','vshrlo.s32','vshrmi.s32','vshrpl.s32','vshrvs.s32','vshrvc.s32','vshrhi.s32','vshrls.s32','vshrge.s32','vshrlt.s32','vshrgt.s32','vshrle.s32',
-            'vshreq.s64','vshrne.s64','vshrcs.s64','vshrhs.s64','vshrcc.s64','vshrlo.s64','vshrmi.s64','vshrpl.s64','vshrvs.s64','vshrvc.s64','vshrhi.s64','vshrls.s64','vshrge.s64','vshrlt.s64','vshrgt.s64','vshrle.s64',
-
-            'vsraeq.s8','vsrane.s8','vsracs.s8','vsrahs.s8','vsracc.s8','vsralo.s8','vsrami.s8','vsrapl.s8','vsravs.s8','vsravc.s8','vsrahi.s8','vsrals.s8','vsrage.s8','vsralt.s8','vsragt.s8','vsrale.s8',
-            'vsraeq.s16','vsrane.s16','vsracs.s16','vsrahs.s16','vsracc.s16','vsralo.s16','vsrami.s16','vsrapl.s16','vsravs.s16','vsravc.s16','vsrahi.s16','vsrals.s16','vsrage.s16','vsralt.s16','vsragt.s16','vsrale.s16',
-            'vsraeq.s32','vsrane.s32','vsracs.s32','vsrahs.s32','vsracc.s32','vsralo.s32','vsrami.s32','vsrapl.s32','vsravs.s32','vsravc.s32','vsrahi.s32','vsrals.s32','vsrage.s32','vsralt.s32','vsragt.s32','vsrale.s32',
-            'vsraeq.s64','vsrane.s64','vsracs.s64','vsrahs.s64','vsracc.s64','vsralo.s64','vsrami.s64','vsrapl.s64','vsravs.s64','vsravc.s64','vsrahi.s64','vsrals.s64','vsrage.s64','vsralt.s64','vsragt.s64','vsrale.s64',
-
-            'vsubleq.s8','vsublne.s8','vsublcs.s8','vsublhs.s8','vsublcc.s8','vsubllo.s8','vsublmi.s8','vsublpl.s8','vsublvs.s8','vsublvc.s8','vsublhi.s8','vsublls.s8','vsublge.s8','vsubllt.s8','vsublgt.s8','vsublle.s8',
-            'vsubleq.s16','vsublne.s16','vsublcs.s16','vsublhs.s16','vsublcc.s16','vsubllo.s16','vsublmi.s16','vsublpl.s16','vsublvs.s16','vsublvc.s16','vsublhi.s16','vsublls.s16','vsublge.s16','vsubllt.s16','vsublgt.s16','vsublle.s16',
-            'vsubleq.s32','vsublne.s32','vsublcs.s32','vsublhs.s32','vsublcc.s32','vsubllo.s32','vsublmi.s32','vsublpl.s32','vsublvs.s32','vsublvc.s32','vsublhi.s32','vsublls.s32','vsublge.s32','vsubllt.s32','vsublgt.s32','vsublle.s32',
-
-            'vsubheq.s8','vsubhne.s8','vsubhcs.s8','vsubhhs.s8','vsubhcc.s8','vsubhlo.s8','vsubhmi.s8','vsubhpl.s8','vsubhvs.s8','vsubhvc.s8','vsubhhi.s8','vsubhls.s8','vsubhge.s8','vsubhlt.s8','vsubhgt.s8','vsubhle.s8',
-            'vsubheq.s16','vsubhne.s16','vsubhcs.s16','vsubhhs.s16','vsubhcc.s16','vsubhlo.s16','vsubhmi.s16','vsubhpl.s16','vsubhvs.s16','vsubhvc.s16','vsubhhi.s16','vsubhls.s16','vsubhge.s16','vsubhlt.s16','vsubhgt.s16','vsubhle.s16',
-            'vsubheq.s32','vsubhne.s32','vsubhcs.s32','vsubhhs.s32','vsubhcc.s32','vsubhlo.s32','vsubhmi.s32','vsubhpl.s32','vsubhvs.s32','vsubhvc.s32','vsubhhi.s32','vsubhls.s32','vsubhge.s32','vsubhlt.s32','vsubhgt.s32','vsubhle.s32'
-            ),
-        /* Conditional NEON SIMD Unsigned Integer Instructions */
-        33 => array(
-            'vabaeq.u8','vabane.u8','vabacs.u8','vabahs.u8','vabacc.u8','vabalo.u8','vabami.u8','vabapl.u8','vabavs.u8','vabavc.u8','vabahi.u8','vabals.u8','vabage.u8','vabalt.u8','vabagt.u8','vabale.u8',
-            'vabaeq.u16','vabane.u16','vabacs.u16','vabahs.u16','vabacc.u16','vabalo.u16','vabami.u16','vabapl.u16','vabavs.u16','vabavc.u16','vabahi.u16','vabals.u16','vabage.u16','vabalt.u16','vabagt.u16','vabale.u16',
-            'vabaeq.u32','vabane.u32','vabacs.u32','vabahs.u32','vabacc.u32','vabalo.u32','vabami.u32','vabapl.u32','vabavs.u32','vabavc.u32','vabahi.u32','vabals.u32','vabage.u32','vabalt.u32','vabagt.u32','vabale.u32',
-
-            'vabaleq.u8','vabalne.u8','vabalcs.u8','vabalhs.u8','vabalcc.u8','vaballo.u8','vabalmi.u8','vabalpl.u8','vabalvs.u8','vabalvc.u8','vabalhi.u8','vaballs.u8','vabalge.u8','vaballt.u8','vabalgt.u8','vaballe.u8',
-            'vabaleq.u16','vabalne.u16','vabalcs.u16','vabalhs.u16','vabalcc.u16','vaballo.u16','vabalmi.u16','vabalpl.u16','vabalvs.u16','vabalvc.u16','vabalhi.u16','vaballs.u16','vabalge.u16','vaballt.u16','vabalgt.u16','vaballe.u16',
-            'vabaleq.u32','vabalne.u32','vabalcs.u32','vabalhs.u32','vabalcc.u32','vaballo.u32','vabalmi.u32','vabalpl.u32','vabalvs.u32','vabalvc.u32','vabalhi.u32','vaballs.u32','vabalge.u32','vaballt.u32','vabalgt.u32','vaballe.u32',
-
-            'vabdeq.u8','vabdne.u8','vabdcs.u8','vabdhs.u8','vabdcc.u8','vabdlo.u8','vabdmi.u8','vabdpl.u8','vabdvs.u8','vabdvc.u8','vabdhi.u8','vabdls.u8','vabdge.u8','vabdlt.u8','vabdgt.u8','vabdle.u8',
-            'vabdeq.u16','vabdne.u16','vabdcs.u16','vabdhs.u16','vabdcc.u16','vabdlo.u16','vabdmi.u16','vabdpl.u16','vabdvs.u16','vabdvc.u16','vabdhi.u16','vabdls.u16','vabdge.u16','vabdlt.u16','vabdgt.u16','vabdle.u16',
-            'vabdeq.u32','vabdne.u32','vabdcs.u32','vabdhs.u32','vabdcc.u32','vabdlo.u32','vabdmi.u32','vabdpl.u32','vabdvs.u32','vabdvc.u32','vabdhi.u32','vabdls.u32','vabdge.u32','vabdlt.u32','vabdgt.u32','vabdle.u32',
-
-            'vaddleq.u8','vaddlne.u8','vaddlcs.u8','vaddlhs.u8','vaddlcc.u8','vaddllo.u8','vaddlmi.u8','vaddlpl.u8','vaddlvs.u8','vaddlvc.u8','vaddlhi.u8','vaddlls.u8','vaddlge.u8','vaddllt.u8','vaddlgt.u8','vaddlle.u8',
-            'vaddleq.u16','vaddlne.u16','vaddlcs.u16','vaddlhs.u16','vaddlcc.u16','vaddllo.u16','vaddlmi.u16','vaddlpl.u16','vaddlvs.u16','vaddlvc.u16','vaddlhi.u16','vaddlls.u16','vaddlge.u16','vaddllt.u16','vaddlgt.u16','vaddlle.u16',
-            'vaddleq.u32','vaddlne.u32','vaddlcs.u32','vaddlhs.u32','vaddlcc.u32','vaddllo.u32','vaddlmi.u32','vaddlpl.u32','vaddlvs.u32','vaddlvc.u32','vaddlhi.u32','vaddlls.u32','vaddlge.u32','vaddllt.u32','vaddlgt.u32','vaddlle.u32',
-
-            'vsubleq.u8','vsublne.u8','vsublcs.u8','vsublhs.u8','vsublcc.u8','vsubllo.u8','vsublmi.u8','vsublpl.u8','vsublvs.u8','vsublvc.u8','vsublhi.u8','vsublls.u8','vsublge.u8','vsubllt.u8','vsublgt.u8','vsublle.u8',
-            'vsubleq.u16','vsublne.u16','vsublcs.u16','vsublhs.u16','vsublcc.u16','vsubllo.u16','vsublmi.u16','vsublpl.u16','vsublvs.u16','vsublvc.u16','vsublhi.u16','vsublls.u16','vsublge.u16','vsubllt.u16','vsublgt.u16','vsublle.u16',
-            'vsubleq.u32','vsublne.u32','vsublcs.u32','vsublhs.u32','vsublcc.u32','vsubllo.u32','vsublmi.u32','vsublpl.u32','vsublvs.u32','vsublvc.u32','vsublhi.u32','vsublls.u32','vsublge.u32','vsubllt.u32','vsublgt.u32','vsublle.u32',
-
-            'vaddweq.u8','vaddwne.u8','vaddwcs.u8','vaddwhs.u8','vaddwcc.u8','vaddwlo.u8','vaddwmi.u8','vaddwpl.u8','vaddwvs.u8','vaddwvc.u8','vaddwhi.u8','vaddwls.u8','vaddwge.u8','vaddwlt.u8','vaddwgt.u8','vaddwle.u8',
-            'vaddweq.u16','vaddwne.u16','vaddwcs.u16','vaddwhs.u16','vaddwcc.u16','vaddwlo.u16','vaddwmi.u16','vaddwpl.u16','vaddwvs.u16','vaddwvc.u16','vaddwhi.u16','vaddwls.u16','vaddwge.u16','vaddwlt.u16','vaddwgt.u16','vaddwle.u16',
-            'vaddweq.u32','vaddwne.u32','vaddwcs.u32','vaddwhs.u32','vaddwcc.u32','vaddwlo.u32','vaddwmi.u32','vaddwpl.u32','vaddwvs.u32','vaddwvc.u32','vaddwhi.u32','vaddwls.u32','vaddwge.u32','vaddwlt.u32','vaddwgt.u32','vaddwle.u32',
-
-            'vsubheq.u8','vsubhne.u8','vsubhcs.u8','vsubhhs.u8','vsubhcc.u8','vsubhlo.u8','vsubhmi.u8','vsubhpl.u8','vsubhvs.u8','vsubhvc.u8','vsubhhi.u8','vsubhls.u8','vsubhge.u8','vsubhlt.u8','vsubhgt.u8','vsubhle.u8',
-            'vsubheq.u16','vsubhne.u16','vsubhcs.u16','vsubhhs.u16','vsubhcc.u16','vsubhlo.u16','vsubhmi.u16','vsubhpl.u16','vsubhvs.u16','vsubhvc.u16','vsubhhi.u16','vsubhls.u16','vsubhge.u16','vsubhlt.u16','vsubhgt.u16','vsubhle.u16',
-            'vsubheq.u32','vsubhne.u32','vsubhcs.u32','vsubhhs.u32','vsubhcc.u32','vsubhlo.u32','vsubhmi.u32','vsubhpl.u32','vsubhvs.u32','vsubhvc.u32','vsubhhi.u32','vsubhls.u32','vsubhge.u32','vsubhlt.u32','vsubhgt.u32','vsubhle.u32',
-
-            'vhaddeq.u8','vhaddne.u8','vhaddcs.u8','vhaddhs.u8','vhaddcc.u8','vhaddlo.u8','vhaddmi.u8','vhaddpl.u8','vhaddvs.u8','vhaddvc.u8','vhaddhi.u8','vhaddls.u8','vhaddge.u8','vhaddlt.u8','vhaddgt.u8','vhaddle.u8',
-            'vhaddeq.u16','vhaddne.u16','vhaddcs.u16','vhaddhs.u16','vhaddcc.u16','vhaddlo.u16','vhaddmi.u16','vhaddpl.u16','vhaddvs.u16','vhaddvc.u16','vhaddhi.u16','vhaddls.u16','vhaddge.u16','vhaddlt.u16','vhaddgt.u16','vhaddle.u16',
-            'vhaddeq.u32','vhaddne.u32','vhaddcs.u32','vhaddhs.u32','vhaddcc.u32','vhaddlo.u32','vhaddmi.u32','vhaddpl.u32','vhaddvs.u32','vhaddvc.u32','vhaddhi.u32','vhaddls.u32','vhaddge.u32','vhaddlt.u32','vhaddgt.u32','vhaddle.u32',
-
-            'vhsubeq.u8','vhsubne.u8','vhsubcs.u8','vhsubhs.u8','vhsubcc.u8','vhsublo.u8','vhsubmi.u8','vhsubpl.u8','vhsubvs.u8','vhsubvc.u8','vhsubhi.u8','vhsubls.u8','vhsubge.u8','vhsublt.u8','vhsubgt.u8','vhsuble.u8',
-            'vhsubeq.u16','vhsubne.u16','vhsubcs.u16','vhsubhs.u16','vhsubcc.u16','vhsublo.u16','vhsubmi.u16','vhsubpl.u16','vhsubvs.u16','vhsubvc.u16','vhsubhi.u16','vhsubls.u16','vhsubge.u16','vhsublt.u16','vhsubgt.u16','vhsuble.u16',
-            'vhsubeq.u32','vhsubne.u32','vhsubcs.u32','vhsubhs.u32','vhsubcc.u32','vhsublo.u32','vhsubmi.u32','vhsubpl.u32','vhsubvs.u32','vhsubvc.u32','vhsubhi.u32','vhsubls.u32','vhsubge.u32','vhsublt.u32','vhsubgt.u32','vhsuble.u32',
-
-            'vpadaleq.u8','vpadalne.u8','vpadalcs.u8','vpadalhs.u8','vpadalcc.u8','vpadallo.u8','vpadalmi.u8','vpadalpl.u8','vpadalvs.u8','vpadalvc.u8','vpadalhi.u8','vpadalls.u8','vpadalge.u8','vpadallt.u8','vpadalgt.u8','vpadalle.u8',
-            'vpadaleq.u16','vpadalne.u16','vpadalcs.u16','vpadalhs.u16','vpadalcc.u16','vpadallo.u16','vpadalmi.u16','vpadalpl.u16','vpadalvs.u16','vpadalvc.u16','vpadalhi.u16','vpadalls.u16','vpadalge.u16','vpadallt.u16','vpadalgt.u16','vpadalle.u16',
-            'vpadaleq.u32','vpadalne.u32','vpadalcs.u32','vpadalhs.u32','vpadalcc.u32','vpadallo.u32','vpadalmi.u32','vpadalpl.u32','vpadalvs.u32','vpadalvc.u32','vpadalhi.u32','vpadalls.u32','vpadalge.u32','vpadallt.u32','vpadalgt.u32','vpadalle.u32',
-
-            'vpaddleq.u8','vpaddlne.u8','vpaddlcs.u8','vpaddlhs.u8','vpaddlcc.u8','vpaddllo.u8','vpaddlmi.u8','vpaddlpl.u8','vpaddlvs.u8','vpaddlvc.u8','vpaddlhi.u8','vpaddlls.u8','vpaddlge.u8','vpaddllt.u8','vpaddlgt.u8','vpaddlle.u8',
-            'vpaddleq.u16','vpaddlne.u16','vpaddlcs.u16','vpaddlhs.u16','vpaddlcc.u16','vpaddllo.u16','vpaddlmi.u16','vpaddlpl.u16','vpaddlvs.u16','vpaddlvc.u16','vpaddlhi.u16','vpaddlls.u16','vpaddlge.u16','vpaddllt.u16','vpaddlgt.u16','vpaddlle.u16',
-            'vpaddleq.u32','vpaddlne.u32','vpaddlcs.u32','vpaddlhs.u32','vpaddlcc.u32','vpaddllo.u32','vpaddlmi.u32','vpaddlpl.u32','vpaddlvs.u32','vpaddlvc.u32','vpaddlhi.u32','vpaddlls.u32','vpaddlge.u32','vpaddllt.u32','vpaddlgt.u32','vpaddlle.u32',
-
-            'vcgeeq.u8','vcgene.u8','vcgecs.u8','vcgehs.u8','vcgecc.u8','vcgelo.u8','vcgemi.u8','vcgepl.u8','vcgevs.u8','vcgevc.u8','vcgehi.u8','vcgels.u8','vcgege.u8','vcgelt.u8','vcgegt.u8','vcgele.u8',
-            'vcgeeq.u16','vcgene.u16','vcgecs.u16','vcgehs.u16','vcgecc.u16','vcgelo.u16','vcgemi.u16','vcgepl.u16','vcgevs.u16','vcgevc.u16','vcgehi.u16','vcgels.u16','vcgege.u16','vcgelt.u16','vcgegt.u16','vcgele.u16',
-            'vcgeeq.u32','vcgene.u32','vcgecs.u32','vcgehs.u32','vcgecc.u32','vcgelo.u32','vcgemi.u32','vcgepl.u32','vcgevs.u32','vcgevc.u32','vcgehi.u32','vcgels.u32','vcgege.u32','vcgelt.u32','vcgegt.u32','vcgele.u32',
-
-            'vcleeq.u8','vclene.u8','vclecs.u8','vclehs.u8','vclecc.u8','vclelo.u8','vclemi.u8','vclepl.u8','vclevs.u8','vclevc.u8','vclehi.u8','vclels.u8','vclege.u8','vclelt.u8','vclegt.u8','vclele.u8',
-            'vcleeq.u16','vclene.u16','vclecs.u16','vclehs.u16','vclecc.u16','vclelo.u16','vclemi.u16','vclepl.u16','vclevs.u16','vclevc.u16','vclehi.u16','vclels.u16','vclege.u16','vclelt.u16','vclegt.u16','vclele.u16',
-            'vcleeq.u32','vclene.u32','vclecs.u32','vclehs.u32','vclecc.u32','vclelo.u32','vclemi.u32','vclepl.u32','vclevs.u32','vclevc.u32','vclehi.u32','vclels.u32','vclege.u32','vclelt.u32','vclegt.u32','vclele.u32',
-
-            'vcgteq.u8','vcgtne.u8','vcgtcs.u8','vcgths.u8','vcgtcc.u8','vcgtlo.u8','vcgtmi.u8','vcgtpl.u8','vcgtvs.u8','vcgtvc.u8','vcgthi.u8','vcgtls.u8','vcgtge.u8','vcgtlt.u8','vcgtgt.u8','vcgtle.u8',
-            'vcgteq.u16','vcgtne.u16','vcgtcs.u16','vcgths.u16','vcgtcc.u16','vcgtlo.u16','vcgtmi.u16','vcgtpl.u16','vcgtvs.u16','vcgtvc.u16','vcgthi.u16','vcgtls.u16','vcgtge.u16','vcgtlt.u16','vcgtgt.u16','vcgtle.u16',
-            'vcgteq.u32','vcgtne.u32','vcgtcs.u32','vcgths.u32','vcgtcc.u32','vcgtlo.u32','vcgtmi.u32','vcgtpl.u32','vcgtvs.u32','vcgtvc.u32','vcgthi.u32','vcgtls.u32','vcgtge.u32','vcgtlt.u32','vcgtgt.u32','vcgtle.u32',
-
-            'vclteq.u8','vcltne.u8','vcltcs.u8','vclths.u8','vcltcc.u8','vcltlo.u8','vcltmi.u8','vcltpl.u8','vcltvs.u8','vcltvc.u8','vclthi.u8','vcltls.u8','vcltge.u8','vcltlt.u8','vcltgt.u8','vcltle.u8',
-            'vclteq.u16','vcltne.u16','vcltcs.u16','vclths.u16','vcltcc.u16','vcltlo.u16','vcltmi.u16','vcltpl.u16','vcltvs.u16','vcltvc.u16','vclthi.u16','vcltls.u16','vcltge.u16','vcltlt.u16','vcltgt.u16','vcltle.u16',
-            'vclteq.u32','vcltne.u32','vcltcs.u32','vclths.u32','vcltcc.u32','vcltlo.u32','vcltmi.u32','vcltpl.u32','vcltvs.u32','vcltvc.u32','vclthi.u32','vcltls.u32','vcltge.u32','vcltlt.u32','vcltgt.u32','vcltle.u32',
-
-            'vmaxeq.u8','vmaxne.u8','vmaxcs.u8','vmaxhs.u8','vmaxcc.u8','vmaxlo.u8','vmaxmi.u8','vmaxpl.u8','vmaxvs.u8','vmaxvc.u8','vmaxhi.u8','vmaxls.u8','vmaxge.u8','vmaxlt.u8','vmaxgt.u8','vmaxle.u8',
-            'vmaxeq.u16','vmaxne.u16','vmaxcs.u16','vmaxhs.u16','vmaxcc.u16','vmaxlo.u16','vmaxmi.u16','vmaxpl.u16','vmaxvs.u16','vmaxvc.u16','vmaxhi.u16','vmaxls.u16','vmaxge.u16','vmaxlt.u16','vmaxgt.u16','vmaxle.u16',
-            'vmaxeq.u32','vmaxne.u32','vmaxcs.u32','vmaxhs.u32','vmaxcc.u32','vmaxlo.u32','vmaxmi.u32','vmaxpl.u32','vmaxvs.u32','vmaxvc.u32','vmaxhi.u32','vmaxls.u32','vmaxge.u32','vmaxlt.u32','vmaxgt.u32','vmaxle.u32',
-
-            'vmineq.u8','vminne.u8','vmincs.u8','vminhs.u8','vmincc.u8','vminlo.u8','vminmi.u8','vminpl.u8','vminvs.u8','vminvc.u8','vminhi.u8','vminls.u8','vminge.u8','vminlt.u8','vmingt.u8','vminle.u8',
-            'vmineq.u16','vminne.u16','vmincs.u16','vminhs.u16','vmincc.u16','vminlo.u16','vminmi.u16','vminpl.u16','vminvs.u16','vminvc.u16','vminhi.u16','vminls.u16','vminge.u16','vminlt.u16','vmingt.u16','vminle.u16',
-            'vmineq.u32','vminne.u32','vmincs.u32','vminhs.u32','vmincc.u32','vminlo.u32','vminmi.u32','vminpl.u32','vminvs.u32','vminvc.u32','vminhi.u32','vminls.u32','vminge.u32','vminlt.u32','vmingt.u32','vminle.u32',
-
-            'vmlaleq.u8','vmlalne.u8','vmlalcs.u8','vmlalhs.u8','vmlalcc.u8','vmlallo.u8','vmlalmi.u8','vmlalpl.u8','vmlalvs.u8','vmlalvc.u8','vmlalhi.u8','vmlalls.u8','vmlalge.u8','vmlallt.u8','vmlalgt.u8','vmlalle.u8',
-            'vmlaleq.u16','vmlalne.u16','vmlalcs.u16','vmlalhs.u16','vmlalcc.u16','vmlallo.u16','vmlalmi.u16','vmlalpl.u16','vmlalvs.u16','vmlalvc.u16','vmlalhi.u16','vmlalls.u16','vmlalge.u16','vmlallt.u16','vmlalgt.u16','vmlalle.u16',
-            'vmlaleq.u32','vmlalne.u32','vmlalcs.u32','vmlalhs.u32','vmlalcc.u32','vmlallo.u32','vmlalmi.u32','vmlalpl.u32','vmlalvs.u32','vmlalvc.u32','vmlalhi.u32','vmlalls.u32','vmlalge.u32','vmlallt.u32','vmlalgt.u32','vmlalle.u32',
-
-            'vmlsleq.u8','vmlslne.u8','vmlslcs.u8','vmlslhs.u8','vmlslcc.u8','vmlsllo.u8','vmlslmi.u8','vmlslpl.u8','vmlslvs.u8','vmlslvc.u8','vmlslhi.u8','vmlslls.u8','vmlslge.u8','vmlsllt.u8','vmlslgt.u8','vmlslle.u8',
-            'vmlsleq.u16','vmlslne.u16','vmlslcs.u16','vmlslhs.u16','vmlslcc.u16','vmlsllo.u16','vmlslmi.u16','vmlslpl.u16','vmlslvs.u16','vmlslvc.u16','vmlslhi.u16','vmlslls.u16','vmlslge.u16','vmlsllt.u16','vmlslgt.u16','vmlslle.u16',
-            'vmlsleq.u32','vmlslne.u32','vmlslcs.u32','vmlslhs.u32','vmlslcc.u32','vmlsllo.u32','vmlslmi.u32','vmlslpl.u32','vmlslvs.u32','vmlslvc.u32','vmlslhi.u32','vmlslls.u32','vmlslge.u32','vmlsllt.u32','vmlslgt.u32','vmlslle.u32',
-
-            'vmulleq.u8','vmullne.u8','vmullcs.u8','vmullhs.u8','vmullcc.u8','vmulllo.u8','vmullmi.u8','vmullpl.u8','vmullvs.u8','vmullvc.u8','vmullhi.u8','vmullls.u8','vmullge.u8','vmulllt.u8','vmullgt.u8','vmullle.u8',
-            'vmulleq.u16','vmullne.u16','vmullcs.u16','vmullhs.u16','vmullcc.u16','vmulllo.u16','vmullmi.u16','vmullpl.u16','vmullvs.u16','vmullvc.u16','vmullhi.u16','vmullls.u16','vmullge.u16','vmulllt.u16','vmullgt.u16','vmullle.u16',
-            'vmulleq.u32','vmullne.u32','vmullcs.u32','vmullhs.u32','vmullcc.u32','vmulllo.u32','vmullmi.u32','vmullpl.u32','vmullvs.u32','vmullvc.u32','vmullhi.u32','vmullls.u32','vmullge.u32','vmulllt.u32','vmullgt.u32','vmullle.u32',
-
-            'vmovleq.u8','vmovlne.u8','vmovlcs.u8','vmovlhs.u8','vmovlcc.u8','vmovllo.u8','vmovlmi.u8','vmovlpl.u8','vmovlvs.u8','vmovlvc.u8','vmovlhi.u8','vmovlls.u8','vmovlge.u8','vmovllt.u8','vmovlgt.u8','vmovlle.u8',
-            'vmovleq.u16','vmovlne.u16','vmovlcs.u16','vmovlhs.u16','vmovlcc.u16','vmovllo.u16','vmovlmi.u16','vmovlpl.u16','vmovlvs.u16','vmovlvc.u16','vmovlhi.u16','vmovlls.u16','vmovlge.u16','vmovllt.u16','vmovlgt.u16','vmovlle.u16',
-            'vmovleq.u32','vmovlne.u32','vmovlcs.u32','vmovlhs.u32','vmovlcc.u32','vmovllo.u32','vmovlmi.u32','vmovlpl.u32','vmovlvs.u32','vmovlvc.u32','vmovlhi.u32','vmovlls.u32','vmovlge.u32','vmovllt.u32','vmovlgt.u32','vmovlle.u32',
-
-            'vshleq.u8','vshlne.u8','vshlcs.u8','vshlhs.u8','vshlcc.u8','vshllo.u8','vshlmi.u8','vshlpl.u8','vshlvs.u8','vshlvc.u8','vshlhi.u8','vshlls.u8','vshlge.u8','vshllt.u8','vshlgt.u8','vshlle.u8',
-            'vshleq.u16','vshlne.u16','vshlcs.u16','vshlhs.u16','vshlcc.u16','vshllo.u16','vshlmi.u16','vshlpl.u16','vshlvs.u16','vshlvc.u16','vshlhi.u16','vshlls.u16','vshlge.u16','vshllt.u16','vshlgt.u16','vshlle.u16',
-            'vshleq.u32','vshlne.u32','vshlcs.u32','vshlhs.u32','vshlcc.u32','vshllo.u32','vshlmi.u32','vshlpl.u32','vshlvs.u32','vshlvc.u32','vshlhi.u32','vshlls.u32','vshlge.u32','vshllt.u32','vshlgt.u32','vshlle.u32',
-            'vshleq.u64','vshlne.u64','vshlcs.u64','vshlhs.u64','vshlcc.u64','vshllo.u64','vshlmi.u64','vshlpl.u64','vshlvs.u64','vshlvc.u64','vshlhi.u64','vshlls.u64','vshlge.u64','vshllt.u64','vshlgt.u64','vshlle.u64',
-
-            'vshlleq.u8','vshllne.u8','vshllcs.u8','vshllhs.u8','vshllcc.u8','vshlllo.u8','vshllmi.u8','vshllpl.u8','vshllvs.u8','vshllvc.u8','vshllhi.u8','vshllls.u8','vshllge.u8','vshlllt.u8','vshllgt.u8','vshllle.u8',
-            'vshlleq.u16','vshllne.u16','vshllcs.u16','vshllhs.u16','vshllcc.u16','vshlllo.u16','vshllmi.u16','vshllpl.u16','vshllvs.u16','vshllvc.u16','vshllhi.u16','vshllls.u16','vshllge.u16','vshlllt.u16','vshllgt.u16','vshllle.u16',
-            'vshlleq.u32','vshllne.u32','vshllcs.u32','vshllhs.u32','vshllcc.u32','vshlllo.u32','vshllmi.u32','vshllpl.u32','vshllvs.u32','vshllvc.u32','vshllhi.u32','vshllls.u32','vshllge.u32','vshlllt.u32','vshllgt.u32','vshllle.u32',
-
-            'vshreq.u8','vshrne.u8','vshrcs.u8','vshrhs.u8','vshrcc.u8','vshrlo.u8','vshrmi.u8','vshrpl.u8','vshrvs.u8','vshrvc.u8','vshrhi.u8','vshrls.u8','vshrge.u8','vshrlt.u8','vshrgt.u8','vshrle.u8',
-            'vshreq.u16','vshrne.u16','vshrcs.u16','vshrhs.u16','vshrcc.u16','vshrlo.u16','vshrmi.u16','vshrpl.u16','vshrvs.u16','vshrvc.u16','vshrhi.u16','vshrls.u16','vshrge.u16','vshrlt.u16','vshrgt.u16','vshrle.u16',
-            'vshreq.u32','vshrne.u32','vshrcs.u32','vshrhs.u32','vshrcc.u32','vshrlo.u32','vshrmi.u32','vshrpl.u32','vshrvs.u32','vshrvc.u32','vshrhi.u32','vshrls.u32','vshrge.u32','vshrlt.u32','vshrgt.u32','vshrle.u32',
-            'vshreq.u64','vshrne.u64','vshrcs.u64','vshrhs.u64','vshrcc.u64','vshrlo.u64','vshrmi.u64','vshrpl.u64','vshrvs.u64','vshrvc.u64','vshrhi.u64','vshrls.u64','vshrge.u64','vshrlt.u64','vshrgt.u64','vshrle.u64',
-
-            'vsraeq.u8','vsrane.u8','vsracs.u8','vsrahs.u8','vsracc.u8','vsralo.u8','vsrami.u8','vsrapl.u8','vsravs.u8','vsravc.u8','vsrahi.u8','vsrals.u8','vsrage.u8','vsralt.u8','vsragt.u8','vsrale.u8',
-            'vsraeq.u16','vsrane.u16','vsracs.u16','vsrahs.u16','vsracc.u16','vsralo.u16','vsrami.u16','vsrapl.u16','vsravs.u16','vsravc.u16','vsrahi.u16','vsrals.u16','vsrage.u16','vsralt.u16','vsragt.u16','vsrale.u16',
-            'vsraeq.u32','vsrane.u32','vsracs.u32','vsrahs.u32','vsracc.u32','vsralo.u32','vsrami.u32','vsrapl.u32','vsravs.u32','vsravc.u32','vsrahi.u32','vsrals.u32','vsrage.u32','vsralt.u32','vsragt.u32','vsrale.u32',
-            'vsraeq.u64','vsrane.u64','vsracs.u64','vsrahs.u64','vsracc.u64','vsralo.u64','vsrami.u64','vsrapl.u64','vsravs.u64','vsravc.u64','vsrahi.u64','vsrals.u64','vsrage.u64','vsralt.u64','vsragt.u64','vsrale.u64',
-
-            'vpmaxeq.u8','vpmaxne.u8','vpmaxcs.u8','vpmaxhs.u8','vpmaxcc.u8','vpmaxlo.u8','vpmaxmi.u8','vpmaxpl.u8','vpmaxvs.u8','vpmaxvc.u8','vpmaxhi.u8','vpmaxls.u8','vpmaxge.u8','vpmaxlt.u8','vpmaxgt.u8','vpmaxle.u8',
-            'vpmaxeq.u16','vpmaxne.u16','vpmaxcs.u16','vpmaxhs.u16','vpmaxcc.u16','vpmaxlo.u16','vpmaxmi.u16','vpmaxpl.u16','vpmaxvs.u16','vpmaxvc.u16','vpmaxhi.u16','vpmaxls.u16','vpmaxge.u16','vpmaxlt.u16','vpmaxgt.u16','vpmaxle.u16',
-            'vpmaxeq.u32','vpmaxne.u32','vpmaxcs.u32','vpmaxhs.u32','vpmaxcc.u32','vpmaxlo.u32','vpmaxmi.u32','vpmaxpl.u32','vpmaxvs.u32','vpmaxvc.u32','vpmaxhi.u32','vpmaxls.u32','vpmaxge.u32','vpmaxlt.u32','vpmaxgt.u32','vpmaxle.u32',
-
-            'vpmineq.u8','vpminne.u8','vpmincs.u8','vpminhs.u8','vpmincc.u8','vpminlo.u8','vpminmi.u8','vpminpl.u8','vpminvs.u8','vpminvc.u8','vpminhi.u8','vpminls.u8','vpminge.u8','vpminlt.u8','vpmingt.u8','vpminle.u8',
-            'vpmineq.u16','vpminne.u16','vpmincs.u16','vpminhs.u16','vpmincc.u16','vpminlo.u16','vpminmi.u16','vpminpl.u16','vpminvs.u16','vpminvc.u16','vpminhi.u16','vpminls.u16','vpminge.u16','vpminlt.u16','vpmingt.u16','vpminle.u16',
-            'vpmineq.u32','vpminne.u32','vpmincs.u32','vpminhs.u32','vpmincc.u32','vpminlo.u32','vpminmi.u32','vpminpl.u32','vpminvs.u32','vpminvc.u32','vpminhi.u32','vpminls.u32','vpminge.u32','vpminlt.u32','vpmingt.u32','vpminle.u32',
-
-            'vqaddeq.u8','vqaddne.u8','vqaddcs.u8','vqaddhs.u8','vqaddcc.u8','vqaddlo.u8','vqaddmi.u8','vqaddpl.u8','vqaddvs.u8','vqaddvc.u8','vqaddhi.u8','vqaddls.u8','vqaddge.u8','vqaddlt.u8','vqaddgt.u8','vqaddle.u8',
-            'vqaddeq.u16','vqaddne.u16','vqaddcs.u16','vqaddhs.u16','vqaddcc.u16','vqaddlo.u16','vqaddmi.u16','vqaddpl.u16','vqaddvs.u16','vqaddvc.u16','vqaddhi.u16','vqaddls.u16','vqaddge.u16','vqaddlt.u16','vqaddgt.u16','vqaddle.u16',
-            'vqaddeq.u32','vqaddne.u32','vqaddcs.u32','vqaddhs.u32','vqaddcc.u32','vqaddlo.u32','vqaddmi.u32','vqaddpl.u32','vqaddvs.u32','vqaddvc.u32','vqaddhi.u32','vqaddls.u32','vqaddge.u32','vqaddlt.u32','vqaddgt.u32','vqaddle.u32',
-            'vqaddeq.u64','vqaddne.u64','vqaddcs.u64','vqaddhs.u64','vqaddcc.u64','vqaddlo.u64','vqaddmi.u64','vqaddpl.u64','vqaddvs.u64','vqaddvc.u64','vqaddhi.u64','vqaddls.u64','vqaddge.u64','vqaddlt.u64','vqaddgt.u64','vqaddle.u64',
-
-            'vqsubeq.u8','vqsubne.u8','vqsubcs.u8','vqsubhs.u8','vqsubcc.u8','vqsublo.u8','vqsubmi.u8','vqsubpl.u8','vqsubvs.u8','vqsubvc.u8','vqsubhi.u8','vqsubls.u8','vqsubge.u8','vqsublt.u8','vqsubgt.u8','vqsuble.u8',
-            'vqsubeq.u16','vqsubne.u16','vqsubcs.u16','vqsubhs.u16','vqsubcc.u16','vqsublo.u16','vqsubmi.u16','vqsubpl.u16','vqsubvs.u16','vqsubvc.u16','vqsubhi.u16','vqsubls.u16','vqsubge.u16','vqsublt.u16','vqsubgt.u16','vqsuble.u16',
-            'vqsubeq.u32','vqsubne.u32','vqsubcs.u32','vqsubhs.u32','vqsubcc.u32','vqsublo.u32','vqsubmi.u32','vqsubpl.u32','vqsubvs.u32','vqsubvc.u32','vqsubhi.u32','vqsubls.u32','vqsubge.u32','vqsublt.u32','vqsubgt.u32','vqsuble.u32',
-            'vqsubeq.u64','vqsubne.u64','vqsubcs.u64','vqsubhs.u64','vqsubcc.u64','vqsublo.u64','vqsubmi.u64','vqsubpl.u64','vqsubvs.u64','vqsubvc.u64','vqsubhi.u64','vqsubls.u64','vqsubge.u64','vqsublt.u64','vqsubgt.u64','vqsuble.u64',
-
-            'vqmovneq.u16','vqmovnne.u16','vqmovncs.u16','vqmovnhs.u16','vqmovncc.u16','vqmovnlo.u16','vqmovnmi.u16','vqmovnpl.u16','vqmovnvs.u16','vqmovnvc.u16','vqmovnhi.u16','vqmovnls.u16','vqmovnge.u16','vqmovnlt.u16','vqmovngt.u16','vqmovnle.u16',
-            'vqmovneq.u32','vqmovnne.u32','vqmovncs.u32','vqmovnhs.u32','vqmovncc.u32','vqmovnlo.u32','vqmovnmi.u32','vqmovnpl.u32','vqmovnvs.u32','vqmovnvc.u32','vqmovnhi.u32','vqmovnls.u32','vqmovnge.u32','vqmovnlt.u32','vqmovngt.u32','vqmovnle.u32',
-            'vqmovneq.u64','vqmovnne.u64','vqmovncs.u64','vqmovnhs.u64','vqmovncc.u64','vqmovnlo.u64','vqmovnmi.u64','vqmovnpl.u64','vqmovnvs.u64','vqmovnvc.u64','vqmovnhi.u64','vqmovnls.u64','vqmovnge.u64','vqmovnlt.u64','vqmovngt.u64','vqmovnle.u64',
-
-            'vqshleq.u8','vqshlne.u8','vqshlcs.u8','vqshlhs.u8','vqshlcc.u8','vqshllo.u8','vqshlmi.u8','vqshlpl.u8','vqshlvs.u8','vqshlvc.u8','vqshlhi.u8','vqshlls.u8','vqshlge.u8','vqshllt.u8','vqshlgt.u8','vqshlle.u8',
-            'vqshleq.u16','vqshlne.u16','vqshlcs.u16','vqshlhs.u16','vqshlcc.u16','vqshllo.u16','vqshlmi.u16','vqshlpl.u16','vqshlvs.u16','vqshlvc.u16','vqshlhi.u16','vqshlls.u16','vqshlge.u16','vqshllt.u16','vqshlgt.u16','vqshlle.u16',
-            'vqshleq.u32','vqshlne.u32','vqshlcs.u32','vqshlhs.u32','vqshlcc.u32','vqshllo.u32','vqshlmi.u32','vqshlpl.u32','vqshlvs.u32','vqshlvc.u32','vqshlhi.u32','vqshlls.u32','vqshlge.u32','vqshllt.u32','vqshlgt.u32','vqshlle.u32',
-            'vqshleq.u64','vqshlne.u64','vqshlcs.u64','vqshlhs.u64','vqshlcc.u64','vqshllo.u64','vqshlmi.u64','vqshlpl.u64','vqshlvs.u64','vqshlvc.u64','vqshlhi.u64','vqshlls.u64','vqshlge.u64','vqshllt.u64','vqshlgt.u64','vqshlle.u64',
-
-            'vqshrneq.u16','vqshrnne.u16','vqshrncs.u16','vqshrnhs.u16','vqshrncc.u16','vqshrnlo.u16','vqshrnmi.u16','vqshrnpl.u16','vqshrnvs.u16','vqshrnvc.u16','vqshrnhi.u16','vqshrnls.u16','vqshrnge.u16','vqshrnlt.u16','vqshrngt.u16','vqshrnle.u16',
-            'vqshrneq.u32','vqshrnne.u32','vqshrncs.u32','vqshrnhs.u32','vqshrncc.u32','vqshrnlo.u32','vqshrnmi.u32','vqshrnpl.u32','vqshrnvs.u32','vqshrnvc.u32','vqshrnhi.u32','vqshrnls.u32','vqshrnge.u32','vqshrnlt.u32','vqshrngt.u32','vqshrnle.u32',
-            'vqshrneq.u64','vqshrnne.u64','vqshrncs.u64','vqshrnhs.u64','vqshrncc.u64','vqshrnlo.u64','vqshrnmi.u64','vqshrnpl.u64','vqshrnvs.u64','vqshrnvc.u64','vqshrnhi.u64','vqshrnls.u64','vqshrnge.u64','vqshrnlt.u64','vqshrngt.u64','vqshrnle.u64',
-
-            'vqrshleq.u8','vqrshlne.u8','vqrshlcs.u8','vqrshlhs.u8','vqrshlcc.u8','vqrshllo.u8','vqrshlmi.u8','vqrshlpl.u8','vqrshlvs.u8','vqrshlvc.u8','vqrshlhi.u8','vqrshlls.u8','vqrshlge.u8','vqrshllt.u8','vqrshlgt.u8','vqrshlle.u8',
-            'vqrshleq.u16','vqrshlne.u16','vqrshlcs.u16','vqrshlhs.u16','vqrshlcc.u16','vqrshllo.u16','vqrshlmi.u16','vqrshlpl.u16','vqrshlvs.u16','vqrshlvc.u16','vqrshlhi.u16','vqrshlls.u16','vqrshlge.u16','vqrshllt.u16','vqrshlgt.u16','vqrshlle.u16',
-            'vqrshleq.u32','vqrshlne.u32','vqrshlcs.u32','vqrshlhs.u32','vqrshlcc.u32','vqrshllo.u32','vqrshlmi.u32','vqrshlpl.u32','vqrshlvs.u32','vqrshlvc.u32','vqrshlhi.u32','vqrshlls.u32','vqrshlge.u32','vqrshllt.u32','vqrshlgt.u32','vqrshlle.u32',
-            'vqrshleq.u64','vqrshlne.u64','vqrshlcs.u64','vqrshlhs.u64','vqrshlcc.u64','vqrshllo.u64','vqrshlmi.u64','vqrshlpl.u64','vqrshlvs.u64','vqrshlvc.u64','vqrshlhi.u64','vqrshlls.u64','vqrshlge.u64','vqrshllt.u64','vqrshlgt.u64','vqrshlle.u64',
-
-            'vqrshrneq.u16','vqrshrnne.u16','vqrshrncs.u16','vqrshrnhs.u16','vqrshrncc.u16','vqrshrnlo.u16','vqrshrnmi.u16','vqrshrnpl.u16','vqrshrnvs.u16','vqrshrnvc.u16','vqrshrnhi.u16','vqrshrnls.u16','vqrshrnge.u16','vqrshrnlt.u16','vqrshrngt.u16','vqrshrnle.u16',
-            'vqrshrneq.u32','vqrshrnne.u32','vqrshrncs.u32','vqrshrnhs.u32','vqrshrncc.u32','vqrshrnlo.u32','vqrshrnmi.u32','vqrshrnpl.u32','vqrshrnvs.u32','vqrshrnvc.u32','vqrshrnhi.u32','vqrshrnls.u32','vqrshrnge.u32','vqrshrnlt.u32','vqrshrngt.u32','vqrshrnle.u32',
-            'vqrshrneq.u64','vqrshrnne.u64','vqrshrncs.u64','vqrshrnhs.u64','vqrshrncc.u64','vqrshrnlo.u64','vqrshrnmi.u64','vqrshrnpl.u64','vqrshrnvs.u64','vqrshrnvc.u64','vqrshrnhi.u64','vqrshrnls.u64','vqrshrnge.u64','vqrshrnlt.u64','vqrshrngt.u64','vqrshrnle.u64',
-
-            'vrhaddeq.u8','vrhaddne.u8','vrhaddcs.u8','vrhaddhs.u8','vrhaddcc.u8','vrhaddlo.u8','vrhaddmi.u8','vrhaddpl.u8','vrhaddvs.u8','vrhaddvc.u8','vrhaddhi.u8','vrhaddls.u8','vrhaddge.u8','vrhaddlt.u8','vrhaddgt.u8','vrhaddle.u8',
-            'vrhaddeq.u16','vrhaddne.u16','vrhaddcs.u16','vrhaddhs.u16','vrhaddcc.u16','vrhaddlo.u16','vrhaddmi.u16','vrhaddpl.u16','vrhaddvs.u16','vrhaddvc.u16','vrhaddhi.u16','vrhaddls.u16','vrhaddge.u16','vrhaddlt.u16','vrhaddgt.u16','vrhaddle.u16',
-            'vrhaddeq.u32','vrhaddne.u32','vrhaddcs.u32','vrhaddhs.u32','vrhaddcc.u32','vrhaddlo.u32','vrhaddmi.u32','vrhaddpl.u32','vrhaddvs.u32','vrhaddvc.u32','vrhaddhi.u32','vrhaddls.u32','vrhaddge.u32','vrhaddlt.u32','vrhaddgt.u32','vrhaddle.u32',
-
-            'vrshleq.u8','vrshlne.u8','vrshlcs.u8','vrshlhs.u8','vrshlcc.u8','vrshllo.u8','vrshlmi.u8','vrshlpl.u8','vrshlvs.u8','vrshlvc.u8','vrshlhi.u8','vrshlls.u8','vrshlge.u8','vrshllt.u8','vrshlgt.u8','vrshlle.u8',
-            'vrshleq.u16','vrshlne.u16','vrshlcs.u16','vrshlhs.u16','vrshlcc.u16','vrshllo.u16','vrshlmi.u16','vrshlpl.u16','vrshlvs.u16','vrshlvc.u16','vrshlhi.u16','vrshlls.u16','vrshlge.u16','vrshllt.u16','vrshlgt.u16','vrshlle.u16',
-            'vrshleq.u32','vrshlne.u32','vrshlcs.u32','vrshlhs.u32','vrshlcc.u32','vrshllo.u32','vrshlmi.u32','vrshlpl.u32','vrshlvs.u32','vrshlvc.u32','vrshlhi.u32','vrshlls.u32','vrshlge.u32','vrshllt.u32','vrshlgt.u32','vrshlle.u32',
-            'vrshleq.u64','vrshlne.u64','vrshlcs.u64','vrshlhs.u64','vrshlcc.u64','vrshllo.u64','vrshlmi.u64','vrshlpl.u64','vrshlvs.u64','vrshlvc.u64','vrshlhi.u64','vrshlls.u64','vrshlge.u64','vrshllt.u64','vrshlgt.u64','vrshlle.u64',
-
-            'vrshreq.u8','vrshrne.u8','vrshrcs.u8','vrshrhs.u8','vrshrcc.u8','vrshrlo.u8','vrshrmi.u8','vrshrpl.u8','vrshrvs.u8','vrshrvc.u8','vrshrhi.u8','vrshrls.u8','vrshrge.u8','vrshrlt.u8','vrshrgt.u8','vrshrle.u8',
-            'vrshreq.u16','vrshrne.u16','vrshrcs.u16','vrshrhs.u16','vrshrcc.u16','vrshrlo.u16','vrshrmi.u16','vrshrpl.u16','vrshrvs.u16','vrshrvc.u16','vrshrhi.u16','vrshrls.u16','vrshrge.u16','vrshrlt.u16','vrshrgt.u16','vrshrle.u16',
-            'vrshreq.u32','vrshrne.u32','vrshrcs.u32','vrshrhs.u32','vrshrcc.u32','vrshrlo.u32','vrshrmi.u32','vrshrpl.u32','vrshrvs.u32','vrshrvc.u32','vrshrhi.u32','vrshrls.u32','vrshrge.u32','vrshrlt.u32','vrshrgt.u32','vrshrle.u32',
-            'vrshreq.u64','vrshrne.u64','vrshrcs.u64','vrshrhs.u64','vrshrcc.u64','vrshrlo.u64','vrshrmi.u64','vrshrpl.u64','vrshrvs.u64','vrshrvc.u64','vrshrhi.u64','vrshrls.u64','vrshrge.u64','vrshrlt.u64','vrshrgt.u64','vrshrle.u64',
-
-            'vrsraeq.u8','vrsrane.u8','vrsracs.u8','vrsrahs.u8','vrsracc.u8','vrsralo.u8','vrsrami.u8','vrsrapl.u8','vrsravs.u8','vrsravc.u8','vrsrahi.u8','vrsrals.u8','vrsrage.u8','vrsralt.u8','vrsragt.u8','vrsrale.u8',
-            'vrsraeq.u16','vrsrane.u16','vrsracs.u16','vrsrahs.u16','vrsracc.u16','vrsralo.u16','vrsrami.u16','vrsrapl.u16','vrsravs.u16','vrsravc.u16','vrsrahi.u16','vrsrals.u16','vrsrage.u16','vrsralt.u16','vrsragt.u16','vrsrale.u16',
-            'vrsraeq.u32','vrsrane.u32','vrsracs.u32','vrsrahs.u32','vrsracc.u32','vrsralo.u32','vrsrami.u32','vrsrapl.u32','vrsravs.u32','vrsravc.u32','vrsrahi.u32','vrsrals.u32','vrsrage.u32','vrsralt.u32','vrsragt.u32','vrsrale.u32',
-            'vrsraeq.u64','vrsrane.u64','vrsracs.u64','vrsrahs.u64','vrsracc.u64','vrsralo.u64','vrsrami.u64','vrsrapl.u64','vrsravs.u64','vrsravc.u64','vrsrahi.u64','vrsrals.u64','vrsrage.u64','vrsralt.u64','vrsragt.u64','vrsrale.u64',
-            ),
-        /* Conditional VFPv3 & NEON SIMD Floating-Point Instructions */
-        34 => array(
-            'vabdeq.f32','vabdne.f32','vabdcs.f32','vabdhs.f32','vabdcc.f32','vabdlo.f32','vabdmi.f32','vabdpl.f32','vabdvs.f32','vabdvc.f32','vabdhi.f32','vabdls.f32','vabdge.f32','vabdlt.f32','vabdgt.f32','vabdle.f32',
-
-            'vabseq.f32','vabsne.f32','vabscs.f32','vabshs.f32','vabscc.f32','vabslo.f32','vabsmi.f32','vabspl.f32','vabsvs.f32','vabsvc.f32','vabshi.f32','vabsls.f32','vabsge.f32','vabslt.f32','vabsgt.f32','vabsle.f32',
-            'vabseq.f64','vabsne.f64','vabscs.f64','vabshs.f64','vabscc.f64','vabslo.f64','vabsmi.f64','vabspl.f64','vabsvs.f64','vabsvc.f64','vabshi.f64','vabsls.f64','vabsge.f64','vabslt.f64','vabsgt.f64','vabsle.f64',
-
-            'vacgeeq.f32','vacgene.f32','vacgecs.f32','vacgehs.f32','vacgecc.f32','vacgelo.f32','vacgemi.f32','vacgepl.f32','vacgevs.f32','vacgevc.f32','vacgehi.f32','vacgels.f32','vacgege.f32','vacgelt.f32','vacgegt.f32','vacgele.f32',
-            'vacgteq.f32','vacgtne.f32','vacgtcs.f32','vacgths.f32','vacgtcc.f32','vacgtlo.f32','vacgtmi.f32','vacgtpl.f32','vacgtvs.f32','vacgtvc.f32','vacgthi.f32','vacgtls.f32','vacgtge.f32','vacgtlt.f32','vacgtgt.f32','vacgtle.f32',
-            'vacleeq.f32','vaclene.f32','vaclecs.f32','vaclehs.f32','vaclecc.f32','vaclelo.f32','vaclemi.f32','vaclepl.f32','vaclevs.f32','vaclevc.f32','vaclehi.f32','vaclels.f32','vaclege.f32','vaclelt.f32','vaclegt.f32','vaclele.f32',
-            'vaclteq.f32','vacltne.f32','vacltcs.f32','vaclths.f32','vacltcc.f32','vacltlo.f32','vacltmi.f32','vacltpl.f32','vacltvs.f32','vacltvc.f32','vaclthi.f32','vacltls.f32','vacltge.f32','vacltlt.f32','vacltgt.f32','vacltle.f32',
-
-            'vaddeq.f32','vaddne.f32','vaddcs.f32','vaddhs.f32','vaddcc.f32','vaddlo.f32','vaddmi.f32','vaddpl.f32','vaddvs.f32','vaddvc.f32','vaddhi.f32','vaddls.f32','vaddge.f32','vaddlt.f32','vaddgt.f32','vaddle.f32',
-            'vaddeq.f64','vaddne.f64','vaddcs.f64','vaddhs.f64','vaddcc.f64','vaddlo.f64','vaddmi.f64','vaddpl.f64','vaddvs.f64','vaddvc.f64','vaddhi.f64','vaddls.f64','vaddge.f64','vaddlt.f64','vaddgt.f64','vaddle.f64',
-
-            'vceqeq.f32','vceqne.f32','vceqcs.f32','vceqhs.f32','vceqcc.f32','vceqlo.f32','vceqmi.f32','vceqpl.f32','vceqvs.f32','vceqvc.f32','vceqhi.f32','vceqls.f32','vceqge.f32','vceqlt.f32','vceqgt.f32','vceqle.f32',
-            'vcgeeq.f32','vcgene.f32','vcgecs.f32','vcgehs.f32','vcgecc.f32','vcgelo.f32','vcgemi.f32','vcgepl.f32','vcgevs.f32','vcgevc.f32','vcgehi.f32','vcgels.f32','vcgege.f32','vcgelt.f32','vcgegt.f32','vcgele.f32',
-            'vcleeq.f32','vclene.f32','vclecs.f32','vclehs.f32','vclecc.f32','vclelo.f32','vclemi.f32','vclepl.f32','vclevs.f32','vclevc.f32','vclehi.f32','vclels.f32','vclege.f32','vclelt.f32','vclegt.f32','vclele.f32',
-            'vcgteq.f32','vcgtne.f32','vcgtcs.f32','vcgths.f32','vcgtcc.f32','vcgtlo.f32','vcgtmi.f32','vcgtpl.f32','vcgtvs.f32','vcgtvc.f32','vcgthi.f32','vcgtls.f32','vcgtge.f32','vcgtlt.f32','vcgtgt.f32','vcgtle.f32',
-            'vclteq.f32','vcltne.f32','vcltcs.f32','vclths.f32','vcltcc.f32','vcltlo.f32','vcltmi.f32','vcltpl.f32','vcltvs.f32','vcltvc.f32','vclthi.f32','vcltls.f32','vcltge.f32','vcltlt.f32','vcltgt.f32','vcltle.f32',
-
-            'vcmpeq.f32','vcmpne.f32','vcmpcs.f32','vcmphs.f32','vcmpcc.f32','vcmplo.f32','vcmpmi.f32','vcmppl.f32','vcmpvs.f32','vcmpvc.f32','vcmphi.f32','vcmpls.f32','vcmpge.f32','vcmplt.f32','vcmpgt.f32','vcmple.f32',
-            'vcmpeq.f64','vcmpne.f64','vcmpcs.f64','vcmphs.f64','vcmpcc.f64','vcmplo.f64','vcmpmi.f64','vcmppl.f64','vcmpvs.f64','vcmpvc.f64','vcmphi.f64','vcmpls.f64','vcmpge.f64','vcmplt.f64','vcmpgt.f64','vcmple.f64',
-
-            'vcmpeeq.f32','vcmpene.f32','vcmpecs.f32','vcmpehs.f32','vcmpecc.f32','vcmpelo.f32','vcmpemi.f32','vcmpepl.f32','vcmpevs.f32','vcmpevc.f32','vcmpehi.f32','vcmpels.f32','vcmpege.f32','vcmpelt.f32','vcmpegt.f32','vcmpele.f32',
-            'vcmpeeq.f64','vcmpene.f64','vcmpecs.f64','vcmpehs.f64','vcmpecc.f64','vcmpelo.f64','vcmpemi.f64','vcmpepl.f64','vcmpevs.f64','vcmpevc.f64','vcmpehi.f64','vcmpels.f64','vcmpege.f64','vcmpelt.f64','vcmpegt.f64','vcmpele.f64',
-
-            'vcvteq.s16.f32','vcvtne.s16.f32','vcvtcs.s16.f32','vcvths.s16.f32','vcvtcc.s16.f32','vcvtlo.s16.f32','vcvtmi.s16.f32','vcvtpl.s16.f32','vcvtvs.s16.f32','vcvtvc.s16.f32','vcvthi.s16.f32','vcvtls.s16.f32','vcvtge.s16.f32','vcvtlt.s16.f32','vcvtgt.s16.f32','vcvtle.s16.f32',
-            'vcvteq.s16.f64','vcvtne.s16.f64','vcvtcs.s16.f64','vcvths.s16.f64','vcvtcc.s16.f64','vcvtlo.s16.f64','vcvtmi.s16.f64','vcvtpl.s16.f64','vcvtvs.s16.f64','vcvtvc.s16.f64','vcvthi.s16.f64','vcvtls.s16.f64','vcvtge.s16.f64','vcvtlt.s16.f64','vcvtgt.s16.f64','vcvtle.s16.f64',
-            'vcvteq.s32.f32','vcvtne.s32.f32','vcvtcs.s32.f32','vcvths.s32.f32','vcvtcc.s32.f32','vcvtlo.s32.f32','vcvtmi.s32.f32','vcvtpl.s32.f32','vcvtvs.s32.f32','vcvtvc.s32.f32','vcvthi.s32.f32','vcvtls.s32.f32','vcvtge.s32.f32','vcvtlt.s32.f32','vcvtgt.s32.f32','vcvtle.s32.f32',
-            'vcvteq.s32.f64','vcvtne.s32.f64','vcvtcs.s32.f64','vcvths.s32.f64','vcvtcc.s32.f64','vcvtlo.s32.f64','vcvtmi.s32.f64','vcvtpl.s32.f64','vcvtvs.s32.f64','vcvtvc.s32.f64','vcvthi.s32.f64','vcvtls.s32.f64','vcvtge.s32.f64','vcvtlt.s32.f64','vcvtgt.s32.f64','vcvtle.s32.f64',
-            'vcvteq.u16.f32','vcvtne.u16.f32','vcvtcs.u16.f32','vcvths.u16.f32','vcvtcc.u16.f32','vcvtlo.u16.f32','vcvtmi.u16.f32','vcvtpl.u16.f32','vcvtvs.u16.f32','vcvtvc.u16.f32','vcvthi.u16.f32','vcvtls.u16.f32','vcvtge.u16.f32','vcvtlt.u16.f32','vcvtgt.u16.f32','vcvtle.u16.f32',
-            'vcvteq.u16.f64','vcvtne.u16.f64','vcvtcs.u16.f64','vcvths.u16.f64','vcvtcc.u16.f64','vcvtlo.u16.f64','vcvtmi.u16.f64','vcvtpl.u16.f64','vcvtvs.u16.f64','vcvtvc.u16.f64','vcvthi.u16.f64','vcvtls.u16.f64','vcvtge.u16.f64','vcvtlt.u16.f64','vcvtgt.u16.f64','vcvtle.u16.f64',
-            'vcvteq.u32.f32','vcvtne.u32.f32','vcvtcs.u32.f32','vcvths.u32.f32','vcvtcc.u32.f32','vcvtlo.u32.f32','vcvtmi.u32.f32','vcvtpl.u32.f32','vcvtvs.u32.f32','vcvtvc.u32.f32','vcvthi.u32.f32','vcvtls.u32.f32','vcvtge.u32.f32','vcvtlt.u32.f32','vcvtgt.u32.f32','vcvtle.u32.f32',
-            'vcvteq.u32.f64','vcvtne.u32.f64','vcvtcs.u32.f64','vcvths.u32.f64','vcvtcc.u32.f64','vcvtlo.u32.f64','vcvtmi.u32.f64','vcvtpl.u32.f64','vcvtvs.u32.f64','vcvtvc.u32.f64','vcvthi.u32.f64','vcvtls.u32.f64','vcvtge.u32.f64','vcvtlt.u32.f64','vcvtgt.u32.f64','vcvtle.u32.f64',
-            'vcvteq.f16.f32','vcvtne.f16.f32','vcvtcs.f16.f32','vcvths.f16.f32','vcvtcc.f16.f32','vcvtlo.f16.f32','vcvtmi.f16.f32','vcvtpl.f16.f32','vcvtvs.f16.f32','vcvtvc.f16.f32','vcvthi.f16.f32','vcvtls.f16.f32','vcvtge.f16.f32','vcvtlt.f16.f32','vcvtgt.f16.f32','vcvtle.f16.f32',
-            'vcvteq.f32.s32','vcvtne.f32.s32','vcvtcs.f32.s32','vcvths.f32.s32','vcvtcc.f32.s32','vcvtlo.f32.s32','vcvtmi.f32.s32','vcvtpl.f32.s32','vcvtvs.f32.s32','vcvtvc.f32.s32','vcvthi.f32.s32','vcvtls.f32.s32','vcvtge.f32.s32','vcvtlt.f32.s32','vcvtgt.f32.s32','vcvtle.f32.s32',
-            'vcvteq.f32.u32','vcvtne.f32.u32','vcvtcs.f32.u32','vcvths.f32.u32','vcvtcc.f32.u32','vcvtlo.f32.u32','vcvtmi.f32.u32','vcvtpl.f32.u32','vcvtvs.f32.u32','vcvtvc.f32.u32','vcvthi.f32.u32','vcvtls.f32.u32','vcvtge.f32.u32','vcvtlt.f32.u32','vcvtgt.f32.u32','vcvtle.f32.u32',
-            'vcvteq.f32.f16','vcvtne.f32.f16','vcvtcs.f32.f16','vcvths.f32.f16','vcvtcc.f32.f16','vcvtlo.f32.f16','vcvtmi.f32.f16','vcvtpl.f32.f16','vcvtvs.f32.f16','vcvtvc.f32.f16','vcvthi.f32.f16','vcvtls.f32.f16','vcvtge.f32.f16','vcvtlt.f32.f16','vcvtgt.f32.f16','vcvtle.f32.f16',
-            'vcvteq.f32.f64','vcvtne.f32.f64','vcvtcs.f32.f64','vcvths.f32.f64','vcvtcc.f32.f64','vcvtlo.f32.f64','vcvtmi.f32.f64','vcvtpl.f32.f64','vcvtvs.f32.f64','vcvtvc.f32.f64','vcvthi.f32.f64','vcvtls.f32.f64','vcvtge.f32.f64','vcvtlt.f32.f64','vcvtgt.f32.f64','vcvtle.f32.f64',
-            'vcvteq.f64.s32','vcvtne.f64.s32','vcvtcs.f64.s32','vcvths.f64.s32','vcvtcc.f64.s32','vcvtlo.f64.s32','vcvtmi.f64.s32','vcvtpl.f64.s32','vcvtvs.f64.s32','vcvtvc.f64.s32','vcvthi.f64.s32','vcvtls.f64.s32','vcvtge.f64.s32','vcvtlt.f64.s32','vcvtgt.f64.s32','vcvtle.f64.s32',
-            'vcvteq.f64.u32','vcvtne.f64.u32','vcvtcs.f64.u32','vcvths.f64.u32','vcvtcc.f64.u32','vcvtlo.f64.u32','vcvtmi.f64.u32','vcvtpl.f64.u32','vcvtvs.f64.u32','vcvtvc.f64.u32','vcvthi.f64.u32','vcvtls.f64.u32','vcvtge.f64.u32','vcvtlt.f64.u32','vcvtgt.f64.u32','vcvtle.f64.u32',
-            'vcvteq.f64.f32','vcvtne.f64.f32','vcvtcs.f64.f32','vcvths.f64.f32','vcvtcc.f64.f32','vcvtlo.f64.f32','vcvtmi.f64.f32','vcvtpl.f64.f32','vcvtvs.f64.f32','vcvtvc.f64.f32','vcvthi.f64.f32','vcvtls.f64.f32','vcvtge.f64.f32','vcvtlt.f64.f32','vcvtgt.f64.f32','vcvtle.f64.f32',
-
-            'vcvtreq.s32.f32','vcvtrne.s32.f32','vcvtrcs.s32.f32','vcvtrhs.s32.f32','vcvtrcc.s32.f32','vcvtrlo.s32.f32','vcvtrmi.s32.f32','vcvtrpl.s32.f32','vcvtrvs.s32.f32','vcvtrvc.s32.f32','vcvtrhi.s32.f32','vcvtrls.s32.f32','vcvtrge.s32.f32','vcvtrlt.s32.f32','vcvtrgt.s32.f32','vcvtrle.s32.f32',
-            'vcvtreq.s32.f64','vcvtrne.s32.f64','vcvtrcs.s32.f64','vcvtrhs.s32.f64','vcvtrcc.s32.f64','vcvtrlo.s32.f64','vcvtrmi.s32.f64','vcvtrpl.s32.f64','vcvtrvs.s32.f64','vcvtrvc.s32.f64','vcvtrhi.s32.f64','vcvtrls.s32.f64','vcvtrge.s32.f64','vcvtrlt.s32.f64','vcvtrgt.s32.f64','vcvtrle.s32.f64',
-            'vcvtreq.u32.f32','vcvtrne.u32.f32','vcvtrcs.u32.f32','vcvtrhs.u32.f32','vcvtrcc.u32.f32','vcvtrlo.u32.f32','vcvtrmi.u32.f32','vcvtrpl.u32.f32','vcvtrvs.u32.f32','vcvtrvc.u32.f32','vcvtrhi.u32.f32','vcvtrls.u32.f32','vcvtrge.u32.f32','vcvtrlt.u32.f32','vcvtrgt.u32.f32','vcvtrle.u32.f32',
-            'vcvtreq.u32.f64','vcvtrne.u32.f64','vcvtrcs.u32.f64','vcvtrhs.u32.f64','vcvtrcc.u32.f64','vcvtrlo.u32.f64','vcvtrmi.u32.f64','vcvtrpl.u32.f64','vcvtrvs.u32.f64','vcvtrvc.u32.f64','vcvtrhi.u32.f64','vcvtrls.u32.f64','vcvtrge.u32.f64','vcvtrlt.u32.f64','vcvtrgt.u32.f64','vcvtrle.u32.f64',
-
-            'vcvtbeq.f16.f32','vcvtbne.f16.f32','vcvtbcs.f16.f32','vcvtbhs.f16.f32','vcvtbcc.f16.f32','vcvtblo.f16.f32','vcvtbmi.f16.f32','vcvtbpl.f16.f32','vcvtbvs.f16.f32','vcvtbvc.f16.f32','vcvtbhi.f16.f32','vcvtbls.f16.f32','vcvtbge.f16.f32','vcvtblt.f16.f32','vcvtbgt.f16.f32','vcvtble.f16.f32',
-            'vcvtbeq.f32.f16','vcvtbne.f32.f16','vcvtbcs.f32.f16','vcvtbhs.f32.f16','vcvtbcc.f32.f16','vcvtblo.f32.f16','vcvtbmi.f32.f16','vcvtbpl.f32.f16','vcvtbvs.f32.f16','vcvtbvc.f32.f16','vcvtbhi.f32.f16','vcvtbls.f32.f16','vcvtbge.f32.f16','vcvtblt.f32.f16','vcvtbgt.f32.f16','vcvtble.f32.f16',
-
-            'vcvtteq.f16.f32','vcvttne.f16.f32','vcvttcs.f16.f32','vcvtths.f16.f32','vcvttcc.f16.f32','vcvttlo.f16.f32','vcvttmi.f16.f32','vcvttpl.f16.f32','vcvttvs.f16.f32','vcvttvc.f16.f32','vcvtthi.f16.f32','vcvttls.f16.f32','vcvttge.f16.f32','vcvttlt.f16.f32','vcvttgt.f16.f32','vcvttle.f16.f32',
-            'vcvtteq.f32.f16','vcvttne.f32.f16','vcvttcs.f32.f16','vcvtths.f32.f16','vcvttcc.f32.f16','vcvttlo.f32.f16','vcvttmi.f32.f16','vcvttpl.f32.f16','vcvttvs.f32.f16','vcvttvc.f32.f16','vcvtthi.f32.f16','vcvttls.f32.f16','vcvttge.f32.f16','vcvttlt.f32.f16','vcvttgt.f32.f16','vcvttle.f32.f16',
-
-            'vdiveq.f32','vdivne.f32','vdivcs.f32','vdivhs.f32','vdivcc.f32','vdivlo.f32','vdivmi.f32','vdivpl.f32','vdivvs.f32','vdivvc.f32','vdivhi.f32','vdivls.f32','vdivge.f32','vdivlt.f32','vdivgt.f32','vdivle.f32',
-            'vdiveq.f64','vdivne.f64','vdivcs.f64','vdivhs.f64','vdivcc.f64','vdivlo.f64','vdivmi.f64','vdivpl.f64','vdivvs.f64','vdivvc.f64','vdivhi.f64','vdivls.f64','vdivge.f64','vdivlt.f64','vdivgt.f64','vdivle.f64',
-
-            'vmaxeq.f32','vmaxne.f32','vmaxcs.f32','vmaxhs.f32','vmaxcc.f32','vmaxlo.f32','vmaxmi.f32','vmaxpl.f32','vmaxvs.f32','vmaxvc.f32','vmaxhi.f32','vmaxls.f32','vmaxge.f32','vmaxlt.f32','vmaxgt.f32','vmaxle.f32',
-            'vmineq.f32','vminne.f32','vmincs.f32','vminhs.f32','vmincc.f32','vminlo.f32','vminmi.f32','vminpl.f32','vminvs.f32','vminvc.f32','vminhi.f32','vminls.f32','vminge.f32','vminlt.f32','vmingt.f32','vminle.f32',
-
-            'vmlaeq.f32','vmlane.f32','vmlacs.f32','vmlahs.f32','vmlacc.f32','vmlalo.f32','vmlami.f32','vmlapl.f32','vmlavs.f32','vmlavc.f32','vmlahi.f32','vmlals.f32','vmlage.f32','vmlalt.f32','vmlagt.f32','vmlale.f32',
-            'vmlaeq.f64','vmlane.f64','vmlacs.f64','vmlahs.f64','vmlacc.f64','vmlalo.f64','vmlami.f64','vmlapl.f64','vmlavs.f64','vmlavc.f64','vmlahi.f64','vmlals.f64','vmlage.f64','vmlalt.f64','vmlagt.f64','vmlale.f64',
-
-            'vmlseq.f32','vmlsne.f32','vmlscs.f32','vmlshs.f32','vmlscc.f32','vmlslo.f32','vmlsmi.f32','vmlspl.f32','vmlsvs.f32','vmlsvc.f32','vmlshi.f32','vmlsls.f32','vmlsge.f32','vmlslt.f32','vmlsgt.f32','vmlsle.f32',
-            'vmlseq.f64','vmlsne.f64','vmlscs.f64','vmlshs.f64','vmlscc.f64','vmlslo.f64','vmlsmi.f64','vmlspl.f64','vmlsvs.f64','vmlsvc.f64','vmlshi.f64','vmlsls.f64','vmlsge.f64','vmlslt.f64','vmlsgt.f64','vmlsle.f64',
-
-            'vmuleq.f32','vmulne.f32','vmulcs.f32','vmulhs.f32','vmulcc.f32','vmullo.f32','vmulmi.f32','vmulpl.f32','vmulvs.f32','vmulvc.f32','vmulhi.f32','vmulls.f32','vmulge.f32','vmullt.f32','vmulgt.f32','vmulle.f32',
-            'vmuleq.f64','vmulne.f64','vmulcs.f64','vmulhs.f64','vmulcc.f64','vmullo.f64','vmulmi.f64','vmulpl.f64','vmulvs.f64','vmulvc.f64','vmulhi.f64','vmulls.f64','vmulge.f64','vmullt.f64','vmulgt.f64','vmulle.f64',
-
-            'vnegeq.f32','vnegne.f32','vnegcs.f32','vneghs.f32','vnegcc.f32','vneglo.f32','vnegmi.f32','vnegpl.f32','vnegvs.f32','vnegvc.f32','vneghi.f32','vnegls.f32','vnegge.f32','vneglt.f32','vneggt.f32','vnegle.f32',
-            'vnegeq.f64','vnegne.f64','vnegcs.f64','vneghs.f64','vnegcc.f64','vneglo.f64','vnegmi.f64','vnegpl.f64','vnegvs.f64','vnegvc.f64','vneghi.f64','vnegls.f64','vnegge.f64','vneglt.f64','vneggt.f64','vnegle.f64',
-
-            'vnmlaeq.f32','vnmlane.f32','vnmlacs.f32','vnmlahs.f32','vnmlacc.f32','vnmlalo.f32','vnmlami.f32','vnmlapl.f32','vnmlavs.f32','vnmlavc.f32','vnmlahi.f32','vnmlals.f32','vnmlage.f32','vnmlalt.f32','vnmlagt.f32','vnmlale.f32',
-            'vnmlaeq.f64','vnmlane.f64','vnmlacs.f64','vnmlahs.f64','vnmlacc.f64','vnmlalo.f64','vnmlami.f64','vnmlapl.f64','vnmlavs.f64','vnmlavc.f64','vnmlahi.f64','vnmlals.f64','vnmlage.f64','vnmlalt.f64','vnmlagt.f64','vnmlale.f64',
-
-            'vnmlseq.f32','vnmlsne.f32','vnmlscs.f32','vnmlshs.f32','vnmlscc.f32','vnmlslo.f32','vnmlsmi.f32','vnmlspl.f32','vnmlsvs.f32','vnmlsvc.f32','vnmlshi.f32','vnmlsls.f32','vnmlsge.f32','vnmlslt.f32','vnmlsgt.f32','vnmlsle.f32',
-            'vnmlseq.f64','vnmlsne.f64','vnmlscs.f64','vnmlshs.f64','vnmlscc.f64','vnmlslo.f64','vnmlsmi.f64','vnmlspl.f64','vnmlsvs.f64','vnmlsvc.f64','vnmlshi.f64','vnmlsls.f64','vnmlsge.f64','vnmlslt.f64','vnmlsgt.f64','vnmlsle.f64',
-
-            'vnmuleq.f64','vnmulne.f64','vnmulcs.f64','vnmulhs.f64','vnmulcc.f64','vnmullo.f64','vnmulmi.f64','vnmulpl.f64','vnmulvs.f64','vnmulvc.f64','vnmulhi.f64','vnmulls.f64','vnmulge.f64','vnmullt.f64','vnmulgt.f64','vnmulle.f64',
-            'vnmuleq.f32','vnmulne.f32','vnmulcs.f32','vnmulhs.f32','vnmulcc.f32','vnmullo.f32','vnmulmi.f32','vnmulpl.f32','vnmulvs.f32','vnmulvc.f32','vnmulhi.f32','vnmulls.f32','vnmulge.f32','vnmullt.f32','vnmulgt.f32','vnmulle.f32',
-
-            'vpaddeq.f32','vpaddne.f32','vpaddcs.f32','vpaddhs.f32','vpaddcc.f32','vpaddlo.f32','vpaddmi.f32','vpaddpl.f32','vpaddvs.f32','vpaddvc.f32','vpaddhi.f32','vpaddls.f32','vpaddge.f32','vpaddlt.f32','vpaddgt.f32','vpaddle.f32',
-
-            'vpmaxeq.f32','vpmaxne.f32','vpmaxcs.f32','vpmaxhs.f32','vpmaxcc.f32','vpmaxlo.f32','vpmaxmi.f32','vpmaxpl.f32','vpmaxvs.f32','vpmaxvc.f32','vpmaxhi.f32','vpmaxls.f32','vpmaxge.f32','vpmaxlt.f32','vpmaxgt.f32','vpmaxle.f32',
-            'vpmineq.f32','vpminne.f32','vpmincs.f32','vpminhs.f32','vpmincc.f32','vpminlo.f32','vpminmi.f32','vpminpl.f32','vpminvs.f32','vpminvc.f32','vpminhi.f32','vpminls.f32','vpminge.f32','vpminlt.f32','vpmingt.f32','vpminle.f32',
-
-            'vrecpeeq.u32','vrecpene.u32','vrecpecs.u32','vrecpehs.u32','vrecpecc.u32','vrecpelo.u32','vrecpemi.u32','vrecpepl.u32','vrecpevs.u32','vrecpevc.u32','vrecpehi.u32','vrecpels.u32','vrecpege.u32','vrecpelt.u32','vrecpegt.u32','vrecpele.u32',
-            'vrecpeeq.f32','vrecpene.f32','vrecpecs.f32','vrecpehs.f32','vrecpecc.f32','vrecpelo.f32','vrecpemi.f32','vrecpepl.f32','vrecpevs.f32','vrecpevc.f32','vrecpehi.f32','vrecpels.f32','vrecpege.f32','vrecpelt.f32','vrecpegt.f32','vrecpele.f32',
-            'vrecpseq.f32','vrecpsne.f32','vrecpscs.f32','vrecpshs.f32','vrecpscc.f32','vrecpslo.f32','vrecpsmi.f32','vrecpspl.f32','vrecpsvs.f32','vrecpsvc.f32','vrecpshi.f32','vrecpsls.f32','vrecpsge.f32','vrecpslt.f32','vrecpsgt.f32','vrecpsle.f32',
-
-            'vrsqrteeq.u32','vrsqrtene.u32','vrsqrtecs.u32','vrsqrtehs.u32','vrsqrtecc.u32','vrsqrtelo.u32','vrsqrtemi.u32','vrsqrtepl.u32','vrsqrtevs.u32','vrsqrtevc.u32','vrsqrtehi.u32','vrsqrtels.u32','vrsqrtege.u32','vrsqrtelt.u32','vrsqrtegt.u32','vrsqrtele.u32',
-            'vrsqrteeq.f32','vrsqrtene.f32','vrsqrtecs.f32','vrsqrtehs.f32','vrsqrtecc.f32','vrsqrtelo.f32','vrsqrtemi.f32','vrsqrtepl.f32','vrsqrtevs.f32','vrsqrtevc.f32','vrsqrtehi.f32','vrsqrtels.f32','vrsqrtege.f32','vrsqrtelt.f32','vrsqrtegt.f32','vrsqrtele.f32',
-            'vrsqrtseq.f32','vrsqrtsne.f32','vrsqrtscs.f32','vrsqrtshs.f32','vrsqrtscc.f32','vrsqrtslo.f32','vrsqrtsmi.f32','vrsqrtspl.f32','vrsqrtsvs.f32','vrsqrtsvc.f32','vrsqrtshi.f32','vrsqrtsls.f32','vrsqrtsge.f32','vrsqrtslt.f32','vrsqrtsgt.f32','vrsqrtsle.f32',
-
-            'vsqrteq.f32','vsqrtne.f32','vsqrtcs.f32','vsqrths.f32','vsqrtcc.f32','vsqrtlo.f32','vsqrtmi.f32','vsqrtpl.f32','vsqrtvs.f32','vsqrtvc.f32','vsqrthi.f32','vsqrtls.f32','vsqrtge.f32','vsqrtlt.f32','vsqrtgt.f32','vsqrtle.f32',
-            'vsqrteq.f64','vsqrtne.f64','vsqrtcs.f64','vsqrths.f64','vsqrtcc.f64','vsqrtlo.f64','vsqrtmi.f64','vsqrtpl.f64','vsqrtvs.f64','vsqrtvc.f64','vsqrthi.f64','vsqrtls.f64','vsqrtge.f64','vsqrtlt.f64','vsqrtgt.f64','vsqrtle.f64',
-
-            'vsubeq.f32','vsubne.f32','vsubcs.f32','vsubhs.f32','vsubcc.f32','vsublo.f32','vsubmi.f32','vsubpl.f32','vsubvs.f32','vsubvc.f32','vsubhi.f32','vsubls.f32','vsubge.f32','vsublt.f32','vsubgt.f32','vsuble.f32',
-            'vsubeq.f64','vsubne.f64','vsubcs.f64','vsubhs.f64','vsubcc.f64','vsublo.f64','vsubmi.f64','vsubpl.f64','vsubvs.f64','vsubvc.f64','vsubhi.f64','vsubls.f64','vsubge.f64','vsublt.f64','vsubgt.f64','vsuble.f64'
-            ),
-        /* Registers */
-        35 => array(
-            /* General-Purpose Registers */
-            'r0','r1','r2','r3','r4','r5','r6','r7',
-            'r8','r9','r10','r11','r12','r13','r14','r15',
-            /* Scratch Registers */
-            'a1','a2','a3','a4',
-            /* Variable Registers */
-            'v1','v2','v3','v4','v5','v6','v7','v8',
-            /* Other Synonims for General-Purpose Registers */
-            'sb','sl','fp','ip','sp','lr','pc',
-            /* WMMX Data Registers */
-            'wr0','wr1','wr2','wr3','wr4','wr5','wr6','wr7',
-            'wr8','wr9','wr10','wr11','wr12','wr13','wr14','wr15',
-            /* WMMX Control Registers */
-            'wcid','wcon','wcssf','wcasf',
-            /* WMMX-Mapped General-Purpose Registers */
-            'wcgr0','wcgr1','wcgr2','wcgr3',
-            /* VFPv3 Registers */
-            's0','s1','s2','s3','s4','s5','s6','s7',
-            's8','s9','s10','s11','s12','s13','s14','s15',
-            's16','s17','s18','s19','s20','s21','s22','s23',
-            's24','s25','s26','s27','s28','s29','s30','s31',
-            /* VFPv3/NEON Registers */
-            'd0','d1','d2','d3','d4','d5','d6','d7',
-            'd8','d9','d10','d11','d12','d13','d14','d15',
-            'd16','d17','d18','d19','d20','d21','d22','d23',
-            'd24','d25','d26','d27','d28','d29','d30','d31',
-            /* NEON Registers */
-            'q0','q1','q2','q3','q4','q5','q6','q7',
-            'q8','q9','q10','q11','q12','q13','q14','q15'
-            )
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '(', ')',
-        '+', '-', '*', '/', '%',
-        '.', ',', ';', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        9 => false,
-        10 => false,
-        11 => false,
-        12 => false,
-        13 => false,
-        14 => false,
-        15 => false,
-        16 => false,
-        17 => false,
-        18 => false,
-        19 => false,
-        20 => false,
-        21 => false,
-        22 => false,
-        23 => false,
-        24 => false,
-        25 => false,
-        26 => false,
-        27 => false,
-        28 => false,
-        29 => false,
-        30 => false,
-        31 => false,
-        32 => false,
-        33 => false,
-        34 => false,
-        35 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            /* Unconditional Data Processing Instructions */
-            1 => 'color: #00007f; font-weight: normal; font-style: normal;',
-            /* Conditional Data Processing Instructions */
-            2 => 'color: #00007f; font-weight: normal; font-style: italic;',
-            /* Unconditional Memory Access Instructions */
-            3 => 'color: #00007f; font-weight: normal; font-style: normal;',
-            /* Conditional Memory Access Instructions */
-            4 => 'color: #00007f; font-weight: normal; font-style: italic;',
-            /* Unconditional Flags Changing Instructions */
-            5 => 'color: #00007f; font-weight: bold; font-style: normal;',
-            /* Conditional Flags Changing Instructions */
-            6 => 'color: #00007f; font-weight: bold; font-style: italic;',
-            /* Unconditional Flow Control Instructions */
-            7 => 'color: #0000ff; font-weight: normal; font-style: normal;',
-            /* Conditional Flow Control Instructions */
-            8 => 'color: #0000ff; font-weight: normal; font-style: italic;',
-            /* Unconditional Syncronization Instructions */
-            9 => 'color: #00007f; font-weight: normal; font-style: normal;',
-            /* Conditional Syncronization Instructions */
-            10 => 'color: #00007f; font-weight: normal; font-style: italic;',
-            /* Unonditional ARMv6 SIMD */
-            11 => 'color: #b00040; font-weight: normal; font-style: normal;',
-            /* Conditional ARMv6 SIMD */
-            12 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional Coprocessor Instructions */
-            13 => 'color: #00007f; font-weight: normal; font-style: normal;',
-            /* Conditional Coprocessor Instructions */
-            14 => 'color: #00007f; font-weight: bold; font-style: italic;',
-            /* Unconditional System Instructions */
-            15 => 'color: #00007f; font-weight: normal; font-style: normal;',
-            /* Conditional System Instructions */
-            16 => 'color: #00007f; font-weight: bold; font-style: italic;',
-            /* Unconditional WMMX/WMMX2 SIMD Instructions */
-            17 => 'color: #b00040; font-weight: normal; font-style: normal;',
-            /* Conditional WMMX/WMMX2 SIMD Instructions */
-            18 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional VFPv3 & NEON SIMD Memory Access Instructions */
-            19 => 'color: #b00040; font-weight: normal; font-style: normal;',
-            /* Unconditional NEON SIMD Logical Instructions */
-            20 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional NEON SIMD ARM Registers Interop Instructions */
-            21 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional NEON SIMD Bit/Byte-Level Instructions */
-            22 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional NEON SIMD Universal Integer Instructions */
-            23 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional NEON SIMD Signed Integer Instructions */
-            24 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional NEON SIMD Unsigned Integer Instructions */
-            25 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Unconditional VFPv3 & NEON SIMD Floating-Point Instructions */
-            26 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional VFPv3 & NEON SIMD Memory Access Instructions */
-            27 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional NEON SIMD Logical Instructions */
-            28 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional NEON SIMD ARM Registers Interop Instructions */
-            29 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional NEON SIMD Bit/Byte-Level Instructions */
-            30 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional NEON SIMD Universal Integer Instructions */
-            31 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional NEON SIMD Signed Integer Instructions */
-            32 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional NEON SIMD Unsigned Integer Instructions */
-            33 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Conditional VFPv3 & NEON SIMD Floating-Point Instructions */
-            34 => 'color: #b00040; font-weight: normal; font-style: italic;',
-            /* Registers */
-            35 => 'color: #46aa03; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #adadad; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        9 => '',
-        10 => '',
-        11 => '',
-        12 => '',
-        13 => '',
-        14 => '',
-        15 => '',
-        16 => '',
-        17 => '',
-        18 => '',
-        19 => '',
-        20 => '',
-        21 => '',
-        22 => '',
-        23 => '',
-        24 => '',
-        25 => '',
-        26 => '',
-        27 => '',
-        28 => '',
-        29 => '',
-        30 => '',
-        31 => '',
-        32 => '',
-        33 => '',
-        34 => '',
-        35 => ''
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_BIN_PREFIX_PERCENT |
-        GESHI_NUMBER_BIN_SUFFIX |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_HEX_SUFFIX |
-        GESHI_NUMBER_OCT_SUFFIX |
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/asm.php b/inc/geshi/asm.php
deleted file mode 100644
index dd0a7ec50..000000000
--- a/inc/geshi/asm.php
+++ /dev/null
@@ -1,603 +0,0 @@
-<?php
-/*************************************************************************************
- * asm.php
- * -------
- * Author: Tux (tux@inmail.cz)
- * Copyright: (c) 2004 Tux (http://tux.a4.cz/),
- *                2004-2009 Nigel McNie (http://qbnz.com/highlighter),
- *                2009-2011 Benny Baumann (http://qbnz.com/highlighter),
- *                2011 Dennis Yurichev (dennis@conus.info),
- *                2011 Marat Dukhan (mdukhan3.at.gatech.dot.edu)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/27
- *
- * x86 Assembler language file for GeSHi.
- * Based on the following documents:
- *   - "Intel64 and IA-32 Architectures Programmer's Reference Manual
- *       Volume 2 (2A & 2B): Instructions Set Reference, A-Z",
- *       Order Number 25383-039US, May 2011
- *   - "Intel Advanced Vector Extensions Programming Reference",
- *       Order Number 319433-011, June 2011
- *   - "AMD64 Architecture Programmer's Manual Volume 3:
- *       General-Purpose and System Instructions", Publication No. 24594,
- *       Revision 3.15, November 2009
- *   - "AMD64 Architecture Programmer's Manual Volume 4:
- *       128-Bit and 256-Bit Media Instructions", Publication No. 26568,
- *       Revision 3.12, May 2011
- *   - "AMD64 Architecture Programmer's Manual Volume 5:
- *       64-Bit Media and x87 Floating-Point Instructions",
- *       Publication No. 26569, Revision 3.11, December 2009
- *   - "AMD64 Technology Lightweight Profiling Specification",
- *       Publication No. 43724, Revision 3.08, August 2010
- *   - "Application Note 108: Cyrix Extended MMX Instruction Set"
- *   - "VIA Padlock Programming Guide", 3rd May 2005
- *   - http://en.wikipedia.org/wiki/X86_instruction_listings
- *   - NASM 2.10rc8 Online Documenation at
- *       http://www.nasm.us/xdoc/2.10rc8/html/nasmdoc0.html
- * Color scheme is taken from SciTE. Previous versions of this file
- * also used words from SciTE configuration file (based on NASM syntax)
- *
- * CHANGES
- * -------
- * 2011/10/07
- *   -  Rearranged instructions and registers into groups
- *   -  Updated to support the following extensions
- *          - CMOV, BMI1, BMI2, TBM, FSGSBASE
- *          - LZCNT, TZCNT, POPCNT, MOVBE, CRC32
- *          - MMX, MMX+, EMMX
- *          - 3dnow!, 3dnow!+, 3dnow! Geode, 3dnow! Prefetch
- *          - SSE, SSE2, SSE3, SSSE3, SSE4A, SSE4.1, SSE4.2
- *          - AVX, AVX2, XOP, FMA3, FMA4, CVT16
- *          - VMX, SVM
- *          - AES, PCLMULQDQ, Padlock, RDRAND
- *   -  Updated NASM macros and directives
- * 2010/07/01 (1.0.8.11)
- *   -  Added MMX/SSE/new x86-64 registers, MMX/SSE (up to 4.2) instructions
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2004/11/27 (1.0.2)
- *   -  Added support for multiple object splitters
- * 2004/10/27 (1.0.1)
- *   -  Added support for URLs
- *   -  Added binary and hexadecimal regexps
- * 2004/08/05 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ASM',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    //Line address prefix suppression
-    'COMMENT_REGEXP' => array(2 => "/^(?:[0-9a-f]{0,4}:)?[0-9a-f]{4}(?:[0-9a-f]{4})?/mi"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* General-Purpose */
-        1 => array(
-            /* BCD instructions */
-            'aaa','aad','aam','aas','daa','das',
-            /* Control flow instructions */
-            'ja','jae','jb','jbe','jc','je','jg','jge','jl','jle','jmp','jna',
-            'jnae','jnb','jnbe','jnc','jne','jng','jnge','jnl','jnle','jno','jnp','jns','jnz',
-            'jo','jp','jpe','jpo','js','jz','jcxz','jecxz','jrcxz','loop','loope','loopne',
-            'call','ret','enter','leave','syscall','sysenter','int','into',
-            /* Predicate instructions */
-            'seta','setae','setb','setbe','setc','sete','setg','setge','setl','setle','setna',
-            'setnae','setnb','setnbe','setnc','setne','setng','setnge','setnl','setnle','setno',
-            'setnp','setns','setnz','seto','setp','setpe','setpo','sets','setz','salc',
-            /* Conditional move instructions */
-            'cmovo','cmovno','cmovb','cmovc','cmovnae','cmovae','cmovnb','cmovnc','cmove','cmovz',
-            'cmovne','cmovnz','cmovbe','cmovna','cmova','cmovnbe','cmovs','cmovns','cmovp','cmovpe',
-            'cmovnp','cmovpo','cmovl','cmovnge','cmovge','cmovnl','cmovle','cmovng','cmovg','cmovnle',
-            /* ALU instructions */
-            'add','sub','adc','sbb','neg','cmp','inc','dec','and','or','xor','not','test',
-            'shl','shr','sal','sar','shld','shrd','rol','ror','rcl','rcr',
-            'cbw','cwd','cwde','cdq','cdqe','cqo','bsf','bsr','bt','btc','btr','bts',
-            'idiv','imul','div','mul','bswap','nop',
-            /* Memory instructions */
-            'lea','mov','movsx','movsxd','movzx','xlatb','bound','xchg','xadd','cmpxchg','cmpxchg8b','cmpxchg16b',
-            /* Stack instructions */
-            'push','pop','pusha','popa','pushad','popad','pushf','popf','pushfd','popfd','pushfq','popfq',
-            /* EFLAGS manipulations instructions */
-            'clc','cld','stc','std','cmc','lahf','sahf',
-            /* Prefix instructions */
-            'lock','rep','repe','repz','repne','repnz',
-            /* String instructions */
-            'cmps','cmpsb','cmpsw',/*'cmpsd',*/ 'cmpsq', /*CMPSD conflicts with the SSE2 instructions of the same name*/
-            'movs','movsb','movsw',/*'movsd',*/ 'movsq', /*MOVSD conflicts with the SSE2 instructions of the same name*/
-            'scas','scasb','scasw','scasd','scasq',
-            'stos','stosb','stosw','stosd','stosq',
-            'lods','lodsb','lodsw','lodsd','lodsq',
-            /* Information instructions */
-            'cpuid','rdtsc','rdtscp','rdpmc','xgetbv',
-            'sgdt','sidt','sldt','smsw','str','lar',
-            /* LWP instructions */
-            'llwpcb','slwpcb','lwpval','lwpins',
-            /* Instructions from miscellaneous extensions */
-            'crc32','popcnt','lzcnt','tzcnt','movbe','pclmulqdq','rdrand',
-            /* FSGSBASE instructions */
-            'rdfsbase','rdgsbase','wrfsbase','wrgsbase',
-            /* BMI1 instructions */
-            'andn','bextr','blsi','blsmk','blsr',
-            /* BMI2 instructions */
-            'bzhi','mulx','pdep','pext','rorx','sarx','shlx','shrx',
-            /* TBM instructions */
-            'blcfill','blci','blcic','blcmsk','blcs','blsfill','blsic','t1mskc','tzmsk',
-            /* Legacy instructions */
-            'arpl','ud2','lds','les','lfs','lgs','lss','lsl','verr','verw',
-            /* Privileged instructions */
-            'cli','sti','clts','hlt','rsm','in','insb','insw','insd',
-            'out','outsb','outsw','outsd','clflush','invd','invlpg','invpcid','wbinvd',
-            'iret','iretd','iretq','sysexit','sysret','lidt','lgdt','lldt','lmsw','ltr',
-            'monitor','mwait','rdmsr','wrmsr','swapgs',
-            'fxsave','fxsave64','fxrstor','fxrstor64',
-            'xsave','xsaveopt','xrstor','xsetbv','getsec',
-            /* VMX instructions */
-            'invept','invvpid','vmcall','vmclear','vmlaunch','vmresume',
-            'vmptrld','vmptrst','vmread','vmwrite','vmxoff','vmxon',
-            /* SVM (AMD-V) instructions */
-            'invlpga','skinit','clgi','stgi','vmload','vmsave','vmmcall','vmrun'
-            ),
-        /*FPU*/
-        2 => array(
-            'f2xm1','fabs','fadd','faddp','fbld','fbstp','fchs','fclex','fcom','fcomp','fcompp','fdecstp',
-            'fdisi','fdiv','fdivp','fdivr','fdivrp','feni','ffree','fiadd','ficom','ficomp','fidiv',
-            'fidivr','fild','fimul','fincstp','finit','fist','fistp','fisub','fisubr','fld','fld1',
-            'fldcw','fldenv','fldenvw','fldl2e','fldl2t','fldlg2','fldln2','fldpi','fldz','fmul',
-            'fmulp','fnclex','fndisi','fneni','fninit','fnop','fnsave','fnsavew','fnstcw','fnstenv',
-            'fnstenvw','fnstsw','fpatan','fprem','fptan','frndint','frstor','frstorw','fsave',
-            'fsavew','fscale','fsqrt','fst','fstcw','fstenv','fstenvw','fstp','fstsw','fsub','fsubp',
-            'fsubr','fsubrp','ftst','fwait','fxam','fxch','fxtract','fyl2x','fyl2xp1',
-            'fsetpm','fcos','fldenvd','fnsaved','fnstenvd','fprem1','frstord','fsaved','fsin','fsincos',
-            'fstenvd','fucom','fucomp','fucompp','ffreep',
-            /* FCMOV instructions */
-            'fcomi','fcomip','fucomi','fucomip',
-            'fcmovb','fcmove','fcmovbe','fcmovu','fcmovnb','fcmovne','fcmovnbe','fcmovnu',
-            /* SSE3 instructions */
-            'fisttp'
-            ),
-        /*SIMD*/
-        3 => array(
-            /* MMX instructions */
-            'movd','movq',
-            'paddb','paddw','paddd','paddsb','paddsw','paddusb','paddusw',
-            'psubb','psubw','psubd','psubsb','psubsw','psubusb','psubusw',
-            'pand','pandn','por','pxor',
-            'pcmpeqb','pcmpeqd','pcmpeqw','pcmpgtb','pcmpgtd','pcmpgtw',
-            'pmaddwd','pmulhw','pmullw',
-            'psllw','pslld','psllq','psrlw','psrld','psrlq','psraw','psrad',
-            'packuswb','packsswb','packssdw',
-            'punpcklbw','punpcklwd','punpckldq','punpckhbw','punpckhwd','punpckhdq',
-            'emms',
-            /* MMX+ instructions */
-            'pavgb','pavgw',
-            'pextrw','pinsrw','pmovmskb',
-            'pmaxsw','pmaxub','pminsw','pminub',
-            'pmulhuw','psadbw','pshufw',
-            'prefetchnta','prefetcht0','prefetcht1','prefetcht2',
-            'maskmovq','movntq','sfence',
-            /* EMMX instructions (only available on Cyrix MediaGXm) */
-            'paddsiw','psubsiw',
-            /*'pmulhrw',*/'pmachriw','pmulhriw', /* PMULHRW conflicts with the 3dnow! instruction of the same name */
-            'pmagw','pdistib','paveb',
-            'pmvzb','pmvnzb','pmvlzb','pmvgezb',
-            /* 3dnow! instructions! */
-            'pfacc','pfadd','pfsub','pfsubr','pfmul',
-            'pfcmpeq','pfcmpge','pfcmpgt',
-            'pfmax','pfmin',
-            'pfrcp','pfrcpit1','pfrcpit2','pfrsqit1','pfrsqrt',
-            'pi2fd','pf2id',
-            'pavgusb','pmulhrw',
-            'femms',
-            /* 3dnow!+ instructions */
-            'pfnacc','pfpnacc','pi2fw','pf2iw','pswapd',
-            /* 3dnow! Geode instructions */
-            'pfrsqrtv','pfrcpv',
-            /* 3dnow! Prefetch instructions */
-            'prefetch','prefetchw',
-            /* SSE instructions */
-            'addss','addps','subss','subps',
-            'mulss','mulps','divss','divps','sqrtss','sqrtps',
-            'rcpss','rcpps','rsqrtss','rsqrtps',
-            'maxss','maxps','minss','minps',
-            'cmpss','comiss','ucomiss','cmpps',
-            'cmpeqss','cmpltss','cmpless','cmpunordss','cmpneqss','cmpnltss','cmpnless','cmpordss',
-            'cmpeqps','cmpltps','cmpleps','cmpunordps','cmpneqps','cmpnltps','cmpnleps','cmpordps',
-            'andnps','andps','orps','xorps',
-            'cvtsi2ss','cvtss2si','cvttss2si',
-            'cvtpi2ps','cvtps2pi','cvttps2pi',
-            'movss','movlps','movhps','movlhps','movhlps','movaps','movups','movntps','movmskps',
-            'shufps','unpckhps','unpcklps',
-            'ldmxcsr','stmxcsr',
-            /* SSE2 instructions */
-            'addpd','addsd','subpd','subsd',
-            'mulsd','mulpd','divsd','divpd','sqrtsd','sqrtpd',
-            'maxsd','maxpd','minsd','minpd',
-            'cmpsd','comisd','ucomisd','cmppd',
-            'cmpeqsd','cmpltsd','cmplesd','cmpunordsd','cmpneqsd','cmpnltsd','cmpnlesd','cmpordsd',
-            'cmpeqpd','cmpltpd','cmplepd','cmpunordpd','cmpneqpd','cmpnltpd','cmpnlepd','cmpordpd',
-            'andnpd','andpd','orpd','xorpd',
-            'cvtsd2ss','cvtpd2ps','cvtss2sd','cvtps2pd',
-            'cvtdq2ps','cvtps2dq','cvttps2dq',
-            'cvtdq2pd','cvtpd2dq','cvttpd2dq',
-            'cvtsi2sd','cvtsd2si','cvttsd2si',
-            'cvtpi2pd','cvtpd2pi','cvttpd2pi',
-            'movsd','movlpd','movhpd','movapd','movupd','movntpd','movmskpd',
-            'shufpd','unpckhpd','unpcklpd',
-            'movnti','movdqa','movdqu','movntdq','maskmovdqu',
-            'movdq2q','movq2dq',
-            'paddq','psubq','pmuludq',
-            'pslldq','psrldq',
-            'punpcklqdq','punpckhqdq',
-            'pshufhw','pshuflw','pshufd',
-            'lfence','mfence',
-            /* SSE3 instructions */
-            'addsubps','addsubpd',
-            'haddps','haddpd','hsubps','hsubpd',
-            'movsldup','movshdup','movddup',
-            'lddqu',
-            /* SSSE3 instructions */
-            'psignb','psignw','psignd',
-            'pabsb','pabsw','pabsd',
-            'palignr','pshufb',
-            'pmulhrsw','pmaddubsw',
-            'phaddw','phaddd','phaddsw',
-            'phsubw','phsubd','phsubsw',
-            /* SSE4A instructions */
-            'extrq','insertq','movntsd','movntss',
-            /* SSE4.1 instructions */
-            'mpsadbw','phminposuw',
-            'pmuldq','pmulld',
-            'dpps','dppd',
-            'blendps','blendpd','blendvps','blendvpd','pblendvb','pblendw',
-            'pmaxsb','pmaxuw','pmaxsd','pmaxud','pminsb','pminuw','pminsd','pminud',
-            'roundps','roundss','roundpd','roundsd',
-            'insertps','pinsrb','pinsrd','pinsrq',
-            'extractps','pextrb','pextrd','pextrq',
-            'pmovsxbw','pmovsxbd','pmovsxbq','pmovsxwd','pmovsxwq','pmovsxdq',
-            'pmovzxbw','pmovzxbd','pmovzxbq','pmovzxwd','pmovzxwq','pmovzxdq',
-            'ptest',
-            'pcmpeqq',
-            'packusdw',
-            'movntdqa',
-            /* SSE4.2 instructions */
-            'pcmpgtq',
-            'pcmpestri','pcmpestrm','pcmpistri','pcmpistrm',
-            /* AES instructions */
-            'aesenc','aesenclast','aesdec','aesdeclast','aeskeygenassist','aesimc',
-            /* VIA Padlock instructions */
-            'xcryptcbc','xcryptcfb','xcryptctr','xcryptecb','xcryptofb',
-            'xsha1','xsha256','montmul','xstore',
-            /* AVX instructions */
-            'vaddss','vaddps','vaddsd','vaddpd','vsubss','vsubps','vsubsd','vsubpd',
-            'vaddsubps','vaddsubpd',
-            'vhaddps','vhaddpd','vhsubps','vhsubpd',
-            'vmulss','vmulps','vmulsd','vmulpd',
-            'vmaxss','vmaxps','vmaxsd','vmaxpd','vminss','vminps','vminsd','vminpd',
-            'vandps','vandpd','vandnps','vandnpd','vorps','vorpd','vxorps','vxorpd',
-            'vblendps','vblendpd','vblendvps','vblendvpd',
-            'vcmpss','vcomiss','vucomiss','vcmpsd','vcomisd','vucomisd','vcmpps','vcmppd',
-            'vcmpeqss','vcmpltss','vcmpless','vcmpunordss','vcmpneqss','vcmpnltss','vcmpnless','vcmpordss',
-            'vcmpeq_uqss','vcmpngess','vcmpngtss','vcmpfalsess','vcmpneq_oqss','vcmpgess','vcmpgtss','vcmptruess',
-            'vcmpeq_osss','vcmplt_oqss','vcmple_oqss','vcmpunord_sss','vcmpneq_usss','vcmpnlt_uqss','vcmpnle_uqss','vcmpord_sss',
-            'vcmpeq_usss','vcmpnge_uqss','vcmpngt_uqss','vcmpfalse_osss','vcmpneq_osss','vcmpge_oqss','vcmpgt_oqss','vcmptrue_usss',
-            'vcmpeqps','vcmpltps','vcmpleps','vcmpunordps','vcmpneqps','vcmpnltps','vcmpnleps','vcmpordps',
-            'vcmpeq_uqps','vcmpngeps','vcmpngtps','vcmpfalseps','vcmpneq_oqps','vcmpgeps','vcmpgtps','vcmptrueps',
-            'vcmpeq_osps','vcmplt_oqps','vcmple_oqps','vcmpunord_sps','vcmpneq_usps','vcmpnlt_uqps','vcmpnle_uqps','vcmpord_sps',
-            'vcmpeq_usps','vcmpnge_uqps','vcmpngt_uqps','vcmpfalse_osps','vcmpneq_osps','vcmpge_oqps','vcmpgt_oqps','vcmptrue_usps',
-            'vcmpeqsd','vcmpltsd','vcmplesd','vcmpunordsd','vcmpneqsd','vcmpnltsd','vcmpnlesd','vcmpordsd',
-            'vcmpeq_uqsd','vcmpngesd','vcmpngtsd','vcmpfalsesd','vcmpneq_oqsd','vcmpgesd','vcmpgtsd','vcmptruesd',
-            'vcmpeq_ossd','vcmplt_oqsd','vcmple_oqsd','vcmpunord_ssd','vcmpneq_ussd','vcmpnlt_uqsd','vcmpnle_uqsd','vcmpord_ssd',
-            'vcmpeq_ussd','vcmpnge_uqsd','vcmpngt_uqsd','vcmpfalse_ossd','vcmpneq_ossd','vcmpge_oqsd','vcmpgt_oqsd','vcmptrue_ussd',
-            'vcmpeqpd','vcmpltpd','vcmplepd','vcmpunordpd','vcmpneqpd','vcmpnltpd','vcmpnlepd','vcmpordpd',
-            'vcmpeq_uqpd','vcmpngepd','vcmpngtpd','vcmpfalsepd','vcmpneq_oqpd','vcmpgepd','vcmpgtpd','vcmptruepd',
-            'vcmpeq_ospd','vcmplt_oqpd','vcmple_oqpd','vcmpunord_spd','vcmpneq_uspd','vcmpnlt_uqpd','vcmpnle_uqpd','vcmpord_spd',
-            'vcmpeq_uspd','vcmpnge_uqpd','vcmpngt_uqpd','vcmpfalse_ospd','vcmpneq_ospd','vcmpge_oqpd','vcmpgt_oqpd','vcmptrue_uspd',
-            'vcvtsd2ss','vcvtpd2ps','vcvtss2sd','vcvtps2pd',
-            'vcvtsi2ss','vcvtss2si','vcvttss2si',
-            'vcvtpi2ps','vcvtps2pi','vcvttps2pi',
-            'vcvtdq2ps','vcvtps2dq','vcvttps2dq',
-            'vcvtdq2pd','vcvtpd2dq','vcvttpd2dq',
-            'vcvtsi2sd','vcvtsd2si','vcvttsd2si',
-            'vcvtpi2pd','vcvtpd2pi','vcvttpd2pi',
-            'vdivss','vdivps','vdivsd','vdivpd','vsqrtss','vsqrtps','vsqrtsd','vsqrtpd',
-            'vdpps','vdppd',
-            'vmaskmovps','vmaskmovpd',
-            'vmovss','vmovsd','vmovaps','vmovapd','vmovups','vmovupd','vmovntps','vmovntpd',
-            'vmovhlps','vmovlhps','vmovlps','vmovlpd','vmovhps','vmovhpd',
-            'vmovsldup','vmovshdup','vmovddup',
-            'vmovmskps','vmovmskpd',
-            'vroundss','vroundps','vroundsd','vroundpd',
-            'vrcpss','vrcpps','vrsqrtss','vrsqrtps',
-            'vunpcklps','vunpckhps','vunpcklpd','vunpckhpd',
-            'vbroadcastss','vbroadcastsd','vbroadcastf128',
-            'vextractps','vinsertps','vextractf128','vinsertf128',
-            'vshufps','vshufpd','vpermilps','vpermilpd','vperm2f128',
-            'vtestps','vtestpd',
-            'vpaddb','vpaddusb','vpaddsb','vpaddw','vpaddusw','vpaddsw','vpaddd','vpaddq',
-            'vpsubb','vpsubusb','vpsubsb','vpsubw','vpsubusw','vpsubsw','vpsubd','vpsubq',
-            'vphaddw','vphaddsw','vphaddd','vphsubw','vphsubsw','vphsubd',
-            'vpsllw','vpslld','vpsllq','vpsrlw','vpsrld','vpsrlq','vpsraw','vpsrad',
-            'vpand','vpandn','vpor','vpxor',
-            'vpblendwb','vpblendw',
-            'vpsignb','vpsignw','vpsignd',
-            'vpavgb','vpavgw',
-            'vpabsb','vpabsw','vpabsd',
-            'vmovd','vmovq','vmovdqa','vmovdqu','vlddqu','vmovntdq','vmovntdqa','vmaskmovdqu',
-            'vpmovsxbw','vpmovsxbd','vpmovsxbq','vpmovsxwd','vpmovsxwq','vpmovsxdq',
-            'vpmovzxbw','vpmovzxbd','vpmovzxbq','vpmovzxwd','vpmovzxwq','vpmovzxdq',
-            'vpackuswb','vpacksswb','vpackusdw','vpackssdw',
-            'vpcmpeqb','vpcmpeqw','vpcmpeqd','vpcmpeqq','vpcmpgtb','vpcmpgtw','vpcmpgtd','vpcmpgtq',
-            'vpmaddubsw','vpmaddwd',
-            'vpmullw','vpmulhuw','vpmulhw','vpmulhrsw','vpmulld','vpmuludq','vpmuldq',
-            'vpmaxub','vpmaxsb','vpmaxuw','vpmaxsw','vpmaxud','vpmaxsd',
-            'vpminub','vpminsb','vpminuw','vpminsw','vpminud','vpminsd',
-            'vpmovmskb','vptest',
-            'vpunpcklbw','vpunpcklwd','vpunpckldq','vpunpcklqdq',
-            'vpunpckhbw','vpunpckhwd','vpunpckhdq','vpunpckhqdq',
-            'vpslldq','vpsrldq','vpalignr',
-            'vpshufb','vpshuflw','vpshufhw','vpshufd',
-            'vpextrb','vpextrw','vpextrd','vpextrq','vpinsrb','vpinsrw','vpinsrd','vpinsrq',
-            'vpsadbw','vmpsadbw','vphminposuw',
-            'vpcmpestri','vpcmpestrm','vpcmpistri','vpcmpistrm',
-            'vpclmulqdq','vaesenc','vaesenclast','vaesdec','vaesdeclast','vaeskeygenassist','vaesimc',
-            'vldmxcsr','vstmxcsr','vzeroall','vzeroupper',
-            /* AVX2 instructions */
-            'vbroadcasti128','vpbroadcastb','vpbroadcastw','vpbroadcastd','vpbroadcastq',
-            'vpblendd',
-            'vpermd','vpermq','vperm2i128',
-            'vextracti128','vinserti128',
-            'vpmaskmovd','vpmaskmovq',
-            'vpsllvd','vpsllvq','vpsravd','vpsrlvd',
-            'vpgatherdd','vpgatherqd','vgatherdq','vgatherqq',
-            'vpermps','vpermpd',
-            'vgatherdpd','vgatherqpd','vgatherdps','vgatherqps',
-            /* XOP instructions */
-            'vfrczss','vfrczps','vfrczsd','vfrczpd',
-            'vpermil2ps','vperlil2pd',
-            'vpcomub','vpcomb','vpcomuw','vpcomw','vpcomud','vpcomd','vpcomuq','vpcomq',
-            'vphaddubw','vphaddbw','vphaddubd','vphaddbd','vphaddubq','vphaddbq',
-            'vphadduwd','vphaddwd','vphadduwq','vphaddwq','vphaddudq','vphadddq',
-            'vphsubbw','vphsubwd','vphsubdq',
-            'vpmacsdd','vpmacssdd','vpmacsdql','vpmacssdql','vpmacsdqh','vpmacssdqh',
-            'vpmacsww','vpmacssww','vpmacswd','vpmacsswd',
-            'vpmadcswd','vpmadcsswd',
-            'vpcmov','vpperm',
-            'vprotb','vprotw','vprotd','vprotq',
-            'vpshab','vpshaw','vpshad','vpshaq',
-            'vpshlb','vpshlw','vpshld','vpshlq',
-            /* CVT16 instructions */
-            'vcvtph2ps','vcvtps2ph',
-            /* FMA4 instructions */
-            'vfmaddss','vfmaddps','vfmaddsd','vfmaddpd',
-            'vfmsubss','vfmsubps','vfmsubsd','vfmsubpd',
-            'vnfmaddss','vnfmaddps','vnfmaddsd','vnfmaddpd',
-            'vnfmsubss','vnfmsubps','vnfmsubsd','vnfmsubpd',
-            'vfmaddsubps','vfmaddsubpd','vfmsubaddps','vfmsubaddpd',
-            /* FMA3 instructions */
-            'vfmadd132ss','vfmadd213ss','vfmadd231ss',
-            'vfmadd132ps','vfmadd213ps','vfmadd231ps',
-            'vfmadd132sd','vfmadd213sd','vfmadd231sd',
-            'vfmadd132pd','vfmadd213pd','vfmadd231pd',
-            'vfmaddsub132ps','vfmaddsub213ps','vfmaddsub231ps',
-            'vfmaddsub132pd','vfmaddsub213pd','vfmaddsub231pd',
-            'vfmsubadd132ps','vfmsubadd213ps','vfmsubadd231ps',
-            'vfmsubadd132pd','vfmsubadd213pd','vfmsubadd231pd',
-            'vfmsub132ss','vfmsub213ss','vfmsub231ss',
-            'vfmsub132ps','vfmsub213ps','vfmsub231ps',
-            'vfmsub132sd','vfmsub213sd','vfmsub231sd',
-            'vfmsub132pd','vfmsub213pd','vfmsub231pd',
-            'vfnmadd132ss','vfnmadd213ss','vfnmadd231ss',
-            'vfnmadd132ps','vfnmadd213ps','vfnmadd231ps',
-            'vfnmadd132sd','vfnmadd213sd','vfnmadd231sd',
-            'vfnmadd132pd','vfnmadd213pd','vfnmadd231pd',
-            'vfnmsub132ss','vfnmsub213ss','vfnmsub231ss',
-            'vfnmsub132ps','vfnmsub213ps','vfnmsub231ps',
-            'vfnmsub132sd','vfnmsub213sd','vfnmsub231sd',
-            'vfnmsub132pd','vfnmsub213pd','vfnmsub231pd'
-            ),
-        /*registers*/
-        4 => array(
-            /* General-Purpose Registers */
-            'al','ah','bl','bh','cl','ch','dl','dh','sil','dil','bpl','spl',
-            'r8b','r9b','r10b','r11b','r12b','r13b','r14b','r15b',
-            'ax','bx','cx','dx','si','di','bp','sp',
-            'r8w','r9w','r10w','r11w','r12w','r13w','r14w','r15w',
-            'eax','ebx','ecx','edx','esi','edi','ebp','esp',
-            'r8d','r9d','r10d','r11d','r12d','r13d','r14d','r15d',
-            'rax','rcx','rdx','rbx','rsp','rbp','rsi','rdi',
-            'r8','r9','r10','r11','r12','r13','r14','r15',
-            /* Debug Registers */
-            'dr0','dr1','dr2','dr3','dr6','dr7',
-            /* Control Registers */
-            'cr0','cr2','cr3','cr4','cr8',
-            /* Test Registers (Supported on Intel 486 only) */
-            'tr3','tr4','tr5','tr6','tr7',
-            /* Segment Registers */
-            'cs','ds','es','fs','gs','ss',
-            /* FPU Registers */
-            'st','st0','st1','st2','st3','st4','st5','st6','st7',
-            /* MMX Registers */
-            'mm0','mm1','mm2','mm3','mm4','mm5','mm6','mm7',
-            /* SSE Registers */
-            'xmm0','xmm1','xmm2','xmm3','xmm4','xmm5','xmm6','xmm7',
-            'xmm8','xmm9','xmm10','xmm11','xmm12','xmm13','xmm14','xmm15',
-            /* AVX Registers */
-            'ymm0','ymm1','ymm2','ymm3','ymm4','ymm5','ymm6','ymm7',
-            'ymm8','ymm9','ymm10','ymm11','ymm12','ymm13','ymm14','ymm15'
-            ),
-        /*Directive*/
-        5 => array(
-            'db','dw','dd','dq','dt','do','dy',
-            'resb','resw','resd','resq','rest','reso','resy','incbin','equ','times','safeseh',
-            '__utf16__','__utf32__',
-            'default','cpu','float','start','imagebase','osabi',
-            '..start','..imagebase','..gotpc','..gotoff','..gottpoff','..got','..plt','..sym','..tlsie',
-            'section','segment','__sect__','group','absolute',
-            '.bss','.comment','.data','.lbss','.ldata','.lrodata','.rdata','.rodata','.tbss','.tdata','.text',
-            'alloc','bss','code','exec','data','noalloc','nobits','noexec','nowrite','progbits','rdata','tls','write',
-            'private','public','common','stack','overlay','class',
-            'extern','global','import','export',
-            '%define','%idefine','%xdefine','%ixdefine','%assign','%undef',
-            '%defstr','%idefstr','%deftok','%ideftok',
-            '%strcat','%strlen','%substr',
-            '%macro','%imacro','%rmacro','%exitmacro','%endmacro','%unmacro',
-            '%if','%ifn','%elif','%elifn','%else','%endif',
-            '%ifdef','%ifndef','%elifdef','%elifndef',
-            '%ifmacro','%ifnmacro','%elifmacro','%elifnmacro',
-            '%ifctx','%ifnctx','%elifctx','%elifnctx',
-            '%ifidn','%ifnidn','%elifidn','%elifnidn',
-            '%ifidni','%ifnidni','%elifidni','%elifnidni',
-            '%ifid','%ifnid','%elifid','%elifnid',
-            '%ifnum','%ifnnum','%elifnum','%elifnnum',
-            '%ifstr','%ifnstr','%elifstr','%elifnstr',
-            '%iftoken','%ifntoken','%eliftoken','%elifntoken',
-            '%ifempty','%ifnempty','%elifempty','%elifnempty',
-            '%ifenv','%ifnenv','%elifenv','%elifnenv',
-            '%rep','%exitrep','%endrep',
-            '%while','%exitwhile','%endwhile',
-            '%include','%pathsearch','%depend','%use',
-            '%push','%pop','%repl','%arg','%local','%stacksize','flat','flat64','large','small',
-            '%error','%warning','%fatal',
-            '%00','.nolist','%rotate','%line','%!','%final','%clear',
-            'struc','endstruc','istruc','at','iend',
-            'align','alignb','sectalign',
-            'bits','use16','use32','use64',
-            '__nasm_major__','__nasm_minor__','__nasm_subminor__','___nasm_patchlevel__',
-            '__nasm_version_id__','__nasm_ver__',
-            '__file__','__line__','__pass__','__bits__','__output_format__',
-            '__date__','__time__','__date_num__','__time_num__','__posix_time__',
-            '__utc_date__','__utc_time__','__utc_date_num__','__utc_time_num__',
-            '__float_daz__','__float_round__','__float__',
-            /* Keywords from standard packages */
-            '__use_altreg__',
-            '__use_smartalign__','smartalign','__alignmode__',
-            '__use_fp__','__infinity__','__nan__','__qnan__','__snan__',
-            '__float8__','__float16__','__float32__','__float64__','__float80m__','__float80e__','__float128l__','__float128h__'
-            ),
-        /*Operands*/
-        6 => array(
-            'a16','a32','a64','o16','o32','o64','strict',
-            'byte','word','dword','qword','tword','oword','yword','nosplit',
-            '%0','%1','%2','%3','%4','%5','%6','%7','%8','%9',
-            'abs','rel',
-            'seg','wrt'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-                '[', ']', '(', ')',
-                '+', '-', '*', '/', '%',
-                '.', ',', ';', ':'
-            ),
-        2 => array(
-                '$','$$','%+','%?','%??'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f; font-weight: bold;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #b00040;',
-            4 => 'color: #46aa03; font-weight: bold;',
-            5 => 'color: #0000ff; font-weight: bold;',
-            6 => 'color: #0000ff; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #adadad; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;',
-            2 => 'color: #0000ff; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_BIN_PREFIX_PERCENT |
-        GESHI_NUMBER_BIN_SUFFIX |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_HEX_SUFFIX |
-        GESHI_NUMBER_OCT_SUFFIX |
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/asp.php b/inc/geshi/asp.php
deleted file mode 100644
index 0096a169c..000000000
--- a/inc/geshi/asp.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/*************************************************************************************
- * asp.php
- * --------
- * Author: Amit Gupta (http://blog.igeek.info/)
- * Copyright: (c) 2004 Amit Gupta (http://blog.igeek.info/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/13
- *
- * ASP language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/12/30 (1.0.3)
- *   -  Strings only delimited by ", comments by '
- * 2004/11/27 (1.0.2)
- *   -  Added support for multiple object splitters
- * 2004/10/27 (1.0.1)
- *   -  Added support for URLs
- * 2004/08/13 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Include all the functions, keywords etc that I have missed
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ASP',
-    'COMMENT_SINGLE' => array(1 => "'", 2 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'include', 'file', 'Const', 'Dim', 'Option', 'Explicit', 'Implicit', 'Set', 'Select', 'ReDim', 'Preserve',
-            'ByVal', 'ByRef', 'End', 'Private', 'Public', 'If', 'Then', 'Else', 'ElseIf', 'Case', 'With', 'NOT',
-            'While', 'Wend', 'For', 'Loop', 'Do', 'Request', 'Response', 'Server', 'ADODB', 'Session', 'Application',
-            'Each', 'In', 'Get', 'Next', 'INT', 'CINT', 'CBOOL', 'CDATE', 'CBYTE', 'CCUR', 'CDBL', 'CLNG', 'CSNG',
-            'CSTR', 'Fix', 'Is', 'Sgn', 'String', 'Boolean', 'Currency', 'Me', 'Single', 'Long', 'Integer', 'Byte',
-            'Variant', 'Double', 'To', 'Let', 'Xor', 'Resume', 'On', 'Error', 'Imp', 'GoTo', 'Call', 'Global'
-            ),
-        2 => array(
-            'Null', 'Nothing', 'And',
-            'False',
-            'True', 'var', 'Or', 'BOF', 'EOF', 'xor',
-            'Function', 'Class', 'New', 'Sub'
-            ),
-        3 => array(
-            'CreateObject', 'Write', 'Redirect', 'Cookies', 'BinaryRead', 'ClientCertificate', 'Form', 'QueryString',
-            'ServerVariables', 'TotalBytes', 'AddHeader', 'AppendToLog', 'BinaryWrite', 'Buffer', 'CacheControl',
-            'Charset', 'Clear', 'ContentType', 'End()', 'Expires', 'ExpiresAbsolute', 'Flush()', 'IsClientConnected',
-            'PICS', 'Status', 'Connection', 'Recordset', 'Execute', 'Abandon', 'Lock', 'UnLock', 'Command', 'Fields',
-            'Properties', 'Property', 'Send', 'Replace', 'InStr', 'TRIM', 'NOW', 'Day', 'Month', 'Hour', 'Minute', 'Second',
-            'Year', 'MonthName', 'LCase', 'UCase', 'Abs', 'Array', 'As', 'LEN', 'MoveFirst', 'MoveLast', 'MovePrevious',
-            'MoveNext', 'LBound', 'UBound', 'Transfer', 'Open', 'Close', 'MapPath', 'FileExists', 'OpenTextFile', 'ReadAll'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '<%', '%>'
-            ),
-        0 => array(
-            '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
-            ';', ':', '?', '='),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #990099; font-weight: bold;',
-            2 => 'color: #0000ff; font-weight: bold;',
-            3 => 'color: #330066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;',
-            2 => 'color: #ff6600;',
-            'MULTI' => 'color: #008000;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #006600; font-weight:bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #cc0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #800000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #9900cc;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #006600; font-weight: bold;',
-            1 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<%' => '%>'
-            ),
-        1 => array(
-            '<script language="vbscript" runat="server">' => '</script>'
-            ),
-        2 => array(
-            '<script language="javascript" runat="server">' => '</script>'
-            ),
-        3 => "/(?P<start><%=?)(?:\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(?P<end>%>|\Z)/sm"
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/asymptote.php b/inc/geshi/asymptote.php
deleted file mode 100644
index 8683588e5..000000000
--- a/inc/geshi/asymptote.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/*************************************************************************************
- * asymptote.php
- * -------------
- * Author: Manuel Yguel (manuel.yguel.robotics@gmail.com)
- * Copyright: (c) 2012 Manuel Yguel (http://manuelyguel.eu)
- * Release Version: 1.0.8.11
- * Date Started: 2012/05/24
- *
- * asymptote language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/05/24 (1.0.0.0)
- *  -  First Release
- *
- * TODO (updated 2012/05/24)
- * -------------------------
- * * Split to several files - php4, php5 etc
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'asymptote',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'and','controls','tension','atleast','curl','if','else','while','for','do','return','break','continue','struct','typedef','new','access','import','unravel','from','include','quote','static','public','private','restricted','this','explicit','true','false','null','cycle','newframe','operator'
-            ),
-        2 => array(
-            'Braid','FitResult','Label','Legend','Segment','Solution','TreeNode','abscissa','arc','arrowhead','binarytree','binarytreeNode','block','bool','bool3','bounds','bqe','circle','conic','coord','coordsys','cputime','ellipse','file','filltype','frame','grid3','guide','horner','hsv','hyperbola','indexedTransform','int','inversion','key','light','line','linefit','marginT','marker','mass','object','pair','parabola','path','path3','pen','picture','point','position','projection','real','revolution','scaleT','scientific','segment','side','slice','solution','splitface','string','surface','tensionSpecifier','ticklocate','ticksgridT','tickvalues','transform','transformation','tree','triangle','trilinear','triple','vector','vertex','void'),
-        3 => array(
-            'AND','Arc','ArcArrow','ArcArrows','Arrow','Arrows','Automatic','AvantGarde','BBox','BWRainbow','BWRainbow2','Bar','Bars','BeginArcArrow','BeginArrow','BeginBar','BeginDotMargin','BeginMargin','BeginPenMargin','Blank','Bookman','Bottom','BottomTop','Bounds','Break','Broken','BrokenLog','CLZ','CTZ','Ceil','Circle','CircleBarIntervalMarker','Cos','Courier','CrossIntervalMarker','DOSendl','DOSnewl','DefaultFormat','DefaultLogFormat','Degrees','Dir','DotMargin','DotMargins','Dotted','Draw','Drawline','Embed','EndArcArrow','EndArrow','EndBar','EndDotMargin','EndMargin','EndPenMargin','Fill','FillDraw','Floor','Format','Full','Gaussian','Gaussrand','Gaussrandpair',
-            'Gradient','Grayscale','Helvetica','Hermite','HookHead','InOutTicks','InTicks','Jn','Label','Landscape','Left','LeftRight','LeftTicks','Legend','Linear','Link','Log','LogFormat','Margin','Margins','Mark','MidArcArrow','MidArrow','NOT','NewCenturySchoolBook','NoBox','NoMargin','NoModifier','NoTicks','NoTicks3','NoZero','NoZeroFormat','None','OR','OmitFormat','OmitTick','OmitTickInterval','OmitTickIntervals','OutTicks','Ox','Oy','Palatino','PaletteTicks','Pen','PenMargin','PenMargins','Pentype','Portrait','RadialShade','RadialShadeDraw','Rainbow','Range','Relative','Right','RightTicks','Rotate','Round','SQR','Scale','ScaleX','ScaleY','ScaleZ','Seascape','Segment','Shift','Sin','Slant','Spline','StickIntervalMarker','Straight','Symbol','Tan','TeXify','Ticks','Ticks3','TildeIntervalMarker','TimesRoman','Top','TrueMargin','UnFill','UpsideDown','Wheel','X','XEquals','XOR','XY','XYEquals','XYZero','XYgrid','XZEquals','XZZero','XZero','XZgrid','Y','YEquals','YXgrid','YZ','YZEquals','YZZero','YZero','YZgrid','Yn','Z','ZX','ZXgrid','ZYgrid','ZapfChancery','ZapfDingbats','_begingroup3','_cputime','_draw','_eval','_image','_labelpath','_projection','_strokepath','_texpath','aCos','aSin','aTan','abort','abs','accel','acos','acosh','acot','acsc','activatequote','add',
-            'addArrow','addMargins','addSaveFunction','addpenarc','addpenline','adjust','alias','align','all','altitude','angabscissa','angle','angpoint','animate','annotate','anticomplementary','antipedal','apply','approximate','arc','arcarrowsize','arccircle','arcdir','arcfromcenter','arcfromfocus','arclength','arcnodesnumber','arcpoint','arcsubtended','arcsubtendedcenter','arctime','arctopath','array','arrow','arrow2','arrowbase','arrowbasepoints','arrowsize','asec','asin','asinh','ask','assert','asy','asycode','asydir','asyfigure','asyfilecode','asyinclude','asywrite','atan','atan2','atanh','atbreakpoint','atexit','attach','attract','atupdate','autoformat','autoscale','autoscale3','axes','axes3','axialshade','axis','axiscoverage','azimuth','babel','background','bangles','bar','barmarksize','barsize','basealign','baseline','bbox','beep','begin','beginclip','begingroup','beginpoint','between','bevel','bezier','bezierP','bezierPP','bezierPPP','bezulate','bibliography','bibliographystyle','binarytree','binarytreeNode','binomial','binput','bins','bisector','bisectorpoint','bispline','blend','blockconnector','boutput','box','bqe','breakpoint','breakpoints','brick','buildRestoreDefaults','buildRestoreThunk','buildcycle','bulletcolor','byte','calculateScaling','canonical','canonicalcartesiansystem','cartesiansystem','case1','case2','case3','case4','cbrt','cd','ceil','center','centerToFocus',
-            'centroid','cevian','change2','changecoordsys','checkSegment','checkconditionlength','checker','checkincreasing','checklengths','checkposition','checktriangle','choose','circle','circlebarframe','circlemarkradius','circlenodesnumber','circumcenter','circumcircle','clamped','clear','clip','clipdraw','close','cmyk','code','colatitude','collect','collinear','color','colorless','colors','colorspace','comma','compassmark','complement','complementary','concat','concurrent','cone','conic','conicnodesnumber','conictype','conj','connect','connected','connectedindex','containmentTree','contains','contour','contour3','contouredges','controlSpecifier','convert','coordinates','coordsys','copy','copyPairOrTriple','cos','cosh','cot','countIntersections','cputime','crop','cropcode','cross',
-            'crossframe','crosshatch','crossmarksize','csc','cubicroots','curabscissa','curlSpecifier','curpoint','currentarrow','currentexitfunction','currentmomarrow','currentpolarconicroutine','curve','cut','cutafter','cutbefore','cyclic','cylinder','deactivatequote','debugger','deconstruct','defaultdir','defaultformat','defaultpen','defined','degenerate','degrees','delete','deletepreamble','determinant','diagonal','diamond','diffdiv','dir','dirSpecifier','dirtime','display','distance',
-            'divisors','do_overpaint','dot','dotframe','dotsize','downcase','draw','drawAll','drawDoubleLine','drawFermion','drawGhost','drawGluon','drawMomArrow','drawPRCcylinder','drawPRCdisk','drawPRCsphere','drawPRCtube','drawPhoton','drawScalar','drawVertex','drawVertexBox','drawVertexBoxO','drawVertexBoxX','drawVertexO','drawVertexOX','drawVertexTriangle','drawVertexTriangleO','drawVertexX','drawarrow','drawarrow2','drawline','drawpixel','drawtick','duplicate','elle','ellipse','ellipsenodesnumber','embed','embed3','empty','enclose','end','endScript','endclip','endgroup','endgroup3','endl','endpoint','endpoints','eof','eol','equation','equations','erase','erasestep','erf','erfc','error','errorbar','errorbars','eval','excenter','excircle','exit','exitXasyMode','exitfunction','exp','expfactors','expi','expm1','exradius','extend','extension','extouch','fabs','factorial','fermat','fft','fhorner','figure','file','filecode','fill','filldraw','filloutside','fillrule','filltype','find','finite','finiteDifferenceJacobian','firstcut','firstframe','fit','fit2','fixedscaling','floor','flush','fmdefaults','fmod','focusToCenter','font','fontcommand','fontsize','foot','format','frac','frequency','fromCenter','fromFocus','fspline','functionshade','gamma','generate_random_backtrace','generateticks','gergonne','getc','getint','getpair','getreal','getstring','gettriple','gluon','gouraudshade','graph','graphic','gray','grestore','grid','grid3','gsave','halfbox','hatch','hdiffdiv','hermite','hex','histogram','history','hline','hprojection',
-            'hsv','hyperbola','hyperbolanodesnumber','hyperlink','hypot','identity','image','incenter','incentral','incircle','increasing','incrementposition','indexedTransform','indexedfigure','initXasyMode','initdefaults','input','inradius','insert','inside','integrate','interactive','interior','interp','interpolate','intersect','intersection','intersectionpoint','intersectionpoints','intersections','intouch','inverse','inversion','invisible','is3D','isCCW','isDuplicate','isogonal','isogonalconjugate','isotomic','isotomicconjugate','isparabola','italic','item','jobname','key','kurtosis','kurtosisexcess','label','labelaxis','labelmargin','labelpath','labels','labeltick','labelx','labelx3','labely','labely3','labelz','labelz3','lastcut','latex','latitude','latticeshade','layer','layout','ldexp','leastsquares','legend','legenditem','length','lexorder','lift','light','limits','line','linear','linecap','lineinversion','linejoin','linemargin','lineskip','linetype','linewidth','link','list','lm_enorm','lm_evaluate_default','lm_lmdif','lm_lmpar','lm_minimize','lm_print_default','lm_print_quiet','lm_qrfac','lm_qrsolv','locale','locate',
-            'locatefile','location','log','log10','log1p','logaxiscoverage','longitude','lookup','makeNode','makedraw','makepen','map','margin','markangle','markangleradius','markanglespace','markarc','marker','markinterval','marknodes','markrightangle','markuniform','mass','masscenter','massformat','math','max','max3','maxAfterTransform','maxbezier','maxbound','maxcoords','maxlength','maxratio','maxtimes','mean','medial','median','midpoint','min','min3','minAfterTransform','minbezier','minbound','minipage','minratio','mintimes','miterlimit','mktemp','momArrowPath','momarrowsize','monotonic','multifigure','nativeformat','natural','needshipout','newl','newpage','newslide','newton','newtree','nextframe','nextnormal','nextpage','nib','nodabscissa','none','norm','normalvideo','notaknot','nowarn','numberpage','nurb','object','offset','onpath','opacity','opposite','orientation','origin','orthic','orthocentercenter','outformat','outline','outname','outprefix','output','overloadedMessage','overwrite','pack','pad','pairs','palette','parabola','parabolanodesnumber','parallel','parallelogram','partialsum','path','path3','pattern','pause','pdf','pedal','periodic','perp','perpendicular','perpendicularmark','phantom','phi1','phi2','phi3','photon','piecewisestraight','point','polar','polarconicroutine','polargraph','polygon','postcontrol','postscript','pow10','ppoint','prc','prc0','precision','precontrol','prepend','printBytecode','print_random_addresses','project','projection','purge','pwhermite','quadrant','quadraticroots','quantize','quarticroots','quotient','radialshade','radians','radicalcenter','radicalline','radius','rand','randompath','rd','readline','realmult','realquarticroots','rectangle','rectangular','rectify','reflect','relabscissa','relative','relativedistance','reldir','relpoint','reltime','remainder','remark','removeDuplicates','rename','replace','report','resetdefaultpen','restore','restoredefaults','reverse','reversevideo','rf','rfind','rgb','rgba','rgbint','rms',
-            'rotate','rotateO','rotation','round','roundbox','roundedpath','roundrectangle','same','samecoordsys','sameside','sample','save','savedefaults','saveline','scale','scale3','scaleO','scaleT','scaleless','scientific','search','searchindex','searchtree','sec','secondaryX','secondaryY','seconds','section','sector','seek','seekeof','segment','sequence','setcontour','setpens','sgn','sgnd','sharpangle','sharpdegrees','shift','shiftless','shipout','shipout3','show','side','simeq','simpson','sin','sinh','size','size3','skewness','skip','slant','sleep','slope','slopefield','solve','solveBVP','sort','sourceline','sphere','split','sqrt','square','srand','standardizecoordsys','startScript','stdev','step','stickframe','stickmarksize','stickmarkspace','stop','straight','straightness','string','stripdirectory','stripextension','stripfile','stripsuffix','strokepath','subdivide','subitem','subpath','substr','sum','surface','symmedial','symmedian','system',
-            'tab','tableau','tan','tangent','tangential','tangents','tanh','tell','tensionSpecifier','tensorshade','tex','texcolor','texify','texpath','texpreamble','texreset','texshipout','texsize','textpath','thick','thin','tick','tickMax','tickMax3','tickMin','tickMin3','ticklabelshift','ticklocate','tildeframe','tildemarksize','tile','tiling','time','times','title','titlepage','topbox','transform','transformation','transpose','trembleFuzz','triangle','triangleAbc','triangleabc','triangulate','tricoef','tridiagonal','trilinear','trim','truepoint','tube','uncycle','unfill','uniform','unique','unit','unitrand','unitsize','unityroot','unstraighten','upcase','updatefunction','uperiodic','upscale','uptodate','usepackage','usersetting','usetypescript','usleep','value','variance','variancebiased','vbox','vector','vectorfield','verbatim','view','vline','vperiodic','vprojection','warn','warning','windingnumber','write','xaxis','xaxis3','xaxis3At','xaxisAt','xequals','xinput','xlimits','xoutput','xpart','xscale','xscaleO','xtick','xtick3','xtrans','yaxis','yaxis3','yaxis3At','yaxisAt','yequals','ylimits','ypart','yscale','yscaleO','ytick','ytick3','ytrans','zaxis3','zaxis3At','zero','zero3','zlimits','zpart','ztick','ztick3','ztrans'
-            ),
-        4 => array(
-            'AliceBlue','Align','Allow','AntiqueWhite','Apricot','Aqua','Aquamarine','Aspect','Azure','BeginPoint','Beige','Bisque','Bittersweet','Black','BlanchedAlmond','Blue','BlueGreen','BlueViolet','Both','Break','BrickRed','Brown','BurlyWood','BurntOrange','CCW','CW','CadetBlue','CarnationPink','Center','Centered','Cerulean','Chartreuse','Chocolate','Coeff','Coral','CornflowerBlue','Cornsilk','Crimson','Crop','Cyan','Dandelion','DarkBlue','DarkCyan','DarkGoldenrod','DarkGray','DarkGreen','DarkKhaki','DarkMagenta','DarkOliveGreen','DarkOrange','DarkOrchid','DarkRed','DarkSalmon','DarkSeaGreen','DarkSlateBlue','DarkSlateGray','DarkTurquoise','DarkViolet','DeepPink','DeepSkyBlue','DefaultHead','DimGray','DodgerBlue','Dotted','Down','Draw','E','ENE','EPS','ESE','E_Euler','E_PC','E_RK2','E_RK3BS','Emerald','EndPoint','Euler','Fill','FillDraw','FireBrick','FloralWhite','ForestGreen','Fuchsia','Gainsboro','GhostWhite','Gold','Goldenrod','Gray','Green','GreenYellow','Honeydew','HookHead','Horizontal','HotPink','I','IgnoreAspect','IndianRed','Indigo','Ivory','JOIN_IN','JOIN_OUT','JungleGreen','Khaki','LM_DWARF','LM_MACHEP','LM_SQRT_DWARF','LM_SQRT_GIANT','LM_USERTOL','Label','Lavender','LavenderBlush','LawnGreen','Left','LeftJustified','LeftSide','LemonChiffon','LightBlue','LightCoral','LightCyan','LightGoldenrodYellow',
-            'LightGreen','LightGrey','LightPink','LightSalmon','LightSeaGreen','LightSkyBlue','LightSlateGray','LightSteelBlue','LightYellow','Lime','LimeGreen','Linear','Linen','Log','Logarithmic','Magenta','Mahogany','Mark','MarkFill','Maroon','Max','MediumAquamarine','MediumBlue','MediumOrchid','MediumPurple','MediumSeaGreen','MediumSlateBlue','MediumSpringGreen','MediumTurquoise','MediumVioletRed','Melon','MidPoint','MidnightBlue','Min','MintCream','MistyRose','Moccasin','Move','MoveQuiet','Mulberry','N','NE','NNE','NNW','NW','NavajoWhite','Navy','NavyBlue','NoAlign','NoCrop','NoFill','NoSide','OldLace','Olive','OliveDrab','OliveGreen','Orange','OrangeRed','Orchid','Ox','Oy','PC','PaleGoldenrod','PaleGreen','PaleTurquoise','PaleVioletRed','PapayaWhip','Peach','PeachPuff','Periwinkle','Peru','PineGreen','Pink','Plum','PowderBlue','ProcessBlue','Purple','RK2','RK3','RK3BS','RK4','RK5','RK5DP','RK5F','RawSienna','Red','RedOrange','RedViolet','Rhodamine','Right','RightJustified','RightSide','RosyBrown','RoyalBlue','RoyalPurple','RubineRed','S','SE','SSE','SSW','SW','SaddleBrown','Salmon','SandyBrown','SeaGreen','Seashell','Sepia','Sienna','Silver','SimpleHead','SkyBlue','SlateBlue','SlateGray','Snow','SpringGreen','SteelBlue','Suppress','SuppressQuiet','Tan','TeXHead','Teal','TealBlue','Thistle','Ticksize','Tomato',
-            'Turquoise','UnFill','Up','VERSION','Value','Vertical','Violet','VioletRed','W','WNW','WSW','Wheat','White','WhiteSmoke','WildStrawberry','XYAlign','YAlign','Yellow','YellowGreen','YellowOrange','addpenarc','addpenline','align','allowstepping','angularsystem','animationdelay','appendsuffix','arcarrowangle','arcarrowfactor','arrow2sizelimit','arrowangle','arrowbarb','arrowdir','arrowfactor','arrowhookfactor','arrowlength','arrowsizelimit','arrowtexfactor','authorpen','axis','axiscoverage','axislabelfactor','background','backgroundcolor','backgroundpen','barfactor','barmarksizefactor','basealign','baselinetemplate','beveljoin','bigvertexpen','bigvertexsize','black','blue','bm','bottom','bp','brown','bullet','byfoci','byvertices','camerafactor','chartreuse','circlemarkradiusfactor','circlenodesnumberfactor','circleprecision','circlescale','cm','codefile','codepen','codeskip','colorPen','coloredNodes','coloredSegments',
-            'conditionlength','conicnodesfactor','count','cputimeformat','crossmarksizefactor','currentcoordsys','currentlight','currentpatterns','currentpen','currentpicture','currentposition','currentprojection','curvilinearsystem','cuttings','cyan','darkblue','darkbrown','darkcyan','darkgray','darkgreen','darkgrey','darkmagenta','darkolive','darkred','dashdotted','dashed','datepen','dateskip','debuggerlines','debugging','deepblue','deepcyan','deepgray','deepgreen','deepgrey','deepmagenta','deepred','default','defaultControl','defaultS','defaultbackpen','defaultcoordsys','defaultexcursion','defaultfilename','defaultformat','defaultmassformat','defaultpen','diagnostics','differentlengths','dot','dotfactor','dotframe','dotted','doublelinepen','doublelinespacing','down','duplicateFuzz','edge','ellipsenodesnumberfactor','eps','epsgeo','epsilon','evenodd','expansionfactor','extendcap','exterior','fermionpen','figureborder','figuremattpen','file3','firstnode','firststep','foregroundcolor','fuchsia','fuzz','gapfactor','ghostpen','gluonamplitude','gluonpen','gluonratio','gray','green','grey','hatchepsilon','havepagenumber','heavyblue','heavycyan','heavygray','heavygreen','heavygrey','heavymagenta','heavyred','hline','hwratio','hyperbola','hyperbolanodesnumberfactor','identity4','ignore','inXasyMode','inch','inches','includegraphicscommand','inf','infinity','institutionpen','intMax','intMin','interior','invert','invisible','itempen','itemskip','itemstep','labelmargin','landscape','lastnode','left','legendhskip','legendlinelength',
-            'legendmargin','legendmarkersize','legendmaxrelativewidth','legendvskip','lightblue','lightcyan','lightgray','lightgreen','lightgrey','lightmagenta','lightolive','lightred','lightyellow','line','linemargin','lm_infmsg','lm_shortmsg','longdashdotted','longdashed','magenta','magneticRadius','mantissaBits','markangleradius','markangleradiusfactor','markanglespace','markanglespacefactor','mediumblue','mediumcyan','mediumgray','mediumgreen','mediumgrey','mediummagenta','mediumred','mediumyellow','middle','minDistDefault','minblockheight','minblockwidth','mincirclediameter','minipagemargin','minipagewidth','minvertexangle','miterjoin','mm','momarrowfactor','momarrowlength','momarrowmargin','momarrowoffset','momarrowpen','monoPen','morepoints','nCircle','newbulletcolor','ngraph','nil','nmesh','nobasealign','nodeMarginDefault','nodesystem','nomarker','nopoint','noprimary','nullpath','nullpen','numarray','ocgindex','oldbulletcolor','olive','orange','origin','overpaint','page','pageheight','pagemargin','pagenumberalign','pagenumberpen','pagenumberposition','pagewidth','paleblue','palecyan','palegray','palegreen','palegrey',
-            'palemagenta','palered','paleyellow','parabolanodesnumberfactor','perpfactor','phi','photonamplitude','photonpen','photonratio','pi','pink','plain','plain_bounds','plain_scaling','plus','preamblenodes','pt','purple','r3','r4a','r4b','randMax','realDigits','realEpsilon','realMax','realMin','red','relativesystem','reverse','right','roundcap','roundjoin','royalblue','salmon','saveFunctions','scalarpen','sequencereal','settings','shipped','signedtrailingzero','solid','springgreen','sqrtEpsilon','squarecap','squarepen','startposition','stdin','stdout','stepfactor','stepfraction','steppagenumberpen','stepping','stickframe','stickmarksizefactor','stickmarkspacefactor','swap','textpen','ticksize','tildeframe','tildemarksizefactor','tinv','titlealign','titlepagepen','titlepageposition','titlepen','titleskip','top','trailingzero','treeLevelStep','treeMinNodeWidth','treeNodeStep','trembleAngle','trembleFrequency','trembleRandom','undefined','unitcircle','unitsquare','up','urlpen','urlskip','version','vertexpen','vertexsize','viewportmargin','viewportsize','vline','white','wye','xformStack','yellow','ylabelwidth','zerotickfuzz','zerowinding'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '(', ')', '{', '}', '[', ']'
-            ),
-        1 => array('<', '>','='),
-        2 => array('+', '-', '*', '/', '%'),
-        3 => array('!', '^', '&', '|'),
-        4 => array('?', ':', ';'),
-        5 => array('..')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #990000;',
-            4 => 'color: #009900; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666;',
-            2 => 'color: #339900;',
-            'MULTI' => 'color: #ff0000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #008000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #007788;',
-            2 => 'color: #007788;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;',
-            1 => 'color: #000080;',
-            2 => 'color: #000040;',
-            3 => 'color: #000040;',
-            4 => 'color: #008080;',
-            5 => 'color: #009080;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/autoconf.php b/inc/geshi/autoconf.php
deleted file mode 100644
index 7a0f1ee9c..000000000
--- a/inc/geshi/autoconf.php
+++ /dev/null
@@ -1,512 +0,0 @@
-<?php
-/*************************************************************************************
- * autoconf.php
- * -----
- * Author: Mihai Vasilian (grayasm@gmail.com)
- * Copyright: (c) 2010 Mihai Vasilian
- * Release Version: 1.0.8.11
- * Date Started: 2010/01/25
- *
- * autoconf language file for GeSHi.
- *
- ***********************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Autoconf',
-    'COMMENT_SINGLE' => array(2 => '#'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Single Line comment started by dnl
-        3 => '/(?<!\$)\bdnl\b.*$/m',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'AC_ACT_IFELSE',
-            'AC_AIX',
-            'AC_ALLOCA',
-            'AC_ARG_ARRAY',
-            'AC_ARG_ENABLE',
-            'AC_ARG_PROGRAM',
-            'AC_ARG_VAR',
-            'AC_ARG_WITH',
-            'AC_AUTOCONF_VERSION',
-            'AC_BEFORE',
-            'AC_C_BACKSLASH_A',
-            'AC_C_BIGENDIAN',
-            'AC_C_CHAR_UNSIGNED',
-            'AC_C_CONST',
-            'AC_C_CROSS',
-            'AC_C_FLEXIBLE_ARRAY_MEMBER',
-            'AC_C_INLINE',
-            'AC_C_LONG_DOUBLE',
-            'AC_C_PROTOTYPES',
-            'AC_C_RESTRICT',
-            'AC_C_STRINGIZE',
-            'AC_C_TYPEOF',
-            'AC_C_VARARRAYS',
-            'AC_C_VOLATILE',
-            'AC_CACHE_CHECK',
-            'AC_CACHE_LOAD',
-            'AC_CACHE_SAVE',
-            'AC_CACHE_VAL',
-            'AC_CANONICAL_BUILD',
-            'AC_CANONICAL_HOST',
-            'AC_CANONICAL_SYSTEM',
-            'AC_CANONICAL_TARGET',
-            'AC_CHAR_UNSIGNED',
-            'AC_CHECK_ALIGNOF',
-            'AC_CHECK_DECL',
-            'AC_CHECK_DECLS',
-            'AC_CHECK_DECLS_ONCE',
-            'AC_CHECK_FILE',
-            'AC_CHECK_FILES',
-            'AC_CHECK_FUNC',
-            'AC_CHECK_FUNCS',
-            'AC_CHECK_FUNCS_ONCE',
-            'AC_CHECK_HEADER',
-            'AC_CHECK_HEADERS',
-            'AC_CHECK_HEADERS_ONCE',
-            'AC_CHECK_LIB',
-            'AC_CHECK_MEMBER',
-            'AC_CHECK_MEMBERS',
-            'AC_CHECK_PROG',
-            'AC_CHECK_PROGS',
-            'AC_CHECK_SIZEOF',
-            'AC_CHECK_TARGET_TOOL',
-            'AC_CHECK_TARGET_TOOLS',
-            'AC_CHECK_TOOL',
-            'AC_CHECK_TOOLS',
-            'AC_CHECK_TYPE',
-            'AC_CHECK_TYPES',
-            'AC_CHECKING',
-            'AC_COMPILE_CHECK',
-            'AC_COMPILE_IFELSE',
-            'AC_COMPUTE_INT',
-            'AC_CONFIG_AUX_DIR',
-            'AC_CONFIG_COMMANDS',
-            'AC_CONFIG_COMMANDS_POST',
-            'AC_CONFIG_COMMANDS_PRE',
-            'AC_CONFIG_FILES',
-            'AC_CONFIG_HEADERS',
-            'AC_CONFIG_ITEMS',
-            'AC_CONFIG_LIBOBJ_DIR',
-            'AC_CONFIG_LINKS',
-            'AC_CONFIG_MACRO_DIR',
-            'AC_CONFIG_SRCDIR',
-            'AC_CONFIG_SUBDIRS',
-            'AC_CONFIG_TESTDIR',
-            'AC_CONST',
-            'AC_COPYRIGHT',
-            'AC_CROSS_CHECK',
-            'AC_CYGWIN',
-            'AC_DATAROOTDIR_CHECKED',
-            'AC_DECL_SYS_SIGLIST',
-            'AC_DECL_YYTEXT',
-            'AC_DEFINE',
-            'AC_DEFINE_UNQUOTED',
-            'AC_DEFUN',
-            'AC_DEFUN_ONCE',
-            'AC_DIAGNOSE',
-            'AC_DIR_HEADER',
-            'AC_DISABLE_OPTION_CHECKING',
-            'AC_DYNIX_SEQ',
-            'AC_EGREP_CPP',
-            'AC_EGREP_HEADER',
-            'AC_EMXOS2',
-            'AC_ENABLE',
-            'AC_ERLANG_CHECK_LIB',
-            'AC_ERLANG_NEED_ERL',
-            'AC_ERLANG_NEED_ERLC',
-            'AC_ERLANG_PATH_ERL',
-            'AC_ERLANG_PATH_ERLC',
-            'AC_ERLANG_SUBST_ERTS_VER',
-            'AC_ERLANG_SUBST_INSTALL_LIB_DIR',
-            'AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR',
-            'AC_ERLANG_SUBST_LIB_DIR',
-            'AC_ERLANG_SUBST_ROOT_DIR',
-            'AC_ERROR',
-            'AC_EXEEXT',
-            'AC_F77_DUMMY_MAIN',
-            'AC_F77_FUNC',
-            'AC_F77_LIBRARY_LDFLAGS',
-            'AC_F77_MAIN',
-            'AC_F77_WRAPPERS',
-            'AC_FATAL',
-            'AC_FC_FREEFORM',
-            'AC_FC_FUNC',
-            'AC_FC_LIBRARY_LDFLAGS',
-            'AC_FC_MAIN',
-            'AC_FC_SRCEXT',
-            'AC_FC_WRAPPERS',
-            'AC_FIND_X',
-            'AC_FIND_XTRA',
-            'AC_FOREACH',
-            'AC_FUNC_ALLOCA',
-            'AC_FUNC_CHECK',
-            'AC_FUNC_CHOWN',
-            'AC_FUNC_CLOSEDIR_VOID',
-            'AC_FUNC_ERROR_AT_LINE',
-            'AC_FUNC_FNMATCH',
-            'AC_FUNC_FNMATCH_GNU',
-            'AC_FUNC_FORK',
-            'AC_FUNC_FSEEKO',
-            'AC_FUNC_GETGROUPS',
-            'AC_FUNC_GETLOADAVG',
-            'AC_FUNC_GETMNTENT',
-            'AC_FUNC_GETPGRP',
-            'AC_FUNC_LSTAT',
-            'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK',
-            'AC_FUNC_MALLOC',
-            'AC_FUNC_MBRTOWC',
-            'AC_FUNC_MEMCMP',
-            'AC_FUNC_MKTIME',
-            'AC_FUNC_MMAP',
-            'AC_FUNC_OBSTACK',
-            'AC_FUNC_REALLOC',
-            'AC_FUNC_SELECT_ARGTYPES',
-            'AC_FUNC_SETPGRP',
-            'AC_FUNC_SETVBUF_REVERSED',
-            'AC_FUNC_STAT',
-            'AC_FUNC_STRCOLL',
-            'AC_FUNC_STRERROR_R',
-            'AC_FUNC_STRFTIME',
-            'AC_FUNC_STRNLEN',
-            'AC_FUNC_STRTOD',
-            'AC_FUNC_STRTOLD',
-            'AC_FUNC_UTIME_NULL',
-            'AC_FUNC_VPRINTF',
-            'AC_FUNC_WAIT3',
-            'AC_GCC_TRADITIONAL',
-            'AC_GETGROUPS_T',
-            'AC_GETLOADAVG',
-            'AC_GNU_SOURCE',
-            'AC_HAVE_FUNCS',
-            'AC_HAVE_HEADERS',
-            'AC_HAVE_LIBRARY',
-            'AC_HAVE_POUNDBANG',
-            'AC_HEADER_ASSERT',
-            'AC_HEADER_CHECK',
-            'AC_HEADER_DIRENT',
-            'AC_HEADER_EGREP',
-            'AC_HEADER_MAJOR',
-            'AC_HEADER_RESOLV',
-            'AC_HEADER_STAT',
-            'AC_HEADER_STDBOOL',
-            'AC_HEADER_STDC',
-            'AC_HEADER_SYS_WAIT',
-            'AC_HEADER_TIME',
-            'AC_HEADER_TIOCGWINSZ',
-            'AC_HELP_STRING',
-            'AC_INCLUDES_DEFAULT',
-            'AC_INIT',
-            'AC_INLINE',
-            'AC_INT_16_BITS',
-            'AC_IRIX_SUN',
-            'AC_ISC_POSIX',
-            'AC_LANG_ASSERT',
-            'AC_LANG_C',
-            'AC_LANG_CALL',
-            'AC_LANG_CONFTEST',
-            'AC_LANG_CPLUSPLUS',
-            'AC_LANG_FORTRAN77',
-            'AC_LANG_FUNC_LINK_TRY',
-            'AC_LANG_POP',
-            'AC_LANG_PROGRAM',
-            'AC_LANG_PUSH',
-            'AC_LANG_RESTORE',
-            'AC_LANG_SAVE',
-            'AC_LANG_SOURCE',
-            'AC_LANG_WERROR',
-            'AC_LIBOBJ',
-            'AC_LIBSOURCE',
-            'AC_LIBSOURCES',
-            'AC_LINK_FILES',
-            'AC_LINK_IFELSE',
-            'AC_LN_S',
-            'AC_LONG_64_BITS',
-            'AC_LONG_DOUBLE',
-            'AC_LONG_FILE_NAMES',
-            'AC_MAJOR_HEADER',
-            'AC_MEMORY_H',
-            'AC_MINGW32',
-            'AC_MINIX',
-            'AC_MINUS_C_MINUS_O',
-            'AC_MMAP',
-            'AC_MODE_T',
-            'AC_MSG_CHECKING',
-            'AC_MSG_ERROR',
-            'AC_MSG_FAILURE',
-            'AC_MSG_NOTICE',
-            'AC_MSG_RESULT',
-            'AC_MSG_WARN',
-            'AC_OBJEXT',
-            'AC_OBSOLETE',
-            'AC_OFF_T',
-            'AC_OPENMP',
-            'AC_OUTPUT',
-            'AC_OUTPUT_COMMANDS',
-            'AC_PACKAGE_BUGREPORT',
-            'AC_PACKAGE_NAME',
-            'AC_PACKAGE_STRING',
-            'AC_PACKAGE_TARNAME',
-            'AC_PACKAGE_URL',
-            'AC_PACKAGE_VERSION',
-            'AC_PATH_PROG',
-            'AC_PATH_PROGS',
-            'AC_PATH_PROGS_FEATURE_CHECK',
-            'AC_PATH_TARGET_TOOL',
-            'AC_PATH_TOOL',
-            'AC_PATH_X',
-            'AC_PATH_XTRA',
-            'AC_PID_T',
-            'AC_PREFIX',
-            'AC_PREFIX_DEFAULT',
-            'AC_PREFIX_PROGRAM',
-            'AC_PREPROC_IFELSE',
-            'AC_PREREQ',
-            'AC_PRESERVE_HELP_ORDER',
-            'AC_PROG_AWK',
-            'AC_PROG_CC',
-            'AC_PROG_CC_C89',
-            'AC_PROG_CC_C99',
-            'AC_PROG_CC_C_O',
-            'AC_PROG_CC_STDC',
-            'AC_PROG_CPP',
-            'AC_PROG_CPP_WERROR',
-            'AC_PROG_CXX',
-            'AC_PROG_CXX_C_O',
-            'AC_PROG_CXXCPP',
-            'AC_PROG_EGREP',
-            'AC_PROG_F77',
-            'AC_PROG_F77_C_O',
-            'AC_PROG_FC',
-            'AC_PROG_FC_C_O',
-            'AC_PROG_FGREP',
-            'AC_PROG_GCC_TRADITIONAL',
-            'AC_PROG_GREP',
-            'AC_PROG_INSTALL',
-            'AC_PROG_LEX',
-            'AC_PROG_LN_S',
-            'AC_PROG_MAKE_SET',
-            'AC_PROG_MKDIR_P',
-            'AC_PROG_OBJC',
-            'AC_PROG_OBJCPP',
-            'AC_PROG_OBJCXX',
-            'AC_PROG_OBJCXXCPP',
-            'AC_PROG_RANLIB',
-            'AC_PROG_SED',
-            'AC_PROG_YACC',
-            'AC_PROGRAM_CHECK',
-            'AC_PROGRAM_EGREP',
-            'AC_PROGRAM_PATH',
-            'AC_PROGRAMS_CHECK',
-            'AC_PROGRAMS_PATH',
-            'AC_REMOTE_TAPE',
-            'AC_REPLACE_FNMATCH',
-            'AC_REPLACE_FUNCS',
-            'AC_REQUIRE',
-            'AC_REQUIRE_AUX_FILE',
-            'AC_REQUIRE_CPP',
-            'AC_RESTARTABLE_SYSCALLS',
-            'AC_RETSIGTYPE',
-            'AC_REVISION',
-            'AC_RSH',
-            'AC_RUN_IFELSE',
-            'AC_SCO_INTL',
-            'AC_SEARCH_LIBS',
-            'AC_SET_MAKE',
-            'AC_SETVBUF_REVERSED',
-            'AC_SIZE_T',
-            'AC_SIZEOF_TYPE',
-            'AC_ST_BLKSIZE',
-            'AC_ST_BLOCKS',
-            'AC_ST_RDEV',
-            'AC_STAT_MACROS_BROKEN',
-            'AC_STDC_HEADERS',
-            'AC_STRCOLL',
-            'AC_STRUCT_DIRENT_D_INO',
-            'AC_STRUCT_DIRENT_D_TYPE',
-            'AC_STRUCT_ST_BLKSIZE',
-            'AC_STRUCT_ST_BLOCKS',
-            'AC_STRUCT_ST_RDEV',
-            'AC_STRUCT_TIMEZONE',
-            'AC_STRUCT_TM',
-            'AC_SUBST',
-            'AC_SUBST_FILE',
-            'AC_SYS_INTERPRETER',
-            'AC_SYS_LARGEFILE',
-            'AC_SYS_LONG_FILE_NAMES',
-            'AC_SYS_POSIX_TERMIOS',
-            'AC_SYS_RESTARTABLE_SYSCALLS',
-            'AC_SYS_SIGLIST_DECLARED',
-            'AC_TEST_CPP',
-            'AC_TEST_PROGRAM',
-            'AC_TIME_WITH_SYS_TIME',
-            'AC_TIMEZONE',
-            'AC_TRY_ACT',
-            'AC_TRY_COMPILE',
-            'AC_TRY_CPP',
-            'AC_TRY_LINK',
-            'AC_TRY_LINK_FUNC',
-            'AC_TRY_RUN',
-            'AC_TYPE_GETGROUPS',
-            'AC_TYPE_INT16_T',
-            'AC_TYPE_INT32_T',
-            'AC_TYPE_INT64_T',
-            'AC_TYPE_INT8_T',
-            'AC_TYPE_INTMAX_T',
-            'AC_TYPE_INTPTR_T',
-            'AC_TYPE_LONG_DOUBLE',
-            'AC_TYPE_LONG_DOUBLE_WIDER',
-            'AC_TYPE_LONG_LONG_INT',
-            'AC_TYPE_MBSTATE_T',
-            'AC_TYPE_MODE_T',
-            'AC_TYPE_OFF_T',
-            'AC_TYPE_PID_T',
-            'AC_TYPE_SIGNAL',
-            'AC_TYPE_SIZE_T',
-            'AC_TYPE_SSIZE_T',
-            'AC_TYPE_UID_T',
-            'AC_TYPE_UINT16_T',
-            'AC_TYPE_UINT32_T',
-            'AC_TYPE_UINT64_T',
-            'AC_TYPE_UINT8_T',
-            'AC_TYPE_UINTMAX_T',
-            'AC_TYPE_UINTPTR_T',
-            'AC_TYPE_UNSIGNED_LONG_LONG_INT',
-            'AC_UID_T',
-            'AC_UNISTD_H',
-            'AC_USE_SYSTEM_EXTENSIONS',
-            'AC_USG',
-            'AC_UTIME_NULL',
-            'AC_VALIDATE_CACHED_SYSTEM_TUPLE',
-            'AC_VERBOSE',
-            'AC_VFORK',
-            'AC_VPRINTF',
-            'AC_WAIT3',
-            'AC_WARN',
-            'AC_WARNING',
-            'AC_WITH',
-            'AC_WORDS_BIGENDIAN',
-            'AC_XENIX_DIR',
-            'AC_YYTEXT_POINTER',
-            'AH_BOTTOM',
-            'AH_HEADER',
-            'AH_TEMPLATE',
-            'AH_TOP',
-            'AH_VERBATIM',
-            'AU_ALIAS',
-            'AU_DEFUN'),
-            ),
-    'SYMBOLS' => array('(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`'),
-    'CASE_SENSITIVE' => array(
-            GESHI_COMMENTS => false,
-                1 => true,
-                ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00ffff;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666;',
-            2 => 'color: #339900;',
-            3 => 'color: #666666;',
-            'MULTI' => 'color: #ff0000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;',
-            1 => 'color: #000099;',
-            2 => 'color: #660099;',
-            3 => 'color: #660099;',
-            4 => 'color: #660099;',
-            5 => 'color: #006699;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #008000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #996600;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;',
-            1 => 'color: #000080;',
-            2 => 'color: #000040;',
-            3 => 'color: #000040;',
-            4 => 'color: #008080;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '$'
-            ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#])",
-            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%\\/])"
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/autohotkey.php b/inc/geshi/autohotkey.php
deleted file mode 100644
index 970684daf..000000000
--- a/inc/geshi/autohotkey.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-/*************************************************************************************
- * autohotkey.php
- * --------
- * Author: Naveen Garg (naveen.garg@gmail.com)
- * Copyright: (c) 2009 Naveen Garg and GeSHi
- * Release Version: 1.0.8.11
- * Date Started: 2009/06/11
- *
- * Autohotkey language file for GeSHi.
- *
- * CHANGES
- * -------
- * Release 1.0.8.5 (2009/06/11)
- * - First Release
- *
- * TODO
- * ----
- * Reference: http://www.autohotkey.com/docs/
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Autohotkey',
-    'COMMENT_SINGLE' => array(
-        1 => ';'
-        ),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'while','if','and','or','else','return'
-            ),
-        2 => array(
-            // built in variables
-            'A_AhkPath','A_AhkVersion','A_AppData','A_AppDataCommon',
-            'A_AutoTrim','A_BatchLines','A_CaretX','A_CaretY',
-            'A_ComputerName','A_ControlDelay','A_Cursor','A_DD',
-            'A_DDD','A_DDDD','A_DefaultMouseSpeed','A_Desktop',
-            'A_DesktopCommon','A_DetectHiddenText','A_DetectHiddenWindows','A_EndChar',
-            'A_EventInfo','A_ExitReason','A_FormatFloat','A_FormatInteger',
-            'A_Gui','A_GuiEvent','A_GuiControl','A_GuiControlEvent',
-            'A_GuiHeight','A_GuiWidth','A_GuiX','A_GuiY',
-            'A_Hour','A_IconFile','A_IconHidden','A_IconNumber',
-            'A_IconTip','A_Index','A_IPAddress1','A_IPAddress2',
-            'A_IPAddress3','A_IPAddress4','A_ISAdmin','A_IsCompiled',
-            'A_IsCritical','A_IsPaused','A_IsSuspended','A_KeyDelay',
-            'A_Language','A_LastError','A_LineFile','A_LineNumber',
-            'A_LoopField','A_LoopFileAttrib','A_LoopFileDir','A_LoopFileExt',
-            'A_LoopFileFullPath','A_LoopFileLongPath','A_LoopFileName','A_LoopFileShortName',
-            'A_LoopFileShortPath','A_LoopFileSize','A_LoopFileSizeKB','A_LoopFileSizeMB',
-            'A_LoopFileTimeAccessed','A_LoopFileTimeCreated','A_LoopFileTimeModified','A_LoopReadLine',
-            'A_LoopRegKey','A_LoopRegName','A_LoopRegSubkey','A_LoopRegTimeModified',
-            'A_LoopRegType','A_MDAY','A_Min','A_MM',
-            'A_MMM','A_MMMM','A_Mon','A_MouseDelay',
-            'A_MSec','A_MyDocuments','A_Now','A_NowUTC',
-            'A_NumBatchLines','A_OSType','A_OSVersion','A_PriorHotkey',
-            'A_ProgramFiles','A_Programs','A_ProgramsCommon','A_ScreenHeight',
-            'A_ScreenWidth','A_ScriptDir','A_ScriptFullPath','A_ScriptName',
-            'A_Sec','A_Space','A_StartMenu','A_StartMenuCommon',
-            'A_Startup','A_StartupCommon','A_StringCaseSense','A_Tab',
-            'A_Temp','A_ThisFunc','A_ThisHotkey','A_ThisLabel',
-            'A_ThisMenu','A_ThisMenuItem','A_ThisMenuItemPos','A_TickCount',
-            'A_TimeIdle','A_TimeIdlePhysical','A_TimeSincePriorHotkey','A_TimeSinceThisHotkey',
-            'A_TitleMatchMode','A_TitleMatchModeSpeed','A_UserName','A_WDay',
-            'A_WinDelay','A_WinDir','A_WorkingDir','A_YDay',
-            'A_YEAR','A_YWeek','A_YYYY','Clipboard',
-            'ClipboardAll','ComSpec','ErrorLevel','ProgramFiles',
-            ),
-        3 => array(
-            'AutoTrim',
-            'BlockInput','Break','Click',
-            'ClipWait','Continue','Control',
-            'ControlClick','ControlFocus','ControlGet',
-            'ControlGetFocus','ControlGetPos','ControlGetText',
-            'ControlMove','ControlSend','ControlSendRaw',
-            'ControlSetText','CoordMode','Critical',
-            'DetectHiddenText','DetectHiddenWindows','DllCall','Drive',
-            'DriveGet','DriveSpaceFree',
-            'Else','EnvAdd','EnvDiv',
-            'EnvGet','EnvMult','EnvSet',
-            'EnvSub','EnvUpdate','Exit',
-            'ExitApp','FileAppend','FileCopy',
-            'FileCopyDir','FileCreateDir','FileCreateShortcut',
-            'FileDelete','FileGetAttrib','FileGetShortcut',
-            'FileGetSize','FileGetTime','FileGetVersion',
-            'FileInstall','FileMove','FileMoveDir',
-            'FileRead','FileReadLine','FileRecycle',
-            'FileRecycleEmpty','FileRemoveDir','FileSelectFile',
-            'FileSelectFolder','FileSetAttrib','FileSetTime',
-            'FormatTime','Gosub',
-            'Goto','GroupActivate','GroupAdd',
-            'GroupClose','GroupDeactivate','Gui',
-            'GuiControl','GuiControlGet','Hotkey',
-            'IfExist','IfGreater','IfGreaterOrEqual',
-            'IfInString','IfLess','IfLessOrEqual',
-            'IfMsgBox','IfNotEqual','IfNotExist',
-            'IfNotInString','IfWinActive','IfWinExist',
-            'IfWinNotActive','IfWinNotExist','ImageSearch',
-            'IniDelete','IniRead','IniWrite',
-            'Input','InputBox','KeyHistory',
-            'KeyWait','ListHotkeys','ListLines',
-            'ListVars','Loop',
-            'Menu','MouseClick','MouseClickDrag',
-            'MouseGetPos','MouseMove','MsgBox',
-            'OnMessage','OnExit','OutputDebug',
-            'PixelGetColor','PixelSearch','PostMessage',
-            'Process','Progress','Random',
-            'RegExMatch','RegExReplace','RegisterCallback',
-            'RegDelete','RegRead','RegWrite',
-            'Reload','Repeat','Return',
-            'Run','RunAs','RunWait',
-            'Send','SendEvent','SendInput',
-            'SendMessage','SendMode','SendPlay',
-            'SendRaw','SetBatchLines','SetCapslockState',
-            'SetControlDelay','SetDefaultMouseSpeed','SetEnv',
-            'SetFormat','SetKeyDelay','SetMouseDelay',
-            'SetNumlockState','SetScrollLockState','SetStoreCapslockMode',
-            'SetTimer','SetTitleMatchMode','SetWinDelay',
-            'SetWorkingDir','Shutdown','Sleep',
-            'Sort','SoundBeep','SoundGet',
-            'SoundGetWaveVolume','SoundPlay','SoundSet',
-            'SoundSetWaveVolume','SplashImage','SplashTextOff',
-            'SplashTextOn','SplitPath','StatusBarGetText',
-            'StatusBarWait','StringCaseSense','StringGetPos',
-            'StringLeft','StringLen','StringLower',
-            'StringMid','StringReplace','StringRight',
-            'StringSplit','StringTrimLeft','StringTrimRight',
-            'StringUpper','Suspend','SysGet',
-            'Thread','ToolTip','Transform',
-            'TrayTip','URLDownloadToFile','While',
-            'VarSetCapacity',
-            'WinActivate','WinActivateBottom','WinClose',
-            'WinGet','WinGetActiveStats','WinGetActiveTitle',
-            'WinGetClass','WinGetPos','WinGetText',
-            'WinGetTitle','WinHide','WinKill',
-            'WinMaximize','WinMenuSelectItem','WinMinimize',
-            'WinMinimizeAll','WinMinimizeAllUndo','WinMove',
-            'WinRestore','WinSet','WinSetTitle',
-            'WinShow','WinWait','WinWaitActive',
-            'WinWaitClose','WinWaitNotActive'
-            ),
-        4 => array(
-            'Abs','ACos','Asc','ASin',
-            'ATan','Ceil','Chr','Cos',
-            'Exp','FileExist','Floor',
-            'GetKeyState','IL_Add','IL_Create','IL_Destroy',
-            'InStr','IsFunc','IsLabel','Ln',
-            'Log','LV_Add','LV_Delete','LV_DeleteCol',
-            'LV_GetCount','LV_GetNext','LV_GetText','LV_Insert',
-            'LV_InsertCol','LV_Modify','LV_ModifyCol','LV_SetImageList',
-            'Mod','NumGet','NumPut',
-            'Round',
-            'SB_SetIcon','SB_SetParts','SB_SetText','Sin',
-            'Sqrt','StrLen','SubStr','Tan',
-            'TV_Add','TV_Delete','TV_GetChild','TV_GetCount',
-            'TV_GetNext','TV_Get','TV_GetParent','TV_GetPrev',
-            'TV_GetSelection','TV_GetText','TV_Modify',
-            'WinActive','WinExist'
-            ),
-        5 => array(
-            // #Directives
-            'AllowSameLineComments','ClipboardTimeout','CommentFlag',
-            'ErrorStdOut','EscapeChar','HotkeyInterval',
-            'HotkeyModifierTimeout','Hotstring','IfWinActive',
-            'IfWinExist','IfWinNotActive','IfWinNotExist',
-            'Include','IncludeAgain','InstallKeybdHook',
-            'InstallMouseHook','KeyHistory','LTrim',
-            'MaxHotkeysPerInterval','MaxMem','MaxThreads',
-            'MaxThreadsBuffer','MaxThreadsPerHotkey','NoEnv',
-            'NoTrayIcon','Persistent','SingleInstance',
-            'UseHook','WinActivateForce'
-            ),
-        6 => array(
-            'Shift','LShift','RShift',
-            'Alt','LAlt','RAlt',
-            'LControl','RControl',
-            'Ctrl','LCtrl','RCtrl',
-            'LWin','RWin','AppsKey',
-            'AltDown','AltUp','ShiftDown',
-            'ShiftUp','CtrlDown','CtrlUp',
-            'LWinDown','LWinUp','RWinDown',
-            'RWinUp','LButton','RButton',
-            'MButton','WheelUp','WheelDown',
-            'WheelLeft','WheelRight','XButton1',
-            'XButton2','Joy1','Joy2',
-            'Joy3','Joy4','Joy5',
-            'Joy6','Joy7','Joy8',
-            'Joy9','Joy10','Joy11',
-            'Joy12','Joy13','Joy14',
-            'Joy15','Joy16','Joy17',
-            'Joy18','Joy19','Joy20',
-            'Joy21','Joy22','Joy23',
-            'Joy24','Joy25','Joy26',
-            'Joy27','Joy28','Joy29',
-            'Joy30','Joy31','Joy32',
-            'JoyX','JoyY','JoyZ',
-            'JoyR','JoyU','JoyV',
-            'JoyPOV','JoyName','JoyButtons',
-            'JoyAxes','JoyInfo','Space',
-            'Tab','Enter',
-            'Escape','Esc','BackSpace',
-            'BS','Delete','Del',
-            'Insert','Ins','PGUP',
-            'PGDN','Home','End',
-            'Up','Down','Left',
-            'Right','PrintScreen','CtrlBreak',
-            'Pause','ScrollLock','CapsLock',
-            'NumLock','Numpad0','Numpad1',
-            'Numpad2','Numpad3','Numpad4',
-            'Numpad5','Numpad6','Numpad7',
-            'Numpad8','Numpad9','NumpadMult',
-            'NumpadAdd','NumpadSub','NumpadDiv',
-            'NumpadDot','NumpadDel','NumpadIns',
-            'NumpadClear','NumpadUp','NumpadDown',
-            'NumpadLeft','NumpadRight','NumpadHome',
-            'NumpadEnd','NumpadPgup','NumpadPgdn',
-            'NumpadEnter','F1','F2',
-            'F3','F4','F5',
-            'F6','F7','F8',
-            'F9','F10','F11',
-            'F12','F13','F14',
-            'F15','F16','F17',
-            'F18','F19','F20',
-            'F21','F22','F23',
-            'F24','Browser_Back','Browser_Forward',
-            'Browser_Refresh','Browser_Stop','Browser_Search',
-            'Browser_Favorites','Browser_Home','Volume_Mute',
-            'Volume_Down','Volume_Up','Media_Next',
-            'Media_Prev','Media_Stop','Media_Play_Pause',
-            'Launch_Mail','Launch_Media','Launch_App1',
-            'Launch_App2'
-            ),
-        7 => array(
-            // Gui commands
-            'Add',
-            'Show', 'Submit', 'Cancel', 'Destroy',
-            'Font', 'Color', 'Margin', 'Flash', 'Default',
-            'GuiEscape','GuiClose','GuiSize','GuiContextMenu','GuiDropFilesTabStop',
-            ),
-        8 => array(
-            // Gui Controls
-            'Button',
-            'Checkbox','Radio','DropDownList','DDL',
-            'ComboBox','ListBox','ListView',
-            'Text', 'Edit', 'UpDown', 'Picture',
-            'TreeView','DateTime', 'MonthCal',
-            'Slider'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(',')','[',']',
-        '+','-','*','/','&','^',
-        '=','+=','-=','*=','/=','&=',
-        '==','<','<=','>','>=',':=',
-        ',','.'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #AAAAFF; font-weight: bold;',       // reserved #blue
-            2 => 'color: #88FF88;',                         // BIV yellow
-            3 => 'color: #FF00FF; font-style: italic;',       // commands purple
-            4 => 'color: #888844; font-weight: bold;',       // functions #0080FF
-            5 => 'color: #000000; font-style: italic;',    // directives #black
-            6 => 'color: #FF0000; font-style: italic;',      // hotkeys #red
-            7 => 'color: #000000; font-style: italic;',    // gui commands #black
-            8 => 'color: #000000; font-style: italic;'      // gui controls
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'font-style: italic; color: #669900;',
-            1 => 'font-style: italic; color: #009933;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #00FF00; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'font-weight: bold; color: #008080;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF; font-style: italic; font-weight: italic;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000; font-weight: italic;'
-            ),
-        'REGEXPS' => array(
-            0 => 'font-weight: italic; color: #A00A0;',
-            1 => 'color: #CC0000; font-style: italic;',
-            2 => 'color: #DD0000; font-style: italic;',
-            3 => 'color: #88FF88;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '_'
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => '%[a-zA-Z_][a-zA-Z0-9_]*%',
-        //hotstrings
-        1 => '::[\w\d]+::',
-        //labels
-        2 => '\w[\w\d]+:\s',
-        //Built-in Variables
-        3 => '\bA_\w+\b(?![^<]*>)'
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => 'http://www.autohotkey.com/docs/Variables.htm#{FNAME}',
-        3 => 'http://www.autohotkey.com/docs/commands/{FNAME}.htm',
-        4 => 'http://www.autohotkey.com/docs/Functions.htm#BuiltIn',
-        5 => 'http://www.autohotkey.com/docs/commands/_{FNAME}.htm',
-        6 => '',
-        7 => 'http://www.autohotkey.com/docs/commands/Gui.htm#{FNAME}',
-        8 => 'http://www.autohotkey.com/docs/commands/GuiControls.htm#{FNAME}'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            5 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)\#'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/autoit.php b/inc/geshi/autoit.php
deleted file mode 100644
index ab401b4cd..000000000
--- a/inc/geshi/autoit.php
+++ /dev/null
@@ -1,1175 +0,0 @@
-<?php
-/*************************************************************************************
- * autoit.php
- * --------
- * Author: big_daddy (robert.i.anthony@gmail.com)
- * Copyright: (c) 2006 and to GESHi ;)
- * Release Version: 1.0.8.11
- * Date Started: 2006/01/26
- *
- * AutoIT language file for GeSHi.
- *
- * CHANGES
- * -------
- * Release 1.0.8.1 (2008/09/15)
- * - Updated on 22.03.2008 By Tlem (tlem@tuxolem.fr)
- * - The link on functions will now correctly re-direct to
- * - http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm
- * - Updated whith au3.api (09.02.2008).
- * - Updated - 16 Mai 2008 - v3.2.12.0
- * - Updated - 12 June 2008 - v3.2.12.1
- * Release 1.0.7.20 (2006/01/26)
- * - First Release
- *
- * Current bugs & todo:
- * ----------
- * - not sure how to get sendkeys to work " {!}, {SPACE} etc... "
- * - just copyied the regexp for variable from php so this HAVE to be checked and fixed to a better one ;)
- *
- * Reference: http://www.autoitscript.com/autoit3/docs/
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License,
-or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not,
-write to the Free Software
- *   Foundation,
-Inc.,
-59 Temple Place,
-Suite 330,
-Boston,
-MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'AutoIt',
-    'COMMENT_SINGLE' => array(';'),
-    'COMMENT_MULTI' => array(
-        '#comments-start' => '#comments-end',
-        '#cs' => '#ce'),
-    'COMMENT_REGEXP' => array(
-        0 => '/(?<!#)#(\s.*)?$/m',
-        1 => '/(?<=include)\s+<.*?>/'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'And','ByRef','Case','Const','ContinueCase','ContinueLoop',
-            'Default','Dim','Do','Else','ElseIf','EndFunc','EndIf','EndSelect',
-            'EndSwitch','EndWith','Enum','Exit','ExitLoop','False','For','Func',
-            'Global','If','In','Local','Next','Not','Or','ReDim','Return',
-            'Select','Step','Switch','Then','To','True','Until','WEnd','While',
-            'With'
-            ),
-        2 => array(
-            '@AppDataCommonDir','@AppDataDir','@AutoItExe','@AutoItPID',
-            '@AutoItUnicode','@AutoItVersion','@AutoItX64','@COM_EventObj',
-            '@CommonFilesDir','@Compiled','@ComputerName','@ComSpec','@CR',
-            '@CRLF','@DesktopCommonDir','@DesktopDepth','@DesktopDir',
-            '@DesktopHeight','@DesktopRefresh','@DesktopWidth',
-            '@DocumentsCommonDir','@error','@exitCode','@exitMethod',
-            '@extended','@FavoritesCommonDir','@FavoritesDir','@GUI_CtrlHandle',
-            '@GUI_CtrlId','@GUI_DragFile','@GUI_DragId','@GUI_DropId',
-            '@GUI_WinHandle','@HomeDrive','@HomePath','@HomeShare',
-            '@HotKeyPressed','@HOUR','@InetGetActive','@InetGetBytesRead',
-            '@IPAddress1','@IPAddress2','@IPAddress3','@IPAddress4','@KBLayout',
-            '@LF','@LogonDNSDomain','@LogonDomain','@LogonServer','@MDAY',
-            '@MIN','@MON','@MyDocumentsDir','@NumParams','@OSBuild','@OSLang',
-            '@OSServicePack','@OSTYPE','@OSVersion','@ProcessorArch',
-            '@ProgramFilesDir','@ProgramsCommonDir','@ProgramsDir','@ScriptDir',
-            '@ScriptFullPath','@ScriptLineNumber','@ScriptName','@SEC',
-            '@StartMenuCommonDir','@StartMenuDir','@StartupCommonDir',
-            '@StartupDir','@SW_DISABLE','@SW_ENABLE','@SW_HIDE','@SW_LOCK',
-            '@SW_MAXIMIZE','@SW_MINIMIZE','@SW_RESTORE','@SW_SHOW',
-            '@SW_SHOWDEFAULT','@SW_SHOWMAXIMIZED','@SW_SHOWMINIMIZED',
-            '@SW_SHOWMINNOACTIVE','@SW_SHOWNA','@SW_SHOWNOACTIVATE',
-            '@SW_SHOWNORMAL','@SW_UNLOCK','@SystemDir','@TAB','@TempDir',
-            '@TRAY_ID','@TrayIconFlashing','@TrayIconVisible','@UserName',
-            '@UserProfileDir','@WDAY','@WindowsDir','@WorkingDir','@YDAY',
-            '@YEAR'
-            ),
-        3 => array(
-            'Abs','ACos','AdlibDisable','AdlibEnable','Asc','AscW','ASin',
-            'Assign','ATan','AutoItSetOption','AutoItWinGetTitle',
-            'AutoItWinSetTitle','Beep','Binary','BinaryLen','BinaryMid',
-            'BinaryToString','BitAND','BitNOT','BitOR','BitRotate','BitShift',
-            'BitXOR','BlockInput','Break','Call','CDTray','Ceiling','Chr',
-            'ChrW','ClipGet','ClipPut','ConsoleRead','ConsoleWrite',
-            'ConsoleWriteError','ControlClick','ControlCommand',
-            'ControlDisable','ControlEnable','ControlFocus','ControlGetFocus',
-            'ControlGetHandle','ControlGetPos','ControlGetText','ControlHide',
-            'ControlListView','ControlMove','ControlSend','ControlSetText',
-            'ControlShow','ControlTreeView','Cos','Dec','DirCopy','DirCreate',
-            'DirGetSize','DirMove','DirRemove','DllCall','DllCallbackFree',
-            'DllCallbackGetPtr','DllCallbackRegister','DllClose','DllOpen',
-            'DllStructCreate','DllStructGetData','DllStructGetPtr',
-            'DllStructGetSize','DllStructSetData','DriveGetDrive',
-            'DriveGetFileSystem','DriveGetLabel','DriveGetSerial',
-            'DriveGetType','DriveMapAdd','DriveMapDel','DriveMapGet',
-            'DriveSetLabel','DriveSpaceFree','DriveSpaceTotal','DriveStatus',
-            'EnvGet','EnvSet','EnvUpdate','Eval','Execute','Exp',
-            'FileChangeDir','FileClose','FileCopy','FileCreateNTFSLink',
-            'FileCreateShortcut','FileDelete','FileExists','FileFindFirstFile',
-            'FileFindNextFile','FileGetAttrib','FileGetLongName',
-            'FileGetShortcut','FileGetShortName','FileGetSize','FileGetTime',
-            'FileGetVersion','FileInstall','FileMove','FileOpen',
-            'FileOpenDialog','FileRead','FileReadLine','FileRecycle',
-            'FileRecycleEmpty','FileSaveDialog','FileSelectFolder',
-            'FileSetAttrib','FileSetTime','FileWrite','FileWriteLine','Floor',
-            'FtpSetProxy','GUICreate','GUICtrlCreateAvi','GUICtrlCreateButton',
-            'GUICtrlCreateCheckbox','GUICtrlCreateCombo',
-            'GUICtrlCreateContextMenu','GUICtrlCreateDate','GUICtrlCreateDummy',
-            'GUICtrlCreateEdit','GUICtrlCreateGraphic','GUICtrlCreateGroup',
-            'GUICtrlCreateIcon','GUICtrlCreateInput','GUICtrlCreateLabel',
-            'GUICtrlCreateList','GUICtrlCreateListView',
-            'GUICtrlCreateListViewItem','GUICtrlCreateMenu',
-            'GUICtrlCreateMenuItem','GUICtrlCreateMonthCal','GUICtrlCreateObj',
-            'GUICtrlCreatePic','GUICtrlCreateProgress','GUICtrlCreateRadio',
-            'GUICtrlCreateSlider','GUICtrlCreateTab','GUICtrlCreateTabItem',
-            'GUICtrlCreateTreeView','GUICtrlCreateTreeViewItem',
-            'GUICtrlCreateUpdown','GUICtrlDelete','GUICtrlGetHandle',
-            'GUICtrlGetState','GUICtrlRead','GUICtrlRecvMsg',
-            'GUICtrlRegisterListViewSort','GUICtrlSendMsg','GUICtrlSendToDummy',
-            'GUICtrlSetBkColor','GUICtrlSetColor','GUICtrlSetCursor',
-            'GUICtrlSetData','GUICtrlSetFont','GUICtrlSetDefColor',
-            'GUICtrlSetDefBkColor','GUICtrlSetGraphic','GUICtrlSetImage',
-            'GUICtrlSetLimit','GUICtrlSetOnEvent','GUICtrlSetPos',
-            'GUICtrlSetResizing','GUICtrlSetState','GUICtrlSetStyle',
-            'GUICtrlSetTip','GUIDelete','GUIGetCursorInfo','GUIGetMsg',
-            'GUIGetStyle','GUIRegisterMsg','GUISetAccelerators()',
-            'GUISetBkColor','GUISetCoord','GUISetCursor','GUISetFont',
-            'GUISetHelp','GUISetIcon','GUISetOnEvent','GUISetState',
-            'GUISetStyle','GUIStartGroup','GUISwitch','Hex','HotKeySet',
-            'HttpSetProxy','HWnd','InetGet','InetGetSize','IniDelete','IniRead',
-            'IniReadSection','IniReadSectionNames','IniRenameSection',
-            'IniWrite','IniWriteSection','InputBox','Int','IsAdmin','IsArray',
-            'IsBinary','IsBool','IsDeclared','IsDllStruct','IsFloat','IsHWnd',
-            'IsInt','IsKeyword','IsNumber','IsObj','IsPtr','IsString','Log',
-            'MemGetStats','Mod','MouseClick','MouseClickDrag','MouseDown',
-            'MouseGetCursor','MouseGetPos','MouseMove','MouseUp','MouseWheel',
-            'MsgBox','Number','ObjCreate','ObjEvent','ObjGet','ObjName','Opt',
-            'Ping','PixelChecksum','PixelGetColor','PixelSearch','PluginClose',
-            'PluginOpen','ProcessClose','ProcessExists','ProcessGetStats',
-            'ProcessList','ProcessSetPriority','ProcessWait','ProcessWaitClose',
-            'ProgressOff','ProgressOn','ProgressSet','Ptr','Random','RegDelete',
-            'RegEnumKey','RegEnumVal','RegRead','RegWrite','Round','Run',
-            'RunAs','RunAsWait','RunWait','Send','SendKeepActive','SetError',
-            'SetExtended','ShellExecute','ShellExecuteWait','Shutdown','Sin',
-            'Sleep','SoundPlay','SoundSetWaveVolume','SplashImageOn',
-            'SplashOff','SplashTextOn','Sqrt','SRandom','StatusbarGetText',
-            'StderrRead','StdinWrite','StdioClose','StdoutRead','String',
-            'StringAddCR','StringCompare','StringFormat','StringInStr',
-            'StringIsAlNum','StringIsAlpha','StringIsASCII','StringIsDigit',
-            'StringIsFloat','StringIsInt','StringIsLower','StringIsSpace',
-            'StringIsUpper','StringIsXDigit','StringLeft','StringLen',
-            'StringLower','StringMid','StringRegExp','StringRegExpReplace',
-            'StringReplace','StringRight','StringSplit','StringStripCR',
-            'StringStripWS','StringToBinary','StringTrimLeft','StringTrimRight',
-            'StringUpper','Tan','TCPAccept','TCPCloseSocket','TCPConnect',
-            'TCPListen','TCPNameToIP','TCPRecv','TCPSend','TCPShutdown',
-            'TCPStartup','TimerDiff','TimerInit','ToolTip','TrayCreateItem',
-            'TrayCreateMenu','TrayGetMsg','TrayItemDelete','TrayItemGetHandle',
-            'TrayItemGetState','TrayItemGetText','TrayItemSetOnEvent',
-            'TrayItemSetState','TrayItemSetText','TraySetClick','TraySetIcon',
-            'TraySetOnEvent','TraySetPauseIcon','TraySetState','TraySetToolTip',
-            'TrayTip','UBound','UDPBind','UDPCloseSocket','UDPOpen','UDPRecv',
-            'UDPSend','UDPShutdown','UDPStartup','VarGetType','WinActivate',
-            'WinActive','WinClose','WinExists','WinFlash','WinGetCaretPos',
-            'WinGetClassList','WinGetClientSize','WinGetHandle','WinGetPos',
-            'WinGetProcess','WinGetState','WinGetText','WinGetTitle','WinKill',
-            'WinList','WinMenuSelectItem','WinMinimizeAll','WinMinimizeAllUndo',
-            'WinMove','WinSetOnTop','WinSetState','WinSetTitle','WinSetTrans',
-            'WinWait','WinWaitActive','WinWaitClose','WinWaitNotActive'
-            ),
-        4 => array(
-            'ArrayAdd','ArrayBinarySearch','ArrayConcatenate','ArrayDelete',
-            'ArrayDisplay','ArrayFindAll','ArrayInsert','ArrayMax',
-            'ArrayMaxIndex','ArrayMin','ArrayMinIndex','ArrayPop','ArrayPush',
-            'ArrayReverse','ArraySearch','ArraySort','ArraySwap','ArrayToClip',
-            'ArrayToString','ArrayTrim','ChooseColor','ChooseFont',
-            'ClipBoard_ChangeChain','ClipBoard_Close','ClipBoard_CountFormats',
-            'ClipBoard_Empty','ClipBoard_EnumFormats','ClipBoard_FormatStr',
-            'ClipBoard_GetData','ClipBoard_GetDataEx','ClipBoard_GetFormatName',
-            'ClipBoard_GetOpenWindow','ClipBoard_GetOwner',
-            'ClipBoard_GetPriorityFormat','ClipBoard_GetSequenceNumber',
-            'ClipBoard_GetViewer','ClipBoard_IsFormatAvailable',
-            'ClipBoard_Open','ClipBoard_RegisterFormat','ClipBoard_SetData',
-            'ClipBoard_SetDataEx','ClipBoard_SetViewer','ClipPutFile',
-            'ColorConvertHSLtoRGB','ColorConvertRGBtoHSL','ColorGetBlue',
-            'ColorGetGreen','ColorGetRed','Date_Time_CompareFileTime',
-            'Date_Time_DOSDateTimeToArray','Date_Time_DOSDateTimeToFileTime',
-            'Date_Time_DOSDateTimeToStr','Date_Time_DOSDateToArray',
-            'Date_Time_DOSDateToStr','Date_Time_DOSTimeToArray',
-            'Date_Time_DOSTimeToStr','Date_Time_EncodeFileTime',
-            'Date_Time_EncodeSystemTime','Date_Time_FileTimeToArray',
-            'Date_Time_FileTimeToDOSDateTime',
-            'Date_Time_FileTimeToLocalFileTime','Date_Time_FileTimeToStr',
-            'Date_Time_FileTimeToSystemTime','Date_Time_GetFileTime',
-            'Date_Time_GetLocalTime','Date_Time_GetSystemTime',
-            'Date_Time_GetSystemTimeAdjustment',
-            'Date_Time_GetSystemTimeAsFileTime',
-            'Date_Time_GetSystemTimes','Date_Time_GetTickCount',
-            'Date_Time_GetTimeZoneInformation',
-            'Date_Time_LocalFileTimeToFileTime','Date_Time_SetFileTime',
-            'Date_Time_SetLocalTime','Date_Time_SetSystemTime',
-            'Date_Time_SetSystemTimeAdjustment',
-            'Date_Time_SetTimeZoneInformation','Date_Time_SystemTimeToArray',
-            'Date_Time_SystemTimeToDateStr','Date_Time_SystemTimeToDateTimeStr',
-            'Date_Time_SystemTimeToFileTime','Date_Time_SystemTimeToTimeStr',
-            'Date_Time_SystemTimeToTzSpecificLocalTime',
-            'Date_Time_TzSpecificLocalTimeToSystemTime','DateAdd',
-            'DateDayOfWeek','DateDaysInMonth','DateDiff','DateIsLeapYear',
-            'DateIsValid','DateTimeFormat','DateTimeSplit','DateToDayOfWeek',
-            'DateToDayOfWeekISO','DateToDayValue','DateToMonth',
-            'DayValueToDate','DebugBugReportEnv','DebugOut','DebugSetup',
-            'Degree','EventLog__Backup','EventLog__Clear','EventLog__Close',
-            'EventLog__Count','EventLog__DeregisterSource','EventLog__Full',
-            'EventLog__Notify','EventLog__Oldest','EventLog__Open',
-            'EventLog__OpenBackup','EventLog__Read','EventLog__RegisterSource',
-            'EventLog__Report','FileCountLines','FileCreate','FileListToArray',
-            'FilePrint','FileReadToArray','FileWriteFromArray',
-            'FileWriteLog','FileWriteToLine','GDIPlus_ArrowCapCreate',
-            'GDIPlus_ArrowCapDispose','GDIPlus_ArrowCapGetFillState',
-            'GDIPlus_ArrowCapGetHeight','GDIPlus_ArrowCapGetMiddleInset',
-            'GDIPlus_ArrowCapGetWidth','GDIPlus_ArrowCapSetFillState',
-            'GDIPlus_ArrowCapSetHeight','GDIPlus_ArrowCapSetMiddleInset',
-            'GDIPlus_ArrowCapSetWidth','GDIPlus_BitmapCloneArea',
-            'GDIPlus_BitmapCreateFromFile','GDIPlus_BitmapCreateFromGraphics',
-            'GDIPlus_BitmapCreateFromHBITMAP',
-            'GDIPlus_BitmapCreateHBITMAPFromBitmap','GDIPlus_BitmapDispose',
-            'GDIPlus_BitmapLockBits','GDIPlus_BitmapUnlockBits',
-            'GDIPlus_BrushClone','GDIPlus_BrushCreateSolid',
-            'GDIPlus_BrushDispose','GDIPlus_BrushGetType',
-            'GDIPlus_CustomLineCapDispose','GDIPlus_Decoders',
-            'GDIPlus_DecodersGetCount','GDIPlus_DecodersGetSize',
-            'GDIPlus_Encoders','GDIPlus_EncodersGetCLSID',
-            'GDIPlus_EncodersGetCount','GDIPlus_EncodersGetParamList',
-            'GDIPlus_EncodersGetParamListSize','GDIPlus_EncodersGetSize',
-            'GDIPlus_FontCreate','GDIPlus_FontDispose',
-            'GDIPlus_FontFamilyCreate','GDIPlus_FontFamilyDispose',
-            'GDIPlus_GraphicsClear','GDIPlus_GraphicsCreateFromHDC',
-            'GDIPlus_GraphicsCreateFromHWND','GDIPlus_GraphicsDispose',
-            'GDIPlus_GraphicsDrawArc','GDIPlus_GraphicsDrawBezier',
-            'GDIPlus_GraphicsDrawClosedCurve','GDIPlus_GraphicsDrawCurve',
-            'GDIPlus_GraphicsDrawEllipse','GDIPlus_GraphicsDrawImage',
-            'GDIPlus_GraphicsDrawImageRect','GDIPlus_GraphicsDrawImageRectRect',
-            'GDIPlus_GraphicsDrawLine','GDIPlus_GraphicsDrawPie',
-            'GDIPlus_GraphicsDrawPolygon','GDIPlus_GraphicsDrawRect',
-            'GDIPlus_GraphicsDrawString','GDIPlus_GraphicsDrawStringEx',
-            'GDIPlus_GraphicsFillClosedCurve','GDIPlus_GraphicsFillEllipse',
-            'GDIPlus_GraphicsFillPie','GDIPlus_GraphicsFillRect',
-            'GDIPlus_GraphicsGetDC','GDIPlus_GraphicsGetSmoothingMode',
-            'GDIPlus_GraphicsMeasureString','GDIPlus_GraphicsReleaseDC',
-            'GDIPlus_GraphicsSetSmoothingMode','GDIPlus_GraphicsSetTransform',
-            'GDIPlus_ImageDispose','GDIPlus_ImageGetGraphicsContext',
-            'GDIPlus_ImageGetHeight','GDIPlus_ImageGetWidth',
-            'GDIPlus_ImageLoadFromFile','GDIPlus_ImageSaveToFile',
-            'GDIPlus_ImageSaveToFileEx','GDIPlus_MatrixCreate',
-            'GDIPlus_MatrixDispose','GDIPlus_MatrixRotate','GDIPlus_ParamAdd',
-            'GDIPlus_ParamInit','GDIPlus_PenCreate','GDIPlus_PenDispose',
-            'GDIPlus_PenGetAlignment','GDIPlus_PenGetColor',
-            'GDIPlus_PenGetCustomEndCap','GDIPlus_PenGetDashCap',
-            'GDIPlus_PenGetDashStyle','GDIPlus_PenGetEndCap',
-            'GDIPlus_PenGetWidth','GDIPlus_PenSetAlignment',
-            'GDIPlus_PenSetColor','GDIPlus_PenSetCustomEndCap',
-            'GDIPlus_PenSetDashCap','GDIPlus_PenSetDashStyle',
-            'GDIPlus_PenSetEndCap','GDIPlus_PenSetWidth','GDIPlus_RectFCreate',
-            'GDIPlus_Shutdown','GDIPlus_Startup','GDIPlus_StringFormatCreate',
-            'GDIPlus_StringFormatDispose','GetIP','GUICtrlAVI_Close',
-            'GUICtrlAVI_Create','GUICtrlAVI_Destroy','GUICtrlAVI_Open',
-            'GUICtrlAVI_OpenEx','GUICtrlAVI_Play','GUICtrlAVI_Seek',
-            'GUICtrlAVI_Show','GUICtrlAVI_Stop','GUICtrlButton_Click',
-            'GUICtrlButton_Create','GUICtrlButton_Destroy',
-            'GUICtrlButton_Enable','GUICtrlButton_GetCheck',
-            'GUICtrlButton_GetFocus','GUICtrlButton_GetIdealSize',
-            'GUICtrlButton_GetImage','GUICtrlButton_GetImageList',
-            'GUICtrlButton_GetState','GUICtrlButton_GetText',
-            'GUICtrlButton_GetTextMargin','GUICtrlButton_SetCheck',
-            'GUICtrlButton_SetFocus','GUICtrlButton_SetImage',
-            'GUICtrlButton_SetImageList','GUICtrlButton_SetSize',
-            'GUICtrlButton_SetState','GUICtrlButton_SetStyle',
-            'GUICtrlButton_SetText','GUICtrlButton_SetTextMargin',
-            'GUICtrlButton_Show','GUICtrlComboBox_AddDir',
-            'GUICtrlComboBox_AddString','GUICtrlComboBox_AutoComplete',
-            'GUICtrlComboBox_BeginUpdate','GUICtrlComboBox_Create',
-            'GUICtrlComboBox_DeleteString','GUICtrlComboBox_Destroy',
-            'GUICtrlComboBox_EndUpdate','GUICtrlComboBox_FindString',
-            'GUICtrlComboBox_FindStringExact','GUICtrlComboBox_GetComboBoxInfo',
-            'GUICtrlComboBox_GetCount','GUICtrlComboBox_GetCurSel',
-            'GUICtrlComboBox_GetDroppedControlRect',
-            'GUICtrlComboBox_GetDroppedControlRectEx',
-            'GUICtrlComboBox_GetDroppedState','GUICtrlComboBox_GetDroppedWidth',
-            'GUICtrlComboBox_GetEditSel','GUICtrlComboBox_GetEditText',
-            'GUICtrlComboBox_GetExtendedUI',
-            'GUICtrlComboBox_GetHorizontalExtent',
-            'GUICtrlComboBox_GetItemHeight','GUICtrlComboBox_GetLBText',
-            'GUICtrlComboBox_GetLBTextLen','GUICtrlComboBox_GetList',
-            'GUICtrlComboBox_GetListArray','GUICtrlComboBox_GetLocale',
-            'GUICtrlComboBox_GetLocaleCountry','GUICtrlComboBox_GetLocaleLang',
-            'GUICtrlComboBox_GetLocalePrimLang',
-            'GUICtrlComboBox_GetLocaleSubLang','GUICtrlComboBox_GetMinVisible',
-            'GUICtrlComboBox_GetTopIndex','GUICtrlComboBox_InitStorage',
-            'GUICtrlComboBox_InsertString','GUICtrlComboBox_LimitText',
-            'GUICtrlComboBox_ReplaceEditSel','GUICtrlComboBox_ResetContent',
-            'GUICtrlComboBox_SelectString','GUICtrlComboBox_SetCurSel',
-            'GUICtrlComboBox_SetDroppedWidth','GUICtrlComboBox_SetEditSel',
-            'GUICtrlComboBox_SetEditText','GUICtrlComboBox_SetExtendedUI',
-            'GUICtrlComboBox_SetHorizontalExtent',
-            'GUICtrlComboBox_SetItemHeight','GUICtrlComboBox_SetMinVisible',
-            'GUICtrlComboBox_SetTopIndex','GUICtrlComboBox_ShowDropDown',
-            'GUICtrlComboBoxEx_AddDir','GUICtrlComboBoxEx_AddString',
-            'GUICtrlComboBoxEx_BeginUpdate','GUICtrlComboBoxEx_Create',
-            'GUICtrlComboBoxEx_CreateSolidBitMap',
-            'GUICtrlComboBoxEx_DeleteString','GUICtrlComboBoxEx_Destroy',
-            'GUICtrlComboBoxEx_EndUpdate','GUICtrlComboBoxEx_FindStringExact',
-            'GUICtrlComboBoxEx_GetComboBoxInfo',
-            'GUICtrlComboBoxEx_GetComboControl','GUICtrlComboBoxEx_GetCount',
-            'GUICtrlComboBoxEx_GetCurSel',
-            'GUICtrlComboBoxEx_GetDroppedControlRect',
-            'GUICtrlComboBoxEx_GetDroppedControlRectEx',
-            'GUICtrlComboBoxEx_GetDroppedState',
-            'GUICtrlComboBoxEx_GetDroppedWidth',
-            'GUICtrlComboBoxEx_GetEditControl','GUICtrlComboBoxEx_GetEditSel',
-            'GUICtrlComboBoxEx_GetEditText',
-            'GUICtrlComboBoxEx_GetExtendedStyle',
-            'GUICtrlComboBoxEx_GetExtendedUI','GUICtrlComboBoxEx_GetImageList',
-            'GUICtrlComboBoxEx_GetItem','GUICtrlComboBoxEx_GetItemEx',
-            'GUICtrlComboBoxEx_GetItemHeight','GUICtrlComboBoxEx_GetItemImage',
-            'GUICtrlComboBoxEx_GetItemIndent',
-            'GUICtrlComboBoxEx_GetItemOverlayImage',
-            'GUICtrlComboBoxEx_GetItemParam',
-            'GUICtrlComboBoxEx_GetItemSelectedImage',
-            'GUICtrlComboBoxEx_GetItemText','GUICtrlComboBoxEx_GetItemTextLen',
-            'GUICtrlComboBoxEx_GetList','GUICtrlComboBoxEx_GetListArray',
-            'GUICtrlComboBoxEx_GetLocale','GUICtrlComboBoxEx_GetLocaleCountry',
-            'GUICtrlComboBoxEx_GetLocaleLang',
-            'GUICtrlComboBoxEx_GetLocalePrimLang',
-            'GUICtrlComboBoxEx_GetLocaleSubLang',
-            'GUICtrlComboBoxEx_GetMinVisible','GUICtrlComboBoxEx_GetTopIndex',
-            'GUICtrlComboBoxEx_InitStorage','GUICtrlComboBoxEx_InsertString',
-            'GUICtrlComboBoxEx_LimitText','GUICtrlComboBoxEx_ReplaceEditSel',
-            'GUICtrlComboBoxEx_ResetContent','GUICtrlComboBoxEx_SetCurSel',
-            'GUICtrlComboBoxEx_SetDroppedWidth','GUICtrlComboBoxEx_SetEditSel',
-            'GUICtrlComboBoxEx_SetEditText',
-            'GUICtrlComboBoxEx_SetExtendedStyle',
-            'GUICtrlComboBoxEx_SetExtendedUI','GUICtrlComboBoxEx_SetImageList',
-            'GUICtrlComboBoxEx_SetItem','GUICtrlComboBoxEx_SetItemEx',
-            'GUICtrlComboBoxEx_SetItemHeight','GUICtrlComboBoxEx_SetItemImage',
-            'GUICtrlComboBoxEx_SetItemIndent',
-            'GUICtrlComboBoxEx_SetItemOverlayImage',
-            'GUICtrlComboBoxEx_SetItemParam',
-            'GUICtrlComboBoxEx_SetItemSelectedImage',
-            'GUICtrlComboBoxEx_SetMinVisible','GUICtrlComboBoxEx_SetTopIndex',
-            'GUICtrlComboBoxEx_ShowDropDown','GUICtrlDTP_Create',
-            'GUICtrlDTP_Destroy','GUICtrlDTP_GetMCColor','GUICtrlDTP_GetMCFont',
-            'GUICtrlDTP_GetMonthCal','GUICtrlDTP_GetRange',
-            'GUICtrlDTP_GetRangeEx','GUICtrlDTP_GetSystemTime',
-            'GUICtrlDTP_GetSystemTimeEx','GUICtrlDTP_SetFormat',
-            'GUICtrlDTP_SetMCColor','GUICtrlDTP_SetMCFont',
-            'GUICtrlDTP_SetRange','GUICtrlDTP_SetRangeEx',
-            'GUICtrlDTP_SetSystemTime','GUICtrlDTP_SetSystemTimeEx',
-            'GUICtrlEdit_AppendText','GUICtrlEdit_BeginUpdate',
-            'GUICtrlEdit_CanUndo','GUICtrlEdit_CharFromPos',
-            'GUICtrlEdit_Create','GUICtrlEdit_Destroy',
-            'GUICtrlEdit_EmptyUndoBuffer','GUICtrlEdit_EndUpdate',
-            'GUICtrlEdit_Find','GUICtrlEdit_FmtLines',
-            'GUICtrlEdit_GetFirstVisibleLine','GUICtrlEdit_GetLimitText',
-            'GUICtrlEdit_GetLine','GUICtrlEdit_GetLineCount',
-            'GUICtrlEdit_GetMargins','GUICtrlEdit_GetModify',
-            'GUICtrlEdit_GetPasswordChar','GUICtrlEdit_GetRECT',
-            'GUICtrlEdit_GetRECTEx','GUICtrlEdit_GetSel','GUICtrlEdit_GetText',
-            'GUICtrlEdit_GetTextLen','GUICtrlEdit_HideBalloonTip',
-            'GUICtrlEdit_InsertText','GUICtrlEdit_LineFromChar',
-            'GUICtrlEdit_LineIndex','GUICtrlEdit_LineLength',
-            'GUICtrlEdit_LineScroll','GUICtrlEdit_PosFromChar',
-            'GUICtrlEdit_ReplaceSel','GUICtrlEdit_Scroll',
-            'GUICtrlEdit_SetLimitText','GUICtrlEdit_SetMargins',
-            'GUICtrlEdit_SetModify','GUICtrlEdit_SetPasswordChar',
-            'GUICtrlEdit_SetReadOnly','GUICtrlEdit_SetRECT',
-            'GUICtrlEdit_SetRECTEx','GUICtrlEdit_SetRECTNP',
-            'GUICtrlEdit_SetRectNPEx','GUICtrlEdit_SetSel',
-            'GUICtrlEdit_SetTabStops','GUICtrlEdit_SetText',
-            'GUICtrlEdit_ShowBalloonTip','GUICtrlEdit_Undo',
-            'GUICtrlHeader_AddItem','GUICtrlHeader_ClearFilter',
-            'GUICtrlHeader_ClearFilterAll','GUICtrlHeader_Create',
-            'GUICtrlHeader_CreateDragImage','GUICtrlHeader_DeleteItem',
-            'GUICtrlHeader_Destroy','GUICtrlHeader_EditFilter',
-            'GUICtrlHeader_GetBitmapMargin','GUICtrlHeader_GetImageList',
-            'GUICtrlHeader_GetItem','GUICtrlHeader_GetItemAlign',
-            'GUICtrlHeader_GetItemBitmap','GUICtrlHeader_GetItemCount',
-            'GUICtrlHeader_GetItemDisplay','GUICtrlHeader_GetItemFlags',
-            'GUICtrlHeader_GetItemFormat','GUICtrlHeader_GetItemImage',
-            'GUICtrlHeader_GetItemOrder','GUICtrlHeader_GetItemParam',
-            'GUICtrlHeader_GetItemRect','GUICtrlHeader_GetItemRectEx',
-            'GUICtrlHeader_GetItemText','GUICtrlHeader_GetItemWidth',
-            'GUICtrlHeader_GetOrderArray','GUICtrlHeader_GetUnicodeFormat',
-            'GUICtrlHeader_HitTest','GUICtrlHeader_InsertItem',
-            'GUICtrlHeader_Layout','GUICtrlHeader_OrderToIndex',
-            'GUICtrlHeader_SetBitmapMargin',
-            'GUICtrlHeader_SetFilterChangeTimeout',
-            'GUICtrlHeader_SetHotDivider','GUICtrlHeader_SetImageList',
-            'GUICtrlHeader_SetItem','GUICtrlHeader_SetItemAlign',
-            'GUICtrlHeader_SetItemBitmap','GUICtrlHeader_SetItemDisplay',
-            'GUICtrlHeader_SetItemFlags','GUICtrlHeader_SetItemFormat',
-            'GUICtrlHeader_SetItemImage','GUICtrlHeader_SetItemOrder',
-            'GUICtrlHeader_SetItemParam','GUICtrlHeader_SetItemText',
-            'GUICtrlHeader_SetItemWidth','GUICtrlHeader_SetOrderArray',
-            'GUICtrlHeader_SetUnicodeFormat','GUICtrlIpAddress_ClearAddress',
-            'GUICtrlIpAddress_Create','GUICtrlIpAddress_Destroy',
-            'GUICtrlIpAddress_Get','GUICtrlIpAddress_GetArray',
-            'GUICtrlIpAddress_GetEx','GUICtrlIpAddress_IsBlank',
-            'GUICtrlIpAddress_Set','GUICtrlIpAddress_SetArray',
-            'GUICtrlIpAddress_SetEx','GUICtrlIpAddress_SetFocus',
-            'GUICtrlIpAddress_SetFont','GUICtrlIpAddress_SetRange',
-            'GUICtrlIpAddress_ShowHide','GUICtrlListBox_AddFile',
-            'GUICtrlListBox_AddString','GUICtrlListBox_BeginUpdate',
-            'GUICtrlListBox_Create','GUICtrlListBox_DeleteString',
-            'GUICtrlListBox_Destroy','GUICtrlListBox_Dir',
-            'GUICtrlListBox_EndUpdate','GUICtrlListBox_FindInText',
-            'GUICtrlListBox_FindString','GUICtrlListBox_GetAnchorIndex',
-            'GUICtrlListBox_GetCaretIndex','GUICtrlListBox_GetCount',
-            'GUICtrlListBox_GetCurSel','GUICtrlListBox_GetHorizontalExtent',
-            'GUICtrlListBox_GetItemData','GUICtrlListBox_GetItemHeight',
-            'GUICtrlListBox_GetItemRect','GUICtrlListBox_GetItemRectEx',
-            'GUICtrlListBox_GetListBoxInfo','GUICtrlListBox_GetLocale',
-            'GUICtrlListBox_GetLocaleCountry','GUICtrlListBox_GetLocaleLang',
-            'GUICtrlListBox_GetLocalePrimLang',
-            'GUICtrlListBox_GetLocaleSubLang','GUICtrlListBox_GetSel',
-            'GUICtrlListBox_GetSelCount','GUICtrlListBox_GetSelItems',
-            'GUICtrlListBox_GetSelItemsText','GUICtrlListBox_GetText',
-            'GUICtrlListBox_GetTextLen','GUICtrlListBox_GetTopIndex',
-            'GUICtrlListBox_InitStorage','GUICtrlListBox_InsertString',
-            'GUICtrlListBox_ItemFromPoint','GUICtrlListBox_ReplaceString',
-            'GUICtrlListBox_ResetContent','GUICtrlListBox_SelectString',
-            'GUICtrlListBox_SelItemRange','GUICtrlListBox_SelItemRangeEx',
-            'GUICtrlListBox_SetAnchorIndex','GUICtrlListBox_SetCaretIndex',
-            'GUICtrlListBox_SetColumnWidth','GUICtrlListBox_SetCurSel',
-            'GUICtrlListBox_SetHorizontalExtent','GUICtrlListBox_SetItemData',
-            'GUICtrlListBox_SetItemHeight','GUICtrlListBox_SetLocale',
-            'GUICtrlListBox_SetSel','GUICtrlListBox_SetTabStops',
-            'GUICtrlListBox_SetTopIndex','GUICtrlListBox_Sort',
-            'GUICtrlListBox_SwapString','GUICtrlListBox_UpdateHScroll',
-            'GUICtrlListView_AddArray','GUICtrlListView_AddColumn',
-            'GUICtrlListView_AddItem','GUICtrlListView_AddSubItem',
-            'GUICtrlListView_ApproximateViewHeight',
-            'GUICtrlListView_ApproximateViewRect',
-            'GUICtrlListView_ApproximateViewWidth','GUICtrlListView_Arrange',
-            'GUICtrlListView_BeginUpdate','GUICtrlListView_CancelEditLabel',
-            'GUICtrlListView_ClickItem','GUICtrlListView_CopyItems',
-            'GUICtrlListView_Create','GUICtrlListView_CreateDragImage',
-            'GUICtrlListView_CreateSolidBitMap',
-            'GUICtrlListView_DeleteAllItems','GUICtrlListView_DeleteColumn',
-            'GUICtrlListView_DeleteItem','GUICtrlListView_DeleteItemsSelected',
-            'GUICtrlListView_Destroy','GUICtrlListView_DrawDragImage',
-            'GUICtrlListView_EditLabel','GUICtrlListView_EnableGroupView',
-            'GUICtrlListView_EndUpdate','GUICtrlListView_EnsureVisible',
-            'GUICtrlListView_FindInText','GUICtrlListView_FindItem',
-            'GUICtrlListView_FindNearest','GUICtrlListView_FindParam',
-            'GUICtrlListView_FindText','GUICtrlListView_GetBkColor',
-            'GUICtrlListView_GetBkImage','GUICtrlListView_GetCallbackMask',
-            'GUICtrlListView_GetColumn','GUICtrlListView_GetColumnCount',
-            'GUICtrlListView_GetColumnOrder',
-            'GUICtrlListView_GetColumnOrderArray',
-            'GUICtrlListView_GetColumnWidth','GUICtrlListView_GetCounterPage',
-            'GUICtrlListView_GetEditControl',
-            'GUICtrlListView_GetExtendedListViewStyle',
-            'GUICtrlListView_GetGroupInfo',
-            'GUICtrlListView_GetGroupViewEnabled','GUICtrlListView_GetHeader',
-            'GUICtrlListView_GetHotCursor','GUICtrlListView_GetHotItem',
-            'GUICtrlListView_GetHoverTime','GUICtrlListView_GetImageList',
-            'GUICtrlListView_GetISearchString','GUICtrlListView_GetItem',
-            'GUICtrlListView_GetItemChecked','GUICtrlListView_GetItemCount',
-            'GUICtrlListView_GetItemCut','GUICtrlListView_GetItemDropHilited',
-            'GUICtrlListView_GetItemEx','GUICtrlListView_GetItemFocused',
-            'GUICtrlListView_GetItemGroupID','GUICtrlListView_GetItemImage',
-            'GUICtrlListView_GetItemIndent','GUICtrlListView_GetItemParam',
-            'GUICtrlListView_GetItemPosition',
-            'GUICtrlListView_GetItemPositionX',
-            'GUICtrlListView_GetItemPositionY','GUICtrlListView_GetItemRect',
-            'GUICtrlListView_GetItemRectEx','GUICtrlListView_GetItemSelected',
-            'GUICtrlListView_GetItemSpacing','GUICtrlListView_GetItemSpacingX',
-            'GUICtrlListView_GetItemSpacingY','GUICtrlListView_GetItemState',
-            'GUICtrlListView_GetItemStateImage','GUICtrlListView_GetItemText',
-            'GUICtrlListView_GetItemTextArray',
-            'GUICtrlListView_GetItemTextString','GUICtrlListView_GetNextItem',
-            'GUICtrlListView_GetNumberOfWorkAreas','GUICtrlListView_GetOrigin',
-            'GUICtrlListView_GetOriginX','GUICtrlListView_GetOriginY',
-            'GUICtrlListView_GetOutlineColor',
-            'GUICtrlListView_GetSelectedColumn',
-            'GUICtrlListView_GetSelectedCount',
-            'GUICtrlListView_GetSelectedIndices',
-            'GUICtrlListView_GetSelectionMark','GUICtrlListView_GetStringWidth',
-            'GUICtrlListView_GetSubItemRect','GUICtrlListView_GetTextBkColor',
-            'GUICtrlListView_GetTextColor','GUICtrlListView_GetToolTips',
-            'GUICtrlListView_GetTopIndex','GUICtrlListView_GetUnicodeFormat',
-            'GUICtrlListView_GetView','GUICtrlListView_GetViewDetails',
-            'GUICtrlListView_GetViewLarge','GUICtrlListView_GetViewList',
-            'GUICtrlListView_GetViewRect','GUICtrlListView_GetViewSmall',
-            'GUICtrlListView_GetViewTile','GUICtrlListView_HideColumn',
-            'GUICtrlListView_HitTest','GUICtrlListView_InsertColumn',
-            'GUICtrlListView_InsertGroup','GUICtrlListView_InsertItem',
-            'GUICtrlListView_JustifyColumn','GUICtrlListView_MapIDToIndex',
-            'GUICtrlListView_MapIndexToID','GUICtrlListView_RedrawItems',
-            'GUICtrlListView_RegisterSortCallBack',
-            'GUICtrlListView_RemoveAllGroups','GUICtrlListView_RemoveGroup',
-            'GUICtrlListView_Scroll','GUICtrlListView_SetBkColor',
-            'GUICtrlListView_SetBkImage','GUICtrlListView_SetCallBackMask',
-            'GUICtrlListView_SetColumn','GUICtrlListView_SetColumnOrder',
-            'GUICtrlListView_SetColumnOrderArray',
-            'GUICtrlListView_SetColumnWidth',
-            'GUICtrlListView_SetExtendedListViewStyle',
-            'GUICtrlListView_SetGroupInfo','GUICtrlListView_SetHotItem',
-            'GUICtrlListView_SetHoverTime','GUICtrlListView_SetIconSpacing',
-            'GUICtrlListView_SetImageList','GUICtrlListView_SetItem',
-            'GUICtrlListView_SetItemChecked','GUICtrlListView_SetItemCount',
-            'GUICtrlListView_SetItemCut','GUICtrlListView_SetItemDropHilited',
-            'GUICtrlListView_SetItemEx','GUICtrlListView_SetItemFocused',
-            'GUICtrlListView_SetItemGroupID','GUICtrlListView_SetItemImage',
-            'GUICtrlListView_SetItemIndent','GUICtrlListView_SetItemParam',
-            'GUICtrlListView_SetItemPosition',
-            'GUICtrlListView_SetItemPosition32',
-            'GUICtrlListView_SetItemSelected','GUICtrlListView_SetItemState',
-            'GUICtrlListView_SetItemStateImage','GUICtrlListView_SetItemText',
-            'GUICtrlListView_SetOutlineColor',
-            'GUICtrlListView_SetSelectedColumn',
-            'GUICtrlListView_SetSelectionMark','GUICtrlListView_SetTextBkColor',
-            'GUICtrlListView_SetTextColor','GUICtrlListView_SetToolTips',
-            'GUICtrlListView_SetUnicodeFormat','GUICtrlListView_SetView',
-            'GUICtrlListView_SetWorkAreas','GUICtrlListView_SimpleSort',
-            'GUICtrlListView_SortItems','GUICtrlListView_SubItemHitTest',
-            'GUICtrlListView_UnRegisterSortCallBack',
-            'GUICtrlMenu_AddMenuItem','GUICtrlMenu_AppendMenu',
-            'GUICtrlMenu_CheckMenuItem','GUICtrlMenu_CheckRadioItem',
-            'GUICtrlMenu_CreateMenu','GUICtrlMenu_CreatePopup',
-            'GUICtrlMenu_DeleteMenu','GUICtrlMenu_DestroyMenu',
-            'GUICtrlMenu_DrawMenuBar','GUICtrlMenu_EnableMenuItem',
-            'GUICtrlMenu_FindItem','GUICtrlMenu_FindParent',
-            'GUICtrlMenu_GetItemBmp','GUICtrlMenu_GetItemBmpChecked',
-            'GUICtrlMenu_GetItemBmpUnchecked','GUICtrlMenu_GetItemChecked',
-            'GUICtrlMenu_GetItemCount','GUICtrlMenu_GetItemData',
-            'GUICtrlMenu_GetItemDefault','GUICtrlMenu_GetItemDisabled',
-            'GUICtrlMenu_GetItemEnabled','GUICtrlMenu_GetItemGrayed',
-            'GUICtrlMenu_GetItemHighlighted','GUICtrlMenu_GetItemID',
-            'GUICtrlMenu_GetItemInfo','GUICtrlMenu_GetItemRect',
-            'GUICtrlMenu_GetItemRectEx','GUICtrlMenu_GetItemState',
-            'GUICtrlMenu_GetItemStateEx','GUICtrlMenu_GetItemSubMenu',
-            'GUICtrlMenu_GetItemText','GUICtrlMenu_GetItemType',
-            'GUICtrlMenu_GetMenu','GUICtrlMenu_GetMenuBackground',
-            'GUICtrlMenu_GetMenuBarInfo','GUICtrlMenu_GetMenuContextHelpID',
-            'GUICtrlMenu_GetMenuData','GUICtrlMenu_GetMenuDefaultItem',
-            'GUICtrlMenu_GetMenuHeight','GUICtrlMenu_GetMenuInfo',
-            'GUICtrlMenu_GetMenuStyle','GUICtrlMenu_GetSystemMenu',
-            'GUICtrlMenu_InsertMenuItem','GUICtrlMenu_InsertMenuItemEx',
-            'GUICtrlMenu_IsMenu','GUICtrlMenu_LoadMenu',
-            'GUICtrlMenu_MapAccelerator','GUICtrlMenu_MenuItemFromPoint',
-            'GUICtrlMenu_RemoveMenu','GUICtrlMenu_SetItemBitmaps',
-            'GUICtrlMenu_SetItemBmp','GUICtrlMenu_SetItemBmpChecked',
-            'GUICtrlMenu_SetItemBmpUnchecked','GUICtrlMenu_SetItemChecked',
-            'GUICtrlMenu_SetItemData','GUICtrlMenu_SetItemDefault',
-            'GUICtrlMenu_SetItemDisabled','GUICtrlMenu_SetItemEnabled',
-            'GUICtrlMenu_SetItemGrayed','GUICtrlMenu_SetItemHighlighted',
-            'GUICtrlMenu_SetItemID','GUICtrlMenu_SetItemInfo',
-            'GUICtrlMenu_SetItemState','GUICtrlMenu_SetItemSubMenu',
-            'GUICtrlMenu_SetItemText','GUICtrlMenu_SetItemType',
-            'GUICtrlMenu_SetMenu','GUICtrlMenu_SetMenuBackground',
-            'GUICtrlMenu_SetMenuContextHelpID','GUICtrlMenu_SetMenuData',
-            'GUICtrlMenu_SetMenuDefaultItem','GUICtrlMenu_SetMenuHeight',
-            'GUICtrlMenu_SetMenuInfo','GUICtrlMenu_SetMenuStyle',
-            'GUICtrlMenu_TrackPopupMenu','GUICtrlMonthCal_Create',
-            'GUICtrlMonthCal_Destroy','GUICtrlMonthCal_GetColor',
-            'GUICtrlMonthCal_GetColorArray','GUICtrlMonthCal_GetCurSel',
-            'GUICtrlMonthCal_GetCurSelStr','GUICtrlMonthCal_GetFirstDOW',
-            'GUICtrlMonthCal_GetFirstDOWStr','GUICtrlMonthCal_GetMaxSelCount',
-            'GUICtrlMonthCal_GetMaxTodayWidth',
-            'GUICtrlMonthCal_GetMinReqHeight','GUICtrlMonthCal_GetMinReqRect',
-            'GUICtrlMonthCal_GetMinReqRectArray',
-            'GUICtrlMonthCal_GetMinReqWidth','GUICtrlMonthCal_GetMonthDelta',
-            'GUICtrlMonthCal_GetMonthRange','GUICtrlMonthCal_GetMonthRangeMax',
-            'GUICtrlMonthCal_GetMonthRangeMaxStr',
-            'GUICtrlMonthCal_GetMonthRangeMin',
-            'GUICtrlMonthCal_GetMonthRangeMinStr',
-            'GUICtrlMonthCal_GetMonthRangeSpan','GUICtrlMonthCal_GetRange',
-            'GUICtrlMonthCal_GetRangeMax','GUICtrlMonthCal_GetRangeMaxStr',
-            'GUICtrlMonthCal_GetRangeMin','GUICtrlMonthCal_GetRangeMinStr',
-            'GUICtrlMonthCal_GetSelRange','GUICtrlMonthCal_GetSelRangeMax',
-            'GUICtrlMonthCal_GetSelRangeMaxStr',
-            'GUICtrlMonthCal_GetSelRangeMin',
-            'GUICtrlMonthCal_GetSelRangeMinStr','GUICtrlMonthCal_GetToday',
-            'GUICtrlMonthCal_GetTodayStr','GUICtrlMonthCal_GetUnicodeFormat',
-            'GUICtrlMonthCal_HitTest','GUICtrlMonthCal_SetColor',
-            'GUICtrlMonthCal_SetCurSel','GUICtrlMonthCal_SetDayState',
-            'GUICtrlMonthCal_SetFirstDOW','GUICtrlMonthCal_SetMaxSelCount',
-            'GUICtrlMonthCal_SetMonthDelta','GUICtrlMonthCal_SetRange',
-            'GUICtrlMonthCal_SetSelRange','GUICtrlMonthCal_SetToday',
-            'GUICtrlMonthCal_SetUnicodeFormat','GUICtrlRebar_AddBand',
-            'GUICtrlRebar_AddToolBarBand','GUICtrlRebar_BeginDrag',
-            'GUICtrlRebar_Create','GUICtrlRebar_DeleteBand',
-            'GUICtrlRebar_Destroy','GUICtrlRebar_DragMove',
-            'GUICtrlRebar_EndDrag','GUICtrlRebar_GetBandBackColor',
-            'GUICtrlRebar_GetBandBorders','GUICtrlRebar_GetBandBordersEx',
-            'GUICtrlRebar_GetBandChildHandle','GUICtrlRebar_GetBandChildSize',
-            'GUICtrlRebar_GetBandCount','GUICtrlRebar_GetBandForeColor',
-            'GUICtrlRebar_GetBandHeaderSize','GUICtrlRebar_GetBandID',
-            'GUICtrlRebar_GetBandIdealSize','GUICtrlRebar_GetBandLength',
-            'GUICtrlRebar_GetBandLParam','GUICtrlRebar_GetBandMargins',
-            'GUICtrlRebar_GetBandMarginsEx','GUICtrlRebar_GetBandRect',
-            'GUICtrlRebar_GetBandRectEx','GUICtrlRebar_GetBandStyle',
-            'GUICtrlRebar_GetBandStyleBreak',
-            'GUICtrlRebar_GetBandStyleChildEdge',
-            'GUICtrlRebar_GetBandStyleFixedBMP',
-            'GUICtrlRebar_GetBandStyleFixedSize',
-            'GUICtrlRebar_GetBandStyleGripperAlways',
-            'GUICtrlRebar_GetBandStyleHidden',
-            'GUICtrlRebar_GetBandStyleHideTitle',
-            'GUICtrlRebar_GetBandStyleNoGripper',
-            'GUICtrlRebar_GetBandStyleTopAlign',
-            'GUICtrlRebar_GetBandStyleUseChevron',
-            'GUICtrlRebar_GetBandStyleVariableHeight',
-            'GUICtrlRebar_GetBandText','GUICtrlRebar_GetBarHeight',
-            'GUICtrlRebar_GetBKColor','GUICtrlRebar_GetColorScheme',
-            'GUICtrlRebar_GetRowCount','GUICtrlRebar_GetRowHeight',
-            'GUICtrlRebar_GetTextColor','GUICtrlRebar_GetToolTips',
-            'GUICtrlRebar_GetUnicodeFormat','GUICtrlRebar_HitTest',
-            'GUICtrlRebar_IDToIndex','GUICtrlRebar_MaximizeBand',
-            'GUICtrlRebar_MinimizeBand','GUICtrlRebar_MoveBand',
-            'GUICtrlRebar_SetBandBackColor','GUICtrlRebar_SetBandForeColor',
-            'GUICtrlRebar_SetBandHeaderSize','GUICtrlRebar_SetBandID',
-            'GUICtrlRebar_SetBandIdealSize','GUICtrlRebar_SetBandLength',
-            'GUICtrlRebar_SetBandLParam','GUICtrlRebar_SetBandStyle',
-            'GUICtrlRebar_SetBandStyleBreak',
-            'GUICtrlRebar_SetBandStyleChildEdge',
-            'GUICtrlRebar_SetBandStyleFixedBMP',
-            'GUICtrlRebar_SetBandStyleFixedSize',
-            'GUICtrlRebar_SetBandStyleGripperAlways',
-            'GUICtrlRebar_SetBandStyleHidden',
-            'GUICtrlRebar_SetBandStyleHideTitle',
-            'GUICtrlRebar_SetBandStyleNoGripper',
-            'GUICtrlRebar_SetBandStyleTopAlign',
-            'GUICtrlRebar_SetBandStyleUseChevron',
-            'GUICtrlRebar_SetBandStyleVariableHeight',
-            'GUICtrlRebar_SetBandText','GUICtrlRebar_SetBKColor',
-            'GUICtrlRebar_SetColorScheme','GUICtrlRebar_SetTextColor',
-            'GUICtrlRebar_SetToolTips','GUICtrlRebar_SetUnicodeFormat',
-            'GUICtrlRebar_ShowBand','GUICtrlSlider_ClearSel',
-            'GUICtrlSlider_ClearTics','GUICtrlSlider_Create',
-            'GUICtrlSlider_Destroy','GUICtrlSlider_GetBuddy',
-            'GUICtrlSlider_GetChannelRect','GUICtrlSlider_GetLineSize',
-            'GUICtrlSlider_GetNumTics','GUICtrlSlider_GetPageSize',
-            'GUICtrlSlider_GetPos','GUICtrlSlider_GetPTics',
-            'GUICtrlSlider_GetRange','GUICtrlSlider_GetRangeMax',
-            'GUICtrlSlider_GetRangeMin','GUICtrlSlider_GetSel',
-            'GUICtrlSlider_GetSelEnd','GUICtrlSlider_GetSelStart',
-            'GUICtrlSlider_GetThumbLength','GUICtrlSlider_GetThumbRect',
-            'GUICtrlSlider_GetThumbRectEx','GUICtrlSlider_GetTic',
-            'GUICtrlSlider_GetTicPos','GUICtrlSlider_GetToolTips',
-            'GUICtrlSlider_GetUnicodeFormat','GUICtrlSlider_SetBuddy',
-            'GUICtrlSlider_SetLineSize','GUICtrlSlider_SetPageSize',
-            'GUICtrlSlider_SetPos','GUICtrlSlider_SetRange',
-            'GUICtrlSlider_SetRangeMax','GUICtrlSlider_SetRangeMin',
-            'GUICtrlSlider_SetSel','GUICtrlSlider_SetSelEnd',
-            'GUICtrlSlider_SetSelStart','GUICtrlSlider_SetThumbLength',
-            'GUICtrlSlider_SetTic','GUICtrlSlider_SetTicFreq',
-            'GUICtrlSlider_SetTipSide','GUICtrlSlider_SetToolTips',
-            'GUICtrlSlider_SetUnicodeFormat','GUICtrlStatusBar_Create',
-            'GUICtrlStatusBar_Destroy','GUICtrlStatusBar_EmbedControl',
-            'GUICtrlStatusBar_GetBorders','GUICtrlStatusBar_GetBordersHorz',
-            'GUICtrlStatusBar_GetBordersRect','GUICtrlStatusBar_GetBordersVert',
-            'GUICtrlStatusBar_GetCount','GUICtrlStatusBar_GetHeight',
-            'GUICtrlStatusBar_GetIcon','GUICtrlStatusBar_GetParts',
-            'GUICtrlStatusBar_GetRect','GUICtrlStatusBar_GetRectEx',
-            'GUICtrlStatusBar_GetText','GUICtrlStatusBar_GetTextFlags',
-            'GUICtrlStatusBar_GetTextLength','GUICtrlStatusBar_GetTextLengthEx',
-            'GUICtrlStatusBar_GetTipText','GUICtrlStatusBar_GetUnicodeFormat',
-            'GUICtrlStatusBar_GetWidth','GUICtrlStatusBar_IsSimple',
-            'GUICtrlStatusBar_Resize','GUICtrlStatusBar_SetBkColor',
-            'GUICtrlStatusBar_SetIcon','GUICtrlStatusBar_SetMinHeight',
-            'GUICtrlStatusBar_SetParts','GUICtrlStatusBar_SetSimple',
-            'GUICtrlStatusBar_SetText','GUICtrlStatusBar_SetTipText',
-            'GUICtrlStatusBar_SetUnicodeFormat','GUICtrlStatusBar_ShowHide',
-            'GUICtrlTab_Create','GUICtrlTab_DeleteAllItems',
-            'GUICtrlTab_DeleteItem','GUICtrlTab_DeselectAll',
-            'GUICtrlTab_Destroy','GUICtrlTab_FindTab','GUICtrlTab_GetCurFocus',
-            'GUICtrlTab_GetCurSel','GUICtrlTab_GetDisplayRect',
-            'GUICtrlTab_GetDisplayRectEx','GUICtrlTab_GetExtendedStyle',
-            'GUICtrlTab_GetImageList','GUICtrlTab_GetItem',
-            'GUICtrlTab_GetItemCount','GUICtrlTab_GetItemImage',
-            'GUICtrlTab_GetItemParam','GUICtrlTab_GetItemRect',
-            'GUICtrlTab_GetItemRectEx','GUICtrlTab_GetItemState',
-            'GUICtrlTab_GetItemText','GUICtrlTab_GetRowCount',
-            'GUICtrlTab_GetToolTips','GUICtrlTab_GetUnicodeFormat',
-            'GUICtrlTab_HighlightItem','GUICtrlTab_HitTest',
-            'GUICtrlTab_InsertItem','GUICtrlTab_RemoveImage',
-            'GUICtrlTab_SetCurFocus','GUICtrlTab_SetCurSel',
-            'GUICtrlTab_SetExtendedStyle','GUICtrlTab_SetImageList',
-            'GUICtrlTab_SetItem','GUICtrlTab_SetItemImage',
-            'GUICtrlTab_SetItemParam','GUICtrlTab_SetItemSize',
-            'GUICtrlTab_SetItemState','GUICtrlTab_SetItemText',
-            'GUICtrlTab_SetMinTabWidth','GUICtrlTab_SetPadding',
-            'GUICtrlTab_SetToolTips','GUICtrlTab_SetUnicodeFormat',
-            'GUICtrlToolbar_AddBitmap','GUICtrlToolbar_AddButton',
-            'GUICtrlToolbar_AddButtonSep','GUICtrlToolbar_AddString',
-            'GUICtrlToolbar_ButtonCount','GUICtrlToolbar_CheckButton',
-            'GUICtrlToolbar_ClickAccel','GUICtrlToolbar_ClickButton',
-            'GUICtrlToolbar_ClickIndex','GUICtrlToolbar_CommandToIndex',
-            'GUICtrlToolbar_Create','GUICtrlToolbar_Customize',
-            'GUICtrlToolbar_DeleteButton','GUICtrlToolbar_Destroy',
-            'GUICtrlToolbar_EnableButton','GUICtrlToolbar_FindToolbar',
-            'GUICtrlToolbar_GetAnchorHighlight','GUICtrlToolbar_GetBitmapFlags',
-            'GUICtrlToolbar_GetButtonBitmap','GUICtrlToolbar_GetButtonInfo',
-            'GUICtrlToolbar_GetButtonInfoEx','GUICtrlToolbar_GetButtonParam',
-            'GUICtrlToolbar_GetButtonRect','GUICtrlToolbar_GetButtonRectEx',
-            'GUICtrlToolbar_GetButtonSize','GUICtrlToolbar_GetButtonState',
-            'GUICtrlToolbar_GetButtonStyle','GUICtrlToolbar_GetButtonText',
-            'GUICtrlToolbar_GetColorScheme',
-            'GUICtrlToolbar_GetDisabledImageList',
-            'GUICtrlToolbar_GetExtendedStyle','GUICtrlToolbar_GetHotImageList',
-            'GUICtrlToolbar_GetHotItem','GUICtrlToolbar_GetImageList',
-            'GUICtrlToolbar_GetInsertMark','GUICtrlToolbar_GetInsertMarkColor',
-            'GUICtrlToolbar_GetMaxSize','GUICtrlToolbar_GetMetrics',
-            'GUICtrlToolbar_GetPadding','GUICtrlToolbar_GetRows',
-            'GUICtrlToolbar_GetString','GUICtrlToolbar_GetStyle',
-            'GUICtrlToolbar_GetStyleAltDrag',
-            'GUICtrlToolbar_GetStyleCustomErase','GUICtrlToolbar_GetStyleFlat',
-            'GUICtrlToolbar_GetStyleList','GUICtrlToolbar_GetStyleRegisterDrop',
-            'GUICtrlToolbar_GetStyleToolTips',
-            'GUICtrlToolbar_GetStyleTransparent',
-            'GUICtrlToolbar_GetStyleWrapable','GUICtrlToolbar_GetTextRows',
-            'GUICtrlToolbar_GetToolTips','GUICtrlToolbar_GetUnicodeFormat',
-            'GUICtrlToolbar_HideButton','GUICtrlToolbar_HighlightButton',
-            'GUICtrlToolbar_HitTest','GUICtrlToolbar_IndexToCommand',
-            'GUICtrlToolbar_InsertButton','GUICtrlToolbar_InsertMarkHitTest',
-            'GUICtrlToolbar_IsButtonChecked','GUICtrlToolbar_IsButtonEnabled',
-            'GUICtrlToolbar_IsButtonHidden',
-            'GUICtrlToolbar_IsButtonHighlighted',
-            'GUICtrlToolbar_IsButtonIndeterminate',
-            'GUICtrlToolbar_IsButtonPressed','GUICtrlToolbar_LoadBitmap',
-            'GUICtrlToolbar_LoadImages','GUICtrlToolbar_MapAccelerator',
-            'GUICtrlToolbar_MoveButton','GUICtrlToolbar_PressButton',
-            'GUICtrlToolbar_SetAnchorHighlight','GUICtrlToolbar_SetBitmapSize',
-            'GUICtrlToolbar_SetButtonBitMap','GUICtrlToolbar_SetButtonInfo',
-            'GUICtrlToolbar_SetButtonInfoEx','GUICtrlToolbar_SetButtonParam',
-            'GUICtrlToolbar_SetButtonSize','GUICtrlToolbar_SetButtonState',
-            'GUICtrlToolbar_SetButtonStyle','GUICtrlToolbar_SetButtonText',
-            'GUICtrlToolbar_SetButtonWidth','GUICtrlToolbar_SetCmdID',
-            'GUICtrlToolbar_SetColorScheme',
-            'GUICtrlToolbar_SetDisabledImageList',
-            'GUICtrlToolbar_SetDrawTextFlags','GUICtrlToolbar_SetExtendedStyle',
-            'GUICtrlToolbar_SetHotImageList','GUICtrlToolbar_SetHotItem',
-            'GUICtrlToolbar_SetImageList','GUICtrlToolbar_SetIndent',
-            'GUICtrlToolbar_SetIndeterminate','GUICtrlToolbar_SetInsertMark',
-            'GUICtrlToolbar_SetInsertMarkColor','GUICtrlToolbar_SetMaxTextRows',
-            'GUICtrlToolbar_SetMetrics','GUICtrlToolbar_SetPadding',
-            'GUICtrlToolbar_SetParent','GUICtrlToolbar_SetRows',
-            'GUICtrlToolbar_SetStyle','GUICtrlToolbar_SetStyleAltDrag',
-            'GUICtrlToolbar_SetStyleCustomErase','GUICtrlToolbar_SetStyleFlat',
-            'GUICtrlToolbar_SetStyleList','GUICtrlToolbar_SetStyleRegisterDrop',
-            'GUICtrlToolbar_SetStyleToolTips',
-            'GUICtrlToolbar_SetStyleTransparent',
-            'GUICtrlToolbar_SetStyleWrapable','GUICtrlToolbar_SetToolTips',
-            'GUICtrlToolbar_SetUnicodeFormat','GUICtrlToolbar_SetWindowTheme',
-            'GUICtrlTreeView_Add','GUICtrlTreeView_AddChild',
-            'GUICtrlTreeView_AddChildFirst','GUICtrlTreeView_AddFirst',
-            'GUICtrlTreeView_BeginUpdate','GUICtrlTreeView_ClickItem',
-            'GUICtrlTreeView_Create','GUICtrlTreeView_CreateDragImage',
-            'GUICtrlTreeView_CreateSolidBitMap','GUICtrlTreeView_Delete',
-            'GUICtrlTreeView_DeleteAll','GUICtrlTreeView_DeleteChildren',
-            'GUICtrlTreeView_Destroy','GUICtrlTreeView_DisplayRect',
-            'GUICtrlTreeView_DisplayRectEx','GUICtrlTreeView_EditText',
-            'GUICtrlTreeView_EndEdit','GUICtrlTreeView_EndUpdate',
-            'GUICtrlTreeView_EnsureVisible','GUICtrlTreeView_Expand',
-            'GUICtrlTreeView_ExpandedOnce','GUICtrlTreeView_FindItem',
-            'GUICtrlTreeView_FindItemEx','GUICtrlTreeView_GetBkColor',
-            'GUICtrlTreeView_GetBold','GUICtrlTreeView_GetChecked',
-            'GUICtrlTreeView_GetChildCount','GUICtrlTreeView_GetChildren',
-            'GUICtrlTreeView_GetCount','GUICtrlTreeView_GetCut',
-            'GUICtrlTreeView_GetDropTarget','GUICtrlTreeView_GetEditControl',
-            'GUICtrlTreeView_GetExpanded','GUICtrlTreeView_GetFirstChild',
-            'GUICtrlTreeView_GetFirstItem','GUICtrlTreeView_GetFirstVisible',
-            'GUICtrlTreeView_GetFocused','GUICtrlTreeView_GetHeight',
-            'GUICtrlTreeView_GetImageIndex',
-            'GUICtrlTreeView_GetImageListIconHandle',
-            'GUICtrlTreeView_GetIndent','GUICtrlTreeView_GetInsertMarkColor',
-            'GUICtrlTreeView_GetISearchString','GUICtrlTreeView_GetItemByIndex',
-            'GUICtrlTreeView_GetItemHandle','GUICtrlTreeView_GetItemParam',
-            'GUICtrlTreeView_GetLastChild','GUICtrlTreeView_GetLineColor',
-            'GUICtrlTreeView_GetNext','GUICtrlTreeView_GetNextChild',
-            'GUICtrlTreeView_GetNextSibling','GUICtrlTreeView_GetNextVisible',
-            'GUICtrlTreeView_GetNormalImageList',
-            'GUICtrlTreeView_GetParentHandle','GUICtrlTreeView_GetParentParam',
-            'GUICtrlTreeView_GetPrev','GUICtrlTreeView_GetPrevChild',
-            'GUICtrlTreeView_GetPrevSibling','GUICtrlTreeView_GetPrevVisible',
-            'GUICtrlTreeView_GetScrollTime','GUICtrlTreeView_GetSelected',
-            'GUICtrlTreeView_GetSelectedImageIndex',
-            'GUICtrlTreeView_GetSelection','GUICtrlTreeView_GetSiblingCount',
-            'GUICtrlTreeView_GetState','GUICtrlTreeView_GetStateImageIndex',
-            'GUICtrlTreeView_GetStateImageList','GUICtrlTreeView_GetText',
-            'GUICtrlTreeView_GetTextColor','GUICtrlTreeView_GetToolTips',
-            'GUICtrlTreeView_GetTree','GUICtrlTreeView_GetUnicodeFormat',
-            'GUICtrlTreeView_GetVisible','GUICtrlTreeView_GetVisibleCount',
-            'GUICtrlTreeView_HitTest','GUICtrlTreeView_HitTestEx',
-            'GUICtrlTreeView_HitTestItem','GUICtrlTreeView_Index',
-            'GUICtrlTreeView_InsertItem','GUICtrlTreeView_IsFirstItem',
-            'GUICtrlTreeView_IsParent','GUICtrlTreeView_Level',
-            'GUICtrlTreeView_SelectItem','GUICtrlTreeView_SelectItemByIndex',
-            'GUICtrlTreeView_SetBkColor','GUICtrlTreeView_SetBold',
-            'GUICtrlTreeView_SetChecked','GUICtrlTreeView_SetCheckedByIndex',
-            'GUICtrlTreeView_SetChildren','GUICtrlTreeView_SetCut',
-            'GUICtrlTreeView_SetDropTarget','GUICtrlTreeView_SetFocused',
-            'GUICtrlTreeView_SetHeight','GUICtrlTreeView_SetIcon',
-            'GUICtrlTreeView_SetImageIndex','GUICtrlTreeView_SetIndent',
-            'GUICtrlTreeView_SetInsertMark',
-            'GUICtrlTreeView_SetInsertMarkColor',
-            'GUICtrlTreeView_SetItemHeight','GUICtrlTreeView_SetItemParam',
-            'GUICtrlTreeView_SetLineColor','GUICtrlTreeView_SetNormalImageList',
-            'GUICtrlTreeView_SetScrollTime','GUICtrlTreeView_SetSelected',
-            'GUICtrlTreeView_SetSelectedImageIndex','GUICtrlTreeView_SetState',
-            'GUICtrlTreeView_SetStateImageIndex',
-            'GUICtrlTreeView_SetStateImageList','GUICtrlTreeView_SetText',
-            'GUICtrlTreeView_SetTextColor','GUICtrlTreeView_SetToolTips',
-            'GUICtrlTreeView_SetUnicodeFormat','GUICtrlTreeView_Sort',
-            'GUIImageList_Add','GUIImageList_AddBitmap','GUIImageList_AddIcon',
-            'GUIImageList_AddMasked','GUIImageList_BeginDrag',
-            'GUIImageList_Copy','GUIImageList_Create','GUIImageList_Destroy',
-            'GUIImageList_DestroyIcon','GUIImageList_DragEnter',
-            'GUIImageList_DragLeave','GUIImageList_DragMove',
-            'GUIImageList_Draw','GUIImageList_DrawEx','GUIImageList_Duplicate',
-            'GUIImageList_EndDrag','GUIImageList_GetBkColor',
-            'GUIImageList_GetIcon','GUIImageList_GetIconHeight',
-            'GUIImageList_GetIconSize','GUIImageList_GetIconSizeEx',
-            'GUIImageList_GetIconWidth','GUIImageList_GetImageCount',
-            'GUIImageList_GetImageInfoEx','GUIImageList_Remove',
-            'GUIImageList_ReplaceIcon','GUIImageList_SetBkColor',
-            'GUIImageList_SetIconSize','GUIImageList_SetImageCount',
-            'GUIImageList_Swap','GUIScrollBars_EnableScrollBar',
-            'GUIScrollBars_GetScrollBarInfoEx','GUIScrollBars_GetScrollBarRect',
-            'GUIScrollBars_GetScrollBarRGState',
-            'GUIScrollBars_GetScrollBarXYLineButton',
-            'GUIScrollBars_GetScrollBarXYThumbBottom',
-            'GUIScrollBars_GetScrollBarXYThumbTop',
-            'GUIScrollBars_GetScrollInfo','GUIScrollBars_GetScrollInfoEx',
-            'GUIScrollBars_GetScrollInfoMax','GUIScrollBars_GetScrollInfoMin',
-            'GUIScrollBars_GetScrollInfoPage','GUIScrollBars_GetScrollInfoPos',
-            'GUIScrollBars_GetScrollInfoTrackPos','GUIScrollBars_GetScrollPos',
-            'GUIScrollBars_GetScrollRange','GUIScrollBars_Init',
-            'GUIScrollBars_ScrollWindow','GUIScrollBars_SetScrollInfo',
-            'GUIScrollBars_SetScrollInfoMax','GUIScrollBars_SetScrollInfoMin',
-            'GUIScrollBars_SetScrollInfoPage','GUIScrollBars_SetScrollInfoPos',
-            'GUIScrollBars_SetScrollRange','GUIScrollBars_ShowScrollBar',
-            'GUIToolTip_Activate','GUIToolTip_AddTool','GUIToolTip_AdjustRect',
-            'GUIToolTip_BitsToTTF','GUIToolTip_Create','GUIToolTip_DelTool',
-            'GUIToolTip_Destroy','GUIToolTip_EnumTools',
-            'GUIToolTip_GetBubbleHeight','GUIToolTip_GetBubbleSize',
-            'GUIToolTip_GetBubbleWidth','GUIToolTip_GetCurrentTool',
-            'GUIToolTip_GetDelayTime','GUIToolTip_GetMargin',
-            'GUIToolTip_GetMarginEx','GUIToolTip_GetMaxTipWidth',
-            'GUIToolTip_GetText','GUIToolTip_GetTipBkColor',
-            'GUIToolTip_GetTipTextColor','GUIToolTip_GetTitleBitMap',
-            'GUIToolTip_GetTitleText','GUIToolTip_GetToolCount',
-            'GUIToolTip_GetToolInfo','GUIToolTip_HitTest',
-            'GUIToolTip_NewToolRect','GUIToolTip_Pop','GUIToolTip_PopUp',
-            'GUIToolTip_SetDelayTime','GUIToolTip_SetMargin',
-            'GUIToolTip_SetMaxTipWidth','GUIToolTip_SetTipBkColor',
-            'GUIToolTip_SetTipTextColor','GUIToolTip_SetTitle',
-            'GUIToolTip_SetToolInfo','GUIToolTip_SetWindowTheme',
-            'GUIToolTip_ToolExists','GUIToolTip_ToolToArray',
-            'GUIToolTip_TrackActivate','GUIToolTip_TrackPosition',
-            'GUIToolTip_TTFToBits','GUIToolTip_Update',
-            'GUIToolTip_UpdateTipText','HexToString','IE_Example',
-            'IE_Introduction','IE_VersionInfo','IEAction','IEAttach',
-            'IEBodyReadHTML','IEBodyReadText','IEBodyWriteHTML','IECreate',
-            'IECreateEmbedded','IEDocGetObj','IEDocInsertHTML',
-            'IEDocInsertText','IEDocReadHTML','IEDocWriteHTML',
-            'IEErrorHandlerDeRegister','IEErrorHandlerRegister','IEErrorNotify',
-            'IEFormElementCheckBoxSelect','IEFormElementGetCollection',
-            'IEFormElementGetObjByName','IEFormElementGetValue',
-            'IEFormElementOptionSelect','IEFormElementRadioSelect',
-            'IEFormElementSetValue','IEFormGetCollection','IEFormGetObjByName',
-            'IEFormImageClick','IEFormReset','IEFormSubmit',
-            'IEFrameGetCollection','IEFrameGetObjByName','IEGetObjById',
-            'IEGetObjByName','IEHeadInsertEventScript','IEImgClick',
-            'IEImgGetCollection','IEIsFrameSet','IELinkClickByIndex',
-            'IELinkClickByText','IELinkGetCollection','IELoadWait',
-            'IELoadWaitTimeout','IENavigate','IEPropertyGet','IEPropertySet',
-            'IEQuit','IETableGetCollection','IETableWriteToArray',
-            'IETagNameAllGetCollection','IETagNameGetCollection','Iif',
-            'INetExplorerCapable','INetGetSource','INetMail','INetSmtpMail',
-            'IsPressed','MathCheckDiv','Max','MemGlobalAlloc','MemGlobalFree',
-            'MemGlobalLock','MemGlobalSize','MemGlobalUnlock','MemMoveMemory',
-            'MemMsgBox','MemShowError','MemVirtualAlloc','MemVirtualAllocEx',
-            'MemVirtualFree','MemVirtualFreeEx','Min','MouseTrap',
-            'NamedPipes_CallNamedPipe','NamedPipes_ConnectNamedPipe',
-            'NamedPipes_CreateNamedPipe','NamedPipes_CreatePipe',
-            'NamedPipes_DisconnectNamedPipe',
-            'NamedPipes_GetNamedPipeHandleState','NamedPipes_GetNamedPipeInfo',
-            'NamedPipes_PeekNamedPipe','NamedPipes_SetNamedPipeHandleState',
-            'NamedPipes_TransactNamedPipe','NamedPipes_WaitNamedPipe',
-            'Net_Share_ConnectionEnum','Net_Share_FileClose',
-            'Net_Share_FileEnum','Net_Share_FileGetInfo','Net_Share_PermStr',
-            'Net_Share_ResourceStr','Net_Share_SessionDel',
-            'Net_Share_SessionEnum','Net_Share_SessionGetInfo',
-            'Net_Share_ShareAdd','Net_Share_ShareCheck','Net_Share_ShareDel',
-            'Net_Share_ShareEnum','Net_Share_ShareGetInfo',
-            'Net_Share_ShareSetInfo','Net_Share_StatisticsGetSvr',
-            'Net_Share_StatisticsGetWrk','Now','NowCalc','NowCalcDate',
-            'NowDate','NowTime','PathFull','PathMake','PathSplit',
-            'ProcessGetName','ProcessGetPriority','Radian',
-            'ReplaceStringInFile','RunDOS','ScreenCapture_Capture',
-            'ScreenCapture_CaptureWnd','ScreenCapture_SaveImage',
-            'ScreenCapture_SetBMPFormat','ScreenCapture_SetJPGQuality',
-            'ScreenCapture_SetTIFColorDepth','ScreenCapture_SetTIFCompression',
-            'Security__AdjustTokenPrivileges','Security__GetAccountSid',
-            'Security__GetLengthSid','Security__GetTokenInformation',
-            'Security__ImpersonateSelf','Security__IsValidSid',
-            'Security__LookupAccountName','Security__LookupAccountSid',
-            'Security__LookupPrivilegeValue','Security__OpenProcessToken',
-            'Security__OpenThreadToken','Security__OpenThreadTokenEx',
-            'Security__SetPrivilege','Security__SidToStringSid',
-            'Security__SidTypeStr','Security__StringSidToSid','SendMessage',
-            'SendMessageA','SetDate','SetTime','Singleton','SoundClose',
-            'SoundLength','SoundOpen','SoundPause','SoundPlay','SoundPos',
-            'SoundResume','SoundSeek','SoundStatus','SoundStop',
-            'SQLite_Changes','SQLite_Close','SQLite_Display2DResult',
-            'SQLite_Encode','SQLite_ErrCode','SQLite_ErrMsg','SQLite_Escape',
-            'SQLite_Exec','SQLite_FetchData','SQLite_FetchNames',
-            'SQLite_GetTable','SQLite_GetTable2d','SQLite_LastInsertRowID',
-            'SQLite_LibVersion','SQLite_Open','SQLite_Query',
-            'SQLite_QueryFinalize','SQLite_QueryReset','SQLite_QuerySingleRow',
-            'SQLite_SaveMode','SQLite_SetTimeout','SQLite_Shutdown',
-            'SQLite_SQLiteExe','SQLite_Startup','SQLite_TotalChanges',
-            'StringAddComma','StringBetween','StringEncrypt','StringInsert',
-            'StringProper','StringRepeat','StringReverse','StringSplit',
-            'StringToHex','TCPIpToName','TempFile','TicksToTime','Timer_Diff',
-            'Timer_GetTimerID','Timer_Init','Timer_KillAllTimers',
-            'Timer_KillTimer','Timer_SetTimer','TimeToTicks','VersionCompare',
-            'viClose','viExecCommand','viFindGpib','viGpibBusReset','viGTL',
-            'viOpen','viSetAttribute','viSetTimeout','WeekNumberISO',
-            'WinAPI_AttachConsole','WinAPI_AttachThreadInput','WinAPI_Beep',
-            'WinAPI_BitBlt','WinAPI_CallNextHookEx','WinAPI_Check',
-            'WinAPI_ClientToScreen','WinAPI_CloseHandle',
-            'WinAPI_CommDlgExtendedError','WinAPI_CopyIcon',
-            'WinAPI_CreateBitmap','WinAPI_CreateCompatibleBitmap',
-            'WinAPI_CreateCompatibleDC','WinAPI_CreateEvent',
-            'WinAPI_CreateFile','WinAPI_CreateFont','WinAPI_CreateFontIndirect',
-            'WinAPI_CreateProcess','WinAPI_CreateSolidBitmap',
-            'WinAPI_CreateSolidBrush','WinAPI_CreateWindowEx',
-            'WinAPI_DefWindowProc','WinAPI_DeleteDC','WinAPI_DeleteObject',
-            'WinAPI_DestroyIcon','WinAPI_DestroyWindow','WinAPI_DrawEdge',
-            'WinAPI_DrawFrameControl','WinAPI_DrawIcon','WinAPI_DrawIconEx',
-            'WinAPI_DrawText','WinAPI_EnableWindow','WinAPI_EnumDisplayDevices',
-            'WinAPI_EnumWindows','WinAPI_EnumWindowsPopup',
-            'WinAPI_EnumWindowsTop','WinAPI_ExpandEnvironmentStrings',
-            'WinAPI_ExtractIconEx','WinAPI_FatalAppExit','WinAPI_FillRect',
-            'WinAPI_FindExecutable','WinAPI_FindWindow','WinAPI_FlashWindow',
-            'WinAPI_FlashWindowEx','WinAPI_FloatToInt',
-            'WinAPI_FlushFileBuffers','WinAPI_FormatMessage','WinAPI_FrameRect',
-            'WinAPI_FreeLibrary','WinAPI_GetAncestor','WinAPI_GetAsyncKeyState',
-            'WinAPI_GetClassName','WinAPI_GetClientHeight',
-            'WinAPI_GetClientRect','WinAPI_GetClientWidth',
-            'WinAPI_GetCurrentProcess','WinAPI_GetCurrentProcessID',
-            'WinAPI_GetCurrentThread','WinAPI_GetCurrentThreadId',
-            'WinAPI_GetCursorInfo','WinAPI_GetDC','WinAPI_GetDesktopWindow',
-            'WinAPI_GetDeviceCaps','WinAPI_GetDIBits','WinAPI_GetDlgCtrlID',
-            'WinAPI_GetDlgItem','WinAPI_GetFileSizeEx','WinAPI_GetFocus',
-            'WinAPI_GetForegroundWindow','WinAPI_GetIconInfo',
-            'WinAPI_GetLastError','WinAPI_GetLastErrorMessage',
-            'WinAPI_GetModuleHandle','WinAPI_GetMousePos','WinAPI_GetMousePosX',
-            'WinAPI_GetMousePosY','WinAPI_GetObject','WinAPI_GetOpenFileName',
-            'WinAPI_GetOverlappedResult','WinAPI_GetParent',
-            'WinAPI_GetProcessAffinityMask','WinAPI_GetSaveFileName',
-            'WinAPI_GetStdHandle','WinAPI_GetStockObject','WinAPI_GetSysColor',
-            'WinAPI_GetSysColorBrush','WinAPI_GetSystemMetrics',
-            'WinAPI_GetTextExtentPoint32','WinAPI_GetWindow',
-            'WinAPI_GetWindowDC','WinAPI_GetWindowHeight',
-            'WinAPI_GetWindowLong','WinAPI_GetWindowRect',
-            'WinAPI_GetWindowText','WinAPI_GetWindowThreadProcessId',
-            'WinAPI_GetWindowWidth','WinAPI_GetXYFromPoint',
-            'WinAPI_GlobalMemStatus','WinAPI_GUIDFromString',
-            'WinAPI_GUIDFromStringEx','WinAPI_HiWord','WinAPI_InProcess',
-            'WinAPI_IntToFloat','WinAPI_InvalidateRect','WinAPI_IsClassName',
-            'WinAPI_IsWindow','WinAPI_IsWindowVisible','WinAPI_LoadBitmap',
-            'WinAPI_LoadImage','WinAPI_LoadLibrary','WinAPI_LoadLibraryEx',
-            'WinAPI_LoadShell32Icon','WinAPI_LoadString','WinAPI_LocalFree',
-            'WinAPI_LoWord','WinAPI_MakeDWord','WinAPI_MAKELANGID',
-            'WinAPI_MAKELCID','WinAPI_MakeLong','WinAPI_MessageBeep',
-            'WinAPI_Mouse_Event','WinAPI_MoveWindow','WinAPI_MsgBox',
-            'WinAPI_MulDiv','WinAPI_MultiByteToWideChar',
-            'WinAPI_MultiByteToWideCharEx','WinAPI_OpenProcess',
-            'WinAPI_PointFromRect','WinAPI_PostMessage','WinAPI_PrimaryLangId',
-            'WinAPI_PtInRect','WinAPI_ReadFile','WinAPI_ReadProcessMemory',
-            'WinAPI_RectIsEmpty','WinAPI_RedrawWindow',
-            'WinAPI_RegisterWindowMessage','WinAPI_ReleaseCapture',
-            'WinAPI_ReleaseDC','WinAPI_ScreenToClient','WinAPI_SelectObject',
-            'WinAPI_SetBkColor','WinAPI_SetCapture','WinAPI_SetCursor',
-            'WinAPI_SetDefaultPrinter','WinAPI_SetDIBits','WinAPI_SetEvent',
-            'WinAPI_SetFocus','WinAPI_SetFont','WinAPI_SetHandleInformation',
-            'WinAPI_SetLastError','WinAPI_SetParent',
-            'WinAPI_SetProcessAffinityMask','WinAPI_SetSysColors',
-            'WinAPI_SetTextColor','WinAPI_SetWindowLong','WinAPI_SetWindowPos',
-            'WinAPI_SetWindowsHookEx','WinAPI_SetWindowText',
-            'WinAPI_ShowCursor','WinAPI_ShowError','WinAPI_ShowMsg',
-            'WinAPI_ShowWindow','WinAPI_StringFromGUID','WinAPI_SubLangId',
-            'WinAPI_SystemParametersInfo','WinAPI_TwipsPerPixelX',
-            'WinAPI_TwipsPerPixelY','WinAPI_UnhookWindowsHookEx',
-            'WinAPI_UpdateLayeredWindow','WinAPI_UpdateWindow',
-            'WinAPI_ValidateClassName','WinAPI_WaitForInputIdle',
-            'WinAPI_WaitForMultipleObjects','WinAPI_WaitForSingleObject',
-            'WinAPI_WideCharToMultiByte','WinAPI_WindowFromPoint',
-            'WinAPI_WriteConsole','WinAPI_WriteFile',
-            'WinAPI_WriteProcessMemory','WinNet_AddConnection',
-            'WinNet_AddConnection2','WinNet_AddConnection3',
-            'WinNet_CancelConnection','WinNet_CancelConnection2',
-            'WinNet_CloseEnum','WinNet_ConnectionDialog',
-            'WinNet_ConnectionDialog1','WinNet_DisconnectDialog',
-            'WinNet_DisconnectDialog1','WinNet_EnumResource',
-            'WinNet_GetConnection','WinNet_GetConnectionPerformance',
-            'WinNet_GetLastError','WinNet_GetNetworkInformation',
-            'WinNet_GetProviderName','WinNet_GetResourceInformation',
-            'WinNet_GetResourceParent','WinNet_GetUniversalName',
-            'WinNet_GetUser','WinNet_OpenEnum','WinNet_RestoreConnection',
-            'WinNet_UseConnection','Word_VersionInfo','WordAttach','WordCreate',
-            'WordDocAdd','WordDocAddLink','WordDocAddPicture','WordDocClose',
-            'WordDocFindReplace','WordDocGetCollection',
-            'WordDocLinkGetCollection','WordDocOpen','WordDocPrint',
-            'WordDocPropertyGet','WordDocPropertySet','WordDocSave',
-            'WordDocSaveAs','WordErrorHandlerDeRegister',
-            'WordErrorHandlerRegister','WordErrorNotify','WordMacroRun',
-            'WordPropertyGet','WordPropertySet','WordQuit'
-            ),
-        5 => array(
-            'ce','comments-end','comments-start','cs','include','include-once',
-            'NoTrayIcon','RequireAdmin'
-            ),
-        6 => array(
-            'AutoIt3Wrapper_Au3Check_Parameters',
-            'AutoIt3Wrapper_Au3Check_Stop_OnWarning',
-            'AutoIt3Wrapper_Change2CUI','AutoIt3Wrapper_Compression',
-            'AutoIt3Wrapper_cvsWrapper_Parameters','AutoIt3Wrapper_Icon',
-            'AutoIt3Wrapper_Outfile','AutoIt3Wrapper_Outfile_Type',
-            'AutoIt3Wrapper_Plugin_Funcs','AutoIt3Wrapper_Res_Comment',
-            'AutoIt3Wrapper_Res_Description','AutoIt3Wrapper_Res_Field',
-            'AutoIt3Wrapper_Res_File_Add','AutoIt3Wrapper_Res_Fileversion',
-            'AutoIt3Wrapper_Res_FileVersion_AutoIncrement',
-            'AutoIt3Wrapper_Res_Icon_Add','AutoIt3Wrapper_Res_Language',
-            'AutoIt3Wrapper_Res_LegalCopyright',
-            'AutoIt3Wrapper_res_requestedExecutionLevel',
-            'AutoIt3Wrapper_Res_SaveSource','AutoIt3Wrapper_Run_After',
-            'AutoIt3Wrapper_Run_Au3check','AutoIt3Wrapper_Run_Before',
-            'AutoIt3Wrapper_Run_cvsWrapper','AutoIt3Wrapper_Run_Debug_Mode',
-            'AutoIt3Wrapper_Run_Obfuscator','AutoIt3Wrapper_Run_Tidy',
-            'AutoIt3Wrapper_Tidy_Stop_OnError','AutoIt3Wrapper_UseAnsi',
-            'AutoIt3Wrapper_UseUpx','AutoIt3Wrapper_UseX64',
-            'AutoIt3Wrapper_Version','EndRegion','forceref',
-            'Obfuscator_Ignore_Funcs','Obfuscator_Ignore_Variables',
-            'Obfuscator_Parameters','Region','Tidy_Parameters'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(',')','[',']',
-        '+','-','*','/','&','^',
-        '=','+=','-=','*=','/=','&=',
-        '==','<','<=','>','>=',
-        ',','.'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF; font-weight: bold;',
-            2 => 'color: #800000; font-weight: bold;',
-            3 => 'color: #000080; font-style: italic; font-weight: bold;',
-            4 => 'color: #0080FF; font-style: italic; font-weight: bold;',
-            5 => 'color: #F000FF; font-style: italic;',
-            6 => 'color: #A00FF0; font-style: italic;'
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'font-style: italic; color: #669900;',
-            0 => 'font-style: italic; color: #009933;',
-            1 => 'font-style: italic; color: #9977BB;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #FF0000; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'font-weight: bold; color: #9977BB;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #AC00A9; font-style: italic; font-weight: bold;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF; font-style: italic; font-weight: bold;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #FF0000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'font-weight: bold; color: #AA0000;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.autoitscript.com/autoit3/docs/keywords.htm',
-        2 => 'http://www.autoitscript.com/autoit3/docs/macros.htm',
-        3 => 'http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            4 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)\_'
-            ),
-            5 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)\#'
-            ),
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)\#'
-            )
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/avisynth.php b/inc/geshi/avisynth.php
deleted file mode 100644
index 88f662886..000000000
--- a/inc/geshi/avisynth.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/*************************************************************************************
- * avisynth.php
- * --------
- * Author: Ryan Jones (sciguyryan@gmail.com)
- * Copyright: (c) 2008 Ryan Jones
- * Release Version: 1.0.8.11
- * Date Started: 2008/10/08
- *
- * AviSynth language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/08 (1.0.8.1)
- *  -  First Release
- *
- * TODO (updated 2008/10/08)
- * -------------------------
- * * There are also some special words that can't currently be specified directly in GeSHi as they may
- *      also be used as variables which would really mess things up.
- * * Also there is an issue with the escape character as this language uses a muti-character escape system. Escape char should be """ but has been left
- *      as empty due to this restiction.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'AviSynth',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/', '[*' => '*]'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        //  Reserved words.
-        1 => array(
-            'try', 'cache', 'function', 'global', 'return'
-            ),
-        // Constants / special variables.
-        2 => array(
-            'true', 'yes', 'false', 'no', '__END__'
-            ),
-        // Internal Filters.
-        3 => array(
-            'AviSource', 'AviFileSource', 'AddBorders', 'AlignedSplice', 'AssumeFPS', 'AssumeScaledFPS',
-            'AssumeFrameBased', 'AssumeFieldBased', 'AssumeBFF', 'AssumeTFF', 'Amplify', 'AmplifydB',
-            'AssumeSampleRate', 'AudioDub', 'AudioDubEx', 'Animate', 'ApplyRange',
-            'BicubicResize', 'BilinearResize', 'BlackmanResize', 'Blur', 'Bob', 'BlankClip', 'Blackness',
-            'ColorYUV', 'ConvertBackToYUY2', 'ConvertToRGB', 'ConvertToRGB24', 'ConvertToRGB32',
-            'ConvertToYUY2', 'ConvertToY8', 'ConvertToYV411', 'ConvertToYV12', 'ConvertToYV16', 'ConvertToYV24',
-            'ColorKeyMask', 'Crop', 'CropBottom', 'ChangeFPS', 'ConvertFPS', 'ComplementParity', 'ConvertAudioTo8bit',
-            'ConvertAudioTo16bit', 'ConvertAudioTo24bit', 'ConvertAudioTo32bit', 'ConvertAudioToFloat', 'ConvertToMono',
-            'ConditionalFilter', 'ConditionalReader', 'ColorBars', 'Compare',
-            'DirectShowSource', 'DeleteFrame', 'Dissolve', 'DuplicateFrame', 'DoubleWeave', 'DelayAudio',
-            'EnsureVBRMP3Sync',
-            'FixLuminance', 'FlipHorizontal', 'FlipVertical', 'FixBrokenChromaUpsampling', 'FadeIn0', 'FadeIn',
-            'FadeIn2', 'FadeOut0', 'FadeOut', 'FadeOut2', 'FadeIO0', 'FadeIO', 'FadeIO2', 'FreezeFrame', 'FrameEvaluate',
-            'GreyScale', 'GaussResize', 'GeneralConvolution', 'GetChannel', 'GetLeftChannel', 'GetRightChannel',
-            'HorizontalReduceBy2', 'Histogram',
-            'ImageReader', 'ImageSource', 'ImageWriter', 'Invert', 'Interleave', 'Info',
-            'KillAudio', 'KillVideo',
-            'Levels', 'Limiter', 'Layer', 'Letterbox', 'LanczosResize', 'Lanczos4Resize', 'Loop',
-            'MergeARGB', 'MergeRGB', 'MergeChroma', 'MergeLuma', 'Merge', 'Mask', 'MaskHS', 'MergeChannels', 'MixAudio',
-            'MonoToStereo', 'MessageClip',
-            'Normalize',
-            'OpenDMLSource', 'Overlay',
-            'PointResize', 'PeculiarBlend', 'Pulldown',
-            'RGBAdjust', 'ResetMask', 'Reverse', 'ResampleAudio', 'ReduceBy2',
-            'SegmentedAviSource', 'SegmentedDirectShowSource', 'SoundOut', 'ShowAlpha', 'ShowRed', 'ShowGreen',
-            'ShowBlue', 'SwapUV', 'Subtract', 'SincResize', 'Spline16Resize', 'Spline36Resize', 'Spline64Resize',
-            'SelectEven', 'SelectOdd', 'SelectEvery', 'SelectRangeEvery', 'Sharpen', 'SpatialSoften', 'SeparateFields',
-            'ShowFiveVersions', 'ShowFrameNumber', 'ShowSMPTE', 'ShowTime', 'StackHorizontal', 'StackVertical', 'Subtitle',
-            'SwapFields', 'SuperEQ', 'SSRC', 'ScriptClip',
-            'Tweak', 'TurnLeft', 'TurnRight', 'Turn180', 'TemporalSoften', 'TimeStretch', 'TCPServer', 'TCPSource', 'Trim',
-            'Tone',
-            'UToY', 'UToY8', 'UnalignedSplice',
-            'VToY', 'VToY8', 'VerticalReduceBy2', 'Version',
-            'WavSource', 'Weave', 'WriteFile', 'WriteFileIf', 'WriteFileStart', 'WriteFileEnd',
-            'YToUV'
-            ),
-        // Internal functions.
-        4 => array(
-            'Abs', 'Apply', 'Assert', 'AverageLuma', 'AverageChromaU', 'AverageChromaV',
-            'Ceil', 'Cos', 'Chr', 'ChromaUDifference', 'ChromaVDifference',
-            'Defined', 'Default',
-            'Exp', 'Exist', 'Eval',
-            'Floor', 'Frac', 'Float', 'Findstr', 'GetMTMode',
-            'HexValue',
-            'Int', 'IsBool', 'IsClip', 'IsFloat', 'IsInt', 'IsString', 'Import',
-            'LoadPlugin', 'Log', 'LCase', 'LeftStr', 'LumaDifference', 'LoadVirtualDubPlugin', 'LoadVFAPIPlugin',
-            'LoadCPlugin', 'Load_Stdcall_Plugin',
-            'Max', 'MulDiv', 'MidStr',
-            'NOP',
-            'OPT_AllowFloatAudio', 'OPT_UseWaveExtensible',
-            'Pi', 'Pow',
-            'Round', 'Rand', 'RevStr', 'RightStr', 'RGBDifference', 'RGBDifferenceFromPrevious', 'RGBDifferenceToNext',
-            'Sin', 'Sqrt', 'Sign', 'Spline', 'StrLen', 'String', 'Select', 'SetMemoryMax', 'SetWorkingDir', 'SetMTMode',
-            'SetPlanarLegacyAlignment',
-            'Time',
-            'UCase', 'UDifferenceFromPrevious', 'UDifferenceToNext', 'UPlaneMax', 'UPlaneMin', 'UPlaneMedian',
-            'UPlaneMinMaxDifference',
-            'Value', 'VersionNumber', 'VersionString', 'VDifferenceFromPrevious', 'VDifferenceToNext', 'VPlaneMax',
-            'VPlaneMin', 'VPlaneMedian', 'VPlaneMinMaxDifference',
-            'YDifferenceFromPrevious', 'YDifferenceToNext', 'YPlaneMax', 'YPlaneMin', 'YPlaneMedian',
-            'YPlaneMinMaxDifference'
-            )
-        ),
-    'SYMBOLS' => array(
-        '+', '++', '-', '--', '/', '*', '%',
-        '=', '==', '<', '<=', '>', '>=', '<>', '!=',
-        '!', '?', ':',
-        '|', '||', '&&',
-        '\\',
-        '(', ')', '{', '}',
-        '.', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color:#9966CC; font-weight:bold;',
-            2 => 'color:#0000FF; font-weight:bold;',
-            3 => 'color:#CC3300; font-weight:bold;',
-            4 => 'color:#660000; font-weight:bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color:#008000; font-style:italic;',
-            'MULTI' => 'color:#000080; font-style:italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color:#000099;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color:#006600; font-weight:bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color:#996600;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color:#006666;'
-            ),
-        'METHODS' => array(
-            1 => 'color:#9900CC;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color:#006600; font-weight:bold;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://avisynth.org/mediawiki/{FNAME}',
-        4 => ''
-        ),
-    'REGEXPS' => array(
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-?>
diff --git a/inc/geshi/awk.php b/inc/geshi/awk.php
deleted file mode 100644
index 1ec239b70..000000000
--- a/inc/geshi/awk.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/************************************************
- * awk.php
- * -------
- * Author: George Pollard (porges@porg.es)
- * Copyright: (c) 2009 George Pollard
- * Release Version: 1.0.8.11
- * Date Started: 2009/01/28
- *
- * Awk language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/01/28 (1.0.8.5)
- *   -  First Release
- *
- * TODO (updated 2009/01/28)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'awk',
-    'COMMENT_SINGLE' => array(
-        1 => '#'
-        ),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array (
-        1 => array(
-            'for', 'in', 'if', 'else', 'while', 'do', 'continue', 'break'
-            ),
-        2 => array(
-            'BEGIN', 'END'
-            ),
-        3 => array(
-            'ARGC', 'ARGV', 'CONVFMT', 'ENVIRON',
-            'FILENAME', 'FNR', 'FS', 'NF', 'NR', 'OFMT',
-            'OFS','ORS','RLENGTH','RS','RSTART','SUBSEP'
-            ),
-        4 => array(
-            'gsub','index','length','match','split',
-            'sprintf','sub','substr','tolower','toupper',
-            'atan2','cos','exp','int','log','rand',
-            'sin','sqrt','srand'
-            ),
-        5 => array(
-            'print','printf','getline','close','fflush','system'
-            ),
-        6 => array(
-            'function', 'return'
-            )
-        ),
-    'SYMBOLS' => array (
-        0 => array(
-            '(',')','[',']','{','}'
-            ),
-        1 => array(
-            '!','||','&&'
-            ),
-        2 => array(
-            '<','>','<=','>=','==','!='
-            ),
-        3 => array(
-            '+','-','*','/','%','^','++','--'
-            ),
-        4 => array(
-            '~','!~'
-            ),
-        5 => array(
-            '?',':'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #C20CB9; font-weight: bold;',
-            3 => 'color: #4107D5; font-weight: bold;',
-            4 => 'color: #07D589; font-weight: bold;',
-            5 => 'color: #0BD507; font-weight: bold;',
-            6 => 'color: #078CD5; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color:#808080;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color:black;',
-            1 => 'color:black;',
-            2 => 'color:black;',
-            3 => 'color:black;',
-            4 => 'color:#C4C364;',
-            5 => 'color:black;font-weight:bold;'),
-        'SCRIPT' => array(),
-        'REGEXPS' => array(
-            0 => 'color:#000088;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #7a0874; font-weight: bold;'
-            ),
-        'METHODS' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array (),
-    'REGEXPS' => array(
-        0 => "\\$[a-zA-Z0-9_]+"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array (),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
diff --git a/inc/geshi/bascomavr.php b/inc/geshi/bascomavr.php
deleted file mode 100644
index 864f74e8d..000000000
--- a/inc/geshi/bascomavr.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/*************************************************************************************
- * bascomavr.php
- * ---------------------------------
- * Author: aquaticus.info
- * Copyright: (c) 2008 aquaticus.info
- * Release Version: 1.0.8.11
- * Date Started: 2008/01/09
- *
- * BASCOM AVR language file for GeSHi.
- *
- * You can find the BASCOM AVR Website at (www.mcselec.com/bascom-avr.htm)
- *
- * CHANGES
- * -------
- * 2008/01/09 (1.0.8.10)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'BASCOM AVR',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            // Navy Blue Bold Keywords
-            '1WRESET' , '1WREAD' , '1WWRITE' , '1WSEARCHFIRST' , '1WSEARCHNEXT' ,'1WVERIFY' , '1WIRECOUNT',
-            'CONFIG' , 'ACI' , 'ADC' , 'BCCARD' , 'CLOCK' , 'COM1' ,
-            'COM2' , 'PS2EMU' , 'ATEMU' , 'I2CSLAVE' ,
-            'INPUT', 'OUTPUT', 'GRAPHLCD' , 'KEYBOARD' , 'TIMER0' , 'TIMER1' ,
-            'LCDBUS' , 'LCDMODE' , '1WIRE' , 'LCD' , 'SERIALOUT' ,
-            'SERIALIN' , 'SPI' , 'LCDPIN' , 'SDA' , 'SCL' ,
-            'WATCHDOG' , 'PORT' , 'COUNTER0', 'COUNTER1' , 'TCPIP' , 'TWISLAVE' ,
-            'X10' , 'XRAM' , 'USB',
-            'BCD' , 'GRAY2BIN' , 'BIN2GRAY' , 'BIN' , 'MAKEBCD' , 'MAKEDEC' , 'MAKEINT' , 'FORMAT' , 'FUSING' , 'BINVAL' ,
-            'CRC8' , 'CRC16' , 'CRC16UNI' , 'CRC32' , 'HIGH' , 'HIGHW' , 'LOW',
-            'DATE' , 'TIME'  , 'DATE$' , 'TIME$' , 'DAYOFWEEK' , 'DAYOFYEAR' , 'SECOFDAY' , 'SECELAPSED' , 'SYSDAY' , 'SYSSEC' , 'SYSSECELAPSED',
-            'WAIT'  , 'WAITMS' , 'WAITUS' , 'DELAY',
-            'BSAVE' , 'BLOAD' , 'GET' , 'VER' , 'DISKFREE' , 'DIR' , 'DriveReset' , 'DriveInit' , 'LINE' , 'INITFILESYSTEM' ,
-            'EOF' , 'WRITE' , 'FLUSH' , 'FREEFILE' , 'FILEATTR' , 'FILEDATE' , 'FILETIME' , 'FILEDATETIME' , 'FILELEN' , 'SEEK' ,
-            'KILL' , 'DriveGetIdentity' , 'DriveWriteSector' , 'DriveReadSector' , 'LOC' , 'LOF' , 'PUT' , 'OPEN' , 'CLOSE',
-            'GLCDCMD' , 'GLCDDATA' , 'SETFONT' , 'PSET' , 'SHOWPIC' , 'SHOWPICE' , 'CIRCLE' , 'BOX',
-            'I2CINIT' , 'I2CRECEIVE' , 'I2CSEND' , 'I2CSTART','I2CSTOP','I2CRBYTE','I2CWBYTE',
-            'ALIAS' , 'BITWAIT' , 'TOGGLE' , 'RESET' , 'SET' , 'SHIFTIN' , 'SHIFTOUT' , 'DEBOUNCE' , 'PULSEIN' , 'PULSEOUT',
-            'IDLE' , 'POWERDOWN' , 'POWERSAVE' , 'ON', 'INTERRUPT' , 'ENABLE' , 'DISABLE' , 'START' , 'VERSION' , 'CLOCKDIVISION' , 'CRYSTAL' , 'STOP',
-            'ADR' , 'ADR2' , 'WRITEEEPROM' , 'CPEEK' , 'CPEEKH' , 'PEEK' , 'POKE' , 'OUT' , 'READEEPROM' , 'DATA' , 'INP' , 'READ' , 'RESTORE' , 'LOOKDOWN' , 'LOOKUP' , 'LOOKUPSTR' , 'LOAD' , 'LOADADR' , 'LOADLABEL' , 'LOADWORDADR' , 'MEMCOPY',
-            'RC5SEND' , 'RC6SEND' , 'GETRC5' , 'SONYSEND',
-            'BAUD' , 'BAUD1', 'BUFSPACE' , 'CLEAR', 'ECHO' , 'WAITKEY' , 'ISCHARWAITING' , 'INKEY' , 'INPUTBIN' , 'INPUTHEX' , 'PRINT', 'PRINT1','PRINT0', 'PRINTBIN' , 'SERIN' , 'SEROUT' , 'SPC' , 'MAKEMODBUS',
-            'SPIIN' , 'SPIINIT' , 'SPIMOVE' , 'SPIOUT', 'SINGLE',
-            'ASC' , 'UCASE' , 'LCASE' , 'TRIM' , 'SPLIT' , 'LTRIM' , 'INSTR' , 'SPACE' , 'RTRIM' , 'LEFT' , 'LEN' , 'MID' , 'RIGHT' , 'VAL' , 'STR' , 'CHR' , 'CHECKSUM' , 'HEX' , 'HEXVAL',
-            'BASE64DEC' , 'BASE64ENC' , 'IP2STR' , 'UDPREAD' , 'UDPWRITE' , 'UDPWRITESTR' , 'TCPWRITE' , 'TCPWRITESTR' , 'TCPREAD' , 'GETDSTIP' , 'GETDSTPORT' , 'SOCKETSTAT' , 'SOCKETCONNECT' , 'SOCKETLISTEN' , 'GETSOCKET' , 'CLOSESOCKET' ,
-            'SETTCP' , 'GETTCPREGS' , 'SETTCPREGS' , 'SETIPPROTOCOL' , 'TCPCHECKSUM',
-            'HOME' , 'CURSOR' , 'UPPERLINE' , 'THIRDLINE' , 'INITLCD' , 'LOWERLINE' , 'LCDAT' , 'FOURTHLINE' , 'DISPLAY' , 'LCDCONTRAST' , 'LOCATE' , 'SHIFTCURSOR' , 'DEFLCDCHAR' , 'SHIFTLCD' , 'CLS',
-            'ACOS' , 'ASIN' , 'ATN' , 'ATN2' , 'EXP' , 'RAD2DEG' , 'FRAC' , 'TAN' , 'TANH' , 'COS' , 'COSH' , 'LOG' , 'LOG10' , 'ROUND' , 'ABS' , 'INT' , 'MAX' , 'MIN' , 'SQR' , 'SGN' , 'POWER' , 'SIN' , 'SINH' , 'FIX' , 'INCR' , 'DECR' , 'DEG2RAD',
-            'DBG' , 'DEBUG', 'DTMFOUT' , 'ENCODER' , 'GETADC' , 'GETKBD' , 'GETATKBD' , 'GETRC' , 'VALUE' , 'POPALL' , 'PS2MOUSEXY' , 'PUSHALL' ,
-            'RETURN'  , 'RND' , 'ROTATE' , 'SENDSCAN' , 'SENDSCANKBD' , 'SHIFT' , 'SOUND' , 'STCHECK' , 'SWAP' , 'VARPTR' , 'X10DETECT' , 'X10SEND' , 'READMAGCARD' , 'REM' , 'BITS' , 'BYVAL' , 'CALL' , 'READHITAG',
-            'Buffered', 'Size', 'Dummy', 'Parity', 'None', 'Stopbits', 'Databits', 'Clockpol', 'Synchrone', 'Prescaler', 'Reference', 'int0', 'int1', 'Interrupts',
-            'Auto', 'avcc', 'ack', 'nack', 'Pin', 'Db4', 'Db3', 'Db2', 'Db1', 'Db7', 'Db6', 'Db5', 'Db0',  'e', 'rs', 'twi',
-            ),
-        2 => array(
-            // Red Lowercase Keywords
-            '$ASM' , '$BAUD' , '$BAUD1' , '$BGF' , '$BOOT' , '$CRYSTAL' , '$DATA' , '$DBG' , '$DEFAULT' , '$EEPLEAVE' , '$EEPROM' ,
-            '$EEPROMHEX' , '$EXTERNAL' , '$HWSTACK' , '$INC' , '$INCLUDE' , '$INITMICRO' , '$LCD' , '$LCDRS' , '$LCDPUTCTRL' ,
-            '$LCDPUTDATA' , '$LCDVFO' , '$LIB' , '$LOADER' , '$LOADERSIZE' , '$MAP' , '$NOCOMPILE' , '$NOINIT' , '$NORAMCLEAR' ,
-            '$PROG' , '$PROGRAMMER' , '$REGFILE' , '$RESOURCE' , '$ROMSTART', '$SERIALINPUT', '$SERIALINPUT1' , '$SERIALINPUT2LCD' ,
-            '$SERIALOUTPUT' , '$SERIALOUTPUT1' , '$SIM' , '$SWSTACK' , '$TIMEOUT' , '$TINY' , '$WAITSTATE' , '$XRAMSIZE' , '$XRAMSTART', '$XA',
-            '#IF' , '#ELSE' , '#ENDIF', '$framesize'
-            ),
-        3 => array(
-            // Blue Lowercase Keywords
-            'IF', 'THEN', 'ELSE', 'END', 'WHILE', 'WEND', 'DO', 'LOOP', 'SELECT', 'CASE', 'FOR', 'NEXT',
-            'GOSUB' , 'GOTO' , 'LOCAL' , 'SUB' , 'DEFBIT', 'DEFBYTE', 'DEFINT', 'DEFWORD', 'DEFLNG', 'DEFSNG', 'DEFDBL',
-            'CONST', 'DECLARE', 'FUNCTION', 'DIM', 'EXIT', 'LONG', 'INTEGER', 'BYTE', 'AS', 'STRING', 'WORD'
-            ),
-        4 => array(
-            //light blue
-            'PINA.0', 'PINA.1', 'PINA.2', 'PINA.3', 'PINA.4', 'PINA.5', 'PINA.6', 'PINA.7',
-            'PINB.0', 'PINB.1', 'PINB.2', 'PINB.3', 'PINB.4', 'PINB.5', 'PINB.6', 'PINB.7',
-            'PINC.0', 'PINC.1', 'PINC.2', 'PINC.3', 'PINC.4', 'PINC.5', 'PINC.6', 'PINC.7',
-            'PIND.0', 'PIND.1', 'PIND.2', 'PIND.3', 'PIND.4', 'PIND.5', 'PIND.6', 'PIND.7',
-            'PINE.0', 'PINE.1', 'PINE.2', 'PINE.3', 'PINE.4', 'PINE.5', 'PINE.6', 'PINE.7',
-            'PINF.0', 'PINF.1', 'PINF.2', 'PINF.3', 'PINF.4', 'PINF.5', 'PINF.6', 'PINF.7',
-
-            'PORTA.0', 'PORTA.1', 'PORTA.2', 'PORTA.3', 'PORTA.4', 'PORTA.5', 'PORTA.6', 'PORTA.7',
-            'PORTB.0', 'PORTB.1', 'PORTB.2', 'PORTB.3', 'PORTB.4', 'PORTB.5', 'PORTB.6', 'PORTB.7',
-            'PORTC.0', 'PORTC.1', 'PORTC.2', 'PORTC.3', 'PORTC.4', 'PORTC.5', 'PORTC.6', 'PORTC.7',
-            'PORTD.0', 'PORTD.1', 'PORTD.2', 'PORTD.3', 'PORTD.4', 'PORTD.5', 'PORTD.6', 'PORTD.7',
-            'PORTE.0', 'PORTE.1', 'PORTE.2', 'PORTE.3', 'PORTE.4', 'PORTE.5', 'PORTE.6', 'PORTE.7',
-            'PORTF.0', 'PORTF.1', 'PORTF.2', 'PORTF.3', 'PORTF.4', 'PORTF.5', 'PORTF.6', 'PORTF.7',
-
-            'DDRA.0', 'DDRA.1', 'DDRA.2', 'DDRA.3', 'DDRA.4', 'DDRA.5', 'DDRA.6', 'DDRA.7',
-            'DDRB.0', 'DDRB.1', 'DDRB.2', 'DDRB.3', 'DDRB.4', 'DDRB.5', 'DDRB.6', 'DDRB.7',
-            'DDRC.0', 'DDRC.1', 'DDRC.2', 'DDRC.3', 'DDRC.4', 'DDRC.5', 'DDRC.6', 'DDRC.7',
-            'DDRD.0', 'DDRD.1', 'DDRD.2', 'DDRD.3', 'DDRD.4', 'DDRD.5', 'DDRD.6', 'DDRD.7',
-            'DDRE.0', 'DDRE.1', 'DDRE.2', 'DDRE.3', 'DDRE.4', 'DDRE.5', 'DDRE.6', 'DDRE.7',
-            'DDRF.0', 'DDRF.1', 'DDRF.2', 'DDRF.3', 'DDRF.4', 'DDRF.5', 'DDRF.6', 'DDRF.7',
-
-            'DDRA','DDRB','DDRC','DDRD','DDRE','DDRF',
-            'PORTA','PORTB','PORTC','PORTD','PORTE','PORTF',
-            'PINA','PINB','PINC','PIND','PINE','PINF',
-            )
-        ),
-    'SYMBOLS' => array(
-        '=', '<', '>', '>=', '<=', '+', '-', '*', '/', '%', '(', ')', '{', '}', '[', ']',  ';', ':', '$', '&H'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080; font-weight: bold;',
-            2 => 'color: #FF0000;',
-            3 => 'color: #0000FF;',
-            4 => 'color: #0080FF;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #657CC4; font-style: italic;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000080;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #008000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000080; font-weight: bold;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #0000FF;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/bash.php b/inc/geshi/bash.php
deleted file mode 100644
index c69f0054f..000000000
--- a/inc/geshi/bash.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-/*************************************************************************************
- * bash.php
- * --------
- * Author: Andreas Gohr (andi@splitbrain.org)
- * Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/20
- *
- * BASH language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/06/21 (1.0.8)
- *  -  Added loads of keywords and commands of GNU/Linux
- *  -  Added support for parameters starting with a dash
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2007/09/05 (1.0.7.21)
- *  -  PARSER_CONTROL patch using SF #1788408 (BenBE)
- * 2007/06/11 (1.0.7.20)
- *  -  Added a lot of keywords (BenBE / Jan G)
- * 2004/11/27 (1.0.2)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.1)
- *   -  Added support for URLs
- * 2004/08/20 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Get symbols working
- * * Highlight builtin vars
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Bash',
-    // Bash DOES have single line comments with # markers. But bash also has
-    // the  $# variable, so comments need special handling (see sf.net
-    // 1564839)
-    'COMMENT_SINGLE' => array('#'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        //Variables
-        1 => "/\\$\\{[^\\n\\}]*?\\}/i",
-        //BASH-style Heredoc
-        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
-        //Escaped String Starters
-        3 => "/\\\\['\"]/siU",
-        // Single-Line Shell usage: Hide the prompt at the beginning
-        /* 4 => "/\A(?!#!)\s*(?>[\w:@\\/\\-\\._~]*[$#]\s?)?(?=[^\n]+\n?\Z)|^(?!#!)(\w+@)?[\w\\-\\.]+(:~?)[\w\\/\\-\\._]*?[$#]\s?/ms" */
-        4 => "/\A(?!#!)(?:(?>[\w:@\\/\\-\\._~]*)[$#]\s?)(?=(?>[^\n]+)\n?\Z)|^(?!#!)(?:\w+@)?(?>[\w\\-\\.]+)(?>:~?[\w\\/\\-\\._]*?)?[$#]\s?/sm"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("\'"),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[nfrtv\\$\\\"\n]#i",
-        // $var
-        2 => "#\\$[a-z_][a-z0-9_]*#i",
-        // ${...}
-        3 => "/\\$\\{[^\\n\\}]*?\\}/i",
-        // $(...)
-        4 => "/\\$\\([^\\n\\)]*?\\)/i",
-        // `...`
-        5 => "/`[^`]*`/"
-        ),
-    'KEYWORDS' => array(
-        1 => array(
-            'case', 'do', 'done', 'elif', 'else', 'esac', 'fi', 'for', 'function',
-            'if', 'in', 'select', 'set', 'then', 'until', 'while', 'time'
-            ),
-        2 => array(
-            'aclocal', 'aconnect', 'apachectl', 'apache2ctl', 'aplay', 'apm',
-            'apmsleep', 'apropos', 'apt-cache', 'apt-cdrom', 'apt-config',
-            'apt-file', 'apt-ftparchive', 'apt-get', 'apt-key', 'apt-listbugs',
-            'apt-listchanges', 'apt-mark', 'apt-mirror', 'apt-sortpkgs',
-            'apt-src', 'apticron', 'aptitude', 'aptsh', 'apxs', 'apxs2', 'ar',
-            'arch', 'arecord', 'as', 'as86', 'ash', 'autoconf', 'autoheader',
-            'automake', 'awk',
-
-            'apachectl start', 'apachectl stop', 'apachectl restart',
-            'apachectl graceful', 'apachectl graceful-stop',
-            'apachectl configtest', 'apachectl status', 'apachectl fullstatus',
-            'apachectl help', 'apache2ctl start', 'apache2ctl stop',
-            'apache2ctl restart', 'apache2ctl graceful',
-            'apache2ctl graceful-stop', 'apache2ctl configtest',
-            'apache2ctl status', 'apache2ctl fullstatus', 'apache2ctl help',
-
-            'apt-cache add', 'apt-cache depends', 'apt-cache dotty',
-            'apt-cache dump', 'apt-cache dumpavail', 'apt-cache gencaches',
-            'apt-cache pkgnames', 'apt-cache policy', 'apt-cache rdepends',
-            'apt-cache search', 'apt-cache show', 'apt-cache showauto',
-            'apt-cache showpkg', 'apt-cache showsrc', 'apt-cache stats',
-            'apt-cache unmet', 'apt-cache xvcg', 'apt-cdrom add',
-            'apt-cdrom ident', 'apt-config dump', 'apt-config shell',
-            'apt-file find', 'apt-file list', 'apt-file purge',
-            'apt-file search', 'apt-file shot', 'apt-file update',
-            'apt-get autoclean', 'apt-get autoremove', 'apt-get build-dep',
-            'apt-get check', 'apt-get clean', 'apt-get dist-upgrade',
-            'apt-get dselect-upgrade', 'apt-get install', 'apt-get markauto',
-            'apt-get purge', 'apt-get remove', 'apt-get source',
-            'apt-get unmarkauto', 'apt-get update', 'apt-get upgrade',
-            'apt-key add', 'apt-key adv', 'apt-key del', 'apt-key export',
-            'apt-key exportall', 'apt-key finger', 'apt-key list',
-            'apt-key net-update', 'apt-key update', 'apt-listbugs apt',
-            'apt-listbugs list', 'apt-listbugs rss', 'apt-src build',
-            'apt-src clean', 'apt-src import', 'apt-src install',
-            'apt-src list', 'apt-src location', 'apt-src name',
-            'apt-src remove', 'apt-src update', 'apt-src upgrade',
-            'apt-src version',
-
-            'basename', 'bash', 'bc', 'bison', 'bunzip2', 'bzcat',
-            'bzcmp', 'bzdiff', 'bzegrep', 'bzfgrep', 'bzgrep',
-            'bzip2', 'bzip2recover', 'bzless', 'bzmore',
-
-            'c++', 'cal', 'cat', 'chattr', 'cc', 'cdda2wav', 'cdparanoia',
-            'cdrdao', 'cd-read', 'cdrecord', 'chfn', 'chgrp', 'chmod',
-            'chown', 'chroot', 'chsh', 'chvt', 'clear', 'cmp', 'comm', 'co',
-            'col', 'cp', 'cpio', 'cpp', 'csh', 'cut', 'cvs', 'cvs-pserver',
-
-            'cvs add', 'cvs admin', 'cvs annotate', 'cvs checkout',
-            'cvs commit', 'cvs diff', 'cvs edit', 'cvs editors', 'cvs export',
-            'cvs history', 'cvs import', 'cvs init', 'cvs log', 'cvs login',
-            'cvs logout', 'cvs ls', 'cvs pserver', 'cvs rannotate',
-            'cvs rdiff', 'cvs release', 'cvs remove', 'cvs rlog', 'cvs rls',
-            'cvs rtag', 'cvs server', 'cvs status', 'cvs tag', 'cvs unedit',
-            'cvs update', 'cvs version', 'cvs watch', 'cvs watchers',
-
-            'dash', 'date', 'dc', 'dch', 'dcop', 'dd', 'ddate', 'ddd',
-            'deallocvt', 'debconf', 'defoma', 'depmod', 'df', 'dh',
-            'dialog', 'diff', 'diff3', 'dig', 'dir', 'dircolors', 'directomatic',
-            'dirname', 'dmesg', 'dnsdomainname', 'domainname', 'dpkg',
-            'dselect', 'du', 'dumpkeys',
-
-            'ed', 'egrep', 'env', 'expr',
-
-            'false', 'fbset', 'fdisk', 'ffmpeg', 'fgconsole','fgrep', 'file',
-            'find', 'flex', 'flex++', 'fmt', 'free', 'ftp', 'funzip', 'fuser',
-
-            'g++', 'gawk', 'gc','gcc', 'gdb', 'getent', 'getkeycodes',
-            'getopt', 'gettext', 'gettextize', 'gimp', 'gimp-remote',
-            'gimptool', 'gmake', 'gocr', 'grep', 'groups', 'gs', 'gunzip',
-            'gzexe', 'gzip',
-
-            'git', 'git add', 'git add--interactive', 'git am', 'git annotate',
-            'git apply', 'git archive', 'git bisect', 'git bisect--helper',
-            'git blame', 'git branch', 'git bundle', 'git cat-file',
-            'git check-attr', 'git checkout', 'git checkout-index',
-            'git check-ref-format', 'git cherry', 'git cherry-pick',
-            'git clean', 'git clone', 'git commit', 'git commit-tree',
-            'git config', 'git count-objects', 'git daemon', 'git describe',
-            'git diff', 'git diff-files', 'git diff-index', 'git difftool',
-            'git difftool--helper', 'git diff-tree', 'git fast-export',
-            'git fast-import', 'git fetch', 'git fetch-pack',
-            'git filter-branch', 'git fmt-merge-msg', 'git for-each-ref',
-            'git format-patch', 'git fsck', 'git fsck-objects', 'git gc',
-            'git get-tar-commit-id', 'git grep', 'git hash-object', 'git help',
-            'git http-backend', 'git http-fetch', 'git http-push',
-            'git imap-send', 'git index-pack', 'git init', 'git init-db',
-            'git instaweb', 'git log', 'git lost-found', 'git ls-files',
-            'git ls-remote', 'git ls-tree', 'git mailinfo', 'git mailsplit',
-            'git merge', 'git merge-base', 'git merge-file', 'git merge-index',
-            'git merge-octopus', 'git merge-one-file', 'git merge-ours',
-            'git merge-recursive', 'git merge-resolve', 'git merge-subtree',
-            'git mergetool', 'git merge-tree', 'git mktag', 'git mktree',
-            'git mv', 'git name-rev', 'git notes', 'git pack-objects',
-            'git pack-redundant', 'git pack-refs', 'git patch-id',
-            'git peek-remote', 'git prune', 'git prune-packed', 'git pull',
-            'git push', 'git quiltimport', 'git read-tree', 'git rebase',
-            'git rebase--interactive', 'git receive-pack', 'git reflog',
-            'git relink', 'git remote', 'git remote-ftp', 'git remote-ftps',
-            'git remote-http', 'git remote-https', 'git remote-testgit',
-            'git repack', 'git replace', 'git repo-config', 'git request-pull',
-            'git rerere', 'git reset', 'git revert', 'git rev-list',
-            'git rev-parse', 'git rm', 'git send-pack', 'git shell',
-            'git shortlog', 'git show', 'git show-branch', 'git show-index',
-            'git show-ref', 'git stage', 'git stash', 'git status',
-            'git stripspace', 'git submodule', 'git symbolic-ref', 'git tag',
-            'git tar-tree', 'git unpack-file', 'git unpack-objects',
-            'git update-index', 'git update-ref', 'git update-server-info',
-            'git upload-archive', 'git upload-pack', 'git var',
-            'git verify-pack', 'git verify-tag', 'git web--browse',
-            'git whatchanged', 'git write-tree',
-
-            'gitaction', 'git-add', 'git-add--interactive', 'git-am',
-            'git-annotate', 'git-apply', 'git-archive', 'git-bisect',
-            'git-bisect--helper', 'git-blame', 'git-branch', 'git-bundle',
-            'git-cat-file', 'git-check-attr', 'git-checkout',
-            'git-checkout-index', 'git-check-ref-format', 'git-cherry',
-            'git-cherry-pick', 'git-clean', 'git-clone', 'git-commit',
-            'git-commit-tree', 'git-config', 'git-count-objects', 'git-daemon',
-            'git-describe', 'git-diff', 'git-diff-files', 'git-diff-index',
-            'git-difftool', 'git-difftool--helper', 'git-diff-tree',
-            'gitdpkgname', 'git-fast-export', 'git-fast-import', 'git-fetch',
-            'git-fetch-pack', 'git-fetch--tool', 'git-filter-branch', 'gitfm',
-            'git-fmt-merge-msg', 'git-for-each-ref', 'git-format-patch',
-            'git-fsck', 'git-fsck-objects', 'git-gc', 'git-get-tar-commit-id',
-            'git-grep', 'git-hash-object', 'git-help', 'git-http-fetch',
-            'git-http-push', 'git-imap-send', 'git-index-pack', 'git-init',
-            'git-init-db', 'git-instaweb', 'gitkeys', 'git-log',
-            'git-lost-found', 'git-ls-files', 'git-ls-remote', 'git-ls-tree',
-            'git-mailinfo', 'git-mailsplit', 'git-merge', 'git-merge-base',
-            'git-merge-file', 'git-merge-index', 'git-merge-octopus',
-            'git-merge-one-file', 'git-merge-ours', 'git-merge-recursive',
-            'git-merge-resolve', 'git-merge-subtree', 'git-mergetool',
-            'git-mergetool--lib', 'git-merge-tree', 'gitmkdirs', 'git-mktag',
-            'git-mktree', 'gitmount', 'git-mv', 'git-name-rev',
-            'git-pack-objects', 'git-pack-redundant', 'git-pack-refs',
-            'git-parse-remote', 'git-patch-id', 'git-peek-remote', 'git-prune',
-            'git-prune-packed', 'gitps', 'git-pull', 'git-push',
-            'git-quiltimport', 'git-read-tree', 'git-rebase',
-            'git-rebase--interactive', 'git-receive-pack', 'git-reflog',
-            'gitregrep', 'git-relink', 'git-remote', 'git-repack',
-            'git-repo-config', 'git-request-pull', 'git-rerere', 'git-reset',
-            'git-revert', 'git-rev-list', 'git-rev-parse', 'gitrfgrep',
-            'gitrgrep', 'git-rm', 'git-send-pack', 'git-shell', 'git-shortlog',
-            'git-show', 'git-show-branch', 'git-show-index', 'git-show-ref',
-            'git-sh-setup', 'git-stage', 'git-stash', 'git-status',
-            'git-stripspace', 'git-submodule', 'git-svn', 'git-symbolic-ref',
-            'git-tag', 'git-tar-tree', 'gitunpack', 'git-unpack-file',
-            'git-unpack-objects', 'git-update-index', 'git-update-ref',
-            'git-update-server-info', 'git-upload-archive', 'git-upload-pack',
-            'git-var', 'git-verify-pack', 'git-verify-tag', 'gitview',
-            'git-web--browse', 'git-whatchanged', 'gitwhich', 'gitwipe',
-            'git-write-tree', 'gitxgrep',
-
-            'head', 'hexdump', 'hostname',
-
-            'id', 'ifconfig', 'ifdown', 'ifup', 'igawk', 'install',
-
-            'ip', 'ip addr', 'ip addrlabel', 'ip link', 'ip maddr', 'ip mroute',
-            'ip neigh', 'ip route', 'ip rule', 'ip tunnel', 'ip xfrm',
-
-            'join',
-
-            'kbd_mode','kbdrate', 'kdialog', 'kfile', 'kill', 'killall',
-
-            'lame', 'last', 'lastb', 'ld', 'ld86', 'ldd', 'less', 'lex', 'link',
-            'ln', 'loadkeys', 'loadunimap', 'locate', 'lockfile', 'login',
-            'logname', 'lp', 'lpr', 'ls', 'lsattr', 'lsmod', 'lsmod.old',
-            'lspci', 'ltrace', 'lynx',
-
-            'm4', 'make', 'man', 'mapscrn', 'mesg', 'mkdir', 'mkfifo',
-            'mknod', 'mktemp', 'more', 'mount', 'mplayer', 'msgfmt', 'mv',
-
-            'namei', 'nano', 'nasm', 'nawk', 'netstat', 'nice',
-            'nisdomainname', 'nl', 'nm', 'nm86', 'nmap', 'nohup', 'nop',
-
-            'od', 'openvt',
-
-            'passwd', 'patch', 'pcregrep', 'pcretest', 'perl', 'perror',
-            'pgawk', 'pidof', 'ping', 'pr', 'procmail', 'prune', 'ps', 'pstree',
-            'ps2ascii', 'ps2epsi', 'ps2frag', 'ps2pdf', 'ps2ps', 'psbook',
-            'psmerge', 'psnup', 'psresize', 'psselect', 'pstops',
-
-            'rbash', 'rcs', 'rcs2log', 'read', 'readlink', 'red', 'resizecons',
-            'rev', 'rm', 'rmdir', 'rsh', 'run-parts',
-
-            'sash', 'scp', 'screen', 'sed', 'seq', 'sendmail', 'setfont',
-            'setkeycodes', 'setleds', 'setmetamode', 'setserial', 'setterm',
-            'sh', 'showkey', 'shred', 'size', 'size86', 'skill', 'sleep',
-            'slogin', 'snice', 'sort', 'sox', 'split', 'ssed', 'ssh', 'ssh-add',
-            'ssh-agent', 'ssh-keygen', 'ssh-keyscan', 'stat', 'strace',
-            'strings', 'strip', 'stty', 'su', 'sudo', 'suidperl', 'sum', 'svn',
-            'svnadmin', 'svndumpfilter', 'svnlook', 'svnmerge', 'svnmucc',
-            'svnserve', 'svnshell', 'svnsync', 'svnversion', 'svnwrap', 'sync',
-
-            'svn add', 'svn ann', 'svn annotate', 'svn blame', 'svn cat',
-            'svn changelist', 'svn checkout', 'svn ci', 'svn cl', 'svn cleanup',
-            'svn co', 'svn commit', 'svn copy', 'svn cp', 'svn del',
-            'svn delete', 'svn di', 'svn diff', 'svn export', 'svn h',
-            'svn help', 'svn import', 'svn info', 'svn list', 'svn lock',
-            'svn log', 'svn ls', 'svn merge', 'svn mergeinfo', 'svn mkdir',
-            'svn move', 'svn mv', 'svn pd', 'svn pdel', 'svn pe', 'svn pedit',
-            'svn pg', 'svn pget', 'svn pl', 'svn plist', 'svn praise',
-            'svn propdel', 'svn propedit', 'svn propget', 'svn proplist',
-            'svn propset', 'svn ps', 'svn pset', 'svn remove', 'svn ren',
-            'svn rename', 'svn resolve', 'svn resolved', 'svn revert', 'svn rm',
-            'svn st', 'svn stat', 'svn status', 'svn sw', 'svn switch',
-            'svn unlock', 'svn up', 'svn update',
-
-            'tac', 'tail', 'tar', 'tee', 'tempfile', 'touch', 'tr', 'tree',
-            'true',
-
-            'umount', 'uname', 'unicode_start', 'unicode_stop', 'uniq',
-            'unlink', 'unzip', 'updatedb', 'updmap', 'uptime', 'users',
-            'utmpdump', 'uuidgen',
-
-            'valgrind', 'vdir', 'vi', 'vim', 'vmstat',
-
-            'w', 'wall', 'watch', 'wc', 'wget', 'whatis', 'whereis',
-            'which', 'whiptail', 'who', 'whoami', 'whois', 'wine', 'wineboot',
-            'winebuild', 'winecfg', 'wineconsole', 'winedbg', 'winedump',
-            'winefile', 'wodim', 'write',
-
-            'xargs', 'xhost', 'xmodmap', 'xset',
-
-            'yacc', 'yes', 'ypdomainname', 'yum',
-
-            'yum check-update', 'yum clean', 'yum deplist', 'yum erase',
-            'yum groupinfo', 'yum groupinstall', 'yum grouplist',
-            'yum groupremove', 'yum groupupdate', 'yum info', 'yum install',
-            'yum list', 'yum localinstall', 'yum localupdate', 'yum makecache',
-            'yum provides', 'yum remove', 'yum resolvedep', 'yum search',
-            'yum shell', 'yum update', 'yum upgrade', 'yum whatprovides',
-
-            'zcat', 'zcmp', 'zdiff', 'zdump', 'zegrep', 'zfgrep', 'zforce',
-            'zgrep', 'zip', 'zipgrep', 'zipinfo', 'zless', 'zmore', 'znew',
-            'zsh', 'zsoelim'
-            ),
-        3 => array(
-            'alias', 'bg', 'bind', 'break', 'builtin', 'cd', 'command',
-            'compgen', 'complete', 'continue', 'declare', 'dirs', 'disown',
-            'echo', 'enable', 'eval', 'exec', 'exit', 'export', 'fc',
-            'fg', 'getopts', 'hash', 'help', 'history', 'jobs', 'let',
-            'local', 'logout', 'popd', 'printf', 'pushd', 'pwd', 'readonly',
-            'return', 'shift', 'shopt', 'source', 'suspend', 'test', 'times',
-            'trap', 'type', 'typeset', 'ulimit', 'umask', 'unalias', 'unset',
-            'wait'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #c20cb9; font-weight: bold;',
-            3 => 'color: #7a0874; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #666666; font-style: italic;',
-            1 => 'color: #800000;',
-            2 => 'color: #cc0000; font-style: italic;',
-            3 => 'color: #000000; font-weight: bold;',
-            4 => 'color: #666666;'
-            ),
-        'ESCAPE_CHAR' => array(
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #007800;',
-            3 => 'color: #007800;',
-            4 => 'color: #007800;',
-            5 => 'color: #780078;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #7a0874; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #007800;',
-            1 => 'color: #007800;',
-            2 => 'color: #007800;',
-            4 => 'color: #007800;',
-            5 => 'color: #660033;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Variables (will be handled by comment_regexps)
-        0 => "\\$\\{[a-zA-Z_][a-zA-Z0-9_]*?\\}",
-        //Variables without braces
-        1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
-        //Variable assignment
-        2 => "(?<![\.a-zA-Z_\-])([a-zA-Z_][a-zA-Z0-9_]*?)(?==)",
-        //Shorthand shell variables
-        4 => "\\$[*#\$\\-\\?!\d]",
-        //Parameters of commands
-        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|<(?:SEMI|PIPE)>|$)"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '$'
-        ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#:])",
-            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%=\\/:])",
-            2 => array(
-                'SPACE_AS_WHITESPACE' => false
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/basic4gl.php b/inc/geshi/basic4gl.php
deleted file mode 100644
index 35c927406..000000000
--- a/inc/geshi/basic4gl.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/*************************************************************************************
- * basic4gl.php
- * ---------------------------------
- * Author: Matthew Webb (bmatthew1@blueyonder.co.uk)
- * Copyright: (c) 2004 Matthew Webb (http://matthew-4gl.wikispaces.com)
- * Release Version: 1.0.8.11
- * Date Started: 2007/09/15
- *
- * Basic4GL language file for GeSHi.
- *
- * You can find the Basic4GL Website at (http://www.basic4gl.net/)
- *
- * CHANGES
- * -------
- * 2007/09/17 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2007/09/17)
- * -------------------------
- * Make sure all the OpenGL and Basic4GL commands have been added and are complete.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Basic4GL',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-
-            // Navy Blue Bold Keywords
-
-            'true','rnd_max','m_pi','m_e','false','VK_ZOOM','VK_UP','VK_TAB','VK_SUBTRACT','VK_SPACE','VK_SNAPSHOT',
-            'VK_SHIFT','VK_SEPARATOR','VK_SELECT','VK_SCROLL','VK_RWIN','VK_RSHIFT','VK_RMENU','VK_RIGHT','VK_RETURN',
-            'VK_RCONTROL','VK_RBUTTON','VK_PROCESSKEY','VK_PRIOR','VK_PRINT','VK_PLAY','VK_PAUSE','VK_NUMPAD9','VK_NUMPAD8',
-            'VK_NUMPAD7','VK_NUMPAD6','VK_NUMPAD5','VK_NUMPAD4','VK_NUMPAD3','VK_NUMPAD2','VK_NUMPAD1','VK_NUMPAD0',
-            'VK_NUMLOCK','VK_NONCONVERT','VK_NEXT','VK_MULTIPLY','VK_MODECHANGE','VK_MENU','VK_MBUTTON','VK_LWIN',
-            'VK_LSHIFT','VK_LMENU','VK_LEFT','VK_LCONTROL','VK_LBUTTON','VK_KANJI','VK_KANA','VK_JUNJA','VK_INSERT',
-            'VK_HOME','VK_HELP','VK_HANJA','VK_HANGUL','VK_HANGEUL','VK_FINAL','VK_F9','VK_F8','VK_F7','VK_F6','VK_F5',
-            'VK_F4','VK_F3','VK_F24','VK_F23','VK_F22','VK_F21','VK_F20','VK_F2','VK_F19','VK_F18','VK_F17','VK_F16',
-            'VK_F15','VK_F14','VK_F13','VK_F12','VK_F11','VK_F10','VK_F1','VK_EXSEL','VK_EXECUTE','VK_ESCAPE','VK_EREOF',
-            'VK_END','VK_DOWN','VK_DIVIDE','VK_DELETE','VK_DECIMAL','VK_CRSEL','VK_CONVERT','VK_CONTROL','VK_CLEAR',
-            'VK_CAPITAL','VK_CANCEL','VK_BACK','VK_ATTN','VK_APPS','VK_ADD','VK_ACCEPT','TEXT_SIMPLE','TEXT_OVERLAID',
-            'TEXT_BUFFERED','SPR_TILEMAP','SPR_SPRITE','SPR_INVALID','MOUSE_RBUTTON','MOUSE_MBUTTON','MOUSE_LBUTTON',
-            'GL_ZOOM_Y','GL_ZOOM_X','GL_ZERO','GL_XOR','GL_WIN_swap_hint','GL_WIN_draw_range_elements','GL_VIEWPORT_BIT',
-            'GL_VIEWPORT','GL_VERTEX_ARRAY_TYPE_EXT','GL_VERTEX_ARRAY_TYPE','GL_VERTEX_ARRAY_STRIDE_EXT','GL_VERTEX_ARRAY_STRIDE',
-            'GL_VERTEX_ARRAY_SIZE_EXT','GL_VERTEX_ARRAY_SIZE','GL_VERTEX_ARRAY_POINTER_EXT','GL_VERTEX_ARRAY_POINTER',
-            'GL_VERTEX_ARRAY_EXT','GL_VERTEX_ARRAY_COUNT_EXT','GL_VERTEX_ARRAY','GL_VERSION_1_1','GL_VERSION','GL_VENDOR',
-            'GL_V3F','GL_V2F','GL_UNSIGNED_SHORT','GL_UNSIGNED_INT','GL_UNSIGNED_BYTE','GL_UNPACK_SWAP_BYTES','GL_UNPACK_SKIP_ROWS',
-            'GL_UNPACK_SKIP_PIXELS','GL_UNPACK_ROW_LENGTH','GL_UNPACK_LSB_FIRST','GL_UNPACK_ALIGNMENT','GL_TRUE','GL_TRIANGLE_STRIP',
-            'GL_TRIANGLE_FAN','GL_TRIANGLES','GL_TRANSFORM_BIT','GL_TEXTURE_WRAP_T','GL_TEXTURE_WRAP_S','GL_TEXTURE_WIDTH',
-            'GL_TEXTURE_STACK_DEPTH','GL_TEXTURE_RESIDENT','GL_TEXTURE_RED_SIZE','GL_TEXTURE_PRIORITY','GL_TEXTURE_MIN_FILTER',
-            'GL_TEXTURE_MATRIX','GL_TEXTURE_MAG_FILTER','GL_TEXTURE_LUMINANCE_SIZE','GL_TEXTURE_INTERNAL_FORMAT','GL_TEXTURE_INTENSITY_SIZE',
-            'GL_TEXTURE_HEIGHT','GL_TEXTURE_GREEN_SIZE','GL_TEXTURE_GEN_T','GL_TEXTURE_GEN_S','GL_TEXTURE_GEN_R','GL_TEXTURE_GEN_Q',
-            'GL_TEXTURE_GEN_MODE','GL_TEXTURE_ENV_MODE','GL_TEXTURE_ENV_COLOR','GL_TEXTURE_ENV','GL_TEXTURE_COORD_ARRAY_TYPE_EXT',
-            'GL_TEXTURE_COORD_ARRAY_TYPE','GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','GL_TEXTURE_COORD_ARRAY_STRIDE','GL_TEXTURE_COORD_ARRAY_SIZE_EXT',
-            'GL_TEXTURE_COORD_ARRAY_SIZE','GL_TEXTURE_COORD_ARRAY_POINTER_EXT','GL_TEXTURE_COORD_ARRAY_POINTER','GL_TEXTURE_COORD_ARRAY_EXT',
-            'GL_TEXTURE_COORD_ARRAY_COUNT_EXT','GL_TEXTURE_COORD_ARRAY','GL_TEXTURE_COMPONENTS','GL_TEXTURE_BORDER_COLOR','GL_TEXTURE_BORDER',
-            'GL_TEXTURE_BLUE_SIZE','GL_TEXTURE_BIT','GL_TEXTURE_BINDING_2D','GL_TEXTURE_BINDING_1D','GL_TEXTURE_ALPHA_SIZE',
-            'GL_TEXTURE_2D','GL_TEXTURE_1D','GL_TEXTURE9_ARB','GL_TEXTURE9','GL_TEXTURE8_ARB','GL_TEXTURE8','GL_TEXTURE7_ARB',
-            'GL_TEXTURE7','GL_TEXTURE6_ARB','GL_TEXTURE6','GL_TEXTURE5_ARB','GL_TEXTURE5','GL_TEXTURE4_ARB','GL_TEXTURE4',
-            'GL_TEXTURE3_ARB','GL_TEXTURE31_ARB','GL_TEXTURE31','GL_TEXTURE30_ARB','GL_TEXTURE30','GL_TEXTURE3','GL_TEXTURE2_ARB',
-            'GL_TEXTURE29_ARB','GL_TEXTURE29','GL_TEXTURE28_ARB','GL_TEXTURE28','GL_TEXTURE27_ARB','GL_TEXTURE27','GL_TEXTURE26_ARB',
-            'GL_TEXTURE26','GL_TEXTURE25_ARB','GL_TEXTURE25','GL_TEXTURE24_ARB','GL_TEXTURE24','GL_TEXTURE23_ARB','GL_TEXTURE23',
-            'GL_TEXTURE22_ARB','GL_TEXTURE22','GL_TEXTURE21_ARB','GL_TEXTURE21','GL_TEXTURE20_ARB','GL_TEXTURE20','GL_TEXTURE2',
-            'GL_TEXTURE1_ARB','GL_TEXTURE19_ARB','GL_TEXTURE19','GL_TEXTURE18_ARB','GL_TEXTURE18','GL_TEXTURE17_ARB',
-            'GL_TEXTURE17','GL_TEXTURE16_ARB','GL_TEXTURE16','GL_TEXTURE15_ARB','GL_TEXTURE15','GL_TEXTURE14_ARB','GL_TEXTURE14',
-            'GL_TEXTURE13_ARB','GL_TEXTURE13','GL_TEXTURE12_ARB','GL_TEXTURE12','GL_TEXTURE11_ARB','GL_TEXTURE11','GL_TEXTURE10_ARB',
-            'GL_TEXTURE10','GL_TEXTURE1','GL_TEXTURE0_ARB','GL_TEXTURE0','GL_TEXTURE','GL_T4F_V4F','GL_T4F_C4F_N3F_V4F','GL_T2F_V3F',
-            'GL_T2F_N3F_V3F','GL_T2F_C4UB_V3F','GL_T2F_C4F_N3F_V3F','GL_T2F_C3F_V3F','GL_T','GL_SUBPIXEL_BITS','GL_STEREO',
-            'GL_STENCIL_WRITEMASK','GL_STENCIL_VALUE_MASK','GL_STENCIL_TEST','GL_STENCIL_REF','GL_STENCIL_PASS_DEPTH_PASS',
-            'GL_STENCIL_PASS_DEPTH_FAIL','GL_STENCIL_INDEX','GL_STENCIL_FUNC','GL_STENCIL_FAIL','GL_STENCIL_CLEAR_VALUE',
-            'GL_STENCIL_BUFFER_BIT','GL_STENCIL_BITS','GL_STENCIL','GL_STACK_UNDERFLOW','GL_STACK_OVERFLOW','GL_SRC_COLOR',
-            'GL_SRC_ALPHA_SATURATE','GL_SRC_ALPHA','GL_SPOT_EXPONENT','GL_SPOT_DIRECTION','GL_SPOT_CUTOFF','GL_SPHERE_MAP',
-            'GL_SPECULAR','GL_SOURCE2_RGB_EXT','GL_SOURCE2_RGB','GL_SOURCE2_ALPHA_EXT','GL_SOURCE2_ALPHA','GL_SOURCE1_RGB_EXT',
-            'GL_SOURCE1_RGB','GL_SOURCE1_ALPHA_EXT','GL_SOURCE1_ALPHA','GL_SOURCE0_RGB_EXT','GL_SOURCE0_RGB','GL_SOURCE0_ALPHA_EXT',
-            'GL_SOURCE0_ALPHA','GL_SMOOTH','GL_SHORT','GL_SHININESS','GL_SHADE_MODEL','GL_SET','GL_SELECTION_BUFFER_SIZE',
-            'GL_SELECTION_BUFFER_POINTER','GL_SELECT','GL_SCISSOR_TEST','GL_SCISSOR_BOX','GL_SCISSOR_BIT','GL_S','GL_RIGHT',
-            'GL_RGB_SCALE_EXT','GL_RGB_SCALE','GL_RGBA_MODE','GL_RGBA8','GL_RGBA4','GL_RGBA2','GL_RGBA16','GL_RGBA12','GL_RGBA',
-            'GL_RGB8','GL_RGB5_A1','GL_RGB5','GL_RGB4','GL_RGB16','GL_RGB12','GL_RGB10_A2','GL_RGB10','GL_RGB','GL_RETURN',
-            'GL_REPLACE','GL_REPEAT','GL_RENDER_MODE','GL_RENDERER','GL_RENDER','GL_RED_SCALE','GL_RED_BITS','GL_RED_BIAS',
-            'GL_RED','GL_READ_BUFFER','GL_R3_G3_B2','GL_R','GL_QUAD_STRIP','GL_QUADS','GL_QUADRATIC_ATTENUATION','GL_Q',
-            'GL_PROXY_TEXTURE_2D','GL_PROXY_TEXTURE_1D','GL_PROJECTION_STACK_DEPTH','GL_PROJECTION_MATRIX','GL_PROJECTION',
-            'GL_PRIMARY_COLOR_EXT','GL_PRIMARY_COLOR','GL_PREVIOUS_EXT','GL_PREVIOUS','GL_POSITION','GL_POLYGON_TOKEN',
-            'GL_POLYGON_STIPPLE_BIT','GL_POLYGON_STIPPLE','GL_POLYGON_SMOOTH_HINT','GL_POLYGON_SMOOTH','GL_POLYGON_OFFSET_UNITS',
-            'GL_POLYGON_OFFSET_POINT','GL_POLYGON_OFFSET_LINE','GL_POLYGON_OFFSET_FILL','GL_POLYGON_OFFSET_FACTOR','GL_POLYGON_MODE',
-            'GL_POLYGON_BIT','GL_POLYGON','GL_POINT_TOKEN','GL_POINT_SMOOTH_HINT','GL_POINT_SMOOTH','GL_POINT_SIZE_RANGE',
-            'GL_POINT_SIZE_GRANULARITY','GL_POINT_SIZE','GL_POINT_BIT','GL_POINTS','GL_POINT','GL_PIXEL_MODE_BIT',
-            'GL_PIXEL_MAP_S_TO_S_SIZE','GL_PIXEL_MAP_S_TO_S','GL_PIXEL_MAP_R_TO_R_SIZE','GL_PIXEL_MAP_R_TO_R','GL_PIXEL_MAP_I_TO_R_SIZE',
-            'GL_PIXEL_MAP_I_TO_R','GL_PIXEL_MAP_I_TO_I_SIZE','GL_PIXEL_MAP_I_TO_I','GL_PIXEL_MAP_I_TO_G_SIZE','GL_PIXEL_MAP_I_TO_G',
-            'GL_PIXEL_MAP_I_TO_B_SIZE','GL_PIXEL_MAP_I_TO_B','GL_PIXEL_MAP_I_TO_A_SIZE','GL_PIXEL_MAP_I_TO_A','GL_PIXEL_MAP_G_TO_G_SIZE',
-            'GL_PIXEL_MAP_G_TO_G','GL_PIXEL_MAP_B_TO_B_SIZE','GL_PIXEL_MAP_B_TO_B','GL_PIXEL_MAP_A_TO_A_SIZE','GL_PIXEL_MAP_A_TO_A',
-            'GL_PHONG_WIN','GL_PHONG_HINT_WIN','GL_PERSPECTIVE_CORRECTION_HINT','GL_PASS_THROUGH_TOKEN','GL_PACK_SWAP_BYTES',
-            'GL_PACK_SKIP_ROWS','GL_PACK_SKIP_PIXELS','GL_PACK_ROW_LENGTH','GL_PACK_LSB_FIRST','GL_PACK_ALIGNMENT','GL_OUT_OF_MEMORY',
-            'GL_OR_REVERSE','GL_OR_INVERTED','GL_ORDER','GL_OR','GL_OPERAND2_RGB_EXT','GL_OPERAND2_RGB','GL_OPERAND2_ALPHA_EXT',
-            'GL_OPERAND2_ALPHA','GL_OPERAND1_RGB_EXT','GL_OPERAND1_RGB','GL_OPERAND1_ALPHA_EXT','GL_OPERAND1_ALPHA','GL_OPERAND0_RGB_EXT',
-            'GL_OPERAND0_RGB','GL_OPERAND0_ALPHA_EXT','GL_OPERAND0_ALPHA','GL_ONE_MINUS_SRC_COLOR','GL_ONE_MINUS_SRC_ALPHA',
-            'GL_ONE_MINUS_DST_COLOR','GL_ONE_MINUS_DST_ALPHA','GL_ONE','GL_OBJECT_PLANE','GL_OBJECT_LINEAR','GL_NO_ERROR',
-            'GL_NOTEQUAL','GL_NORMAL_ARRAY_TYPE_EXT','GL_NORMAL_ARRAY_TYPE','GL_NORMAL_ARRAY_STRIDE_EXT','GL_NORMAL_ARRAY_STRIDE',
-            'GL_NORMAL_ARRAY_POINTER_EXT','GL_NORMAL_ARRAY_POINTER','GL_NORMAL_ARRAY_EXT','GL_NORMAL_ARRAY_COUNT_EXT',
-            'GL_NORMAL_ARRAY','GL_NORMALIZE','GL_NOR','GL_NOOP','GL_NONE','GL_NICEST','GL_NEVER','GL_NEAREST_MIPMAP_NEAREST','GL_NEAREST_MIPMAP_LINEAR',
-            'GL_NEAREST','GL_NAND','GL_NAME_STACK_DEPTH','GL_N3F_V3F','GL_MULT','GL_MODULATE','GL_MODELVIEW_STACK_DEPTH','GL_MODELVIEW_MATRIX',
-            'GL_MODELVIEW','GL_MAX_VIEWPORT_DIMS','GL_MAX_TEXTURE_UNITS_ARB','GL_MAX_TEXTURE_UNITS','GL_MAX_TEXTURE_STACK_DEPTH',
-            'GL_MAX_TEXTURE_SIZE','GL_MAX_PROJECTION_STACK_DEPTH','GL_MAX_PIXEL_MAP_TABLE','GL_MAX_NAME_STACK_DEPTH','GL_MAX_MODELVIEW_STACK_DEPTH',
-            'GL_MAX_LIST_NESTING','GL_MAX_LIGHTS','GL_MAX_EVAL_ORDER','GL_MAX_ELEMENTS_VERTICES_WIN','GL_MAX_ELEMENTS_INDICES_WIN',
-            'GL_MAX_CLIP_PLANES','GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','GL_MAX_ATTRIB_STACK_DEPTH','GL_MATRIX_MODE','GL_MAP_STENCIL',
-            'GL_MAP_COLOR','GL_MAP2_VERTEX_4','GL_MAP2_VERTEX_3','GL_MAP2_TEXTURE_COORD_4','GL_MAP2_TEXTURE_COORD_3','GL_MAP2_TEXTURE_COORD_2',
-            'GL_MAP2_TEXTURE_COORD_1','GL_MAP2_NORMAL','GL_MAP2_INDEX','GL_MAP2_GRID_SEGMENTS','GL_MAP2_GRID_DOMAIN','GL_MAP2_COLOR_4',
-            'GL_MAP1_VERTEX_4','GL_MAP1_VERTEX_3','GL_MAP1_TEXTURE_COORD_4','GL_MAP1_TEXTURE_COORD_3','GL_MAP1_TEXTURE_COORD_2',
-            'GL_MAP1_TEXTURE_COORD_1','GL_MAP1_NORMAL','GL_MAP1_INDEX','GL_MAP1_GRID_SEGMENTS','GL_MAP1_GRID_DOMAIN',
-            'GL_MAP1_COLOR_4','GL_LUMINANCE_ALPHA','GL_LUMINANCE8_ALPHA8','GL_LUMINANCE8','GL_LUMINANCE6_ALPHA2','GL_LUMINANCE4_ALPHA4',
-            'GL_LUMINANCE4','GL_LUMINANCE16_ALPHA16','GL_LUMINANCE16','GL_LUMINANCE12_ALPHA4','GL_LUMINANCE12_ALPHA12','GL_LUMINANCE12',
-            'GL_LUMINANCE','GL_LOGIC_OP_MODE','GL_LOGIC_OP','GL_LOAD','GL_LIST_MODE','GL_LIST_INDEX','GL_LIST_BIT',
-            'GL_LIST_BASE','GL_LINE_WIDTH_RANGE','GL_LINE_WIDTH_GRANULARITY','GL_LINE_WIDTH','GL_LINE_TOKEN','GL_LINE_STRIP','GL_LINE_STIPPLE_REPEAT',
-            'GL_LINE_STIPPLE_PATTERN','GL_LINE_STIPPLE','GL_LINE_SMOOTH_HINT','GL_LINE_SMOOTH','GL_LINE_RESET_TOKEN','GL_LINE_LOOP',
-            'GL_LINE_BIT','GL_LINES','GL_LINEAR_MIPMAP_NEAREST','GL_LINEAR_MIPMAP_LINEAR','GL_LINEAR_ATTENUATION','GL_LINEAR',
-            'GL_LINE','GL_LIGHT_MODEL_TWO_SIDE','GL_LIGHT_MODEL_LOCAL_VIEWER','GL_LIGHT_MODEL_AMBIENT','GL_LIGHTING_BIT',
-            'GL_LIGHTING','GL_LIGHT7','GL_LIGHT6','GL_LIGHT5','GL_LIGHT4','GL_LIGHT3','GL_LIGHT2','GL_LIGHT1','GL_LIGHT0',
-            'GL_LESS','GL_LEQUAL','GL_LEFT','GL_KEEP','GL_INVERT','GL_INVALID_VALUE','GL_INVALID_OPERATION','GL_INVALID_ENUM','GL_INTERPOLATE_EXT',
-            'GL_INTERPOLATE','GL_INTENSITY8','GL_INTENSITY4','GL_INTENSITY16','GL_INTENSITY12','GL_INTENSITY','GL_INT',
-            'GL_INDEX_WRITEMASK','GL_INDEX_SHIFT','GL_INDEX_OFFSET','GL_INDEX_MODE','GL_INDEX_LOGIC_OP','GL_INDEX_CLEAR_VALUE','GL_INDEX_BITS',
-            'GL_INDEX_ARRAY_TYPE_EXT','GL_INDEX_ARRAY_TYPE','GL_INDEX_ARRAY_STRIDE_EXT','GL_INDEX_ARRAY_STRIDE','GL_INDEX_ARRAY_POINTER_EXT',
-            'GL_INDEX_ARRAY_POINTER','GL_INDEX_ARRAY_EXT','GL_INDEX_ARRAY_COUNT_EXT','GL_INDEX_ARRAY','GL_INCR','GL_HINT_BIT',
-            'GL_GREEN_SCALE','GL_GREEN_BITS','GL_GREEN_BIAS','GL_GREEN','GL_GREATER','GL_GEQUAL','GL_FRONT_RIGHT','GL_FRONT_LEFT',
-            'GL_FRONT_FACE','GL_FRONT_AND_BACK','GL_FRONT','GL_FOG_START','GL_FOG_SPECULAR_TEXTURE_WIN','GL_FOG_MODE','GL_FOG_INDEX',
-            'GL_FOG_HINT','GL_FOG_END','GL_FOG_DENSITY','GL_FOG_COLOR','GL_FOG_BIT','GL_FOG','GL_FLOAT','GL_FLAT','GL_FILL',
-            'GL_FEEDBACK_BUFFER_TYPE','GL_FEEDBACK_BUFFER_SIZE','GL_FEEDBACK_BUFFER_POINTER','GL_FEEDBACK','GL_FASTEST','GL_FALSE',
-            'GL_EYE_PLANE','GL_EYE_LINEAR','GL_EXT_vertex_array','GL_EXT_paletted_texture','GL_EXT_bgra','GL_EXTENSIONS','GL_EXP2',
-            'GL_EXP','GL_EVAL_BIT','GL_EQUIV','GL_EQUAL','GL_ENABLE_BIT','GL_EMISSION','GL_EDGE_FLAG_ARRAY_STRIDE_EXT','GL_EDGE_FLAG_ARRAY_STRIDE',
-            'GL_EDGE_FLAG_ARRAY_POINTER_EXT','GL_EDGE_FLAG_ARRAY_POINTER','GL_EDGE_FLAG_ARRAY_EXT','GL_EDGE_FLAG_ARRAY_COUNT_EXT','GL_EDGE_FLAG_ARRAY',
-            'GL_EDGE_FLAG','GL_DST_COLOR','GL_DST_ALPHA','GL_DRAW_PIXEL_TOKEN','GL_DRAW_BUFFER','GL_DOUBLE_EXT','GL_DOUBLEBUFFER',
-            'GL_DOUBLE','GL_DONT_CARE','GL_DOMAIN','GL_DITHER','GL_DIFFUSE','GL_DEPTH_WRITEMASK','GL_DEPTH_TEST','GL_DEPTH_SCALE',
-            'GL_DEPTH_RANGE','GL_DEPTH_FUNC','GL_DEPTH_COMPONENT','GL_DEPTH_CLEAR_VALUE','GL_DEPTH_BUFFER_BIT','GL_DEPTH_BITS',
-            'GL_DEPTH_BIAS','GL_DEPTH','GL_DECR','GL_DECAL','GL_CW','GL_CURRENT_TEXTURE_COORDS','GL_CURRENT_RASTER_TEXTURE_COORDS','GL_CURRENT_RASTER_POSITION_VALID',
-            'GL_CURRENT_RASTER_POSITION','GL_CURRENT_RASTER_INDEX','GL_CURRENT_RASTER_DISTANCE','GL_CURRENT_RASTER_COLOR','GL_CURRENT_NORMAL',
-            'GL_CURRENT_INDEX','GL_CURRENT_COLOR','GL_CURRENT_BIT','GL_CULL_FACE_MODE','GL_CULL_FACE','GL_COPY_PIXEL_TOKEN',
-            'GL_COPY_INVERTED','GL_COPY','GL_CONSTANT_EXT','GL_CONSTANT_ATTENUATION','GL_CONSTANT','GL_COMPILE_AND_EXECUTE','GL_COMPILE','GL_COMBINE_RGB_EXT',
-            'GL_COMBINE_RGB','GL_COMBINE_EXT','GL_COMBINE_ALPHA_EXT','GL_COMBINE_ALPHA','GL_COMBINE','GL_COLOR_WRITEMASK',
-            'GL_COLOR_TABLE_WIDTH_EXT','GL_COLOR_TABLE_RED_SIZE_EXT','GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','GL_COLOR_TABLE_INTENSITY_SIZE_EXT',
-            'GL_COLOR_TABLE_GREEN_SIZE_EXT','GL_COLOR_TABLE_FORMAT_EXT','GL_COLOR_TABLE_BLUE_SIZE_EXT','GL_COLOR_TABLE_ALPHA_SIZE_EXT',
-            'GL_COLOR_MATERIAL_PARAMETER','GL_COLOR_MATERIAL_FACE','GL_COLOR_MATERIAL','GL_COLOR_LOGIC_OP','GL_COLOR_INDEXES',
-            'GL_COLOR_INDEX8_EXT','GL_COLOR_INDEX4_EXT','GL_COLOR_INDEX2_EXT','GL_COLOR_INDEX1_EXT','GL_COLOR_INDEX16_EXT',
-            'GL_COLOR_INDEX12_EXT','GL_COLOR_INDEX','GL_COLOR_CLEAR_VALUE','GL_COLOR_BUFFER_BIT','GL_COLOR_ARRAY_TYPE_EXT',
-            'GL_COLOR_ARRAY_TYPE','GL_COLOR_ARRAY_STRIDE_EXT','GL_COLOR_ARRAY_STRIDE','GL_COLOR_ARRAY_SIZE_EXT','GL_COLOR_ARRAY_SIZE',
-            'GL_COLOR_ARRAY_POINTER_EXT','GL_COLOR_ARRAY_POINTER','GL_COLOR_ARRAY_EXT','GL_COLOR_ARRAY_COUNT_EXT','GL_COLOR_ARRAY',
-            'GL_COLOR','GL_COEFF','GL_CLIP_PLANE5','GL_CLIP_PLANE4','GL_CLIP_PLANE3','GL_CLIP_PLANE2','GL_CLIP_PLANE1','GL_CLIP_PLANE0',
-            'GL_CLIENT_VERTEX_ARRAY_BIT','GL_CLIENT_PIXEL_STORE_BIT','GL_CLIENT_ATTRIB_STACK_DEPTH','GL_CLIENT_ALL_ATTRIB_BITS',
-            'GL_CLIENT_ACTIVE_TEXTURE_ARB','GL_CLIENT_ACTIVE_TEXTURE','GL_CLEAR','GL_CLAMP','GL_CCW','GL_C4UB_V3F','GL_C4UB_V2F',
-            'GL_C4F_N3F_V3F','GL_C3F_V3F','GL_BYTE','GL_BLUE_SCALE','GL_BLUE_BITS','GL_BLUE_BIAS','GL_BLUE','GL_BLEND_SRC','GL_BLEND_DST',
-            'GL_BLEND','GL_BITMAP_TOKEN','GL_BITMAP','GL_BGR_EXT','GL_BGRA_EXT','GL_BACK_RIGHT','GL_BACK_LEFT','GL_BACK',
-            'GL_AUX_BUFFERS','GL_AUX3','GL_AUX2','GL_AUX1','GL_AUX0','GL_AUTO_NORMAL','GL_ATTRIB_STACK_DEPTH','GL_AND_REVERSE',
-            'GL_AND_INVERTED','GL_AND','GL_AMBIENT_AND_DIFFUSE','GL_AMBIENT','GL_ALWAYS','GL_ALPHA_TEST_REF','GL_ALPHA_TEST_FUNC',
-            'GL_ALPHA_TEST','GL_ALPHA_SCALE','GL_ALPHA_BITS','GL_ALPHA_BIAS','GL_ALPHA8','GL_ALPHA4','GL_ALPHA16','GL_ALPHA12',
-            'GL_ALPHA','GL_ALL_ATTRIB_BITS','GL_ADD_SIGNED_EXT','GL_ADD_SIGNED','GL_ADD','GL_ACTIVE_TEXTURE_ARB','GL_ACTIVE_TEXTURE',
-            'GL_ACCUM_RED_BITS','GL_ACCUM_GREEN_BITS','GL_ACCUM_CLEAR_VALUE','GL_ACCUM_BUFFER_BIT','GL_ACCUM_BLUE_BITS','GL_ACCUM_ALPHA_BITS',
-            'GL_ACCUM','GL_4_BYTES','GL_4D_COLOR_TEXTURE','GL_3_BYTES','GL_3D_COLOR_TEXTURE','GL_3D_COLOR','GL_3D','GL_2_BYTES',
-            'GL_2D','GLU_V_STEP','GLU_VERTEX','GLU_VERSION_1_2','GLU_VERSION_1_1','GLU_VERSION','GLU_U_STEP','GLU_UNKNOWN','GLU_TRUE',
-            'GLU_TESS_WINDING_RULE','GLU_TESS_WINDING_POSITIVE','GLU_TESS_WINDING_ODD','GLU_TESS_WINDING_NONZERO','GLU_TESS_WINDING_NEGATIVE',
-            'GLU_TESS_WINDING_ABS_GEQ_TWO','GLU_TESS_VERTEX_DATA','GLU_TESS_VERTEX','GLU_TESS_TOLERANCE','GLU_TESS_NEED_COMBINE_CALLBACK','GLU_TESS_MISSING_END_POLYGON',
-            'GLU_TESS_MISSING_END_CONTOUR','GLU_TESS_MISSING_BEGIN_POLYGON','GLU_TESS_MISSING_BEGIN_CONTOUR','GLU_TESS_ERROR_DATA',
-            'GLU_TESS_ERROR8','GLU_TESS_ERROR7','GLU_TESS_ERROR6','GLU_TESS_ERROR5','GLU_TESS_ERROR4','GLU_TESS_ERROR3','GLU_TESS_ERROR2',
-            'GLU_TESS_ERROR1','GLU_TESS_ERROR','GLU_TESS_END_DATA','GLU_TESS_END','GLU_TESS_EDGE_FLAG_DATA','GLU_TESS_EDGE_FLAG',
-            'GLU_TESS_COORD_TOO_LARGE','GLU_TESS_COMBINE_DATA','GLU_TESS_COMBINE','GLU_TESS_BOUNDARY_ONLY','GLU_TESS_BEGIN_DATA',
-            'GLU_TESS_BEGIN','GLU_SMOOTH','GLU_SILHOUETTE','GLU_SAMPLING_TOLERANCE','GLU_SAMPLING_METHOD','GLU_POINT','GLU_PATH_LENGTH',
-            'GLU_PARAMETRIC_TOLERANCE','GLU_PARAMETRIC_ERROR','GLU_OUT_OF_MEMORY','GLU_OUTSIDE','GLU_OUTLINE_POLYGON','GLU_OUTLINE_PATCH',
-            'GLU_NURBS_ERROR9','GLU_NURBS_ERROR8','GLU_NURBS_ERROR7','GLU_NURBS_ERROR6','GLU_NURBS_ERROR5','GLU_NURBS_ERROR4',
-            'GLU_NURBS_ERROR37','GLU_NURBS_ERROR36','GLU_NURBS_ERROR35','GLU_NURBS_ERROR34','GLU_NURBS_ERROR33','GLU_NURBS_ERROR32',
-            'GLU_NURBS_ERROR31','GLU_NURBS_ERROR30','GLU_NURBS_ERROR3','GLU_NURBS_ERROR29','GLU_NURBS_ERROR28','GLU_NURBS_ERROR27','GLU_NURBS_ERROR26',
-            'GLU_NURBS_ERROR25','GLU_NURBS_ERROR24','GLU_NURBS_ERROR23','GLU_NURBS_ERROR22','GLU_NURBS_ERROR21','GLU_NURBS_ERROR20',
-            'GLU_NURBS_ERROR2','GLU_NURBS_ERROR19','GLU_NURBS_ERROR18','GLU_NURBS_ERROR17','GLU_NURBS_ERROR16','GLU_NURBS_ERROR15','GLU_NURBS_ERROR14',
-            'GLU_NURBS_ERROR13','GLU_NURBS_ERROR12','GLU_NURBS_ERROR11','GLU_NURBS_ERROR10','GLU_NURBS_ERROR1','GLU_NONE',
-            'GLU_MAP1_TRIM_3','GLU_MAP1_TRIM_2','GLU_LINE','GLU_INVALID_VALUE','GLU_INVALID_ENUM','GLU_INTERIOR','GLU_INSIDE','GLU_INCOMPATIBLE_GL_VERSION',
-            'GLU_FLAT','GLU_FILL','GLU_FALSE','GLU_EXTERIOR','GLU_EXTENSIONS','GLU_ERROR','GLU_END','GLU_EDGE_FLAG','GLU_DOMAIN_DISTANCE',
-            'GLU_DISPLAY_MODE','GLU_CW','GLU_CULLING','GLU_CCW','GLU_BEGIN','GLU_AUTO_LOAD_MATRIX','CHANNEL_UNORDERED','CHANNEL_ORDERED',
-            'CHANNEL_MAX'
-            ),
-        2 => array(
-
-            // Red Lowercase Keywords
-
-            'WriteWord','WriteString','WriteReal','WriteLine','WriteInt','WriteFloat','WriteDouble','WriteChar','WriteByte',
-            'windowwidth','windowheight','waittimer','Vec4','Vec3','Vec2','val','UpdateJoystick','ucase$','Transpose','tickcount',
-            'textscroll','textrows','textmode','textcols','tanh','tand','tan','synctimercatchup','synctimer','swapbuffers',
-            'str$','stopsoundvoice','stopsounds','stopmusic','sqrt','sqr','sprzorder','spryvel','sprytiles','sprysize','spryrepeat',
-            'spryflip','sprycentre','spry','sprxvel','sprxtiles','sprxsize','sprxrepeat','sprxflip','sprxcentre','sprx',
-            'sprvisible','sprvel','sprtype','sprtop','sprspin','sprsolid','sprsetzorder','sprsetyvel','sprsetysize','sprsetyrepeat',
-            'sprsetyflip','sprsetycentre','sprsety','sprsetxvel','sprsetxsize','sprsetxrepeat','sprsetxflip','sprsetxcentre',
-            'sprsetx','sprsetvisible','sprsetvel','sprsettiles','sprsettextures','sprsettexture','sprsetspin','sprsetsolid',
-            'sprsetsize','sprsetscale','sprsetpos','sprsetparallax','sprsetframe','sprsetcolor','sprsetanimspeed','sprsetanimloop',
-            'sprsetangle','sprsetalpha','sprscale','sprright','sprpos','sprparallax','sprleft','spriteareawidth','spriteareaheight',
-            'sprframe','sprcolor','sprcameraz','sprcameray','sprcamerax','sprcamerasetz','sprcamerasety','sprcamerasetx',
-            'sprcamerasetpos','sprcamerasetfov','sprcamerasetangle','sprcamerapos','sprcamerafov','sprcameraangle',
-            'sprbottom','spranimspeed','spranimloop','spranimdone','sprangle','spralpha','spraddtextures','spraddtexture',
-            'sounderror','sleep','sind','sin','showcursor','sgn','settextscroll','setmusicvolume','SendMessage','Seek',
-            'scankeydown','RTInvert','rnd','right$','resizetext','resizespritearea','RejectConnection','ReceiveMessage','ReadWord',
-            'ReadText','ReadReal','ReadLine','ReadInt','ReadFloat','ReadDouble','ReadChar','ReadByte','randomize','printr',
-            'print','pow','playsound','playmusic','performancecounter','Orthonormalize','OpenFileWrite','OpenFileRead','Normalize',
-            'newtilemap','newsprite','NewServer','NewConnection','musicplaying','mouse_yd','mouse_y','mouse_xd','mouse_x',
-            'mouse_wheel','mouse_button','mid$','MessageSmoothed','MessageReliable','MessagePending','MessageChannel','maxtextureunits',
-            'MatrixZero','MatrixTranslate','MatrixScale','MatrixRotateZ','MatrixRotateY','MatrixRotateX','MatrixRotate','MatrixIdentity',
-            'MatrixCrossProduct','MatrixBasis','log','locate','loadtexture','loadsound','loadmipmaptexture','loadmipmapimagestrip',
-            'loadimagestrip','loadimage','Length','len','left$','lcase$','keydown','Joy_Y','Joy_X','Joy_Up','Joy_Right','Joy_Left',
-            'Joy_Keys','Joy_Down','Joy_Button','Joy_3','Joy_2','Joy_1','Joy_0','int','inscankey','input$','inkey$','inittimer',
-            'imagewidth','imagestripframes','imageheight','imageformat','imagedatatype','hidecursor','glViewport','glVertex4sv',
-            'glVertex4s','glVertex4iv','glVertex4i','glVertex4fv','glVertex4f','glVertex4dv','glVertex4d','glVertex3sv','glVertex3s',
-            'glVertex3iv','glVertex3i','glVertex3fv','glVertex3f','glVertex3dv','glVertex3d','glVertex2sv','glVertex2s','glVertex2iv',
-            'glVertex2i','glVertex2fv','glVertex2f','glVertex2dv','glVertex2d','gluPerspective','gluOrtho2D','gluLookAt',
-            'glubuild2dmipmaps','glTranslatef','glTranslated','gltexsubimage2d','glTexParameteriv','glTexParameteri',
-            'glTexParameterfv','glTexParameterf','glteximage2d','glTexGeniv','glTexGeni','glTexGenfv','glTexGenf','glTexGendv',
-            'glTexGend','glTexEnviv','glTexEnvi','glTexEnvfv','glTexEnvf','glTexCoord4sv','glTexCoord4s','glTexCoord4iv','glTexCoord4i',
-            'glTexCoord4fv','glTexCoord4f','glTexCoord4dv','glTexCoord4d','glTexCoord3sv','glTexCoord3s','glTexCoord3iv','glTexCoord3i',
-            'glTexCoord3fv','glTexCoord3f','glTexCoord3dv','glTexCoord3d','glTexCoord2sv','glTexCoord2s','glTexCoord2iv','glTexCoord2i',
-            'glTexCoord2fv','glTexCoord2f','glTexCoord2dv','glTexCoord2d','glTexCoord1sv','glTexCoord1s','glTexCoord1iv','glTexCoord1i','glTexCoord1fv',
-            'glTexCoord1f','glTexCoord1dv','glTexCoord1d','glStencilOp','glStencilMask','glStencilFunc','glShadeModel','glSelectBuffer',
-            'glScissor','glScalef','glScaled','glRotatef','glRotated','glRenderMode','glRectsv','glRects','glRectiv','glRecti',
-            'glRectfv','glRectf','glRectdv','glRectd','glReadBuffer','glRasterPos4sv','glRasterPos4s','glRasterPos4iv',
-            'glRasterPos4i','glRasterPos4fv','glRasterPos4f','glRasterPos4dv','glRasterPos4d','glRasterPos3sv','glRasterPos3s',
-            'glRasterPos3iv','glRasterPos3i','glRasterPos3fv','glRasterPos3f','glRasterPos3dv','glRasterPos3d','glRasterPos2sv',
-            'glRasterPos2s','glRasterPos2iv','glRasterPos2i','glRasterPos2fv','glRasterPos2f','glRasterPos2dv','glRasterPos2d',
-            'glPushName','glPushMatrix','glPushClientAttrib','glPushAttrib','glPrioritizeTextures','glPopName','glPopMatrix',
-            'glPopClientAttrib','glPopAttrib','glpolygonstipple','glPolygonOffset','glPolygonMode','glPointSize','glPixelZoom',
-            'glPixelTransferi','glPixelTransferf','glPixelStorei','glPixelStoref','glPassThrough','glOrtho','glNormal3sv','glNormal3s',
-            'glNormal3iv','glNormal3i','glNormal3fv','glNormal3f','glNormal3dv','glNormal3d','glNormal3bv','glNormal3b','glNewList',
-            'glMultMatrixf','glMultMatrixd','glmultitexcoord2f','glmultitexcoord2d','glMatrixMode','glMaterialiv','glMateriali',
-            'glMaterialfv','glMaterialf','glMapGrid2f','glMapGrid2d','glMapGrid1f','glMapGrid1d','glLogicOp','glLoadName','glLoadMatrixf',
-            'glLoadMatrixd','glLoadIdentity','glListBase','glLineWidth','glLineStipple','glLightModeliv','glLightModeli','glLightModelfv',
-            'glLightModelf','glLightiv','glLighti','glLightfv','glLightf','glIsTexture','glIsList','glIsEnabled','glInitNames',
-            'glIndexubv','glIndexub','glIndexsv','glIndexs','glIndexMask','glIndexiv','glIndexi','glIndexfv','glIndexf','glIndexdv',
-            'glIndexd','glHint','glGetTexParameteriv','glGetTexParameterfv','glGetTexLevelParameteriv','glGetTexLevelParameterfv',
-            'glGetTexGeniv','glGetTexGenfv','glGetTexGendv','glGetTexEnviv','glGetTexEnvfv','glgetstring','glgetpolygonstipple','glGetPixelMapuiv',
-            'glGetMaterialiv','glGetMaterialfv','glGetLightiv','glGetLightfv','glGetIntegerv','glGetFloatv',
-            'glGetError','glGetDoublev','glGetClipPlane','glGetBooleanv','glgentextures','glgentexture',
-            'glgenlists','glFrustum','glFrontFace','glFogiv','glFogi','glFogfv','glFogf','glFlush','glFinish','glFeedbackBuffer',
-            'glEvalPoint2','glEvalPoint1','glEvalMesh2','glEvalMesh1','glEvalCoord2fv','glEvalCoord2f','glEvalCoord2dv','glEvalCoord2d',
-            'glEvalCoord1fv','glEvalCoord1f','glEvalCoord1dv','glEvalCoord1d','glEndList','glEnd','glEnableClientState','glEnable',
-            'glEdgeFlagv','glEdgeFlag','glDrawBuffer','glDrawArrays','glDisableClientState','glDisable','glDepthRange','glDepthMask',
-            'glDepthFunc','gldeletetextures','gldeletetexture','gldeletelists','glCullFace','glCopyTexSubImage2D','glCopyTexSubImage1D',
-            'glCopyTexImage2D','glCopyTexImage1D','glColorMaterial','glColorMask','glColor4usv','glColor4us','glColor4uiv','glColor4ui',
-            'glColor4ubv','glColor4ub','glColor4sv','glColor4s','glColor4iv','glColor4i','glColor4fv','glColor4f','glColor4dv',
-            'glColor4d','glColor4bv','glColor4b','glColor3usv','glColor3us','glColor3uiv','glColor3ui','glColor3ubv','glColor3ub',
-            'glColor3sv','glColor3s','glColor3iv','glColor3i','glColor3fv','glColor3f','glColor3dv','glColor3d','glColor3bv',
-            'glColor3b','glClipPlane','glClearStencil','glClearIndex','glClearDepth','glClearColor','glClearAccum','glClear',
-            'glcalllists','glCallList','glBlendFunc','glBindTexture','glBegin','glArrayElement','glAreTexturesResident',
-            'glAlphaFunc','glactivetexture','glAccum','font','FindNextFile','FindFirstFile','FindClose','FileError',
-            'extensionsupported','exp','execute','EndOfFile','drawtext','divbyzero','Determinant','deletesprite','deletesound',
-            'DeleteServer','deleteimage','DeleteConnection','defaultfont','CrossProduct','cosd','cos','copysprite','ConnectionPending',
-            'ConnectionHandShaking','ConnectionConnected','ConnectionAddress','compilererrorline','compilererrorcol','compilererror',
-            'compilefile','compile','color','cls','CloseFile','clearregion','clearline','clearkeys','chr$','charat$','bindsprite',
-            'beep','atnd','atn2d','atn2','atn','atand','asc','argcount','arg','animatesprites','AcceptConnection','abs'
-            ),
-        3 => array(
-
-            // Blue Lowercase Keywords
-
-            'xor','while','wend','until','type','traditional_print','traditional','to','then','struc','string','step','single',
-            'run','return','reset','read','or','null','not','next','lor','loop','language','land','integer','input','if',
-            'goto','gosub','for','endstruc','endif','end','elseif','else','double','do','dim','data','const','basic4gl','as',
-            'and','alloc'
-            )
-
-        ),
-    'SYMBOLS' => array(
-        '=', '<', '>', '>=', '<=', '+', '-', '*', '/', '%', '(', ')', '{', '}', '[', ']', '&', ';', ':', '$'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080; font-weight: bold;',
-            2 => 'color: #FF0000;',
-            3 => 'color: #0000FF;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #657CC4; font-style: italic;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000080;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #008000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000080; font-weight: bold;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #0000FF;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/bf.php b/inc/geshi/bf.php
deleted file mode 100644
index c06ca5bf6..000000000
--- a/inc/geshi/bf.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*************************************************************************************
- * bf.php
- * ----------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/31
- *
- * Brainfuck language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/31 (1.0.8.1)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'Brainfuck',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(1 => '/[^\n+\-<>\[\]\.\,Y]+/s'),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        0 => array('+', '-'),
-        1 => array('[', ']'),
-        2 => array('<', '>'),
-        3 => array('.', ','),
-        4 => array('Y') //Brainfork Extension ;-)
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #660000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #006600;',
-            1 => 'color: #660000;',
-            2 => 'color: #000066;',
-            3 => 'color: #666600;',
-            4 => 'color: #660066;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'STRINGS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER,
-            'BRACKETS' => GESHI_NEVER
-        ),
-        'KEYWORDS' => array(
-            'DISALLOW_BEFORE' => '',
-            'DISALLOW_AFTER' => ''
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/bibtex.php b/inc/geshi/bibtex.php
deleted file mode 100644
index 51cb4cebd..000000000
--- a/inc/geshi/bibtex.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/********************************************************************************
- * bibtex.php
- * -----
- * Author: Quinn Taylor (quinntaylor@mac.com)
- * Copyright: (c) 2009 Quinn Taylor (quinntaylor@mac.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2009/04/29
- *
- * BibTeX language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/04/29 (1.0.8.4)
- *  -  First Release
- *
- * TODO
- * -------------------------
- *  - Add regex for matching and replacing URLs with corresponding hyperlinks
- *  - Add regex for matching more LaTeX commands that may be embedded in BibTeX
- *    (Someone who understands regex better than I should borrow from latex.php)
- ********************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
-*******************************************************************************/
-
-// http://en.wikipedia.org/wiki/BibTeX
-// http://www.fb10.uni-bremen.de/anglistik/langpro/bibliographies/jacobsen-bibtex.html
-
-$language_data = array (
-    'LANG_NAME' => 'BibTeX',
-    'OOLANG' => false,
-    'COMMENT_SINGLE' => array(
-        1 => '%%'
-        ),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        0 => array(
-            '@comment','@preamble','@string'
-            ),
-        // Standard entry types
-        1 => array(
-            '@article','@book','@booklet','@conference','@inbook',
-            '@incollection','@inproceedings','@manual','@mastersthesis',
-            '@misc','@phdthesis','@proceedings','@techreport','@unpublished'
-            ),
-        // Custom entry types
-        2 => array(
-            '@collection','@patent','@webpage'
-            ),
-        // Standard entry field names
-        3 => array(
-            'address','annote','author','booktitle','chapter','crossref',
-            'edition','editor','howpublished','institution','journal','key',
-            'month','note','number','organization','pages','publisher','school',
-            'series','title','type','volume','year'
-            ),
-        // Custom entry field names
-        4 => array(
-            'abstract','affiliation','chaptername','cited-by','cites',
-            'contents','copyright','date-added','date-modified','doi','eprint',
-            'isbn','issn','keywords','language','lccn','lib-congress',
-            'location','price','rating','read','size','source','url'
-            )
-        ),
-    'URLS' => array(
-        0 => '',
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'SYMBOLS' => array(
-        '{', '}', '#', '=', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        GESHI_COMMENTS => false,
-        ),
-    // Define the colors for the groups listed above
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #C02020;', // Standard entry types
-            2 => 'color: #C02020;', // Custom entry types
-            3 => 'color: #C08020;', // Standard entry field names
-            4 => 'color: #C08020;'  // Custom entry field names
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #2C922C; font-style: italic;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #2020C0;'
-            ),
-        'SYMBOLS' => array(
-            0 =>  'color: #E02020;'
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #2020C0;', // {...}
-            2 => 'color: #C08020;',  // BibDesk fields
-            3 => 'color: #800000;'   // LaTeX commands
-            ),
-        'ESCAPE_CHAR' => array(
-            0 =>  'color: #000000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 =>  'color: #E02020;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'REGEXPS' => array(
-        // {parameters}
-        1 => array(
-            GESHI_SEARCH => "(?<=\\{)(?:\\{(?R)\\}|[^\\{\\}])*(?=\\})",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => 's',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        2 => array(
-            GESHI_SEARCH => "\bBdsk-(File|Url)-\d+",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        3 => array(
-            GESHI_SEARCH => "\\\\[A-Za-z0-9]*+",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER
-            ),
-        'KEYWORDS' => array(
-            3 => array(
-                'DISALLOWED_AFTER' => '(?=\s*=)'
-                ),
-            4 => array(
-                'DISALLOWED_AFTER' => '(?=\s*=)'
-                ),
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/blitzbasic.php b/inc/geshi/blitzbasic.php
deleted file mode 100644
index 1d3c08d05..000000000
--- a/inc/geshi/blitzbasic.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/*************************************************************************************
- * blitzbasic.php
- * --------------
- * Author: P�draig O`Connel (info@moonsword.info)
- * Copyright: (c) 2005 P�draig O`Connel (http://moonsword.info)
- * Release Version: 1.0.8.11
- * Date Started: 16.10.2005
- *
- * BlitzBasic language file for GeSHi.
- *
- * It is a simple Basic dialect. Released for Games and Network Connections.
- * In this Language File are all functions included (2D BB and 3D BB)
- *
- *
- * CHANGES
- * -------
- * 2005/12/28 (1.0.1)
- *   -  Remove unnecessary style index for regexps
- * 2005/10/22 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2005/10/22)
- * -------------------------
- * * Sort out the Basic commands for splitting up.
- * * To set up the right colors.
- *      (the colors are ok, but not the correct ones)
- * * Split to BlitzBasic 2D and BlitzBasic 3D.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'BlitzBasic',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'If','EndIf','ElseIf','Else','While','Wend','Return','Next','Include','End Type','End Select','End If','End Function','End','Select',
-            'Type','Forever','For','Or','And','AppTitle','Case','Goto','Gosub','Step','Stop','Int','Last','False','Then','To','True','Until','Float',
-            'String','Before','Not'
-            ),
-        2 => array(
-            // All Functions - 2D BB and 3D BB
-            'Xor','WriteString','WriteShort','WritePixelFast','WritePixel','WriteLine','WriteInt','WriteFloat','WriteFile','WriteBytes',
-            'WriteByte','Write','WaitTimer','WaitMouse','WaitKey','WaitJoy','VWait','Viewport',
-            'Upper','UpdateGamma','UnlockBuffer','UDPTimeouts','UDPStreamPort','UDPStreamIP','UDPMsgPort','UDPMsgIP',
-            'Trim','TotalVidMem','TileImage','TileBlock','TFormImage','TFormFilter','Text',
-            'TCPTimeouts','TCPStreamPort','TCPStreamIP','Tan','SystemProperty','StringWidth','StringHeight','Str','StopNetGame',
-            'StopChannel','StartNetGame','Sqr','SoundVolume','SoundPitch','SoundPan','Sin','Shr',
-            'ShowPointer','Shl','Sgn','SetGfxDriver','SetGamma','SetFont','SetEnv','SetBuffer','SendUDPMsg','SendNetMsg',
-            'SeekFile','SeedRnd','ScanLine','ScaleImage','SaveImage','SaveBuffer','Sar','RuntimeError','RSet',
-            'RotateImage','RndSeed','Rnd','Right','ResumeChannel','Restore','ResizeImage','ResizeBank','Replace',
-            'Repeat','RecvUDPMsg','RecvNetMsg','RectsOverlap','Rect','ReadString','ReadShort','ReadPixelFast','ReadPixel','ReadLine',
-            'ReadInt','ReadFloat','ReadFile','ReadDir','ReadBytes','ReadByte','ReadAvail','Read','Rand','Print',
-            'PokeShort','PokeInt','PokeFloat','PokeByte','Plot','PlaySound','PlayMusic','PlayCDTrack','Pi','PeekShort',
-            'PeekInt','PeekFloat','PeekByte','PauseChannel','Oval','Origin','OpenTCPStream','OpenMovie','OpenFile',
-            'Null','NextFile','New','NetPlayerName','NetPlayerLocal','NetMsgType','NetMsgTo','NetMsgFrom',
-            'NetMsgData','MovieWidth','MoviePlaying','MovieHeight','MoveMouse','MouseZSpeed','MouseZ','MouseYSpeed','MouseY','MouseXSpeed',
-            'MouseX','MouseHit','MouseDown','Mod','Millisecs','MidHandle','Mid','MaskImage','LSet','Lower',
-            'LoopSound','Log10','Log','LockBuffer','Locate','Local','LoadSound','LoadImage','LoadFont','LoadBuffer',
-            'LoadAnimImage','Line','Len','Left','KeyHit','KeyDown','JoyZDir','JoyZ','JoyYDir',
-            'JoyYaw','JoyY','JoyXDir','JoyX','JoyVDir','JoyV','JoyUDir','JoyU','JoyType','JoyRoll',
-            'JoyPitch','JoyHit','JoyHat','JoyDown','JoinNetGame','Instr','Insert','Input',
-            'ImageYHandle','ImageXHandle','ImageWidth','ImagesOverlap','ImagesCollide','ImageRectOverlap','ImageRectCollide','ImageHeight','ImageBuffer',
-            'HostNetGame','HostIP','HidePointer','Hex','HandleImage','GraphicsWidth','GraphicsHeight','GraphicsDepth','GraphicsBuffer','Graphics',
-            'GrabImage','Global','GFXModeWidth','GFXModeHeight','GfxModeExists','GFXModeDepth','GfxDriverName','GetMouse',
-            'GetKey','GetJoy','GetEnv','GetColor','GammaRed','GammaGreen','GammaBlue','Function','FrontBuffer','FreeTimer',
-            'FreeSound','FreeImage','FreeFont','FreeBank','FontWidth','FontHeight','FlushMouse','FlushKeys',
-            'FlushJoy','Floor','Flip','First','FileType','FileSize','FilePos','Field',
-            'Exp','Exit','ExecFile','Eof','EndGraphics','Each','DrawMovie','DrawImageRect','DrawImage','DrawBlockRect','DrawBlock',
-            'DottedIP','Dim','DeleteNetPlayer','DeleteFile','DeleteDir','Delete','Delay','Default','DebugLog','Data',
-            'CurrentTime','CurrentDir','CurrentDate','CreateUDPStream','CreateTimer','CreateTCPServer','CreateNetPlayer','CreateImage','CreateDir','CreateBank',
-            'CountHostIPs','CountGFXModes','CountGfxDrivers','Cos','CopyStream','CopyRect','CopyPixelFast','CopyPixel','CopyImage','CopyFile',
-            'CopyBank','Const','CommandLine','ColorRed','ColorGreen','ColorBlue','Color','ClsColor','Cls','CloseUDPStream',
-            'CloseTCPStream','CloseTCPServer','CloseMovie','CloseFile','CloseDir','Chr','ChannelVolume','ChannelPlaying','ChannelPitch','ChannelPan',
-            'ChangeDir','Ceil','CallDLL','Bin','BankSize','BackBuffer','AvailVidMem','AutoMidHandle',
-            'ATan2','ATan','ASin','Asc','After','ACos','AcceptTCPStream','Abs',
-            // 3D Commands
-            'Wireframe','Windowed3D','WBuffer','VertexZ','VertexY',
-            'VertexX','VertexW','VertexV','VertexU','VertexTexCoords','VertexRed','VertexNZ','VertexNY','VertexNX','VertexNormal',
-            'VertexGreen','VertexCoords','VertexColor','VertexBlue','VertexAlpha','VectorYaw','VectorPitch','UpdateWorld','UpdateNormals','TurnEntity',
-            'TrisRendered','TriangleVertex','TranslateEntity','TFormVector','TFormPoint','TFormNormal','TFormedZ','TFormedY','TFormedX','TextureWidth',
-            'TextureName','TextureHeight','TextureFilter','TextureCoords','TextureBuffer','TextureBlend','TerrainZ','TerrainY','TerrainX','TerrainSize',
-            'TerrainShading','TerrainHeight','TerrainDetail','SpriteViewMode','ShowEntity','SetCubeFace','SetAnimTime','SetAnimKey','ScaleTexture','ScaleSprite',
-            'ScaleMesh','ScaleEntity','RotateTexture','RotateSprite','RotateMesh','RotateEntity','ResetEntity','RenderWorld','ProjectedZ','ProjectedY',
-            'ProjectedX','PositionTexture','PositionMesh','PositionEntity','PointEntity','PickedZ','PickedY','PickedX','PickedTriangle','PickedTime',
-            'PickedSurface','PickedNZ','PickedNY','PickedNX','PickedEntity','PaintSurface','PaintMesh','PaintEntity','NameEntity','MoveEntity',
-            'ModifyTerrain','MeshWidth','MeshHeight','MeshesIntersect','MeshDepth','MD2AnimTime','MD2AnimLength','MD2Animating','LoadTexture','LoadTerrain',
-            'LoadSprite','LoadMesh','LoadMD2','LoaderMatrix','LoadBSP','LoadBrush','LoadAnimTexture','LoadAnimSeq','LoadAnimMesh','Load3DSound',
-            'LinePick','LightRange','LightMesh','LightConeAngles','LightColor','HWMultiTex','HideEntity','HandleSprite','Graphics3D','GfxMode3DExists',
-            'GfxMode3D','GfxDriverCaps3D','GfxDriver3D','GetSurfaceBrush','GetSurface','GetParent','GetMatElement','GetEntityType','GetEntityBrush','GetChild',
-            'GetBrushTexture','FreeTexture','FreeEntity','FreeBrush','FlipMesh','FitMesh','FindSurface','FindChild','ExtractAnimSeq','EntityZ',
-            'EntityYaw','EntityY','EntityX','EntityVisible','EntityType','EntityTexture','EntityShininess','EntityRoll','EntityRadius','EntityPitch',
-            'EntityPickMode','EntityPick','EntityParent','EntityOrder','EntityName','EntityInView','EntityFX','EntityDistance','EntityColor','EntityCollided',
-            'EntityBox','EntityBlend','EntityAutoFade','EntityAlpha','EmitSound','Dither','DeltaYaw','DeltaPitch','CreateTexture','CreateTerrain',
-            'CreateSurface','CreateSprite','CreateSphere','CreatePlane','CreatePivot','CreateMirror','CreateMesh','CreateListener','CreateLight','CreateCylinder',
-            'CreateCube','CreateCone','CreateCamera','CreateBrush','CountVertices','CountTriangles','CountSurfaces','CountGfxModes3D','CountCollisions','CountChildren',
-            'CopyMesh','CopyEntity','CollisionZ','CollisionY','CollisionX','CollisionTriangle','CollisionTime','CollisionSurface','Collisions','CollisionNZ',
-            'CollisionNY','CollisionNX','CollisionEntity','ClearWorld','ClearTextureFilters','ClearSurface','ClearCollisions','CaptureWorld','CameraZoom','CameraViewport',
-            'CameraRange','CameraProjMode','CameraProject','CameraPick','CameraFogRange','CameraFogMode','CameraFogColor','CameraClsMode','CameraClsColor','BSPLighting',
-            'BSPAmbientLight','BrushTexture','BrushShininess','BrushFX','BrushColor','BrushBlend','BrushAlpha','AntiAlias','AnimTime','AnimSeq',
-            'AnimLength','Animating','AnimateMD2','Animate','AmbientLight','AlignToVector','AddVertex','AddTriangle','AddMesh','AddAnimSeq',
-            )
-        ),
-    'SYMBOLS' => array(
-        '(',')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066; font-weight: bold;',
-            2 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #D9D100; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000066;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #009900;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #CC0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '\\'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => false,
-        1 => false
-        )
-);
-
-?>
diff --git a/inc/geshi/bnf.php b/inc/geshi/bnf.php
deleted file mode 100644
index ca15cf9eb..000000000
--- a/inc/geshi/bnf.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/*************************************************************************************
- * bnf.php
- * --------
- * Author: Rowan Rodrik van der Molen (rowan@bigsmoke.us)
- * Copyright: (c) 2006 Rowan Rodrik van der Molen (http://www.bigsmoke.us/)
- * Release Version: 1.0.8.11
- * Date Started: 2006/09/28
- *
- * BNF (Backus-Naur form) language file for GeSHi.
- *
- * See http://en.wikipedia.org/wiki/Backus-Naur_form for more info on BNF.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- *  -  Removed superflicious regexps
- * 2006/09/18 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2006/09/18)
- * -------------------------
- * * Nothing I can think of
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'bnf',
-    'COMMENT_SINGLE' => array(';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(),
-    'SYMBOLS' => array(
-        0 => array('(', ')'),
-        1 => array('<', '>'),
-        2 => array('[', ']'),
-        3 => array('{', '}'),
-        4 => array('=', '*', '/', '|', ':'),
-    ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false
-    ),
-    'STYLES' => array(
-        'KEYWORDS' => array(),
-        'COMMENTS' => array(
-            0 => 'color: #666666; font-style: italic;', // Single Line comments
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => ''
-            ),
-        'STRINGS' => array(
-            0 => 'color: #a00;',
-            1 => 'color: #a00;'
-            ),
-        'NUMBERS' => array(
-            0 => ''
-            ),
-        'METHODS' => array(
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066; font-weight: bold;', // Round brackets
-            1 => 'color: #000066; font-weight: bold;', // Angel Brackets
-            2 => 'color: #000066; font-weight: bold;', // Square Brackets
-            3 => 'color: #000066; font-weight: bold;', // BRaces
-            4 => 'color: #006600; font-weight: bold;', // Other operator symbols
-        ),
-        'REGEXPS' => array(
-            0 => 'color: #007;',
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        //terminal symbols
-        0 => array(
-            GESHI_SEARCH => '(&lt;)([^&]+?)(&gt;)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/boo.php b/inc/geshi/boo.php
deleted file mode 100644
index b68d442f7..000000000
--- a/inc/geshi/boo.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/*************************************************************************************
- * boo.php
- * --------
- * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
- * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
- * Release Version: 1.0.8.11
- * Date Started: 2007/09/10
- *
- * Boo language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2004/09/10 (1.0.8)
- *  -  First Release
- *
- * TODO (updated 2007/09/10)
- * -------------------------
- * Regular Expression Literal matching
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Boo',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'''", "'", '"""', '"'),
-    'HARDQUOTE' => array('"""', '"""'),
-    'HARDESCAPE' => array('\"""'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(//Namespace
-            'namespace', 'import', 'from'
-            ),
-        2 => array(//Jump
-            'yield', 'return', 'goto', 'continue', 'break'
-            ),
-        3 => array(//Conditional
-            'while', 'unless', 'then', 'in', 'if', 'for', 'else', 'elif'
-            ),
-        4 => array(//Property
-            'set', 'get'
-            ),
-        5 => array(//Exception
-            'try', 'raise', 'failure', 'except', 'ensure'
-            ),
-        6 => array(//Visibility
-            'public', 'private', 'protected', 'internal'
-            ),
-        7 => array(//Define
-            'struct', 'ref', 'of', 'interface', 'event', 'enum', 'do', 'destructor', 'def', 'constructor', 'class'
-            ),
-        8 => array(//Cast
-            'typeof', 'cast', 'as'
-            ),
-        9 => array(//BiMacro
-            'yieldAll', 'using', 'unchecked', 'rawArayIndexing', 'print', 'normalArrayIndexing', 'lock',
-            'debug', 'checked', 'assert'
-            ),
-        10 => array(//BiAttr
-            'required', 'property', 'meta', 'getter', 'default'
-            ),
-        11 => array(//BiFunc
-            'zip', 'shellp', 'shellm', 'shell', 'reversed', 'range', 'prompt',
-            'matrix', 'map', 'len', 'join', 'iterator', 'gets', 'enumerate', 'cat', 'array'
-            ),
-        12 => array(//HiFunc
-            '__switch__', '__initobj__', '__eval__', '__addressof__', 'quack'
-            ),
-        13 => array(//Primitive
-            'void', 'ushort', 'ulong', 'uint', 'true', 'timespan', 'string', 'single',
-            'short', 'sbyte', 'regex', 'object', 'null', 'long', 'int', 'false', 'duck',
-            'double', 'decimal', 'date', 'char', 'callable', 'byte', 'bool'
-            ),
-        14 => array(//Operator
-            'not', 'or', 'and', 'is', 'isa',
-            ),
-        15 => array(//Modifier
-            'virtual', 'transient', 'static', 'partial', 'override', 'final', 'abstract'
-            ),
-        16 => array(//Access
-            'super', 'self'
-            ),
-        17 => array(//Pass
-            'pass'
-            )
-        ),
-    'SYMBOLS' => array(
-        '[|', '|]', '${', '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', '+', '-', ';'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true,
-        10 => true,
-        11 => true,
-        12 => true,
-        13 => true,
-        14 => true,
-        15 => true,
-        16 => true,
-        17 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color:green;font-weight:bold;',
-            2 => 'color:navy;',
-            3 => 'color:blue;font-weight:bold;',
-            4 => 'color:#8B4513;',
-            5 => 'color:teal;font-weight:bold;',
-            6 => 'color:blue;font-weight:bold;',
-            7 => 'color:blue;font-weight:bold;',
-            8 => 'color:blue;font-weight:bold;',
-            9 => 'color:maroon;',
-            10 => 'color:maroon;',
-            11 => 'color:purple;',
-            12 => 'color:#4B0082;',
-            13 => 'color:purple;font-weight:bold;',
-            14 => 'color:#008B8B;font-weight:bold;',
-            15 => 'color:brown;',
-            16 => 'color:black;font-weight:bold;',
-            17 => 'color:gray;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #999999; font-style: italic;',
-            2 => 'color: #999999; font-style: italic;',
-            'MULTI' => 'color: #008000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #0000FF; font-weight: bold;',
-            'HARD' => 'color: #0000FF; font-weight: bold;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #006400;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #008000;',
-            'HARD' => 'color: #008000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #00008B;'
-            ),
-        'METHODS' => array(
-            0 => 'color: 000000;',
-            1 => 'color: 000000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #006400;'
-            ),
-        'REGEXPS' => array(
-            #0 => 'color: #0066ff;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        9 => '',
-        10 => '',
-        11 => '',
-        12 => '',
-        13 => '',
-        14 => '',
-        15 => '',
-        16 => '',
-        17 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        0 => '.',
-        1 => '::'
-        ),
-    'REGEXPS' => array(
-        #0 => '%(@)?\/(?:(?(1)[^\/\\\\\r\n]+|[^\/\\\\\r\n \t]+)|\\\\[\/\\\\\w+()|.*?$^[\]{}\d])+\/%'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/c.php b/inc/geshi/c.php
deleted file mode 100644
index 35d5b019d..000000000
--- a/inc/geshi/c.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-/*************************************************************************************
- * c.php
- * -----
- * Author: Nigel McNie (nigel@geshi.org)
- * Contributors:
- *  - Jack Lloyd (lloyd@randombit.net)
- *  - Michael Mol (mikemol@gmail.com)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * C language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/01/22 (1.0.8.3)
- *   -  Made keywords case-sensitive.
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2004/XX/XX (1.0.4)
- *   -  Added a couple of new keywords (Jack Lloyd)
- * 2004/11/27 (1.0.3)
- *   -  Added support for multiple object splitters
- * 2004/10/27 (1.0.2)
- *   -  Added support for URLs
- * 2004/08/05 (1.0.1)
- *   -  Added support for symbols
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2009/02/08)
- * -------------------------
- *  -  Get a list of inbuilt functions to add (and explore C more
- *     to complete this rather bare language file
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'C',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'if', 'return', 'while', 'case', 'continue', 'default',
-            'do', 'else', 'for', 'switch', 'goto'
-            ),
-        2 => array(
-            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
-            ),
-        3 => array(
-            // assert.h
-            'assert',
-
-            //complex.h
-            'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan',
-            'catanh', 'ccos', 'ccosh', 'cexp', 'cimag', 'cis', 'clog', 'conj',
-            'cpow', 'cproj', 'creal', 'csin', 'csinh', 'csqrt', 'ctan', 'ctanh',
-
-            //ctype.h
-            'digittoint', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl',
-            'isdigit', 'isgraph', 'islower', 'isprint', 'ispunct', 'isspace',
-            'isupper', 'isxdigit', 'toascii', 'tolower', 'toupper',
-
-            //inttypes.h
-            'imaxabs', 'imaxdiv', 'strtoimax', 'strtoumax', 'wcstoimax',
-            'wcstoumax',
-
-            //locale.h
-            'localeconv', 'setlocale',
-
-            //math.h
-            'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
-            'fabs', 'floor', 'frexp', 'ldexp', 'log', 'log10', 'modf', 'pow',
-            'sin', 'sinh', 'sqrt', 'tan', 'tanh',
-
-            //setjmp.h
-            'longjmp', 'setjmp',
-
-            //signal.h
-            'raise',
-
-            //stdarg.h
-            'va_arg', 'va_copy', 'va_end', 'va_start',
-
-            //stddef.h
-            'offsetof',
-
-            //stdio.h
-            'clearerr', 'fclose', 'fdopen', 'feof', 'ferror', 'fflush', 'fgetc',
-            'fgetpos', 'fgets', 'fopen', 'fprintf', 'fputc', 'fputchar',
-            'fputs', 'fread', 'freopen', 'fscanf', 'fseek', 'fsetpos', 'ftell',
-            'fwrite', 'getc', 'getch', 'getchar', 'gets', 'perror', 'printf',
-            'putc', 'putchar', 'puts', 'remove', 'rename', 'rewind', 'scanf',
-            'setbuf', 'setvbuf', 'snprintf', 'sprintf', 'sscanf', 'tmpfile',
-            'tmpnam', 'ungetc', 'vfprintf', 'vfscanf', 'vprintf', 'vscanf',
-            'vsprintf', 'vsscanf',
-
-            //stdlib.h
-            'abort', 'abs', 'atexit', 'atof', 'atoi', 'atol', 'bsearch',
-            'calloc', 'div', 'exit', 'free', 'getenv', 'itoa', 'labs', 'ldiv',
-            'ltoa', 'malloc', 'qsort', 'rand', 'realloc', 'srand', 'strtod',
-            'strtol', 'strtoul', 'system',
-
-            //string.h
-            'memchr', 'memcmp', 'memcpy', 'memmove', 'memset', 'strcat',
-            'strchr', 'strcmp', 'strcoll', 'strcpy', 'strcspn', 'strerror',
-            'strlen', 'strncat', 'strncmp', 'strncpy', 'strpbrk', 'strrchr',
-            'strspn', 'strstr', 'strtok', 'strxfrm',
-
-            //time.h
-            'asctime', 'clock', 'ctime', 'difftime', 'gmtime', 'localtime',
-            'mktime', 'strftime', 'time',
-
-            //wchar.h
-            'btowc', 'fgetwc', 'fgetws', 'fputwc', 'fputws', 'fwide',
-            'fwprintf', 'fwscanf', 'getwc', 'getwchar', 'mbrlen', 'mbrtowc',
-            'mbsinit', 'mbsrtowcs', 'putwc', 'putwchar', 'swprintf', 'swscanf',
-            'ungetwc', 'vfwprintf', 'vswprintf', 'vwprintf', 'wcrtomb',
-            'wcscat', 'wcschr', 'wcscmp', 'wcscoll', 'wcscpy', 'wcscspn',
-            'wcsftime', 'wcslen', 'wcsncat', 'wcsncmp', 'wcsncpy', 'wcspbrk',
-            'wcsrchr', 'wcsrtombs', 'wcsspn', 'wcsstr', 'wcstod', 'wcstok',
-            'wcstol', 'wcstoul', 'wcsxfrm', 'wctob', 'wmemchr', 'wmemcmp',
-            'wmemcpy', 'wmemmove', 'wmemset', 'wprintf', 'wscanf',
-
-            //wctype.h
-            'iswalnum', 'iswalpha', 'iswcntrl', 'iswctype', 'iswdigit',
-            'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace',
-            'iswupper', 'iswxdigit', 'towctrans', 'towlower', 'towupper',
-            'wctrans', 'wctype'
-            ),
-        4 => array(
-            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
-            'register', 'short', 'signed', 'sizeof', 'static', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t',
-
-            'int8', 'int16', 'int32', 'int64',
-            'uint8', 'uint16', 'uint32', 'uint64',
-
-            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
-            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
-
-            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
-            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
-
-            'int8_t', 'int16_t', 'int32_t', 'int64_t',
-            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
-
-            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
-            'size_t', 'off_t'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']',
-        '+', '-', '*', '/', '%',
-        '=', '<', '>',
-        '!', '^', '&', '|',
-        '?', ':',
-        ';', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #993333;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #339933;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/c_loadrunner.php b/inc/geshi/c_loadrunner.php
deleted file mode 100644
index 42b3d7721..000000000
--- a/inc/geshi/c_loadrunner.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/*************************************************************************************
- * c_loadrunner.php
- * ---------------------------------
- * Author: Stuart Moncrieff (stuart at myloadtest dot com)
- * Copyright: (c) 2010 Stuart Moncrieff (http://www.myloadtest.com/loadrunner-syntax-highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2010-07-25
- *
- * C (for LoadRunner) language file for GeSHi.
- *
- * Based on LoadRunner 9.52.
- *
- * CHANGES
- * -------
- * 2010-08-01 (1.0.8.9)
- *  -  Added highlighting support for LoadRunner {parameters}.
- * 2010-07-25 (1.0.8.8)
- *  -  First Release. Syntax highlighting support for lr_, web_, and sapgui_ functions only.
- *
- * TODO (updated 2010-07-25)
- * -------------------------
- *  - Add support for other vuser types: MMS, FTP, etc.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * ************************************************************************************/
-
-$language_data = array (
-    // The First Indices
-    'LANG_NAME' => 'C (LoadRunner)',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    // Escape characters within strings (like \\) are not highlighted differently in LoadRunner, so
-    // I am using GeSHi escape characters (or regular expressions) to highlight LoadRunner {parameters}.
-    // LoadRunner {parameters} must begin with a letter and contain only alphanumeric characters and '_'
-    'ESCAPE_REGEXP' => array(
-        0 => "#\{[a-zA-Z]{1}[a-zA-Z_]{0,}\}#",
-    ),
-
-    // Keywords
-    'KEYWORDS' => array(
-        // Keywords from http://en.wikipedia.org/wiki/C_syntax
-        1 => array(
-            'auto', 'break', 'case', 'char', 'const', 'continue', 'default',
-            'do', 'double', 'else', 'enum', 'extern', 'float', 'for', 'goto',
-            'if', 'inline', 'int', 'long', 'register', 'restrict', 'return',
-            'short', 'signed', 'sizeof', 'static', 'struct', 'switch',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'while',
-            '_Bool', '_Complex', '_Imaginary'
-            ),
-        // C preprocessor directives from http://en.wikipedia.org/wiki/C_preprocessor
-        2 => array(
-            '#define', '#if', '#ifdef', '#ifndef', '#include', '#else', '#elif', '#endif', '#pragma', '#undef'
-            ),
-        // Functions from lrun.h
-        3 => array(
-            'lr_start_transaction', 'lr_start_sub_transaction', 'lr_start_transaction_instance', 'lr_end_transaction',
-            'lr_end_sub_transaction', 'lr_end_transaction_instance', 'lr_stop_transaction', 'lr_stop_transaction_instance',
-            'lr_resume_transaction', 'lr_resume_transaction_instance', 'lr_wasted_time', 'lr_set_transaction', 'lr_user_data_point',
-            'lr_user_data_point_instance', 'lr_user_data_point_ex', 'lr_user_data_point_instance_ex', 'lr_get_transaction_duration',
-            'lr_get_trans_instance_duration', 'lr_get_transaction_think_time', 'lr_get_trans_instance_think_time',
-            'lr_get_transaction_wasted_time', 'lr_get_trans_instance_wasted_time', 'lr_get_transaction_status',
-            'lr_get_trans_instance_status', 'lr_set_transaction_status', 'lr_set_transaction_status_by_name',
-            'lr_set_transaction_instance_status', 'lr_start_timer', 'lr_end_timer', 'lr_rendezvous', 'lr_rendezvous_ex',
-            'lr_get_vuser_ip', 'lr_whoami', 'lr_get_host_name', 'lr_get_master_host_name', 'lr_get_attrib_long',
-            'lr_get_attrib_string', 'lr_get_attrib_double', 'lr_paramarr_idx', 'lr_paramarr_random', 'lr_paramarr_len',
-            'lr_param_unique', 'lr_param_sprintf', 'lr_load_dll', 'lr_continue_on_error', 'lr_decrypt', 'lr_abort', 'lr_exit',
-            'lr_peek_events', 'lr_think_time', 'lr_debug_message', 'lr_log_message', 'lr_message', 'lr_error_message',
-            'lr_output_message', 'lr_vuser_status_message', 'lr_fail_trans_with_error', 'lr_next_row', 'lr_advance_param',
-            'lr_eval_string', 'lr_eval_string_ext', 'lr_eval_string_ext_free', 'lr_param_increment', 'lr_save_var',
-            'lr_save_string', 'lr_save_int', 'lr_save_datetime', 'lr_save_searched_string', 'lr_set_debug_message',
-            'lr_get_debug_message', 'lr_enable_ip_spoofing', 'lr_disable_ip_spoofing', 'lr_convert_string_encoding'
-            ),
-        // Constants from lrun.h
-        4 => array(
-            'DP_FLAGS_NO_LOG', 'DP_FLAGS_STANDARD_LOG', 'DP_FLAGS_EXTENDED_LOG', 'merc_timer_handle_t', 'LR_EXIT_VUSER',
-            'LR_EXIT_ACTION_AND_CONTINUE', 'LR_EXIT_ITERATION_AND_CONTINUE', 'LR_EXIT_VUSER_AFTER_ITERATION',
-            'LR_EXIT_VUSER_AFTER_ACTION', 'LR_EXIT_MAIN_ITERATION_AND_CONTINUE', 'LR_MSG_CLASS_DISABLE_LOG',
-            'LR_MSG_CLASS_STANDARD_LOG', 'LR_MSG_CLASS_RETURNED_DATA', 'LR_MSG_CLASS_PARAMETERS', 'LR_MSG_CLASS_ADVANCED_TRACE',
-            'LR_MSG_CLASS_EXTENDED_LOG', 'LR_MSG_CLASS_SENT_DATA', 'LR_MSG_CLASS_JIT_LOG_ON_ERROR', 'LR_SWITCH_OFF', 'LR_SWITCH_ON',
-            'LR_SWITCH_DEFAULT', 'ONE_DAY', 'ONE_HOUR', 'ONE_MIN', 'DATE_NOW', 'TIME_NOW', 'LR_MSG_CLASS_BRIEF_LOG',
-            'LR_MSG_CLASS_RESULT_DATA', 'LR_MSG_CLASS_FULL_TRACE', 'LR_MSG_CLASS_AUTO_LOG', 'LR_MSG_OFF', 'LR_MSG_ON',
-            'LR_MSG_DEFAULT'
-            ),
-        // Functions from web_api.h
-        5 => array(
-            'web_reg_add_cookie', 'web_report_data_point', 'web_text_link', 'web_element', 'web_image_link', 'web_static_image',
-            'web_image_submit', 'web_button', 'web_edit_field', 'web_radio_group', 'web_check_box', 'web_list', 'web_text_area',
-            'web_map_area', 'web_eval_java_script', 'web_reg_dialog', 'web_reg_cross_step_download', 'web_browser',
-            'web_set_rts_key', 'web_save_param_length', 'web_save_timestamp_param', 'web_load_cache', 'web_dump_cache',
-            'web_add_cookie_ex'
-            ),
-        // Constants from web_api.h
-        6 => array(
-            'DESCRIPTION', 'ACTION', 'VERIFICATION', 'LR_NOT_FOUND', 'HTTP_INFO_TOTAL_REQUEST_STAT',
-            'HTTP_INFO_TOTAL_RESPONSE_STAT', 'LRW_OPT_STOP_VUSER_ON_ERROR', 'LRW_OPT_DISPLAY_IMAGE_BODY'
-            ),
-        // Functions from as_web.h
-        7 => array(
-            'web_add_filter', 'web_add_auto_filter', 'web_add_auto_header', 'web_add_header', 'web_add_cookie',
-            'web_cleanup_auto_headers', 'web_cleanup_cookies', 'web_concurrent_end', 'web_concurrent_start', 'web_create_html_param',
-            'web_create_html_param_ex', 'web_custom_request', 'web_disable_keep_alive', 'web_enable_keep_alive', 'web_find',
-            'web_get_int_property', 'web_image', 'web_image_check', 'web_link', 'web_global_verification', 'web_reg_find',
-            'web_reg_save_param', 'web_convert_param', 'web_remove_auto_filter', 'web_remove_auto_header', 'web_revert_auto_header',
-            'web_remove_cookie', 'web_save_header', 'web_set_certificate', 'web_set_certificate_ex', 'web_set_connections_limit',
-            'web_set_max_html_param_len', 'web_set_max_retries', 'web_set_proxy', 'web_set_proxy_bypass', 'web_set_secure_proxy',
-            'web_set_sockets_option', 'web_set_option', 'web_set_timeout', 'web_set_user', 'web_sjis_to_euc_param',
-            'web_submit_data', 'web_submit_form', 'web_url', 'web_set_proxy_bypass_local', 'web_cache_cleanup',
-            'web_create_html_query', 'web_create_radio_button_param', 'web_switch_net_layer'
-            ),
-        // Constants from as_web.h
-        8 => array(
-            'ENDFORM', 'LAST', 'ENDITEM', 'EXTRARES', 'ITEMDATA', 'STARTHIDDENS', 'ENDHIDDENS', 'CONNECT', 'RECEIVE', 'RESOLVE',
-            'STEP', 'REQUEST', 'RESPONSE', 'STARTQUERY', 'ENDQUERY', 'INPROPS', 'OUTPROPS', 'ENDPROPS', 'RAW_BODY_START',
-            'RAW_BODY_END', 'HTTP_INFO_RETURN_CODE', 'HTTP_INFO_DOWNLOAD_SIZE', 'HTTP_INFO_DOWNLOAD_TIME',
-            'LRW_NET_SOCKET_OPT_LOAD_VERIFY_FILE', 'LRW_NET_SOCKET_OPT_DEFAULT_VERIFY_PATH', 'LRW_NET_SOCKET_OPT_SSL_VERSION',
-            'LRW_NET_SOCKET_OPT_SSL_CIPHER_LIST', 'LRW_NET_SOCKET_OPT_SO_REUSE_ADDRESS', 'LRW_NET_SOCKET_OPT_USER_IP_ADDRESS',
-            'LRW_NET_SOCKET_OPT_IP_ADDRESS_BY_INDEX', 'LRW_NET_SOCKET_OPT_HELP', 'LRW_NET_SOCKET_OPT_PRINT_USER_IP_ADDRESS_LIST',
-            'LRW_OPT_HTML_CHAR_REF_BACKWARD_COMPATIBILITY', 'LRW_OPT_VALUE_YES', 'LRW_OPT_VALUE_NO'
-            ),
-        // Functions from as_sapgui.h
-        9 => array(
-            'sapgui_open_connection', 'sapgui_open_connection_ex', 'sapgui_logon', 'sapgui_create_session',
-            'sapgui_create_new_session', 'sapgui_call_method', 'sapgui_call_method_ex', 'sapgui_set_property',
-            'sapgui_get_property', 'sapgui_set_collection_property', 'sapgui_active_object_from_parent_method',
-            'sapgui_active_object_from_parent_property', 'sapgui_call_method_of_active_object',
-            'sapgui_call_method_of_active_object_ex', 'sapgui_set_property_of_active_object', 'sapgui_get_property_of_active_object',
-            'sapgui_select_active_connection', 'sapgui_select_active_session', 'sapgui_select_active_window ',
-            'sapgui_status_bar_get_text', 'sapgui_status_bar_get_param', 'sapgui_status_bar_get_type', 'sapgui_get_status_bar_text',
-            'sapgui_get_active_window_title', 'sapgui_is_object_available', 'sapgui_is_tab_selected', 'sapgui_is_object_changeable',
-            'sapgui_set_ok_code', 'sapgui_send_vkey', 'sapgui_resize_window', 'sapgui_window_resize', 'sapgui_window_maximize',
-            'sapgui_window_close', 'sapgui_window_restore', 'sapgui_window_scroll_to_row', 'sapgui_press_button',
-            'sapgui_select_radio_button', 'sapgui_set_password', 'sapgui_set_text', 'sapgui_select_menu', 'sapgui_select_tab',
-            'sapgui_set_checkbox', 'sapgui_set_focus', 'sapgui_select_combobox_entry', 'sapgui_get_ok_code',
-            'sapgui_is_radio_button_selected', 'sapgui_get_text', 'sapgui_is_checkbox_selected', 'sapgui_table_set_focus',
-            'sapgui_table_press_button', 'sapgui_table_select_radio_button', 'sapgui_table_set_password', 'sapgui_table_set_text',
-            'sapgui_table_set_checkbox', 'sapgui_table_select_combobox_entry', 'sapgui_table_set_row_selected',
-            'sapgui_table_set_column_selected', 'sapgui_table_set_column_width', 'sapgui_table_reorder', 'sapgui_table_fill_data',
-            'sapgui_table_get_text', 'sapgui_table_is_radio_button_selected', 'sapgui_table_is_checkbox_selected',
-            'sapgui_table_is_row_selected', 'sapgui_table_is_column_selected', 'sapgui_table_get_column_width',
-            'sapgui_grid_clear_selection', 'sapgui_grid_select_all', 'sapgui_grid_selection_changed',
-            'sapgui_grid_press_column_header', 'sapgui_grid_select_cell', 'sapgui_grid_select_rows', 'sapgui_grid_select_column',
-            'sapgui_grid_deselect_column', 'sapgui_grid_select_columns', 'sapgui_grid_select_cells', 'sapgui_grid_select_cell_row',
-            'sapgui_grid_select_cell_column', 'sapgui_grid_set_column_order', 'sapgui_grid_set_column_width',
-            'sapgui_grid_scroll_to_row', 'sapgui_grid_double_click', 'sapgui_grid_click', 'sapgui_grid_press_button',
-            'sapgui_grid_press_total_row', 'sapgui_grid_set_cell_data', 'sapgui_grid_set_checkbox',
-            'sapgui_grid_double_click_current_cell', 'sapgui_grid_click_current_cell', 'sapgui_grid_press_button_current_cell',
-            'sapgui_grid_press_total_row_current_cell', 'sapgui_grid_press_F1', 'sapgui_grid_press_F4', 'sapgui_grid_press_ENTER',
-            'sapgui_grid_press_toolbar_button', 'sapgui_grid_press_toolbar_context_button', 'sapgui_grid_open_context_menu',
-            'sapgui_grid_select_context_menu', 'sapgui_grid_select_toolbar_menu', 'sapgui_grid_fill_data',
-            'sapgui_grid_get_current_cell_row', 'sapgui_grid_get_current_cell_column', 'sapgui_grid_get_rows_count',
-            'sapgui_grid_get_columns_count', 'sapgui_grid_get_cell_data', 'sapgui_grid_is_checkbox_selected',
-            'sapgui_tree_scroll_to_node', 'sapgui_tree_set_hierarchy_header_width', 'sapgui_tree_set_selected_node',
-            'sapgui_tree_double_click_node', 'sapgui_tree_press_key', 'sapgui_tree_press_button', 'sapgui_tree_set_checkbox',
-            'sapgui_tree_double_click_item', 'sapgui_tree_click_link', 'sapgui_tree_open_default_context_menu',
-            'sapgui_tree_open_node_context_menu', 'sapgui_tree_open_header_context_menu', 'sapgui_tree_open_item_context_menu',
-            'sapgui_tree_select_context_menu', 'sapgui_tree_select_item', 'sapgui_tree_select_node', 'sapgui_tree_unselect_node',
-            'sapgui_tree_unselect_all', 'sapgui_tree_select_column', 'sapgui_tree_unselect_column', 'sapgui_tree_set_column_order',
-            'sapgui_tree_collapse_node', 'sapgui_tree_expand_node', 'sapgui_tree_scroll_to_item', 'sapgui_tree_set_column_width',
-            'sapgui_tree_press_header', 'sapgui_tree_is_checkbox_selected', 'sapgui_tree_get_node_text', 'sapgui_tree_get_item_text',
-            'sapgui_calendar_scroll_to_date', 'sapgui_calendar_focus_date', 'sapgui_calendar_select_interval',
-            'sapgui_apogrid_select_all', 'sapgui_apogrid_clear_selection', 'sapgui_apogrid_select_cell',
-            'sapgui_apogrid_deselect_cell', 'sapgui_apogrid_select_row', 'sapgui_apogrid_deselect_row',
-            'sapgui_apogrid_select_column', 'sapgui_apogrid_deselect_column', 'sapgui_apogrid_scroll_to_row',
-            'sapgui_apogrid_scroll_to_column', 'sapgui_apogrid_double_click', 'sapgui_apogrid_set_cell_data',
-            'sapgui_apogrid_get_cell_data', 'sapgui_apogrid_is_cell_changeable', 'sapgui_apogrid_get_cell_format',
-            'sapgui_apogrid_get_cell_tooltip', 'sapgui_apogrid_press_ENTER', 'sapgui_apogrid_open_cell_context_menu',
-            'sapgui_apogrid_select_context_menu_item', 'sapgui_text_edit_scroll_to_line', 'sapgui_text_edit_set_selection_indexes',
-            'sapgui_text_edit_set_unprotected_text_part', 'sapgui_text_edit_get_first_visible_line',
-            'sapgui_text_edit_get_selection_index_start', 'sapgui_text_edit_get_selection_index_end',
-            'sapgui_text_edit_get_number_of_unprotected_text_parts', 'sapgui_text_edit_double_click',
-            'sapgui_text_edit_single_file_dropped', 'sapgui_text_edit_multiple_files_dropped', 'sapgui_text_edit_press_F1',
-            'sapgui_text_edit_press_F4', 'sapgui_text_edit_open_context_menu', 'sapgui_text_edit_select_context_menu',
-            'sapgui_text_edit_modified_status_changed', 'sapgui_htmlviewer_send_event', 'sapgui_htmlviewer_dom_get_property',
-            'sapgui_toolbar_press_button', 'sapgui_toolbar_press_context_button', 'sapgui_toolbar_select_menu_item',
-            'sapgui_toolbar_select_menu_item_by_text', 'sapgui_toolbar_select_context_menu_item',
-            'sapgui_toolbar_select_context_menu_item_by_text'
-            ),
-        // Constants from as_sapgui.h
-        10 => array(
-            'BEGIN_OPTIONAL', 'END_OPTIONAL', 'al-keys', 'ENTER', 'HELP', 'F2', 'BACK', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9',
-            'F10', 'F11', 'ESC', 'SHIFT_F1', 'SHIFT_F2', 'SHIFT_F3', 'SHIFT_F4', 'SHIFT_F5', 'SHIFT_F6', 'SHIFT_F7', 'SHIFT_F8',
-            'SHIFT_F9', 'SHIFT_F10', 'SHIFT_F11', 'SHIFT_F12', 'CTRL_F1', 'CTRL_F2', 'CTRL_F3', 'CTRL_F4', 'CTRL_F5', 'CTRL_F6',
-            'CTRL_F7', 'CTRL_F8', 'CTRL_F9', 'CTRL_F10', 'CTRL_F11', 'CTRL_F12', 'CTRL_SHIFT_F1', 'CTRL_SHIFT_F2', 'CTRL_SHIFT_F3',
-            'CTRL_SHIFT_F4', 'CTRL_SHIFT_F5', 'CTRL_SHIFT_F6', 'CTRL_SHIFT_F7', 'CTRL_SHIFT_F8', 'CTRL_SHIFT_F9', 'CTRL_SHIFT_F10',
-            'CTRL_SHIFT_F11', 'CTRL_SHIFT_F12', 'CANCEL', 'CTRL_F', 'CTRL_PAGE_UP', 'PAGE_UP', 'PAGE_DOWN', 'CTRL_PAGE_DOWN',
-            'CTRL_G', 'CTRL_P'
-            ),
-        ),
-
-    // Symbols and Case Sensitivity
-    // Symbols from: http://en.wikipedia.org/wiki/C_syntax
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']',
-        '+', '-', '*', '/', '%',
-        '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true, // Standard C reserved keywords
-        2 => true, // C preprocessor directives
-        3 => true, // Functions from lrun.h
-        4 => true, // Constants from lrun.h
-        5 => true, // Functions from web_api.h
-        6 => true, // Constants from web_api.h
-        7 => true, // Functions from as_web.h
-        8 => true, // Constants from as_web.h
-        9 => true, // Functions from as_sapgui.h
-        10 => true, // Constants from as_sapgui.h
-        ),
-
-    // Styles
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            // Functions are brown, constants and reserved words are blue
-            1 => 'color: #0000ff;', // Standard C reserved keywords
-            2 => 'color: #0000ff;', // C preprocessor directives
-            3 => 'color: #8a0000;', // Functions from lrun.h
-            4 => 'color: #0000ff;', // Constants from lrun.h
-            5 => 'color: #8a0000;', // Functions from web_api.h
-            6 => 'color: #0000ff;', // Constants from web_api.h
-            7 => 'color: #8a0000;', // Functions from as_web.h
-            8 => 'color: #0000ff;', // Constants from as_web.h
-            9 => 'color: #8a0000;', // Functions from as_sapgui.h
-            10 => 'color: #0000ff;', // Constants from as_sapgui.h
-            ),
-        'COMMENTS' => array(
-            // Comments are grey
-            1 => 'color: #9b9b9b;',
-            'MULTI' => 'color: #9b9b9b;'
-            ),
-        'ESCAPE_CHAR' => array(
-            // GeSHi cannot define a separate style for ESCAPE_REGEXP. The style for ESCAPE_CHAR also applies to ESCAPE_REGEXP.
-            // This is used for LoadRunner {parameters}
-            // {parameters} are pink
-            0 => 'color: #c000c0;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            // Strings are green
-            0 => 'color: #008080;'
-            ),
-        'NUMBERS' => array(
-            // Numbers are green
-            0 => 'color: #008080;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #008080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #008080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #008080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#008080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#008080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#008080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#008080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #000000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-
-    // URLs for Functions
-    'URLS' => array(
-        1 => '', // Standard C reserved keywords
-        2 => '', // C preprocessor directives
-        3 => '', // Functions from lrun.h
-        4 => '', // Constants from lrun.h
-        5 => '', // Functions from web_api.h
-        6 => '', // Constants from web_api.h
-        7 => '', // Functions from as_web.h
-        8 => '', // Constants from as_web.h
-        9 => '', // Functions from as_sapgui.h
-        10 => '', // Constants from as_sapgui.h
-        ),
-
-    // Object Orientation
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-
-    // Regular Expressions
-    // Note that REGEXPS are not applied within strings.
-    'REGEXPS' => array(
-        ),
-
-    // Contextual Highlighting and Strict Mode
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-
-    // Tabs
-    // Note that if you are using <pre> tags for your code, then the browser chooses how many spaces your tabs will translate to.
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/c_mac.php b/inc/geshi/c_mac.php
deleted file mode 100644
index 41c21ce54..000000000
--- a/inc/geshi/c_mac.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/*************************************************************************************
- * c_mac.php
- * ---------
- * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
- * Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * C for Macs language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2004/11/27
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'C (Mac)',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'if', 'return', 'while', 'case', 'continue', 'default',
-            'do', 'else', 'for', 'switch', 'goto'
-            ),
-        2 => array(
-            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
-            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
-            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
-            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
-            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
-            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
-            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
-            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
-            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
-            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
-            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
-            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
-            // Mac-specific constants:
-            'kCFAllocatorDefault'
-            ),
-        3 => array(
-            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
-            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
-            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
-            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
-            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
-            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
-            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
-            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
-            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
-            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
-            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
-            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
-            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
-            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
-            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
-            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
-            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
-            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
-            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
-            ),
-        4 => array(
-            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
-            'register', 'short', 'signed', 'static', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
-            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
-            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
-
-            'int8', 'int16', 'int32', 'int64',
-            'uint8', 'uint16', 'uint32', 'uint64',
-
-            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
-            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
-
-            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
-            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
-
-            'int8_t', 'int16_t', 'int32_t', 'int64_t',
-            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
-
-            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
-
-            // Mac-specific types:
-            'CFArrayRef', 'CFDictionaryRef', 'CFMutableDictionaryRef', 'CFBundleRef', 'CFSetRef', 'CFStringRef',
-            'CFURLRef', 'CFLocaleRef', 'CFDateFormatterRef', 'CFNumberFormatterRef', 'CFPropertyListRef',
-            'CFTreeRef', 'CFWriteStreamRef', 'CFCharacterSetRef', 'CFMutableStringRef', 'CFNotificationRef',
-            'CFReadStreamRef', 'CFNull', 'CFAllocatorRef', 'CFBagRef', 'CFBinaryHeapRef',
-            'CFBitVectorRef', 'CFBooleanRef', 'CFDataRef', 'CFDateRef', 'CFMachPortRef', 'CFMessagePortRef',
-            'CFMutableArrayRef', 'CFMutableBagRef', 'CFMutableBitVectorRef', 'CFMutableCharacterSetRef',
-            'CFMutableDataRef', 'CFMutableSetRef', 'CFNumberRef', 'CFPlugInRef', 'CFPlugInInstanceRef',
-            'CFRunLoopRef', 'CFRunLoopObserverRef', 'CFRunLoopSourceRef', 'CFRunLoopTimerRef', 'CFSocketRef',
-            'CFTimeZoneRef', 'CFTypeRef', 'CFUserNotificationRef', 'CFUUIDRef', 'CFXMLNodeRef', 'CFXMLParserRef',
-            'CFXMLTreeRef'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #0000dd;',
-            4 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #ff0000;',
-            2 => 'color: #339900;',
-            'MULTI' => 'color: #ff0000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #666666;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #00eeff;',
-            2 => 'color: #00eeff;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/caddcl.php b/inc/geshi/caddcl.php
deleted file mode 100644
index 8b8b2f248..000000000
--- a/inc/geshi/caddcl.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*************************************************************************************
- * caddcl.php
- * ----------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * CAD DCL (Dialog Control Language) language file for GeSHi.
- *
- * DCL for AutoCAD 12 or later and IntelliCAD all versions.
- *
- * CHANGES
- * -------
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/1!/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'CAD DCL',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'boxed_column','boxed_radio_column','boxed_radio_row','boxed_row',
-            'column','concatenation','button','dialog','edit_box','image','image_button',
-            'errtile','list_box','ok_cancel','ok_cancel_help','ok_cancel_help_errtile',
-            'ok_cancel_help_info','ok_only','paragraph','popup_list','radio_button',
-            'radio_column','radio_row','row','slider','spacer','spacer_0','spacer_1','text',
-            'text_part','toggle',
-            'action','alignment','allow_accept','aspect_ratio','big_increment',
-            'children_alignment','children_fixed_height',
-            'children_fixed_width','color',
-            'edit_limit','edit_width','fixed_height','fixed_width',
-            'height','initial_focus','is_cancel','is_default',
-            'is_enabled','is_tab_stop','is-bold','key','label','layout','list',
-            'max_value','min_value','mnemonic','multiple_select','password_char',
-            'small_increment','tabs','tab_truncate','value','width',
-            'false','true','left','right','centered','top','bottom',
-            'dialog_line','dialog_foreground','dialog_background',
-            'graphics_background','black','red','yellow','green','cyan',
-            'blue','magenta','whitegraphics_foreground',
-            'horizontal','vertical'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/cadlisp.php b/inc/geshi/cadlisp.php
deleted file mode 100644
index 3fa7ead09..000000000
--- a/inc/geshi/cadlisp.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/*************************************************************************************
- * cadlisp.php
- * -----------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * AutoCAD/IntelliCAD Lisp language file for GeSHi.
- *
- * For AutoCAD V.12..2005 and IntelliCAD all versions.
- *
- * CHANGES
- * -------
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'CAD Lisp',
-    'COMMENT_SINGLE' => array(1 => ";"),
-    'COMMENT_MULTI' => array(";|" => "|;"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'abs','acad_colordlg','acad_helpdlg','acad_strlsort','action_tile',
-            'add_list','alert','alloc','and','angle','angtof','angtos','append','apply',
-            'arx','arxload','arxunload','ascii','assoc','atan','atof','atoi','atom',
-            'atoms-family','autoarxload','autoload','Boole','boundp','caddr',
-            'cadr','car','cdr','chr','client_data_tile','close','command','cond',
-            'cons','cos','cvunit','defun','defun-q','defun-q-list-ref',
-            'defun-q-list-set','dictadd','dictnext','dictremove','dictrename',
-            'dictsearch','dimx_tile','dimy_tile','distance','distof','done_dialog',
-            'end_image','end_list','entdel','entget','entlast','entmake',
-            'entmakex','entmod','entnext','entsel','entupd','eq','equal','eval','exit',
-            'exp','expand','expt','fill_image','findfile','fix','float','foreach','function',
-            'gc','gcd','get_attr','get_tile','getangle','getcfg','getcname','getcorner',
-            'getdist','getenv','getfiled','getint','getkword','getorient','getpoint',
-            'getreal','getstring','getvar','graphscr','grclear','grdraw','grread','grtext',
-            'grvecs','handent','help','if','initdia','initget','inters','itoa','lambda','last',
-            'layoutlist','length','list','listp','load','load_dialog','log','logand','logior',
-            'lsh','mapcar','max','mem','member','menucmd','menugroup','min','minusp','mode_tile',
-            'namedobjdict','nentsel','nentselp','new_dialog','nil','not','nth','null',
-            'numberp','open','or','osnap','polar','prin1','princ','print','progn','prompt',
-            'quit','quote','read','read-char','read-line','redraw','regapp','rem','repeat',
-            'reverse','rtos','set','set_tile','setcfg','setenv','setfunhelp','setq','setvar',
-            'setview','sin','slide_image','snvalid','sqrt','ssadd','ssdel','ssget','ssgetfirst',
-            'sslength','ssmemb','ssname','ssnamex','sssetfirst','start_dialog','start_image',
-            'start_list','startapp','strcase','strcat','strlen','subst','substr','t','tablet',
-            'tblnext','tblobjname','tblsearch','term_dialog','terpri','textbox','textpage',
-            'textscr','trace','trans','type','unload_dialog','untrace','vector_image','ver',
-            'vports','wcmatch','while','write-char','write-line','xdroom','xdsize','zerop',
-            'vl-acad-defun','vl-acad-undefun','vl-arx-import','vlax-3D-point',
-            'vlax-add-cmd','vlax-create-object','vlax-curve-getArea',
-            'vlax-curve-getClosestPointTo','vlax-curve-getClosestPointToProjection',
-            'vlax-curve-getDistAtParam','vlax-curve-getDistAtPoint',
-            'vlax-curve-getEndParam','vlax-curve-getEndPoint',
-            'vlax-curve-getFirstDeriv','vlax-curve-getParamAtDist',
-            'vlax-curve-getParamAtPoint','vlax-curve-getPointAtDist',
-            'vlax-curve-getPointAtParam','vlax-curve-getSecondDeriv',
-            'vlax-curve-getStartParam','vlax-curve-getStartPoint',
-            'vlax-curve-isClosed','vlax-curve-isPeriodic','vlax-curve-isPlanar',
-            'vlax-dump-object','vlax-erased-p','vlax-for','vlax-get-acad-object',
-            'vlax-get-object','vlax-get-or-create-object','vlax-get-property',
-            'vlax-import-type-library','vlax-invoke-method','vlax-ldata-delete',
-            'vlax-ldata-get','vlax-ldata-list','vlax-ldata-put','vlax-ldata-test',
-            'vlax-make-safearray','vlax-make-variant','vlax-map-collection',
-            'vlax-method-applicable-p','vlax-object-released-p','vlax-product-key',
-            'vlax-property-available-p','vlax-put-property','vlax-read-enabled-p',
-            'vlax-release-object','vlax-remove-cmd','vlax-safearray-fill',
-            'vlax-safearray-get-dim','vlax-safearray-get-element',
-            'vlax-safearray-get-l-bound','vlax-safearray-get-u-bound',
-            'vlax-safearray-put-element','vlax-safearray-type','vlax-tmatrix',
-            'vlax-typeinfo-available-p','vlax-variant-change-type',
-            'vlax-variant-type','vlax-variant-value','vlax-write-enabled-p',
-            'vl-bb-ref','vl-bb-set','vl-catch-all-apply','vl-catch-all-error-message',
-            'vl-catch-all-error-p','vl-cmdf','vl-consp','vl-directory-files','vl-doc-export',
-            'vl-doc-import','vl-doc-ref','vl-doc-set','vl-every','vl-exit-with-error',
-            'vl-exit-with-value','vl-file-copy','vl-file-delete','vl-file-directory-p',
-            'vl-filename-base','vl-filename-directory','vl-filename-extension',
-            'vl-filename-mktemp','vl-file-rename','vl-file-size','vl-file-systime',
-            'vl-get-resource','vlisp-compile','vl-list-exported-functions',
-            'vl-list-length','vl-list-loaded-vlx','vl-load-all','vl-load-com',
-            'vl-load-reactors','vl-member-if','vl-member-if-not','vl-position',
-            'vl-prin1-to-string','vl-princ-to-string','vl-propagate','vlr-acdb-reactor',
-            'vlr-add','vlr-added-p','vlr-beep-reaction','vlr-command-reactor',
-            'vlr-current-reaction-name','vlr-data','vlr-data-set',
-            'vlr-deepclone-reactor','vlr-docmanager-reactor','vlr-dwg-reactor',
-            'vlr-dxf-reactor','vlr-editor-reactor','vl-registry-delete',
-            'vl-registry-descendents','vl-registry-read','vl-registry-write',
-            'vl-remove','vl-remove-if','vl-remove-if-not','vlr-insert-reactor',
-            'vlr-linker-reactor','vlr-lisp-reactor','vlr-miscellaneous-reactor',
-            'vlr-mouse-reactor','vlr-notification','vlr-object-reactor',
-            'vlr-owner-add','vlr-owner-remove','vlr-owners','vlr-pers','vlr-pers-list',
-            'vlr-pers-p','vlr-pers-release','vlr-reaction-names','vlr-reactions',
-            'vlr-reaction-set','vlr-reactors','vlr-remove','vlr-remove-all',
-            'vlr-set-notification','vlr-sysvar-reactor','vlr-toolbar-reactor',
-            'vlr-trace-reaction','vlr-type','vlr-types','vlr-undo-reactor',
-            'vlr-wblock-reactor','vlr-window-reactor','vlr-xref-reactor',
-            'vl-some','vl-sort','vl-sort-i','vl-string-elt','vl-string-left-trim',
-            'vl-string-mismatch','vl-string-position','vl-string-right-trim',
-            'vl-string-search','vl-string-subst','vl-string-translate','vl-string-trim',
-            'vl-symbol-name','vl-symbolp','vl-symbol-value','vl-unload-vlx','vl-vbaload',
-            'vl-vbarun','vl-vlx-loaded-p'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/cfdg.php b/inc/geshi/cfdg.php
deleted file mode 100644
index e40963f06..000000000
--- a/inc/geshi/cfdg.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/*************************************************************************************
- * cfdg.php
- * --------
- * Author: John Horigan <john@glyphic.com>
- * Copyright: (c) 2006 John Horigan http://www.ozonehouse.com/john/
- * Release Version: 1.0.8.11
- * Date Started: 2006/03/11
- *
- * CFDG language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2006/03/11 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2006/03/11)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'CFDG',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'include', 'startshape', 'rule', 'background'
-            ),
-        2 => array(
-            'SQUARE', 'CIRCLE', 'TRIANGLE',
-            ),
-        3 => array(
-            'b','brightness','h','hue','sat','saturation',
-            'a','alpha','x','y','z','s','size',
-            'r','rotate','f','flip','skew','xml_set_object'
-            )
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '{', '}', '*', '|'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #717100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #006666;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/cfm.php b/inc/geshi/cfm.php
deleted file mode 100644
index 2d165bd68..000000000
--- a/inc/geshi/cfm.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/*************************************************************************************
- * cfm.php
- * -------
- * Author: Diego
- * Copyright: (c) 2006 Diego
- * Release Version: 1.0.8.11
- * Date Started: 2006/02/25
- *
- * ColdFusion language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2006/02/25 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2006/02/25)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ColdFusion',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /* CFM Tags */
-        1 => array(
-            'cfabort', 'cfapplet', 'cfapplication', 'cfargument', 'cfassociate',
-            'cfbreak', 'cfcache', 'cfcase', 'cfcatch', 'cfchart', 'cfchartdata',
-            'cfchartseries', 'cfcol', 'cfcollection', 'cfcomponent',
-            'cfcontent', 'cfcookie', 'cfdefaultcase', 'cfdirectory',
-            'cfdocument', 'cfdocumentitem', 'cfdocumentsection', 'cfdump',
-            'cfelse', 'cfelseif', 'cferror', 'cfexecute', 'cfexit', 'cffile',
-            'cfflush', 'cfform', 'cfformgroup', 'cfformitem', 'cfftp',
-            'cffunction', 'cfgrid', 'cfgridcolumn', 'cfgridrow', 'cfgridupdate',
-            'cfheader', 'cfhtmlhead', 'cfhttp', 'cfhttpparam', 'cfif',
-            'cfimport', 'cfinclude', 'cfindex', 'cfinput', 'cfinsert',
-            'cfinvoke', 'cfinvokeargument', 'cfldap', 'cflocation', 'cflock',
-            'cflog', 'cflogin', 'cfloginuser', 'cflogout', 'cfloop', 'cfmail',
-            'cfmailparam', 'cfmailpart', 'cfmodule', 'cfNTauthenticate',
-            'cfobject', 'cfobjectcache', 'cfoutput', 'cfparam', 'cfpop',
-            'cfprocessingdirective', 'cfprocparam',
-            'cfprocresult', 'cfproperty', 'cfquery', 'cfqueryparam',
-            'cfregistry', 'cfreport', 'cfreportparam', 'cfrethrow', 'cfreturn',
-            'cfsavecontent', 'cfschedule', 'cfscript', 'cfsearch', 'cfselect',
-            'cfset', 'cfsetting', 'cfsilent', 'cfstoredproc',
-            'cfswitch', 'cftable', 'cftextarea', 'cfthrow', 'cftimer',
-            'cftrace', 'cftransaction', 'cftree', 'cftreeitem', 'cftry',
-            'cfupdate', 'cfwddx'
-            ),
-        /* HTML Tags */
-        2 => array(
-            'a', 'abbr', 'acronym', 'address', 'applet',
-
-            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
-
-            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
-
-            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
-
-            'em',
-
-            'fieldset', 'font', 'form', 'frame', 'frameset',
-
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
-
-            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
-
-            'kbd',
-
-            'label', 'legend', 'link', 'li',
-
-            'map', 'meta',
-
-            'noframes', 'noscript',
-
-            'object', 'ol', 'optgroup', 'option',
-
-            'param', 'pre', 'p',
-
-            'q',
-
-            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
-
-            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
-
-            'ul', 'u',
-
-            'var',
-            ),
-        /* HTML attributes */
-        3 => array(
-            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
-            'background', 'bgcolor', 'border',
-            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
-            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
-            'enctype',
-            'face', 'for', 'frame', 'frameborder',
-            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
-            'id', 'ismap',
-            'label', 'lang', 'language', 'link', 'longdesc',
-            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
-            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
-            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
-            'profile', 'prompt',
-            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
-            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
-            'tabindex', 'target', 'text', 'title', 'type',
-            'usemap',
-            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
-            'width'
-            ),
-        /* CFM Script delimeters */
-        4 => array(
-            'var', 'function', 'while', 'if','else'
-            ),
-        /* CFM Functions */
-        5 => array(
-            'Abs', 'GetFunctionList', 'LSTimeFormat','ACos','GetGatewayHelper','LTrim','AddSOAPRequestHeader','GetHttpRequestData',
-            'Max','AddSOAPResponseHeader','GetHttpTimeString','Mid','ArrayAppend','GetLocale','Min','ArrayAvg','GetLocaleDisplayName',
-            'Minute','ArrayClear','GetMetaData','Month','ArrayDeleteAt','GetMetricData','MonthAsString','ArrayInsertAt','GetPageContext',
-            'Now','ArrayIsEmpty','GetProfileSections','NumberFormat','ArrayLen','GetProfileString','ParagraphFormat','ArrayMax',
-            'GetLocalHostIP','ParseDateTime','ArrayMin','GetSOAPRequest','Pi','ArrayNew','GetSOAPRequestHeader','PreserveSingleQuotes',
-            'ArrayPrepend','GetSOAPResponse','Quarter','ArrayResize','GetSOAPResponseHeader','QueryAddColumn','ArraySet',
-            'GetTempDirectory','QueryAddRow','ArraySort','QueryNew','ArraySum','GetTempFile','QuerySetCell',
-            'ArraySwap','GetTickCount','QuotedValueList','ArrayToList','GetTimeZoneInfo','Rand','Asc','GetToken','Randomize',
-            'ASin','Hash','RandRange','Atn','Hour','REFind','BinaryDecode','HTMLCodeFormat','REFindNoCase','BinaryEncode',
-            'HTMLEditFormat','ReleaseComObject','BitAnd','IIf','RemoveChars','BitMaskClear','IncrementValue','RepeatString',
-            'BitMaskRead','InputBaseN','Replace','BitMaskSet','Insert','ReplaceList','BitNot','Int','ReplaceNoCase','BitOr',
-            'IsArray','REReplace','BitSHLN','IsBinary','REReplaceNoCase','BitSHRN','IsBoolean','Reverse','BitXor','IsCustomFunction',
-            'Right','Ceiling','IsDate','RJustify','CharsetDecode','IsDebugMode','Round','CharsetEncode','IsDefined','RTrim',
-            'Chr','IsLeapYear','Second','CJustify','IsLocalHost','SendGatewayMessage','Compare','IsNumeric','SetEncoding',
-            'CompareNoCase','IsNumericDate','SetLocale','Cos','IsObject','SetProfileString','CreateDate','IsQuery','SetVariable',
-            'CreateDateTime','IsSimpleValue','Sgn','CreateObject','IsSOAPRequest','Sin','CreateODBCDate','IsStruct','SpanExcluding',
-            'CreateODBCDateTime','IsUserInRole','SpanIncluding','CreateODBCTime','IsValid','Sqr','CreateTime','IsWDDX','StripCR',
-            'CreateTimeSpan','IsXML','StructAppend','CreateUUID','IsXmlAttribute','StructClear','DateAdd','IsXmlDoc','StructCopy',
-            'DateCompare','IsXmlElem','StructCount','DateConvert','IsXmlNode','StructDelete','DateDiff','IsXmlRoot','StructFind',
-            'DateFormat','JavaCast','StructFindKey','DatePart','JSStringFormat','StructFindValue','Day','LCase','StructGet',
-            'DayOfWeek','Left','StructInsert','DayOfWeekAsString','Len','StructIsEmpty','DayOfYear','ListAppend','StructKeyArray',
-            'DaysInMonth','ListChangeDelims','StructKeyExists','DaysInYear','ListContains','StructKeyList','DE','ListContainsNoCase',
-            'StructNew','DecimalFormat','ListDeleteAt','StructSort','DecrementValue','ListFind','StructUpdate','Decrypt','ListFindNoCase',
-            'Tan','DecryptBinary','ListFirst','TimeFormat','DeleteClientVariable','ListGetAt','ToBase64','DirectoryExists',
-            'ListInsertAt','ToBinary','DollarFormat','ListLast','ToScript','Duplicate','ListLen','ToString','Encrypt','ListPrepend',
-            'Trim','EncryptBinary','ListQualify','UCase','Evaluate','ListRest','URLDecode','Exp','ListSetAt','URLEncodedFormat',
-            'ExpandPath','ListSort','URLSessionFormat','FileExists','ListToArray','Val','Find','ListValueCount','ValueList',
-            'FindNoCase','ListValueCountNoCase','Week','FindOneOf','LJustify','Wrap','FirstDayOfMonth','Log','WriteOutput',
-            'Fix','Log10','XmlChildPos','FormatBaseN','LSCurrencyFormat','XmlElemNew','GetAuthUser','LSDateFormat','XmlFormat',
-            'GetBaseTagData','LSEuroCurrencyFormat','XmlGetNodeType','GetBaseTagList','LSIsCurrency','XmlNew','GetBaseTemplatePath',
-            'LSIsDate','XmlParse','GetClientVariablesList','LSIsNumeric','XmlSearch','GetCurrentTemplatePath','LSNumberFormat',
-            'XmlTransform','GetDirectoryFromPath','LSParseCurrency','XmlValidate','GetEncoding','LSParseDateTime','Year',
-            'GetException','LSParseEuroCurrency','YesNoFormat','GetFileFromPath','LSParseNumber'
-            ),
-        /* CFM Attributes */
-        6 => array(
-            'dbtype','connectstring','datasource','username','password','query','delimeter','description','required','hint','default','access','from','to','list','index'
-            ),
-        7 => array(
-            'EQ', 'GT', 'LT', 'GTE', 'LTE', 'IS', 'LIKE', 'NEQ'
-            )
-        ),
-    'SYMBOLS' => array(
-        '/', '=', '{', '}', '(', ')', '[', ']', '<', '>', '&'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #990000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #0000FF;',
-            4 => 'color: #000000; font-weight: bold;',
-            5 => 'color: #0000FF;',
-            6 => 'color: #0000FF;',
-            7 => 'color: #0000FF;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #0000FF;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #009900;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #0000FF;'
-            ),
-        'SCRIPT' => array(
-            0 => 'color: #808080; font-style: italic;',
-            1 => 'color: #00bbdd;',
-            2 => 'color: #0000FF;',
-            3 => 'color: #000099;',
-            4 => 'color: #333333;',
-            5 => 'color: #333333;'
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<!--' => '-->'
-            ),
-        1 => array(
-            '<!DOCTYPE' => '>'
-            ),
-        2 => "/(?!<#)(?:(?:##)*)(#)[a-zA-Z0-9_\.\(\)]+(#)/",
-        3 => array(
-            '<cfscript>' => '</cfscript>'
-            ),
-        4 => array(
-            '<' => '>'
-            ),
-        5 => '/((?!<!)<)(?:"[^"]*"|\'[^\']*\'|(?R)|[^">])+?(>)/si'
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => false,
-        1 => false,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            1 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-                ),
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-                ),
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^])', // allow ; before keywords
-                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
-                ),
-            7 => array(
-                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>&|^])', // allow ; before keywords
-                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/chaiscript.php b/inc/geshi/chaiscript.php
deleted file mode 100644
index f9d0a8681..000000000
--- a/inc/geshi/chaiscript.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/*************************************************************************************
- * chaiscript.php
- * --------------
- * Author: Jason Turner & Jonathan Turner
- * Copyright: (c) 2010 Jason Turner (lefticus@gmail.com),
- *            (c) 2009 Jonathan Turner,
- *            (c) 2004 Ben Keen (ben.keen@gmail.com), Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2009/07/03
- *
- * ChaiScript language file for GeSHi.
- *
- * Based on JavaScript by Ben Keen (ben.keen@gmail.com)
- *
- * CHANGES
- * -------
- * 2010/03/30 (1.0.8.8)
- *  -  Updated to include more language features
- *  -  Removed left over pieces from JavaScript
- * 2009/07/03 (1.0.0)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ChaiScript',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    //Regular Expressions
-    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'break', 'else', 'elseif', 'eval', 'for', 'if', 'return', 'while', 'try', 'catch', 'finally',
-            ),
-        2 => array(
-            'def', 'false', 'fun', 'true', 'var', 'attr',
-            ),
-        3 => array(
-            // built in functions
-            'throw',
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '+', '-', '*', '/', '%',
-        '!', '@', '&', '|', '^',
-        '<', '>', '=',
-        ',', ';', '?', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066; font-weight: bold;',
-            2 => 'color: #003366; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #006600; font-style: italic;',
-            2 => 'color: #009966; font-style: italic;',
-            'MULTI' => 'color: #006600; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #3366CC;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #CC0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #660066;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            ),
-        1 => array(
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/cil.php b/inc/geshi/cil.php
deleted file mode 100644
index 9872e755f..000000000
--- a/inc/geshi/cil.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/*************************************************************************************
- * cil.php
- * --------
- * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
- * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
- * Release Version: 1.0.8.11
- * Date Started: 2007/10/24
- *
- * CIL (Common Intermediate Language) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2004/10/24 (1.0.8)
- *  -  First Release
- *
- * TODO (updated 2007/10/24)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'CIL',
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'COMMENT_SINGLE' => array('//'),
-    'COMMENT_MULTI' => array(),
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(//Dotted
-            '.zeroinit', '.vtfixup', '.vtentry', '.vtable', '.ver', '.try', '.subsystem', '.size', '.set', '.removeon',
-            '.publickeytoken', '.publickey', '.property', '.permissionset', '.permission', '.pdirect', '.param', '.pack',
-            '.override', '.other', '.namespace', '.mresource', '.module', '.method', '.maxstack', '.manifestres', '.locals',
-            '.localized', '.locale', '.line', '.language', '.import', '.imagebase', '.hash', '.get', '.fire', '.file', '.field',
-            '.export', '.event', '.entrypoint', '.emitbyte', '.data', '.custom', '.culture', '.ctor', '.corflags', '.class',
-            '.cctor', '.assembly', '.addon'
-            ),
-        2 => array(//Attributes
-            'wrapper', 'with', 'winapi', 'virtual', 'vector', 'vararg', 'value', 'userdefined', 'unused', 'unmanagedexp',
-            'unmanaged', 'unicode', 'to', 'tls', 'thiscall', 'synchronized', 'struct', 'strict', 'storage', 'stdcall',
-            'static', 'specialname', 'special', 'serializable', 'sequential', 'sealed', 'runtime', 'rtspecialname', 'request',
-            'reqsecobj', 'reqrefuse', 'reqopt', 'reqmin', 'record', 'public', 'privatescope', 'private', 'preservesig',
-            'prejitgrant', 'prejitdeny', 'platformapi', 'pinvokeimpl', 'pinned', 'permitonly', 'out', 'optil', 'opt',
-            'notserialized', 'notremotable', 'not_in_gc_heap', 'noprocess', 'noncaslinkdemand', 'noncasinheritance',
-            'noncasdemand', 'nometadata', 'nomangle', 'nomachine', 'noinlining', 'noappdomain', 'newslot', 'nested', 'native',
-            'modreq', 'modopt', 'marshal', 'managed', 'literal', 'linkcheck', 'lcid', 'lasterr', 'internalcall', 'interface',
-            'instance', 'initonly', 'init', 'inheritcheck', 'in', 'import', 'implicitres', 'implicitcom', 'implements',
-            'illegal', 'il', 'hidebysig', 'handler', 'fromunmanaged', 'forwardref', 'fixed', 'finally', 'final', 'filter',
-            'filetime', 'field', 'fault', 'fastcall', 'famorassem', 'family', 'famandassem', 'extern', 'extends', 'explicit',
-            'error', 'enum', 'endmac', 'deny', 'demand', 'default', 'custom', 'compilercontrolled', 'clsid', 'class', 'cil',
-            'cf', 'cdecl', 'catch', 'beforefieldinit', 'autochar', 'auto', 'at', 'assert', 'assembly', 'as', 'any', 'ansi',
-            'alignment', 'algorithm', 'abstract'
-            ),
-        3 => array(//Types
-            'wchar', 'void', 'variant', 'unsigned', 'valuetype', 'typedref', 'tbstr', 'sysstring', 'syschar', 'string',
-            'streamed_object', 'stream', 'stored_object', 'safearray', 'objectref', 'object', 'nullref', 'method', 'lpwstr',
-            'lpvoid', 'lptstr', 'lpstruct', 'lpstr', 'iunknown', 'int64', 'int32', 'int16', 'int8', 'int', 'idispatch',
-            'hresult', 'float64', 'float32', 'float', 'decimal', 'date', 'currency', 'char', 'carray', 'byvalstr',
-            'bytearray', 'boxed', 'bool', 'blob_object', 'blob', 'array'
-            ),
-        4 => array(//Prefix
-            'volatile', 'unaligned', 'tail', 'readonly', 'no', 'constrained'
-            ),
-        5 => array(//Suffix
-            'un', 'u8', 'u4', 'u2', 'u1', 'u', 's', 'ref', 'r8', 'r4', 'm1', 'i8', 'i4', 'i2', 'i1', 'i'#, '.8', '.7', '.6', '.5', '.4', '.3', '.2', '.1', '.0'
-            ),
-        6 => array(//Base
-            'xor', 'switch', 'sub', 'stloc',
-            'stind', 'starg',
-            'shr', 'shl', 'ret', 'rem', 'pop', 'or', 'not', 'nop', 'neg', 'mul',
-            'localloc', 'leave', 'ldnull', 'ldloca',
-            'ldloc', 'ldind', 'ldftn', 'ldc', 'ldarga',
-            'ldarg', 'jmp', 'initblk', 'endfinally', 'endfilter',
-            'endfault', 'dup', 'div', 'cpblk', 'conv', 'clt', 'ckfinite', 'cgt', 'ceq', 'calli',
-            'call', 'brzero', 'brtrue', 'brnull', 'brinst',
-            'brfalse', 'break', 'br', 'bne', 'blt', 'ble', 'bgt', 'bge', 'beq', 'arglist',
-            'and', 'add'
-            ),
-        7 => array(//Object
-            'unbox.any', 'unbox', 'throw', 'stsfld', 'stobj', 'stfld', 'stelem', 'sizeof', 'rethrow', 'refanyval', 'refanytype', 'newobj',
-            'newarr', 'mkrefany', 'ldvirtftn', 'ldtoken', 'ldstr', 'ldsflda', 'ldsfld', 'ldobj', 'ldlen', 'ldflda', 'ldfld',
-            'ldelema', 'ldelem', 'isinst', 'initobj', 'cpobj', 'castclass',
-            'callvirt', 'callmostderived', 'box'
-            ),
-        8 => array(//Other
-            'prefixref', 'prefix7', 'prefix6', 'prefix5', 'prefix4', 'prefix3', 'prefix2', 'prefix1', 'prefix0'
-            ),
-        9 => array(//Literal
-            'true', 'null', 'false'
-            ),
-        10 => array(//Comment-like
-            '#line', '^THE_END^'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '!!'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true,
-        10 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color:maroon;font-weight:bold;',
-            2 => 'color:blue;font-weight:bold;',
-            3 => 'color:purple;font-weight:bold;',
-            4 => 'color:teal;',
-            5 => 'color:blue;',
-            6 => 'color:blue;',
-            7 => 'color:blue;',
-            8 => 'color:blue;',
-            9 => 'color:00008B',
-            10 => 'color:gray'
-            ),
-        'COMMENTS' => array(
-            0 => 'color:gray;font-style:italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #006400;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #008000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #00008B;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #000033;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #006400;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color:blue;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        9 => '',
-        10 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '::'
-        ),
-    'REGEXPS' => array(
-        0 => '(?<=ldc\\.i4\\.)[0-8]|(?<=(?:ldarg|ldloc|stloc)\\.)[0-3]' # Pickup the opcodes that end with integers
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/clojure.php b/inc/geshi/clojure.php
deleted file mode 100644
index 0ad4e4ad7..000000000
--- a/inc/geshi/clojure.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/*************************************************************************************
- * clojure.php
- * --------
- * Author: Jess Johnson (jess@grok-code.com)
- * Copyright: (c) 2009 Jess Johnson (http://grok-code.com)
- * Release Version: 1.0.8.11
- * Date Started: 2009/09/20
- *
- * Clojure language file for GeSHi.
- *
- * This file borrows significantly from the lisp language file for GeSHi
- *
- * CHANGES
- * -------
- * 2009/09/20 (1.0.8.6)
- *  -  First Release
- *
- * TODO (updated 2009/09/20)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Clojure',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(';|' => '|;'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'defn', 'defn-', 'defmulti', 'defmethod', 'defmacro', 'deftest',
-            'defstruct', 'def', 'defonce', 'let', 'letfn', 'do', 'cond', 'condp',
-            'for', 'loop', 'recur', 'when', 'when-not', 'when-let', 'when-first',
-            'if', 'if-let', 'if-not', 'doto', 'and', 'or','not','aget','aset',
-            'dosync', 'doseq', 'dotimes', 'dorun', 'doall',
-            'load', 'import', 'unimport', 'ns', 'in-ns', 'refer', 'print',
-            'try', 'catch', 'finally', 'throw', 'fn', 'update-in',
-            'with-open', 'with-local-vars', 'binding',
-            'gen-class', 'gen-and-load-class', 'gen-and-save-class',
-            'implement', 'proxy', 'lazy-cons', 'with-meta',
-            'struct', 'struct-map', 'delay', 'locking', 'sync', 'time', 'apply',
-            'remove', 'merge', 'interleave', 'interpose', 'distinct',
-            'cons', 'concat', 'lazy-cat', 'cycle', 'rest', 'frest', 'drop',
-            'drop-while', 'nthrest', 'take', 'take-while', 'take-nth', 'butlast',
-            'reverse', 'sort', 'sort-by', 'split-at', 'partition', 'split-with',
-            'first', 'ffirst', 'rfirst', 'zipmap', 'into', 'set', 'vec',
-            'to-array-2d', 'not-empty', 'seq?', 'not-every?', 'every?', 'not-any?',
-            'map', 'mapcat', 'vector?', 'list?', 'hash-map', 'reduce', 'filter',
-            'vals', 'keys', 'rseq', 'subseq', 'rsubseq', 'count', 'empty?',
-            'fnseq', 'repeatedly', 'iterate', 'drop-last',
-            'repeat', 'replicate', 'range',  'into-array',
-            'line-seq', 'resultset-seq', 're-seq', 're-find', 'tree-seq', 'file-seq',
-            'iterator-seq', 'enumeration-seq', 'declare',  'xml-seq',
-            'symbol?', 'string?', 'vector', 'conj', 'str',
-            'pos?', 'neg?', 'zero?', 'nil?', 'inc', 'dec', 'format',
-            'alter', 'commute', 'ref-set', 'floor', 'assoc', 'send', 'send-off'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|', '.', '..', '->',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #555;',
-            1 => 'color: #555;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-            '::', ':'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/cmake.php b/inc/geshi/cmake.php
deleted file mode 100644
index 67277aa9c..000000000
--- a/inc/geshi/cmake.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/*************************************************************************************
- * cmake.php
- * -------
- * Author: Daniel Nelson (danieln@eng.utah.edu)
- * Copyright: (c) 2009 Daniel Nelson
- * Release Version: 1.0.8.11
- * Date Started: 2009/04/06
- *
- * CMake language file for GeSHi.
- *
- * Keyword list generated using CMake 2.6.3.
- *
- * CHANGES
- * -------
- * <date-of-release> (<GeSHi release>)
- *  -  First Release
- *
- * TODO (updated <date-of-release>)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'CMake',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'ESCAPE_REGEXP' => array(
-        // Quoted variables ${...}
-        1 => "/\\$(ENV)?\\{[^\\n\\}]*?\\}/i",
-        // Quoted registry keys [...]
-        2 => "/\\[HKEY[^\n\\]]*?]/i"
-        ),
-    'KEYWORDS' => array(
-        1 => array(
-            'add_custom_command', 'add_custom_target', 'add_definitions',
-            'add_dependencies', 'add_executable', 'add_library',
-            'add_subdirectory', 'add_test', 'aux_source_directory', 'break',
-            'build_command', 'cmake_minimum_required', 'cmake_policy',
-            'configure_file', 'create_test_sourcelist', 'define_property',
-            'else', 'elseif', 'enable_language', 'enable_testing',
-            'endforeach', 'endfunction', 'endif', 'endmacro',
-            'endwhile', 'execute_process', 'export', 'file', 'find_file',
-            'find_library', 'find_package', 'find_path', 'find_program',
-            'fltk_wrap_ui', 'foreach', 'function', 'get_cmake_property',
-            'get_directory_property', 'get_filename_component', 'get_property',
-            'get_source_file_property', 'get_target_property',
-            'get_test_property', 'if', 'include', 'include_directories',
-            'include_external_msproject', 'include_regular_expression',
-            'install', 'link_directories', 'list', 'load_cache',
-            'load_command', 'macro', 'mark_as_advanced', 'math', 'message',
-            'option', 'output_required_files', 'project', 'qt_wrap_cpp',
-            'qt_wrap_ui', 'remove_definitions', 'return', 'separate_arguments',
-            'set', 'set_directory_properties', 'set_property',
-            'set_source_files_properties', 'set_target_properties',
-            'set_tests_properties', 'site_name', 'source_group', 'string',
-            'target_link_libraries', 'try_compile', 'try_run', 'unset',
-            'variable_watch', 'while'
-            ),
-        2 => array(
-            // Deprecated commands
-            'build_name', 'exec_program', 'export_library_dependencies',
-            'install_files', 'install_programs', 'install_targets',
-            'link_libraries', 'make_directory', 'remove', 'subdir_depends',
-            'subdirs', 'use_mangled_mesa', 'utility_source',
-            'variable_requires', 'write_file'
-            ),
-        3 => array(
-            // Special command arguments, this list is not comprehesive.
-            'AND', 'APPEND', 'ASCII', 'BOOL', 'CACHE', 'COMMAND', 'COMMENT',
-            'COMPARE', 'CONFIGURE', 'DEFINED', 'DEPENDS', 'DIRECTORY',
-            'EQUAL', 'EXCLUDE_FROM_ALL', 'EXISTS', 'FALSE', 'FATAL_ERROR',
-            'FILEPATH', 'FIND', 'FORCE', 'GET', 'GLOBAL', 'GREATER',
-            'IMPLICIT_DEPENDS', 'INSERT', 'INTERNAL', 'IS_ABSOLUTE',
-            'IS_DIRECTORY', 'IS_NEWER_THAN', 'LENGTH', 'LESS',
-            'MAIN_DEPENDENCY', 'MATCH', 'MATCHALL', 'MATCHES', 'MODULE', 'NOT',
-            'NOTFOUND', 'OFF', 'ON', 'OR', 'OUTPUT', 'PARENT_SCOPE', 'PATH',
-            'POLICY', 'POST_BUILD', 'PRE_BUILD', 'PRE_LINK', 'PROPERTY',
-            'RANDOM', 'REGEX', 'REMOVE_AT', 'REMOVE_DUPLICATES', 'REMOVE_ITEM',
-            'REPLACE', 'REVERSE', 'SEND_ERROR', 'SHARED', 'SORT', 'SOURCE',
-            'STATIC', 'STATUS', 'STREQUAL', 'STRGREATER', 'STRING', 'STRIP',
-            'STRLESS', 'SUBSTRING', 'TARGET', 'TEST', 'TOLOWER', 'TOUPPER',
-            'TRUE', 'VERBATIM', 'VERSION', 'VERSION_EQUAL', 'VERSION_GREATOR',
-            'VERSION_LESS', 'WORKING_DIRECTORY',
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => true
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')')
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #1f3f81; font-style: bold;',
-            2 => 'color: #1f3f81;',
-            3 => 'color: #077807; font-sytle: italic;'
-            ),
-        'BRACKETS' => array(),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #b08000;',
-            2 => 'color: #0000cd;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #912f11;',
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #197d8b;'
-            ),
-        'NUMBERS' => array(),
-        'METHODS' => array(),
-        'REGEXPS' => array(
-            0 => 'color: #b08000;',
-            1 => 'color: #0000cd;'
-            ),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => 'http://www.cmake.org/cmake/help/cmake2.6docs.html#command:{FNAMEL}',
-        2 => 'http://www.cmake.org/cmake/help/cmake2.6docs.html#command:{FNAMEL}',
-        3 => '',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        // Unquoted variables
-        0 => "\\$(ENV)?\\{[^\\n}]*?\\}",
-        // Unquoted registry keys
-        1 => "\\[HKEY[^\n\\]]*?]"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            // These keywords cannot come after a open paren
-            1 => array(
-                'DISALLOWED_AFTER' =>  '(?= *\()'
-                ),
-            2 => array(
-                'DISALLOWED_AFTER' =>  '(?= *\()'
-                )
-            ),
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'METHODS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/cobol.php b/inc/geshi/cobol.php
deleted file mode 100644
index b07be48a1..000000000
--- a/inc/geshi/cobol.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/*************************************************************************************
- * cobol.php
- * ----------
- * Author: BenBE (BenBE@omorphia.org)
- * Copyright: (c) 2007-2008 BenBE (http://www.omorphia.de/)
- * Release Version: 1.0.8.11
- * Date Started: 2007/07/02
- *
- * COBOL language file for GeSHi.
- *
- * CHANGES
- * -------
- *
- * TODO (updated 2007/07/02)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'COBOL',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(1 => '/^\*.*?$/m'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_SCI_SHORT |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array( //Compiler Directives
-            'ANSI', 'BLANK', 'NOBLANK', 'CALL-SHARED', 'CANCEL', 'NOCANCEL',
-            'CHECK', 'CODE', 'NOCODE', 'COLUMNS', 'COMPACT', 'NOCOMPACT',
-            'COMPILE', 'CONSULT', 'NOCONSULT', 'CROSSREF', 'NOCROSSREF',
-            'DIAGNOSE-74', 'NODIAGNOSE-74', 'DIAGNOSE-85', 'NODIAGNOSE-85',
-            'DIAGNOSEALL', 'NODIAGNOSEALL', 'ENDIF', 'ENDUNIT', 'ENV',
-            'ERRORFILE', 'ERRORS', 'FIPS', 'NOFIPS', 'FMAP', 'HEADING', 'HEAP',
-            'HIGHPIN', 'HIGHREQUESTERS', 'ICODE', 'NOICODE', 'IF', 'IFNOT',
-            'INNERLIST', 'NOINNERLIST', 'INSPECT', 'NOINSPECT', 'LARGEDATA',
-            'LD', 'LESS-CODE', 'LIBRARY', 'LINES', 'LIST', 'NOLIST', 'LMAP',
-            'NOLMAP', 'MAIN', 'MAP', 'NOMAP', 'NLD', 'NONSTOP', 'NON-SHARED',
-            'OPTIMIZE', 'PERFORM-TRACE', 'PORT', 'NOPORT', 'RESETTOG',
-            'RUNNABLE', 'RUNNAMED', 'SAVE', 'SAVEABEND', 'NOSAVEABEND',
-            'SEARCH', 'NOSEARCH', 'SECTION', 'SETTOG', 'SHARED', 'SHOWCOPY',
-            'NOSHOWCOPY', 'SHOWFILE', 'NOSHOWFILE', 'SOURCE', 'SQL', 'NOSQL',
-            'SQLMEM', 'SUBSET', 'SUBTYPE', 'SUPPRESS', 'NOSUPPRESS', 'SYMBOLS',
-            'NOSYMBOLS', 'SYNTAX', 'TANDEM', 'TRAP2', 'NOTRAP2', 'TRAP2-74',
-            'NOTRAP2-74', 'UL', 'WARN', 'NOWARN'
-            ),
-        2 => array( //Statement Keywords
-            'ACCEPT', 'ADD', 'TO', 'GIVING', 'CORRESPONDING', 'ALTER', 'CALL',
-            'CHECKPOINT', 'CLOSE', 'COMPUTE', 'CONTINUE', 'COPY',
-            'DELETE', 'DISPLAY', 'DIVIDE', 'INTO', 'REMAINDER', 'ENTER',
-            'COBOL', 'EVALUATE', 'EXIT', 'GO', 'INITIALIZE',
-            'TALLYING', 'REPLACING', 'CONVERTING', 'LOCKFILE', 'MERGE', 'MOVE',
-            'MULTIPLY', 'OPEN', 'PERFORM', 'TIMES',
-            'UNTIL', 'VARYING', 'RETURN',
-            ),
-        3 => array( //Reserved in some contexts
-            'ACCESS', 'ADDRESS', 'ADVANCING', 'AFTER', 'ALL',
-            'ALPHABET', 'ALPHABETIC', 'ALPHABETIC-LOWER', 'ALPHABETIC-UPPER',
-            'ALPHANUMERIC', 'ALPHANUMERIC-EDITED', 'ALSO', 'ALTERNATE',
-            'AND', 'ANY', 'APPROXIMATE', 'AREA', 'AREAS', 'ASCENDING', 'ASSIGN',
-            'AT', 'AUTHOR', 'BEFORE', 'BINARY', 'BLOCK', 'BOTTOM', 'BY',
-            'CD', 'CF', 'CH', 'CHARACTER', 'CHARACTERS',
-            'CHARACTER-SET', 'CLASS', 'CLOCK-UNITS',
-            'CODE-SET', 'COLLATING', 'COLUMN', 'COMMA',
-            'COMMON', 'COMMUNICATION', 'COMP', 'COMP-3', 'COMP-5',
-            'COMPUTATIONAL', 'COMPUTATIONAL-3', 'COMPUTATIONAL-5',
-            'CONFIGURATION', 'CONTAINS', 'CONTENT', 'CONTROL',
-            'CONTROLS', 'CORR', 'COUNT',
-            'CURRENCY', 'DATA', 'DATE', 'DATE-COMPILED', 'DATE-WRITTEN', 'DAY',
-            'DAY-OF-WEEK', 'DE', 'DEBUG-CONTENTS', 'DEBUG-ITEM', 'DEBUG-LINE',
-            'DEBUG-SUB-2', 'DEBUG-SUB-3', 'DEBUGGING', 'DECIMAL-POINT',
-            'DECLARATIVES', 'DEBUG-NAME', 'DEBUG-SUB-1', 'DELIMITED',
-            'DELIMITER', 'DEPENDING', 'DESCENDING', 'DESTINATION', 'DETAIL',
-            'DISABLE', 'DIVISION', 'DOWN', 'DUPLICATES',
-            'DYNAMIC', 'EGI', 'ELSE', 'EMI', 'ENABLE', 'END', 'END-ADD',
-            'END-COMPUTE', 'END-DELETE', 'END-DIVIDE', 'END-EVALUATE', 'END-IF',
-            'END-MULTIPLY', 'END-OF-PAGE', 'END-PERFORM', 'END-READ',
-            'END-RECEIVE', 'END-RETURN', 'END-REWRITE', 'END-SEARCH',
-            'END-START', 'END-STRING', 'END-SUBTRACT', 'END-UNSTRING',
-            'END-WRITE', 'EOP', 'EQUAL', 'ERROR', 'ESI',
-            'EVERY', 'EXCEPTION', 'EXCLUSIVE', 'EXTEND',
-            'EXTENDED-STORAGE', 'EXTERNAL', 'FALSE', 'FD', 'FILE',
-            'FILE-CONTROL', 'FILLER', 'FINAL', 'FIRST', 'FOOTING', 'FOR',
-            'FROM', 'FUNCTION', 'GENERATE', 'GENERIC', 'GLOBAL',
-            'GREATER', 'GROUP', 'GUARDIAN-ERR', 'HIGH-VALUE',
-            'HIGH-VALUES', 'I-O', 'I-O-CONTROL', 'IDENTIFICATION', 'IN',
-            'INDEX', 'INDEXED', 'INDICATE', 'INITIAL', 'INITIATE',
-            'INPUT', 'INPUT-OUTPUT', 'INSTALLATION',
-            'INVALID', 'IS', 'JUST', 'JUSTIFIED', 'KEY', 'LABEL', 'LAST',
-            'LEADING', 'LEFT', 'LESS', 'LIMIT', 'LIMITS', 'LINAGE',
-            'LINAGE-COUNTER', 'LINE', 'LINE-COUNTER', 'LINKAGE', 'LOCK',
-            'LOW-VALUE', 'LOW-VALUES', 'MEMORY', 'MESSAGE',
-            'MODE', 'MODULES', 'MULTIPLE', 'NATIVE',
-            'NEGATIVE', 'NEXT', 'NO', 'NOT', 'NULL', 'NULLS', 'NUMBER',
-            'NUMERIC', 'NUMERIC-EDITED', 'OBJECT-COMPUTER', 'OCCURS', 'OF',
-            'OFF', 'OMITTED', 'ON', 'OPTIONAL', 'OR', 'ORDER',
-            'ORGANIZATION', 'OTHER', 'OUTPUT', 'OVERFLOW', 'PACKED-DECIMAL',
-            'PADDING', 'PAGE', 'PAGE-COUNTER', 'PF', 'PH', 'PIC',
-            'PICTURE', 'PLUS', 'POINTER', 'POSITION', 'POSITIVE', 'PRINTING',
-            'PROCEDURE', 'PROCEDURES', 'PROCEED', 'PROGRAM', 'PROGRAM-ID',
-            'PROGRAM-STATUS', 'PROGRAM-STATUS-1', 'PROGRAM-STATUS-2', 'PROMPT',
-            'PROTECTED', 'PURGE', 'QUEUE', 'QUOTE', 'QUOTES', 'RD',
-            'RECEIVE', 'RECEIVE-CONTROL', 'RECORD', 'RECORDS',
-            'REDEFINES', 'REEL', 'REFERENCE', 'REFERENCES', 'RELATIVE',
-            'REMOVAL', 'RENAMES', 'REPLACE',
-            'REPLY', 'REPORT', 'REPORTING', 'REPORTS', 'RERUN',
-            'RESERVE', 'RESET', 'REVERSED', 'REWIND', 'REWRITE', 'RF',
-            'RH', 'RIGHT', 'ROUNDED', 'RUN', 'SAME', 'SD',
-            'SECURITY', 'SEGMENT', 'SEGMENT-LIMIT', 'SELECT', 'SEND',
-            'SENTENCE', 'SEPARATE', 'SEQUENCE', 'SEQUENTIAL', 'SET',
-            'SIGN', 'SIZE', 'SORT', 'SORT-MERGE', 'SOURCE-COMPUTER',
-            'SPACE', 'SPACES', 'SPECIAL-NAMES', 'STANDARD', 'STANDARD-1',
-            'STANDARD-2', 'START', 'STARTBACKUP', 'STATUS', 'STOP', 'STRING',
-            'SUB-QUEUE-1', 'SUB-QUEUE-2', 'SUB-QUEUE-3', 'SUBTRACT',
-            'SYMBOLIC', 'SYNC', 'SYNCDEPTH', 'SYNCHRONIZED',
-            'TABLE', 'TAL', 'TAPE', 'TERMINAL', 'TERMINATE', 'TEST',
-            'TEXT', 'THAN', 'THEN', 'THROUGH', 'THRU', 'TIME',
-            'TOP', 'TRAILING', 'TRUE', 'TYPE', 'UNIT', 'UNLOCK', 'UNLOCKFILE',
-            'UNLOCKRECORD', 'UNSTRING', 'UP', 'UPON', 'USAGE', 'USE',
-            'USING', 'VALUE', 'VALUES', 'WHEN', 'WITH', 'WORDS',
-            'WORKING-STORAGE', 'WRITE', 'ZERO', 'ZEROES'
-            ),
-        4 => array( //Standard functions
-            'ACOS', 'ANNUITY', 'ASIN', 'ATAN', 'CHAR', 'COS', 'CURRENT-DATE',
-            'DATE-OF-INTEGER', 'DAY-OF-INTEGER', 'FACTORIAL', 'INTEGER',
-            'INTEGER-OF-DATE', 'INTEGER-OF-DAY', 'INTEGER-PART', 'LENGTH',
-            'LOG', 'LOG10', 'LOWER-CASE', 'MAX', 'MEAN', 'MEDIAN', 'MIDRANGE',
-            'MIN', 'MOD', 'NUMVAL', 'NUMVAL-C', 'ORD', 'ORD-MAX', 'ORD-MIN',
-            'PRESENT-VALUE', 'RANDOM', 'RANGE', 'REM', 'REVERSE', 'SIN', 'SQRT',
-            'STANDARD-DEVIATION', 'SUM', 'TAN', 'UPPER-CASE', 'VARIANCE',
-            'WHEN-COMPILED'
-            ),
-        5 => array( //Privileged Built-in Functions
-            '#IN', '#OUT', '#TERM', '#TEMP', '#DYNAMIC', 'COBOL85^ARMTRAP',
-            'COBOL85^COMPLETION', 'COBOL_COMPLETION_', 'COBOL_CONTROL_',
-            'COBOL_GETENV_', 'COBOL_PUTENV_', 'COBOL85^RETURN^SORT^ERRORS',
-            'COBOL_RETURN_SORT_ERRORS_', 'COBOL85^REWIND^SEQUENTIAL',
-            'COBOL_REWIND_SEQUENTIAL_', 'COBOL85^SET^SORT^PARAM^TEXT',
-            'COBOL_SET_SORT_PARAM_TEXT_', 'COBOL85^SET^SORT^PARAM^VALUE',
-            'COBOL_SET_SORT_PARAM_VALUE_', 'COBOL_SET_MAX_RECORD_',
-            'COBOL_SETMODE_', 'COBOL85^SPECIAL^OPEN', 'COBOL_SPECIAL_OPEN_',
-            'COBOLASSIGN', 'COBOL_ASSIGN_', 'COBOLFILEINFO', 'COBOL_FILE_INFO_',
-            'COBOLSPOOLOPEN', 'CREATEPROCESS', 'ALTERPARAMTEXT',
-            'CHECKLOGICALNAME', 'CHECKMESSAGE', 'DELETEASSIGN', 'DELETEPARAM',
-            'DELETESTARTUP', 'GETASSIGNTEXT', 'GETASSIGNVALUE', 'GETBACKUPCPU',
-            'GETPARAMTEXT', 'GETSTARTUPTEXT', 'PUTASSIGNTEXT', 'PUTASSIGNVALUE',
-            'PUTPARAMTEXT', 'PUTSTARTUPTEXT'
-            )
-        ),
-    'SYMBOLS' => array(
-        //Avoid having - in identifiers marked as symbols
-        ' + ', ' - ', ' * ', ' / ', ' ** ',
-        '.', ',',
-        '=',
-        '(', ')', '[', ']'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #008000; font-weight: bold;',
-            4 => 'color: #000080;',
-            5 => 'color: #008000;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #a0a0a0; font-style: italic;',
-            'MULTI' => 'color: #a0a0a0; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #339933;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #993399;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-    );
-
-?>
diff --git a/inc/geshi/coffeescript.php b/inc/geshi/coffeescript.php
deleted file mode 100644
index 194aecd08..000000000
--- a/inc/geshi/coffeescript.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/*************************************************************************************
- * coffeescript.php
- * ----------
- * Author: Trevor Burnham (trevorburnham@gmail.com)
- * Copyright: (c) 2010 Trevor Burnham (http://iterative.ly)
- * Release Version: 1.0.8.11
- * Date Started: 2010/06/08
- *
- * CoffeeScript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/06/08 (1.0.8.9)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'CoffeeScript',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array('###' => '###'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    //Longest quotemarks ALWAYS first
-    'QUOTEMARKS' => array('"""', "'''", '"', "'"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-
-        /*
-        ** Set 1: control keywords
-        */
-        1 => array(
-            'break', 'by', 'catch', 'continue', 'else', 'finally', 'for', 'in', 'of', 'if',
-            'return', 'switch', 'then', 'throw', 'try', 'unless', 'when', 'while', 'until'
-            ),
-
-        /*
-        ** Set 2: logic keywords
-        */
-        2 => array(
-            'and', 'or', 'is', 'isnt', 'not'
-            ),
-
-        /*
-        ** Set 3: other keywords
-        */
-        3 => array(
-            'instanceof', 'new', 'delete', 'typeof',
-            'class', 'super', 'this', 'extends'
-            ),
-
-        /*
-        ** Set 4: constants
-        */
-        4 => array(
-            'true', 'false', 'on', 'off', 'yes', 'no',
-            'Infinity', 'NaN', 'undefined', 'null'
-            )
-        ),
-    'SYMBOLS' => array(
-            '(', ')', '[', ']', '{', '}', '*', '&', '|', '%', '!', ',', ';', '<', '>', '?', '`',
-            '+', '-', '*', '/', '->', '=>', '<<', '>>', '@', ':', '^'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #ff7700;font-weight:bold;',
-            2 => 'color: #008000;',
-            3 => 'color: #dc143c;',
-            4 => 'color: #0000cd;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: black;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #483d8b;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff4500;'
-            ),
-        'METHODS' => array(
-            1 => 'color: black;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<script type="text/coffeescript">' => '</script>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/cpp-qt.php b/inc/geshi/cpp-qt.php
deleted file mode 100644
index 36626c90d..000000000
--- a/inc/geshi/cpp-qt.php
+++ /dev/null
@@ -1,564 +0,0 @@
-<?php
-/*************************************************************************************
- * cpp.php
- * -------
- * Author: Iulian M
- * Copyright: (c) 2006 Iulian M
- * Release Version: 1.0.8.11
- * Date Started: 2004/09/27
- *
- * C++ (with Qt extensions) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/06/28 (1.0.8.4)
- *   -  Updated list of Keywords from Qt 4.5
- *
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'C++ (Qt)',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[abfnrtv\\\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
-            'switch', 'while', 'delete', 'new', 'this'
-            ),
-        2 => array(
-            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
-            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
-            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
-            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
-            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
-            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
-            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
-            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
-            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
-            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
-            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
-            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
-            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
-            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
-            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class' ,
-            'foreach','connect', 'Q_OBJECT' , 'slots' , 'signals', 'Q_SIGNALS', 'Q_SLOTS',
-            'Q_FOREACH', 'QCOMPARE', 'QVERIFY', 'qDebug', 'kDebug', 'QBENCHMARK'
-            ),
-        3 => array(
-            'cin', 'cerr', 'clog', 'cout',
-            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
-            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
-            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
-            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
-            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
-            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
-            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
-            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
-            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
-            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
-            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
-            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
-            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
-            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
-            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
-            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
-            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
-            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
-            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
-            ),
-        4 => array(
-            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
-            'register', 'short', 'shortint', 'signed', 'static', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
-            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
-            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
-
-            'int8', 'int16', 'int32', 'int64',
-            'uint8', 'uint16', 'uint32', 'uint64',
-
-            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
-            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
-
-            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
-            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
-
-            'int8_t', 'int16_t', 'int32_t', 'int64_t',
-            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
-
-            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
-            ),
-        5 => array(
-            "Q_UINT16", "Q_UINT32", "Q_UINT64", "Q_UINT8", "Q_ULLONG",
-            "Q_ULONG", "Q3Accel", "Q3Action", "Q3ActionGroup", "Q3AsciiBucket",
-            "Q3AsciiCache", "Q3AsciiCacheIterator", "Q3AsciiDict",
-            "Q3AsciiDictIterator", "Q3BaseBucket", "Q3BoxLayout", "Q3Button",
-            "Q3ButtonGroup", "Q3Cache", "Q3CacheIterator", "Q3Canvas",
-            "Q3CanvasEllipse", "Q3CanvasItem", "Q3CanvasItemList",
-            "Q3CanvasLine", "Q3CanvasPixmap", "Q3CanvasPixmapArray",
-            "Q3CanvasPolygon", "Q3CanvasPolygonalItem", "Q3CanvasRectangle",
-            "Q3CanvasSpline", "Q3CanvasSprite", "Q3CanvasText", "Q3CanvasView",
-            "Q3CheckListItem", "Q3CheckTableItem", "Q3CleanupHandler",
-            "Q3ColorDrag", "Q3ComboBox", "Q3ComboTableItem", "Q3CString",
-            "Q3DataBrowser", "Q3DataTable", "Q3DataView", "Q3DateEdit",
-            "Q3DateTimeEdit", "Q3DateTimeEditBase", "Q3DeepCopy", "Q3Dict",
-            "Q3DictIterator", "Q3Dns", "Q3DnsSocket", "Q3DockArea",
-            "Q3DockAreaLayout", "Q3DockWindow", "Q3DragObject", "Q3DropSite",
-            "Q3EditorFactory", "Q3FileDialog", "Q3FileIconProvider",
-            "Q3FilePreview", "Q3Frame", "Q3Ftp", "Q3GArray", "Q3GCache",
-            "Q3GCacheIterator", "Q3GDict", "Q3GDictIterator", "Q3GList",
-            "Q3GListIterator", "Q3GListStdIterator", "Q3Grid", "Q3GridLayout",
-            "Q3GridView", "Q3GroupBox", "Q3GVector", "Q3HBox", "Q3HBoxLayout",
-            "Q3HButtonGroup", "Q3Header", "Q3HGroupBox", "Q3Http",
-            "Q3HttpHeader", "Q3HttpRequestHeader", "Q3HttpResponseHeader",
-            "Q3IconDrag", "Q3IconDragItem", "Q3IconView", "Q3IconViewItem",
-            "Q3ImageDrag", "Q3IntBucket", "Q3IntCache", "Q3IntCacheIterator",
-            "Q3IntDict", "Q3IntDictIterator", "Q3ListBox", "Q3ListBoxItem",
-            "Q3ListBoxPixmap", "Q3ListBoxText", "Q3ListView", "Q3ListViewItem",
-            "Q3ListViewItemIterator", "Q3LNode", "Q3LocalFs", "Q3MainWindow",
-            "Q3MemArray", "Q3MimeSourceFactory", "Q3MultiLineEdit",
-            "Q3NetworkOperation", "Q3NetworkProtocol", "Q3NetworkProtocolDict",
-            "Q3NetworkProtocolFactory", "Q3NetworkProtocolFactoryBase",
-            "Q3ObjectDictionary", "Q3PaintDeviceMetrics", "Q3Painter",
-            "Q3Picture", "Q3PointArray", "Q3PolygonScanner", "Q3PopupMenu",
-            "Q3Process", "Q3ProgressBar", "Q3ProgressDialog", "Q3PtrBucket",
-            "Q3PtrCollection", "Q3PtrDict", "Q3PtrDictIterator", "Q3PtrList",
-            "Q3PtrListIterator", "Q3PtrListStdIterator", "Q3PtrQueue",
-            "Q3PtrStack", "Q3PtrVector", "Q3RangeControl", "Q3ScrollView",
-            "Q3Semaphore", "Q3ServerSocket", "Q3Shared", "Q3Signal",
-            "Q3SimpleRichText", "Q3SingleCleanupHandler", "Q3Socket",
-            "Q3SocketDevice", "Q3SortedList", "Q3SpinWidget", "Q3SqlCursor",
-            "Q3SqlEditorFactory", "Q3SqlFieldInfo", "Q3SqlFieldInfoList",
-            "Q3SqlForm", "Q3SqlPropertyMap", "Q3SqlRecordInfo",
-            "Q3SqlSelectCursor", "Q3StoredDrag", "Q3StrIList", "Q3StringBucket",
-            "Q3StrIVec", "Q3StrList", "Q3StrListIterator", "Q3StrVec",
-            "Q3StyleSheet", "Q3StyleSheetItem", "Q3SyntaxHighlighter",
-            "Q3TabDialog", "Q3Table", "Q3TableItem", "Q3TableSelection",
-            "Q3TextBrowser", "Q3TextDrag", "Q3TextEdit",
-            "Q3TextEditOptimPrivate", "Q3TextStream", "Q3TextView",
-            "Q3TimeEdit", "Q3ToolBar", "Q3TSFUNC", "Q3UriDrag", "Q3Url",
-            "Q3UrlOperator", "Q3ValueList", "Q3ValueListConstIterator",
-            "Q3ValueListIterator", "Q3ValueStack", "Q3ValueVector", "Q3VBox",
-            "Q3VBoxLayout", "Q3VButtonGroup", "Q3VGroupBox", "Q3WhatsThis",
-            "Q3WidgetStack", "Q3Wizard", "QAbstractButton",
-            "QAbstractEventDispatcher", "QAbstractExtensionFactory",
-            "QAbstractExtensionManager", "QAbstractFileEngine",
-            "QAbstractFileEngineHandler", "QAbstractFileEngineIterator",
-            "QAbstractFormBuilder", "QAbstractGraphicsShapeItem",
-            "QAbstractItemDelegate", "QAbstractItemModel", "QAbstractItemView",
-            "QAbstractListModel", "QAbstractMessageHandler",
-            "QAbstractNetworkCache", "QAbstractPageSetupDialog",
-            "QAbstractPrintDialog", "QAbstractProxyModel",
-            "QAbstractScrollArea", "QAbstractSlider", "QAbstractSocket",
-            "QAbstractSpinBox", "QAbstractTableModel",
-            "QAbstractTextDocumentLayout", "QAbstractUndoItem",
-            "QAbstractUriResolver", "QAbstractXmlNodeModel",
-            "QAbstractXmlReceiver", "QAccessible", "QAccessible2Interface",
-            "QAccessibleApplication", "QAccessibleBridge",
-            "QAccessibleBridgeFactoryInterface", "QAccessibleBridgePlugin",
-            "QAccessibleEditableTextInterface", "QAccessibleEvent",
-            "QAccessibleFactoryInterface", "QAccessibleInterface",
-            "QAccessibleInterfaceEx", "QAccessibleObject",
-            "QAccessibleObjectEx", "QAccessiblePlugin",
-            "QAccessibleSimpleEditableTextInterface",
-            "QAccessibleTableInterface", "QAccessibleTextInterface",
-            "QAccessibleValueInterface", "QAccessibleWidget",
-            "QAccessibleWidgetEx", "QAction", "QActionEvent", "QActionGroup",
-            "QApplication", "QArgument", "QAssistantClient", "QAtomicInt",
-            "QAtomicPointer", "QAuthenticator", "QBasicAtomicInt",
-            "QBasicAtomicPointer", "QBasicTimer", "QBitArray", "QBitmap",
-            "QBitRef", "QBool", "QBoxLayout", "QBrush", "QBrushData", "QBuffer",
-            "QButtonGroup", "QByteArray", "QByteArrayMatcher", "QByteRef",
-            "QCache", "QCalendarWidget", "QCDEStyle", "QChar", "QCharRef",
-            "QCheckBox", "QChildEvent", "QCleanlooksStyle", "QClipboard",
-            "QClipboardEvent", "QCloseEvent", "QColor", "QColorDialog",
-            "QColorGroup", "QColormap", "QColumnView", "QComboBox",
-            "QCommandLinkButton", "QCommonStyle", "QCompleter",
-            "QConicalGradient", "QConstString", "QContextMenuEvent", "QCOORD",
-            "QCoreApplication", "QCryptographicHash", "QCursor", "QCursorShape",
-            "QCustomEvent", "QDataStream", "QDataWidgetMapper", "QDate",
-            "QDateEdit", "QDateTime", "QDateTimeEdit", "QDB2Driver",
-            "QDB2Result", "QDBusAbstractAdaptor", "QDBusAbstractInterface",
-            "QDBusArgument", "QDBusConnection", "QDBusConnectionInterface",
-            "QDBusContext", "QDBusError", "QDBusInterface", "QDBusMessage",
-            "QDBusMetaType", "QDBusObjectPath", "QDBusPendingCall",
-            "QDBusPendingCallWatcher", "QDBusPendingReply",
-            "QDBusPendingReplyData", "QDBusReply", "QDBusServer",
-            "QDBusSignature", "QDBusVariant", "QDebug",
-            "QDesignerActionEditorInterface", "QDesignerBrushManagerInterface",
-            "QDesignerComponents", "QDesignerContainerExtension",
-            "QDesignerCustomWidgetCollectionInterface",
-            "QDesignerCustomWidgetInterface", "QDesignerDnDItemInterface",
-            "QDesignerDynamicPropertySheetExtension", "QDesignerExportWidget",
-            "QDesignerExtraInfoExtension", "QDesignerFormEditorInterface",
-            "QDesignerFormEditorPluginInterface", "QDesignerFormWindowCursorInterface",
-            "QDesignerFormWindowInterface", "QDesignerFormWindowManagerInterface",
-            "QDesignerFormWindowToolInterface",
-            "QDesignerIconCacheInterface", "QDesignerIntegrationInterface",
-            "QDesignerLanguageExtension", "QDesignerLayoutDecorationExtension",
-            "QDesignerMemberSheetExtension", "QDesignerMetaDataBaseInterface",
-            "QDesignerMetaDataBaseItemInterface",
-            "QDesignerObjectInspectorInterface", "QDesignerPromotionInterface",
-            "QDesignerPropertyEditorInterface",
-            "QDesignerPropertySheetExtension", "QDesignerResourceBrowserInterface",
-            "QDesignerTaskMenuExtension", "QDesignerWidgetBoxInterface",
-            "QDesignerWidgetDataBaseInterface", "QDesignerWidgetDataBaseItemInterface",
-            "QDesignerWidgetFactoryInterface", "QDesktopServices",
-            "QDesktopWidget", "QDial", "QDialog", "QDialogButtonBox", "QDir",
-            "QDirIterator", "QDirModel", "QDockWidget", "QDomAttr",
-            "QDomCDATASection", "QDomCharacterData", "QDomComment",
-            "QDomDocument", "QDomDocumentFragment", "QDomDocumentType",
-            "QDomElement", "QDomEntity", "QDomEntityReference",
-            "QDomImplementation", "QDomNamedNodeMap", "QDomNode",
-            "QDomNodeList", "QDomNotation", "QDomProcessingInstruction",
-            "QDomText", "QDoubleSpinBox", "QDoubleValidator", "QDrag",
-            "QDragEnterEvent", "QDragLeaveEvent", "QDragMoveEvent",
-            "QDragResponseEvent", "QDropEvent", "QDynamicPropertyChangeEvent",
-            "QErrorMessage", "QEvent", "QEventLoop", "QEventSizeOfChecker",
-            "QExplicitlySharedDataPointer", "QExtensionFactory",
-            "QExtensionManager", "QFactoryInterface", "QFile", "QFileDialog",
-            "QFileIconProvider", "QFileInfo", "QFileInfoList",
-            "QFileInfoListIterator", "QFileOpenEvent", "QFileSystemModel",
-            "QFileSystemWatcher", "QFlag", "QFlags", "QFocusEvent",
-            "QFocusFrame", "QFont", "QFontComboBox", "QFontDatabase",
-            "QFontDialog", "QFontInfo", "QFontMetrics", "QFontMetricsF",
-            "QForeachContainer", "QForeachContainerBase", "QFormBuilder",
-            "QFormLayout", "QFrame", "QFSFileEngine", "QFtp", "QFuture",
-            "QFutureInterface", "QFutureInterfaceBase", "QFutureIterator",
-            "QFutureSynchronizer", "QFutureWatcher", "QFutureWatcherBase",
-            "QGenericArgument", "QGenericReturnArgument", "QGLColormap",
-            "QGLContext", "QGLFormat", "QGLFramebufferObject", "QGlobalStatic",
-            "QGlobalStaticDeleter", "QGLPixelBuffer", "QGLWidget", "QGradient",
-            "QGradientStop", "QGradientStops", "QGraphicsEllipseItem",
-            "QGraphicsGridLayout", "QGraphicsItem", "QGraphicsItemAnimation",
-            "QGraphicsItemGroup", "QGraphicsLayout", "QGraphicsLayoutItem",
-            "QGraphicsLinearLayout", "QGraphicsLineItem", "QGraphicsPathItem",
-            "QGraphicsPixmapItem", "QGraphicsPolygonItem",
-            "QGraphicsProxyWidget", "QGraphicsRectItem", "QGraphicsScene",
-            "QGraphicsSceneContextMenuEvent", "QGraphicsSceneDragDropEvent",
-            "QGraphicsSceneEvent", "QGraphicsSceneHelpEvent",
-            "QGraphicsSceneHoverEvent", "QGraphicsSceneMouseEvent",
-            "QGraphicsSceneMoveEvent", "QGraphicsSceneResizeEvent",
-            "QGraphicsSceneWheelEvent", "QGraphicsSimpleTextItem",
-            "QGraphicsSvgItem", "QGraphicsTextItem", "QGraphicsView",
-            "QGraphicsWidget", "QGridLayout", "QGroupBox", "QGtkStyle", "QHash",
-            "QHashData", "QHashDummyNode", "QHashDummyValue", "QHashIterator",
-            "QHashNode", "QHBoxLayout", "QHeaderView", "QHelpContentItem",
-            "QHelpContentModel", "QHelpContentWidget", "QHelpEngine",
-            "QHelpEngineCore", "QHelpEvent", "QHelpGlobal", "QHelpIndexModel",
-            "QHelpIndexWidget", "QHelpSearchEngine", "QHelpSearchQuery",
-            "QHelpSearchQueryWidget", "QHelpSearchResultWidget", "QHideEvent",
-            "QHostAddress", "QHostInfo", "QHoverEvent", "QHttp", "QHttpHeader",
-            "QHttpRequestHeader", "QHttpResponseHeader", "QIBaseDriver",
-            "QIBaseResult", "QIcon", "QIconDragEvent", "QIconEngine",
-            "QIconEngineFactoryInterface", "QIconEngineFactoryInterfaceV2",
-            "QIconEnginePlugin", "QIconEnginePluginV2", "QIconEngineV2",
-            "QIconSet", "QImage", "QImageIOHandler",
-            "QImageIOHandlerFactoryInterface", "QImageIOPlugin", "QImageReader",
-            "QImageTextKeyLang", "QImageWriter", "QIncompatibleFlag",
-            "QInputContext", "QInputContextFactory",
-            "QInputContextFactoryInterface", "QInputContextPlugin",
-            "QInputDialog", "QInputEvent", "QInputMethodEvent", "Q_INT16",
-            "Q_INT32", "Q_INT64", "Q_INT8", "QInternal", "QIntForSize",
-            "QIntForType", "QIntValidator", "QIODevice", "Q_IPV6ADDR",
-            "QIPv6Address", "QItemDelegate", "QItemEditorCreator",
-            "QItemEditorCreatorBase", "QItemEditorFactory", "QItemSelection",
-            "QItemSelectionModel", "QItemSelectionRange", "QKeyEvent",
-            "QKeySequence", "QLabel", "QLatin1Char", "QLatin1String", "QLayout",
-            "QLayoutItem", "QLayoutIterator", "QLCDNumber", "QLibrary",
-            "QLibraryInfo", "QLine", "QLinearGradient", "QLineEdit", "QLineF",
-            "QLinkedList", "QLinkedListData", "QLinkedListIterator",
-            "QLinkedListNode", "QList", "QListData", "QListIterator",
-            "QListView", "QListWidget", "QListWidgetItem", "Q_LLONG", "QLocale",
-            "QLocalServer", "QLocalSocket", "Q_LONG", "QMacCompatGLenum",
-            "QMacCompatGLint", "QMacCompatGLuint", "QMacGLCompatTypes",
-            "QMacMime", "QMacPasteboardMime", "QMainWindow", "QMap", "QMapData",
-            "QMapIterator", "QMapNode", "QMapPayloadNode", "QMatrix",
-            "QMdiArea", "QMdiSubWindow", "QMenu", "QMenuBar",
-            "QMenubarUpdatedEvent", "QMenuItem", "QMessageBox",
-            "QMetaClassInfo", "QMetaEnum", "QMetaMethod", "QMetaObject",
-            "QMetaObjectExtraData", "QMetaProperty", "QMetaType", "QMetaTypeId",
-            "QMetaTypeId2", "QMimeData", "QMimeSource", "QModelIndex",
-            "QModelIndexList", "QMotifStyle", "QMouseEvent", "QMoveEvent",
-            "QMovie", "QMultiHash", "QMultiMap", "QMutableFutureIterator",
-            "QMutableHashIterator", "QMutableLinkedListIterator",
-            "QMutableListIterator", "QMutableMapIterator",
-            "QMutableSetIterator", "QMutableStringListIterator",
-            "QMutableVectorIterator", "QMutex", "QMutexLocker", "QMYSQLDriver",
-            "QMYSQLResult", "QNetworkAccessManager", "QNetworkAddressEntry",
-            "QNetworkCacheMetaData", "QNetworkCookie", "QNetworkCookieJar",
-            "QNetworkDiskCache", "QNetworkInterface", "QNetworkProxy",
-            "QNetworkProxyFactory", "QNetworkProxyQuery", "QNetworkReply",
-            "QNetworkRequest", "QNoDebug", "QNoImplicitBoolCast", "QObject",
-            "QObjectCleanupHandler", "QObjectData", "QObjectList",
-            "QObjectUserData", "QOCIDriver", "QOCIResult", "QODBCDriver",
-            "QODBCResult", "QPageSetupDialog", "QPaintDevice", "QPaintEngine",
-            "QPaintEngineState", "QPainter", "QPainterPath",
-            "QPainterPathPrivate", "QPainterPathStroker", "QPaintEvent",
-            "QPair", "QPalette", "QPen", "QPersistentModelIndex", "QPicture",
-            "QPictureFormatInterface", "QPictureFormatPlugin", "QPictureIO",
-            "Q_PID", "QPixmap", "QPixmapCache", "QPlainTextDocumentLayout",
-            "QPlainTextEdit", "QPlastiqueStyle", "QPluginLoader", "QPoint",
-            "QPointer", "QPointF", "QPolygon", "QPolygonF", "QPrintDialog",
-            "QPrintEngine", "QPrinter", "QPrinterInfo", "QPrintPreviewDialog",
-            "QPrintPreviewWidget", "QProcess", "QProgressBar",
-            "QProgressDialog", "QProxyModel", "QPSQLDriver", "QPSQLResult",
-            "QPushButton", "QQueue", "QRadialGradient", "QRadioButton",
-            "QReadLocker", "QReadWriteLock", "QRect", "QRectF", "QRegExp",
-            "QRegExpValidator", "QRegion", "QResizeEvent", "QResource",
-            "QReturnArgument", "QRgb", "QRubberBand", "QRunnable",
-            "QScriptable", "QScriptClass", "QScriptClassPropertyIterator",
-            "QScriptContext", "QScriptContextInfo", "QScriptContextInfoList",
-            "QScriptEngine", "QScriptEngineAgent", "QScriptEngineDebugger",
-            "QScriptExtensionInterface", "QScriptExtensionPlugin",
-            "QScriptString", "QScriptSyntaxCheckResult", "QScriptValue",
-            "QScriptValueIterator", "QScriptValueList", "QScrollArea",
-            "QScrollBar", "QSemaphore", "QSessionManager", "QSet",
-            "QSetIterator", "QSettings", "QSharedData", "QSharedDataPointer",
-            "QSharedMemory", "QSharedPointer", "QShortcut", "QShortcutEvent",
-            "QShowEvent", "QSignalMapper", "QSignalSpy", "QSimpleXmlNodeModel",
-            "QSize", "QSizeF", "QSizeGrip", "QSizePolicy", "QSlider",
-            "QSocketNotifier", "QSortFilterProxyModel", "QSound",
-            "QSourceLocation", "QSpacerItem", "QSpinBox", "QSplashScreen",
-            "QSplitter", "QSplitterHandle", "QSpontaneKeyEvent", "QSqlDatabase",
-            "QSqlDriver", "QSqlDriverCreator", "QSqlDriverCreatorBase",
-            "QSqlDriverFactoryInterface", "QSqlDriverPlugin", "QSqlError",
-            "QSqlField", "QSqlIndex", "QSQLite2Driver", "QSQLite2Result",
-            "QSQLiteDriver", "QSQLiteResult", "QSqlQuery", "QSqlQueryModel",
-            "QSqlRecord", "QSqlRelation", "QSqlRelationalDelegate",
-            "QSqlRelationalTableModel", "QSqlResult", "QSqlTableModel", "QSsl",
-            "QSslCertificate", "QSslCipher", "QSslConfiguration", "QSslError",
-            "QSslKey", "QSslSocket", "QStack", "QStackedLayout",
-            "QStackedWidget", "QStandardItem", "QStandardItemEditorCreator",
-            "QStandardItemModel", "QStatusBar", "QStatusTipEvent",
-            "QStdWString", "QString", "QStringList", "QStringListIterator",
-            "QStringListModel", "QStringMatcher", "QStringRef", "QStyle",
-            "QStyledItemDelegate", "QStyleFactory", "QStyleFactoryInterface",
-            "QStyleHintReturn", "QStyleHintReturnMask",
-            "QStyleHintReturnVariant", "QStyleOption", "QStyleOptionButton",
-            "QStyleOptionComboBox", "QStyleOptionComplex",
-            "QStyleOptionDockWidget", "QStyleOptionDockWidgetV2",
-            "QStyleOptionFocusRect", "QStyleOptionFrame", "QStyleOptionFrameV2",
-            "QStyleOptionFrameV3", "QStyleOptionGraphicsItem",
-            "QStyleOptionGroupBox", "QStyleOptionHeader",
-            "QStyleOptionMenuItem", "QStyleOptionProgressBar",
-            "QStyleOptionProgressBarV2", "QStyleOptionQ3DockWindow",
-            "QStyleOptionQ3ListView", "QStyleOptionQ3ListViewItem",
-            "QStyleOptionRubberBand", "QStyleOptionSizeGrip",
-            "QStyleOptionSlider", "QStyleOptionSpinBox", "QStyleOptionTab",
-            "QStyleOptionTabBarBase", "QStyleOptionTabBarBaseV2",
-            "QStyleOptionTabV2", "QStyleOptionTabV3",
-            "QStyleOptionTabWidgetFrame", "QStyleOptionTitleBar",
-            "QStyleOptionToolBar", "QStyleOptionToolBox",
-            "QStyleOptionToolBoxV2", "QStyleOptionToolButton",
-            "QStyleOptionViewItem", "QStyleOptionViewItemV2",
-            "QStyleOptionViewItemV3", "QStyleOptionViewItemV4", "QStylePainter",
-            "QStylePlugin", "QSvgGenerator", "QSvgRenderer", "QSvgWidget",
-            "QSyntaxHighlighter", "QSysInfo", "QSystemLocale",
-            "QSystemSemaphore", "QSystemTrayIcon", "Qt", "Qt3Support",
-            "QTabBar", "QTabletEvent", "QTableView", "QTableWidget",
-            "QTableWidgetItem", "QTableWidgetSelectionRange", "QTabWidget",
-            "QtAlgorithms", "QtAssistant", "QtCleanUpFunction",
-            "QtConcurrentFilter", "QtConcurrentMap", "QtConcurrentRun",
-            "QtContainerFwd", "QtCore", "QTcpServer", "QTcpSocket", "QtDBus",
-            "QtDebug", "QtDesigner", "QTDSDriver", "QTDSResult",
-            "QTemporaryFile", "QtEndian", "QTest", "QTestAccessibility",
-            "QTestAccessibilityEvent", "QTestData", "QTestDelayEvent",
-            "QTestEvent", "QTestEventList", "QTestEventLoop",
-            "QTestKeyClicksEvent", "QTestKeyEvent", "QTestMouseEvent",
-            "QtEvents", "QTextBlock", "QTextBlockFormat", "QTextBlockGroup",
-            "QTextBlockUserData", "QTextBoundaryFinder", "QTextBrowser",
-            "QTextCharFormat", "QTextCodec", "QTextCodecFactoryInterface",
-            "QTextCodecPlugin", "QTextCursor", "QTextDecoder", "QTextDocument",
-            "QTextDocumentFragment", "QTextDocumentWriter", "QTextEdit",
-            "QTextEncoder", "QTextFormat", "QTextFragment", "QTextFrame",
-            "QTextFrameFormat", "QTextFrameLayoutData", "QTextImageFormat",
-            "QTextInlineObject", "QTextIStream", "QTextItem", "QTextLayout",
-            "QTextLength", "QTextLine", "QTextList", "QTextListFormat",
-            "QTextObject", "QTextObjectInterface", "QTextOption",
-            "QTextOStream", "QTextStream", "QTextStreamFunction",
-            "QTextStreamManipulator", "QTextTable", "QTextTableCell",
-            "QTextTableCellFormat", "QTextTableFormat", "QtGlobal", "QtGui",
-            "QtHelp", "QThread", "QThreadPool", "QThreadStorage",
-            "QThreadStorageData", "QTime", "QTimeEdit", "QTimeLine", "QTimer",
-            "QTimerEvent", "QtMsgHandler", "QtNetwork", "QToolBar",
-            "QToolBarChangeEvent", "QToolBox", "QToolButton", "QToolTip",
-            "QtOpenGL", "QtPlugin", "QtPluginInstanceFunction", "QTransform",
-            "QTranslator", "QTreeView", "QTreeWidget", "QTreeWidgetItem",
-            "QTreeWidgetItemIterator", "QTS", "QtScript", "QtScriptTools",
-            "QtSql", "QtSvg", "QtTest", "QtUiTools", "QtWebKit", "QtXml",
-            "QtXmlPatterns", "QTypeInfo", "QUdpSocket", "QUiLoader",
-            "QUintForSize", "QUintForType", "QUndoCommand", "QUndoGroup",
-            "QUndoStack", "QUndoView", "QUnixPrintWidget", "QUpdateLaterEvent",
-            "QUrl", "QUrlInfo", "QUuid", "QValidator", "QVariant",
-            "QVariantComparisonHelper", "QVariantHash", "QVariantList",
-            "QVariantMap", "QVarLengthArray", "QVBoxLayout", "QVector",
-            "QVectorData", "QVectorIterator", "QVectorTypedData",
-            "QWaitCondition", "QWeakPointer", "QWebDatabase", "QWebFrame",
-            "QWebHistory", "QWebHistoryInterface", "QWebHistoryItem",
-            "QWebHitTestResult", "QWebPage", "QWebPluginFactory",
-            "QWebSecurityOrigin", "QWebSettings", "QWebView", "QWhatsThis",
-            "QWhatsThisClickedEvent", "QWheelEvent", "QWidget", "QWidgetAction",
-            "QWidgetData", "QWidgetItem", "QWidgetItemV2", "QWidgetList",
-            "QWidgetMapper", "QWidgetSet", "QWindowsCEStyle", "QWindowsMime",
-            "QWindowsMobileStyle", "QWindowsStyle", "QWindowStateChangeEvent",
-            "QWindowsVistaStyle", "QWindowsXPStyle", "QWizard", "QWizardPage",
-            "QWMatrix", "QWorkspace", "QWriteLocker", "QX11EmbedContainer",
-            "QX11EmbedWidget", "QX11Info", "QXmlAttributes",
-            "QXmlContentHandler", "QXmlDeclHandler", "QXmlDefaultHandler",
-            "QXmlDTDHandler", "QXmlEntityResolver", "QXmlErrorHandler",
-            "QXmlFormatter", "QXmlInputSource", "QXmlItem",
-            "QXmlLexicalHandler", "QXmlLocator", "QXmlName", "QXmlNamePool",
-            "QXmlNamespaceSupport", "QXmlNodeModelIndex", "QXmlParseException",
-            "QXmlQuery", "QXmlReader", "QXmlResultItems", "QXmlSerializer",
-            "QXmlSimpleReader", "QXmlStreamAttribute", "QXmlStreamAttributes",
-            "QXmlStreamEntityDeclaration", "QXmlStreamEntityDeclarations",
-            "QXmlStreamEntityResolver", "QXmlStreamNamespaceDeclaration",
-            "QXmlStreamNamespaceDeclarations", "QXmlStreamNotationDeclaration",
-            "QXmlStreamNotationDeclarations", "QXmlStreamReader",
-            "QXmlStreamStringRef", "QXmlStreamWriter"
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', ';', '|', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight:bold;',
-            2 => 'color: #0057AE;',
-            3 => 'color: #2B74C7;',
-            4 => 'color: #0057AE;',
-            5 => 'color: #22aadd;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #888888;',
-            2 => 'color: #006E28;',
-            'MULTI' => 'color: #888888; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #006E28;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #BF0303;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #B08000;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #2B74C7;',
-            2 => 'color: #2B74C7;',
-            3 => 'color: #2B74C7;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #006E28;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => 'http://doc.trolltech.com/latest/{FNAMEL}.html'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::',
-        3 => '-&gt;',
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
-        ),
-        'OOLANG' => array(
-            'MATCH_AFTER' => '~?[a-zA-Z][a-zA-Z0-9_]*',
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/cpp.php b/inc/geshi/cpp.php
deleted file mode 100644
index 42ab311cc..000000000
--- a/inc/geshi/cpp.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/*************************************************************************************
- * cpp.php
- * -------
- * Author: Dennis Bayer (Dennis.Bayer@mnifh-giessen.de)
- * Contributors:
- *  - M. Uli Kusterer (witness.of.teachtext@gmx.net)
- *  - Jack Lloyd (lloyd@randombit.net)
- * Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/09/27
- *
- * C++ language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2004/XX/XX (1.0.2)
- *  -  Added several new keywords (Jack Lloyd)
- * 2004/11/27 (1.0.1)
- *  -  Added StdCLib function and constant names, changed color scheme to
- *     a cleaner one. (M. Uli Kusterer)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'C++',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[abfnrtv\\\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'break', 'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
-            'switch', 'throw', 'while'
-            ),
-        2 => array(
-            'NULL', 'false', 'true', 'enum', 'errno', 'EDOM',
-            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
-            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
-            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
-            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
-            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
-            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
-            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
-            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
-            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
-            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
-            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
-            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
-            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
-            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class'
-            ),
-        3 => array(
-            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
-            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
-            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
-            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
-            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
-            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
-            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
-            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
-            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
-            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
-            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
-            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
-            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
-            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
-            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
-            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
-            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
-            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
-            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
-            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
-            ),
-        4 => array(
-            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
-            'register', 'short', 'shortint', 'signed', 'static', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
-            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
-            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
-
-            'int8', 'int16', 'int32', 'int64',
-            'uint8', 'uint16', 'uint32', 'uint64',
-
-            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
-            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
-
-            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
-            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
-
-            'int8_t', 'int16_t', 'int32_t', 'int64_t',
-            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
-
-            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '{', '}', '[', ']'),
-        1 => array('<', '>','='),
-        2 => array('+', '-', '*', '/', '%'),
-        3 => array('!', '^', '&', '|'),
-        4 => array('?', ':', ';')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #0000dd;',
-            4 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666;',
-            2 => 'color: #339900;',
-            'MULTI' => 'color: #ff0000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #008000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #007788;',
-            2 => 'color: #007788;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;',
-            1 => 'color: #000080;',
-            2 => 'color: #000040;',
-            3 => 'color: #000040;',
-            4 => 'color: #008080;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/csharp.php b/inc/geshi/csharp.php
deleted file mode 100644
index 26024e91a..000000000
--- a/inc/geshi/csharp.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/*************************************************************************************
- * csharp.php
- * ----------
- * Author: Alan Juden (alan@judenware.org)
- * Revised by: Michael Mol (mikemol@gmail.com)
- * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * C# language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/06/18 (1.0.8.11)
- *  -  Added missing keywords (Christian Stelzmann)
- * 2009/04/03 (1.0.8.6)
- *  -  Added missing keywords identified by Rosetta Code users.
- * 2008/05/25 (1.0.7.22)
- *  -  Added highlighting of using and namespace directives as non-OOP
- * 2005/01/05 (1.0.1)
- *  -  Used hardquote support for @"..." strings (Cliff Stanford)
- * 2004/11/27 (1.0.0)
- *  -  Initial release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'C#',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Using and Namespace directives (basic support)
-        //Please note that the alias syntax for using is not supported
-        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'HARDQUOTE' => array('@"', '"'),
-    'HARDESCAPE' => array('"'),
-    'HARDCHAR' => '"',
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'abstract', 'add', 'as', 'base', 'break', 'by', 'case', 'catch', 'const', 'continue',
-            'default', 'do', 'else', 'event', 'explicit', 'extern', 'false',
-            'finally', 'fixed', 'for', 'foreach', 'from', 'get', 'goto', 'group', 'if',
-            'implicit', 'in', 'into', 'internal', 'join', 'lock', 'namespace', 'null',
-            'operator', 'out', 'override', 'params', 'partial', 'private',
-            'protected', 'public', 'readonly', 'remove', 'ref', 'return', 'sealed',
-            'select', 'set', 'stackalloc', 'static', 'switch', 'this', 'throw', 'true',
-            'try', 'unsafe', 'using', 'var', 'value', 'virtual', 'volatile', 'where',
-            'while', 'yield'
-            ),
-        2 => array(
-            '#elif', '#endif', '#endregion', '#else', '#error', '#define', '#if',
-            '#line', '#region', '#undef', '#warning'
-            ),
-        3 => array(
-            'checked', 'is', 'new', 'sizeof', 'typeof', 'unchecked'
-            ),
-        4 => array(
-            'bool', 'byte', 'char', 'class', 'decimal', 'delegate', 'double',
-            'dynamic', 'enum', 'float', 'int', 'interface', 'long', 'object', 'sbyte',
-            'short', 'string', 'struct', 'uint', 'ulong', 'ushort', 'void'
-            ),
-        5 => array(
-            'Microsoft.Win32',
-            'System',
-            'System.CodeDOM',
-            'System.CodeDOM.Compiler',
-            'System.Collections',
-            'System.Collections.Bases',
-            'System.ComponentModel',
-            'System.ComponentModel.Design',
-            'System.ComponentModel.Design.CodeModel',
-            'System.Configuration',
-            'System.Configuration.Assemblies',
-            'System.Configuration.Core',
-            'System.Configuration.Install',
-            'System.Configuration.Interceptors',
-            'System.Configuration.Schema',
-            'System.Configuration.Web',
-            'System.Core',
-            'System.Data',
-            'System.Data.ADO',
-            'System.Data.Design',
-            'System.Data.Internal',
-            'System.Data.SQL',
-            'System.Data.SQLTypes',
-            'System.Data.XML',
-            'System.Data.XML.DOM',
-            'System.Data.XML.XPath',
-            'System.Data.XML.XSLT',
-            'System.Diagnostics',
-            'System.Diagnostics.SymbolStore',
-            'System.DirectoryServices',
-            'System.Drawing',
-            'System.Drawing.Design',
-            'System.Drawing.Drawing2D',
-            'System.Drawing.Imaging',
-            'System.Drawing.Printing',
-            'System.Drawing.Text',
-            'System.Globalization',
-            'System.IO',
-            'System.IO.IsolatedStorage',
-            'System.Messaging',
-            'System.Net',
-            'System.Net.Sockets',
-            'System.NewXml',
-            'System.NewXml.XPath',
-            'System.NewXml.Xsl',
-            'System.Reflection',
-            'System.Reflection.Emit',
-            'System.Resources',
-            'System.Runtime.InteropServices',
-            'System.Runtime.InteropServices.Expando',
-            'System.Runtime.Remoting',
-            'System.Runtime.Serialization',
-            'System.Runtime.Serialization.Formatters',
-            'System.Runtime.Serialization.Formatters.Binary',
-            'System.Security',
-            'System.Security.Cryptography',
-            'System.Security.Cryptography.X509Certificates',
-            'System.Security.Permissions',
-            'System.Security.Policy',
-            'System.Security.Principal',
-            'System.ServiceProcess',
-            'System.Text',
-            'System.Text.RegularExpressions',
-            'System.Threading',
-            'System.Timers',
-            'System.Web',
-            'System.Web.Caching',
-            'System.Web.Configuration',
-            'System.Web.Security',
-            'System.Web.Services',
-            'System.Web.Services.Description',
-            'System.Web.Services.Discovery',
-            'System.Web.Services.Protocols',
-            'System.Web.UI',
-            'System.Web.UI.Design',
-            'System.Web.UI.Design.WebControls',
-            'System.Web.UI.Design.WebControls.ListControls',
-            'System.Web.UI.HtmlControls',
-            'System.Web.UI.WebControls',
-            'System.WinForms',
-            'System.WinForms.ComponentModel',
-            'System.WinForms.Design',
-            'System.Xml',
-            'System.Xml.Serialization',
-            'System.Xml.Serialization.Code',
-            'System.Xml.Serialization.Schema'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
-        '(', ')', '{', '}', '[', ']', '|', '.'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF; font-weight: bold;',
-            2 => 'color: #FF8000; font-weight: bold;',
-            3 => 'color: #008000;',
-            4 => 'color: #6666cc; font-weight: bold;',
-            5 => 'color: #000000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080; font-style: italic;',
-            2 => 'color: #008080;',
-            3 => 'color: #008080;',
-            'MULTI' => 'color: #008080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080; font-weight: bold;',
-            'HARD' => 'color: #008080; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #008000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #666666;',
-            'HARD' => 'color: #666666;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000FF;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_%\\-])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/css.php b/inc/geshi/css.php
deleted file mode 100644
index d09bea7da..000000000
--- a/inc/geshi/css.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/*************************************************************************************
- * css.php
- * -------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/18
- *
- * CSS language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2004/11/27 (1.0.3)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.2)
- *   -  Changed regexps to catch "-" symbols
- *   -  Added support for URLs
- * 2004/08/05 (1.0.1)
- *   -  Added support for symbols
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Improve or drop regexps for class/id/psuedoclass highlighting
- * * Re-look at keywords - possibly to make several CSS language
- *   files, all with different versions of CSS in them
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'CSS',
-    'COMMENT_SINGLE' => array(1 => '@'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        2 => "/(?<=\\()\\s*(?:(?:[a-z0-9]+?:\\/\\/)?[a-z0-9_\\-\\.\\/:]+?)?[a-z]+?\\.[a-z]+?(\\?[^\)]+?)?\\s*?(?=\\))/i"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        //1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\[\da-fA-F]{1,6}\s?#i",
-        //Unicode Char Specs
-        //3 => "#\\\\u[\da-fA-F]{1,8}#i",
-        ),
-    'KEYWORDS' => array(
-        1 => array(
-            'aqua', 'azimuth', 'background-attachment', 'background-color',
-            'background-image', 'background-position', 'background-repeat',
-            'background', 'black', 'blue', 'border-bottom-color',
-            'border-radius', 'border-top-left-radius', 'border-top-right-radius',
-            'border-bottom-right-radius', 'border-bottom-left-radius',
-            'border-bottom-style', 'border-bottom-width', 'border-left-color',
-            'border-left-style', 'border-left-width', 'border-right',
-            'border-right-color', 'border-right-style', 'border-right-width',
-            'border-top-color', 'border-top-style',
-            'border-top-width','border-bottom', 'border-collapse',
-            'border-left', 'border-width', 'border-color', 'border-spacing',
-            'border-style', 'border-top', 'border', 'caption-side', 'clear',
-            'clip', 'color', 'content', 'counter-increment', 'counter-reset',
-            'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
-            'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
-            'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
-            'font-weight', 'font', 'line-height', 'letter-spacing',
-            'list-style', 'list-style-image', 'list-style-position',
-            'list-style-type', 'margin-bottom', 'margin-left', 'margin-right',
-            'margin-top', 'margin', 'marker-offset', 'marks', 'max-height',
-            'max-width', 'min-height', 'min-width', 'orphans', 'outline',
-            'outline-color', 'outline-style', 'outline-width', 'overflow',
-            'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
-            'padding', 'page', 'page-break-after', 'page-break-before',
-            'page-break-inside', 'pause-after', 'pause-before', 'pause',
-            'pitch', 'pitch-range', 'play-during', 'position', 'quotes',
-            'richness', 'right', 'size', 'speak-header', 'speak-numeral',
-            'speak-punctuation', 'speak', 'speech-rate', 'stress',
-            'table-layout', 'text-align', 'text-decoration', 'text-indent',
-            'text-shadow', 'text-transform', 'top', 'unicode-bidi',
-            'vertical-align', 'visibility', 'voice-family', 'volume',
-            'white-space', 'widows', 'width', 'word-spacing', 'z-index',
-            'bottom', 'left', 'height'
-            ),
-        2 => array(
-            'above', 'absolute', 'always', 'armenian', 'aural', 'auto',
-            'avoid', 'baseline', 'behind', 'below', 'bidi-override', 'blink',
-            'block', 'bold', 'bolder', 'both', 'capitalize', 'center-left',
-            'center-right', 'center', 'circle', 'cjk-ideographic',
-            'close-quote', 'collapse', 'condensed', 'continuous', 'crop',
-            'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero',
-            'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
-            'e-resize', 'embed', 'extra-condensed', 'extra-expanded',
-            'expanded', 'fantasy', 'far-left', 'far-right', 'faster', 'fast',
-            'fixed', 'fuchsia', 'georgian', 'gray', 'green', 'groove',
-            'hebrew', 'help', 'hidden', 'hide', 'higher', 'high',
-            'hiragana-iroha', 'hiragana', 'icon', 'inherit', 'inline-table',
-            'inline', 'inset', 'inside', 'invert', 'italic', 'justify',
-            'katakana-iroha', 'katakana', 'landscape', 'larger', 'large',
-            'left-side', 'leftwards', 'level', 'lighter', 'lime',
-            'line-through', 'list-item', 'loud', 'lower-alpha', 'lower-greek',
-            'lower-roman', 'lowercase', 'ltr', 'lower', 'low', 'maroon',
-            'medium', 'message-box', 'middle', 'mix', 'monospace', 'n-resize',
-            'narrower', 'navy', 'ne-resize', 'no-close-quote',
-            'no-open-quote', 'no-repeat', 'none', 'normal', 'nowrap',
-            'nw-resize', 'oblique', 'olive', 'once', 'open-quote', 'outset',
-            'outside', 'overline', 'pointer', 'portrait', 'purple', 'px',
-            'red', 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb',
-            'ridge', 'right-side', 'rightwards', 's-resize', 'sans-serif',
-            'scroll', 'se-resize', 'semi-condensed', 'semi-expanded',
-            'separate', 'serif', 'show', 'silent', 'silver', 'slow', 'slower',
-            'small-caps', 'small-caption', 'smaller', 'soft', 'solid',
-            'spell-out', 'square', 'static', 'status-bar', 'super',
-            'sw-resize', 'table-caption', 'table-cell', 'table-column',
-            'table-column-group', 'table-footer-group', 'table-header-group',
-            'table-row', 'table-row-group', 'teal', 'text', 'text-bottom',
-            'text-top', 'thick', 'thin', 'transparent', 'ultra-condensed',
-            'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin',
-            'upper-roman', 'uppercase', 'url', 'visible', 'w-resize', 'wait',
-            'white', 'wider', 'x-fast', 'x-high', 'x-large', 'x-loud',
-            'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small', 'yellow',
-            'yes'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', ':', ';',
-        '>', '+', '*', ',', '^', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #993333;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #a1a100;',
-            2 => 'color: #ff0000; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            //1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #000099; font-weight: bold;'
-            //3 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #00AA00;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #00AA00;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #cc00cc;',
-            1 => 'color: #6666ff;',
-            2 => 'color: #3333ff;',
-            3 => 'color: #933;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //DOM Node ID
-        0 => '\#[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*',
-        //CSS classname
-        1 => '\.(?!\d)[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*\b(?=[\{\.#\s,:].|<\|)',
-        //CSS Pseudo classes
-        //note: & is needed for &gt; (i.e. > )
-        2 => '(?<!\\\\):(?!\d)[a-zA-Z0-9\-]+\b(?:\s*(?=[\{\.#a-zA-Z,:+*&](.|\n)|<\|))',
-        //Measurements
-        3 => '[+\-]?(\d+|(\d*\.\d+))(em|ex|pt|px|cm|in|%)',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_AFTER' => '(?![\-a-zA-Z0-9_\|%\\-&\.])',
-            'DISALLOWED_BEFORE' => '(?<![\-a-zA-Z0-9_\|%\\~&\.])'
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/cuesheet.php b/inc/geshi/cuesheet.php
deleted file mode 100644
index ebaca955f..000000000
--- a/inc/geshi/cuesheet.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/*************************************************************************************
- * cuesheet.php
- * ----------
- * Author: Benny Baumann (benbe@geshi.org)
- * Copyright: (c) 2009 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/12/21
- *
- * Cuesheet language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/12/21 (1.0.8.6)
- *   -  First Release
- *
- * TODO (updated 2009/12/21)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Cuesheet',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        //Single-Line Comments using REM command
-        1 => "/(?<=\bREM\b).*?$/im",
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'CATALOG','CDTEXTFILE','FILE','FLAGS','INDEX','ISRC','PERFORMER',
-            'POSTGAP','PREGAP','REM','SONGWRITER','TITLE','TRACK'
-            ),
-        2 => array(
-            'AIFF', 'BINARY', 'MOTOROLA', 'MP3', 'WAVE'
-            ),
-        3 => array(
-            '4CH', 'DCP', 'PRE', 'SCMS'
-            ),
-        4 => array(
-            'AUDIO', 'CDG', 'MODE1/2048', 'MODE1/2336', 'MODE2/2336',
-            'MODE2/2352', 'CDI/2336', 'CDI/2352'
-            )
-        ),
-    'SYMBOLS' => array(
-        ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000066; font-weight: bold;',
-            3 => 'color: #000066; font-weight: bold;',
-            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #006600;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #000099;',
-            2 => 'color: #009900;',
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://digitalx.org/cuesheetsyntax.php#{FNAMEL}',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        2 => '\b[A-Za-z0-9]{5}\d{7}\b',
-        1 => '(?<=[\s:]|^)\d+(?=[\s:]|$)',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 2,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => '(?<![\w\.])',
-            'DISALLOWED_AFTER' => '(?![\w\.])',
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/d.php b/inc/geshi/d.php
deleted file mode 100644
index 7f3e9857a..000000000
--- a/inc/geshi/d.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/*************************************************************************************
- * d.php
- * -----
- * Author: Thomas Kuehne (thomas@kuehne.cn)
- * Contributors:
- *  - Jimmy Cao
- * Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
- * Release Version: 1.0.8.11
- * Date Started: 2005/04/22
- *
- * D language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2011/06/28 (0.0.3) (Jimmy Cao)
- *  -  added D2 features
- * 2005/04/22 (0.0.2)
- *  -  added _d_* and sizeof/ptrdiff_t
- * 2005/04/20 (0.0.1)
- *  -  First release
- *
- * TODO (updated 2005/04/22)
- * -------------------------
- * * nested comments
- * * correct handling of r"" and ``
- * * correct handling of ... and ..
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'D',
-    'COMMENT_SINGLE' => array(2 => '///', 1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/', '/+' => '+/'),
-    'COMMENT_REGEXP' => array(
-        // doxygen comments
-        3 => '#/\*\*(?![\*\/]).*\*/#sU',
-        // raw strings
-        4 => '#r"[^"]*"#s',
-        // Script Style interpreter comment
-        5 => "/\A#!(?=\\/).*?$/m"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[abfnrtv\\'\"?\n\\\\]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#",
-        //Named entity escapes
-        /*6 => "#\\\\&(?:quot|amp|lt|gt|OElig|oelig|Scaron|scaron|Yuml|circ|tilde|".
-            "ensp|emsp|thinsp|zwnj|zwj|lrm|rlm|ndash|mdash|lsquo|rsquo|sbquo|".
-            "ldquo|rdquo|bdquo|dagger|Dagger|permil|lsaquo|rsaquo|euro|nbsp|".
-            "iexcl|cent|pound|curren|yen|brvbar|sect|uml|copy|ordf|laquo|not|".
-            "shy|reg|macr|deg|plusmn|sup2|sup3|acute|micro|para|middot|cedil|".
-            "sup1|ordm|raquo|frac14|frac12|frac34|iquest|Agrave|Aacute|Acirc|".
-            "Atilde|Auml|Aring|AElig|Ccedil|Egrave|Eacute|Ecirc|Euml|Igrave|".
-            "Iacute|Icirc|Iuml|ETH|Ntilde|Ograve|Oacute|Ocirc|Otilde|Ouml|".
-            "times|Oslash|Ugrave|Uacute|Ucirc|Uuml|Yacute|THORN|szlig|agrave|".
-            "aacute|acirc|atilde|auml|aring|aelig|ccedil|egrave|eacute|ecirc|".
-            "euml|igrave|iacute|icirc|iuml|eth|ntilde|ograve|oacute|ocirc|".
-            "otilde|ouml|divide|oslash|ugrave|uacute|ucirc|uuml|yacute|thorn|".
-            "yuml|fnof|Alpha|Beta|Gamma|Delta|Epsilon|Zeta|Eta|Theta|Iota|".
-            "Kappa|Lambda|Mu|Nu|Xi|Omicron|Pi|Rho|Sigma|Tau|Upsilon|Phi|Chi|".
-            "Psi|Omega|alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|".
-            "kappa|lambda|mu|nu|xi|omicron|pi|rho|sigmaf|sigma|tau|upsilon|".
-            "phi|chi|psi|omega|thetasym|upsih|piv|bull|hellip|prime|Prime|".
-            "oline|frasl|weierp|image|real|trade|alefsym|larr|uarr|rarr|darr|".
-            "harr|crarr|lArr|uArr|rArr|dArr|hArr|forall|part|exist|empty|".
-            "nabla|isin|notin|ni|prod|sum|minus|lowast|radic|prop|infin|ang|".
-            "and|or|cap|cup|int|there4|sim|cong|asymp|ne|equiv|le|ge|sub|sup|".
-            "nsub|sube|supe|oplus|otimes|perp|sdot|lceil|rceil|lfloor|rfloor|".
-            "lang|rang|loz|spades|clubs|hearts|diams);#",*/
-        // optimized:
-        6 => "#\\\\&(?:A(?:Elig|acute|circ|grave|lpha|ring|tilde|uml)|Beta|".
-            "C(?:cedil|hi)|D(?:agger|elta)|E(?:TH|acute|circ|grave|psilon|ta|uml)|".
-            "Gamma|I(?:acute|circ|grave|ota|uml)|Kappa|Lambda|Mu|N(?:tilde|u)|".
-            "O(?:Elig|acute|circ|grave|m(?:ega|icron)|slash|tilde|uml)|".
-            "P(?:hi|i|rime|si)|Rho|S(?:caron|igma)|T(?:HORN|au|heta)|".
-            "U(?:acute|circ|grave|psilon|uml)|Xi|Y(?:acute|uml)|Zeta|".
-            "a(?:acute|c(?:irc|ute)|elig|grave|l(?:efsym|pha)|mp|n[dg]|ring|".
-            "symp|tilde|uml)|b(?:dquo|eta|rvbar|ull)|c(?:ap|cedil|e(?:dil|nt)|".
-            "hi|irc|lubs|o(?:ng|py)|rarr|u(?:p|rren))|d(?:Arr|a(?:gger|rr)|".
-            "e(?:g|lta)|i(?:ams|vide))|e(?:acute|circ|grave|m(?:pty|sp)|nsp|".
-            "psilon|quiv|t[ah]|u(?:ml|ro)|xist)|f(?:nof|orall|ra(?:c(?:1[24]|34)|sl))|".
-            "g(?:amma|e|t)|h(?:Arr|arr|e(?:arts|llip))|i(?:acute|circ|excl|grave|mage|".
-            "n(?:fin|t)|ota|quest|sin|uml)|kappa|l(?:Arr|a(?:mbda|ng|quo|rr)|ceil|".
-            "dquo|e|floor|o(?:wast|z)|rm|s(?:aquo|quo)|t)|m(?:acr|dash|".
-            "i(?:cro|ddot|nus)|u)|n(?:abla|bsp|dash|e|i|ot(?:in)?|sub|tilde|u)|".
-            "o(?:acute|circ|elig|grave|line|m(?:ega|icron)|plus|r(?:d[fm])?|".
-            "slash|ti(?:lde|mes)|uml)|p(?:ar[at]|er(?:mil|p)|hi|iv?|lusmn|ound|".
-            "r(?:ime|o[dp])|si)|quot|r(?:Arr|a(?:dic|ng|quo|rr)|ceil|dquo|e(?:al|g)|".
-            "floor|ho|lm|s(?:aquo|quo))|s(?:bquo|caron|dot|ect|hy|i(?:gmaf?|m)|".
-            "pades|u(?:be?|m|p[123e]?)|zlig)|t(?:au|h(?:e(?:re4|ta(?:sym)?)|insp|".
-            "orn)|i(?:lde|mes)|rade)|u(?:Arr|a(?:cute|rr)|circ|grave|ml|".
-            "psi(?:h|lon)|uml)|weierp|xi|y(?:acute|en|uml)|z(?:eta|w(?:j|nj)));#",
-        ),
-    'HARDQUOTE' => array('`', '`'),
-    'HARDESCAPE' => array(),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-                'break', 'case', 'continue', 'do', 'else',
-                'for', 'foreach', 'goto', 'if', 'return',
-                'switch', 'while', 'foreach_reverse'
-            ),
-        2 => array(
-                'alias', 'asm', 'assert', 'body', 'cast',
-                'catch', 'default', 'delegate', 'delete',
-                'extern', 'false', 'finally', 'function',
-                'import', 'in', 'inout',
-                'invariant', 'is', 'lazy', 'mixin', 'module', 'new',
-                'null', 'out', 'pragma', 'ref', 'super', 'this',
-                'throw', 'true', 'try', 'typeid',
-                'typeof', 'union', 'with', 'scope'
-            ),
-        3 => array(
-                'ClassInfo', 'Error', 'Exception',
-                'Interface', 'Object', 'IMonitor',
-                'OffsetTypeInfo', 'Throwable',
-                'TypeInfo_Class', 'TypeInfo', '__traits',
-                '__EOF__', '__FILE__', '__LINE__',
-            ),
-        4 => array(
-                'abstract', 'align', 'auto', 'bit', 'bool',
-                'byte', 'cdouble', 'cfloat', 'char',
-                'class', 'const', 'creal', 'dchar', 'dstring', 'debug',
-                'deprecated', 'double', 'enum', 'export',
-                'final', 'float', 'idouble', 'ifloat', 'immutable', 'int',
-                'interface', 'ireal', 'long', 'nothrow', 'override',
-                'package', 'private', 'protected', 'ptrdiff_t',
-                'public', 'real', 'short', 'shared', 'size_t',
-                'static', 'string', 'struct', 'synchronized',
-                'template', 'ubyte', 'ucent', 'uint',
-                'ulong', 'unittest', 'ushort', 'version',
-                'void', 'volatile', 'wchar', 'wstring',
-                '__gshared', '@disable', '@property', 'pure', 'safe'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '?', '!', ';', ':', ',', '...', '..',
-        '+', '-', '*', '/', '%', '&', '|', '^', '<', '>', '=', '~',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #aaaadd; font-weight: bold;',
-            4 => 'color: #993333;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #009933; font-style: italic;',
-            3 => 'color: #009933; font-style: italic;',
-            4 => 'color: #ff0000;',
-            5 => 'color: #0040ff;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            6 => 'color: #666699; font-weight: bold; font-style: italic;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/dcl.php b/inc/geshi/dcl.php
deleted file mode 100644
index db12a4c4e..000000000
--- a/inc/geshi/dcl.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*************************************************************************************
- * dcl.php
- * --------
- * Author: Petr Hendl (petr@hendl.cz)
- * Copyright: (c) 2011 Petr Hendl http://hendl.cz/geshi/
- * Release Version: 1.0.8.11
- * Date Started: 2011/02/17
- *
- * DCL language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2011-02-17 (1.0.8.11)
- *   - First Release
- *
- * TODO
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'DCL',
-    'COMMENT_SINGLE' => array('$!', '!'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        2 => '/(?<=\$)\s*sql\s+.*?(?:quit|exit);?\s*?$/sim' // do not highlight inline sql
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDESCAPE' => array(),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        1 => "/''[a-zA-Z\\-_]+'/"
-        ),
-    'KEYWORDS' => array(
-        1 => array( // commands
-            'ACCOUNTING', 'ALLOCATE', 'ANALYZE', 'APPEND', 'ASSIGN', 'ATTACH', 'BACKUP',
-            'CALL', 'CANCEL', 'CHECKSUM', 'CLOSE', 'CONNECT', 'CONTINUE', 'CONVERT',
-            'COPY', 'CREATE', 'DEALLOCATE', 'DEASSIGN', 'DEBUG', 'DECK',
-            'DECRYPT', 'DEFINE', 'DELETE', 'DEPOSIT', 'DIFFERENCES', 'DIRECTORY',
-            'DISABLE',  'AUTOSTART', 'DISCONNECT', 'DISMOUNT', 'DUMP', 'EDIT', 'ENABLE',
-            'ENCRYPT', 'ENDSUBROUTINE', 'EOD', 'EOJ', 'EXAMINE', 'EXCHANGE',
-            'EXIT', 'FONT', 'GOSUB', 'GOTO', 'HELP', 'IF', 'THEN', 'ELSE', 'ENDIF', 'INITIALIZE', 'INQUIRE',
-            'INSTALL', 'JAVA', 'JOB', 'LIBRARY', 'LICENSE', 'LINK', 'LOGIN', 'LOGOUT',
-            'MACRO', 'MAIL', 'MERGE', 'MESSAGE', 'MONITOR', 'MOUNT', 'NCS', 'ON', 'OPEN',
-            'PASSWORD', 'PATCH', 'PHONE', 'PIPE', 'PPPD', 'PRINT', 'PRODUCT', 'PURGE',
-            'READ', 'RECALL', 'RENAME', 'REPLY', 'REQUEST', 'RETURN', 'RMU', 'RUN', 'RUNOFF',
-            'SEARCH', 'SET', 'SET AUDIT', 'SET BOOTBLOCK', 'SET BROADCAST',
-            'SET CACHE', 'SET CARD_READER', 'SET CLUSTER', 'SET COMMAND', 'SET CONTROL',
-            'SET CPU', 'SET DAY', 'SET DEFAULT', 'SET DEVICE', 'SET DIRECTORY',
-            'SET DISPLAY', 'SET ENTRY', 'SET FILE', 'SET HOST', 'SET IMAGE', 'SET KEY',
-            'SET LOGINS', 'SET MAGTAPE', 'SET MESSAGE', 'SET NETWORK', 'SET ON', 'SET OUTPUT_RATE',
-            'SET PASSWORD', 'SET PREFERRED_PATH', 'SET PREFIX', 'SET PRINTER', 'SET PROCESS',
-            'SET PROMPT', 'SET PROTECTION', 'SET QUEUE', 'SET RESTART_VALUE',
-            'SET RIGHTS_LIST', 'SET RMS_DEFAULT', 'SET ROOT', 'SET SECURITY',
-            'SET SERVER ACME_SERVER', 'SET SERVER REGISTRY_SERVER', 'SET SERVER SECURITY_SERVER',
-            'SET SHADOW', 'SET SYMBOL', 'SET TERMINAL', 'SET TIME', 'SET VERIFY',
-            'SET VOLUME', 'SET WORKING_SET', 'SHOW', 'SHOW AUDIT',
-            'SHOW BROADCAST', 'SHOW CLUSTER', 'SHOW CPU', 'SHOW DEFAULT', 'SHOW DEVICES',
-            'SHOW DISPLAY', 'SHOW ENTRY', 'SHOW ERROR', 'SHOW FASTPATH', 'SHOW IMAGE',
-            'SHOW INTRUSION', 'SHOW KEY', 'SHOW LICENSE', 'SHOW LOGICAL', 'SHOW MEMORY',
-            'SHOW NETWORK', 'SHOW PRINTER', 'SHOW PROCESS', 'SHOW PROTECTION', 'SHOW QUEUE',
-            'SHOW QUOTA', 'SHOW RMS_DEFAULT', 'SHOW ROOT', 'SHOW SECURITY',
-            'SHOW SERVER ACME_SERVER', 'SHOW SERVER REGISTRY_SERVER', 'SHOW SHADOW',
-            'SHOW STATUS', 'SHOW SYMBOL', 'SHOW SYSTEM', 'SHOW TERMINAL', 'SHOW TIME',
-            'SHOW TRANSLATION', 'SHOW USERS', 'SHOW WORKING_SET', 'SHOW ZONE', 'SORT',
-            'SPAWN', 'START', 'STOP', 'SUBMIT', 'SUBROUTINE', 'SYNCHRONIZE', 'TYPE',
-            'UNLOCK', 'VIEW', 'WAIT', 'WRITE', 'XAUTH'
-            ),
-        2 => array( // lexical functions
-            'F$CONTEXT', 'F$CSID', 'F$CUNITS', 'F$CVSI', 'F$CVTIME', 'F$CVUI',
-            'F$DELTA_TIME', 'F$DEVICE', 'F$DIRECTORY', 'F$EDIT', 'F$ELEMENT',
-            'F$ENVIRONMENT', 'F$EXTRACT', 'F$FAO', 'F$FID_TO_NAME', 'F$FILE_ATTRIBUTES',
-            'F$GETDVI', 'F$GETENV', 'F$GETJPI', 'F$GETQUI', 'F$GETSYI', 'F$IDENTIFIER',
-            'F$INTEGER', 'F$LENGTH', 'F$LICENSE', 'F$LOCATE', 'F$MATCH_WILD', 'F$MESSAGE',
-            'F$MODE', 'F$MULTIPATH', 'F$PARSE', 'F$PID', 'F$PRIVILEGE', 'F$PROCESS',
-            'F$SEARCH', 'F$SETPRV', 'F$STRING', 'F$TIME', 'F$TRNLNM', 'F$TYPE', 'F$UNIQUE',
-            'F$USER', 'F$VERIFY'
-            ),
-        3 => array( // special variables etc
-            'sql$database', 'P1', 'P2', 'P3', 'P4', 'P5', 'P6', 'P7', 'P8', 'P9',
-            '$status', '$severity', 'sys$login', 'sys$system',
-            'sys$input', 'sys$output', 'sys$pipe'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '@', '&', '|', '<', '>', '-',
-        '.eqs.', '.eq.', '.lt.', '.lts.', '.gt.', '.gts.', '.ne.', '.nes.',
-        '.le.', '.ge.', '.ges.', '.les.',
-        '.EQS.', '.EQ.', '.LT.', '.LTS.', '.GT.', '.GTS.', '.NE.', '.NES.',
-        '.LE.', '.GE.', '.GES.', '.LES.',
-        '.and.', '.or.', '.not.',
-        '.AND.', '.OR.', '.NOT.',
-        '==', ':==', '=', ':='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #0066FF;',
-            3 => 'color: #993300;'
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #666666; font-style: italic;',
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #9999FF; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #006666;',
-            1 => 'color: #0099FF;',
-            2 => 'color: red;',
-            3 => 'color: #007800;',
-            4 => 'color: #007800;',
-            5 => 'color: #780078;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #7a0874; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #009900;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0099FF;',                     // variables
-            1 => 'color: #0000FF;',                     // qualifiers
-            2 => 'color: #FF6600; font-weight: bold;'   // labels
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        // variables
-        0 => "'[a-zA-Z_\\-$]+'",
-        // qualifiers and parameters
-        1 => "(?:\/[a-zA-Z_\/]+)[\s=]",
-        // labels
-        2 => '(?<=\$)\s*[a-zA-Z\-_]+:'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-        ),
-        'KEYWORDS' => array(
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/dcpu16.php b/inc/geshi/dcpu16.php
deleted file mode 100644
index 5fcb25e51..000000000
--- a/inc/geshi/dcpu16.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/*************************************************************************************
- * dcpu16.php
- * -------
- * Author: Benny Baumann (BenBE@omorphia.de)
- * Copyright: (c) 2007-2012 Benny Baumann (http://geshi.org/)
- * Release Version: 1.0.8.11
- * Date Started: 2012/04/12
- *
- * DCPU/16 Assembly language file for GeSHi.
- * Syntax definition based on http://0x10c.com/doc/dcpu-16.txt
- *
- * CHANGES
- * -------
- * 2012/04/12 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2012/04/12)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'DCPU-16 Assembly',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_HEX_PREFIX,
-    'KEYWORDS' => array(
-        /*CPU*/
-        1 => array(
-            'set','add','sub','mul','div','mod','shl','shr','and','bor','xor',
-            'ife','ifn','ifg','ifb',
-            'jsr'
-            ),
-        /*registers*/
-        2 => array(
-            'a','b','c','x','y','z','i','j',
-            'pc','sp','o',
-            'pop','peek','push' //Special cases with DCPU-16
-            ),
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '+', '-', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000088; font-weight:bold;',
-            2 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000088;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #880000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            2 => 'color: #993333;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://0x10c.com/doc/dcpu-16.txt',
-        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-        //0 => '0[0-9a-fA-F]{1,32}[hH]',
-        //Binary numbers
-        //1 => '\%[01]{1,64}|[01]{1,64}[bB]?(?![^<]*>)',
-        //Labels
-        2 => '^:[_a-zA-Z][_a-zA-Z0-9]?(?=\s|$)'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#\/])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/dcs.php b/inc/geshi/dcs.php
deleted file mode 100644
index d32cfc5b9..000000000
--- a/inc/geshi/dcs.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*************************************************************************************
- * dcs.php
- * ---------------------------------
- * Author: Stelio Passaris (GeSHi@stelio.net)
- * Copyright: (c) 2009 Stelio Passaris (http://stelio.net/stiki/GeSHi)
- * Release Version: 1.0.8.11
- * Date Started: 2009/01/20
- *
- * DCS language file for GeSHi.
- *
- * DCS (Data Conversion System) is part of Sungard iWorks' Prophet suite and is used
- * to convert external data files into a format that Prophet and Glean can read.
- * See http://www.prophet-web.com/Products/DCS for product information.
- * This language file is current for DCS version 7.3.2.
- *
- * Note that the DCS IDE does not handle escape characters correctly. The IDE thinks
- * that a backslash '\' is an escape character, but in practice the backslash does
- * not escape the string delimiter character '"' when the program runs. A '\\' is
- * escaped to '\' when the program runs, but '\"' is treated as '\' at the end of a
- * string. Therefore in this language file, we do not recognise the backslash as an
- * escape character. For the purposes of GeSHi, there is no character escaping.
- *
- * CHANGES
- * -------
- * 2009/02/21 (1.0.8.3)
- *  -  First Release
- *
- * TODO (updated 2009/02/21)
- * -------------------------
- * * Add handling for embedded C code. Note that the DCS IDE does not highlight C code
- *   correctly, but that doesn't mean that we can't! This will be included for a
- *   stable release of GeSHi of version 1.1.x (or later) that allows for highlighting
- *   embedded code using that code's appropriate language file.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'DCS',
-    'COMMENT_SINGLE' => array(
-        1 => ';'
-        ),
-    'COMMENT_MULTI' => array(
-        ),
-    'COMMENT_REGEXP' => array(
-        // Highlight embedded C code in a separate color:
-        2 => '/\bINSERT_C_CODE\b.*?\bEND_C_CODE\b/ims'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array(
-        '"'
-        ),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => '',
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'abs', 'ascii_value', 'bit_value', 'blank_date', 'calc_unit_values', 'cm',
-            'complete_months', 'complete_years', 'correct', 'create_input_file', 'cy',
-            'date_convert', 'day', 'del_output_separator',
-            'delete_existing_output_files', 'div', 'ex', 'exact_years', 'exp',
-            'extract_date', 'failed_validation', 'file_number', 'first_record',
-            'fract', 'fund_fac_a', 'fund_fac_b', 'fund_fac_c', 'fund_fac_d',
-            'fund_fac_e', 'fund_fac_f', 'fund_fac_g', 'fund_fac_h', 'fund_fac_i',
-            'fund_fac_j', 'fund_fac_k', 'fund_fac_l', 'fund_fac_m', 'fund_fac_n',
-            'fund_fac_o', 'fund_fac_p', 'fund_fac_q', 'fund_fac_r', 'fund_fac_s',
-            'fund_fac_t', 'fund_fac_u', 'fund_fac_v', 'fund_fac_w', 'fund_fac_x',
-            'fund_fac_y', 'fund_fac_z', 'group', 'group_record',
-            'input_file_date_time', 'input_file_extension', 'input_file_location',
-            'input_file_name', 'int', 'invalid', 'last_record', 'leap_year', 'len',
-            'ln', 'log', 'main_format_name', 'max', 'max_num_subrecords', 'message',
-            'min', 'mod', 'month', 'months_add', 'months_sub', 'nearest_months',
-            'nearest_years', 'next_record', 'nm', 'no_of_current_records',
-            'no_of_records', 'numval', 'ny', 'output', 'output_array_as_constants',
-            'output_file_path', 'output_record', 'pmdf_output', 'previous', 'rand',
-            're_start', 'read_generic_table', 'read_generic_table_text',
-            'read_input_footer', 'read_input_footer_text', 'read_input_header',
-            'read_input_header_text', 'record_count', 'record_suppressed', 'round',
-            'round_down', 'round_near', 'round_up', 'run_dcs_program', 'run_parameter',
-            'run_parameter_text', 'set_main_record', 'set_num_subrecords',
-            'sort_array', 'sort_current_records', 'sort_input', 'strval', 'substr',
-            'summarise', 'summarise_record', 'summarise_units',
-            'summarise_units_record', 'suppress_record', 'table_correct',
-            'table_validate', 'terminate', 'time', 'today', 'trim', 'ubound', 'year',
-            'years_add', 'years_sub'
-            ),
-        2 => array(
-            'and', 'as', 'begin', 'boolean', 'byref', 'byval', 'call', 'case', 'date',
-            'default', 'do', 'else', 'elseif', 'end_c_code', 'endfor', 'endfunction',
-            'endif', 'endproc', 'endswitch', 'endwhile', 'eq',
-            'explicit_declarations', 'false', 'for', 'from', 'function', 'ge', 'gt',
-            'if', 'insert_c_code', 'integer', 'le', 'loop', 'lt', 'ne', 'not',
-            'number', 'or', 'private', 'proc', 'public', 'quitloop', 'return',
-            'short', 'step', 'switch', 'text', 'then', 'to', 'true', 'while'
-            ),
-        3 => array(
-            // These keywords are not highlighted by the DCS IDE but we may as well
-            // keep track of them anyway:
-            'mp_file', 'odbc_file'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']',
-        '=', '<', '>',
-        '+', '-', '*', '/', '^',
-        ':', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: red;',
-            2 => 'color: blue;',
-            3 => 'color: black;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: black; background-color: silver;',
-            // Colors for highlighting embedded C code:
-            2 => 'color: maroon; background-color: pink;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: black;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: green;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: green;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: black;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/delphi.php b/inc/geshi/delphi.php
deleted file mode 100644
index d5596e0cd..000000000
--- a/inc/geshi/delphi.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/*************************************************************************************
- * delphi.php
- * ----------
- * Author: J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
- * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/26
- *
- * Delphi (Object Pascal) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/06/27 (1.0.8.11)
- *   -  Added some keywords
- *   -  fixed hex numbers and hex char literals (including WideChar)
- *   -  Added support for FPC-Style generics
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2005/11/19 (1.0.3)
- *   -  Updated the very incomplete keyword and type lists
- * 2005/09/03 (1.0.2)
- *   -  Added support for hex numbers and string entities
- * 2004/11/27 (1.0.1)
- *   -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Delphi',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
-    //Compiler directives
-    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'"),
-    'ESCAPE_CHAR' => '',
-
-    'KEYWORDS' => array(
-        1 => array(
-            'Abstract', 'And', 'Array', 'As', 'Asm', 'At', 'Begin', 'Case',
-            'Class', 'Const', 'Constructor', 'Contains', 'Default', 'delayed', 'Destructor',
-            'DispInterface', 'Div', 'Do', 'DownTo', 'Else', 'End', 'Except',
-            'Export', 'Exports', 'External', 'File', 'Finalization', 'Finally', 'For',
-            'Function', 'Generic', 'Goto', 'If', 'Implementation', 'In', 'Inherited',
-            'Initialization', 'Inline', 'Interface', 'Is', 'Label', 'Library', 'Message',
-            'Mod', 'Nil', 'Not', 'Object', 'Of', 'On', 'Or', 'Overload', 'Override',
-            'Package', 'Packed', 'Private', 'Procedure', 'Program', 'Property',
-            'Protected', 'Public', 'Published', 'Read', 'Raise', 'Record', 'Register',
-            'Repeat', 'Requires', 'Resourcestring', 'Set', 'Shl', 'Shr', 'Specialize', 'Stored',
-            'Then', 'ThreadVar', 'To', 'Try', 'Type', 'Unit', 'Until', 'Uses', 'Var',
-            'Virtual', 'While', 'With', 'Write', 'Xor', 'assembler', 'far',
-            'near', 'pascal', 'cdecl', 'safecall', 'stdcall', 'varargs'
-            ),
-        2 => array(
-            'false', 'self', 'true',
-            ),
-        3 => array(
-            'Abs', 'AcquireExceptionObject', 'Addr', 'AnsiToUtf8', 'Append', 'ArcTan',
-            'Assert', 'AssignFile', 'Assigned', 'BeginThread', 'BlockRead',
-            'BlockWrite', 'Break', 'ChDir', 'Chr', 'Close', 'CloseFile',
-            'CompToCurrency', 'CompToDouble', 'Concat', 'Continue', 'Copy', 'Cos',
-            'Dec', 'Delete', 'Dispose', 'DoubleToComp', 'EndThread', 'EnumModules',
-            'EnumResourceModules', 'Eof', 'Eoln', 'Erase', 'ExceptAddr',
-            'ExceptObject', 'Exclude', 'Exit', 'Exp', 'FilePos', 'FileSize',
-            'FillChar', 'Finalize', 'FindClassHInstance', 'FindHInstance',
-            'FindResourceHInstance', 'Flush', 'Frac', 'FreeMem', 'Get8087CW',
-            'GetDir', 'GetLastError', 'GetMem', 'GetMemoryManager',
-            'GetModuleFileName', 'GetVariantManager', 'Halt', 'Hi', 'High',
-            'IOResult', 'Inc', 'Include', 'Initialize', 'Insert', 'Int',
-            'IsMemoryManagerSet', 'IsVariantManagerSet', 'Length', 'Ln', 'Lo', 'Low',
-            'MkDir', 'Move', 'New', 'Odd', 'OleStrToStrVar', 'OleStrToString', 'Ord',
-            'PUCS4Chars', 'ParamCount', 'ParamStr', 'Pi', 'Pos', 'Pred', 'Ptr',
-            'Random', 'Randomize', 'Read', 'ReadLn', 'ReallocMem',
-            'ReleaseExceptionObject', 'Rename', 'Reset', 'Rewrite', 'RmDir', 'Round',
-            'RunError', 'Seek', 'SeekEof', 'SeekEoln', 'Set8087CW', 'SetLength',
-            'SetLineBreakStyle', 'SetMemoryManager', 'SetString', 'SetTextBuf',
-            'SetVariantManager', 'Sin', 'SizeOf', 'Slice', 'Sqr', 'Sqrt', 'Str',
-            'StringOfChar', 'StringToOleStr', 'StringToWideChar', 'Succ', 'Swap',
-            'Trunc', 'Truncate', 'TypeInfo', 'UCS4StringToWideString', 'UTF8Decode',
-            'UTF8Encode', 'UnicodeToUtf8', 'UniqueString', 'UpCase', 'Utf8ToAnsi',
-            'Utf8ToUnicode', 'Val', 'VarArrayRedim', 'VarClear',
-            'WideCharLenToStrVar', 'WideCharLenToString', 'WideCharToStrVar',
-            'WideCharToString', 'WideStringToUCS4String', 'Write', 'WriteLn',
-
-            'Abort', 'AddExitProc', 'AddTerminateProc', 'AdjustLineBreaks', 'AllocMem',
-            'AnsiCompareFileName', 'AnsiCompareStr', 'AnsiCompareText',
-            'AnsiDequotedStr', 'AnsiExtractQuotedStr', 'AnsiLastChar',
-            'AnsiLowerCase', 'AnsiLowerCaseFileName', 'AnsiPos', 'AnsiQuotedStr',
-            'AnsiSameStr', 'AnsiSameText', 'AnsiStrComp', 'AnsiStrIComp',
-            'AnsiStrLComp', 'AnsiStrLIComp', 'AnsiStrLastChar', 'AnsiStrLower',
-            'AnsiStrPos', 'AnsiStrRScan', 'AnsiStrScan', 'AnsiStrUpper',
-            'AnsiUpperCase', 'AnsiUpperCaseFileName', 'AppendStr', 'AssignStr',
-            'Beep', 'BoolToStr', 'ByteToCharIndex', 'ByteToCharLen', 'ByteType',
-            'CallTerminateProcs', 'ChangeFileExt', 'CharLength', 'CharToByteIndex',
-            'CharToByteLen', 'CompareMem', 'CompareStr', 'CompareText', 'CreateDir',
-            'CreateGUID', 'CurrToStr', 'CurrToStrF', 'CurrentYear', 'Date',
-            'DateTimeToFileDate', 'DateTimeToStr', 'DateTimeToString',
-            'DateTimeToSystemTime', 'DateTimeToTimeStamp', 'DateToStr', 'DayOfWeek',
-            'DecodeDate', 'DecodeDateFully', 'DecodeTime', 'DeleteFile',
-            'DirectoryExists', 'DiskFree', 'DiskSize', 'DisposeStr', 'EncodeDate',
-            'EncodeTime', 'ExceptionErrorMessage', 'ExcludeTrailingBackslash',
-            'ExcludeTrailingPathDelimiter', 'ExpandFileName', 'ExpandFileNameCase',
-            'ExpandUNCFileName', 'ExtractFileDir', 'ExtractFileDrive',
-            'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath',
-            'ExtractRelativePath', 'ExtractShortPathName', 'FileAge', 'FileClose',
-            'FileCreate', 'FileDateToDateTime', 'FileExists', 'FileGetAttr',
-            'FileGetDate', 'FileIsReadOnly', 'FileOpen', 'FileRead', 'FileSearch',
-            'FileSeek', 'FileSetAttr', 'FileSetDate', 'FileSetReadOnly', 'FileWrite',
-            'FinalizePackage', 'FindClose', 'FindCmdLineSwitch', 'FindFirst',
-            'FindNext', 'FloatToCurr', 'FloatToDateTime', 'FloatToDecimal',
-            'FloatToStr', 'FloatToStrF', 'FloatToText', 'FloatToTextFmt',
-            'FmtLoadStr', 'FmtStr', 'ForceDirectories', 'Format', 'FormatBuf',
-            'FormatCurr', 'FormatDateTime', 'FormatFloat', 'FreeAndNil',
-            'GUIDToString', 'GetCurrentDir', 'GetEnvironmentVariable',
-            'GetFileVersion', 'GetFormatSettings', 'GetLocaleFormatSettings',
-            'GetModuleName', 'GetPackageDescription', 'GetPackageInfo', 'GetTime',
-            'IncAMonth', 'IncMonth', 'IncludeTrailingBackslash',
-            'IncludeTrailingPathDelimiter', 'InitializePackage', 'IntToHex',
-            'IntToStr', 'InterlockedDecrement', 'InterlockedExchange',
-            'InterlockedExchangeAdd', 'InterlockedIncrement', 'IsDelimiter',
-            'IsEqualGUID', 'IsLeapYear', 'IsPathDelimiter', 'IsValidIdent',
-            'Languages', 'LastDelimiter', 'LoadPackage', 'LoadStr', 'LowerCase',
-            'MSecsToTimeStamp', 'NewStr', 'NextCharIndex', 'Now', 'OutOfMemoryError',
-            'QuotedStr', 'RaiseLastOSError', 'RaiseLastWin32Error', 'RemoveDir',
-            'RenameFile', 'ReplaceDate', 'ReplaceTime', 'SafeLoadLibrary',
-            'SameFileName', 'SameText', 'SetCurrentDir', 'ShowException', 'Sleep',
-            'StrAlloc', 'StrBufSize', 'StrByteType', 'StrCat', 'StrCharLength',
-            'StrComp', 'StrCopy', 'StrDispose', 'StrECopy', 'StrEnd', 'StrFmt',
-            'StrIComp', 'StrLCat', 'StrLComp', 'StrLCopy', 'StrLFmt', 'StrLIComp',
-            'StrLen', 'StrLower', 'StrMove', 'StrNew', 'StrNextChar', 'StrPCopy',
-            'StrPLCopy', 'StrPas', 'StrPos', 'StrRScan', 'StrScan', 'StrToBool',
-            'StrToBoolDef', 'StrToCurr', 'StrToCurrDef', 'StrToDate', 'StrToDateDef',
-            'StrToDateTime', 'StrToDateTimeDef', 'StrToFloat', 'StrToFloatDef',
-            'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime',
-            'StrToTimeDef', 'StrUpper', 'StringReplace', 'StringToGUID', 'Supports',
-            'SysErrorMessage', 'SystemTimeToDateTime', 'TextToFloat', 'Time',
-            'TimeStampToDateTime', 'TimeStampToMSecs', 'TimeToStr', 'Trim',
-            'TrimLeft', 'TrimRight', 'TryEncodeDate', 'TryEncodeTime',
-            'TryFloatToCurr', 'TryFloatToDateTime', 'TryStrToBool', 'TryStrToCurr',
-            'TryStrToDate', 'TryStrToDateTime', 'TryStrToFloat', 'TryStrToInt',
-            'TryStrToInt64', 'TryStrToTime', 'UnloadPackage', 'UpperCase',
-            'WideCompareStr', 'WideCompareText', 'WideFmtStr', 'WideFormat',
-            'WideFormatBuf', 'WideLowerCase', 'WideSameStr', 'WideSameText',
-            'WideUpperCase', 'Win32Check', 'WrapText',
-
-            'ActivateClassGroup', 'AllocateHwnd', 'BinToHex', 'CheckSynchronize',
-            'CollectionsEqual', 'CountGenerations', 'DeallocateHwnd', 'EqualRect',
-            'ExtractStrings', 'FindClass', 'FindGlobalComponent', 'GetClass',
-            'GroupDescendantsWith', 'HexToBin', 'IdentToInt',
-            'InitInheritedComponent', 'IntToIdent', 'InvalidPoint',
-            'IsUniqueGlobalComponentName', 'LineStart', 'ObjectBinaryToText',
-            'ObjectResourceToText', 'ObjectTextToBinary', 'ObjectTextToResource',
-            'PointsEqual', 'ReadComponentRes', 'ReadComponentResEx',
-            'ReadComponentResFile', 'Rect', 'RegisterClass', 'RegisterClassAlias',
-            'RegisterClasses', 'RegisterComponents', 'RegisterIntegerConsts',
-            'RegisterNoIcon', 'RegisterNonActiveX', 'SmallPoint', 'StartClassGroup',
-            'TestStreamFormat', 'UnregisterClass', 'UnregisterClasses',
-            'UnregisterIntegerConsts', 'UnregisterModuleClasses',
-            'WriteComponentResFile',
-
-            'ArcCos', 'ArcCosh', 'ArcCot', 'ArcCotH', 'ArcCsc', 'ArcCscH', 'ArcSec',
-            'ArcSecH', 'ArcSin', 'ArcSinh', 'ArcTan2', 'ArcTanh', 'Ceil',
-            'CompareValue', 'Cosecant', 'Cosh', 'Cot', 'CotH', 'Cotan', 'Csc', 'CscH',
-            'CycleToDeg', 'CycleToGrad', 'CycleToRad', 'DegToCycle', 'DegToGrad',
-            'DegToRad', 'DivMod', 'DoubleDecliningBalance', 'EnsureRange', 'Floor',
-            'Frexp', 'FutureValue', 'GetExceptionMask', 'GetPrecisionMode',
-            'GetRoundMode', 'GradToCycle', 'GradToDeg', 'GradToRad', 'Hypot',
-            'InRange', 'IntPower', 'InterestPayment', 'InterestRate',
-            'InternalRateOfReturn', 'IsInfinite', 'IsNan', 'IsZero', 'Ldexp', 'LnXP1',
-            'Log10', 'Log2', 'LogN', 'Max', 'MaxIntValue', 'MaxValue', 'Mean',
-            'MeanAndStdDev', 'Min', 'MinIntValue', 'MinValue', 'MomentSkewKurtosis',
-            'NetPresentValue', 'Norm', 'NumberOfPeriods', 'Payment', 'PeriodPayment',
-            'Poly', 'PopnStdDev', 'PopnVariance', 'Power', 'PresentValue',
-            'RadToCycle', 'RadToDeg', 'RadToGrad', 'RandG', 'RandomRange', 'RoundTo',
-            'SLNDepreciation', 'SYDDepreciation', 'SameValue', 'Sec', 'SecH',
-            'Secant', 'SetExceptionMask', 'SetPrecisionMode', 'SetRoundMode', 'Sign',
-            'SimpleRoundTo', 'SinCos', 'Sinh', 'StdDev', 'Sum', 'SumInt',
-            'SumOfSquares', 'SumsAndSquares', 'Tan', 'Tanh', 'TotalVariance',
-            'Variance'
-            ),
-        4 => array(
-            'AnsiChar', 'AnsiString', 'Bool', 'Boolean', 'Byte', 'ByteBool', 'Cardinal', 'Char',
-            'Comp', 'Currency', 'DWORD', 'Double', 'Extended', 'Int64', 'Integer', 'IUnknown',
-            'LongBool', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PBool', 'PBoolean', 'PByte',
-            'PByteArray', 'PCardinal', 'PChar', 'PComp', 'PCurrency', 'PDWORD', 'PDate', 'PDateTime',
-            'PDouble', 'PExtended', 'PInt64', 'PInteger', 'PLongInt', 'PLongWord', 'Pointer', 'PPointer',
-            'PShortInt', 'PShortString', 'PSingle', 'PSmallInt', 'PString', 'PHandle', 'PVariant', 'PWord',
-            'PWordArray', 'PWordBool', 'PWideChar', 'PWideString', 'Real', 'Real48', 'ShortInt', 'ShortString',
-            'Single', 'SmallInt', 'String', 'TClass', 'TDate', 'TDateTime', 'TextFile', 'THandle',
-            'TObject', 'TTime', 'Variant', 'WideChar', 'WideString', 'Word', 'WordBool'
-            ),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '[', ']'),
-        1 => array('.', ',', ':', ';'),
-        2 => array('@', '^'),
-        3 => array('=', '+', '-', '*', '/')
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #008000; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #ff0000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000066;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000cc;',
-            1 => 'color: #ff0000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;',
-            1 => 'color: #000066;',
-            2 => 'color: #000066;',
-            3 => 'color: #000066;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-        0 => '(?<!\#)\$[0-9a-fA-F]+(?!\w)',
-        //Characters
-        1 => '\#(?:\$[0-9a-fA-F]{1,4}|\d{1,5})'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 2,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            3 => array(
-                'DISALLOWED_AFTER' => '(?=\s*[(;])'
-                )
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/diff.php b/inc/geshi/diff.php
deleted file mode 100644
index 5b6817178..000000000
--- a/inc/geshi/diff.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/*************************************************************************************
- * diff.php
- * --------
- * Author: Conny Brunnkvist (conny@fuchsia.se), W. Tasin (tasin@fhm.edu)
- * Copyright: (c) 2004 Fuchsia Open Source Solutions (http://www.fuchsia.se/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/12/29
- *
- * Diff-output language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2006/02/27
- *  -  changing language file to use matching of start (^) and end ($) (wt)
- * 2004/12/29 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2006/02/27)
- * -------------------------
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-
-$language_data = array (
-    'LANG_NAME' => 'Diff',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => ' ',
-    'KEYWORDS' => array(
-            1 => array(
-                '\ No newline at end of file'
-            ),
-//            2 => array(
-//                '***************' /* This only seems to works in some cases? */
-//            ),
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        1 => false,
-//        2 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #aaaaaa; font-style: italic;',
-//            2 => 'color: #dd6611;',
-            ),
-        'COMMENTS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => ''
-            ),
-        'STRINGS' => array(
-            0 => ''
-            ),
-        'NUMBERS' => array(
-            0 => ''
-            ),
-        'METHODS' => array(
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => ''
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #440088;',
-            1 => 'color: #991111;',
-            2 => 'color: #00b000;',
-            3 => 'color: #888822;',
-            4 => 'color: #888822;',
-            5 => 'color: #0011dd;',
-            6 => 'color: #440088;',
-            7 => 'color: #991111;',
-            8 => 'color: #00b000;',
-            9 => 'color: #888822;',
-            ),
-        ),
-    'URLS' => array(
-        1 => '',
-//        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        0 => "[0-9,]+[acd][0-9,]+",
-        //Removed lines
-        1 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))\\&lt;.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Inserted lines
-        2 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))\\&gt;.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Location line
-        3 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))-{3}\\s.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Inserted line
-        4 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))(\\+){3}\\s.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Modified line
-        5 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))\\!.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //File specification
-        6 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))[\\@]{2}.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Removed line
-        7 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))\\-.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Inserted line
-        8 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))\\+.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //File specification
-        9 => array(
-            GESHI_SEARCH => '(^|(?<=\A\s))(\\*){3}\\s.*$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/div.php b/inc/geshi/div.php
deleted file mode 100644
index aa11795ac..000000000
--- a/inc/geshi/div.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*************************************************************************************
- * div.php
- * ---------------------------------
- * Author: Gabriel Lorenzo (ermakina@gmail.com)
- * Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)
- * Release Version: 1.0.8.11
- * Date Started: 2005/06/19
- *
- * DIV language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/06/22 (1.0.0)
- *  -  First Release, includes "2nd gen" ELSEIF statement
- *
- * TODO (updated 2005/06/22)
- * -------------------------
- *  -  I'm pretty satisfied with this, so nothing for now... :P
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'DIV',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'while','until','to','switch','step','return','repeat','loop','if','from','frame','for','end','elseif',
-            'else','default','debug','continue','clone','case','break','begin'
-            ),
-        2 => array(
-            'xor','whoami','type','sizeof','pointer','or','offset','not','neg','mod','id','dup','and','_ne','_lt',
-            '_le','_gt','_ge','_eq'
-            ),
-        3 => array(
-            'setup_program','program','process','private','local','import','global','function','const',
-            'compiler_options'
-            ),
-        4 => array(
-            'word','struct','string','int','byte'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(',')','[',']','=','+','-','*','/','!','%','^','&',':',';',',','<','>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0040b1;',
-            2 => 'color: #000000;',
-            3 => 'color: #000066; font-weight: bold;',
-            4 => 'color: #993333;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #44aa44;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #202020;',
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #44aa44;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/dos.php b/inc/geshi/dos.php
deleted file mode 100644
index 36d99836b..000000000
--- a/inc/geshi/dos.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/*************************************************************************************
- * dos.php
- * -------
- * Author: Alessandro Staltari (staltari@geocities.com)
- * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
- * Release Version: 1.0.8.11
- * Date Started: 2005/07/05
- *
- * DOS language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2005/07/05 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2005/07/05)
- * -------------------------
- *
- * - Highlight pipes and redirection (do we really need this?)
- * - Add missing keywords.
- * - Find a good hyperlink for keywords.
- * - Improve styles.
- *
- * KNOWN ISSUES (updated 2005/07/07)
- * ---------------------------------
- *
- * - Doesn't even try to handle spaces in variables name or labels (I can't
- *   find a reliable way to establish if a sting is a name or not, in some
- *   cases it depends on the contex or enviroment status).
- * - Doesn't handle %%[letter] pseudo variable used inside FOR constructs
- *   (it should be done only into its scope: how to handle variable it?).
- * - Doesn't handle %~[something] pseudo arguments.
- * - If the same keyword is placed at the end of the line and the
- *   beginning of the next, the second occourrence is not highlighted
- *   (this should be a GeSHi bug, not related to the language definition).
- * - I can't avoid to have keyword highlighted even when they are not used
- *   as keywords but, for example, as arguments to the echo command.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'DOS',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    //DOS comment lines
-    'COMMENT_REGEXP' => array(
-        1 => "/^\s*@?REM\b.*$/mi",
-        2 => "/^\s*::.*$/m",
-        3 => "/\^./"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* Flow control keywords */
-        1 => array(
-            'if', 'else', 'goto', 'shift',
-            'for', 'in', 'do',
-            'call', 'exit'
-            ),
-        /* IF statement keywords */
-        2 => array(
-            'not', 'exist', 'errorlevel',
-            'defined',
-            'equ', 'neq', 'lss', 'leq', 'gtr', 'geq'
-            ),
-        /* Internal commands */
-        3 => array(
-            'cd', 'md', 'rd', 'chdir', 'mkdir', 'rmdir', 'dir',
-            'del', 'copy', 'move', 'ren', 'rename',
-            'echo',
-            'setlocal', 'endlocal', 'set',
-            'pause',
-            'pushd', 'popd', 'title', 'verify'
-            ),
-        /* Special files */
-        4 => array(
-            'prn', 'nul', 'lpt3', 'lpt2', 'lpt1', 'con',
-            'com4', 'com3', 'com2', 'com1', 'aux'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '@', '%', '!', '|', '<', '>', '&'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00b100; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #b1b100; font-weight: bold;',
-            4 => 'color: #0000ff; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #b100b1; font-style: italic;',
-            3 => 'color: #33cc33;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #ff0000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #33cc33;',
-            1 => 'color: #33cc33;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #b100b1; font-weight: bold;',
-            1 => 'color: #448844;',
-            2 => 'color: #448888;',
-            3 => 'color: #448888;'
-            )
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'URLS' => array(
-        1 => 'http://www.ss64.com/nt/{FNAMEL}.html',
-        2 => 'http://www.ss64.com/nt/{FNAMEL}.html',
-        3 => 'http://www.ss64.com/nt/{FNAMEL}.html',
-        4 => 'http://www.ss64.com/nt/{FNAMEL}.html'
-        ),
-    'REGEXPS' => array(
-        /* Label */
-        0 => array(
-/*            GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\s\n]*)',*/
-            GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\s\n]*)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'si',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-        ),
-        /* Variable assignement */
-        1 => array(
-/*            GESHI_SEARCH => '(SET[\s]+(?si:\/A[\s]+|\/P[\s]+|))([^=\s\n]+)([\s]*=)',*/
-            GESHI_SEARCH => '(SET\s+(?si:\\/A\s+|\\/P\s+)?)([^=\n]+)(\s*=)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'si',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        /* Arguments or variable evaluation */
-        2 => array(
-/*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((?<!%\d)%|)',*/
-            GESHI_SEARCH => '(!(?:!(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^!>\n]*(?=!))((?<!%\d)%|)(?!!>)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'si',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        /* Arguments or variable evaluation */
-        3 => array(
-/*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((?<!%\d)%|)',*/
-            GESHI_SEARCH => '(%(?:%(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^%\n]*(?=%))((?<!%\d)%|)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'si',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-            ),
-        'KEYWORDS' => array(
-            1 => array(
-                'DISALLOWED_BEFORE' => '(?<![\w\-])'
-                ),
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<![\w\-])'
-                ),
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<![\w\-])'
-                ),
-            4 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/dot.php b/inc/geshi/dot.php
deleted file mode 100644
index bdf240a1f..000000000
--- a/inc/geshi/dot.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/*************************************************************************************
- * dot.php
- * ---------------------------------
- * Author: Adrien Friggeri (adrien@friggeri.net)
- * Copyright: (c) 2007 Adrien Friggeri (http://www.friggeri.net)
- * Release Version: 1.0.8.11
- * Date Started: 2007/05/30
- *
- * dot language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2007/05/30 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2007/05/30)
- * -------------------------
- * Everything
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'dot',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'URL', 'arrowhead', 'arrowsize', 'arrowtail', 'bb', 'bgcolor', 'bottomlabel',
-            'center', 'clusterrank', 'color', 'comment', 'constraint', 'decorate',
-            'dir', 'distortion', 'fillcolor', 'fixedsize', 'fontcolor',
-            'fontname', 'fontsize', 'group', 'headclip', 'headlabel', 'headport',
-            'height', 'id', 'label', 'labelangle', 'labeldistance', 'labelfontcolor',
-            'labelfontname', 'labelfontsize', 'layer', 'layers', 'margin', 'mclimit',
-            'minlen', 'nodesep', 'nslimit', 'ordering', 'orientation', 'page',
-            'pagedir', 'peripheries', 'port_label_distance', 'quantum', 'rank', 'rankdir',
-            'ranksep', 'ratio', 'regular', 'rotate', 'samehead', 'sametail', 'searchsize',
-            'shape', 'shapefile', 'showboxes', 'sides', 'size', 'skew', 'style',
-            'tailclip', 'taillabel', 'tailport', 'toplabel', 'weight', 'width'
-            ),
-        2 => array(
-            'node', 'graph', 'digraph', 'strict', 'edge', 'subgraph'
-            ),
-        3 => array(
-            'Mcircle', 'Mdiamond', 'Mrecord', 'Msquare', 'auto', 'back', 'bold',
-            'both', 'box', 'circle', 'compress', 'dashed', 'diamond', 'dot',
-            'dotted', 'doublecircle', 'doubleoctagon', 'egg', 'ellipse', 'epsf',
-            'false', 'fill', 'filled', 'forward', 'global', 'hexagon', 'house',
-            'inv', 'invdot', 'invhouse', 'invis', 'invodot', 'invtrapezium',
-            'invtriangle', 'local', 'max', 'min', 'none', 'normal', 'octagon',
-            'odot', 'out', 'parallelogram', 'plaintext', 'polygon', 'record',
-            'same', 'solid', 'trapezium', 'triangle', 'tripleoctagon', 'true'
-            ),
-        4 => array(
-            'aliceblue', 'antiquewhite', 'aquamarine', 'azure', 'beige', 'bisque', 'black',
-            'blanchedalmond', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue',
-            'chartreuse', 'chocolate', 'coral', 'cornflowerblue', 'cornsilk', 'crimson',
-            'cyan', 'darkgoldenrod', 'darkgreen', 'darkkhaki', 'darkolivegreen',
-            'darkorange', 'darkorchid', 'darksalmon', 'darkseagreen', 'darkslateblue',
-            'darkslategray', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue',
-            'dimgray', 'dodgerblue', 'firebrick', 'forestgreen', 'gainsboro', 'ghostwhite',
-            'gold', 'goldenrod', 'gray', 'green', 'greenyellow', 'honeydew', 'hotpink',
-            'indianred', 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush',
-            'lawngreen', 'lemonchiffon', 'lightblue', 'lightcyan', 'lightgoldenrod',
-            'lightgoldenrodyellow', 'lightgray', 'lightpink', 'lightsalmon',
-            'lightseagreen', 'lightskyblue', 'lightslateblue', 'lightslategray',
-            'lightyellow', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine',
-            'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen',
-            'mediumslateblue', 'mediumspringgreen', 'mediumturquoise', 'mediumvioletred',
-            'midnightblue', 'mintcream', 'mistyrose', 'moccasin', 'navajowhite', 'navy',
-            'navyblue', 'oldlace', 'olivedrab', 'oralwhite', 'orange', 'orangered',
-            'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise', 'palevioletred',
-            'papayawhip', 'peachpuff', 'peru', 'pink', 'plum', 'powderblue', 'purple',
-            'red', 'rosybrown', 'royalblue', 'saddlebrown', 'salmon', 'salmon2', 'sandybrown',
-            'seagreen', 'seashell', 'sienna', 'skyblue', 'slateblue', 'slategray', 'snow',
-            'springgreen', 'steelblue', 'tan', 'thistle', 'tomato', 'turquoise', 'violet',
-            'violetred', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen'
-            )
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '{', '}', '-', '+', '*', '/', '<', '>', '!', '~', '%', '&', '|', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #993333;',
-            4 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #339933;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #af624d; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'METHODS' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            ),
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/e.php b/inc/geshi/e.php
deleted file mode 100644
index 319bee016..000000000
--- a/inc/geshi/e.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/*************************************************************************************
- * e.php
- * --------
- * Author: Kevin Reid (kpreid@switchb.org)
- * Copyright: (c) 2010 Kevin Reid (http://switchb.org/kpreid/)
- * Release Version: 1.0.8.11
- * Date Started: 2010/04/16
- *
- * E language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010-04-21 (1.0.8.8)
- *  -  Fixing langcheck-reported bugs.
- * 2010-04-14 (0.1)
- *  -  First Release
- *
- * TODO (updated 2010-04-21)
- * -------------------------
- *  -  Do something useful with the keyword groups. Since RC uses CSS classes named
- *     by the group numbers, either
- *     - change the numbering to match conventional uses by other languages,
- *     - or find or create some way to produce usefully named classes.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'E',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array('/**' => '*/'), // Note: This is method doc, not a general comment syntax.
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-
-    // FIXME: The escaping inside ` is actually doubling of any interior `, $, or @ -- backslash is NOT special
-    'QUOTEMARKS' => array('\'', '"', '`'),
-    'ESCAPE_CHAR' => '\\',
-
-    'KEYWORDS' => array(
-        // builtin control structures
-        1 => array(
-            'accum', 'break', 'try', 'continue', 'if', 'while', 'for', 'switch'
-            ),
-
-        // control structures subsidiary keywords
-        2 => array(
-            'catch', 'else', 'finally', 'in', 'exit'
-            ),
-
-        // named operators
-        3 => array(
-            'fn', 'via'
-            ),
-
-        // variable/function/object definers
-        4 => array(
-            'def', 'bind', 'var'
-            ),
-
-        // object definition subsidiary keywords
-        5 => array(
-            'extends', 'as', 'implements', 'guards', 'match', 'to', 'method'
-            ),
-
-        // builtin nouns in safeEnv
-        6 => array(
-            'null', 'false', 'true', 'throw', '__loop', '__makeList',
-            '__makeMap', '__makeProtocolDesc', '__makeMessageDesc',
-            '__makeParamDesc', 'any', 'void', 'boolean', '__makeOrderedSpace',
-            'ValueGuard', '__MatchContext', 'require', '__makeVerbFacet', 'NaN',
-            'Infinity', '__identityFunc', '__makeInt', '__makeFinalSlot',
-            '__makeVarSlot', '__makeGuardedSlot', '__makeGuard', '__makeTwine',
-            '__makeSourceSpan', '__auditedBy', 'Guard', 'near', 'pbc',
-            'PassByCopy', 'DeepPassByCopy', 'Data', 'Persistent', 'DeepFrozen',
-            'int', 'float64', 'char', 'String', 'Twine', 'TextWriter', 'List',
-            'Map', 'nullOk', 'Tuple', '__Portrayal', 'notNull', 'vow', 'rcvr',
-            'SturdyRef', 'simple__quasiParser', 'twine__quasiParser',
-            'rx__quasiParser', 'e__quasiParser', 'epatt__quasiParser',
-            'sml__quasiParser', 'term__quasiParser', 'traceln', '__equalizer',
-            '__comparer', 'Ref', 'E', 'promiseAllFulfilled', 'EIO', 'help',
-            'safeScope', '__eval', 'resource__uriGetter', 'type__uriGetter',
-            'import__uriGetter', 'elib__uriGetter', 'elang__uriGetter',
-            'opaque__uriGetter'
-            ),
-
-        // builtin nouns in privilegedEnv
-        7 => array(
-            'file__uriGetter', 'fileURL__uriGetter', 'jar__uriGetter',
-            'http__uriGetter', 'ftp__uriGetter', 'gopher__uriGetter',
-            'news__uriGetter', 'cap__uriGetter', 'makeCommand', 'stdout',
-            'stderr', 'stdin', 'print', 'println', 'interp', 'entropy', 'timer',
-            'introducer', 'identityMgr', 'makeSturdyRef', 'timeMachine',
-            'unsafe__uriGetter', 'currentVat', 'rune', 'awt__uriGetter',
-            'swing__uriGetter', 'JPanel__quasiParser', 'swt__uriGetter',
-            'currentDisplay', 'swtGrid__quasiParser', 'swtGrid`',
-            'privilegedScope'
-            ),
-
-        // reserved keywords
-        8 => array(
-            'abstract', 'an', 'assert', 'attribute', 'be', 'begin', 'behalf',
-            'belief', 'believe', 'believes', 'case', 'class', 'const',
-            'constructor', 'declare', 'default', 'define', 'defmacro',
-            'delicate', 'deprecated', 'dispatch', 'do', 'encapsulate',
-            'encapsulated', 'encapsulates', 'end', 'ensure', 'enum', 'eventual',
-            'eventually', 'export', 'facet', 'forall', 'function', 'given',
-            'hidden', 'hides', 'inline', 'is', 'know', 'knows', 'lambda', 'let',
-            'methods', 'module', 'namespace', 'native', 'obeys', 'octet',
-            'oneway', 'operator', 'package', 'private', 'protected', 'public',
-            'raises', 'reliance', 'reliant', 'relies', 'rely', 'reveal', 'sake',
-            'signed', 'static', 'struct', 'suchthat', 'supports', 'suspect',
-            'suspects', 'synchronized', 'this', 'transient', 'truncatable',
-            'typedef', 'unsigned', 'unum', 'uses', 'using', 'utf8', 'utf16',
-            'virtual', 'volatile', 'wstring'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #b1b100;',
-            3 => 'color: #b1b100;',
-            4 => 'color: #b1b100;',
-            5 => 'color: #b1b100;',
-            6 => 'color: #b1b100;',
-            7 => 'color: #b1b100;',
-            8 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => 'http://wiki.erights.org/wiki/{FNAME}',
-        2 => 'http://wiki.erights.org/wiki/{FNAME}',
-        3 => 'http://wiki.erights.org/wiki/{FNAME}',
-        4 => 'http://wiki.erights.org/wiki/{FNAME}',
-        5 => 'http://wiki.erights.org/wiki/{FNAME}',
-        6 => 'http://wiki.erights.org/wiki/{FNAME}',
-        7 => 'http://wiki.erights.org/wiki/{FNAME}',
-        8 => 'http://wiki.erights.org/wiki/{FNAME}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '<-',
-        3 => '::'
-        ),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/ecmascript.php b/inc/geshi/ecmascript.php
deleted file mode 100644
index 69a55c9aa..000000000
--- a/inc/geshi/ecmascript.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/*************************************************************************************
- * ecmascript.php
- * --------------
- * Author: Michel Mariani (http://www.tonton-pixel.com/site/)
- * Copyright: (c) 2010 Michel Mariani (http://www.tonton-pixel.com/site/)
- * Release Version: 1.0.8.11
- * Date Started: 2010/01/08
- *
- * ECMAScript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/01/08 (1.0.8.6)
- *  -  First Release
- *  -  Adapted from javascript.php to support plain ECMAScript/JavaScript (no HTML, no DOM)
- *  -  Fixed regular expression for 'COMMENT_REGEXP' to exclude 'COMMENT_MULTI' syntax
- *  -  Added '~' and removed '@' from 'SYMBOLS'
- *  -  Cleaned up and expanded the list of 'KEYWORDS'
- *  -  Added support for 'ESCAPE_REGEXP' and 'NUMBERS' (from c.php)
- *  -  Selected colors to match my web site color chart
- *  -  Added full number highlighting in all C language style formats
- *  -  Added highlighting of escape sequences in strings, in all C language style formats including Unicode (\uXXXX).
- *
- * TODO (updated 2010/01/08)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ECMAScript',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    // Regular Expression Literals
-    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array( // Reserved literals
-            'false', 'true',
-            'null'
-            ),
-        2 => array( // Main keywords
-            'break', 'case', 'catch', 'continue', 'default', 'delete', 'do', 'else',
-            'finally', 'for', 'function', 'if', 'in', 'instanceof', 'new', 'return',
-            'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void', 'while',
-            'with'
-            ),
-        3 => array( // Extra keywords or keywords reserved for future use
-            'abstract', 'as', 'boolean', 'byte', 'char', 'class', 'const', 'debugger',
-            'double', 'enum', 'export', 'extends', 'final', 'float', 'goto', 'implements',
-            'import', 'int', 'interface', 'is', 'long', 'native', 'namespace', 'package',
-            'private', 'protected', 'public', 'short', 'static', 'super', 'synchronized', 'throws',
-            'transient', 'use', 'volatile'
-            ),
-        4 => array( // Operators
-            'get', 'set'
-            ),
-        5 => array( // Built-in object classes
-            'Array', 'Boolean', 'Date', 'EvalError', 'Error', 'Function', 'Math', 'Number',
-            'Object', 'RangeError', 'ReferenceError', 'RegExp', 'String', 'SyntaxError', 'TypeError', 'URIError'
-            ),
-        6 => array( // Global properties
-            'Infinity', 'NaN', 'undefined'
-            ),
-        7 => array( // Global methods
-            'decodeURI', 'decodeURIComponent', 'encodeURI', 'encodeURIComponent',
-            'eval', 'isFinite', 'isNaN', 'parseFloat', 'parseInt',
-            // The escape and unescape functions do not work properly for non-ASCII characters and have been deprecated.
-            // In JavaScript 1.5 and later, use encodeURI, decodeURI, encodeURIComponent, and decodeURIComponent.
-            'escape', 'unescape'
-            ),
-        8 => array( // Function's arguments
-            'arguments'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '+', '-', '*', '/', '%',
-        '!', '.', '&', '|', '^',
-        '<', '>', '=', '~',
-        ',', ';', '?', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #009999;',
-            2 => 'color: #1500C8;',
-            3 => 'color: #1500C8;',
-            4 => 'color: #1500C8;',
-            5 => 'color: #1500C8;',
-            6 => 'color: #1500C8;',
-            7 => 'color: #1500C8;',
-            8 => 'color: #1500C8;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #CC0000;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #3366CC;',
-            1 => 'color: #3366CC;',
-            2 => 'color: #3366CC;',
-            3 => 'color: #3366CC;',
-            4 => 'color: #3366CC;',
-            5 => 'color: #3366CC;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #008800;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #9900FF;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF00FF;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #FF00FF;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #FF00FF;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #FF00FF;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color: #FF00FF;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color: #FF00FF;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color: #FF00FF;',
-            GESHI_NUMBER_FLT_NONSCI => 'color: #FF00FF;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #660066;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/eiffel.php b/inc/geshi/eiffel.php
deleted file mode 100644
index baa13c319..000000000
--- a/inc/geshi/eiffel.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/*************************************************************************************
- * eiffel.php
- * ----------
- * Author: Zoran Simic (zsimic@axarosenberg.com)
- * Copyright: (c) 2005 Zoran Simic
- * Release Version: 1.0.8.11
- * Date Started: 2005/06/30
- *
- * Eiffel language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/06/30 (1.0.7)
- *  -  Initial release
- *
- * TODO (updated 2005/06/30)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Eiffel',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '%',
-    'KEYWORDS' => array(
-        1 => array(
-            'separate',
-            'invariant',
-            'inherit',
-            'indexing',
-            'feature',
-            'expanded',
-            'deferred',
-            'class'
-            ),
-        2 => array(
-            'xor',
-            'when',
-            'variant',
-            'until',
-            'unique',
-            'undefine',
-            'then',
-            'strip',
-            'select',
-            'retry',
-            'rescue',
-            'require',
-            'rename',
-            'reference',
-            'redefine',
-            'prefix',
-            'or',
-            'once',
-            'old',
-            'obsolete',
-            'not',
-            'loop',
-            'local',
-            'like',
-            'is',
-            'inspect',
-            'infix',
-            'include',
-            'implies',
-            'if',
-            'frozen',
-            'from',
-            'external',
-            'export',
-            'ensure',
-            'end',
-            'elseif',
-            'else',
-            'do',
-            'creation',
-            'create',
-            'check',
-            'as',
-            'and',
-            'alias',
-            'agent'
-            ),
-        3 => array(
-            'Void',
-            'True',
-            'Result',
-            'Precursor',
-            'False',
-            'Current'
-            ),
-        4 => array(
-            'UNIX_SIGNALS',
-            'UNIX_FILE_INFO',
-            'UNBOUNDED',
-            'TWO_WAY_TREE_CURSOR',
-            'TWO_WAY_TREE',
-            'TWO_WAY_SORTED_SET',
-            'TWO_WAY_LIST',
-            'TWO_WAY_CURSOR_TREE',
-            'TWO_WAY_CIRCULAR',
-            'TWO_WAY_CHAIN_ITERATOR',
-            'TUPLE',
-            'TREE',
-            'TRAVERSABLE',
-            'TO_SPECIAL',
-            'THREAD_CONTROL',
-            'THREAD_ATTRIBUTES',
-            'THREAD',
-            'TABLE',
-            'SUBSET',
-            'STRING_HANDLER',
-            'STRING',
-            'STREAM',
-            'STORABLE',
-            'STD_FILES',
-            'STACK',
-            'SPECIAL',
-            'SORTED_TWO_WAY_LIST',
-            'SORTED_STRUCT',
-            'SORTED_LIST',
-            'SINGLE_MATH',
-            'SET',
-            'SEQUENCE',
-            'SEQ_STRING',
-            'SEMAPHORE',
-            'ROUTINE',
-            'RESIZABLE',
-            'RECURSIVE_TREE_CURSOR',
-            'RECURSIVE_CURSOR_TREE',
-            'REAL_REF',
-            'REAL',
-            'RAW_FILE',
-            'RANDOM',
-            'QUEUE',
-            'PROXY',
-            'PROFILING_SETTING',
-            'PROCEDURE',
-            'PRIORITY_QUEUE',
-            'PRIMES',
-            'PRECOMP',
-            'POINTER_REF',
-            'POINTER',
-            'PLATFORM',
-            'PLAIN_TEXT_FILE',
-            'PATH_NAME',
-            'PART_SORTED_TWO_WAY_LIST',
-            'PART_SORTED_SET',
-            'PART_SORTED_LIST',
-            'PART_COMPARABLE',
-            'OPERATING_ENVIRONMENT',
-            'ONCE_CONTROL',
-            'OBJECT_OWNER',
-            'OBJECT_CONTROL',
-            'NUMERIC',
-            'NONE',
-            'MUTEX',
-            'MULTI_ARRAY_LIST',
-            'MULTAR_LIST_CURSOR',
-            'MEMORY',
-            'MEM_INFO',
-            'MEM_CONST',
-            'MATH_CONST',
-            'LIST',
-            'LINKED_TREE_CURSOR',
-            'LINKED_TREE',
-            'LINKED_STACK',
-            'LINKED_SET',
-            'LINKED_QUEUE',
-            'LINKED_PRIORITY_QUEUE',
-            'LINKED_LIST_CURSOR',
-            'LINKED_LIST',
-            'LINKED_CURSOR_TREE',
-            'LINKED_CIRCULAR',
-            'LINKABLE',
-            'LINEAR_ITERATOR',
-            'LINEAR',
-            'ITERATOR',
-            'IO_MEDIUM',
-            'INTERNAL',
-            'INTEGER_REF',
-            'INTEGER_INTERVAL',
-            'INTEGER',
-            'INFINITE',
-            'INDEXABLE',
-            'IDENTIFIED_CONTROLLER',
-            'IDENTIFIED',
-            'HIERARCHICAL',
-            'HEAP_PRIORITY_QUEUE',
-            'HASHABLE',
-            'HASH_TABLE_CURSOR',
-            'HASH_TABLE',
-            'GENERAL',
-            'GC_INFO',
-            'FUNCTION',
-            'FORMAT_INTEGER',
-            'FORMAT_DOUBLE',
-            'FIXED_TREE',
-            'FIXED_LIST',
-            'FIXED',
-            'FINITE',
-            'FILE_NAME',
-            'FILE',
-            'FIBONACCI',
-            'EXECUTION_ENVIRONMENT',
-            'EXCEPTIONS',
-            'EXCEP_CONST',
-            'DYNAMIC_TREE',
-            'DYNAMIC_LIST',
-            'DYNAMIC_CIRCULAR',
-            'DYNAMIC_CHAIN',
-            'DOUBLE_REF',
-            'DOUBLE_MATH',
-            'DOUBLE',
-            'DISPENSER',
-            'DIRECTORY_NAME',
-            'DIRECTORY',
-            'DECLARATOR',
-            'DEBUG_OUTPUT',
-            'CURSOR_TREE_ITERATOR',
-            'CURSOR_TREE',
-            'CURSOR_STRUCTURE',
-            'CURSOR',
-            'COUNTABLE_SEQUENCE',
-            'COUNTABLE',
-            'CONTAINER',
-            'CONSOLE',
-            'CONDITION_VARIABLE',
-            'COMPARABLE_STRUCT',
-            'COMPARABLE_SET',
-            'COMPARABLE',
-            'COMPACT_TREE_CURSOR',
-            'COMPACT_CURSOR_TREE',
-            'COLLECTION',
-            'CIRCULAR_CURSOR',
-            'CIRCULAR',
-            'CHARACTER_REF',
-            'CHARACTER',
-            'CHAIN',
-            'CELL',
-            'BOX',
-            'BOUNDED_STACK',
-            'BOUNDED_QUEUE',
-            'BOUNDED',
-            'BOOLEAN_REF',
-            'BOOLEAN',
-            'BOOL_STRING',
-            'BIT_REF',
-            'BINARY_TREE',
-            'BINARY_SEARCH_TREE_SET',
-            'BINARY_SEARCH_TREE',
-            'BILINEAR',
-            'BI_LINKABLE',
-            'BASIC_ROUTINES',
-            'BAG',
-            'ASCII',
-            'ARRAYED_TREE',
-            'ARRAYED_STACK',
-            'ARRAYED_QUEUE',
-            'ARRAYED_LIST_CURSOR',
-            'ARRAYED_LIST',
-            'ARRAYED_CIRCULAR',
-            'ARRAY2',
-            'ARRAY',
-            'ARGUMENTS',
-            'ANY',
-            'ACTIVE'
-            ),
-        5 => array(
-            'yes',
-            'visible',
-            'trace',
-            'system',
-            'root',
-            'profile',
-            'override_cluster',
-            'object',
-            'no',
-            'multithreaded',
-            'msil_generation_type',
-            'line_generation',
-            'library',
-            'inlining_size',
-            'inlining',
-            'include_path',
-            'il_verifiable',
-            'exclude',
-            'exception_trace',
-            'dynamic_runtime',
-            'dotnet_naming_convention',
-            'disabled_debug',
-            'default',
-            'debug',
-            'dead_code_removal',
-            'console_application',
-            'cluster',
-            'cls_compliant',
-            'check_vape',
-            'assertion',
-            'array_optimization',
-            'all',
-            'address_expression'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', '|', ':',
-        '(', ')', '{', '}', '[', ']', '#'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => true,
-        5 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF; font-weight: bold;',
-            2 => 'color: #0600FF; font-weight: bold;',
-            3 => 'color: #800080;',
-            4 => 'color: #800000',
-            5 => 'color: #603000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            'MULTI' => ''
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #005070; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0080A0;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #000060;',
-            2 => 'color: #000050;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #600000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => 'http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+{FNAMEL}&amp;btnI=I%27m+Feeling+Lucky',
-        5 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/email.php b/inc/geshi/email.php
deleted file mode 100644
index 8a313d483..000000000
--- a/inc/geshi/email.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/*************************************************************************************
- * email.php
- * ---------------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2008/10/19
- *
- * Email (mbox \ eml \ RFC format) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/19 (1.0.8.1)
- *   -  First Release
- *
- * TODO (updated 2008/10/19)
- * -------------------------
- * * Better checks when a header field should be expected
- * * Fix the bound checks for kw groups 2 and 3, as well as rx group 1
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'eMail (mbox)',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'HTTP', 'SMTP', 'ASMTP', 'ESMTP'
-            ),
-        2 => array(
-            'Authentication-Results','Comment','Content-Description','Content-Type',
-            'Content-Disposition','Content-Transfer-Encoding','Delivered-To',
-            'Dkim-Signature','Domainkey-Signature','In-Reply-To','Message-Id',
-            'MIME-Version','OpenPGP','Received','Received-SPF','References',
-            'Reply-To', 'Resend-From','Resend-To','Return-Path','User-Agent'
-            ),
-        3 => array(
-            'Date','From','Sender','Subject','To','CC'
-            ),
-        4 => array(
-            'by', 'for', 'from', 'id', 'with'
-            )
-        ),
-    'SYMBOLS' => array(
-        ':', ';', '<', '>', '[', ']'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => false,
-        3 => false,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #800000; font-weight: bold;',
-            4 => 'font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            0 => 'color: #000040;',
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #0000FF;',
-            3 => 'color: #008000;',
-            4 => 'color: #0000FF; font-weight: bold;',
-            5 => 'font-weight: bold;',
-            6 => 'color: #400080;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        // Non-Standard-Header
-        1 => array(
-            GESHI_SEARCH => "(?<=\A\x20|\n)x-[a-z0-9\-]*(?=\s*:|\s*<)",
-            GESHI_REPLACE => "\\0",
-            GESHI_MODIFIERS => "smi",
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            ),
-        //Email-Adresses or Mail-IDs
-        2 => array(
-            GESHI_SEARCH => "\b(?<!\\/)(?P<q>\"?)[\w\.\-]+\k<q>@(?!-)[\w\-]+(?<!-)(?:(?:\.(?!-)[\w\-]+(?<!-))*)?",
-            GESHI_REPLACE => "\\0",
-            GESHI_MODIFIERS => "mi",
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            ),
-        //Date values in RFC format
-        3 => array(
-            GESHI_SEARCH => "\b(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s+\d\d?\s+" .
-                "(?:Jan|Feb|Mar|apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+" .
-                "\d{4}\s+\d\d?:\d\d:\d\d\s+[+\-]\d{4}(?:\s+\(\w+\))?",
-            GESHI_REPLACE => "\\0",
-            GESHI_MODIFIERS => "mi",
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            ),
-        //IP addresses
-        4 => array(
-            GESHI_SEARCH => "(?<=\s)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\s)|".
-                "(?<=\[)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\])|".
-                "(?<==)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=<)|".
-
-                "(?<=\s)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=\s)|".
-                "(?<=\[)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=\])|".
-                "(?<==)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=<)|".
-
-                "(?<=\s)\:(?:\:[a-f\d]{1,4})+(?=\s)|".
-                "(?<=\[)\:(?:\:[a-f\d]{1,4})+(?=\])|".
-                "(?<==)\:(?:\:[a-f\d]{1,4})+(?=<)|".
-
-                "(?<=\s)(?:[a-f\d]{1,4}\:)+\:(?=\s)|".
-                "(?<=\[)(?:[a-f\d]{1,4}\:)+\:(?=\])|".
-                "(?<==)(?:[a-f\d]{1,4}\:)+\:(?=<)",
-            GESHI_REPLACE => "\\0",
-            GESHI_MODIFIERS => "i",
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            ),
-        //Field-Assignments
-        5 => array(
-            GESHI_SEARCH => "(?<=\s)[A-Z0-9\-\.]+(?==(?:$|\s$|[^\s=]))",
-            GESHI_REPLACE => "\\0",
-            GESHI_MODIFIERS => "mi",
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            ),
-        //MIME type
-        6 => array(
-            GESHI_SEARCH => "(?<=\s)(?:audio|application|image|multipart|text|".
-                "video|x-[a-z0-9\-]+)\/[a-z0-9][a-z0-9\-]*(?=\s|<|$)",
-            GESHI_REPLACE => "\\0",
-            GESHI_MODIFIERS => "m",
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        0 => "/(?P<start>^)[A-Za-z][a-zA-Z0-9\-]*\s*:\s*(?:.|(?=\n\s)\n)*(?P<end>$)/m"
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
-                'DISALLOWED_AFTER' => '(?=\s*:)',
-            ),
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
-                'DISALLOWED_AFTER' => '(?=\s*:)',
-            ),
-            4 => array(
-                'DISALLOWED_BEFORE' => '(?<=\s)',
-                'DISALLOWED_AFTER' => '(?=\s|\b)',
-            )
-        ),
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'COMMENTS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/epc.php b/inc/geshi/epc.php
deleted file mode 100644
index c575c0c63..000000000
--- a/inc/geshi/epc.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/*************************************************************************************
- * epc.php
- * --------
- * Author: Thorsten Muehlfelder (muehlfelder@enertex.de)
- * Copyright: (c) 2010 Enertex Bayern GmbH
- * Release Version: 1.0.8.11
- * Date Started: 2010/08/26
- *
- * Enerscript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/08/26 (1.0.8.10)
- *   -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'EPC',
-    'COMMENT_SINGLE' => array('//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //[Sections]
-        //1 => "/^\\[.*\\]/"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(
-        0 => '"',
-        1 => '$'
-        ),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'if', 'then', 'else', 'endif',
-            'and', 'or', 'xor', 'hysteresis'
-            ),
-        2 => array(
-            'read', 'write', 'event',
-            'gettime', 'settime', 'getdate', 'setdate', 'gettimedate', 'settimedate',
-            'hour', 'minute', 'second', 'changehour', 'changeminute', 'changesecond',
-            'date', 'month', 'day', 'dayofweek', 'sun', 'azimuth', 'elevation',
-            'sunrisehour', 'sunriseminute', 'sunsethour', 'sunsetminute',
-            'wtime', 'htime', 'mtime', 'stime',
-            'cwtime', 'chtime', 'cmtime', 'cstime',
-            'delay', 'after', 'cycle',
-            'readflash', 'writeflash',
-            'abs', 'acos', 'asin', 'atan', 'cos', 'ceil', 'average', 'exp', 'floor',
-            'log', 'max', 'min', 'mod', 'pow', 'sqrt', 'sin', 'tan', 'change', 'convert',
-            'eval', 'systemstart', 'random', 'comobject', 'sleep', 'scene', 'storescene', 'callscene',
-            'find', 'stringcast', 'stringset', 'stringformat', 'split', 'size',
-            'readrs232'. 'sendrs232', 'address', 'readknx',
-            'readudp', 'sendudp', 'connecttcp', 'closetcp', 'readtcp', 'sendtcp',
-            'resolve', 'sendmail',
-            'button', 'webbutton', 'chart', 'webchart', 'webdisplay', 'getslider', 'pshifter', 'mpshifter',
-            'getpslider', 'mbutton', 'mbbutton', 'mchart', 'mpchart', 'mpbutton', 'pdisplay', 'pchart',
-            'pbutton', 'setslider', 'setpslider', 'slider', 'pslider', 'page', 'line', 'header',
-            'footer', 'none', 'plink', 'link', 'frame', 'dframe'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '%', 'b01',
-            ),
-        1 => array(
-            '+', '-', '==', '>=', '=<',
-            ),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #e63ec3;',
-            2 => 'color: #e63ec3;'
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #0000ff;'
-            //1 => 'color: #ffa500;'
-            ),
-        'ESCAPE_CHAR' => array(
-            1 => 'color: #000099;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #8a0808;',
-            1 => 'color: #6e6e6e;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0b610b;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #0b610b;',
-            1 => 'color: #e63ec3;'
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #0b610b;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        // Numbers, e.g. 255u08
-        1 => "[0-9]*[subf][0136][12468]"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '$'
-        ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#])",
-            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%=\\/])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/erlang.php b/inc/geshi/erlang.php
deleted file mode 100644
index 4b8d406b0..000000000
--- a/inc/geshi/erlang.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-/*************************************************************************************
- * erlang.php
- * --------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Contributions:
- * - Uwe Dauernheim (uwe@dauernheim.net)
- * - Dan Forest-Barbier (dan@twisted.in)
- * Copyright: (c) 2008 Uwe Dauernheim (http://www.kreisquadratur.de/)
- * Release Version: 1.0.8.11
- * Date Started: 2008-09-27
- *
- * Erlang language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/05/02 (1.0.8.3)
- *  -  Now using 'PARSER_CONTROL' instead of huge rexgexps, better and cleaner
- *
- * 2009/04/26 (1.0.8.3)
- *  -  Only link to existing docs / Fixes
- *
- * 2008-09-28 (1.0.0.1)
- *   [!] Bug fixed with keyword module.
- *   [+] Added more function names
- *
- * 2008-09-27 (1.0.0)
- *   [ ] First Release
- *
- * TODO (updated 2008-09-27)
- * -------------------------
- *   [!] Stop ';' from being transformed to '<SEMI>'
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Erlang',
-    'COMMENT_SINGLE' => array(1 => '%'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("'", "\\"),
-    'HARDCHAR' => "\\",
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        //Control flow keywrods
-        1 => array(
-            'after', 'andalso', 'begin', 'case', 'catch', 'end', 'fun', 'if',
-            'of', 'orelse', 'receive', 'try', 'when', 'query'
-            ),
-        //Binary operators
-        2 => array(
-            'and', 'band', 'bnot', 'bor', 'bsl', 'bsr', 'bxor', 'div', 'not',
-            'or', 'rem', 'xor'
-            ),
-        3 => array(
-            'abs', 'alive', 'apply', 'atom_to_list', 'binary_to_list',
-            'binary_to_term', 'concat_binary', 'date', 'disconnect_node',
-            'element', 'erase', 'exit', 'float', 'float_to_list', 'get',
-            'get_keys', 'group_leader', 'halt', 'hd', 'integer_to_list',
-            'is_alive', 'length', 'link', 'list_to_atom', 'list_to_binary',
-            'list_to_float', 'list_to_integer', 'list_to_pid', 'list_to_tuple',
-            'load_module', 'make_ref', 'monitor_node', 'node', 'nodes', 'now',
-            'open_port', 'pid_to_list', 'process_flag', 'process_info',
-            'process', 'put', 'register', 'registered', 'round', 'self',
-            'setelement', 'size', 'spawn', 'spawn_link', 'split_binary',
-            'statistics', 'term_to_binary', 'throw', 'time', 'tl', 'trunc',
-            'tuple_to_list', 'unlink', 'unregister', 'whereis'
-            ),
-        // Built-In Functions
-        4 => array(
-            'atom', 'binary', 'constant', 'function', 'integer', 'is_atom',
-            'is_binary', 'is_constant', 'is_function', 'is_integer', 'is_list',
-            'is_number', 'is_pid', 'is_reference', 'is_record', 'list',
-            'number', 'pid', 'ports', 'port_close', 'port_info', 'reference'
-            ),
-        // Erlang/OTP internal modules (scary one)
-        5 => array(
-            'alarm_handler', 'any', 'app', 'application', 'appmon', 'appup',
-            'array', 'asn1ct', 'asn1rt', 'auth', 'base64', 'beam_lib', 'c',
-            'calendar', 'code', 'common_test_app', 'compile', 'config',
-            'corba', 'corba_object', 'cosEventApp', 'CosEventChannelAdmin',
-            'CosEventChannelAdmin_ConsumerAdmin',
-            'CosEventChannelAdmin_EventChannel',
-            'CosEventChannelAdmin_ProxyPullConsumer',
-            'CosEventChannelAdmin_ProxyPullSupplier',
-            'CosEventChannelAdmin_ProxyPushConsumer',
-            'CosEventChannelAdmin_ProxyPushSupplier',
-            'CosEventChannelAdmin_SupplierAdmin', 'CosEventDomainAdmin',
-            'CosEventDomainAdmin_EventDomain',
-            'CosEventDomainAdmin_EventDomainFactory',
-            'cosEventDomainApp', 'CosFileTransfer_Directory',
-            'CosFileTransfer_File', 'CosFileTransfer_FileIterator',
-            'CosFileTransfer_FileTransferSession',
-            'CosFileTransfer_VirtualFileSystem',
-            'cosFileTransferApp', 'CosNaming', 'CosNaming_BindingIterator',
-            'CosNaming_NamingContext', 'CosNaming_NamingContextExt',
-            'CosNotification', 'CosNotification_AdminPropertiesAdmin',
-            'CosNotification_QoSAdmin', 'cosNotificationApp',
-            'CosNotifyChannelAdmin_ConsumerAdmin',
-            'CosNotifyChannelAdmin_EventChannel',
-            'CosNotifyChannelAdmin_EventChannelFactory',
-            'CosNotifyChannelAdmin_ProxyConsumer',
-            'CosNotifyChannelAdmin_ProxyPullConsumer',
-            'CosNotifyChannelAdmin_ProxyPullSupplier',
-            'CosNotifyChannelAdmin_ProxyPushConsumer',
-            'CosNotifyChannelAdmin_ProxyPushSupplier',
-            'CosNotifyChannelAdmin_ProxySupplier',
-            'CosNotifyChannelAdmin_SequenceProxyPullConsumer',
-            'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
-            'CosNotifyChannelAdmin_SequenceProxyPushConsumer',
-            'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
-            'CosNotifyChannelAdmin_StructuredProxyPullConsumer',
-            'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
-            'CosNotifyChannelAdmin_StructuredProxyPushConsumer',
-            'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
-            'CosNotifyChannelAdmin_SupplierAdmin',
-            'CosNotifyComm_NotifyPublish', 'CosNotifyComm_NotifySubscribe',
-            'CosNotifyFilter_Filter', 'CosNotifyFilter_FilterAdmin',
-            'CosNotifyFilter_FilterFactory', 'CosNotifyFilter_MappingFilter',
-            'cosProperty', 'CosPropertyService_PropertiesIterator',
-            'CosPropertyService_PropertyNamesIterator',
-            'CosPropertyService_PropertySet',
-            'CosPropertyService_PropertySetDef',
-            'CosPropertyService_PropertySetDefFactory',
-            'CosPropertyService_PropertySetFactory', 'cosTime',
-            'CosTime_TimeService', 'CosTime_TIO', 'CosTime_UTO',
-            'CosTimerEvent_TimerEventHandler',
-            'CosTimerEvent_TimerEventService', 'cosTransactions',
-            'CosTransactions_Control', 'CosTransactions_Coordinator',
-            'CosTransactions_RecoveryCoordinator', 'CosTransactions_Resource',
-            'CosTransactions_SubtransactionAwareResource',
-            'CosTransactions_Terminator', 'CosTransactions_TransactionFactory',
-            'cover', 'cprof', 'cpu_sup', 'crashdump', 'crypto', 'crypto_app',
-            'ct', 'ct_cover', 'ct_ftp', 'ct_master', 'ct_rpc', 'ct_snmp',
-            'ct_ssh', 'ct_telnet', 'dbg', 'debugger', 'dets', 'dialyzer',
-            'dict', 'digraph', 'digraph_utils', 'disk_log', 'disksup',
-            'docb_gen', 'docb_transform', 'docb_xml_check', 'docbuilder_app',
-            'driver_entry', 'edoc', 'edoc_doclet', 'edoc_extract',
-            'edoc_layout', 'edoc_lib', 'edoc_run', 'egd', 'ei', 'ei_connect',
-            'epmd', 'epp', 'epp_dodger', 'eprof', 'erl', 'erl_boot_server',
-            'erl_call', 'erl_comment_scan', 'erl_connect', 'erl_ddll',
-            'erl_driver', 'erl_error', 'erl_eterm', 'erl_eval',
-            'erl_expand_records', 'erl_format', 'erl_global', 'erl_id_trans',
-            'erl_internal', 'erl_lint', 'erl_malloc', 'erl_marshal',
-            'erl_parse', 'erl_pp', 'erl_prettypr', 'erl_prim_loader',
-            'erl_prim_loader_stub', 'erl_recomment', 'erl_scan',
-            'erl_set_memory_block', 'erl_syntax', 'erl_syntax_lib', 'erl_tar',
-            'erl_tidy', 'erlang', 'erlang_mode', 'erlang_stub', 'erlc',
-            'erlsrv', 'error_handler', 'error_logger', 'erts_alloc',
-            'erts_alloc_config', 'escript', 'et', 'et_collector',
-            'et_selector', 'et_viewer', 'etop', 'ets', 'eunit', 'file',
-            'file_sorter', 'filelib', 'filename', 'fixed', 'fprof', 'ftp',
-            'gb_sets', 'gb_trees', 'gen_event', 'gen_fsm', 'gen_sctp',
-            'gen_server', 'gen_tcp', 'gen_udp', 'gl', 'global', 'global_group',
-            'glu', 'gs', 'heart', 'http', 'httpd', 'httpd_conf',
-            'httpd_socket', 'httpd_util', 'i', 'ic', 'ic_c_protocol',
-            'ic_clib', 'igor', 'inet', 'inets', 'init', 'init_stub',
-            'instrument', 'int', 'interceptors', 'inviso', 'inviso_as_lib',
-            'inviso_lfm', 'inviso_lfm_tpfreader', 'inviso_rt',
-            'inviso_rt_meta', 'io', 'io_lib', 'kernel_app', 'lib', 'lists',
-            'lname', 'lname_component', 'log_mf_h', 'make', 'math', 'megaco',
-            'megaco_codec_meas', 'megaco_codec_transform',
-            'megaco_edist_compress', 'megaco_encoder', 'megaco_flex_scanner',
-            'megaco_tcp', 'megaco_transport', 'megaco_udp', 'megaco_user',
-            'memsup', 'mnesia', 'mnesia_frag_hash', 'mnesia_registry',
-            'mod_alias', 'mod_auth', 'mod_esi', 'mod_security',
-            'Module_Interface', 'ms_transform', 'net_adm', 'net_kernel',
-            'new_ssl', 'nteventlog', 'observer_app', 'odbc', 'orber',
-            'orber_acl', 'orber_diagnostics', 'orber_ifr', 'orber_tc',
-            'orddict', 'ordsets', 'os', 'os_mon', 'os_mon_mib', 'os_sup',
-            'otp_mib', 'overload', 'packages', 'percept', 'percept_profile',
-            'pg', 'pg2', 'pman', 'pool', 'prettypr', 'proc_lib', 'proplists',
-            'public_key', 'qlc', 'queue', 'random', 'rb', 're', 'regexp',
-            'registry', 'rel', 'release_handler', 'reltool', 'relup', 'rpc',
-            'run_erl', 'run_test', 'runtime_tools_app', 'sasl_app', 'script',
-            'seq_trace', 'sets', 'shell', 'shell_default', 'slave', 'snmp',
-            'snmp_app', 'snmp_community_mib', 'snmp_framework_mib',
-            'snmp_generic', 'snmp_index', 'snmp_notification_mib', 'snmp_pdus',
-            'snmp_standard_mib', 'snmp_target_mib', 'snmp_user_based_sm_mib',
-            'snmp_view_based_acm_mib', 'snmpa', 'snmpa_conf', 'snmpa_error',
-            'snmpa_error_io', 'snmpa_error_logger', 'snmpa_error_report',
-            'snmpa_local_db', 'snmpa_mpd', 'snmpa_network_interface',
-            'snmpa_network_interface_filter',
-            'snmpa_notification_delivery_info_receiver',
-            'snmpa_notification_filter', 'snmpa_supervisor', 'snmpc', 'snmpm',
-            'snmpm_conf', 'snmpm_mpd', 'snmpm_network_interface', 'snmpm_user',
-            'sofs', 'ssh', 'ssh_channel', 'ssh_connection', 'ssh_sftp',
-            'ssh_sftpd', 'ssl', 'ssl_app', 'ssl_pkix', 'start', 'start_erl',
-            'start_webtool', 'stdlib_app', 'string', 'supervisor',
-            'supervisor_bridge', 'sys', 'systools', 'tags', 'test_server',
-            'test_server_app', 'test_server_ctrl', 'tftp', 'timer', 'toolbar',
-            'ttb', 'tv', 'unicode', 'unix_telnet', 'user', 'webtool', 'werl',
-            'win32reg', 'wrap_log_reader', 'wx', 'wx_misc', 'wx_object',
-            'wxAcceleratorEntry', 'wxAcceleratorTable', 'wxArtProvider',
-            'wxAuiDockArt', 'wxAuiManager', 'wxAuiNotebook', 'wxAuiPaneInfo',
-            'wxAuiTabArt', 'wxBitmap', 'wxBitmapButton', 'wxBitmapDataObject',
-            'wxBoxSizer', 'wxBrush', 'wxBufferedDC', 'wxBufferedPaintDC',
-            'wxButton', 'wxCalendarCtrl', 'wxCalendarDateAttr',
-            'wxCalendarEvent', 'wxCaret', 'wxCheckBox', 'wxCheckListBox',
-            'wxChildFocusEvent', 'wxChoice', 'wxClientDC', 'wxClipboard',
-            'wxCloseEvent', 'wxColourData', 'wxColourDialog',
-            'wxColourPickerCtrl', 'wxColourPickerEvent', 'wxComboBox',
-            'wxCommandEvent', 'wxContextMenuEvent', 'wxControl',
-            'wxControlWithItems', 'wxCursor', 'wxDataObject', 'wxDateEvent',
-            'wxDatePickerCtrl', 'wxDC', 'wxDialog', 'wxDirDialog',
-            'wxDirPickerCtrl', 'wxDisplayChangedEvent', 'wxEraseEvent',
-            'wxEvent', 'wxEvtHandler', 'wxFileDataObject', 'wxFileDialog',
-            'wxFileDirPickerEvent', 'wxFilePickerCtrl', 'wxFindReplaceData',
-            'wxFindReplaceDialog', 'wxFlexGridSizer', 'wxFocusEvent', 'wxFont',
-            'wxFontData', 'wxFontDialog', 'wxFontPickerCtrl',
-            'wxFontPickerEvent', 'wxFrame', 'wxGauge', 'wxGBSizerItem',
-            'wxGenericDirCtrl', 'wxGLCanvas', 'wxGraphicsBrush',
-            'wxGraphicsContext', 'wxGraphicsFont', 'wxGraphicsMatrix',
-            'wxGraphicsObject', 'wxGraphicsPath', 'wxGraphicsPen',
-            'wxGraphicsRenderer', 'wxGrid', 'wxGridBagSizer', 'wxGridCellAttr',
-            'wxGridCellEditor', 'wxGridCellRenderer', 'wxGridEvent',
-            'wxGridSizer', 'wxHelpEvent', 'wxHtmlEasyPrinting', 'wxIcon',
-            'wxIconBundle', 'wxIconizeEvent', 'wxIdleEvent', 'wxImage',
-            'wxImageList', 'wxJoystickEvent', 'wxKeyEvent',
-            'wxLayoutAlgorithm', 'wxListBox', 'wxListCtrl', 'wxListEvent',
-            'wxListItem', 'wxListView', 'wxMask', 'wxMaximizeEvent',
-            'wxMDIChildFrame', 'wxMDIClientWindow', 'wxMDIParentFrame',
-            'wxMemoryDC', 'wxMenu', 'wxMenuBar', 'wxMenuEvent', 'wxMenuItem',
-            'wxMessageDialog', 'wxMiniFrame', 'wxMirrorDC',
-            'wxMouseCaptureChangedEvent', 'wxMouseEvent', 'wxMoveEvent',
-            'wxMultiChoiceDialog', 'wxNavigationKeyEvent', 'wxNcPaintEvent',
-            'wxNotebook', 'wxNotebookEvent', 'wxNotifyEvent',
-            'wxPageSetupDialog', 'wxPageSetupDialogData', 'wxPaintDC',
-            'wxPaintEvent', 'wxPalette', 'wxPaletteChangedEvent', 'wxPanel',
-            'wxPasswordEntryDialog', 'wxPen', 'wxPickerBase', 'wxPostScriptDC',
-            'wxPreviewCanvas', 'wxPreviewControlBar', 'wxPreviewFrame',
-            'wxPrintData', 'wxPrintDialog', 'wxPrintDialogData', 'wxPrinter',
-            'wxPrintout', 'wxPrintPreview', 'wxProgressDialog',
-            'wxQueryNewPaletteEvent', 'wxRadioBox', 'wxRadioButton',
-            'wxRegion', 'wxSashEvent', 'wxSashLayoutWindow', 'wxSashWindow',
-            'wxScreenDC', 'wxScrollBar', 'wxScrolledWindow', 'wxScrollEvent',
-            'wxScrollWinEvent', 'wxSetCursorEvent', 'wxShowEvent',
-            'wxSingleChoiceDialog', 'wxSizeEvent', 'wxSizer', 'wxSizerFlags',
-            'wxSizerItem', 'wxSlider', 'wxSpinButton', 'wxSpinCtrl',
-            'wxSpinEvent', 'wxSplashScreen', 'wxSplitterEvent',
-            'wxSplitterWindow', 'wxStaticBitmap', 'wxStaticBox',
-            'wxStaticBoxSizer', 'wxStaticLine', 'wxStaticText', 'wxStatusBar',
-            'wxStdDialogButtonSizer', 'wxStyledTextCtrl', 'wxStyledTextEvent',
-            'wxSysColourChangedEvent', 'wxTextAttr', 'wxTextCtrl',
-            'wxTextDataObject', 'wxTextEntryDialog', 'wxToggleButton',
-            'wxToolBar', 'wxToolTip', 'wxTopLevelWindow', 'wxTreeCtrl',
-            'wxTreeEvent', 'wxUpdateUIEvent', 'wxWindow', 'wxWindowCreateEvent',
-            'wxWindowDC', 'wxWindowDestroyEvent', 'wxXmlResource', 'xmerl',
-            'xmerl_eventp', 'xmerl_scan', 'xmerl_xpath', 'xmerl_xs',
-            'xmerl_xsd', 'xref', 'yecc', 'zip', 'zlib', 'zlib_stub'
-            ),
-        // Binary modifiers
-        6 => array(
-            'big', 'binary', 'float', 'integer', 'little', 'signed', 'unit', 'unsigned'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '[', ']', '{', '}'),
-        1 => array('->', ',', ';', '.'),
-        2 => array('<<', '>>'),
-        3 => array('=', '||', '-', '+', '*', '/', '++', '--', '!', '<', '>', '>=',
-                    '=<', '==', '/=', '=:=', '=/=')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #186895;',
-            2 => 'color: #014ea4;',
-            3 => 'color: #fa6fff;',
-            4 => 'color: #fa6fff;',
-            5 => 'color: #ff4e18;',
-            6 => 'color: #9d4f37;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #109ab8;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff7800;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff9600;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #004866;',
-            1 => 'color: #6bb810;',
-            2 => 'color: #ee3800;',
-            3 => 'color: #014ea4;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #6941fd;',
-            1 => 'color: #d400ed;',
-            2 => 'color: #5400b3;',
-            3 => 'color: #ff3c00;',
-            4 => 'color: #6941fd;',
-            5 => 'color: #45b3e6;',
-            6 => 'color: #ff9600;',
-            7 => 'color: #d400ed;',
-            8 => 'color: #ff9600;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => 'http://erlang.org/doc/man/{FNAME}.html',
-        6 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '-&gt;',
-        2 => ':'
-        ),
-    'REGEXPS' => array(
-        //�Macro definitions
-        0 => array(
-            GESHI_SEARCH => '(-define\s*\()([a-zA-Z0-9_]+)(\(|,)',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
-            ),
-        // Record definitions
-        1 => array(
-            GESHI_SEARCH => '(-record\s*\()([a-zA-Z0-9_]+)(,)',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
-            ),
-        // Precompiler directives
-        2 => array(
-            GESHI_SEARCH => '(-)([a-z][a-zA-Z0-9_]*)(\()',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
-            ),
-        // Functions
-        3 => array(
-            GESHI_SEARCH => '([a-z]\w*|\'\w*\')(\s*\()',
-            GESHI_REPLACE => '\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\2'
-            ),
-        // Macros
-        4 => array(
-            GESHI_SEARCH => '(\?)([a-zA-Z0-9_]+)',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => ''
-            ),
-        // Variables - With hack to avoid interfering wish GeSHi internals
-        5 => array(
-            GESHI_SEARCH => '([([{,<+*-\/=\s!]|&lt;)(?!(?:PIPE|SEMI|DOT|NUM|REG3XP\d*)\W)([A-Z_]\w*)(?!\w)',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => ''
-            ),
-        // ASCII�codes
-        6 => '(\$[a-zA-Z0-9_])',
-        // Records
-        7 => array(
-            GESHI_SEARCH => '(#)([a-z][a-zA-Z0-9_]*)(\.|\{)',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
-            ),
-        // Numbers with a different radix
-        8 => '(?<=>)(#[a-zA-Z0-9]*)'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<![\w])',
-                'DISALLOWED_AFTER' => ''//'(?=\s*\()'
-            ),
-            5 => array(
-                'DISALLOWED_BEFORE' => '(?<=\'|)',
-                'DISALLOWED_AFTER' => '(?=(\'|):)'
-            ),
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<=\/|-)',
-                'DISALLOWED_AFTER' => ''
-            )
-        )
-    ),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/euphoria.php b/inc/geshi/euphoria.php
deleted file mode 100644
index 7bbf88460..000000000
--- a/inc/geshi/euphoria.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/*************************************************************************************
- * euphoria.php
- * ---------------------------------
- * Author: Nicholas Koceja (nerketur@hotmail.com)
- * Copyright: (c) 2010 Nicholas Koceja
- * Release Version: 1.0.8.11
- * Date Started: 11/24/2010
- *
- * Euphoria language file for GeSHi.
- *
- * Author's note:  The colors are based off of the Euphoria Editor (ed.ex) colors.
- * Also, I added comments in places so I could remember a few things about Euphoria.
- *
- *
- * CHANGES
- * -------
- * <date-of-release> (1.0.8.9)
- *  -  First Release
- *
- * TODO (updated <date-of-release>)
- * -------------------------
- * seperate the funtions from the procedures, and have a slight color change for each.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Euphoria',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array(), //Euphoria doesn't support multi-line comments
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array( // keywords
-            'and', 'by', 'constant', 'do', 'else', 'elsif', 'end', 'exit',
-            'for', 'function', 'global', 'if', 'include', 'not', 'or',
-            'procedure', 'return', 'then', 'to', 'type', 'while', 'with',
-            'without', 'xor'
-            ),
-        2 => array( // built-ins
-            'abort', 'and_bits', 'append', 'arctan', 'atom', 'c_func', 'call',
-            'c_proc', 'call_func', 'call_proc', 'clear_screen', 'close', 'compare',
-            'command_line', 'cos', 'date', 'equal', 'find', 'find_from', 'floor',
-            'getc', 'getenv', 'gets', 'get_key', 'get_pixel', 'integer', 'length',
-            'log', 'machine_func', 'machine_proc', 'match', 'match_from',
-            'mem_copy', 'mem_set', 'not_bits', 'object', 'open', 'or_bits', 'peek',
-            'peek4s', 'peek4u', 'pixel', 'platform', 'poke', 'poke4', 'position',
-            'power', 'prepend', 'print', 'printf', 'profile', 'puts', 'rand',
-            'remainder', 'repeat', 'routine_id', 'sequence', 'sin', 'sprintf',
-            'sqrt', 'system', 'system_exec', 'tan', 'task_clock_stop',
-            'task_clock_start', 'task_create', 'task_list', 'task_schedule',
-            'task_self', 'task_status', 'task_suspend', 'task_yield', 'time',
-            'trace', 'xor_bits'
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '(', ')', '{', '}', '[', ']'
-            ),
-        1 => array(
-            '+', '-', '*', '/', '=', '&', '^'
-            ),
-        2 => array(
-            '&', '?', ','
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff; font-weight: bold;', // keywords
-            2 => 'color: #cc33ff; font-weight: bold;', // builtins
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #ff0000; font-style: italic;',
-            'MULTI' => '' // doesn't exist
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #009900; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #999900; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #00cc00;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc33cc; font-style: italic'
-            ),
-        'METHODS' => array( // Doesn't exist in Euphoria.  Everything is a function =)
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #999900;', // brackets
-            1 => 'color: #333333;', // operators
-            2 => 'color: #333333; font-style: bold' // print+concat
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array( // Never included in scripts.
-            )
-        ),
-    'REGEXPS' => array(
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/f1.php b/inc/geshi/f1.php
deleted file mode 100644
index 7d7676085..000000000
--- a/inc/geshi/f1.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/*************************************************************************************
- * f1.php
- * -------
- * Author: Juro Bystricky (juro@f1compiler.com)
- * Copyright: K2 Software Corp.
- * Release Version: 1.0.8.11
- * Date Started: 2010/07/06
- *
- * Formula One language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/06 (1.0.8.9)
- *  -  First Release
- *
- * TODO
- * -------------------------
- *  -  Add more RTL functions with URLs
- *
- *************************************************************************************
- *
- * This file is part of GeSHi.
- *
- * GeSHi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GeSHi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GeSHi; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Formula One',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('{' => '}'),
-    'COMMENT_REGEXP' => array(
-        //Nested Comments
-        2 =>  "/(\{(?:\{.*\}|[^\{])*\})/m"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'",'"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\nrt\'\"?\n]#i",
-        //Hexadecimal Char Specs (Utf16 codes, Unicode versions only)
-        2 => "#\\\\u[\da-fA-F]{4}#",
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE |
-        GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX_0O |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'pred','proc','subr','else','elsif','iff','if','then','false','true',
-            'case','of','use','local','mod','end','list','file','all','one','max','min','rel',
-            'external','Nil','_stdcall','_cdecl','_addressof','_pred','_file','_line'
-            ),
-        2 => array(
-            'Ascii','Bin','I','L','P','R','S','U'
-            ),
-        3 => array(
-            'Append','in','Dupl','Len','Print','_AllDifferent','_AllAscending',
-            '_AllDescending','_Ascending','_Descending'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '[', ']'),
-        1 => array('<', '>','='),
-        2 => array('+', '-', '*', '/'),
-        3 => array('&', '|'),
-        4 => array(':', ';')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #000080;',
-            3 => 'color: #000080;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            2 => 'color: #008000; font-style: italic;',
-            'MULTI' => 'color: #008000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #009999; font-weight: bold;',
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #800000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;',
-            1 => 'color: #000000;',
-            2 => 'color: #000000;',
-            3 => 'color: #000000;',
-            4 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.f1compiler.com/f1helponline/f1_runtime_library.html#{FNAME}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/falcon.php b/inc/geshi/falcon.php
deleted file mode 100644
index 2111d9e8e..000000000
--- a/inc/geshi/falcon.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/*************************************************************************************
- * falcon.php
- * ---------------------------------
- * Author: billykater (billykater+geshi@gmail.com)
- * Copyright: (c) 2010 billykater (http://falconpl.org/)
- * Release Version: 1.0.8.11
- * Date Started: 2010/06/07
- *
- * Falcon language file for GeSHi.
- *
- * CHANGES
- * -------
- * <2010/8/1> (1.0.8.10)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Falcon',
-    'COMMENT_SINGLE' => array( 1 => '//' ),
-    'COMMENT_MULTI' => array( '/*' => '*/' ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array( "'", '"' ),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'break','case','catch','class','const','continue','def','default',
-            'dropping','elif','else','end','enum','for','forfirst','forlast',
-            'formiddle','from','function','global','if','init','innerfunc',
-            'launch','loop','object','raise','return','select','state','static',
-            'switch','try','while'
-        ),
-        2 => array(
-            'false','nil','true',
-        ),
-        3 => array(
-            'and','as','eq','fself','in','not','notin','or','provides','self','to'
-        ),
-        4 => array(
-            'directive','export','import','load','macro'
-        ),
-        5 => array(
-            'ArrayType','BooleanType','ClassMethodType','ClassType','DictionaryType',
-            'FunctionType','MemBufType','MethodType','NilType','NumericType','ObjectType',
-            'RangeType','StringType','LBindType'
-        ),
-        6 => array(
-            "CurrentTime","IOStream","InputStream","MemBufFromPtr","OutputStream",
-            "PageDict","ParseRFC2822","abs","acos","all",
-            "allp","any","anyp","argd","argv",
-            "arrayAdd","arrayBuffer","arrayCompact","arrayDel","arrayDelAll",
-            "arrayFill","arrayFind","arrayHead","arrayIns","arrayMerge",
-            "arrayNM","arrayRemove","arrayResize","arrayScan","arraySort",
-            "arrayTail","asin","assert","atan","atan2",
-            "attributes","baseClass","beginCritical","bless","brigade",
-            "broadcast","cascade","ceil","choice","chr",
-            "className","clone","combinations","compare","consume",
-            "cos","deg2rad","deoob","derivedFrom","describe",
-            "deserialize","dictBack","dictBest","dictClear","dictFill",
-            "dictFind","dictFront","dictGet","dictKeys","dictMerge",
-            "dictRemove","dictSet","dictValues","dirChange","dirCurrent",
-            "dirMake","dirMakeLink","dirReadLink","dirRemove","dolist",
-            "endCritical","epoch","eval","exit","exp",
-            "factorial","fileChgroup","fileChmod","fileChown","fileCopy",
-            "fileExt","fileMove","fileName","fileNameMerge","filePath",
-            "fileRemove","fileType","fileUnit","filter","fint",
-            "firstOf","floop","floor","fract","getAssert",
-            "getEnviron","getProperty","getSlot","getSystemEncoding","getenv",
-            "iff","include","input","inspect","int",
-            "isBound","isCallable","isoob","lbind","len",
-            "let","lit","log","map","max",
-            "metaclass","min","numeric","oob","ord",
-            "paramCount","paramIsRef","paramSet","parameter","passvp",
-            "permutations","pow","print","printl","properties",
-            "rad2deg","random","randomChoice","randomDice","randomGrab",
-            "randomPick","randomSeed","randomWalk","readURI","reduce",
-            "retract","round","seconds","serialize","set",
-            "setProperty","setenv","sin","sleep","stdErr",
-            "stdErrRaw","stdIn","stdInRaw","stdOut","stdOutRaw",
-            "strBack","strBackFind","strBackTrim","strBuffer","strCmpIgnoreCase",
-            "strEndsWith","strEscape","strEsq","strFill","strFind",
-            "strFromMemBuf","strFront","strFrontTrim","strLower","strMerge",
-            "strReplace","strReplicate","strSplit","strSplitTrimmed","strStartsWith",
-            "strToMemBuf","strTrim","strUnescape","strUnesq","strUpper",
-            "strWildcardMatch","subscribe","systemErrorDescription","tan","times",
-            "toString","transcodeFrom","transcodeTo","typeOf","unsetenv",
-            "unsubscribe","valof","vmFalconPath","vmIsMain","vmModuleName",
-            "vmModuleVersionInfo","vmSearchPath","vmSystemType","vmVersionInfo","vmVersionName",
-            "writeURI","xmap","yield","yieldOut"
-        ),
-        7 => array(
-            "AccessError","Array","BOM","Base64","Class",
-            "ClassMethod","CloneError","CmdlineParser","CodeError","Continuation",
-            "Dictionary","Directory","Error","FileStat","Format",
-            "Function","GarbagePointer","GenericError","Integer","InterruptedError",
-            "IoError","Iterator","LateBinding","List","MathError",
-            "MemoryBuffer","MessageError","Method","Numeric","Object",
-            "ParamError","ParseError","Path","Range","Semaphore",
-            "Sequence","Set","Stream","String","StringStream",
-            "SyntaxError","Table","TableError","TimeStamp","TimeZone",
-            "Tokenizer","TypeError","URI","VMSlot"
-        ),
-        8 => array(
-            "args","scriptName","scriptPath"
-        ),
-        9 => array(
-            "GC"
-        ),
-    ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => 'http://falconpl.org/project_docs/core/functions.html#typeOf',
-        6 => 'http://falconpl.org/project_docs/core/functions.html#{FNAME}',
-        7 => 'http://falconpl.org/project_docs/core/class_{FNAME}.html',
-        8 => 'http://falconpl.org/project_docs/core/globals.html#{FNAME}',
-        9 => 'http://falconpl.org/project_docs/core/object_{FNAME}.html)'
-    ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true
-    ),
-    'SYMBOLS' => array(
-        '(',')','$','%','&','/','{','[',']','=','}','?','+','-','#','*','@',
-        '<','>','|',',',':',';','\\','^'
-    ),
-    'REGEXPS' => array(
-        0 => array(
-            GESHI_SEARCH => '(\[)([a-zA-Z_]|\c{C})(?:[a-zA-Z0-9_]|\p{C})*(\])',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3',
-
-        ),
-    ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array( '<?' => '?>' )
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true
-    ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080;font-weight:bold;',
-            2 => 'color: #800000;font-weight:bold;',
-            3 => 'color: #800000;font-weight:bold;',
-            4 => 'color: #000080;font-weight:bold;',
-            5 => 'color: #000000;font-weight:bold;',
-            6 => 'font-weight:bold;',
-            7 => 'font-weight:bold;',
-            8 => 'font-weight:bold;'
-        ),
-        'COMMENTS' => array(
-            1 => 'color: #29B900;',
-            'MULTI' => 'color: #008080'
-        ),
-        'STRINGS' => array(
-            0 => 'color: #800000'
-        ),
-        'BRACKETS' => array(
-            0 => 'color: #000000'
-        ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #800000'
-        ),
-        'NUMBERS' => array(
-            0 => 'color: #000000'
-        ),
-        'METHODS' => array(
-            0 => 'color: #000000'
-        ),
-        'SYMBOLS' => array(
-            0 => 'color: #8B0513'
-        ),
-        'SCRIPT' => array(
-            0 => ''
-        ),
-        'REGEXPS' => array(
-            0 => 'color: #FF00FF'
-        )
-    ),
-
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        '.'
-    )
-);
-?>
\ No newline at end of file
diff --git a/inc/geshi/fo.php b/inc/geshi/fo.php
deleted file mode 100644
index ba4a59244..000000000
--- a/inc/geshi/fo.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/*************************************************************************************
- * fo.php
- * --------
- * Author: Tan-Vinh Nguyen (tvnguyen@web.de)
- * Copyright: (c) 2009 Tan-Vinh Nguyen
- * Release Version: 1.0.8.11
- * Date Started: 2009/03/23
- *
- * fo language file for GeSHi.
- *
- * FO stands for "Flexible Oberflaechen" (Flexible Surfaces) and
- * is part of the abas-ERP.
- *
- * CHANGES
- * -------
- * 2009/03/23 (1.0.0)
- *   -  First Release
- *      Basic commands in German and English
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'FO (abas-ERP)',
-    'COMMENT_SINGLE' => array(1 => '..'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        //Control Flow
-        1 => array(
-            /* see http://www.abas.de/sub_de/kunden/help/hd/html/9.html */
-
-            /* fo keywords, part 1: control flow */
-            '.weiter', '.continue'
-
-            /* this language works with goto's only*/
-            ),
-
-        //FO Keywords
-        2 => array(
-            /* fo keywords, part 2 */
-            '.fo', '.formel', '.formula',
-            '.zuweisen', '.assign',
-            '.fehler', '.error',
-            '.ende', '.end'
-            ),
-
-        //Java Keywords
-        3 => array(
-            /* Java keywords, part 3: primitive data types */
-            '.art', '.type',
-            'integer', 'real', 'bool', 'text', 'datum', 'woche', 'termin', 'zeit',
-            'mehr', 'MEHR'
-            ),
-
-        //Reserved words in fo literals
-        4 => array(
-            /* other reserved words in fo literals */
-            /* should be styled to look similar to numbers and Strings */
-            'false', 'null', 'true',
-            'OBJEKT',
-            'VORGANG', 'PROCESS',
-            'OFFEN', 'OPEN',
-            'ABORT',
-            'AN', 'ADDEDTO',
-            'AUF', 'NEW',
-            'BILDSCHIRM', 'TERMINAL',
-            'PC',
-            'MASKE', 'SCREEN',
-            'ZEILE', 'LINE'
-            ),
-
-        // interpreter settings
-        5 => array (
-            '..!INTERPRETER', 'DEBUG'
-            ),
-
-        // database commands
-        6 => array (
-            '.hole', '.hol', '.select',
-            '.lade', '.load',
-            '.aktion', '.action',
-            '.belegen', '.occupy',
-            '.bringe', '.rewrite',
-            '.dazu', '.add',
-            '.löschen', '.delete',
-            '.mache', '.make',
-            '.merke', '.reserve',
-            '.setze', '.set',
-            'SPERREN', 'LOCK',
-            'TEIL', 'PART',
-            'KEINESPERRE',
-            'AMASKE', 'ASCREEN',
-            'BETRIEB', 'WORK-ORDER',
-            'NUMERISCH', 'NUMERICAL',
-            'VORSCHLAG', 'SUGGESTION',
-            'OBLIGO', 'OUTSTANDING',
-            'LISTE', 'LIST',
-            'DRUCK', 'PRINT',
-            'ÜBERNAHME', 'TAGEOVER',
-            'ABLAGE', 'FILINGSYSTEM',
-            'BDE', 'PDC',
-            'BINDUNG', 'ALLOCATION',
-            'BUCHUNG', 'ENTRY',
-            'COLLI', 'SERIAL',
-            'DATEI', 'FILE',
-            'VERKAUF', 'SALES',
-            'EINKAUF', 'PURCHASING',
-            'EXEMPLAR', 'EXAMPLE',
-            'FERTIGUNG', 'PRODUCTION',
-            'FIFO',
-            'GRUPPE', 'GROUP',
-            'JAHR', 'YEAR',
-            'JOURNAL',
-            'KOPF', 'HEADER',
-            'KOSTEN',
-            'LIFO',
-            'LMENGE', 'SQUANTITY',
-            'LOHNFERTIGUNG', 'SUBCONTRACTING',
-            'LPLATZ', 'LOCATION',
-            'MBELEGUNG', 'MACHLOADING',
-            'MONAT', 'MONTH', 'MZ',
-            'NACHRICHT', 'MESSAGE',
-            'PLAN', 'TARGET',
-            'REGIONEN', 'REGIONS',
-            'SERVICEANFRAGE', 'SERVICEREQUEST',
-            'VERWENDUNG', 'APPLICATION',
-            'WEITER', 'CONTINUE',
-            'ABBRUCH', 'CANCEL',
-            'ABLAGEKENNZEICHEN', 'FILLINGCODE',
-            'ALLEIN', 'SINGLEUSER',
-            'AUFZAEHLTYP', 'ENUMERATION-TYPE',
-            'AUSGABE', 'OUTPUT',
-            'DEZPUNKT', 'DECPOINT'
-            ),
-
-        // output settings
-        7 => array (
-            '.absatz', '.para',
-            '.blocksatz', '.justified',
-            '.flattersatz', '.unjustified',
-            '.format',
-            '.box',
-            '.drucken', '.print',
-            '.gedruckt', '.printed',
-            '.länge', '.length',
-            '.links', '.left',
-            '.rechts', '.right',
-            '.oben', '.up',
-            '.unten', '.down',
-            '.seite', '.page',
-            '.tabellensatz', '.tablerecord',
-            '.trenner', '.separator',
-            'ARCHIV'
-            ),
-
-        // text commands
-        8 => array (
-            '.text',
-            '.atext',
-            '.println',
-            '.uebersetzen', '.translate'
-            ),
-
-        // I/O commands
-        9 => array (
-            '.aus', '.ausgabe', '.output',
-            '.ein', '.eingabe', '.input',
-            '.datei', '.file',
-            '.lesen', '.read',
-            '.sortiere', '.sort',
-            '-ÖFFNEN', '-OPEN',
-            '-TEST',
-            '-LESEN', '-READ',
-            'VON', 'FROM'
-            ),
-
-        //system
-        10 => array (
-            '.browser',
-            '.kommando', '.command',
-            '.system', '.dde',
-            '.editiere', '.edit',
-            '.hilfe', '.help',
-            '.kopieren', '.copy',
-            '.pc.clip',
-            '.pc.copy',
-            '.pc.dll',
-            '.pc.exec',
-            '.pc.open',
-            'DIAGNOSE', 'ERRORREPORT',
-            'DOPPELPUNKT', 'COLON',
-            'ERSETZUNG', 'REPLACEMENT',
-            'WARTEN', 'PARALLEL'
-            ),
-
-        //fibu/accounting specific commands
-        11 => array (
-            '.budget',
-            '.chart',
-            'VKZ',
-            'KONTO', 'ACCOUNT',
-            'AUSZUG', 'STATEMENT',
-            'WAEHRUNG', 'CURRENCY',
-            'WAEHRUNGSKURS', 'EXCHANGERATE',
-            'AUSWAEHR', 'FORCURR',
-            'BUCHUNGSKREIS', 'SET OF BOOKS'
-            ),
-
-        // efop - extended flexible surface
-        12 => array (
-            '.cursor',
-            '.farbe', '.colour',
-            '.fenster', '.window',
-            '.hinweis', '.note',
-            '.menue', '.menu',
-            '.schutz', '.protection',
-            '.zeigen', '.view',
-            '.zeile', '.line',
-            'VORDERGRUND', 'FOREGROUND',
-            'HINTERGRUND', 'BACKGROUND',
-            'SOFORT', 'IMMEDIATELY',
-            'AKTUALISIEREN', 'UPDATE',
-            'FENSTERSCHLIESSEN', 'CLOSEWINDOWS'
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '[', ']', '{', '}', '*', '&', '%', ';', '<', '>'),
-        1 => array('?', '!')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        /* all fo keywords are case sensitive, don't have to but I like this type of coding */
-        1 => true, 2 => true, 3 => true, 4 => true,
-        5 => true, 6 => true, 7 => true, 8 => true, 9 => true,
-        10 => true, 11 => true, 12 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #006600; font-weight: bold;',
-            4 => 'color: #006600; font-weight: bold;',
-            5 => 'color: #003399; font-weight: bold;',
-            6 => 'color: #003399; font-weight: bold;',
-            7 => 'color: #003399; font-weight: bold;',
-            8 => 'color: #003399; font-weight: bold;',
-            9 => 'color: #003399; font-weight: bold;',
-            10 => 'color: #003399; font-weight: bold;',
-            11 => 'color: #003399; font-weight: bold;',
-            12 => 'color: #003399; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            //2 => 'color: #006699;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006633;',
-            2 => 'color: #006633;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            1 => 'color: #000000; font-weight: bold;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        9 => '',
-        10 => '',
-        11 => '',
-        12 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-?>
\ No newline at end of file
diff --git a/inc/geshi/fortran.php b/inc/geshi/fortran.php
deleted file mode 100644
index c21ccd192..000000000
--- a/inc/geshi/fortran.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/*************************************************************************************
- * fortran.php
- * -----------
- * Author: Cedric Arrabie (cedric.arrabie@univ-pau.fr)
- * Copyright: (C) 2006 Cetric Arrabie
- * Release Version: 1.0.8.11
- * Date Started: 2006/04/22
- *
- * Fortran language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2006/04/20 (1.0.0)
- *   -  First Release
- *
- * TODO
- * -------------------------
- *  -  Get a list of inbuilt functions to add (and explore fortran more
- *     to complete this rather bare language file)
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME'=>'Fortran',
-    'COMMENT_SINGLE'=> array(1 =>'!',2=>'Cf2py'),
-    'COMMENT_MULTI'=> array(),
-    //Fortran Comments
-    'COMMENT_REGEXP' => array(1 => '/^C.*?$/mi'),
-    'CASE_KEYWORDS'=> GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS'=> array("'",'"'),
-    'ESCAPE_CHAR'=>'\\',
-    'KEYWORDS'=> array(
-        1 => array(
-            'allocate','block','call','case','contains','continue','cycle','deallocate',
-            'default','do','else','elseif','elsewhere','end','enddo','endif','endwhere',
-            'entry','exit','function','go','goto','if','interface','module','nullify','only',
-            'operator','procedure','program','recursive','return','select','stop',
-            'subroutine','then','to','where','while',
-            'access','action','advance','blank','blocksize','carriagecontrol',
-            'delim','direct','eor','err','exist','file','flen','fmt','form','formatted',
-            'iostat','name','named','nextrec','nml','number','opened','pad','position',
-            'readwrite','recl','sequential','status','unformatted','unit'
-            ),
-        2 => array(
-            '.AND.','.EQ.','.EQV.','.GE.','.GT.','.LE.','.LT.','.NE.','.NEQV.','.NOT.',
-            '.OR.','.TRUE.','.FALSE.'
-            ),
-        3 => array(
-            'allocatable','character','common','complex','data','dimension','double',
-            'equivalence','external','implicit','in','inout','integer','intent','intrinsic',
-            'kind','logical','namelist','none','optional','out','parameter','pointer',
-            'private','public','real','result','save','sequence','target','type','use'
-            ),
-        4 => array(
-            'abs','achar','acos','adjustl','adjustr','aimag','aint','all','allocated',
-            'anint','any','asin','atan','atan2','bit_size','break','btest','carg',
-            'ceiling','char','cmplx','conjg','cos','cosh','cpu_time','count','cshift',
-            'date_and_time','dble','digits','dim','dot_product','dprod dvchk',
-            'eoshift','epsilon','error','exp','exponent','floor','flush','fraction',
-            'getcl','huge','iachar','iand','ibclr','ibits','ibset','ichar','ieor','index',
-            'int','intrup','invalop','ior','iostat_msg','ishft','ishftc','lbound',
-            'len','len_trim','lge','lgt','lle','llt','log','log10','matmul','max','maxexponent',
-            'maxloc','maxval','merge','min','minexponent','minloc','minval','mod','modulo',
-            'mvbits','nbreak','ndperr','ndpexc','nearest','nint','not','offset','ovefl',
-            'pack','precfill','precision','present','product','prompt','radix',
-            'random_number','random_seed','range','repeat','reshape','rrspacing',
-            'scale','scan','segment','selected_int_kind','selected_real_kind',
-            'set_exponent','shape','sign','sin','sinh','size','spacing','spread','sqrt',
-            'sum system','system_clock','tan','tanh','timer','tiny','transfer','transpose',
-            'trim','ubound','undfl','unpack','val','verify'
-            ),
-        ),
-    'SYMBOLS'=> array(
-        '(',')','{','}','[',']','=','+','-','*','/','!','%','^','&',':'
-        ),
-    'CASE_SENSITIVE'=> array(
-        GESHI_COMMENTS => true,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES'=> array(
-        'KEYWORDS'=> array(
-            1 =>'color: #b1b100;',
-            2 =>'color: #000000; font-weight: bold;',
-            3 =>'color: #000066;',
-            4 =>'color: #993333;'
-            ),
-        'COMMENTS'=> array(
-            1 =>'color: #666666; font-style: italic;',
-            2 =>'color: #339933;',
-            'MULTI'=>'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR'=> array(
-            0 =>'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS'=> array(
-            0 =>'color: #009900;'
-            ),
-        'STRINGS'=> array(
-            0 =>'color: #ff0000;'
-            ),
-        'NUMBERS'=> array(
-            0 =>'color: #cc66cc;'
-            ),
-        'METHODS'=> array(
-            1 =>'color: #202020;',
-            2 =>'color: #202020;'
-            ),
-        'SYMBOLS'=> array(
-            0 =>'color: #339933;'
-            ),
-        'REGEXPS'=> array(
-            ),
-        'SCRIPT'=> array(
-            )
-        ),
-    'URLS'=> array(
-        1 =>'',
-        2 =>'',
-        3 =>'',
-        4 =>''
-        ),
-    'OOLANG'=> true,
-    'OBJECT_SPLITTERS'=> array(
-        1 =>'.',
-        2 =>'::'
-        ),
-    'REGEXPS'=> array(
-        ),
-    'STRICT_MODE_APPLIES'=> GESHI_NEVER,
-    'SCRIPT_DELIMITERS'=> array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK'=> array(
-        )
-);
-
-?>
diff --git a/inc/geshi/freebasic.php b/inc/geshi/freebasic.php
deleted file mode 100644
index b23f39bc7..000000000
--- a/inc/geshi/freebasic.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/*************************************************************************************
- * freebasic.php
- * -------------
- * Author: Roberto Rossi
- * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.8.11
- * Date Started: 2005/08/19
- *
- * FreeBasic (http://www.freebasic.net/) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/08/19 (1.0.0)
- *  -  First Release
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'FreeBasic',
-    'COMMENT_SINGLE' => array(1 => "'", 2 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            "append", "as", "asc", "asin", "asm", "atan2", "atn", "beep", "bin", "binary", "bit",
-            "bitreset", "bitset", "bload", "bsave", "byref", "byte", "byval", "call",
-            "callocate", "case", "cbyte", "cdbl", "cdecl", "chain", "chdir", "chr", "cint",
-            "circle", "clear", "clng", "clngint", "close", "cls", "color", "command",
-            "common", "cons", "const", "continue", "cos", "cshort", "csign", "csng",
-            "csrlin", "cubyte", "cuint", "culngint", "cunsg", "curdir", "cushort", "custom",
-            "cvd", "cvi", "cvl", "cvlongint", "cvs", "cvshort", "data", "date",
-            "deallocate", "declare", "defbyte", "defdbl", "defined", "defint", "deflng",
-            "deflngint", "defshort", "defsng", "defstr", "defubyte", "defuint",
-            "defulngint", "defushort", "dim", "dir", "do", "double", "draw", "dylibload",
-            "dylibsymbol", "else", "elseif", "end", "enum", "environ", 'environ$', "eof",
-            "eqv", "erase", "err", "error", "exec", "exepath", "exit", "exp", "export",
-            "extern", "field", "fix", "flip", "for", "fre", "freefile", "function", "get",
-            "getjoystick", "getkey", "getmouse", "gosub", "goto", "hex", "hibyte", "hiword",
-            "if", "iif", "imagecreate", "imagedestroy", "imp", "inkey", "inp", "input",
-            "instr", "int", "integer", "is", "kill", "lbound", "lcase", "left", "len",
-            "let", "lib", "line", "lobyte", "loc", "local", "locate", "lock", "lof", "log",
-            "long", "longint", "loop", "loword", "lset", "ltrim", "mid", "mkd", "mkdir",
-            "mki", "mkl", "mklongint", "mks", "mkshort", "mod", "multikey", "mutexcreate",
-            "mutexdestroy", "mutexlock", "mutexunlock", "name", "next", "not", "oct", "on",
-            "once", "open", "option", "or", "out", "output", "overload", "paint", "palette",
-            "pascal", "pcopy", "peek", "peeki", "peeks", "pipe", "pmap", "point", "pointer",
-            "poke", "pokei", "pokes", "pos", "preserve", "preset", "print", "private",
-            "procptr", "pset", "ptr", "public", "put", "random", "randomize", "read",
-            "reallocate", "redim", "rem", "reset", "restore", "resume",
-            "return", "rgb", "rgba", "right", "rmdir", "rnd", "rset", "rtrim", "run",
-            "sadd", "screen", "screencopy", "screeninfo", "screenlock", "screenptr",
-            "screenres", "screenset", "screensync", "screenunlock", "seek", "statement",
-            "selectcase", "setdate", "setenviron", "setmouse",
-            "settime", "sgn", "shared", "shell", "shl", "short", "shr", "sin", "single",
-            "sizeof", "sleep", "space", "spc", "sqr", "static", "stdcall", "step", "stop",
-            "str", "string", "strptr", "sub", "swap", "system", "tab", "tan",
-            "then", "threadcreate", "threadwait", "time", "timer", "to", "trans",
-            "trim", "type", "ubound", "ubyte", "ucase", "uinteger", "ulongint", "union",
-            "unlock", "unsigned", "until", "ushort", "using", "va_arg", "va_first",
-            "va_next", "val", "val64", "valint", "varptr", "view", "viewprint", "wait",
-            "wend", "while", "width", "window", "windowtitle", "with", "write", "xor",
-            "zstring", "explicit", "escape", "true", "false"
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;',
-            2 => 'color: #339933;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/freeswitch.php b/inc/geshi/freeswitch.php
deleted file mode 100644
index c6fff2767..000000000
--- a/inc/geshi/freeswitch.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/*************************************************************************************
- * freeswitch.php
- * --------
- * Author: James Rose (james.gs@stubbornroses.com)
- * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1.0.8.11n/a
- * Date Started: 2011/11/18
- *
- * FreeSWITCH language file for GeSHi.
- *
- * This file is based on robots.php
- *
- * 2011/11/18 (1.0.0)
- *   -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'FreeSWITCH',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(1 => "/^Comment:.*?$/m"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-//        1 => array(
-//            'Disallow', 'Request-rate', 'Robot-version',
-//            'Sitemap', 'User-agent', 'Visit-time'
-//            )
-        ),
-    'SYMBOLS' => array(
-//        ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false
-        ),
-
-//order is important. regexes will overwrite most things....
-    'STYLES' => array(
-        'KEYWORDS' => array(
-//            1 => 'color: #FF0000; font-weight: bold;',//red
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-//            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-//            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-//            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-//            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: firebrick; font-weight: bold;',
-            1 => 'color: cornflowerblue; font-weight: bold;',
-            2 => 'color: goldenrod; font-weight: bold;',
-            3 => 'color: green; font-weight: bold;',
-            4 => 'color: dimgrey; font-style: italic;',
-            5 => 'color: green; font-weight: bold;',
-            6 => 'color: firebrick; font-weight: bold;',
-            7 => 'color: indigo; font-weight: italic;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-//        1 => 'http://www.robotstxt.org/wc/norobots.html'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => array(
-            GESHI_SEARCH => '(^.*ERROR.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        1 => array(
-            GESHI_SEARCH => '(^.*NOTICE.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        2 => array(
-            GESHI_SEARCH => '(^.*DEBUG.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        3 => array(
-            GESHI_SEARCH => '(^.*INFO.*|.*info\(.*|^Channel.*|^Caller.*|^variable.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        4 => array(
-            GESHI_SEARCH => '(^Dialplan.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        5 => array(
-            GESHI_SEARCH => '(Regex\ \(PASS\))',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        6 => array(
-            GESHI_SEARCH => '(Regex\ \(FAIL\))',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        7 => array(
-            GESHI_SEARCH => '(\d{7,15})',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            )
-        ),
-
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/fsharp.php b/inc/geshi/fsharp.php
deleted file mode 100644
index d85a7c757..000000000
--- a/inc/geshi/fsharp.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/*************************************************************************************
- * fsharp.php
- * ----------
- * Author: julien ortin (jo_spam-divers@yahoo.fr)
- * Copyright: (c) 2009 julien ortin
- * Release Version: 1.0.8.11
- * Date Started: 2009/09/20
- *
- * F# language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/09/22 (1.0.1)
- *  -  added rules for single char handling (generics ['a] vs char ['x'])
- *  -  added symbols and keywords
- * 2009/09/20 (1.0.0)
- *  -  Initial release
- *
- * TODO
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'F#',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(3 => '/\(\*(?!\)).*?\*\)/s'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'HARDQUOTE' => array('@"', '"'),
-    'HARDESCAPE' => array('"'),
-    'HARDCHAR' => '"',
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /* main F# keywords */
-        /* section 3.4 */
-        1 => array(
-            'abstract', 'and', 'as', 'assert', 'base', 'begin', 'class', 'default', 'delegate', 'do', 'done',
-            'downcast', 'downto', 'elif', 'else', 'end', 'exception', 'extern', 'false', 'finally', 'for',
-            'fun', 'function', 'if', 'in', 'inherit', 'inline', 'interface', 'internal', 'lazy', 'let',
-            'match', 'member', 'module', 'mutable', 'namespace', 'new', 'not', 'null', 'of', 'open', 'or',
-            'override', 'private', 'public', 'rec', 'return', 'sig', 'static', 'struct', 'then', 'to',
-            'true', 'try', 'type', 'upcast', 'use', 'val', 'void', 'when', 'while', 'with', 'yield',
-            'asr', 'land', 'lor', 'lsl', 'lsr', 'lxor', 'mod',
-            /* identifiers are reserved for future use by F# */
-            'atomic', 'break', 'checked', 'component', 'const', 'constraint', 'constructor',
-            'continue', 'eager', 'fixed', 'fori', 'functor', 'global', 'include', 'method', 'mixin',
-            'object', 'parallel', 'params', 'process', 'protected', 'pure', 'sealed', 'tailcall',
-            'trait', 'virtual', 'volatile',
-            /* take monads into account */
-            'let!', 'yield!'
-            ),
-        /* define names of main libraries in F# Core, so we can link to it
-         * http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/namespaces.html
-         */
-        2 => array(
-            'Array', 'Array2D', 'Array3D', 'Array4D', 'ComparisonIdentity', 'HashIdentity', 'List',
-            'Map', 'Seq', 'SequenceExpressionHelpers', 'Set', 'CommonExtensions', 'Event',
-            'ExtraTopLevelOperators', 'LanguagePrimitives', 'NumericLiterals', 'Operators',
-            'OptimizedClosures', 'Option', 'String', 'NativePtr', 'Printf'
-            ),
-        /* 17.2 & 17.3 */
-        3 => array(
-            'abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
-            'floor', 'log', 'log10', 'pown', 'round', 'sign', 'sin', 'sinh', 'sqrt',
-            'tan', 'tanh',
-            'ignore',
-            'fst', 'snd',
-            'stdin', 'stdout', 'stderr',
-            'KeyValue',
-            'max', 'min'
-            ),
-        /* Pervasives Types & Overloaded Conversion Functions */
-        4 => array(
-            'bool', 'byref', 'byte', 'char', 'decimal', 'double', 'exn', 'float', 'float32',
-            'FuncConvert', 'ilsigptr', 'int', 'int16', 'int32', 'int64', 'int8',
-            'nativeint', 'nativeptr', 'obj', 'option', 'ref', 'sbyte', 'single', 'string', 'uint16',
-            'uint32', 'uint64', 'uint8', 'unativeint', 'unit',
-            'enum',
-            'async', 'seq', 'dict'
-            ),
-        /* 17.2 Exceptions */
-        5 => array (
-            'failwith', 'invalidArg', 'raise', 'rethrow'
-            ),
-        /* 3.3 Conditional compilation & 13.3 Compiler Directives + light / light off */
-        6 => array(
-            '(*IF-FSHARP', 'ENDIF-FSHARP*)', '(*F#', 'F#*)', '(*IF-OCAML', 'ENDIF-OCAML*)',
-            '#light',
-            '#if', '#else', '#endif', '#indent', '#nowarn', '#r', '#reference',
-            '#I', '#Include', '#load', '#time', '#help', '#q', '#quit',
-            ),
-        /* 3.11 Pre-processor Declarations / Identifier Replacements */
-        7 => array(
-            '__SOURCE_DIRECTORY__', '__SOURCE_FILE__', '__LINE__'
-            ),
-        /* 17.2 Object Transformation Operators */
-        8 => array(
-            'box', 'hash', 'sizeof', 'typeof', 'typedefof', 'unbox'
-            )
-        ),
-    /* 17.2 basic operators + the yield and yield! arrows */
-    'SYMBOLS' => array(
-        1 => array('+', '-', '/', '*', '**', '%', '~-'),
-        2 => array('<', '<=', '>', '<=', '=', '<>'),
-        3 => array('<<<', '>>>', '^^^', '&&&', '|||', '~~~'),
-        4 => array('|>', '>>', '<|', '<<'),
-        5 => array('!', '->', '->>'),
-        6 => array('[',']','(',')','{','}', '[|', '|]', '(|', '|)'),
-        7 => array(':=', ';', ';;')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true, /* keywords */
-        2 => true, /* modules */
-        3 => true, /* pervasives functions */
-        4 => true, /* types and overloaded conversion operators */
-        5 => true, /* exceptions */
-        6 => true, /* conditional compilation & compiler Directives */
-        7 => true, /* pre-processor declarations / identifier replacements */
-        8 => true  /* object transformation operators */
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #06c; font-weight: bold;', /* nice blue */
-            2 => 'color: #06c; font-weight: bold;', /* nice blue */
-            3 => 'color: #06c; font-weight: bold;', /* nice blue */
-            4 => 'color: #06c; font-weight: bold;', /* nice blue */
-            5 => 'color: #06c; font-weight: bold;', /* nice blue */
-            6 => 'color: #06c; font-weight: bold;', /* nice blue */
-            7 => 'color: #06c; font-weight: bold;', /* nice blue */
-            8 => 'color: #06c; font-weight: bold;' /* nice blue */
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #5d478b; font-style: italic;', /* light purple */
-            1 => 'color: #5d478b; font-style: italic;',
-            2 => 'color: #5d478b; font-style: italic;', /* light purple */
-            3 => 'color: #5d478b; font-style: italic;' /* light purple */
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #6c6;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #3cb371;' /* nice green */
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #c6c;' /* pink */
-            ),
-        'METHODS' => array(
-            1 => 'color: #060;' /* dark green */
-            ),
-        'REGEXPS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #a52a2a;' /* maroon */
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        /* some of keywords are Pervasives functions (land, lxor, asr, ...) */
-        1 => '',
-        2 => 'http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/namespaces.html',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/gambas.php b/inc/geshi/gambas.php
deleted file mode 100644
index 352830ebb..000000000
--- a/inc/geshi/gambas.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/*************************************************************************************
- * gambas.php
- * ---------
- * Author: Jesus Guardon (jguardon@telefonica.net)
- * Copyright: (c) 2009 Jesus Guardon (http://gambas-es.org),
- *                     Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/20
- *
- * GAMBAS language file for GeSHi.
- * GAMBAS Official Site: http://gambas.sourceforge.net
- *
- * CHANGES
- * -------
- * 2009/09/26 (1.0.1)
- *  -  Splitted dollar-ended keywords in another group to match with or without '$'
- *  -  Modified URL for object/components keywords search through Google "I'm feeling lucky"
- * 2009/09/23 (1.0.0)
- *  -  Initial release
- *
- * TODO (updated 2009/09/26)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GAMBAS',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        //keywords
-        1 => array(
-            'APPEND', 'AS', 'BREAK', 'BYREF', 'CASE', 'CATCH', 'CLASS', 'CLOSE', 'CONST', 'CONTINUE', 'COPY',
-            'CREATE', 'DEBUG', 'DEC', 'DEFAULT', 'DIM', 'DO', 'EACH', 'ELSE', 'END', 'ENDIF', 'ERROR', 'EVENT', 'EXEC',
-            'EXPORT', 'EXTERN', 'FALSE', 'FINALLY', 'FLUSH', 'FOR', 'FUNCTION', 'GOTO', 'IF', 'IN', 'INC', 'INHERITS',
-            'INPUT', 'FROM', 'IS', 'KILL', 'LAST', 'LIBRARY', 'LIKE', 'LINE INPUT', 'LINK', 'LOCK', 'LOOP', 'ME',
-            'MKDIR', 'MOVE', 'NEW', 'NEXT', 'NULL', 'OPEN', 'OPTIONAL', 'OUTPUT', 'PIPE', 'PRINT', 'PRIVATE',
-            'PROCEDURE', 'PROPERTY', 'PUBLIC', 'QUIT', 'RAISE', 'RANDOMIZE', 'READ', 'REPEAT', 'RETURN', 'RMDIR',
-            'SEEK', 'SELECT', 'SHELL', 'SLEEP', 'STATIC', 'STEP', 'STOP', 'SUB', 'SUPER', 'SWAP', 'THEN', 'TO',
-            'TRUE', 'TRY', 'UNLOCK', 'UNTIL', 'WAIT', 'WATCH', 'WEND', 'WHILE', 'WITH', 'WRITE'
-            ),
-        //functions
-        2 => array(
-            'Abs', 'Access', 'Acos', 'Acosh', 'Alloc', 'Ang', 'Asc', 'ASin', 'ASinh', 'Asl', 'Asr', 'Assign', 'Atan',
-            'ATan2', 'ATanh',
-            'BChg', 'BClr', 'Bin', 'BSet', 'BTst',
-            'CBool', 'Cbr', 'CByte', 'CDate', 'CFloat', 'Choose', 'Chr', 'CInt', 'CLong', 'Comp', 'Conv', 'Cos',
-            'Cosh', 'CShort', 'CSng', 'CStr',
-            'DateAdd', 'DateDiff', 'Day', 'DConv', 'Deg', 'DFree', 'Dir',
-            'Eof', 'Eval', 'Exist', 'Exp', 'Exp10', 'Exp2', 'Expm',
-            'Fix', 'Format', 'Frac', 'Free',
-            'Hex', 'Hour', 'Hyp',
-            'Iif', 'InStr', 'Int', 'IsAscii', 'IsBlank', 'IsBoolean', 'IsByte', 'IsDate', 'IsDigit', 'IsDir',
-            'IsFloat', 'IsHexa', 'IsInteger', 'IsLCase', 'IsLetter', 'IsLong', 'IsNull', 'IsNumber', 'IsObject',
-            'IsPunct', 'IsShort', 'IsSingle', 'IsSpace', 'IsString', 'IsUCase', 'IsVariant',
-            'LCase', 'Left', 'Len', 'Lof', 'Log', 'Log10', 'Log2', 'Logp', 'Lsl', 'Lsr', 'LTrim',
-            'Mag', 'Max', 'Mid', 'Min', 'Minute', 'Month', 'Now', 'Quote',
-            'Rad', 'RDir', 'Realloc', 'Replace', 'Right', 'RInStr', 'Rnd', 'Rol', 'Ror', 'Round', 'RTrim',
-            'Scan', 'SConv', 'Second', 'Seek', 'Sgn', 'Shl', 'Shr', 'Sin', 'Sinh', 'Space', 'Split', 'Sqr',
-            'Stat', 'Str', 'StrPtr', 'Subst',
-            'Tan', 'Tanh', 'Temp$', 'Time', 'Timer', 'Tr', 'Trim', 'TypeOf',
-            'UCase', 'Unquote', 'Val', 'VarPtr', 'Week', 'WeekDay', 'Year'
-            ),
-        //string functions
-        3 => array(
-            'Bin$', 'Chr$', 'Conv$', 'DConv$', 'Format$', 'Hex$', 'LCase$', 'Left$', 'LTrim$', 'Mid$', 'Quote$',
-            'Replace$', 'Right$', 'SConv$', 'Space$', 'Str$', 'String$', 'Subst$', 'Tr$', 'Trim$', 'UCase$',
-            'Unquote$'
-            ),
-        //datatypes
-        4 => array(
-            'Boolean', 'Byte', 'Short', 'Integer', 'Long', 'Single', 'Float', 'Date', 'String', 'Variant', 'Object',
-            'Pointer', 'File'
-            ),
-        //operators
-        5 => array(
-            'AND', 'DIV', 'MOD', 'NOT', 'OR', 'XOR'
-            ),
-        //objects/classes
-        6 => array(
-            'Application', 'Array', 'Byte[]', 'Collection', 'Component', 'Enum', 'Observer', 'Param', 'Process',
-            'Stream', 'System', 'User', 'Chart', 'Compress', 'Crypt', 'Blob', 'Connection', 'DB', 'Database',
-            'DatabaseUser', 'Field', 'Index', 'Result', 'ResultField', 'Table', 'DataBrowser', 'DataCombo',
-            'DataControl', 'DataSource', 'DataView', 'Desktop', 'DesktopFile', 'Balloon', 'ColorButton',
-            'ColorChooser', 'DateChooser', 'DirChooser', 'DirView', 'Expander', 'FileChooser', 'FileView',
-            'FontChooser', 'InputBox', 'ListContainer', 'SidePanel', 'Stock', 'TableView', 'ToolPanel', 'ValueBox',
-            'Wizard', 'Dialog', 'ToolBar', 'WorkSpace', 'DnsClient', 'SerialPort', 'ServerSocket', 'Socket',
-            'UdpSocket', 'FtpClient', 'HttpClient', 'SmtpClient', 'Regexp', 'Action', 'Button', 'CheckBox',
-            'ColumnView', 'ComboBox', 'Draw', 'Container', 'Control', 'Cursor', 'DrawingArea', 'Embedder',
-            'Font', 'Form', 'Frame', 'GridView', 'HBox', 'HPanel', 'HSplit', 'IconView', 'Image', 'Key', 'Label',
-            'Line', 'ListBox', 'ListView', 'Menu', 'Message', 'Mouse', 'MovieBox', 'Panel', 'Picture', 'PictureBox',
-            'ProgressBar', 'RadioButton', 'ScrollBar', 'ScrollView', 'Separator', 'Slider', 'SpinBox', 'TabStrip',
-            'TextArea', 'TextBox', 'TextLabel', 'ToggleButton', 'TrayIcon', 'TreeView', 'VBox', 'VPanel', 'VSplit',
-            'Watcher', 'Window', 'Dial', 'Editor', 'LCDNumber', 'Printer', 'TextEdit', 'WebBrowser', 'GLarea',
-            'Report', 'ReportCloner', 'ReportContainer', 'ReportControl', 'ReportDrawing', 'ReportField', 'ReportHBox',
-            'ReportImage', 'ReportLabel', 'ReportSection', 'ReportSpecialField', 'ReportTextLabel', 'ReportVBox',
-            'CDRom', 'Channel', 'Music', 'Sound', 'Settings', 'VideoDevice', 'Vb', 'CGI', 'HTML', 'Request', 'Response',
-            'Session', 'XmlDocument', 'XmlNode', 'XmlReader', 'XmlReaderNodeType', 'XmlWriter', 'RpcArray', 'RpcClient',
-            'RpcFunction', 'RpcServer', 'RpcStruct', 'RpcType', 'XmlRpc', 'Xslt'
-            ),
-        //constants
-        7 => array(
-            'Pi'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '&', '&=', '&/', '*', '*=', '+', '+=', '-', '-=', '//', '/', '/=', '=', '==', '\\', '\\=',
-        '^', '^=', '[', ']', '{', '}', '<', '>', '<>', '<=', '>='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF; font-weight: bold;',          // Keywords
-            2 => 'color: #8B1433;',                             // Functions
-            3 => 'color: #8B1433;',                             // String Functions
-            4 => 'color: #0600FF;',                             // Data Types
-            5 => 'color: #1E90FF;',                             // Operators
-            6 => 'color: #0600FF;',                             // Objects/Components
-            7 => 'color: #0600FF;'                              // Constants
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #1A5B1A; font-style: italic;',
-            'MULTI' => 'color: #1A5B1A; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #612188;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7E4B05;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;',
-            GESHI_NUMBER_INT_BASIC => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #6132B2;'
-            ),
-        'REGEXPS' => array(
-            //3 => 'color: #8B1433;'  //fakes '$' colour matched by REGEXP
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
-        2 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
-        3 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:http://gambasdoc.org/help/lang/&amp;btnI=I%27m%20Feeling%20Lucky',
-        4 => 'http://gambasdoc.org/help/lang/type/{FNAMEL}',
-        5 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
-        6 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:http://gambasdoc.org/&amp;btnI=I%27m%20Feeling%20Lucky',
-        7 => 'http://gambasdoc.org/help/lang/{FNAMEL}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 =>'.'
-        ),
-    'REGEXPS' => array(
-        //3 => "\\$(?!\\w)"   //matches '$' at the end of Keyword
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            2 => array(
-                'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-&;\$])"
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/gdb.php b/inc/geshi/gdb.php
deleted file mode 100644
index 0a5e32c30..000000000
--- a/inc/geshi/gdb.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/*************************************************************************************
- * gdb.php
- * --------
- * Author: Milian Wolff (mail@milianw.de)
- * Copyright: (c) 2009 Milian Wolff
- * Release Version: 1.0.8.11
- * Date Started: 2009/06/24
- *
- * GDB language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/06/24 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2009/06/24)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GDB',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        0 => array(
-            'Application',
-            'signal',
-            ),
-        1 => array(
-            'Segmentation fault',
-            '[KCrash Handler]',
-            ),
-        ),
-    'NUMBERS' => false,
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        0 => true,
-        1 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            0 => 'font-weight:bold;',
-            1 => 'font-weight:bold; color: #ff0000;'
-            ),
-        'COMMENTS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'font-weight:bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #933;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000066; font-weight:bold;',
-            1 => 'color: #006600;',
-            2 => 'color: #B07E00;',
-            3 => 'color: #0057AE; text-style:italic;',
-            4 => 'color: #0057AE; text-style:italic;',
-            5 => 'color: #442886;',
-            6 => 'color: #442886; font-weight:bold;',
-            7 => 'color: #FF0000; font-weight:bold;',
-            8 => 'color: #006E26;',
-            9 => 'color: #555;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        0 => '',
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //[Current Thread...], [KCrash Handler] etc.
-        0 => array(
-            GESHI_SEARCH => '^\[.+\]',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //stack number
-        1 => array(
-            GESHI_SEARCH => '^#\d+',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Thread X (Thread...)
-        2 => array(
-            GESHI_SEARCH => '^Thread \d.+$',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        //Files with linenumbers
-        3 => array(
-            GESHI_SEARCH => '(at\s+)(.+)(:\d+\s*)$',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        //Libs without linenumbers
-        4 => array(
-            GESHI_SEARCH => '(from\s+)(.+)(\s*)$',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        //Line numbers
-        5 => array(
-            GESHI_SEARCH => '(:)(\d+)(\s*)$',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        //Location
-        6 => array(
-            GESHI_SEARCH => '(\s+)(in\s+)?([^ 0-9][^ ]*)([ \n]+\()',
-            GESHI_REPLACE => '\\3',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1\\2',
-            GESHI_AFTER => '\\4'
-            ),
-        // interesting parts: abort, qFatal, assertions, null ptrs, ...
-        7 => array(
-            GESHI_SEARCH => '\b((?:\*__GI_)?(?:__assert_fail|abort)|qFatal|0x0)\b([^\.]|$)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2'
-            ),
-        // Namespace / Classes
-        8 => array(
-            GESHI_SEARCH => '\b(\w+)(::)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'U',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2'
-            ),
-        // make ptr adresses and <value optimized out> uninteresting
-        9 => '\b(?:0x[a-f0-9]{2,}|value\s+optimized\s+out)\b'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => false
-            ),
-        )
-);
-
-// kate: replace-tabs on; indent-width 4;
-
-?>
diff --git a/inc/geshi/genero.php b/inc/geshi/genero.php
deleted file mode 100644
index e1b20b3e8..000000000
--- a/inc/geshi/genero.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/*************************************************************************************
- * genero.php
- * ----------
- * Author: Lars Gersmann (lars.gersmann@gmail.com)
- * Copyright: (c) 2007 Lars Gersmann, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2007/07/01
- *
- * Genero (FOURJ's Genero 4GL) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2007/07/01 (1.0.0)
- *  -  Initial release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'genero',
-    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
-    'COMMENT_MULTI' => array('{' => '}'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            "ABSOLUTE",
-            "ACCEPT",
-            "ACTION",
-            "ADD",
-            "AFTER",
-            "ALL",
-            "ALTER",
-            "AND",
-            "ANY",
-            "APPEND",
-            "APPLICATION",
-            "AS",
-            "AT",
-            "ATTRIBUTE",
-            "ATTRIBUTES",
-            "AUDIT",
-            "AVG",
-            "BEFORE",
-            "BEGIN",
-            "BETWEEN",
-            "BORDER",
-            "BOTTOM",
-            "BREAKPOINT",
-            "BUFFER",
-            "BUFFERED",
-            "BY",
-            "CALL",
-            "CANCEL",
-            "CASE",
-            "CENTURY",
-            "CHANGE",
-            "CHECK",
-            "CLEAR",
-            "CLIPPED",
-            "CLOSE",
-            "CLUSTER",
-            "COLUMN",
-            "COLUMNS",
-            "COMMAND",
-            "COMMENT",
-            "COMMIT",
-            "COMMITTED",
-            "CONCURRENT ",
-            "CONNECT",
-            "CONNECTION",
-            "CONSTANT",
-            "CONSTRAINED",
-            "CONSTRAINT",
-            "CONSTRUCT",
-            "CONTINUE",
-            "CONTROL",
-            "COUNT",
-            "CREATE",
-            "CROSS",
-            "CURRENT",
-            "DATABASE",
-            "DBA",
-            "DEC",
-            "DECLARE",
-            "DEFAULT",
-            "DEFAULTS",
-            "DEFER",
-            "DEFINE",
-            "DELETE",
-            "DELIMITER",
-            "DESCRIBE",
-            "DESTINATION",
-            "DIM",
-            "DIALOG",
-            "DIMENSION",
-            "DIRTY",
-            "DISCONNECT",
-            "DISPLAY",
-            "DISTINCT",
-            "DORMANT",
-            "DOWN",
-            "DROP",
-            "DYNAMIC",
-            "ELSE",
-            "END",
-            "ERROR",
-            "ESCAPE",
-            "EVERY",
-            "EXCLUSIVE",
-            "EXECUTE",
-            "EXISTS",
-            "EXIT",
-            "EXPLAIN",
-            "EXTEND",
-            "EXTENT",
-            "EXTERNAL",
-            "FETCH",
-            "FGL_DRAWBOX",
-            "FIELD",
-            "FIELD_TOUCHED",
-            "FILE",
-            "FILL",
-            "FINISH",
-            "FIRST",
-            "FLOAT",
-            "FLUSH",
-            "FOR",
-            "FOREACH",
-            "FORM",
-            "FORMAT",
-            "FOUND",
-            "FRACTION",
-            "FREE",
-            "FROM",
-            "FULL",
-            "FUNCTION",
-            "GET_FLDBUF",
-            "GLOBALS",
-            "GO",
-            "GOTO",
-            "GRANT",
-            "GROUP",
-            "HAVING",
-            "HEADER",
-            "HELP",
-            "HIDE",
-            "HOLD",
-            "HOUR",
-            "IDLE",
-            "IF",
-            "IMAGE",
-            "IMMEDIATE",
-            "IN",
-            "INDEX",
-            "INFIELD",
-            "INITIALIZE",
-            "INNER",
-            "INPUT",
-            "INSERT",
-            "INTERRUPT",
-            "INTERVAL",
-            "INTO",
-            "INVISIBLE",
-            "IS",
-            "ISOLATION",
-            "JOIN",
-            "KEEP",
-            "KEY",
-            "LABEL",
-            "LAST",
-            "LEFT",
-            "LENGTH",
-            "LET",
-            "LIKE",
-            "LINE",
-            "LINENO",
-            "LINES",
-            "LOAD",
-            "LOCATE",
-            "LOCK",
-            "LOG",
-            "LSTR",
-            "MAIN",
-            "MARGIN",
-            "MATCHES",
-            "MAX",
-            "MAXCOUNT",
-            "MDY",
-            "MEMORY",
-            "MENU",
-            "MESSAGE",
-            "MIN",
-            "MINUTE",
-            "MOD",
-            "MODE",
-            "MODIFY",
-            "MONEY",
-            "NAME",
-            "NEED",
-            "NEXT",
-            "NO",
-            "NORMAL",
-            "NOT",
-            "NOTFOUND",
-            "NULL",
-            "NUMERIC",
-            "OF",
-            "ON",
-            "OPEN",
-            "OPTION",
-            "OPTIONS",
-            "OR",
-            "ORDER",
-            "OTHERWISE",
-            "OUTER",
-            "OUTPUT",
-            "PAGE",
-            "PAGENO",
-            "PAUSE",
-            "PERCENT",
-            "PICTURE",
-            "PIPE",
-            "PRECISION",
-            "PREPARE",
-            "PREVIOUS",
-            "PRINT",
-            "PRINTER",
-            "PRINTX",
-            "PRIOR",
-            "PRIVILEGES",
-            "PROCEDURE",
-            "PROGRAM",
-            "PROMPT",
-            "PUBLIC",
-            "PUT",
-            "QUIT",
-            "READ",
-            "REAL",
-            "RECORD",
-            "RECOVER",
-            "RED ",
-            "RELATIVE",
-            "RENAME",
-            "REOPTIMIZATION",
-            "REPEATABLE",
-            "REPORT",
-            "RESOURCE",
-            "RETURN",
-            "RETURNING",
-            "REVERSE",
-            "REVOKE",
-            "RIGHT",
-            "ROLLBACK",
-            "ROLLFORWARD",
-            "ROW",
-            "ROWS",
-            "RUN",
-            "SCHEMA",
-            "SCREEN",
-            "SCROLL",
-            "SECOND",
-            "SELECT",
-            "SERIAL",
-            "SET",
-            "SFMT",
-            "SHARE",
-            "SHIFT",
-            "SHOW",
-            "SIGNAL ",
-            "SIZE",
-            "SKIP",
-            "SLEEP",
-            "SOME",
-            "SPACE",
-            "SPACES",
-            "SQL",
-            "SQLERRMESSAGE",
-            "SQLERROR",
-            "SQLSTATE",
-            "STABILITY",
-            "START",
-            "STATISTICS",
-            "STEP",
-            "STOP",
-            "STYLE",
-            "SUM",
-            "SYNONYM",
-            "TABLE",
-            "TEMP",
-            "TERMINATE",
-            "TEXT",
-            "THEN",
-            "THROUGH",
-            "THRU",
-            "TO",
-            "TODAY",
-            "TOP",
-            "TRAILER",
-            "TRANSACTION ",
-            "UNBUFFERED",
-            "UNCONSTRAINED",
-            "UNDERLINE",
-            "UNION",
-            "UNIQUE",
-            "UNITS",
-            "UNLOAD",
-            "UNLOCK",
-            "UP",
-            "UPDATE",
-            "USE",
-            "USER",
-            "USING",
-            "VALIDATE",
-            "VALUE",
-            "VALUES",
-            "VARCHAR",
-            "VIEW",
-            "WAIT",
-            "WAITING",
-            "WARNING",
-            "WHEN",
-            "WHENEVER",
-            "WHERE",
-            "WHILE",
-            "WINDOW",
-            "WITH",
-            "WITHOUT",
-            "WORDWRAP",
-            "WORK",
-            "WRAP"
-            ),
-        2 => array(
-            '&amp;IFDEF', '&amp;ENDIF'
-            ),
-        3 => array(
-            "ARRAY",
-            "BYTE",
-            "CHAR",
-            "CHARACTER",
-            "CURSOR",
-            "DATE",
-            "DATETIME",
-            "DECIMAL",
-            "DOUBLE",
-            "FALSE",
-            "INT",
-            "INTEGER",
-            "SMALLFLOAT",
-            "SMALLINT",
-            "STRING",
-            "TIME",
-            "TRUE"
-            ),
-        4 => array(
-            "BLACK",
-            "BLINK",
-            "BLUE",
-            "BOLD",
-            "ANSI",
-            "ASC",
-            "ASCENDING",
-            "ASCII",
-            "CYAN",
-            "DESC",
-            "DESCENDING",
-            "GREEN",
-            "MAGENTA",
-            "OFF",
-            "WHITE",
-            "YELLOW",
-            "YEAR",
-            "DAY",
-            "MONTH",
-            "WEEKDAY"
-            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
-        '(', ')', '[', ']'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF;',
-            2 => 'color: #0000FF; font-weight: bold;',
-            3 => 'color: #008000;',
-            4 => 'color: #FF0000;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080; font-style: italic;',
-            2 => 'color: #008080;',
-            'MULTI' => 'color: #008080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #808080;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000FF;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/genie.php b/inc/geshi/genie.php
deleted file mode 100644
index db05ec062..000000000
--- a/inc/geshi/genie.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*************************************************************************************
- * genie.php
- * ----------
- * Author: Nicolas Joseph (nicolas.joseph@valaide.org)
- * Copyright: (c) 2009 Nicolas Joseph
- * Release Version: 1.0.8.11
- * Date Started: 2009/04/29
- *
- * Genie language file for GeSHi.
- *
- * CHANGES
- * -------
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Genie',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Using and Namespace directives (basic support)
-        //Please note that the alias syntax for using is not supported
-        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'HARDQUOTE' => array('@"', '"'),
-    'HARDESCAPE' => array('""'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'and', 'as', 'abstract', 'break', 'case', 'cast', 'catch', 'const',
-            'construct', 'continue', 'default', 'def', 'delete', 'div',
-            'dynamic', 'do', 'downto', 'else', 'ensures', 'except', 'extern',
-            'false', 'final', 'finally', 'for', 'foreach', 'get', 'if', 'in',
-            'init', 'inline', 'internal', 'implements', 'lock', 'not', 'null',
-            'of', 'or', 'otherwise', 'out', 'override', 'pass', 'raise',
-            'raises', 'readonly', 'ref', 'requires', 'self', 'set', 'static',
-            'super', 'switch', 'to', 'true', 'try', 'unless', 'uses', 'var', 'virtual',
-            'volatile', 'void', 'when', 'while'
-            ),
-//        2 => array(
-//            ),
-        3 => array(
-            'is', 'isa', 'new', 'owned', 'sizeof', 'typeof', 'unchecked',
-            'unowned', 'weak'
-            ),
-        4 => array(
-            'bool', 'byte', 'class', 'char', 'date', 'datetime', 'decimal', 'delegate',
-            'double', 'enum', 'event', 'exception', 'float', 'int', 'interface',
-            'long', 'object', 'prop', 'sbyte', 'short', 'single', 'string',
-            'struct', 'ulong', 'ushort'
-            ),
-//        5 => array(
-//            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
-        '(', ')', '{', '}', '[', ']', '|'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-//        2 => false,
-        3 => false,
-        4 => false,
-//        5 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF;',
-//            2 => 'color: #FF8000; font-weight: bold;',
-            3 => 'color: #008000;',
-            4 => 'color: #FF0000;',
-//            5 => 'color: #000000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080; font-style: italic;',
-//            2 => 'color: #008080;',
-            3 => 'color: #008080;',
-            'MULTI' => 'color: #008080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080; font-weight: bold;',
-            'HARD' => 'color: #008080; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #666666;',
-            'HARD' => 'color: #666666;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000FF;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-//        2 => '',
-        3 => '',
-        4 => '',
-//        5 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
-        )
-    )
-);
-
-?>
diff --git a/inc/geshi/gettext.php b/inc/geshi/gettext.php
deleted file mode 100644
index 80b531c10..000000000
--- a/inc/geshi/gettext.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*************************************************************************************
- * gettext.php
- * --------
- * Author: Milian Wolff (mail@milianw.de)
- * Copyright: (c) 2008 Milian Wolff
- * Release Version: 1.0.8.11
- * Date Started: 2008/05/25
- *
- * GNU Gettext .po/.pot language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/08/02 (1.0.8)
- *  -  New comments: flags and previous-fields
- *  -  New keywords: msgctxt, msgid_plural
- *  -  Msgstr array indices
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GNU Gettext',
-    'COMMENT_SINGLE' => array('#:', '#.', '#,', '#|', '#'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array('msgctxt', 'msgid_plural', 'msgid', 'msgstr'),
-    ),
-    'SYMBOLS' => array(),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-    ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;'
-        ),
-        'COMMENTS' => array(
-            0 => 'color: #000099;',
-            1 => 'color: #000099;',
-            2 => 'color: #000099;',
-            3 => 'color: #006666;',
-            4 => 'color: #666666; font-style: italic;',
-        ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-        ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-        ),
-        'REGEXPS' => array(),
-        'SYMBOLS' => array(),
-        'NUMBERS' => array(
-            0 => 'color: #000099;'
-        ),
-        'METHODS' => array(),
-        'SCRIPT' => array(),
-        'BRACKETS' => array(
-            0 => 'color: #000099;'
-        ),
-    ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-);
-
-?>
diff --git a/inc/geshi/glsl.php b/inc/geshi/glsl.php
deleted file mode 100644
index 3615cfe71..000000000
--- a/inc/geshi/glsl.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/*************************************************************************************
- * glsl.php
- * -----
- * Author: Benny Baumann (BenBE@omorphia.de)
- * Copyright: (c) 2008 Benny Baumann (BenBE@omorphia.de)
- * Release Version: 1.0.8.11
- * Date Started: 2008/03/20
- *
- * glSlang language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/03/20 (1.0.7.21)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'glSlang',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'if', 'else', 'for', 'while', 'do', 'break', 'continue', 'asm',
-            'switch', 'case', 'default', 'return', 'discard',
-            'namespace', 'using', 'sizeof', 'cast'
-            ),
-        2 => array(
-            'const', 'uniform', 'attribute', 'centroid', 'varying', 'invariant',
-            'in', 'out', 'inout', 'input', 'output', 'typedef', 'volatile',
-            'public', 'static', 'extern', 'external', 'packed',
-            'inline', 'noinline', 'noperspective', 'flat'
-            ),
-        3 => array(
-            'void', 'bool', 'int', 'long', 'short', 'float', 'half', 'fixed',
-            'unsigned', 'lowp', 'mediump', 'highp', 'precision',
-            'vec2', 'vec3', 'vec4', 'bvec2', 'bvec3', 'bvec4',
-            'dvec2', 'dvec3', 'dvec4', 'fvec2', 'fvec3', 'fvec4',
-            'hvec2', 'hvec3', 'hvec4', 'ivec2', 'ivec3', 'ivec4',
-            'mat2', 'mat3', 'mat4', 'mat2x2', 'mat3x2', 'mat4x2',
-            'mat2x3', 'mat3x3', 'mat4x3', 'mat2x4', 'mat3x4', 'mat4x4',
-            'sampler1D', 'sampler2D', 'sampler3D', 'samplerCube',
-            'sampler1DShadow', 'sampler2DShadow',
-            'struct', 'class', 'union', 'enum', 'interface', 'template'
-            ),
-        4 => array(
-            'this', 'false', 'true'
-            ),
-        5 => array(
-            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan',
-            'pow', 'exp2', 'log2', 'sqrt', 'inversesqrt', 'abs', 'sign', 'ceil',
-            'floor', 'fract', 'mod', 'min', 'max', 'clamp', 'mix', 'step',
-            'smoothstep', 'length', 'distance', 'dot', 'cross', 'normalize',
-            'ftransform', 'faceforward', 'reflect', 'matrixCompMult', 'equal',
-            'lessThan', 'lessThanEqual', 'greaterThan', 'greaterThanEqual',
-            'notEqual', 'any', 'all', 'not', 'texture1D', 'texture1DProj',
-            'texture1DLod', 'texture1DProjLod', 'texture2D', 'texture2DProj',
-            'texture2DLod', 'texture2DProjLod', 'texture3D', 'texture3DProj',
-            'texture3DLod', 'texture3DProjLod', 'textureCube', 'textureCubeLod',
-            'shadow1D', 'shadow1DProj', 'shadow1DLod', 'shadow1DProjLod',
-            'shadow2D', 'shadow2DProj', 'shadow2DLod', 'shadow2DProjLod',
-            'noise1', 'noise2', 'noise3', 'noise4'
-            ),
-        6 => array(
-            'gl_Position', 'gl_PointSize', 'gl_ClipVertex', 'gl_FragColor',
-            'gl_FragData', 'gl_FragDepth', 'gl_FragCoord', 'gl_FrontFacing',
-            'gl_Color', 'gl_SecondaryColor', 'gl_Normal', 'gl_Vertex',
-            'gl_MultiTexCoord0', 'gl_MultiTexCoord1', 'gl_MultiTexCoord2',
-            'gl_MultiTexCoord3', 'gl_MultiTexCoord4', 'gl_MultiTexCoord5',
-            'gl_MultiTexCoord6', 'gl_MultiTexCoord7', 'gl_FogCoord',
-            'gl_MaxLights', 'gl_MaxClipPlanes', 'gl_MaxTextureUnits',
-            'gl_MaxTextureCoords', 'gl_MaxVertexAttribs', 'gl_MaxVaryingFloats',
-            'gl_MaxVertexUniformComponents', 'gl_MaxVertexTextureImageUnits',
-            'gl_MaxCombinedTextureImageUnits', 'gl_MaxTextureImageUnits',
-            'gl_MaxFragmentUniformComponents', 'gl_MaxDrawBuffers', 'gl_Point',
-            'gl_ModelViewMatrix', 'gl_ProjectionMatrix', 'gl_FrontMaterial',
-            'gl_ModelViewProjectionMatrix', 'gl_TextureMatrix', 'gl_ClipPlane',
-            'gl_NormalMatrix', 'gl_ModelViewMatrixInverse', 'gl_BackMaterial',
-            'gl_ProjectionMatrixInverse', 'gl_ModelViewProjectionMatrixInverse',
-            'gl_TextureMatrixInverse', 'gl_ModelViewMatrixTranspose', 'gl_Fog',
-            'gl_ProjectionMatrixTranspose', 'gl_NormalScale', 'gl_DepthRange',
-            'gl_odelViewProjectionMatrixTranspose', 'gl_TextureMatrixTranspose',
-            'gl_ModelViewMatrixInverseTranspose', 'gl_LightSource',
-            'gl_ProjectionMatrixInverseTranspose', 'gl_LightModel',
-            'gl_ModelViewProjectionMatrixInverseTranspose', 'gl_TexCoord',
-            'gl_TextureMatrixInverseTranspose', 'gl_TextureEnvColor',
-            'gl_FrontLightModelProduct', 'gl_BackLightModelProduct',
-            'gl_FrontLightProduct', 'gl_BackLightProduct', 'gl_ObjectPlaneS',
-            'gl_ObjectPlaneT', 'gl_ObjectPlaneR', 'gl_ObjectPlaneQ',
-            'gl_EyePlaneS', 'gl_EyePlaneT', 'gl_EyePlaneR', 'gl_EyePlaneQ',
-            'gl_FrontColor', 'gl_BackColor', 'gl_FrontSecondaryColor',
-            'gl_BackSecondaryColor', 'gl_FogFragCoord', 'gl_PointCoord'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^',
-        '&', '?', ':', '.', '|', ';', ',', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #333399; font-weight: bold;',
-            3 => 'color: #000066; font-weight: bold;',
-            4 => 'color: #333399; font-weight: bold;',
-            5 => 'color: #993333; font-weight: bold;',
-            6 => 'color: #551111;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #009900;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000066;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'OOLANG' => array(
-            'MATCH_BEFORE' => '',
-            'MATCH_AFTER' => '[a-zA-Z_][a-zA-Z0-9_]*',
-            'MATCH_SPACES' => '[\s]*'
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/gml.php b/inc/geshi/gml.php
deleted file mode 100644
index 999251b22..000000000
--- a/inc/geshi/gml.php
+++ /dev/null
@@ -1,506 +0,0 @@
-<?php
-/*************************************************************************************
- * gml.php
- * --------
- * Author: Jos� Jorge Enr�quez (jenriquez@users.sourceforge.net)
- * Copyright: (c) 2005 Jos� Jorge Enr�quez Rodr�guez (http://www.zonamakers.com)
- * Release Version: 1.0.8.11
- * Date Started: 2005/06/21
- *
- * GML language file for GeSHi.
- *
- * GML (Game Maker Language) is a script language that is built-in into Game Maker,
- * a game creation program, more info about Game Maker can be found at
- * http://www.gamemaker.nl/
- * All GML keywords were extracted from the Game Maker HTML Help file using a PHP
- * script (one section at a time). I love PHP for saving me that bunch of work :P!.
- * I think all GML functions have been indexed here, but I'm not sure about it, so
- * please let me know of any issue you may find.
- *
- * CHANGES
- * -------
- * 2005/11/11
- *  -  Changed 'CASE_KEYWORDS' fom 'GESHI_CAPS_LOWER' to 'GESHI_CAPS_NO_CHANGE',
- *     so that MCI_command appears correctly (the only GML function using capitals).
- *  -  Changed 'CASE_SENSITIVE' options, 'GESHI_COMMENTS' from true to false and all
- *     of the others from false to true.
- *  -  Deleted repeated entries.
- *  -  div and mod are language keywords, moved (from symbols) to the appropiate section (1).
- *  -  Moved self, other, all, noone and global identifiers to language keywords section 1.
- *  -  Edited this file lines to a maximum width of 100 characters (as stated in
- *     the GeSHi docs). Well, not strictly to 100 but around it.
- *  -  Corrected some minor issues (the vk_f1...vk_f12 keys and similar).
- *  -  Deleted the KEYWORDS=>5 and KEYWORDS=>6 sections (actually, they were empty).
- *     I was planning of using those for the GML functions available only in the
- *     registered version of the program, but not anymore.
- *
- * 2005/06/26 (1.0.3)
- *  -  First Release.
- *
- * TODO (updated 2005/11/11)
- * -------------------------
- *  -  Test it for a while and make the appropiate corrections.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GML',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        // language keywords
-        1 => array(
-            'break', 'continue', 'do', 'until', 'if', 'else',
-            'exit', 'for', 'repeat', 'return', 'switch',
-            'case', 'default', 'var', 'while', 'with', 'div', 'mod',
-            // GML Language overview
-            'self', 'other', 'all', 'noone', 'global',
-            ),
-        // modifiers and built-in variables
-        2 => array(
-            // Game play
-            'x','y','xprevious','yprevious','xstart','ystart','hspeed','vspeed','direction','speed',
-            'friction','gravity','gravity_direction',
-            'path_index','path_position','path_positionprevious','path_speed','path_orientation',
-            'path_endaction',
-            'object_index','id','mask_index','solid','persistent','instance_count','instance_id',
-            'room_speed','fps','current_time','current_year','current_month','current_day','current_weekday',
-            'current_hour','current_minute','current_second','alarm','timeline_index','timeline_position',
-            'timeline_speed',
-            'room','room_first','room_last','room_width','room_height','room_caption','room_persistent',
-            'score','lives','health','show_score','show_lives','show_health','caption_score','caption_lives',
-            'caption_health',
-            'event_type','event_number','event_object','event_action',
-            'error_occurred','error_last',
-            // User interaction
-            'keyboard_lastkey','keyboard_key','keyboard_lastchar','keyboard_string',
-            'mouse_x','mouse_y','mouse_button','mouse_lastbutton',
-            // Game Graphics
-            'sprite_index','sprite_width','sprite_height','sprite_xoffset','sprite_yoffset',
-            'image_number','image_index','image_speed','image_xscale','image_yscale','image_angle',
-            'image_alpha','image_blend','bbox_left','bbox_right','bbox_top','bbox_bottom',
-            'background_color','background_showcolor','background_visible','background_foreground',
-            'background_index','background_x','background_y','background_width','background_height',
-            'background_htiled','background_vtiled','background_xscale','background_yscale',
-            'background_hspeed','background_vspeed','background_blend','background_alpha',
-            'background','left, top, width, height','depth','visible','xscale','yscale','blend','alpha',
-            'view_enabled','view_current','view_visible','view_yview','view_wview','view_hview','view_xport',
-            'view_yport','view_wport','view_hport','view_angle','view_hborder','view_vborder','view_hspeed',
-            'view_vspeed','view_object',
-            'transition_kind',
-            // Files, registry and executing programs
-            'game_id','working_directory','temp_directory',
-            'secure_mode',
-            // Creating particles
-            'xmin', 'xmax', 'ymin', 'ymax','shape','distribution','particle type','number',
-            'force','dist','kind','additive', 'parttype1', 'parttype2'
-            ),
-        // functions
-        3 => array(
-            // Computing things
-            'random','choose','abs','sign','round','floor','ceil','frac','sqrt','sqr','power','exp','ln',
-            'log2','log10','logn','sin','cos','tan','arcsin','arccos','arctan','arctan2','degtorad',
-            'radtodeg','min','max','mean','median','point_distance','point_direction','lengthdir_x',
-            'lengthdir_y','is_real','is_string',
-            'chr','ord','real','string','string_format','string_length','string_pos','string_copy',
-            'string_char_at','string_delete','string_insert','string_replace','string_replace_all',
-            'string_count','string_lower','string_upper','string_repeat','string_letters','string_digits',
-            'string_lettersdigits','clipboard_has_text','clipboard_get_text','clipboard_set_text',
-            'date_current_datetime','date_current_date','date_current_time','date_create_datetime',
-            'date_create_date','date_create_time','date_valid_datetime','date_valid_date','date_valid_time',
-            'date_inc_year','date_inc_month','date_inc_week','date_inc_day','date_inc_hour',
-            'date_inc_minute','date_inc_second','date_get_year','date_get_month','date_get_week',
-            'date_get_day','date_get_hour', 'date_get_minute','date_get_second','date_get_weekday',
-            'date_get_day_of_year','date_get_hour_of_year','date_get_minute_of_year',
-            'date_get_second_of_year','date_year_span','date_month_span','date_week_span','date_day_span',
-            'date_hour_span','date_minute_span','date_second_span','date_compare_datetime',
-            'date_compare_date','date_compare_time','date_date_of','date_time_of','date_datetime_string',
-            'date_date_string','date_time_string','date_days_in_month','date_days_in_year','date_leap_year',
-            'date_is_today',
-            // Game play
-            'motion_set','motion_add','place_free','place_empty','place_meeting','place_snapped',
-            'move_random','move_snap','move_wrap','move_towards_point','move_bounce_solid','move_bounce_all',
-            'move_contact_solid','move_contact_all','move_outside_solid','move_outside_all',
-            'distance_to_point','distance_to_object','position_empty','position_meeting',
-            'path_start','path_end',
-            'mp_linear_step','mp_linear_step_object','mp_potential_step','mp_potential_step_object',
-            'mp_potential_settings','mp_linear_path','mp_linear_path_object', 'mp_potential_path',
-            'mp_potential_path_object','mp_grid_create','mp_grid_destroy','mp_grid_clear_all',
-            'mp_grid_clear_cell','mp_grid_clear_rectangle','mp_grid_add_cell','mp_grid_add_rectangle',
-            'mp_grid_add_instances','mp_grid_path','mp_grid_draw',
-            'collision_point','collision_rectangle','collision_circle','collision_ellipse','collision_line',
-            'instance_find','instance_exists','instance_number','instance_position','instance_nearest',
-            'instance_furthest','instance_place','instance_create','instance_copy','instance_destroy',
-            'instance_change','position_destroy','position_change',
-            'instance_deactivate_all','instance_deactivate_object','instance_deactivate_region',
-            'instance_activate_all','instance_activate_object','instance_activate_region',
-            'sleep',
-            'room_goto','room_goto_previous','room_goto_next','room_restart','room_previous','room_next',
-            'game_end','game_restart','game_save','game_load',
-            'event_perform', 'event_perform_object','event_user','event_inherited',
-            'show_debug_message','variable_global_exists','variable_local_exists','variable_global_get',
-            'variable_global_array_get','variable_global_array2_get','variable_local_get',
-            'variable_local_array_get','variable_local_array2_get','variable_global_set',
-            'variable_global_array_set','variable_global_array2_set','variable_local_set',
-            'variable_local_array_set','variable_local_array2_set','set_program_priority',
-            // User interaction
-            'keyboard_set_map','keyboard_get_map','keyboard_unset_map','keyboard_check',
-            'keyboard_check_pressed','keyboard_check_released','keyboard_check_direct',
-            'keyboard_get_numlock','keyboard_set_numlock','keyboard_key_press','keyboard_key_release',
-            'keyboard_clear','io_clear','io_handle','keyboard_wait',
-            'mouse_check_button','mouse_check_button_pressed','mouse_check_button_released','mouse_clear',
-            'mouse_wait',
-            'joystick_exists','joystick_name','joystick_axes','joystick_buttons','joystick_has_pov',
-            'joystick_direction','joystick_check_button','joystick_xpos','joystick_ypos','joystick_zpos',
-            'joystick_rpos','joystick_upos','joystick_vpos','joystick_pov',
-            // Game Graphics
-            'draw_sprite','draw_sprite_stretched','draw_sprite_tiled','draw_sprite_part','draw_background',
-            'draw_background_stretched','draw_background_tiled','draw_background_part','draw_sprite_ext',
-            'draw_sprite_stretched_ext','draw_sprite_tiled_ext','draw_sprite_part_ext','draw_sprite_general',
-            'draw_background_ext','draw_background_stretched_ext','draw_background_tiled_ext',
-            'draw_background_part_ext','draw_background_general',
-            'draw_clear','draw_clear_alpha','draw_point','draw_line','draw_rectangle','draw_roundrect',
-            'draw_triangle','draw_circle','draw_ellipse','draw_arrow','draw_button','draw_path',
-            'draw_healthbar','draw_set_color','draw_set_alpha','draw_get_color','draw_get_alpha',
-            'make_color_rgb','make_color_hsv','color_get_red','color_get_green','color_get_blue',
-            'color_get_hue','color_get_saturation','color_get_value','merge_color','draw_getpixel',
-            'screen_save','screen_save_part',
-            'draw_set_font','draw_set_halign','draw_set_valign','draw_text','draw_text_ext','string_width',
-            'string_height','string_width_ext','string_height_ext','draw_text_transformed',
-            'draw_text_ext_transformed','draw_text_color','draw_text_ext_color',
-            'draw_text_transformed_color','draw_text_ext_transformed_color',
-            'draw_point_color','draw_line_color','draw_rectangle_color','draw_roundrect_color',
-            'draw_triangle_color','draw_circle_color','draw_ellipse_color','draw_primitive_begin',
-            'draw_vertex','draw_vertex_color','draw_primitive_end','sprite_get_texture',
-            'background_get_texture','texture_preload','texture_set_priority',
-            'texture_get_width','texture_get_height','draw_primitive_begin_texture','draw_vertex_texture',
-            'draw_vertex_texture_color','texture_set_interpolation',
-            'texture_set_blending','texture_set_repeat','draw_set_blend_mode','draw_set_blend_mode_ext',
-            'surface_create','surface_free','surface_exists','surface_get_width','surface_get_height',
-            'surface_get_texture','surface_set_target','surface_reset_target','surface_getpixel',
-            'surface_save','surface_save_part','draw_surface','draw_surface_stretched','draw_surface_tiled',
-            'draw_surface_part','draw_surface_ext','draw_surface_stretched_ext','draw_surface_tiled_ext',
-            'draw_surface_part_ext','draw_surface_general','surface_copy','surface_copy_part',
-            'tile_add','tile_delete','tile_exists','tile_get_x','tile_get_y','tile_get_left','tile_get_top',
-            'tile_get_width','tile_get_height','tile_get_depth','tile_get_visible','tile_get_xscale',
-            'tile_get_yscale','tile_get_background','tile_get_blend','tile_get_alpha','tile_set_position',
-            'tile_set_region','tile_set_background','tile_set_visible','tile_set_depth','tile_set_scale',
-            'tile_set_blend','tile_set_alpha','tile_layer_hide','tile_layer_show','tile_layer_delete',
-            'tile_layer_shift','tile_layer_find','tile_layer_delete_at','tile_layer_depth',
-            'display_get_width','display_get_height','display_get_colordepth','display_get_frequency',
-            'display_set_size','display_set_colordepth','display_set_frequency','display_set_all',
-            'display_test_all','display_reset','display_mouse_get_x','display_mouse_get_y','display_mouse_set',
-            'window_set_visible','window_get_visible','window_set_fullscreen','window_get_fullscreen',
-            'window_set_showborder','window_get_showborder','window_set_showicons','window_get_showicons',
-            'window_set_stayontop','window_get_stayontop','window_set_sizeable','window_get_sizeable',
-            'window_set_caption','window_get_caption','window_set_cursor', 'window_get_cursor',
-            'window_set_color','window_get_color','window_set_region_scale','window_get_region_scale',
-            'window_set_position','window_set_size','window_set_rectangle','window_center','window_default',
-            'window_get_x','window_get_y','window_get_width','window_get_height','window_mouse_get_x',
-            'window_mouse_get_y','window_mouse_set',
-            'window_set_region_size','window_get_region_width','window_get_region_height',
-            'window_view_mouse_get_x','window_view_mouse_get_y','window_view_mouse_set',
-            'window_views_mouse_get_x','window_views_mouse_get_y','window_views_mouse_set',
-            'screen_redraw','screen_refresh','set_automatic_draw','set_synchronization','screen_wait_vsync',
-            // Sound and music)
-            'sound_play','sound_loop','sound_stop','sound_stop_all','sound_isplaying','sound_volume',
-            'sound_global_volume','sound_fade','sound_pan','sound_background_tempo','sound_set_search_directory',
-            'sound_effect_set','sound_effect_chorus','sound_effect_echo',    'sound_effect_flanger',
-            'sound_effect_gargle','sound_effect_reverb','sound_effect_compressor','sound_effect_equalizer',
-            'sound_3d_set_sound_position','sound_3d_set_sound_velocity','sound_3d_set_sound_distance',
-            'sound_3d_set_sound_cone',
-            'cd_init','cd_present','cd_number','cd_playing','cd_paused','cd_track','cd_length',
-            'cd_track_length','cd_position','cd_track_position','cd_play','cd_stop','cd_pause','cd_resume',
-            'cd_set_position','cd_set_track_position','cd_open_door','cd_close_door','MCI_command',
-            // Splash screens, highscores, and other pop-ups
-            'show_text','show_image','show_video','show_info','load_info',
-            'show_message','show_message_ext','show_question','get_integer','get_string',
-            'message_background','message_alpha','message_button','message_text_font','message_button_font',
-            'message_input_font','message_mouse_color','message_input_color','message_caption',
-            'message_position','message_size','show_menu','show_menu_pos','get_color','get_open_filename',
-            'get_save_filename','get_directory','get_directory_alt','show_error',
-            'highscore_show','highscore_set_background','highscore_set_border','highscore_set_font',
-            'highscore_set_colors','highscore_set_strings','highscore_show_ext','highscore_clear',
-            'highscore_add','highscore_add_current','highscore_value','highscore_name','draw_highscore',
-            // Resources
-            'sprite_exists','sprite_get_name','sprite_get_number','sprite_get_width','sprite_get_height',
-            'sprite_get_transparent','sprite_get_smooth','sprite_get_preload','sprite_get_xoffset',
-            'sprite_get_yoffset','sprite_get_bbox_left','sprite_get_bbox_right','sprite_get_bbox_top',
-            'sprite_get_bbox_bottom','sprite_get_bbox_mode','sprite_get_precise',
-            'sound_exists','sound_get_name','sound_get_kind','sound_get_preload','sound_discard',
-            'sound_restore',
-            'background_exists','background_get_name','background_get_width','background_get_height',
-            'background_get_transparent','background_get_smooth','background_get_preload',
-            'font_exists','font_get_name','font_get_fontname','font_get_bold','font_get_italic',
-            'font_get_first','font_get_last',
-            'path_exists','path_get_name','path_get_length','path_get_kind','path_get_closed',
-            'path_get_precision','path_get_number','path_get_point_x','path_get_point_y',
-            'path_get_point_speed','path_get_x','path_get_y','path_get_speed',
-            'script_exists','script_get_name','script_get_text',
-            'timeline_exists','timeline_get_name',
-            'object_exists','object_get_name','object_get_sprite','object_get_solid','object_get_visible',
-            'object_get_depth','object_get_persistent','object_get_mask','object_get_parent',
-            'object_is_ancestor',
-            'room_exists','room_get_name',
-            // Changing resources
-            'sprite_set_offset','sprite_set_bbox_mode','sprite_set_bbox','sprite_set_precise',
-            'sprite_duplicate','sprite_assign','sprite_merge','sprite_add','sprite_replace',
-            'sprite_create_from_screen','sprite_add_from_screen','sprite_create_from_surface',
-            'sprite_add_from_surface','sprite_delete','sprite_set_alpha_from_sprite',
-            'sound_add','sound_replace','sound_delete',
-            'background_duplicate','background_assign','background_add','background_replace',
-            'background_create_color','background_create_gradient','background_create_from_screen',
-            'background_create_from_surface','background_delete','background_set_alpha_from_background',
-            'font_add','font_add_sprite','font_replace_sprite','font_delete',
-            'path_set_kind','path_set_closed','path_set_precision','path_add','path_delete','path_duplicate',
-            'path_assign','path_append','path_add_point','path_insert_point','path_change_point',
-            'path_delete_point','path_clear_points','path_reverse','path_mirror','path_flip','path_rotate',
-            'path_scale','path_shift',
-            'execute_string','execute_file','script_execute',
-            'timeline_add','timeline_delete','timeline_moment_add','timeline_moment_clear',
-            'object_set_sprite','object_set_solid','object_set_visible','object_set_depth',
-            'object_set_persistent','object_set_mask','object_set_parent','object_add','object_delete',
-            'object_event_add','object_event_clear',
-            'room_set_width','room_set_height','room_set_caption','room_set_persistent','room_set_code',
-            'room_set_background_color','room_set_background','room_set_view','room_set_view_enabled',
-            'room_add','room_duplicate','room_assign','room_instance_add','room_instance_clear',
-            'room_tile_add','room_tile_add_ext','room_tile_clear',
-            // Files, registry and executing programs
-            'file_text_open_read','file_text_open_write','file_text_open_append','file_text_close',
-            'file_text_write_string','file_text_write_real','file_text_writeln','file_text_read_string',
-            'file_text_read_real','file_text_readln','file_text_eof','file_exists','file_delete',
-            'file_rename','file_copy','directory_exists','directory_create','file_find_first',
-            'file_find_next','file_find_close','file_attributes', 'filename_name','filename_path',
-            'filename_dir','filename_drive','filename_ext','filename_change_ext','file_bin_open',
-            'file_bin_rewrite','file_bin_close','file_bin_size','file_bin_position','file_bin_seek',
-            'file_bin_write_byte','file_bin_read_byte','parameter_count','parameter_string',
-            'environment_get_variable',
-            'registry_write_string','registry_write_real','registry_read_string','registry_read_real',
-            'registry_exists','registry_write_string_ext','registry_write_real_ext',
-            'registry_read_string_ext','registry_read_real_ext','registry_exists_ext','registry_set_root',
-            'ini_open','ini_close','ini_read_string','ini_read_real','ini_write_string','ini_write_real',
-            'ini_key_exists','ini_section_exists','ini_key_delete','ini_section_delete',
-            'execute_program','execute_shell',
-            // Data structures
-            'ds_stack_create','ds_stack_destroy','ds_stack_clear','ds_stack_size','ds_stack_empty',
-            'ds_stack_push','ds_stack_pop','ds_stack_top',
-            'ds_queue_create','ds_queue_destroy','ds_queue_clear','ds_queue_size','ds_queue_empty',
-            'ds_queue_enqueue','ds_queue_dequeue','ds_queue_head','ds_queue_tail',
-            'ds_list_create','ds_list_destroy','ds_list_clear','ds_list_size','ds_list_empty','ds_list_add',
-            'ds_list_insert','ds_list_replace','ds_list_delete','ds_list_find_index','ds_list_find_value',
-            'ds_list_sort',
-            'ds_map_create','ds_map_destroy','ds_map_clear','ds_map_size','ds_map_empty','ds_map_add',
-            'ds_map_replace','ds_map_delete','ds_map_exists','ds_map_find_value','ds_map_find_previous',
-            'ds_map_find_next','ds_map_find_first','ds_map_find_last',
-            'ds_priority_create','ds_priority_destroy','ds_priority_clear','ds_priority_size',
-            'ds_priority_empty','ds_priority_add','ds_priority_change_priority','ds_priority_find_priority',
-            'ds_priority_delete_value','ds_priority_delete_min','ds_priority_find_min',
-            'ds_priority_delete_max','ds_priority_find_max',
-            'ds_grid_create','ds_grid_destroy','ds_grid_resize','ds_grid_width','ds_grid_height',
-            'ds_grid_clear','ds_grid_set','ds_grid_add','ds_grid_multiply','ds_grid_set_region',
-            'ds_grid_add_region','ds_grid_multiply_region','ds_grid_set_disk','ds_grid_add_disk',
-            'ds_grid_multiply_disk','ds_grid_get','ds_grid_get_sum','ds_grid_get_max','ds_grid_get_min',
-            'ds_grid_get_mean','ds_grid_get_disk_sum','ds_grid_get_disk_min','ds_grid_get_disk_max',
-            'ds_grid_get_disk_mean','ds_grid_value_exists','ds_grid_value_x','ds_grid_value_y',
-            'ds_grid_value_disk_exists','ds_grid_value_disk_x','ds_grid_value_disk_y',
-            // Creating particles
-            'effect_create_below','effect_create_above','effect_clear',
-            'part_type_create','part_type_destroy','part_type_exists','part_type_clear','part_type_shape',
-            'part_type_sprite','part_type_size','part_type_scale',
-            'part_type_orientation','part_type_color1','part_type_color2','part_type_color3',
-            'part_type_color_mix','part_type_color_rgb','part_type_color_hsv',
-            'part_type_alpha1','part_type_alpha2','part_type_alpha3','part_type_blend','part_type_life',
-            'part_type_step','part_type_death','part_type_speed','part_type_direction','part_type_gravity',
-            'part_system_create','part_system_destroy','part_system_exists','part_system_clear',
-            'part_system_draw_order','part_system_depth','part_system_position',
-            'part_system_automatic_update','part_system_automatic_draw','part_system_update',
-            'part_system_drawit','part_particles_create','part_particles_create_color',
-            'part_particles_clear','part_particles_count',
-            'part_emitter_create','part_emitter_destroy','part_emitter_destroy_all','part_emitter_exists',
-            'part_emitter_clear','part_emitter_region','part_emitter_burst','part_emitter_stream',
-            'part_attractor_create','part_attractor_destroy','part_attractor_destroy_all',
-            'part_attractor_exists','part_attractor_clear','part_attractor_position','part_attractor_force',
-            'part_destroyer_create','part_destroyer_destroy','part_destroyer_destroy_all',
-            'part_destroyer_exists','part_destroyer_clear','part_destroyer_region',
-            'part_deflector_create','part_deflector_destroy','part_deflector_destroy_all',
-            'part_deflector_exists','part_deflector_clear','part_deflector_region','part_deflector_kind',
-            'part_deflector_friction',
-            'part_changer_create','part_changer_destroy','part_changer_destroy_all','part_changer_exists',
-            'part_changer_clear','part_changer_region','part_changer_types','part_changer_kind',
-            // Multiplayer games
-            'mplay_init_ipx','mplay_init_tcpip','mplay_init_modem','mplay_init_serial',
-            'mplay_connect_status','mplay_end','mplay_ipaddress',
-            'mplay_session_create','mplay_session_find','mplay_session_name','mplay_session_join',
-            'mplay_session_mode','mplay_session_status','mplay_session_end',
-            'mplay_player_find','mplay_player_name','mplay_player_id',
-            'mplay_data_write','mplay_data_read','mplay_data_mode',
-            'mplay_message_send','mplay_message_send_guaranteed','mplay_message_receive','mplay_message_id',
-            'mplay_message_value','mplay_message_player','mplay_message_name','mplay_message_count',
-            'mplay_message_clear',
-            // Using DLL's
-            'external_define','external_call','external_free','window_handle',
-            // 3D Graphics
-            'd3d_start','d3d_end','d3d_set_hidden','d3d_set_perspective',
-            'd3d_set_depth',
-            'd3d_primitive_begin','d3d_vertex','d3d_vertex_color','d3d_primitive_end',
-            'd3d_primitive_begin_texture','d3d_vertex_texture','d3d_vertex_texture_color','d3d_set_culling',
-            'd3d_draw_block','d3d_draw_cylinder','d3d_draw_cone','d3d_draw_ellipsoid','d3d_draw_wall',
-            'd3d_draw_floor',
-            'd3d_set_projection','d3d_set_projection_ext','d3d_set_projection_ortho',
-            'd3d_set_projection_perspective',
-            'd3d_transform_set_identity','d3d_transform_set_translation','d3d_transform_set_scaling',
-            'd3d_transform_set_rotation_x','d3d_transform_set_rotation_y','d3d_transform_set_rotation_z',
-            'd3d_transform_set_rotation_axis','d3d_transform_add_translation','d3d_transform_add_scaling',
-            'd3d_transform_add_rotation_x','d3d_transform_add_rotation_y','d3d_transform_add_rotation_z',
-            'd3d_transform_add_rotation_axis','d3d_transform_stack_clear','d3d_transform_stack_empty',
-            'd3d_transform_stack_push','d3d_transform_stack_pop','d3d_transform_stack_top',
-            'd3d_transform_stack_discard',
-            'd3d_set_fog',
-            'd3d_set_lighting','d3d_set_shading','d3d_light_define_direction','d3d_light_define_point',
-            'd3d_light_enable','d3d_vertex_normal','d3d_vertex_normal_color','d3d_vertex_normal_texture',
-            'd3d_vertex_normal_texture_color',
-            'd3d_model_create','d3d_model_destroy','d3d_model_clear','d3d_model_save','d3d_model_load',
-            'd3d_model_draw','d3d_model_primitive_begin','d3d_model_vertex','d3d_model_vertex_color',
-            'd3d_model_vertex_texture','d3d_model_vertex_texture_color','d3d_model_vertex_normal',
-            'd3d_model_vertex_normal_color','d3d_model_vertex_normal_texture',
-            'd3d_model_vertex_normal_texture_color','d3d_model_primitive_end','d3d_model_block',
-            'd3d_model_cylinder','d3d_model_cone','d3d_model_ellipsoid','d3d_model_wall','d3d_model_floor'
-            ),
-        // constants
-        4 => array(
-            'true', 'false', 'pi',
-            'ev_destroy','ev_step','ev_alarm','ev_keyboard','ev_mouse','ev_collision','ev_other','ev_draw',
-            'ev_keypress','ev_keyrelease','ev_left_button','ev_right_button','ev_middle_button',
-            'ev_no_button','ev_left_press','ev_right_press','ev_middle_press','ev_left_release',
-            'ev_right_release','ev_middle_release','ev_mouse_enter','ev_mouse_leave','ev_mouse_wheel_up',
-            'ev_mouse_wheel_down','ev_global_left_button','ev_global_right_button','ev_global_middle_button',
-            'ev_global_left_press','ev_global_right_press','ev_global_middle_press','ev_global_left_release',
-            'ev_global_right_release','ev_global_middle_release','ev_joystick1_left','ev_joystick1_right',
-            'ev_joystick1_up','ev_joystick1_down','ev_joystick1_button1','ev_joystick1_button2',
-            'ev_joystick1_button3','ev_joystick1_button4','ev_joystick1_button5','ev_joystick1_button6',
-            'ev_joystick1_button7','ev_joystick1_button8','ev_joystick2_left','ev_joystick2_right',
-            'ev_joystick2_up','ev_joystick2_down','ev_joystick2_button1','ev_joystick2_button2',
-            'ev_joystick2_button3','ev_joystick2_button4','ev_joystick2_button5','ev_joystick2_button6',
-            'ev_joystick2_button7','ev_joystick2_button8',
-            'ev_outside','ev_boundary','ev_game_start','ev_game_end','ev_room_start','ev_room_end',
-            'ev_no_more_lives','ev_no_more_health','ev_animation_end','ev_end_of_path','ev_user0','ev_user1',
-            'ev_user2','ev_user3','ev_user4','ev_user5','ev_user6','ev_user7','ev_user8','ev_user9',
-            'ev_user10','ev_user11','ev_user12','ev_user13','ev_user14','ev_user15','ev_step_normal',
-            'ev_step_begin','ev_step_end',
-            'vk_nokey','vk_anykey','vk_left','vk_right','vk_up','vk_down','vk_enter','vk_escape','vk_space',
-            'vk_shift','vk_control','vk_alt','vk_backspace','vk_tab','vk_home','vk_end','vk_delete',
-            'vk_insert','vk_pageup','vk_pagedown','vk_pause','vk_printscreen',
-            'vk_f1','vk_f2','vk_f3','vk_f4','vk_f5','vk_f6','vk_f7','vk_f8','vk_f9','vk_f10','vk_f11','vk_f12',
-            'vk_numpad0','vk_numpad1','vk_numpad2','vk_numpad3','vk_numpad4','vk_numpad5','vk_numpad6',
-            'vk_numpad7','vk_numpad8','vk_numpad9', 'vk_multiply','vk_divide','vk_add','vk_subtract',
-            'vk_decimal','vk_lshift','vk_lcontrol','vk_lalt','vk_rshift','vk_rcontrol','vk_ralt',
-            'c_aqua','c_black','c_blue','c_dkgray','c_fuchsia','c_gray','c_green','c_lime','c_ltgray',
-            'c_maroon','c_navy','c_olive','c_purple','c_red','c_silver','c_teal','c_white','c_yellow',
-            'fa_left', 'fa_center','fa_right','fa_top','fa_middle','fa_bottom',
-            'pr_pointlist','pr_linelist','pr_linestrip','pr_trianglelist','pr_trianglestrip',
-            'pr_trianglefan',
-            'cr_none','cr_arrow','cr_cross','cr_beam','cr_size_nesw','cr_size_ns','cr_size_nwse',
-            'cr_size_we','cr_uparrow','cr_hourglass','cr_drag','cr_nodrop','cr_hsplit','cr_vsplit',
-            'cr_multidrag','cr_sqlwait','cr_no','cr_appstart','cr_help','cr_handpoint','cr_size_all',
-            'se_chorus','se_echo','se_flanger','se_gargle','se_reverb','se_compressor','se_equalizer',
-            'fa_readonly','fa_hidden','fa_sysfile','fa_volumeid','fa_directory','fa_archive',
-            'pt_shape_pixel','pt_shape_disk','pt_shape_square','pt_shape_line','pt_shape_star',
-            'pt_shape_circle','pt_shape_ring','pt_shape_sphere','pt_shape_flare','pt_shape_spark',
-            'pt_shape_explosion','pt_shape_cloud','pt_shape_smoke','pt_shape_snow',
-            'ps_shape_rectangle','ps_shape_ellipse ','ps_shape_diamond','ps_shape_line',
-            'ps_distr_linear','ps_distr_gaussian','ps_force_constant','ps_force_linear','ps_force_quadratic',
-            'ps_deflect_horizontal', 'ps_deflect_vertical',
-            'ps_change_motion','ps_change_shape','ps_change_all'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']',
-        '&&', '||', '^^', '&', '|', '^',
-        '<', '<=', '==', '!=', '>', '>=', '=',
-        '<<', '>>',
-        '+=', '-=', '*=', '/=',
-        '+', '-', '*', '/',
-        '!', '~', ',', ';'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'font-weight: bold; color: #000000;',
-            2 => 'font-weight: bold; color: #000000;',
-            3 => 'color: navy;',
-            4 => 'color: #663300;',
-            ),
-        'COMMENTS' => array(
-            1 => 'font-style: italic; color: green;',
-            'MULTI' => 'font-style: italic; color: green;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;' //'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/gnuplot.php b/inc/geshi/gnuplot.php
deleted file mode 100644
index d8445eabb..000000000
--- a/inc/geshi/gnuplot.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/*************************************************************************************
- * gnuplot.php
- * ----------
- * Author: Milian Wolff (mail@milianw.de)
- * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.11
- * Date Started: 2008/07/07
- *
- * Gnuplot script language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/07/07 (1.0.8)
- *  -  Initial import
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Gnuplot',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('`', '"', "'"),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_SCI_SHORT |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        // copy output of help command, indent properly and use this replace regexp:
-        // ([a-z0-9_\-]+)(( )+|$)          =>     '\1',\3
-
-        // commands as found in `help commands`
-        1 => array(
-            'bind', 'call', 'cd', 'clear',
-            'exit', 'fit', 'help', 'history',
-            'if', 'load', 'lower', 'pause',
-            'plot', 'print', 'pwd', 'quit',
-            'raise', 'replot', 'reread', 'reset',
-            'save', 'set', 'shell', 'show',
-            'splot', 'system', 'test', 'unset',
-            'update'
-            ),
-        2 => array(
-            // set commands as returned by `help set`
-            'angles', 'arrow', 'autoscale', 'bars',
-            'bmargin', 'border', 'boxwidth', 'cbdata',
-            'cbdtics', 'cblabel', 'cbmtics', 'cbrange',
-            'cbtics', 'clabel', 'clip', 'cntrparam',
-            'colorbox', 'contour', 'datafile', 'date_specifiers',
-            'decimalsign', 'dgrid3d', 'dummy', 'encoding',
-            'fontpath', 'format', 'grid',
-            'hidden3d', 'historysize', 'isosamples', 'key',
-            'label', 'lmargin', 'loadpath', 'locale',
-            'log', 'logscale', 'macros', 'mapping',
-            'margin', 'missing', 'mouse', 'multiplot',
-            'mx2tics', 'mxtics', 'my2tics', 'mytics',
-            'mztics', 'object', 'offsets', 'origin',
-            'output', 'palette', 'parametric', 'pm3d',
-            'pointsize', 'polar', 'rmargin',
-            'rrange', 'samples', 'size', 'style',
-            'surface', 'table', 'term', 'terminal',
-            'termoption', 'tics', 'ticscale', 'ticslevel',
-            'time_specifiers', 'timefmt', 'timestamp', 'title',
-            'trange', 'urange', 'view',
-            'vrange', 'x2data', 'x2dtics', 'x2label',
-            'x2mtics', 'x2range', 'x2tics', 'x2zeroaxis',
-            'xdata', 'xdtics', 'xlabel', 'xmtics',
-            'xrange', 'xtics', 'xyplane', 'xzeroaxis',
-            'y2data', 'y2dtics', 'y2label', 'y2mtics',
-            'y2range', 'y2tics', 'y2zeroaxis', 'ydata',
-            'ydtics', 'ylabel', 'ymtics', 'yrange',
-            'ytics', 'yzeroaxis', 'zdata', 'zdtics',
-            'zero', 'zeroaxis', 'zlabel', 'zmtics',
-            'zrange', 'ztics', 'zzeroaxis',
-            // same but with leading no
-            'noangles', 'noarrow', 'noautoscale', 'nobars',
-            'nobmargin', 'noborder', 'noboxwidth', 'nocbdata',
-            'nocbdtics', 'nocblabel', 'nocbmtics', 'nocbrange',
-            'nocbtics', 'noclabel', 'noclip', 'nocntrparam',
-            'nocolorbox', 'nocontour', 'nodatafile', 'nodate_specifiers',
-            'nodecimalsign', 'nodgrid3d', 'nodummy', 'noencoding',
-            'nofit', 'nofontpath', 'noformat', 'nogrid',
-            'nohidden3d', 'nohistorysize', 'noisosamples', 'nokey',
-            'nolabel', 'nolmargin', 'noloadpath', 'nolocale',
-            'nolog', 'nologscale', 'nomacros', 'nomapping',
-            'nomargin', 'nomissing', 'nomouse', 'nomultiplot',
-            'nomx2tics', 'nomxtics', 'nomy2tics', 'nomytics',
-            'nomztics', 'noobject', 'nooffsets', 'noorigin',
-            'nooutput', 'nopalette', 'noparametric', 'nopm3d',
-            'nopointsize', 'nopolar', 'noprint', 'normargin',
-            'norrange', 'nosamples', 'nosize', 'nostyle',
-            'nosurface', 'notable', 'noterm', 'noterminal',
-            'notermoption', 'notics', 'noticscale', 'noticslevel',
-            'notime_specifiers', 'notimefmt', 'notimestamp', 'notitle',
-            'notmargin', 'notrange', 'nourange', 'noview',
-            'novrange', 'nox2data', 'nox2dtics', 'nox2label',
-            'nox2mtics', 'nox2range', 'nox2tics', 'nox2zeroaxis',
-            'noxdata', 'noxdtics', 'noxlabel', 'noxmtics',
-            'noxrange', 'noxtics', 'noxyplane', 'noxzeroaxis',
-            'noy2data', 'noy2dtics', 'noy2label', 'noy2mtics',
-            'noy2range', 'noy2tics', 'noy2zeroaxis', 'noydata',
-            'noydtics', 'noylabel', 'noymtics', 'noyrange',
-            'noytics', 'noyzeroaxis', 'nozdata', 'nozdtics',
-            'nozero', 'nozeroaxis', 'nozlabel', 'nozmtics',
-            'nozrange', 'noztics', 'nozzeroaxis',
-            ),
-        3 => array(
-            // predefined variables
-            'pi', 'NaN', 'GNUTERM',
-            'GPVAL_X_MIN', 'GPVAL_X_MAX', 'GPVAL_Y_MIN', 'GPVAL_Y_MAX',
-            'GPVAL_TERM', 'GPVAL_TERMOPTIONS', 'GPVAL_OUTPUT',
-            'GPVAL_VERSION', 'GPVAL_PATcHLEVEL', 'GPVAL_COMPILE_OPTIONS',
-            'MOUSE_KEY', 'MOUSE_X', 'MOUSE_X2', 'MOUSE_Y', 'MOUSE_Y2',
-            'MOUSE_BUTTON', 'MOUSE_SHIFT', 'MOUSE_ALT', 'MOUSE_CTRL'
-            ),
-        4 => array(
-            // predefined functions `help functions`
-            'abs', 'acos', 'acosh', 'arg',
-            'asin', 'asinh', 'atan', 'atan2',
-            'atanh', 'besj0', 'besj1', 'besy0',
-            'besy1', 'ceil', 'column', 'cos',
-            'cosh', 'defined', 'erf', 'erfc',
-            'exists', 'exp', 'floor', 'gamma',
-            'gprintf', 'ibeta', 'igamma', 'imag',
-            'int', 'inverf', 'invnorm', 'lambertw',
-            'lgamma', 'log10', 'norm',
-            'rand', 'random', 'real', 'sgn',
-            'sin', 'sinh', 'sprintf', 'sqrt',
-            'stringcolumn', 'strlen', 'strstrt', 'substr',
-            'tan', 'tanh', 'timecolumn',
-            'tm_hour', 'tm_mday', 'tm_min', 'tm_mon',
-            'tm_sec', 'tm_wday', 'tm_yday', 'tm_year',
-            'valid', 'word', 'words',
-            ),
-        5 => array(
-            // mixed arguments
-            // there is no sane way to get these ones easily...
-            'autofreq', 'x', 'y', 'z',
-            'lt', 'linetype', 'lw', 'linewidth', 'ls', 'linestyle',
-            'out', 'rotate by', 'screen',
-            'enhanced', 'via',
-            // `help set key`
-            'on', 'off', 'default', 'inside', 'outside', 'tmargin',
-            'at', 'left', 'right', 'center', 'top', 'bottom', 'vertical', 'horizontal', 'Left', 'Right',
-            'noreverse', 'reverse', 'noinvert', 'invert', 'samplen', 'spacing', 'width', 'height',
-            'noautotitle', 'autotitle', 'noenhanced', 'nobox', 'box',
-
-            // help set terminal postscript
-            'landscape', 'portrait', 'eps', 'defaultplex', 'simplex', 'duplex',
-            'fontfile', 'add', 'delete', 'nofontfiles', 'level1', 'leveldefault',
-            'color', 'colour', 'monochrome', 'solid', 'dashed', 'dashlength', 'dl',
-            'rounded', 'butt', 'palfuncparam', 'blacktext', 'colortext', 'colourtext',
-            'font',
-
-            // help set terminal png
-            'notransparent', 'transparent', 'nointerlace', 'interlace',
-            'notruecolor', 'truecolor', 'tiny', 'small', 'medium', 'large', 'giant',
-            'nocrop', 'crop',
-
-            // `help plot`
-            'acsplines', 'bezier', 'binary', 'csplines',
-            'every',
-            'example', 'frequency', 'index', 'matrix',
-            'ranges', 'sbezier', 'smooth',
-            'special-filenames', 'thru',
-            'unique', 'using', 'with',
-
-            // `help plotting styles`
-            'boxerrorbars', 'boxes', 'boxxyerrorbars', 'candlesticks',
-            'dots', 'errorbars', 'errorlines', 'filledcurves',
-            'financebars', 'fsteps', 'histeps', 'histograms',
-            'image', 'impulses', 'labels', 'lines',
-            'linespoints', 'points', 'rgbimage', 'steps',
-            'vectors', 'xerrorbars', 'xerrorlines', 'xyerrorbars',
-            'xyerrorlines', 'yerrorbars', 'yerrorlines',
-
-
-            // terminals `help terminals`
-            'aed512', 'aed767', 'aifm', 'bitgraph',
-            'cgm', 'corel', 'dumb', 'dxf',
-            'eepic', 'emf', 'emtex', 'epslatex',
-            'epson-180dpi', 'epson-60dpi', 'epson-lx800', 'fig',
-            'gif', 'gpic', 'hp2623a', 'hp2648',
-            'hp500c', 'hpdj', 'hpgl', 'hpljii',
-            'hppj', 'imagen', 'jpeg', 'kc-tek40xx',
-            'km-tek40xx', 'latex', 'mf', 'mif',
-            'mp', 'nec-cp6', 'okidata', 'pbm',
-            'pcl5', 'png', 'pop', 'postscript',
-            'pslatex', 'pstex', 'pstricks', 'push',
-            'qms', 'regis', 'selanar', 'starc',
-            'svg', 'tandy-60dpi', 'tek40xx', 'tek410x',
-            'texdraw', 'tgif', 'tkcanvas', 'tpic',
-            'vttek', 'x11', 'xlib',
-            )
-        ),
-    'REGEXPS' => array(
-        //Variable assignment
-        0 => "(?<![?;>\w])([a-zA-Z_][a-zA-Z0-9_]*)\s*=",
-        //Numbers with unit
-        1 => "(?<=^|\s)([0-9]*\.?[0-9]+\s*cm)"
-        ),
-    'SYMBOLS' => array(
-        '-', '+', '~', '!', '$',
-        '*', '/', '%', '=', '<', '>', '&',
-        '^', '|', '.', 'eq', 'ne', '?:', ':', '`', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #990000;',
-            3 => 'color: #550000;',
-            4 => 'color: #7a0874;',
-            5 => 'color: #448888;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight:bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000099; font-weight:bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #007800;',
-            1 => 'color: #cc66cc;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => 'http://www.google.com/search?q=%22set+{FNAME}%22+site%3Ahttp%3A%2F%2Fwww.gnuplot.info%2Fdocs%2F&amp;btnI=lucky',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            4 => array(
-                'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%])"
-            )
-        )
-    ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/go.php b/inc/geshi/go.php
deleted file mode 100644
index 5b7a47db6..000000000
--- a/inc/geshi/go.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-/*************************************************************************************
- * go.php
- * --------
- * Author: Markus Jarderot (mizardx at gmail dot com)
- * Copyright: (c) 2010 Markus Jarderot
- * Release Version: 1.0.8.11
- * Date Started: 2010/05/20
- *
- * Go language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/05/20 (1.0.8.9)
- *  -  First Release
- *
- * TODO (updated 2010/05/20)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Go',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        # Raw strings (escapes and linebreaks ignored)
-        2 => "#`[^`]*`#"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        1 => "#\\\\[abfnrtv\\\\\'\"]#",
-        2 => "#\\\\[0-7]{3}#",
-        3 => "#\\\\x[0-9a-fA-F]{2}#",
-        4 => "#\\\\u[0-9a-fA-F]{4}#",
-        5 => "#\\\\U[0-9a-fA-F]{8}#"
-        ),
-    'NUMBERS' => array(
-        # integer literals (possibly imaginary)
-        0 => '\b([1-9][0-9]*i?|0[0-7]*|0[xX][0-9a-f]+|0[0-9]*i)\b',
-        # real floating point literals
-        1 => '\b((?:\d+\.\d*(?:[Ee][+-]?\d+\b)?|\.\d+(?:[Ee][+-]?\d+)?|\d+[Ee][+-]?\d+)?)\b',
-        # imaginary floating point literals
-        2 => '\b((?:\d+\.\d*(?:[Ee][+-]?\d+)?|\.\d+(?:[Ee][+-]?\d+)?|\d+[Ee][+-]?\d+)?i)\b'
-        ),
-    'KEYWORDS' => array(
-        # statements
-        1 => array(
-            'break', 'case', 'const', 'continue', 'default', 'defer', 'else',
-            'fallthrough', 'for', 'go', 'goto', 'if', 'import', 'package',
-            'range', 'return', 'select', 'switch', 'type', 'var'
-            ),
-        # literals
-        2 => array(
-            'nil', 'true', 'false'
-            ),
-        # built-in functions
-        3 => array(
-            'close', 'closed', 'len', 'cap', 'new', 'make', 'copy', 'cmplx',
-            'real', 'imag', 'panic', 'recover', 'print', 'println'
-            ),
-        # built-in types
-        4 => array(
-            'chan', 'func', 'interface', 'map', 'struct', 'bool', 'uint8',
-            'uint16', 'uint32', 'uint64', 'int8', 'int16', 'int32', 'int64',
-            'float32', 'float64', 'complex64', 'complex128', 'byte', 'uint',
-            'int', 'float', 'complex', 'uintptr', 'string'
-            ),
-        # library types
-        5 => array(
-            'aes.Cipher', 'aes.KeySizeError', 'ascii85.CorruptInputError', 'asn1.BitString',
-            'asn1.RawValue', 'asn1.StructuralError', 'asn1.SyntaxError', 'ast.ChanDir',
-            'ast.Comment', 'ast.CommentGroup', 'ast.Decl', 'ast.Expr', 'ast.Field',
-            'ast.FieldList', 'ast.File', 'ast.Filter', 'ast.MergeMode', 'ast.Node',
-            'ast.ObjKind', 'ast.Object', 'ast.Package', 'ast.Scope', 'ast.Stmt',
-            'ast.Visitor', 'av.Color', 'av.Image', 'av.Window', 'base64.CorruptInputError',
-            'base64.Encoding', 'big.Int', 'big.Word', 'bignum.Integer', 'bignum.Rational',
-            'binary.ByteOrder', 'block.Cipher', 'block.EAXTagError', 'blowfish.Cipher',
-            'blowfish.KeySizeError', 'bufio.BufSizeError', 'bufio.Error', 'bufio.ReadWriter',
-            'bufio.Reader', 'bufio.Writer', 'bytes.Buffer', 'datafmt.Environment',
-            'datafmt.Format', 'datafmt.Formatter', 'datafmt.FormatterMap', 'datafmt.State',
-            'doc.Filter', 'doc.FuncDoc', 'doc.PackageDoc', 'doc.TypeDoc', 'doc.ValueDoc',
-            'draw.Color', 'draw.Context', 'draw.Image', 'draw.Mouse', 'draw.Op',
-            'draw.Point', 'draw.Rectangle', 'dwarf.AddrType', 'dwarf.ArrayType',
-            'dwarf.Attr', 'dwarf.BasicType', 'dwarf.BoolType', 'dwarf.CharType',
-            'dwarf.CommonType', 'dwarf.ComplexType', 'dwarf.Data', 'dwarf.DecodeError',
-            'dwarf.DotDotDotType', 'dwarf.Entry', 'dwarf.EnumType', 'dwarf.EnumValue',
-            'dwarf.Field', 'dwarf.FloatType', 'dwarf.FuncType', 'dwarf.IntType',
-            'dwarf.Offset', 'dwarf.PtrType', 'dwarf.QualType', 'dwarf.Reader',
-            'dwarf.StructField', 'dwarf.StructType', 'dwarf.Tag', 'dwarf.Type',
-            'dwarf.TypedefType', 'dwarf.UcharType', 'dwarf.UintType', 'dwarf.VoidType',
-            'elf.Class', 'elf.Data', 'elf.Dyn32', 'elf.Dyn64', 'elf.DynFlag', 'elf.DynTag',
-            'elf.File', 'elf.FileHeader', 'elf.FormatError', 'elf.Header32', 'elf.Header64',
-            'elf.Machine', 'elf.NType', 'elf.OSABI', 'elf.Prog', 'elf.Prog32', 'elf.Prog64',
-            'elf.ProgFlag', 'elf.ProgHeader', 'elf.ProgType', 'elf.R_386', 'elf.R_ALPHA',
-            'elf.R_ARM', 'elf.R_PPC', 'elf.R_SPARC', 'elf.R_X86_64', 'elf.Rel32',
-            'elf.Rel64', 'elf.Rela32', 'elf.Rela64', 'elf.Section', 'elf.Section32',
-            'elf.Section64', 'elf.SectionFlag', 'elf.SectionHeader', 'elf.SectionIndex',
-            'elf.SectionType', 'elf.Sym32', 'elf.Sym64', 'elf.SymBind', 'elf.SymType',
-            'elf.SymVis', 'elf.Symbol', 'elf.Type', 'elf.Version', 'eval.ArrayType',
-            'eval.ArrayValue', 'eval.BoolValue', 'eval.BoundedType', 'eval.ChanType',
-            'eval.Code', 'eval.Constant', 'eval.Def', 'eval.DivByZeroError',
-            'eval.FloatValue', 'eval.Frame', 'eval.Func', 'eval.FuncDecl', 'eval.FuncType',
-            'eval.FuncValue', 'eval.IMethod', 'eval.IdealFloatValue', 'eval.IdealIntValue',
-            'eval.IndexError', 'eval.IntValue', 'eval.Interface', 'eval.InterfaceType',
-            'eval.InterfaceValue', 'eval.KeyError', 'eval.Map', 'eval.MapType',
-            'eval.MapValue', 'eval.Method', 'eval.MultiType', 'eval.NamedType',
-            'eval.NegativeCapacityError', 'eval.NegativeLengthError', 'eval.NilPointerError',
-            'eval.PtrType', 'eval.PtrValue', 'eval.RedefinitionError', 'eval.Scope',
-            'eval.Slice', 'eval.SliceError', 'eval.SliceType', 'eval.SliceValue',
-            'eval.StringValue', 'eval.StructField', 'eval.StructType', 'eval.StructValue',
-            'eval.Thread', 'eval.Type', 'eval.UintValue', 'eval.Value', 'eval.Variable',
-            'eval.World', 'exec.Cmd', 'expvar.Int', 'expvar.IntFunc', 'expvar.KeyValue',
-            'expvar.Map', 'expvar.String', 'expvar.StringFunc', 'expvar.Var', 'flag.Flag',
-            'flag.Value', 'flate.CorruptInputError', 'flate.InternalError',
-            'flate.ReadError', 'flate.Reader', 'flate.WriteError', 'flate.WrongValueError',
-            'fmt.Formatter', 'fmt.GoStringer', 'fmt.State', 'fmt.Stringer',
-            'git85.CorruptInputError', 'gob.Decoder', 'gob.Encoder', 'gosym.DecodingError',
-            'gosym.Func', 'gosym.LineTable', 'gosym.Obj', 'gosym.Sym', 'gosym.Table',
-            'gosym.UnknownFileError', 'gosym.UnknownLineError', 'gzip.Deflater',
-            'gzip.Header', 'gzip.Inflater', 'hash.Hash', 'hash.Hash32', 'hash.Hash64',
-            'heap.Interface', 'hex.InvalidHexCharError', 'hex.OddLengthInputError',
-            'http.ClientConn', 'http.Conn', 'http.Handler', 'http.HandlerFunc',
-            'http.ProtocolError', 'http.Request', 'http.Response', 'http.ServeMux',
-            'http.ServerConn', 'http.URL', 'http.URLError', 'http.URLEscapeError',
-            'image.Alpha', 'image.AlphaColor', 'image.Color', 'image.ColorImage',
-            'image.ColorModel', 'image.ColorModelFunc', 'image.Image', 'image.NRGBA',
-            'image.NRGBA64', 'image.NRGBA64Color', 'image.NRGBAColor', 'image.Paletted',
-            'image.RGBA', 'image.RGBA64', 'image.RGBA64Color', 'image.RGBAColor',
-            'io.Closer', 'io.Error', 'io.PipeReader', 'io.PipeWriter', 'io.ReadByter',
-            'io.ReadCloser', 'io.ReadSeeker', 'io.ReadWriteCloser', 'io.ReadWriteSeeker',
-            'io.ReadWriter', 'io.Reader', 'io.ReaderAt', 'io.ReaderFrom', 'io.SectionReader',
-            'io.Seeker', 'io.WriteCloser', 'io.WriteSeeker', 'io.Writer', 'io.WriterAt',
-            'io.WriterTo', 'iterable.Func', 'iterable.Group', 'iterable.Grouper',
-            'iterable.Injector', 'iterable.Iterable', 'jpeg.FormatError', 'jpeg.Reader',
-            'jpeg.UnsupportedError', 'json.Decoder', 'json.Encoder',
-            'json.InvalidUnmarshalError', 'json.Marshaler', 'json.MarshalerError',
-            'json.SyntaxError', 'json.UnmarshalTypeError', 'json.Unmarshaler',
-            'json.UnsupportedTypeError', 'list.Element', 'list.List', 'log.Logger',
-            'macho.Cpu', 'macho.File', 'macho.FileHeader', 'macho.FormatError', 'macho.Load',
-            'macho.LoadCmd', 'macho.Regs386', 'macho.RegsAMD64', 'macho.Section',
-            'macho.Section32', 'macho.Section64', 'macho.SectionHeader', 'macho.Segment',
-            'macho.Segment32', 'macho.Segment64', 'macho.SegmentHeader', 'macho.Thread',
-            'macho.Type', 'net.Addr', 'net.AddrError', 'net.Conn', 'net.DNSConfigError',
-            'net.DNSError', 'net.Error', 'net.InvalidAddrError', 'net.InvalidConnError',
-            'net.Listener', 'net.OpError', 'net.PacketConn', 'net.TCPAddr', 'net.TCPConn',
-            'net.TCPListener', 'net.UDPAddr', 'net.UDPConn', 'net.UnixAddr', 'net.UnixConn',
-            'net.UnixListener', 'net.UnknownNetworkError', 'net.UnknownSocketError',
-            'netchan.Dir', 'netchan.Exporter', 'netchan.Importer', 'nntp.Article',
-            'nntp.Conn', 'nntp.Error', 'nntp.Group', 'nntp.ProtocolError', 'ogle.Arch',
-            'ogle.ArchAlignedMultiple', 'ogle.ArchLSB', 'ogle.Breakpoint', 'ogle.Event',
-            'ogle.EventAction', 'ogle.EventHandler', 'ogle.EventHook', 'ogle.FormatError',
-            'ogle.Frame', 'ogle.Goroutine', 'ogle.GoroutineCreate', 'ogle.GoroutineExit',
-            'ogle.NoCurrentGoroutine', 'ogle.NotOnStack', 'ogle.Process',
-            'ogle.ProcessNotStopped', 'ogle.ReadOnlyError', 'ogle.RemoteMismatchError',
-            'ogle.UnknownArchitecture', 'ogle.UnknownGoroutine', 'ogle.UsageError',
-            'os.Errno', 'os.Error', 'os.ErrorString', 'os.File', 'os.FileInfo',
-            'os.LinkError', 'os.PathError', 'os.SyscallError', 'os.Waitmsg', 'patch.Diff',
-            'patch.File', 'patch.GitBinaryLiteral', 'patch.Op', 'patch.Set',
-            'patch.SyntaxError', 'patch.TextChunk', 'patch.Verb', 'path.Visitor',
-            'pdp1.HaltError', 'pdp1.LoopError', 'pdp1.Trapper', 'pdp1.UnknownInstrError',
-            'pdp1.Word', 'pem.Block', 'png.FormatError', 'png.IDATDecodingError',
-            'png.UnsupportedError', 'printer.Config', 'printer.HTMLTag', 'printer.Styler',
-            'proc.Breakpoint', 'proc.Cause', 'proc.Process', 'proc.ProcessExited',
-            'proc.Regs', 'proc.Signal', 'proc.Stopped', 'proc.Thread', 'proc.ThreadCreate',
-            'proc.ThreadExit', 'proc.Word', 'quick.CheckEqualError', 'quick.CheckError',
-            'quick.Config', 'quick.Generator', 'quick.SetupError', 'rand.Rand',
-            'rand.Source', 'rand.Zipf', 'rc4.Cipher', 'rc4.KeySizeError',
-            'reflect.ArrayOrSliceType', 'reflect.ArrayOrSliceValue', 'reflect.ArrayType',
-            'reflect.ArrayValue', 'reflect.BoolType', 'reflect.BoolValue', 'reflect.ChanDir',
-            'reflect.ChanType', 'reflect.ChanValue', 'reflect.Complex128Type',
-            'reflect.Complex128Value', 'reflect.Complex64Type', 'reflect.Complex64Value',
-            'reflect.ComplexType', 'reflect.ComplexValue', 'reflect.Float32Type',
-            'reflect.Float32Value', 'reflect.Float64Type', 'reflect.Float64Value',
-            'reflect.FloatType', 'reflect.FloatValue', 'reflect.FuncType',
-            'reflect.FuncValue', 'reflect.Int16Type', 'reflect.Int16Value',
-            'reflect.Int32Type', 'reflect.Int32Value', 'reflect.Int64Type',
-            'reflect.Int64Value', 'reflect.Int8Type', 'reflect.Int8Value', 'reflect.IntType',
-            'reflect.IntValue', 'reflect.InterfaceType', 'reflect.InterfaceValue',
-            'reflect.MapType', 'reflect.MapValue', 'reflect.Method', 'reflect.PtrType',
-            'reflect.PtrValue', 'reflect.SliceHeader', 'reflect.SliceType',
-            'reflect.SliceValue', 'reflect.StringHeader', 'reflect.StringType',
-            'reflect.StringValue', 'reflect.StructField', 'reflect.StructType',
-            'reflect.StructValue', 'reflect.Type', 'reflect.Uint16Type',
-            'reflect.Uint16Value', 'reflect.Uint32Type', 'reflect.Uint32Value',
-            'reflect.Uint64Type', 'reflect.Uint64Value', 'reflect.Uint8Type',
-            'reflect.Uint8Value', 'reflect.UintType', 'reflect.UintValue',
-            'reflect.UintptrType', 'reflect.UintptrValue', 'reflect.UnsafePointerType',
-            'reflect.UnsafePointerValue', 'reflect.Value', 'regexp.Error', 'regexp.Regexp',
-            'ring.Ring', 'rpc.Call', 'rpc.Client', 'rpc.ClientCodec', 'rpc.InvalidRequest',
-            'rpc.Request', 'rpc.Response', 'rpc.ServerCodec', 'rsa.DecryptionError',
-            'rsa.MessageTooLongError', 'rsa.PKCS1v15Hash', 'rsa.PrivateKey', 'rsa.PublicKey',
-            'rsa.VerificationError', 'runtime.ArrayType', 'runtime.BoolType',
-            'runtime.ChanDir', 'runtime.ChanType', 'runtime.Complex128Type',
-            'runtime.Complex64Type', 'runtime.ComplexType', 'runtime.Error',
-            'runtime.Float32Type', 'runtime.Float64Type', 'runtime.FloatType',
-            'runtime.Func', 'runtime.FuncType', 'runtime.Int16Type', 'runtime.Int32Type',
-            'runtime.Int64Type', 'runtime.Int8Type', 'runtime.IntType',
-            'runtime.InterfaceType', 'runtime.Itable', 'runtime.MapType',
-            'runtime.MemProfileRecord', 'runtime.MemStatsType', 'runtime.PtrType',
-            'runtime.SliceType', 'runtime.StringType', 'runtime.StructType', 'runtime.Type',
-            'runtime.TypeAssertionError', 'runtime.Uint16Type', 'runtime.Uint32Type',
-            'runtime.Uint64Type', 'runtime.Uint8Type', 'runtime.UintType',
-            'runtime.UintptrType', 'runtime.UnsafePointerType', 'scanner.Error',
-            'scanner.ErrorHandler', 'scanner.ErrorVector', 'scanner.Position',
-            'scanner.Scanner', 'script.Close', 'script.Closed', 'script.Event',
-            'script.ReceivedUnexpected', 'script.Recv', 'script.RecvMatch', 'script.Send',
-            'script.SetupError', 'signal.Signal', 'signal.UnixSignal', 'sort.Interface',
-            'srpc.Client', 'srpc.Errno', 'srpc.Handler', 'srpc.RPC', 'strconv.NumError',
-            'strings.Reader', 'sync.Mutex', 'sync.RWMutex',
-            'syscall.ByHandleFileInformation', 'syscall.Cmsghdr', 'syscall.Dirent',
-            'syscall.EpollEvent', 'syscall.Fbootstraptransfer_t', 'syscall.FdSet',
-            'syscall.Filetime', 'syscall.Flock_t', 'syscall.Fstore_t', 'syscall.Iovec',
-            'syscall.Kevent_t', 'syscall.Linger', 'syscall.Log2phys_t', 'syscall.Msghdr',
-            'syscall.Overlapped', 'syscall.PtraceRegs', 'syscall.Radvisory_t',
-            'syscall.RawSockaddr', 'syscall.RawSockaddrAny', 'syscall.RawSockaddrInet4',
-            'syscall.RawSockaddrInet6', 'syscall.RawSockaddrUnix', 'syscall.Rlimit',
-            'syscall.Rusage', 'syscall.Sockaddr', 'syscall.SockaddrInet4',
-            'syscall.SockaddrInet6', 'syscall.SockaddrUnix', 'syscall.Stat_t',
-            'syscall.Statfs_t', 'syscall.Sysinfo_t', 'syscall.Time_t', 'syscall.Timespec',
-            'syscall.Timeval', 'syscall.Timex', 'syscall.Tms', 'syscall.Ustat_t',
-            'syscall.Utimbuf', 'syscall.Utsname', 'syscall.WaitStatus',
-            'syscall.Win32finddata', 'syslog.Priority', 'syslog.Writer', 'tabwriter.Writer',
-            'tar.Header', 'tar.Reader', 'tar.Writer', 'template.Error',
-            'template.FormatterMap', 'template.Template', 'testing.Benchmark',
-            'testing.Regexp', 'testing.Test', 'time.ParseError', 'time.Ticker', 'time.Time',
-            'tls.CASet', 'tls.Certificate', 'tls.Config', 'tls.Conn', 'tls.ConnectionState',
-            'tls.Listener', 'token.Position', 'token.Token', 'unicode.CaseRange',
-            'unicode.Range', 'unsafe.ArbitraryType', 'vector.LessInterface',
-            'websocket.Conn', 'websocket.Draft75Handler', 'websocket.Handler',
-            'websocket.ProtocolError', 'websocket.WebSocketAddr', 'x509.Certificate',
-            'x509.ConstraintViolationError', 'x509.KeyUsage', 'x509.Name',
-            'x509.PublicKeyAlgorithm', 'x509.SignatureAlgorithm',
-            'x509.UnhandledCriticalExtension', 'x509.UnsupportedAlgorithmError', 'xml.Attr',
-            'xml.EndElement', 'xml.Name', 'xml.Parser', 'xml.ProcInst', 'xml.StartElement',
-            'xml.SyntaxError', 'xml.Token', 'xml.UnmarshalError', 'xtea.Cipher',
-            'xtea.KeySizeError'
-            )
-        ),
-    'SYMBOLS' => array(
-        # delimiters
-        1 => array(
-            '(', ')', '{', '}', '[', ']', ',', ':', ';'
-            ),
-        # assignments
-        2 => array(
-            '<<=', '!=', '%=', '&=', '&^=', '*=', '+=', '-=', '/=', ':=', '>>=',
-            '^=', '|=', '=', '++', '--'
-            ),
-        # operators
-        3 => array(
-            '<=', '<', '==', '>', '>=', '&&', '!', '||', '&', '&^', '|', '^',
-            '>>', '<<', '*', '%', '+', '-', '.', '/', '<-'),
-        # vararg
-        4 => array(
-            '...'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            # statements
-            1 => 'color: #b1b100; font-weight: bold;',
-            # literals
-            2 => 'color: #000000; font-weight: bold;',
-            # built-in functions
-            3 => 'color: #000066;',
-            # built-in types
-            4 => 'color: #993333;',
-            # library types
-            5 => 'color: #003399;'
-            ),
-        'COMMENTS' => array(
-            # single-line comments
-            1 => 'color: #666666; font-style: italic;',
-            # raw strings
-            2 => 'color: #0000ff;',
-            # multi-line comments
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            # simple escape
-            1 => 'color: #000099; font-weight: bold;',
-            # octal escape
-            2 => 'color: #000099;',
-            # hex escape
-            3 => 'color: #000099;',
-            # unicode escape
-            4 => 'color: #000099;',
-            # long unicode escape
-            5 => 'color: #000099;'
-            ),
-        'BRACKETS' => array(
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;',
-            0 => 'color: #cc66cc;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            # delimiters
-            1 => 'color: #339933;',
-            # assignments
-            2 => 'color: #339933;',
-            # operators
-            3 => 'color: #339933;',
-            # vararg (highlighted as a keyword)
-            4 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            # If CSS classes are enabled, these would be highlighted as numbers (nu0)
-            # integer literals (possibly imaginary)
-            //0 => 'color: #cc66cc;',
-            # real floating point literals
-            //1 => 'color: #cc66cc;',
-            # imaginary floating point literals
-            //2 => 'color: #cc66cc;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => 'http://golang.org/search?q={FNAME}'
-        ),
-    'REGEXPS' => array(
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(1 => '.'),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER, # handled by symbols
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/groovy.php b/inc/geshi/groovy.php
deleted file mode 100644
index 45290d2fc..000000000
--- a/inc/geshi/groovy.php
+++ /dev/null
@@ -1,1011 +0,0 @@
-<?php
-/*************************************************************************************
- * groovy.php
- * ----------
- * Author: Ivan F. Villanueva B. (geshi_groovy@artificialidea.com)
- * Copyright: (c) 2006 Ivan F. Villanueva B.(http://www.artificialidea.com)
- * Release Version: 1.0.8.11
- * Date Started: 2006/04/29
- *
- * Groovy language file for GeSHi.
- *
- * Keywords from http: http://docs.codehaus.org/download/attachments/2715/groovy-reference-card.pdf?version=1
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2006/04/29 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2006/04/29)
- * -------------------------
- * Testing
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Groovy',
-    'COMMENT_SINGLE' => array(1 => '//', 3 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Import and Package directives (Basic Support only)
-        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'''", '"""', "'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'case', 'do', 'else', 'for', 'foreach', 'if', 'in', 'switch',
-            'while',
-            ),
-        2 => array(
-            'abstract', 'as', 'assert', 'break', 'catch', 'class', 'const',
-            'continue', 'def', 'default', 'enum', 'extends',
-            'false', 'final', 'finally', 'goto', 'implements', 'import',
-            'instanceof', 'interface', 'native', 'new', 'null',
-            'package', 'private', 'property', 'protected',
-            'public', 'return', 'static', 'strictfp', 'super',
-            'synchronized', 'this', 'throw', 'throws',
-            'transient', 'true', 'try', 'volatile'
-            ),
-        3 => array(
-            'AbstractAction', 'AbstractBorder', 'AbstractButton',
-            'AbstractCellEditor', 'AbstractCollection',
-            'AbstractColorChooserPanel', 'AbstractDocument',
-            'AbstractDocument.AttributeContext',
-            'AbstractDocument.Content',
-            'AbstractDocument.ElementEdit',
-            'AbstractLayoutCache',
-            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
-            'AbstractListModel', 'AbstractMap',
-            'AbstractMethodError', 'AbstractSequentialList',
-            'AbstractSet', 'AbstractTableModel',
-            'AbstractUndoableEdit', 'AbstractWriter',
-            'AccessControlContext', 'AccessControlException',
-            'AccessController', 'AccessException', 'Accessible',
-            'AccessibleAction', 'AccessibleBundle',
-            'AccessibleComponent', 'AccessibleContext',
-            'AccessibleHyperlink', 'AccessibleHypertext',
-            'AccessibleIcon', 'AccessibleObject',
-            'AccessibleRelation', 'AccessibleRelationSet',
-            'AccessibleResourceBundle', 'AccessibleRole',
-            'AccessibleSelection', 'AccessibleState',
-            'AccessibleStateSet', 'AccessibleTable',
-            'AccessibleTableModelChange', 'AccessibleText',
-            'AccessibleValue', 'Acl', 'AclEntry',
-            'AclNotFoundException', 'Action', 'ActionEvent',
-            'ActionListener', 'ActionMap', 'ActionMapUIResource',
-            'Activatable', 'ActivateFailedException',
-            'ActivationDesc', 'ActivationException',
-            'ActivationGroup', 'ActivationGroupDesc',
-            'ActivationGroupDesc.CommandEnvironment',
-            'ActivationGroupID', 'ActivationID',
-            'ActivationInstantiator', 'ActivationMonitor',
-            'ActivationSystem', 'Activator', 'ActiveEvent',
-            'Adjustable', 'AdjustmentEvent',
-            'AdjustmentListener', 'Adler32', 'AffineTransform',
-            'AffineTransformOp', 'AlgorithmParameterGenerator',
-            'AlgorithmParameterGeneratorSpi',
-            'AlgorithmParameters', 'AlgorithmParameterSpec',
-            'AlgorithmParametersSpi', 'AllPermission',
-            'AlphaComposite', 'AlreadyBound',
-            'AlreadyBoundException', 'AlreadyBoundHelper',
-            'AlreadyBoundHolder', 'AncestorEvent',
-            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
-            'AnySeqHelper', 'AnySeqHolder', 'Applet',
-            'AppletContext', 'AppletInitializer', 'AppletStub',
-            'ApplicationException', 'Arc2D', 'Arc2D.Double',
-            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
-            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
-            'ArithmeticException', 'Array',
-            'ArrayIndexOutOfBoundsException', 'ArrayList',
-            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
-            'Attribute', 'AttributedCharacterIterator',
-            'AttributedCharacterIterator.Attribute',
-            'AttributedString', 'AttributeInUseException',
-            'AttributeList', 'AttributeModificationException',
-            'Attributes', 'Attributes.Name', 'AttributeSet',
-            'AttributeSet.CharacterAttribute',
-            'AttributeSet.ColorAttribute',
-            'AttributeSet.FontAttribute',
-            'AttributeSet.ParagraphAttribute', 'AudioClip',
-            'AudioFileFormat', 'AudioFileFormat.Type',
-            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
-            'AudioFormat.Encoding', 'AudioInputStream',
-            'AudioPermission', 'AudioSystem',
-            'AuthenticationException',
-            'AuthenticationNotSupportedException',
-            'Authenticator', 'Autoscroll', 'AWTError',
-            'AWTEvent', 'AWTEventListener',
-            'AWTEventMulticaster', 'AWTException',
-            'AWTPermission', 'BadKind', 'BadLocationException',
-            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
-            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
-            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
-            'BandedSampleModel', 'BasicArrowButton',
-            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
-            'BasicBorders.ButtonBorder',
-            'BasicBorders.FieldBorder',
-            'BasicBorders.MarginBorder',
-            'BasicBorders.MenuBarBorder',
-            'BasicBorders.RadioButtonBorder',
-            'BasicBorders.SplitPaneBorder',
-            'BasicBorders.ToggleButtonBorder',
-            'BasicButtonListener', 'BasicButtonUI',
-            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
-            'BasicColorChooserUI', 'BasicComboBoxEditor',
-            'BasicComboBoxEditor.UIResource',
-            'BasicComboBoxRenderer',
-            'BasicComboBoxRenderer.UIResource',
-            'BasicComboBoxUI', 'BasicComboPopup',
-            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
-            'BasicDirectoryModel', 'BasicEditorPaneUI',
-            'BasicFileChooserUI', 'BasicGraphicsUtils',
-            'BasicHTML', 'BasicIconFactory',
-            'BasicInternalFrameTitlePane',
-            'BasicInternalFrameUI', 'BasicLabelUI',
-            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
-            'BasicMenuItemUI', 'BasicMenuUI',
-            'BasicOptionPaneUI',
-            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
-            'BasicPasswordFieldUI', 'BasicPermission',
-            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
-            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
-            'BasicRadioButtonUI', 'BasicRootPaneUI',
-            'BasicScrollBarUI', 'BasicScrollPaneUI',
-            'BasicSeparatorUI', 'BasicSliderUI',
-            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
-            'BasicStroke', 'BasicTabbedPaneUI',
-            'BasicTableHeaderUI', 'BasicTableUI',
-            'BasicTextAreaUI', 'BasicTextFieldUI',
-            'BasicTextPaneUI', 'BasicTextUI',
-            'BasicTextUI.BasicCaret',
-            'BasicTextUI.BasicHighlighter',
-            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
-            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
-            'BasicViewportUI', 'BatchUpdateException',
-            'BeanContext', 'BeanContextChild',
-            'BeanContextChildComponentProxy',
-            'BeanContextChildSupport',
-            'BeanContextContainerProxy', 'BeanContextEvent',
-            'BeanContextMembershipEvent',
-            'BeanContextMembershipListener', 'BeanContextProxy',
-            'BeanContextServiceAvailableEvent',
-            'BeanContextServiceProvider',
-            'BeanContextServiceProviderBeanInfo',
-            'BeanContextServiceRevokedEvent',
-            'BeanContextServiceRevokedListener',
-            'BeanContextServices', 'BeanContextServicesListener',
-            'BeanContextServicesSupport',
-            'BeanContextServicesSupport.BCSSServiceProvider',
-            'BeanContextSupport',
-            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
-            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
-            'BigInteger', 'BinaryRefAddr', 'BindException',
-            'Binding', 'BindingHelper', 'BindingHolder',
-            'BindingIterator', 'BindingIteratorHelper',
-            'BindingIteratorHolder', 'BindingIteratorOperations',
-            'BindingListHelper', 'BindingListHolder',
-            'BindingType', 'BindingTypeHelper',
-            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
-            'Book', 'Boolean', 'BooleanControl',
-            'BooleanControl.Type', 'BooleanHolder',
-            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
-            'BorderFactory', 'BorderLayout', 'BorderUIResource',
-            'BorderUIResource.BevelBorderUIResource',
-            'BorderUIResource.CompoundBorderUIResource',
-            'BorderUIResource.EmptyBorderUIResource',
-            'BorderUIResource.EtchedBorderUIResource',
-            'BorderUIResource.LineBorderUIResource',
-            'BorderUIResource.MatteBorderUIResource',
-            'BorderUIResource.TitledBorderUIResource',
-            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
-            'BoxedValueHelper', 'BoxLayout', 'BoxView',
-            'BreakIterator', 'BufferedImage',
-            'BufferedImageFilter', 'BufferedImageOp',
-            'BufferedInputStream', 'BufferedOutputStream',
-            'BufferedReader', 'BufferedWriter', 'Button',
-            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
-            'ByteArrayInputStream', 'ByteArrayOutputStream',
-            'ByteHolder', 'ByteLookupTable', 'Calendar',
-            'CallableStatement', 'CannotProceed',
-            'CannotProceedException', 'CannotProceedHelper',
-            'CannotProceedHolder', 'CannotRedoException',
-            'CannotUndoException', 'Canvas', 'CardLayout',
-            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
-            'CellEditorListener', 'CellRendererPane',
-            'Certificate', 'Certificate.CertificateRep',
-            'CertificateEncodingException',
-            'CertificateException',
-            'CertificateExpiredException', 'CertificateFactory',
-            'CertificateFactorySpi',
-            'CertificateNotYetValidException',
-            'CertificateParsingException',
-            'ChangedCharSetException', 'ChangeEvent',
-            'ChangeListener', 'Character', 'Character.Subset',
-            'Character.UnicodeBlock', 'CharacterIterator',
-            'CharArrayReader', 'CharArrayWriter',
-            'CharConversionException', 'CharHolder',
-            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
-            'CheckboxGroup', 'CheckboxMenuItem',
-            'CheckedInputStream', 'CheckedOutputStream',
-            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
-            'ClassCastException', 'ClassCircularityError',
-            'ClassDesc', 'ClassFormatError', 'ClassLoader',
-            'ClassNotFoundException', 'Clip', 'Clipboard',
-            'ClipboardOwner', 'Clob', 'Cloneable',
-            'CloneNotSupportedException', 'CMMException',
-            'CodeSource', 'CollationElementIterator',
-            'CollationKey', 'Collator', 'Collection',
-            'Collections', 'Color',
-            'ColorChooserComponentFactory', 'ColorChooserUI',
-            'ColorConvertOp', 'ColorModel',
-            'ColorSelectionModel', 'ColorSpace',
-            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
-            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
-            'COMM_FAILURE', 'Comparable', 'Comparator',
-            'Compiler', 'CompletionStatus',
-            'CompletionStatusHelper', 'Component',
-            'ComponentAdapter', 'ComponentColorModel',
-            'ComponentEvent', 'ComponentInputMap',
-            'ComponentInputMapUIResource', 'ComponentListener',
-            'ComponentOrientation', 'ComponentSampleModel',
-            'ComponentUI', 'ComponentView', 'Composite',
-            'CompositeContext', 'CompositeName', 'CompositeView',
-            'CompoundBorder', 'CompoundControl',
-            'CompoundControl.Type', 'CompoundEdit',
-            'CompoundName', 'ConcurrentModificationException',
-            'ConfigurationException', 'ConnectException',
-            'ConnectIOException', 'Connection', 'Constructor',
-            'Container', 'ContainerAdapter', 'ContainerEvent',
-            'ContainerListener', 'ContentHandler',
-            'ContentHandlerFactory', 'ContentModel', 'Context',
-            'ContextList', 'ContextNotEmptyException',
-            'ContextualRenderedImageFactory', 'Control',
-            'Control.Type', 'ControlFactory',
-            'ControllerEventListener', 'ConvolveOp', 'CRC32',
-            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
-            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
-            'CubicCurve2D', 'CubicCurve2D.Double',
-            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
-            'CurrentHolder', 'CurrentOperations', 'Cursor',
-            'Customizer', 'CustomMarshal', 'CustomValue',
-            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
-            'DataBufferInt', 'DataBufferShort',
-            'DataBufferUShort', 'DataFlavor',
-            'DataFormatException', 'DatagramPacket',
-            'DatagramSocket', 'DatagramSocketImpl',
-            'DatagramSocketImplFactory', 'DataInput',
-            'DataInputStream', 'DataLine', 'DataLine.Info',
-            'DataOutput', 'DataOutputStream', 'DataTruncation',
-            'DATA_CONVERSION', 'Date', 'DateFormat',
-            'DateFormatSymbols', 'DebugGraphics',
-            'DecimalFormat', 'DecimalFormatSymbols',
-            'DefaultBoundedRangeModel', 'DefaultButtonModel',
-            'DefaultCaret', 'DefaultCellEditor',
-            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
-            'DefaultDesktopManager', 'DefaultEditorKit',
-            'DefaultEditorKit.BeepAction',
-            'DefaultEditorKit.CopyAction',
-            'DefaultEditorKit.CutAction',
-            'DefaultEditorKit.DefaultKeyTypedAction',
-            'DefaultEditorKit.InsertBreakAction',
-            'DefaultEditorKit.InsertContentAction',
-            'DefaultEditorKit.InsertTabAction',
-            'DefaultEditorKit.PasteAction,',
-            'DefaultFocusManager', 'DefaultHighlighter',
-            'DefaultHighlighter.DefaultHighlightPainter',
-            'DefaultListCellRenderer',
-            'DefaultListCellRenderer.UIResource',
-            'DefaultListModel', 'DefaultListSelectionModel',
-            'DefaultMenuLayout', 'DefaultMetalTheme',
-            'DefaultMutableTreeNode',
-            'DefaultSingleSelectionModel',
-            'DefaultStyledDocument',
-            'DefaultStyledDocument.AttributeUndoableEdit',
-            'DefaultStyledDocument.ElementSpec',
-            'DefaultTableCellRenderer',
-            'DefaultTableCellRenderer.UIResource',
-            'DefaultTableColumnModel', 'DefaultTableModel',
-            'DefaultTextUI', 'DefaultTreeCellEditor',
-            'DefaultTreeCellRenderer', 'DefaultTreeModel',
-            'DefaultTreeSelectionModel', 'DefinitionKind',
-            'DefinitionKindHelper', 'Deflater',
-            'DeflaterOutputStream', 'Delegate', 'DesignMode',
-            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
-            'DGC', 'Dialog', 'Dictionary', 'DigestException',
-            'DigestInputStream', 'DigestOutputStream',
-            'Dimension', 'Dimension2D', 'DimensionUIResource',
-            'DirContext', 'DirectColorModel', 'DirectoryManager',
-            'DirObjectFactory', 'DirStateFactory',
-            'DirStateFactory.Result', 'DnDConstants', 'Document',
-            'DocumentEvent', 'DocumentEvent.ElementChange',
-            'DocumentEvent.EventType', 'DocumentListener',
-            'DocumentParser', 'DomainCombiner', 'DomainManager',
-            'DomainManagerOperations', 'Double', 'DoubleHolder',
-            'DoubleSeqHelper', 'DoubleSeqHolder',
-            'DragGestureEvent', 'DragGestureListener',
-            'DragGestureRecognizer', 'DragSource',
-            'DragSourceContext', 'DragSourceDragEvent',
-            'DragSourceDropEvent', 'DragSourceEvent',
-            'DragSourceListener', 'Driver', 'DriverManager',
-            'DriverPropertyInfo', 'DropTarget',
-            'DropTarget.DropTargetAutoScroller',
-            'DropTargetContext', 'DropTargetDragEvent',
-            'DropTargetDropEvent', 'DropTargetEvent',
-            'DropTargetListener', 'DSAKey',
-            'DSAKeyPairGenerator', 'DSAParameterSpec',
-            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
-            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
-            'DTDConstants', 'DynamicImplementation', 'DynAny',
-            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
-            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
-            'Element', 'ElementIterator', 'Ellipse2D',
-            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
-            'EmptyStackException', 'EncodedKeySpec', 'Entity',
-            'EnumControl', 'EnumControl.Type', 'Enumeration',
-            'Environment', 'EOFException', 'Error',
-            'EtchedBorder', 'Event', 'EventContext',
-            'EventDirContext', 'EventListener',
-            'EventListenerList', 'EventObject', 'EventQueue',
-            'EventSetDescriptor', 'Exception',
-            'ExceptionInInitializerError', 'ExceptionList',
-            'ExpandVetoException', 'ExportException',
-            'ExtendedRequest', 'ExtendedResponse',
-            'Externalizable', 'FeatureDescriptor', 'Field',
-            'FieldNameHelper', 'FieldPosition', 'FieldView',
-            'File', 'FileChooserUI', 'FileDescriptor',
-            'FileDialog', 'FileFilter', 'FileInputStream',
-            'FilenameFilter', 'FileNameMap',
-            'FileNotFoundException', 'FileOutputStream',
-            'FilePermission', 'FileReader', 'FileSystemView',
-            'FileView', 'FileWriter', 'FilteredImageSource',
-            'FilterInputStream', 'FilterOutputStream',
-            'FilterReader', 'FilterWriter',
-            'FixedHeightLayoutCache', 'FixedHolder',
-            'FlatteningPathIterator', 'FlavorMap', 'Float',
-            'FloatControl', 'FloatControl.Type', 'FloatHolder',
-            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
-            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
-            'FocusEvent', 'FocusListener', 'FocusManager',
-            'Font', 'FontFormatException', 'FontMetrics',
-            'FontRenderContext', 'FontUIResource', 'Format',
-            'FormatConversionProvider', 'FormView', 'Frame',
-            'FREE_MEM', 'GapContent', 'GeneralPath',
-            'GeneralSecurityException', 'GlyphJustificationInfo',
-            'GlyphMetrics', 'GlyphVector', 'GlyphView',
-            'GlyphView.GlyphPainter', 'GradientPaint',
-            'GraphicAttribute', 'Graphics', 'Graphics2D',
-            'GraphicsConfigTemplate', 'GraphicsConfiguration',
-            'GraphicsDevice', 'GraphicsEnvironment',
-            'GrayFilter', 'GregorianCalendar',
-            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
-            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
-            'GZIPOutputStream', 'HasControls', 'HashMap',
-            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
-            'HierarchyBoundsListener', 'HierarchyEvent',
-            'HierarchyListener', 'Highlighter',
-            'Highlighter.Highlight',
-            'Highlighter.HighlightPainter', 'HTML',
-            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
-            'HTMLDocument', 'HTMLDocument.Iterator',
-            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
-            'HTMLEditorKit.HTMLTextAction',
-            'HTMLEditorKit.InsertHTMLTextAction',
-            'HTMLEditorKit.LinkController',
-            'HTMLEditorKit.Parser',
-            'HTMLEditorKit.ParserCallback',
-            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
-            'HttpURLConnection', 'HyperlinkEvent',
-            'HyperlinkEvent.EventType', 'HyperlinkListener',
-            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
-            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
-            'IconView', 'IdentifierHelper', 'Identity',
-            'IdentityScope', 'IDLEntity', 'IDLType',
-            'IDLTypeHelper', 'IDLTypeOperations',
-            'IllegalAccessError', 'IllegalAccessException',
-            'IllegalArgumentException',
-            'IllegalComponentStateException',
-            'IllegalMonitorStateException',
-            'IllegalPathStateException', 'IllegalStateException',
-            'IllegalThreadStateException', 'Image',
-            'ImageConsumer', 'ImageFilter',
-            'ImageGraphicAttribute', 'ImageIcon',
-            'ImageObserver', 'ImageProducer',
-            'ImagingOpException', 'IMP_LIMIT',
-            'IncompatibleClassChangeError',
-            'InconsistentTypeCode', 'IndexColorModel',
-            'IndexedPropertyDescriptor',
-            'IndexOutOfBoundsException', 'IndirectionException',
-            'InetAddress', 'Inflater', 'InflaterInputStream',
-            'InheritableThreadLocal', 'InitialContext',
-            'InitialContextFactory',
-            'InitialContextFactoryBuilder', 'InitialDirContext',
-            'INITIALIZE', 'Initializer', 'InitialLdapContext',
-            'InlineView', 'InputContext', 'InputEvent',
-            'InputMap', 'InputMapUIResource', 'InputMethod',
-            'InputMethodContext', 'InputMethodDescriptor',
-            'InputMethodEvent', 'InputMethodHighlight',
-            'InputMethodListener', 'InputMethodRequests',
-            'InputStream', 'InputStreamReader', 'InputSubset',
-            'InputVerifier', 'Insets', 'InsetsUIResource',
-            'InstantiationError', 'InstantiationException',
-            'Instrument', 'InsufficientResourcesException',
-            'Integer', 'INTERNAL', 'InternalError',
-            'InternalFrameAdapter', 'InternalFrameEvent',
-            'InternalFrameListener', 'InternalFrameUI',
-            'InterruptedException', 'InterruptedIOException',
-            'InterruptedNamingException', 'INTF_REPOS',
-            'IntHolder', 'IntrospectionException',
-            'Introspector', 'Invalid',
-            'InvalidAlgorithmParameterException',
-            'InvalidAttributeIdentifierException',
-            'InvalidAttributesException',
-            'InvalidAttributeValueException',
-            'InvalidClassException',
-            'InvalidDnDOperationException',
-            'InvalidKeyException', 'InvalidKeySpecException',
-            'InvalidMidiDataException', 'InvalidName',
-            'InvalidNameException', 'InvalidNameHelper',
-            'InvalidNameHolder', 'InvalidObjectException',
-            'InvalidParameterException',
-            'InvalidParameterSpecException',
-            'InvalidSearchControlsException',
-            'InvalidSearchFilterException', 'InvalidSeq',
-            'InvalidTransactionException', 'InvalidValue',
-            'INVALID_TRANSACTION', 'InvocationEvent',
-            'InvocationHandler', 'InvocationTargetException',
-            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
-            'INV_OBJREF', 'INV_POLICY', 'IOException',
-            'IRObject', 'IRObjectOperations', 'IstringHelper',
-            'ItemEvent', 'ItemListener', 'ItemSelectable',
-            'Iterator', 'JApplet', 'JarEntry', 'JarException',
-            'JarFile', 'JarInputStream', 'JarOutputStream',
-            'JarURLConnection', 'JButton', 'JCheckBox',
-            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
-            'JComboBox.KeySelectionManager', 'JComponent',
-            'JDesktopPane', 'JDialog', 'JEditorPane',
-            'JFileChooser', 'JFrame', 'JInternalFrame',
-            'JInternalFrame.JDesktopIcon', 'JLabel',
-            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
-            'JMenuItem', 'JobAttributes',
-            'JobAttributes.DefaultSelectionType',
-            'JobAttributes.DestinationType',
-            'JobAttributes.DialogType',
-            'JobAttributes.MultipleDocumentHandlingType',
-            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
-            'JPasswordField', 'JPopupMenu',
-            'JPopupMenu.Separator', 'JProgressBar',
-            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
-            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
-            'JSplitPane', 'JTabbedPane', 'JTable',
-            'JTableHeader', 'JTextArea', 'JTextComponent',
-            'JTextComponent.KeyBinding', 'JTextField',
-            'JTextPane', 'JToggleButton',
-            'JToggleButton.ToggleButtonModel', 'JToolBar',
-            'JToolBar.Separator', 'JToolTip', 'JTree',
-            'JTree.DynamicUtilTreeNode',
-            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
-            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
-            'KeyException', 'KeyFactory', 'KeyFactorySpi',
-            'KeyListener', 'KeyManagementException', 'Keymap',
-            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
-            'KeySpec', 'KeyStore', 'KeyStoreException',
-            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
-            'LabelView', 'LastOwnerException',
-            'LayeredHighlighter',
-            'LayeredHighlighter.LayerPainter', 'LayoutManager',
-            'LayoutManager2', 'LayoutQueue', 'LdapContext',
-            'LdapReferralException', 'Lease',
-            'LimitExceededException', 'Line', 'Line.Info',
-            'Line2D', 'Line2D.Double', 'Line2D.Float',
-            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
-            'LineEvent.Type', 'LineListener', 'LineMetrics',
-            'LineNumberInputStream', 'LineNumberReader',
-            'LineUnavailableException', 'LinkageError',
-            'LinkedList', 'LinkException', 'LinkLoopException',
-            'LinkRef', 'List', 'ListCellRenderer',
-            'ListDataEvent', 'ListDataListener', 'ListIterator',
-            'ListModel', 'ListResourceBundle',
-            'ListSelectionEvent', 'ListSelectionListener',
-            'ListSelectionModel', 'ListUI', 'ListView',
-            'LoaderHandler', 'Locale', 'LocateRegistry',
-            'LogStream', 'Long', 'LongHolder',
-            'LongLongSeqHelper', 'LongLongSeqHolder',
-            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
-            'LookupOp', 'LookupTable', 'MalformedLinkException',
-            'MalformedURLException', 'Manifest', 'Map',
-            'Map.Entry', 'MARSHAL', 'MarshalException',
-            'MarshalledObject', 'Math', 'MatteBorder',
-            'MediaTracker', 'Member', 'MemoryImageSource',
-            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
-            'MenuContainer', 'MenuDragMouseEvent',
-            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
-            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
-            'MenuKeyListener', 'MenuListener',
-            'MenuSelectionManager', 'MenuShortcut',
-            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
-            'MetaEventListener', 'MetalBorders',
-            'MetalBorders.ButtonBorder',
-            'MetalBorders.Flush3DBorder',
-            'MetalBorders.InternalFrameBorder',
-            'MetalBorders.MenuBarBorder',
-            'MetalBorders.MenuItemBorder',
-            'MetalBorders.OptionDialogBorder',
-            'MetalBorders.PaletteBorder',
-            'MetalBorders.PopupMenuBorder',
-            'MetalBorders.RolloverButtonBorder',
-            'MetalBorders.ScrollPaneBorder',
-            'MetalBorders.TableHeaderBorder',
-            'MetalBorders.TextFieldBorder',
-            'MetalBorders.ToggleButtonBorder',
-            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
-            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
-            'MetalComboBoxButton', 'MetalComboBoxEditor',
-            'MetalComboBoxEditor.UIResource',
-            'MetalComboBoxIcon', 'MetalComboBoxUI',
-            'MetalDesktopIconUI', 'MetalFileChooserUI',
-            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
-            'MetalIconFactory.FolderIcon16',
-            'MetalIconFactory.PaletteCloseIcon',
-            'MetalIconFactory.TreeControlIcon',
-            'MetalIconFactory.TreeFolderIcon',
-            'MetalIconFactory.TreeLeafIcon',
-            'MetalInternalFrameTitlePane',
-            'MetalInternalFrameUI', 'MetalLabelUI',
-            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
-            'MetalProgressBarUI', 'MetalRadioButtonUI',
-            'MetalScrollBarUI', 'MetalScrollButton',
-            'MetalScrollPaneUI', 'MetalSeparatorUI',
-            'MetalSliderUI', 'MetalSplitPaneUI',
-            'MetalTabbedPaneUI', 'MetalTextFieldUI',
-            'MetalTheme', 'MetalToggleButtonUI',
-            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
-            'MetaMessage', 'Method', 'MethodDescriptor',
-            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
-            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
-            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
-            'MidiSystem', 'MidiUnavailableException',
-            'MimeTypeParseException', 'MinimalHTMLWriter',
-            'MissingResourceException', 'Mixer', 'Mixer.Info',
-            'MixerProvider', 'ModificationItem', 'Modifier',
-            'MouseAdapter', 'MouseDragGestureRecognizer',
-            'MouseEvent', 'MouseInputAdapter',
-            'MouseInputListener', 'MouseListener',
-            'MouseMotionAdapter', 'MouseMotionListener',
-            'MultiButtonUI', 'MulticastSocket',
-            'MultiColorChooserUI', 'MultiComboBoxUI',
-            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
-            'MultiFileChooserUI', 'MultiInternalFrameUI',
-            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
-            'MultiMenuBarUI', 'MultiMenuItemUI',
-            'MultiOptionPaneUI', 'MultiPanelUI',
-            'MultiPixelPackedSampleModel', 'MultipleMaster',
-            'MultiPopupMenuUI', 'MultiProgressBarUI',
-            'MultiScrollBarUI', 'MultiScrollPaneUI',
-            'MultiSeparatorUI', 'MultiSliderUI',
-            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
-            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
-            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
-            'MultiViewportUI', 'MutableAttributeSet',
-            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
-            'NameAlreadyBoundException', 'NameClassPair',
-            'NameComponent', 'NameComponentHelper',
-            'NameComponentHolder', 'NamedValue', 'NameHelper',
-            'NameHolder', 'NameNotFoundException', 'NameParser',
-            'NamespaceChangeListener', 'NameValuePair',
-            'NameValuePairHelper', 'Naming', 'NamingContext',
-            'NamingContextHelper', 'NamingContextHolder',
-            'NamingContextOperations', 'NamingEnumeration',
-            'NamingEvent', 'NamingException',
-            'NamingExceptionEvent', 'NamingListener',
-            'NamingManager', 'NamingSecurityException',
-            'NegativeArraySizeException', 'NetPermission',
-            'NoClassDefFoundError', 'NoInitialContextException',
-            'NoninvertibleTransformException',
-            'NoPermissionException', 'NoRouteToHostException',
-            'NoSuchAlgorithmException',
-            'NoSuchAttributeException', 'NoSuchElementException',
-            'NoSuchFieldError', 'NoSuchFieldException',
-            'NoSuchMethodError', 'NoSuchMethodException',
-            'NoSuchObjectException', 'NoSuchProviderException',
-            'NotActiveException', 'NotBoundException',
-            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
-            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
-            'NotFoundHolder', 'NotFoundReason',
-            'NotFoundReasonHelper', 'NotFoundReasonHolder',
-            'NotOwnerException', 'NotSerializableException',
-            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
-            'NO_RESOURCES', 'NO_RESPONSE',
-            'NullPointerException', 'Number', 'NumberFormat',
-            'NumberFormatException', 'NVList', 'Object',
-            'ObjectChangeListener', 'ObjectFactory',
-            'ObjectFactoryBuilder', 'ObjectHelper',
-            'ObjectHolder', 'ObjectImpl', 'ObjectInput',
-            'ObjectInputStream', 'ObjectInputStream.GetField',
-            'ObjectInputValidation', 'ObjectOutput',
-            'ObjectOutputStream', 'ObjectOutputStream.PutField',
-            'ObjectStreamClass', 'ObjectStreamConstants',
-            'ObjectStreamException', 'ObjectStreamField',
-            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
-            'OBJ_ADAPTER', 'Observable', 'Observer',
-            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
-            'OpenType', 'Operation',
-            'OperationNotSupportedException', 'Option',
-            'OptionalDataException', 'OptionPaneUI', 'ORB',
-            'OutOfMemoryError', 'OutputStream',
-            'OutputStreamWriter', 'OverlayLayout', 'Owner',
-            'Package', 'PackedColorModel', 'Pageable',
-            'PageAttributes', 'PageAttributes.ColorType',
-            'PageAttributes.MediaType',
-            'PageAttributes.OrientationRequestedType',
-            'PageAttributes.OriginType',
-            'PageAttributes.PrintQualityType', 'PageFormat',
-            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
-            'PanelUI', 'Paper', 'ParagraphView',
-            'ParameterBlock', 'ParameterDescriptor',
-            'ParseException', 'ParsePosition', 'Parser',
-            'ParserDelegator', 'PartialResultException',
-            'PasswordAuthentication', 'PasswordView', 'Patch',
-            'PathIterator', 'Permission', 'PermissionCollection',
-            'Permissions', 'PERSIST_STORE', 'PhantomReference',
-            'PipedInputStream', 'PipedOutputStream',
-            'PipedReader', 'PipedWriter', 'PixelGrabber',
-            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
-            'PlainDocument', 'PlainView', 'Point', 'Point2D',
-            'Point2D.Double', 'Point2D.Float', 'Policy',
-            'PolicyError', 'PolicyHelper', 'PolicyHolder',
-            'PolicyListHelper', 'PolicyListHolder',
-            'PolicyOperations', 'PolicyTypeHelper', 'Polygon',
-            'PopupMenu', 'PopupMenuEvent', 'PopupMenuListener',
-            'PopupMenuUI', 'Port', 'Port.Info',
-            'PortableRemoteObject',
-            'PortableRemoteObjectDelegate', 'Position',
-            'Position.Bias', 'PreparedStatement', 'Principal',
-            'PrincipalHolder', 'Printable',
-            'PrinterAbortException', 'PrinterException',
-            'PrinterGraphics', 'PrinterIOException',
-            'PrinterJob', 'PrintGraphics', 'PrintJob',
-            'PrintStream', 'PrintWriter', 'PrivateKey',
-            'PRIVATE_MEMBER', 'PrivilegedAction',
-            'PrivilegedActionException',
-            'PrivilegedExceptionAction', 'Process',
-            'ProfileDataException', 'ProgressBarUI',
-            'ProgressMonitor', 'ProgressMonitorInputStream',
-            'Properties', 'PropertyChangeEvent',
-            'PropertyChangeListener', 'PropertyChangeSupport',
-            'PropertyDescriptor', 'PropertyEditor',
-            'PropertyEditorManager', 'PropertyEditorSupport',
-            'PropertyPermission', 'PropertyResourceBundle',
-            'PropertyVetoException', 'ProtectionDomain',
-            'ProtocolException', 'Provider', 'ProviderException',
-            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
-            'PushbackInputStream', 'PushbackReader',
-            'QuadCurve2D', 'QuadCurve2D.Double',
-            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
-            'Raster', 'RasterFormatException', 'RasterOp',
-            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
-            'Rectangle2D.Double', 'Rectangle2D.Float',
-            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
-            'Referenceable', 'ReferenceQueue',
-            'ReferralException', 'ReflectPermission', 'Registry',
-            'RegistryHandler', 'RemarshalException', 'Remote',
-            'RemoteCall', 'RemoteException', 'RemoteObject',
-            'RemoteRef', 'RemoteServer', 'RemoteStub',
-            'RenderableImage', 'RenderableImageOp',
-            'RenderableImageProducer', 'RenderContext',
-            'RenderedImage', 'RenderedImageFactory', 'Renderer',
-            'RenderingHints', 'RenderingHints.Key',
-            'RepaintManager', 'ReplicateScaleFilter',
-            'Repository', 'RepositoryIdHelper', 'Request',
-            'RescaleOp', 'Resolver', 'ResolveResult',
-            'ResourceBundle', 'ResponseHandler', 'ResultSet',
-            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
-            'RMIClassLoader', 'RMIClientSocketFactory',
-            'RMIFailureHandler', 'RMISecurityException',
-            'RMISecurityManager', 'RMIServerSocketFactory',
-            'RMISocketFactory', 'Robot', 'RootPaneContainer',
-            'RootPaneUI', 'RoundRectangle2D',
-            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
-            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
-            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
-            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
-            'RSAPublicKeySpec', 'RTFEditorKit',
-            'RuleBasedCollator', 'Runnable', 'Runtime',
-            'RunTime', 'RuntimeException', 'RunTimeOperations',
-            'RuntimePermission', 'SampleModel',
-            'SchemaViolationException', 'Scrollable',
-            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
-            'ScrollPaneConstants', 'ScrollPaneLayout',
-            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
-            'SearchControls', 'SearchResult',
-            'SecureClassLoader', 'SecureRandom',
-            'SecureRandomSpi', 'Security', 'SecurityException',
-            'SecurityManager', 'SecurityPermission', 'Segment',
-            'SeparatorUI', 'Sequence', 'SequenceInputStream',
-            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
-            'SerializablePermission', 'ServantObject',
-            'ServerCloneException', 'ServerError',
-            'ServerException', 'ServerNotActiveException',
-            'ServerRef', 'ServerRequest',
-            'ServerRuntimeException', 'ServerSocket',
-            'ServiceDetail', 'ServiceDetailHelper',
-            'ServiceInformation', 'ServiceInformationHelper',
-            'ServiceInformationHolder',
-            'ServiceUnavailableException', 'Set',
-            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
-            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
-            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
-            'ShortSeqHolder', 'Signature', 'SignatureException',
-            'SignatureSpi', 'SignedObject', 'Signer',
-            'SimpleAttributeSet', 'SimpleBeanInfo',
-            'SimpleDateFormat', 'SimpleTimeZone',
-            'SinglePixelPackedSampleModel',
-            'SingleSelectionModel', 'SizeLimitExceededException',
-            'SizeRequirements', 'SizeSequence', 'Skeleton',
-            'SkeletonMismatchException',
-            'SkeletonNotFoundException', 'SliderUI', 'Socket',
-            'SocketException', 'SocketImpl', 'SocketImplFactory',
-            'SocketOptions', 'SocketPermission',
-            'SocketSecurityException', 'SoftBevelBorder',
-            'SoftReference', 'SortedMap', 'SortedSet',
-            'Soundbank', 'SoundbankReader', 'SoundbankResource',
-            'SourceDataLine', 'SplitPaneUI', 'SQLData',
-            'SQLException', 'SQLInput', 'SQLOutput',
-            'SQLPermission', 'SQLWarning', 'Stack',
-            'StackOverflowError', 'StateEdit', 'StateEditable',
-            'StateFactory', 'Statement', 'Streamable',
-            'StreamableValue', 'StreamCorruptedException',
-            'StreamTokenizer', 'StrictMath', 'String',
-            'StringBuffer', 'StringBufferInputStream',
-            'StringCharacterIterator', 'StringContent',
-            'StringHolder', 'StringIndexOutOfBoundsException',
-            'StringReader', 'StringRefAddr', 'StringSelection',
-            'StringTokenizer', 'StringValueHelper',
-            'StringWriter', 'Stroke', 'Struct', 'StructMember',
-            'StructMemberHelper', 'Stub', 'StubDelegate',
-            'StubNotFoundException', 'Style', 'StyleConstants',
-            'StyleConstants.CharacterConstants',
-            'StyleConstants.ColorConstants',
-            'StyleConstants.FontConstants',
-            'StyleConstants.ParagraphConstants', 'StyleContext',
-            'StyledDocument', 'StyledEditorKit',
-            'StyledEditorKit.AlignmentAction',
-            'StyledEditorKit.BoldAction',
-            'StyledEditorKit.FontFamilyAction',
-            'StyledEditorKit.FontSizeAction',
-            'StyledEditorKit.ForegroundAction',
-            'StyledEditorKit.ItalicAction',
-            'StyledEditorKit.StyledTextAction',
-            'StyledEditorKit.UnderlineAction', 'StyleSheet',
-            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
-            'SwingConstants', 'SwingPropertyChangeSupport',
-            'SwingUtilities', 'SyncFailedException',
-            'Synthesizer', 'SysexMessage', 'System',
-            'SystemColor', 'SystemException', 'SystemFlavorMap',
-            'TabableView', 'TabbedPaneUI', 'TabExpander',
-            'TableCellEditor', 'TableCellRenderer',
-            'TableColumn', 'TableColumnModel',
-            'TableColumnModelEvent', 'TableColumnModelListener',
-            'TableHeaderUI', 'TableModel', 'TableModelEvent',
-            'TableModelListener', 'TableUI', 'TableView',
-            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
-            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
-            'TextComponent', 'TextEvent', 'TextField',
-            'TextHitInfo', 'TextLayout',
-            'TextLayout.CaretPolicy', 'TextListener',
-            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
-            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
-            'Throwable', 'Tie', 'TileObserver', 'Time',
-            'TimeLimitExceededException', 'Timer', 'TimerTask',
-            'Timestamp', 'TimeZone', 'TitledBorder', 'ToolBarUI',
-            'Toolkit', 'ToolTipManager', 'ToolTipUI',
-            'TooManyListenersException', 'Track',
-            'TransactionRequiredException',
-            'TransactionRolledbackException',
-            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
-            'Transferable', 'TransformAttribute', 'TRANSIENT',
-            'Transmitter', 'Transparency', 'TreeCellEditor',
-            'TreeCellRenderer', 'TreeExpansionEvent',
-            'TreeExpansionListener', 'TreeMap', 'TreeModel',
-            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
-            'TreePath', 'TreeSelectionEvent',
-            'TreeSelectionListener', 'TreeSelectionModel',
-            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
-            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
-            'Types', 'UID', 'UIDefaults',
-            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
-            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
-            'UIManager', 'UIManager.LookAndFeelInfo',
-            'UIResource', 'ULongLongSeqHelper',
-            'ULongLongSeqHolder', 'ULongSeqHelper',
-            'ULongSeqHolder', 'UndeclaredThrowableException',
-            'UndoableEdit', 'UndoableEditEvent',
-            'UndoableEditListener', 'UndoableEditSupport',
-            'UndoManager', 'UnexpectedException',
-            'UnicastRemoteObject', 'UnionMember',
-            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
-            'UnknownException', 'UnknownGroupException',
-            'UnknownHostException', 'UnknownObjectException',
-            'UnknownServiceException', 'UnknownUserException',
-            'UnmarshalException', 'UnrecoverableKeyException',
-            'Unreferenced', 'UnresolvedPermission',
-            'UnsatisfiedLinkError', 'UnsolicitedNotification',
-            'UnsolicitedNotificationEvent',
-            'UnsolicitedNotificationListener',
-            'UnsupportedAudioFileException',
-            'UnsupportedClassVersionError',
-            'UnsupportedEncodingException',
-            'UnsupportedFlavorException',
-            'UnsupportedLookAndFeelException',
-            'UnsupportedOperationException',
-            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
-            'URL', 'URLClassLoader', 'URLConnection',
-            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
-            'URLStreamHandlerFactory', 'UserException',
-            'UShortSeqHelper', 'UShortSeqHolder',
-            'UTFDataFormatException', 'Util', 'UtilDelegate',
-            'Utilities', 'ValueBase', 'ValueBaseHelper',
-            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
-            'ValueMember', 'ValueMemberHelper',
-            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
-            'VersionSpecHelper', 'VetoableChangeListener',
-            'VetoableChangeSupport', 'View', 'ViewFactory',
-            'ViewportLayout', 'ViewportUI',
-            'VirtualMachineError', 'Visibility',
-            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
-            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
-            'VoiceStatus', 'Void', 'WCharSeqHelper',
-            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
-            'Window', 'WindowAdapter', 'WindowConstants',
-            'WindowEvent', 'WindowListener', 'WrappedPlainView',
-            'WritableRaster', 'WritableRenderedImage',
-            'WriteAbortedException', 'Writer',
-            'WrongTransaction', 'WStringValueHelper',
-            'X509Certificate', 'X509CRL', 'X509CRLEntry',
-            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
-            'ZipException', 'ZipFile', 'ZipInputStream',
-            'ZipOutputStream', 'ZoneView',
-            '_BindingIteratorImplBase', '_BindingIteratorStub',
-            '_IDLTypeStub', '_NamingContextImplBase',
-            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
-            ),
-        4 => array(
-            'boolean', 'byte', 'char', 'double', 'float', 'int', 'long',
-            'short', 'void'
-            ),
-        5 => array(
-            'allProperties', 'asImmutable', 'asSynchronized', 'collect',
-            'count', 'each', 'eachProperty', 'eachPropertyName',
-            'eachWithIndex', 'find', 'findAll', 'findIndexOf',
-            'flatten', 'get', 'grep', 'inject', 'intersect',
-            'join', 'max', 'min', 'pop', 'reverse',
-            'reverseEach', 'size', 'sort', 'subMap', 'toList'
-            ),
-        6 => array(
-            'center', 'contains', 'eachMatch', 'padLeft', 'padRight',
-            'toCharacter', 'tokenize', 'toLong', 'toURL'
-            ),
-        7 => array(
-            'append', 'eachByte', 'eachFile', 'eachFileRecurse', 'eachLine',
-            'eachLines', 'encodeBase64', 'filterLine', 'getText',
-            'splitEachLine', 'transformChar', 'transformLine',
-            'withOutputStream', 'withPrintWriter', 'withReader',
-            'withStream', 'withStreams', 'withWriter',
-            'withWriterAppend', 'write', 'writeLine'
-            ),
-        8 => array(
-            'dump', 'getLastMatcher', 'inspect', 'invokeMethod', 'print',
-            'println', 'start', 'startDaemon', 'step', 'times',
-            'upto', 'use'
-            ),
-        9 => array(
-            'call', 'close', 'eachRow', 'execute', 'executeUpdate', 'Sql'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '|', '=',
-        '=>', '||', '-', '+', '<<', '<<<', '&&'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => false,
-        2 => false,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #aaaadd; font-weight: bold;',
-            4 => 'color: #993333;',
-            5 => 'color: #663399;',
-            6 => 'color: #CC0099;',
-            7 => 'color: #FFCC33;',
-            8 => 'color: #993399;',
-            9 => 'color: #993399; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1=> 'color: #808080; font-style: italic;',
-            2=> 'color: #a1a100;',
-            3=> 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;'
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAMEL}',
-        2 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAMEL}',
-        3 => 'http://www.google.de/search?as_q={FNAME}&amp;num=100&amp;hl=en&amp;as_occt=url&amp;as_sitesearch=java.sun.com%2Fj2se%2F1%2E5%2E0%2Fdocs%2Fapi%2F',
-        4 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
-        5 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
-        6 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
-        7 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
-        8 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
-        9 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => '\\$\\{[a-zA-Z_][a-zA-Z0-9_]*\\}'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/gwbasic.php b/inc/geshi/gwbasic.php
deleted file mode 100644
index ecc16341d..000000000
--- a/inc/geshi/gwbasic.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/*************************************************************************************
- * gwbasic.php
- * ----------
- * Author: José Gabriel Moya Yangüela (josemoya@gmail.com)
- * Copyright: (c) 2010 José Gabriel Moya Yangüela (http://doc.apagada.com)
- * Release Version: 1.0.8.11
- * Date Started: 2010/01/30
- *
- * GwBasic language file for GeSHi.
- *
- * CHANGES
- * -------
- * REM was not classified as comment.
- * APPEND and RANDOM missing.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GwBasic',
-    'COMMENT_SINGLE' => array(1 => "'", 2=> "REM"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-    /* Statements */
-        1 => array('END','FOR','NEXT','DATA','INPUT','DIM','READ','LET',
-            'GOTO','RUN','IF','RESTORE','GOSUB','RETURN','REM',
-            'STOP','PRINT','CLEAR','LIST','NEW','ON','WAIT','DEF',
-            'POKE','CONT','OUT','LPRINT','LLIST','WIDTH','ELSE',
-            'TRON','TROFF','SWAP','ERASE','EDIT','ERROR','RESUME',
-            'DELETE','AUTO','RENUM','DEFSTR','DEFINT','DEFSNG',
-            'DEFDBL','LINE','WHILE','WEND','CALL','WRITE','OPTION',
-            'RANDOMIZE','OPEN','CLOSE','LOAD','MERGE','SAVE',
-            'COLOR','CLS','MOTOR','BSAVE','BLOAD','SOUND','BEEP',
-            'PSET','PRESET','SCREEN','KEY','LOCATE','TO','THEN',
-            'STEP','USR','FN','SPC','NOT','ERL','ERR','STRING',
-            'USING','INSTR','VARPTR','CSRLIN','POINT','OFF',
-            'FILES','FIELD','SYSTEM','NAME','LSET','RSET','KILL',
-            'PUT','GET','RESET','COMMON','CHAIN','PAINT','COM',
-            'CIRCLE','DRAW','PLAY','TIMER','IOCTL','CHDIR','MKDIR',
-            'RMDIR','SHELL','VIEW','WINDOW','PMAP','PALETTE','LCOPY',
-            'CALLS','PCOPY','LOCK','UNLOCK','RANDOM','APPEND',
-            ),
-        2 => array(
-            /* Functions */
-            'CVI','CVS','CVD','MKI','MKS','MKD','ENVIRON',
-            'LEFT','RIGHT','MID','SGN','INT','ABS',
-            'SQR','SIN','LOG','EXP','COS','TAN','ATN',
-            'FRE','INP','POS','LEN','STR','VAL','ASC',
-            'CHR','PEEK','SPACE','OCT','HEX','LPOS',
-            'CINT','CSNG','CDBL','FIX','PEN','STICK',
-            'STRIG','EOF','LOC','LOF'
-            ),
-        3 => array(
-            /* alpha Operators */
-            'AND','OR','XOR','EQV','IMP','MOD'
-            ),
-        4 => array(
-            /* parameterless functions */
-            'INKEY','DATE','TIME','ERDEV','RND'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '>','=','<','+','-','*','/','^','\\'
-            ),
-        1 => array(
-            '?'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-            GESHI_COMMENTS => false,
-            1 => false,
-            2 => false,
-            3 => false,
-            4 => false
-            ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00a1a1;font-weight: bold',
-            2 => 'color: #000066;font-weight: bold',
-            3 => 'color: #00a166;font-weight: bold',
-            4 => 'color: #0066a1;font-weight: bold'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;',
-            2 => 'color: #808080;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-        /* Same as KEYWORDS[3] (and, or, not...) */
-            0 => 'color: #00a166;font-weight: bold',
-            1 => 'color: #00a1a1;font-weight: bold',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #708090'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        1 => '^[0-9]+ '
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/haskell.php b/inc/geshi/haskell.php
deleted file mode 100644
index adae11168..000000000
--- a/inc/geshi/haskell.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/*************************************************************************************
- * haskell.php
- * ----------
- * Author: Jason Dagit (dagit@codersbase.com) based on ocaml.php by Flaie (fireflaie@gmail.com)
- * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2005/08/27
- *
- * Haskell language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/08/27 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2005/08/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Haskell',
-    'COMMENT_SINGLE' => array( 1 => '--'),
-    'COMMENT_MULTI' => array('{-' => '-}'),
-    'COMMENT_REGEXP' => array(
-        2 => "/-->/",
-        3 => "/{-(?:(?R)|.)-}/s", //Nested Comments
-        ),
-    'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array('"',"'"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /* main haskell keywords */
-        1 => array(
-            'as',
-            'case', 'of', 'class', 'data', 'default',
-            'deriving', 'do', 'forall', 'hiding', 'if', 'then',
-            'else', 'import', 'infix', 'infixl', 'infixr',
-            'instance', 'let', 'in', 'module', 'newtype',
-            'qualified', 'type', 'where'
-            ),
-        /* define names of main librarys, so we can link to it */
-        2 => array(
-            'Foreign', 'Numeric', 'Prelude'
-            ),
-        /* just link to Prelude functions, cause it's the default opened library when starting Haskell */
-        3 => array(
-            'not', 'otherwise', 'maybe',
-            'either', 'fst', 'snd', 'curry', 'uncurry',
-            'compare',
-            'max', 'min', 'succ', 'pred', 'toEnum', 'fromEnum',
-            'enumFrom', 'enumFromThen', 'enumFromTo',
-            'enumFromThenTo', 'minBound', 'maxBound',
-            'negate', 'abs', 'signum',
-            'fromInteger', 'toRational', 'quot', 'rem',
-            'div', 'mod', 'quotRem', 'divMod', 'toInteger',
-            'recip', 'fromRational', 'pi', 'exp',
-            'log', 'sqrt', 'logBase', 'sin', 'cos',
-            'tan', 'asin', 'acos', 'atan', 'sinh', 'cosh',
-            'tanh', 'asinh', 'acosh', 'atanh',
-            'properFraction', 'truncate', 'round', 'ceiling',
-            'floor', 'floatRadix', 'floatDigits', 'floatRange',
-            'decodeFloat', 'encodeFloat', 'exponent',
-            'significand', 'scaleFloat', 'isNaN', 'isInfinite',
-            'isDenomalized', 'isNegativeZero', 'isIEEE',
-            'atan2', 'subtract', 'even', 'odd', 'gcd',
-            'lcm', 'fromIntegral', 'realToFrac',
-            'return', 'fail', 'fmap',
-            'mapM', 'mapM_', 'sequence', 'sequence_',
-            'id', 'const','flip',
-            'until', 'asTypeOf', 'error', 'undefined',
-            'seq','map','filter', 'head',
-            'last', 'tail', 'init', 'null', 'length',
-            'reverse', 'foldl', 'foldl1', 'foldr',
-            'foldr1', 'and', 'or', 'any', 'all', 'sum',
-            'product', 'concat', 'concatMap', 'maximum',
-            'minimum', 'scanl', 'scanl1', 'scanr', 'scanr1',
-            'iterate', 'repeat', 'cycle', 'take', 'drop',
-            'splitAt', 'takeWhile', 'dropWhile', 'span',
-            'break', 'elem', 'notElem', 'lookup', 'zip',
-            'zip3', 'zipWith', 'zipWith3', 'unzip', 'unzip3',
-            'lines', 'words', 'unlines',
-            'unwords', 'showPrec', 'show', 'showList',
-            'shows', 'showChar', 'showString', 'showParen',
-            'readsPrec', 'readList', 'reads', 'readParen',
-            'read', 'lex', 'putChar', 'putStr', 'putStrLn',
-            'print', 'getChar', 'getLine', 'getContents',
-            'interact', 'readFile', 'writeFile', 'appendFile',
-            'readIO', 'readLn', 'ioError', 'userError', 'catch'
-            ),
-        /* here Prelude Types */
-        4 => array (
-            'Bool', 'Maybe', 'Either', 'Ord', 'Ordering',
-            'Char', 'String', 'Eq', 'Enum', 'Bounded',
-            'Int', 'Integer', 'Float', 'Double', 'Rational',
-            'Num', 'Real', 'Integral', 'Fractional',
-            'Floating', 'RealFrac', 'RealFloat', 'Monad',
-            'Functor', 'Show', 'ShowS', 'Read', 'ReadS',
-            'IO'
-            ),
-        /* finally Prelude Exceptions */
-        5 => array (
-            'IOError', 'IOException'
-            )
-        ),
-    /* highlighting symbols is really important in Haskell */
-    'SYMBOLS' => array(
-        '|', '->', '<-', '@', '!', '::', '_', '~', '=', '?',
-        '&&', '||', '==', '/=', '<', '<=', '>',
-        '>=','+', '-', '*','/', '%', '**', '^', '^^',
-        '>>=', '>>', '=<<',  '$', '.', ',', '$!',
-        '++', '!!'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true, /* functions name are case seinsitive */
-        3 => true, /* types name too */
-        4 => true, /* finally exceptions too */
-        5 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #06c; font-weight: bold;', /* nice blue */
-            2 => 'color: #06c; font-weight: bold;', /* blue as well */
-            3 => 'font-weight: bold;', /* make the preduled functions bold */
-            4 => 'color: #cccc00; font-weight: bold;', /* give types a different bg */
-            5 => 'color: maroon;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #5d478b; font-style: italic;',
-            2 => 'color: #339933; font-weight: bold;',
-            3 => 'color: #5d478b; font-style: italic;', /* light purple */
-            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'background-color: #3cb371; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: green;'
-            ),
-        'STRINGS' => array(
-            0 => 'background-color: #3cb371;' /* nice green */
-            ),
-        'NUMBERS' => array(
-            0 => 'color: red;' /* pink */
-            ),
-        'METHODS' => array(
-            1 => 'color: #060;' /* dark green */
-            ),
-        'REGEXPS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933; font-weight: bold;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        /* some of keywords are Prelude functions */
-        1 => '',
-        /* link to the wanted library */
-        2 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/{FNAME}.html',
-        /* link to Prelude functions */
-        3 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#v:{FNAME}',
-        /* link to Prelude types */
-        4 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
-        /* link to Prelude exceptions */
-        5 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/haxe.php b/inc/geshi/haxe.php
deleted file mode 100644
index 778637e2b..000000000
--- a/inc/geshi/haxe.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/*************************************************************************************
- * haxe.php
- * --------
- * Author: Andy Li (andy@onthewings.net)
- *         John Liao (colorhook@gmail.com)
- * Copyright: (c) 2012 onthewings (http://www.onthewings.net/)
- *                2010 colorhook (http://colorhook.com/)
- * Release Version: 1.0.8.11
- * Date Started: 2010/10/05
- *
- * Haxe language file for GeSHi.
- * Haxe version: 2.10
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Haxe',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Import and Package directives (Basic Support only)
-        2 => '/(?:(?<=import[\\n\\s])|(?<=using[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
-        // Haxe comments
-        3 => '#/\*\*(?![\*\/]).*\*/#sU',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            //http://haxe.org/ref/keywords
-            'break', 'callback', 'case', 'cast', 'catch', 'class', 'continue', 'default', 'do', 'dynamic',
-            'else', 'enum', 'extends', 'extern', /*'false',*/ 'for', 'function', 'here', 'if',
-            'implements', 'import', 'in', 'inline', 'interface', 'never', 'new', /*'null',*/ 'override',
-            'package', 'private', 'public', 'return', 'static', 'super', 'switch', 'this', 'throw',
-            'trace', /*'true',*/ 'try', 'typedef', 'untyped', 'using', 'var', 'while',
-            'macro', '$type',
-            ),
-        2 => array(
-            //primitive values
-            'null', 'false', 'true',
-            ),
-        3 => array(
-            //global types
-            'Array', 'ArrayAccess', /*'Bool',*/ 'Class', 'Date', 'DateTools', 'Dynamic',
-            'EReg', 'Enum', 'EnumValue', /*'Float',*/ 'Hash', /*'Int',*/ 'IntHash', 'IntIter',
-            'Iterable', 'Iterator', 'Lambda', 'List', 'Math', 'Null', 'Reflect', 'Std',
-            /*'String',*/ 'StringBuf', 'StringTools', 'Sys', 'Type', /*'UInt',*/ 'ValueType',
-            /*'Void',*/ 'Xml', 'XmlType',
-            ),
-        4 => array(
-            //primitive types
-            'Void', 'Bool', 'Int', 'Float', 'UInt', 'String',
-            ),
-        5 => array(
-            //compiler switches
-            "#if", "#elseif", "#else", "#end", "#error",
-            ),
-        ),
-    'SYMBOLS' => array(
-        //http://haxe.org/manual/operators
-        '++', '--',
-        '%',
-        '*', '/',
-        '+', '-',
-        '<<', '>>', '>>>',
-        '|', '&', '^',
-        '==', '!=', '>', '>=', '<', '<=',
-        '...',
-        '&&',
-        '||',
-        '?', ':',
-        '=', '+=', '-=', '/=', '*=', '<<=', '>>=', '>>>=', '|=', '&=', '^=',
-        '(', ')', '[', ']', '{', '}', ';',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #6699cc; font-weight: bold;',
-            2 => 'color: #000066; font-weight: bold;',
-            3 => 'color: #03F; ',
-            4 => 'color: #000033; font-weight: bold;',
-            5 => 'color: #330000; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #006699;',
-            3 => 'color: #008000; font-style: italic; font-weight: bold;',
-            3 => 'color: #008000; font-style: italic; font-weight: bold;',
-            'MULTI' => 'color: #666666; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;',
-            ),
-        'STRINGS' => array(
-            0 => 'color: #FF0000;',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            1 => 'color: #006633;',
-            2 => 'color: #006633;',
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/hicest.php b/inc/geshi/hicest.php
deleted file mode 100644
index 78a2bc206..000000000
--- a/inc/geshi/hicest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/*************************************************************************************
- * hicest.php
- * --------
- * Author: Georg Petrich (spt@hicest.com)
- * Copyright: (c) 2010 Georg Petrich (http://www.HicEst.com)
- * Release Version: 1.0.8.11
- * Date Started: 2010/03/15
- *
- * HicEst language file for GeSHi.
- *
- * CHANGES
- * -------
- * yyyy/mm/dd (v.v.v.v)
- *  -  First Release
- *
- * TODO (updated yyyy/mm/dd)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'HicEst',
-    'COMMENT_SINGLE' => array(1 => '!'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '\''),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            '$cmd_line', 'abs', 'acos', 'alarm', 'alias', 'allocate', 'appendix', 'asin', 'atan', 'axis', 'beep',
-            'call', 'ceiling', 'char', 'character', 'com', 'continue', 'cos', 'cosh', 'data', 'diffeq', 'dimension', 'dlg', 'dll',
-            'do', 'edit', 'else', 'elseif', 'end', 'enddo', 'endif', 'exp', 'floor', 'function', 'fuz', 'goto', 'iand', 'ichar',
-            'ieor', 'if', 'index', 'init', 'int', 'intpol', 'ior', 'key', 'len', 'len_trim', 'line', 'lock', 'log', 'max', 'maxloc',
-            'min', 'minloc', 'mod', 'nint', 'not', 'open', 'pop', 'ran', 'read', 'real', 'return', 'rgb', 'roots', 'sign', 'sin',
-            'sinh', 'solve', 'sort', 'subroutine', 'sum', 'system', 'tan', 'tanh', 'then', 'time', 'use', 'window', 'write', 'xeq'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '+', '-', '*', '/', '=', '<', '>', '!', '^', ':', ','
-            ),
-        2 => array(
-            '$', '$$'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #ff0000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;',
-            2 => 'color: #ff0000;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(1 => ''),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/hq9plus.php b/inc/geshi/hq9plus.php
deleted file mode 100644
index 7ba1a73c1..000000000
--- a/inc/geshi/hq9plus.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/*************************************************************************************
- * hq9plus.php
- * ----------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/31
- *
- * HQ9+ language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/31 (1.0.8.1)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'HQ9+',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        'H', 'Q', '9', '+', 'h', 'q'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #a16000;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'KEYWORDS' => GESHI_NEVER,
-            'COMMENTS' => GESHI_NEVER,
-            'STRINGS' => GESHI_NEVER,
-            'REGEXPS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/html4strict.php b/inc/geshi/html4strict.php
deleted file mode 100644
index 97392fa84..000000000
--- a/inc/geshi/html4strict.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/*************************************************************************************
- * html4strict.php
- * ---------------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/10
- *
- * HTML 4.01 strict language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/12/28 (1.0.4)
- *   -  Removed escape character for strings
- * 2004/11/27 (1.0.3)
- *   -  Added support for multiple object splitters
- * 2004/10/27 (1.0.2)
- *   -  Added support for URLs
- * 2004/08/05 (1.0.1)
- *   -  Added INS and DEL
- *   -  Removed the background colour from tags' styles
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Check that only HTML4 strict attributes are highlighted
- * * Eliminate empty tags that aren't allowed in HTML4 strict
- * * Split to several files - html4trans, xhtml1 etc
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'HTML',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        2 => array(
-            'a', 'abbr', 'acronym', 'address', 'applet', 'area',
-            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
-            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
-            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
-            'em',
-            'fieldset', 'font', 'form', 'frame', 'frameset',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
-            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
-            'kbd',
-            'label', 'legend', 'link', 'li',
-            'map', 'meta',
-            'noframes', 'noscript',
-            'object', 'ol', 'optgroup', 'option',
-            'param', 'pre', 'p',
-            'q',
-            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
-            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
-            'ul', 'u',
-            'var',
-            ),
-        3 => array(
-            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
-            'background', 'bgcolor', 'border',
-            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
-            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
-            'enctype',
-            'face', 'for', 'frame', 'frameborder',
-            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
-            'id', 'ismap',
-            'label', 'lang', 'language', 'link', 'longdesc',
-            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
-            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
-            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
-            'profile', 'prompt',
-            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
-            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
-            'tabindex', 'target', 'text', 'title', 'type',
-            'usemap',
-            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
-            'width'
-            )
-        ),
-    'SYMBOLS' => array(
-        '/', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            -2 => 'color: #404040;', // CDATA
-            -1 => 'color: #808080; font-style: italic;', // comments
-            0 => 'color: #00bbdd;',
-            1 => 'color: #ddbb00;',
-            2 => 'color: #009900;'
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        -2 => array(
-            '<![CDATA[' => ']]>'
-            ),
-        -1 => array(
-            '<!--' => '-->'
-            ),
-        0 => array(
-            '<!DOCTYPE' => '>'
-            ),
-        1 => array(
-            '&' => ';'
-            ),
-        2 => array(
-            '<' => '>'
-            )
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        -2 => false,
-        -1 => false,
-        0 => false,
-        1 => false,
-        2 => true
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-            )
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/html5.php b/inc/geshi/html5.php
deleted file mode 100644
index 0d9755945..000000000
--- a/inc/geshi/html5.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/*************************************************************************************
- * html5.php
- * ---------------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/10
- *
- * HTML 5 language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/12/28 (1.0.4)
- *   -  Removed escape character for strings
- * 2004/11/27 (1.0.3)
- *   -  Added support for multiple object splitters
- * 2004/10/27 (1.0.2)
- *   -  Added support for URLs
- * 2004/08/05 (1.0.1)
- *   -  Added INS and DEL
- *   -  Removed the background colour from tags' styles
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Check that only HTML4 strict attributes are highlighted
- * * Eliminate empty tags that aren't allowed in HTML4 strict
- * * Split to several files - html4trans, xhtml1 etc
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'HTML5',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        2 => array(
-            'a', 'abbr', 'address', 'article', 'area', 'aside', 'audio',
-
-            'base', 'bdo', 'blockquote', 'body', 'br', 'button', 'b',
-
-            'caption', 'cite', 'code', 'colgroup', 'col', 'canvas', 'command', 'datalist', 'details',
-
-            'dd', 'del', 'dfn', 'div', 'dl', 'dt',
-
-            'em', 'embed',
-
-            'fieldset', 'form', 'figcaption', 'figure', 'footer',
-
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'header', 'hgroup',
-
-            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
-
-            'kbd', 'keygen',
-
-            'label', 'legend', 'link', 'li',
-
-            'map', 'meta', 'mark', 'meter',
-
-            'noscript', 'nav',
-
-            'object', 'ol', 'optgroup', 'option', 'output',
-
-            'param', 'pre', 'p', 'progress',
-
-            'q',
-
-            'rp', 'rt', 'ruby',
-
-            'samp', 'script', 'select', 'small', 'span', 'strong', 'style', 'sub', 'sup', 's', 'section', 'source', 'summary',
-
-            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'time',
-
-            'ul',
-
-            'var', 'video',
-
-            'wbr',
-            ),
-        3 => array(
-            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis', 'autocomplete', 'autofocus',
-            'background', 'bgcolor', 'border',
-            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords', 'contenteditable', 'contextmenu',
-            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled', 'draggable', 'dropzone',
-            'enctype',
-            'face', 'for', 'frame', 'frameborder', 'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
-            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv', 'hidden',
-            'id', 'ismap',
-            'label', 'lang', 'language', 'link', 'longdesc',
-            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple', 'min', 'max',
-            'name', 'nohref', 'noresize', 'noshade', 'nowrap', 'novalidate',
-            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onselect', 'onsubmit', 'onunload', 'onafterprint', 'onbeforeprint', 'onbeforeonload', 'onerror', 'onhaschange', 'onmessage', 'onoffline', 'ononline', 'onpagehide', 'onpageshow', 'onpopstate', 'onredo', 'onresize', 'onstorage', 'onundo', 'oncontextmenu', 'onformchange', 'onforminput', 'oninput', 'oninvalid', 'ondrag', 'ondragend', 'ondragenter', 'ondragleave', 'ondragover', 'ondragstart', 'ondrop', 'onmousewheel', 'onscroll', 'oncanplay', 'oncanplaythrough', 'ondurationchange', 'onemptied', 'onended', 'onloadeddata', 'onloadedmetadata', 'onloadstart', 'onpause', 'onplay', 'onplaying', 'onprogress', 'onratechange', 'onreadystatechange', 'onseeked', 'onseeking', 'onstalled', 'onsuspend', 'ontimeupdate', 'onvolumechange', 'onwaiting',
-            'profile', 'prompt', 'pattern', 'placeholder',
-            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules', 'required',
-            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary', 'spellcheck', 'step',
-            'tabindex', 'target', 'text', 'title', 'type',
-            'usemap',
-            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
-            'width'
-            )
-        ),
-    'SYMBOLS' => array(
-        '/', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            -2 => 'color: #404040;', // CDATA
-            -1 => 'color: #808080; font-style: italic;', // comments
-            0 => 'color: #00bbdd;',
-            1 => 'color: #ddbb00;',
-            2 => 'color: #009900;'
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        -2 => array(
-            '<![CDATA[' => ']]>'
-            ),
-        -1 => array(
-            '<!--' => '-->'
-            ),
-        0 => array(
-            '<!DOCTYPE' => '>'
-            ),
-        1 => array(
-            '&' => ';'
-            ),
-        2 => array(
-            '<' => '>'
-            )
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        -2 => false,
-        -1 => false,
-        0 => false,
-        1 => false,
-        2 => true
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-            )
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/icon.php b/inc/geshi/icon.php
deleted file mode 100644
index 06383ea5d..000000000
--- a/inc/geshi/icon.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/*************************************************************************************
- * icon.php
- * --------
- * Author: Matt Oates (mattoates@gmail.com)
- * Copyright: (c) 2010 Matt Oates (http://mattoates.co.uk)
- * Release Version: 1.0.8.11
- * Date Started: 2010/04/24
- *
- * Icon language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/04/24 (0.0.0.2)
- *  -  Validated with Geshi langcheck.php FAILED due to preprocessor keywords looking like symbols
- *  -  Hard wrapped to improve readability
- * 2010/04/20 (0.0.0.1)
- *  -  First Release
- *
- * TODO (updated 2010/04/20)
- * -------------------------
- * - Do the &amp; need replacing with &?
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Icon',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '\''),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'break', 'case', 'continue', 'create', 'default', 'do', 'else',
-            'end', 'every', 'fail', 'for', 'if', 'import', 'initial',
-            'initially', 'invocable', 'link', 'next', 'not', 'of', 'package',
-            'procedure', 'record', 'repeat', 'return', 'switch', 'suspend',
-            'then', 'to', 'until', 'while'
-            ),
-        2 => array(
-            'global', 'local', 'static'
-            ),
-        3 => array(
-            'allocated', 'ascii', 'clock', 'collections',
-            'column', 'cset', 'current', 'date', 'dateline', 'digits',
-            'dump', 'e', 'error', 'errornumber', 'errortext',
-            'errorvalue', 'errout', 'eventcode', 'eventsource', 'eventvalue',
-            'fail', 'features', 'file', 'host', 'input', 'lcase',
-            'letters', 'level', 'line', 'main', 'now', 'null',
-            'output', 'phi', 'pi', 'pos', 'progname', 'random',
-            'regions', 'source', 'storage', 'subject', 'syserr', 'time',
-            'trace', 'ucase', 'version', 'col', 'control', 'interval',
-            'ldrag', 'lpress', 'lrelease', 'mdrag', 'meta', 'mpress',
-            'mrelease', 'rdrag', 'resize', 'row', 'rpress', 'rrelease',
-            'shift', 'window', 'x', 'y'
-            ),
-        4 => array(
-            'abs', 'acos', 'any', 'args', 'asin', 'atan', 'bal', 'center', 'char',
-            'chmod', 'close', 'cofail', 'collect', 'copy', 'cos', 'cset', 'ctime', 'delay', 'delete',
-            'detab', 'display', 'dtor', 'entab', 'errorclear', 'event', 'eventmask', 'EvGet', 'exit',
-            'exp', 'fetch', 'fieldnames', 'find', 'flock', 'flush', 'function', 'get', 'getch',
-            'getche', 'getenv', 'gettimeofday', 'globalnames', 'gtime', 'iand', 'icom', 'image',
-            'insert', 'integer', 'ior', 'ishift', 'ixor', 'key', 'left', 'list', 'load', 'loadfunc',
-            'localnames', 'log', 'many', 'map', 'match', 'member', 'mkdir', 'move', 'name', 'numeric',
-            'open', 'opmask', 'ord', 'paramnames', 'parent', 'pipe', 'pop', 'pos', 'proc', 'pull',
-            'push', 'put', 'read', 'reads', 'real', 'receive', 'remove', 'rename', 'repl', 'reverse',
-            'right', 'rmdir', 'rtod', 'runerr', 'seek', 'select', 'send', 'seq', 'serial', 'set',
-            'setenv', 'sort', 'sortf', 'sql', 'sqrt', 'stat', 'stop', 'string', 'system', 'tab',
-            'table', 'tan', 'trap', 'trim', 'truncate', 'type', 'upto', 'utime', 'variable', 'where',
-            'write', 'writes'
-            ),
-        5 => array(
-            'Active', 'Alert', 'Bg', 'Clip', 'Clone', 'Color', 'ColorValue',
-            'CopyArea', 'Couple', 'DrawArc', 'DrawCircle', 'DrawCurve', 'DrawCylinder', 'DrawDisk',
-            'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon', 'DrawRectangle', 'DrawSegment',
-            'DrawSphere', 'DrawString', 'DrawTorus', 'EraseArea', 'Event', 'Fg', 'FillArc',
-            'FillCircle', 'FillPolygon', 'FillRectangle', 'Font', 'FreeColor', 'GotoRC', 'GotoXY',
-            'IdentifyMatrix', 'Lower', 'MatrixMode', 'NewColor', 'PaletteChars', 'PaletteColor',
-            'PaletteKey', 'Pattern', 'Pending', 'Pixel', 'PopMatrix', 'PushMatrix', 'PushRotate',
-            'PushScale', 'PushTranslate', 'QueryPointer', 'Raise', 'ReadImage', 'Refresh', 'Rotate',
-            'Scale', 'Texcoord', 'TextWidth', 'Texture', 'Translate', 'Uncouple', 'WAttrib',
-            'WDefault', 'WFlush', 'WindowContents', 'WriteImage', 'WSync'
-            ),
-        6 => array(
-            'define', 'include', 'ifdef', 'ifndef', 'else', 'endif', 'error',
-            'line', 'undef'
-            ),
-        7 => array(
-            '_V9', '_AMIGA', '_ACORN', '_CMS', '_MACINTOSH', '_MSDOS_386',
-            '_MS_WINDOWS_NT', '_MSDOS', '_MVS', '_OS2', '_POR', 'T', '_UNIX', '_POSIX', '_DBM',
-            '_VMS', '_ASCII', '_EBCDIC', '_CO_EXPRESSIONS', '_CONSOLE_WINDOW', '_DYNAMIC_LOADING',
-            '_EVENT_MONITOR', '_EXTERNAL_FUNCTIONS', '_KEYBOARD_FUNCTIONS', '_LARGE_INTEGERS',
-            '_MULTITASKING', '_PIPES', '_RECORD_IO', '_SYSTEM_FUNCTION', '_MESSAGING', '_GRAPHICS',
-            '_X_WINDOW_SYSTEM', '_MS_WINDOWS', '_WIN32', '_PRESENTATION_MGR', '_ARM_FUNCTIONS',
-            '_DOS_FUNCTIONS'
-            ),
-        8 => array(
-            'line'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '\\', '%', '=', '<', '>', '!', '^',
-            '&', '|', '?', ':', ';', ',', '.', '~', '@'
-            ),
-        2 => array(
-            '$(', '$)', '$<', '$>', '$'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #b1b100;',
-            3 => 'color: #b1b100;',
-            4 => 'color: #b1b100;',
-            5 => 'color: #b1b100;',
-            6 => 'color: #b1b100;',
-            7 => 'color: #b1b100;',
-            8 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;',
-            2 => 'color: #b1b100;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(1 => '.'),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<=&amp;)'
-                ),
-            4 => array(
-                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9_\"\'])",
-                'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\"\'])"
-                ),
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<=\$)'
-                ),
-            8 => array(
-                'DISALLOWED_BEFORE' => '(?<=#)'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/idl.php b/inc/geshi/idl.php
deleted file mode 100644
index 69bd14ff4..000000000
--- a/inc/geshi/idl.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/*************************************************************************************
- * idl.php
- * -------
- * Author: Cedric Bosdonnat (cedricbosdo@openoffice.org)
- * Copyright: (c) 2006 Cedric Bosdonnat
- * Release Version: 1.0.8.11
- * Date Started: 2006/08/20
- *
- * Unoidl language file for GeSHi.
- *
- * 2006/08/20 (1.0.0)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-
-$language_data = array (
-    'LANG_NAME' => 'Uno Idl',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'published', 'get', 'set', 'service', 'singleton', 'type', 'module', 'interface', 'struct',
-            'const', 'constants', 'exception', 'enum', 'raises', 'typedef'
-            ),
-        2 => array(
-            'bound', 'maybeambiguous', 'maybedefault', 'maybevoid', 'oneway', 'optional',
-            'readonly', 'in', 'out', 'inout', 'attribute', 'transient', 'removable'
-            ),
-        3 => array(
-            'True', 'False', 'TRUE', 'FALSE'
-            ),
-        4 => array(
-            'string', 'long', 'byte', 'hyper', 'boolean', 'any', 'char', 'double',
-            'void', 'sequence', 'unsigned'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ';', '...'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #990078; font-weight: bold',
-            2 => 'color: #36dd1c;',
-            3 => 'color: #990078; font-weight: bold',
-            4 => 'color: #0000ec;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #3f7f5f;',
-            2 => 'color: #808080;',
-            'MULTI' => 'color: #4080ff; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #666666; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #808080;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/ini.php b/inc/geshi/ini.php
deleted file mode 100644
index 8e6ca76db..000000000
--- a/inc/geshi/ini.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/*************************************************************************************
- * ini.php
- * --------
- * Author: deguix (cevo_deguix@yahoo.com.br)
- * Copyright: (c) 2005 deguix
- * Release Version: 1.0.8.11
- * Date Started: 2005/03/27
- *
- * INI language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2005/12/28 (1.0.1)
- *   -  Removed unnecessary keyword style index
- *   -  Added support for " strings
- * 2005/04/05 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2005/03/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'INI',
-    'COMMENT_SINGLE' => array(0 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => ''
-            ),
-        'STRINGS' => array(
-            0 => 'color: #933;'
-            ),
-        'NUMBERS' => array(
-            0 => ''
-            ),
-        'METHODS' => array(
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066; font-weight:bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000066; font-weight:bold;',
-            1 => 'color: #000099;',
-            2 => 'color: #660066;'
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Section names
-        0 => '\[.+\]',
-        //Entry names
-        1 => array(
-            GESHI_SEARCH => '^(\s*)([a-zA-Z0-9_\-]+)(\s*=)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        //Entry values
-        2 => array(
-            // Evil hackery to get around GeSHi bug: <>" and ; are added so <span>s can be matched
-            // Explicit match on variable names because if a comment is before the first < of the span
-            // gets chewed up...
-            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.*)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1=',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/inno.php b/inc/geshi/inno.php
deleted file mode 100644
index 1e2ee8bef..000000000
--- a/inc/geshi/inno.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/*************************************************************************************
- * Inno.php
- * ----------
- * Author: Thomas Klingler (hotline@theratech.de) based on delphi.php from J�rja Norbert (jnorbi@vipmail.hu)
- * Copyright: (c) 2004 J�rja Norbert, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2005/07/29
- *
- * Inno Script language inkl. Delphi (Object Pascal) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/09/03
- *   -  First Release
- *
- * TODO (updated 2005/07/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Inno',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('(*' => '*)'),
-    'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'Setup','Types','Components','Tasks','Dirs','Files','Icons','INI',
-            'InstallDelete','Languages','Messages','CustomMessage',
-            'LangOptions','Registry','RUN','UninstallDelete','UninstallRun',
-            'app','win','sys','syswow64','src','sd','pf','pf32','pf64','cf',
-            'cf32','cf64','tmp','fonts','dao','group','localappdata','sendto',
-            'userappdata','commonappdata','userdesktop','commondesktop',
-            'userdocs','commondocs','userfavorites','commonfavorites',
-            'userprograms','commonprograms','userstartmenu','commonstartmenu',
-            'userstartup','commonstartup','usertemplates','commontemplates'
-            ),
-        2 => array(
-            'nil', 'false', 'true', 'var', 'type', 'const','And', 'Array', 'As', 'Begin', 'Case', 'Class', 'Constructor', 'Destructor', 'Div', 'Do', 'DownTo', 'Else',
-            'End', 'Except', 'File', 'Finally', 'For', 'Function', 'Goto', 'If', 'Implementation', 'In', 'Inherited', 'Interface',
-            'Is', 'Mod', 'Not', 'Object', 'Of', 'On', 'Or', 'Packed', 'Procedure', 'Property', 'Raise', 'Record',
-            'Repeat', 'Set', 'Shl', 'Shr', 'Then', 'ThreadVar', 'To', 'Try', 'Unit', 'Until', 'Uses', 'While', 'With', 'Xor',
-
-            'HKCC','HKCR','HKCU','HKLM','HKU','alwaysoverwrite','alwaysskipifsameorolder','append',
-            'binary','classic','closeonexit','comparetimestamp','confirmoverwrite',
-            'createkeyifdoesntexist','createonlyiffileexists','createvalueifdoesntexist',
-            'deleteafterinstall','deletekey','deletevalue','dirifempty','dontcloseonexit',
-            'dontcopy','dontcreatekey','disablenouninstallwarning','dword','exclusive','expandsz',
-            'external','files','filesandordirs','fixed','fontisnttruetype','ignoreversion','iscustom','isreadme',
-            'modern','multisz','new','noerror','none','normal','nowait','onlyifdestfileexists',
-            'onlyifdoesntexist','onlyifnewer','overwrite','overwritereadonly','postinstall',
-            'preservestringtype','promptifolder','regserver','regtypelib','restart','restartreplace',
-            'runhidden','runmaximized','runminimized','sharedfile','shellexec','showcheckbox',
-            'skipifnotsilent','skipifsilent','silent','skipifdoesntexist',
-            'skipifsourcedoesntexist','sortfilesbyextension','unchecked','uninsalwaysuninstall',
-            'uninsclearvalue','uninsdeleteentry','uninsdeletekey','uninsdeletekeyifempty',
-            'uninsdeletesection','uninsdeletesectionifempty','uninsdeletevalue',
-            'uninsneveruninstall','useapppaths','verysilent','waituntilidle'
-            ),
-        3 => array(
-            'Abs', 'Addr', 'AnsiCompareStr', 'AnsiCompareText', 'AnsiContainsStr', 'AnsiEndsStr', 'AnsiIndexStr', 'AnsiLeftStr',
-            'AnsiLowerCase', 'AnsiMatchStr', 'AnsiMidStr', 'AnsiPos', 'AnsiReplaceStr', 'AnsiReverseString', 'AnsiRightStr',
-            'AnsiStartsStr', 'AnsiUpperCase', 'ArcCos', 'ArcSin', 'ArcTan', 'Assigned', 'BeginThread', 'Bounds', 'CelsiusToFahrenheit',
-            'ChangeFileExt', 'Chr', 'CompareStr', 'CompareText', 'Concat', 'Convert', 'Copy', 'Cos', 'CreateDir', 'CurrToStr',
-            'CurrToStrF', 'Date', 'DateTimeToFileDate', 'DateTimeToStr', 'DateToStr', 'DayOfTheMonth', 'DayOfTheWeek', 'DayOfTheYear',
-            'DayOfWeek', 'DaysBetween', 'DaysInAMonth', 'DaysInAYear', 'DaySpan', 'DegToRad', 'DeleteFile', 'DiskFree', 'DiskSize',
-            'DupeString', 'EncodeDate', 'EncodeDateTime', 'EncodeTime', 'EndOfADay', 'EndOfAMonth', 'Eof', 'Eoln', 'Exp', 'ExtractFileDir',
-            'ExtractFileDrive', 'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath', 'FahrenheitToCelsius', 'FileAge',
-            'FileDateToDateTime', 'FileExists', 'FilePos', 'FileSearch', 'FileSetDate', 'FileSize', 'FindClose', 'FindCmdLineSwitch',
-            'FindFirst', 'FindNext', 'FloatToStr', 'FloatToStrF', 'Format', 'FormatCurr', 'FormatDateTime', 'FormatFloat', 'Frac',
-            'GetCurrentDir', 'GetLastError', 'GetMem', 'High', 'IncDay', 'IncMinute', 'IncMonth', 'IncYear', 'InputBox',
-            'InputQuery', 'Int', 'IntToHex', 'IntToStr', 'IOResult', 'IsInfinite', 'IsLeapYear', 'IsMultiThread', 'IsNaN',
-            'LastDelimiter', 'Length', 'Ln', 'Lo', 'Log10', 'Low', 'LowerCase', 'Max', 'Mean', 'MessageDlg', 'MessageDlgPos',
-            'MonthOfTheYear', 'Now', 'Odd', 'Ord', 'ParamCount', 'ParamStr', 'Pi', 'Point', 'PointsEqual', 'Pos', 'Pred',
-            'Printer', 'PromptForFileName', 'PtInRect', 'RadToDeg', 'Random', 'RandomRange', 'RecodeDate', 'RecodeTime', 'Rect',
-            'RemoveDir', 'RenameFile', 'Round', 'SeekEof', 'SeekEoln', 'SelectDirectory', 'SetCurrentDir', 'Sin', 'SizeOf',
-            'Slice', 'Sqr', 'Sqrt', 'StringOfChar', 'StringReplace', 'StringToWideChar', 'StrToCurr', 'StrToDate', 'StrToDateTime',
-            'StrToFloat', 'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime', 'StuffString', 'Succ', 'Sum', 'Tan',
-            'Time', 'TimeToStr', 'Tomorrow', 'Trunc', 'UpCase', 'UpperCase', 'VarType', 'WideCharToString', 'WrapText', 'Yesterday',
-            'Append', 'AppendStr', 'Assign', 'AssignFile', 'AssignPrn', 'Beep', 'BlockRead', 'BlockWrite', 'Break',
-            'ChDir', 'Close', 'CloseFile', 'Continue', 'DateTimeToString', 'Dec', 'DecodeDate', 'DecodeDateTime',
-            'DecodeTime', 'Delete', 'Dispose', 'EndThread', 'Erase', 'Exclude', 'Exit', 'FillChar', 'Flush', 'FreeAndNil',
-            'FreeMem', 'GetDir', 'GetLocaleFormatSettings', 'Halt', 'Inc', 'Include', 'Insert', 'MkDir', 'Move', 'New',
-            'ProcessPath', 'Randomize', 'Read', 'ReadLn', 'ReallocMem', 'Rename', 'ReplaceDate', 'ReplaceTime',
-            'Reset', 'ReWrite', 'RmDir', 'RunError', 'Seek', 'SetLength', 'SetString', 'ShowMessage', 'ShowMessageFmt',
-            'ShowMessagePos', 'Str', 'Truncate', 'Val', 'Write', 'WriteLn',
-
-            'AdminPrivilegesRequired','AfterInstall','AllowCancelDuringInstall','AllowNoIcons','AllowRootDirectory','AllowUNCPath','AlwaysRestart','AlwaysShowComponentsList','AlwaysShowDirOnReadyPage','AlwaysShowGroupOnReadyPage ','AlwaysUsePersonalGroup','AppComments','AppContact','AppCopyright','AppendDefaultDirName',
-            'AppendDefaultGroupName','AppId','AppModifyPath','AppMutex','AppName','AppPublisher',
-            'AppPublisherURL','AppReadmeFile','AppSupportURL','AppUpdatesURL','AppVerName','AppVersion',
-            'Attribs','BackColor','BackColor2','BackColorDirection','BackSolid','BeforeInstall',
-            'ChangesAssociations','ChangesEnvironment','Check','CodeFile','Comment','Compression','CopyMode',
-            'CreateAppDir','CreateUninstallRegKey','DefaultDirName','DefaultGroupName',
-            'DefaultUserInfoName','DefaultUserInfoOrg','DefaultUserInfoSerial',
-            'Description','DestDir','DestName','DirExistsWarning',
-            'DisableDirPage','DisableFinishedPage',
-            'DisableProgramGroupPage','DisableReadyMemo','DisableReadyPage',
-            'DisableStartupPrompt','DiskClusterSize','DiskSliceSize','DiskSpaceMBLabel',
-            'DiskSpanning','DontMergeDuplicateFiles','EnableDirDoesntExistWarning','Encryption',
-            'Excludes','ExtraDiskSpaceRequired','Filename','Flags','FlatComponentsList','FontInstall',
-            'GroupDescription','HotKey','IconFilename','IconIndex','InfoAfterFile','InfoBeforeFile',
-            'InternalCompressLevel','Key','LanguageDetectionMethod',
-            'LicenseFile','MergeDuplicateFiles','MessagesFile','MinVersion','Name',
-            'OnlyBelowVersion','OutputBaseFilename','OutputManifestFile','OutputDir',
-            'Parameters','Password','Permissions','PrivilegesRequired','ReserveBytes',
-            'RestartIfNeededByRun','Root','RunOnceId','Section','SetupIconFile',
-            'ShowComponentSizes','ShowLanguageDialog','ShowTasksTreeLines','SlicesPerDisk',
-            'SolidCompression','Source','SourceDir','StatusMsg','Subkey',
-            'TimeStampRounding','TimeStampsInUTC','TouchDate','TouchTime','Type',
-            'UninstallDisplayIcon','UninstallDisplayName','UninstallFilesDir','UninstallIconFile',
-            'UninstallLogMode','UninstallRestartComputer','UninstallStyle','Uninstallable',
-            'UpdateUninstallLogAppName','UsePreviousAppDir','UsePreviousGroup',
-            'UsePreviousTasks','UsePreviousSetupType','UsePreviousUserInfo',
-            'UserInfoPage','UseSetupLdr','ValueData','ValueName','ValueType',
-            'VersionInfoVersion','VersionInfoCompany','VersionInfoDescription','VersionInfoTextVersion',
-            'WindowResizable','WindowShowCaption','WindowStartMaximized',
-            'WindowVisible','WizardImageBackColor','WizardImageFile','WizardImageStretch','WizardSmallImageBackColor','WizardSmallImageFile','WizardStyle','WorkingDir'
-            ),
-        4 => array(
-            'AnsiChar', 'AnsiString', 'Boolean', 'Byte', 'Cardinal', 'Char', 'Comp', 'Currency', 'Double', 'Extended',
-            'Int64', 'Integer', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PChar', 'PCurrency', 'PDateTime',
-            'PExtended', 'PInt64', 'Pointer', 'PShortString', 'PString', 'PVariant', 'PWideChar', 'PWideString',
-            'Real', 'Real48', 'ShortInt', 'ShortString', 'Single', 'SmallInt', 'String', 'TBits', 'TConvType', 'TDateTime',
-            'Text', 'TextFile', 'TFloatFormat', 'TFormatSettings', 'TList', 'TObject', 'TOpenDialog', 'TPoint',
-            'TPrintDialog', 'TRect', 'TReplaceFlags', 'TSaveDialog', 'TSearchRec', 'TStringList', 'TSysCharSet',
-            'TThreadFunc', 'Variant', 'WideChar', 'WideString', 'Word'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '@', '%', '&', '*', '|', '/', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',/*bold Black*/
-            2 => 'color: #000000;font-style: italic;',/*Black*/
-            3 => 'color: #0000FF;',/*blue*/
-            4 => 'color: #CC0000;'/*red*/
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #33FF00; font-style: italic;',
-            'MULTI' => 'color: #33FF00; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000; font-weight: bold;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/intercal.php b/inc/geshi/intercal.php
deleted file mode 100644
index 3c81b81cc..000000000
--- a/inc/geshi/intercal.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/*************************************************************************************
- * intercal.php
- * ----------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/31
- *
- * INTERCAL language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/31 (1.0.8.1)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'INTERCAL',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        //Politeness
-        1 => array(
-            'DO', 'DOES', 'DONT', 'DON\'T', 'NOT', 'PLEASE', 'PLEASENT', 'PLEASEN\'T', 'MAYBE'
-            ),
-        //Statements
-        2 => array(
-            'STASH', 'RETRIEVE', 'NEXT', 'RESUME', 'FORGET', 'ABSTAIN', 'ABSTAINING',
-            'COME', 'FROM', 'CALCULATING', 'REINSTATE', 'IGNORE', 'REMEMBER',
-            'WRITE', 'IN', 'READ', 'OUT', 'GIVE', 'UP'
-            )
-        ),
-    'SYMBOLS' => array(
-        '.', ',', ':', ';', '#',
-        '~', '$', '&', '?',
-        '\'', '"', '<-'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080; font-weight: bold;',
-            2 => 'color: #000080; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #808080; font-style: italic;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        1 => '^\(\d+\)'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'COMMENTS' => GESHI_NEVER,
-            'STRINGS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/io.php b/inc/geshi/io.php
deleted file mode 100644
index 51fad43a7..000000000
--- a/inc/geshi/io.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/*************************************************************************************
- * io.php
- * -------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2006 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2006/09/23
- *
- * Io language file for GeSHi. Thanks to Johnathan Wright for the suggestion and help
- * with this language :)
- *
- * CHANGES
- * -------
- * 2006/09/23(1.0.0)
- *  -  First Release
- *
- * TODO
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Io',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'and', 'break', 'else', 'elseif', 'exit', 'for', 'foreach', 'if', 'ifFalse', 'ifNil',
-            'ifTrue', 'or', 'pass', 'raise', 'return', 'then', 'try', 'wait', 'while', 'yield'
-            ),
-        2 => array(
-            'activate', 'activeCoroCount', 'asString', 'block', 'catch', 'clone', 'collectGarbage',
-            'compileString', 'continue', 'do', 'doFile', 'doMessage', 'doString', 'forward',
-            'getSlot', 'getenv', 'hasSlot', 'isActive', 'isNil', 'isResumable', 'list', 'message',
-            'method', 'parent', 'pause', 'perform', 'performWithArgList', 'print', 'proto',
-            'raiseResumable', 'removeSlot', 'resend', 'resume', 'schedulerSleepSeconds', 'self',
-            'sender', 'setSchedulerSleepSeconds', 'setSlot', 'shallowCopy', 'slotNames', 'super',
-            'system', 'thisBlock', 'thisContext', 'thisMessage', 'type', 'uniqueId', 'updateSlot',
-            'write'
-            ),
-        3 => array(
-            'Array', 'AudioDevice', 'AudioMixer', 'Block', 'Box', 'Buffer', 'CFunction', 'CGI',
-            'Color', 'Curses', 'DBM', 'DNSResolver', 'DOConnection', 'DOProxy', 'DOServer',
-            'Date', 'Directory', 'Duration', 'DynLib', 'Error', 'Exception', 'FFT', 'File',
-            'Fnmatch', 'Font', 'Future', 'GL', 'GLE', 'GLScissor', 'GLU', 'GLUCylinder',
-            'GLUQuadric', 'GLUSphere', 'GLUT', 'Host', 'Image', 'Importer', 'LinkList', 'List',
-            'Lobby', 'Locals', 'MD5', 'MP3Decoder', 'MP3Encoder', 'Map', 'Message', 'Movie',
-            'NULL', 'Nil', 'Nop', 'Notifiction', 'Number', 'Object', 'OpenGL', 'Point', 'Protos',
-            'Regex', 'SGMLTag', 'SQLite', 'Server', 'ShowMessage', 'SleepyCat', 'SleepyCatCursor',
-            'Socket', 'SocketManager', 'Sound', 'Soup', 'Store', 'String', 'Tree', 'UDPSender',
-            'UDPReceiver', 'URL', 'User', 'Warning', 'WeakLink'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/j.php b/inc/geshi/j.php
deleted file mode 100644
index 5565bb499..000000000
--- a/inc/geshi/j.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/*************************************************************************************
- * j.php
- * --------
- * Author: Ric Sherlock (tikkanz@gmail.com)
- * Copyright: (c) 2009 Ric Sherlock
- * Release Version: 1.0.8.11
- * Date Started: 2009/11/10
- *
- * J language file for GeSHi.
- *
- * CHANGES
- * -------
- *  2010/07/18 (1.0.8.10)
- *   - Infinity and negative infinity recognized as numbers
- *  2010/03/01 (1.0.8.8)
- *   - Add support for label_xyz. and goto_xyz.
- *   - Fix highlighting of for_i.
- *   - Use alternative method for highlighting for_xyz. construct
- *  2010/02/14 (1.0.8.7)
- *   - Add support for primitives
- *  2010/01/12 (1.0.2)
- *   - Use HARDQUOTE for strings
- *   - Highlight open quotes/incomplete strings
- *   - Highlight multi-line comments that use Note
- *   - Refinements for NUMBERS and Argument keywords
- *   - Highlight infinity and neg. infinity using REGEXPS
- *   - Highlight "for_myvar." style Control keyword using REGEXPS
- *  2009/12/14 (1.0.1)
- *   -  Regex for NUMBERS, SYMBOLS for () and turn off BRACKETS
- *  2009/11/12 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2010/01/27)
- * -------------------------
- *  * combine keyword categories by using conditional regex statement in PARSER CONTROL?
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'J',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        1 => '/(?<!\w)NB\..*?$/m',                //singleline comments NB.
-        2 => '/(?<=\bNote\b).*?$\s+\)(?:(?!\n)\s)*$/sm',   //multiline comments in Note
-        3 => "/'[^']*?$/m"                        //incomplete strings/open quotes
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("'"),
-    'HARDCHAR' => "'",
-    'NUMBERS' => array(
-        0 => '\b(?:_?\d+(?:\.\d+)?(?:x|[bejprx]_?[\da-z]+(?:\.[\da-z]+)?)?|__?)(?![\w\.\:])',
-        ),
-    'KEYWORDS' => array(
-        //Control words
-        1 => array(
-            'assert.', 'break.', 'case.', 'catch.', 'catcht.', 'continue.', 'do.',
-            'else.', 'elseif.', 'end.', 'fcase.', 'for.', 'goto.', 'if.', 'label.',
-            'return.', 'select.', 'throw.', 'trap.', 'try.', 'while.', 'whilst.'
-            ),
-        //Arguments
-        2 => array(
-            'm', 'n', 'u', 'v', 'x', 'y'
-            ),
-        ),
-    'SYMBOLS' => array(
-        //Punctuation
-        0 => array(
-            '(', ')'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        //6 => true,
-        //7 => true,
-        //8 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff; font-weight: bold;',
-            2 => 'color: #0000cc; font-weight: bold;',
-            //6 => 'color: #000000; font-weight: bold;',
-            //7 => 'color: #000000; font-weight: bold;',
-            //8 => 'color: #000000; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #666666; font-style: italic; font-weight: bold;',
-            3 => 'color: #ff00ff; ',                      //open quote
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            'HARD' => 'font-weight: bold;',
-            0 => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            'HARD' => 'color: #ff0000;',
-            0 => 'color: #ff0000;',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #009999; font-weight: bold;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #009900; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff; font-weight: bold;',   //for_xyz. - same as kw1
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '', //'http://www.jsoftware.com/help/dictionary/ctrl.htm',
-        2 => '',
-        //6 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
-        //7 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
-        //8 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => '\b(for|goto|label)_[a-zA-Z]\w*\.',   //for_xyz. - should be kw1
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            ),
-        'NUMBERS' => array(
-            'PRECHECK_RX' => '#[\d_]#',            // underscore is valid number
-            ),
-        'KEYWORDS' => array(
-            //Control words
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)',
-                'DISALLOWED_AFTER' => '(?![\w\.\:])',
-                ),
-            //Primtives starting with a symbol (except . or :)
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?!K)',    // effect should be to allow anything
-                'DISALLOWED_AFTER' => '(?=.*)',
-                ),
-            //Primtives starting with a letter
-            7 => array(
-                'DISALLOWED_BEFORE' => '(?<!\w)',
-                'DISALLOWED_AFTER' => '(?=.*)',
-                ),
-            //Primtives starting with symbol . or :
-            8 => array(
-                'DISALLOWED_BEFORE' => '(?<=\s)',
-                'DISALLOWED_AFTER' => '(?=.*)',
-                ),
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/java.php b/inc/geshi/java.php
deleted file mode 100644
index 652b8ddd3..000000000
--- a/inc/geshi/java.php
+++ /dev/null
@@ -1,983 +0,0 @@
-<?php
-/*************************************************************************************
- * java.php
- * --------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/10
- *
- * Java language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/25 (1.0.7.22)
- *   -  Added highlighting of import and package directives as non-OOP
- * 2005/12/28 (1.0.4)
- *   -  Added instanceof keyword
- * 2004/11/27 (1.0.3)
- *   -  Added support for multiple object splitters
- * 2004/08/05 (1.0.2)
- *   -  Added URL support
- *   -  Added keyword "this", as bugs in GeSHi class ironed out
- * 2004/08/05 (1.0.1)
- *   -  Added support for symbols
- *   -  Added extra missed keywords
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Compact the class names like the first few have been
- *   and eliminate repeats
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Java',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Import and Package directives (Basic Support only)
-        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
-        // javadoc comments
-        3 => '#/\*\*(?![\*\/]).*\*/#sU'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'for', 'foreach', 'if', 'else', 'while', 'do',
-            'switch', 'case',  'return', 'public',
-            'private', 'protected', 'extends', 'break', 'class',
-            'new', 'try', 'catch', 'throws', 'finally', 'implements',
-            'interface', 'throw', 'final', 'native', 'synchronized', 'this',
-            'abstract', 'transient', 'instanceof', 'assert', 'continue',
-            'default', 'enum', 'package', 'static', 'strictfp', 'super',
-            'volatile', 'const', 'goto', 'import'
-            ),
-        2 => array(
-            'null', 'false', 'true'
-            ),
-        3 => array(
-            'AbstractAction', 'AbstractBorder', 'AbstractButton',
-            'AbstractCellEditor', 'AbstractCollection',
-            'AbstractColorChooserPanel', 'AbstractDocument',
-            'AbstractDocument.AttributeContext',
-            'AbstractDocument.Content',
-            'AbstractDocument.ElementEdit',
-            'AbstractLayoutCache',
-            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
-            'AbstractListModel', 'AbstractMap',
-            'AbstractMethodError', 'AbstractSequentialList',
-            'AbstractSet', 'AbstractTableModel',
-            'AbstractUndoableEdit', 'AbstractWriter',
-            'AccessControlContext', 'AccessControlException',
-            'AccessController', 'AccessException', 'Accessible',
-            'AccessibleAction', 'AccessibleBundle',
-            'AccessibleComponent', 'AccessibleContext',
-            'AccessibleHyperlink', 'AccessibleHypertext',
-            'AccessibleIcon', 'AccessibleObject',
-            'AccessibleRelation', 'AccessibleRelationSet',
-            'AccessibleResourceBundle', 'AccessibleRole',
-            'AccessibleSelection', 'AccessibleState',
-            'AccessibleStateSet', 'AccessibleTable',
-            'AccessibleTableModelChange', 'AccessibleText',
-            'AccessibleValue', 'Acl', 'AclEntry',
-            'AclNotFoundException', 'Action', 'ActionEvent',
-            'ActionListener', 'ActionMap', 'ActionMapUIResource',
-            'Activatable', 'ActivateFailedException',
-            'ActivationDesc', 'ActivationException',
-            'ActivationGroup', 'ActivationGroupDesc',
-            'ActivationGroupDesc.CommandEnvironment',
-            'ActivationGroupID', 'ActivationID',
-            'ActivationInstantiator', 'ActivationMonitor',
-            'ActivationSystem', 'Activator', 'ActiveEvent',
-            'Adjustable', 'AdjustmentEvent',
-            'AdjustmentListener', 'Adler32', 'AffineTransform',
-            'AffineTransformOp', 'AlgorithmParameterGenerator',
-            'AlgorithmParameterGeneratorSpi',
-            'AlgorithmParameters', 'AlgorithmParameterSpec',
-            'AlgorithmParametersSpi', 'AllPermission',
-            'AlphaComposite', 'AlreadyBound',
-            'AlreadyBoundException', 'AlreadyBoundHelper',
-            'AlreadyBoundHolder', 'AncestorEvent',
-            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
-            'AnySeqHelper', 'AnySeqHolder', 'Applet',
-            'AppletContext', 'AppletInitializer', 'AppletStub',
-            'ApplicationException', 'Arc2D', 'Arc2D.Double',
-            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
-            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
-            'ArithmeticException', 'Array',
-            'ArrayIndexOutOfBoundsException', 'ArrayList',
-            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
-            'Attribute', 'AttributedCharacterIterator',
-            'AttributedCharacterIterator.Attribute',
-            'AttributedString', 'AttributeInUseException',
-            'AttributeList', 'AttributeModificationException',
-            'Attributes', 'Attributes.Name', 'AttributeSet',
-            'AttributeSet.CharacterAttribute',
-            'AttributeSet.ColorAttribute',
-            'AttributeSet.FontAttribute',
-            'AttributeSet.ParagraphAttribute', 'AudioClip',
-            'AudioFileFormat', 'AudioFileFormat.Type',
-            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
-            'AudioFormat.Encoding', 'AudioInputStream',
-            'AudioPermission', 'AudioSystem',
-            'AuthenticationException',
-            'AuthenticationNotSupportedException',
-            'Authenticator', 'Autoscroll', 'AWTError',
-            'AWTEvent', 'AWTEventListener',
-            'AWTEventMulticaster', 'AWTException',
-            'AWTPermission', 'BadKind', 'BadLocationException',
-            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
-            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
-            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
-            'BandedSampleModel', 'BasicArrowButton',
-            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
-            'BasicBorders.ButtonBorder',
-            'BasicBorders.FieldBorder',
-            'BasicBorders.MarginBorder',
-            'BasicBorders.MenuBarBorder',
-            'BasicBorders.RadioButtonBorder',
-            'BasicBorders.SplitPaneBorder',
-            'BasicBorders.ToggleButtonBorder',
-            'BasicButtonListener', 'BasicButtonUI',
-            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
-            'BasicColorChooserUI', 'BasicComboBoxEditor',
-            'BasicComboBoxEditor.UIResource',
-            'BasicComboBoxRenderer',
-            'BasicComboBoxRenderer.UIResource',
-            'BasicComboBoxUI', 'BasicComboPopup',
-            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
-            'BasicDirectoryModel', 'BasicEditorPaneUI',
-            'BasicFileChooserUI', 'BasicGraphicsUtils',
-            'BasicHTML', 'BasicIconFactory',
-            'BasicInternalFrameTitlePane',
-            'BasicInternalFrameUI', 'BasicLabelUI',
-            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
-            'BasicMenuItemUI', 'BasicMenuUI',
-            'BasicOptionPaneUI',
-            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
-            'BasicPasswordFieldUI', 'BasicPermission',
-            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
-            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
-            'BasicRadioButtonUI', 'BasicRootPaneUI',
-            'BasicScrollBarUI', 'BasicScrollPaneUI',
-            'BasicSeparatorUI', 'BasicSliderUI',
-            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
-            'BasicStroke', 'BasicTabbedPaneUI',
-            'BasicTableHeaderUI', 'BasicTableUI',
-            'BasicTextAreaUI', 'BasicTextFieldUI',
-            'BasicTextPaneUI', 'BasicTextUI',
-            'BasicTextUI.BasicCaret',
-            'BasicTextUI.BasicHighlighter',
-            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
-            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
-            'BasicViewportUI', 'BatchUpdateException',
-            'BeanContext', 'BeanContextChild',
-            'BeanContextChildComponentProxy',
-            'BeanContextChildSupport',
-            'BeanContextContainerProxy', 'BeanContextEvent',
-            'BeanContextMembershipEvent',
-            'BeanContextMembershipListener', 'BeanContextProxy',
-            'BeanContextServiceAvailableEvent',
-            'BeanContextServiceProvider',
-            'BeanContextServiceProviderBeanInfo',
-            'BeanContextServiceRevokedEvent',
-            'BeanContextServiceRevokedListener',
-            'BeanContextServices', 'BeanContextServicesListener',
-            'BeanContextServicesSupport',
-            'BeanContextServicesSupport.BCSSServiceProvider',
-            'BeanContextSupport',
-            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
-            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
-            'BigInteger', 'BinaryRefAddr', 'BindException',
-            'Binding', 'BindingHelper', 'BindingHolder',
-            'BindingIterator', 'BindingIteratorHelper',
-            'BindingIteratorHolder', 'BindingIteratorOperations',
-            'BindingListHelper', 'BindingListHolder',
-            'BindingType', 'BindingTypeHelper',
-            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
-            'Book', 'Boolean', 'BooleanControl',
-            'BooleanControl.Type', 'BooleanHolder',
-            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
-            'BorderFactory', 'BorderLayout', 'BorderUIResource',
-            'BorderUIResource.BevelBorderUIResource',
-            'BorderUIResource.CompoundBorderUIResource',
-            'BorderUIResource.EmptyBorderUIResource',
-            'BorderUIResource.EtchedBorderUIResource',
-            'BorderUIResource.LineBorderUIResource',
-            'BorderUIResource.MatteBorderUIResource',
-            'BorderUIResource.TitledBorderUIResource',
-            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
-            'BoxedValueHelper', 'BoxLayout', 'BoxView',
-            'BreakIterator', 'BufferedImage',
-            'BufferedImageFilter', 'BufferedImageOp',
-            'BufferedInputStream', 'BufferedOutputStream',
-            'BufferedReader', 'BufferedWriter', 'Button',
-            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
-            'ByteArrayInputStream', 'ByteArrayOutputStream',
-            'ByteHolder', 'ByteLookupTable', 'Calendar',
-            'CallableStatement', 'CannotProceed',
-            'CannotProceedException', 'CannotProceedHelper',
-            'CannotProceedHolder', 'CannotRedoException',
-            'CannotUndoException', 'Canvas', 'CardLayout',
-            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
-            'CellEditorListener', 'CellRendererPane',
-            'Certificate', 'Certificate.CertificateRep',
-            'CertificateEncodingException',
-            'CertificateException',
-            'CertificateExpiredException', 'CertificateFactory',
-            'CertificateFactorySpi',
-            'CertificateNotYetValidException',
-            'CertificateParsingException',
-            'ChangedCharSetException', 'ChangeEvent',
-            'ChangeListener', 'Character', 'Character.Subset',
-            'Character.UnicodeBlock', 'CharacterIterator',
-            'CharArrayReader', 'CharArrayWriter',
-            'CharConversionException', 'CharHolder',
-            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
-            'CheckboxGroup', 'CheckboxMenuItem',
-            'CheckedInputStream', 'CheckedOutputStream',
-            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
-            'ClassCastException', 'ClassCircularityError',
-            'ClassDesc', 'ClassFormatError', 'ClassLoader',
-            'ClassNotFoundException', 'Clip', 'Clipboard',
-            'ClipboardOwner', 'Clob', 'Cloneable',
-            'CloneNotSupportedException', 'CMMException',
-            'CodeSource', 'CollationElementIterator',
-            'CollationKey', 'Collator', 'Collection',
-            'Collections', 'Color',
-            'ColorChooserComponentFactory', 'ColorChooserUI',
-            'ColorConvertOp', 'ColorModel',
-            'ColorSelectionModel', 'ColorSpace',
-            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
-            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
-            'COMM_FAILURE', 'Comparable', 'Comparator',
-            'Compiler', 'CompletionStatus',
-            'CompletionStatusHelper', 'Component',
-            'ComponentAdapter', 'ComponentColorModel',
-            'ComponentEvent', 'ComponentInputMap',
-            'ComponentInputMapUIResource', 'ComponentListener',
-            'ComponentOrientation', 'ComponentSampleModel',
-            'ComponentUI', 'ComponentView', 'Composite',
-            'CompositeContext', 'CompositeName', 'CompositeView',
-            'CompoundBorder', 'CompoundControl',
-            'CompoundControl.Type', 'CompoundEdit',
-            'CompoundName', 'ConcurrentModificationException',
-            'ConfigurationException', 'ConnectException',
-            'ConnectIOException', 'Connection', 'Constructor', 'Container',
-            'ContainerAdapter', 'ContainerEvent',
-            'ContainerListener', 'ContentHandler',
-            'ContentHandlerFactory', 'ContentModel', 'Context',
-            'ContextList', 'ContextNotEmptyException',
-            'ContextualRenderedImageFactory', 'Control',
-            'Control.Type', 'ControlFactory',
-            'ControllerEventListener', 'ConvolveOp', 'CRC32',
-            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
-            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
-            'CubicCurve2D', 'CubicCurve2D.Double',
-            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
-            'CurrentHolder', 'CurrentOperations', 'Cursor',
-            'Customizer', 'CustomMarshal', 'CustomValue',
-            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
-            'DataBufferInt', 'DataBufferShort',
-            'DataBufferUShort', 'DataFlavor',
-            'DataFormatException', 'DatagramPacket',
-            'DatagramSocket', 'DatagramSocketImpl',
-            'DatagramSocketImplFactory', 'DataInput',
-            'DataInputStream', 'DataLine', 'DataLine.Info',
-            'DataOutput', 'DataOutputStream',
-            'DataTruncation', 'DATA_CONVERSION', 'Date',
-            'DateFormat', 'DateFormatSymbols', 'DebugGraphics',
-            'DecimalFormat', 'DecimalFormatSymbols',
-            'DefaultBoundedRangeModel', 'DefaultButtonModel',
-            'DefaultCaret', 'DefaultCellEditor',
-            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
-            'DefaultDesktopManager', 'DefaultEditorKit',
-            'DefaultEditorKit.BeepAction',
-            'DefaultEditorKit.CopyAction',
-            'DefaultEditorKit.CutAction',
-            'DefaultEditorKit.DefaultKeyTypedAction',
-            'DefaultEditorKit.InsertBreakAction',
-            'DefaultEditorKit.InsertContentAction',
-            'DefaultEditorKit.InsertTabAction',
-            'DefaultEditorKit.PasteAction,',
-            'DefaultFocusManager', 'DefaultHighlighter',
-            'DefaultHighlighter.DefaultHighlightPainter',
-            'DefaultListCellRenderer',
-            'DefaultListCellRenderer.UIResource',
-            'DefaultListModel', 'DefaultListSelectionModel',
-            'DefaultMenuLayout', 'DefaultMetalTheme',
-            'DefaultMutableTreeNode',
-            'DefaultSingleSelectionModel',
-            'DefaultStyledDocument',
-            'DefaultStyledDocument.AttributeUndoableEdit',
-            'DefaultStyledDocument.ElementSpec',
-            'DefaultTableCellRenderer',
-            'DefaultTableCellRenderer.UIResource',
-            'DefaultTableColumnModel', 'DefaultTableModel',
-            'DefaultTextUI', 'DefaultTreeCellEditor',
-            'DefaultTreeCellRenderer', 'DefaultTreeModel',
-            'DefaultTreeSelectionModel', 'DefinitionKind',
-            'DefinitionKindHelper', 'Deflater',
-            'DeflaterOutputStream', 'Delegate', 'DesignMode',
-            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
-            'DGC', 'Dialog', 'Dictionary', 'DigestException',
-            'DigestInputStream', 'DigestOutputStream',
-            'Dimension', 'Dimension2D', 'DimensionUIResource',
-            'DirContext', 'DirectColorModel', 'DirectoryManager',
-            'DirObjectFactory', 'DirStateFactory',
-            'DirStateFactory.Result', 'DnDConstants', 'Document',
-            'DocumentEvent', 'DocumentEvent.ElementChange',
-            'DocumentEvent.EventType', 'DocumentListener',
-            'DocumentParser', 'DomainCombiner', 'DomainManager',
-            'DomainManagerOperations', 'Double', 'DoubleHolder',
-            'DoubleSeqHelper', 'DoubleSeqHolder',
-            'DragGestureEvent', 'DragGestureListener',
-            'DragGestureRecognizer', 'DragSource',
-            'DragSourceContext', 'DragSourceDragEvent',
-            'DragSourceDropEvent', 'DragSourceEvent',
-            'DragSourceListener', 'Driver', 'DriverManager',
-            'DriverPropertyInfo', 'DropTarget',
-            'DropTarget.DropTargetAutoScroller',
-            'DropTargetContext', 'DropTargetDragEvent',
-            'DropTargetDropEvent', 'DropTargetEvent',
-            'DropTargetListener', 'DSAKey',
-            'DSAKeyPairGenerator', 'DSAParameterSpec',
-            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
-            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
-            'DTDConstants', 'DynamicImplementation', 'DynAny',
-            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
-            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
-            'Element', 'ElementIterator', 'Ellipse2D',
-            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
-            'EmptyStackException', 'EncodedKeySpec', 'Entity',
-            'EnumControl', 'EnumControl.Type', 'Enumeration',
-            'Environment', 'EOFException', 'Error',
-            'EtchedBorder', 'Event', 'EventContext',
-            'EventDirContext', 'EventListener',
-            'EventListenerList', 'EventObject', 'EventQueue',
-            'EventSetDescriptor', 'Exception',
-            'ExceptionInInitializerError', 'ExceptionList',
-            'ExpandVetoException', 'ExportException',
-            'ExtendedRequest', 'ExtendedResponse',
-            'Externalizable', 'FeatureDescriptor', 'Field',
-            'FieldNameHelper', 'FieldPosition', 'FieldView',
-            'File', 'FileChooserUI', 'FileDescriptor',
-            'FileDialog', 'FileFilter',
-            'FileInputStream', 'FilenameFilter', 'FileNameMap',
-            'FileNotFoundException', 'FileOutputStream',
-            'FilePermission', 'FileReader', 'FileSystemView',
-            'FileView', 'FileWriter', 'FilteredImageSource',
-            'FilterInputStream', 'FilterOutputStream',
-            'FilterReader', 'FilterWriter',
-            'FixedHeightLayoutCache', 'FixedHolder',
-            'FlatteningPathIterator', 'FlavorMap', 'Float',
-            'FloatControl', 'FloatControl.Type', 'FloatHolder',
-            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
-            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
-            'FocusEvent', 'FocusListener', 'FocusManager',
-            'Font', 'FontFormatException', 'FontMetrics',
-            'FontRenderContext', 'FontUIResource', 'Format',
-            'FormatConversionProvider', 'FormView', 'Frame',
-            'FREE_MEM', 'GapContent', 'GeneralPath',
-            'GeneralSecurityException', 'GlyphJustificationInfo',
-            'GlyphMetrics', 'GlyphVector', 'GlyphView',
-            'GlyphView.GlyphPainter', 'GradientPaint',
-            'GraphicAttribute', 'Graphics', 'Graphics2D',
-            'GraphicsConfigTemplate', 'GraphicsConfiguration',
-            'GraphicsDevice', 'GraphicsEnvironment',
-            'GrayFilter', 'GregorianCalendar',
-            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
-            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
-            'GZIPOutputStream', 'HasControls', 'HashMap',
-            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
-            'HierarchyBoundsListener', 'HierarchyEvent',
-            'HierarchyListener', 'Highlighter',
-            'Highlighter.Highlight',
-            'Highlighter.HighlightPainter', 'HTML',
-            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
-            'HTMLDocument', 'HTMLDocument.Iterator',
-            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
-            'HTMLEditorKit.HTMLTextAction',
-            'HTMLEditorKit.InsertHTMLTextAction',
-            'HTMLEditorKit.LinkController',
-            'HTMLEditorKit.Parser',
-            'HTMLEditorKit.ParserCallback',
-            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
-            'HttpURLConnection', 'HyperlinkEvent',
-            'HyperlinkEvent.EventType', 'HyperlinkListener',
-            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
-            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
-            'IconView', 'IdentifierHelper', 'Identity',
-            'IdentityScope', 'IDLEntity', 'IDLType',
-            'IDLTypeHelper', 'IDLTypeOperations',
-            'IllegalAccessError', 'IllegalAccessException',
-            'IllegalArgumentException',
-            'IllegalComponentStateException',
-            'IllegalMonitorStateException',
-            'IllegalPathStateException', 'IllegalStateException',
-            'IllegalThreadStateException', 'Image',
-            'ImageConsumer', 'ImageFilter',
-            'ImageGraphicAttribute', 'ImageIcon',
-            'ImageObserver', 'ImageProducer',
-            'ImagingOpException', 'IMP_LIMIT',
-            'IncompatibleClassChangeError',
-            'InconsistentTypeCode', 'IndexColorModel',
-            'IndexedPropertyDescriptor',
-            'IndexOutOfBoundsException', 'IndirectionException',
-            'InetAddress', 'Inflater', 'InflaterInputStream',
-            'InheritableThreadLocal', 'InitialContext',
-            'InitialContextFactory',
-            'InitialContextFactoryBuilder', 'InitialDirContext',
-            'INITIALIZE', 'Initializer', 'InitialLdapContext',
-            'InlineView', 'InputContext', 'InputEvent',
-            'InputMap', 'InputMapUIResource', 'InputMethod',
-            'InputMethodContext', 'InputMethodDescriptor',
-            'InputMethodEvent', 'InputMethodHighlight',
-            'InputMethodListener', 'InputMethodRequests',
-            'InputStream',
-            'InputStreamReader', 'InputSubset', 'InputVerifier',
-            'Insets', 'InsetsUIResource', 'InstantiationError',
-            'InstantiationException', 'Instrument',
-            'InsufficientResourcesException', 'Integer',
-            'INTERNAL', 'InternalError', 'InternalFrameAdapter',
-            'InternalFrameEvent', 'InternalFrameListener',
-            'InternalFrameUI', 'InterruptedException',
-            'InterruptedIOException',
-            'InterruptedNamingException', 'INTF_REPOS',
-            'IntHolder', 'IntrospectionException',
-            'Introspector', 'Invalid',
-            'InvalidAlgorithmParameterException',
-            'InvalidAttributeIdentifierException',
-            'InvalidAttributesException',
-            'InvalidAttributeValueException',
-            'InvalidClassException',
-            'InvalidDnDOperationException',
-            'InvalidKeyException', 'InvalidKeySpecException',
-            'InvalidMidiDataException', 'InvalidName',
-            'InvalidNameException',
-            'InvalidNameHelper', 'InvalidNameHolder',
-            'InvalidObjectException',
-            'InvalidParameterException',
-            'InvalidParameterSpecException',
-            'InvalidSearchControlsException',
-            'InvalidSearchFilterException', 'InvalidSeq',
-            'InvalidTransactionException', 'InvalidValue',
-            'INVALID_TRANSACTION', 'InvocationEvent',
-            'InvocationHandler', 'InvocationTargetException',
-            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
-            'INV_OBJREF', 'INV_POLICY', 'IOException',
-            'IRObject', 'IRObjectOperations', 'IstringHelper',
-            'ItemEvent', 'ItemListener', 'ItemSelectable',
-            'Iterator', 'JApplet', 'JarEntry', 'JarException',
-            'JarFile', 'JarInputStream', 'JarOutputStream',
-            'JarURLConnection', 'JButton', 'JCheckBox',
-            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
-            'JComboBox.KeySelectionManager', 'JComponent',
-            'JDesktopPane', 'JDialog', 'JEditorPane',
-            'JFileChooser', 'JFrame', 'JInternalFrame',
-            'JInternalFrame.JDesktopIcon', 'JLabel',
-            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
-            'JMenuItem', 'JobAttributes',
-            'JobAttributes.DefaultSelectionType',
-            'JobAttributes.DestinationType',
-            'JobAttributes.DialogType',
-            'JobAttributes.MultipleDocumentHandlingType',
-            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
-            'JPasswordField', 'JPopupMenu',
-            'JPopupMenu.Separator', 'JProgressBar',
-            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
-            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
-            'JSplitPane', 'JTabbedPane', 'JTable',
-            'JTableHeader', 'JTextArea', 'JTextComponent',
-            'JTextComponent.KeyBinding', 'JTextField',
-            'JTextPane', 'JToggleButton',
-            'JToggleButton.ToggleButtonModel', 'JToolBar',
-            'JToolBar.Separator', 'JToolTip', 'JTree',
-            'JTree.DynamicUtilTreeNode',
-            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
-            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
-            'KeyException', 'KeyFactory', 'KeyFactorySpi',
-            'KeyListener', 'KeyManagementException', 'Keymap',
-            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
-            'KeySpec', 'KeyStore', 'KeyStoreException',
-            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
-            'LabelView', 'LastOwnerException',
-            'LayeredHighlighter',
-            'LayeredHighlighter.LayerPainter', 'LayoutManager',
-            'LayoutManager2', 'LayoutQueue', 'LdapContext',
-            'LdapReferralException', 'Lease',
-            'LimitExceededException', 'Line', 'Line.Info',
-            'Line2D', 'Line2D.Double', 'Line2D.Float',
-            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
-            'LineEvent.Type', 'LineListener', 'LineMetrics',
-            'LineNumberInputStream', 'LineNumberReader',
-            'LineUnavailableException', 'LinkageError',
-            'LinkedList', 'LinkException', 'LinkLoopException',
-            'LinkRef', 'List', 'ListCellRenderer',
-            'ListDataEvent', 'ListDataListener', 'ListIterator',
-            'ListModel', 'ListResourceBundle',
-            'ListSelectionEvent', 'ListSelectionListener',
-            'ListSelectionModel', 'ListUI', 'ListView',
-            'LoaderHandler', 'Locale', 'LocateRegistry',
-            'LogStream', 'Long', 'LongHolder',
-            'LongLongSeqHelper', 'LongLongSeqHolder',
-            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
-            'LookupOp', 'LookupTable', 'MalformedLinkException',
-            'MalformedURLException', 'Manifest', 'Map',
-            'Map.Entry', 'MARSHAL', 'MarshalException',
-            'MarshalledObject', 'Math', 'MatteBorder',
-            'MediaTracker', 'Member', 'MemoryImageSource',
-            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
-            'MenuContainer', 'MenuDragMouseEvent',
-            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
-            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
-            'MenuKeyListener', 'MenuListener',
-            'MenuSelectionManager', 'MenuShortcut',
-            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
-            'MetaEventListener', 'MetalBorders',
-            'MetalBorders.ButtonBorder',
-            'MetalBorders.Flush3DBorder',
-            'MetalBorders.InternalFrameBorder',
-            'MetalBorders.MenuBarBorder',
-            'MetalBorders.MenuItemBorder',
-            'MetalBorders.OptionDialogBorder',
-            'MetalBorders.PaletteBorder',
-            'MetalBorders.PopupMenuBorder',
-            'MetalBorders.RolloverButtonBorder',
-            'MetalBorders.ScrollPaneBorder',
-            'MetalBorders.TableHeaderBorder',
-            'MetalBorders.TextFieldBorder',
-            'MetalBorders.ToggleButtonBorder',
-            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
-            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
-            'MetalComboBoxButton', 'MetalComboBoxEditor',
-            'MetalComboBoxEditor.UIResource',
-            'MetalComboBoxIcon', 'MetalComboBoxUI',
-            'MetalDesktopIconUI', 'MetalFileChooserUI',
-            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
-            'MetalIconFactory.FolderIcon16',
-            'MetalIconFactory.PaletteCloseIcon',
-            'MetalIconFactory.TreeControlIcon',
-            'MetalIconFactory.TreeFolderIcon',
-            'MetalIconFactory.TreeLeafIcon',
-            'MetalInternalFrameTitlePane',
-            'MetalInternalFrameUI', 'MetalLabelUI',
-            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
-            'MetalProgressBarUI', 'MetalRadioButtonUI',
-            'MetalScrollBarUI', 'MetalScrollButton',
-            'MetalScrollPaneUI', 'MetalSeparatorUI',
-            'MetalSliderUI', 'MetalSplitPaneUI',
-            'MetalTabbedPaneUI', 'MetalTextFieldUI',
-            'MetalTheme', 'MetalToggleButtonUI',
-            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
-            'MetaMessage', 'Method', 'MethodDescriptor',
-            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
-            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
-            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
-            'MidiSystem', 'MidiUnavailableException',
-            'MimeTypeParseException', 'MinimalHTMLWriter',
-            'MissingResourceException', 'Mixer', 'Mixer.Info',
-            'MixerProvider', 'ModificationItem', 'Modifier',
-            'MouseAdapter', 'MouseDragGestureRecognizer',
-            'MouseEvent', 'MouseInputAdapter',
-            'MouseInputListener', 'MouseListener',
-            'MouseMotionAdapter', 'MouseMotionListener',
-            'MultiButtonUI', 'MulticastSocket',
-            'MultiColorChooserUI', 'MultiComboBoxUI',
-            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
-            'MultiFileChooserUI', 'MultiInternalFrameUI',
-            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
-            'MultiMenuBarUI', 'MultiMenuItemUI',
-            'MultiOptionPaneUI', 'MultiPanelUI',
-            'MultiPixelPackedSampleModel', 'MultipleMaster',
-            'MultiPopupMenuUI', 'MultiProgressBarUI',
-            'MultiScrollBarUI', 'MultiScrollPaneUI',
-            'MultiSeparatorUI', 'MultiSliderUI',
-            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
-            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
-            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
-            'MultiViewportUI', 'MutableAttributeSet',
-            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
-            'NameAlreadyBoundException', 'NameClassPair',
-            'NameComponent', 'NameComponentHelper',
-            'NameComponentHolder', 'NamedValue', 'NameHelper',
-            'NameHolder', 'NameNotFoundException', 'NameParser',
-            'NamespaceChangeListener', 'NameValuePair',
-            'NameValuePairHelper', 'Naming', 'NamingContext',
-            'NamingContextHelper', 'NamingContextHolder',
-            'NamingContextOperations', 'NamingEnumeration',
-            'NamingEvent', 'NamingException',
-            'NamingExceptionEvent', 'NamingListener',
-            'NamingManager', 'NamingSecurityException',
-            'NegativeArraySizeException', 'NetPermission',
-            'NoClassDefFoundError', 'NoInitialContextException',
-            'NoninvertibleTransformException',
-            'NoPermissionException', 'NoRouteToHostException',
-            'NoSuchAlgorithmException',
-            'NoSuchAttributeException', 'NoSuchElementException',
-            'NoSuchFieldError', 'NoSuchFieldException',
-            'NoSuchMethodError', 'NoSuchMethodException',
-            'NoSuchObjectException', 'NoSuchProviderException',
-            'NotActiveException', 'NotBoundException',
-            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
-            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
-            'NotFoundHolder', 'NotFoundReason',
-            'NotFoundReasonHelper', 'NotFoundReasonHolder',
-            'NotOwnerException', 'NotSerializableException',
-            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
-            'NO_RESOURCES', 'NO_RESPONSE',
-            'NullPointerException', 'Number', 'NumberFormat',
-            'NumberFormatException', 'NVList', 'Object',
-            'ObjectChangeListener', 'ObjectFactory',
-            'ObjectFactoryBuilder', 'ObjectHelper',
-            'ObjectHolder', 'ObjectImpl',
-            'ObjectInput', 'ObjectInputStream',
-            'ObjectInputStream.GetField',
-            'ObjectInputValidation', 'ObjectOutput',
-            'ObjectOutputStream', 'ObjectOutputStream.PutField',
-            'ObjectStreamClass', 'ObjectStreamConstants',
-            'ObjectStreamException', 'ObjectStreamField',
-            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
-            'OBJ_ADAPTER', 'Observable', 'Observer',
-            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
-            'OpenType', 'Operation',
-            'OperationNotSupportedException', 'Option',
-            'OptionalDataException', 'OptionPaneUI', 'ORB',
-            'OutOfMemoryError', 'OutputStream',
-            'OutputStreamWriter', 'OverlayLayout', 'Owner',
-            'Package', 'PackedColorModel', 'Pageable',
-            'PageAttributes', 'PageAttributes.ColorType',
-            'PageAttributes.MediaType',
-            'PageAttributes.OrientationRequestedType',
-            'PageAttributes.OriginType',
-            'PageAttributes.PrintQualityType', 'PageFormat',
-            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
-            'PanelUI', 'Paper', 'ParagraphView',
-            'ParameterBlock', 'ParameterDescriptor',
-            'ParseException', 'ParsePosition', 'Parser',
-            'ParserDelegator', 'PartialResultException',
-            'PasswordAuthentication', 'PasswordView', 'Patch',
-            'PathIterator', 'Permission',
-            'PermissionCollection', 'Permissions',
-            'PERSIST_STORE', 'PhantomReference',
-            'PipedInputStream', 'PipedOutputStream',
-            'PipedReader', 'PipedWriter', 'PixelGrabber',
-            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
-            'PlainDocument', 'PlainView', 'Point', 'Point2D',
-            'Point2D.Double', 'Point2D.Float', 'Policy',
-            'PolicyError', 'PolicyHelper',
-            'PolicyHolder', 'PolicyListHelper',
-            'PolicyListHolder', 'PolicyOperations',
-            'PolicyTypeHelper', 'Polygon', 'PopupMenu',
-            'PopupMenuEvent', 'PopupMenuListener', 'PopupMenuUI',
-            'Port', 'Port.Info', 'PortableRemoteObject',
-            'PortableRemoteObjectDelegate', 'Position',
-            'Position.Bias', 'PreparedStatement', 'Principal',
-            'PrincipalHolder', 'Printable',
-            'PrinterAbortException', 'PrinterException',
-            'PrinterGraphics', 'PrinterIOException',
-            'PrinterJob', 'PrintGraphics', 'PrintJob',
-            'PrintStream', 'PrintWriter', 'PrivateKey',
-            'PRIVATE_MEMBER', 'PrivilegedAction',
-            'PrivilegedActionException',
-            'PrivilegedExceptionAction', 'Process',
-            'ProfileDataException', 'ProgressBarUI',
-            'ProgressMonitor', 'ProgressMonitorInputStream',
-            'Properties', 'PropertyChangeEvent',
-            'PropertyChangeListener', 'PropertyChangeSupport',
-            'PropertyDescriptor', 'PropertyEditor',
-            'PropertyEditorManager', 'PropertyEditorSupport',
-            'PropertyPermission', 'PropertyResourceBundle',
-            'PropertyVetoException', 'ProtectionDomain',
-            'ProtocolException', 'Provider', 'ProviderException',
-            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
-            'PushbackInputStream', 'PushbackReader',
-            'QuadCurve2D', 'QuadCurve2D.Double',
-            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
-            'Raster', 'RasterFormatException', 'RasterOp',
-            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
-            'Rectangle2D.Double', 'Rectangle2D.Float',
-            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
-            'Referenceable', 'ReferenceQueue',
-            'ReferralException', 'ReflectPermission', 'Registry',
-            'RegistryHandler', 'RemarshalException', 'Remote',
-            'RemoteCall', 'RemoteException', 'RemoteObject',
-            'RemoteRef', 'RemoteServer', 'RemoteStub',
-            'RenderableImage', 'RenderableImageOp',
-            'RenderableImageProducer', 'RenderContext',
-            'RenderedImage', 'RenderedImageFactory', 'Renderer',
-            'RenderingHints', 'RenderingHints.Key',
-            'RepaintManager', 'ReplicateScaleFilter',
-            'Repository', 'RepositoryIdHelper', 'Request',
-            'RescaleOp', 'Resolver', 'ResolveResult',
-            'ResourceBundle', 'ResponseHandler', 'ResultSet',
-            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
-            'RMIClassLoader', 'RMIClientSocketFactory',
-            'RMIFailureHandler', 'RMISecurityException',
-            'RMISecurityManager', 'RMIServerSocketFactory',
-            'RMISocketFactory', 'Robot', 'RootPaneContainer',
-            'RootPaneUI', 'RoundRectangle2D',
-            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
-            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
-            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
-            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
-            'RSAPublicKeySpec', 'RTFEditorKit',
-            'RuleBasedCollator', 'Runnable', 'RunTime',
-            'Runtime', 'RuntimeException', 'RunTimeOperations',
-            'RuntimePermission', 'SampleModel',
-            'SchemaViolationException', 'Scrollable',
-            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
-            'ScrollPaneConstants', 'ScrollPaneLayout',
-            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
-            'SearchControls', 'SearchResult',
-            'SecureClassLoader', 'SecureRandom',
-            'SecureRandomSpi', 'Security', 'SecurityException',
-            'SecurityManager', 'SecurityPermission', 'Segment',
-            'SeparatorUI', 'Sequence', 'SequenceInputStream',
-            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
-            'SerializablePermission', 'ServantObject',
-            'ServerCloneException', 'ServerError',
-            'ServerException', 'ServerNotActiveException',
-            'ServerRef', 'ServerRequest',
-            'ServerRuntimeException', 'ServerSocket',
-            'ServiceDetail', 'ServiceDetailHelper',
-            'ServiceInformation', 'ServiceInformationHelper',
-            'ServiceInformationHolder',
-            'ServiceUnavailableException', 'Set',
-            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
-            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
-            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
-            'ShortSeqHolder', 'Signature', 'SignatureException',
-            'SignatureSpi', 'SignedObject', 'Signer',
-            'SimpleAttributeSet', 'SimpleBeanInfo',
-            'SimpleDateFormat', 'SimpleTimeZone',
-            'SinglePixelPackedSampleModel',
-            'SingleSelectionModel', 'SizeLimitExceededException',
-            'SizeRequirements', 'SizeSequence', 'Skeleton',
-            'SkeletonMismatchException',
-            'SkeletonNotFoundException', 'SliderUI', 'Socket',
-            'SocketException', 'SocketImpl', 'SocketImplFactory',
-            'SocketOptions', 'SocketPermission',
-            'SocketSecurityException', 'SoftBevelBorder',
-            'SoftReference', 'SortedMap', 'SortedSet',
-            'Soundbank', 'SoundbankReader', 'SoundbankResource',
-            'SourceDataLine', 'SplitPaneUI', 'SQLData',
-            'SQLException', 'SQLInput', 'SQLOutput',
-            'SQLPermission', 'SQLWarning', 'Stack',
-            'StackOverflowError', 'StateEdit', 'StateEditable',
-            'StateFactory', 'Statement', 'Streamable',
-            'StreamableValue', 'StreamCorruptedException',
-            'StreamTokenizer', 'StrictMath', 'String',
-            'StringBuffer', 'StringBufferInputStream',
-            'StringCharacterIterator', 'StringContent',
-            'StringHolder', 'StringIndexOutOfBoundsException',
-            'StringReader', 'StringRefAddr', 'StringSelection',
-            'StringTokenizer', 'StringValueHelper',
-            'StringWriter', 'Stroke', 'Struct', 'StructMember',
-            'StructMemberHelper', 'Stub', 'StubDelegate',
-            'StubNotFoundException', 'Style', 'StyleConstants',
-            'StyleConstants.CharacterConstants',
-            'StyleConstants.ColorConstants',
-            'StyleConstants.FontConstants',
-            'StyleConstants.ParagraphConstants', 'StyleContext',
-            'StyledDocument', 'StyledEditorKit',
-            'StyledEditorKit.AlignmentAction',
-            'StyledEditorKit.BoldAction',
-            'StyledEditorKit.FontFamilyAction',
-            'StyledEditorKit.FontSizeAction',
-            'StyledEditorKit.ForegroundAction',
-            'StyledEditorKit.ItalicAction',
-            'StyledEditorKit.StyledTextAction',
-            'StyledEditorKit.UnderlineAction', 'StyleSheet',
-            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
-            'SwingConstants', 'SwingPropertyChangeSupport',
-            'SwingUtilities', 'SyncFailedException',
-            'Synthesizer', 'SysexMessage', 'System',
-            'SystemColor', 'SystemException', 'SystemFlavorMap',
-            'TabableView', 'TabbedPaneUI', 'TabExpander',
-            'TableCellEditor', 'TableCellRenderer',
-            'TableColumn', 'TableColumnModel',
-            'TableColumnModelEvent', 'TableColumnModelListener',
-            'TableHeaderUI', 'TableModel', 'TableModelEvent',
-            'TableModelListener', 'TableUI', 'TableView',
-            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
-            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
-            'TextComponent', 'TextEvent', 'TextField',
-            'TextHitInfo', 'TextLayout',
-            'TextLayout.CaretPolicy', 'TextListener',
-            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
-            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
-            'Throwable', 'Tie', 'TileObserver', 'Time',
-            'TimeLimitExceededException', 'Timer',
-            'TimerTask', 'Timestamp', 'TimeZone', 'TitledBorder',
-            'ToolBarUI', 'Toolkit', 'ToolTipManager',
-            'ToolTipUI', 'TooManyListenersException', 'Track',
-            'TransactionRequiredException',
-            'TransactionRolledbackException',
-            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
-            'Transferable', 'TransformAttribute', 'TRANSIENT',
-            'Transmitter', 'Transparency', 'TreeCellEditor',
-            'TreeCellRenderer', 'TreeExpansionEvent',
-            'TreeExpansionListener', 'TreeMap', 'TreeModel',
-            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
-            'TreePath', 'TreeSelectionEvent',
-            'TreeSelectionListener', 'TreeSelectionModel',
-            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
-            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
-            'Types', 'UID', 'UIDefaults',
-            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
-            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
-            'UIManager', 'UIManager.LookAndFeelInfo',
-            'UIResource', 'ULongLongSeqHelper',
-            'ULongLongSeqHolder', 'ULongSeqHelper',
-            'ULongSeqHolder', 'UndeclaredThrowableException',
-            'UndoableEdit', 'UndoableEditEvent',
-            'UndoableEditListener', 'UndoableEditSupport',
-            'UndoManager', 'UnexpectedException',
-            'UnicastRemoteObject', 'UnionMember',
-            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
-            'UnknownException', 'UnknownGroupException',
-            'UnknownHostException',
-            'UnknownObjectException', 'UnknownServiceException',
-            'UnknownUserException', 'UnmarshalException',
-            'UnrecoverableKeyException', 'Unreferenced',
-            'UnresolvedPermission', 'UnsatisfiedLinkError',
-            'UnsolicitedNotification',
-            'UnsolicitedNotificationEvent',
-            'UnsolicitedNotificationListener',
-            'UnsupportedAudioFileException',
-            'UnsupportedClassVersionError',
-            'UnsupportedEncodingException',
-            'UnsupportedFlavorException',
-            'UnsupportedLookAndFeelException',
-            'UnsupportedOperationException',
-            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
-            'URL', 'URLClassLoader', 'URLConnection',
-            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
-            'URLStreamHandlerFactory', 'UserException',
-            'UShortSeqHelper', 'UShortSeqHolder',
-            'UTFDataFormatException', 'Util', 'UtilDelegate',
-            'Utilities', 'ValueBase', 'ValueBaseHelper',
-            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
-            'ValueMember', 'ValueMemberHelper',
-            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
-            'VersionSpecHelper', 'VetoableChangeListener',
-            'VetoableChangeSupport', 'View', 'ViewFactory',
-            'ViewportLayout', 'ViewportUI',
-            'VirtualMachineError', 'Visibility',
-            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
-            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
-            'VoiceStatus', 'Void', 'WCharSeqHelper',
-            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
-            'Window', 'WindowAdapter', 'WindowConstants',
-            'WindowEvent', 'WindowListener', 'WrappedPlainView',
-            'WritableRaster', 'WritableRenderedImage',
-            'WriteAbortedException', 'Writer',
-            'WrongTransaction', 'WStringValueHelper',
-            'X509Certificate', 'X509CRL', 'X509CRLEntry',
-            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
-            'ZipException', 'ZipFile', 'ZipInputStream',
-            'ZipOutputStream', 'ZoneView',
-            '_BindingIteratorImplBase', '_BindingIteratorStub',
-            '_IDLTypeStub', '_NamingContextImplBase',
-            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
-            ),
-        4 => array(
-            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '+', '-', '*', '/', '%',
-        '!', '&', '|', '^',
-        '<', '>', '=',
-        '?', ':', ';',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000066; font-weight: bold;',
-            3 => 'color: #003399;',
-            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #006699;',
-            3 => 'color: #008000; font-style: italic; font-weight: bold;',
-            3 => 'color: #008000; font-style: italic; font-weight: bold;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006633;',
-            2 => 'color: #006633;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.google.com/search?hl=en&amp;q=allinurl%3Adocs.oracle.com+javase+docs+api+{FNAMEL}',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/java5.php b/inc/geshi/java5.php
deleted file mode 100644
index af16bd1e6..000000000
--- a/inc/geshi/java5.php
+++ /dev/null
@@ -1,1037 +0,0 @@
-<?php
-/*************************************************************************************
- * java.php
- * --------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/10
- *
- * Java language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/25 (1.0.7.22)
- *   -  Added highlighting of import and package directives as non-OOP
- * 2005/12/28 (1.0.4)
- *   -  Added instanceof keyword
- * 2004/11/27 (1.0.3)
- *   -  Added support for multiple object splitters
- * 2004/08/05 (1.0.2)
- *   -  Added URL support
- *   -  Added keyword "this", as bugs in GeSHi class ironed out
- * 2004/08/05 (1.0.1)
- *   -  Added support for symbols
- *   -  Added extra missed keywords
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO
- * -------------------------
- * *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Java(TM) 2 Platform Standard Edition 5.0',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Import and Package directives (Basic Support only)
-        2 => '/(?:(?<=import[\\n\\s](?!static))|(?<=import[\\n\\s]static[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
-        // javadoc comments
-        3 => '#/\*\*(?![\*\/]).*\*/#sU'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            /* see the authoritative list of all 50 Java keywords at */
-            /* http://java.sun.com/docs/books/jls/third_edition/html/lexical.html#229308 */
-
-            /* java keywords, part 1: control flow */
-            'case', 'default', 'do', 'else', 'for',
-            'goto', 'if', 'switch', 'while'
-
-            /* IMO 'break', 'continue', 'return' and 'throw' */
-                        /* should also be added to this group, as they   */
-            /* also manage the control flow,                 */
-            /* arguably 'try'/'catch'/'finally' as well      */
-            ),
-        2 => array(
-            /* java keywords, part 2 */
-
-            'break', 'continue', 'return', 'throw',
-            'try', 'catch', 'finally',
-
-            'abstract', 'assert', 'class', 'const', 'enum', 'extends',
-            'final', 'implements', 'import', 'instanceof', 'interface',
-            'native', 'new', 'package', 'private', 'protected',
-            'public', 'static', 'strictfp', 'super', 'synchronized',
-            'this', 'throws', 'transient', 'volatile'
-            ),
-        3 => array(
-            /* Java keywords, part 3: primitive data types and 'void' */
-            'boolean', 'byte', 'char', 'double',
-            'float', 'int', 'long', 'short', 'void'
-            ),
-        4 => array(
-            /* other reserved words in Java: literals */
-            /* should be styled to look similar to numbers and Strings */
-            'false', 'null', 'true'
-            ),
-        5 => array (
-            'Applet', 'AppletContext', 'AppletStub', 'AudioClip'
-            ),
-        6 => array (
-            'AWTError', 'AWTEvent', 'AWTEventMulticaster', 'AWTException', 'AWTKeyStroke', 'AWTPermission', 'ActiveEvent', 'Adjustable', 'AlphaComposite', 'BasicStroke', 'BorderLayout', 'BufferCapabilities', 'BufferCapabilities.FlipContents', 'Button', 'Canvas', 'CardLayout', 'Checkbox', 'CheckboxGroup', 'CheckboxMenuItem', 'Choice', 'Color', 'Component', 'ComponentOrientation', 'Composite', 'CompositeContext', 'Container', 'ContainerOrderFocusTraversalPolicy', 'Cursor', 'DefaultFocusTraversalPolicy', 'DefaultKeyboardFocusManager', 'Dialog', 'Dimension', 'DisplayMode', 'EventQueue', 'FileDialog', 'FlowLayout', 'FocusTraversalPolicy', 'Font', 'FontFormatException', 'FontMetrics', 'Frame', 'GradientPaint', 'Graphics', 'Graphics2D', 'GraphicsConfigTemplate', 'GraphicsConfiguration', 'GraphicsDevice', 'GraphicsEnvironment', 'GridBagConstraints', 'GridBagLayout', 'GridLayout', 'HeadlessException', 'IllegalComponentStateException', 'Image', 'ImageCapabilities', 'Insets', 'ItemSelectable', 'JobAttributes',
-            'JobAttributes.DefaultSelectionType', 'JobAttributes.DestinationType', 'JobAttributes.DialogType', 'JobAttributes.MultipleDocumentHandlingType', 'JobAttributes.SidesType', 'KeyEventDispatcher', 'KeyEventPostProcessor', 'KeyboardFocusManager', 'Label', 'LayoutManager', 'LayoutManager2', 'MediaTracker', 'Menu', 'MenuBar', 'MenuComponent', 'MenuContainer', 'MenuItem', 'MenuShortcut', 'MouseInfo', 'PageAttributes', 'PageAttributes.ColorType', 'PageAttributes.MediaType', 'PageAttributes.OrientationRequestedType', 'PageAttributes.OriginType', 'PageAttributes.PrintQualityType', 'Paint', 'PaintContext', 'Panel', 'Point', 'PointerInfo', 'Polygon', 'PopupMenu', 'PrintGraphics', 'PrintJob', 'Rectangle', 'RenderingHints', 'RenderingHints.Key', 'Robot', 'ScrollPane', 'ScrollPaneAdjustable', 'Scrollbar', 'Shape', 'Stroke', 'SystemColor', 'TextArea', 'TextComponent', 'TextField', 'TexturePaint', 'Toolkit', 'Transparency', 'Window'
-            ),
-        7 => array (
-            'CMMException', 'ColorSpace', 'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray', 'ICC_ProfileRGB', 'ProfileDataException'
-            ),
-        8 => array (
-            'Clipboard', 'ClipboardOwner', 'DataFlavor', 'FlavorEvent', 'FlavorListener', 'FlavorMap', 'FlavorTable', 'MimeTypeParseException', 'StringSelection', 'SystemFlavorMap', 'Transferable', 'UnsupportedFlavorException'
-            ),
-        9 => array (
-            'Autoscroll', 'DnDConstants', 'DragGestureEvent', 'DragGestureListener', 'DragGestureRecognizer', 'DragSource', 'DragSourceAdapter', 'DragSourceContext', 'DragSourceDragEvent', 'DragSourceDropEvent', 'DragSourceEvent', 'DragSourceListener', 'DragSourceMotionListener', 'DropTarget', 'DropTarget.DropTargetAutoScroller', 'DropTargetAdapter', 'DropTargetContext', 'DropTargetDragEvent', 'DropTargetDropEvent', 'DropTargetEvent', 'DropTargetListener', 'InvalidDnDOperationException', 'MouseDragGestureRecognizer'
-            ),
-        10 => array (
-            'AWTEventListener', 'AWTEventListenerProxy', 'ActionEvent', 'ActionListener', 'AdjustmentEvent', 'AdjustmentListener', 'ComponentAdapter', 'ComponentEvent', 'ComponentListener', 'ContainerAdapter', 'ContainerEvent', 'ContainerListener', 'FocusAdapter', 'FocusEvent', 'FocusListener', 'HierarchyBoundsAdapter', 'HierarchyBoundsListener', 'HierarchyEvent', 'HierarchyListener', 'InputEvent', 'InputMethodEvent', 'InputMethodListener', 'InvocationEvent', 'ItemEvent', 'ItemListener', 'KeyAdapter', 'KeyEvent', 'KeyListener', 'MouseAdapter', 'MouseListener', 'MouseMotionAdapter', 'MouseMotionListener', 'MouseWheelEvent', 'MouseWheelListener', 'PaintEvent', 'TextEvent', 'TextListener', 'WindowAdapter', 'WindowEvent', 'WindowFocusListener', 'WindowListener', 'WindowStateListener'
-            ),
-        11 => array (
-            'FontRenderContext', 'GlyphJustificationInfo', 'GlyphMetrics', 'GlyphVector', 'GraphicAttribute', 'ImageGraphicAttribute', 'LineBreakMeasurer', 'LineMetrics', 'MultipleMaster', 'NumericShaper', 'ShapeGraphicAttribute', 'TextAttribute', 'TextHitInfo', 'TextLayout', 'TextLayout.CaretPolicy', 'TextMeasurer', 'TransformAttribute'
-            ),
-        12 => array (
-            'AffineTransform', 'Arc2D', 'Arc2D.Double', 'Arc2D.Float', 'Area', 'CubicCurve2D', 'CubicCurve2D.Double', 'CubicCurve2D.Float', 'Dimension2D', 'Ellipse2D', 'Ellipse2D.Double', 'Ellipse2D.Float', 'FlatteningPathIterator', 'GeneralPath', 'IllegalPathStateException', 'Line2D', 'Line2D.Double', 'Line2D.Float', 'NoninvertibleTransformException', 'PathIterator', 'Point2D', 'Point2D.Double', 'Point2D.Float', 'QuadCurve2D', 'QuadCurve2D.Double', 'QuadCurve2D.Float', 'Rectangle2D', 'Rectangle2D.Double', 'Rectangle2D.Float', 'RectangularShape', 'RoundRectangle2D', 'RoundRectangle2D.Double', 'RoundRectangle2D.Float'
-            ),
-        13 => array (
-            'InputContext', 'InputMethodHighlight', 'InputMethodRequests', 'InputSubset'
-            ),
-        14 => array (
-            'InputMethod', 'InputMethodContext', 'InputMethodDescriptor'
-            ),
-        15 => array (
-            'AffineTransformOp', 'AreaAveragingScaleFilter', 'BandCombineOp', 'BandedSampleModel', 'BufferStrategy', 'BufferedImage', 'BufferedImageFilter', 'BufferedImageOp', 'ByteLookupTable', 'ColorConvertOp', 'ColorModel', 'ComponentColorModel', 'ComponentSampleModel', 'ConvolveOp', 'CropImageFilter', 'DataBuffer', 'DataBufferByte', 'DataBufferDouble', 'DataBufferFloat', 'DataBufferInt', 'DataBufferShort', 'DataBufferUShort', 'DirectColorModel', 'FilteredImageSource', 'ImageConsumer', 'ImageFilter', 'ImageObserver', 'ImageProducer', 'ImagingOpException', 'IndexColorModel', 'Kernel', 'LookupOp', 'LookupTable', 'MemoryImageSource', 'MultiPixelPackedSampleModel', 'PackedColorModel', 'PixelGrabber', 'PixelInterleavedSampleModel', 'RGBImageFilter', 'Raster', 'RasterFormatException', 'RasterOp', 'RenderedImage', 'ReplicateScaleFilter', 'RescaleOp', 'SampleModel', 'ShortLookupTable', 'SinglePixelPackedSampleModel', 'TileObserver', 'VolatileImage', 'WritableRaster', 'WritableRenderedImage'
-            ),
-        16 => array (
-            'ContextualRenderedImageFactory', 'ParameterBlock', 'RenderContext', 'RenderableImage', 'RenderableImageOp', 'RenderableImageProducer', 'RenderedImageFactory'
-            ),
-        17 => array (
-            'Book', 'PageFormat', 'Pageable', 'Paper', 'Printable', 'PrinterAbortException', 'PrinterException', 'PrinterGraphics', 'PrinterIOException', 'PrinterJob'
-            ),
-        18 => array (
-            'AppletInitializer', 'BeanDescriptor', 'BeanInfo', 'Beans', 'Customizer', 'DefaultPersistenceDelegate', 'DesignMode', 'Encoder', 'EventHandler', 'EventSetDescriptor', 'ExceptionListener', 'Expression', 'FeatureDescriptor', 'IndexedPropertyChangeEvent', 'IndexedPropertyDescriptor', 'Introspector', 'MethodDescriptor', 'ParameterDescriptor', 'PersistenceDelegate', 'PropertyChangeEvent', 'PropertyChangeListener', 'PropertyChangeListenerProxy', 'PropertyChangeSupport', 'PropertyDescriptor', 'PropertyEditor', 'PropertyEditorManager', 'PropertyEditorSupport', 'PropertyVetoException', 'SimpleBeanInfo', 'VetoableChangeListener', 'VetoableChangeListenerProxy', 'VetoableChangeSupport', 'Visibility', 'XMLDecoder', 'XMLEncoder'
-            ),
-        19 => array (
-            'BeanContext', 'BeanContextChild', 'BeanContextChildComponentProxy', 'BeanContextChildSupport', 'BeanContextContainerProxy', 'BeanContextEvent', 'BeanContextMembershipEvent', 'BeanContextMembershipListener', 'BeanContextProxy', 'BeanContextServiceAvailableEvent', 'BeanContextServiceProvider', 'BeanContextServiceProviderBeanInfo', 'BeanContextServiceRevokedEvent', 'BeanContextServiceRevokedListener', 'BeanContextServices', 'BeanContextServicesListener', 'BeanContextServicesSupport', 'BeanContextServicesSupport.BCSSServiceProvider', 'BeanContextSupport', 'BeanContextSupport.BCSIterator'
-            ),
-        20 => array (
-            'BufferedInputStream', 'BufferedOutputStream', 'BufferedReader', 'BufferedWriter', 'ByteArrayInputStream', 'ByteArrayOutputStream', 'CharArrayReader', 'CharArrayWriter', 'CharConversionException', 'Closeable', 'DataInput', 'DataOutput', 'EOFException', 'Externalizable', 'File', 'FileDescriptor', 'FileInputStream', 'FileNotFoundException', 'FileOutputStream', 'FilePermission', 'FileReader', 'FileWriter', 'FilenameFilter', 'FilterInputStream', 'FilterOutputStream', 'FilterReader', 'FilterWriter', 'Flushable', 'IOException', 'InputStreamReader', 'InterruptedIOException', 'InvalidClassException', 'InvalidObjectException', 'LineNumberInputStream', 'LineNumberReader', 'NotActiveException', 'NotSerializableException', 'ObjectInput', 'ObjectInputStream', 'ObjectInputStream.GetField', 'ObjectInputValidation', 'ObjectOutput', 'ObjectOutputStream', 'ObjectOutputStream.PutField', 'ObjectStreamClass', 'ObjectStreamConstants', 'ObjectStreamException', 'ObjectStreamField', 'OptionalDataException', 'OutputStreamWriter',
-            'PipedInputStream', 'PipedOutputStream', 'PipedReader', 'PipedWriter', 'PrintStream', 'PrintWriter', 'PushbackInputStream', 'PushbackReader', 'RandomAccessFile', 'Reader', 'SequenceInputStream', 'Serializable', 'SerializablePermission', 'StreamCorruptedException', 'StreamTokenizer', 'StringBufferInputStream', 'StringReader', 'StringWriter', 'SyncFailedException', 'UTFDataFormatException', 'UnsupportedEncodingException', 'WriteAbortedException', 'Writer'
-            ),
-        21 => array (
-            'AbstractMethodError', 'Appendable', 'ArithmeticException', 'ArrayIndexOutOfBoundsException', 'ArrayStoreException', 'AssertionError', 'Boolean', 'Byte', 'CharSequence', 'Character', 'Character.Subset', 'Character.UnicodeBlock', 'Class', 'ClassCastException', 'ClassCircularityError', 'ClassFormatError', 'ClassLoader', 'ClassNotFoundException', 'CloneNotSupportedException', 'Cloneable', 'Comparable', 'Compiler', 'Deprecated', 'Double', 'Enum', 'EnumConstantNotPresentException', 'Error', 'Exception', 'ExceptionInInitializerError', 'Float', 'IllegalAccessError', 'IllegalAccessException', 'IllegalArgumentException', 'IllegalMonitorStateException', 'IllegalStateException', 'IllegalThreadStateException', 'IncompatibleClassChangeError', 'IndexOutOfBoundsException', 'InheritableThreadLocal', 'InstantiationError', 'InstantiationException', 'Integer', 'InternalError', 'InterruptedException', 'Iterable', 'LinkageError', 'Long', 'Math', 'NegativeArraySizeException', 'NoClassDefFoundError', 'NoSuchFieldError',
-            'NoSuchFieldException', 'NoSuchMethodError', 'NoSuchMethodException', 'NullPointerException', 'Number', 'NumberFormatException', 'OutOfMemoryError', 'Override', 'Package', 'Process', 'ProcessBuilder', 'Readable', 'Runnable', 'Runtime', 'RuntimeException', 'RuntimePermission', 'SecurityException', 'SecurityManager', 'Short', 'StackOverflowError', 'StackTraceElement', 'StrictMath', 'String', 'StringBuffer', 'StringBuilder', 'StringIndexOutOfBoundsException', 'SuppressWarnings', 'System', 'Thread', 'Thread.State', 'Thread.UncaughtExceptionHandler', 'ThreadDeath', 'ThreadGroup', 'ThreadLocal', 'Throwable', 'TypeNotPresentException', 'UnknownError', 'UnsatisfiedLinkError', 'UnsupportedClassVersionError', 'UnsupportedOperationException', 'VerifyError', 'VirtualMachineError', 'Void'
-            ),
-        22 => array (
-            'AnnotationFormatError', 'AnnotationTypeMismatchException', 'Documented', 'ElementType', 'IncompleteAnnotationException', 'Inherited', 'Retention', 'RetentionPolicy', 'Target'
-            ),
-        23 => array (
-            'ClassDefinition', 'ClassFileTransformer', 'IllegalClassFormatException', 'Instrumentation', 'UnmodifiableClassException'
-            ),
-        24 => array (
-            'ClassLoadingMXBean', 'CompilationMXBean', 'GarbageCollectorMXBean', 'ManagementFactory', 'ManagementPermission', 'MemoryMXBean', 'MemoryManagerMXBean', 'MemoryNotificationInfo', 'MemoryPoolMXBean', 'MemoryType', 'MemoryUsage', 'OperatingSystemMXBean', 'RuntimeMXBean', 'ThreadInfo', 'ThreadMXBean'
-            ),
-        25 => array (
-            'PhantomReference', 'ReferenceQueue', 'SoftReference', 'WeakReference'
-            ),
-        26 => array (
-            'AccessibleObject', 'AnnotatedElement', 'Constructor', 'Field', 'GenericArrayType', 'GenericDeclaration', 'GenericSignatureFormatError', 'InvocationHandler', 'InvocationTargetException', 'MalformedParameterizedTypeException', 'Member', 'Method', 'Modifier', 'ParameterizedType', 'ReflectPermission', 'Type', 'TypeVariable', 'UndeclaredThrowableException', 'WildcardType'
-            ),
-        27 => array (
-            'BigDecimal', 'BigInteger', 'MathContext', 'RoundingMode'
-            ),
-        28 => array (
-            'Authenticator', 'Authenticator.RequestorType', 'BindException', 'CacheRequest', 'CacheResponse', 'ContentHandlerFactory', 'CookieHandler', 'DatagramPacket', 'DatagramSocket', 'DatagramSocketImpl', 'DatagramSocketImplFactory', 'FileNameMap', 'HttpRetryException', 'HttpURLConnection', 'Inet4Address', 'Inet6Address', 'InetAddress', 'InetSocketAddress', 'JarURLConnection', 'MalformedURLException', 'MulticastSocket', 'NetPermission', 'NetworkInterface', 'NoRouteToHostException', 'PasswordAuthentication', 'PortUnreachableException', 'ProtocolException', 'Proxy.Type', 'ProxySelector', 'ResponseCache', 'SecureCacheResponse', 'ServerSocket', 'Socket', 'SocketAddress', 'SocketException', 'SocketImpl', 'SocketImplFactory', 'SocketOptions', 'SocketPermission', 'SocketTimeoutException', 'URI', 'URISyntaxException', 'URL', 'URLClassLoader', 'URLConnection', 'URLDecoder', 'URLEncoder', 'URLStreamHandler', 'URLStreamHandlerFactory', 'UnknownServiceException'
-            ),
-        29 => array (
-            'Buffer', 'BufferOverflowException', 'BufferUnderflowException', 'ByteBuffer', 'ByteOrder', 'CharBuffer', 'DoubleBuffer', 'FloatBuffer', 'IntBuffer', 'InvalidMarkException', 'LongBuffer', 'MappedByteBuffer', 'ReadOnlyBufferException', 'ShortBuffer'
-            ),
-        30 => array (
-            'AlreadyConnectedException', 'AsynchronousCloseException', 'ByteChannel', 'CancelledKeyException', 'Channel', 'Channels', 'ClosedByInterruptException', 'ClosedChannelException', 'ClosedSelectorException', 'ConnectionPendingException', 'DatagramChannel', 'FileChannel', 'FileChannel.MapMode', 'FileLock', 'FileLockInterruptionException', 'GatheringByteChannel', 'IllegalBlockingModeException', 'IllegalSelectorException', 'InterruptibleChannel', 'NoConnectionPendingException', 'NonReadableChannelException', 'NonWritableChannelException', 'NotYetBoundException', 'NotYetConnectedException', 'OverlappingFileLockException', 'Pipe', 'Pipe.SinkChannel', 'Pipe.SourceChannel', 'ReadableByteChannel', 'ScatteringByteChannel', 'SelectableChannel', 'SelectionKey', 'Selector', 'ServerSocketChannel', 'SocketChannel', 'UnresolvedAddressException', 'UnsupportedAddressTypeException', 'WritableByteChannel'
-            ),
-        31 => array (
-            'AbstractInterruptibleChannel', 'AbstractSelectableChannel', 'AbstractSelectionKey', 'AbstractSelector', 'SelectorProvider'
-            ),
-        32 => array (
-            'CharacterCodingException', 'Charset', 'CharsetDecoder', 'CharsetEncoder', 'CoderMalfunctionError', 'CoderResult', 'CodingErrorAction', 'IllegalCharsetNameException', 'MalformedInputException', 'UnmappableCharacterException', 'UnsupportedCharsetException'
-            ),
-        33 => array (
-            'CharsetProvider'
-            ),
-        34 => array (
-            'AccessException', 'AlreadyBoundException', 'ConnectIOException', 'MarshalException', 'MarshalledObject', 'Naming', 'NoSuchObjectException', 'NotBoundException', 'RMISecurityException', 'RMISecurityManager', 'Remote', 'RemoteException', 'ServerError', 'ServerException', 'ServerRuntimeException', 'StubNotFoundException', 'UnexpectedException', 'UnmarshalException'
-            ),
-        35 => array (
-            'Activatable', 'ActivateFailedException', 'ActivationDesc', 'ActivationException', 'ActivationGroup', 'ActivationGroupDesc', 'ActivationGroupDesc.CommandEnvironment', 'ActivationGroupID', 'ActivationGroup_Stub', 'ActivationID', 'ActivationInstantiator', 'ActivationMonitor', 'ActivationSystem', 'Activator', 'UnknownGroupException', 'UnknownObjectException'
-            ),
-        36 => array (
-            'DGC', 'Lease', 'VMID'
-            ),
-        37 => array (
-            'LocateRegistry', 'Registry', 'RegistryHandler'
-            ),
-        38 => array (
-            'ExportException', 'LoaderHandler', 'LogStream', 'ObjID', 'Operation', 'RMIClassLoader', 'RMIClassLoaderSpi', 'RMIClientSocketFactory', 'RMIFailureHandler', 'RMIServerSocketFactory', 'RMISocketFactory', 'RemoteCall', 'RemoteObject', 'RemoteObjectInvocationHandler', 'RemoteRef', 'RemoteServer', 'RemoteStub', 'ServerCloneException', 'ServerNotActiveException', 'ServerRef', 'Skeleton', 'SkeletonMismatchException', 'SkeletonNotFoundException', 'SocketSecurityException', 'UID', 'UnicastRemoteObject', 'Unreferenced'
-            ),
-        39 => array (
-            'AccessControlContext', 'AccessControlException', 'AccessController', 'AlgorithmParameterGenerator', 'AlgorithmParameterGeneratorSpi', 'AlgorithmParameters', 'AlgorithmParametersSpi', 'AllPermission', 'AuthProvider', 'BasicPermission', 'CodeSigner', 'CodeSource', 'DigestException', 'DigestInputStream', 'DigestOutputStream', 'DomainCombiner', 'GeneralSecurityException', 'Guard', 'GuardedObject', 'Identity', 'IdentityScope', 'InvalidAlgorithmParameterException', 'InvalidParameterException', 'Key', 'KeyException', 'KeyFactory', 'KeyFactorySpi', 'KeyManagementException', 'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi', 'KeyRep', 'KeyRep.Type', 'KeyStore', 'KeyStore.Builder', 'KeyStore.CallbackHandlerProtection', 'KeyStore.Entry', 'KeyStore.LoadStoreParameter', 'KeyStore.PasswordProtection', 'KeyStore.PrivateKeyEntry', 'KeyStore.ProtectionParameter', 'KeyStore.SecretKeyEntry', 'KeyStore.TrustedCertificateEntry', 'KeyStoreException', 'KeyStoreSpi', 'MessageDigest', 'MessageDigestSpi',
-            'NoSuchAlgorithmException', 'NoSuchProviderException', 'PermissionCollection', 'Permissions', 'PrivateKey', 'PrivilegedAction', 'PrivilegedActionException', 'PrivilegedExceptionAction', 'ProtectionDomain', 'Provider', 'Provider.Service', 'ProviderException', 'PublicKey', 'SecureClassLoader', 'SecureRandom', 'SecureRandomSpi', 'Security', 'SecurityPermission', 'Signature', 'SignatureException', 'SignatureSpi', 'SignedObject', 'Signer', 'UnrecoverableEntryException', 'UnrecoverableKeyException', 'UnresolvedPermission'
-            ),
-        40 => array (
-            'Acl', 'AclEntry', 'AclNotFoundException', 'Group', 'LastOwnerException', 'NotOwnerException', 'Owner'
-            ),
-        41 => array (
-            'CRL', 'CRLException', 'CRLSelector', 'CertPath', 'CertPath.CertPathRep', 'CertPathBuilder', 'CertPathBuilderException', 'CertPathBuilderResult', 'CertPathBuilderSpi', 'CertPathParameters', 'CertPathValidator', 'CertPathValidatorException', 'CertPathValidatorResult', 'CertPathValidatorSpi', 'CertSelector', 'CertStore', 'CertStoreException', 'CertStoreParameters', 'CertStoreSpi', 'Certificate.CertificateRep', 'CertificateFactory', 'CertificateFactorySpi', 'CollectionCertStoreParameters', 'LDAPCertStoreParameters', 'PKIXBuilderParameters', 'PKIXCertPathBuilderResult', 'PKIXCertPathChecker', 'PKIXCertPathValidatorResult', 'PKIXParameters', 'PolicyNode', 'PolicyQualifierInfo', 'TrustAnchor', 'X509CRL', 'X509CRLEntry', 'X509CRLSelector', 'X509CertSelector', 'X509Extension'
-            ),
-        42 => array (
-            'DSAKey', 'DSAKeyPairGenerator', 'DSAParams', 'DSAPrivateKey', 'DSAPublicKey', 'ECKey', 'ECPrivateKey', 'ECPublicKey', 'RSAKey', 'RSAMultiPrimePrivateCrtKey', 'RSAPrivateCrtKey', 'RSAPrivateKey', 'RSAPublicKey'
-            ),
-        43 => array (
-            'AlgorithmParameterSpec', 'DSAParameterSpec', 'DSAPrivateKeySpec', 'DSAPublicKeySpec', 'ECField', 'ECFieldF2m', 'ECFieldFp', 'ECGenParameterSpec', 'ECParameterSpec', 'ECPoint', 'ECPrivateKeySpec', 'ECPublicKeySpec', 'EllipticCurve', 'EncodedKeySpec', 'InvalidKeySpecException', 'InvalidParameterSpecException', 'KeySpec', 'MGF1ParameterSpec', 'PKCS8EncodedKeySpec', 'PSSParameterSpec', 'RSAKeyGenParameterSpec', 'RSAMultiPrimePrivateCrtKeySpec', 'RSAOtherPrimeInfo', 'RSAPrivateCrtKeySpec', 'RSAPrivateKeySpec', 'RSAPublicKeySpec', 'X509EncodedKeySpec'
-            ),
-        44 => array (
-            'BatchUpdateException', 'Blob', 'CallableStatement', 'Clob', 'Connection', 'DataTruncation', 'DatabaseMetaData', 'Driver', 'DriverManager', 'DriverPropertyInfo', 'ParameterMetaData', 'PreparedStatement', 'Ref', 'ResultSet', 'ResultSetMetaData', 'SQLData', 'SQLException', 'SQLInput', 'SQLOutput', 'SQLPermission', 'SQLWarning', 'Savepoint', 'Struct', 'Time', 'Types'
-            ),
-        45 => array (
-            'AttributedCharacterIterator', 'AttributedCharacterIterator.Attribute', 'AttributedString', 'Bidi', 'BreakIterator', 'CharacterIterator', 'ChoiceFormat', 'CollationElementIterator', 'CollationKey', 'Collator', 'DateFormat', 'DateFormat.Field', 'DateFormatSymbols', 'DecimalFormat', 'DecimalFormatSymbols', 'FieldPosition', 'Format', 'Format.Field', 'MessageFormat', 'MessageFormat.Field', 'NumberFormat', 'NumberFormat.Field', 'ParseException', 'ParsePosition', 'RuleBasedCollator', 'SimpleDateFormat', 'StringCharacterIterator'
-            ),
-        46 => array (
-            'AbstractCollection', 'AbstractList', 'AbstractMap', 'AbstractQueue', 'AbstractSequentialList', 'AbstractSet', 'ArrayList', 'Arrays', 'BitSet', 'Calendar', 'Collection', 'Collections', 'Comparator', 'ConcurrentModificationException', 'Currency', 'Dictionary', 'DuplicateFormatFlagsException', 'EmptyStackException', 'EnumMap', 'EnumSet', 'Enumeration', 'EventListenerProxy', 'EventObject', 'FormatFlagsConversionMismatchException', 'Formattable', 'FormattableFlags', 'Formatter.BigDecimalLayoutForm', 'FormatterClosedException', 'GregorianCalendar', 'HashMap', 'HashSet', 'Hashtable', 'IdentityHashMap', 'IllegalFormatCodePointException', 'IllegalFormatConversionException', 'IllegalFormatException', 'IllegalFormatFlagsException', 'IllegalFormatPrecisionException', 'IllegalFormatWidthException', 'InputMismatchException', 'InvalidPropertiesFormatException', 'Iterator', 'LinkedHashMap', 'LinkedHashSet', 'LinkedList', 'ListIterator', 'ListResourceBundle', 'Locale', 'Map', 'Map.Entry', 'MissingFormatArgumentException',
-            'MissingFormatWidthException', 'MissingResourceException', 'NoSuchElementException', 'Observable', 'Observer', 'PriorityQueue', 'Properties', 'PropertyPermission', 'PropertyResourceBundle', 'Queue', 'Random', 'RandomAccess', 'ResourceBundle', 'Scanner', 'Set', 'SimpleTimeZone', 'SortedMap', 'SortedSet', 'Stack', 'StringTokenizer', 'TimeZone', 'TimerTask', 'TooManyListenersException', 'TreeMap', 'TreeSet', 'UUID', 'UnknownFormatConversionException', 'UnknownFormatFlagsException', 'Vector', 'WeakHashMap'
-            ),
-        47 => array (
-            'AbstractExecutorService', 'ArrayBlockingQueue', 'BlockingQueue', 'BrokenBarrierException', 'Callable', 'CancellationException', 'CompletionService', 'ConcurrentHashMap', 'ConcurrentLinkedQueue', 'ConcurrentMap', 'CopyOnWriteArrayList', 'CopyOnWriteArraySet', 'CountDownLatch', 'CyclicBarrier', 'DelayQueue', 'Delayed', 'Exchanger', 'ExecutionException', 'Executor', 'ExecutorCompletionService', 'ExecutorService', 'Executors', 'Future', 'FutureTask', 'LinkedBlockingQueue', 'PriorityBlockingQueue', 'RejectedExecutionException', 'RejectedExecutionHandler', 'ScheduledExecutorService', 'ScheduledFuture', 'ScheduledThreadPoolExecutor', 'Semaphore', 'SynchronousQueue', 'ThreadFactory', 'ThreadPoolExecutor', 'ThreadPoolExecutor.AbortPolicy', 'ThreadPoolExecutor.CallerRunsPolicy', 'ThreadPoolExecutor.DiscardOldestPolicy', 'ThreadPoolExecutor.DiscardPolicy', 'TimeUnit', 'TimeoutException'
-            ),
-        48 => array (
-            'AtomicBoolean', 'AtomicInteger', 'AtomicIntegerArray', 'AtomicIntegerFieldUpdater', 'AtomicLong', 'AtomicLongArray', 'AtomicLongFieldUpdater', 'AtomicMarkableReference', 'AtomicReference', 'AtomicReferenceArray', 'AtomicReferenceFieldUpdater', 'AtomicStampedReference'
-            ),
-        49 => array (
-            'AbstractQueuedSynchronizer', 'Condition', 'Lock', 'LockSupport', 'ReadWriteLock', 'ReentrantLock', 'ReentrantReadWriteLock', 'ReentrantReadWriteLock.ReadLock', 'ReentrantReadWriteLock.WriteLock'
-            ),
-        50 => array (
-            'Attributes.Name', 'JarEntry', 'JarException', 'JarFile', 'JarInputStream', 'JarOutputStream', 'Manifest', 'Pack200', 'Pack200.Packer', 'Pack200.Unpacker'
-            ),
-        51 => array (
-            'ConsoleHandler', 'ErrorManager', 'FileHandler', 'Filter', 'Handler', 'Level', 'LogManager', 'LogRecord', 'Logger', 'LoggingMXBean', 'LoggingPermission', 'MemoryHandler', 'SimpleFormatter', 'SocketHandler', 'StreamHandler', 'XMLFormatter'
-            ),
-        52 => array (
-            'AbstractPreferences', 'BackingStoreException', 'InvalidPreferencesFormatException', 'NodeChangeEvent', 'NodeChangeListener', 'PreferenceChangeEvent', 'PreferenceChangeListener', 'Preferences', 'PreferencesFactory'
-            ),
-        53 => array (
-            'MatchResult', 'Matcher', 'Pattern', 'PatternSyntaxException'
-            ),
-        54 => array (
-            'Adler32', 'CRC32', 'CheckedInputStream', 'CheckedOutputStream', 'Checksum', 'DataFormatException', 'Deflater', 'DeflaterOutputStream', 'GZIPInputStream', 'GZIPOutputStream', 'Inflater', 'InflaterInputStream', 'ZipEntry', 'ZipException', 'ZipFile', 'ZipInputStream', 'ZipOutputStream'
-            ),
-        55 => array (
-            'Accessible', 'AccessibleAction', 'AccessibleAttributeSequence', 'AccessibleBundle', 'AccessibleComponent', 'AccessibleContext', 'AccessibleEditableText', 'AccessibleExtendedComponent', 'AccessibleExtendedTable', 'AccessibleExtendedText', 'AccessibleHyperlink', 'AccessibleHypertext', 'AccessibleIcon', 'AccessibleKeyBinding', 'AccessibleRelation', 'AccessibleRelationSet', 'AccessibleResourceBundle', 'AccessibleRole', 'AccessibleSelection', 'AccessibleState', 'AccessibleStateSet', 'AccessibleStreamable', 'AccessibleTable', 'AccessibleTableModelChange', 'AccessibleText', 'AccessibleTextSequence', 'AccessibleValue'
-            ),
-        56 => array (
-            'ActivityCompletedException', 'ActivityRequiredException', 'InvalidActivityException'
-            ),
-        57 => array (
-            'BadPaddingException', 'Cipher', 'CipherInputStream', 'CipherOutputStream', 'CipherSpi', 'EncryptedPrivateKeyInfo', 'ExemptionMechanism', 'ExemptionMechanismException', 'ExemptionMechanismSpi', 'IllegalBlockSizeException', 'KeyAgreement', 'KeyAgreementSpi', 'KeyGenerator', 'KeyGeneratorSpi', 'Mac', 'MacSpi', 'NoSuchPaddingException', 'NullCipher', 'SealedObject', 'SecretKey', 'SecretKeyFactory', 'SecretKeyFactorySpi', 'ShortBufferException'
-            ),
-        58 => array (
-            'DHKey', 'DHPrivateKey', 'DHPublicKey', 'PBEKey'
-            ),
-        59 => array (
-            'DESKeySpec', 'DESedeKeySpec', 'DHGenParameterSpec', 'DHParameterSpec', 'DHPrivateKeySpec', 'DHPublicKeySpec', 'IvParameterSpec', 'OAEPParameterSpec', 'PBEKeySpec', 'PBEParameterSpec', 'PSource', 'PSource.PSpecified', 'RC2ParameterSpec', 'RC5ParameterSpec', 'SecretKeySpec'
-            ),
-        60 => array (
-            'IIOException', 'IIOImage', 'IIOParam', 'IIOParamController', 'ImageIO', 'ImageReadParam', 'ImageReader', 'ImageTranscoder', 'ImageTypeSpecifier', 'ImageWriteParam', 'ImageWriter'
-            ),
-        61 => array (
-            'IIOReadProgressListener', 'IIOReadUpdateListener', 'IIOReadWarningListener', 'IIOWriteProgressListener', 'IIOWriteWarningListener'
-            ),
-        62 => array (
-            'IIOInvalidTreeException', 'IIOMetadata', 'IIOMetadataController', 'IIOMetadataFormat', 'IIOMetadataFormatImpl', 'IIOMetadataNode'
-            ),
-        63 => array (
-            'BMPImageWriteParam'
-            ),
-        64 => array (
-            'JPEGHuffmanTable', 'JPEGImageReadParam', 'JPEGImageWriteParam', 'JPEGQTable'
-            ),
-        65 => array (
-            'IIORegistry', 'IIOServiceProvider', 'ImageInputStreamSpi', 'ImageOutputStreamSpi', 'ImageReaderSpi', 'ImageReaderWriterSpi', 'ImageTranscoderSpi', 'ImageWriterSpi', 'RegisterableService', 'ServiceRegistry', 'ServiceRegistry.Filter'
-            ),
-        66 => array (
-            'FileCacheImageInputStream', 'FileCacheImageOutputStream', 'FileImageInputStream', 'FileImageOutputStream', 'IIOByteBuffer', 'ImageInputStream', 'ImageInputStreamImpl', 'ImageOutputStream', 'ImageOutputStreamImpl', 'MemoryCacheImageInputStream', 'MemoryCacheImageOutputStream'
-            ),
-        67 => array (
-            'AttributeChangeNotification', 'AttributeChangeNotificationFilter', 'AttributeNotFoundException', 'AttributeValueExp', 'BadAttributeValueExpException', 'BadBinaryOpValueExpException', 'BadStringOperationException', 'Descriptor', 'DescriptorAccess', 'DynamicMBean', 'InstanceAlreadyExistsException', 'InstanceNotFoundException', 'InvalidApplicationException', 'JMException', 'JMRuntimeException', 'ListenerNotFoundException', 'MBeanAttributeInfo', 'MBeanConstructorInfo', 'MBeanException', 'MBeanFeatureInfo', 'MBeanInfo', 'MBeanNotificationInfo', 'MBeanOperationInfo', 'MBeanParameterInfo', 'MBeanPermission', 'MBeanRegistration', 'MBeanRegistrationException', 'MBeanServer', 'MBeanServerBuilder', 'MBeanServerConnection', 'MBeanServerDelegate', 'MBeanServerDelegateMBean', 'MBeanServerFactory', 'MBeanServerInvocationHandler', 'MBeanServerNotification', 'MBeanServerPermission', 'MBeanTrustPermission', 'MalformedObjectNameException', 'NotCompliantMBeanException', 'Notification', 'NotificationBroadcaster',
-            'NotificationBroadcasterSupport', 'NotificationEmitter', 'NotificationFilter', 'NotificationFilterSupport', 'NotificationListener', 'ObjectInstance', 'ObjectName', 'OperationsException', 'PersistentMBean', 'Query', 'QueryEval', 'QueryExp', 'ReflectionException', 'RuntimeErrorException', 'RuntimeMBeanException', 'RuntimeOperationsException', 'ServiceNotFoundException', 'StandardMBean', 'StringValueExp', 'ValueExp'
-            ),
-        68 => array (
-            'ClassLoaderRepository', 'MLet', 'MLetMBean', 'PrivateClassLoader', 'PrivateMLet'
-            ),
-        69 => array (
-            'DescriptorSupport', 'InvalidTargetObjectTypeException', 'ModelMBean', 'ModelMBeanAttributeInfo', 'ModelMBeanConstructorInfo', 'ModelMBeanInfo', 'ModelMBeanInfoSupport', 'ModelMBeanNotificationBroadcaster', 'ModelMBeanNotificationInfo', 'ModelMBeanOperationInfo', 'RequiredModelMBean', 'XMLParseException'
-            ),
-        70 => array (
-            'CounterMonitor', 'CounterMonitorMBean', 'GaugeMonitor', 'GaugeMonitorMBean', 'Monitor', 'MonitorMBean', 'MonitorNotification', 'MonitorSettingException', 'StringMonitor', 'StringMonitorMBean'
-            ),
-        71 => array (
-            'ArrayType', 'CompositeData', 'CompositeDataSupport', 'CompositeType', 'InvalidOpenTypeException', 'KeyAlreadyExistsException', 'OpenDataException', 'OpenMBeanAttributeInfo', 'OpenMBeanAttributeInfoSupport', 'OpenMBeanConstructorInfo', 'OpenMBeanConstructorInfoSupport', 'OpenMBeanInfo', 'OpenMBeanInfoSupport', 'OpenMBeanOperationInfo', 'OpenMBeanOperationInfoSupport', 'OpenMBeanParameterInfo', 'OpenMBeanParameterInfoSupport', 'SimpleType', 'TabularData', 'TabularDataSupport', 'TabularType'
-            ),
-        72 => array (
-            'InvalidRelationIdException', 'InvalidRelationServiceException', 'InvalidRelationTypeException', 'InvalidRoleInfoException', 'InvalidRoleValueException', 'MBeanServerNotificationFilter', 'Relation', 'RelationException', 'RelationNotFoundException', 'RelationNotification', 'RelationService', 'RelationServiceMBean', 'RelationServiceNotRegisteredException', 'RelationSupport', 'RelationSupportMBean', 'RelationType', 'RelationTypeNotFoundException', 'RelationTypeSupport', 'Role', 'RoleInfo', 'RoleInfoNotFoundException', 'RoleList', 'RoleNotFoundException', 'RoleResult', 'RoleStatus', 'RoleUnresolved', 'RoleUnresolvedList'
-            ),
-        73 => array (
-            'JMXAuthenticator', 'JMXConnectionNotification', 'JMXConnector', 'JMXConnectorFactory', 'JMXConnectorProvider', 'JMXConnectorServer', 'JMXConnectorServerFactory', 'JMXConnectorServerMBean', 'JMXConnectorServerProvider', 'JMXPrincipal', 'JMXProviderException', 'JMXServerErrorException', 'JMXServiceURL', 'MBeanServerForwarder', 'NotificationResult', 'SubjectDelegationPermission', 'TargetedNotification'
-            ),
-        74 => array (
-            'RMIConnection', 'RMIConnectionImpl', 'RMIConnectionImpl_Stub', 'RMIConnector', 'RMIConnectorServer', 'RMIIIOPServerImpl', 'RMIJRMPServerImpl', 'RMIServer', 'RMIServerImpl', 'RMIServerImpl_Stub'
-            ),
-        75 => array (
-            'TimerAlarmClockNotification', 'TimerMBean', 'TimerNotification'
-            ),
-        76 => array (
-            'AuthenticationNotSupportedException', 'BinaryRefAddr', 'CannotProceedException', 'CommunicationException', 'CompositeName', 'CompoundName', 'ConfigurationException', 'ContextNotEmptyException', 'InitialContext', 'InsufficientResourcesException', 'InterruptedNamingException', 'InvalidNameException', 'LimitExceededException', 'LinkException', 'LinkLoopException', 'LinkRef', 'MalformedLinkException', 'Name', 'NameAlreadyBoundException', 'NameClassPair', 'NameNotFoundException', 'NameParser', 'NamingEnumeration', 'NamingException', 'NamingSecurityException', 'NoInitialContextException', 'NoPermissionException', 'NotContextException', 'OperationNotSupportedException', 'PartialResultException', 'RefAddr', 'Referenceable', 'ReferralException', 'ServiceUnavailableException', 'SizeLimitExceededException', 'StringRefAddr', 'TimeLimitExceededException'
-            ),
-        77 => array (
-            'AttributeInUseException', 'AttributeModificationException', 'BasicAttribute', 'BasicAttributes', 'DirContext', 'InitialDirContext', 'InvalidAttributeIdentifierException', 'InvalidAttributesException', 'InvalidSearchControlsException', 'InvalidSearchFilterException', 'ModificationItem', 'NoSuchAttributeException', 'SchemaViolationException', 'SearchControls', 'SearchResult'
-            ),
-        78 => array (
-            'EventContext', 'EventDirContext', 'NamespaceChangeListener', 'NamingEvent', 'NamingExceptionEvent', 'NamingListener', 'ObjectChangeListener'
-            ),
-        79 => array (
-            'BasicControl', 'ControlFactory', 'ExtendedRequest', 'ExtendedResponse', 'HasControls', 'InitialLdapContext', 'LdapContext', 'LdapName', 'LdapReferralException', 'ManageReferralControl', 'PagedResultsControl', 'PagedResultsResponseControl', 'Rdn', 'SortControl', 'SortKey', 'SortResponseControl', 'StartTlsRequest', 'StartTlsResponse', 'UnsolicitedNotification', 'UnsolicitedNotificationEvent', 'UnsolicitedNotificationListener'
-            ),
-        80 => array (
-            'DirObjectFactory', 'DirStateFactory', 'DirStateFactory.Result', 'DirectoryManager', 'InitialContextFactory', 'InitialContextFactoryBuilder', 'NamingManager', 'ObjectFactory', 'ObjectFactoryBuilder', 'ResolveResult', 'Resolver', 'StateFactory'
-            ),
-        81 => array (
-            'ServerSocketFactory', 'SocketFactory'
-            ),
-        82 => array (
-            'CertPathTrustManagerParameters', 'HandshakeCompletedEvent', 'HandshakeCompletedListener', 'HostnameVerifier', 'HttpsURLConnection', 'KeyManager', 'KeyManagerFactory', 'KeyManagerFactorySpi', 'KeyStoreBuilderParameters', 'ManagerFactoryParameters', 'SSLContext', 'SSLContextSpi', 'SSLEngine', 'SSLEngineResult', 'SSLEngineResult.HandshakeStatus', 'SSLEngineResult.Status', 'SSLException', 'SSLHandshakeException', 'SSLKeyException', 'SSLPeerUnverifiedException', 'SSLPermission', 'SSLProtocolException', 'SSLServerSocket', 'SSLServerSocketFactory', 'SSLSession', 'SSLSessionBindingEvent', 'SSLSessionBindingListener', 'SSLSessionContext', 'SSLSocket', 'SSLSocketFactory', 'TrustManager', 'TrustManagerFactory', 'TrustManagerFactorySpi', 'X509ExtendedKeyManager', 'X509KeyManager', 'X509TrustManager'
-            ),
-        83 => array (
-            'AttributeException', 'CancelablePrintJob', 'Doc', 'DocFlavor', 'DocFlavor.BYTE_ARRAY', 'DocFlavor.CHAR_ARRAY', 'DocFlavor.INPUT_STREAM', 'DocFlavor.READER', 'DocFlavor.SERVICE_FORMATTED', 'DocFlavor.STRING', 'DocFlavor.URL', 'DocPrintJob', 'FlavorException', 'MultiDoc', 'MultiDocPrintJob', 'MultiDocPrintService', 'PrintException', 'PrintService', 'PrintServiceLookup', 'ServiceUI', 'ServiceUIFactory', 'SimpleDoc', 'StreamPrintService', 'StreamPrintServiceFactory', 'URIException'
-            ),
-        84 => array (
-            'AttributeSetUtilities', 'DateTimeSyntax', 'DocAttribute', 'DocAttributeSet', 'EnumSyntax', 'HashAttributeSet', 'HashDocAttributeSet', 'HashPrintJobAttributeSet', 'HashPrintRequestAttributeSet', 'HashPrintServiceAttributeSet', 'IntegerSyntax', 'PrintJobAttribute', 'PrintJobAttributeSet', 'PrintRequestAttribute', 'PrintRequestAttributeSet', 'PrintServiceAttribute', 'PrintServiceAttributeSet', 'ResolutionSyntax', 'SetOfIntegerSyntax', 'Size2DSyntax', 'SupportedValuesAttribute', 'TextSyntax', 'URISyntax', 'UnmodifiableSetException'
-            ),
-        85 => array (
-            'Chromaticity', 'ColorSupported', 'Compression', 'Copies', 'CopiesSupported', 'DateTimeAtCompleted', 'DateTimeAtCreation', 'DateTimeAtProcessing', 'Destination', 'DocumentName', 'Fidelity', 'Finishings', 'JobHoldUntil', 'JobImpressions', 'JobImpressionsCompleted', 'JobImpressionsSupported', 'JobKOctets', 'JobKOctetsProcessed', 'JobKOctetsSupported', 'JobMediaSheets', 'JobMediaSheetsCompleted', 'JobMediaSheetsSupported', 'JobMessageFromOperator', 'JobName', 'JobOriginatingUserName', 'JobPriority', 'JobPrioritySupported', 'JobSheets', 'JobState', 'JobStateReason', 'JobStateReasons', 'Media', 'MediaName', 'MediaPrintableArea', 'MediaSize', 'MediaSize.Engineering', 'MediaSize.ISO', 'MediaSize.JIS', 'MediaSize.NA', 'MediaSize.Other', 'MediaSizeName', 'MediaTray', 'MultipleDocumentHandling', 'NumberOfDocuments', 'NumberOfInterveningJobs', 'NumberUp', 'NumberUpSupported', 'OrientationRequested', 'OutputDeviceAssigned', 'PDLOverrideSupported', 'PageRanges', 'PagesPerMinute', 'PagesPerMinuteColor',
-            'PresentationDirection', 'PrintQuality', 'PrinterInfo', 'PrinterIsAcceptingJobs', 'PrinterLocation', 'PrinterMakeAndModel', 'PrinterMessageFromOperator', 'PrinterMoreInfo', 'PrinterMoreInfoManufacturer', 'PrinterName', 'PrinterResolution', 'PrinterState', 'PrinterStateReason', 'PrinterStateReasons', 'PrinterURI', 'QueuedJobCount', 'ReferenceUriSchemesSupported', 'RequestingUserName', 'Severity', 'SheetCollate', 'Sides'
-            ),
-        86 => array (
-            'PrintEvent', 'PrintJobAdapter', 'PrintJobAttributeEvent', 'PrintJobAttributeListener', 'PrintJobEvent', 'PrintJobListener', 'PrintServiceAttributeEvent', 'PrintServiceAttributeListener'
-            ),
-        87 => array (
-            'PortableRemoteObject'
-            ),
-        88 => array (
-            'ClassDesc', 'PortableRemoteObjectDelegate', 'Stub', 'StubDelegate', 'Tie', 'Util', 'UtilDelegate', 'ValueHandler', 'ValueHandlerMultiFormat'
-            ),
-        89 => array (
-            'SslRMIClientSocketFactory', 'SslRMIServerSocketFactory'
-            ),
-        90 => array (
-            'AuthPermission', 'DestroyFailedException', 'Destroyable', 'PrivateCredentialPermission', 'RefreshFailedException', 'Refreshable', 'Subject', 'SubjectDomainCombiner'
-            ),
-        91 => array (
-            'Callback', 'CallbackHandler', 'ChoiceCallback', 'ConfirmationCallback', 'LanguageCallback', 'NameCallback', 'PasswordCallback', 'TextInputCallback', 'TextOutputCallback', 'UnsupportedCallbackException'
-            ),
-        92 => array (
-            'DelegationPermission', 'KerberosKey', 'KerberosPrincipal', 'KerberosTicket', 'ServicePermission'
-            ),
-        93 => array (
-            'AccountException', 'AccountExpiredException', 'AccountLockedException', 'AccountNotFoundException', 'AppConfigurationEntry', 'AppConfigurationEntry.LoginModuleControlFlag', 'Configuration', 'CredentialException', 'CredentialExpiredException', 'CredentialNotFoundException', 'FailedLoginException', 'LoginContext', 'LoginException'
-            ),
-        94 => array (
-            'LoginModule'
-            ),
-        95 => array (
-            'X500Principal', 'X500PrivateCredential'
-            ),
-        96 => array (
-            'AuthorizeCallback', 'RealmCallback', 'RealmChoiceCallback', 'Sasl', 'SaslClient', 'SaslClientFactory', 'SaslException', 'SaslServer', 'SaslServerFactory'
-            ),
-        97 => array (
-            'ControllerEventListener', 'Instrument', 'InvalidMidiDataException', 'MetaEventListener', 'MetaMessage', 'MidiChannel', 'MidiDevice', 'MidiDevice.Info', 'MidiEvent', 'MidiFileFormat', 'MidiMessage', 'MidiSystem', 'MidiUnavailableException', 'Patch', 'Receiver', 'Sequence', 'Sequencer', 'Sequencer.SyncMode', 'ShortMessage', 'Soundbank', 'SoundbankResource', 'Synthesizer', 'SysexMessage', 'Track', 'Transmitter', 'VoiceStatus'
-            ),
-        98 => array (
-            'MidiDeviceProvider', 'MidiFileReader', 'MidiFileWriter', 'SoundbankReader'
-            ),
-        99 => array (
-            'AudioFileFormat', 'AudioFileFormat.Type', 'AudioFormat', 'AudioFormat.Encoding', 'AudioInputStream', 'AudioPermission', 'AudioSystem', 'BooleanControl', 'BooleanControl.Type', 'Clip', 'CompoundControl', 'CompoundControl.Type', 'Control.Type', 'DataLine', 'DataLine.Info', 'EnumControl', 'EnumControl.Type', 'FloatControl', 'FloatControl.Type', 'Line', 'Line.Info', 'LineEvent', 'LineEvent.Type', 'LineListener', 'LineUnavailableException', 'Mixer', 'Mixer.Info', 'Port', 'Port.Info', 'ReverbType', 'SourceDataLine', 'TargetDataLine', 'UnsupportedAudioFileException'
-            ),
-        100 => array (
-            'AudioFileReader', 'AudioFileWriter', 'FormatConversionProvider', 'MixerProvider'
-            ),
-        101 => array (
-            'ConnectionEvent', 'ConnectionEventListener', 'ConnectionPoolDataSource', 'DataSource', 'PooledConnection', 'RowSet', 'RowSetEvent', 'RowSetInternal', 'RowSetListener', 'RowSetMetaData', 'RowSetReader', 'RowSetWriter', 'XAConnection', 'XADataSource'
-            ),
-        102 => array (
-            'BaseRowSet', 'CachedRowSet', 'FilteredRowSet', 'JdbcRowSet', 'JoinRowSet', 'Joinable', 'Predicate', 'RowSetMetaDataImpl', 'RowSetWarning', 'WebRowSet'
-            ),
-        103 => array (
-            'SQLInputImpl', 'SQLOutputImpl', 'SerialArray', 'SerialBlob', 'SerialClob', 'SerialDatalink', 'SerialException', 'SerialJavaObject', 'SerialRef', 'SerialStruct'
-            ),
-        104 => array (
-            'SyncFactory', 'SyncFactoryException', 'SyncProvider', 'SyncProviderException', 'SyncResolver', 'TransactionalWriter', 'XmlReader', 'XmlWriter'
-            ),
-        105 => array (
-            'AbstractAction', 'AbstractButton', 'AbstractCellEditor', 'AbstractListModel', 'AbstractSpinnerModel', 'Action', 'ActionMap', 'BorderFactory', 'BoundedRangeModel', 'Box', 'Box.Filler', 'BoxLayout', 'ButtonGroup', 'ButtonModel', 'CellEditor', 'CellRendererPane', 'ComboBoxEditor', 'ComboBoxModel', 'ComponentInputMap', 'DebugGraphics', 'DefaultBoundedRangeModel', 'DefaultButtonModel', 'DefaultCellEditor', 'DefaultComboBoxModel', 'DefaultDesktopManager', 'DefaultFocusManager', 'DefaultListCellRenderer', 'DefaultListCellRenderer.UIResource', 'DefaultListModel', 'DefaultListSelectionModel', 'DefaultSingleSelectionModel', 'DesktopManager', 'FocusManager', 'GrayFilter', 'Icon', 'ImageIcon', 'InputMap', 'InputVerifier', 'InternalFrameFocusTraversalPolicy', 'JApplet', 'JButton', 'JCheckBox', 'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox', 'JComboBox.KeySelectionManager', 'JComponent', 'JDesktopPane', 'JDialog', 'JEditorPane', 'JFileChooser', 'JFormattedTextField', 'JFormattedTextField.AbstractFormatter',
-            'JFormattedTextField.AbstractFormatterFactory', 'JFrame', 'JInternalFrame', 'JInternalFrame.JDesktopIcon', 'JLabel', 'JLayeredPane', 'JList', 'JMenu', 'JMenuBar', 'JMenuItem', 'JOptionPane', 'JPanel', 'JPasswordField', 'JPopupMenu', 'JPopupMenu.Separator', 'JProgressBar', 'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane', 'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider', 'JSpinner', 'JSpinner.DateEditor', 'JSpinner.DefaultEditor', 'JSpinner.ListEditor', 'JSpinner.NumberEditor', 'JSplitPane', 'JTabbedPane', 'JTable', 'JTable.PrintMode', 'JTextArea', 'JTextField', 'JTextPane', 'JToggleButton', 'JToggleButton.ToggleButtonModel', 'JToolBar', 'JToolBar.Separator', 'JToolTip', 'JTree', 'JTree.DynamicUtilTreeNode', 'JTree.EmptySelectionModel', 'JViewport', 'JWindow', 'KeyStroke', 'LayoutFocusTraversalPolicy', 'ListCellRenderer', 'ListModel', 'ListSelectionModel', 'LookAndFeel', 'MenuElement', 'MenuSelectionManager', 'MutableComboBoxModel', 'OverlayLayout', 'Popup', 'PopupFactory', 'ProgressMonitor',
-            'ProgressMonitorInputStream', 'Renderer', 'RepaintManager', 'RootPaneContainer', 'ScrollPaneConstants', 'ScrollPaneLayout', 'ScrollPaneLayout.UIResource', 'Scrollable', 'SingleSelectionModel', 'SizeRequirements', 'SizeSequence', 'SortingFocusTraversalPolicy', 'SpinnerDateModel', 'SpinnerListModel', 'SpinnerModel', 'SpinnerNumberModel', 'Spring', 'SpringLayout', 'SpringLayout.Constraints', 'SwingConstants', 'SwingUtilities', 'ToolTipManager', 'TransferHandler', 'UIDefaults', 'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap', 'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue', 'UIManager', 'UIManager.LookAndFeelInfo', 'UnsupportedLookAndFeelException', 'ViewportLayout', 'WindowConstants'
-            ),
-        106 => array (
-            'AbstractBorder', 'BevelBorder', 'Border', 'CompoundBorder', 'EmptyBorder', 'EtchedBorder', 'LineBorder', 'MatteBorder', 'SoftBevelBorder', 'TitledBorder'
-            ),
-        107 => array (
-            'AbstractColorChooserPanel', 'ColorChooserComponentFactory', 'ColorSelectionModel', 'DefaultColorSelectionModel'
-            ),
-        108 => array (
-            'AncestorEvent', 'AncestorListener', 'CaretEvent', 'CaretListener', 'CellEditorListener', 'ChangeEvent', 'ChangeListener', 'DocumentEvent.ElementChange', 'DocumentEvent.EventType', 'DocumentListener', 'EventListenerList', 'HyperlinkEvent', 'HyperlinkEvent.EventType', 'HyperlinkListener', 'InternalFrameAdapter', 'InternalFrameEvent', 'InternalFrameListener', 'ListDataEvent', 'ListDataListener', 'ListSelectionEvent', 'ListSelectionListener', 'MenuDragMouseEvent', 'MenuDragMouseListener', 'MenuEvent', 'MenuKeyEvent', 'MenuKeyListener', 'MenuListener', 'MouseInputAdapter', 'MouseInputListener', 'PopupMenuEvent', 'PopupMenuListener', 'SwingPropertyChangeSupport', 'TableColumnModelEvent', 'TableColumnModelListener', 'TableModelEvent', 'TableModelListener', 'TreeExpansionEvent', 'TreeExpansionListener', 'TreeModelEvent', 'TreeModelListener', 'TreeSelectionEvent', 'TreeSelectionListener', 'TreeWillExpandListener', 'UndoableEditEvent', 'UndoableEditListener'
-            ),
-        109 => array (
-            'FileSystemView', 'FileView'
-            ),
-        110 => array (
-            'ActionMapUIResource', 'BorderUIResource', 'BorderUIResource.BevelBorderUIResource', 'BorderUIResource.CompoundBorderUIResource', 'BorderUIResource.EmptyBorderUIResource', 'BorderUIResource.EtchedBorderUIResource', 'BorderUIResource.LineBorderUIResource', 'BorderUIResource.MatteBorderUIResource', 'BorderUIResource.TitledBorderUIResource', 'ButtonUI', 'ColorChooserUI', 'ColorUIResource', 'ComboBoxUI', 'ComponentInputMapUIResource', 'ComponentUI', 'DesktopIconUI', 'DesktopPaneUI', 'DimensionUIResource', 'FileChooserUI', 'FontUIResource', 'IconUIResource', 'InputMapUIResource', 'InsetsUIResource', 'InternalFrameUI', 'LabelUI', 'ListUI', 'MenuBarUI', 'MenuItemUI', 'OptionPaneUI', 'PanelUI', 'PopupMenuUI', 'ProgressBarUI', 'RootPaneUI', 'ScrollBarUI', 'ScrollPaneUI', 'SeparatorUI', 'SliderUI', 'SpinnerUI', 'SplitPaneUI', 'TabbedPaneUI', 'TableHeaderUI', 'TableUI', 'TextUI', 'ToolBarUI', 'ToolTipUI', 'TreeUI', 'UIResource', 'ViewportUI'
-            ),
-        111 => array (
-            'BasicArrowButton', 'BasicBorders', 'BasicBorders.ButtonBorder', 'BasicBorders.FieldBorder', 'BasicBorders.MarginBorder', 'BasicBorders.MenuBarBorder', 'BasicBorders.RadioButtonBorder', 'BasicBorders.RolloverButtonBorder', 'BasicBorders.SplitPaneBorder', 'BasicBorders.ToggleButtonBorder', 'BasicButtonListener', 'BasicButtonUI', 'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI', 'BasicColorChooserUI', 'BasicComboBoxEditor', 'BasicComboBoxEditor.UIResource', 'BasicComboBoxRenderer', 'BasicComboBoxRenderer.UIResource', 'BasicComboBoxUI', 'BasicComboPopup', 'BasicDesktopIconUI', 'BasicDesktopPaneUI', 'BasicDirectoryModel', 'BasicEditorPaneUI', 'BasicFileChooserUI', 'BasicFormattedTextFieldUI', 'BasicGraphicsUtils', 'BasicHTML', 'BasicIconFactory', 'BasicInternalFrameTitlePane', 'BasicInternalFrameUI', 'BasicLabelUI', 'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI', 'BasicMenuItemUI', 'BasicMenuUI', 'BasicOptionPaneUI', 'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI', 'BasicPasswordFieldUI',
-            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI', 'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI', 'BasicRadioButtonUI', 'BasicRootPaneUI', 'BasicScrollBarUI', 'BasicScrollPaneUI', 'BasicSeparatorUI', 'BasicSliderUI', 'BasicSpinnerUI', 'BasicSplitPaneDivider', 'BasicSplitPaneUI', 'BasicTabbedPaneUI', 'BasicTableHeaderUI', 'BasicTableUI', 'BasicTextAreaUI', 'BasicTextFieldUI', 'BasicTextPaneUI', 'BasicTextUI', 'BasicTextUI.BasicCaret', 'BasicTextUI.BasicHighlighter', 'BasicToggleButtonUI', 'BasicToolBarSeparatorUI', 'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI', 'BasicViewportUI', 'ComboPopup', 'DefaultMenuLayout'
-            ),
-        112 => array (
-            'DefaultMetalTheme', 'MetalBorders', 'MetalBorders.ButtonBorder', 'MetalBorders.Flush3DBorder', 'MetalBorders.InternalFrameBorder', 'MetalBorders.MenuBarBorder', 'MetalBorders.MenuItemBorder', 'MetalBorders.OptionDialogBorder', 'MetalBorders.PaletteBorder', 'MetalBorders.PopupMenuBorder', 'MetalBorders.RolloverButtonBorder', 'MetalBorders.ScrollPaneBorder', 'MetalBorders.TableHeaderBorder', 'MetalBorders.TextFieldBorder', 'MetalBorders.ToggleButtonBorder', 'MetalBorders.ToolBarBorder', 'MetalButtonUI', 'MetalCheckBoxIcon', 'MetalCheckBoxUI', 'MetalComboBoxButton', 'MetalComboBoxEditor', 'MetalComboBoxEditor.UIResource', 'MetalComboBoxIcon', 'MetalComboBoxUI', 'MetalDesktopIconUI', 'MetalFileChooserUI', 'MetalIconFactory', 'MetalIconFactory.FileIcon16', 'MetalIconFactory.FolderIcon16', 'MetalIconFactory.PaletteCloseIcon', 'MetalIconFactory.TreeControlIcon', 'MetalIconFactory.TreeFolderIcon', 'MetalIconFactory.TreeLeafIcon', 'MetalInternalFrameTitlePane', 'MetalInternalFrameUI', 'MetalLabelUI',
-            'MetalLookAndFeel', 'MetalMenuBarUI', 'MetalPopupMenuSeparatorUI', 'MetalProgressBarUI', 'MetalRadioButtonUI', 'MetalRootPaneUI', 'MetalScrollBarUI', 'MetalScrollButton', 'MetalScrollPaneUI', 'MetalSeparatorUI', 'MetalSliderUI', 'MetalSplitPaneUI', 'MetalTabbedPaneUI', 'MetalTextFieldUI', 'MetalTheme', 'MetalToggleButtonUI', 'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI', 'OceanTheme'
-            ),
-        113 => array (
-            'MultiButtonUI', 'MultiColorChooserUI', 'MultiComboBoxUI', 'MultiDesktopIconUI', 'MultiDesktopPaneUI', 'MultiFileChooserUI', 'MultiInternalFrameUI', 'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel', 'MultiMenuBarUI', 'MultiMenuItemUI', 'MultiOptionPaneUI', 'MultiPanelUI', 'MultiPopupMenuUI', 'MultiProgressBarUI', 'MultiRootPaneUI', 'MultiScrollBarUI', 'MultiScrollPaneUI', 'MultiSeparatorUI', 'MultiSliderUI', 'MultiSpinnerUI', 'MultiSplitPaneUI', 'MultiTabbedPaneUI', 'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI', 'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI', 'MultiViewportUI'
-            ),
-        114 => array (
-            'ColorType', 'Region', 'SynthConstants', 'SynthContext', 'SynthGraphicsUtils', 'SynthLookAndFeel', 'SynthPainter', 'SynthStyle', 'SynthStyleFactory'
-            ),
-        115 => array (
-            'AbstractTableModel', 'DefaultTableCellRenderer', 'DefaultTableCellRenderer.UIResource', 'DefaultTableColumnModel', 'DefaultTableModel', 'JTableHeader', 'TableCellEditor', 'TableCellRenderer', 'TableColumn', 'TableColumnModel', 'TableModel'
-            ),
-        116 => array (
-            'AbstractDocument', 'AbstractDocument.AttributeContext', 'AbstractDocument.Content', 'AbstractDocument.ElementEdit', 'AbstractWriter', 'AsyncBoxView', 'AttributeSet.CharacterAttribute', 'AttributeSet.ColorAttribute', 'AttributeSet.FontAttribute', 'AttributeSet.ParagraphAttribute', 'BadLocationException', 'BoxView', 'Caret', 'ChangedCharSetException', 'ComponentView', 'CompositeView', 'DateFormatter', 'DefaultCaret', 'DefaultEditorKit', 'DefaultEditorKit.BeepAction', 'DefaultEditorKit.CopyAction', 'DefaultEditorKit.CutAction', 'DefaultEditorKit.DefaultKeyTypedAction', 'DefaultEditorKit.InsertBreakAction', 'DefaultEditorKit.InsertContentAction', 'DefaultEditorKit.InsertTabAction', 'DefaultEditorKit.PasteAction', 'DefaultFormatter', 'DefaultFormatterFactory', 'DefaultHighlighter', 'DefaultHighlighter.DefaultHighlightPainter', 'DefaultStyledDocument', 'DefaultStyledDocument.AttributeUndoableEdit', 'DefaultStyledDocument.ElementSpec', 'DefaultTextUI', 'DocumentFilter', 'DocumentFilter.FilterBypass',
-            'EditorKit', 'ElementIterator', 'FieldView', 'FlowView', 'FlowView.FlowStrategy', 'GapContent', 'GlyphView', 'GlyphView.GlyphPainter', 'Highlighter', 'Highlighter.Highlight', 'Highlighter.HighlightPainter', 'IconView', 'InternationalFormatter', 'JTextComponent', 'JTextComponent.KeyBinding', 'Keymap', 'LabelView', 'LayeredHighlighter', 'LayeredHighlighter.LayerPainter', 'LayoutQueue', 'MaskFormatter', 'MutableAttributeSet', 'NavigationFilter', 'NavigationFilter.FilterBypass', 'NumberFormatter', 'PasswordView', 'PlainDocument', 'PlainView', 'Position', 'Position.Bias', 'Segment', 'SimpleAttributeSet', 'StringContent', 'Style', 'StyleConstants', 'StyleConstants.CharacterConstants', 'StyleConstants.ColorConstants', 'StyleConstants.FontConstants', 'StyleConstants.ParagraphConstants', 'StyleContext', 'StyledDocument', 'StyledEditorKit', 'StyledEditorKit.AlignmentAction', 'StyledEditorKit.BoldAction', 'StyledEditorKit.FontFamilyAction', 'StyledEditorKit.FontSizeAction', 'StyledEditorKit.ForegroundAction',
-            'StyledEditorKit.ItalicAction', 'StyledEditorKit.StyledTextAction', 'StyledEditorKit.UnderlineAction', 'TabExpander', 'TabSet', 'TabStop', 'TabableView', 'TableView', 'TextAction', 'Utilities', 'View', 'ViewFactory', 'WrappedPlainView', 'ZoneView'
-            ),
-        117 => array (
-            'BlockView', 'CSS', 'CSS.Attribute', 'FormSubmitEvent', 'FormSubmitEvent.MethodType', 'FormView', 'HTML', 'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag', 'HTMLDocument', 'HTMLDocument.Iterator', 'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory', 'HTMLEditorKit.HTMLTextAction', 'HTMLEditorKit.InsertHTMLTextAction', 'HTMLEditorKit.LinkController', 'HTMLEditorKit.Parser', 'HTMLEditorKit.ParserCallback', 'HTMLFrameHyperlinkEvent', 'HTMLWriter', 'ImageView', 'InlineView', 'ListView', 'MinimalHTMLWriter', 'ObjectView', 'Option', 'StyleSheet', 'StyleSheet.BoxPainter', 'StyleSheet.ListPainter'
-            ),
-        118 => array (
-            'ContentModel', 'DTD', 'DTDConstants', 'DocumentParser', 'ParserDelegator', 'TagElement'
-            ),
-        119 => array (
-            'RTFEditorKit'
-            ),
-        120 => array (
-            'AbstractLayoutCache', 'AbstractLayoutCache.NodeDimensions', 'DefaultMutableTreeNode', 'DefaultTreeCellEditor', 'DefaultTreeCellRenderer', 'DefaultTreeModel', 'DefaultTreeSelectionModel', 'ExpandVetoException', 'FixedHeightLayoutCache', 'MutableTreeNode', 'RowMapper', 'TreeCellEditor', 'TreeCellRenderer', 'TreeModel', 'TreeNode', 'TreePath', 'TreeSelectionModel', 'VariableHeightLayoutCache'
-            ),
-        121 => array (
-            'AbstractUndoableEdit', 'CannotRedoException', 'CannotUndoException', 'CompoundEdit', 'StateEdit', 'StateEditable', 'UndoManager', 'UndoableEdit', 'UndoableEditSupport'
-            ),
-        122 => array (
-            'InvalidTransactionException', 'TransactionRequiredException', 'TransactionRolledbackException'
-            ),
-        123 => array (
-            'XAException', 'XAResource', 'Xid'
-            ),
-        124 => array (
-            'XMLConstants'
-            ),
-        125 => array (
-            'DatatypeConfigurationException', 'DatatypeConstants', 'DatatypeConstants.Field', 'DatatypeFactory', 'Duration', 'XMLGregorianCalendar'
-            ),
-        126 => array (
-            'NamespaceContext', 'QName'
-            ),
-        127 => array (
-            'DocumentBuilder', 'DocumentBuilderFactory', 'FactoryConfigurationError', 'ParserConfigurationException', 'SAXParser', 'SAXParserFactory'
-            ),
-        128 => array (
-            'ErrorListener', 'OutputKeys', 'Result', 'Source', 'SourceLocator', 'Templates', 'Transformer', 'TransformerConfigurationException', 'TransformerException', 'TransformerFactory', 'TransformerFactoryConfigurationError', 'URIResolver'
-            ),
-        129 => array (
-            'DOMResult', 'DOMSource'
-            ),
-        130 => array (
-            'SAXResult', 'SAXSource', 'SAXTransformerFactory', 'TemplatesHandler', 'TransformerHandler'
-            ),
-        131 => array (
-            'StreamResult', 'StreamSource'
-            ),
-        132 => array (
-            'Schema', 'SchemaFactory', 'SchemaFactoryLoader', 'TypeInfoProvider', 'Validator', 'ValidatorHandler'
-            ),
-        133 => array (
-            'XPath', 'XPathConstants', 'XPathException', 'XPathExpression', 'XPathExpressionException', 'XPathFactory', 'XPathFactoryConfigurationException', 'XPathFunction', 'XPathFunctionException', 'XPathFunctionResolver', 'XPathVariableResolver'
-            ),
-        134 => array (
-            'ChannelBinding', 'GSSContext', 'GSSCredential', 'GSSException', 'GSSManager', 'GSSName', 'MessageProp', 'Oid'
-            ),
-        135 => array (
-            'ACTIVITY_COMPLETED', 'ACTIVITY_REQUIRED', 'ARG_IN', 'ARG_INOUT', 'ARG_OUT', 'Any', 'AnyHolder', 'AnySeqHolder', 'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION', 'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE', 'BAD_POLICY_VALUE', 'BAD_QOS', 'BAD_TYPECODE', 'BooleanHolder', 'BooleanSeqHelper', 'BooleanSeqHolder', 'ByteHolder', 'CODESET_INCOMPATIBLE', 'COMM_FAILURE', 'CTX_RESTRICT_SCOPE', 'CharHolder', 'CharSeqHelper', 'CharSeqHolder', 'CompletionStatus', 'CompletionStatusHelper', 'ContextList', 'CurrentHolder', 'CustomMarshal', 'DATA_CONVERSION', 'DefinitionKind', 'DefinitionKindHelper', 'DomainManager', 'DomainManagerOperations', 'DoubleHolder', 'DoubleSeqHelper', 'DoubleSeqHolder', 'Environment', 'ExceptionList', 'FREE_MEM', 'FixedHolder', 'FloatHolder', 'FloatSeqHelper', 'FloatSeqHolder', 'IDLType', 'IDLTypeHelper', 'IDLTypeOperations', 'IMP_LIMIT', 'INITIALIZE', 'INTERNAL', 'INTF_REPOS', 'INVALID_ACTIVITY', 'INVALID_TRANSACTION', 'INV_FLAG', 'INV_IDENT', 'INV_OBJREF', 'INV_POLICY', 'IRObject',
-            'IRObjectOperations', 'IdentifierHelper', 'IntHolder', 'LocalObject', 'LongHolder', 'LongLongSeqHelper', 'LongLongSeqHolder', 'LongSeqHelper', 'LongSeqHolder', 'MARSHAL', 'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION', 'NO_RESOURCES', 'NO_RESPONSE', 'NVList', 'NamedValue', 'OBJECT_NOT_EXIST', 'OBJ_ADAPTER', 'OMGVMCID', 'ObjectHelper', 'ObjectHolder', 'OctetSeqHelper', 'OctetSeqHolder', 'PERSIST_STORE', 'PRIVATE_MEMBER', 'PUBLIC_MEMBER', 'ParameterMode', 'ParameterModeHelper', 'ParameterModeHolder', 'PolicyError', 'PolicyErrorCodeHelper', 'PolicyErrorHelper', 'PolicyErrorHolder', 'PolicyHelper', 'PolicyHolder', 'PolicyListHelper', 'PolicyListHolder', 'PolicyOperations', 'PolicyTypeHelper', 'PrincipalHolder', 'REBIND', 'RepositoryIdHelper', 'Request', 'ServerRequest', 'ServiceDetail', 'ServiceDetailHelper', 'ServiceInformation', 'ServiceInformationHelper', 'ServiceInformationHolder', 'SetOverrideType', 'SetOverrideTypeHelper', 'ShortHolder', 'ShortSeqHelper', 'ShortSeqHolder', 'StringHolder',
-            'StringSeqHelper', 'StringSeqHolder', 'StringValueHelper', 'StructMember', 'StructMemberHelper', 'SystemException', 'TCKind', 'TIMEOUT', 'TRANSACTION_MODE', 'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK', 'TRANSACTION_UNAVAILABLE', 'TRANSIENT', 'TypeCode', 'TypeCodeHolder', 'ULongLongSeqHelper', 'ULongLongSeqHolder', 'ULongSeqHelper', 'ULongSeqHolder', 'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE', 'UShortSeqHelper', 'UShortSeqHolder', 'UnionMember', 'UnionMemberHelper', 'UnknownUserException', 'UnknownUserExceptionHelper', 'UnknownUserExceptionHolder', 'UserException', 'VM_ABSTRACT', 'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE', 'ValueBaseHelper', 'ValueBaseHolder', 'ValueMember', 'ValueMemberHelper', 'VersionSpecHelper', 'VisibilityHelper', 'WCharSeqHelper', 'WCharSeqHolder', 'WStringSeqHelper', 'WStringSeqHolder', 'WStringValueHelper', 'WrongTransaction', 'WrongTransactionHelper', 'WrongTransactionHolder', '_IDLTypeStub', '_PolicyStub'
-            ),
-        136 => array (
-            'Invalid', 'InvalidSeq'
-            ),
-        137 => array (
-            'BadKind'
-            ),
-        138 => array (
-            'ApplicationException', 'BoxedValueHelper', 'CustomValue', 'IDLEntity', 'IndirectionException', 'InvokeHandler', 'RemarshalException', 'ResponseHandler', 'ServantObject', 'Streamable', 'StreamableValue', 'UnknownException', 'ValueBase', 'ValueFactory', 'ValueInputStream', 'ValueOutputStream'
-            ),
-        139 => array (
-            'BindingHelper', 'BindingHolder', 'BindingIterator', 'BindingIteratorHelper', 'BindingIteratorHolder', 'BindingIteratorOperations', 'BindingIteratorPOA', 'BindingListHelper', 'BindingListHolder', 'BindingType', 'BindingTypeHelper', 'BindingTypeHolder', 'IstringHelper', 'NameComponent', 'NameComponentHelper', 'NameComponentHolder', 'NameHelper', 'NameHolder', 'NamingContext', 'NamingContextExt', 'NamingContextExtHelper', 'NamingContextExtHolder', 'NamingContextExtOperations', 'NamingContextExtPOA', 'NamingContextHelper', 'NamingContextHolder', 'NamingContextOperations', 'NamingContextPOA', '_BindingIteratorImplBase', '_BindingIteratorStub', '_NamingContextExtStub', '_NamingContextImplBase', '_NamingContextStub'
-            ),
-        140 => array (
-            'AddressHelper', 'InvalidAddress', 'InvalidAddressHelper', 'InvalidAddressHolder', 'StringNameHelper', 'URLStringHelper'
-            ),
-        141 => array (
-            'AlreadyBound', 'AlreadyBoundHelper', 'AlreadyBoundHolder', 'CannotProceed', 'CannotProceedHelper', 'CannotProceedHolder', 'InvalidNameHolder', 'NotEmpty', 'NotEmptyHelper', 'NotEmptyHolder', 'NotFound', 'NotFoundHelper', 'NotFoundHolder', 'NotFoundReason', 'NotFoundReasonHelper', 'NotFoundReasonHolder'
-            ),
-        142 => array (
-            'Parameter'
-            ),
-        143 => array (
-            'DynAnyFactory', 'DynAnyFactoryHelper', 'DynAnyFactoryOperations', 'DynAnyHelper', 'DynAnyOperations', 'DynAnySeqHelper', 'DynArrayHelper', 'DynArrayOperations', 'DynEnumHelper', 'DynEnumOperations', 'DynFixedHelper', 'DynFixedOperations', 'DynSequenceHelper', 'DynSequenceOperations', 'DynStructHelper', 'DynStructOperations', 'DynUnionHelper', 'DynUnionOperations', 'DynValueBox', 'DynValueBoxOperations', 'DynValueCommon', 'DynValueCommonOperations', 'DynValueHelper', 'DynValueOperations', 'NameDynAnyPair', 'NameDynAnyPairHelper', 'NameDynAnyPairSeqHelper', 'NameValuePairSeqHelper', '_DynAnyFactoryStub', '_DynAnyStub', '_DynArrayStub', '_DynEnumStub', '_DynFixedStub', '_DynSequenceStub', '_DynStructStub', '_DynUnionStub', '_DynValueStub'
-            ),
-        144 => array (
-            'InconsistentTypeCodeHelper'
-            ),
-        145 => array (
-            'InvalidValueHelper'
-            ),
-        146 => array (
-            'CodeSets', 'Codec', 'CodecFactory', 'CodecFactoryHelper', 'CodecFactoryOperations', 'CodecOperations', 'ComponentIdHelper', 'ENCODING_CDR_ENCAPS', 'Encoding', 'ExceptionDetailMessage', 'IOR', 'IORHelper', 'IORHolder', 'MultipleComponentProfileHelper', 'MultipleComponentProfileHolder', 'ProfileIdHelper', 'RMICustomMaxStreamFormat', 'ServiceContext', 'ServiceContextHelper', 'ServiceContextHolder', 'ServiceContextListHelper', 'ServiceContextListHolder', 'ServiceIdHelper', 'TAG_ALTERNATE_IIOP_ADDRESS', 'TAG_CODE_SETS', 'TAG_INTERNET_IOP', 'TAG_JAVA_CODEBASE', 'TAG_MULTIPLE_COMPONENTS', 'TAG_ORB_TYPE', 'TAG_POLICIES', 'TAG_RMI_CUSTOM_MAX_STREAM_FORMAT', 'TaggedComponent', 'TaggedComponentHelper', 'TaggedComponentHolder', 'TaggedProfile', 'TaggedProfileHelper', 'TaggedProfileHolder', 'TransactionService'
-            ),
-        147 => array (
-            'UnknownEncoding', 'UnknownEncodingHelper'
-            ),
-        148 => array (
-            'FormatMismatch', 'FormatMismatchHelper', 'InvalidTypeForEncoding', 'InvalidTypeForEncodingHelper'
-            ),
-        149 => array (
-            'SYNC_WITH_TRANSPORT', 'SyncScopeHelper'
-            ),
-        150 => array (
-            'ACTIVE', 'AdapterManagerIdHelper', 'AdapterNameHelper', 'AdapterStateHelper', 'ClientRequestInfo', 'ClientRequestInfoOperations', 'ClientRequestInterceptor', 'ClientRequestInterceptorOperations', 'DISCARDING', 'HOLDING', 'INACTIVE', 'IORInfo', 'IORInfoOperations', 'IORInterceptor', 'IORInterceptorOperations', 'IORInterceptor_3_0', 'IORInterceptor_3_0Helper', 'IORInterceptor_3_0Holder', 'IORInterceptor_3_0Operations', 'Interceptor', 'InterceptorOperations', 'InvalidSlot', 'InvalidSlotHelper', 'LOCATION_FORWARD', 'NON_EXISTENT', 'ORBIdHelper', 'ORBInitInfo', 'ORBInitInfoOperations', 'ORBInitializer', 'ORBInitializerOperations', 'ObjectReferenceFactory', 'ObjectReferenceFactoryHelper', 'ObjectReferenceFactoryHolder', 'ObjectReferenceTemplate', 'ObjectReferenceTemplateHelper', 'ObjectReferenceTemplateHolder', 'ObjectReferenceTemplateSeqHelper', 'ObjectReferenceTemplateSeqHolder', 'PolicyFactory', 'PolicyFactoryOperations', 'RequestInfo', 'RequestInfoOperations', 'SUCCESSFUL', 'SYSTEM_EXCEPTION',
-            'ServerIdHelper', 'ServerRequestInfo', 'ServerRequestInfoOperations', 'ServerRequestInterceptor', 'ServerRequestInterceptorOperations', 'TRANSPORT_RETRY', 'USER_EXCEPTION'
-            ),
-        151 => array (
-            'DuplicateName', 'DuplicateNameHelper'
-            ),
-        152 => array (
-            'AdapterActivator', 'AdapterActivatorOperations', 'ID_ASSIGNMENT_POLICY_ID', 'ID_UNIQUENESS_POLICY_ID', 'IMPLICIT_ACTIVATION_POLICY_ID', 'IdAssignmentPolicy', 'IdAssignmentPolicyOperations', 'IdAssignmentPolicyValue', 'IdUniquenessPolicy', 'IdUniquenessPolicyOperations', 'IdUniquenessPolicyValue', 'ImplicitActivationPolicy', 'ImplicitActivationPolicyOperations', 'ImplicitActivationPolicyValue', 'LIFESPAN_POLICY_ID', 'LifespanPolicy', 'LifespanPolicyOperations', 'LifespanPolicyValue', 'POA', 'POAHelper', 'POAManager', 'POAManagerOperations', 'POAOperations', 'REQUEST_PROCESSING_POLICY_ID', 'RequestProcessingPolicy', 'RequestProcessingPolicyOperations', 'RequestProcessingPolicyValue', 'SERVANT_RETENTION_POLICY_ID', 'Servant', 'ServantActivator', 'ServantActivatorHelper', 'ServantActivatorOperations', 'ServantActivatorPOA', 'ServantLocator', 'ServantLocatorHelper', 'ServantLocatorOperations', 'ServantLocatorPOA', 'ServantManager', 'ServantManagerOperations', 'ServantRetentionPolicy',
-            'ServantRetentionPolicyOperations', 'ServantRetentionPolicyValue', 'THREAD_POLICY_ID', 'ThreadPolicy', 'ThreadPolicyOperations', 'ThreadPolicyValue', '_ServantActivatorStub', '_ServantLocatorStub'
-            ),
-        153 => array (
-            'NoContext', 'NoContextHelper'
-            ),
-        154 => array (
-            'AdapterInactive', 'AdapterInactiveHelper', 'State'
-            ),
-        155 => array (
-            'AdapterAlreadyExists', 'AdapterAlreadyExistsHelper', 'AdapterNonExistent', 'AdapterNonExistentHelper', 'InvalidPolicy', 'InvalidPolicyHelper', 'NoServant', 'NoServantHelper', 'ObjectAlreadyActive', 'ObjectAlreadyActiveHelper', 'ObjectNotActive', 'ObjectNotActiveHelper', 'ServantAlreadyActive', 'ServantAlreadyActiveHelper', 'ServantNotActive', 'ServantNotActiveHelper', 'WrongAdapter', 'WrongAdapterHelper', 'WrongPolicy', 'WrongPolicyHelper'
-            ),
-        156 => array (
-            'CookieHolder'
-            ),
-        157 => array (
-            'RunTime', 'RunTimeOperations'
-            ),
-        158 => array (
-            '_Remote_Stub'
-            ),
-        159 => array (
-            'Attr', 'CDATASection', 'CharacterData', 'Comment', 'DOMConfiguration', 'DOMError', 'DOMErrorHandler', 'DOMException', 'DOMImplementation', 'DOMImplementationList', 'DOMImplementationSource', 'DOMStringList', 'DocumentFragment', 'DocumentType', 'EntityReference', 'NameList', 'NamedNodeMap', 'Node', 'NodeList', 'Notation', 'ProcessingInstruction', 'Text', 'TypeInfo', 'UserDataHandler'
-            ),
-        160 => array (
-            'DOMImplementationRegistry'
-            ),
-        161 => array (
-            'EventException', 'EventTarget', 'MutationEvent', 'UIEvent'
-            ),
-        162 => array (
-            'DOMImplementationLS', 'LSException', 'LSInput', 'LSLoadEvent', 'LSOutput', 'LSParser', 'LSParserFilter', 'LSProgressEvent', 'LSResourceResolver', 'LSSerializer', 'LSSerializerFilter'
-            ),
-        163 => array (
-            'DTDHandler', 'DocumentHandler', 'EntityResolver', 'ErrorHandler', 'HandlerBase', 'InputSource', 'Locator', 'SAXException', 'SAXNotRecognizedException', 'SAXNotSupportedException', 'SAXParseException', 'XMLFilter', 'XMLReader'
-            ),
-        164 => array (
-            'Attributes2', 'Attributes2Impl', 'DeclHandler', 'DefaultHandler2', 'EntityResolver2', 'LexicalHandler', 'Locator2', 'Locator2Impl'
-            ),
-        165 => array (
-            'AttributeListImpl', 'AttributesImpl', 'DefaultHandler', 'LocatorImpl', 'NamespaceSupport', 'ParserAdapter', 'ParserFactory', 'XMLFilterImpl', 'XMLReaderAdapter', 'XMLReaderFactory'
-            ),
-        /* ambiguous class names (appear in more than one package) */
-        166 => array (
-            'Annotation', 'AnySeqHelper', 'Array', 'Attribute', 'AttributeList', 'AttributeSet', 'Attributes', 'AuthenticationException', 'Binding', 'Bounds', 'Certificate', 'CertificateEncodingException', 'CertificateException', 'CertificateExpiredException', 'CertificateNotYetValidException', 'CertificateParsingException', 'ConnectException', 'ContentHandler', 'Context', 'Control', 'Current', 'CurrentHelper', 'CurrentOperations', 'DOMLocator', 'DataInputStream', 'DataOutputStream', 'Date', 'DefaultLoaderRepository', 'Delegate', 'Document', 'DocumentEvent', 'DynAny', 'DynArray', 'DynEnum', 'DynFixed', 'DynSequence', 'DynStruct', 'DynUnion', 'DynValue', 'DynamicImplementation', 'Element', 'Entity', 'Event', 'EventListener', 'FieldNameHelper', 'FileFilter', 'Formatter', 'ForwardRequest', 'ForwardRequestHelper', 'InconsistentTypeCode', 'InputStream', 'IntrospectionException', 'InvalidAttributeValueException', 'InvalidKeyException', 'InvalidName', 'InvalidNameHelper', 'InvalidValue', 'List', 'MouseEvent',
-            'NameValuePair', 'NameValuePairHelper', 'ORB', 'Object', 'ObjectIdHelper', 'ObjectImpl', 'OpenType', 'OutputStream', 'ParagraphView', 'Parser', 'Permission', 'Policy', 'Principal', 'Proxy', 'Reference', 'Statement', 'Timer', 'Timestamp', 'TypeMismatch', 'TypeMismatchHelper', 'UNKNOWN', 'UnknownHostException', 'X509Certificate'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        /* all Java keywords are case sensitive */
-        1 => true, 2 => true, 3 => true, 4 => true,
-        5 => true, 6 => true, 7 => true, 8 => true, 9 => true,
-        10 => true, 11 => true, 12 => true, 13 => true, 14 => true,
-        15 => true, 16 => true, 17 => true, 18 => true, 19 => true,
-        20 => true, 21 => true, 22 => true, 23 => true, 24 => true,
-        25 => true, 26 => true, 27 => true, 28 => true, 29 => true,
-        30 => true, 31 => true, 32 => true, 33 => true, 34 => true,
-        35 => true, 36 => true, 37 => true, 38 => true, 39 => true,
-        40 => true, 41 => true, 42 => true, 43 => true, 44 => true,
-        45 => true, 46 => true, 47 => true, 48 => true, 49 => true,
-        50 => true, 51 => true, 52 => true, 53 => true, 54 => true,
-        55 => true, 56 => true, 57 => true, 58 => true, 59 => true,
-        60 => true, 61 => true, 62 => true, 63 => true, 64 => true,
-        65 => true, 66 => true, 67 => true, 68 => true, 69 => true,
-        70 => true, 71 => true, 72 => true, 73 => true, 74 => true,
-        75 => true, 76 => true, 77 => true, 78 => true, 79 => true,
-        80 => true, 81 => true, 82 => true, 83 => true, 84 => true,
-        85 => true, 86 => true, 87 => true, 88 => true, 89 => true,
-        90 => true, 91 => true, 92 => true, 93 => true, 94 => true,
-        95 => true, 96 => true, 97 => true, 98 => true, 99 => true,
-        100 => true, 101 => true, 102 => true, 103 => true, 104 => true,
-        105 => true, 106 => true, 107 => true, 108 => true, 109 => true,
-        110 => true, 111 => true, 112 => true, 113 => true, 114 => true,
-        115 => true, 116 => true, 117 => true, 118 => true, 119 => true,
-        120 => true, 121 => true, 122 => true, 123 => true, 124 => true,
-        125 => true, 126 => true, 127 => true, 128 => true, 129 => true,
-        130 => true, 131 => true, 132 => true, 133 => true, 134 => true,
-        135 => true, 136 => true, 137 => true, 138 => true, 139 => true,
-        140 => true, 141 => true, 142 => true, 143 => true, 144 => true,
-        145 => true, 146 => true, 147 => true, 148 => true, 149 => true,
-        150 => true, 151 => true, 152 => true, 153 => true, 154 => true,
-        155 => true, 156 => true, 157 => true, 158 => true, 159 => true,
-        160 => true, 161 => true, 162 => true, 163 => true, 164 => true,
-        165 => true, 166 => true
-    ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000;  font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #006600; font-weight: bold;',
-            4 => 'color: #006600; font-weight: bold;',
-            5 => 'color: #003399; font-weight: bold;',
-            6 => 'color: #003399; font-weight: bold;',
-            7 => 'color: #003399; font-weight: bold;',
-            8 => 'color: #003399; font-weight: bold;',
-            9 => 'color: #003399; font-weight: bold;',
-            10 => 'color: #003399; font-weight: bold;',
-            11 => 'color: #003399; font-weight: bold;',
-            12 => 'color: #003399; font-weight: bold;',
-            13 => 'color: #003399; font-weight: bold;',
-            14 => 'color: #003399; font-weight: bold;',
-            15 => 'color: #003399; font-weight: bold;',
-            16 => 'color: #003399; font-weight: bold;',
-            17 => 'color: #003399; font-weight: bold;',
-            18 => 'color: #003399; font-weight: bold;',
-            19 => 'color: #003399; font-weight: bold;',
-            20 => 'color: #003399; font-weight: bold;',
-            21 => 'color: #003399; font-weight: bold;',
-            22 => 'color: #003399; font-weight: bold;',
-            23 => 'color: #003399; font-weight: bold;',
-            24 => 'color: #003399; font-weight: bold;',
-            25 => 'color: #003399; font-weight: bold;',
-            26 => 'color: #003399; font-weight: bold;',
-            27 => 'color: #003399; font-weight: bold;',
-            28 => 'color: #003399; font-weight: bold;',
-            29 => 'color: #003399; font-weight: bold;',
-            30 => 'color: #003399; font-weight: bold;',
-            31 => 'color: #003399; font-weight: bold;',
-            32 => 'color: #003399; font-weight: bold;',
-            33 => 'color: #003399; font-weight: bold;',
-            34 => 'color: #003399; font-weight: bold;',
-            35 => 'color: #003399; font-weight: bold;',
-            36 => 'color: #003399; font-weight: bold;',
-            37 => 'color: #003399; font-weight: bold;',
-            38 => 'color: #003399; font-weight: bold;',
-            39 => 'color: #003399; font-weight: bold;',
-            40 => 'color: #003399; font-weight: bold;',
-            41 => 'color: #003399; font-weight: bold;',
-            42 => 'color: #003399; font-weight: bold;',
-            43 => 'color: #003399; font-weight: bold;',
-            44 => 'color: #003399; font-weight: bold;',
-            45 => 'color: #003399; font-weight: bold;',
-            46 => 'color: #003399; font-weight: bold;',
-            47 => 'color: #003399; font-weight: bold;',
-            48 => 'color: #003399; font-weight: bold;',
-            49 => 'color: #003399; font-weight: bold;',
-            50 => 'color: #003399; font-weight: bold;',
-            51 => 'color: #003399; font-weight: bold;',
-            52 => 'color: #003399; font-weight: bold;',
-            53 => 'color: #003399; font-weight: bold;',
-            54 => 'color: #003399; font-weight: bold;',
-            55 => 'color: #003399; font-weight: bold;',
-            56 => 'color: #003399; font-weight: bold;',
-            57 => 'color: #003399; font-weight: bold;',
-            58 => 'color: #003399; font-weight: bold;',
-            59 => 'color: #003399; font-weight: bold;',
-            60 => 'color: #003399; font-weight: bold;',
-            61 => 'color: #003399; font-weight: bold;',
-            62 => 'color: #003399; font-weight: bold;',
-            63 => 'color: #003399; font-weight: bold;',
-            64 => 'color: #003399; font-weight: bold;',
-            65 => 'color: #003399; font-weight: bold;',
-            66 => 'color: #003399; font-weight: bold;',
-            67 => 'color: #003399; font-weight: bold;',
-            68 => 'color: #003399; font-weight: bold;',
-            69 => 'color: #003399; font-weight: bold;',
-            70 => 'color: #003399; font-weight: bold;',
-            71 => 'color: #003399; font-weight: bold;',
-            72 => 'color: #003399; font-weight: bold;',
-            73 => 'color: #003399; font-weight: bold;',
-            74 => 'color: #003399; font-weight: bold;',
-            75 => 'color: #003399; font-weight: bold;',
-            76 => 'color: #003399; font-weight: bold;',
-            77 => 'color: #003399; font-weight: bold;',
-            78 => 'color: #003399; font-weight: bold;',
-            79 => 'color: #003399; font-weight: bold;',
-            80 => 'color: #003399; font-weight: bold;',
-            81 => 'color: #003399; font-weight: bold;',
-            82 => 'color: #003399; font-weight: bold;',
-            83 => 'color: #003399; font-weight: bold;',
-            84 => 'color: #003399; font-weight: bold;',
-            85 => 'color: #003399; font-weight: bold;',
-            86 => 'color: #003399; font-weight: bold;',
-            87 => 'color: #003399; font-weight: bold;',
-            88 => 'color: #003399; font-weight: bold;',
-            89 => 'color: #003399; font-weight: bold;',
-            90 => 'color: #003399; font-weight: bold;',
-            91 => 'color: #003399; font-weight: bold;',
-            92 => 'color: #003399; font-weight: bold;',
-            93 => 'color: #003399; font-weight: bold;',
-            94 => 'color: #003399; font-weight: bold;',
-            95 => 'color: #003399; font-weight: bold;',
-            96 => 'color: #003399; font-weight: bold;',
-            97 => 'color: #003399; font-weight: bold;',
-            98 => 'color: #003399; font-weight: bold;',
-            99 => 'color: #003399; font-weight: bold;',
-            100 => 'color: #003399; font-weight: bold;',
-            101 => 'color: #003399; font-weight: bold;',
-            102 => 'color: #003399; font-weight: bold;',
-            103 => 'color: #003399; font-weight: bold;',
-            104 => 'color: #003399; font-weight: bold;',
-            105 => 'color: #003399; font-weight: bold;',
-            106 => 'color: #003399; font-weight: bold;',
-            107 => 'color: #003399; font-weight: bold;',
-            108 => 'color: #003399; font-weight: bold;',
-            109 => 'color: #003399; font-weight: bold;',
-            110 => 'color: #003399; font-weight: bold;',
-            111 => 'color: #003399; font-weight: bold;',
-            112 => 'color: #003399; font-weight: bold;',
-            113 => 'color: #003399; font-weight: bold;',
-            114 => 'color: #003399; font-weight: bold;',
-            115 => 'color: #003399; font-weight: bold;',
-            116 => 'color: #003399; font-weight: bold;',
-            117 => 'color: #003399; font-weight: bold;',
-            118 => 'color: #003399; font-weight: bold;',
-            119 => 'color: #003399; font-weight: bold;',
-            120 => 'color: #003399; font-weight: bold;',
-            121 => 'color: #003399; font-weight: bold;',
-            122 => 'color: #003399; font-weight: bold;',
-            123 => 'color: #003399; font-weight: bold;',
-            124 => 'color: #003399; font-weight: bold;',
-            125 => 'color: #003399; font-weight: bold;',
-            126 => 'color: #003399; font-weight: bold;',
-            127 => 'color: #003399; font-weight: bold;',
-            128 => 'color: #003399; font-weight: bold;',
-            129 => 'color: #003399; font-weight: bold;',
-            130 => 'color: #003399; font-weight: bold;',
-            131 => 'color: #003399; font-weight: bold;',
-            132 => 'color: #003399; font-weight: bold;',
-            133 => 'color: #003399; font-weight: bold;',
-            134 => 'color: #003399; font-weight: bold;',
-            135 => 'color: #003399; font-weight: bold;',
-            136 => 'color: #003399; font-weight: bold;',
-            137 => 'color: #003399; font-weight: bold;',
-            138 => 'color: #003399; font-weight: bold;',
-            139 => 'color: #003399; font-weight: bold;',
-            140 => 'color: #003399; font-weight: bold;',
-            141 => 'color: #003399; font-weight: bold;',
-            142 => 'color: #003399; font-weight: bold;',
-            143 => 'color: #003399; font-weight: bold;',
-            144 => 'color: #003399; font-weight: bold;',
-            145 => 'color: #003399; font-weight: bold;',
-            146 => 'color: #003399; font-weight: bold;',
-            147 => 'color: #003399; font-weight: bold;',
-            148 => 'color: #003399; font-weight: bold;',
-            149 => 'color: #003399; font-weight: bold;',
-            150 => 'color: #003399; font-weight: bold;',
-            151 => 'color: #003399; font-weight: bold;',
-            152 => 'color: #003399; font-weight: bold;',
-            153 => 'color: #003399; font-weight: bold;',
-            154 => 'color: #003399; font-weight: bold;',
-            155 => 'color: #003399; font-weight: bold;',
-            156 => 'color: #003399; font-weight: bold;',
-            157 => 'color: #003399; font-weight: bold;',
-            158 => 'color: #003399; font-weight: bold;',
-            159 => 'color: #003399; font-weight: bold;',
-            160 => 'color: #003399; font-weight: bold;',
-            161 => 'color: #003399; font-weight: bold;',
-            162 => 'color: #003399; font-weight: bold;',
-            163 => 'color: #003399; font-weight: bold;',
-            164 => 'color: #003399; font-weight: bold;',
-            165 => 'color: #003399; font-weight: bold;',
-            166 => 'color: #003399; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #006699;',
-            3 => 'color: #008000; font-style: italic; font-weight: bold;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006633;',
-            2 => 'color: #006633;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => 'http://docs.oracle.com/javase/7/docs/api/java/applet/{FNAME}.html',
-        6 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/{FNAME}.html',
-        7 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/color/{FNAME}.html',
-        8 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/datatransfer/{FNAME}.html',
-        9 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/dnd/{FNAME}.html',
-        10 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/event/{FNAME}.html',
-        11 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/font/{FNAME}.html',
-        12 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/geom/{FNAME}.html',
-        13 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/im/{FNAME}.html',
-        14 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/im/spi/{FNAME}.html',
-        15 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/image/{FNAME}.html',
-        16 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/image/renderable/{FNAME}.html',
-        17 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/print/{FNAME}.html',
-        18 => 'http://docs.oracle.com/javase/7/docs/api/java/beans/{FNAME}.html',
-        19 => 'http://docs.oracle.com/javase/7/docs/api/java/beans/beancontext/{FNAME}.html',
-        20 => 'http://docs.oracle.com/javase/7/docs/api/java/io/{FNAME}.html',
-        21 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/{FNAME}.html',
-        22 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/{FNAME}.html',
-        23 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/{FNAME}.html',
-        24 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/management/{FNAME}.html',
-        25 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/ref/{FNAME}.html',
-        26 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/{FNAME}.html',
-        27 => 'http://docs.oracle.com/javase/7/docs/api/java/math/{FNAME}.html',
-        28 => 'http://docs.oracle.com/javase/7/docs/api/java/net/{FNAME}.html',
-        29 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/{FNAME}.html',
-        30 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/channels/{FNAME}.html',
-        31 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/channels/spi/{FNAME}.html',
-        32 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/charset/{FNAME}.html',
-        33 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/charset/spi/{FNAME}.html',
-        34 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/{FNAME}.html',
-        35 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/activation/{FNAME}.html',
-        36 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/dgc/{FNAME}.html',
-        37 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/registry/{FNAME}.html',
-        38 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/server/{FNAME}.html',
-        39 => 'http://docs.oracle.com/javase/7/docs/api/java/security/{FNAME}.html',
-        40 => 'http://docs.oracle.com/javase/7/docs/api/java/security/acl/{FNAME}.html',
-        41 => 'http://docs.oracle.com/javase/7/docs/api/java/security/cert/{FNAME}.html',
-        42 => 'http://docs.oracle.com/javase/7/docs/api/java/security/interfaces/{FNAME}.html',
-        43 => 'http://docs.oracle.com/javase/7/docs/api/java/security/spec/{FNAME}.html',
-        44 => 'http://docs.oracle.com/javase/7/docs/api/java/sql/{FNAME}.html',
-        45 => 'http://docs.oracle.com/javase/7/docs/api/java/text/{FNAME}.html',
-        46 => 'http://docs.oracle.com/javase/7/docs/api/java/util/{FNAME}.html',
-        47 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/{FNAME}.html',
-        48 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/{FNAME}.html',
-        49 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/locks/{FNAME}.html',
-        50 => 'http://docs.oracle.com/javase/7/docs/api/java/util/jar/{FNAME}.html',
-        51 => 'http://docs.oracle.com/javase/7/docs/api/java/util/logging/{FNAME}.html',
-        52 => 'http://docs.oracle.com/javase/7/docs/api/java/util/prefs/{FNAME}.html',
-        53 => 'http://docs.oracle.com/javase/7/docs/api/java/util/regex/{FNAME}.html',
-        54 => 'http://docs.oracle.com/javase/7/docs/api/java/util/zip/{FNAME}.html',
-        55 => 'http://docs.oracle.com/javase/7/docs/api/javax/accessibility/{FNAME}.html',
-        56 => 'http://docs.oracle.com/javase/7/docs/api/javax/activity/{FNAME}.html',
-        57 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/{FNAME}.html',
-        58 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/interfaces/{FNAME}.html',
-        59 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/spec/{FNAME}.html',
-        60 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/{FNAME}.html',
-        61 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/event/{FNAME}.html',
-        62 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/{FNAME}.html',
-        63 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/plugins/bmp/{FNAME}.html',
-        64 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/plugins/jpeg/{FNAME}.html',
-        65 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/spi/{FNAME}.html',
-        66 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/stream/{FNAME}.html',
-        67 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/{FNAME}.html',
-        68 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/loading/{FNAME}.html',
-        69 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/modelmbean/{FNAME}.html',
-        70 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/monitor/{FNAME}.html',
-        71 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/openmbean/{FNAME}.html',
-        72 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/relation/{FNAME}.html',
-        73 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/remote/{FNAME}.html',
-        74 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/remote/rmi/{FNAME}.html',
-        75 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/timer/{FNAME}.html',
-        76 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/{FNAME}.html',
-        77 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/directory/{FNAME}.html',
-        78 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/event/{FNAME}.html',
-        79 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/ldap/{FNAME}.html',
-        80 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/spi/{FNAME}.html',
-        81 => 'http://docs.oracle.com/javase/7/docs/api/javax/net/{FNAME}.html',
-        82 => 'http://docs.oracle.com/javase/7/docs/api/javax/net/ssl/{FNAME}.html',
-        83 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/{FNAME}.html',
-        84 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/attribute/{FNAME}.html',
-        85 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/attribute/standard/{FNAME}.html',
-        86 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/event/{FNAME}.html',
-        87 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/{FNAME}.html',
-        88 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/CORBA/{FNAME}.html',
-        89 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/ssl/{FNAME}.html',
-        90 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/{FNAME}.html',
-        91 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/callback/{FNAME}.html',
-        92 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/kerberos/{FNAME}.html',
-        93 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/{FNAME}.html',
-        94 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/spi/{FNAME}.html',
-        95 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/x500/{FNAME}.html',
-        96 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/sasl/{FNAME}.html',
-        97 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/midi/{FNAME}.html',
-        98 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/midi/spi/{FNAME}.html',
-        99 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/sampled/{FNAME}.html',
-        100 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/sampled/spi/{FNAME}.html',
-        101 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/{FNAME}.html',
-        102 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/{FNAME}.html',
-        103 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/serial/{FNAME}.html',
-        104 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/spi/{FNAME}.html',
-        105 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/{FNAME}.html',
-        106 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/border/{FNAME}.html',
-        107 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/colorchooser/{FNAME}.html',
-        108 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/event/{FNAME}.html',
-        109 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/filechooser/{FNAME}.html',
-        110 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/{FNAME}.html',
-        111 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/basic/{FNAME}.html',
-        112 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/metal/{FNAME}.html',
-        113 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/multi/{FNAME}.html',
-        114 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/synth/{FNAME}.html',
-        115 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/table/{FNAME}.html',
-        116 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/{FNAME}.html',
-        117 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/html/{FNAME}.html',
-        118 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/html/parser/{FNAME}.html',
-        119 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/rtf/{FNAME}.html',
-        120 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/tree/{FNAME}.html',
-        121 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/undo/{FNAME}.html',
-        122 => 'http://docs.oracle.com/javase/7/docs/api/javax/transaction/{FNAME}.html',
-        123 => 'http://docs.oracle.com/javase/7/docs/api/javax/transaction/xa/{FNAME}.html',
-        124 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/{FNAME}.html',
-        125 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/datatype/{FNAME}.html',
-        126 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/namespace/{FNAME}.html',
-        127 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/parsers/{FNAME}.html',
-        128 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/{FNAME}.html',
-        129 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/dom/{FNAME}.html',
-        130 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/sax/{FNAME}.html',
-        131 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/stream/{FNAME}.html',
-        132 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/validation/{FNAME}.html',
-        133 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/xpath/{FNAME}.html',
-        134 => 'http://docs.oracle.com/javase/7/docs/api/org/ietf/jgss/{FNAME}.html',
-        135 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/{FNAME}.html',
-        136 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/DynAnyPackage/{FNAME}.html',
-        137 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/TypeCodePackage/{FNAME}.html',
-        138 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/portable/{FNAME}.html',
-        139 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/{FNAME}.html',
-        140 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/NamingContextExtPackage/{FNAME}.html',
-        141 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/NamingContextPackage/{FNAME}.html',
-        142 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/Dynamic/{FNAME}.html',
-        143 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/{FNAME}.html',
-        144 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/DynAnyFactoryPackage/{FNAME}.html',
-        145 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/DynAnyPackage/{FNAME}.html',
-        146 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/{FNAME}.html',
-        147 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/CodecFactoryPackage/{FNAME}.html',
-        148 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/CodecPackage/{FNAME}.html',
-        149 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/Messaging/{FNAME}.html',
-        150 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableInterceptor/{FNAME}.html',
-        151 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableInterceptor/ORBInitInfoPackage/{FNAME}.html',
-        152 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/{FNAME}.html',
-        153 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/CurrentPackage/{FNAME}.html',
-        154 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/POAManagerPackage/{FNAME}.html',
-        155 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/POAPackage/{FNAME}.html',
-        156 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/ServantLocatorPackage/{FNAME}.html',
-        157 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/SendingContext/{FNAME}.html',
-        158 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/stub/java/rmi/{FNAME}.html',
-        159 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/{FNAME}.html',
-        160 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/bootstrap/{FNAME}.html',
-        161 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/events/{FNAME}.html',
-        162 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/ls/{FNAME}.html',
-        163 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/{FNAME}.html',
-        164 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/ext/{FNAME}.html',
-        165 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/helpers/{FNAME}.html',
-        /* ambiguous class names (appear in more than one package) */
-        166 => 'http://www.google.com/search?sitesearch=docs.oracle.com&amp;q=allinurl%3Ajavase+docs+api+{FNAME}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        /* Java does not use '::' */
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&"\'])',
-            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-;"\'])'
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/javascript.php b/inc/geshi/javascript.php
deleted file mode 100644
index b96d1b5b6..000000000
--- a/inc/geshi/javascript.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/*************************************************************************************
- * javascript.php
- * --------------
- * Author: Ben Keen (ben.keen@gmail.com)
- * Copyright: (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/20
- *
- * JavaScript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/06/27 (1.0.8.11)
- *  -  Reordered Keyword Groups to reflect syntactical meaning of keywords
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Javascript',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Regular Expressions
-        2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\*)(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])*(?<!\s)\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?!\*)(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            //reserved/keywords; also some non-reserved keywords
-            'break','case','catch','const','continue',
-            'default','delete','do',
-            'else',
-            'finally','for','function',
-            'get','goto',
-            'if','in','instanceof',
-            'new',
-            'prototype',
-            'return',
-            'set','static','switch',
-            'this','throw','try','typeof',
-            'var','void'
-            ),
-        2 => array(
-            //reserved/non-keywords; metaconstants
-            'false','null','true','undefined','NaN','Infinity'
-            ),
-        3 => array(
-            //magic properties/functions
-            '__proto__','__defineGetter__','__defineSetter__','hasOwnProperty','hasProperty'
-            ),
-        4 => array(
-            //type constructors
-            'Object', 'Function', 'Date', 'Math', 'String', 'Number', 'Boolean', 'Array'
-            ),
-        5 => array(
-            //reserved, but invalid in language
-            'abstract','boolean','byte','char','class','debugger','double','enum','export','extends',
-            'final','float','implements','import','int','interface','long','native',
-            'short','super','synchronized','throws','transient','volatile'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '+', '-', '*', '/', '%',
-        '!', '@', '&', '|', '^',
-        '<', '>', '=',
-        ',', ';', '?', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066; font-weight: bold;',
-            2 => 'color: #003366; font-weight: bold;',
-            3 => 'color: #000066;',
-            5 => 'color: #FF0000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #006600; font-style: italic;',
-            2 => 'color: #009966; font-style: italic;',
-            'MULTI' => 'color: #006600; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #3366CC;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #CC0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #660066;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-    ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<script type="text/javascript">' => '</script>'
-            ),
-        1 => array(
-            '<script language="javascript">' => '</script>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/jquery.php b/inc/geshi/jquery.php
deleted file mode 100644
index a75320d5c..000000000
--- a/inc/geshi/jquery.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/*************************************************************************************
- * jquery.php
- * --------------
- * Author: Rob Loach (http://www.robloach.net)
- * Copyright: (c) 2009 Rob Loach (http://www.robloach.net)
- * Release Version: 1.0.8.11
- * Date Started: 2009/07/20
- *
- * jQuery 1.3 language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/07/20 (1.0.8.5)
- *  -  First Release
- *
- * TODO (updated 2009/07/20)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'jQuery',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    //Regular Expressions
-    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
-            'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
-            'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
-            'while', 'write', 'with'
-            ),
-        2 => array(
-            'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
-            'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
-            'protected', 'public', 'super', 'true', 'use', 'var'
-            ),
-        3 => array(
-            // common functions for Window object
-            'alert', 'back', 'close', 'confirm', 'forward', 'home',
-            'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
-            'onresize', 'onunload', 'open', 'print', 'prompt', 'status',
-            //'blur', 'focus', 'scroll', // Duplicate with kw9
-            //'stop', //Duplicate with kw10
-            ),
-        4 => array(
-            // jQuery Core Functions
-            'jQuery', 'each', 'size', 'length', 'selector', 'context', 'eq',
-            'index', 'data', 'removeData', 'queue', 'dequeue', 'noConflict'
-            //'get', //Duplicate with kw11
-            ),
-        5 => array(
-            // jQuery Attribute Functions
-            'attr', 'removeAttr', 'addClass', 'hasClass', 'removeClass', 'toggleClass',
-            'html', 'text', 'val',
-            ),
-        6 => array(
-            // jQuery Traversing Functions
-            'filter', 'not', 'slice', 'add', 'children', 'closest',
-            'contents', 'find', 'next', 'nextAll', 'parent', 'parents',
-            'prev', 'prevAll', 'siblings', 'andSelf', 'end',
-            //'is',  //Dup with kw1
-            //'offsetParent', //Duplicate with kw8
-            //'map', //Duplicate with kw12
-            ),
-        7 => array(
-            // jQuery Manipulation Functions
-            'append', 'appendTo', 'prepend', 'prependTo', 'after', 'before', 'insertAfter',
-            'insertBefore', 'wrap', 'wrapAll', 'wrapInner', 'replaceWith', 'replaceAll',
-            'empty', 'remove', 'clone',
-            ),
-        8 => array(
-            // jQuery CSS Functions
-            'css', 'offset', 'offsetParent', 'position', 'scrollTop', 'scrollLeft',
-            'height', 'width', 'innerHeight', 'innerWidth', 'outerHeight', 'outerWidth',
-            ),
-        9 => array(
-            // jQuery Events Functions
-            'ready', 'bind', 'one', 'trigger', 'triggerHandler', 'unbind', 'live',
-            'die', 'hover', 'blur', 'change', 'click', 'dblclick', 'error',
-            'focus', 'keydown', 'keypress', 'keyup', 'mousedown', 'mouseenter',
-            'mouseleave', 'mousemove', 'mouseout', 'mouseover', 'mouseup', 'resize',
-            'scroll', 'select', 'submit', 'unload',
-            //'toggle', //Duplicate with kw10
-            //'load', //Duplicate with kw11
-            ),
-        10 => array(
-            // jQuery Effects Functions
-            'show', 'hide', 'toggle', 'slideDown', 'slideUp', 'slideToggle', 'fadeIn',
-            'fadeOut', 'fadeTo', 'animate', 'stop',
-            ),
-        11 => array(
-            // jQuery Ajax Functions
-            'ajax', 'load', 'get', 'getJSON', 'getScript', 'post', 'ajaxComplete',
-            'ajaxError', 'ajaxSend', 'ajaxStart', 'ajaxStop', 'ajaxSuccess', 'ajaxSetup',
-            'serialize', 'serializeArray',
-            ),
-        12 => array(
-            // jQuery Utility Functions
-            'support', 'browser', 'version', 'boxModal', 'extend', 'grep', 'makeArray',
-            'map', 'inArray', 'merge', 'unique', 'isArray', 'isFunction', 'trim',
-            'param',
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '(', ')', '[', ']', '{', '}',
-            '+', '-', '*', '/', '%',
-            '!', '@', '&', '|', '^',
-            '<', '>', '=',
-            ',', ';', '?', ':'
-            ),
-        1 => array(
-            '$'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        9 => false,
-        10 => false,
-        11 => false,
-        12 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066; font-weight: bold;',
-            2 => 'color: #003366; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #000066;',
-            5 => 'color: #000066;',
-            6 => 'color: #000066;',
-            7 => 'color: #000066;',
-            8 => 'color: #000066;',
-            9 => 'color: #000066;',
-            10 => 'color: #000066;',
-            11 => 'color: #000066;',
-            12 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #006600; font-style: italic;',
-            2 => 'color: #009966; font-style: italic;',
-            'MULTI' => 'color: #006600; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #3366CC;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #CC0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #660066;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            1 => 'color: #000066;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => 'http://docs.jquery.com/Core/{FNAME}',
-        5 => 'http://docs.jquery.com/Attributes/{FNAME}',
-        6 => 'http://docs.jquery.com/Traversing/{FNAME}',
-        7 => 'http://docs.jquery.com/Manipulation/{FNAME}',
-        8 => 'http://docs.jquery.com/CSS/{FNAME}',
-        9 => 'http://docs.jquery.com/Events/{FNAME}',
-        10 => 'http://docs.jquery.com/Effects/{FNAME}',
-        11 => 'http://docs.jquery.com/Ajax/{FNAME}',
-        12 => 'http://docs.jquery.com/Utilities/{FNAME}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<script type="text/javascript">' => '</script>'
-            ),
-        1 => array(
-            '<script language="javascript">' => '</script>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/kixtart.php b/inc/geshi/kixtart.php
deleted file mode 100644
index 5b9091989..000000000
--- a/inc/geshi/kixtart.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/*************************************************************************************
- * kixtart.php
- * --------
- * Author: Riley McArdle (riley@glyff.net)
- * Copyright: (c) 2007 Riley McArdle (http://www.glyff.net/)
- * Release Version: 1.0.8.11
- * Date Started: 2007/08/31
- *
- * PHP language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2007/08/31 (1.0.7.22)
- *  -  First Release
- *
- * TODO (updated 2007/08/31)
- * -------------------------
- * *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'KiXtart',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'While', 'Loop',
-            'Use',
-            'Small',
-            'Sleep',
-            'Shell',
-            'SetTime',
-            'SetM',
-            'SetL',
-            'Set',
-            'Select', 'Case',
-            'Run',
-            'Return',
-            'Redim',
-            'RD',
-            'Quit',
-            'Play',
-            'Move',
-            'MD',
-            'Include',
-            'If', 'Else', 'Endif',
-            'GoTo',
-            'GoSub',
-            'Go',
-            'Global',
-            'GetS',
-            'Get',
-            'Function', 'Endfunction',
-            'For', 'Next',
-            'Each',
-            'FlushKb',
-            'Exit',
-            'Do', 'Until',
-            'Display',
-            'Dim',
-            'Del',
-            'Debug',
-            'Copy',
-            'Cookie1',
-            'Color',
-            'CLS',
-            'CD',
-            'Call',
-            'Break',
-            'Big',
-            'Beep',
-            ),
-        2 => array(
-            '@Address',
-            '@Build',
-            '@Color',
-            '@Comment',
-            '@CPU',
-            '@CRLF',
-            '@CSD',
-            '@CurDir',
-            '@Date',
-            '@Day',
-            '@Domain',
-            '@DOS',
-            '@Error',
-            '@FullName',
-            '@HomeDir',
-            '@HomeDrive',
-            '@HomeShr',
-            '@HostName',
-            '@InWin',
-            '@IPaddressX',
-            '@KiX',
-            '@LanRoot',
-            '@LDomain',
-            '@LDrive',
-            '@LM',
-            '@LogonMode',
-            '@LongHomeDir',
-            '@LServer',
-            '@MaxPWAge',
-            '@MDayNo',
-            '@MHz',
-            '@MonthNo',
-            '@Month',
-            '@MSecs',
-            '@OnWoW64',
-            '@PID',
-            '@PrimaryGroup',
-            '@Priv',
-            '@ProductSuite',
-            '@ProductType',
-            '@PWAge',
-            '@RAS',
-            '@Result',
-            '@RServer',
-            '@ScriptDir',
-            '@ScriptExe',
-            '@ScriptName',
-            '@SError',
-            '@SID',
-            '@Site',
-            '@StartDir',
-            '@SysLang',
-            '@Ticks',
-            '@Time',
-            '@TsSession',
-            '@UserID',
-            '@UserLang',
-            '@WDayNo',
-            '@Wksta',
-            '@WUserID',
-            '@YDayNo',
-            '@Year',
-            ),
-        3 => array(
-            'WriteValue',
-            'WriteProfileString',
-            'WriteLine',
-            'VarTypeName',
-            'VarType',
-            'Val',
-            'UnloadHive',
-            'UCase',
-            'Ubound',
-            'Trim',
-            'Substr',
-            'SRnd',
-            'Split',
-            'SidToName',
-            'ShutDown',
-            'ShowProgramGroup',
-            'SetWallpaper',
-            'SetTitle',
-            'SetSystemState',
-            'SetOption',
-            'SetFocus',
-            'SetFileAttr',
-            'SetDefaultPrinter',
-            'SetConsole',
-            'SetAscii',
-            'SendMessage',
-            'SendKeys',
-            'SaveKey',
-            'RTrim',
-            'Round',
-            'Rnd',
-            'Right',
-            'RedirectOutput',
-            'ReadValue',
-            'ReadType',
-            'ReadProfileString',
-            'ReadLine',
-            'Open',
-            'MessageBox',
-            'MemorySize',
-            'LTrim',
-            'Logoff',
-            'LogEvent',
-            'LoadKey',
-            'LoadHive',
-            'Len',
-            'Left',
-            'LCase',
-            'KeyExist',
-            'KbHit',
-            'Join',
-            'IsDeclared',
-            'Int',
-            'InStrRev',
-            'InStr',
-            'InGroup',
-            'IIF',
-            'GetObject',
-            'GetFileVersion',
-            'GetFileTime',
-            'GetFileSize',
-            'GetFileAttr',
-            'GetDiskSpace',
-            'FreeFileHandle',
-            'FormatNumber',
-            'Fix',
-            'ExpandEnvironmentVars',
-            'Exist',
-            'Execute',
-            'EnumValue',
-            'EnumLocalGroup',
-            'EnumKey',
-            'EnumIpInfo',
-            'EnumGroup',
-            'Dir',
-            'DelValue',
-            'DelTree',
-            'DelProgramItem',
-            'DelProgramGroup',
-            'DelPrinterConnection',
-            'DelKey',
-            'DecToHex',
-            'CStr',
-            'CreateObject',
-            'CompareFileTimes',
-            'Close',
-            'ClearEventLog',
-            'CInt',
-            'Chr',
-            'CDbl',
-            'Box',
-            'BackupEventLog',
-            'At',
-            'AScan',
-            'Asc',
-            'AddProgramItem',
-            'AddProgramGroup',
-            'AddPrinterConnection',
-            'AddKey',
-            'Abs'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '?', ':', '+', '-', '*', '/', '&', '|', '^', '~', '<', '>', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.kixtart.org/manual/Commands/{FNAMEL}.htm',
-        2 => '',
-        3 => 'http://www.kixtart.org/manual/Functions/{FNAMEL}.htm'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/klonec.php b/inc/geshi/klonec.php
deleted file mode 100644
index 5f86e78dc..000000000
--- a/inc/geshi/klonec.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/*************************************************************************************
- * klonec.php
- * --------
- * Author: AUGER Mickael
- * Copyright: Synchronic
- * Release Version: 1.0.8.11
- * Date Started: 2008/04/16
- *
- * KLone with C language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/04/16 (1.0.8)
- *  -  First Release
- *
- * TODO (updated 2008/04/16)
- * -------------------------
- * A tester et a completer si besoin
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'KLone C',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
-    'COMMENT_MULTI' => array('/*' => '*/', '<!--' => '-->' ),//comentaires C et KLone suivi de ceux pour HTML
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(//mots-cles C
-            'if', 'return', 'while', 'case', 'class', 'continue', 'default',
-            'do', 'else', 'for', 'switch', 'goto',
-            'null', 'break', 'true', 'enum', 'extern', 'inline', 'false'
-            ),
-        2 => array(//mots-cles KLone
-            'out', 'request', 'response',
-            ),
-        3 => array(//fonctions C usuelles
-            'printf', 'malloc', 'fopen', 'fclose', 'free', 'fputs', 'fgets', 'feof', 'fwrite',
-            'perror', 'ferror', 'qsort', 'stats', 'sscanf', 'scanf',
-            'strdup', 'strcpy', 'strcmp', 'strncpy', 'strcasecmp', 'cat', 'strcat', 'strstr',
-            'strlen', 'strtof', 'strtod', 'strtok', 'towlower', 'towupper',
-            'cd', 'system', 'exit', 'exec', 'fork', 'vfork', 'kill', 'signal', 'syslog',
-            'usleep', 'utime', 'wait', 'waitpid', 'waitid',
-            'ceil', 'eval', 'round', 'floor',
-            'atoi', 'atol', 'abs', 'cos', 'sin', 'tan', 'acos', 'asin', 'atan', 'exp',
-            'time', 'ctime', 'localtime', 'asctime', 'gmtime', 'difftime', 'date'
-            ),
-        4 => array(//fonctions KLone usuelles
-            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
-            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
-            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
-            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
-            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
-            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
-            'request_get_header', 'request_get_field', 'request_get_field_value',
-            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
-            'response_set_cookie', 'response_set_method', 'response_get_method',
-            'response_print_header', 'response_set_field', 'response_del_field',
-            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
-            'response_set_content_length', 'response_get_status', 'response_get_header',
-            'response_io', 'response_redirect', 'response_set_status',
-            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
-            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
-            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
-            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
-            'io_codecs_remove', 'io_name_set', 'io_name_get'
-            ),
-        5 => array(//types C
-            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
-            'register', 'short', 'signed', 'sizeof', 'static', 'string', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile',
-            'wchar_t', 'time_t', 'FILE'
-            ),
-        6 => array(//mots-cles HTML
-            'a', 'abbr', 'acronym', 'address', 'applet',
-
-            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
-
-            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
-
-            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
-
-            'em',
-
-            'fieldset', 'font', 'form', 'frame', 'frameset',
-
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
-
-            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
-
-            'kbd',
-
-            'label', 'legend', 'link', 'li',
-
-            'map', 'meta',
-
-            'noframes', 'noscript',
-
-            'object', 'ol', 'optgroup', 'option',
-
-            'param', 'pre', 'p',
-
-            'q',
-
-            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
-
-            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
-
-            'ul', 'u',
-
-            'var',
-            ),
-        7 => array(//autres mots-cles HTML
-            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
-            'background', 'bgcolor', 'border',
-            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
-            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
-            'enctype',
-            'face', 'for', 'frame', 'frameborder',
-            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
-            'id', 'ismap',
-            'label', 'lang', 'language', 'link', 'longdesc',
-            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
-            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
-            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
-            'profile', 'prompt',
-            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
-            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
-            'tabindex', 'target', 'text', 'title', 'type',
-            'usemap',
-            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
-            'width'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '<%=', '<%!', '<%', '%>'
-            ),
-        0 => array(
-            '(', ')', '[', ']', '{', '}',
-            '!', '%', '&', '|', '/',
-            '<', '>',
-            '=', '-', '+', '*',
-            '.', ':', ',', ';', '^'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C
-            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
-            3 => 'color: #6600FF;',//pour les fonctions C
-            4 => 'color: #6600FF;',//pour les fonctions Klone
-            5 => 'color: #0099FF; font-weight: bold;',//pour les types C
-            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
-            7 => 'color: #000066;'//pour les autres mots-cles HTML
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C et KLone
-            2 => 'color: #339933;',//pour les #... en C
-            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C et KLone
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;',
-            1 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array(
-            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
-            1 => '',
-            2 => '',
-            3 => 'color: #00bbdd; font-weight: bold;',
-            4 => 'color: #ddbb00;',
-            5 => 'color: #009900;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
-        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
-        5 => '',
-        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
-        7 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        //delimiteurs pour KLone
-        0 => array(
-            '<%=' => '%>'
-            ),
-        1 => array(
-            '<%!' => '%>'
-            ),
-        2 => array(
-            '<%' => '%>'
-            ),
-        //delimiteur pour HTML
-        3 => array(
-            '<!DOCTYPE' => '>'
-            ),
-        4 => array(
-            '&' => ';'
-            ),
-        5 => array(
-            '<' => '>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => false,
-        1 => true,
-        2 => true,
-        3 => false,
-        4 => false,
-        5 => true
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-            ),
-            7 => array(
-                'DISALLOWED_AFTER' => '(?=\s*=)',
-            )
-        )
-    )
-);
-
-?>
diff --git a/inc/geshi/klonecpp.php b/inc/geshi/klonecpp.php
deleted file mode 100644
index 6564c6b7b..000000000
--- a/inc/geshi/klonecpp.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-/*************************************************************************************
- * klonecpp.php
- * --------
- * Author: AUGER Mickael
- * Copyright: Synchronic
- * Release Version: 1.0.8.11
- * Date Started: 2008/04/16
- *
- * KLone with C++ language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/04/16 (1.0.8)
- *  -  First Release
- *
- * TODO (updated 2008/04/16)
- * -------------------------
- * A tester et a completer si besoin
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'KLone C++',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
-    'COMMENT_MULTI' => array('/*' => '*/', '<!--' => '-->' ),//comentaires C et KLone suivi de ceux pour HTML
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(//mots-cles C++
-            'if', 'return', 'while', 'case', 'continue', 'default',
-            'do', 'else', 'for', 'switch', 'goto',
-            'break', 'true', 'enum', 'extern', 'inline', 'false',
-            'errno', 'stdin', 'stdout', 'stderr',
-            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
-            'try', 'catch', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
-            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class',
-            'EDOM', 'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
-            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
-            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
-            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
-            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
-            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
-            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
-            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
-            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam', 'NULL',
-            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX',
-            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC'
-            ),
-        2 => array(//mots-cles KLone
-            'out', 'request', 'response',
-            ),
-        3 => array(//fonctions C++ usuelles
-            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
-            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
-            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
-            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
-            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
-            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
-            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
-            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
-            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
-            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
-            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
-            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
-            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
-            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
-            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
-            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
-            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
-            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
-            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
-            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
-            ),
-        4 => array(//fonctions KLone usuelles
-            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
-            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
-            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
-            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
-            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
-            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
-            'request_get_header', 'request_get_field', 'request_get_field_value',
-            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
-            'response_set_cookie', 'response_set_method', 'response_get_method',
-            'response_print_header', 'response_set_field', 'response_del_field',
-            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
-            'response_set_content_length', 'response_get_status', 'response_get_header',
-            'response_io', 'response_redirect', 'response_set_status',
-            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
-            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
-            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
-            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
-            'io_codecs_remove', 'io_name_set', 'io_name_get'
-            ),
-        5 => array(//types C++
-            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
-            'register', 'short', 'shortint', 'signed', 'static', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'jmp_buf',
-            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
-            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm',
-            'string', 'wchar_t'
-            ),
-        6 => array(//mots-cles HTML
-            'a', 'abbr', 'acronym', 'address', 'applet',
-
-            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
-
-            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
-
-            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
-
-            'em',
-
-            'fieldset', 'font', 'form', 'frame', 'frameset',
-
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
-
-            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
-
-            'kbd',
-
-            'label', 'legend', 'link', 'li',
-
-            'map', 'meta',
-
-            'noframes', 'noscript',
-
-            'object', 'ol', 'optgroup', 'option',
-
-            'param', 'pre', 'p',
-
-            'q',
-
-            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
-
-            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
-
-            'ul', 'u',
-
-            'var',
-            ),
-        7 => array(//autres mots-cles HTML
-            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
-            'background', 'bgcolor', 'border',
-            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
-            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
-            'enctype',
-            'face', 'for', 'frame', 'frameborder',
-            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
-            'id', 'ismap',
-            'label', 'lang', 'language', 'link', 'longdesc',
-            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
-            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
-            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
-            'profile', 'prompt',
-            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
-            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
-            'tabindex', 'target', 'text', 'title', 'type',
-            'usemap',
-            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
-            'width'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '<%=', '<%!', '<%', '%>'
-            ),
-        0 => array(
-            '(', ')', '[', ']', '{', '}',
-            '!', '%', '&', '|', '/',
-            '<', '>',
-            '=', '-', '+', '*',
-            '.', ':', ',', ';', '^'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C++
-            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
-            3 => 'color: #6600FF;',//pour les fonctions C++
-            4 => 'color: #6600FF;',//pour les fonctions Klone
-            5 => 'color: #0099FF; font-weight: bold;',//pour les types C++
-            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
-            7 => 'color: #000066;'//pour les autres mots-cles HTML
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C++ et KLone
-            2 => 'color: #339933;',//pour les #... en C++
-            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C++ et KLone
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;',
-            1 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array(
-            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
-            1 => '',
-            2 => '',
-            3 => 'color: #00bbdd; font-weight: bold;',
-            4 => 'color: #ddbb00;',
-            5 => 'color: #009900;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
-        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
-        5 => '',
-        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
-        7 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        //delimiteurs pour KLone
-        0 => array(
-            '<%=' => '%>'
-            ),
-        1 => array(
-            '<%!' => '%>'
-            ),
-        2 => array(
-            '<%' => '%>'
-            ),
-        //delimiteur pour HTML
-        3 => array(
-            '<!DOCTYPE' => '>'
-            ),
-        4 => array(
-            '&' => ';'
-            ),
-        5 => array(
-            '<' => '>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => false,
-        1 => true,
-        2 => true,
-        3 => false,
-        4 => false,
-        5 => true
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-            ),
-            7 => array(
-                'DISALLOWED_AFTER' => '(?=\s*=)',
-            )
-        )
-    )
-);
-
-?>
diff --git a/inc/geshi/latex.php b/inc/geshi/latex.php
deleted file mode 100644
index 386a0b989..000000000
--- a/inc/geshi/latex.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/*************************************************************************************
- * latex.php
- * -----
- * Author: efi, Matthias Pospiech (matthias@pospiech.eu)
- * Copyright: (c) 2006 efi, Matthias Pospiech (matthias@pospiech.eu), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2006/09/23
- *
- * LaTeX language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/08/18 (1.0.8.1)
- *  - Changes in color and some additional command recognition
- *  - No special Color for Brackets, it is only distracting
- *    if color should be reintroduced it should be less bright
- *  - Math color changed from green to violett, since green is now used for comments
- *  - Comments are now colored and the only green. The reason for coloring the comments
- *    is that often important information is in the comments und was merely unvisible before.
- *  - New Color for [Options]
- *  - color for labels not specialised anymore. It makes sence in large documents but less in
- *    small web examples.
- *  - \@keyword introduced
- *  - Fixed \& escaped ampersand
- * 2006/09/23 (1.0.0)
- *  -  First Release
- *
- * TODO
- * -------------------------
- * *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'LaTeX',
-    'COMMENT_SINGLE' => array(
-        1 => '%'
-        ),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'addlinespace','and','address','appendix','author','backmatter',
-            'bfseries','bibitem','bigskip','blindtext','caption','captionabove',
-            'captionbelow','cdot','centering','chapter','cite','color',
-            'colorbox','date','dedication','def','definecolor','documentclass',
-            'edef','else','email','emph','eqref','extratitle','fbox','fi',
-            'flushleft','flushright','footnote','frac','frontmatter',
-            'graphicspath','hfil','hfill','hfilll','hline','hspace','huge','ifx','include',
-            'includegraphics','infty','input','int','item','itemsep',
-            'KOMAoption','KOMAoptions','label','LaTeX','left','let','limits',
-            'listfiles','listoffigures','listoftables','lowertitleback',
-            'mainmatter','makeatletter','makeatother','makebox','makeindex',
-            'maketitle','mbox','mediumskip','newcommand','newenvironment',
-            'newpage','nocite','nonumber','pagestyle','par','paragraph',
-            'parbox','parident','parskip','partial','publishers','raggedleft',
-            'raggedright','raisebox','ref','renewcommand','renewenvironment',
-            'right','rule','section','setlength','sffamily','subject',
-            'subparagraph','subsection','subsubsection','subtitle','sum',
-            'table','tableofcontents','textbf','textcolor','textit',
-            'textnormal','textsuperscript','texttt','textwidth','thanks','title',
-            'titlehead','today','ttfamily','uppertitleback','urlstyle',
-            'usepackage','vfil','vfill','vfilll','vspace'
-            )
-        ),
-    'SYMBOLS' => array(
-        "&", "\\", "{", "}", "[", "]"
-        ),
-    'CASE_SENSITIVE' => array(
-        1 => true,
-        GESHI_COMMENTS => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #800000;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #2C922C; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 =>  'color: #000000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            ),
-        'STRINGS' => array(
-            0 =>  'color: #000000;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 =>  'color: #E02020; '
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #8020E0; font-weight: normal;',  // Math inner
-            2 => 'color: #C08020; font-weight: normal;', // [Option]
-            3 => 'color: #8020E0; font-weight: normal;', // Maths
-            4 => 'color: #800000; font-weight: normal;', // Structure: Labels
-            5 => 'color: #00008B; font-weight: bold;',  // Structure (\section{->x<-})
-            6 => 'color: #800000; font-weight: normal;', // Structure (\section)
-            7 => 'color: #0000D0; font-weight: normal;', // Environment \end or \begin{->x<-} (brighter blue)
-            8 => 'color: #C00000; font-weight: normal;', // Structure \end or \begin
-            9 => 'color: #2020C0; font-weight: normal;', // {...}
-            10 => 'color: #800000; font-weight: normal;', // \%, \& etc.
-            11 => 'color: #E00000; font-weight: normal;', // \@keyword
-            12 => 'color: #800000; font-weight: normal;', // \keyword
-        ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.golatex.de/wiki/index.php?title=%5C{FNAME}',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        // Math inner
-        1 => array(
-            GESHI_SEARCH => "(\\\\begin\\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign)\\})(.*)(\\\\end\\{\\2\\})",
-            GESHI_REPLACE => '\3',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\4'
-            ),
-        // [options]
-        2 => array(
-            GESHI_SEARCH => "(?<=\[).*(?=\])",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // Math mode with $ ... $
-        3 => array(
-            GESHI_SEARCH => "\\$.+\\$",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // Structure: Label
-        4 => "\\\\(?:label|pageref|ref|cite)(?=[^a-zA-Z])",
-        // Structure: sections
-        5 => array(
-            GESHI_SEARCH => "(\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?\\{)(.*)(?=\\})",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'U',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        // Structure: sections
-        6 => "\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?(?=[^a-zA-Z])",
-        // environment \begin{} and \end{} (i.e. the things inside the {})
-        7 => array(
-            GESHI_SEARCH => "(\\\\(?:begin|end)\\{)(.*)(?=\\})",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'U',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        // Structure \begin and \end
-        8 => "\\\\(?:end|begin)(?=[^a-zA-Z])",
-        // {parameters}
-        9 => array(
-            GESHI_SEARCH => "(?<=\\{)(?!<\|!REG3XP5!>).*?(?=\\})",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // \%, \& usw.
-        10 => "\\\\(?:[_$%]|&amp;)",
-        //  \@keywords
-        11 => "(?<!<\|!REG3XP[8]!>)\\\\@[a-zA-Z]+\*?",
-        // \keywords
-        12 => "(?<!<\|!REG3XP[468]!>)\\\\[a-zA-Z]+\*?",
-
-// ---------------------------------------------
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '\\'
-        ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<=\\\\)",
-            'DISALLOWED_AFTER' => "(?![A-Za-z0-9])"
-        ),
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER,
-            'BRACKETS' => GESHI_NEVER
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/lb.php b/inc/geshi/lb.php
deleted file mode 100644
index 6c2882894..000000000
--- a/inc/geshi/lb.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/*************************************************************************************
- * lb.php
- * --------
- * Author: Chris Iverson (cj.no.one@gmail.com)
- * Copyright: (c) 2010 Chris Iverson
- * Release Version: 1.0.8.11
- * Date Started: 2010/07/18
- *
- * Liberty BASIC language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/22
- *  -  First Release
- *
- * 2010/08/23
- *  -  Added missing default variables
- *
- * TODO (updated 2010/07/20)
- * -------------------------
- * Prevent highlighting numbers in handle names(constants beginning with #)
- * Allow number highlighting after a single period(e.g.  .9 = 0.9, should be
- *     highlighted
- * Prevent highlighting keywords within branch labels(within brackets)
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Liberty BASIC',
-    'COMMENT_SINGLE' => array(1 => '\''),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'and', 'append', 'as', 'beep', 'bmpbutton', 'bmpsave', 'boolean',
-            'button', 'byref', 'call', 'callback', 'calldll', 'callfn', 'case',
-            'checkbox', 'close', 'cls', 'colordialog', 'combobox', 'confirm',
-            'cursor', 'data', 'dialog', 'dim', 'dll', 'do', 'double', 'dump',
-            'dword', 'else', 'end', 'error', 'exit', 'field', 'filedialog',
-            'files', 'fontdialog', 'for', 'function', 'get', 'gettrim',
-            'global', 'gosub', 'goto', 'graphicbox', 'graphics', 'groupbox',
-            'if', 'input', 'kill', 'let', 'line', 'listbox', 'loadbmp',
-            'locate', 'long', 'loop', 'lprint', 'mainwin', 'maphandle', 'menu',
-            'mod', 'name', 'next', 'nomainwin', 'none', 'notice', 'on',
-            'oncomerror', 'or', 'open', 'out', 'output', 'password', 'playmidi',
-            'playwave', 'popupmenu', 'print', 'printerdialog', 'prompt', 'ptr',
-            'put', 'radiobutton', 'random', 'randomize', 'read', 'readjoystick',
-            'redim', 'rem', 'restore', 'resume', 'return', 'run', 'scan',
-            'seek', 'select', 'short', 'sort', 'statictext', 'stop', 'stopmidi',
-            'struct', 'stylebits', 'sub', 'text', 'textbox', 'texteditor',
-            'then', 'timer', 'titlebar', 'to', 'trace', 'ulong', 'unloadbmp',
-            'until', 'ushort', 'void', 'wait', 'window', 'wend', 'while',
-            'word', 'xor'
-            ),
-        2 => array(
-            'abs', 'acs', 'asc', 'asn', 'atn', 'chr$', 'cos', 'date$',
-            'dechex$', 'eof', 'eval', 'eval$', 'exp', 'hbmp', 'hexdec', 'hwnd',
-            'inp', 'input$', 'inputto$', 'instr', 'int', 'left$', 'len', 'lof',
-            'log', 'lower$', 'max', 'midipos', 'mid$', 'min', 'mkdir', 'not',
-            'right$', 'rmdir', 'rnd', 'sin', 'space$', 'sqr', 'str$', 'tab',
-            'tan', 'time$', 'trim$', 'txcount', 'upper$', 'using', 'val',
-            'winstring', 'word$'
-            ),
-        3 => array(
-            'BackgroundColor$', 'Com', 'ComboboxColor$', 'ComError', 'ComErrorNumber',
-            'CommandLine$', 'ComPortNumber', 'DefaultDir$',
-            'DisplayHeight', 'DisplayWidth', 'Drives$', 'Err', 'Err$',
-            'ForegroundColor$', 'Inkey$', 'Joy1x', 'Joy1y', 'Joy1z',
-            'Joy1button1', 'Joy1button2', 'Joy2x', 'Joy2y', 'Joy2z',
-            'Joy2button1', 'Joy2button2', 'ListboxColor$', 'MouseX', 'MouseY', 'Platform$',
-            'PrintCollate', 'PrintCopies', 'PrinterFont$', 'PrinterName$', 'StartupDir$',
-            'TextboxColor$', 'TexteditorColor$', 'Version$', 'WindowHeight',
-            'WindowWidth', 'UpperLeftX', 'UpperLeftY'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', ':', ',', '#'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #AD0080;',
-            3 => 'color: #008080;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #008000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            2 => array(
-                //In LB, the second keyword list is a list of built-in functions,
-                //and their names should not be highlighted unless being used
-                //as a function name.
-                'DISALLOWED_AFTER' => '(?=\s*\()'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/ldif.php b/inc/geshi/ldif.php
deleted file mode 100644
index 424818380..000000000
--- a/inc/geshi/ldif.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*************************************************************************************
- * ldif.php
- * --------
- * Author: Bruno Harbulot (Bruno.Harbulot@manchester.ac.uk)
- * Copyright: (c) 2005 deguix, (c) 2010 Bruno Harbulot
- * Release Version: 1.0.8.11
- * Date Started: 2010/03/01
- *
- * LDIF language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/03/01 (1.0.8.11)
- *   -  First Release
- *   -  Derived from ini.php (INI language), (c) 2005 deguix
- *
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'LDIF',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => ''
-            ),
-        'STRINGS' => array(
-            0 => 'color: #933;'
-            ),
-        'NUMBERS' => array(
-            0 => ''
-            ),
-        'METHODS' => array(
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000066; font-weight: bold;',
-            1 => 'color: #FF0000;'
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => array(
-            GESHI_SEARCH => '([a-zA-Z0-9_]+):(.+)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ':\\2'
-            ),
-        1 => array(
-            // Evil hackery to get around GeSHi bug: <>" and ; are added so <span>s can be matched
-            // Explicit match on variable names because if a comment is before the first < of the span
-            // gets chewed up...
-            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+):(.+)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1:',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/lisp.php b/inc/geshi/lisp.php
deleted file mode 100644
index be823a405..000000000
--- a/inc/geshi/lisp.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/*************************************************************************************
- * lisp.php
- * --------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * Generic Lisp language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/12/9  (1.0.2)
- *  -  Added support for :keywords and ::access (Denis Mashkevich)
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/08/30 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Lisp',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(';|' => '|;'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'not','defun','princ','when',
-            'eval','apply','funcall','quote','identity','function',
-            'complement','backquote','lambda','set','setq','setf',
-            'defmacro','gensym','make','symbol','intern',
-            'name','value','plist','get',
-            'getf','putprop','remprop','hash','array','aref',
-            'car','cdr','caar','cadr','cdar','cddr','caaar','caadr','cadar',
-            'caddr','cdaar','cdadr','cddar','cdddr','caaaar','caaadr',
-            'caadar','caaddr','cadaar','cadadr','caddar','cadddr',
-            'cdaaar','cdaadr','cdadar','cdaddr','cddaar','cddadr',
-            'cdddar','cddddr','cons','list','append','reverse','last','nth',
-            'nthcdr','member','assoc','subst','sublis','nsubst',
-            'nsublis','remove','length',
-            'mapc','mapcar','mapl','maplist','mapcan','mapcon','rplaca',
-            'rplacd','nconc','delete','atom','symbolp','numberp',
-            'boundp','null','listp','consp','minusp','zerop','plusp',
-            'evenp','oddp','eq','eql','equal','cond','case','and','or',
-            'let','l','if','prog','prog1','prog2','progn','go','return',
-            'do','dolist','dotimes','catch','throw','error','cerror','break',
-            'continue','errset','baktrace','evalhook','truncate','float',
-            'rem','min','max','abs','sin','cos','tan','expt','exp','sqrt',
-            'random','logand','logior','logxor','lognot','bignums','logeqv',
-            'lognand','lognor','logorc2','logtest','logbitp','logcount',
-            'integer','nil','parse-integer','make-list','print','write'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']',
-        '!', '%', '^', '&',
-        ' + ',' - ',' * ',' / ',
-        '=','<','>',
-        '.',':',',',';',
-        '|'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #555;',
-            1 => 'color: #555;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        '::', ':'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'OOLANG' => array(
-            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/llvm.php b/inc/geshi/llvm.php
deleted file mode 100644
index 580099b52..000000000
--- a/inc/geshi/llvm.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/*************************************************************************************
- * llvm.php
- * --------
- * Author: Benny Baumann (BenBE@geshi.org), Azriel Fasten (azriel.fasten@gmail.com)
- * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/), Azriel Fasten (azriel.fasten@gmail.com)
- * Release Version: 1.0.8.11
- * Date Started: 2010/10/14
- *
- * LLVM language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/10/14 (1.0.8.10)
- *  -  First Release
- *
- * TODO (updated 2010/10/14)
- * -------------------------
- * * Check if all links aren't broken
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'LLVM Intermediate Representation',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'HARDQUOTE' => array("\"", "\""),
-    'HARDESCAPE' => array("\"", "\\"),
-    'HARDCHAR' => "\\",
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        // 1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
-        //Hexadecimal Char Specs
-        // 2 => "#\\\\x[\da-fA-F]{1,2}#i",
-        //Octal Char Specs
-        // 3 => "#\\\\[0-7]{1,3}#",
-        //String Parsing of Variable Names
-        // 4 => "#\\$[a-z0-9_]+(?:\\[[a-z0-9_]+\\]|->[a-z0-9_]+)?|(?:\\{\\$|\\$\\{)[a-z0-9_]+(?:\\[('?)[a-z0-9_]*\\1\\]|->[a-z0-9_]+)*\\}#i",
-        //Experimental extension supporting cascaded {${$var}} syntax
-        // 5 => "#\$[a-z0-9_]+(?:\[[a-z0-9_]+\]|->[a-z0-9_]+)?|(?:\{\$|\$\{)[a-z0-9_]+(?:\[('?)[a-z0-9_]*\\1\]|->[a-z0-9_]+)*\}|\{\$(?R)\}#i",
-        //Format String support in ""-Strings
-        // 6 => "#%(?:%|(?:\d+\\\\\\\$)?\\+?(?:\x20|0|'.)?-?(?:\d+|\\*)?(?:\.\d+)?[bcdefFosuxX])#"
-        ),
-    'NUMBERS' =>
-    GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        0 => array(
-            'to', 'nuw', 'nsw', 'align', 'inbounds', 'entry', 'return'
-            ),
-        //Terminator Instructions
-        1 => array(
-            'ret', 'br', 'switch', 'indirectbr', 'invoke', 'unwind', 'unreachable'
-            ),
-        //Binary Operations
-        2 => array(
-            'add', 'fadd', 'sub', 'fsub', 'mul', 'fmul', 'udiv', 'sdiv', 'fdiv', 'urem', 'frem', 'srem'
-            ),
-        //Bitwise Binary Operations
-        3 => array(
-            'shl', 'lshr', 'ashr', 'and', 'or', 'xor'
-            ),
-        //Vector Operations
-        4 => array(
-            'extractelement', 'insertelement', 'shufflevector'
-            ),
-        //Aggregate Operations
-        5 => array(
-            'extractvalue', 'insertvalue'
-            ),
-        //Memory Access and Addressing Operations
-        6 => array(
-            'alloca', 'load', 'store', 'getelementptr'
-            ),
-        //Conversion Operations
-        7 => array(
-            'trunc', 'zext', 'sext', 'fptrunc', 'fpext', 'fptoui', 'fptosi',
-            'uitofp', 'sitofp', 'ptrtoint', 'inttoptr', 'bitcast'
-            ),
-        //Other Operations
-        8 => array(
-            'icmp', 'fcmp', 'phi', 'select', 'call', 'va_arg'
-            ),
-        //Linkage Types
-        9 => array(
-            'private', 'linker_private', 'linker_private_weak', 'linker_private_weak_def_auto',
-            'internal', 'available_externally', 'linkonce', 'common', 'weak', 'appending',
-            'extern_weak', 'linkonce_odr', 'weak_odr', 'externally visible', 'dllimport', 'dllexport',
-            ),
-        //Calling Conventions
-        10 => array(
-            'ccc', 'fastcc', 'coldcc', 'cc 10'
-            ),
-        //Named Types
-        11 => array(
-            'type'
-            ),
-        //Parameter Attributes
-        12 => array(
-            'zeroext', 'signext', 'inreg', 'byval', 'sret', 'noalias', 'nocapture', 'nest'
-            ),
-        //Function Attributes
-        13 => array(
-            'alignstack', 'alwaysinline', 'inlinehint', 'naked', 'noimplicitfloat', 'noinline', 'noredzone', 'noreturn',
-            'nounwind', 'optsize', 'readnone', 'readonly', 'ssp', 'sspreq',
-            ),
-        //Module-Level Inline Assembly
-        14 => array(
-            'module asm'
-            ),
-        //Data Layout
-        15 => array(
-            'target datalayout'
-            ),
-        //Primitive Types
-        16 => array(
-            'x86mmx',
-            'void',
-            'label',
-            'metadata',
-            'opaque'
-            ),
-        //Floating Point Types
-        17 => array(
-            'float', 'double', 'fp128', 'x86_fp80', 'ppc_fp128',
-            ),
-        //Simple Constants
-        18 => array(
-            'false', 'true', 'null'
-            ),
-        //Global Variable and Function Addresses
-        19 => array(
-            'global', 'addrspace', 'constant', 'section'
-            ),
-        //Functions
-        20 => array(
-            'declare', 'define'
-            ),
-        //Complex Constants
-        21 => array(
-            'zeroinitializer'
-            ),
-        //Undefined Values
-        22 => array(
-            'undef'
-            ),
-        //Addresses of Basic Blocks
-        23 => array(
-            'blockaddress'
-            ),
-        //Visibility Styles
-        24 => array(
-            'default', 'hidden', 'protected'
-            ),
-        25 => array(
-            'volatile'
-            ),
-        26 => array(
-            'tail'
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '(', ')', '[', ']', '{', '}',
-            '!', '@', '%', '&', '|', '/',
-            '<', '>',
-            '=', '-', '+', '*',
-            '.', ':', ',', ';'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true,
-        10 => true,
-        11 => true,
-        12 => true,
-        13 => true,
-        14 => true,
-        15 => true,
-        16 => true,
-        17 => true,
-        18 => true,
-        19 => true,
-        20 => true,
-        21 => true,
-        22 => true,
-        23 => true,
-        24 => true,
-        25 => true,
-        26 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            0 => 'color: #209090;',
-            1 => 'color: #0000F0;',
-            2 => 'color: #00F000; font-weight: bold;',
-            3 => 'color: #F00000;',
-            4 => 'color: #00F0F0; font-weight: bold;',
-            5 => 'color: #F000F0; font-weight: bold;',
-            6 => 'color: #403020; font-weight: bold;',
-            7 => 'color: #909090; font-weight: bold;',
-            8 => 'color: #009090; font-weight: bold;',
-            9 => 'color: #900090; font-weight: bold;',
-            10 => 'color: #909000; font-weight: bold;',
-            11 => 'color: #000090; font-weight: bold;',
-            12 => 'color: #900000; font-weight: bold;',
-            13 => 'color: #009000; font-weight: bold;',
-            14 => 'color: #F0F090; font-weight: bold;',
-            15 => 'color: #F090F0; font-weight: bold;',
-            16 => 'color: #90F0F0; font-weight: bold;',
-            17 => 'color: #9090F0; font-weight: bold;',
-            18 => 'color: #90F090; font-weight: bold;',
-            19 => 'color: #F09090; font-weight: bold;',
-            20 => 'color: #4040F0; font-weight: bold;',
-            21 => 'color: #40F040; font-weight: bold;',
-            22 => 'color: #F04040; font-weight: bold;',
-            23 => 'color: #F0F040; font-weight: bold;',
-            24 => 'color: #F040F0; font-weight: bold;',
-            25 => 'color: #40F0F0; font-weight: bold;',
-            26 => 'color: #904040; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #006699; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold; font-style: italic;',
-            6 => 'color: #009933; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;',
-            'HARD' => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            ),
-        'METHODS' => array(
-            1 => 'color: #004000;',
-            2 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #007088;',
-            1 => 'color: #007088;',
-            // 2 => 'color: #000088;',
-            3 => 'color: #700088;',
-            4 => 'color: #010088;',
-            // 5 => 'color: #610088;',
-            // 6 => 'color: #616088;',
-            // 7 => 'color: #616988;',
-            // 8 => 'color: #616908;',
-            9 => 'color: #6109F8;',
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => '',
-            4 => '',
-            5 => ''
-            )
-        ),
-    'URLS' => array(
-        0 => '',
-        1 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        2 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        3 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        4 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        5 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        6 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        7 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        8 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
-        9 => 'http://llvm.org/docs/LangRef.html#linkage_{FNAME}',
-        10 => 'http://llvm.org/docs/LangRef.html#callingconv',
-        11 => 'http://llvm.org/docs/LangRef.html#namedtypes',
-        12 => 'http://llvm.org/docs/LangRef.html#paramattrs',
-        13 => 'http://llvm.org/docs/LangRef.html#fnattrs',
-        14 => 'http://llvm.org/docs/LangRef.html#moduleasm',
-        15 => 'http://llvm.org/docs/LangRef.html#datalayout',
-        16 => 'http://llvm.org/docs/LangRef.html#t_{FNAME}',
-        17 => 'http://llvm.org/docs/LangRef.html#t_floating',
-        18 => 'http://llvm.org/docs/LangRef.html#simpleconstants',
-        19 => 'http://llvm.org/docs/LangRef.html#globalvars',
-        20 => 'http://llvm.org/docs/LangRef.html#functionstructure',
-        21 => 'http://llvm.org/docs/LangRef.html#complexconstants',
-        22 => 'http://llvm.org/docs/LangRef.html#undefvalues',
-        23 => 'http://llvm.org/docs/LangRef.html#blockaddress',
-        24 => 'http://llvm.org/docs/LangRef.html#visibility',
-        25 => 'http://llvm.org/docs/LangRef.html#volatile',
-        26 => 'http://llvm.org/docs/LangRef.html#i_call',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => '%[-a-zA-Z$\._][-a-zA-Z$\._0-9]*',
-        //Labels
-        // 1 => '[-a-zA-Z$\._0-9]+:',
-        1 => '(?<!\w)[\-\w\$\.]+:(?![^">]*<)',
-        //Strings
-        // 2 => '"[^"]+"',
-        //Unnamed variable slots
-        3 => '%[-]?[0-9]+',
-        //Integer Types
-        4 => array(
-            GESHI_SEARCH => '(?<!\w)i\d+(?!\w)',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '<a href="http://llvm.org/docs/LangRef.html#t_integer">',
-            GESHI_AFTER => '</a>'
-            ),
-        //Comments
-        // 5 => ';.*',
-        //Integer literals
-        // 6 => '\\b[-]?[0-9]+\\b',
-        //Floating point constants
-        // 7 => '\\b[-+]?[0-9]+\.[0-9]*\([eE][-+]?[0-9]+\)?\\b',
-        //Hex constants
-        // 8 => '\\b0x[0-9A-Fa-f]+\\b',
-        //Global variables
-        9 => array(
-            GESHI_SEARCH => '@[-a-zA-Z$\._][-a-zA-Z$\._0-9]*',
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '<a href="http://llvm.org/docs/LangRef.html#globalvars">',
-            GESHI_AFTER => '</a>'
-            ),
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'SCRIPT_DELIMITERS' => array(),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/locobasic.php b/inc/geshi/locobasic.php
deleted file mode 100644
index 61c8a3c83..000000000
--- a/inc/geshi/locobasic.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/*************************************************************************************
- * locobasic.php
- * -------------
- * Author: Nacho Cabanes
- * Copyright: (c) 2009 Nacho Cabanes (http://www.nachocabanes.com)
- * Release Version: 1.0.8.11
- * Date Started: 2009/03/22
- *
- * Locomotive Basic (Amstrad CPC series) language file for GeSHi.
- *
- * More details at http://en.wikipedia.org/wiki/Locomotive_BASIC
- *
- * CHANGES
- * -------
- * 2009/03/22 (1.0.8.3)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Locomotive Basic',
-    'COMMENT_SINGLE' => array(1 => "'", 2 => 'REM'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            "AFTER", "AND", "AUTO", "BORDER", "BREAK", "CALL", "CAT", "CHAIN",
-            "CLEAR", "CLG", "CLS", "CLOSEIN", "CLOSEOUT", "CONT", "CURSOR",
-            "DATA", "DEF", "DEFINT", "DEFREAL", "DEFSTR", "DEG", "DELETE",
-            "DERR", "DI", "DIM", "DRAW", "DRAWR", "EDIT", "EI", "ELSE", "END",
-            "ENV", "ENT", "EOF", "ERASE", "ERL", "ERR", "ERROR", "EVERY",
-            "FILL", "FN", "FOR", "FRAME", "GOSUB", "GOTO", "GRAPHICS", "HIMEM",
-            "IF", "INK", "INPUT", "KEY", "LET", "LINE", "LIST", "LOAD",
-            "LOCATE", "MASK", "MEMORY", "MERGE", "MODE", "MOVE", "MOVER", "NEW",
-            "NEXT", "NOT", "ON", "OPENIN", "OPENOUT", "OR", "ORIGIN", "PAPER",
-            "PEEK", "PEN", "PLOT", "PLOTR", "POKE", "PRINT", "RAD", "RANDOMIZE",
-            "READ", "RELEASE", "REMAIN", "RENUM", "RESTORE", "RESUME", "RETURN",
-            "RUN", "SAVE", "SPEED", "SOUND", "SPC", "SQ", "STEP", "STOP", "SWAP",
-            "SYMBOL", "TAB", "TAG", "TAGOFF", "TEST", "TESTR", "TIME", "TO",
-            "THEN", "TRON", "TROFF", "USING", "WAIT", "WEND", "WHILE", "WIDTH",
-            "WINDOW", "WRITE", "XOR", "ZONE"
-            ),
-        2 => array(
-            "ABS", "ASC", "ATN", "BIN", "CHR", "CINT", "COPYCHR", "COS",
-            "CREAL", "DEC", "FIX", "FRE", "EXP", "HEX", "INKEY", "INP", "INSTR",
-            "INT", "JOY", "LEFT", "LEN", "LOG", "LOG10", "LOWER", "MAX", "MID",
-            "MIN", "MOD", "OUT", "PI", "POS", "RIGHT", "RND", "ROUND", "SGN",
-            "SIN", "SPACE", "SQR", "STR", "STRING", "TAN", "UNT", "UPPER",
-            "VAL", "VPOS", "XPOS", "YPOS"
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000088; font-weight: bold;',
-            2 => 'color: #AA00AA; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;',
-            2 => 'color: #808080;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #008800;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0044ff;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/logtalk.php b/inc/geshi/logtalk.php
deleted file mode 100644
index 05734663e..000000000
--- a/inc/geshi/logtalk.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/*************************************************************************************
- * logtalk.php
- * -----------
- *
- * Author: Paulo Moura (pmoura@logtalk.org)
- * Copyright: (c) 2009-2011 Paulo Moura (http://logtalk.org/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/24
- *
- * Logtalk language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2011/01/18 (1.1.4)
- *  -  Added syntax coloring of ignore/1
- * 2010/11/28 (1.1.3)
- *  -  Added syntax coloring of conforms_to_protocol/2-3
- * 2010/09/14 (1.1.2)
- *  -  Added syntax coloring of coinductive/1
- * 2010/06/23 (1.1.1)
- *  -  Added syntax coloring of e/0 and pi/0
- *  -  Added syntax coloring of ground/1, numbervars/3, keysort/2, and sort/2
- * 2010/05/15 (1.1.0)
- *  -  Added syntax coloring of callable/1 and compare/3
- * 2009/10/28 (1.0.0)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Logtalk',
-    'COMMENT_SINGLE' => array(1 => '%'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(2 => "/0'./sim"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'"),
-    'HARDQUOTE' => array('"', '"'),
-    'HARDESCAPE' => array(),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]+\\\\#",
-        //Octal Char Specs
-        3 => "#\\\\[0-7]+\\\\#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX_0O |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        // Directives (with arguments)
-        1 => array(
-            // file directives
-            'encoding', 'ensure_loaded',
-            // flag directives
-            'set_logtalk_flag', 'set_prolog_flag',
-            // entity opening directives
-            'category', 'object', 'protocol',
-            // predicate scope directives
-            'private', 'protected', 'public',
-            // conditional compilation directives
-            'elif', 'if',
-            // entity directives
-            'calls', 'initialization', 'op', 'uses',
-            // predicate directives
-            'alias', 'coinductive', 'discontiguous', 'dynamic', 'mode', 'info', 'meta_predicate', 'multifile', 'synchronized',
-            // module directives
-            'export', 'module', 'reexport', 'use_module'
-            ),
-        // Directives (no arguments)
-        2 => array(
-            // entity directives
-            'dynamic',
-            // multi-threading directives
-            'synchronized', 'threaded',
-            // entity closing directives
-            'end_category', 'end_object', 'end_protocol',
-            // conditional compilation directives
-            'else', 'endif'
-            ),
-        // Entity relations
-        3 => array(
-            'complements', 'extends', 'imports', 'implements','instantiates', 'specializes'
-            ),
-        // Built-in predicates (with arguments)
-        4 => array(
-            // event handlers
-            'after', 'before',
-            // execution-context methods
-            'parameter', 'self', 'sender', 'this',
-            // predicate reflection
-            'current_predicate', 'predicate_property',
-            // DCGs and term expansion
-            'expand_goal', 'expand_term', 'goal_expansion', 'phrase', 'term_expansion',
-            // entity
-            'abolish_category', 'abolish_object', 'abolish_protocol',
-            'create_category', 'create_object', 'create_protocol',
-            'current_category', 'current_object', 'current_protocol',
-            'category_property', 'object_property', 'protocol_property',
-            // entity relations
-            'complements_object', 'conforms_to_protocol',
-            'extends_category', 'extends_object', 'extends_protocol',
-            'implements_protocol', 'imports_category',
-            'instantiates_class', 'specializes_class',
-            // events
-            'abolish_events', 'current_event', 'define_events',
-            // flags
-            'current_logtalk_flag', 'set_logtalk_flag',
-            'current_prolog_flag', 'set_prolog_flag',
-            // compiling, loading, and library path
-            'logtalk_compile', 'logtalk_library_path', 'logtalk_load',
-            // database
-            'abolish', 'asserta', 'assertz', 'clause', 'retract', 'retractall',
-            // control
-            'call', 'catch', 'ignore', 'once', 'throw',
-            // all solutions predicates
-            'bagof', 'findall', 'forall', 'setof',
-            // multi-threading meta-predicates
-            'threaded',
-            'threaded_call', 'threaded_once', 'threaded_ignore', 'threaded_exit', 'threaded_peek',
-            'threaded_wait', 'threaded_notify',
-            // term unification
-            'unify_with_occurs_check',
-            // atomic term processing
-            'atom_chars', 'atom_codes', 'atom_concat', 'atom_length',
-            'number_chars', 'number_codes',
-            'char_code',
-            // term creation and decomposition
-            'arg', 'copy_term', 'functor', 'numbervars',
-            // term testing
-            'atom', 'atomic', 'callable', 'compound', 'float', 'ground', 'integer', 'nonvar', 'number', 'sub_atom', 'var',
-            // term comparison
-            'compare',
-            // stream selection and control
-            'current_input', 'current_output', 'set_input', 'set_output',
-            'open', 'close', 'flush_output', 'stream_property',
-            'at_end_of_stream', 'set_stream_position',
-            // character and byte input/output predicates
-            'get_byte', 'get_char', 'get_code',
-            'peek_byte', 'peek_char', 'peek_code',
-            'put_byte', 'put_char', 'put_code',
-            'nl',
-            // term input/output predicates
-            'current_op', 'op',
-            'write', 'writeq', 'write_canonical', 'write_term',
-            'read', 'read_term',
-            'char_conversion', 'current_char_conversion',
-            // hooks
-            'halt',
-            // sorting
-            'keysort', 'sort'
-            ),
-        // Built-in predicates (no arguments)
-        5 => array(
-            // control
-            'fail', 'repeat', 'true',
-            // character and byte input/output predicates
-            'nl',
-            // implementation defined hooks functions
-            'halt',
-            // arithemtic evaluation
-            'is',
-            // stream selection and control
-            'at_end_of_stream', 'flush_output'
-            ),
-        // Evaluable functors (with arguments)
-        6 => array(
-            'float_integer_part', 'float_fractional_part',
-            'rem', 'mod', 'abs', 'sign', 'floor', 'truncate', 'round', 'ceiling',
-            'cos', 'atan', 'exp', 'log', 'sin', 'sqrt'
-            ),
-        // Evaluable functors (no arguments)
-        7 => array(
-            'e', 'pi', 'mod', 'rem'
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            // external call
-            '{', '}'
-            ),
-        1 => array(
-            // arithemtic comparison
-            '=:=', '=\=', '<', '=<', '>=', '>',
-            // term comparison
-            '<<', '>>', '/\\', '\\/', '\\',
-            // bitwise functors
-            '==', '\==', '@<', '@=<', '@>=', '@>',
-            // evaluable functors
-            '+', '-', '*', '/', '**',
-            // logic and control
-            '!', '\\+', ';',
-            // message sending operators
-            '::', '^^', ':',
-            // grammar rule and conditional functors
-            '-->', '->',
-            // mode operators
-            '@', '?',
-            // term to list predicate
-            '=..',
-            // unification
-            '=', '\\='
-            ),
-        2 => array(
-            // clause and directive functors
-            ':-'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #2e4dc9;',
-            2 => 'color: #2e4dc9;',
-            3 => 'color: #2e4dc9;',
-            4 => 'color: #9d4f37;',
-            5 => 'color: #9d4f37;',
-            6 => 'color: #9d4f37;',
-            7 => 'color: #9d4f37;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #430000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #60a0b0; font-style: italic;',
-            2 => 'color: #430000;',
-            'MULTI' => 'color: #60a0b0; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #9f0000; font-weight: bold;',
-            1 => 'color: #9f0000; font-weight: bold;',
-            2 => 'color: #9f0000; font-weight: bold;',
-            3 => 'color: #9f0000; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #666666;font-weight: bold;',
-            1 => 'color: #666666;font-weight: bold;',
-            2 => 'color: #000000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #9f0000;',
-            'HARD' => 'color: #9f0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #848484;'
-            ),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '::'
-        ),
-    'REGEXPS' => array(
-        // variables
-        0 => '\b(?!(?:PIPE|SEMI|REG3XP\d*)[^a-zA-Z0-9_])[A-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_])'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER
-        ),
-        'KEYWORDS' => array(
-            1 => array(
-                'DISALLOWED_BEFORE' => '(?<=:-\s)',
-                'DISALLOWED_AFTER' => '(?=\()'
-            ),
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<=:-\s)',
-                'DISALLOWED_AFTER' => '(?=\.)'
-            ),
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&\'"])',
-                'DISALLOWED_AFTER' => '(?=\()'
-            ),
-            4 => array(
-                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&\'"])',
-                'DISALLOWED_AFTER' => '(?=\()'
-            ),
-            5 => array(
-                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&\'"])',
-                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\'"])'
-            ),
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#;>|^&\'"])',
-                'DISALLOWED_AFTER' => '(?=\()'
-            ),
-            7 => array(
-                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#;>|^&\'"])',
-                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\'"])'
-            )
-        )
-    ),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/lolcode.php b/inc/geshi/lolcode.php
deleted file mode 100644
index ab6088b18..000000000
--- a/inc/geshi/lolcode.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/*************************************************************************************
- * lolcode.php
- * ----------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/31
- *
- * LOLcode language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/31 (1.0.8.1)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'LOLcode',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        1 => "/\bBTW\b.*$/im",
-        2 => "/(^|\b)(?:OBTW\b.+?\bTLDR|LOL\b.+?\/LOL)(\b|$)/si"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        1 => '/:[)>o":]/',
-        2 => '/:\([\da-f]+\)/i',
-        3 => '/:\{\w+\}/i',
-        4 => '/:\[\w+\]/i',
-        ),
-    'KEYWORDS' => array(
-        //Statements
-        1 => array(
-            'VISIBLE', 'HAI', 'KTHX', 'KTHXBYE', 'SMOOSH', 'GIMMEH', 'PLZ',
-            'ON', 'INVISIBLE', 'R', 'ITZ', 'GTFO', 'COMPLAIN', 'GIMME',
-
-            'OPEN', 'FILE', 'I HAS A', 'AWSUM THX', 'O NOES', 'CAN', 'HAS', 'HAZ',
-            'HOW DOES I', 'IF U SAY SO', 'FOUND YR', 'BORROW', 'OWN', 'ALONG',
-            'WITH', 'WIT', 'LOOK', 'AT', 'AWSUM', 'THX'
-            ),
-        //Conditionals
-        2 => array(
-            'IZ', 'YARLY', 'NOWAI', 'WTF?', 'MEBBE', 'OMG', 'OMGWTF',
-            'ORLY?', 'OF', 'NOPE', 'SO', 'IM', 'MAI',
-
-            'O RLY?', 'SUM', 'BOTH SAEM', 'DIFFRINT', 'BOTH', 'EITHER', 'WON',
-            'DIFF', 'PRODUKT', 'QUOSHUNT', 'MOD', 'MKAY', 'OK', 'THING',
-            'BIGNESS'
-            ),
-        //Repetition
-        3 => array(
-            'IN', 'OUTTA', 'LOOP', 'WHILE'
-            ),
-        //Operators \Math
-        4 => array(
-            'AN', 'AND', 'NOT', 'UP', 'YR', 'UPPIN', 'NERF', 'NERFIN', 'NERFZ',
-            'SMASHING', 'UR', 'KINDA', 'LIKE', 'SAEM', 'BIG', 'SMALL',
-            'BIGGR', 'SMALLR', 'BIGGER', 'SMALLER', 'GOOD', 'CUTE', 'THAN'
-            )
-        ),
-    'SYMBOLS' => array(
-        '.', ',', '?',
-        '!!'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #008000;',
-            2 => 'color: #000080;',
-            3 => 'color: #000080;',
-            4 => 'color: #800000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; style: italic;',
-            2 => 'color: #666666; style: italic;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'SPACE_AS_WHITESPACE' => true
-            )
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/lotusformulas.php b/inc/geshi/lotusformulas.php
deleted file mode 100644
index 12257d748..000000000
--- a/inc/geshi/lotusformulas.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-/*************************************************************************************
- * lotusformulas.php
- * ------------------------
- * Author: Richard Civil (info@richardcivil.net)
- * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2008/04/12
- *
- * @Formula/@Command language file for GeSHi.
- *
- * @Formula/@Command source: IBM Lotus Notes/Domino 8 Designer Help
- *
- * CHANGES
- * -------
- * 2008/04/12 (1.0.7.22)
- *  -  First Release
- *
- * TODO (updated 2008/04/12)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Lotus Notes @Formulas',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array('REM' => ';'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array (
-            '[ZoomPreview]', '[WorkspaceStackReplicaIcons]',
-            '[WorkspaceProperties]', '[WindowWorkspace]',
-            '[WindowTile]', '[WindowRestore]', '[WindowNext]',
-            '[WindowMinimizeAll]', '[WindowMinimize]', '[WindowMaximizeAll]',
-            '[WindowMaximize]', '[WindowCascade]', '[ViewSwitchForm]',
-            '[ViewShowUnread]', '[ViewShowServerNames]', '[ViewShowSearchBar]',
-            '[ViewShowRuler]', '[ViewShowPageBreaks]', '[ViewShowOnlyUnread]',
-            '[ViewShowOnlySelected]', '[ViewShowOnlySearchResults]',
-            '[ViewShowOnlyCategories]', '[ViewShowObject]',
-            '[ViewShowFieldHelp]', '[ViewRenamePerson]', '[ViewRefreshUnread]',
-            '[ViewRefreshFields]', '[ViewNavigatorsNone]',
-            '[ViewNavigatorsFolders]', '[ViewMoveName]', '[ViewHorizScrollbar]',
-            '[ViewExpandWithChildren]', '[ViewExpandAll]', '[ViewExpand]',
-            '[ViewCollapseAll]', '[ViewCollapse]', '[ViewChange]',
-            '[ViewCertify]', '[ViewBesideFolders]', '[ViewBelowFolders]',
-            '[ViewArrangeIcons]', '[V3EditPrevField]', '[V3EditNextField]',
-            '[UserIDSwitch]', '[UserIDSetPassword]', '[UserIDMergeCopy]',
-            '[UserIDInfo]', '[UserIDEncryptionKeys]', '[UserIDCreateSafeCopy]',
-            '[UserIDClearPassword]', '[UserIDCertificates]',
-            '[ToolsUserLogoff]', '[ToolsSpellCheck]', '[ToolsSmartIcons]',
-            '[ToolsSetupUserSetup]', '[ToolsSetupPorts]', '[ToolsSetupMail]',
-            '[ToolsSetupLocation]', '[ToolsScanUnreadSelected]',
-            '[ToolsScanUnreadPreferred]', '[ToolsScanUnreadChoose]',
-            '[ToolsRunMacro]', '[ToolsRunBackgroundMacros]', '[ToolsReplicate]',
-            '[ToolsRefreshSelectedDocs]', '[ToolsRefreshAllDocs]',
-            '[ToolsMarkSelectedUnread]', '[ToolsMarkSelectedRead]',
-            '[ToolsMarkAllUnread]', '[ToolsMarkAllRead]', '[ToolsHangUp]',
-            '[ToolsCategorize]', '[ToolsCall]', '[TextUnderline]',
-            '[TextSpacingSingle]', '[TextSpacingOneAndaHalf]',
-            '[TextSpacingDouble]', '[TextSetFontSize]', '[TextSetFontFace]',
-            '[TextSetFontColor]', '[TextReduceFont]', '[TextPermanentPen]',
-            '[TextParagraphStyles]', '[TextParagraph]', '[TextOutdent]',
-            '[TextNumbers]', '[TextNormal]', '[TextItalic]', '[TextFont]',
-            '[TextEnlargeFont]', '[TextCycleSpacing]', '[TextBullet]',
-            '[TextBold]', '[TextAlignRight]', '[TextAlignNone]',
-            '[TextAlignLeft]', '[TextAlignFull]', '[TextAlignCenter]',
-            '[SwitchView]', '[SwitchForm]', '[StyleCycleKey]',
-            '[SmartIconsNextSet]', '[SmartIconsFloating]', '[ShowProperties]',
-            '[ShowHidePreviewPane]', '[ShowHideParentPreview]',
-            '[ShowHideLinkPreview]', '[ShowHideIMContactList]',
-            '[SetCurrentLocation]', '[SendInstantMessage]',
-            '[SectionRemoveHeader]', '[SectionProperties]',
-            '[SectionExpandAll]', '[SectionExpand]', '[SectionDefineEditors]',
-            '[SectionCollapseAll]', '[SectionCollapse]', '[RunScheduledAgents]',
-            '[RunAgent]', '[ReplicatorStop]', '[ReplicatorStart]',
-            '[ReplicatorSendReceiveMail]', '[ReplicatorSendMail]',
-            '[ReplicatorReplicateWithServer]', '[ReplicatorReplicateSelected]',
-            '[ReplicatorReplicateNext]', '[ReplicatorReplicateHigh]',
-            '[Replicator]', '[RenameDatabase]', '[RemoveFromFolder]',
-            '[RemoteDebugLotusScript]', '[ReloadWindow]', '[RefreshWindow]',
-            '[RefreshParentNote]', '[RefreshHideFormulas]', '[RefreshFrame]',
-            '[PublishDatabase]', '[PictureProperties]', '[PasteBitmapAsObject]',
-            '[PasteBitmapAsBackground]', '[OpenView]', '[OpenPage]',
-            '[OpenNavigator]', '[OpenInNewWindow]', '[OpenHelpDocument]',
-            '[OpenFrameset]', '[OpenDocument]', '[OpenCalendar]',
-            '[ObjectProperties]', '[ObjectOpen]', '[ObjectDisplayAs]',
-            '[NavPrevUnread]', '[NavPrevSelected]', '[NavPrevMain]',
-            '[NavPrev]', '[NavNextUnread]', '[NavNextSelected]',
-            '[NavNextMain]', '[NavNext]', '[NavigatorTest]',
-            '[NavigatorProperties]', '[NavigateToBacklink]',
-            '[NavigatePrevUnread]', '[NavigatePrevSelected]',
-            '[NavigatePrevMain]', '[NavigatePrevHighlight]', '[NavigatePrev]',
-            '[NavigateNextUnread]', '[NavigateNextSelected]',
-            '[NavigateNextMain]', '[NavigateNextHighlight]', '[NavigateNext]',
-            '[MoveToTrash]', '[MailSendPublicKey]', '[MailSendEncryptionKey]',
-            '[MailSendCertificateRequest]', '[MailSend]', '[MailScanUnread]',
-            '[MailRequestNewPublicKey]', '[MailRequestNewName]',
-            '[MailRequestCrossCert]', '[MailOpen]', '[MailForwardAsAttachment]',
-            '[MailForward]', '[MailComposeMemo]', '[MailAddress]',
-            '[LayoutProperties]', '[LayoutElementSendToBack]',
-            '[LayoutElementProperties]', '[LayoutElementBringToFront]',
-            '[LayoutAddText]', '[LayoutAddGraphic]', '[InsertSubform]',
-            '[HotspotProperties]', '[HotspotClear]', '[HelpUsingDatabase]',
-            '[HelpAboutNotes]', '[HelpAboutDatabase]', '[GoUpLevel]',
-            '[FormTestDocument]', '[FormActions]', '[FolderRename]',
-            '[FolderProperties]', '[FolderMove]', '[FolderExpandWithChildren]',
-            '[FolderExpandAll]', '[FolderExpand]', '[FolderDocuments]',
-            '[FolderCustomize]', '[FolderCollapse]', '[Folder]',
-            '[FindFreeTimeDialog]', '[FileSaveNewVersion]', '[FileSave]',
-            '[FilePrintSetup]', '[FilePrint]', '[FilePageSetup]',
-            '[FileOpenDBRepID]', '[FileOpenDatabase]', '[FileNewReplica]',
-            '[FileNewDatabase]', '[FileImport]', '[FileFullTextUpdate]',
-            '[FileFullTextInfo]', '[FileFullTextDelete]',
-            '[FileFullTextCreate]', '[FileExport]', '[FileExit]',
-            '[FileDatabaseUseServer]', '[FileDatabaseRemove]',
-            '[FileDatabaseInfo]', '[FileDatabaseDelete]', '[FileDatabaseCopy]',
-            '[FileDatabaseCompact]', '[FileDatabaseACL]', '[FileCloseWindow]',
-            '[ExitNotes]', '[Execute]', '[ExchangeUnreadMarks]', '[EmptyTrash]',
-            '[EditUp]', '[EditUntruncate]', '[EditUndo]', '[EditTop]',
-            '[EditTableInsertRowColumn]', '[EditTableFormat]',
-            '[EditTableDeleteRowColumn]', '[EditShowHideHiddenChars]',
-            '[EditSelectByDate]', '[EditSelectAll]', '[EditRight]',
-            '[EditRestoreDocument]', '[EditResizePicture]',
-            '[EditQuoteSelection]', '[EditProfileDocument]', '[EditProfile]',
-            '[EditPrevField]', '[EditPhoneNumbers]', '[EditPasteSpecial]',
-            '[EditPaste]', '[EditOpenLink]', '[EditNextField]',
-            '[EditMakeDocLink]', '[EditLocations]', '[EditLinks]', '[EditLeft]',
-            '[EditInsertText]', '[EditInsertTable]', '[EditInsertPopup]',
-            '[EditInsertPageBreak]', '[EditInsertObject]',
-            '[EditInsertFileAttachment]', '[EditInsertButton]',
-            '[EditIndentFirstLine]', '[EditIndent]', '[EditHorizScrollbar]',
-            '[EditHeaderFooter]', '[EditGotoField]', '[EditFindNext]',
-            '[EditFindInPreview]', '[EditFind]', '[EditEncryptionKeys]',
-            '[EditDown]', '[EditDocument]', '[EditDetach]', '[EditDeselectAll]',
-            '[EditCut]', '[EditCopy]', '[EditClear]', '[EditButton]',
-            '[EditBottom]', '[DiscoverFolders]', '[Directories]',
-            '[DialingRules]', '[DesignViewSelectFormula]', '[DesignViews]',
-            '[DesignViewNewColumn]', '[DesignViewFormFormula]',
-            '[DesignViewEditActions]', '[DesignViewColumnDef]',
-            '[DesignViewAttributes]', '[DesignViewAppendColumn]',
-            '[DesignSynopsis]', '[DesignSharedFields]', '[DesignReplace]',
-            '[DesignRefresh]', '[DesignMacros]', '[DesignIcon]',
-            '[DesignHelpUsingDocument]', '[DesignHelpAboutDocument]',
-            '[DesignFormWindowTitle]', '[DesignFormUseField]',
-            '[DesignFormShareField]', '[DesignForms]', '[DesignFormNewField]',
-            '[DesignFormFieldDef]', '[DesignFormAttributes]',
-            '[DesignDocumentInfo]', '[DebugLotusScript]',
-            '[DatabaseReplSettings]', '[DatabaseDelete]', '[CreateView]',
-            '[CreateTextbox]', '[CreateSubForm]', '[CreateSection]',
-            '[CreateRectangularHotspot]', '[CreateRectangle]',
-            '[CreatePolyline]', '[CreatePolygon]', '[CreateNavigator]',
-            '[CreateLayoutRegion]', '[CreateForm]', '[CreateFolder]',
-            '[CreateEllipse]', '[CreateControlledAccessSection]',
-            '[CreateAgent]', '[CreateAction]', '[CopySelectedAsTable]',
-            '[ComposeWithReference]', '[Compose]', '[CloseWindow]', '[Clear]',
-            '[ChooseFolders]', '[CalendarGoTo]', '[CalendarFormat]',
-            '[AttachmentView]', '[AttachmentProperties]', '[AttachmentLaunch]',
-            '[AttachmentDetachAll]', '[AgentTestRun]', '[AgentSetServerName]',
-            '[AgentRun]', '[AgentLog]', '[AgentEnableDisable]', '[AgentEdit]',
-            '[AdminTraceConnection]', '[AdminStatisticsConfig]',
-            '[AdminSendMailTrace]', '[AdminRemoteConsole]',
-            '[AdminRegisterUser]', '[AdminRegisterServer]',
-            '[AdminRegisterFromFile]', '[AdminOutgoingMail]',
-            '[AdminOpenUsersView]', '[AdminOpenStatistics]',
-            '[AdminOpenServersView]', '[AdminOpenServerLog]',
-            '[AdminOpenGroupsView]', '[AdminOpenCertLog]', '[AdminOpenCatalog]',
-            '[AdminOpenAddressBook]', '[AdminNewOrgUnit]',
-            '[AdminNewOrganization]', '[Administration]',
-            '[AdminIDFileSetPassword]', '[AdminIDFileExamine]',
-            '[AdminIDFileClearPassword]', '[AdminDatabaseQuotas]',
-            '[AdminDatabaseAnalysis]', '[AdminCrossCertifyKey]',
-            '[AdminCrossCertifyIDFile]', '[AdminCreateGroup]', '[AdminCertify]',
-            '[AddToIMContactList]', '[AddDatabaseRepID]', '[AddDatabase]',
-            '[AddBookmark]'
-            ),
-        2 => array(
-            'SELECT', 'FIELD', 'ENVIRONMENT', 'DEFAULT', '@Zone ', '@Yesterday',
-            '@Yes', '@Year', '@Word', '@Wide', '@While', '@Weekday',
-            '@WebDbName', '@ViewTitle', '@ViewShowThisUnread', '@Version',
-            '@VerifyPassword', '@ValidateInternetAddress', '@V4UserAccess',
-            '@V3UserName', '@V2If', '@UserRoles', '@UserPrivileges',
-            '@UserNamesList', '@UserNameLanguage', '@UserName', '@UserAccess',
-            '@UrlQueryString', '@URLOpen', '@URLHistory', '@URLGetHeader',
-            '@URLEncode', '@URLDecode', '@UpperCase', '@UpdateFormulaContext',
-            '@Unique', '@UndeleteDocument', '@Unavailable', '@True', '@Trim',
-            '@Transform', '@ToTime', '@ToNumber', '@Tomorrow', '@Today',
-            '@TimeZoneToText', '@TimeToTextInZone', '@TimeMerge', '@Time',
-            '@ThisValue', '@ThisName', '@TextToTime', '@TextToNumber', '@Text',
-            '@TemplateVersion', '@Tan', '@Sum', '@Success', '@Subset',
-            '@StatusBar', '@Sqrt', '@Soundex', '@Sort', '@Sin', '@Sign',
-            '@SetViewInfo', '@SetTargetFrame', '@SetProfileField',
-            '@SetHTTPHeader', '@SetField', '@SetEnvironment', '@SetDocField',
-            '@Set', '@ServerName', '@ServerAccess', '@Select', '@Second',
-            '@Round', '@RightBack', '@Right', '@Return', '@Responses',
-            '@ReplicaID', '@ReplaceSubstring', '@Replace', '@Repeat',
-            '@RegQueryValue', '@RefreshECL', '@Random', '@ProperCase',
-            '@Prompt', '@Power', '@PostedCommand', '@PolicyIsFieldLocked',
-            '@Platform', '@PickList', '@Pi', '@PasswordQuality', '@Password',
-            '@OrgDir', '@OptimizeMailAddress', '@OpenInNewWindow', '@Now',
-            '@Nothing', '@NoteID', '@No', '@NewLine', '@Narrow', '@NameLookup',
-            '@Name', '@Month', '@Modulo', '@Modified', '@Minute', '@Min',
-            '@MiddleBack', '@Middle', '@Member', '@Max', '@Matches',
-            '@MailSignPreference', '@MailSend', '@MailSavePreference',
-            '@MailEncryptSentPreference', '@MailEncryptSavedPreference',
-            '@MailDbName', '@LowerCase', '@Log', '@Locale', '@Ln', '@Like',
-            '@Length', '@LeftBack', '@Left', '@LDAPServer', '@LaunchApp',
-            '@LanguagePreference', '@Keywords', '@IsVirtualizedDirectory',
-            '@IsValid', '@IsUsingJavaElement', '@IsUnavailable', '@IsTime',
-            '@IsText', '@IsResponseDoc', '@IsNumber', '@IsNull', '@IsNotMember',
-            '@IsNewDoc', '@IsModalHelp', '@IsMember', '@IsExpandable',
-            '@IsError', '@IsEmbeddedInsideWCT', '@IsDocTruncated',
-            '@IsDocBeingSaved', '@IsDocBeingRecalculated', '@IsDocBeingMailed',
-            '@IsDocBeingLoaded', '@IsDocBeingEdited', '@IsDB2', '@IsCategory',
-            '@IsAvailable', '@IsAppInstalled', '@IsAgentEnabled', '@Integer',
-            '@InheritedDocumentUniqueID', '@Implode', '@IfError', '@If',
-            '@Hour', '@HashPassword', '@HardDeleteDocument', '@GetViewInfo',
-            '@GetProfileField', '@GetPortsList', '@GetIMContactListGroupNames',
-            '@GetHTTPHeader', '@GetFocusTable', '@GetField', '@GetDocField',
-            '@GetCurrentTimeZone', '@GetAddressBooks', '@FormLanguage', '@For',
-            '@FontList', '@FloatEq', '@FileDir', '@False', '@Failure',
-            '@Explode', '@Exp', '@Eval', '@Error', '@Environment', '@Ends',
-            '@EnableAlarms', '@Elements', '@EditUserECL', '@EditECL',
-            '@DoWhile', '@Domain', '@DocumentUniqueID', '@DocSiblings',
-            '@DocParentNumber', '@DocOmmittedLength', '@DocNumber', '@DocMark',
-            '@DocLock', '@DocLevel', '@DocLength', '@DocFields',
-            '@DocDescendants', '@DocChildren', '@Do', '@DialogBox',
-            '@DeleteField', '@DeleteDocument', '@DDETerminate', '@DDEPoke',
-            '@DDEInitiate', '@DDEExecute', '@DbTitle', '@DbName', '@DbManager',
-            '@DbLookup', '@DbExists', '@DbCommand', '@DbColumn', '@DB2Schema',
-            '@Day', '@Date', '@Created', '@Count', '@Cos', '@Contains',
-            '@ConfigFile', '@Compare', '@Command', '@ClientType',
-            '@CheckFormulaSyntax', '@CheckAlarms', '@Char', '@Certificate',
-            '@BusinessDays', '@BrowserInfo', '@Begins', '@Author',
-            '@Attachments', '@AttachmentNames', '@AttachmentModifiedTimes',
-            '@AttachmentLengths', '@ATan2', '@ATan', '@ASin', '@Ascii',
-            '@AllDescendants', '@AllChildren', '@All', '@AdminECLIsLocked',
-            '@Adjust', '@AddToFolder', '@ACos', '@Accessed', '@AbstractSimple',
-            '@Abstract', '@Abs'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #800000;',
-            2 => 'color: #0000FF;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #FF00FF;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF00FF;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000AA;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 2
-    );
-
-?>
diff --git a/inc/geshi/lotusscript.php b/inc/geshi/lotusscript.php
deleted file mode 100644
index b8b65f206..000000000
--- a/inc/geshi/lotusscript.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * lotusscript.php
- * ------------------------
- * Author: Richard Civil (info@richardcivil.net)
- * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2008/04/12
- *
- * LotusScript language file for GeSHi.
- *
- * LotusScript source: IBM Lotus Notes/Domino 8 Designer Help
- *
- * CHANGES
- * -------
- * 2008/04/12 (1.0.7.22)
- *     -  First Release
- *
- * TODO (2008/04/12)
- * -----------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'LotusScript',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array('%REM' => '%END REM'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"' , "|"),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array (
-            'Yield', 'Year', 'Xor', 'Write', 'With', 'Width', 'While', 'Wend',
-            'Weekday', 'VarType', 'Variant', 'Val', 'UString', 'UString$',
-            'UseLSX', 'Use', 'Until', 'Unlock', 'Unicode', 'Uni', 'UChr',
-            'UChr$', 'UCase', 'UCase$', 'UBound', 'TypeName', 'Type', 'TRUE',
-            'Trim', 'Trim$', 'Today', 'To', 'TimeValue', 'TimeSerial', 'Timer',
-            'TimeNumber', 'Time', 'Time$', 'Then', 'Text', 'Tan', 'Tab', 'Sub',
-            'StrToken', 'StrToken$', 'StrRightBack', 'StrRightBack$',
-            'StrRight', 'StrRight$', 'StrLeftBack', 'StrLeftBack$', 'StrLeft',
-            'StrLeft$', 'String', 'String$', 'StrConv', 'StrCompare', 'StrComp',
-            'Str', 'Str$', 'Stop', 'Step', 'Static', 'Sqr', 'Split', 'Spc',
-            'Space', 'Space$', 'Sleep', 'Single', 'Sin', 'Shell', 'Shared',
-            'Sgn', 'SetFileAttr', 'SetAttr', 'Set', 'SendKeys', 'Select',
-            'Seek', 'Second', 'RTrim', 'RTrim$', 'RSet', 'Round', 'Rnd',
-            'RmDir', 'RightC', 'RightC$', 'RightBP', 'RightBP$', 'RightB',
-            'RightB$', 'Right', 'Right$', 'Return', 'Resume', 'Reset',
-            'Replace', 'Remove', 'Rem', 'ReDim', 'Read', 'Randomize',
-            'Random', 'Put', 'Public', 'Property', 'Private', 'Print',
-            'Preserve', 'Pitch', 'PI', 'Output', 'Or', 'Option', 'Open', 'On',
-            'Oct', 'Oct$', 'NULL', 'Now', 'NOTHING', 'Not', 'NoPitch', 'NoCase',
-            'Next', 'New', 'Name', 'MsgBox', 'Month', 'Mod', 'MkDir', 'Minute',
-            'MidC', 'MidC$', 'MidBP', 'MidBP$', 'MidB', 'MidB$', 'Mid', 'Mid$',
-            'MessageBox', 'Me', 'LTrim', 'LTrim$', 'LSServer', 'LSI_Info',
-            'LSet', 'Loop', 'Long', 'Log', 'LOF', 'Lock', 'LOC', 'LMBCS',
-            'ListTag', 'List', 'Line', 'Like', 'Lib', 'Let', 'LenC', 'LenBP',
-            'LenB', 'Len', 'LeftC', 'LeftC$', 'LeftBP', 'LeftBP$', 'LeftB',
-            'LeftB$', 'Left', 'Left$', 'LCase', 'LCase$', 'LBound', 'Kill',
-            'Join', 'IsUnknown', 'IsScalar', 'IsObject', 'IsNumeric', 'IsNull',
-            'IsList', 'IsEmpty', 'IsElement', 'IsDate', 'IsArray', 'IsA', 'Is',
-            'Integer', 'Int', 'InStrC', 'InStrBP', 'InStrB', 'InStr', 'InputBP',
-            'InputBP$', 'InputBox', 'InputBox$', 'InputB', 'InputB$', 'Input',
-            'Input$', 'In', 'IMSetMode', 'Implode', 'Implode$', 'Imp',
-            'IMEStatus', 'If', 'Hour', 'Hex', 'Hex$', 'Goto', 'GoSub',
-            'GetThreadInfo', 'GetFileAttr', 'GetAttr', 'Get', 'Function',
-            'FullTrim', 'From', 'FreeFile', 'Fraction', 'Format', 'Format$',
-            'ForAll', 'For', 'Fix', 'FileLen', 'FileDateTime', 'FileCopy',
-            'FileAttr', 'FALSE', 'Explicit', 'Exp', 'Exit', 'Execute', 'Event',
-            'Evaluate', 'Error', 'Error$', 'Err', 'Erl', 'Erase', 'Eqv', 'EOF',
-            'Environ', 'Environ$', 'End', 'ElseIf', 'Else', 'Double', 'DoEvents',
-            'Do', 'Dir', 'Dir$', 'Dim', 'DestroyLock', 'Delete', 'DefVar',
-            'DefStr', 'DefSng', 'DefLng', 'DefInt', 'DefDbl', 'DefCur',
-            'DefByte', 'DefBool', 'Declare', 'Day', 'DateValue', 'DateSerial',
-            'DateNumber', 'Date', 'Date$', 'DataType', 'CVDate', 'CVar',
-            'Currency', 'CurDrive', 'CurDrive$', 'CurDir', 'CurDir$', 'CStr',
-            'CSng', 'CreateLock', 'Cos', 'Const', 'Compare', 'Command',
-            'Command$', 'CodeUnlock', 'CodeLockCheck', 'CodeLock', 'Close',
-            'CLng', 'Class', 'CInt', 'Chr', 'Chr$', 'ChDrive', 'ChDir', 'CDbl',
-            'CDat', 'CCur', 'CByte', 'CBool', 'Case', 'Call', 'ByVal', 'Byte',
-            'Boolean', 'Bind', 'Binary', 'Bin', 'Bin$', 'Beep', 'Base', 'Atn2',
-            'Atn', 'ASin', 'Asc', 'As', 'ArrayUnique', 'ArrayReplace',
-            'ArrayGetIndex', 'ArrayAppend', 'Append', 'AppActivate', 'Any',
-            'And', 'Alias', 'ActivateApp', 'ACos', 'Access', 'Abs', '%Include',
-            '%If', '%END', '%ElseIf', '%Else'
-            ),
-        2 => array (
-            'NotesXSLTransformer', 'NotesXMLProcessor', 'NotesViewNavigator',
-            'NotesViewEntryCollection', 'NotesViewEntry', 'NotesViewColumn',
-            'NotesView', 'NotesUIWorkspace', 'NotesUIView', 'NotesUIScheduler',
-            'NotesUIDocument', 'NotesUIDatabase', 'NotesTimer', 'NotesStream',
-            'NotesSession', 'NotesSAXParser', 'NotesSAXException',
-            'NotesSAXAttributeList', 'NotesRichTextTable', 'NotesRichTextTab',
-            'NotesRichTextStyle', 'NotesRichTextSection', 'NotesRichTextRange',
-            'NotesRichTextParagraphStyle', 'NotesRichTextNavigator',
-            'NotesRichTextItem', 'NotesRichTextDocLink',
-            'NotesReplicationEntry', 'NotesReplication', 'NotesRegistration',
-            'NotesOutlineEntry', 'NotesOutline', 'NotesNoteCollection',
-            'NotesNewsLetter', 'NotesName', 'NotesMIMEHeader',
-            'NotesMIMEEntity', 'NotesLog', 'NotesItem', 'NotesInternational',
-            'NotesForm', 'NotesEmbeddedObject', 'NotesDXLImporter',
-            'NotesDXLExporter', 'NotesDOMXMLDeclNode', 'NotesDOMTextNode',
-            'NotesDOMProcessingInstructionNode', 'NotesDOMParser',
-            'NotesDOMNotationNode', 'NotesDOMNodeList', 'NotesDOMNode',
-            'NotesDOMNamedNodeMap', 'NotesDOMEntityReferenceNode',
-            'NotesDOMEntityNode', 'NotesDOMElementNode',
-            'NotesDOMDocumentTypeNode', 'NotesDOMDocumentNode',
-            'NotesDOMDocumentFragmentNode', 'NotesDOMCommentNode',
-            'NotesDOMCharacterDataNote', 'NotesDOMCDATASectionNode',
-            'NotesDOMAttributeNode', 'NotesDocumentCollection', 'NotesDocument',
-            'NotesDbDirectory', 'NotesDateTime', 'NotesDateRange',
-            'NotesDatabase', 'NotesColorObject', 'NotesAgent',
-            'NotesAdministrationProcess', 'NotesACLEntry', 'NotesACL',
-            'Navigator', 'Field', 'Button'
-            )
-        ) ,
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000EE;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #000000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF00FF;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000AA;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #006600;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 2
-);
-
-?>
diff --git a/inc/geshi/lscript.php b/inc/geshi/lscript.php
deleted file mode 100644
index 298af618c..000000000
--- a/inc/geshi/lscript.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-/*************************************************************************************
- * lscript.php
- * ---------
- * Author: Arendedwinter (admin@arendedwinter.com)
- * Copyright: (c) 2008 Beau McGuigan (http://www.arendedwinter.com)
- * Release Version: 1.0.8.11
- * Date Started: 15/11/2008
- *
- * Lightwave Script language file for GeSHi.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'LScript',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-    //Yes, I'm aware these are out of order,
-    //I had to rearrange and couldn't be bothered changing the numbers...
-        7 => array(
-            '@data', '@define', '@else', '@end', '@fpdepth', '@if', '@include',
-            '@insert', '@library', '@localipc', '@name', '@save', '@script',
-            '@sequence', '@version', '@warnings'
-            ),
-        1 => array(
-            'break', 'case', 'continue', 'else', 'end', 'false', 'for',
-            'foreach', 'if', 'return', 'switch', 'true', 'while',
-            ),
-        3 => array(
-            'active', 'alertlevel', 'alpha', 'alphaprefix', 'animfilename', 'autokeycreate',
-            'backdroptype', 'blue', 'boxthreshold', 'button',
-            'channelsvisible', 'childrenvisible', 'compfg', 'compbg', 'compfgalpha',
-            'coneangles', 'cosine', 'count', 'ctl', 'curFilename', 'curFrame',
-            'currenttime', 'curTime', 'curType',
-            'depth', 'diffshade', 'diffuse', 'dimensions', 'displayopts', 'dynamicupdate',
-            'end', 'eta',
-            'filename', 'flags', 'fogtype', 'fps', 'frame', 'frameend', 'frameheight',
-            'framestart', 'framestep', 'framewidth',
-            'generalopts', 'genus', 'geometry', 'gNorm', 'goal', 'green',
-            'h', 'hasAlpha', 'height',
-            'id', 'innerlimit', 'isColor',
-            'keyCount', 'keys',
-            'limiteregion', 'locked', 'luminous',
-            'maxsamplesperpixel', 'minsamplesperpixel', 'mirror', 'motionx', 'motiony',
-            'name', 'newFilename', 'newFrame', 'newTime', 'newType', 'null', 'numthreads',
-            'objID', 'oPos', 'outerlimit', 'oXfrm',
-            'parent', 'pixel', 'pixelaspect', 'point', 'points', 'pointcount', 'polNum',
-            'polycount', 'polygon', 'polygons', 'postBehavior', 'preBehavior', 'previewend',
-            'previewstart', 'previewstep',
-            'range', 'rawblue', 'rawgreen', 'rawred', 'rayLength', 'raySource', 'red',
-            'reflectblue', 'reflectgreen', 'reflectred', 'recursiondepth', 'renderend',
-            'renderopts', 'renderstart', 'renderstep', 'rendertype', 'restlength',
-            'rgbprefix', 'roughness',
-            'selected', 'setColor', 'setPattern', 'shading', 'shadow', 'shadows',
-            'shadowtype', 'size', 'source', 'special', 'specshade', 'specular',
-            'spotsize', 'start', 'sx', 'sy', 'sz',
-            'target', 'totallayers', 'totalpoints', 'totalpolygons', 'trans', 'transparency',
-            'type',
-            'value', 'view', 'visible', 'visibility',
-            'w', 'width', 'wNorm', 'wPos', 'wXfrm',
-            'x', 'xoffset',
-            'y', 'yoffset',
-            'z'
-            ),
-        4 => array(
-            'addLayer', 'addParticle', 'alphaspot', 'ambient', 'asAsc', 'asBin',
-            'asInt', 'asNum', 'asStr', 'asVec', 'attach', 'axislocks',
-            'backdropColor', 'backdropRay', 'backdropSqueeze', 'bone', 'blurLength',
-            'close', 'color', 'contains', 'copy', 'createKey',
-            'deleteKey', 'detach', 'drawCircle', 'drawLine', 'drawPoint', 'drawText',
-            'drawTriangle',
-            'edit', 'eof', 'event',
-            'firstChannel', 'firstLayer', 'firstSelect', 'focalLength', 'fogColor',
-            'fogMaxAmount', 'fogMaxDist', 'fogMinAmount', 'fogMinDist',
-            'fovAngles', 'fStop', 'firstChild', 'focalDistance',
-            'get', 'getChannelGroup', 'getEnvelope', 'getForward', 'getKeyBias',
-            'getKeyContinuity', 'getKeyCurve', 'getKeyHermite', 'getKeyTension',
-            'getKeyTime', 'getKeyValue', 'getParticle', 'getPivot', 'getPosition',
-            'getRight', 'getRotation', 'getSelect', 'getScaling', 'getTag', 'getTexture',
-            'getUp', 'getValue', 'getWorldPosition', 'getWorldForward', 'getWorldRight',
-            'getWorldRotation', 'getWorldUp', 'globalBlur', 'globalMask', 'globalResolution',
-            'hasCCEnd', 'hasCCStart',
-            'illuminate', 'indexOf', 'isAscii', 'isAlnum', 'isAlpha', 'isBone',
-            'isCamera', 'isChannel', 'isChannelGroup', 'isCntrl', 'isCurve', 'isDigit',
-            'isEnvelope', 'isImage', 'isInt', 'isLight', 'isLower', 'isMapped', 'isMesh',
-            'isNil', 'isNum', 'IsOpen', 'isOriginal', 'isPrint', 'isPunct', 'isScene',
-            'isSpace', 'isStr', 'isUpper', 'isValid', 'isVMap', 'isVec', 'isXDigit',
-            'keyExists',
-            'layer', 'layerName', 'layerVisible', 'limits', 'line', 'linecount', 'load', 'luma',
-            'next', 'nextLayer', 'nextSelect', 'nextChannel', 'nextChild', 'nl',
-            'offset', 'open',
-            'pack', 'param', 'parse', 'paste', 'persist', 'polygonCount', 'position',
-            'rayCast', 'rayTrace', 'read', 'readByte', 'readInt', 'readNumber',
-            'readDouble', 'readShort', 'readString', 'readVector', 'reduce',
-            'remParticle', 'renderCamera', 'reopen', 'replace', 'reset', 'restParam',
-            'rewind', 'rgb', 'rgbambient', 'rgbcolor', 'rgbspot',
-            'save', 'schemaPosition', 'select', 'set', 'setChannelGroup', 'setKeyBias',
-            'setKeyContinuity', 'setKeyCurve',
-            'setKeyHermite', 'setKeyTension', 'setKeyValue', 'setParticle', 'setPoints',
-            'setTag', 'setValue', 'server', 'serverFlags', 'sortA', 'sortD', 'surface',
-            'trunc',
-            'write', 'writeln', 'writeByte', 'writeData', 'writeNumber', 'writeDouble',
-            'writeShort', 'writeString', 'writeVector',
-            'vertex', 'vertexCount',
-            'zoomFactor'
-            ),
-        2 => array(
-            'abs', 'acos', 'angle', 'append', 'ascii', 'asin', 'atan',
-            'binary',
-            'ceil', 'center', 'chdir', 'clearimage', 'cloned', 'comringattach',
-            'comringdecode', 'comringdetach', 'comringencode', 'comringmsg', 'cos',
-            'cosh', 'cot', 'cross2d', 'cross3d', 'csc', 'ctlstring', 'ctlinteger',
-            'ctlnumber', 'ctlvector', 'ctldistance', 'ctlchoice', 'ctltext',
-            'ctlcolor', 'ctlsurface', 'ctlfont', 'ctlpopup', 'ctledit', 'ctlpercent',
-            'ctlangle', 'ctlrgb', 'ctlhsv', 'ctlcheckbox', 'ctlstate', 'ctlfilename',
-            'ctlbutton', 'ctllistbox', 'ctlslider', 'ctlminislider', 'ctlsep', 'ctlimage',
-            'ctltab', 'ctlallitems', 'ctlmeshitems', 'ctlcameraitems', 'ctllightitems',
-            'ctlboneitems', 'ctlimageitems', 'ctlchannel', 'ctlviewport', 'Control_Management',
-            'ctlpage', 'ctlgroup', 'ctlposition', 'ctlactive', 'ctlvisible', 'ctlalign',
-            'ctlrefresh', 'ctlmenu', 'ctlinfo',
-            'date', 'debug', 'deg', 'dot2d', 'dot3d', 'drawborder', 'drawbox', 'drawcircle',
-            'drawelipse', 'drawerase', 'drawfillcircle', 'drawfillelipse', 'drawline',
-            'drawpixel', 'drawtext', 'drawtextwidth', 'drawtextheight', 'dump',
-            'error', 'exp', 'expose', 'extent',
-            'fac', 'filecrc', 'filedelete', 'fileexists', 'filefind', 'filerename',
-            'filestat', 'floor', 'format', 'frac', 'fullpath',
-            'gamma', 'getdir', 'getenv', 'getfile', 'getfirstitem', 'getsep', 'getvalue',
-            'globalrecall', 'globalstore',
-            'hash', 'hex', 'hostBuild', 'hostVersion', 'hypot',
-            'info', 'integer',
-            'library', 'licenseId', 'lscriptVersion', 'load', 'loadimage', 'log', 'log10',
-            'matchdirs', 'matchfiles', 'max', 'min', 'mkdir', 'mod', 'monend', 'moninit', 'monstep',
-            'nil', 'normalize', 'number',
-            'octal', 'overlayglyph',
-            'parse', 'platform', 'pow',
-            'rad', 'random', 'randu', 'range', 'read', 'readdouble', 'readInt', 'readNumber',
-            'readShort', 'recall', 'regexp', 'reqabort', 'reqbegin', 'reqend', 'reqisopen',
-            'reqkeyboard', 'reqopen', 'reqposition', 'reqpost', 'reqredraw',
-            'reqsize', 'reqresize', 'requpdate', 'rmdir', 'round', 'runningUnder',
-            'save', 'sec', 'select', 'selector', 'setdesc', 'setvalue', 'sin', 'sinh', 'size',
-            'sizeof', 'sleep', 'spawn', 'split', 'sqrt', 'step', 'store', 'string', 'strleft',
-            'strlower', 'strright', 'strsub', 'strupper',
-            'tan', 'tanh', 'targetobject', 'terminate', 'text', 'time',
-            'wait', 'warn', 'when', 'write', 'writeDouble', 'writeInt', 'writeNumber', 'writeShort',
-            'var', 'vector', 'visitnodes', 'vmag',
-            ),
-        5 => array(
-            'addcurve', 'addpoint', 'addpolygon', 'addquad', 'addtriangle', 'alignpols',
-            'autoflex', 'axisdrill',
-            'bend', 'bevel', 'boolean', 'boundingbox',
-            'changepart', 'changesurface', 'close', 'closeall', 'cmdseq', 'copy', 'copysurface',
-            'createsurface', 'cut',
-            'deformregion', 'delete',
-            'editbegin', 'editend', 'exit', 'extrude',
-            'fixedflex', 'flip', 'fontclear', 'fontcount', 'fontindex', 'fontload',
-            'fontname', 'fracsubdivide', 'freezecurves',
-            'getdefaultsurface',
-            'jitter',
-            'lathe', 'layerName', 'layerVisible', 'lyrbg', 'lyrdata', 'lyrempty', 'lyremptybg',
-            'lyremptyfg', 'lyrfg', 'lyrsetbg', 'lyrsetfg', 'lyrswap',
-            'magnet', 'make4patch', 'makeball', 'makebox', 'makecone', 'makedisc',
-            'maketesball', 'maketext', 'mergepoints', 'mergepols', 'meshedit', 'mirror',
-            'morphpols', 'move',
-            'new', 'nextsurface',
-            'paste', 'pathclone', 'pathextrude', 'pixel', 'pointcount', 'pointinfo',
-            'pointmove', 'pole', 'polycount', 'polyinfo', 'polynormal', 'polypointcount',
-            'polypoints', 'polysurface',
-            'quantize',
-            'railclone', 'railextrude', 'redo', 'removepols', 'rempoint', 'rempoly',
-            'renamesurface', 'revert', 'rotate',
-            'scale', 'selhide', 'selinvert', 'selmode', 'selpoint', 'selpolygon', 'selunhide',
-            'selectvmap', 'setlayername', 'setobject', 'setpivot', 'setsurface', 'shapebevel',
-            'shear', 'skinpols', 'smooth', 'smoothcurves', 'smoothscale', 'smoothshift',
-            'soliddrill', 'splitpols', 'subdivide', 'swaphidden',
-            'taper', 'triple', 'toggleCCend', 'toggleCCstart', 'togglepatches', 'twist',
-            'undo', 'undogroupend', 'undogroupbegin', 'unifypols', 'unweld',
-            'vortex',
-            'weldaverage', 'weldpoints'
-            ),
-        6 => array(
-            'About', 'AboutOpenGL', 'AdaptiveSampling', 'AdaptiveThreshold',
-            'AddAreaLight', 'AddBone', 'AddButton', 'AddCamera', 'AddChildBone',
-            'AddDistantLight', 'AddEnvelope', 'AddLinearLight', 'AddNull',
-            'AddPartigon', 'AddPlugins', 'AddPointLight', 'AddPosition',
-            'AddRotation', 'AddScale', 'AddSpotlight', 'AddToSelection',
-            'AdjustRegionTool', 'AffectCaustics', 'AffectDiffuse', 'AffectOpenGL',
-            'AffectSpecular', 'AlertLevel', 'AmbientColor', 'AmbientIntensity',
-            'Antialiasing', 'ApertureHeight', 'ApplyServer', 'AreaLight',
-            'AutoConfirm', 'AutoFrameAdvance', 'AutoKey',
-            'BackdropColor', 'BackView', 'BController', 'BLimits', 'BLurLength', 'BoneActive',
-            'BoneFalloffType', 'BoneJointComp', 'BoneJointCompAmounts', 'BoneJointCompParent',
-            'BoneLimitedRange', 'BoneMaxRange', 'BoneMinRange', 'BoneMuscleFlex',
-            'BoneMuscleFlexAmounts', 'BoneMuscleFlexParent', 'BoneNormalization',
-            'BoneRestLength', 'BoneRestPosition', 'BoneRestRotation', 'BoneSource',
-            'BoneStrength', 'BoneStrengthMultiply', 'BoneWeightMapName', 'BoneWeightMapOnly',
-            'BoneWeightShade', 'BoneXRay', 'BottomView', 'BoundingBoxThreshold',
-            'BStiffness',
-            'CacheCaustics', 'CacheRadiosity', 'CacheShadowMap',
-            'CameraMask', 'CameraView', 'CameraZoomTool', 'CastShadow', 'CausticIntensity',
-            'CenterItem', 'CenterMouse', 'ChangeTool', 'ClearAllBones', 'ClearAllCameras',
-            'ClearAllLights', 'ClearAllObjects', 'ClearAudio', 'ClearScene', 'ClearSelected',
-            'Clone', 'CommandHistory', 'CommandInput', 'Compositing', 'ConeAngleTool',
-            'ContentDirectory', 'CreateKey',
-            'DecreaseGrid', 'DeleteKey', 'DepthBufferAA', 'DepthOfField', 'DisplayOptions',
-            'DistantLight', 'DrawAntialiasing', 'DrawBones', 'DrawChildBones', 'DynamicUpdate',
-            'EditBones', 'EditCameras', 'EditKeys', 'EditLights',
-            'EditMenus', 'EditObjects', 'EditPlugins', 'EditServer', 'EnableCaustics',
-            'EnableDeformations', 'EnableIK', 'EnableLensFlares', 'EnableRadiosity', 'EnableServer',
-            'EnableShadowMaps', 'EnableVIPER', 'EnableVolumetricLights', 'EnableXH',
-            'EnableYP', 'EnableZB', 'EnahancedAA', 'ExcludeLight', 'ExcludeObject',
-            'EyeSeparation',
-            'FasterBones', 'FirstFrame', 'FirstItem', 'FitAll', 'FitSelected',
-            'FlareIntensity', 'FlareOptions', 'FocalDistance', 'FogColor', 'FogMaxAmount',
-            'FogMaxDistance', 'FogMinAmount', 'FogMinDistance', 'FogType', 'FractionalFrames',
-            'FrameSize', 'FramesPerSecond', 'FrameStep', 'FreePreview', 'FrontView', 'FullTimeIK',
-            'GeneralOptions', 'Generics', 'GlobalApertureHeight', 'GlobalBlurLength',
-            'GlobalFrameSize', 'GlobalIllumination', 'GlobalMaskPosition', 'GlobalMotionBlur',
-            'GlobalParticleBlur', 'GlobalPixelAspect', 'GlobalResolutionMulitplier', 'GoalItem',
-            'GoalStrength', 'GoToFrame', 'GradientBackdrop', 'GraphEditor', 'GridSize', 'GroundColor',
-            'HController', 'HideToolbar', 'HideWindows', 'HLimits', 'HStiffness',
-            'ImageEditor', 'ImageProcessing', 'IncludeLight', 'IncludeObject', 'IncreaseGrid',
-            'IndirectBounces', 'Item_SetWindowPos', 'ItemActive', 'ItemColor', 'ItemLock',
-            'ItemProperties', 'ItemVisibilty',
-            'KeepGoalWithinReach',
-            'LastFrame', 'LastItem', 'LastPluginInterface', 'Layout_SetWindowPos',
-            'Layout_SetWindowSize', 'LeftView', 'LensFlare', 'LensFStop', 'LightColor',
-            'LightConeAngle', 'LightEdgeAngle', 'LightFalloffType', 'LightIntensity',
-            'LightIntensityTool', 'LightQuality', 'LightRange', 'LightView', 'LimitB',
-            'LimitDynamicRange', 'LimitedRegion', 'LimitH', 'LimitP', 'LinearLight',
-            'LoadAudio', 'LoadFromScene', 'LoadMotion', 'LoadObject', 'LoadObjectLayer',
-            'LoadPreview', 'LoadScene', 'LocalCoordinateSystem',
-            'MakePreview', 'MaskColor', 'MaskPosition', 'MasterPlugins', 'MatchGoalOrientation',
-            'MatteColor', 'MatteObject', 'MetaballResolution', 'Model', 'MorphAmount',
-            'MorphAmountTool', 'MorphMTSE', 'MorphSurfaces', 'MorphTarget', 'MotionBlur',
-            'MotionBlurDOFPreview', 'MotionOptions', 'MovePathTool', 'MovePivotTool', 'MoveTool',
-            'NadirColor', 'NetRender', 'NextFrame', 'NextItem', 'NextKey', 'NextSibling',
-            'NextViewLayout', 'NoiseReduction', 'Numeric',
-            'ObjectDissolve',
-            'ParentCoordinateSystem', 'ParentInPlace', 'ParentItem',
-            'ParticleBlur', 'PathAlignLookAhead', 'PathAlignMaxLookSteps', 'PathAlignReliableDist',
-            'Pause', 'PController', 'PerspectiveView',
-            'PivotPosition', 'PivotRotation', 'PixelAspect', 'PlayAudio', 'PlayBackward',
-            'PlayForward', 'PlayPreview', 'PLimits', 'PointLight', 'PolygonEdgeColor',
-            'PolygonEdgeFlags', 'PolygonEdgeThickness', 'PolygonEdgeZScale', 'PolygonSize',
-            'Position', 'Presets', 'PreviewFirstFrame', 'PreviewFrameStep', 'PreviewLastFrame',
-            'PreviewOptions', 'PreviousFrame', 'PreviousItem', 'PreviousKey', 'PreviousSibling',
-            'PreviousViewLayout', 'PStiffness',
-            'Quit',
-            'RadiosityIntensity', 'RadiosityTolerance', 'RadiosityType', 'RayRecursionLimit',
-            'RayTraceReflection', 'RayTraceShadows',
-            'RayTraceTransparency', 'ReceiveShadow', 'RecentContentDirs', 'RecentScenes',
-            'ReconstructionFilter', 'RecordMaxAngles', 'RecordMinAngles', 'RecordPivotRotation',
-            'RecordRestPosition', 'Redraw', 'RedrawNow', 'Refresh', 'RefreshNow', 'RegionPosition',
-            'RemoveEnvelope', 'RemoveFromSelection', 'RemoveServer', 'Rename', 'RenderFrame',
-            'RenderOptions', 'RenderScene', 'RenderSelected', 'RenderThreads',
-            'ReplaceObjectLayer', 'ReplaceWithNull', 'ReplaceWithObject', 'Reset',
-            'ResolutionMultiplier', 'RestLengthTool', 'RightView', 'RotatePivotTool',
-            'RotateTool', 'Rotation',
-            'SaveAllObjects', 'SaveCommandList', 'SaveCommandMessages',
-            'SaveEndomorph', 'SaveLight', 'SaveLWSC1', 'SaveMotion', 'SaveObject', 'SaveObjectCopy',
-            'SavePreview', 'SaveScene', 'SaveSceneAs', 'SaveSceneCopy', 'SaveTransformed',
-            'SaveViewLayout', 'Scale', 'Scene_SetWindowPos', 'Scene_SetWindowSize',
-            'SceneEditor', 'SchematicPosition', 'SchematicView', 'SelectAllBones',
-            'SelectAllCameras', 'SelectAllLights', 'SelectAllObjects', 'SelectByName',
-            'SelectChild', 'SelectItem', 'SelectParent', 'SelfShadow', 'ShadowColor',
-            'ShadowExclusion', 'ShadowMapAngle', 'ShadowMapFitCone', 'ShadowMapFuzziness',
-            'ShadowMapSize', 'ShadowType', 'ShowCages', 'ShowFieldChart', 'ShowHandles',
-            'ShowIKChains', 'ShowMotionPaths', 'ShowSafeAreas', 'ShowTargetLines',
-            'ShrinkEdgesWithDistance', 'SingleView', 'SizeTool', 'SkelegonsToBones', 'SkyColor',
-            'Spotlight', 'SquashTool', 'Statistics', 'StatusMsg', 'Stereoscopic', 'StretchTool',
-            'SubdivisionOrder', 'SubPatchLevel', 'SurfaceEditor', 'Synchronize',
-            'TargetItem', 'TopView',
-            'UnaffectedByFog', 'UnaffectedByIK', 'Undo', 'UnseenByAlphaChannel', 'UnseenByCamera',
-            'UnseenByRays', 'UseGlobalResolution', 'UseGlobalBlur', 'UseGlobalMask',
-            'UseMorphedPositions',
-            'ViewLayout', 'VIPER', 'VolumetricLighting',
-            'VolumetricLightingOptions', 'VolumetricRadiosity', 'Volumetrics',
-            'WorldCoordinateSystem',
-            'XYView', 'XZView',
-            'ZenithColor', 'ZoomFactor', 'ZoomIn', 'ZoomInX2', 'ZoomOut', 'ZoomOutX2', 'ZYView',
-            'Camera', 'Channel', 'ChannelGroup', 'Envelope', 'File', 'Glyph', 'Icon', 'Image',
-            'Light', 'Mesh', 'Scene', 'Surface', 'VMap'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '<', '>', '+', '-', '*', '/', '!', '%', '&', '@'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #FF6820; font-weight: bold;', //LS_COMMANDS
-            3 => 'color: #007F7F; font-weight: bold;', //LS_MEMBERS
-            4 => 'color: #800080; font-weight: bold;', //LS_METHODS
-            5 => 'color: #51BD95; font-weight: bold;', //LS_MODELER
-            6 => 'color: #416F85; font-weight: bold;', //LS_GENERAL
-            7 => 'color: #C92929; font-weight: bold;'  //LS_COMMANDS (cont)
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #7F7F7F;',
-            'MULTI' => 'color: #7F7F7F;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #0040A0;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #00C800;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #6953AC;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #0040A0;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<=\.)'
-                ),
-            4 => array(
-                'DISALLOWED_BEFORE' => '(?<=\.)'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/lsl2.php b/inc/geshi/lsl2.php
deleted file mode 100644
index f80cf4f29..000000000
--- a/inc/geshi/lsl2.php
+++ /dev/null
@@ -1,898 +0,0 @@
-<?php
-/*************************************************************************************
- * lsl2.php
- * --------
- * Author: William Fry (william.fry@nyu.edu)
- * Copyright: (c) 2009 William Fry
- * Release Version: 1.0.8.11
- * Date Started: 2009/02/04
- *
- * Linden Scripting Language (LSL2) language file for GeSHi.
- *
- *   Data derived and validated against the following:
- *      http://wiki.secondlife.com/wiki/LSL_Portal
- *      http://www.lslwiki.net/lslwiki/wakka.php?wakka=HomePage
- *      http://rpgstats.com/wiki/index.php?title=Main_Page
- *
- * CHANGES
- * -------
- * 2009/02/05 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2009/02/05)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'LSL2',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array( // flow control
-            'do',
-            'else',
-            'for',
-            'if',
-            'jump',
-            'return',
-            'state',
-            'while',
-            ),
-        2 => array( // manifest constants
-            'ACTIVE',
-            'AGENT',
-            'AGENT_ALWAYS_RUN',
-            'AGENT_ATTACHMENTS',
-            'AGENT_AWAY',
-            'AGENT_BUSY',
-            'AGENT_CROUCHING',
-            'AGENT_FLYING',
-            'AGENT_IN_AIR',
-            'AGENT_MOUSELOOK',
-            'AGENT_ON_OBJECT',
-            'AGENT_SCRIPTED',
-            'AGENT_SITTING',
-            'AGENT_TYPING',
-            'AGENT_WALKING',
-            'ALL_SIDES',
-            'ANIM_ON',
-            'ATTACH_BACK',
-            'ATTACH_BELLY',
-            'ATTACH_CHEST',
-            'ATTACH_CHIN',
-            'ATTACH_HEAD',
-            'ATTACH_HUD_BOTTOM',
-            'ATTACH_HUD_BOTTOM_LEFT',
-            'ATTACH_HUD_BOTTOM_RIGHT',
-            'ATTACH_HUD_CENTER_1',
-            'ATTACH_HUD_CENTER_2',
-            'ATTACH_HUD_TOP_CENTER',
-            'ATTACH_HUD_TOP_LEFT',
-            'ATTACH_HUD_TOP_RIGHT',
-            'ATTACH_LEAR',
-            'ATTACH_LEYE',
-            'ATTACH_LFOOT',
-            'ATTACH_LHAND',
-            'ATTACH_LHIP',
-            'ATTACH_LLARM',
-            'ATTACH_LLLEG',
-            'ATTACH_LPEC',
-            'ATTACH_LSHOULDER',
-            'ATTACH_LUARM',
-            'ATTACH_LULEG',
-            'ATTACH_MOUTH',
-            'ATTACH_NOSE',
-            'ATTACH_PELVIS',
-            'ATTACH_REAR',
-            'ATTACH_REYE',
-            'ATTACH_RFOOT',
-            'ATTACH_RHAND',
-            'ATTACH_RHIP',
-            'ATTACH_RLARM',
-            'ATTACH_RLLEG',
-            'ATTACH_RPEC',
-            'ATTACH_RSHOULDER',
-            'ATTACH_RUARM',
-            'ATTACH_RULEG',
-            'CAMERA_ACTIVE',
-            'CAMERA_BEHINDNESS_ANGLE',
-            'CAMERA_BEHINDNESS_LAG',
-            'CAMERA_DISTANCE',
-            'CAMERA_FOCUS',
-            'CAMERA_FOCUS_LAG',
-            'CAMERA_FOCUS_LOCKED',
-            'CAMERA_FOCUS_OFFSET',
-            'CAMERA_FOCUS_THRESHOLD',
-            'CAMERA_PITCH',
-            'CAMERA_POSITION',
-            'CAMERA_POSITION_LAG',
-            'CAMERA_POSITION_LOCKED',
-            'CAMERA_POSITION_THRESHOLD',
-            'CHANGED_ALLOWED_DROP',
-            'CHANGED_COLOR',
-            'CHANGED_INVENTORY',
-            'CHANGED_LINK',
-            'CHANGED_OWNER',
-            'CHANGED_REGION',
-            'CHANGED_SCALE',
-            'CHANGED_SHAPE',
-            'CHANGED_TELEPORT',
-            'CHANGED_TEXTURE',
-            'CLICK_ACTION_NONE',
-            'CLICK_ACTION_OPEN',
-            'CLICK_ACTION_OPEN_MEDIA',
-            'CLICK_ACTION_PAY',
-            'CLICK_ACTION_SIT',
-            'CLICK_ACTION_TOUCH',
-            'CONTROL_BACK',
-            'CONTROL_DOWN',
-            'CONTROL_FWD',
-            'CONTROL_LBUTTON',
-            'CONTROL_LEFT',
-            'CONTROL_ML_LBUTTON',
-            'CONTROL_RIGHT',
-            'CONTROL_ROT_LEFT',
-            'CONTROL_ROT_RIGHT',
-            'CONTROL_UP',
-            'DATA_BORN',
-            'DATA_NAME',
-            'DATA_ONLINE',
-            'DATA_PAYINFO',
-            'DATA_RATING',
-            'DATA_SIM_POS',
-            'DATA_SIM_RATING',
-            'DATA_SIM_STATUS',
-            'DEBUG_CHANNEL',
-            'DEG_TO_RAD',
-            'EOF',
-            'FALSE',
-            'HTTP_BODY_MAXLENGTH',
-            'HTTP_BODY_TRUNCATED',
-            'HTTP_METHOD',
-            'HTTP_MIMETYPE',
-            'HTTP_VERIFY_CERT',
-            'INVENTORY_ALL',
-            'INVENTORY_ANIMATION',
-            'INVENTORY_BODYPART',
-            'INVENTORY_CLOTHING',
-            'INVENTORY_GESTURE',
-            'INVENTORY_LANDMARK',
-            'INVENTORY_NONE',
-            'INVENTORY_NOTECARD',
-            'INVENTORY_OBJECT',
-            'INVENTORY_SCRIPT',
-            'INVENTORY_SOUND',
-            'INVENTORY_TEXTURE',
-            'LAND_LEVEL',
-            'LAND_LOWER',
-            'LAND_NOISE',
-            'LAND_RAISE',
-            'LAND_REVERT',
-            'LAND_SMOOTH',
-            'LINK_ALL_CHILDREN',
-            'LINK_ALL_OTHERS',
-            'LINK_ROOT',
-            'LINK_SET',
-            'LINK_THIS',
-            'LIST_STAT_GEOMETRIC_MEAN',
-            'LIST_STAT_MAX',
-            'LIST_STAT_MEAN',
-            'LIST_STAT_MEDIAN',
-            'LIST_STAT_MIN',
-            'LIST_STAT_NUM_COUNT',
-            'LIST_STAT_RANGE',
-            'LIST_STAT_STD_DEV',
-            'LIST_STAT_SUM',
-            'LIST_STAT_SUM_SQUARES',
-            'LOOP',
-            'MASK_BASE',
-            'MASK_EVERYONE',
-            'MASK_GROUP',
-            'MASK_NEXT',
-            'MASK_OWNER',
-            'NULL_KEY',
-            'OBJECT_CREATOR',
-            'OBJECT_DESC',
-            'OBJECT_GROUP',
-            'OBJECT_NAME',
-            'OBJECT_OWNER',
-            'OBJECT_POS',
-            'OBJECT_ROT',
-            'OBJECT_UNKNOWN_DETAIL',
-            'OBJECT_VELOCITY',
-            'PARCEL_DETAILS_AREA',
-            'PARCEL_DETAILS_DESC',
-            'PARCEL_DETAILS_GROUP',
-            'PARCEL_DETAILS_NAME',
-            'PARCEL_DETAILS_OWNER',
-            'PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY',
-            'PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS',
-            'PARCEL_FLAG_ALLOW_CREATE_OBJECTS',
-            'PARCEL_FLAG_ALLOW_DAMAGE',
-            'PARCEL_FLAG_ALLOW_FLY',
-            'PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY',
-            'PARCEL_FLAG_ALLOW_GROUP_SCRIPTS',
-            'PARCEL_FLAG_ALLOW_LANDMARK',
-            'PARCEL_FLAG_ALLOW_SCRIPTS',
-            'PARCEL_FLAG_ALLOW_TERRAFORM',
-            'PARCEL_FLAG_LOCAL_SOUND_ONLY',
-            'PARCEL_FLAG_RESTRICT_PUSHOBJECT',
-            'PARCEL_FLAG_USE_ACCESS_GROUP',
-            'PARCEL_FLAG_USE_ACCESS_LIST',
-            'PARCEL_FLAG_USE_BAN_LIST',
-            'PARCEL_FLAG_USE_LAND_PASS_LIST',
-            'PARCEL_MEDIA_COMMAND_AGENT',
-            'PARCEL_MEDIA_COMMAND_AUTO_ALIGN',
-            'PARCEL_MEDIA_COMMAND_DESC',
-            'PARCEL_MEDIA_COMMAND_LOOP_SET',
-            'PARCEL_MEDIA_COMMAND_PAUSE',
-            'PARCEL_MEDIA_COMMAND_PLAY',
-            'PARCEL_MEDIA_COMMAND_SIZE',
-            'PARCEL_MEDIA_COMMAND_STOP',
-            'PARCEL_MEDIA_COMMAND_TEXTURE',
-            'PARCEL_MEDIA_COMMAND_TIME',
-            'PARCEL_MEDIA_COMMAND_TYPE',
-            'PARCEL_MEDIA_COMMAND_URL',
-            'PASSIVE',
-            'PAYMENT_INFO_ON_FILE',
-            'PAYMENT_INFO_USED',
-            'PAY_DEFAULT',
-            'PAY_HIDE',
-            'PERMISSION_ATTACH',
-            'PERMISSION_CHANGE_LINKS',
-            'PERMISSION_CONTROL_CAMERA',
-            'PERMISSION_DEBIT',
-            'PERMISSION_TAKE_CONTROLS',
-            'PERMISSION_TRACK_CAMERA',
-            'PERMISSION_TRIGGER_ANIMATION',
-            'PERM_ALL',
-            'PERM_COPY',
-            'PERM_MODIFY',
-            'PERM_MOVE',
-            'PERM_TRANSFER',
-            'PI',
-            'PI_BY_TWO',
-            'PRIM_BUMP_BARK',
-            'PRIM_BUMP_BLOBS',
-            'PRIM_BUMP_BRICKS',
-            'PRIM_BUMP_BRIGHT',
-            'PRIM_BUMP_CHECKER',
-            'PRIM_BUMP_CONCRETE',
-            'PRIM_BUMP_DARK',
-            'PRIM_BUMP_DISKS',
-            'PRIM_BUMP_GRAVEL',
-            'PRIM_BUMP_LARGETILE',
-            'PRIM_BUMP_NONE',
-            'PRIM_BUMP_SHINY',
-            'PRIM_BUMP_SIDING',
-            'PRIM_BUMP_STONE',
-            'PRIM_BUMP_STUCCO',
-            'PRIM_BUMP_SUCTION',
-            'PRIM_BUMP_TILE',
-            'PRIM_BUMP_WEAVE',
-            'PRIM_BUMP_WOOD',
-            'PRIM_COLOR',
-            'PRIM_FULLBRIGHT',
-            'PRIM_HOLE_CIRCLE',
-            'PRIM_HOLE_DEFAULT',
-            'PRIM_HOLE_SQUARE',
-            'PRIM_HOLE_TRIANGLE',
-            'PRIM_MATERIAL',
-            'PRIM_MATERIAL_FLESH',
-            'PRIM_MATERIAL_GLASS',
-            'PRIM_MATERIAL_LIGHT',
-            'PRIM_MATERIAL_METAL',
-            'PRIM_MATERIAL_PLASTIC',
-            'PRIM_MATERIAL_RUBBER',
-            'PRIM_MATERIAL_STONE',
-            'PRIM_MATERIAL_WOOD',
-            'PRIM_PHANTOM',
-            'PRIM_PHYSICS',
-            'PRIM_POSITION',
-            'PRIM_ROTATION',
-            'PRIM_SHINY_HIGH',
-            'PRIM_SHINY_LOW',
-            'PRIM_SHINY_MEDIUM',
-            'PRIM_SHINY_NONE',
-            'PRIM_SIZE',
-            'PRIM_TEMP_ON_REZ',
-            'PRIM_TEXTURE',
-            'PRIM_TYPE',
-            'PRIM_TYPE_BOX',
-            'PRIM_TYPE_CYLINDER',
-            'PRIM_TYPE_PRISM',
-            'PRIM_TYPE_RING',
-            'PRIM_TYPE_SPHERE',
-            'PRIM_TYPE_TORUS',
-            'PRIM_TYPE_TUBE',
-            'PSYS_PART_BOUNCE_MASK',
-            'PSYS_PART_EMISSIVE_MASK',
-            'PSYS_PART_END_ALPHA',
-            'PSYS_PART_END_COLOR',
-            'PSYS_PART_END_SCALE',
-            'PSYS_PART_FLAGS',
-            'PSYS_PART_FOLLOW_SRC_MASK',
-            'PSYS_PART_FOLLOW_VELOCITY_MASK',
-            'PSYS_PART_INTERP_COLOR_MASK',
-            'PSYS_PART_INTERP_SCALE_MASK',
-            'PSYS_PART_MAX_AGE',
-            'PSYS_PART_START_ALPHA',
-            'PSYS_PART_START_COLOR',
-            'PSYS_PART_START_SCALE',
-            'PSYS_PART_TARGET_LINEAR_MASK',
-            'PSYS_PART_TARGET_POS_MASK',
-            'PSYS_PART_WIND_MASK',
-            'PSYS_SRC_ACCEL',
-            'PSYS_SRC_ANGLE_BEGIN',
-            'PSYS_SRC_ANGLE_END',
-            'PSYS_SRC_BURST_PART_COUNT',
-            'PSYS_SRC_BURST_RADIUS',
-            'PSYS_SRC_BURST_RATE',
-            'PSYS_SRC_BURST_SPEED_MAX',
-            'PSYS_SRC_BURST_SPEED_MIN',
-            'PSYS_SRC_INNERANGLE',
-            'PSYS_SRC_MAX_AGE',
-            'PSYS_SRC_OMEGA',
-            'PSYS_SRC_OUTERANGLE',
-            'PSYS_SRC_PATTERN',
-            'PSYS_SRC_PATTERN_ANGLE',
-            'PSYS_SRC_PATTERN_ANGLE_CONE',
-            'PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY',
-            'PSYS_SRC_PATTERN_DROP',
-            'PSYS_SRC_PATTERN_EXPLODE',
-            'PSYS_SRC_TARGET_KEY',
-            'PSYS_SRC_TEXTURE',
-            'RAD_TO_DEG',
-            'REMOTE_DATA_CHANNEL',
-            'REMOTE_DATA_REQUEST',
-            'SCRIPTED',
-            'SQRT2',
-            'STATUS_BLOCK_GRAB',
-            'STATUS_DIE_AT_EDGE',
-            'STATUS_PHANTOM',
-            'STATUS_PHYSICS',
-            'STATUS_RETURN_AT_EDGE',
-            'STATUS_ROTATE_X',
-            'STATUS_ROTATE_Y',
-            'STATUS_ROTATE_Z',
-            'STATUS_SANDBOX',
-            'TRUE',
-            'TWO_PI',
-            'VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY',
-            'VEHICLE_ANGULAR_DEFLECTION_TIMESCALE',
-            'VEHICLE_ANGULAR_FRICTION_TIMESCALE',
-            'VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE',
-            'VEHICLE_ANGULAR_MOTOR_DIRECTION',
-            'VEHICLE_ANGULAR_MOTOR_TIMESCALE',
-            'VEHICLE_BANKING_EFFICIENCY',
-            'VEHICLE_BANKING_MIX',
-            'VEHICLE_BANKING_TIMESCALE',
-            'VEHICLE_BUOYANCY',
-            'VEHICLE_FLAG_CAMERA_DECOUPLED',
-            'VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT',
-            'VEHICLE_FLAG_HOVER_TERRAIN_ONLY',
-            'VEHICLE_FLAG_HOVER_UP_ONLY',
-            'VEHICLE_FLAG_HOVER_WATER_ONLY',
-            'VEHICLE_FLAG_LIMIT_MOTOR_UP',
-            'VEHICLE_FLAG_LIMIT_ROLL_ONLY',
-            'VEHICLE_FLAG_MOUSELOOK_BANK',
-            'VEHICLE_FLAG_MOUSELOOK_STEER',
-            'VEHICLE_FLAG_NO_DEFLECTION_UP',
-            'VEHICLE_HOVER_EFFICIENCY',
-            'VEHICLE_HOVER_HEIGHT',
-            'VEHICLE_HOVER_TIMESCALE',
-            'VEHICLE_LINEAR_DEFLECTION_EFFICIENCY',
-            'VEHICLE_LINEAR_DEFLECTION_TIMESCALE',
-            'VEHICLE_LINEAR_FRICTION_TIMESCALE',
-            'VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE',
-            'VEHICLE_LINEAR_MOTOR_DIRECTION',
-            'VEHICLE_LINEAR_MOTOR_OFFSET',
-            'VEHICLE_LINEAR_MOTOR_TIMESCALE',
-            'VEHICLE_REFERENCE_FRAME',
-            'VEHICLE_TYPE_AIRPLANE',
-            'VEHICLE_TYPE_BALLOON',
-            'VEHICLE_TYPE_BOAT',
-            'VEHICLE_TYPE_CAR',
-            'VEHICLE_TYPE_NONE',
-            'VEHICLE_TYPE_SLED',
-            'VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY',
-            'VEHICLE_VERTICAL_ATTRACTION_TIMESCALE',
-            'ZERO_ROTATION',
-            'ZERO_VECTOR',
-            ),
-        3 => array( // handlers
-            'at_rot_target',
-            'at_target',
-            'attached',
-            'changed',
-            'collision',
-            'collision_end',
-            'collision_start',
-            'control',
-            'dataserver',
-            'email',
-            'http_response',
-            'land_collision',
-            'land_collision_end',
-            'land_collision_start',
-            'link_message',
-            'listen',
-            'money',
-            'moving_end',
-            'moving_start',
-            'no_sensor',
-            'not_at_rot_target',
-            'not_at_target',
-            'object_rez',
-            'on_rez',
-            'remote_data',
-            'run_time_permissions',
-            'sensor',
-            'state_entry',
-            'state_exit',
-            'timer',
-            'touch',
-            'touch_end',
-            'touch_start',
-            ),
-        4 => array( // data types
-            'float',
-            'integer',
-            'key',
-            'list',
-            'rotation',
-            'string',
-            'vector',
-            ),
-        5 => array( // library
-            'default',
-            'llAbs',
-            'llAcos',
-            'llAddToLandBanList',
-            'llAddToLandPassList',
-            'llAdjustSoundVolume',
-            'llAllowInventoryDrop',
-            'llAngleBetween',
-            'llApplyImpulse',
-            'llApplyRotationalImpulse',
-            'llAsin',
-            'llAtan2',
-            'llAttachToAvatar',
-            'llAvatarOnSitTarget',
-            'llAxes2Rot',
-            'llAxisAngle2Rot',
-            'llBase64ToInteger',
-            'llBase64ToString',
-            'llBreakAllLinks',
-            'llBreakLink',
-            'llCeil',
-            'llClearCameraParams',
-            'llCloseRemoteDataChannel',
-            'llCloud',
-            'llCollisionFilter',
-            'llCollisionSound',
-            'llCollisionSprite',
-            'llCos',
-            'llCreateLink',
-            'llCSV2List',
-            'llDeleteSubList',
-            'llDeleteSubString',
-            'llDetachFromAvatar',
-            'llDetectedGrab',
-            'llDetectedGroup',
-            'llDetectedKey',
-            'llDetectedLinkNumber',
-            'llDetectedName',
-            'llDetectedOwner',
-            'llDetectedPos',
-            'llDetectedRot',
-            'llDetectedTouchBinormal',
-            'llDetectedTouchFace',
-            'llDetectedTouchNormal',
-            'llDetectedTouchPos',
-            'llDetectedTouchST',
-            'llDetectedTouchUV',
-            'llDetectedType',
-            'llDetectedVel',
-            'llDialog',
-            'llDie',
-            'llDumpList2String',
-            'llEdgeOfWorld',
-            'llEjectFromLand',
-            'llEmail',
-            'llEscapeURL',
-            'llEuler2Rot',
-            'llFabs',
-            'llFloor',
-            'llForceMouselook',
-            'llFrand',
-            'llGetAccel',
-            'llGetAgentInfo',
-            'llGetAgentLanguage',
-            'llGetAgentSize',
-            'llGetAlpha',
-            'llGetAndResetTime',
-            'llGetAnimation',
-            'llGetAnimationList',
-            'llGetAttached',
-            'llGetBoundingBox',
-            'llGetCameraPos',
-            'llGetCameraRot',
-            'llGetCenterOfMass',
-            'llGetColor',
-            'llGetCreator',
-            'llGetDate',
-            'llGetEnergy',
-            'llGetForce',
-            'llGetFreeMemory',
-            'llGetGeometricCenter',
-            'llGetGMTclock',
-            'llGetInventoryCreator',
-            'llGetInventoryKey',
-            'llGetInventoryName',
-            'llGetInventoryNumber',
-            'llGetInventoryPermMask',
-            'llGetInventoryType',
-            'llGetKey',
-            'llGetLandOwnerAt',
-            'llGetLinkKey',
-            'llGetLinkName',
-            'llGetLinkNumber',
-            'llGetListEntryType',
-            'llGetListLength',
-            'llGetLocalPos',
-            'llGetLocalRot',
-            'llGetMass',
-            'llGetNextEmail',
-            'llGetNotecardLine',
-            'llGetNumberOfNotecardLines',
-            'llGetNumberOfPrims',
-            'llGetNumberOfSides',
-            'llGetObjectDesc',
-            'llGetObjectDetails',
-            'llGetObjectMass',
-            'llGetObjectName',
-            'llGetObjectPermMask',
-            'llGetObjectPrimCount',
-            'llGetOmega',
-            'llGetOwner',
-            'llGetOwnerKey',
-            'llGetParcelDetails',
-            'llGetParcelFlags',
-            'llGetParcelMaxPrims',
-            'llGetParcelPrimCount',
-            'llGetParcelPrimOwners',
-            'llGetPermissions',
-            'llGetPermissionsKey',
-            'llGetPos',
-            'llGetPrimitiveParams',
-            'llGetRegionAgentCount',
-            'llGetRegionCorner',
-            'llGetRegionFlags',
-            'llGetRegionFPS',
-            'llGetRegionName',
-            'llGetRegionTimeDilation',
-            'llGetRootPosition',
-            'llGetRootRotation',
-            'llGetRot',
-            'llGetScale',
-            'llGetScriptName',
-            'llGetScriptState',
-            'llGetSimulatorHostname',
-            'llGetStartParameter',
-            'llGetStatus',
-            'llGetSubString',
-            'llGetSunDirection',
-            'llGetTexture',
-            'llGetTextureOffset',
-            'llGetTextureRot',
-            'llGetTextureScale',
-            'llGetTime',
-            'llGetTimeOfDay',
-            'llGetTimestamp',
-            'llGetTorque',
-            'llGetUnixTime',
-            'llGetVel',
-            'llGetWallclock',
-            'llGiveInventory',
-            'llGiveInventoryList',
-            'llGiveMoney',
-            'llGround',
-            'llGroundContour',
-            'llGroundNormal',
-            'llGroundRepel',
-            'llGroundSlope',
-            'llHTTPRequest',
-            'llInsertString',
-            'llInstantMessage',
-            'llIntegerToBase64',
-            'llKey2Name',
-            'llList2CSV',
-            'llList2Float',
-            'llList2Integer',
-            'llList2Key',
-            'llList2List',
-            'llList2ListStrided',
-            'llList2Rot',
-            'llList2String',
-            'llList2Vector',
-            'llListen',
-            'llListenControl',
-            'llListenRemove',
-            'llListFindList',
-            'llListInsertList',
-            'llListRandomize',
-            'llListReplaceList',
-            'llListSort',
-            'llListStatistics',
-            'llLoadURL',
-            'llLog',
-            'llLog10',
-            'llLookAt',
-            'llLoopSound',
-            'llLoopSoundMaster',
-            'llLoopSoundSlave',
-            'llMapDestination',
-            'llMD5String',
-            'llMessageLinked',
-            'llMinEventDelay',
-            'llModifyLand',
-            'llModPow',
-            'llMoveToTarget',
-            'llOffsetTexture',
-            'llOpenRemoteDataChannel',
-            'llOverMyLand',
-            'llOwnerSay',
-            'llParcelMediaCommandList',
-            'llParcelMediaQuery',
-            'llParseString2List',
-            'llParseStringKeepNulls',
-            'llParticleSystem',
-            'llPassCollisions',
-            'llPassTouches',
-            'llPlaySound',
-            'llPlaySoundSlave',
-            'llPow',
-            'llPreloadSound',
-            'llPushObject',
-            'llRegionSay',
-            'llReleaseControls',
-            'llRemoteDataReply',
-            'llRemoteDataSetRegion',
-            'llRemoteLoadScriptPin',
-            'llRemoveFromLandBanList',
-            'llRemoveFromLandPassList',
-            'llRemoveInventory',
-            'llRemoveVehicleFlags',
-            'llRequestAgentData',
-            'llRequestInventoryData',
-            'llRequestPermissions',
-            'llRequestSimulatorData',
-            'llResetLandBanList',
-            'llResetLandPassList',
-            'llResetOtherScript',
-            'llResetScript',
-            'llResetTime',
-            'llRezAtRoot',
-            'llRezObject',
-            'llRot2Angle',
-            'llRot2Axis',
-            'llRot2Euler',
-            'llRot2Fwd',
-            'llRot2Left',
-            'llRot2Up',
-            'llRotateTexture',
-            'llRotBetween',
-            'llRotLookAt',
-            'llRotTarget',
-            'llRotTargetRemove',
-            'llRound',
-            'llSameGroup',
-            'llSay',
-            'llScaleTexture',
-            'llScriptDanger',
-            'llSendRemoteData',
-            'llSensor',
-            'llSensorRemove',
-            'llSensorRepeat',
-            'llSetAlpha',
-            'llSetBuoyancy',
-            'llSetCameraAtOffset',
-            'llSetCameraEyeOffset',
-            'llSetCameraParams',
-            'llSetClickAction',
-            'llSetColor',
-            'llSetDamage',
-            'llSetForce',
-            'llSetForceAndTorque',
-            'llSetHoverHeight',
-            'llSetLinkAlpha',
-            'llSetLinkColor',
-            'llSetLinkPrimitiveParams',
-            'llSetLinkTexture',
-            'llSetLocalRot',
-            'llSetObjectDesc',
-            'llSetObjectName',
-            'llSetParcelMusicURL',
-            'llSetPayPrice',
-            'llSetPos',
-            'llSetPrimitiveParams',
-            'llSetRemoteScriptAccessPin',
-            'llSetRot',
-            'llSetScale',
-            'llSetScriptState',
-            'llSetSitText',
-            'llSetSoundQueueing',
-            'llSetSoundRadius',
-            'llSetStatus',
-            'llSetText',
-            'llSetTexture',
-            'llSetTextureAnim',
-            'llSetTimerEvent',
-            'llSetTorque',
-            'llSetTouchText',
-            'llSetVehicleFlags',
-            'llSetVehicleFloatParam',
-            'llSetVehicleRotationParam',
-            'llSetVehicleType',
-            'llSetVehicleVectorParam',
-            'llSHA1String',
-            'llShout',
-            'llSin',
-            'llSitTarget',
-            'llSleep',
-            'llSqrt',
-            'llStartAnimation',
-            'llStopAnimation',
-            'llStopHover',
-            'llStopLookAt',
-            'llStopMoveToTarget',
-            'llStopSound',
-            'llStringLength',
-            'llStringToBase64',
-            'llStringTrim',
-            'llSubStringIndex',
-            'llTakeControls',
-            'llTan',
-            'llTarget',
-            'llTargetOmega',
-            'llTargetRemove',
-            'llTeleportAgentHome',
-            'llToLower',
-            'llToUpper',
-            'llTriggerSound',
-            'llTriggerSoundLimited',
-            'llUnescapeURL',
-            'llUnSit',
-            'llVecDist',
-            'llVecMag',
-            'llVecNorm',
-            'llVolumeDetect',
-            'llWater',
-            'llWhisper',
-            'llWind',
-            'llXorBase64StringsCorrect',
-            ),
-        6 => array( // deprecated
-            'llMakeExplosion',
-            'llMakeFire',
-            'llMakeFountain',
-            'llMakeSmoke',
-            'llSound',
-            'llSoundPreload',
-            'llXorBase64Strings',
-            ),
-        7 => array( // unimplemented
-            'llPointAt',
-            'llRefreshPrimURL',
-            'llReleaseCamera',
-            'llRemoteLoadScript',
-            'llSetPrimURL',
-            'llStopPointAt',
-            'llTakeCamera',
-            'llTextBox',
-            ),
-        8 => array( // God mode
-            'llGodLikeRezObject',
-            'llSetInventoryPermMask',
-            'llSetObjectPermMask',
-            ),
-        ),
-    'SYMBOLS' => array(
-        '{', '}', '(', ')', '[', ']',
-        '=', '+', '-', '*', '/',
-        '+=', '-=', '*=', '/=', '++', '--',
-        '!', '%', '&amp;', '|', '&amp;&amp;', '||',
-        '==', '!=', '&lt;', '&gt;', '&lt;=', '&gt;=',
-        '~', '&lt;&lt;', '&gt;&gt;', '^', ':',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #000080;',
-            3 => 'color: #008080;',
-            4 => 'color: #228b22;',
-            5 => 'color: #b22222;',
-            6 => 'color: #8b0000; background-color: #ffff00;',
-            7 => 'color: #8b0000; background-color: #fa8072;',
-            8 => 'color: #000000; background-color: #ba55d3;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #ff7f50; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #006400;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
-        4 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
-        5 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
-        6 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
-        7 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
-        8 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-?>
\ No newline at end of file
diff --git a/inc/geshi/lua.php b/inc/geshi/lua.php
deleted file mode 100644
index 8a09ba20e..000000000
--- a/inc/geshi/lua.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/*************************************************************************************
- * lua.php
- * -------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/10
- *
- * LUA language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/08/26 (1.0.2)
- *  -  Added support for objects and methods
- *  -  Removed unusable keywords
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Lua',
-    'COMMENT_SINGLE' => array(1 => "--"),
-    'COMMENT_MULTI' => array('--[[' => ']]'),
-    'COMMENT_REGEXP' => array(2 => '/\[(=*)\[.*?\]\1\]/s'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\abfnrtv\'\"]#i",
-        //Octal Char Specs
-        2 => "#\\\\\\d{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_NONSCI | GESHI_NUMBER_FLT_NONSCI_F |
-        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'break','do','else','elseif','end','for','function','if',
-            'local','repeat','return','then','until','while'
-            ),
-        2 => array(
-            'and','in','not','or'
-            ),
-        3 => array(
-            '_VERSION','assert','collectgarbage','dofile','error','gcinfo','loadfile','loadstring',
-            'print','tonumber','tostring','type','unpack',
-            '_ALERT','_ERRORMESSAGE','_INPUT','_PROMPT','_OUTPUT',
-            '_STDERR','_STDIN','_STDOUT','call','dostring','foreach','foreachi','getn','globals','newtype',
-            'rawget','rawset','require','sort','tinsert','tremove',
-            'abs','acos','asin','atan','atan2','ceil','cos','deg','exp',
-            'floor','format','frexp','gsub','ldexp','log','log10','max','min','mod','rad','random','randomseed',
-            'sin','sqrt','strbyte','strchar','strfind','strlen','strlower','strrep','strsub','strupper','tan',
-            'openfile','closefile','readfrom','writeto','appendto',
-            'remove','rename','flush','seek','tmpfile','tmpname','read','write',
-            'clock','date','difftime','execute','exit','getenv','setlocale','time',
-            '_G','getfenv','getmetatable','ipairs','loadlib','next','pairs','pcall',
-            'rawegal','setfenv','setmetatable','xpcall',
-            'string.byte','string.char','string.dump','string.find','string.len',
-            'string.lower','string.rep','string.sub','string.upper','string.format','string.gfind','string.gsub',
-            'table.concat','table.foreach','table.foreachi','table.getn','table.sort','table.insert','table.remove','table.setn',
-            'math.abs','math.acos','math.asin','math.atan','math.atan2','math.ceil','math.cos','math.deg','math.exp',
-            'math.floor','math.frexp','math.ldexp','math.log','math.log10','math.max','math.min','math.mod',
-            'math.pi','math.rad','math.random','math.randomseed','math.sin','math.sqrt','math.tan',
-            'coroutine.create','coroutine.resume','coroutine.status',
-            'coroutine.wrap','coroutine.yield',
-            'io.close','io.flush','io.input','io.lines','io.open','io.output','io.read','io.tmpfile','io.type','io.write',
-            'io.stdin','io.stdout','io.stderr',
-            'os.clock','os.date','os.difftime','os.execute','os.exit','os.getenv','os.remove','os.rename',
-            'os.setlocale','os.time','os.tmpname',
-            'string','table','math','coroutine','io','os','debug'
-            ),
-        4 => array(
-            'nil', 'false', 'true'
-            ),
-        5 => array(
-            'Nil', 'Boolean', 'Number', 'String', 'Userdata', 'Thread', 'Table'
-            )
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '/', '%', '^', '#',
-        '==', '~=', '<=', '>=', '<', '>', '=',
-        '(', ')', '{', '}', '[', ']',
-        ';', ':', ',', '.', '..', '...'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #aa9900; font-weight: bold;',
-            2 => 'color: #aa9900; font-weight: bold;',
-            3 => 'color: #0000aa;',
-            4 => 'color: #aa9900;',
-            5 => 'color: #aa9900;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #ff0000;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff6666;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #aa9900;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/m68k.php b/inc/geshi/m68k.php
deleted file mode 100644
index 98321577b..000000000
--- a/inc/geshi/m68k.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/*************************************************************************************
- * m68k.php
- * --------
- * Author: Benny Baumann (BenBE@omorphia.de)
- * Copyright: (c) 2007 Benny Baumann (http://www.omorphia.de/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2007/02/06
- *
- * Motorola 68000 Assembler language file for GeSHi.
- *
- * Syntax definition as commonly used by the motorola documentation for the
- * MC68HC908GP32 Microcontroller (and maybe others).
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2007/06/02 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2007/06/02)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Motorola 68000 Assembler',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /*CPU*/
-        1 => array(
-            'adc','add','ais','aix','and','asl','asr','bcc','bclr','bcs','beq',
-            'bge','bgt','bhcc','bhcs','bhi','bhs','bih','bil','bit','ble','blo',
-            'bls','blt','bmc','bmi','bms','bne','bpl','bra','brclr','brn',
-            'brset','bset','bsr','cbeq','clc','cli','clr','cmp','com','cphx',
-            'cpx','daa','dbnz','dec','div','eor','inc','jmp','jsr','lda','ldhx',
-            'ldx','lsl','lsr','mov','mul','neg','nop','nsa','ora','psha','pshh',
-            'pshx','pula','pulh','pulx','rol','ror','rsp','rti','rts','sbc',
-            'sec','sei','sta','sthx','stop','stx','sub','swi','tap','tax','tpa',
-            'tst','tsx','txa','txs','wait'
-        ),
-        /*registers*/
-        2 => array(
-            'a','h','x',
-            'hx','sp'
-            ),
-        /*Directive*/
-        3 => array(
-            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
-            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
-            ),
-        ),
-    'SYMBOLS' => array(
-        ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff; font-weight:bold;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #46aa03; font-weight:bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #dd22dd;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #22bbff;',
-            1 => 'color: #22bbff;',
-            2 => 'color: #993333;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-        0 => '#?0[0-9a-fA-F]{1,32}[hH]',
-        //Binary numbers
-        1 => '\%[01]{1,64}[bB]',
-        //Labels
-        2 => '^[_a-zA-Z][_a-zA-Z0-9]*?\:'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8
-);
-
-?>
diff --git a/inc/geshi/magiksf.php b/inc/geshi/magiksf.php
deleted file mode 100644
index 612e1603e..000000000
--- a/inc/geshi/magiksf.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/*************************************************************************************
- * magiksf.php
- * --------
- * Author: Sjoerd van Leent (svanleent@gmail.com)
- * Copyright: (c) 2010 Sjoerd van Leent
- * Release Version: 1.0.8.11
- * Date Started: 2010/02/15
- *
- * MagikSF language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/02/22 (1.0.0.2)
- *   - Symbols also accept the ! and ? characters properly
- *   - Labels (identifiers starting with !) are also coloured
- * 2010/02/17 (1.0.0.1)
- *   -  Parsing out symbols better
- *   -  Add package identifiers
- * 2010/02/15 (1.0.0)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'ESCAPE_CHAR' => null,
-    'LANG_NAME' => 'MagikSF',
-    'COMMENT_SINGLE' => array(1 => '##', 2 => '#%', 3 => '#'),
-    'COMMENT_MULTI' => array("_pragma(" => ")"),
-    //Multiline-continued single-line comments
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            '_block', '_endblock', '_proc', '_endproc', '_loop', '_endloop',
-            '_method', '_endmethod',
-            '_protect', '_endprotect', '_protection', '_locking',
-            '_continue',
-            ),
-        2 => array(
-            '_self', '_thisthread', '_pragma', '_private', '_abstract',
-            '_local', '_global', '_dynamic', '_package', '_constant',
-            '_import', '_iter', '_lock', '_optional', '_recursive', '_super'
-            ),
-        3 => array(
-            '_if', '_endif', '_then', '_else', '_elif', '_orif', '_andif', '_for', '_over',
-            '_try', '_endtry', '_when', '_throw', '_catch', '_endcatch', '_handling',
-            '_finally', '_loopbody', '_return', '_leave', '_with'
-            ),
-        4 => array(
-            '_false', '_true', '_maybe', '_unset', '_no_way'
-            ),
-        5 => array(
-            '_mod', '_div', '_or', '_and', '_cf', '_is', '_isnt', '_not', '_gather', '_scatter',
-            '_allresults', '_clone', '_xor'
-            ),
-        6 => array(
-            'def_slotted_exemplar', 'write_string', 'write', 'condition',
-            'record_transaction', 'gis_program_manager', 'perform', 'define_shared_constant',
-            'property_list', 'rope', 'def_property', 'def_mixin'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']',
-        '+', '-', '*', '/', '**',
-        '=', '<', '>', '<<', '>>',
-        ',', '$',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #ff3f3f;',
-            3 => 'color: #3f7f3f; font-weight: bold;',
-            4 => 'color: #cc66cc;',
-            5 => 'color: #ff3fff; font-weight: bold;',
-            6 => 'font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #339933; font-weight: bold;',
-            2 => 'color: #993333;',
-            3 => 'color: #339933;',
-            'MULTI' => 'color: #7f7f7f; font-style: italic',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #ff3f3f;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #ff3f3f;'
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #3f3fff;',
-            2 => 'color: #3f3fff;',
-            3 => 'color: #cc66cc;',
-            4 => 'color: #7f3f7f; font-style: italic;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        1 => array(
-            GESHI_SEARCH => '\b[a-zA-Z0-9_]+:', // package identifiers
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        2 => array(
-            GESHI_SEARCH => ':(?:[a-zA-Z0-9!?_]+|(?:[<pipe>].*?[<pipe>]))*', //symbols
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        3 => array(
-            GESHI_SEARCH => '%space|%tab|%newline|%.', //characters
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        4 => array(
-            GESHI_SEARCH => '@(?:[a-zA-Z0-9!?_]+|(?:[<pipe>].*?[<pipe>]))*', //symbols
-            GESHI_REPLACE => '\\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/make.php b/inc/geshi/make.php
deleted file mode 100644
index 885fa1765..000000000
--- a/inc/geshi/make.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/*************************************************************************************
- * make.php
- * --------
- * Author: Neil Bird <phoenix@fnxweb.com>
- * Copyright: (c) 2008 Neil Bird
- * Release Version: 1.0.8.11
- * Date Started: 2008/08/26
- *
- * make language file for GeSHi.
- *
- * (GNU make specific)
- *
- * CHANGES
- * -------
- * 2008/09/05 (1.0.0)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GNU make',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_REGEXP' => array(
-        //Escaped String Starters
-        2 => "/\\\\['\"]/siU"
-        ),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            // core
-            'ifeq', 'else', 'endif', 'ifneq', 'ifdef', 'ifndef',
-            'include', 'vpath', 'export', 'unexport', 'override',
-            'info', 'warning', 'error'
-            ),
-        2 => array(
-            // macros, literals
-            '.SUFFIXES', '.PHONY', '.DEFAULT', '.PRECIOUS', '.IGNORE', '.SILENT', '.EXPORT_ALL_VARIABLES', '.KEEP_STATE',
-            '.LIBPATTERNS', '.NOTPARALLEL', '.DELETE_ON_ERROR', '.INTERMEDIATE', '.POSIX', '.SECONDARY'
-            ),
-        /*
-        3 => array(
-            // funcs - see regex
-            //'subst', 'addprefix', 'addsuffix', 'basename', 'call', 'dir', 'error', 'eval', 'filter-out', 'filter',
-            //'findstring', 'firstword', 'foreach', 'if', 'join', 'notdir', 'origin', 'patsubst', 'shell', 'sort', 'strip',
-            //'suffix', 'warning', 'wildcard', 'word', 'wordlist', 'words'
-            )*/
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '!', '@', '%', '&', '|', '/',
-        '<', '>',
-        '=', '-', '+', '*',
-        '.', ':', ',', ';',
-        '$'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        //3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #666622; font-weight: bold;',
-            2 => 'color: #990000;',
-            //3 => 'color: #000000; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #339900; font-style: italic;',
-            2 => 'color: #000099; font-weight: bold;',
-            'MULTI' => ''
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(  # keep same as symbols so as to make ${} and $() equiv.
-            0 => 'color: #004400;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #CC2200;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #CC2200;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #004400;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000088; font-weight: bold;',
-            1 => 'color: #0000CC; font-weight: bold;',
-            2 => 'color: #000088;'
-            ),
-        'SCRIPT' => array(),
-        'METHODS' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        //3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        //Simple variables
-        0 => "\\$(?:[^{(&]|&(?:amp|lt|gt);)",
-        //Complex variables/functions [built-ins]
-        1 => array(
-            GESHI_SEARCH => '(\\$[({])(subst|addprefix|addsuffix|basename|call|dir|error|eval|filter-out|filter,|findstring|firstword|foreach|if|join|notdir|origin|patsubst|shell|sort|strip,|suffix|warning|wildcard|word|wordlist|words)([ })])',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-            //Complex variables/functions [others]
-        2 => array(
-            GESHI_SEARCH => '(\\$[({])([A-Za-z_][A-Za-z_0-9]*)([ })])',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'TAB_WIDTH' => 8
-// vim: set sw=4 sts=4 :
-);
-?>
diff --git a/inc/geshi/mapbasic.php b/inc/geshi/mapbasic.php
deleted file mode 100644
index 8859c4831..000000000
--- a/inc/geshi/mapbasic.php
+++ /dev/null
@@ -1,908 +0,0 @@
-<?php
-/*************************************************************************************
- * mapbasic.php
- * ------
- * Author: Tomasz Berus (t.berus@gisodkuchni.pl)
- * Copyright: (c) 2009 Tomasz Berus (http://sourceforge.net/projects/mbsyntax/)
- * Release Version: 1.0.8.11
- * Date Started: 2008/11/25
- *
- * MapBasic language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/09/17 (1.0.1)
- *  -  Replaced all tabs with spaces
- *  -  Fixed 'URLS' array
- * 2008/11/25 (1.0.0)
- *  -  First Release (MapBasic v9.5)
- *
- * TODO (updated 2008/11/25)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'MapBasic',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-/*
-        1 - Statements + Clauses + Data Types + Logical Operators, Geographical Operators + SQL
-        2 - Special Procedures
-        3 - Functions
-        4 - Constants
-        5 - Extended keywords (case sensitive)
-*/
-        1 => array(
-            'Add', 'Alias', 'All', 'Alter', 'And', 'Any', 'Application', 'Arc',
-            'Area', 'As', 'AutoLabel', 'Bar', 'Beep', 'Begin', 'Bind',
-            'Browse', 'Brush', 'BrushPicker', 'Button', 'ButtonPad',
-            'ButtonPads', 'BY', 'Call', 'CancelButton', 'Cartographic', 'Case',
-            'CharSet', 'Check', 'CheckBox', 'Clean', 'Close', 'Collection',
-            'Column', 'Combine', 'Command', 'Commit', 'Connection',
-            'ConnectionNumber', 'Contains', 'Continue', 'Control', 'CoordSys',
-            'Create', 'Cutter', 'Date', 'Datum', 'DDEExecute', 'DDEPoke',
-            'DDETerminate', 'DDETerminateAll', 'Declare', 'Default', 'Define',
-            'Delete', 'Dialog', 'Digitizer', 'Dim', 'Disaggregate',
-            'Disconnect', 'Distance', 'Do', 'Document', 'DocumentWindow',
-            'Drag', 'Drop', 'EditText', 'Ellipse', 'Enclose', 'End', 'Entire',
-            'Entirely', 'Erase', 'Error', 'Event', 'Exit', 'Export',
-            'Farthest', 'Fetch', 'File', 'Find', 'Float', 'FME', 'Font',
-            'FontPicker', 'For', 'Format', 'Frame', 'From', 'Function',
-            'Geocode', 'Get', 'Global', 'Goto', 'Graph', 'Grid', 'GROUP',
-            'GroupBox', 'Handler', 'If', 'Import', 'In', 'Include', 'Index',
-            'Info', 'Input', 'Insert', 'Integer', 'Intersect', 'Intersects',
-            'INTO', 'Isogram', 'Item', 'Kill', 'Layout', 'Legend', 'Line',
-            'Link', 'ListBox', 'Logical', 'Loop', 'Map', 'Map3D', 'MapInfo',
-            'MapInfoDialog', 'Menu', 'Merge', 'Metadata', 'Method', 'Mod',
-            'Move', 'MultiListBox', 'MultiPoint', 'MWS', 'Nearest', 'Next',
-            'NOSELECT', 'Not', 'Note', 'Object', 'Objects', 'Offset',
-            'OKButton', 'OnError', 'Open', 'Or', 'ORDER', 'Overlay', 'Pack',
-            'Paper', 'Part', 'Partly', 'Pen', 'PenPicker', 'Pline', 'Point',
-            'PopupMenu', 'Preserve', 'Print', 'PrintWin', 'PrismMap',
-            'Processing', 'Program', 'ProgressBar', 'ProgressBars', 'Put',
-            'RadioGroup', 'Randomize', 'Ranges', 'Rect', 'ReDim',
-            'Redistricter', 'Refresh', 'Region', 'Register', 'Relief',
-            'Reload', 'Remove', 'Rename', 'Report', 'Reproject', 'Resolution',
-            'Resume', 'Rollback', 'RoundRect', 'RowID', 'Run', 'Save', 'Seek',
-            'Select', 'Selection', 'Server', 'Set', 'Shade', 'SmallInt',
-            'Snap', 'Split', 'StaticText', 'StatusBar', 'Stop', 'String',
-            'Style', 'Styles', 'Sub', 'Symbol', 'SymbolPicker', 'Symbols',
-            'Table', 'Target', 'Terminate', 'Text', 'Then', 'Threshold',
-            'Timeout', 'To', 'Transaction', 'Transform', 'Type', 'UnDim',
-            'Units', 'Unlink', 'Update', 'Using', 'VALUES', 'Version',
-            'Versioning', 'Wend', 'WFS', 'WHERE', 'While', 'Window', 'Within',
-            'Workspace', 'Write'
-            ),
-        2 => array(
-            'EndHandler', 'ForegroundTaskSwitchHandler', 'Main',
-            'RemoteMapGenHandler', 'RemoteMsgHandler', 'SelChangedHandler',
-            'ToolHandler', 'WinChangedHandler', 'WinClosedHandler',
-            'WinFocusChangedHandler'
-            ),
-        3 => array(
-            'Abs', 'Acos', 'ApplicationDirectory$', 'AreaOverlap', 'Asc',
-            'Asin', 'Ask', 'Atn', 'Avg', 'Buffer', 'ButtonPadInfo',
-            'CartesianArea', 'CartesianBuffer', 'CartesianConnectObjects',
-            'CartesianDistance', 'CartesianObjectDistance',
-            'CartesianObjectLen', 'CartesianOffset', 'CartesianOffsetXY',
-            'CartesianPerimeter', 'Centroid', 'CentroidX', 'CentroidY',
-            'ChooseProjection$', 'Chr$', 'ColumnInfo', 'CommandInfo',
-            'ConnectObjects', 'ControlPointInfo', 'ConvertToPline',
-            'ConvertToRegion', 'ConvexHull', 'CoordSysName$', 'Cos', 'Count',
-            'CreateCircle', 'CreateLine', 'CreatePoint', 'CreateText',
-            'CurDate', 'CurrentBorderPen', 'CurrentBrush', 'CurrentFont',
-            'CurrentLinePen', 'CurrentPen', 'CurrentSymbol', 'DateWindow',
-            'Day', 'DDEInitiate', 'DDERequest$', 'DeformatNumber$', 'EOF',
-            'EOT', 'EPSGToCoordSysString$', 'Err', 'Error$', 'Exp',
-            'ExtractNodes', 'FileAttr', 'FileExists', 'FileOpenDlg',
-            'FileSaveAsDlg', 'Fix', 'Format$', 'FormatDate$', 'FormatNumber$',
-            'FrontWindow', 'GeocodeInfo', 'GetFolderPath$', 'GetGridCellValue',
-            'GetMetadata$', 'GetSeamlessSheet', 'GridTableInfo',
-            'HomeDirectory$', 'InStr', 'Int', 'IntersectNodes',
-            'IsGridCellNull', 'IsogramInfo', 'IsPenWidthPixels',
-            'LabelFindByID', 'LabelFindFirst', 'LabelFindNext', 'LabelInfo',
-            'LayerInfo', 'LCase$', 'Left$', 'LegendFrameInfo', 'LegendInfo',
-            'LegendStyleInfo', 'Len', 'Like', 'LocateFile$', 'LOF', 'Log',
-            'LTrim$', 'MakeBrush', 'MakeCustomSymbol', 'MakeFont',
-            'MakeFontSymbol', 'MakePen', 'MakeSymbol', 'Map3DInfo',
-            'MapperInfo', 'Max', 'Maximum', 'MBR', 'MenuItemInfoByHandler',
-            'MenuItemInfoByID', 'MGRSToPoint', 'MICloseContent',
-            'MICloseFtpConnection', 'MICloseFtpFileFind',
-            'MICloseHttpConnection', 'MICloseHttpFile', 'MICloseSession',
-            'MICreateSession', 'MICreateSessionFull', 'Mid$', 'MidByte$',
-            'MIErrorDlg', 'MIFindFtpFile', 'MIFindNextFtpFile', 'MIGetContent',
-            'MIGetContentBuffer', 'MIGetContentLen', 'MIGetContentString',
-            'MIGetContentToFile', 'MIGetContentType',
-            'MIGetCurrentFtpDirectory', 'MIGetErrorCode', 'MIGetErrorMessage',
-            'MIGetFileURL', 'MIGetFtpConnection', 'MIGetFtpFile',
-            'MIGetFtpFileFind', 'MIGetFtpFileName', 'MIGetHttpConnection',
-            'MIIsFtpDirectory', 'MIIsFtpDots', 'Min', 'Minimum',
-            'MIOpenRequest', 'MIOpenRequestFull', 'MIParseURL', 'MIPutFtpFile',
-            'MIQueryInfo', 'MIQueryInfoStatusCode', 'MISaveContent',
-            'MISendRequest', 'MISendSimpleRequest', 'MISetCurrentFtpDirectory',
-            'MISetSessionTimeout', 'MIXmlAttributeListDestroy',
-            'MIXmlDocumentCreate', 'MIXmlDocumentDestroy',
-            'MIXmlDocumentGetNamespaces', 'MIXmlDocumentGetRootNode',
-            'MIXmlDocumentLoad', 'MIXmlDocumentLoadXML',
-            'MIXmlDocumentLoadXMLString', 'MIXmlDocumentSetProperty',
-            'MIXmlGetAttributeList', 'MIXmlGetChildList',
-            'MIXmlGetNextAttribute', 'MIXmlGetNextNode', 'MIXmlNodeDestroy',
-            'MIXmlNodeGetAttributeValue', 'MIXmlNodeGetFirstChild',
-            'MIXmlNodeGetName', 'MIXmlNodeGetParent', 'MIXmlNodeGetText',
-            'MIXmlNodeGetValue', 'MIXmlNodeListDestroy', 'MIXmlSCDestroy',
-            'MIXmlSCGetLength', 'MIXmlSCGetNamespace', 'MIXmlSelectNodes',
-            'MIXmlSelectSingleNode', 'Month', 'NumAllWindows', 'NumberToDate',
-            'NumCols', 'NumTables', 'NumWindows', 'ObjectDistance',
-            'ObjectGeography', 'ObjectInfo', 'ObjectLen', 'ObjectNodeHasM',
-            'ObjectNodeHasZ', 'ObjectNodeM', 'ObjectNodeX', 'ObjectNodeY',
-            'ObjectNodeZ', 'OffsetXY', 'Overlap', 'OverlayNodes',
-            'PathToDirectory$', 'PathToFileName$', 'PathToTableName$',
-            'PenWidthToPoints', 'Perimeter', 'PointsToPenWidth',
-            'PointToMGRS$', 'PrismMapInfo', 'ProgramDirectory$', 'Proper$',
-            'ProportionOverlap', 'RasterTableInfo', 'ReadControlValue',
-            'RegionInfo', 'RemoteQueryHandler', 'RGB', 'Right$', 'Rnd',
-            'Rotate', 'RotateAtPoint', 'Round', 'RTrim$', 'SearchInfo',
-            'SearchPoint', 'SearchRect', 'SelectionInfo', 'Server_ColumnInfo',
-            'Server_Connect', 'Server_ConnectInfo', 'Server_DriverInfo',
-            'Server_EOT', 'Server_Execute', 'Server_GetODBCHConn',
-            'Server_GetODBCHStmt', 'Server_NumCols', 'Server_NumDrivers',
-            'SessionInfo', 'Sgn', 'Sin', 'Space$', 'SphericalArea',
-            'SphericalConnectObjects', 'SphericalDistance',
-            'SphericalObjectDistance', 'SphericalObjectLen', 'SphericalOffset',
-            'SphericalOffsetXY', 'SphericalPerimeter', 'Sqr', 'Str$',
-            'String$', 'StringCompare', 'StringCompareIntl', 'StringToDate',
-            'StyleAttr', 'Sum', 'SystemInfo', 'TableInfo', 'Tan',
-            'TempFileName$', 'TextSize', 'Time', 'Timer', 'TriggerControl',
-            'TrueFileName$', 'UBound', 'UCase$', 'UnitAbbr$', 'UnitName$',
-            'Val', 'Weekday', 'WindowID', 'WindowInfo', 'WtAvg', 'Year'
-            ),
-        4 => array(
-            'BLACK', 'BLUE', 'BRUSH_BACKCOLOR', 'BRUSH_FORECOLOR',
-            'BRUSH_PATTERN', 'BTNPAD_INFO_FLOATING', 'BTNPAD_INFO_NBTNS',
-            'BTNPAD_INFO_WIDTH', 'BTNPAD_INFO_WINID', 'BTNPAD_INFO_X',
-            'BTNPAD_INFO_Y', 'CLS', 'CMD_INFO_CTRL', 'CMD_INFO_CUSTOM_OBJ',
-            'CMD_INFO_DLG_DBL', 'CMD_INFO_DLG_OK', 'CMD_INFO_EDIT_ASK',
-            'CMD_INFO_EDIT_DISCARD', 'CMD_INFO_EDIT_SAVE',
-            'CMD_INFO_EDIT_STATUS', 'CMD_INFO_EDIT_TABLE', 'CMD_INFO_FIND_RC',
-            'CMD_INFO_FIND_ROWID', 'CMD_INFO_HL_FILE_NAME',
-            'CMD_INFO_HL_LAYER_ID', 'CMD_INFO_HL_ROWID',
-            'CMD_INFO_HL_TABLE_NAME', 'CMD_INFO_HL_WINDOW_ID',
-            'CMD_INFO_INTERRUPT', 'CMD_INFO_MENUITEM', 'CMD_INFO_MSG',
-            'CMD_INFO_ROWID', 'CMD_INFO_SELTYPE', 'CMD_INFO_SHIFT',
-            'CMD_INFO_STATUS', 'CMD_INFO_TASK_SWITCH', 'CMD_INFO_TOOLBTN',
-            'CMD_INFO_WIN', 'CMD_INFO_X', 'CMD_INFO_X2', 'CMD_INFO_XCMD',
-            'CMD_INFO_Y', 'CMD_INFO_Y2', 'COL_INFO_DECPLACES',
-            'COL_INFO_EDITABLE', 'COL_INFO_INDEXED', 'COL_INFO_NAME',
-            'COL_INFO_NUM', 'COL_INFO_TYPE', 'COL_INFO_WIDTH', 'COL_TYPE_CHAR',
-            'COL_TYPE_DATE', 'COL_TYPE_DATETIME', 'COL_TYPE_DECIMAL',
-            'COL_TYPE_FLOAT', 'COL_TYPE_GRAPHIC', 'COL_TYPE_INTEGER',
-            'COL_TYPE_LOGICAL', 'COL_TYPE_SMALLINT', 'COL_TYPE_TIME', 'CYAN',
-            'DATE_WIN_CURPROG', 'DATE_WIN_SESSION', 'DEG_2_RAD',
-            'DICTIONARY_ADDRESS_ONLY', 'DICTIONARY_ALL',
-            'DICTIONARY_PREFER_ADDRESS', 'DICTIONARY_PREFER_USER',
-            'DICTIONARY_USER_ONLY', 'DM_CUSTOM_CIRCLE', 'DM_CUSTOM_ELLIPSE',
-            'DM_CUSTOM_LINE', 'DM_CUSTOM_POINT', 'DM_CUSTOM_POLYGON',
-            'DM_CUSTOM_POLYLINE', 'DM_CUSTOM_RECT', 'DMPAPER_10X11',
-            'DMPAPER_10X14', 'DMPAPER_11X17', 'DMPAPER_12X11', 'DMPAPER_15X11',
-            'DMPAPER_9X11', 'DMPAPER_A_PLUS', 'DMPAPER_A2', 'DMPAPER_A3',
-            'DMPAPER_A3_EXTRA', 'DMPAPER_A3_EXTRA_TRANSVERSE',
-            'DMPAPER_A3_ROTATED', 'DMPAPER_A3_TRANSVERSE', 'DMPAPER_A4',
-            'DMPAPER_A4_EXTRA', 'DMPAPER_A4_PLUS', 'DMPAPER_A4_ROTATED',
-            'DMPAPER_A4_TRANSVERSE', 'DMPAPER_A4SMALL', 'DMPAPER_A5',
-            'DMPAPER_A5_EXTRA', 'DMPAPER_A5_ROTATED', 'DMPAPER_A5_TRANSVERSE',
-            'DMPAPER_A6', 'DMPAPER_A6_ROTATED', 'DMPAPER_B_PLUS', 'DMPAPER_B4',
-            'DMPAPER_B4_JIS_ROTATED', 'DMPAPER_B5', 'DMPAPER_B5_EXTRA',
-            'DMPAPER_B5_JIS_ROTATED', 'DMPAPER_B5_TRANSVERSE',
-            'DMPAPER_B6_JIS', 'DMPAPER_B6_JIS_ROTATED', 'DMPAPER_CSHEET',
-            'DMPAPER_DBL_JAPANESE_POSTCARD',
-            'DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED', 'DMPAPER_DSHEET',
-            'DMPAPER_ENV_10', 'DMPAPER_ENV_11', 'DMPAPER_ENV_12',
-            'DMPAPER_ENV_14', 'DMPAPER_ENV_9', 'DMPAPER_ENV_B4',
-            'DMPAPER_ENV_B5', 'DMPAPER_ENV_B6', 'DMPAPER_ENV_C3',
-            'DMPAPER_ENV_C4', 'DMPAPER_ENV_C5', 'DMPAPER_ENV_C6',
-            'DMPAPER_ENV_C65', 'DMPAPER_ENV_DL', 'DMPAPER_ENV_INVITE',
-            'DMPAPER_ENV_ITALY', 'DMPAPER_ENV_MONARCH', 'DMPAPER_ENV_PERSONAL',
-            'DMPAPER_ESHEET', 'DMPAPER_EXECUTIVE',
-            'DMPAPER_FANFOLD_LGL_GERMAN', 'DMPAPER_FANFOLD_STD_GERMAN',
-            'DMPAPER_FANFOLD_US', 'DMPAPER_FIRST', 'DMPAPER_FOLIO',
-            'DMPAPER_ISO_B4', 'DMPAPER_JAPANESE_POSTCARD',
-            'DMPAPER_JAPANESE_POSTCARD_ROTATED', 'DMPAPER_JENV_CHOU3',
-            'DMPAPER_JENV_CHOU3_ROTATED', 'DMPAPER_JENV_CHOU4',
-            'DMPAPER_JENV_CHOU4_ROTATED', 'DMPAPER_JENV_KAKU2',
-            'DMPAPER_JENV_KAKU2_ROTATED', 'DMPAPER_JENV_KAKU3',
-            'DMPAPER_JENV_KAKU3_ROTATED', 'DMPAPER_JENV_YOU4',
-            'DMPAPER_JENV_YOU4_ROTATED', 'DMPAPER_LEDGER', 'DMPAPER_LEGAL',
-            'DMPAPER_LEGAL_EXTRA', 'DMPAPER_LETTER', 'DMPAPER_LETTER_EXTRA',
-            'DMPAPER_LETTER_EXTRA_TRANSVERSE', 'DMPAPER_LETTER_PLUS',
-            'DMPAPER_LETTER_ROTATED', 'DMPAPER_LETTER_TRANSVERSE',
-            'DMPAPER_LETTERSMALL', 'DMPAPER_NOTE', 'DMPAPER_P16K',
-            'DMPAPER_P16K_ROTATED', 'DMPAPER_P32K', 'DMPAPER_P32K_ROTATED',
-            'DMPAPER_P32KBIG', 'DMPAPER_P32KBIG_ROTATED', 'DMPAPER_PENV_1',
-            'DMPAPER_PENV_1_ROTATED', 'DMPAPER_PENV_10',
-            'DMPAPER_PENV_10_ROTATED', 'DMPAPER_PENV_2',
-            'DMPAPER_PENV_2_ROTATED', 'DMPAPER_PENV_3',
-            'DMPAPER_PENV_3_ROTATED', 'DMPAPER_PENV_4',
-            'DMPAPER_PENV_4_ROTATED', 'DMPAPER_PENV_5',
-            'DMPAPER_PENV_5_ROTATED', 'DMPAPER_PENV_6',
-            'DMPAPER_PENV_6_ROTATED', 'DMPAPER_PENV_7',
-            'DMPAPER_PENV_7_ROTATED', 'DMPAPER_PENV_8',
-            'DMPAPER_PENV_8_ROTATED', 'DMPAPER_PENV_9',
-            'DMPAPER_PENV_9_ROTATED', 'DMPAPER_QUARTO', 'DMPAPER_RESERVED_48',
-            'DMPAPER_RESERVED_49', 'DMPAPER_STATEMENT', 'DMPAPER_TABLOID',
-            'DMPAPER_TABLOID_EXTRA', 'DMPAPER_USER', 'ERR_BAD_WINDOW',
-            'ERR_BAD_WINDOW_NUM', 'ERR_CANT_ACCESS_FILE',
-            'ERR_CANT_INITIATE_LINK', 'ERR_CMD_NOT_SUPPORTED',
-            'ERR_FCN_ARG_RANGE', 'ERR_FCN_INVALID_FMT',
-            'ERR_FCN_OBJ_FETCH_FAILED', 'ERR_FILEMGR_NOTOPEN',
-            'ERR_FP_MATH_LIB_DOMAIN', 'ERR_FP_MATH_LIB_RANGE',
-            'ERR_INVALID_CHANNEL', 'ERR_INVALID_READ_CONTROL',
-            'ERR_INVALID_TRIG_CONTROL', 'ERR_NO_FIELD',
-            'ERR_NO_RESPONSE_FROM_APP', 'ERR_NULL_SELECTION',
-            'ERR_PROCESS_FAILED_IN_APP', 'ERR_TABLE_NOT_FOUND',
-            'ERR_WANT_MAPPER_WIN', 'FALSE', 'FILE_ATTR_FILESIZE',
-            'FILE_ATTR_MODE', 'FILTER_ALL_DIRECTIONS_1',
-            'FILTER_ALL_DIRECTIONS_2', 'FILTER_DIAGONALLY',
-            'FILTER_HORIZONTALLY', 'FILTER_VERTICALLY',
-            'FILTER_VERTICALLY_AND_HORIZONTALLY', 'FOLDER_APPDATA',
-            'FOLDER_COMMON_APPDATA', 'FOLDER_COMMON_DOCS',
-            'FOLDER_LOCAL_APPDATA', 'FOLDER_MI_APPDATA',
-            'FOLDER_MI_COMMON_APPDATA', 'FOLDER_MI_LOCAL_APPDATA',
-            'FOLDER_MI_PREFERENCE', 'FOLDER_MYDOCS', 'FOLDER_MYPICS',
-            'FONT_BACKCOLOR', 'FONT_FORECOLOR', 'FONT_NAME', 'FONT_POINTSIZE',
-            'FONT_STYLE', 'FRAME_INFO_BORDER_PEN', 'FRAME_INFO_COLUMN',
-            'FRAME_INFO_HEIGHT', 'FRAME_INFO_LABEL', 'FRAME_INFO_MAP_LAYER_ID',
-            'FRAME_INFO_NUM_STYLES', 'FRAME_INFO_POS_X', 'FRAME_INFO_POS_Y',
-            'FRAME_INFO_REFRESHABLE', 'FRAME_INFO_SUBTITLE',
-            'FRAME_INFO_SUBTITLE_FONT', 'FRAME_INFO_TITLE',
-            'FRAME_INFO_TITLE_FONT', 'FRAME_INFO_TYPE', 'FRAME_INFO_VISIBLE',
-            'FRAME_INFO_WIDTH', 'FRAME_TYPE_STYLE', 'FRAME_TYPE_THEME',
-            'GEO_CONTROL_POINT_X', 'GEO_CONTROL_POINT_Y', 'GEOCODE_BATCH_SIZE',
-            'GEOCODE_COUNT_GEOCODED', 'GEOCODE_COUNT_NOTGEOCODED',
-            'GEOCODE_COUNTRY_SUBDIVISION', 'GEOCODE_COUNTRY_SUBDIVISION2',
-            'GEOCODE_DICTIONARY', 'GEOCODE_FALLBACK_GEOGRAPHIC',
-            'GEOCODE_FALLBACK_POSTAL', 'GEOCODE_MAX_BATCH_SIZE',
-            'GEOCODE_MIXED_CASE', 'GEOCODE_MUNICIPALITY',
-            'GEOCODE_MUNICIPALITY2', 'GEOCODE_OFFSET_CENTER',
-            'GEOCODE_OFFSET_CENTER_UNITS', 'GEOCODE_OFFSET_END',
-            'GEOCODE_OFFSET_END_UNITS', 'GEOCODE_PASSTHROUGH',
-            'GEOCODE_POSTAL_CODE', 'GEOCODE_RESULT_MARK_MULTIPLE',
-            'GEOCODE_STREET_NAME', 'GEOCODE_STREET_NUMBER',
-            'GEOCODE_UNABLE_TO_CONVERT_DATA', 'GREEN',
-            'GRID_TAB_INFO_HAS_HILLSHADE', 'GRID_TAB_INFO_MAX_VALUE',
-            'GRID_TAB_INFO_MIN_VALUE', 'HOTLINK_INFO_ENABLED',
-            'HOTLINK_INFO_EXPR', 'HOTLINK_INFO_MODE', 'HOTLINK_INFO_RELATIVE',
-            'HOTLINK_MODE_BOTH', 'HOTLINK_MODE_LABEL', 'HOTLINK_MODE_OBJ',
-            'IMAGE_CLASS_BILEVEL', 'IMAGE_CLASS_GREYSCALE',
-            'IMAGE_CLASS_PALETTE', 'IMAGE_CLASS_RGB', 'IMAGE_TYPE_GRID',
-            'IMAGE_TYPE_RASTER', 'INCL_ALL', 'INCL_COMMON', 'INCL_CROSSINGS',
-            'ISOGRAM_AMBIENT_SPEED_DIST_UNIT',
-            'ISOGRAM_AMBIENT_SPEED_TIME_UNIT', 'ISOGRAM_BANDING',
-            'ISOGRAM_BATCH_SIZE', 'ISOGRAM_DEFAULT_AMBIENT_SPEED',
-            'ISOGRAM_MAJOR_POLYGON_ONLY', 'ISOGRAM_MAJOR_ROADS_ONLY',
-            'ISOGRAM_MAX_BANDS', 'ISOGRAM_MAX_BATCH_SIZE',
-            'ISOGRAM_MAX_DISTANCE', 'ISOGRAM_MAX_DISTANCE_UNITS',
-            'ISOGRAM_MAX_OFFROAD_DIST', 'ISOGRAM_MAX_OFFROAD_DIST_UNITS',
-            'ISOGRAM_MAX_TIME', 'ISOGRAM_MAX_TIME_UNITS',
-            'ISOGRAM_POINTS_ONLY', 'ISOGRAM_PROPAGATION_FACTOR',
-            'ISOGRAM_RECORDS_INSERTED', 'ISOGRAM_RECORDS_NOTINSERTED',
-            'ISOGRAM_RETURN_HOLES', 'ISOGRAM_SIMPLIFICATION_FACTOR',
-            'LABEL_INFO_ANCHORX', 'LABEL_INFO_ANCHORY', 'LABEL_INFO_DRAWN',
-            'LABEL_INFO_EDIT', 'LABEL_INFO_EDIT_ANCHOR',
-            'LABEL_INFO_EDIT_ANGLE', 'LABEL_INFO_EDIT_FONT',
-            'LABEL_INFO_EDIT_OFFSET', 'LABEL_INFO_EDIT_PEN',
-            'LABEL_INFO_EDIT_POSITION', 'LABEL_INFO_EDIT_TEXT',
-            'LABEL_INFO_EDIT_TEXTARROW', 'LABEL_INFO_EDIT_TEXTLINE',
-            'LABEL_INFO_EDIT_VISIBILITY', 'LABEL_INFO_OBJECT',
-            'LABEL_INFO_OFFSET', 'LABEL_INFO_ORIENTATION',
-            'LABEL_INFO_POSITION', 'LABEL_INFO_ROWID', 'LABEL_INFO_SELECT',
-            'LABEL_INFO_TABLE', 'LAYER_INFO_ARROWS', 'LAYER_INFO_CENTROIDS',
-            'LAYER_INFO_COSMETIC', 'LAYER_INFO_DISPLAY',
-            'LAYER_INFO_DISPLAY_GLOBAL', 'LAYER_INFO_DISPLAY_GRAPHIC',
-            'LAYER_INFO_DISPLAY_OFF', 'LAYER_INFO_DISPLAY_VALUE',
-            'LAYER_INFO_EDITABLE', 'LAYER_INFO_HOTLINK_COUNT',
-            'LAYER_INFO_HOTLINK_EXPR', 'LAYER_INFO_HOTLINK_MODE',
-            'LAYER_INFO_HOTLINK_RELATIVE', 'LAYER_INFO_LABEL_ALPHA',
-            'LAYER_INFO_LABEL_ORIENT_CURVED',
-            'LAYER_INFO_LABEL_ORIENT_HORIZONTAL',
-            'LAYER_INFO_LABEL_ORIENT_PARALLEL', 'LAYER_INFO_LAYER_ALPHA',
-            'LAYER_INFO_LAYER_TRANSLUCENCY', 'LAYER_INFO_LBL_AUTODISPLAY',
-            'LAYER_INFO_LBL_CURFONT', 'LAYER_INFO_LBL_DUPLICATES',
-            'LAYER_INFO_LBL_EXPR', 'LAYER_INFO_LBL_FONT', 'LAYER_INFO_LBL_LT',
-            'LAYER_INFO_LBL_LT_ARROW', 'LAYER_INFO_LBL_LT_NONE',
-            'LAYER_INFO_LBL_LT_SIMPLE', 'LAYER_INFO_LBL_MAX',
-            'LAYER_INFO_LBL_OFFSET', 'LAYER_INFO_LBL_ORIENTATION',
-            'LAYER_INFO_LBL_OVERLAP', 'LAYER_INFO_LBL_PARALLEL',
-            'LAYER_INFO_LBL_PARTIALSEGS', 'LAYER_INFO_LBL_POS',
-            'LAYER_INFO_LBL_POS_BC', 'LAYER_INFO_LBL_POS_BL',
-            'LAYER_INFO_LBL_POS_BR', 'LAYER_INFO_LBL_POS_CC',
-            'LAYER_INFO_LBL_POS_CL', 'LAYER_INFO_LBL_POS_CR',
-            'LAYER_INFO_LBL_POS_TC', 'LAYER_INFO_LBL_POS_TL',
-            'LAYER_INFO_LBL_POS_TR', 'LAYER_INFO_LBL_VIS_OFF',
-            'LAYER_INFO_LBL_VIS_ON', 'LAYER_INFO_LBL_VIS_ZOOM',
-            'LAYER_INFO_LBL_VISIBILITY', 'LAYER_INFO_LBL_ZOOM_MAX',
-            'LAYER_INFO_LBL_ZOOM_MIN', 'LAYER_INFO_NAME', 'LAYER_INFO_NODES',
-            'LAYER_INFO_OVR_BRUSH', 'LAYER_INFO_OVR_FONT',
-            'LAYER_INFO_OVR_LINE', 'LAYER_INFO_OVR_PEN',
-            'LAYER_INFO_OVR_SYMBOL', 'LAYER_INFO_PATH',
-            'LAYER_INFO_SELECTABLE', 'LAYER_INFO_TYPE',
-            'LAYER_INFO_TYPE_COSMETIC', 'LAYER_INFO_TYPE_GRID',
-            'LAYER_INFO_TYPE_IMAGE', 'LAYER_INFO_TYPE_NORMAL',
-            'LAYER_INFO_TYPE_THEMATIC', 'LAYER_INFO_TYPE_WMS',
-            'LAYER_INFO_ZOOM_LAYERED', 'LAYER_INFO_ZOOM_MAX',
-            'LAYER_INFO_ZOOM_MIN', 'LEGEND_INFO_MAP_ID',
-            'LEGEND_INFO_NUM_FRAMES', 'LEGEND_INFO_ORIENTATION',
-            'LEGEND_INFO_STYLE_SAMPLE_SIZE', 'LEGEND_STYLE_INFO_FONT',
-            'LEGEND_STYLE_INFO_OBJ', 'LEGEND_STYLE_INFO_TEXT',
-            'LOCATE_ABB_FILE', 'LOCATE_CLR_FILE', 'LOCATE_CUSTSYMB_DIR',
-            'LOCATE_DEF_WOR', 'LOCATE_FNT_FILE', 'LOCATE_GEOCODE_SERVERLIST',
-            'LOCATE_GRAPH_DIR', 'LOCATE_LAYOUT_TEMPLATE_DIR',
-            'LOCATE_MNU_FILE', 'LOCATE_PEN_FILE', 'LOCATE_PREF_FILE',
-            'LOCATE_PRJ_FILE', 'LOCATE_ROUTING_SERVERLIST',
-            'LOCATE_THMTMPLT_DIR', 'LOCATE_WFS_SERVERLIST',
-            'LOCATE_WMS_SERVERLIST', 'M_3DMAP_CLONE_VIEW',
-            'M_3DMAP_PREVIOUS_VIEW', 'M_3DMAP_PROPERTIES',
-            'M_3DMAP_REFRESH_GRID_TEXTURE', 'M_3DMAP_VIEW_ENTIRE_GRID',
-            'M_3DMAP_VIEWPOINT_CONTROL', 'M_3DMAP_WIREFRAME',
-            'M_ANALYZE_CALC_STATISTICS', 'M_ANALYZE_CUSTOMIZE_LEGEND',
-            'M_ANALYZE_FIND', 'M_ANALYZE_FIND_SELECTION',
-            'M_ANALYZE_INVERTSELECT', 'M_ANALYZE_SELECT',
-            'M_ANALYZE_SELECTALL', 'M_ANALYZE_SHADE', 'M_ANALYZE_SQLQUERY',
-            'M_ANALYZE_UNSELECT', 'M_BROWSE_EDIT', 'M_BROWSE_GRID',
-            'M_BROWSE_NEW_RECORD', 'M_BROWSE_OPTIONS', 'M_BROWSE_PICK_FIELDS',
-            'M_DBMS_OPEN_ODBC', 'M_EDIT_CLEAR', 'M_EDIT_CLEAROBJ',
-            'M_EDIT_COPY', 'M_EDIT_CUT', 'M_EDIT_GETINFO', 'M_EDIT_NEW_ROW',
-            'M_EDIT_PASTE', 'M_EDIT_PREFERENCES', 'M_EDIT_PREFERENCES_COUNTRY',
-            'M_EDIT_PREFERENCES_FILE', 'M_EDIT_PREFERENCES_IMAGE_PROC',
-            'M_EDIT_PREFERENCES_LAYOUT', 'M_EDIT_PREFERENCES_LEGEND',
-            'M_EDIT_PREFERENCES_MAP', 'M_EDIT_PREFERENCES_OUTPUT',
-            'M_EDIT_PREFERENCES_PATH', 'M_EDIT_PREFERENCES_PRINTER',
-            'M_EDIT_PREFERENCES_STYLES', 'M_EDIT_PREFERENCES_SYSTEM',
-            'M_EDIT_PREFERENCES_WEBSERVICES', 'M_EDIT_RESHAPE', 'M_EDIT_UNDO',
-            'M_FILE_ABOUT', 'M_FILE_ADD_WORKSPACE', 'M_FILE_CLOSE',
-            'M_FILE_CLOSE_ALL', 'M_FILE_CLOSE_ODBC', 'M_FILE_EXIT',
-            'M_FILE_HELP', 'M_FILE_NEW', 'M_FILE_OPEN', 'M_FILE_OPEN_ODBC',
-            'M_FILE_OPEN_ODBC_CONN', 'M_FILE_OPEN_UNIVERSAL_DATA',
-            'M_FILE_OPEN_WFS', 'M_FILE_OPEN_WMS', 'M_FILE_PAGE_SETUP',
-            'M_FILE_PRINT', 'M_FILE_PRINT_SETUP', 'M_FILE_REVERT',
-            'M_FILE_RUN', 'M_FILE_SAVE', 'M_FILE_SAVE_COPY_AS',
-            'M_FILE_SAVE_QUERY', 'M_FILE_SAVE_WINDOW_AS',
-            'M_FILE_SAVE_WORKSPACE', 'M_FORMAT_CUSTOM_COLORS',
-            'M_FORMAT_PICK_FILL', 'M_FORMAT_PICK_FONT', 'M_FORMAT_PICK_LINE',
-            'M_FORMAT_PICK_SYMBOL', 'M_GRAPH_3D_VIEWING_ANGLE',
-            'M_GRAPH_FORMATING', 'M_GRAPH_GENERAL_OPTIONS',
-            'M_GRAPH_GRID_SCALES', 'M_GRAPH_LABEL_AXIS',
-            'M_GRAPH_SAVE_AS_TEMPLATE', 'M_GRAPH_SERIES',
-            'M_GRAPH_SERIES_OPTIONS', 'M_GRAPH_TITLES', 'M_GRAPH_TYPE',
-            'M_GRAPH_VALUE_AXIS', 'M_HELP_ABOUT', 'M_HELP_CHECK_FOR_UPDATE',
-            'M_HELP_CONNECT_MIFORUM', 'M_HELP_CONTENTS',
-            'M_HELP_CONTEXTSENSITIVE', 'M_HELP_HELPMODE',
-            'M_HELP_MAPINFO_3DGRAPH_HELP', 'M_HELP_MAPINFO_CONNECT_SERVICES',
-            'M_HELP_MAPINFO_WWW', 'M_HELP_MAPINFO_WWW_STORE',
-            'M_HELP_MAPINFO_WWW_TUTORIAL', 'M_HELP_SEARCH',
-            'M_HELP_TECHSUPPORT', 'M_HELP_USE_HELP', 'M_LAYOUT_ACTUAL',
-            'M_LAYOUT_ALIGN', 'M_LAYOUT_AUTOSCROLL_ONOFF',
-            'M_LAYOUT_BRING2FRONT', 'M_LAYOUT_CHANGE_VIEW',
-            'M_LAYOUT_DISPLAYOPTIONS', 'M_LAYOUT_DROPSHADOWS',
-            'M_LAYOUT_ENTIRE', 'M_LAYOUT_LAYOUT_SIZE', 'M_LAYOUT_PREVIOUS',
-            'M_LAYOUT_SEND2BACK', 'M_LEGEND_ADD_FRAMES', 'M_LEGEND_DELETE',
-            'M_LEGEND_PROPERTIES', 'M_LEGEND_REFRESH', 'M_MAP_AUTOLABEL',
-            'M_MAP_AUTOSCROLL_ONOFF', 'M_MAP_CHANGE_VIEW',
-            'M_MAP_CLEAR_COSMETIC', 'M_MAP_CLEAR_CUSTOM_LABELS',
-            'M_MAP_CLIP_REGION_ONOFF', 'M_MAP_CLONE_MAPPER',
-            'M_MAP_CREATE_3DMAP', 'M_MAP_CREATE_LEGEND',
-            'M_MAP_CREATE_PRISMMAP', 'M_MAP_ENTIRE_LAYER',
-            'M_MAP_LAYER_CONTROL', 'M_MAP_MODIFY_THEMATIC', 'M_MAP_OPTIONS',
-            'M_MAP_PREVIOUS', 'M_MAP_PROJECTION', 'M_MAP_SAVE_COSMETIC',
-            'M_MAP_SET_CLIP_REGION', 'M_MAP_SETUNITS', 'M_MAP_SETUPDIGITIZER',
-            'M_MAP_THEMATIC', 'M_MAPBASIC_CLEAR', 'M_MAPBASIC_SAVECONTENTS',
-            'M_OBJECTS_BREAKPOLY', 'M_OBJECTS_BUFFER',
-            'M_OBJECTS_CHECK_REGIONS', 'M_OBJECTS_CLEAN',
-            'M_OBJECTS_CLEAR_TARGET', 'M_OBJECTS_COMBINE',
-            'M_OBJECTS_CONVEX_HULL', 'M_OBJECTS_CVT_PGON',
-            'M_OBJECTS_CVT_PLINE', 'M_OBJECTS_DISAGG',
-            'M_OBJECTS_DRIVE_REGION', 'M_OBJECTS_ENCLOSE', 'M_OBJECTS_ERASE',
-            'M_OBJECTS_ERASE_OUT', 'M_OBJECTS_MERGE', 'M_OBJECTS_OFFSET',
-            'M_OBJECTS_OVERLAY', 'M_OBJECTS_POLYLINE_SPLIT',
-            'M_OBJECTS_POLYLINE_SPLIT_AT_NODE', 'M_OBJECTS_RESHAPE',
-            'M_OBJECTS_ROTATE', 'M_OBJECTS_SET_TARGET', 'M_OBJECTS_SMOOTH',
-            'M_OBJECTS_SNAP', 'M_OBJECTS_SPLIT', 'M_OBJECTS_UNSMOOTH',
-            'M_OBJECTS_VORONOI', 'M_ORACLE_CREATE_WORKSPACE',
-            'M_ORACLE_DELETE_WORKSPACE', 'M_ORACLE_MERGE_PARENT',
-            'M_ORACLE_REFRESH_FROM_PARENT', 'M_ORACLE_VERSION_ENABLE_OFF',
-            'M_ORACLE_VERSION_ENABLE_ON', 'M_QUERY_CALC_STATISTICS',
-            'M_QUERY_FIND', 'M_QUERY_FIND_ADDRESS', 'M_QUERY_FIND_SELECTION',
-            'M_QUERY_FIND_SELECTION_CURRENT_MAP', 'M_QUERY_INVERTSELECT',
-            'M_QUERY_SELECT', 'M_QUERY_SELECTALL', 'M_QUERY_SQLQUERY',
-            'M_QUERY_UNSELECT', 'M_REDISTRICT_ADD', 'M_REDISTRICT_ASSIGN',
-            'M_REDISTRICT_DELETE', 'M_REDISTRICT_OPTIONS',
-            'M_REDISTRICT_TARGET', 'M_SENDMAIL_CURRENTWINDOW',
-            'M_SENDMAIL_WORKSPACE', 'M_TABLE_APPEND', 'M_TABLE_BUFFER',
-            'M_TABLE_CHANGESYMBOL', 'M_TABLE_CREATE_POINTS', 'M_TABLE_DELETE',
-            'M_TABLE_DRIVE_REGION', 'M_TABLE_EXPORT', 'M_TABLE_GEOCODE',
-            'M_TABLE_IMPORT', 'M_TABLE_MAKEMAPPABLE',
-            'M_TABLE_MERGE_USING_COLUMN', 'M_TABLE_MODIFY_STRUCTURE',
-            'M_TABLE_PACK', 'M_TABLE_RASTER_REG', 'M_TABLE_RASTER_STYLE',
-            'M_TABLE_REFRESH', 'M_TABLE_RENAME',
-            'M_TABLE_UNIVERSAL_DATA_REFRESH', 'M_TABLE_UNLINK',
-            'M_TABLE_UPDATE_COLUMN', 'M_TABLE_VORONOI', 'M_TABLE_WEB_GEOCODE',
-            'M_TABLE_WFS_PROPS', 'M_TABLE_WFS_REFRESH', 'M_TABLE_WMS_PROPS',
-            'M_TOOLS_ADD_NODE', 'M_TOOLS_ARC', 'M_TOOLS_CRYSTAL_REPORTS_NEW',
-            'M_TOOLS_CRYSTAL_REPORTS_OPEN', 'M_TOOLS_DRAGWINDOW',
-            'M_TOOLS_ELLIPSE', 'M_TOOLS_EXPAND', 'M_TOOLS_FRAME',
-            'M_TOOLS_HOTLINK', 'M_TOOLS_LABELER', 'M_TOOLS_LINE',
-            'M_TOOLS_MAPBASIC', 'M_TOOLS_PNT_QUERY', 'M_TOOLS_POINT',
-            'M_TOOLS_POLYGON', 'M_TOOLS_POLYLINE', 'M_TOOLS_RASTER_REG',
-            'M_TOOLS_RECENTER', 'M_TOOLS_RECTANGLE', 'M_TOOLS_ROUNDEDRECT',
-            'M_TOOLS_RULER', 'M_TOOLS_RUN', 'M_TOOLS_SEARCH_BOUNDARY',
-            'M_TOOLS_SEARCH_POLYGON', 'M_TOOLS_SEARCH_RADIUS',
-            'M_TOOLS_SEARCH_RECT', 'M_TOOLS_SELECTOR', 'M_TOOLS_SHRINK',
-            'M_TOOLS_TEXT', 'M_TOOLS_TOOL_MANAGER', 'M_WINDOW_ARRANGEICONS',
-            'M_WINDOW_BROWSE', 'M_WINDOW_BUTTONPAD', 'M_WINDOW_CASCADE',
-            'M_WINDOW_EXPORT_WINDOW', 'M_WINDOW_FIRST', 'M_WINDOW_GRAPH',
-            'M_WINDOW_LAYOUT', 'M_WINDOW_LEGEND', 'M_WINDOW_MAP',
-            'M_WINDOW_MAPBASIC', 'M_WINDOW_MORE', 'M_WINDOW_REDISTRICT',
-            'M_WINDOW_REDRAW', 'M_WINDOW_STATISTICS', 'M_WINDOW_STATUSBAR',
-            'M_WINDOW_TILE', 'M_WINDOW_TOOL_PALETTE', 'MAGENTA',
-            'MAP3D_INFO_BACKGROUND', 'MAP3D_INFO_CAMERA_CLIP_FAR',
-            'MAP3D_INFO_CAMERA_CLIP_NEAR', 'MAP3D_INFO_CAMERA_FOCAL_X',
-            'MAP3D_INFO_CAMERA_FOCAL_Y', 'MAP3D_INFO_CAMERA_FOCAL_Z',
-            'MAP3D_INFO_CAMERA_VPN_1', 'MAP3D_INFO_CAMERA_VPN_2',
-            'MAP3D_INFO_CAMERA_VPN_3', 'MAP3D_INFO_CAMERA_VU_1',
-            'MAP3D_INFO_CAMERA_VU_2', 'MAP3D_INFO_CAMERA_VU_3',
-            'MAP3D_INFO_CAMERA_X', 'MAP3D_INFO_CAMERA_Y',
-            'MAP3D_INFO_CAMERA_Z', 'MAP3D_INFO_LIGHT_COLOR',
-            'MAP3D_INFO_LIGHT_X', 'MAP3D_INFO_LIGHT_Y', 'MAP3D_INFO_LIGHT_Z',
-            'MAP3D_INFO_RESOLUTION_X', 'MAP3D_INFO_RESOLUTION_Y',
-            'MAP3D_INFO_SCALE', 'MAP3D_INFO_UNITS', 'MAPPER_INFO_AREAUNITS',
-            'MAPPER_INFO_CENTERX', 'MAPPER_INFO_CENTERY',
-            'MAPPER_INFO_CLIP_DISPLAY_ALL', 'MAPPER_INFO_CLIP_DISPLAY_POLYOBJ',
-            'MAPPER_INFO_CLIP_OVERLAY', 'MAPPER_INFO_CLIP_REGION',
-            'MAPPER_INFO_CLIP_TYPE', 'MAPPER_INFO_COORDSYS_CLAUSE',
-            'MAPPER_INFO_COORDSYS_CLAUSE_WITH_BOUNDS',
-            'MAPPER_INFO_COORDSYS_NAME', 'MAPPER_INFO_DISPLAY',
-            'MAPPER_INFO_DISPLAY_DECIMAL', 'MAPPER_INFO_DISPLAY_DEGMINSEC',
-            'MAPPER_INFO_DISPLAY_DMS', 'MAPPER_INFO_DISPLAY_MGRS',
-            'MAPPER_INFO_DISPLAY_POSITION', 'MAPPER_INFO_DISPLAY_SCALE',
-            'MAPPER_INFO_DISPLAY_ZOOM', 'MAPPER_INFO_DIST_CALC_TYPE',
-            'MAPPER_INFO_DIST_CARTESIAN', 'MAPPER_INFO_DIST_SPHERICAL',
-            'MAPPER_INFO_DISTUNITS', 'MAPPER_INFO_EDIT_LAYER',
-            'MAPPER_INFO_LAYERS', 'MAPPER_INFO_MAXX', 'MAPPER_INFO_MAXY',
-            'MAPPER_INFO_MERGE_MAP', 'MAPPER_INFO_MINX', 'MAPPER_INFO_MINY',
-            'MAPPER_INFO_MOVE_DUPLICATE_NODES', 'MAPPER_INFO_NUM_THEMATIC',
-            'MAPPER_INFO_REPROJECTION', 'MAPPER_INFO_RESAMPLING',
-            'MAPPER_INFO_SCALE', 'MAPPER_INFO_SCROLLBARS',
-            'MAPPER_INFO_XYUNITS', 'MAPPER_INFO_ZOOM', 'MAX_STRING_LENGTH',
-            'MENUITEM_INFO_ACCELERATOR', 'MENUITEM_INFO_CHECKABLE',
-            'MENUITEM_INFO_CHECKED', 'MENUITEM_INFO_ENABLED',
-            'MENUITEM_INFO_HANDLER', 'MENUITEM_INFO_HELPMSG',
-            'MENUITEM_INFO_ID', 'MENUITEM_INFO_SHOWHIDEABLE',
-            'MENUITEM_INFO_TEXT', 'MI_CURSOR_ARROW', 'MI_CURSOR_CHANGE_WIDTH',
-            'MI_CURSOR_CROSSHAIR', 'MI_CURSOR_DRAG_OBJ',
-            'MI_CURSOR_FINGER_LEFT', 'MI_CURSOR_FINGER_UP',
-            'MI_CURSOR_GRABBER', 'MI_CURSOR_IBEAM', 'MI_CURSOR_IBEAM_CROSS',
-            'MI_CURSOR_ZOOM_IN', 'MI_CURSOR_ZOOM_OUT', 'MI_ICON_ADD_NODE',
-            'MI_ICON_ARC', 'MI_ICON_ARROW', 'MI_ICON_ARROW_1',
-            'MI_ICON_ARROW_10', 'MI_ICON_ARROW_11', 'MI_ICON_ARROW_12',
-            'MI_ICON_ARROW_13', 'MI_ICON_ARROW_14', 'MI_ICON_ARROW_15',
-            'MI_ICON_ARROW_16', 'MI_ICON_ARROW_17', 'MI_ICON_ARROW_18',
-            'MI_ICON_ARROW_19', 'MI_ICON_ARROW_2', 'MI_ICON_ARROW_20',
-            'MI_ICON_ARROW_21', 'MI_ICON_ARROW_3', 'MI_ICON_ARROW_4',
-            'MI_ICON_ARROW_5', 'MI_ICON_ARROW_6', 'MI_ICON_ARROW_7',
-            'MI_ICON_ARROW_8', 'MI_ICON_ARROW_9', 'MI_ICON_CLIP_MODE',
-            'MI_ICON_CLIP_REGION', 'MI_ICON_CLOSE_ALL',
-            'MI_ICON_COMMUNICATION_1', 'MI_ICON_COMMUNICATION_10',
-            'MI_ICON_COMMUNICATION_11', 'MI_ICON_COMMUNICATION_12',
-            'MI_ICON_COMMUNICATION_2', 'MI_ICON_COMMUNICATION_3',
-            'MI_ICON_COMMUNICATION_4', 'MI_ICON_COMMUNICATION_5',
-            'MI_ICON_COMMUNICATION_6', 'MI_ICON_COMMUNICATION_7',
-            'MI_ICON_COMMUNICATION_8', 'MI_ICON_COMMUNICATION_9',
-            'MI_ICON_COMPASS_CIRCLE_TA', 'MI_ICON_COMPASS_CONTRACT',
-            'MI_ICON_COMPASS_EXPAND', 'MI_ICON_COMPASS_POLY_TA',
-            'MI_ICON_COMPASS_TAG', 'MI_ICON_COMPASS_UNTAG', 'MI_ICON_COPY',
-            'MI_ICON_CROSSHAIR', 'MI_ICON_CUT', 'MI_ICON_DISTRICT_MANY',
-            'MI_ICON_DISTRICT_SAME', 'MI_ICON_DRAG_HANDLE', 'MI_ICON_ELLIPSE',
-            'MI_ICON_EMERGENCY_1', 'MI_ICON_EMERGENCY_10',
-            'MI_ICON_EMERGENCY_11', 'MI_ICON_EMERGENCY_12',
-            'MI_ICON_EMERGENCY_13', 'MI_ICON_EMERGENCY_14',
-            'MI_ICON_EMERGENCY_15', 'MI_ICON_EMERGENCY_16',
-            'MI_ICON_EMERGENCY_17', 'MI_ICON_EMERGENCY_18',
-            'MI_ICON_EMERGENCY_2', 'MI_ICON_EMERGENCY_3',
-            'MI_ICON_EMERGENCY_4', 'MI_ICON_EMERGENCY_5',
-            'MI_ICON_EMERGENCY_6', 'MI_ICON_EMERGENCY_7',
-            'MI_ICON_EMERGENCY_8', 'MI_ICON_EMERGENCY_9', 'MI_ICON_GRABBER',
-            'MI_ICON_GRAPH_SELECT', 'MI_ICON_HELP', 'MI_ICON_HOT_LINK',
-            'MI_ICON_INFO', 'MI_ICON_INVERTSELECT', 'MI_ICON_LABEL',
-            'MI_ICON_LAYERS', 'MI_ICON_LEGEND', 'MI_ICON_LETTERS_A',
-            'MI_ICON_LETTERS_B', 'MI_ICON_LETTERS_C', 'MI_ICON_LETTERS_D',
-            'MI_ICON_LETTERS_E', 'MI_ICON_LETTERS_F', 'MI_ICON_LETTERS_G',
-            'MI_ICON_LETTERS_H', 'MI_ICON_LETTERS_I', 'MI_ICON_LETTERS_J',
-            'MI_ICON_LETTERS_K', 'MI_ICON_LETTERS_L', 'MI_ICON_LETTERS_M',
-            'MI_ICON_LETTERS_N', 'MI_ICON_LETTERS_O', 'MI_ICON_LETTERS_P',
-            'MI_ICON_LETTERS_Q', 'MI_ICON_LETTERS_R', 'MI_ICON_LETTERS_S',
-            'MI_ICON_LETTERS_T', 'MI_ICON_LETTERS_U', 'MI_ICON_LETTERS_V',
-            'MI_ICON_LETTERS_W', 'MI_ICON_LETTERS_X', 'MI_ICON_LETTERS_Y',
-            'MI_ICON_LETTERS_Z', 'MI_ICON_LINE', 'MI_ICON_LINE_STYLE',
-            'MI_ICON_MAPSYMB_1', 'MI_ICON_MAPSYMB_10', 'MI_ICON_MAPSYMB_11',
-            'MI_ICON_MAPSYMB_12', 'MI_ICON_MAPSYMB_13', 'MI_ICON_MAPSYMB_14',
-            'MI_ICON_MAPSYMB_15', 'MI_ICON_MAPSYMB_16', 'MI_ICON_MAPSYMB_17',
-            'MI_ICON_MAPSYMB_18', 'MI_ICON_MAPSYMB_19', 'MI_ICON_MAPSYMB_2',
-            'MI_ICON_MAPSYMB_20', 'MI_ICON_MAPSYMB_21', 'MI_ICON_MAPSYMB_22',
-            'MI_ICON_MAPSYMB_23', 'MI_ICON_MAPSYMB_24', 'MI_ICON_MAPSYMB_25',
-            'MI_ICON_MAPSYMB_26', 'MI_ICON_MAPSYMB_3', 'MI_ICON_MAPSYMB_4',
-            'MI_ICON_MAPSYMB_5', 'MI_ICON_MAPSYMB_6', 'MI_ICON_MAPSYMB_7',
-            'MI_ICON_MAPSYMB_8', 'MI_ICON_MAPSYMB_9', 'MI_ICON_MARITIME_1',
-            'MI_ICON_MARITIME_10', 'MI_ICON_MARITIME_2', 'MI_ICON_MARITIME_3',
-            'MI_ICON_MARITIME_4', 'MI_ICON_MARITIME_5', 'MI_ICON_MARITIME_6',
-            'MI_ICON_MARITIME_7', 'MI_ICON_MARITIME_8', 'MI_ICON_MARITIME_9',
-            'MI_ICON_MB_1', 'MI_ICON_MB_10', 'MI_ICON_MB_11', 'MI_ICON_MB_12',
-            'MI_ICON_MB_13', 'MI_ICON_MB_14', 'MI_ICON_MB_2', 'MI_ICON_MB_3',
-            'MI_ICON_MB_4', 'MI_ICON_MB_5', 'MI_ICON_MB_6', 'MI_ICON_MB_7',
-            'MI_ICON_MB_8', 'MI_ICON_MB_9', 'MI_ICON_MISC_1',
-            'MI_ICON_MISC_10', 'MI_ICON_MISC_11', 'MI_ICON_MISC_12',
-            'MI_ICON_MISC_13', 'MI_ICON_MISC_14', 'MI_ICON_MISC_15',
-            'MI_ICON_MISC_16', 'MI_ICON_MISC_17', 'MI_ICON_MISC_18',
-            'MI_ICON_MISC_19', 'MI_ICON_MISC_2', 'MI_ICON_MISC_20',
-            'MI_ICON_MISC_21', 'MI_ICON_MISC_22', 'MI_ICON_MISC_23',
-            'MI_ICON_MISC_24', 'MI_ICON_MISC_25', 'MI_ICON_MISC_26',
-            'MI_ICON_MISC_27', 'MI_ICON_MISC_28', 'MI_ICON_MISC_29',
-            'MI_ICON_MISC_3', 'MI_ICON_MISC_30', 'MI_ICON_MISC_31',
-            'MI_ICON_MISC_4', 'MI_ICON_MISC_5', 'MI_ICON_MISC_6',
-            'MI_ICON_MISC_7', 'MI_ICON_MISC_8', 'MI_ICON_MISC_9',
-            'MI_ICON_NEW_DOC', 'MI_ICON_NUMBERS_1', 'MI_ICON_NUMBERS_10',
-            'MI_ICON_NUMBERS_11', 'MI_ICON_NUMBERS_12', 'MI_ICON_NUMBERS_13',
-            'MI_ICON_NUMBERS_14', 'MI_ICON_NUMBERS_15', 'MI_ICON_NUMBERS_16',
-            'MI_ICON_NUMBERS_17', 'MI_ICON_NUMBERS_18', 'MI_ICON_NUMBERS_19',
-            'MI_ICON_NUMBERS_2', 'MI_ICON_NUMBERS_20', 'MI_ICON_NUMBERS_21',
-            'MI_ICON_NUMBERS_22', 'MI_ICON_NUMBERS_23', 'MI_ICON_NUMBERS_24',
-            'MI_ICON_NUMBERS_25', 'MI_ICON_NUMBERS_26', 'MI_ICON_NUMBERS_27',
-            'MI_ICON_NUMBERS_28', 'MI_ICON_NUMBERS_29', 'MI_ICON_NUMBERS_3',
-            'MI_ICON_NUMBERS_30', 'MI_ICON_NUMBERS_31', 'MI_ICON_NUMBERS_32',
-            'MI_ICON_NUMBERS_4', 'MI_ICON_NUMBERS_5', 'MI_ICON_NUMBERS_6',
-            'MI_ICON_NUMBERS_7', 'MI_ICON_NUMBERS_8', 'MI_ICON_NUMBERS_9',
-            'MI_ICON_ODBC_DISCONNECT', 'MI_ICON_ODBC_MAPPABLE',
-            'MI_ICON_ODBC_OPEN', 'MI_ICON_ODBC_REFRESH', 'MI_ICON_ODBC_SYMBOL',
-            'MI_ICON_ODBC_UNLINK', 'MI_ICON_OPEN_FILE', 'MI_ICON_OPEN_WOR',
-            'MI_ICON_OPENWFS', 'MI_ICON_OPENWMS', 'MI_ICON_PASTE',
-            'MI_ICON_POLYGON', 'MI_ICON_POLYLINE', 'MI_ICON_PRINT',
-            'MI_ICON_REALESTATE_1', 'MI_ICON_REALESTATE_10',
-            'MI_ICON_REALESTATE_11', 'MI_ICON_REALESTATE_12',
-            'MI_ICON_REALESTATE_13', 'MI_ICON_REALESTATE_14',
-            'MI_ICON_REALESTATE_15', 'MI_ICON_REALESTATE_16',
-            'MI_ICON_REALESTATE_17', 'MI_ICON_REALESTATE_18',
-            'MI_ICON_REALESTATE_19', 'MI_ICON_REALESTATE_2',
-            'MI_ICON_REALESTATE_20', 'MI_ICON_REALESTATE_21',
-            'MI_ICON_REALESTATE_22', 'MI_ICON_REALESTATE_23',
-            'MI_ICON_REALESTATE_3', 'MI_ICON_REALESTATE_4',
-            'MI_ICON_REALESTATE_5', 'MI_ICON_REALESTATE_6',
-            'MI_ICON_REALESTATE_7', 'MI_ICON_REALESTATE_8',
-            'MI_ICON_REALESTATE_9', 'MI_ICON_RECT', 'MI_ICON_REGION_STYLE',
-            'MI_ICON_RESHAPE', 'MI_ICON_ROUND_RECT', 'MI_ICON_RULER',
-            'MI_ICON_RUN', 'MI_ICON_SAVE_FILE', 'MI_ICON_SAVE_WIN',
-            'MI_ICON_SAVE_WOR', 'MI_ICON_SEARCH_BDY', 'MI_ICON_SEARCH_POLYGON',
-            'MI_ICON_SEARCH_RADIUS', 'MI_ICON_SEARCH_RECT', 'MI_ICON_SIGNS_1',
-            'MI_ICON_SIGNS_10', 'MI_ICON_SIGNS_11', 'MI_ICON_SIGNS_12',
-            'MI_ICON_SIGNS_13', 'MI_ICON_SIGNS_14', 'MI_ICON_SIGNS_15',
-            'MI_ICON_SIGNS_16', 'MI_ICON_SIGNS_17', 'MI_ICON_SIGNS_18',
-            'MI_ICON_SIGNS_19', 'MI_ICON_SIGNS_2', 'MI_ICON_SIGNS_3',
-            'MI_ICON_SIGNS_4', 'MI_ICON_SIGNS_5', 'MI_ICON_SIGNS_6',
-            'MI_ICON_SIGNS_7', 'MI_ICON_SIGNS_8', 'MI_ICON_SIGNS_9',
-            'MI_ICON_STATISTICS', 'MI_ICON_SYMBOL', 'MI_ICON_SYMBOL_STYLE',
-            'MI_ICON_TEXT', 'MI_ICON_TEXT_STYLE', 'MI_ICON_TRANSPORT_1',
-            'MI_ICON_TRANSPORT_10', 'MI_ICON_TRANSPORT_11',
-            'MI_ICON_TRANSPORT_12', 'MI_ICON_TRANSPORT_13',
-            'MI_ICON_TRANSPORT_14', 'MI_ICON_TRANSPORT_15',
-            'MI_ICON_TRANSPORT_16', 'MI_ICON_TRANSPORT_17',
-            'MI_ICON_TRANSPORT_18', 'MI_ICON_TRANSPORT_19',
-            'MI_ICON_TRANSPORT_2', 'MI_ICON_TRANSPORT_20',
-            'MI_ICON_TRANSPORT_21', 'MI_ICON_TRANSPORT_22',
-            'MI_ICON_TRANSPORT_23', 'MI_ICON_TRANSPORT_24',
-            'MI_ICON_TRANSPORT_25', 'MI_ICON_TRANSPORT_26',
-            'MI_ICON_TRANSPORT_27', 'MI_ICON_TRANSPORT_3',
-            'MI_ICON_TRANSPORT_4', 'MI_ICON_TRANSPORT_5',
-            'MI_ICON_TRANSPORT_6', 'MI_ICON_TRANSPORT_7',
-            'MI_ICON_TRANSPORT_8', 'MI_ICON_TRANSPORT_9', 'MI_ICON_UNDO',
-            'MI_ICON_UNSELECT_ALL', 'MI_ICON_WINDOW_FRAME', 'MI_ICON_WRENCH',
-            'MI_ICON_ZOOM_IN', 'MI_ICON_ZOOM_OUT', 'MI_ICON_ZOOM_QUESTION',
-            'MI_ICONS_MAPS_1', 'MI_ICONS_MAPS_10', 'MI_ICONS_MAPS_11',
-            'MI_ICONS_MAPS_12', 'MI_ICONS_MAPS_13', 'MI_ICONS_MAPS_14',
-            'MI_ICONS_MAPS_15', 'MI_ICONS_MAPS_2', 'MI_ICONS_MAPS_3',
-            'MI_ICONS_MAPS_4', 'MI_ICONS_MAPS_5', 'MI_ICONS_MAPS_6',
-            'MI_ICONS_MAPS_7', 'MI_ICONS_MAPS_8', 'MI_ICONS_MAPS_9',
-            'MIPLATFORM_HP', 'MIPLATFORM_MAC68K', 'MIPLATFORM_POWERMAC',
-            'MIPLATFORM_SPECIAL', 'MIPLATFORM_SUN', 'MIPLATFORM_WIN16',
-            'MIPLATFORM_WIN32', 'MODE_APPEND', 'MODE_BINARY', 'MODE_INPUT',
-            'MODE_OUTPUT', 'MODE_RANDOM', 'OBJ_ARC', 'OBJ_ELLIPSE',
-            'OBJ_FRAME', 'OBJ_GEO_ARCBEGANGLE', 'OBJ_GEO_ARCENDANGLE',
-            'OBJ_GEO_CENTROID', 'OBJ_GEO_LINEBEGX', 'OBJ_GEO_LINEBEGY',
-            'OBJ_GEO_LINEENDX', 'OBJ_GEO_LINEENDY', 'OBJ_GEO_MAXX',
-            'OBJ_GEO_MAXY', 'OBJ_GEO_MINX', 'OBJ_GEO_MINY', 'OBJ_GEO_POINTM',
-            'OBJ_GEO_POINTX', 'OBJ_GEO_POINTY', 'OBJ_GEO_POINTZ',
-            'OBJ_GEO_ROUNDRADIUS', 'OBJ_GEO_TEXTANGLE', 'OBJ_GEO_TEXTLINEX',
-            'OBJ_GEO_TEXTLINEY', 'OBJ_INFO_BRUSH', 'OBJ_INFO_FILLFRAME',
-            'OBJ_INFO_FRAMETITLE', 'OBJ_INFO_FRAMEWIN', 'OBJ_INFO_HAS_M',
-            'OBJ_INFO_HAS_Z', 'OBJ_INFO_MPOINT', 'OBJ_INFO_NONEMPTY',
-            'OBJ_INFO_NPNTS', 'OBJ_INFO_NPOLYGONS', 'OBJ_INFO_PEN',
-            'OBJ_INFO_PLINE', 'OBJ_INFO_REGION', 'OBJ_INFO_SMOOTH',
-            'OBJ_INFO_SYMBOL', 'OBJ_INFO_TEXTARROW', 'OBJ_INFO_TEXTFONT',
-            'OBJ_INFO_TEXTJUSTIFY', 'OBJ_INFO_TEXTSPACING',
-            'OBJ_INFO_TEXTSTRING', 'OBJ_INFO_TYPE', 'OBJ_INFO_Z_UNIT',
-            'OBJ_INFO_Z_UNIT_SET', 'OBJ_LINE', 'OBJ_PLINE', 'OBJ_POINT',
-            'OBJ_RECT', 'OBJ_REGION', 'OBJ_ROUNDRECT', 'OBJ_TEXT',
-            'OBJ_TYPE_ARC', 'OBJ_TYPE_COLLECTION', 'OBJ_TYPE_ELLIPSE',
-            'OBJ_TYPE_FRAME', 'OBJ_TYPE_LINE', 'OBJ_TYPE_MPOINT',
-            'OBJ_TYPE_PLINE', 'OBJ_TYPE_POINT', 'OBJ_TYPE_RECT',
-            'OBJ_TYPE_REGION', 'OBJ_TYPE_ROUNDRECT', 'OBJ_TYPE_TEXT',
-            'ORIENTATION_CUSTOM', 'ORIENTATION_LANDSCAPE',
-            'ORIENTATION_PORTRAIT', 'PEN_COLOR', 'PEN_INDEX',
-            'PEN_INTERLEAVED', 'PEN_PATTERN', 'PEN_WIDTH', 'PLATFORM_MAC',
-            'PLATFORM_MOTIF', 'PLATFORM_SPECIAL', 'PLATFORM_WIN',
-            'PLATFORM_X11', 'PLATFORM_XOL', 'PRISMMAP_INFO_BACKGROUND',
-            'PRISMMAP_INFO_CAMERA_CLIP_FAR', 'PRISMMAP_INFO_CAMERA_CLIP_NEAR',
-            'PRISMMAP_INFO_CAMERA_FOCAL_X', 'PRISMMAP_INFO_CAMERA_FOCAL_Y',
-            'PRISMMAP_INFO_CAMERA_FOCAL_Z', 'PRISMMAP_INFO_CAMERA_VPN_1',
-            'PRISMMAP_INFO_CAMERA_VPN_2', 'PRISMMAP_INFO_CAMERA_VPN_3',
-            'PRISMMAP_INFO_CAMERA_VU_1', 'PRISMMAP_INFO_CAMERA_VU_2',
-            'PRISMMAP_INFO_CAMERA_VU_3', 'PRISMMAP_INFO_CAMERA_X',
-            'PRISMMAP_INFO_CAMERA_Y', 'PRISMMAP_INFO_CAMERA_Z',
-            'PRISMMAP_INFO_INFOTIP_EXPR', 'PRISMMAP_INFO_LIGHT_COLOR',
-            'PRISMMAP_INFO_LIGHT_X', 'PRISMMAP_INFO_LIGHT_Y',
-            'PRISMMAP_INFO_LIGHT_Z', 'PRISMMAP_INFO_SCALE', 'RAD_2_DEG',
-            'RASTER_CONTROL_POINT_X', 'RASTER_CONTROL_POINT_Y',
-            'RASTER_TAB_INFO_ALPHA', 'RASTER_TAB_INFO_BITS_PER_PIXEL',
-            'RASTER_TAB_INFO_BRIGHTNESS', 'RASTER_TAB_INFO_CONTRAST',
-            'RASTER_TAB_INFO_DISPLAY_TRANSPARENT', 'RASTER_TAB_INFO_GREYSCALE',
-            'RASTER_TAB_INFO_HEIGHT', 'RASTER_TAB_INFO_IMAGE_CLASS',
-            'RASTER_TAB_INFO_IMAGE_NAME', 'RASTER_TAB_INFO_IMAGE_TYPE',
-            'RASTER_TAB_INFO_NUM_CONTROL_POINTS',
-            'RASTER_TAB_INFO_TRANSPARENT_COLOR', 'RASTER_TAB_INFO_WIDTH',
-            'RED', 'REGION_INFO_IS_CLOCKWISE', 'SEARCH_INFO_ROW',
-            'SEARCH_INFO_TABLE', 'SECONDS_PER_DAY', 'SEL_INFO_NROWS',
-            'SEL_INFO_SELNAME', 'SEL_INFO_TABLENAME',
-            'SESSION_INFO_AREA_UNITS', 'SESSION_INFO_COORDSYS_CLAUSE',
-            'SESSION_INFO_DISTANCE_UNITS', 'SESSION_INFO_PAPER_UNITS',
-            'SRV_COL_INFO_ALIAS', 'SRV_COL_INFO_NAME',
-            'SRV_COL_INFO_PRECISION', 'SRV_COL_INFO_SCALE',
-            'SRV_COL_INFO_STATUS', 'SRV_COL_INFO_TYPE', 'SRV_COL_INFO_VALUE',
-            'SRV_COL_INFO_WIDTH', 'SRV_COL_TYPE_BIN_STRING',
-            'SRV_COL_TYPE_CHAR', 'SRV_COL_TYPE_DATE', 'SRV_COL_TYPE_DECIMAL',
-            'SRV_COL_TYPE_FIXED_LEN_STRING', 'SRV_COL_TYPE_FLOAT',
-            'SRV_COL_TYPE_INTEGER', 'SRV_COL_TYPE_LOGICAL',
-            'SRV_COL_TYPE_NONE', 'SRV_COL_TYPE_SMALLINT',
-            'SRV_CONNECT_INFO_DB_NAME', 'SRV_CONNECT_INFO_DRIVER_NAME',
-            'SRV_CONNECT_INFO_DS_NAME', 'SRV_CONNECT_INFO_QUOTE_CHAR',
-            'SRV_CONNECT_INFO_SQL_USER_ID', 'SRV_DRV_DATA_SOURCE',
-            'SRV_DRV_INFO_NAME', 'SRV_DRV_INFO_NAME_LIST', 'SRV_ERROR',
-            'SRV_FETCH_FIRST', 'SRV_FETCH_LAST', 'SRV_FETCH_NEXT',
-            'SRV_FETCH_PREV', 'SRV_INVALID_HANDLE', 'SRV_NEED_DATA',
-            'SRV_NO_MORE_DATA', 'SRV_NULL_DATA', 'SRV_SUCCESS',
-            'SRV_SUCCESS_WITH_INFO', 'SRV_TRUNCATED_DATA',
-            'SRV_WM_HIST_NO_OVERWRITE', 'SRV_WM_HIST_NONE',
-            'SRV_WM_HIST_OVERWRITE', 'STR_EQ', 'STR_GT', 'STR_LT',
-            'STYLE_SAMPLE_SIZE_LARGE', 'STYLE_SAMPLE_SIZE_SMALL',
-            'SWITCHING_INTO_MAPINFO', 'SWITCHING_OUT_OF_MAPINFO',
-            'SYMBOL_ANGLE', 'SYMBOL_CODE', 'SYMBOL_COLOR',
-            'SYMBOL_CUSTOM_NAME', 'SYMBOL_CUSTOM_STYLE', 'SYMBOL_FONT_NAME',
-            'SYMBOL_FONT_STYLE', 'SYMBOL_KIND', 'SYMBOL_KIND_CUSTOM',
-            'SYMBOL_KIND_FONT', 'SYMBOL_KIND_VECTOR', 'SYMBOL_POINTSIZE',
-            'SYS_INFO_APPIDISPATCH', 'SYS_INFO_APPLICATIONWND',
-            'SYS_INFO_APPVERSION', 'SYS_INFO_CHARSET',
-            'SYS_INFO_COPYPROTECTED', 'SYS_INFO_DATE_FORMAT',
-            'SYS_INFO_DDESTATUS', 'SYS_INFO_DIG_INSTALLED',
-            'SYS_INFO_DIG_MODE', 'SYS_INFO_MAPINFOWND',
-            'SYS_INFO_MDICLIENTWND', 'SYS_INFO_MIBUILD_NUMBER',
-            'SYS_INFO_MIPLATFORM', 'SYS_INFO_MIVERSION',
-            'SYS_INFO_NUMBER_FORMAT', 'SYS_INFO_PLATFORM',
-            'SYS_INFO_PRODUCTLEVEL', 'SYS_INFO_RUNTIME',
-            'TAB_GEO_CONTROL_POINT_X', 'TAB_GEO_CONTROL_POINT_Y',
-            'TAB_INFO_BROWSER_LIST', 'TAB_INFO_COORDSYS_CLAUSE',
-            'TAB_INFO_COORDSYS_CLAUSE_WITHOUT_BOUNDS',
-            'TAB_INFO_COORDSYS_MAXX', 'TAB_INFO_COORDSYS_MAXY',
-            'TAB_INFO_COORDSYS_MINX', 'TAB_INFO_COORDSYS_MINY',
-            'TAB_INFO_COORDSYS_NAME', 'TAB_INFO_EDITED', 'TAB_INFO_FASTEDIT',
-            'TAB_INFO_MAPPABLE', 'TAB_INFO_MAPPABLE_TABLE', 'TAB_INFO_MAXX',
-            'TAB_INFO_MAXY', 'TAB_INFO_MINX', 'TAB_INFO_MINY', 'TAB_INFO_NAME',
-            'TAB_INFO_NCOLS', 'TAB_INFO_NREFS', 'TAB_INFO_NROWS',
-            'TAB_INFO_NUM', 'TAB_INFO_READONLY', 'TAB_INFO_SEAMLESS',
-            'TAB_INFO_SUPPORT_MZ', 'TAB_INFO_TABFILE', 'TAB_INFO_TEMP',
-            'TAB_INFO_THEME_METADATA', 'TAB_INFO_TYPE', 'TAB_INFO_UNDO',
-            'TAB_INFO_USERBROWSE', 'TAB_INFO_USERCLOSE',
-            'TAB_INFO_USERDISPLAYMAP', 'TAB_INFO_USEREDITABLE',
-            'TAB_INFO_USERMAP', 'TAB_INFO_USERREMOVEMAP', 'TAB_INFO_Z_UNIT',
-            'TAB_INFO_Z_UNIT_SET', 'TAB_TYPE_BASE', 'TAB_TYPE_FME',
-            'TAB_TYPE_IMAGE', 'TAB_TYPE_LINKED', 'TAB_TYPE_RESULT',
-            'TAB_TYPE_VIEW', 'TAB_TYPE_WFS', 'TAB_TYPE_WMS', 'TRUE', 'WHITE',
-            'WIN_3DMAP', 'WIN_BROWSER', 'WIN_BUTTONPAD', 'WIN_CART_LEGEND',
-            'WIN_GRAPH', 'WIN_HELP', 'WIN_INFO', 'WIN_INFO_AUTOSCROLL',
-            'WIN_INFO_CLONEWINDOW', 'WIN_INFO_ENHANCED_RENDERING',
-            'WIN_INFO_EXPORT_ANTIALIASING', 'WIN_INFO_EXPORT_BORDER',
-            'WIN_INFO_EXPORT_DITHER', 'WIN_INFO_EXPORT_FILTER',
-            'WIN_INFO_EXPORT_MASKSIZE', 'WIN_INFO_EXPORT_THRESHOLD',
-            'WIN_INFO_EXPORT_TRANSPRASTER', 'WIN_INFO_EXPORT_TRANSPVECTOR',
-            'WIN_INFO_EXPORT_TRUECOLOR', 'WIN_INFO_HEIGHT',
-            'WIN_INFO_LEGENDS_MAP', 'WIN_INFO_NAME', 'WIN_INFO_OPEN',
-            'WIN_INFO_PRINTER_BORDER', 'WIN_INFO_PRINTER_BOTTOMMARGIN',
-            'WIN_INFO_PRINTER_COPIES', 'WIN_INFO_PRINTER_DITHER',
-            'WIN_INFO_PRINTER_LEFTMARGIN', 'WIN_INFO_PRINTER_METHOD',
-            'WIN_INFO_PRINTER_NAME', 'WIN_INFO_PRINTER_ORIENT',
-            'WIN_INFO_PRINTER_PAPERSIZE', 'WIN_INFO_PRINTER_RIGHTMARGIN',
-            'WIN_INFO_PRINTER_SCALE_PATTERNS', 'WIN_INFO_PRINTER_TOPMARGIN',
-            'WIN_INFO_PRINTER_TRANSPRASTER', 'WIN_INFO_PRINTER_TRANSPVECTOR',
-            'WIN_INFO_PRINTER_TRUECOLOR', 'WIN_INFO_SMARTPAN',
-            'WIN_INFO_SMOOTH_IMAGE', 'WIN_INFO_SMOOTH_TEXT',
-            'WIN_INFO_SMOOTH_VECTOR', 'WIN_INFO_SNAPMODE',
-            'WIN_INFO_SNAPTHRESHOLD', 'WIN_INFO_STATE',
-            'WIN_INFO_SYSMENUCLOSE', 'WIN_INFO_TABLE', 'WIN_INFO_TOPMOST',
-            'WIN_INFO_TYPE', 'WIN_INFO_WIDTH', 'WIN_INFO_WINDOWID',
-            'WIN_INFO_WND', 'WIN_INFO_WORKSPACE', 'WIN_INFO_X', 'WIN_INFO_Y',
-            'WIN_LAYOUT', 'WIN_LEGEND', 'WIN_MAPBASIC', 'WIN_MAPINFO',
-            'WIN_MAPPER', 'WIN_MESSAGE', 'WIN_PENPICKER',
-            'WIN_PRINTER_LANDSCAPE', 'WIN_PRINTER_PORTRAIT', 'WIN_RULER',
-            'WIN_STATE_MAXIMIZED', 'WIN_STATE_MINIMIZED', 'WIN_STATE_NORMAL',
-            'WIN_STATISTICS', 'WIN_STYLE_CHILD', 'WIN_STYLE_POPUP',
-            'WIN_STYLE_POPUP_FULLCAPTION', 'WIN_STYLE_STANDARD',
-            'WIN_SYMBOLPICKER', 'WIN_TOOLBAR', 'WIN_TOOLPICKER', 'YELLOW'
-            ),
-        5 => array(
-            'Abbrs', 'Above', 'Access', 'Active', 'Address', 'Advanced',
-            'Affine', 'Align', 'Alpha', 'alpha_value', 'Always', 'Angle',
-            'Animate', 'Antialiasing', 'Append', 'Apply', 'ApplyUpdates',
-            'Arrow', 'Ascending', 'ASCII', 'At', 'AttributeData', 'Auto',
-            'Autoflip', 'Autokey', 'Automatic', 'Autoscroll', 'Axis',
-            'Background', 'Banding', 'Batch', 'Behind', 'Below', 'Bend',
-            'Binary', 'Blocks', 'Border', 'BorderPen', 'Bottom', 'Bounds',
-            'ByteOrder', 'ByVal', 'Calling', 'Camera', 'Candidates',
-            'Cartesian', 'Cell', 'Center', 'Change', 'Char', 'Circle',
-            'Clipping', 'CloseMatchesOnly', 'ClosestAddr', 'Color', 'Columns',
-            'Contents', 'ControlPoints', 'Copies', 'Copyright', 'Counter',
-            'Country', 'CountrySecondarySubdivision', 'CountrySubdivision',
-            'Cross', 'CubicConvolution', 'Cull', 'Cursor', 'Custom', 'Data',
-            'DBF', 'DDE', 'Decimal', 'DecimalPlaces', 'DefaultAmbientSpeed',
-            'DefaultPropagationFactor', 'DeformatNumber', 'Delimiter',
-            'Density', 'DenyWrite', 'Descending', 'Destroy', 'Device',
-            'Dictionary', 'DInfo', 'Disable', 'DiscardUpdates', 'Display',
-            'Dither', 'DrawMode', 'DropKey', 'Droplines', 'Duplicates',
-            'Dynamic', 'Earth', 'East', 'EditLayerPopup', 'Elevation', 'Else',
-            'ElseIf', 'Emf', 'Enable', 'Envinsa', 'ErrorDiffusion', 'Extents',
-            'Fallback', 'FastEdit', 'FillFrame', 'Filter', 'First', 'Fit',
-            'Fixed', 'FocalPoint', 'Footnote', 'Force', 'FromMapCatalog',
-            'Front', 'Gap', 'Geographic', 'Geography', 'Graduated', 'Graphic',
-            'Gutter', 'Half', 'Halftone', 'Handles', 'Height', 'Help',
-            'HelpMsg', 'Hide', 'Hierarchical', 'HIGHLOW', 'History', 'Icon',
-            'ID', 'Ignore', 'Image', 'Inflect', 'Inset', 'Inside',
-            'Interactive', 'Internal', 'Interpolate', 'IntersectingStreet',
-            'Justify', 'Key', 'Label', 'Labels', 'Landscape', 'Large', 'Last',
-            'Layer', 'Left', 'Lib', 'Light', 'LinePen', 'Lines', 'Linestyle',
-            'Longitude', 'LOWHIGH', 'Major', 'MajorPolygonOnly',
-            'MajorRoadsOnly', 'MapBounds', 'MapMarker', 'MapString', 'Margins',
-            'MarkMultiple', 'MaskSize', 'Match', 'MaxOffRoadDistance',
-            'Message', 'MICODE', 'Minor', 'MixedCase', 'Mode', 'ModifierKeys',
-            'Modify', 'Multiple', 'MultiPolygonRgns', 'Municipality',
-            'MunicipalitySubdivision', 'Name', 'NATIVE', 'NearestNeighbor',
-            'NoCollision', 'Node', 'Nodes', 'NoIndex', 'None', 'Nonearth',
-            'NoRefresh', 'Normalized', 'North', 'Number', 'ObjectType', 'ODBC',
-            'Off', 'OK', 'OLE', 'On', 'Options', 'Orientation', 'OtherBdy',
-            'Output', 'Outside', 'Overlapped', 'Overwrite', 'Pagebreaks',
-            'Pan', 'Papersize', 'Parent', 'PassThrough', 'Password',
-            'Patterns', 'Per', 'Percent', 'Percentage', 'Permanent',
-            'PersistentCache', 'Pie', 'Pitch', 'Placename', 'PointsOnly',
-            'PolyObj', 'Portrait', 'Position', 'PostalCode', 'Prefer',
-            'Preferences', 'Prev', 'Printer', 'Projection', 'PushButton',
-            'Quantile', 'Query', 'Random', 'Range', 'Raster', 'Read',
-            'ReadOnly', 'Rec', 'Redraw', 'Refine', 'Regionstyle', 'RemoveData',
-            'Replace', 'Reprojection', 'Resampling', 'Restore', 'ResultCode',
-            'ReturnHoles', 'Right', 'Roll', 'ROP', 'Rotated', 'Row', 'Ruler',
-            'Scale', 'ScrollBars', 'Seamless', 'SecondaryPostalCode',
-            'SelfInt', 'Separator', 'Series', 'Service', 'SetKey',
-            'SetTraverse', 'Shades', 'Show', 'Simple', 'SimplificationFactor',
-            'Size', 'Small', 'Smart', 'Smooth', 'South', 'Spacing',
-            'SPATIALWARE', 'Spherical', 'Square', 'Stacked', 'Step', 'Store',
-            'Street', 'StreetName', 'StreetNumber', 'StyleType', 'Subtitle',
-            'SysMenuClose', 'Thin', 'Tick', 'Title', 'TitleAxisY',
-            'TitleGroup', 'Titles', 'TitleSeries', 'ToggleButton', 'Tolerance',
-            'ToolbarPosition', 'ToolButton', 'Toolkit', 'Top', 'Translucency',
-            'translucency_percent', 'Transparency', 'Transparent', 'Traverse',
-            'TrueColor', 'Uncheck', 'Undo', 'Union', 'Unit', 'Until', 'URL',
-            'Use', 'User', 'UserBrowse', 'UserClose', 'UserDisplayMap',
-            'UserEdit', 'UserMap', 'UserRemoveMap', 'Value', 'Variable',
-            'Vary', 'Vector', 'Versioned', 'View', 'ViewDisplayPopup',
-            'VisibleOnly', 'VMDefault', 'VMGrid', 'VMRaster', 'Voronoi',
-            'Warnings', 'Wedge', 'West', 'Width', 'With', 'XY', 'XYINDEX',
-            'Yaw', 'Zoom'
-            )
-        ),
-    'SYMBOLS' => array(
-            //Numeric/String Operators + Comparison Operators
-            '(', ')', '[', ']', '+', '-', '*', '/', '\\', '^', '&',
-            '=', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',        //Statements + Clauses + Data Types + Logical Operators, Geographical Operators + SQL
-            2 => 'color: #2391af;',        //Special Procedures
-            3 => 'color: #2391af;',        //Functions
-            4 => 'color: #c635cb;',        //Constants
-            5 => 'color: #0000ff;'         //Extended keywords (case sensitive)
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;',
-            'MULTI' => 'color: #008000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #a31515;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #12198b;',            //Table Attributes
-            1 => 'color: #2391af;'             //Data Types
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-            //Table Attribute
-            0 => "[\\.]{1}[a-zA-Z0-9_]+",
-            //Data Type
-            1 => "(?xi) \\s+ as \\s+ (Alias|Brush|Date|Float|Font|Integer|Logical|Object|Pen|SmallInt|String|Symbol)"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/matlab.php b/inc/geshi/matlab.php
deleted file mode 100644
index 7cdd50e5e..000000000
--- a/inc/geshi/matlab.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/*************************************************************************************
- * matlab.php
- * -----------
- * Author: Florian Knorn (floz@gmx.de)
- * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
- * Release Version: 1.0.8.11
- * Date Started: 2005/02/09
- *
- * Matlab M-file language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2006-03-25 (1.0.7.22)
- *   - support for the transpose operator
- *   - many keywords added
- *   - links to the matlab documentation at mathworks
- *      by: Olivier Verdier (olivier.verdier@free.fr)
- * 2005/05/07 (1.0.0)
- *   -  First Release
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Matlab M',
-    'COMMENT_SINGLE' => array(1 => '%'),
-    'COMMENT_MULTI' => array(),
-    //Matlab Strings
-    'COMMENT_REGEXP' => array(
-        2 => "/(?<![\\w\\)\\]\\}\\.])('[^\\n']*?')/"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'break', 'case', 'catch', 'continue', 'elseif', 'else', 'end', 'for',
-            'function', 'global', 'if', 'otherwise', 'persistent', 'return',
-            'switch', 'try', 'while'
-            ),
-        2 => array(
-            'all','any','exist','is','logical','mislocked',
-
-            'abs','acos','acosh','acot','acoth','acsc','acsch','airy','angle',
-            'ans','area','asec','asech','asin','asinh','atan','atan2','atanh',
-            'auread','autumn','auwrite','axes','axis','balance','bar','bar3',
-            'bar3h','barh','besselh','besseli','besselj','besselk','Bessely',
-            'beta','betainc','betaln','bicg','bicgstab','bin2dec','bitand',
-            'bitcmp','bitget','bitmax','bitor','bitset','bitshift','bitxor',
-            'blkdiag','bone','box','brighten','builtin','bwcontr','calendar',
-            'camdolly','camlight','camlookat','camorbit','campan','campos',
-            'camproj','camroll','camtarget','camup','camva','camzoom','capture',
-            'cart2pol','cart2sph','cat','caxis','cdf2rdf','ceil','cell',
-            'cell2struct','celldisp','cellfun','cellplot','cellstr','cgs',
-            'char','chol','cholinc','cholupdate','cla','clabel','class','clc',
-            'clf','clg','clock','close','colmmd','colorbar','colorcube',
-            'colordef','colormap','colperm','comet','comet3','compan','compass',
-            'complex','computer','cond','condeig','condest','coneplot','conj',
-            'contour','contourc','contourf','contourslice','contrast','conv',
-            'conv2','convhull','cool','copper','copyobj','corrcoef','cos',
-            'cosh','cot','coth','cov','cplxpair','cputime','cross','csc','csch',
-            'cumprod','cumsum','cumtrapz','cylinder','daspect','date','datenum',
-            'datestr','datetick','datevec','dbclear','dbcont','dbdown',
-            'dblquad','dbmex','dbquit','dbstack','dbstatus','dbstep','dbstop',
-            'dbtype','dbup','deblank','dec2bin','dec2hex','deconv','del2',
-            'delaunay','det','diag','dialog','diff','diffuse','dlmread',
-            'dlmwrite','dmperm','double','dragrect','drawnow','dsearch','eig',
-            'eigs','ellipj','ellipke','eomday','eps','erf','erfc','erfcx',
-            'erfiny','error','errorbar','errordlg','etime','eval','evalc',
-            'evalin','exp','expint','expm','eye','ezcontour','ezcontourf',
-            'ezmesh','ezmeshc','ezplot','ezplot3','ezpolar','ezsurf','ezsurfc',
-            'factor','factorial','fclose','feather','feof','ferror','feval',
-            'fft','fft2','fftshift','fgetl','fgets','fieldnames','figure',
-            'fill','fill3','filter','filter2','find','findfigs','findobj',
-            'findstr','fix','flag','flipdim','fliplr','flipud','floor','flops',
-            'fmin','fmins','fopen','fplot','fprintf','fread','frewind','fscanf',
-            'fseek','ftell','full','funm','fwrite','fzero','gallery','gamma',
-            'gammainc','gammaln','gca','gcbo','gcd','gcf','gco','get',
-            'getfield','ginput','gmres','gradient','gray','graymon','grid',
-            'griddata','gsvd','gtext','hadamard','hankel','hdf','helpdlg',
-            'hess','hex2dec','hex2num','hidden','hilb','hist','hold','hot',
-            'hsv','hsv2rgb','i','ifft','ifft2','ifftn','ifftshift','imag',
-            'image','imfinfo','imread','imwrite','ind2sub','Inf','inferiorto',
-            'inline','inpolygon','input','inputdlg','inputname','int16',
-            'int2str','int32','int8','interp1','interp2','interp3','interpft',
-            'interpn','intersect','inv','invhilb','ipermute','isa','ishandle',
-            'ismember','isocaps','isonormals','isosurface','j','jet','keyboard',
-            'lcm','legend','legendre','light','lighting','lightingangle',
-            'lin2mu','line','lines','linspace','listdlg','loadobj','log',
-            'log10','log2','loglog','logm','logspace','lower','lscov','lu',
-            'luinc','magic','mat2str','material','max','mean','median','menu',
-            'menuedit','mesh','meshc','meshgrid','min','mod','msgbox','mu2lin',
-            'NaN','nargchk','nargin','nargout','nchoosek','ndgrid','ndims',
-            'newplot','nextpow2','nnls','nnz','nonzeros','norm','normest','now',
-            'null','num2cell','num2str','nzmax','ode113,','ode15s,','ode23s,',
-            'ode23t,','ode23tb','ode45,','odefile','odeget','odeset','ones',
-            'orient','orth','pagedlg','pareto','pascal','patch','pause',
-            'pbaspect','pcg','pcolor','peaks','perms','permute','pi','pie',
-            'pie3','pinv','plot','plot3','plotmatrix','plotyy','pol2cart',
-            'polar','poly','polyarea','polyder','polyeig','polyfit','polyval',
-            'polyvalm','pow2','primes','print','printdlg','printopt','prism',
-            'prod','propedit','qmr','qr','qrdelete','qrinsert','qrupdate',
-            'quad','questdlg','quiver','quiver3','qz','rand','randn','randperm',
-            'rank','rat','rats','rbbox','rcond','real','realmax','realmin',
-            'rectangle','reducepatch','reducevolume','refresh','rem','repmat',
-            'reset','reshape','residue','rgb2hsv','rgbplot','ribbon','rmfield',
-            'roots','rose','rot90','rotate','rotate3d','round','rref',
-            'rrefmovie','rsf2csf','saveobj','scatter','scatter3','schur',
-            'script','sec','sech','selectmoveresize','semilogx','semilogy',
-            'set','setdiff','setfield','setxor','shading','shg','shiftdim',
-            'shrinkfaces','sign','sin','single','sinh','slice','smooth3','sort',
-            'sortrows','sound','soundsc','spalloc','sparse','spconvert',
-            'spdiags','specular','speye','spfun','sph2cart','sphere','spinmap',
-            'spline','spones','spparms','sprand','sprandn','sprandsym','spring',
-            'sprintf','sqrt','sqrtm','squeeze','sscanf','stairs','std','stem',
-            'stem3','str2double','str2num','strcat','strcmp','strcmpi',
-            'stream2','stream3','streamline','strings','strjust','strmatch',
-            'strncmp','strrep','strtok','struct','struct2cell','strvcat',
-            'sub2ind','subplot','subspace','subvolume','sum','summer',
-            'superiorto','surf','surf2patch','surface','surfc','surfl',
-            'surfnorm','svd','svds','symmmd','symrcm','symvar','tan','tanh',
-            'texlabel','text Create','textread','textwrap','tic','title','toc',
-            'toeplitz','trace','trapz','tril','trimesh','trisurf','triu',
-            'tsearch','uicontext Create','uicontextmenu','uicontrol',
-            'uigetfile','uimenu','uint32','uint8','uiputfile','uiresume',
-            'uisetcolor','uisetfont','uiwait Used','union','unique','unwrap',
-            'upper','var','varargin','varargout','vectorize','view','viewmtx',
-            'voronoi','waitbar','waitforbuttonpress','warndlg','warning',
-            'waterfall','wavread','wavwrite','weekday','whitebg','wilkinson',
-            'winter','wk1read','wk1write','xlabel','xlim','ylabel','ylim',
-            'zeros','zlabel','zlim','zoom',
-            //'[Keywords 6]',
-            'addpath','cd','clear','copyfile','delete','diary','dir','disp',
-            'doc','docopt','echo','edit','fileparts','format','fullfile','help',
-            'helpdesk','helpwin','home','inmem','lasterr','lastwarn','length',
-            'load','lookfor','ls','matlabrc','matlabroot','mkdir','mlock',
-            'more','munlock','open','openvar','pack','partialpath','path',
-            'pathtool','profile','profreport','pwd','quit','rmpath','save',
-            'saveas','size','tempdir','tempname','type','ver','version','web',
-            'what','whatsnew','which','who','whos','workspace'
-            )
-        ),
-    'SYMBOLS' => array(
-        '...'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        //3 => false,
-        //4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000FF;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #228B22;',
-            2 => 'color:#A020F0;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #080;'
-            ),
-        'STRINGS' => array(
-            //0 => 'color: #A020F0;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #33f;'
-            ),
-        'METHODS' => array(
-            1 => '',
-            2 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #080;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #33f;'
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        //Complex numbers
-        0 => '(?<![\\w\\/])[+-]?[\\d]*([\\d]\\.|\\.[\\d])?[\\d]*[ij](?![\\w]|\<DOT>html)'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/mirc.php b/inc/geshi/mirc.php
deleted file mode 100644
index fa2f307ee..000000000
--- a/inc/geshi/mirc.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/*************************************************************************************
- * mirc.php
- * -----
- * Author: Alberto 'Birckin' de Areba (Birckin@hotmail.com)
- * Copyright: (c) 2006 Alberto de Areba
- * Release Version: 1.0.8.11
- * Date Started: 2006/05/29
- *
- * mIRC Scripting language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2006/05/29 (1.0.0)
- *   -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'mIRC Scripting',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'alias', 'menu', 'dialog',
-            ),
-        2 => array(
-            'if', 'elseif', 'else', 'while', 'return', 'goto', 'var'
-            ),
-        3 => array(
-            'action','ajinvite','amsg','ame','anick','aop','auser',
-            'avoice','auto','autojoin','away','background','ban','beep',
-            'channel','clear','clearall','clipboard','close','closemsg','color',
-            'copy','creq','ctcp','ctcpreply','ctcps','dcc','dde','ddeserver',
-            'debug','describe','disable','disconnect','dlevel','dll','dns',
-            'dqwindow','ebeeps','echo','editbox','emailaddr','enable','events',
-            'exit','filter','findtext','finger','flash','flood','flush',
-            'flushini','font','fsend','fserve','fullname','ghide','gload',
-            'gmove','gopts','gplay','gpoint','gqreq','groups','gshow','gsize',
-            'gstop','gtalk','gunload','guser','help','hop','ignore','invite',
-            'join','kick','linesep','links','list','load','loadbuf','localinfo',
-            'log','me','mdi','mkdir','mnick','mode','msg','names','nick','noop',
-            'notice','notify','omsg','onotice','part','partall','pdcc',
-            'perform','ping','play','pop','protect','pvoice','qmsg','qme',
-            'query','queryrn','quit','raw','remini','remote','remove','rename',
-            'enwin','resetidle','rlevel','rmdir','run','ruser','save','savebuf',
-            'saveini','say','server','showmirc','sline','sound','speak','splay',
-            'sreq','strip','time',
-            //'timer[N/name]', //Handled as a regular expression below ...
-            'timers','timestamp','titlebar','tnick','tokenize','topic','ulist',
-            'unload','updatenl','url','uwho','window','winhelp','write',
-            'writeini','who','whois','whowas'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '/'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #994444;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #990000; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #FF0000;',
-            ),
-        'STRINGS' => array(
-            ),
-        'NUMBERS' => array(
-            0 => '',
-            ),
-        'METHODS' => array(
-            0 => 'color: #008000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #FF0000;',
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000099;',
-            1 => 'color: #990000;',
-            2 => 'color: #000099;',
-            3 => 'color: #888800;',
-            4 => 'color: #888800;',
-            5 => 'color: #000099;',
-            6 => 'color: #990000; font-weight: bold;',
-            7 => 'color: #990000; font-weight: bold;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.mirc.com/{FNAMEL}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array('.'),
-    'REGEXPS' => array(
-        //Variable names
-        0 => '\$[a-zA-Z0-9]+',
-        //Variable names
-        1 => '(%|&amp;)[\w\x80-\xFE]+',
-        //Client to Client Protocol handling
-        2 => '(on|ctcp) (!|@|&amp;)?(\d|\*):[a-zA-Z]+:',
-        /*4 => array(
-            GESHI_SEARCH => '((on|ctcp) (!|@|&)?(\d|\*):(Action|Active|Agent|AppActive|Ban|Chat|Close|Connect|Ctcp|CtcpReply|DccServer|DeHelp|DeOp|DeVoice|Dialog|Dns|Error|Exit|FileRcvd|FileSent|GetFail|Help|Hotlink|Input|Invite|Join|KeyDown|KeyUp|Kick|Load|Logon|MidiEnd|Mode|Mp3End|Nick|NoSound|Notice|Notify|Op|Open|Part|Ping|Pong|PlayEnd|Quit|Raw|RawMode|SendFail|Serv|ServerMode|ServerOp|Signal|Snotice|Start|Text|Topic|UnBan|Unload|Unotify|User|Mode|Voice|Wallops|WaveEnd):)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),*/
-        //Channel names
-        3 => '(#|@)[a-zA-Z0-9]+',
-        4 => '-[a-z\d]+',
-        //Raw protocol handling
-        5 => 'raw (\d|\*):',
-        //Timer handling
-        6 => '(?<!>|:|\/)\/timer(?!s\b)[0-9a-zA-Z_]+',
-        // /...
-        7 => '(?<!>|:|\/|\w)\/[a-zA-Z][a-zA-Z0-9]*(?!>)'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER
-            ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => '(?<![\w\$\|\#;<^&])'
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/mmix.php b/inc/geshi/mmix.php
deleted file mode 100644
index 60b6e28ce..000000000
--- a/inc/geshi/mmix.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/*************************************************************************************
- * mmix.php
- * -------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2009 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/16
- *
- * MMIX Assembler language file for GeSHi.
- *
- * This is an implementation of the MMIX language as designed by Donald E. Knuth
- *
- * CHANGES
- * -------
- * 2004/08/05 (1.0.8.6)
- *   -  First Release
- *
- * TODO (updated 2009/10/16)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'MMIX',
-    'COMMENT_SINGLE' => array(1 => ';', 2 => '%'),
-    'COMMENT_MULTI' => array(),
-    //Line address prefix suppression
-    'COMMENT_REGEXP' => array(
-        3 => "/^\s*(?!\s)[^\w].*$/m",
-        4 => "/^\s*[0-9a-f]{12,16}+(?:\s+[0-9a-f]+(?:\.{3}[0-9a-f]{2,})?)?:/mi"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'NUMBERS' => array(
-        1 => '(?<![\d\$#\w])[\da-fA-F]+(?!\w)',
-        2 => '#[\da-fA-F]+',
-        3 => '\$\d+'
-        ),
-    'KEYWORDS' => array(
-        /*CPU*/
-        1 => array(
-            '16ADDU','2ADDU','4ADDU','8ADDU','ADD','ADDU','AND','ANDN','ANDNH',
-            'ANDNL','ANDNMH','ANDNML','BDIF','BEV','BN','BNN','BNP','BNZ','BOD',
-            'BP','BZ','CMP','CMPU','CSEV','CSN','CSNN','CSNP','CSNZ','CSOD',
-            'CSP','CSWAP','CSZ','DIV','DIVU','FADD','FCMP','FCMPE','FDIV',
-            'FEQL','FEQLE','FINT','FIX','FIXU','FLOT','FLOTU','FMUL','FREM',
-            'FSQRT','FSUB','FUN','FUNE','GET','GETA','GO','INCH','INCL','INCMH',
-            'INCML','JMP','LDA','LDB','LDBU','LDHT','LDO','LDOU','LDSF','LDT',
-            'LDTU','LDUNC','LDVTS','LDW','LDWU','MOR','MUL','MULU','MUX','MXOR',
-            'NAND','NEG','NEGU','NOR','NXOR','ODIF','OR','ORH','ORL','ORMH',
-            'ORML','ORN','PBEV','PBN','PBNN','PBNP','PBNZ','PBOD','PBP','PBZ',
-            'POP','PREGO','PRELD','PREST','PUSHGO','PUSHJ','PUT','RESUME','SADD',
-            'SAVE','SETH','SETL','SETMH','SETML','SFLOT','SFLOTU','SL','SLU',
-            'SR','SRU','STB','STBU','STCO','STHT','STO','STOU','STSF','STT',
-            'STTU','STUNC','STW','STWU','SUB','SUBU','SWYM','SYNC','SYNCD',
-            'SYNCID','TDIF','TRAP','TRIP','UNSAVE','WDIF','XOR','ZSEV','ZSN',
-            'ZSNN','ZSNP','ZSNZ','ZSOD','ZSP','ZSZ'
-            ),
-        2 => array(
-            'BSPEC','BYTE','ESPEC','GREG','IS','LOC','LOCAL','OCTA',
-            'PREFIX','SET','TETRA','WYDE'
-            ),
-        /*registers*/
-        3 => array(
-            'rA','rB','rC','rD','rE','rF','rG','rH','rI','rJ','rK','rL','rM',
-            'rN','rO','rP','rQ','rR','rS','rT','rU','rV','rW','rX','rY','rZ',
-            'rBB','rTT','rWW','rXX','rYY','rZZ'
-            ),
-//        /*Directive*/
-//        4 => array(
-//            ),
-//        /*Operands*/
-//        5 => array(
-//            )
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '(', ')',
-        '+', '-', '*', '/', '%',
-        '.', ',', ';', ':',
-        '<<','>>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => false,
-        3 => true,
-//        4 => false,
-//        5 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f; font-weight: bold;',
-            2 => 'color: #0000ff; font-weight: bold;',
-            3 => 'color: #00007f;',
-//            4 => 'color: #000000; font-weight: bold;',
-//            5 => 'color: #000000; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #666666; font-style: italic;',
-            3 => 'color: #666666; font-style: italic;',
-            4 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000ff;',
-            1 => 'color: #0000ff;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #00007f;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-//            0 => 'color: #0000ff;',
-//            1 => 'color: #0000ff;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-//        4 => '',
-//        5 => ''
-        ),
-/*
-    'NUMBERS' =>
-        GESHI_NUMBER_BIN_PREFIX_PERCENT |
-        GESHI_NUMBER_BIN_SUFFIX |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_HEX_SUFFIX |
-        GESHI_NUMBER_OCT_SUFFIX |
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-*/
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-//        0 => /*  */ "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))(?:[0-9][0-9a-fA-F]{0,31}[hH]|0x[0-9a-fA-F]{1,32})(?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))",
-        //Binary numbers
-//        1 => "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))[01]{1,64}[bB](?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/modula2.php b/inc/geshi/modula2.php
deleted file mode 100644
index 18508340b..000000000
--- a/inc/geshi/modula2.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/****************************************************************************
- * modula2.php
- * -----------
- * Author: Benjamin Kowarsch (benjamin@modula2.net)
- * Copyright: (c) 2009 Benjamin Kowarsch (benjamin@modula2.net)
- * Release Version: 1.0.8.11
- * Date Started: 2009/11/05
- *
- * Modula-2 language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/05/22 (1.0.8.8)
- *   -  First Release
- *
- * TODO (updated 2010/05/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Modula-2',
-    'COMMENT_MULTI' => array('(*' => '*)'),
-    'COMMENT_SINGLE' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("''"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array( /* reserved words */
-            'AND', 'ARRAY', 'BEGIN', 'BY', 'CASE', 'CONST', 'DEFINITION',
-            'DIV', 'DO', 'ELSE', 'ELSIF', 'END', 'EXIT', 'EXPORT', 'FOR',
-            'FROM', 'IF', 'IMPLEMENTATION', 'IMPORT', 'IN', 'LOOP', 'MOD',
-            'MODULE', 'NOT', 'OF', 'OR', 'POINTER', 'PROCEDURE', 'QUALIFIED',
-            'RECORD', 'REPEAT', 'RETURN', 'SET', 'THEN', 'TO', 'TYPE',
-            'UNTIL', 'VAR', 'WHILE', 'WITH'
-            ),
-        2 => array( /* pervasive constants */
-            'NIL', 'FALSE', 'TRUE',
-            ),
-        3 => array( /* pervasive types */
-            'BITSET', 'CAP', 'CHR', 'DEC', 'DISPOSE', 'EXCL', 'FLOAT',
-            'HALT', 'HIGH', 'INC', 'INCL', 'MAX', 'MIN', 'NEW', 'ODD', 'ORD',
-            'SIZE', 'TRUNC', 'VAL'
-            ),
-        4 => array( /* pervasive functions and macros */
-            'ABS', 'BOOLEAN', 'CARDINAL', 'CHAR', 'INTEGER',
-            'LONGCARD', 'LONGINT', 'LONGREAL', 'PROC', 'REAL'
-            ),
-        ),
-    'SYMBOLS' => array(
-        ',', ':', '=', '+', '-', '*', '/', '#', '~'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0066ee;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => ''
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/modula3.php b/inc/geshi/modula3.php
deleted file mode 100644
index ae08dcf97..000000000
--- a/inc/geshi/modula3.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*************************************************************************************
- * modula3.php
- * ----------
- * Author: mbishop (mbishop@esoteriq.org)
- * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
- * Release Version: 1.0.8.11
- * Date Started: 2009/01/21
- *
- * Modula-3 language file for GeSHi.
- *
- * CHANGES
- * -------
- *
- * TODO
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Modula-3',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('(*' => '*)'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("''"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'AND', 'ANY', 'ARRAY', 'AS', 'BEGIN', 'BITS', 'BRANDED', 'BY', 'CASE',
-            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END', 'EVAL', 'EXCEPT', 'EXCEPTION',
-            'EXIT', 'EXPORTS', 'FINALLY', 'FOR', 'FROM', 'GENERIC', 'IF', 'IMPORT', 'IN',
-            'INTERFACE', 'LOCK', 'LOOP', 'METHODS', 'MOD', 'MODULE', 'NOT', 'OBJECT', 'OF',
-            'OR', 'OVERRIDES', 'PROCEDURE', 'RAISE', 'RAISES', 'READONLY', 'RECORD', 'REF',
-            'REPEAT', 'RETURN', 'REVEAL', 'ROOT', 'SET', 'THEN', 'TO', 'TRY', 'TYPE', 'TYPECASE',
-            'UNSAFE', 'UNTIL', 'UNTRACED', 'VALUE', 'VAR', 'WHILE', 'WITH'
-            ),
-        2 => array(
-            'NIL', 'NULL', 'FALSE', 'TRUE',
-            ),
-        3 => array(
-            'ABS','ADR','ADRSIZE','BITSIZE','BYTESIZE','CEILING','DEC','DISPOSE',
-            'EXTENDED','FIRST','FLOAT','FLOOR','INC','ISTYPE','LAST','LOOPHOLE','MAX','MIN',
-            'NARROW','NEW','NUMBER','ORD','ROUND','SUBARRAY','TRUNC','TYPECODE', 'VAL'
-            ),
-        4 => array(
-            'ADDRESS', 'BOOLEAN', 'CARDINAL', 'CHAR', 'INTEGER',
-            'LONGREAL', 'MUTEX', 'REAL', 'REFANY', 'TEXT'
-            ),
-        ),
-    'SYMBOLS' => array(
-        ',', ':', '=', '+', '-', '*', '/', '#'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0066ee;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/mpasm.php b/inc/geshi/mpasm.php
deleted file mode 100644
index f724a9414..000000000
--- a/inc/geshi/mpasm.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/*************************************************************************************
- * mpasm.php
- * ---------
- * Author: Bakalex (bakalex@gmail.com)
- * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/12/6
- *
- * Microchip Assembler language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  - Added description of extra language features (SF#1970248)
- * 2005/01/29 (1.0.0)
- *  - First Release
- *
- * TODO (updated 2005/12/6)
- * -------------------------
- *
- * For the moment, i've only added PIC16C6X registers. We need more (PIC16F/C7x/8x,
- * PIC10, PIC18 and dsPIC registers).
- * Must take a look to dsPIC instructions.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Microchip Assembler',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /*Directive Language*/
-        4 => array(
-            'CONSTANT', '#DEFINE', 'END', 'EQU', 'ERROR', 'ERROR-LEVEL', '#INCLUDE', 'LIST',
-            'MESSG', 'NOLIST', 'ORG', 'PAGE', 'PROCESSOR', 'RADIX', 'SET', 'SPACE', 'SUBTITLE',
-            'TITLE', '#UNDEFINE', 'VARIABLE', 'ELSE', 'ENDIF', 'ENDW', 'IF', 'IFDEF', 'IFNDEF',
-            'WHILE', '__BADRAM', 'CBLOCK', '__CONFIG', 'DA', 'DATA', 'DB', 'DE', 'DT', 'DW',
-            'ENDC', 'FILL', '__IDLOCS', '__MAXRAM', 'RES', 'ENDM', 'EXITM', 'EXPAND', 'LOCAL',
-            'MACRO', 'NOEXPAND', 'BANKISEL', 'BANKSEL', 'CODE', 'EXTERN', 'GLOBAL', 'IDATA',
-            'PAGESEL', 'UDATA', 'UDATA_ACS', 'UDATA_OVR', 'UDATA_SHR'
-            ),
-        /* 12&14-bit Specific Instruction Set*/
-        1 => array(
-            'andlw', 'call', 'clrwdt', 'goto', 'iorlw', 'movlw', 'option', 'retlw', 'sleep',
-            'tris', 'xorlw', 'addwf', 'andwf', 'clrf', 'clrw', 'comf', 'decf', 'decfsz', 'incf',
-            'incfsz', 'iorwf', 'movf', 'nop', 'rlf', 'rrf', 'subwf', 'swapf', 'xorwf',
-            'bcf', 'bsf', 'btfsc', 'btfss',
-            'addlw', 'retfie', 'return', 'sublw', 'addcf', 'adddcf', 'b', 'bc', 'bdc',
-            'bnc', 'bndc', 'bnz', 'bz', 'clrc', 'clrdc', 'clrz', 'lcall', 'lgoto', 'movfw',
-            'negf', 'setc', 'setdc', 'setz', 'skpc', 'skpdc', 'skpnc', 'skpndc', 'skpnz', 'skpz',
-            'subcf', 'subdcf', 'tstf'
-            ),
-        /* 16-bit Specific Instructiob Set */
-        2 => array (
-            'movfp', 'movlb', 'movlp', 'movpf', 'movwf', 'tablrd', 'tablwt', 'tlrd', 'tlwt',
-            'addwfc', 'daw', 'mullw', 'negw', 'rlcf', 'rlncf', 'rrcf', 'rrncf', 'setf', 'subwfb',
-            'btg', 'cpfseq', 'cpfsgt', 'cpfslt', 'dcfsnz', 'infsnz', 'tstfsz', 'lfsr', 'bnn',
-            'bnov', 'bra', 'pop', 'push', 'rcall', 'reset'
-            ),
-        /* Registers */
-        3 => array(
-            'INDF', 'TMR0', 'PCL', 'STATUS', 'FSR', 'PORTA', 'PORTB', 'PORTC', 'PORTD', 'PORTE',
-            'PCLATH', 'INTCON', 'PIR1', 'PIR2', 'TMR1L', 'TMR1H', 'T1CON', 'TMR2', 'T2CON', 'TMR2L',
-            'TMR2H', 'TMR0H', 'TMR0L', 'SSPBUF', 'SSPCON', 'CCPR1L', 'CCPR1H', 'CCP1CON', 'RCSTA',
-            'TXREG', 'RCREG', 'CCPR2L', 'CCPR2H', 'CCP2CON', 'OPTION', 'TRISA', 'TRISB', 'TRISC',
-            'TRISD', 'TRISE', 'PIE2', 'PIE1', 'PR2', 'SSPADD', 'SSPSTAT', 'TXSTA', 'SPBRG'
-            ),
-        /*Operands*/
-        5 => array(
-            'high','low'
-            )
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #007f00;',
-            4 => 'color: #46aa03; font-weight:bold;',
-            5 => 'color: #7f0000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #ff0000;',
-            1 => 'color: #ff0000;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-        0 => '[0-9a-fA-F]{1,32}[hH]',
-        //Binary numbers
-        1 => '[01]{1,64}[bB]'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/mxml.php b/inc/geshi/mxml.php
deleted file mode 100644
index 0cc8287a2..000000000
--- a/inc/geshi/mxml.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/*************************************************************************************
- * mxml.php
- * -------
- * Author: David Spurr
- * Copyright: (c) 2007 David Spurr (http://www.defusion.org.uk/)
- * Release Version: 1.0.8.11
- * Date Started: 2007/10/04
- *
- * MXML language file for GeSHi. Based on the XML file by Nigel McNie
- *
- * CHANGES
- * -------
- * 2007/10/04 (1.0.7.22)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'MXML',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('<!--' => '-->'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            0 => 'color: #00bbdd;',
-            1 => 'color: #ddbb00;',
-            2 => 'color: #339933;',
-            3 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            0 => 'font-weight: bold; color: black;',
-            1 => 'color: #7400FF;',
-            2 => 'color: #7400FF;'
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        // xml declaration
-        0 => array(
-            GESHI_SEARCH => '(&lt;[\/?|(\?xml)]?[a-z0-9_\-:]*(\?&gt;))',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // opening tags
-        1 => array(
-            GESHI_SEARCH => '(&lt;\/?[a-z]+:[a-z]+)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // closing tags
-        2 => array(
-            GESHI_SEARCH => '(\/?&gt;)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<!DOCTYPE' => '>'
-            ),
-        1 => array(
-            '&' => ';'
-            ),
-        2 => array(
-            //'<![CDATA[' => ']]>'
-            '<mx:Script>' => '</mx:Script>'
-            ),
-        3 => array(
-            '<' => '>'
-            )
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => false,
-        1 => false,
-        2 => false,
-        3 => true
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/mysql.php b/inc/geshi/mysql.php
deleted file mode 100644
index 507da2d09..000000000
--- a/inc/geshi/mysql.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<?php
-/*************************************************************************************
- * mysql.php
- * ---------
- * Author: Marjolein Katsma (marjolein.is.back@gmail.com)
- * Copyright: (c) 2008 Marjolein Katsma (http://blog.marjoleinkatsma.com/)
- * Release Version: 1.0.8.11
- * Date Started: 2008-12-12
- *
- * MySQL language file for GeSHi.
- *
- * Based on original MySQL language file by Carl Fürstenberg (2004); brought
- * up-to-date for current MySQL versions, and with more classes for different
- * types of keywords; several minor errors were corrected as well.
- *
- * Some "classes" have two groups here: this is to allow for the fact that some
- * keywords in MySQL have a double function: many of those are either a function
- * (must be immediately followed by an opening bracket) or some other keyword:
- * so they can be distinguished by the presence (or not) of that opening bracket.
- * (An immediately following opening bracket is a default rule for functions in
- * MySQL, though this may be overridden; because it's only a default, we use a
- * regex lookahead only where necessary to distinguish homonyms, not generally
- * to match any function.)
- * Other keywords with double usage cannot be distinguished and are classified
- * in the "Mix" category.
- *
- *************************************************************************************
- *
- * This file is part of GeSHi.
- *
- * GeSHi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GeSHi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GeSHi; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'MySQL',
-    //'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),    // '--' MUST be folowed by whitespace,not necessarily a space
-    'COMMENT_SINGLE' => array(
-        1 =>'-- ',
-        2 => '#'
-        ),
-    'COMMENT_REGEXP' => array(
-        1 => "/(?:--\s).*?$/",                          // double dash followed by any whitespace
-        ),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,            // @@@ would be nice if this could be defined per group!
-    'QUOTEMARKS' => array("'", '"', '`'),
-    'ESCAPE_CHAR' => '\\',                              // by default only, can be specified
-    'ESCAPE_REGEXP' => array(
-        1 => "/[_%]/",                                  // search wildcards
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_OCT_PREFIX |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_SCI_SHORT |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            // Mix: statement keywords and keywords that don't fit in any other
-            // category, or have multiple usage/meanings
-            'ACTION','ADD','AFTER','ALGORITHM','ALL','ALTER','ANALYZE','ANY',
-            'ASC','AS','BDB','BEGIN','BERKELEYDB','BINARY','BTREE','CALL',
-            'CASCADED','CASCADE','CHAIN','CHANGE','CHECK','COLUMNS','COLUMN',
-            'COMMENT','COMMIT','COMMITTED','CONSTRAINT','CONTAINS SQL',
-            'CONSISTENT','CONVERT','CREATE','CROSS','DATA','DATABASES',
-            'DECLARE','DEFINER','DELAYED','DELETE','DESCRIBE','DESC',
-            'DETERMINISTIC','DISABLE','DISCARD','DISTINCTROW','DISTINCT','DO',
-            'DROP','DUMPFILE','DUPLICATE KEY','ENABLE','ENCLOSED BY','ENGINE',
-            'ERRORS','ESCAPED BY','EXISTS','EXPLAIN','EXTENDED','FIELDS',
-            'FIRST','FOR EACH ROW','FORCE','FOREIGN KEY','FROM','FULL',
-            'FUNCTION','GLOBAL','GRANT','GROUP BY','HANDLER','HASH','HAVING',
-            'HELP','HIGH_PRIORITY','IF NOT EXISTS','IGNORE','IMPORT','INDEX',
-            'INFILE','INNER','INNODB','INOUT','INTO','INVOKER',
-            'ISOLATION LEVEL','JOIN','KEYS','KEY','KILL','LANGUAGE SQL','LAST',
-            'LIMIT','LINES','LOAD','LOCAL','LOCK','LOW_PRIORITY',
-            'MASTER_SERVER_ID','MATCH','MERGE','MIDDLEINT','MODIFIES SQL DATA',
-            'MODIFY','MRG_MYISAM','NATURAL','NEXT','NO SQL','NO','ON',
-            'OPTIMIZE','OPTIONALLY','OPTION','ORDER BY','OUTER','OUTFILE','OUT',
-            'PARTIAL','PARTITION','PREV','PRIMARY KEY','PRIVILEGES','PROCEDURE',
-            'PURGE','QUICK','READS SQL DATA','READ','REFERENCES','RELEASE',
-            'RENAME','REORGANIZE','REPEATABLE','REQUIRE','RESTRICT','RETURNS',
-            'REVOKE','ROLLBACK','ROUTINE','RTREE','SAVEPOINT','SELECT',
-            'SERIALIZABLE','SESSION','SET','SHARE MODE','SHOW','SIMPLE',
-            'SNAPSHOT','SOME','SONAME','SQL SECURITY','SQL_BIG_RESULT',
-            'SQL_BUFFER_RESULT','SQL_CACHE','SQL_CALC_FOUND_ROWS',
-            'SQL_NO_CACHE','SQL_SMALL_RESULT','SSL','START','STARTING BY',
-            'STATUS','STRAIGHT_JOIN','STRIPED','TABLESPACE','TABLES','TABLE',
-            'TEMPORARY','TEMPTABLE','TERMINATED BY','TO','TRANSACTIONS',
-            'TRANSACTION','TRIGGER','TYPES','TYPE','UNCOMMITTED','UNDEFINED',
-            'UNION','UNLOCK_TABLES','UPDATE','USAGE','USE','USER_RESOURCES',
-            'USING','VALUES','VALUE','VIEW','WARNINGS','WHERE','WITH ROLLUP',
-            'WITH','WORK','WRITE',
-            ),
-        2 => array(     //No ( must follow
-            // Mix: statement keywords distinguished from functions by the same name
-            "CURRENT_USER", "DATABASE", "IN", "INSERT", "DEFAULT", "REPLACE", "SCHEMA", "TRUNCATE"
-            ),
-        3 => array(
-            // Values (Constants)
-            'FALSE','NULL','TRUE',
-            ),
-        4 => array(
-            // Column Data Types
-            'BIGINT','BIT','BLOB','BOOLEAN','BOOL','CHARACTER VARYING',
-            'CHAR VARYING','DATETIME','DECIMAL','DEC','DOUBLE PRECISION',
-            'DOUBLE','ENUM','FIXED','FLOAT','GEOMETRYCOLLECTION','GEOMETRY',
-            'INTEGER','INT','LINESTRING','LONGBLOB','LONGTEXT','MEDIUMBLOB',
-            'MEDIUMINT','MEDIUMTEXT','MULTIPOINT','MULTILINESTRING',
-            'MULTIPOLYGON','NATIONAL CHARACTER','NATIONAL CHARACTER VARYING',
-            'NATIONAL CHAR VARYING','NATIONAL VARCHAR','NCHAR VARCHAR','NCHAR',
-            'NUMERIC','POINT','POLYGON','REAL','SERIAL',
-            'SMALLINT','TEXT','TIMESTAMP','TINYBLOB','TINYINT',
-            'TINYTEXT','VARBINARY','VARCHARACTER','VARCHAR',
-            ),
-        5 => array(     //No ( must follow
-            // Column data types distinguished from functions by the same name
-            "CHAR", "DATE", "TIME"
-            ),
-        6 => array(
-            // Table, Column & Index Attributes
-            'AUTO_INCREMENT','AVG_ROW_LENGTH','BOTH','CHECKSUM','CONNECTION',
-            'DATA DIRECTORY','DEFAULT NULL','DELAY_KEY_WRITE','FULLTEXT',
-            'INDEX DIRECTORY','INSERT_METHOD','LEADING','MAX_ROWS','MIN_ROWS',
-            'NOT NULL','PACK_KEYS','ROW_FORMAT','SERIAL DEFAULT VALUE','SIGNED',
-            'SPATIAL','TRAILING','UNIQUE','UNSIGNED','ZEROFILL'
-            ),
-        7 => array(     //No ( must follow
-            // Column attribute distinguished from function by the same name
-            "CHARSET"
-            ),
-        8 => array(
-            // Date and Time Unit Specifiers
-            'DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND',
-            'HOUR_MICROSECOND','HOUR_MINUTE','HOUR_SECOND',
-            'MINUTE_MICROSECOND','MINUTE_SECOND',
-            'SECOND_MICROSECOND','YEAR_MONTH'
-            ),
-        9 => array(     //No ( must follow
-            // Date-time unit specifiers distinguished from functions by the same name
-            "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER", "SECOND", "WEEK", "YEAR"
-            ),
-        10 => array(
-            // Operators (see also Symbols)
-            'AND','BETWEEN','CHARACTER SET','COLLATE','DIV','IS NOT NULL',
-            'IS NOT','IS NULL','IS','LIKE','NOT','OFFSET','OR','REGEXP','RLIKE',
-            'SOUNDS LIKE','XOR'
-            ),
-        11 => array(     //No ( must follow
-            // Operator distinghuished from function by the same name
-            "INTERVAL"
-            ),
-        12 => array(
-            // Control Flow (functions)
-            'CASE','ELSE','END','IFNULL','IF','NULLIF','THEN','WHEN',
-            ),
-        13 => array(
-            // String Functions
-            'ASCII','BIN','BIT_LENGTH','CHAR_LENGTH','CHARACTER_LENGTH',
-            'CONCAT_WS','CONCAT','ELT','EXPORT_SET','FIELD',
-            'FIND_IN_SET','FORMAT','HEX','INSTR','LCASE','LEFT','LENGTH',
-            'LOAD_FILE','LOCATE','LOWER','LPAD','LTRIM','MAKE_SET','MID',
-            'OCTET_LENGTH','ORD','POSITION','QUOTE','REPEAT','REVERSE',
-            'RIGHT','RPAD','RTRIM','SOUNDEX','SPACE','STRCMP','SUBSTRING_INDEX',
-            'SUBSTRING','TRIM','UCASE','UNHEX','UPPER',
-            ),
-        14 => array(     //A ( must follow
-            // String functions distinguished from other keywords by the same name
-            "INSERT", "REPLACE", "CHAR"
-            ),
-        15 => array(
-            // Numeric Functions
-            'ABS','ACOS','ASIN','ATAN2','ATAN','CEILING','CEIL',
-            'CONV','COS','COT','CRC32','DEGREES','EXP','FLOOR','LN','LOG10',
-            'LOG2','LOG','MOD','OCT','PI','POWER','POW','RADIANS','RAND',
-            'ROUND','SIGN','SIN','SQRT','TAN',
-            ),
-        16 => array(     //A ( must follow
-            // Numeric function distinguished from other keyword by the same name
-            "TRUNCATE"
-            ),
-        17 => array(
-            // Date and Time Functions
-            'ADDDATE','ADDTIME','CONVERT_TZ','CURDATE','CURRENT_DATE',
-            'CURRENT_TIME','CURRENT_TIMESTAMP','CURTIME','DATE_ADD',
-            'DATE_FORMAT','DATE_SUB','DATEDIFF','DAYNAME','DAYOFMONTH',
-            'DAYOFWEEK','DAYOFYEAR','EXTRACT','FROM_DAYS','FROM_UNIXTIME',
-            'GET_FORMAT','LAST_DAY','LOCALTIME','LOCALTIMESTAMP','MAKEDATE',
-            'MAKETIME','MONTHNAME','NOW','PERIOD_ADD',
-            'PERIOD_DIFF','SEC_TO_TIME','STR_TO_DATE','SUBDATE','SUBTIME',
-            'SYSDATE','TIME_FORMAT','TIME_TO_SEC',
-            'TIMESTAMPADD','TIMESTAMPDIFF','TO_DAYS',
-            'UNIX_TIMESTAMP','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','WEEKDAY',
-            'WEEKOFYEAR','YEARWEEK',
-            ),
-        18 => array(     //A ( must follow
-            // Date-time functions distinguished from other keywords by the same name
-            "DATE", "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER",
-            "SECOND", "TIME", "WEEK", "YEAR"
-            ),
-        19 => array(
-            // Comparison Functions
-            'COALESCE','GREATEST','ISNULL','LEAST',
-            ),
-        20 => array(     //A ( must follow
-            // Comparison functions distinguished from other keywords by the same name
-            "IN", "INTERVAL"
-            ),
-        21 => array(
-            // Encryption and Compression Functions
-            'AES_DECRYPT','AES_ENCRYPT','COMPRESS','DECODE','DES_DECRYPT',
-            'DES_ENCRYPT','ENCODE','ENCRYPT','MD5','OLD_PASSWORD','PASSWORD',
-            'SHA1','SHA','UNCOMPRESS','UNCOMPRESSED_LENGTH',
-            ),
-        22 => array(
-            // GROUP BY (aggregate) Functions
-            'AVG','BIT_AND','BIT_OR','BIT_XOR','COUNT','GROUP_CONCAT',
-            'MAX','MIN','STDDEV_POP','STDDEV_SAMP','STDDEV','STD','SUM',
-            'VAR_POP','VAR_SAMP','VARIANCE',
-            ),
-        23 => array(
-            // Information Functions
-            'BENCHMARK','COERCIBILITY','COLLATION','CONNECTION_ID',
-            'FOUND_ROWS','LAST_INSERT_ID','ROW_COUNT',
-            'SESSION_USER','SYSTEM_USER','USER','VERSION',
-            ),
-        24 => array(     //A ( must follow
-            // Information functions distinguished from other keywords by the same name
-            "CURRENT_USER", "DATABASE", "SCHEMA", "CHARSET"
-            ),
-        25 => array(
-            // Miscellaneous Functions
-            'ExtractValue','BIT_COUNT','GET_LOCK','INET_ATON','INET_NTOA',
-            'IS_FREE_LOCK','IS_USED_LOCK','MASTER_POS_WAIT','NAME_CONST',
-            'RELEASE_LOCK','SLEEP','UpdateXML','UUID',
-            ),
-        26 => array(     //A ( must follow
-            // Miscellaneous function distinguished from other keyword by the same name
-            "DEFAULT"
-            ),
-        27 => array(
-            // Geometry Functions
-            'Area','AsBinary','AsText','AsWKB','AsWKT','Boundary','Buffer',
-            'Centroid','Contains','ConvexHull','Crosses',
-            'Difference','Dimension','Disjoint','Distance',
-            'EndPoint','Envelope','Equals','ExteriorRing',
-            'GLength','GeomCollFromText','GeomCollFromWKB','GeomFromText',
-            'GeomFromWKB','GeometryCollectionFromText',
-            'GeometryCollectionFromWKB','GeometryFromText','GeometryFromWKB',
-            'GeometryN','GeometryType',
-            'InteriorRingN','Intersection','Intersects','IsClosed','IsEmpty',
-            'IsRing','IsSimple',
-            'LineFromText','LineFromWKB','LineStringFromText',
-            'LineStringFromWKB',
-            'MBRContains','MBRDisjoint','MBREqual','MBRIntersects',
-            'MBROverlaps','MBRTouches','MBRWithin','MLineFromText',
-            'MLineFromWKB','MPointFromText','MPointFromWKB','MPolyFromText',
-            'MPolyFromWKB','MultiLineStringFromText','MultiLineStringFromWKB',
-            'MultiPointFromText','MultiPointFromWKB','MultiPolygonFromText',
-            'MultiPolygonFromWKB',
-            'NumGeometries','NumInteriorRings','NumPoints',
-            'Overlaps',
-            'PointFromText','PointFromWKB','PointN','PointOnSurface',
-            'PolyFromText','PolyFromWKB','PolygonFromText','PolygonFromWKB',
-            'Related','SRID','StartPoint','SymDifference',
-            'Touches',
-            'Union',
-            'Within',
-            'X',
-            'Y',
-            ),
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            /* Operators */
-            '=', ':=',                                      // assignment operators
-            '||', '&&', '!',                                // locical operators
-            '=', '<=>', '>=', '>', '<=', '<', '<>', '!=',   // comparison operators
-            '|', '&', '^', '~', '<<', '>>',                 // bitwise operators
-            '-', '+', '*', '/', '%',                        // numerical operators
-            ),
-        2 => array(
-            /* Other syntactical symbols */
-            '(', ')',
-            ',', ';',
-            ),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        9 => false,
-        10 => false,
-        11 => false,
-        12 => false,
-        13 => false,
-        13 => false,
-        14 => false,
-        15 => false,
-        16 => false,
-        17 => false,
-        18 => false,
-        19 => false,
-        20 => false,
-        21 => false,
-        22 => false,
-        23 => false,
-        24 => false,
-        25 => false,
-        26 => false,
-        27 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #990099; font-weight: bold;',      // mix
-            2 => 'color: #990099; font-weight: bold;',      // mix
-            3 => 'color: #9900FF; font-weight: bold;',      // constants
-            4 => 'color: #999900; font-weight: bold;',      // column data types
-            5 => 'color: #999900; font-weight: bold;',      // column data types
-            6 => 'color: #FF9900; font-weight: bold;',      // attributes
-            7 => 'color: #FF9900; font-weight: bold;',      // attributes
-            8 => 'color: #9900FF; font-weight: bold;',      // date-time units
-            9 => 'color: #9900FF; font-weight: bold;',      // date-time units
-
-            10 => 'color: #CC0099; font-weight: bold;',      // operators
-            11 => 'color: #CC0099; font-weight: bold;',      // operators
-
-            12 => 'color: #009900;',     // control flow (functions)
-            13 => 'color: #000099;',     // string functions
-            14 => 'color: #000099;',     // string functions
-            15 => 'color: #000099;',     // numeric functions
-            16 => 'color: #000099;',     // numeric functions
-            17 => 'color: #000099;',     // date-time functions
-            18 => 'color: #000099;',     // date-time functions
-            19 => 'color: #000099;',     // comparison functions
-            20 => 'color: #000099;',     // comparison functions
-            21 => 'color: #000099;',     // encryption functions
-            22 => 'color: #000099;',     // aggregate functions
-            23 => 'color: #000099;',     // information functions
-            24 => 'color: #000099;',     // information functions
-            25 => 'color: #000099;',     // miscellaneous functions
-            26 => 'color: #000099;',     // miscellaneous functions
-            27 => 'color: #00CC00;',     // geometry functions
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #808000; font-style: italic;',
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #004000; font-weight: bold;',
-            1 => 'color: #008080; font-weight: bold;'       // search wildcards
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #FF00FF;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #008000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #008080;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #CC0099;',         // operators
-            2 => 'color: #000033;',         // syntax
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        2 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        3 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        4 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        5 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        6 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        7 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        8 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-        9 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
-
-        10 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/non-typed-operators.html',
-        11 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/non-typed-operators.html',
-
-        12 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/control-flow-functions.html',
-        13 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/string-functions.html',
-        14 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/string-functions.html',
-        15 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/numeric-functions.html',
-        16 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/numeric-functions.html',
-        17 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/date-and-time-functions.html',
-        18 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/date-and-time-functions.html',
-        19 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/comparison-operators.html',
-        20 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/comparison-operators.html',
-        21 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/encryption-functions.html',
-        22 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/group-by-functions-and-modifiers.html',
-        23 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/information-functions.html',
-        24 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/information-functions.html',
-        25 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/func-op-summary-ref.html',
-        26 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/func-op-summary-ref.html',
-        27 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/analysing-spatial-information.html',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            2 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-            5 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-            7 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-            9 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-            11 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-
-            14 => array(
-                'DISALLOWED_AFTER' => '(?=\()'
-                ),
-            16 => array(
-                'DISALLOWED_AFTER' => '(?=\()'
-                ),
-            18 => array(
-                'DISALLOWED_AFTER' => '(?=\()'
-                ),
-            20 => array(
-                'DISALLOWED_AFTER' => '(?=\()'
-                ),
-            24 => array(
-                'DISALLOWED_AFTER' => '(?=\()'
-                ),
-            26 => array(
-                'DISALLOWED_AFTER' => '(?=\()'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/nagios.php b/inc/geshi/nagios.php
deleted file mode 100644
index 32cbaef9e..000000000
--- a/inc/geshi/nagios.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/*************************************************************************************
- * nagios.php
- * --------
- * Author: Albéric de Pertat <alberic@depertat.net>
- * Copyright: (c) 2012 Albéric de Pertat (https://github.com/adepertat/geshi-nagios)
- * Release Version: 1.0.8.11
- * Date Started: 2012/01/19
- *
- * Nagios language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/01/19 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2012/01/19)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Nagios',
-    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'HARDQUOTE' => array("'", "'"),
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\'',
-    'KEYWORDS' => array(
-        1 => array(
-            'define'
-            ),
-        2 => array(
-            'command', 'contact', 'contactgroup', 'host', 'hostdependency',
-            'hostescalation', 'hostextinfo', 'hostgroup', 'service',
-            'servicedependency', 'serviceescalation',
-            'serviceextinfo', 'servicegroup', 'timeperiod'
-            ),
-        3 => array(
-            'active_checks_enabled', 'passive_checks_enabled', 'alias',
-            'display_name', 'host_name', 'address', 'hostgroups', 'parents',
-            'hostgroup_members', 'members', 'service_description',
-            'servicegroups', 'is_volatile', 'servicegroup_name',
-            'servicegroup_members', 'contact_name', 'contactgroups', 'email',
-            'pager', 'can_submit_commands', 'contactgroup_name',
-            'contactgroup_members', 'host_notifications_enabled',
-            'service_notifications_enabled', 'host_notification_period',
-            'service_notification_period', 'host_notification_options',
-            'service_notification_options', 'host_notification_commands',
-            'service_notification_commands', 'check_command',
-            'check_freshness', 'check_interval', 'check_period', 'contacts',
-            'contact_groups', 'event_handler', 'event_handler_enabled',
-            'flap_detection_enabled', 'flap_detection_options',
-            'freshness_threshold', 'initial_state', 'low_flap_threshold',
-            'high_flap_threshold', 'max_check_attempts',
-            'notification_interval', 'first_notification_delay',
-            'notification_period', 'notification_options',
-            'notifications_enabled', 'stalking_options', 'notes', 'notes_url',
-            'action_url', 'icon_image', 'icon_image_alt', 'vrml_image',
-            'statusmap_image', '2d_coords', '3d_coords', 'obsess_over_host',
-            'obsess_over_hostver_service', 'process_perf_data',
-            'retain_status_information', 'retain_nonstatus_information',
-            'retry_interval', 'register', 'use', 'name', 'timeperiod_name',
-            'exclude', 'command_name', 'command_line', 'dependent_host_name',
-            'dependent_hostgroup_name', 'dependent_service_description',
-            'inherits_parent', 'execution_failure_criteria',
-            'notification_failure_criteria', 'dependency_period',
-            'first_notification', 'last_notification', 'escalation_period',
-            'escalation_options'
-            ),
-        4 => array(
-            'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday',
-            'sunday', 'january', 'february', 'march', 'april', 'may', 'june',
-            'july', 'august', 'september', 'october', 'november', 'december',
-            'day'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '{', '}', ',', '+'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'font-weight:bold;color:#FFDCA8;',
-            2 => 'font-weight:bold;color #FFA858;',
-            3 => 'font-weight:bold;color:#00C0C0;',
-            4 => 'font-weight:bold;color:#C0C0FF;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'font-weight:bold;color:#000000;'
-            ),
-        'NUMBERS' => array(
-            0 => ''
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #AAAAAA; font-style: italic;',
-            1 => 'color: #AAAAAA; font-style: italic;',
-            2 => 'color: #AAAAAA; font-style: italic;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #660066;',
-            'HARD' => 'color: #660066;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'REGEXPS' => array(
-            0 => 'font-weight:bold;color:#808080;',
-            1 => 'font-weight:bold;color:#000080;',
-            2 => 'font-weight:bold;color:red;',
-            3 => 'font-weight:bold;color:#808000;',
-            4 => 'font-weight:bold;color:blue;',
-            5 => 'font-weight:bold;color:#C0FFC0;',
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            )
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '\\'
-        ),
-    'REGEXPS' => array(
-        // Custom macros
-        0 => array(
-            GESHI_SEARCH => '(\$[a-zA-Z_]+\$)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        // Custom macro definitions
-        1 => array(
-            GESHI_SEARCH => '(\A|\s)(_[a-zA-Z_]+)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '',
-            ),
-        // $USERxx$
-        2 => array(
-            GESHI_SEARCH => '(\$USER[0-9]+\$)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        // $ARGxx$
-        3 => array(
-            GESHI_SEARCH => '(\$ARG[1-9]\$)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        // register 0
-        4 => array(
-            GESHI_SEARCH => '(\bregister[\\x20\\t]+[01])',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        // use
-        5 => array(
-            GESHI_SEARCH => '(use[\\x20\\t]+[^\\x20\\t]+)([\\x20\\t]*[$;#])',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '',
-            ),
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => false
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/netrexx.php b/inc/geshi/netrexx.php
deleted file mode 100644
index 14a2d23fd..000000000
--- a/inc/geshi/netrexx.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/*************************************************************************************
- * netrexx.php
- * ---------------------------------
- * Author: Jon Wolfers (sahananda@windhorse.biz)
- * Contributors:
- *    - Walter Pachl (pachl@chello.at)
- * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
- * Release Version: 1.0.8.11
- * Date Started: 2008/01/07
- *
- * NetRexx language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/07/29 (1.0.0)
- *    -  tried to get it syntactically right
- *
- * TODO (updated 2012/07/29)
- * -------------------------
- *   -  Get it working on rosettacode.org
- *
- *************************************************************************************
- *
- *      This file is part of GeSHi.
- *
- *    GeSHi is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    GeSHi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with GeSHi; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'NetRexx',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'class', 'do', 'exit', 'if', 'import', 'iterate', 'leave',
-            'loop', 'nop', 'numeric', 'package', 'parse', 'properties',
-            'return', 'say', 'select', 'signal', 'trace'
-            ),
-        2 => array(
-            'abstract', 'adapter', 'all', 'ask', 'binary', 'case',
-            'constant', 'dependent', 'deprecated', 'extends', 'final',
-            'implements', 'inheritable', 'interface', 'label', 'methods',
-            'native', 'off', 'private', 'protect', 'public', 'results',
-            'returns', 'shared', 'signals', 'source', 'static',
-            'transient', 'unused', 'uses', 'version', 'volatile'
-            ),
-        3 => array(
-            'catch', 'else', 'end', 'finally', 'otherwise', 'then', 'when'
-            ),
-        4 => array(
-            'rc', 'result', 'self', 'sigl', 'super'
-            ),
-        5 => array(
-            'placeholderforoorexxdirectives'
-            ),
-        6 => array(
-            'abbrev', 'abs', 'b2x', 'c2d', 'c2x', 'center', 'centre',
-            'changestr', 'compare', 'copies', 'copyindexed', 'countstr',
-            'd2c', 'd2x', 'datatype', 'delstr', 'delword', 'exists',
-            'formword', 'hashcode', 'insert', 'lastpos', 'left', 'lower',
-            'max', 'min', 'noteq', 'noteqs', 'opadd', 'opand', 'opcc',
-            'opccblank', 'opdiv', 'opdivi', 'opeq', 'opeqs', 'opgt',
-            'opgteq', 'opgteqs', 'opgts', 'oplt', 'oplteq', 'oplteqs',
-            'oplts', 'opminus', 'opmult', 'opnot', 'opor', 'opplus',
-            'oppow', 'oprem', 'opsub', 'opxor', 'overlay', 'pos position',
-            'reverse', 'right', 'sequence', 'setdigits', 'setform',
-            'sign', 'space', 'strip', 'substr', 'subword', 'toboolean',
-            'tobyte', 'tochar', 'todouble', 'tofloat', 'toint', 'tolong',
-            'toshort', 'tostring', 'translate', 'trunc', 'upper',
-            'verify', 'word', 'wordindex', 'wordlength', 'wordpos',
-            'words', 'x2b', 'x2c', 'x2d'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '<', '>', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':',
-        '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #ff0000; font-weight: bold;',
-            3 => 'color: #00ff00; font-weight: bold;',
-            4 => 'color: #0000ff; font-weight: bold;',
-            5 => 'color: #880088; font-weight: bold;',
-            6 => 'color: #888800; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666;',
-            'MULTI' => 'color: #808080;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/newlisp.php b/inc/geshi/newlisp.php
deleted file mode 100644
index 0dc6c1619..000000000
--- a/inc/geshi/newlisp.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/*************************************************************************************
- * newlisp.php
- * ----------
- * Author: cormullion (cormullion@mac.com) Sept 2009
- * Copyright: (c) 2009 Cormullion (http://unbalanced-parentheses.nfshost.com/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/09/30
- *
- * newLISP language file for GeSHi.
- *
- * based on work by Lutz Mueller and Jeff Ober
- *
- * CHANGES
- * -------
- * 2009/09/30 (1.0.8.6)
- *  -  First Release
- *
- * TODO (updated 2009/09/30)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'newlisp',
-    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
-    'COMMENT_MULTI' => array('[text]' => '[/text]', '{' => '}'), // also used for strings
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_SCI_ZERO,
-    'TAB_WIDTH' => 2,
-    'KEYWORDS' => array(
-        1 => array(
-            'NaN?','abort','abs','acos','acosh','add','address','amb','and',
-            'append','append-file','apply','args','array','array-list','array?',
-            'asin','asinh','assoc','atan','atan2','atanh','atom?','base64-dec',
-            'base64-enc','bayes-query','bayes-train','begin','beta','betai',
-            'bind','binomial','bits','callback','case','catch','ceil',
-            'change-dir','char','chop','clean','close','command-event','cond',
-            'cons','constant','context','context?','copy','copy-file','cos',
-            'cosh','count','cpymem','crc32','crit-chi2','crit-z','current-line',
-            'curry','date','date-value','debug','dec','def-new','default',
-            'define','define-macro','delete','delete-file','delete-url',
-            'destroy','det','device','difference','directory','directory?',
-            'div','do-until','do-while','doargs','dolist','dostring','dotimes',
-            'dotree','dump','dup','empty?','encrypt','ends-with','env','erf',
-            'error-event','estack','eval','eval-string','exec','exists','exit',
-            'exp','expand','explode','factor','fft','file-info','file?',
-            'filter','find','find-all','first','flat','float','float?','floor',
-            'flt','for','for-all','fork','format','fv','gammai','gammaln','gcd',
-            'get-char','get-float','get-int','get-long','get-string','get-url',
-            'global','global?','if','if-not','ifft','import','inc','index',
-            'inf?','int','integer','integer?','intersect','invert','irr','join',
-            'lambda','lambda?','last','last-error','legal?','length','let',
-            'letex','letn','list','list?','load','local','log','lookup',
-            'lower-case','macro?','main-args','make-dir','map','mat','match',
-            'max','member','min','mod','mul','multiply','name','net-accept',
-            'net-close','net-connect','net-error','net-eval','net-interface',
-            'net-listen','net-local','net-lookup','net-peek','net-peer',
-            'net-ping','net-receive','net-receive-from','net-receive-udp',
-            'net-select','net-send','net-send-to','net-send-udp','net-service',
-            'net-sessions','new','nil','nil?','normal','not','now','nper','npv',
-            'nth','null?','number?','open','or','pack','parse','parse-date',
-            'peek','pipe','pmt','pop','pop-assoc','post-url','pow',
-            'pretty-print','primitive?','print','println','prob-chi2','prob-z',
-            'process','prompt-event','protected?','push','put-url','pv','quote',
-            'quote?','rand','random','randomize','read-buffer','read-char',
-            'read-expr','read-file','read-key','read-line','read-utf8',
-            'real-path','receive','ref','ref-all','regex','regex-comp',
-            'remove-dir','rename-file','replace','reset','rest','reverse',
-            'rotate','round','save','search','seed','seek','select','semaphore',
-            'send','sequence','series','set','set-locale','set-ref',
-            'set-ref-all','setf','setq','sgn','share','signal','silent','sin',
-            'sinh','sleep','slice','sort','source','spawn','sqrt','starts-with',
-            'string','string?','sub','swap','sym','symbol?','symbols','sync',
-            'sys-error','sys-info','tan','tanh','throw','throw-error','time',
-            'time-of-day','timer','title-case','trace','trace-highlight',
-            'transpose','trim','true','true?','unicode','unify','unique',
-            'unless','unpack','until','upper-case','utf8','utf8len','uuid',
-            'wait-pid','when','while','write-buffer','write-char','write-file',
-            'write-line','xfer-event','xml-error','xml-parse','xml-type-tags',
-            'zero?'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '(', ')','\''
-            ),
-        1 => array(
-            '!','!=','$','%','&','*','+','-','/',':',
-            '<','<<','<=','=','>','>=','>>','^','|'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000AA;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #00aa00; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #009900;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #009900;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #777700;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #000099;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #AA0000;',
-            1 => 'color: #0000AA;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #00aa00;',
-            1 => 'color: #00aa00;',
-            2 => 'color: #00aa00;',
-            3 => 'color: #00aa00;',
-            4 => 'color: #00aa00;',
-            5 => 'color: #AA0000;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.newlisp.org/downloads/newlisp_manual.html#{FNAME}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(':'),
-    'REGEXPS' => array(
-        // tags in newlispdoc
-        0 => "\s+@\S*?\s+",
-        // dollar sign symbols
-        1 => "[\\$]\w*",
-        // curly-braced string literals
-        2 => "{[^{}]*?}",
-        // [text] multi-line strings
-        3 => "(?s)\[text\].*\[\/text\](?-s)",
-        // [code] multi-line blocks
-        4 => "(?s)\[code\].*\[\/code\](?-s)",
-        // variable references
-        5 => "'[\w\-]+"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'OOLANG' => array(
-            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
-            ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => '(?<=[^\w\-])',
-            )
-        ),
-
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/nsis.php b/inc/geshi/nsis.php
deleted file mode 100644
index 35df9b4b8..000000000
--- a/inc/geshi/nsis.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/*************************************************************************************
- * nsis.php
- * --------
- * Author: deguix (cevo_deguix@yahoo.com.br), Tux (http://tux.a4.cz/)
- * Copyright: (c) 2005 deguix, 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2005/12/03
- *
- * Nullsoft Scriptable Install System language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/12/03 (2.0.2)
- *   - Updated to NSIS 2.11.
- * 2005/06/17 (2.0.1)
- *   - Updated to NSIS 2.07b0.
- * 2005/04/05 (2.0.0)
- *   - Updated to NSIS 2.06.
- * 2004/11/27 (1.0.2)
- *   - Added support for multiple object splitters
- * 2004/10/27 (1.0.1)
- *   - Added support for URLs
- * 2004/08/05 (1.0.0)
- *   - First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'NSIS',
-    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'",'"','`'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            '!appendfile', '!addIncludeDir', '!addplugindir', '!cd', '!define', '!delfile', '!echo', '!else',
-            '!endif', '!error', '!execute', '!ifdef', '!ifmacrodef', '!ifmacrondef', '!ifndef', '!include',
-            '!insertmacro', '!macro', '!macroend', '!packhdr', '!tempfile', '!system', '!undef', '!verbose',
-            '!warning'
-            ),
-        2 => array(
-            'AddBrandingImage', 'AllowRootDirInstall', 'AutoCloseWindow', 'BGFont',
-            'BGGradient', 'BrandingText', 'Caption', 'ChangeUI', 'CheckBitmap', 'CompletedText', 'ComponentText',
-            'CRCCheck', 'DetailsButtonText', 'DirShow', 'DirText', 'DirVar', 'DirVerify', 'FileErrorText',
-            'Function', 'FunctionEnd', 'Icon', 'InstallButtonText', 'InstallColors', 'InstallDir',
-            'InstallDirRegKey', 'InstProgressFlags', 'InstType', 'LangString', 'LangStringUP', 'LicenseBkColor',
-            'LicenseData', 'LicenseForceSelection', 'LicenseLangString', 'LicenseText', 'LoadLanguageFile',
-            'MiscButtonText', 'Name', 'OutFile', 'Page', 'PageEx', 'PageExEnd', 'Section',
-            'SectionEnd', 'SectionGroup', 'SectionGroupEnd', 'SetCompressor', 'SetFont', 'ShowInstDetails',
-            'ShowUninstDetails', 'SilentInstall', 'SilentUnInstall', 'SpaceTexts', 'SubCaption', 'SubSection',
-            'SubSectionEnd', 'UninstallButtonText', 'UninstallCaption', 'UninstallIcon', 'UninstallSubCaption',
-            'UninstallText', 'UninstPage', 'Var', 'VIAddVersionKey', 'VIProductVersion', 'WindowIcon', 'XPStyle'
-            ),
-        3 => array(
-            'AddSize', 'AllowSkipFiles', 'FileBufSize', 'GetInstDirError', 'PageCallbacks',
-            'SectionIn', 'SetCompress', 'SetCompressionLevel', 'SetCompressorDictSize',
-            'SetDatablockOptimize', 'SetDateSave', 'SetOverwrite', 'SetPluginUnload'
-            ),
-        4 => array(
-            'Abort', 'BringToFront', 'Call', 'CallInstDLL', 'ClearErrors', 'CopyFiles','CreateDirectory',
-            'CreateFont', 'CreateShortCut', 'Delete', 'DeleteINISec', 'DeleteINIStr', 'DeleteRegKey',
-            'DeleteRegValue', 'DetailPrint', 'EnableWindow', 'EnumRegKey', 'EnumRegValue', 'Exch', 'Exec',
-            'ExecShell', 'ExecWait', 'ExpandEnvStrings', 'File', 'FileClose', 'FileOpen', 'FileRead',
-            'FileReadByte', 'FileSeek', 'FileWrite', 'FileWriteByte', 'FindClose', 'FindFirst', 'FindNext',
-            'FindWindow', 'FlushINI', 'GetCurInstType', 'GetCurrentAddress', 'GetDlgItem', 'GetDLLVersion',
-            'GetDLLVersionLocal', 'GetErrorLevel', 'GetFileTime', 'GetFileTimeLocal', 'GetFullPathName',
-            'GetFunctionAddress', 'GetLabelAddress', 'GetTempFileName', 'GetWindowText', 'Goto', 'HideWindow',
-            'IfAbort', 'IfErrors', 'IfFileExists', 'IfRebootFlag', 'IfSilent', 'InitPluginsDir', 'InstTypeGetText',
-            'InstTypeSetText', 'IntCmp', 'IntCmpU', 'IntFmt', 'IntOp', 'IsWindow', 'LockWindow', 'LogSet', 'LogText',
-            'MessageBox', 'Nop', 'Pop', 'Push', 'Quit', 'ReadEnvStr', 'ReadIniStr', 'ReadRegDWORD', 'ReadRegStr',
-            'Reboot', 'RegDLL', 'Rename', 'ReserveFile', 'Return', 'RMDir', 'SearchPath', 'SectionGetFlags',
-            'SectionGetInstTypes', 'SectionGetSize', 'SectionGetText', 'SectionSetFlags', 'SectionSetInstTypes',
-            'SectionSetSize', 'SectionSetText', 'SendMessage', 'SetAutoClose', 'SetBrandingImage', 'SetCtlColors',
-            'SetCurInstType', 'SetDetailsPrint', 'SetDetailsView', 'SetErrorLevel', 'SetErrors', 'SetFileAttributes',
-            'SetOutPath', 'SetRebootFlag', 'SetShellVarContext', 'SetSilent', 'ShowWindow', 'Sleep', 'StrCmp',
-            'StrCpy', 'StrLen', 'UnRegDLL', 'WriteINIStr', 'WriteRegBin', 'WriteRegDWORD', 'WriteRegExpandStr',
-            'WriteRegStr', 'WriteUninstaller'
-            ),
-        5 => array(
-            'all', 'alwaysoff', 'ARCHIVE', 'auto', 'both', 'bzip2', 'checkbox', 'components', 'current',
-            'custom', 'directory', 'false', 'FILE_ATTRIBUTE_ARCHIVE', 'FILE_ATTRIBUTE_HIDDEN', 'FILE_ATTRIBUTE_NORMAL',
-            'FILE_ATTRIBUTE_OFFLINE', 'FILE_ATTRIBUTE_READONLY', 'FILE_ATTRIBUTE_SYSTEM,TEMPORARY',
-            'FILE_ATTRIBUTE_TEMPORARY', 'force', 'HIDDEN', 'hide', 'HKCC', 'HKCR', 'HKCU', 'HKDD', 'HKEY_CLASSES_ROOT',
-            'HKEY_CURRENT_CONFIG', 'HKEY_CURRENT_USER', 'HKEY_DYN_DATA', 'HKEY_LOCAL_MACHINE', 'HKEY_PERFORMANCE_DATA',
-            'HKEY_USERS', 'HKLM', 'HKPD', 'HKU', 'IDABORT', 'IDCANCEL', 'IDIGNORE', 'IDNO', 'IDOK', 'IDRETRY', 'IDYES',
-            'ifdiff', 'ifnewer', 'instfiles', 'lastused', 'leave', 'license', 'listonly', 'lzma', 'manual',
-            'MB_ABORTRETRYIGNORE', 'MB_DEFBUTTON1', 'MB_DEFBUTTON2', 'MB_DEFBUTTON3', 'MB_DEFBUTTON4',
-            'MB_ICONEXCLAMATION', 'MB_ICONINFORMATION', 'MB_ICONQUESTION', 'MB_ICONSTOP', 'MB_OK', 'MB_OKCANCEL',
-            'MB_RETRYCANCEL', 'MB_RIGHT', 'MB_SETFOREGROUND', 'MB_TOPMOST', 'MB_YESNO', 'MB_YESNOCANCEL', 'nevershow',
-            'none', 'normal', 'off', 'OFFLINE', 'on', 'radiobuttons', 'READONLY', 'RO', 'SHCTX', 'SHELL_CONTEXT', 'show',
-            'silent', 'silentlog', 'SW_HIDE', 'SW_SHOWMAXIMIZED', 'SW_SHOWMINIMIZED', 'SW_SHOWNORMAL', 'SYSTEM',
-            'textonly', 'true', 'try', 'uninstConfirm', 'zlib'
-            ),
-        6 => array(
-            '/a', '/components', '/COMPONENTSONLYONCUSTOM', '/CUSTOMSTRING', '/e', '/FILESONLY', '/FINAL', '/gray', '/GLOBAL',
-            '/ifempty', '/IMGID', '/ITALIC', '/lang', '/NOCUSTOM', '/nonfatal', '/NOUNLOAD', '/oname', '/r', '/REBOOTOK',
-            '/RESIZETOFIT', '/SOLID', '/SD', '/SHORT', '/silent', '/STRIKE', '/TIMEOUT', '/TRIMCENTER', '/TRIMLEFT',
-            '/TRIMRIGHT', '/UNDERLINE', '/windows', '/x'
-            ),
-        7 => array(
-            '.onGUIEnd', '.onGUIInit', '.onInit', '.onInstFailed', '.onInstSuccess', '.onMouseOverSection',
-            '.onRebootFailed', '.onSelChange', '.onUserAbort', '.onVerifyInstDir', 'un.onGUIEnd', 'un.onGUIInit',
-            'un.onInit', 'un.onRebootFailed', 'un.onUninstFailed', 'un.onUninstSuccess', 'un.onUserAbort'
-            ),
-        8 => array(
-            'MUI.nsh', '"${NSISDIR}\Contrib\Modern UI\System.nsh"', 'MUI_SYSVERSION', 'MUI_ICON', 'MUI_UNICON',
-            'MUI_HEADERIMAGE', 'MUI_HEADERIMAGE_BITMAP', 'MUI_HEADERIMAGE_BITMAP_NOSTRETCH', 'MUI_HEADERIMAGE_BITMAP_RTL',
-            'MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_UNBITMAP', 'MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH',
-            'MUI_HEADERIMAGE_UNBITMAP_RTL', 'MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_RIGHT', 'MUI_BGCOLOR',
-            'MUI_UI', 'MUI_UI_HEADERIMAGE', 'MUI_UI_HEADERIMAGE_RIGHT', 'MUI_UI_COMPONENTSPAGE_SMALLDESC',
-            'MUI_UI_COMPONENTSPAGE_NODESC', 'MUI_WELCOMEFINISHPAGE_BITMAP', 'MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
-            'MUI_WELCOMEFINISHPAGE_INI', 'MUI_UNWELCOMEFINISHPAGE_BITMAP', 'MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
-            'MUI_UNWELCOMEFINISHPAGE_INI', 'MUI_LICENSEPAGE_BGCOLOR', 'MUI_COMPONENTSPAGE_CHECKBITMAP',
-            'MUI_COMPONENTSPAGE_SMALLDESC', 'MUI_COMPONENTSPAGE_NODESC', 'MUI_INSTFILESPAGE_COLORS',
-            'MUI_INSTFILESPAGE_PROGRESSBAR', 'MUI_FINISHPAGE_NOAUTOCLOSE', 'MUI_UNFINISHPAGE_NOAUTOCLOSE',
-            'MUI_ABORTWARNING', 'MUI_ABORTWARNING_TEXT', 'MUI_UNABORTWARNING', 'MUI_UNABORTWARNING_TEXT',
-            'MUI_PAGE_WELCOME', 'MUI_PAGE_LICENSE', 'MUI_PAGE_COMPONENTS', 'MUI_PAGE_DIRECTORY',
-            'MUI_PAGE_STARTMENU', 'MUI_PAGE_INSTFILES', 'MUI_PAGE_FINISH', 'MUI_UNPAGE_WELCOME',
-            'MUI_UNPAGE_CONFIRM', 'MUI_UNPAGE_LICENSE', 'MUI_UNPAGE_COMPONENTS', 'MUI_UNPAGE_DIRECTORY',
-            'MUI_UNPAGE_INSTFILES', 'MUI_UNPAGE_FINISH', 'MUI_PAGE_HEADER_TEXT', 'MUI_PAGE_HEADER_SUBTEXT',
-            'MUI_WELCOMEPAGE_TITLE', 'MUI_WELCOMEPAGE_TITLE_3LINES', 'MUI_WELCOMEPAGE_TEXT',
-            'MUI_LICENSEPAGE_TEXT_TOP', 'MUI_LICENSEPAGE_TEXT_BOTTOM', 'MUI_LICENSEPAGE_BUTTON',
-            'MUI_LICENSEPAGE_CHECKBOX', 'MUI_LICENSEPAGE_CHECKBOX_TEXT', 'MUI_LICENSEPAGE_RADIOBUTTONS',
-            'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT', 'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE',
-            'MUI_COMPONENTSPAGE_TEXT_TOP', 'MUI_COMPONENTSPAGE_TEXT_COMPLIST', 'MUI_COMPONENTSPAGE_TEXT_INSTTYPE',
-            'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_TITLE', 'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO',
-            'MUI_DIRECTORYPAGE_TEXT_TOP', 'MUI_DIRECTORYPAGE_TEXT_DESTINATION', 'MUI_DIRECTORYPAGE_VARIABLE',
-            'MUI_DIRECTORYPAGE_VERIFYONLEAVE', 'MUI_STARTMENU_WRITE_BEGIN', 'MUI_STARTMENU_WRITE_END',
-            'MUI_STARTMENUPAGE_TEXT_TOP', 'MUI_STARTMENUPAGE_TEXT_CHECKBOX', 'MUI_STARTMENUPAGE_DEFAULTFOLDER',
-            'MUI_STARTMENUPAGE_NODISABLE', 'MUI_STARTMENUPAGE_REGISTRY_ROOT', 'MUI_STARTMENUPAGE_REGISTRY_KEY',
-            'MUI_STARTMENUPAGE_REGISTRY_VALUENAME', 'MUI_INSTFILESPAGE_FINISHHEADER_TEXT',
-            'MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT', 'MUI_INSTFILESPAGE_ABORTHEADER_TEXT',
-            'MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT', 'MUI_FINISHPAGE_TITLE', 'MUI_FINISHPAGE_TITLE_3LINES',
-            'MUI_FINISHPAGE_TEXT', 'MUI_FINISHPAGE_TEXT_LARGE', 'MUI_FINISHPAGE_BUTTON',
-            'MUI_FINISHPAGE_TEXT_REBOOT', 'MUI_FINISHPAGE_TEXT_REBOOTNOW', 'MUI_FINISHPAGE_TEXT_REBOOTLATER',
-            'MUI_FINISHPAGE_RUN', 'MUI_FINISHPAGE_RUN_TEXT', 'MUI_FINISHPAGE_RUN_PARAMETERS',
-            'MUI_FINISHPAGE_RUN_NOTCHECKED', 'MUI_FINISHPAGE_RUN_FUNCTION', 'MUI_FINISHPAGE_SHOWREADME',
-            'MUI_FINISHPAGE_SHOWREADME_TEXT', 'MUI_FINISHPAGE_SHOWREADME_NOTCHECKED',
-            'MUI_FINISHPAGE_SHOWREADME_FUNCTION', 'MUI_FINISHPAGE_LINK', 'MUI_FINISHPAGE_LINK_LOCATION',
-            'MUI_FINISHPAGE_LINK_COLOR', 'MUI_FINISHPAGE_NOREBOOTSUPPORT', 'MUI_UNCONFIRMPAGE_TEXT_TOP',
-            'MUI_UNCONFIRMPAGE_TEXT_LOCATION', 'MUI_LANGUAGE', 'MUI_LANGDLL_DISPLAY',
-            'MUI_LANGDLL_REGISTRY_ROOT', 'MUI_LANGDLL_REGISTRY_KEY', 'MUI_LANGDLL_REGISTRY_VALUENAME',
-            'MUI_LANGDLL_WINDOWTITLE', 'MUI_LANGDLL_INFO', 'MUI_LANGDLL_ALWAYSSHOW',
-            'MUI_RESERVEFILE_INSTALLOPTIONS', 'MUI_RESERVEFILE_LANGDLL', 'MUI_FUNCTION_DESCRIPTION_BEGIN',
-            'MUI_DESCRIPTION_TEXT', 'MUI_FUNCTION_DESCRIPTION_END', 'MUI_INSTALLOPTIONS_EXTRACT',
-            'MUI_INSTALLOPTIONS_EXTRACT_AS', 'MUI_HEADER_TEXT', 'MUI_INSTALLOPTIONS_DISPLAY',
-            'MUI_INSTALLOPTIONS_INITDIALOG', 'MUI_INSTALLOPTIONS_SHOW',
-            'MUI_INSTALLOPTIONS_DISPLAY_RETURN', 'MUI_INSTALLOPTIONS_SHOW_RETURN',
-            'MUI_INSTALLOPTIONS_READ', 'MUI_INSTALLOPTIONS_WRITE',
-            'MUI_CUSTOMFUNCTION_GUIINIT', 'MUI_CUSTOMFUNCTION_UNGUIINIT',
-            'MUI_CUSTOMFUNCTION_ABORT', 'MUI_CUSTOMFUNCTION_UNABORT',
-            'MUI_PAGE_CUSTOMFUNCTION_PRE', 'MUI_PAGE_CUSTOMFUNCTION_SHOW', 'MUI_PAGE_CUSTOMFUNCTION_LEAVE',
-            'MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT'
-            ),
-        9 => array(
-            'LogicLib.nsh', '${LOGICLIB}', 'LOGICLIB_STRCMP', 'LOGICLIB_INT64CMP', 'LOGICLIB_SECTIONCMP', '${If}', '${Unless}',
-            '${ElseIf}', '${ElseUnless}', '${Else}', '${EndIf}', '${EndUnless}', '${AndIf}', '${AndUnless}',
-            '${OrIf}', '${OrUnless}', '${IfThen}', '${IfCmd}', '${Select}', '${Case2}', '${Case3}',
-            '${Case4}', '${Case5}', '${CaseElse}', '${Default}', '${EndSelect}', '${Switch}',
-            '${Case}', '${EndSwitch}', '${Do}', '${DoWhile}', '${UntilWhile}', '${Continue}', '${Break}',
-            '${Loop}', '${LoopWhile}', '${LoopUntil}', '${While}', '${ExitWhile}', '${EndWhile}', '${For}',
-            '${ForEach}', '${ExitFor}', '${Next}', '${Abort}', '${Errors}', '${RebootFlag}', '${Silent}',
-            '${FileExists}', '${Cmd}', '${SectionIsSelected}', '${SectionIsSectionGroup}',
-            '${SectionIsSectionGroupEnd}', '${SectionIsBold}', '${SectionIsReadOnly}',
-            '${SectionIsExpanded}', '${SectionIsPartiallySelected}'
-            ),
-        10 => array(
-            'StrFunc.nsh', '${STRFUNC}', '${StrCase}', '${StrClb}', '${StrIOToNSIS}', '${StrLoc}', '${StrNSISToIO}', '${StrRep}',
-            '${StrSort}', '${StrStr}', '${StrStrAdv}', '${StrTok}', '${StrTrimNewLines}'
-            ),
-        11 => array(
-            'UpgradeDLL.nsh', 'UPGRADEDLL_INCLUDED', 'UpgradeDLL'
-            ),
-        12 => array(
-            'Sections.nsh', 'SECTIONS_INCLUDED', '${SF_SELECTED}', '${SF_SECGRP}', '${SF_SUBSEC}', '${SF_SECGRPEND}',
-            '${SF_SUBSECEND}', '${SF_BOLD}', '${SF_RO}', '${SF_EXPAND}', '${SF_PSELECTED}', '${SF_TOGGLED}',
-            '${SF_NAMECHG}', '${SECTION_OFF}', 'SelectSection', 'UnselectSection', 'ReverseSection',
-            'StartRadioButtons', 'RadioButton', 'EndRadioButtons', '${INSTTYPE_0}', '${INSTTYPE_1}', '${INSTTYPE_2}',
-            '${INSTTYPE_3}', '${INSTTYPE_4}', '${INSTTYPE_5}', '${INSTTYPE_6}', '${INSTTYPE_7}', '${INSTTYPE_8}',
-            '${INSTTYPE_9}', '${INSTTYPE_10}', '${INSTTYPE_11}', '${INSTTYPE_12}', '${INSTTYPE_13}', '${INSTTYPE_14}',
-            '${INSTTYPE_15}', '${INSTTYPE_16}', '${INSTTYPE_17}', '${INSTTYPE_18}', '${INSTTYPE_19}', '${INSTTYPE_20}',
-            '${INSTTYPE_21}', '${INSTTYPE_22}', '${INSTTYPE_23}', '${INSTTYPE_24}', '${INSTTYPE_25}', '${INSTTYPE_26}',
-            '${INSTTYPE_27}', '${INSTTYPE_28}', '${INSTTYPE_29}', '${INSTTYPE_30}', '${INSTTYPE_31}', '${INSTTYPE_32}',
-            'SetSectionInInstType', 'ClearSectionInInstType', 'SetSectionFlag', 'ClearSectionFlag', 'SectionFlagIsSet'
-            ),
-        13 => array(
-            'Colors.nsh', 'WHITE', 'BLACK', 'YELLOW', 'RED', 'GREEN', 'BLUE', 'MAGENTA', 'CYAN', 'rgb2hex'
-            ),
-        14 => array(
-            'FileFunc.nsh', '${Locate}', '${GetSize}', '${DriveSpace}', '${GetDrives}', '${GetTime}', '${GetFileAttributes}', '${GetFileVersion}', '${GetExeName}', '${GetExePath}', '${GetParameters}', '${GetOptions}', '${GetRoot}', '${GetParent}', '${GetFileName}', '${GetBaseName}', '${GetFileExt}', '${BannerTrimPath}', '${DirState}', '${RefreshShellIcons}'
-            ),
-        15 => array(
-            'TextFunc.nsh', '${LineFind}', '${LineRead}', '${FileReadFromEnd}', '${LineSum}', '${FileJoin}', '${TextCompare}', '${ConfigRead}', '${ConfigWrite}', '${FileRecode}', '${TrimNewLines}'
-            ),
-        16 => array(
-            'WordFunc.nsh', '${WordFind}', '${WordFind2X}', '${WordFind3X}', '${WordReplace}', '${WordAdd}', '${WordInsert}', '${StrFilter}', '${VersionCompare}', '${VersionConvert}'
-            )
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        9 => false,
-        10 => false,
-        11 => false,
-        12 => false,
-        13 => false,
-        14 => false,
-        15 => false,
-        16 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066; font-weight:bold;',
-            2 => 'color: #000066;',
-            3 => 'color: #003366;',
-            4 => 'color: #000099;',
-            5 => 'color: #ff6600;',
-            6 => 'color: #ff6600;',
-            7 => 'color: #006600;',
-            8 => 'color: #006600;',
-            9 => 'color: #006600;',
-            10 => 'color: #006600;',
-            11 => 'color: #006600;',
-            12 => 'color: #006600;',
-            13 => 'color: #006600;',
-            14 => 'color: #006600;',
-            15 => 'color: #006600;',
-            16 => 'color: #006600;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #660066; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => ''
-            ),
-        'STRINGS' => array(
-            0 => 'color: #660066;'
-            ),
-        'NUMBERS' => array(
-            0 => ''
-            ),
-        'METHODS' => array(
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => ''
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #660000;',
-            1 => 'color: #660000;',
-            2 => 'color: #660000;',
-            3 => 'color: #660000;',
-            4 => 'color: #660000;',
-            5 => 'color: #660000;',
-            6 => 'color: #660000;',
-            7 => 'color: #000099;',
-            8 => 'color: #003399;'
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        9 => '',
-        10 => '',
-        11 => '',
-        12 => '',
-        13 => '',
-        14 => '',
-        15 => '',
-        16 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => '\$\$',
-        1 => '\$\\r',
-        2 => '\$\\n',
-        3 => '\$\\t',
-        4 => '\$[a-zA-Z0-9_]+',
-        5 => '\$\{.{1,256}\}',
-        6 => '\$\\\(.{1,256}\\\)',
-        7 => array(
-            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2\\3'
-            ),
-        8 => array(
-            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:<PIPE>)]*?\s)',
-            GESHI_REPLACE => '\\3',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1\\2',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/oberon2.php b/inc/geshi/oberon2.php
deleted file mode 100644
index b43f81408..000000000
--- a/inc/geshi/oberon2.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*************************************************************************************
- * oberon2.php
- * ----------
- * Author: mbishop (mbishop@esoteriq.org)
- * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
- * Release Version: 1.0.8.11
- * Date Started: 2009/02/10
- *
- * Oberon-2 language file for GeSHi.
- *
- * CHANGES
- * -------
- *
- * TODO
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Oberon-2',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('(*' => '*)'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("''"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'ARRAY', 'BEGIN', 'BY', 'CASE',
-            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END',
-            'EXIT', 'FOR', 'IF', 'IMPORT', 'IN', 'IS',
-            'LOOP', 'MOD', 'MODULE', 'OF',
-            'OR', 'POINTER', 'PROCEDURE', 'RECORD',
-            'REPEAT', 'RETURN', 'THEN', 'TO',
-            'TYPE', 'UNTIL', 'VAR', 'WHILE', 'WITH'
-            ),
-        2 => array(
-            'NIL', 'FALSE', 'TRUE',
-            ),
-        3 => array(
-            'ABS', 'ASH', 'ASSERT', 'CAP', 'CHR', 'COPY', 'DEC',
-            'ENTIER', 'EXCL', 'HALT', 'INC', 'INCL', 'LEN',
-            'LONG', 'MAX', 'MIN', 'NEW', 'ODD', 'ORD', 'SHORT', 'SIZE'
-            ),
-        4 => array(
-            'BOOLEAN', 'CHAR', 'SHORTINT', 'LONGINT',
-            'INTEGER', 'LONGREAL', 'REAL', 'SET', 'PTR'
-            ),
-        ),
-    'SYMBOLS' => array(
-        ',', ':', '=', '+', '-', '*', '/', '#', '~'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0066ee;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/objc.php b/inc/geshi/objc.php
deleted file mode 100644
index 2f5162d76..000000000
--- a/inc/geshi/objc.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-/*************************************************************************************
- * objc.php
- * --------
- * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
- * Contributors: Quinn Taylor (quinntaylor@mac.com)
- * Copyright: (c) 2008 Quinn Taylor, 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * Objective-C language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/07/11 (1.0.8)
- *   -  Added support for @ before strings being highlighted
- * 2008/06/10 (1.0.7.22)
- *   -  Added keywords for Objective-C 2.0 (Leopard+).
- *   -  Changed colors to match Xcode 3 highlighting more closely.
- *   -  Updated API for AppKit and Foundation; added CoreData classes.
- *   -  Updated URLs for AppKit and Foundation; split classes and protocols.
- *   -  Sorted all keyword group in reverse-alpha order for correct matching.
- *   -  Changed all keyword groups to be case-sensitive.
- * 2004/11/27 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Objective-C',
-    'COMMENT_SINGLE' => array(
-        //Compiler directives
-        1 => '#',
-        //Single line C-Comments
-        2 => '//'
-        ),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline Continuation for single-line comment
-        2 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Pseudo-Highlighting of the @-sign before strings
-        3 => "/@(?=\")/"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '\\',
-
-    'KEYWORDS' => array(
-        // Objective-C keywords
-        1 => array(
-            'while', 'switch', 'return', 'in', 'if', 'goto', 'foreach', 'for',
-            'else', 'do', 'default', 'continue', 'case', '@try', '@throw',
-            '@synthesize', '@synchronized', '@selector', '@public', '@protocol',
-            '@protected', '@property', '@private', '@interface',
-            '@implementation', '@finally', '@end', '@encode', '@defs', '@class',
-            '@catch'
-            ),
-        // Macros and constants
-        2 => array(
-            'YES', 'USHRT_MAX', 'ULONG_MAX', 'UINT_MAX', 'UCHAR_MAX', 'true',
-            'TMP_MAX', 'stdout', 'stdin', 'stderr', 'SIGTERM', 'SIGSEGV',
-            'SIGINT', 'SIGILL', 'SIG_IGN', 'SIGFPE', 'SIG_ERR', 'SIG_DFL',
-            'SIGABRT', 'SHRT_MIN', 'SHRT_MAX', 'SEEK_SET', 'SEEK_END',
-            'SEEK_CUR', 'SCHAR_MIN', 'SCHAR_MAX', 'RAND_MAX', 'NULL',
-            'NO', 'nil', 'Nil', 'L_tmpnam', 'LONG_MIN', 'LONG_MAX',
-            'LDBL_MIN_EXP', 'LDBL_MIN', 'LDBL_MAX_EXP', 'LDBL_MAX',
-            'LDBL_MANT_DIG', 'LDBL_EPSILON', 'LDBL_DIG', 'INT_MIN', 'INT_MAX',
-            'HUGE_VAL', 'FOPEN_MAX', 'FLT_ROUNDS', 'FLT_RADIX', 'FLT_MIN_EXP',
-            'FLT_MIN', 'FLT_MAX_EXP', 'FLT_MAX', 'FLT_MANT_DIG', 'FLT_EPSILON',
-            'FLT_DIG', 'FILENAME_MAX', 'false', 'EXIT_SUCCESS', 'EXIT_FAILURE',
-            'errno', 'ERANGE', 'EOF', 'enum', 'EDOM', 'DBL_MIN_EXP', 'DBL_MIN',
-            'DBL_MAX_EXP', 'DBL_MAX', 'DBL_MANT_DIG', 'DBL_EPSILON', 'DBL_DIG',
-            'CLOCKS_PER_SEC', 'CHAR_MIN', 'CHAR_MAX', 'CHAR_BIT', 'BUFSIZ',
-            'break'
-            ),
-        // C standard library functions
-        3 => array(
-            'vsprintf', 'vprintf', 'vfprintf', 'va_start', 'va_end', 'va_arg',
-            'ungetc', 'toupper', 'tolower', 'tmpname', 'tmpfile', 'time',
-            'tanh', 'tan', 'system', 'strxfrm', 'strtoul', 'strtol', 'strtok',
-            'strtod', 'strstr', 'strspn', 'strrchr', 'strpbrk', 'strncpy',
-            'strncmp', 'strncat', 'strlen', 'strftime', 'strerror', 'strcspn',
-            'strcpy', 'strcoll', 'strcmp', 'strchr', 'strcat', 'sscanf',
-            'srand', 'sqrt', 'sprintf', 'snprintf', 'sizeof', 'sinh', 'sin',
-            'setvbuf', 'setjmp', 'setbuf', 'scanf', 'rewind', 'rename',
-            'remove', 'realloc', 'rand', 'qsort', 'puts', 'putchar', 'putc',
-            'printf', 'pow', 'perror', 'offsetof', 'modf', 'mktime', 'memset',
-            'memmove', 'memcpy', 'memcmp', 'memchr', 'malloc', 'longjmp',
-            'log10', 'log', 'localtime', 'ldiv', 'ldexp', 'labs', 'isxdigit',
-            'isupper', 'isspace', 'ispunct', 'isprint', 'islower',
-            'isgraph', 'isdigit', 'iscntrl', 'isalpha', 'isalnum', 'gmtime',
-            'gets', 'getenv', 'getchar', 'getc', 'fwrite', 'ftell', 'fsetpos',
-            'fseek', 'fscanf', 'frexp', 'freopen', 'free', 'fread', 'fputs',
-            'fputc', 'fprintf', 'fopen', 'fmod', 'floor', 'fgets', 'fgetpos',
-            'fgetc', 'fflush', 'ferror', 'feof', 'fclose', 'fabs', 'exp',
-            'exit', 'div', 'difftime', 'ctime', 'cosh', 'cos', 'clock',
-            'clearerr', 'ceil', 'calloc', 'bsearch', 'atol', 'atoi', 'atof',
-            'atexit', 'atan2', 'atan', 'assert', 'asin', 'asctime', 'acos',
-            'abs', 'abort'
-            ),
-        // Data types (C, Objective-C, Cocoa)
-        4 => array(
-            'volatile', 'void', 'va_list', 'unsigned', 'union', 'typedef', 'tm',
-            'time_t', 'struct', 'string', 'static', 'size_t',
-            'signed', 'signal', 'short', 'SEL', 'register', 'raise',
-            'ptrdiff_t', 'NSZone', 'NSRect', 'NSRange', 'NSPoint', 'long',
-            'ldiv_t', 'jmp_buf', 'int', 'IMP', 'id', 'fpos_t', 'float', 'FILE',
-            'extern', 'double', 'div_t', 'const', 'clock_t', 'Class', 'char',
-            'BOOL', 'auto'
-            ),
-        // Foundation classes
-        5 => array(
-            'NSXMLParser', 'NSXMLNode', 'NSXMLElement', 'NSXMLDTDNode',
-            'NSXMLDTD', 'NSXMLDocument', 'NSWhoseSpecifier',
-            'NSValueTransformer', 'NSValue', 'NSUserDefaults', 'NSURLResponse',
-            'NSURLRequest', 'NSURLProtocol', 'NSURLProtectionSpace',
-            'NSURLHandle', 'NSURLDownload', 'NSURLCredentialStorage',
-            'NSURLCredential', 'NSURLConnection', 'NSURLCache',
-            'NSURLAuthenticationChallenge', 'NSURL', 'NSUniqueIDSpecifier',
-            'NSUndoManager', 'NSUnarchiver', 'NSTimeZone', 'NSTimer',
-            'NSThread', 'NSTask', 'NSString', 'NSStream', 'NSSpellServer',
-            'NSSpecifierTest', 'NSSortDescriptor', 'NSSocketPortNameServer',
-            'NSSocketPort', 'NSSetCommand', 'NSSet', 'NSSerializer',
-            'NSScriptWhoseTest', 'NSScriptSuiteRegistry',
-            'NSScriptObjectSpecifier', 'NSScriptExecutionContext',
-            'NSScriptCommandDescription', 'NSScriptCommand',
-            'NSScriptCoercionHandler', 'NSScriptClassDescription', 'NSScanner',
-            'NSRunLoop', 'NSRelativeSpecifier', 'NSRecursiveLock',
-            'NSRangeSpecifier', 'NSRandomSpecifier', 'NSQuitCommand', 'NSProxy',
-            'NSProtocolChecker', 'NSPropertySpecifier',
-            'NSPropertyListSerialization', 'NSProcessInfo', 'NSPredicate',
-            'NSPositionalSpecifier', 'NSPortNameServer', 'NSPortMessage',
-            'NSPortCoder', 'NSPort', 'NSPointerFunctions', 'NSPointerArray',
-            'NSPipe', 'NSOutputStream', 'NSOperationQueue', 'NSOperation',
-            'NSObject', 'NSNumberFormatter', 'NSNumber', 'NSNull',
-            'NSNotificationQueue', 'NSNotificationCenter', 'NSNotification',
-            'NSNetServiceBrowser', 'NSNetService', 'NSNameSpecifier',
-            'NSMutableURLRequest', 'NSMutableString', 'NSMutableSet',
-            'NSMutableIndexSet', 'NSMutableDictionary', 'NSMutableData',
-            'NSMutableCharacterSet', 'NSMutableAttributedString',
-            'NSMutableArray', 'NSMoveCommand', 'NSMiddleSpecifier',
-            'NSMethodSignature', 'NSMetadataQueryResultGroup',
-            'NSMetadataQueryAttributeValueTuple', 'NSMetadataQuery',
-            'NSMetadataItem', 'NSMessagePortNameServer', 'NSMessagePort',
-            'NSMapTable', 'NSMachPort', 'NSMachBootstrapServer',
-            'NSLogicalTest', 'NSLock', 'NSLocale', 'NSKeyedUnarchiver',
-            'NSKeyedArchiver', 'NSInvocationOperation', 'NSInvocation',
-            'NSInputStream', 'NSIndexSpecifier', 'NSIndexSet', 'NSIndexPath',
-            'NSHTTPURLResponse', 'NSHTTPCookieStorage', 'NSHTTPCookie',
-            'NSHost', 'NSHashTable', 'NSGetCommand', 'NSGarbageCollector',
-            'NSFormatter', 'NSFileManager', 'NSFileHandle', 'NSExpression',
-            'NSExistsCommand', 'NSException', 'NSError', 'NSEnumerator',
-            'NSDistributedNotificationCenter', 'NSDistributedLock',
-            'NSDistantObjectRequest', 'NSDistantObject',
-            'NSDirectoryEnumerator', 'NSDictionary', 'NSDeserializer',
-            'NSDeleteCommand', 'NSDecimalNumberHandler', 'NSDecimalNumber',
-            'NSDateFormatter', 'NSDateComponents', 'NSDate', 'NSData',
-            'NSCreateCommand', 'NSCountedSet', 'NSCountCommand', 'NSConnection',
-            'NSConditionLock', 'NSCondition', 'NSCompoundPredicate',
-            'NSComparisonPredicate', 'NSCoder', 'NSCloseCommand',
-            'NSCloneCommand', 'NSClassDescription', 'NSCharacterSet',
-            'NSCalendarDate', 'NSCalendar', 'NSCachedURLResponse', 'NSBundle',
-            'NSAutoreleasePool', 'NSAttributedString', 'NSAssertionHandler',
-            'NSArray', 'NSArchiver', 'NSAppleScript', 'NSAppleEventManager',
-            'NSAppleEventDescriptor', 'NSAffineTransform'
-            ),
-        // Foundation protocols
-        6 => array(
-            'NSURLProtocolClient', 'NSURLHandleClient', 'NSURLClient',
-            'NSURLAuthenticationChallengeSender', 'NSScriptObjectSpecifiers',
-            'NSScriptKeyValueCoding', 'NSScriptingComparisonMethods',
-            'NSObjCTypeSerializationCallBack', 'NSMutableCopying',
-            'NSLocking', 'NSKeyValueObserving', 'NSKeyValueCoding',
-            'NSFastEnumeration', 'NSErrorRecoveryAttempting',
-            'NSDecimalNumberBehaviors', 'NSCopying', 'NSComparisonMethods',
-            'NSCoding'
-            ),
-        // AppKit classes
-        7 => array(
-            'NSWorkspace', 'NSWindowController', 'NSWindow', 'NSViewController',
-            'NSViewAnimation', 'NSView', 'NSUserDefaultsController',
-            'NSTypesetter', 'NSTreeNode', 'NSTreeController', 'NSTrackingArea',
-            'NSToolbarItemGroup', 'NSToolbarItem', 'NSToolbar',
-            'NSTokenFieldCell', 'NSTokenField', 'NSTextView',
-            'NSTextTableBlock', 'NSTextTable', 'NSTextTab', 'NSTextStorage',
-            'NSTextList', 'NSTextFieldCell', 'NSTextField', 'NSTextContainer',
-            'NSTextBlock', 'NSTextAttachmentCell', 'NSTextAttachment', 'NSText',
-            'NSTabViewItem', 'NSTabView', 'NSTableView', 'NSTableHeaderView',
-            'NSTableHeaderCell', 'NSTableColumn', 'NSStepperCell', 'NSStepper',
-            'NSStatusItem', 'NSStatusBar', 'NSSplitView', 'NSSpellChecker',
-            'NSSpeechSynthesizer', 'NSSpeechRecognizer', 'NSSound',
-            'NSSliderCell', 'NSSlider', 'NSSimpleHorizontalTypesetter',
-            'NSShadow', 'NSSegmentedControl', 'NSSegmentedCell',
-            'NSSecureTextFieldCell', 'NSSecureTextField', 'NSSearchFieldCell',
-            'NSSearchField', 'NSScrollView', 'NSScroller', 'NSScreen',
-            'NSSavePanel', 'NSRulerView', 'NSRulerMarker', 'NSRuleEditor',
-            'NSResponder', 'NSQuickDrawView', 'NSProgressIndicator',
-            'NSPrintPanel', 'NSPrintOperation', 'NSPrintInfo', 'NSPrinter',
-            'NSPredicateEditorRowTemplate', 'NSPredicateEditor',
-            'NSPopUpButtonCell', 'NSPopUpButton', 'NSPICTImageRep',
-            'NSPersistentDocument', 'NSPDFImageRep', 'NSPathControl',
-            'NSPathComponentCell', 'NSPathCell', 'NSPasteboard',
-            'NSParagraphStyle', 'NSPanel', 'NSPageLayout', 'NSOutlineView',
-            'NSOpenPanel', 'NSOpenGLView', 'NSOpenGLPixelFormat',
-            'NSOpenGLPixelBuffer', 'NSOpenGLContext', 'NSObjectController',
-            'NSNibOutletConnector', 'NSNibControlConnector', 'NSNibConnector',
-            'NSNib', 'NSMutableParagraphStyle', 'NSMovieView', 'NSMovie',
-            'NSMenuView', 'NSMenuItemCell', 'NSMenuItem', 'NSMenu', 'NSMatrix',
-            'NSLevelIndicatorCell', 'NSLevelIndicator', 'NSLayoutManager',
-            'NSInputServer', 'NSInputManager', 'NSImageView', 'NSImageRep',
-            'NSImageCell', 'NSImage', 'NSHelpManager', 'NSGraphicsContext',
-            'NSGradient', 'NSGlyphInfo', 'NSGlyphGenerator', 'NSFormCell',
-            'NSForm', 'NSFontPanel', 'NSFontManager', 'NSFontDescriptor',
-            'NSFont', 'NSFileWrapper', 'NSEvent', 'NSEPSImageRep', 'NSDrawer',
-            'NSDocumentController', 'NSDocument', 'NSDockTile',
-            'NSDictionaryController', 'NSDatePickerCell', 'NSDatePicker',
-            'NSCustomImageRep', 'NSCursor', 'NSController', 'NSControl',
-            'NSComboBoxCell', 'NSComboBox', 'NSColorWell', 'NSColorSpace',
-            'NSColorPicker', 'NSColorPanel', 'NSColorList', 'NSColor',
-            'NSCollectionViewItem', 'NSCollectionView', 'NSClipView',
-            'NSCIImageRep', 'NSCell', 'NSCachedImageRep', 'NSButtonCell',
-            'NSButton', 'NSBrowserCell', 'NSBrowser', 'NSBox',
-            'NSBitmapImageRep', 'NSBezierPath', 'NSATSTypesetter',
-            'NSArrayController', 'NSApplication', 'NSAnimationContext',
-            'NSAnimation', 'NSAlert', 'NSActionCell'
-            ),
-        // AppKit protocols
-        8 => array(
-            'NSWindowScripting', 'NSValidatedUserInterfaceItem',
-            'NSUserInterfaceValidations', 'NSToolTipOwner',
-            'NSToolbarItemValidation', 'NSTextInput',
-            'NSTableDataSource', 'NSServicesRequests',
-            'NSPrintPanelAccessorizing', 'NSPlaceholders',
-            'NSPathControlDelegate', 'NSPathCellDelegate',
-            'NSOutlineViewDataSource', 'NSNibAwaking', 'NSMenuValidation',
-            'NSKeyValueBindingCreation', 'NSInputServiceProvider',
-            'NSInputServerMouseTracker', 'NSIgnoreMisspelledWords',
-            'NSGlyphStorage', 'NSFontPanelValidation', 'NSEditorRegistration',
-            'NSEditor', 'NSDraggingSource', 'NSDraggingInfo',
-            'NSDraggingDestination', 'NSDictionaryControllerKeyValuePair',
-            'NSComboBoxDataSource', 'NSComboBoxCellDataSource',
-            'NSColorPickingDefault', 'NSColorPickingCustom', 'NSChangeSpelling',
-            'NSAnimatablePropertyContainer', 'NSAccessibility'
-            ),
-        // CoreData classes
-        9 => array(
-            'NSRelationshipDescription', 'NSPropertyMapping',
-            'NSPropertyDescription', 'NSPersistentStoreCoordinator',
-            'NSPersistentStore', 'NSMigrationManager', 'NSMappingModel',
-            'NSManagedObjectModel', 'NSManagedObjectID',
-            'NSManagedObjectContext', 'NSManagedObject',
-            'NSFetchRequestExpression', 'NSFetchRequest',
-            'NSFetchedPropertyDescription', 'NSEntityMigrationPolicy',
-            'NSEntityMapping', 'NSEntityDescription', 'NSAttributeDescription',
-            'NSAtomicStoreCacheNode', 'NSAtomicStore'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true
-        ),
-    // Define the colors for the groups listed above
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #a61390;', // Objective-C keywords
-            2 => 'color: #a61390;', // Macros and constants
-            3 => 'color: #a61390;', // C standard library functions
-            4 => 'color: #a61390;', // data types
-            5 => 'color: #400080;', // Foundation classes
-            6 => 'color: #2a6f76;', // Foundation protocols
-            7 => 'color: #400080;', // AppKit classes
-            8 => 'color: #2a6f76;', // AppKit protocols
-            9 => 'color: #400080;' // CoreData classes
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #6e371a;', // Preprocessor directives
-            2 => 'color: #11740a; font-style: italic;', // Normal C single-line comments
-            3 => 'color: #bf1d1a;', // Q-sign in front of Strings
-            'MULTI' => 'color: #11740a; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #2400d9;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #002200;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #bf1d1a;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #2400d9;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #002200;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAME}.html',
-        4 => '',
-        5 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Classes/{FNAME}_Class/',
-        6 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Protocols/{FNAME}_Protocol/',
-        7 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/{FNAME}_Class/',
-        8 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Protocols/{FNAME}_Protocol/',
-        9 => 'http://developer.apple.com/documentation/Cocoa/Reference/CoreDataFramework/Classes/{FNAME}_Class/'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/objeck.php b/inc/geshi/objeck.php
deleted file mode 100644
index bf9dab564..000000000
--- a/inc/geshi/objeck.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*************************************************************************************
- * objeck.php
- * --------
- * Author: Randy Hollines (objeck@gmail.com)
- * Copyright: (c) 2010 Randy Hollines (http://code.google.com/p/objeck-lang/)
- * Release Version: 1.0.8.11
- * Date Started: 2010/07/01
- *
- * Objeck Programming Language language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/26 (1.0.8.10)
- *  -  Added new and missing keywords and symbols: 'String', 'each', '+=', '-=', '*=' and '/='.
- * 2010/07/01 (1.0.8.9)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Objeck Programming Language',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array('#~' => '~#'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'virtual', 'if', 'else', 'do', 'while', 'use', 'bundle', 'native',
-            'static', 'public', 'private', 'class', 'function', 'method',
-            'select', 'other', 'enum', 'for', 'each', 'label', 'return', 'from'
-            ),
-        2 => array(
-            'Byte', 'Int', 'Nil', 'Float', 'Char', 'Bool', 'String'
-            ),
-        3 => array(
-            'true', 'false'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', '&', '|', ':', ';', ',', '+=', '-=', '*=', '/=',
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #b1b100;',
-            3 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '-&gt;'
-        ),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/ocaml-brief.php b/inc/geshi/ocaml-brief.php
deleted file mode 100644
index b518adf87..000000000
--- a/inc/geshi/ocaml-brief.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*************************************************************************************
- * ocaml.php
- * ----------
- * Author: Flaie (fireflaie@gmail.com)
- * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2005/08/27
- *
- * OCaml (Objective Caml) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/08/27 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2005/08/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'OCaml (brief)',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('(*' => '*)'),
-    'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => "",
-    'KEYWORDS' => array(
-        /* main OCaml keywords */
-        1 => array(
-            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
-            'end', 'exception', 'external', 'failwith', 'false', 'flush', 'for', 'fun', 'function', 'functor',
-            'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
-            'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
-            'private', 'ref', 'rec', 'raise', 'regexp', 'sig', 'struct', 'stdout', 'stdin', 'stderr', 'then',
-            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
-            )
-        ),
-    /* highlighting symbols is really important in OCaml */
-    'SYMBOLS' => array(
-        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
-        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'"
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #06c; font-weight: bold;' /* nice blue */
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #6c6;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #3cb371;' /* nice green */
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #c6c;' /* pink */
-            ),
-        'METHODS' => array(
-            1 => 'color: #060;' /* dark green */
-            ),
-        'REGEXPS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #a52a2a;' /* maroon */
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/ocaml.php b/inc/geshi/ocaml.php
deleted file mode 100644
index ac6c29bcc..000000000
--- a/inc/geshi/ocaml.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/*************************************************************************************
- * ocaml.php
- * ----------
- * Author: Flaie (fireflaie@gmail.com)
- * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2005/08/27
- *
- * OCaml (Objective Caml) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/03/29 (1.0.7.22)
- *   -  Fixed warnings resulting from missing style information
- * 2005/08/27 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2005/08/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'OCaml',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('(*' => '*)'),
-    'COMMENT_REGEXP' => array(1 => '/\(\*(?:(?R)|.)+?\*\)/s'),
-    'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => "",
-    'KEYWORDS' => array(
-        /* main OCaml keywords */
-        1 => array(
-            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
-            'end', 'exception', 'external', 'failwith', 'false', 'for', 'fun', 'function', 'functor',
-            'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
-            'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
-            'private', 'ref', 'rec', 'raise', 'regexp', 'sig', 'struct', 'stdout', 'stdin', 'stderr', 'then',
-            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
-            ),
-        /* define names of main librarys, so we can link to it */
-        2 => array(
-            'Arg', 'Arith_status', 'Array', //'Array1', 'Array2', 'Array3',
-            'ArrayLabels', 'Big_int', 'Bigarray', 'Buffer', 'Callback',
-            'CamlinternalLazy', 'CamlinternalMod', 'CamlinternalOO', 'Char',
-            'Complex', 'Condition', 'Dbm', 'Digest', 'Dynlink', 'Event',
-            'Filename', 'Format', 'Gc', 'Genlex', 'Graphics', 'GraphicsX11',
-            'Hashtbl', 'Int32', 'Int64', 'Lazy', 'Lexing', 'List', 'ListLabels',
-            'Map', 'Marshal', 'MoreLabels', 'Mutex', 'Nativeint', 'Num', 'Obj',
-            'Oo', 'Parsing', 'Pervasives', 'Printexc', 'Printf', 'Queue',
-            'Random', 'Scanf', 'Set', 'Sort', 'Stack', 'StdLabels', 'Str',
-            'Stream', 'String', 'StringLabels', 'Sys', 'Thread', 'ThreadUnix',
-            'Tk', 'Unix', 'UnixLabels', 'Weak'
-            ),
-        /* just link to the Pervasives functions library, cause it's the default opened library when starting OCaml */
-        3 => array(
-            'abs', 'abs_float', 'acos', 'asin', 'at_exit', 'atan', 'atan2',
-            'bool_of_string', 'ceil', 'char_of_int', 'classify_float',
-            'close_in', 'close_in_noerr', 'close_out', 'close_out_noerr',
-            'compare', 'cos', 'cosh', 'decr', 'epsilon_float', 'exit', 'exp',
-            'float', 'float_of_int', 'float_of_string', 'floor', 'flush',
-            'flush_all', 'format_of_string', 'frexp', 'fst', 'ignore',
-            'in_channel_length', 'infinity', 'input', 'input_binary_int',
-            'input_byte', 'input_char', 'input_line', 'input_value',
-            'int_of_char', 'int_of_float', 'int_of_string', 'invalid_arg',
-            'ldexp', 'log', 'log10', 'max', 'max_float', 'max_int', 'min',
-            'min_float', 'min_int', 'mod_float', 'modf', 'nan', 'open_in',
-            'open_in_bin', 'open_in_gen', 'open_out', 'open_out_bin',
-            'open_out_gen', 'out_channel_length', 'output', 'output_binary_int',
-            'output_byte', 'output_char', 'output_string', 'output_value',
-            'pos_in', 'pos_out',  'pred', 'prerr_char', 'prerr_endline',
-            'prerr_float', 'prerr_int', 'prerr_newline', 'prerr_string',
-            'print_char', 'print_endline', 'print_float', 'print_int',
-            'print_newline', 'print_string', 'read_float', 'read_int',
-            'read_line', 'really_input', 'seek_in', 'seek_out',
-            'set_binary_mode_in', 'set_binary_mode_out', 'sin', 'sinh', 'snd',
-            'sqrt', 'string_of_bool', 'string_of_float', 'string_of_format',
-            'string_of_int', 'succ', 'tan', 'tanh', 'truncate'
-            ),
-        /* here Pervasives Types */
-        4 => array (
-            'array','bool','char','exn','file_descr','format','fpclass',
-            'in_channel','int','int32','int64','list','nativeint','open_flag',
-            'out_channel','string','Sys_error','unit'
-            ),
-        /* finally Pervasives Exceptions */
-        5 => array (
-            'Exit', 'Invalid_Argument', 'Failure', 'Division_by_zero'
-            )
-        ),
-    /* highlighting symbols is really important in OCaml */
-    'SYMBOLS' => array(
-        '+.', '-.', '*.', '/.', '[<', '>]',
-        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
-        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'",
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => true, /* functions name are case sensitive */
-        3 => true, /* types name too */
-        4 => true, /* pervasives types */
-        5 => true  /* pervasives exceptions */
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #06c; font-weight: bold;', /* nice blue */
-            2 => 'color: #06c; font-weight: bold;', /* nice blue */
-            3 => 'color: #06c; font-weight: bold;', /* nice blue */
-            4 => 'color: #06c; font-weight: bold;', /* nice blue */
-            5 => 'color: #06c; font-weight: bold;' /* nice blue */
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #5d478b; font-style: italic;', /* light purple */
-            1 => 'color: #5d478b; font-style: italic;' /* light purple */
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #a52a2a;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #3cb371;' /* nice green */
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #c6c;' /* pink */
-            ),
-        'METHODS' => array(
-            1 => 'color: #060;' /* dark green */
-            ),
-        'REGEXPS' => array(
-            1 => 'font-weight:bold; color:#339933;',
-            2 => 'font-weight:bold; color:#993399;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #a52a2a;' /* maroon */
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        /* some of keywords are Pervasives functions (land, lxor, asr, ...) */
-        1 => '',
-        /* link to the wanted library */
-        2 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/{FNAME}.html',
-        /* link to Pervasives functions */
-        3 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#VAL{FNAME}',
-        /* link to Pervasives type */
-        4 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#TYPE{FNAME}',
-        /* link to Pervasives exceptions */
-        5 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#EXCEPTION{FNAME}'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        1 => '~\w+',
-        2 => '`(?=(?-i:[a-z]))\w*',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/octave.php b/inc/geshi/octave.php
deleted file mode 100644
index ccffcd97a..000000000
--- a/inc/geshi/octave.php
+++ /dev/null
@@ -1,515 +0,0 @@
-<?php
-/*************************************************************************************
- * octave.php
- * -----------
- * Author: Carnë Draug (carandraug+dev@gmail.com)
- *         Juan Pablo Carbajal (carbajal@ifi.uzh.ch)
- * Copyright: (c) 2012 Carnë Draug
- *            (c) 2012 Juan Pablo Carbajal
- * Release Version: 1.0.8.11
- * Date Started: 2012/05/22
- *
- * GNU Octave M-file language file for GeSHi.
- *
- * This file was heavily based on octave.lang from gtksourceview. If bugs are
- * found and/or fixed on this file, please send them to the gtksourceview
- * project or e-mail them to this file authors. Thanks in advance
- *
- * CHANGES
- * -------
- * 2012/05/22 (1.0.8.11)
- *   -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'GNU Octave',
-    'COMMENT_SINGLE' => array(1 => '#', 2 => '%'),
-    // we can't use COMMENT_MULTI since start and end of block comments need to
-    // be alone on the line (optionally, with whitespace). See COMMENT_REGEXP
-    'COMMENT_MULTI' => array(),
-    // we can't use QUOTEMARKS, not even HARDQUOTE, see COMMENT_REGEXP
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'COMMENT_REGEXP' => array(
-        // Single quote strings: we can't use QUOTEMARKS here since new
-        // lines will break the string. Plus, single quote strings do not even
-        // allow for continuation markers, only double quote strings allow it.
-        // Also, to do not misdetect the transpose operator ' as the start of a
-        // string we assert to not follow a variable name (letters, digits and
-        // underscores) or a closing bracket (round, square or curly) or a dot
-        // (to form the array transpose operator ".'" ).
-        3 => "/(?<![0-9a-zA-Z_\)\]}\.])'.*?'/",
-        // Double quote strings: we also can't use QUOTEMARKS here (see single
-        // line quotes). However, with double quote strings both \ and ... can
-        // be used to make multiline strings. Continuation markers can be
-        // followed by whitespace
-        4 => '/"(.|(\.\.\.|\\\)(\s)*?\n)*?(?<!\\\)"/',
-        // Block comments: the ms modifiers treat strings as multiple lines (to
-        // be able to use ^ and $ instead of newline and thus support block
-        // comments on the first and last line of source) and make . also match
-        // a newline
-        5 => "/^\s*?[%#]{\s*?$.*?^\s*?[%#]}\s*?$/ms",
-        // Packaging system: comes here so that pkg can also be used in the
-        // function form. The list of pkg commands is optional to the match so
-        // that at least pkg is highlighted if new commands are implemented
-        6 => "/\bpkg(?!\s*\()\s+((un)?install|update|(un)?load|list|(global|local)_list|describe|prefix|(re)?build)?\b/",
-        // Function handles
-        7 => "/@([a-z_][a-z1-9_]*)?/i",
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_OCT_PREFIX |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'KEYWORDS' => array(
-        // Data types
-        1 => array(
-            'cell', 'char', 'double', 'uint8', 'uint16', 'uint32', 'uint64',
-            'int8','int16', 'int32', 'int64', 'logical', 'single', 'struct'
-            ),
-        // Storage type
-        2 => array(
-            'global', 'persistent', 'static'
-            ),
-        // Internal variable
-        3 => array(
-            'ans'
-            ),
-        // Reserved words
-        4 => array(
-            'break', 'case', 'catch', 'continue', 'do', 'else', 'elseif', 'end',
-            'end_try_catch', 'end_unwind_protect', 'endfor', 'endfunction',
-            'endif', 'endparfor', 'endswitch', 'endwhile', 'for', 'function',
-            'if', 'otherwise', 'parfor', 'return',
-            'switch', 'try', 'until', 'unwind_protect',
-            'unwind_protect_cleanup', 'varargin', 'varargout', 'while'
-            ),
-        // Built in
-        5 => array(
-            'P_tmpdir', 'abs', 'acos', 'acosh',
-            'add_input_event_hook', 'addlistener', 'addpath', 'addproperty',
-            'all', 'allow_noninteger_range_as_index', 'and', 'angle', 'any',
-            'arg', 'argnames', 'argv', 'asin', 'asinh', 'assignin', 'atan',
-            'atan2', 'atanh', 'atexit', 'autoload', 'available_graphics_toolkits',
-            'beep_on_error', 'bitand', 'bitmax', 'bitor', 'bitshift', 'bitxor',
-            'builtin', 'canonicalize_file_name', 'cat', 'cbrt', 'cd', 'ceil',
-            'cell2struct', 'cellstr', 'chdir', 'class', 'clc',
-            'clear', 'columns', 'command_line_path', 'completion_append_char',
-            'completion_matches', 'complex', 'confirm_recursive_rmdir', 'conj',
-            'cos', 'cosh', 'cputime', 'crash_dumps_octave_core', 'ctranspose',
-            'cumprod', 'cumsum', 'dbclear', 'dbcont', 'dbdown', 'dbnext',
-            'dbquit', 'dbstack', 'dbstatus', 'dbstep', 'dbstop', 'dbtype', 'dbup',
-            'dbwhere', 'debug_on_error', 'debug_on_interrupt', 'debug_on_warning',
-            'default_save_options', 'dellistener', 'diag', 'diary', 'diff',
-            'disp', 'do_braindead_shortcircuit_evaluation', 'do_string_escapes',
-            'doc_cache_file', 'drawnow', 'dup2', 'echo',
-            'echo_executing_commands', 'edit_history','eq', 'erf', 'erfc',
-            'erfcx', 'erfinv', 'errno', 'errno_list', 'error', 'eval', 'evalin',
-            'exec', 'exist', 'exit', 'exp', 'expm1', 'eye', 'fclear',
-            'fclose', 'fcntl', 'fdisp', 'feof', 'ferror', 'feval', 'fflush',
-            'fgetl', 'fgets', 'fieldnames', 'file_in_loadpath', 'file_in_path',
-            'filemarker', 'filesep', 'find_dir_in_path', 'finite', 'fix',
-            'fixed_point_format', 'floor', 'fmod', 'fnmatch', 'fopen', 'fork',
-            'format', 'formula', 'fprintf', 'fputs', 'fread', 'freport',
-            'frewind', 'fscanf', 'fseek', 'fskipl', 'ftell', 'full', 'func2str',
-            'functions', 'fwrite', 'gamma', 'gammaln', 'ge', 'genpath', 'get',
-            'get_help_text', 'get_help_text_from_file', 'getegid', 'getenv',
-            'geteuid', 'getgid', 'gethostname', 'getpgrp', 'getpid', 'getppid',
-            'getuid', 'glob', 'gt', 'history', 'history_control', 'history_file',
-            'history_size', 'history_timestamp_format_string', 'home', 'horzcat',
-            'hypot', 'ifelse', 'ignore_function_time_stamp', 'imag',
-            'inferiorto', 'info_file', 'info_program', 'inline', 'input',
-            'intmax', 'intmin', 'ipermute',
-            'is_absolute_filename', 'is_dq_string', 'is_function_handle',
-            'is_rooted_relative_filename', 'is_sq_string', 'isalnum', 'isalpha',
-            'isargout', 'isascii', 'isbool', 'iscell', 'iscellstr', 'ischar',
-            'iscntrl', 'iscomplex', 'isdebugmode', 'isdigit', 'isempty',
-            'isfield', 'isfinite', 'isfloat', 'isglobal', 'isgraph', 'ishandle',
-            'isieee', 'isindex', 'isinf', 'isinteger', 'iskeyword', 'islogical',
-            'islower', 'ismatrix', 'ismethod', 'isna', 'isnan', 'isnull',
-            'isnumeric', 'isobject', 'isprint', 'ispunct', 'isreal', 'issorted',
-            'isspace', 'issparse', 'isstruct', 'isupper', 'isvarname', 'isxdigit',
-            'kbhit', 'keyboard', 'kill', 'lasterr', 'lasterror', 'lastwarn',
-            'ldivide', 'le', 'length', 'lgamma', 'link', 'linspace',
-            'list_in_columns', 'load', 'loaded_graphics_toolkits', 'log', 'log10',
-            'log1p', 'log2', 'lower', 'lstat', 'lt',
-            'make_absolute_filename', 'makeinfo_program', 'max_recursion_depth',
-            'merge', 'methods', 'mfilename', 'minus', 'mislocked',
-            'missing_function_hook', 'mkdir', 'mkfifo', 'mkstemp', 'mldivide',
-            'mlock', 'mod', 'more', 'mpower', 'mrdivide', 'mtimes', 'munlock',
-            'nargin', 'nargout', 'native_float_format', 'ndims', 'ne',
-            'nfields', 'nnz', 'norm', 'not', 'nth_element', 'numel', 'nzmax',
-            'octave_config_info', 'octave_core_file_limit',
-            'octave_core_file_name', 'octave_core_file_options',
-            'octave_tmp_file_name', 'onCleanup', 'ones',
-            'optimize_subsasgn_calls', 'or', 'output_max_field_width',
-            'output_precision', 'page_output_immediately', 'page_screen_output',
-            'path', 'pathsep', 'pause', 'pclose', 'permute', 'pipe', 'plus',
-            'popen', 'popen2', 'power', 'print_empty_dimensions',
-            'print_struct_array_contents', 'printf', 'prod',
-            'program_invocation_name', 'program_name', 'putenv', 'puts', 'pwd',
-            'quit', 'rats', 'rdivide', 're_read_readline_init_file',
-            'read_readline_init_file', 'readdir', 'readlink', 'real', 'realmax',
-            'realmin', 'register_graphics_toolkit', 'rehash', 'rem',
-            'remove_input_event_hook', 'rename', 'repelems', 'reset', 'reshape',
-            'resize', 'restoredefaultpath', 'rethrow', 'rmdir', 'rmfield',
-            'rmpath', 'round', 'roundb', 'rows', 'run_history', 'save',
-            'save_header_format_string', 'save_precision', 'saving_history',
-            'scanf', 'set', 'setenv', 'sighup_dumps_octave_core', 'sign',
-            'sigterm_dumps_octave_core', 'silent_functions', 'sin',
-            'sinh', 'size', 'size_equal', 'sizemax', 'sizeof', 'sleep', 'sort',
-            'source', 'spalloc', 'sparse', 'sparse_auto_mutate',
-            'split_long_rows', 'sprintf', 'sqrt', 'squeeze', 'sscanf', 'stat',
-            'stderr', 'stdin', 'stdout', 'str2func', 'strcmp', 'strcmpi',
-            'string_fill_char', 'strncmp', 'strncmpi', 'struct2cell',
-            'struct_levels_to_print', 'strvcat', 'subsasgn', 'subsref', 'sum',
-            'sumsq', 'superiorto', 'suppress_verbose_help_message', 'symlink',
-            'system', 'tan', 'tanh', 'terminal_size', 'tic', 'tilde_expand',
-            'times', 'tmpfile', 'tmpnam', 'toascii', 'toc', 'tolower', 'toupper',
-            'transpose', 'typeinfo',
-            'umask', 'uminus', 'uname', 'undo_string_escapes', 'unlink',
-            'uplus', 'upper', 'usage', 'usleep', 'vec', 'vectorize', 'vertcat',
-            'waitfor', 'waitpid', 'warning', 'warranty', 'who', 'whos',
-            'whos_line_format', 'yes_or_no', 'zeros'
-            ),
-        // Octave functions
-        6 => array(
-            'accumarray', 'accumdim', 'acosd', 'acot', 'acotd', 'acoth', 'acsc',
-            'acscd', 'acsch', 'addpref', 'addtodate', 'allchild', 'amd',
-            'ancestor', 'anova', 'arch_fit', 'arch_rnd', 'arch_test',
-            'area', 'arma_rnd', 'asctime', 'asec', 'asecd', 'asech', 'asind',
-            'assert', 'atand', 'autoreg_matrix', 'autumn',
-            'axes', 'axis', 'balance', 'bar', 'barh', 'bartlett', 'bartlett_test',
-            'base2dec', 'beep', 'bessel', 'besselj', 'beta', 'betacdf',
-            'betainc', 'betainv', 'betaln', 'betapdf', 'betarnd', 'bicg',
-            'bicgstab', 'bicubic', 'bin2dec', 'bincoeff', 'binocdf', 'binoinv',
-            'binopdf', 'binornd', 'bitcmp', 'bitget', 'bitset', 'blackman',
-            'blanks', 'blkdiag', 'bone', 'box', 'brighten', 'bsxfun',
-            'bug_report', 'bunzip2', 'bzip2', 'calendar', 'cart2pol', 'cart2sph',
-            'cast', 'cauchy_cdf', 'cauchy_inv', 'cauchy_pdf', 'cauchy_rnd',
-            'caxis', 'ccolamd', 'cell2mat', 'celldisp', 'cellfun',
-            'center', 'cgs', 'chi2cdf', 'chi2inv', 'chi2pdf', 'chi2rnd',
-            'chisquare_test_homogeneity', 'chisquare_test_independence', 'chol',
-            'chop', 'circshift', 'cla', 'clabel', 'clf', 'clock',
-            'cloglog', 'close', 'closereq', 'colamd', 'colloc', 'colon',
-            'colorbar', 'colormap', 'colperm', 'colstyle', 'comet', 'comet3',
-            'comma', 'common_size', 'commutation_matrix', 'compan',
-            'compare_versions', 'compass', 'computer', 'cond', 'condest',
-            'contour', 'contour3', 'contourc', 'contourf', 'contrast', 'conv',
-            'conv2', 'convhull', 'convhulln', 'cool', 'copper', 'copyfile',
-            'cor_test', 'corr', 'cosd', 'cot', 'cotd', 'coth', 'cov',
-            'cplxpair', 'cross', 'csc', 'cscd', 'csch', 'cstrcat',
-            'csvread', 'csvwrite', 'ctime', 'cumtrapz', 'curl', 'cylinder',
-            'daspect', 'daspk', 'dasrt', 'dassl', 'date', 'datenum', 'datestr',
-            'datetick', 'datevec', 'dblquad', 'deal', 'deblank', 'debug',
-            'dec2base', 'dec2bin', 'dec2hex', 'deconv', 'del2', 'delaunay',
-            'delaunay3', 'delaunayn', 'delete', 'demo', 'det', 'detrend',
-            'diffpara', 'diffuse', 'dir', 'discrete_cdf', 'discrete_inv',
-            'discrete_pdf', 'discrete_rnd', 'display', 'divergence',
-            'dlmread', 'dlmwrite', 'dmperm', 'doc', 'dos', 'dot', 'dsearch',
-            'dsearchn', 'dump_prefs', 'duplication_matrix', 'durbinlevinson',
-            'edit', 'eig', 'eigs', 'ellipsoid', 'empirical_cdf', 'empirical_inv',
-            'empirical_pdf', 'empirical_rnd', 'eomday', 'errorbar',
-            'etime', 'etreeplot', 'example', 'expcdf', 'expinv', 'expm', 'exppdf',
-            'exprnd', 'ezcontour', 'ezcontourf', 'ezmesh', 'ezmeshc', 'ezplot',
-            'ezplot3', 'ezpolar', 'ezsurf', 'ezsurfc', 'f_test_regression',
-            'fact', 'factor', 'factorial', 'fail', 'fcdf', 'feather', 'fft',
-            'fft2', 'fftconv', 'fftfilt', 'fftn', 'fftshift', 'fftw', 'figure',
-            'fileattrib', 'fileparts', 'fileread', 'fill', 'filter', 'filter2',
-            'find', 'findall', 'findobj', 'findstr', 'finv', 'flag', 'flipdim',
-            'fliplr', 'flipud', 'fminbnd', 'fminunc', 'fpdf', 'fplot',
-            'fractdiff', 'freqz', 'freqz_plot', 'frnd', 'fsolve',
-            'fullfile', 'fzero', 'gamcdf', 'gaminv', 'gammainc',
-            'gampdf', 'gamrnd', 'gca', 'gcbf', 'gcbo', 'gcd', 'gcf',
-            'gen_doc_cache', 'genvarname', 'geocdf', 'geoinv', 'geopdf', 'geornd',
-            'get_first_help_sentence', 'getappdata', 'getfield', 'getgrent',
-            'getpref', 'getpwent', 'getrusage', 'ginput', 'givens', 'glpk',
-            'gls', 'gmap40', 'gmres', 'gnuplot_binary', 'gplot',
-            'gradient', 'graphics_toolkit', 'gray', 'gray2ind', 'grid',
-            'griddata', 'griddata3', 'griddatan', 'gtext', 'guidata',
-            'guihandles', 'gunzip', 'gzip', 'hadamard', 'hamming', 'hankel',
-            'hanning', 'help', 'hess', 'hex2dec', 'hex2num', 'hggroup', 'hidden',
-            'hilb', 'hist', 'histc', 'hold', 'hot', 'hotelling_test',
-            'hotelling_test_2', 'housh', 'hsv', 'hsv2rgb', 'hurst', 'hygecdf',
-            'hygeinv', 'hygepdf', 'hygernd', 'idivide', 'ifftshift', 'image',
-            'imagesc', 'imfinfo', 'imread', 'imshow', 'imwrite', 'ind2gray',
-            'ind2rgb', 'index', 'info', 'inpolygon', 'inputname', 'int2str',
-            'interp1', 'interp1q', 'interp2', 'interp3', 'interpft', 'interpn',
-            'intersect', 'inv', 'invhilb', 'iqr',
-            'is_leap_year', 'is_valid_file_id',
-            'isa', 'isappdata', 'iscolumn', 'isdefinite', 'isdeployed', 'isdir',
-            'isequal', 'isequalwithequalnans', 'isfigure', 'ishermitian',
-            'ishghandle', 'ishold', 'isletter', 'ismac', 'ismember', 'isocolors',
-            'isonormals', 'isosurface', 'ispc', 'ispref', 'isprime', 'isprop',
-            'isrow', 'isscalar', 'issquare', 'isstrprop', 'issymmetric',
-            'isunix', 'isvector', 'jet', 'kendall', 'kolmogorov_smirnov_cdf',
-            'kolmogorov_smirnov_test', 'kolmogorov_smirnov_test_2', 'kron',
-            'kruskal_wallis_test', 'krylov', 'kurtosis', 'laplace_cdf',
-            'laplace_inv', 'laplace_pdf', 'laplace_rnd', 'lcm', 'legend',
-            'legendre', 'license', 'lin2mu', 'line', 'linkprop', 'list_primes',
-            'loadaudio', 'loadobj', 'logistic_cdf', 'logistic_inv',
-            'logistic_pdf', 'logistic_regression', 'logistic_rnd', 'logit',
-            'loglog', 'loglogerr', 'logm', 'logncdf', 'logninv', 'lognpdf',
-            'lognrnd', 'logspace', 'lookfor', 'lookup', 'ls', 'ls_command',
-            'lsode', 'lsqnonneg', 'lu', 'luinc', 'magic', 'mahalanobis', 'manova',
-            'mat2str', 'matlabroot', 'matrix_type', 'max', 'mcnemar_test',
-            'md5sum', 'mean', 'meansq', 'median', 'menu', 'mesh', 'meshc',
-            'meshgrid', 'meshz', 'mex', 'mexext', 'mgorth', 'mkoctfile', 'mkpp',
-            'mode', 'moment', 'movefile', 'mpoles', 'mu2lin', 'namelengthmax',
-            'nargchk', 'narginchk', 'nargoutchk', 'nbincdf', 'nbininv', 'nbinpdf',
-            'nbinrnd', 'nchoosek', 'ndgrid', 'newplot', 'news', 'nextpow2',
-            'nonzeros', 'normcdf', 'normest', 'norminv', 'normpdf', 'normrnd',
-            'now', 'nproc', 'nthargout', 'nthroot', 'ntsc2rgb', 'null', 'num2str',
-            'ocean', 'ols', 'onenormest', 'optimget', 'optimset', 'orderfields',
-            'orient', 'orth', 'pack', 'paren', 'pareto', 'parseparams', 'pascal',
-            'patch', 'pathdef', 'pbaspect', 'pcg', 'pchip', 'pcolor', 'pcr',
-            'peaks', 'periodogram', 'perl', 'perms', 'pie', 'pie3',
-            'pink', 'pinv', 'pkg', 'planerot', 'playaudio', 'plot', 'plot3',
-            'plotmatrix', 'plotyy', 'poisscdf', 'poissinv', 'poisspdf',
-            'poissrnd', 'pol2cart', 'polar', 'poly', 'polyaffine', 'polyarea',
-            'polyder', 'polyfit', 'polygcd', 'polyint', 'polyout',
-            'polyreduce', 'polyval', 'polyvalm', 'postpad', 'pow2', 'powerset',
-            'ppder', 'ppint', 'ppjumps', 'ppplot', 'ppval', 'pqpnonneg',
-            'prctile', 'prepad', 'primes', 'print', 'printAllBuiltins',
-            'print_usage', 'prism', 'probit', 'profexplore', 'profile',
-            'profshow', 'prop_test_2', 'python', 'qp', 'qqplot', 'qr', 'quad',
-            'quadcc', 'quadgk', 'quadl', 'quadv', 'quantile', 'quiver', 'quiver3',
-            'qz', 'qzhess', 'rainbow', 'rand', 'randi', 'range', 'rank', 'ranks',
-            'rat', 'rcond', 'reallog', 'realpow', 'realsqrt', 'record',
-            'rectangle', 'rectint', 'recycle', 'refresh', 'refreshdata', 'regexp',
-            'regexptranslate', 'repmat', 'residue', 'rgb2hsv',
-            'rgb2ind', 'rgb2ntsc', 'ribbon', 'rindex', 'rmappdata', 'rmpref',
-            'roots', 'rose', 'rosser', 'rot90', 'rotdim', 'rref', 'run',
-            'run_count', 'run_test', 'rundemos', 'runlength', 'runtests',
-            'saveas', 'saveaudio', 'saveobj', 'savepath', 'scatter',
-            'scatter3', 'schur', 'sec', 'secd', 'sech', 'semicolon', 'semilogx',
-            'semilogxerr', 'semilogy', 'semilogyerr', 'setappdata', 'setaudio',
-            'setdiff', 'setfield', 'setpref', 'setxor', 'shading',
-            'shg', 'shift', 'shiftdim', 'sign_test', 'sinc', 'sind',
-            'sinetone', 'sinewave', 'skewness', 'slice', 'sombrero', 'sortrows',
-            'spaugment', 'spconvert', 'spdiags', 'spearman', 'spectral_adf',
-            'spectral_xdf', 'specular', 'speed', 'spencer', 'speye', 'spfun',
-            'sph2cart', 'sphere', 'spinmap', 'spline', 'spones', 'spparms',
-            'sprand', 'sprandn', 'sprandsym', 'spring', 'spstats', 'spy', 'sqp',
-            'sqrtm', 'stairs', 'statistics', 'std', 'stdnormal_cdf',
-            'stdnormal_inv', 'stdnormal_pdf', 'stdnormal_rnd', 'stem', 'stem3',
-            'stft', 'str2double', 'str2num', 'strcat', 'strchr',
-            'strfind', 'strjust', 'strmatch', 'strread', 'strsplit', 'strtok',
-            'strtrim', 'strtrunc', 'structfun', 'sub2ind',
-            'subplot', 'subsindex', 'subspace', 'substr', 'substruct', 'summer',
-            'surf', 'surface', 'surfc', 'surfl', 'surfnorm', 'svd', 'svds',
-            'swapbytes', 'syl', 'symbfact', 'symrcm',
-            'symvar', 'synthesis', 't_test', 't_test_2', 't_test_regression',
-            'table', 'tand', 'tar', 'tcdf', 'tempdir', 'tempname', 'test', 'text',
-            'textread', 'textscan', 'time', 'tinv', 'title', 'toeplitz', 'tpdf',
-            'trace', 'trapz', 'treelayout', 'treeplot', 'tril', 'trimesh',
-            'triplequad', 'triplot', 'trisurf', 'trnd', 'tsearch', 'tsearchn',
-            'type', 'typecast', 'u_test', 'uicontextmenu', 'uicontrol',
-            'uigetdir', 'uigetfile', 'uimenu', 'uipanel', 'uipushtool',
-            'uiputfile', 'uiresume', 'uitoggletool', 'uitoolbar', 'uiwait',
-            'unidcdf', 'unidinv', 'unidpdf', 'unidrnd', 'unifcdf', 'unifinv',
-            'unifpdf', 'unifrnd', 'unimplemented', 'union', 'unique', 'unix',
-            'unmkpp', 'unpack', 'untabify', 'untar', 'unwrap', 'unzip',
-            'urlwrite', 'usejava', 'validatestring', 'vander', 'var',
-            'var_test', 'vech', 'ver', 'version', 'view', 'voronoi', 'voronoin',
-            'waitbar', 'waitforbuttonpress', 'warning_ids', 'wavread', 'wavwrite',
-            'wblcdf', 'wblinv', 'wblpdf', 'wblrnd', 'weekday',
-            'welch_test', 'what', 'which',
-            'white', 'whitebg', 'wienrnd', 'wilcoxon_test', 'wilkinson', 'winter',
-            'xlabel', 'xlim', 'xor', 'ylabel', 'ylim', 'yulewalker', 'z_test',
-            'z_test_2', 'zip', 'zlabel', 'zlim', 'zscore', 'airy', 'arrayfun',
-            'besselh', 'besseli', 'besselk', 'bessely', 'bitpack', 'bitunpack',
-            'blkmm', 'cellindexmat', 'cellslices', 'chol2inv', 'choldelete',
-            'cholinsert', 'cholinv', 'cholshift', 'cholupdate', 'convn',
-            'csymamd', 'cummax', 'cummin', 'daspk_options', 'dasrt_options',
-            'dassl_options', 'endgrent', 'endpwent', 'etree', 'getgrgid',
-            'getgrnam', 'getpwnam', 'getpwuid', 'gmtime', 'gui_mode', 'ifft',
-            'ifft2', 'ifftn', 'ind2sub', 'inverse', 'localtime', 'lsode_options',
-            'luupdate', 'mat2cell', 'min', 'mktime', 'mouse_wheel_zoom',
-            'num2cell', 'num2hex', 'qrdelete', 'qrinsert', 'qrshift', 'qrupdate',
-            'quad_options', 'rande', 'randg', 'randn', 'randp', 'randperm',
-            'regexpi', 'regexprep', 'rsf2csf', 'setgrent', 'setpwent', 'sprank',
-            'strftime', 'strptime', 'strrep', 'svd_driver', 'symamd', 'triu',
-            'urlread'
-            ),
-        // Private builtin
-        7 => array(
-            '__accumarray_max__', '__accumarray_min__', '__accumarray_sum__',
-            '__accumdim_sum__', '__builtins__', '__calc_dimensions__',
-            '__current_scope__', '__display_tokens__', '__dump_symtab_info__',
-            '__end__', '__get__', '__go_axes__', '__go_axes_init__',
-            '__go_delete__', '__go_execute_callback__', '__go_figure__',
-            '__go_figure_handles__', '__go_handles__', '__go_hggroup__',
-            '__go_image__', '__go_line__', '__go_patch__', '__go_surface__',
-            '__go_text__', '__go_uicontextmenu__', '__go_uicontrol__',
-            '__go_uimenu__', '__go_uipanel__', '__go_uipushtool__',
-            '__go_uitoggletool__', '__go_uitoolbar__', '__gud_mode__',
-            '__image_pixel_size__', '__is_handle_visible__', '__isa_parent__',
-            '__keywords__', '__lexer_debug_flag__', '__list_functions__',
-            '__operators__', '__parent_classes__', '__parser_debug_flag__',
-            '__pathorig__', '__profiler_data__', '__profiler_enable__',
-            '__profiler_reset__', '__request_drawnow__', '__sort_rows_idx__',
-            '__token_count__', '__varval__', '__version_info__', '__which__'
-        ),
-        // Private Octave functions
-        8 => array(
-            '__all_opts__', '__contourc__', '__delaunayn__', '__dispatch__',
-            '__dsearchn__', '__finish__', '__fltk_uigetfile__',
-            '__glpk__', '__gnuplot_drawnow__', '__init_fltk__',
-            '__init_gnuplot__', '__lin_interpn__', '__magick_read__',
-            '__makeinfo__', '__pchip_deriv__', '__plt_get_axis_arg__', '__qp__',
-            '__voronoi__', '__fltk_maxtime__', '__fltk_redraw__', '__ftp__',
-            '__ftp_ascii__', '__ftp_binary__', '__ftp_close__', '__ftp_cwd__',
-            '__ftp_delete__', '__ftp_dir__', '__ftp_mget__', '__ftp_mkdir__',
-            '__ftp_mode__', '__ftp_mput__', '__ftp_pwd__', '__ftp_rename__',
-            '__ftp_rmdir__', '__magick_finfo__', '__magick_format_list__',
-            '__magick_write__'
-            ),
-        // Builtin Global Variables
-        9 => array(
-            'EDITOR', 'EXEC_PATH', 'F_DUPFD', 'F_GETFD', 'F_GETFL', 'F_SETFD',
-            'F_SETFL', 'IMAGE_PATH', 'OCTAVE_HOME',
-            'OCTAVE_VERSION', 'O_APPEND', 'O_ASYNC', 'O_CREAT', 'O_EXCL',
-            'O_NONBLOCK', 'O_RDONLY', 'O_RDWR', 'O_SYNC', 'O_TRUNC', 'O_WRONLY',
-            'PAGER', 'PAGER_FLAGS', 'PS1', 'PS2', 'PS4', 'SEEK_CUR', 'SEEK_END',
-            'SEEK_SET', 'SIG', 'S_ISBLK', 'S_ISCHR', 'S_ISDIR', 'S_ISFIFO',
-            'S_ISLNK', 'S_ISREG', 'S_ISSOCK', 'WCONTINUE', 'WCOREDUMP',
-            'WEXITSTATUS', 'WIFCONTINUED', 'WIFEXITED', 'WIFSIGNALED',
-            'WIFSTOPPED', 'WNOHANG', 'WSTOPSIG', 'WTERMSIG', 'WUNTRACED'
-            ),
-        // Constant functions
-        10 => array (
-            'e', 'eps', 'inf', 'Inf', 'nan', 'NaN', 'NA', 'pi', 'i', 'I', 'j',
-            'J', 'true', 'false'
-            ),
-        ),
-    'SYMBOLS' => array(
-        // Comparison & logical
-        0 => array(
-            '!', '!=', '&', '&&','|', '||', '~', '~=',
-            '<', '<=', '==', '>', '>='
-            ),
-        // Aritmethical
-        1 => array(
-            '*', '**', '+', '++', '-', '--', '/', "\\","'"
-            ),
-        // Elementwise arithmetical
-        2 => array(
-            '.*', '.**','./', '.^', '^',".\\",".'"
-            ),
-        // Arithmetical & assignation
-        3 => array(
-            '*=','+=','-=','/=','\=','**=','^=',
-            '.*=','.+=','.-=','./=','.\=','.**=','.^=','='
-            ),
-        // Indexer
-        4 => array(
-            ':'
-            ),
-        // Delimiters
-        5 => array(
-            ',', '...', ';'
-            ),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true,
-        10 => true,
-        ),
-    'URLS' => array(
-        1 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
-        6 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
-        7 => '',
-        8 => '',
-        9 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
-        10 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        ),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'STYLES' => array(
-        'COMMENTS' => array(
-            1 => 'color: #0000FF; font-style: italic;', // single quote strings
-            2 => 'color: #0000FF; font-style: italic;', // double quote strings
-            3 => 'color: #FF00FF; font-style: italic;', // single quote strings
-            4 => 'color: #FF00FF; font-style: italic;', // double quote strings
-            5 => 'color: #0000FF; font-style: italic;', // block comments
-            6 => 'color: #996600; font-weight:bold;',   // packaging system
-            7 => 'color: #006600; font-weight:bold;',   // function handles
-            'MULTI' => 'color: #0000FF; font-style: italic;',
-            ),
-        'KEYWORDS' => array(
-            1 => 'color: #2E8B57; font-weight:bold;',   // Data types
-            2 => 'color: #2E8B57;',                     // Storage type
-            3 => 'color: #0000FF; font-weight:bold;',   // Internal variable
-            4 => 'color: #990000; font-weight:bold;',   // Reserved words
-            5 => 'color: #008A8C; font-weight:bold;',   // Built-in
-            6 => 'color: #008A8C;',                     // Octave functions
-            9 => 'color: #000000; font-weight:bold;',   // Builtin Global Variables
-            10 => 'color: #008A8C; font-weight:bold;',  // Constant functions
-            ),
-        'ESCAPE_CHAR' => array(),
-        'BRACKETS' => array(
-            0 => 'color: #080;',
-            ),
-        'STRINGS' => array(
-            // strings were specified on the COMMENT_REGEXP section
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            ),
-        'METHODS' => array(),
-        'SYMBOLS' => array(
-            0 => 'color: #FF9696; font-weight:bold;',   // Comparison & logical
-            1 => 'color: #CC0000; font-weight:bold;',   // Aritmethical
-            2 => 'color: #993333; font-weight:bold;',   // Elementwise arithmetical
-            3 => 'color: #FF0000; font-weight:bold;',   // Arithmetical & assignation
-            4 => 'color: #33F;',                        // Indexer
-            5 => 'color: #33F;',                        // Delimiters
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array(),
-        )
-);
-
-?>
diff --git a/inc/geshi/oobas.php b/inc/geshi/oobas.php
deleted file mode 100644
index ff75af65f..000000000
--- a/inc/geshi/oobas.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*************************************************************************************
- * oobas.php
- * ---------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * OpenOffice.org Basic language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'OpenOffice.org Basic',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    //Single-Line comments using REM keyword
-    'COMMENT_REGEXP' => array(2 => '/\bREM.*?$/i'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'dim','private','public','global','as','if','redim','true','set','byval',
-            'false','bool','double','integer','long','object','single','variant',
-            'msgbox','print','inputbox','green','blue','red','qbcolor',
-            'rgb','open','close','reset','freefile','get','input','line',
-            'put','write','loc','seek','eof','lof','chdir','chdrive',
-            'curdir','dir','fileattr','filecopy','filedatetime','fileexists',
-            'filelen','getattr','kill','mkdir','name','rmdir','setattr',
-            'dateserial','datevalue','day','month','weekday','year','cdatetoiso',
-            'cdatefromiso','hour','minute','second','timeserial','timevalue',
-            'date','now','time','timer','erl','err','error','on','goto','resume',
-            'and','eqv','imp','not','or','xor','mod','atn','cos','sin','tan','log',
-            'exp','rnd','randomize','sqr','fix','int','abs','sgn','hex','oct',
-            'it','then','else','select','case','iif','do','loop','for','next','to',
-            'while','wend','gosub','return','call','choose','declare',
-            'end','exit','freelibrary','function','rem','stop','sub','switch','with',
-            'cbool','cdate','cdbl','cint','clng','const','csng','cstr','defbool',
-            'defdate','defdbl','defint','deflng','asc','chr','str','val','cbyte',
-            'space','string','format','lcase','left','lset','ltrim','mid','right',
-            'rset','rtrim','trim','ucase','split','join','converttourl','convertfromurl',
-            'instr','len','strcomp','beep','shell','wait','getsystemticks','environ',
-            'getsolarversion','getguitype','twipsperpixelx','twipsperpixely',
-            'createunostruct','createunoservice','getprocessservicemanager',
-            'createunodialog','createunolistener','createunovalue','thiscomponent',
-            'globalscope'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;',
-            2 => 'color: #808080;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/oorexx.php b/inc/geshi/oorexx.php
deleted file mode 100644
index 62c6cc463..000000000
--- a/inc/geshi/oorexx.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/*************************************************************************************
- * oorexx.php
- * ---------------------------------
- * Author: Jon Wolfers (sahananda@windhorse.biz)
- * Contributors:
- *    - Walter Pachl (pachl@chello.at)
- * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
- * Release Version: 1.0.8.11
- * Date Started: 2008/01/07
- *
- * ooRexx language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/07/29 (1.0.0)
- *    -  tried to get it syntactically right
- *
- * TODO (updated 2012/07/29)
- * -------------------------
- *   -  Get it working on rosettacode.org
- *
- *************************************************************************************
- *
- *      This file is part of GeSHi.
- *
- *    GeSHi is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    GeSHi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with GeSHi; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ooRexx',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'address', 'arg', 'attribute', 'call', 'constant', 'do',
-            'drop', 'exit', 'if',
-            'interpret', 'iterate', 'leave', 'loop', 'nop', 'numeric',
-            'parse', 'procedure', 'pull', 'push', 'queue',
-            'raise', 'reply', 'return', 'say', 'select', 'signal',
-            'use'
-            ),
-        2 => array(
-            'abstract', 'any', 'arguments', 'array', 'by',
-            'continue', 'digits', 'engineering', 'error',
-            'expose', 'external', 'failure', 'for', 'forever',
-            'forward', 'get', 'guard', 'guarded', 'halt',
-            'inherit', 'library', 'lostdigits', 'message',
-            'metaclass', 'mixinclass', 'name', 'nomethod', 'nostring',
-            'notready', 'novalue', 'off', 'on', 'options', 'over',
-            'private', 'protected', 'public', 'scientific', 'set',
-            'source', 'subclass', 'syntax', 'to', 'unguarded',
-            'unprotected', 'until', 'user',
-            'version', 'while', 'with'
-            ),
-        3 => array(
-            'else', 'end', 'otherwise', 'then', 'when'
-            ),
-        4 => array(
-            'rc', 'result', 'self', 'sigl', 'super'
-            ),
-        5 => array(
-            '::attribute', '::class', '::constant', '::method',
-            '::optins', '::requires', '::routine'
-            ),
-        6 => array(
-            'abbrev', 'abs', 'beep', 'bitand', 'bitor',
-            'bitxor', 'b2x', 'center', 'centre', 'changestr', 'charin',
-            'charout', 'chars', 'compare', 'condition', 'copies',
-            'countstr', 'c2d', 'c2x', 'datatype', 'date', 'delstr',
-            'delword', 'directory', 'd2c', 'd2x', 'endlocal',
-            'errortext', 'filespec', 'form', 'format', 'fuzz', 'insert',
-            'lastpos', 'left', 'length', 'linein', 'lineout', 'lines',
-            'lower', 'max', 'min', 'overlay', 'pos', 'qualify', 'queued',
-            'random', 'reverse', 'right', 'rxfuncadd', 'rxfuncdrop',
-            'rxfuncquery', 'rxqueue', 'setlocal', 'sign', 'sourceline',
-            'space', 'stream', 'strip', 'substr', 'subword', 'symbol',
-            'time', 'trace', 'translate', 'trunc', 'upper', 'userid',
-            'value', 'var', 'verify', 'word', 'wordindex', 'wordlength',
-            'wordpos', 'words', 'xrange', 'x2b', 'x2c', 'x2d'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '<', '>', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':',
-        '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #ff0000; font-weight: bold;',
-            3 => 'color: #00ff00; font-weight: bold;',
-            4 => 'color: #0000ff; font-weight: bold;',
-            5 => 'color: #880088; font-weight: bold;',
-            6 => 'color: #888800; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666;',
-            'MULTI' => 'color: #808080;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/oracle11.php b/inc/geshi/oracle11.php
deleted file mode 100644
index 16259e695..000000000
--- a/inc/geshi/oracle11.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<?php
-/*************************************************************************************
- * oracle11.php
- * -----------
- * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
- * Contributions:
- * - Updated for 11i by Simon Redhead
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * Oracle 11i language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/04/08 (1.0.8)
- *  -  SR changes to oracle8.php to support Oracle 11i reserved words.
- * 2005/01/29 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Oracle 11 SQL',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array("'", '"', '`'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
-//        6 => array(
-//            ),
-
-//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
-//        5 => array(
-//            ),
-
-//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
-//        4 => array(
-//            ),
-
-//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
-//        3 => array(
-//            ),
-
-        //Put ORACLE reserved keywords here (11i).  I like mine uppercase.
-        1 => array(
-            'ABS',
-            'ACCESS',
-            'ACOS',
-            'ADD',
-            'ADD_MONTHS',
-            'ALL',
-            'ALTER',
-            'ANALYZE',
-            'AND',
-            'ANY',
-            'APPENDCHILDXML',
-            'ARRAY',
-            'AS',
-            'ASC',
-            'ASCII',
-            'ASCIISTR',
-            'ASIN',
-            'ASSOCIATE',
-            'AT',
-            'ATAN',
-            'ATAN2',
-            'AUDIT',
-            'AUTHID',
-            'AVG',
-            'BEGIN',
-            'BETWEEN',
-            'BFILENAME',
-            'BIN_TO_NUM',
-            'BINARY_INTEGER',
-            'BITAND',
-            'BODY',
-            'BOOLEAN',
-            'BULK',
-            'BY',
-            'CALL',
-            'CARDINALITY',
-            'CASCADE',
-            'CASE',
-            'CAST',
-            'CEIL',
-            'CHAR',
-            'CHAR_BASE',
-            'CHARTOROWID',
-            'CHECK',
-            'CHR',
-            'CLOSE',
-            'CLUSTER',
-            'CLUSTER_ID',
-            'CLUSTER_PROBABILITY',
-            'CLUSTER_SET',
-            'COALESCE',
-            'COLLECT',
-            'COLUMN',
-            'COMMENT',
-            'COMMIT',
-            'COMPOSE',
-            'COMPRESS',
-            'CONCAT',
-            'CONNECT',
-            'CONSTANT',
-            'CONSTRAINT',
-            'CONSTRAINTS',
-            'CONTEXT',
-            'CONTROLFILE',
-            'CONVERT',
-            'CORR',
-            'CORR_K',
-            'CORR_S',
-            'COS',
-            'COSH',
-            'COST',
-            'COUNT',
-            'COVAR_POP',
-            'COVAR_SAMP',
-            'CREATE',
-            'CUBE_TABLE',
-            'CUME_DIST',
-            'CURRENT',
-            'CURRENT_DATE',
-            'CURRENT_TIMESTAMP',
-            'CURRVAL',
-            'CURSOR',
-            'CV',
-            'DATABASE',
-            'DATAOBJ_TO_PARTITION',
-            'DATE',
-            'DAY',
-            'DBTIMEZONE',
-            'DECIMAL',
-            'DECLARE',
-            'DECODE',
-            'DECOMPOSE',
-            'DEFAULT',
-            'DELETE',
-            'DELETEXML',
-            'DENSE_RANK',
-            'DEPTH',
-            'DEREF',
-            'DESC',
-            'DIMENSION',
-            'DIRECTORY',
-            'DISASSOCIATE',
-            'DISTINCT',
-            'DO',
-            'DROP',
-            'DUMP',
-            'ELSE',
-            'ELSIF',
-            'EMPTY_BLOB',
-            'EMPTY_CLOB',
-            'END',
-            'EXCEPTION',
-            'EXCLUSIVE',
-            'EXEC',
-            'EXECUTE',
-            'EXISTS',
-            'EXISTSNODE',
-            'EXIT',
-            'EXP',
-            'EXPLAIN',
-            'EXTENDS',
-            'EXTRACT',
-            'EXTRACTVALUE',
-            'FALSE',
-            'FEATURE_ID',
-            'FEATURE_SET',
-            'FEATURE_VALUE',
-            'FETCH',
-            'FILE',
-            'FIRST',
-            'FIRST_VALUE',
-            'FLOAT',
-            'FLOOR',
-            'FOR',
-            'FORALL',
-            'FROM',
-            'FROM_TZ',
-            'FUNCTION',
-            'GOTO',
-            'GRANT',
-            'GREATEST',
-            'GROUP',
-            'GROUP_ID',
-            'GROUPING',
-            'GROUPING_ID',
-            'HAVING',
-            'HEAP',
-            'HEXTORAW',
-            'HOUR',
-            'IDENTIFIED',
-            'IF',
-            'IMMEDIATE',
-            'IN',
-            'INCREMENT',
-            'INDEX',
-            'INDEXTYPE',
-            'INDICATOR',
-            'INITCAP',
-            'INITIAL',
-            'INSERT',
-            'INSERTCHILDXML',
-            'INSERTXMLBEFORE',
-            'INSTR',
-            'INSTRB',
-            'INTEGER',
-            'INTERFACE',
-            'INTERSECT',
-            'INTERVAL',
-            'INTO',
-            'IS',
-            'ISOLATION',
-            'ITERATION_NUMBER',
-            'JAVA',
-            'KEY',
-            'LAG',
-            'LAST',
-            'LAST_DAY',
-            'LAST_VALUE',
-            'LEAD',
-            'LEAST',
-            'LENGTH',
-            'LENGTHB',
-            'LEVEL',
-            'LIBRARY',
-            'LIKE',
-            'LIMITED',
-            'LINK',
-            'LN',
-            'LNNVL',
-            'LOCALTIMESTAMP',
-            'LOCK',
-            'LOG',
-            'LONG',
-            'LOOP',
-            'LOWER',
-            'LPAD',
-            'LTRIM',
-            'MAKE_REF',
-            'MATERIALIZED',
-            'MAX',
-            'MAXEXTENTS',
-            'MEDIAN',
-            'MIN',
-            'MINUS',
-            'MINUTE',
-            'MLSLABEL',
-            'MOD',
-            'MODE',
-            'MODIFY',
-            'MONTH',
-            'MONTHS_BETWEEN',
-            'NANVL',
-            'NATURAL',
-            'NATURALN',
-            'NCHR',
-            'NEW',
-            'NEW_TIME',
-            'NEXT_DAY',
-            'NEXTVAL',
-            'NLS_CHARSET_DECL_LEN',
-            'NLS_CHARSET_ID',
-            'NLS_CHARSET_NAME',
-            'NLS_INITCAP',
-            'NLS_LOWER',
-            'NLS_UPPER',
-            'NLSSORT',
-            'NOAUDIT',
-            'NOCOMPRESS',
-            'NOCOPY',
-            'NOT',
-            'NOWAIT',
-            'NTILE',
-            'NULL',
-            'NULLIF',
-            'NUMBER',
-            'NUMBER_BASE',
-            'NUMTODSINTERVAL',
-            'NUMTOYMINTERVAL',
-            'NVL',
-            'NVL2',
-            'OCIROWID',
-            'OF',
-            'OFFLINE',
-            'ON',
-            'ONLINE',
-            'OPAQUE',
-            'OPEN',
-            'OPERATOR',
-            'OPTION',
-            'OR',
-            'ORA_HASH',
-            'ORDER',
-            'ORGANIZATION',
-            'OTHERS',
-            'OUT',
-            'OUTLINE',
-            'PACKAGE',
-            'PARTITION',
-            'PATH',
-            'PCTFREE',
-            'PERCENT_RANK',
-            'PERCENTILE_CONT',
-            'PERCENTILE_DISC',
-            'PLAN',
-            'PLS_INTEGER',
-            'POSITIVE',
-            'POSITIVEN',
-            'POWER',
-            'POWERMULTISET',
-            'POWERMULTISET_BY_CARDINALITY',
-            'PRAGMA',
-            'PREDICTION',
-            'PREDICTION_BOUNDS',
-            'PREDICTION_COST',
-            'PREDICTION_DETAILS',
-            'PREDICTION_PROBABILITY',
-            'PREDICTION_SET',
-            'PRESENTNNV',
-            'PRESENTV',
-            'PREVIOUS',
-            'PRIMARY',
-            'PRIOR',
-            'PRIVATE',
-            'PRIVILEGES',
-            'PROCEDURE',
-            'PROFILE',
-            'PUBLIC',
-            'RAISE',
-            'RANGE',
-            'RANK',
-            'RATIO_TO_REPORT',
-            'RAW',
-            'RAWTOHEX',
-            'RAWTONHEX',
-            'REAL',
-            'RECORD',
-            'REF',
-            'REFTOHEX',
-            'REGEXP_COUNT',
-            'REGEXP_INSTR',
-            'REGEXP_REPLACE',
-            'REGEXP_SUBSTR',
-            'REGR_AVGX',
-            'REGR_AVGY',
-            'REGR_COUNT',
-            'REGR_INTERCEPT',
-            'REGR_R2',
-            'REGR_SLOPE',
-            'REGR_SXX',
-            'REGR_SXY',
-            'REGR_SYY',
-            'RELEASE',
-            'REMAINDER',
-            'RENAME',
-            'REPLACE',
-            'RESOURCE',
-            'RETURN',
-            'RETURNING',
-            'REVERSE',
-            'REVOKE',
-            'ROLE',
-            'ROLLBACK',
-            'ROUND',
-            'ROW',
-            'ROW_NUMBER',
-            'ROWID',
-            'ROWIDTOCHAR',
-            'ROWIDTONCHAR',
-            'ROWNUM',
-            'ROWS',
-            'ROWTYPE',
-            'RPAD',
-            'RTRIM',
-            'SAVEPOINT',
-            'SCHEMA',
-            'SCN_TO_TIMESTAMP',
-            'SECOND',
-            'SEGMENT',
-            'SELECT',
-            'SEPERATE',
-            'SEQUENCE',
-            'SESSION',
-            'SESSIONTIMEZONE',
-            'SET',
-            'SHARE',
-            'SIGN',
-            'SIN',
-            'SINH',
-            'SIZE',
-            'SMALLINT',
-            'SOUNDEX',
-            'SPACE',
-            'SQL',
-            'SQLCODE',
-            'SQLERRM',
-            'SQRT',
-            'START',
-            'STATISTICS',
-            'STATS_BINOMIAL_TEST',
-            'STATS_CROSSTAB',
-            'STATS_F_TEST',
-            'STATS_KS_TEST',
-            'STATS_MODE',
-            'STATS_MW_TEST',
-            'STATS_ONE_WAY_ANOVA',
-            'STATS_T_TEST_INDEP',
-            'STATS_T_TEST_INDEPU',
-            'STATS_T_TEST_ONE',
-            'STATS_T_TEST_PAIRED',
-            'STATS_WSR_TEST',
-            'STDDEV',
-            'STDDEV_POP',
-            'STDDEV_SAMP',
-            'STOP',
-            'SUBSTR',
-            'SUBSTRB',
-            'SUBTYPE',
-            'SUCCESSFUL',
-            'SUM',
-            'SYNONYM',
-            'SYS_CONNECT_BY_PATH',
-            'SYS_CONTEXT',
-            'SYS_DBURIGEN',
-            'SYS_EXTRACT_UTC',
-            'SYS_GUID',
-            'SYS_TYPEID',
-            'SYS_XMLAGG',
-            'SYS_XMLGEN',
-            'SYSDATE',
-            'SYSTEM',
-            'SYSTIMESTAMP',
-            'TABLE',
-            'TABLESPACE',
-            'TAN',
-            'TANH',
-            'TEMPORARY',
-            'THEN',
-            'TIME',
-            'TIMESTAMP',
-            'TIMESTAMP_TO_SCN',
-            'TIMEZONE_ABBR',
-            'TIMEZONE_HOUR',
-            'TIMEZONE_MINUTE',
-            'TIMEZONE_REGION',
-            'TIMING',
-            'TO',
-            'TO_BINARY_DOUBLE',
-            'TO_BINARY_FLOAT',
-            'TO_CHAR',
-            'TO_CLOB',
-            'TO_DATE',
-            'TO_DSINTERVAL',
-            'TO_LOB',
-            'TO_MULTI_BYTE',
-            'TO_NCHAR',
-            'TO_NCLOB',
-            'TO_NUMBER',
-            'TO_SINGLE_BYTE',
-            'TO_TIMESTAMP',
-            'TO_TIMESTAMP_TZ',
-            'TO_YMINTERVAL',
-            'TRANSACTION',
-            'TRANSLATE',
-            'TREAT',
-            'TRIGGER',
-            'TRIM',
-            'TRUE',
-            'TRUNC',
-            'TRUNCATE',
-            'TYPE',
-            'TZ_OFFSET',
-            'UI',
-            'UID',
-            'UNION',
-            'UNIQUE',
-            'UNISTR',
-            'UPDATE',
-            'UPDATEXML',
-            'UPPER',
-            'USE',
-            'USER',
-            'USERENV',
-            'USING',
-            'VALIDATE',
-            'VALUE',
-            'VALUES',
-            'VAR_POP',
-            'VAR_SAMP',
-            'VARCHAR',
-            'VARCHAR2',
-            'VARIANCE',
-            'VIEW',
-            'VSIZE',
-            'WHEN',
-            'WHENEVER',
-            'WHERE',
-            'WHILE',
-            'WIDTH_BUCKET',
-            'WITH',
-            'WORK',
-            'WRITE',
-            'XMLAGG',
-            'XMLCAST',
-            'XMLCDATA',
-            'XMLCOLATTVAL',
-            'XMLCOMMENT',
-            'XMLCONCAT',
-            'XMLDIFF',
-            'XMLELEMENT',
-            'XMLEXISTS',
-            'XMLFOREST',
-            'XMLPARSE',
-            'XMLPATCH',
-            'XMLPI',
-            'XMLQUERY',
-            'XMLROOT',
-            'XMLSEQUENCE',
-            'XMLSERIALIZE',
-            'XMLTABLE',
-            'XMLTRANSFORM',
-            'YEAR',
-            'ZONE'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '=', '<', '>', '|', '+', '-', '*', '/', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-//        3 => false,
-//        4 => false,
-//        5 => false,
-//        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #ff0000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-//        3 => '',
-//        4 => '',
-//        5 => '',
-//        6 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/oracle8.php b/inc/geshi/oracle8.php
deleted file mode 100644
index 145bda407..000000000
--- a/inc/geshi/oracle8.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-/*************************************************************************************
- * oracle8.php
- * -----------
- * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * Oracle 8 language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/01/29 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Oracle 8 SQL',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array("'", '"', '`'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
-//        6 => array(
-//            ),
-
-//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
-//        5 => array(
-//            ),
-
-//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
-//        4 => array(
-//            ),
-
-//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
-//        3 => array(
-//            ),
-
-//Put ORACLE reserved keywords here (8.1.7).  I like mine uppercase.
-        1 => array(
-            'ABS',
-            'ACCESS',
-            'ACOS',
-            'ADD',
-            'ADD_MONTHS',
-            'ALL',
-            'ALTER',
-            'ANALYZE',
-            'AND',
-            'ANY',
-            'ARRAY',
-            'AS',
-            'ASC',
-            'ASCII',
-            'ASIN',
-            'ASSOCIATE',
-            'AT',
-            'ATAN',
-            'ATAN2',
-            'AUDIT',
-            'AUTHID',
-            'AVG',
-            'BEGIN',
-            'BETWEEN',
-            'BFILENAME',
-            'BINARY_INTEGER',
-            'BITAND',
-            'BODY',
-            'BOOLEAN',
-            'BULK',
-            'BY',
-            'CALL',
-            'CASCADE',
-            'CASE',
-            'CEIL',
-            'CHAR',
-            'CHAR_BASE',
-            'CHARTOROWID',
-            'CHECK',
-            'CHR',
-            'CLOSE',
-            'CLUSTER',
-            'COALESCE',
-            'COLLECT',
-            'COLUMN',
-            'COMMENT',
-            'COMMIT',
-            'COMPRESS',
-            'CONCAT',
-            'CONNECT',
-            'CONSTANT',
-            'CONSTRAINT',
-            'CONSTRAINTS',
-            'CONTEXT',
-            'CONTROLFILE',
-            'CONVERT',
-            'CORR',
-            'COS',
-            'COSH',
-            'COST',
-            'COUNT',
-            'COVAR_POP',
-            'COVAR_SAMP',
-            'CREATE',
-            'CUME_DIST',
-            'CURRENT',
-            'CURRVAL',
-            'CURSOR',
-            'DATABASE',
-            'DATE',
-            'DAY',
-            'DECIMAL',
-            'DECLARE',
-            'DECODE',
-            'DEFAULT',
-            'DELETE',
-            'DENSE_RANK',
-            'DEREF',
-            'DESC',
-            'DIMENSION',
-            'DIRECTORY',
-            'DISASSOCIATE',
-            'DISTINCT',
-            'DO',
-            'DROP',
-            'DUMP',
-            'ELSE',
-            'ELSIF',
-            'EMPTY_BLOB',
-            'EMPTY_CLOB',
-            'END',
-            'EXCEPTION',
-            'EXCLUSIVE',
-            'EXEC',
-            'EXECUTE',
-            'EXISTS',
-            'EXIT',
-            'EXP',
-            'EXPLAIN',
-            'EXTENDS',
-            'EXTRACT',
-            'FALSE',
-            'FETCH',
-            'FILE',
-            'FIRST_VALUE',
-            'FLOAT',
-            'FLOOR',
-            'FOR',
-            'FORALL',
-            'FROM',
-            'FUNCTION',
-            'GOTO',
-            'GRANT',
-            'GREATEST',
-            'GROUP',
-            'GROUPING',
-            'HAVING',
-            'HEAP',
-            'HEXTORAW',
-            'HOUR',
-            'IDENTIFIED',
-            'IF',
-            'IMMEDIATE',
-            'IN',
-            'INCREMENT',
-            'INDEX',
-            'INDEXTYPE',
-            'INDICATOR',
-            'INITCAP',
-            'INITIAL',
-            'INSERT',
-            'INSTR',
-            'INSTRB',
-            'INTEGER',
-            'INTERFACE',
-            'INTERSECT',
-            'INTERVAL',
-            'INTO',
-            'IS',
-            'ISOLATION',
-            'JAVA',
-            'KEY',
-            'LAG',
-            'LAST_DAY',
-            'LAST_VALUE',
-            'LEAD',
-            'LEAST',
-            'LENGTH',
-            'LENGTHB',
-            'LEVEL',
-            'LIBRARY',
-            'LIKE',
-            'LIMITED',
-            'LINK',
-            'LN',
-            'LOCK',
-            'LOG',
-            'LONG',
-            'LOOP',
-            'LOWER',
-            'LPAD',
-            'LTRIM',
-            'MAKE_REF',
-            'MATERIALIZED',
-            'MAX',
-            'MAXEXTENTS',
-            'MIN',
-            'MINUS',
-            'MINUTE',
-            'MLSLABEL',
-            'MOD',
-            'MODE',
-            'MODIFY',
-            'MONTH',
-            'MONTHS_BETWEEN',
-            'NATURAL',
-            'NATURALN',
-            'NEW',
-            'NEW_TIME',
-            'NEXT_DAY',
-            'NEXTVAL',
-            'NLS_CHARSET_DECL_LEN',
-            'NLS_CHARSET_ID',
-            'NLS_CHARSET_NAME',
-            'NLS_INITCAP',
-            'NLS_LOWER',
-            'NLS_UPPER',
-            'NLSSORT',
-            'NOAUDIT',
-            'NOCOMPRESS',
-            'NOCOPY',
-            'NOT',
-            'NOWAIT',
-            'NTILE',
-            'NULL',
-            'NULLIF',
-            'NUMBER',
-            'NUMBER_BASE',
-            'NUMTODSINTERVAL',
-            'NUMTOYMINTERVAL',
-            'NVL',
-            'NVL2',
-            'OCIROWID',
-            'OF',
-            'OFFLINE',
-            'ON',
-            'ONLINE',
-            'OPAQUE',
-            'OPEN',
-            'OPERATOR',
-            'OPTION',
-            'OR',
-            'ORDER',
-            'ORGANIZATION',
-            'OTHERS',
-            'OUT',
-            'OUTLINE',
-            'PACKAGE',
-            'PARTITION',
-            'PCTFREE',
-            'PERCENT_RANK',
-            'PLAN',
-            'PLS_INTEGER',
-            'POSITIVE',
-            'POSITIVEN',
-            'POWER',
-            'PRAGMA',
-            'PRIMARY',
-            'PRIOR',
-            'PRIVATE',
-            'PRIVILEGES',
-            'PROCEDURE',
-            'PROFILE',
-            'PUBLIC',
-            'RAISE',
-            'RANGE',
-            'RANK',
-            'RATIO_TO_REPORT',
-            'RAW',
-            'RAWTOHEX',
-            'REAL',
-            'RECORD',
-            'REF',
-            'REFTOHEX',
-            'REGR_AVGX',
-            'REGR_AVGY',
-            'REGR_COUNT',
-            'REGR_INTERCEPT',
-            'REGR_R2',
-            'REGR_SLOPE',
-            'REGR_SXX',
-            'REGR_SXY',
-            'REGR_SYY',
-            'RELEASE',
-            'RENAME',
-            'REPLACE',
-            'RESOURCE',
-            'RETURN',
-            'RETURNING',
-            'REVERSE',
-            'REVOKE',
-            'ROLE',
-            'ROLLBACK',
-            'ROUND',
-            'ROW',
-            'ROW_NUMBER',
-            'ROWID',
-            'ROWIDTOCHAR',
-            'ROWNUM',
-            'ROWS',
-            'ROWTYPE',
-            'RPAD',
-            'RTRIM',
-            'SAVEPOINT',
-            'SCHEMA',
-            'SECOND',
-            'SEGMENT',
-            'SELECT',
-            'SEPERATE',
-            'SEQUENCE',
-            'SESSION',
-            'SET',
-            'SHARE',
-            'SIGN',
-            'SIN',
-            'SINH',
-            'SIZE',
-            'SMALLINT',
-            'SOUNDEX',
-            'SPACE',
-            'SQL',
-            'SQLCODE',
-            'SQLERRM',
-            'SQRT',
-            'START',
-            'STATISTICS',
-            'STDDEV',
-            'STDDEV_POP',
-            'STDDEV_SAMP',
-            'STOP',
-            'SUBSTR',
-            'SUBSTRB',
-            'SUBTYPE',
-            'SUCCESSFUL',
-            'SUM',
-            'SYNONYM',
-            'SYS_CONTEXT',
-            'SYS_GUID',
-            'SYSDATE',
-            'SYSTEM',
-            'TABLE',
-            'TABLESPACE',
-            'TAN',
-            'TANH',
-            'TEMPORARY',
-            'THEN',
-            'TIME',
-            'TIMESTAMP',
-            'TIMEZONE_ABBR',
-            'TIMEZONE_HOUR',
-            'TIMEZONE_MINUTE',
-            'TIMEZONE_REGION',
-            'TIMING',
-            'TO',
-            'TO_CHAR',
-            'TO_DATE',
-            'TO_LOB',
-            'TO_MULTI_BYTE',
-            'TO_NUMBER',
-            'TO_SINGLE_BYTE',
-            'TRANSACTION',
-            'TRANSLATE',
-            'TRIGGER',
-            'TRIM',
-            'TRUE',
-            'TRUNC',
-            'TRUNCATE',
-            'TYPE',
-            'UI',
-            'UID',
-            'UNION',
-            'UNIQUE',
-            'UPDATE',
-            'UPPER',
-            'USE',
-            'USER',
-            'USERENV',
-            'USING',
-            'VALIDATE',
-            'VALUE',
-            'VALUES',
-            'VAR_POP',
-            'VAR_SAMP',
-            'VARCHAR',
-            'VARCHAR2',
-            'VARIANCE',
-            'VIEW',
-            'VSIZE',
-            'WHEN',
-            'WHENEVER',
-            'WHERE',
-            'WHILE',
-            'WITH',
-            'WORK',
-            'WRITE',
-            'YEAR',
-            'ZONE'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '=', '<', '>', '|', '+', '-', '*', '/', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-//        3 => false,
-//        4 => false,
-//        5 => false,
-//        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
-//Add the styles for groups 3-6 here when used
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #ff0000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-//        3 => '',
-//        4 => '',
-//        5 => '',
-//        6 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/oxygene.php b/inc/geshi/oxygene.php
deleted file mode 100644
index bc2ee6563..000000000
--- a/inc/geshi/oxygene.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/*************************************************************************************
- * oxygene.php
- * ----------
- * Author: Carlo Kok (ck@remobjects.com), J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
- * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2010/01/11
- *
- * Delphi Prism (Oxygene) language file for GeSHi.
- * Based on the original Delphi language file.
- *
- * CHANGES
- * -------
- * 2012/06/28 (1.0.8.11)
- *   -  Added "write" keyword for properties
- * 2010/01/11 (1.0.0)
- *   -  First Release
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Oxygene (Delphi Prism)',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
-    //Compiler directives
-    'COMMENT_REGEXP' => array(2 => '/{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
-    'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array("'"),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'and',   'begin', 'case', 'const',  'div', 'do', 'downto', 'else',
-            'end',  'for',  'function', 'if', 'in', 'mod', 'not', 'of', 'or',
-            'procedure', 'repeat', 'record', 'set', 'shl', 'shr', 'then', 'to',
-            'type', 'until', 'uses', 'var','while', 'with', 'xor', 'exit', 'break',
-            'class', 'constructor', 'inherited', 'private', 'public', 'protected',
-            'property', 'As', 'Is', 'Unit', 'Continue', 'Try', 'Except', 'Forward',
-            'Interface','Implementation', 'nil', 'out', 'loop', 'namespace', 'true',
-            'false', 'new', 'ensure', 'require', 'on', 'event', 'delegate', 'method',
-            'raise', 'assembly', 'module', 'using','locking', 'old', 'invariants', 'operator',
-            'self', 'async', 'finalizer', 'where', 'yield', 'nullable', 'Future',
-            'From',  'Finally', 'dynamic'
-            ),
-        2 => array(
-            'override', 'virtual', 'External', 'read', 'add', 'remove','final', 'abstract',
-            'empty', 'global', 'locked', 'sealed', 'reintroduce', 'implements', 'each',
-            'default', 'partial', 'finalize', 'enum', 'flags', 'result', 'readonly', 'unsafe',
-            'pinned', 'matching', 'static', 'has', 'step', 'iterator', 'inline', 'nested',
-            'Implies', 'Select', 'Order', 'By', 'Desc', 'Asc', 'Group', 'Join', 'Take',
-            'Skip', 'Concat', 'Union', 'Reverse', 'Distinct', 'Into', 'Equals', 'params',
-            'sequence', 'index', 'notify', 'Parallel', 'create', 'array', 'Queryable', 'Aspect',
-            'volatile', 'write'
-            ),
-        3 => array(
-            'chr', 'ord', 'inc', 'dec', 'assert', 'iff', 'assigned','futureAssigned', 'length', 'low', 'high', 'typeOf', 'sizeOf', 'disposeAndNil', 'Coalesce', 'unquote'
-            ),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-//        4 => false,
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '[', ']'),
-        1 => array('.', ',', ':', ';'),
-        2 => array('@', '^'),
-        3 => array('=', '+', '-', '*', '/')
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-//            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #008000; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #ff0000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000066;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #9ac;',
-            1 => 'color: #ff0000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;',
-            1 => 'color: #000066;',
-            2 => 'color: #000066;',
-            3 => 'color: #000066;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-//        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-        0 => '\$[0-9a-fA-F]+',
-        //Characters
-        1 => '\#\$?[0-9]{1,3}'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 2
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/oz.php b/inc/geshi/oz.php
deleted file mode 100644
index d24561bf0..000000000
--- a/inc/geshi/oz.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/*************************************************************************************
- * oz.php
- * --------
- * Author: Wolfgang Meyer (Wolfgang.Meyer@gmx.net)
- * Copyright: (c) 2010 Wolfgang Meyer
- * Release Version: 1.0.8.11
- * Date Started: 2010/01/03
- *
- * Oz language file for GeSHi.
- *
- * CHANGES
- * -------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'OZ',
-    'COMMENT_SINGLE' => array(1 => '%'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"','\''),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => array(),
-    'KEYWORDS' => array(
-        1 => array(
-            'declare','local','in','end','proc','fun','functor','require','prepare',
-            'import','export','define','at','case','then','else','of','elseof',
-            'elsecase','if','elseif','class','from','prop','attr','feat','meth',
-            'self','true','false','unit','div','mod','andthen','orelse','cond','or',
-            'dis','choice','not','thread','try','catch','finally','raise','lock',
-            'skip','fail','for','do'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true
-        ),
-    'SYMBOLS' => array(
-        '@', '!', '|', '<-', ':=', '<', '>', '=<', '>=', '<=', '#', '~', '.',
-        '*', '-', '+', '/', '<:', '>:', '=:', '=<:', '>=:', '\\=', '\\=:', ',',
-        '!!', '...', '==', '::', ':::'
-        ),
-    'STYLES' => array(
-        'REGEXPS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #00a030;',
-            3 => 'color: #bc8f8f;',
-            4 => 'color: #0000ff;',
-            5 => 'color: #a020f0;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #bc8f8f;'
-            ),
-        'KEYWORDS' => array(
-            1 => 'color: #a020f0;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #B22222;',
-            'MULTI' => 'color: #B22222;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #bc8f8f;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #a020f0;'
-            ),
-        'BRACKETS' => array(),
-        'NUMBERS' => array(),
-        'METHODS' => array(),
-        'SCRIPT' => array()
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'URLS' => array(
-        1 => ''
-        ),
-    'REGEXPS' => array(
-        // function and procedure definition
-        1 => array(
-            GESHI_SEARCH => "(proc|fun)([^{}\n\)]*)(\\{)([\$A-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9_.]*)",
-            GESHI_REPLACE => '\4',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1\2\3',
-            GESHI_AFTER => ''
-            ),
-        // class definition
-        2 => array(
-            GESHI_SEARCH => "(class)([^A-Z\$]*)([\$A-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9_.]*)",
-            GESHI_REPLACE => '\3\4',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1\2',
-            GESHI_AFTER => ''
-            ),
-        // single character
-        3 => array(
-            GESHI_SEARCH => "&amp;.",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // method definition
-        4 => array(
-            GESHI_SEARCH => "(meth)([^a-zA-Z]+)([a-zA-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9]*)",
-            GESHI_REPLACE => '\3',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1\2',
-            GESHI_AFTER => ''
-            ),
-        // highlight "[]"
-        // ([] is actually a keyword, but that causes problems in validation; putting it into symbols doesn't work.)
-        5 => array(
-            GESHI_SEARCH => "\[\]",
-            GESHI_REPLACE => '\0',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/parasail.php b/inc/geshi/parasail.php
deleted file mode 100644
index 864eba1e9..000000000
--- a/inc/geshi/parasail.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/*************************************************************************************
- * parasail.php
- * -------
- * Author: T. Taft (taft@adacore.com)
- * Copyright: (c) 2012 AdaCore (http://adacore.com/)
- * Release Version: 1.0.8.11
- * Date Started: 2012/08/02
- *
- * ParaSail language file for GeSHi.
- *
- * Words are from SciTe configuration file
- *
- * CHANGES
- * -------
- * 2012/08/02 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2012/08/02)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ParaSail',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('{' => '}'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'all', 'block', 'case', 'continue', 'each',
-            'else', 'elsif', 'exit', 'for',
-            'forward', 'if', 'loop', 'return', 'reverse', 'some',
-            'then', 'until', 'while', 'with'
-            ),
-        2 => array(
-            'abs', 'and','in', 'mod', 'not', 'null', 'or', 'rem', 'xor'
-            ),
-        3 => array(
-            'abstract', 'class',
-            'concurrent', 'const', 
-            'end', 'extends', 'exports', 
-            'func', 'global', 'implements', 'import',
-            'interface', 'is', 'lambda', 'locked', 
-            'new', 'of', 'op', 'optional',
-            'private', 'queued', 'ref',
-            'separate', 'type', 'var',
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #46aa03; font-weight:bold;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/parigp.php b/inc/geshi/parigp.php
deleted file mode 100644
index c9c73095b..000000000
--- a/inc/geshi/parigp.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/*************************************************************************************
- * parigp.php
- * --------
- * Author: Charles R Greathouse IV (charles@crg4.com)
- * Copyright: 2011 Charles R Greathouse IV (http://math.crg4.com/)
- * Release Version: 1.0.8.11
- * Date Started: 2011/05/11
- *
- * PARI/GP language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2011/07/09 (1.0.8.11)
- *  -  First Release
- *
- * TODO (updated 2011/07/09)
- * -------------------------
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'PARI/GP',
-    'COMMENT_SINGLE' => array(1 => '\\\\'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => array(
-        # Integers
-        1 => GESHI_NUMBER_INT_BASIC,
-        # Reals
-        2 => GESHI_NUMBER_FLT_SCI_ZERO
-        ),
-    'KEYWORDS' => array(
-        1 => array(
-            'addprimes','bestappr','bezout','bezoutres','bigomega','binomial',
-            'chinese','content','contfrac','contfracpnqn','core','coredisc',
-            'dirdiv','direuler','dirmul','divisors','eulerphi','factor',
-            'factorback','factorcantor','factorff','factorial','factorint',
-            'factormod','ffgen','ffinit','fflog','fforder','ffprimroot',
-            'fibonacci','gcd','hilbert','isfundamental','ispower','isprime',
-            'ispseudoprime','issquare','issquarefree','kronecker','lcm',
-            'moebius','nextprime','numbpart','numdiv','omega','partitions',
-            'polrootsff','precprime','prime','primepi','primes','qfbclassno',
-            'qfbcompraw','qfbhclassno','qfbnucomp','qfbnupow','qfbpowraw',
-            'qfbprimeform','qfbred','qfbsolve','quadclassunit','quaddisc',
-            'quadgen','quadhilbert','quadpoly','quadray','quadregulator',
-            'quadunit','removeprimes','sigma','sqrtint','stirling',
-            'sumdedekind','zncoppersmith','znlog','znorder','znprimroot',
-            'znstar','Col','List','Mat','Mod','Pol','Polrev','Qfb','Ser','Set',
-            'Str','Strchr','Strexpand','Strtex','Vec','Vecrev','Vecsmall',
-            'binary','bitand','bitneg','bitnegimply','bitor','bittest','bitxor',
-            'ceil','centerlift','component','conj','conjvec','denominator',
-            'floor','frac','imag','length','lift','norm','norml2','numerator',
-            'numtoperm','padicprec','permtonum','precision','random','real',
-            'round','simplify','sizebyte','sizedigit','truncate','valuation',
-            'variable','ellL1','elladd','ellak','ellan','ellanalyticrank',
-            'ellap','ellbil','ellchangecurve','ellchangepoint','ellconvertname',
-            'elldivpol','elleisnum','elleta','ellgenerators','ellglobalred',
-            'ellgroup','ellheight','ellheightmatrix','ellidentify','ellinit',
-            'ellisoncurve','ellj','elllocalred','elllog','elllseries',
-            'ellminimalmodel','ellmodulareqn','ellorder','ellordinate',
-            'ellpointtoz','ellpow','ellrootno','ellsearch','ellsigma','ellsub',
-            'elltaniyama','elltatepairing','elltors','ellweilpairing','ellwp',
-            'ellzeta','ellztopoint','bnfcertify','bnfcompress',
-            'bnfdecodemodule','bnfinit','bnfisintnorm','bnfisnorm',
-            'bnfisprincipal','bnfissunit','bnfisunit','bnfnarrow','bnfsignunit',
-            'bnfsunit','bnrL1','bnrclassno','bnrclassnolist','bnrconductor',
-            'bnrconductorofchar','bnrdisc','bnrdisclist','bnrinit',
-            'bnrisconductor','bnrisprincipal','bnrrootnumber','bnrstark',
-            'dirzetak','factornf','galoisexport','galoisfixedfield',
-            'galoisgetpol','galoisidentify','galoisinit','galoisisabelian',
-            'galoisisnormal','galoispermtopol','galoissubcyclo',
-            'galoissubfields','galoissubgroups','idealadd','idealaddtoone',
-            'idealappr','idealchinese','idealcoprime','idealdiv','idealfactor',
-            'idealfactorback','idealfrobenius','idealhnf','idealintersect',
-            'idealinv','ideallist','ideallistarch','ideallog','idealmin',
-            'idealmul','idealnorm','idealpow','idealprimedec','idealramgroups',
-            'idealred','idealstar','idealtwoelt','idealval','matalgtobasis',
-            'matbasistoalg','modreverse','newtonpoly','nfalgtobasis','nfbasis',
-            'nfbasistoalg','nfdetint','nfdisc','nfeltadd','nfeltdiv',
-            'nfeltdiveuc','nfeltdivmodpr','nfeltdivrem','nfeltmod','nfeltmul',
-            'nfeltmulmodpr','nfeltnorm','nfeltpow','nfeltpowmodpr',
-            'nfeltreduce','nfeltreducemodpr','nfelttrace','nfeltval','nffactor',
-            'nffactorback','nffactormod','nfgaloisapply','nfgaloisconj',
-            'nfhilbert','nfhnf','nfhnfmod','nfinit','nfisideal','nfisincl',
-            'nfisisom','nfkermodpr','nfmodprinit','nfnewprec','nfroots',
-            'nfrootsof1','nfsnf','nfsolvemodpr','nfsubfields','polcompositum',
-            'polgalois','polred','polredabs','polredord','poltschirnhaus',
-            'rnfalgtobasis','rnfbasis','rnfbasistoalg','rnfcharpoly',
-            'rnfconductor','rnfdedekind','rnfdet','rnfdisc','rnfeltabstorel',
-            'rnfeltdown','rnfeltreltoabs','rnfeltup','rnfequation',
-            'rnfhnfbasis','rnfidealabstorel','rnfidealdown','rnfidealhnf',
-            'rnfidealmul','rnfidealnormabs','rnfidealnormrel',
-            'rnfidealreltoabs','rnfidealtwoelt','rnfidealup','rnfinit',
-            'rnfisabelian','rnfisfree','rnfisnorm','rnfisnorminit','rnfkummer',
-            'rnflllgram','rnfnormgroup','rnfpolred','rnfpolredabs',
-            'rnfpseudobasis','rnfsteinitz','subgrouplist','zetak','zetakinit',
-            'plot','plotbox','plotclip','plotcolor','plotcopy','plotcursor',
-            'plotdraw','ploth','plothraw','plothsizes','plotinit','plotkill',
-            'plotlines','plotlinetype','plotmove','plotpoints','plotpointsize',
-            'plotpointtype','plotrbox','plotrecth','plotrecthraw','plotrline',
-            'plotrmove','plotrpoint','plotscale','plotstring','psdraw',
-            'psploth','psplothraw','O','deriv','diffop','eval','factorpadic',
-            'intformal','padicappr','padicfields','polchebyshev','polcoeff',
-            'polcyclo','poldegree','poldisc','poldiscreduced','polhensellift',
-            'polhermite','polinterpolate','polisirreducible','pollead',
-            'pollegendre','polrecip','polresultant','polroots','polrootsmod',
-            'polrootspadic','polsturm','polsubcyclo','polsylvestermatrix',
-            'polsym','poltchebi','polzagier','serconvol','serlaplace',
-            'serreverse','subst','substpol','substvec','taylor','thue',
-            'thueinit','break','for','fordiv','forell','forprime','forstep',
-            'forsubgroup','forvec','if','next','return','until','while',
-            'Strprintf','addhelp','alarm','alias','allocatemem','apply',
-            'default','error','extern','externstr','getheap','getrand',
-            'getstack','gettime','global','input','install','kill','print1',
-            'print','printf','printtex','quit','read','readvec','select',
-            'setrand','system','trap','type','version','warning','whatnow',
-            'write1','write','writebin','writetex','divrem','lex','max','min',
-            'shift','shiftmul','sign','vecmax','vecmin','derivnum','intcirc',
-            'intfouriercos','intfourierexp','intfouriersin','intfuncinit',
-            'intlaplaceinv','intmellininv','intmellininvshort','intnum',
-            'intnuminit','intnuminitgen','intnumromb','intnumstep','prod',
-            'prodeuler','prodinf','solve','sum','sumalt','sumdiv','suminf',
-            'sumnum','sumnumalt','sumnuminit','sumpos','Euler','I','Pi','abs',
-            'acos','acosh','agm','arg','asin','asinh','atan','atanh','bernfrac',
-            'bernreal','bernvec','besselh1','besselh2','besseli','besselj',
-            'besseljh','besselk','besseln','cos','cosh','cotan','dilog','eint1',
-            'erfc','eta','exp','gamma','gammah','hyperu','incgam','incgamc',
-            'lngamma','log','polylog','psi','sin','sinh','sqr','sqrt','sqrtn',
-            'tan','tanh','teichmuller','theta','thetanullk','weber','zeta',
-            'algdep','charpoly','concat','lindep','listcreate','listinsert',
-            'listkill','listpop','listput','listsort','matadjoint',
-            'matcompanion','matdet','matdetint','matdiagonal','mateigen',
-            'matfrobenius','mathess','mathilbert','mathnf','mathnfmod',
-            'mathnfmodid','matid','matimage','matimagecompl','matindexrank',
-            'matintersect','matinverseimage','matisdiagonal','matker',
-            'matkerint','matmuldiagonal','matmultodiagonal','matpascal',
-            'matrank','matrix','matrixqz','matsize','matsnf','matsolve',
-            'matsolvemod','matsupplement','mattranspose','minpoly','qfgaussred',
-            'qfjacobi','qflll','qflllgram','qfminim','qfperfection','qfrep',
-            'qfsign','setintersect','setisset','setminus','setsearch','cmp',
-            'setunion','trace','vecextract','vecsort','vector','vectorsmall',
-            'vectorv','ellheegner'
-            ),
-
-        2 => array(
-            'void','bool','negbool','small','int',/*'real',*/'mp','var','lg','pol',
-            'vecsmall','vec','list','str','genstr','gen','typ'
-            ),
-
-        3 => array(
-            'TeXstyle','breakloop','colors','compatible','datadir','debug',
-            'debugfiles','debugmem','echo','factor_add_primes','factor_proven',
-            'format','graphcolormap','graphcolors','help','histfile','histsize',
-            'lines','linewrap',/*'log',*/'logfile','new_galois_format','output',
-            'parisize','path','prettyprinter','primelimit','prompt_cont',
-            'prompt','psfile','readline','realprecision','recover','secure',
-            'seriesprecision',/*'simplify',*/'strictmatch','timer'
-            ),
-
-        4 => array(
-            'alarmer','archer','errpile','gdiver','impl','syntaxer','invmoder',
-            'overflower','talker','typeer','user'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(',')','{','}','[',']','+','-','*','/','%','=','<','>','!','^','&','|','?',';',':',',','\\','\''
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #e07022;',
-            3 => 'color: #00d2d2;',
-            4 => 'color: #00d2d2;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;',
-            'MULTI' => 'color: #008000;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #111111; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #002222;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #800080;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #666666;',
-            1 => 'color: #666666;',
-            2 => 'color: #666666;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #e07022',    # Should be the same as keyword group 2
-            1 => 'color: #555555'
-            ),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        0 => array( # types marked on variables
-            GESHI_SEARCH => '(?<!\\\\ )"(t_(?:INT|REAL|INTMOD|FRAC|FFELT|COMPLEX|PADIC|QUAD|POLMOD|POL|SER|RFRAC|QFR|QFI|VEC|COL|MAT|LIST|STR|VECSMALL|CLOSURE))"',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '"',
-            GESHI_AFTER => '"'
-            ),
-        1 => array( # literal variables
-            GESHI_SEARCH => '(?<!\\\\)(\'[a-zA-Z][a-zA-Z0-9_]*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        2 => array(
-            '[a-zA-Z][a-zA-Z0-9_]*:' => ''
-            ),
-        3 => array(
-            'default(' => ''
-            ),
-        4 => array(
-            'trap(' => ''
-            ),
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
diff --git a/inc/geshi/pascal.php b/inc/geshi/pascal.php
deleted file mode 100644
index de5ca8717..000000000
--- a/inc/geshi/pascal.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/*************************************************************************************
- * pascal.php
- * ----------
- * Author: Tux (tux@inamil.cz)
- * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/26
- *
- * Pascal language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2004/11/27 (1.0.2)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.1)
- *   -  Added support for URLs
- * 2004/08/05 (1.0.0)
- *   -  Added support for symbols
- * 2004/07/27 (0.9.1)
- *   -  Pascal is OO language. Some new words.
- * 2004/07/26 (0.9.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Pascal',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
-    //Compiler directives
-    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'"),
-    'ESCAPE_CHAR' => '',
-
-    'KEYWORDS' => array(
-        1 => array(
-            'absolute','asm','assembler','begin','break','case','catch','cdecl',
-            'const','constructor','default','destructor','div','do','downto',
-            'else','end','except','export','exports','external','far',
-            'finalization','finally','for','forward','function','goto','if',
-            'implementation','in','index','inherited','initialization','inline',
-            'interface','interrupt','label','library','mod','name','not','of',
-            'or','overload','override','private','procedure','program',
-            'property','protected','public','published','raise','repeat',
-            'resourcestring','shl','shr','stdcall','stored','switch','then',
-            'to','try','type','unit','until','uses','var','while','with','xor'
-            ),
-        2 => array(
-            'nil', 'false', 'true',
-            ),
-        3 => array(
-            'abs','and','arc','arctan','blockread','blockwrite','chr','dispose',
-            'cos','eof','eoln','exp','get','ln','new','odd','ord','ordinal',
-            'pred','read','readln','sin','sqrt','succ','write','writeln'
-            ),
-        4 => array(
-            'ansistring','array','boolean','byte','bytebool','char','file',
-            'integer','longbool','longint','object','packed','pointer','real',
-            'record','set','shortint','smallint','string','union','word'
-            ),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '[', ']'),
-        1 => array('.', ',', ':', ';'),
-        2 => array('@', '^'),
-        3 => array('=', '+', '-', '*', '/')
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #000066; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #008000; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #ff0000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            //'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000cc;',
-            1 => 'color: #ff0000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;',
-            1 => 'color: #000066;',
-            2 => 'color: #000066;',
-            3 => 'color: #000066;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-        0 => '\$[0-9a-fA-F]+',
-        //Characters
-        1 => '\#(?:\$[0-9a-fA-F]{1,2}|\d{1,3})'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/pcre.php b/inc/geshi/pcre.php
deleted file mode 100644
index 13a2e024d..000000000
--- a/inc/geshi/pcre.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/*************************************************************************************
- * pcre.php
- * --------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2010/05/22
- *
- * PCRE language file for GeSHi.
- *
- * NOTE: This language file handles plain PCRE expressions without delimiters.
- * If you want to highlight PCRE with delimiters you should use the
- * Perl language file instead.
- *
- * CHANGES
- * -------
- * 2010/05/22 (1.0.8.8)
- *   -  First Release
- *
- * TODO (updated 2010/05/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PCRE',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(
-        ),
-    'COMMENT_REGEXP' => array(
-        // Non-matching groups
-        1 => "/(?<=\()\?(?::|(?=\())/",
-
-        // Modifier groups
-        2 => "/(?<=\()\?[cdegimopsuxUX\-]+(?::|(?=\)))/",
-
-        // Look-Aheads
-        3 => "/(?<=\()\?[!=]/",
-
-        // Look-Behinds
-        4 => "/(?<=\()\?<[!=]/",
-
-        // Forward Matching
-        5 => "/(?<=\()\?>/",
-
-        // Recursive Matching
-        6 => "/(?<=\()\?R(?=\))/",
-
-        // Named Subpattern
-        7 => "/(?<=\()\?(?:P?<\w+>|\d+(?=\))|P[=>]\w+(?=\)))/",
-
-        // Back Reference
-        8 => "/\\\\(?:[1-9]\d?|g\d+|g\{(?:-?\d+|\w+)\}|k<\w+>|k'\w+'|k\{\w+\})/",
-
-        // Byte sequence: Octal
-        9 => "/\\\\[0-7]{2,3}/",
-
-        // Byte sequence: Hex
-        10 => "/\\\\x[0-9a-fA-F]{2}/",
-
-        // Byte sequence: Hex
-        11 => "/\\\\u[0-9a-fA-F]{4}/",
-
-        // Byte sequence: Hex
-        12 => "/\\\\U[0-9a-fA-F]{8}/",
-
-        // Byte sequence: Unicode
-        13 => "/\\\\[pP]\{[^}\n]+\}/",
-
-        // One-Char Escapes
-        14 => "/\\\\[abdefnrstvwzABCDGSWXZ\\\\\\.\[\]\(\)\{\}\^\\\$\?\+\*]/",
-
-        // Byte sequence: Control-X sequence
-        15 => "/\\\\c./",
-
-        // Quantifier
-        16 => "/\{(?:\d+,?|\d*,\d+)\}/",
-
-        // Comment Subpattern
-        17 => "/(?<=\()\?#[^\)]*/",
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        0 => array('.'),
-        1 => array('(', ')'),
-        2 => array('[', ']', '|'),
-        3 => array('^', '$'),
-        4 => array('?', '+', '*'),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #993333; font-weight: bold;',
-            2 => 'color: #cc3300; font-weight: bold;',
-            3 => 'color: #cc0066; font-weight: bold;',
-            4 => 'color: #cc0066; font-weight: bold;',
-            5 => 'color: #cc6600; font-weight: bold;',
-            6 => 'color: #cc00cc; font-weight: bold;',
-            7 => 'color: #cc9900; font-weight: bold; font-style: italic;',
-            8 => 'color: #cc9900; font-style: italic;',
-            9 => 'color: #669933; font-style: italic;',
-            10 => 'color: #339933; font-style: italic;',
-            11 => 'color: #339966; font-style: italic;',
-            12 => 'color: #339999; font-style: italic;',
-            13 => 'color: #663399; font-style: italic;',
-            14 => 'color: #999933; font-style: italic;',
-            15 => 'color: #993399; font-style: italic;',
-            16 => 'color: #333399; font-style: italic;',
-            17 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #333399; font-weight: bold;',
-            1 => 'color: #993333; font-weight: bold;',
-            2 => 'color: #339933; font-weight: bold;',
-            3 => 'color: #333399; font-weight: bold;',
-            4 => 'color: #333399; font-style: italic;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/per.php b/inc/geshi/per.php
deleted file mode 100644
index c42ddb58a..000000000
--- a/inc/geshi/per.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/*************************************************************************************
- * per.php
- * --------
- * Author: Lars Gersmann (lars.gersmann@gmail.com)
- * Copyright: (c) 2007 Lars Gersmann
- * Release Version: 1.0.8.11
- * Date Started: 2007/06/03
- *
- * Per (forms) (FOURJ's Genero 4GL) language file for GeSHi.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'per',
-    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
-    'COMMENT_MULTI' => array('{' => '}'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            "ACCELERATOR",
-            "ACCELERATOR2",
-            "ACTION",
-            "ALT",
-            "AND",
-            "AUTO",
-            "AUTONEXT",
-            "AUTOSCALE",
-            "BETWEEN",
-            "BOTH",
-            "BUTTON",
-            "BUTTONEDIT",
-            "BUTTONTEXTHIDDEN",
-            "BY",
-            "BYTE",
-            "CANVAS",
-            "CENTER",
-            "CHECKBOX",
-            "CLASS",
-            "COLOR",
-            "COLUMNS",
-            "COMBOBOX",
-            "COMMAND",
-            "COMMENT",
-            "COMMENTS",
-            "COMPACT",
-            "COMPRESS",
-            "CONFIG",
-            "CONTROL",
-            "CURRENT",
-            "DATABASE",
-            "DATEEDIT",
-            "DEC",
-            "DEFAULT",
-            "DEFAULTS",
-            "DELIMITERS",
-            "DISPLAY",
-            "DISPLAYONLY",
-            "DOWNSHIFT",
-            "DYNAMIC",
-            "EDIT",
-            "FIXED",
-            "FOLDER",
-            "FONTPITCH",
-            "FORMAT",
-            "FORMONLY",
-            "GRID",
-            "GRIDCHILDRENINPARENT",
-            "GROUP",
-            "HBOX",
-            "HEIGHT",
-            "HIDDEN",
-            "HORIZONTAL",
-            "INCLUDE",
-            "INITIAL",
-            "INITIALIZER",
-            "INPUT",
-            "INSTRUCTIONS",
-            "INTERVAL",
-            "INVISIBLE",
-            "IS",
-            "ITEM",
-            "ITEMS",
-            "JUSTIFY",
-            "KEY",
-            "KEYS",
-            "LABEL",
-            "LEFT",
-            "LIKE",
-            "LINES",
-            "MATCHES",
-            "NAME",
-            "NOENTRY",
-            "NONCOMPRESS",
-            "NORMAL",
-            "NOT",
-            "NOUPDATE",
-            "OPTIONS",
-            "OR",
-            "ORIENTATION",
-            "PACKED",
-            "PAGE",
-            "PICTURE",
-            "PIXELHEIGHT",
-            "PIXELS",
-            "PIXELWIDTH",
-            "POINTS",
-            "PROGRAM",
-            "PROGRESSBAR",
-            "QUERYCLEAR",
-            "QUERYEDITABLE",
-            "RADIOGROUP",
-            "RECORD",
-            "REQUIRED",
-            "REVERSE",
-            "RIGHT",
-            "SAMPLE",
-            "SCREEN",
-            "SCROLL",
-            "SCROLLBARS",
-            "SCROLLGRID",
-            "SECOND",
-            "SEPARATOR",
-            "SHIFT",
-            "SIZE",
-            "SIZEPOLICY",
-            "SMALLFLOAT",
-            "SMALLINT",
-            "SPACING",
-            "STRETCH",
-            "STYLE",
-            "TABINDEX",
-            "TABLE",
-            "TAG",
-            "TEXT",
-            "TEXTEDIT",
-            "THROUGH",
-            "THRU",
-            "TITLE",
-            "TO",
-            "TOOLBAR",
-            "TOPMENU",
-            "TYPE",
-            "UNHIDABLE",
-            "UNHIDABLECOLUMNS",
-            "UNMOVABLE",
-            "UNMOVABLECOLUMNS",
-            "UNSIZABLE",
-            "UNSIZABLECOLUMNS",
-            "UNSORTABLE",
-            "UNSORTABLECOLUMNS",
-            "UPSHIFT",
-            "USER",
-            "VALIDATE",
-            "VALUECHECKED",
-            "VALUEMAX",
-            "VALUEMIN",
-            "VALUEUNCHECKED",
-            "VARCHAR",
-            "VARIABLE",
-            "VBOX",
-            "VERIFY",
-            "VERSION",
-            "VERTICAL",
-            "TIMESTAMP",
-            "WANTCOLUMNSANCHORED", /* to be removed! */
-            "WANTFIXEDPAGESIZE",
-            "WANTNORETURNS",
-            "WANTTABS",
-            "WHERE",
-            "WIDGET",
-            "WIDTH",
-            "WINDOWSTYLE",
-            "WITHOUT",
-            "WORDWRAP",
-            "X",
-            "Y",
-            "ZEROFILL",
-            "SCHEMA",
-            "ATTRIBUTES",
-            "TABLES",
-            "LAYOUT",
-            "END"
-            ),
-        2 => array(
-            "YEAR",
-            "BLACK",
-            "BLINK",
-            "BLUE",
-            "YELLOW",
-            "WHITE",
-            "UNDERLINE",
-            "CENTURY",
-            "FRACTION",
-            "CHAR",
-            "CHARACTER",
-            "CHARACTERS",
-            "CYAN",
-            "DATE",
-            "DATETIME",
-            "DAY",
-            "DECIMAL",
-            "FALSE",
-            "FLOAT",
-            "GREEN",
-            "HOUR",
-            "INT",
-            "INTEGER",
-            "MAGENTA",
-            "MINUTE",
-            "MONEY",
-            "NONE",
-            "NULL",
-            "REAL",
-            "RED",
-            "TRUE",
-            "TODAY",
-            "MONTH",
-            "IMAGE"
-            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
-        '(', ')', '[', ']'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF;',
-            2 => 'color: #0000FF; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080; font-style: italic;',
-            2 => 'color: #008080;',
-            'MULTI' => 'color: green'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #808080;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000FF;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/perl.php b/inc/geshi/perl.php
deleted file mode 100644
index 309ebd861..000000000
--- a/inc/geshi/perl.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/*************************************************************************************
- * perl.php
- * --------
- * Author: Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
- * Copyright: (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/20
- *
- * Perl language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/06/22 (1.0.8)
- *   -  Added support for system calls in backticks (Corley Kinnane)
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- *   -  Added comment_regexp for predefined variables
- * 2008/02/15 (1.003)
- *   -  Fixed SF#1891630 with placebo patch
- * 2006/01/05 (1.0.2)
- *   -  Used hardescape feature for ' strings (Cliff Stanford)
- * 2004/11/27 (1.0.1)
- *   -  Added support for multiple object splitters
- * 2004/08/20 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * LABEL:
- * * string comparison operators
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Perl',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(
-        '=back' => '=cut',
-        '=head' => '=cut',
-        '=item' => '=cut',
-        '=over' => '=cut',
-        '=begin' => '=cut',
-        '=end' => '=cut',
-        '=for' => '=cut',
-        '=encoding' => '=cut',
-        '=pod' => '=cut'
-        ),
-    'COMMENT_REGEXP' => array(
-        //Regular expressions
-        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
-        //Regular expression match variables
-        3 => '/\$\d+/',
-        //Heredoc
-        4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
-        //Predefined variables
-        5 => '/\$(\^[a-zA-Z]?|[\*\$`\'&_\.,+\-~:;\\\\\/"\|%=\?!@#<>\(\)\[\]])(?!\w)|@[_+\-]|%[!]|\$(?=\{)/',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"','`'),
-    'HARDQUOTE' => array("'", "'"),            // An optional 2-element array defining the beginning and end of a hard-quoted string
-    'HARDESCAPE' => array('\\\'',),
-        // Things that must still be escaped inside a hard-quoted string
-        // If HARDQUOTE is defined, HARDESCAPE must be defined
-        // This will not work unless the first character of each element is either in the
-        // QUOTEMARKS array or is the ESCAPE_CHAR
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'case', 'do', 'else', 'elsif', 'for', 'if', 'then', 'until', 'while', 'foreach', 'my',
-            'xor', 'or', 'and', 'unless', 'next', 'last', 'redo', 'not', 'our',
-            'reset', 'continue', 'cmp', 'ne', 'eq', 'lt', 'gt', 'le', 'ge',
-            ),
-        2 => array(
-            'use', 'sub', 'new', '__END__', '__DATA__', '__DIE__', '__WARN__', 'BEGIN',
-            'STDIN', 'STDOUT', 'STDERR', 'ARGV', 'ARGVOUT'
-            ),
-        3 => array(
-            'abs', 'accept', 'alarm', 'atan2', 'bind', 'binmode', 'bless',
-            'caller', 'chdir', 'chmod', 'chomp', 'chop', 'chown', 'chr',
-            'chroot', 'close', 'closedir', 'connect', 'cos',
-            'crypt', 'dbmclose', 'dbmopen', 'defined', 'delete', 'die',
-            'dump', 'each', 'endgrent', 'endhostent', 'endnetent', 'endprotoent',
-            'endpwent', 'endservent', 'eof', 'eval', 'exec', 'exists', 'exit',
-            'exp', 'fcntl', 'fileno', 'flock', 'fork', 'format', 'formline',
-            'getc', 'getgrent', 'getgrgid', 'getgrnam', 'gethostbyaddr',
-            'gethostbyname', 'gethostent', 'getlogin', 'getnetbyaddr', 'getnetbyname',
-            'getnetent', 'getpeername', 'getpgrp', 'getppid', 'getpriority',
-            'getprotobyname', 'getprotobynumber', 'getprotoent', 'getpwent',
-            'getpwnam', 'getpwuid', 'getservbyname', 'getservbyport', 'getservent',
-            'getsockname', 'getsockopt', 'glob', 'gmtime', 'goto', 'grep',
-            'hex', 'import', 'index', 'int', 'ioctl', 'join', 'keys', 'kill',
-            'lc', 'lcfirst', 'length', 'link', 'listen', 'local',
-            'localtime', 'log', 'lstat', 'm', 'map', 'mkdir', 'msgctl', 'msgget',
-            'msgrcv', 'msgsnd', 'no', 'oct', 'open', 'opendir',
-            'ord', 'pack', 'package', 'pipe', 'pop', 'pos', 'print',
-            'printf', 'prototype', 'push', 'qq', 'qr', 'quotemeta', 'qw',
-            'qx', 'q', 'rand', 'read', 'readdir', 'readline', 'readlink', 'readpipe',
-            'recv', 'ref', 'rename', 'require', 'return',
-            'reverse', 'rewinddir', 'rindex', 'rmdir', 's', 'scalar', 'seek',
-            'seekdir', 'select', 'semctl', 'semget', 'semop', 'send', 'setgrent',
-            'sethostent', 'setnetent', 'setpgrp', 'setpriority', 'setprotoent',
-            'setpwent', 'setservent', 'setsockopt', 'shift', 'shmctl', 'shmget',
-            'shmread', 'shmwrite', 'shutdown', 'sin', 'sleep', 'socket', 'socketpair',
-            'sort', 'splice', 'split', 'sprintf', 'sqrt', 'srand', 'stat',
-            'study', 'substr', 'symlink', 'syscall', 'sysopen', 'sysread',
-            'sysseek', 'system', 'syswrite', 'tell', 'telldir', 'tie', 'tied',
-            'time', 'times', 'tr', 'truncate', 'uc', 'ucfirst', 'umask', 'undef',
-            'unlink', 'unpack', 'unshift', 'untie', 'utime', 'values',
-            'vec', 'wait', 'waitpid', 'wantarray', 'warn', 'write', 'y'
-            )
-        ),
-    'SYMBOLS' => array(
-        '<', '>', '=',
-        '!', '@', '~', '&', '|', '^',
-        '+','-', '*', '/', '%',
-        ',', ';', '?', '.', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #009966; font-style: italic;',
-            3 => 'color: #0000ff;',
-            4 => 'color: #cc0000; font-style: italic;',
-            5 => 'color: #0000ff;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;',
-            4 => 'color: #009999;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://perldoc.perl.org/functions/{FNAMEL}.html'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '-&gt;',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        //Variable
-        0 => '(?:\$[\$#]?|\\\\(?:[@%*]?|\\\\*\$|&amp;)|%[$]?|@[$]?|\*[$]?|&amp;[$]?)[a-zA-Z_][a-zA-Z0-9_]*',
-        //File Descriptor
-        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '$'
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/perl6.php b/inc/geshi/perl6.php
deleted file mode 100644
index 706eabcb5..000000000
--- a/inc/geshi/perl6.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/*************************************************************************************
- * perl6.php
- * ---------
- * Author: Kodi Arfer (kodiarfer {at} warpmail {period} net); forked from perl.php 1.0.8 by Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
- * Copyright: (c) 2009 Kodi Arfer, (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/11/07
- *
- * Perl 6 language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/12/25 (1.0.8.6)
- *   - First Release
- *
- * TODO (updated 2009/11/07)
- * -------------------------
- * * It's all pretty rough. Perl 6 is complicated; this'll never be more
- *   than reasonably accurate unless it's carefully written to match
- *   STD.pm.
- * * It's largely incomplete. Lots of keywords are no doubt missing.
- * * Recognize comments like #`( Hello! ).
- * * Recognize qw-ing angle brackets.
- * * ! should probably be in OBJECT_SPLITTERS too, but putting it there
- *   gives bizarre results. What to do?.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Perl 6',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array('=begin' => '=end'),
-    'COMMENT_REGEXP' => array(
-        //Regular expressions
-        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
-        //Regular expression match variables
-        3 => '/\$\d+/',
-        //Heredoc
-        4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
-        //Beastly hack to finish highlighting each POD block
-        5 => '((?<==end) .+)'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDQUOTE' => array("'", "'"),            // An optional 2-element array defining the beginning and end of a hard-quoted string
-    'HARDESCAPE' => array('\\\''),
-        // Things that must still be escaped inside a hard-quoted string
-        // If HARDQUOTE is defined, HARDESCAPE must be defined
-        // This will not work unless the first character of each element is either in the
-        // QUOTEMARKS array or is the ESCAPE_CHAR
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'do', 'else', 'elsif', 'for', 'if', 'then', 'until',
-            'while', 'loop', 'repeat', 'my', 'xor', 'or', 'and',
-            'unless', 'next', 'last', 'redo', 'not', 'our', 'let',
-            'temp', 'state', 'enum', 'constant', 'continue', 'cmp',
-            'ne', 'eq', 'lt', 'gt', 'le', 'ge', 'leg', 'div', 'X',
-            'Z', 'x', 'xx', 'given', 'when', 'default', 'has',
-            'returns', 'of', 'is', 'does', 'where', 'subset', 'but',
-            'True', 'False', 'return', 'die', 'fail'
-            ),
-        2 => array(
-            'use', 'sub', 'multi', 'method', 'submethod', 'proto',
-            'class', 'role', 'grammar', 'regex', 'token', 'rule',
-            'new', 'BEGIN', 'END', 'CHECK', 'INIT', 'START', 'FIRST',
-            'ENTER', 'LEAVE', 'KEEP', 'UNDO', 'NEXT', 'LAST', 'PRE',
-            'POST', 'CATCH', 'CONTROL', 'BUILD'
-            ),
-        3 => array(
-            'all', 'any', 'cat', 'classify', 'defined', 'grep', 'first',
-            'keys', 'kv', 'join', 'map', 'max', 'min', 'none', 'one', 'pairs',
-            'print', 'printf', 'roundrobin', 'pick', 'reduce', 'reverse', 'say',
-            'shape', 'sort', 'srand', 'undefine', 'uri', 'values', 'warn', 'zip',
-
-            # Container
-            'rotate', 'comb', 'end', 'elems', 'delete',
-            'exists', 'pop', 'push', 'shift', 'splice',
-            'unshift', 'invert', 'decode',
-
-            # Numeric
-            'succ', 'pred', 'abs', 'exp', 'log',
-            'log10', 'rand', 'roots', 'cis', 'unpolar', 'i', 'floor',
-            'ceiling', 'round', 'truncate', 'sign', 'sqrt',
-            'polar', 're', 'im', 'I', 'atan2', 'nude',
-            'denominator', 'numerator',
-
-            # Str
-            'p5chop', 'chop', 'p5chomp', 'chomp', 'lc', 'lcfirst',
-            'uc', 'ucfirst', 'normalize', 'samecase', 'sameaccent',
-            'capitalize', 'length', 'chars', 'graphs', 'codes',
-            'bytes', 'encode', 'index', 'pack', 'quotemeta', 'rindex',
-            'split', 'words', 'flip', 'sprintf', 'fmt',
-            'substr', 'trim', 'unpack', 'match', 'subst', 'trans'
-            )
-        ),
-    'SYMBOLS' => array(
-        '<', '>', '=',
-        '!', '@', '~', '&', '|', '^',
-        '+','-', '*', '/', '%',
-        ',', ';', '?', '.', ':',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #009966; font-style: italic;',
-            3 => 'color: #0000ff;',
-            4 => 'color: #cc0000; font-style: italic;',
-            5 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        //Variable
-        0 => '(?:[$@%]|&amp;)(?:(?:[\^:*?!~]|&lt;)?[a-zA-Z_][a-zA-Z0-9_]*|(?=\.))'
-        # We treat the . twigil specially so the name can be highlighted as an
-        # object field (via OBJECT_SPLITTERS).
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '$'
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/pf.php b/inc/geshi/pf.php
deleted file mode 100644
index 818e11bcb..000000000
--- a/inc/geshi/pf.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/*************************************************************************************
- * pf.php
- * --------
- * Author: David Berard (david@nfrance.com)
- * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/16
- * Based on bash.php
- *
- * OpenBSD PACKET FILTER language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/10/16 (1.0.0)
- *   -  First Release
- *
- * TODO
- * -------------------------
- * * Support ALTQ
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'OpenBSD Packet Filter',
-    'COMMENT_SINGLE' => array('#'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        1 => "/\\$\\{[^\\n\\}]*?\\}/i",
-        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
-        3 => "/\\\\['\"]/siU"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("\'"),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        1 => "#\\\\[nfrtv\\$\\\"\n]#i",
-        2 => "#\\$[a-z_][a-z0-9_]*#i",
-        3 => "/\\$\\{[^\\n\\}]*?\\}/i",
-        4 => "/\\$\\([^\\n\\)]*?\\)/i",
-        5 => "/`[^`]*`/"
-        ),
-    'KEYWORDS' => array(
-        1 => array(
-            'pass'
-        ),
-        2 => array(
-            'block'
-            ),
-        3 => array(
-            'quick','keep','state','antispoof','table','persist','file','scrub',
-            'set','skip','flags','on'
-            ),
-        4 => array(
-            'in','out','proto'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`','='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #009900; font-weight: bold;',
-            2 => 'color: #990000; font-weight: bold;',
-            3 => 'color: #7a0874;',
-            4 => 'color: #336699;'
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #666666; font-style: italic;',
-            1 => 'color: #800000;',
-            2 => 'color: #cc0000; font-style: italic;',
-            3 => 'color: #000000; font-weight: bold;'
-            ),
-        'ESCAPE_CHAR' => array(
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #007800;',
-            3 => 'color: #007800;',
-            4 => 'color: #007800;',
-            5 => 'color: #780078;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #7a0874; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #CC0000;',
-            'HARD' => 'color: #CC0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff00cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #007800;',
-            1 => 'color: #007800;',
-            2 => 'color: #007800;',
-            4 => 'color: #007800;',
-            5 => 'color: #660033;',
-            6 => 'color: #000099; font-weight: bold;',
-            7 => 'color: #0000ff;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Variables (will be handled by comment_regexps)
-        0 => "\\$\\{[a-zA-Z_][a-zA-Z0-9_]*?\\}",
-        //Variables without braces
-        1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
-        //Variable assignment
-        2 => "(?<![\.a-zA-Z_\-])([a-zA-Z_][a-zA-Z0-9_]*?)(?==)",
-        //Shorthand shell variables
-        4 => "\\$[*#\$\\-\\?!]",
-        //Parameters of commands
-        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|$)",
-        //IPs
-        6 => "([0-9]{1,3}\.){3}[0-9]{1,3}",
-        //Tables
-        7 => "(&lt;(.*)&gt;)"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '$'
-        ),
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#])",
-            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%\\/])"
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/php-brief.php b/inc/geshi/php-brief.php
deleted file mode 100644
index a4804b4da..000000000
--- a/inc/geshi/php-brief.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/*************************************************************************************
- * php-brief.php
- * -------------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/02
- *
- * PHP (brief version) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2004/11/27 (1.0.3)
- *  -  Added support for multiple object splitters
- *  -  Fixed &new problem
- * 2004/10/27 (1.0.2)
- *   -  Added support for URLs
- * 2004/08/05 (1.0.1)
- *   -  Added support for symbols
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/07/14)
- * -------------------------
- * * Remove more functions that are hardly used
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PHP (brief)',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    //Heredoc and Nowdoc syntax
-    'COMMENT_REGEXP' => array(3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("\'"),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'include', 'require', 'include_once', 'require_once',
-            'for', 'as', 'foreach', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch',
-            'return', 'break'
-            ),
-        2 => array(
-            'null', '__LINE__', '__FILE__',
-            'false', '&lt;?php',
-            'true', 'var', 'default',
-            'function', 'class', 'new', '&amp;new', 'public', 'private', 'interface', 'extends',
-            'const', 'self'
-            ),
-        3 => array(
-            'func_num_args', 'func_get_arg', 'func_get_args', 'strlen', 'strcmp', 'strncmp', 'strcasecmp', 'strncasecmp', 'each', 'error_reporting', 'define', 'defined',
-            'trigger_error', 'user_error', 'set_error_handler', 'restore_error_handler', 'get_declared_classes', 'get_loaded_extensions',
-            'extension_loaded', 'get_extension_funcs', 'debug_backtrace',
-            'constant', 'bin2hex', 'sleep', 'usleep', 'time', 'mktime', 'gmmktime', 'strftime', 'gmstrftime', 'strtotime', 'date', 'gmdate', 'getdate', 'localtime', 'checkdate', 'flush', 'wordwrap', 'htmlspecialchars', 'htmlentities', 'html_entity_decode', 'md5', 'md5_file', 'crc32', 'getimagesize', 'image_type_to_mime_type', 'phpinfo', 'phpversion', 'phpcredits', 'strnatcmp', 'strnatcasecmp', 'substr_count', 'strspn', 'strcspn', 'strtok', 'strtoupper', 'strtolower', 'strpos', 'strrpos', 'strrev', 'hebrev', 'hebrevc', 'nl2br', 'basename', 'dirname', 'pathinfo', 'stripslashes', 'stripcslashes', 'strstr', 'stristr', 'strrchr', 'str_shuffle', 'str_word_count', 'strcoll', 'substr', 'substr_replace', 'quotemeta', 'ucfirst', 'ucwords', 'strtr', 'addslashes', 'addcslashes', 'rtrim', 'str_replace', 'str_repeat', 'count_chars', 'chunk_split', 'trim', 'ltrim', 'strip_tags', 'similar_text', 'explode', 'implode', 'setlocale', 'localeconv',
-            'parse_str', 'str_pad', 'chop', 'strchr', 'sprintf', 'printf', 'vprintf', 'vsprintf', 'sscanf', 'fscanf', 'parse_url', 'urlencode', 'urldecode', 'rawurlencode', 'rawurldecode', 'readlink', 'linkinfo', 'link', 'unlink', 'exec', 'system', 'escapeshellcmd', 'escapeshellarg', 'passthru', 'shell_exec', 'proc_open', 'proc_close', 'rand', 'srand', 'getrandmax', 'mt_rand', 'mt_srand', 'mt_getrandmax', 'base64_decode', 'base64_encode', 'abs', 'ceil', 'floor', 'round', 'is_finite', 'is_nan', 'is_infinite', 'bindec', 'hexdec', 'octdec', 'decbin', 'decoct', 'dechex', 'base_convert', 'number_format', 'fmod', 'ip2long', 'long2ip', 'getenv', 'putenv', 'getopt', 'microtime', 'gettimeofday', 'getrusage', 'uniqid', 'quoted_printable_decode', 'set_time_limit', 'get_cfg_var', 'magic_quotes_runtime', 'set_magic_quotes_runtime', 'get_magic_quotes_gpc', 'get_magic_quotes_runtime',
-            'import_request_variables', 'error_log', 'serialize', 'unserialize', 'memory_get_usage', 'var_dump', 'var_export', 'debug_zval_dump', 'print_r','highlight_file', 'show_source', 'highlight_string', 'ini_get', 'ini_get_all', 'ini_set', 'ini_alter', 'ini_restore', 'get_include_path', 'set_include_path', 'restore_include_path', 'setcookie', 'header', 'headers_sent', 'connection_aborted', 'connection_status', 'ignore_user_abort', 'parse_ini_file', 'is_uploaded_file', 'move_uploaded_file', 'intval', 'floatval', 'doubleval', 'strval', 'gettype', 'settype', 'is_null', 'is_resource', 'is_bool', 'is_long', 'is_float', 'is_int', 'is_integer', 'is_double', 'is_real', 'is_numeric', 'is_string', 'is_array', 'is_object', 'is_scalar',
-            'ereg', 'ereg_replace', 'eregi', 'eregi_replace', 'split', 'spliti', 'join', 'sql_regcase', 'dl', 'pclose', 'popen', 'readfile', 'rewind', 'rmdir', 'umask', 'fclose', 'feof', 'fgetc', 'fgets', 'fgetss', 'fread', 'fopen', 'fpassthru', 'ftruncate', 'fstat', 'fseek', 'ftell', 'fflush', 'fwrite', 'fputs', 'mkdir', 'rename', 'copy', 'tempnam', 'tmpfile', 'file', 'file_get_contents', 'stream_select', 'stream_context_create', 'stream_context_set_params', 'stream_context_set_option', 'stream_context_get_options', 'stream_filter_prepend', 'stream_filter_append', 'fgetcsv', 'flock', 'get_meta_tags', 'stream_set_write_buffer', 'set_file_buffer', 'set_socket_blocking', 'stream_set_blocking', 'socket_set_blocking', 'stream_get_meta_data', 'stream_register_wrapper', 'stream_wrapper_register', 'stream_set_timeout', 'socket_set_timeout', 'socket_get_status', 'realpath', 'fnmatch', 'fsockopen', 'pfsockopen', 'pack', 'unpack', 'get_browser', 'crypt', 'opendir', 'closedir', 'chdir', 'getcwd', 'rewinddir', 'readdir', 'dir', 'glob', 'fileatime', 'filectime', 'filegroup', 'fileinode', 'filemtime', 'fileowner', 'fileperms', 'filesize', 'filetype', 'file_exists', 'is_writable', 'is_writeable', 'is_readable', 'is_executable', 'is_file', 'is_dir', 'is_link', 'stat', 'lstat', 'chown',
-            'touch', 'clearstatcache', 'mail', 'ob_start', 'ob_flush', 'ob_clean', 'ob_end_flush', 'ob_end_clean', 'ob_get_flush', 'ob_get_clean', 'ob_get_length', 'ob_get_level', 'ob_get_status', 'ob_get_contents', 'ob_implicit_flush', 'ob_list_handlers', 'ksort', 'krsort', 'natsort', 'natcasesort', 'asort', 'arsort', 'sort', 'rsort', 'usort', 'uasort', 'uksort', 'shuffle', 'array_walk', 'count', 'end', 'prev', 'next', 'reset', 'current', 'key', 'min', 'max', 'in_array', 'array_search', 'extract', 'compact', 'array_fill', 'range', 'array_multisort', 'array_push', 'array_pop', 'array_shift', 'array_unshift', 'array_splice', 'array_slice', 'array_merge', 'array_merge_recursive', 'array_keys', 'array_values', 'array_count_values', 'array_reverse', 'array_reduce', 'array_pad', 'array_flip', 'array_change_key_case', 'array_rand', 'array_unique', 'array_intersect', 'array_intersect_assoc', 'array_diff', 'array_diff_assoc', 'array_sum', 'array_filter', 'array_map', 'array_chunk', 'array_key_exists', 'pos', 'sizeof', 'key_exists', 'assert', 'assert_options', 'version_compare', 'ftok', 'str_rot13', 'aggregate',
-            'session_name', 'session_module_name', 'session_save_path', 'session_id', 'session_regenerate_id', 'session_decode', 'session_register', 'session_unregister', 'session_is_registered', 'session_encode',
-            'session_start', 'session_destroy', 'session_unset', 'session_set_save_handler', 'session_cache_limiter', 'session_cache_expire', 'session_set_cookie_params', 'session_get_cookie_params', 'session_write_close', 'preg_match', 'preg_match_all', 'preg_replace', 'preg_replace_callback', 'preg_split', 'preg_quote', 'preg_grep', 'overload', 'ctype_alnum', 'ctype_alpha', 'ctype_cntrl', 'ctype_digit', 'ctype_lower', 'ctype_graph', 'ctype_print', 'ctype_punct', 'ctype_space', 'ctype_upper', 'ctype_xdigit', 'virtual', 'apache_request_headers', 'apache_note', 'apache_lookup_uri', 'apache_child_terminate', 'apache_setenv', 'apache_response_headers', 'apache_get_version', 'getallheaders', 'mysql_connect', 'mysql_pconnect', 'mysql_close', 'mysql_select_db', 'mysql_create_db', 'mysql_drop_db', 'mysql_query', 'mysql_unbuffered_query', 'mysql_db_query', 'mysql_list_dbs', 'mysql_list_tables', 'mysql_list_fields', 'mysql_list_processes', 'mysql_error', 'mysql_errno', 'mysql_affected_rows', 'mysql_insert_id', 'mysql_result', 'mysql_num_rows', 'mysql_num_fields', 'mysql_fetch_row', 'mysql_fetch_array', 'mysql_fetch_assoc', 'mysql_fetch_object', 'mysql_data_seek', 'mysql_fetch_lengths', 'mysql_fetch_field', 'mysql_field_seek', 'mysql_free_result', 'mysql_field_name', 'mysql_field_table', 'mysql_field_len', 'mysql_field_type', 'mysql_field_flags', 'mysql_escape_string', 'mysql_real_escape_string', 'mysql_stat',
-            'mysql_thread_id', 'mysql_client_encoding', 'mysql_get_client_info', 'mysql_get_host_info', 'mysql_get_proto_info', 'mysql_get_server_info', 'mysql_info', 'mysql', 'mysql_fieldname', 'mysql_fieldtable', 'mysql_fieldlen', 'mysql_fieldtype', 'mysql_fieldflags', 'mysql_selectdb', 'mysql_createdb', 'mysql_dropdb', 'mysql_freeresult', 'mysql_numfields', 'mysql_numrows', 'mysql_listdbs', 'mysql_listtables', 'mysql_listfields', 'mysql_db_name', 'mysql_dbname', 'mysql_tablename', 'mysql_table_name', 'pg_connect', 'pg_pconnect', 'pg_close', 'pg_connection_status', 'pg_connection_busy', 'pg_connection_reset', 'pg_host', 'pg_dbname', 'pg_port', 'pg_tty', 'pg_options', 'pg_ping', 'pg_query', 'pg_send_query', 'pg_cancel_query', 'pg_fetch_result', 'pg_fetch_row', 'pg_fetch_assoc', 'pg_fetch_array', 'pg_fetch_object', 'pg_fetch_all', 'pg_affected_rows', 'pg_get_result', 'pg_result_seek', 'pg_result_status', 'pg_free_result', 'pg_last_oid', 'pg_num_rows', 'pg_num_fields', 'pg_field_name', 'pg_field_num', 'pg_field_size', 'pg_field_type', 'pg_field_prtlen', 'pg_field_is_null', 'pg_get_notify', 'pg_get_pid', 'pg_result_error', 'pg_last_error', 'pg_last_notice', 'pg_put_line', 'pg_end_copy', 'pg_copy_to', 'pg_copy_from',
-            'pg_trace', 'pg_untrace', 'pg_lo_create', 'pg_lo_unlink', 'pg_lo_open', 'pg_lo_close', 'pg_lo_read', 'pg_lo_write', 'pg_lo_read_all', 'pg_lo_import', 'pg_lo_export', 'pg_lo_seek', 'pg_lo_tell', 'pg_escape_string', 'pg_escape_bytea', 'pg_unescape_bytea', 'pg_client_encoding', 'pg_set_client_encoding', 'pg_meta_data', 'pg_convert', 'pg_insert', 'pg_update', 'pg_delete', 'pg_select', 'pg_exec', 'pg_getlastoid', 'pg_cmdtuples', 'pg_errormessage', 'pg_numrows', 'pg_numfields', 'pg_fieldname', 'pg_fieldsize', 'pg_fieldtype', 'pg_fieldnum', 'pg_fieldprtlen', 'pg_fieldisnull', 'pg_freeresult', 'pg_result', 'pg_loreadall', 'pg_locreate', 'pg_lounlink', 'pg_loopen', 'pg_loclose', 'pg_loread', 'pg_lowrite', 'pg_loimport', 'pg_loexport',
-            'echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '<%', '<%=', '%>', '<?', '<?=', '?>'
-            ),
-        0 => array(
-            '(', ')', '[', ']', '{', '}',
-            '!', '@', '%', '&', '|', '/',
-            '<', '>',
-            '=', '-', '+', '*',
-            '.', ':', ',', ';'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #990000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #666666; font-style: italic;',
-            3 => 'color: #0000cc; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;',
-            'HARD' => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            ),
-        'METHODS' => array(
-            1 => 'color: #004000;',
-            2 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            1 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => '',
-            4 => '',
-            5 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.php.net/{FNAMEL}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '-&gt;',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => "[\\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<?php' => '?>'
-            ),
-        1 => array(
-            '<?' => '?>'
-            ),
-        2 => array(
-            '<%' => '%>'
-            ),
-        3 => array(
-            '<script language="php">' => '</script>'
-            ),
-        4 => "/(?P<start><\\?(?>php\b)?)(?:".
-            "(?>[^\"'?\\/<]+)|".
-            "\\?(?!>)|".
-            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
-            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
-            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
-            "\\/\\/(?>.*?$)|".
-            "\\/(?=[^*\\/])|".
-            "<(?!<<)|".
-            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
-            ")*(?P<end>\\?>|\Z)/sm",
-        5 => "/(?P<start><%)(?:".
-            "(?>[^\"'%\\/<]+)|".
-            "%(?!>)|".
-            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
-            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
-            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
-            "\\/\\/(?>.*?$)|".
-            "\\/(?=[^*\\/])|".
-            "<(?!<<)|".
-            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
-            ")*(?P<end>%>)/sm"
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/php.php b/inc/geshi/php.php
deleted file mode 100644
index 2827457b1..000000000
--- a/inc/geshi/php.php
+++ /dev/null
@@ -1,1117 +0,0 @@
-<?php
-/*************************************************************************************
- * php.php
- * --------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/20
- *
- * PHP language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2004/11/25 (1.0.3)
- *  -  Added support for multiple object splitters
- *  -  Fixed &new problem
- * 2004/10/27 (1.0.2)
- *  -  Added URL support
- *  -  Added extra constants
- * 2004/08/05 (1.0.1)
- *  -  Added support for symbols
- * 2004/07/14 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/07/14)
- * -------------------------
- * * Make sure the last few function I may have missed
- *   (like eval()) are included for highlighting
- * * Split to several files - php4, php5 etc
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'PHP',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Heredoc and Nowdoc syntax
-        3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+?)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
-        // phpdoc comments
-        4 => '#/\*\*(?![\*\/]).*\*/#sU',
-        // Advanced # handling
-        2 => "/#.*?(?:(?=\?\>)|^)/smi"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{1,2}#i",
-        //Octal Char Specs
-        3 => "#\\\\[0-7]{1,3}#",
-        //String Parsing of Variable Names
-        4 => "#\\$[a-z0-9_]+(?:\\[[a-z0-9_]+\\]|->[a-z0-9_]+)?|(?:\\{\\$|\\$\\{)[a-z0-9_]+(?:\\[('?)[a-z0-9_]*\\1\\]|->[a-z0-9_]+)*\\}#i",
-        //Experimental extension supporting cascaded {${$var}} syntax
-        5 => "#\$[a-z0-9_]+(?:\[[a-z0-9_]+\]|->[a-z0-9_]+)?|(?:\{\$|\$\{)[a-z0-9_]+(?:\[('?)[a-z0-9_]*\\1\]|->[a-z0-9_]+)*\}|\{\$(?R)\}#i",
-        //Format String support in ""-Strings
-        6 => "#%(?:%|(?:\d+\\\\\\\$)?\\+?(?:\x20|0|'.)?-?(?:\d+|\\*)?(?:\.\d+)?[bcdefFosuxX])#"
-        ),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("'", "\\"),
-    'HARDCHAR' => "\\",
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'as','break','case','continue','default','do','else','elseif',
-            'endfor','endforeach','endif','endswitch','endwhile','for',
-            'foreach','if','include','include_once','require','require_once',
-            'return','switch','throw','while',
-
-            'echo','print'
-            ),
-        2 => array(
-            '&amp;new','&lt;/script&gt;','&lt;?php','&lt;script language',
-            'abstract','class','const','declare','extends','function','global',
-            'interface','namespace','new','private','protected','public','self',
-            'use','var'
-            ),
-        3 => array(
-            'abs','acos','acosh','addcslashes','addslashes','aggregate',
-            'aggregate_methods','aggregate_methods_by_list',
-            'aggregate_methods_by_regexp','aggregate_properties',
-            'aggregate_properties_by_list','aggregate_properties_by_regexp',
-            'aggregation_info','apache_child_terminate','apache_get_modules',
-            'apache_get_version','apache_getenv','apache_lookup_uri',
-            'apache_note','apache_request_headers','apache_response_headers',
-            'apache_setenv','array','array_change_key_case','array_chunk',
-            'array_combine','array_count_values','array_diff',
-            'array_diff_assoc','array_diff_key','array_diff_uassoc',
-            'array_diff_ukey','array_fill','array_fill_keys','array_filter',
-            'array_flip','array_intersect','array_intersect_assoc',
-            'array_intersect_key','array_intersect_uassoc',
-            'array_intersect_ukey','array_key_exists','array_keys','array_map',
-            'array_merge','array_merge_recursive','array_multisort','array_pad',
-            'array_pop','array_product','array_push','array_rand',
-            'array_reduce','array_reverse','array_search','array_shift',
-            'array_slice','array_splice','array_sum','array_udiff',
-            'array_udiff_assoc','array_udiff_uassoc','array_uintersect',
-            'array_uintersect_assoc','array_uintersect_uassoc','array_unique',
-            'array_unshift','array_values','array_walk','array_walk_recursive',
-            'arsort','asin','asinh','asort','assert','assert_options','atan',
-            'atan2','atanh','base_convert','base64_decode','base64_encode',
-            'basename','bcadd','bccomp','bcdiv','bcmod','bcmul',
-            'bcompiler_load','bcompiler_load_exe','bcompiler_parse_class',
-            'bcompiler_read','bcompiler_write_class','bcompiler_write_constant',
-            'bcompiler_write_exe_footer','bcompiler_write_file',
-            'bcompiler_write_footer','bcompiler_write_function',
-            'bcompiler_write_functions_from_file','bcompiler_write_header',
-            'bcompiler_write_included_filename','bcpow','bcpowmod','bcscale',
-            'bcsqrt','bcsub','bin2hex','bindec','bindtextdomain',
-            'bind_textdomain_codeset','bitset_empty','bitset_equal',
-            'bitset_excl','bitset_fill','bitset_from_array','bitset_from_hash',
-            'bitset_from_string','bitset_in','bitset_incl',
-            'bitset_intersection','bitset_invert','bitset_is_empty',
-            'bitset_subset','bitset_to_array','bitset_to_hash',
-            'bitset_to_string','bitset_union','blenc_encrypt','bzclose',
-            'bzcompress','bzdecompress','bzerrno','bzerror','bzerrstr',
-            'bzflush','bzopen','bzread','bzwrite','cal_days_in_month',
-            'cal_from_jd','cal_info','cal_to_jd','call_user_func',
-            'call_user_func_array','call_user_method','call_user_method_array',
-            'ceil','chdir','checkdate','checkdnsrr','chgrp','chmod','chop',
-            'chown','chr','chunk_split','class_exists','class_implements',
-            'class_parents','classkit_aggregate_methods',
-            'classkit_doc_comments','classkit_import','classkit_method_add',
-            'classkit_method_copy','classkit_method_redefine',
-            'classkit_method_remove','classkit_method_rename','clearstatcache',
-            'closedir','closelog','com_create_guid','com_event_sink',
-            'com_get_active_object','com_load_typelib','com_message_pump',
-            'com_print_typeinfo','compact','confirm_phpdoc_compiled',
-            'connection_aborted','connection_status','constant',
-            'convert_cyr_string','convert_uudecode','convert_uuencode','copy',
-            'cos','cosh','count','count_chars','cpdf_add_annotation',
-            'cpdf_add_outline','cpdf_arc','cpdf_begin_text','cpdf_circle',
-            'cpdf_clip','cpdf_close','cpdf_closepath',
-            'cpdf_closepath_fill_stroke','cpdf_closepath_stroke',
-            'cpdf_continue_text','cpdf_curveto','cpdf_end_text','cpdf_fill',
-            'cpdf_fill_stroke','cpdf_finalize','cpdf_finalize_page',
-            'cpdf_global_set_document_limits','cpdf_import_jpeg','cpdf_lineto',
-            'cpdf_moveto','cpdf_newpath','cpdf_open','cpdf_output_buffer',
-            'cpdf_page_init','cpdf_rect','cpdf_restore','cpdf_rlineto',
-            'cpdf_rmoveto','cpdf_rotate','cpdf_rotate_text','cpdf_save',
-            'cpdf_save_to_file','cpdf_scale','cpdf_set_action_url',
-            'cpdf_set_char_spacing','cpdf_set_creator','cpdf_set_current_page',
-            'cpdf_set_font','cpdf_set_font_directories',
-            'cpdf_set_font_map_file','cpdf_set_horiz_scaling',
-            'cpdf_set_keywords','cpdf_set_leading','cpdf_set_page_animation',
-            'cpdf_set_subject','cpdf_set_text_matrix','cpdf_set_text_pos',
-            'cpdf_set_text_rendering','cpdf_set_text_rise','cpdf_set_title',
-            'cpdf_set_viewer_preferences','cpdf_set_word_spacing',
-            'cpdf_setdash','cpdf_setflat','cpdf_setgray','cpdf_setgray_fill',
-            'cpdf_setgray_stroke','cpdf_setlinecap','cpdf_setlinejoin',
-            'cpdf_setlinewidth','cpdf_setmiterlimit','cpdf_setrgbcolor',
-            'cpdf_setrgbcolor_fill','cpdf_setrgbcolor_stroke','cpdf_show',
-            'cpdf_show_xy','cpdf_stringwidth','cpdf_stroke','cpdf_text',
-            'cpdf_translate','crack_check','crack_closedict',
-            'crack_getlastmessage','crack_opendict','crc32','create_function',
-            'crypt','ctype_alnum','ctype_alpha','ctype_cntrl','ctype_digit',
-            'ctype_graph','ctype_lower','ctype_print','ctype_punct',
-            'ctype_space','ctype_upper','ctype_xdigit','curl_close',
-            'curl_copy_handle','curl_errno','curl_error','curl_exec',
-            'curl_getinfo','curl_init','curl_multi_add_handle',
-            'curl_multi_close','curl_multi_exec','curl_multi_getcontent',
-            'curl_multi_info_read','curl_multi_init','curl_multi_remove_handle',
-            'curl_multi_select','curl_setopt','curl_setopt_array',
-            'curl_version','current','cvsclient_connect','cvsclient_log',
-            'cvsclient_login','cvsclient_retrieve','date','date_create',
-            'date_date_set','date_default_timezone_get',
-            'date_default_timezone_set','date_format','date_isodate_set',
-            'date_modify','date_offset_get','date_parse','date_sun_info',
-            'date_sunrise','date_sunset','date_time_set','date_timezone_get',
-            'date_timezone_set','db_id_list','dba_close','dba_delete',
-            'dba_exists','dba_fetch','dba_firstkey','dba_handlers','dba_insert',
-            'dba_key_split','dba_list','dba_nextkey','dba_open','dba_optimize',
-            'dba_popen','dba_replace','dba_sync','dbase_add_record',
-            'dbase_close','dbase_create','dbase_delete_record',
-            'dbase_get_header_info','dbase_get_record',
-            'dbase_get_record_with_names','dbase_numfields','dbase_numrecords',
-            'dbase_open','dbase_pack','dbase_replace_record',
-            'dbg_get_all_contexts','dbg_get_all_module_names',
-            'dbg_get_all_source_lines','dbg_get_context_name',
-            'dbg_get_module_name','dbg_get_profiler_results',
-            'dbg_get_source_context','dblist','dbmclose','dbmdelete',
-            'dbmexists','dbmfetch','dbmfirstkey','dbminsert','dbmnextkey',
-            'dbmopen','dbmreplace','dbx_close','dbx_compare','dbx_connect',
-            'dbx_error','dbx_escape_string','dbx_fetch_row','dbx_query',
-            'dbx_sort','dcgettext','dcngettext','deaggregate','debug_backtrace',
-            'debug_zval_dump','debugbreak','decbin','dechex','decoct','define',
-            'defined','define_syslog_variables','deg2rad','dgettext','die',
-            'dio_close','dio_open','dio_read','dio_seek','dio_stat','dio_write',
-            'dir','dirname','disk_free_space','disk_total_space',
-            'diskfreespace','dl','dngettext','docblock_token_name',
-            'docblock_tokenize','dom_import_simplexml','domxml_add_root',
-            'domxml_attributes','domxml_children','domxml_doc_add_root',
-            'domxml_doc_document_element','domxml_doc_get_element_by_id',
-            'domxml_doc_get_elements_by_tagname','domxml_doc_get_root',
-            'domxml_doc_set_root','domxml_doc_validate','domxml_doc_xinclude',
-            'domxml_dump_mem','domxml_dump_mem_file','domxml_dump_node',
-            'domxml_dumpmem','domxml_elem_get_attribute',
-            'domxml_elem_set_attribute','domxml_get_attribute','domxml_getattr',
-            'domxml_html_dump_mem','domxml_new_child','domxml_new_doc',
-            'domxml_new_xmldoc','domxml_node','domxml_node_add_namespace',
-            'domxml_node_attributes','domxml_node_children',
-            'domxml_node_get_content','domxml_node_has_attributes',
-            'domxml_node_new_child','domxml_node_set_content',
-            'domxml_node_set_namespace','domxml_node_unlink_node',
-            'domxml_open_file','domxml_open_mem','domxml_parser',
-            'domxml_parser_add_chunk','domxml_parser_cdata_section',
-            'domxml_parser_characters','domxml_parser_comment',
-            'domxml_parser_end','domxml_parser_end_document',
-            'domxml_parser_end_element','domxml_parser_entity_reference',
-            'domxml_parser_get_document','domxml_parser_namespace_decl',
-            'domxml_parser_processing_instruction',
-            'domxml_parser_start_document','domxml_parser_start_element',
-            'domxml_root','domxml_set_attribute','domxml_setattr',
-            'domxml_substitute_entities_default','domxml_unlink_node',
-            'domxml_version','domxml_xmltree','doubleval','each','easter_date',
-            'easter_days','empty','end','ereg','ereg_replace','eregi',
-            'eregi_replace','error_get_last','error_log','error_reporting',
-            'escapeshellarg','escapeshellcmd','eval','event_deschedule',
-            'event_dispatch','event_free','event_handle_signal',
-            'event_have_events','event_init','event_new','event_pending',
-            'event_priority_set','event_schedule','event_set','event_timeout',
-            'exec','exif_imagetype','exif_read_data','exif_tagname',
-            'exif_thumbnail','exit','exp','explode','expm1','extension_loaded',
-            'extract','ezmlm_hash','fbird_add_user','fbird_affected_rows',
-            'fbird_backup','fbird_blob_add','fbird_blob_cancel',
-            'fbird_blob_close','fbird_blob_create','fbird_blob_echo',
-            'fbird_blob_get','fbird_blob_import','fbird_blob_info',
-            'fbird_blob_open','fbird_close','fbird_commit','fbird_commit_ret',
-            'fbird_connect','fbird_db_info','fbird_delete_user','fbird_drop_db',
-            'fbird_errcode','fbird_errmsg','fbird_execute','fbird_fetch_assoc',
-            'fbird_fetch_object','fbird_fetch_row','fbird_field_info',
-            'fbird_free_event_handler','fbird_free_query','fbird_free_result',
-            'fbird_gen_id','fbird_maintain_db','fbird_modify_user',
-            'fbird_name_result','fbird_num_fields','fbird_num_params',
-            'fbird_param_info','fbird_pconnect','fbird_prepare','fbird_query',
-            'fbird_restore','fbird_rollback','fbird_rollback_ret',
-            'fbird_server_info','fbird_service_attach','fbird_service_detach',
-            'fbird_set_event_handler','fbird_trans','fbird_wait_event','fclose',
-            'fdf_add_doc_javascript','fdf_add_template','fdf_close',
-            'fdf_create','fdf_enum_values','fdf_errno','fdf_error','fdf_get_ap',
-            'fdf_get_attachment','fdf_get_encoding','fdf_get_file',
-            'fdf_get_flags','fdf_get_opt','fdf_get_status','fdf_get_value',
-            'fdf_get_version','fdf_header','fdf_next_field_name','fdf_open',
-            'fdf_open_string','fdf_remove_item','fdf_save','fdf_save_string',
-            'fdf_set_ap','fdf_set_encoding','fdf_set_file','fdf_set_flags',
-            'fdf_set_javascript_action','fdf_set_on_import_javascript',
-            'fdf_set_opt','fdf_set_status','fdf_set_submit_form_action',
-            'fdf_set_target_frame','fdf_set_value','fdf_set_version','feof',
-            'fflush','fgetc','fgetcsv','fgets','fgetss','file','file_exists',
-            'file_get_contents','file_put_contents','fileatime','filectime',
-            'filegroup','fileinode','filemtime','fileowner','fileperms',
-            'filepro','filepro_fieldcount','filepro_fieldname',
-            'filepro_fieldtype','filepro_fieldwidth','filepro_retrieve',
-            'filepro_rowcount','filesize','filetype','filter_has_var',
-            'filter_id','filter_input','filter_input_array','filter_list',
-            'filter_var','filter_var_array','finfo_buffer','finfo_close',
-            'finfo_file','finfo_open','finfo_set_flags','floatval','flock',
-            'floor','flush','fmod','fnmatch','fopen','fpassthru','fprintf',
-            'fputcsv','fputs','fread','frenchtojd','fribidi_charset_info',
-            'fribidi_get_charsets','fribidi_log2vis','fscanf','fseek',
-            'fsockopen','fstat','ftell','ftok','ftp_alloc','ftp_cdup',
-            'ftp_chdir','ftp_chmod','ftp_close','ftp_connect','ftp_delete',
-            'ftp_exec','ftp_fget','ftp_fput','ftp_get','ftp_get_option',
-            'ftp_login','ftp_mdtm','ftp_mkdir','ftp_nb_continue','ftp_nb_fget',
-            'ftp_nb_fput','ftp_nb_get','ftp_nb_put','ftp_nlist','ftp_pasv',
-            'ftp_put','ftp_pwd','ftp_quit','ftp_raw','ftp_rawlist','ftp_rename',
-            'ftp_rmdir','ftp_set_option','ftp_site','ftp_size',
-            'ftp_ssl_connect','ftp_systype','ftruncate','function_exists',
-            'func_get_arg','func_get_args','func_num_args','fwrite','gd_info',
-            'getallheaders','getcwd','getdate','getenv','gethostbyaddr',
-            'gethostbyname','gethostbynamel','getimagesize','getlastmod',
-            'getmxrr','getmygid','getmyinode','getmypid','getmyuid','getopt',
-            'getprotobyname','getprotobynumber','getrandmax','getrusage',
-            'getservbyname','getservbyport','gettext','gettimeofday','gettype',
-            'get_browser','get_cfg_var','get_class','get_class_methods',
-            'get_class_vars','get_current_user','get_declared_classes',
-            'get_defined_constants','get_defined_functions','get_defined_vars',
-            'get_extension_funcs','get_headers','get_html_translation_table',
-            'get_included_files','get_include_path','get_loaded_extensions',
-            'get_magic_quotes_gpc','get_magic_quotes_runtime','get_meta_tags',
-            'get_object_vars','get_parent_class','get_required_files',
-            'get_resource_type','glob','gmdate','gmmktime','gmp_abs','gmp_add',
-            'gmp_and','gmp_clrbit','gmp_cmp','gmp_com','gmp_div','gmp_div_q',
-            'gmp_div_qr','gmp_div_r','gmp_divexact','gmp_fact','gmp_gcd',
-            'gmp_gcdext','gmp_hamdist','gmp_init','gmp_intval','gmp_invert',
-            'gmp_jacobi','gmp_legendre','gmp_mod','gmp_mul','gmp_neg',
-            'gmp_nextprime','gmp_or','gmp_perfect_square','gmp_popcount',
-            'gmp_pow','gmp_powm','gmp_prob_prime','gmp_random','gmp_scan0',
-            'gmp_scan1','gmp_setbit','gmp_sign','gmp_sqrt','gmp_sqrtrem',
-            'gmp_strval','gmp_sub','gmp_xor','gmstrftime','gopher_parsedir',
-            'gregoriantojd','gzclose','gzcompress','gzdeflate','gzencode',
-            'gzeof','gzfile','gzgetc','gzgets','gzgetss','gzinflate','gzopen',
-            'gzpassthru','gzputs','gzread','gzrewind','gzseek','gztell',
-            'gzuncompress','gzwrite','hash','hash_algos','hash_file',
-            'hash_final','hash_hmac','hash_hmac_file','hash_init','hash_update',
-            'hash_update_file','hash_update_stream','header','headers_list',
-            'headers_sent','hebrev','hebrevc','hexdec','highlight_file',
-            'highlight_string','html_doc','html_doc_file','html_entity_decode',
-            'htmlentities','htmlspecialchars','htmlspecialchars_decode',
-            'http_build_cookie','http_build_query','http_build_str',
-            'http_build_url','http_cache_etag','http_cache_last_modified',
-            'http_chunked_decode','http_date','http_deflate','http_get',
-            'http_get_request_body','http_get_request_body_stream',
-            'http_get_request_headers','http_head','http_inflate',
-            'http_match_etag','http_match_modified','http_match_request_header',
-            'http_negotiate_charset','http_negotiate_content_type',
-            'http_negotiate_language','http_parse_cookie','http_parse_headers',
-            'http_parse_message','http_parse_params',
-            'http_persistent_handles_clean','http_persistent_handles_count',
-            'http_persistent_handles_ident','http_post_data','http_post_fields',
-            'http_put_data','http_put_file','http_put_stream','http_redirect',
-            'http_request','http_request_body_encode',
-            'http_request_method_exists','http_request_method_name',
-            'http_request_method_register','http_request_method_unregister',
-            'http_send_content_disposition','http_send_content_type',
-            'http_send_data','http_send_file','http_send_last_modified',
-            'http_send_status','http_send_stream','http_support',
-            'http_throttle','hypot','i18n_convert','i18n_discover_encoding',
-            'i18n_http_input','i18n_http_output','i18n_internal_encoding',
-            'i18n_ja_jp_hantozen','i18n_mime_header_decode',
-            'i18n_mime_header_encode','ibase_add_user','ibase_affected_rows',
-            'ibase_backup','ibase_blob_add','ibase_blob_cancel',
-            'ibase_blob_close','ibase_blob_create','ibase_blob_echo',
-            'ibase_blob_get','ibase_blob_import','ibase_blob_info',
-            'ibase_blob_open','ibase_close','ibase_commit','ibase_commit_ret',
-            'ibase_connect','ibase_db_info','ibase_delete_user','ibase_drop_db',
-            'ibase_errcode','ibase_errmsg','ibase_execute','ibase_fetch_assoc',
-            'ibase_fetch_object','ibase_fetch_row','ibase_field_info',
-            'ibase_free_event_handler','ibase_free_query','ibase_free_result',
-            'ibase_gen_id','ibase_maintain_db','ibase_modify_user',
-            'ibase_name_result','ibase_num_fields','ibase_num_params',
-            'ibase_param_info','ibase_pconnect','ibase_prepare','ibase_query',
-            'ibase_restore','ibase_rollback','ibase_rollback_ret',
-            'ibase_server_info','ibase_service_attach','ibase_service_detach',
-            'ibase_set_event_handler','ibase_trans','ibase_wait_event','iconv',
-            'iconv_get_encoding','iconv_mime_decode',
-            'iconv_mime_decode_headers','iconv_mime_encode',
-            'iconv_set_encoding','iconv_strlen','iconv_strpos','iconv_strrpos',
-            'iconv_substr','id3_get_frame_long_name','id3_get_frame_short_name',
-            'id3_get_genre_id','id3_get_genre_list','id3_get_genre_name',
-            'id3_get_tag','id3_get_version','id3_remove_tag','id3_set_tag',
-            'idate','ignore_user_abort','image_type_to_extension',
-            'image_type_to_mime_type','image2wbmp','imagealphablending',
-            'imageantialias','imagearc','imagechar','imagecharup',
-            'imagecolorallocate','imagecolorallocatealpha','imagecolorat',
-            'imagecolorclosest','imagecolorclosestalpha','imagecolordeallocate',
-            'imagecolorexact','imagecolorexactalpha','imagecolormatch',
-            'imagecolorresolve','imagecolorresolvealpha','imagecolorset',
-            'imagecolorsforindex','imagecolorstotal','imagecolortransparent',
-            'imageconvolution','imagecopy','imagecopymerge',
-            'imagecopymergegray','imagecopyresampled','imagecopyresized',
-            'imagecreate','imagecreatefromgd','imagecreatefromgd2',
-            'imagecreatefromgd2part','imagecreatefromgif','imagecreatefromjpeg',
-            'imagecreatefrompng','imagecreatefromstring','imagecreatefromwbmp',
-            'imagecreatefromxbm','imagecreatetruecolor','imagedashedline',
-            'imagedestroy','imageellipse','imagefill','imagefilledarc',
-            'imagefilledellipse','imagefilledpolygon','imagefilledrectangle',
-            'imagefilltoborder','imagefilter','imagefontheight',
-            'imagefontwidth','imageftbbox','imagefttext','imagegammacorrect',
-            'imagegd','imagegd2','imagegif','imagegrabscreen','imagegrabwindow',
-            'imageinterlace','imageistruecolor','imagejpeg','imagelayereffect',
-            'imageline','imageloadfont','imagepalettecopy','imagepng',
-            'imagepolygon','imagepsbbox','imagepsencodefont',
-            'imagepsextendfont','imagepsfreefont','imagepsloadfont',
-            'imagepsslantfont','imagepstext','imagerectangle','imagerotate',
-            'imagesavealpha','imagesetbrush','imagesetpixel','imagesetstyle',
-            'imagesetthickness','imagesettile','imagestring','imagestringup',
-            'imagesx','imagesy','imagetruecolortopalette','imagettfbbox',
-            'imagettftext','imagetypes','imagewbmp','imagexbm','imap_8bit',
-            'imap_alerts','imap_append','imap_base64','imap_binary','imap_body',
-            'imap_bodystruct','imap_check','imap_clearflag_full','imap_close',
-            'imap_create','imap_createmailbox','imap_delete',
-            'imap_deletemailbox','imap_errors','imap_expunge',
-            'imap_fetch_overview','imap_fetchbody','imap_fetchheader',
-            'imap_fetchstructure','imap_fetchtext','imap_get_quota',
-            'imap_get_quotaroot','imap_getacl','imap_getmailboxes',
-            'imap_getsubscribed','imap_header','imap_headerinfo','imap_headers',
-            'imap_last_error','imap_list','imap_listmailbox',
-            'imap_listsubscribed','imap_lsub','imap_mail','imap_mail_compose',
-            'imap_mail_copy','imap_mail_move','imap_mailboxmsginfo',
-            'imap_mime_header_decode','imap_msgno','imap_num_msg',
-            'imap_num_recent','imap_open','imap_ping','imap_qprint',
-            'imap_rename','imap_renamemailbox','imap_reopen',
-            'imap_rfc822_parse_adrlist','imap_rfc822_parse_headers',
-            'imap_rfc822_write_address','imap_savebody','imap_scan',
-            'imap_scanmailbox','imap_search','imap_set_quota','imap_setacl',
-            'imap_setflag_full','imap_sort','imap_status','imap_subscribe',
-            'imap_thread','imap_timeout','imap_uid','imap_undelete',
-            'imap_unsubscribe','imap_utf7_decode','imap_utf7_encode',
-            'imap_utf8','implode','import_request_variables','in_array',
-            'ini_alter','ini_get','ini_get_all','ini_restore','ini_set',
-            'intval','ip2long','iptcembed','iptcparse','isset','is_a',
-            'is_array','is_bool','is_callable','is_dir','is_double',
-            'is_executable','is_file','is_finite','is_float','is_infinite',
-            'is_int','is_integer','is_link','is_long','is_nan','is_null',
-            'is_numeric','is_object','is_readable','is_real','is_resource',
-            'is_scalar','is_soap_fault','is_string','is_subclass_of',
-            'is_uploaded_file','is_writable','is_writeable','iterator_apply',
-            'iterator_count','iterator_to_array','java_last_exception_clear',
-            'java_last_exception_get','jddayofweek','jdmonthname','jdtofrench',
-            'jdtogregorian','jdtojewish','jdtojulian','jdtounix','jewishtojd',
-            'join','jpeg2wbmp','json_decode','json_encode','juliantojd','key',
-            'key_exists','krsort','ksort','lcg_value','ldap_add','ldap_bind',
-            'ldap_close','ldap_compare','ldap_connect','ldap_count_entries',
-            'ldap_delete','ldap_dn2ufn','ldap_err2str','ldap_errno',
-            'ldap_error','ldap_explode_dn','ldap_first_attribute',
-            'ldap_first_entry','ldap_first_reference','ldap_free_result',
-            'ldap_get_attributes','ldap_get_dn','ldap_get_entries',
-            'ldap_get_option','ldap_get_values','ldap_get_values_len',
-            'ldap_list','ldap_mod_add','ldap_mod_del','ldap_mod_replace',
-            'ldap_modify','ldap_next_attribute','ldap_next_entry',
-            'ldap_next_reference','ldap_parse_reference','ldap_parse_result',
-            'ldap_read','ldap_rename','ldap_search','ldap_set_option',
-            'ldap_sort','ldap_start_tls','ldap_unbind','levenshtein',
-            'libxml_clear_errors','libxml_get_errors','libxml_get_last_error',
-            'libxml_set_streams_context','libxml_use_internal_errors','link',
-            'linkinfo','list','localeconv','localtime','log','log1p','log10',
-            'long2ip','lstat','ltrim','lzf_compress','lzf_decompress',
-            'lzf_optimized_for','magic_quotes_runtime','mail','max','mbereg',
-            'mberegi','mberegi_replace','mbereg_match','mbereg_replace',
-            'mbereg_search','mbereg_search_getpos','mbereg_search_getregs',
-            'mbereg_search_init','mbereg_search_pos','mbereg_search_regs',
-            'mbereg_search_setpos','mbregex_encoding','mbsplit','mbstrcut',
-            'mbstrlen','mbstrpos','mbstrrpos','mbsubstr','mb_check_encoding',
-            'mb_convert_case','mb_convert_encoding','mb_convert_kana',
-            'mb_convert_variables','mb_decode_mimeheader',
-            'mb_decode_numericentity','mb_detect_encoding','mb_detect_order',
-            'mb_encode_mimeheader','mb_encode_numericentity','mb_ereg',
-            'mb_eregi','mb_eregi_replace','mb_ereg_match','mb_ereg_replace',
-            'mb_ereg_search','mb_ereg_search_getpos','mb_ereg_search_getregs',
-            'mb_ereg_search_init','mb_ereg_search_pos','mb_ereg_search_regs',
-            'mb_ereg_search_setpos','mb_get_info','mb_http_input',
-            'mb_http_output','mb_internal_encoding','mb_language',
-            'mb_list_encodings','mb_output_handler','mb_parse_str',
-            'mb_preferred_mime_name','mb_regex_encoding','mb_regex_set_options',
-            'mb_send_mail','mb_split','mb_strcut','mb_strimwidth','mb_stripos',
-            'mb_stristr','mb_strlen','mb_strpos','mb_strrchr','mb_strrichr',
-            'mb_strripos','mb_strrpos','mb_strstr','mb_strtolower',
-            'mb_strtoupper','mb_strwidth','mb_substitute_character','mb_substr',
-            'mb_substr_count','mcrypt_cbc','mcrypt_cfb','mcrypt_create_iv',
-            'mcrypt_decrypt','mcrypt_ecb','mcrypt_enc_get_algorithms_name',
-            'mcrypt_enc_get_block_size','mcrypt_enc_get_iv_size',
-            'mcrypt_enc_get_key_size','mcrypt_enc_get_modes_name',
-            'mcrypt_enc_get_supported_key_sizes',
-            'mcrypt_enc_is_block_algorithm',
-            'mcrypt_enc_is_block_algorithm_mode','mcrypt_enc_is_block_mode',
-            'mcrypt_enc_self_test','mcrypt_encrypt','mcrypt_generic',
-            'mcrypt_generic_deinit','mcrypt_generic_end','mcrypt_generic_init',
-            'mcrypt_get_block_size','mcrypt_get_cipher_name',
-            'mcrypt_get_iv_size','mcrypt_get_key_size','mcrypt_list_algorithms',
-            'mcrypt_list_modes','mcrypt_module_close',
-            'mcrypt_module_get_algo_block_size',
-            'mcrypt_module_get_algo_key_size',
-            'mcrypt_module_get_supported_key_sizes',
-            'mcrypt_module_is_block_algorithm',
-            'mcrypt_module_is_block_algorithm_mode',
-            'mcrypt_module_is_block_mode','mcrypt_module_open',
-            'mcrypt_module_self_test','mcrypt_ofb','md5','md5_file',
-            'mdecrypt_generic','memcache_add','memcache_add_server',
-            'memcache_close','memcache_connect','memcache_debug',
-            'memcache_decrement','memcache_delete','memcache_flush',
-            'memcache_get','memcache_get_extended_stats',
-            'memcache_get_server_status','memcache_get_stats',
-            'memcache_get_version','memcache_increment','memcache_pconnect',
-            'memcache_replace','memcache_set','memcache_set_compress_threshold',
-            'memcache_set_server_params','memory_get_peak_usage',
-            'memory_get_usage','metaphone','mhash','mhash_count',
-            'mhash_get_block_size','mhash_get_hash_name','mhash_keygen_s2k',
-            'method_exists','microtime','mime_content_type','min',
-            'ming_keypress','ming_setcubicthreshold','ming_setscale',
-            'ming_useconstants','ming_useswfversion','mkdir','mktime',
-            'money_format','move_uploaded_file','msql','msql_affected_rows',
-            'msql_close','msql_connect','msql_create_db','msql_createdb',
-            'msql_data_seek','msql_db_query','msql_dbname','msql_drop_db',
-            'msql_dropdb','msql_error','msql_fetch_array','msql_fetch_field',
-            'msql_fetch_object','msql_fetch_row','msql_field_flags',
-            'msql_field_len','msql_field_name','msql_field_seek',
-            'msql_field_table','msql_field_type','msql_fieldflags',
-            'msql_fieldlen','msql_fieldname','msql_fieldtable','msql_fieldtype',
-            'msql_free_result','msql_freeresult','msql_list_dbs',
-            'msql_list_fields','msql_list_tables','msql_listdbs',
-            'msql_listfields','msql_listtables','msql_num_fields',
-            'msql_num_rows','msql_numfields','msql_numrows','msql_pconnect',
-            'msql_query','msql_regcase','msql_result','msql_select_db',
-            'msql_selectdb','msql_tablename','mssql_bind','mssql_close',
-            'mssql_connect','mssql_data_seek','mssql_execute',
-            'mssql_fetch_array','mssql_fetch_assoc','mssql_fetch_batch',
-            'mssql_fetch_field','mssql_fetch_object','mssql_fetch_row',
-            'mssql_field_length','mssql_field_name','mssql_field_seek',
-            'mssql_field_type','mssql_free_result','mssql_free_statement',
-            'mssql_get_last_message','mssql_guid_string','mssql_init',
-            'mssql_min_error_severity','mssql_min_message_severity',
-            'mssql_next_result','mssql_num_fields','mssql_num_rows',
-            'mssql_pconnect','mssql_query','mssql_result','mssql_rows_affected',
-            'mssql_select_db','mt_getrandmax','mt_rand','mt_srand','mysql',
-            'mysql_affected_rows','mysql_client_encoding','mysql_close',
-            'mysql_connect','mysql_createdb','mysql_create_db',
-            'mysql_data_seek','mysql_dbname','mysql_db_name','mysql_db_query',
-            'mysql_dropdb','mysql_drop_db','mysql_errno','mysql_error',
-            'mysql_escape_string','mysql_fetch_array','mysql_fetch_assoc',
-            'mysql_fetch_field','mysql_fetch_lengths','mysql_fetch_object',
-            'mysql_fetch_row','mysql_fieldflags','mysql_fieldlen',
-            'mysql_fieldname','mysql_fieldtable','mysql_fieldtype',
-            'mysql_field_flags','mysql_field_len','mysql_field_name',
-            'mysql_field_seek','mysql_field_table','mysql_field_type',
-            'mysql_freeresult','mysql_free_result','mysql_get_client_info',
-            'mysql_get_host_info','mysql_get_proto_info',
-            'mysql_get_server_info','mysql_info','mysql_insert_id',
-            'mysql_listdbs','mysql_listfields','mysql_listtables',
-            'mysql_list_dbs','mysql_list_fields','mysql_list_processes',
-            'mysql_list_tables','mysql_numfields','mysql_numrows',
-            'mysql_num_fields','mysql_num_rows','mysql_pconnect','mysql_ping',
-            'mysql_query','mysql_real_escape_string','mysql_result',
-            'mysql_selectdb','mysql_select_db','mysql_set_charset','mysql_stat',
-            'mysql_tablename','mysql_table_name','mysql_thread_id',
-            'mysql_unbuffered_query','mysqli_affected_rows','mysqli_autocommit',
-            'mysqli_bind_param','mysqli_bind_result','mysqli_change_user',
-            'mysqli_character_set_name','mysqli_client_encoding','mysqli_close',
-            'mysqli_commit','mysqli_connect','mysqli_connect_errno',
-            'mysqli_connect_error','mysqli_data_seek','mysqli_debug',
-            'mysqli_disable_reads_from_master','mysqli_disable_rpl_parse',
-            'mysqli_dump_debug_info','mysqli_embedded_server_end',
-            'mysqli_embedded_server_start','mysqli_enable_reads_from_master',
-            'mysqli_enable_rpl_parse','mysqli_errno','mysqli_error',
-            'mysqli_escape_string','mysqli_execute','mysqli_fetch',
-            'mysqli_fetch_array','mysqli_fetch_assoc','mysqli_fetch_field',
-            'mysqli_fetch_field_direct','mysqli_fetch_fields',
-            'mysqli_fetch_lengths','mysqli_fetch_object','mysqli_fetch_row',
-            'mysqli_field_count','mysqli_field_seek','mysqli_field_tell',
-            'mysqli_free_result','mysqli_get_charset','mysqli_get_client_info',
-            'mysqli_get_client_version','mysqli_get_host_info',
-            'mysqli_get_metadata','mysqli_get_proto_info',
-            'mysqli_get_server_info','mysqli_get_server_version',
-            'mysqli_get_warnings','mysqli_info','mysqli_init',
-            'mysqli_insert_id','mysqli_kill','mysqli_master_query',
-            'mysqli_more_results','mysqli_multi_query','mysqli_next_result',
-            'mysqli_num_fields','mysqli_num_rows','mysqli_options',
-            'mysqli_param_count','mysqli_ping','mysqli_prepare','mysqli_query',
-            'mysqli_real_connect','mysqli_real_escape_string',
-            'mysqli_real_query','mysqli_report','mysqli_rollback',
-            'mysqli_rpl_parse_enabled','mysqli_rpl_probe',
-            'mysqli_rpl_query_type','mysqli_select_db','mysqli_send_long_data',
-            'mysqli_send_query','mysqli_set_charset',
-            'mysqli_set_local_infile_default','mysqli_set_local_infile_handler',
-            'mysqli_set_opt','mysqli_slave_query','mysqli_sqlstate',
-            'mysqli_ssl_set','mysqli_stat','mysqli_stmt_affected_rows',
-            'mysqli_stmt_attr_get','mysqli_stmt_attr_set',
-            'mysqli_stmt_bind_param','mysqli_stmt_bind_result',
-            'mysqli_stmt_close','mysqli_stmt_data_seek','mysqli_stmt_errno',
-            'mysqli_stmt_error','mysqli_stmt_execute','mysqli_stmt_fetch',
-            'mysqli_stmt_field_count','mysqli_stmt_free_result',
-            'mysqli_stmt_get_warnings','mysqli_stmt_init',
-            'mysqli_stmt_insert_id','mysqli_stmt_num_rows',
-            'mysqli_stmt_param_count','mysqli_stmt_prepare','mysqli_stmt_reset',
-            'mysqli_stmt_result_metadata','mysqli_stmt_send_long_data',
-            'mysqli_stmt_sqlstate','mysqli_stmt_store_result',
-            'mysqli_store_result','mysqli_thread_id','mysqli_thread_safe',
-            'mysqli_use_result','mysqli_warning_count','natcasesort','natsort',
-            'new_xmldoc','next','ngettext','nl2br','nl_langinfo',
-            'ntuser_getdomaincontroller','ntuser_getusergroups',
-            'ntuser_getuserinfo','ntuser_getuserlist','number_format',
-            'ob_clean','ob_deflatehandler','ob_end_clean','ob_end_flush',
-            'ob_etaghandler','ob_flush','ob_get_clean','ob_get_contents',
-            'ob_get_flush','ob_get_length','ob_get_level','ob_get_status',
-            'ob_gzhandler','ob_iconv_handler','ob_implicit_flush',
-            'ob_inflatehandler','ob_list_handlers','ob_start','ob_tidyhandler',
-            'octdec','odbc_autocommit','odbc_binmode','odbc_close',
-            'odbc_close_all','odbc_columnprivileges','odbc_columns',
-            'odbc_commit','odbc_connect','odbc_cursor','odbc_data_source',
-            'odbc_do','odbc_error','odbc_errormsg','odbc_exec','odbc_execute',
-            'odbc_fetch_array','odbc_fetch_into','odbc_fetch_object',
-            'odbc_fetch_row','odbc_field_len','odbc_field_name',
-            'odbc_field_num','odbc_field_precision','odbc_field_scale',
-            'odbc_field_type','odbc_foreignkeys','odbc_free_result',
-            'odbc_gettypeinfo','odbc_longreadlen','odbc_next_result',
-            'odbc_num_fields','odbc_num_rows','odbc_pconnect','odbc_prepare',
-            'odbc_primarykeys','odbc_procedurecolumns','odbc_procedures',
-            'odbc_result','odbc_result_all','odbc_rollback','odbc_setoption',
-            'odbc_specialcolumns','odbc_statistics','odbc_tableprivileges',
-            'odbc_tables','opendir','openlog','openssl_csr_export',
-            'openssl_csr_export_to_file','openssl_csr_get_public_key',
-            'openssl_csr_get_subject','openssl_csr_new','openssl_csr_sign',
-            'openssl_error_string','openssl_free_key','openssl_get_privatekey',
-            'openssl_get_publickey','openssl_open','openssl_pkcs12_export',
-            'openssl_pkcs12_export_to_file','openssl_pkcs12_read',
-            'openssl_pkcs7_decrypt','openssl_pkcs7_encrypt',
-            'openssl_pkcs7_sign','openssl_pkcs7_verify','openssl_pkey_export',
-            'openssl_pkey_export_to_file','openssl_pkey_free',
-            'openssl_pkey_get_details','openssl_pkey_get_private',
-            'openssl_pkey_get_public','openssl_pkey_new',
-            'openssl_private_decrypt','openssl_private_encrypt',
-            'openssl_public_decrypt','openssl_public_encrypt','openssl_seal',
-            'openssl_sign','openssl_verify','openssl_x509_checkpurpose',
-            'openssl_x509_check_private_key','openssl_x509_export',
-            'openssl_x509_export_to_file','openssl_x509_free',
-            'openssl_x509_parse','openssl_x509_read','ord',
-            'output_add_rewrite_var','output_reset_rewrite_vars','overload',
-            'outputdebugstring','pack','parse_ini_file','parse_str','parse_url',
-            'parsekit_compile_file','parsekit_compile_string',
-            'parsekit_func_arginfo','parsekit_opcode_flags',
-            'parsekit_opcode_name','passthru','pathinfo','pclose',
-            'pdf_add_bookmark','pdf_add_launchlink','pdf_add_locallink',
-            'pdf_add_nameddest','pdf_add_note','pdf_add_pdflink',
-            'pdf_add_thumbnail','pdf_add_weblink','pdf_arc','pdf_arcn',
-            'pdf_attach_file','pdf_begin_font','pdf_begin_glyph',
-            'pdf_begin_page','pdf_begin_pattern','pdf_begin_template',
-            'pdf_circle','pdf_clip','pdf_close','pdf_close_image',
-            'pdf_close_pdi','pdf_close_pdi_page','pdf_closepath',
-            'pdf_closepath_fill_stroke','pdf_closepath_stroke','pdf_concat',
-            'pdf_continue_text','pdf_create_gstate','pdf_create_pvf',
-            'pdf_curveto','pdf_delete','pdf_delete_pvf','pdf_encoding_set_char',
-            'pdf_end_font','pdf_end_glyph','pdf_end_page','pdf_end_pattern',
-            'pdf_end_template','pdf_endpath','pdf_fill','pdf_fill_imageblock',
-            'pdf_fill_pdfblock','pdf_fill_stroke','pdf_fill_textblock',
-            'pdf_findfont','pdf_fit_image','pdf_fit_pdi_page',
-            'pdf_fit_textline','pdf_get_apiname','pdf_get_buffer',
-            'pdf_get_errmsg','pdf_get_errnum','pdf_get_parameter',
-            'pdf_get_pdi_parameter','pdf_get_pdi_value','pdf_get_value',
-            'pdf_initgraphics','pdf_lineto','pdf_load_font',
-            'pdf_load_iccprofile','pdf_load_image','pdf_makespotcolor',
-            'pdf_moveto','pdf_new','pdf_open_ccitt','pdf_open_file',
-            'pdf_open_image','pdf_open_image_file','pdf_open_pdi',
-            'pdf_open_pdi_page','pdf_place_image','pdf_place_pdi_page',
-            'pdf_process_pdi','pdf_rect','pdf_restore','pdf_rotate','pdf_save',
-            'pdf_scale','pdf_set_border_color','pdf_set_border_dash',
-            'pdf_set_border_style','pdf_set_gstate','pdf_set_info',
-            'pdf_set_parameter','pdf_set_text_pos','pdf_set_value',
-            'pdf_setcolor','pdf_setdash','pdf_setdashpattern','pdf_setflat',
-            'pdf_setfont','pdf_setlinecap','pdf_setlinejoin','pdf_setlinewidth',
-            'pdf_setmatrix','pdf_setmiterlimit','pdf_setpolydash','pdf_shading',
-            'pdf_shading_pattern','pdf_shfill','pdf_show','pdf_show_boxed',
-            'pdf_show_xy','pdf_skew','pdf_stringwidth','pdf_stroke',
-            'pdf_translate','pdo_drivers','pfsockopen','pg_affected_rows',
-            'pg_cancel_query','pg_clientencoding','pg_client_encoding',
-            'pg_close','pg_cmdtuples','pg_connect','pg_connection_busy',
-            'pg_connection_reset','pg_connection_status','pg_convert',
-            'pg_copy_from','pg_copy_to','pg_dbname','pg_delete','pg_end_copy',
-            'pg_errormessage','pg_escape_bytea','pg_escape_string','pg_exec',
-            'pg_execute','pg_fetch_all','pg_fetch_all_columns','pg_fetch_array',
-            'pg_fetch_assoc','pg_fetch_object','pg_fetch_result','pg_fetch_row',
-            'pg_fieldisnull','pg_fieldname','pg_fieldnum','pg_fieldprtlen',
-            'pg_fieldsize','pg_fieldtype','pg_field_is_null','pg_field_name',
-            'pg_field_num','pg_field_prtlen','pg_field_size','pg_field_table',
-            'pg_field_type','pg_field_type_oid','pg_free_result',
-            'pg_freeresult','pg_get_notify','pg_get_pid','pg_get_result',
-            'pg_getlastoid','pg_host','pg_insert','pg_last_error',
-            'pg_last_notice','pg_last_oid','pg_loclose','pg_locreate',
-            'pg_loexport','pg_loimport','pg_loopen','pg_loread','pg_loreadall',
-            'pg_lounlink','pg_lowrite','pg_lo_close','pg_lo_create',
-            'pg_lo_export','pg_lo_import','pg_lo_open','pg_lo_read',
-            'pg_lo_read_all','pg_lo_seek','pg_lo_tell','pg_lo_unlink',
-            'pg_lo_write','pg_meta_data','pg_numfields','pg_numrows',
-            'pg_num_fields','pg_num_rows','pg_options','pg_parameter_status',
-            'pg_pconnect','pg_ping','pg_port','pg_prepare','pg_put_line',
-            'pg_query','pg_query_params','pg_result','pg_result_error',
-            'pg_result_error_field','pg_result_seek','pg_result_status',
-            'pg_select','pg_send_execute','pg_send_prepare','pg_send_query',
-            'pg_send_query_params','pg_set_client_encoding',
-            'pg_set_error_verbosity','pg_setclientencoding','pg_trace',
-            'pg_transaction_status','pg_tty','pg_unescape_bytea','pg_untrace',
-            'pg_update','pg_version','php_egg_logo_guid','php_ini_loaded_file',
-            'php_ini_scanned_files','php_logo_guid','php_real_logo_guid',
-            'php_sapi_name','php_strip_whitespace','php_uname','phpcredits',
-            'phpdoc_xml_from_string','phpinfo','phpversion','pi','png2wbmp',
-            'pop3_close','pop3_delete_message','pop3_get_account_size',
-            'pop3_get_message','pop3_get_message_count',
-            'pop3_get_message_header','pop3_get_message_ids',
-            'pop3_get_message_size','pop3_get_message_sizes','pop3_open',
-            'pop3_undelete','popen','pos','posix_ctermid','posix_errno',
-            'posix_getcwd','posix_getegid','posix_geteuid','posix_getgid',
-            'posix_getgrgid','posix_getgrnam','posix_getgroups',
-            'posix_getlogin','posix_getpgid','posix_getpgrp','posix_getpid',
-            'posix_getppid','posix_getpwnam','posix_getpwuid','posix_getrlimit',
-            'posix_getsid','posix_getuid','posix_get_last_error','posix_isatty',
-            'posix_kill','posix_mkfifo','posix_setegid','posix_seteuid',
-            'posix_setgid','posix_setpgid','posix_setsid','posix_setuid',
-            'posix_strerror','posix_times','posix_ttyname','posix_uname','pow',
-            'preg_grep','preg_last_error','preg_match','preg_match_all',
-            'preg_quote','preg_replace','preg_replace_callback','preg_split',
-            'prev','print_r','printf','proc_close','proc_get_status',
-            'proc_open','proc_terminate','putenv','quoted_printable_decode',
-            'quotemeta','rad2deg','radius_acct_open','radius_add_server',
-            'radius_auth_open','radius_close','radius_config',
-            'radius_create_request','radius_cvt_addr','radius_cvt_int',
-            'radius_cvt_string','radius_demangle','radius_demangle_mppe_key',
-            'radius_get_attr','radius_get_vendor_attr','radius_put_addr',
-            'radius_put_attr','radius_put_int','radius_put_string',
-            'radius_put_vendor_addr','radius_put_vendor_attr',
-            'radius_put_vendor_int','radius_put_vendor_string',
-            'radius_request_authenticator','radius_send_request',
-            'radius_server_secret','radius_strerror','rand','range',
-            'rawurldecode','rawurlencode','read_exif_data','readdir','readfile',
-            'readgzfile','readlink','realpath','reg_close_key','reg_create_key',
-            'reg_enum_key','reg_enum_value','reg_get_value','reg_open_key',
-            'reg_set_value','register_shutdown_function',
-            'register_tick_function','rename','res_close','res_get','res_list',
-            'res_list_type','res_open','res_set','reset',
-            'restore_error_handler','restore_include_path','rewind','rewinddir',
-            'rmdir','round','rsort','rtrim','runkit_class_adopt',
-            'runkit_class_emancipate','runkit_constant_add',
-            'runkit_constant_redefine','runkit_constant_remove',
-            'runkit_default_property_add','runkit_function_add',
-            'runkit_function_copy','runkit_function_redefine',
-            'runkit_function_remove','runkit_function_rename','runkit_import',
-            'runkit_lint','runkit_lint_file','runkit_method_add',
-            'runkit_method_copy','runkit_method_redefine',
-            'runkit_method_remove','runkit_method_rename','runkit_object_id',
-            'runkit_return_value_used','runkit_sandbox_output_handler',
-            'runkit_superglobals','runkit_zval_inspect','scandir','sem_acquire',
-            'sem_get','sem_release','sem_remove','serialize',
-            'session_cache_expire','session_cache_limiter','session_commit',
-            'session_decode','session_destroy','session_encode',
-            'session_get_cookie_params','session_id','session_is_registered',
-            'session_module_name','session_name','session_regenerate_id',
-            'session_register','session_save_path','session_set_cookie_params',
-            'session_set_save_handler','session_start','session_unregister',
-            'session_unset','session_write_close','set_content',
-            'set_error_handler','set_file_buffer','set_include_path',
-            'set_magic_quotes_runtime','set_socket_blocking','set_time_limit',
-            'setcookie','setlocale','setrawcookie','settype','sha1','sha1_file',
-            'shell_exec','shmop_close','shmop_delete','shmop_open','shmop_read',
-            'shmop_size','shmop_write','shm_attach','shm_detach','shm_get_var',
-            'shm_put_var','shm_remove','shm_remove_var','show_source','shuffle',
-            'similar_text','simplexml_import_dom','simplexml_load_file',
-            'simplexml_load_string','sin','sinh','sizeof','sleep','smtp_close',
-            'smtp_cmd_data','smtp_cmd_mail','smtp_cmd_rcpt','smtp_connect',
-            'snmp_get_quick_print','snmp_get_valueretrieval','snmp_read_mib',
-            'snmp_set_quick_print','snmp_set_valueretrieval','snmp2_get',
-            'snmp2_getnext','snmp2_real_walk','snmp2_set','snmp2_walk',
-            'snmp3_get','snmp3_getnext','snmp3_real_walk','snmp3_set',
-            'snmp3_walk','snmpget','snmpgetnext','snmprealwalk','snmpset',
-            'snmpwalk','snmpwalkoid','socket_accept','socket_bind',
-            'socket_clear_error','socket_close','socket_connect',
-            'socket_create','socket_create_listen','socket_create_pair',
-            'socket_getopt','socket_getpeername','socket_getsockname',
-            'socket_get_option','socket_get_status','socket_iovec_add',
-            'socket_iovec_alloc','socket_iovec_delete','socket_iovec_fetch',
-            'socket_iovec_free','socket_iovec_set','socket_last_error',
-            'socket_listen','socket_read','socket_readv','socket_recv',
-            'socket_recvfrom','socket_recvmsg','socket_select','socket_send',
-            'socket_sendmsg','socket_sendto','socket_setopt','socket_set_block',
-            'socket_set_blocking','socket_set_nonblock','socket_set_option',
-            'socket_set_timeout','socket_shutdown','socket_strerror',
-            'socket_write','socket_writev','sort','soundex','spl_autoload',
-            'spl_autoload_call','spl_autoload_extensions',
-            'spl_autoload_functions','spl_autoload_register',
-            'spl_autoload_unregister','spl_classes','spl_object_hash','split',
-            'spliti','sprintf','sql_regcase','sqlite_array_query',
-            'sqlite_busy_timeout','sqlite_changes','sqlite_close',
-            'sqlite_column','sqlite_create_aggregate','sqlite_create_function',
-            'sqlite_current','sqlite_error_string','sqlite_escape_string',
-            'sqlite_exec','sqlite_factory','sqlite_fetch_all',
-            'sqlite_fetch_array','sqlite_fetch_column_types',
-            'sqlite_fetch_object','sqlite_fetch_single','sqlite_fetch_string',
-            'sqlite_field_name','sqlite_has_more','sqlite_has_prev',
-            'sqlite_last_error','sqlite_last_insert_rowid','sqlite_libencoding',
-            'sqlite_libversion','sqlite_next','sqlite_num_fields',
-            'sqlite_num_rows','sqlite_open','sqlite_popen','sqlite_prev',
-            'sqlite_query','sqlite_rewind','sqlite_seek','sqlite_single_query',
-            'sqlite_udf_decode_binary','sqlite_udf_encode_binary',
-            'sqlite_unbuffered_query','sqlite_valid','sqrt','srand','sscanf',
-            'ssh2_auth_hostbased_file','ssh2_auth_none','ssh2_auth_password',
-            'ssh2_auth_pubkey_file','ssh2_connect','ssh2_exec',
-            'ssh2_fetch_stream','ssh2_fingerprint','ssh2_forward_accept',
-            'ssh2_forward_listen','ssh2_methods_negotiated','ssh2_poll',
-            'ssh2_publickey_add','ssh2_publickey_init','ssh2_publickey_list',
-            'ssh2_publickey_remove','ssh2_scp_recv','ssh2_scp_send','ssh2_sftp',
-            'ssh2_sftp_lstat','ssh2_sftp_mkdir','ssh2_sftp_readlink',
-            'ssh2_sftp_realpath','ssh2_sftp_rename','ssh2_sftp_rmdir',
-            'ssh2_sftp_stat','ssh2_sftp_symlink','ssh2_sftp_unlink',
-            'ssh2_shell','ssh2_tunnel','stat','stats_absolute_deviation',
-            'stats_cdf_beta','stats_cdf_binomial','stats_cdf_cauchy',
-            'stats_cdf_chisquare','stats_cdf_exponential','stats_cdf_f',
-            'stats_cdf_gamma','stats_cdf_laplace','stats_cdf_logistic',
-            'stats_cdf_negative_binomial','stats_cdf_noncentral_chisquare',
-            'stats_cdf_noncentral_f','stats_cdf_noncentral_t',
-            'stats_cdf_normal','stats_cdf_poisson','stats_cdf_t',
-            'stats_cdf_uniform','stats_cdf_weibull','stats_covariance',
-            'stats_dens_beta','stats_dens_cauchy','stats_dens_chisquare',
-            'stats_dens_exponential','stats_dens_f','stats_dens_gamma',
-            'stats_dens_laplace','stats_dens_logistic','stats_dens_normal',
-            'stats_dens_pmf_binomial','stats_dens_pmf_hypergeometric',
-            'stats_dens_pmf_negative_binomial','stats_dens_pmf_poisson',
-            'stats_dens_t','stats_dens_uniform','stats_dens_weibull',
-            'stats_harmonic_mean','stats_kurtosis','stats_rand_gen_beta',
-            'stats_rand_gen_chisquare','stats_rand_gen_exponential',
-            'stats_rand_gen_f','stats_rand_gen_funiform','stats_rand_gen_gamma',
-            'stats_rand_gen_ipoisson','stats_rand_gen_iuniform',
-            'stats_rand_gen_noncenral_f','stats_rand_gen_noncentral_chisquare',
-            'stats_rand_gen_noncentral_t','stats_rand_gen_normal',
-            'stats_rand_gen_t','stats_rand_getsd','stats_rand_ibinomial',
-            'stats_rand_ibinomial_negative','stats_rand_ignlgi',
-            'stats_rand_phrase_to_seeds','stats_rand_ranf','stats_rand_setall',
-            'stats_skew','stats_standard_deviation','stats_stat_binomial_coef',
-            'stats_stat_correlation','stats_stat_factorial',
-            'stats_stat_independent_t','stats_stat_innerproduct',
-            'stats_stat_paired_t','stats_stat_percentile','stats_stat_powersum',
-            'stats_variance','strcasecmp','strchr','strcmp','strcoll','strcspn',
-            'stream_bucket_append','stream_bucket_make_writeable',
-            'stream_bucket_new','stream_bucket_prepend','stream_context_create',
-            'stream_context_get_default','stream_context_get_options',
-            'stream_context_set_default','stream_context_set_option',
-            'stream_context_set_params','stream_copy_to_stream',
-            'stream_encoding','stream_filter_append','stream_filter_prepend',
-            'stream_filter_register','stream_filter_remove',
-            'stream_get_contents','stream_get_filters','stream_get_line',
-            'stream_get_meta_data','stream_get_transports',
-            'stream_get_wrappers','stream_is_local',
-            'stream_notification_callback','stream_register_wrapper',
-            'stream_resolve_include_path','stream_select','stream_set_blocking',
-            'stream_set_timeout','stream_set_write_buffer',
-            'stream_socket_accept','stream_socket_client',
-            'stream_socket_enable_crypto','stream_socket_get_name',
-            'stream_socket_pair','stream_socket_recvfrom',
-            'stream_socket_sendto','stream_socket_server',
-            'stream_socket_shutdown','stream_supports_lock',
-            'stream_wrapper_register','stream_wrapper_restore',
-            'stream_wrapper_unregister','strftime','stripcslashes','stripos',
-            'stripslashes','strip_tags','stristr','strlen','strnatcasecmp',
-            'strnatcmp','strpbrk','strncasecmp','strncmp','strpos','strrchr',
-            'strrev','strripos','strrpos','strspn','strstr','strtok',
-            'strtolower','strtotime','strtoupper','strtr','strval',
-            'str_ireplace','str_pad','str_repeat','str_replace','str_rot13',
-            'str_split','str_shuffle','str_word_count','substr',
-            'substr_compare','substr_count','substr_replace','svn_add',
-            'svn_auth_get_parameter','svn_auth_set_parameter','svn_cat',
-            'svn_checkout','svn_cleanup','svn_client_version','svn_commit',
-            'svn_diff','svn_export','svn_fs_abort_txn','svn_fs_apply_text',
-            'svn_fs_begin_txn2','svn_fs_change_node_prop','svn_fs_check_path',
-            'svn_fs_contents_changed','svn_fs_copy','svn_fs_delete',
-            'svn_fs_dir_entries','svn_fs_file_contents','svn_fs_file_length',
-            'svn_fs_is_dir','svn_fs_is_file','svn_fs_make_dir',
-            'svn_fs_make_file','svn_fs_node_created_rev','svn_fs_node_prop',
-            'svn_fs_props_changed','svn_fs_revision_prop',
-            'svn_fs_revision_root','svn_fs_txn_root','svn_fs_youngest_rev',
-            'svn_import','svn_info','svn_log','svn_ls','svn_repos_create',
-            'svn_repos_fs','svn_repos_fs_begin_txn_for_commit',
-            'svn_repos_fs_commit_txn','svn_repos_hotcopy','svn_repos_open',
-            'svn_repos_recover','svn_status','svn_update','symlink',
-            'sys_get_temp_dir','syslog','system','tan','tanh','tempnam',
-            'textdomain','thread_get','thread_include','thread_lock',
-            'thread_lock_try','thread_mutex_destroy','thread_mutex_init',
-            'thread_set','thread_start','thread_unlock','tidy_access_count',
-            'tidy_clean_repair','tidy_config_count','tidy_diagnose',
-            'tidy_error_count','tidy_get_body','tidy_get_config',
-            'tidy_get_error_buffer','tidy_get_head','tidy_get_html',
-            'tidy_get_html_ver','tidy_get_output','tidy_get_release',
-            'tidy_get_root','tidy_get_status','tidy_getopt','tidy_is_xhtml',
-            'tidy_is_xml','tidy_parse_file','tidy_parse_string',
-            'tidy_repair_file','tidy_repair_string','tidy_warning_count','time',
-            'timezone_abbreviations_list','timezone_identifiers_list',
-            'timezone_name_from_abbr','timezone_name_get','timezone_offset_get',
-            'timezone_open','timezone_transitions_get','tmpfile',
-            'token_get_all','token_name','touch','trigger_error',
-            'transliterate','transliterate_filters_get','trim','uasort',
-            'ucfirst','ucwords','uksort','umask','uniqid','unixtojd','unlink',
-            'unpack','unregister_tick_function','unserialize','unset',
-            'urldecode','urlencode','user_error','use_soap_error_handler',
-            'usleep','usort','utf8_decode','utf8_encode','var_dump',
-            'var_export','variant_abs','variant_add','variant_and',
-            'variant_cast','variant_cat','variant_cmp',
-            'variant_date_from_timestamp','variant_date_to_timestamp',
-            'variant_div','variant_eqv','variant_fix','variant_get_type',
-            'variant_idiv','variant_imp','variant_int','variant_mod',
-            'variant_mul','variant_neg','variant_not','variant_or',
-            'variant_pow','variant_round','variant_set','variant_set_type',
-            'variant_sub','variant_xor','version_compare','virtual','vfprintf',
-            'vprintf','vsprintf','wddx_add_vars','wddx_deserialize',
-            'wddx_packet_end','wddx_packet_start','wddx_serialize_value',
-            'wddx_serialize_vars','win_beep','win_browse_file',
-            'win_browse_folder','win_create_link','win_message_box',
-            'win_play_wav','win_shell_execute','win32_create_service',
-            'win32_delete_service','win32_get_last_control_message',
-            'win32_ps_list_procs','win32_ps_stat_mem','win32_ps_stat_proc',
-            'win32_query_service_status','win32_scheduler_delete_task',
-            'win32_scheduler_enum_tasks','win32_scheduler_get_task_info',
-            'win32_scheduler_run','win32_scheduler_set_task_info',
-            'win32_set_service_status','win32_start_service',
-            'win32_start_service_ctrl_dispatcher','win32_stop_service',
-            'wordwrap','xml_error_string','xml_get_current_byte_index',
-            'xml_get_current_column_number','xml_get_current_line_number',
-            'xml_get_error_code','xml_parse','xml_parser_create',
-            'xml_parser_create_ns','xml_parser_free','xml_parser_get_option',
-            'xml_parser_set_option','xml_parse_into_struct',
-            'xml_set_character_data_handler','xml_set_default_handler',
-            'xml_set_element_handler','xml_set_end_namespace_decl_handler',
-            'xml_set_external_entity_ref_handler',
-            'xml_set_notation_decl_handler','xml_set_object',
-            'xml_set_processing_instruction_handler',
-            'xml_set_start_namespace_decl_handler',
-            'xml_set_unparsed_entity_decl_handler','xmldoc','xmldocfile',
-            'xmlrpc_decode','xmlrpc_decode_request','xmlrpc_encode',
-            'xmlrpc_encode_request','xmlrpc_get_type','xmlrpc_is_fault',
-            'xmlrpc_parse_method_descriptions',
-            'xmlrpc_server_add_introspection_data','xmlrpc_server_call_method',
-            'xmlrpc_server_create','xmlrpc_server_destroy',
-            'xmlrpc_server_register_introspection_callback',
-            'xmlrpc_server_register_method','xmlrpc_set_type','xmltree',
-            'xmlwriter_end_attribute','xmlwriter_end_cdata',
-            'xmlwriter_end_comment','xmlwriter_end_document',
-            'xmlwriter_end_dtd','xmlwriter_end_dtd_attlist',
-            'xmlwriter_end_dtd_element','xmlwriter_end_dtd_entity',
-            'xmlwriter_end_element','xmlwriter_end_pi','xmlwriter_flush',
-            'xmlwriter_full_end_element','xmlwriter_open_memory',
-            'xmlwriter_open_uri','xmlwriter_output_memory',
-            'xmlwriter_set_indent','xmlwriter_set_indent_string',
-            'xmlwriter_start_attribute','xmlwriter_start_attribute_ns',
-            'xmlwriter_start_cdata','xmlwriter_start_comment',
-            'xmlwriter_start_document','xmlwriter_start_dtd',
-            'xmlwriter_start_dtd_attlist','xmlwriter_start_dtd_element',
-            'xmlwriter_start_dtd_entity','xmlwriter_start_element',
-            'xmlwriter_start_element_ns','xmlwriter_start_pi','xmlwriter_text',
-            'xmlwriter_write_attribute','xmlwriter_write_attribute_ns',
-            'xmlwriter_write_cdata','xmlwriter_write_comment',
-            'xmlwriter_write_dtd','xmlwriter_write_dtd_attlist',
-            'xmlwriter_write_dtd_element','xmlwriter_write_dtd_entity',
-            'xmlwriter_write_element','xmlwriter_write_element_ns',
-            'xmlwriter_write_pi','xmlwriter_write_raw','xpath_eval',
-            'xpath_eval_expression','xpath_new_context','xpath_register_ns',
-            'xpath_register_ns_auto','xptr_eval','xptr_new_context','yp_all',
-            'yp_cat','yp_errno','yp_err_string','yp_first',
-            'yp_get_default_domain','yp_master','yp_match','yp_next','yp_order',
-            'zend_current_obfuscation_level','zend_get_cfg_var','zend_get_id',
-            'zend_loader_current_file','zend_loader_enabled',
-            'zend_loader_file_encoded','zend_loader_file_licensed',
-            'zend_loader_install_license','zend_loader_version',
-            'zend_logo_guid','zend_match_hostmasks','zend_obfuscate_class_name',
-            'zend_obfuscate_function_name','zend_optimizer_version',
-            'zend_runtime_obfuscate','zend_version','zip_close',
-            'zip_entry_close','zip_entry_compressedsize',
-            'zip_entry_compressionmethod','zip_entry_filesize','zip_entry_name',
-            'zip_entry_open','zip_entry_read','zip_open','zip_read',
-            'zlib_get_coding_type'
-            ),
-        4 => array(
-            'DEFAULT_INCLUDE_PATH', 'DIRECTORY_SEPARATOR', 'E_ALL',
-            'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_CORE_ERROR',
-            'E_CORE_WARNING', 'E_ERROR', 'E_NOTICE', 'E_PARSE', 'E_STRICT',
-            'E_USER_ERROR', 'E_USER_NOTICE', 'E_USER_WARNING', 'E_WARNING',
-            'ENT_COMPAT','ENT_QUOTES','ENT_NOQUOTES',
-            'false', 'null', 'PEAR_EXTENSION_DIR', 'PEAR_INSTALL_DIR',
-            'PHP_BINDIR', 'PHP_CONFIG_FILE_PATH', 'PHP_DATADIR',
-            'PHP_EXTENSION_DIR', 'PHP_LIBDIR',
-            'PHP_LOCALSTATEDIR', 'PHP_OS',
-            'PHP_OUTPUT_HANDLER_CONT', 'PHP_OUTPUT_HANDLER_END',
-            'PHP_OUTPUT_HANDLER_START', 'PHP_SYSCONFDIR',
-            'PHP_VERSION', 'true', '__CLASS__', '__FILE__', '__FUNCTION__',
-            '__LINE__', '__METHOD__'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '<'.'%', '<'.'%=', '%'.'>', '<'.'?', '<'.'?=', '?'.'>'
-            ),
-        0 => array(
-            '(', ')', '[', ']', '{', '}',
-            '!', '@', '%', '&', '|', '/',
-            '<', '>',
-            '=', '-', '+', '*',
-            '.', ':', ',', ';'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #990000;',
-            4 => 'color: #009900; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #666666; font-style: italic;',
-            3 => 'color: #0000cc; font-style: italic;',
-            4 => 'color: #009933; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #006699; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold; font-style: italic;',
-            6 => 'color: #009933; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;',
-            'HARD' => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            ),
-        'METHODS' => array(
-            1 => 'color: #004000;',
-            2 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            1 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000088;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => '',
-            4 => '',
-            5 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.php.net/{FNAMEL}',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '-&gt;',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => "[\\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<'.'?php' => '?'.'>'
-            ),
-        1 => array(
-            '<'.'?' => '?'.'>'
-            ),
-        2 => array(
-            '<'.'%' => '%'.'>'
-            ),
-        3 => array(
-            '<script language="php">' => '</script>'
-            ),
-        4 => "/(?P<start><\\?(?>php\b)?)(?:".
-            "(?>[^\"'?\\/<]+)|".
-            "\\?(?!>)|".
-            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
-            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
-            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
-            "\\/\\/(?>.*?(?:\\?>|$))|".
-            "#(?>.*?(?:\\?>|$))|".
-            "\\/(?=[^*\\/])|".
-            "<(?!<<)|".
-            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
-            ")*?(?P<end>\\?>|\Z)/sm",
-        5 => "/(?P<start><%)(?:".
-            "(?>[^\"'%\\/<]+)|".
-            "%(?!>)|".
-            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
-            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
-            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
-            "\\/\\/(?>.*?(?:%>|$))|".
-            "#(?>.*?(?:%>|$))|".
-            "\\/(?=[^*\\/])|".
-            "<(?!<<)|".
-            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
-            ")*?(?P<end>%>|\Z)/sm",
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/pic16.php b/inc/geshi/pic16.php
deleted file mode 100644
index 46d7ac94d..000000000
--- a/inc/geshi/pic16.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/*************************************************************************************
- * pic16.php
- * -------
- * Author: Phil Mattison (mattison@ohmikron.com)
- * Copyright: (c) 2008 Ohmikron Corp. (http://www.ohmikron.com/)
- * Release Version: 1.0.8.11
- * Date Started: 2008/07/30
- *
- * PIC16 Assembler language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/07/30 (1.0.8)
- *   -  First Release
- *
- * TODO (updated 2008/07/30)
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PIC16',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /*Instructions*/
-        1 => array(
-            'addcf','adddcf','addlw','addwf','andlw','andwf','bc','bcf','bdc',
-            'bnc','bndc','bnz','bsf','btfsc','btfss','bz','call','clrc','clrdc',
-            'clrf','clrw','clrwdt','clrz','comf','decf','goto','incf','incfsz',
-            'iorlw','iorwf','lcall','lgoto','movf','movfw','movlw','movwf',
-            'option','negf','nop','retfie','retlw','return','rlf','rrf','setc',
-            'setdc','setz','skpc','skpdc','skpnc','skpndc','skpnz','skpz',
-            'sleep','subcf','subdcf','sublw','subwf','swapf','tris','tstf',
-            'xorlw','xorwf'
-            ),
-        /*Registers*/
-        2 => array(
-            'INDF','TMR0','OPTION','PCL','STATUS','FSR','PORTA','PORTB','PORTC',
-            'PORTD','PORTE','PORTF','TRISA','TRISB','TRISC','TRISD','TRISE',
-            'TRISF','PCLATH','INTCON','PIR1','PIE1','PCON','CMCON','VRCON',
-            'F','W'
-            ),
-        /*Directives*/
-        3 => array(
-            '_BADRAM','BANKISEL','BANKSEL','CBLOCK','CODE','_CONFIG','CONSTANT',
-            'DA','DATA','DB','DE','#DEFINE','DT','DW','ELSE','END','ENDC',
-            'ENDIF','ENDM','ENDW','EQU','ERROR','ERRORLEVEL','EXITM','EXPAND',
-            'EXTERN','FILL','GLOBAL','IDATA','_IDLOCS','IF','IFDEF','IFNDEF',
-            'INCLUDE','#INCLUDE','LIST','LOCAL','MACRO','_MAXRAM','MESSG',
-            'NOEXPAND','NOLIST','ORG','PAGE','PAGESEL','PROCESSOR','RADIX',
-            'RES','SET','SPACE','SUBTITLE','TITLE','UDATA','UDATA_ACS',
-            'UDATA_OVR','UDATA_SHR','#UNDEFINE','VARIABLE','WHILE',
-            'D','H','O','B','A'
-            ),
-        ),
-    'SYMBOLS' => array('=','.',',',':'),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000a0; font-weight: bold;',
-            2 => 'color: #aa3300; font-weight: bold;',
-            3 => 'color: #0000ff;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #00a000;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff7700;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff7700;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #7777ff;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC |
-        GESHI_NUMBER_BIN_SUFFIX |
-        GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_HEX_SUFFIX,
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "a-zA-Z0-9\$_\|\#>|^",
-            'DISALLOWED_AFTER' => "a-zA-Z0-9_<\|%"
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/pike.php b/inc/geshi/pike.php
deleted file mode 100644
index 743f711b1..000000000
--- a/inc/geshi/pike.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*************************************************************************************
- * pike.php
- * --------
- * Author: Rick E. (codeblock@eighthbit.net)
- * Copyright: (c) 2009 Rick E.
- * Release Version: 1.0.8.11
- * Date Started: 2009/12/10
- *
- * Pike language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/12/25 (1.0.8.6)
- *  -  First Release
- *
- * TODO (updated 2009/12/25)
- * -------------------------
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Pike',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'goto', 'break', 'continue', 'return', 'case', 'default', 'if',
-            'else', 'switch', 'while', 'foreach', 'do', 'for', 'gauge',
-            'destruct', 'lambda', 'inherit', 'import', 'typeof', 'catch',
-            'inline', 'nomask', 'private', 'protected', 'public', 'static'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '!', '&', '|', '?', ';'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(1 => ''),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(1 => '.'),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
diff --git a/inc/geshi/pixelbender.php b/inc/geshi/pixelbender.php
deleted file mode 100644
index 7b29ee6c3..000000000
--- a/inc/geshi/pixelbender.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*************************************************************************************
- * pixelbender.php
- * ----------------
- * Author: Richard Olsson (r@richardolsson.se)
- * Copyright: (c) 2008 Richard Olsson (richardolsson.se)
- * Release Version: 1.0.8.11
- * Date Started: 2008/11/16
- *
- * Pixel Bender 1.0 language file for GeSHi.
- *
- *
- * Please feel free to modify this file, although I would greatly appreciate
- * it if you would then send some feedback on why the file needed to be
- * changed, using the e-mail address above.
- *
- *
- * The colors are inspired by those used in the Pixel Bender Toolkit, with
- * some slight modifications.
- *
- * For more info on Pixel Bender, see the Adobe Labs Wiki article at
- * http://labs.adobe.com/wiki/index.php/Pixel_Bender_Toolkit.
- *
- * Keyword groups are defined as follows (groups marked with an asterisk
- * inherit their names from terminology used in the language specification
- * included with the Pixel Bender Toolkit, see URL above.)
- *
- *  1. languageVersion & kernel keywords
- *  2. Kernel Members *
- *  3. Types *
- *  4. Statements * & qualifiers (in, out, inout)
- *  5. Built-in functions *
- *  6. Meta-data names
- *  7. Preprocessor & Pre-defined symbols *
- *
- *
- * CHANGES
- * -------
- * 2008/11/16 (1.0.8.2)
- *  - Initial release
- *
- * TODO (updated 2008/11/16)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Pixel Bender 1.0',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'languageVersion', 'kernel'
-            ),
-        2 => array(
-            'import', 'parameter', 'dependent', 'const', 'input', 'output',
-            'evaluatePixel', 'evaluateDependents', 'needed', 'changed', 'generated'
-            ),
-        3 => array(
-            'bool', 'bool2', 'bool3', 'bool4', 'int', 'int2', 'int3', 'int4',
-            'float', 'float2', 'float3', 'float4', 'float2x2', 'float3x3', 'float4x4',
-            'pixel2', 'pixel3', 'pixel4', 'region', 'image1', 'image2', 'image3', 'image4',
-            'imageRef', 'void'
-            ),
-        4 => array(
-            'in', 'out', 'inout', 'if', 'else', 'for', 'while', 'do', 'break',
-            'continue', 'return'
-            ),
-        5 => array(
-            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'pow',
-            'exp', 'exp2', 'log', 'log2', 'sqrt', 'inverseSqrt', 'abs', 'sign', 'floor',
-            'ceil', 'fract', 'mod', 'min', 'max', 'step', 'clamp', 'mix', 'smoothStep',
-            'length', 'distance', 'dot', 'cross', 'normalize', 'matrixCompMult', 'lessThan',
-            'lessThanEqual', 'greaterThan', 'greaterThanEqual', 'equal', 'notEqual', 'any',
-            'all', 'not', 'nowhere', 'everywhere', 'transform', 'union', 'intersect',
-            'outset', 'inset', 'bounds', 'isEmpty', 'sample', 'sampleLinear', 'sampleNearest',
-            'outCoord', 'dod', 'pixelSize', 'pixelAspectRatio'
-            ),
-        6 => array(
-            'namespace', 'vendor', 'version', 'minValue', 'maxValue', 'defaultValue', 'description'
-            ),
-        7 => array(
-            '#if', '#endif', '#ifdef', '#elif', 'defined', '#define',
-            'AIF_ATI', 'AIF_NVIDIA', 'AIF_FLASH_TARGET'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '%', '&', '|', '+', '-', '*', '/', '=', '<', '>', '?', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0033ff;',
-            2 => 'color: #0033ff; font-weight: bold;',
-            3 => 'color: #0033ff;',
-            4 => 'color: #9900cc; font-weight: bold;',
-            5 => 'color: #333333;',
-            6 => 'color: #666666;',
-            7 => 'color: #990000;',
-        ),
-        'COMMENTS' => array(
-            1 => 'color: #009900;',
-            'MULTI' => 'color: #3f5fbf;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #990000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000; font-weight:bold;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #000000;',
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array('.'),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-
-?>
diff --git a/inc/geshi/pli.php b/inc/geshi/pli.php
deleted file mode 100644
index c29985140..000000000
--- a/inc/geshi/pli.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/*************************************************************************************
- * pli.php
- * --------
- * Author: Robert AH Prins (robert@prino.org)
- * Copyright: (c) 2011 Robert AH Prins (http://hitchwiki.org/en/User:Prino)
- * Release Version: 1.0.8.11
- * Date Started: 2011/02/09
- *
- * PL/I language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2011/02/09 (1.0.8.10)
- *  -  First Release - machine(ish) generated by http://rosettacode.org/geshi/
- *
- * TODO (updated 2011/02/09)
- * -------------------------
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'PL/I',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '\''),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'abnormal', 'abs', 'acos', 'acosf', 'add', 'addbuff', 'addr',
-            'addrdata', 'alias', 'aligned', 'all', 'alloc', 'allocate',
-            'allocation', 'allocn', 'allocsize', 'any', 'anycondition', 'area',
-            'ascii', 'asin', 'asinf', 'asm', 'asmtdli', 'assembler',
-            'assignable', 'atan', 'atand', 'atanf', 'atanh', 'attach',
-            'attention', 'attn', 'auto', 'automatic', 'availablearea',
-            'backwards', 'based', 'begin', 'bigendian', 'bin', 'binary',
-            'binaryvalue', 'bind', 'binvalue', 'bit', 'bitloc', 'bitlocation',
-            'bkwd', 'blksize', 'bool', 'buf', 'buffered', 'buffers', 'bufnd',
-            'bufni', 'bufoff', 'bufsp', 'builtin', 'bx', 'by', 'byaddr', 'byte',
-            'byvalue', 'b4', 'call', 'cast', 'cds', 'ceil', 'center',
-            'centerleft', 'centerright', 'centre', 'centreleft', 'centreright',
-            'char', 'character', 'charg', 'chargraphic', 'charval', 'check',
-            'checkstg', 'close', 'cmpat', 'cobol', 'col', 'collate', 'column',
-            'comment', 'compare', 'compiledate', 'compiletime', 'completion',
-            'complex', 'cond', 'condition', 'conjg', 'conn', 'connected',
-            'consecutive', 'controlled', 'conv', 'conversion', 'copy', 'cos',
-            'cosd', 'cosf', 'cosh', 'count', 'counter', 'cpln', 'cplx', 'cs',
-            'cstg', 'ctl', 'ctlasa', 'ctl360', 'currentsize', 'currentstorage',
-            'data', 'datafield', 'date', 'datetime', 'days', 'daystodate',
-            'daystosecs', 'db', 'dcl', 'dec', 'decimal', 'declare', 'def',
-            'default', 'define', 'defined', 'delay', 'delete', 'descriptor',
-            'descriptors', 'detach', 'dft', 'dim', 'dimacross', 'dimension',
-            'direct', 'display', 'divide', 'do', 'downthru', 'edit', 'else',
-            'empty', 'end', 'endfile', 'endpage', 'entry', 'entryaddr', 'env',
-            'environment', 'epsilon', 'erf', 'erfc', 'error', 'event', 'excl',
-            'exclusive', 'exit', 'exp', 'expf', 'exponent', 'exports', 'ext',
-            'external', 'fb', 'fbs', 'fetch', 'file', 'fileddint', 'fileddtest',
-            'fileddword', 'fileid', 'fileopen', 'fileread', 'fileseek',
-            'filetell', 'filewrite', 'finish', 'first', 'fixed', 'fixedbin',
-            'fixeddec', 'fixedoverflow', 'float', 'floatbin', 'floatdec',
-            'floor', 'flush', 'fofl', 'format', 'fortran', 'free', 'from',
-            'fromalien', 'fs', 'gamma', 'generic', 'genkey', 'get', 'getenv',
-            'go', 'goto', 'graphic', 'gx', 'handle', 'hbound', 'hex', 'hexadec',
-            'heximage', 'high', 'huge', 'iand', 'ieee', 'ieor', 'if', 'ignore',
-            'imag', 'in', 'index', 'indexarea', 'indexed', 'init', 'initial',
-            'inline', 'inonly', 'inot', 'inout', 'input', 'int', 'inter',
-            'internal', 'into', 'invalidop', 'ior', 'irred', 'irreducible',
-            'isfinite', 'isigned', 'isinf', 'isll', 'ismain', 'isnan',
-            'isnormal', 'isrl', 'iszero', 'iunsigned', 'key', 'keyed',
-            'keyfrom', 'keylength', 'keyloc', 'keyto', 'label', 'last',
-            'lbound', 'leave', 'left', 'length', 'like', 'limited', 'line',
-            'lineno', 'linesize', 'linkage', 'list', 'littleendian', 'loc',
-            'locate', 'location', 'log', 'logf', 'loggamma', 'log10', 'log10f',
-            'log2', 'low', 'lowercase', 'lower2', 'maccol', 'maclmar',
-            'macname', 'macrmar', 'main', 'max', 'maxexp', 'maxlength',
-            'memconvert', 'memcu12', 'memcu14', 'memcu21', 'memcu24', 'memcu41',
-            'memcu42', 'memindex', 'memsearch', 'memsearchr', 'memverify',
-            'memverifyr', 'min', 'minexp', 'mod', 'mpstr', 'multiply', 'name',
-            'native', 'ncp', 'new', 'nocharg', 'nochargraphic', 'nocheck',
-            'nocmpat', 'noconv', 'noconversion', 'nodescriptor', 'noexecops',
-            'nofixedoverflow', 'nofofl', 'noinline', 'nolock', 'nomap',
-            'nomapin', 'nomapout', 'nonasgn', 'nonassignable', 'nonconnected',
-            'nonnative', 'noofl', 'nooverflow', 'norescan', 'normal', 'nosize',
-            'nostrg', 'nostringrange', 'nostringsize', 'nostrz', 'nosubrg',
-            'nosubscriptrange', 'noufl', 'nounderflow', 'nowrite', 'nozdiv',
-            'nozerodivide', 'null', 'offset', 'offsetadd', 'offsetdiff',
-            'offsetsubtract', 'offsetvalue', 'ofl', 'omitted', 'on', 'onarea',
-            'onchar', 'oncode', 'oncondcond', 'oncondid', 'oncount', 'onfile',
-            'ongsource', 'onkey', 'online', 'onloc', 'onoffset', 'onsource',
-            'onsubcode', 'onwchar', 'onwsource', 'open', 'optional', 'options',
-            'order', 'ordinal', 'ordinalname', 'ordinalpred', 'ordinalsucc',
-            'other', 'otherwise', 'outonly', 'output', 'overflow', 'package',
-            'packagename', 'page', 'pageno', 'pagesize', 'parameter', 'parmset',
-            'password', 'pending', 'pic', 'picspec', 'picture', 'places',
-            'pliascii', 'plicanc', 'plickpt', 'plidelete', 'plidump',
-            'pliebcdic', 'plifill', 'plifree', 'plimove', 'pliover', 'plirest',
-            'pliretc', 'pliretv', 'plisaxa', 'plisaxb', 'plisaxc', 'plisaxd',
-            'plisrta', 'plisrtb', 'plisrtc', 'plisrtd', 'plitdli', 'plitran11',
-            'plitran12', 'plitran21', 'plitran22', 'pointer', 'pointeradd',
-            'pointerdiff', 'pointersubtract', 'pointervalue', 'poly', 'pos',
-            'position', 'prec', 'precision', 'pred', 'present', 'print',
-            'priority', 'proc', 'procedure', 'procedurename', 'procname',
-            'prod', 'ptr', 'ptradd', 'ptrdiff', 'ptrsubtract', 'ptrvalue',
-            'put', 'putenv', 'quote', 'radix', 'raise2', 'random', 'range',
-            'rank', 'read', 'real', 'record', 'recsize', 'recursive', 'red',
-            'reducible', 'reentrant', 'refer', 'regional', 'reg12', 'release',
-            'rem', 'reorder', 'repattern', 'repeat', 'replaceby2', 'reply',
-            'reread', 'rescan', 'reserved', 'reserves', 'resignal', 'respec',
-            'retcode', 'return', 'returns', 'reuse', 'reverse', 'revert',
-            'rewrite', 'right', 'round', 'rounddec', 'samekey', 'scalarvarying',
-            'scale', 'search', 'searchr', 'secs', 'secstodate', 'secstodays',
-            'select', 'seql', 'sequential', 'serialize4', 'set', 'sign',
-            'signal', 'signed', 'sin', 'sind', 'sinf', 'sinh', 'sis', 'size',
-            'skip', 'snap', 'sourcefile', 'sourceline', 'sqrt', 'sqrtf',
-            'stackaddr', 'statement', 'static', 'status', 'stg', 'stmt', 'stop',
-            'storage', 'stream', 'strg', 'string', 'stringrange', 'stringsize',
-            'structure', 'strz', 'subrg', 'subscriptrange', 'substr',
-            'subtract', 'succ', 'sum', 'suppress', 'sysin', 'sysnull',
-            'sysparm', 'sysprint', 'system', 'sysversion', 'tally', 'tan',
-            'tand', 'tanf', 'tanh', 'task', 'then', 'thread', 'threadid',
-            'time', 'tiny', 'title', 'to', 'total', 'tpk', 'tpm', 'transient',
-            'translate', 'transmit', 'trim', 'trkofl', 'trunc', 'type', 'ufl',
-            'ulength', 'ulength16', 'ulength8', 'unal', 'unaligned',
-            'unallocated', 'unbuf', 'unbuffered', 'undefinedfile', 'underflow',
-            'undf', 'unlock', 'unsigned', 'unspec', 'until', 'update', 'upos',
-            'uppercase', 'upthru', 'usubstr', 'usurrogate', 'uvalid', 'uwidth',
-            'valid', 'validdate', 'value', 'var', 'varglist', 'vargsize',
-            'variable', 'varying', 'varyingz', 'vb', 'vbs', 'verify', 'verifyr',
-            'vs', 'vsam', 'wait', 'wchar', 'wcharval', 'weekday', 'when',
-            'whigh', 'while', 'widechar', 'wlow', 'write', 'xmlchar', 'y4date',
-            'y4julian', 'y4year', 'zdiv', 'zerodivide'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '+', '-', '*', '/', '=', '<', '>', '&', '^', '|', ':', '(', ')', ';', ','
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(1 => ''),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(1 => '.'),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/plsql.php b/inc/geshi/plsql.php
deleted file mode 100644
index 09f90a225..000000000
--- a/inc/geshi/plsql.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/*************************************************************************************
- * plsql.php
- * -------
- * Author: Victor Engmark <victor.engmark@gmail.com>
- * Copyright: (c) 2006 Victor Engmark (http://l0b0.net/)
- * Release Version: 1.0.8.11
- * Date Started: 2006/10/26
- *
- * Oracle 9.2 PL/SQL language file for GeSHi.
- * Formatting is based on the default setup of TOAD 8.6.
- *
- * CHANGES
- * -------
- * 2006/10/27 (1.0.0)
- *    -    First Release
- *
- * TODO (updated 2006/10/27)
- * -------------------------
- * * Add < and > to brackets
- * * Remove symbols which are also comment delimiters / quote marks?
- *
- *************************************************************************************
- *
- *         This file is part of GeSHi.
- *
- *     GeSHi is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     GeSHi is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with GeSHi; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA    02111-1307    USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PL/SQL',
-    'COMMENT_SINGLE' => array(1 =>'--'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2930
-    'COMMENT_MULTI' => array('/*' => '*/'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2950
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array("'", '"'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        //PL/SQL reserved keywords (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/f_words.htm#LNPLS019)
-        1 => array('ZONE', 'YEAR', 'WRITE', 'WORK', 'WITH', 'WHILE', 'WHERE',
-        'WHENEVER', 'WHEN', 'VIEW', 'VARCHAR2', 'VARCHAR', 'VALUES',
-        'VALIDATE', 'USE', 'UPDATE', 'UNIQUE', 'UNION', 'TYPE', 'TRUE',
-        'TRIGGER', 'TO', 'TIMEZONE_REGION', 'TIMEZONE_MINUTE', 'TIMEZONE_HOUR',
-        'TIMEZONE_ABBR', 'TIMESTAMP', 'TIME', 'THEN', 'TABLE', 'SYNONYM',
-        'SUCCESSFUL', 'SUBTYPE', 'START', 'SQLERRM', 'SQLCODE', 'SQL', 'SPACE',
-        'SMALLINT', 'SHARE', 'SET', 'SEPARATE', 'SELECT', 'SECOND',
-        'SAVEPOINT', 'ROWTYPE', 'ROWNUM', 'ROWID', 'ROW', 'ROLLBACK',
-        'REVERSE', 'RETURN', 'RELEASE', 'RECORD', 'REAL', 'RAW', 'RANGE',
-        'RAISE', 'PUBLIC', 'PROCEDURE', 'PRIVATE', 'PRIOR', 'PRAGMA',
-        'POSITIVEN', 'POSITIVE', 'PLS_INTEGER', 'PCTFREE', 'PARTITION',
-        'PACKAGE', 'OUT', 'OTHERS', 'ORGANIZATION', 'ORDER', 'OR', 'OPTION',
-        'OPERATOR', 'OPEN', 'OPAQUE', 'ON', 'OF', 'OCIROWID', 'NUMBER_BASE',
-        'NUMBER', 'NULL', 'NOWAIT', 'NOT', 'NOCOPY', 'NEXTVAL', 'NEW',
-        'NATURALN', 'NATURAL', 'MONTH', 'MODE', 'MLSLABEL', 'MINUTE', 'MINUS',
-        'LOOP', 'LONG', 'LOCK', 'LIMITED', 'LIKE', 'LEVEL', 'JAVA',
-        'ISOLATION', 'IS', 'INTO', 'INTERVAL', 'INTERSECT', 'INTERFACE',
-        'INTEGER', 'INSERT', 'INDICATOR', 'INDEX', 'IN', 'IMMEDIATE', 'IF',
-        'HOUR', 'HEAP', 'HAVING', 'GROUP', 'GOTO', 'FUNCTION', 'FROM',
-        'FORALL', 'FOR', 'FLOAT', 'FETCH', 'FALSE', 'EXTENDS', 'EXIT',
-        'EXISTS', 'EXECUTE', 'EXCLUSIVE', 'EXCEPTION', 'END', 'ELSIF', 'ELSE',
-        'DROP', 'DO', 'DISTINCT', 'DESC', 'DELETE', 'DEFAULT', 'DECLARE',
-        'DECIMAL', 'DAY', 'DATE', 'CURSOR', 'CURRVAL', 'CURRENT', 'CREATE',
-        'CONSTANT', 'CONNECT', 'COMPRESS', 'COMMIT', 'COMMENT', 'COLLECT',
-        'CLUSTER', 'CLOSE', 'CHECK', 'CHAR_BASE', 'CHAR', 'CASE', 'BY', 'BULK',
-        'BOOLEAN', 'BODY', 'BINARY_INTEGER', 'BETWEEN', 'BEGIN', 'AUTHID',
-        'AT', 'ASC', 'AS', 'ARRAY', 'ANY', 'AND', 'ALTER', 'ALL'),
-        //SQL functions (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/toc.htm & http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/functions101a.htm#85925)
-        2 => array('XMLTRANSFORM', 'XMLSEQUENCE', 'XMLFOREST', 'XMLELEMENT',
-        'XMLCONCAT', 'XMLCOLATTVAL', 'XMLAGG', 'WIDTH_BUCKET', 'VSIZE',
-        'VARIANCE', 'VAR_SAMP', 'VAR_POP', 'VALUE', 'USERENV', 'USER', 'UPPER',
-        'UPDATEXML', 'UNISTR', 'UID', 'TZ_OFFSET', 'TRUNC', 'TRIM', 'TREAT',
-        'TRANSLATE', 'TO_YMINTERVAL', 'TO_TIMESTAMP_TZ', 'TO_TIMESTAMP',
-        'TO_SINGLE_BYTE', 'TO_NUMBER', 'TO_NCLOB', 'TO_NCHAR', 'TO_MULTI_BYTE',
-        'TO_LOB', 'TO_DSINTERVAL', 'TO_DATE', 'TO_CLOB', 'TO_CHAR', 'TANH',
-        'TAN', 'SYSTIMESTAMP', 'SYSDATE', 'SYS_XMLGEN', 'SYS_XMLAGG',
-        'SYS_TYPEID', 'SYS_GUID', 'SYS_EXTRACT_UTC', 'SYS_DBURIGEN',
-        'SYS_CONTEXT', 'SYS_CONNECT_BY_PATH', 'SUM', 'SUBSTR', 'STDDEV_SAMP',
-        'STDDEV_POP', 'STDDEV', 'SQRT', 'SOUNDEX', 'SINH', 'SIN', 'SIGN',
-        'SESSIONTIMEZONE', 'RTRIM', 'RPAD', 'ROWIDTONCHAR', 'ROWIDTOCHAR',
-        'ROW_NUMBER', 'ROUND', 'REPLACE', 'REGR_SYY', 'REGR_SXY', 'REGR_SXX',
-        'REGR_SLOPE', 'REGR_R2', 'REGR_INTERCEPT', 'REGR_COUNT', 'REGR_AVGY',
-        'REGR_AVGX', 'REFTOHEX', 'REF', 'RAWTONHEX', 'RAWTOHEX',
-        'RATIO_TO_REPORT', 'RANK', 'POWER', 'PERCENTILE_DISC',
-        'PERCENTILE_CONT', 'PERCENT_RANK', 'PATH', 'NVL2', 'NVL',
-        'NUMTOYMINTERVAL', 'NUMTODSINTERVAL', 'NULLIF', 'NTILE', 'NLSSORT',
-        'NLS_UPPER', 'NLS_LOWER', 'NLS_INITCAP', 'NLS_CHARSET_NAME',
-        'NLS_CHARSET_ID', 'NLS_CHARSET_DECL_LEN', 'NEXT_DAY', 'NEW_TIME',
-        'NCHR', 'MONTHS_BETWEEN', 'MOD', 'MIN', 'MAX', 'MAKE_REF', 'LTRIM',
-        'LPAD', 'LOWER', 'LOG', 'LOCALTIMESTAMP', 'LN', 'LENGTH', 'LEAST',
-        'LEAD', 'LAST_VALUE', 'LAST_DAY', 'LAST', 'LAG', 'INSTR', 'INITCAP',
-        'HEXTORAW', 'GROUPING_ID', 'GROUPING', 'GROUP_ID', 'GREATEST',
-        'FROM_TZ', 'FLOOR', 'FIRST_VALUE', 'FIRST', 'EXTRACTVALUE', 'EXTRACT',
-        'EXP', 'EXISTSNODE', 'EMPTY_CLOB', 'EMPTY_BLOB', 'DUMP', 'DEREF',
-        'DEPTH', 'DENSE_RANK', 'DECOMPOSE', 'DECODE', 'DBTIMEZONE',
-        'CURRENT_TIMESTAMP', 'CURRENT_DATE', 'CUME_DIST', 'COVAR_SAMP',
-        'COVAR_POP', 'COUNT', 'COSH', 'COS', 'CORR', 'CONVERT', 'CONCAT',
-        'COMPOSE', 'COALESCE', 'CHR', 'CHARTOROWID', 'CEIL', 'CAST', 'BITAND',
-        'BIN_TO_NUM', 'BFILENAME', 'AVG', 'ATAN2', 'ATAN', 'ASIN', 'ASCIISTR',
-        'ASCII', 'ADD_MONTHS', 'ACOS', 'ABS'),
-        //PL/SQL packages (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96612/intro2.htm#1025672)
-        3 => array('UTL_URL', 'UTL_TCP', 'UTL_SMTP', 'UTL_REF', 'UTL_RAW',
-        'UTL_PG', 'UTL_INADDR', 'UTL_HTTP', 'UTL_FILE', 'UTL_ENCODE',
-        'UTL_COLL', 'SDO_UTIL', 'SDO_TUNE', 'SDO_MIGRATE', 'SDO_LRS',
-        'SDO_GEOM', 'SDO_CS', 'DMBS_XMLQUERY', 'DMBS_FLASHBACK',
-        'DMBS_DEFER_SYS', 'DEBUG_EXTPROC', 'DBMS_XSLPROCESSOR', 'DBMS_XPLAN',
-        'DBMS_XMLSCHEMA', 'DBMS_XMLSAVE', 'DBMS_XMLPARSER', 'DBMS_XMLGEN',
-        'DBMS_XMLDOM', 'DBMS_XDBT', 'DBMS_XDB_VERSION', 'DBMS_XDB', 'DBMS_WM',
-        'DBMS_UTILITY', 'DBMS_TYPES', 'DBMS_TTS', 'DBMS_TRANSFORM',
-        'DBMS_TRANSACTION', 'DBMS_TRACE', 'DBMS_STRM_A', 'DBMS_STRM',
-        'DBMS_STORAGE_MAP', 'DBMS_STATS', 'DBMS_SQL', 'DBMS_SPACE_ADMIN',
-        'DBMS_SPACE', 'DBMS_SHARED_POOL', 'DBMS_SESSION', 'DBMS_RULE_ADM',
-        'DBMS_RULE', 'DBMS_ROWID', 'DBMS_RLS', 'DBMS_RESUMABLE',
-        'DBMS_RESOURCE_MANAGER_PRIVS', 'DBMS_RESOURCE_MANAGER', 'DBMS_REPUTIL',
-        'DBMS_REPCAT_RGT', 'DBMS_REPCAT_INSTATIATE', 'DBMS_REPCAT_ADMIN',
-        'DBMS_REPCAT', 'DBMS_REPAIR', 'DBMS_REFRESH', 'DBMS_REDEFINITION',
-        'DBMS_RECTIFIER_DIFF', 'DBMS_RANDOM', 'DBMS_PROPAGATION_ADM',
-        'DBMS_PROFILER', 'DBMS_PIPE', 'DBMS_PCLXUTIL', 'DBMS_OUTPUT',
-        'DBMS_OUTLN_EDIT', 'DBMS_OUTLN', 'DBMS_ORACLE_TRACE_USER',
-        'DBMS_ORACLE_TRACE_AGENT', 'DBMS_OLAP', 'DBMS_OFFLINE_SNAPSHOT',
-        'DBMS_OFFLINE_OG', 'DBMS_ODCI', 'DBMS_OBFUSCATION_TOOLKIT',
-        'DBMS_MVIEW', 'DBMS_MGWMSG', 'DBMS_MGWADM', 'DBMS_METADATA',
-        'DBMS_LOGSTDBY', 'DBMS_LOGMNR_D', 'DBMS_LOGMNR_CDC_SUBSCRIBE',
-        'DBMS_LOGMNR_CDC_PUBLISH', 'DBMS_LOGMNR', 'DBMS_LOCK', 'DBMS_LOB',
-        'DBMS_LIBCACHE', 'DBMS_LDAP', 'DBMS_JOB', 'DBMS_IOT',
-        'DBMS_HS_PASSTHROUGH', 'DBMS_FGA', 'DBMS_DISTRIBUTED_TRUST_ADMIN',
-        'DBMS_DESCRIBE', 'DBMS_DEFER_QUERY', 'DBMS_DEFER', 'DBMS_DEBUG',
-        'DBMS_DDL', 'DBMS_CAPTURE_ADM', 'DBMS_AW', 'DBMS_AQELM', 'DBMS_AQADM',
-        'DBMS_AQ', 'DBMS_APPLY_ADM', 'DBMS_APPLICATION_INFO', 'DBMS_ALERT',
-        'CWM2_OLAP_AW_ACCESS'),
-        //PL/SQL predefined exceptions (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/07_errs.htm#784)
-        4 => array('ZERO_DIVIDE', 'VALUE_ERROR', 'TOO_MANY_ROWS',
-        'TIMEOUT_ON_RESOURCE', 'SYS_INVALID_ROWID', 'SUBSCRIPT_OUTSIDE_LIMIT',
-        'SUBSCRIPT_BEYOND_COUNT', 'STORAGE_ERROR', 'SELF_IS_NULL',
-        'ROWTYPE_MISMATCH', 'PROGRAM_ERROR', 'NOT_LOGGED_ON', 'NO_DATA_FOUND',
-        'LOGIN_DENIED', 'INVALID_NUMBER', 'INVALID_CURSOR', 'DUP_VAL_ON_INDEX',
-        'CURSOR_ALREADY_OPEN', 'COLLECTION_IS_NULL', 'CASE_NOT_FOUND',
-        'ACCESS_INTO_NULL'),
-        //Static data dictionary views (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96536/ch2.htm)
-        5 => array('USER_REPSITES', 'USER_REPSCHEMA',
-        'USER_REPRESOLUTION_STATISTICS', 'USER_REPRESOLUTION_METHOD',
-        'USER_REPRESOLUTION', 'USER_REPRESOL_STATS_CONTROL', 'USER_REPPROP',
-        'USER_REPPRIORITY_GROUP', 'USER_REPPRIORITY',
-        'USER_REPPARAMETER_COLUMN', 'USER_REPOBJECT', 'USER_REPKEY_COLUMNS',
-        'USER_REPGROUPED_COLUMN', 'USER_REPGROUP_PRIVILEGES', 'USER_REPGROUP',
-        'USER_REPGENOBJECTS', 'USER_REPGENERATED', 'USER_REPFLAVORS',
-        'USER_REPFLAVOR_OBJECTS', 'USER_REPFLAVOR_COLUMNS', 'USER_REPDDL',
-        'USER_REPCONFLICT', 'USER_REPCOLUMN_GROUP', 'USER_REPCOLUMN',
-        'USER_REPCATLOG', 'USER_REPCAT_USER_PARM_VALUES',
-        'USER_REPCAT_USER_AUTHORIZATIONS', 'USER_REPCAT_TEMPLATE_SITES',
-        'USER_REPCAT_TEMPLATE_PARMS', 'USER_REPCAT_TEMPLATE_OBJECTS',
-        'USER_REPCAT_REFRESH_TEMPLATES', 'USER_REPCAT', 'USER_REPAUDIT_COLUMN',
-        'USER_REPAUDIT_ATTRIBUTE', 'DBA_REPSITES_NEW', 'DBA_REPSITES',
-        'DBA_REPSCHEMA', 'DBA_REPRESOLUTION_STATISTICS',
-        'DBA_REPRESOLUTION_METHOD', 'DBA_REPRESOLUTION',
-        'DBA_REPRESOL_STATS_CONTROL', 'DBA_REPPROP', 'DBA_REPPRIORITY_GROUP',
-        'DBA_REPPRIORITY', 'DBA_REPPARAMETER_COLUMN', 'DBA_REPOBJECT',
-        'DBA_REPKEY_COLUMNS', 'DBA_REPGROUPED_COLUMN',
-        'DBA_REPGROUP_PRIVILEGES', 'DBA_REPGROUP', 'DBA_REPGENOBJECTS',
-        'DBA_REPGENERATED', 'DBA_REPFLAVORS', 'DBA_REPFLAVOR_OBJECTS',
-        'DBA_REPFLAVOR_COLUMNS', 'DBA_REPEXTENSIONS', 'DBA_REPDDL',
-        'DBA_REPCONFLICT', 'DBA_REPCOLUMN_GROUP', 'DBA_REPCOLUMN',
-        'DBA_REPCATLOG', 'DBA_REPCAT_USER_PARM_VALUES',
-        'DBA_REPCAT_USER_AUTHORIZATIONS', 'DBA_REPCAT_TEMPLATE_SITES',
-        'DBA_REPCAT_TEMPLATE_PARMS', 'DBA_REPCAT_TEMPLATE_OBJECTS',
-        'DBA_REPCAT_REFRESH_TEMPLATES', 'DBA_REPCAT_EXCEPTIONS', 'DBA_REPCAT',
-        'DBA_REPAUDIT_COLUMN', 'DBA_REPAUDIT_ATTRIBUTE', 'ALL_REPSITES',
-        'ALL_REPSCHEMA', 'ALL_REPRESOLUTION_STATISTICS',
-        'ALL_REPRESOLUTION_METHOD', 'ALL_REPRESOLUTION',
-        'ALL_REPRESOL_STATS_CONTROL', 'ALL_REPPROP', 'ALL_REPPRIORITY_GROUP',
-        'ALL_REPPRIORITY', 'ALL_REPPARAMETER_COLUMN', 'ALL_REPOBJECT',
-        'ALL_REPKEY_COLUMNS', 'ALL_REPGROUPED_COLUMN',
-        'ALL_REPGROUP_PRIVILEGES', 'ALL_REPGROUP', 'ALL_REPGENOBJECTS',
-        'ALL_REPGENERATED', 'ALL_REPFLAVORS', 'ALL_REPFLAVOR_OBJECTS',
-        'ALL_REPFLAVOR_COLUMNS', 'ALL_REPDDL', 'ALL_REPCONFLICT',
-        'ALL_REPCOLUMN_GROUP', 'ALL_REPCOLUMN', 'ALL_REPCATLOG',
-        'ALL_REPCAT_USER_PARM_VALUES', 'ALL_REPCAT_USER_AUTHORIZATIONS',
-        'ALL_REPCAT_TEMPLATE_SITES', 'ALL_REPCAT_TEMPLATE_PARMS',
-        'ALL_REPCAT_TEMPLATE_OBJECTS', 'ALL_REPCAT_REFRESH_TEMPLATES',
-        'ALL_REPCAT', 'ALL_REPAUDIT_COLUMN', 'ALL_REPAUDIT_ATTRIBUTE')
-        ),
-    'SYMBOLS' => array(
-        //PL/SQL delimiters (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2732)
-        '+', '%', "'", '.', '/', '(', ')', ':', ',', '*', '"', '=', '<', '>', '@', ';', '-', ':=', '=>', '||', '**', '<<', '>>', '/*', '*/', '..', '<>', '!=', '~=', '^=', '<=', '>='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00F;',
-            2 => 'color: #000;',
-            3 => 'color: #00F;',
-            4 => 'color: #F00;',
-            5 => 'color: #800;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #080; font-style: italic;',
-            'MULTI' => 'color: #080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #00F;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #F00;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #800;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #0F0;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #00F;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => 'color: #0F0;'
-            )
-        ),
-        'URLS' => array(
-            1 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
-            2 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
-            3 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
-            4 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
-            5 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}'
-            ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
diff --git a/inc/geshi/postgresql.php b/inc/geshi/postgresql.php
deleted file mode 100644
index 662fdd760..000000000
--- a/inc/geshi/postgresql.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/*************************************************************************************
- * postgresql.php
- * -----------
- * Author: Christophe Chauvet (christophe_at_kryskool_dot_org)
- * Contributors: Leif Biberg Kristensen <leif_at_solumslekt_dot_org> 2010-05-03
- * Copyright: (c) 2007 Christophe Chauvet (http://kryskool.org/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2007/07/20
- *
- * PostgreSQL language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2007/07/20 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2007/07/20)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PostgreSQL',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"', '`'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        //Put PostgreSQL reserved keywords here.  I like mine uppercase.
-        1 => array(
-            'ABORT','ABSOLUTE','ACCESS','ACTION','ADD','ADMIN','AFTER',
-            'AGGREGATE','ALL','ALSO','ALTER','ALWAYS','ANALYSE','ANALYZE','AND',
-            'ANY','AS','ASC,','ASSERTION','ASSIGNMENT','ASYMMETRIC','AT',
-            'AUTHORIZATION','BACKWARD','BEFORE','BEGIN','BETWEEN','BOTH','BY',
-            'CACHE','CALLED','CASCADE','CASCADED','CASE','CAST','CATALOG',
-            'CHAIN','CHARACTERISTICS','CHECK','CHECKPOINT','CLASS','CLOSE',
-            'CLUSTER','COALESCE','COLLATE','COLUMN','COMMENT','COMMIT',
-            'COMMITTED','CONCURRENTLY','CONFIGURATION','CONNECTION',
-            'CONSTRAINT','CONSTRAINTS','CONTENT','CONTINUE','CONVERSION','COPY',
-            'COST','CREATE','CREATEDB','CREATEROLE','CREATEUSER','CROSS','CSV',
-            'CURRENT','CURRENT_CATALOG','CURRENT_DATE','CURRENT_ROLE',
-            'CURRENT_SCHEMA','CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER',
-            'CURSOR','CYCLE','DATA','DATABASE','DAY','DEALLOCATE','DEC',
-            'DECLARE','DEFAULT','DEFAULTS','DEFERRABLE','DEFERRED','DEFINER',
-            'DELETE','DELIMITER','DELIMITERS','DESC','DICTIONARY','DISABLE',
-            'DISCARD','DISTINCT','DO','DOCUMENT','DOMAIN','DOUBLE','DROP',
-            'EACH','ELSE','ENABLE','ENCODING','ENCRYPTED','END','ESCAPE',
-            'EXCEPT','EXCLUDING','EXCLUSIVE','EXECUTE','EXISTS','EXPLAIN',
-            'EXTERNAL','EXTRACT','FALSE','FAMILY','FETCH','FIRST','FOLLOWING',
-            'FOR','FORCE','FOREIGN','FORWARD','FREEZE','FROM','FULL','FUNCTION',
-            'GLOBAL','GRANT','GRANTED','GREATEST','GROUP','HANDLER','HAVING',
-            'HEADER','HOLD','HOUR','IDENTITY','IF','ILIKE','IMMEDIATE',
-            'IMMUTABLE','IMPLICIT','IN','INCLUDING','INCREMENT','INDEX',
-            'INDEXES','INHERIT','INHERITS','INITIALLY','INNER','INOUT','INPUT',
-            'INSENSITIVE','INSERT','INSTEAD','INTERSECT','INTO','INVOKER','IS',
-            'ISNULL','ISOLATION','JOIN','KEY','LANCOMPILER','LANGUAGE','LARGE',
-            'LAST','LC_COLLATE','LC_CTYPE','LEADING','LEAST','LEFT','LEVEL',
-            'LIKE','LIMIT','LISTEN','LOAD','LOCAL','LOCALTIME','LOCALTIMESTAMP',
-            'LOCATION','LOCK','LOGIN','LOOP','MAPPING','MATCH','MAXVALUE',
-            'MINUTE','MINVALUE','MODE','MONTH','MOVE','NAME','NAMES','NATIONAL',
-            'NATURAL','NEW','NEXT','NO','NOCREATEDB','NOCREATEROLE',
-            'NOCREATEUSER','NOINHERIT','NOLOGIN','NONE','NOSUPERUSER','NOT',
-            'NOTHING','NOTIFY','NOTNULL','NOWAIT','NULL','NULLIF','NULLS',
-            'NUMERIC','OBJECT','OF','OFF','OFFSET','OIDS','OLD','ON','ONLY',
-            'OPERATOR','OPTION','OPTIONS','OR','ORDER','OUT','OUTER','OVER',
-            'OVERLAPS','OVERLAY','OWNED','OWNER','PARSER','PARTIAL','PARTITION',
-            'PASSWORD','PLACING','PLANS','POSITION','PRECEDING','PRECISION',
-            'PREPARE','PREPARED','PRESERVE','PRIMARY','PRIOR','PRIVILEGES',
-            'PROCEDURAL','PROCEDURE','QUOTE','RANGE','READ','REASSIGN',
-            'RECHECK','RECURSIVE','REFERENCES','REINDEX','RELATIVE','RELEASE',
-            'RENAME','REPEATABLE','REPLACE','REPLICA','RESET','RESTART',
-            'RESTRICT','RETURN','RETURNING','RETURNS','REVOKE','RIGHT','ROLE',
-            'ROLLBACK','ROW','ROWS','RULE','SAVEPOINT','SCHEMA','SCROLL',
-            'SEARCH','SECOND',
-            'SECURITY','SELECT','SEQUENCE','SERIALIZABLE','SERVER','SESSION',
-            'SESSION_USER','SET','SETOF','SHARE','SHOW','SIMILAR','SIMPLE',
-            'SOME','STABLE','STANDALONE','START','STATEMENT','STATISTICS',
-            'STDIN','STDOUT','STORAGE','STRICT','STRIP','SUPERUSER',
-            'SYMMETRIC','SYSID','SYSTEM','TABLE','TABLESPACE','TEMP','TEMPLATE',
-            'TEMPORARY','THEN','TO','TRAILING','TRANSACTION','TREAT','TRIGGER',
-            'TRUE','TRUNCATE','TRUSTED','TYPE','UNBOUNDED','UNCOMMITTED',
-            'UNENCRYPTED','UNION','UNIQUE','UNKNOWN','UNLISTEN','UNTIL',
-            'UPDATE','USER','USING','VACUUM','VALID','VALIDATOR','VALUE',
-            'VALUES','VARIADIC','VERBOSE','VERSION','VIEW','VOLATILE','WHEN',
-            'WHERE','WHILE','WHITESPACE','WINDOW','WITH','WITHOUT','WORK','WRAPPER',
-            'WRITE','XMLATTRIBUTES','XMLCONCAT','XMLELEMENT','XMLFOREST',
-            'XMLPARSE','XMLPI','XMLROOT','XMLSERIALIZE','YEAR','YES','ZONE'
-            ),
-
-        //Put functions here
-        3 => array(
-            // mathematical functions
-            'ABS','CBRT','CEIL','CEILING','DEGREES','DIV','EXP','FLOOR','LN',
-            'LOG','MOD','PI','POWER','RADIANS','RANDOM','ROUND','SETSEED',
-            'SIGN','SQRT','TRUNC','WIDTH_BUCKET',
-            // trigonometric functions
-            'ACOS','ASIN','ATAN','ATAN2','COS','COT','SIN','TAN',
-            // string functions
-            'BIT_LENGTH','CHAR_LENGTH','CHARACTER_LENGTH','LOWER',
-            'OCTET_LENGTH','POSITION','SUBSTRING','TRIM','UPPER',
-            // other string functions
-            'ASCII','BTRIM','CHR','CONVERT','CONVERT_FROM','CONVERT_TO',
-            'DECODE','ENCODE','INITCAP','LENGTH','LPAD','LTRIM','MD5',
-            'PG_CLIENT_ENCODING','QUOTE_IDENT','QUOTE_LITERAL','QUOTE_NULLABLE',
-            'REGEXP_MATCHES','REGEXP_REPLACE','REGEXP_SPLIT_TO_ARRAY',
-            'REGEXP_SPLIT_TO_TABLE','REPEAT','RPAD','RTRIM','SPLIT_PART',
-            'STRPOS','SUBSTR','TO_ASCII','TO_HEX','TRANSLATE',
-            // binary string functions
-            'GET_BIT','GET_BYTE','SET_BIT','SET_BYTE',
-            // data type formatting functions
-            'TO_CHAR','TO_DATE','TO_NUMBER','TO_TIMESTAMP',
-            // date/time functions
-            'AGE','CLOCK_TIMESTAMP','DATE_PART','DATE_TRUNC','EXTRACT',
-            'ISFINITE','JUSTIFY_DAYS','JUSTIFY_HOURS','JUSTIFY_INTERVAL','NOW',
-            'STATEMENT_TIMESTAMP','TIMEOFDAY','TRANSACTION_TIMESTAMP',
-            // enum support functions
-            'ENUM_FIRST','ENUM_LAST','ENUM_RANGE',
-            // geometric functions
-            'AREA','CENTER','DIAMETER','HEIGHT','ISCLOSED','ISOPEN','NPOINTS',
-            'PCLOSE','POPEN','RADIUS','WIDTH',
-            'BOX','CIRCLE','LSEG','PATH','POINT','POLYGON',
-            // cidr and inet functions
-            'ABBREV','BROADCAST','FAMILY','HOST','HOSTMASK','MASKLEN','NETMASK',
-            'NETWORK','SET_MASKLEN',
-            // text search functions
-            'TO_TSVECTOR','SETWEIGHT','STRIP','TO_TSQUERY','PLAINTO_TSQUERY',
-            'NUMNODE','QUERYTREE','TS_RANK','TS_RANK_CD','TS_HEADLINE',
-            'TS_REWRITE','GET_CURRENT_TS_CONFIG','TSVECTOR_UPDATE_TRIGGER',
-            'TSVECTOR_UPDATE_TRIGGER_COLUMN',
-            'TS_DEBUG','TS_LEXISE','TS_PARSE','TS_TOKEN_TYPE','TS_STAT',
-            // XML functions
-            'XMLCOMMENT','XMLCONCAT','XMLELEMENT','XMLFOREST','XMLPI','XMLROOT',
-            'XMLAGG','XPATH','TABLE_TO_XMLSCHEMA','QUERY_TO_XMLSCHEMA',
-            'CURSOR_TO_XMLSCHEMA','TABLE_TO_XML_AND_XMLSCHEMA',
-            'QUERY_TO_XML_AND_XMLSCHEMA','SCHEMA_TO_XML','SCHEMA_TO_XMLSCHEMA',
-            'SCHEMA_TO_XML_AND_XMLSCHEMA','DATABASE_TO_XML',
-            'DATABASE_TO_XMLSCHEMA','DATABASE_TO_XML_AND_XMLSCHEMA',
-            // sequence manipulating functions
-            'CURRVAL','LASTVAL','NEXTVAL','SETVAL',
-            // conditional expressions
-            'COALESCE','NULLIF','GREATEST','LEAST',
-            // array functions
-            'ARRAY_APPEND','ARRAY_CAT','ARRAY_NDIMS','ARRAY_DIMS','ARRAY_FILL',
-            'ARRAY_LENGTH','ARRAY_LOWER','ARRAY_PREPEND','ARRAY_TO_STRING',
-            'ARRAY_UPPER','STRING_TO_ARRAY','UNNEST',
-            // aggregate functions
-            'ARRAY_AGG','AVG','BIT_AND','BIT_OR','BOOL_AND','BOOL_OR','COUNT',
-            'EVERY','MAX','MIN','STRING_AGG','SUM',
-            // statistic aggregate functions
-            'CORR','COVAR_POP','COVAR_SAMP','REGR_AVGX','REGR_AVGY',
-            'REGR_COUNT','REGR_INTERCEPT','REGR_R2','REGR_SLOPE','REGR_SXX',
-            'REGR_SXY','REGR_SYY','STDDEV','STDDEV_POP','STDDEV_SAMP',
-            'VARIANCE','VAR_POP','VAR_SAMP',
-            // window functions
-            'ROW_NUMBER','RANK','DENSE_RANK','PERCENT_RANK','CUME_DIST','NTILE',
-            'LAG','LEAD','FIRST_VALUE','LAST_VALUE','NTH_VALUE',
-            // set returning functions
-            'GENERATE_SERIES','GENERATE_SUBSCRIPTS'
-            // system information functions not currently included
-            ),
-
-        //Put your postgresql var
-        4 => array(
-            'client_encoding',
-            'standard_conforming_strings'
-            ),
-
-        //Put your data types here
-        5 => array(
-            'ARRAY','ABSTIME','BIGINT','BIGSERIAL','BINARY','BIT','BIT VARYING',
-            'BOOLEAN','BOX','BYTEA','CHAR','CHARACTER','CHARACTER VARYING',
-            'CIDR','CIRCLE','DATE','DECIMAL','DOUBLE PRECISION','ENUM','FLOAT',
-            'INET','INT','INTEGER','INTERVAL','NCHAR','REAL','SMALLINT','TEXT',
-            'TIME','TIMESTAMP','VARCHAR','XML',
-            ),
-
-        //        //Put your package names here
-        //        6 => array(
-        //            ),
-
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '=', '<', '>', '|'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        3 => false,
-        4 => false,
-        5 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            // regular keywords
-            1 => 'color: #000000; font-weight: bold; text-transform: uppercase;',
-            // inbuilt functions
-            3 => 'color: #333399; font-weight: bold; text-transform: uppercase;',
-            // postgresql var(?)
-            4 => 'color: #993333; font-weight: bold; text-transform: uppercase;',
-            // data types
-            5 => 'color: #993333; font-weight: bold; text-transform: uppercase;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #ff0000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        3 => '',
-        4 => 'http://paste.postgresql.fr/wiki/desc.php?def={FNAME}',
-        5 => '',
-        ),
-
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            1 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-
-            3 => array(
-                'DISALLOWED_AFTER' => '(?=\()'
-                ),
-
-            4 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-
-            5 => array(
-                'DISALLOWED_AFTER' => '(?![\(\w])'
-                ),
-            )
-        )
-
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/povray.php b/inc/geshi/povray.php
deleted file mode 100644
index c0ce35ca1..000000000
--- a/inc/geshi/povray.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/*************************************************************************************
- * povray.php
- * --------
- * Author: Carl Fürstenberg (azatoth@gmail.com)
- * Copyright: © 2007 Carl Fürstenberg
- * Release Version: 1.0.8.11
- * Date Started: 2008/07/11
- *
- * Povray language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/07/11 (1.0.8)
- *   -  initial import to GeSHi SVN
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'POVRAY',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'yes', 'wrinkles', 'wood', 'width', 'waves', 'water_level', 'warp', 'vturbulence',
-            'vstr', 'vrotate', 'vnormalize', 'vlength', 'vcross', 'vaxis_rotate', 'variance', 'v_steps',
-            'uv_mapping', 'utf8', 'use_index', 'use_colour', 'use_color', 'use_alpha', 'up', 'undef',
-            'ultra_wide_angle', 'u_steps', 'type', 'turbulence', 'turb_depth', 'ttf', 'true', 'triangle_wave',
-            'translate', 'transform', 'trace', 'toroidal', 'tolerance', 'tiles', 'tile2', 'tightness',
-            'tiff', 'threshold', 'thickness', 'tga', 'texture_map', 'target', 'sys', 'sum',
-            'substr', 'sturm', 'strupr', 'strlwr', 'strength', 'str', 'statistics', 'sqr',
-            'spotted', 'spotlight', 'split_union', 'spline', 'spiral2', 'spiral1', 'spherical', 'specular',
-            'spacing', 'solid', 'smooth', 'slope', 'slice', 'sky', 'size', 'sine_wave',
-            'shadowless', 'scattering', 'scallop_wave', 'scale', 'save_file', 'samples', 'roughness', 'rotate',
-            'ripples', 'right', 'rgbt', 'rgbft', 'rgbf', 'rgb', 'repeat', 'render',
-            'refraction', 'reflection_exponent', 'recursion_limit', 'reciprocal', 'ratio', 'ramp_wave', 'radius', 'radial',
-            'quilted', 'quick_colour', 'quick_color', 'quaternion', 'quadratic_spline', 'pwr', 'projected_through', 'prod',
-            'pretrace_start', 'pretrace_end', 'precompute', 'precision', 'ppm', 'pow', 'pot', 'poly_wave',
-            'point_at', 'png', 'planar', 'pigment_pattern', 'pi', 'phong_size', 'phong', 'phase',
-            'pgm', 'perspective', 'pattern', 'pass_through', 'parallel', 'panoramic', 'orthographic', 'orientation',
-            'orient', 'open', 'onion', 'once', 'on', 'omnimax', 'omega', 'offset',
-            'off', 'octaves', 'number_of_waves', 'noise_generator', 'no_shadow', 'no_reflection', 'no_image', 'no_bump_scale',
-            'no', 'nearest_count', 'natural_spline', 'mortar', 'minimum_reuse', 'min_extent', 'metric', 'method',
-            'metallic', 'media_interaction', 'media_attenuation', 'media', 'max_trace_level', 'max_trace', 'max_sample', 'max_iteration',
-            'max_intersections', 'max_gradient', 'max_extent', 'matrix', 'material_map', 'marble', 'map_type', 'mandel',
-            'major_radius', 'magnet', 'low_error_factor', 'look_at', 'location', 'load_file', 'linear_sweep', 'linear_spline',
-            'leopard', 'lambda', 'julia', 'jpeg', 'jitter', 'irid_wavelength', 'ior', 'inverse',
-            'intervals', 'interpolate', 'internal', 'inside_vector', 'inside', 'initial_frame', 'initial_clock', 'image_width',
-            'image_pattern', 'image_height', 'iff', 'hypercomplex', 'hollow', 'hierarchy', 'hf_gray_16', 'hexagon',
-            'gray_threshold', 'granite', 'gradient', 'global_lights', 'gif', 'gather', 'fresnel', 'frequency',
-            'frame_number', 'form', 'fog_type', 'fog_offset', 'fog_alt', 'focal_point', 'flip', 'flatness',
-            'fisheye', 'final_frame', 'final_clock', 'false', 'falloff_angle', 'falloff', 'fade_power', 'fade_distance',
-            'fade_colour', 'fade_color', 'facets', 'extinction', 'exterior', 'exponent', 'expand_thresholds', 'evaluate',
-            'error_bound', 'emission', 'eccentricity', 'double_illuminate', 'distance', 'dist_exp', 'dispersion_samples', 'dispersion',
-            'direction', 'diffuse', 'df3', 'dents', 'density_map', 'density_file', 'density', 'cylindrical',
-            'cutaway_textures', 'cubic_wave', 'cubic_spline', 'cube', 'crand', 'crackle', 'count', 'coords',
-            'control1', 'control0', 'conserve_energy', 'conic_sweep', 'confidence', 'concat', 'composite', 'component',
-            'colour_map', 'colour', 'color', 'collect', 'clock_on', 'clock_delta', 'clock', 'circular',
-            'chr', 'checker', 'charset', 'cells', 'caustics', 'bumps', 'bump_size', 'brilliance',
-            'brightness', 'brick_size', 'brick', 'bozo', 'boxed', 'blur_samples', 'black_hole', 'bezier_spline',
-            'b_spline', 'average', 'autostop', 'assumed_gamma', 'ascii', 'array', 'area_light', 'arc_angle',
-            'append', 'aperture', 'angle', 'ambient_light', 'ambient', 'always_sample', 'altitude', 'alpha',
-            'all_intersections', 'all', 'agate_turb', 'agate', 'adc_bailout', 'adaptive', 'accuracy', 'absorption',
-            'aa_threshold', 'aa_level', 'reflection'
-            ),
-        2 => array(
-            'abs', 'acos', 'acosh', 'asc', 'asin', 'asinh', 'atan', 'atanh',
-            'atan2', 'ceil', 'cos', 'cosh', 'defined', 'degrees', 'dimensions', 'dimension_size',
-            'div', 'exp', 'file_exists', 'floor', 'int', 'ln', 'log', 'max',
-            'min', 'mod', 'pov', 'radians', 'rand', 'seed', 'select', 'sin',
-            'sinh', 'sqrt', 'strcmp', 'strlen', 'tan', 'tanh', 'val', 'vdot',
-            'vlenght',
-            ),
-        3 => array (
-            'x', 'y', 'z', 't', 'u', 'v', 'red', 'blue',
-            'green', 'filter', 'transmit', 'gray', 'e',
-            ),
-        4 => array (
-            'camera', 'background', 'fog', 'sky_sphere', 'rainbow', 'global_settings', 'radiosity', 'photon',
-            'object', 'blob', 'sphere', 'cylinder', 'box', 'cone', 'height_field', 'julia_fractal',
-            'lathe', 'prism', 'sphere_sweep', 'superellipsoid', 'sor', 'text', 'torus', 'bicubic_patch',
-            'disc', 'mesh', 'triangle', 'smooth_triangle', 'mesh2', 'vertex_vectors', 'normal_vectors', 'uv_vectors',
-            'texture_list', 'face_indices', 'normal_indices', 'uv_indices', 'texture', 'polygon', 'plane', 'poly',
-            'cubic', 'quartic', 'quadric', 'isosurface', 'function', 'contained_by', 'parametric', 'pigment',
-            'union', 'intersection', 'difference', 'merge', 'light_source', 'looks_like', 'light_group', 'clipped_by',
-            'bounded_by', 'interior', 'material', 'interior_texture', 'normal', 'finish', 'color_map', 'pigment_map',
-            'image_map', 'bump_map', 'slope_map', 'normal_map', 'irid', 'photons',
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!',
-        '@', '%', '&', '*', '|', '/', '<',
-        '>', '+', '-', '.', '=', '<=', '>=',
-        '!=',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #a63123;',
-            2 => 'color: #2312bc;',
-            3 => 'color: #cc1122; font-weight: bold;',
-            4 => 'color: #116688; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-//            2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66aa;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #6666cc; font-weight: bold;',
-            1 => 'color: #66cc66; font-weight: bold;',
-            2 => 'color: #66cc66; font-weight: bold;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        # normal hash lines
-        0 => '\#(?!(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro) )[[:word:]]*',
-        # syntax functions hash thingis
-        1 => "\#(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro)",
-        2 => array(
-            GESHI_SEARCH  => "([a-zA-Z]+)(\n)(.*)(\n)(\\1;?)",
-            GESHI_REPLACE => '\3',
-            GESHI_BEFORE => '\1\2',
-            GESHI_AFTER => '\4\5',
-            GESHI_MODIFIERS => 'siU'
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'TAB_WIDTH' => 4
-);
-?>
diff --git a/inc/geshi/powerbuilder.php b/inc/geshi/powerbuilder.php
deleted file mode 100644
index d3fcf615f..000000000
--- a/inc/geshi/powerbuilder.php
+++ /dev/null
@@ -1,418 +0,0 @@
-<?php
-/*************************************************************************************
- * powerbuilder.php
- * ------
- * Author: Doug Porter (powerbuilder.geshi@gmail.com)
- * Copyright: (c) 2009 Doug Porter
- * Release Version: 1.0.8.11
- * Date Started: 2009/07/13
- *
- * PowerBuilder (PowerScript) language file for GeSHi.
- *
- * Based on the TextPad Syntax file for PowerBuilder
- * built by Rafi Avital
- *
- * CHANGES
- * -------
- * 2009/07/13 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2009/07/13)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PowerBuilder',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '~',
-    'KEYWORDS' => array(
-        1 => array(
-            'alias', 'and', 'autoinstantiate', 'call',
-            'case', 'catch', 'choose', 'close', 'commit', 'connect',
-            'constant', 'continue', 'create', 'cursor', 'declare',
-            'delete', 'describe', 'descriptor', 'destroy', 'disconnect',
-            'do', 'dynamic', 'else', 'elseif', 'end', 'enumerated',
-            'event', 'execute', 'exit', 'external', 'false', 'fetch',
-            'first', 'for', 'forward', 'from', 'function', 'global',
-            'goto', 'halt', 'if', 'immediate', 'indirect', 'insert',
-            'into', 'intrinsic', 'is', 'last', 'library', 'loop', 'next',
-            'not', 'of', 'on', 'open', 'or', 'parent', 'post', 'prepare',
-            'prior', 'private', 'privateread', 'privatewrite', 'procedure',
-            'protected', 'protectedread', 'protectedwrite', 'prototypes',
-            'public', 'readonly', 'ref', 'return', 'rollback', 'rpcfunc',
-            'select', 'selectblob', 'shared', 'static', 'step', 'subroutine',
-            'super', 'system', 'systemread', 'systemwrite', 'then', 'this',
-            'to', 'trigger', 'true', 'try', 'type', 'until', 'update', 'updateblob',
-            'using', 'variables', 'where', 'while', 'with', 'within'
-            ),
-        2 => array (
-            'blob', 'boolean', 'char', 'character', 'date', 'datetime',
-            'dec', 'decimal',
-            'double', 'int', 'integer', 'long', 'real', 'string', 'time',
-            'uint', 'ulong', 'unsignedint', 'unsignedinteger', 'unsignedlong'
-            ),
-        3 => array (
-            'abortretryignore!', 'actbegin!', 'acterror!', 'actesql!',
-            'actgarbagecollect!', 'activate!', 'activatemanually!',
-            'activateondoubleclick!',
-            'activateongetfocus!', 'actline!', 'actobjectcreate!', 'actobjectdestroy!',
-            'actprofile!', 'actroutine!', 'acttrace!', 'actual!',
-            'actuser!', 'adoresultset!', 'adtdate!', 'adtdatetime!',
-            'adtdefault!', 'adtdouble!', 'adttext!', 'adttime!',
-            'aix!', 'alignatbottom!', 'alignatleft!', 'alignatright!',
-            'alignattop!', 'all!', 'allowpartialchanges!', 'alpha!',
-            'ansi!', 'any!', 'anycase!', 'anyfont!',
-            'append!', 'application!', 'arabiccharset!', 'area3d!',
-            'areagraph!', 'arraybounds!', 'arrow!', 'ascending!',
-            'asstatement!', 'atbottom!', 'atleft!', 'atright!',
-            'attop!', 'autosize!', 'background!', 'balticcharset!',
-            'bar3dgraph!', 'bar3dobjgraph!', 'bargraph!', 'barstack3dobjgraph!',
-            'barstackgraph!', 'bdiagonal!', 'beam!', 'begin!',
-            'begindrag!', 'beginlabeledit!', 'beginrightdrag!', 'behind!',
-            'blob!', 'bold!', 'boolean!', 'bottom!',
-            'boundedarray!', 'box!', 'byreferenceargument!', 'byvalueargument!',
-            'cancel!', 'cascade!', 'cascaded!', 'category!',
-            'center!', 'character!', 'charsetansi!', 'charsetansiarabic!',
-            'charsetansihebrew!', 'charsetdbcsjapanese!', 'charsetunicode!', 'checkbox!',
-            'child!', 'childtreeitem!', 'chinesebig5!', 'classdefinition!',
-            'classdefinitionobject!', 'classorstructuretype!', 'clicked!', 'clip!',
-            'clipboard!', 'clipformatbitmap!', 'clipformatdib!', 'clipformatdif!',
-            'clipformatenhmetafile!', 'clipformathdrop!', 'clipformatlocale!',
-            'clipformatmetafilepict!',
-            'clipformatoemtext!', 'clipformatpalette!', 'clipformatpendata!', 'clipformatriff!',
-            'clipformatsylk!', 'clipformattext!', 'clipformattiff!', 'clipformatunicodetext!',
-            'clipformatwave!', 'clock!', 'close!', 'closequery!',
-            'col3dgraph!', 'col3dobjgraph!', 'colgraph!',
-            'colstack3dobjgraph!', 'colstackgraph!', 'columnclick!', 'commandbutton!',
-            'connection!', 'connectioninfo!', 'connectobject!', 'connectprivilege!',
-            'connectwithadminprivilege!', 'constructor!', 'containsany!', 'containsembeddedonly!',
-            'containslinkedonly!', 'contextinformation!', 'contextkeyword!', 'continuous!',
-            'corbaobject!', 'corbaunion!', 'cplusplus!', 'cross!',
-            'csv!', 'cumulative!', 'cumulativepercent!', 'currenttreeitem!',
-            'customvisual!', 'dash!', 'dashdot!', 'dashdotdot!',
-            'data!', 'datachange!', 'datamodified!', 'datastore!',
-            'datawindow!', 'datawindowchild!', 'date!', 'datemask!',
-            'datetime!', 'datetimemask!', 'dbase2!', 'dbase3!',
-            'dberror!', 'deactivate!', 'decimal!', 'decimalmask!',
-            'decorative!', 'default!', 'defaultcharset!', 'delete!',
-            'deleteallitems!', 'deleteitem!', 'descending!', 'desktop!',
-            'destructor!', 'detail!', 'diamond!', 'dif!',
-            'dirall!', 'dirapplication!', 'dirdatawindow!', 'directionall!',
-            'directiondown!', 'directionleft!', 'directionright!', 'directionup!',
-            'dirfunction!', 'dirmenu!', 'dirpipeline!', 'dirproject!',
-            'dirquery!', 'dirstructure!', 'diruserobject!', 'dirwindow!',
-            'displayasactivexdocument!', 'displayascontent!', 'displayasicon!', 'dot!',
-            'double!', 'doubleclicked!', 'dragdrop!', 'dragenter!',
-            'dragleave!', 'dragobject!', 'dragwithin!', 'drawobject!',
-            'dropdownlistbox!', 'dropdownpicturelistbox!', 'drophighlighttreeitem!', 'dwobject!',
-            'dynamicdescriptionarea!', 'dynamicstagingarea!', 'easteuropecharset!', 'editchanged!',
-            'editmask!', 'editmenu!', 'end!', 'endlabeledit!',
-            'enterprise!', 'enterpriseonlyfeature!', 'enumeratedtype!', 'enumerationdefinition!',
-            'enumerationitemdefinition!', 'environment!', 'error!', 'errorlogging!',
-            'eventnotexisterror!', 'eventwrongprototypeerror!', 'excel!', 'excel5!',
-            'exceptionfail!', 'exceptionignore!', 'exceptionretry!',
-            'exceptionsubstitutereturnvalue!',
-            'exclamation!', 'exclude!', 'exportapplication!', 'exportdatawindow!',
-            'exportfunction!', 'exportmenu!', 'exportpipeline!', 'exportproject!',
-            'exportquery!', 'exportstructure!', 'exportuserobject!', 'exportwindow!',
-            'externalvisual!', 'extobject!', 'failonanyconflict!', 'fdiagonal!',
-            'featurenotsupportederror!', 'filealreadyopenerror!', 'filecloseerror!',
-            'fileexists!',
-            'fileinvalidformaterror!', 'filemenu!', 'filenotopenerror!', 'filenotseterror!',
-            'filereaderror!', 'filetyperichtext!', 'filetypetext!', 'filewriteerror!',
-            'filter!', 'first!', 'firstvisibletreeitem!', 'fixed!',
-            'floating!', 'focusrect!', 'footer!', 'foreground!',
-            'frombeginning!', 'fromcurrent!', 'fromend!', 'functionobject!',
-            'gb231charset!', 'getfocus!', 'graph!', 'graphicobject!',
-            'graxis!', 'grdispattr!', 'greekcharset!', 'groupbox!',
-            'hand!', 'hangeul!', 'header!', 'hebrewcharset!',
-            'helpmenu!', 'hide!', 'horizontal!', 'hotlinkalarm!',
-            'hourglass!', 'hppa!', 'hprogressbar!', 'hpux!',
-            'hscrollbar!', 'hticksonboth!', 'hticksonbottom!', 'hticksonneither!',
-            'hticksontop!', 'htmltable!', 'htrackbar!', 'i286!',
-            'i386!', 'i486!', 'icon!', 'icons!',
-            'idle!', 'importdatawindow!', 'indent!', 'index!',
-            'inet!', 'information!', 'inplace!', 'inputfieldselected!',
-            'insertitem!', 'inside!', 'integer!', 'internetresult!',
-            'italic!', 'itemchanged!', 'itemchanging!', 'itemcollapsed!',
-            'itemcollapsing!', 'itemerror!', 'itemexpanded!', 'itemexpanding!',
-            'itemfocuschanged!', 'itempopulate!', 'jaguarorb!', 'johabcharset!',
-            'justify!', 'key!', 'key0!', 'key1!',
-            'key2!', 'key3!', 'key4!', 'key5!',
-            'key6!', 'key7!', 'key8!', 'key9!',
-            'keya!', 'keyadd!', 'keyalt!', 'keyapps!',
-            'keyb!', 'keyback!', 'keybackquote!', 'keybackslash!',
-            'keyc!', 'keycapslock!', 'keycomma!', 'keycontrol!',
-            'keyd!', 'keydash!', 'keydecimal!', 'keydelete!',
-            'keydivide!', 'keydownarrow!', 'keye!', 'keyend!',
-            'keyenter!', 'keyequal!', 'keyescape!', 'keyf!',
-            'keyf1!', 'keyf10!', 'keyf11!', 'keyf12!',
-            'keyf2!', 'keyf3!', 'keyf4!', 'keyf5!',
-            'keyf6!', 'keyf7!', 'keyf8!', 'keyf9!',
-            'keyg!', 'keyh!', 'keyhome!', 'keyi!',
-            'keyinsert!', 'keyj!', 'keyk!', 'keyl!',
-            'keyleftarrow!', 'keyleftbracket!', 'keyleftbutton!', 'keyleftwindows!',
-            'keym!', 'keymiddlebutton!', 'keymultiply!', 'keyn!',
-            'keynull!', 'keynumlock!', 'keynumpad0!', 'keynumpad1!',
-            'keynumpad2!', 'keynumpad3!', 'keynumpad4!', 'keynumpad5!',
-            'keynumpad6!', 'keynumpad7!', 'keynumpad8!', 'keynumpad9!',
-            'keyo!', 'keyp!', 'keypagedown!', 'keypageup!',
-            'keypause!', 'keyperiod!', 'keyprintscreen!', 'keyq!',
-            'keyquote!', 'keyr!', 'keyrightarrow!', 'keyrightbracket!',
-            'keyrightbutton!', 'keyrightwindows!', 'keys!', 'keyscrolllock!',
-            'keysemicolon!', 'keyshift!', 'keyslash!', 'keyspacebar!',
-            'keysubtract!', 'keyt!', 'keytab!', 'keyu!',
-            'keyuparrow!', 'keyv!', 'keyw!', 'keyword!',
-            'keyx!', 'keyy!', 'keyz!', 'languageafrikaans!',
-            'languagealbanian!', 'languagearabicalgeria!', 'languagearabicbahrain!',
-            'languagearabicegypt!',
-            'languagearabiciraq!', 'languagearabicjordan!', 'languagearabickuwait!',
-            'languagearabiclebanon!',
-            'languagearabiclibya!', 'languagearabicmorocco!', 'languagearabicoman!',
-            'languagearabicqatar!',
-            'languagearabicsaudiarabia!', 'languagearabicsyria!', 'languagearabictunisia!',
-            'languagearabicuae!',
-            'languagearabicyemen!', 'languagebasque!', 'languagebulgarian!', 'languagebyelorussian!',
-            'languagecatalan!', 'languagechinese!', 'languagechinesehongkong!', 'languagechinesesimplified!',
-            'languagechinesesingapore!', 'languagechinesetraditional!', 'languagecroatian!', 'languageczech!',
-            'languagedanish!', 'languagedutch!', 'languagedutchbelgian!', 'languagedutchneutral!',
-            'languageenglish!', 'languageenglishaustralian!', 'languageenglishcanadian!',
-            'languageenglishirish!',
-            'languageenglishnewzealand!', 'languageenglishsouthafrica!', 'languageenglishuk!',
-            'languageenglishus!',
-            'languageestonian!', 'languagefaeroese!', 'languagefarsi!', 'languagefinnish!',
-            'languagefrench!', 'languagefrenchbelgian!', 'languagefrenchcanadian!', 'languagefrenchluxembourg!',
-            'languagefrenchneutral!', 'languagefrenchswiss!', 'languagegerman!', 'languagegermanaustrian!',
-            'languagegermanliechtenstein!', 'languagegermanluxembourg!', 'languagegermanneutral!',
-            'languagegermanswiss!',
-            'languagegreek!', 'languagehebrew!', 'languagehindi!', 'languagehungarian!',
-            'languageicelandic!', 'languageindonesian!', 'languageitalian!', 'languageitalianneutral!',
-            'languageitalianswiss!', 'languagejapanese!', 'languagekorean!', 'languagekoreanjohab!',
-            'languagelatvian!', 'languagelithuanian!', 'languagemacedonian!', 'languagemaltese!',
-            'languageneutral!', 'languagenorwegian!', 'languagenorwegianbokmal!', 'languagenorwegiannynorsk!',
-            'languagepolish!', 'languageportuguese!', 'languageportuguese_brazilian!',
-            'languageportugueseneutral!',
-            'languagerhaetoromanic!', 'languageromanian!', 'languageromanianmoldavia!', 'languagerussian!',
-            'languagerussianmoldavia!', 'languagesami!', 'languageserbian!', 'languageslovak!',
-            'languageslovenian!', 'languagesorbian!', 'languagesortnative!', 'languagesortunicode!',
-            'languagespanish!', 'languagespanishcastilian!', 'languagespanishmexican!', 'languagespanishmodern!',
-            'languagesutu!', 'languageswedish!', 'languagesystemdefault!', 'languagethai!',
-            'languagetsonga!', 'languagetswana!', 'languageturkish!', 'languageukrainian!',
-            'languageurdu!', 'languageuserdefault!', 'languagevenda!', 'languagexhosa!',
-            'languagezulu!', 'last!', 'layer!', 'layered!',
-            'Left!', 'leftmargin!', 'line!', 'line3d!',
-            'linear!', 'linecolor!', 'linedown!', 'linegraph!',
-            'lineleft!', 'linemode!', 'lineright!', 'lineup!',
-            'linkupdateautomatic!', 'linkupdatemanual!', 'listbox!', 'listview!',
-            'listviewitem!', 'listviewlargeicon!', 'listviewlist!', 'listviewreport!',
-            'listviewsmallicon!', 'lockread!', 'lockreadwrite!', 'lockwrite!',
-            'log10!', 'loge!', 'long!', 'losefocus!',
-            'lower!', 'lowered!', 'm68000!', 'm68020!',
-            'm68030!', 'm68040!', 'maccharset!', 'macintosh!',
-            'mailattach!', 'mailbcc!', 'mailbodyasfile!', 'mailcc!',
-            'maildownload!', 'mailentiremessage!', 'mailenvelopeonly!', 'mailfiledescription!',
-            'mailmessage!', 'mailnewsession!', 'mailnewsessionwithdownload!', 'mailole!',
-            'mailolestatic!', 'mailoriginator!', 'mailrecipient!', 'mailreturnaccessdenied!',
-            'mailreturnattachmentnotfound!', 'mailreturnattachmentopenfailure!',
-            'mailreturnattachmentwritefailure!', 'mailreturndiskfull!',
-            'mailreturnfailure!', 'mailreturninsufficientmemory!', 'mailreturninvalidmessage!',
-            'mailreturnloginfailure!',
-            'mailreturnmessageinuse!', 'mailreturnnomessages!', 'mailreturnsuccess!', 'mailreturntexttoolarge!',
-            'mailreturntoomanyfiles!', 'mailreturntoomanyrecipients!', 'mailreturntoomanysessions!',
-            'mailreturnunknownrecipient!',
-            'mailreturnuserabort!', 'mailsession!', 'mailsuppressattachments!', 'mailto!',
-            'main!', 'maximized!', 'mdi!', 'mdiclient!',
-            'mdihelp!', 'menu!', 'menucascade!', 'menuitemtypeabout!',
-            'menuitemtypeexit!', 'menuitemtypehelp!', 'menuitemtypenormal!', 'merge!',
-            'message!', 'minimized!', 'mips!', 'modelexistserror!',
-            'modelnotexistserror!', 'modern!', 'modified!', 'mousedown!',
-            'mousemove!', 'mouseup!', 'moved!', 'multiline!',
-            'multilineedit!', 'mutexcreateerror!', 'new!', 'newmodified!',
-            'next!', 'nexttreeitem!', 'nextvisibletreeitem!', 'noborder!',
-            'noconnectprivilege!', 'nolegend!', 'none!', 'nonvisualobject!',
-            'normal!', 'nosymbol!', 'notic!', 'notmodified!',
-            'notopmost!', 'notype!', 'numericmask!', 'objhandle!',
-            'oem!', 'off!', 'offsite!', 'ok!',
-            'okcancel!', 'olecontrol!', 'olecustomcontrol!', 'oleobject!',
-            'olestorage!', 'olestream!', 'oletxnobject!', 'omcontrol!',
-            'omcustomcontrol!', 'omembeddedcontrol!', 'omobject!', 'omstorage!',
-            'omstream!', 'open!', 'orb!', 'original!',
-            'osf1!', 'other!', 'outside!', 'oval!',
-            'pagedown!', 'pageleft!', 'pageright!', 'pageup!',
-            'parenttreeitem!', 'pbtocppobject!', 'pentium!', 'percentage!',
-            'picture!', 'picturebutton!', 'picturehyperlink!', 'picturelistbox!',
-            'pictureselected!', 'pie3d!', 'piegraph!', 'pipeend!',
-            'pipeline!', 'pipemeter!', 'pipestart!', 'popup!',
-            'powerobject!', 'powerpc!', 'powerrs!', 'ppc601!',
-            'ppc603!', 'ppc604!', 'previewdelete!', 'previewfunctionreselectrow!',
-            'previewfunctionretrieve!', 'previewfunctionupdate!', 'previewinsert!', 'previewselect!',
-            'previewupdate!', 'previoustreeitem!', 'previousvisibletreeitem!', 'primary!',
-            'printend!', 'printfooter!', 'printheader!', 'printpage!',
-            'printstart!', 'prior!', 'private!', 'process!',
-            'profilecall!', 'profileclass!', 'profileline!', 'profileroutine!',
-            'profiling!', 'protected!', 'psreport!', 'public!',
-            'question!', 'radiobutton!', 'raised!', 'rbuttondown!',
-            'rbuttonup!', 'read!', 'readonlyargument!', 'real!',
-            'rectangle!', 'regbinary!', 'regexpandstring!', 'reglink!',
-            'regmultistring!', 'regstring!', 'regulong!', 'regulongbigendian!',
-            'remoteexec!', 'remotehotlinkstart!', 'remotehotlinkstop!', 'remoteobject!',
-            'remoterequest!', 'remotesend!', 'rename!', 'replace!',
-            'resize!', 'resizeborder!', 'response!', 'resultset!',
-            'resultsets!', 'retrieveend!', 'retrieverow!', 'retrievestart!',
-            'retrycancel!', 'richtextedit!', 'Right!', 'rightclicked!',
-            'rightdoubleclicked!', 'rightmargin!', 'rnddays!', 'rnddefault!',
-            'rndhours!', 'rndmicroseconds!', 'rndminutes!', 'rndmonths!',
-            'rndnumber!', 'rndseconds!', 'rndyears!', 'roman!',
-            'roottreeitem!', 'roundrectangle!', 'routineesql!', 'routineevent!',
-            'routinefunction!', 'routinegarbagecollection!', 'routineobjectcreation!',
-            'routineobjectdestruction!',
-            'routineroot!', 'rowfocuschanged!', 'russiancharset!', 'save!',
-            'scalartype!', 'scattergraph!', 'script!', 'scriptdefinition!',
-            'scriptevent!', 'scriptfunction!', 'scrollhorizontal!', 'scrollvertical!',
-            'selected!', 'selectionchanged!', 'selectionchanging!', 'series!',
-            'service!', 'shade!', 'shadowbox!', 'shared!',
-            'sharedobjectcreateinstanceerror!', 'sharedobjectcreatepbsessionerror!',
-            'sharedobjectexistserror!', 'sharedobjectnotexistserror!',
-            'shiftjis!', 'show!', 'simpletype!', 'simpletypedefinition!',
-            'singlelineedit!', 'size!', 'sizenesw!', 'sizens!',
-            'sizenwse!', 'sizewe!', 'sol2!', 'solid!',
-            'sort!', 'sourcepblerror!', 'spacing1!', 'spacing15!',
-            'spacing2!', 'sparc!', 'sqlinsert!', 'sqlpreview!',
-            'square!', 'sslcallback!', 'sslserviceprovider!', 'statichyperlink!',
-            'statictext!', 'stgdenynone!', 'stgdenyread!', 'stgdenywrite!',
-            'stgexclusive!', 'stgread!', 'stgreadwrite!', 'stgwrite!',
-            'stopsign!', 'straddle!', 'streammode!', 'stretch!',
-            'strikeout!', 'string!', 'stringmask!', 'structure!',
-            'stylebox!', 'stylelowered!', 'styleraised!', 'styleshadowbox!',
-            'subscript!', 'success!', 'superscript!', 'swiss!',
-            'sylk!', 'symbol!', 'symbolhollowbox!', 'symbolhollowcircle!',
-            'symbolhollowdiamond!', 'symbolhollowdownarrow!', 'symbolhollowuparrow!', 'symbolplus!',
-            'symbolsolidbox!', 'symbolsolidcircle!', 'symbolsoliddiamond!', 'symbolsoliddownarrow!',
-            'symbolsoliduparrow!', 'symbolstar!', 'symbolx!', 'system!',
-            'systemerror!', 'systemfunctions!', 'systemkey!', 'tab!',
-            'tabsonbottom!', 'tabsonbottomandtop!', 'tabsonleft!', 'tabsonleftandright!',
-            'tabsonright!', 'tabsonrightandleft!', 'tabsontop!', 'tabsontopandbottom!',
-            'text!', 'thaicharset!', 'thread!', 'tile!',
-            'tilehorizontal!', 'time!', 'timemask!', 'timer!',
-            'timernone!', 'timing!', 'tobottom!', 'toolbarmoved!',
-            'top!', 'topic!', 'topmost!', 'totop!',
-            'traceactivitynode!', 'traceatomic!', 'tracebeginend!', 'traceerror!',
-            'traceesql!', 'tracefile!', 'tracegarbagecollect!', 'tracegeneralerror!',
-            'tracein!', 'traceline!', 'tracenomorenodes!', 'tracenotstartederror!',
-            'traceobject!', 'traceout!', 'traceroutine!', 'tracestartederror!',
-            'tracetree!', 'tracetreeerror!', 'tracetreeesql!', 'tracetreegarbagecollect!',
-            'tracetreeline!', 'tracetreenode!', 'tracetreeobject!', 'tracetreeroutine!',
-            'tracetreeuser!', 'traceuser!', 'transaction!', 'transactionserver!',
-            'transparent!', 'transport!', 'treeview!', 'treeviewitem!',
-            'turkishcharset!', 'typeboolean!', 'typecategory!', 'typecategoryaxis!',
-            'typecategorylabel!', 'typedata!', 'typedate!', 'typedatetime!',
-            'typedecimal!', 'typedefinition!', 'typedouble!', 'typegraph!',
-            'typeinteger!', 'typelegend!', 'typelong!', 'typereal!',
-            'typeseries!', 'typeseriesaxis!', 'typeserieslabel!', 'typestring!',
-            'typetime!', 'typetitle!', 'typeuint!', 'typeulong!',
-            'typeunknown!', 'typevalueaxis!', 'typevaluelabel!', 'ultrasparc!',
-            'unboundedarray!', 'underline!', 'underlined!', 'unsignedinteger!',
-            'unsignedlong!', 'unsorted!', 'uparrow!', 'updateend!',
-            'updatestart!', 'upper!', 'userdefinedsort!', 'userobject!',
-            'variable!', 'variableargument!', 'variablecardinalitydefinition!', 'variabledefinition!',
-            'variableglobal!', 'variableinstance!', 'variablelocal!', 'variableshared!',
-            'varlistargument!', 'vbxvisual!', 'vcenter!', 'vertical!',
-            'vietnamesecharset!', 'viewchange!', 'vprogressbar!', 'vscrollbar!',
-            'vticksonboth!', 'vticksonleft!', 'vticksonneither!', 'vticksonright!',
-            'vtrackbar!', 'window!', 'windowmenu!', 'windowobject!',
-            'windows!', 'windowsnt!', 'wk1!', 'wks!',
-            'wmf!', 'write!', 'xpixelstounits!', 'xunitstopixels!',
-            'xvalue!', 'yesno!', 'yesnocancel!', 'ypixelstounits!',
-            'yunitstopixels!',
-            'yvalue!',
-            'zoom!'
-            )
-        ),
-    'SYMBOLS' => array(
-            0 => array('(', ')', '[', ']', '{', '}'),
-            1 => array('|'),
-            2 => array('+', '-', '*', '/'),
-            3 => array('=', '&lt;', '>', '^')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #008000; font-weight: bold;',
-            2 => 'color: #990099; font-weight: bold;',
-            3 => 'color: #330099; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #0000ff; font-weight: bold;',
-            'MULTI' => 'color: #0000ff; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #800000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #330099; font-weight: bold;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;',
-            1 => 'color: #ffff00; background-color:#993300; font-weight: bold',
-            2 => 'color: #000000;',
-            3 => 'color: #000000;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #800000; font-weight: bold;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/powershell.php b/inc/geshi/powershell.php
deleted file mode 100644
index bd78d7392..000000000
--- a/inc/geshi/powershell.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/*************************************************************************************
- * powershell.php
- * ---------------------------------
- * Author: Frode Aarebrot (frode@aarebrot.net)
- * Copyright: (c) 2008 Frode Aarebrot (http://www.aarebrot.net)
- * Release Version: 1.0.8.11
- * Date Started: 2008/06/20
- *
- * PowerShell language file for GeSHi.
- *
- * I've tried to make this language file as true to the highlighting in PowerGUI as
- * possible. Unfortunately it's not 100% complete, although it is pretty close.
- *
- * I've included some classes and their members, but there's tons and tons of these.
- * I suggest you add the ones you need yourself. I've included a few Sharepoint ones
- * in this language file.
- *
- * CHANGES
- * -------
- * 2008/06/20 (1.0.8)
- *  -  First Release
- *
- * TODO (updated 2008/06/20)
- * -------------------------
- * - Color text between Cmdlets/Aliases and pipe/end-of-line
- * - Try and get -- and ++ to work in the KEYWORDS array with the other operators
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PowerShell',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array('<#' => '#>'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '`',
-    'KEYWORDS' => array(
-        1 => array(
-            // Cmdlets
-            'Add-Content', 'Add-History', 'Add-Member', 'Add-PSSnapin', 'Clear-Content', 'Clear-Item',
-            'Clear-ItemProperty', 'Clear-Variable', 'Compare-Object', 'ConvertFrom-SecureString',
-            'Convert-Path', 'ConvertTo-Html', 'ConvertTo-SecureString', 'Copy-Item', 'Copy-ItemProperty',
-            'Export-Alias', 'Export-Clixml', 'Export-Console', 'Export-Csv', 'ForEach-Object',
-            'Format-Custom', 'Format-List', 'Format-Table', 'Format-Wide', 'Get-Acl', 'Get-Alias',
-            'Get-AuthenticodeSignature', 'Get-ChildItem', 'Get-Command', 'Get-Content', 'Get-Credential',
-            'Get-Culture', 'Get-Date', 'Get-EventLog', 'Get-ExecutionPolicy', 'Get-Help', 'Get-History',
-            'Get-Host', 'Get-Item', 'Get-ItemProperty', 'Get-Location', 'Get-Member',
-            'Get-PfxCertificate', 'Get-Process', 'Get-PSDrive', 'Get-PSProvider', 'Get-PSSnapin',
-            'Get-Service', 'Get-TraceSource', 'Get-UICulture', 'Get-Unique', 'Get-Variable',
-            'Get-WmiObject', 'Group-Object', 'Import-Alias', 'Import-Clixml', 'Import-Csv',
-            'Invoke-Expression', 'Invoke-History', 'Invoke-Item', 'Join-Path', 'Measure-Command',
-            'Measure-Object', 'Move-Item', 'Move-ItemProperty', 'New-Alias', 'New-Item',
-            'New-ItemProperty', 'New-Object', 'New-PSDrive', 'New-Service', 'New-TimeSpan',
-            'New-Variable', 'Out-Default', 'Out-File', 'Out-Host', 'Out-Null', 'Out-Printer',
-            'Out-String', 'Pop-Location', 'Push-Location', 'Read-Host', 'Remove-Item',
-            'Remove-ItemProperty', 'Remove-PSDrive', 'Remove-PSSnapin', 'Remove-Variable', 'Rename-Item',
-            'Rename-ItemProperty', 'Resolve-Path', 'Restart-Service', 'Resume-Service', 'Select-Object',
-            'Select-String', 'Set-Acl', 'Set-Alias', 'Set-AuthenticodeSignature', 'Set-Content',
-            'Set-Date', 'Set-ExecutionPolicy', 'Set-Item', 'Set-ItemProperty', 'Set-Location',
-            'Set-PSDebug', 'Set-Service', 'Set-TraceSource', 'Set-Variable', 'Sort-Object', 'Split-Path',
-            'Start-Service', 'Start-Sleep', 'Start-Transcript', 'Stop-Process', 'Stop-Service',
-            'Stop-Transcript', 'Suspend-Service', 'Tee-Object', 'Test-Path', 'Trace-Command',
-            'Update-FormatData', 'Update-TypeData', 'Where-Object', 'Write-Debug', 'Write-Error',
-            'Write-Host', 'Write-Output', 'Write-Progress', 'Write-Verbose', 'Write-Warning'
-            ),
-        2 => array(
-            // Aliases
-            'ac', 'asnp', 'clc', 'cli', 'clp', 'clv', 'cpi', 'cpp', 'cvpa', 'diff', 'epal', 'epcsv', 'fc',
-            'fl', 'ft', 'fw', 'gal', 'gc', 'gci', 'gcm', 'gdr', 'ghy', 'gi', 'gl', 'gm',
-            'gp', 'gps', 'group', 'gsv', 'gsnp', 'gu', 'gv', 'gwmi', 'iex', 'ihy', 'ii', 'ipal', 'ipcsv',
-            'mi', 'mp', 'nal', 'ndr', 'ni', 'nv', 'oh', 'rdr', 'ri', 'rni', 'rnp', 'rp', 'rsnp', 'rv',
-            'rvpa', 'sal', 'sasv', 'sc', 'select', 'si', 'sl', 'sleep', 'sort', 'sp', 'spps', 'spsv', 'sv',
-            'tee', 'write', 'cat', 'cd', 'clear', 'cp', 'h', 'history', 'kill', 'lp', 'ls',
-            'mount', 'mv', 'popd', 'ps', 'pushd', 'pwd', 'r', 'rm', 'rmdir', 'echo', 'cls', 'chdir',
-            'copy', 'del', 'dir', 'erase', 'move', 'rd', 'ren', 'set', 'type'
-            ),
-        3 => array(
-            // Reserved words
-            'break', 'continue', 'do', 'for', 'foreach', 'while', 'if', 'switch', 'until', 'where',
-            'function', 'filter', 'else', 'elseif', 'in', 'return', 'param', 'throw', 'trap'
-            ),
-        4 => array(
-            // Operators
-            '-eq', '-ne', '-gt', '-ge', '-lt', '-le', '-ieq', '-ine', '-igt', '-ige', '-ilt', '-ile',
-            '-ceq', '-cne', '-cgt', '-cge', '-clt', '-cle', '-like', '-notlike', '-match', '-notmatch',
-            '-ilike', '-inotlike', '-imatch', '-inotmatch', '-clike', '-cnotlike', '-cmatch', '-cnotmatch',
-            '-contains', '-notcontains', '-icontains', '-inotcontains', '-ccontains', '-cnotcontains',
-            '-isnot', '-is', '-as', '-replace', '-ireplace', '-creplace', '-and', '-or', '-band', '-bor',
-            '-not', '-bnot', '-f', '-casesensitive', '-exact', '-file', '-regex', '-wildcard'
-            ),
-        5 => array(
-            // Options
-            '-Year', '-Wrap', '-Word', '-Width', '-WhatIf', '-Wait', '-View', '-Verbose', '-Verb',
-            '-Variable', '-ValueOnly', '-Value', '-Unique', '-UFormat', '-TypeName', '-Trace', '-TotalCount',
-            '-Title', '-TimestampServer', '-TargetObject', '-Syntax', '-SyncWindow', '-Sum', '-String',
-            '-Strict', '-Stream', '-Step', '-Status', '-Static', '-StartupType', '-Start', '-StackName',
-            '-Stack', '-SourceId', '-SimpleMatch', '-ShowError', '-Separator', '-SecureString', '-SecureKey',
-            '-SecondValue', '-SecondsRemaining', '-Seconds', '-Second', '-Scope', '-Root', '-Role',
-            '-Resolve', '-RemoveListener', '-RemoveFileListener', '-Registered', '-ReferenceObject',
-            '-Recurse', '-RecommendedAction', '-ReadCount', '-Quiet', '-Query', '-Qualifier', '-PSSnapin',
-            '-PSProvider', '-PSHost', '-PSDrive', '-PropertyType', '-Property', '-Prompt', '-Process',
-            '-PrependPath', '-PercentComplete', '-Pattern', '-PathType', '-Path', '-PassThru', '-ParentId',
-            '-Parent', '-Parameter', '-Paging', '-OutVariable', '-OutBuffer', '-Option', '-OnType', '-Off',
-            '-Object', '-Noun', '-NoTypeInformation', '-NoQualifier', '-NoNewline', '-NoElement',
-            '-NoClobber', '-NewName', '-Newest', '-Namespace', '-Name', '-Month', '-Minutes', '-Minute',
-            '-Minimum', '-Milliseconds', '-Message', '-MemberType', '-Maximum', '-LogName', '-LiteralPath',
-            '-LiteralName', '-ListenerOption', '-List', '-Line', '-Leaf', '-Last', '-Key', '-ItemType',
-            '-IsValid', '-IsAbsolute', '-InputObject', '-IncludeEqual', '-IncludeChain', '-Include',
-            '-IgnoreWhiteSpace', '-Id', '-Hours', '-Hour', '-HideTableHeaders', '-Head', '-GroupBy',
-            '-Functionality', '-Full', '-Format', '-ForegroundColor', '-Force', '-First', '-FilterScript',
-            '-Filter', '-FilePath', '-Expression', '-ExpandProperty', '-Expand', '-ExecutionPolicy',
-            '-ExcludeProperty', '-ExcludeDifferent', '-Exclude', '-Exception', '-Examples', '-ErrorVariable',
-            '-ErrorRecord', '-ErrorId', '-ErrorAction', '-End', '-Encoding', '-DisplayName', '-DisplayHint',
-            '-DisplayError', '-DifferenceObject', '-Detailed', '-Destination', '-Description', '-Descending',
-            '-Depth', '-DependsOn', '-Delimiter', '-Debugger', '-Debug', '-Days', '-Day', '-Date',
-            '-CurrentOperation', '-Culture', '-Credential', '-Count', '-Container', '-Confirm',
-            '-ComputerName', '-Component', '-Completed', '-ComObject', '-CommandType', '-Command',
-            '-Column', '-Class', '-ChildPath', '-Character', '-Certificate', '-CategoryTargetType',
-            '-CategoryTargetName', '-CategoryReason', '-CategoryActivity', '-Category', '-CaseSensitive',
-            '-Body', '-BinaryPathName', '-Begin', '-BackgroundColor', '-Average', '-AutoSize', '-Audit',
-            '-AsString', '-AsSecureString', '-AsPlainText', '-As', '-ArgumentList', '-AppendPath', '-Append',
-            '-Adjust', '-Activity', '-AclObject'
-            ),
-        6 => array(
-            '_','args','DebugPreference','Error','ErrorActionPreference',
-            'foreach','Home','Host','Input','LASTEXITCODE','MaximumAliasCount',
-            'MaximumDriveCount','MaximumFunctionCount','MaximumHistoryCount',
-            'MaximumVariableCount','OFS','PsHome',
-            'ReportErrorShowExceptionClass','ReportErrorShowInnerException',
-            'ReportErrorShowSource','ReportErrorShowStackTrace',
-            'ShouldProcessPreference','ShouldProcessReturnPreference',
-            'StackTrace','VerbosePreference','WarningPreference','PWD'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '=', '<', '>', '@', '|', '&', ',', '?',
-        '+=', '-=', '*=', '/=', '%=', '*', '/', '%', '!', '+', '-', '++', '--'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #008080; font-weight: bold;',
-            2 => 'color: #008080; font-weight: bold;',
-            3 => 'color: #0000FF;',
-            4 => 'color: #FF0000;',
-            5 => 'color: #008080; font-style: italic;',
-            6 => 'color: #000080;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;',
-            'MULTI' => 'color: #008000;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #800000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #804000;'
-            ),
-        'METHODS' => array(
-            0 => 'color: pink;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: pink;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #800080;',
-            3 => 'color: #008080;',
-            4 => 'color: #008080;',
-            5 => 'color: #800000;',
-            6 => 'color: #000080;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => 'about:blank',
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        // special after pipe
-        3 => array(
-            GESHI_SEARCH => '(\[)(int|long|string|char|bool|byte|double|decimal|float|single|regex|array|xml|scriptblock|switch|hashtable|type|ref|psobject|wmi|wmisearcher|wmiclass|object)((\[.*\])?\])',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => 'si',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
-            ),
-        // Classes
-        4 => array(
-            GESHI_SEARCH => '(\[)(System\.Reflection\.Assembly|System\.Net\.CredentialCache|Microsoft\.SharePoint\.SPFileLevel|Microsoft\.SharePoint\.Publishing\.PublishingWeb|Microsoft\.SharePoint\.Publishing|Microsoft\.SharePoint\.SPWeb)(\])',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
-            ),
-        // Members
-        // There's about a hundred million of these, add the ones you need as you need them
-        5 => array (
-            GESHI_SEARCH => '(::)(ReflectionOnlyLoadFrom|ReflectionOnlyLoad|ReferenceEquals|LoadWithPartialName|LoadFrom|LoadFile|Load|GetExecutingAssembly|GetEntryAssembly|GetCallingAssembly|GetAssembly|Equals|DefaultNetworkCredentials|DefaultCredentials|CreateQualifiedName|Checkout|Draft|Published|IsPublishingWeb)',
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => ''
-            ),
-        // Special variables
-        6 => array(
-            GESHI_SEARCH => '(\$)(\$[_\^]?|\?)(?!\w)',
-            GESHI_REPLACE => '\1\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // variables
-        //BenBE: Please note that changes here and in Keyword group 6 have to be synchronized in order to work properly.
-        //This Regexp must only match, if keyword group 6 doesn't. If this assumption fails
-        //Highlighting of the keywords will be incomplete or incorrect!
-        0 => "(?<!\\\$|>)[\\\$](\w+)(?=[^|\w])",
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            4 => array(
-                'DISALLOWED_AFTER' => '(?![a-zA-Z])',
-                'DISALLOWED_BEFORE' => ''
-                ),
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<!\$>)\$'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/proftpd.php b/inc/geshi/proftpd.php
deleted file mode 100644
index 330db4b27..000000000
--- a/inc/geshi/proftpd.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-/*************************************************************************************
- * proftpd.php
- * ----------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2011/01/25
- *
- * ProFTPd language file for GeSHi.
- * Words are scraped from their documentation
- *
- * CHANGES
- * -------
- * 2004/08/05 (1.0.8.10)
- *   -  First Release
- *
- * TODO (updated 2011/01/25)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ProFTPd configuration',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /*keywords*/
-        1 => array(
-            //mod_auth
-            'AccessDenyMsg', 'AccessGrantMsg', 'AnonRejectePasswords',
-            'AnonRequirePassword', 'AuthAliasOnly', 'AuthUsingAlias',
-            'CreateHome', 'DefaultChdir', 'DefaultRoot', 'GroupPassword',
-            'LoginPasswordPrompt', 'MaxClients', 'MaxClientsPerClass',
-            'MaxClientsPerHost', 'MaxClientsPerUser', 'MaxConnectionsPerHost',
-            'MaxHostsPerUser', 'MaxLoginAttempts', 'RequireValidShell',
-            'RootLogin', 'RootRevoke', 'TimeoutLogin', 'TimeoutSession',
-            'UseFtpUsers', 'UserAlias', 'UserDirRoot', 'UserPassword',
-
-            //mod_auth_file
-            'AuthGroupFile', 'AuthUserFile',
-
-            //mod_auth_pam
-            'AuthPAM', 'AuthPAMConfig',
-
-            //mod_auth_unix
-            'PersistentPasswd',
-
-            //mod_ban
-            'BanControlsACLs', 'BanEngine', 'BanLog', 'BanMessage', 'BanOnEvent',
-            'BanTable',
-
-            //mod_cap
-            'CapabilitiesEngine', 'CapabilitiesSet',
-
-            //mod_core
-            'Allow', 'AllowAll', 'AllowClass', 'AllowFilter',
-            'AllowForeignAddress', 'AllowGroup', 'AllowOverride',
-            'AllowRetrieveRestart', 'AllowStoreRestart', 'AllowUser',
-            'AnonymousGroup', 'AuthOrder', 'Bind', 'CDPath', 'Class', 'Classes',
-            'CommandBufferSize', 'DebugLevel', 'DefaultAddress',
-            'DefaultServer', 'DefaultTransferMode', 'DeferWelcome', 'Define',
-            'Deny', 'DenyAll', 'DenyClass', 'DenyFilter', 'DenyGroup',
-            'DenyUser', 'DisplayChdir', 'DisplayConnect', 'DisplayFirstChdir',
-            'DisplayGoAway', 'DisplayLogin', 'DisplayQuit', 'From', 'Group',
-            'GroupOwner', 'HideFiles', 'HideGroup', 'HideNoAccess', 'HideUser',
-            'IdentLookups', 'IgnoreHidden', 'Include', 'MasqueradeAddress',
-            'MaxConnectionRate', 'MaxInstances', 'MultilineRFC2228', 'Order',
-            'PassivePorts', 'PathAllowFilter', 'PathDenyFilter', 'PidFile',
-            'Port', 'RLimitCPU', 'RLimitMemory', 'RLimitOpenFiles', 'Satisfy',
-            'ScoreboardFile', 'ServerAdmin', 'ServerIdent', 'ServerName',
-            'ServerType', 'SetEnv', 'SocketBindTight', 'SocketOptions',
-            'SyslogFacility', 'SyslogLevel', 'tcpBackLog', 'tcpNoDelay',
-            'TimeoutIdle', 'TimeoutLinger', 'TimesGMT', 'TransferLog', 'Umask',
-            'UnsetEnv', 'UseIPv6', 'User', 'UseReverseDNS', 'UserOwner',
-            'UseUTF8', 'WtmpLog',
-
-            //mod_ctrls_admin
-            'AdminControlsACLs', 'AdminControlsEngine',
-
-            //mod_delay
-            'DelayEngine', 'DelayTable',
-
-            //mod_dynmasq
-            'DynMasqRefresh',
-
-            //mod_exec
-            'ExecBeforeCommand', 'ExecEngine', 'ExecEnviron', 'ExecLog',
-            'ExecOnCommand', 'ExecOnConnect', 'ExecOnError', 'ExecOnEvent',
-            'ExecOnExit', 'ExecOnRestart', 'ExecOptions', 'ExecTimeout',
-
-            //mod_ldap
-            'LDAPAliasDereference', 'LDAPAttr', 'LDAPAuthBinds',
-            'LDAPDefaultAuthScheme', 'LDAPDefaultGID', 'LDAPDefaultUID',
-            'LDAPDNInfo', 'LDAPDoAuth', 'LDAPDoGIDLookups',
-            'LDAPDoQuotaLookups', 'LDAPDoUIDLookups',
-            'LDAPForceGeneratedHomedir', 'LDAPForceHomedirOnDemand',
-            'LDAPGenerateHomedir', 'LDAPGenerateHomedirPrefix',
-            'LDAPGenerateHomedirPrefixNoUsername', 'LDAPHomedirOnDemand',
-            'LDAPHomedirOnDemandPrefix', 'LDAPHomedirOnDemandPrefixNoUsername',
-            'LDAPHomedirOnDemandSuffix', 'LDAPNegativeCache',
-            'LDAPProtocolVersion', 'LDAPQueryTimeout', 'LDAPSearchScope',
-            'LDAPServer',
-
-            //mod_load
-            'MaxLoad',
-
-            //mod_log
-            'AllowLogSymlinks', 'ExtendedLog', 'LogFormat', 'ServerLog',
-            'SystemLog',
-
-            //mod_ls'
-            'DirFakeGroup', 'DirFakeMode', 'DirFakeUser', 'ListOptions',
-            'ShowSymlinks', 'UseGlobbing',
-
-            //mod_quotatab
-            'QuotaDirectoryTally', 'QuotaDisplayUnits', 'QuotaEngine',
-            'QuotaExcludeFilter', 'QuotaLimitTable', 'QuotaLock', 'QuotaLog',
-            'QuotaOptions', 'QuotaShowQuotas', 'QuotaTallyTable',
-
-            //mod_quotatab_file
-
-            //mod_quotatab_ldap
-
-            //mod_quotatab_sql
-
-            //mod_radius
-            'RadiusAcctServer', 'RadiusAuthServer', 'RadiusEngine',
-            'RadiusGroupInfo', 'RadiusLog', 'RadiusNASIdentifier',
-            'RadiusQuotaInfo', 'RadiusRealm', 'RadiusUserInfo', 'RadiusVendor',
-
-            //mod_ratio
-            'AnonRatio', 'ByteRatioErrMsg', 'CwdRatioMsg', 'FileRatioErrMsg',
-            'GroupRatio', 'HostRatio', 'LeechRatioMsg', 'RatioFile', 'Ratios',
-            'RatioTempFile', 'SaveRatios', 'UserRatio',
-
-            //mod_readme
-            'DisplayReadme',
-
-            //mod_rewrite
-            'RewriteCondition', 'RewriteEngine', 'RewriteLock', 'RewriteLog',
-            'RewriteMap', 'RewriteRule',
-
-            //mod_sftp
-            'SFTPAcceptEnv', 'SFTPAuthMethods', 'SFTPAuthorizedHostKeys',
-            'SFTPAuthorizedUserKeys', 'SFTPCiphers', 'SFTPClientMatch',
-            'SFTPCompression', 'SFTPCryptoDevice', 'SFTPDHParamFile',
-            'SFTPDigests', 'SFTPDisplayBanner', 'SFTPEngine', 'SFTPExtensions',
-            'SFTPHostKey', 'SFTPKeyBlacklist', 'SFTPKeyExchanges', 'SFTPLog',
-            'SFTPMaxChannels', 'SFTPOptions', 'SFTPPassPhraseProvider',
-            'SFTPRekey', 'SFTPTrafficPolicy',
-
-            //mod_sftp_pam
-            'SFTPPAMEngine', 'SFTPPAMOptions', 'SFTPPAMServiceName',
-
-            //mod_sftp_sql
-
-            //mod_shaper
-            'ShaperAll', 'ShaperControlsACLs', 'ShaperEngine', 'ShaperLog',
-            'ShaperSession', 'ShaperTable',
-
-            //mod_sql
-            'SQLAuthenticate', 'SQLAuthTypes', 'SQLBackend', 'SQLConnectInfo',
-            'SQLDefaultGID', 'SQLDefaultHomedir', 'SQLDefaultUID', 'SQLEngine',
-            'SQLGroupInfo', 'SQLGroupWhereClause', 'SQLHomedirOnDemand',
-            'SQLLog', 'SQLLogFile', 'SQLMinID', 'SQLMinUserGID',
-            'SQLMinUserUID', 'SQLNamedQuery', 'SQLNegativeCache', 'SQLOptions',
-            'SQLRatios', 'SQLRatioStats', 'SQLShowInfo', 'SQLUserInfo',
-            'SQLUserWhereClause',
-
-            //mod_sql_passwd
-            'SQLPasswordEncoding', 'SQLPasswordEngine', 'SQLPasswordSaltFile',
-            'SQLPasswordUserSalt',
-
-            //mod_tls
-            'TLSCACertificateFile', 'TLSCACertificatePath',
-            'TLSCARevocationFile', 'TLSCARevocationPath',
-            'TLSCertificateChainFile', 'TLSCipherSuite', 'TLSControlsACLs',
-            'TLSCryptoDevice', 'TLSDHParamFile', 'TLSDSACertificateFile',
-            'TLSDSACertificateKeyFile', 'TLSEngine', 'TLSLog', 'TLSOptions',
-            'TLSPKCS12File', 'TLSPassPhraseProvider', 'TLSProtocol',
-            'TLSRandomSeed', 'TLSRenegotiate', 'TLSRequired',
-            'TLSRSACertificateFile', 'TLSRSACertificateKeyFile',
-            'TLSSessionCache', 'TLSTimeoutHandshake', 'TLSVerifyClient',
-            'TLSVerifyDepth', 'TLSVerifyOrder',
-
-            //mod_tls_shmcache
-
-            //mod_unique_id
-            'UniqueIDEngine',
-
-            //mod_wrap
-            'TCPAccessFiles', 'TCPAccessSyslogLevels', 'TCPGroupAccessFiles',
-            'TCPServiceName', 'TCPUserAccessFiles',
-
-            //mod_wrap2
-            'WrapAllowMsg', 'WrapDenyMsg', 'WrapEngine', 'WrapGroupTables',
-            'WrapLog', 'WrapServiceName', 'WrapTables', 'WrapUserTables',
-
-            //mod_wrap2_file
-
-            //mod_wrap2_sql
-
-            //mod_xfer
-            'AllowOverwrite', 'DeleteAbortedStores', 'DisplayFileTransfer',
-            'HiddenStor', 'HiddenStores', 'MaxRetrieveFileSize',
-            'MaxStoreFileSize', 'StoreUniquePrefix', 'TimeoutNoTransfer',
-            'TimeoutStalled', 'TransferRate', 'UseSendfile',
-
-            //unknown
-            'ScoreboardPath', 'ScoreboardScrub'
-            ),
-        /*keywords 3*/
-        3 => array(
-            //mod_core
-            'Anonymous',
-            'Class',
-            'Directory',
-            'IfDefine',
-            'IfModule',
-            'Limit',
-            'VirtualHost',
-
-            //mod_ifsession
-            'IfClass', 'IfGroup', 'IfUser',
-
-            //mod_version
-            'IfVersion'
-            ),
-        /*permissions*/
-        4 => array(
-            //mod_core
-            'ALL',
-            'CDUP',
-            'CMD',
-            'CWD',
-            'DELE',
-            'DIRS',
-            'LOGIN',
-            'MKD',
-            'READ',
-            'RETR',
-            'RMD',
-            'RNFR',
-            'RNTO',
-            'STOR',
-            'WRITE',
-            'XCWD',
-            'XMKD',
-            'XRMD',
-
-            //mod_copy
-            'SITE_CPFR', 'SITE_CPTO',
-
-            //mod_quotatab
-            'SITE_QUOTA',
-
-            //mod_site
-            'SITE_HELP', 'SITE_CHMOD', 'SITE_CHGRP',
-
-            //mod_site_misc
-            'SITE_MKDIR', 'SITE_RMDIR', 'SITE_SYMLINK', 'SITE_UTIME',
-            ),
-        /*keywords 2*/
-        2 => array(
-            'all','on','off','yes','no',
-            'standalone', 'inetd',
-            'default', 'auth', 'write',
-            'internet', 'local', 'limit', 'ip',
-            'from'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #000000; font-weight:bold;',
-            4 => 'color: #000080; font-weight:bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #339933;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:www.proftpd.org+inurl:docs&amp;btnI=I%27m%20Feeling%20Lucky',
-        2 => '',
-        3 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:www.proftpd.org+inurl:docs&amp;btnI=I%27m%20Feeling%20Lucky',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'SYMBOLS' => GESHI_NEVER
-        ),
-        'KEYWORDS' => array(
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?<=\s)(?<!=)',
-                'DISALLOWED_AFTER' => '(?!\+)(?!\w)',
-            ),
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
-                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
-            ),
-            4 => array(
-                'DISALLOWED_BEFORE' => '(?<=\s)(?<!=)',
-                'DISALLOWED_AFTER' => '(?!\+)(?=\/|(?:\s+\w+)*\s*&gt;)',
-            )
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/progress.php b/inc/geshi/progress.php
deleted file mode 100644
index 79900261b..000000000
--- a/inc/geshi/progress.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/*************************************************************************************
- * progress.php
- * --------
- * Author: Marco Aurelio de Pasqual (marcop@hdi.com.br)
- * Copyright: (c) 2008 Marco Aurelio de Pasqual, Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2008/07/11
- *
- * Progress language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/07/11 (1.0.8)
- *   -  First Release
- *
- * TODO (updated 2008/07/11)
- * -------------------------
- * * Clean up the keyword list
- * * Sort Keyword lists by Control Structures, Predefined functions and other important keywords
- * * Complete language support
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Progress',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array (
-        1 => array(
-            'ACCUMULATE','APPLY','ASSIGN','BELL','QUERY',
-            'BUFFER-COMPARE','BUFFER-COPY','CALL','CASE',
-            'CHOOSE','CLASS','CLOSE QUERY','each','WHERE',
-            'CLOSE STORED-PROCEDURE','COLOR','COMPILE','CONNECT',
-            'CONSTRUCTOR','COPY-LOB','CREATE','CREATE ALIAS',
-            'CREATE BROWSE','CREATE BUFFER','CREATE CALL','CREATE CLIENT-PRINCIPAL',
-            'CREATE DATABASE','CREATE DATASET','CREATE DATA-SOURCE','CREATE QUERY',
-            'CREATE SAX-attributeS','CREATE SAX-READER','CREATE SAX-WRITER','CREATE SERVER',
-            'CREATE SERVER-SOCKET','CREATE SOAP-HEADER','CREATE SOAP-HEADER-ENTRYREF','CREATE SOCKET',
-            'CREATE TEMP-TABLE','CREATE WIDGET','CREATE widget-POOL','CREATE X-DOCUMENT',
-            'CREATE X-NODEREF','CURRENT-LANGUAGE','CURRENT-VALUE','DDE ADVISE',
-            'DDE EXECUTE','DDE GET','DDE INITIATE','DDE REQUEST',
-            'DDE SEND','DDE TERMINATE','DEFINE BROWSE','DEFINE BUFFER','DEFINE',
-            'DEFINE BUTTON','DEFINE DATASET','DEFINE DATA-SOURCE','DEFINE FRAME','DEF','VAR',
-            'DEFINE IMAGE','DEFINE MENU','DEFINE PARAMETER','DEFINE property','PARAM',
-            'DEFINE QUERY','DEFINE RECTANGLE','DEFINE STREAM','DEFINE SUB-MENU',
-            'DEFINE TEMP-TABLE','DEFINE WORKFILE','DEFINE WORK-TABLE',
-            'DELETE','DELETE ALIAS','DELETE object','DELETE PROCEDURE',
-            'DELETE widget','DELETE widget-POOL','DESTRUCTOR','DICTIONARY',
-            'DISABLE','DISABLE TRIGGERS','DISCONNECT','DISPLAY',
-            'DO','DOS','DOWN','DYNAMIC-CURRENT-VALUE',
-            'ELSE','EMPTY TEMP-TABLE','ENABLE','END',
-            'ENTRY','FIND','AND',
-            'FIX-CODEPAGE','FOR','FORM','FRAME-VALUE',
-            'GET','GET-KEY-VALUE','HIDE','IF',
-            'IMPORT','INPUT CLEAR','INPUT CLOSE','INPUT FROM','input',
-            'INPUT THROUGH','INPUT-OUTPUT CLOSE','INPUT-OUTPUT THROUGH',
-            'INTERFACE','LEAVE','BREAK',
-            'LOAD-PICTURE','MESSAGE','method','NEXT','prev',
-            'NEXT-PROMPT','ON','OPEN QUERY','OS-APPEND',
-            'OS-COMMAND','OS-COPY','OS-CREATE-DIR','OS-DELETE',
-            'OS-RENAME','OUTPUT CLOSE','OUTPUT THROUGH','OUTPUT TO',
-            'OVERLAY','PAGE','PAUSE','PROCEDURE',
-            'PROCESS EVENTS','PROMPT-FOR','PROMSGS','PROPATH',
-            'PUBLISH','PUT','PUT CURSOR','PUT SCREEN',
-            'PUT-BITS','PUT-BYTE','PUT-BYTES','PUT-DOUBLE',
-            'PUT-FLOAT','PUT-INT64','PUT-KEY-VALUE','PUT-LONG',
-            'PUT-SHORT','PUT-STRING','PUT-UNSIGNED-LONG','PUT-UNSIGNED-SHORT',
-            'QUIT','RAW-TRANSFER','READKEY','RELEASE',
-            'RELEASE EXTERNAL','RELEASE object','REPEAT','REPOSITION',
-            'RUN','RUN STORED-PROCEDURE','RUN SUPER',
-            'SAVE CACHE','SCROLL','SEEK','SET',
-            'SET-BYTE-ORDER','SET-POINTER-VALUE','SET-SIZE','SHOW-STATS',
-            'STATUS','STOP','SUBSCRIBE','SUBSTRING',
-            'system-DIALOG COLOR','system-DIALOG FONT','system-DIALOG GET-DIR','system-DIALOG GET-FILE',
-            'system-DIALOG PRINTER-SETUP','system-HELP','THEN','THIS-object',
-            'TRANSACTION-MODE AUTOMATIC','TRIGGER PROCEDURE','UNDERLINE','UNDO',
-            'UNIX','UNLOAD','UNSUBSCRIBE','UP','STRING',
-            'UPDATE','USE','USING','substr','SKIP','CLOSE',
-            'VIEW','WAIT-FOR','MODULO','NE','AVAIL',
-            'NOT','OR','&GLOBAL-DEFINE','&IF','UNFORMATTED','NO-PAUSE',
-            '&THEN','&ELSEIF','&ELSE','&ENDIF','OPEN','NO-WAIT',
-            '&MESSAGE','&SCOPED-DEFINE','&UNDEFINE','DEFINED',
-            'BROWSE','BUTTON','COMBO-BOX','CONTROL-FRAME',
-            'DIALOG-BOX','EDITOR','FIELD-GROUP','FILL-IN',
-            'FRAME','IMAGE','LITERAL','MENU',
-            'MENU-ITEM','RADIO-SET','RECTANGLE','SELECTION-LIST',
-            'SLIDER','SUB-MENU','TEXT','TOGGLE-BOX',
-            'WINDOW','WITH','AT','OF','EDITING','ON ENDKEY','output',
-            'ON ERROR','ON QUIT','ON STOP','PRESELECT',
-            'QUERY-TUNING','SIZE','Trigger','VIEW-AS','ALERT-BOX',
-            'Buffer','Data-relation','ProDataSet','SAX-attributes',
-            'SAX-reader','SAX-writer','Server socket','SOAP-fault',
-            'SOAP-header','SOAP-header-entryref','Socket','Temp-table',
-            'X-noderef','Height','Left','Top','TO',
-            'Width','ACTIVE-WINDOW','AUDIT-CONTROL','FIRST','LAST',
-            'AUDIT-POLICY','CLIPBOARD','CODEBASE-LOCATOR','COLOR-TABLE',
-            'COMPILER','COM-SELF','DEBUGGER','DEFAULT-WINDOW',
-            'ERROR-STATUS','FILE-INFO','FOCUS','FONT-TABLE',
-            'LAST-EVENT','LOG-MANAGER','RCODE-INFO','SECURITY-POLICY',
-            'SELF','SESSION','SOURCE-PROCEDURE','TARGET-PROCEDURE','NO-LOCK','NO-error',
-            'THIS-PROCEDURE','WEB-CONTEXT','FUNCTION','RETURNS','NO-UNDO'
-            ),
-        2 => array(
-            'ACCEPT-CHANGES','ACCEPT-ROW-CHANGES','ADD-BUFFER','ADD-CALC-COLUMN',
-            'ADD-COLUMNS-FROM','ADD-EVENTS-PROCEDURE','ADD-FIELDS-FROM','ADD-FIRST',
-            'ADD-HEADER-ENTRY','ADD-INDEX-FIELD','ADD-LAST','ADD-LIKE-COLUMN',
-            'ADD-LIKE-FIELD','ADD-LIKE-INDEX','ADD-NEW-FIELD','ADD-NEW-INDEX',
-            'ADD-RELATION','ADD-SCHEMA-LOCATION','ADD-SOURCE-BUFFER','ADD-SUPER-PROCEDURE',
-            'APPEND-CHILD','APPLY-CALLBACK','ATTACH-DATA-SOURCE','AUTHENTICATION-FAILED',
-            'BEGIN-EVENT-GROUP','BUFFER-CREATE',
-            'BUFFER-DELETE','BUFFER-RELEASE','BUFFER-VALIDATE',
-            'CANCEL-BREAK','CANCEL-REQUESTS','CLEAR','CLEAR-APPL-CONTEXT',
-            'CLEAR-LOG','CLEAR-SELECTION','CLEAR-SORT-ARROWS','CLONE-NODE',
-            'CLOSE-LOG','CONNECTED','CONVERT-TO-OFFSET',
-            'COPY-DATASET','COPY-SAX-attributeS','COPY-TEMP-TABLE','CREATE-LIKE',
-            'CREATE-NODE','CREATE-NODE-NAMESPACE','CREATE-RESULT-LIST-ENTRY','DEBUG',
-            'DECLARE-NAMESPACE','DELETE-CHAR','DELETE-CURRENT-ROW',
-            'DELETE-HEADER-ENTRY','DELETE-LINE','DELETE-NODE','DELETE-RESULT-LIST-ENTRY',
-            'DELETE-SELECTED-ROW','DELETE-SELECTED-ROWS','DESELECT-FOCUSED-ROW','DESELECT-ROWS',
-            'DESELECT-SELECTED-ROW','DETACH-DATA-SOURCE','DISABLE-CONNECTIONS',
-            'DISABLE-DUMP-TRIGGERS','DISABLE-LOAD-TRIGGERS','DISPLAY-MESSAGE',
-            'DUMP-LOGGING-NOW','EDIT-CLEAR','EDIT-COPY','EDIT-CUT',
-            'EDIT-PASTE','EDIT-UNDO','EMPTY-DATASET','EMPTY-TEMP-TABLE',
-            'ENABLE-CONNECTIONS','ENABLE-EVENTS','ENCRYPT-AUDIT-MAC-KEY',
-            'END-DOCUMENT','END-ELEMENT','END-EVENT-GROUP','END-FILE-DROP',
-            'EXPORT','EXPORT-PRINCIPAL','FETCH-SELECTED-ROW',
-            'FILL','FIND-BY-ROWID','FIND-CURRENT','FIND-FIRST',
-            'FIND-LAST','FIND-UNIQUE','GET-attribute','GET-attribute-NODE',
-            'GET-BINARY-DATA','GET-BLUE-VALUE','GET-BROWSE-COLUMN','GET-BUFFER-HANDLE',
-            'GET-BYTES-AVAILABLE','GET-CALLBACK-PROC-CONTEXT','GET-CALLBACK-PROC-NAME','GET-CGI-LIST',
-            'GET-CGI-LONG-VALUE','GET-CGI-VALUE','GET-CHANGES','GET-CHILD',
-            'GET-CHILD-RELATION','GET-CONFIG-VALUE','GET-CURRENT','GET-DATASET-BUFFER',
-            'GET-DOCUMENT-ELEMENT','GET-DROPPED-FILE','GET-DYNAMIC','GET-ERROR-COLUMN ',
-            'GET-ERROR-ROW ','GET-FILE-NAME ','GET-FILE-OFFSET ','GET-FIRST',
-            'GET-GREEN-VALUE','GET-HEADER-ENTRY','GET-INDEX-BY-NAMESPACE-NAME','GET-INDEX-BY-QNAME',
-            'GET-ITERATION','GET-LAST','GET-LOCALNAME-BY-INDEX','GET-MESSAGE',
-            'GET-NEXT','GET-NODE','GET-NUMBER','GET-PARENT',
-            'GET-PREV','GET-PRINTERS','GET-property','GET-QNAME-BY-INDEX',
-            'GET-RED-VALUE','GET-RELATION','GET-REPOSITIONED-ROW','GET-RGB-VALUE',
-            'GET-SELECTED-widget','GET-SERIALIZED','GET-SIGNATURE','GET-SOCKET-OPTION',
-            'GET-SOURCE-BUFFER','GET-TAB-ITEM','GET-TEXT-HEIGHT-CHARS','GET-TEXT-HEIGHT-PIXELS',
-            'GET-TEXT-WIDTH-CHARS','GET-TEXT-WIDTH-PIXELS','GET-TOP-BUFFER','GET-TYPE-BY-INDEX',
-            'GET-TYPE-BY-NAMESPACE-NAME','GET-TYPE-BY-QNAME','GET-URI-BY-INDEX','GET-VALUE-BY-INDEX',
-            'GET-VALUE-BY-NAMESPACE-NAME','GET-VALUE-BY-QNAME','GET-WAIT-STATE','IMPORT-NODE',
-            'IMPORT-PRINCIPAL','INCREMENT-EXCLUSIVE-ID','INITIALIZE-DOCUMENT-TYPE',
-            'INITIATE','INSERT','INSERT-attribute','INSERT-BACKTAB',
-            'INSERT-BEFORE','INSERT-FILE','INSERT-ROW','INSERT-STRING',
-            'INSERT-TAB','INVOKE','IS-ROW-SELECTED','IS-SELECTED',
-            'LIST-property-NAMES','LOAD','LoadControls','LOAD-DOMAINS',
-            'LOAD-ICON','LOAD-IMAGE','LOAD-IMAGE-DOWN','LOAD-IMAGE-INSENSITIVE',
-            'LOAD-IMAGE-UP','LOAD-MOUSE-POINTER','LOAD-SMALL-ICON','LOCK-REGISTRATION',
-            'LOG-AUDIT-EVENT','LOGOUT','LONGCHAR-TO-NODE-VALUE','LOOKUP',
-            'MEMPTR-TO-NODE-VALUE','MERGE-CHANGES','MERGE-ROW-CHANGES','MOVE-AFTER-TAB-ITEM',
-            'MOVE-BEFORE-TAB-ITEM','MOVE-COLUMN','MOVE-TO-BOTTOM','MOVE-TO-EOF',
-            'MOVE-TO-TOP','NODE-VALUE-TO-LONGCHAR','NODE-VALUE-TO-MEMPTR','NORMALIZE',
-            'QUERY-CLOSE','QUERY-OPEN','QUERY-PREPARE',
-            'READ','READ-FILE','READ-XML','READ-XMLSCHEMA',
-            'REFRESH','REFRESH-AUDIT-POLICY','REGISTER-DOMAIN','REJECT-CHANGES',
-            'REJECT-ROW-CHANGES','REMOVE-attribute','REMOVE-CHILD','REMOVE-EVENTS-PROCEDURE',
-            'REMOVE-SUPER-PROCEDURE','REPLACE','REPLACE-CHILD','REPLACE-SELECTION-TEXT',
-            'REPOSITION-BACKWARD','REPOSITION-FORWARD','REPOSITION-TO-ROW','REPOSITION-TO-ROWID',
-            'RESET','SAVE','SAVE-FILE','SAVE-ROW-CHANGES',
-            'SAX-PARSE','SAX-PARSE-FIRST','SAX-PARSE-NEXT','SCROLL-TO-CURRENT-ROW',
-            'SCROLL-TO-ITEM','SCROLL-TO-SELECTED-ROW','SEAL','SEARCH',
-            'SELECT-ALL','SELECT-FOCUSED-ROW','SELECT-NEXT-ROW','SELECT-PREV-ROW',
-            'SELECT-ROW','SET-ACTOR','SET-APPL-CONTEXT','SET-attribute',
-            'SET-attribute-NODE','SET-BLUE-VALUE','SET-BREAK','SET-BUFFERS',
-            'SET-CALLBACK','SET-CALLBACK-PROCEDURE','SET-CLIENT','SET-COMMIT',
-            'SET-CONNECT-PROCEDURE','SET-DYNAMIC','SET-GREEN-VALUE','SET-INPUT-SOURCE',
-            'SET-MUST-UNDERSTAND','SET-NODE','SET-NUMERIC-FORMAT','SET-OUTPUT-DESTINATION',
-            'SET-PARAMETER','SET-property','SET-READ-RESPONSE-PROCEDURE','SET-RED-VALUE',
-            'SET-REPOSITIONED-ROW','SET-RGB-VALUE','SET-ROLLBACK','SET-SELECTION',
-            'SET-SERIALIZED','SET-SOCKET-OPTION','SET-SORT-ARROW','SET-WAIT-STATE',
-            'START-DOCUMENT','START-ELEMENT','STOP-PARSING','SYNCHRONIZE',
-            'TEMP-TABLE-PREPARE','UPDATE-attribute','URL-DECODE','URL-ENCODE',
-            'VALIDATE','VALIDATE-SEAL','WRITE','WRITE-CDATA','USE-INDEX',
-            'WRITE-CHARACTERS','WRITE-COMMENT','WRITE-DATA-ELEMENT','WRITE-EMPTY-ELEMENT',
-            'WRITE-ENTITY-REF','WRITE-EXTERNAL-DTD','WRITE-FRAGMENT','WRITE-MESSAGE',
-            'WRITE-PROCESSING-INSTRUCTION','WRITE-XML','WRITE-XMLSCHEMA','FALSE','true'
-            ),
-        3 => array(
-            'ABSOLUTE','ACCUM','ADD-INTERVAL','ALIAS','mod',
-            'AMBIGUOUS','ASC','AUDIT-ENABLED','AVAILABLE',
-            'BASE64-DECODE','BASE64-ENCODE','CAN-DO','CAN-FIND',
-            'CAN-QUERY','CAN-SET','CAPS','CAST','OS-DIR',
-            'CHR','CODEPAGE-CONVERT','COMPARE',
-            'COUNT-OF','CURRENT-CHANGED','CURRENT-RESULT-ROW','DATASERVERS',
-            'DATA-SOURCE-MODIFIED','DATETIME','DATETIME-TZ',
-            'DAY','DBCODEPAGE','DBCOLLATION','DBNAME',
-            'DBPARAM','DBRESTRICTIONS','DBTASKID','DBTYPE',
-            'DBVERSION','DECIMAL','DECRYPT','DYNAMIC-function',
-            'DYNAMIC-NEXT-VALUE','ENCODE','ENCRYPT','ENTERED',
-            'ERROR','ETIME','EXP','ENDKEY','END-error',
-            'FIRST-OF','FRAME-DB','FRAME-DOWN',
-            'FRAME-FIELD','FRAME-FILE','FRAME-INDEX','FRAME-LINE',
-            'GATEWAYS','GENERATE-PBE-KEY','GENERATE-PBE-SALT','GENERATE-RANDOM-KEY',
-            'GENERATE-UUID','GET-BITS','GET-BYTE','GET-BYTE-ORDER',
-            'GET-BYTES','GET-CODEPAGE','GET-CODEPAGES','GET-COLLATION',
-            'GET-COLLATIONS','GET-DOUBLE','GET-FLOAT','GET-INT64',
-            'GET-LONG','GET-POINTER-VALUE','GET-SHORT','GET-SIZE',
-            'GET-STRING','GET-UNSIGNED-LONG','GET-UNSIGNED-SHORT','GO-PENDING',
-            'GUID','HEX-DECODE','INDEX',
-            'INT64','INTEGER','INTERVAL','IS-ATTR-SPACE',
-            'IS-CODEPAGE-FIXED','IS-COLUMN-CODEPAGE','IS-LEAD-BYTE','ISO-DATE',
-            'KBLABEL','KEYCODE','KEYFUNCTION','KEYLABEL',
-            'KEYWORD','KEYWORD-ALL','LASTKEY',
-            'LAST-OF','LC','LDBNAME','LEFT-TRIM',
-            'LIBRARY','LINE-COUNTER','LIST-EVENTS','LIST-QUERY-ATTRS',
-            'LIST-SET-ATTRS','LIST-widgetS','LOCKED',
-            'LOGICAL','MAXIMUM','MD5-DIGEST',
-            'MEMBER','MESSAGE-LINES','MINIMUM','MONTH',
-            'MTIME','NEW','NEXT-VALUE','SHARED',
-            'NOT ENTERED','NOW','NUM-ALIASES','NUM-DBS',
-            'NUM-ENTRIES','NUM-RESULTS','OPSYS','OS-DRIVES',
-            'OS-ERROR','OS-GETENV','PAGE-NUMBER','PAGE-SIZE',
-            'PDBNAME','PROC-HANDLE','PROC-STATUS','PROGRAM-NAME',
-            'PROGRESS','PROVERSION','QUERY-OFF-END','QUOTER',
-            'RANDOM','RAW','RECID','REJECTED',
-            'RETRY','RETURN-VALUE','RGB-VALUE',
-            'RIGHT-TRIM','R-INDEX','ROUND','ROWID','LENGTH',
-            'SDBNAME','SET-DB-CLIENT','SETUSERID',
-            'SHA1-DIGEST','SQRT','SUBSTITUTE','VARIABLE',
-            'SUPER','TERMINAL','TIME','TIMEZONE','external',
-            'TODAY','TO-ROWID','TRIM','TRUNCATE','return',
-            'TYPE-OF','USERID','VALID-EVENT','VALID-HANDLE',
-            'VALID-object','WEEKDAY','YEAR','BEGINS','VALUE',
-            'EQ','GE','GT','LE','LT','MATCHES','AS','BY','LIKE'
-            ),
-        4 => array(
-            'ACCELERATOR','ACTIVE','ACTOR','ADM-DATA',
-            'AFTER-BUFFER','AFTER-ROWID','AFTER-TABLE','ALLOW-COLUMN-SEARCHING',
-            'ALWAYS-ON-TOP','APPL-ALERT-BOXES','APPL-CONTEXT-ID','APPSERVER-INFO',
-            'APPSERVER-PASSWORD','APPSERVER-USERID','ASYNCHRONOUS','ASYNC-REQUEST-COUNT',
-            'ASYNC-REQUEST-HANDLE','ATTACHED-PAIRLIST','attribute-NAMES','ATTR-SPACE',
-            'AUDIT-EVENT-CONTEXT','AUTO-COMPLETION','AUTO-DELETE','AUTO-DELETE-XML',
-            'AUTO-END-KEY','AUTO-GO','AUTO-INDENT','AUTO-RESIZE',
-            'AUTO-RETURN','AUTO-SYNCHRONIZE','AUTO-VALIDATE','AUTO-ZAP',
-            'AVAILABLE-FORMATS','BACKGROUND','BASE-ADE','BASIC-LOGGING',
-            'BATCH-MODE','BATCH-SIZE','BEFORE-BUFFER','BEFORE-ROWID',
-            'BEFORE-TABLE','BGCOLOR','BLANK','BLOCK-ITERATION-DISPLAY',
-            'BORDER-BOTTOM-CHARS','BORDER-BOTTOM-PIXELS','BORDER-LEFT-CHARS','BORDER-LEFT-PIXELS',
-            'BORDER-RIGHT-CHARS','BORDER-RIGHT-PIXELS','BORDER-TOP-CHARS','BORDER-TOP-PIXELS',
-            'BOX','BOX-SELECTABLE','BUFFER-CHARS','BUFFER-FIELD',
-            'BUFFER-HANDLE','BUFFER-LINES','BUFFER-NAME','BUFFER-VALUE',
-            'BYTES-READ','BYTES-WRITTEN','CACHE','CALL-NAME',
-            'CALL-TYPE','CANCEL-BUTTON','CANCELLED','CAN-CREATE',
-            'CAN-DELETE','CAN-READ','CAN-WRITE','CAREFUL-PAINT',
-            'CASE-SENSITIVE','CENTERED','CHARSET','CHECKED',
-            'CHILD-BUFFER','CHILD-NUM','CLASS-TYPE','CLIENT-CONNECTION-ID',
-            'CLIENT-TTY','CLIENT-TYPE','CLIENT-WORKSTATION','CODE',
-            'CODEPAGE','COLUMN','COLUMN-BGCOLOR','COLUMN-DCOLOR',
-            'COLUMN-FGCOLOR','COLUMN-FONT','COLUMN-LABEL','COLUMN-MOVABLE',
-            'COLUMN-PFCOLOR','COLUMN-READ-ONLY','COLUMN-RESIZABLE','COLUMN-SCROLLING',
-            'COM-HANDLE','COMPLETE','CONFIG-NAME','CONTEXT-HELP',
-            'CONTEXT-HELP-FILE','CONTEXT-HELP-ID','CONTROL-BOX','CONVERT-3D-COLORS',
-            'CPCASE','CPCOLL','CPINTERNAL','CPLOG',
-            'CPPRINT','CPRCODEIN','CPRCODEOUT','CPSTREAM',
-            'CPTERM','CRC-VALUE','CURRENT-COLUMN','CURRENT-ENVIRONMENT',
-            'CURRENT-ITERATION','CURRENT-ROW-MODIFIED','CURRENT-WINDOW','CURSOR-CHAR',
-            'CURSOR-LINE','CURSOR-OFFSET','DATA-ENTRY-RETURN','DATASET',
-            'DATA-SOURCE','DATA-SOURCE-COMPLETE-MAP','DATA-TYPE','DATE-FORMAT',
-            'DB-REFERENCES','DCOLOR','DDE-ERROR','DDE-ID',
-            'DDE-ITEM','DDE-NAME','DDE-TOPIC','DEBLANK',
-            'DEBUG-ALERT','DECIMALS','DEFAULT','DEFAULT-BUFFER-HANDLE',
-            'DEFAULT-BUTTON','DEFAULT-COMMIT','DELIMITER','DISABLE-AUTO-ZAP',
-            'DISPLAY-TIMEZONE','DISPLAY-TYPE','DOMAIN-DESCRIPTION','DOMAIN-NAME',
-            'DOMAIN-TYPE','DRAG-ENABLED','DROP-TARGET','DYNAMIC',
-            'EDGE-CHARS','EDGE-PIXELS','EDIT-CAN-PASTE','EDIT-CAN-UNDO',
-            'EMPTY','ENCODING','ENCRYPTION-SALT','END-USER-PROMPT',
-            'ENTRY-TYPES-LIST','ERROR-COLUMN','ERROR-object-DETAIL','ERROR-ROW',
-            'ERROR-STRING','EVENT-GROUP-ID','EVENT-PROCEDURE','EVENT-PROCEDURE-CONTEXT',
-            'EVENT-TYPE','EXCLUSIVE-ID','EXECUTION-LOG','EXPAND',
-            'EXPANDABLE','FGCOLOR','FILE-CREATE-DATE','FILE-CREATE-TIME',
-            'FILE-MOD-DATE','FILE-MOD-TIME','FILE-NAME','FILE-OFFSET',
-            'FILE-SIZE','FILE-TYPE','FILLED','FILL-MODE',
-            'FILL-WHERE-STRING','FIRST-ASYNC-REQUEST','FIRST-BUFFER','FIRST-CHILD',
-            'FIRST-COLUMN','FIRST-DATASET','FIRST-DATA-SOURCE','FIRST-object',
-            'FIRST-PROCEDURE','FIRST-QUERY','FIRST-SERVER','FIRST-SERVER-SOCKET',
-            'FIRST-SOCKET','FIRST-TAB-ITEM','FIT-LAST-COLUMN','FLAT-BUTTON',
-            'FOCUSED-ROW','FOCUSED-ROW-SELECTED','FONT','FOREGROUND',
-            'FORMAT','FORMATTED','FORM-INPUT','FORM-LONG-INPUT',
-            'FORWARD-ONLY','FRAGMENT','FRAME-COL','FRAME-NAME',
-            'FRAME-ROW','FRAME-SPACING','FRAME-X','FRAME-Y',
-            'FREQUENCY','FULL-HEIGHT-CHARS','FULL-HEIGHT-PIXELS','FULL-PATHNAME',
-            'FULL-WIDTH-CHARS','FULL-WIDTH-PIXELS','GRAPHIC-EDGE',
-            'GRID-FACTOR-HORIZONTAL','GRID-FACTOR-VERTICAL','GRID-SNAP','GRID-UNIT-HEIGHT-CHARS',
-            'GRID-UNIT-HEIGHT-PIXELS','GRID-UNIT-WIDTH-CHARS','GRID-UNIT-WIDTH-PIXELS','GRID-VISIBLE',
-            'GROUP-BOX','HANDLE','HANDLER','HAS-LOBS',
-            'HAS-RECORDS','HEIGHT-CHARS','HEIGHT-PIXELS','HELP',
-            'HIDDEN','HORIZONTAL','HTML-CHARSET','HTML-END-OF-LINE',
-            'HTML-END-OF-PAGE','HTML-FRAME-BEGIN','HTML-FRAME-END','HTML-HEADER-BEGIN',
-            'HTML-HEADER-END','HTML-TITLE-BEGIN','HTML-TITLE-END','HWND',
-            'ICFPARAMETER','ICON','IGNORE-CURRENT-MODIFIED','IMAGE-DOWN',
-            'IMAGE-INSENSITIVE','IMAGE-UP','IMMEDIATE-DISPLAY','INDEX-INFORMATION',
-            'IN-HANDLE','INHERIT-BGCOLOR','INHERIT-FGCOLOR','INITIAL','INIT',
-            'INNER-CHARS','INNER-LINES','INPUT-VALUE','INSTANTIATING-PROCEDURE',
-            'INTERNAL-ENTRIES','IS-CLASS','IS-OPEN','IS-PARAMETER-SET',
-            'IS-XML','ITEMS-PER-ROW','KEEP-CONNECTION-OPEN','KEEP-FRAME-Z-ORDER',
-            'KEEP-SECURITY-CACHE','KEY','KEYS','LABEL',
-            'LABEL-BGCOLOR','LABEL-DCOLOR','LABEL-FGCOLOR','LABEL-FONT',
-            'LABELS','LANGUAGES','LARGE','LARGE-TO-SMALL',
-            'LAST-ASYNC-REQUEST','LAST-BATCH','LAST-CHILD','LAST-object',
-            'LAST-PROCEDURE','LAST-SERVER','LAST-SERVER-SOCKET','LAST-SOCKET',
-            'LAST-TAB-ITEM','LINE','LIST-ITEM-PAIRS','LIST-ITEMS',
-            'LITERAL-QUESTION','LOCAL-HOST','LOCAL-NAME','LOCAL-PORT',
-            'LOCATOR-COLUMN-NUMBER','LOCATOR-LINE-NUMBER','LOCATOR-PUBLIC-ID','LOCATOR-system-ID',
-            'LOCATOR-TYPE','LOG-ENTRY-TYPES','LOGFILE-NAME','LOGGING-LEVEL',
-            'LOGIN-EXPIRATION-TIMESTAMP','LOGIN-HOST','LOGIN-STATE','LOG-THRESHOLD',
-            'MANDATORY','MANUAL-HIGHLIGHT','MAX-BUTTON','MAX-CHARS',
-            'MAX-DATA-GUESS','MAX-HEIGHT-CHARS','MAX-HEIGHT-PIXELS','MAX-VALUE',
-            'MAX-WIDTH-CHARS','MAX-WIDTH-PIXELS','MD5-VALUE','MENU-BAR',
-            'MENU-KEY','MENU-MOUSE','MERGE-BY-FIELD','MESSAGE-AREA',
-            'MESSAGE-AREA-FONT','MIN-BUTTON','MIN-COLUMN-WIDTH-CHARS','MIN-COLUMN-WIDTH-PIXELS',
-            'MIN-HEIGHT-CHARS','MIN-HEIGHT-PIXELS','MIN-SCHEMA-MARSHAL','MIN-VALUE',
-            'MIN-WIDTH-CHARS','MIN-WIDTH-PIXELS','MODIFIED','MOUSE-POINTER',
-            'MOVABLE','MULTI-COMPILE','MULTIPLE','MULTITASKING-INTERVAL',
-            'MUST-UNDERSTAND','NAME','NAMESPACE-PREFIX','NAMESPACE-URI',
-            'NEEDS-APPSERVER-PROMPT','NEEDS-PROMPT','NESTED','NEW-ROW',
-            'NEXT-COLUMN','NEXT-ROWID','NEXT-SIBLING','NEXT-TAB-ITEM', 'NO-BOX',
-            'NO-CURRENT-VALUE','NODE-VALUE','NO-EMPTY-SPACE','NO-FOCUS',
-            'NONAMESPACE-SCHEMA-LOCATION','NO-SCHEMA-MARSHAL','NO-VALIDATE','NUM-BUFFERS',
-            'NUM-BUTTONS','NUM-CHILD-RELATIONS','NUM-CHILDREN','NUM-COLUMNS',
-            'NUM-DROPPED-FILES','NUMERIC-DECIMAL-POINT','NUMERIC-FORMAT','NUMERIC-SEPARATOR',
-            'NUM-FIELDS','NUM-FORMATS','NUM-HEADER-ENTRIES','NUM-ITEMS',
-            'NUM-ITERATIONS','NUM-LINES','NUM-LOCKED-COLUMNS','NUM-LOG-FILES',
-            'NUM-MESSAGES','NUM-PARAMETERS','NUM-REFERENCES','NUM-RELATIONS',
-            'NUM-REPLACED','NUM-SELECTED-ROWS','NUM-SELECTED-WIDGETS','NUM-SOURCE-BUFFERS',
-            'NUM-TABS','NUM-TOP-BUFFERS','NUM-TO-RETAIN','NUM-VISIBLE-COLUMNS',
-            'ON-FRAME-BORDER','ORIGIN-HANDLE','ORIGIN-ROWID','OWNER',
-            'OWNER-DOCUMENT','PAGE-BOTTOM','PAGE-TOP','PARAMETER',
-            'PARENT','PARENT-BUFFER','PARENT-RELATION','PARSE-STATUS',
-            'PASSWORD-FIELD','PATHNAME','PBE-HASH-ALGORITHM','PBE-KEY-ROUNDS',
-            'PERSISTENT','PERSISTENT-CACHE-DISABLED','PERSISTENT-PROCEDURE','PFCOLOR',
-            'PIXELS-PER-COLUMN','PIXELS-PER-ROW','POPUP-MENU','POPUP-ONLY',
-            'POSITION','PREFER-DATASET','PREPARED','PREPARE-STRING',
-            'PREV-COLUMN','PREV-SIBLING','PREV-TAB-ITEM','PRIMARY',
-            'PRINTER-CONTROL-HANDLE','PRINTER-HDC','PRINTER-NAME','PRINTER-PORT',
-            'PRIVATE-DATA','PROCEDURE-NAME','PROGRESS-SOURCE','PROXY',
-            'PROXY-PASSWORD','PROXY-USERID','PUBLIC-ID','PUBLISHED-EVENTS',
-            'RADIO-BUTTONS','READ-ONLY','RECORD-LENGTH',
-            'REFRESHABLE','RELATION-FIELDS','RELATIONS-ACTIVE','REMOTE',
-            'REMOTE-HOST','REMOTE-PORT','RESIZABLE','RESIZE',
-            'RESTART-ROWID','RETAIN-SHAPE','RETURN-INSERTED','RETURN-VALUE-DATA-TYPE',
-            'ROLES','ROUNDED','COL','ROW','ROW-HEIGHT-CHARS',
-            'ROW-HEIGHT-PIXELS','ROW-MARKERS','ROW-RESIZABLE','ROW-STATE',
-            'SAVE-WHERE-STRING','SCHEMA-CHANGE','SCHEMA-LOCATION','SCHEMA-MARSHAL',
-            'SCHEMA-PATH','SCREEN-LINES','SCREEN-VALUE','SCROLLABLE',
-            'SCROLLBAR-HORIZONTAL','SCROLL-BARS','SCROLLBAR-VERTICAL','SEAL-TIMESTAMP',
-            'SELECTABLE','SELECTED','SELECTION-END','SELECTION-START',
-            'SELECTION-TEXT','SENSITIVE','SEPARATOR-FGCOLOR','SEPARATORS',
-            'SERVER','SERVER-CONNECTION-BOUND','SERVER-CONNECTION-BOUND-REQUEST','SERVER-CONNECTION-CONTEXT',
-            'SERVER-CONNECTION-ID','SERVER-OPERATING-MODE','SESSION-END','SESSION-ID',
-            'SHOW-IN-TASKBAR','SIDE-LABEL-HANDLE','SIDE-LABELS','SKIP-DELETED-RECORD',
-            'SMALL-ICON','SMALL-TITLE','SOAP-FAULT-ACTOR','SOAP-FAULT-CODE',
-            'SOAP-FAULT-DETAIL','SOAP-FAULT-STRING','SORT','SORT-ASCENDING',
-            'SORT-NUMBER','SSL-SERVER-NAME','STANDALONE','STARTUP-PARAMETERS',
-            'STATE-DETAIL','STATUS-AREA','STATUS-AREA-FONT','STOPPED',
-            'STREAM','STRETCH-TO-FIT','STRICT','STRING-VALUE',
-            'SUBTYPE','SUPER-PROCEDURES','SUPPRESS-NAMESPACE-PROCESSING','SUPPRESS-WARNINGS',
-            'SYMMETRIC-ENCRYPTION-ALGORITHM','SYMMETRIC-ENCRYPTION-IV','SYMMETRIC-ENCRYPTION-KEY','SYMMETRIC-SUPPORT',
-            'system-ALERT-BOXES','system-ID','TABLE','TABLE-CRC-LIST',
-            'TABLE-HANDLE','TABLE-LIST','TABLE-NUMBER','TAB-POSITION',
-            'TAB-STOP','TEMP-DIRECTORY','TEXT-SELECTED','THREE-D',
-            'TIC-MARKS','TIME-SOURCE','TITLE','TITLE-BGCOLOR','FIELD',
-            'TITLE-DCOLOR','TITLE-FGCOLOR','TITLE-FONT','TOOLTIP',
-            'TOOLTIPS','TOP-ONLY','TRACKING-CHANGES','TRANSACTION',
-            'TRANS-INIT-PROCEDURE','TRANSPARENT','TYPE','UNIQUE-ID',
-            'UNIQUE-MATCH','URL','URL-PASSWORD','URL-USERID','EXTENT',
-            'USER-ID','V6DISPLAY','VALIDATE-EXPRESSION','VALIDATE-MESSAGE',
-            'VALIDATE-XML','VALIDATION-ENABLED','VIEW-FIRST-COLUMN-ON-REOPEN',
-            'VIRTUAL-HEIGHT-CHARS','VIRTUAL-HEIGHT-PIXELS','VIRTUAL-WIDTH-CHARS','VIRTUAL-WIDTH-PIXELS',
-            'VISIBLE','WARNING','WHERE-STRING','widget-ENTER','DATE',
-            'widget-LEAVE','WIDTH-CHARS','WIDTH-PIXELS','WINDOW-STATE',
-            'WINDOW-system','WORD-WRAP','WORK-AREA-HEIGHT-PIXELS','WORK-AREA-WIDTH-PIXELS',
-            'WORK-AREA-X','WORK-AREA-Y','WRITE-STATUS','X','widget-Handle',
-            'X-DOCUMENT','XML-DATA-TYPE','XML-NODE-TYPE','XML-SCHEMA-PATH',
-            'XML-SUPPRESS-NAMESPACE-PROCESSING','Y','YEAR-OFFSET','CHARACTER',
-            'LONGCHAR','MEMPTR','CHAR','DEC','INT','LOG','DECI','INTE','LOGI','long'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '<', '>', '=',
-        '+', '-', '*', '/',
-        '!', '@', '%', '|', '$',
-        ':', '.', ';', ',',
-        '?', '<=','<>','>=', '\\'
-        ),
-    'CASE_SENSITIVE' => array (
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array (
-        'KEYWORDS' => array (
-            1 => 'color: #0000ff; font-weight: bold;',
-            2 => 'color: #1D16B2;',
-            3 => 'color: #993333;',
-            4 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array (
-//            1 => 'color: #808080; font-style: italic;',
-//            2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array (
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array (
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array (
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array (
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array (
-            0 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array (
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array (
-            ),
-        'SCRIPT' => array (
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        0 => ':'
-        ),
-    'REGEXPS' => array (
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array (
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array (
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#&])",
-            'DISALLOWED_AFTER' =>  "(?![\-a-zA-Z0-9_%])",
-            1 => array(
-                'SPACE_AS_WHITESPACE' => true
-                ),
-            2 => array(
-                'SPACE_AS_WHITESPACE' => true
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/prolog.php b/inc/geshi/prolog.php
deleted file mode 100644
index a106a4e4e..000000000
--- a/inc/geshi/prolog.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/*************************************************************************************
- * prolog.php
- * --------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2008/10/02
- *
- * Prolog language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/02 (1.0.8.1)
- *  -  First Release
- *
- * TODO (updated 2008/10/02)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Prolog',
-    'COMMENT_SINGLE' => array(1 => '%'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("\'"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'abolish','abs','arg','asserta','assertz','at_end_of_stream','atan',
-            'atom','atom_chars','atom_codes','atom_concat','atom_length',
-            'atomic','bagof','call','catch','ceiling','char_code',
-            'char_conversion','clause','close','compound','consult','copy_term',
-            'cos','current_char_conversion','current_input','current_op',
-            'current_output','current_predicate','current_prolog_flag',
-            'discontiguous','dynamic','ensure_loaded','exp','fail','findall',
-            'float','float_fractional_part','float_integer_part','floor',
-            'flush_output','functor','get_byte','get_char','get_code','halt',
-            'include','initialization','integer','is','listing','log','mod',
-            'multifile','nl','nonvar','notrace','number','number_chars',
-            'number_codes','once','op','open','peek_byte','peek_char',
-            'peek_code','put_byte','put_char','put_code','read','read_term',
-            'rem','repeat','retract','round','set_input','set_output',
-            'set_prolog_flag','set_stream_position','setof','sign','sin','sqrt',
-            'stream_property','sub_atom','throw','trace','true','truncate',
-            'unify_with_occurs_check','univ','var','write','write_canonical',
-            'write_term','writeq'
-            )
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '[', ']', '{', '}',),
-        1 => array('?-', ':-', '=:='),
-        2 => array('\-', '\+', '\*', '\/'),
-        3 => array('-', '+', '*', '/'),
-        4 => array('.', ':', ',', ';'),
-        5 => array('!', '@', '&', '|'),
-        6 => array('<', '>', '=')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #990000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;',
-            'HARD' => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #800080;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;',
-            1 => 'color: #339933;',
-            2 => 'color: #339933;',
-            3 => 'color: #339933;',
-            4 => 'color: #339933;',
-            5 => 'color: #339933;',
-            6 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #008080;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://pauillac.inria.fr/~deransar/prolog/bips.html'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => "(?<![a-zA-Z0-9_])(?!(?:PIPE|SEMI|DOT)[^a-zA-Z0-9_])[A-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_])(?!\x7C)"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/properties.php b/inc/geshi/properties.php
deleted file mode 100644
index e1317b227..000000000
--- a/inc/geshi/properties.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*************************************************************************************
- * properties.php
- * --------
- * Author: Edy Hinzen
- * Copyright: (c) 2009 Edy Hinzen
- * Release Version: 1.0.8.11
- * Date Started: 2009/04/03
- *
- * Property language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/04/03 (1.0.0)
- *   -  First Release
- *
- * TODO
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PROPERTIES',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* Common used variables */
-        1 => array(
-            '${user.home}'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => ''
-            ),
-        'STRINGS' => array(
-            0 => 'color: #933;'
-            ),
-        'NUMBERS' => array(
-            0 => ''
-            ),
-        'METHODS' => array(
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000080; font-weight:bold;',
-            1 => 'color: #008000; font-weight:bold;'
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Entry names
-        0 => array(
-            GESHI_SEARCH => '^(\s*)([.a-zA-Z0-9_\-]+)(\s*=)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        //Entry values
-        1 => array(
-            // Evil hackery to get around GeSHi bug: <>" and ; are added so <span>s can be matched
-            // Explicit match on variable names because if a comment is before the first < of the span
-            // gets chewed up...
-            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.*)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1=',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/providex.php b/inc/geshi/providex.php
deleted file mode 100644
index 1e735bd0f..000000000
--- a/inc/geshi/providex.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/******************************************************************************
- * providex.php
- * ----------
- * Author: Jeff Wilder (jeff@coastallogix.com)
- * Copyright:  (c) 2008 Coastal Logix (http://www.coastallogix.com)
- * Release Version: 1.0.8.11
- * Date Started: 2008/10/18
- *
- * ProvideX language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/21 (1.0.0)
- *  - First Release
- *
- * TODO
- * -------------------------
- * 1. Create a regexp for numeric global variables (ex: %VarName = 3)
- * 2. Add standard object control properties
- *
- ******************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *****************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'ProvideX',
-    'COMMENT_SINGLE' => array(1 => '!'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        // Single-Line Comments using REM command
-        2 => "/\bREM\b.*?$/i"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            // Directives
-            '*break', '*continue', '*end', '*escape', '*next', '*proceed',
-            '*retry', '*return', '*same', 'accept', 'add index', 'addr',
-            'auto', 'begin', 'break', 'button', 'bye', 'call', 'case',
-            'chart', 'check_box', 'class', 'clear', 'clip_board', 'close',
-            'continue', 'control', 'create required', 'create table',
-            'cwdir', 'data', 'day_format', 'def', 'default', 'defctl',
-            'defprt', 'deftty', 'delete required', 'dictionary', 'dim', 'direct',
-            'directory', 'disable', 'drop', 'drop_box', 'dump', 'edit',
-            'else', 'enable', 'end switch', 'end', 'end_if', 'endtrace',
-            'enter', 'erase', 'error_handler', 'escape', 'event', 'execute',
-            'exit', 'exitto', 'extract', 'file', 'find', 'floating point',
-            'for', 'function', 'get_file_box', 'gosub', 'goto', 'grid',
-            'h_scrollbar', 'hide', 'if', 'index', 'indexed', 'input',
-            'insert', 'invoke', 'iolist', 'keyed', 'let', 'like',
-            'line_switch', 'list', 'list_box', 'load', 'local', 'lock',
-            'long_form', 'menu_bar', 'merge', 'message_lib', 'mnemonic',
-            'msgbox', 'multi_line', 'multi_media', 'next', 'object', 'obtain',
-            'on', 'open', 'password', 'perform', 'pop', 'popup_menu',
-            'precision', 'prefix', 'preinput', 'print', 'process', 'program',
-            'property', 'purge', 'quit', 'radio_button', 'randomize',
-            'read', 'record', 'redim', 'refile', 'release', 'rem', 'remove',
-            'rename', 'renumber', 'repeat', 'reset', 'restore', 'retry',
-            'return', 'round', 'run', 'save', 'select', 'serial', 'server',
-            'set_focus', 'set_nbf', 'set_param', 'setctl', 'setday', 'setdev',
-            'setdrive', 'seterr', 'setesc', 'setfid', 'setmouse', 'settime',
-            'settrace', 'short_form', 'show', 'sort', 'start', 'static',
-            'step', 'stop', 'switch', 'system_help', 'system_jrnl', 'table',
-            'then', 'to', 'translate', 'tristate_box', 'unlock', 'until',
-            'update', 'user_lex', 'v_scrollbar', 'vardrop_box', 'varlist_box',
-            'via', 'video_palette', 'wait', 'wend', 'while', 'winprt_setup',
-            'with', 'write'
-            ),
-        2 => array(
-            // System Functions
-            '@x', '@y', 'abs', 'acs', 'and', 'arg', 'asc', 'asn', 'ath',
-            'atn', 'bin', 'bsz', 'chg', 'chr', 'cmp', 'cos', 'cpl',
-            'crc', 'cse', 'ctl', 'cvs', 'dec', 'dir', 'dll', 'dsk',
-            'dte', 'env', 'ept', 'err', 'evn', 'evs', 'exp', 'ffn',
-            'fib', 'fid', 'fin', 'fpt', 'gap', 'gbl', 'gep', 'hsa',
-            'hsh', 'hta', 'hwn', 'i3e', 'ind', 'int', 'iol', 'ior',
-            'jul', 'jst', 'kec', 'kef', 'kel', 'ken', 'kep', 'key',
-            'kgn', 'lcs', 'len', 'lno', 'log', 'lrc', 'lst', 'max',
-            'mem', 'mid', 'min', 'mnm', 'mod', 'msg', 'msk', 'mxc',
-            'mxl', 'new', 'not', 'nul', 'num', 'obj', 'opt', 'pad',
-            'pck', 'pfx', 'pgm', 'pos', 'prc', 'prm', 'pth', 'pub',
-            'rcd', 'rdx', 'rec', 'ref', 'rnd', 'rno', 'sep', 'sgn',
-            'sin', 'sqr', 'srt', 'ssz', 'stk', 'stp', 'str', 'sub',
-            'swp', 'sys', 'tan', 'tbl', 'tcb', 'tmr', 'trx', 'tsk',
-            'txh', 'txw', 'ucp', 'ucs', 'upk', 'vin', 'vis', 'xeq',
-            'xfa', 'xor', '_obj'
-            ),
-        3 => array(
-            // System Variables
-            // Vars that are duplicates of functions
-            // 'ctl', 'err', 'pfx', 'prm', 'rnd', 'sep', 'sys',
-            'bkg', 'chn', 'day', 'dlm', 'dsz', 'eom', 'ers', 'esc',
-            'gfn', 'gid', 'hfn', 'hlp', 'hwd', 'lfa', 'lfo', 'lip',
-            'lpg', 'lwd', 'mse', 'msl', 'nar', 'nid', 'pgn', 'psz',
-            'quo', 'ret', 'sid', 'ssn', 'tim', 'tme', 'tms', 'tsm',
-            'uid', 'unt', 'who'
-
-            ),
-        4 => array(
-            // Nomads Variables
-            '%Flmaint_Lib$', '%Flmaint_Msg$', '%Nomads_Activation_Ok',
-            '%Nomads_Auto_Qry', '%Nomads_Disable_Debug',
-            '%Nomads_Disable_Trace', '%Nomads_Fkey_Handler$',
-            '%Nomads_Fkey_Tbl$', '%Nomads_Notest', '%Nomads_Onexit$',
-            '%Nomads_Post_Display', '%Nomads_Pre_Display$',
-            '%Nomads_Process$', '%Nomads_Trace_File$',
-            '%Nomad_Actv_Folder_Colors$', '%Nomad_Automation_Enabled',
-            '%Nomad_Auto_Close', '%Nomad_Center_Wdw', '%Nomad_Concurrent_Wdw',
-            '%Nomad_Custom_Define', '%Nomad_Custom_Dir$',
-            '%Nomad_Custom_Genmtc', '%Nomad_Custom_Skip_Definition',
-            '%Nomad_Def_Sfx$', '%Nomad_Enter_Tab', '%Nomad_Esc_Sel',
-            '%Nomad_Isjavx', '%Nomad_Iswindx', '%Nomad_Iswindx$',
-            '%Nomad_Menu$', '%Nomad_Menu_Leftedge_Clr$',
-            '%Nomad_Menu_Textbackground_Clr$', '%Nomad_Mln_Sep$',
-            '%Nomad_Msgmnt$', '%Nomad_Noplusw', '%Nomad_No_Customize',
-            '%Nomad_Object_Persistence', '%Nomad_Object_Resize',
-            '%Nomad_Open_Load', '%Nomad_Override_Font$',
-            '%Nomad_Palette_Loaded', '%Nomad_Panel_Info_Force',
-            '%Nomad_Panel_Info_Prog$', '%Nomad_Pnl_Def_Colour$',
-            '%Nomad_Pnl_Def_Font$', '%Nomad_Prg_Cache', '%Nomad_Qry_Attr$',
-            '%Nomad_Qry_Btn$', '%Nomad_Qry_Clear_Start', '%Nomad_Qry_Tip$',
-            '%Nomad_Qry_Wide', '%Nomad_Query_Clear_Status', '%Nomad_Query_Kno',
-            '%Nomad_Query_No_Gray', '%Nomad_Query_Odb_Ignore',
-            '%Nomad_Query_Retkno', '%Nomad_Query_Sbar_Max',
-            '%Nomad_Relative_Wdw', '%Nomad_Save_Qry_Path', '%Nomad_Script_Fn',
-            '%Nomad_Script_Log', '%Nomad_Script_Wdw',
-            '%Nomad_Skip_Change_Logic', '%Nomad_Skip_Onselect_Logic',
-            '%Nomad_Stk$', '%Nomad_Tab_Dir', '%Nomad_Timeout',
-            '%Nomad_Turbo_Off', '%Nomad_Visual_Effect',
-            '%Nomad_Visual_Override', '%Nomad_Win_Ver', '%Nomad_Xchar',
-            '%Nomad_Xmax', '%Nomad_Ychar', '%Nomad_Ymax', '%Scr_Def_Attr$',
-            '%Scr_Def_H_Fl$', '%Scr_Def_H_Id$', '%Scr_Lib', '%Scr_Lib$',
-            '%Z__Usr_Sec$', 'Alternate_Panel$', 'Alternate_Panel_Type$',
-            'Arg_1$', 'Arg_10$', 'Arg_11$', 'Arg_12$', 'Arg_13$', 'Arg_14$',
-            'Arg_15$', 'Arg_16$', 'Arg_17$', 'Arg_18$', 'Arg_19$', 'Arg_2$',
-            'Arg_20$', 'Arg_3$', 'Arg_4$', 'Arg_5$', 'Arg_6$', 'Arg_7$',
-            'Arg_8$', 'Arg_9$', 'Change_Flg', 'Cmd_Str$', 'Default_Prog$',
-            'Disp_Cmd$', 'Entire_Record$', 'Exit_Cmd$', 'Fldr_Default_Prog$',
-            'Folder_Id$', 'Id', 'Id$', 'Ignore_Exit', 'Initialize_Flg',
-            'Init_Text$', 'Init_Val$', 'Main_Scrn_K$', 'Mnu_Ln$',
-            'Next_Folder', 'Next_Id', 'Next_Id$', 'No_Flush', 'Prime_Key$',
-            'Prior_Val', 'Prior_Val$', 'Qry_Val$', 'Refresh_Flg',
-            'Replacement_Folder$', 'Replacement_Lib$', 'Replacement_Scrn$',
-            'Scrn_Id$', 'Scrn_K$', 'Scrn_Lib$', 'Tab_Table$', '_Eom$'
-            ),
-        5 => array(
-            // Mnemonics
-            "'!w'", "'*c'", "'*h'", "'*i'", "'*o'", "'*r'", "'*x'",
-            "'+b'", "'+d'", "'+e'", "'+f'", "'+i'", "'+n'",
-            "'+p'", "'+s'", "'+t'", "'+u'", "'+v'", "'+w'", "'+x'",
-            "'+z'", "'-b'", "'-d'", "'-e'", "'-f'", "'-i'",
-            "'-n'", "'-p'", "'-s'", "'-t'", "'-u'", "'-v'", "'-w'",
-            "'-x'", "'-z'", "'2d'", "'3d'", "'4d'", "'@@'", "'ab'",
-            "'arc'", "'at'", "'backgr'", "'bb'", "'be'", "'beep'",
-            "'bg'", "'bi'", "'bj'", "'bk'", "'black'", "'blue'",
-            "'bm'", "'bo'", "'box'", "'br'", "'bs'", "'bt'", "'bu'",
-            "'bw'", "'bx'", "'caption'", "'ce'", "'cf'", "'ch'",
-            "'ci'", "'circle'", "'cl'", "'colour'", "'cp'", "'cpi'",
-            "'cr'", "'cs'", "'cursor'", "'cyan''_cyan'", "'dc'",
-            "'default'", "'df'", "'dialogue'", "'dn'", "'do'",
-            "'drop'", "'eb'", "'ee'", "'ef'", "'eg'", "'ei'", "'ej'",
-            "'el'", "'em'", "'eo'", "'ep'", "'er'", "'es'", "'et'",
-            "'eu'", "'ew'", "'ff'", "'fill'", "'fl'", "'font'",
-            "'frame'", "'gd'", "'ge'", "'gf'", "'goto'", "'green'",
-            "'gs'", "'hide'", "'ic'", "'image'", "'jc'",
-            "'jd'", "'jl'", "'jn'", "'jr'", "'js'", "'l6'", "'l8'",
-            "'lc'", "'ld'", "'lf'", "'li'", "'line'", "'lm'",
-            "'lpi'", "'lt'", "'magenta'", "'maxsize'", "'me'",
-            "'message'", "'minsize'", "'mn'", "'mode'",
-            "'move'", "'mp'", "'ms'", "'ni'", "'offset'", "'option'",
-            "'pe'", "'pen'", "'picture'", "'pie'", "'pm'", "'polygon'",
-            "'pop'", "'ps'", "'push'", "'rb'", "'rc'", "'rectangle'",
-            "'red'", "'rl'", "'rm'", "'rp'", "'rs'", "'rt'", "'sb'",
-            "'scroll'", "'sd'", "'se'", "'sf'", "'show'", "'size'",
-            "'sl'", "'sn'", "'sp'", "'sr'", "'swap'", "'sx'", "'text'",
-            "'textwdw'", "'tr'", "'tw'", "'uc'", "'up'", "'vt'", "'wa'",
-            "'wc'", "'wd'", "'wg'", "'white'", "'window'", "'wm'",
-            "'wp'", "'wr'", "'wrap'", "'ws'", "'wx'", "'xp'", "'yellow'",
-            "'zx'", "'_black'", "'_blue'", "'_colour'", "'_green'",
-            "'_magenta'", "'_red'", "'_white'", "'_yellow'"
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array('+', '-', '*', '/', '^', '|'),
-        1 => array('++', '--', '+=', '-=', '*=', '/=', '^=', '|='),
-        2 => array('&lt;', '&gt;', '='),
-        3 => array('(', ')', '[', ']', '{', '}'),
-        4 => array(',', '@', ';', '\\')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: navy;', // Directives
-            2 => 'color: blue;', // System Functions
-            3 => 'color: blue;', // System Variables
-            4 => 'color: #6A5ACD; font-style: italic;', // Nomads Global Variables
-            5 => 'color: #BDB76B;', // Mnemonics
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080; font-style: italic;',
-            2 => 'color: #008080;',
-            'MULTI' => 'color: #008080; font-style: italic;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000066;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: green;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #00008B;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;',
-            1 => 'color: #000099;',
-            2 => 'color: #000099;',
-            3 => 'color: #0000C9;',
-            4 => 'color: #000099;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #006400; font-weight: bold',
-            2 => 'color: #6A5ACD;'
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.allbasic.info./wiki/index.php/PX:Directive_{FNAME}',
-        2 => 'http://www.allbasic.info./wiki/index.php/PX:System_function_{FNAME}',
-        3 => 'http://www.allbasic.info./wiki/index.php/PX:System_variable_{FNAME}',
-        4 => 'http://www.allbasic.info./wiki/index.php/PX:Nomads_{FNAME}',
-        5 => 'http://www.allbasic.info./wiki/index.php/PX:Mnemonic_{FNAMEU}'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => "'"
-        ),
-    'REGEXPS' => array(
-        1 => array(
-            // Line Labels
-            GESHI_SEARCH => '([[:space:]])([a-zA-Z_][a-zA-Z0-9_]+)(:)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        2 => array(
-            // Global String Variables
-            GESHI_SEARCH => '(\%)([a-zA-Z_][a-zA-Z0-9_]+)(\$)',
-            GESHI_REPLACE => '\\1\\2\\3',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER
-            )
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/purebasic.php b/inc/geshi/purebasic.php
deleted file mode 100644
index d78ffe97b..000000000
--- a/inc/geshi/purebasic.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/*************************************************************************************
- * purebasic.php
- * -------
- * Author: GuShH
- * Copyright: (c) 2009 Gustavo Julio Fiorenza
- * Release Version: 1.0.8.11
- * Date Started: 13/06/2009
- *
- * PureBasic language file for GeSHi.
- *
- * CHANGES
- * -------
- * 13/06/2009 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2009/06/13)
- * -------------------------
- * Add the remaining ASM mnemonics and the 4.3x functions/etc.
- * Better coloring (perhaps match the default scheme of PB?)
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'PureBasic',
-    'COMMENT_SINGLE' => array( 1 => ";"  ),
-    'COMMENT_MULTI' => array( ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            // Keywords
-            'And', 'As', 'Break', 'CallDebugger', 'Case', 'CompilerCase', 'CompilerDefault', 'CompilerElse', 'CompilerEndIf', 'CompilerEndSelect',
-            'CompilerError', 'CompilerIf', 'CompilerSelect', 'Continue', 'Data', 'DataSection', 'EndDataSection', 'Debug', 'DebugLevel', 'Declare',
-            'DeclareCDLL', 'DeclareDLL', 'Default', 'Define', 'Dim', 'DisableASM', 'DisableDebugger', 'DisableExplicit', 'Else', 'ElseIf', 'EnableASM',
-            'EnableDebugger', 'EnableExplicit', 'End', 'EndEnumeration', 'EndIf', 'EndImport', 'EndInterface', 'EndMacro', 'EndProcedure',
-            'EndSelect', 'EndStructure', 'EndStructureUnion', 'EndWith', 'Enumeration', 'Extends', 'FakeReturn', 'For', 'Next', 'ForEach',
-            'ForEver', 'Global', 'Gosub', 'Goto', 'If', 'Import', 'ImportC', 'IncludeBinary', 'IncludeFile', 'IncludePath', 'Interface', 'Macro',
-            'NewList', 'Not', 'Or', 'Procedure', 'ProcedureC', 'ProcedureCDLL', 'ProcedureDLL', 'ProcedureReturn', 'Protected', 'Prototype',
-            'PrototypeC', 'Read', 'ReDim', 'Repeat', 'Until', 'Restore', 'Return', 'Select', 'Shared', 'Static', 'Step', 'Structure', 'StructureUnion',
-            'Swap', 'To', 'Wend', 'While', 'With', 'XIncludeFile', 'XOr'
-            ),
-        2 => array(
-            // All Functions
-            'Abs', 'ACos', 'Add3DArchive', 'AddBillboard', 'AddDate', 'AddElement', 'AddGadgetColumn', 'AddGadgetItem',
-            'AddKeyboardShortcut', 'AddMaterialLayer', 'AddPackFile', 'AddPackMemory', 'AddStatusBarField', 'AddSysTrayIcon',
-            'AllocateMemory', 'AmbientColor', 'AnimateEntity', 'Asc', 'ASin', 'ATan', 'AudioCDLength', 'AudioCDName', 'AudioCDStatus',
-            'AudioCDTrackLength', 'AudioCDTracks', 'AudioCDTrackSeconds', 'AvailableProgramOutput', 'AvailableScreenMemory',
-            'BackColor', 'Base64Decoder', 'Base64Encoder', 'BillboardGroupLocate', 'BillboardGroupMaterial', 'BillboardGroupX',
-            'BillboardGroupY', 'BillboardGroupZ', 'BillboardHeight', 'BillboardLocate', 'BillboardWidth', 'BillboardX', 'BillboardY', 'BillboardZ',
-            'Bin', 'BinQ', 'Blue', 'Box', 'ButtonGadget', 'ButtonImageGadget', 'CalendarGadget', 'CallCFunction', 'CallCFunctionFast',
-            'CallFunction', 'CallFunctionFast', 'CameraBackColor', 'CameraFOV', 'CameraLocate', 'CameraLookAt', 'CameraProjection',
-            'CameraRange', 'CameraRenderMode', 'CameraX', 'CameraY', 'CameraZ', 'CatchImage', 'CatchSound', 'CatchSprite',
-            'CatchXML', 'ChangeAlphaIntensity', 'ChangeCurrentElement', 'ChangeGamma', 'ChangeListIconGadgetDisplay',
-            'ChangeSysTrayIcon', 'CheckBoxGadget', 'CheckEntityCollision', 'CheckFilename', 'ChildXMLNode', 'Chr', 'Circle',
-            'ClearBillboards', 'ClearClipboard', 'ClearConsole', 'ClearError', 'ClearGadgetItemList', 'ClearList', 'ClearScreen', 'ClipSprite',
-            'CloseConsole', 'CloseDatabase', 'CloseFile', 'CloseGadgetList', 'CloseHelp', 'CloseLibrary', 'CloseNetworkConnection',
-            'CloseNetworkServer', 'ClosePack', 'ClosePreferences', 'CloseProgram', 'CloseScreen', 'CloseSubMenu', 'CloseWindow',
-            'ColorRequester', 'ComboBoxGadget', 'CompareMemory', 'CompareMemoryString', 'ConnectionID', 'ConsoleColor',
-            'ConsoleCursor', 'ConsoleError', 'ConsoleLocate', 'ConsoleTitle', 'ContainerGadget', 'CopyDirectory', 'CopyEntity',
-            'CopyFile', 'CopyImage', 'CopyLight', 'CopyMaterial', 'CopyMemory', 'CopyMemoryString', 'CopyMesh', 'CopySprite',
-            'CopyTexture', 'CopyXMLNode', 'Cos', 'CountBillboards', 'CountGadgetItems', 'CountLibraryFunctions', 'CountList',
-            'CountMaterialLayers', 'CountProgramParameters', 'CountRenderedTriangles', 'CountString', 'CRC32Fingerprint',
-            'CreateBillboardGroup', 'CreateCamera', 'CreateDirectory', 'CreateEntity', 'CreateFile', 'CreateGadgetList',
-            'CreateImage', 'CreateLight', 'CreateMaterial', 'CreateMenu', 'CreateMesh', 'CreateMutex', 'CreateNetworkServer',
-            'CreatePack', 'CreatePalette', 'CreateParticleEmitter', 'CreatePopupMenu', 'CreatePreferences', 'CreateSprite',
-            'CreateSprite3D', 'CreateStatusBar', 'CreateTerrain', 'CreateTexture', 'CreateThread', 'CreateToolBar', 'CreateXML',
-            'CreateXMLNode', 'DatabaseColumnName', 'DatabaseColumns', 'DatabaseColumnType', 'DatabaseDriverDescription',
-            'DatabaseDriverName', 'DatabaseError', 'DatabaseQuery', 'DatabaseUpdate', 'Date', 'DateGadget', 'Day', 'DayOfWeek',
-            'DayOfYear', 'DefaultPrinter', 'Defined', 'Delay', 'DeleteDirectory', 'DeleteElement', 'DeleteFile', 'DeleteXMLNode',
-            'DESFingerprint', 'DesktopDepth', 'DesktopFrequency', 'DesktopHeight', 'DesktopMouseX', 'DesktopMouseY', 'DesktopName',
-            'DesktopWidth', 'DirectoryEntryAttributes', 'DirectoryEntryDate', 'DirectoryEntryName', 'DirectoryEntrySize',
-            'DirectoryEntryType', 'DisableGadget', 'DisableMaterialLighting', 'DisableMenuItem', 'DisableToolBarButton', 'DisableWindow',
-            'DisASMCommand', 'DisplayAlphaSprite', 'DisplayPalette', 'DisplayPopupMenu', 'DisplayRGBFilter', 'DisplayShadowSprite',
-            'DisplaySolidSprite', 'DisplaySprite', 'DisplaySprite3D', 'DisplayTranslucentSprite', 'DisplayTransparentSprite', 'DragFiles',
-            'DragImage', 'DragOSFormats', 'DragPrivate', 'DragText', 'DrawAlphaImage', 'DrawImage', 'DrawingBuffer',
-            'DrawingBufferPitch', 'DrawingBufferPixelFormat', 'DrawingFont', 'DrawingMode', 'DrawText', 'EditorGadget',
-            'egrid_AddColumn', 'egrid_AddRows', 'egrid_AppendCells', 'egrid_ClearRows', 'egrid_CopyCells',
-            'egrid_CreateCellCallback', 'egrid_CreateGrid', 'egrid_DeleteCells', 'egrid_FastDeleteCells', 'egrid_FreeGrid',
-            'egrid_GetCellSelection', 'egrid_GetCellText', 'egrid_GetColumnOrderArray', 'egrid_HasSelectedCellChanged', 'egrid_Height',
-            'egrid_HideEdit', 'egrid_HideGrid', 'egrid_MakeCellVisible', 'egrid_NumberOfColumns', 'egrid_NumberOfRows',
-            'egrid_PasteCells', 'egrid_Register', 'egrid_RemoveCellCallback', 'egrid_RemoveColumn', 'egrid_RemoveRow', 'egrid_Resize',
-            'egrid_SelectCell', 'egrid_SelectedColumn', 'egrid_SelectedRow', 'egrid_SetCellSelection', 'egrid_SetCellText',
-            'egrid_SetColumnOrderArray', 'egrid_SetHeaderFont', 'egrid_SetHeaderHeight', 'egrid_SetOption', 'egrid_Width', 'egrid_x',
-            'egrid_y', 'EjectAudioCD', 'ElapsedMilliseconds', 'Ellipse', 'EnableGadgetDrop', 'EnableGraphicalConsole',
-            'EnableWindowDrop', 'EnableWorldCollisions', 'EnableWorldPhysics', 'Engine3DFrameRate', 'EntityAngleX',
-            'EntityAnimationLength', 'EntityLocate', 'EntityMaterial', 'EntityMesh', 'EntityPhysicBody', 'EntityRenderMode',
-            'EntityX', 'EntityY', 'EntityZ', 'EnvironmentVariableName', 'EnvironmentVariableValue', 'Eof', 'EventClient',
-            'EventDropAction', 'EventDropBuffer', 'EventDropFiles', 'EventDropImage', 'EventDropPrivate', 'EventDropSize',
-            'EventDropText', 'EventDropType', 'EventDropX', 'EventDropY', 'EventGadget', 'EventlParam', 'EventMenu', 'EventServer',
-            'EventType', 'EventWindow', 'EventwParam', 'ExamineDatabaseDrivers', 'ExamineDesktops', 'ExamineDirectory',
-            'ExamineEnvironmentVariables', 'ExamineIPAddresses', 'ExamineJoystick', 'ExamineKeyboard', 'ExamineLibraryFunctions',
-            'ExamineMouse', 'ExaminePreferenceGroups', 'ExaminePreferenceKeys', 'ExamineScreenModes', 'ExamineWorldCollisions',
-            'ExamineXMLAttributes', 'ExplorerComboGadget', 'ExplorerListGadget', 'ExplorerTreeGadget', 'ExportXML',
-            'ExportXMLSize', 'FileBuffersSize', 'FileID', 'FileSeek', 'FileSize', 'FillArea', 'FindString', 'FinishDirectory',
-            'FirstDatabaseRow', 'FirstElement', 'FirstWorldCollisionEntity', 'FlipBuffers', 'FlushFileBuffers', 'Fog', 'FontID',
-            'FontRequester', 'FormatDate', 'FormatXML', 'Frame3DGadget', 'FreeBillboardGroup', 'FreeCamera', 'FreeEntity',
-            'FreeFont', 'FreeGadget', 'FreeImage', 'FreeLight', 'FreeMaterial', 'FreeMemory', 'FreeMenu', 'FreeMesh',
-            'FreeModule', 'FreeMovie', 'FreeMutex', 'FreePalette', 'FreeParticleEmitter', 'FreeSound', 'FreeSprite',
-            'FreeSprite3D', 'FreeStatusBar', 'FreeTexture', 'FreeToolBar', 'FreeXML', 'FrontColor', 'GadgetHeight', 'GadgetID',
-            'GadgetItemID', 'GadgetToolTip', 'GadgetType', 'GadgetWidth', 'GadgetX', 'GadgetY', 'GetActiveGadget',
-            'GetActiveWindow', 'GetClientIP', 'GetClientPort', 'GetClipboardImage', 'GetClipboardText', 'GetCurrentDirectory',
-            'GetCurrentEIP', 'GetDatabaseDouble', 'GetDatabaseFloat', 'GetDatabaseLong', 'GetDatabaseQuad', 'GetDatabaseString',
-            'GetDisASMString', 'GetEntityAnimationTime', 'GetEntityFriction', 'GetEntityMass', 'GetEnvironmentVariable',
-            'GetErrorAddress', 'GetErrorCounter', 'GetErrorDescription', 'GetErrorDLL', 'GetErrorLineNR', 'GetErrorModuleName',
-            'GetErrorNumber', 'GetErrorRegister', 'GetExtensionPart', 'GetFileAttributes', 'GetFileDate', 'GetFilePart', 'GetFunction',
-            'GetFunctionEntry', 'GetGadgetAttribute', 'GetGadgetColor', 'GetGadgetData', 'GetGadgetFont',
-            'GetGadgetItemAttribute', 'GetGadgetItemColor', 'GetGadgetItemData', 'GetGadgetItemState', 'GetGadgetItemText',
-            'GetGadgetState', 'GetGadgetText', 'GetHomeDirectory', 'GetMenuItemState', 'GetMenuItemText', 'GetMenuTitleText',
-            'GetModulePosition', 'GetModuleRow', 'GetPaletteColor', 'GetPathPart', 'GetTemporaryDirectory',
-            'GetToolBarButtonState', 'GetWindowColor', 'GetWindowState', 'GetWindowTitle', 'GetXMLAttribute', 'GetXMLEncoding',
-            'GetXMLNodeName', 'GetXMLNodeOffset', 'GetXMLNodeText', 'GetXMLStandalone', 'GoToEIP', 'GrabImage', 'GrabSprite',
-            'Green', 'Hex', 'HexQ', 'HideBillboardGroup', 'HideEntity', 'HideGadget', 'HideLight', 'HideMenu', 'HideParticleEmitter',
-            'HideWindow', 'Hostname', 'Hour', 'HyperLinkGadget', 'ImageDepth', 'ImageGadget', 'ImageHeight', 'ImageID',
-            'ImageOutput', 'ImageWidth', 'InitAudioCD', 'InitEngine3D', 'InitJoystick', 'InitKeyboard', 'InitMouse', 'InitMovie',
-            'InitNetwork', 'InitPalette', 'InitScintilla', 'InitSound', 'InitSprite', 'InitSprite3D', 'Inkey', 'Input', 'InputRequester',
-            'InsertElement', 'Int', 'IntQ', 'IPAddressField', 'IPAddressGadget', 'IPString', 'IsBillboardGroup', 'IsCamera', 'IsDatabase',
-            'IsDirectory', 'IsEntity', 'IsFile', 'IsFont', 'IsGadget', 'IsImage', 'IsLibrary', 'IsLight', 'IsMaterial', 'IsMenu', 'IsMesh',
-            'IsModule', 'IsMovie', 'IsPalette', 'IsParticleEmitter', 'IsProgram', 'IsScreenActive', 'IsSound', 'IsSprite', 'IsSprite3D',
-            'IsStatusBar', 'IsSysTrayIcon', 'IsTexture', 'IsThread', 'IsToolBar', 'IsWindow', 'IsXML', 'JoystickAxisX', 'JoystickAxisY',
-            'JoystickButton', 'KeyboardInkey', 'KeyboardMode', 'KeyboardPushed', 'KeyboardReleased', 'KillProgram', 'KillThread',
-            'LastElement', 'LCase', 'Left', 'Len', 'LibraryFunctionAddress', 'LibraryFunctionName', 'LibraryID', 'LightColor',
-            'LightLocate', 'LightSpecularColor', 'Line', 'LineXY', 'ListIconGadget', 'ListIndex', 'ListViewGadget', 'LoadFont',
-            'LoadImage', 'LoadMesh', 'LoadModule', 'LoadMovie', 'LoadPalette', 'LoadSound', 'LoadSprite', 'LoadTexture',
-            'LoadWorld', 'LoadXML', 'Loc', 'LockMutex', 'Lof', 'Log', 'Log10', 'LSet', 'LTrim', 'MainXMLNode', 'MakeIPAddress',
-            'MaterialAmbientColor', 'MaterialBlendingMode', 'MaterialDiffuseColor', 'MaterialFilteringMode', 'MaterialID',
-            'MaterialShadingMode', 'MaterialSpecularColor', 'MD5FileFingerprint', 'MD5Fingerprint', 'MDIGadget', 'MemorySize',
-            'MemoryStringLength', 'MenuBar', 'MenuHeight', 'MenuID', 'MenuItem', 'MenuTitle', 'MeshID', 'MessageRequester',
-            'Mid', 'Minute', 'ModuleVolume', 'Month', 'MouseButton', 'MouseDeltaX', 'MouseDeltaY', 'MouseLocate', 'MouseWheel',
-            'MouseX', 'MouseY', 'MoveBillboard', 'MoveBillboardGroup', 'MoveCamera', 'MoveEntity', 'MoveLight', 'MoveMemory',
-            'MoveParticleEmitter', 'MoveXMLNode', 'MovieAudio', 'MovieHeight', 'MovieInfo', 'MovieLength', 'MovieSeek',
-            'MovieStatus', 'MovieWidth', 'NetworkClientEvent', 'NetworkServerEvent', 'NewPrinterPage', 'NextDatabaseDriver',
-            'NextDatabaseRow', 'NextDirectoryEntry', 'NextElement', 'NextEnvironmentVariable', 'NextIPAddress',
-            'NextLibraryFunction', 'NextPackFile', 'NextPreferenceGroup', 'NextPreferenceKey', 'NextScreenMode',
-            'NextSelectedFileName', 'NextWorldCollision', 'NextXMLAttribute', 'NextXMLNode', 'OffsetOf', 'OnErrorExit',
-            'OnErrorGosub', 'OnErrorGoto', 'OnErrorResume', 'OpenComPort', 'OpenConsole', 'OpenDatabase',
-            'OpenDatabaseRequester', 'OpenFile', 'OpenFileRequester', 'OpenGadgetList', 'OpenHelp', 'OpenLibrary',
-            'OpenNetworkConnection', 'OpenPack', 'OpenPreferences', 'OpenScreen', 'OpenSubMenu', 'OpenWindow',
-            'OpenWindowedScreen', 'OptionGadget', 'OSVersion', 'PackerCallback', 'PackFileSize', 'PackMemory', 'PanelGadget',
-            'ParentXMLNode', 'Parse3DScripts', 'ParseDate', 'ParticleColorFader', 'ParticleColorRange', 'ParticleEmissionRate',
-            'ParticleEmitterDirection', 'ParticleEmitterLocate', 'ParticleEmitterX', 'ParticleEmitterY', 'ParticleEmitterZ',
-            'ParticleMaterial', 'ParticleSize', 'ParticleTimeToLive', 'ParticleVelocity', 'PathRequester', 'PauseAudioCD',
-            'PauseMovie', 'PauseThread', 'PeekB', 'PeekC', 'PeekD', 'PeekF', 'PeekL', 'PeekQ', 'PeekS', 'PeekW', 'PlayAudioCD',
-            'PlayModule', 'PlayMovie', 'PlaySound', 'Plot', 'Point', 'PokeB', 'PokeC', 'PokeD', 'PokeF', 'PokeL', 'PokeQ', 'PokeS',
-            'PokeW', 'Pow', 'PreferenceComment', 'PreferenceGroup', 'PreferenceGroupName', 'PreferenceKeyName',
-            'PreferenceKeyValue', 'PreviousDatabaseRow', 'PreviousElement', 'PreviousXMLNode', 'Print', 'PrinterOutput',
-            'PrinterPageHeight', 'PrinterPageWidth', 'PrintN', 'PrintRequester', 'ProgramExitCode', 'ProgramFilename',
-            'ProgramID', 'ProgramParameter', 'ProgramRunning', 'ProgressBarGadget', 'Random', 'RandomSeed', 'RawKey',
-            'ReadByte', 'ReadCharacter', 'ReadConsoleData', 'ReadData', 'ReadDouble', 'ReadFile', 'ReadFloat', 'ReadLong',
-            'ReadPreferenceDouble', 'ReadPreferenceFloat', 'ReadPreferenceLong', 'ReadPreferenceQuad',
-            'ReadPreferenceString', 'ReadProgramData', 'ReadProgramError', 'ReadProgramString', 'ReadQuad', 'ReadString',
-            'ReadStringFormat', 'ReadWord', 'ReAllocateMemory', 'ReceiveNetworkData', 'ReceiveNetworkFile', 'Red',
-            'Reg_DeleteEmptyKey', 'Reg_DeleteKey', 'Reg_DeleteValue', 'Reg_GetErrorMsg', 'Reg_GetErrorNr',
-            'Reg_GetValueTyp', 'Reg_ListSubKey', 'Reg_ListSubValue', 'Reg_ReadBinary', 'Reg_ReadExpandString',
-            'Reg_ReadLong', 'Reg_ReadMultiLineString', 'Reg_ReadQuad', 'Reg_ReadString', 'Reg_WriteBinary',
-            'Reg_WriteExpandString', 'Reg_WriteLong', 'Reg_WriteMultiLineString', 'Reg_WriteQuad', 'Reg_WriteString',
-            'ReleaseMouse', 'RemoveBillboard', 'RemoveEnvironmentVariable', 'RemoveGadgetColumn', 'RemoveGadgetItem',
-            'RemoveKeyboardShortcut', 'RemoveMaterialLayer', 'RemovePreferenceGroup', 'RemovePreferenceKey',
-            'RemoveString', 'RemoveSysTrayIcon', 'RemoveXMLAttribute', 'RenameFile', 'RenderMovieFrame', 'RenderWorld',
-            'ReplaceString', 'ResetList', 'ResizeBillboard', 'ResizeEntity', 'ResizeGadget', 'ResizeImage', 'ResizeMovie',
-            'ResizeParticleEmitter', 'ResizeWindow', 'ResolveXMLAttributeName', 'ResolveXMLNodeName', 'ResumeAudioCD',
-            'ResumeMovie', 'ResumeThread', 'RGB', 'Right', 'RootXMLNode', 'RotateBillboardGroup', 'RotateCamera',
-            'RotateEntity', 'RotateMaterial', 'RotateSprite3D', 'Round', 'RSet', 'RTrim', 'RunProgram', 'SaveFileRequester',
-            'SaveImage', 'SaveSprite', 'SaveXML', 'ScaleEntity', 'ScaleMaterial', 'ScintillaGadget', 'ScintillaSendMessage',
-            'ScreenID', 'ScreenModeDepth', 'ScreenModeHeight', 'ScreenModeRefreshRate', 'ScreenModeWidth',
-            'ScreenOutput', 'ScrollAreaGadget', 'ScrollBarGadget', 'ScrollMaterial', 'Second', 'SecondWorldCollisionEntity',
-            'SelectedFilePattern', 'SelectedFontColor', 'SelectedFontName', 'SelectedFontSize', 'SelectedFontStyle',
-            'SelectElement', 'SendNetworkData', 'SendNetworkFile', 'SendNetworkString', 'SetActiveGadget',
-            'SetActiveWindow', 'SetClipboardImage', 'SetClipboardText', 'SetCurrentDirectory', 'SetDragCallback',
-            'SetDropCallback', 'SetEntityAnimationTime', 'SetEntityFriction', 'SetEntityMass', 'SetEnvironmentVariable',
-            'SetErrorNumber', 'SetFileAttributes', 'SetFileDate', 'SetFrameRate', 'SetGadgetAttribute', 'SetGadgetColor',
-            'SetGadgetData', 'SetGadgetFont', 'SetGadgetItemAttribute', 'SetGadgetItemColor', 'SetGadgetItemData',
-            'SetGadgetItemState', 'SetGadgetItemText', 'SetGadgetState', 'SetGadgetText', 'SetMenuItemState',
-            'SetMenuItemText', 'SetMenuTitleText', 'SetMeshData', 'SetModulePosition', 'SetPaletteColor', 'SetRefreshRate',
-            'SetToolBarButtonState', 'SetWindowCallback', 'SetWindowColor', 'SetWindowState', 'SetWindowTitle',
-            'SetXMLAttribute', 'SetXMLEncoding', 'SetXMLNodeName', 'SetXMLNodeOffset', 'SetXMLNodeText',
-            'SetXMLStandalone', 'Sin', 'SizeOf', 'SkyBox', 'SkyDome', 'SmartWindowRefresh', 'SortArray', 'SortList',
-            'SortStructuredArray', 'SortStructuredList', 'SoundFrequency', 'SoundPan', 'SoundVolume', 'Space',
-            'SpinGadget', 'SplitterGadget', 'Sprite3DBlendingMode', 'Sprite3DQuality', 'SpriteCollision', 'SpriteDepth',
-            'SpriteHeight', 'SpriteID', 'SpriteOutput', 'SpritePixelCollision', 'SpriteWidth', 'Sqr', 'Start3D', 'StartDrawing',
-            'StartPrinting', 'StartSpecialFX', 'StatusBarHeight', 'StatusBarIcon', 'StatusBarID', 'StatusBarText',
-            'StickyWindow', 'Stop3D', 'StopAudioCD', 'StopDrawing', 'StopModule', 'StopMovie', 'StopPrinting',
-            'StopSound', 'StopSpecialFX', 'Str', 'StrD', 'StrF', 'StringByteLength', 'StringField', 'StringGadget', 'StrQ',
-            'StrU', 'Subsystem', 'SwapElements', 'SysTrayIconToolTip', 'Tan', 'TerrainHeight', 'TextGadget', 'TextHeight',
-            'TextureHeight', 'TextureID', 'TextureOutput', 'TextureWidth', 'TextWidth', 'ThreadID', 'ThreadPriority',
-            'ToolBarHeight', 'ToolBarID', 'ToolBarImageButton', 'ToolBarSeparator', 'ToolBarStandardButton',
-            'ToolBarToolTip', 'TrackBarGadget', 'TransformSprite3D', 'TransparentSpriteColor', 'TreeGadget', 'Trim',
-            'TruncateFile', 'TryLockMutex', 'UCase', 'UnlockMutex', 'UnpackMemory', 'UseAudioCD', 'UseBuffer',
-            'UseGadgetList', 'UseJPEGImageDecoder', 'UseJPEGImageEncoder', 'UseODBCDatabase', 'UseOGGSoundDecoder',
-            'UsePNGImageDecoder', 'UsePNGImageEncoder', 'UseTGAImageDecoder', 'UseTIFFImageDecoder', 'Val', 'ValD',
-            'ValF', 'ValQ', 'WaitProgram', 'WaitThread', 'WaitWindowEvent', 'WebGadget', 'WebGadgetPath', 'WindowEvent',
-            'WindowHeight', 'WindowID', 'WindowMouseX', 'WindowMouseY', 'WindowOutput', 'WindowWidth', 'WindowX',
-            'WindowY', 'WorldGravity', 'WorldShadows', 'WriteByte', 'WriteCharacter', 'WriteConsoleData', 'WriteData',
-            'WriteDouble', 'WriteFloat', 'WriteLong', 'WritePreferenceDouble', 'WritePreferenceFloat', 'WritePreferenceLong',
-            'WritePreferenceQuad', 'WritePreferenceString', 'WriteProgramData', 'WriteProgramString', 'WriteProgramStringN',
-            'WriteQuad', 'WriteString', 'WriteStringFormat', 'WriteStringN', 'WriteWord', 'XMLAttributeName', 'XMLAttributeValue',
-            'XMLChildCount', 'XMLError', 'XMLErrorLine', 'XMLErrorPosition', 'XMLNodeFromID', 'XMLNodeFromPath', 'XMLNodePath',
-            'XMLNodeType', 'XMLStatus', 'Year', 'ZoomSprite3D'
-            ),
-        3 => array(
-            // some ASM instructions
-            'AAA', 'AAD', 'AAM', 'AAS', 'ADC', 'ADD', 'AND', 'ARPL', 'BOUND', 'BSF', 'BSR', 'BSWAP', 'BT', 'BTC', 'BTR',
-            'BTS', 'CALL', 'CBW', 'CDQ', 'CLC', 'CLD', 'CLI', 'CLTS', 'CMC', 'CMP', 'CMPS', 'CMPXCHG', 'CWD', 'CWDE',
-            'DAA', 'DAS', 'DB', 'DD', 'DEC', 'DIV', 'DW', 'ENTER', 'ESC', 'F2XM1', 'FABS', 'FADD', 'FCHS', 'FCLEX',
-            'FCOM', 'FDIV', 'FDIVR', 'FFREE', 'FINCSTP', 'FINIT', 'FLD', 'FLD1', 'FLDCW', 'FMUL', 'FNOP', 'FPATAN',
-            'FPREM', 'FRNDINT', 'FSAVE', 'FSCALE', 'FSETPM', 'FSIN', 'FSQRT', 'FST', 'FSTENV', 'FSTSW', 'FSUB',
-            'FSUBR', 'FTST', 'FUCOM', 'FWAIT', 'FXAM', 'FXCH', 'FXTRACT', 'FYL2X', 'FYL2XP1', 'HLT', 'IDIV', 'IMUL',
-            'IN', 'INC', 'INS', 'INT', 'INTO', 'INVLPG', 'IRET', 'IRETD', 'JA', 'JAE', 'JB', 'JBE', 'JC', 'JCXZ', 'JE', 'JECXZ',
-            'JG', 'JGE', 'JL', 'JLE', 'JMP', 'JNA', 'JNAE', 'JNB', 'JNBE', 'JNC', 'JNE', 'JNG', 'JNGE', 'JNL', 'JNLE', 'JNO', 'JNP',
-            'JNS', 'JNZ', 'JO', 'JP', 'JPE', 'JPO', 'JS', 'JZ', 'LAHF', 'LAR', 'LDS', 'LEA', 'LEAVE', 'LES', 'LFS', 'LGDT', 'LGS',
-            'LIDT', 'LLDT', 'LMSW', 'LOCK', 'LODS', 'LOOP', 'LOOPE', 'LOOPNE', 'LOOPNZ', 'LOOPZ', 'LSL', 'LSS', 'LTR',
-            'MOV', 'MOVS', 'MOVSX', 'MOVZX', 'MUL', 'NEG', 'NOP', 'NOT', 'OR', 'OUT', 'OUTS', 'POP', 'POPA', 'POPAD',
-            'POPF', 'POPFD', 'PUSH', 'PUSHA', 'PUSHAD', 'PUSHF', 'PUSHFD', 'RCL', 'RCR', 'REP', 'REPE', 'REPNE',
-            'REPNZ', 'REPZ', 'RET', 'RETF', 'ROL', 'ROR', 'SAHF', 'SAL', 'SAR', 'SBB', 'SCAS', 'SETAE', 'SETB', 'SETBE',
-            'SETC', 'SETE', 'SETG', 'SETGE', 'SETL', 'SETLE', 'SETNA', 'SETNAE', 'SETNB', 'SETNC', 'SETNE', 'SETNG',
-            'SETNGE', 'SETNL', 'SETNLE', 'SETNO', 'SETNP', 'SETNS', 'SETNZ', 'SETO', 'SETP', 'SETPE', 'SETPO',
-            'SETS', 'SETZ', 'SGDT', 'SHL', 'SHLD', 'SHR', 'SHRD', 'SIDT', 'SLDT', 'SMSW', 'STC', 'STD', 'STI',
-            'STOS', 'STR', 'SUB', 'TEST', 'VERR', 'VERW', 'WAIT', 'WBINVD', 'XCHG', 'XLAT', 'XLATB', 'XOR'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '+', '-', '*', '/', '\\', '>', '<', '=', '<=', '>=', '&', '|', '!', '~', '<>', '>>', '<<', '%'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000066; font-weight: bold;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #000fff;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #ff0000; font-style: italic;',
-            'MULTI' => 'color: #ff0000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000066;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #009900;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #CC0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '\\'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => false,
-        1 => false
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/pycon.php b/inc/geshi/pycon.php
deleted file mode 100644
index ac2b34d07..000000000
--- a/inc/geshi/pycon.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*************************************************************************************
- * python.php
- * ----------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * Python language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/12/18
- *  -  Added missing functions and keywords. Also added two new Python 3.0 types. SF#2441839
- * 2005/05/26
- *  -  Modifications by Tim (tim@skreak.com): added more keyword categories, tweaked colors
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/08/30 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-//This
-require(dirname(__FILE__).'/python.php');
-
-$language_data['LANG_NAME'] = 'Python (console mode)';
-
-$language_data['STRICT_MODE_APPLIES'] = GESHI_ALWAYS;
-$language_data['SCRIPT_DELIMITERS'][-1] = '/^(>>>).*?$(?:\n\.\.\..*?$)*($)/m';
-$language_data['HIGHLIGHT_STRICT_BLOCK'][-1] = true;
-
-$language_data['STYLES']['SCRIPT'][-1] = 'color: #222222;';
-
-if(!isset($language_data['COMMENT_REGEXP'])) {
-    $language_data['COMMENT_REGEXP'] = array();
-}
-
-$language_data['COMMENT_REGEXP'][-1] = '/(?:^|\A\s)(?:>>>|\.\.\.)/m';
-$language_data['STYLES']['COMMENTS'][-1] = 'color: #444444;';
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/pys60.php b/inc/geshi/pys60.php
deleted file mode 100644
index 59c67fac7..000000000
--- a/inc/geshi/pys60.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/**************************************************************************************
- * pys60.php
- * ----------
- * Author: Sohan Basak (ronnie.basak96 @gmail.com)
- * Copyright: (c) 2012 Sohan Basak (http://tothepower.tk),  Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2012/05/03
- *
- * Python for S60 language file for GeSHi.
- *
- * CHANGES
- * -------
- * No Changes Till Date
- *
- * The python.php file is extended to pys60.php with required modifications
- *
- * NOTES
- *
- * -I have kept the ":" in Reserved chars, so that it gets highlighted differently than brackets and/or symbols
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Python for S60',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'", '"""',"'''",'""','""'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-
-        /*
-         ** Set 1: reserved words
-         ** http://python.org/doc/current/ref/keywords.html
-         */
-        1 => array(
-            'and', 'del', 'for', 'is', 'raise', 'assert', 'elif', 'from', 'lambda', 'return', 'break',
-            'else', 'global', 'not', 'try', 'class', 'except', 'if', 'or', 'while', 'continue', 'exec',
-            'import', 'pass', 'yield', 'def', 'finally', 'in', 'print', "<<", ">>", "as"
-            ),
-
-        /*
-         ** Set 2: builtins
-         ** http://python.org/doc/current/lib/built-in-funcs.html
-         */
-        2 => array(
-            '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
-            'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
-            'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
-            'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
-            'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
-            'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
-            'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
-            'vars', 'xrange', 'zip',
-            // Built-in constants: http://python.org/doc/current/lib/node35.html
-            'False', 'True', 'None', 'NotImplemented', 'Ellipsis',
-            // Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
-            'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
-            'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
-            'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
-            'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
-            'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
-            'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
-            'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
-            'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
-            'RuntimeWarning', 'FutureWarning',
-            //Symbian Errors
-            "SymbianError", "KernelError",
-            // self: this is a common python convention (but not a reserved word)
-            'self'
-            ),
-
-        /*
-         ** Set 3: standard library
-         ** http://python.org/doc/current/lib/modindex.html
-         */
-        3 => array(
-            '__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
-            'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
-            'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
-            'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
-            'collections', 'colorsys', 'commands', 'compileall', 'compiler',
-            'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
-            'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
-            'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
-            'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
-            'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
-            'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
-            'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
-            'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
-            'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
-            'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
-            'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
-            'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
-            'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
-            'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
-            're', 'readline', 'resource', 'rexec', 'rgbimg', 'rlcompleter',
-            'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
-            'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
-            'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
-            'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
-            'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
-            'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
-            'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
-            'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
-            'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
-            'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib', "os.path", "sys.path",
-
-            //PythonS60 Standard Library
-            //http://pys60.garage.maemo.org/doc/s60/
-            //These are the standard modules in the archive
-
-            "appuifw", "globalui","e32", "telephone", "aosocket", "btsocket",
-            "sysinfo","camera","graphics","keycapture","key_codes","topwindow", "gles",
-            "glcanvas","sensor", "audio","messaging", "inbox","location","positioning",
-            "contacts", "e32calendar", "e32db","e32dbm","logs","scriptext",
-            "series60_console",
-
-            //These are external but very often usable modules
-
-            "appuifw2","ArchetypeUI","elementtree","lightblue",
-            "activaprofile","Adjustor","akntextutils","aosocketnativenew",
-            "appreciation","applicationmanager","appswitch","atextit","bt_teror","btconsole",
-            "btswitch","cElementTree","cenrep","cerealizer","cl_gui","clipboard",
-            "clipboard_CHN","debugger","decompile2",
-            "dir_iter","download","easydb","ECenrep","Edit_find","efeature","elocation","envy",
-            "EProfile","erestart","error","esyagent","Execwap","exprofile","fastcamera",
-            "feature","fgimage","filebrowser","firmware","fold","fonts","fraction","FTP",
-            "ftplibnew","fy_manager","fy_menu","gles_utils","gps_location","hack",
-            "HTML2TXT","iapconnect","icon_image","image_decoder",
-            "ini","interactive_console","inting","key_modifiers","key_tricks","keypress",
-            "landmarks","lite_fm","locationacq","locationrequestor",
-            "logo","markupbase","mbm","mbm2","minidb","miniinfo","MISC",
-            "misty","Msg","ntpath","odict","Paintbox","pathinfo","pexif","pickcolor",
-            "powlite_fm","powlite_fm2","powlite_fm3","powlite_fme","prgbar","prodb",
-            "profileengine","progressbar","progressbartw","progressnotes",
-            "ProgressBarTW2","proshivka","py_upload","pyConnection","PyFileMan",
-            "pykeylock","PyPyc","pyqq","pys60crypto","pys60usb","rfc822",
-            "RUSOS","scmk","scrollpage","SISFIELDS","SISFIELD","sisfile",
-            "SISINFO","sisreader","Sistools","smidi","smsreject","speechy","sre_compile",
-            "sre_constants","sre_parse","sre","sysagent","syslang","TextMan",
-            "textrenderer","TextWrap","topwind","tsocket","uikludge","uikludges","uitricks",
-            "walkfile","wallpaper","wfm_lite",
-            "wif_keys","wif","window","wlanmgmt","wlantools","wt_color","wt_requesters",
-            "zhkey",
-
-            //These are recent additions
-            "miffile"
-            ),
-
-        /*
-         ** Set 4: special methods
-         ** http://python.org/doc/current/ref/specialnames.html
-         */
-        4 => array(
-            ///*
-            //// Iterator types: http://python.org/doc/current/lib/typeiter.html
-            //'__iter__', 'next',
-            //// String types: http://python.org/doc/current/lib/string-methods.html
-            //'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
-            //'find', 'index', 'isalnum', 'isalpha', 'isdigit', 'islower', 'isspace', 'istitle',
-            //'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
-            //'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
-            //'translate', 'upper', 'zfill',
-            // */
-
-            // Basic customization: http://python.org/doc/current/ref/customization.html
-            '__new__', '__init__', '__del__', '__repr__', '__str__',
-            '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
-            '__hash__', '__nonzero__', '__unicode__', '__dict__',
-            // Attribute access: http://python.org/doc/current/ref/attribute-access.html
-            '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
-            '__delete__', '__slots__',
-            // Class creation, callable objects
-            '__metaclass__', '__call__',
-            // Container types: http://python.org/doc/current/ref/sequence-types.html
-            '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
-            '__getslice__', '__setslice__', '__delslice__',
-            // Numeric types: http://python.org/doc/current/ref/numeric-types.html
-            '__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
-            '__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
-            '__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
-            '__long__','__lshift__',
-            '__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
-            '__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
-            '__rshift__','__rsub__','__rmul__','__rand__','__rxor__','__ror__',
-            '__sub__','__xor__'
-            )
-
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '`'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #006000;font-weight:bold;',   // Reserved
-            2 => 'color: #800950;font-size:105%',                  // Built-ins + self
-            3 => 'color: #003399;font-size:106%',                  // Standard lib
-            4 => 'color: #0000cd;'                  // Special methods
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style:italic;font-size:92%',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #930; font-weight: bold;font-size:105%'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: maroon;font-size:102%;padding:2px'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #666;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #2356F8;'
-            ),
-        'METHODS' => array(
-            1 => 'color: navy;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66ccFF;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/python.php b/inc/geshi/python.php
deleted file mode 100644
index ec9b17e6f..000000000
--- a/inc/geshi/python.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/*************************************************************************************
- * python.php
- * ----------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * Python language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/12/18
- *  -  Added missing functions and keywords. Also added two new Python 3.0 types. SF#2441839
- * 2005/05/26
- *  -  Modifications by Tim (tim@skreak.com): added more keyword categories, tweaked colors
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/08/30 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Python',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    //Longest quotemarks ALWAYS first
-    'QUOTEMARKS' => array('"""', "'''", '"', "'"),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX_0O | GESHI_NUMBER_HEX_PREFIX |
-        GESHI_NUMBER_FLT_NONSCI | GESHI_NUMBER_FLT_NONSCI_F |
-        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-
-        /*
-        ** Set 1: reserved words
-        ** http://python.org/doc/current/ref/keywords.html
-        */
-        1 => array(
-            'and', 'del', 'for', 'is', 'raise', 'assert', 'elif', 'from', 'lambda', 'return', 'break',
-            'else', 'global', 'not', 'try', 'class', 'except', 'if', 'or', 'while', 'continue', 'exec',
-            'import', 'pass', 'yield', 'def', 'finally', 'in', 'print', 'with', 'as', 'nonlocal'
-            ),
-
-        /*
-        ** Set 2: builtins
-        ** http://python.org/doc/current/lib/built-in-funcs.html
-        */
-        2 => array(
-            '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
-            'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
-            'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
-            'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
-            'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
-            'raw_input', 'reduce', 'reload', 'reversed', 'round', 'set', 'setattr', 'slice',
-            'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
-            'vars', 'xrange', 'zip',
-            // Built-in constants: http://python.org/doc/current/lib/node35.html
-            'False', 'True', 'None', 'NotImplemented', 'Ellipsis',
-            // Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
-            'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
-            'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
-            'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
-            'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
-            'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
-            'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
-            'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
-            'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
-            'RuntimeWarning', 'FutureWarning',
-            // self: this is a common python convention (but not a reserved word)
-            'self',
-            // other
-            'any', 'all'
-            ),
-
-        /*
-        ** Set 3: standard library
-        ** http://python.org/doc/current/lib/modindex.html
-        */
-        3 => array(
-            '__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
-            'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
-            'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
-            'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
-            'collections', 'colorsys', 'commands', 'compileall', 'compiler',
-            'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
-            'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
-            'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
-            'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
-            'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
-            'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
-            'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
-            'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
-            'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
-            'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
-            'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
-            'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
-            'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
-            'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
-            're', 'readline', 'repr', 'resource', 'rexec', 'rfc822', 'rgbimg', 'rlcompleter',
-            'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
-            'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
-            'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
-            'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
-            'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
-            'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
-            'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
-            'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
-            'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
-            'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib',
-            // Python 3.0
-            'bytes', 'bytearray'
-            ),
-
-        /*
-        ** Set 4: special methods
-        ** http://python.org/doc/current/ref/specialnames.html
-        */
-        4 => array(
-            /*
-            // Iterator types: http://python.org/doc/current/lib/typeiter.html
-            '__iter__', 'next',
-            // String types: http://python.org/doc/current/lib/string-methods.html
-            'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
-            'find', 'index', 'isalnum', 'isalpha', 'isdigit', 'islower', 'isspace', 'istitle',
-            'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
-            'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
-            'translate', 'upper', 'zfill',
-            */
-            // Basic customization: http://python.org/doc/current/ref/customization.html
-            '__new__', '__init__', '__del__', '__repr__', '__str__',
-            '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
-            '__hash__', '__nonzero__', '__unicode__', '__dict__',
-            // Attribute access: http://python.org/doc/current/ref/attribute-access.html
-            '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
-            '__delete__', '__slots__',
-            // Class creation, callable objects
-            '__metaclass__', '__call__',
-            // Container types: http://python.org/doc/current/ref/sequence-types.html
-            '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
-            '__getslice__', '__setslice__', '__delslice__',
-            // Numeric types: http://python.org/doc/current/ref/numeric-types.html
-            '__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
-            '__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
-            '__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
-            '__long__','__lshift__',
-            '__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
-            '__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
-            '__rshift__','__rsub__','__rmul__','__rand__','__rxor__','__ror__',
-            '__sub__','__xor__'
-            )
-        ),
-    'SYMBOLS' => array(
-        '<', '>', '=', '!', '<=', '>=',             //·comparison·operators
-        '~', '@',                                   //·unary·operators
-        ';', ','                                    //·statement·separator
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
-            2 => 'color: #008000;',                        // Built-ins + self
-            3 => 'color: #dc143c;',                        // Standard lib
-            4 => 'color: #0000cd;'                        // Special methods
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: black;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #483d8b;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff4500;'
-            ),
-        'METHODS' => array(
-            1 => 'color: black;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/q.php b/inc/geshi/q.php
deleted file mode 100644
index ade9928d0..000000000
--- a/inc/geshi/q.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/*************************************************************************************
- * q.php
- * -----
- * Author: Ian Roddis (ian.roddis@proteanmind.net)
- * Copyright: (c) 2008 Ian Roddis (http://proteanmind.net)
- * Release Version: 1.0.8.11
- * Date Started: 2009/01/21
- *
- * q/kdb+ language file for GeSHi.
- *
- * Based on information available from code.kx.com
- *
- * CHANGES
- * -------
- * 2010/01/21 (1.0.0)
- *   -  First Release
- *
- * TODO (updated <1.0.0>)
- * -------------------------
- *  - Fix the handling of single line comments
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME'                 => 'q/kdb+',
-    'COMMENT_SINGLE'            => array(1 => '//'),
-    'COMMENT_MULTI'             => array(),
-    'COMMENT_REGEXP'            => array(
-        2 => '/ \s\/.*/',         # This needs to get fixed up, since it won't catch some instances
-        # Multi line comments (Moved from REGEXPS)
-        3 => '/^\/\s*?\n.*?\n\\\s*?\n/smi'
-        ),
-    'CASE_KEYWORDS'             => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS'                => array('"'),
-    'ESCAPE_CHAR'               => '\\',
-    'OOLANG'                    => false,
-    'OBJECT_SPLITTERS'          => array(),
-    'STRICT_MODE_APPLIES'       => GESHI_NEVER,
-    'SCRIPT_DELIMITERS'         => array(),
-    'HIGHLIGHT_STRICT_BLOCK'    => array(),
-    'TAB_WIDTH'                 => 4,
-    'KEYWORDS' => array(
-        1 => array(
-            'abs', 'acos', 'all', 'and', 'any', 'asc', 'asin', 'asof', 'atan', 'attr', 'avg', 'avgs', 'bin', 'ceiling',
-            'cols', 'cor', 'cos', 'count', 'cov', 'cross', 'cut', 'deltas', 'desc', 'dev', 'differ', 'distinct',
-            'div', 'each', 'enlist', 'eval', 'except', 'exec', 'exit', 'exp', 'fills', 'first', 'flip', 'floor',
-            'fkeys', 'get', 'getenv', 'group', 'gtime', 'hclose', 'hcount', 'hdel', 'hopen', 'hsym', 'iasc', 'idesc',
-            'in', 'insert', 'inter', 'inv', 'joins', 'key', 'keys', 'last', 'like', 'load', 'log', 'lower',
-            'lsq', 'ltime', 'ltrim', 'mavg', 'max', 'maxs', 'mcount', 'md5', 'mdev', 'med', 'meta', 'min', 'mins',
-            'mmax', 'mmin', 'mmu', 'mod', 'msum', 'neg', 'next', 'not', 'null', 'or', 'over', 'parse', 'peach',
-            'plist', 'prd', 'prds', 'prev', 'rand', 'rank', 'ratios', 'raze', 'read0', 'read1', 'reciprocal',
-            'reverse', 'rload', 'rotate', 'rsave', 'rtrim', 'save', 'scan', 'set', 'setenv', 'show', 'signum',
-            'sin', 'sqrt', 'ss', 'ssr', 'string', 'sublist', 'sum', 'sums', 'sv', 'system', 'tables', 'tan', 'til', 'trim',
-            'txf', 'type', 'ungroup', 'union', 'upper', 'upsert', 'value', 'var', 'view', 'views', 'vs',
-            'wavg', 'within', 'wsum', 'xasc', 'xbar', 'xcol', 'xcols', 'xdesc', 'xexp', 'xgroup', 'xkey',
-            'xlog', 'xprev', 'xrank'
-            ),
-        # kdb database template keywords
-        2 => array(
-            'aj', 'by', 'delete', 'fby', 'from', 'ij', 'lj', 'pj', 'select', 'uj', 'update', 'where', 'wj',
-            ),
-        ),
-    'SYMBOLS' => array(
-        '?', '#', ',', '_', '@', '.', '^', '~', '$', '!', '\\', '\\', '/:', '\:', "'", "':", '::', '+', '-', '%', '*'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #009900; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #666666; font-style: italic;',
-            3 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #990000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            2   => 'color: #999900;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'REGEXPS' => array(
-        # Symbols
-        2 => '`[^\s"]*',
-        ),
-    'URLS'  => array(
-        1   => '',
-        2   => '',
-        ),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/qbasic.php b/inc/geshi/qbasic.php
deleted file mode 100644
index 3345e3c69..000000000
--- a/inc/geshi/qbasic.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/*************************************************************************************
- * qbasic.php
- * ----------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/20
- *
- * QBasic/QuickBASIC language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2004/11/27 (1.0.3)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.2)
- *   -  Added support for URLs
- * 2004/08/05 (1.0.1)
- *   -  Added support for symbols
- *   -  Removed unnessecary slashes from some keywords
- * 2004/07/14 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Make sure all possible combinations of keywords with
- *   a space in them (EXIT FOR, END SELECT) are added
- *   to the first keyword group
- * * Update colours, especially for the first keyword group
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'QBasic/QuickBASIC',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        //Single-Line Comments using REM command
-        2 => "/\bREM.*?$/i",
-        //Line numbers
-        3 => "/^\s*\d+/im"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT |
-        GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'DO', 'LOOP', 'WHILE', 'WEND', 'THEN', 'ELSE', 'ELSEIF', 'IF',
-            'FOR', 'TO', 'NEXT', 'STEP', 'GOTO', 'GOSUB', 'CALL', 'CALLS',
-            'SUB', 'FUNCTION', 'RETURN', 'RESUME', 'SELECT', 'CASE', 'UNTIL'
-            ),
-        3 => array(
-            'ABS', 'ABSOLUTE', 'ACCESS', 'ALIAS', 'AND', 'ANY', 'APPEND', 'AS', 'ASC', 'ATN',
-            'BASE', 'BEEP', 'BINARY', 'BLOAD', 'BSAVE', 'BYVAL',
-            'CDBL', 'CDECL', 'CHAIN', 'CHDIR', 'CHR$', 'CINT', 'CIRCLE', 'CLEAR',
-            'CLNG', 'CLOSE', 'CLS', 'COM', 'COMMAND$', 'COMMON', 'CONST', 'COS', 'CSNG',
-            'CSRLIN', 'CVD', 'CVDMBF', 'CVI', 'CVL', 'CVS', 'CVSMDF', 'DATA', 'DATE$',
-            'DECLARE', 'DEF', 'FN', 'SEG', 'DEFDBL', 'DEFINT', 'DEFLNG', 'DEFSNG', 'DEFSTR',
-            'DIM', 'DOUBLE', 'DRAW', 'END', 'ENVIRON', 'ENVIRON$', 'EOF', 'EQV', 'ERASE',
-            'ERDEV', 'ERDEV$', 'ERL', 'ERR', 'ERROR', 'EXIT', 'EXP', 'FIELD', 'FILEATTR',
-            'FILES', 'FIX', 'FRE', 'FREEFILE', 'GET', 'HEX$', 'IMP', 'INKEY$',
-            'INP', 'INPUT', 'INPUT$', 'INSTR', 'INT', 'INTEGER', 'IOCTL', 'IOCTL$', 'IS',
-            'KEY', 'KILL', 'LBOUND', 'LCASE$', 'LEFT$', 'LEN', 'LET', 'LINE', 'LIST', 'LOC',
-            'LOCAL', 'LOCATE', 'LOCK', 'LOF', 'LOG', 'LONG', 'LPOS', 'LPRINT',
-            'LSET', 'LTRIM$', 'MID$', 'MKD$', 'MKDIR', 'MKDMBF$', 'MKI$', 'MKL$',
-            'MKS$', 'MKSMBF$', 'MOD', 'NAME', 'NOT', 'OCT$', 'OFF', 'ON', 'PEN', 'PLAY',
-            'OPEN', 'OPTION', 'OR', 'OUT', 'OUTPUT',
-            'PAINT', 'PALETTE', 'PCOPY', 'PEEK', 'PMAP', 'POINT', 'POKE', 'POS', 'PRESET',
-            'PRINT', 'PSET', 'PUT', 'RANDOM', 'RANDOMIZE', 'READ', 'REDIM', 'RESET',
-            'RESTORE', 'RIGHT$', 'RMDIR', 'RND', 'RSET', 'RTRIM$', 'RUN', 'SADD', 'SCREEN',
-            'SEEK', 'SETMEM', 'SGN', 'SHARED', 'SHELL', 'SIGNAL', 'SIN', 'SINGLE', 'SLEEP',
-            'SOUND', 'SPACE$', 'SPC', 'SQR', 'STATIC', 'STICK', 'STOP', 'STR$', 'STRIG',
-            'STRING', 'STRING$', 'SWAP', 'SYSTEM', 'TAB', 'TAN', 'TIME$', 'TIMER',
-            'TROFF', 'TRON', 'TYPE', 'UBOUND', 'UCASE$', 'UEVENT', 'UNLOCK', 'USING', 'VAL',
-            'VARPTR', 'VARPTR$', 'VARSEG', 'VIEW', 'WAIT', 'WIDTH', 'WINDOW', 'WRITE', 'XOR'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', ',', '+', '-', '*', '/', '=', '<', '>', '^'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #a1a100;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;',
-            2 => 'color: #808080;',
-            3 => 'color: #8080C0;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #cc66cc;',
-            2 => 'color: #339933;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        3 => 'http://www.qbasicnews.com/qboho/qck{FNAMEL}.shtml'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        1 => '&amp;(?:H[0-9a-fA-F]+|O[0-7]+)(?!\w)',
-        2 => '#[0-9]+(?!\w)'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/rails.php b/inc/geshi/rails.php
deleted file mode 100644
index 65ddee884..000000000
--- a/inc/geshi/rails.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-/*************************************************************************************
- * rails.php
- * ---------
- * Author: Moises Deniz
- * Copyright: (c) 2005 Moises Deniz
- * Release Version: 1.0.8.11
- * Date Started: 2007/03/21
- *
- * Ruby (with Ruby on Rails Framework) language file for GeSHi.
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Rails',
-    'COMMENT_SINGLE' => array(1 => "#"),
-    'COMMENT_MULTI' => array("=begin" => "=end"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '`','\''),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'alias', 'and', 'begin', 'break', 'case', 'class',
-            'def', 'defined', 'do', 'else', 'elsif', 'end',
-            'ensure', 'for', 'if', 'in', 'module', 'while',
-            'next', 'not', 'or', 'redo', 'rescue', 'yield',
-            'retry', 'super', 'then', 'undef', 'unless',
-            'until', 'when', 'BEGIN', 'END', 'include'
-            ),
-        2 => array(
-            '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
-            'return'
-            ),
-        3 => array(
-            'Array', 'Float', 'Integer', 'String', 'at_exit',
-            'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
-            'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
-            'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
-            'iterator?', 'lambda', 'load', 'local_variables', 'loop',
-            'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
-            'raise', 'rand', 'readline', 'readlines', 'require', 'select',
-            'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
-            'system', 'trace_var', 'trap', 'untrace_var'
-            ),
-        4 => array(
-            'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
-            'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
-            'CGI::HtmlExtension', 'CGI::QueryExtension',
-            'CGI::Session', 'CGI::Session::FileStore',
-            'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
-            'ConditionVariable', 'Continuation', 'Data',
-            'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
-            'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
-            'Exception', 'FalseClass', 'File',
-            'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
-            'FileUtils::DryRun', 'FileUtils::NoWrite',
-            'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
-            'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
-            'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
-            'Iconv::Failure', 'Iconv::IllegalSequence',
-            'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
-            'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
-            'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
-            'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
-            'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
-            'Logger::ShiftingError', 'Marshal', 'MatchData',
-            'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
-            'NameError::message', 'NilClass', 'NoMemoryError',
-            'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
-            'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
-            'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
-            'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
-            'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
-            'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
-            'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
-            'SingleForwardable', 'Singleton', 'SingletonClassMethods',
-            'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
-            'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
-            'SyncEnumerator', 'SyntaxError', 'SystemCallError',
-            'SystemExit', 'SystemStackError', 'Tempfile',
-            'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
-            'ThreadError', 'ThreadGroup',
-            'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
-            'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
-            'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
-            'URI::InvalidComponentError', 'URI::InvalidURIError',
-            'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
-            'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
-            'ZeroDivisionError', 'Zlib',
-            'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
-            'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
-            'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
-            'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
-            'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
-            'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
-            'Zlib::VersionError',
-            'Zlib::ZStream',
-            'ActionController::AbstractRequest',
-            'ActionController::Assertions::DomAssertions',
-            'ActionController::Assertions::ModelAssertions',
-            'ActionController::Assertions::ResponseAssertions',
-            'ActionController::Assertions::RoutingAssertions',
-            'ActionController::Assertions::SelectorAssertions',
-            'ActionController::Assertions::TagAssertions',
-            'ActionController::Base',
-            'ActionController::Benchmarking::ClassMethods',
-            'ActionController::Caching',
-            'ActionController::Caching::Actions',
-            'ActionController::Caching::Actions::ActionCachePath',
-            'ActionController::Caching::Fragments',
-            'ActionController::Caching::Pages',
-            'ActionController::Caching::Pages::ClassMethods',
-            'ActionController::Caching::Sweeping',
-            'ActionController::Components',
-            'ActionController::Components::ClassMethods',
-            'ActionController::Components::InstanceMethods',
-            'ActionController::Cookies',
-            'ActionController::Filters::ClassMethods',
-            'ActionController::Flash',
-            'ActionController::Flash::FlashHash',
-            'ActionController::Helpers::ClassMethods',
-            'ActionController::Integration::Session',
-            'ActionController::IntegrationTest',
-            'ActionController::Layout::ClassMethods',
-            'ActionController::Macros',
-            'ActionController::Macros::AutoComplete::ClassMethods',
-            'ActionController::Macros::InPlaceEditing::ClassMethods',
-            'ActionController::MimeResponds::InstanceMethods',
-            'ActionController::Pagination',
-            'ActionController::Pagination::ClassMethods',
-            'ActionController::Pagination::Paginator',
-            'ActionController::Pagination::Paginator::Page',
-            'ActionController::Pagination::Paginator::Window',
-            'ActionController::Rescue', 'ActionController::Resources',
-            'ActionController::Routing',
-            'ActionController::Scaffolding::ClassMethods',
-            'ActionController::SessionManagement::ClassMethods',
-            'ActionController::Streaming', 'ActionController::TestProcess',
-            'ActionController::TestUploadedFile',
-            'ActionController::UrlWriter',
-            'ActionController::Verification::ClassMethods',
-            'ActionMailer::Base', 'ActionView::Base',
-            'ActionView::Helpers::ActiveRecordHelper',
-            'ActionView::Helpers::AssetTagHelper',
-            'ActionView::Helpers::BenchmarkHelper',
-            'ActionView::Helpers::CacheHelper',
-            'ActionView::Helpers::CaptureHelper',
-            'ActionView::Helpers::DateHelper',
-            'ActionView::Helpers::DebugHelper',
-            'ActionView::Helpers::FormHelper',
-            'ActionView::Helpers::FormOptionsHelper',
-            'ActionView::Helpers::FormTagHelper',
-            'ActionView::Helpers::JavaScriptHelper',
-            'ActionView::Helpers::JavaScriptMacrosHelper',
-            'ActionView::Helpers::NumberHelper',
-            'ActionView::Helpers::PaginationHelper',
-            'ActionView::Helpers::PrototypeHelper',
-            'ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods',
-            'ActionView::Helpers::ScriptaculousHelper',
-            'ActionView::Helpers::TagHelper',
-            'ActionView::Helpers::TextHelper',
-            'ActionView::Helpers::UrlHelper', 'ActionView::Partials',
-            'ActionWebService::API::Method', 'ActionWebService::Base',
-            'ActionWebService::Client::Soap',
-            'ActionWebService::Client::XmlRpc',
-            'ActionWebService::Container::ActionController::ClassMethods',
-            'ActionWebService::Container::Delegated::ClassMethods',
-            'ActionWebService::Container::Direct::ClassMethods',
-            'ActionWebService::Invocation::ClassMethods',
-            'ActionWebService::Scaffolding::ClassMethods',
-            'ActionWebService::SignatureTypes', 'ActionWebService::Struct',
-            'ActiveRecord::Acts::List::ClassMethods',
-            'ActiveRecord::Acts::List::InstanceMethods',
-            'ActiveRecord::Acts::NestedSet::ClassMethods',
-            'ActiveRecord::Acts::NestedSet::InstanceMethods',
-            'ActiveRecord::Acts::Tree::ClassMethods',
-            'ActiveRecord::Acts::Tree::InstanceMethods',
-            'ActiveRecord::Aggregations::ClassMethods',
-            'ActiveRecord::Associations::ClassMethods',
-            'ActiveRecord::AttributeMethods::ClassMethods',
-            'ActiveRecord::Base',
-            'ActiveRecord::Calculations::ClassMethods',
-            'ActiveRecord::Callbacks',
-            'ActiveRecord::ConnectionAdapters::AbstractAdapter',
-            'ActiveRecord::ConnectionAdapters::Column',
-            'ActiveRecord::ConnectionAdapters::DB2Adapter',
-            'ActiveRecord::ConnectionAdapters::DatabaseStatements',
-            'ActiveRecord::ConnectionAdapters::FirebirdAdapter',
-            'ActiveRecord::ConnectionAdapters::FrontBaseAdapter',
-            'ActiveRecord::ConnectionAdapters::MysqlAdapter',
-            'ActiveRecord::ConnectionAdapters::OpenBaseAdapter',
-            'ActiveRecord::ConnectionAdapters::OracleAdapter',
-            'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
-            'ActiveRecord::ConnectionAdapters::Quoting',
-            'ActiveRecord::ConnectionAdapters::SQLServerAdapter',
-            'ActiveRecord::ConnectionAdapters::SQLiteAdapter',
-            'ActiveRecord::ConnectionAdapters::SchemaStatements',
-            'ActiveRecord::ConnectionAdapters::SybaseAdapter::ColumnWithIdentity',
-            'ActiveRecord::ConnectionAdapters::SybaseAdapterContext',
-            'ActiveRecord::ConnectionAdapters::TableDefinition',
-            'ActiveRecord::Errors', 'ActiveRecord::Locking',
-            'ActiveRecord::Locking::Optimistic',
-            'ActiveRecord::Locking::Optimistic::ClassMethods',
-            'ActiveRecord::Locking::Pessimistic',
-            'ActiveRecord::Migration', 'ActiveRecord::Observer',
-            'ActiveRecord::Observing::ClassMethods',
-            'ActiveRecord::Reflection::ClassMethods',
-            'ActiveRecord::Reflection::MacroReflection',
-            'ActiveRecord::Schema', 'ActiveRecord::Timestamp',
-            'ActiveRecord::Transactions::ClassMethods',
-            'ActiveRecord::Validations',
-            'ActiveRecord::Validations::ClassMethods',
-            'ActiveRecord::XmlSerialization',
-            'ActiveSupport::CachingTools::HashCaching',
-            'ActiveSupport::CoreExtensions::Array::Conversions',
-            'ActiveSupport::CoreExtensions::Array::Grouping',
-            'ActiveSupport::CoreExtensions::Date::Conversions',
-            'ActiveSupport::CoreExtensions::Hash::Conversions',
-            'ActiveSupport::CoreExtensions::Hash::Conversions::ClassMethods',
-            'ActiveSupport::CoreExtensions::Hash::Diff',
-            'ActiveSupport::CoreExtensions::Hash::Keys',
-            'ActiveSupport::CoreExtensions::Hash::ReverseMerge',
-            'ActiveSupport::CoreExtensions::Integer::EvenOdd',
-            'ActiveSupport::CoreExtensions::Integer::Inflections',
-            'ActiveSupport::CoreExtensions::Numeric::Bytes',
-            'ActiveSupport::CoreExtensions::Numeric::Time',
-            'ActiveSupport::CoreExtensions::Pathname::CleanWithin',
-            'ActiveSupport::CoreExtensions::Range::Conversions',
-            'ActiveSupport::CoreExtensions::String::Access',
-            'ActiveSupport::CoreExtensions::String::Conversions',
-            'ActiveSupport::CoreExtensions::String::Inflections',
-            'ActiveSupport::CoreExtensions::String::Iterators',
-            'ActiveSupport::CoreExtensions::String::StartsEndsWith',
-            'ActiveSupport::CoreExtensions::String::Unicode',
-            'ActiveSupport::CoreExtensions::Time::Calculations',
-            'ActiveSupport::CoreExtensions::Time::Calculations::ClassMethods',
-            'ActiveSupport::CoreExtensions::Time::Conversions',
-            'ActiveSupport::Multibyte::Chars',
-            'ActiveSupport::Multibyte::Handlers::UTF8Handler',
-            'Breakpoint', 'Builder::BlankSlate', 'Builder::XmlMarkup',
-            'Fixtures',
-            'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
-            'Inflector::Inflections', 'Mime', 'Mime::Type',
-            'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
-            ),
-        5 => array(
-            'image_tag', 'link_to', 'link_to_remote', 'javascript_include_tag',
-            'assert_equal', 'assert_not_equal', 'before_filter',
-            'after_filter', 'render', 'redirect_to', 'hide_action',
-            'render_to_string', 'url_for', 'controller_name',
-            'controller_class_name', 'controller_path', 'session',
-            'render_component', 'render_component_as_string', 'cookie',
-            'layout', 'flash', 'auto_complete_for', 'in_place_editor_for',
-            'respond_to', 'paginate', 'current_page', 'each', 'first',
-            'first_page', 'last_page', 'last', 'length', 'new', 'page_count',
-            'previous', 'scaffold', 'send_data',
-            'send_file', 'deliver', 'receive', 'error_messages_for',
-            'error_message_on', 'form', 'input', 'stylesheet_link_tag',
-            'stylesheet_path', 'content_for', 'select_date', 'ago',
-            'month', 'day', 'check_box', 'fields_for', 'file_field',
-            'form_for', 'hidden_field', 'text_area', 'password_field',
-            'collection_select', 'options_for_select',
-            'options_from_collection_for_select', 'file_field_tag',
-            'form_for_tag', 'hidden_field_tag', 'text_area_tag',
-            'password_field_tag', 'link_to_function', 'javascript_tag',
-            'human_size', 'number_to_currency', 'pagination_links',
-            'form_remote_tag', 'form_remote_for',
-            'submit_to_remote', 'remote_function', 'observe_form',
-            'observe_field', 'remote_form_for', 'options_for_ajax', 'alert',
-            'call', 'assign', 'show', 'hide', 'insert_html', 'sortable',
-            'toggle', 'visual_effect', 'replace', 'replace_html', 'remove',
-            'save', 'save!', 'draggable', 'drop_receiving', 'literal',
-            'draggable_element', 'drop_receiving_element', 'sortable_element',
-            'content_tag', 'tag', 'link_to_image', 'link_to_if',
-            'link_to_unless', 'mail_to', 'link_image_to', 'button_to',
-            'current_page?', 'act_as_list', 'act_as_nested', 'act_as_tree',
-            'has_many', 'has_one', 'belongs_to', 'has_many_and_belogns_to',
-            'delete', 'destroy', 'destroy_all', 'clone', 'deep_clone', 'copy',
-            'update', 'table_name', 'primary_key', 'sum', 'maximun', 'minimum',
-            'count', 'size', 'after_save', 'after_create', 'before_save',
-            'before_create', 'add_to_base', 'errors', 'add', 'validate',
-            'validates_presence_of', 'validates_numericality_of',
-            'validates_uniqueness_of', 'validates_length_of',
-            'validates_format_of', 'validates_size_of', 'to_a', 'to_s',
-            'to_xml', 'to_i'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
-        '+', '-', '=>', '<<'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color:#9966CC; font-weight:bold;',
-            2 => 'color:#0000FF; font-weight:bold;',
-            3 => 'color:#CC0066; font-weight:bold;',
-            4 => 'color:#CC00FF; font-weight:bold;',
-            5 => 'color:#5A0A0A; font-weight:bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color:#008000; font-style:italic;',
-                    'MULTI' => 'color:#000080; font-style:italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color:#000099;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color:#006600; font-weight:bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color:#996600;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color:#006666;'
-            ),
-        'METHODS' => array(
-            1 => 'color:#9900CC;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color:#006600; font-weight:bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color:#ff6633; font-weight:bold;',
-            1 => 'color:#0066ff; font-weight:bold;',
-            2 => 'color:#6666ff; font-weight:bold;',
-            3 => 'color:#ff3333; font-weight:bold;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        0 => array(
-            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        1 => array(
-            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*", //Static OOP References
-        3 => array(
-            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<%' => '%>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        )
-);
-
-?>
diff --git a/inc/geshi/rebol.php b/inc/geshi/rebol.php
deleted file mode 100644
index ea86c21cd..000000000
--- a/inc/geshi/rebol.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/*************************************************************************************
- * rebol.php
- * --------
- * Author: Lecanu Guillaume (Guillaume@LyA.fr)
- * Copyright: (c) 2004-2005 Lecanu Guillaume (Guillaume@LyA.fr)
- * Release Version: 1.0.8.11
- * Date Started: 2004/12/22
- *
- * Rebol language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/01/26 (1.0.8.3)
- *  -  Adapted language file to comply to GeSHi language file guidelines
- * 2004/11/25 (1.0.3)
- *  -  Added support for multiple object splitters
- *  -  Fixed &new problem
- * 2004/10/27 (1.0.2)
- *  -  Added URL support
- *  -  Added extra constants
- * 2004/08/05 (1.0.1)
- *  -  Added support for symbols
- * 2004/07/14 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/07/14)
- * -------------------------
- * * Make sure the last few function I may have missed
- *   (like eval()) are included for highlighting
- * * Split to several files - php4, php5 etc
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'REBOL',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array('rebol [' => ']', 'comment [' => ']'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'binary!','block!','char!','date!','decimal!','email!','file!',
-            'hash!','integer!','issue!','list!','logic!','money!','none!',
-            'object!','paren!','pair!','path!','string!','tag!','time!',
-            'tuple!','url!',
-            ),
-        2 => array(
-            'all','any','attempt','break','catch','compose','disarm','dispatch',
-            'do','do-events','does','either','else','exit','for','forall',
-            'foreach','forever','forskip','func','function','halt','has','if',
-            'launch','loop','next','quit','reduce','remove-each','repeat',
-            'return','secure','switch','throw','try','until','wait','while',
-            ),
-        3 => array(
-            'about','abs','absolute','add','alert','alias','alter','and',
-            'any-block?','any-function?','any-string?','any-type?','any-word?',
-            'append','arccosine','arcsine','arctangent','array','as-pair',
-            'ask','at','back','binary?','bind','bitset?','block?','brightness?',
-            'browse','build-tag','caret-to-offset','center-face','change',
-            'change-dir','char?','charset','checksum','choose','clean-path',
-            'clear','clear-fields','close','comment','complement','component?',
-            'compress','confirm','connected?','construct','context','copy',
-            'cosine','datatype?','date?','debase','decimal?','decode-cgi',
-            'decompress','dehex','delete','detab','difference','dir?','dirize',
-            'divide','dump-face','dump-obj','echo','email?','empty?','enbase',
-            'entab','equal?','error?','even?','event?','exclude','exists?',
-            'exp','extract','fifth','file?','find','first','flash','focus',
-            'form','found?','fourth','free','function?','get','get-modes',
-            'get-word?','greater-or-equal?','greater?','hash?','head','head?',
-            'help','hide','hide-popup','image?','import-email','in',
-            'in-window?','index?','info?','inform','input','input?','insert',
-            'integer?','intersect','issue?','join','last','layout','length?',
-            'lesser-or-equal?','lesser?','library?','license','link?',
-            'list-dir','list?','lit-path?','lit-word?','load','load-image',
-            'log-10','log-2','log-e','logic?','lowercase','make','make-dir',
-            'make-face','max','maximum','maximum-of','min','minimum',
-            'minimum-of','modified?','mold','money?','multiply','native?',
-            'negate','negative?','none?','not','not-equal?','now','number?',
-            'object?','odd?','offset-to-caret','offset?','op?','open','or',
-            'pair?','paren?','parse','parse-xml','path?','pick','poke','port?',
-            'positive?','power','prin','print','probe','protect',
-            'protect-system','query','random','read','read-io','recycle',
-            'refinement?','reform','rejoin','remainder','remold','remove',
-            'rename',
-            //'repeat',
-            'repend','replace','request','request-color','request-date',
-            'request-download','request-file','request-list','request-pass',
-            'request-text','resend','reverse','routine?','same?','save',
-            'script?','second','select','send','series?','set','set-modes',
-            'set-net','set-path?','set-word?','show','show-popup','sign?',
-            'sine','size-text','size?','skip','sort','source','span?',
-            'split-path','square-root','strict-equal?','strict-not-equal?',
-            'string?','struct?','stylize','subtract','suffix?','tag?','tail',
-            'tail?','tangent','third','time?','to','to-binary','to-bitset',
-            'to-block','to-char','to-date','to-decimal','to-email','to-file',
-            'to-get-word','to-hash','to-hex','to-idate','to-image','to-integer',
-            'to-issue','to-list','to-lit-path','to-lit-word','to-local-file',
-            'to-logic','to-money','to-pair','to-paren','to-path',
-            'to-rebol-file','to-refinement','to-set-path','to-set-word',
-            'to-string','to-tag','to-time','to-tuple','to-url','to-word',
-            'trace','trim','tuple?','type?','unfocus','union','unique',
-            'unprotect','unset','unset?','unview','update','upgrade',
-            'uppercase','url?','usage','use','value?','view','viewed?','what',
-            'what-dir','within?','word?','write','write-io','xor','zero?',
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-//            2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-//        2 => 'includes/dico_rebol.php?word={FNAME}',
-//        3 => 'includes/dico_rebol.php?word={FNAME}'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*",
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/reg.php b/inc/geshi/reg.php
deleted file mode 100644
index 157b2bd24..000000000
--- a/inc/geshi/reg.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/*************************************************************************************
- * reg.php
- * -------
- * Author: Sean Hanna (smokingrope@gmail.com)
- * Copyright: (c) 2006 Sean Hanna
- * Release Version: 1.0.8.11
- * Date Started: 03/15/2006
- *
- * Microsoft Registry Editor language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- *  -  Updated and optimized most regular expressions
- * 03/15/2006 (0.5.0)
- *  -  Syntax File Created
- * 04/27/2006 (0.9.5)
- *  -  Syntax Coloring Cleaned Up
- *  -  First Release
- * 04/29/2006 (1.0.0)
- *  -  Updated a few coloring settings
- *
- * TODO (updated 4/27/2006)
- * -------------------------
- * - Add a verification to the multi-line portion of the hex field regex
- *    for a '\' character on the line preceding the line of the multi-line
- *    hex field.
- *
- * KNOWN ISSUES (updated 4/27/2006)
- * ---------------------------------
- *
- * - There are two regexes for the multiline hex value regex. The regex for
- *        all lines after the first does not verify that the previous line contains
- *        a line continuation character '\'. This regex also does not check for
- *        end of line as it should.
- *
- * - If number_highlighting is enabled during processing of this syntax file
- *    many of the regexps used will appear slightly incorrect.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
-
- ************************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'Microsoft Registry',
-    'COMMENT_SINGLE' => array(1 =>';'),
-    'COMMENT_MULTI' => array( ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-//        1 => array(),
-//        2 => array(),
-        /* Registry Key Constants Not Used */
-        3 => array(
-            'HKEY_LOCAL_MACHINE',
-            'HKEY_CLASSES_ROOT',
-            'HKEY_CURRENT_USER',
-            'HKEY_USERS',
-            'HKEY_CURRENT_CONFIG',
-            'HKEY_DYN_DATA',
-            'HKLM', 'HKCR', 'HKCU', 'HKU', 'HKCC', 'HKDD'
-            )
-        ),
-    'SYMBOLS' => array(
-        '='
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-//        1 => false,
-//        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-//            1 => 'color: #00CCFF;',
-//            2 => 'color: #0000FF;',
-            3 => 'color: #800000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #009900;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #009900;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #00CCFF;',
-            1 => 'color: #0000FF;',
-            2 => '',
-            3 => 'color: #0000FF;',
-            4 => 'color: #0000FF;',
-            5 => '',
-            6 => '',
-            7 => '',
-            8 => 'color: #FF6600;',
-            )
-        ),
-    'URLS' => array(
-//        1 => '',
-//        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        // Highlight Key Delimiters
-        0 => array(
-            GESHI_SEARCH => '((^|\\n)\\s*)(\\\\\\[(.*)\\\\\\])(\\s*(\\n|$))',
-            GESHI_REPLACE => '\\3',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\5'
-//            GESHI_CLASS => 'kw1'
-            ),
-        // Highlight File Format Header Version 5
-        1 => array(
-            GESHI_SEARCH => '(^\s*)(Windows Registry Editor Version \d+\.\d+)(\s*$)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3',
-            GESHI_CLASS => 'geshi_registry_header'
-            ),
-        // Highlight File Format Header Version 4
-        2 => array(
-            GESHI_SEARCH => '(^\\s*)(REGEDIT\s?\d+)(\s*$)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3',
-            GESHI_CLASS => 'geshi_registry_header'
-            ),
-        // Highlight dword: 32 bit integer values
-        3 => array(
-            GESHI_SEARCH => '(=\s*)(dword:[0-9a-fA-F]{8})(\s*$)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-//            GESHI_CLASS => 'kw2'
-            ),
-        // Highlight variable names
-        4 => array(
-            GESHI_SEARCH => '(^\s*)(\&quot;.*?\&quot;)(\s*=)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3',
-            GESHI_CLASS => 'geshi_variable'
-            ),
-        // Highlight String Values
-        5 => array(
-            GESHI_SEARCH => '(=\s*)(\&quot;.*?\&quot;)(\s*$)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3',
-            GESHI_CLASS => 'st0'
-            ),
-        // Highlight Hexadecimal Values (Single-Line and Multi-Line)
-        6 => array(
-            GESHI_SEARCH => '(=\s*\n?\s*)(hex:[0-9a-fA-F]{2}(,(\\\s*\n\s*)?[0-9a-fA-F]{2})*)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '',
-            GESHI_CLASS => 'kw2'
-            ),
-        // Highlight Default Variable
-        7 => array(
-            GESHI_SEARCH => '(^\s*)(@)(\s*=)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'm',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3',
-            GESHI_CLASS => 'geshi_variable'
-            ),
-        // Highlight GUID's found anywhere.
-        8 => array(
-            GESHI_SEARCH => '(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\})',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            GESHI_CLASS => 'geshi_guid'
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER,
-        )
-    )
-);
-
-?>
diff --git a/inc/geshi/rexx.php b/inc/geshi/rexx.php
deleted file mode 100644
index b3cb93229..000000000
--- a/inc/geshi/rexx.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/*************************************************************************************
- * rexx.php
- * ---------------------------------
- * Author: Jon Wolfers (sahananda@windhorse.biz)
- * Contributors:
- *    - Walter Pachl (pachl@chello.at)
- * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
- * Release Version: 1.0.8.11
- * Date Started: 2008/01/07
- *
- * Rexx language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/07/29 (1.0.0)
- *    -  tried to get it syntactically right
- *
- * TODO (updated 2012/07/29)
- * -------------------------
- *   -  Get it working on rosettacode.org
- *
- *************************************************************************************
- *
- *      This file is part of GeSHi.
- *
- *    GeSHi is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    GeSHi is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with GeSHi; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'rexx',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'address', 'arg', 'attribute', 'call', 'constant', 'do',
-            'drop', 'exit', 'forward', 'if',
-            'interpret', 'iterate', 'leave', 'loop', 'nop', 'numeric',
-            'options', 'parse', 'procedure', 'pull', 'push', 'queue',
-            'raise', 'return', 'say', 'select', 'signal', 'trace'
-            ),
-        2 => array(
-            'by', 'digits', 'engineering', 'error', 'expose',
-            'failure', 'for', 'forever', 'form', 'fuzz', 'halt',
-            'name', 'novalue', 'off', 'on', 'over', 'scientific', 'source',
-            'syntax', 'to', 'until', 'upper', 'version',
-            'while', 'with'
-            ),
-        3 => array(
-            'else', 'end', 'otherwise', 'then', 'when'
-            ),
-        4 => array(
-            'rc', 'result', 'sigl'
-            ),
-        5 => array(
-            'placeholderforoorexxdirectives'
-            ),
-        6 => array(
-            'abbrev', 'abs', 'beep', 'bitand', 'bitor',
-            'bitxor', 'b2x', 'center', 'centre', 'changestr', 'charin',
-            'charout', 'chars', 'compare', 'condition', 'copies',
-            'countstr', 'c2d', 'c2x', 'datatype', 'date', 'delstr',
-            'delword', 'directory', 'd2c', 'd2x', 'endlocal',
-            'errortext', 'filespec', 'format', 'insert',
-            'lastpos', 'left', 'length', 'linein', 'lineout', 'lines',
-            'lower', 'max', 'min', 'overlay', 'pos', 'queued', 'random',
-            'reverse', 'right', 'rxfuncadd', 'rxfuncdrop', 'rxfuncquery',
-            'rxqueue', 'setlocal', 'sign', 'sourceline', 'space',
-            'stream', 'strip', 'substr', 'subword', 'symbol', 'time',
-            'translate', 'trunc', 'userid', 'value',
-            'var', 'verify', 'word', 'wordindex', 'wordlength', 'wordpos',
-            'words', 'xrange', 'x2b', 'x2c', 'x2d'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '<', '>', '=', '+', '-', '*', '**', '/', '|', '%', '^', '&', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #ff0000; font-weight: bold;',
-            3 => 'color: #00ff00; font-weight: bold;',
-            4 => 'color: #0000ff; font-weight: bold;',
-            5 => 'color: #880088; font-weight: bold;',
-            6 => 'color: #888800; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666;',
-            'MULTI' => 'color: #808080;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/robots.php b/inc/geshi/robots.php
deleted file mode 100644
index 0b75f7111..000000000
--- a/inc/geshi/robots.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/*************************************************************************************
- * robots.php
- * --------
- * Author: Christian Lescuyer (cl@goelette.net)
- * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1.0.8.11
- * Date Started: 2006/02/17
- *
- * robots.txt language file for GeSHi.
- *
- * 2006/02/17 (1.0.0)
- *   -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'robots.txt',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(1 => "/^Comment:.*?/m"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'Allow', 'Crawl-delay', 'Disallow', 'Request-rate', 'Robot-version',
-            'Sitemap', 'User-agent', 'Visit-time'
-            )
-        ),
-    'SYMBOLS' => array(
-        ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.robotstxt.org/wc/norobots.html'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/rpmspec.php b/inc/geshi/rpmspec.php
deleted file mode 100644
index fd6a561f8..000000000
--- a/inc/geshi/rpmspec.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/*************************************************************************************
- * rpmspec.php
- * ---------------------------------
- * Author: Paul Grinberg (gri6507 TA unity-linux TOD org)
- * Copyright: (c) 2010 Paul Grinberg
- * Release Version: 1.0.8.11
- * Date Started: 2010/04/27
- *
- * RPM Spec language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/04/27 (0.1)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'RPM Specification File',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'QUOTEMARKS' => array('"','`'),
-    'ESCAPE_CHAR' => '\\',
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        ),
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        '<', '>', '=',
-        '!', '@', '~', '&', '|', '^',
-        '+','-', '*', '/', '%',
-        ',', ';', '?', '.', ':'
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #009999;',
-            3 => 'color: #000000; font-weight: bold;',
-            4 => 'color: #ff6600; font-style: italic;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'REGEXPS' => array(
-        1 => array(
-            // search for generic macros
-            GESHI_SEARCH => '(%{?[a-zA-Z0-9_]+}?)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        2 => array(
-            // search for special macros
-            GESHI_SEARCH => '(%(?:define|patch\d*|mklibname|mkrel|configure\S+|makeinstall\S+|make_session|make|defattr|config|doc|setup))',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        3 => array (
-            // special definitions
-            GESHI_SEARCH => '((?:summary|license|buildroot|buildrequires|provides|version|release|source\d*|group|buildarch|autoreqprov|provides|obsoletes|vendor|distribution|suggests|autoreq|autoprov|conflicts|name|url|requires|patch\d*):)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        4 => array (
-            // section delimiting words
-            GESHI_SEARCH => '(%(?:description|package|prep|build|install|clean|postun|preun|post|pre|files|changelog))',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '',
-            ),
-        ),
-    'URLS' => array(),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/rsplus.php b/inc/geshi/rsplus.php
deleted file mode 100644
index e8a4e722b..000000000
--- a/inc/geshi/rsplus.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-/*************************************************************************************
- * rsplus.php
- * ———–
- * Author: Ron Fredericks (ronf@LectureMaker.com)
- * Contributors:
- *  - Benilton Carvalho (beniltoncarvalho@gmail.com)
- *  - Fernando Henrique Ferraz Pereira da Rosa (mentus@gmail.com)
- * Copyright: (c) 2009 Ron Fredericks (http://www.LectureMaker.com)
- * Release Version: 1.0.8.11
- * Date Started: 2009/03/28
- *
- * R language file for GeSHi.
- *
- * CHANGES
- * ——-
- * 2009/04/06
- *   -  Add references to Sekhon’s R Package docs
- * 2009/03/29 (1.0.8.5)
- *   -  First Release
- * 2009/07/16 (1.0.8.6)
- *   - Added functions from base packages (Benilton Carvalho - carvalho@bclab.org)
- *
- * References
- * ———-
- * Some online R Package documentation:
- *     http://sekhon.berkeley.edu/library/index.html         2.4 docs
- *     http://astrostatistics.psu.edu/su07/R/html            2.5 docs
- *
- * Another R GeSHi with no meat?
- *     http://organicdesign.co.nz/GeSHi/R.php
- * SourceForge R discussion:
- *     http://sourceforge.net/tracker/?func=detail&aid=2276025&group_id=114997&atid=670234
- *
- * TODO (updated 2007/02/06)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'R / S+',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'else','global','in', 'otherwise','persistent',
-            ),
-        2 => array( // base package
-            '$.package_version', '$<-', '$<-.data.frame', 'abbreviate', 'abs', 'acos', 'acosh', 'addNA', 'addTaskCallback',
-            'agrep', 'alist', 'all', 'all.equal', 'all.equal.character', 'all.equal.default', 'all.equal.factor',
-            'all.equal.formula', 'all.equal.language', 'all.equal.list', 'all.equal.numeric', 'all.equal.POSIXct',
-            'all.equal.raw', 'all.names', 'all.vars', 'any', 'aperm', 'append', 'apply', 'Arg', 'args', 'array', 'as.array',
-            'as.array.default', 'as.call', 'as.character', 'as.character.condition', 'as.character.Date', 'as.character.default',
-            'as.character.error', 'as.character.factor', 'as.character.hexmode', 'as.character.numeric_version', 'as.character.octmode',
-            'as.character.POSIXt', 'as.character.srcref', 'as.complex', 'as.data.frame', 'as.data.frame.array', 'as.data.frame.AsIs',
-            'as.data.frame.character', 'as.data.frame.complex', 'as.data.frame.data.frame', 'as.data.frame.Date', 'as.data.frame.default',
-            'as.data.frame.difftime', 'as.data.frame.factor', 'as.data.frame.integer', 'as.data.frame.list', 'as.data.frame.logical',
-            'as.data.frame.matrix', 'as.data.frame.model.matrix', 'as.data.frame.numeric', 'as.data.frame.numeric_version',
-            'as.data.frame.ordered', 'as.data.frame.POSIXct', 'as.data.frame.POSIXlt', 'as.data.frame.raw', 'as.data.frame.table',
-            'as.data.frame.ts', 'as.data.frame.vector', 'as.Date', 'as.Date.character', 'as.Date.date', 'as.Date.dates',
-            'as.Date.default', 'as.Date.factor', 'as.Date.numeric', 'as.Date.POSIXct', 'as.Date.POSIXlt', 'as.difftime', 'as.double',
-            'as.double.difftime', 'as.double.POSIXlt', 'as.environment', 'as.expression', 'as.expression.default', 'as.factor',
-            'as.function', 'as.function.default', 'as.hexmode', 'as.integer', 'as.list', 'as.list.data.frame', 'as.list.default',
-            'as.list.environment', 'as.list.factor', 'as.list.function', 'as.list.numeric_version', 'as.logical', 'as.matrix',
-            'as.matrix.data.frame', 'as.matrix.default', 'as.matrix.noquote', 'as.matrix.POSIXlt', 'as.name', 'as.null', 'as.null.default',
-            'as.numeric', 'as.numeric_version', 'as.octmode', 'as.ordered', 'as.package_version', 'as.pairlist', 'as.POSIXct',
-            'as.POSIXct.date', 'as.POSIXct.Date', 'as.POSIXct.dates', 'as.POSIXct.default', 'as.POSIXct.numeric', 'as.POSIXct.POSIXlt',
-            'as.POSIXlt', 'as.POSIXlt.character', 'as.POSIXlt.date', 'as.POSIXlt.Date', 'as.POSIXlt.dates', 'as.POSIXlt.default',
-            'as.POSIXlt.factor', 'as.POSIXlt.numeric', 'as.POSIXlt.POSIXct', 'as.qr', 'as.raw', 'as.real', 'as.single',
-            'as.single.default', 'as.symbol', 'as.table', 'as.table.default', 'as.vector', 'as.vector.factor', 'asin', 'asinh',
-            'asNamespace', 'asS4', 'assign', 'atan', 'atan2', 'atanh', 'attach', 'attachNamespace', 'attr', 'attr.all.equal',
-            'attr<-', 'attributes', 'attributes<-', 'autoload', 'autoloader', 'backsolve', 'baseenv', 'basename', 'besselI',
-            'besselJ', 'besselK', 'besselY', 'beta', 'bindingIsActive', 'bindingIsLocked', 'bindtextdomain', 'body', 'body<-',
-            'bquote', 'break', 'browser', 'builtins', 'by', 'by.data.frame', 'by.default', 'bzfile', 'c', 'c.Date', 'c.noquote',
-            'c.numeric_version', 'c.POSIXct', 'c.POSIXlt', 'call', 'callCC', 'capabilities', 'casefold', 'cat', 'category',
-            'cbind', 'cbind.data.frame', 'ceiling', 'char.expand', 'character', 'charmatch', 'charToRaw', 'chartr', 'check_tzones',
-            'chol', 'chol.default', 'chol2inv', 'choose', 'class', 'class<-', 'close', 'close.connection', 'close.srcfile',
-            'closeAllConnections', 'codes', 'codes.factor', 'codes.ordered', 'codes<-', 'col', 'colMeans', 'colnames',
-            'colnames<-', 'colSums', 'commandArgs', 'comment', 'comment<-', 'complex', 'computeRestarts', 'conditionCall',
-            'conditionCall.condition', 'conditionMessage', 'conditionMessage.condition', 'conflicts', 'Conj', 'contributors',
-            'cos', 'cosh', 'crossprod', 'Cstack_info', 'cummax', 'cummin', 'cumprod', 'cumsum', 'cut', 'cut.Date', 'cut.default',
-            'cut.POSIXt', 'data.class', 'data.frame', 'data.matrix', 'date', 'debug', 'default.stringsAsFactors', 'delay',
-            'delayedAssign', 'deparse', 'det', 'detach', 'determinant', 'determinant.matrix', 'dget', 'diag', 'diag<-', 'diff',
-            'diff.Date', 'diff.default', 'diff.POSIXt', 'difftime', 'digamma', 'dim', 'dim.data.frame', 'dim<-', 'dimnames',
-            'dimnames.data.frame', 'dimnames<-', 'dimnames<-.data.frame', 'dir', 'dir.create', 'dirname', 'do.call', 'double',
-            'dput', 'dQuote', 'drop', 'dump', 'duplicated', 'duplicated.array', 'duplicated.data.frame', 'duplicated.default',
-            'duplicated.matrix', 'duplicated.numeric_version', 'duplicated.POSIXlt', 'dyn.load', 'dyn.unload', 'eapply', 'eigen',
-            'emptyenv', 'encodeString', 'Encoding', 'Encoding<-', 'env.profile', 'environment', 'environment<-', 'environmentIsLocked',
-            'environmentName', 'eval', 'eval.parent', 'evalq', 'exists', 'exp', 'expand.grid', 'expm1', 'expression', 'F', 'factor',
-            'factorial', 'fifo', 'file', 'file.access', 'file.append', 'file.choose', 'file.copy', 'file.create', 'file.exists',
-            'file.info', 'file.path', 'file.remove', 'file.rename', 'file.show', 'file.symlink', 'Filter', 'Find', 'findInterval',
-            'findPackageEnv', 'findRestart', 'floor', 'flush', 'flush.connection', 'for', 'force', 'formals', 'formals<-',
-            'format', 'format.AsIs', 'format.char', 'format.data.frame', 'format.Date', 'format.default', 'format.difftime',
-            'format.factor', 'format.hexmode', 'format.info', 'format.octmode', 'format.POSIXct', 'format.POSIXlt',
-            'format.pval', 'formatC', 'formatDL', 'forwardsolve', 'function', 'gamma', 'gammaCody', 'gc', 'gc.time',
-            'gcinfo', 'gctorture', 'get', 'getAllConnections', 'getCallingDLL', 'getCallingDLLe', 'getCConverterDescriptions',
-            'getCConverterStatus', 'getConnection', 'getDLLRegisteredRoutines', 'getDLLRegisteredRoutines.character',
-            'getDLLRegisteredRoutines.DLLInfo', 'getenv', 'geterrmessage', 'getExportedValue', 'getHook', 'getLoadedDLLs',
-            'getNamespace', 'getNamespaceExports', 'getNamespaceImports', 'getNamespaceInfo', 'getNamespaceName',
-            'getNamespaceUsers', 'getNamespaceVersion', 'getNativeSymbolInfo', 'getNumCConverters', 'getOption', 'getRversion',
-            'getSrcLines', 'getTaskCallbackNames', 'gettext', 'gettextf', 'getwd', 'gl', 'globalenv', 'gregexpr', 'grep',
-            'grepl', 'gsub', 'gzcon', 'gzfile', 'httpclient', 'I', 'iconv', 'iconvlist', 'icuSetCollate', 'identical', 'identity',
-            'if', 'ifelse', 'Im', 'importIntoEnv', 'inherits', 'integer', 'interaction', 'interactive', 'intersect', 'intToBits',
-            'intToUtf8', 'inverse.rle', 'invisible', 'invokeRestart', 'invokeRestartInteractively', 'is.array', 'is.atomic',
-            'is.call', 'is.character', 'is.complex', 'is.data.frame', 'is.double', 'is.element', 'is.environment',
-            'is.expression', 'is.factor', 'is.finite', 'is.function', 'is.infinite', 'is.integer', 'is.language',
-            'is.list', 'is.loaded', 'is.logical', 'is.matrix', 'is.na', 'is.na.data.frame', 'is.na.POSIXlt', 'is.na<-',
-            'is.na<-.default', 'is.na<-.factor', 'is.name', 'is.nan', 'is.null', 'is.numeric', 'is.numeric_version',
-            'is.numeric.Date', 'is.numeric.POSIXt', 'is.object', 'is.ordered', 'is.package_version', 'is.pairlist', 'is.primitive',
-            'is.qr', 'is.R', 'is.raw', 'is.real', 'is.recursive', 'is.single', 'is.symbol', 'is.table', 'is.unsorted', 'is.vector',
-            'isBaseNamespace', 'isdebugged', 'isIncomplete', 'isNamespace', 'ISOdate', 'ISOdatetime', 'isOpen', 'isRestart', 'isS4',
-            'isSeekable', 'isSymmetric', 'isSymmetric.matrix', 'isTRUE', 'jitter', 'julian', 'julian.Date', 'julian.POSIXt', 'kappa',
-            'kappa.default', 'kappa.lm', 'kappa.qr', 'kappa.tri', 'kronecker', 'l10n_info', 'La.chol', 'La.chol2inv', 'La.eigen',
-            'La.svd', 'labels', 'labels.default', 'lapply', 'lazyLoad', 'lazyLoadDBfetch', 'lbeta', 'lchoose', 'length', 'length<-',
-            'length<-.factor', 'letters', 'LETTERS', 'levels', 'levels.default', 'levels<-', 'levels<-.factor', 'lfactorial', 'lgamma',
-            'library', 'library.dynam', 'library.dynam.unload', 'licence', 'license', 'list', 'list.files', 'load', 'loadedNamespaces',
-            'loadingNamespaceInfo', 'loadNamespace', 'loadURL', 'local', 'lockBinding', 'lockEnvironment', 'log', 'log10', 'log1p', 'log2',
-            'logb', 'logical', 'lower.tri', 'ls', 'machine', 'Machine', 'make.names', 'make.unique', 'makeActiveBinding', 'manglePackageName',
-            'Map', 'mapply', 'margin.table', 'mat.or.vec', 'match', 'match.arg', 'match.call', 'match.fun', 'Math.data.frame', 'Math.Date',
-            'Math.difftime', 'Math.factor', 'Math.POSIXt', 'matrix', 'max', 'max.col', 'mean', 'mean.data.frame', 'mean.Date', 'mean.default',
-            'mean.difftime', 'mean.POSIXct', 'mean.POSIXlt', 'mem.limits', 'memory.profile', 'merge', 'merge.data.frame', 'merge.default',
-            'message', 'mget', 'min', 'missing', 'Mod', 'mode', 'mode<-', 'month.abb', 'month.name', 'months', 'months.Date',
-            'months.POSIXt', 'mostattributes<-', 'names', 'names<-', 'namespaceExport', 'namespaceImport', 'namespaceImportClasses',
-            'namespaceImportFrom', 'namespaceImportMethods', 'nargs', 'nchar', 'ncol', 'NCOL', 'Negate', 'new.env', 'next', 'NextMethod',
-            'ngettext', 'nlevels', 'noquote', 'nrow', 'NROW', 'numeric', 'numeric_version', 'nzchar', 'objects', 'oldClass',
-            'oldClass<-', 'on.exit', 'open', 'open.connection', 'open.srcfile', 'open.srcfilecopy', 'Ops.data.frame', 'Ops.Date',
-            'Ops.difftime', 'Ops.factor', 'Ops.numeric_version', 'Ops.ordered', 'Ops.POSIXt', 'options', 'order', 'ordered',
-            'outer', 'package_version', 'package.description', 'packageEvent', 'packageHasNamespace', 'packageStartupMessage',
-            'packBits', 'pairlist', 'parent.env', 'parent.env<-', 'parent.frame', 'parse', 'parse.dcf', 'parseNamespaceFile',
-            'paste', 'path.expand', 'pentagamma', 'pi', 'pipe', 'Platform', 'pmatch', 'pmax', 'pmax.int', 'pmin', 'pmin.int',
-            'polyroot', 'pos.to.env', 'Position', 'pretty', 'prettyNum', 'print', 'print.AsIs', 'print.atomic', 'print.by',
-            'print.condition', 'print.connection', 'print.data.frame', 'print.Date', 'print.default', 'print.difftime',
-            'print.DLLInfo', 'print.DLLInfoList', 'print.DLLRegisteredRoutines', 'print.factor', 'print.hexmode', 'print.libraryIQR',
-            'print.listof', 'print.NativeRoutineList', 'print.noquote', 'print.numeric_version', 'print.octmode', 'print.packageInfo',
-            'print.POSIXct', 'print.POSIXlt', 'print.proc_time', 'print.restart', 'print.rle', 'print.simple.list',
-            'print.srcfile', 'print.srcref', 'print.summary.table', 'print.table', 'print.warnings', 'printNoClass',
-            'prmatrix', 'proc.time', 'prod', 'prop.table', 'provide', 'psigamma', 'pushBack', 'pushBackLength', 'q', 'qr',
-            'qr.coef', 'qr.default', 'qr.fitted', 'qr.Q', 'qr.qty', 'qr.qy', 'qr.R', 'qr.resid', 'qr.solve', 'qr.X', 'quarters',
-            'quarters.Date', 'quarters.POSIXt', 'quit', 'quote', 'R_system_version', 'R.home', 'R.version', 'R.Version',
-            'R.version.string', 'range', 'range.default', 'rank', 'rapply', 'raw', 'rawConnection', 'rawConnectionValue',
-            'rawShift', 'rawToBits', 'rawToChar', 'rbind', 'rbind.data.frame', 'rcond', 'Re', 'read.dcf', 'read.table.url',
-            'readBin', 'readChar', 'readline', 'readLines', 'real', 'Recall', 'Reduce', 'reg.finalizer', 'regexpr',
-            'registerS3method', 'registerS3methods', 'remove', 'removeCConverter', 'removeTaskCallback', 'rep', 'rep.Date',
-            'rep.factor', 'rep.int', 'rep.numeric_version', 'rep.POSIXct', 'rep.POSIXlt', 'repeat', 'replace', 'replicate',
-            'require', 'restart', 'restartDescription', 'restartFormals', 'retracemem', 'return', 'rev', 'rev.default', 'rle',
-            'rm', 'RNGkind', 'RNGversion', 'round', 'round.Date', 'round.difftime', 'round.POSIXt', 'row', 'row.names',
-            'row.names.data.frame', 'row.names.default', 'row.names<-', 'row.names<-.data.frame', 'row.names<-.default',
-            'rowMeans', 'rownames', 'rownames<-', 'rowsum', 'rowsum.data.frame', 'rowsum.default', 'rowSums', 'sample',
-            'sample.int', 'sapply', 'save', 'save.image', 'saveNamespaceImage', 'scale', 'scale.default', 'scan', 'scan.url',
-            'search', 'searchpaths', 'seek', 'seek.connection', 'seq', 'seq_along', 'seq_len', 'seq.Date', 'seq.default',
-            'seq.int', 'seq.POSIXt', 'sequence', 'serialize', 'set.seed', 'setCConverterStatus', 'setdiff', 'setequal',
-            'setHook', 'setNamespaceInfo', 'setSessionTimeLimit', 'setTimeLimit', 'setwd', 'showConnections', 'shQuote',
-            'sign', 'signalCondition', 'signif', 'simpleCondition', 'simpleError', 'simpleMessage', 'simpleWarning', 'sin',
-            'single', 'sinh', 'sink', 'sink.number', 'slice.index', 'socketConnection', 'socketSelect', 'solve', 'solve.default',
-            'solve.qr', 'sort', 'sort.default', 'sort.int', 'sort.list', 'sort.POSIXlt', 'source', 'source.url', 'split',
-            'split.data.frame', 'split.Date', 'split.default', 'split.POSIXct', 'split<-', 'split<-.data.frame', 'split<-.default',
-            'sprintf', 'sqrt', 'sQuote', 'srcfile', 'srcfilecopy', 'srcref', 'standardGeneric', 'stderr', 'stdin', 'stdout',
-            'stop', 'stopifnot', 'storage.mode', 'storage.mode<-', 'strftime', 'strptime', 'strsplit', 'strtrim', 'structure',
-            'strwrap', 'sub', 'subset', 'subset.data.frame', 'subset.default', 'subset.matrix', 'substitute', 'substr',
-            'substr<-', 'substring', 'substring<-', 'sum', 'summary', 'summary.connection', 'summary.data.frame',
-            'Summary.data.frame', 'summary.Date', 'Summary.Date', 'summary.default', 'Summary.difftime',
-            'summary.factor', 'Summary.factor', 'summary.matrix', 'Summary.numeric_version', 'summary.POSIXct',
-            'Summary.POSIXct', 'summary.POSIXlt', 'Summary.POSIXlt', 'summary.table', 'suppressMessages',
-            'suppressPackageStartupMessages', 'suppressWarnings', 'svd', 'sweep', 'switch', 'symbol.C',
-            'symbol.For', 'sys.call', 'sys.calls', 'Sys.chmod', 'Sys.Date', 'sys.frame', 'sys.frames',
-            'sys.function', 'Sys.getenv', 'Sys.getlocale', 'Sys.getpid', 'Sys.glob', 'Sys.info', 'sys.load.image',
-            'Sys.localeconv', 'sys.nframe', 'sys.on.exit', 'sys.parent', 'sys.parents', 'Sys.putenv',
-            'sys.save.image', 'Sys.setenv', 'Sys.setlocale', 'Sys.sleep', 'sys.source', 'sys.status',
-            'Sys.time', 'Sys.timezone', 'Sys.umask', 'Sys.unsetenv', 'Sys.which', 'system', 'system.file',
-            'system.time', 't', 'T', 't.data.frame', 't.default', 'table', 'tabulate', 'tan', 'tanh', 'tapply',
-            'taskCallbackManager', 'tcrossprod', 'tempdir', 'tempfile', 'testPlatformEquivalence', 'tetragamma',
-            'textConnection', 'textConnectionValue', 'tolower', 'topenv', 'toString', 'toString.default', 'toupper',
-            'trace', 'traceback', 'tracemem', 'tracingState', 'transform', 'transform.data.frame', 'transform.default',
-            'trigamma', 'trunc', 'trunc.Date', 'trunc.POSIXt', 'truncate', 'truncate.connection', 'try', 'tryCatch',
-            'typeof', 'unclass', 'undebug', 'union', 'unique', 'unique.array', 'unique.data.frame', 'unique.default',
-            'unique.matrix', 'unique.numeric_version', 'unique.POSIXlt', 'units', 'units.difftime', 'units<-',
-            'units<-.difftime', 'unix', 'unix.time', 'unlink', 'unlist', 'unloadNamespace', 'unlockBinding',
-            'unname', 'unserialize', 'unsplit', 'untrace', 'untracemem', 'unz', 'upper.tri', 'url', 'UseMethod',
-            'utf8ToInt', 'vector', 'Vectorize', 'version', 'Version', 'warning', 'warnings', 'weekdays',
-            'weekdays.Date', 'weekdays.POSIXt', 'which', 'which.max', 'which.min', 'while', 'with',
-            'with.default', 'withCallingHandlers', 'within', 'within.data.frame', 'within.list', 'withRestarts',
-            'withVisible', 'write', 'write.dcf', 'write.table0', 'writeBin', 'writeChar', 'writeLines', 'xor',
-            'xpdrows.data.frame', 'xtfrm', 'xtfrm.Date', 'xtfrm.default', 'xtfrm.factor', 'xtfrm.numeric_version',
-            'xtfrm.POSIXct', 'xtfrm.POSIXlt', 'xtfrm.Surv', 'zapsmall',
-            ),
-        3 => array( // Datasets
-            'ability.cov', 'airmiles', 'AirPassengers', 'airquality',
-            'anscombe', 'attenu', 'attitude', 'austres', 'beaver1',
-            'beaver2', 'BJsales', 'BJsales.lead', 'BOD', 'cars',
-            'ChickWeight', 'chickwts', 'co2', 'crimtab',
-            'discoveries', 'DNase', 'esoph', 'euro', 'euro.cross',
-            'eurodist', 'EuStockMarkets', 'faithful', 'fdeaths',
-            'Formaldehyde', 'freeny', 'freeny.x', 'freeny.y',
-            'HairEyeColor', 'Harman23.cor', 'Harman74.cor', 'Indometh',
-            'infert', 'InsectSprays', 'iris', 'iris3', 'islands',
-            'JohnsonJohnson', 'LakeHuron', 'ldeaths', 'lh', 'LifeCycleSavings',
-            'Loblolly', 'longley', 'lynx', 'mdeaths', 'morley', 'mtcars',
-            'nhtemp', 'Nile', 'nottem', 'occupationalStatus', 'Orange',
-            'OrchardSprays', 'PlantGrowth', 'precip', 'presidents',
-            'pressure', 'Puromycin', 'quakes', 'randu', 'rivers', 'rock',
-            'Seatbelts', 'sleep', 'stack.loss', 'stack.x', 'stackloss',
-            'state.abb', 'state.area', 'state.center', 'state.division',
-            'state.name', 'state.region', 'state.x77', 'sunspot.month',
-            'sunspot.year', 'sunspots', 'swiss', 'Theoph', 'Titanic', 'ToothGrowth',
-            'treering', 'trees', 'UCBAdmissions', 'UKDriverDeaths', 'UKgas',
-            'USAccDeaths', 'USArrests', 'USJudgeRatings', 'USPersonalExpenditure',
-            'uspop', 'VADeaths', 'volcano', 'warpbreaks', 'women', 'WorldPhones',
-            'WWWusage',
-            ),
-        4 => array( // graphics package
-            'abline', 'arrows', 'assocplot', 'axis', 'Axis', 'axis.Date', 'axis.POSIXct',
-            'axTicks', 'barplot', 'barplot.default', 'box', 'boxplot', 'boxplot.default',
-            'boxplot.matrix', 'bxp', 'cdplot', 'clip', 'close.screen', 'co.intervals',
-            'contour', 'contour.default', 'coplot', 'curve', 'dotchart', 'erase.screen',
-            'filled.contour', 'fourfoldplot', 'frame', 'grconvertX', 'grconvertY', 'grid',
-            'hist', 'hist.default', 'identify', 'image', 'image.default', 'layout',
-            'layout.show', 'lcm', 'legend', 'lines', 'lines.default', 'locator', 'matlines',
-            'matplot', 'matpoints', 'mosaicplot', 'mtext', 'pairs', 'pairs.default',
-            'panel.smooth', 'par', 'persp', 'pie', 'piechart', 'plot', 'plot.default',
-            'plot.design', 'plot.new', 'plot.window', 'plot.xy', 'points', 'points.default',
-            'polygon', 'rect', 'rug', 'screen', 'segments', 'smoothScatter', 'spineplot',
-            'split.screen', 'stars', 'stem', 'strheight', 'stripchart', 'strwidth', 'sunflowerplot',
-            'symbols', 'text', 'text.default', 'title', 'xinch', 'xspline', 'xyinch', 'yinch',
-            ),
-        5 => array( // grDevices pkg
-            'as.graphicsAnnot', 'bitmap', 'blues9', 'bmp', 'boxplot.stats', 'cairo_pdf', 'cairo_ps', 'check.options',
-            'chull', 'CIDFont', 'cm', 'cm.colors', 'col2rgb', 'colorConverter', 'colorRamp', 'colorRampPalette',
-            'colors', 'colorspaces', 'colours', 'contourLines', 'convertColor', 'densCols', 'dev.control', 'dev.copy',
-            'dev.copy2eps', 'dev.copy2pdf', 'dev.cur', 'dev.interactive', 'dev.list', 'dev.new', 'dev.next', 'dev.off',
-            'dev.prev', 'dev.print', 'dev.set', 'dev.size', 'dev2bitmap', 'devAskNewPage', 'deviceIsInteractive',
-            'embedFonts', 'extendrange', 'getGraphicsEvent', 'graphics.off', 'gray', 'gray.colors', 'grey', 'grey.colors',
-            'hcl', 'heat.colors', 'Hershey', 'hsv', 'jpeg', 'make.rgb', 'n2mfrow', 'nclass.FD', 'nclass.scott',
-            'nclass.Sturges', 'palette', 'pdf', 'pdf.options', 'pdfFonts', 'pictex', 'png', 'postscript', 'postscriptFont',
-            'postscriptFonts', 'ps.options', 'quartz', 'quartz.options', 'quartzFont', 'quartzFonts', 'rainbow',
-            'recordGraphics', 'recordPlot', 'replayPlot', 'rgb', 'rgb2hsv', 'savePlot', 'setEPS', 'setPS', 'svg',
-            'terrain.colors', 'tiff', 'topo.colors', 'trans3d', 'Type1Font', 'x11', 'X11', 'X11.options', 'X11Font',
-            'X11Fonts', 'xfig', 'xy.coords', 'xyTable', 'xyz.coords',
-            ),
-        6 => array( // methods package
-            'addNextMethod', 'allGenerics', 'allNames', 'Arith', 'as', 'as<-',
-            'asMethodDefinition', 'assignClassDef', 'assignMethodsMetaData', 'balanceMethodsList',
-            'cacheGenericsMetaData', 'cacheMetaData', 'cacheMethod', 'callGeneric',
-            'callNextMethod', 'canCoerce', 'cbind2', 'checkSlotAssignment', 'classesToAM',
-            'classMetaName', 'coerce', 'coerce<-', 'Compare', 'completeClassDefinition',
-            'completeExtends', 'completeSubclasses', 'Complex', 'conformMethod', 'defaultDumpName',
-            'defaultPrototype', 'doPrimitiveMethod', 'dumpMethod', 'dumpMethods', 'el', 'el<-',
-            'elNamed', 'elNamed<-', 'empty.dump', 'emptyMethodsList', 'existsFunction', 'existsMethod',
-            'extends', 'finalDefaultMethod', 'findClass', 'findFunction', 'findMethod', 'findMethods',
-            'findMethodSignatures', 'findUnique', 'fixPre1.8', 'formalArgs', 'functionBody',
-            'functionBody<-', 'generic.skeleton', 'getAccess', 'getAllMethods', 'getAllSuperClasses',
-            'getClass', 'getClassDef', 'getClasses', 'getClassName', 'getClassPackage', 'getDataPart',
-            'getExtends', 'getFunction', 'getGeneric', 'getGenerics', 'getGroup', 'getGroupMembers',
-            'getMethod', 'getMethods', 'getMethodsForDispatch', 'getMethodsMetaData', 'getPackageName',
-            'getProperties', 'getPrototype', 'getSlots', 'getSubclasses', 'getValidity', 'getVirtual',
-            'hasArg', 'hasMethod', 'hasMethods', 'implicitGeneric', 'initialize', 'insertMethod', 'is',
-            'isClass', 'isClassDef', 'isClassUnion', 'isGeneric', 'isGrammarSymbol', 'isGroup',
-            'isSealedClass', 'isSealedMethod', 'isVirtualClass', 'isXS3Class', 'languageEl', 'languageEl<-',
-            'linearizeMlist', 'listFromMethods', 'listFromMlist', 'loadMethod', 'Logic',
-            'makeClassRepresentation', 'makeExtends', 'makeGeneric', 'makeMethodsList',
-            'makePrototypeFromClassDef', 'makeStandardGeneric', 'matchSignature', 'Math', 'Math2', 'mergeMethods',
-            'metaNameUndo', 'method.skeleton', 'MethodAddCoerce', 'methodSignatureMatrix', 'MethodsList',
-            'MethodsListSelect', 'methodsPackageMetaName', 'missingArg', 'mlistMetaName', 'new', 'newBasic',
-            'newClassRepresentation', 'newEmptyObject', 'Ops', 'packageSlot', 'packageSlot<-', 'possibleExtends',
-            'prohibitGeneric', 'promptClass', 'promptMethods', 'prototype', 'Quote', 'rbind2',
-            'reconcilePropertiesAndPrototype', 'registerImplicitGenerics', 'rematchDefinition',
-            'removeClass', 'removeGeneric', 'removeMethod', 'removeMethods', 'removeMethodsObject', 'representation',
-            'requireMethods', 'resetClass', 'resetGeneric', 'S3Class', 'S3Class<-', 'S3Part', 'S3Part<-', 'sealClass',
-            'seemsS4Object', 'selectMethod', 'selectSuperClasses', 'sessionData', 'setAs', 'setClass', 'setClassUnion',
-            'setDataPart', 'setGeneric', 'setGenericImplicit', 'setGroupGeneric', 'setIs', 'setMethod', 'setOldClass',
-            'setPackageName', 'setPrimitiveMethods', 'setReplaceMethod', 'setValidity', 'show', 'showClass', 'showDefault',
-            'showExtends', 'showMethods', 'showMlist', 'signature', 'SignatureMethod', 'sigToEnv', 'slot', 'slot<-',
-            'slotNames', 'slotsFromS3', 'substituteDirect', 'substituteFunctionArgs', 'Summary', 'superClassDepth',
-            'testInheritedMethods', 'testVirtual', 'traceOff', 'traceOn', 'tryNew', 'trySilent', 'unRematchDefinition',
-            'validObject', 'validSlotNames',
-            ),
-        7 => array( // stats pkg
-            'acf', 'acf2AR', 'add.scope', 'add1', 'addmargins', 'aggregate',
-            'aggregate.data.frame', 'aggregate.default', 'aggregate.ts', 'AIC',
-            'alias', 'anova', 'anova.glm', 'anova.glmlist', 'anova.lm', 'anova.lmlist',
-            'anova.mlm', 'anovalist.lm', 'ansari.test', 'aov', 'approx', 'approxfun',
-            'ar', 'ar.burg', 'ar.mle', 'ar.ols', 'ar.yw', 'arima', 'arima.sim',
-            'arima0', 'arima0.diag', 'ARMAacf', 'ARMAtoMA', 'as.dendrogram', 'as.dist',
-            'as.formula', 'as.hclust', 'as.stepfun', 'as.ts', 'asOneSidedFormula', 'ave',
-            'bandwidth.kernel', 'bartlett.test', 'binom.test', 'binomial', 'biplot',
-            'Box.test', 'bw.bcv', 'bw.nrd', 'bw.nrd0', 'bw.SJ', 'bw.ucv', 'C', 'cancor',
-            'case.names', 'ccf', 'chisq.test', 'clearNames', 'cmdscale', 'coef', 'coefficients',
-            'complete.cases', 'confint', 'confint.default', 'constrOptim', 'contr.helmert',
-            'contr.poly', 'contr.SAS', 'contr.sum', 'contr.treatment', 'contrasts', 'contrasts<-',
-            'convolve', 'cooks.distance', 'cophenetic', 'cor', 'cor.test', 'cov', 'cov.wt',
-            'cov2cor', 'covratio', 'cpgram', 'cutree', 'cycle', 'D', 'dbeta', 'dbinom', 'dcauchy',
-            'dchisq', 'decompose', 'delete.response', 'deltat', 'dendrapply', 'density', 'density.default',
-            'deriv', 'deriv.default', 'deriv.formula', 'deriv3', 'deriv3.default', 'deriv3.formula',
-            'deviance', 'dexp', 'df', 'df.kernel', 'df.residual', 'dfbeta', 'dfbetas', 'dffits',
-            'dgamma', 'dgeom', 'dhyper', 'diff.ts', 'diffinv', 'dist', 'dlnorm', 'dlogis',
-            'dmultinom', 'dnbinom', 'dnorm', 'dpois', 'drop.scope', 'drop.terms', 'drop1',
-            'dsignrank', 'dt', 'dummy.coef', 'dunif', 'dweibull', 'dwilcox', 'ecdf', 'eff.aovlist',
-            'effects', 'embed', 'end', 'estVar', 'expand.model.frame', 'extractAIC', 'factanal',
-            'factor.scope', 'family', 'fft', 'filter', 'fisher.test', 'fitted', 'fitted.values',
-            'fivenum', 'fligner.test', 'formula', 'frequency', 'friedman.test', 'ftable', 'Gamma',
-            'gaussian', 'get_all_vars', 'getInitial', 'glm', 'glm.control', 'glm.fit', 'glm.fit.null',
-            'hasTsp', 'hat', 'hatvalues', 'hatvalues.lm', 'hclust', 'heatmap', 'HoltWinters', 'influence',
-            'influence.measures', 'integrate', 'interaction.plot', 'inverse.gaussian', 'IQR',
-            'is.empty.model', 'is.leaf', 'is.mts', 'is.stepfun', 'is.ts', 'is.tskernel', 'isoreg',
-            'KalmanForecast', 'KalmanLike', 'KalmanRun', 'KalmanSmooth', 'kernapply', 'kernel', 'kmeans',
-            'knots', 'kruskal.test', 'ks.test', 'ksmooth', 'lag', 'lag.plot', 'line', 'lines.ts', 'lm',
-            'lm.fit', 'lm.fit.null', 'lm.influence', 'lm.wfit', 'lm.wfit.null', 'loadings', 'loess',
-            'loess.control', 'loess.smooth', 'logLik', 'loglin', 'lowess', 'ls.diag', 'ls.print', 'lsfit',
-            'mad', 'mahalanobis', 'make.link', 'makeARIMA', 'makepredictcall', 'manova', 'mantelhaen.test',
-            'mauchley.test', 'mauchly.test', 'mcnemar.test', 'median', 'median.default', 'medpolish',
-            'model.extract', 'model.frame', 'model.frame.aovlist', 'model.frame.default', 'model.frame.glm',
-            'model.frame.lm', 'model.matrix', 'model.matrix.default', 'model.matrix.lm', 'model.offset',
-            'model.response', 'model.tables', 'model.weights', 'monthplot', 'mood.test', 'mvfft', 'na.action',
-            'na.contiguous', 'na.exclude', 'na.fail', 'na.omit', 'na.pass', 'napredict', 'naprint', 'naresid',
-            'nextn', 'nlm', 'nlminb', 'nls', 'nls.control', 'NLSstAsymptotic', 'NLSstClosestX', 'NLSstLfAsymptote',
-            'NLSstRtAsymptote', 'numericDeriv', 'offset', 'oneway.test', 'optim', 'optimise', 'optimize',
-            'order.dendrogram', 'p.adjust', 'p.adjust.methods', 'pacf', 'pairwise.prop.test', 'pairwise.t.test',
-            'pairwise.table', 'pairwise.wilcox.test', 'pbeta', 'pbinom', 'pbirthday', 'pcauchy', 'pchisq', 'pexp',
-            'pf', 'pgamma', 'pgeom', 'phyper', 'plclust', 'plnorm', 'plogis', 'plot.density', 'plot.ecdf', 'plot.lm',
-            'plot.mlm', 'plot.spec', 'plot.spec.coherency', 'plot.spec.phase', 'plot.stepfun', 'plot.ts', 'plot.TukeyHSD',
-            'pnbinom', 'pnorm', 'poisson', 'poisson.test', 'poly', 'polym', 'power', 'power.anova.test', 'power.prop.test',
-            'power.t.test', 'PP.test', 'ppoints', 'ppois', 'ppr', 'prcomp', 'predict', 'predict.glm', 'predict.lm',
-            'predict.mlm', 'predict.poly', 'preplot', 'princomp', 'print.anova', 'print.coefmat', 'print.density',
-            'print.family', 'print.formula', 'print.ftable', 'print.glm', 'print.infl', 'print.integrate', 'print.lm',
-            'print.logLik', 'print.terms', 'print.ts', 'printCoefmat', 'profile', 'proj', 'promax', 'prop.test',
-            'prop.trend.test', 'psignrank', 'pt', 'ptukey', 'punif', 'pweibull', 'pwilcox', 'qbeta', 'qbinom',
-            'qbirthday', 'qcauchy', 'qchisq', 'qexp', 'qf', 'qgamma', 'qgeom', 'qhyper', 'qlnorm', 'qlogis',
-            'qnbinom', 'qnorm', 'qpois', 'qqline', 'qqnorm', 'qqnorm.default', 'qqplot', 'qsignrank', 'qt',
-            'qtukey', 'quade.test', 'quantile', 'quantile.default', 'quasi', 'quasibinomial', 'quasipoisson',
-            'qunif', 'qweibull', 'qwilcox', 'r2dtable', 'rbeta', 'rbinom', 'rcauchy', 'rchisq', 'read.ftable',
-            'rect.hclust', 'reformulate', 'relevel', 'reorder', 'replications', 'reshape', 'reshapeLong', 'reshapeWide',
-            'resid', 'residuals', 'residuals.default', 'residuals.glm', 'residuals.lm', 'rexp', 'rf', 'rgamma', 'rgeom',
-            'rhyper', 'rlnorm', 'rlogis', 'rmultinom', 'rnbinom', 'rnorm', 'rpois', 'rsignrank', 'rstandard', 'rstandard.glm',
-            'rstandard.lm', 'rstudent', 'rstudent.glm', 'rstudent.lm', 'rt', 'runif', 'runmed', 'rweibull', 'rwilcox',
-            'scatter.smooth', 'screeplot', 'sd', 'se.contrast', 'selfStart', 'setNames', 'shapiro.test', 'simulate',
-            'smooth', 'smooth.spline', 'smoothEnds', 'sortedXyData', 'spec.ar', 'spec.pgram', 'spec.taper', 'spectrum',
-            'spline', 'splinefun', 'splinefunH', 'SSasymp', 'SSasympOff', 'SSasympOrig', 'SSbiexp', 'SSD', 'SSfol',
-            'SSfpl', 'SSgompertz', 'SSlogis', 'SSmicmen', 'SSweibull', 'start', 'stat.anova', 'step', 'stepfun', 'stl',
-            'StructTS', 'summary.aov', 'summary.aovlist', 'summary.glm', 'summary.infl', 'summary.lm', 'summary.manova',
-            'summary.mlm', 'summary.stepfun', 'supsmu', 'symnum', 't.test', 'termplot', 'terms', 'terms.aovlist',
-            'terms.default', 'terms.formula', 'terms.terms', 'time', 'toeplitz', 'ts', 'ts.intersect', 'ts.plot',
-            'ts.union', 'tsdiag', 'tsp', 'tsp<-', 'tsSmooth', 'TukeyHSD', 'TukeyHSD.aov', 'uniroot', 'update',
-            'update.default', 'update.formula', 'var', 'var.test', 'variable.names', 'varimax', 'vcov', 'weighted.mean',
-            'weighted.residuals', 'weights', 'wilcox.test', 'window', 'window<-', 'write.ftable', 'xtabs',
-            ),
-        8 => array( // utils pkg
-            'alarm', 'apropos', 'argsAnywhere', 'as.person', 'as.personList', 'as.relistable', 'as.roman',
-            'assignInNamespace', 'available.packages', 'browseEnv', 'browseURL', 'browseVignettes', 'bug.report',
-            'capture.output', 'checkCRAN', 'chooseCRANmirror', 'citation', 'citEntry', 'citFooter', 'citHeader',
-            'close.socket', 'combn', 'compareVersion', 'contrib.url', 'count.fields', 'CRAN.packages', 'data',
-            'data.entry', 'dataentry', 'de', 'de.ncols', 'de.restore', 'de.setup', 'debugger', 'demo', 'download.file',
-            'download.packages', 'dump.frames', 'edit', 'emacs', 'example', 'file_test', 'file.edit', 'find', 'fix',
-            'fixInNamespace', 'flush.console', 'formatOL', 'formatUL', 'getAnywhere', 'getCRANmirrors', 'getFromNamespace',
-            'getS3method', 'getTxtProgressBar', 'glob2rx', 'head', 'head.matrix', 'help', 'help.request', 'help.search',
-            'help.start', 'history', 'index.search', 'install.packages', 'installed.packages', 'is.relistable',
-            'limitedLabels', 'loadhistory', 'localeToCharset', 'ls.str', 'lsf.str', 'make.packages.html', 'make.socket',
-            'makeRweaveLatexCodeRunner', 'memory.limit', 'memory.size', 'menu', 'methods', 'mirror2html', 'modifyList',
-            'new.packages', 'normalizePath', 'nsl', 'object.size', 'old.packages', 'package.contents', 'package.skeleton',
-            'packageDescription', 'packageStatus', 'page', 'person', 'personList', 'pico', 'prompt', 'promptData',
-            'promptPackage', 'rc.getOption', 'rc.options', 'rc.settings', 'rc.status', 'read.csv', 'read.csv2', 'read.delim',
-            'read.delim2', 'read.DIF', 'read.fortran', 'read.fwf', 'read.socket', 'read.table', 'readCitationFile', 'recover',
-            'relist', 'remove.packages', 'Rprof', 'Rprofmem', 'RShowDoc', 'RSiteSearch', 'rtags', 'Rtangle', 'RtangleSetup',
-            'RtangleWritedoc', 'RweaveChunkPrefix', 'RweaveEvalWithOpt', 'RweaveLatex', 'RweaveLatexFinish', 'RweaveLatexOptions',
-            'RweaveLatexSetup', 'RweaveLatexWritedoc', 'RweaveTryStop', 'savehistory', 'select.list', 'sessionInfo',
-            'setRepositories', 'setTxtProgressBar', 'stack', 'Stangle', 'str', 'strOptions', 'summaryRprof', 'Sweave',
-            'SweaveHooks', 'SweaveSyntaxLatex', 'SweaveSyntaxNoweb', 'SweaveSyntConv', 'tail', 'tail.matrix', 'timestamp',
-            'toBibtex', 'toLatex', 'txtProgressBar', 'type.convert', 'unstack', 'unzip', 'update.packages', 'update.packageStatus',
-            'upgrade', 'url.show', 'URLdecode', 'URLencode', 'vi', 'View', 'vignette', 'write.csv', 'write.csv2', 'write.socket',
-            'write.table', 'wsbrowser', 'xedit', 'xemacs', 'zip.file.extract',
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|','<-','->',
-        '^', '-', ':', '::', ':::', '!', '!=', '*', '?',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF; font-weight: bold;',
-            2 => 'color: #0000FF; font-weight: bold;',
-            3 => 'color: #CC9900; font-weight: bold;',
-            4 => 'color: #0000FF; font-weight: bold;',
-            5 => 'color: #0000FF; font-weight: bold;',
-            6 => 'color: #0000FF; font-weight: bold;',
-            7 => 'color: #0000FF; font-weight: bold;',
-            8 => 'color: #0000FF; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #228B22;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #080;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            1 => '',
-            2 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #080;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color:#A020F0;'
-            ),
-        'SCRIPT' => array(
-            0 => ''            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => 'http://stat.ethz.ch/R-manual/R-devel/library/base/html/{FNAME}.html', // Base Package
-        3 => 'http://stat.ethz.ch/R-manual/R-devel/library/datasets/html/{FNAME}.html', // Datasets
-        4 => 'http://stat.ethz.ch/R-manual/R-devel/library/graphics/html/{FNAME}.html', // Graphics Package
-        5 => 'http://stat.ethz.ch/R-manual/R-devel/library/grDevices/html/{FNAME}.html', // grDevices
-        6 => 'http://stat.ethz.ch/R-manual/R-devel/library/methods/html/{FNAME}.html', // methods
-        7 => 'http://stat.ethz.ch/R-manual/R-devel/library/stats/html/{FNAME}.html', // stats
-        8 => 'http://stat.ethz.ch/R-manual/R-devel/library/utils/html/{FNAME}.html' // utils
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        0 => array(
-            GESHI_SEARCH => "([^\w])'([^\\n\\r']*)'",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => "\\1'",
-            GESHI_AFTER => "'"
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#;>|^&\\.])(?<!\/html\/)",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-&;\\.])"
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/ruby.php b/inc/geshi/ruby.php
deleted file mode 100644
index f6eb1b1e3..000000000
--- a/inc/geshi/ruby.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/*************************************************************************************
- * ruby.php
- * --------
- * Author: Moises Deniz
- * Copyright: (c) 2007 Moises Deniz
- * Release Version: 1.0.8.11
- * Date Started: 2007/03/21
- *
- * Ruby language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2007/03/21 (1.0.7.19)
- *   -  Initial release
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Ruby',
-    'COMMENT_SINGLE' => array(1 => "#"),
-    'COMMENT_MULTI' => array("=begin" => "=end"),
-    'COMMENT_REGEXP' => array(
-        //Heredoc
-        4 => '/<<\s*?(\w+)\\n.*?\\n\\1(?![a-zA-Z0-9])/si',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '`','\''),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-                'alias', 'and', 'begin', 'break', 'case', 'class',
-                'def', 'defined', 'do', 'else', 'elsif', 'end',
-                'ensure', 'for', 'if', 'in', 'module', 'while',
-                'next', 'not', 'or', 'redo', 'rescue', 'yield',
-                'retry', 'super', 'then', 'undef', 'unless',
-                'until', 'when', 'include'
-            ),
-        2 => array(
-                '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
-                'return'
-            ),
-        3 => array(
-                'Array', 'Float', 'Integer', 'String', 'at_exit',
-                'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
-                'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
-                'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
-                'iterator?', 'lambda', 'load', 'local_variables', 'loop',
-                'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
-                'raise', 'rand', 'readline', 'readlines', 'require', 'select',
-                'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
-                'system', 'trace_var', 'trap', 'untrace_var'
-            ),
-        4 => array(
-                'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
-                'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
-                'CGI::HtmlExtension', 'CGI::QueryExtension',
-                'CGI::Session', 'CGI::Session::FileStore',
-                'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
-                'ConditionVariable', 'Continuation', 'Data',
-                'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
-                'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
-                'Exception', 'FalseClass', 'File',
-                'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
-                'FileUtils::DryRun', 'FileUtils::NoWrite',
-                'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
-                'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
-                'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
-                'Iconv::Failure', 'Iconv::IllegalSequence',
-                'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
-                'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
-                'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
-                'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
-                'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
-                'Logger::ShiftingError', 'Marshal', 'MatchData',
-                'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
-                'NameError::message', 'NilClass', 'NoMemoryError',
-                'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
-                'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
-                'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
-                'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
-                'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
-                'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
-                'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
-                'SingleForwardable', 'Singleton', 'SingletonClassMethods',
-                'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
-                'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
-                'SyncEnumerator', 'SyntaxError', 'SystemCallError',
-                'SystemExit', 'SystemStackError', 'Tempfile',
-                'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
-                'ThreadError', 'ThreadGroup',
-                'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
-                'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
-                'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
-                'URI::InvalidComponentError', 'URI::InvalidURIError',
-                'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
-                'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
-                'ZeroDivisionError', 'Zlib',
-                'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
-                'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
-                'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
-                'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
-                'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
-                'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
-                'Zlib::VersionError',
-                'Zlib::ZStream',
-                'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
-                'Inflector::Inflections', 'Mime', 'Mime::Type',
-                'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
-        '+', '-', '=>', '<<'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color:#9966CC; font-weight:bold;',
-            2 => 'color:#0000FF; font-weight:bold;',
-            3 => 'color:#CC0066; font-weight:bold;',
-            4 => 'color:#CC00FF; font-weight:bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color:#008000; font-style:italic;',
-            4 => 'color: #cc0000; font-style: italic;',
-            'MULTI' => 'color:#000080; font-style:italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color:#000099;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color:#006600; font-weight:bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color:#996600;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color:#006666;'
-            ),
-        'METHODS' => array(
-            1 => 'color:#9900CC;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color:#006600; font-weight:bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color:#ff6633; font-weight:bold;',
-            1 => 'color:#0066ff; font-weight:bold;',
-            2 => 'color:#6666ff; font-weight:bold;',
-            3 => 'color:#ff3333; font-weight:bold;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        0 => array(//Variables
-            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        1 => array(//Arrays
-            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*",//Static OOP symbols
-        3 => array(
-            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<%' => '%>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        ),
-    'TAB_WIDTH' => 2
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/sas.php b/inc/geshi/sas.php
deleted file mode 100644
index dbf95a14e..000000000
--- a/inc/geshi/sas.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/*************************************************************************************
- * sas.php
- * -------
- * Author: Galen Johnson (solitaryr@gmail.com)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2005/12/27
- *
- * SAS language file for GeSHi. Based on the sas vim file.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- *   -  Cleaned up code style
- * 2005/12/27 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2005/12/27)
- * -------------------------
- * * Check highlighting stuff works
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'SAS',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('/*' => '*/', '*' => ';'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            '_ALL_','_CHARACTER_','_INFILE_','_N_','_NULL_','_NUMERIC_',
-            '_WEBOUT_'
-            ),
-        2 => array(
-            '%BQUOTE','%CMPRES','%COMPSTOR','%DATATYP','%DISPLAY','%DO','%ELSE',
-            '%END','%EVAL','%GLOBAL','%GOTO','%IF','%INDEX','%INPUT','%KEYDEF',
-            '%LABEL','%LEFT','%LENGTH','%LET','%LOCAL','%LOWCASE','%MACRO',
-            '%MEND','%NRBQUOTE','%NRQUOTE','%NRSTR','%PUT','%QCMPRES','%QLEFT',
-            '%QLOWCASE','%QSCAN','%QSUBSTR','%QSYSFUNC','%QTRIM','%QUOTE',
-            '%QUPCASE','%SCAN','%STR','%SUBSTR','%SUPERQ','%SYSCALL',
-            '%SYSEVALF','%SYSEXEC','%SYSFUNC','%SYSGET','%SYSLPUT','%SYSPROD',
-            '%SYSRC','%SYSRPUT','%THEN','%TO','%TRIM','%UNQUOTE','%UNTIL',
-            '%UPCASE','%VERIFY','%WHILE','%WINDOW'
-            ),
-        3 => array(
-            'ABS','ADDR','AIRY','ARCOS','ARSIN','ATAN','ATTRC','ATTRN','BAND',
-            'BETAINV','BLSHIFT','BNOT','BOR','BRSHIFT','BXOR','BYTE','CDF',
-            'CEIL','CEXIST','CINV','CLOSE','CNONCT','COLLATE','COMPBL',
-            'COMPOUND','COMPRESS','COSH','COS','CSS','CUROBS','CV','DACCDBSL',
-            'DACCDB','DACCSL','DACCSYD','DACCTAB','DAIRY','DATETIME','DATEJUL',
-            'DATEPART','DATE','DAY','DCLOSE','DEPDBSL','DEPDB','DEPSL','DEPSYD',
-            'DEPTAB','DEQUOTE','DHMS','DIF','DIGAMMA','DIM','DINFO','DNUM',
-            'DOPEN','DOPTNAME','DOPTNUM','DREAD','DROPNOTE','DSNAME','ERFC',
-            'ERF','EXIST','EXP','FAPPEND','FCLOSE','FCOL','FDELETE','FETCHOBS',
-            'FETCH','FEXIST','FGET','FILEEXIST','FILENAME','FILEREF','FINFO',
-            'FINV','FIPNAMEL','FIPNAME','FIPSTATE','FLOOR','FNONCT','FNOTE',
-            'FOPEN','FOPTNAME','FOPTNUM','FPOINT','FPOS','FPUT','FREAD',
-            'FREWIND','FRLEN','FSEP','FUZZ','FWRITE','GAMINV','GAMMA',
-            'GETOPTION','GETVARC','GETVARN','HBOUND','HMS','HOSTHELP','HOUR',
-            'IBESSEL','INDEXW','INDEXC','INDEX','INPUTN','INPUTC','INPUT',
-            'INTRR','INTCK','INTNX','INT','IRR','JBESSEL','JULDATE','KURTOSIS',
-            'LAG','LBOUND','LEFT','LENGTH','LGAMMA','LIBNAME','LIBREF','LOG10',
-            'LOG2','LOGPDF','LOGPMF','LOGSDF','LOG','LOWCASE','MAX','MDY',
-            'MEAN','MINUTE','MIN','MOD','MONTH','MOPEN','MORT','NETPV','NMISS',
-            'NORMAL','NPV','N','OPEN','ORDINAL','PATHNAME','PDF','PEEKC','PEEK',
-            'PMF','POINT','POISSON','POKE','PROBBETA','PROBBNML','PROBCHI',
-            'PROBF','PROBGAM','PROBHYPR','PROBIT','PROBNEGB','PROBNORM','PROBT',
-            'PUTN','PUTC','PUT','QTR','QUOTE','RANBIN','RANCAU','RANEXP',
-            'RANGAM','RANGE','RANK','RANNOR','RANPOI','RANTBL','RANTRI',
-            'RANUNI','REPEAT','RESOLVE','REVERSE','REWIND','RIGHT','ROUND',
-            'SAVING','SCAN','SDF','SECOND','SIGN','SINH','SIN','SKEWNESS',
-            'SOUNDEX','SPEDIS','SQRT','STDERR','STD','STFIPS','STNAME',
-            'STNAMEL','SUBSTR','SUM','SYMGET','SYSGET','SYSMSG','SYSPROD',
-            'SYSRC','SYSTEM','TANH','TAN','TIMEPART','TIME','TINV','TNONCT',
-            'TODAY','TRANSLATE','TRANWRD','TRIGAMMA','TRIMN','TRIM','TRUNC',
-            'UNIFORM','UPCASE','USS','VARFMT','VARINFMT','VARLABEL','VARLEN',
-            'VARNAME','VARNUM','VARRAYX','VARRAY','VARTYPE','VAR','VERIFY',
-            'VFORMATX','VFORMATDX','VFORMATD','VFORMATNX','VFORMATN',
-            'VFORMATWX','VFORMATW','VFORMAT','VINARRAYX','VINARRAY',
-            'VINFORMATX','VINFORMATDX','VINFORMATD','VINFORMATNX','VINFORMATN',
-            'VINFORMATWX','VINFORMATW','VINFORMAT','VLABELX','VLABEL',
-            'VLENGTHX','VLENGTH','VNAMEX','VNAME','VTYPEX','VTYPE','WEEKDAY',
-            'YEAR','YYQ','ZIPFIPS','ZIPNAME','ZIPNAMEL','ZIPSTATE'
-            ),
-        4 => array(
-            'ABORT','ADD','ALTER','AND','ARRAY','AS','ATTRIB','BY','CALL',
-            'CARDS4','CASCADE','CATNAME','CHECK','CONTINUE','CREATE',
-            'DATALINES4','DELETE','DESCRIBE','DISPLAY','DISTINCT','DM','DROP',
-            'ENDSAS','FILE','FOOTNOTE','FOREIGN','FORMAT','FROM',
-            'GOTO','GROUP','HAVING','IN','INFILE','INFORMAT',
-            'INSERT','INTO','KEEP','KEY','LABEL','LEAVE',
-            'LIKE','LINK','LIST','LOSTCARD','MERGE','MESSAGE','MISSING',
-            'MODIFY','MSGTYPE','NOT','NULL','ON','OPTIONS','OR','ORDER',
-            'OUTPUT','PAGE','PRIMARY','REDIRECT','REFERENCES','REMOVE',
-            'RENAME','REPLACE','RESET','RESTRICT','RETAIN','RETURN','SELECT',
-            'SET','SKIP','STARTSAS','STOP','SYSTASK','TABLE','TITLE','UNIQUE',
-            'UPDATE','VALIDATE','VIEW','WAITSAS','WHERE','WINDOW','X'
-            ),
-        5 => array(
-            'DO','ELSE','END','IF','THEN','UNTIL','WHILE'
-            ),
-        6 => array(
-            'RUN','QUIT','DATA'
-            ),
-        7 => array(
-            'ERROR'
-            ),
-        8 => array(
-            'WARNING'
-            ),
-        9 => array(
-            'NOTE'
-            )
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        9 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #0000ff;',
-            4 => 'color: #0000ff;',
-            5 => 'color: #0000ff;',
-            6 => 'color: #000080; font-weight: bold;',
-            7 => 'color: #ff0000;',
-            8 => 'color: #00ff00;',
-            9 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array(
-//            1 => 'color: #006400; font-style: italic;',
-            'MULTI' => 'color: #006400; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #a020f0;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #2e8b57; font-weight: bold;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff; font-weight: bold;',
-            1 => 'color: #000080; font-weight: bold;',
-            2 => 'color: #006400; font-style: italic;',
-            3 => 'color: #006400; font-style: italic;',
-            4 => 'color: #006400; font-style: italic;',
-            5 => 'color: #ff0000; font-weight: bold;',
-            6 => 'color: #00ff00; font-style: italic;',
-            7 => 'color: #0000ff; font-style: normal;',
-            8 => 'color: #b218b2; font-weight: bold;',
-            9 => 'color: #b218b2; font-weight: bold;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => '',
-        9 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => "&amp;[a-zA-Z_][a-zA-Z0-9_]*",
-        1 => array(//Procedures
-            GESHI_SEARCH => '(^\\s*)(PROC \\w+)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        2 => array(
-            GESHI_SEARCH => '(^\\s*)(\\*.*;)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        3 => array(
-            GESHI_SEARCH => '(.*;\\s*)(\\*.*;)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        4 => array(
-            GESHI_SEARCH => '(^\\s*)(%\\*.*;)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        5 => array(//Error messages
-            GESHI_SEARCH => '(^ERROR.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        6 => array(//Warning messages
-            GESHI_SEARCH => '(^WARNING.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        7 => array(//Notice messages
-            GESHI_SEARCH => '(^NOTE.*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'im',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        8 => array(
-            GESHI_SEARCH => '(^\\s*)(CARDS.*)(^\\s*;\\s*$)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'sim',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-        9 => array(
-            GESHI_SEARCH => '(^\\s*)(DATALINES.*)(^\\s*;\\s*$)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'sim',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/scala.php b/inc/geshi/scala.php
deleted file mode 100644
index 405f59de0..000000000
--- a/inc/geshi/scala.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/*************************************************************************************
- * scala.php
- * ----------
- * Author: Franco Lombardo (franco@francolombardo.net)
- * Copyright: (c) 2008 Franco Lombardo, Benny Baumann
- * Release Version: 1.0.8.11
- * Date Started: 2008/02/08
- *
- * Scala language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/02/08 (1.0.7.22)
- *   -  First Release
- *
- * TODO (updated 2007/04/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Scala',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(2 => "/\\'(?!\w\\'|\\\\)\w+(?=\s)/"),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'",'"'),
-    'ESCAPE_CHAR' => '\\',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{1,2}#i",
-        //Hexadecimal Char Specs (unicode)
-        3 => "#\\\\u[\da-fA-F]{1,4}#",
-        //Hexadecimal Char Specs (Extended Unicode)
-        4 => "#\\\\U[\da-fA-F]{1,8}#",
-        ),
-    'KEYWORDS' => array(
-        1 => array(
-            'abstract', 'case', 'catch', 'class', 'def',
-            'do', 'else', 'extends', 'false', 'final',
-            'finally', 'for', 'forSome', 'if', 'implicit',
-            'import', 'match', 'new', 'null', 'object',
-            'override', 'package', 'private', 'protected', 'requires',
-            'return', 'sealed', 'super', 'this', 'throw',
-            'trait', 'try', 'true', 'type', 'val',
-            'var', 'while', 'with', 'yield'
-            ),
-        2 => array(
-            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?',
-        '_', ':', '=', '=>', '<<:',
-        '<%', '>:', '#', '@'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff; font-weight: bold;',
-            2 => 'color: #9999cc; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            2 => 'color: #CC66FF;',
-            'MULTI' => 'color: #00ff00; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #6666ff; font-weight: bold;',
-            1 => 'color: #6666ff; font-weight: bold;',
-            2 => 'color: #5555ff; font-weight: bold;',
-            3 => 'color: #4444ff; font-weight: bold;',
-            4 => 'color: #3333ff; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #F78811;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #6666FF;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #F78811;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #000000;',
-            2 => 'color: #000000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000080;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://scala-lang.org',
-        2 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/scheme.php b/inc/geshi/scheme.php
deleted file mode 100644
index a84b90809..000000000
--- a/inc/geshi/scheme.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/*************************************************************************************
- * scheme.php
- * ----------
- * Author: Jon Raphaelson (jonraphaelson@gmail.com)
- * Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * Scheme language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/09/22 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2005/09/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Scheme',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array('#|' => '|#'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'abs', 'acos', 'and', 'angle', 'append', 'appply', 'approximate',
-            'asin', 'assoc', 'assq', 'assv', 'atan',
-
-            'begin', 'boolean?', 'bound-identifier=?',
-
-            'caar', 'caddr', 'cadr', 'call-with-current-continuation',
-            'call-with-input-file', 'call-with-output-file', 'call/cc', 'car',
-            'case', 'catch', 'cdddar', 'cddddr', 'cdr', 'ceiling', 'char->integer',
-            'char-alphabetic?', 'char-ci<=?', 'char-ci<?', 'char-ci?', 'char-ci>=?',
-            'char-ci>?', 'char-ci=?', 'char-downcase', 'char-lower-case?',
-            'char-numeric', 'char-ready', 'char-ready?', 'char-upcase',
-            'char-upper-case?', 'char-whitespace?', 'char<=?', 'char<?', 'char=?',
-            'char>=?', 'char>?', 'char?', 'close-input-port', 'close-output-port',
-            'complex?', 'cond', 'cons', 'construct-identifier', 'cos',
-            'current-input-port', 'current-output-port',
-
-            'd', 'define', 'define-syntax', 'delay', 'denominator', 'display', 'do',
-
-            'e', 'eof-object?', 'eq?', 'equal?', 'eqv?', 'even?', 'exact->inexact',
-            'exact?', 'exp', 'expt', 'else',
-
-            'f', 'floor', 'for-each', 'force', 'free-identifer=?',
-
-            'gcd', 'gen-counter', 'gen-loser', 'generate-identifier',
-
-            'identifier->symbol', 'identifier', 'if', 'imag-part', 'inexact->exact',
-            'inexact?', 'input-port?', 'integer->char', 'integer?', 'integrate-system',
-
-            'l', 'lambda', 'last-pair', 'lcm', 'length', 'let', 'let*', 'letrec',
-            'list', 'list->string', 'list->vector', 'list-ref', 'list-tail', 'list?',
-            'load', 'log',
-
-            'magnitude', 'make-polar', 'make-promise', 'make-rectangular',
-            'make-string', 'make-vector', 'map', 'map-streams', 'max', 'member',
-            'memq', 'memv', 'min', 'modulo',
-
-            'negative', 'newline', 'nil', 'not', 'null?', 'number->string', 'number?',
-            'numerator',
-
-            'odd?', 'open-input-file', 'open-output-file', 'or', 'output-port',
-
-            'pair?', 'peek-char', 'positive?', 'procedure?',
-
-            'quasiquote', 'quote', 'quotient',
-
-            'rational', 'rationalize', 'read', 'read-char', 'real-part', 'real?',
-            'remainder', 'return', 'reverse',
-
-            's', 'sequence', 'set!', 'set-char!', 'set-cdr!', 'sin', 'sqrt', 'string',
-            'string->list', 'string->number', 'string->symbol', 'string-append',
-            'string-ci<=?', 'string-ci<?', 'string-ci=?', 'string-ci>=?',
-            'string-ci>?', 'string-copy', 'string-fill!', 'string-length',
-            'string-ref', 'string-set!', 'string<=?', 'string<?', 'string=?',
-            'string>=?', 'string>?', 'string?', 'substring', 'symbol->string',
-            'symbol?', 'syntax', 'syntax-rules',
-
-            't', 'tan', 'template', 'transcript-off', 'transcript-on', 'truncate',
-
-            'unquote', 'unquote-splicing', 'unwrap-syntax',
-
-            'vector', 'vector->list', 'vector-fill!', 'vector-length', 'vector-ref',
-            'vector-set!', 'vector?',
-
-            'with-input-from-file', 'with-output-to-file', 'write', 'write-char',
-
-            'zero?'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/scilab.php b/inc/geshi/scilab.php
deleted file mode 100644
index f011497dd..000000000
--- a/inc/geshi/scilab.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-/*************************************************************************************
- * scilab.php
- * --------
- * Author: Christophe David (geshi@christophedavid.org)
- * Copyright: (c) 2008 Christophe David (geshi@christophedavid.org)
- * Release Version: 1.0.8.11
- * Date Started: 2008/08/04
- *
- * SciLab language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/08/25 (1.0.8.1)
- *   - Corrected with the help of Benny Baumann (BenBE@geshi.org)
- * 2008/08/04 (0.0.0.1)
- *   - First beta Release - known problem with ' used to transpose matrices considered as start of strings
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'SciLab',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        2 => "/(?<=\)|\]|\w)'/"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array(),
-    'KEYWORDS' => array(
-        1 => array(
-            'if', 'else', 'elseif', 'end', 'select', 'case', 'for', 'while', 'break'
-            ),
-        2 => array(
-            'STDIN', 'STDOUT', 'STDERR',
-            '%i', '%pi', '%e', '%eps', '%nan', '%inf', '%s', '%t', '%f',
-            'usual', 'polynomial', 'boolean', 'character', 'function', 'rational', 'state-space',
-            'sparse', 'boolean sparse', 'list', 'tlist', 'library', 'endfunction'
-            ),
-        3 => array(
-            '%asn', '%helps', '%k', '%sn', 'abcd', 'abinv', 'abort', 'about', 'About_M2SCI_tools',
-            'abs', 'acos', 'acosh', 'acoshm', 'acosm', 'AdCommunications', 'add_demo', 'add_edge',
-            'add_help_chapter', 'add_node', 'add_palette', 'addcolor', 'addf', 'addinter', 'addmenu',
-            'adj_lists', 'adj2sp', 'aff2ab', 'alufunctions', 'amell', 'analpf', 'analyze', 'and',
-            'ans', 'apropos', 'arc_graph', 'arc_number', 'arc_properties', 'argn', 'arhnk', 'arl2',
-            'arma', 'arma2p', 'armac', 'armax', 'armax1', 'arsimul', 'artest', 'articul', 'ascii',
-            'asciimat', 'asin', 'asinh', 'asinhm', 'asinm', 'assignation', 'atan', 'atanh', 'atanhm',
-            'atanm', 'augment', 'auread', 'auwrite', 'axes_properties', 'axis_properties', 'backslash',
-            'balanc', 'balreal', 'bandwr', 'banner','bar', 'barh', 'barhomogenize', 'basename', 'bdiag',
-            'beep', 'besselh', 'besseli', 'besselj', 'besselk', 'bessely', 'best_match', 'beta','bezout',
-            'bifish', 'bilin', 'binomial', 'black', 'bloc2exp', 'bloc2ss', 'bode', 'bool2s',
-            'boucle', 'brackets', 'browsevar', 'bsplin3val', 'bstap', 'buttmag', 'buttondialog',
-            'bvode', 'bvodeS', 'c_link', 'cainv', 'calendar', 'calerf', 'calfrq', 'call', 'canon', 'casc',
-            'cat', 'catch', 'ccontrg', 'cd', 'cdfbet', 'cdfbin', 'cdfchi', 'cdfchn', 'cdff', 'cdffnc',
-            'cdfgam', 'cdfnbn', 'cdfnor', 'cdfpoi', 'cdft', 'ceil', 'cell', 'cell2mat', 'cellstr', 'center',
-            'cepstrum', 'chain_struct', 'chaintest', 'champ', 'champ_properties', 'champ1', 'char', 'chart',
-            'chartooem', 'chdir', 'cheb1mag', 'cheb2mag', 'check_graph', 'chepol', 'chfact', 'chol', 'chsolve',
-            'circuit', 'classmarkov', 'clc', 'clean', 'clear', 'clear_pixmap', 'clearfun', 'clearglobal','clf',
-            'clipboard', 'close', 'cls2dls', 'cmb_lin', 'cmndred', 'cmoment', 'code2str', 'coeff', 'coff', 'coffg',
-            'colcomp', 'colcompr', 'colinout', 'colon', 'color', 'color_list', 'colorbar', 'colordef', 'colormap',
-            'colregul', 'comma', 'comments', 'comp', 'companion', 'comparison', 'Compound_properties', 'con_nodes',
-            'cond', 'config', 'configure_msvc', 'conj', 'connex', 'console', 'cont_frm', 'cont_mat', 'Contents',
-            'continue', 'contour', 'contour2d', 'contour2di', 'contourf', 'contr', 'contract_edge', 'contrss',
-            'convex_hull', 'convol', 'convstr', 'copfac', 'copy', 'corr', 'correl', 'cos', 'cosh', 'coshm',
-            'cosm', 'cotg', 'coth', 'cothm', 'covar', 'create_palette', 'cshep2d', 'csim', 'cspect', 'Cste',
-            'ctr_gram', 'cumprod', 'cumsum', 'cycle_basis', 'czt', 'dasrt', 'dassl', 'datafit', 'date', 'datenum',
-            'datevec', 'dbphi', 'dcf', 'ddp', 'debug', 'dec2hex', 'deff', 'definedfields', 'degree', 'delbpt',
-            'delete', 'delete_arcs', 'delete_nodes', 'delip', 'delmenu', 'demoplay', 'denom', 'derivat', 'derivative',
-            'des2ss', 'des2tf', 'det', 'determ', 'detr', 'detrend', 'dft', 'dhinf', 'dhnorm', 'diag', 'diary',
-            'diff', 'diophant', 'dir', 'dirname', 'disp', 'dispbpt', 'dispfiles', 'dlgamma', 'dnaupd', 'do', 'dot',
-            'double', 'dragrect', 'draw', 'drawaxis', 'drawlater', 'drawnow', 'driver', 'dsaupd', 'dscr',
-            'dsearch', 'dsimul', 'dt_ility', 'dtsi', 'edge_number', 'edit', 'edit_curv', 'edit_error',
-            'edit_graph', 'edit_graph_menus', 'editvar', 'eigenmarkov', 'ell1mag',
-            'empty', 'emptystr', 'eqfir', 'eqiir', 'equal', 'Equal', 'equil', 'equil1',
-            'ereduc', 'erf', 'erfc', 'erfcx', 'errbar', 'errcatch', 'errclear', 'error', 'error_table', 'etime',
-            'eval', 'eval_cshep2d', 'eval3d', 'eval3dp', 'evans', 'evstr', 'excel2sci', 'exec', 'execstr', 'exists',
-            'exit', 'exp', 'expm', 'external', 'extraction', 'eye', 'fac3d', 'factorial', 'factors', 'faurre', 'fchamp',
-            'fcontour', 'fcontour2d', 'fec', 'fec_properties', 'feedback', 'feval', 'ffilt', 'fft', 'fft2', 'fftshift',
-            'fgrayplot', 'figure', 'figure_properties', 'figure_style', 'file', 'fileinfo', 'fileparts', 'filter', 'find',
-            'find_freq', 'find_path', 'findABCD', 'findAC', 'findBD', 'findBDK', 'findm', 'findmsvccompiler', 'findobj',
-            'findR', 'findx0BD', 'firstnonsingleton', 'fit_dat', 'fix', 'floor', 'flts', 'foo', 'format',
-            'formatman', 'fort', 'fourplan', 'fplot2d', 'fplot3d', 'fplot3d1', 'fprintf', 'fprintfMat', 'frep2tf',
-            'freq', 'freson', 'frexp', 'frfit', 'frmag', 'fscanf', 'fscanfMat', 'fsfirlin', 'fsolve', 'fspecg',
-            'fstabst', 'fstair', 'ftest', 'ftuneq', 'full', 'fullfile', 'fullrf', 'fullrfk', 'fun2string', 'Funcall',
-            'funcprot', 'functions', 'funptr', 'fusee', 'G_make', 'g_margin', 'gainplot', 'gamitg',
-            'gamma', 'gammaln', 'gca', 'gcare', 'gcd', 'gce', 'gcf', 'gda', 'gdf', 'gen_net', 'genfac3d', 'genlib',
-            'genmarkov', 'geom3d', 'geomean', 'get', 'get_contents_infer', 'get_function_path', 'getcolor', 'getcwd',
-            'getd', 'getdate', 'getenv', 'getf', 'getfield', 'getfont', 'gethistory', 'getio', 'getlinestyle',
-            'getlongpathname', 'getmark', 'getmemory', 'getos', 'getpid', 'getscilabkeywords', 'getshell',
-            'getshortpathname', 'getsymbol', 'getvalue', 'getversion', 'gfare', 'gfrancis', 'girth', 'givens',
-            'glever', 'glist', 'global', 'GlobalProperty', 'glue', 'gmres', 'gpeche', 'gr_menu', 'graduate', 'grand',
-            'graph_2_mat', 'graph_center', 'graph_complement', 'graph_diameter', 'graph_power', 'graph_simp', 'graph_sum',
-            'graph_union', 'graphic', 'Graphics', 'graphics_entities', 'graph-list', 'graycolormap', 'grayplot',
-            'grayplot_properties', 'graypolarplot', 'great', 'grep', 'group', 'gschur', 'gsort', 'gspec', 'gstacksize',
-            'gtild', 'h_cl', 'h_inf', 'h_inf_st', 'h_norm', 'h2norm', 'halt', 'hamilton', 'hank', 'hankelsv', 'harmean',
-            'hat', 'havewindow', 'head_comments', 'help', 'help_skeleton', 'hermit', 'hess', 'hex2dec', 'hilb', 'hinf',
-            'hist3d', 'histplot', 'horner', 'host', 'hotcolormap', 'householder', 'hrmt', 'hsv2rgb', 'hsvcolormap',
-            'htrianr', 'hypermat', 'hypermatrices', 'iconvert', 'ieee', 'ifft', 'iir', 'iirgroup', 'iirlp',
-            'ilib_build', 'ilib_compile', 'ilib_for_link', 'ilib_gen_gateway', 'ilib_gen_loader', 'ilib_gen_Make',
-            'im_inv', 'imag', 'impl', 'imrep2ss', 'imult', 'ind2sub', 'Infer', 'inistate', 'input', 'insertion', 'int',
-            'int16', 'int2d', 'int32', 'int3d', 'int8', 'intc', 'intdec', 'integrate', 'interp', 'interp1', 'interp2d',
-            'interp3d', 'interpln', 'intersci', 'intersect', 'intg', 'intl', 'intppty', 'intsplin', 'inttrap', 'inttype',
-            'inv', 'inv_coeff', 'invr', 'invsyslin', 'iqr', 'is_connex', 'iscellstr', 'isdef', 'isdir', 'isempty',
-            'isequal', 'isequalbitwise', 'iserror', 'isglobal', 'isinf', 'isnan', 'isoview', 'isreal', 'javasci',
-            'jetcolormap', 'jmat', 'justify', 'kalm', 'karmarkar', 'kernel', 'keyboard', 'knapsack', 'kpure', 'krac2',
-            'kron', 'kroneck', 'label_properties', 'labostat', 'LANGUAGE', 'lasterror', 'lattn', 'lattp', 'lcf', 'lcm',
-            'lcmdiag', 'ldiv', 'ldivf', 'leastsq', 'left', 'legend', 'legend_properties', 'legendre', 'legends', 'length',
-            'leqr', 'less', 'lev', 'levin', 'lex_sort', 'lft', 'lgfft', 'lib', 'lin', 'lin2mu', 'lindquist',
-            'line_graph', 'linear_interpn', 'lines', 'LineSpec', 'linf', 'linfn', 'link', 'linmeq', 'linpro', 'linsolve',
-            'linspace', 'listfiles', 'listvarinfile', 'lmisolver', 'lmitool', 'load', 'load_graph', 'loadhistory',
-            'loadmatfile', 'loadplots', 'loadwave', 'locate', 'log', 'log10', 'log1p', 'log2', 'logm', 'logspace',
-            'lotest', 'lqe', 'lqg', 'lqg_ltr', 'lqg2stan', 'lqr', 'ls', 'lsq', 'lsq_splin', 'lsqrsolve', 'lsslist',
-            'lstcat', 'lstsize', 'ltitr', 'lu', 'ludel', 'lufact', 'luget', 'lusolve', 'lyap', 'm_circle', 'm2scideclare',
-            'macglov', 'macr2lst', 'macr2tree', 'macro', 'macrovar', 'mad', 'make_graph', 'make_index', 'makecell', 'man',
-            'manedit', 'mapsound', 'markp2ss', 'mat_2_graph', 'matfile2sci', 'Matlab-Scilab_character_strings', 'Matplot',
-            'Matplot_properties', 'Matplot1', 'matrices', 'matrix', 'max', 'max_cap_path', 'max_clique', 'max_flow',
-            'maxi', 'mcisendstring', 'mclearerr', 'mclose', 'mdelete', 'mean', 'meanf', 'median', 'menus', 'meof',
-            'merror', 'mese', 'mesh', 'mesh2d', 'meshgrid', 'mfft', 'mfile2sci', 'mfprintf', 'mfscanf', 'mget', 'mgeti',
-            'mgetl', 'mgetstr', 'milk_drop', 'min', 'min_lcost_cflow', 'min_lcost_flow1', 'min_lcost_flow2',
-            'min_qcost_flow', 'min_weight_tree', 'mine', 'mini', 'minreal', 'minss', 'minus', 'mkdir', 'mlist', 'mode',
-            'modulo', 'moment', 'mopen', 'move', 'mprintf', 'mps2linpro', 'mput', 'mputl', 'mputstr', 'mrfit', 'mscanf',
-            'msd', 'mseek', 'msprintf', 'msscanf', 'mstr2sci', 'mtell', 'mtlb_0', 'mtlb_a', 'mtlb_all', 'mtlb_any',
-            'mtlb_axis', 'mtlb_beta', 'mtlb_box', 'mtlb_close', 'mtlb_colordef', 'mtlb_conv', 'mtlb_cumprod', 'mtlb_cumsum',
-            'mtlb_dec2hex', 'mtlb_delete', 'mtlb_diag', 'mtlb_diff', 'mtlb_dir', 'mtlb_double', 'mtlb_e', 'mtlb_echo',
-            'mtlb_eig', 'mtlb_eval', 'mtlb_exist', 'mtlb_eye', 'mtlb_false', 'mtlb_fft', 'mtlb_fftshift', 'mtlb_find',
-            'mtlb_findstr', 'mtlb_fliplr', 'mtlb_fopen', 'mtlb_format', 'mtlb_fprintf', 'mtlb_fread', 'mtlb_fscanf',
-            'mtlb_full', 'mtlb_fwrite', 'mtlb_grid', 'mtlb_hold', 'mtlb_i', 'mtlb_ifft', 'mtlb_imp', 'mtlb_int16',
-            'mtlb_int32', 'mtlb_int8', 'mtlb_is', 'mtlb_isa', 'mtlb_isfield', 'mtlb_isletter', 'mtlb_isspace', 'mtlb_l',
-            'mtlb_legendre', 'mtlb_linspace', 'mtlb_load', 'mtlb_logic', 'mtlb_logical', 'mtlb_lower', 'mtlb_max',
-            'mtlb_min', 'mtlb_mode', 'mtlb_more', 'mtlb_num2str', 'mtlb_ones', 'mtlb_plot', 'mtlb_prod', 'mtlb_rand',
-            'mtlb_randn', 'mtlb_rcond', 'mtlb_realmax', 'mtlb_realmin', 'mtlb_repmat', 'mtlb_s', 'mtlb_save',
-            'mtlb_setstr', 'mtlb_size', 'mtlb_sort', 'mtlb_sparse', 'mtlb_strcmp', 'mtlb_strcmpi', 'mtlb_strfind',
-            'mtlb_strrep', 'mtlb_sum', 'mtlb_t', 'mtlb_toeplitz', 'mtlb_tril', 'mtlb_triu', 'mtlb_true', 'mtlb_uint16',
-            'mtlb_uint32', 'mtlb_uint8', 'mtlb_upper', 'mtlb_zeros', 'mu2lin', 'mucomp', 'mulf', 'mvvacov', 'name2rgb',
-            'names', 'nancumsum', 'nand2mean', 'nanmax', 'nanmean', 'nanmeanf', 'nanmedian', 'nanmin', 'nanstdev',
-            'nansum', 'narsimul', 'NDcost', 'ndgrid', 'ndims', 'nearfloat', 'nehari', 'neighbors', 'netclose', 'netwindow',
-            'netwindows', 'new', 'newaxes', 'newest', 'newfun', 'nextpow2', 'nf3d', 'nfreq', 'nlev', 'nnz', 'node_number',
-            'nodes_2_path', 'nodes_degrees', 'noisegen', 'norm', 'not', 'null', 'number_properties', 'numdiff', 'numer',
-            'nyquist', 'object_editor', 'obs_gram', 'obscont', 'obscont1', 'observer', 'obsv_mat', 'obsvss', 'ode',
-            'ode_discrete', 'ode_optional_output', 'ode_root', 'odedc', 'odeoptions', 'oemtochar', 'old_style',
-            'oldbesseli', 'oldbesselj', 'oldbesselk', 'oldbessely', 'oldload', 'oldplot', 'oldsave', 'ones',
-            'Operation', 'optim', 'or', 'orth', 'overloading', 'p_margin', 'param3d', 'param3d_properties',
-            'param3d1', 'paramfplot2d', 'parents', 'parrot', 'part', 'path_2_nodes', 'pathconvert', 'pause', 'pbig',
-            'pca', 'pcg', 'pdiv', 'pen2ea', 'pencan', 'penlaur', 'percent', 'perctl', 'perfect_match', 'perl',
-            'perms', 'permute', 'pertrans', 'pfss', 'phasemag', 'phc', 'pie', 'pinv', 'pipe_network', 'playsnd', 'plot',
-            'plot_graph', 'plot2d', 'plot2d_old_version', 'plot2d1', 'plot2d2', 'plot2d3', 'plot2d4', 'plot3d',
-            'plot3d_old_version', 'plot3d1', 'plot3d2', 'plot3d3', 'plotframe', 'plotprofile', 'plus', 'plzr',
-            'pmodulo', 'pol2des', 'pol2str', 'pol2tex', 'polar', 'polarplot', 'polfact', 'poly', 'polyline_properties',
-            'portr3d', 'portrait', 'power', 'ppol', 'prbs_a', 'predecessors', 'predef', 'print', 'printf',
-            'printf_conversion', 'printing', 'printsetupbox', 'prod', 'profile', 'progressionbar', 'proj', 'projsl',
-            'projspec', 'psmall', 'pspect', 'pvm', 'pvm_addhosts', 'pvm_barrier', 'pvm_bcast', 'pvm_bufinfo', 'pvm_config',
-            'pvm_delhosts', 'pvm_error', 'pvm_exit', 'pvm_f772sci', 'pvm_get_timer', 'pvm_getinst', 'pvm_gettid',
-            'pvm_gsize', 'pvm_halt', 'pvm_joingroup', 'pvm_kill', 'pvm_lvgroup', 'pvm_mytid', 'pvm_parent', 'pvm_probe',
-            'pvm_recv', 'pvm_reduce', 'pvm_sci2f77', 'pvm_send', 'pvm_set_timer', 'pvm_spawn', 'pvm_spawn_independent',
-            'pvm_start', 'pvm_tasks', 'pvm_tidtohost', 'pvmd3', 'pwd', 'qassign', 'qld', 'qmr', 'qr', 'quapro', 'quart',
-            'quaskro', 'quit', 'quote', 'rand', 'randpencil', 'range', 'rank', 'rankqr', 'rat',  'rcond',
-            'rdivf', 'read', 'read4b', 'readb', 'readc_', 'readmps', 'readxls', 'real', 'realtime', 'realtimeinit',
-            'rectangle_properties', 'recur', 'reglin', 'regress', 'remez', 'remezb', 'repfreq', 'replot', 'resethistory',
-            'residu', 'resume', 'return', 'rgb2name', 'ric_desc', 'ricc', 'riccati', 'rlist', 'rmdir', 'roots', 'rotate',
-            'round', 'routh_t', 'rowcomp', 'rowcompr', 'rowinout', 'rowregul', 'rowshuff', 'rpem', 'rref', 'rtitr',
-            'rubberbox', 'salesman', 'sample', 'samplef', 'samwr', 'save', 'save_format', 'save_graph', 'savehistory',
-            'savematfile', 'savewave', 'sca', 'scaling', 'scanf', 'scanf_conversion', 'scf', 'schur', 'sci_files',
-            'sci2exp', 'sci2for', 'sci2map', 'sciargs', 'SciComplex', 'SciComplexArray', 'SciDouble', 'SciDoubleArray',
-            'scilab', 'Scilab', 'ScilabEval', 'scilink', 'scipad', 'SciString', 'SciStringArray', 'sd2sci', 'sda', 'sdf',
-            'secto3d', 'segs_properties', 'semi', 'semicolon', 'semidef', 'sensi', 'set', 'set_posfig_dim',
-            'setbpt', 'setdiff', 'setenv', 'seteventhandler', 'setfield', 'sethomedirectory', 'setlanguage', 'setmenu',
-            'sfact', 'Sfgrayplot', 'Sgrayplot', 'sgrid', 'shortest_path', 'show_arcs', 'show_graph', 'show_nodes',
-            'show_pixmap', 'showprofile', 'sident', 'sign', 'Signal', 'signm', 'simp', 'simp_mode', 'sin', 'sinc',
-            'sincd', 'sinh', 'sinhm', 'sinm', 'size', 'slash', 'sleep', 'sm2des', 'sm2ss', 'smooth', 'solve',
-            'sorder', 'sort', 'sound', 'soundsec', 'sp2adj', 'spaninter', 'spanplus', 'spantwo', 'spchol',
-            'spcompack', 'spec', 'specfact', 'speye', 'spget', 'splin', 'splin2d', 'splin3d', 'split_edge', 'spones',
-            'sprand', 'sprintf', 'spzeros', 'sqroot', 'sqrt', 'sqrtm', 'square', 'squarewave', 'srfaur', 'srkf', 'ss2des',
-            'ss2ss', 'ss2tf', 'sscanf', 'sskf', 'ssprint', 'ssrand', 'st_deviation', 'st_ility', 'stabil', 'stacksize',
-            'star', 'startup', 'stdev', 'stdevf', 'str2code', 'strange', 'strcat', 'strindex', 'string', 'stringbox',
-            'strings', 'stripblanks', 'strong_con_nodes', 'strong_connex', 'strsplit', 'strsubst', 'struct', 'sub2ind',
-            'subf', 'subgraph', 'subplot', 'successors', 'sum', 'supernode', 'surf', 'surface_properties', 'sva',
-            'svd', 'svplot', 'sylm', 'sylv', 'symbols', 'sysconv', 'sysdiag', 'sysfact', 'syslin', 'syssize', 'system',
-            'systems', 'systmat', 'tabul', 'tan', 'tangent', 'tanh', 'tanhm', 'tanm', 'TCL_CreateSlave', 'TCL_DeleteInterp',
-            'TCL_EvalFile', 'TCL_EvalStr', 'TCL_ExistInterp', 'TCL_ExistVar', 'TCL_GetVar', 'TCL_GetVersion', 'TCL_SetVar',
-            'TCL_UnsetVar', 'TCL_UpVar', 'tdinit', 'testmatrix', 'texprint', 'text_properties', 'tf2des', 'tf2ss', 'then',
-            'thrownan', 'tic', 'tilda', 'time_id', 'timer', 'title', 'titlepage', 'TK_EvalFile', 'TK_EvalStr', 'tk_getdir',
-            'tk_getfile', 'TK_GetVar', 'tk_savefile', 'TK_SetVar',  'toc', 'toeplitz', 'tohome', 'tokenpos',
-            'tokens', 'toolbar', 'toprint', 'trace', 'trans', 'trans_closure', 'translatepaths', 'tree2code', 'trfmod',
-            'trianfml', 'tril', 'trimmean', 'trisolve', 'triu', 'try', 'trzeros', 'twinkle', 'type', 'Type', 'typename',
-            'typeof', 'ui_observer', 'uicontrol', 'uimenu', 'uint16', 'uint32', 'uint8', 'ulink', 'unglue', 'union',
-            'unique', 'unix', 'unix_g', 'unix_s', 'unix_w', 'unix_x', 'unobs', 'unsetmenu', 'unzoom', 'user', 'varargin',
-            'varargout', 'Variable', 'variance', 'variancef', 'varn', 'vectorfind', 'waitbar', 'warning', 'wavread',
-            'wavwrite', 'wcenter', 'wfir', 'what', 'where', 'whereami', 'whereis', 'who', 'who_user', 'whos',
-            'wiener', 'wigner', 'winclose', 'window', 'winlist', 'winopen', 'winqueryreg', 'winsid', 'with_atlas',
-            'with_gtk', 'with_javasci', 'with_pvm', 'with_texmacs', 'with_tk', 'writb', 'write', 'write4b', 'x_choices',
-            'x_choose', 'x_dialog', 'x_matrix', 'x_mdialog', 'x_message', 'x_message_modeless', 'xarc', 'xarcs', 'xarrows',
-            'xaxis', 'xbasc', 'xbasimp', 'xbasr', 'xchange', 'xclea', 'xclear', 'xclick', 'xclip', 'xdel', 'xend',
-            'xfarc', 'xfarcs', 'xfpoly', 'xfpolys', 'xfrect', 'xget', 'xgetech', 'xgetfile', 'xgetmouse', 'xgraduate',
-            'xgrid', 'xinfo', 'xinit', 'xlfont', 'xload', 'xls_open', 'xls_read', 'xmltohtml', 'xname', 'xnumb', 'xpause',
-            'xpoly', 'xpolys', 'xrect', 'xrects', 'xrpoly', 'xs2bmp', 'xs2emf', 'xs2eps', 'xs2fig', 'xs2gif', 'xs2ppm',
-            'xs2ps', 'xsave', 'xsegs', 'xselect', 'xset', 'xsetech', 'xsetm', 'xstring', 'xstringb', 'xstringl', 'xtape',
-            'xtitle', 'yulewalk', 'zeropen', 'zeros', 'zgrid', 'zoom_rect', 'zpbutt', 'zpch1', 'zpch2', 'zpell'
-            )
-        ),
-    'SYMBOLS' => array(
-        '<', '>', '=',
-        '!', '@', '~', '&', '|',
-        '+','-', '*', '/', '%',
-        ',', ';', '?', ':', "'"
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => true,
-        2 => true,
-        3 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => '',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            'HARD' => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;',
-            2 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;',
-            4 => 'color: #009999;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
-        2 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
-        3 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '-&gt;',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        //Variable
-        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
-        //File Descriptor
-        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/sdlbasic.php b/inc/geshi/sdlbasic.php
deleted file mode 100644
index 381161fdf..000000000
--- a/inc/geshi/sdlbasic.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/*************************************************************************************
- * sdlbasic.php
- * ------------
- * Author: Roberto Rossi
- * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1.0.8.11
- * Date Started: 2005/08/19
- *
- * sdlBasic (http://sdlbasic.sf.net) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2005/08/19 (1.0.0)
- *  -  First Release
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'sdlBasic',
-    'COMMENT_SINGLE' => array(1 => "'", 2 => "rem", 3 => "!", 4 => "#"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'const', 'option', 'explicit', 'qbasic', 'include', 'argc',
-            'argv', 'command', 'command$', 'run', 'shell', 'os', 'declare',
-            'sub', 'function', 'return', 'while', 'wend', 'exit', 'end',
-            'continue', 'if', 'then', 'else', 'elseif',
-            'select', 'case', 'for', 'each', 'step',
-            'next', 'to', 'dim', 'shared', 'common', 'lbound', 'bound',
-            'erase', 'asc', 'chr', 'chr$', 'insert', 'insert$', 'instr', 'lcase',
-            'lcase$', 'left', 'left$', 'len', 'length', 'ltrim', 'ltrim$', 'mid',
-            'mid$', 'replace', 'replace$', 'replacesubstr', 'replacesubstr$',
-            'reverse', 'reverse$', 'right', 'right$', 'rinstr', 'rtrim', 'rtrim$',
-            'space', 'space$', 'str', 'str$', 'strf', 'strf$', 'string', 'string$',
-            'tally', 'trim', 'trim$', 'typeof', 'typeof$', 'ucase', 'ucase$', 'val',
-            'abs', 'acos', 'andbit', 'asin', 'atan', 'bitwiseand', 'bitwiseor',
-            'bitwisexor', 'cos', 'exp', 'fix', 'floor', 'frac', 'hex', 'hex$', 'int',
-            'log', 'min', 'max', 'orbit', 'randomize', 'rnd', 'round', 'sgn', 'sin',
-            'sqr', 'tan', 'xorbit', 'open', 'as', 'file', 'input', 'close', 'output',
-            'append', 'eof', 'fileexists', 'filecopy', 'filemove', 'filerename',
-            'freefile', 'kill', 'loc', 'lof', 'readbyte', 'rename', 'seek',
-            'writebyte', 'chdir', 'dir', 'dir$', 'direxists', 'dirfirst', 'dirnext',
-            'mkdir', 'rmdir', 'print', 'date', 'date$', 'time', 'time$', 'ticks',
-            'data', 'read', 'reservebank', 'freebank', 'copybank', 'loadbank',
-            'savebank', 'setbank', 'sizebank', 'poke', 'doke', 'loke', 'peek', 'deek',
-            'leek', 'memcopy', 'setdisplay', 'setcaption', 'caption', 'displaywidth',
-            'displayheight', 'displaybpp', 'screen', 'directscreen', 'screenopen',
-            'screenclose', 'screenclone', 'screencopy', 'screenfade', 'screenfadein',
-            'screencrossfade', 'screenalpha', 'screenlock', 'screenunlock',
-            'screenrect', 'xscreenrect', 'yscreenrect', 'wscreenrect', 'hscreenrect',
-            'flagscreenrect', 'screenwidth', 'screenheight', 'offset', 'xoffset',
-            'yoffset', 'cls', 'screenswap', 'autoback', 'setautoback',
-            'dualplayfield', 'waitvbl', 'fps', 'rgb', 'enablepalette', 'color',
-            'palette', 'colorcycling', 'ink', 'point', 'dot', 'plot', 'line', 'box',
-            'bar', 'circle', 'fillcircle', 'ellipse', 'fillellipse', 'paint',
-            'loadimage', 'saveimage', 'loadsound', 'savesound', 'loadmusic',
-            'hotspot', 'setcolorkey', 'imageexists', 'imagewidth', 'imageheight',
-            'deleteimage', 'copyimage', 'setalpha', 'zoomimage', 'rotateimage',
-            'rotozoomimage', 'blt', 'pastebob', 'pasteicon', 'grab', 'spriteclip',
-            'sprite', 'deletesprite', 'xsprite', 'ysprite', 'spritewidth',
-            'spriteheight', 'frsprite', 'livesprite', 'spritehit', 'autoupdatesprite',
-            'updatesprite', 'setbob', 'bob', 'deletebob', 'xbob', 'ybob', 'bobwidth',
-            'bobheight', 'frbob', 'livebob', 'bobhit', 'autoupdatebob', 'updatebob',
-            'text', 'setfont', 'textrender', 'pen', 'paper', 'prints', 'locate',
-            'atx', 'aty', 'curson', 'cursoff', 'inputs', 'zoneinputs',
-            'isenabledsound', 'soundexists', 'deletesound', 'copysound',
-            'musicexists', 'playsound', 'volumesound', 'stopsound', 'pausesound',
-            'resumesound', 'vumetersound', 'positionsound', 'soundchannels',
-            'playmusic', 'positionmusic', 'stopmusic', 'fademusic', 'pausemusic',
-            'resumemusic', 'rewindmusic', 'volumemusic', 'speedmusic', 'numdrivescd',
-            'namecd', 'getfreecd', 'opencd', 'indrivecd', 'trackscd', 'curtrackcd',
-            'curframecd', 'playcd', 'playtrackscd',
-            'pausecd', 'resumecd', 'stopcd', 'ejectcd', 'closecd', 'tracktypecd',
-            'tracklengthcd', 'trackoffsetcd', 'key', 'inkey', 'waitkey', 'xmouse',
-            'ymouse', 'xmousescreen', 'ymousescreen', 'bmouse', 'changemouse',
-            'locatemouse', 'mouseshow', 'mousehide', 'mousezone', 'numjoysticks',
-            'namejoystick', 'numaxesjoystick', 'numballsjoystick', 'numhatsjoystick',
-            'numbuttonsjoystick', 'getaxisjoystick', 'gethatjoystick',
-            'getbuttonjoystick', 'xgetballjoystick', 'ygetballjoystick', 'joy',
-            'bjoy', 'wait', 'timer', 'isenabledsock', 'getfreesock', 'opensock',
-            'acceptsock', 'isserverready', 'connectsock', 'connectionreadysock',
-            'isclientready', 'losesock', 'peeksock', 'readsock', 'readbytesock',
-            'readlinesock', 'writesock', 'writebytesock', 'writelinesock',
-            'getremoteip', 'getremoteport', 'getlocalip'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;',
-            2 => 'color: #808080;',
-            3 => 'color: #808080;',
-            4 => 'color: #808080;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/smalltalk.php b/inc/geshi/smalltalk.php
deleted file mode 100644
index 5b61badaf..000000000
--- a/inc/geshi/smalltalk.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/*************************************************************************************
- * smalltalk.php
- * --------
- * Author: Bananeweizen (Bananeweizen@gmx.de)
- * Copyright: (c) 2005 Bananeweizen (www.bananeweizen.de)
- * Release Version: 1.0.8.11
- * Date Started: 2005/03/27
- *
- * Smalltalk language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2006-05-24 (1.0.0)
- *   -  First Release
- *
- * TODO
- * -------------------------
- * * recognize nested array symbols correctly
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Smalltalk',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('"' => '"'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'"),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'self','super','true','false','nil'
-            )
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '=' , ':=', '(', ')', '#'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #7f007f;'
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #007f00; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => ''
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #7f0000;'
-            ),
-        'METHODS' => array(
-            0 => ''
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066; font-weight:bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;',
-            1 => 'color: #7f0000;',
-            2 => 'color: #7f0000;',
-            3 => 'color: #00007f;',
-            5 => 'color: #00007f;',
-            6 => 'color: #00007f;'
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => array(
-            GESHI_SEARCH => '([^a-zA-Z0-9_#<])([A-Z]+[a-zA-Z0-9_]*)(?!>)', //class names
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        1 => array(
-            GESHI_SEARCH => '(#+)([a-zA-Z0-9_]+)', //symbols
-            GESHI_REPLACE => '\\1\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        2 => array(
-            GESHI_SEARCH => '(#\s*\([^)]*\))', //array symbols
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        3 => array(
-            GESHI_SEARCH => '<PIPE>([a-zA-Z0-9_\s]+)<PIPE>', //temporary variables
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '|',
-            GESHI_AFTER => '|'
-            ),
-        5 => array(
-            GESHI_SEARCH => '([:(,=[.*\/+-]\s*(?!\d+\/))([a-zA-Z0-9_]+)', //message parameters, message receivers
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 's',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        6 => array(
-            GESHI_SEARCH => '([a-zA-Z0-9_]+)(\s*:=)', //assignment targets
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2'
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/smarty.php b/inc/geshi/smarty.php
deleted file mode 100644
index 86e9d44c0..000000000
--- a/inc/geshi/smarty.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*************************************************************************************
- * smarty.php
- * ----------
- * Author: Alan Juden (alan@judenware.org)
- * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/07/10
- *
- * Smarty template language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2004/11/27 (1.0.0)
- *  -  Initial Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Smarty',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array('{*' => '*}'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            '$smarty', 'now', 'const', 'capture', 'config', 'section', 'foreach', 'template', 'version', 'ldelim', 'rdelim',
-            'foreachelse', 'include', 'include_php', 'insert', 'if', 'elseif', 'else', 'php',
-            'sectionelse', 'is_cached',
-            ),
-        2 => array(
-            'capitalize', 'count_characters', 'cat', 'count_paragraphs', 'count_sentences', 'count_words', 'date_format',
-            'default', 'escape', 'indent', 'lower', 'nl2br', 'regex_replace', 'replace', 'spacify', 'string_format',
-            'strip', 'strip_tags', 'truncate', 'upper', 'wordwrap',
-            ),
-        3 => array(
-            'counter', 'cycle', 'debug', 'eval', 'html_checkboxes', 'html_image', 'html_options',
-            'html_radios', 'html_select_date', 'html_select_time', 'html_table', 'math', 'mailto', 'popup_init',
-            'popup', 'textformat'
-            ),
-        4 => array(
-            '$template_dir', '$compile_dir', '$config_dir', '$plugins_dir', '$debugging', '$debug_tpl',
-            '$debugging_ctrl', '$autoload_filters', '$compile_check', '$force_compile', '$caching', '$cache_dir',
-            '$cache_lifetime', '$cache_handler_func', '$cache_modified_check', '$config_overwrite',
-            '$config_booleanize', '$config_read_hidden', '$config_fix_newlines', '$default_template_handler_func',
-            '$php_handling', '$security', '$secure_dir', '$security_settings', '$trusted_dir', '$left_delimiter',
-            '$right_delimiter', '$compiler_class', '$request_vars_order', '$request_use_auto_globals',
-            '$error_reporting', '$compile_id', '$use_sub_dirs', '$default_modifiers', '$default_resource_type'
-            ),
-        5 => array(
-            'append', 'append_by_ref', 'assign', 'assign_by_ref', 'clear_all_assign', 'clear_all_cache',
-            'clear_assign', 'clear_cache', 'clear_compiled_tpl', 'clear_config', 'config_load', 'display',
-            'fetch', 'get_config_vars', 'get_registered_object', 'get_template_vars',
-            'load_filter', 'register_block', 'register_compiler_function', 'register_function',
-            'register_modifier', 'register_object', 'register_outputfilter', 'register_postfilter',
-            'register_prefilter', 'register_resource', 'trigger_error', 'template_exists', 'unregister_block',
-            'unregister_compiler_function', 'unregister_function', 'unregister_modifier', 'unregister_object',
-            'unregister_outputfilter', 'unregister_postfilter', 'unregister_prefilter', 'unregister_resource'
-            ),
-        6 => array(
-            'name', 'file', 'scope', 'global', 'key', 'once', 'script',
-            'loop', 'start', 'step', 'max', 'show', 'values', 'value', 'from', 'item'
-            ),
-        7 => array(
-            'eq', 'neq', 'ne', 'lte', 'gte', 'ge', 'le', 'not', 'mod'
-            ),
-        8 => array(
-            // some common php functions
-            'isset', 'is_array', 'empty', 'count', 'sizeof'
-            )
-        ),
-    'SYMBOLS' => array(
-        '/', '=', '==', '!=', '>', '<', '>=', '<=', '!', '%'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF;',        //Functions
-            2 => 'color: #008000;',        //Modifiers
-            3 => 'color: #0600FF;',        //Custom Functions
-            4 => 'color: #804040;',        //Variables
-            5 => 'color: #008000;',        //Methods
-            6 => 'color: #6A0A0A;',        //Attributes
-            7 => 'color: #D36900;',        //Text-based symbols
-            8 => 'color: #0600FF;'        //php functions
-            ),
-        'COMMENTS' => array(
-            'MULTI' => 'color: #008080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #D36900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #D36900;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #009000;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #00aaff;'
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://smarty.php.net/{FNAMEL}',
-        2 => 'http://smarty.php.net/{FNAMEL}',
-        3 => 'http://smarty.php.net/{FNAMEL}',
-        4 => 'http://smarty.php.net/{FNAMEL}',
-        5 => 'http://smarty.php.net/{FNAMEL}',
-        6 => '',
-        7 => 'http://smarty.php.net/{FNAMEL}',
-        8 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        // variables
-        0 => '\$[a-zA-Z][a-zA-Z0-9_]*'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '{' => '}'
-            ),
-        1 => array(
-            '<!--' => '-->',
-        ),
-        2 => array(
-            '<' => '>'
-            )
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => false,
-        2 => false
-    ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#;>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-&])"
-        )
-    )
-);
-
-?>
diff --git a/inc/geshi/spark.php b/inc/geshi/spark.php
deleted file mode 100644
index 0284a1a47..000000000
--- a/inc/geshi/spark.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/*************************************************************************************
- * ada.php
- * -------
- * Author: Phil Thornley (tux@inmail.cz)
- * Copyright: (c) 2004 Phil Thornley (http://www.sparksure.com)
- * Release Version: 1.0.8.11
- * Date Started: 2010/08/22
- *
- * SPARK language file for GeSHi.
- *
- * Created by modifying Ada file version 1.0.2
- * Words are from SciTe configuration file
- *
- * CHANGES
- * -------
- * 2010/08/28 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2010/08/22)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'SPARK',
-    'COMMENT_SINGLE' => array(1 => '--', 2 => '--#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'begin', 'declare', 'do', 'else', 'elsif', 'exception', 'for', 'if',
-            'is', 'loop', 'while', 'then', 'end', 'select', 'case', 'until',
-            'goto', 'return'
-            ),
-        2 => array(
-            'abs', 'and', 'at', 'mod', 'not', 'or', 'rem', 'xor'
-            ),
-        3 => array(
-            'abort', 'abstract', 'accept', 'access', 'aliased', 'all', 'array',
-            'body', 'constant', 'delay', 'delta', 'digits', 'entry', 'exit',
-            'function', 'generic', 'in', 'interface', 'limited', 'new', 'null',
-            'of', 'others', 'out', 'overriding', 'package', 'pragma', 'private',
-            'procedure', 'protected', 'raise', 'range', 'record', 'renames',
-            'requeue', 'reverse', 'separate', 'subtype', 'synchronized',
-            'tagged', 'task', 'terminate', 'type', 'use', 'when', 'with'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00007f;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #46aa03; font-weight:bold;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            2 => 'color: #adadad; font-style: italic; font-weight: bold;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/sparql.php b/inc/geshi/sparql.php
deleted file mode 100644
index 282165a01..000000000
--- a/inc/geshi/sparql.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/*************************************************************************************
- * sparql.php
- * -------
- * Author: Karima Rafes (karima.rafes@bordercloud.com)
- * Copyright: (c) 2011 Bourdercloud.com
- * Release Version: 1.0.8.11
- * Date Started: 2011/11/05
- *
- * SPARQL language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2011/11/05 (1.0.0)
- *  -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'SPARQL',
-    'COMMENT_SINGLE' => array('#'),
-    'COMMENT_MULTI' => array('/*' => '*/' ),
-    'COMMENT_REGEXP' => array(
-        //IRI (it's not a comment ;)
-        1 => "/<[^> ]*>/i"
-        ),
-    'CASE_KEYWORDS' => 1,
-    'QUOTEMARKS' => array("'", '"', '`'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'BASE','PREFIX','SELECT','DISTINCT','REDUCED','CONSTRUCT','DESCRIBE','ASK','FROM',
-            'NAMED','WHERE','ORDER','BY','ASC','DESC','LIMIT','OFFSET','OPTIONAL','GRAPH',
-            'UNION','FILTER','STR','LANG','LANGMATCHES','DATATYPE','BOUND','SAMETERM',
-            'ISIRI','ISURI','ISBLANK',
-            'ISLITERAL','REGEX','SUBSTR','TRUE',
-            'FALSE','LOAD','CLEAR',
-            'DROP','ADD','MOVE','COPY',
-            'CREATE','DELETE','INSERT',
-            'USING','SILENT','DEFAULT','ALL',
-            'DATA','WITH','INTO','TO',
-            'AS','GROUP','HAVING','UNDEF',
-            'BINDINGS','SERVICE','BIND','MINUS_KEYWORD',
-            'IRI','URI', 'BNODE',
-            'RAND','ABS','CEIL','FLOOR','ROUND',
-            'CONCAT','STRLEN',
-            'UCASE','LCASE','ENCODE_FOR_URI',
-            'CONTAINS','STRSTARTS',
-            'STRENDS','STRBEFORE',
-            'STRAFTER','REPLACE',
-            'YEAR','MONTH',
-            'DAY','HOURS',
-            'MINUTES','SECONDS',
-            'TIMEZONE','TZ',
-            'NOW','MD5',
-            'SHA1','SHA224',
-            'SHA256','SHA384',
-            'SHA512','COALESCE',
-            'IF','STRLANG','STRDT',
-            'ISNUMERIC','COUNT',
-            'SUM','MIN',
-            'MAX','AVG','SAMPLE',
-            'GROUP_CONCAT ','NOT',
-            'IN','EXISTS','SEPARATOR'
-            )
-        ),
-    'REGEXPS' => array(
-        //Variables without braces
-        1 => "\\?[a-zA-Z_][a-zA-Z0-9_]*",
-        //prefix
-        2 => "[a-zA-Z_.\\-0-9]*:",
-        //tag lang
-        3 => "@[^ .)}]*",
-        ),
-    'SYMBOLS' => array(
-        0 => array(
-            '{', '}' , '.', ';'
-            ),
-        1 => array(
-            '^^',
-            '<=','>=','!=','=','<','>','|',
-            '&&','||',
-            '(',')','[', ']',
-            '+','-','*','!','/'
-            ),
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #993333; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #808080; font-style: italic;',
-            1 => 'color: #000078;',
-            //2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF63C3;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #0000FF;',
-            1 => 'color: #FF8000; font-weight: bold;'
-            ),
-        'SCRIPT' => array(),
-        'REGEXPS' => array(
-            1 => 'color: #007800;',
-            2 => 'color: #780078;',
-            3 => 'color: #005078;'
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/sql.php b/inc/geshi/sql.php
deleted file mode 100644
index 4d08a51fe..000000000
--- a/inc/geshi/sql.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/*************************************************************************************
- * sql.php
- * -------
- * Author: Nigel McNie (nigel@geshi.org)
- * Contributors:
- *  - Jürgen Thomas (Juergen.Thomas@vs-polis.de)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * SQL language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/07/19 (1.0.8.9)
- *  -  Added many more keywords
- * 2008/05/23 (1.0.7.22)
- *  -  Added additional symbols for highlighting
- * 2004/11/27 (1.0.3)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.2)
- *  -  Added "`" string delimiter
- *  -  Added "#" single comment starter
- * 2004/08/05 (1.0.1)
- *  -  Added support for symbols
- *  -  Added many more keywords (mostly MYSQL keywords)
- * 2004/07/14 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Add all keywords
- * * Split this to several sql files - mysql-sql, ansi-sql etc
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'SQL',
-    'COMMENT_SINGLE' => array(1 =>'--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => 1,
-    'QUOTEMARKS' => array("'", '"', '`'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC', 'AUTO_INCREMENT',
-            'BEFORE', 'BEGIN', 'BETWEEN', 'BIGINT', 'BINARY', 'BLOB', 'BOOLEAN', 'BOTH', 'BY',
-            'CALL', 'CASE', 'CAST', 'CEIL', 'CEILING', 'CHANGE', 'CHAR', 'CHAR_LENGTH', 'CHARACTER',
-            'CHARACTER_LENGTH', 'CHECK', 'CLOB', 'COALESCE', 'COLLATE', 'COLUMN', 'COLUMNS',
-            'CONNECT', 'CONSTRAINT', 'CONVERT', 'COUNT', 'CREATE', 'CROSS', 'CURRENT',
-            'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
-            'DATA', 'DATABASE', 'DATABASES', 'DATE', 'DAY', 'DEC', 'DECIMAL', 'DECLARE',
-            'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE', 'DISTINCT', 'DOUBLE',
-            'DOMAIN', 'DROP',
-            'ELSE', 'ENCLOSED', 'END', 'ESCAPED', 'EXCEPT', 'EXEC', 'EXECUTE', 'EXISTS', 'EXP',
-            'EXPLAIN', 'EXTRACT',
-            'FALSE', 'FIELD', 'FIELDS', 'FILTER', 'FIRST', 'FLOAT', 'FLOOR', 'FLUSH', 'FOR',
-            'FOREIGN', 'FROM', 'FULL', 'FUNCTION',
-            'GET', 'GROUP', 'GROUPING', 'GO', 'GOTO', 'GRANT', 'GRANTED',
-            'HAVING', 'HOUR',
-            'IDENTIFIED', 'IDENTITY', 'IF', 'IGNORE', 'IN', 'INCREMENT', 'INDEX', 'INFILE', 'INNER',
-            'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERSECTION', 'INTERVAL',
-            'INTO', 'IS',
-            'JOIN',
-            'KEY', 'KEYS', 'KILL',
-            'LANGUAGE', 'LARGE', 'LAST', 'LEADING', 'LEFT', 'LENGTH', 'LIKE', 'LIMIT', 'LINES', 'LOAD',
-            'LOCAL', 'LOCK', 'LOW_PRIORITY', 'LOWER',
-            'MATCH', 'MAX', 'MERGE', 'MIN', 'MINUTE', 'MOD', 'MODIFIES', 'MODIFY', 'MONTH',
-            'NATIONAL', 'NATURAL', 'NCHAR', 'NEW', 'NEXT', 'NEXTVAL', 'NONE', 'NOT',
-            'NULL', 'NULLABLE', 'NULLIF', 'NULLS', 'NUMBER', 'NUMERIC',
-            'OF', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPTIMIZE', 'OPTION',
-            'OPTIONALLY', 'OR', 'ORDER', 'OUT', 'OUTER', 'OUTFILE', 'OVER',
-            'POSITION', 'POWER', 'PRECISION', 'PREPARE', 'PRIMARY', 'PROCEDURAL', 'PROCEDURE',
-            'READ', 'REAL', 'REF', 'REFERENCES', 'REFERENCING', 'REGEXP', 'RENAME', 'REPLACE',
-            'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'RLIKE', 'ROLLBACK', 'ROW',
-            'ROW_NUMBER', 'ROWS', 'RESTRICT', 'ROLE', 'ROUTINE', 'ROW_COUNT',
-            'SAVEPOINT', 'SEARCH', 'SECOND', 'SECTION', 'SELECT', 'SELF', 'SEQUENCE',
-            'SESSION', 'SET', 'SETVAL', 'SHOW', 'SIMILAR', 'SIZE', 'SMALLINT', 'SOME',
-            'SONAME', 'SOURCE', 'SPACE', 'SQL', 'SQRT', 'START', 'STATUS',
-            'STRAIGHT_JOIN', 'STRUCTURE', 'STYLE', 'SUBSTRING', 'SUM',
-            'TABLE', 'TABLE_NAME', 'TABLES', 'TERMINATED', 'TEMPORARY', 'THEN', 'TIME',
-            'TIMESTAMP', 'TO', 'TRAILING', 'TRANSACTION', 'TRIGGER', 'TRIM', 'TRUE', 'TRUNCATE',
-            'TRUSTED', 'TYPE',
-            'UNDER', 'UNION', 'UNIQUE', 'UNKNOWN', 'UNLOCK', 'UNSIGNED',
-            'UPDATE', 'UPPER', 'USE', 'USER', 'USING',
-            'VALUE', 'VALUES', 'VARCHAR', 'VARIABLES', 'VARYING', 'VIEW',
-            'WHEN', 'WHERE', 'WITH', 'WITHIN', 'WITHOUT', 'WORK', 'WRITE',
-            'XOR',
-            'YEAR',
-            'ZEROFILL'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '=', '<', '>', '|', ',', '.', '+', '-', '*', '/'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #993333; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            //2 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/stonescript.php b/inc/geshi/stonescript.php
deleted file mode 100644
index 2844e885e..000000000
--- a/inc/geshi/stonescript.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/*************************************************************************************
- * stonescript.php
- * --------
- * Author: Archimmersion ( based on ruby.php by Moises Deniz )
- * Copyright: (c) 2011 Archimmersion ( http://www.archimmersion.com )
- * Release Version: 1.0.8.11
- * Date Started: 2011/03/30
- *
- * StoneScript language file for GeSHi.
- *
- * StonesCript is a Lua based script language for the ShiVa3D game engine ( http://www.stonetrip.com )
- *
- * More information can be found at http://www.stonetrip.com/developer/doc/api/introduction
- *
- * CHANGES
- * -------
- * 2011/04/18 (1.0.8.11)
- *   -  Initial release
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'StoneScript',
-    'COMMENT_SINGLE' => array(1 => "--"),
-    'COMMENT_MULTI' => array("--[[" => "]]"),
-    'COMMENT_REGEXP' => array(
-        4 => '/<<\s*?(\w+)\\n.*?\\n\\1(?![a-zA-Z0-9])/si',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '`','\''),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        // Blue - General Keywords
-        1 => array(
-                'and', 'begin', 'break', 'do', 'else', 'elseif', 'end',
-                'for', 'if', 'in', 'while', 'next', 'not', 'or', 'redo',
-                'then', 'unless', 'until', 'when', 'false', 'nil', 'self',
-                'true', 'local', 'this', 'return',
-            ),
-        // Dark Blue - Main API names
-        2 => array(
-                'animation', 'application', 'cache', 'camera', 'debug',
-                'dynamics', 'group', 'hashtable', 'hud', 'input', 'light',
-                'log', 'math', 'mesh', 'microphone', 'music', 'navigation',
-                'network', 'object', 'pixelmap', 'projector', 'scene',
-                'sensor', 'server', 'session', 'sfx', 'shape', 'sound',
-                'string', 'system', 'table', 'user', 'video', 'xml',
-                // Plugin API names
-                'plasma', 'watersim',
-                'winDirectories',
-                'ActionSheet', 'Alert', 'Mail', 'Picker', 'StatusBar',
-            ),
-        // Constants
-        // Can be commented out if performance is crucial -> then these keywords will appear in a slightly lighter color
-        3 => array(
-                //Animation
-                'kPlaybackModeLoop', 'kPlaybackModeLoopMirrored', 'kPlaybackModeLoopReversed',
-                'kPlaybackModeOnce', 'kPlaybackModeOnceReversed',
-                //Application - Environment
-                'kStatusLoading', 'kStatusReady', 'kStatusSaving', // 'kStatusNone'
-                //Application - Options
-                'kOptionAudioMasterVolume', 'kOptionAutomaticVirtualKeyboard', 'kOptionDynamicShadowsBufferCount',
-                'kOptionDynamicShadowsBufferSize', 'kOptionDynamicShadowsConstantSampling', 'kOptionDynamicShadowsPCFSampleCount',
-                'kOptionDynamicShadowsQuality', 'kOptionDynamicShadowsScreenSpaceBlur', 'kOptionFullscreen',
-                'kOptionFullscreenHeight', 'kOptionFullscreenWidth', 'kOptionHardwareOcclusion',
-                'kOptionMaxEventBouncesPerFrame', 'kOptionNetworkStreams', 'kOptionNetworkStreamsUseBrowser',
-                'kOptionPrioritizeEventBounces', 'kOptionRenderingEnabled', 'kOptionShadersQuality',
-                'kOptionSwapInterval', 'kOptionTerrainsQuality', 'kOptionTexturesAnisotropyLevel',
-                'kOptionTexturesMipmapBias', 'kOptionTexturesQuality', 'kOptionViewportRotation',
-                //Application - Resource Types
-                'kResourceTypeAnimBank', 'kResourceTypeFont', 'kResourceTypeHUD',
-                'kResourceTypeMaterial', 'kResourceTypeMesh', 'kResourceTypeParticle',
-                'kResourceTypePixelMap', 'kResourceTypeSoundBank', 'kResourceTypeTexture',
-                'kResourceTypeTextureClip', 'kResourceTypeTrail',
-                //Cache
-                'kPropertyHeight', 'kPropertySize', 'kPropertyWidth',
-                //Dynamics
-                'kAxisX', 'kAxisY', 'kAxisZ',
-                'kTypeBox', 'kTypeCapsule', 'kTypeSphere',
-                //HUD
-                'kAddressingModeClamp', 'kAddressingModeRepeat', 'kAlignCenter', 'kAlignJustify','kAlignLeft', 'kAlignRight',
-                'kAlignTop', 'kBlendModeAdd', 'kBlendModeDefault', 'kBlendModeModulate', 'kCaseFixed', 'kCaseVariable',
-                'kCommandTypeCallAction', 'kCommandTypeCopyCheckStateToRegister', 'kCommandTypeCopyEditTextToRegister',
-                'kCommandTypeCopyListItemTextToRegister', 'kCommandTypeCopyListLastSelectedItemToRegister',
-                'kCommandTypeCopyProgressValueToRegister', 'kCommandTypeCopySliderValueToRegister', 'kCommandTypeCopyTagToRegister',
-                'kCommandTypeEnterModalMode', 'kCommandTypeInterpolateBackgroundColor', 'kCommandTypeInterpolateBorderColor',
-                'kCommandTypeInterpolateForegroundColor', 'kCommandTypeInterpolateHeight', 'kCommandTypeInterpolateOpacity',
-                'kCommandTypeInterpolatePosition', 'kCommandTypeInterpolateProgressValue', 'kCommandTypeInterpolateRotation',
-                'kCommandTypeInterpolateSize', 'kCommandTypeInterpolateWidth', 'kCommandTypeLeaveModalMode',
-                'kCommandTypeMatchScreenSpaceBottomLeftCorner', 'kCommandTypeMatchScreenSpaceBottomRightCorner',
-                'kCommandTypeMatchScreenSpaceCenter', 'kCommandTypeMatchScreenSpaceHeight', 'kCommandTypeMatchScreenSpaceTopLeftCorner',
-                'kCommandTypeMatchScreenSpaceTopRightCorner', 'kCommandTypeMatchScreenSpaceWidth', 'kCommandTypePauseMovie',
-                'kCommandTypePauseSound', 'kCommandTypePauseTimer', 'kCommandTypePlayMovie', 'kCommandTypePlaySound',
-                'kCommandTypePlaySoundLoop', 'kCommandTypeResumeSound', 'kCommandTypeSendEventToUser', 'kCommandTypeSetActive',
-                'kCommandTypeSetBackgroundColor', 'kCommandTypeSetBackgroundImage', 'kCommandTypeSetBackgroundImageUVOffset',
-                'kCommandTypeSetBackgroundImageUVScale', 'kCommandTypeSetBorderColor', 'kCommandTypeSetButtonText',
-                'kCommandTypeSetCheckState', 'kCommandTypeSetCheckText', 'kCommandTypeSetCursorPosition', 'kCommandTypeSetCursorVisible',
-                'kCommandTypeSetEditText', 'kCommandTypeSetFocus', 'kCommandTypeSetForegroundColor', 'kCommandTypeSetHeight',
-                'kCommandTypeSetLabelText', 'kCommandTypeSetOpacity', 'kCommandTypeSetPosition', 'kCommandTypeSetRotation',
-                'kCommandTypeSetSize', 'kCommandTypeSetVisible', 'kCommandTypeSetWidth', 'kCommandTypeSleep', 'kCommandTypeStartTimer',
-                'kCommandTypeStopAction', 'kCommandTypeStopMovie', 'kCommandTypeStopSound', 'kCommandTypeStopTimer',
-                'kComponentTypeButton', 'kComponentTypeCheck', 'kComponentTypeContainer', 'kComponentTypeEdit', 'kComponentTypeLabel',
-                'kComponentTypeList', 'kComponentTypeMovie', 'kComponentTypePicture', 'kComponentTypePixelMap', 'kComponentTypeProgress',
-                'kComponentTypeRenderMap', 'kComponentTypeSlider', 'kCursorShapeCross', 'kCursorShapeDefault', 'kCursorShapeHandPointing',
-                'kCursorShapeIBeam', 'kCursorShapeNone', 'kCursorShapeWaiting', 'kDirectionLeftToRight', 'kDirectionRightToLeft',
-                'kEncodingASCII', 'kEncodingUTF8', 'kEventTypeGainFocus', 'kEventTypeLooseFocus', 'kEventTypeMouseEnter',
-                'kEventTypeMouseLeave', 'kFillModeSolid', 'kInterpolatorTypeLinear', 'kInterpolatorTypePower2', 'kInterpolatorTypePower3',
-                'kInterpolatorTypePower4', 'kInterpolatorTypeRoot2', 'kInterpolatorTypeRoot3', 'kInterpolatorTypeRoot4',
-                'kInterpolatorTypeSpring1', 'kInterpolatorTypeSpring2', 'kInterpolatorTypeSpring3', 'kInterpolatorTypeSpring4',
-                'kInterpolatorTypeSpring5', 'kInterpolatorTypeSpring6',
-                'kOriginBottom', 'kOriginBottomLeft', 'kOriginBottomRight', 'kOriginCenter', 'kOriginLeft', 'kOriginRight',
-                'kOriginTop', 'kOriginTopLeft', 'kOriginTopRight', 'kProgressTypeBottomToTop', 'kProgressTypeLeftToRight',
-                'kProgressTypeRightToLeft', 'kProgressTypeTopToBottom', 'kRuntimeValueCallArgument0', 'kRuntimeValueCallArgument1',
-                'kRuntimeValueCallArgument2', 'kRuntimeValueCallArgument3', 'kRuntimeValueCurrentUser', 'kRuntimeValueCurrentUserMainCamera',
-                'kRuntimeValueRegister0', 'kRuntimeValueRegister1', 'kRuntimeValueRegister2', 'kRuntimeValueRegister3',
-                'kShapeTypeEllipsoid', 'kShapeTypeRectangle', 'kShapeTypeRoundRectangle', 'kSliderTypeBottomToTop',
-                'kSliderTypeLeftToRight', 'kSliderTypeRightToLeft', 'kSliderTypeTopToBottom', 'kWaveTypeConstant',
-                'kWaveTypeSawtooth', 'kWaveTypeSawtoothInv', 'kWaveTypeSinus', 'kWaveTypeSinusNoise', 'kWaveTypeSquare', 'kWaveTypeTriangle',
-                //Input
-                'kJoypadTypeIPhone', 'kJoypadTypeNone', 'kJoypadTypePhone', 'kJoypadTypeStandard', 'kJoypadTypeWiimote',
-                'kKey0', 'kKey1', 'kKey2', 'kKey3', 'kKey4', 'kKey5', 'kKey6', 'kKey7', 'kKey8', 'kKey9', 'kKeyA', 'kKeyB',
-                'kKeyBackspace', 'kKeyC', 'kKeyD', 'kKeyDelete', 'kKeyDown', 'kKeyE', 'kKeyEnd', 'kKeyEscape', 'kKeyF',
-                'kKeyF1', 'kKeyF10', 'kKeyF11', 'kKeyF12', 'kKeyF2', 'kKeyF3', 'kKeyF4', 'kKeyF5', 'kKeyF6', 'kKeyF7',
-                'kKeyF8', 'kKeyF9', 'kKeyG', 'kKeyH', 'kKeyHome', 'kKeyI', 'kKeyInsert', 'kKeyJ', 'kKeyK', 'kKeyL',
-                'kKeyLAlt', 'kKeyLControl', 'kKeyLeft', 'kKeyLShift', 'kKeyM', 'kKeyN', 'kKeyO', 'kKeyP', 'kKeyPageDown',
-                'kKeyPageUp', 'kKeyQ', 'kKeyR', 'kKeyRAlt', 'kKeyRControl', 'kKeyReturn', 'kKeyRight', 'kKeyRShift',
-                'kKeyS', 'kKeySpace', 'kKeyT', 'kKeyTab', 'kKeyU', 'kKeyUp', 'kKeyV', 'kKeyW', 'kKeyX', 'kKeyY',
-                'kKeyZ', 'kJoypadButtonPSPCircle', 'kJoypadButtonPSPCross', 'kJoypadButtonPSPDown', 'kJoypadButtonPSPL',
-                'kJoypadButtonPSPLeft', 'kJoypadButtonPSPR', 'kJoypadButtonPSPRight', 'kJoypadButtonPSPSelect',
-                'kJoypadButtonPSPSquare', 'kJoypadButtonPSPStart', 'kJoypadButtonPSPTriangle', 'kJoypadButtonPSPUp',
-                'kJoypadTypePSP', 'kJoypadButtonWiimoteA', 'kJoypadButtonWiimoteB', 'kJoypadButtonWiimoteC',
-                'kJoypadButtonWiimoteDown', 'kJoypadButtonWiimoteHome', 'kJoypadButtonWiimoteLeft',
-                'kJoypadButtonWiimoteMinus', 'kJoypadButtonWiimoteOne', 'kJoypadButtonWiimotePlus',
-                'kJoypadButtonWiimoteRight', 'kJoypadButtonWiimoteTwo', 'kJoypadButtonWiimoteUp', 'kJoypadButtonWiimoteZ',
-                //Light
-                'kTypeDirectional', 'kTypePoint',
-                //Math
-                'kEpsilon', 'kInfinity', 'kPi',
-                //Mesh
-                'kLockModeRead', 'kLockModeWrite', 'kLockReadWrite',
-                //Network
-                'kBluetoothServerPort', 'kDefaultServerPort', 'kStatusAuthenticated', 'kStatusSearchFinished', // 'kStatusNone', 'kStatusPending',
-                //Object
-                'kControllerTypeAI', 'kControllerTypeAnimation', 'kControllerTypeAny', 'kControllerTypeDynamics',
-                'kControllerTypeNavigation', 'kControllerTypeSound', 'kGlobalSpace', 'kLocalSpace', 'kParentSpace',
-                'kTransformOptionInheritsParentRotation', 'kTransformOptionInheritsParentScale', 'kTransformOptionInheritsParentTranslation',
-                'kTransformOptionTranslationAffectedByParentRotation', 'kTransformOptionTranslationAffectedByParentScale', 'kTypeCamera',
-                'kTypeCollider', 'kTypeDummy', 'kTypeGroup', 'kTypeLight', 'kTypeOccluder', 'kTypeProjector', 'kTypeReflector',
-                'kTypeSensor', 'kTypeSfx', 'kTypeShape',
-                //Pixelmap
-                'kBlendModeDecal', 'kBlendModeReplace', 'kFillModeBrush', 'kFillModeNone', 'kPenModeBrush', // 'kFillModeSolid',
-                'kPenModeNone', 'kPenModeSolid',
-                //Projector
-                'kMapTypeMovie', 'kMapTypePixelMap', 'kMapTypeRenderMap', 'kMapTypeTexture', 'kMapTypeTextureClip',
-                //Scene
-                'kFilteringModeBilinear', 'kFilteringModeNearest', 'kFilteringModeTrilinear', // 'kAddressingModeClamp', 'kAddressingModeRepeat',
-                'kSkyBoxFaceBack', 'kSkyBoxFaceBottom', 'kSkyBoxFaceFront', 'kSkyBoxFaceLeft', 'kSkyBoxFaceRight', 'kSkyBoxFaceTop',
-                //Sensor
-                'kShapeTypeBox', 'kShapeTypeSphere',
-                //Server
-                'kStatusConnected', 'kStatusNone', 'kStatusPending',
-                //Session - duplicate keywords
-                //'kStatusConnected', 'kStatusNone', 'kStatusPending',
-                //Shape
-                'kMapTypeUnknown', 'kCurveTypeBezier', 'kCurveTypeBSpline', 'kCurveTypeCatmullRom', 'kCurveTypePolyLine',
-                // 'kMapTypeMovie', 'kMapTypePixelMap', 'kMapTypeRenderMap', 'kMapTypeTexture',  'kMapTypeTextureClip',
-
-                //System
-                'kOSType3DS', 'kOSTypeBada', 'kOSTypeBrew', 'kOSTypePalm', 'kOSTypePS3',
-                'kClientTypeEditor', 'kClientTypeEmbedded', 'kClientTypeStandalone',
-                'kGPUCapabilityBloomFilterSupport', 'kGPUCapabilityContrastFilterSupport', 'kGPUCapabilityDepthBlurFilterSupport',
-                'kGPUCapabilityDistortionFilterSupport', 'kGPUCapabilityDynamicShadowsSupport', 'kGPUCapabilityHardwareOcclusionSupport',
-                'kGPUCapabilityHardwareRenderingSupport', 'kGPUCapabilityMonochromeFilterSupport', 'kGPUCapabilityMotionBlurFilterSupport',
-                'kGPUCapabilityPixelShaderSupport', 'kGPUCapabilityVelocityBlurFilterSupport', 'kGPUCapabilityVertexShaderSupport',
-                'kLanguageAlbanian', 'kLanguageArabic', 'kLanguageBulgarian', 'kLanguageCatalan', 'kLanguageCzech', 'kLanguageDanish',
-                'kLanguageDutch', 'kLanguageEnglish', 'kLanguageFinnish', 'kLanguageFrench', 'kLanguageGerman', 'kLanguageGreek',
-                'kLanguageHebrew', 'kLanguageHungarian', 'kLanguageIcelandic', 'kLanguageItalian', 'kLanguageJapanese', 'kLanguageKorean',
-                'kLanguageNorwegian', 'kLanguagePolish', 'kLanguagePortuguese', 'kLanguageRomanian', 'kLanguageRussian',
-                'kLanguageSerboCroatian', 'kLanguageSlovak', 'kLanguageSpanish', 'kLanguageSwedish', 'kLanguageThai',
-                'kLanguageTurkish', 'kLanguageUnknown', 'kLanguageUrdu', 'kOSTypeAndroid', 'kOSTypeAngstrom', 'kOSTypeIPhone',
-                'kOSTypeLinux', 'kOSTypeMac', 'kOSTypePSP', 'kOSTypeSymbian', 'kOSTypeWii', 'kOSTypeWindows', 'kOSTypeWindowsCE',
-            ),
-        // Not used yet
-        4 => array(
-                'dummycommand',
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
-        '+', '-', '=>', '<<'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color:#0000FF; font-weight:bold;',
-            2 => 'color:#000088; font-weight:bold;',
-            3 => 'color:#C088C0; font-weight:bold;',
-            4 => 'color:#00FEFE; font-weight:bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color:#008000; font-style:italic;',
-            4 => 'color: #cc0000; font-style: italic;',
-            'MULTI' => 'color:#008000; font-style:italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color:#000099;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color:#000000; font-weight:bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color:#888800;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color:#AA0000;'
-            ),
-        // names after "."
-        'METHODS' => array(
-            1 => 'color:#FF00FF; font-weight:bold;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color:#000000; font-weight:bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color:#ff6633; font-weight:bold;',
-            1 => 'color:#0066ff; font-weight:bold;',
-            2 => 'color:#6666ff; font-weight:bold;',
-            3 => 'color:#ff3333; font-weight:bold;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        0 => array(//Variables
-            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        1 => array(//Arrays
-            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*",//Static OOP symbols
-        3 => array(
-            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        0 => array(
-            '<%' => '%>'
-            )
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        ),
-    'TAB_WIDTH' => 2
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/systemverilog.php b/inc/geshi/systemverilog.php
deleted file mode 100644
index f2ba92b19..000000000
--- a/inc/geshi/systemverilog.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/************************************************************************************
- * systemverilog.php
- * -------
- * Author: Sean O'Boyle
- * Copyright: (C) 2008 IntelligentDV
- * Release Version: 1.0.8.11
- * Date Started: 2008/06/25
- *
- * SystemVerilog IEEE 1800-2009(draft8) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/06/25 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2008/06/25)
- * -------------------------
- *
- *************************************************************************************
- *
- *   This file is part of GeSHi.
- *
- *  GeSHi is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- ************************************************************************
- * Title:        SystemVerilog Language Keywords File for GeSHi
- * Description:  This file contains the SV keywords defined in the
- *               IEEE1800-2009 Draft Standard in the format expected by
- *               GeSHi.
- *
- * Original Author: Sean O'Boyle
- * Contact:         seanoboyle@intelligentdv.com
- * Company:         Intelligent Design Verification
- * Company URL:     http://intelligentdv.com
- *
- * Download the most recent version here:
- *                  http://intelligentdv.com/downloads
- *
- * File Bugs Here:  http://bugs.intelligentdv.com
- *        Project:  SyntaxFiles
- *
- * File: systemverilog.php
- * $LastChangedBy: benbe $
- * $LastChangedDate: 2012-08-18 01:56:20 +0200 (Sa, 18. Aug 2012) $
- * $LastChangedRevision: 2542 $
- *
- ************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'SystemVerilog',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        // system tasks
-        1 => array(
-            'acos','acosh','asin','asinh','assertfailoff','assertfailon',
-            'assertkill','assertnonvacuouson','assertoff','asserton',
-            'assertpassoff','assertpasson','assertvacuousoff','async$and$array',
-            'async$and$plane','async$nand$array','async$nand$plane',
-            'async$nor$array','async$nor$plane','async$or$array',
-            'async$or$plane','atan','atan2','atanh','bits','bitstoreal',
-            'bitstoshortreal','cast','ceil','changed','changed_gclk',
-            'changing_gclk','clog2','cos','cosh','countones','coverage_control',
-            'coverage_get','coverage_get_max','coverage_merge','coverage_save',
-            'dimensions','display','displayb','displayh','displayo',
-            'dist_chi_square','dist_erlang','dist_exponential','dist_normal',
-            'dist_poisson','dist_t','dist_uniform','dumpall','dumpfile',
-            'dumpflush','dumplimit','dumpoff','dumpon','dumpports',
-            'dumpportsall','dumpportsflush','dumpportslimit','dumpportsoff',
-            'dumpportson','dumpvars','error','exit','exp','falling_gclk',
-            'fclose','fdisplay','fdisplayb','fdisplayh','fdisplayo','fell',
-            'fell_gclk','feof','ferror','fflush','fgetc','fgets','finish',
-            'floor','fmonitor','fmonitorb','fmonitorh','fmonitoro','fopen',
-            'fread','fscanf','fseek','fstrobe','fstrobeb','fstrobeh','fstrobeo',
-            'ftell','future_gclk','fwrite','fwriteb','fwriteh','fwriteo',
-            'get_coverage','high','hypot','increment','info','isunbounded',
-            'isunknown','itor','left','ln','load_coverage_db','log10','low',
-            'monitor','monitorb','monitorh','monitoro','monitoroff','monitoron',
-            'onehot','onehot0','past','past_gclk','pow','printtimescale',
-            'q_add','q_exam','q_full','q_initialize','q_remove','random',
-            'readmemb','readmemh','realtime','realtobits','rewind','right',
-            'rising_gclk','rose','rose_gclk','rtoi','sampled',
-            'set_coverage_db_name','sformat','sformatf','shortrealtobits',
-            'signed','sin','sinh','size','sqrt','sscanf','stable','stable_gclk',
-            'steady_gclk','stime','stop','strobe','strobeb','strobeh','strobeo',
-            'swrite','swriteb','swriteh','swriteo','sync$and$array',
-            'sync$and$plane','sync$nand$array','sync$nand$plane',
-            'sync$nor$array','sync$nor$plane','sync$or$array','sync$or$plane',
-            'system','tan','tanh','test$plusargs','time','timeformat',
-            'typename','ungetc','unpacked_dimensions','unsigned',
-            'value$plusargs','warning','write','writeb','writeh','writememb',
-            'writememh','writeo',
-            ),
-        // compiler directives
-        2 => array(
-            '`__FILE__', '`__LINE__', '`begin_keywords', '`case', '`celldefine',
-            '`endcelldefine', '`default_nettype', '`define', '`default', '`else',
-            '`elsif', '`end_keywords', '`endfor', '`endif',
-            '`endprotect', '`endswitch', '`endwhile', '`for', '`format',
-            '`if', '`ifdef', '`ifndef', '`include', '`let',
-            '`line', '`nounconnected_drive', '`pragma', '`protect', '`resetall',
-            '`switch', '`timescale', '`unconnected_drive', '`undef', '`undefineall',
-            '`while'
-            ),
-        // keywords
-        3 => array(
-            'assert', 'assume', 'cover', 'expect', 'disable',
-            'iff', 'binsof', 'intersect', 'first_match', 'throughout',
-            'within', 'coverpoint', 'cross', 'wildcard', 'bins',
-            'ignore_bins', 'illegal_bins', 'genvar', 'if', 'else',
-            'unique', 'priority', 'matches', 'default', 'forever',
-            'repeat', 'while', 'for', 'do', 'foreach',
-            'break', 'continue', 'return', 'pulsestyle_onevent', 'pulsestyle_ondetect',
-            'noshowcancelled', 'showcancelled', 'ifnone', 'posedge', 'negedge',
-            'edge', 'wait', 'wait_order', 'timeunit', 'timeprecision',
-            's', 'ms', 'us', 'ns',
-            'ps', 'fs', 'step', 'new', 'extends',
-            'this', 'super', 'protected', 'local', 'rand',
-            'randc', 'bind', 'constraint', 'solve', 'before',
-            'dist', 'inside', 'with', 'virtual', 'extern',
-            'pure', 'forkjoin', 'design', 'instance', 'cell',
-            'liblist', 'use', 'library', 'incdir', 'include',
-            'modport', 'sync_accept_on', 'reject_on', 'accept_on',
-            'sync_reject_on', 'restrict', 'let', 'until', 'until_with',
-            'unique0', 'eventually', 's_until', 's_always', 's_eventually',
-            's_nexttime', 's_until_with', 'global', 'untyped', 'implies',
-            'weak', 'strong', 'nexttime'
-            ),
-        // block keywords
-        4 => array(
-            'begin', 'end', 'package', 'endpackage', 'macromodule',
-            'module', 'endmodule', 'generate', 'endgenerate', 'program',
-            'endprogram', 'class', 'endclass', 'function', 'endfunction',
-            'case', 'casex', 'casez', 'randcase', 'endcase',
-            'interface', 'endinterface', 'clocking', 'endclocking', 'task',
-            'endtask', 'primitive', 'endprimitive', 'fork', 'join',
-            'join_any', 'join_none', 'covergroup', 'endgroup', 'checker',
-            'endchecker', 'property', 'endproperty', 'randsequence', 'sequence',
-            'endsequence', 'specify', 'endspecify', 'config', 'endconfig',
-            'table', 'endtable', 'initial', 'final', 'always',
-            'always_comb', 'always_ff', 'always_latch', 'alias', 'assign',
-            'force', 'release'
-            ),
-
-        // types
-        5 => array(
-            'parameter', 'localparam', 'specparam', 'input', 'output',
-            'inout', 'ref', 'byte', 'shortint', 'int',
-            'integer', 'longint', 'time', 'bit', 'logic',
-            'reg', 'supply0', 'supply1', 'tri', 'triand',
-            'trior', 'trireg', 'tri0', 'tri1', 'wire',
-            'uwire', 'wand', 'wor', 'signed', 'unsigned',
-            'shortreal', 'real', 'realtime', 'type', 'void',
-            'struct', 'union', 'tagged', 'const', 'var',
-            'automatic', 'static', 'packed', 'vectored', 'scalared',
-            'typedef', 'enum', 'string', 'chandle', 'event',
-            'null', 'pullup', 'pulldown', 'cmos', 'rcmos',
-            'nmos', 'pmos', 'rnmos', 'rpmos', 'and',
-            'nand', 'or', 'nor', 'xor', 'xnor',
-            'not', 'buf', 'tran', 'rtran', 'tranif0',
-            'tranif1', 'rtranif0', 'rtranif1', 'bufif0', 'bufif1',
-            'notif0', 'notif1', 'strong0', 'strong1', 'pull0',
-            'pull1', 'weak0', 'weak1', 'highz0', 'highz1',
-            'small', 'medium', 'large'
-            ),
-
-        // DPI
-        6 => array(
-            'DPI', 'DPI-C', 'import', 'export', 'context'
-            ),
-
-        // stdlib
-        7 => array(
-            'randomize', 'mailbox', 'semaphore', 'put', 'get',
-            'try_put', 'try_get', 'peek', 'try_peek', 'process',
-            'state', 'self', 'status', 'kill', 'await',
-            'suspend', 'resume', 'size', 'delete', 'insert',
-            'num', 'first', 'last', 'next', 'prev',
-            'pop_front', 'pop_back', 'push_front', 'push_back', 'find',
-            'find_index', 'find_first', 'find_last', 'find_last_index', 'min',
-            'max', 'unique_index', 'reverse', 'sort', 'rsort',
-            'shuffle', 'sum', 'product', 'List', 'List_Iterator',
-            'neq', 'eq', 'data', 'empty', 'front',
-            'back', 'start', 'finish', 'insert_range', 'erase',
-            'erase_range', 'set', 'swap', 'clear', 'purge'
-            ),
-
-        // key_deprecated
-        8 => array(
-            'defparam', 'deassign', 'TODO'
-        ),
-
-        ),
-    'SYMBOLS' => array(
-            '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%',
-            '^', '&', '|', '~',
-            '?', ':',
-            '#', '<<', '<<<',
-            '>', '<', '>=', '<=',
-            '@', ';', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #996666; font-weight: bold;',
-            2 => 'color: #336600; font-weight: bold;',
-            3 => 'color: #996600; font-weight: bold;',
-            4 => 'color: #000033; font-weight: bold;',
-            5 => 'color: #330033; font-weight: bold;',
-            6 => 'color: #996600; font-weight: bold;',
-            7 => 'color: #CC9900; font-weight: bold;',
-            8 => 'color: #990000; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #00008B; font-style: italic;',
-            'MULTI' => 'color: #00008B; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #9F79EE'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #9F79EE;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #FF00FF;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0055;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #5D478B;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #ff0055;',
-            1 => 'color: #ff0055;',
-            2 => 'color: #ff0055;',
-            3 => 'color: #ff0055;'
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => ''
-        ),
-    'REGEXPS' => array(
-        // integer
-        0 => "\d'[bdh][0-9_a-fA-FxXzZ]+",
-        // realtime
-        1 => "\d*\.\d+[munpf]?s",
-        // time s, ms, us, ns, ps, of fs
-        2 => "\d+[munpf]?s",
-        // real
-        3 => "\d*\.\d+"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        0 => ''
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true
-        ),
-    'TAB_WIDTH' => 3,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            1 => array(
-                'DISALLOWED_BEFORE' => '(?<=$)'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/tcl.php b/inc/geshi/tcl.php
deleted file mode 100644
index 4dd7be87b..000000000
--- a/inc/geshi/tcl.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/*************************************************************************************
- * tcl.php
- * ---------------------------------
- * Author: Reid van Melle (rvanmelle@gmail.com)
- * Copyright: (c) 2004 Reid van Melle (sorry@nowhere)
- * Release Version: 1.0.8.11
- * Date Started: 2006/05/05
- *
- * TCL/iTCL language file for GeSHi.
- *
- * This was thrown together in about an hour so I don't expect
- * really great things.  However, it is a good start.  I never
- * got a change to try out the iTCL or object-based support but
- * this is not widely used anyway.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- * 2006/05/05 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2006/05/05)
- * -------------------------
- * - Get TCL built-in special variables highlighted with a new color..
- *   currently, these are listed in //special variables in the keywords
- *   section, but they get covered by the general REGEXP for symbols
- * - General cleanup, testing, and verification
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'TCL',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        1 => '/(?<!\\\\)#(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //2 => '/{[^}\n]+}/'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'"),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        /*
-         * Set 1: reserved words
-         * http://python.org/doc/current/ref/keywords.html
-         */
-        1 => array(
-            'proc', 'global', 'upvar', 'if', 'then', 'else', 'elseif', 'for', 'foreach',
-            'break', 'continue', 'while', 'set', 'eval', 'case', 'in', 'switch',
-            'default', 'exit', 'error', 'return', 'uplevel', 'loop',
-            'for_array_keys', 'for_recursive_glob', 'for_file', 'unwind_protect',
-            'expr', 'catch', 'namespace', 'rename', 'variable',
-            // itcl
-            'method', 'itcl_class', 'public', 'protected'),
-
-        /*
-         * Set 2: builtins
-         * http://asps.activatestate.com/ASPN/docs/ActiveTcl/8.4/tcl/tcl_2_contents.htm
-         */
-        2 => array(
-            // string handling
-            'append', 'binary', 'format', 're_syntax', 'regexp', 'regsub',
-            'scan', 'string', 'subst',
-            // list handling
-            'concat', 'join', 'lappend', 'lindex', 'list', 'llength', 'lrange',
-            'lreplace', 'lsearch', 'lset', 'lsort', 'split',
-            // procedures and output
-            'incr', 'close', 'eof', 'fblocked', 'fconfigure', 'fcopy', 'file',
-            'fileevent', 'flush', 'gets', 'open', 'puts', 'read', 'seek',
-            'socket', 'tell',
-            // packages and source files
-            'load', 'loadTk', 'package', 'pgk::create', 'pgk_mkIndex', 'source',
-            // interpreter routines
-            'bgerror', 'history', 'info', 'interp', 'memory', 'unknown',
-            // library routines
-            'enconding', 'http', 'msgcat',
-            // system related
-            'cd', 'clock', 'exec', 'glob', 'pid', 'pwd', 'time',
-            // platform specified
-            'dde', 'registry', 'resource',
-            // special variables
-            '$argc', '$argv', '$errorCode', '$errorInfo', '$argv0',
-            '$auto_index', '$auto_oldpath', '$auto_path', '$env',
-            '$tcl_interactive', '$tcl_libpath', '$tcl_library',
-            '$tcl_pkgPath', '$tcl_platform', '$tcl_precision', '$tcl_traceExec',
-            ),
-
-        /*
-         * Set 3: standard library
-         */
-        3 => array(
-            'comment', 'filename', 'library', 'packagens', 'tcltest', 'tclvars',
-            ),
-
-        /*
-         * Set 4: special methods
-         */
-//        4 => array(
-//            )
-
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '$', '*', '&', '%', '!', ';', '<', '>', '?'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-//        4 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
-            2 => 'color: #008000;',                        // Built-ins + self
-            3 => 'color: #dc143c;',                        // Standard lib
-//            4 => 'color: #0000cd;'                        // Special methods
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-//            2 => 'color: #483d8b;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: black;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #483d8b;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff4500;'
-            ),
-        'METHODS' => array(
-            1 => 'color: black;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #ff3333;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-//        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '::'
-        ),
-    'REGEXPS' => array(
-        //Special variables
-        0 => '[\\$]+[a-zA-Z_][a-zA-Z0-9_]*',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'COMMENTS' => array(
-            'DISALLOWED_BEFORE' => '\\'
-        )
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/teraterm.php b/inc/geshi/teraterm.php
deleted file mode 100644
index f125642d5..000000000
--- a/inc/geshi/teraterm.php
+++ /dev/null
@@ -1,354 +0,0 @@
-<?php
-/*************************************************************************************
- * teraterm.php
- * --------
- * Author: Boris Maisuradze (boris at logmett.com)
- * Copyright: (c) 2008 Boris Maisuradze (http://logmett.com)
- * Release Version: 1.0.8.11
- * Date Started: 2008/09/26
- *
- * Tera Term Macro language file for GeSHi.
- *
- *
- * This version of teraterm.php was created for Tera Term 4.62 and LogMeTT 2.9.4.
- * Newer versions of these application can contain additional Macro commands
- * and/or keywords that are not listed here. The latest release of teraterm.php
- * can be downloaded from Download section of LogMeTT.com
- *
- * CHANGES
- * -------
- * 2008/09/26 (1.0.0)
- *   -  First Release for Tera Term 4.60 and below.
- * 2009/03/22 (1.1.0)
- *   -  First Release for Tera Term 4.62 and below.
- * 2009/04/25 (1.1.1)
- *   -  Second Release for Tera Term 4.62 and below.
- * 2010/09/12 (1.1.2)
- *   -  Second Release for Tera Term 4.67, LogMeTT 2.97, TTLEditor 1.2.1 and below.
- *
- * TODO (updated 2010/09/12)
- * -------------------------
- * *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Tera Term Macro',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /* Commands */
-        1 => array(
-            'Beep',
-            'BplusRecv',
-            'BplusSend',
-            'Break',
-            'Call',
-            'CallMenu',
-            'ChangeDir',
-            'ClearScreen',
-            'Clipb2Var',
-            'ClosesBox',
-            'CloseTT',
-            'Code2Str',
-            'Connect',
-            'CRC32',
-            'CRC32File',
-            'CygConnect',
-            'DelPassword',
-            'Disconnect',
-            'DispStr',
-            'Do',
-            'Else',
-            'ElseIf',
-            'EnableKeyb',
-            'End',
-            'EndIf',
-            'EndUntil',
-            'EndWhile',
-            'Exec',
-            'ExecCmnd',
-            'Exit',
-            'FileClose',
-            'FileConcat',
-            'FileCopy',
-            'FileCreate',
-            'FileDelete',
-            'FileMarkPtr',
-            'FileNameBox',
-            'FileOpen',
-            'FileRead',
-            'FileReadln',
-            'FileRename',
-            'FileSearch',
-            'FileSeek',
-            'FileSeekBack',
-            'FileStat',
-            'FileStrSeek',
-            'FileStrSeek2',
-            'FileTruncate',
-            'FileWrite',
-            'FileWriteLn',
-            'FindClose',
-            'FindFirst',
-            'FindNext',
-            'FlushRecv',
-            'For',
-            'GetDate',
-            'GetDir',
-            'GetEnv',
-            'GetHostname',
-            'GetPassword',
-            'GetTime',
-            'GetTitle',
-            'GetTTDir',
-            'Getver',
-            'GoTo',
-            'If',
-            'IfDefined',
-            'Include',
-            'InputBox',
-            'Int2Str',
-            'KmtFinish',
-            'KmtGet',
-            'KmtRecv',
-            'KmtSend',
-            'LoadKeymap',
-            'LogClose',
-            'LogOpen',
-            'LogPause',
-            'LogStart',
-            'LogWrite',
-            'Loop',
-            'MakePath',
-            'MessageBox',
-            'MPause',
-            'Next',
-            'PasswordBox',
-            'Pause',
-            'QuickVANRecv',
-            'QuickVANSend',
-            'Random',
-            'RecvLn',
-            'RestoreSetup',
-            'Return',
-            'RotateLeft',
-            'RotateRight',
-            'ScpRecv',
-            'ScpSend',
-            'Send',
-            'SendBreak',
-            'SendBroadcast',
-            'SendFile',
-            'SendKCode',
-            'SendLn',
-            'SendLnBroadcast',
-            'SendMulticast',
-            'SetBaud',
-            'SetDate',
-            'SetDebug',
-            'SetDir',
-            'SetDlgPos',
-            'SetDTR',
-            'SetEcho',
-            'SetEnv',
-            'SetExitCode',
-            'SetMulticastName',
-            'SetRTS',
-            'SetSync',
-            'SetTime',
-            'SetTitle',
-            'Show',
-            'ShowTT',
-            'SPrintF',
-            'SPrintF2',
-            'StatusBox',
-            'Str2Code',
-            'Str2Int',
-            'StrCompare',
-            'StrConcat',
-            'StrCopy',
-            'StrInsert',
-            'StrJoin',
-            'StrLen',
-            'StrMatch',
-            'StrRemove',
-            'StrReplace',
-            'StrScan',
-            'StrSpecial',
-            'StrSplit',
-            'StrTrim',
-            'TestLink',
-            'Then',
-            'ToLower',
-            'ToUpper',
-            'UnLink',
-            'Until',
-            'Var2Clipb',
-            'Wait',
-            'Wait4All',
-            'WaitEvent',
-            'WaitLn',
-            'WaitN',
-            'WaitRecv',
-            'WaitRegEx',
-            'While',
-            'XmodemRecv',
-            'XmodemSend',
-            'YesNoBox',
-            'YmodemRecv',
-            'YmodemSend',
-            'ZmodemRecv',
-            'ZmodemSend'
-            ),
-        /* System Variables */
-        2 => array(
-            'groupmatchstr1',
-            'groupmatchstr2',
-            'groupmatchstr3',
-            'groupmatchstr4',
-            'groupmatchstr5',
-            'groupmatchstr6',
-            'groupmatchstr7',
-            'groupmatchstr8',
-            'groupmatchstr9',
-            'inputstr',
-            'matchstr',
-            'mtimeout',
-            'param2',
-            'param3',
-            'param4',
-            'param5',
-            'param6',
-            'param7',
-            'param8',
-            'param9',
-            'result',
-            'timeout'
-            ),
-        /* LogMeTT Key Words */
-        3 => array(
-            '$[1]',
-            '$[2]',
-            '$[3]',
-            '$[4]',
-            '$[5]',
-            '$[6]',
-            '$[7]',
-            '$[8]',
-            '$[9]',
-            '$branch$',
-            '$computername$',
-            '$connection$',
-            '$email$',
-            '$logdir$',
-            '$logfilename$',
-            '$lttfilename$',
-            '$mobile$',
-            '$name$',
-            '$pager$',
-            '$parent$',
-            '$phone$',
-            '$snippet$',
-            '$ttdir$',
-            '$user$',
-            '$windir$',
-        ),
-        /* Keyword Symbols */
-        4 => array(
-            'and',
-            'not',
-            'or',
-            'xor'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '+', '-', '*', '/', '%',
-        '!', '&', '|', '^',
-        '<', '>', '=',
-        '?', ':', ';',
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080; font-weight: bold!important;',
-            2 => 'color: #808000; font-weight: bold;',  // System Variables
-            3 => 'color: #ff0000; font-weight: bold;',  // LogMeTT Key Words
-            4 => 'color: #ff00ff; font-weight: bold;'   // Keyword Symbols
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(),
-        'BRACKETS' => array(
-            0 => 'color: #ff00ff; font-weight: bold;'
-        ),
-        'STRINGS' => array(
-            0 => 'color: #800080;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #008080;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #ff00ff; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff; font-weight: bold;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        0 => array (
-            GESHI_SEARCH => '(\:[_a-zA-Z][_a-zA-Z0-9]+)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/text.php b/inc/geshi/text.php
deleted file mode 100644
index 87fb7110c..000000000
--- a/inc/geshi/text.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*************************************************************************************
- * text.php
- * --------
- * Author: Sean Hanna (smokingrope@gmail.com)
- * Copyright: (c) 2006 Sean Hanna
- * Release Version: 1.0.8.11
- * Date Started: 04/23/2006
- *
- * Standard Text File (No Syntax Highlighting).
- * Plaintext language file for GeSHi.
- *
- * CHANGES
- * -------
- * 04/23/2006 (0.5.0)
- * - Syntax File Created
- *
- * 04/27/2006 (1.0.0)
- * - Documentation Cleaned Up
- * - First Release
- *
- * TODO (updated 04/27/2006)
- * -------------------------
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Text',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(),
-    'SYMBOLS' => array(),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(),
-        'COMMENTS' => array(),
-        'ESCAPE_CHAR' => array(),
-        'BRACKETS' => array(),
-        'STRINGS' => array(),
-        'NUMBERS' => array(),
-        'METHODS' => array(),
-        'SYMBOLS' => array(),
-        'SCRIPT' => array(),
-        'REGEXPS' => array()
-        ),
-    'URLS' => array(),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'ALL' => GESHI_NEVER
-        ),
-    )
-);
-
-?>
diff --git a/inc/geshi/thinbasic.php b/inc/geshi/thinbasic.php
deleted file mode 100644
index f54959e16..000000000
--- a/inc/geshi/thinbasic.php
+++ /dev/null
@@ -1,868 +0,0 @@
-<?php
-/*************************************************************************************
- * thinbasic.php
- * ------
- * Author: Eros Olmi (eros.olmi@thinbasic.com)
- * Copyright: (c) 2006 Eros Olmi (http://www.thinbasic.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2006/05/12
- *
- * thinBasic language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2006/05/12 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2006/05/12)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'thinBasic',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'XOR','XML_TREETOSTRING','XML_PARSEFILE','XML_PARSE','XML_PARENT','XML_NODETYPE','XML_NODETOSTRING','XML_NEXTSIBLING',
-            'XML_LASTERROR','XML_GETTAG','XML_FREE','XML_FINDNODE','XML_DECODEPARAM','XML_CHILDDATA','XML_CHILD','XML_ATTRIBVALUE',
-            'XML_ATTRIBNAME','XML_ATTRIBCOUNT','WORD','WITH','WIN_SHOW','WIN_SETTITLE','WIN_SETFOREGROUND','WIN_ISZOOMED',
-            'WIN_ISVISIBLE','WIN_ISICONIC','WIN_GETTITLE','WIN_GETFOREGROUND','WIN_GETCLASS','WIN_GETACTIVE','WIN_FLASH','WIN_FINDBYTITLE',
-            'WIN_FINDBYCLASS','WHILE','WEND','VERIFY','VARPTR','VARIANTVT$','VARIANTVT','VARIANT',
-            'VARIABLE_GETINFO','VARIABLE_EXISTS','VARIABLE_EXIST','VALUE','VAL','USING$','USING','USES',
-            'USER','UNTIL','UNITS','UNION','UNICODE2ASCII','UDP_SEND','UDP_RECV','UDP_OPENSERVER',
-            'UDP_OPEN','UDP_FREEFILE','UDP_CLOSE','UCODE$','UCASE$','UBOUND','TYPE','TRIMFULL$',
-            'TRIM$','TOOLTIP','TOKENIZER_MOVETOEOL','TOKENIZER_KEYSETUSERSTRING','TOKENIZER_KEYSETUSERNUMBER','TOKENIZER_KEYGETUSERSTRING','TOKENIZER_KEYGETUSERNUMBER','TOKENIZER_KEYGETSUBTYPE',
-            'TOKENIZER_KEYGETNAME','TOKENIZER_KEYGETMAINTYPE','TOKENIZER_KEYFIND','TOKENIZER_KEYADD','TOKENIZER_GETNEXTTOKEN','TOKENIZER_DEFAULT_SET','TOKENIZER_DEFAULT_GET','TOKENIZER_DEFAULT_CODE',
-            'TOKENIZER_DEFAULT_CHAR','TO','TIMER','TIME$','THEN','TEXTBOX','TEXT','TCP_SEND',
-            'TCP_RECV','TCP_PRINT','TCP_OPEN','TCP_LINEINPUT','TCP_FREEFILE','TCP_CLOSE','TB_IMGCTX_SETIMAGEADJUSTMENT','TB_IMGCTX_LOADIMAGE',
-            'TB_IMGCTX_GETIMAGEADJUSTMENT','TBGL_VIEWPORT','TBGL_VERTEX','TBGL_USETEXTUREFLAG','TBGL_USETEXTURE','TBGL_USELINESTIPPLEFLAG','TBGL_USELINESTIPPLE','TBGL_USELIGHTSOURCEFLAG',
-            'TBGL_USELIGHTSOURCE','TBGL_USELIGHTINGFLAG','TBGL_USELIGHTING','TBGL_USEFOGFLAG','TBGL_USEFOG','TBGL_USEDEPTHMASK','TBGL_USEDEPTHFLAG','TBGL_USEDEPTH',
-            'TBGL_USECLIPPLANEFLAG','TBGL_USECLIPPLANE','TBGL_USEBLENDFLAG','TBGL_USEBLEND','TBGL_USEALPHATEST','TBGL_TRANSLATE','TBGL_TORUS','TBGL_TEXCOORD2D',
-            'TBGL_SPHERE','TBGL_SHOWWINDOW','TBGL_SHOWCURSOR','TBGL_SETWINDOWTITLE','TBGL_SETUPLIGHTSOURCE','TBGL_SETUPFOG','TBGL_SETUPCLIPPLANE','TBGL_SETPRIMITIVEQUALITY',
-            'TBGL_SETLIGHTPARAMETER','TBGL_SETDRAWDISTANCE','TBGL_SCALE','TBGL_SAVESCREENSHOT','TBGL_ROTATEXYZ','TBGL_ROTATE','TBGL_RESETMATRIX','TBGL_RENDERTOTEXTURE',
-            'TBGL_RENDERMATRIX3D','TBGL_RENDERMATRIX2D','TBGL_PUSHMATRIX','TBGL_PRINTFONT','TBGL_PRINTBMP','TBGL_PRINT','TBGL_POS3DTOPOS2D','TBGL_POPMATRIX',
-            'TBGL_POLYGONLOOK','TBGL_POINTSIZE','TBGL_POINTINSIDE3D','TBGL_NORMAL','TBGL_NEWLIST','TBGL_MOUSEGETWHEELDELTA','TBGL_MOUSEGETRBUTTON','TBGL_MOUSEGETPOSY',
-            'TBGL_MOUSEGETPOSX','TBGL_MOUSEGETMBUTTON','TBGL_MOUSEGETLBUTTON','TBGL_M15SETVERTEXZ','TBGL_M15SETVERTEXY','TBGL_M15SETVERTEXXYZ','TBGL_M15SETVERTEXX','TBGL_M15SETVERTEXTEXY',
-            'TBGL_M15SETVERTEXTEXXY','TBGL_M15SETVERTEXTEXX','TBGL_M15SETVERTEXTEXN','TBGL_M15SETVERTEXRGB','TBGL_M15SETVERTEXR','TBGL_M15SETVERTEXPSTOP','TBGL_M15SETVERTEXPARAM','TBGL_M15SETVERTEXLAYER',
-            'TBGL_M15SETVERTEXG','TBGL_M15SETVERTEXB','TBGL_M15SETMODELVERTEXCOUNT','TBGL_M15SETBONECHILD','TBGL_M15ROTBONEZ','TBGL_M15ROTBONEY','TBGL_M15ROTBONEX','TBGL_M15ROTBONE',
-            'TBGL_M15RESETBONES','TBGL_M15RECALCNORMALS','TBGL_M15LOADMODEL','TBGL_M15INITMODELBUFFERS','TBGL_M15GETVERTEXZ','TBGL_M15GETVERTEXY','TBGL_M15GETVERTEXXYZ','TBGL_M15GETVERTEXX',
-            'TBGL_M15GETVERTEXTEXY','TBGL_M15GETVERTEXTEXXY','TBGL_M15GETVERTEXTEXX','TBGL_M15GETVERTEXTEXN','TBGL_M15GETVERTEXRGB','TBGL_M15GETVERTEXR','TBGL_M15GETVERTEXPSTOP','TBGL_M15GETVERTEXPARAM',
-            'TBGL_M15GETVERTEXLAYER','TBGL_M15GETVERTEXG','TBGL_M15GETVERTEXB','TBGL_M15GETMODELVERTEXCOUNT','TBGL_M15GETMODELPOLYCOUNT','TBGL_M15ERASECHILDBONES','TBGL_M15DRAWMODEL','TBGL_M15DEFBONERESET',
-            'TBGL_M15DEFBONELAYER','TBGL_M15DEFBONEBOX','TBGL_M15DEFBONEANCHOR','TBGL_M15DEFBONEADDVERTEX','TBGL_M15CLEARMODEL','TBGL_M15APPLYBONES','TBGL_M15ADDBONETREEITEM','TBGL_LOADTEXTURE',
-            'TBGL_LOADFONT','TBGL_LOADBMPFONT','TBGL_LINEWIDTH','TBGL_LINESTIPPLE','TBGL_KILLFONT','TBGL_ISWINDOW','TBGL_ISPOINTVISIBLE','TBGL_ISPOINTBEHINDVIEW',
-            'TBGL_GETWINDOWMULTIKEYSTATE','TBGL_GETWINDOWKEYSTATE','TBGL_GETWINDOWKEYONCE','TBGL_GETWINDOWCLIENT','TBGL_GETTEXTURENAME','TBGL_GETTEXTURELIST','TBGL_GETPIXELINFO','TBGL_GETMULTIASYNCKEYSTATE',
-            'TBGL_GETLASTGLERROR','TBGL_GETFRAMERATE','TBGL_GETDESKTOPINFO','TBGL_GETASYNCKEYSTATE','TBGL_ERRORMESSAGES','TBGL_ENDPOLY','TBGL_ENDLIST','TBGL_DRAWFRAME',
-            'TBGL_DESTROYWINDOW','TBGL_DELETELIST','TBGL_CYLINDER','TBGL_CREATEWINDOWEX','TBGL_CREATEWINDOW','TBGL_COLORALPHA','TBGL_COLOR','TBGL_CLEARFRAME',
-            'TBGL_CAMERA','TBGL_CALLLIST','TBGL_BUILDFONT','TBGL_BOX','TBGL_BLENDFUNC','TBGL_BINDTEXTURE','TBGL_BEGINPOLY','TBGL_BACKCOLOR',
-            'TBGL_ALPHAFUNC','TBDI_JOYZ','TBDI_JOYY','TBDI_JOYX','TBDI_JOYSTOPEFFECT','TBDI_JOYSLIDER','TBDI_JOYSETRANGEZ','TBDI_JOYSETRANGEY',
-            'TBDI_JOYSETRANGEXYZ','TBDI_JOYSETRANGEX','TBDI_JOYSETDEADZONEZ','TBDI_JOYSETDEADZONEY','TBDI_JOYSETDEADZONEXYZ','TBDI_JOYSETDEADZONEX','TBDI_JOYSETAUTOCENTER','TBDI_JOYRZ',
-            'TBDI_JOYRY','TBDI_JOYRX','TBDI_JOYPOV','TBDI_JOYPLAYEFFECT','TBDI_JOYLOADEFFECT','TBDI_JOYHASFF','TBDI_JOYHASEFFECT','TBDI_JOYGETEFFECTNAME',
-            'TBDI_JOYGETEFFECTGUID','TBDI_JOYCREATEEFFECT','TBDI_JOYCOUNTPOV','TBDI_JOYCOUNTEFFECTS','TBDI_JOYCOUNTBTN','TBDI_JOYCOUNTAXES','TBDI_JOYBUTTON','TBDI_JOYAVAIL',
-            'TBDI_INIT','TBASS_STREAMFREE','TBASS_STREAMCREATEFILE','TBASS_SETVOLUME','TBASS_SETEAXPRESET','TBASS_SETEAXPARAMETERS','TBASS_SETCONFIG','TBASS_SET3DPOSITION',
-            'TBASS_SET3DFACTORS','TBASS_SAMPLELOAD','TBASS_SAMPLEGETCHANNEL','TBASS_MUSICLOAD','TBASS_MUSICFREE','TBASS_INIT','TBASS_GETVOLUME','TBASS_GETVERSION',
-            'TBASS_GETCONFIG','TBASS_FREE','TBASS_ERRORGETCODE','TBASS_CHANNELSTOP','TBASS_CHANNELSETPOSITION','TBASS_CHANNELSETATTRIBUTES','TBASS_CHANNELSET3DPOSITION','TBASS_CHANNELPLAY',
-            'TBASS_CHANNELPAUSE','TBASS_CHANNELISACTIVE','TBASS_CHANNELGETPOSITION','TBASS_CHANNELGETLENGTH','TBASS_CHANNELGETATTRIBUTES','TBASS_APPLY3D','TANH','TANGENT',
-            'TAN','TALLY','TABCTRL_ONNOTIFY','TABCTRL_INSERTITEM','TABCTRL_GETCURSEL','SWAP','SUB','STRZIP$',
-            'STRUNZIP$','STRREVERSE$','STRPTRLEN','STRPTR','STRINSERT$','STRING$','STRING','STRDELETE$',
-            'STR$','STOP','STEP','STDOUT','STDIN','STAT_SUM','STAT_STDERROR','STAT_STDDEVIATION',
-            'STAT_RANDOM','STAT_PRODUCT','STAT_MIN','STAT_MEDIAN','STAT_MEANHARMONIC','STAT_MEANGEOMETRIC','STAT_MEANARITHMETIC','STAT_MAX',
-            'STAT_INVERSESUM','STAT_HISTOGRAM','STAT_FILLARRAY','STAT_COUNT','STAT_COPYARRAY','STAT_CLONEARRAY','STAT_CHISQUARE','STATIC',
-            'STATE','SQR','SPLIT','SORT','SMTP_STATISTICS','SMTP_SETOPTION','SMTP_SETLOGFILE','SMTP_SENDHTML',
-            'SMTP_SENDEMAIL','SMTP_GETERROR','SMTP_FINISHED','SMTP_DEBUG','SMTP_CONNECT','SMTP_CLOSE','SLEEP','SIZEOF',
-            'SIZE','SINH','SINGLE','SIN','SIGNED','SHOW','SHIFT','SHAPETOBMP',
-            'SGN','SETAT','SET','SENDMESSAGE','SENDKEYSBULK','SENDKEYS','SEND','SELECTEXPRESSION',
-            'SELECT','SECH','SEC','SCAN','SAPI_SPEAK','SAPI_SETVOLUME','SAPI_SETRATE','SAPI_MODULELOADED',
-            'SAPI_GETVOLUME','SAPI_GETRATE','RTRIM$','RTF_SETTEXT','RTF_SETFONTSIZE','RTF_SETFONTNAME','RTF_SETFGCOLOR','RTF_SETEFFECT',
-            'RTF_SETBGCOLOR','RTF_SETALIGN','RTF_SAVETOFILE','RTF_LOADFROMFILE','RTF_GETTEXT','RTF_GETFONTSIZE','RTF_GETFONTNAME','RTF_GETEFFECT',
-            'RTF_GETCLASS','RTF_APPENDTEXT','RSET$','ROUND','RNDF','RND','RIGHT$','RIGHT',
-            'RGB','RESOURCE','RESIZE','RESET','REPLACE$','REPEAT$','REMOVE$','REM',
-            'REGISTRY_SETVALUE','REGISTRY_SETTXTNUM','REGISTRY_SETTXTBOOL','REGISTRY_SETDWORD','REGISTRY_GETVALUE','REGISTRY_GETTXTNUM','REGISTRY_GETTXTBOOL','REGISTRY_GETDWORD',
-            'REGISTRY_GETALLKEYS','REGISTRY_DELVALUE','REGISTRY_DELKEY','REFERENCE','REF','REDRAW','REDIM','RAS_SETPARAMS',
-            'RAS_OPENDIALUPDIALOG','RAS_LOADENTRIES','RAS_HANGUPALL','RAS_HANGUP','RAS_GETENTRY','RAS_BEGINDIAL','RANDOMIZE','RADTODEG',
-            'QUERYPERFORMANCEFREQUENCY','QUERYPERFORMANCECOUNTER','QUAD','PTR','PRESERVE','POST','POPUP','POKE$',
-            'POKE','PIXELS','PI','PERMUTATIONS','PEEKMESSAGE','PEEK$','PEEK','PC_SYSTEMUPFROM',
-            'PC_SUSPENDSTATE','PC_SHUTDOWN','PC_SHOWCARET','PC_SETCARETBLINKTIME','PC_RESTARTDIALOG','PC_PREVENTSHUTDOWN','PC_LOCK','PC_INSERTCD',
-            'PC_HIDECARET','PC_GETSTATEONOFF','PC_GETSCROLLLOCKKEYSTATE','PC_GETNUMLOCKKEYSTATE','PC_GETCARETBLINKTIME','PC_GETCAPSLOCKKEYSTATE','PC_EMPTYBIN','PC_EJECTCD',
-            'PC_DECODECDERROR','PCT','PARSESET$','PARSECOUNT','PARSE$','PARSE','PARAMETERS','OUTSIDE',
-            'OS_WINVERSIONTEXT','OS_WINGETVERSIONTIMELINE','OS_SHELLEXECUTE','OS_SHELLABOUT','OS_SHELL','OS_SETLASTCALLDLLERROR','OS_SERVICESTOP','OS_SERVICESTATUSDESCRIPTION',
-            'OS_SERVICESTARTTYPEDESCRIPTION','OS_SERVICESTART','OS_SERVICESETSTARTTYPE','OS_SERVICEQUERY','OS_SERVICEGETSTARTTYPE','OS_SERVICEGETLIST','OS_PROCESSKILLBYNAME','OS_PROCESSKILLBYID',
-            'OS_PROCESSISRUNNING','OS_PROCESSGETLIST','OS_PROCESSGETID','OS_PROCESSARERUNNING','OS_MESSAGEBEEP','OS_ISWOW64','OS_ISFEATUREPRESENT','OS_IEVERSION',
-            'OS_GETWINDOWSDIR','OS_GETUSERNAME','OS_GETTEMPDIR','OS_GETSYSTEMDIR','OS_GETSPECIALFOLDER','OS_GETLASTCALLDLLSTATUS','OS_GETLASTCALLDLLERROR','OS_GETCURRENTTHREADID',
-            'OS_GETCURRENTPROCESSID','OS_GETCOMPUTERNAME','OS_GETCOMMANDS','OS_GETCOMMAND','OS_FLASHWINDOW','OS_FATALAPPEXIT','OS_ENVIRON','OS_CALLDLL',
-            'OR','OPTIONAL','OPTION','OPT','ONCE','ON','OFF','NUMBER',
-            'NOT','NEXT','NEW','MSGBOX','MOUSEPTR','MODULE','MODELESS','MODAL',
-            'MOD','MKWRD$','MKS$','MKQ$','MKL$','MKI$','MKE$','MKDWD$',
-            'MKD$','MKCUX$','MKCUR$','MKBYT$','MIN$','MIN','MID$','MENU',
-            'MDI_CREATE','MCASE$','MAX$','MAX','MAKWRD','MAKLNG','MAKINT','MAKDWR',
-            'LTRIM$','LSET$','LOWRD','LOOP','LONG','LOINT','LOG_WRITE','LOGB',
-            'LOG2','LOG10','LOG','LOCAL','LOC','LL_UPDATEBYNAME','LL_UPDATE','LL_TOSTRING',
-            'LL_TOFILE','LL_NAME','LL_GETITEM','LL_GETBYNUMBER','LL_FROMFILE','LL_FREE','LL_FINDLAST','LL_FINDBYNAME',
-            'LL_FINDBYDATA','LL_DELETELIKE','LL_DELETEBYNAME','LL_DELETE','LL_DATABYNAME','LL_DATA','LL_COUNT','LL_ADD',
-            'LISTBOX','LINE','LIBRARY_EXISTS','LIB','LEN','LEFT$','LEFT','LCASE$',
-            'LBOUND','LABEL','KILL','JOIN$','ITERATE','ISWINDOW','ISUNICODE','ISTRUE',
-            'ISODD','ISLIKE','ISFALSE','ISEVEN','IP_TOSTRING','IP_ADDR','INTERNALINFO','INTEGER',
-            'INT','INSTR','INSIDE','INPUTBOX$','INI_SETKEY','INI_GETSECTIONSLIST','INI_GETSECTIONKEYLIST','INI_GETKEY',
-            'INET_URLDOWNLOAD','INET_PING','INET_OPENDIALUPDIALOG','INET_GETSTATE','INET_GETREMOTEMACADDRESS','INET_GETIP','INET_GETCONNECTIONMODE','INCR',
-            'IN','IMAGE','IIF$','IIF','IF','ICRYPTO_TESTSHA1','ICRYPTO_TESTMD5','ICRYPTO_TESTCRC32',
-            'ICRYPTO_TESTCRC16','ICRYPTO_STRING2ASCII','ICRYPTO_SHA1','ICRYPTO_MD5','ICRYPTO_ENCRYPTRIJNDAEL','ICRYPTO_ENCRYPTRC4','ICRYPTO_DECRYPTRIJNDAEL','ICRYPTO_DECRYPTRC4',
-            'ICRYPTO_CRC32','ICRYPTO_CRC16','ICRYPTO_BYTEXOR','ICRYPTO_BIN2ASCII','ICRYPTO_ASCII2STRING','ICRYPTO_ASCII2BIN','HOST_ADDR','HOSTNAME_TOIP',
-            'HOSTIP_TONAME','HIWRD','HIINT','HEX$','HASH','HANDLE','GUIDTXT$','GUID$',
-            'GRAPHIC','GLVOID','GLUSHORT','GLUINT','GLUBYTE','GLSIZEI','GLSHORT','GLOBAL',
-            'GLINT','GLFLOAT','GLENUM','GLDOUBLE','GLCLAMPF','GLCLAMPD','GLBYTE','GLBOOLEAN',
-            'GLBITFIELD','GETWINDOWMULTIKEYSTATE','GETWINDOWKEYSTATE','GETTICKCOUNT','GETS','GETMULTIASYNCKEYSTATE','GETMESSAGE','GETCURRENTINSTANCE',
-            'GETAT','GETASYNCKEYSTATE','GET','FUNCTION_NPARAMS','FUNCTION_EXISTS','FUNCTION_CPARAMS','FUNCTION','FTP_SETSTRING',
-            'FTP_SETSERVERDIR','FTP_SETNUMBER','FTP_SETMODE','FTP_SETLOGFILE','FTP_SETLOCALDIR','FTP_QUIT','FTP_PUTFILE','FTP_GETSTRING',
-            'FTP_GETSERVERDIR','FTP_GETNUMBER','FTP_GETLOCALDIR','FTP_GETLIST','FTP_GETFILE','FTP_GETERRORSTRING','FTP_GETERRORNUMBER','FTP_FINISHED',
-            'FTP_EXTRACT','FTP_DELFILE','FTP_CONNECT','FTP_COMMAND','FRAME','FRAC','FORMAT$','FOR',
-            'FONT_LIST','FONT_CREATE','FONT','FOCUS','FLUSH','FIX','FILE_SIZE','FILE_SHELLDELETE',
-            'FILE_SHELLCOPY','FILE_SETDATETIME','FILE_SEEK','FILE_SAVE','FILE_RENAME','FILE_PUT','FILE_PATHSPLIT','FILE_OPEN',
-            'FILE_LOF','FILE_LOAD','FILE_LINEPRINT','FILE_LINEINPUT','FILE_KILL','FILE_GETVERSIONSTRING','FILE_GETVERSION','FILE_GETTIME',
-            'FILE_GETDATETIMESTAMP','FILE_GETDATETIME','FILE_GETDATE','FILE_GET','FILE_EXISTS','FILE_EOF','FILE_COPY','FILE_CLOSE',
-            'FILE_CHANGED','FILE_APPEND','FACTORIAL','EXTRACT$','EXT','EXPORT','EXP2','EXP10',
-            'EXP','EXIT','EVAL_STRING','EVAL_SETSTRING','EVAL_SETNUMBER','EVAL_MATH','EVAL_LINKEXT','EVAL_GETSTRING',
-            'EVAL_GETNUMBER','EVAL_ERRORGETTOKEN','EVAL_ERRORDESCRIPTION','EVAL_ERRORCLEAR','EVAL','ERRCLEAR','ERR','ENGINE_GETCURRENTTOKEN',
-            'ENDIF','END','ENABLE','ELSEIF','ELSE','ECHO','DWORD','DT_YEAR',
-            'DT_TIMETOSEC','DT_TIMESUBSECONDS','DT_TIMEFORMAT','DT_TIMEADDSECONDS','DT_SETTIMESEPARATOR','DT_SETDATESEPARATOR','DT_SETDATECENTURY','DT_SECTOTIME',
-            'DT_SECTODATE','DT_SECOND','DT_MONTH','DT_MINUTE','DT_LASTDAYOFMONTH','DT_ISVALIDDATE','DT_ISLEAPYEAR','DT_HOUR',
-            'DT_GETWEEKDAYNAME','DT_GETWEEKDAY','DT_GETTIMESTAMP','DT_GETTIMESEPARATOR','DT_GETMONTHNAME','DT_GETDATESEPARATOR','DT_GETDATECENTURY','DT_DAY',
-            'DT_DATETOSEC','DT_DATETIMESUBSECONDS','DT_DATETIMEADDSECONDS','DT_DATESUBDAYS','DT_DATEFORMAT','DT_DATEDIFF','DT_DATEADDDAYS','DT_COOKIEDATE',
-            'DRAW','DOUBLE','DOEVENTS','DO','DISABLE','DIR_REMOVE','DIR_MAKEALL','DIR_MAKE',
-            'DIR_LISTARRAY','DIR_LIST','DIR_ISEMPTY','DIR_ISDIR','DIR_GETCURRENT','DIR_EXISTS','DIR_CHANGEDRIVE','DIR_CHANGE',
-            'DIM','DICTIONARY_MEMINFO','DICTIONARY_LISTKEYS','DICTIONARY_FREE','DICTIONARY_FIND','DICTIONARY_EXISTS','DICTIONARY_CREATE','DICTIONARY_COUNT',
-            'DICTIONARY_ADD','DIALOG_STOPEVENTS','DIALOG_SAVEFILE','DIALOG_OPENFILE','DIALOG_GETCONTROL','DIALOG_CHOOSECOLOR','DIALOG_BROWSEFORFOLDER','DIALOG',
-            'DESKTOP','DESCENDING','DESCEND','DELETEOBJECT','DELETE','DEGTORAD','DECR','DECLARE',
-            'DATE$','CVWRD','CVS','CVQ','CVL','CVI','CVE','CVDWD',
-            'CVD','CVCUX','CVCUR','CVBYT','CURRENCY','CUR','CSET$','CSCH',
-            'CSC','CRYPTO_GETPROVIDERTYPESCOUNT','CRYPTO_GETPROVIDERSCOUNT','CRYPTO_GETDEFAULTPROVIDER','CRYPTO_GENRANDOMSTRING','CRYPTO_ENUMPROVIDERTYPES','CRYPTO_ENUMPROVIDERS','CRYPTO_ENCRYPT',
-            'CRYPTO_DECRYPT','CREATEFONT','COTH','COTAN','COSH','COS','CONTROL_SETTEXT','CONTROL_GETTEXT',
-            'CONTROL_GETNUMBER','CONTROL','CONST','CONSOLE_WRITELINE','CONSOLE_WRITE','CONSOLE_WAITKEY','CONSOLE_SHOWWINDOW','CONSOLE_SHOWCURSOR',
-            'CONSOLE_SETTITLE','CONSOLE_SETTEXTATTRIBUTE','CONSOLE_SETSTDHANDLE','CONSOLE_SETSCREENBUFFERSIZE','CONSOLE_SETPROGRESSBARCHAR','CONSOLE_SETOUTPUTMODE','CONSOLE_SETOUTPUTCP','CONSOLE_SETINPUTMODE',
-            'CONSOLE_SETFILEAPISTOOEM','CONSOLE_SETFILEAPISTOANSI','CONSOLE_SETCURSORSIZE','CONSOLE_SETCURSORPOSITION','CONSOLE_SETCP','CONSOLE_SETACTIVESCREENBUFFER','CONSOLE_SCROLLWINDOW','CONSOLE_SCROLLBUFFERONEROW',
-            'CONSOLE_SCROLLBUFFER','CONSOLE_SAVESCREEN','CONSOLE_RESTORESCREEN','CONSOLE_READLINE','CONSOLE_READ','CONSOLE_PROGRESSBAR','CONSOLE_PRINTLINE','CONSOLE_PRINTAT',
-            'CONSOLE_PRINT','CONSOLE_NORMALSCREEN','CONSOLE_LINE','CONSOLE_INKEYB','CONSOLE_INKEY','CONSOLE_HIDECURSOR','CONSOLE_GETTITLE','CONSOLE_GETTEXTATTRIBUTE',
-            'CONSOLE_GETSTDHANDLE','CONSOLE_GETSIZEY','CONSOLE_GETSIZEX','CONSOLE_GETPROGRESSBARCHAR','CONSOLE_GETOUTPUTMODE','CONSOLE_GETOUTPUTCP','CONSOLE_GETNUMBEROFMOUSEBUTTONS','CONSOLE_GETINPUTMODE',
-            'CONSOLE_GETCURSORY','CONSOLE_GETCURSORX','CONSOLE_GETCURSORSIZE','CONSOLE_GETCURRENTFONTINDEX','CONSOLE_GETCP','CONSOLE_GENERATECTRLEVENT','CONSOLE_FULLSCREEN','CONSOLE_FREE',
-            'CONSOLE_FOREGROUNDRGB','CONSOLE_ENABLECTRLC','CONSOLE_DISABLECTRLC','CONSOLE_CREATESCREENBUFFER','CONSOLE_COLORAT','CONSOLE_CLS','CONSOLE_BOX','CONSOLE_BACKGROUNDRGB',
-            'CONSOLE_ATTACH','CONSOLE_AREFILEAPISANSI','CONSOLE_ALLOC','COM_VARIANTINIT','COM_VARIANTCOPY','COM_VARIANTCLEAR','COM_SUCCEEDED','COM_STRINGFROMCLSID',
-            'COM_RELEASE','COM_QUERYINTERFACE','COM_PROGIDFROMCLSID','COM_ISEQUALIID','COM_ISEQUALGUID','COM_ISEQUALCLSID','COM_GETOBJECT','COM_GETENGINEGUID',
-            'COM_EXECUTE','COM_DISPLAYERROR','COM_CREATEOBJECT','COM_CLSIDFROMSTRING','COM_CLSIDFROMPROGID','COM_BUILDVARIANT','COMBOBOX','COMBINATIONS',
-            'COLOR','CLIPBOARD_SETTEXT','CLIPBOARD_GETTEXT','CLIENT','CLEARMESSAGES','CHR$','CHOOSE$','CHOOSE',
-            'CHECKBOX','CHECK3STATE','CHECK','CGI_WRITELOGFILE','CGI_WRITE','CGI_URLDECODESTRING','CGI_UPLOADFILESTIME','CGI_UPLOADFILESNUMBER',
-            'CGI_UPLOADFILESIZE','CGI_STARTSESSION','CGI_SETSESSIONVARIABLE','CGI_RESETDEFAULTSETTINGS','CGI_REMOVESPECIALCHARSPREFIX','CGI_REMOVEQUOTE','CGI_READ','CGI_LOADCONFIGFILE',
-            'CGI_HEADER','CGI_GETSESSIONVARIABLE','CGI_GETREQUESTMETHOD','CGI_GETQUERYVALUE','CGI_GETCURRENTSESSION','CGI_GETCURRENTGUID','CGI_ENVIRON','CGI_CFGSETOPTION',
-            'CGI_CFGGETOPTION','CGI_ADDSPECIALCHARSPREFIX','CGI_ADDQUOTE','CEIL','CASE','CALL','BYVAL','BYTE',
-            'BYREF','BYCMD','BUTTON','BUNDLE_SETSCRIPTPARAMETERS','BUNDLE_SETSCRIPTNAME','BUNDLE_SETFLAGOBFUSCATEMAINSCRIPT','BUNDLE_SETFLAGDELETEAFTERRUN','BUNDLE_SETFLAGCOMPRESSALLFILES',
-            'BUNDLE_SETFLAGASKBEFOREEXTRACT','BUNDLE_SETEXTRACTIONFOLDER','BUNDLE_SETCREATIONFOLDER','BUNDLE_SETBUNDLENAME','BUNDLE_RESET','BUNDLE_MAKE','BUNDLE_BUILDER','BUNDLE_ADDFOLDER',
-            'BUNDLE_ADDFILE','BOUNDCHECK','BIN$','BIFF_WRITETEXT','BIFF_WRITENUMBER','BIFF_WRITEDATE','BIFF_SETROWHEIGHT','BIFF_SETCOLWIDTH',
-            'BIFF_SETBUFFER','BIFF_CREATEFILE','BIFF_CLOSEFILE','BETWEEN','BEEP','BAR','ATTACH','ATN',
-            'AT','ASSIGN','ASCIZ','ASCIIZ','ASCII2UNICODE','ASCENDING','ASCEND','ASC',
-            'AS','ARRAY','ARCTANH','ARCSINH','ARCSIN','ARCSECH','ARCSEC','ARCCSCH',
-            'ARCCSC','ARCCOTH','ARCCOT','ARCCOSH','ARCCOS','APP_TIMER','APP_SOURCEPATH','APP_SOURCENAME',
-            'APP_SOURCEFULLNAME','APP_PATH','APP_NAME','APP_LISTVARIABLES','APP_LISTKEYWORDS','APP_LISTFUNCTIONS','APP_LISTEQUATES','APP_INCLUDEPATH',
-            'APP_GETMODULEFULLPATH','APP_COUNTER','APPEND','ANY','ANIMATE_STOP','ANIMATE_PLAY','ANIMATE_OPEN','AND',
-            'ALIAS','ALERT','ADD','ACODE$','ABS','%DEF','#MINVERSION','#IF',
-            '#ENDIF','#ELSEIF','#ELSE','#DEFAULT','#DEF','SQLWRITEPRIVATEPROFILESTRING','SQLWRITEFILEDSN','SQLWRITEDSNTOINI',
-            'SQLVALIDDSN','SQLTRANSACT','SQLTABLES','SQLTABLEPRIVILEGES','SQLSTATISTICS','SQLSPECIALCOLUMNS','SQLSETSTMTOPTION','SQLSETSTMTATTR',
-            'SQLSETSCROLLOPTIONS','SQLSETPOS','SQLSETPARAM','SQLSETENVATTR','SQLSETDESCREC','SQLSETDESCFIELD','SQLSETCURSORNAME','SQLSETCONNECTOPTION',
-            'SQLSETCONNECTATTR','SQLSETCONFIGMODE','SQLROWCOUNT','SQLREMOVETRANSLATOR','SQLREMOVEDSNFROMINI','SQLREMOVEDRIVERMANAGER','SQLREMOVEDRIVER','SQLREADFILEDSN',
-            'SQLPUTDATA','SQLPROCEDURES','SQLPROCEDURECOLUMNS','SQLPRIMARYKEYS','SQLPREPARE','SQLPOSTINSTALLERERROR','SQLPARAMOPTIONS','SQLPARAMDATA',
-            'SQLNUMRESULTCOLS','SQLNUMPARAMS','SQLNATIVESQL','SQLMORERESULTS','SQLMANAGEDATASOURCES','SQLINSTALLTRANSLATOREX','SQLINSTALLERERROR','SQLINSTALLDRIVERMANAGER',
-            'SQLINSTALLDRIVEREX','SQLGETTYPEINFO','SQLGETTRANSLATOR','SQLGETSTMTOPTION','SQLGETSTMTATTR','SQLGETPRIVATEPROFILESTRING','SQLGETINSTALLEDDRIVERS','SQLGETINFO',
-            'SQLGETFUNCTIONS','SQLGETENVATTR','SQLGETDIAGREC','SQLGETDIAGFIELD','SQLGETDESCREC','SQLGETDESCFIELD','SQLGETDATA','SQLGETCURSORNAME',
-            'SQLGETCONNECTOPTION','SQLGETCONNECTATTR','SQLGETCONFIGMODE','SQLFREESTMT','SQLFREEHANDLE','SQLFREEENV','SQLFREECONNECT','SQLFOREIGNKEYS',
-            'SQLFETCHSCROLL','SQLFETCH','SQLEXTENDEDFETCH','SQLEXECUTE','SQLEXECDIRECT','SQLERROR','SQLENDTRAN','SQLDRIVERS',
-            'SQLDRIVERCONNECT','SQLDISCONNECT','SQLDESCRIBEPARAM','SQLDESCRIBECOL','SQLDATASOURCES','SQLCREATEDATASOURCE','SQLCOPYDESC','SQLCONNECT',
-            'SQLCONFIGDRIVER','SQLCONFIGDATASOURCE','SQLCOLUMNS','SQLCOLUMNPRIVILEGES','SQLCOLATTRIBUTES','SQLCOLATTRIBUTE','SQLCLOSECURSOR','SQLCANCEL',
-            'SQLBULKOPERATIONS','SQLBROWSECONNECT','SQLBINDPARAMETER','SQLBINDPARAM','SQLBINDCOL','SQLALLOCSTMT','SQLALLOCHANDLE','SQLALLOCENV',
-            'SQLALLOCCONNECT','ODBCWRONGDRIVER','ODBCWRITEPRIVATEPROFILESTRING','ODBCWRITEFILEDSN','ODBCWRITEDSNTOINI','ODBCVALIDDSN','ODBCUPDATERECORD','ODBCUPDATEBYBOOKMARK',
-            'ODBCUNLOCKRECORD','ODBCUNBINDCOLUMNS','ODBCUNBINDCOL','ODBCTABLESCOUNT','ODBCTABLES','ODBCTABLEPRIVILEGESCOUNT','ODBCTABLEPRIVILEGES','ODBCSUPPORTS',
-            'ODBCSTATTABLESCHEMANAME','ODBCSTATTABLEPAGES','ODBCSTATTABLECATALOGNAME','ODBCSTATTABLECARDINALITY','ODBCSTATISTICSCOUNT','ODBCSTATISTICS','ODBCSTATINDEXSORTSEQUENCE','ODBCSTATINDEXSCHEMANAME',
-            'ODBCSTATINDEXQUALIFIER','ODBCSTATINDEXPAGES','ODBCSTATINDEXFILTERCONDITION','ODBCSTATINDEXCOLUMNORDINALPOSITION','ODBCSTATINDEXCOLUMNNAME','ODBCSTATINDEXCATALOGNAME','ODBCSTATINDEXCARDINALITY','ODBCSTATINDEXALLOWDUPLICATES',
-            'ODBCSPECIALCOLUMNSCOUNT','ODBCSPECIALCOLUMNS','ODBCSETTXNISOLATION','ODBCSETTRANSLATELIB','ODBCSETTRACEFILE','ODBCSETTRACE','ODBCSETSTMTUSEBOOKMARKS','ODBCSETSTMTSIMULATECURSOR',
-            'ODBCSETSTMTROWSTATUSPTR','ODBCSETSTMTROWSFETCHEDPTR','ODBCSETSTMTROWOPERATIONPTR','ODBCSETSTMTROWBINDTYPE','ODBCSETSTMTROWBINDOFFSETPTR','ODBCSETSTMTROWARRAYSIZE','ODBCSETSTMTRETRIEVEDATA','ODBCSETSTMTQUERYTIMEOUT',
-            'ODBCSETSTMTPARAMSTATUSPTR','ODBCSETSTMTPARAMSPROCESSEDPTR','ODBCSETSTMTPARAMSETSIZE','ODBCSETSTMTPARAMOPERATIONPTR','ODBCSETSTMTPARAMBINDTYPE','ODBCSETSTMTPARAMBINDOFFSETPTR','ODBCSETSTMTNOSCAN','ODBCSETSTMTMETADATAID',
-            'ODBCSETSTMTMAXROWS','ODBCSETSTMTMAXLENGTH','ODBCSETSTMTKEYSETSIZE','ODBCSETSTMTFETCHBOOKMARKPTR','ODBCSETSTMTENABLEAUTOIPD','ODBCSETSTMTCURSORTYPE','ODBCSETSTMTCURSORSENSITIVITY','ODBCSETSTMTCURSORSCROLLABLE',
-            'ODBCSETSTMTCONCURRENCY','ODBCSETSTMTATTR','ODBCSETSTMTASYNCENABLE','ODBCSETSTMTAPPROWDESC','ODBCSETSTMTAPPPARAMDESC','ODBCSETSTATICCURSOR','ODBCSETROWVERCONCURRENCY','ODBCSETRESULT',
-            'ODBCSETRELATIVEPOSITION','ODBCSETREADONLYCONCURRENCY','ODBCSETQUIETMODE','ODBCSETPOSITION','ODBCSETPOS','ODBCSETPACKETMODE','ODBCSETOPTIMISTICCONCURRENCY','ODBCSETODBCCURSORS',
-            'ODBCSETMULTIUSERKEYSETCURSOR','ODBCSETMETADATAID','ODBCSETLOGINTIMEOUT','ODBCSETLOCKCONCURRENCY','ODBCSETKEYSETDRIVENCURSOR','ODBCSETFORWARDONLYCURSOR','ODBCSETENVOUTPUTNTS','ODBCSETENVODBCVERSION',
-            'ODBCSETENVCPMATCH','ODBCSETENVCONNECTIONPOOLING','ODBCSETENVATTR','ODBCSETDYNAMICCURSOR','ODBCSETDESCREC','ODBCSETDESCFIELD','ODBCSETCURSORTYPE','ODBCSETCURSORSENSITIVITY',
-            'ODBCSETCURSORSCROLLABILITY','ODBCSETCURSORNAME','ODBCSETCURSORLOCKTYPE','ODBCSETCURSORKEYSETSIZE','ODBCSETCURSORCONCURRENCY','ODBCSETCURRENTCATALOG','ODBCSETCONNECTIONTIMEOUT','ODBCSETCONNECTATTR',
-            'ODBCSETCONFIGMODE','ODBCSETCONCURVALUESCONCURRENCY','ODBCSETAUTOCOMMITON','ODBCSETAUTOCOMMITOFF','ODBCSETAUTOCOMMIT','ODBCSETASYNCENABLE','ODBCSETACCESSMODE','ODBCSETABSOLUTEPOSITION',
-            'ODBCROWCOUNT','ODBCROLLBACKTRAN','ODBCROLLBACKENVTRAN','ODBCROLLBACKDBCTRAN','ODBCRESULT','ODBCRESETPARAMS','ODBCREMOVETRANSLATOR','ODBCREMOVEDSNFROMINI',
-            'ODBCREMOVEDRIVERMANAGER','ODBCREMOVEDRIVER','ODBCREFRESHRECORD','ODBCRECORDCOUNT','ODBCREADFILEDSN','ODBCQUOTEDIDENTIFIERCASE','ODBCPUTDATA','ODBCPROCEDURESCOUNT',
-            'ODBCPROCEDURES','ODBCPROCEDURECOLUMNSCOUNT','ODBCPROCEDURECOLUMNS','ODBCPRIMARYKEYSCOUNT','ODBCPRIMARYKEYS','ODBCPREPARE','ODBCPOSTINSTALLERERROR','ODBCPARAMDATA',
-            'ODBCOPENSTMT','ODBCOPENCONNECTION','ODBCNUMRESULTCOLS','ODBCNUMPARAMS','ODBCNATIVESQL','ODBCMOVEPREVIOUS','ODBCMOVENEXT','ODBCMOVELAST',
-            'ODBCMOVEFIRST','ODBCMOVE','ODBCMORERESULTS','ODBCMANAGEDATASOURCES','ODBCLOCKRECORD','ODBCINSTALLTRANSLATOREX','ODBCINSTALLERERROR','ODBCINSTALLDRIVERMANAGER',
-            'ODBCINSTALLDRIVEREX','ODBCGETXOPENCLIYEAR','ODBCGETUSERNAME','ODBCGETUNION','ODBCGETTYPEINFOCOUNT','ODBCGETTYPEINFO','ODBCGETTXNISOLATIONOPTION','ODBCGETTXNISOLATION',
-            'ODBCGETTXNCAPABLE','ODBCGETTRANSLATOR','ODBCGETTRANSLATELIB','ODBCGETTRACEFILE','ODBCGETTRACE','ODBCGETTIMEDATEFUNCTIONS','ODBCGETTIMEDATEDIFFINTERVALS','ODBCGETTIMEDATEADDINTERVALS',
-            'ODBCGETTABLETERM','ODBCGETSYSTEMFUNCTIONS','ODBCGETSUBQUERIES','ODBCGETSTRINGFUNCTIONS','ODBCGETSTMTUSEBOOKMARKS','ODBCGETSTMTSQLSTATE','ODBCGETSTMTSIMULATECURSOR','ODBCGETSTMTROWSTATUSPTR',
-            'ODBCGETSTMTROWSFETCHEDPTR','ODBCGETSTMTROWOPERATIONPTR','ODBCGETSTMTROWNUMBER','ODBCGETSTMTROWBINDTYPE','ODBCGETSTMTROWBINDOFFSETPTR','ODBCGETSTMTROWARRAYSIZE','ODBCGETSTMTRETRIEVEDATA','ODBCGETSTMTQUERYTIMEOUT',
-            'ODBCGETSTMTPARAMSTATUSPTR','ODBCGETSTMTPARAMSPROCESSEDPTR','ODBCGETSTMTPARAMSETSIZE','ODBCGETSTMTPARAMOPERATIONPTR','ODBCGETSTMTPARAMBINDTYPE','ODBCGETSTMTPARAMBINDOFFSETPTR','ODBCGETSTMTNOSCAN','ODBCGETSTMTMETADATAID',
-            'ODBCGETSTMTMAXROWS','ODBCGETSTMTMAXLENGTH','ODBCGETSTMTKEYSETSIZE','ODBCGETSTMTIMPROWDESC','ODBCGETSTMTIMPPARAMDESC','ODBCGETSTMTFETCHBOOKMARKPTR','ODBCGETSTMTERRORINFO','ODBCGETSTMTENABLEAUTOIPD',
-            'ODBCGETSTMTCURSORTYPE','ODBCGETSTMTCURSORSENSITIVITY','ODBCGETSTMTCURSORSCROLLABLE','ODBCGETSTMTCONCURRENCY','ODBCGETSTMTATTR','ODBCGETSTMTASYNCENABLE','ODBCGETSTMTAPPROWDESC','ODBCGETSTMTAPPPARAMDESC',
-            'ODBCGETSTATICCURSORATTRIBUTES2','ODBCGETSTATICCURSORATTRIBUTES1','ODBCGETSTATEMENTSQLSTATE','ODBCGETSTATEMENTERRORINFO','ODBCGETSTANDARDCLICONFORMANCE','ODBCGETSQLSTATE','ODBCGETSQLCONFORMANCE','ODBCGETSQL92VALUEEXPRESSIONS',
-            'ODBCGETSQL92STRINGFUNCTIONS','ODBCGETSQL92ROWVALUECONSTRUCTOR','ODBCGETSQL92REVOKE','ODBCGETSQL92RELATIONALJOINOPERATORS','ODBCGETSQL92PREDICATES','ODBCGETSQL92NUMERICVALUEFUNCTIONS','ODBCGETSQL92GRANT','ODBCGETSQL92FOREIGNKEYUPDATERULE',
-            'ODBCGETSQL92FOREIGNKEYDELETERULE','ODBCGETSQL92DATETIMEFUNCTIONS','ODBCGETSPECIALCHARACTERS','ODBCGETSERVERNAME','ODBCGETSEARCHPATTERNESCAPE','ODBCGETSCROLLOPTIONS','ODBCGETSCHEMAUSAGE','ODBCGETSCHEMATERM',
-            'ODBCGETROWUPDATES','ODBCGETQUIETMODE','ODBCGETPROCEDURETERM','ODBCGETPROCEDURESSUPPORT','ODBCGETPRIVATEPROFILESTRING','ODBCGETPOSOPERATIONS','ODBCGETPARAMARRAYSELECTS','ODBCGETPARAMARRAYROWCOUNTS',
-            'ODBCGETPACKETMODE','ODBCGETOUTERJOINS','ODBCGETORDERBYCOLUMNSINSELECT','ODBCGETOJCAPABILITIES','ODBCGETODBCVER','ODBCGETODBCINTERFACECONFORMANCE','ODBCGETODBCCURSORS','ODBCGETNUMERICFUNCTIONS',
-            'ODBCGETNULLCOLLATION','ODBCGETNONNULLABLECOLUMNS','ODBCGETNEEDLONGDATALEN','ODBCGETMULTRESULTSETS','ODBCGETMULTIPLEACTIVETXN','ODBCGETMETADATAID','ODBCGETMAXUSERNAMELEN','ODBCGETMAXTABLESINSELECT',
-            'ODBCGETMAXTABLENAMELEN','ODBCGETMAXSTATEMENTLEN','ODBCGETMAXSCHEMANAMELEN','ODBCGETMAXROWSIZEINCLUDESLONG','ODBCGETMAXROWSIZE','ODBCGETMAXPROCEDURENAMELEN','ODBCGETMAXINDEXSIZE','ODBCGETMAXIDENTIFIERLEN',
-            'ODBCGETMAXDRIVERCONNECTIONS','ODBCGETMAXCURSORNAMELEN','ODBCGETMAXCONCURRENTACTIVITIES','ODBCGETMAXCOLUMNSINTABLE','ODBCGETMAXCOLUMNSINSELECT','ODBCGETMAXCOLUMNSINORDERBY','ODBCGETMAXCOLUMNSININDEX','ODBCGETMAXCOLUMNSINGROUPBY',
-            'ODBCGETMAXCOLUMNNAMELEN','ODBCGETMAXCHARLITERALLEN','ODBCGETMAXCATALOGNAMELEN','ODBCGETMAXBINARYLITERALLEN','ODBCGETMAXASYNCCONCURRENTSTATEMENTS','ODBCGETLONGVARCHARDATABYCOLNAME','ODBCGETLONGVARCHARDATA','ODBCGETLOGINTIMEOUT',
-            'ODBCGETLIKEESCAPECLAUSE','ODBCGETKEYWORDS','ODBCGETKEYSETCURSORATTRIBUTES2','ODBCGETKEYSETCURSORATTRIBUTES1','ODBCGETINTEGRITY','ODBCGETINSTALLERERRORMESSAGE','ODBCGETINSTALLERERRORCODE','ODBCGETINSTALLEDDRIVERS',
-            'ODBCGETINSERTSTATEMENT','ODBCGETINFOSTR','ODBCGETINFOSCHEMAVIEWS','ODBCGETINFOLONG','ODBCGETINFOINT','ODBCGETINFO','ODBCGETINDEXKEYWORDS','ODBCGETIMPROWDESCREC',
-            'ODBCGETIMPROWDESCFIELDTYPE','ODBCGETIMPROWDESCFIELDSCALE','ODBCGETIMPROWDESCFIELDPRECISION','ODBCGETIMPROWDESCFIELDOCTETLENGTH','ODBCGETIMPROWDESCFIELDNULLABLE','ODBCGETIMPROWDESCFIELDNAME','ODBCGETIMPROWDESCFIELD','ODBCGETIMPPARAMDESCREC',
-            'ODBCGETIMPPARAMDESCFIELDTYPE','ODBCGETIMPPARAMDESCFIELDSCALE','ODBCGETIMPPARAMDESCFIELDPRECISION','ODBCGETIMPPARAMDESCFIELDOCTETLENGTH','ODBCGETIMPPARAMDESCFIELDNULLABLE','ODBCGETIMPPARAMDESCFIELDNAME','ODBCGETIMPPARAMDESCFIELD','ODBCGETIDENTIFIERQUOTECHAR',
-            'ODBCGETIDENTIFIERCASE','ODBCGETGROUPBY','ODBCGETFUNCTIONS','ODBCGETFORWARDONLYCURSORATTRIBUTES2','ODBCGETFORWARDONLYCURSORATTRIBUTES1','ODBCGETFILEUSAGE','ODBCGETEXPRESSIONSINORDERBY','ODBCGETERRORINFO',
-            'ODBCGETENVSQLSTATE','ODBCGETENVOUTPUTNTS','ODBCGETENVODBCVERSION','ODBCGETENVIRONMENTSQLSTATE','ODBCGETENVIRONMENTERRORINFO','ODBCGETENVERRORINFO','ODBCGETENVCPMATCH','ODBCGETENVCONNECTIONPOOLING',
-            'ODBCGETENVATTR','ODBCGETDYNAMICCURSORATTRIBUTES2','ODBCGETDYNAMICCURSORATTRIBUTES1','ODBCGETDROPVIEW','ODBCGETDROPTRANSLATION','ODBCGETDROPTABLE','ODBCGETDROPSCHEMA','ODBCGETDROPDOMAIN',
-            'ODBCGETDROPCOLLATION','ODBCGETDROPCHARACTERSET','ODBCGETDROPASSERTION','ODBCGETDRIVERVER','ODBCGETDRIVERODBCVER','ODBCGETDRIVERNAME','ODBCGETDRIVERMANAGERINSTALLPATH','ODBCGETDRIVERHLIB',
-            'ODBCGETDRIVERHENV','ODBCGETDRIVERHDBC','ODBCGETDMVERMINOR','ODBCGETDMVERMAJOR','ODBCGETDMVER','ODBCGETDIAGREC','ODBCGETDIAGFIELD','ODBCGETDESCSQLSTATE',
-            'ODBCGETDESCRIPTORSQLSTATE','ODBCGETDESCRIPTORERRORINFO','ODBCGETDESCRIBEPARAMETER','ODBCGETDESCREC','ODBCGETDESCFIELD','ODBCGETDESCERRORINFO','ODBCGETDEFAULTTXNISOLATION','ODBCGETDDLINDEX',
-            'ODBCGETDBMSVER','ODBCGETDBMSNAME','ODBCGETDBCSQLSTATE','ODBCGETDBCERRORINFO','ODBCGETDATETIMELITERALS','ODBCGETDATASTRINGBYCOLNAME','ODBCGETDATASTRING','ODBCGETDATASOURCEREADONLY',
-            'ODBCGETDATASOURCENAME','ODBCGETDATAEXTENSIONS','ODBCGETDATABASENAME','ODBCGETDATA','ODBCGETCURSORTYPE','ODBCGETCURSORSENSITIVITYSUPPORT','ODBCGETCURSORSENSITIVITY','ODBCGETCURSORSCROLLABILITY',
-            'ODBCGETCURSORROLLBACKBEHAVIOR','ODBCGETCURSORNAME','ODBCGETCURSORLOCKTYPE','ODBCGETCURSORKEYSETSIZE','ODBCGETCURSORCONCURRENCY','ODBCGETCURSORCOMMITBEHAVIOR','ODBCGETCURRENTCATALOG','ODBCGETCREATEVIEW',
-            'ODBCGETCREATETRANSLATION','ODBCGETCREATETABLE','ODBCGETCREATESCHEMA','ODBCGETCREATEDOMAIN','ODBCGETCREATECOLLATION','ODBCGETCREATECHARACTERSET','ODBCGETCREATEASSERTION','ODBCGETCORRELATIONNAME',
-            'ODBCGETCONVERTVARCHAR','ODBCGETCONVERTVARBINARY','ODBCGETCONVERTTINYINT','ODBCGETCONVERTTIMESTAMP','ODBCGETCONVERTTIME','ODBCGETCONVERTSMALLINT','ODBCGETCONVERTREAL','ODBCGETCONVERTNUMERIC',
-            'ODBCGETCONVERTLONGVARCHAR','ODBCGETCONVERTLONGVARBINARY','ODBCGETCONVERTINTERVALYEARMONTH','ODBCGETCONVERTINTERVALDAYTIME','ODBCGETCONVERTINTEGER','ODBCGETCONVERTFUNCTIONS','ODBCGETCONVERTFLOAT','ODBCGETCONVERTDOUBLE',
-            'ODBCGETCONVERTDECIMAL','ODBCGETCONVERTDATE','ODBCGETCONVERTCHAR','ODBCGETCONVERTBIT','ODBCGETCONVERTBINARY','ODBCGETCONVERTBIGINT','ODBCGETCONNECTIONTIMEOUT','ODBCGETCONNECTIONSQLSTATE',
-            'ODBCGETCONNECTIONERRORINFO','ODBCGETCONNECTIONDEAD','ODBCGETCONNECTATTR','ODBCGETCONFIGMODE','ODBCGETCONCATNULLBEHAVIOR','ODBCGETCOLUMNALIAS','ODBCGETCOLLATIONSEQ','ODBCGETCATALOGUSAGE',
-            'ODBCGETCATALOGTERM','ODBCGETCATALOGNAMESEPARATOR','ODBCGETCATALOGNAME','ODBCGETCATALOGLOCATION','ODBCGETBOOKMARKPERSISTENCE','ODBCGETBATCHSUPPORT','ODBCGETBATCHROWCOUNT','ODBCGETAUTOIPD',
-            'ODBCGETAUTOCOMMIT','ODBCGETASYNCMODE','ODBCGETASYNCENABLE','ODBCGETALTERTABLE','ODBCGETALTERDOMAIN','ODBCGETAGGREGATEFUNCTIONS','ODBCGETACTIVEENVIRONMENTS','ODBCGETACCESSMODE',
-            'ODBCGETACCESSIBLETABLES','ODBCGETACCESSIBLEPROCEDURES','ODBCFREESTMT','ODBCFREEHANDLE','ODBCFREEENV','ODBCFREEDESC','ODBCFREEDBC','ODBCFREECONNECT',
-            'ODBCFOREIGNKEYSCOUNT','ODBCFOREIGNKEYS','ODBCFETCHSCROLL','ODBCFETCHBYBOOKMARK','ODBCFETCH','ODBCEXTENDEDFETCH','ODBCEXECUTE','ODBCEXECDIRECT',
-            'ODBCERROR','ODBCEOF','ODBCENDTRAN','ODBCDRIVERSCOUNT','ODBCDRIVERS','ODBCDRIVERCONNECT','ODBCDISCONNECT','ODBCDESCRIBEPARAM',
-            'ODBCDESCRIBECOL','ODBCDELETERECORD','ODBCDELETEBYBOOKMARK','ODBCDATASOURCES','ODBCCREATEDATASOURCE','ODBCCOPYDESC','ODBCCONNECTIONISDEAD','ODBCCONNECTIONISALIVE',
-            'ODBCCONNECT','ODBCCONFIGDRIVER','ODBCCONFIGDATASOURCE','ODBCCOMMITTRAN','ODBCCOMMITENVTRAN','ODBCCOMMITDBCTRAN','ODBCCOLUPDATABLE','ODBCCOLUNSIGNED',
-            'ODBCCOLUNNAMED','ODBCCOLUMNSCOUNT','ODBCCOLUMNS','ODBCCOLUMNPRIVILEGESCOUNT','ODBCCOLUMNPRIVILEGES','ODBCCOLUMN','ODBCCOLTYPENAME','ODBCCOLTYPE',
-            'ODBCCOLTABLENAME','ODBCCOLSEARCHABLE','ODBCCOLSCHEMANAME','ODBCCOLSCALE','ODBCCOLPRECISION','ODBCCOLOCTETLENGTH','ODBCCOLNUMPRECRADIX','ODBCCOLNULLABLE',
-            'ODBCCOLNAME','ODBCCOLLOCALTYPENAME','ODBCCOLLITERALSUFFIX','ODBCCOLLITERALPREFIX','ODBCCOLLENGTH','ODBCCOLLABEL','ODBCCOLISNULL','ODBCCOLFIXEDPRECSCALE',
-            'ODBCCOLDISPLAYSIZE','ODBCCOLCOUNT','ODBCCOLCONCISETYPE','ODBCCOLCATALOGNAME','ODBCCOLCASESENSITIVE','ODBCCOLBASETABLENAME','ODBCCOLBASECOLUMNNAME','ODBCCOLAUTOUNIQUEVALUE',
-            'ODBCCOLATTRIBUTE','ODBCCLOSESTMTCURSOR','ODBCCLOSESTMT','ODBCCLOSECURSOR','ODBCCLOSECONNECTION','ODBCCLEARRESULT','ODBCCANCEL','ODBCBULKOPERATIONS',
-            'ODBCBROWSECONNECT','ODBCBINDPARAMETER','ODBCBINDCOLTOWORD','ODBCBINDCOLTOTIMESTAMP','ODBCBINDCOLTOTIME','ODBCBINDCOLTOSTRING','ODBCBINDCOLTOSINGLE','ODBCBINDCOLTOQUAD',
-            'ODBCBINDCOLTONUMERIC','ODBCBINDCOLTOLONG','ODBCBINDCOLTOINTEGER','ODBCBINDCOLTODWORD','ODBCBINDCOLTODOUBLE','ODBCBINDCOLTODECIMAL','ODBCBINDCOLTODATE','ODBCBINDCOLTOCURRENCY',
-            'ODBCBINDCOLTOBYTE','ODBCBINDCOLTOBIT','ODBCBINDCOLTOBINARY','ODBCBINDCOL','ODBCALLOCSTMT','ODBCALLOCHANDLE','ODBCALLOCENV','ODBCALLOCDESC',
-            'ODBCALLOCDBC','ODBCALLOCCONNECT','ODBCADDRECORD','GLVIEWPORT','GLVERTEXPOINTER','GLVERTEX4SV','GLVERTEX4S','GLVERTEX4IV',
-            'GLVERTEX4I','GLVERTEX4FV','GLVERTEX4F','GLVERTEX4DV','GLVERTEX4D','GLVERTEX3SV','GLVERTEX3S','GLVERTEX3IV',
-            'GLVERTEX3I','GLVERTEX3FV','GLVERTEX3F','GLVERTEX3DV','GLVERTEX3D','GLVERTEX2SV','GLVERTEX2S','GLVERTEX2IV',
-            'GLVERTEX2I','GLVERTEX2FV','GLVERTEX2F','GLVERTEX2DV','GLVERTEX2D','GLUUNPROJECT','GLUTESSVERTEX','GLUTESSPROPERTY',
-            'GLUTESSNORMAL','GLUTESSENDPOLYGON','GLUTESSENDCONTOUR','GLUTESSCALLBACK','GLUTESSBEGINPOLYGON','GLUTESSBEGINCONTOUR','GLUSPHERE','GLUSCALEIMAGE',
-            'GLUQUADRICTEXTURE','GLUQUADRICORIENTATION','GLUQUADRICNORMALS','GLUQUADRICDRAWSTYLE','GLUQUADRICCALLBACK','GLUPWLCURVE','GLUPROJECT','GLUPICKMATRIX',
-            'GLUPERSPECTIVE','GLUPARTIALDISK','GLUORTHO2D','GLUNURBSSURFACE','GLUNURBSPROPERTY','GLUNURBSCURVE','GLUNURBSCALLBACK','GLUNEXTCONTOUR',
-            'GLUNEWTESS','GLUNEWQUADRIC','GLUNEWNURBSRENDERER','GLULOOKAT','GLULOADSAMPLINGMATRICES','GLUGETTESSPROPERTY','GLUGETSTRING','GLUGETNURBSPROPERTY',
-            'GLUERRORSTRING','GLUENDTRIM','GLUENDSURFACE','GLUENDPOLYGON','GLUENDCURVE','GLUDISK','GLUDELETETESS','GLUDELETEQUADRIC',
-            'GLUDELETENURBSRENDERER','GLUCYLINDER','GLUBUILD2DMIPMAPS','GLUBUILD1DMIPMAPS','GLUBEGINTRIM','GLUBEGINSURFACE','GLUBEGINPOLYGON','GLUBEGINCURVE',
-            'GLTRANSLATEF','GLTRANSLATED','GLTEXSUBIMAGE2D','GLTEXSUBIMAGE1D','GLTEXPARAMETERIV','GLTEXPARAMETERI','GLTEXPARAMETERFV','GLTEXPARAMETERF',
-            'GLTEXIMAGE2D','GLTEXIMAGE1D','GLTEXGENIV','GLTEXGENI','GLTEXGENFV','GLTEXGENF','GLTEXGENDV','GLTEXGEND',
-            'GLTEXENVIV','GLTEXENVI','GLTEXENVFV','GLTEXENVF','GLTEXCOORDPOINTER','GLTEXCOORD4SV','GLTEXCOORD4S','GLTEXCOORD4IV',
-            'GLTEXCOORD4I','GLTEXCOORD4FV','GLTEXCOORD4F','GLTEXCOORD4DV','GLTEXCOORD4D','GLTEXCOORD3SV','GLTEXCOORD3S','GLTEXCOORD3IV',
-            'GLTEXCOORD3I','GLTEXCOORD3FV','GLTEXCOORD3F','GLTEXCOORD3DV','GLTEXCOORD3D','GLTEXCOORD2SV','GLTEXCOORD2S','GLTEXCOORD2IV',
-            'GLTEXCOORD2I','GLTEXCOORD2FV','GLTEXCOORD2F','GLTEXCOORD2DV','GLTEXCOORD2D','GLTEXCOORD1SV','GLTEXCOORD1S','GLTEXCOORD1IV',
-            'GLTEXCOORD1I','GLTEXCOORD1FV','GLTEXCOORD1F','GLTEXCOORD1DV','GLTEXCOORD1D','GLSTENCILOP','GLSTENCILMASK','GLSTENCILFUNC',
-            'GLSHADEMODEL','GLSELECTBUFFER','GLSCISSOR','GLSCALEF','GLSCALED','GLROTATEF','GLROTATED','GLRENDERMODE',
-            'GLRECTSV','GLRECTS','GLRECTIV','GLRECTI','GLRECTFV','GLRECTF','GLRECTDV','GLRECTD',
-            'GLREADPIXELS','GLREADBUFFER','GLRASTERPOS4SV','GLRASTERPOS4S','GLRASTERPOS4IV','GLRASTERPOS4I','GLRASTERPOS4FV','GLRASTERPOS4F',
-            'GLRASTERPOS4DV','GLRASTERPOS4D','GLRASTERPOS3SV','GLRASTERPOS3S','GLRASTERPOS3IV','GLRASTERPOS3I','GLRASTERPOS3FV','GLRASTERPOS3F',
-            'GLRASTERPOS3DV','GLRASTERPOS3D','GLRASTERPOS2SV','GLRASTERPOS2S','GLRASTERPOS2IV','GLRASTERPOS2I','GLRASTERPOS2FV','GLRASTERPOS2F',
-            'GLRASTERPOS2DV','GLRASTERPOS2D','GLPUSHNAME','GLPUSHMATRIX','GLPUSHCLIENTATTRIB','GLPUSHATTRIB','GLPRIORITIZETEXTURES','GLPOPNAME',
-            'GLPOPMATRIX','GLPOPCLIENTATTRIB','GLPOPATTRIB','GLPOLYGONSTIPPLE','GLPOLYGONOFFSET','GLPOLYGONMODE','GLPOINTSIZE','GLPIXELZOOM',
-            'GLPIXELTRANSFERI','GLPIXELTRANSFERF','GLPIXELSTOREI','GLPIXELSTOREF','GLPIXELMAPUSV','GLPIXELMAPUIV','GLPIXELMAPFV','GLPASSTHROUGH',
-            'GLORTHO','GLNORMALPOINTER','GLNORMAL3SV','GLNORMAL3S','GLNORMAL3IV','GLNORMAL3I','GLNORMAL3FV','GLNORMAL3F',
-            'GLNORMAL3DV','GLNORMAL3D','GLNORMAL3BV','GLNORMAL3B','GLNEWLIST','GLMULTMATRIXF','GLMULTMATRIXD','GLMATRIXMODE',
-            'GLMATERIALIV','GLMATERIALI','GLMATERIALFV','GLMATERIALF','GLMAPGRID2F','GLMAPGRID2D','GLMAPGRID1F','GLMAPGRID1D',
-            'GLMAP2F','GLMAP2D','GLMAP1F','GLMAP1D','GLLOGICOP','GLLOADNAME','GLLOADMATRIXF','GLLOADMATRIXD',
-            'GLLOADIDENTITY','GLLISTBASE','GLLINEWIDTH','GLLINESTIPPLE','GLLIGHTMODELIV','GLLIGHTMODELI','GLLIGHTMODELFV','GLLIGHTMODELF',
-            'GLLIGHTIV','GLLIGHTI','GLLIGHTFV','GLLIGHTF','GLISTEXTURE','GLISLIST','GLISENABLED','GLINTERLEAVEDARRAYS',
-            'GLINITNAMES','GLINDEXUBV','GLINDEXUB','GLINDEXSV','GLINDEXS','GLINDEXPOINTER','GLINDEXMASK','GLINDEXIV',
-            'GLINDEXI','GLINDEXFV','GLINDEXF','GLINDEXDV','GLINDEXD','GLHINT','GLGETTEXPARAMETERIV','GLGETTEXPARAMETERFV',
-            'GLGETTEXLEVELPARAMETERIV','GLGETTEXLEVELPARAMETERFV','GLGETTEXIMAGE','GLGETTEXGENIV','GLGETTEXGENFV','GLGETTEXGENDV','GLGETTEXENVIV','GLGETTEXENVFV',
-            'GLGETSTRING','GLGETPOLYGONSTIPPLE','GLGETPOINTERV','GLGETPIXELMAPUSV','GLGETPIXELMAPUIV','GLGETPIXELMAPFV','GLGETMATERIALIV','GLGETMATERIALFV',
-            'GLGETMAPIV','GLGETMAPFV','GLGETMAPDV','GLGETLIGHTIV','GLGETLIGHTFV','GLGETINTEGERV','GLGETFLOATV','GLGETERROR',
-            'GLGETDOUBLEV','GLGETCLIPPLANE','GLGETBOOLEANV','GLGENTEXTURES','GLGENLISTS','GLFRUSTUM','GLFRONTFACE','GLFOGIV',
-            'GLFOGI','GLFOGFV','GLFOGF','GLFLUSH','GLFINISH','GLFEEDBACKBUFFER','GLEVALPOINT2','GLEVALPOINT1',
-            'GLEVALMESH2','GLEVALMESH1','GLEVALCOORD2FV','GLEVALCOORD2F','GLEVALCOORD2DV','GLEVALCOORD2D','GLEVALCOORD1FV','GLEVALCOORD1F',
-            'GLEVALCOORD1DV','GLEVALCOORD1D','GLENDLIST','GLEND','GLENABLECLIENTSTATE','GLENABLE','GLEDGEFLAGV','GLEDGEFLAGPOINTER',
-            'GLEDGEFLAG','GLDRAWPIXELS','GLDRAWELEMENTS','GLDRAWBUFFER','GLDRAWARRAYS','GLDISABLECLIENTSTATE','GLDISABLE','GLDEPTHRANGE',
-            'GLDEPTHMASK','GLDEPTHFUNC','GLDELETETEXTURES','GLDELETELISTS','GLCULLFACE','GLCOPYTEXSUBIMAGE2D','GLCOPYTEXSUBIMAGE1D','GLCOPYTEXIMAGE2D',
-            'GLCOPYTEXIMAGE1D','GLCOPYPIXELS','GLCOLORPOINTER','GLCOLORMATERIAL','GLCOLORMASK','GLCOLOR4USV','GLCOLOR4US','GLCOLOR4UIV',
-            'GLCOLOR4UI','GLCOLOR4UBV','GLCOLOR4UB','GLCOLOR4SV','GLCOLOR4S','GLCOLOR4IV','GLCOLOR4I','GLCOLOR4FV',
-            'GLCOLOR4F','GLCOLOR4DV','GLCOLOR4D','GLCOLOR4BV','GLCOLOR4B','GLCOLOR3USV','GLCOLOR3US','GLCOLOR3UIV',
-            'GLCOLOR3UI','GLCOLOR3UBV','GLCOLOR3UB','GLCOLOR3SV','GLCOLOR3S','GLCOLOR3IV','GLCOLOR3I','GLCOLOR3FV',
-            'GLCOLOR3F','GLCOLOR3DV','GLCOLOR3D','GLCOLOR3BV','GLCOLOR3B','GLCLIPPLANE','GLCLEARSTENCIL','GLCLEARINDEX',
-            'GLCLEARDEPTH','GLCLEARCOLOR','GLCLEARACCUM','GLCLEAR','GLCALLLISTS','GLCALLLIST','GLBLENDFUNC','GLBITMAP',
-            'GLBINDTEXTURE','GLBEGIN','GLARRAYELEMENT','GLARETEXTURESRESIDENT','GLALPHAFUNC','GLACCUM'),
-        2 => array(
-            '$BEL','$BS','$CR','$CRLF','$DQ','$DT_DATE_SEPARATOR','$DT_LANGUAGE','$DT_TIME_SEPARATOR',
-            '$ESC','$FF','$LF','$NUL','$PC_SD_MY_PC','$SPC','$SQL_OPT_TRACE_FILE_DEFAULT','$SQL_SPEC_STRING',
-            '$TAB','$TRACKBAR_CLASS','$VT','%ACM_OPEN','%ACM_OPENW','%ACM_PLAY','%ACM_STOP','%ACN_START',
-            '%ACN_STOP','%ACS_AUTOPLAY','%ACS_CENTER','%ACS_TIMER','%ACS_TRANSPARENT','%APP_COUNTER_FUNLOOKUP','%APP_COUNTER_KEYLOOKUP','%APP_COUNTER_LOOKUP',
-            '%APP_COUNTER_TESTALPHA','%APP_COUNTER_UDTLOOKUP','%APP_COUNTER_VARLOOKUP','%APP_TIMER_EXECTOTAL','%APP_TIMER_INIT','%APP_TIMER_LOAD','%APP_TIMER_PREPROCESSOR','%AW_ACTIVATE',
-            '%AW_BLEND','%AW_CENTER','%AW_HIDE','%AW_HOR_NEGATIVE','%AW_HOR_POSITIVE','%AW_SLIDE','%AW_VER_NEGATIVE','%AW_VER_POSITIVE',
-            '%BCM_FIRST','%BLACK','%BLUE','%BM_GETCHECK','%BM_SETCHECK','%BST_CHECKED','%BST_UNCHECKED','%BS_AUTOCHECKBOX',
-            '%BS_BOTTOM','%BS_CENTER','%BS_DEFAULT','%BS_DEFPUSHBUTTON','%BS_FLAT','%BS_LEFT','%BS_LEFTTEXT','%BS_MULTILINE',
-            '%BS_NOTIFY','%BS_OWNERDRAW','%BS_PUSHLIKE','%BS_RIGHT','%BS_TOP','%BS_VCENTER','%BUNDLE_BUILDER_CANCELLED','%CBM_FIRST',
-            '%CBN_CLOSEUP','%CBN_DBLCLK','%CBN_DROPDOWN','%CBN_EDITCHANGE','%CBN_EDITUPDATE','%CBN_ERRSPACE','%CBN_KILLFOCUS','%CBN_SELCANCEL',
-            '%CBN_SELCHANGE','%CBN_SELENDCANCEL','%CBN_SELENDOK','%CBN_SETFOCUS','%CBS_AUTOHSCROLL','%CBS_DISABLENOSCROLL','%CBS_DROPDOWN','%CBS_DROPDOWNLIST',
-            '%CBS_HASSTRINGS','%CBS_LOWERCASE','%CBS_NOINTEGRALHEIGHT','%CBS_SIMPLE','%CBS_SORT','%CBS_UPPERCASE','%CB_SELECTSTRING','%CCM_FIRST',
-            '%CC_ANYCOLOR','%CC_ENABLEHOOK','%CC_ENABLETEMPLATE','%CC_ENABLETEMPLATEHANDLE','%CC_FULLOPEN','%CC_PREVENTFULLOPEN','%CC_RGBINIT','%CC_SHOWHELP',
-            '%CC_SOLIDCOLOR','%CFE_BOLD','%CFE_ITALIC','%CFE_LINK','%CFE_PROTECTED','%CFE_STRIKEOUT','%CFE_UNDERLINE','%CFM_ANIMATION',
-            '%CFM_BACKCOLOR','%CFM_BOLD','%CFM_CHARSET','%CFM_COLOR','%CFM_FACE','%CFM_ITALIC','%CFM_KERNING','%CFM_LCID',
-            '%CFM_LINK','%CFM_OFFSET','%CFM_PROTECTED','%CFM_REVAUTHOR','%CFM_SIZE','%CFM_SPACING','%CFM_STRIKEOUT','%CFM_STYLE',
-            '%CFM_UNDERLINE','%CFM_UNDERLINETYPE','%CFM_WEIGHT','%CGI_ACCEPT_FILE_UPLOAD','%CGI_AUTO_ADD_SPECIAL_CHARS_PREFIX','%CGI_AUTO_CREATE_VARS','%CGI_BUFFERIZE_OUTPUT','%CGI_DOUBLE_QUOTE',
-            '%CGI_FILE_UPLOAD_BASEPATH','%CGI_FORCE_SESSION_VALIDATION','%CGI_MAX_BYTE_FROM_STD_IN','%CGI_REQUEST_METHOD_GET','%CGI_REQUEST_METHOD_POST','%CGI_SESSION_FILE_BASEPATH','%CGI_SINGLE_QUOTE','%CGI_SPECIAL_CHARS_PREFIX',
-            '%CGI_TEMPORARY_UPLOAD_PATH','%CGI_UPLOAD_CAN_OVERWRITE','%CGI_WRITE_LOG_FILE','%CGI_WRITE_VARS_INTO_LOG_FILE','%CONOLE_ATTACH_PARENT_PROCESS','%CONSOLE_BACKGROUND_BLUE','%CONSOLE_BACKGROUND_GREEN','%CONSOLE_BACKGROUND_INTENSITY',
-            '%CONSOLE_BACKGROUND_RED','%CONSOLE_BOX_FLAG_3DOFF','%CONSOLE_BOX_FLAG_3DON','%CONSOLE_BOX_FLAG_SHADOW','%CONSOLE_COMMON_LVB_GRID_HORIZONTAL','%CONSOLE_COMMON_LVB_GRID_LVERTICAL','%CONSOLE_COMMON_LVB_GRID_RVERTICAL','%CONSOLE_COMMON_LVB_LEADING_BYTE',
-            '%CONSOLE_COMMON_LVB_REVERSE_VIDEO','%CONSOLE_COMMON_LVB_TRAILING_BYTE','%CONSOLE_COMMON_LVB_UNDERSCORE','%CONSOLE_CTRL_BREAK_EVENT','%CONSOLE_CTRL_C_EVENT','%CONSOLE_DOUBLE_CLICK','%CONSOLE_ENABLE_AUTO_POSITION','%CONSOLE_ENABLE_ECHO_INPUT',
-            '%CONSOLE_ENABLE_EXTENDED_FLAGS','%CONSOLE_ENABLE_INSERT_MODE','%CONSOLE_ENABLE_LINE_INPUT','%CONSOLE_ENABLE_MOUSE_INPUT','%CONSOLE_ENABLE_PROCESSED_INPUT','%CONSOLE_ENABLE_PROCESSED_OUTPUT','%CONSOLE_ENABLE_QUICK_EDIT_MODE','%CONSOLE_ENABLE_WINDOW_INPUT',
-            '%CONSOLE_ENABLE_WRAP_AT_EOL_OUTPUT','%CONSOLE_FOREGROUND_BLUE','%CONSOLE_FOREGROUND_GREEN','%CONSOLE_FOREGROUND_INTENSITY','%CONSOLE_FOREGROUND_RED','%CONSOLE_LBUTTON','%CONSOLE_LINE_HORIZONTAL','%CONSOLE_LINE_VERTICAL',
-            '%CONSOLE_MBUTTON','%CONSOLE_MOUSE_MOVED','%CONSOLE_MOUSE_WHEELED','%CONSOLE_RBUTTON','%CONSOLE_SCROLLBUF_DOWN','%CONSOLE_SCROLLBUF_UP','%CONSOLE_SCROLLWND_ABSOLUTE','%CONSOLE_SCROLLWND_RELATIVE',
-            '%CONSOLE_STD_ERROR_HANDLE','%CONSOLE_STD_INPUT_HANDLE','%CONSOLE_STD_OUTPUT_HANDLE','%CONSOLE_SW_FORCEMINIMIZE','%CONSOLE_SW_HIDE','%CONSOLE_SW_MAXIMIZE','%CONSOLE_SW_MINIMIZE','%CONSOLE_SW_RESTORE',
-            '%CONSOLE_SW_SHOW','%CONSOLE_SW_SHOWDEFAULT','%CONSOLE_SW_SHOWMAXIMIZED','%CONSOLE_SW_SHOWMINIMIZED','%CONSOLE_SW_SHOWMINNOACTIVE','%CONSOLE_SW_SHOWNA','%CONSOLE_SW_SHOWNOACTIVATE','%CONSOLE_SW_SHOWNORMAL',
-            '%CONSOLE_UNAVAILABLE','%CRYPTO_CALG_DES','%CRYPTO_CALG_RC2','%CRYPTO_CALG_RC4','%CRYPTO_PROV_DH_SCHANNEL','%CRYPTO_PROV_DSS','%CRYPTO_PROV_DSS_DH','%CRYPTO_PROV_FORTEZZA',
-            '%CRYPTO_PROV_MS_EXCHANGE','%CRYPTO_PROV_RSA_FULL','%CRYPTO_PROV_RSA_SCHANNEL','%CRYPTO_PROV_RSA_SIG','%CRYPTO_PROV_SSL','%CSIDL_ADMINTOOLS','%CSIDL_ALTSTARTUP','%CSIDL_APPDATA',
-            '%CSIDL_BITBUCKET','%CSIDL_CDBURN_AREA','%CSIDL_COMMON_ADMINTOOLS','%CSIDL_COMMON_ALTSTARTUP','%CSIDL_COMMON_APPDATA','%CSIDL_COMMON_DESKTOPDIRECTORY','%CSIDL_COMMON_DOCUMENTS','%CSIDL_COMMON_FAVORITES',
-            '%CSIDL_COMMON_MUSIC','%CSIDL_COMMON_PICTURES','%CSIDL_COMMON_PROGRAMS','%CSIDL_COMMON_STARTMENU','%CSIDL_COMMON_STARTUP','%CSIDL_COMMON_TEMPLATES','%CSIDL_COMMON_VIDEO','%CSIDL_CONTROLS',
-            '%CSIDL_COOKIES','%CSIDL_DESKTOP','%CSIDL_DESKTOPDIRECTORY','%CSIDL_DRIVES','%CSIDL_FAVORITES','%CSIDL_FLAG_CREATE','%CSIDL_FONTS','%CSIDL_HISTORY',
-            '%CSIDL_INTERNET','%CSIDL_INTERNET_CACHE','%CSIDL_LOCAL_APPDATA','%CSIDL_MYDOCUMENTS','%CSIDL_MYMUSIC','%CSIDL_MYPICTURES','%CSIDL_MYVIDEO','%CSIDL_NETHOOD',
-            '%CSIDL_NETWORK','%CSIDL_PERSONAL','%CSIDL_PRINTERS','%CSIDL_PRINTHOOD','%CSIDL_PROFILE','%CSIDL_PROGRAMS','%CSIDL_PROGRAM_FILES','%CSIDL_PROGRAM_FILES_COMMON',
-            '%CSIDL_RECENT','%CSIDL_SENDTO','%CSIDL_STARTMENU','%CSIDL_STARTUP','%CSIDL_SYSTEM','%CSIDL_TEMPLATES','%CSIDL_WINDOWS','%CW_USEDEFAULT',
-            '%CYAN','%DATE_TIME_FILE_CREATION','%DATE_TIME_LAST_FILE_ACCESS','%DATE_TIME_LAST_FILE_WRITE','%DICTIONARY_MEMINFO_DATA','%DICTIONARY_MEMINFO_KEYS','%DICTIONARY_MEMINFO_TOTAL','%DICTIONARY_SORTDESCENDING',
-            '%DICTIONARY_SORTKEYS','%DSCAPS_CERTIFIED','%DSCAPS_CONTINUOUSRATE','%DSCAPS_EMULDRIVER','%DSCAPS_SECONDARY16BIT','%DSCAPS_SECONDARY8BIT','%DSCAPS_SECONDARYMONO','%DSCAPS_SECONDARYSTEREO',
-            '%DSCCAPS_CERTIFIED','%DSCCAPS_EMULDRIVER','%DS_3DLOOK','%DS_ABSALIGN','%DS_CENTER','%DS_CENTERMOUSE','%DS_CONTEXTHELP','%DS_CONTROL',
-            '%DS_MODALFRAME','%DS_NOFAILCREATE','%DS_SETFONT','%DS_SETFOREGROUND','%DS_SYSMODAL','%DTM_FIRST','%DTM_GETMCCOLOR','%DTM_GETMCFONT',
-            '%DTM_GETMONTHCAL','%DTM_GETRANGE','%DTM_GETSYSTEMTIME','%DTM_SETFORMAT','%DTM_SETFORMATW','%DTM_SETMCCOLOR','%DTM_SETMCFONT','%DTM_SETRANGE',
-            '%DTM_SETSYSTEMTIME','%DTN_CLOSEUP','%DTN_DATETIMECHANGE','%DTN_DROPDOWN','%DTN_FORMAT','%DTN_FORMATQUERY','%DTN_FORMATQUERYW','%DTN_FORMATW',
-            '%DTN_USERSTRING','%DTN_USERSTRINGW','%DTN_WMKEYDOWN','%DTN_WMKEYDOWNW','%DTS_APPCANPARSE','%DTS_LONGDATEFORMAT','%DTS_RIGHTALIGN','%DTS_SHORTDATECENTURYFORMAT',
-            '%DTS_SHORTDATEFORMAT','%DTS_SHOWNONE','%DTS_TIMEFORMAT','%DTS_UPDOWN','%DT_DATE_CENTURY','%DT_DATE_OK','%DT_DAY_IN_YEAR','%DT_DIFF_IN_DAYS',
-            '%DT_DIFF_IN_HOURS','%DT_DIFF_IN_MINUTES','%DT_DIFF_IN_SECONDS','%DT_HOURS_IN_DAY','%DT_MINUTES_IN_HOUR','%DT_SECONDS_IN_DAY','%DT_SECONDS_IN_HOUR','%DT_SECONDS_IN_MINUTE',
-            '%DT_SECONDS_IN_YEAR','%DT_USE_LONG_FORM','%DT_USE_SHORT_FORM','%DT_WRONG_DATE','%DT_WRONG_DAY','%DT_WRONG_MONTH','%ECM_FIRST','%ECOOP_AND',
-            '%ECOOP_OR','%ECOOP_SET','%ECOOP_XOR','%ECO_AUTOHSCROLL','%ECO_AUTOVSCROLL','%ECO_AUTOWORDSELECTION','%ECO_NOHIDESEL','%ECO_READONLY',
-            '%ECO_SELECTIONBAR','%ECO_WANTRETURN','%EM_AUTOURLDETECT','%EM_CANPASTE','%EM_CANREDO','%EM_CANUNDO','%EM_CHARFROMPOS','%EM_DISPLAYBAND',
-            '%EM_EMPTYUNDOBUFFER','%EM_EXGETSEL','%EM_EXLIMITTEXT','%EM_EXLINEFROMCHAR','%EM_EXSETSEL','%EM_FINDTEXT','%EM_FINDTEXTEX','%EM_FINDWORDBREAK',
-            '%EM_FMTLINES','%EM_FORMATRANGE','%EM_GETAUTOURLDETECT','%EM_GETCHARFORMAT','%EM_GETEDITSTYLE','%EM_GETEVENTMASK','%EM_GETFIRSTVISIBLELINE','%EM_GETHANDLE',
-            '%EM_GETIMESTATUS','%EM_GETLIMITTEXT','%EM_GETLINE','%EM_GETLINECOUNT','%EM_GETMARGINS','%EM_GETMODIFY','%EM_GETOLEINTERFACE','%EM_GETOPTIONS',
-            '%EM_GETPARAFORMAT','%EM_GETPASSWORDCHAR','%EM_GETRECT','%EM_GETREDONAME','%EM_GETSCROLLPOS','%EM_GETSEL','%EM_GETSELTEXT','%EM_GETTEXTMODE',
-            '%EM_GETTEXTRANGE','%EM_GETTHUMB','%EM_GETUNDONAME','%EM_GETWORDBREAKPROC','%EM_GETWORDBREAKPROCEX','%EM_HIDESELECTION','%EM_LIMITTEXT','%EM_LINEFROMCHAR',
-            '%EM_LINEINDEX','%EM_LINELENGTH','%EM_LINESCROLL','%EM_PASTESPECIAL','%EM_POSFROMCHAR','%EM_REDO','%EM_REPLACESEL','%EM_REQUESTRESIZE',
-            '%EM_SCROLL','%EM_SCROLLCARET','%EM_SELECTIONTYPE','%EM_SETBKGNDCOLOR','%EM_SETCHARFORMAT','%EM_SETEDITSTYLE','%EM_SETEVENTMASK','%EM_SETHANDLE',
-            '%EM_SETIMESTATUS','%EM_SETLIMITTEXT','%EM_SETMARGINS','%EM_SETMODIFY','%EM_SETOLECALLBACK','%EM_SETOPTIONS','%EM_SETPARAFORMAT','%EM_SETPASSWORDCHAR',
-            '%EM_SETREADONLY','%EM_SETRECT','%EM_SETRECTNP','%EM_SETSCROLLPOS','%EM_SETSEL','%EM_SETTABSTOPS','%EM_SETTARGETDEVICE','%EM_SETTEXTMODE',
-            '%EM_SETUNDOLIMIT','%EM_SETWORDBREAKPROC','%EM_SETWORDBREAKPROCEX','%EM_SETWORDWRAPMODE','%EM_SETZOOM','%EM_STOPGROUPTYPING','%EM_STREAMIN','%EM_STREAMOUT',
-            '%EM_UNDO','%ENM_CHANGE','%ENM_CORRECTTEXT','%ENM_DRAGDROPDONE','%ENM_DROPFILES','%ENM_KEYEVENTS','%ENM_MOUSEEVENTS','%ENM_NONE',
-            '%ENM_PARAGRAPHEXPANDED','%ENM_PROTECTED','%ENM_REQUESTRESIZE','%ENM_SCROLL','%ENM_SCROLLEVENTS','%ENM_SELCHANGE','%ENM_UPDATE','%EN_CHANGE',
-            '%EN_MSGFILTER','%EN_SELCHANGE','%EN_UPDATE','%ES_AUTOHSCROLL','%ES_AUTOVSCROLL','%ES_CENTER','%ES_DISABLENOSCROLL','%ES_EX_NOCALLOLEINIT',
-            '%ES_LEFT','%ES_LOWERCASE','%ES_MULTILINE','%ES_NOHIDESEL','%ES_NOOLEDRAGDROP','%ES_NUMBER','%ES_OEMCONVERT','%ES_PASSWORD',
-            '%ES_READONLY','%ES_RIGHT','%ES_SAVESEL','%ES_SELECTIONBAR','%ES_SUNKEN','%ES_UPPERCASE','%ES_WANTRETURN','%EVAL_EXEC_STRING',
-            '%FALSE','%FILE_ADDPATH','%FILE_ARCHIVE','%FILE_BUILDVERSION','%FILE_HIDDEN','%FILE_MAJORVERSION','%FILE_MINORVERSION','%FILE_NORMAL',
-            '%FILE_READONLY','%FILE_REVISIONVERSION','%FILE_SUBDIR','%FILE_SYSTEM','%FILE_VLABEL','%FTP_GET_CONNECT_STATUS','%FTP_GET_FILE_BYTES_RCVD','%FTP_GET_FILE_BYTES_SENT',
-            '%FTP_GET_LAST_RESPONSE','%FTP_GET_LOCAL_IP','%FTP_GET_SERVER_IP','%FTP_GET_TOTAL_BYTES_RCVD','%FTP_GET_TOTAL_BYTES_SENT','%FTP_LIST_FULLLIST','%FTP_LIST_FULLLISTDIR','%FTP_LIST_FULLLISTFILE',
-            '%FTP_SET_ASYNC','%FTP_SET_CONNECT_WAIT','%FTP_SET_MAX_LISTEN_WAIT','%FTP_SET_MAX_RESPONSE_WAIT','%FTP_SET_PASSIVE','%FTP_SET_SYNC','%FW_BLACK','%FW_BOLD',
-            '%FW_DEMIBOLD','%FW_DONTCARE','%FW_EXTRABOLD','%FW_EXTRALIGHT','%FW_HEAVY','%FW_LIGHT','%FW_MEDIUM','%FW_NORMAL',
-            '%FW_REGULAR','%FW_SEMIBOLD','%FW_THIN','%FW_ULTRABOLD','%FW_ULTRALIGHT','%GDTR_MAX','%GDTR_MIN','%GLU_AUTO_LOAD_MATRIX',
-            '%GLU_BEGIN','%GLU_CCW','%GLU_CULLING','%GLU_CW','%GLU_DISPLAY_MODE','%GLU_DOMAIN_DISTANCE','%GLU_EDGE_FLAG','%GLU_END',
-            '%GLU_ERROR','%GLU_EXTENSIONS','%GLU_EXTERIOR','%GLU_FALSE','%GLU_FILL','%GLU_FLAT','%GLU_INCOMPATIBLE_GL_VERSION','%GLU_INSIDE',
-            '%GLU_INTERIOR','%GLU_INVALID_ENUM','%GLU_INVALID_VALUE','%GLU_LINE','%GLU_MAP1_TRIM_2','%GLU_MAP1_TRIM_3','%GLU_NONE','%GLU_NURBS_ERROR1',
-            '%GLU_NURBS_ERROR10','%GLU_NURBS_ERROR11','%GLU_NURBS_ERROR12','%GLU_NURBS_ERROR13','%GLU_NURBS_ERROR14','%GLU_NURBS_ERROR15','%GLU_NURBS_ERROR16','%GLU_NURBS_ERROR17',
-            '%GLU_NURBS_ERROR18','%GLU_NURBS_ERROR19','%GLU_NURBS_ERROR2','%GLU_NURBS_ERROR20','%GLU_NURBS_ERROR21','%GLU_NURBS_ERROR22','%GLU_NURBS_ERROR23','%GLU_NURBS_ERROR24',
-            '%GLU_NURBS_ERROR25','%GLU_NURBS_ERROR26','%GLU_NURBS_ERROR27','%GLU_NURBS_ERROR28','%GLU_NURBS_ERROR29','%GLU_NURBS_ERROR3','%GLU_NURBS_ERROR30','%GLU_NURBS_ERROR31',
-            '%GLU_NURBS_ERROR32','%GLU_NURBS_ERROR33','%GLU_NURBS_ERROR34','%GLU_NURBS_ERROR35','%GLU_NURBS_ERROR36','%GLU_NURBS_ERROR37','%GLU_NURBS_ERROR4','%GLU_NURBS_ERROR5',
-            '%GLU_NURBS_ERROR6','%GLU_NURBS_ERROR7','%GLU_NURBS_ERROR8','%GLU_NURBS_ERROR9','%GLU_OUTLINE_PATCH','%GLU_OUTLINE_POLYGON','%GLU_OUTSIDE','%GLU_OUT_OF_MEMORY',
-            '%GLU_PARAMETRIC_ERROR','%GLU_PARAMETRIC_TOLERANCE','%GLU_PATH_LENGTH','%GLU_POINT','%GLU_SAMPLING_METHOD','%GLU_SAMPLING_TOLERANCE','%GLU_SILHOUETTE','%GLU_SMOOTH',
-            '%GLU_TESS_BEGIN','%GLU_TESS_BEGIN_DATA','%GLU_TESS_BOUNDARY_ONLY','%GLU_TESS_COMBINE','%GLU_TESS_COMBINE_DATA','%GLU_TESS_COORD_TOO_LARGE','%GLU_TESS_EDGE_FLAG','%GLU_TESS_EDGE_FLAG_DATA',
-            '%GLU_TESS_END','%GLU_TESS_END_DATA','%GLU_TESS_ERROR','%GLU_TESS_ERROR1','%GLU_TESS_ERROR2','%GLU_TESS_ERROR3','%GLU_TESS_ERROR4','%GLU_TESS_ERROR5',
-            '%GLU_TESS_ERROR6','%GLU_TESS_ERROR7','%GLU_TESS_ERROR8','%GLU_TESS_ERROR_DATA','%GLU_TESS_MISSING_BEGIN_CONTOUR','%GLU_TESS_MISSING_BEGIN_POLYGON','%GLU_TESS_MISSING_END_CONTOUR','%GLU_TESS_MISSING_END_POLYGON',
-            '%GLU_TESS_NEED_COMBINE_CALLBACK','%GLU_TESS_TOLERANCE','%GLU_TESS_VERTEX','%GLU_TESS_VERTEX_DATA','%GLU_TESS_WINDING_ABS_GEQ_TWO','%GLU_TESS_WINDING_NEGATIVE','%GLU_TESS_WINDING_NONZERO','%GLU_TESS_WINDING_ODD',
-            '%GLU_TESS_WINDING_POSITIVE','%GLU_TESS_WINDING_RULE','%GLU_TRUE','%GLU_UNKNOWN','%GLU_U_STEP','%GLU_VERSION','%GLU_VERSION_1_1','%GLU_VERSION_1_2',
-            '%GLU_VERTEX','%GLU_V_STEP','%GL_2D','%GL_2_BYTES','%GL_3D','%GL_3D_COLOR','%GL_3D_COLOR_TEXTURE','%GL_3_BYTES',
-            '%GL_4D_COLOR_TEXTURE','%GL_4_BYTES','%GL_ABGR_EXT','%GL_ACCUM','%GL_ACCUM_ALPHA_BITS','%GL_ACCUM_BLUE_BITS','%GL_ACCUM_BUFFER_BIT','%GL_ACCUM_CLEAR_VALUE',
-            '%GL_ACCUM_GREEN_BITS','%GL_ACCUM_RED_BITS','%GL_ADD','%GL_ALL_ATTRIB_BITS','%GL_ALPHA','%GL_ALPHA12','%GL_ALPHA16','%GL_ALPHA4',
-            '%GL_ALPHA8','%GL_ALPHA_BIAS','%GL_ALPHA_BITS','%GL_ALPHA_SCALE','%GL_ALPHA_TEST','%GL_ALPHA_TEST_FUNC','%GL_ALPHA_TEST_REF','%GL_ALWAYS',
-            '%GL_AMBIENT','%GL_AMBIENT_AND_DIFFUSE','%GL_AND','%GL_AND_INVERTED','%GL_AND_REVERSE','%GL_ARRAY_ELEMENT_LOCK_COUNT_EXT','%GL_ARRAY_ELEMENT_LOCK_FIRST_EXT','%GL_ATTRIB_STACK_DEPTH',
-            '%GL_AUTO_NORMAL','%GL_AUX0','%GL_AUX1','%GL_AUX2','%GL_AUX3','%GL_AUX_BUFFERS','%GL_BACK','%GL_BACK_LEFT',
-            '%GL_BACK_RIGHT','%GL_BGRA_EXT','%GL_BGR_EXT','%GL_BITMAP','%GL_BITMAP_TOKEN','%GL_BLEND','%GL_BLEND_COLOR_EXT','%GL_BLEND_DST',
-            '%GL_BLEND_EQUATION_EXT','%GL_BLEND_SRC','%GL_BLUE','%GL_BLUE_BIAS','%GL_BLUE_BITS','%GL_BLUE_SCALE','%GL_BYTE','%GL_C3F_V3F',
-            '%GL_C4F_N3F_V3F','%GL_C4UB_V2F','%GL_C4UB_V3F','%GL_CCW','%GL_CLAMP','%GL_CLEAR','%GL_CLIENT_ALL_ATTRIB_BITS','%GL_CLIENT_ATTRIB_STACK_DEPTH',
-            '%GL_CLIENT_PIXEL_STORE_BIT','%GL_CLIENT_VERTEX_ARRAY_BIT','%GL_CLIP_PLANE0','%GL_CLIP_PLANE1','%GL_CLIP_PLANE2','%GL_CLIP_PLANE3','%GL_CLIP_PLANE4','%GL_CLIP_PLANE5',
-            '%GL_CLIP_VOLUME_CLIPPING_HINT_EXT','%GL_COEFF','%GL_COLOR','%GL_COLOR_ARRAY','%GL_COLOR_ARRAY_COUNT_EXT','%GL_COLOR_ARRAY_EXT','%GL_COLOR_ARRAY_POINTER','%GL_COLOR_ARRAY_POINTER_EXT',
-            '%GL_COLOR_ARRAY_SIZE','%GL_COLOR_ARRAY_SIZE_EXT','%GL_COLOR_ARRAY_STRIDE','%GL_COLOR_ARRAY_STRIDE_EXT','%GL_COLOR_ARRAY_TYPE','%GL_COLOR_ARRAY_TYPE_EXT','%GL_COLOR_BUFFER_BIT','%GL_COLOR_CLEAR_VALUE',
-            '%GL_COLOR_INDEX','%GL_COLOR_INDEX12_EXT','%GL_COLOR_INDEX16_EXT','%GL_COLOR_INDEX1_EXT','%GL_COLOR_INDEX2_EXT','%GL_COLOR_INDEX4_EXT','%GL_COLOR_INDEX8_EXT','%GL_COLOR_INDEXES',
-            '%GL_COLOR_LOGIC_OP','%GL_COLOR_MATERIAL','%GL_COLOR_MATERIAL_FACE','%GL_COLOR_MATERIAL_PARAMETER','%GL_COLOR_SUM_EXT','%GL_COLOR_TABLE_ALPHA_SIZE_EXT','%GL_COLOR_TABLE_BIAS_EXT','%GL_COLOR_TABLE_BLUE_SIZE_EXT',
-            '%GL_COLOR_TABLE_EXT','%GL_COLOR_TABLE_FORMAT_EXT','%GL_COLOR_TABLE_GREEN_SIZE_EXT','%GL_COLOR_TABLE_INTENSITY_SIZE_EXT','%GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','%GL_COLOR_TABLE_RED_SIZE_EXT','%GL_COLOR_TABLE_SCALE_EXT','%GL_COLOR_TABLE_WIDTH_EXT',
-            '%GL_COLOR_WRITEMASK','%GL_COMPILE','%GL_COMPILE_AND_EXECUTE','%GL_CONSTANT_ALPHA_EXT','%GL_CONSTANT_ATTENUATION','%GL_CONSTANT_COLOR_EXT','%GL_CONVOLUTION_1D_EXT','%GL_CONVOLUTION_2D_EXT',
-            '%GL_CONVOLUTION_BORDER_MODE_EXT','%GL_CONVOLUTION_FILTER_BIAS_EXT','%GL_CONVOLUTION_FILTER_SCALE_EXT','%GL_CONVOLUTION_FORMAT_EXT','%GL_CONVOLUTION_HEIGHT_EXT','%GL_CONVOLUTION_WIDTH_EXT','%GL_COPY','%GL_COPY_INVERTED',
-            '%GL_COPY_PIXEL_TOKEN','%GL_CULL_FACE','%GL_CULL_FACE_MODE','%GL_CULL_VERTEX_EXT','%GL_CULL_VERTEX_EYE_POSITION_EXT','%GL_CULL_VERTEX_OBJECT_POSITION_EXT','%GL_CURRENT_BIT','%GL_CURRENT_COLOR',
-            '%GL_CURRENT_INDEX','%GL_CURRENT_NORMAL','%GL_CURRENT_RASTER_COLOR','%GL_CURRENT_RASTER_DISTANCE','%GL_CURRENT_RASTER_INDEX','%GL_CURRENT_RASTER_POSITION','%GL_CURRENT_RASTER_POSITION_VALID','%GL_CURRENT_RASTER_TEXTURE_COORDS',
-            '%GL_CURRENT_SECONDARY_COLOR_EXT','%GL_CURRENT_TEXTURE_COORDS','%GL_CW','%GL_DECAL','%GL_DECR','%GL_DEPTH','%GL_DEPTH_BIAS','%GL_DEPTH_BITS',
-            '%GL_DEPTH_BUFFER_BIT','%GL_DEPTH_CLEAR_VALUE','%GL_DEPTH_COMPONENT','%GL_DEPTH_FUNC','%GL_DEPTH_RANGE','%GL_DEPTH_SCALE','%GL_DEPTH_TEST','%GL_DEPTH_WRITEMASK',
-            '%GL_DIFFUSE','%GL_DITHER','%GL_DOMAIN','%GL_DONT_CARE','%GL_DOUBLE','%GL_DOUBLEBUFFER','%GL_DOUBLE_EXT','%GL_DRAW_BUFFER',
-            '%GL_DRAW_PIXEL_TOKEN','%GL_DST_ALPHA','%GL_DST_COLOR','%GL_EDGE_FLAG','%GL_EDGE_FLAG_ARRAY','%GL_EDGE_FLAG_ARRAY_COUNT_EXT','%GL_EDGE_FLAG_ARRAY_EXT','%GL_EDGE_FLAG_ARRAY_POINTER',
-            '%GL_EDGE_FLAG_ARRAY_POINTER_EXT','%GL_EDGE_FLAG_ARRAY_STRIDE','%GL_EDGE_FLAG_ARRAY_STRIDE_EXT','%GL_EMISSION','%GL_ENABLE_BIT','%GL_EQUAL','%GL_EQUIV','%GL_EVAL_BIT',
-            '%GL_EXP','%GL_EXP2','%GL_EXTENSIONS','%GL_EXT_ABGR','%GL_EXT_BGRA','%GL_EXT_BLEND_COLOR','%GL_EXT_BLEND_MINMAX','%GL_EXT_BLEND_SUBTRACT',
-            '%GL_EXT_CLIP_VOLUME_HINT','%GL_EXT_COLOR_TABLE','%GL_EXT_COMPILED_VERTEX_ARRAY','%GL_EXT_CONVOLUTION','%GL_EXT_CULL_VERTEX','%GL_EXT_HISTOGRAM','%GL_EXT_PACKED_PIXELS','%GL_EXT_PALETTED_TEXTURE',
-            '%GL_EXT_POLYGON_OFFSET','%GL_EXT_SECONDARY_COLOR','%GL_EXT_SEPARATE_SPECULAR_COLOR','%GL_EXT_VERTEX_ARRAY','%GL_EYE_LINEAR','%GL_EYE_PLANE','%GL_FALSE','%GL_FASTEST',
-            '%GL_FEEDBACK','%GL_FEEDBACK_BUFFER_POINTER','%GL_FEEDBACK_BUFFER_SIZE','%GL_FEEDBACK_BUFFER_TYPE','%GL_FILL','%GL_FLAT','%GL_FLOAT','%GL_FOG',
-            '%GL_FOG_BIT','%GL_FOG_COLOR','%GL_FOG_DENSITY','%GL_FOG_END','%GL_FOG_HINT','%GL_FOG_INDEX','%GL_FOG_MODE','%GL_FOG_START',
-            '%GL_FRONT','%GL_FRONT_AND_BACK','%GL_FRONT_FACE','%GL_FRONT_LEFT','%GL_FRONT_RIGHT','%GL_FUNC_ADD_EXT','%GL_FUNC_REVERSE_SUBTRACT_EXT','%GL_FUNC_SUBTRACT_EXT',
-            '%GL_GEQUAL','%GL_GREATER','%GL_GREEN','%GL_GREEN_BIAS','%GL_GREEN_BITS','%GL_GREEN_SCALE','%GL_HINT_BIT','%GL_HISTOGRAM_ALPHA_SIZE_EXT',
-            '%GL_HISTOGRAM_BLUE_SIZE_EXT','%GL_HISTOGRAM_EXT','%GL_HISTOGRAM_FORMAT_EXT','%GL_HISTOGRAM_GREEN_SIZE_EXT','%GL_HISTOGRAM_LUMINANCE_SIZE_EXT','%GL_HISTOGRAM_RED_SIZE_EXT','%GL_HISTOGRAM_SINK_EXT','%GL_HISTOGRAM_WIDTH_EXT',
-            '%GL_INCR','%GL_INDEX_ARRAY','%GL_INDEX_ARRAY_COUNT_EXT','%GL_INDEX_ARRAY_EXT','%GL_INDEX_ARRAY_POINTER','%GL_INDEX_ARRAY_POINTER_EXT','%GL_INDEX_ARRAY_STRIDE','%GL_INDEX_ARRAY_STRIDE_EXT',
-            '%GL_INDEX_ARRAY_TYPE','%GL_INDEX_ARRAY_TYPE_EXT','%GL_INDEX_BITS','%GL_INDEX_CLEAR_VALUE','%GL_INDEX_LOGIC_OP','%GL_INDEX_MODE','%GL_INDEX_OFFSET','%GL_INDEX_SHIFT',
-            '%GL_INDEX_WRITEMASK','%GL_INT','%GL_INTENSITY','%GL_INTENSITY12','%GL_INTENSITY16','%GL_INTENSITY4','%GL_INTENSITY8','%GL_INVALID_ENUM',
-            '%GL_INVALID_OPERATION','%GL_INVALID_VALUE','%GL_INVERT','%GL_KEEP','%GL_LEFT','%GL_LEQUAL','%GL_LESS','%GL_LIGHT0',
-            '%GL_LIGHT1','%GL_LIGHT2','%GL_LIGHT3','%GL_LIGHT4','%GL_LIGHT5','%GL_LIGHT6','%GL_LIGHT7','%GL_LIGHTING',
-            '%GL_LIGHTING_BIT','%GL_LIGHT_MODEL_AMBIENT','%GL_LIGHT_MODEL_COLOR_CONTROL_EXT','%GL_LIGHT_MODEL_LOCAL_VIEWER','%GL_LIGHT_MODEL_TWO_SIDE','%GL_LINE','%GL_LINEAR','%GL_LINEAR_ATTENUATION',
-            '%GL_LINEAR_MIPMAP_LINEAR','%GL_LINEAR_MIPMAP_NEAREST','%GL_LINES','%GL_LINE_BIT','%GL_LINE_LOOP','%GL_LINE_RESET_TOKEN','%GL_LINE_SMOOTH','%GL_LINE_SMOOTH_HINT',
-            '%GL_LINE_STIPPLE','%GL_LINE_STIPPLE_PATTERN','%GL_LINE_STIPPLE_REPEAT','%GL_LINE_STRIP','%GL_LINE_TOKEN','%GL_LINE_WIDTH','%GL_LINE_WIDTH_GRANULARITY','%GL_LINE_WIDTH_RANGE',
-            '%GL_LIST_BASE','%GL_LIST_BIT','%GL_LIST_INDEX','%GL_LIST_MODE','%GL_LOAD','%GL_LOGIC_OP','%GL_LOGIC_OP_MODE','%GL_LUMINANCE',
-            '%GL_LUMINANCE12','%GL_LUMINANCE12_ALPHA12','%GL_LUMINANCE12_ALPHA4','%GL_LUMINANCE16','%GL_LUMINANCE16_ALPHA16','%GL_LUMINANCE4','%GL_LUMINANCE4_ALPHA4','%GL_LUMINANCE6_ALPHA2',
-            '%GL_LUMINANCE8','%GL_LUMINANCE8_ALPHA8','%GL_LUMINANCE_ALPHA','%GL_MAP1_COLOR_4','%GL_MAP1_GRID_DOMAIN','%GL_MAP1_GRID_SEGMENTS','%GL_MAP1_INDEX','%GL_MAP1_NORMAL',
-            '%GL_MAP1_TEXTURE_COORD_1','%GL_MAP1_TEXTURE_COORD_2','%GL_MAP1_TEXTURE_COORD_3','%GL_MAP1_TEXTURE_COORD_4','%GL_MAP1_VERTEX_3','%GL_MAP1_VERTEX_4','%GL_MAP2_COLOR_4','%GL_MAP2_GRID_DOMAIN',
-            '%GL_MAP2_GRID_SEGMENTS','%GL_MAP2_INDEX','%GL_MAP2_NORMAL','%GL_MAP2_TEXTURE_COORD_1','%GL_MAP2_TEXTURE_COORD_2','%GL_MAP2_TEXTURE_COORD_3','%GL_MAP2_TEXTURE_COORD_4','%GL_MAP2_VERTEX_3',
-            '%GL_MAP2_VERTEX_4','%GL_MAP_COLOR','%GL_MAP_STENCIL','%GL_MATRIX_MODE','%GL_MAX_ATTRIB_STACK_DEPTH','%GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','%GL_MAX_CLIP_PLANES','%GL_MAX_CONVOLUTION_HEIGHT_EXT',
-            '%GL_MAX_CONVOLUTION_WIDTH_EXT','%GL_MAX_EVAL_ORDER','%GL_MAX_EXT','%GL_MAX_LIGHTS','%GL_MAX_LIST_NESTING','%GL_MAX_MODELVIEW_STACK_DEPTH','%GL_MAX_NAME_STACK_DEPTH','%GL_MAX_PIXEL_MAP_TABLE',
-            '%GL_MAX_PROJECTION_STACK_DEPTH','%GL_MAX_TEXTURE_SIZE','%GL_MAX_TEXTURE_STACK_DEPTH','%GL_MAX_VIEWPORT_DIMS','%GL_MINMAX_EXT','%GL_MINMAX_FORMAT_EXT','%GL_MINMAX_SINK_EXT','%GL_MIN_EXT',
-            '%GL_MODELVIEW','%GL_MODELVIEW_MATRIX','%GL_MODELVIEW_STACK_DEPTH','%GL_MODULATE','%GL_MULT','%GL_N3F_V3F','%GL_NAME_STACK_DEPTH','%GL_NAND',
-            '%GL_NEAREST','%GL_NEAREST_MIPMAP_LINEAR','%GL_NEAREST_MIPMAP_NEAREST','%GL_NEVER','%GL_NICEST','%GL_NONE','%GL_NOOP','%GL_NOR',
-            '%GL_NORMALIZE','%GL_NORMAL_ARRAY','%GL_NORMAL_ARRAY_COUNT_EXT','%GL_NORMAL_ARRAY_EXT','%GL_NORMAL_ARRAY_POINTER','%GL_NORMAL_ARRAY_POINTER_EXT','%GL_NORMAL_ARRAY_STRIDE','%GL_NORMAL_ARRAY_STRIDE_EXT',
-            '%GL_NORMAL_ARRAY_TYPE','%GL_NORMAL_ARRAY_TYPE_EXT','%GL_NOTEQUAL','%GL_NO_ERROR','%GL_OBJECT_LINEAR','%GL_OBJECT_PLANE','%GL_ONE','%GL_ONE_MINUS_CONSTANT_ALPHA_EXT',
-            '%GL_ONE_MINUS_CONSTANT_COLOR_EXT','%GL_ONE_MINUS_DST_ALPHA','%GL_ONE_MINUS_DST_COLOR','%GL_ONE_MINUS_SRC_ALPHA','%GL_ONE_MINUS_SRC_COLOR','%GL_OR','%GL_ORDER','%GL_OR_INVERTED',
-            '%GL_OR_REVERSE','%GL_OUT_OF_MEMORY','%GL_PACK_ALIGNMENT','%GL_PACK_LSB_FIRST','%GL_PACK_ROW_LENGTH','%GL_PACK_SKIP_PIXELS','%GL_PACK_SKIP_ROWS','%GL_PACK_SWAP_BYTES',
-            '%GL_PASS_THROUGH_TOKEN','%GL_PERSPECTIVE_CORRECTION_HINT','%GL_PIXEL_MAP_A_TO_A','%GL_PIXEL_MAP_A_TO_A_SIZE','%GL_PIXEL_MAP_B_TO_B','%GL_PIXEL_MAP_B_TO_B_SIZE','%GL_PIXEL_MAP_G_TO_G','%GL_PIXEL_MAP_G_TO_G_SIZE',
-            '%GL_PIXEL_MAP_I_TO_A','%GL_PIXEL_MAP_I_TO_A_SIZE','%GL_PIXEL_MAP_I_TO_B','%GL_PIXEL_MAP_I_TO_B_SIZE','%GL_PIXEL_MAP_I_TO_G','%GL_PIXEL_MAP_I_TO_G_SIZE','%GL_PIXEL_MAP_I_TO_I','%GL_PIXEL_MAP_I_TO_I_SIZE',
-            '%GL_PIXEL_MAP_I_TO_R','%GL_PIXEL_MAP_I_TO_R_SIZE','%GL_PIXEL_MAP_R_TO_R','%GL_PIXEL_MAP_R_TO_R_SIZE','%GL_PIXEL_MAP_S_TO_S','%GL_PIXEL_MAP_S_TO_S_SIZE','%GL_PIXEL_MODE_BIT','%GL_POINT',
-            '%GL_POINTS','%GL_POINT_BIT','%GL_POINT_SIZE','%GL_POINT_SIZE_GRANULARITY','%GL_POINT_SIZE_RANGE','%GL_POINT_SMOOTH','%GL_POINT_SMOOTH_HINT','%GL_POINT_TOKEN',
-            '%GL_POLYGON','%GL_POLYGON_BIT','%GL_POLYGON_MODE','%GL_POLYGON_OFFSET_BIAS_EXT','%GL_POLYGON_OFFSET_EXT','%GL_POLYGON_OFFSET_FACTOR','%GL_POLYGON_OFFSET_FACTOR_EXT','%GL_POLYGON_OFFSET_FILL',
-            '%GL_POLYGON_OFFSET_LINE','%GL_POLYGON_OFFSET_POINT','%GL_POLYGON_OFFSET_UNITS','%GL_POLYGON_SMOOTH','%GL_POLYGON_SMOOTH_HINT','%GL_POLYGON_STIPPLE','%GL_POLYGON_STIPPLE_BIT','%GL_POLYGON_TOKEN',
-            '%GL_POSITION','%GL_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_ALPHA_BIAS_EXT','%GL_POST_CONVOLUTION_ALPHA_SCALE_EXT','%GL_POST_CONVOLUTION_BLUE_BIAS_EXT','%GL_POST_CONVOLUTION_BLUE_SCALE_EXT','%GL_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_GREEN_BIAS_EXT',
-            '%GL_POST_CONVOLUTION_GREEN_SCALE_EXT','%GL_POST_CONVOLUTION_RED_BIAS_EXT','%GL_POST_CONVOLUTION_RED_SCALE_EXT','%GL_PROJECTION','%GL_PROJECTION_MATRIX','%GL_PROJECTION_STACK_DEPTH','%GL_PROXY_COLOR_TABLE_EXT','%GL_PROXY_HISTOGRAM_EXT',
-            '%GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_PROXY_TEXTURE_1D','%GL_PROXY_TEXTURE_2D','%GL_Q','%GL_QUADRATIC_ATTENUATION','%GL_QUADS','%GL_QUAD_STRIP',
-            '%GL_R','%GL_R3_G3_B2','%GL_READ_BUFFER','%GL_RED','%GL_REDUCE_EXT','%GL_RED_BIAS','%GL_RED_BITS','%GL_RED_SCALE',
-            '%GL_RENDER','%GL_RENDERER','%GL_RENDER_MODE','%GL_REPEAT','%GL_REPLACE','%GL_RETURN','%GL_RGB','%GL_RGB10',
-            '%GL_RGB10_A2','%GL_RGB12','%GL_RGB16','%GL_RGB4','%GL_RGB5','%GL_RGB5_A1','%GL_RGB8','%GL_RGBA',
-            '%GL_RGBA12','%GL_RGBA16','%GL_RGBA2','%GL_RGBA4','%GL_RGBA8','%GL_RGBA_MODE','%GL_RIGHT','%GL_S',
-            '%GL_SCISSOR_BIT','%GL_SCISSOR_BOX','%GL_SCISSOR_TEST','%GL_SECONDARY_COLOR_ARRAY_EXT','%GL_SECONDARY_COLOR_ARRAY_POINTER_EXT','%GL_SECONDARY_COLOR_ARRAY_SIZE_EXT','%GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT','%GL_SECONDARY_COLOR_ARRAY_TYPE_EXT',
-            '%GL_SELECT','%GL_SELECTION_BUFFER_POINTER','%GL_SELECTION_BUFFER_SIZE','%GL_SEPARABLE_2D_EXT','%GL_SEPARATE_SPECULAR_COLOR_EXT','%GL_SET','%GL_SHADE_MODEL','%GL_SHININESS',
-            '%GL_SHORT','%GL_SINGLE_COLOR_EXT','%GL_SMOOTH','%GL_SPECULAR','%GL_SPHERE_MAP','%GL_SPOT_CUTOFF','%GL_SPOT_DIRECTION','%GL_SPOT_EXPONENT',
-            '%GL_SRC_ALPHA','%GL_SRC_ALPHA_SATURATE','%GL_SRC_COLOR','%GL_STACK_OVERFLOW','%GL_STACK_UNDERFLOW','%GL_STENCIL','%GL_STENCIL_BITS','%GL_STENCIL_BUFFER_BIT',
-            '%GL_STENCIL_CLEAR_VALUE','%GL_STENCIL_FAIL','%GL_STENCIL_FUNC','%GL_STENCIL_INDEX','%GL_STENCIL_PASS_DEPTH_FAIL','%GL_STENCIL_PASS_DEPTH_PASS','%GL_STENCIL_REF','%GL_STENCIL_TEST',
-            '%GL_STENCIL_VALUE_MASK','%GL_STENCIL_WRITEMASK','%GL_STEREO','%GL_SUBPIXEL_BITS','%GL_T','%GL_T2F_C3F_V3F','%GL_T2F_C4F_N3F_V3F','%GL_T2F_C4UB_V3F',
-            '%GL_T2F_N3F_V3F','%GL_T2F_V3F','%GL_T4F_C4F_N3F_V4F','%GL_T4F_V4F','%GL_TABLE_TOO_LARGE_EXT','%GL_TEXTURE','%GL_TEXTURE_1D','%GL_TEXTURE_2D',
-            '%GL_TEXTURE_ALPHA_SIZE','%GL_TEXTURE_BINDING_1D','%GL_TEXTURE_BINDING_2D','%GL_TEXTURE_BIT','%GL_TEXTURE_BLUE_SIZE','%GL_TEXTURE_BORDER','%GL_TEXTURE_BORDER_COLOR','%GL_TEXTURE_COMPONENTS',
-            '%GL_TEXTURE_COORD_ARRAY','%GL_TEXTURE_COORD_ARRAY_COUNT_EXT','%GL_TEXTURE_COORD_ARRAY_EXT','%GL_TEXTURE_COORD_ARRAY_POINTER','%GL_TEXTURE_COORD_ARRAY_POINTER_EXT','%GL_TEXTURE_COORD_ARRAY_SIZE','%GL_TEXTURE_COORD_ARRAY_SIZE_EXT','%GL_TEXTURE_COORD_ARRAY_STRIDE',
-            '%GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','%GL_TEXTURE_COORD_ARRAY_TYPE','%GL_TEXTURE_COORD_ARRAY_TYPE_EXT','%GL_TEXTURE_ENV','%GL_TEXTURE_ENV_COLOR','%GL_TEXTURE_ENV_MODE','%GL_TEXTURE_GEN_MODE','%GL_TEXTURE_GEN_Q',
-            '%GL_TEXTURE_GEN_R','%GL_TEXTURE_GEN_S','%GL_TEXTURE_GEN_T','%GL_TEXTURE_GREEN_SIZE','%GL_TEXTURE_HEIGHT','%GL_TEXTURE_INTENSITY_SIZE','%GL_TEXTURE_INTERNAL_FORMAT','%GL_TEXTURE_LUMINANCE_SIZE',
-            '%GL_TEXTURE_MAG_FILTER','%GL_TEXTURE_MATRIX','%GL_TEXTURE_MIN_FILTER','%GL_TEXTURE_PRIORITY','%GL_TEXTURE_RED_SIZE','%GL_TEXTURE_RESIDENT','%GL_TEXTURE_STACK_DEPTH','%GL_TEXTURE_WIDTH',
-            '%GL_TEXTURE_WRAP_S','%GL_TEXTURE_WRAP_T','%GL_TRANSFORM_BIT','%GL_TRIANGLES','%GL_TRIANGLE_FAN','%GL_TRIANGLE_STRIP','%GL_TRUE','%GL_UNPACK_ALIGNMENT',
-            '%GL_UNPACK_LSB_FIRST','%GL_UNPACK_ROW_LENGTH','%GL_UNPACK_SKIP_PIXELS','%GL_UNPACK_SKIP_ROWS','%GL_UNPACK_SWAP_BYTES','%GL_UNSIGNED_BYTE','%GL_UNSIGNED_BYTE_3_3_2_EXT','%GL_UNSIGNED_INT',
-            '%GL_UNSIGNED_INT_10_10_10_2_EXT','%GL_UNSIGNED_INT_8_8_8_8_EXT','%GL_UNSIGNED_SHORT','%GL_UNSIGNED_SHORT_4_4_4_4_EXT','%GL_UNSIGNED_SHORT_5_5_5_1_EXT','%GL_V2F','%GL_V3F','%GL_VENDOR',
-            '%GL_VERSION','%GL_VERSION_1_1','%GL_VERTEX_ARRAY','%GL_VERTEX_ARRAY_COUNT_EXT','%GL_VERTEX_ARRAY_EXT','%GL_VERTEX_ARRAY_POINTER','%GL_VERTEX_ARRAY_POINTER_EXT','%GL_VERTEX_ARRAY_SIZE',
-            '%GL_VERTEX_ARRAY_SIZE_EXT','%GL_VERTEX_ARRAY_STRIDE','%GL_VERTEX_ARRAY_STRIDE_EXT','%GL_VERTEX_ARRAY_TYPE','%GL_VERTEX_ARRAY_TYPE_EXT','%GL_VIEWPORT','%GL_VIEWPORT_BIT','%GL_WIN_SWAP_HINT',
-            '%GL_XOR','%GL_ZERO','%GL_ZOOM_X','%GL_ZOOM_Y','%GRAY','%GREEN','%GWLP_HINSTANCE','%GWLP_HWNDPARENT',
-            '%GWLP_ID','%GWLP_USERDATA','%GWLP_WNDPROC','%GWL_EXSTYLE','%GWL_HINSTANCE','%GWL_HWNDPARENT','%GWL_ID','%GWL_STYLE',
-            '%GWL_USERDATA','%GWL_WNDPROC','%HDM_FIRST','%HTCAPTION','%HWND_BOTTOM','%HWND_DESKTOP','%HWND_MESSAGE','%HWND_NOTOPMOST',
-            '%HWND_TOP','%HWND_TOPMOST','%ICRYPTO_XOR_DECREASE','%ICRYPTO_XOR_INCREASE','%ICRYPTO_XOR_NORMAL','%IDABORT','%IDCANCEL','%IDCONTINUE',
-            '%IDIGNORE','%IDNO','%IDOK','%IDRETRY','%IDTIMEOUT','%IDTRYAGAIN','%IDYES','%INTERNET_CONNECTION_CONFIGURED',
-            '%INTERNET_CONNECTION_LAN','%INTERNET_CONNECTION_MODEM','%INTERNET_CONNECTION_MODEM_BUSY','%INTERNET_CONNECTION_OFFLINE','%INTERNET_CONNECTION_PROXY','%INTERNET_RAS_INSTALLED','%LBN_DBLCLK','%LBN_KILLFOCUS',
-            '%LBN_SELCANCEL','%LBN_SELCHANGE','%LBN_SETFOCUS','%LBS_DISABLENOSCROLL','%LBS_EXTENDEDSEL','%LBS_MULTICOLUMN','%LBS_MULTIPLESEL','%LBS_NOINTEGRALHEIGHT',
-            '%LBS_NOSEL','%LBS_NOTIFY','%LBS_SORT','%LBS_STANDARD','%LBS_USETABSTOPS','%LB_ADDFILE','%LB_ADDSTRING','%LB_DELETESTRING',
-            '%LB_DIR','%LB_FINDSTRING','%LB_FINDSTRINGEXACT','%LB_GETANCHORINDEX','%LB_GETCARETINDEX','%LB_GETCOUNT','%LB_GETCURSEL','%LB_GETHORIZONTALEXTENT',
-            '%LB_GETITEMDATA','%LB_GETITEMHEIGHT','%LB_GETITEMRECT','%LB_GETLISTBOXINFO','%LB_GETLOCALE','%LB_GETSEL','%LB_GETSELCOUNT','%LB_GETSELITEMS',
-            '%LB_GETTEXT','%LB_GETTEXTLEN','%LB_GETTOPINDEX','%LB_INITSTORAGE','%LB_INSERTSTRING','%LB_ITEMFROMPOINT','%LB_MULTIPLEADDSTRING','%LB_RESETCONTENT',
-            '%LB_SELECTSTRING','%LB_SELITEMRANGE','%LB_SELITEMRANGEEX','%LB_SETANCHORINDEX','%LB_SETCARETINDEX','%LB_SETCOLUMNWIDTH','%LB_SETCOUNT','%LB_SETCURSEL',
-            '%LB_SETHORIZONTALEXTENT','%LB_SETITEMDATA','%LB_SETITEMHEIGHT','%LB_SETLOCALE','%LB_SETSEL','%LB_SETTABSTOPS','%LB_SETTOPINDEX','%LF_FACESIZE',
-            '%LTGRAY','%LVM_FIRST','%LWA_ALPHA','%LWA_COLORKEY','%MAGENTA','%MAXBYTE','%MAXCHAR','%MAXDWORD',
-            '%MAXSHORT','%MAXWORD','%MAX_PATH','%MB_ABORTRETRYIGNORE','%MB_APPLMODAL','%MB_CANCELTRYCONTINUE','%MB_DEFBUTTON1','%MB_DEFBUTTON2',
-            '%MB_DEFBUTTON3','%MB_HELP','%MB_ICONASTERISK','%MB_ICONERROR','%MB_ICONEXCLAMATION','%MB_ICONHAND','%MB_ICONINFORMATION','%MB_ICONQUESTION',
-            '%MB_ICONSTOP','%MB_ICONWARNING','%MB_OK','%MB_OKCANCEL','%MB_RETRYCANCEL','%MB_SIMPLE','%MB_SYSTEMMODAL','%MB_TOPMOST',
-            '%MB_YESNO','%MB_YESNOCANCEL','%MF_CHECKED','%MF_DISABLED','%MF_ENABLED','%MF_GRAYED','%MF_SEPARATOR','%MF_UNCHECKED',
-            '%MINCHAR','%MINLONG','%MINSHORT','%NULL','%ODBC352_INC','%ODBCVER','%ODBC_ADD_DSN','%ODBC_ADD_SYS_DSN',
-            '%ODBC_BOTH_DSN','%ODBC_CONFIG_DRIVER','%ODBC_CONFIG_DRIVER_MAX','%ODBC_CONFIG_DSN','%ODBC_CONFIG_SYS_DSN','%ODBC_DRIVER_VERSION','%ODBC_ERROR_COMPONENT_NOT_FOUND','%ODBC_ERROR_CREATE_DSN_FAILED',
-            '%ODBC_ERROR_GENERAL_ERR','%ODBC_ERROR_INVALID_BUFF_LEN','%ODBC_ERROR_INVALID_DSN','%ODBC_ERROR_INVALID_HWND','%ODBC_ERROR_INVALID_INF','%ODBC_ERROR_INVALID_KEYWORD_VALUE','%ODBC_ERROR_INVALID_LOG_FILE','%ODBC_ERROR_INVALID_NAME',
-            '%ODBC_ERROR_INVALID_PARAM_SEQUENCE','%ODBC_ERROR_INVALID_PATH','%ODBC_ERROR_INVALID_REQUEST_TYPE','%ODBC_ERROR_INVALID_STR','%ODBC_ERROR_LOAD_LIB_FAILED','%ODBC_ERROR_OUTPUT_STRING_TRUNCATED','%ODBC_ERROR_OUT_OF_MEM','%ODBC_ERROR_REMOVE_DSN_FAILED',
-            '%ODBC_ERROR_REQUEST_FAILED','%ODBC_ERROR_USAGE_UPDATE_FAILED','%ODBC_ERROR_USER_CANCELED','%ODBC_ERROR_WRITING_SYSINFO_FAILED','%ODBC_INSTALL_COMPLETE','%ODBC_INSTALL_DRIVER','%ODBC_INSTALL_INQUIRY','%ODBC_REMOVE_DEFAULT_DSN',
-            '%ODBC_REMOVE_DRIVER','%ODBC_REMOVE_DSN','%ODBC_REMOVE_SYS_DSN','%ODBC_SYSTEM_DSN','%ODBC_USER_DSN','%OFN_ALLOWMULTISELECT','%OFN_CREATEPROMPT','%OFN_ENABLEHOOK',
-            '%OFN_ENABLEINCLUDENOTIFY','%OFN_ENABLESIZING','%OFN_ENABLETEMPLATE','%OFN_ENABLETEMPLATEHANDLE','%OFN_EXPLORER','%OFN_EXTENSIONDIFFERENT','%OFN_FILEMUSTEXIST','%OFN_HIDEREADONLY',
-            '%OFN_LONGNAMES','%OFN_NOCHANGEDIR','%OFN_NODEREFERENCELINKS','%OFN_NOLONGNAMES','%OFN_NONETWORKBUTTON','%OFN_NOREADONLYRETURN','%OFN_NOTESTFILECREATE','%OFN_NOVALIDATE',
-            '%OFN_OVERWRITEPROMPT','%OFN_PATHMUSTEXIST','%OFN_READONLY','%OFN_SHAREAWARE','%OFN_SHOWHELP','%OS_ERROR_CALLFUNCTION','%OS_ERROR_EMPTYSTRING','%OS_ERROR_LOADLIBRARY',
-            '%OS_ERROR_SUCCESS','%OS_ERROR_WRONGPARAMETER','%OS_SHELL_ASYNC','%OS_SHELL_SYNC','%OS_WINDOWS_2K','%OS_WINDOWS_95','%OS_WINDOWS_95_OSR2','%OS_WINDOWS_98',
-            '%OS_WINDOWS_98_SE','%OS_WINDOWS_ME','%OS_WINDOWS_NT','%OS_WINDOWS_SERVER_2003','%OS_WINDOWS_SERVER_LONGHORN','%OS_WINDOWS_SERVER_LONGHORN_DC','%OS_WINDOWS_VISTA','%OS_WINDOWS_XP',
-            '%OS_WNDSTYLE_HIDE','%OS_WNDSTYLE_MAXIMIZED','%OS_WNDSTYLE_MINIMIZED','%OS_WNDSTYLE_MINIMIZEDNOFOCUS','%OS_WNDSTYLE_NORMAL','%OS_WNDSTYLE_NORMALNOFOCUS','%PATH_EXT','%PATH_FILE',
-            '%PATH_FILEEXT','%PATH_ROOT','%PATH_ROOTPATH','%PATH_ROOTPATHPROG','%PATH_ROOTPATHPROGEXT','%PBM_DELTAPOS','%PBM_GETPOS','%PBM_GETRANGE',
-            '%PBM_SETBARCOLOR','%PBM_SETBKCOLOR','%PBM_SETPOS','%PBM_SETRANGE','%PBM_SETRANGE32','%PBM_SETSTEP','%PBM_STEPIT','%PBS_SMOOTH',
-            '%PBS_VERTICAL','%PC_DISABLEWAKEEVENT_OFF','%PC_DISABLEWAKEEVENT_ON','%PC_EB_NOCONFIRMATION','%PC_EB_NOPROGRESSUI','%PC_EB_NORMAL','%PC_EB_NOSOUND','%PC_FORCECRITICAL_OFF',
-            '%PC_FORCECRITICAL_ON','%PC_HIBERNATE_OFF','%PC_HIBERNATE_ON','%PC_RD_FORCE','%PC_RD_FORCEIFHUNG','%PC_RD_LOGOFF','%PC_RD_POWEROFF','%PC_RD_REBOOT',
-            '%PC_RD_SHUTDOWN','%PC_SD_DONOT_FORCE','%PC_SD_DONOT_REBOOT','%PC_SD_FORCE','%PC_SD_REBOOT','%PFA_CENTER','%PFA_LEFT','%PFA_RIGHT',
-            '%PF_3DNOW_INSTRUCTIONS_AVAILABLE','%PF_CHANNELS_ENABLED','%PF_COMPARE64_EXCHANGE128','%PF_COMPARE_EXCHANGE128','%PF_COMPARE_EXCHANGE_DOUBLE','%PF_FLOATING_POINT_EMULATED','%PF_FLOATING_POINT_PRECISION_ERRATA','%PF_MMX_INSTRUCTIONS_AVAILABLE',
-            '%PF_NX_ENABLED','%PF_PAE_ENABLED','%PF_RDTSC_INSTRUCTION_AVAILABLE','%PF_SSE3_INSTRUCTIONS_AVAILABLE','%PF_XMMI64_INSTRUCTIONS_AVAILABLE','%PF_XMMI_INSTRUCTIONS_AVAILABLE','%PGM_FIRST','%RED',
-            '%RTF_UBB','%SAPI_SVSFDEFAULT','%SAPI_SVSFISFILENAME','%SAPI_SVSFISNOTXML','%SAPI_SVSFISXML','%SAPI_SVSFLAGSASYNC','%SAPI_SVSFNLPMASK','%SAPI_SVSFNLPSPEAKPUNC',
-            '%SAPI_SVSFPERSISTXML','%SAPI_SVSFPURGEBEFORESPEAK','%SAPI_SVSFUNUSEDFLAGS','%SAPI_SVSFVOICEMASK','%SBS_SIZEGRIP','%SB_BOTTOM','%SB_ENDSCROLL','%SB_LEFT',
-            '%SB_LINEDOWN','%SB_LINELEFT','%SB_LINERIGHT','%SB_LINEUP','%SB_PAGEDOWN','%SB_PAGELEFT','%SB_PAGERIGHT','%SB_PAGEUP',
-            '%SB_RIGHT','%SB_SETPARTS','%SB_SETTEXT','%SB_THUMBPOSITION','%SB_THUMBTRACK','%SB_TOP','%SCF_ALL','%SCF_ASSOCIATEFONT',
-            '%SCF_DEFAULT','%SCF_NOKBUPDATE','%SCF_SELECTION','%SCF_USEUIRULES','%SCF_WORD','%SC_CLOSE','%SC_CONTEXTHELP','%SC_HOTKEY',
-            '%SC_HSCROLL','%SC_KEYMENU','%SC_MAXIMIZE','%SC_MINIMIZE','%SC_MONITORPOWER','%SC_MOUSEMENU','%SC_MOVE','%SC_NEXTWINDOW',
-            '%SC_PREVWINDOW','%SC_RESTORE','%SC_SCREENSAVE','%SC_SIZE','%SC_TASKLIST','%SC_VSCROLL','%SERVICE_ACTIVE','%SERVICE_AUTO_START',
-            '%SERVICE_BOOT_START','%SERVICE_CONTINUE_PENDING','%SERVICE_DEMAND_START','%SERVICE_DISABLED','%SERVICE_DRIVER','%SERVICE_INACTIVE','%SERVICE_INFO_DISPLAY_NAME','%SERVICE_INFO_NAME',
-            '%SERVICE_PAUSED','%SERVICE_PAUSE_PENDING','%SERVICE_RUNNING','%SERVICE_START_PENDING','%SERVICE_STATE_ALL','%SERVICE_STOPPED','%SERVICE_STOP_PENDING','%SERVICE_SYSTEM_START',
-            '%SERVICE_TYPE_ALL','%SERVICE_WIN32','%SES_ALLOWBEEPS','%SES_BEEPONMAXTEXT','%SES_BIDI','%SES_EMULATE10','%SES_EMULATESYSEDIT','%SES_EXTENDBACKCOLOR',
-            '%SES_LOWERCASE','%SES_MAPCPS','%SES_NOIME','%SES_NOINPUTSEQUENCECHK','%SES_SCROLLONKILLFOCUS','%SES_UPPERCASE','%SES_USEAIMM','%SES_USECRLF',
-            '%SES_XLTCRCRLFTOCR','%SF_RTF','%SF_TEXT','%SMTP_SET_ATTACH_CONTENT_TYPE','%SMTP_SET_CONTENT_TYPE_PREFIX','%SQL_AA_FALSE','%SQL_AA_TRUE','%SQL_ACCESSIBLE_PROCEDURES',
-            '%SQL_ACCESSIBLE_TABLES','%SQL_ACCESS_MODE','%SQL_ACTIVE_CONNECTIONS','%SQL_ACTIVE_ENVIRONMENTS','%SQL_ACTIVE_STATEMENTS','%SQL_ADD','%SQL_AD_ADD_CONSTRAINT_DEFERRABLE','%SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED',
-            '%SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE','%SQL_AD_ADD_DOMAIN_CONSTRAINT','%SQL_AD_ADD_DOMAIN_DEFAULT','%SQL_AD_CONSTRAINT_NAME_DEFINITION','%SQL_AD_DROP_DOMAIN_CONSTRAINT','%SQL_AD_DROP_DOMAIN_DEFAULT','%SQL_AF_ALL',
-            '%SQL_AF_AVG','%SQL_AF_COUNT','%SQL_AF_DISTINCT','%SQL_AF_MAX','%SQL_AF_MIN','%SQL_AF_SUM','%SQL_AGGREGATE_FUNCTIONS','%SQL_ALL_EXCEPT_LIKE',
-            '%SQL_ALL_TYPES','%SQL_ALTER_DOMAIN','%SQL_ALTER_TABLE','%SQL_AM_CONNECTION','%SQL_AM_NONE','%SQL_AM_STATEMENT','%SQL_API_ALL_FUNCTIONS','%SQL_API_LOADBYORDINAL',
-            '%SQL_API_ODBC3_ALL_FUNCTIONS','%SQL_API_ODBC3_ALL_FUNCTIONS_SIZE','%SQL_API_SQLALLOCCONNECT','%SQL_API_SQLALLOCENV','%SQL_API_SQLALLOCHANDLE','%SQL_API_SQLALLOCHANDLESTD','%SQL_API_SQLALLOCSTMT','%SQL_API_SQLBINDCOL',
-            '%SQL_API_SQLBINDPARAM','%SQL_API_SQLBINDPARAMETER','%SQL_API_SQLBROWSECONNECT','%SQL_API_SQLBULKOPERATIONS','%SQL_API_SQLCANCEL','%SQL_API_SQLCLOSECURSOR','%SQL_API_SQLCOLATTRIBUTE','%SQL_API_SQLCOLATTRIBUTES',
-            '%SQL_API_SQLCOLUMNPRIVILEGES','%SQL_API_SQLCOLUMNS','%SQL_API_SQLCONNECT','%SQL_API_SQLCOPYDESC','%SQL_API_SQLDATASOURCES','%SQL_API_SQLDESCRIBECOL','%SQL_API_SQLDESCRIBEPARAM','%SQL_API_SQLDISCONNECT',
-            '%SQL_API_SQLDRIVERCONNECT','%SQL_API_SQLDRIVERS','%SQL_API_SQLENDTRAN','%SQL_API_SQLERROR','%SQL_API_SQLEXECDIRECT','%SQL_API_SQLEXECUTE','%SQL_API_SQLEXTENDEDFETCH','%SQL_API_SQLFETCH',
-            '%SQL_API_SQLFETCHSCROLL','%SQL_API_SQLFOREIGNKEYS','%SQL_API_SQLFREECONNECT','%SQL_API_SQLFREEENV','%SQL_API_SQLFREEHANDLE','%SQL_API_SQLFREESTMT','%SQL_API_SQLGETCONNECTATTR','%SQL_API_SQLGETCONNECTOPTION',
-            '%SQL_API_SQLGETCURSORNAME','%SQL_API_SQLGETDATA','%SQL_API_SQLGETDESCFIELD','%SQL_API_SQLGETDESCREC','%SQL_API_SQLGETDIAGFIELD','%SQL_API_SQLGETDIAGREC','%SQL_API_SQLGETENVATTR','%SQL_API_SQLGETFUNCTIONS',
-            '%SQL_API_SQLGETINFO','%SQL_API_SQLGETSTMTATTR','%SQL_API_SQLGETSTMTOPTION','%SQL_API_SQLGETTYPEINFO','%SQL_API_SQLMORERESULTS','%SQL_API_SQLNATIVESQL','%SQL_API_SQLNUMPARAMS','%SQL_API_SQLNUMRESULTCOLS',
-            '%SQL_API_SQLPARAMDATA','%SQL_API_SQLPARAMOPTIONS','%SQL_API_SQLPREPARE','%SQL_API_SQLPRIMARYKEYS','%SQL_API_SQLPROCEDURECOLUMNS','%SQL_API_SQLPROCEDURES','%SQL_API_SQLPUTDATA','%SQL_API_SQLROWCOUNT',
-            '%SQL_API_SQLSETCONNECTATTR','%SQL_API_SQLSETCONNECTOPTION','%SQL_API_SQLSETCURSORNAME','%SQL_API_SQLSETDESCFIELD','%SQL_API_SQLSETDESCREC','%SQL_API_SQLSETENVATTR','%SQL_API_SQLSETPARAM','%SQL_API_SQLSETPOS',
-            '%SQL_API_SQLSETSCROLLOPTIONS','%SQL_API_SQLSETSTMTATTR','%SQL_API_SQLSETSTMTOPTION','%SQL_API_SQLSPECIALCOLUMNS','%SQL_API_SQLSTATISTICS','%SQL_API_SQLTABLEPRIVILEGES','%SQL_API_SQLTABLES','%SQL_API_SQLTRANSACT',
-            '%SQL_ARD_TYPE','%SQL_ASYNC_ENABLE','%SQL_ASYNC_ENABLE_DEFAULT','%SQL_ASYNC_ENABLE_OFF','%SQL_ASYNC_ENABLE_ON','%SQL_ASYNC_MODE','%SQL_ATTR_ACCESS_MODE','%SQL_ATTR_ANSI_APP',
-            '%SQL_ATTR_APP_PARAM_DESC','%SQL_ATTR_APP_ROW_DESC','%SQL_ATTR_ASYNC_ENABLE','%SQL_ATTR_AUTOCOMMIT','%SQL_ATTR_AUTO_IPD','%SQL_ATTR_CONCURRENCY','%SQL_ATTR_CONNECTION_DEAD','%SQL_ATTR_CONNECTION_POOLING',
-            '%SQL_ATTR_CONNECTION_TIMEOUT','%SQL_ATTR_CP_MATCH','%SQL_ATTR_CURRENT_CATALOG','%SQL_ATTR_CURSOR_SCROLLABLE','%SQL_ATTR_CURSOR_SENSITIVITY','%SQL_ATTR_CURSOR_TYPE','%SQL_ATTR_DISCONNECT_BEHAVIOR','%SQL_ATTR_ENABLE_AUTO_IPD',
-            '%SQL_ATTR_ENLIST_IN_DTC','%SQL_ATTR_ENLIST_IN_XA','%SQL_ATTR_FETCH_BOOKMARK_PTR','%SQL_ATTR_IMP_PARAM_DESC','%SQL_ATTR_IMP_ROW_DESC','%SQL_ATTR_KEYSET_SIZE','%SQL_ATTR_LOGIN_TIMEOUT','%SQL_ATTR_MAX_LENGTH',
-            '%SQL_ATTR_MAX_ROWS','%SQL_ATTR_METADATA_ID','%SQL_ATTR_NOSCAN','%SQL_ATTR_ODBC_CURSORS','%SQL_ATTR_ODBC_VERSION','%SQL_ATTR_OUTPUT_NTS','%SQL_ATTR_PACKET_SIZE','%SQL_ATTR_PARAMSET_SIZE',
-            '%SQL_ATTR_PARAMS_PROCESSED_PTR','%SQL_ATTR_PARAM_BIND_OFFSET_PTR','%SQL_ATTR_PARAM_BIND_TYPE','%SQL_ATTR_PARAM_OPERATION_PTR','%SQL_ATTR_PARAM_STATUS_PTR','%SQL_ATTR_QUERY_TIMEOUT','%SQL_ATTR_QUIET_MODE','%SQL_ATTR_READONLY',
-            '%SQL_ATTR_READWRITE_UNKNOWN','%SQL_ATTR_RETRIEVE_DATA','%SQL_ATTR_ROWS_FETCHED_PTR','%SQL_ATTR_ROW_ARRAY_SIZE','%SQL_ATTR_ROW_BIND_OFFSET_PTR','%SQL_ATTR_ROW_BIND_TYPE','%SQL_ATTR_ROW_NUMBER','%SQL_ATTR_ROW_OPERATION_PTR',
-            '%SQL_ATTR_ROW_STATUS_PTR','%SQL_ATTR_SIMULATE_CURSOR','%SQL_ATTR_TRACE','%SQL_ATTR_TRACEFILE','%SQL_ATTR_TRANSLATE_LIB','%SQL_ATTR_TRANSLATE_OPTION','%SQL_ATTR_TXN_ISOLATION','%SQL_ATTR_USE_BOOKMARKS',
-            '%SQL_ATTR_WRITE','%SQL_AT_ADD_COLUMN','%SQL_AT_ADD_COLUMN_COLLATION','%SQL_AT_ADD_COLUMN_DEFAULT','%SQL_AT_ADD_COLUMN_SINGLE','%SQL_AT_ADD_CONSTRAINT','%SQL_AT_ADD_TABLE_CONSTRAINT','%SQL_AT_CONSTRAINT_DEFERRABLE',
-            '%SQL_AT_CONSTRAINT_INITIALLY_DEFERRED','%SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AT_CONSTRAINT_NAME_DEFINITION','%SQL_AT_CONSTRAINT_NON_DEFERRABLE','%SQL_AT_DROP_COLUMN','%SQL_AT_DROP_COLUMN_CASCADE','%SQL_AT_DROP_COLUMN_DEFAULT','%SQL_AT_DROP_COLUMN_RESTRICT',
-            '%SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE','%SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT','%SQL_AT_SET_COLUMN_DEFAULT','%SQL_AUTOCOMMIT','%SQL_AUTOCOMMIT_DEFAULT','%SQL_AUTOCOMMIT_OFF','%SQL_AUTOCOMMIT_ON','%SQL_BATCH_ROW_COUNT',
-            '%SQL_BATCH_SUPPORT','%SQL_BEST_ROWID','%SQL_BIGINT','%SQL_BINARY','%SQL_BIND_BY_COLUMN','%SQL_BIND_TYPE','%SQL_BIND_TYPE_DEFAULT','%SQL_BIT',
-            '%SQL_BOOKMARK_PERSISTENCE','%SQL_BP_CLOSE','%SQL_BP_DELETE','%SQL_BP_DROP','%SQL_BP_OTHER_HSTMT','%SQL_BP_SCROLL','%SQL_BP_TRANSACTION','%SQL_BP_UPDATE',
-            '%SQL_BRC_EXPLICIT','%SQL_BRC_PROCEDURES','%SQL_BRC_ROLLED_UP','%SQL_BS_ROW_COUNT_EXPLICIT','%SQL_BS_ROW_COUNT_PROC','%SQL_BS_SELECT_EXPLICIT','%SQL_BS_SELECT_PROC','%SQL_CA1_ABSOLUTE',
-            '%SQL_CA1_BOOKMARK','%SQL_CA1_BULK_ADD','%SQL_CA1_BULK_DELETE_BY_BOOKMARK','%SQL_CA1_BULK_FETCH_BY_BOOKMARK','%SQL_CA1_BULK_UPDATE_BY_BOOKMARK','%SQL_CA1_LOCK_EXCLUSIVE','%SQL_CA1_LOCK_NO_CHANGE','%SQL_CA1_LOCK_UNLOCK',
-            '%SQL_CA1_NEXT','%SQL_CA1_POSITIONED_DELETE','%SQL_CA1_POSITIONED_UPDATE','%SQL_CA1_POS_DELETE','%SQL_CA1_POS_POSITION','%SQL_CA1_POS_REFRESH','%SQL_CA1_POS_UPDATE','%SQL_CA1_RELATIVE',
-            '%SQL_CA1_SELECT_FOR_UPDATE','%SQL_CA2_CRC_APPROXIMATE','%SQL_CA2_CRC_EXACT','%SQL_CA2_LOCK_CONCURRENCY','%SQL_CA2_MAX_ROWS_AFFECTS_ALL','%SQL_CA2_MAX_ROWS_CATALOG','%SQL_CA2_MAX_ROWS_DELETE','%SQL_CA2_MAX_ROWS_INSERT',
-            '%SQL_CA2_MAX_ROWS_SELECT','%SQL_CA2_MAX_ROWS_UPDATE','%SQL_CA2_OPT_ROWVER_CONCURRENCY','%SQL_CA2_OPT_VALUES_CONCURRENCY','%SQL_CA2_READ_ONLY_CONCURRENCY','%SQL_CA2_SENSITIVITY_ADDITIONS','%SQL_CA2_SENSITIVITY_DELETIONS','%SQL_CA2_SENSITIVITY_UPDATES',
-            '%SQL_CA2_SIMULATE_NON_UNIQUE','%SQL_CA2_SIMULATE_TRY_UNIQUE','%SQL_CA2_SIMULATE_UNIQUE','%SQL_CASCADE','%SQL_CATALOG_LOCATION','%SQL_CATALOG_NAME','%SQL_CATALOG_NAME_SEPARATOR','%SQL_CATALOG_TERM',
-            '%SQL_CATALOG_USAGE','%SQL_CA_CONSTRAINT_DEFERRABLE','%SQL_CA_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CA_CONSTRAINT_NON_DEFERRABLE','%SQL_CA_CREATE_ASSERTION','%SQL_CB_CLOSE','%SQL_CB_DELETE',
-            '%SQL_CB_NON_NULL','%SQL_CB_NULL','%SQL_CB_PRESERVE','%SQL_CCOL_CREATE_COLLATION','%SQL_CCS_COLLATE_CLAUSE','%SQL_CCS_CREATE_CHARACTER_SET','%SQL_CCS_LIMITED_COLLATION','%SQL_CC_CLOSE',
-            '%SQL_CC_DELETE','%SQL_CC_PRESERVE','%SQL_CDO_COLLATION','%SQL_CDO_CONSTRAINT','%SQL_CDO_CONSTRAINT_DEFERRABLE','%SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CDO_CONSTRAINT_NAME_DEFINITION',
-            '%SQL_CDO_CONSTRAINT_NON_DEFERRABLE','%SQL_CDO_CREATE_DOMAIN','%SQL_CDO_DEFAULT','%SQL_CD_FALSE','%SQL_CD_TRUE','%SQL_CHAR','%SQL_CLOSE','%SQL_CL_END',
-            '%SQL_CL_START','%SQL_CN_ANY','%SQL_CN_DIFFERENT','%SQL_CN_NONE','%SQL_CODE_DATE','%SQL_CODE_DAY','%SQL_CODE_DAY_TO_HOUR','%SQL_CODE_DAY_TO_MINUTE',
-            '%SQL_CODE_DAY_TO_SECOND','%SQL_CODE_HOUR','%SQL_CODE_HOUR_TO_MINUTE','%SQL_CODE_HOUR_TO_SECOND','%SQL_CODE_MINUTE','%SQL_CODE_MINUTE_TO_SECOND','%SQL_CODE_MONTH','%SQL_CODE_SECOND',
-            '%SQL_CODE_TIME','%SQL_CODE_TIMESTAMP','%SQL_CODE_YEAR','%SQL_CODE_YEAR_TO_MONTH','%SQL_COLATT_OPT_MAX','%SQL_COLATT_OPT_MIN','%SQL_COLLATION_SEQ','%SQL_COLUMN_ALIAS',
-            '%SQL_COLUMN_AUTO_INCREMENT','%SQL_COLUMN_CASE_SENSITIVE','%SQL_COLUMN_COUNT','%SQL_COLUMN_DISPLAY_SIZE','%SQL_COLUMN_IGNORE','%SQL_COLUMN_LABEL','%SQL_COLUMN_LENGTH','%SQL_COLUMN_MONEY',
-            '%SQL_COLUMN_NAME','%SQL_COLUMN_NULLABLE','%SQL_COLUMN_NUMBER_UNKNOWN','%SQL_COLUMN_OWNER_NAME','%SQL_COLUMN_PRECISION','%SQL_COLUMN_QUALIFIER_NAME','%SQL_COLUMN_SCALE','%SQL_COLUMN_SEARCHABLE',
-            '%SQL_COLUMN_TABLE_NAME','%SQL_COLUMN_TYPE','%SQL_COLUMN_TYPE_NAME','%SQL_COLUMN_UNSIGNED','%SQL_COLUMN_UPDATABLE','%SQL_COL_PRED_BASIC','%SQL_COL_PRED_CHAR','%SQL_COMMIT',
-            '%SQL_CONCAT_NULL_BEHAVIOR','%SQL_CONCURRENCY','%SQL_CONCUR_DEFAULT','%SQL_CONCUR_LOCK','%SQL_CONCUR_READ_ONLY','%SQL_CONCUR_ROWVER','%SQL_CONCUR_TIMESTAMP','%SQL_CONCUR_VALUES',
-            '%SQL_CONVERT_BIGINT','%SQL_CONVERT_BINARY','%SQL_CONVERT_BIT','%SQL_CONVERT_CHAR','%SQL_CONVERT_DATE','%SQL_CONVERT_DECIMAL','%SQL_CONVERT_DOUBLE','%SQL_CONVERT_FLOAT',
-            '%SQL_CONVERT_FUNCTIONS','%SQL_CONVERT_GUID','%SQL_CONVERT_INTEGER','%SQL_CONVERT_INTERVAL_DAY_TIME','%SQL_CONVERT_INTERVAL_YEAR_MONTH','%SQL_CONVERT_LONGVARBINARY','%SQL_CONVERT_LONGVARCHAR','%SQL_CONVERT_NUMERIC',
-            '%SQL_CONVERT_REAL','%SQL_CONVERT_SMALLINT','%SQL_CONVERT_TIME','%SQL_CONVERT_TIMESTAMP','%SQL_CONVERT_TINYINT','%SQL_CONVERT_VARBINARY','%SQL_CONVERT_VARCHAR','%SQL_CONVERT_WCHAR',
-            '%SQL_CONVERT_WLONGVARCHAR','%SQL_CONVERT_WVARCHAR','%SQL_CORRELATION_NAME','%SQL_CP_DEFAULT','%SQL_CP_MATCH_DEFAULT','%SQL_CP_OFF','%SQL_CP_ONE_PER_DRIVER','%SQL_CP_ONE_PER_HENV',
-            '%SQL_CP_RELAXED_MATCH','%SQL_CP_STRICT_MATCH','%SQL_CREATE_ASSERTION','%SQL_CREATE_CHARACTER_SET','%SQL_CREATE_COLLATION','%SQL_CREATE_DOMAIN','%SQL_CREATE_SCHEMA','%SQL_CREATE_TABLE',
-            '%SQL_CREATE_TRANSLATION','%SQL_CREATE_VIEW','%SQL_CR_CLOSE','%SQL_CR_DELETE','%SQL_CR_PRESERVE','%SQL_CS_AUTHORIZATION','%SQL_CS_CREATE_SCHEMA','%SQL_CS_DEFAULT_CHARACTER_SET',
-            '%SQL_CTR_CREATE_TRANSLATION','%SQL_CT_COLUMN_COLLATION','%SQL_CT_COLUMN_CONSTRAINT','%SQL_CT_COLUMN_DEFAULT','%SQL_CT_COMMIT_DELETE','%SQL_CT_COMMIT_PRESERVE','%SQL_CT_CONSTRAINT_DEFERRABLE','%SQL_CT_CONSTRAINT_INITIALLY_DEFERRED',
-            '%SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CT_CONSTRAINT_NAME_DEFINITION','%SQL_CT_CONSTRAINT_NON_DEFERRABLE','%SQL_CT_CREATE_TABLE','%SQL_CT_GLOBAL_TEMPORARY','%SQL_CT_LOCAL_TEMPORARY','%SQL_CT_TABLE_CONSTRAINT','%SQL_CURRENT_QUALIFIER',
-            '%SQL_CURSOR_COMMIT_BEHAVIOR','%SQL_CURSOR_DYNAMIC','%SQL_CURSOR_FORWARD_ONLY','%SQL_CURSOR_KEYSET_DRIVEN','%SQL_CURSOR_ROLLBACK_BEHAVIOR','%SQL_CURSOR_SENSITIVITY','%SQL_CURSOR_STATIC','%SQL_CURSOR_TYPE',
-            '%SQL_CURSOR_TYPE_DEFAULT','%SQL_CUR_DEFAULT','%SQL_CUR_USE_DRIVER','%SQL_CUR_USE_IF_NEEDED','%SQL_CUR_USE_ODBC','%SQL_CU_DML_STATEMENTS','%SQL_CU_INDEX_DEFINITION','%SQL_CU_PRIVILEGE_DEFINITION',
-            '%SQL_CU_PROCEDURE_INVOCATION','%SQL_CU_TABLE_DEFINITION','%SQL_CVT_BIGINT','%SQL_CVT_BINARY','%SQL_CVT_BIT','%SQL_CVT_CHAR','%SQL_CVT_DATE','%SQL_CVT_DECIMAL',
-            '%SQL_CVT_DOUBLE','%SQL_CVT_FLOAT','%SQL_CVT_GUID','%SQL_CVT_INTEGER','%SQL_CVT_INTERVAL_DAY_TIME','%SQL_CVT_INTERVAL_YEAR_MONTH','%SQL_CVT_LONGVARBINARY','%SQL_CVT_LONGVARCHAR',
-            '%SQL_CVT_NUMERIC','%SQL_CVT_REAL','%SQL_CVT_SMALLINT','%SQL_CVT_TIME','%SQL_CVT_TIMESTAMP','%SQL_CVT_TINYINT','%SQL_CVT_VARBINARY','%SQL_CVT_VARCHAR',
-            '%SQL_CVT_WCHAR','%SQL_CVT_WLONGVARCHAR','%SQL_CVT_WVARCHAR','%SQL_CV_CASCADED','%SQL_CV_CHECK_OPTION','%SQL_CV_CREATE_VIEW','%SQL_CV_LOCAL','%SQL_C_BINARY',
-            '%SQL_C_BIT','%SQL_C_BOOKMARK','%SQL_C_CHAR','%SQL_C_DATE','%SQL_C_DEFAULT','%SQL_C_DOUBLE','%SQL_C_FLOAT','%SQL_C_GUID',
-            '%SQL_C_INTERVAL_DAY','%SQL_C_INTERVAL_DAY_TO_HOUR','%SQL_C_INTERVAL_DAY_TO_MINUTE','%SQL_C_INTERVAL_DAY_TO_SECOND','%SQL_C_INTERVAL_HOUR','%SQL_C_INTERVAL_HOUR_TO_MINUTE','%SQL_C_INTERVAL_HOUR_TO_SECOND','%SQL_C_INTERVAL_MINUTE',
-            '%SQL_C_INTERVAL_MINUTE_TO_SECOND','%SQL_C_INTERVAL_MONTH','%SQL_C_INTERVAL_SECOND','%SQL_C_INTERVAL_YEAR','%SQL_C_INTERVAL_YEAR_TO_MONTH','%SQL_C_LONG','%SQL_C_NUMERIC','%SQL_C_SBIGINT',
-            '%SQL_C_SHORT','%SQL_C_SLONG','%SQL_C_SSHORT','%SQL_C_STINYINT','%SQL_C_TIME','%SQL_C_TIMESTAMP','%SQL_C_TINYINT','%SQL_C_TYPE_DATE',
-            '%SQL_C_TYPE_TIME','%SQL_C_TYPE_TIMESTAMP','%SQL_C_UBIGINT','%SQL_C_ULONG','%SQL_C_USHORT','%SQL_C_UTINYINT','%SQL_C_VARBOOKMARK','%SQL_DATABASE_NAME',
-            '%SQL_DATA_AT_EXEC','%SQL_DATA_SOURCE_NAME','%SQL_DATA_SOURCE_READ_ONLY','%SQL_DATE','%SQL_DATETIME','%SQL_DATETIME_LITERALS','%SQL_DATE_LEN','%SQL_DAY',
-            '%SQL_DAY_TO_HOUR','%SQL_DAY_TO_MINUTE','%SQL_DAY_TO_SECOND','%SQL_DA_DROP_ASSERTION','%SQL_DBMS_NAME','%SQL_DBMS_VER','%SQL_DB_DEFAULT','%SQL_DB_DISCONNECT',
-            '%SQL_DB_RETURN_TO_POOL','%SQL_DCS_DROP_CHARACTER_SET','%SQL_DC_DROP_COLLATION','%SQL_DDL_INDEX','%SQL_DD_CASCADE','%SQL_DD_DROP_DOMAIN','%SQL_DD_RESTRICT','%SQL_DECIMAL',
-            '%SQL_DEFAULT','%SQL_DEFAULT_PARAM','%SQL_DEFAULT_TXN_ISOLATION','%SQL_DELETE','%SQL_DELETE_BY_BOOKMARK','%SQL_DESCRIBE_PARAMETER','%SQL_DESC_ALLOC_AUTO','%SQL_DESC_ALLOC_TYPE',
-            '%SQL_DESC_ALLOC_USER','%SQL_DESC_ARRAY_SIZE','%SQL_DESC_ARRAY_STATUS_PTR','%SQL_DESC_AUTO_UNIQUE_VALUE','%SQL_DESC_BASE_COLUMN_NAME','%SQL_DESC_BASE_TABLE_NAME','%SQL_DESC_BIND_OFFSET_PTR','%SQL_DESC_BIND_TYPE',
-            '%SQL_DESC_CASE_SENSITIVE','%SQL_DESC_CATALOG_NAME','%SQL_DESC_CONCISE_TYPE','%SQL_DESC_COUNT','%SQL_DESC_DATA_PTR','%SQL_DESC_DATETIME_INTERVAL_CODE','%SQL_DESC_DATETIME_INTERVAL_PRECISION','%SQL_DESC_DISPLAY_SIZE',
-            '%SQL_DESC_FIXED_PREC_SCALE','%SQL_DESC_INDICATOR_PTR','%SQL_DESC_LABEL','%SQL_DESC_LENGTH','%SQL_DESC_LITERAL_PREFIX','%SQL_DESC_LITERAL_SUFFIX','%SQL_DESC_LOCAL_TYPE_NAME','%SQL_DESC_MAXIMUM_SCALE',
-            '%SQL_DESC_MINIMUM_SCALE','%SQL_DESC_NAME','%SQL_DESC_NULLABLE','%SQL_DESC_NUM_PREC_RADIX','%SQL_DESC_OCTET_LENGTH','%SQL_DESC_OCTET_LENGTH_PTR','%SQL_DESC_PARAMETER_TYPE','%SQL_DESC_PRECISION',
-            '%SQL_DESC_ROWS_PROCESSED_PTR','%SQL_DESC_SCALE','%SQL_DESC_SCHEMA_NAME','%SQL_DESC_SEARCHABLE','%SQL_DESC_TABLE_NAME','%SQL_DESC_TYPE','%SQL_DESC_TYPE_NAME','%SQL_DESC_UNNAMED',
-            '%SQL_DESC_UNSIGNED','%SQL_DESC_UPDATABLE','%SQL_DIAG_ALTER_TABLE','%SQL_DIAG_CALL','%SQL_DIAG_CLASS_ORIGIN','%SQL_DIAG_COLUMN_NUMBER','%SQL_DIAG_CONNECTION_NAME','%SQL_DIAG_CREATE_INDEX',
-            '%SQL_DIAG_CREATE_TABLE','%SQL_DIAG_CREATE_VIEW','%SQL_DIAG_CURSOR_ROW_COUNT','%SQL_DIAG_DELETE_WHERE','%SQL_DIAG_DROP_INDEX','%SQL_DIAG_DROP_TABLE','%SQL_DIAG_DROP_VIEW','%SQL_DIAG_DYNAMIC_DELETE_CURSOR',
-            '%SQL_DIAG_DYNAMIC_FUNCTION','%SQL_DIAG_DYNAMIC_FUNCTION_CODE','%SQL_DIAG_DYNAMIC_UPDATE_CURSOR','%SQL_DIAG_GRANT','%SQL_DIAG_INSERT','%SQL_DIAG_MESSAGE_TEXT','%SQL_DIAG_NATIVE','%SQL_DIAG_NUMBER',
-            '%SQL_DIAG_RETURNCODE','%SQL_DIAG_REVOKE','%SQL_DIAG_ROW_COUNT','%SQL_DIAG_ROW_NUMBER','%SQL_DIAG_SELECT_CURSOR','%SQL_DIAG_SERVER_NAME','%SQL_DIAG_SQLSTATE','%SQL_DIAG_SUBCLASS_ORIGIN',
-            '%SQL_DIAG_UNKNOWN_STATEMENT','%SQL_DIAG_UPDATE_WHERE','%SQL_DI_CREATE_INDEX','%SQL_DI_DROP_INDEX','%SQL_DL_SQL92_DATE','%SQL_DL_SQL92_INTERVAL_DAY','%SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR','%SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE',
-            '%SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND','%SQL_DL_SQL92_INTERVAL_HOUR','%SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE','%SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MINUTE','%SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MONTH','%SQL_DL_SQL92_INTERVAL_SECOND',
-            '%SQL_DL_SQL92_INTERVAL_YEAR','%SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH','%SQL_DL_SQL92_TIME','%SQL_DL_SQL92_TIMESTAMP','%SQL_DM_VER','%SQL_DOUBLE','%SQL_DRIVER_COMPLETE','%SQL_DRIVER_COMPLETE_REQUIRED',
-            '%SQL_DRIVER_HDBC','%SQL_DRIVER_HDESC','%SQL_DRIVER_HENV','%SQL_DRIVER_HLIB','%SQL_DRIVER_HSTMT','%SQL_DRIVER_NAME','%SQL_DRIVER_NOPROMPT','%SQL_DRIVER_ODBC_VER',
-            '%SQL_DRIVER_PROMPT','%SQL_DRIVER_VER','%SQL_DROP','%SQL_DROP_ASSERTION','%SQL_DROP_CHARACTER_SET','%SQL_DROP_COLLATION','%SQL_DROP_DOMAIN','%SQL_DROP_SCHEMA',
-            '%SQL_DROP_TABLE','%SQL_DROP_TRANSLATION','%SQL_DROP_VIEW','%SQL_DS_CASCADE','%SQL_DS_DROP_SCHEMA','%SQL_DS_RESTRICT','%SQL_DTC_DONE','%SQL_DTC_ENLIST_EXPENSIVE',
-            '%SQL_DTC_TRANSITION_COST','%SQL_DTC_UNENLIST_EXPENSIVE','%SQL_DTR_DROP_TRANSLATION','%SQL_DT_CASCADE','%SQL_DT_DROP_TABLE','%SQL_DT_RESTRICT','%SQL_DV_CASCADE','%SQL_DV_DROP_VIEW',
-            '%SQL_DV_RESTRICT','%SQL_DYNAMIC_CURSOR_ATTRIBUTES1','%SQL_DYNAMIC_CURSOR_ATTRIBUTES2','%SQL_ENSURE','%SQL_ENTIRE_ROWSET','%SQL_ERROR','%SQL_EXPRESSIONS_IN_ORDERBY','%SQL_FALSE',
-            '%SQL_FD_FETCH_ABSOLUTE','%SQL_FD_FETCH_BOOKMARK','%SQL_FD_FETCH_FIRST','%SQL_FD_FETCH_LAST','%SQL_FD_FETCH_NEXT','%SQL_FD_FETCH_PREV','%SQL_FD_FETCH_PRIOR','%SQL_FD_FETCH_RELATIVE',
-            '%SQL_FETCH_ABSOLUTE','%SQL_FETCH_BOOKMARK','%SQL_FETCH_BY_BOOKMARK','%SQL_FETCH_DIRECTION','%SQL_FETCH_FIRST','%SQL_FETCH_FIRST_SYSTEM','%SQL_FETCH_FIRST_USER','%SQL_FETCH_LAST',
-            '%SQL_FETCH_NEXT','%SQL_FETCH_PREV','%SQL_FETCH_PRIOR','%SQL_FETCH_RELATIVE','%SQL_FILE_CATALOG','%SQL_FILE_NOT_SUPPORTED','%SQL_FILE_QUALIFIER','%SQL_FILE_TABLE',
-            '%SQL_FILE_USAGE','%SQL_FLOAT','%SQL_FN_CVT_CAST','%SQL_FN_CVT_CONVERT','%SQL_FN_NUM_ABS','%SQL_FN_NUM_ACOS','%SQL_FN_NUM_ASIN','%SQL_FN_NUM_ATAN',
-            '%SQL_FN_NUM_ATAN2','%SQL_FN_NUM_CEILING','%SQL_FN_NUM_COS','%SQL_FN_NUM_COT','%SQL_FN_NUM_DEGREES','%SQL_FN_NUM_EXP','%SQL_FN_NUM_FLOOR','%SQL_FN_NUM_LOG',
-            '%SQL_FN_NUM_LOG10','%SQL_FN_NUM_MOD','%SQL_FN_NUM_PI','%SQL_FN_NUM_POWER','%SQL_FN_NUM_RADIANS','%SQL_FN_NUM_RAND','%SQL_FN_NUM_ROUND','%SQL_FN_NUM_SIGN',
-            '%SQL_FN_NUM_SIN','%SQL_FN_NUM_SQRT','%SQL_FN_NUM_TAN','%SQL_FN_NUM_TRUNCATE','%SQL_FN_STR_ASCII','%SQL_FN_STR_BIT_LENGTH','%SQL_FN_STR_CHAR','%SQL_FN_STR_CHARACTER_LENGTH',
-            '%SQL_FN_STR_CHAR_LENGTH','%SQL_FN_STR_CONCAT','%SQL_FN_STR_DIFFERENCE','%SQL_FN_STR_INSERT','%SQL_FN_STR_LCASE','%SQL_FN_STR_LEFT','%SQL_FN_STR_LENGTH','%SQL_FN_STR_LOCATE',
-            '%SQL_FN_STR_LOCATE_2','%SQL_FN_STR_LTRIM','%SQL_FN_STR_OCTET_LENGTH','%SQL_FN_STR_POSITION','%SQL_FN_STR_REPEAT','%SQL_FN_STR_REPLACE','%SQL_FN_STR_RIGHT','%SQL_FN_STR_RTRIM',
-            '%SQL_FN_STR_SOUNDEX','%SQL_FN_STR_SPACE','%SQL_FN_STR_SUBSTRING','%SQL_FN_STR_UCASE','%SQL_FN_SYS_DBNAME','%SQL_FN_SYS_IFNULL','%SQL_FN_SYS_USERNAME','%SQL_FN_TD_CURDATE',
-            '%SQL_FN_TD_CURRENT_DATE','%SQL_FN_TD_CURRENT_TIME','%SQL_FN_TD_CURRENT_TIMESTAMP','%SQL_FN_TD_CURTIME','%SQL_FN_TD_DAYNAME','%SQL_FN_TD_DAYOFMONTH','%SQL_FN_TD_DAYOFWEEK','%SQL_FN_TD_DAYOFYEAR',
-            '%SQL_FN_TD_EXTRACT','%SQL_FN_TD_HOUR','%SQL_FN_TD_MINUTE','%SQL_FN_TD_MONTH','%SQL_FN_TD_MONTHNAME','%SQL_FN_TD_NOW','%SQL_FN_TD_QUARTER','%SQL_FN_TD_SECOND',
-            '%SQL_FN_TD_TIMESTAMPADD','%SQL_FN_TD_TIMESTAMPDIFF','%SQL_FN_TD_WEEK','%SQL_FN_TD_YEAR','%SQL_FN_TSI_DAY','%SQL_FN_TSI_FRAC_SECOND','%SQL_FN_TSI_HOUR','%SQL_FN_TSI_MINUTE',
-            '%SQL_FN_TSI_MONTH','%SQL_FN_TSI_QUARTER','%SQL_FN_TSI_SECOND','%SQL_FN_TSI_WEEK','%SQL_FN_TSI_YEAR','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2','%SQL_GB_COLLATE',
-            '%SQL_GB_GROUP_BY_CONTAINS_SELECT','%SQL_GB_GROUP_BY_EQUALS_SELECT','%SQL_GB_NOT_SUPPORTED','%SQL_GB_NO_RELATION','%SQL_GD_ANY_COLUMN','%SQL_GD_ANY_ORDER','%SQL_GD_BLOCK','%SQL_GD_BOUND',
-            '%SQL_GETDATA_EXTENSIONS','%SQL_GET_BOOKMARK','%SQL_GROUP_BY','%SQL_GUID','%SQL_HANDLE_DBC','%SQL_HANDLE_DESC','%SQL_HANDLE_ENV','%SQL_HANDLE_SENV',
-            '%SQL_HANDLE_STMT','%SQL_HOUR','%SQL_HOUR_TO_MINUTE','%SQL_HOUR_TO_SECOND','%SQL_IC_LOWER','%SQL_IC_MIXED','%SQL_IC_SENSITIVE','%SQL_IC_UPPER',
-            '%SQL_IDENTIFIER_CASE','%SQL_IDENTIFIER_QUOTE_CHAR','%SQL_IGNORE','%SQL_IK_ALL','%SQL_IK_ASC','%SQL_IK_DESC','%SQL_IK_NONE','%SQL_INDEX_ALL',
-            '%SQL_INDEX_CLUSTERED','%SQL_INDEX_HASHED','%SQL_INDEX_KEYWORDS','%SQL_INDEX_OTHER','%SQL_INDEX_UNIQUE','%SQL_INFO_FIRST','%SQL_INFO_SCHEMA_VIEWS','%SQL_INITIALLY_DEFERRED',
-            '%SQL_INITIALLY_IMMEDIATE','%SQL_INSENSITIVE','%SQL_INSERT_STATEMENT','%SQL_INTEGER','%SQL_INTEGRITY','%SQL_INTERVAL','%SQL_INTERVAL_DAY','%SQL_INTERVAL_DAY_TO_HOUR',
-            '%SQL_INTERVAL_DAY_TO_MINUTE','%SQL_INTERVAL_DAY_TO_SECOND','%SQL_INTERVAL_HOUR','%SQL_INTERVAL_HOUR_TO_MINUTE','%SQL_INTERVAL_HOUR_TO_SECOND','%SQL_INTERVAL_MINUTE','%SQL_INTERVAL_MINUTE_TO_SECOND','%SQL_INTERVAL_MONTH',
-            '%SQL_INTERVAL_SECOND','%SQL_INTERVAL_YEAR','%SQL_INTERVAL_YEAR_TO_MONTH','%SQL_INVALID_HANDLE','%SQL_ISV_ASSERTIONS','%SQL_ISV_CHARACTER_SETS','%SQL_ISV_CHECK_CONSTRAINTS','%SQL_ISV_COLLATIONS',
-            '%SQL_ISV_COLUMNS','%SQL_ISV_COLUMN_DOMAIN_USAGE','%SQL_ISV_COLUMN_PRIVILEGES','%SQL_ISV_CONSTRAINT_COLUMN_USAGE','%SQL_ISV_CONSTRAINT_TABLE_USAGE','%SQL_ISV_DOMAINS','%SQL_ISV_DOMAIN_CONSTRAINTS','%SQL_ISV_KEY_COLUMN_USAGE',
-            '%SQL_ISV_REFERENTIAL_CONSTRAINTS','%SQL_ISV_SCHEMATA','%SQL_ISV_SQL_LANGUAGES','%SQL_ISV_TABLES','%SQL_ISV_TABLE_CONSTRAINTS','%SQL_ISV_TABLE_PRIVILEGES','%SQL_ISV_TRANSLATIONS','%SQL_ISV_USAGE_PRIVILEGES',
-            '%SQL_ISV_VIEWS','%SQL_ISV_VIEW_COLUMN_USAGE','%SQL_ISV_VIEW_TABLE_USAGE','%SQL_IS_DAY','%SQL_IS_DAY_TO_HOUR','%SQL_IS_DAY_TO_MINUTE','%SQL_IS_DAY_TO_SECOND','%SQL_IS_HOUR',
-            '%SQL_IS_HOUR_TO_MINUTE','%SQL_IS_HOUR_TO_SECOND','%SQL_IS_INSERT_LITERALS','%SQL_IS_INSERT_SEARCHED','%SQL_IS_INTEGER','%SQL_IS_MINUTE','%SQL_IS_MINUTE_TO_SECOND','%SQL_IS_MONTH',
-            '%SQL_IS_POINTER','%SQL_IS_SECOND','%SQL_IS_SELECT_INTO','%SQL_IS_SMALLINT','%SQL_IS_UINTEGER','%SQL_IS_USMALLINT','%SQL_IS_YEAR','%SQL_IS_YEAR_TO_MONTH',
-            '%SQL_KEYSET_CURSOR_ATTRIBUTES1','%SQL_KEYSET_CURSOR_ATTRIBUTES2','%SQL_KEYSET_SIZE','%SQL_KEYSET_SIZE_DEFAULT','%SQL_KEYWORDS','%SQL_LCK_EXCLUSIVE','%SQL_LCK_NO_CHANGE','%SQL_LCK_UNLOCK',
-            '%SQL_LEN_BINARY_ATTR_OFFSET','%SQL_LEN_DATA_AT_EXEC_OFFSET','%SQL_LIKE_ESCAPE_CLAUSE','%SQL_LIKE_ONLY','%SQL_LOCK_EXCLUSIVE','%SQL_LOCK_NO_CHANGE','%SQL_LOCK_TYPES','%SQL_LOCK_UNLOCK',
-            '%SQL_LOGIN_TIMEOUT','%SQL_LOGIN_TIMEOUT_DEFAULT','%SQL_LONGVARBINARY','%SQL_LONGVARCHAR','%SQL_MAXIMUM_CATALOG_NAME_LENGTH','%SQL_MAXIMUM_COLUMNS_IN_GROUP_BY','%SQL_MAXIMUM_COLUMNS_IN_INDEX','%SQL_MAXIMUM_COLUMNS_IN_ORDER_BY',
-            '%SQL_MAXIMUM_COLUMNS_IN_SELECT','%SQL_MAXIMUM_COLUMN_NAME_LENGTH','%SQL_MAXIMUM_CONCURRENT_ACTIVITIES','%SQL_MAXIMUM_CURSOR_NAME_LENGTH','%SQL_MAXIMUM_DRIVER_CONNECTIONS','%SQL_MAXIMUM_IDENTIFIER_LENGTH','%SQL_MAXIMUM_INDEX_SIZE','%SQL_MAXIMUM_ROW_SIZE',
-            '%SQL_MAXIMUM_SCHEMA_NAME_LENGTH','%SQL_MAXIMUM_STATEMENT_LENGTH','%SQL_MAXIMUM_TABLES_IN_SELECT','%SQL_MAXIMUM_USER_NAME_LENGTH','%SQL_MAX_ASYNC_CONCURRENT_STATEMENTS','%SQL_MAX_BINARY_LITERAL_LEN','%SQL_MAX_CATALOG_NAME_LEN','%SQL_MAX_CHAR_LITERAL_LEN',
-            '%SQL_MAX_COLUMNS_IN_GROUP_BY','%SQL_MAX_COLUMNS_IN_INDEX','%SQL_MAX_COLUMNS_IN_ORDER_BY','%SQL_MAX_COLUMNS_IN_SELECT','%SQL_MAX_COLUMNS_IN_TABLE','%SQL_MAX_COLUMN_NAME_LEN','%SQL_MAX_CONCURRENT_ACTIVITIES','%SQL_MAX_CURSOR_NAME_LEN',
-            '%SQL_MAX_DRIVER_CONNECTIONS','%SQL_MAX_DSN_LENGTH','%SQL_MAX_IDENTIFIER_LEN','%SQL_MAX_INDEX_SIZE','%SQL_MAX_LENGTH','%SQL_MAX_LENGTH_DEFAULT','%SQL_MAX_MESSAGE_LENGTH','%SQL_MAX_NUMERIC_LEN',
-            '%SQL_MAX_OPTION_STRING_LENGTH','%SQL_MAX_OWNER_NAME_LEN','%SQL_MAX_PROCEDURE_NAME_LEN','%SQL_MAX_QUALIFIER_NAME_LEN','%SQL_MAX_ROWS','%SQL_MAX_ROWS_DEFAULT','%SQL_MAX_ROW_SIZE','%SQL_MAX_ROW_SIZE_INCLUDES_LONG',
-            '%SQL_MAX_SCHEMA_NAME_LEN','%SQL_MAX_STATEMENT_LEN','%SQL_MAX_TABLES_IN_SELECT','%SQL_MAX_TABLE_NAME_LEN','%SQL_MAX_USER_NAME_LEN','%SQL_MINUTE','%SQL_MINUTE_TO_SECOND','%SQL_MODE_DEFAULT',
-            '%SQL_MODE_READ_ONLY','%SQL_MODE_READ_WRITE','%SQL_MONTH','%SQL_MULTIPLE_ACTIVE_TXN','%SQL_MULT_RESULT_SETS','%SQL_NAMED','%SQL_NC_END','%SQL_NC_HIGH',
-            '%SQL_NC_LOW','%SQL_NC_START','%SQL_NEED_DATA','%SQL_NEED_LONG_DATA_LEN','%SQL_NNC_NON_NULL','%SQL_NNC_NULL','%SQL_NONSCROLLABLE','%SQL_NON_NULLABLE_COLUMNS',
-            '%SQL_NOSCAN','%SQL_NOSCAN_DEFAULT','%SQL_NOSCAN_OFF','%SQL_NOSCAN_ON','%SQL_NOT_DEFERRABLE','%SQL_NO_ACTION','%SQL_NO_COLUMN_NUMBER','%SQL_NO_DATA',
-            '%SQL_NO_DATA_FOUND','%SQL_NO_NULLS','%SQL_NO_ROW_NUMBER','%SQL_NO_TOTAL','%SQL_NTS','%SQL_NTSL','%SQL_NULLABLE','%SQL_NULLABLE_UNKNOWN',
-            '%SQL_NULL_COLLATION','%SQL_NULL_DATA','%SQL_NULL_HANDLE','%SQL_NULL_HDBC','%SQL_NULL_HDESC','%SQL_NULL_HENV','%SQL_NULL_HSTMT','%SQL_NUMERIC',
-            '%SQL_NUMERIC_FUNCTIONS','%SQL_OAC_LEVEL1','%SQL_OAC_LEVEL2','%SQL_OAC_NONE','%SQL_ODBC_API_CONFORMANCE','%SQL_ODBC_CURSORS','%SQL_ODBC_INTERFACE_CONFORMANCE','%SQL_ODBC_SAG_CLI_CONFORMANCE',
-            '%SQL_ODBC_SQL_CONFORMANCE','%SQL_ODBC_SQL_OPT_IEF','%SQL_ODBC_VER','%SQL_OIC_CORE','%SQL_OIC_LEVEL1','%SQL_OIC_LEVEL2','%SQL_OJ_ALL_COMPARISON_OPS','%SQL_OJ_CAPABILITIES',
-            '%SQL_OJ_FULL','%SQL_OJ_INNER','%SQL_OJ_LEFT','%SQL_OJ_NESTED','%SQL_OJ_NOT_ORDERED','%SQL_OJ_RIGHT','%SQL_OPT_TRACE','%SQL_OPT_TRACEFILE',
-            '%SQL_OPT_TRACE_DEFAULT','%SQL_OPT_TRACE_OFF','%SQL_OPT_TRACE_ON','%SQL_ORDER_BY_COLUMNS_IN_SELECT','%SQL_OSCC_COMPLIANT','%SQL_OSCC_NOT_COMPLIANT','%SQL_OSC_CORE','%SQL_OSC_EXTENDED',
-            '%SQL_OSC_MINIMUM','%SQL_OUTER_JOINS','%SQL_OUTER_JOIN_CAPABILITIES','%SQL_OU_DML_STATEMENTS','%SQL_OU_INDEX_DEFINITION','%SQL_OU_PRIVILEGE_DEFINITION','%SQL_OU_PROCEDURE_INVOCATION','%SQL_OU_TABLE_DEFINITION',
-            '%SQL_OV_ODBC2','%SQL_OV_ODBC3','%SQL_OWNER_TERM','%SQL_OWNER_USAGE','%SQL_PACKET_SIZE','%SQL_PARAM_ARRAY_ROW_COUNTS','%SQL_PARAM_ARRAY_SELECTS','%SQL_PARAM_BIND_BY_COLUMN',
-            '%SQL_PARAM_BIND_TYPE_DEFAULT','%SQL_PARAM_DIAG_UNAVAILABLE','%SQL_PARAM_ERROR','%SQL_PARAM_IGNORE','%SQL_PARAM_INPUT','%SQL_PARAM_INPUT_OUTPUT','%SQL_PARAM_OUTPUT','%SQL_PARAM_PROCEED',
-            '%SQL_PARAM_SUCCESS','%SQL_PARAM_SUCCESS_WITH_INFO','%SQL_PARAM_TYPE_DEFAULT','%SQL_PARAM_TYPE_UNKNOWN','%SQL_PARAM_UNUSED','%SQL_PARC_BATCH','%SQL_PARC_NO_BATCH','%SQL_PAS_BATCH',
-            '%SQL_PAS_NO_BATCH','%SQL_PAS_NO_SELECT','%SQL_PC_NON_PSEUDO','%SQL_PC_NOT_PSEUDO','%SQL_PC_PSEUDO','%SQL_PC_UNKNOWN','%SQL_POSITION','%SQL_POSITIONED_STATEMENTS',
-            '%SQL_POS_ADD','%SQL_POS_DELETE','%SQL_POS_OPERATIONS','%SQL_POS_POSITION','%SQL_POS_REFRESH','%SQL_POS_UPDATE','%SQL_PRED_BASIC','%SQL_PRED_CHAR',
-            '%SQL_PRED_NONE','%SQL_PRED_SEARCHABLE','%SQL_PROCEDURES','%SQL_PROCEDURE_TERM','%SQL_PS_POSITIONED_DELETE','%SQL_PS_POSITIONED_UPDATE','%SQL_PS_SELECT_FOR_UPDATE','%SQL_PT_FUNCTION',
-            '%SQL_PT_PROCEDURE','%SQL_PT_UNKNOWN','%SQL_QL_END','%SQL_QL_START','%SQL_QUALIFIER_LOCATION','%SQL_QUALIFIER_NAME_SEPARATOR','%SQL_QUALIFIER_TERM','%SQL_QUALIFIER_USAGE',
-            '%SQL_QUERY_TIMEOUT','%SQL_QUERY_TIMEOUT_DEFAULT','%SQL_QUICK','%SQL_QUIET_MODE','%SQL_QUOTED_IDENTIFIER_CASE','%SQL_QU_DML_STATEMENTS','%SQL_QU_INDEX_DEFINITION','%SQL_QU_PRIVILEGE_DEFINITION',
-            '%SQL_QU_PROCEDURE_INVOCATION','%SQL_QU_TABLE_DEFINITION','%SQL_RD_DEFAULT','%SQL_RD_OFF','%SQL_RD_ON','%SQL_REAL','%SQL_REFRESH','%SQL_RESET_PARAMS',
-            '%SQL_RESTRICT','%SQL_RESULT_COL','%SQL_RETRIEVE_DATA','%SQL_RETURN_VALUE','%SQL_ROLLBACK','%SQL_ROWSET_SIZE','%SQL_ROWSET_SIZE_DEFAULT','%SQL_ROWVER',
-            '%SQL_ROW_ADDED','%SQL_ROW_DELETED','%SQL_ROW_ERROR','%SQL_ROW_IDENTIFIER','%SQL_ROW_IGNORE','%SQL_ROW_NOROW','%SQL_ROW_NUMBER','%SQL_ROW_NUMBER_UNKNOWN',
-            '%SQL_ROW_PROCEED','%SQL_ROW_SUCCESS','%SQL_ROW_SUCCESS_WITH_INFO','%SQL_ROW_UPDATED','%SQL_ROW_UPDATES','%SQL_SCCO_LOCK','%SQL_SCCO_OPT_ROWVER','%SQL_SCCO_OPT_TIMESTAMP',
-            '%SQL_SCCO_OPT_VALUES','%SQL_SCCO_READ_ONLY','%SQL_SCC_ISO92_CLI','%SQL_SCC_XOPEN_CLI_VERSION1','%SQL_SCHEMA_TERM','%SQL_SCHEMA_USAGE','%SQL_SCOPE_CURROW','%SQL_SCOPE_SESSION',
-            '%SQL_SCOPE_TRANSACTION','%SQL_SCROLLABLE','%SQL_SCROLL_CONCURRENCY','%SQL_SCROLL_DYNAMIC','%SQL_SCROLL_FORWARD_ONLY','%SQL_SCROLL_KEYSET_DRIVEN','%SQL_SCROLL_OPTIONS','%SQL_SCROLL_STATIC',
-            '%SQL_SC_FIPS127_2_TRANSITIONAL','%SQL_SC_NON_UNIQUE','%SQL_SC_SQL92_ENTRY','%SQL_SC_SQL92_FULL','%SQL_SC_SQL92_INTERMEDIATE','%SQL_SC_TRY_UNIQUE','%SQL_SC_UNIQUE','%SQL_SDF_CURRENT_DATE',
-            '%SQL_SDF_CURRENT_TIME','%SQL_SDF_CURRENT_TIMESTAMP','%SQL_SEARCHABLE','%SQL_SEARCH_PATTERN_ESCAPE','%SQL_SECOND','%SQL_SENSITIVE','%SQL_SERVER_NAME','%SQL_SETPARAM_VALUE_MAX',
-            '%SQL_SETPOS_MAX_LOCK_VALUE','%SQL_SETPOS_MAX_OPTION_VALUE','%SQL_SET_DEFAULT','%SQL_SET_NULL','%SQL_SFKD_CASCADE','%SQL_SFKD_NO_ACTION','%SQL_SFKD_SET_DEFAULT','%SQL_SFKD_SET_NULL',
-            '%SQL_SFKU_CASCADE','%SQL_SFKU_NO_ACTION','%SQL_SFKU_SET_DEFAULT','%SQL_SFKU_SET_NULL','%SQL_SG_DELETE_TABLE','%SQL_SG_INSERT_COLUMN','%SQL_SG_INSERT_TABLE','%SQL_SG_REFERENCES_COLUMN',
-            '%SQL_SG_REFERENCES_TABLE','%SQL_SG_SELECT_TABLE','%SQL_SG_UPDATE_COLUMN','%SQL_SG_UPDATE_TABLE','%SQL_SG_USAGE_ON_CHARACTER_SET','%SQL_SG_USAGE_ON_COLLATION','%SQL_SG_USAGE_ON_DOMAIN','%SQL_SG_USAGE_ON_TRANSLATION',
-            '%SQL_SG_WITH_GRANT_OPTION','%SQL_SIGNED_OFFSET','%SQL_SIMULATE_CURSOR','%SQL_SMALLINT','%SQL_SNVF_BIT_LENGTH','%SQL_SNVF_CHARACTER_LENGTH','%SQL_SNVF_CHAR_LENGTH','%SQL_SNVF_EXTRACT',
-            '%SQL_SNVF_OCTET_LENGTH','%SQL_SNVF_POSITION','%SQL_SO_DYNAMIC','%SQL_SO_FORWARD_ONLY','%SQL_SO_KEYSET_DRIVEN','%SQL_SO_MIXED','%SQL_SO_STATIC','%SQL_SPECIAL_CHARACTERS',
-            '%SQL_SPEC_MAJOR','%SQL_SPEC_MINOR','%SQL_SP_BETWEEN','%SQL_SP_COMPARISON','%SQL_SP_EXISTS','%SQL_SP_IN','%SQL_SP_ISNOTNULL','%SQL_SP_ISNULL',
-            '%SQL_SP_LIKE','%SQL_SP_MATCH_FULL','%SQL_SP_MATCH_PARTIAL','%SQL_SP_MATCH_UNIQUE_FULL','%SQL_SP_MATCH_UNIQUE_PARTIAL','%SQL_SP_OVERLAPS','%SQL_SP_QUANTIFIED_COMPARISON','%SQL_SP_UNIQUE',
-            '%SQL_SQL92_DATETIME_FUNCTIONS','%SQL_SQL92_FOREIGN_KEY_DELETE_RULE','%SQL_SQL92_FOREIGN_KEY_UPDATE_RULE','%SQL_SQL92_GRANT','%SQL_SQL92_NUMERIC_VALUE_FUNCTIONS','%SQL_SQL92_PREDICATES','%SQL_SQL92_RELATIONAL_JOIN_OPERATORS','%SQL_SQL92_REVOKE',
-            '%SQL_SQL92_ROW_VALUE_CONSTRUCTOR','%SQL_SQL92_STRING_FUNCTIONS','%SQL_SQL92_VALUE_EXPRESSIONS','%SQL_SQLSTATE_SIZE','%SQL_SQL_CONFORMANCE','%SQL_SQ_COMPARISON','%SQL_SQ_CORRELATED_SUBQUERIES','%SQL_SQ_EXISTS',
-            '%SQL_SQ_IN','%SQL_SQ_QUANTIFIED','%SQL_SRJO_CORRESPONDING_CLAUSE','%SQL_SRJO_CROSS_JOIN','%SQL_SRJO_EXCEPT_JOIN','%SQL_SRJO_FULL_OUTER_JOIN','%SQL_SRJO_INNER_JOIN','%SQL_SRJO_INTERSECT_JOIN',
-            '%SQL_SRJO_LEFT_OUTER_JOIN','%SQL_SRJO_NATURAL_JOIN','%SQL_SRJO_RIGHT_OUTER_JOIN','%SQL_SRJO_UNION_JOIN','%SQL_SRVC_DEFAULT','%SQL_SRVC_NULL','%SQL_SRVC_ROW_SUBQUERY','%SQL_SRVC_VALUE_EXPRESSION',
-            '%SQL_SR_CASCADE','%SQL_SR_DELETE_TABLE','%SQL_SR_GRANT_OPTION_FOR','%SQL_SR_INSERT_COLUMN','%SQL_SR_INSERT_TABLE','%SQL_SR_REFERENCES_COLUMN','%SQL_SR_REFERENCES_TABLE','%SQL_SR_RESTRICT',
-            '%SQL_SR_SELECT_TABLE','%SQL_SR_UPDATE_COLUMN','%SQL_SR_UPDATE_TABLE','%SQL_SR_USAGE_ON_CHARACTER_SET','%SQL_SR_USAGE_ON_COLLATION','%SQL_SR_USAGE_ON_DOMAIN','%SQL_SR_USAGE_ON_TRANSLATION','%SQL_SSF_CONVERT',
-            '%SQL_SSF_LOWER','%SQL_SSF_SUBSTRING','%SQL_SSF_TRANSLATE','%SQL_SSF_TRIM_BOTH','%SQL_SSF_TRIM_LEADING','%SQL_SSF_TRIM_TRAILING','%SQL_SSF_UPPER','%SQL_SS_ADDITIONS',
-            '%SQL_SS_DELETIONS','%SQL_SS_UPDATES','%SQL_STANDARD_CLI_CONFORMANCE','%SQL_STATIC_CURSOR_ATTRIBUTES1','%SQL_STATIC_CURSOR_ATTRIBUTES2','%SQL_STATIC_SENSITIVITY','%SQL_STILL_EXECUTING','%SQL_STRING_FUNCTIONS',
-            '%SQL_SUBQUERIES','%SQL_SUCCESS','%SQL_SUCCESS_WITH_INFO','%SQL_SU_DML_STATEMENTS','%SQL_SU_INDEX_DEFINITION','%SQL_SU_PRIVILEGE_DEFINITION','%SQL_SU_PROCEDURE_INVOCATION','%SQL_SU_TABLE_DEFINITION',
-            '%SQL_SVE_CASE','%SQL_SVE_CAST','%SQL_SVE_COALESCE','%SQL_SVE_NULLIF','%SQL_SYSTEM_FUNCTIONS','%SQL_TABLE_STAT','%SQL_TABLE_TERM','%SQL_TC_ALL',
-            '%SQL_TC_DDL_COMMIT','%SQL_TC_DDL_IGNORE','%SQL_TC_DML','%SQL_TC_NONE','%SQL_TIME','%SQL_TIMEDATE_ADD_INTERVALS','%SQL_TIMEDATE_DIFF_INTERVALS','%SQL_TIMEDATE_FUNCTIONS',
-            '%SQL_TIMESTAMP','%SQL_TIMESTAMP_LEN','%SQL_TIME_LEN','%SQL_TINYINT','%SQL_TRANSACTION_CAPABLE','%SQL_TRANSACTION_ISOLATION_OPTION','%SQL_TRANSACTION_READ_COMMITTED','%SQL_TRANSACTION_READ_UNCOMMITTED',
-            '%SQL_TRANSACTION_REPEATABLE_READ','%SQL_TRANSACTION_SERIALIZABLE','%SQL_TRANSLATE_DLL','%SQL_TRANSLATE_OPTION','%SQL_TRUE','%SQL_TXN_CAPABLE','%SQL_TXN_ISOLATION','%SQL_TXN_ISOLATION_OPTION',
-            '%SQL_TXN_READ_COMMITTED','%SQL_TXN_READ_UNCOMMITTED','%SQL_TXN_REPEATABLE_READ','%SQL_TXN_SERIALIZABLE','%SQL_TYPE_DATE','%SQL_TYPE_NULL','%SQL_TYPE_TIME','%SQL_TYPE_TIMESTAMP',
-            '%SQL_UB_DEFAULT','%SQL_UB_FIXED','%SQL_UB_OFF','%SQL_UB_ON','%SQL_UB_VARIABLE','%SQL_UNBIND','%SQL_UNICODE','%SQL_UNICODE_CHAR',
-            '%SQL_UNICODE_LONGVARCHAR','%SQL_UNICODE_VARCHAR','%SQL_UNION','%SQL_UNION_STATEMENT','%SQL_UNKNOWN_TYPE','%SQL_UNNAMED','%SQL_UNSEARCHABLE','%SQL_UNSIGNED_OFFSET',
-            '%SQL_UNSPECIFIED','%SQL_UPDATE','%SQL_UPDATE_BY_BOOKMARK','%SQL_USER_NAME','%SQL_USE_BOOKMARKS','%SQL_US_UNION','%SQL_US_UNION_ALL','%SQL_U_UNION',
-            '%SQL_U_UNION_ALL','%SQL_VARBINARY','%SQL_VARCHAR','%SQL_XOPEN_CLI_YEAR','%SQL_YEAR','%SQL_YEAR_TO_MONTH','%SRCCOPY','%SS_BITMAP',
-            '%SS_BLACKFRAME','%SS_BLACKRECT','%SS_CENTER','%SS_CENTERIMAGE','%SS_ENDELLIPSIS','%SS_ETCHEDFRAME','%SS_ETCHEDHORZ','%SS_ETCHEDVERT',
-            '%SS_GRAYFRAME','%SS_GRAYRECT','%SS_LEFT','%SS_NOPREFIX','%SS_NOTIFY','%SS_NOWORDWRAP','%SS_PATHELLIPSIS','%SS_RIGHT',
-            '%SS_RIGHTJUST','%SS_SIMPLE','%SS_SUNKEN','%SS_WHITEFRAME','%SS_WHITERECT','%SS_WORDELLIPSIS','%STAT_FILL_FROM_MEMORY','%STAT_FILL_NATURAL',
-            '%STAT_FILL_NATURAL_ERASTONE','%STAT_FILL_NATURAL_EVEN','%STAT_FILL_NATURAL_FIBONACCI','%STAT_FILL_NATURAL_ODD','%STAT_FILL_WITH_NUMBER','%STAT_MINMAX_INDEX','%STAT_MINMAX_VALUE','%STAT_TYPE_BYTE',
-            '%STAT_TYPE_CURRENCY','%STAT_TYPE_DOUBLE','%STAT_TYPE_DWORD','%STAT_TYPE_EXT','%STAT_TYPE_INTEGER','%STAT_TYPE_LONG','%STAT_TYPE_QUAD','%STAT_TYPE_SINGLE',
-            '%STAT_TYPE_WORD','%SWP_ASYNCWINDOWPOS','%SWP_DEFERERASE','%SWP_DRAWFRAME','%SWP_FRAMECHANGED','%SWP_HIDEWINDOW','%SWP_NOACTIVATE','%SWP_NOCOPYBITS',
-            '%SWP_NOMOVE','%SWP_NOOWNERZORDER','%SWP_NOREDRAW','%SWP_NOREPOSITION','%SWP_NOSENDCHANGING','%SWP_NOSIZE','%SWP_NOZORDER','%SWP_SHOWWINDOW',
-            '%SW_FORCEMINIMIZE','%SW_HIDE','%SW_MAXIMIZE','%SW_MINIMIZE','%SW_NORMAL','%SW_RESTORE','%SW_SHOW','%SW_SHOWDEFAULT',
-            '%SW_SHOWMAXIMIZED','%SW_SHOWMINIMIZED','%SW_SHOWMINNOACTIVE','%SW_SHOWNA','%SW_SHOWNOACTIVATE','%SW_SHOWNORMAL','%TBASS_3DALG_DEFAULT','%TBASS_3DALG_FULL',
-            '%TBASS_3DALG_LIGHT','%TBASS_3DALG_OFF','%TBASS_3DMODE_NORMAL','%TBASS_3DMODE_OFF','%TBASS_3DMODE_RELATIVE','%TBASS_ACTIVE_PAUSED','%TBASS_ACTIVE_PLAYING','%TBASS_ACTIVE_STALLED',
-            '%TBASS_ACTIVE_STOPPED','%TBASS_CONFIG_3DALGORITHM','%TBASS_CONFIG_BUFFER','%TBASS_CONFIG_CURVE_PAN','%TBASS_CONFIG_CURVE_VOL','%TBASS_CONFIG_FLOATDSP','%TBASS_CONFIG_GVOL_MUSIC','%TBASS_CONFIG_GVOL_SAMPLE',
-            '%TBASS_CONFIG_GVOL_STREAM','%TBASS_CONFIG_MAXVOL','%TBASS_CONFIG_MP3_CODEC','%TBASS_CONFIG_NET_AGENT','%TBASS_CONFIG_NET_BUFFER','%TBASS_CONFIG_NET_PASSIVE','%TBASS_CONFIG_NET_PREBUF','%TBASS_CONFIG_NET_PROXY',
-            '%TBASS_CONFIG_NET_TIMEOUT','%TBASS_CONFIG_PAUSE_NOPLAY','%TBASS_CONFIG_UPDATEPERIOD','%TBASS_CTYPE_MUSIC_IT','%TBASS_CTYPE_MUSIC_MO3','%TBASS_CTYPE_MUSIC_MOD','%TBASS_CTYPE_MUSIC_MTM','%TBASS_CTYPE_MUSIC_S3M',
-            '%TBASS_CTYPE_MUSIC_XM','%TBASS_CTYPE_RECORD','%TBASS_CTYPE_SAMPLE','%TBASS_CTYPE_STREAM','%TBASS_CTYPE_STREAM_AIFF','%TBASS_CTYPE_STREAM_MP1','%TBASS_CTYPE_STREAM_MP2','%TBASS_CTYPE_STREAM_MP3',
-            '%TBASS_CTYPE_STREAM_OGG','%TBASS_CTYPE_STREAM_WAV','%TBASS_CTYPE_STREAM_WAV_FLOAT','%TBASS_CTYPE_STREAM_WAV_PCM','%TBASS_DATA_AVAILABLE','%TBASS_DATA_FFT1024','%TBASS_DATA_FFT2048','%TBASS_DATA_FFT4096',
-            '%TBASS_DATA_FFT512','%TBASS_DATA_FFT_INDIVIDUAL','%TBASS_DATA_FFT_NOWINDOW','%TBASS_DATA_FLOAT','%TBASS_DEVICE_3D','%TBASS_DEVICE_8BITS','%TBASS_DEVICE_LATENCY','%TBASS_DEVICE_MONO',
-            '%TBASS_DEVICE_NOSPEAKER','%TBASS_DEVICE_SPEAKERS','%TBASS_EAX_ENVIRONMENT_ALLEY','%TBASS_EAX_ENVIRONMENT_ARENA','%TBASS_EAX_ENVIRONMENT_AUDITORIUM','%TBASS_EAX_ENVIRONMENT_BATHROOM','%TBASS_EAX_ENVIRONMENT_CARPETEDHALLWAY','%TBASS_EAX_ENVIRONMENT_CAVE',
-            '%TBASS_EAX_ENVIRONMENT_CITY','%TBASS_EAX_ENVIRONMENT_CONCERTHALL','%TBASS_EAX_ENVIRONMENT_COUNT','%TBASS_EAX_ENVIRONMENT_DIZZY','%TBASS_EAX_ENVIRONMENT_DRUGGED','%TBASS_EAX_ENVIRONMENT_FOREST','%TBASS_EAX_ENVIRONMENT_GENERIC','%TBASS_EAX_ENVIRONMENT_HALLWAY',
-            '%TBASS_EAX_ENVIRONMENT_HANGAR','%TBASS_EAX_ENVIRONMENT_LIVINGROOM','%TBASS_EAX_ENVIRONMENT_MOUNTAINS','%TBASS_EAX_ENVIRONMENT_PADDEDCELL','%TBASS_EAX_ENVIRONMENT_PARKINGLOT','%TBASS_EAX_ENVIRONMENT_PLAIN','%TBASS_EAX_ENVIRONMENT_PSYCHOTIC','%TBASS_EAX_ENVIRONMENT_QUARRY',
-            '%TBASS_EAX_ENVIRONMENT_ROOM','%TBASS_EAX_ENVIRONMENT_SEWERPIPE','%TBASS_EAX_ENVIRONMENT_STONECORRIDOR','%TBASS_EAX_ENVIRONMENT_STONEROOM','%TBASS_EAX_ENVIRONMENT_UNDERWATER','%TBASS_ERROR_ALREADY','%TBASS_ERROR_BUFLOST','%TBASS_ERROR_CODEC',
-            '%TBASS_ERROR_CREATE','%TBASS_ERROR_DECODE','%TBASS_ERROR_DEVICE','%TBASS_ERROR_DRIVER','%TBASS_ERROR_DX','%TBASS_ERROR_EMPTY','%TBASS_ERROR_FILEFORM','%TBASS_ERROR_FILEOPEN',
-            '%TBASS_ERROR_FORMAT','%TBASS_ERROR_FREQ','%TBASS_ERROR_HANDLE','%TBASS_ERROR_ILLPARAM','%TBASS_ERROR_ILLTYPE','%TBASS_ERROR_INIT','%TBASS_ERROR_MEM','%TBASS_ERROR_NO3D',
-            '%TBASS_ERROR_NOCHAN','%TBASS_ERROR_NOEAX','%TBASS_ERROR_NOFX','%TBASS_ERROR_NOHW','%TBASS_ERROR_NONET','%TBASS_ERROR_NOPAUSE','%TBASS_ERROR_NOPLAY','%TBASS_ERROR_NOTAVAIL',
-            '%TBASS_ERROR_NOTFILE','%TBASS_ERROR_PLAYING','%TBASS_ERROR_POSITION','%TBASS_ERROR_SPEAKER','%TBASS_ERROR_START','%TBASS_ERROR_TIMEOUT','%TBASS_ERROR_UNKNOWN','%TBASS_ERROR_VERSION',
-            '%TBASS_FALSE','%TBASS_FILEPOS_CURRENT','%TBASS_FILEPOS_DECODE','%TBASS_FILEPOS_DOWNLOAD','%TBASS_FILEPOS_END','%TBASS_FILEPOS_START','%TBASS_FILE_CLOSE','%TBASS_FILE_LEN',
-            '%TBASS_FILE_READ','%TBASS_FILE_SEEK','%TBASS_FX_CHORUS','%TBASS_FX_COMPRESSOR','%TBASS_FX_DISTORTION','%TBASS_FX_ECHO','%TBASS_FX_FLANGER','%TBASS_FX_GARGLE',
-            '%TBASS_FX_I3DL2REVERB','%TBASS_FX_PARAMEQ','%TBASS_FX_PHASE_180','%TBASS_FX_PHASE_90','%TBASS_FX_PHASE_NEG_180','%TBASS_FX_PHASE_NEG_90','%TBASS_FX_PHASE_ZERO','%TBASS_FX_REVERB',
-            '%TBASS_INPUT_LEVEL','%TBASS_INPUT_OFF','%TBASS_INPUT_ON','%TBASS_INPUT_TYPE_ANALOG','%TBASS_INPUT_TYPE_AUX','%TBASS_INPUT_TYPE_CD','%TBASS_INPUT_TYPE_DIGITAL','%TBASS_INPUT_TYPE_LINE',
-            '%TBASS_INPUT_TYPE_MASK','%TBASS_INPUT_TYPE_MIC','%TBASS_INPUT_TYPE_PHONE','%TBASS_INPUT_TYPE_SPEAKER','%TBASS_INPUT_TYPE_SYNTH','%TBASS_INPUT_TYPE_UNDEF','%TBASS_INPUT_TYPE_WAVE','%TBASS_MP3_SETPOS',
-            '%TBASS_MUSIC_3D','%TBASS_MUSIC_ATTRIB_AMPLIFY','%TBASS_MUSIC_ATTRIB_BPM','%TBASS_MUSIC_ATTRIB_PANSEP','%TBASS_MUSIC_ATTRIB_PSCALER','%TBASS_MUSIC_ATTRIB_SPEED','%TBASS_MUSIC_ATTRIB_VOL_CHAN','%TBASS_MUSIC_ATTRIB_VOL_GLOBAL',
-            '%TBASS_MUSIC_ATTRIB_VOL_INST','%TBASS_MUSIC_AUTOFREE','%TBASS_MUSIC_CALCLEN','%TBASS_MUSIC_DECODE','%TBASS_MUSIC_FLOAT','%TBASS_MUSIC_FT2MOD','%TBASS_MUSIC_FX','%TBASS_MUSIC_LOOP',
-            '%TBASS_MUSIC_MONO','%TBASS_MUSIC_NONINTER','%TBASS_MUSIC_NOSAMPLE','%TBASS_MUSIC_POSRESET','%TBASS_MUSIC_POSRESETEX','%TBASS_MUSIC_PRESCAN','%TBASS_MUSIC_PT1MOD','%TBASS_MUSIC_RAMP',
-            '%TBASS_MUSIC_RAMPS','%TBASS_MUSIC_STOPBACK','%TBASS_MUSIC_SURROUND','%TBASS_MUSIC_SURROUND2','%TBASS_OBJECT_DS','%TBASS_OBJECT_DS3DL','%TBASS_OK','%TBASS_RECORD_PAUSE',
-            '%TBASS_SAMPLE_3D','%TBASS_SAMPLE_8BITS','%TBASS_SAMPLE_FLOAT','%TBASS_SAMPLE_FX','%TBASS_SAMPLE_LOOP','%TBASS_SAMPLE_MONO','%TBASS_SAMPLE_MUTEMAX','%TBASS_SAMPLE_OVER_DIST',
-            '%TBASS_SAMPLE_OVER_POS','%TBASS_SAMPLE_OVER_VOL','%TBASS_SAMPLE_SOFTWARE','%TBASS_SAMPLE_VAM','%TBASS_SLIDE_FREQ','%TBASS_SLIDE_PAN','%TBASS_SLIDE_VOL','%TBASS_SPEAKER_CENLFE',
-            '%TBASS_SPEAKER_CENTER','%TBASS_SPEAKER_FRONT','%TBASS_SPEAKER_FRONTLEFT','%TBASS_SPEAKER_FRONTRIGHT','%TBASS_SPEAKER_LEFT','%TBASS_SPEAKER_LFE','%TBASS_SPEAKER_REAR','%TBASS_SPEAKER_REAR2',
-            '%TBASS_SPEAKER_REAR2LEFT','%TBASS_SPEAKER_REAR2RIGHT','%TBASS_SPEAKER_REARLEFT','%TBASS_SPEAKER_REARRIGHT','%TBASS_SPEAKER_RIGHT','%TBASS_STREAMPROC_END','%TBASS_STREAM_AUTOFREE','%TBASS_STREAM_BLOCK',
-            '%TBASS_STREAM_DECODE','%TBASS_STREAM_PRESCAN','%TBASS_STREAM_RESTRATE','%TBASS_STREAM_STATUS','%TBASS_SYNC_DOWNLOAD','%TBASS_SYNC_END','%TBASS_SYNC_FREE','%TBASS_SYNC_MESSAGE',
-            '%TBASS_SYNC_META','%TBASS_SYNC_MIXTIME','%TBASS_SYNC_MUSICFX','%TBASS_SYNC_MUSICINST','%TBASS_SYNC_MUSICPOS','%TBASS_SYNC_ONETIME','%TBASS_SYNC_POS','%TBASS_SYNC_SLIDE',
-            '%TBASS_SYNC_STALL','%TBASS_TAG_HTTP','%TBASS_TAG_ICY','%TBASS_TAG_ID3','%TBASS_TAG_ID3V2','%TBASS_TAG_META','%TBASS_TAG_MUSIC_INST','%TBASS_TAG_MUSIC_MESSAGE',
-            '%TBASS_TAG_MUSIC_NAME','%TBASS_TAG_MUSIC_SAMPLE','%TBASS_TAG_OGG','%TBASS_TAG_RIFF_INFO','%TBASS_TAG_VENDOR','%TBASS_TRUE','%TBASS_UNICODE','%TBASS_VAM_HARDWARE',
-            '%TBASS_VAM_SOFTWARE','%TBASS_VAM_TERM_DIST','%TBASS_VAM_TERM_PRIO','%TBASS_VAM_TERM_TIME','%TBASS_VERSION','%TBCD_CHANNEL','%TBCD_THUMB','%TBCD_TICS',
-            '%TBGL_ALIGN_CENTER','%TBGL_ALIGN_CENTER_CENTER','%TBGL_ALIGN_CENTER_DOWN','%TBGL_ALIGN_CENTER_UP','%TBGL_ALIGN_LEFT','%TBGL_ALIGN_LEFT_CENTER','%TBGL_ALIGN_LEFT_DOWN','%TBGL_ALIGN_LEFT_UP',
-            '%TBGL_ALIGN_RIGHT','%TBGL_ALIGN_RIGHT_CENTER','%TBGL_ALIGN_RIGHT_DOWN','%TBGL_ALIGN_RIGHT_UP','%TBGL_ALWAYS','%TBGL_EQUAL','%TBGL_ERROR_FILE','%TBGL_ERROR_MSGBOX',
-            '%TBGL_ERROR_NONE','%TBGL_GEQUAL','%TBGL_GREATER','%TBGL_LEQUAL','%TBGL_LESS','%TBGL_LIGHT_AMBIENT','%TBGL_LIGHT_CONSTANT_ATTENUATION','%TBGL_LIGHT_DIFFUSE',
-            '%TBGL_LIGHT_LINEAR_ATTENUATION','%TBGL_LIGHT_POSITION','%TBGL_LIGHT_QUADRATIC_ATTENUATION','%TBGL_LIGHT_SPECULAR','%TBGL_LIGHT_SPOT_CUTOFF','%TBGL_LIGHT_SPOT_DIRECTION','%TBGL_LIGHT_SPOT_EXPONENT','%TBGL_M15B',
-            '%TBGL_M15G','%TBGL_M15LAYER','%TBGL_M15PSTOP','%TBGL_M15R','%TBGL_M15TEXN','%TBGL_M15TEXX','%TBGL_M15TEXY','%TBGL_M15X',
-            '%TBGL_M15Y','%TBGL_M15Z','%TBGL_NEVER','%TBGL_NORMAL_NONE','%TBGL_NORMAL_PRECISE','%TBGL_NORMAL_SMOOTH','%TBGL_NOTEQUAL','%TBGL_OBJ_CUBE',
-            '%TBGL_OBJ_CUBE3','%TBGL_OBJ_CYLINDER','%TBGL_OBJ_SPHERE','%TBGL_PINFO_RGB','%TBGL_PINFO_XYZ','%TBGL_TEX_LINEAR','%TBGL_TEX_MIPMAP','%TBGL_TEX_NEAREST',
-            '%TBM_CLEARSEL','%TBM_CLEARTICS','%TBM_GETBUDDY','%TBM_GETCHANNELRECT','%TBM_GETLINESIZE','%TBM_GETNUMTICS','%TBM_GETPAGESIZE','%TBM_GETPOS',
-            '%TBM_GETPTICS','%TBM_GETRANGEMAX','%TBM_GETRANGEMIN','%TBM_GETSELEND','%TBM_GETSELSTART','%TBM_GETTHUMBLENGTH','%TBM_GETTHUMBRECT','%TBM_GETTIC',
-            '%TBM_GETTICPOS','%TBM_GETTOOLTIPS','%TBM_GETUNICODEFORMAT','%TBM_SETBUDDY','%TBM_SETLINESIZE','%TBM_SETPAGESIZE','%TBM_SETPOS','%TBM_SETRANGE',
-            '%TBM_SETRANGEMAX','%TBM_SETRANGEMIN','%TBM_SETSEL','%TBM_SETSELEND','%TBM_SETSELSTART','%TBM_SETTHUMBLENGTH','%TBM_SETTIC','%TBM_SETTICFREQ',
-            '%TBM_SETTIPSIDE','%TBM_SETTOOLTIPS','%TBM_SETUNICODEFORMAT','%TBS_AUTOTICKS','%TBS_BOTH','%TBS_BOTTOM','%TBS_DOWNISLEFT','%TBS_ENABLESELRANGE',
-            '%TBS_FIXEDLENGTH','%TBS_HORZ','%TBS_LEFT','%TBS_NOTHUMB','%TBS_NOTICKS','%TBS_REVERSED','%TBS_RIGHT','%TBS_TOOLTIPS',
-            '%TBS_TOP','%TBS_VERT','%TBTS_BOTTOM','%TBTS_LEFT','%TBTS_RIGHT','%TBTS_TOP','%TB_%VT_BSTR','%TB_%VT_CY',
-            '%TB_%VT_DATE','%TB_%VT_EMPTY','%TB_%VT_I2','%TB_%VT_I4','%TB_%VT_NULL','%TB_%VT_R4','%TB_%VT_R8','%TB_BOTTOM',
-            '%TB_CLASS_E_NOAGGREGATION','%TB_CO_E_CLASSSTRING','%TB_DISPATCH_METHOD','%TB_DISPATCH_PROPERTYGET','%TB_DISPATCH_PROPERTYPUT','%TB_DISPATCH_PROPERTYPUTREF','%TB_ENDTRACK','%TB_E_INVALIDARG',
-            '%TB_E_NOINTERFACE','%TB_E_OUTOFMEMORY','%TB_IMGCTX_ACTUALSIZE','%TB_IMGCTX_AUTOSIZE','%TB_IMGCTX_FITTOHEIGHT','%TB_IMGCTX_FITTOWIDTH','%TB_IMGCTX_STRETCH','%TB_LINEDOWN',
-            '%TB_LINEUP','%TB_MK_E_CONNECTMANUALLY','%TB_MK_E_EXCEEDEDDEADLINE','%TB_MK_E_INTERMEDIATEINTERFACENOTSUPPORTED','%TB_MK_E_NOOBJECT','%TB_MK_E_SYNTAX','%TB_PAGEDOWN','%TB_PAGEUP',
-            '%TB_REGDB_E_CLASSNOTREG','%TB_REGDB_E_WRITEREGDB','%TB_SIZEOF_TBVARIANT','%TB_S_FALSE','%TB_S_OK','%TB_THUMBPOSITION','%TB_THUMBTRACK','%TB_TOP',
-            '%TCM_FIRST','%TCM_GETCURSEL','%TCN_FOCUSCHANGE','%TCN_GETOBJECT','%TCN_SELCHANGE','%TCN_SELCHANGING','%TCS_BOTTOM','%TCS_BUTTONS',
-            '%TCS_EX_FLATSEPARATORS','%TCS_EX_REGISTERDROP','%TCS_FIXEDWIDTH','%TCS_FLATBUTTONS','%TCS_FOCUSNEVER','%TCS_FOCUSONBUTTONDOWN','%TCS_FORCEICONLEFT','%TCS_FORCELABELLEFT',
-            '%TCS_HOTTRACK','%TCS_MULTILINE','%TCS_MULTISELECT','%TCS_OWNERDRAWFIXED','%TCS_RAGGEDRIGHT','%TCS_RIGHT','%TCS_RIGHTJUSTIFY','%TCS_SCROLLOPPOSITE',
-            '%TCS_SINGLELINE','%TCS_TABS','%TCS_TOOLTIPS','%TCS_VERTICAL','%TM_PLAINTEXT','%TM_RICHTEXT','%TOKENIZER_DEFAULT_ALPHA','%TOKENIZER_DEFAULT_DELIM',
-            '%TOKENIZER_DEFAULT_DQUOTE','%TOKENIZER_DEFAULT_NEWLINE','%TOKENIZER_DEFAULT_NUMERIC','%TOKENIZER_DEFAULT_SPACE','%TOKENIZER_DELIMITER','%TOKENIZER_EOL','%TOKENIZER_ERROR','%TOKENIZER_FINISHED',
-            '%TOKENIZER_NUMBER','%TOKENIZER_QUOTE','%TOKENIZER_STRING','%TOKENIZER_UNDEFTOK','%TRUE','%TV_FIRST','%UDM_GETACCEL','%UDM_GETBASE',
-            '%UDM_GETBUDDY','%UDM_GETPOS','%UDM_GETPOS32','%UDM_GETRANGE','%UDM_GETRANGE32','%UDM_GETUNICODEFORMAT','%UDM_SETACCEL','%UDM_SETBASE',
-            '%UDM_SETBUDDY','%UDM_SETPOS','%UDM_SETPOS32','%UDM_SETRANGE','%UDM_SETRANGE32','%UDM_SETUNICODEFORMAT','%UDS_ALIGNLEFT','%UDS_ALIGNRIGHT',
-            '%UDS_ARROWKEYS','%UDS_AUTOBUDDY','%UDS_HORZ','%UDS_HOTTRACK','%UDS_NOTHOUSANDS','%UDS_SETBUDDYINT','%UDS_WRAP','%UD_MAXVAL',
-            '%UD_MINVAL','%VK_0','%VK_1','%VK_2','%VK_3','%VK_4','%VK_5','%VK_6',
-            '%VK_7','%VK_8','%VK_9','%VK_A','%VK_ACCEPT','%VK_ADD','%VK_APPS','%VK_B',
-            '%VK_BACK','%VK_C','%VK_CANCEL','%VK_CAPITAL','%VK_CLEAR','%VK_CONTROL','%VK_CONVERT','%VK_D',
-            '%VK_DECIMAL','%VK_DELETE','%VK_DIVIDE','%VK_DOWN','%VK_E','%VK_END','%VK_ESCAPE','%VK_EXECUTE',
-            '%VK_F','%VK_F1','%VK_F10','%VK_F11','%VK_F12','%VK_F13','%VK_F14','%VK_F15',
-            '%VK_F16','%VK_F17','%VK_F18','%VK_F19','%VK_F2','%VK_F20','%VK_F21','%VK_F22',
-            '%VK_F23','%VK_F24','%VK_F3','%VK_F4','%VK_F5','%VK_F6','%VK_F7','%VK_F8',
-            '%VK_F9','%VK_FINAL','%VK_G','%VK_H','%VK_HANGEUL','%VK_HANGUL','%VK_HANJA','%VK_HELP',
-            '%VK_HOME','%VK_I','%VK_INSERT','%VK_J','%VK_JUNJA','%VK_K','%VK_KANA','%VK_KANJI',
-            '%VK_L','%VK_LBUTTON','%VK_LEFT','%VK_LINEFEED','%VK_LWIN','%VK_M','%VK_MBUTTON','%VK_MENU',
-            '%VK_MODECHANGE','%VK_MULTIPLY','%VK_N','%VK_NEXT','%VK_NONCONVERT','%VK_NUMLOCK','%VK_NUMPAD0','%VK_NUMPAD1',
-            '%VK_NUMPAD2','%VK_NUMPAD3','%VK_NUMPAD4','%VK_NUMPAD5','%VK_NUMPAD6','%VK_NUMPAD7','%VK_NUMPAD8','%VK_NUMPAD9',
-            '%VK_O','%VK_P','%VK_PAUSE','%VK_PGDN','%VK_PGUP','%VK_PRINT','%VK_PRIOR','%VK_Q',
-            '%VK_R','%VK_RBUTTON','%VK_RETURN','%VK_RIGHT','%VK_RWIN','%VK_S','%VK_SCROLL','%VK_SELECT',
-            '%VK_SEPARATOR','%VK_SHIFT','%VK_SLEEP','%VK_SNAPSHOT','%VK_SPACE','%VK_SUBTRACT','%VK_T','%VK_TAB',
-            '%VK_U','%VK_UP','%VK_V','%VK_W','%VK_X','%VK_XBUTTON1','%VK_XBUTTON2','%VK_Y',
-            '%VK_Z','%VT_ARRAY','%VT_BLOB','%VT_BLOB_OBJECT','%VT_BOOL','%VT_BSTR','%VT_BYREF','%VT_CARRAY',
-            '%VT_CF','%VT_CLSID','%VT_CY','%VT_DATE','%VT_DISPATCH','%VT_EMPTY','%VT_ERROR','%VT_FILETIME',
-            '%VT_HRESULT','%VT_I1','%VT_I2','%VT_I4','%VT_I8','%VT_INT','%VT_LPSTR','%VT_LPWSTR',
-            '%VT_NULL','%VT_PTR','%VT_R4','%VT_R8','%VT_RECORD','%VT_RESERVED','%VT_SAFEARRAY','%VT_STORAGE',
-            '%VT_STORED_OBJECT','%VT_STREAM','%VT_STREAMED_OBJECT','%VT_UI1','%VT_UI2','%VT_UI4','%VT_UI8','%VT_UINT',
-            '%VT_UNKNOWN','%VT_USERDEFINED','%VT_VARIANT','%VT_VECTOR','%VT_VOID','%WAVE_FORMAT_1M08','%WAVE_FORMAT_1M16','%WAVE_FORMAT_1S08',
-            '%WAVE_FORMAT_1S16','%WAVE_FORMAT_2M08','%WAVE_FORMAT_2M16','%WAVE_FORMAT_2S08','%WAVE_FORMAT_2S16','%WAVE_FORMAT_4M08','%WAVE_FORMAT_4M16','%WAVE_FORMAT_4S08',
-            '%WAVE_FORMAT_4S16','%WBF_CUSTOM','%WBF_LEVEL1','%WBF_LEVEL2','%WBF_OVERFLOW','%WBF_WORDBREAK','%WBF_WORDWRAP','%WHITE',
-            '%WIN_FINDTITLECONTAIN','%WIN_FINDTITLEEND','%WIN_FINDTITLEEQUAL','%WIN_FINDTITLESTART','%WM_ACTIVATE','%WM_ACTIVATEAPP','%WM_CAPTURECHANGED','%WM_CHAR',
-            '%WM_CLOSE','%WM_COMMAND','%WM_DESTROY','%WM_DROPFILES','%WM_ERASEBKGND','%WM_GETTEXTLENGTH','%WM_HOTKEY','%WM_HSCROLL',
-            '%WM_IDLE','%WM_INITDIALOG','%WM_KEYDOWN','%WM_KEYUP','%WM_KILLFOCUS','%WM_LBUTTONDBLCLK','%WM_LBUTTONDOWN','%WM_LBUTTONUP',
-            '%WM_MBUTTONDBLCLK','%WM_MBUTTONDOWN','%WM_MBUTTONUP','%WM_MOUSEFIRST','%WM_MOUSEMOVE','%WM_MOUSEWHEEL','%WM_MOVE','%WM_MOVING',
-            '%WM_NCLBUTTONDOWN','%WM_NCRBUTTONDOWN','%WM_NEXTDLGCTL','%WM_NOTIFY','%WM_PAINT','%WM_QUIT','%WM_RBUTTONDBLCLK','%WM_RBUTTONDOWN',
-            '%WM_RBUTTONUP','%WM_SETFOCUS','%WM_SETFONT','%WM_SETTEXT','%WM_SIZE','%WM_SIZING','%WM_SYSCOMMAND','%WM_TIMER',
-            '%WM_USER','%WM_VSCROLL','%WS_BORDER','%WS_CAPTION','%WS_CHILD','%WS_CLIPCHILDREN','%WS_CLIPSIBLINGS','%WS_DISABLED',
-            '%WS_DLGFRAME','%WS_EX_ACCEPTFILES','%WS_EX_APPWINDOW','%WS_EX_CLIENTEDGE','%WS_EX_CONTEXTHELP','%WS_EX_CONTROLPARENT','%WS_EX_LAYERED','%WS_EX_LEFT',
-            '%WS_EX_LEFTSCROLLBAR','%WS_EX_LTRREADING','%WS_EX_MDICHILD','%WS_EX_NOPARENTNOTIFY','%WS_EX_OVERLAPPEDWINDOW','%WS_EX_PALETTEWINDOW','%WS_EX_RIGHT','%WS_EX_RIGHTSCROLLBAR',
-            '%WS_EX_RTLREADING','%WS_EX_STATICEDGE','%WS_EX_TOOLWINDOW','%WS_EX_TOPMOST','%WS_EX_TRANSPARENT','%WS_EX_WINDOWEDGE','%WS_GROUP','%WS_HSCROLL',
-            '%WS_ICONIC','%WS_MAXIMIZE','%WS_MAXIMIZEBOX','%WS_MINIMIZE','%WS_MINIMIZEBOX','%WS_OVERLAPPEDWINDOW','%WS_POPUP','%WS_POPUPWINDOW',
-            '%WS_SYSMENU','%WS_TABSTOP','%WS_THICKFRAME','%WS_VISIBLE','%WS_VSCROLL','%YELLOW','%ZERO','CRLF',
-            'FALSE','M_E','M_PI','NULL','TAB','TRUE'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF; font-weight: bold;',
-            2 => 'color: #993333; font-style: italic; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #333333;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #800080;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #CC0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #66cc66;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #333333;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => '_'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/tsql.php b/inc/geshi/tsql.php
deleted file mode 100644
index b4bf6bdad..000000000
--- a/inc/geshi/tsql.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-/*************************************************************************************
- * tsql.php
- * --------
- * Author: Duncan Lock (dunc@dflock.co.uk)
- * Copyright: (c) 2006 Duncan Lock (http://dflock.co.uk/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2005/11/22
- *
- * T-SQL language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2004/01/23 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2006/01/23)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'T-SQL',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            // Datatypes
-            'bigint', 'tinyint', 'money',
-            'smallmoney', 'datetime', 'smalldatetime',
-            'text', 'nvarchar', 'ntext', 'varbinary', 'image',
-            'sql_variant', 'uniqueidentifier',
-
-            // Keywords
-            'ABSOLUTE', 'ACTION', 'ADD', 'ADMIN', 'AFTER', 'AGGREGATE', 'ALIAS', 'ALLOCATE', 'ALTER', 'ARE', 'ARRAY', 'AS',
-            'ASC', 'ASSERTION', 'AT', 'AUTHORIZATION', 'BACKUP', 'BEFORE', 'BEGIN', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'BOTH', 'BREADTH',
-            'BREAK', 'BROWSE', 'BULK', 'BY', 'CALL', 'CASCADE', 'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATCH', 'CHAR', 'CHARACTER', 'CHECK', 'CHECKPOINT',
-            'CLASS', 'CLOB', 'CLOSE', 'CLUSTERED', 'COALESCE', 'COLLATE', 'COLLATION', 'COLUMN', 'COMMIT', 'COMPLETION', 'COMPUTE', 'CONNECT',
-            'CONNECTION', 'CONSTRAINT', 'CONSTRAINTS', 'CONSTRUCTOR', 'CONTAINS', 'CONTAINSTABLE', 'CONTINUE', 'CONVERT', 'CORRESPONDING', 'CREATE',
-            'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH', 'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
-            'CURSOR', 'CYCLE', 'DATA', 'DATABASE', 'DATE', 'DAY', 'DBCC', 'DEALLOCATE', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', 'DEFERRABLE',
-            'DEFERRED', 'DELETE', 'DENY', 'DEPTH', 'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR', 'DETERMINISTIC',
-            'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISK', 'DISTINCT', 'DISTRIBUTED', 'DOMAIN', 'DOUBLE', 'DROP', 'DUMMY', 'DUMP', 'DYNAMIC',
-            'EACH', 'ELSE', 'END', 'END-EXEC', 'EQUALS', 'ERRLVL', 'ESCAPE', 'EVERY', 'EXCEPT', 'EXCEPTION', 'EXEC', 'EXECUTE', 'EXIT',
-            'EXTERNAL', 'FALSE', 'FETCH', 'FILE', 'FILLFACTOR', 'FIRST', 'FLOAT', 'FOR', 'FOREIGN', 'FOUND', 'FREE', 'FREETEXT', 'FREETEXTTABLE',
-            'FROM', 'FULL', 'FUNCTION', 'GENERAL', 'GET', 'GLOBAL', 'GOTO', 'GRANT', 'GROUP', 'GROUPING', 'HAVING', 'HOLDLOCK', 'HOST', 'HOUR',
-            'IDENTITY', 'IDENTITY_INSERT', 'IDENTITYCOL', 'IF', 'IGNORE', 'IMMEDIATE', 'INDEX', 'INDICATOR', 'INITIALIZE', 'INITIALLY',
-            'INNER', 'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ISOLATION', 'ITERATE', 'KEY',
-            'KILL', 'LANGUAGE', 'LARGE', 'LAST', 'LATERAL', 'LEADING', 'LEFT', 'LESS', 'LEVEL', 'LIMIT', 'LINENO', 'LOAD', 'LOCAL',
-            'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATOR', 'MAP', 'MATCH', 'MINUTE', 'MODIFIES', 'MODIFY', 'MODULE', 'MONTH', 'NAMES', 'NATIONAL',
-            'NATURAL', 'NCHAR', 'NCLOB', 'NEW', 'NEXT', 'NO', 'NOCHECK', 'NONCLUSTERED', 'NONE', 'NULLIF', 'NUMERIC', 'OBJECT', 'OF',
-            'OFF', 'OFFSETS', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPENDATASOURCE', 'OPENQUERY', 'OPENROWSET', 'OPENXML', 'OPERATION', 'OPTION',
-            'ORDER', 'ORDINALITY', 'OUT', 'OUTPUT', 'OVER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARTIAL', 'PATH', 'PERCENT', 'PLAN',
-            'POSTFIX', 'PRECISION', 'PREFIX', 'PREORDER', 'PREPARE', 'PRESERVE', 'PRIMARY', 'PRINT', 'PRIOR', 'PRIVILEGES', 'PROC', 'PROCEDURE',
-            'PUBLIC', 'RAISERROR', 'READ', 'READS', 'READTEXT', 'REAL', 'RECONFIGURE', 'RECURSIVE', 'REF', 'REFERENCES', 'REFERENCING', 'RELATIVE',
-            'REPLICATION', 'RESTORE', 'RESTRICT', 'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE', 'ROW',
-            'ROWGUIDCOL', 'ROWS', 'RULE', 'SAVE', 'SAVEPOINT', 'SCHEMA', 'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECTION', 'SELECT',
-            'SEQUENCE', 'SESSION', 'SESSION_USER', 'SET', 'SETS', 'SETUSER', 'SHUTDOWN', 'SIZE', 'SMALLINT', 'SPACE', 'SPECIFIC',
-            'SPECIFICTYPE', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STRUCTURE',
-            'SYSTEM_USER', 'TABLE', 'TEMPORARY', 'TERMINATE', 'TEXTSIZE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR', 'TIMEZONE_MINUTE',
-            'TO', 'TOP', 'TRAILING', 'TRAN', 'TRANSACTION', 'TRANSLATION', 'TREAT', 'TRIGGER', 'TRUE', 'TRUNCATE', 'TRY', 'TSEQUAL', 'UNDER', 'UNION',
-            'UNIQUE', 'UNKNOWN', 'UNNEST', 'UPDATE', 'UPDATETEXT', 'USAGE', 'USE', 'USER', 'USING', 'VALUE', 'VALUES', 'VARCHAR', 'VARIABLE',
-            'VARYING', 'VIEW', 'WAITFOR', 'WHEN', 'WHENEVER', 'WHERE', 'WHILE', 'WITH', 'WITHOUT', 'WORK', 'WRITE', 'WRITETEXT', 'YEAR', 'ZONE',
-            'UNCOMMITTED', 'NOCOUNT',
-            ),
-        2 => array(
-            /*
-                Built-in functions
-                Highlighted in pink.
-            */
-
-            //Configuration Functions
-            '@@DATEFIRST','@@OPTIONS','@@DBTS','@@REMSERVER','@@LANGID','@@SERVERNAME',
-            '@@LANGUAGE','@@SERVICENAME','@@LOCK_TIMEOUT','@@SPID','@@MAX_CONNECTIONS',
-            '@@TEXTSIZE','@@MAX_PRECISION','@@VERSION','@@NESTLEVEL',
-
-            //Cursor Functions
-            '@@CURSOR_ROWS','@@FETCH_STATUS',
-
-            //Date and Time Functions
-            'DATEADD','DATEDIFF','DATENAME','DATEPART','GETDATE','GETUTCDATE',
-
-            //Mathematical Functions
-            'ABS','DEGREES','RAND','ACOS','EXP','ROUND','ASIN','FLOOR','SIGN',
-            'ATAN','LOG','SIN','ATN2','LOG10','SQUARE','CEILING','PI','SQRT','COS',
-            'POWER','TAN','COT','RADIANS',
-
-            //Meta Data Functions
-            'COL_LENGTH','COL_NAME','FULLTEXTCATALOGPROPERTY',
-            'COLUMNPROPERTY','FULLTEXTSERVICEPROPERTY','DATABASEPROPERTY','INDEX_COL',
-            'DATABASEPROPERTYEX','INDEXKEY_PROPERTY','DB_ID','INDEXPROPERTY','DB_NAME',
-            'OBJECT_ID','FILE_ID','OBJECT_NAME','FILE_NAME','OBJECTPROPERTY','FILEGROUP_ID',
-            '@@PROCID','FILEGROUP_NAME','SQL_VARIANT_PROPERTY','FILEGROUPPROPERTY',
-            'TYPEPROPERTY','FILEPROPERTY',
-
-            //Security Functions
-            'IS_SRVROLEMEMBER','SUSER_SID','SUSER_SNAME','USER_ID',
-            'HAS_DBACCESS','IS_MEMBER',
-
-            //String Functions
-            'ASCII','SOUNDEX','PATINDEX','CHARINDEX','REPLACE','STR',
-            'DIFFERENCE','QUOTENAME','STUFF','REPLICATE','SUBSTRING','LEN',
-            'REVERSE','UNICODE','LOWER','UPPER','LTRIM','RTRIM',
-
-            //System Functions
-            'APP_NAME','COLLATIONPROPERTY','@@ERROR','FORMATMESSAGE',
-            'GETANSINULL','HOST_ID','HOST_NAME','IDENT_CURRENT','IDENT_INCR',
-            'IDENT_SEED','@@IDENTITY','ISDATE','ISNUMERIC','PARSENAME','PERMISSIONS',
-            '@@ROWCOUNT','ROWCOUNT_BIG','SCOPE_IDENTITY','SERVERPROPERTY','SESSIONPROPERTY',
-            'STATS_DATE','@@TRANCOUNT','USER_NAME',
-
-            //System Statistical Functions
-            '@@CONNECTIONS','@@PACK_RECEIVED','@@CPU_BUSY','@@PACK_SENT',
-            '@@TIMETICKS','@@IDLE','@@TOTAL_ERRORS','@@IO_BUSY',
-            '@@TOTAL_READ','@@PACKET_ERRORS','@@TOTAL_WRITE',
-
-            //Text and Image Functions
-            'TEXTPTR','TEXTVALID',
-
-            //Aggregate functions
-            'AVG', 'MAX', 'BINARY_CHECKSUM', 'MIN', 'CHECKSUM', 'SUM', 'CHECKSUM_AGG',
-            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'VARP'
-            ),
-        3 => array(
-            /*
-                System stored procedures
-                Higlighted dark brown
-            */
-
-            //Active Directory Procedures
-            'sp_ActiveDirectory_Obj', 'sp_ActiveDirectory_SCP',
-
-            //Catalog Procedures
-            'sp_column_privileges', 'sp_special_columns', 'sp_columns', 'sp_sproc_columns',
-            'sp_databases', 'sp_statistics', 'sp_fkeys', 'sp_stored_procedures', 'sp_pkeys',
-            'sp_table_privileges', 'sp_server_info', 'sp_tables',
-
-            //Cursor Procedures
-            'sp_cursor_list', 'sp_describe_cursor_columns', 'sp_describe_cursor', 'sp_describe_cursor_tables',
-
-            //Database Maintenance Plan Procedures
-            'sp_add_maintenance_plan', 'sp_delete_maintenance_plan_db', 'sp_add_maintenance_plan_db',
-            'sp_delete_maintenance_plan_job', 'sp_add_maintenance_plan_job', 'sp_help_maintenance_plan',
-            'sp_delete_maintenance_plan',
-
-            //Distributed Queries Procedures
-            'sp_addlinkedserver', 'sp_indexes', 'sp_addlinkedsrvlogin', 'sp_linkedservers', 'sp_catalogs',
-            'sp_primarykeys', 'sp_column_privileges_ex', 'sp_columns_ex',
-            'sp_table_privileges_ex', 'sp_tables_ex', 'sp_foreignkeys',
-
-            //Full-Text Search Procedures
-            'sp_fulltext_catalog', 'sp_help_fulltext_catalogs_cursor', 'sp_fulltext_column',
-            'sp_help_fulltext_columns', 'sp_fulltext_database', 'sp_help_fulltext_columns_cursor',
-            'sp_fulltext_service', 'sp_help_fulltext_tables', 'sp_fulltext_table',
-            'sp_help_fulltext_tables_cursor', 'sp_help_fulltext_catalogs',
-
-            //Log Shipping Procedures
-            'sp_add_log_shipping_database', 'sp_delete_log_shipping_database', 'sp_add_log_shipping_plan',
-            'sp_delete_log_shipping_plan', 'sp_add_log_shipping_plan_database',
-            'sp_delete_log_shipping_plan_database', 'sp_add_log_shipping_primary',
-            'sp_delete_log_shipping_primary', 'sp_add_log_shipping_secondary',
-            'sp_delete_log_shipping_secondary', 'sp_can_tlog_be_applied', 'sp_get_log_shipping_monitor_info',
-            'sp_change_monitor_role', 'sp_remove_log_shipping_monitor', 'sp_change_primary_role',
-            'sp_resolve_logins', 'sp_change_secondary_role', 'sp_update_log_shipping_monitor_info',
-            'sp_create_log_shipping_monitor_account', 'sp_update_log_shipping_plan',
-            'sp_define_log_shipping_monitor', 'sp_update_log_shipping_plan_database',
-
-            //OLE Automation Extended Stored Procedures
-            'sp_OACreate', 'sp_OAMethod', 'sp_OADestroy', 'sp_OASetProperty', 'sp_OAGetErrorInfo',
-            'sp_OAStop', 'sp_OAGetProperty',
-
-            //Replication Procedures
-            'sp_add_agent_parameter', 'sp_enableagentoffload', 'sp_add_agent_profile',
-            'sp_enumcustomresolvers', 'sp_addarticle', 'sp_enumdsn', 'sp_adddistpublisher',
-            'sp_enumfullsubscribers', 'sp_adddistributiondb', 'sp_expired_subscription_cleanup',
-            'sp_adddistributor', 'sp_generatefilters', 'sp_addmergealternatepublisher',
-            'sp_getagentoffloadinfo', 'sp_addmergearticle', 'sp_getmergedeletetype', 'sp_addmergefilter',
-            'sp_get_distributor', 'sp_addmergepublication', 'sp_getqueuedrows', 'sp_addmergepullsubscription',
-            'sp_getsubscriptiondtspackagename', 'sp_addmergepullsubscription_agent', 'sp_grant_publication_access',
-            'sp_addmergesubscription', 'sp_help_agent_default', 'sp_addpublication', 'sp_help_agent_parameter',
-            'sp_addpublication_snapshot', 'sp_help_agent_profile', 'sp_addpublisher70', 'sp_helparticle',
-            'sp_addpullsubscription', 'sp_helparticlecolumns', 'sp_addpullsubscription_agent', 'sp_helparticledts',
-            'sp_addscriptexec', 'sp_helpdistpublisher', 'sp_addsubscriber', 'sp_helpdistributiondb',
-            'sp_addsubscriber_schedule', 'sp_helpdistributor', 'sp_addsubscription', 'sp_helpmergealternatepublisher',
-            'sp_addsynctriggers', 'sp_helpmergearticle', 'sp_addtabletocontents', 'sp_helpmergearticlecolumn',
-            'sp_adjustpublisheridentityrange', 'sp_helpmergearticleconflicts', 'sp_article_validation',
-            'sp_helpmergeconflictrows', 'sp_articlecolumn', 'sp_helpmergedeleteconflictrows', 'sp_articlefilter',
-            'sp_helpmergefilter', 'sp_articlesynctranprocs', 'sp_helpmergepublication', 'sp_articleview',
-            'sp_helpmergepullsubscription', 'sp_attachsubscription', 'sp_helpmergesubscription', 'sp_browsesnapshotfolder',
-            'sp_helppublication', 'sp_browsemergesnapshotfolder', 'sp_help_publication_access', 'sp_browsereplcmds',
-            'sp_helppullsubscription', 'sp_change_agent_parameter', 'sp_helpreplfailovermode', 'sp_change_agent_profile',
-            'sp_helpreplicationdboption', 'sp_changearticle', 'sp_helpreplicationoption', 'sp_changedistpublisher',
-            'sp_helpsubscriberinfo', 'sp_changedistributiondb', 'sp_helpsubscription', 'sp_changedistributor_password',
-            'sp_ivindexhasnullcols', 'sp_changedistributor_property', 'sp_helpsubscription_properties', 'sp_changemergearticle',
-            'sp_link_publication', 'sp_changemergefilter', 'sp_marksubscriptionvalidation', 'sp_changemergepublication',
-            'sp_mergearticlecolumn', 'sp_changemergepullsubscription', 'sp_mergecleanupmetadata', 'sp_changemergesubscription',
-            'sp_mergedummyupdate', 'sp_changepublication', 'sp_mergesubscription_cleanup', 'sp_changesubscriber',
-            'sp_publication_validation', 'sp_changesubscriber_schedule', 'sp_refreshsubscriptions', 'sp_changesubscriptiondtsinfo',
-            'sp_reinitmergepullsubscription', 'sp_changesubstatus', 'sp_reinitmergesubscription', 'sp_change_subscription_properties',
-            'sp_reinitpullsubscription', 'sp_check_for_sync_trigger', 'sp_reinitsubscription', 'sp_copymergesnapshot',
-            'sp_removedbreplication', 'sp_copysnapshot', 'sp_repladdcolumn', 'sp_copysubscription', 'sp_replcmds',
-            'sp_deletemergeconflictrow', 'sp_replcounters', 'sp_disableagentoffload', 'sp_repldone', 'sp_drop_agent_parameter',
-            'sp_repldropcolumn', 'sp_drop_agent_profile', 'sp_replflush', 'sp_droparticle', 'sp_replicationdboption',
-            'sp_dropanonymouseagent', 'sp_replication_agent_checkup', 'sp_dropdistpublisher', 'sp_replqueuemonitor',
-            'sp_dropdistributiondb', 'sp_replsetoriginator', 'sp_dropmergealternatepublisher', 'sp_replshowcmds',
-            'sp_dropdistributor', 'sp_repltrans', 'sp_dropmergearticle', 'sp_restoredbreplication', 'sp_dropmergefilter',
-            'sp_revoke_publication_access', 'sp_scriptsubconflicttable', 'sp_dropmergepublication', 'sp_script_synctran_commands',
-            'sp_dropmergepullsubscription', 'sp_setreplfailovermode', 'sp_showrowreplicainfo', 'sp_dropmergesubscription',
-            'sp_subscription_cleanup', 'sp_droppublication', 'sp_table_validation', 'sp_droppullsubscription',
-            'sp_update_agent_profile', 'sp_dropsubscriber', 'sp_validatemergepublication', 'sp_dropsubscription',
-            'sp_validatemergesubscription', 'sp_dsninfo', 'sp_vupgrade_replication', 'sp_dumpparamcmd',
-
-            //Security Procedures
-            'sp_addalias', 'sp_droprolemember', 'sp_addapprole', 'sp_dropserver', 'sp_addgroup', 'sp_dropsrvrolemember',
-            'sp_dropuser', 'sp_addlogin', 'sp_grantdbaccess', 'sp_addremotelogin',
-            'sp_grantlogin', 'sp_addrole', 'sp_helpdbfixedrole', 'sp_addrolemember', 'sp_helpgroup',
-            'sp_addserver', 'sp_helplinkedsrvlogin', 'sp_addsrvrolemember', 'sp_helplogins', 'sp_adduser',
-            'sp_helpntgroup', 'sp_approlepassword', 'sp_helpremotelogin', 'sp_changedbowner', 'sp_helprole',
-            'sp_changegroup', 'sp_helprolemember', 'sp_changeobjectowner', 'sp_helprotect', 'sp_change_users_login',
-            'sp_helpsrvrole', 'sp_dbfixedrolepermission', 'sp_helpsrvrolemember', 'sp_defaultdb', 'sp_helpuser',
-            'sp_defaultlanguage', 'sp_MShasdbaccess', 'sp_denylogin', 'sp_password', 'sp_dropalias', 'sp_remoteoption',
-            'sp_dropapprole', 'sp_revokedbaccess', 'sp_dropgroup', 'sp_revokelogin', 'sp_droplinkedsrvlogin',
-            'sp_setapprole', 'sp_droplogin', 'sp_srvrolepermission', 'sp_dropremotelogin', 'sp_validatelogins', 'sp_droprole',
-
-            //SQL Mail Procedures
-            'sp_processmail', 'xp_sendmail', 'xp_deletemail', 'xp_startmail', 'xp_findnextmsg', 'xp_stopmail', 'xp_readmail',
-
-            //SQL Profiler Procedures
-            'sp_trace_create', 'sp_trace_setfilter', 'sp_trace_generateevent', 'sp_trace_setstatus', 'sp_trace_setevent',
-
-            //SQL Server Agent Procedures
-            'sp_add_alert', 'sp_help_jobhistory', 'sp_add_category', 'sp_help_jobschedule', 'sp_add_job',
-            'sp_help_jobserver', 'sp_add_jobschedule', 'sp_help_jobstep', 'sp_add_jobserver', 'sp_help_notification',
-            'sp_add_jobstep', 'sp_help_operator', 'sp_add_notification', 'sp_help_targetserver',
-            'sp_add_operator', 'sp_help_targetservergroup', 'sp_add_targetservergroup', 'sp_helptask',
-            'sp_add_targetsvrgrp_member', 'sp_manage_jobs_by_login', 'sp_addtask', 'sp_msx_defect',
-            'sp_apply_job_to_targets', 'sp_msx_enlist', 'sp_delete_alert', 'sp_post_msx_operation',
-            'sp_delete_category', 'sp_purgehistory', 'sp_delete_job', 'sp_purge_jobhistory', 'sp_delete_jobschedule',
-            'sp_reassigntask', 'sp_delete_jobserver', 'sp_remove_job_from_targets', 'sp_delete_jobstep',
-            'sp_resync_targetserver', 'sp_delete_notification', 'sp_start_job', 'sp_delete_operator',
-            'sp_stop_job', 'sp_delete_targetserver', 'sp_update_alert', 'sp_delete_targetservergroup',
-            'sp_update_category', 'sp_delete_targetsvrgrp_member', 'sp_update_job', 'sp_droptask',
-            'sp_update_jobschedule', 'sp_help_alert', 'sp_update_jobstep', 'sp_help_category',
-            'sp_update_notification', 'sp_help_downloadlist', 'sp_update_operator', 'sp_helphistory',
-            'sp_update_targetservergroup', 'sp_help_job', 'sp_updatetask', 'xp_sqlagent_proxy_account',
-
-            //System Procedures
-            'sp_add_data_file_recover_suspect_db', 'sp_helpconstraint', 'sp_addextendedproc',
-            'sp_helpdb', 'sp_addextendedproperty', 'sp_helpdevice', 'sp_add_log_file_recover_suspect_db',
-            'sp_helpextendedproc', 'sp_addmessage', 'sp_helpfile', 'sp_addtype', 'sp_helpfilegroup',
-            'sp_addumpdevice', 'sp_helpindex', 'sp_altermessage', 'sp_helplanguage', 'sp_autostats',
-            'sp_helpserver', 'sp_attach_db', 'sp_helpsort', 'sp_attach_single_file_db', 'sp_helpstats',
-            'sp_bindefault', 'sp_helptext', 'sp_bindrule', 'sp_helptrigger', 'sp_bindsession',
-            'sp_indexoption', 'sp_certify_removable', 'sp_invalidate_textptr', 'sp_configure',
-            'sp_lock', 'sp_create_removable', 'sp_monitor', 'sp_createstats', 'sp_procoption',
-            'sp_cycle_errorlog', 'sp_recompile', 'sp_datatype_info', 'sp_refreshview', 'sp_dbcmptlevel',
-            'sp_releaseapplock', 'sp_dboption', 'sp_rename', 'sp_dbremove', 'sp_renamedb',
-            'sp_delete_backuphistory', 'sp_resetstatus', 'sp_depends', 'sp_serveroption', 'sp_detach_db',
-            'sp_setnetname', 'sp_dropdevice', 'sp_settriggerorder', 'sp_dropextendedproc', 'sp_spaceused',
-            'sp_dropextendedproperty', 'sp_tableoption', 'sp_dropmessage', 'sp_unbindefault', 'sp_droptype',
-            'sp_unbindrule', 'sp_executesql', 'sp_updateextendedproperty', 'sp_getapplock', 'sp_updatestats',
-            'sp_getbindtoken', 'sp_validname', 'sp_help', 'sp_who',
-
-            //Web Assistant Procedures
-            'sp_dropwebtask', 'sp_makewebtask', 'sp_enumcodepages', 'sp_runwebtask',
-
-            //XML Procedures
-            'sp_xml_preparedocument', 'sp_xml_removedocument',
-
-            //General Extended Procedures
-            'xp_cmdshellxp_logininfo', 'xp_enumgroups', 'xp_msver', 'xp_findnextmsgxp_revokelogin',
-            'xp_grantlogin', 'xp_sprintf', 'xp_logevent', 'xp_sqlmaint', 'xp_loginconfig', 'xp_sscanf',
-
-            //API System Stored Procedures
-            'sp_cursor', 'sp_cursorclose', 'sp_cursorexecute', 'sp_cursorfetch', 'sp_cursoropen',
-            'sp_cursoroption', 'sp_cursorprepare', 'sp_cursorunprepare', 'sp_execute', 'sp_prepare', 'sp_unprepare',
-
-            //Misc
-            'sp_createorphan', 'sp_droporphans', 'sp_reset_connection', 'sp_sdidebug'
-            ),
-        4 => array(
-            //Function/sp's higlighted brown.
-            'fn_helpcollations', 'fn_listextendedproperty ', 'fn_servershareddrives',
-            'fn_trace_geteventinfo', 'fn_trace_getfilterinfo', 'fn_trace_getinfo',
-            'fn_trace_gettable', 'fn_virtualfilestats','fn_listextendedproperty',
-            ),
-        ),
-    'SYMBOLS' => array(
-        '!', '!=', '%', '&', '&&', '(', ')', '*', '+', '-', '/', '<', '<<', '<=',
-        '<=>', '<>', '=', '>', '>=', '>>', '^', 'ALL', 'AND', 'ANY', 'BETWEEN', 'CROSS',
-        'EXISTS', 'IN', 'JOIN', 'LIKE', 'NOT', 'NULL', 'OR', 'OUTER', 'SOME', '|', '||', '~'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #FF00FF;',
-            3 => 'color: #AF0000;',
-            4 => 'color: #AF0000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080;',
-            'MULTI' => 'color: #008080;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #808080;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #808080;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/typoscript.php b/inc/geshi/typoscript.php
deleted file mode 100644
index 6751aaa8d..000000000
--- a/inc/geshi/typoscript.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/*************************************************************************************
- * typoscript.php
- * --------
- * Author: Jan-Philipp Halle (typo3@jphalle.de)
- * Copyright: (c) 2005 Jan-Philipp Halle (http://www.jphalle.de/)
- * Release Version: 1.0.8.11
- * Date Started: 2005/07/29
- *
- * TypoScript language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/07/11 (1.0.8)
- * - Michiel Roos <geshi@typofree.org> Complete rewrite
- * 2005/07/29 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/07/14)
- * -------------------------
- * <things-to-do>
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'TypoScript',
-    'COMMENT_SINGLE' => array(1  => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(2 => '/(?<!(#|\'|"))(?:#(?!(?:[a-fA-F0-9]{6}|[a-fA-F0-9]{3}))[^\n#]+|#{2}[^\n#]+|#{7,999}[^\n]+)/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        // Conditions: http://documentation.typo3.org/documentation/tsref/conditions/
-        1 => array(
-            'browser', 'compatVersion', 'dayofmonth', 'dayofweek', 'device',
-            'globalString', 'globalVars', 'hostname', 'hour',
-            'ip', 'language', 'loginUser', 'loginuser', 'minute',
-            'month', 'PIDinRootline', 'PIDupinRootline',
-            'system', 'treelevel', 'useragent', 'userFunc',
-            'usergroup', 'version'
-            ),
-
-        // Functions: http://documentation.typo3.org/documentation/tsref/functions/
-        2 => array(
-            'addParams', 'encapsLines', 'filelink', 'HTMLparser',
-            'HTMLparser_tags', 'if', 'imageLinkWrap',
-            'imgResource', 'makelinks', 'numRows', 'parseFunc',
-            'select', 'split', 'stdWrap', 'tableStyle', 'tags',
-            'textStyle', 'typolink'
-            ),
-
-        // Toplevel objects: http://documentation.typo3.org/documentation/tsref/tlo-objects/
-        3 => array(
-            'CARRAY', 'CONFIG', 'CONSTANTS', 'FE_DATA', 'FE_TABLE', 'FRAME',
-            'FRAMESET', 'META', 'PAGE', 'plugin'
-            ),
-
-        // Content Objects (cObject) : http://documentation.typo3.org/documentation/tsref/cobjects/
-        4 => array(
-            'CASE', 'CLEARGIF', 'COA', 'COA_INT', 'COBJ_ARRAY', 'COLUMNS',
-            'CONTENT', 'CTABLE', 'EDITPANEL', 'FILE', 'FORM',
-            'HMENU', 'HRULER', 'HTML', 'IMAGE', 'IMGTEXT',
-            'IMG_RESOURCE', 'LOAD_REGISTER', 'MULTIMEDIA',
-            'OTABLE', 'PHP_SCRIPT', 'PHP_SCRIPT_EXT',
-            'PHP_SCRIPT_INT', 'RECORDS', 'RESTORE_REGISTER',
-            'SEARCHRESULT', 'TEMPLATE', 'TEXT', 'USER',
-            'USER_INT'
-            ),
-
-        // GIFBUILDER toplevel link: http://documentation.typo3.org/documentation/tsref/gifbuilder/
-        5 => array(
-            'GIFBUILDER',
-            ),
-
-        // GIFBUILDER: http://documentation.typo3.org/documentation/tsref/gifbuilder/
-        // skipped fields: IMAGE, TEXT
-        // NOTE! the IMAGE and TEXT field already are linked in group 4, they
-        // cannot be linked twice . . . . unfortunately
-        6 => array(
-            'ADJUST', 'BOX', 'CROP', 'EFFECT', 'EMBOSS',
-            'IMGMAP', 'OUTLINE', 'SCALE', 'SHADOW',
-            'WORKAREA'
-            ),
-
-        // MENU Objects: http://documentation.typo3.org/documentation/tsref/menu/
-        7 => array(
-            'GMENU', 'GMENU_FOLDOUT', 'GMENU_LAYERS', 'IMGMENU',
-            'IMGMENUITEM', 'JSMENU', 'JSMENUITEM', 'TMENU',
-            'TMENUITEM', 'TMENU_LAYERS'
-            ),
-
-        // MENU common properties: http://documentation.typo3.org/documentation/tsref/menu/common-properties/
-        8 => array(
-            'alternativeSortingField', 'begin', 'debugItemConf',
-            'imgNameNotRandom', 'imgNamePrefix',
-            'itemArrayProcFunc', 'JSWindow', 'maxItems',
-            'minItems', 'overrideId', 'sectionIndex',
-            'showAccessRestrictedPages', 'submenuObjSuffixes'
-            ),
-
-        // MENU item states: http://documentation.typo3.org/documentation/tsref/menu/item-states/
-        9 => array(
-            'ACT', 'ACTIFSUB', 'ACTIFSUBRO', 'ACTRO', 'CUR', 'CURIFSUB',
-            'CURIFSUBRO', 'CURRO', 'IFSUB', 'IFSUBRO', 'NO',
-            'SPC', 'USERDEF1', 'USERDEF1RO', 'USERDEF2',
-            'USERDEF2RO', 'USR', 'USRRO'
-            ),
-        ),
-
-    // Does not include '-' because of stuff like htmlTag_langKey = en-GB and
-    // lib.nav-sub
-    'SYMBOLS' => array(
-        0 => array(
-            '|',
-            '+', '*', '/', '%',
-            '!', '&&', '^',
-            '<', '>', '=',
-            '?', ':',
-            '.'
-            ),
-        1 => array(
-            '(', ')', '{', '}', '[', ']'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true,
-        9 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #ed7d14;',
-            2 => 'font-weight: bold;',
-            3 => 'color: #990000; font-weight: bold;',
-            4 => 'color: #990000; font-weight: bold;',
-            5 => 'color: #990000; font-weight: bold;',
-            6 => 'color: #990000; font-weight: bold;',
-            7 => 'color: #990000; font-weight: bold;',
-            8 => 'font-weight: bold;',
-            9 => 'color: #990000; font-weight: bold;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #aaa; font-style: italic;',
-            2 => 'color: #aaa; font-style: italic;',
-            'MULTI' => 'color: #aaa; font-style: italic;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ac14aa;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000e0; font-weight: bold;',
-            2 => 'color: #0000e0; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933; font-weight: bold;',
-                // Set this to the same value as brackets above
-            1 => 'color: #009900; font-weight: bold;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #009900;',
-            1 => 'color: #009900; font-weight: bold;',
-            2 => 'color: #3366CC;',
-            3 => 'color: #000066; font-weight: bold;',
-            4 => 'color: #ed7d14;',
-            5 => 'color: #000066; font-weight: bold;',
-            6 => 'color: #009900;',
-            7 => 'color: #3366CC;'
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => 'http://documentation.typo3.org/documentation/tsref/conditions/{FNAME}/',
-        2 => 'http://documentation.typo3.org/documentation/tsref/functions/{FNAME}/',
-        3 => 'http://documentation.typo3.org/documentation/tsref/tlo-objects/{FNAME}/',
-        4 => 'http://documentation.typo3.org/documentation/tsref/cobjects/{FNAME}/',
-        5 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/',
-        6 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/{FNAME}/',
-        7 => 'http://documentation.typo3.org/documentation/tsref/menu/{FNAME}/',
-        8 => 'http://documentation.typo3.org/documentation/tsref/menu/common-properties/',
-        9 => 'http://documentation.typo3.org/documentation/tsref/menu/item-states/'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-            // xhtml tag
-        2 => array(
-            GESHI_SEARCH => '(&lt;)([a-zA-Z\\/][^\\/\\|]*?)(&gt;)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 's',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-
-            // Constant
-        0 => array(
-            GESHI_SEARCH => '(\{)(\$[a-zA-Z_\.]+[a-zA-Z0-9_\.]*)(\})',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3'
-            ),
-
-            // Constant dollar sign
-        1 => array(
-            GESHI_SEARCH => '(\$)([a-zA-Z_\.]+[a-zA-Z0-9_\.]*)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2'
-            ),
-
-            // extension keys / tables: (static|user|ttx|tx|tt|fe)_something[_something]
-        3 => array(
-            GESHI_SEARCH => '(plugin\.|[^\.]\b)((?:static|user|ttx|tx|tt|fe)(?:_[0-9A-Za-z_]+?)\b)',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-
-            // conditions and controls
-        4 => array(
-            GESHI_SEARCH => '(\[)(globalVar|global|end)\b',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-
-            // lowlevel setup and constant objects
-        5 => array(
-            GESHI_SEARCH => '([^\.\$-\{]\b)(cObj|field|config|content|file|frameset|includeLibs|lib|page|plugin|register|resources|sitemap|sitetitle|styles|temp|tt_content|tt_news|types|xmlnews)\b',
-            GESHI_REPLACE => '\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '\\1',
-            GESHI_AFTER => ''
-            ),
-
-            // markers
-        6 => array(
-            GESHI_SEARCH => '(###[^#]+###)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-
-            // hex color codes
-        7 => array(
-            GESHI_SEARCH => '(#[a-fA-F0-9]{6}\b|#[a-fA-F0-9]{3}\b)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-);
-
-?>
diff --git a/inc/geshi/unicon.php b/inc/geshi/unicon.php
deleted file mode 100644
index 6fe62d0fb..000000000
--- a/inc/geshi/unicon.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/*************************************************************************************
- * unicon.php
- * --------
- * Author: Matt Oates (mattoates@gmail.com)
- * Copyright: (c) 2010 Matt Oates (http://mattoates.co.uk)
- * Release Version: 1.0.8.11
- * Date Started: 2010/04/20
- *
- * Unicon the Unified Extended Dialect of Icon language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2010/04/24 (0.0.0.2)
- *  -  Validated with Geshi langcheck.php FAILED due to preprocessor keywords looking like symbols
- *  -  Hard wrapped to improve readability
- * 2010/04/20 (0.0.0.1)
- *  -  First Release
- *
- * TODO (updated 2010/04/20)
- * -------------------------
- * - Do the &amp; need replacing with &?
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Unicon (Unified Extended Dialect of Icon)',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '\''),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'break', 'case', 'class', 'continue', 'create', 'default', 'do',
-            'else', 'end', 'every', 'fail', 'for', 'if', 'import', 'initial', 'initially',
-            'invocable', 'link', 'method', 'next', 'not', 'of', 'package', 'procedure', 'record',
-            'repeat', 'return', 'switch', 'suspend', 'then', 'to', 'until', 'while'
-            ),
-        2 => array(
-            'global', 'local', 'static'
-            ),
-        3 => array(
-            'allocated', 'ascii', 'clock', 'collections',
-            'column', 'cset', 'current', 'date', 'dateline', 'digits',
-            'dump', 'e', 'error', 'errornumber', 'errortext',
-            'errorvalue', 'errout', 'eventcode', 'eventsource', 'eventvalue',
-            'fail', 'features', 'file', 'host', 'input', 'lcase',
-            'letters', 'level', 'line', 'main', 'now', 'null',
-            'output', 'phi', 'pi', 'pos', 'progname', 'random',
-            'regions', 'source', 'storage', 'subject', 'syserr', 'time',
-            'trace', 'ucase', 'version', 'col', 'control', 'interval',
-            'ldrag', 'lpress', 'lrelease', 'mdrag', 'meta', 'mpress',
-            'mrelease', 'rdrag', 'resize', 'row', 'rpress', 'rrelease',
-            'shift', 'window', 'x', 'y'
-            ),
-        4 => array(
-            'abs', 'acos', 'any', 'args', 'asin', 'atan', 'bal', 'center', 'char',
-            'chmod', 'close', 'cofail', 'collect', 'copy', 'cos', 'cset', 'ctime', 'dbcolumns',
-            'dbdriver', 'dbkeys', 'dblimits', 'dbproduction', 'dbtables', 'delay', 'delete', 'detab',
-            'display', 'dtor', 'entab', 'errorclear', 'event', 'eventmask', 'EvGet', 'exit', 'exp',
-            'fetch', 'fieldnames', 'find', 'flock', 'flush', 'function', 'get', 'getch', 'getche',
-            'getenv', 'gettimeofday', 'globalnames', 'gtime', 'iand', 'icom', 'image', 'insert',
-            'integer', 'ior', 'ishift', 'ixor', 'key', 'left', 'list', 'load', 'loadfunc',
-            'localnames', 'log', 'many', 'map', 'match', 'member', 'mkdir', 'move', 'name', 'numeric',
-            'open', 'opmask', 'ord', 'paramnames', 'parent', 'pipe', 'pop', 'pos', 'proc', 'pull',
-            'push', 'put', 'read', 'reads', 'real', 'receive', 'remove', 'rename', 'repl', 'reverse',
-            'right', 'rmdir', 'rtod', 'runerr', 'seek', 'select', 'send', 'seq', 'serial', 'set',
-            'setenv', 'sort', 'sortf', 'sql', 'sqrt', 'stat', 'staticnames', 'stop', 'string', 'system', 'tab',
-            'table', 'tan', 'trap', 'trim', 'truncate', 'type', 'upto', 'utime', 'variable', 'where',
-            'write', 'writes'
-            ),
-        5 => array(
-            'Active', 'Alert', 'Bg', 'Clip', 'Clone', 'Color', 'ColorValue',
-            'CopyArea', 'Couple', 'DrawArc', 'DrawCircle', 'DrawCurve', 'DrawCylinder', 'DrawDisk',
-            'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon', 'DrawRectangle', 'DrawSegment',
-            'DrawSphere', 'DrawString', 'DrawTorus', 'EraseArea', 'Event', 'Fg', 'FillArc',
-            'FillCircle', 'FillPolygon', 'FillRectangle', 'Font', 'FreeColor', 'GotoRC', 'GotoXY',
-            'IdentifyMatrix', 'Lower', 'MatrixMode', 'NewColor', 'PaletteChars', 'PaletteColor',
-            'PaletteKey', 'Pattern', 'Pending', 'Pixel', 'PopMatrix', 'PushMatrix', 'PushRotate',
-            'PushScale', 'PushTranslate', 'QueryPointer', 'Raise', 'ReadImage', 'Refresh', 'Rotate',
-            'Scale', 'Texcoord', 'TextWidth', 'Texture', 'Translate', 'Uncouple', 'WAttrib',
-            'WDefault', 'WFlush', 'WindowContents', 'WriteImage', 'WSync'
-            ),
-        6 => array(
-            'define', 'include', 'ifdef', 'ifndef', 'else', 'endif', 'error',
-            'line', 'undef'
-            ),
-        7 => array(
-            '_V9', '_AMIGA', '_ACORN', '_CMS', '_MACINTOSH', '_MSDOS_386',
-            '_MS_WINDOWS_NT', '_MSDOS', '_MVS', '_OS2', '_POR', 'T', '_UNIX', '_POSIX', '_DBM',
-            '_VMS', '_ASCII', '_EBCDIC', '_CO_EXPRESSIONS', '_CONSOLE_WINDOW', '_DYNAMIC_LOADING',
-            '_EVENT_MONITOR', '_EXTERNAL_FUNCTIONS', '_KEYBOARD_FUNCTIONS', '_LARGE_INTEGERS',
-            '_MULTITASKING', '_PIPES', '_RECORD_IO', '_SYSTEM_FUNCTION', '_MESSAGING', '_GRAPHICS',
-            '_X_WINDOW_SYSTEM', '_MS_WINDOWS', '_WIN32', '_PRESENTATION_MGR', '_ARM_FUNCTIONS',
-            '_DOS_FUNCTIONS'
-            ),
-        8 => array(
-            'line')
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '\\', '%', '=', '<', '>', '!', '^',
-            '&', '|', '?', ':', ';', ',', '.', '~', '@'
-            ),
-        2 => array(
-            '$(', '$)', '$<', '$>'
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        5 => true,
-        6 => true,
-        7 => true,
-        8 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #b1b100;',
-            3 => 'color: #b1b100;',
-            4 => 'color: #b1b100;',
-            5 => 'color: #b1b100;',
-            6 => 'color: #b1b100;',
-            7 => 'color: #b1b100;',
-            8 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(1 => '.'),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array(),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            3 => array(
-                'DISALLOWED_BEFORE' => '(?<=&amp;)'
-                ),
-            4 => array(
-                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9_\"\'])",
-                'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\"\'])"
-                ),
-            6 => array(
-                'DISALLOWED_BEFORE' => '(?<=\$)'
-                ),
-            8 => array(
-                'DISALLOWED_BEFORE' => '(?<=#)'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/upc.php b/inc/geshi/upc.php
deleted file mode 100644
index e05303228..000000000
--- a/inc/geshi/upc.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/*************************************************************************************
- * upc.php
- * -----
- * Author: Viraj Sinha (viraj@indent.com)
- * Contributors:
- *  - Nigel McNie (nigel@geshi.org)
- *  - Jack Lloyd (lloyd@randombit.net)
- *  - Michael Mol (mikemol@gmail.com)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * UPC language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2011/06/14 (1.0.8.11)
- *   -  This file is a revision of c.php with UPC keywords added
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'UPC',
-    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#"
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        1 => array(
-            'if', 'return', 'while', 'case', 'continue', 'default',
-            'do', 'else', 'for', 'switch', 'goto',
-
-            'upc_forall', 'upc_barrier', 'upc_notify', 'upc_wait', 'upc_fence'
-            ),
-        2 => array(
-            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
-            ),
-        3 => array(
-            // assert.h
-            'assert',
-
-            //complex.h
-            'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan',
-            'catanh', 'ccos', 'ccosh', 'cexp', 'cimag', 'cis', 'clog', 'conj',
-            'cpow', 'cproj', 'creal', 'csin', 'csinh', 'csqrt', 'ctan', 'ctanh',
-
-            //ctype.h
-            'digittoint', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl',
-            'isdigit', 'isgraph', 'islower', 'isprint', 'ispunct', 'isspace',
-            'isupper', 'isxdigit', 'toascii', 'tolower', 'toupper',
-
-            //inttypes.h
-            'imaxabs', 'imaxdiv', 'strtoimax', 'strtoumax', 'wcstoimax',
-            'wcstoumax',
-
-            //locale.h
-            'localeconv', 'setlocale',
-
-            //math.h
-            'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
-            'fabs', 'floor', 'frexp', 'ldexp', 'log', 'log10', 'modf', 'pow',
-            'sin', 'sinh', 'sqrt', 'tan', 'tanh',
-
-            //setjmp.h
-            'longjmp', 'setjmp',
-
-            //signal.h
-            'raise',
-
-            //stdarg.h
-            'va_arg', 'va_copy', 'va_end', 'va_start',
-
-            //stddef.h
-            'offsetof',
-
-            //stdio.h
-            'clearerr', 'fclose', 'fdopen', 'feof', 'ferror', 'fflush', 'fgetc',
-            'fgetpos', 'fgets', 'fopen', 'fprintf', 'fputc', 'fputchar',
-            'fputs', 'fread', 'freopen', 'fscanf', 'fseek', 'fsetpos', 'ftell',
-            'fwrite', 'getc', 'getch', 'getchar', 'gets', 'perror', 'printf',
-            'putc', 'putchar', 'puts', 'remove', 'rename', 'rewind', 'scanf',
-            'setbuf', 'setvbuf', 'snprintf', 'sprintf', 'sscanf', 'tmpfile',
-            'tmpnam', 'ungetc', 'vfprintf', 'vfscanf', 'vprintf', 'vscanf',
-            'vsprintf', 'vsscanf',
-
-            //stdlib.h
-            'abort', 'abs', 'atexit', 'atof', 'atoi', 'atol', 'bsearch',
-            'calloc', 'div', 'exit', 'free', 'getenv', 'itoa', 'labs', 'ldiv',
-            'ltoa', 'malloc', 'qsort', 'rand', 'realloc', 'srand', 'strtod',
-            'strtol', 'strtoul', 'system',
-
-            //string.h
-            'memchr', 'memcmp', 'memcpy', 'memmove', 'memset', 'strcat',
-            'strchr', 'strcmp', 'strcoll', 'strcpy', 'strcspn', 'strerror',
-            'strlen', 'strncat', 'strncmp', 'strncpy', 'strpbrk', 'strrchr',
-            'strspn', 'strstr', 'strtok', 'strxfrm',
-
-            //time.h
-            'asctime', 'clock', 'ctime', 'difftime', 'gmtime', 'localtime',
-            'mktime', 'strftime', 'time',
-
-            //wchar.h
-            'btowc', 'fgetwc', 'fgetws', 'fputwc', 'fputws', 'fwide',
-            'fwprintf', 'fwscanf', 'getwc', 'getwchar', 'mbrlen', 'mbrtowc',
-            'mbsinit', 'mbsrtowcs', 'putwc', 'putwchar', 'swprintf', 'swscanf',
-            'ungetwc', 'vfwprintf', 'vswprintf', 'vwprintf', 'wcrtomb',
-            'wcscat', 'wcschr', 'wcscmp', 'wcscoll', 'wcscpy', 'wcscspn',
-            'wcsftime', 'wcslen', 'wcsncat', 'wcsncmp', 'wcsncpy', 'wcspbrk',
-            'wcsrchr', 'wcsrtombs', 'wcsspn', 'wcsstr', 'wcstod', 'wcstok',
-            'wcstol', 'wcstoul', 'wcsxfrm', 'wctob', 'wmemchr', 'wmemcmp',
-            'wmemcpy', 'wmemmove', 'wmemset', 'wprintf', 'wscanf',
-
-            //wctype.h
-            'iswalnum', 'iswalpha', 'iswcntrl', 'iswctype', 'iswdigit',
-            'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace',
-            'iswupper', 'iswxdigit', 'towctrans', 'towlower', 'towupper',
-            'wctrans', 'wctype'
-            ),
-        4 => array(
-            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
-            'register', 'short', 'signed', 'sizeof', 'static', 'struct',
-            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t',
-
-            'int8', 'int16', 'int32', 'int64',
-            'uint8', 'uint16', 'uint32', 'uint64',
-
-            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
-            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
-
-            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
-            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
-
-            'int8_t', 'int16_t', 'int32_t', 'int64_t',
-            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
-
-            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
-            'size_t', 'off_t',
-
-            'upc_lock_t', 'shared', 'strict', 'relaxed', 'upc_blocksizeof',
-            'upc_localsizeof', 'upc_elemsizeof'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']',
-        '+', '-', '*', '/', '%',
-        '=', '<', '>',
-        '!', '^', '&', '|',
-        '?', ':',
-        ';', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #993333;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #339933;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            1 => 'color: #000099; font-weight: bold;',
-            2 => 'color: #660099; font-weight: bold;',
-            3 => 'color: #660099; font-weight: bold;',
-            4 => 'color: #660099; font-weight: bold;',
-            5 => 'color: #006699; font-weight: bold;',
-            'HARD' => '',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;',
-            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
-            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
-            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
-            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
-            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/urbi.php b/inc/geshi/urbi.php
deleted file mode 100644
index a7353ea8b..000000000
--- a/inc/geshi/urbi.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/*************************************************************************************
- * urbi.php
- * -------
- * Author: Alexandre Morgand (morgand.alexandre@gmail.com)
- * Copyright: (c) 2011 Morgand (http://gostai.com)
- * Release Version: 1.0.8.11
- * Date Started: 2011/09/10
- *
- * Urbi language file for GeSHi.
- *
- * CHANGES
- * -------
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Urbi',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Multiline-continued single-line comments
-        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        //Multiline-continued preprocessor define
-        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        // Urbi warning.
-        3 => "#\[[0-9a-f]{8}:warning\].*#",
-        // Urbi message from echo.
-        4 => '#\[[0-9a-f]{8}\] \*\*\*.*#',
-        // Urbi error message.
-        6 => '#\[[0-9a-f]{8}:error\].*#',
-        // Urbi system message.
-        5 => '#\[00.*\].*#',
-        // Nested comment. Max depth 4.
-        7 => '#\/\*(.|\n)*\/\*(.|\n)*\*\/(.|\n)*\*\/#',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(
-        0 => '"',
-        1 => '\'',
-        ),
-    // For Urbi, disable escape char is better.
-    'ESCAPE_CHAR' => '\\',
-    'ESCAPE_REGEXP' => array(
-        //Simple Single Char Escapes
-        1 => "#\\\\[abfnrtv\\\'\"?\n]#",
-        //Hexadecimal Char Specs
-        2 => "#\\\\x[\da-fA-F]{2}#",
-        //Hexadecimal Char Specs
-        3 => "#\\\\u[\da-fA-F]{4}#",
-        //Hexadecimal Char Specs
-        4 => "#\\\\U[\da-fA-F]{8}#",
-        //Octal Char Specs
-        5 => "#\\\\[0-7]{1,3}#",
-        ),
-    'NUMBERS' =>
-        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
-    'KEYWORDS' => array(
-        // Condition keywords.
-        1 => array(
-            'at', 'at;', 'at|', 'at&', 'at,', 'break', 'call', 'case', 'catch', 'continue',
-            'do', 'else', 'every', 'every&', 'every,', 'every;', 'every|', 'for', 'for&',
-            'for,', 'for;', 'foreach', 'for|', 'freezeif', 'goto', 'if', 'in', 'loop',
-            'loop&', 'loop,', 'loop;', 'loop|', 'or_eq', 'stopif', 'switch', 'try',
-            'waituntil', 'when', 'whenever', 'while', 'while&', 'while,', 'while;',
-            'while|', 'throw', 'onleave', 'watch', 'return', 'and_eq', 'default', 'finally',
-            'timeout', 'xor_eq'
-            ),
-        // Type.
-        2 => array(
-            'virtual', 'using', 'namespace', 'inline', 'protected', 'private', 'public',
-            'typename', 'typeid', 'class', 'const_cast', 'dynamic_cast', 'friend',
-            'template', 'enum', 'static_cast', 'reinterpret_cast', 'mutable', 'explicit'
-            ),
-        // Standard function.
-        3 => array(
-            'this', 'sizeof', 'delete', 'assert', 'isdef', 'compl', 'detach',
-            'disown', '__HERE__', 'asm'
-            ),
-        // Type.
-        4 => array(
-            'char', 'const', 'double', 'int', 'long', 'typedef', 'union',
-            'unsigned', 'var', 'short', 'wchar_t', 'volatile', 'signed', 'bool',
-            'float', 'struct', 'auto', 'register', 'static', 'extern', 'function',
-            'export', 'external', 'internal', 'closure', 'BIN'
-            ),
-        ),
-    'SYMBOLS' => array(
-        0 => array('(', ')', '{', '}', '[', ']'),
-        1 => array('<', '>','=', '!=', '==', '==='),
-        2 => array('+', '-', '*', '/', '%', 'bitand', 'bitor', 'xor'),
-        3 => array('!', '^', '&', '|'),
-        4 => array('?', ':', ';')
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #0000dd;',
-            4 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666;',
-            2 => 'color: #339900;',
-            3 => 'color: #d46b0f;',
-            4 => 'color: #20b537;',
-            5 => 'color: #73776f;',
-            6 => 'color: #a71616;',
-            7 => 'color: #666666;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #ff0000;',
-            1 => 'color: #ff0000;',
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #7a0874; font-weight: bold;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;',
-            1 => 'color: #007788;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000dd;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #007788;',
-            2 => 'color: #007788;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;',
-            1 => 'color: #0000f8;',
-            2 => 'color: #000040;',
-            3 => 'color: #000040; font-weight: bold;',
-            4 => 'color: #008080;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000dd',
-            1 => 'color: #0000dd;',
-            2 => 'color: #0000dd;',
-            3 => 'color: #0000dd;',
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::',
-        // FIXME: add -> splitter.
-        ),
-    'REGEXPS' => array(
-        0 => '0x[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])*',
-        1 => '[0-9]([0-9_]*[0-9])*(e|E)(-|\+)?[0-9]([0-9_]*[0-9])*',
-        2 => '[0-9]([0-9_]*[0-9])*(min|s|ms|h|d)',
-        3 => '[0-9]+_([0-9_])*[0-9]',
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-);
-
-?>
diff --git a/inc/geshi/uscript.php b/inc/geshi/uscript.php
deleted file mode 100644
index 58cdb8d9e..000000000
--- a/inc/geshi/uscript.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/*************************************************************************************
- * uscript.php
- * ---------------------------------
- * Author: pospi (pospi@spadgos.com)
- * Copyright: (c) 2007 pospi (http://pospi.spadgos.com)
- * Release Version: 1.0.8.11
- * Date Started: 2007/05/21
- *
- * UnrealScript language file for GeSHi.
- *
- * Comments:
- * * Main purpose at this time is for Unreal Engine 2 / 2.5
- * * Mostly taken from UltraEdit unrealScript wordfile.
- *
- * CHANGES
- * -------
- * 2007/05/21 (1.0.8.10)
- *  -  First Release
- *
- * TODO (updated 2007/05/21)
- * -------------------------
- * * Update to feature any UE3 classes / keywords when UT3 comes out
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Unreal Script',
-    'COMMENT_SINGLE' => array(
-            1 => '//',
-            2 => '#'
-            ),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(        //declaration keywords
-            'simulated', 'state', 'class', 'function', 'event', 'var', 'local',
-            'ignores', 'globalconfig', 'config', 'abstract', 'nativereplication', 'native',
-            'auto', 'coerce', 'const', 'default',
-            'defaultproperties',
-            'enum', 'extends', 'expands', 'final', 'guid', 'latent', 'localized',
-            'new', 'noexport', 'operator', 'preoperator', 'optional', 'out',
-            'private', 'public', 'protected', 'reliable', 'replication',
-            'singular', 'static', 'struct', 'transient', 'unreliable',
-            'hidedropdown', 'cacheexempt', 'exec', 'delegate', 'import', 'placeable', 'exportstructs'
-            ),
-        2 => array(        //control flow keywords
-            'for', 'while', 'do', 'if', 'else', 'switch', 'case', 'return', 'break', 'continue',
-            'begin', 'loop', 'assert',
-            'foreach', 'AllActors', 'DynamicActors', 'ChildActors', 'BasedActors', 'TouchingActors',
-            'TraceActors', 'RadiusActors', 'VisibleActors', 'CollidingActors', 'VisibleCollidingActors'
-            ),
-        3 => array(        //global (object) functions
-            'log', 'warn', 'rot', 'vect', 'Rand', 'Min', 'Max', 'Clamp', 'Abs', 'Sin', 'ASin',
-            'Cos', 'ACos', 'Tan', 'ATan', 'Exp', 'Loge', 'Sqrt', 'Square', 'FRand', 'FMin', 'FMax', 'FClamp',
-            'Lerp', 'Smerp', 'Ceil', 'Round', 'VSize', 'Normal', 'Invert', 'VRand', 'MirrorVectorByNormal',
-            'GetAxes', 'GetUnAxes', 'RotRand', 'OrthoRotation', 'Normalize', 'ClockwiseFrom',
-            'Len', 'InStr', 'Mid', 'Left', 'Right', 'Caps', 'Chr', 'Asc', 'Locs',
-            'Divide', 'Split', 'StrCmp', 'Repl', 'Eval',
-            'InterpCurveEval', 'InterpCurveGetOutputRange', 'InterpCurveGetInputDomain',
-            'QuatProduct', 'QuatInvert', 'QuatRotateVector', 'QuatFindBetween', 'QuatFromAxisAndAngle',
-            'QuatFromRotator', 'QuatToRotator', 'QuatSlerp',
-            'Localize', 'GotoState', 'IsInState', 'GetStateName',
-            'ClassIsChildOf', 'IsA', 'Enable', 'Disable',
-            'GetPropertyText', 'SetPropertyText', 'GetEnum', 'DynamicLoadObject', 'FindObject',
-            'SaveConfig', 'ClearConfig', 'StaticSaveConfig', 'ResetConfig', 'StaticClearConfig',
-            'GetPerObjectNames', 'RandRange', 'StopWatch', 'IsOnConsole', 'IsSoaking',
-            'PlatformIsMacOS', 'PlatformIsUnix', 'PlatformIsWindows', 'PlatformIs64Bit',
-            'BeginState', 'EndState', 'Created', 'AllObjects', 'GetReferencers', 'GetItemName',
-            'ReplaceText', 'EatStr'
-            ),
-        4 => array(        //common almost-global (actor) functions
-            'ClientMessage', 'ConsoleCommand', 'CopyObjectToClipboard', 'TextToSpeech',
-            'Error', 'Sleep', 'SetCollision', 'SetCollisionSize', 'SetDrawScale', 'SetDrawScale3D',
-            'SetStaticMesh', 'SetDrawType', 'Move', 'SetLocation', 'SetRotation',
-            'SetRelativeLocation', 'SetRelativeRotation', 'MoveSmooth', 'AutonomousPhysics',
-            'SetBase', 'SetOwner', 'IsJoinedTo', 'GetMeshName', 'PlayAnim', 'LoopAnim', 'TweenAnim',
-            'IsAnimating', 'FinishAnim', 'HasAnim', 'StopAnimating', 'FreezeFrameAt', 'SetAnimFrame',
-            'IsTweening', 'AnimStopLooping', 'AnimEnd', 'LinkSkelAnim', 'LinkMesh', 'BoneRefresh',
-            'GetBoneCoords', 'GetBoneRotation', 'GetRootLocation', 'GetRootRotation', 'AttachToBone',
-            'DetachFromBone', 'SetBoneScale', 'UpdateURL', 'GetURLOption', 'SetPhysics', 'KAddImpulse',
-            'KImpact', 'KApplyForce', 'Clock', 'UnClock', 'Destroyed', 'GainedChild', 'LostChild',
-            'Tick', 'PostNetReceive', 'ClientTrigger', 'Trigger', 'UnTrigger', 'BeginEvent', 'EndEvent',
-            'Timer', 'HitWall', 'Falling', 'Landed', 'ZoneChange', 'PhysicsVolumeChange', 'Touch',
-            'PostTouch', 'UnTouch', 'Bump', 'BaseChange', 'Attach', 'Detach', 'SpecialHandling',
-            'EncroachingOn', 'EncroachedBy', 'RanInto', 'FinishedInterpolation', 'EndedRotation',
-            'UsedBy', 'FellOutOfWorld', 'KilledBy', 'TakeDamage', 'HealDamage', 'Trace', 'FastTrace',
-            'TraceThisActor', 'spawn', 'Destroy', 'TornOff', 'SetTimer', 'PlaySound', 'PlayOwnedSound',
-            'GetSoundDuration', 'MakeNoise', 'BeginPlay', 'GetAllInt', 'RenderOverlays', 'RenderTexture',
-            'PreBeginPlay', 'PostBeginPlay', 'PostNetBeginPlay', 'HurtRadius', 'Reset', 'Crash'
-            ),
-        5 => array(        //data types
-            'none', 'null',
-            'float', 'int', 'bool', 'byte', 'char', 'double', 'iterator', 'name', 'string',    //primitive
-            'plane', 'rotator', 'vector', 'spline',    'coords', 'Quat', 'Range', 'RangeVector', //structs
-            'Scale', 'Color', 'Box', 'IntBox', 'FloatBox', 'BoundingVolume', 'Matrix', 'InterpCurvePoint',
-            'InterpCurve', 'CompressedPosition', 'TMultiMap', 'PointRegion',
-            'KRigidBodyState', 'KSimParams', 'AnimRep', 'FireProperties',
-            'lodmesh', 'skeletalmesh', 'mesh', 'StaticMesh', 'MeshInstance',    //3d resources
-            'sound',    //sound resources
-            'material', 'texture', 'combiner', 'modifier', 'ColorModifier', 'FinalBlend',    //2d resources
-            'MaterialSequence', 'MaterialSwitch', 'OpacityModifier', 'TexModifier', 'TexEnvMap',
-            'TexCoordSource', 'TexMatrix', 'TexOscillator', 'TexPanner', 'TexRotator', 'TexScaler',
-            'RenderedMaterial', 'BitmapMaterial', 'ScriptedTexture', 'ShadowBitmapMaterial', 'Cubemap',
-            'FractalTexture', 'FireTexture', 'IceTexture', 'WaterTexture', 'FluidTexture', 'WaveTexture',
-            'WetTexture', 'ConstantMaterial', 'ConstantColor', 'FadeColor', 'ParticleMaterial',
-            'ProjectorMaterial', 'Shader', 'TerrainMaterial', 'VertexColor'
-            ),
-        6 => array(        //misc keywords
-            'false', 'true', 'self', 'super', 'MaxInt', 'Pi'
-            ),
-        7 => array(        //common actor enums & variables
-            'DT_None', 'DT_Sprite', 'DT_Mesh', 'DT_Brush', 'DT_RopeSprite',
-            'DT_VerticalSprite', 'DT_TerraForm', 'DT_SpriteAnimOnce', 'DT_StaticMesh', 'DT_DrawType',
-            'DT_Particle', 'DT_AntiPortal', 'DT_FluidSurface',
-            'PHYS_None', 'PHYS_Walking', 'PHYS_Falling', 'PHYS_Swimming', 'PHYS_Flying',
-            'PHYS_Rotating', 'PHYS_Projectile', 'PHYS_Interpolating', 'PHYS_MovingBrush', 'PHYS_Spider',
-            'PHYS_Trailer', 'PHYS_Ladder', 'PHYS_RootMotion', 'PHYS_Karma', 'PHYS_KarmaRagDoll',
-            'PHYS_Hovering', 'PHYS_CinMotion',
-            'ROLE_None', 'ROLE_DumbProxy', 'ROLE_SimulatedProxy',
-            'ROLE_AutonomousProxy', 'ROLE_Authority',
-            'STY_None', 'STY_Normal', 'STY_Masked', 'STY_Translucent', 'STY_Modulated', 'STY_Alpha',
-            'STY_Additive', 'STY_Subtractive', 'STY_Particle', 'STY_AlphaZ',
-            'OCCLUSION_None', 'OCCLUSION_BSP', 'OCCLUSION_Default', 'OCCLUSION_StaticMeshes',
-            'SLOT_None', 'SLOT_Misc', 'SLOT_Pain', 'SLOT_Interact', 'SLOT_Ambient', 'SLOT_Talk',
-            'SLOT_Interface', 'MTRAN_None', 'MTRAN_Instant', 'MTRAN_Segue', 'MTRAN_Fade',
-            'MTRAN_FastFade', 'MTRAN_SlowFade',
-
-            'DrawType', 'Physics', 'Owner', 'Base', 'Level', 'Game', 'Instigator', 'RemoteRole', 'Role',
-            'LifeSpan', 'Tag', 'Event', 'Location', 'Rotation', 'Velocity', 'Acceleration',
-            'RelativeLocation', 'RelativeRotation', 'DrawScale', 'DrawScale3D', 'Skins', 'Style',
-            'SoundVolume', 'SoundPitch', 'SoundRadius', 'TransientSoundVolume', 'TransientSoundRadius',
-            'CollisionRadius', 'CollisionHeight', 'Mass', 'Buoyancy', 'RotationRate', 'DesiredRotation'
-            ),
-        8 => array(        //common non-actor uscript classes
-            'Object',
-            'CacheManager', 'CameraEffect', 'Canvas', 'CheatManager', 'Commandlet', 'DecoText', 'GUI',
-            'InteractionMaster', 'Interactions', 'Interaction', 'KarmaParamsCollision', 'KarmaParamsRBFull',
-            'KarmaParamsSkel', 'KarmaParams', 'LevelSummary', 'Locale', 'Manifest', 'MaterialFactory',
-            'MeshObject', 'ObjectPool', 'Pallete',
-            'ParticleEmitter', 'MeshEmitter', 'BeamEmitter', 'SpriteEmitter', 'SparkEmitter', 'TrailEmitter',
-            'Player', 'PlayerInput', 'PlayInfo', 'ReachSpec', 'Resource', 'LatentScriptedAction', 'ScriptedAction',
-            'speciesType', 'StreamBase', 'Stream', 'EditorEngine', 'Engine', 'Time', 'WeaponFire',
-            'WebApplication', 'WebRequest', 'WebResponse', 'WebSkin', 'xPawnGibGroup', 'xPawnSoundGroup',
-            'xUtil'
-            ),
-        9 => array(        //common actor-based uscript classes
-            'Actor',
-            'Controller', 'AIController', 'ScriptedController', 'Bot', 'xBot',
-            'PlayerController', 'UnrealPlayer', 'xPlayer',
-            'DamageType', 'WeaponDamageType', 'Effects', 'Emitter', 'NetworkEmitter',
-            'Gib', 'HUD', 'HudBase', 'Info', 'FluidSurfaceInfo', 'Combo',
-            'GameInfo', 'UnrealMPGameInfo', 'DeathMatch', 'TeamGame', 'CTFGame',
-            'xCTFGame', 'xBombingRun', 'xDoubleDom', 'xTeamGame',
-            'ASGameInfo', 'Invasion', 'ONSOnslaughtGame', 'xDeathmatch',
-            'Mutator', 'Inventory', 'Ammunition', 'KeyInventory', 'Powerups', 'Armor', 'Weapon',
-            'InventoryAttachment', 'WeaponAttachment',
-            'KActor', 'KConstraint', 'KBSJoint', 'KCarWheelJoint', 'KConeLimit', 'KHinge', 'KTire',
-            'KVehicleFactory', 'Keypoint', 'AIScript', 'ScriptedSequence', 'ScriptedTrigger',
-            'AmbientSound', 'Light', 'SpotLight', 'SunLight', 'TriggerLight',
-            'MeshEffect', 'NavigationPoint', 'GameObjective', 'DestroyableObjective',
-            'PathNode', 'FlyingPathNode', 'RoadPathNode', 'InventorySpot', 'PlayerStart',
-            'Pawn', 'Vehicle', 'UnrealPawn', 'xPawn', 'Monster', 'ASVehicle', 'KVehicle', 'KCar',
-            'ONSWeaponPawn', 'SVehicle', 'ONSVehicle', 'ONSChopperCraft', 'ONSHoverCraft',
-            'ONSPlaneCraft', 'ONSTreadCraft', 'ONSWheeledCraft',
-            'Pickup', 'Ammo', 'UTAmmoPickup', 'ArmorPickup', 'KeyPickup', 'TournamentPickup',
-            'Projectile', 'Projector', 'DynamicProjector', 'ShadowProjector', 'xScorch',
-            'xEmitter', 'xPickupBase', 'xProcMesh', 'xWeatherEffect', 'PhysicsVolume', 'Volume'
-            ),
-        10 => array(    //symbol-like operators
-            'dot','cross'
-            )
-        ),
-    'SYMBOLS' => array(
-        '+','-','=','/','*','-','%','>','<','&','^','!','|','`','(',')','[',']','{','}',
-        '<<','>>','$','@'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false,
-        7 => false,
-        8 => false,
-        9 => false,
-        10 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000FF;',
-            3 => 'color: #0066AA;',
-            4 => 'color: #0088FF;',
-            5 => 'color: #E000E0;',
-            6 => 'color: #900000;',
-            7 => 'color: #888800;',
-            8 => 'color: #AA6600;',
-            9 => 'color: #FF8800;',
-            10 => 'color: #0000FF;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080; font-style: italic;',
-            2 => 'color: #000000; font-weight: bold;',
-            'MULTI' => 'color: #008080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #999999;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #669966;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #E000E0;',
-            1 => 'color: #E000E0;'
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => '',
-        7 => '',
-        8 => 'http://wiki.beyondunreal.com/wiki?search={FNAME}',
-        9 => 'http://wiki.beyondunreal.com/wiki?search={FNAME}',
-        10 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array('.'),
-    'REGEXPS' => array(            //handle template-style variable definitions
-        0 => array(
-            GESHI_SEARCH => '(class\s*)<(\s*(\w+)\s*)>',
-            GESHI_REPLACE => "\${1}",
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => "< \${3} >"
-            ),
-        1 => array(
-            GESHI_SEARCH => '(array\s*)<(\s*(\w+)\s*)>',
-            GESHI_REPLACE => "\${1}",
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => "< \${3} >"
-            )
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            10 => array(
-                'DISALLOWED_BEFORE' => '(?<!<)(?=DOT>)'
-                )
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/vala.php b/inc/geshi/vala.php
deleted file mode 100644
index acac57e2a..000000000
--- a/inc/geshi/vala.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/*************************************************************************************
- * vala.php
- * ----------
- * Author: Nicolas Joseph (nicolas.joseph@valaide.org)
- * Copyright: (c) 2009 Nicolas Joseph
- * Release Version: 1.0.8.11
- * Date Started: 2009/04/29
- *
- * Vala language file for GeSHi.
- *
- * CHANGES
- * -------
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Vala',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        //Using and Namespace directives (basic support)
-        //Please note that the alias syntax for using is not supported
-        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'HARDQUOTE' => array('"""'),
-    'HARDESCAPE' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'as', 'abstract', 'base', 'break', 'case', 'catch', 'const',
-            'construct', 'continue', 'default', 'delete', 'dynamic', 'do',
-            'else', 'ensures', 'extern', 'false', 'finally', 'for', 'foreach',
-            'get', 'if', 'in', 'inline', 'internal', 'lock', 'namespace',
-            'null', 'out', 'override', 'private', 'protected', 'public', 'ref',
-            'requires', 'return', 'set', 'static', 'switch', 'this', 'throw',
-            'throws', 'true', 'try', 'using', 'value', 'var', 'virtual',
-            'volatile', 'void', 'yield', 'yields', 'while'
-            ),
-        2 => array(
-            '#elif', '#endif', '#else', '#if'
-            ),
-        3 => array(
-            'is', 'new', 'owned', 'sizeof', 'typeof', 'unchecked', 'unowned', 'weak'
-            ),
-        4 => array(
-            'bool', 'char', 'class', 'delegate', 'double', 'enum',
-            'errordomain', 'float', 'int', 'int8', 'int16', 'int32', 'int64',
-            'interface', 'long', 'short', 'signal', 'size_t', 'ssize_t',
-            'string', 'struct', 'uchar', 'uint', 'uint8', 'uint16', 'uint32',
-            'ulong', 'unichar', 'ushort'
-            )
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
-        '(', ')', '{', '}', '[', ']', '|'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true,
-        4 => true,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0600FF;',
-            2 => 'color: #FF8000; font-weight: bold;',
-            3 => 'color: #008000;',
-            4 => 'color: #FF0000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008080; font-style: italic;',
-            3 => 'color: #008080;',
-            'MULTI' => 'color: #008080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080; font-weight: bold;',
-            'HARD' => 'color: #008080; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #666666;',
-            'HARD' => 'color: #666666;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #FF0000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #0000FF;',
-            2 => 'color: #0000FF;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
-            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
-        )
-    )
-);
-
-?>
diff --git a/inc/geshi/vb.php b/inc/geshi/vb.php
deleted file mode 100644
index 528e7cd45..000000000
--- a/inc/geshi/vb.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*************************************************************************************
- * vb.php
- * ------
- * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org),
- *                     Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/08/30
- *
- * Visual Basic language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/08/27 (1.0.8.1)
- *  -  changed keyword list for better Visual Studio compliance
- * 2008/08/26 (1.0.8.1)
- *  -  Fixed multiline comments
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/08/30 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Visual Basic',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        // Comments (either single or multiline with _
-        1 => '/\'.*(?<! _)\n/sU',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'Binary', 'Boolean', 'Byte', 'Currency', 'Date', 'Decimal', 'Double',
-            'String', 'Enum', 'Integer', 'Long', 'Object', 'Single', 'Variant'
-            ),
-        2 => array(
-            'CreateObject', 'GetObject', 'New', 'Option', 'Function',
-            'Call', 'Private', 'Public', 'Sub', 'Explicit', 'Compare', 'Exit'
-            ),
-        3 => array(
-            'And', 'Case', 'Do', 'Each', 'Else', 'ElseIf', 'For',
-            'Goto', 'If', 'Is', 'Loop', 'Next', 'Not', 'Or', 'Select', 'Step',
-            'Then', 'To', 'Until', 'While', 'With', 'Xor', 'WithEvents',
-            'DoEvents', 'Close', 'Like', 'In', 'End'
-            ),
-        4 => array(
-            'As', 'Dim', 'Get', 'Set', 'ReDim', 'Error',
-            'Resume', 'Declare', 'Let', 'ByRef', 'ByVal',
-            'Optional', 'Property', 'Control', 'UBound', 'Mod',
-            'GoSub', 'Implements', 'Input', 'LBound', 'Static', 'Stop',
-            'Type', 'TypeOf', 'On', 'Open', 'Output', 'ParamArray',
-            'Preserve', 'Print', 'RaiseEvent', 'Random', 'Line'
-            ),
-        5 => array(
-            'Nothing', 'False', 'True', 'Null', 'Empty'
-            ),
-        6 => array(
-            'ErrorHandler','ExitProc', 'PublishReport'
-            ),
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        6 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #F660AB; font-weight: bold;',
-            2 => 'color: #E56717; font-weight: bold;',
-            3 => 'color: #8D38C9; font-weight: bold;',
-            4 => 'color: #151B8D; font-weight: bold;',
-            5 => 'color: #00C2FF; font-weight: bold;',
-            6 => 'color: #3EA99F; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000;'
-            ),
-        'BRACKETS' => array(
-            ),
-        'STRINGS' => array(
-            0 => 'color: #800000;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #800000; font-weight: bold;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => '',
-        6 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'SYMBOLS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/vbnet.php b/inc/geshi/vbnet.php
deleted file mode 100644
index 758df9893..000000000
--- a/inc/geshi/vbnet.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*************************************************************************************
- * vbnet.php
- * ---------
- * Author: Alan Juden (alan@judenware.org)
- * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
- * Date Started: 2004/06/04
- *
- * VB.NET language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2004/11/27 (1.0.0)
- *  -  Initial release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'vb.net',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        //Keywords
-        1 => array(
-            'AddHandler', 'AddressOf', 'Alias', 'And', 'AndAlso', 'As', 'ByRef', 'ByVal',
-            'Call', 'Case', 'Catch', 'Char', 'Class', 'Const', 'Continue',
-            'Declare', 'Default',
-            'Delegate', 'Dim', 'DirectCast', 'Do', 'Each', 'Else', 'ElseIf', 'End', 'EndIf',
-            'Enum', 'Erase', 'Error', 'Event', 'Exit', 'False', 'Finally', 'For', 'Friend', 'Function',
-            'Get', 'GetType', 'GetXMLNamespace', 'Global', 'GoSub', 'GoTo', 'Handles', 'If', 'Implements',
-            'Imports', 'In', 'Inherits', 'Interface', 'Is', 'IsNot', 'Let', 'Lib', 'Like', 'Loop', 'Me',
-            'Mod', 'Module', 'Module Statement', 'MustInherit', 'MustOverride', 'MyBase', 'MyClass', 'Namespace',
-            'Narrowing', 'New', 'Next', 'Not', 'Nothing', 'NotInheritable', 'NotOverridable', 'Of', 'On',
-            'Operator', 'Option', 'Optional', 'Or', 'OrElse', 'Out', 'Overloads', 'Overridable', 'Overrides',
-            'ParamArray', 'Partial', 'Private', 'Property', 'Protected', 'Public', 'RaiseEvent', 'ReadOnly', 'ReDim',
-            'REM', 'RemoveHandler', 'Resume', 'Return', 'Select','Set', 'Shadows', 'Shared', 'Static', 'Step',
-            'Stop', 'Structure', 'Sub', 'SyncLock', 'Then', 'Throw', 'To', 'True', 'Try', 'TryCast', 'TypeOf',
-            'Using', 'Wend', 'When', 'While', 'Widening', 'With', 'WithEvents', 'WriteOnly', 'Xor'
-            ),
-        //Data Types
-        2 => array(
-            'Boolean', 'Byte', 'Date', 'Decimal', 'Double', 'Integer', 'Long', 'Object',
-            'SByte', 'Short', 'Single', 'String', 'UInteger', 'ULong', 'UShort'
-            ),
-        //Compiler Directives
-        3 => array(
-            '#Const', '#Else', '#ElseIf', '#End', '#If'
-            ),
-        //Constants
-        4 => array(
-            'CBool', 'CByte', 'CChar', 'CChr', 'CDate', 'CDbl', 'CDec','CInt', 'CLng', 'CLng8', 'CObj', 'CSByte', 'CShort',
-            'CSng', 'CStr', 'CType', 'CUInt', 'CULng', 'CUShort'
-            ),
-        //Linq
-        5 => array(
-            'By','From','Group','Where'
-            ),
-        //Built-in functions
-        7 => array(
-            'ABS', 'ARRAY', 'ASC', 'ASCB', 'ASCW', 'CALLBYNAME', 'CHOOSE', 'CHR', 'CHR$', 'CHRB', 'CHRB$', 'CHRW',
-            'CLOSE', 'COMMAND', 'COMMAND$', 'CONVERSION',
-            'COS', 'CREATEOBJECT', 'CURDIR', 'CVDATE', 'DATEADD',
-            'DATEDIFF', 'DATEPART', 'DATESERIAL', 'DATEVALUE', 'DAY', 'DDB', 'DIR', 'DIR$',
-            'EOF', 'ERROR$', 'EXP', 'FILEATTR', 'FILECOPY', 'FILEDATATIME', 'FILELEN', 'FILTER',
-            'FIX', 'FORMAT', 'FORMAT$', 'FORMATCURRENCY', 'FORMATDATETIME', 'FORMATNUMBER',
-            'FORMATPERCENT', 'FREEFILE', 'FV', 'GETALLSETTINGS', 'GETATTRGETOBJECT', 'GETSETTING',
-            'HEX', 'HEX$', 'HOUR', 'IIF', 'IMESTATUS', 'INPUT$', 'INPUTB', 'INPUTB$', 'INPUTBOX',
-            'INSTR', 'INSTRB', 'INSTRREV', 'INT', 'IPMT', 'IRR', 'ISARRAY', 'ISDATE', 'ISEMPTY',
-            'ISERROR', 'ISNULL', 'ISNUMERIC', 'ISOBJECT', 'JOIN', 'LBOUND', 'LCASE', 'LCASE$',
-            'LEFT', 'LEFT$', 'LEFTB', 'LEFTB$', 'LENB', 'LINEINPUT', 'LOC', 'LOF', 'LOG', 'LTRIM',
-            'LTRIM$', 'MID$', 'MIDB', 'MIDB$', 'MINUTE', 'MIRR', 'MKDIR', 'MONTH', 'MONTHNAME',
-            'MSGBOX', 'NOW', 'NPER', 'NPV', 'OCT', 'OCT$', 'PARTITION', 'PMT', 'PPMT', 'PV',
-            'RATE', 'REPLACE', 'RIGHT', 'RIGHT$', 'RIGHTB', 'RIGHTB$', 'RMDIR', 'RND', 'RTRIM',
-            'RTRIM$', 'SECOND', 'SIN', 'SLN', 'SPACE', 'SPACE$', 'SPC', 'SPLIT', 'SQRT', 'STR', 'STR$',
-            'STRCOMP', 'STRCONV', 'STRING$', 'STRREVERSE', 'SYD', 'TAB', 'TAN', 'TIMEOFDAY',
-            'TIMER', 'TIMESERIAL', 'TIMEVALUE', 'TODAY', 'TRIM', 'TRIM$', 'TYPENAME', 'UBOUND',
-            'UCASE', 'UCASE$', 'VAL', 'WEEKDAY', 'WEEKDAYNAME', 'YEAR'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!',
-        '(', ')', '{', '}', '.'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false,
-        7 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF; font-weight: bold;',  //Keywords
-            2 => 'color: #6a5acd;',                     //primitive Data Types
-            3 => 'color: #6a5acd; font-weight: bold;',  //preprocessor-commands
-            4 => 'color: #cd6a5a;',                     //Constants
-            5 => 'color: #cd6a5a; font-weight: bold;',  //LinQ
-            7 => 'color: #000066;',                     //Built-in functions
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            'MULTI' => 'color: #008000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #a52a2a; back-color: #fffacd;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #a52a2a; back-color: #fffacd;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #000000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.google.com/search?q={FNAMEU}+site:msdn.microsoft.com',
-        4 => '',
-        5 => '',
-        7 => 'http://www.google.com/search?q={FNAMEU}+site:msdn.microsoft.com'
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 =>'.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            7 => array(
-                'DISALLOWED_AFTER' => '(?!\w)(?=\s*\()'
-                )
-            )
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/vedit.php b/inc/geshi/vedit.php
deleted file mode 100644
index 19b2bdb21..000000000
--- a/inc/geshi/vedit.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*************************************************************************************
- * vedit.php
- * --------
- * Author: Pauli Lindgren (pauli0212@yahoo.com)
- * Copyright: (c) 2009 Pauli Lindgren (http://koti.mbnet.fi/pkl/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/12/16
- *
- * Vedit macro language language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2009/12/16 (1.0.8.11)
- *  -  First Release
- *
- * TODO (updated 2009/12/16)
- * -------------------------
- * - Add keyword groups 2, 3 and 4.
- *
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Vedit macro language',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', '\''),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'break', 'breakout', 'break_out', 'continue', 'do', 'else', 'for',
-            'goto', 'if', 'repeat', 'return', 'while'
-            )
-        ),
-    'SYMBOLS' => array(
-        1 => array(
-            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%',
-            '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
-            )
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;',
-            ),
-        'METHODS' => array(
-            0 => 'color: #004000;'
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: #339933;'
-            ),
-        'REGEXPS' => array(),
-        'SCRIPT' => array()
-        ),
-    'URLS' => array(1 => ''),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/verilog.php b/inc/geshi/verilog.php
deleted file mode 100644
index 2bf66d1c0..000000000
--- a/inc/geshi/verilog.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * verilog.php
- * -----------
- * Author: G�nter Dannoritzer <dannoritzer@web.de>
- * Copyright: (C) 2008 Guenter Dannoritzer
- * Release Version: 1.0.8.11
- * Date Started: 2008/05/28
- *
- * Verilog language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/29
- *   -  added regular expression to find numbers of the form 4'b001xz
- *   -  added regular expression to find values for `timescale command
- *   -  extended macro keywords
- *
- * TODO (updated 2008/05/29)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Verilog',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        // keywords
-        1 => array('always', 'and', 'assign', 'begin', 'buf', 'bufif0', 'bufif1', 'case',
-            'casex', 'casez', 'cmos', 'deassign', 'default', 'defparam',
-            'disable', 'edge', 'else', 'end', 'endcase', 'endfunction',
-            'endmodule', 'endprimitive', 'endspecify', 'endtable', 'endtask',
-            'event', 'fork', 'for', 'force', 'forever', 'function', 'highz0',
-            'highz1', 'if', 'ifnone', 'initial', 'inout', 'input', 'integer',
-            'join', 'large', 'macromodule', 'medium', 'module', 'nand',
-            'negedge', 'nmos', 'nor', 'not', 'notif0', 'notif1', 'or',
-            'output', 'parameter', 'pmos', 'posedge', 'primitive', 'pull0',
-            'pull1', 'pulldown', 'pullup', 'rcmos', 'real', 'realtime', 'reg',
-            'release', 'repeat', 'rnmos', 'rpmos', 'rtran', 'rtranif0',
-            'rtranif1', 'scalared', 'small', 'specify', 'specparam',
-            'strong0', 'strong1', 'supply0', 'supply1', 'table', 'task',
-            'time', 'tran', 'tranif0', 'tranif1', 'tri', 'tri0', 'tri1',
-            'triand', 'trior', 'trireg', 'vectored', 'wait', 'wand', 'weak0',
-            'weak1', 'while', 'wire', 'wor', 'xnor', 'xor'
-            ),
-        // system tasks
-        2 => array(
-            '$display', '$monitor',
-            '$dumpall', '$dumpfile', '$dumpflush', '$dumplimit', '$dumpoff',
-            '$dumpon', '$dumpvars',
-            '$fclose', '$fdisplay', '$fopen',
-            '$finish', '$fmonitor', '$fstrobe', '$fwrite',
-            '$fgetc', '$ungetc', '$fgets', '$fscanf', '$fread', '$ftell',
-            '$fseek', '$frewind', '$ferror', '$fflush', '$feof',
-            '$random',
-            '$readmemb', '$readmemh', '$readmemx',
-            '$signed', '$stime', '$stop',
-            '$strobe', '$time', '$unsigned', '$write'
-            ),
-        // macros
-        3 => array(
-            '`default-net', '`define',
-            '`celldefine', '`default_nettype', '`else', '`elsif', '`endcelldefine',
-            '`endif', '`ifdef', '`ifndef', '`include', '`line', '`nounconnected_drive',
-            '`resetall', '`timescale', '`unconnected_drive', '`undef'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%',
-        '^', '&', '|', '~',
-        '?', ':',
-        '#', '<<', '<<<',
-        '>', '<', '>=', '<=',
-        '@', ';', ','
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #A52A2A; font-weight: bold;',
-            2 => 'color: #9932CC;',
-            3 => 'color: #008800;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #00008B; font-style: italic;',
-            'MULTI' => 'color: #00008B; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #9F79EE'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #9F79EE;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #FF00FF;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0055;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #202020;',
-            2 => 'color: #202020;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #5D478B;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #ff0055;',
-            1 => 'color: #ff0055;',
-            ),
-        'SCRIPT' => array(
-            0 => '',
-            1 => '',
-            2 => '',
-            3 => ''
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        1 => ''
-        ),
-    'REGEXPS' => array(
-        // numbers
-        0 => "\d'[bdh][0-9_a-fA-FxXzZ]+",
-        // time -> 1, 10, or 100; s, ms, us, ns, ps, of fs
-        1 => "1[0]{0,2}[munpf]?s"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        1 => ''
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        0 => true,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/vhdl.php b/inc/geshi/vhdl.php
deleted file mode 100644
index a8f37e676..000000000
--- a/inc/geshi/vhdl.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/*************************************************************************************
- * vhdl.php
- * --------
- * Author: Alexander 'E-Razor' Krause (admin@erazor-zone.de)
- * Contributors:
- *  - Kevin Thibedeau (kevinpt@yahoo.com)
- * Copyright: (c) 2005 Alexander Krause
- * Release Version: 1.0.8.11
- * Date Started: 2005/06/15
- *
- * VHDL (VHSICADL, very high speed integrated circuit HDL) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2012/4/30 (1.0.8.10)
- *  -  Reworked to support new features of VHDL-2008.
- *  -    Changes include: multi-line comments, all new keywords, PSL keywords and metacomments,
- *  -    based literals, attribute highlighting, preprocessor macros (from PSL), and other small
- *  -    improvements.
- * 2008/05/23 (1.0.7.22)
- *  -  Added description of extra language features (SF#1970248)
- *  -  Optimized regexp group 0 somewhat
- * 2006/06/15 (1.0.0)
- *  -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'VHDL',
-    'COMMENT_SINGLE' => array(1 => '--'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'COMMENT_REGEXP' => array(
-        // PSL adds C-preprocessor support
-        1 => '/(?<=\s)#(?:\\\\\\\\|\\\\\\n|.)*$/m',
-        // PSL metacomments (single-line only for now)
-        2 => '/--\s*@?psl(?:.)*?;$/m',
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /*keywords*/
-        1 => array(
-            'access','after','alias','all','attribute','architecture','array','begin',
-            'block','body','buffer','bus','case','case?','component','configuration','constant','context',
-            'disconnect','downto','else','elsif','end','entity','exit','file','for','force',
-            'function','generate','generic','group','guarded','if','impure','in',
-            'inertial','inout','is','label','library','linkage','literal','loop',
-            'map','new','next','null','of','on','open','others','out','package',
-            'port','postponed','procedure','process','protected','pure','range','record','register',
-            'reject','release','report','return','select','severity','shared','signal','subtype',
-            'then','to','transport','type','unaffected','units','until','use','variable',
-            'wait','when','while','with'
-            ),
-        /*types and standard libs*/
-        2 => array(
-            'bit','bit_vector','character','boolean','integer','real','time','delay_length','string',
-            'severity_level','positive','natural','signed','unsigned','line','text',
-            'std_logic','std_logic_vector','std_ulogic','std_ulogic_vector',
-            'sfixed','ufixed','float','float32','float64','float128',
-            'work','ieee','std_logic_1164','math_real','math_complex','textio',
-            'numeric_std','numeric_std_signed','numeric_std_unsigned','numeric_bit'
-            ),
-        /*operators*/
-        3 => array(
-            'abs','and','mod','nor','not','or','rem','rol','ror','sla','sll','sra','srl','xnor','xor'
-            ),
-        /*psl*/
-        4 => array(
-            'assert','assume','assume_guarantee','clock','const','countones','cover','default',
-            'endpoint','fairness','fell','forall','inf','inherit','isunknown','onehot','onehot0','property',
-            'prev','restrict','restrict_guarantee','rose','sequence','stable','strong','union','vmode','vprop','vunit'
-            ),
-        /*psl operators*/
-        5 => array(
-            'abort','always','before','before!','before!_','before_','eventually!','never',
-            'next!','next_a','next_a!','next_e','next_e!','next_event','next_event!','next_event_a','next_event_a!',
-            'next_event_e','next_event_e!','until!','until!_','until_','within'
-            )
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '(', ')',
-        ';',':',
-        '<','>','=','+','-','*','/','&','|','?'
-    ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080; font-weight: bold;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #000066;',
-            4 => 'color: #000080; font-weight: bold;',
-            5 => 'color: #000066;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            2 => 'color: #ff0000; font-weight: bold;',
-            'MULTI' => 'color: #008000; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000066;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000066;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #ff0000;',
-            //1 => 'color: #ff0000;',
-            2 => 'color: #ee82ee;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Based literals, scientific notation, and time units
-        0 => '(\b\d+#[[:xdigit:]_]+#)|'.
-            '(\b[\d_]+(\.[\d_]+)?[eE][+\-]?[\d_]+)|'.
-            '(\b(hr|min|sec|ms|us|ns|ps|fs)\b)',
-        //Character literals
-        /* GeSHi won't match this pattern for some reason and QUOTEMARKS
-         * can't be used because it interferes with attribute parsing */
-        /*1 => "\b'.'\b",*/
-        //Attributes
-        2 => "'\w+(?!')"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/vim.php b/inc/geshi/vim.php
deleted file mode 100644
index fe7e5e006..000000000
--- a/inc/geshi/vim.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-/*************************************************************************************
- * vim.php
- * ----------------
- * Author: Swaroop C H (swaroop@swaroopch.com)
- * Contributors:
- *  - Laurent Peuch (psycojoker@gmail.com)
- * Copyright: (c) 2008 Swaroop C H (http://www.swaroopch.com)
- * Release Version: 1.0.8.11
- * Date Started: 2008/10/19
- *
- * Vim scripting language file for GeSHi.
- *
- * Reference: http://qbnz.com/highlighter/geshi-doc.html#language-files
- * All keywords scraped from `:help expression-commands`.
- * All method names scraped from `:help function-list`.
- *
- * CHANGES
- * -------
- * 2008/10/19 (1.0.8.2)
- * - Started.
- * 2009/07/05
- * - Fill out list of zillion commands (maybe somes still miss).
- * - fix a part of the regex, now works for comment that have white space before the "
- *
- * TODO (updated 2009/07/05)
- * -------------------------
- * - Make this damn string with "" work correctly. I've just remove it for my wiki.
- * - Make the comment regex able to find comment after some code.
- *   (i.e: let rocks " unworking comment)
- * - Make <F1> <F2> ... <Esc> <CR> ... works event if they aren't surround by space.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array(
-    'LANG_NAME' => 'Vim Script',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_REGEXP' => array(
-        1 => "/\s*\"[^\"]*?$/m",
-        //Regular expressions (Ported from perl.php)
-//        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
-        ),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'au', 'augroup', 'autocmd', 'brea', 'break', 'bufadd',
-            'bufcreate', 'bufdelete', 'bufenter', 'buffilepost',
-            'buffilepre', 'bufleave', 'bufnew', 'bufnewfile',
-            'bufread', 'bufreadcmd', 'bufreadpost', 'bufreadpre',
-            'bufunload', 'bufwinenter', 'bufwinleave', 'bufwipeout',
-            'bufwrite', 'bufwritecmd', 'bufwritepost', 'bufwritepre',
-            'call', 'cat', 'catc', 'catch', 'cmd-event', 'cmdwinenter',
-            'cmdwinleave', 'colorscheme', 'con', 'confirm', 'cont', 'conti',
-            'contin', 'continu', 'continue', 'cursorhold', 'cursorholdi',
-            'cursormoved', 'cursormovedi', 'ec', 'echo', 'echoe',
-            'echoer', 'echoerr', 'echoh', 'echohl', 'echom', 'echoms',
-            'echomsg', 'echon', 'el', 'els', 'else', 'elsei', 'elseif',
-            'en', 'encodingchanged', 'end', 'endfo', 'endfor', 'endi',
-            'endif', 'endt', 'endtr', 'endtry', 'endw', 'endwh', 'endwhi',
-            'endwhil', 'endwhile', 'exe', 'exec', 'execu', 'execut',
-            'execute', 'fileappendcmd', 'fileappendpost', 'fileappendpre',
-            'filechangedro', 'filechangedshell', 'filechangedshellpost',
-            'filereadcmd', 'filereadpost', 'filereadpre',
-            'filetype', 'filewritecmd', 'filewritepost', 'filewritepre',
-            'filterreadpost', 'filterreadpre', 'filterwritepost',
-            'filterwritepre', 'fina', 'final', 'finall', 'finally',
-            'finish', 'focusgained', 'focuslost', 'for', 'fun', 'func',
-            'funct', 'functi', 'functio', 'function', 'funcundefined',
-            'guienter', 'guifailed', 'hi', 'highlight', 'if', 'in',
-            'insertchange', 'insertenter', 'insertleave', 'let', 'lockv',
-            'lockva', 'lockvar', 'map', 'match', 'menupopup', 'nnoremap',
-            'quickfixcmdpost', 'quickfixcmdpre', 'remotereply', 'retu',
-            'retur', 'return', 'sessionloadpost', 'set', 'setlocal',
-            'shellcmdpost', 'shellfilterpost', 'sourcecmd', 'sourcepre',
-            'spellfilemissing', 'stdinreadpost', 'stdinreadpre',
-            'swapexists', 'syntax', 'tabenter', 'tableave', 'termchanged',
-            'termresponse', 'th', 'thr', 'thro', 'throw', 'tr', 'try', 'unl',
-            'unle', 'unlet', 'unlo', 'unloc', 'unlock', 'unlockv',
-            'unlockva', 'unlockvar', 'user', 'usergettingbored',
-            'vimenter', 'vimleave', 'vimleavepre', 'vimresized', 'wh',
-            'whi', 'whil', 'while', 'winenter', 'winleave'
-            ),
-        2 => array(
-            '&lt;CR&gt;', '&lt;Esc&gt;', '&lt;F1&gt;', '&lt;F10&gt;',
-            '&lt;F11&gt;', '&lt;F12&gt;', '&lt;F2&gt;', '&lt;F3&gt;',
-            '&lt;F4&gt;', '&lt;F5&gt;', '&lt;F6&gt;', '&lt;F7&gt;',
-            '&lt;F8&gt;', '&lt;F9&gt;', '&lt;cr&gt;', '&lt;silent&gt;',
-            '-nargs', 'acd', 'ai', 'akm', 'al', 'aleph',
-            'allowrevins', 'altkeymap', 'ambiwidth', 'ambw',
-            'anti', 'antialias', 'ar', 'arab', 'arabic',
-            'arabicshape', 'ari', 'arshape', 'autochdir',
-            'autoindent', 'autoread', 'autowrite', 'autowriteall',
-            'aw', 'awa', 'background', 'backspace', 'backup',
-            'backupcopy', 'backupdir', 'backupext',
-            'backupskip', 'balloondelay', 'ballooneval', 'balloonexpr',
-            'bdir', 'bdlay', 'beval', 'bex', 'bexpr', 'bg',
-            'bh', 'bin', 'binary', 'biosk', 'bioskey',
-            'bk', 'bkc', 'bl', 'bomb', 'breakat', 'brk',
-            'bs', 'bsdir', 'bsk', 'bt', 'bufhidden',
-            'buftype', 'casemap', 'cb',
-            'ccv', 'cd', 'cdpath', 'cedit', 'cf', 'cfu', 'ch',
-            'charconvert', 'ci', 'cin', 'cink',
-            'cinkeys', 'cino', 'cinoptions', 'cinw', 'cinwords',
-            'clipboard', 'cmdheight', 'cmdwinheight',
-            'cmp', 'cms', 'co', 'columns', 'com',
-            'comc', 'comcl', 'comcle', 'comclea', 'comclear', 'comm',
-            'comma', 'comman', 'command', 'comments', 'commentstring',
-            'compatible', 'completefunc', 'completeopt',
-            'consk', 'conskey', 'copyindent',
-            'cot', 'cp', 'cpo', 'cpoptions', 'cpt',
-            'cscopepathcomp', 'cscopeprg', 'cscopequickfix', 'cscopetag',
-            'cscopetagorder', 'cscopeverbose',
-            'cspc', 'csprg', 'csqf', 'cst', 'csto', 'csverb', 'cuc',
-            'cul', 'cursorcolumn', 'cursorline', 'cwh', 'debug',
-            'deco', 'def', 'define', 'delc', 'delco', 'delcom',
-            'delcombine', 'delcomm', 'delcomman', 'delcommand', 'dex',
-            'dg', 'dict', 'dictionary', 'diff', 'diffexpr',
-            'diffopt', 'digraph', 'dip', 'dir', 'directory', 'display',
-            'dlcomma', 'dy', 'ea', 'ead', 'eadirection',
-            'eb', 'ed', 'edcompatible', 'ef', 'efm',
-            'ei', 'ek', 'enc', 'encoding', 'endfun', 'endofline',
-            'eol', 'ep', 'equalalways', 'equalprg', 'errorbells',
-            'errorfile', 'errorformat', 'esckeys', 'et',
-            'eventignore', 'ex', 'expandtab', 'exrc', 'fcl',
-            'fcs', 'fdc', 'fde', 'fdi', 'fdl', 'fdls', 'fdm',
-            'fdn', 'fdo', 'fdt', 'fen', 'fenc', 'fencs', 'fex',
-            'ff', 'ffs', 'fileencoding', 'fileencodings', 'fileformat',
-            'fileformats', /*'filetype',*/ 'fillchars', 'fk',
-            'fkmap', 'flp', 'fml', 'fmr', 'fo', 'foldclose',
-            'foldcolumn', 'foldenable', 'foldexpr', 'foldignore',
-            'foldlevelstart', 'foldmarker', 'foldmethod', 'foldminlines',
-            'foldnestmax', 'foldopen', 'formatexpr', 'formatlistpat',
-            'formatoptions', 'formatprg', 'fp', 'fs', 'fsync', 'ft',
-            'gcr', 'gd', 'gdefault', 'gfm', 'gfn', 'gfs', 'gfw',
-            'ghr', 'go', 'gp', 'grepformat', 'grepprg', 'gtl',
-            'gtt', 'guicursor', 'guifont', 'guifontset',
-            'guifontwide', 'guiheadroom', 'guioptions', 'guipty',
-            'guitablabel', 'guitabtooltip', 'helpfile',
-            'helpheight', 'helplang', 'hf', 'hh', 'hid', 'hidden',
-            'history', 'hk', 'hkmap', 'hkmapp', 'hkp', 'hl',
-            'hlg', 'hls', 'hlsearch', 'ic', 'icon', 'iconstring',
-            'ignorecase', 'im', 'imactivatekey', 'imak', 'imc',
-            'imcmdline', 'imd', 'imdisable', 'imi', 'iminsert', 'ims',
-            'imsearch', 'inc', 'include', 'includeexpr',
-            'incsearch', 'inde', 'indentexpr', 'indentkeys',
-            'indk', 'inex', 'inf', 'infercase', 'insertmode', 'is', 'isf',
-            'isfname', 'isi', 'isident', 'isk', 'iskeyword',
-            'isp', 'isprint', 'joinspaces', 'js', 'key',
-            'keymap', 'keymodel', 'keywordprg', 'km', 'kmp', 'kp',
-            'langmap', 'langmenu', 'laststatus', 'lazyredraw', 'lbr',
-            'lcs', 'linebreak', 'lines', 'linespace', 'lisp',
-            'lispwords', 'list', 'listchars', 'lm', 'lmap',
-            'loadplugins', 'lpl', 'ls', 'lsp', 'lw', 'lz', 'ma',
-            'macatsui', 'magic', 'makeef', 'makeprg', 'mat',
-            'matchpairs', 'matchtime', 'maxcombine', 'maxfuncdepth',
-            'maxmapdepth', 'maxmem', 'maxmempattern',
-            'maxmemtot', 'mco', 'mef', 'menuitems', 'mfd', 'mh',
-            'mis', 'mkspellmem', 'ml', 'mls', 'mm', 'mmd', 'mmp',
-            'mmt', 'mod', 'modeline', 'modelines', 'modifiable',
-            'modified', 'more', 'mouse', 'mousef', 'mousefocus',
-            'mousehide', 'mousem', 'mousemodel', 'mouses',
-            'mouseshape', 'mouset', 'mousetime', 'mp', 'mps', 'msm',
-            'mzq', 'mzquantum', 'nf', 'noacd', 'noai', 'noakm',
-            'noallowrevins', 'noaltkeymap', 'noanti', 'noantialias',
-            'noar', 'noarab', 'noarabic', 'noarabicshape', 'noari',
-            'noarshape', 'noautochdir', 'noautoindent', 'noautoread',
-            'noautowrite', 'noautowriteall', 'noaw', 'noawa', 'nobackup',
-            'noballooneval', 'nobeval', 'nobin', 'nobinary', 'nobiosk',
-            'nobioskey', 'nobk', 'nobl', 'nobomb', 'nobuflisted', 'nocf',
-            'noci', 'nocin', 'nocindent', 'nocompatible', 'noconfirm',
-            'noconsk', 'noconskey', 'nocopyindent', 'nocp', 'nocscopetag',
-            'nocscopeverbose', 'nocst', 'nocsverb', 'nocuc', 'nocul',
-            'nocursorcolumn', 'nocursorline', 'nodeco', 'nodelcombine',
-            'nodg', 'nodiff', 'nodigraph', 'nodisable', 'noea', 'noeb',
-            'noed', 'noedcompatible', 'noek', 'noendofline', 'noeol',
-            'noequalalways', 'noerrorbells', 'noesckeys', 'noet',
-            'noex', 'noexpandtab', 'noexrc', 'nofen', 'nofk', 'nofkmap',
-            'nofoldenable', 'nogd', 'nogdefault', 'noguipty', 'nohid',
-            'nohidden', 'nohk', 'nohkmap', 'nohkmapp', 'nohkp', 'nohls',
-            'nohlsearch', 'noic', 'noicon', 'noignorecase', 'noim',
-            'noimc', 'noimcmdline', 'noimd', 'noincsearch', 'noinf',
-            'noinfercase', 'noinsertmode', 'nois', 'nojoinspaces',
-            'nojs', 'nolazyredraw', 'nolbr', 'nolinebreak', 'nolisp',
-            'nolist', 'noloadplugins', 'nolpl', 'nolz', 'noma',
-            'nomacatsui', 'nomagic', 'nomh', 'noml', 'nomod',
-            'nomodeline', 'nomodifiable', 'nomodified', 'nomore',
-            'nomousef', 'nomousefocus', 'nomousehide', 'nonu',
-            'nonumber', 'noodev', 'noopendevice', 'nopaste', 'nopi',
-            'nopreserveindent', 'nopreviewwindow', 'noprompt', 'nopvw',
-            'noreadonly', 'noremap', 'norestorescreen', 'norevins',
-            'nori', 'norightleft', 'norightleftcmd', 'norl', 'norlc',
-            'noro', 'nors', 'noru', 'noruler', 'nosb', 'nosc', 'noscb',
-            'noscrollbind', 'noscs', 'nosecure', 'nosft', 'noshellslash',
-            'noshelltemp', 'noshiftround', 'noshortname', 'noshowcmd',
-            'noshowfulltag', 'noshowmatch', 'noshowmode', 'nosi', 'nosm',
-            'nosmartcase', 'nosmartindent', 'nosmarttab', 'nosmd',
-            'nosn', 'nosol', 'nospell', 'nosplitbelow', 'nosplitright',
-            'nospr', 'nosr', 'nossl', 'nosta', 'nostartofline',
-            'nostmp', 'noswapfile', 'noswf', 'nota', 'notagbsearch',
-            'notagrelative', 'notagstack', 'notbi', 'notbidi', 'notbs',
-            'notermbidi', 'noterse', 'notextauto', 'notextmode',
-            'notf', 'notgst', 'notildeop', 'notimeout', 'notitle',
-            'noto', 'notop', 'notr', 'nottimeout', 'nottybuiltin',
-            'nottyfast', 'notx', 'novb', 'novisualbell', 'nowa',
-            'nowarn', 'nowb', 'noweirdinvert', 'nowfh', 'nowfw',
-            'nowildmenu', 'nowinfixheight', 'nowinfixwidth', 'nowiv',
-            'nowmnu', 'nowrap', 'nowrapscan', 'nowrite', 'nowriteany',
-            'nowritebackup', 'nows', 'nrformats', 'nu', 'number',
-            'numberwidth', 'nuw', 'odev', 'oft', 'ofu',
-            'omnifunc', 'opendevice', 'operatorfunc', 'opfunc',
-            'osfiletype', 'pa', 'para', 'paragraphs',
-            'paste', 'pastetoggle', 'patchexpr',
-            'patchmode', 'path', 'pdev', 'penc', 'pex', 'pexpr',
-            'pfn', 'ph', 'pheader', 'pi', 'pm', 'pmbcs',
-            'pmbfn', 'popt', 'preserveindent', 'previewheight',
-            'previewwindow', 'printdevice', 'printencoding', 'printexpr',
-            'printfont', 'printheader', 'printmbcharset',
-            'printmbfont', 'printoptions', 'prompt', 'pt', 'pumheight',
-            'pvh', 'pvw', 'qe', 'quoteescape', 'rdt',
-            'readonly', 'redrawtime', 'remap', 'report',
-            'restorescreen', 'revins', 'ri', 'rightleft', 'rightleftcmd',
-            'rl', 'rlc', 'ro', 'rs', 'rtp', 'ru',
-            'ruf', 'ruler', 'rulerformat', 'runtimepath', 'sb', 'sbo',
-            'sbr', 'sc', 'scb', 'scr', 'scroll', 'scrollbind',
-            'scrolljump', 'scrolloff', 'scrollopt',
-            'scs', 'sect', 'sections', 'secure', 'sel',
-            'selection', 'selectmode', 'sessionoptions', 'sft',
-            'sh', 'shcf', 'shell', 'shellcmdflag', 'shellpipe',
-            'shellquote', 'shellredir', 'shellslash',
-            'shelltemp', 'shelltype', 'shellxquote', 'shiftround',
-            'shiftwidth', 'shm', 'shortmess', 'shortname',
-            'showbreak', 'showcmd', 'showfulltag', 'showmatch',
-            'showmode', 'showtabline', 'shq', 'si', 'sidescroll',
-            'sidescrolloff', 'siso', 'sj', 'slm', 'sm', 'smartcase',
-            'smartindent', 'smarttab', 'smc', 'smd', 'sn',
-            'so', 'softtabstop', 'sol', 'sp', 'spc', 'spell',
-            'spellcapcheck', 'spellfile', 'spelllang',
-            'spf', 'spl', 'splitbelow', 'splitright', 'spr',
-            'sps', 'sr', 'srr', 'ss', 'ssl', 'ssop', 'st', 'sta',
-            'stal', 'startofline', 'statusline', 'stl', 'stmp',
-            'sts', 'su', 'sua', 'suffixes', 'suffixesadd', 'sw',
-            'swapfile', 'swapsync', 'swb', 'swf', 'switchbuf',
-            'sws', 'sxq', 'syn', 'synmaxcol', 'ta',
-            'tabline', 'tabpagemax', 'tabstop', 'tag',
-            'tagbsearch', 'taglength', 'tagrelative', 'tags', 'tagstack',
-            'tal', 'tb', 'tbi', 'tbidi', 'tbis', 'tbs',
-            'tenc', 'term', 'termbidi', 'termencoding', 'terse',
-            'textauto', 'textmode', 'textwidth', 'tf', 'tgst',
-            'thesaurus', 'tildeop', 'timeout', 'timeoutlen',
-            'title', 'titlelen', 'titleold', 'titlestring',
-            'tl', 'tm', 'to', 'toolbar', 'toolbariconsize', 'top',
-            'tpm', 'ts', 'tsl', 'tsr', 'ttimeout',
-            'ttimeoutlen', 'ttm', 'tty', 'ttybuiltin', 'ttyfast', 'ttym',
-            'ttymouse', 'ttyscroll', 'ttytype', 'tw', 'tx', 'uc',
-            'ul', 'undolevels', 'updatecount', 'updatetime', 'ut',
-            'vb', 'vbs', 'vdir', 've', 'verbose', 'verbosefile',
-            'vfile', 'vi', 'viewdir', 'viewoptions', 'viminfo',
-            'virtualedit', 'visualbell', 'vop', 'wa', 'wak',
-            'warn', 'wb', 'wc', 'wcm', 'wd', 'weirdinvert', 'wfh',
-            'wfw', /*'wh',*/ 'whichwrap', 'wi', 'wig', 'wildchar',
-            'wildcharm', 'wildignore', 'wildmenu',
-            'wildmode', 'wildoptions', 'wim', 'winaltkeys', 'window',
-            'winfixheight', 'winfixwidth', 'winheight',
-            'winminheight', 'winminwidth', 'winwidth', 'wiv',
-            'wiw', 'wm', 'wmh', 'wmnu', 'wmw', 'wop', 'wrap',
-            'wrapmargin', 'wrapscan', 'write', 'writeany',
-            'writebackup', 'writedelay', 'ws', 'ww'
-            ),
-        3 => array(
-            'BufAdd', 'BufCreate', 'BufDelete', 'BufEnter', 'BufFilePost',
-            'BufFilePre', 'BufHidden', 'BufLeave', 'BufNew', 'BufNewFile',
-            'BufRead', 'BufReadCmd', 'BufReadPost', 'BufReadPre',
-            'BufUnload', 'BufWinEnter', 'BufWinLeave', 'BufWipeout',
-            'BufWrite', 'BufWriteCmd', 'BufWritePost', 'BufWritePre',
-            'Cmd-event', 'CmdwinEnter', 'CmdwinLeave', 'ColorScheme',
-            'CursorHold', 'CursorHoldI', 'CursorMoved', 'CursorMovedI',
-            'EncodingChanged', 'FileAppendCmd', 'FileAppendPost',
-            'FileAppendPre', 'FileChangedRO', 'FileChangedShell',
-            'FileChangedShellPost', 'FileEncoding', 'FileReadCmd',
-            'FileReadPost', 'FileReadPre', 'FileType',
-            'FileWriteCmd', 'FileWritePost', 'FileWritePre',
-            'FilterReadPost', 'FilterReadPre', 'FilterWritePost',
-            'FilterWritePre', 'FocusGained', 'FocusLost', 'FuncUndefined',
-            'GUIEnter', 'GUIFailed', 'InsertChange', 'InsertEnter',
-            'InsertLeave', 'MenuPopup', 'QuickFixCmdPost',
-            'QuickFixCmdPre', 'RemoteReply', 'SessionLoadPost',
-            'ShellCmdPost', 'ShellFilterPost', 'SourceCmd',
-            'SourcePre', 'SpellFileMissing', 'StdinReadPost',
-            'StdinReadPre', 'SwapExists', 'Syntax', 'TabEnter',
-            'TabLeave', 'TermChanged', 'TermResponse', 'User',
-            'UserGettingBored', 'VimEnter', 'VimLeave', 'VimLeavePre',
-            'VimResized', 'WinEnter', 'WinLeave', 'abs', 'add', 'append',
-            'argc', 'argidx', 'argv', 'atan', 'browse', 'browsedir',
-            'bufexists', 'buflisted', 'bufloaded', 'bufname', 'bufnr',
-            'bufwinnr', 'byte2line', 'byteidx', 'ceil', 'changenr',
-            'char2nr', 'cindent', 'clearmatches', 'col', 'complete',
-            'complete_add', 'complete_check', 'copy',
-            'cos', 'count', 'cscope_connection', 'cursor', 'deepcopy',
-            'delete', 'did_filetype', 'diff_filler', 'diff_hlID',
-            'empty', 'escape', 'eval', 'eventhandler', 'executable',
-            'exists', 'expand', 'extend', 'feedkeys', 'filereadable',
-            'filewritable', 'filter', 'finddir', 'findfile', 'float2nr',
-            'floor', 'fnameescape', 'fnamemodify', 'foldclosed',
-            'foldclosedend', 'foldlevel', 'foldtext', 'foldtextresult',
-            'foreground', 'garbagecollect', 'get', 'getbufline',
-            'getbufvar', 'getchar', 'getcharmod', 'getcmdline',
-            'getcmdpos', 'getcmdtype', 'getcwd', 'getfontname',
-            'getfperm', 'getfsize', 'getftime', 'getftype', 'getline',
-            'getloclist', 'getmatches', 'getpid', 'getpos', 'getqflist',
-            'getreg', 'getregtype', 'gettabwinvar', 'getwinposx',
-            'getwinposy', 'getwinvar', 'glob', 'globpath', 'has',
-            'has_key', 'haslocaldir', 'hasmapto', 'histadd', 'histdel',
-            'histget', 'histnr', 'hlID', 'hlexists', 'hostname', 'iconv',
-            'indent', 'index', 'input', 'inputdialog', 'inputlist',
-            'inputrestore', 'inputsave', 'inputsecret', 'insert',
-            'isdirectory', 'islocked', 'items', 'join', 'keys', 'len',
-            'libcall', 'libcallnr', 'line', 'line2byte', 'lispindent',
-            'localtime', 'log10', 'maparg', 'mapcheck', 'matchadd',
-            'matcharg', 'matchdelete', 'matchend', 'matchlist',
-            'matchstr', 'max', 'min', 'mkdir', 'mode', 'nextnonblank',
-            'nr2char', 'off', 'on', 'pathshorten', 'plugin', 'pow',
-            'prevnonblank', 'printf', 'pumvisible', 'range', 'readfile',
-            'reltime', 'reltimestr', 'remote_expr', 'remote_foreground',
-            'remote_peek', 'remote_read', 'remote_send', 'remove',
-            'rename', 'repeat', 'resolve', 'reverse', 'round', 'search',
-            'searchdecl', 'searchpair', 'searchpairpos', 'searchpos',
-            'server2client', 'serverlist', 'setbufvar', 'setcmdpos',
-            'setline', 'setloclist', 'setmatches', 'setpos', 'setqflist',
-            'setreg', 'settabwinvar', 'setwinvar', 'shellescape',
-            'simplify', 'sin', 'sort', 'soundfold', 'spellbadword',
-            'spellsuggest', 'split', 'sqrt', 'str2float', 'str2nr',
-            'strftime', 'stridx', 'string', 'strlen', 'strpart',
-            'strridx', 'strtrans', 'submatch', 'substitute',
-            'synID', 'synIDattr', 'synIDtrans', 'synstack', 'system',
-            'tabpagebuflist', 'tabpagenr', 'tabpagewinnr', 'tagfiles',
-            'taglist', 'tempname', 'tolower', 'toupper', 'trunc',
-            'type', 'values', 'virtcol', 'visualmode', 'winbufnr',
-            'wincol', 'winline', 'winnr', 'winrestcmd',
-            'winrestview', 'winsaveview', 'writefile'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>',
-        '^', '-', '+', '~', '?', ':', '$', '@', '.'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'STYLES' => array(
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-//            2 => 'color: #009966; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => ''
-            ),
-        'KEYWORDS' => array(
-            1 => 'color: #804040;',
-            2 => 'color: #668080;',
-            3 => 'color: #25BB4D;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #000000;',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000; font-weight:bold;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'STRINGS' => array(
-            0 => 'color: #C5A22D;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false, //Save some time as OO identifiers aren't used
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(),
-    'HIGHLIGHT_STRICT_BLOCK' => array()
-);
-
-?>
diff --git a/inc/geshi/visualfoxpro.php b/inc/geshi/visualfoxpro.php
deleted file mode 100644
index 123a3db41..000000000
--- a/inc/geshi/visualfoxpro.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-/*************************************************************************************
- * visualfoxpro.php
- * ----------------
- * Author: Roberto Armellin (r.armellin@tin.it)
- * Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/09/17
- *
- * Visual FoxPro language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *  -  Removed tab as a symbol char
- * 2004/11/27 (1.0.1)
- *  -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/10/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Visual Fox Pro',
-    'COMMENT_SINGLE' => array(1 => "//", 2 => "\n*"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'Case', 'Else', '#Else', 'Then',
-            'Endcase', 'Enddefine', 'Enddo', 'Endfor', 'Endfunc', 'Endif', 'Endprintjob',
-            'Endproc', 'Endscan', 'Endtext', 'Endwith', '#Endif',
-            '#Elif','#Define','#If','#Include',
-            '#Itsexpression','#Readclauses','#Region','#Section','#Undef','#Wname',
-            'Define','Do',
-            'For','Function','Hidden',
-            'If','Local','Lparameter','Lparameters','Next','Otherwise',
-            'Parameters','Printjob','Procedure','Protected','Public','Scan',
-            'Text','While','With','Abs','Accept','Access','Aclass','Acopy',
-            'Acos','Adatabases','Adbobjects','Addbs','Addrelationtoenv','Addtabletoenv',
-            'Adel','Adir','Aelement','Aerror','Afields','Afont',
-            'Agetclass','Agetfileversion','Ains','Ainstance','Alen','Align',
-            'Alines','Alltrim','Alter','Amembers','Amouseobj','Anetresources',
-            'Ansitooem','Append','Aprinters','Ascan','Aselobj','Asin',
-            'Asort','Assert','Asserts','Assist','Asubscript','Asynchronous',
-            'At_c','Atan','Atc','Atcc','Atcline','Atline',
-            'Atn2','Aused','Autoform','Autoreport','Avcxclasses','Average',
-            'BarCount','BarPrompt','BatchMode','BatchUpdateCount','Begin','BellSound',
-            'BinToC','Bitand','Bitclear','Bitlshift','Bitnot',
-            'Bitor','Bitrshift','Bitset','Bittest','Bitxor','Bof',
-            'Browse','BrowseRefresh','Buffering','BuilderLock','COMArray','COMReturnError',
-            'CToBin','Calculate','Call','Capslock','Cd','Cdow',
-            'Ceiling','Central','Change','Char','Chdir','Chr',
-            'Chrsaw','Chrtran','Chrtranc','Close','Cmonth','Cntbar',
-            'Cntpad','Col','Comclassinfo','CommandTargetQuery','Compile','Completed',
-            'Compobj','Compute','Concat','ConnectBusy','ConnectHandle','ConnectName',
-            'ConnectString','ConnectTimeOut','ContainerReleaseType','Continue','Copy','Cos',
-            'Cot','Count','Coverage','Cpconvert','Cpcurrent','Cpdbf',
-            'Cpnotrans','Create','CreateBinary','Createobject','Createobjectex','Createoffline',
-            'CrsBuffering','CrsFetchMemo','CrsFetchSize','CrsMaxRows','CrsMethodUsed','CrsNumBatch',
-            'CrsShareConnection','CrsUseMemoSize','CrsWhereClause','Ctod','Ctot',
-            'Curdate','Curdir','CurrLeft','CurrSymbol','CursorGetProp','CursorSetProp',
-            'Curtime','Curval','DBGetProp','DBSetProp','DB_BufLockRow','DB_BufLockTable',
-            'DB_BufOff','DB_BufOptRow','DB_BufOptTable','DB_Complette','DB_DeleteInsert','DB_KeyAndModified',
-            'DB_KeyAndTimestamp','DB_KeyAndUpdatable','DB_LocalSQL','DB_NoPrompt','DB_Prompt','DB_RemoteSQL',
-            'DB_TransAuto','DB_TransManual','DB_TransNone','DB_Update','Datetime','Day',
-            'Dayname','Dayofmonth','Dayofweek','Dayofyear','Dbalias','Dbused',
-            'Ddeaborttrans','Ddeadvise','Ddeenabled','Ddeexecute','Ddeinitiate','Ddelasterror',
-            'Ddepoke','Dderequest','Ddesetoption','Ddesetservice','Ddesettopic','Ddeterminate',
-            'Debugout','Declare','DefOLELCid','DefaultValue','Defaultext','Degrees',
-            'DeleteTrigger','Desc','Description','Difference','Dimension','Dir',
-            'Directory','Diskspace','DispLogin','DispWarnings','Display','Dll',
-            'Dmy','DoDefault','DoEvents','Doc','Dow',
-            'Drivetype','Drop','Dropoffline','Dtoc','Dtor','Dtos',
-            'Dtot','DynamicInputMask','Each','Edit','Eject','Elif',
-            'End','Eof','Erase','Evaluate','Event','Eventtracking',
-            'Exclude','Exclusive','Exit','Exp','Export','External',
-            'FDate','FTime','Fchsize','Fclose','Fcount','Fcreate',
-            'Feof','Ferror','FetchMemo','FetchSize','Fflush','Fgets',
-            'Filer','Filetostr','Find','Fklabel','Fkmax','Fldlist',
-            'Flock','Floor','Flush','Fontmetric','Fopen','Forceext',
-            'Forcepath','FormSetClass','FormSetLib','FormsClass','FormsLib','Found',
-            'FoxPro','Foxcode','Foxdoc','Foxgen','Foxgraph','Foxview',
-            'Fputs','Fread','French','Fseek','Fsize','Fv',
-            'Fwrite','Gather','German','GetPem','Getbar','Getcolor',
-            'Getcp','Getdir','Getenv','Getexpr','Getfile','Getfldstate',
-            'Getfont','Gethost','Getnextmodified','Getobject','Getpad','Getpict',
-            'Getprinter','Go','Gomonth','Goto','Graph','GridHorz',
-            'GridShow','GridShowPos','GridSnap','GridVert','Help','HelpOn',
-            'HelpTo','HighLightRow','Home','Hour','IMEStatus','IdleTimeOut',
-            'Idxcollate','Ifdef','Ifndef','Iif','Import','Include',
-            'Indbc','Index','Indexseek','Inkey','Inlist','Input',
-            'Insert','InsertTrigger','Insmode','IsBlank','IsFLocked','IsLeadByte',
-            'IsMouse','IsNull','IsRLocked','Isalpha','Iscolor','Isdigit',
-            'IsExclusive','Ishosted','IsLower','IsReadOnly',
-            'IsUpper','Italian','Japan','Join','Justdrive','Justext',
-            'Justfname','Justpath','Juststem','KeyField','KeyFieldList','Keyboard'
-            ),
-        2 => array('Keymatch','LastProject','Lastkey','Lcase','Leftc','Len',
-            'Lenc','Length','Likec','Lineno','LoadPicture',
-            'Locate','Locfile','Log','Log10','Logout','Lookup',
-            'Loop','Lower','Ltrim','Lupdate','Mail','MaxRecords',
-            'Mcol','Md','Mdown','Mdx','Mdy','Memlines',
-            'Menu','Messagebox','Minute','Mkdir','Mline','Modify',
-            'Month','Monthname','Mouse','Mrkbar','Mrkpad','Mrow',
-            'Mtdll','Mton','Mwindow','Native','Ndx','Network',
-            'NoFilter','Nodefault','Normalize','Note','Now','Ntom',
-            'NullString','Numlock','Nvl','ODBChdbc','ODBChstmt','OLEDropTextInsertion',
-            'OLELCid','Objnum','Objref','Objtoclient','Objvar','Occurs',
-            'Oemtoansi','Oldval','OlePublic','Olereturnerror','On','Open',
-            'Oracle','Order','Os','Outer','PCount','Pack',
-            'PacketSize','Padc','Padl','Padr','Payment','Pcol',
-            'PemStatus','Pi','Pivot','Play','Pop','Popup',
-            'Power','PrimaryKey','Printstatus','Private','Prmbar','Prmpad',
-            'ProjectClick','Proper','Prow','Prtinfo','Push','Putfile',
-            'Pv','Qpr','Quater','QueryTimeOut','Quit','Radians',
-            'Rand','Rat','Ratc','Ratline','Rd','Rdlevel',
-            'Read','Readkey','Recall','Reccount','RecentlyUsedFiles','Recno',
-            'Recsize','Regional','Reindex','RelatedChild','RelatedTable','RelatedTag',
-            'Remove','Rename','Repeat','Replace','Replicate','Report',
-            'ResHeight','ResWidth','ResourceOn','ResourceTo','Resources','Restore',
-            'Resume','Retry','Return','Revertoffline','Rgbscheme','Rightc',
-            'Rlock','Rmdir','Rollback','Round','Rtod','Rtrim',
-            'RuleExpression','RuleText','Run','Runscript','Rview','SQLAsynchronous',
-            'SQLBatchMode','SQLCancel','SQLColumns','SQLConnect','SQLConnectTimeOut','SQLDisconnect',
-            'SQLDispLogin','SQLDispWarnings','SQLExec','SQLGetProp','SQLIdleTimeOut','SQLMoreResults',
-            'SQLPrepare','SQLQueryTimeOut','SQLSetProp','SQLTables','SQLTransactions','SQLWaitTime',
-            'Save','SavePicture','ScaleUnits','Scatter','Scols',
-            'Scroll','Sec','Second','Seek','Select','SendUpdates',
-            'Set','SetDefault','Setfldstate','Setup','ShareConnection','ShowOLEControls',
-            'ShowOLEInsertable','ShowVCXs','Sign','Sin','Size','SizeBox',
-            'Skpbar','Skppad','Sort','Soundex','SourceName','Sqlcommit',
-            'Sqll','Sqlrollback','Sqlstringconnect','Sqrt','Srows','StatusBar',
-            'Store','Str','Strconv','Strtofile','Strtran','Stuff',
-            'Stuffc','Substr','Substrc','Substring','Sum','Suspend',
-            'Sys','Sysmetric','TabOrdering','Table','TableRefresh','Tablerevert',
-            'Tableupdate','TagCount','TagNo','Tan','Target','This',
-            'Thisform','Thisformset','Timestamp','Timestampdiff','Total','Transactions',
-            'Transform','Trim','Truncate','Ttoc','Ttod','Txnlevel',
-            'Txtwidth','Type','Ucase','Undefine','Unlock','Unpack',
-            'Updatable','UpdatableFieldList','Update','UpdateName','UpdateNameList','UpdateTrigger',
-            'UpdateType','Updated','Upper','Upsizing','Usa','Use',
-            'UseMemoSize','Used','Val','Validate','Varread','Vartype',
-            'Version','VersionLanguage','Wait','WaitTime','Wborder','Wchild',
-            'Wcols','Week','Wexist','Wfont','WhereType','Windcmd',
-            'Windhelp','Windmemo','Windmenu','Windmodify','Windquery','Windscreen',
-            'Windsnip','Windstproc','WizardPrompt','Wlast','Wlcol','Wlrow',
-            'Wmaximum','Wminimum','Wontop','Woutput','Wparent','Wread',
-            'Wrows','Wtitle','Wvisible','Year','Zap','_Alignment',
-            '_Asciicols','_Asciirows','_Assist','_Beautify','_Box','_Browser',
-            '_Builder','_Calcmem','_Calcvalue','_Cliptext','_Converter','_Coverage',
-            '_Curobj','_Dblclick','_Diarydate','_Dos','_Foxdoc','_Foxgraph',
-            '_Gallery','_Gengraph','_Genhtml','_Genmenu','_Genpd','_Genscrn',
-            '_Genxtab','_Getexpr','_Include','_Indent','_Lmargin','_Mac',
-            '_Mbr_appnd','_Mbr_cpart','_Mbr_delet','_Mbr_font','_Mbr_goto','_Mbr_grid',
-            '_Mbr_link','_Mbr_mode','_Mbr_mvfld','_Mbr_mvprt','_Mbr_seek','_Mbr_sp100',
-            '_Mbr_sp200','_Mbr_szfld','_Mbrowse','_Mda_appnd','_Mda_avg','_Mda_brow',
-            '_Mda_calc','_Mda_copy','_Mda_count','_Mda_label','_Mda_pack','_Mda_reprt',
-            '_Mda_rindx','_Mda_setup','_Mda_sort','_Mda_sp100','_Mda_sp200','_Mda_sp300',
-            '_Mda_sum','_Mda_total','_Mdata','_Mdiary','_Med_clear','_Med_copy',
-            '_Med_cut','_Med_cvtst','_Med_find','_Med_finda','_Med_goto','_Med_insob',
-            '_Med_link','_Med_obj','_Med_paste','_Med_pref','_Med_pstlk','_Med_redo',
-            '_Med_repl','_Med_repla','_Med_slcta','_Med_sp100','_Med_sp200','_Med_sp300',
-            '_Med_sp400','_Med_sp500','_Med_undo','_Medit','_Mfi_clall','_Mfi_close',
-            '_Mfi_export','_Mfi_import','_Mfi_new','_Mfi_open','_Mfi_pgset','_Mfi_prevu',
-            '_Mfi_print','_Mfi_quit','_Mfi_revrt','_Mfi_savas','_Mfi_save','_Mfi_send',
-            '_Mfi_setup','_Mfi_sp100','_Mfi_sp200','_Mfi_sp300','_Mfi_sp400','_Mfile',
-            '_Mfiler','_Mfirst','_Mlabel','_Mlast','_Mline','_Mmacro',
-            '_Mmbldr','_Mpr_beaut','_Mpr_cancl','_Mpr_compl','_Mpr_do','_Mpr_docum',
-            '_Mpr_formwz','_Mpr_gener','_Mpr_graph','_Mpr_resum','_Mpr_sp100','_Mpr_sp200',
-            '_Mpr_sp300','_Mpr_suspend','_Mprog','_Mproj','_Mrc_appnd','_Mrc_chnge',
-            '_Mrc_cont','_Mrc_delet','_Mrc_goto','_Mrc_locat','_Mrc_recal','_Mrc_repl',
-            '_Mrc_seek','_Mrc_sp100','_Mrc_sp200','_Mrecord','_Mreport','_Mrqbe',
-            '_Mscreen','_Msm_data','_Msm_edit','_Msm_file','_Msm_format','_Msm_prog',
-            '_Msm_recrd','_Msm_systm','_Msm_text','_Msm_tools','_Msm_view','_Msm_windo',
-            '_Mst_about','_Mst_ascii','_Mst_calcu','_Mst_captr','_Mst_dbase','_Mst_diary',
-            '_Mst_filer','_Mst_help','_Mst_hphow','_Mst_hpsch','_Mst_macro','_Mst_office',
-            '_Mst_puzzl','_Mst_sp100','_Mst_sp200','_Mst_sp300','_Mst_specl','_Msysmenu',
-            '_Msystem','_Mtable','_Mtb_appnd','_Mtb_cpart','_Mtb_delet','_Mtb_delrc',
-            '_Mtb_goto','_Mtb_link','_Mtb_mvfld','_Mtb_mvprt','_Mtb_props','_Mtb_recal',
-            '_Mtb_sp100','_Mtb_sp200','_Mtb_sp300','_Mtb_sp400','_Mtb_szfld','_Mwi_arran',
-            '_Mwi_clear','_Mwi_cmd','_Mwi_color','_Mwi_debug','_Mwi_hide','_Mwi_hidea',
-            '_Mwi_min','_Mwi_move','_Mwi_rotat','_Mwi_showa','_Mwi_size','_Mwi_sp100',
-            '_Mwi_sp200','_Mwi_toolb','_Mwi_trace','_Mwi_view','_Mwi_zoom','_Mwindow',
-            '_Mwizards','_Mwz_all','_Mwz_form','_Mwz_foxdoc','_Mwz_import','_Mwz_label',
-            '_Mwz_mail','_Mwz_pivot','_Mwz_query','_Mwz_reprt','_Mwz_setup','_Mwz_table',
-            '_Mwz_upsizing','_Netware','_Oracle','_Padvance','_Pageno','_Pbpage',
-            '_Pcolno','_Pcopies','_Pdparms','_Pdriver','_Pdsetup','_Pecode',
-            '_Peject','_Pepage','_Pform','_Plength','_Plineno','_Ploffset',
-            '_Ppitch','_Pquality','_Pretext','_Pscode','_Pspacing','_Pwait',
-            '_Rmargin','_Runactivedoc','_Samples','_Screen','_Shell','_Spellchk',
-            '_Sqlserver','_Startup','_Tabs','_Tally','_Text','_Throttle',
-            '_Transport','_Triggerlevel','_Unix','_WebDevOnly','_WebMenu','_WebMsftHomePage',
-            '_WebVFPHomePage','_WebVfpOnlineSupport','_Windows','_Wizard','_Wrap','_scctext',
-            '_vfp','Additive','After','Again','Aindent','Alignright',
-            'All','Alt','Alternate','And','Ansi','Any',
-            'Aplabout','App','Array','As','Asc','Ascending',
-            'Ascii','At','Attributes','Automatic','Autosave','Avg',
-            'Bar','Before','Bell','Between','Bitmap','Blank',
-            'Blink','Blocksize','Border','Bottom','Brstatus','Bucket',
-            'Buffers','By','Candidate','Carry','Cascade','Catalog',
-            'Cdx','Center','Century','Cga','Character','Check',
-            'Classlib','Clock','Cnt','Codepage','Collate','Color',
-            'Com1','Com2','Command','Compact','Compatible','Compress',
-            'Confirm','Connection','Connections','Connstring','Console','Copies',
-            'Cpcompile','Cpdialog','Csv','Currency','Cycle','Databases',
-            'Datasource','Date','Db4','Dbc','Dbf','Dbmemo3',
-            'Debug','Decimals','Defaultsource','Deletetables','Delimited','Delimiters',
-            'Descending','Design','Development','Device','Dif','Disabled',
-            'Distinct','Dlls','Dohistory','Dos','Dosmem','Double',
-            'Driver','Duplex','Echo','Editwork','Ega25','Ega43',
-            'Ems','Ems64','Encrypt','Encryption','Environment','Escape',
-            'Events','Exact','Except','Exe','Exists','Expression',
-            'Extended','F','Fdow','Fetch','Field','Fields',
-            'File','Files','Fill','Fixed','Float','Foldconst',
-            'Font','Footer','Force','Foreign','Fox2x','Foxplus',
-            'Free','Freeze','From','Fullpath','Fw2','Fweek',
-            'Get','Gets','Global','Group','Grow','Halfheight',
-            'Having','Heading','Headings','Helpfilter','History','Hmemory',
-            'Hours','Id','In','Indexes','Information','Instruct',
-            'Int','Integer','Intensity','Intersect','Into','Is',
-            'Isometric','Key','Keycolumns','Keycomp','Keyset','Last',
-            'Ledit','Level','Library','Like','Linked','Lock',
-            'Logerrors','Long','Lpartition','Mac','Macdesktop','Machelp',
-            'Mackey','Macros','Mark','Master','Max','Maxmem',
-            'Mdi','Memlimit','Memory','Memos','Memowidth','Memvar',
-            'Menus','Messages','Middle','Min','Minimize','Minus',
-            'Mod','Modal','Module','Mono43','Movers','Multilocks',
-            'Mvarsiz','Mvcount','N','Near','Negotiate','Noalias',
-            'Noappend','Noclear','Noclose','Noconsole','Nocptrans','Nodata',
-            'Nodebug','Nodelete','Nodup','Noedit','Noeject','Noenvironment',
-            'Nofloat','Nofollow','Nogrow','Noinit','Nolgrid','Nolink',
-            'Nolock','Nomargin','Nomdi','Nomenu','Nominimize','Nomodify'
-            ),
-        3 => array('Nomouse','None','Nooptimize','Nooverwrite','Noprojecthook','Noprompt',
-            'Noread','Norefresh','Norequery','Norgrid','Norm','Normal',
-            'Nosave','Noshadow','Noshow','Nospace','Not','Notab',
-            'Notify','Noupdate','Novalidate','Noverify','Nowait','Nowindow',
-            'Nowrap','Nozoom','Npv','Null','Number','Objects',
-            'Odometer','Of','Off','Oleobjects','Only','Optimize',
-            'Or','Orientation','Output','Outshow','Overlay','Overwrite',
-            'Pad','Palette','Paperlength','Papersize','Paperwidth','Password',
-            'Path','Pattern','Pause','Pdox','Pdsetup','Pen',
-            'Pfs','Pixels','Plain','Popups','Precision','Preference',
-            'Preview','Primary','Printer','Printquality','Procedures','Production',
-            'Program','Progwork','Project','Prompt','Query','Random',
-            'Range','Readborder','Readerror','Record','Recover','Redit',
-            'Reference','References','Relative','Remote','Reprocess','Resource',
-            'Rest','Restrict','Rgb','Right','Row','Rowset',
-            'Rpd','Runtime','Safety','Same','Sample','Say',
-            'Scale','Scheme','Scoreboard','Screen','Sdf','Seconds',
-            'Selection','Shadows','Shared','Sheet','Shell','Shift',
-            'Shutdown','Single','Some','Sortwork','Space','Sql',
-            'Standalone','Status','Std','Step','Sticky','String',
-            'Structure','Subclass','Summary','Sylk','Sysformats','Sysmenus',
-            'System','T','Tab','Tables','Talk','Tedit',
-            'Textmerge','Time','Timeout','Titles','Tmpfiles','To',
-            'Topic','Transaction','Trap','Trbetween','Trigger','Ttoption',
-            'Typeahead','Udfparms','Union','Unique','Userid','Users',
-            'Values','Var','Verb','Vga25','Vga50','Views',
-            'Volume','Where','Windows','Wk1','Wk3','Wks',
-            'Workarea','Wp','Wr1','Wrap','Wrk','Xcmdfile',
-            'Xl5','Xl8','Xls','Y','Yresolution','Zoom',
-            'Activate','ActivateCell','Add','AddColumn','AddItem','AddListItem',
-            'AddObject','AddProperty','AddToSCC','AfterBuild','AfterCloseTables','AfterDock',
-            'AfterRowColChange','BeforeBuild','BeforeDock','BeforeOpenTables','BeforeRowColChange','Box',
-            'Build','CheckIn','CheckOut','Circle','Clear','ClearData',
-            'Cleanup','Click','CloneObject','CloseEditor','CloseTables','Cls',
-            'CommandTargetExec','CommandTargetQueryStas','ContainerRelease','DataToClip','DblClick','Deactivate',
-            'Delete','DeleteColumn','Deleted','Destroy','DoCmd','Dock',
-            'DoScroll','DoVerb','DownClick','Drag','DragDrop','DragOver',
-            'DropDown','Draw','EnterFocus','Error','ErrorMessage','Eval',
-            'ExitFocus','FormatChange','GetData','GetFormat','GetLatestVersion','GoBack',
-            'GotFocus','GoForward','GridHitTest','Hide','HideDoc','IndexToItemId',
-            'Init','InteractiveChange','Item','ItemIdToIndex','KeyPress','Line',
-            'Load','LostFocus','Message','MiddleClick','MouseDown','MouseMove',
-            'MouseUp','MouseWheel','Move','Moved','NavigateTo','Newobject',
-            'OLECompleteDrag','OLEDrag','OLEDragDrop','OLEDragOver','OLEGiveFeedback','OLESetData',
-            'OLEStartDrag','OpenEditor','OpenTables','Paint','Point','Print',
-            'ProgrammaticChange','PSet','QueryAddFile','QueryModifyFile','QueryRemoveFile','QueryRunFile',
-            'QueryUnload','RangeHigh','RangeLow','ReadActivate','ReadExpression','ReadDeactivate',
-            'ReadMethod','ReadShow','ReadValid','ReadWhen','Refresh','Release',
-            'RemoveFromSCC','RemoveItem','RemoveListItem','RemoveObject','Requery','RequestData',
-            'Reset','ResetToDefault','Resize','RightClick','SaveAs','SaveAsClass',
-            'Scrolled','SetAll','SetData','SetFocus','SetFormat','SetMain',
-            'SetVar','SetViewPort','ShowDoc','ShowWhatsThis','TextHeight','TextWidth',
-            'Timer','UIEnable','UnDock','UndoCheckOut','Unload','UpClick',
-            'Valid','WhatsThisMode','When','WriteExpression','WriteMethod','ZOrder',
-            'ATGetColors','ATListColors','Accelerate','ActiveColumn','ActiveControl','ActiveForm',
-            'ActiveObjectId','ActivePage','ActiveProject','ActiveRow','AddLineFeeds','Alias',
-            'Alignment','AllowAddNew','AllowHeaderSizing','AllowResize','AllowRowSizing','AllowTabs',
-            'AlwaysOnTop','Application','AutoActivate','AutoCenter','AutoCloseTables','AutoIncrement',
-            'AutoOpenTables','AutoRelease','AutoSize','AutoVerbMenu','AutoYield','AvailNum',
-            'BackColor','BackStyle','BaseClass','BorderColor','BorderStyle','BorderWidth',
-            'Bound','BoundColumn','BoundTo','BrowseAlignment','BrowseCellMarg','BrowseDestWidth',
-            'BufferMode','BufferModeOverride','BuildDateTime','ButtonCount','ButtonIndex','Buttons',
-            'CLSID','CanAccelerate','CanGetFocus','CanLoseFocus','Cancel','Caption',
-            'ChildAlias','ChildOrder','Class','ClassLibrary','ClipControls','ClipRect',
-            'Closable','ColorScheme','ColorSource','ColumnCount','ColumnHeaders','ColumnLines',
-            'ColumnOrder','ColumnWidths','Columns','Comment','ContinuousScroll','ControlBox',
-            'ControlCount','ControlIndex','ControlSource','Controls','CurrentControl','CurrentX',
-            'CurrentY','CursorSource','Curvature','DataSession','DataSessionId','DataSourceObj',
-            'DataType','Database','DateFormat','DateMark','DefButton','DefButtonOrig',
-            'DefHeight','DefLeft','DefTop','DefWidth','Default','DefaultFilePath',
-            'DefineWindows','DeleteMark','Desktop','Dirty','DisabledBackColor','DisabledByEOF',
-            'DisabledForeColor','DisabledItemBackColor','DisabledItemForeColor','DisabledPicture','DispPageHeight','DispPageWidth',
-            'DisplayCount','DisplayValue','DoCreate','DockPosition','Docked','DocumentFile',
-            'DownPicture','DragIcon','DragMode','DragState','DrawMode','DrawStyle',
-            'DrawWidth','DynamicAlignment','DynamicBackColor','DynamicCurrentControl','DynamicFontBold','DynamicFontItalic',
-            'DynamicFontName','DynamicFontOutline','DynamicFontShadow','DynamicFontSize','DynamicFontStrikethru','DynamicFontUnderline',
-            'DynamicForeColor','EditFlags','Enabled','EnabledByReadLock','Encrypted','EnvLevel',
-            'ErasePage','FileClass','FileClassLibrary','FillColor','FillStyle','Filter',
-            'FirstElement','FontBold','FontItalic','FontName','FontOutline','FontShadow',
-            'FontSize','FontStrikethru','FontUnderline','ForceFocus','ForeColor','FormCount',
-            'FormIndex','FormPageCount','FormPageIndex','Format','Forms','FoxFont',
-            'FullName','GoFirst','GoLast','GridLineColor','GridLineWidth','GridLines'
-            ),
-        4 => array('HPROJ','HWnd','HalfHeightCaption','HasClip','HeaderGap','HeaderHeight',
-            'Height','HelpContextID','HideSelection','Highlight','HomeDir','HostName',
-            'HotKey','HscrollSmallChange','IMEMode','Icon','IgnoreInsert','InResize',
-            'Increment','IncrementalSearch','InitialSelectedAlias','InputMask','Instancing','IntegralHeight',
-            'Interval','ItemBackColor','ItemData','ItemForeColor','ItemIDData','ItemTips',
-            'JustReadLocked','KeyPreview','KeyboardHighValue','KeyboardLowValue','LastModified','Left',
-            'LeftColumn','LineSlant','LinkMaster','List','ListCount','ListIndex',
-            'ListItem','ListItemId','LockDataSource','LockScreen','MDIForm','MainClass',
-            'MainFile','Margin','MaxButton','MaxHeight','MaxLeft','MaxLength',
-            'MaxTop','MaxWidth','MemoWindow','MinButton','MinHeight','MinWidth',
-            'MouseIcon','MousePointer','Movable','MoverBars','MultiSelect','Name',
-            'NapTime','NewIndex','NewItemId','NoDataOnLoad','NoDefine','NotifyContainer',
-            'NullDisplay','NumberOfElements','OLEDragMode','OLEDragPicture','OLEDropEffects','OLEDropHasData',
-            'OLEDropMode','OLERequestPendingTimeOut','OLEServerBusyRaiseError','OLEServerBusyTimeOut','OLETypeAllowed','OleClass',
-            'OleClassId','OleControlContainer','OleIDispInValue','OleIDispOutValue','OleIDispatchIncoming','OleIDispatchOutgoing',
-            'OnResize','OneToMany','OpenViews','OpenWindow','PageCount','PageHeight',
-            'PageOrder','PageWidth','Pages','Panel','PanelLink','Parent',
-            'ParentAlias','ParentClass','Partition','PasswordChar','Picture','ProcessID',
-            'ProgID','ProjectHookClass','ProjectHookLibrary','Projects','ReadColors','ReadCycle',
-            'ReadFiller','ReadLock','ReadMouse','ReadOnly','ReadSave','ReadSize',
-            'ReadTimeout','RecordMark','RecordSource','RecordSourceType','Rect','RelationalExpr',
-            'RelativeColumn','RelativeRow','ReleaseErase','ReleaseType','ReleaseWindows','Resizable',
-            'RightToLeft','RowHeight','RowSource','RowSourceType','SCCProvider','SCCStatus',
-            'SDIForm','ScaleMode','ScrollBars','SelLength','SelStart','SelText',
-            'SelectOnEntry','Selected','SelectedBackColor','SelectedForeColor','SelectedID','SelectedItemBackColor',
-            'SelectedItemForeColor','SelfEdit','ServerClass','ServerClassLibrary','ServerHelpFile','ServerName',
-            'ServerProject','ShowTips','ShowWindow','Sizable','Size<height>','Size<maxlength>',
-            'Size<width>','Skip','SkipForm','Sorted','SourceType','Sparse',
-            'SpecialEffect','SpinnerHighValue','SpinnerLowValue','SplitBar','StartMode','StatusBarText',
-            'Stretch','StrictDateEntry','Style','SystemRefCount','TabIndex','TabStop',
-            'TabStretch','TabStyle','Tabhit','Tabs','Tag','TerminateRead',
-            'ThreadID','TitleBar','ToolTipText','Top','TopIndex','TopItemId',
-            'TypeLibCLSID','TypeLibDesc','TypeLibName','UnlockDataSource','Value','ValueDirty',
-            'VersionComments','VersionCompany','VersionCopyright','VersionDescription','VersionNumber','VersionProduct',
-            'VersionTrademarks','View','ViewPortHeight','ViewPortLeft','ViewPortTop','ViewPortWidth',
-            'Visible','VscrollSmallChange','WasActive','WasOpen','WhatsThisButton','WhatsThisHelp',
-            'WhatsThisHelpID','Width','WindowList','WindowNTIList','WindowState','WindowType',
-            'WordWrap','ZOrderSet','ActiveDoc','Checkbox','Column','ComboBox',
-            'CommandButton','CommandGroup','Container','Control','Cursor','Custom',
-            'DataEnvironment','EditBox','Empty','FontClass','Form','Formset',
-            'General','Grid','Header','HyperLink','Image','Label',
-            'ListBox','Memo','OleBaseControl','OleBoundControl','OleClassIDispOut','OleControl',
-            'OptionButton','OptionGroup','Page','PageFrame','ProjectHook','RectClass',
-            'Relation','Session','Shape','Spinner','TextBox' ,'Toolbar'
-            ),
-        ),
-    'SYMBOLS' => array(
-        "!", "@", "$", "%",
-        "(", ")", "{", "}", "[", "]",
-        "-", "+", "*", "/",
-        "=", "<", ">",
-        ":", ";", ",", ".", "&",
-        "?", "??", "???"
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: blue;',
-            2 => 'color: blue;',
-            3 => 'color: blue;',
-            4 => 'color: blue;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: green; font-style: italic;',
-            2 => 'color: green; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: blue;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: blue;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/visualprolog.php b/inc/geshi/visualprolog.php
deleted file mode 100644
index d36f1c67a..000000000
--- a/inc/geshi/visualprolog.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/*************************************************************************************
- * visualprolog.php
- * ----------
- * Author: Thomas Linder Puls (puls@pdc.dk)
- * Copyright: (c) 2008 Thomas Linder Puls (puls@pdc.dk)
- * Release Version: 1.0.8.11
- * Date Started: 2008/11/20
- *
- * Visual Prolog language file for GeSHi.
- *
- * CHANGES
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Visual Prolog',
-    'COMMENT_SINGLE' => array(1 => '%'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'HARDQUOTE' => array('@"', '"'),
-    'HARDESCAPE' => array('""'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            'clauses','constants','constructors','delegate','domains','facts',
-            'goal','guards','inherits','monitor','namespace','open',
-            'predicates','properties','resolve','supports'
-            ),
-        2 => array(
-            'align','and','anyflow','as','bitsize','catch','determ','digits',
-            'div','do','else','elseif','erroneous','externally','failure',
-            'finally','from','language','mod','multi','nondeterm','or',
-            'procedure','quot','rem','single','then','to'
-            ),
-        3 => array(
-            '#bininclude','#else','#elseif','#endif','#error','#export',
-            '#externally','#if','#import','#include','#message','#options',
-            '#orrequires','#requires','#then','#warning'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '+', '-', '*', '?', '=', '/', '>', '<', '^', '!', ':', '(', ')', '{', '}', '[', ']'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => true,
-        2 => true,
-        3 => true
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #808000;',
-            2 => 'color: #333399;',
-            3 => 'color: #800080;',
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #AA77BD',
-            'MULTI' => 'color: #AA77BD'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #008080;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #00B7B7;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #0000FF;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #000000;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #008000;',
-            1 => 'color: #808000;',
-            2 => 'color: #333399;',
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => ':',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        0 => "(?<![a-zA-Z0-9_])(?!(?:PIPE|SEMI)>)[A-Z_]\w*(?!\w)",
-        1 => "\\b(end\\s+)?(implement|class|interface)\\b",
-        2 => "\\b(end\\s+)?(foreach|if|try)\\b",
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/whitespace.php b/inc/geshi/whitespace.php
deleted file mode 100644
index 58f396376..000000000
--- a/inc/geshi/whitespace.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/*************************************************************************************
- * whitespace.php
- * ----------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2009/10/31
- *
- * Whitespace language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/10/31 (1.0.8.1)
- *   -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-$language_data = array (
-    'LANG_NAME' => 'Whitespace',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        3 => "/[^\n\x20\x09]+/s"
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            3 => 'color: #666666; font-style: italic;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            2 => 'background-color: #FF9999;',
-            3 => 'background-color: #9999FF;'
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        2 => array(
-            GESHI_SEARCH => "(?<!\\A)\x20",
-            GESHI_REPLACE => "&#32;",
-            GESHI_MODIFIERS => 's',
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            ),
-        3 => array(
-            GESHI_SEARCH => "\x09",
-            GESHI_REPLACE => "&#9;",
-            GESHI_MODIFIERS => 's',
-            GESHI_BEFORE => "",
-            GESHI_AFTER => ""
-            ),
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'KEYWORDS' => GESHI_NEVER,
-            'SYMBOLS' => GESHI_NEVER,
-            'STRINGS' => GESHI_NEVER,
-//            'REGEXPS' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER
-            )
-        )
-);
-
-?>
diff --git a/inc/geshi/whois.php b/inc/geshi/whois.php
deleted file mode 100644
index a89e4731d..000000000
--- a/inc/geshi/whois.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/*************************************************************************************
- * whois.php
- * --------
- * Author: Benny Baumann (BenBE@geshi.org)
- * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2008/09/14
- *
- * Whois response (RPSL format) language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/09/14 (1.0.0)
- *  -  First Release
- *
- * TODO
- * ----
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Whois (RPSL format)',
-    'COMMENT_SINGLE' => array(1 => '% ', 2 => '%ERROR:'),
-    'COMMENT_MULTI' => array(),
-    'COMMENT_REGEXP' => array(
-        //Description
-        3 => '/(?:(?<=^remarks:)|(?<=^descr:))(.|\n\s)*$/mi',
-
-        //Contact Details
-        4 => '/(?<=^address:)(.|\n\s)*$/mi',
-        5 => '/\+\d+(?:(?:\s\(\d+(\s\d+)*\))?(?:\s\d+)+|-\d+-\d+)/',
-        6 => '/\b(?!-|\.)[\w\-\.]+(?!-|\.)@((?!-)[\w\-]+\.)+\w+\b/',
-
-        //IP, Networks and AS information\links
-        7 => '/\b(?<!\.|\-)(?:[\da-f:]+(?!\.)|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?:\/1?\d\d?)?(?<!\.|\-)\b/',
-        8 => '/\bAS\d+\b/'
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array(),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array( //Object Types
-            'as-block','as-set','aut-num','domain','filter-set','inet-rtr',
-            'inet6num','inetnum','irt','key-cert','limerick','mntner',
-            'organisation','peering-set','person','poem','role','route-set',
-            'route','route6','rtr-set'
-            ),
-        2 => array( //Field Types
-            'abuse-mailbox','address','admin-c','aggr-bndry','aggr-mtd','alias',
-            'as-block','as-name','as-set','aut-num','auth','author','certif',
-            'changed','components','country','default','descr','dom-net',
-            'domain','ds-rdata','e-mail','encryption','export','export-comps',
-            'fax-no','filter','filter-set','fingerpr','form','holes','ifaddr',
-            'import','inet-rtr','inet6num','inetnum','inject','interface','irt',
-            'irt-nfy','key-cert','limerick','local-as','mbrs-by-ref',
-            'member-of','members','method','mnt-by','mnt-domains','mnt-irt',
-            'mnt-lower','mnt-nfy','mnt-ref','mnt-routes','mntner','mp-default',
-            'mp-export','mp-filter','mp-import','mp-members','mp-peer',
-            'mp-peering','netname','nic-hdl','notify','nserver','org',
-            'org-name','org-type','organisation','origin','owner','peer',
-            'peering','peering-set','person','phone','poem','ref-nfy','refer',
-            'referral-by','remarks','rev-srv','role','route','route-set',
-            'route6','rtr-set','signature','source','status','sub-dom','tech-c',
-            'text','upd-to','zone-c'
-            ),
-        3 => array( //RPSL reserved
-            'accept','action','and','announce','any','as-any','at','atomic',
-            'except','from','inbound','into','networks','not','or','outbound',
-            'peeras','refine','rs-any','to'
-            )
-        ),
-    'SYMBOLS' => array(
-        ':'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000FF; font-weight: bold;',
-            2 => 'color: #000080; font-weight: bold;',
-            3 => 'color: #990000; font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #666666; font-style: italic;',
-            2 => 'color: #666666; font-style: italic;',
-            3 => 'color: #404080;',
-            4 => 'color: #408040;',
-            5 => 'color: #408040;',
-            6 => 'color: #408040;',
-            7 => 'color: #804040;',
-            8 => 'color: #804040;',
-            'MULTI' => 'color: #666666; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;',
-            'HARD' => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #009900;'
-            ),
-        'STRINGS' => array(
-            0 => '',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000080;',
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #0000FF;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000088;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.irr.net/docs/rpsl.html'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Variables
-        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4,
-    'PARSER_CONTROL' => array(
-        'KEYWORDS' => array(
-            1 => array(
-                'DISALLOWED_BEFORE' => '(?<=\A |\A \n(?m:^)|\n\n(?m:^))'
-                ),
-            2 => array(
-                'DISALLOWED_BEFORE' => '(?m:^)'
-                )
-            ),
-        'ENABLE_FLAGS' => array(
-            'BRACKETS' => GESHI_NEVER,
-            'SYMBOLS' => GESHI_NEVER,
-            'BRACKETS' => GESHI_NEVER,
-            'STRINGS' => GESHI_NEVER,
-            'ESCAPE_CHAR' => GESHI_NEVER,
-            'NUMBERS' => GESHI_NEVER,
-            'METHODS' => GESHI_NEVER,
-            'SCRIPT' => GESHI_NEVER
-            )
-        ),
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/winbatch.php b/inc/geshi/winbatch.php
deleted file mode 100644
index 3599a027c..000000000
--- a/inc/geshi/winbatch.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-/*************************************************************************************
- * winbatch.php
- * ------------
- * Author: Craig Storey (storey.craig@gmail.com)
- * Copyright: (c) 2004 Craig Storey (craig.xcottawa.ca)
- * Release Version: 1.0.8.11
- * Date Started: 2006/05/19
- *
- * WinBatch language file for GeSHi.
- *
- * WinBatch is a Windows scripting language - www.winbatch.com.
- * The keywords were pulled from the winbatch/system/WIL.clr file for v2005G.
- * Not all extender functions are added, but a very large set of the most common.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2006/05/05 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2004/07/14)
- * -------------------------
- * - Right now any ':Subroutine' is treated as a comment. This highlights the
- *   Subroutine's name, but it's not a perfect fix. I should use a RegEx in
- *   GeSHI_Search&Replace features..
- * - Update the list of extender functions.
- * - Use a regular expression to comment UDFs that start with 'udf_'.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Winbatch',
-    'COMMENT_SINGLE' => array(1 => ';', 2 => ':'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"', '`'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'While', 'To', 'Then', 'Switch', 'Select', 'Return', 'Next', 'IntControl', 'Include', 'In', 'If',
-            'Goto', 'GoSub', 'ForEach', 'For', 'Exit', 'Execute', 'ErrorMode', 'EndWhile', 'EndSwitch', '#EndSubRoutine',
-            'EndSelect', 'EndIf', '#EEndFunction', 'EndFor', 'End', 'Else', 'DropWild', 'Drop', '#DefineSubRoutine',
-            '#DefineFunction', 'Debug', 'Continue', 'Case', 'CallExt', 'Call', 'By', 'BreakPoint', 'Break'
-            ),
-        2 => array(
-            'ZOOMED', 'YES', 'WORD4', 'WORD2', 'WORD1', 'WHOLESECTION', 'WAIT', 'UNSORTED', 'UNCHECK', 'TRUE', 'TILE',
-            'TAB', 'STRING', 'STACK', 'SPC2NET', 'SORTED', 'SOK', 'SNET2PC', 'SINGLE', 'SHIFT', 'SERVER', 'SERRWINSOCK',
-            'SERRVOICE', 'SERRSOCKET', 'SERRSERVICE', 'SERRSELECT', 'SERRPARAM', 'SERROUTOFMEM', 'SERRNOTFOUND', 'SERRNOCONN',
-            'SERRNOANSWER', 'SERRMUSTWAIT', 'SERRIPADDR', 'SERRHOSTNAME', 'SERRFAILURE', 'SERRBUSY', 'SCROLLLOCK', 'SCANCEL',
-            'SAVE', 'SALREADY', 'ROWS', 'REGUSERS', 'REGROOT', 'REGMACHINE', 'REGCURRENT', 'REGCLASSES', 'RDBLCLICK', 'RCLICK',
-            'RBUTTON', 'RAD2DEG', 'QSUCCESSINFO', 'QSUCCESS', 'QSTILLEX', 'QROLLBACK', 'QNULL', 'QNODATA', 'QNEXT', 'QNEEDDATA',
-            'QFIRST', 'QCOMMIT', 'QBADHANDLE', 'PRINTER', 'PLANCKJOULES', 'PLANCKERGS', 'PI', 'PARSEONLY', 'PARSEC', 'P3ERRREPLY',
-            'OPEN', 'ON', 'OFF', 'NUMLOCK', 'NOWAIT', 'NOTIFY', 'NORMAL', 'NORESIZE', 'NONE', 'NO', 'NCSAFORMAT', 'MULTIPLE',
-            'MSFORMAT', 'MPLAYRDBLCK', 'MPLAYRCLK', 'MPLAYRBUTTON', 'MPLAYMDBLCK', 'MPLAYMCLK', 'MPLAYMBUTTON', 'MPLAYLDBLCK',
-            'MPLAYLCLK', 'MPLAYLBUTTON', 'MINOR', 'MDBLCLICK', 'MCLICK', 'MBYESNO', 'MBUTTON', 'MBOKCANCEL', 'MAJOR', 'MAGFIELD',
-            'LOCALGROUP', 'LIGHTMTPS', 'LIGHTMPS', 'LF', 'LDBLCLICK', 'LCLICK', 'LBUTTON', 'LAFFDBERROR', 'ICON', 'HTTPS', 'HTTP',
-            'HNOHEADER', 'HMETHODPOST', 'HMETHODGET', 'HIDDEN', 'HHEADERONLY', 'HHEADER', 'GRAVITATION', 'GOPHER', 'GOLDENRATIO',
-            'GMTSEC', 'GLOBALGROUP', 'GFTSEC', 'GETPROCID', 'GETEXITCODE', 'FWDSCAN', 'FTPPASSIVE', 'FTP', 'FLOAT8', 'FARADAY',
-            'FALSE', 'EXTENDED', 'EULERS', 'ENABLE', 'ELECTRIC', 'DRIVE', 'DISABLE', 'DESCENDING', 'DEG2RAD', 'DEFAULT', 'CTRL',
-            'CRLF', 'CR', 'COMMONFORMAT', 'COLUMNS', 'CHECK', 'CAPSLOCK', 'CANCEL', 'BOLTZMANN', 'BACKSCAN', 'AVOGADRO', 'ATTR_X',
-            'ATTR_T', 'ATTR_SY', 'ATTR_SH', 'ATTR_RO', 'ATTR_RI', 'ATTR_P', 'ATTR_IC', 'ATTR_H', 'ATTR_DM', 'ATTR_DI', 'ATTR_DC',
-            'ATTR_CI', 'ATTR_A', 'ASCENDING', 'ARRANGE', 'AMC', 'ACC_WRITE', 'ACC_READ_NT', 'ACC_READ_95', 'ACC_READ', 'ACC_PRINT_NT',
-            'ACC_PMANG_NT', 'ACC_PFULL_NT', 'ACC_LIST', 'ACC_FULL_NT', 'ACC_FULL_95', 'ACC_DELETE', 'ACC_CREATE', 'ACC_CONTROL',
-            'ACC_CHNG_NT', 'ACC_ATTRIB', 'ABOVEICONS'
-            ),
-        3 => array(
-            'Yields', 'Yield', 'WinZoom', 'WinWaitExist', 'WinWaitClose', 'WinWaitChild', 'WinVersion', 'WinTitle', 'WinSysInfo',
-            'WinState', 'WinShow', 'WinResources', 'WinPositionChild', 'WinPosition', 'WinPlaceSet', 'WinPlaceGet', 'WinPlaceChild',
-            'WinPlace', 'WinParmSet', 'WinParmGet', 'WinName', 'WinMetrics', 'WinItemProcId', 'WinItemNameId', 'WinItemizeEx',
-            'WinItemize', 'WinItemChild', 'WinIsDos', 'WinIdGet', 'WinIconize', 'WinHide', 'WinHelp', 'WinGetactive', 'WinExistchild',
-            'WinExist', 'WinExename', 'WinConfig', 'WinClosenot', 'WinClose', 'WinArrange', 'WinActivechild', 'WinActivchild',
-            'WinActivate', 'WebVerifyCard', 'WebSetTimeout', 'WebParamSize', 'WebParamNames', 'WebParamFile', 'WebParamData',
-            'WebParamBuf', 'WebOutFile', 'WebOutBinary', 'WebOut', 'WebDumpError', 'WebDatData', 'WebCounter', 'WebConSize', 'WebConData',
-            'WebConBuf', 'WebCmdData', 'WebBaseConv', 'Wallpaper', 'WaitForKeyEX', 'WaitForKey', 'VersionDLL', 'Version', 'VarType',
-            'TimeYmdHms', 'TimeWait', 'TimeSubtract', 'TimeJulToYmd', 'TimeJulianDay', 'TimeDiffSecs', 'TimeDiffDays', 'TimeDiff', 'TimeDelay',
-            'TimeDate', 'TimeAdd', 'TextSelect', 'TextBoxSort', 'TextBox', 'Terminate', 'Tanh', 'Tan', 'SysParamInfo', 'SvcWaitForCmd',
-            'SvcSetState', 'SvcSetAccept', 'StrUpper', 'StrTrim', 'StrSubWild', 'StrSub', 'StrScan', 'StrReplace', 'StrLower', 'StrLenWild',
-            'StrLen', 'StrIndexWild', 'StrIndexNC', 'StrIndex', 'StriCmp', 'StrFixLeft', 'StrFixCharsL', 'StrFixChars', 'StrFix', 'StrFill',
-            'StrCnt', 'StrCmp', 'StrClean', 'StrCharCount', 'StrCat', 'StrByteCount', 'Sqrt', 'SoundVolume', 'Sounds', 'Snapshot', 'Sinh', 'Sin',
-            'ShortCutMake', 'ShortCutInfo', 'ShortCutExtra', 'ShortCutEdit', 'ShortCutDir', 'ShellExecute', 'SendMenusToEx', 'SendMenusTo',
-            'SendKeysTo', 'SendKeysChild', 'SendKey', 'RunZoomWait', 'RunZoom', 'RunWithLogon', 'RunWait', 'RunShell', 'RunIconWait',
-            'RunIcon', 'RunHideWait', 'RunHide', 'RunExit', 'RunEnviron', 'Run', 'RtStatus', 'Reload', 'RegUnloadHive', 'RegSetValue',
-            'RegSetQword', 'RegSetMulSz', 'RegSetExpSz', 'RegSetEx', 'RegSetDword', 'RegSetBin', 'RegQueryValue', 'RegQueryStr',
-            'RegQueryQword', 'RegQueryMulSz', 'RegQueryKeys', 'RegQueryKeyLastWriteTime', 'RegQueryKey', 'RegQueryItem', 'RegQueryExpSz',
-            'RegQueryEx', 'RegQueryDword', 'RegQueryBin', 'RegOpenKeyEx', 'RegOpenKey', 'RegOpenFlags', 'RegLoadHive', 'RegExistValue',
-            'RegExistKey', 'RegEntryType', 'RegDelValue', 'RegDeleteKey', 'RegCreateKey', 'RegConnect', 'RegCloseKey', 'RegApp', 'Random',
-            'PtrPersistent', 'PtrGlobalDefine', 'PtrGlobal', 'Print', 'PlayWaveform', 'PlayMidi', 'PlayMedia', 'PipeServerWrite', 'PipeServerRead',
-            'PipeServerCreate', 'PipeServerClose', 'PipeInfo', 'PipeClientSendRecvData', 'PipeClientOpen', 'PipeClientClose', 'Pause',
-            'ParseData', 'ObjectTypeGet', 'ObjectType', 'ObjectOpen', 'ObjectGet', 'ObjectEventRemove', 'ObjectEventAdd',
-            'ObjectCreate', 'ObjectConstToArray', 'ObjectConstantsGet', 'ObjectCollectionOpen', 'ObjectCollectionNext',
-            'ObjectCollectionClose', 'ObjectClose', 'ObjectAccess', 'Num2Char', 'NetInfo', 'MsgTextGet', 'MousePlay', 'MouseMove', 'MouseInfo',
-            'MouseDrag', 'MouseCoords', 'MouseClickBtn', 'MouseClick', 'mod', 'Min', 'Message', 'Max', 'Loge', 'LogDisk', 'Log10', 'LastError',
-            'KeyToggleSet', 'KeyToggleGet', 'ItemSortNc', 'ItemSort', 'ItemSelect', 'ItemReplace', 'ItemRemove', 'ItemLocate', 'ItemInsert',
-            'ItemExtractCSV', 'ItemExtract', 'ItemCountCSV', 'ItemCount', 'IsNumber', 'IsLicensed', 'IsKeyDown', 'IsInt', 'IsFloat', 'IsDefined',
-            'Int', 'InstallFile', 'IniWritePvt', 'IniWrite', 'IniReadPvt', 'IniRead', 'IniItemizePvt', 'IniItemize', 'IniDeletePvt', 'IniDelete',
-            'IgnoreInput', 'IconReplace', 'IconInfo', 'IconExtract', 'IconArrange', 'GetTickCount', 'GetObject', 'GetExactTime', 'Floor',
-            'FindWindow', 'FileYmdHms', 'FileWrite', 'FileVerInfo', 'FileTimeTouch', 'FileTimeSetEx', 'FileTimeSet', 'FileTimeGetEx',
-            'FileTimeGet', 'FileTimeCode', 'FileSizeEx', 'FileSize', 'FileRoot', 'FileRename', 'FileRead', 'FilePutW', 'FilePut', 'FilePath',
-            'FileOpen', 'FileNameShort', 'FileNameLong', 'FileNameEval2', 'FileNameEval1', 'FileMoveAttr', 'FileMove', 'FileMapName',
-            'FileLocate', 'FileItemPath', 'FileItemize', 'FileInfoToArray', 'FileGetW', 'FileGet', 'FileFullname', 'FileExtension', 'FileExist',
-            'FileDelete', 'FileCreateTemp', 'FileCopyAttr', 'FileCopy', 'FileCompare', 'FileClose', 'FileBaseName', 'FileAttrSetEx',
-            'FileAttrSet', 'FileAttrGetEx', 'FileAttrGet', 'FileAppend', 'Fabs', 'ExtractAttachedFile', 'Exp', 'ExeTypeInfo', 'Exclusive',
-            'EnvItemize', 'EnvironSet', 'Environment', 'EndSession', 'DosVersion', 'DllLoad', 'DllLastError', 'DllHwnd', 'DllHinst',
-            'DllFree', 'DllCallCDecl', 'DllCall', 'Display', 'DiskVolinfo', 'DiskSize', 'DiskScan', 'DiskInfo', 'DiskFree', 'DiskExist',
-            'DirWindows', 'DirSize', 'DirScript', 'DirRename', 'DirRemove', 'DirMake', 'DirItemize', 'DirInfoToArray', 'DirHome', 'DirGet',
-            'DirExist', 'DirChange', 'DirAttrSetEx', 'DirAttrSet', 'DirAttrGetEx', 'DirAttrGet', 'DialogProcOptions', 'DialogObject',
-            'DialogControlState', 'DialogControlSet', 'DialogControlGet', 'DialogBox', 'Dialog', 'Delay', 'Decimals', 'DebugTrace',
-            'DebugData', 'DDETimeout', 'DDETerminate', 'DDERequest', 'DDEPoke', 'DDEInitiate', 'DDEExecute', 'DateTime', 'CurrFilepath',
-            'CurrentPath', 'CurrentFile', 'CreateObject', 'Cosh', 'Cos', 'ClipPut', 'ClipHasFormat', 'ClipGetEx', 'ClipGet', 'ClipAppend',
-            'ChrUnicodeToString', 'ChrUnicodeToHex', 'ChrStringToUnicode', 'ChrSetCodepage', 'ChrHexToUnicode', 'ChrGetCodepage',
-            'Char2Num', 'Ceiling', 'ButtonNames', 'BoxUpdates', 'BoxTitle', 'BoxTextFont', 'BoxTextColor', 'BoxText', 'BoxShut', 'BoxPen',
-            'BoxOpen', 'BoxNew', 'BoxMapmode', 'BoxesUp', 'BoxDrawText', 'BoxDrawRect', 'BoxDrawLine', 'BoxDrawCircle', 'BoxDestroy',
-            'BoxDataTag', 'BoxDataClear', 'BoxColor', 'BoxCaption', 'BoxButtonWait', 'BoxButtonStat', 'BoxButtonKill', 'BoxButtonDraw',
-            'BoxBitMap', 'BinaryXor', 'BinaryXlate', 'BinaryWriteEx', 'BinaryWrite', 'BinaryTagRepl', 'BinaryTagLen', 'BinaryTagInit',
-            'BinaryTagIndex', 'BinaryTagFind', 'BinaryTagExtr', 'BinaryStrCnt', 'BinarySort', 'BinaryReplace', 'BinaryReadEx',
-            'BinaryRead', 'BinaryPokeStrW', 'BinaryPokeStr', 'BinaryPokeHex', 'BinaryPokeFlt', 'BinaryPoke4', 'BinaryPoke2', 'BinaryPoke',
-            'BinaryPeekStrW', 'BinaryPeekStr', 'BinaryPeekHex', 'BinaryPeekFlt', 'BinaryPeek4', 'BinaryPeek2', 'BinaryPeek', 'BinaryOr',
-            'BinaryOleType', 'BinaryIndexNc', 'BinaryIndexEx', 'BinaryIndexBin', 'BinaryIndex', 'BinaryIncrFlt', 'BinaryIncr4',
-            'BinaryIncr2', 'BinaryIncr', 'BinaryHashRec', 'BinaryFree', 'BinaryEodSet', 'BinaryEodGet', 'BinaryCopy', 'BinaryConvert',
-            'BinaryCompare', 'BinaryClipPut', 'BinaryClipGet', 'BinaryChecksum', 'BinaryBufInfo', 'BinaryAnd', 'BinaryAllocArray',
-            'BinaryAlloc', 'Beep', 'Average', 'Atan', 'AskYesNo', 'AskTextbox', 'AskPassword', 'AskLine', 'AskItemlist', 'AskFont',
-            'AskFiletext', 'AskFilename', 'AskDirectory', 'AskColor', 'Asin', 'ArrInitialize', 'ArrInfo', 'ArrDimension',
-            'Arrayize', 'ArrayFilePutCSV', 'ArrayFilePut', 'ArrayFileGetCSV', 'ArrayFileGet', 'AppWaitClose', 'AppExist', 'AddExtender',
-            'Acos', 'Abs', 'About'
-            ),
-        4 => array(
-            'zZipFiles', 'zVersionInfo', 'zVersion', 'zUnZipFiles', 'zSetPortBit', 'zRPortShift', 'zPortOut', 'zPortIn', 'zNotPortBit',
-            'zLPortShift', 'zGetPortBit', 'zClrPortBit', 'xVerifyCCard', 'xSendMessage', 'xMessageBox', 'xMemCompact', 'xHex', 'xGetElapsed',
-            'xGetChildHwnd', 'xExtenderInfo', 'xEnumStreams', 'xEjectMedia', 'xDriveReady', 'xDiskLabelGet', 'xCursorSet', 'xBaseConvert',
-            'wxPing', 'wxParmSet', 'wxParmGet', 'wxMsgSetHdr', 'wxMsgGetHdr', 'wxMsgGetBody', 'wxHost2Addr', 'wxGetLastErr', 'wxGetInfo',
-            'wxGetErrDesc', 'wxAddr2Host', 'wtsWaitSystemEvent', 'wtsVersion', 'wtsTerminateProcess', 'wtsShutdownSystem', 'wtsSendMessage',
-            'wtsQuerySessionInfo', 'wtsProcIdToSessId', 'wtsLogoffSession', 'wtsLastErrMsg', 'wtsIsTSEnabled', 'wtsIsCitrixEnabled',
-            'wtsGetActiveConsoleSessId', 'wtsEnumSessions', 'wtsEnumProcesses', 'wtsDisconnectSession', 'wnWrkGroups', 'wnVersion', 'wntWtsUserSet',
-            'wntWtsUserGet', 'wntVersion', 'wntUserSidChk', 'wntUserSetDat', 'wntUserRename', 'wntUserProps', 'wntUserList', 'wntUserInfo',
-            'wntUserGetDat', 'wntUserFiles', 'wntUserExist', 'wntUserDel', 'wntUserAddDat', 'wntUserAdd', 'wntSvcStatus', 'wntSvcStart',
-            'wntSvcList', 'wntSvcDelete', 'wntSvcCreate', 'wntSvcControl', 'wntSvcCfgSet', 'wntSvcCfgGet', 'wntShutdown', 'wntShareUsers',
-            'wntShareSet', 'wntShareList', 'wntShareInfo', 'wntShareDel', 'wntShareAdd', 'wntServiceInf', 'wntServiceAt', 'wntServerType',
-            'wntServerList', 'wntServerInfo', 'wntSecurityGet', 'wntRunAsUser', 'wntResources2', 'wntResources', 'wntRemoteTime', 'wntRasUserSet',
-            'wntRasUserGet', 'wntProfileInfo', 'wntProfileDel', 'wntPrivUsers', 'wntPrivList', 'wntPrivGet', 'wntPrivDel', 'wntPrivAdd',
-            'wntOwnerSet', 'wntOwnerGet', 'wntMemberSet', 'wntMemberLst2', 'wntMemberList', 'wntMemberGrps', 'wntMemberGet', 'wntMemberDel',
-            'wntLsaPolSet', 'wntLsaPolGet', 'wntListGroups', 'wntLastErrMsg', 'wntGroupRen', 'wntGroupInfo', 'wntGroupEdit', 'wntGroupDel',
-            'wntGroupAdd', 'wntGetUser', 'wntGetDrive', 'wntGetDc', 'wntGetCon', 'wntFileUsers', 'wntFilesOpen', 'wntFileClose', 'wntEventWrite',
-            'wntEventLog', 'wntDomainSync', 'wntDirDialog', 'wntDfsList', 'wntDfsGetInfo', 'wntCurrUsers', 'wntChgPswd', 'wntCancelCon',
-            'wntAuditMod', 'wntAuditList', 'wntAuditGet', 'wntAuditDel', 'wntAuditAdd2', 'wntAuditAdd', 'wntAddPrinter', 'wntAddDrive',
-            'wntAcctPolSet', 'wntAcctPolGet', 'wntAcctList', 'wntAcctInfo', 'wntAccessMod', 'wntAccessList', 'wntAccessGet', 'wntAccessDel',
-            'wntaccessadd2', 'wntAccessAdd', 'wnShares', 'wnSharePath', 'wnShareName', 'wnShareCnt', 'wnServers', 'wnRestore', 'wnNetNames',
-            'wnGetUser', 'wnGetCon', 'wnGetCaps', 'wnDlgShare', 'wnDlgNoShare', 'wnDlgDiscon', 'wnDlgCon4', 'wnDlgCon3', 'wnDlgCon2', 'wnDlgCon',
-            'wnDlgBrowse', 'wnDialog', 'wnCmptrInfo', 'wnCancelCon', 'wnAddCon', 'WaitSRQ', 'w9xVersion', 'w9xUserSetDat', 'w9xUserRename',
-            'w9xUserprops', 'w9xUserList', 'w9xUserinfo', 'w9xUserGetDat', 'w9xUserExist', 'w9xUserDel', 'w9xUserAddDat', 'w9xUserAdd', 'w9xShareSet',
-            'w9xShareInfo', 'w9xShareDel', 'w9xShareAdd', 'w9xServiceAt', 'w9xServerList', 'w9xRemoteTime', 'w9xOwnerGet', 'w9xMemberSet',
-            'w9xMemberList', 'w9xMemberGrps', 'w9xMemberGet', 'w9xMemberDel', 'w9xListGroups', 'w9xGroupInfo', 'w9xGroupDel', 'w9xGroupAdd',
-            'w9xGetDC', 'w9xFileUsers', 'w9xAccessList', 'w9xAccessGet', 'w9xAccessDel', 'w9xAccessAdd', 'w95Version', 'w95ShareUsers',
-            'w95ShareSet', 'w95ShareList', 'w95ShareInfo', 'w95ShareDel', 'w95ShareAdd', 'w95ServiceInf', 'w95ServiceAt', 'w95ServerType',
-            'w95ServerInfo', 'w95Resources', 'w95GetUser', 'w95GetDrive', 'w95GetCon', 'w95FileUsers', 'w95FileClose', 'w95DirDialog',
-            'w95CancelCon', 'w95AddPrinter', 'w95AddDrive', 'w95AccessDel', 'w95AccessAdd', 'w3Version', 'w3PrtBrowse', 'w3NetGetUser',
-            'w3NetDialog', 'w3GetCon', 'w3GetCaps', 'w3DirBrowse', 'w3CancelCon', 'w3AddCon', 'urlGetScheme', 'urlEncode', 'urlDecode',
-            'tVersion', 'tSetPriority', 'TriggerList', 'Trigger', 'tRemoteConn', 'tOpenProc', 'tListProc', 'tListMod', 'tKillProc', 'tGetProcInfo',
-            'tGetPriority', 'tGetModInfo', 'tGetLastError', 'tGetData', 'TestSys', 'TestSRQ', 'tCountProc', 'tCompatible', 'tCloseProc',
-            'tBrowseCntrs', 'sSendString', 'sSendNum', 'sSendLine', 'sSendBinary', 'sRecvNum', 'sRecvLine', 'sRecvBinary', 'SrchVersion',
-            'SrchNext', 'SrchInit', 'SrchFree', 'sOpen', 'sOK2Send', 'sOK2Recv', 'smtpSendText', 'smtpSendFile', 'sListen', 'SetRWLS',
-            'SendSetup', 'SendLLO', 'SendList', 'SendIFC', 'SendDataBytes', 'SendCmds', 'Send', 'sConnect', 'sClose', 'SByteOrder32',
-            'sByteOrder16', 'sAccept', 'rRegVersion', 'rRegSearch', 'ResetSys', 'ReceiveSetup', 'Receive', 'ReadStsByte', 'RcvRespMsg',
-            'RasVersion', 'RasTypeSize', 'RasRename', 'RasNumCons', 'RasNameValid', 'RasListActCon', 'RasItemize', 'RasHangUp', 'RasGetLastErr',
-            'RasGetConStat', 'RasEntrySet', 'RasEntryInfo', 'RasEntryExist', 'RasEntryDel', 'RasEntryAdd', 'RasDialInfo', 'RasDial',
-            'RasCopy', 'RasConStatus', 'qVersionInfo', 'qTransact', 'qTables', 'qSpecial', 'qSetConnOpt', 'qNumRsltCol', 'qNativeSql', 'qLastCode',
-            'qGetData', 'qFreeStmt', 'qFreeEnv', 'qFreeConnect', 'qFetch', 'qExecDirect', 'qError', 'qDriverList', 'qDriverCon', 'qDisconnect',
-            'qDataSources', 'qConnect', 'qConfigError', 'qConfigData', 'qColumns', 'qBindCol', 'qAllocStmt', 'qAllocEnv', 'qAllocConnect',
-            'pWaitFor', 'pVersionInfo', 'pTimeout', 'pSetPublish', 'pSetPrtInfo', 'pSetPrtAttrib', 'pSetDefPrtEx', 'pSetDefPrt', 'pSendFile',
-            'pRecvFile', 'pPutString', 'pPutLine', 'pPutChar', 'pPutByte', 'pPutBinary', 'PPollUnconfig', 'PPollConfig', 'PPoll', 'pPeekChar',
-            'pPeekByte', 'pPaperSizes', 'pPaperBins', 'pModemSReg', 'pModemParams', 'pModemInit', 'pModemHangUp', 'pModemDial', 'pModemControl',
-            'pModemConnect', 'pModemCommand', 'pModemAnsRing', 'pModemAnsCall', 'pMediaTypes', 'pGetString', 'pGetPublish', 'pGetPrtList',
-            'pGetPrtInfo', 'pGetPrtAttrib', 'pGetLine', 'pGetLastError', 'pGetErrorMsg', 'pGetErrorCode', 'pGetDefPrtInf', 'pGetChar',
-            'pGetByte', 'pGetBinary', 'pDelPrtConn', 'pDelPrinter', 'pComOpen', 'pComModify', 'pComInfo', 'pComControl', 'pComClose',
-            'pCheckSum', 'pCheckBinary', 'pCaptureOn', 'pCaptureOff', 'pCaptureLog', 'PassControl', 'pAddPrtConn', 'pAddPrinter', 'p3RecvText',
-            'p3RecvFile', 'p3Peek', 'p3Open', 'p3GetReply', 'p3Delete', 'p3Count', 'p3Close', 'nwWhoAmI', 'nwVfyPassword', 'nwVersion',
-            'nwSrvShutdown', 'nwSrvNLMMgr', 'nwSrvGenGUID', 'nwSrvExecNCF', 'nwSetVolLimit', 'nwSetSrvParam', 'nwSetSrvInfo', 'nwSetPrimServ',
-            'nwSetPassword', 'nwSetOptions', 'nwSetFileInfo', 'nwSetDirLimit', 'nwSetDirInfo', 'nwSetContext', 'nwSetBcastMode', 'nwServerList',
-            'nwSendBcastMsg', 'nwSearchObjects', 'nwSearchFilter', 'nwRenameObject', 'nwRemoveObject', 'nwReceiveBcastMsg', 'nwNameConvert',
-            'nwMutateObject', 'nwMoveObject', 'nwModifyObject', 'nwMapDelete', 'nwMap', 'nwLogout', 'nwLogin', 'nwListUserGroups',
-            'nwListObjects', 'nwListGroupMembers', 'nwLastErrMsg', 'nwIsUserInGroup', 'nwGetVolLimit', 'nwGetSrvStats', 'nwGetSrvParam',
-            'nwGetSrvInfo', 'nwGetSrvCfg', 'nwGetOptions', 'nwGetObjValue', 'nwGetObjInfo', 'nwGetNLMInfo', 'nwGetMapped', 'nwGetFileInfo',
-            'nwGetDirLimit', 'nwGetDirInfo', 'nwGetContext', 'nwGetConnInfo', 'nwGetCapture', 'nwGetBcastMode', 'nwGetAttrInfo',
-            'nwDriveStatus', 'nwDrivePath', 'nwDetachFromServer', 'nwDelUserFromGroup', 'nwDelConnNum', 'nwCompareObject', 'nwClientInfo',
-            'nwChgPassword', 'nwAttachToServer', 'nwAddUserToGroup', 'nwAddObject', 'netVersion', 'netResources', 'netGetUser', 'netGetCon',
-            'netDirDialog', 'netCancelCon', 'netAddPrinter', 'netAddDrive', 'n4Version', 'n4UserGroups', 'n4UserGroupEx', 'n4SetPrimServ',
-            'n4SetOptions', 'n4SetContextG', 'n4SetContext', 'n4ServerList', 'n4ServerInfo', 'n4ObjSearch', 'n4ObjRename', 'n4ObjOptions',
-            'n4ObjMove', 'n4ObjGetVal', 'n4ObjectProps', 'n4ObjectList', 'n4ObjectInfo', 'n4ObjDelete', 'n4NameConvert', 'n4MsgsEndAll',
-            'n4MsgsEnd', 'n4MemberSet', 'n4MemberGet', 'n4MemberDel', 'n4MapRoot', 'n4MapDir', 'n4MapDelete', 'n4Map', 'n4LogoutTree',
-            'n4Logout', 'n4Login', 'n4GetUserName', 'n4GetUserId', 'n4GetUser', 'n4GetNetAddr', 'n4GetMapped', 'n4GetContext',
-            'n4GetConnNum', 'n4FileUsers', 'n4FileTimeGet', 'n4FileAttrSet', 'n4FileAttrGet', 'n4DriveStatus', 'n4DrivePath', 'n4DirTimeGet',
-            'n4DirAttrSet', 'n4DirAttrGet', 'n4Detach', 'n4ChgPassword', 'n4CapturePrt', 'n4CaptureGet', 'n4CaptureEnd', 'n4Attach',
-            'n3Version', 'n3UserGroups', 'n3ServerList', 'n3ServerInfo', 'n3MsgsEndAll', 'n3MsgsEnd', 'n3MemberSet', 'n3MemberGet',
-            'n3MemberDel', 'n3Maproot', 'n3Mapdir', 'n3Mapdelete', 'n3Map', 'n3Logout', 'n3GetUserId', 'n3GetUser', 'n3GetNetAddr',
-            'n3GetMapped', 'n3GetConnNum', 'n3FileTimeGet', 'n3FileAttrSet', 'n3FileAttrGet', 'n3DriveStatus', 'n3DrivePath',
-            'n3DirTimeGet', 'n3DirAttrSet', 'n3DirAttrGet', 'n3Detach', 'n3ChgPassword', 'n3CapturePrt', 'n3CaptureGet',
-            'n3CaptureEnd', 'n3Attach', 'mVersion', 'mSyncMail', 'mSendMailEx', 'mSendMail', 'mrecvmail', 'mReadNextMsg', 'mLogOn',
-            'mLogOff', 'mFindNext', 'mError', 'mCompatible', 'kVerInfo', 'kStatusInfo', 'kSendText', 'kSendFile', 'kManageImap4',
-            'kInit', 'kGetMail', 'kExtra', 'kDest', 'kDeletePop3', 'iWriteDataBuf', 'iWriteData', 'iVersion', 'IUrlOpen', 'iUrlEncode',
-            'iUrlDecode', 'iReadDataBuf', 'iReadData', 'ipVersion', 'ipPing', 'iPing', 'ipHost2Addr', 'ipGetLastErr', 'ipGetAddress',
-            'iParseURL', 'ipAddr2Host', 'iOptionSet', 'iOptionGet', 'ImgWave', 'ImgVersion', 'ImgUnsharpMask', 'ImgThreshold', 'ImgSwirl',
-            'ImgSpread', 'ImgSolarize', 'ImgShear', 'ImgSharpen', 'ImgShade', 'ImgScale', 'ImgSample', 'ImgRotate', 'ImgResize',
-            'ImgReduceNoise', 'ImgRaise', 'ImgOilPaint', 'ImgNormalize', 'ImgNegate', 'ImgMotionBlur', 'ImgModulate', 'ImgMinify',
-            'ImgMedianFilter', 'ImgMagnify', 'ImgLevel', 'ImgIsValid', 'ImgIsPalette', 'ImgIsMono', 'ImgIsGray', 'ImgInfo', 'ImgImplode',
-            'ImgGetImageType', 'ImgGetColorCount', 'ImgGaussianBlur', 'ImgGamma', 'ImgFrame', 'ImgFlop', 'ImgFlip', 'ImgEqualize',
-            'ImgEnhance', 'ImgEmboss', 'ImgCrop', 'ImgConvert', 'ImgContrast', 'ImgCompare', 'ImgColorize', 'ImgChop', 'ImgCharcoal',
-            'ImgBorder', 'ImgBlur', 'ImgAddNoise', 'iLocFindNext', 'iLocFindInit', 'iHttpOpen', 'iHttpInit', 'iHttpHeaders', 'iHttpAccept',
-            'iHostConnect', 'iHost2Addr', 'iGetResponse', 'iGetLastError', 'iGetIEVer', 'iGetConStatEx', 'iGetConState', 'iFtpRename',
-            'iFtpPut', 'iFtpOpen', 'iFtpGet', 'iFtpFindNext', 'iFtpFindInit', 'iFtpDirRemove', 'iFtpDirMake', 'iFtpDirGet', 'iFtpDirChange',
-            'iFtpDialog', 'iFtpDelete', 'iFtpCmd', 'iErrorDialog', 'iDialItemize', 'iDialHangUp', 'iDial', 'iCookieSet', 'iCookieGet',
-            'iContentURL', 'iContentFile', 'iContentData', 'iClose', 'ibWrtf', 'ibWrt', 'ibWait', 'ibVersion', 'ibUnlock', 'ibTrg',
-            'ibTmo', 'ibStop', 'ibStatus', 'ibSta', 'ibSre', 'ibSic', 'ibSad', 'ibRsv', 'ibRsp', 'ibRsc', 'ibRpp', 'ibRdf', 'ibRd',
-            'ibPpc', 'ibPoke', 'ibPct', 'ibPad', 'ibOnl', 'ibMakeAddr', 'ibLock', 'ibLoc', 'ibLn', 'ibLines', 'ibIst', 'ibInit',
-            'ibGts', 'ibGetSad', 'ibGetPad', 'ibFind', 'ibEvent', 'ibErr', 'ibEot', 'ibEos', 'iBegin', 'ibDma', 'ibDev', 'ibConfig',
-            'ibCntl', 'ibCnt', 'ibCmda', 'ibCmd', 'ibClr', 'ibCac', 'ibBna', 'ibAsk', 'iAddr2Host', 'huge_Thousands', 'huge_Subtract',
-            'huge_SetOptions', 'huge_Multiply', 'huge_GetLastError', 'huge_ExtenderInfo', 'huge_Divide', 'huge_Decimal', 'huge_Add',
-            'httpStripHTML', 'httpRecvTextF', 'httpRecvText', 'httpRecvQuery', 'httpRecvQryF', 'httpRecvFile', 'httpGetServer',
-            'httpGetQuery', 'httpGetPath', 'httpGetFile', 'httpGetDir', 'httpGetAnchor', 'httpFullPath', 'httpFirewall', 'httpAuth',
-            'ftpRename', 'ftpQuote', 'ftpPut', 'ftpOpen', 'ftpList', 'ftpGet', 'ftpFirewall', 'ftpDelete', 'ftpClose', 'ftpChDir',
-            'FindRQS', 'FindLstn', 'EnvSetVar', 'EnvPathDel', 'EnvPathChk', 'EnvPathAdd', 'EnvListVars', 'EnvGetVar', 'EnvGetInfo',
-            'EnableRemote', 'EnableLocal', 'ehllapiWait', 'ehllapiVersion', 'ehllapiUninit', 'ehllapiStopKeyIntercept', 'ehllapiStopHostNotify',
-            'ehllapiStopCloseIntercept', 'ehllapiStartKeyIntercept', 'ehllapiStartHostNotify', 'ehllapiStartCloseIntercept',
-            'ehllapiSetWindowStatus', 'ehllapiSetSessionParams', 'ehllapiSetPSWindowName', 'ehllapiSetCursorLoc', 'ehllapiSendKey',
-            'ehllapiSendFile', 'ehllapiSearchPS', 'ehllapiSearchField', 'ehllapiRunProfile', 'ehllapiResetSystem', 'ehllapiReserve',
-            'ehllapiRelease', 'ehllapiReceiveFile', 'ehllapiQuerySystem', 'ehllapiQueryPSStatus', 'ehllapiQueryHostNotify',
-            'ehllapiQueryFieldAttr', 'ehllapiQueryCursorLoc', 'ehllapiQueryCloseIntercept', 'ehllapiPostInterceptStatus',
-            'ehllapiPause', 'ehllapiLastErrMsg', 'ehllapiInit', 'ehllapiGetWindowStatus', 'ehllapiGetPSHWND', 'ehllapiGetKey',
-            'ehllapiFindFieldPos', 'ehllapiFindFieldLen', 'ehllapiDisconnectPS', 'ehllapiCvtRCToPos', 'ehllapiCvtPosToRC',
-            'ehllapiCopyTextToPS', 'ehllapiCopyTextToField', 'ehllapiCopyTextFromPS', 'ehllapiCopyTextFromField', 'ehllapiCopyOIA',
-            'ehllapiConnectPS', 'dunItemize', 'dunDisconnect', 'dunConnectEx', 'dunConnect', 'dsTestParam', 'dsSIDtoHexStr', 'dsSetSecProp',
-            'dsSetProperty', 'dsSetPassword', 'dsSetObj', 'dsSetCredentX', 'dsSetCredent', 'dsRemFromGrp', 'dsRelSecObj', 'dsMoveObj',
-            'dsIsObject', 'dsIsMemberGrp', 'dsIsContainer', 'dsGetUsersGrps', 'dsGetSecProp', 'dsGetPropName', 'dsGetProperty',
-            'dsGetPrntPath', 'dsGetPrimGrp', 'dsGetMemGrp', 'dsGetInfo', 'dsGetClass', 'dsGetChldPath', 'dsFindPath', 'dsDeleteObj',
-            'dsCreatSecObj', 'dsCreateObj', 'dsCopySecObj', 'dsAddToGrp', 'dsAclRemAce', 'dsAclOrderAce', 'dsAclGetAces', 'dsAclAddAce',
-            'DevClearList', 'DevClear', 'dbTest', 'dbSwapColumns', 'dbSort', 'dbSetRecordField', 'dbSetOptions', 'dbSetErrorReporting',
-            'dbSetEntireRecord', 'dbSetDelimiter', 'dbSave', 'dbOpen', 'dbNameColumn', 'dbMakeNewItem', 'dbInsertColumn', 'dbGetVersion',
-            'dbGetSaveStatus', 'dbGetRecordField', 'dbGetRecordCount', 'dbGetNextItem', 'dbGetLastError', 'dbGetEntireRecord',
-            'dbGetColumnType', 'dbGetColumnNumber', 'dbGetColumnName', 'dbGetColumnCount', 'dbFindRecord', 'dbExist', 'dbEasterEgg',
-            'dbDeleteRecord', 'dbDeleteColumn', 'dbDebug', 'dbCookDatabases', 'dbClose', 'dbCloneRecord', 'dbBindCol', 'cWndState',
-            'cWndinfo', 'cWndGetWndSpecName', 'cWndGetWndSpec', 'cWndexist', 'cWndByWndSpecName', 'cWndByWndSpec', 'cWndbyseq',
-            'cWndbyname', 'cWndbyid', 'cWndbyclass', 'cWinIDConvert', 'cVersionInfo', 'cVendorId', 'cSetWndText', 'cSetUpDownPos',
-            'cSetTvItem', 'cSetTrackPos', 'cSetTabItem', 'cSetLvItem', 'cSetLbItemEx', 'cSetLbItem', 'cSetIpAddr', 'cSetFocus',
-            'cSetEditText', 'cSetDtpDate', 'cSetCbItem', 'cSetCalDate', 'cSendMessage', 'cRadioButton', 'cPostMessage', 'cPostButton',
-            'cMemStat', 'cGetWndCursor', 'cGetUpDownPos', 'cGetUpDownMin', 'cGetUpDownMax', 'cGetTVItem', 'cGetTrackPos', 'cGetTrackMin',
-            'cGetTrackMax', 'cGetTbText', 'cGetSbText', 'cGetLvText', 'cGetLvSelText', 'cGetLvFocText', 'cGetLvDdtText', 'cGetLvColText',
-            'cGetLbText', 'cGetLbSelText', 'cGetLbCount', 'cGetIpAddr', 'cGetInfo', 'cGetHrText', 'cGetFocus', 'cGetEditText', 'cGetDtpDate',
-            'cGetControlImageCRC', 'cGetCBText', 'cGetCbCount', 'cGetCalDate', 'cFindByName', 'cFindByClass', 'cEnablestate', 'cDblClickItem',
-            'cCpuSupt', 'cCpuSpeed', 'cCpuIdExt', 'cCpuId', 'cCpuFeat', 'cCpuBenchmark', 'cCloneCheck', 'cClickToolbar', 'cClickButton',
-            'cClearTvItem', 'cClearLvItem', 'cClearLbAll', 'cCheckbox', 'aVersion', 'aStatusbar', 'aShellFolder', 'aMsgTimeout', 'AllSPoll',
-            'aGetLastError', 'aFileRename', 'aFileMove', 'aFileDelete', 'aFileCopy'
-            ),
-        5 => array(
-            'wWordRight', 'wWordLeft', 'wWinTile', 'wWinRestore', 'wWinNext', 'wWinMinimize', 'wWinMaximize', 'wWinCloseAll', 'wWinClose',
-            'wWinCascade', 'wWinArricons', 'wViewOutput', 'wViewOptions', 'wViewHtml', 'wUpperCase', 'wUpline', 'wUndo', 'wTopOfFile', 'wToggleIns',
-            'wTab', 'wStatusMsg', 'wStartSel', 'wSpellcheck', 'wSetProject', 'wSetPrefs', 'wSetColblk', 'wSetBookmark', 'wSelWordRight',
-            'wSelWordLeft', 'wSelUp', 'wSelTop', 'wSelRight', 'wSelPgUp', 'wSelPgDn', 'wSelLeft', 'wSelInfo', 'wSelHome', 'wSelEnd', 'wSelectAll',
-            'wSelDown', 'wSelBottom', 'wRunRebuild', 'wRunMake', 'wRunExecute', 'wRunDebug', 'wRunConfig', 'wRunCompile', 'wRunCommand', 'wRight',
-            'wRepeat', 'wRedo', 'wRecord', 'wProperties', 'wPrintDirect', 'wPrinSetup', 'wPrevError', 'wPaste', 'wPageUp', 'wPageDown', 'wNextError',
-            'wNewLine', 'wLowerCase', 'wLineCount', 'wLeft', 'wInvertCase', 'wInsString', 'wInsLine', 'wHome', 'wHelpKeyword', 'wHelpKeybrd',
-            'wHelpIndex', 'wHelpHelp', 'wHelpCmds', 'wHelpAbout', 'wGotoLine', 'wGotoCol', 'wGetWrap', 'wGetWord', 'wGetUndo', 'wGetSelstate',
-            'wGetRedo', 'wGetOutput', 'wGetModified', 'wGetLineNo', 'wGetIns', 'wGetFilename', 'wGetColNo', 'wGetChar', 'wFtpOpen', 'wFindNext',
-            'wFindInFiles', 'wFind', 'wFileSaveAs', 'wFileSave', 'wFileRevert', 'wFilePrint', 'wFilePgSetup', 'wFileOpen', 'wFileNew', 'wFileMerge',
-            'wFileList', 'wFileExit', 'wEndSel', 'wEndOfFile', 'wEnd', 'wEdWrap', 'wEdWordRight', 'wEdWordLeft', 'wEdUpLine', 'wEdUndo', 'wEdTopOfFile',
-            'wEdToggleIns', 'wEdTab', 'wEdStartSel', 'wEdSetColBlk', 'wEdSelectAll', 'wEdRight', 'wEdRedo', 'wEdPaste', 'wEdPageUp', 'wEdPageDown',
-            'wEdNewLine', 'wEdLeft', 'wEdInsString', 'wEdHome', 'wEdGoToLine', 'wEdGoToCol', 'wEdGetWord', 'wEdEndSel', 'wEdEndOfFile', 'wEdEnd',
-            'wEdDownLine', 'wEdDelete', 'wEdCutLine', 'wEdCut', 'wEdCopyLine', 'wEdCopy', 'wEdClearSel', 'wEdBackTab', 'wEdBackspace', 'wDownLine',
-            'wDelete', 'wDelButton', 'wCutMarked', 'wCutLine', 'wCutAppend', 'wCut', 'wCopyMarked', 'wCopyLine', 'wCopyAppend', 'wCopy', 'wCompile',
-            'wClearSel', 'wChange', 'wCallMacro', 'wBackTab', 'wBackspace', 'wAutoIndent', 'wAddButton', 'edWindowTile', 'edWindowRestore',
-            'edWindowNext', 'edWindowMinimize', 'edWindowMaximize', 'edWindowCloseall', 'edWindowClose', 'edWindowCascade', 'edWindowArrangeIcons',
-            'edStatusMsg', 'edSearchViewOutput', 'edSearchRepeat', 'edSearchPrevError', 'edSearchNextError', 'edSearchFind', 'edSearchChange',
-            'edRunRebuild', 'edRunMake', 'edRunExecute', 'edRunDebug', 'edRunConfigure', 'edRunCompile', 'edRunCommand', 'edRecord', 'edHelpProcedures',
-            'edHelpKeyword', 'edHelpKeyboard', 'edHelpIndex', 'edHelpHelp', 'edHelpCommands', 'edHelpAbout', 'edGetWordWrapState', 'edGetWindowName',
-            'edGetUndoState', 'edGetSelectionState', 'edGetRedoState', 'edGetModifiedStatus', 'edGetLineNumber', 'edGetInsertState', 'edGetColumnNumber',
-            'edGetChar', 'edFileSetPreferences', 'edFileSaveAs', 'edFileSave', 'edFilePrinterSetup', 'edFilePrint', 'edFilePageSetup', 'edFileOpen',
-            'edFileNew', 'edFileMerge', 'edFileList', 'edFileExit', 'edEditWrap', 'edEditWordRight', 'edEditWordLeft', 'edEditUpLine', 'edEditUndo',
-            'edEditToggleIns', 'edEditTab', 'edEditStartSelection', 'edEditSetColumnBlock', 'edEditSetBookmark', 'edEditSelectAll', 'edEditRight',
-            'edEditRedo', 'edEditPaste', 'edEditPageUp', 'edEditPageDown', 'edEditLeft', 'edEditInsertString', 'edEditGoToLine', 'edEditGoToColumn',
-            'edEditGoToBookmark', 'edEditGetCurrentWord', 'edEditEndSelection', 'edEditEndOfLine', 'edEditEndOfFile', 'edEditDownline', 'edEditDelete',
-            'edEditCutline', 'edEditCut', 'edEditCopyline', 'edEditCopy', 'edEditClearSelection', 'edEditBeginningOfLine', 'edEditBeginningOfFile',
-            'edEditBackTab', 'edEditBackspace', 'edDeleteButton', 'edAddButton'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '+', '-', '~', '$', '^', '?', '@', '%', '#', '&', '*', '|', '/', '<', '>'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
-        5 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #800080;',
-            2 => 'color: #0080FF; font-weight: bold;',
-            3 => 'color: #0000FF;',
-            4 => 'color: #FF00FF;',
-            5 => 'color: #008000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #008000; font-style: italic;',
-            2 => 'color: #FF1010; font-weight: bold;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #006600;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(),
-    'REGEXPS' => array(//Variable names
-        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/xbasic.php b/inc/geshi/xbasic.php
deleted file mode 100644
index 2edede364..000000000
--- a/inc/geshi/xbasic.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/*************************************************************************************
- * xbasic.php
- * ----------
- * Author: Jos� Gabriel Moya Yang�ela (josemoya@gmail.com)
- * Copyright: (c) 2005 Jos� Gabriel Moya Yang�ela (http://aprenderadesaprender.6te.net)
- * Release Version: 1.0.8.11
- * Date Started: 2005/11/23
- *
- * XBasic language file for GeSHi.
- *
- * CHANGES
- * -------
- *  - Removed duplicate keywords
- *  - Tabs converted in spaces.
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'XBasic',
-    'COMMENT_SINGLE' => array(1 => "'"),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'WHILE', 'UNTIL', 'TRUE', 'TO', 'THEN', 'SUB', 'STOP', 'STEP',
-            'SELECT', 'RETURN', 'PROGRAM', 'NEXT', 'LOOP', 'IFZ',
-            'IFT', 'IFF', 'IF', 'GOTO', 'GOSUB', 'FOR', 'FALSE', 'EXIT',
-            'ENDIF', 'END', 'ELSE', 'DO', 'CASE', 'ALL'
-            ),
-        2 => array(
-            'XMAKE', 'XLONGAT', 'XLONG', 'WRITE', 'VOID', 'VERSION$', 'VERSION',
-            'USHORTAT', 'USHORT', 'UNION', 'ULONGAT', 'ULONG', 'UCASE$',
-            'UBYTEAT', 'UBYTE', 'UBOUND', 'TYPE','TRIM$', 'TAB', 'SWAP',
-            'SUBADDRESS', 'SUBADDR', 'STUFF$', 'STRING', 'STRING$', 'STR$',
-            'STATIC', 'SSHORTAT', 'SSHORT', 'SPACE$', 'SMAKE', 'SLONGAT', 'SLONG',
-            'SIZE', 'SINGLEAT', 'SINGLE', 'SIGNED$', 'SIGN', 'SHELL', 'SHARED',
-            'SGN', 'SFUNCTION', 'SET', 'SEEK', 'SCOMPLEX', 'SBYTEAT', 'SBYTE',
-            'RTRIM$', 'ROTATER', 'ROTATEL', 'RJUST$', 'RINSTRI', 'RINSTR',
-            'RINCHRI', 'RINCHR', 'RIGHT$', 'REDIM', 'READ', 'RCLIP$', 'QUIT',
-            'PROGRAM$', 'PRINT', 'POF', 'OPEN', 'OCTO$', 'OCT$', 'NULL$', 'MIN',
-            'MID$', 'MAX', 'MAKE', 'LTRIM$', 'LOF', 'LJUST$', 'LIBRARY', 'LEN',
-            'LEFT$', 'LCLIP$', 'LCASE$', 'INTERNAL', 'INT', 'INSTRI', 'INSTR',
-            'INLINE$', 'INFILE$', 'INCHRI', 'INCHR', 'INC', 'IMPORT', 'HIGH1',
-            'HIGH0', 'HEXX$', 'HEX$', 'GOADDRESS', 'GOADDR', 'GMAKE', 'GLOW',
-            'GIANTAT', 'GIANT', 'GHIGH', 'FUNCTION', 'FUNCADDRESS', 'FUNCADDR',
-            'FORMAT$', 'FIX', 'EXTU', 'EXTS', 'EXTERNAL', 'ERROR', 'ERROR$',
-            'EOF', 'DOUBLEAT', 'DOUBLE', 'DMAKE', 'DLOW', 'DIM', 'DHIGH',
-            'DECLARE', 'DEC', 'DCOMPLEX', 'CSTRING$', 'CSIZE', 'CSIZE$', 'CLR',
-            'CLOSE', 'CLEAR', 'CJUST$', 'CHR$', 'CFUNCTION', 'BITFIELD', 'BINB$',
-            'BIN$', 'AUTOX', 'AUTOS', 'AUTO', 'ATTACH', 'ASC', 'ABS'
-            ),
-        3 => array(
-            'XOR', 'OR', 'NOT', 'MOD', 'AND'
-            ),
-        4 => array(
-            'TANH', 'TAN', 'SQRT', 'SINH', 'SIN', 'SECH', 'SEC', 'POWER',
-            'LOG10', 'LOG', 'EXP10', 'EXP', 'CSCH', 'CSC', 'COTH', 'COT', 'COSH',
-            'COS', 'ATANH', 'ATAN', 'ASINH', 'ASIN', 'ASECH', 'ASEC', 'ACSCH',
-            'ACSC', 'ACOSH', 'ACOS'
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
-        '=','+','-'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #00a1a1;font-weight: bold',
-            2 => 'color: #000066;font-weight: bold',
-            3 => 'color: #00a166;font-weight: bold',
-            4 => 'color: #0066a1;font-weight: bold'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://www.xbasic.org',
-        4 => 'http://www.xbasic.org'
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/xml.php b/inc/geshi/xml.php
deleted file mode 100644
index 6354e457b..000000000
--- a/inc/geshi/xml.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*************************************************************************************
- * xml.php
- * -------
- * Author: Nigel McNie (nigel@geshi.org)
- * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.11
- * Date Started: 2004/09/01
- *
- * XML language file for GeSHi. Based on the idea/file by Christian Weiske
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2005/12/28 (1.0.2)
- *   -  Removed escape character for strings
- * 2004/11/27 (1.0.1)
- *   -  Added support for multiple object splitters
- * 2004/10/27 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2004/11/27)
- * -------------------------
- * * Check regexps work and correctly highlight XML stuff and nothing else
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'XML',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            ),
-        'COMMENTS' => array(
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SCRIPT' => array(
-            -1 => 'color: #808080; font-style: italic;', // comments
-            0 => 'color: #00bbdd;',
-            1 => 'color: #ddbb00;',
-            2 => 'color: #339933;',
-            3 => 'color: #009900;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #000066;',
-            1 => 'color: #000000; font-weight: bold;',
-            2 => 'color: #000000; font-weight: bold;'
-            )
-        ),
-    'URLS' => array(
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        0 => array(//attribute names
-            GESHI_SEARCH => '([a-z_:][\w\-\.:]*)(=)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2'
-            ),
-        1 => array(//Initial header line
-            GESHI_SEARCH => '(&lt;[\/?|(\?xml)]?[a-z_:][\w\-\.:]*(\??&gt;)?)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        2 => array(//Tag end markers
-            GESHI_SEARCH => '(([\/|\?])?&gt;)',
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => 'i',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
-    'SCRIPT_DELIMITERS' => array(
-        -1 => array(
-            '<!--' => '-->'
-            ),
-        0 => array(
-            '<!DOCTYPE' => '>'
-            ),
-        1 => array(
-            '&' => ';'
-            ),
-        2 => array(
-            '<![CDATA[' => ']]>'
-            ),
-        3 => array(
-            '<' => '>'
-            )
-    ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        -1 => false,
-        0 => false,
-        1 => false,
-        2 => false,
-        3 => true
-        ),
-    'TAB_WIDTH' => 2,
-    'PARSER_CONTROL' => array(
-        'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER
-        )
-    )
-);
-
-?>
diff --git a/inc/geshi/xorg_conf.php b/inc/geshi/xorg_conf.php
deleted file mode 100644
index 99edc6652..000000000
--- a/inc/geshi/xorg_conf.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/*************************************************************************************
- * xorg_conf.php
- * ----------
- * Author: Milian Wolff (mail@milianw.de)
- * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8.11
- * Date Started: 2008/06/18
- *
- * xorg.conf language file for GeSHi.
- *
- * CHANGES
- * -------
- * 2008/06/18 (1.0.8)
- *  -  Initial import
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'Xorg configuration',
-    'COMMENT_SINGLE' => array(1 => '#'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        // sections
-        1 => array(
-            'Section', 'EndSection', 'SubSection', 'EndSubSection'
-            ),
-        2 => array(
-            // see http://www.x.org/archive/X11R6.9.0/doc/html/xorg.conf.5.html
-            'BiosBase', 'Black', 'Boardname', 'BusID', 'ChipID', 'ChipRev',
-            'Chipset', 'ClockChip', 'Clocks', 'DacSpeed',
-            'DefaultDepth', 'DefaultFbBpp', 'Depth', 'Device',
-            'DisplaySize', 'Driver', 'FbBpp', 'Gamma',
-            'HorizSync', 'IOBase', 'Identifier', 'InputDevice',
-            'Load', 'MemBase', 'Mode', 'Modeline', 'Modelname',
-            'Modes', 'Monitor', 'Option', 'Ramdac', 'RgbPath',
-            'Screen', 'TextClockFreq', 'UseModes', 'VendorName',
-            'VertRefresh', 'VideoAdaptor', 'VideoRam',
-            'ViewPort', 'Virtual', 'Visual', 'Weight', 'White'
-            ),
-        3 => array(
-            // some sub-keywords
-            // screen position
-            'Above', 'Absolute', 'Below', 'LeftOf', 'Relative', 'RightOf',
-            // modes
-            'DotClock', 'Flags', 'HSkew', 'HTimings', 'VScan', 'VTimings'
-            ),
-        ),
-    'REGEXPS' => array(
-        ),
-    'SYMBOLS' => array(
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #990000;',
-            3 => 'color: #550000;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            ),
-        'STRINGS' => array(
-            0 => 'color: #0000ff;',
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 4
-);
-
-?>
diff --git a/inc/geshi/xpp.php b/inc/geshi/xpp.php
deleted file mode 100644
index a06e27794..000000000
--- a/inc/geshi/xpp.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/*************************************************************************************
- * xpp.php
- * -------
- * Author: Simon Butcher (simon@butcher.name)
- * Copyright: (c) 2007 Simon Butcher (http://simon.butcher.name/)
- * Release Version: 1.0.8.11
- * Date Started: 2007/02/27
- *
- * Axapta/Dynamics Ax X++ language file for GeSHi.
- * For details, see <http://msdn.microsoft.com/en-us/library/aa867122.aspx>
- *
- * CHANGES
- * -------
- * 2007/02/28 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2007/02/27)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'X++',
-    'COMMENT_SINGLE' => array(1 => '//'),
-    'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array( // Primitive types
-            'void',
-            'str',
-            'real',
-            'int64',
-            'int',
-            'date',
-            'container',
-            'boolean',
-            'anytype'
-            ),
-        2 => array( // Keywords
-            'window',
-            'while',
-            'try',
-            'true',
-            'throw',
-            'switch',
-            'super',
-            'static',
-            'server',
-            'right',
-            'return',
-            'retry',
-            'public',
-            'protected',
-            'private',
-            'print',
-            'pause',
-            'null',
-            'new',
-            'mod',
-            'left',
-            'interface',
-            'implements',
-            'if',
-            'for',
-            'final',
-            'false',
-            'extends',
-            'else',
-            'edit',
-            'do',
-            'div',
-            'display',
-            'default',
-            'continue',
-            'client',
-            'class',
-            'changeCompany',
-            'case',
-            'breakpoint',
-            'break',
-            'at',
-            'abstract'
-            ),
-        3 => array( // Functions within the Axapta kernel
-            'year',
-            'wkofyr',
-            'webwebpartstr',
-            'webstaticfilestr',
-            'websitetempstr',
-            'websitedefstr',
-            'webreportstr',
-            'webpagedefstr',
-            'weboutputcontentitemstr',
-            'webmenustr',
-            'webletitemstr',
-            'webformstr',
-            'webdisplaycontentitemstr',
-            'webactionitemstr',
-            'varstr',
-            'utilmoyr',
-            'uint2str',
-            'typeof',
-            'typeid',
-            'trunc',
-            'today',
-            'timenow',
-            'time2str',
-            'term',
-            'tanh',
-            'tan',
-            'tablestr',
-            'tablestaticmethodstr',
-            'tablepname',
-            'tablenum',
-            'tablename2id',
-            'tablemethodstr',
-            'tableid2pname',
-            'tableid2name',
-            'tablefieldgroupstr',
-            'tablecollectionstr',
-            'systemdateset',
-            'systemdateget',
-            'syd',
-            'substr',
-            'strupr',
-            'strscan',
-            'strrtrim',
-            'strrep',
-            'strrem',
-            'strprompt',
-            'strpoke',
-            'strnfind',
-            'strlwr',
-            'strltrim',
-            'strline',
-            'strlen',
-            'strkeep',
-            'strins',
-            'strfmt',
-            'strfind',
-            'strdel',
-            'strcolseq',
-            'strcmp',
-            'stralpha',
-            'str2time',
-            'str2num',
-            'str2int64',
-            'str2int',
-            'str2guid',
-            'str2enum',
-            'str2date',
-            'staticmethodstr',
-            'sln',
-            'sleep',
-            'sinh',
-            'sin',
-            'setprefix',
-            'sessionid',
-            'securitykeystr',
-            'securitykeynum',
-            'runbuf',
-            'runas',
-            'round',
-            'resourcestr',
-            'reportstr',
-            'refprintall',
-            'rate',
-            'querystr',
-            'pv',
-            'pt',
-            'prmisdefault',
-            'primoyr',
-            'prevyr',
-            'prevqtr',
-            'prevmth',
-            'power',
-            'pmt',
-            'num2str',
-            'num2date',
-            'num2char',
-            'nextyr',
-            'nextqtr',
-            'nextmth',
-            'newguid',
-            'mthofyr',
-            'mthname',
-            'mkdate',
-            'minint',
-            'min',
-            'methodstr',
-            'menustr',
-            'menuitemoutputstr',
-            'menuitemdisplaystr',
-            'menuitemactionstr',
-            'maxint',
-            'maxdate',
-            'max',
-            'match',
-            'logn',
-            'log10',
-            'literalstr',
-            'licensecodestr',
-            'licensecodenum',
-            'intvnorm',
-            'intvno',
-            'intvname',
-            'intvmax',
-            'int64str',
-            'indexstr',
-            'indexnum',
-            'indexname2id',
-            'indexid2name',
-            'idg',
-            'identifierstr',
-            'helpfilestr',
-            'helpdevstr',
-            'helpapplstr',
-            'guid2str',
-            'getprefix',
-            'getCurrentUTCTime',
-            'fv',
-            'funcname',
-            'frac',
-            'formstr',
-            'fieldstr',
-            'fieldpname',
-            'fieldnum',
-            'fieldname2id',
-            'fieldid2pname',
-            'fieldid2name',
-            'extendedTypeStr',
-            'extendedTypeNum',
-            'exp10',
-            'exp',
-            'evalbuf',
-            'enumstr',
-            'enumnum',
-            'enumcnt',
-            'enum2str',
-            'endmth',
-            'dimof',
-            'dg',
-            'decround',
-            'ddb',
-            'dayofyr',
-            'dayofwk',
-            'dayofmth',
-            'dayname',
-            'date2str',
-            'date2num',
-            'curuserid',
-            'curext',
-            'cterm',
-            'cosh',
-            'cos',
-            'corrflagset',
-            'corrflagget',
-            'convertUTCTimeToLocalTime',
-            'convertUTCDateToLocalDate',
-            'conpoke',
-            'conpeek',
-            'connull',
-            'conlen',
-            'conins',
-            'confind',
-            'configurationkeystr',
-            'configurationkeynum',
-            'condel',
-            'classstr',
-            'classnum',
-            'classidget',
-            'char2num',
-            'beep',
-            'atan',
-            'asin',
-            'ascii2ansi',
-            'any2str',
-            'any2real',
-            'any2int64',
-            'any2int',
-            'any2guid',
-            'any2enum',
-            'any2date',
-            'ansi2ascii',
-            'acos',
-            'abs'
-            ),
-        4 => array( // X++ SQL stuff
-            'where',
-            'update_recordset',
-            'ttsCommit',
-            'ttsBegin',
-            'ttsAbort',
-            'sum',
-            'setting',
-            'select',
-            'reverse',
-            'pessimisticLock',
-            'outer',
-            'order by',
-            'optimisticLock',
-            'notExists',
-            'noFetch',
-            'next',
-            'minof',
-            'maxof',
-            'like',
-            'join',
-            'insert_recordset',
-            'index hint',
-            'index',
-            'group by',
-            'from',
-            'forUpdate',
-            'forceSelectOrder',
-            'forcePlaceholders',
-            'forceNestedLoop',
-            'forceLiterals',
-            'flush',
-            'firstOnly',
-            'firstFast',
-            'exists',
-            'desc',
-            'delete_from',
-            'count',
-            'avg',
-            'asc'
-            )
-        ),
-    'SYMBOLS' => array( // X++ symbols
-        '!',
-        '&',
-        '(',
-        ')',
-        '*',
-        '^',
-        '|',
-        '~',
-        '+',
-        ',',
-        '-',
-        '/',
-        ':',
-        '<',
-        '=',
-        '>',
-        '?',
-        '[',
-        ']',
-        '{',
-        '}'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #0000ff;',
-            4 => 'color: #0000ff;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #007f00;',
-            'MULTI' => 'color: #007f00; font-style: italic;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000000;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #000000;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #ff0000;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #000000;'
-            ),
-        'METHODS' => array(
-            1 => 'color: #000000;',
-            2 => 'color: #000000;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #00007f;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
diff --git a/inc/geshi/yaml.php b/inc/geshi/yaml.php
deleted file mode 100644
index a2974eb57..000000000
--- a/inc/geshi/yaml.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/*************************************************************************************
- * yaml.php
- * --------
- * Author: Josh Ventura (JoshV10@gmail.com)
- * Copyright: (c) 2010 Josh Ventura
- * Release Version: 1.0.8.11
- * Date Started: 2010/12/14
- *
- * YAML language file for GeSHi.
- *
- * YAML gets hairy sometimes. If anything needs fixed, drop me an email and
- *      I'll probably spit up on it. This is, in general, not a long format.
- *
- * CHANGES
- * ---------
- * 2010/12/14
- *  - Started project in rage over GML support but not YAML support. WTFH?
- * 2010/12/15
- *  - Submitted to Ben.
- *
- * TODO (not updated since release)
- * ----------------------------------
- *  -  Field testing and necessary corrections: this grammar file is usable, but not
- *     completely accurate. There are, in fact, multiple cases in which it will mess
- *     up, and some of it may need moved around. It is the most temperamental parser
- *     I have ever associated my name with. Points of interest follow:
- *   *  Improvised support for | and >: since PHP offers no variable-width lookbehind,
- *      these blocks will still be highlighted even when commented out. As it happens,
- *      any line ending with | or > could result in the unintentional highlighting of
- *      all remaining lines in the file, just because I couldn't check for this regex
- *      as a lookbehind:  '/:(\s+)(!!(\w+)(\s+))?/'
- *      If there is a workaround for that, it needs implemented.
- *   *  I may be missing some operators. I deliberately omitted inline array notation
- *      as, in general, it's ugly and tends to conflict with plain-text. Ensuring all
- *      highlighted list delimiters are not plain text would be as simple as checking
- *      that they follow a colon directly. Alas, without variable-length lookbehinds,
- *      if there is a way to do so in GeSHi I am unaware of it.
- *   *  I kind of whored the comment regexp array. It seemed like a safe bet, so it's
- *      where I crammed everything. Some of it may need moved elsewhere for neatness.
- *   *  The !!typename highlight needs not to interfere with ": |" and ": >": Pairing
- *      key: !!type | value is perfectly legal, but again due to lookbehind issues, I
- *      can't add a case for that. Also, it is likely that multiple spaces can be put
- *      between the colon and pipe symbol, which would also break it.
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'YAML',
-    'COMMENT_SINGLE' => array(),
-    'COMMENT_MULTI' => array(),
-    //Keys
-    'COMMENT_REGEXP' => array( // ENTRY ZERO  SHOULD CHECK FOR (\n(\s*)([^#%]+?):(\s+)(!!(\w+)(\s+))?) AS A LOOKBEHIND, BUT IT CAN'T.
-        0 => '/(?<=\s[\|>]\n)(\s+)(.*)((?=[\n$])(([\n^](\1(.*)|(?=[\n$])))*)|$)/', // Pipe blocks and > blocks.
-        1 => '/#(.*)/', // Blue # comments
-        2 => '/%(.*)/', // Red % comments
-        3 => '/(^|\n)([^#%^\n]+?)(?=: )/',  // Key-value names
-        4 => '/(^|\n)([^#%^\n]+?)(?=:\n)/',// Key-group names
-        5 => '/(?<=^---)(\s*)!(\S+)/',    // Comments after ---
-        6 => '/(?<=: )(\s*)\&(\S+)/',    // References
-        7 => '/(?<=: )(\s*)\*(\S+)/',   // Dereferences
-        8 => '/!!(\w+)/',              // Types
-        //9 => '/(?<=\n)(\s*)-(?!-)/',       // List items: This needs to search within comments 3 and 4, but I don't know how.
-        ),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        1 => array(
-            'all','any','none', "yes", "no"
-            ),
-        ),
-    'SYMBOLS' => array(
-        1 => array('---', '...'),
-        2 => array(': ', ">\n", "|\n", '<<:', ":\n") // It'd be nice if I could specify that the colon must
-        //                                              follow comment 3 or 4 to be considered, and the > and |
-        //                                              must follow such a colon.
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'font-weight: bold;'
-            ),
-        'COMMENTS' => array(
-            0 => 'color: #303050;background-color: #F5F5F5',
-            1 => 'color: blue;',
-            2 => 'font-weight: bold; color: red;',
-            3 => 'color: green;',
-            4 => 'color: #007F45;',
-            5 => 'color: #7f7fFF;',
-            6 => 'color: #FF7000;',
-            7 => 'color: #FF45C0;',
-            8 => 'font-weight: bold; color: #005F5F;',
-            //9 => 'font-weight: bold; color: #000000;',
-            ),
-        'ESCAPE_CHAR' => array(
-            ),
-        'BRACKETS' => array(
-            ),
-        'STRINGS' => array(
-            0 => 'color: #CF00CF;'
-            ),
-        'NUMBERS' => array(
-            // 0 => 'color: #33f;' // Don't highlight numbers, really...
-            ),
-        'METHODS' => array(
-            1 => '',
-            2 => ''
-            ),
-        'SYMBOLS' => array(
-            1 => 'color: cyan;',
-            2 => 'font-weight: bold; color: brown;'
-            ),
-        'REGEXPS' => array(
-            ),
-        'SCRIPT' => array(
-            0 => ''
-            )
-        ),
-    'URLS' => array(1 => ''),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array( ),
-    'REGEXPS' => array( ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array( ),
-    'HIGHLIGHT_STRICT_BLOCK' => array( )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/z80.php b/inc/geshi/z80.php
deleted file mode 100644
index 47326bb21..000000000
--- a/inc/geshi/z80.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/*************************************************************************************
- * z80.php
- * -------
- * Author: Benny Baumann (BenBE@omorphia.de)
- * Copyright: (c) 2007-2008 Benny Baumann (http://www.omorphia.de/)
- * Release Version: 1.0.8.11
- * Date Started: 2007/02/06
- *
- * ZiLOG Z80 Assembler language file for GeSHi.
- * Syntax definition as commonly used with table assembler TASM32
- * This file will contain some undocumented opcodes.
- *
- * CHANGES
- * -------
- * 2008/05/23 (1.0.7.22)
- *   -  Added description of extra language features (SF#1970248)
- * 2007/06/03 (1.0.1)
- *   -  Fixed two typos in the language file
- * 2007/02/06 (1.0.0)
- *   -  First Release
- *
- * TODO (updated 2007/02/06)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ZiLOG Z80 Assembler',
-    'COMMENT_SINGLE' => array(1 => ';'),
-    'COMMENT_MULTI' => array(),
-    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '',
-    'KEYWORDS' => array(
-        /*CPU*/
-        1 => array(
-            'adc','add','and','bit','call','ccf','cp','cpd','cpdr','cpir','cpi',
-            'cpl','daa','dec','di','djnz','ei','ex','exx','halt','im','in',
-            'in0','inc','ind','indr','inir','ini','jp','jr','ld','ldd','lddr',
-            'ldir','ldi','mlt','neg','nop','or','otdm','otdmr','otdr','otim',
-            'otimr','otir','out','out0','outd','outi','pop','push','res','ret',
-            'reti','retn','rl','rla','rlc','rlca','rld','rr','rra','rrc','rrca',
-            'rrd','rst','sbc','scf','set','sla','sl1','sll','slp','sra','srl',
-            'sub','tst','tstio','xor'
-            ),
-        /*registers*/
-        2 => array(
-            'a','b','c','d','e','h','l',
-            'af','bc','de','hl','ix','iy','sp',
-            'af\'','ixh','ixl','iyh','iyl'
-            ),
-        /*Directive*/
-        3 => array(
-            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
-            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
-            ),
-        ),
-    'SYMBOLS' => array(
-        '[', ']', '(', ')', '?', '+', '-', '*', '/', '%', '$'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #0000ff; font-weight:bold;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #46aa03; font-weight:bold;'
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #adadad; font-style: italic;',
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
-            ),
-        'BRACKETS' => array(
-            0 => 'color: #0000ff;'
-            ),
-        'STRINGS' => array(
-            0 => 'color: #7f007f;'
-            ),
-        'NUMBERS' => array(
-            0 => 'color: #dd22dd;'
-            ),
-        'METHODS' => array(
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #008000;'
-            ),
-        'REGEXPS' => array(
-            0 => 'color: #22bbff;',
-            1 => 'color: #22bbff;',
-            2 => 'color: #993333;'
-            ),
-        'SCRIPT' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => ''
-        ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
-    'REGEXPS' => array(
-        //Hex numbers
-        0 => '0[0-9a-fA-F]{1,32}[hH]',
-        //Binary numbers
-        1 => '\%[01]{1,64}|[01]{1,64}[bB]?(?![^<]*>)',
-        //Labels
-        2 => '^[_a-zA-Z][_a-zA-Z0-9]?\:'
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        ),
-    'TAB_WIDTH' => 8
-);
-
-?>
\ No newline at end of file
diff --git a/inc/geshi/zxbasic.php b/inc/geshi/zxbasic.php
deleted file mode 100644
index b1de472b5..000000000
--- a/inc/geshi/zxbasic.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/*************************************************************************************
- * zxbasic.php
- * -------------
- * Author: Jose Rodriguez (a.k.a. Boriel)
- * Based on Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org) Freebasic template
- * Release Version: 1.0.8.11
- * Date Started: 2010/06/19
- *
- * ZXBasic language file for GeSHi.
- *
- * More details at http://www.zxbasic.net/
- *
- * CHANGES
- * -------
- * 2010/06/19 (1.0.0)
- *  -  First Release
- *
- * TODO (updated 2007/02/06)
- * -------------------------
- *
- *************************************************************************************
- *
- *     This file is part of GeSHi.
- *
- *   GeSHi is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   GeSHi is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- ************************************************************************************/
-
-$language_data = array (
-    'LANG_NAME' => 'ZXBasic',
-    'COMMENT_SINGLE' => array(
-        1 => "'",
-        2 => '#',
-        3 => 'REM'
-        ),
-    'COMMENT_MULTI' => array("/'" => "'/"),
-    'CASE_KEYWORDS' => GESHI_CAPS_UPPER, //GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'KEYWORDS' => array(
-        1 => array(
-            "ASM", "BEEP", "BOLD", "BORDER", "BRIGHT", "ByRef", "ByVal", "CAST",
-            "CIRCLE", "CLS", "CONST", "CONTINUE", "DECLARE", "DIM", "DO",
-            "DRAW", "ELSE", "ELSEIF", "END", "EXIT", "FastCall", "FLASH", "FOR",
-            "FUNCTION", "GOTO", "GOSUB", "GO", "IF", "INK", "INVERSE", "ITALIC",
-            "LET", "LOAD", "LOOP", "NEXT", "OVER", "PAPER", "PAUSE", "PI",
-            "PLOT", "POKE", "PRINT", "RANDOMIZE", "REM", "RETURN", "SAVE",
-            "StdCall", "Sub", "THEN", "TO", "UNTIL", "VERIFY", "WEND", "WHILE",
-            ),
-
-        // types
-        2 => array(
-            'byte', 'ubyte', 'integer', 'uinteger', 'long', 'ulong', 'fixed',
-            'float', 'string'
-            ),
-
-        // Functions
-        3 => array(
-            "ABS", "ACS", "ASN", "ATN", "CHR", "CODE", "COS", "CSRLIN", "EXP",
-            "HEX", "HEX16", "INKEY", "INT", "LEN", "LN", "PEEK", "POS", "RND",
-            "SCREEN$", "SGN", "SIN", "SQR", "STR", "TAN", "VAL",
-            ),
-
-        // Operators and modifiers
-        4 => array(
-            "AT", "AS", "AND", "MOD", "NOT", "OR", "SHL", "SHR", "STEP", "XOR"
-            )
-        ),
-    'SYMBOLS' => array(
-        '(', ')'
-        ),
-    'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false
-        ),
-    'STYLES' => array(
-        'KEYWORDS' => array(
-            1 => 'color: #000080; font-weight: bold;', // Commands
-            2 => 'color: #800080; font-weight: bold;', // Types
-            3 => 'color: #006000; font-weight: bold;', // Functions
-            4 => 'color: #801010; font-weight: bold;'  // Operators and Modifiers
-            ),
-        'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;',
-            2 => 'color: #339933;',
-            3 => 'color: #808080; font-style: italic;',
-            'MULTI' => 'color: #808080; font-style: italic;'
-            ),
-        'BRACKETS' => array(
-            //0 => 'color: #66cc66;'
-            0 => 'color: #007676;'
-            ),
-        'STRINGS' => array(
-            //0 => 'color: #ff0000;'
-            0 => 'color: #A00000; font-style: italic;'
-            ),
-        'NUMBERS' => array(
-            //0 => 'color: #cc66cc;'
-            0 => 'color: #b05103;'// font-weight: bold;'
-            ),
-        'METHODS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
-            ),
-        'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
-            ),
-        'SCRIPT' => array(
-            ),
-        'REGEXPS' => array(
-            )
-        ),
-    'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => ''
-        ),
-    'OOLANG' => true,
-    'OBJECT_SPLITTERS' => array(
-        1 => '.'
-        ),
-    'REGEXPS' => array(
-        ),
-    'STRICT_MODE_APPLIES' => GESHI_NEVER,
-    'SCRIPT_DELIMITERS' => array(
-        ),
-    'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
-);
-
-?>
\ No newline at end of file
diff --git a/inc/load.php b/inc/load.php
index 18786dc79..daf856188 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -70,7 +70,6 @@ function load_autoload($name){
         'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
         'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
         'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
-        'GeSHi'                 => DOKU_INC.'inc/geshi.php',
         'Tar'                   => DOKU_INC.'inc/Tar.class.php',
         'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
         'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 17c331ef5..8650f974f 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -746,14 +746,13 @@ function p_xhtml_cached_geshi($code, $language, $wrapper='pre') {
     $cache = getCacheName($language.$code,".code");
     $ctime = @filemtime($cache);
     if($ctime && !$INPUT->bool('purge') &&
-            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+            $ctime > filemtime(DOKU_INC.'vendor/composer/installed.json') &&  // libraries changed
             $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
         $highlighted_code = io_readFile($cache, false);
 
     } else {
 
-        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+        $geshi = new GeSHi($code, $language);
         $geshi->set_encoding('utf-8');
         $geshi->enable_classes();
         $geshi->set_header_type(GESHI_HEADER_PRE);
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 7a91153b0..63b550c32 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'GeSHi' => $vendorDir . '/easybook/geshi/geshi.php',
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 769865f79..a9eb3f9ee 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -47,5 +47,53 @@
             "unzip",
             "zip"
         ]
+    },
+    {
+        "name": "easybook/geshi",
+        "version": "v1.0.8.14",
+        "version_normalized": "1.0.8.14",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/easybook/geshi.git",
+            "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/easybook/geshi/zipball/af589a67bf308791bb13e54bddd9aa3544b7dff8",
+            "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">4.3.0"
+        },
+        "time": "2015-04-15 13:21:45",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "./"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0"
+        ],
+        "authors": [
+            {
+                "name": "Nigel McNie",
+                "email": "nigel@geshi.org"
+            },
+            {
+                "name": "Benny Baumann",
+                "email": "BenBE@geshi.org"
+            }
+        ],
+        "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.",
+        "homepage": "http://qbnz.com/highlighter",
+        "keywords": [
+            "highlight",
+            "highlighter",
+            "syntax"
+        ]
     }
 ]
diff --git a/vendor/easybook/geshi/README.md b/vendor/easybook/geshi/README.md
new file mode 100644
index 000000000..0a12d08bb
--- /dev/null
+++ b/vendor/easybook/geshi/README.md
@@ -0,0 +1,10 @@
+# GeSHi - Generic Syntax Highlighter #
+
+This repository has been created just to be able to install GeSHi as a Composer
+package. Technically it's a port of the GeSHi project code found on SourceForge:
+http://sourceforge.net/projects/geshi/
+
+Differences from the official SourceForge repository:
+
+  * 11/may/2014: added `sass.php` file to highlight Sass stylesheets.
+  * 28/sep/2012: added `twig.php` file to highlight Twig templates.
diff --git a/vendor/easybook/geshi/composer.json b/vendor/easybook/geshi/composer.json
new file mode 100644
index 000000000..33494664c
--- /dev/null
+++ b/vendor/easybook/geshi/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "easybook/geshi",
+    "type": "library",
+    "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.",
+    "homepage": "http://qbnz.com/highlighter",
+    "keywords": ["highlighter", "highlight", "syntax"],
+    "license": "GPL-2.0",
+    "authors": [
+        {
+            "name": "Benny Baumann",
+            "email": "BenBE@geshi.org"
+        },
+        {
+            "name": "Nigel McNie",
+            "email": "nigel@geshi.org"
+        }
+    ],
+    "require": {
+        "php": ">4.3.0"
+    }, 
+    "autoload": {
+        "classmap": ["./"]
+    }
+}
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi.php b/vendor/easybook/geshi/geshi.php
new file mode 100755
index 000000000..bd265af97
--- /dev/null
+++ b/vendor/easybook/geshi/geshi.php
@@ -0,0 +1,4775 @@
+<?php
+/**
+ * GeSHi - Generic Syntax Highlighter
+ *
+ * The GeSHi class for Generic Syntax Highlighting. Please refer to the
+ * documentation at http://qbnz.com/highlighter/documentation.php for more
+ * information about how to use this class.
+ *
+ * For changes, release notes, TODOs etc, see the relevant files in the docs/
+ * directory.
+ *
+ *   This file is part of GeSHi.
+ *
+ *  GeSHi is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GeSHi is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GeSHi; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package    geshi
+ * @subpackage core
+ * @author     Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
+ * @copyright  (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann
+ * @license    http://gnu.org/copyleft/gpl.html GNU GPL
+ *
+ */
+
+//
+// GeSHi Constants
+// You should use these constant names in your programs instead of
+// their values - you never know when a value may change in a future
+// version
+//
+
+/** The version of this GeSHi file */
+define('GESHI_VERSION', '1.0.8.12');
+
+// Define the root directory for the GeSHi code tree
+if (!defined('GESHI_ROOT')) {
+    /** The root directory for GeSHi */
+    define('GESHI_ROOT', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+}
+/** The language file directory for GeSHi
+    @access private */
+define('GESHI_LANG_ROOT', GESHI_ROOT . 'geshi' . DIRECTORY_SEPARATOR);
+
+// Define if GeSHi should be paranoid about security
+if (!defined('GESHI_SECURITY_PARANOID')) {
+    /** Tells GeSHi to be paranoid about security settings */
+    define('GESHI_SECURITY_PARANOID', false);
+}
+
+// Line numbers - use with enable_line_numbers()
+/** Use no line numbers when building the result */
+define('GESHI_NO_LINE_NUMBERS', 0);
+/** Use normal line numbers when building the result */
+define('GESHI_NORMAL_LINE_NUMBERS', 1);
+/** Use fancy line numbers when building the result */
+define('GESHI_FANCY_LINE_NUMBERS', 2);
+
+// Container HTML type
+/** Use nothing to surround the source */
+define('GESHI_HEADER_NONE', 0);
+/** Use a "div" to surround the source */
+define('GESHI_HEADER_DIV', 1);
+/** Use a "pre" to surround the source */
+define('GESHI_HEADER_PRE', 2);
+/** Use a pre to wrap lines when line numbers are enabled or to wrap the whole code. */
+define('GESHI_HEADER_PRE_VALID', 3);
+/**
+ * Use a "table" to surround the source:
+ *
+ *  <table>
+ *    <thead><tr><td colspan="2">$header</td></tr></thead>
+ *    <tbody><tr><td><pre>$linenumbers</pre></td><td><pre>$code></pre></td></tr></tbody>
+ *    <tfooter><tr><td colspan="2">$footer</td></tr></tfoot>
+ *  </table>
+ *
+ * this is essentially only a workaround for Firefox, see sf#1651996 or take a look at
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=365805
+ * @note when linenumbers are disabled this is essentially the same as GESHI_HEADER_PRE
+ */
+define('GESHI_HEADER_PRE_TABLE', 4);
+
+// Capatalisation constants
+/** Lowercase keywords found */
+define('GESHI_CAPS_NO_CHANGE', 0);
+/** Uppercase keywords found */
+define('GESHI_CAPS_UPPER', 1);
+/** Leave keywords found as the case that they are */
+define('GESHI_CAPS_LOWER', 2);
+
+// Link style constants
+/** Links in the source in the :link state */
+define('GESHI_LINK', 0);
+/** Links in the source in the :hover state */
+define('GESHI_HOVER', 1);
+/** Links in the source in the :active state */
+define('GESHI_ACTIVE', 2);
+/** Links in the source in the :visited state */
+define('GESHI_VISITED', 3);
+
+// Important string starter/finisher
+// Note that if you change these, they should be as-is: i.e., don't
+// write them as if they had been run through htmlentities()
+/** The starter for important parts of the source */
+define('GESHI_START_IMPORTANT', '<BEGIN GeSHi>');
+/** The ender for important parts of the source */
+define('GESHI_END_IMPORTANT', '<END GeSHi>');
+
+/**#@+
+ *  @access private
+ */
+// When strict mode applies for a language
+/** Strict mode never applies (this is the most common) */
+define('GESHI_NEVER', 0);
+/** Strict mode *might* apply, and can be enabled or
+    disabled by {@link GeSHi->enable_strict_mode()} */
+define('GESHI_MAYBE', 1);
+/** Strict mode always applies */
+define('GESHI_ALWAYS', 2);
+
+// Advanced regexp handling constants, used in language files
+/** The key of the regex array defining what to search for */
+define('GESHI_SEARCH', 0);
+/** The key of the regex array defining what bracket group in a
+    matched search to use as a replacement */
+define('GESHI_REPLACE', 1);
+/** The key of the regex array defining any modifiers to the regular expression */
+define('GESHI_MODIFIERS', 2);
+/** The key of the regex array defining what bracket group in a
+    matched search to put before the replacement */
+define('GESHI_BEFORE', 3);
+/** The key of the regex array defining what bracket group in a
+    matched search to put after the replacement */
+define('GESHI_AFTER', 4);
+/** The key of the regex array defining a custom keyword to use
+    for this regexp's html tag class */
+define('GESHI_CLASS', 5);
+
+/** Used in language files to mark comments */
+define('GESHI_COMMENTS', 0);
+
+/** Used to work around missing PHP features **/
+define('GESHI_PHP_PRE_433', !(version_compare(PHP_VERSION, '4.3.3') === 1));
+
+/** make sure we can call stripos **/
+if (!function_exists('stripos')) {
+    // the offset param of preg_match is not supported below PHP 4.3.3
+    if (GESHI_PHP_PRE_433) {
+        /**
+         * @ignore
+         */
+        function stripos($haystack, $needle, $offset = null) {
+            if (!is_null($offset)) {
+                $haystack = substr($haystack, $offset);
+            }
+            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE)) {
+                return $match[0][1];
+            }
+            return false;
+        }
+    }
+    else {
+        /**
+         * @ignore
+         */
+        function stripos($haystack, $needle, $offset = null) {
+            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE, $offset)) {
+                return $match[0][1];
+            }
+            return false;
+        }
+    }
+}
+
+/** some old PHP / PCRE subpatterns only support up to xxx subpatterns in
+    regular expressions. Set this to false if your PCRE lib is up to date
+    @see GeSHi->optimize_regexp_list()
+    **/
+define('GESHI_MAX_PCRE_SUBPATTERNS', 500);
+/** it's also important not to generate too long regular expressions
+    be generous here... but keep in mind, that when reaching this limit we
+    still have to close open patterns. 12k should do just fine on a 16k limit.
+    @see GeSHi->optimize_regexp_list()
+    **/
+define('GESHI_MAX_PCRE_LENGTH', 12288);
+
+//Number format specification
+/** Basic number format for integers */
+define('GESHI_NUMBER_INT_BASIC', 1);        //Default integers \d+
+/** Enhanced number format for integers like seen in C */
+define('GESHI_NUMBER_INT_CSTYLE', 2);       //Default C-Style \d+[lL]?
+/** Number format to highlight binary numbers with a suffix "b" */
+define('GESHI_NUMBER_BIN_SUFFIX', 16);           //[01]+[bB]
+/** Number format to highlight binary numbers with a prefix % */
+define('GESHI_NUMBER_BIN_PREFIX_PERCENT', 32);   //%[01]+
+/** Number format to highlight binary numbers with a prefix 0b (C) */
+define('GESHI_NUMBER_BIN_PREFIX_0B', 64);        //0b[01]+
+/** Number format to highlight octal numbers with a leading zero */
+define('GESHI_NUMBER_OCT_PREFIX', 256);           //0[0-7]+
+/** Number format to highlight octal numbers with a prefix 0o (logtalk) */
+define('GESHI_NUMBER_OCT_PREFIX_0O', 512);           //0[0-7]+
+/** Number format to highlight octal numbers with a leading @ (Used in HiSofts Devpac series). */
+define('GESHI_NUMBER_OCT_PREFIX_AT', 1024);           //@[0-7]+
+/** Number format to highlight octal numbers with a suffix of o */
+define('GESHI_NUMBER_OCT_SUFFIX', 2048);           //[0-7]+[oO]
+/** Number format to highlight hex numbers with a prefix 0x */
+define('GESHI_NUMBER_HEX_PREFIX', 4096);           //0x[0-9a-fA-F]+
+/** Number format to highlight hex numbers with a prefix $ */
+define('GESHI_NUMBER_HEX_PREFIX_DOLLAR', 8192);           //$[0-9a-fA-F]+
+/** Number format to highlight hex numbers with a suffix of h */
+define('GESHI_NUMBER_HEX_SUFFIX', 16384);           //[0-9][0-9a-fA-F]*h
+/** Number format to highlight floating-point numbers without support for scientific notation */
+define('GESHI_NUMBER_FLT_NONSCI', 65536);          //\d+\.\d+
+/** Number format to highlight floating-point numbers without support for scientific notation */
+define('GESHI_NUMBER_FLT_NONSCI_F', 131072);       //\d+(\.\d+)?f
+/** Number format to highlight floating-point numbers with support for scientific notation (E) and optional leading zero */
+define('GESHI_NUMBER_FLT_SCI_SHORT', 262144);      //\.\d+e\d+
+/** Number format to highlight floating-point numbers with support for scientific notation (E) and required leading digit */
+define('GESHI_NUMBER_FLT_SCI_ZERO', 524288);       //\d+(\.\d+)?e\d+
+//Custom formats are passed by RX array
+
+// Error detection - use these to analyse faults
+/** No sourcecode to highlight was specified
+ * @deprecated
+ */
+define('GESHI_ERROR_NO_INPUT', 1);
+/** The language specified does not exist */
+define('GESHI_ERROR_NO_SUCH_LANG', 2);
+/** GeSHi could not open a file for reading (generally a language file) */
+define('GESHI_ERROR_FILE_NOT_READABLE', 3);
+/** The header type passed to {@link GeSHi->set_header_type()} was invalid */
+define('GESHI_ERROR_INVALID_HEADER_TYPE', 4);
+/** The line number type passed to {@link GeSHi->enable_line_numbers()} was invalid */
+define('GESHI_ERROR_INVALID_LINE_NUMBER_TYPE', 5);
+/**#@-*/
+
+
+/**
+ * The GeSHi Class.
+ *
+ * Please refer to the documentation for GeSHi 1.0.X that is available
+ * at http://qbnz.com/highlighter/documentation.php for more information
+ * about how to use this class.
+ *
+ * @package   geshi
+ * @author    Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
+ * @copyright (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann
+ */
+class GeSHi {
+    /**#@+
+     * @access private
+     */
+    /**
+     * The source code to highlight
+     * @var string
+     */
+    var $source = '';
+
+    /**
+     * The language to use when highlighting
+     * @var string
+     */
+    var $language = '';
+
+    /**
+     * The data for the language used
+     * @var array
+     */
+    var $language_data = array();
+
+    /**
+     * The path to the language files
+     * @var string
+     */
+    var $language_path = GESHI_LANG_ROOT;
+
+    /**
+     * The error message associated with an error
+     * @var string
+     * @todo check err reporting works
+     */
+    var $error = false;
+
+    /**
+     * Possible error messages
+     * @var array
+     */
+    var $error_messages = array(
+        GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})',
+        GESHI_ERROR_FILE_NOT_READABLE => 'The file specified for load_from_file was not readable',
+        GESHI_ERROR_INVALID_HEADER_TYPE => 'The header type specified is invalid',
+        GESHI_ERROR_INVALID_LINE_NUMBER_TYPE => 'The line number type specified is invalid'
+    );
+
+    /**
+     * Whether highlighting is strict or not
+     * @var boolean
+     */
+    var $strict_mode = false;
+
+    /**
+     * Whether to use CSS classes in output
+     * @var boolean
+     */
+    var $use_classes = false;
+
+    /**
+     * The type of header to use. Can be one of the following
+     * values:
+     *
+     * - GESHI_HEADER_PRE: Source is outputted in a "pre" HTML element.
+     * - GESHI_HEADER_DIV: Source is outputted in a "div" HTML element.
+     * - GESHI_HEADER_NONE: No header is outputted.
+     *
+     * @var int
+     */
+    var $header_type = GESHI_HEADER_PRE;
+
+    /**
+     * Array of permissions for which lexics should be highlighted
+     * @var array
+     */
+    var $lexic_permissions = array(
+        'KEYWORDS' =>    array(),
+        'COMMENTS' =>    array('MULTI' => true),
+        'REGEXPS' =>     array(),
+        'ESCAPE_CHAR' => true,
+        'BRACKETS' =>    true,
+        'SYMBOLS' =>     false,
+        'STRINGS' =>     true,
+        'NUMBERS' =>     true,
+        'METHODS' =>     true,
+        'SCRIPT' =>      true
+    );
+
+    /**
+     * The time it took to parse the code
+     * @var double
+     */
+    var $time = 0;
+
+    /**
+     * The content of the header block
+     * @var string
+     */
+    var $header_content = '';
+
+    /**
+     * The content of the footer block
+     * @var string
+     */
+    var $footer_content = '';
+
+    /**
+     * The style of the header block
+     * @var string
+     */
+    var $header_content_style = '';
+
+    /**
+     * The style of the footer block
+     * @var string
+     */
+    var $footer_content_style = '';
+
+    /**
+     * Tells if a block around the highlighted source should be forced
+     * if not using line numbering
+     * @var boolean
+     */
+    var $force_code_block = false;
+
+    /**
+     * The styles for hyperlinks in the code
+     * @var array
+     */
+    var $link_styles = array();
+
+    /**
+     * Whether important blocks should be recognised or not
+     * @var boolean
+     * @deprecated
+     * @todo REMOVE THIS FUNCTIONALITY!
+     */
+    var $enable_important_blocks = false;
+
+    /**
+     * Styles for important parts of the code
+     * @var string
+     * @deprecated
+     * @todo As above - rethink the whole idea of important blocks as it is buggy and
+     * will be hard to implement in 1.2
+     */
+    var $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code
+
+    /**
+     * Whether CSS IDs should be added to the code
+     * @var boolean
+     */
+    var $add_ids = false;
+
+    /**
+     * Lines that should be highlighted extra
+     * @var array
+     */
+    var $highlight_extra_lines = array();
+
+    /**
+     * Styles of lines that should be highlighted extra
+     * @var array
+     */
+    var $highlight_extra_lines_styles = array();
+
+    /**
+     * Styles of extra-highlighted lines
+     * @var string
+     */
+    var $highlight_extra_lines_style = 'background-color: #ffc;';
+
+    /**
+     * The line ending
+     * If null, nl2br() will be used on the result string.
+     * Otherwise, all instances of \n will be replaced with $line_ending
+     * @var string
+     */
+    var $line_ending = null;
+
+    /**
+     * Number at which line numbers should start at
+     * @var int
+     */
+    var $line_numbers_start = 1;
+
+    /**
+     * The overall style for this code block
+     * @var string
+     */
+    var $overall_style = 'font-family:monospace;';
+
+    /**
+     *  The style for the actual code
+     * @var string
+     */
+    var $code_style = 'font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;';
+
+    /**
+     * The overall class for this code block
+     * @var string
+     */
+    var $overall_class = '';
+
+    /**
+     * The overall ID for this code block
+     * @var string
+     */
+    var $overall_id = '';
+
+    /**
+     * Line number styles
+     * @var string
+     */
+    var $line_style1 = 'font-weight: normal; vertical-align:top;';
+
+    /**
+     * Line number styles for fancy lines
+     * @var string
+     */
+    var $line_style2 = 'font-weight: bold; vertical-align:top;';
+
+    /**
+     * Style for line numbers when GESHI_HEADER_PRE_TABLE is chosen
+     * @var string
+     */
+    var $table_linenumber_style = 'width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;';
+
+    /**
+     * Flag for how line numbers are displayed
+     * @var boolean
+     */
+    var $line_numbers = GESHI_NO_LINE_NUMBERS;
+
+    /**
+     * Flag to decide if multi line spans are allowed. Set it to false to make sure
+     * each tag is closed before and reopened after each linefeed.
+     * @var boolean
+     */
+    var $allow_multiline_span = true;
+
+    /**
+     * The "nth" value for fancy line highlighting
+     * @var int
+     */
+    var $line_nth_row = 0;
+
+    /**
+     * The size of tab stops
+     * @var int
+     */
+    var $tab_width = 8;
+
+    /**
+     * Should we use language-defined tab stop widths?
+     * @var int
+     */
+    var $use_language_tab_width = false;
+
+    /**
+     * Default target for keyword links
+     * @var string
+     */
+    var $link_target = '';
+
+    /**
+     * The encoding to use for entity encoding
+     * NOTE: Used with Escape Char Sequences to fix UTF-8 handling (cf. SF#2037598)
+     * @var string
+     */
+    var $encoding = 'utf-8';
+
+    /**
+     * Should keywords be linked?
+     * @var boolean
+     */
+    var $keyword_links = true;
+
+    /**
+     * Currently loaded language file
+     * @var string
+     * @since 1.0.7.22
+     */
+    var $loaded_language = '';
+
+    /**
+     * Wether the caches needed for parsing are built or not
+     *
+     * @var bool
+     * @since 1.0.8
+     */
+    var $parse_cache_built = false;
+
+    /**
+     * Work around for Suhosin Patch with disabled /e modifier
+     *
+     * Note from suhosins author in config file:
+     * <blockquote>
+     *   The /e modifier inside <code>preg_replace()</code> allows code execution.
+     *   Often it is the cause for remote code execution exploits. It is wise to
+     *   deactivate this feature and test where in the application it is used.
+     *   The developer using the /e modifier should be made aware that he should
+     *   use <code>preg_replace_callback()</code> instead
+     * </blockquote>
+     *
+     * @var array
+     * @since 1.0.8
+     */
+    var $_kw_replace_group = 0;
+    var $_rx_key = 0;
+
+    /**
+     * some "callback parameters" for handle_multiline_regexps
+     *
+     * @since 1.0.8
+     * @access private
+     * @var string
+     */
+    var $_hmr_before = '';
+    var $_hmr_replace = '';
+    var $_hmr_after = '';
+    var $_hmr_key = 0;
+
+    /**#@-*/
+
+    /**
+     * Creates a new GeSHi object, with source and language
+     *
+     * @param string The source code to highlight
+     * @param string The language to highlight the source with
+     * @param string The path to the language file directory. <b>This
+     *               is deprecated!</b> I've backported the auto path
+     *               detection from the 1.1.X dev branch, so now it
+     *               should be automatically set correctly. If you have
+     *               renamed the language directory however, you will
+     *               still need to set the path using this parameter or
+     *               {@link GeSHi->set_language_path()}
+     * @since 1.0.0
+     */
+    function GeSHi($source = '', $language = '', $path = '') {
+        if (!empty($source)) {
+            $this->set_source($source);
+        }
+        if (!empty($language)) {
+            $this->set_language($language);
+        }
+        $this->set_language_path($path);
+    }
+
+    /**
+     * Returns the version of GeSHi
+     *
+     * @return string
+     * @since 1 0.8.11
+     */
+    function get_version()
+    {
+        return GESHI_VERSION;
+    }
+
+    /**
+     * Returns an error message associated with the last GeSHi operation,
+     * or false if no error has occured
+     *
+     * @return string|false An error message if there has been an error, else false
+     * @since  1.0.0
+     */
+    function error() {
+        if ($this->error) {
+            //Put some template variables for debugging here ...
+            $debug_tpl_vars = array(
+                '{LANGUAGE}' => $this->language,
+                '{PATH}' => $this->language_path
+            );
+            $msg = str_replace(
+                array_keys($debug_tpl_vars),
+                array_values($debug_tpl_vars),
+                $this->error_messages[$this->error]);
+
+            return "<br /><strong>GeSHi Error:</strong> $msg (code {$this->error})<br />";
+        }
+        return false;
+    }
+
+    /**
+     * Gets a human-readable language name (thanks to Simon Patterson
+     * for the idea :))
+     *
+     * @return string The name for the current language
+     * @since  1.0.2
+     */
+    function get_language_name() {
+        if (GESHI_ERROR_NO_SUCH_LANG == $this->error) {
+            return $this->language_data['LANG_NAME'] . ' (Unknown Language)';
+        }
+        return $this->language_data['LANG_NAME'];
+    }
+
+    /**
+     * Sets the source code for this object
+     *
+     * @param string The source code to highlight
+     * @since 1.0.0
+     */
+    function set_source($source) {
+        $this->source = $source;
+        $this->highlight_extra_lines = array();
+    }
+
+    /**
+     * Sets the language for this object
+     *
+     * @note since 1.0.8 this function won't reset language-settings by default anymore!
+     *       if you need this set $force_reset = true
+     *
+     * @param string The name of the language to use
+     * @since 1.0.0
+     */
+    function set_language($language, $force_reset = false) {
+        if ($force_reset) {
+            $this->loaded_language = false;
+        }
+
+        //Clean up the language name to prevent malicious code injection
+        $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language);
+
+        $language = strtolower($language);
+
+        //Retreive the full filename
+        $file_name = $this->language_path . $language . '.php';
+        if ($file_name == $this->loaded_language) {
+            // this language is already loaded!
+            return;
+        }
+
+        $this->language = $language;
+
+        $this->error = false;
+        $this->strict_mode = GESHI_NEVER;
+
+        //Check if we can read the desired file
+        if (!is_readable($file_name)) {
+            $this->error = GESHI_ERROR_NO_SUCH_LANG;
+            return;
+        }
+
+        // Load the language for parsing
+        $this->load_language($file_name);
+    }
+
+    /**
+     * Sets the path to the directory containing the language files. Note
+     * that this path is relative to the directory of the script that included
+     * geshi.php, NOT geshi.php itself.
+     *
+     * @param string The path to the language directory
+     * @since 1.0.0
+     * @deprecated The path to the language files should now be automatically
+     *             detected, so this method should no longer be needed. The
+     *             1.1.X branch handles manual setting of the path differently
+     *             so this method will disappear in 1.2.0.
+     */
+    function set_language_path($path) {
+        if(strpos($path,':')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            if(DIRECTORY_SEPARATOR == "\\") {
+                if(!preg_match('#^[a-zA-Z]:#', $path) || false !== strpos($path, ':', 2)) {
+                    return;
+                }
+            } else {
+                return;
+            }
+        }
+        if(preg_match('#[^/a-zA-Z0-9_\.\-\\\s:]#', $path)) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '/.')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '..')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if ($path) {
+            $this->language_path = ('/' == $path[strlen($path) - 1]) ? $path : $path . '/';
+            $this->set_language($this->language); // otherwise set_language_path has no effect
+        }
+    }
+
+    /**
+     * Get supported langs or an associative array lang=>full_name.
+     * @param boolean $longnames
+     * @return array
+     */
+    function get_supported_languages($full_names=false)
+    {
+        // return array
+        $back = array();
+
+        // we walk the lang root
+        $dir = dir($this->language_path);
+
+        // foreach entry
+        while (false !== ($entry = $dir->read()))
+        {
+            $full_path = $this->language_path.$entry;
+
+            // Skip all dirs
+            if (is_dir($full_path)) {
+                continue;
+            }
+
+            // we only want lang.php files
+            if (!preg_match('/^([^.]+)\.php$/', $entry, $matches)) {
+                continue;
+            }
+
+            // Raw lang name is here
+            $langname = $matches[1];
+
+            // We want the fullname too?
+            if ($full_names === true)
+            {
+                if (false !== ($fullname = $this->get_language_fullname($langname)))
+                {
+                    $back[$langname] = $fullname; // we go associative
+                }
+            }
+            else
+            {
+                // just store raw langname
+                $back[] = $langname;
+            }
+        }
+
+        $dir->close();
+
+        return $back;
+    }
+
+    /**
+     * Get full_name for a lang or false.
+     * @param string $language short langname (html4strict for example)
+     * @return mixed
+     */
+    function get_language_fullname($language)
+    {
+        //Clean up the language name to prevent malicious code injection
+        $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language);
+
+        $language = strtolower($language);
+
+        // get fullpath-filename for a langname
+        $fullpath = $this->language_path.$language.'.php';
+
+        // we need to get contents :S
+        if (false === ($data = file_get_contents($fullpath))) {
+            $this->error = sprintf('Geshi::get_lang_fullname() Unknown Language: %s', $language);
+            return false;
+        }
+
+        // match the langname
+        if (!preg_match('/\'LANG_NAME\'\s*=>\s*\'((?:[^\']|\\\')+?)\'/', $data, $matches)) {
+            $this->error = sprintf('Geshi::get_lang_fullname(%s): Regex can not detect language', $language);
+            return false;
+        }
+
+        // return fullname for langname
+        return stripcslashes($matches[1]);
+    }
+
+    /**
+     * Sets the type of header to be used.
+     *
+     * If GESHI_HEADER_DIV is used, the code is surrounded in a "div".This
+     * means more source code but more control over tab width and line-wrapping.
+     * GESHI_HEADER_PRE means that a "pre" is used - less source, but less
+     * control. Default is GESHI_HEADER_PRE.
+     *
+     * From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code
+     * should be outputted.
+     *
+     * @param int The type of header to be used
+     * @since 1.0.0
+     */
+    function set_header_type($type) {
+        //Check if we got a valid header type
+        if (!in_array($type, array(GESHI_HEADER_NONE, GESHI_HEADER_DIV,
+            GESHI_HEADER_PRE, GESHI_HEADER_PRE_VALID, GESHI_HEADER_PRE_TABLE))) {
+            $this->error = GESHI_ERROR_INVALID_HEADER_TYPE;
+            return;
+        }
+
+        //Set that new header type
+        $this->header_type = $type;
+    }
+
+    /**
+     * Sets the styles for the code that will be outputted
+     * when this object is parsed. The style should be a
+     * string of valid stylesheet declarations
+     *
+     * @param string  The overall style for the outputted code block
+     * @param boolean Whether to merge the styles with the current styles or not
+     * @since 1.0.0
+     */
+    function set_overall_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->overall_style = $style;
+        } else {
+            $this->overall_style .= $style;
+        }
+    }
+
+    /**
+     * Sets the overall classname for this block of code. This
+     * class can then be used in a stylesheet to style this object's
+     * output
+     *
+     * @param string The class name to use for this block of code
+     * @since 1.0.0
+     */
+    function set_overall_class($class) {
+        $this->overall_class = $class;
+    }
+
+    /**
+     * Sets the overall id for this block of code. This id can then
+     * be used in a stylesheet to style this object's output
+     *
+     * @param string The ID to use for this block of code
+     * @since 1.0.0
+     */
+    function set_overall_id($id) {
+        $this->overall_id = $id;
+    }
+
+    /**
+     * Sets whether CSS classes should be used to highlight the source. Default
+     * is off, calling this method with no arguments will turn it on
+     *
+     * @param boolean Whether to turn classes on or not
+     * @since 1.0.0
+     */
+    function enable_classes($flag = true) {
+        $this->use_classes = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the style for the actual code. This should be a string
+     * containing valid stylesheet declarations. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * Note: Use this method to override any style changes you made to
+     * the line numbers if you are using line numbers, else the line of
+     * code will have the same style as the line number! Consult the
+     * GeSHi documentation for more information about this.
+     *
+     * @param string  The style to use for actual code
+     * @param boolean Whether to merge the current styles with the new styles
+     * @since 1.0.2
+     */
+    function set_code_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->code_style = $style;
+        } else {
+            $this->code_style .= $style;
+        }
+    }
+
+    /**
+     * Sets the styles for the line numbers.
+     *
+     * @param string The style for the line numbers that are "normal"
+     * @param string|boolean If a string, this is the style of the line
+     *        numbers that are "fancy", otherwise if boolean then this
+     *        defines whether the normal styles should be merged with the
+     *        new normal styles or not
+     * @param boolean If set, is the flag for whether to merge the "fancy"
+     *        styles with the current styles or not
+     * @since 1.0.2
+     */
+    function set_line_style($style1, $style2 = '', $preserve_defaults = false) {
+        //Check if we got 2 or three parameters
+        if (is_bool($style2)) {
+            $preserve_defaults = $style2;
+            $style2 = '';
+        }
+
+        //Actually set the new styles
+        if (!$preserve_defaults) {
+            $this->line_style1 = $style1;
+            $this->line_style2 = $style2;
+        } else {
+            $this->line_style1 .= $style1;
+            $this->line_style2 .= $style2;
+        }
+    }
+
+    /**
+     * Sets whether line numbers should be displayed.
+     *
+     * Valid values for the first parameter are:
+     *
+     *  - GESHI_NO_LINE_NUMBERS: Line numbers will not be displayed
+     *  - GESHI_NORMAL_LINE_NUMBERS: Line numbers will be displayed
+     *  - GESHI_FANCY_LINE_NUMBERS: Fancy line numbers will be displayed
+     *
+     * For fancy line numbers, the second parameter is used to signal which lines
+     * are to be fancy. For example, if the value of this parameter is 5 then every
+     * 5th line will be fancy.
+     *
+     * @param int How line numbers should be displayed
+     * @param int Defines which lines are fancy
+     * @since 1.0.0
+     */
+    function enable_line_numbers($flag, $nth_row = 5) {
+        if (GESHI_NO_LINE_NUMBERS != $flag && GESHI_NORMAL_LINE_NUMBERS != $flag
+            && GESHI_FANCY_LINE_NUMBERS != $flag) {
+            $this->error = GESHI_ERROR_INVALID_LINE_NUMBER_TYPE;
+        }
+        $this->line_numbers = $flag;
+        $this->line_nth_row = $nth_row;
+    }
+
+    /**
+     * Sets wether spans and other HTML markup generated by GeSHi can
+     * span over multiple lines or not. Defaults to true to reduce overhead.
+     * Set it to false if you want to manipulate the output or manually display
+     * the code in an ordered list.
+     *
+     * @param boolean Wether multiline spans are allowed or not
+     * @since 1.0.7.22
+     */
+    function enable_multiline_span($flag) {
+        $this->allow_multiline_span = (bool) $flag;
+    }
+
+    /**
+     * Get current setting for multiline spans, see GeSHi->enable_multiline_span().
+     *
+     * @see enable_multiline_span
+     * @return bool
+     */
+    function get_multiline_span() {
+        return $this->allow_multiline_span;
+    }
+
+    /**
+     * Sets the style for a keyword group. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param int     The key of the keyword group to change the styles of
+     * @param string  The style to make the keywords
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_keyword_group_style($key, $style, $preserve_defaults = false) {
+        //Set the style for this keyword group
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['KEYWORDS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['KEYWORDS'][$key] .= $style;
+        }
+
+        //Update the lexic permissions
+        if (!isset($this->lexic_permissions['KEYWORDS'][$key])) {
+            $this->lexic_permissions['KEYWORDS'][$key] = true;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for a keyword group
+     *
+     * @param int     The key of the keyword group to turn on or off
+     * @param boolean Whether to turn highlighting for that group on or off
+     * @since 1.0.0
+     */
+    function set_keyword_group_highlighting($key, $flag = true) {
+        $this->lexic_permissions['KEYWORDS'][$key] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for comment groups.  If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param int     The key of the comment group to change the styles of
+     * @param string  The style to make the comments
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_comments_style($key, $style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['COMMENTS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['COMMENTS'][$key] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for comment groups
+     *
+     * @param int     The key of the comment group to turn on or off
+     * @param boolean Whether to turn highlighting for that group on or off
+     * @since 1.0.0
+     */
+    function set_comments_highlighting($key, $flag = true) {
+        $this->lexic_permissions['COMMENTS'][$key] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for escaped characters. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the escape characters
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_escape_characters_style($style, $preserve_defaults = false, $group = 0) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for escaped characters
+     *
+     * @param boolean Whether to turn highlighting for escape characters on or off
+     * @since 1.0.0
+     */
+    function set_escape_characters_highlighting($flag = true) {
+        $this->lexic_permissions['ESCAPE_CHAR'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for brackets. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * This method is DEPRECATED: use set_symbols_style instead.
+     * This method will be removed in 1.2.X
+     *
+     * @param string  The style to make the brackets
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     * @deprecated In favour of set_symbols_style
+     */
+    function set_brackets_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['BRACKETS'][0] = $style;
+        } else {
+            $this->language_data['STYLES']['BRACKETS'][0] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for brackets
+     *
+     * This method is DEPRECATED: use set_symbols_highlighting instead.
+     * This method will be remove in 1.2.X
+     *
+     * @param boolean Whether to turn highlighting for brackets on or off
+     * @since 1.0.0
+     * @deprecated In favour of set_symbols_highlighting
+     */
+    function set_brackets_highlighting($flag) {
+        $this->lexic_permissions['BRACKETS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for symbols. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the symbols
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @param int     Tells the group of symbols for which style should be set.
+     * @since 1.0.1
+     */
+    function set_symbols_style($style, $preserve_defaults = false, $group = 0) {
+        // Update the style of symbols
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['SYMBOLS'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['SYMBOLS'][$group] .= $style;
+        }
+
+        // For backward compatibility
+        if (0 == $group) {
+            $this->set_brackets_style ($style, $preserve_defaults);
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for symbols
+     *
+     * @param boolean Whether to turn highlighting for symbols on or off
+     * @since 1.0.0
+     */
+    function set_symbols_highlighting($flag) {
+        // Update lexic permissions for this symbol group
+        $this->lexic_permissions['SYMBOLS'] = ($flag) ? true : false;
+
+        // For backward compatibility
+        $this->set_brackets_highlighting ($flag);
+    }
+
+    /**
+     * Sets the styles for strings. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the escape characters
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @param int     Tells the group of strings for which style should be set.
+     * @since 1.0.0
+     */
+    function set_strings_style($style, $preserve_defaults = false, $group = 0) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['STRINGS'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['STRINGS'][$group] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for strings
+     *
+     * @param boolean Whether to turn highlighting for strings on or off
+     * @since 1.0.0
+     */
+    function set_strings_highlighting($flag) {
+        $this->lexic_permissions['STRINGS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for strict code blocks. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the script blocks
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @param int     Tells the group of script blocks for which style should be set.
+     * @since 1.0.8.4
+     */
+    function set_script_style($style, $preserve_defaults = false, $group = 0) {
+        // Update the style of symbols
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['SCRIPT'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['SCRIPT'][$group] .= $style;
+        }
+    }
+
+    /**
+     * Sets the styles for numbers. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the numbers
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @param int     Tells the group of numbers for which style should be set.
+     * @since 1.0.0
+     */
+    function set_numbers_style($style, $preserve_defaults = false, $group = 0) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['NUMBERS'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['NUMBERS'][$group] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for numbers
+     *
+     * @param boolean Whether to turn highlighting for numbers on or off
+     * @since 1.0.0
+     */
+    function set_numbers_highlighting($flag) {
+        $this->lexic_permissions['NUMBERS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for methods. $key is a number that references the
+     * appropriate "object splitter" - see the language file for the language
+     * you are highlighting to get this number. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param int     The key of the object splitter to change the styles of
+     * @param string  The style to make the methods
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_methods_style($key, $style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['METHODS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['METHODS'][$key] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for methods
+     *
+     * @param boolean Whether to turn highlighting for methods on or off
+     * @since 1.0.0
+     */
+    function set_methods_highlighting($flag) {
+        $this->lexic_permissions['METHODS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for regexps. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the regular expression matches
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_regexps_style($key, $style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['REGEXPS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['REGEXPS'][$key] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for regexps
+     *
+     * @param int     The key of the regular expression group to turn on or off
+     * @param boolean Whether to turn highlighting for the regular expression group on or off
+     * @since 1.0.0
+     */
+    function set_regexps_highlighting($key, $flag) {
+        $this->lexic_permissions['REGEXPS'][$key] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets whether a set of keywords are checked for in a case sensitive manner
+     *
+     * @param int The key of the keyword group to change the case sensitivity of
+     * @param boolean Whether to check in a case sensitive manner or not
+     * @since 1.0.0
+     */
+    function set_case_sensitivity($key, $case) {
+        $this->language_data['CASE_SENSITIVE'][$key] = ($case) ? true : false;
+    }
+
+    /**
+     * Sets the case that keywords should use when found. Use the constants:
+     *
+     *  - GESHI_CAPS_NO_CHANGE: leave keywords as-is
+     *  - GESHI_CAPS_UPPER: convert all keywords to uppercase where found
+     *  - GESHI_CAPS_LOWER: convert all keywords to lowercase where found
+     *
+     * @param int A constant specifying what to do with matched keywords
+     * @since 1.0.1
+     */
+    function set_case_keywords($case) {
+        if (in_array($case, array(
+            GESHI_CAPS_NO_CHANGE, GESHI_CAPS_UPPER, GESHI_CAPS_LOWER))) {
+            $this->language_data['CASE_KEYWORDS'] = $case;
+        }
+    }
+
+    /**
+     * Sets how many spaces a tab is substituted for
+     *
+     * Widths below zero are ignored
+     *
+     * @param int The tab width
+     * @since 1.0.0
+     */
+    function set_tab_width($width) {
+        $this->tab_width = intval($width);
+
+        //Check if it fit's the constraints:
+        if ($this->tab_width < 1) {
+            //Return it to the default
+            $this->tab_width = 8;
+        }
+    }
+
+    /**
+     * Sets whether or not to use tab-stop width specifed by language
+     *
+     * @param boolean Whether to use language-specific tab-stop widths
+     * @since 1.0.7.20
+     */
+    function set_use_language_tab_width($use) {
+        $this->use_language_tab_width = (bool) $use;
+    }
+
+    /**
+     * Returns the tab width to use, based on the current language and user
+     * preference
+     *
+     * @return int Tab width
+     * @since 1.0.7.20
+     */
+    function get_real_tab_width() {
+        if (!$this->use_language_tab_width ||
+            !isset($this->language_data['TAB_WIDTH'])) {
+            return $this->tab_width;
+        } else {
+            return $this->language_data['TAB_WIDTH'];
+        }
+    }
+
+    /**
+     * Enables/disables strict highlighting. Default is off, calling this
+     * method without parameters will turn it on. See documentation
+     * for more details on strict mode and where to use it.
+     *
+     * @param boolean Whether to enable strict mode or not
+     * @since 1.0.0
+     */
+    function enable_strict_mode($mode = true) {
+        if (GESHI_MAYBE == $this->language_data['STRICT_MODE_APPLIES']) {
+            $this->strict_mode = ($mode) ? GESHI_ALWAYS : GESHI_NEVER;
+        }
+    }
+
+    /**
+     * Disables all highlighting
+     *
+     * @since 1.0.0
+     * @todo  Rewrite with array traversal
+     * @deprecated In favour of enable_highlighting
+     */
+    function disable_highlighting() {
+        $this->enable_highlighting(false);
+    }
+
+    /**
+     * Enables all highlighting
+     *
+     * The optional flag parameter was added in version 1.0.7.21 and can be used
+     * to enable (true) or disable (false) all highlighting.
+     *
+     * @since 1.0.0
+     * @param boolean A flag specifying whether to enable or disable all highlighting
+     * @todo  Rewrite with array traversal
+     */
+    function enable_highlighting($flag = true) {
+        $flag = $flag ? true : false;
+        foreach ($this->lexic_permissions as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $k => $v) {
+                    $this->lexic_permissions[$key][$k] = $flag;
+                }
+            } else {
+                $this->lexic_permissions[$key] = $flag;
+            }
+        }
+
+        // Context blocks
+        $this->enable_important_blocks = $flag;
+    }
+
+    /**
+     * Given a file extension, this method returns either a valid geshi language
+     * name, or the empty string if it couldn't be found
+     *
+     * @param string The extension to get a language name for
+     * @param array  A lookup array to use instead of the default one
+     * @since 1.0.5
+     * @todo Re-think about how this method works (maybe make it private and/or make it
+     *       a extension->lang lookup?)
+     * @todo static?
+     */
+    function get_language_name_from_extension( $extension, $lookup = array() ) {
+        $extension = strtolower($extension);
+
+        if ( !is_array($lookup) || empty($lookup)) {
+            $lookup = array(
+                '6502acme' => array( 'a', 's', 'asm', 'inc' ),
+                '6502tasm' => array( 'a', 's', 'asm', 'inc' ),
+                '6502kickass' => array( 'a', 's', 'asm', 'inc' ),
+                '68000devpac' => array( 'a', 's', 'asm', 'inc' ),
+                'abap' => array('abap'),
+                'actionscript' => array('as'),
+                'ada' => array('a', 'ada', 'adb', 'ads'),
+                'apache' => array('conf'),
+                'asm' => array('ash', 'asm', 'inc'),
+                'asp' => array('asp'),
+                'bash' => array('sh'),
+                'bf' => array('bf'),
+                'c' => array('c', 'h'),
+                'c_mac' => array('c', 'h'),
+                'caddcl' => array(),
+                'cadlisp' => array(),
+                'cdfg' => array('cdfg'),
+                'cobol' => array('cbl'),
+                'cpp' => array('cpp', 'hpp', 'C', 'H', 'CPP', 'HPP'),
+                'csharp' => array('cs'),
+                'css' => array('css'),
+                'd' => array('d'),
+                'delphi' => array('dpk', 'dpr', 'pp', 'pas'),
+                'diff' => array('diff', 'patch'),
+                'dos' => array('bat', 'cmd'),
+                'gdb' => array('kcrash', 'crash', 'bt'),
+                'gettext' => array('po', 'pot'),
+                'gml' => array('gml'),
+                'gnuplot' => array('plt'),
+                'groovy' => array('groovy'),
+                'haskell' => array('hs'),
+                'haxe' => array('hx'),
+                'html4strict' => array('html', 'htm'),
+                'ini' => array('ini', 'desktop'),
+                'java' => array('java'),
+                'javascript' => array('js'),
+                'klonec' => array('kl1'),
+                'klonecpp' => array('klx'),
+                'latex' => array('tex'),
+                'lisp' => array('lisp'),
+                'lua' => array('lua'),
+                'matlab' => array('m'),
+                'mpasm' => array(),
+                'mysql' => array('sql'),
+                'nsis' => array(),
+                'objc' => array(),
+                'oobas' => array(),
+                'oracle8' => array(),
+                'oracle10' => array(),
+                'pascal' => array('pas'),
+                'perl' => array('pl', 'pm'),
+                'php' => array('php', 'php5', 'phtml', 'phps'),
+                'povray' => array('pov'),
+                'providex' => array('pvc', 'pvx'),
+                'prolog' => array('pl'),
+                'python' => array('py'),
+                'qbasic' => array('bi'),
+                'reg' => array('reg'),
+                'ruby' => array('rb'),
+                'sas' => array('sas'),
+                'scala' => array('scala'),
+                'scheme' => array('scm'),
+                'scilab' => array('sci'),
+                'smalltalk' => array('st'),
+                'smarty' => array(),
+                'tcl' => array('tcl'),
+                'text' => array('txt'),
+                'vb' => array('bas'),
+                'vbnet' => array(),
+                'visualfoxpro' => array(),
+                'whitespace' => array('ws'),
+                'xml' => array('xml', 'svg', 'xrc'),
+                'z80' => array('z80', 'asm', 'inc')
+            );
+        }
+
+        foreach ($lookup as $lang => $extensions) {
+            if (in_array($extension, $extensions)) {
+                return $lang;
+            }
+        }
+
+        return 'text';
+    }
+
+    /**
+     * Given a file name, this method loads its contents in, and attempts
+     * to set the language automatically. An optional lookup table can be
+     * passed for looking up the language name. If not specified a default
+     * table is used
+     *
+     * The language table is in the form
+     * <pre>array(
+     *   'lang_name' => array('extension', 'extension', ...),
+     *   'lang_name' ...
+     * );</pre>
+     *
+     * @param string The filename to load the source from
+     * @param array  A lookup array to use instead of the default one
+     * @todo Complete rethink of this and above method
+     * @since 1.0.5
+     */
+    function load_from_file($file_name, $lookup = array()) {
+        if (is_readable($file_name)) {
+            $this->set_source(file_get_contents($file_name));
+            $this->set_language($this->get_language_name_from_extension(substr(strrchr($file_name, '.'), 1), $lookup));
+        } else {
+            $this->error = GESHI_ERROR_FILE_NOT_READABLE;
+        }
+    }
+
+    /**
+     * Adds a keyword to a keyword group for highlighting
+     *
+     * @param int    The key of the keyword group to add the keyword to
+     * @param string The word to add to the keyword group
+     * @since 1.0.0
+     */
+    function add_keyword($key, $word) {
+        if (!is_array($this->language_data['KEYWORDS'][$key])) {
+            $this->language_data['KEYWORDS'][$key] = array();
+        }
+        if (!in_array($word, $this->language_data['KEYWORDS'][$key])) {
+            $this->language_data['KEYWORDS'][$key][] = $word;
+
+            //NEW in 1.0.8 don't recompile the whole optimized regexp, simply append it
+            if ($this->parse_cache_built) {
+                $subkey = count($this->language_data['CACHED_KEYWORD_LISTS'][$key]) - 1;
+                $this->language_data['CACHED_KEYWORD_LISTS'][$key][$subkey] .= '|' . preg_quote($word, '/');
+            }
+        }
+    }
+
+    /**
+     * Removes a keyword from a keyword group
+     *
+     * @param int    The key of the keyword group to remove the keyword from
+     * @param string The word to remove from the keyword group
+     * @param bool   Wether to automatically recompile the optimized regexp list or not.
+     *               Note: if you set this to false and @see GeSHi->parse_code() was already called once,
+     *               for the current language, you have to manually call @see GeSHi->optimize_keyword_group()
+     *               or the removed keyword will stay in cache and still be highlighted! On the other hand
+     *               it might be too expensive to recompile the regexp list for every removal if you want to
+     *               remove a lot of keywords.
+     * @since 1.0.0
+     */
+    function remove_keyword($key, $word, $recompile = true) {
+        $key_to_remove = array_search($word, $this->language_data['KEYWORDS'][$key]);
+        if ($key_to_remove !== false) {
+            unset($this->language_data['KEYWORDS'][$key][$key_to_remove]);
+
+            //NEW in 1.0.8, optionally recompile keyword group
+            if ($recompile && $this->parse_cache_built) {
+                $this->optimize_keyword_group($key);
+            }
+        }
+    }
+
+    /**
+     * Creates a new keyword group
+     *
+     * @param int    The key of the keyword group to create
+     * @param string The styles for the keyword group
+     * @param boolean Whether the keyword group is case sensitive ornot
+     * @param array  The words to use for the keyword group
+     * @since 1.0.0
+     */
+    function add_keyword_group($key, $styles, $case_sensitive = true, $words = array()) {
+        $words = (array) $words;
+        if  (empty($words)) {
+            // empty word lists mess up highlighting
+            return false;
+        }
+
+        //Add the new keyword group internally
+        $this->language_data['KEYWORDS'][$key] = $words;
+        $this->lexic_permissions['KEYWORDS'][$key] = true;
+        $this->language_data['CASE_SENSITIVE'][$key] = $case_sensitive;
+        $this->language_data['STYLES']['KEYWORDS'][$key] = $styles;
+
+        //NEW in 1.0.8, cache keyword regexp
+        if ($this->parse_cache_built) {
+            $this->optimize_keyword_group($key);
+        }
+    }
+
+    /**
+     * Removes a keyword group
+     *
+     * @param int    The key of the keyword group to remove
+     * @since 1.0.0
+     */
+    function remove_keyword_group ($key) {
+        //Remove the keyword group internally
+        unset($this->language_data['KEYWORDS'][$key]);
+        unset($this->lexic_permissions['KEYWORDS'][$key]);
+        unset($this->language_data['CASE_SENSITIVE'][$key]);
+        unset($this->language_data['STYLES']['KEYWORDS'][$key]);
+
+        //NEW in 1.0.8
+        unset($this->language_data['CACHED_KEYWORD_LISTS'][$key]);
+    }
+
+    /**
+     * compile optimized regexp list for keyword group
+     *
+     * @param int   The key of the keyword group to compile & optimize
+     * @since 1.0.8
+     */
+    function optimize_keyword_group($key) {
+        $this->language_data['CACHED_KEYWORD_LISTS'][$key] =
+            $this->optimize_regexp_list($this->language_data['KEYWORDS'][$key]);
+        $space_as_whitespace = false;
+        if(isset($this->language_data['PARSER_CONTROL'])) {
+            if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
+                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'])) {
+                    $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'];
+                }
+                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
+                    if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
+                        $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'];
+                    }
+                }
+            }
+        }
+        if($space_as_whitespace) {
+            foreach($this->language_data['CACHED_KEYWORD_LISTS'][$key] as $rxk => $rxv) {
+                $this->language_data['CACHED_KEYWORD_LISTS'][$key][$rxk] =
+                    str_replace(" ", "\\s+", $rxv);
+            }
+        }
+    }
+
+    /**
+     * Sets the content of the header block
+     *
+     * @param string The content of the header block
+     * @since 1.0.2
+     */
+    function set_header_content($content) {
+        $this->header_content = $content;
+    }
+
+    /**
+     * Sets the content of the footer block
+     *
+     * @param string The content of the footer block
+     * @since 1.0.2
+     */
+    function set_footer_content($content) {
+        $this->footer_content = $content;
+    }
+
+    /**
+     * Sets the style for the header content
+     *
+     * @param string The style for the header content
+     * @since 1.0.2
+     */
+    function set_header_content_style($style) {
+        $this->header_content_style = $style;
+    }
+
+    /**
+     * Sets the style for the footer content
+     *
+     * @param string The style for the footer content
+     * @since 1.0.2
+     */
+    function set_footer_content_style($style) {
+        $this->footer_content_style = $style;
+    }
+
+    /**
+     * Sets whether to force a surrounding block around
+     * the highlighted code or not
+     *
+     * @param boolean Tells whether to enable or disable this feature
+     * @since 1.0.7.20
+     */
+    function enable_inner_code_block($flag) {
+        $this->force_code_block = (bool)$flag;
+    }
+
+    /**
+     * Sets the base URL to be used for keywords
+     *
+     * @param int The key of the keyword group to set the URL for
+     * @param string The URL to set for the group. If {FNAME} is in
+     *               the url somewhere, it is replaced by the keyword
+     *               that the URL is being made for
+     * @since 1.0.2
+     */
+    function set_url_for_keyword_group($group, $url) {
+        $this->language_data['URLS'][$group] = $url;
+    }
+
+    /**
+     * Sets styles for links in code
+     *
+     * @param int A constant that specifies what state the style is being
+     *            set for - e.g. :hover or :visited
+     * @param string The styles to use for that state
+     * @since 1.0.2
+     */
+    function set_link_styles($type, $styles) {
+        $this->link_styles[$type] = $styles;
+    }
+
+    /**
+     * Sets the target for links in code
+     *
+     * @param string The target for links in the code, e.g. _blank
+     * @since 1.0.3
+     */
+    function set_link_target($target) {
+        if (!$target) {
+            $this->link_target = '';
+        } else {
+            $this->link_target = ' target="' . $target . '"';
+        }
+    }
+
+    /**
+     * Sets styles for important parts of the code
+     *
+     * @param string The styles to use on important parts of the code
+     * @since 1.0.2
+     */
+    function set_important_styles($styles) {
+        $this->important_styles = $styles;
+    }
+
+    /**
+     * Sets whether context-important blocks are highlighted
+     *
+     * @param boolean Tells whether to enable or disable highlighting of important blocks
+     * @todo REMOVE THIS SHIZ FROM GESHI!
+     * @deprecated
+     * @since 1.0.2
+     */
+    function enable_important_blocks($flag) {
+        $this->enable_important_blocks = ( $flag ) ? true : false;
+    }
+
+    /**
+     * Whether CSS IDs should be added to each line
+     *
+     * @param boolean If true, IDs will be added to each line.
+     * @since 1.0.2
+     */
+    function enable_ids($flag = true) {
+        $this->add_ids = ($flag) ? true : false;
+    }
+
+    /**
+     * Specifies which lines to highlight extra
+     *
+     * The extra style parameter was added in 1.0.7.21.
+     *
+     * @param mixed An array of line numbers to highlight, or just a line
+     *              number on its own.
+     * @param string A string specifying the style to use for this line.
+     *              If null is specified, the default style is used.
+     *              If false is specified, the line will be removed from
+     *              special highlighting
+     * @since 1.0.2
+     * @todo  Some data replication here that could be cut down on
+     */
+    function highlight_lines_extra($lines, $style = null) {
+        if (is_array($lines)) {
+            //Split up the job using single lines at a time
+            foreach ($lines as $line) {
+                $this->highlight_lines_extra($line, $style);
+            }
+        } else {
+            //Mark the line as being highlighted specially
+            $lines = intval($lines);
+            $this->highlight_extra_lines[$lines] = $lines;
+
+            //Decide on which style to use
+            if ($style === null) { //Check if we should use default style
+                unset($this->highlight_extra_lines_styles[$lines]);
+            } elseif ($style === false) { //Check if to remove this line
+                unset($this->highlight_extra_lines[$lines]);
+                unset($this->highlight_extra_lines_styles[$lines]);
+            } else {
+                $this->highlight_extra_lines_styles[$lines] = $style;
+            }
+        }
+    }
+
+    /**
+     * Sets the style for extra-highlighted lines
+     *
+     * @param string The style for extra-highlighted lines
+     * @since 1.0.2
+     */
+    function set_highlight_lines_extra_style($styles) {
+        $this->highlight_extra_lines_style = $styles;
+    }
+
+    /**
+     * Sets the line-ending
+     *
+     * @param string The new line-ending
+     * @since 1.0.2
+     */
+    function set_line_ending($line_ending) {
+        $this->line_ending = (string)$line_ending;
+    }
+
+    /**
+     * Sets what number line numbers should start at. Should
+     * be a positive integer, and will be converted to one.
+     *
+     * <b>Warning:</b> Using this method will add the "start"
+     * attribute to the &lt;ol&gt; that is used for line numbering.
+     * This is <b>not</b> valid XHTML strict, so if that's what you
+     * care about then don't use this method. Firefox is getting
+     * support for the CSS method of doing this in 1.1 and Opera
+     * has support for the CSS method, but (of course) IE doesn't
+     * so it's not worth doing it the CSS way yet.
+     *
+     * @param int The number to start line numbers at
+     * @since 1.0.2
+     */
+    function start_line_numbers_at($number) {
+        $this->line_numbers_start = abs(intval($number));
+    }
+
+    /**
+     * Sets the encoding used for htmlspecialchars(), for international
+     * support.
+     *
+     * NOTE: This is not needed for now because htmlspecialchars() is not
+     * being used (it has a security hole in PHP4 that has not been patched).
+     * Maybe in a future version it may make a return for speed reasons, but
+     * I doubt it.
+     *
+     * @param string The encoding to use for the source
+     * @since 1.0.3
+     */
+    function set_encoding($encoding) {
+        if ($encoding) {
+          $this->encoding = strtolower($encoding);
+        }
+    }
+
+    /**
+     * Turns linking of keywords on or off.
+     *
+     * @param boolean If true, links will be added to keywords
+     * @since 1.0.2
+     */
+    function enable_keyword_links($enable = true) {
+        $this->keyword_links = (bool) $enable;
+    }
+
+    /**
+     * Setup caches needed for styling. This is automatically called in
+     * parse_code() and get_stylesheet() when appropriate. This function helps
+     * stylesheet generators as they rely on some style information being
+     * preprocessed
+     *
+     * @since 1.0.8
+     * @access private
+     */
+    function build_style_cache() {
+        //Build the style cache needed to highlight numbers appropriate
+        if($this->lexic_permissions['NUMBERS']) {
+            //First check what way highlighting information for numbers are given
+            if(!isset($this->language_data['NUMBERS'])) {
+                $this->language_data['NUMBERS'] = 0;
+            }
+
+            if(is_array($this->language_data['NUMBERS'])) {
+                $this->language_data['NUMBERS_CACHE'] = $this->language_data['NUMBERS'];
+            } else {
+                $this->language_data['NUMBERS_CACHE'] = array();
+                if(!$this->language_data['NUMBERS']) {
+                    $this->language_data['NUMBERS'] =
+                        GESHI_NUMBER_INT_BASIC |
+                        GESHI_NUMBER_FLT_NONSCI;
+                }
+
+                for($i = 0, $j = $this->language_data['NUMBERS']; $j > 0; ++$i, $j>>=1) {
+                    //Rearrange style indices if required ...
+                    if(isset($this->language_data['STYLES']['NUMBERS'][1<<$i])) {
+                        $this->language_data['STYLES']['NUMBERS'][$i] =
+                            $this->language_data['STYLES']['NUMBERS'][1<<$i];
+                        unset($this->language_data['STYLES']['NUMBERS'][1<<$i]);
+                    }
+
+                    //Check if this bit is set for highlighting
+                    if($j&1) {
+                        //So this bit is set ...
+                        //Check if it belongs to group 0 or the actual stylegroup
+                        if(isset($this->language_data['STYLES']['NUMBERS'][$i])) {
+                            $this->language_data['NUMBERS_CACHE'][$i] = 1 << $i;
+                        } else {
+                            if(!isset($this->language_data['NUMBERS_CACHE'][0])) {
+                                $this->language_data['NUMBERS_CACHE'][0] = 0;
+                            }
+                            $this->language_data['NUMBERS_CACHE'][0] |= 1 << $i;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Setup caches needed for parsing. This is automatically called in parse_code() when appropriate.
+     * This function makes stylesheet generators much faster as they do not need these caches.
+     *
+     * @since 1.0.8
+     * @access private
+     */
+    function build_parse_cache() {
+        // cache symbol regexp
+        //As this is a costy operation, we avoid doing it for multiple groups ...
+        //Instead we perform it for all symbols at once.
+        //
+        //For this to work, we need to reorganize the data arrays.
+        if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) {
+            $this->language_data['MULTIPLE_SYMBOL_GROUPS'] = count($this->language_data['STYLES']['SYMBOLS']) > 1;
+
+            $this->language_data['SYMBOL_DATA'] = array();
+            $symbol_preg_multi = array(); // multi char symbols
+            $symbol_preg_single = array(); // single char symbols
+            foreach ($this->language_data['SYMBOLS'] as $key => $symbols) {
+                if (is_array($symbols)) {
+                    foreach ($symbols as $sym) {
+                        $sym = $this->hsc($sym);
+                        if (!isset($this->language_data['SYMBOL_DATA'][$sym])) {
+                            $this->language_data['SYMBOL_DATA'][$sym] = $key;
+                            if (isset($sym[1])) { // multiple chars
+                                $symbol_preg_multi[] = preg_quote($sym, '/');
+                            } else { // single char
+                                if ($sym == '-') {
+                                    // don't trigger range out of order error
+                                    $symbol_preg_single[] = '\-';
+                                } else {
+                                    $symbol_preg_single[] = preg_quote($sym, '/');
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    $symbols = $this->hsc($symbols);
+                    if (!isset($this->language_data['SYMBOL_DATA'][$symbols])) {
+                        $this->language_data['SYMBOL_DATA'][$symbols] = 0;
+                        if (isset($symbols[1])) { // multiple chars
+                            $symbol_preg_multi[] = preg_quote($symbols, '/');
+                        } elseif ($symbols == '-') {
+                            // don't trigger range out of order error
+                            $symbol_preg_single[] = '\-';
+                        } else { // single char
+                            $symbol_preg_single[] = preg_quote($symbols, '/');
+                        }
+                    }
+                }
+            }
+
+            //Now we have an array with each possible symbol as the key and the style as the actual data.
+            //This way we can set the correct style just the moment we highlight ...
+            //
+            //Now we need to rewrite our array to get a search string that
+            $symbol_preg = array();
+            if (!empty($symbol_preg_multi)) {
+                rsort($symbol_preg_multi);
+                $symbol_preg[] = implode('|', $symbol_preg_multi);
+            }
+            if (!empty($symbol_preg_single)) {
+                rsort($symbol_preg_single);
+                $symbol_preg[] = '[' . implode('', $symbol_preg_single) . ']';
+            }
+            $this->language_data['SYMBOL_SEARCH'] = implode("|", $symbol_preg);
+        }
+
+        // cache optimized regexp for keyword matching
+        // remove old cache
+        $this->language_data['CACHED_KEYWORD_LISTS'] = array();
+        foreach (array_keys($this->language_data['KEYWORDS']) as $key) {
+            if (!isset($this->lexic_permissions['KEYWORDS'][$key]) ||
+                    $this->lexic_permissions['KEYWORDS'][$key]) {
+                $this->optimize_keyword_group($key);
+            }
+        }
+
+        // brackets
+        if ($this->lexic_permissions['BRACKETS']) {
+            $this->language_data['CACHE_BRACKET_MATCH'] = array('[', ']', '(', ')', '{', '}');
+            if (!$this->use_classes && isset($this->language_data['STYLES']['BRACKETS'][0])) {
+                $this->language_data['CACHE_BRACKET_REPLACE'] = array(
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#91;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#93;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#40;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#41;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#123;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#125;|>',
+                );
+            }
+            else {
+                $this->language_data['CACHE_BRACKET_REPLACE'] = array(
+                    '<| class="br0">&#91;|>',
+                    '<| class="br0">&#93;|>',
+                    '<| class="br0">&#40;|>',
+                    '<| class="br0">&#41;|>',
+                    '<| class="br0">&#123;|>',
+                    '<| class="br0">&#125;|>',
+                );
+            }
+        }
+
+        //Build the parse cache needed to highlight numbers appropriate
+        if($this->lexic_permissions['NUMBERS']) {
+            //Check if the style rearrangements have been processed ...
+            //This also does some preprocessing to check which style groups are useable ...
+            if(!isset($this->language_data['NUMBERS_CACHE'])) {
+                $this->build_style_cache();
+            }
+
+            //Number format specification
+            //All this formats are matched case-insensitively!
+            static $numbers_format = array(
+                GESHI_NUMBER_INT_BASIC =>
+                    '(?:(?<![0-9a-z_\.%$@])|(?<=\.\.))(?<![\d\.]e[+\-])([1-9]\d*?|0)(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_INT_CSTYLE =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])([1-9]\d*?|0)l(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_BIN_SUFFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])[01]+?[bB](?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_BIN_PREFIX_PERCENT =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])%[01]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_BIN_PREFIX_0B =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])0b[01]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_OCT_PREFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])0[0-7]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_OCT_PREFIX_0O =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])0o[0-7]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_OCT_PREFIX_AT =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])\@[0-7]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_OCT_SUFFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])[0-7]+?o(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_HEX_PREFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])0x[0-9a-fA-F]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_HEX_PREFIX_DOLLAR =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\$[0-9a-fA-F]+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_HEX_SUFFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\d[0-9a-fA-F]*?[hH](?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_FLT_NONSCI =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\d+?\.\d+?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_FLT_NONSCI_F =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])(?:\d+?(?:\.\d*?)?|\.\d+?)f(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_FLT_SCI_SHORT =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\.\d+?(?:e[+\-]?\d+?)?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)',
+                GESHI_NUMBER_FLT_SCI_ZERO =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])(?:\d+?(?:\.\d*?)?|\.\d+?)(?:e[+\-]?\d+?)?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)'
+                );
+
+            //At this step we have an associative array with flag groups for a
+            //specific style or an string denoting a regexp given its index.
+            $this->language_data['NUMBERS_RXCACHE'] = array();
+            foreach($this->language_data['NUMBERS_CACHE'] as $key => $rxdata) {
+                if(is_string($rxdata)) {
+                    $regexp = $rxdata;
+                } else {
+                    //This is a bitfield of number flags to highlight:
+                    //Build an array, implode them together and make this the actual RX
+                    $rxuse = array();
+                    for($i = 1; $i <= $rxdata; $i<<=1) {
+                        if($rxdata & $i) {
+                            $rxuse[] = $numbers_format[$i];
+                        }
+                    }
+                    $regexp = implode("|", $rxuse);
+                }
+
+                $this->language_data['NUMBERS_RXCACHE'][$key] =
+                    "/(?<!<\|\/)(?<!<\|!REG3XP)(?<!<\|\/NUM!)(?<!\d\/>)($regexp)(?!(?:<DOT>|(?>[^\<]))+>)(?![^<]*>)(?!\|>)(?!\/>)/i"; //
+            }
+
+            if(!isset($this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'])) {
+                $this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'] = '#\d#';
+            }
+        }
+
+        $this->parse_cache_built = true;
+    }
+
+    /**
+     * Returns the code in $this->source, highlighted and surrounded by the
+     * nessecary HTML.
+     *
+     * This should only be called ONCE, cos it's SLOW! If you want to highlight
+     * the same source multiple times, you're better off doing a whole lot of
+     * str_replaces to replace the &lt;span&gt;s
+     *
+     * @since 1.0.0
+     */
+    function parse_code () {
+        // Start the timer
+        $start_time = microtime();
+
+        // Replace all newlines to a common form.
+        $code = str_replace("\r\n", "\n", $this->source);
+        $code = str_replace("\r", "\n", $code);
+
+        // Firstly, if there is an error, we won't highlight
+        if ($this->error) {
+            //Escape the source for output
+            $result = $this->hsc($this->source);
+
+            //This fix is related to SF#1923020, but has to be applied regardless of
+            //actually highlighting symbols.
+            $result = str_replace(array('<SEMI>', '<PIPE>'), array(';', '|'), $result);
+
+            // Timing is irrelevant
+            $this->set_time($start_time, $start_time);
+            $this->finalise($result);
+            return $result;
+        }
+
+        // make sure the parse cache is up2date
+        if (!$this->parse_cache_built) {
+            $this->build_parse_cache();
+        }
+
+        // Initialise various stuff
+        $length           = strlen($code);
+        $COMMENT_MATCHED  = false;
+        $stuff_to_parse   = '';
+        $endresult        = '';
+
+        // "Important" selections are handled like multiline comments
+        // @todo GET RID OF THIS SHIZ
+        if ($this->enable_important_blocks) {
+            $this->language_data['COMMENT_MULTI'][GESHI_START_IMPORTANT] = GESHI_END_IMPORTANT;
+        }
+
+        if ($this->strict_mode) {
+            // Break the source into bits. Each bit will be a portion of the code
+            // within script delimiters - for example, HTML between < and >
+            $k = 0;
+            $parts = array();
+            $matches = array();
+            $next_match_pointer = null;
+            // we use a copy to unset delimiters on demand (when they are not found)
+            $delim_copy = $this->language_data['SCRIPT_DELIMITERS'];
+            $i = 0;
+            while ($i < $length) {
+                $next_match_pos = $length + 1; // never true
+                foreach ($delim_copy as $dk => $delimiters) {
+                    if(is_array($delimiters)) {
+                        foreach ($delimiters as $open => $close) {
+                            // make sure the cache is setup properly
+                            if (!isset($matches[$dk][$open])) {
+                                $matches[$dk][$open] = array(
+                                    'next_match' => -1,
+                                    'dk' => $dk,
+
+                                    'open' => $open, // needed for grouping of adjacent code blocks (see below)
+                                    'open_strlen' => strlen($open),
+
+                                    'close' => $close,
+                                    'close_strlen' => strlen($close),
+                                );
+                            }
+                            // Get the next little bit for this opening string
+                            if ($matches[$dk][$open]['next_match'] < $i) {
+                                // only find the next pos if it was not already cached
+                                $open_pos = strpos($code, $open, $i);
+                                if ($open_pos === false) {
+                                    // no match for this delimiter ever
+                                    unset($delim_copy[$dk][$open]);
+                                    continue;
+                                }
+                                $matches[$dk][$open]['next_match'] = $open_pos;
+                            }
+                            if ($matches[$dk][$open]['next_match'] < $next_match_pos) {
+                                //So we got a new match, update the close_pos
+                                $matches[$dk][$open]['close_pos'] =
+                                    strpos($code, $close, $matches[$dk][$open]['next_match']+1);
+
+                                $next_match_pointer =& $matches[$dk][$open];
+                                $next_match_pos = $matches[$dk][$open]['next_match'];
+                            }
+                        }
+                    } else {
+                        //So we should match an RegExp as Strict Block ...
+                        /**
+                         * The value in $delimiters is expected to be an RegExp
+                         * containing exactly 2 matching groups:
+                         *  - Group 1 is the opener
+                         *  - Group 2 is the closer
+                         */
+                        if(!GESHI_PHP_PRE_433 && //Needs proper rewrite to work with PHP >=4.3.0; 4.3.3 is guaranteed to work.
+                            preg_match($delimiters, $code, $matches_rx, PREG_OFFSET_CAPTURE, $i)) {
+                            //We got a match ...
+                            if(isset($matches_rx['start']) && isset($matches_rx['end']))
+                            {
+                                $matches[$dk] = array(
+                                    'next_match' => $matches_rx['start'][1],
+                                    'dk' => $dk,
+
+                                    'close_strlen' => strlen($matches_rx['end'][0]),
+                                    'close_pos' => $matches_rx['end'][1],
+                                    );
+                            } else {
+                                $matches[$dk] = array(
+                                    'next_match' => $matches_rx[1][1],
+                                    'dk' => $dk,
+
+                                    'close_strlen' => strlen($matches_rx[2][0]),
+                                    'close_pos' => $matches_rx[2][1],
+                                    );
+                            }
+                        } else {
+                            // no match for this delimiter ever
+                            unset($delim_copy[$dk]);
+                            continue;
+                        }
+
+                        if ($matches[$dk]['next_match'] <= $next_match_pos) {
+                            $next_match_pointer =& $matches[$dk];
+                            $next_match_pos = $matches[$dk]['next_match'];
+                        }
+                    }
+                }
+
+                // non-highlightable text
+                $parts[$k] = array(
+                    1 => substr($code, $i, $next_match_pos - $i)
+                );
+                ++$k;
+
+                if ($next_match_pos > $length) {
+                    // out of bounds means no next match was found
+                    break;
+                }
+
+                // highlightable code
+                $parts[$k][0] = $next_match_pointer['dk'];
+
+                //Only combine for non-rx script blocks
+                if(is_array($delim_copy[$next_match_pointer['dk']])) {
+                    // group adjacent script blocks, e.g. <foobar><asdf> should be one block, not three!
+                    $i = $next_match_pos + $next_match_pointer['open_strlen'];
+                    while (true) {
+                        $close_pos = strpos($code, $next_match_pointer['close'], $i);
+                        if ($close_pos == false) {
+                            break;
+                        }
+                        $i = $close_pos + $next_match_pointer['close_strlen'];
+                        if ($i == $length) {
+                            break;
+                        }
+                        if ($code[$i] == $next_match_pointer['open'][0] && ($next_match_pointer['open_strlen'] == 1 ||
+                            substr($code, $i, $next_match_pointer['open_strlen']) == $next_match_pointer['open'])) {
+                            // merge adjacent but make sure we don't merge things like <tag><!-- comment -->
+                            foreach ($matches as $submatches) {
+                                foreach ($submatches as $match) {
+                                    if ($match['next_match'] == $i) {
+                                        // a different block already matches here!
+                                        break 3;
+                                    }
+                                }
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                } else {
+                    $close_pos = $next_match_pointer['close_pos'] + $next_match_pointer['close_strlen'];
+                    $i = $close_pos;
+                }
+
+                if ($close_pos === false) {
+                    // no closing delimiter found!
+                    $parts[$k][1] = substr($code, $next_match_pos);
+                    ++$k;
+                    break;
+                } else {
+                    $parts[$k][1] = substr($code, $next_match_pos, $i - $next_match_pos);
+                    ++$k;
+                }
+            }
+            unset($delim_copy, $next_match_pointer, $next_match_pos, $matches);
+            $num_parts = $k;
+
+            if ($num_parts == 1 && $this->strict_mode == GESHI_MAYBE) {
+                // when we have only one part, we don't have anything to highlight at all.
+                // if we have a "maybe" strict language, this should be handled as highlightable code
+                $parts = array(
+                    0 => array(
+                        0 => '',
+                        1 => ''
+                    ),
+                    1 => array(
+                        0 => null,
+                        1 => $parts[0][1]
+                    )
+                );
+                $num_parts = 2;
+            }
+
+        } else {
+            // Not strict mode - simply dump the source into
+            // the array at index 1 (the first highlightable block)
+            $parts = array(
+                0 => array(
+                    0 => '',
+                    1 => ''
+                ),
+                1 => array(
+                    0 => null,
+                    1 => $code
+                )
+            );
+            $num_parts = 2;
+        }
+
+        //Unset variables we won't need any longer
+        unset($code);
+
+        //Preload some repeatedly used values regarding hardquotes ...
+        $hq = isset($this->language_data['HARDQUOTE']) ? $this->language_data['HARDQUOTE'][0] : false;
+        $hq_strlen = strlen($hq);
+
+        //Preload if line numbers are to be generated afterwards
+        //Added a check if line breaks should be forced even without line numbers, fixes SF#1727398
+        $check_linenumbers = $this->line_numbers != GESHI_NO_LINE_NUMBERS ||
+            !empty($this->highlight_extra_lines) || !$this->allow_multiline_span;
+
+        //preload the escape char for faster checking ...
+        $escaped_escape_char = $this->hsc($this->language_data['ESCAPE_CHAR']);
+
+        // this is used for single-line comments
+        $sc_disallowed_before = "";
+        $sc_disallowed_after = "";
+
+        if (isset($this->language_data['PARSER_CONTROL'])) {
+            if (isset($this->language_data['PARSER_CONTROL']['COMMENTS'])) {
+                if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE'])) {
+                    $sc_disallowed_before = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE'];
+                }
+                if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER'])) {
+                    $sc_disallowed_after = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER'];
+                }
+            }
+        }
+
+        //Fix for SF#1932083: Multichar Quotemarks unsupported
+        $is_string_starter = array();
+        if ($this->lexic_permissions['STRINGS']) {
+            foreach ($this->language_data['QUOTEMARKS'] as $quotemark) {
+                if (!isset($is_string_starter[$quotemark[0]])) {
+                    $is_string_starter[$quotemark[0]] = (string)$quotemark;
+                } elseif (is_string($is_string_starter[$quotemark[0]])) {
+                    $is_string_starter[$quotemark[0]] = array(
+                        $is_string_starter[$quotemark[0]],
+                        $quotemark);
+                } else {
+                    $is_string_starter[$quotemark[0]][] = $quotemark;
+                }
+            }
+        }
+
+        // Now we go through each part. We know that even-indexed parts are
+        // code that shouldn't be highlighted, and odd-indexed parts should
+        // be highlighted
+        for ($key = 0; $key < $num_parts; ++$key) {
+            $STRICTATTRS = '';
+
+            // If this block should be highlighted...
+            if (!($key & 1)) {
+                // Else not a block to highlight
+                $endresult .= $this->hsc($parts[$key][1]);
+                unset($parts[$key]);
+                continue;
+            }
+
+            $result = '';
+            $part = $parts[$key][1];
+
+            $highlight_part = true;
+            if ($this->strict_mode && !is_null($parts[$key][0])) {
+                // get the class key for this block of code
+                $script_key = $parts[$key][0];
+                $highlight_part = $this->language_data['HIGHLIGHT_STRICT_BLOCK'][$script_key];
+                if ($this->language_data['STYLES']['SCRIPT'][$script_key] != '' &&
+                    $this->lexic_permissions['SCRIPT']) {
+                    // Add a span element around the source to
+                    // highlight the overall source block
+                    if (!$this->use_classes &&
+                        $this->language_data['STYLES']['SCRIPT'][$script_key] != '') {
+                        $attributes = ' style="' . $this->language_data['STYLES']['SCRIPT'][$script_key] . '"';
+                    } else {
+                        $attributes = ' class="sc' . $script_key . '"';
+                    }
+                    $result .= "<span$attributes>";
+                    $STRICTATTRS = $attributes;
+                }
+            }
+
+            if ($highlight_part) {
+                // Now, highlight the code in this block. This code
+                // is really the engine of GeSHi (along with the method
+                // parse_non_string_part).
+
+                // cache comment regexps incrementally
+                $next_comment_regexp_key = '';
+                $next_comment_regexp_pos = -1;
+                $next_comment_multi_pos = -1;
+                $next_comment_single_pos = -1;
+                $comment_regexp_cache_per_key = array();
+                $comment_multi_cache_per_key = array();
+                $comment_single_cache_per_key = array();
+                $next_open_comment_multi = '';
+                $next_comment_single_key = '';
+                $escape_regexp_cache_per_key = array();
+                $next_escape_regexp_key = '';
+                $next_escape_regexp_pos = -1;
+
+                $length = strlen($part);
+                for ($i = 0; $i < $length; ++$i) {
+                    // Get the next char
+                    $char = $part[$i];
+                    $char_len = 1;
+
+                    // update regexp comment cache if needed
+                    if (isset($this->language_data['COMMENT_REGEXP']) && $next_comment_regexp_pos < $i) {
+                        $next_comment_regexp_pos = $length;
+                        foreach ($this->language_data['COMMENT_REGEXP'] as $comment_key => $regexp) {
+                            $match_i = false;
+                            if (isset($comment_regexp_cache_per_key[$comment_key]) &&
+                                ($comment_regexp_cache_per_key[$comment_key]['pos'] >= $i ||
+                                 $comment_regexp_cache_per_key[$comment_key]['pos'] === false)) {
+                                // we have already matched something
+                                if ($comment_regexp_cache_per_key[$comment_key]['pos'] === false) {
+                                    // this comment is never matched
+                                    continue;
+                                }
+                                $match_i = $comment_regexp_cache_per_key[$comment_key]['pos'];
+                            } elseif (
+                                //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
+                                (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $i), $match, PREG_OFFSET_CAPTURE)) ||
+                                (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $i))
+                                ) {
+                                $match_i = $match[0][1];
+                                if (GESHI_PHP_PRE_433) {
+                                    $match_i += $i;
+                                }
+
+                                $comment_regexp_cache_per_key[$comment_key] = array(
+                                    'key' => $comment_key,
+                                    'length' => strlen($match[0][0]),
+                                    'pos' => $match_i
+                                );
+                            } else {
+                                $comment_regexp_cache_per_key[$comment_key]['pos'] = false;
+                                continue;
+                            }
+
+                            if ($match_i !== false && $match_i < $next_comment_regexp_pos) {
+                                $next_comment_regexp_pos = $match_i;
+                                $next_comment_regexp_key = $comment_key;
+                                if ($match_i === $i) {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    $string_started = false;
+
+                    if (isset($is_string_starter[$char])) {
+                        // Possibly the start of a new string ...
+
+                        //Check which starter it was ...
+                        //Fix for SF#1932083: Multichar Quotemarks unsupported
+                        if (is_array($is_string_starter[$char])) {
+                            $char_new = '';
+                            foreach ($is_string_starter[$char] as $testchar) {
+                                if ($testchar === substr($part, $i, strlen($testchar)) &&
+                                    strlen($testchar) > strlen($char_new)) {
+                                    $char_new = $testchar;
+                                    $string_started = true;
+                                }
+                            }
+                            if ($string_started) {
+                                $char = $char_new;
+                            }
+                        } else {
+                            $testchar = $is_string_starter[$char];
+                            if ($testchar === substr($part, $i, strlen($testchar))) {
+                                $char = $testchar;
+                                $string_started = true;
+                            }
+                        }
+                        $char_len = strlen($char);
+                    }
+
+                    if ($string_started && ($i != $next_comment_regexp_pos)) {
+                        // Hand out the correct style information for this string
+                        $string_key = array_search($char, $this->language_data['QUOTEMARKS']);
+                        if (!isset($this->language_data['STYLES']['STRINGS'][$string_key]) ||
+                            !isset($this->language_data['STYLES']['ESCAPE_CHAR'][$string_key])) {
+                            $string_key = 0;
+                        }
+
+                        // parse the stuff before this
+                        $result .= $this->parse_non_string_part($stuff_to_parse);
+                        $stuff_to_parse = '';
+
+                        if (!$this->use_classes) {
+                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][$string_key] . '"';
+                        } else {
+                            $string_attributes = ' class="st'.$string_key.'"';
+                        }
+
+                        // now handle the string
+                        $string = "<span$string_attributes>" . GeSHi::hsc($char);
+                        $start = $i + $char_len;
+                        $string_open = true;
+
+                        if(empty($this->language_data['ESCAPE_REGEXP'])) {
+                            $next_escape_regexp_pos = $length;
+                        }
+
+                        do {
+                            //Get the regular ending pos ...
+                            $close_pos = strpos($part, $char, $start);
+                            if(false === $close_pos) {
+                                $close_pos = $length;
+                            }
+
+                            if($this->lexic_permissions['ESCAPE_CHAR']) {
+                                // update escape regexp cache if needed
+                                if (isset($this->language_data['ESCAPE_REGEXP']) && $next_escape_regexp_pos < $start) {
+                                    $next_escape_regexp_pos = $length;
+                                    foreach ($this->language_data['ESCAPE_REGEXP'] as $escape_key => $regexp) {
+                                        $match_i = false;
+                                        if (isset($escape_regexp_cache_per_key[$escape_key]) &&
+                                            ($escape_regexp_cache_per_key[$escape_key]['pos'] >= $start ||
+                                             $escape_regexp_cache_per_key[$escape_key]['pos'] === false)) {
+                                            // we have already matched something
+                                            if ($escape_regexp_cache_per_key[$escape_key]['pos'] === false) {
+                                                // this comment is never matched
+                                                continue;
+                                            }
+                                            $match_i = $escape_regexp_cache_per_key[$escape_key]['pos'];
+                                        } elseif (
+                                            //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
+                                            (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $start), $match, PREG_OFFSET_CAPTURE)) ||
+                                            (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $start))
+                                            ) {
+                                            $match_i = $match[0][1];
+                                            if (GESHI_PHP_PRE_433) {
+                                                $match_i += $start;
+                                            }
+
+                                            $escape_regexp_cache_per_key[$escape_key] = array(
+                                                'key' => $escape_key,
+                                                'length' => strlen($match[0][0]),
+                                                'pos' => $match_i
+                                            );
+                                        } else {
+                                            $escape_regexp_cache_per_key[$escape_key]['pos'] = false;
+                                            continue;
+                                        }
+
+                                        if ($match_i !== false && $match_i < $next_escape_regexp_pos) {
+                                            $next_escape_regexp_pos = $match_i;
+                                            $next_escape_regexp_key = $escape_key;
+                                            if ($match_i === $start) {
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+
+                                //Find the next simple escape position
+                                if('' != $this->language_data['ESCAPE_CHAR']) {
+                                    $simple_escape = strpos($part, $this->language_data['ESCAPE_CHAR'], $start);
+                                    if(false === $simple_escape) {
+                                        $simple_escape = $length;
+                                    }
+                                } else {
+                                    $simple_escape = $length;
+                                }
+                            } else {
+                                $next_escape_regexp_pos = $length;
+                                $simple_escape = $length;
+                            }
+
+                            if($simple_escape < $next_escape_regexp_pos &&
+                                $simple_escape < $length &&
+                                $simple_escape < $close_pos) {
+                                //The nexxt escape sequence is a simple one ...
+                                $es_pos = $simple_escape;
+
+                                //Add the stuff not in the string yet ...
+                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
+
+                                //Get the style for this escaped char ...
+                                if (!$this->use_classes) {
+                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][0] . '"';
+                                } else {
+                                    $escape_char_attributes = ' class="es0"';
+                                }
+
+                                //Add the style for the escape char ...
+                                $string .= "<span$escape_char_attributes>" .
+                                    GeSHi::hsc($this->language_data['ESCAPE_CHAR']);
+
+                                //Get the byte AFTER the ESCAPE_CHAR we just found
+                                $es_char = $part[$es_pos + 1];
+                                if ($es_char == "\n") {
+                                    // don't put a newline around newlines
+                                    $string .= "</span>\n";
+                                    $start = $es_pos + 2;
+                                } elseif (ord($es_char) >= 128) {
+                                    //This is an non-ASCII char (UTF8 or single byte)
+                                    //This code tries to work around SF#2037598 ...
+                                    if(function_exists('mb_substr')) {
+                                        $es_char_m = mb_substr(substr($part, $es_pos+1, 16), 0, 1, $this->encoding);
+                                        $string .= $es_char_m . '</span>';
+                                    } elseif (!GESHI_PHP_PRE_433 && 'utf-8' == $this->encoding) {
+                                        if(preg_match("/[\xC2-\xDF][\x80-\xBF]".
+                                            "|\xE0[\xA0-\xBF][\x80-\xBF]".
+                                            "|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}".
+                                            "|\xED[\x80-\x9F][\x80-\xBF]".
+                                            "|\xF0[\x90-\xBF][\x80-\xBF]{2}".
+                                            "|[\xF1-\xF3][\x80-\xBF]{3}".
+                                            "|\xF4[\x80-\x8F][\x80-\xBF]{2}/s",
+                                            $part, $es_char_m, null, $es_pos + 1)) {
+                                            $es_char_m = $es_char_m[0];
+                                        } else {
+                                            $es_char_m = $es_char;
+                                        }
+                                        $string .= $this->hsc($es_char_m) . '</span>';
+                                    } else {
+                                        $es_char_m = $this->hsc($es_char);
+                                    }
+                                    $start = $es_pos + strlen($es_char_m) + 1;
+                                } else {
+                                    $string .= $this->hsc($es_char) . '</span>';
+                                    $start = $es_pos + 2;
+                                }
+                            } elseif ($next_escape_regexp_pos < $length &&
+                                $next_escape_regexp_pos < $close_pos) {
+                                $es_pos = $next_escape_regexp_pos;
+                                //Add the stuff not in the string yet ...
+                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
+
+                                //Get the key and length of this match ...
+                                $escape = $escape_regexp_cache_per_key[$next_escape_regexp_key];
+                                $escape_str = substr($part, $es_pos, $escape['length']);
+                                $escape_key = $escape['key'];
+
+                                //Get the style for this escaped char ...
+                                if (!$this->use_classes) {
+                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][$escape_key] . '"';
+                                } else {
+                                    $escape_char_attributes = ' class="es' . $escape_key . '"';
+                                }
+
+                                //Add the style for the escape char ...
+                                $string .= "<span$escape_char_attributes>" .
+                                    $this->hsc($escape_str) . '</span>';
+
+                                $start = $es_pos + $escape['length'];
+                            } else {
+                                //Copy the remainder of the string ...
+                                $string .= $this->hsc(substr($part, $start, $close_pos - $start + $char_len)) . '</span>';
+                                $start = $close_pos + $char_len;
+                                $string_open = false;
+                            }
+                        } while($string_open);
+
+                        if ($check_linenumbers) {
+                            // Are line numbers used? If, we should end the string before
+                            // the newline and begin it again (so when <li>s are put in the source
+                            // remains XHTML compliant)
+                            // note to self: This opens up possibility of config files specifying
+                            // that languages can/cannot have multiline strings???
+                            $string = str_replace("\n", "</span>\n<span$string_attributes>", $string);
+                        }
+
+                        $result .= $string;
+                        $string = '';
+                        $i = $start - 1;
+                        continue;
+                    } elseif ($this->lexic_permissions['STRINGS'] && $hq && $hq[0] == $char &&
+                        substr($part, $i, $hq_strlen) == $hq && ($i != $next_comment_regexp_pos)) {
+                        // The start of a hard quoted string
+                        if (!$this->use_classes) {
+                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS']['HARD'] . '"';
+                            $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR']['HARD'] . '"';
+                        } else {
+                            $string_attributes = ' class="st_h"';
+                            $escape_char_attributes = ' class="es_h"';
+                        }
+                        // parse the stuff before this
+                        $result .= $this->parse_non_string_part($stuff_to_parse);
+                        $stuff_to_parse = '';
+
+                        // now handle the string
+                        $string = '';
+
+                        // look for closing quote
+                        $start = $i + $hq_strlen;
+                        while ($close_pos = strpos($part, $this->language_data['HARDQUOTE'][1], $start)) {
+                            $start = $close_pos + 1;
+                            if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['HARDCHAR'] &&
+                                (($i + $hq_strlen) != ($close_pos))) { //Support empty string for HQ escapes if Starter = Escape
+                                // make sure this quote is not escaped
+                                foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
+                                    if (substr($part, $close_pos - 1, strlen($hardescape)) == $hardescape) {
+                                        // check wether this quote is escaped or if it is something like '\\'
+                                        $escape_char_pos = $close_pos - 1;
+                                        while ($escape_char_pos > 0
+                                                && $part[$escape_char_pos - 1] == $this->language_data['HARDCHAR']) {
+                                            --$escape_char_pos;
+                                        }
+                                        if (($close_pos - $escape_char_pos) & 1) {
+                                            // uneven number of escape chars => this quote is escaped
+                                            continue 2;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // found closing quote
+                            break;
+                        }
+
+                        //Found the closing delimiter?
+                        if (!$close_pos) {
+                            // span till the end of this $part when no closing delimiter is found
+                            $close_pos = $length;
+                        }
+
+                        //Get the actual string
+                        $string = substr($part, $i, $close_pos - $i + 1);
+                        $i = $close_pos;
+
+                        // handle escape chars and encode html chars
+                        // (special because when we have escape chars within our string they may not be escaped)
+                        if ($this->lexic_permissions['ESCAPE_CHAR'] && $this->language_data['ESCAPE_CHAR']) {
+                            $start = 0;
+                            $new_string = '';
+                            while ($es_pos = strpos($string, $this->language_data['ESCAPE_CHAR'], $start)) {
+                                // hmtl escape stuff before
+                                $new_string .= $this->hsc(substr($string, $start, $es_pos - $start));
+                                // check if this is a hard escape
+                                foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
+                                    if (substr($string, $es_pos, strlen($hardescape)) == $hardescape) {
+                                        // indeed, this is a hardescape
+                                        $new_string .= "<span$escape_char_attributes>" .
+                                            $this->hsc($hardescape) . '</span>';
+                                        $start = $es_pos + strlen($hardescape);
+                                        continue 2;
+                                    }
+                                }
+                                // not a hard escape, but a normal escape
+                                // they come in pairs of two
+                                $c = 0;
+                                while (isset($string[$es_pos + $c]) && isset($string[$es_pos + $c + 1])
+                                    && $string[$es_pos + $c] == $this->language_data['ESCAPE_CHAR']
+                                    && $string[$es_pos + $c + 1] == $this->language_data['ESCAPE_CHAR']) {
+                                    $c += 2;
+                                }
+                                if ($c) {
+                                    $new_string .= "<span$escape_char_attributes>" .
+                                        str_repeat($escaped_escape_char, $c) .
+                                        '</span>';
+                                    $start = $es_pos + $c;
+                                } else {
+                                    // this is just a single lonely escape char...
+                                    $new_string .= $escaped_escape_char;
+                                    $start = $es_pos + 1;
+                                }
+                            }
+                            $string = $new_string . $this->hsc(substr($string, $start));
+                        } else {
+                            $string = $this->hsc($string);
+                        }
+
+                        if ($check_linenumbers) {
+                            // Are line numbers used? If, we should end the string before
+                            // the newline and begin it again (so when <li>s are put in the source
+                            // remains XHTML compliant)
+                            // note to self: This opens up possibility of config files specifying
+                            // that languages can/cannot have multiline strings???
+                            $string = str_replace("\n", "</span>\n<span$string_attributes>", $string);
+                        }
+
+                        $result .= "<span$string_attributes>" . $string . '</span>';
+                        $string = '';
+                        continue;
+                    } else {
+                        //Have a look for regexp comments
+                        if ($i == $next_comment_regexp_pos) {
+                            $COMMENT_MATCHED = true;
+                            $comment = $comment_regexp_cache_per_key[$next_comment_regexp_key];
+                            $test_str = $this->hsc(substr($part, $i, $comment['length']));
+
+                            //@todo If remove important do remove here
+                            if ($this->lexic_permissions['COMMENTS']['MULTI']) {
+                                if (!$this->use_classes) {
+                                    $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment['key']] . '"';
+                                } else {
+                                    $attributes = ' class="co' . $comment['key'] . '"';
+                                }
+
+                                $test_str = "<span$attributes>" . $test_str . "</span>";
+
+                                // Short-cut through all the multiline code
+                                if ($check_linenumbers) {
+                                    // strreplace to put close span and open span around multiline newlines
+                                    $test_str = str_replace(
+                                        "\n", "</span>\n<span$attributes>",
+                                        str_replace("\n ", "\n&nbsp;", $test_str)
+                                    );
+                                }
+                            }
+
+                            $i += $comment['length'] - 1;
+
+                            // parse the rest
+                            $result .= $this->parse_non_string_part($stuff_to_parse);
+                            $stuff_to_parse = '';
+                        }
+
+                        // If we haven't matched a regexp comment, try multi-line comments
+                        if (!$COMMENT_MATCHED) {
+                            // Is this a multiline comment?
+                            if (!empty($this->language_data['COMMENT_MULTI']) && $next_comment_multi_pos < $i) {
+                                $next_comment_multi_pos = $length;
+                                foreach ($this->language_data['COMMENT_MULTI'] as $open => $close) {
+                                    $match_i = false;
+                                    if (isset($comment_multi_cache_per_key[$open]) &&
+                                        ($comment_multi_cache_per_key[$open] >= $i ||
+                                         $comment_multi_cache_per_key[$open] === false)) {
+                                        // we have already matched something
+                                        if ($comment_multi_cache_per_key[$open] === false) {
+                                            // this comment is never matched
+                                            continue;
+                                        }
+                                        $match_i = $comment_multi_cache_per_key[$open];
+                                    } elseif (($match_i = stripos($part, $open, $i)) !== false) {
+                                        $comment_multi_cache_per_key[$open] = $match_i;
+                                    } else {
+                                        $comment_multi_cache_per_key[$open] = false;
+                                        continue;
+                                    }
+                                    if ($match_i !== false && $match_i < $next_comment_multi_pos) {
+                                        $next_comment_multi_pos = $match_i;
+                                        $next_open_comment_multi = $open;
+                                        if ($match_i === $i) {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if ($i == $next_comment_multi_pos) {
+                                $open = $next_open_comment_multi;
+                                $close = $this->language_data['COMMENT_MULTI'][$open];
+                                $open_strlen = strlen($open);
+                                $close_strlen = strlen($close);
+                                $COMMENT_MATCHED = true;
+                                $test_str_match = $open;
+                                //@todo If remove important do remove here
+                                if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
+                                    $open == GESHI_START_IMPORTANT) {
+                                    if ($open != GESHI_START_IMPORTANT) {
+                                        if (!$this->use_classes) {
+                                            $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS']['MULTI'] . '"';
+                                        } else {
+                                            $attributes = ' class="coMULTI"';
+                                        }
+                                        $test_str = "<span$attributes>" . $this->hsc($open);
+                                    } else {
+                                        if (!$this->use_classes) {
+                                            $attributes = ' style="' . $this->important_styles . '"';
+                                        } else {
+                                            $attributes = ' class="imp"';
+                                        }
+
+                                        // We don't include the start of the comment if it's an
+                                        // "important" part
+                                        $test_str = "<span$attributes>";
+                                    }
+                                } else {
+                                    $test_str = $this->hsc($open);
+                                }
+
+                                $close_pos = strpos( $part, $close, $i + $open_strlen );
+
+                                if ($close_pos === false) {
+                                    $close_pos = $length;
+                                }
+
+                                // Short-cut through all the multiline code
+                                $rest_of_comment = $this->hsc(substr($part, $i + $open_strlen, $close_pos - $i - $open_strlen + $close_strlen));
+                                if (($this->lexic_permissions['COMMENTS']['MULTI'] ||
+                                    $test_str_match == GESHI_START_IMPORTANT) &&
+                                    $check_linenumbers) {
+
+                                    // strreplace to put close span and open span around multiline newlines
+                                    $test_str .= str_replace(
+                                        "\n", "</span>\n<span$attributes>",
+                                        str_replace("\n ", "\n&nbsp;", $rest_of_comment)
+                                    );
+                                } else {
+                                    $test_str .= $rest_of_comment;
+                                }
+
+                                if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
+                                    $test_str_match == GESHI_START_IMPORTANT) {
+                                    $test_str .= '</span>';
+                                }
+
+                                $i = $close_pos + $close_strlen - 1;
+
+                                // parse the rest
+                                $result .= $this->parse_non_string_part($stuff_to_parse);
+                                $stuff_to_parse = '';
+                            }
+                        }
+
+                        // If we haven't matched a multiline comment, try single-line comments
+                        if (!$COMMENT_MATCHED) {
+                            // cache potential single line comment occurances
+                            if (!empty($this->language_data['COMMENT_SINGLE']) && $next_comment_single_pos < $i) {
+                                $next_comment_single_pos = $length;
+                                foreach ($this->language_data['COMMENT_SINGLE'] as $comment_key => $comment_mark) {
+                                    $match_i = false;
+                                    if (isset($comment_single_cache_per_key[$comment_key]) &&
+                                        ($comment_single_cache_per_key[$comment_key] >= $i ||
+                                         $comment_single_cache_per_key[$comment_key] === false)) {
+                                        // we have already matched something
+                                        if ($comment_single_cache_per_key[$comment_key] === false) {
+                                            // this comment is never matched
+                                            continue;
+                                        }
+                                        $match_i = $comment_single_cache_per_key[$comment_key];
+                                    } elseif (
+                                        // case sensitive comments
+                                        ($this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] &&
+                                        ($match_i = stripos($part, $comment_mark, $i)) !== false) ||
+                                        // non case sensitive
+                                        (!$this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] &&
+                                          (($match_i = strpos($part, $comment_mark, $i)) !== false))) {
+                                        $comment_single_cache_per_key[$comment_key] = $match_i;
+                                    } else {
+                                        $comment_single_cache_per_key[$comment_key] = false;
+                                        continue;
+                                    }
+                                    if ($match_i !== false && $match_i < $next_comment_single_pos) {
+                                        $next_comment_single_pos = $match_i;
+                                        $next_comment_single_key = $comment_key;
+                                        if ($match_i === $i) {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if ($next_comment_single_pos == $i) {
+                                $comment_key = $next_comment_single_key;
+                                $comment_mark = $this->language_data['COMMENT_SINGLE'][$comment_key];
+                                $com_len = strlen($comment_mark);
+
+                                // This check will find special variables like $# in bash
+                                // or compiler directives of Delphi beginning {$
+                                if ((empty($sc_disallowed_before) || ($i == 0) ||
+                                    (false === strpos($sc_disallowed_before, $part[$i-1]))) &&
+                                    (empty($sc_disallowed_after) || ($length <= $i + $com_len) ||
+                                    (false === strpos($sc_disallowed_after, $part[$i + $com_len]))))
+                                {
+                                    // this is a valid comment
+                                    $COMMENT_MATCHED = true;
+                                    if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
+                                        if (!$this->use_classes) {
+                                            $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment_key] . '"';
+                                        } else {
+                                            $attributes = ' class="co' . $comment_key . '"';
+                                        }
+                                        $test_str = "<span$attributes>" . $this->hsc($this->change_case($comment_mark));
+                                    } else {
+                                        $test_str = $this->hsc($comment_mark);
+                                    }
+
+                                    //Check if this comment is the last in the source
+                                    $close_pos = strpos($part, "\n", $i);
+                                    $oops = false;
+                                    if ($close_pos === false) {
+                                        $close_pos = $length;
+                                        $oops = true;
+                                    }
+                                    $test_str .= $this->hsc(substr($part, $i + $com_len, $close_pos - $i - $com_len));
+                                    if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
+                                        $test_str .= "</span>";
+                                    }
+
+                                    // Take into account that the comment might be the last in the source
+                                    if (!$oops) {
+                                      $test_str .= "\n";
+                                    }
+
+                                    $i = $close_pos;
+
+                                    // parse the rest
+                                    $result .= $this->parse_non_string_part($stuff_to_parse);
+                                    $stuff_to_parse = '';
+                                }
+                            }
+                        }
+                    }
+
+                    // Where are we adding this char?
+                    if (!$COMMENT_MATCHED) {
+                        $stuff_to_parse .= $char;
+                    } else {
+                        $result .= $test_str;
+                        unset($test_str);
+                        $COMMENT_MATCHED = false;
+                    }
+                }
+                // Parse the last bit
+                $result .= $this->parse_non_string_part($stuff_to_parse);
+                $stuff_to_parse = '';
+            } else {
+                $result .= $this->hsc($part);
+            }
+            // Close the <span> that surrounds the block
+            if ($STRICTATTRS != '') {
+                $result = str_replace("\n", "</span>\n<span$STRICTATTRS>", $result);
+                $result .= '</span>';
+            }
+
+            $endresult .= $result;
+            unset($part, $parts[$key], $result);
+        }
+
+        //This fix is related to SF#1923020, but has to be applied regardless of
+        //actually highlighting symbols.
+        /** NOTE: memorypeak #3 */
+        $endresult = str_replace(array('<SEMI>', '<PIPE>'), array(';', '|'), $endresult);
+
+//        // Parse the last stuff (redundant?)
+//        $result .= $this->parse_non_string_part($stuff_to_parse);
+
+        // Lop off the very first and last spaces
+//        $result = substr($result, 1, -1);
+
+        // We're finished: stop timing
+        $this->set_time($start_time, microtime());
+
+        $this->finalise($endresult);
+        return $endresult;
+    }
+
+    /**
+     * Swaps out spaces and tabs for HTML indentation. Not needed if
+     * the code is in a pre block...
+     *
+     * @param  string The source to indent (reference!)
+     * @since  1.0.0
+     * @access private
+     */
+    function indent(&$result) {
+        /// Replace tabs with the correct number of spaces
+        if (false !== strpos($result, "\t")) {
+            $lines = explode("\n", $result);
+            $result = null;//Save memory while we process the lines individually
+            $tab_width = $this->get_real_tab_width();
+            $tab_string = '&nbsp;' . str_repeat(' ', $tab_width);
+
+            for ($key = 0, $n = count($lines); $key < $n; $key++) {
+                $line = $lines[$key];
+                if (false === strpos($line, "\t")) {
+                    continue;
+                }
+
+                $pos = 0;
+                $length = strlen($line);
+                $lines[$key] = ''; // reduce memory
+
+                $IN_TAG = false;
+                for ($i = 0; $i < $length; ++$i) {
+                    $char = $line[$i];
+                    // Simple engine to work out whether we're in a tag.
+                    // If we are we modify $pos. This is so we ignore HTML
+                    // in the line and only workout the tab replacement
+                    // via the actual content of the string
+                    // This test could be improved to include strings in the
+                    // html so that < or > would be allowed in user's styles
+                    // (e.g. quotes: '<' '>'; or similar)
+                    if ($IN_TAG) {
+                        if ('>' == $char) {
+                            $IN_TAG = false;
+                        }
+                        $lines[$key] .= $char;
+                    } elseif ('<' == $char) {
+                        $IN_TAG = true;
+                        $lines[$key] .= '<';
+                    } elseif ('&' == $char) {
+                        $substr = substr($line, $i + 3, 5);
+                        $posi = strpos($substr, ';');
+                        if (false === $posi) {
+                            ++$pos;
+                        } else {
+                            $pos -= $posi+2;
+                        }
+                        $lines[$key] .= $char;
+                    } elseif ("\t" == $char) {
+                        $str = '';
+                        // OPTIMISE - move $strs out. Make an array:
+                        // $tabs = array(
+                        //  1 => '&nbsp;',
+                        //  2 => '&nbsp; ',
+                        //  3 => '&nbsp; &nbsp;' etc etc
+                        // to use instead of building a string every time
+                        $tab_end_width = $tab_width - ($pos % $tab_width); //Moved out of the look as it doesn't change within the loop
+                        if (($pos & 1) || 1 == $tab_end_width) {
+                            $str .= substr($tab_string, 6, $tab_end_width);
+                        } else {
+                            $str .= substr($tab_string, 0, $tab_end_width+5);
+                        }
+                        $lines[$key] .= $str;
+                        $pos += $tab_end_width;
+
+                        if (false === strpos($line, "\t", $i + 1)) {
+                            $lines[$key] .= substr($line, $i + 1);
+                            break;
+                        }
+                    } elseif (0 == $pos && ' ' == $char) {
+                        $lines[$key] .= '&nbsp;';
+                        ++$pos;
+                    } else {
+                        $lines[$key] .= $char;
+                        ++$pos;
+                    }
+                }
+            }
+            $result = implode("\n", $lines);
+            unset($lines);//We don't need the lines separated beyond this --- free them!
+        }
+        // Other whitespace
+        // BenBE: Fix to reduce the number of replacements to be done
+        $result = preg_replace('/^ /m', '&nbsp;', $result);
+        $result = str_replace('  ', ' &nbsp;', $result);
+
+        if ($this->line_numbers == GESHI_NO_LINE_NUMBERS && $this->header_type != GESHI_HEADER_PRE_TABLE) {
+            if ($this->line_ending === null) {
+                $result = nl2br($result);
+            } else {
+                $result = str_replace("\n", $this->line_ending, $result);
+            }
+        }
+    }
+
+    /**
+     * Changes the case of a keyword for those languages where a change is asked for
+     *
+     * @param  string The keyword to change the case of
+     * @return string The keyword with its case changed
+     * @since  1.0.0
+     * @access private
+     */
+    function change_case($instr) {
+        switch ($this->language_data['CASE_KEYWORDS']) {
+            case GESHI_CAPS_UPPER:
+                return strtoupper($instr);
+            case GESHI_CAPS_LOWER:
+                return strtolower($instr);
+            default:
+                return $instr;
+        }
+    }
+
+    /**
+     * Handles replacements of keywords to include markup and links if requested
+     *
+     * @param  string The keyword to add the Markup to
+     * @return The HTML for the match found
+     * @since  1.0.8
+     * @access private
+     *
+     * @todo   Get rid of ender in keyword links
+     */
+    function handle_keyword_replace($match) {
+        $k = $this->_kw_replace_group;
+        $keyword = $match[0];
+        $keyword_match = $match[1];
+
+        $before = '';
+        $after = '';
+
+        if ($this->keyword_links) {
+            // Keyword links have been ebabled
+
+            if (isset($this->language_data['URLS'][$k]) &&
+                $this->language_data['URLS'][$k] != '') {
+                // There is a base group for this keyword
+
+                // Old system: strtolower
+                //$keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword);
+                // New system: get keyword from language file to get correct case
+                if (!$this->language_data['CASE_SENSITIVE'][$k] &&
+                    strpos($this->language_data['URLS'][$k], '{FNAME}') !== false) {
+                    foreach ($this->language_data['KEYWORDS'][$k] as $word) {
+                        if (strcasecmp($word, $keyword_match) == 0) {
+                            break;
+                        }
+                    }
+                } else {
+                    $word = $keyword_match;
+                }
+
+                $before = '<|UR1|"' .
+                    str_replace(
+                        array(
+                            '{FNAME}',
+                            '{FNAMEL}',
+                            '{FNAMEU}',
+                            '.'),
+                        array(
+                            str_replace('+', '%20', urlencode($this->hsc($word))),
+                            str_replace('+', '%20', urlencode($this->hsc(strtolower($word)))),
+                            str_replace('+', '%20', urlencode($this->hsc(strtoupper($word)))),
+                            '<DOT>'),
+                        $this->language_data['URLS'][$k]
+                    ) . '">';
+                $after = '</a>';
+            }
+        }
+
+        return $before . '<|/'. $k .'/>' . $this->change_case($keyword) . '|>' . $after;
+    }
+
+    /**
+     * handles regular expressions highlighting-definitions with callback functions
+     *
+     * @note this is a callback, don't use it directly
+     *
+     * @param array the matches array
+     * @return The highlighted string
+     * @since 1.0.8
+     * @access private
+     */
+    function handle_regexps_callback($matches) {
+        // before: "' style=\"' . call_user_func(\"$func\", '\\1') . '\"\\1|>'",
+        return  ' style="' . call_user_func($this->language_data['STYLES']['REGEXPS'][$this->_rx_key], $matches[1]) . '"'. $matches[1] . '|>';
+    }
+
+    /**
+     * handles newlines in REGEXPS matches. Set the _hmr_* vars before calling this
+     *
+     * @note this is a callback, don't use it directly
+     *
+     * @param array the matches array
+     * @return string
+     * @since 1.0.8
+     * @access private
+     */
+    function handle_multiline_regexps($matches) {
+        $before = $this->_hmr_before;
+        $after = $this->_hmr_after;
+        if ($this->_hmr_replace) {
+            $replace = $this->_hmr_replace;
+            $search = array();
+
+            foreach (array_keys($matches) as $k) {
+                $search[] = '\\' . $k;
+            }
+
+            $before = str_replace($search, $matches, $before);
+            $after = str_replace($search, $matches, $after);
+            $replace = str_replace($search, $matches, $replace);
+        } else {
+            $replace = $matches[0];
+        }
+        return $before
+                    . '<|!REG3XP' . $this->_hmr_key .'!>'
+                        . str_replace("\n", "|>\n<|!REG3XP" . $this->_hmr_key . '!>', $replace)
+                    . '|>'
+              . $after;
+    }
+
+    /**
+     * Takes a string that has no strings or comments in it, and highlights
+     * stuff like keywords, numbers and methods.
+     *
+     * @param string The string to parse for keyword, numbers etc.
+     * @since 1.0.0
+     * @access private
+     * @todo BUGGY! Why? Why not build string and return?
+     */
+    function parse_non_string_part($stuff_to_parse) {
+        $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse);
+
+        // Highlight keywords
+        $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#|^&";
+        $disallowed_after = "(?![a-zA-Z0-9_\|%\\-&;";
+        if ($this->lexic_permissions['STRINGS']) {
+            $quotemarks = preg_quote(implode($this->language_data['QUOTEMARKS']), '/');
+            $disallowed_before .= $quotemarks;
+            $disallowed_after .= $quotemarks;
+        }
+        $disallowed_before .= "])";
+        $disallowed_after .= "])";
+
+        $parser_control_pergroup = false;
+        if (isset($this->language_data['PARSER_CONTROL'])) {
+            if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
+                $x = 0; // check wether per-keyword-group parser_control is enabled
+                if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) {
+                    $disallowed_before = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'];
+                    ++$x;
+                }
+                if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'])) {
+                    $disallowed_after = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'];
+                    ++$x;
+                }
+                $parser_control_pergroup = (count($this->language_data['PARSER_CONTROL']['KEYWORDS']) - $x) > 0;
+            }
+        }
+
+        foreach (array_keys($this->language_data['KEYWORDS']) as $k) {
+            if (!isset($this->lexic_permissions['KEYWORDS'][$k]) ||
+                $this->lexic_permissions['KEYWORDS'][$k]) {
+
+                $case_sensitive = $this->language_data['CASE_SENSITIVE'][$k];
+                $modifiers = $case_sensitive ? '' : 'i';
+
+                // NEW in 1.0.8 - per-keyword-group parser control
+                $disallowed_before_local = $disallowed_before;
+                $disallowed_after_local = $disallowed_after;
+                if ($parser_control_pergroup && isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k])) {
+                    if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE'])) {
+                        $disallowed_before_local =
+                            $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE'];
+                    }
+
+                    if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER'])) {
+                        $disallowed_after_local =
+                            $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER'];
+                    }
+                }
+
+                $this->_kw_replace_group = $k;
+
+                //NEW in 1.0.8, the cached regexp list
+                // since we don't want PHP / PCRE to crash due to too large patterns we split them into smaller chunks
+                for ($set = 0, $set_length = count($this->language_data['CACHED_KEYWORD_LISTS'][$k]); $set <  $set_length; ++$set) {
+                    $keywordset =& $this->language_data['CACHED_KEYWORD_LISTS'][$k][$set];
+                    // Might make a more unique string for putting the number in soon
+                    // Basically, we don't put the styles in yet because then the styles themselves will
+                    // get highlighted if the language has a CSS keyword in it (like CSS, for example ;))
+                    $stuff_to_parse = preg_replace_callback(
+                        "/$disallowed_before_local({$keywordset})(?!\<DOT\>(?:htm|php|aspx?))$disallowed_after_local/$modifiers",
+                        array($this, 'handle_keyword_replace'),
+                        $stuff_to_parse
+                        );
+                }
+            }
+        }
+
+        // Regular expressions
+        foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
+            if ($this->lexic_permissions['REGEXPS'][$key]) {
+                if (is_array($regexp)) {
+                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                        // produce valid HTML when we match multiple lines
+                        $this->_hmr_replace = $regexp[GESHI_REPLACE];
+                        $this->_hmr_before = $regexp[GESHI_BEFORE];
+                        $this->_hmr_key = $key;
+                        $this->_hmr_after = $regexp[GESHI_AFTER];
+                        $stuff_to_parse = preg_replace_callback(
+                            "/" . $regexp[GESHI_SEARCH] . "/{$regexp[GESHI_MODIFIERS]}",
+                            array($this, 'handle_multiline_regexps'),
+                            $stuff_to_parse);
+                        $this->_hmr_replace = false;
+                        $this->_hmr_before = '';
+                        $this->_hmr_after = '';
+                    } else {
+                        $stuff_to_parse = preg_replace(
+                            '/' . $regexp[GESHI_SEARCH] . '/' . $regexp[GESHI_MODIFIERS],
+                            $regexp[GESHI_BEFORE] . '<|!REG3XP'. $key .'!>' . $regexp[GESHI_REPLACE] . '|>' . $regexp[GESHI_AFTER],
+                            $stuff_to_parse);
+                    }
+                } else {
+                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                        // produce valid HTML when we match multiple lines
+                        $this->_hmr_key = $key;
+                        $stuff_to_parse = preg_replace_callback( "/(" . $regexp . ")/",
+                                              array($this, 'handle_multiline_regexps'), $stuff_to_parse);
+                        $this->_hmr_key = '';
+                    } else {
+                        $stuff_to_parse = preg_replace( "/(" . $regexp . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
+                    }
+                }
+            }
+        }
+
+        // Highlight numbers. As of 1.0.8 we support different types of numbers
+        $numbers_found = false;
+
+        if ($this->lexic_permissions['NUMBERS'] && preg_match($this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'], $stuff_to_parse )) {
+            $numbers_found = true;
+
+            //For each of the formats ...
+            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
+                //Check if it should be highlighted ...
+                $stuff_to_parse = preg_replace($regexp, "<|/NUM!$id/>\\1|>", $stuff_to_parse);
+            }
+        }
+
+        //
+        // Now that's all done, replace /[number]/ with the correct styles
+        //
+        foreach (array_keys($this->language_data['KEYWORDS']) as $k) {
+            if (!$this->use_classes) {
+                $attributes = ' style="' .
+                    (isset($this->language_data['STYLES']['KEYWORDS'][$k]) ?
+                    $this->language_data['STYLES']['KEYWORDS'][$k] : "") . '"';
+            } else {
+                $attributes = ' class="kw' . $k . '"';
+            }
+            $stuff_to_parse = str_replace("<|/$k/>", "<|$attributes>", $stuff_to_parse);
+        }
+
+        if ($numbers_found) {
+            // Put number styles in
+            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
+                //Commented out for now, as this needs some review ...
+                //                if ($numbers_permissions & $id) {
+                //Get the appropriate style ...
+                //Checking for unset styles is done by the style cache builder ...
+                if (!$this->use_classes) {
+                    $attributes = ' style="' . $this->language_data['STYLES']['NUMBERS'][$id] . '"';
+                } else {
+                    $attributes = ' class="nu'.$id.'"';
+                }
+
+                //Set in the correct styles ...
+                $stuff_to_parse = str_replace("/NUM!$id/", $attributes, $stuff_to_parse);
+                //                }
+            }
+        }
+
+        // Highlight methods and fields in objects
+        if ($this->lexic_permissions['METHODS'] && $this->language_data['OOLANG']) {
+            $oolang_spaces = "[\s]*";
+            $oolang_before = "";
+            $oolang_after = "[a-zA-Z][a-zA-Z0-9_]*";
+            if (isset($this->language_data['PARSER_CONTROL'])) {
+                if (isset($this->language_data['PARSER_CONTROL']['OOLANG'])) {
+                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE'])) {
+                        $oolang_before = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE'];
+                    }
+                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER'])) {
+                        $oolang_after = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER'];
+                    }
+                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES'])) {
+                        $oolang_spaces = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES'];
+                    }
+                }
+            }
+
+            foreach ($this->language_data['OBJECT_SPLITTERS'] as $key => $splitter) {
+                if (false !== strpos($stuff_to_parse, $splitter)) {
+                    if (!$this->use_classes) {
+                        $attributes = ' style="' . $this->language_data['STYLES']['METHODS'][$key] . '"';
+                    } else {
+                        $attributes = ' class="me' . $key . '"';
+                    }
+                    $stuff_to_parse = preg_replace("/($oolang_before)(" . preg_quote($this->language_data['OBJECT_SPLITTERS'][$key], '/') . ")($oolang_spaces)($oolang_after)/", "\\1\\2\\3<|$attributes>\\4|>", $stuff_to_parse);
+                }
+            }
+        }
+
+        //
+        // Highlight brackets. Yes, I've tried adding a semi-colon to this list.
+        // You try it, and see what happens ;)
+        // TODO: Fix lexic permissions not converting entities if shouldn't
+        // be highlighting regardless
+        //
+        if ($this->lexic_permissions['BRACKETS']) {
+            $stuff_to_parse = str_replace( $this->language_data['CACHE_BRACKET_MATCH'],
+                              $this->language_data['CACHE_BRACKET_REPLACE'], $stuff_to_parse );
+        }
+
+
+        //FIX for symbol highlighting ...
+        if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) {
+            //Get all matches and throw away those witin a block that is already highlighted... (i.e. matched by a regexp)
+            $n_symbols = preg_match_all("/<\|(?:<DOT>|[^>])+>(?:(?!\|>).*?)\|>|<\/a>|(?:" . $this->language_data['SYMBOL_SEARCH'] . ")+(?![^<]+?>)/", $stuff_to_parse, $pot_symbols, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+            $global_offset = 0;
+            for ($s_id = 0; $s_id < $n_symbols; ++$s_id) {
+                $symbol_match = $pot_symbols[$s_id][0][0];
+                if (strpos($symbol_match, '<') !== false || strpos($symbol_match, '>') !== false) {
+                    // already highlighted blocks _must_ include either < or >
+                    // so if this conditional applies, we have to skip this match
+                    // BenBE: UNLESS the block contains <SEMI> or <PIPE>
+                    if(strpos($symbol_match, '<SEMI>') === false &&
+                        strpos($symbol_match, '<PIPE>') === false) {
+                        continue;
+                    }
+                }
+
+                // if we reach this point, we have a valid match which needs to be highlighted
+
+                $symbol_length = strlen($symbol_match);
+                $symbol_offset = $pot_symbols[$s_id][0][1];
+                unset($pot_symbols[$s_id]);
+                $symbol_end = $symbol_length + $symbol_offset;
+                $symbol_hl = "";
+
+                // if we have multiple styles, we have to handle them properly
+                if ($this->language_data['MULTIPLE_SYMBOL_GROUPS']) {
+                    $old_sym = -1;
+                    // Split the current stuff to replace into its atomic symbols ...
+                    preg_match_all("/" . $this->language_data['SYMBOL_SEARCH'] . "/", $symbol_match, $sym_match_syms, PREG_PATTERN_ORDER);
+                    foreach ($sym_match_syms[0] as $sym_ms) {
+                        //Check if consequtive symbols belong to the same group to save output ...
+                        if (isset($this->language_data['SYMBOL_DATA'][$sym_ms])
+                            && ($this->language_data['SYMBOL_DATA'][$sym_ms] != $old_sym)) {
+                            if (-1 != $old_sym) {
+                                $symbol_hl .= "|>";
+                            }
+                            $old_sym = $this->language_data['SYMBOL_DATA'][$sym_ms];
+                            if (!$this->use_classes) {
+                                $symbol_hl .= '<| style="' . $this->language_data['STYLES']['SYMBOLS'][$old_sym] . '">';
+                            } else {
+                                $symbol_hl .= '<| class="sy' . $old_sym . '">';
+                            }
+                        }
+                        $symbol_hl .= $sym_ms;
+                    }
+                    unset($sym_match_syms);
+
+                    //Close remaining tags and insert the replacement at the right position ...
+                    //Take caution if symbol_hl is empty to avoid doubled closing spans.
+                    if (-1 != $old_sym) {
+                        $symbol_hl .= "|>";
+                    }
+                } else {
+                    if (!$this->use_classes) {
+                        $symbol_hl = '<| style="' . $this->language_data['STYLES']['SYMBOLS'][0] . '">';
+                    } else {
+                        $symbol_hl = '<| class="sy0">';
+                    }
+                    $symbol_hl .= $symbol_match . '|>';
+                }
+
+                $stuff_to_parse = substr_replace($stuff_to_parse, $symbol_hl, $symbol_offset + $global_offset, $symbol_length);
+
+                // since we replace old text with something of different size,
+                // we'll have to keep track of the differences
+                $global_offset += strlen($symbol_hl) - $symbol_length;
+            }
+        }
+        //FIX for symbol highlighting ...
+
+        // Add class/style for regexps
+        foreach (array_keys($this->language_data['REGEXPS']) as $key) {
+            if ($this->lexic_permissions['REGEXPS'][$key]) {
+                if (is_callable($this->language_data['STYLES']['REGEXPS'][$key])) {
+                    $this->_rx_key = $key;
+                    $stuff_to_parse = preg_replace_callback("/!REG3XP$key!(.*)\|>/U",
+                        array($this, 'handle_regexps_callback'),
+                        $stuff_to_parse);
+                } else {
+                    if (!$this->use_classes) {
+                        $attributes = ' style="' . $this->language_data['STYLES']['REGEXPS'][$key] . '"';
+                    } else {
+                        if (is_array($this->language_data['REGEXPS'][$key]) &&
+                            array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$key])) {
+                            $attributes = ' class="' .
+                                $this->language_data['REGEXPS'][$key][GESHI_CLASS] . '"';
+                        } else {
+                           $attributes = ' class="re' . $key . '"';
+                        }
+                    }
+                    $stuff_to_parse = str_replace("!REG3XP$key!", "$attributes", $stuff_to_parse);
+                }
+            }
+        }
+
+        // Replace <DOT> with . for urls
+        $stuff_to_parse = str_replace('<DOT>', '.', $stuff_to_parse);
+        // Replace <|UR1| with <a href= for urls also
+        if (isset($this->link_styles[GESHI_LINK])) {
+            if ($this->use_classes) {
+                $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' href=', $stuff_to_parse);
+            } else {
+                $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' style="' . $this->link_styles[GESHI_LINK] . '" href=', $stuff_to_parse);
+            }
+        } else {
+            $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' href=', $stuff_to_parse);
+        }
+
+        //
+        // NOW we add the span thingy ;)
+        //
+
+        $stuff_to_parse = str_replace('<|', '<span', $stuff_to_parse);
+        $stuff_to_parse = str_replace ( '|>', '</span>', $stuff_to_parse );
+        return substr($stuff_to_parse, 1);
+    }
+
+    /**
+     * Sets the time taken to parse the code
+     *
+     * @param microtime The time when parsing started
+     * @param microtime The time when parsing ended
+     * @since 1.0.2
+     * @access private
+     */
+    function set_time($start_time, $end_time) {
+        $start = explode(' ', $start_time);
+        $end = explode(' ', $end_time);
+        $this->time = $end[0] + $end[1] - $start[0] - $start[1];
+    }
+
+    /**
+     * Gets the time taken to parse the code
+     *
+     * @return double The time taken to parse the code
+     * @since  1.0.2
+     */
+    function get_time() {
+        return $this->time;
+    }
+
+    /**
+     * Merges arrays recursively, overwriting values of the first array with values of later arrays
+     *
+     * @since 1.0.8
+     * @access private
+     */
+    function merge_arrays() {
+        $arrays = func_get_args();
+        $narrays = count($arrays);
+
+        // check arguments
+        // comment out if more performance is necessary (in this case the foreach loop will trigger a warning if the argument is not an array)
+        for ($i = 0; $i < $narrays; $i ++) {
+            if (!is_array($arrays[$i])) {
+                // also array_merge_recursive returns nothing in this case
+                trigger_error('Argument #' . ($i+1) . ' is not an array - trying to merge array with scalar! Returning false!', E_USER_WARNING);
+                return false;
+            }
+        }
+
+        // the first array is in the output set in every case
+        $ret = $arrays[0];
+
+        // merege $ret with the remaining arrays
+        for ($i = 1; $i < $narrays; $i ++) {
+            foreach ($arrays[$i] as $key => $value) {
+                if (is_array($value) && isset($ret[$key])) {
+                    // if $ret[$key] is not an array you try to merge an scalar value with an array - the result is not defined (incompatible arrays)
+                    // in this case the call will trigger an E_USER_WARNING and the $ret[$key] will be false.
+                    $ret[$key] = $this->merge_arrays($ret[$key], $value);
+                } else {
+                    $ret[$key] = $value;
+                }
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Gets language information and stores it for later use
+     *
+     * @param string The filename of the language file you want to load
+     * @since 1.0.0
+     * @access private
+     * @todo Needs to load keys for lexic permissions for keywords, regexps etc
+     */
+    function load_language($file_name) {
+        if ($file_name == $this->loaded_language) {
+            // this file is already loaded!
+            return;
+        }
+
+        //Prepare some stuff before actually loading the language file
+        $this->loaded_language = $file_name;
+        $this->parse_cache_built = false;
+        $this->enable_highlighting();
+        $language_data = array();
+
+        //Load the language file
+        require $file_name;
+
+        // Perhaps some checking might be added here later to check that
+        // $language data is a valid thing but maybe not
+        $this->language_data = $language_data;
+
+        // Set strict mode if should be set
+        $this->strict_mode = $this->language_data['STRICT_MODE_APPLIES'];
+
+        // Set permissions for all lexics to true
+        // so they'll be highlighted by default
+        foreach (array_keys($this->language_data['KEYWORDS']) as $key) {
+            if (!empty($this->language_data['KEYWORDS'][$key])) {
+                $this->lexic_permissions['KEYWORDS'][$key] = true;
+            } else {
+                $this->lexic_permissions['KEYWORDS'][$key] = false;
+            }
+        }
+
+        foreach (array_keys($this->language_data['COMMENT_SINGLE']) as $key) {
+            $this->lexic_permissions['COMMENTS'][$key] = true;
+        }
+        foreach (array_keys($this->language_data['REGEXPS']) as $key) {
+            $this->lexic_permissions['REGEXPS'][$key] = true;
+        }
+
+        // for BenBE and future code reviews:
+        // we can use empty here since we only check for existance and emptiness of an array
+        // if it is not an array at all but rather false or null this will work as intended as well
+        // even if $this->language_data['PARSER_CONTROL'] is undefined this won't trigger a notice
+        if (!empty($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'])) {
+            foreach ($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'] as $flag => $value) {
+                // it's either true or false and maybe is true as well
+                $perm = $value !== GESHI_NEVER;
+                if ($flag == 'ALL') {
+                    $this->enable_highlighting($perm);
+                    continue;
+                }
+                if (!isset($this->lexic_permissions[$flag])) {
+                    // unknown lexic permission
+                    continue;
+                }
+                if (is_array($this->lexic_permissions[$flag])) {
+                    foreach ($this->lexic_permissions[$flag] as $key => $val) {
+                        $this->lexic_permissions[$flag][$key] = $perm;
+                    }
+                } else {
+                    $this->lexic_permissions[$flag] = $perm;
+                }
+            }
+            unset($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS']);
+        }
+
+        //Fix: Problem where hardescapes weren't handled if no ESCAPE_CHAR was given
+        //You need to set one for HARDESCAPES only in this case.
+        if(!isset($this->language_data['HARDCHAR'])) {
+            $this->language_data['HARDCHAR'] = $this->language_data['ESCAPE_CHAR'];
+        }
+
+        //NEW in 1.0.8: Allow styles to be loaded from a separate file to override defaults
+        $style_filename = substr($file_name, 0, -4) . '.style.php';
+        if (is_readable($style_filename)) {
+            //Clear any style_data that could have been set before ...
+            if (isset($style_data)) {
+                unset($style_data);
+            }
+
+            //Read the Style Information from the style file
+            include $style_filename;
+
+            //Apply the new styles to our current language styles
+            if (isset($style_data) && is_array($style_data)) {
+                $this->language_data['STYLES'] =
+                    $this->merge_arrays($this->language_data['STYLES'], $style_data);
+            }
+        }
+    }
+
+    /**
+     * Takes the parsed code and various options, and creates the HTML
+     * surrounding it to make it look nice.
+     *
+     * @param  string The code already parsed (reference!)
+     * @since  1.0.0
+     * @access private
+     */
+    function finalise(&$parsed_code) {
+        // Remove end parts of important declarations
+        // This is BUGGY!! My fault for bad code: fix coming in 1.2
+        // @todo Remove this crap
+        if ($this->enable_important_blocks &&
+            (strpos($parsed_code, $this->hsc(GESHI_START_IMPORTANT)) === false)) {
+            $parsed_code = str_replace($this->hsc(GESHI_END_IMPORTANT), '', $parsed_code);
+        }
+
+        // Add HTML whitespace stuff if we're using the <div> header
+        if ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) {
+            $this->indent($parsed_code);
+        }
+
+        // purge some unnecessary stuff
+        /** NOTE: memorypeak #1 */
+        $parsed_code = preg_replace('#<span[^>]+>(\s*)</span>#', '\\1', $parsed_code);
+
+        // If we are using IDs for line numbers, there needs to be an overall
+        // ID set to prevent collisions.
+        if ($this->add_ids && !$this->overall_id) {
+            $this->overall_id = 'geshi-' . substr(md5(microtime()), 0, 4);
+        }
+
+        // Get code into lines
+        /** NOTE: memorypeak #2 */
+        $code = explode("\n", $parsed_code);
+        $parsed_code = $this->header();
+
+        // If we're using line numbers, we insert <li>s and appropriate
+        // markup to style them (otherwise we don't need to do anything)
+        if ($this->line_numbers != GESHI_NO_LINE_NUMBERS && $this->header_type != GESHI_HEADER_PRE_TABLE) {
+            // If we're using the <pre> header, we shouldn't add newlines because
+            // the <pre> will line-break them (and the <li>s already do this for us)
+            $ls = ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) ? "\n" : '';
+
+            // Set vars to defaults for following loop
+            $i = 0;
+
+            // Foreach line...
+            for ($i = 0, $n = count($code); $i < $n;) {
+                //Reset the attributes for a new line ...
+                $attrs = array();
+
+                // Make lines have at least one space in them if they're empty
+                // BenBE: Checking emptiness using trim instead of relying on blanks
+                if ('' == trim($code[$i])) {
+                    $code[$i] = '&nbsp;';
+                }
+
+                // If this is a "special line"...
+                if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                    $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+                    // Set the attributes to style the line
+                    if ($this->use_classes) {
+                        //$attr = ' class="li2"';
+                        $attrs['class'][] = 'li2';
+                        $def_attr = ' class="de2"';
+                    } else {
+                        //$attr = ' style="' . $this->line_style2 . '"';
+                        $attrs['style'][] = $this->line_style2;
+                        // This style "covers up" the special styles set for special lines
+                        // so that styles applied to special lines don't apply to the actual
+                        // code on that line
+                        $def_attr = ' style="' . $this->code_style . '"';
+                    }
+                } else {
+                    if ($this->use_classes) {
+                        //$attr = ' class="li1"';
+                        $attrs['class'][] = 'li1';
+                        $def_attr = ' class="de1"';
+                    } else {
+                        //$attr = ' style="' . $this->line_style1 . '"';
+                        $attrs['style'][] = $this->line_style1;
+                        $def_attr = ' style="' . $this->code_style . '"';
+                    }
+                }
+
+                //Check which type of tag to insert for this line
+                if ($this->header_type == GESHI_HEADER_PRE_VALID) {
+                    $start = "<pre$def_attr>";
+                    $end = '</pre>';
+                } else {
+                    // Span or div?
+                    $start = "<div$def_attr>";
+                    $end = '</div>';
+                }
+
+                ++$i;
+
+                // Are we supposed to use ids? If so, add them
+                if ($this->add_ids) {
+                    $attrs['id'][] = "$this->overall_id-$i";
+                }
+
+                //Is this some line with extra styles???
+                if (in_array($i, $this->highlight_extra_lines)) {
+                    if ($this->use_classes) {
+                        if (isset($this->highlight_extra_lines_styles[$i])) {
+                            $attrs['class'][] = "lx$i";
+                        } else {
+                            $attrs['class'][] = "ln-xtra";
+                        }
+                    } else {
+                        array_push($attrs['style'], $this->get_line_style($i));
+                    }
+                }
+
+                // Add in the line surrounded by appropriate list HTML
+                $attr_string = '';
+                foreach ($attrs as $key => $attr) {
+                    $attr_string .= ' ' . $key . '="' . implode(' ', $attr) . '"';
+                }
+
+                $parsed_code .= "<li$attr_string>$start{$code[$i-1]}$end</li>$ls";
+                unset($code[$i - 1]);
+            }
+        } else {
+            $n = count($code);
+            if ($this->use_classes) {
+                $attributes = ' class="de1"';
+            } else {
+                $attributes = ' style="'. $this->code_style .'"';
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_VALID) {
+                $parsed_code .= '<pre'. $attributes .'>';
+            } elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
+                if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                    if ($this->use_classes) {
+                        $attrs = ' class="ln"';
+                    } else {
+                        $attrs = ' style="'. $this->table_linenumber_style .'"';
+                    }
+                    $parsed_code .= '<td'.$attrs.'><pre'.$attributes.'>';
+                    // get linenumbers
+                    // we don't merge it with the for below, since it should be better for
+                    // memory consumption this way
+                    // @todo: but... actually it would still be somewhat nice to merge the two loops
+                    //        the mem peaks are at different positions
+                    for ($i = 0; $i < $n; ++$i) {
+                        $close = 0;
+                        // fancy lines
+                        if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                            $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+                            // Set the attributes to style the line
+                            if ($this->use_classes) {
+                                $parsed_code .= '<span class="xtra li2"><span class="de2">';
+                            } else {
+                                // This style "covers up" the special styles set for special lines
+                                // so that styles applied to special lines don't apply to the actual
+                                // code on that line
+                                $parsed_code .= '<span style="display:block;' . $this->line_style2 . '">'
+                                                  .'<span style="' . $this->code_style .'">';
+                            }
+                            $close += 2;
+                        }
+                        //Is this some line with extra styles???
+                        if (in_array($i + 1, $this->highlight_extra_lines)) {
+                            if ($this->use_classes) {
+                                if (isset($this->highlight_extra_lines_styles[$i])) {
+                                    $parsed_code .= "<span class=\"xtra lx$i\">";
+                                } else {
+                                    $parsed_code .= "<span class=\"xtra ln-xtra\">";
+                                }
+                            } else {
+                                $parsed_code .= "<span style=\"display:block;" . $this->get_line_style($i) . "\">";
+                            }
+                            ++$close;
+                        }
+                        $parsed_code .= $this->line_numbers_start + $i;
+                        if ($close) {
+                            $parsed_code .= str_repeat('</span>', $close);
+                        } elseif ($i != $n) {
+                            $parsed_code .= "\n";
+                        }
+                    }
+                    $parsed_code .= '</pre></td><td'.$attributes.'>';
+                }
+                $parsed_code .= '<pre'. $attributes .'>';
+            }
+            // No line numbers, but still need to handle highlighting lines extra.
+            // Have to use divs so the full width of the code is highlighted
+            $close = 0;
+            for ($i = 0; $i < $n; ++$i) {
+                // Make lines have at least one space in them if they're empty
+                // BenBE: Checking emptiness using trim instead of relying on blanks
+                if ('' == trim($code[$i])) {
+                    $code[$i] = '&nbsp;';
+                }
+                // fancy lines
+                if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                    $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+                    // Set the attributes to style the line
+                    if ($this->use_classes) {
+                        $parsed_code .= '<span class="xtra li2"><span class="de2">';
+                    } else {
+                        // This style "covers up" the special styles set for special lines
+                        // so that styles applied to special lines don't apply to the actual
+                        // code on that line
+                        $parsed_code .= '<span style="display:block;' . $this->line_style2 . '">'
+                                          .'<span style="' . $this->code_style .'">';
+                    }
+                    $close += 2;
+                }
+                //Is this some line with extra styles???
+                if (in_array($i + 1, $this->highlight_extra_lines)) {
+                    if ($this->use_classes) {
+                        if (isset($this->highlight_extra_lines_styles[$i])) {
+                            $parsed_code .= "<span class=\"xtra lx$i\">";
+                        } else {
+                            $parsed_code .= "<span class=\"xtra ln-xtra\">";
+                        }
+                    } else {
+                        $parsed_code .= "<span style=\"display:block;" . $this->get_line_style($i) . "\">";
+                    }
+                    ++$close;
+                }
+
+                $parsed_code .= $code[$i];
+
+                if ($close) {
+                  $parsed_code .= str_repeat('</span>', $close);
+                  $close = 0;
+                }
+                elseif ($i + 1 < $n) {
+                    $parsed_code .= "\n";
+                }
+                unset($code[$i]);
+            }
+
+            if ($this->header_type == GESHI_HEADER_PRE_VALID || $this->header_type == GESHI_HEADER_PRE_TABLE) {
+                $parsed_code .= '</pre>';
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                $parsed_code .= '</td>';
+            }
+        }
+
+        $parsed_code .= $this->footer();
+    }
+
+    /**
+     * Creates the header for the code block (with correct attributes)
+     *
+     * @return string The header for the code block
+     * @since  1.0.0
+     * @access private
+     */
+    function header() {
+        // Get attributes needed
+        /**
+         * @todo   Document behaviour change - class is outputted regardless of whether
+         *         we're using classes or not. Same with style
+         */
+        $attributes = ' class="' . $this->_genCSSName($this->language);
+        if ($this->overall_class != '') {
+            $attributes .= " ".$this->_genCSSName($this->overall_class);
+        }
+        $attributes .= '"';
+
+        if ($this->overall_id != '') {
+            $attributes .= " id=\"{$this->overall_id}\"";
+        }
+        if ($this->overall_style != '' && !$this->use_classes) {
+            $attributes .= ' style="' . $this->overall_style . '"';
+        }
+
+        $ol_attributes = '';
+
+        if ($this->line_numbers_start != 1) {
+            $ol_attributes .= ' start="' . $this->line_numbers_start . '"';
+        }
+
+        // Get the header HTML
+        $header = $this->header_content;
+        if ($header) {
+            if ($this->header_type == GESHI_HEADER_PRE || $this->header_type == GESHI_HEADER_PRE_VALID) {
+                $header = str_replace("\n", '', $header);
+            }
+            $header = $this->replace_keywords($header);
+
+            if ($this->use_classes) {
+                $attr = ' class="head"';
+            } else {
+                $attr = " style=\"{$this->header_content_style}\"";
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                $header = "<thead><tr><td colspan=\"2\" $attr>$header</td></tr></thead>";
+            } else {
+                $header = "<div$attr>$header</div>";
+            }
+        }
+
+        if (GESHI_HEADER_NONE == $this->header_type) {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "$header<ol$attributes$ol_attributes>";
+            }
+            return $header . ($this->force_code_block ? '<div>' : '');
+        }
+
+        // Work out what to return and do it
+        if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+            if ($this->header_type == GESHI_HEADER_PRE) {
+                return "<pre$attributes>$header<ol$ol_attributes>";
+            } elseif ($this->header_type == GESHI_HEADER_DIV ||
+                $this->header_type == GESHI_HEADER_PRE_VALID) {
+                return "<div$attributes>$header<ol$ol_attributes>";
+            } elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
+                return "<table$attributes>$header<tbody><tr class=\"li1\">";
+            }
+        } else {
+            if ($this->header_type == GESHI_HEADER_PRE) {
+                return "<pre$attributes>$header"  .
+                    ($this->force_code_block ? '<div>' : '');
+            } else {
+                return "<div$attributes>$header" .
+                    ($this->force_code_block ? '<div>' : '');
+            }
+        }
+    }
+
+    /**
+     * Returns the footer for the code block.
+     *
+     * @return string The footer for the code block
+     * @since  1.0.0
+     * @access private
+     */
+    function footer() {
+        $footer = $this->footer_content;
+        if ($footer) {
+            if ($this->header_type == GESHI_HEADER_PRE) {
+                $footer = str_replace("\n", '', $footer);;
+            }
+            $footer = $this->replace_keywords($footer);
+
+            if ($this->use_classes) {
+                $attr = ' class="foot"';
+            } else {
+                $attr = " style=\"{$this->footer_content_style}\"";
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                $footer = "<tfoot><tr><td colspan=\"2\">$footer</td></tr></tfoot>";
+            } else {
+                $footer = "<div$attr>$footer</div>";
+            }
+        }
+
+        if (GESHI_HEADER_NONE == $this->header_type) {
+            return ($this->line_numbers != GESHI_NO_LINE_NUMBERS) ? '</ol>' . $footer : $footer;
+        }
+
+        if ($this->header_type == GESHI_HEADER_DIV || $this->header_type == GESHI_HEADER_PRE_VALID) {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "</ol>$footer</div>";
+            }
+            return ($this->force_code_block ? '</div>' : '') .
+                "$footer</div>";
+        }
+        elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "</tr></tbody>$footer</table>";
+            }
+            return ($this->force_code_block ? '</div>' : '') .
+                "$footer</div>";
+        }
+        else {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "</ol>$footer</pre>";
+            }
+            return ($this->force_code_block ? '</div>' : '') .
+                "$footer</pre>";
+        }
+    }
+
+    /**
+     * Replaces certain keywords in the header and footer with
+     * certain configuration values
+     *
+     * @param  string The header or footer content to do replacement on
+     * @return string The header or footer with replaced keywords
+     * @since  1.0.2
+     * @access private
+     */
+    function replace_keywords($instr) {
+        $keywords = $replacements = array();
+
+        $keywords[] = '<TIME>';
+        $keywords[] = '{TIME}';
+        $replacements[] = $replacements[] = number_format($time = $this->get_time(), 3);
+
+        $keywords[] = '<LANGUAGE>';
+        $keywords[] = '{LANGUAGE}';
+        $replacements[] = $replacements[] = $this->language_data['LANG_NAME'];
+
+        $keywords[] = '<VERSION>';
+        $keywords[] = '{VERSION}';
+        $replacements[] = $replacements[] = GESHI_VERSION;
+
+        $keywords[] = '<SPEED>';
+        $keywords[] = '{SPEED}';
+        if ($time <= 0) {
+            $speed = 'N/A';
+        } else {
+            $speed = strlen($this->source) / $time;
+            if ($speed >= 1024) {
+                $speed = sprintf("%.2f KB/s", $speed / 1024.0);
+            } else {
+                $speed = sprintf("%.0f B/s", $speed);
+            }
+        }
+        $replacements[] = $replacements[] = $speed;
+
+        return str_replace($keywords, $replacements, $instr);
+    }
+
+    /**
+     * Secure replacement for PHP built-in function htmlspecialchars().
+     *
+     * See ticket #427 (http://wush.net/trac/wikka/ticket/427) for the rationale
+     * for this replacement function.
+     *
+     * The INTERFACE for this function is almost the same as that for
+     * htmlspecialchars(), with the same default for quote style; however, there
+     * is no 'charset' parameter. The reason for this is as follows:
+     *
+     * The PHP docs say:
+     *      "The third argument charset defines character set used in conversion."
+     *
+     * I suspect PHP's htmlspecialchars() is working at the byte-value level and
+     * thus _needs_ to know (or asssume) a character set because the special
+     * characters to be replaced could exist at different code points in
+     * different character sets. (If indeed htmlspecialchars() works at
+     * byte-value level that goes some  way towards explaining why the
+     * vulnerability would exist in this function, too, and not only in
+     * htmlentities() which certainly is working at byte-value level.)
+     *
+     * This replacement function however works at character level and should
+     * therefore be "immune" to character set differences - so no charset
+     * parameter is needed or provided. If a third parameter is passed, it will
+     * be silently ignored.
+     *
+     * In the OUTPUT there is a minor difference in that we use '&#39;' instead
+     * of PHP's '&#039;' for a single quote: this provides compatibility with
+     *      get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES)
+     * (see comment by mikiwoz at yahoo dot co dot uk on
+     * http://php.net/htmlspecialchars); it also matches the entity definition
+     * for XML 1.0
+     * (http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_Special_characters).
+     * Like PHP we use a numeric character reference instead of '&apos;' for the
+     * single quote. For the other special characters we use the named entity
+     * references, as PHP is doing.
+     *
+     * @author      {@link http://wikkawiki.org/JavaWoman Marjolein Katsma}
+     *
+     * @license     http://www.gnu.org/copyleft/lgpl.html
+     *              GNU Lesser General Public License
+     * @copyright   Copyright 2007, {@link http://wikkawiki.org/CreditsPage
+     *              Wikka Development Team}
+     *
+     * @access      private
+     * @param       string  $string string to be converted
+     * @param       integer $quote_style
+     *                      - ENT_COMPAT:   escapes &, <, > and double quote (default)
+     *                      - ENT_NOQUOTES: escapes only &, < and >
+     *                      - ENT_QUOTES:   escapes &, <, >, double and single quotes
+     * @return      string  converted string
+     * @since       1.0.7.18
+     */
+    function hsc($string, $quote_style = ENT_COMPAT) {
+        // init
+        static $aTransSpecchar = array(
+            '&' => '&amp;',
+            '"' => '&quot;',
+            '<' => '&lt;',
+            '>' => '&gt;',
+
+            //This fix is related to SF#1923020, but has to be applied
+            //regardless of actually highlighting symbols.
+
+            //Circumvent a bug with symbol highlighting
+            //This is required as ; would produce undesirable side-effects if it
+            //was not to be processed as an entity.
+            ';' => '<SEMI>', // Force ; to be processed as entity
+            '|' => '<PIPE>' // Force | to be processed as entity
+            );                      // ENT_COMPAT set
+
+        switch ($quote_style) {
+            case ENT_NOQUOTES: // don't convert double quotes
+                unset($aTransSpecchar['"']);
+                break;
+            case ENT_QUOTES: // convert single quotes as well
+                $aTransSpecchar["'"] = '&#39;'; // (apos) htmlspecialchars() uses '&#039;'
+                break;
+        }
+
+        // return translated string
+        return strtr($string, $aTransSpecchar);
+    }
+
+    function _genCSSName($name){
+        return (is_numeric($name[0]) ? '_' : '') . $name;
+    }
+
+    /**
+     * Returns a stylesheet for the highlighted code. If $economy mode
+     * is true, we only return the stylesheet declarations that matter for
+     * this code block instead of the whole thing
+     *
+     * @param  boolean Whether to use economy mode or not
+     * @return string A stylesheet built on the data for the current language
+     * @since  1.0.0
+     */
+    function get_stylesheet($economy_mode = true) {
+        // If there's an error, chances are that the language file
+        // won't have populated the language data file, so we can't
+        // risk getting a stylesheet...
+        if ($this->error) {
+            return '';
+        }
+
+        //Check if the style rearrangements have been processed ...
+        //This also does some preprocessing to check which style groups are useable ...
+        if(!isset($this->language_data['NUMBERS_CACHE'])) {
+            $this->build_style_cache();
+        }
+
+        // First, work out what the selector should be. If there's an ID,
+        // that should be used, the same for a class. Otherwise, a selector
+        // of '' means that these styles will be applied anywhere
+        if ($this->overall_id) {
+            $selector = '#' . $this->_genCSSName($this->overall_id);
+        } else {
+            $selector = '.' . $this->_genCSSName($this->language);
+            if ($this->overall_class) {
+                $selector .= '.' . $this->_genCSSName($this->overall_class);
+            }
+        }
+        $selector .= ' ';
+
+        // Header of the stylesheet
+        if (!$economy_mode) {
+            $stylesheet = "/**\n".
+                " * GeSHi Dynamically Generated Stylesheet\n".
+                " * --------------------------------------\n".
+                " * Dynamically generated stylesheet for {$this->language}\n".
+                " * CSS class: {$this->overall_class}, CSS id: {$this->overall_id}\n".
+                " * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann\n" .
+                " * (http://qbnz.com/highlighter/ and http://geshi.org/)\n".
+                " * --------------------------------------\n".
+                " */\n";
+        } else {
+            $stylesheet = "/**\n".
+                " * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann\n" .
+                " * (http://qbnz.com/highlighter/ and http://geshi.org/)\n".
+                " */\n";
+        }
+
+        // Set the <ol> to have no effect at all if there are line numbers
+        // (<ol>s have margins that should be destroyed so all layout is
+        // controlled by the set_overall_style method, which works on the
+        // <pre> or <div> container). Additionally, set default styles for lines
+        if (!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+            //$stylesheet .= "$selector, {$selector}ol, {$selector}ol li {margin: 0;}\n";
+            $stylesheet .= "$selector.de1, $selector.de2 {{$this->code_style}}\n";
+        }
+
+        // Add overall styles
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->overall_style != '') {
+            $stylesheet .= "$selector {{$this->overall_style}}\n";
+        }
+
+        // Add styles for links
+        // note: economy mode does not make _any_ sense here
+        //       either the style is empty and thus no selector is needed
+        //       or the appropriate key is given.
+        foreach ($this->link_styles as $key => $style) {
+            if ($style != '') {
+                switch ($key) {
+                    case GESHI_LINK:
+                        $stylesheet .= "{$selector}a:link {{$style}}\n";
+                        break;
+                    case GESHI_HOVER:
+                        $stylesheet .= "{$selector}a:hover {{$style}}\n";
+                        break;
+                    case GESHI_ACTIVE:
+                        $stylesheet .= "{$selector}a:active {{$style}}\n";
+                        break;
+                    case GESHI_VISITED:
+                        $stylesheet .= "{$selector}a:visited {{$style}}\n";
+                        break;
+                }
+            }
+        }
+
+        // Header and footer
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->header_content_style != '') {
+            $stylesheet .= "$selector.head {{$this->header_content_style}}\n";
+        }
+        if ($this->footer_content_style != '') {
+            $stylesheet .= "$selector.foot {{$this->footer_content_style}}\n";
+        }
+
+        // Styles for important stuff
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->important_styles != '') {
+            $stylesheet .= "$selector.imp {{$this->important_styles}}\n";
+        }
+
+        // Simple line number styles
+        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->line_style1 != '') {
+            $stylesheet .= "{$selector}li, {$selector}.li1 {{$this->line_style1}}\n";
+        }
+        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->table_linenumber_style != '') {
+            $stylesheet .= "{$selector}.ln {{$this->table_linenumber_style}}\n";
+        }
+        // If there is a style set for fancy line numbers, echo it out
+        if ((!$economy_mode || $this->line_numbers == GESHI_FANCY_LINE_NUMBERS) && $this->line_style2 != '') {
+            $stylesheet .= "{$selector}.li2 {{$this->line_style2}}\n";
+        }
+
+        // note: empty styles are meaningless
+        foreach ($this->language_data['STYLES']['KEYWORDS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['KEYWORDS'][$group]) &&
+                $this->lexic_permissions['KEYWORDS'][$group]))) {
+                $stylesheet .= "$selector.kw$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['COMMENTS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['COMMENTS'][$group]) &&
+                $this->lexic_permissions['COMMENTS'][$group]) ||
+                (!empty($this->language_data['COMMENT_REGEXP']) &&
+                !empty($this->language_data['COMMENT_REGEXP'][$group])))) {
+                $stylesheet .= "$selector.co$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['ESCAPE_CHAR'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['ESCAPE_CHAR'])) {
+                // NEW: since 1.0.8 we have to handle hardescapes
+                if ($group === 'HARD') {
+                    $group = '_h';
+                }
+                $stylesheet .= "$selector.es$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['BRACKETS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['BRACKETS'])) {
+                $stylesheet .= "$selector.br$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['SYMBOLS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['SYMBOLS'])) {
+                $stylesheet .= "$selector.sy$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['STRINGS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['STRINGS'])) {
+                // NEW: since 1.0.8 we have to handle hardquotes
+                if ($group === 'HARD') {
+                    $group = '_h';
+                }
+                $stylesheet .= "$selector.st$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['NUMBERS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['NUMBERS'])) {
+                $stylesheet .= "$selector.nu$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['METHODS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['METHODS'])) {
+                $stylesheet .= "$selector.me$group {{$styles}}\n";
+            }
+        }
+        // note: neglect economy_mode, empty styles are meaningless
+        foreach ($this->language_data['STYLES']['SCRIPT'] as $group => $styles) {
+            if ($styles != '') {
+                $stylesheet .= "$selector.sc$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['REGEXPS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['REGEXPS'][$group]) &&
+                $this->lexic_permissions['REGEXPS'][$group]))) {
+                if (is_array($this->language_data['REGEXPS'][$group]) &&
+                    array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$group])) {
+                    $stylesheet .= "$selector.";
+                    $stylesheet .= $this->language_data['REGEXPS'][$group][GESHI_CLASS];
+                    $stylesheet .= " {{$styles}}\n";
+                } else {
+                    $stylesheet .= "$selector.re$group {{$styles}}\n";
+                }
+            }
+        }
+        // Styles for lines being highlighted extra
+        if (!$economy_mode || (count($this->highlight_extra_lines)!=count($this->highlight_extra_lines_styles))) {
+            $stylesheet .= "{$selector}.ln-xtra, {$selector}li.ln-xtra, {$selector}div.ln-xtra {{$this->highlight_extra_lines_style}}\n";
+        }
+        $stylesheet .= "{$selector}span.xtra { display:block; }\n";
+        foreach ($this->highlight_extra_lines_styles as $lineid => $linestyle) {
+            $stylesheet .= "{$selector}.lx$lineid, {$selector}li.lx$lineid, {$selector}div.lx$lineid {{$linestyle}}\n";
+        }
+
+        return $stylesheet;
+    }
+
+    /**
+     * Get's the style that is used for the specified line
+     *
+     * @param int The line number information is requested for
+     * @access private
+     * @since 1.0.7.21
+     */
+    function get_line_style($line) {
+        //$style = null;
+        $style = null;
+        if (isset($this->highlight_extra_lines_styles[$line])) {
+            $style = $this->highlight_extra_lines_styles[$line];
+        } else { // if no "extra" style assigned
+            $style = $this->highlight_extra_lines_style;
+        }
+
+        return $style;
+    }
+
+    /**
+    * this functions creates an optimized regular expression list
+    * of an array of strings.
+    *
+    * Example:
+    * <code>$list = array('faa', 'foo', 'foobar');
+    *          => string 'f(aa|oo(bar)?)'</code>
+    *
+    * @param $list array of (unquoted) strings
+    * @param $regexp_delimiter your regular expression delimiter, @see preg_quote()
+    * @return string for regular expression
+    * @author Milian Wolff <mail@milianw.de>
+    * @since 1.0.8
+    * @access private
+    */
+    function optimize_regexp_list($list, $regexp_delimiter = '/') {
+        $regex_chars = array('.', '\\', '+', '-', '*', '?', '[', '^', ']', '$',
+            '(', ')', '{', '}', '=', '!', '<', '>', '|', ':', $regexp_delimiter);
+        sort($list);
+        $regexp_list = array('');
+        $num_subpatterns = 0;
+        $list_key = 0;
+
+        // the tokens which we will use to generate the regexp list
+        $tokens = array();
+        $prev_keys = array();
+        // go through all entries of the list and generate the token list
+        $cur_len = 0;
+        for ($i = 0, $i_max = count($list); $i < $i_max; ++$i) {
+            if ($cur_len > GESHI_MAX_PCRE_LENGTH) {
+                // seems like the length of this pcre is growing exorbitantly
+                $regexp_list[++$list_key] = $this->_optimize_regexp_list_tokens_to_string($tokens);
+                $num_subpatterns = substr_count($regexp_list[$list_key], '(?:');
+                $tokens = array();
+                $cur_len = 0;
+            }
+            $level = 0;
+            $entry = preg_quote((string) $list[$i], $regexp_delimiter);
+            $pointer = &$tokens;
+            // properly assign the new entry to the correct position in the token array
+            // possibly generate smaller common denominator keys
+            while (true) {
+                // get the common denominator
+                if (isset($prev_keys[$level])) {
+                    if ($prev_keys[$level] == $entry) {
+                        // this is a duplicate entry, skip it
+                        continue 2;
+                    }
+                    $char = 0;
+                    while (isset($entry[$char]) && isset($prev_keys[$level][$char])
+                            && $entry[$char] == $prev_keys[$level][$char]) {
+                        ++$char;
+                    }
+                    if ($char > 0) {
+                        // this entry has at least some chars in common with the current key
+                        if ($char == strlen($prev_keys[$level])) {
+                            // current key is totally matched, i.e. this entry has just some bits appended
+                            $pointer = &$pointer[$prev_keys[$level]];
+                        } else {
+                            // only part of the keys match
+                            $new_key_part1 = substr($prev_keys[$level], 0, $char);
+                            $new_key_part2 = substr($prev_keys[$level], $char);
+
+                            if (in_array($new_key_part1[0], $regex_chars)
+                                || in_array($new_key_part2[0], $regex_chars)) {
+                                // this is bad, a regex char as first character
+                                $pointer[$entry] = array('' => true);
+                                array_splice($prev_keys, $level, count($prev_keys), $entry);
+                                $cur_len += strlen($entry);
+                                continue;
+                            } else {
+                                // relocate previous tokens
+                                $pointer[$new_key_part1] = array($new_key_part2 => $pointer[$prev_keys[$level]]);
+                                unset($pointer[$prev_keys[$level]]);
+                                $pointer = &$pointer[$new_key_part1];
+                                // recreate key index
+                                array_splice($prev_keys, $level, count($prev_keys), array($new_key_part1, $new_key_part2));
+                                $cur_len += strlen($new_key_part2);
+                            }
+                        }
+                        ++$level;
+                        $entry = substr($entry, $char);
+                        continue;
+                    }
+                    // else: fall trough, i.e. no common denominator was found
+                }
+                if ($level == 0 && !empty($tokens)) {
+                    // we can dump current tokens into the string and throw them away afterwards
+                    $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
+                    $new_subpatterns = substr_count($new_entry, '(?:');
+                    if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + $new_subpatterns > GESHI_MAX_PCRE_SUBPATTERNS) {
+                        $regexp_list[++$list_key] = $new_entry;
+                        $num_subpatterns = $new_subpatterns;
+                    } else {
+                        if (!empty($regexp_list[$list_key])) {
+                            $new_entry = '|' . $new_entry;
+                        }
+                        $regexp_list[$list_key] .= $new_entry;
+                        $num_subpatterns += $new_subpatterns;
+                    }
+                    $tokens = array();
+                    $cur_len = 0;
+                }
+                // no further common denominator found
+                $pointer[$entry] = array('' => true);
+                array_splice($prev_keys, $level, count($prev_keys), $entry);
+
+                $cur_len += strlen($entry);
+                break;
+            }
+            unset($list[$i]);
+        }
+        // make sure the last tokens get converted as well
+        $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
+        if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + substr_count($new_entry, '(?:') > GESHI_MAX_PCRE_SUBPATTERNS) {
+            if ( !empty($regexp_list[$list_key]) ) {
+              ++$list_key;
+            }
+            $regexp_list[$list_key] = $new_entry;
+        } else {
+            if (!empty($regexp_list[$list_key])) {
+                $new_entry = '|' . $new_entry;
+            }
+            $regexp_list[$list_key] .= $new_entry;
+        }
+        return $regexp_list;
+    }
+    /**
+    * this function creates the appropriate regexp string of an token array
+    * you should not call this function directly, @see $this->optimize_regexp_list().
+    *
+    * @param &$tokens array of tokens
+    * @param $recursed bool to know wether we recursed or not
+    * @return string
+    * @author Milian Wolff <mail@milianw.de>
+    * @since 1.0.8
+    * @access private
+    */
+    function _optimize_regexp_list_tokens_to_string(&$tokens, $recursed = false) {
+        $list = '';
+        foreach ($tokens as $token => $sub_tokens) {
+            $list .= $token;
+            $close_entry = isset($sub_tokens['']);
+            unset($sub_tokens['']);
+            if (!empty($sub_tokens)) {
+                $list .= '(?:' . $this->_optimize_regexp_list_tokens_to_string($sub_tokens, true) . ')';
+                if ($close_entry) {
+                    // make sub_tokens optional
+                    $list .= '?';
+                }
+            }
+            $list .= '|';
+        }
+        if (!$recursed) {
+            // do some optimizations
+            // common trailing strings
+            // BUGGY!
+            //$list = preg_replace_callback('#(?<=^|\:|\|)\w+?(\w+)(?:\|.+\1)+(?=\|)#', create_function(
+            //    '$matches', 'return "(?:" . preg_replace("#" . preg_quote($matches[1], "#") . "(?=\||$)#", "", $matches[0]) . ")" . $matches[1];'), $list);
+            // (?:p)? => p?
+            $list = preg_replace('#\(\?\:(.)\)\?#', '\1?', $list);
+            // (?:a|b|c|d|...)? => [abcd...]?
+            // TODO: a|bb|c => [ac]|bb
+            static $callback_2;
+            if (!isset($callback_2)) {
+                $callback_2 = create_function('$matches', 'return "[" . str_replace("|", "", $matches[1]) . "]";');
+            }
+            $list = preg_replace_callback('#\(\?\:((?:.\|)+.)\)#', $callback_2, $list);
+        }
+        // return $list without trailing pipe
+        return substr($list, 0, -1);
+    }
+} // End Class GeSHi
+
+
+if (!function_exists('geshi_highlight')) {
+    /**
+     * Easy way to highlight stuff. Behaves just like highlight_string
+     *
+     * @param string The code to highlight
+     * @param string The language to highlight the code in
+     * @param string The path to the language files. You can leave this blank if you need
+     *               as from version 1.0.7 the path should be automatically detected
+     * @param boolean Whether to return the result or to echo
+     * @return string The code highlighted (if $return is true)
+     * @since 1.0.2
+     */
+    function geshi_highlight($string, $language, $path = null, $return = false) {
+        $geshi = new GeSHi($string, $language, $path);
+        $geshi->set_header_type(GESHI_HEADER_NONE);
+
+        if ($return) {
+            return '<code>' . $geshi->parse_code() . '</code>';
+        }
+
+        echo '<code>' . $geshi->parse_code() . '</code>';
+
+        if ($geshi->error()) {
+            return false;
+        }
+        return true;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/4cs.php b/vendor/easybook/geshi/geshi/4cs.php
new file mode 100755
index 000000000..e5a00645c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/4cs.php
@@ -0,0 +1,137 @@
+<?php
+/*************************************************************************************
+ * 4cs.php
+ * ------
+ * Author: Jason Curl (jason.curl@continental-corporation.com)
+ * Copyright: (c) 2009 Jason Curl
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/09/05
+ *
+ * 4CS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/09/05
+ *   -  First Release
+ *
+ * TODO (updated 2009/09/01)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GADV 4CS',
+    'COMMENT_SINGLE' => array(1 => "//"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'All', 'AllMatches', 'And', 'And_Filters', 'As', 'Asc', 'BasedOn',
+            'BestMatch', 'Block', 'Buffer', 'ByRef', 'ByVal', 'Call', 'Channel',
+            'Chr', 'Clear', 'Close', 'Confirm', 'Const', 'Continue', 'Cos',
+            'Critical', 'Declare', 'Default', 'DefaultChannel', 'DefaultDelayTime',
+            'DefaultReceiveMode', 'DefaultResponseTime', '#Define', 'DelayTime',
+            'Delete', 'Div', 'Else', '#Else', 'ElseIf', '#ElseIf', 'End', 'EndCritical',
+            'EndInlineC', 'EndFunction', 'EndIf', '#EndIf', 'EndInputList',
+            'EndLocalChannel', 'EndScenario', 'EndSub', 'EndWhile', 'Error',
+            'ErrorLevelOff', 'ErrorLevelOn', 'ErrorLevelSet', 'ErrorLevelSetRaw',
+            'Event', 'EventMode', 'EventOff', 'EventOn', 'EventSet', 'EventSetRaw',
+            'Execute', 'Exit', 'Exp', 'FileClose', 'FilterClear', 'FileEOF', 'FileOpen',
+            'FileRead', 'FileSize', 'FileWrite', 'FilterAdd', 'FilterMode',
+            'FilterOff', 'FilterOn', 'For', 'Format', 'Function', 'GoOnline', 'GoTo',
+            'Handle', 'Hide', 'If', '#If', '#IfDef', '#IfNDef', 'Ignore', '#Include',
+            'InlineC', 'Input', 'InputItem', 'InputList', 'Kill', 'LBound', 'LocalChannel',
+            'Local', 'Log', 'Log10', 'LogOff', 'LogOn', 'Loop', 'Message', 'Mod',
+            'MonitorChannel', 'MostFormat', 'MostMessage', 'Named', 'Never', 'Next',
+            'NoOrder', 'Not', 'Nothing', 'NoWait', 'Numeric', 'OnError', 'OnEvent',
+            'Or', 'Or_Filters', 'Order', 'Pass', 'Pow', 'Prototype', 'Quit', 'Raise',
+            'Random', 'Receive', 'ReceiveMode', 'ReceiveRaw', 'Redim', 'Remote', 'Repeat',
+            'Repeated', 'ResponseTime', 'Resume', 'ResumeCritical', 'RT_Common',
+            'RT_Dll_Call', 'RT_FILEIO', 'RT_General', 'RT_HardwareAccess',
+            'RT_MessageVariableAccess', 'RT_Scenario', 'RT_VariableAccess', 'Runtime',
+            'Scenario', 'ScenarioEnd', 'ScenarioStart', 'ScenarioStatus', 'ScenarioTerminate',
+            'Send', 'SendRaw', 'Set', 'SetError', 'Sin', 'Single', 'Show', 'Start',
+            'StartCritical', 'Starts', 'Static', 'Step', 'Stop', 'String', 'Sub',
+            'System_Error', 'TerminateAllChilds', 'Terminates', 'Then', 'Throw', 'TimeOut',
+            'To', 'TooLate', 'Trunc', 'UBound', 'Unexpected', 'Until', 'User_Error',
+            'View', 'Wait', 'Warning', 'While', 'XOr'
+            ),
+        2 => array(
+            'alias', 'winapi', 'long', 'char', 'double', 'float', 'int', 'short', 'lib'
+            )
+        ),
+    'SYMBOLS' => array(
+        '=', ':=', '<', '>', '<>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000C0; font-weight: bold;',
+            2 => 'color: #808080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/6502acme.php b/vendor/easybook/geshi/geshi/6502acme.php
new file mode 100755
index 000000000..203e04dfa
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/6502acme.php
@@ -0,0 +1,230 @@
+<?php
+/*************************************************************************************
+ * 6502acme.php
+ * -------
+ * Author: Warren Willmey
+ * Copyright: (c) 2010 Warren Willmey.
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/05/26
+ *
+ * MOS 6502 (more specifically 6510) ACME Cross Assembler 0.93 by Marco Baye language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/22
+ *  -  First Release
+ *
+ * TODO (updated 2010/07/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MOS 6502 (6510) ACME Cross Assembler format',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* 6502/6510 Opcodes. */
+        1 => array(
+            'adc', 'and', 'asl', 'bcc', 'bcs', 'beq', 'bit', 'bmi',
+            'bne', 'bpl', 'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli',
+            'clv', 'cmp', 'cpx', 'cpy', 'dec', 'dex', 'dey', 'eor',
+            'inc', 'inx', 'iny', 'jmp', 'jsr', 'lda', 'ldx', 'ldy',
+            'lsr', 'nop', 'ora', 'pha', 'php', 'pla', 'plp', 'rol',
+            'ror', 'rti', 'rts', 'sbc', 'sec', 'sed', 'sei', 'sta',
+            'stx', 'sty', 'tax', 'tay', 'tsx', 'txa', 'txs', 'tya',
+            ),
+        /* Index Registers, yes the 6502 has other registers by they are only
+        * accessable by specific opcodes. The 65816 also has access to the stack pointer S. */
+        2 => array(
+            'x', 'y', 's'
+            ),
+        /* Directives or "pseudo opcodes" as defined by ACME 0.93 file AllPOs.txt. */
+        3 => array(
+            '!8', '!08', '!by', '!byte',
+            '!16', '!wo', '!word',
+            '!24', '!32',
+            '!fi', '!fill',
+            '!align',
+            '!ct', '!convtab',
+            '!tx', '!text',
+            '!pet',
+            '!raw',
+            '!scrxor',
+            '!to',
+            '!source',
+            '!bin', '!binary',
+            '!zn', '!zone',
+            '!sl',
+            '!svl',
+            '!sal',
+            '!if', '!ifdef',
+            '!for',
+            '!set',
+            '!do', 'while', 'until',
+            '!eof', '!endoffile',
+            '!warn', '!error', '!serious',
+            '!macro',
+//            , '*='        // Not a valid keyword (uses both * and = signs) moved to symbols instead.
+            '!initmem',
+            '!pseudopc',
+            '!cpu',
+            '!al', '!as', '!rl', '!rs',
+            ),
+
+        /* 6502/6510 undocumented opcodes (often referred to as illegal instructions).
+        *  These are present in the 6502/6510 but NOT in the newer CMOS revisions of the 65C02 or 65816.
+        *  As they are undocumented instructions there are no "official" names for them, there are also
+        *  several more that mainly perform various forms of crash and are not supported by ACME 0.93.
+        */
+        4 => array(
+            'anc', 'arr', 'asr', 'dcp', 'dop', 'isc', 'jam', 'lax',
+            'rla', 'rra', 'sax', 'sbx', 'slo', 'sre', 'top',
+            ),
+        /* 65c02 instructions, MOS added a few (much needed) instructions in the CMOS version of the 6502, but stupidly removed the undocumented/illegal opcodes.
+        *  ACME 0.93 does not support the rmb0-7 and smb0-7 instructions (they are currently rem'ed out).  */
+        5 => array(
+            'bra', 'phx', 'phy', 'plx', 'ply', 'stz', 'trb', 'tsb'
+            ),
+        /* 65816 instructions. */
+        6 => array(
+            'brl', 'cop', 'jml', 'jsl', 'mvn', 'mvp', 'pea', 'pei',
+            'per', 'phb', 'phd', 'phk', 'plb', 'pld', 'rep', 'rtl',
+            'sep', 'tcd', 'tcs', 'tdc', 'tsc', 'txy', 'tyx', 'wdm',
+            'xba', 'xce',
+            ),
+        /* Deprecated directives or "pseudo opcodes" as defined by ACME 0.93 file AllPOs.txt. */
+        7 => array(
+            '!cbm',
+            '!sz', '!subzone',
+            '!realpc',
+            ),
+        /* Math functions, some are aliases for the symbols. */
+        8 => array(
+            'not', 'div', 'mod', 'xor', 'or', 'sin', 'cos', 'tan',
+            'arcsin', 'arccos', 'arctan', 'int', 'float',
+
+            ),
+
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '*=', '#', '!', '^', '-', '*', '/',
+        '%', '+', '-', '<<', '>>', '>>>',
+        '<', '>', '^', '<=', '<', '>=', '>', '!=',
+        '=', '&', '|', '<>',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00f; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #080; font-weight:bold;',
+            4 => 'color: #f00; font-weight:bold;',
+            5 => 'color: #80f; font-weight:bold;',
+            6 => 'color: #f08; font-weight:bold;',
+            7 => 'color: #a04; font-weight:bold; font-style: italic;',
+            8 => 'color: #000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX         => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            GESHI_NUMBER_FLT_NONSCI         => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0   => 'color: #f00;'
+            , 1 => 'color: #933;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
+    'REGEXPS' => array(
+        //ACME .# Binary number format. e.g. %..##..##..##
+        0 => '\%[\.\#]{1,64}',
+        //ACME Local Labels
+        1 => '\.[_a-zA-Z][_a-zA-Z0-9]*',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/6502kickass.php b/vendor/easybook/geshi/geshi/6502kickass.php
new file mode 100755
index 000000000..804282629
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/6502kickass.php
@@ -0,0 +1,241 @@
+<?php
+/*************************************************************************************
+ * 6502kickass.php
+ * -------
+ * Author: Warren Willmey
+ * Copyright: (c) 2010 Warren Willmey.
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/06/07
+ *
+ * MOS 6502 (6510) Kick Assembler 3.13 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/22
+ *  -  First Release
+ *
+ * TODO (updated 2010/07/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MOS 6502 (6510) Kick Assembler format',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* 6502/6510 Opcodes including undocumented opcodes as Kick Assembler 3.13 does not make a distinction - they are ALL valid. */
+        1 => array(
+            'adc', 'ahx', 'alr', 'anc', 'anc2', 'and', 'arr', 'asl',
+            'axs', 'bcc', 'bcs', 'beq', 'bit', 'bmi', 'bne', 'bpl',
+            'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli', 'clv', 'cmp',
+            'cpx', 'cpy', 'dcp', 'dec', 'dex', 'dey', 'eor', 'inc',
+            'inx', 'iny', 'isc', 'jmp', 'jsr', 'las', 'lax', 'lda',
+            'ldx', 'ldy', 'lsr', 'nop', 'ora', 'pha', 'php', 'pla',
+            'plp', 'rla', 'rol', 'ror', 'rra', 'rti', 'rts', 'sax',
+            'sbc', 'sbc2', 'sec', 'sed', 'sei', 'shx', 'shy', 'slo',
+            'sre', 'sta', 'stx', 'sty', 'tas', 'tax', 'tay', 'tsx',
+            'txa', 'txs', 'tya', 'xaa',
+            ),
+        /* DTV additional Opcodes. */
+        2 => array(
+            'bra', 'sac', 'sir'
+            ),
+        /* Index Registers, yes the 6502 has other registers by they are only
+        * accessable by specific opcodes. */
+        3 => array(
+            'x', 'y'
+            ),
+        /* Directives. */
+        4 => array(
+            '.pc', '.pseudopc', 'virtual', '.align', '.byte', '.word', '.text', '.fill',
+            '.import source', '.import binary', '.import c64', '.import text', '.import', '.print', '.printnow',
+            '.error', '.var', '.eval', '.const', '.eval const', '.enum', '.label', '.define', '.struct',
+            'if', '.for', '.macro', '.function', '.return', '.pseudocommand', '.namespace', '.filenamespace',
+            '.assert', '.asserterror',
+            ),
+        /* Kick Assembler 3.13 Functions/Operators. */
+        5 => array(
+            'size', 'charAt', 'substring', 'asNumber', 'asBoolean', 'toIntString', 'toBinaryString', 'toOctalString',
+            'toHexString', 'lock',                                       // String functions/operators.
+            'get', 'set', 'add', 'remove', 'shuffle',                    // List functions.
+            'put', 'keys',                                               // Hashtable functions.
+            'getType', 'getValue', 'CmdArgument',                        // Pseudo Commands functions.
+            'asmCommandSize',                                            // Opcode Constants functions.
+            'LoadBinary', 'getSize',
+            'LoadSid', 'getData',
+            'LoadPicture', 'width', 'height', 'getPixel', 'getSinglecolorByte', 'getMulticolorByte',
+            'createFile', 'writeln',
+            'cmdLineVars',
+            'getX', 'getY', 'getZ',                                             // Vector functions.
+            'RotationMatrix', 'ScaleMatrix', 'MoveMatrix', 'PerspectiveMatrix', // Matrix functions.
+
+            ),
+
+        /* Kick Assembler 3.13 Math Functions. */
+        6 => array(
+            'abs', 'acos', 'asin', 'atan', 'atan2', 'cbrt', 'ceil', 'cos', 'cosh',
+            'exp', 'expm1', 'floor', 'hypot', 'IEEEremainder', 'log', 'log10',
+            'log1p', 'max', 'min', 'pow', 'mod', 'random', 'round', 'signum',
+            'sin', 'sinh', 'sqrt', 'tan', 'tanh', 'toDegrees', 'toRadians',
+            ),
+
+        /* Kick Assembler 3.13 Objects/Data Types. */
+        7 => array(
+            'List',          // List() Object.
+            'Hashtable',     // Hashtable() Object.
+            'Vector',        // Vector() Object.
+            'Matrix',        // Matrix() Object.
+            ),
+
+        /* Kick Assembler 3.13 Constants. */
+        8 => array(
+            'PI', 'E',                                                         // Math Constants.
+            'AT_ABSOLUTE' , 'AT_ABSOLUTEX' , 'AT_ABSOLUTEY' , 'AT_IMMEDIATE',  // Pseudo Commands Constants.
+            'AT_INDIRECT' , 'AT_IZEROPAGEX' , 'AT_IZEROPAGEY' , 'AT_NONE',
+            'BLACK', 'WHITE', 'RED', 'CYAN', 'PURPLE', 'GREEN', 'BLUE',        // Colour Constants.
+            'YELLOW', 'ORANGE', 'BROWN', 'LIGHT_RED', 'DARK_GRAY', 'GRAY',
+            'LIGHT_GREEN', 'LIGHT_BLUE', 'LIGHT_GRAY',
+            'C64FILE',                                                         // Template Tag names.
+            'BF_C64FILE', 'BF_BITMAP_SINGLECOLOR', 'BF_KOALA' , 'BF_FLI',      // Binary format constant
+            ),
+
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '-', '+', '-', '*', '/', '>', '<', '<<', '>>', '&', '|', '^', '=', '==',
+        '!=', '>=', '<=', '!', '&&', '||', '#',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00f; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #00f; font-weight:bold;',
+            4 => 'color: #080; font-weight:bold;',
+            5 => 'color: #80f; font-weight:bold;',
+            6 => 'color: #f08; font-weight:bold;',
+            7 => 'color: #a04; font-weight:bold; font-style: italic;',
+            8 => 'color: #f08; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            GESHI_NUMBER_FLT_NONSCI         => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #933;',
+            1 => 'color: #933;',
+            2 => 'color: #933;',
+            3 => 'color: #00f; font-weight:bold;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
+    'REGEXPS' => array(
+        //Labels end with a collon.
+        0 => '[!]{0,1}[_a-zA-Z][_a-zA-Z0-9]*\:',
+        //Multi Labels (local labels) references start with ! and end with + or - for forward/backward reference.
+        1 => '![_a-zA-Z][_a-zA-Z0-9]*[+-]',
+        //Macros start with a colon :Macro.
+        2 => ':[_a-zA-Z][_a-zA-Z0-9]*',
+        // Opcode Constants, such as LDA_IMM, STA_IZPY are basically all 6502 opcodes
+        // in UPPER case followed by _underscore_ and the ADDRESS MODE.
+        // As you might imagine that is rather a lot ( 78 supported Opcodes * 12 Addressing modes = 936 variations)
+        // So I thought it better and easier to maintain as a regular expression.
+        // NOTE: The order of the Address Modes must be maintained or it wont work properly (eg. place ZP first and find out!)
+        3 => '[A-Z]{3}[2]?_(?:IMM|IND|IZPX|IZPY|ZPX|ZPY|ABSX|ABSY|REL|ABS|ZP)',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS'  => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
+            ),
+        'KEYWORDS' => array(
+            5 => array (
+                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\;>|^&'\"])"
+                ),
+            6 => array (
+                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\;>|^&'\"])"
+                ),
+            8 => array (
+                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\;>|^&'\"])"
+                )
+            )
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/6502tasm.php b/vendor/easybook/geshi/geshi/6502tasm.php
new file mode 100755
index 000000000..86aa479df
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/6502tasm.php
@@ -0,0 +1,189 @@
+<?php
+/*************************************************************************************
+ * 6502tasm.php
+ * -------
+ * Author: Warren Willmey
+ * Copyright: (c) 2010 Warren Willmey.
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/06/02
+ *
+ * MOS 6502 (6510) TASM/64TASS (64TASS being the super set of TASM) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/22
+ *  -  First Release
+ *
+ * TODO (updated 2010/07/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MOS 6502 (6510) TASM/64TASS 1.46 Assembler format',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* 6502/6510 Opcodes. */
+        1 => array(
+            'adc', 'and', 'asl', 'bcc', 'bcs', 'beq', 'bit', 'bmi',
+            'bne', 'bpl', 'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli',
+            'clv', 'cmp', 'cpx', 'cpy', 'dec', 'dex', 'dey', 'eor',
+            'inc', 'inx', 'iny', 'jmp', 'jsr', 'lda', 'ldx', 'ldy',
+            'lsr', 'nop', 'ora', 'pha', 'php', 'pla', 'plp', 'rol',
+            'ror', 'rti', 'rts', 'sbc', 'sec', 'sed', 'sei', 'sta',
+            'stx', 'sty', 'tax', 'tay', 'tsx', 'txa', 'txs', 'tya',
+            ),
+        /* Index Registers, yes the 6502 has other registers by they are only
+        * accessable by specific opcodes. The 65816 also has access to the stack pointer S. */
+        2 => array(
+            'x', 'y', 's'
+            ),
+        /* Directives. */
+        3 => array(
+            '.al', '.align', '.as', '.assert', '.binary', '.byte', '.cerror', '.char',
+            '.comment', '.cpu', '.cwarn', '.databank', '.dpage', '.else', '.elsif',
+            '.enc', '.endc', '.endif', '.endm', '.endp', '.error', '.fi', '.fill',
+            '.for', '.here', '.if', '.ifeq', '.ifmi', '.ifne', '.ifpl',
+            '.include', '.int', '.logical', '.long', '.macro', '.next', '.null', '.offs',
+            '.page', '.pend', '.proc', '.rept', '.rta', '.shift', '.text', '.warn', '.word',
+            '.xl', '.xs',
+//            , '*='        // Not a valid keyword (uses both * and = signs) moved to symbols instead.
+            ),
+
+        /* 6502/6510 undocumented opcodes (often referred to as illegal instructions).
+        *  These are present in the 6502/6510 but NOT in the newer CMOS revisions of the 65C02 or 65816.
+        *  As they are undocumented instructions there are no "official" names for them, these are the names
+        *  used by 64TASS V1.46.
+        */
+        4 => array(
+            'ahx', 'alr', 'anc', 'ane', 'arr', 'asr', 'axs', 'dcm',
+            'dcp', 'ins', 'isb', 'isc', 'jam', 'lae', 'las', 'lax',
+            'lds', 'lxa', 'rla', 'rra', 'sax', 'sbx', 'sha', 'shs',
+            'shx', 'shy', 'slo', 'sre', 'tas', 'xaa',
+            ),
+        /* 65c02 instructions, MOS added a few (much needed) instructions in the
+        *  CMOS version of the 6502, but stupidly removed the undocumented/illegal opcodes.  */
+        5 => array(
+            'bra', 'dea', 'gra', 'ina', 'phx', 'phy', 'plx', 'ply',
+            'stz', 'trb', 'tsb',
+            ),
+        /* 65816 instructions. */
+        6 => array(
+            'brl', 'cop', 'jml', 'jsl', 'mvn', 'mvp', 'pea', 'pei',
+            'per', 'phb', 'phd', 'phk', 'plb', 'pld', 'rep', 'rtl',
+            'sep', 'stp', 'swa', 'tad', 'tcd', 'tcs', 'tda',
+            'tdc', 'tsa', 'tsc', 'txy', 'tyx', 'wai', 'xba', 'xce',
+            ),
+        /* Deprecated directives (or yet to be implemented). */
+        7 => array(
+            '.global', '.check'
+            ),
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '*=', '#', '<', '>', '`', '=', '<', '>',
+        '!=', '>=', '<=', '+', '-', '*', '/', '//', '|',
+        '^', '&', '<<', '>>', '-', '~', '!',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00f; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #080; font-weight:bold;',
+            4 => 'color: #f00; font-weight:bold;',
+            5 => 'color: #80f; font-weight:bold;',
+            6 => 'color: #f08; font-weight:bold;',
+            7 => 'color: #a04; font-weight:bold; font-style: italic;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/68000devpac.php b/vendor/easybook/geshi/geshi/68000devpac.php
new file mode 100755
index 000000000..f46387ae9
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/68000devpac.php
@@ -0,0 +1,168 @@
+<?php
+/*************************************************************************************
+ * 68000devpac.php
+ * -------
+ * Author: Warren Willmey
+ * Copyright: (c) 2010 Warren Willmey.
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/06/09
+ *
+ * Motorola 68000 - HiSoft Devpac ST 2 Assembler language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/22
+ *  -  First Release
+ *
+ * TODO (updated 2010/07/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Motorola 68000 - HiSoft Devpac ST 2 Assembler format',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Directives. */
+        1 => array(
+            'end', 'include', 'incbin', 'opt', 'even', 'cnop', 'dc.b', 'dc.w',
+            'dc.l', 'ds.b', 'ds.w', 'ds.l', 'dcb.b', 'dcb.w', 'dcb.l',
+            'fail', 'output', '__g2', 'rept', 'endr', 'list', 'nolist', 'plen',
+            'llen', 'ttl', 'subttl', 'spc', 'page', 'listchar', 'format',
+            'equ', 'equr', 'set', 'reg', 'rs.b', 'rs.w', 'rs.l', 'rsreset',
+            'rsset', '__rs', 'ifeq', 'ifne', 'ifgt', 'ifge', 'iflt', 'ifle', 'endc',
+            'ifd', 'ifnd', 'ifc', 'ifnc', 'elseif', 'iif', 'macro', 'endm', 'mexit',
+            'narg', '\@', 'section', 'text', 'data', 'bss', 'xdef', 'xref', 'org',
+            'offset', '__lk', 'comment',
+            ),
+        /* 68000 Opcodes. */
+        2 => array(
+            'abcd',    'add', 'adda', 'addi', 'addq', 'addx',  'and', 'andi',
+            'asl',     'asr',  'bcc', 'bchg', 'bclr',  'bcs',  'beq',  'bge',
+            'bgt',     'bhi',  'ble',  'bls',  'blt',  'bmi',  'bne',  'bpl',
+            'bra',    'bset',  'bsr', 'btst',  'bvc',  'bvs',  'chk',  'clr',
+            'cmp',    'cmpa', 'cmpi', 'cmpm', 'dbcc', 'dbcs', 'dbeq',  'dbf',
+            'dbge',   'dbgt', 'dbhi', 'dble', 'dbls', 'dblt', 'dbmi', 'dbne',
+            'dbpl',   'dbra',  'dbt', 'dbvc', 'dbvs', 'divs', 'divu',  'eor',
+            'eori',    'exg',  'ext','illegal','jmp',  'jsr',  'lea', 'link',
+            'lsl',     'lsr', 'move','movea','movem','movep','moveq', 'muls',
+            'mulu',   'nbcd',  'neg', 'negx',  'nop',  'not',   'or',  'ori',
+            'pea',   'reset',  'rol',  'ror', 'roxl', 'roxr',  'rte',  'rtr',
+            'rts',    'sbcd',  'scc',  'scs',  'seq',   'sf',  'sge',  'sgt',
+            'shi',     'sle',  'sls',  'slt',  'smi',  'sne',  'spl',   'st',
+            'stop',    'sub', 'suba', 'subi', 'subq', 'subx',  'svc',  'svs',
+            'swap',    'tas', 'trap','trapv',  'tst', 'unlk',
+            ),
+        /* oprand sizes. */
+        3 => array(
+            'b', 'w', 'l' , 's'
+            ),
+        /* 68000 Registers. */
+        4 => array(
+            'd0', 'd1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7',
+            'a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'sp', 'usp', 'ssp',
+            'pc', 'ccr', 'sr',
+            ),
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '+', '-', '~', '<<', '>>', '&',
+        '!', '^', '*', '/', '=', '<', '>',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #f08; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #00f; font-weight:bold;',
+            4 => 'color: #080; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            GESHI_NUMBER_OCT_PREFIX_AT      => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #933;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_OCT_PREFIX_AT |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+    'REGEXPS' => array(
+        //Labels may end in a colon.
+        0 => '(?<=\A\x20|\r|\n|^)[\._a-zA-Z][\._a-zA-Z0-9]*[\:]?[\s]'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%\@]/'
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/abap.php b/vendor/easybook/geshi/geshi/abap.php
new file mode 100755
index 000000000..5acd261c6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/abap.php
@@ -0,0 +1,1409 @@
+<?php
+/*************************************************************************************
+ * abap.php
+ * --------
+ * Author: Andres Picazo (andres@andrespicazo.com)
+ * Contributors:
+ *  - Sandra Rossi (sandra.rossi@gmail.com)
+ *  - Jacob Laursen (jlu@kmd.dk)
+ * Copyright: (c) 2007 Andres Picazo
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * ABAP language file for GeSHi.
+ *
+ * Reference abap language documentation (abap 7.1) : http://help.sap.com/abapdocu/en/ABENABAP_INDEX.htm
+ *
+ * ABAP syntax is highly complex, several problems could not be addressed, see TODO below if you dare ;-)
+ * Be aware that in ABAP language, keywords may be composed of several tokens,
+ *    separated by one or more spaces or carriage returns
+ *    (for example CONCATENATE 'hello' 'world' INTO string SEPARATED  BY ' ')
+ *    it's why we must decode them with REGEXPS. As there are many keywords with several tokens,
+ *    I had to create a separate section in the code to simplify the reading.
+ * Be aware that some words may be highlighted several times like for "ref to data", which is first
+ *    highlighted for "ref to data", then secondly for "ref to". It is very important to
+ *    position "ref to" after "ref to data" otherwise "data" wouldn't be highlighted because
+ *    of the previous highlight.
+ * Control, declarative and other statements are assigned URLs to sap documentation website:
+ *    http://help.sap.com/abapdocu/en/ABAP<statement_name>.htm
+ *
+ * CHANGES
+ * -------
+ * 2009/02/25 (1.0.8.3)
+ *   -  Some more rework of the language file
+ * 2009/01/04 (1.0.8.2)
+ *   -  Major Release, more than 1000 statements and keywords added = whole abap 7.1 (Sandra Rossi)
+ * 2007/06/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *   - in DATA data TYPE type, 2nd "data" and 2nd "type" are highlighted with data
+ *     style, but should be ignored. Same problem for all words!!! This is quite impossible to
+ *     solve it as we should define syntaxes of all statements (huge effort!) and use a lex
+ *     or something like that instead of regexp I guess.
+ *   - Some words are considered as being statement names (report, tables, etc.) though they
+ *     are used as keyword in some statements. For example: FORM xxxx TABLES itab. It was
+ *     arbitrary decided to define them as statement instead of keyword, because it may be
+ *     useful to have the URL to SAP help for some of them.
+ *   - if a comment is between 2 words of a keyword (for example SEPARATED "comment \n BY),
+ *     it is not considered as a keyword, but it should!
+ *   - for statements like "READ DATASET", GeSHi does not allow to set URLs because these
+ *     statements are determined by REGEXPS. For "READ DATASET", the URL should be
+ *     ABAPREAD_DATASET.htm. If a technical solution is found, be careful : URLs
+ *     are sometimes not valid because the URL does not exist. For example, for "AT NEW"
+ *     statement, the URL should be ABAPAT_ITAB.htm (not ABAPAT_NEW.htm).
+ *     There are many other exceptions.
+ *     Note: for adding this functionality within your php program, you can execute this code:
+ *       function add_urls_to_multi_tokens( $matches ) {
+ *           $url = preg_replace( "/[ \n]+/" , "_" , $matches[3] );
+ *           if( $url == $matches[3] ) return $matches[0] ;
+ *           else return $matches[1]."<a href=\"http://help.sap.com/abapdocu/en/ABAP".strtoupper($url).".htm\">".$matches[3]."</a>".$matches[4];
+ *           }
+ *       $html = $geshi->parse_code();
+ *       $html = preg_replace_callback( "£(zzz:(control|statement|data);\">)(.+?)(</span>)£s", "add_urls_to_multi_tokens", $html );
+ *       echo $html;
+ *   - Numbers followed by a dot terminating the statement are not properly recognized
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'ABAP',
+    'COMMENT_SINGLE' => array(
+        1 => '"'
+        ),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // lines beginning with star at 1st position are comments
+        // (star anywhere else is not a comment, especially be careful with
+        // "assign dref->* to <fs>" statement)
+        2 => '/^\*.*?$/m'
+        ),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array(
+        1 => "'",
+        2 => "`"
+        ),
+    'ESCAPE_CHAR' => '',
+
+    'KEYWORDS' => array(
+        //***********************************************
+        // Section 2 : process sequences of several tokens
+        //***********************************************
+
+        7 => array(
+            'at new',
+            'at end of',
+            'at first',
+            'at last',
+            'loop at',
+            'loop at screen',
+            ),
+
+        8 => array(
+            'private section',
+            'protected section',
+            'public section',
+            'at line-selection',
+            'at selection-screen',
+            'at user-command',
+            'assign component',
+            'assign table field',
+            'call badi',
+            'call customer-function',
+            'call customer subscreen',
+            'call dialog',
+            'call function',
+            'call method',
+            'call screen',
+            'call selection-screen',
+            'call transaction',
+            'call transformation',
+            'close cursor',
+            'close dataset',
+            'commit work',
+            'convert date',
+            'convert text',
+            'convert time stamp',
+            'create data',
+            'create object',
+            'delete dataset',
+            'delete from',
+            'describe distance',
+            'describe field',
+            'describe list',
+            'describe table',
+            'exec sql',
+            'exit from sql',
+            'exit from step-loop',
+            'export dynpro',
+            'export nametab',
+            'free memory',
+            'generate subroutine-pool',
+            'get badi',
+            'get bit',
+            'get cursor',
+            'get dataset',
+            'get locale',
+            'get parameter',
+            'get pf-status',
+            'get property',
+            'get reference',
+            'get run time',
+            'get time',
+            'get time stamp',
+            'import directory',
+            'insert report',
+            'insert text-pool',
+            'leave list-processing',
+            'leave program',
+            'leave screen',
+            'leave to list-processing',
+            'leave to transaction',
+            'modify line',
+            'modify screen',
+            'move percentage',
+            'open cursor',
+            'open dataset',
+            'raise event',
+            'raise exception',
+            'read dataset',
+            'read line',
+            'read report',
+            'read table',
+            'read textpool',
+            'receive results from function',
+            'refresh control',
+            'rollback work',
+            'set bit',
+            'set blank lines',
+            'set country',
+            'set cursor',
+            'set dataset',
+            'set extended check',
+            'set handler',
+            'set hold data',
+            'set language',
+            'set left scroll-boundary',
+            'set locale',
+            'set margin',
+            'set parameter',
+            'set pf-status',
+            'set property',
+            'set run time analyzer',
+            'set run time clock',
+            'set screen',
+            'set titlebar',
+            'set update task',
+            'set user-command',
+            'suppress dialog',
+            'truncate dataset',
+            'wait until',
+            'wait up to',
+            ),
+
+        9 => array(
+            'accepting duplicate keys',
+            'accepting padding',
+            'accepting truncation',
+            'according to',
+            'actual length',
+            'adjacent duplicates',
+            'after input',
+            'all blob columns',
+            'all clob columns',
+            'all fields',
+            'all methods',
+            'all other columns',
+            'and mark',
+            'and return to screen',
+            'and return',
+            'and skip first screen',
+            'and wait',
+            'any table',
+            'appendage type',
+            'archive mode',
+            'archiving parameters',
+            'area handle',
+            'as checkbox',
+            'as icon',
+            'as line',
+            'as listbox',
+            'as person table',
+            'as search patterns',
+            'as separate unit',
+            'as subscreen',
+            'as symbol',
+            'as text',
+            'as window',
+            'at cursor-selection',
+            'at exit-command',
+            'at next application statement',
+            'at position',
+
+            'backup into',
+            'before output',
+            'before unwind',
+            'begin of block',
+            'begin of common part',
+            'begin of line',
+            'begin of screen',
+            'begin of tabbed block',
+            'begin of version',
+            'begin of',
+            'big endian',
+            'binary mode',
+            'binary search',
+            'by kernel module',
+            'bypassing buffer',
+
+            'client specified',
+            'code page',
+            'code page hint',
+            'code page into',
+            'color black',
+            'color blue',
+            'color green',
+            'color pink',
+            'color red',
+            'color yellow',
+            'compression off',
+            'compression on',
+            'connect to',
+            'corresponding fields of table',
+            'corresponding fields of',
+            'cover page',
+            'cover text',
+            'create package',
+            'create private',
+            'create protected',
+            'create public',
+            'current position',
+
+            'data buffer',
+            'data values',
+            'dataset expiration',
+            'daylight saving time',
+            'default key',
+            'default program',
+            'default screen',
+            'defining database',
+            'deleting leading',
+            'deleting trailing',
+            'directory entry',
+            'display like',
+            'display offset',
+            'during line-selection',
+            'dynamic selections',
+
+            'edit mask',
+            'end of block',
+            'end of common part',
+            'end of file',
+            'end of line',
+            'end of screen',
+            'end of tabbed block',
+            'end of version',
+            'end of',
+            'endian into',
+            'ending at',
+            'enhancement options into',
+            'enhancement into',
+            'environment time format',
+            'execute procedure',
+            'exporting list to memory',
+            'extension type',
+
+            'field format',
+            'field selection',
+            'field value into',
+            'final methods',
+            'first occurrence of',
+            'fixed-point arithmetic',
+            'for all entries',
+            'for all instances',
+            'for appending',
+            'for columns',
+            'for event of',
+            'for field',
+            'for high',
+            'for input',
+            'for lines',
+            'for low',
+            'for node',
+            'for output',
+            'for select',
+            'for table',
+            'for testing',
+            'for update',
+            'for user',
+            'frame entry',
+            'frame program from',
+            'from code page',
+            'from context',
+            'from database',
+            'from logfile id',
+            'from number format',
+            'from screen',
+            'from table',
+            'function key',
+
+            'get connection',
+            'global friends',
+            'group by',
+
+            'hashed table of',
+            'hashed table',
+
+            'if found',
+            'ignoring case',
+            'ignoring conversion errors',
+            'ignoring structure boundaries',
+            'implementations from',
+            'in background',
+            'in background task',
+            'in background unit',
+            'in binary mode',
+            'in byte mode',
+            'in char-to-hex mode',
+            'in character mode',
+            'in group',
+            'in legacy binary mode',
+            'in legacy text mode',
+            'in program',
+            'in remote task',
+            'in text mode',
+            'in table',
+            'in update task',
+            'include bound',
+            'include into',
+            'include program from',
+            'include structure',
+            'include type',
+            'including gaps',
+            'index table',
+            'inheriting from',
+            'init destination',
+            'initial line of',
+            'initial line',
+            'initial size',
+            'internal table',
+            'into sortable code',
+
+            'keep in spool',
+            'keeping directory entry',
+            'keeping logical unit of work',
+            'keeping task',
+            'keywords from',
+
+            'left margin',
+            'left outer',
+            'levels into',
+            'line format',
+            'line into',
+            'line of',
+            'line page',
+            'line value from',
+            'line value into',
+            'lines of',
+            'list authority',
+            'list dataset',
+            'list name',
+            'little endian',
+            'lob handle for',
+            'local friends',
+            'locator for',
+            'lower case',
+
+            'main table field',
+            'match count',
+            'match length',
+            'match line',
+            'match offset',
+            'matchcode object',
+            'maximum length',
+            'maximum width into',
+            'memory id',
+            'message into',
+            'messages into',
+            'modif id',
+
+            'nesting level',
+            'new list identification',
+            'next cursor',
+            'no database selection',
+            'no dialog',
+            'no end of line',
+            'no fields',
+            'no flush',
+            'no intervals',
+            'no intervals off',
+            'no standard page heading',
+            'no-extension off',
+            'non-unique key',
+            'non-unique sorted key',
+            'not at end of mode',
+            'number of lines',
+            'number of pages',
+
+            'object key',
+            'obligatory off',
+            'of current page',
+            'of page',
+            'of program',
+            'offset into',
+            'on block',
+            'on commit',
+            'on end of task',
+            'on end of',
+            'on exit-command',
+            'on help-request for',
+            'on radiobutton group',
+            'on rollback',
+            'on value-request for',
+            'open for package',
+            'option class-coding',
+            'option class',
+            'option coding',
+            'option expand',
+            'option syncpoints',
+            'options from',
+            'order by',
+            'overflow into',
+
+            'package section',
+            'package size',
+            'preferred parameter',
+            'preserving identifier escaping',
+            'primary key',
+            'print off',
+            'print on',
+            'program from',
+            'program type',
+
+            'radiobutton groups',
+            'radiobutton group',
+            'range of',
+            'reader for',
+            'receive buffer',
+            'reduced functionality',
+            'ref to data',
+            'ref to object',
+            'ref to',
+
+            'reference into',
+            'renaming with suffix',
+            'replacement character',
+            'replacement count',
+            'replacement length',
+            'replacement line',
+            'replacement offset',
+            'respecting blanks',
+            'respecting case',
+            'result into',
+            'risk level',
+
+            'sap cover page',
+            'search fkeq',
+            'search fkge',
+            'search gkeq',
+            'search gkge',
+            'section of',
+            'send buffer',
+            'separated by',
+            'shared buffer',
+            'shared memory',
+            'shared memory enabled',
+            'skipping byte-order mark',
+            'sorted by',
+            'sorted table of',
+            'sorted table',
+            'spool parameters',
+            'standard table of',
+            'standard table',
+            'starting at',
+            'starting new task',
+            'statements into',
+            'structure default',
+            'structures into',
+
+            'table field',
+            'table of',
+            'text mode',
+            'time stamp',
+            'time zone',
+            'to code page',
+            'to column',
+            'to context',
+            'to first page',
+            'to last page',
+            'to last line',
+            'to line',
+            'to lower case',
+            'to number format',
+            'to page',
+            'to sap spool',
+            'to upper case',
+            'tokens into',
+            'transporting no fields',
+            'type tableview',
+            'type tabstrip',
+
+            'unicode enabling',
+            'up to',
+            'upper case',
+            'using edit mask',
+            'using key',
+            'using no edit mask',
+            'using screen',
+            'using selection-screen',
+            'using selection-set',
+            'using selection-sets of program',
+
+            'valid between',
+            'valid from',
+            'value check',
+            'via job',
+            'via selection-screen',
+            'visible length',
+
+            'whenever found',
+            'with analysis',
+            'with byte-order mark',
+            'with comments',
+            'with current switchstates',
+            'with explicit enhancements',
+            'with frame',
+            'with free selections',
+            'with further secondary keys',
+            'with header line',
+            'with hold',
+            'with implicit enhancements',
+            'with inactive enhancements',
+            'with includes',
+            'with key',
+            'with linefeed',
+            'with list tokenization',
+            'with native linefeed',
+            'with non-unique key',
+            'with null',
+            'with pragmas',
+            'with precompiled headers',
+            'with selection-table',
+            'with smart linefeed',
+            'with table key',
+            'with test code',
+            'with type-pools',
+            'with unique key',
+            'with unix linefeed',
+            'with windows linefeed',
+            'without further secondary keys',
+            'without selection-screen',
+            'without spool dynpro',
+            'without trmac',
+            'word into',
+            'writer for'
+            ),
+
+        //**********************************************************
+        // Other abap statements
+        //**********************************************************
+        3 => array(
+            'add',
+            'add-corresponding',
+            'aliases',
+            'append',
+            'assign',
+            'at',
+            'authority-check',
+
+            'break-point',
+
+            'clear',
+            'collect',
+            'compute',
+            'concatenate',
+            'condense',
+            'class',
+            'class-events',
+            'class-methods',
+            'class-pool',
+
+            'define',
+            'delete',
+            'demand',
+            'detail',
+            'divide',
+            'divide-corresponding',
+
+            'editor-call',
+            'end-of-file',
+            'end-enhancement-section',
+            'end-of-definition',
+            'end-of-page',
+            'end-of-selection',
+            'endclass',
+            'endenhancement',
+            'endexec',
+            'endform',
+            'endfunction',
+            'endinterface',
+            'endmethod',
+            'endmodule',
+            'endon',
+            'endprovide',
+            'endselect',
+            'enhancement',
+            'enhancement-point',
+            'enhancement-section',
+            'export',
+            'extract',
+            'events',
+
+            'fetch',
+            'field-groups',
+            'find',
+            'format',
+            'form',
+            'free',
+            'function-pool',
+            'function',
+
+            'get',
+
+            'hide',
+
+            'import',
+            'infotypes',
+            'input',
+            'insert',
+            'include',
+            'initialization',
+            'interface',
+            'interface-pool',
+            'interfaces',
+
+            'leave',
+            'load-of-program',
+            'log-point',
+
+            'maximum',
+            'message',
+            'methods',
+            'method',
+            'minimum',
+            'modify',
+            'move',
+            'move-corresponding',
+            'multiply',
+            'multiply-corresponding',
+
+            'new-line',
+            'new-page',
+            'new-section',
+
+            'overlay',
+
+            'pack',
+            'perform',
+            'position',
+            'print-control',
+            'program',
+            'provide',
+            'put',
+
+            'raise',
+            'refresh',
+            'reject',
+            'replace',
+            'report',
+            'reserve',
+
+            'scroll',
+            'search',
+            'select',
+            'selection-screen',
+            'shift',
+            'skip',
+            'sort',
+            'split',
+            'start-of-selection',
+            'submit',
+            'subtract',
+            'subtract-corresponding',
+            'sum',
+            'summary',
+            'summing',
+            'supply',
+            'syntax-check',
+
+            'top-of-page',
+            'transfer',
+            'translate',
+            'type-pool',
+
+            'uline',
+            'unpack',
+            'update',
+
+            'window',
+            'write'
+
+            ),
+
+        //**********************************************************
+        // keywords
+        //**********************************************************
+
+        4 => array(
+            'abbreviated',
+            'abstract',
+            'accept',
+            'acos',
+            'activation',
+            'alias',
+            'align',
+            'all',
+            'allocate',
+            'and',
+            'assigned',
+            'any',
+            'appending',
+            'area',
+            'as',
+            'ascending',
+            'asin',
+            'assigning',
+            'atan',
+            'attributes',
+            'avg',
+
+            'backward',
+            'between',
+            'bit-and',
+            'bit-not',
+            'bit-or',
+            'bit-set',
+            'bit-xor',
+            'boolc',
+            'boolx',
+            'bound',
+            'bt',
+            'blocks',
+            'bounds',
+            'boxed',
+            'by',
+            'byte-ca',
+            'byte-cn',
+            'byte-co',
+            'byte-cs',
+            'byte-na',
+            'byte-ns',
+
+            'ca',
+            'calling',
+            'casting',
+            'ceil',
+            'center',
+            'centered',
+            'changing',
+            'char_off',
+            'charlen',
+            'circular',
+            'class_constructor',
+            'client',
+            'clike',
+            'close',
+            'cmax',
+            'cmin',
+            'cn',
+            'cnt',
+            'co',
+            'col_background',
+            'col_group',
+            'col_heading',
+            'col_key',
+            'col_negative',
+            'col_normal',
+            'col_positive',
+            'col_total',
+            'color',
+            'column',
+            'comment',
+            'comparing',
+            'components',
+            'condition',
+            'context',
+            'copies',
+            'count',
+            'country',
+            'cpi',
+            'creating',
+            'critical',
+            'concat_lines_of',
+            'cos',
+            'cosh',
+            'count_any_not_of',
+            'count_any_of',
+            'cp',
+            'cs',
+            'csequence',
+            'currency',
+            'current',
+            'cx_static_check',
+            'cx_root',
+            'cx_dynamic_check',
+
+            'dangerous',
+            'database',
+            'datainfo',
+            'date',
+            'dbmaxlen',
+            'dd/mm/yy',
+            'dd/mm/yyyy',
+            'ddmmyy',
+            'deallocate',
+            'decfloat',
+            'decfloat16',
+            'decfloat34',
+            'decimals',
+            'default',
+            'deferred',
+            'definition',
+            'department',
+            'descending',
+            'destination',
+            'disconnect',
+            'display-mode',
+            'distance',
+            'distinct',
+            'div',
+            'dummy',
+
+            'encoding',
+            'end-lines',
+            'engineering',
+            'environment',
+            'eq',
+            'equiv',
+            'error_message',
+            'errormessage',
+            'escape',
+            'exact',
+            'exception-table',
+            'exceptions',
+            'exclude',
+            'excluding',
+            'exists',
+            'exp',
+            'exponent',
+            'exporting',
+            'extended_monetary',
+
+            'field',
+            'filter-table',
+            'filters',
+            'filter',
+            'final',
+            'find_any_not_of',
+            'find_any_of',
+            'find_end',
+            'floor',
+            'first-line',
+            'font',
+            'forward',
+            'for',
+            'frac',
+            'from_mixed',
+            'friends',
+            'from',
+
+            'giving',
+            'ge',
+            'gt',
+
+            'handle',
+            'harmless',
+            'having',
+            'head-lines',
+            'help-id',
+            'help-request',
+            'high',
+            'hold',
+            'hotspot',
+
+            'id',
+            'ids',
+            'immediately',
+            'implementation',
+            'importing',
+            'in',
+            'initial',
+            'incl',
+            'including',
+            'increment',
+            'index',
+            'index-line',
+            'inner',
+            'inout',
+            'intensified',
+            'into',
+            'inverse',
+            'is',
+            'iso',
+
+            'join',
+
+            'key',
+            'kind',
+
+            'log10',
+            'language',
+            'late',
+            'layout',
+            'le',
+            'lt',
+            'left-justified',
+            'leftplus',
+            'leftspace',
+            'left',
+            'length',
+            'level',
+            'like',
+            'line-count',
+            'line-size',
+            'lines',
+            'line',
+            'load',
+            'long',
+            'lower',
+            'low',
+            'lpi',
+
+            'matches',
+            'match',
+            'mail',
+            'major-id',
+            'max',
+            'medium',
+            'memory',
+            'message-id',
+            'module',
+            'minor-id',
+            'min',
+            'mm/dd/yyyy',
+            'mm/dd/yy',
+            'mmddyy',
+            'mode',
+            'modifier',
+            'mod',
+            'monetary',
+
+            'name',
+            'nb',
+            'ne',
+            'next',
+            'no-display',
+            'no-extension',
+            'no-gap',
+            'no-gaps',
+            'no-grouping',
+            'no-heading',
+            'no-scrolling',
+            'no-sign',
+            'no-title',
+            'no-topofpage',
+            'no-zero',
+            'nodes',
+            'non-unicode',
+            'no',
+            'number',
+            'nmax',
+            'nmin',
+            'not',
+            'null',
+            'numeric',
+            'numofchar',
+
+            'o',
+            'objects',
+            'obligatory',
+            'occurs',
+            'offset',
+            'off',
+            'of',
+            'only',
+            'open',
+            'option',
+            'optional',
+            'options',
+            'output-length',
+            'output',
+            'out',
+            'on change of',
+            'or',
+            'others',
+
+            'pad',
+            'page',
+            'pages',
+            'parameter-table',
+            'part',
+            'performing',
+            'pos_high',
+            'pos_low',
+            'priority',
+            'public',
+            'pushbutton',
+
+            'queue-only',
+            'quickinfo',
+
+            'raising',
+            'range',
+            'read-only',
+            'received',
+            'receiver',
+            'receiving',
+            'redefinition',
+            'reference',
+            'regex',
+            'replacing',
+            'reset',
+            'responsible',
+            'result',
+            'results',
+            'resumable',
+            'returncode',
+            'returning',
+            'right',
+            'right-specified',
+            'rightplus',
+            'rightspace',
+            'round',
+            'rows',
+            'repeat',
+            'requested',
+            'rescale',
+            'reverse',
+
+            'scale_preserving',
+            'scale_preserving_scientific',
+            'scientific',
+            'scientific_with_leading_zero',
+            'screen',
+            'scrolling',
+            'seconds',
+            'segment',
+            'shift_left',
+            'shift_right',
+            'sign',
+            'simple',
+            'sin',
+            'sinh',
+            'short',
+            'shortdump-id',
+            'sign_as_postfix',
+            'single',
+            'size',
+            'some',
+            'source',
+            'space',
+            'spots',
+            'stable',
+            'state',
+            'static',
+            'statusinfo',
+            'sqrt',
+            'string',
+            'strlen',
+            'structure',
+            'style',
+            'subkey',
+            'submatches',
+            'substring',
+            'substring_after',
+            'substring_before',
+            'substring_from',
+            'substring_to',
+            'super',
+            'supplied',
+            'switch',
+
+            'tan',
+            'tanh',
+            'table_line',
+            'table',
+            'tab',
+            'then',
+            'timestamp',
+            'times',
+            'time',
+            'timezone',
+            'title-lines',
+            'title',
+            'top-lines',
+            'to',
+            'to_lower',
+            'to_mixed',
+            'to_upper',
+            'trace-file',
+            'trace-table',
+            'transporting',
+            'trunc',
+            'type',
+
+            'under',
+            'unique',
+            'unit',
+            'user-command',
+            'using',
+            'utf-8',
+
+            'valid',
+            'value',
+            'value-request',
+            'values',
+            'vary',
+            'varying',
+            'version',
+
+            'warning',
+            'where',
+            'width',
+            'with',
+            'word',
+            'with-heading',
+            'with-title',
+
+            'xsequence',
+            'xstring',
+            'xstrlen',
+
+            'yes',
+            'yymmdd',
+
+            'z',
+            'zero'
+
+            ),
+
+        //**********************************************************
+        // screen statements
+        //**********************************************************
+
+        5 => array(
+            'call subscreen',
+            'chain',
+            'endchain',
+            'on chain-input',
+            'on chain-request',
+            'on help-request',
+            'on input',
+            'on request',
+            'on value-request',
+            'process'
+            ),
+
+        //**********************************************************
+        // internal statements
+        //**********************************************************
+
+        6 => array(
+            'generate dynpro',
+            'generate report',
+            'import dynpro',
+            'import nametab',
+            'include methods',
+            'load report',
+            'scan abap-source',
+            'scan and check abap-source',
+            'syntax-check for dynpro',
+            'syntax-check for program',
+            'syntax-trace',
+            'system-call',
+            'system-exit',
+            'verification-message'
+            ),
+
+        //**********************************************************
+        // Control statements
+        //**********************************************************
+
+        1 => array(
+            'assert',
+            'case',
+            'catch',
+            'check',
+            'cleanup',
+            'continue',
+            'do',
+            'else',
+            'elseif',
+            'endat',
+            'endcase',
+            'endcatch',
+            'endif',
+            'enddo',
+            'endloop',
+            'endtry',
+            'endwhile',
+            'exit',
+            'if',
+            'loop',
+            'resume',
+            'retry',
+            'return',
+            'stop',
+            'try',
+            'when',
+            'while'
+
+            ),
+
+        //**********************************************************
+        // variable declaration statements
+        //**********************************************************
+
+        2 => array(
+            'class-data',
+            'controls',
+            'constants',
+            'data',
+            'field-symbols',
+            'fields',
+            'local',
+            'parameters',
+            'ranges',
+            'select-options',
+            'statics',
+            'tables',
+            'type-pools',
+            'types'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '->*', '->', '=>',
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', '.'
+            ),
+        1 => array(
+            '>=', '<=', '<', '>', '='
+            ),
+        2 => array(
+            '?='
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;', //control statements
+            2 => 'color: #cc4050; text-transform: uppercase; font-weight: bold; zzz:data;', //data statements
+            3 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;', //first token of other statements
+            4 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;', // next tokens of other statements ("keywords")
+            5 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
+            6 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
+            7 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
+            8 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
+            9 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #4da619;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #3399ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #808080;',
+            1 => 'color: #800080;',
+            2 => 'color: #0000ff;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        2 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        3 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '=&gt;'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            7 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            8 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            9 => array(
+                'SPACE_AS_WHITESPACE' => true
+                )
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/actionscript.php b/vendor/easybook/geshi/geshi/actionscript.php
new file mode 100755
index 000000000..08e5b49ac
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/actionscript.php
@@ -0,0 +1,197 @@
+<?php
+/*************************************************************************************
+ * actionscript.php
+ * ----------------
+ * Author: Steffen Krause (Steffen.krause@muse.de)
+ * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/20
+ *
+ * Actionscript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ActionScript',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '#include', 'for', 'foreach', 'each', 'if', 'elseif', 'else', 'while', 'do', 'dowhile',
+            'endwhile', 'endif', 'switch', 'case', 'endswitch', 'return', 'break', 'continue', 'in'
+            ),
+        2 => array(
+            'null', 'false', 'true', 'var',
+            'default', 'function', 'class',
+            'new', '_global'
+            ),
+        3 => array(
+            '#endinitclip', '#initclip', '__proto__', '_accProps', '_alpha', '_currentframe',
+            '_droptarget', '_focusrect', '_framesloaded', '_height', '_highquality', '_lockroot',
+            '_name', '_parent', '_quality', '_root', '_rotation', '_soundbuftime', '_target', '_totalframes',
+            '_url', '_visible', '_width', '_x', '_xmouse', '_xscale', '_y', '_ymouse', '_yscale', 'abs',
+            'Accessibility', 'acos', 'activityLevel', 'add', 'addListener', 'addPage', 'addProperty',
+            'addRequestHeader', 'align', 'allowDomain', 'allowInsecureDomain', 'and', 'appendChild',
+            'apply', 'Arguments', 'Array', 'asfunction', 'asin', 'atan', 'atan2', 'attachAudio', 'attachMovie',
+            'attachSound', 'attachVideo', 'attributes', 'autosize', 'avHardwareDisable', 'background',
+            'backgroundColor', 'BACKSPACE', 'bandwidth', 'beginFill', 'beginGradientFill', 'blockIndent',
+            'bold', 'Boolean', 'border', 'borderColor', 'bottomScroll', 'bufferLength', 'bufferTime',
+            'builtInItems', 'bullet', 'Button', 'bytesLoaded', 'bytesTotal', 'call', 'callee', 'caller',
+            'Camera', 'capabilities', 'CAPSLOCK', 'caption', 'catch', 'ceil', 'charAt', 'charCodeAt',
+            'childNodes', 'chr', 'clear', 'clearInterval', 'cloneNode', 'close', 'Color', 'concat',
+            'connect', 'condenseWhite', 'constructor', 'contentType', 'ContextMenu', 'ContextMenuItem',
+            'CONTROL', 'copy', 'cos', 'createElement', 'createEmptyMovieClip', 'createTextField',
+            'createTextNode', 'currentFps', 'curveTo', 'CustomActions', 'customItems', 'data', 'Date',
+            'deblocking', 'delete', 'DELETEKEY', 'docTypeDecl', 'domain', 'DOWN',
+            'duplicateMovieClip', 'duration', 'dynamic', 'E', 'embedFonts', 'enabled',
+            'END', 'endFill', 'ENTER', 'eq', 'Error', 'ESCAPE(Konstante)', 'escape(Funktion)', 'eval',
+            'exactSettings', 'exp', 'extends', 'finally', 'findText', 'firstChild', 'floor',
+            'flush', 'focusEnabled', 'font', 'fps', 'fromCharCode', 'fscommand',
+            'gain', 'ge', 'get', 'getAscii', 'getBeginIndex', 'getBounds', 'getBytesLoaded', 'getBytesTotal',
+            'getCaretIndex', 'getCode', 'getCount', 'getDate', 'getDay', 'getDepth', 'getEndIndex', 'getFocus',
+            'getFontList', 'getFullYear', 'getHours', 'getInstanceAtDepth', 'getLocal', 'getMilliseconds',
+            'getMinutes', 'getMonth', 'getNewTextFormat', 'getNextHighestDepth', 'getPan', 'getProgress',
+            'getProperty', 'getRGB', 'getSeconds', 'getSelected', 'getSelectedText', 'getSize', 'getStyle',
+            'getStyleNames', 'getSWFVersion', 'getText', 'getTextExtent', 'getTextFormat', 'getTextSnapshot',
+            'getTime', 'getTimer', 'getTimezoneOffset', 'getTransform', 'getURL', 'getUTCDate', 'getUTCDay',
+            'getUTCFullYear', 'getUTCHours', 'getUTCMilliseconds', 'getUTCMinutes', 'getUTCMonth', 'getUTCSeconds',
+            'getVersion', 'getVolume', 'getYear', 'globalToLocal', 'goto', 'gotoAndPlay', 'gotoAndStop',
+            'hasAccessibility', 'hasAudio', 'hasAudioEncoder', 'hasChildNodes', 'hasEmbeddedVideo', 'hasMP3',
+            'hasPrinting', 'hasScreenBroadcast', 'hasScreenPlayback', 'hasStreamingAudio', 'hasStreamingVideo',
+            'hasVideoEncoder', 'height', 'hide', 'hideBuiltInItems', 'hitArea', 'hitTest', 'hitTestTextNearPos',
+            'HOME', 'hscroll', 'html', 'htmlText', 'ID3', 'ifFrameLoaded', 'ignoreWhite', 'implements',
+            'import', 'indent', 'index', 'indexOf', 'Infinity', '-Infinity', 'INSERT', 'insertBefore', 'install',
+            'instanceof', 'int', 'interface', 'isActive', 'isDebugger', 'isDown', 'isFinite', 'isNaN', 'isToggled',
+            'italic', 'join', 'Key', 'language', 'lastChild', 'lastIndexOf', 'le', 'leading', 'LEFT', 'leftMargin',
+            'length', 'level', 'lineStyle', 'lineTo', 'list', 'LN10', 'LN2', 'load', 'loadClip', 'loaded', 'loadMovie',
+            'loadMovieNum', 'loadSound', 'loadVariables', 'loadVariablesNum', 'LoadVars', 'LocalConnection',
+            'localFileReadDisable', 'localToGlobal', 'log', 'LOG10E', 'LOG2E', 'manufacturer', 'Math', 'max',
+            'MAX_VALUE', 'maxChars', 'maxhscroll', 'maxscroll', 'mbchr', 'mblength', 'mbord', 'mbsubstring', 'menu',
+            'message', 'Microphone', 'min', 'MIN_VALUE', 'MMExecute', 'motionLevel', 'motionTimeOut', 'Mouse',
+            'mouseWheelEnabled', 'moveTo', 'Movieclip', 'MovieClipLoader', 'multiline', 'muted', 'name', 'names', 'NaN',
+            'ne', 'NEGATIVE_INFINITY', 'NetConnection', 'NetStream', 'newline', 'nextFrame',
+            'nextScene', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue', 'not', 'Number', 'Object',
+            'on', 'onActivity', 'onChanged', 'onClipEvent', 'onClose', 'onConnect', 'onData', 'onDragOut',
+            'onDragOver', 'onEnterFrame', 'onID3', 'onKeyDown', 'onKeyUp', 'onKillFocus', 'onLoad', 'onLoadComplete',
+            'onLoadError', 'onLoadInit', 'onLoadProgress', 'onLoadStart', 'onMouseDown', 'onMouseMove', 'onMouseUp',
+            'onMouseWheel', 'onPress', 'onRelease', 'onReleaseOutside', 'onResize', 'onRollOut', 'onRollOver',
+            'onScroller', 'onSelect', 'onSetFocus', 'onSoundComplete', 'onStatus', 'onUnload', 'onUpdate', 'onXML',
+            'or(logischesOR)', 'ord', 'os', 'parentNode', 'parseCSS', 'parseFloat', 'parseInt', 'parseXML', 'password',
+            'pause', 'PGDN', 'PGUP', 'PI', 'pixelAspectRatio', 'play', 'playerType', 'pop', 'position',
+            'POSITIVE_INFINITY', 'pow', 'prevFrame', 'previousSibling', 'prevScene', 'print', 'printAsBitmap',
+            'printAsBitmapNum', 'PrintJob', 'printNum', 'private', 'prototype', 'public', 'push', 'quality',
+            'random', 'rate', 'registerClass', 'removeListener', 'removeMovieClip', 'removeNode', 'removeTextField',
+            'replaceSel', 'replaceText', 'resolutionX', 'resolutionY', 'restrict', 'reverse', 'RIGHT',
+            'rightMargin', 'round', 'scaleMode', 'screenColor', 'screenDPI', 'screenResolutionX', 'screenResolutionY',
+            'scroll', 'seek', 'selectable', 'Selection', 'send', 'sendAndLoad', 'separatorBefore', 'serverString',
+            'set', 'setvariable', 'setBufferTime', 'setClipboard', 'setDate', 'setFocus', 'setFullYear', 'setGain',
+            'setHours', 'setInterval', 'setMask', 'setMilliseconds', 'setMinutes', 'setMode', 'setMonth',
+            'setMotionLevel', 'setNewTextFormat', 'setPan', 'setProperty', 'setQuality', 'setRate', 'setRGB',
+            'setSeconds', 'setSelectColor', 'setSelected', 'setSelection', 'setSilenceLevel', 'setStyle',
+            'setTextFormat', 'setTime', 'setTransform', 'setUseEchoSuppression', 'setUTCDate', 'setUTCFullYear',
+            'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds', 'setVolume',
+            'setYear', 'SharedObject', 'SHIFT(Konstante)', 'shift(Methode)', 'show', 'showMenu', 'showSettings',
+            'silenceLevel', 'silenceTimeout', 'sin', 'size', 'slice', 'smoothing', 'sort', 'sortOn', 'Sound', 'SPACE',
+            'splice', 'split', 'sqrt', 'SQRT1_2', 'SQRT2', 'Stage', 'start', 'startDrag', 'static', 'status', 'stop',
+            'stopAllSounds', 'stopDrag', 'String', 'StyleSheet(Klasse)', 'styleSheet(Eigenschaft)', 'substr',
+            'substring', 'super', 'swapDepths', 'System', 'TAB', 'tabChildren', 'tabEnabled', 'tabIndex',
+            'tabStops', 'tan', 'target', 'targetPath', 'tellTarget', 'text', 'textColor', 'TextField', 'TextFormat',
+            'textHeight', 'TextSnapshot', 'textWidth', 'this', 'throw', 'time', 'toggleHighQuality', 'toLowerCase',
+            'toString', 'toUpperCase', 'trace', 'trackAsMenu', 'try', 'type', 'typeof', 'undefined',
+            'underline', 'unescape', 'uninstall', 'unloadClip', 'unloadMovie', 'unLoadMovieNum', 'unshift', 'unwatch',
+            'UP', 'updateAfterEvent', 'updateProperties', 'url', 'useCodePage', 'useEchoSuppression', 'useHandCursor',
+            'UTC', 'valueOf', 'variable', 'version', 'Video', 'visible', 'void', 'watch', 'width',
+            'with', 'wordwrap', 'XML', 'xmlDecl', 'XMLNode', 'XMLSocket'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #0066CC;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/actionscript3.php b/vendor/easybook/geshi/geshi/actionscript3.php
new file mode 100755
index 000000000..189d714b3
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/actionscript3.php
@@ -0,0 +1,473 @@
+<?php
+/*************************************************************************************
+ * actionscript3.php
+ * ----------------
+ * Author: Jordi Boggiano (j.boggiano@seld.be)
+ * Copyright: (c) 2007 Jordi Boggiano (http://www.seld.be/), Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/11/26
+ *
+ * ActionScript3 language file for GeSHi.
+ *
+ * All keywords scraped from the Flex 2.0.1 Documentation
+ *
+ * The default style is based on FlexBuilder2 coloring, with the addition of class, package, method and
+ * constant names that are highlighted to help identifying problem when used on public pastebins.
+ *
+ * For styling, keywords data from 0 to 1 (accessible through .kw1, etc.) are described here :
+ *
+ *   1 : operators
+ *   2 : 'var' keyword
+ *   3 : 'function' keyword
+ *   4 : 'class' and 'package' keywords
+ *   5 : all flash.* class names plus Top Level classes, mx are excluded
+ *   6 : all flash.* package names, mx are excluded
+ *   7 : valid flash method names and properties (there is no type checks sadly, for example String().x will be highlighted as 'x' is valid, but obviously strings don't have a x property)
+ *   8 : valid flash constant names (again, no type check)
+ *
+ *
+ * CHANGES
+ * -------
+ * 2007/12/06 (1.0.7.22)
+ *  -  Added the 'this' keyword (oops)
+ *
+ * TODO (updated 2007/11/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ActionScript 3',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])*(?<!\s)\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'with', 'while', 'void', 'undefined', 'typeof', 'try', 'true',
+            'throw', 'this', 'switch', 'super', 'set', 'return', 'public', 'protected',
+            'private', 'null', 'new', 'is', 'internal', 'instanceof', 'in',
+            'import', 'if', 'get', 'for', 'false', 'else', 'each', 'do',
+            'delete', 'default', 'continue', 'catch', 'case', 'break', 'as',
+            'extends', 'override'
+            ),
+        2 => array(
+            'var'
+            ),
+        3 => array(
+            'function'
+            ),
+        4 => array(
+            'class', 'package'
+            ),
+        6 => array(
+            'flash.xml', 'flash.utils', 'flash.ui', 'flash.text',
+            'flash.system', 'flash.profiler', 'flash.printing', 'flash.net',
+            'flash.media', 'flash.geom', 'flash.filters', 'flash.external',
+            'flash.events', 'flash.errors', 'flash.display',
+            'flash.accessibility'
+            ),
+        7 => array(
+            'zoom', 'year', 'y', 'xmlDecl', 'x', 'writeUnsignedInt',
+            'writeUTFBytes', 'writeUTF', 'writeShort', 'writeObject',
+            'writeMultiByte', 'writeInt', 'writeFloat', 'writeExternal',
+            'writeDynamicProperty', 'writeDynamicProperties', 'writeDouble',
+            'writeBytes', 'writeByte', 'writeBoolean', 'wordWrap',
+            'willTrigger', 'width', 'volume', 'visible', 'videoWidth',
+            'videoHeight', 'version', 'valueOf', 'value', 'usingTLS',
+            'useRichTextClipboard', 'useHandCursor', 'useEchoSuppression',
+            'useCodePage', 'url', 'uri', 'uploadCompleteData', 'upload',
+            'updateProperties', 'updateAfterEvent', 'upState', 'unshift',
+            'unlock', 'unload', 'union', 'unescapeMultiByte', 'unescape',
+            'underline', 'uncompress', 'type', 'ty', 'tx', 'transparent',
+            'translate', 'transformPoint', 'transform', 'trackAsMenu', 'track',
+            'trace', 'totalMemory', 'totalFrames', 'topLeft', 'top',
+            'togglePause', 'toXMLString', 'toUpperCase', 'toUTCString',
+            'toTimeString', 'toString', 'toPrecision', 'toLowerCase',
+            'toLocaleUpperCase', 'toLocaleTimeString', 'toLocaleString',
+            'toLocaleLowerCase', 'toLocaleDateString', 'toFixed',
+            'toExponential', 'toDateString', 'timezoneOffset', 'timerComplete',
+            'timer', 'time', 'threshold', 'thickness', 'textWidth',
+            'textSnapshot', 'textInput', 'textHeight', 'textColor', 'text',
+            'test', 'target', 'tan', 'tabStops', 'tabIndexChange', 'tabIndex',
+            'tabEnabledChange', 'tabEnabled', 'tabChildrenChange',
+            'tabChildren', 'sync', 'swfVersion', 'swapChildrenAt',
+            'swapChildren', 'subtract', 'substring', 'substr', 'styleSheet',
+            'styleNames', 'strength', 'stopPropagation',
+            'stopImmediatePropagation', 'stopDrag', 'stopAll', 'stop', 'status',
+            'startDrag', 'start', 'stageY', 'stageX', 'stageWidth',
+            'stageHeight', 'stageFocusRect', 'stage', 'sqrt', 'split', 'splice',
+            'source', 'soundTransform', 'soundComplete', 'sortOn', 'sort',
+            'songName', 'some', 'socketData', 'smoothing', 'slice', 'size',
+            'sin', 'silent', 'silenceTimeout', 'silenceLevel', 'showSettings',
+            'showRedrawRegions', 'showDefaultContextMenu', 'show', 'shortcut',
+            'shiftKey', 'shift', 'sharpness', 'sharedEvents', 'shadowColor',
+            'shadowAlpha', 'settings', 'setUseEchoSuppression', 'setUTCSeconds',
+            'setUTCMonth', 'setUTCMinutes', 'setUTCMilliseconds', 'setUTCHours',
+            'setUTCFullYear', 'setUTCDate', 'setTimeout', 'setTime',
+            'setTextFormat', 'setStyle', 'setSilenceLevel', 'setSettings',
+            'setSelection', 'setSelected', 'setSelectColor', 'setSeconds',
+            'setQuality', 'setPropertyIsEnumerable', 'setProperty', 'setPixels',
+            'setPixel32', 'setPixel', 'setNamespace', 'setName',
+            'setMotionLevel', 'setMonth', 'setMode', 'setMinutes',
+            'setMilliseconds', 'setLoopback', 'setLoopBack', 'setLocalName',
+            'setKeyFrameInterval', 'setInterval', 'setHours', 'setFullYear',
+            'setEmpty', 'setDirty', 'setDate', 'setCompositionString',
+            'setClipboard', 'setChildren', 'setChildIndex',
+            'setAdvancedAntiAliasingTable', 'serverString', 'separatorBefore',
+            'sendToURL', 'send', 'selectionEndIndex', 'selectionBeginIndex',
+            'selectable', 'select', 'seek', 'securityError', 'securityDomain',
+            'secondsUTC', 'seconds', 'search', 'scrollV', 'scrollRect',
+            'scrollH', 'scroll', 'screenResolutionY', 'screenResolutionX',
+            'screenDPI', 'screenColor', 'scenes', 'scaleY', 'scaleX',
+            'scaleMode', 'scale9Grid', 'scale', 'save', 'sandboxType',
+            'sameDomain', 'running', 'round', 'rotation', 'rotate', 'root',
+            'rollOver', 'rollOut', 'rightToRight', 'rightToLeft', 'rightPeak',
+            'rightMargin', 'right', 'rewind', 'reverse', 'resume', 'restrict',
+            'resize', 'reset', 'requestHeaders', 'replaceText',
+            'replaceSelectedText', 'replace', 'repeatCount', 'render',
+            'removedFromStage', 'removed', 'removeNode', 'removeNamespace',
+            'removeEventListener', 'removeChildAt', 'removeChild',
+            'relatedObject', 'registerFont', 'registerClassAlias', 'redOffset',
+            'redMultiplier', 'rect', 'receiveVideo', 'receiveAudio',
+            'readUnsignedShort', 'readUnsignedInt', 'readUnsignedByte',
+            'readUTFBytes', 'readUTF', 'readShort', 'readObject',
+            'readMultiByte', 'readInt', 'readFloat', 'readExternal',
+            'readDouble', 'readBytes', 'readByte', 'readBoolean', 'ratios',
+            'rate', 'random', 'quality', 'push', 'publish', 'proxyType',
+            'prototype', 'propertyIsEnumerable', 'progress',
+            'processingInstructions', 'printAsBitmap', 'print',
+            'previousSibling', 'preventDefault', 'prevScene', 'prevFrame',
+            'prettyPrinting', 'prettyIndent', 'preserveAlpha', 'prependChild',
+            'prefix', 'pow', 'position', 'pop', 'polar', 'playerType', 'play',
+            'pixelSnapping', 'pixelDissolve', 'pixelBounds', 'pixelAspectRatio',
+            'perlinNoise', 'pause', 'parseXML', 'parseInt', 'parseFloat',
+            'parseCSS', 'parse', 'parentNode', 'parentDomain',
+            'parentAllowsChild', 'parent', 'parameters', 'paperWidth',
+            'paperHeight', 'pan', 'paletteMap', 'pageWidth', 'pageHeight',
+            'overState', 'outsideCutoff', 'os', 'orientation', 'open',
+            'opaqueBackground', 'onPlayStatus', 'onMetaData', 'onCuePoint',
+            'offsetPoint', 'offset', 'objectID', 'objectEncoding', 'numLock',
+            'numLines', 'numFrames', 'numChildren', 'normalize', 'noise',
+            'nodeValue', 'nodeType', 'nodeName', 'nodeKind', 'noAutoLabeling',
+            'nextValue', 'nextSibling', 'nextScene', 'nextNameIndex',
+            'nextName', 'nextFrame', 'netStatus', 'navigateToURL',
+            'namespaceURI', 'namespaceDeclarations', 'namespace', 'names',
+            'name', 'muted', 'multiline', 'moveTo', 'mouseY', 'mouseX',
+            'mouseWheelEnabled', 'mouseWheel', 'mouseUp', 'mouseTarget',
+            'mouseOver', 'mouseOut', 'mouseMove', 'mouseLeave',
+            'mouseFocusChange', 'mouseEnabled', 'mouseDown', 'mouseChildren',
+            'motionTimeout', 'motionLevel', 'monthUTC', 'month',
+            'modificationDate', 'mode', 'minutesUTC', 'minutes', 'min',
+            'millisecondsUTC', 'milliseconds', 'method', 'message', 'merge',
+            'menuSelect', 'menuItemSelect', 'maxScrollV', 'maxScrollH',
+            'maxLevel', 'maxChars', 'max', 'matrixY', 'matrixX', 'matrix',
+            'match', 'mask', 'mapPoint', 'mapBitmap', 'map', 'manufacturer',
+            'macType', 'loopback', 'loop', 'log', 'lock', 'localeCompare',
+            'localY', 'localX', 'localToGlobal', 'localName',
+            'localFileReadDisable', 'loaderURL', 'loaderInfo', 'loader',
+            'loadPolicyFile', 'loadBytes', 'load', 'liveDelay', 'link',
+            'lineTo', 'lineStyle', 'lineGradientStyle', 'level',
+            'letterSpacing', 'length', 'leftToRight', 'leftToLeft', 'leftPeak',
+            'leftMargin', 'left', 'leading', 'lastIndexOf', 'lastIndex',
+            'lastChild', 'language', 'labels', 'knockout', 'keyUp',
+            'keyLocation', 'keyFrameInterval', 'keyFocusChange', 'keyDown',
+            'keyCode', 'kerning', 'join', 'italic', 'isXMLName',
+            'isPrototypeOf', 'isNaN', 'isFocusInaccessible', 'isFinite',
+            'isEmpty', 'isDefaultPrevented', 'isDebugger', 'isBuffering',
+            'isAttribute', 'isAccessible', 'ioError', 'invert', 'invalidate',
+            'intersects', 'intersection', 'interpolate', 'insideCutoff',
+            'insertChildBefore', 'insertChildAfter', 'insertBefore', 'inner',
+            'init', 'info', 'inflatePoint', 'inflate', 'indexOf', 'index',
+            'indent', 'inScopeNamespaces', 'imeComposition', 'ime',
+            'ignoreWhitespace', 'ignoreWhite', 'ignoreProcessingInstructions',
+            'ignoreComments', 'ignoreCase', 'identity', 'idMap', 'id3',
+            'httpStatus', 'htmlText', 'hoursUTC', 'hours', 'hitTestTextNearPos',
+            'hitTestState', 'hitTestPoint', 'hitTestObject', 'hitTest',
+            'hitArea', 'highlightColor', 'highlightAlpha', 'hideObject',
+            'hideBuiltInItems', 'hide', 'height', 'hasVideoEncoder', 'hasTLS',
+            'hasStreamingVideo', 'hasStreamingAudio', 'hasSimpleContent',
+            'hasScreenPlayback', 'hasScreenBroadcast', 'hasProperty',
+            'hasPrinting', 'hasOwnProperty', 'hasMP3', 'hasIME', 'hasGlyphs',
+            'hasEventListener', 'hasEmbeddedVideo', 'hasDefinition',
+            'hasComplexContent', 'hasChildNodes', 'hasAudioEncoder', 'hasAudio',
+            'hasAccessibility', 'gridFitType', 'greenOffset', 'greenMultiplier',
+            'graphics', 'gotoAndStop', 'gotoAndPlay', 'globalToLocal', 'global',
+            'getUTCSeconds', 'getUTCMonth', 'getUTCMinutes',
+            'getUTCMilliseconds', 'getUTCHours', 'getUTCFullYear', 'getUTCDay',
+            'getUTCDate', 'getTimezoneOffset', 'getTimer', 'getTime',
+            'getTextRunInfo', 'getTextFormat', 'getText', 'getStyle',
+            'getStackTrace', 'getSelectedText', 'getSelected', 'getSeconds',
+            'getRemote', 'getRect', 'getQualifiedSuperclassName',
+            'getQualifiedClassName', 'getProperty', 'getPrefixForNamespace',
+            'getPixels', 'getPixel32', 'getPixel', 'getParagraphLength',
+            'getObjectsUnderPoint', 'getNamespaceForPrefix', 'getMonth',
+            'getMinutes', 'getMilliseconds', 'getMicrophone', 'getLocal',
+            'getLineText', 'getLineOffset', 'getLineMetrics', 'getLineLength',
+            'getLineIndexOfChar', 'getLineIndexAtPoint', 'getImageReference',
+            'getHours', 'getFullYear', 'getFirstCharInParagraph',
+            'getDescendants', 'getDefinitionByName', 'getDefinition', 'getDay',
+            'getDate', 'getColorBoundsRect', 'getClassByAlias', 'getChildIndex',
+            'getChildByName', 'getChildAt', 'getCharIndexAtPoint',
+            'getCharBoundaries', 'getCamera', 'getBounds', 'genre',
+            'generateFilterRect', 'gain', 'fullYearUTC', 'fullYear',
+            'fullScreen', 'fscommand', 'fromCharCode', 'framesLoaded',
+            'frameRate', 'frame', 'fps', 'forwardAndBack', 'formatToString',
+            'forceSimple', 'forEach', 'fontType', 'fontStyle', 'fontSize',
+            'fontName', 'font', 'focusRect', 'focusOut', 'focusIn', 'focus',
+            'flush', 'floor', 'floodFill', 'firstChild', 'findText', 'filters',
+            'filter', 'fillRect', 'fileList', 'extension', 'extended', 'exp',
+            'exec', 'exactSettings', 'every', 'eventPhase', 'escapeMultiByte',
+            'escape', 'errorID', 'error', 'equals', 'enumerateFonts',
+            'enterFrame', 'endian', 'endFill', 'encodeURIComponent',
+            'encodeURI', 'enabled', 'embedFonts', 'elements',
+            'dynamicPropertyWriter', 'dropTarget', 'drawRoundRect', 'drawRect',
+            'drawEllipse', 'drawCircle', 'draw', 'download', 'downState',
+            'doubleClickEnabled', 'doubleClick', 'dotall', 'domain',
+            'docTypeDecl', 'doConversion', 'divisor', 'distance', 'dispose',
+            'displayState', 'displayMode', 'displayAsPassword', 'dispatchEvent',
+            'description', 'describeType', 'descent', 'descendants',
+            'deltaTransformPoint', 'delta', 'deleteProperty', 'delay',
+            'defaultTextFormat', 'defaultSettings', 'defaultObjectEncoding',
+            'decodeURIComponent', 'decodeURI', 'decode', 'deblocking',
+            'deactivate', 'dayUTC', 'day', 'dateUTC', 'date', 'dataFormat',
+            'data', 'd', 'customItems', 'curveTo', 'currentTarget',
+            'currentScene', 'currentLabels', 'currentLabel', 'currentFrame',
+            'currentFPS', 'currentDomain', 'currentCount', 'ctrlKey', 'creator',
+            'creationDate', 'createTextNode', 'createGradientBox',
+            'createElement', 'createBox', 'cos', 'copyPixels', 'copyChannel',
+            'copy', 'conversionMode', 'contextMenuOwner', 'contextMenu',
+            'contentType', 'contentLoaderInfo', 'content', 'containsRect',
+            'containsPoint', 'contains', 'constructor', 'connectedProxyType',
+            'connected', 'connect', 'condenseWhite', 'concatenatedMatrix',
+            'concatenatedColorTransform', 'concat', 'computeSpectrum',
+            'compress', 'componentY', 'componentX', 'complete', 'compare',
+            'comments', 'comment', 'colors', 'colorTransform', 'color', 'code',
+            'close', 'cloneNode', 'clone', 'client', 'click', 'clearTimeout',
+            'clearInterval', 'clear', 'clamp', 'children', 'childNodes',
+            'childIndex', 'childAllowsParent', 'child', 'checkPolicyFile',
+            'charCount', 'charCodeAt', 'charCode', 'charAt', 'changeList',
+            'change', 'ceil', 'caretIndex', 'caption', 'capsLock', 'cancelable',
+            'cancel', 'callee', 'callProperty', 'call', 'cacheAsBitmap', 'c',
+            'bytesTotal', 'bytesLoaded', 'bytesAvailable', 'buttonMode',
+            'buttonDown', 'bullet', 'builtInItems', 'bufferTime',
+            'bufferLength', 'bubbles', 'browse', 'bottomScrollV', 'bottomRight',
+            'bottom', 'borderColor', 'border', 'bold', 'blurY', 'blurX',
+            'blueOffset', 'blueMultiplier', 'blockIndent', 'blendMode',
+            'bitmapData', 'bias', 'beginGradientFill', 'beginFill',
+            'beginBitmapFill', 'bandwidth', 'backgroundColor', 'background',
+            'b', 'available', 'avHardwareDisable', 'autoSize', 'attributes',
+            'attribute', 'attachNetStream', 'attachCamera', 'attachAudio',
+            'atan2', 'atan', 'asyncError', 'asin', 'ascent', 'artist',
+            'areSoundsInaccessible', 'areInaccessibleObjectsUnderPoint',
+            'applyFilter', 'apply', 'applicationDomain', 'appendText',
+            'appendChild', 'antiAliasType', 'angle', 'alwaysShowSelection',
+            'altKey', 'alphas', 'alphaOffset', 'alphaMultiplier', 'alpha',
+            'allowInsecureDomain', 'allowDomain', 'align', 'album',
+            'addedToStage', 'added', 'addPage', 'addNamespace', 'addHeader',
+            'addEventListener', 'addChildAt', 'addChild', 'addCallback', 'add',
+            'activityLevel', 'activity', 'active', 'activating', 'activate',
+            'actionScriptVersion', 'acos', 'accessibilityProperties', 'abs'
+            ),
+        8 => array(
+            'WRAP', 'VERTICAL', 'VARIABLES',
+            'UTC', 'UPLOAD_COMPLETE_DATA', 'UP', 'UNLOAD', 'UNKNOWN',
+            'UNIQUESORT', 'TOP_RIGHT', 'TOP_LEFT', 'TOP', 'TIMER_COMPLETE',
+            'TIMER', 'TEXT_NODE', 'TEXT_INPUT', 'TEXT', 'TAB_INDEX_CHANGE',
+            'TAB_ENABLED_CHANGE', 'TAB_CHILDREN_CHANGE', 'TAB', 'SYNC',
+            'SUBTRACT', 'SUBPIXEL', 'STATUS', 'STANDARD', 'SQUARE', 'SQRT2',
+            'SQRT1_2', 'SPACE', 'SOUND_COMPLETE', 'SOCKET_DATA', 'SHOW_ALL',
+            'SHIFT', 'SETTINGS_MANAGER', 'SELECT', 'SECURITY_ERROR', 'SCROLL',
+            'SCREEN', 'ROUND', 'ROLL_OVER', 'ROLL_OUT', 'RIGHT', 'RGB',
+            'RETURNINDEXEDARRAY', 'RESIZE', 'REPEAT', 'RENDER',
+            'REMOVED_FROM_STAGE', 'REMOVED', 'REMOTE', 'REGULAR', 'REFLECT',
+            'RED', 'RADIAL', 'PROGRESS', 'PRIVACY', 'POST', 'POSITIVE_INFINITY',
+            'PORTRAIT', 'PIXEL', 'PI', 'PENDING', 'PAGE_UP', 'PAGE_DOWN', 'PAD',
+            'OVERLAY', 'OUTER', 'OPEN', 'NaN', 'NUM_PAD', 'NUMPAD_SUBTRACT',
+            'NUMPAD_MULTIPLY', 'NUMPAD_ENTER', 'NUMPAD_DIVIDE',
+            'NUMPAD_DECIMAL', 'NUMPAD_ADD', 'NUMPAD_9', 'NUMPAD_8', 'NUMPAD_7',
+            'NUMPAD_6', 'NUMPAD_5', 'NUMPAD_4', 'NUMPAD_3', 'NUMPAD_2',
+            'NUMPAD_1', 'NUMPAD_0', 'NUMERIC', 'NO_SCALE', 'NO_BORDER',
+            'NORMAL', 'NONE', 'NEVER', 'NET_STATUS', 'NEGATIVE_INFINITY',
+            'MULTIPLY', 'MOUSE_WHEEL', 'MOUSE_UP', 'MOUSE_OVER', 'MOUSE_OUT',
+            'MOUSE_MOVE', 'MOUSE_LEAVE', 'MOUSE_FOCUS_CHANGE', 'MOUSE_DOWN',
+            'MITER', 'MIN_VALUE', 'MICROPHONE', 'MENU_SELECT',
+            'MENU_ITEM_SELECT', 'MEDIUM', 'MAX_VALUE', 'LOW', 'LOG2E', 'LOG10E',
+            'LOCAL_WITH_NETWORK', 'LOCAL_WITH_FILE', 'LOCAL_TRUSTED',
+            'LOCAL_STORAGE', 'LN2', 'LN10', 'LITTLE_ENDIAN', 'LINK',
+            'LINEAR_RGB', 'LINEAR', 'LIGHT_COLOR', 'LIGHTEN', 'LEFT', 'LCD',
+            'LAYER', 'LANDSCAPE', 'KOREAN', 'KEY_UP', 'KEY_FOCUS_CHANGE',
+            'KEY_DOWN', 'JUSTIFY', 'JAPANESE_KATAKANA_HALF',
+            'JAPANESE_KATAKANA_FULL', 'JAPANESE_HIRAGANA', 'Infinity', 'ITALIC',
+            'IO_ERROR', 'INVERT', 'INSERT', 'INPUT', 'INNER', 'INIT',
+            'IME_COMPOSITION', 'IGNORE', 'ID3', 'HTTP_STATUS', 'HORIZONTAL',
+            'HOME', 'HIGH', 'HARDLIGHT', 'GREEN', 'GET', 'FULLSCREEN', 'FULL',
+            'FOCUS_OUT', 'FOCUS_IN', 'FLUSHED', 'FLASH9', 'FLASH8', 'FLASH7',
+            'FLASH6', 'FLASH5', 'FLASH4', 'FLASH3', 'FLASH2', 'FLASH1', 'F9',
+            'F8', 'F7', 'F6', 'F5', 'F4', 'F3', 'F2', 'F15', 'F14', 'F13',
+            'F12', 'F11', 'F10', 'F1', 'EXACT_FIT', 'ESCAPE', 'ERROR', 'ERASE',
+            'ENTER_FRAME', 'ENTER', 'END', 'EMBEDDED', 'ELEMENT_NODE', 'E',
+            'DYNAMIC', 'DOWN', 'DOUBLE_CLICK', 'DIFFERENCE', 'DEVICE',
+            'DESCENDING', 'DELETE', 'DEFAULT', 'DEACTIVATE', 'DATA',
+            'DARK_COLOR', 'DARKEN', 'CRT', 'CONTROL', 'CONNECT', 'COMPLETE',
+            'COLOR', 'CLOSE', 'CLICK', 'CLAMP', 'CHINESE', 'CHANGE', 'CENTER',
+            'CASEINSENSITIVE', 'CAPTURING_PHASE', 'CAPS_LOCK', 'CANCEL',
+            'CAMERA', 'BUBBLING_PHASE', 'BOTTOM_RIGHT', 'BOTTOM_LEFT', 'BOTTOM',
+            'BOLD_ITALIC', 'BOLD', 'BLUE', 'BINARY', 'BIG_ENDIAN', 'BEVEL',
+            'BEST', 'BACKSPACE', 'AUTO', 'AT_TARGET', 'ASYNC_ERROR', 'AMF3',
+            'AMF0', 'ALWAYS', 'ALPHANUMERIC_HALF', 'ALPHANUMERIC_FULL', 'ALPHA',
+            'ADVANCED', 'ADDED_TO_STAGE', 'ADDED', 'ADD', 'ACTIVITY',
+            'ACTIONSCRIPT3', 'ACTIONSCRIPT2'
+            ),
+        //FIX: Must be last in order to avoid conflicts with keywords present
+        //in other keyword groups, that might get highlighted as part of the URL.
+        //I know this is not a proper work-around, but should do just fine.
+        5 => array(
+            'uint', 'int', 'arguments', 'XMLSocket', 'XMLNodeType', 'XMLNode',
+            'XMLList', 'XMLDocument', 'XML', 'Video', 'VerifyError',
+            'URLVariables', 'URLStream', 'URLRequestMethod', 'URLRequestHeader',
+            'URLRequest', 'URLLoaderDataFormat', 'URLLoader', 'URIError',
+            'TypeError', 'Transform', 'TimerEvent', 'Timer', 'TextSnapshot',
+            'TextRenderer', 'TextLineMetrics', 'TextFormatAlign', 'TextFormat',
+            'TextFieldType', 'TextFieldAutoSize', 'TextField', 'TextEvent',
+            'TextDisplayMode', 'TextColorType', 'System', 'SyntaxError',
+            'SyncEvent', 'StyleSheet', 'String', 'StatusEvent', 'StaticText',
+            'StageScaleMode', 'StageQuality', 'StageAlign', 'Stage',
+            'StackOverflowError', 'Sprite', 'SpreadMethod', 'SoundTransform',
+            'SoundMixer', 'SoundLoaderContext', 'SoundChannel', 'Sound',
+            'Socket', 'SimpleButton', 'SharedObjectFlushStatus', 'SharedObject',
+            'Shape', 'SecurityPanel', 'SecurityErrorEvent', 'SecurityError',
+            'SecurityDomain', 'Security', 'ScriptTimeoutError', 'Scene',
+            'SWFVersion', 'Responder', 'RegExp', 'ReferenceError', 'Rectangle',
+            'RangeError', 'QName', 'Proxy', 'ProgressEvent',
+            'PrintJobOrientation', 'PrintJobOptions', 'PrintJob', 'Point',
+            'PixelSnapping', 'ObjectEncoding', 'Object', 'Number', 'NetStream',
+            'NetStatusEvent', 'NetConnection', 'Namespace', 'MovieClip',
+            'MouseEvent', 'Mouse', 'MorphShape', 'Microphone', 'MemoryError',
+            'Matrix', 'Math', 'LocalConnection', 'LoaderInfo', 'LoaderContext',
+            'Loader', 'LineScaleMode', 'KeyboardEvent', 'Keyboard',
+            'KeyLocation', 'JointStyle', 'InvalidSWFError',
+            'InterpolationMethod', 'InteractiveObject', 'IllegalOperationError',
+            'IOErrorEvent', 'IOError', 'IMEEvent', 'IMEConversionMode', 'IME',
+            'IExternalizable', 'IEventDispatcher', 'IDynamicPropertyWriter',
+            'IDynamicPropertyOutput', 'IDataOutput', 'IDataInput', 'ID3Info',
+            'IBitmapDrawable', 'HTTPStatusEvent', 'GridFitType', 'Graphics',
+            'GradientType', 'GradientGlowFilter', 'GradientBevelFilter',
+            'GlowFilter', 'Function', 'FrameLabel', 'FontType', 'FontStyle',
+            'Font', 'FocusEvent', 'FileReferenceList', 'FileReference',
+            'FileFilter', 'ExternalInterface', 'EventPhase', 'EventDispatcher',
+            'Event', 'EvalError', 'ErrorEvent', 'Error', 'Endian', 'EOFError',
+            'DropShadowFilter', 'DisplayObjectContainer', 'DisplayObject',
+            'DisplacementMapFilterMode', 'DisplacementMapFilter', 'Dictionary',
+            'DefinitionError', 'Date', 'DataEvent', 'ConvolutionFilter',
+            'ContextMenuItem', 'ContextMenuEvent', 'ContextMenuBuiltInItems',
+            'ContextMenu', 'ColorTransform', 'ColorMatrixFilter', 'Class',
+            'CapsStyle', 'Capabilities', 'Camera', 'CSMSettings', 'ByteArray',
+            'Boolean', 'BlurFilter', 'BlendMode', 'BitmapFilterType',
+            'BitmapFilterQuality', 'BitmapFilter', 'BitmapDataChannel',
+            'BitmapData', 'Bitmap', 'BevelFilter', 'AsyncErrorEvent', 'Array',
+            'ArgumentError', 'ApplicationDomain', 'AntiAliasType',
+            'ActivityEvent', 'ActionScriptVersion', 'AccessibilityProperties',
+            'Accessibility', 'AVM1Movie'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>', '^', '-', '+', '~', '?', ':', ';', '.', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0033ff; font-weight: bold;',
+            2 => 'color: #6699cc; font-weight: bold;',
+            3 => 'color: #339966; font-weight: bold;',
+            4 => 'color: #9900cc; font-weight: bold;',
+            5 => 'color: #004993;',
+            6 => 'color: #004993;',
+            7 => 'color: #004993;',
+            8 => 'color: #004993;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #009900; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #3f5fbf;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #990000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://www.google.com/search?q={FNAMEL}%20inurl:http://livedocs.adobe.com/flex/201/langref/%20inurl:{FNAMEL}.html',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => false,//Save some time as OO identifiers aren't used
+    'OBJECT_SPLITTERS' => array(
+        // commented out because it's not very relevant for AS, as all properties, methods and constants are dot-accessed.
+        // I believe it's preferable to have package highlighting for example, which is not possible with this enabled.
+        // 0 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/ada.php b/vendor/easybook/geshi/geshi/ada.php
new file mode 100755
index 000000000..c4ef2c395
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ada.php
@@ -0,0 +1,135 @@
+<?php
+/*************************************************************************************
+ * ada.php
+ * -------
+ * Author: Tux (tux@inmail.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/29
+ *
+ * Ada language file for GeSHi.
+ * Words are from SciTe configuration file
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Removed apostrophe as string delimiter
+ *   -  Added URL support
+ * 2004/08/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Ada',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'begin', 'declare', 'do', 'else', 'elsif', 'exception', 'for', 'if',
+            'is', 'loop', 'while', 'then', 'end', 'select', 'case', 'until',
+            'goto', 'return'
+            ),
+        2 => array(
+            'abs', 'and', 'at', 'mod', 'not', 'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abort', 'abstract', 'accept', 'access', 'aliased', 'all', 'array',
+            'body', 'constant', 'delay', 'delta', 'digits', 'entry', 'exit',
+            'function', 'generic', 'in', 'interface', 'limited', 'new', 'null',
+            'of', 'others', 'out', 'overriding', 'package', 'pragma', 'private',
+            'procedure', 'protected', 'raise', 'range', 'record', 'renames',
+            'requeue', 'reverse', 'separate', 'subtype', 'synchronized',
+            'tagged', 'task', 'terminate', 'type', 'use', 'when', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/aimms.php b/vendor/easybook/geshi/geshi/aimms.php
new file mode 100644
index 000000000..f46bdd0bc
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/aimms.php
@@ -0,0 +1,316 @@
+<?php
+/*************************************************************************************
+ * aimms.php
+ * --------
+ * Author: Guido Diepen (guido.diepen@aimms.com)
+ * Copyright: (c) 2011 Guido Diepen (http://www.aimms.com)
+ * Release Version: 1.0.8.12
+ * Date Started: 2011/05/05
+ *
+ * AIMMS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/07/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * * Make sure the last few function I may have missed
+ *   (like eval()) are included for highlighting
+ * * Split to several files - php4, php5 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'AIMMS3',
+    'COMMENT_SINGLE' => array(1 => '!'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'", "\\"),
+    'HARDCHAR' => "\\",
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'then', 'else', 'endif', 'elseif', 'for', 'do', 'while' , 'endfor' , 'endwhile', 'break', 'switch', 'endswitch',
+            'display', 'return', 'in', 'apply'
+
+            ),
+        2 => array(
+            'main model' , 'declaration section', 'procedure', 'endprocedure', 'endmodel', 'endsection' , 'set', 'parameter',
+            'string parameter', 'element parameter', 'quantity'
+            ),
+        3 => array(
+            'identifier', 'index', 'index domain', 'body'
+            ),
+        4 => array(
+            'ActiveCard','Card','ConvertUnit','DistributionCumulative','DistributionDensity','DistributionDeviation',
+            'DistributionInverseCumulative','DistributionInverseDensity','DistributionKurtosis','DistributionMean',
+            'DistributionSkewness','DistributionVariance','Element','EvaluateUnit','First','FormatString','Last',
+            'Ord','Unit','Val','Aggregate','AttributeToString','CaseCompareIdentifier','CaseCreateDifferenceFile',
+            'CloseDataSource','CreateTimeTable','ConstraintVariables','ConvertReferenceDate','CloneElement',
+            'FindNthString','FindReplaceNthString','FindReplaceStrings','FindString','StringOccurrences',
+            'CurrentToMoment','CurrentToString','CurrentToTimeSlot','DaylightsavingEndDate','DaylightsavingStartDate',
+            'DeclaredSubset','DomainIndex','IndexRange','IsRunningAsViewer','ListingFileCopy','ListingFileDelete',
+            'DirectoryGetFiles','DirectoryGetSubdirectories','DirectSQL','Disaggregate','ElementCast','ElementRange',
+            'EnvironmentGetString','EnvironmentSetString','errh::Adapt','errh::Attribute','errh::Category',
+            'errh::Code','errh::Column','errh::CreationTime','errh::Filename','errh::InsideCategory',
+            'errh::IsMarkedAsHandled','errh::Line','errh::MarkAsHandled','errh::Message','errh::Multiplicity',
+            'errh::Node','errh::NumberOfLocations','errh::Severity','ExcelAddNewSheet','ExcelAssignParameter',
+            'ExcelAssignSet','ExcelAssignTable','ExcelAssignValue','ExcelClearRange','ExcelCloseWorkbook',
+            'ExcelColumnName','ExcelColumnNumber','ExcelCopyRange','ExcelCreateWorkbook','ExcelDeleteSheet',
+            'ExcelPrint','ExcelRetrieveParameter','ExcelRetrieveSet','ExcelRetrieveTable','ExcelRetrieveValue',
+            'ExcelRunMacro','ExcelSaveWorkbook','ExcelSetActiveSheet','ExcelSetUpdateLinksBehavior',
+            'ExcelSetVisibility','FindUsedElements','GenerateCUT','GMP::Coefficient::Get',
+            'GMP::Coefficient::GetQuadratic','GMP::Coefficient::Set','GMP::Coefficient::SetQuadratic',
+            'GMP::Column::Add','GMP::Column::Delete','GMP::Column::Freeze','GMP::Column::GetLowerbound',
+            'GMP::Column::GetScale','GMP::Column::GetStatus','GMP::Column::GetType','GMP::Column::GetUpperbound',
+            'GMP::Column::SetAsObjective','GMP::Column::SetLowerbound','GMP::Column::SetType',
+            'GMP::Column::SetUpperbound','GMP::Column::Unfreeze','GMP::Instance::AddIntegerEliminationRows',
+            'GMP::Instance::CalculateSubGradient','GMP::Instance::Copy','GMP::Instance::CreateDual',
+            'GMP::Instance::CreateMasterMip','GMP::Instance::CreatePresolved',
+            'GMP::SolverSession::CreateProgressCategory','GMP::Instance::CreateProgressCategory',
+            'GMP::Instance::CreateSolverSession','GMP::Stochastic::CreateBendersRootproblem',
+            'GMP::Instance::Delete','GMP::Instance::DeleteIntegerEliminationRows',
+            'GMP::Instance::DeleteSolverSession','GMP::Instance::FindApproximatelyFeasibleSolution',
+            'GMP::Instance::FixColumns','GMP::Instance::Generate','GMP::Instance::GenerateRobustCounterpart',
+            'GMP::Instance::GenerateStochasticProgram','GMP::SolverSession::GetCallbackInterruptStatus',
+            'GMP::SolverSession::WaitForCompletion','GMP::SolverSession::WaitForSingleCompletion',
+            'GMP::SolverSession::ExecutionStatus','GMP::Instance::GetDirection','GMP::Instance::GetLinearObjective',
+            'GMP::Instance::GetMathematicalProgrammingType','GMP::Instance::GetMemoryUsed',
+            'GMP::Instance::GetNumberOfColumns','GMP::Instance::GetNumberOfIndicatorRows',
+            'GMP::Instance::GetNumberOfIntegerColumns','GMP::Instance::GetNumberOfNonlinearColumns',
+            'GMP::Instance::GetNumberOfNonlinearNonzeros','GMP::Instance::GetNumberOfNonlinearRows',
+            'GMP::Instance::GetNumberOfNonzeros','GMP::Instance::GetNumberOfRows',
+            'GMP::Instance::GetNumberOfSOS1Rows','GMP::Instance::GetNumberOfSOS2Rows',
+            'GMP::Instance::GetObjective','GMP::Instance::GetOptionValue','GMP::Instance::GetSolver',
+            'GMP::Instance::GetSymbolicMathematicalProgram','GMP::Instance::MemoryStatistics',
+            'GMP::Instance::Rename','GMP::Instance::SetCallbackAddCut','GMP::Instance::SetCallbackBranch',
+            'GMP::Instance::SetCallbackHeuristic','GMP::Instance::SetCallbackIncumbent',
+            'GMP::Instance::SetCallbackIterations','GMP::Instance::SetCallbackNewIncumbent',
+            'GMP::Instance::SetCallbackStatusChange','GMP::Instance::SetCutoff','GMP::Instance::SetDirection',
+            'GMP::Instance::SetMathematicalProgrammingType','GMP::Instance::SetSolver','GMP::Instance::Solve',
+            'GMP::Stochastic::GetObjectiveBound','GMP::Stochastic::GetRelativeWeight',
+            'GMP::Stochastic::GetRepresentativeScenario','GMP::Stochastic::UpdateBendersSubproblem',
+            'GMP::Linearization::Add','GMP::Linearization::AddSingle','GMP::Linearization::Delete',
+            'GMP::Linearization::GetDeviation','GMP::Linearization::GetDeviationBound',
+            'GMP::Linearization::GetLagrangeMultiplier','GMP::Linearization::GetType',
+            'GMP::Linearization::GetWeight','GMP::Linearization::RemoveDeviation',
+            'GMP::Linearization::SetDeviationBound','GMP::Linearization::SetType',
+            'GMP::Linearization::SetWeight','GMP::ProgressWindow::DeleteCategory',
+            'GMP::ProgressWindow::DisplayLine','GMP::ProgressWindow::DisplayProgramStatus',
+            'GMP::ProgressWindow::DisplaySolver','GMP::ProgressWindow::DisplaySolverStatus',
+            'GMP::ProgressWindow::FreezeLine','GMP::ProgressWindow::UnfreezeLine',
+            'GMP::QuadraticCoefficient::Get','GMP::QuadraticCoefficient::Set','GMP::Row::Activate',
+            'GMP::Stochastic::AddBendersFeasibilityCut','GMP::Stochastic::AddBendersOptimalityCut',
+            'GMP::Stochastic::BendersFindFeasibilityReference','GMP::Stochastic::MergeSolution',
+            'GMP::Row::Add','GMP::Row::Deactivate','GMP::Row::Delete','GMP::Row::DeleteIndicatorCondition',
+            'GMP::Row::Generate','GMP::Row::GetConvex','GMP::Row::GetIndicatorColumn',
+            'GMP::Row::GetIndicatorCondition','GMP::Row::GetLeftHandSide','GMP::Row::GetRelaxationOnly',
+            'GMP::Row::GetRightHandSide','GMP::Row::GetScale','GMP::Row::GetStatus','GMP::Row::GetType',
+            'GMP::Row::SetConvex','GMP::Row::SetIndicatorCondition','GMP::Row::SetLeftHandSide',
+            'GMP::Row::SetRelaxationOnly','GMP::Row::SetRightHandSide','GMP::Row::SetType',
+            'GMP::Solution::Check','GMP::Solution::Copy','GMP::Solution::Count','GMP::Solution::Delete',
+            'GMP::Solution::DeleteAll','GMP::Solution::GetColumnValue','GMP::Solution::GetCPUSecondsUsed',
+            'GMP::Solution::GetDistance','GMP::Solution::GetFirstOrderDerivative',
+            'GMP::Solution::GetIterationsUsed','GMP::Solution::GetNodesUsed','GMP::Solution::GetLinearObjective',
+            'GMP::Solution::GetMemoryUsed','GMP::Solution::GetObjective','GMP::Solution::GetPenalizedObjective',
+            'GMP::Solution::GetProgramStatus','GMP::Solution::GetRowValue','GMP::Solution::GetSolutionsSet',
+            'GMP::Solution::GetSolverStatus','GMP::Solution::IsDualDegenerated','GMP::Solution::IsInteger',
+            'GMP::Solution::IsPrimalDegenerated','GMP::Solution::SetMIPStartFlag','GMP::Solution::Move',
+            'GMP::Solution::RandomlyGenerate','GMP::Solution::RetrieveFromModel',
+            'GMP::Solution::RetrieveFromSolverSession','GMP::Solution::SendToModel',
+            'GMP::Solution::SendToModelSelection','GMP::Solution::SendToSolverSession',
+            'GMP::Solution::SetIterationCount','GMP::Solution::SetProgramStatus','GMP::Solution::SetSolverStatus',
+            'GMP::Solution::UpdatePenaltyWeights','GMP::Solution::ConstructMean',
+            'GMP::SolverSession::AsynchronousExecute','GMP::SolverSession::Execute',
+            'GMP::SolverSession::Interrupt','GMP::SolverSession::AddLinearization',
+            'GMP::SolverSession::GenerateBranchLowerBound','GMP::SolverSession::GenerateBranchUpperBound',
+            'GMP::SolverSession::GenerateBranchRow','GMP::SolverSession::GenerateCut',
+            'GMP::SolverSession::GenerateBinaryEliminationRow','GMP::SolverSession::GetCPUSecondsUsed',
+            'GMP::SolverSession::GetHost','GMP::SolverSession::GetInstance',
+            'GMP::SolverSession::GetIterationsUsed','GMP::SolverSession::GetNodesLeft',
+            'GMP::SolverSession::GetNodesUsed','GMP::SolverSession::GetNodeNumber',
+            'GMP::SolverSession::GetNodeObjective','GMP::SolverSession::GetNumberOfBranchNodes',
+            'GMP::SolverSession::GetLinearObjective','GMP::SolverSession::GetMemoryUsed',
+            'GMP::SolverSession::GetObjective','GMP::SolverSession::GetOptionValue',
+            'GMP::SolverSession::GetProgramStatus','GMP::SolverSession::GetSolver',
+            'GMP::SolverSession::GetSolverStatus','GMP::SolverSession::RejectIncumbent',
+            'GMP::Event::Create','GMP::Event::Delete','GMP::Event::Reset','GMP::Event::Set',
+            'GMP::SolverSession::SetObjective','GMP::SolverSession::SetOptionValue',
+            'GMP::Instance::SetCPUSecondsLimit','GMP::Instance::SetIterationLimit',
+            'GMP::Instance::SetMemoryLimit','GMP::Instance::SetOptionValue','GMP::Tuning::SolveSingleMPS',
+            'GMP::Tuning::TuneMultipleMPS','GMP::Tuning::TuneSingleGMP',
+            'GMP::Solver::GetAsynchronousSessionsLimit','GMP::Robust::EvaluateAdjustableVariables',
+            'GenerateXML','GetDatasourceProperty','ReadGeneratedXML','ReadXML','ReferencedIdentifiers',
+            'WriteXML','IdentifierAttributes','IdentifierDimension','IsRuntimeIdentifier','IdentifierMemory',
+            'IdentifierMemoryStatistics','IdentifierText','IdentifierType','IdentifierUnit','ScalarValue',
+            'SectionIdentifiers','SubRange','MemoryInUse','CommitTransaction','RollbackTransaction',
+            'MemoryStatistics','me::AllowedAttribute','me::ChangeType','me::ChangeTypeAllowed','me::Children',
+            'me::ChildTypeAllowed','me::Compile','me::Create','me::CreateLibrary','me::Delete','me::ExportNode',
+            'me::GetAttribute','me::ImportLibrary','me::ImportNode','me::IsRunnable','me::Move','me::Parent',
+            'me::Rename','me::SetAttribute','MomentToString','MomentToTimeSlot','OptionGetValue',
+            'OptionGetKeywords','OptionGetString','OptionSetString','OptionSetValue','PeriodToString',
+            'ProfilerContinue','ProfilerPause','ProfilerRestart','RestoreInactiveElements',
+            'RetrieveCurrentVariableValues','SetAddRecursive','SetElementAdd','SetElementRename',
+            'SQLColumnData','SQLCreateConnectionString','SQLDriverName','SQLNumberOfColumns',
+            'SQLNumberOfDrivers','SQLNumberOfTables','SQLNumberOfViews','SQLTableName','SQLViewName',
+            'StartTransaction','StringToElement','StringToMoment','StringToTimeSlot','TestDatabaseColumn',
+            'TestDatabaseTable','TestDataSource','TestDate','TimeslotCharacteristic','TimeslotToMoment',
+            'TimeslotToString','TimeZoneOffset','VariableConstraints','PageOpen','PageOpenSingle','PageClose',
+            'PageGetActive','PageSetFocus','PageGetFocus','PageSetCursor','PageRefreshAll','PageGetChild',
+            'PageGetParent','PageGetNext','PageGetPrevious','PageGetNextInTreeWalk','PageGetUsedIdentifiers',
+            'PageGetTitle','PageGetAll','PageCopyTableToClipboard','PageCopyTableToExcel','PrintPage',
+            'PrintPageCount','PrintStartReport','PrintEndReport','PivotTableReloadState','PivotTableSaveState',
+            'PivotTableDeleteState','FileSelect','FileSelectNew','FileDelete','FileExists','FileCopy',
+            'FileMove','FileView','FileEdit','FilePrint','FileTime','FileTouch','FileAppend','FileGetSize',
+            'DirectorySelect','DirectoryCreate','DirectoryDelete','DirectoryExists','DirectoryCopy',
+            'DirectoryMove','DirectoryGetCurrent','DialogProgress','DialogMessage','DialogError',
+            'StatusMessage','DialogAsk','DialogGetString','DialogGetDate','DialogGetNumber','DialogGetElement',
+            'DialogGetElementByText','DialogGetElementByData','DialogGetPassword','DialogGetColor','CaseNew',
+            'CaseFind','CaseCreate','CaseLoadCurrent','CaseMerge','CaseLoadIntoCurrent','CaseSelect',
+            'CaseSelectNew','CaseSetCurrent','CaseSave','CaseSaveAll','CaseSaveAs','CaseSelectMultiple',
+            'CaseGetChangedStatus','CaseSetChangedStatus','CaseDelete','CaseGetType','CaseGetDatasetReference',
+            'CaseWriteToSingleFile','CaseReadFromSingleFile','DatasetNew','DatasetFind','DatasetCreate',
+            'DatasetLoadCurrent','DatasetMerge','DatasetLoadIntoCurrent','DatasetSelect','DatasetSelectNew',
+            'DatasetSetCurrent','DatasetSave','DatasetSaveAll','DatasetSaveAs','DatasetGetChangedStatus',
+            'DatasetSetChangedStatus','DatasetDelete','DatasetGetCategory','DataFileGetName',
+            'DataFileGetAcronym','DataFileSetAcronym','DataFileGetComment','DataFileSetComment',
+            'DataFileGetPath','DataFileGetTime','DataFileGetOwner','DataFileGetGroup','DataFileReadPermitted',
+            'DataFileWritePermitted','DataFileExists','DataFileCopy','DataCategoryContents','CaseTypeContents',
+            'CaseTypeCategories','Execute','OpenDocument','TestInternetConnection','GeoFindCoordinates',
+            'ShowHelpTopic','Delay','ScheduleAt','ExitAimms','SessionArgument','SessionHasVisibleGUI',
+            'ProjectDeveloperMode','DebuggerBreakpoint','ShowProgressWindow','ShowMessageWindow',
+            'SolverGetControl','SolverReleaseControl','ProfilerStart','DataManagerImport','DataManagerExport',
+            'DataManagerFileNew','DataManagerFileOpen','DataManagerFileGetCurrent','DataImport220',
+            'SecurityGetUsers','SecurityGetGroups','UserColorAdd','UserColorDelete','UserColorGetRGB',
+            'UserColorModify','LicenseNumber','LicenseType','LicenseStartDate','LicenseExpirationDate',
+            'LicenseMaintenanceExpirationDate','VARLicenseExpirationDate','AimmsRevisionString',
+            'VARLicenseCreate','HistogramCreate','HistogramDelete','HistogramSetDomain',
+            'HistogramAddObservation','HistogramGetFrequencies','HistogramGetBounds',
+            'HistogramGetObservationCount','HistogramGetAverage','HistogramGetDeviation',
+            'HistogramGetSkewness','HistogramGetKurtosis','DateDifferenceDays','DateDifferenceYearFraction',
+            'PriceFractional','PriceDecimal','RateEffective','RateNominal','DepreciationLinearLife',
+            'DepreciationLinearRate','DepreciationNonLinearSumOfYear','DepreciationNonLinearLife',
+            'DepreciationNonLinearFactor','DepreciationNonLinearRate','DepreciationSum',
+            'InvestmentConstantPresentValue','InvestmentConstantFutureValue',
+            'InvestmentConstantPeriodicPayment','InvestmentConstantInterestPayment',
+            'InvestmentConstantPrincipalPayment','InvestmentConstantCumulativePrincipalPayment',
+            'InvestmentConstantCumulativeInterestPayment','InvestmentConstantNumberPeriods',
+            'InvestmentConstantRateAll','InvestmentConstantRate','InvestmentVariablePresentValue',
+            'InvestmentVariablePresentValueInperiodic','InvestmentSingleFutureValue',
+            'InvestmentVariableInternalRateReturnAll','InvestmentVariableInternalRateReturn',
+            'InvestmentVariableInternalRateReturnInperiodicAll','InvestmentVariableInternalRateReturnInperiodic',
+            'InvestmentVariableInternalRateReturnModified','SecurityDiscountedPrice',
+            'SecurityDiscountedRedemption','SecurityDiscountedYield','SecurityDiscountedRate',
+            'TreasuryBillPrice','TreasuryBillYield','TreasuryBillBondEquivalent','SecurityMaturityPrice',
+            'SecurityMaturityCouponRate','SecurityMaturityYield','SecurityMaturityAccruedInterest',
+            'SecurityCouponNumber','SecurityCouponPreviousDate','SecurityCouponNextDate','SecurityCouponDays',
+            'SecurityCouponDaysPreSettlement','SecurityCouponDaysPostSettlement','SecurityPeriodicPrice',
+            'SecurityPeriodicRedemption','SecurityPeriodicCouponRate','SecurityPeriodicYieldAll',
+            'SecurityPeriodicYield','SecurityPeriodicAccruedInterest','SecurityPeriodicDuration',
+            'SecurityPeriodicDurationModified','Abs','AtomicUnit','Ceil','Character','CharacterNumber','Cube',
+            'Degrees','Div','Exp','FileRead','Floor','Log','Log10','Mapval','Max','Min','Mod','Power',
+            'Radians','Round','Sign','Sqr','Sqrt','StringCapitalize','StringLength','StringToLower',
+            'StringToUnit','StringToUpper','SubString','Trunc','Binomial','NegativeBinomial','Poisson',
+            'Geometric','HyperGeometric','Uniform','Normal','LogNormal','Triangular','Exponential','Weibull',
+            'Beta','Gamma','Logistic','Pareto','ExtremeValue','Precision','Factorial','Combination',
+            'Permutation','Errorf','Cos','Sin','Tan','ArcCos','ArcSin','ArcTan','Cosh','Sinh','Tanh',
+            'ArcCosh','ArcSinh','ArcTanh'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '%', '&', '|', '/',
+            '<', '>', '>=' , '<=', ':=',
+            '=', '-', '+', '*',
+            '.', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #404040;',
+            4 => 'color: #990000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080; font-style: italic ',
+            'HARD' => 'color: #808080; font-style: italic'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            ),
+        'ESCAPE_CHAR' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/algol68.php b/vendor/easybook/geshi/geshi/algol68.php
new file mode 100755
index 000000000..5b1e5aa7f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/algol68.php
@@ -0,0 +1,329 @@
+<?php
+/*************************************************************************************
+ * algol68.php
+ * --------
+ * Author: Neville Dempsey (NevilleD.sourceforge@sgr-a.net)
+ * Copyright: (c) 2010 Neville Dempsey (https://sourceforge.net/projects/algol68/files/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/04/24
+ *
+ * ALGOL 68 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/04/24 (1.0.8.8.0)
+ *   - First Release - machine generated by http://rosettacode.org/geshi/
+ * 2010/05/24 (1.0.8.8.1)
+ *   - #2324 - converted comment detection to RegEx
+ * 2010/06/16 (1.0.8.8.2)
+ *   - separate symbols from keywords - quick fix
+ * 2010/06/16 (1.0.8.8.3)
+ *   - reverse length order symbols
+ *   - Add RegEx for BITS and REAL literals (INT to do)
+ *   - recognise LONG and SHORT prefixes to literals
+ * 2010/07/23 (1.0.8.8.4)
+ *   - fix errors detected by langcheck.php, eg rm tab, fix indenting, rm duplicate keywords, fix symbols as keywords etc
+ *   - removed bulk of local variables from name space.
+ *   - unfolded arrays
+ *
+ * TODO (updated yyyy/mm/dd)
+ * -------------------------
+ *   - Use "Parser Control" to fix KEYWORD parsing, eg: (INT minus one= -1; print(ABSminus one))
+ *   - Parse $FORMATS$ more fully - if possible.
+ *   - Pull reserved words from the source of A68G and A68RS
+ *   - Pull stdlib PROC/OP/MODE symbols from the soruce of A68G and A68RS
+ *   - Pull PROC/OP/MODE extensions from the soruce of A68G and A68RS
+ *   - Use RegEx to detect extended precision PROC names, eg 'long long sin' etc
+ *   - Use RegEx to detect white space std PROC names, eg 'new line'
+ *   - Use RegEx to detect white space ext PROC names, eg 'cgs speed of light'
+ *   - Use RegEx to detect BOLD symbols, eg userdefined MODEs and OPs
+ *   - Add REgEx for INT literals - Adding INT breaks formatting...
+ *   - Adding PIPE as a key word breaks formatting of "|" symbols!!
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+if(!function_exists('geshi_langfile_algol68_vars')) {
+    function geshi_langfile_algol68_vars(){
+        $pre='(?<![0-9a-z_\.])';
+        $post='?(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)';
+        $post=""; # assuming the RegEx is greedy #
+
+        $_="\s*";
+
+        $srad="Rr";        $rrad="[".$srad."]";  # either one digit, OR opt-space in digits #
+        $sbin="0-1";       $rbin="[".$sbin."]";  $_bin=$rbin."(?:[".$sbin."\s]*".$rbin."|)";
+        $snib="0-3";       $rnib="[".$snib."]";  $_nib=$rnib."(?:[".$snib."\s]*".$rnib."|)";
+        $soct="0-7";       $roct="[".$soct."]";  $_oct=$roct."(?:[".$soct."\s]*".$roct."|)";
+        $sdec="0-9";       $rdec="[".$sdec."]";  $_dec=$rdec."(?:[".$sdec."\s]*".$rdec."|)";
+        $shex="0-9A-Fa-f"; $rhex="[".$shex."]";  $_hex=$rhex."(?:[".$shex."\s]*".$rhex."|)";
+
+        # Define BITS: #
+        $prebits=$pre; $postbits=$post;
+        $bl="2".$_.$rrad.$_.$_bin;
+        $bl=$bl."|"."2".$_.$rrad.$_.$_bin;
+        $bl=$bl."|"."4".$_.$rrad.$_.$_nib;
+        $bl=$bl."|"."8".$_.$rrad.$_.$_oct;
+        $bl=$bl."|"."1".$_."0".$_.$rrad.$_.$_dec;
+        $bl=$bl."|"."1".$_."6".$_.$rrad.$_.$_hex;
+
+        # Define INT: #
+        $preint=$pre; $postint=$post;
+        # for some reason ".0 e - 2" is not recognised, but ".0 e + 2" IS!
+        # work around: remove spaces between sign and digits! Maybe because
+        # of the Unary '-' Operator
+        $sign_="(?:-|\-|[-]|[\-]|\+|)";  # attempts #
+
+        $sign_="(?:-\s*|\+\s*|)"; # n.b. sign is followed by white space #
+
+        $_int=$sign_.$_dec;
+        $il=          $_int;                      # +_9           #
+
+        $GESHI_NUMBER_INT_BASIC='(?:(?<![0-9a-z_\.%])|(?<=\.\.))(?<![\d\.]e[+\-])([1-9]\d*?|0)(?![0-9a-z]|\.(?:[eE][+\-]?)?\d)';
+
+        # Define REAL: #
+        $prereal=$pre; $postreal=$post;
+        $sexp="Ee\\\\";   $_exp="(?:⏨|[".$sexp."])".$_.$_int;
+        $_decimal="[.]".$_.$_dec;
+
+        # Add permitted permutations of various parts #
+        $rl=        $_int.$_.$_decimal.$_.$_exp; # +_9_._9_e_+_9 #
+        $rl=$rl."|".$_int.$_."[.]".$_.$_exp;     # +_9_.___e_+_9 #
+        $rl=$rl."|".$_int.$_.$_exp;              # +_9_____e_+_9 #
+        $rl=$rl."|".$sign_.$_decimal.$_.$_exp;   # +___._9_e_+_9 #
+
+        $rl=$rl."|".$_int.$_.$_decimal;          # +_9_._9       #
+        $rl=$rl."|".$sign_.$_decimal;            # +___._9       #
+
+        # The following line damaged formatting...
+        #$rl=$rl."|".$_int;                       # +_9           #
+
+        # Apparently Algol68 does not support '2.', c.f. Algol 68G
+        #$rl=$rl."|".$_int.$_."[.]";             # +_9_.         #
+
+        # Literal prefixes are overridden by KEYWORDS :-(
+        $LONGS="(?:(?:(LONG\s+)*|(SHORT\s+))*|)";
+
+        return array(
+            "BITS" => $prebits.$LONGS."(?:".$bl.")".$postbits,
+            "INT" => $preint.$LONGS."(?:".$il.")".$postint,
+            "REAL" => $prereal.$LONGS."(?:".$rl.")".$postreal,
+
+            "BOLD" => 'color: #b1b100; font-weight: bold;',
+            "ITALIC" => 'color: #b1b100;', # procedures traditionally italic #
+            "NONSTD" => 'color: #FF0000; font-weight: bold;', # RED #
+            "COMMENT" => 'color: #666666; font-style: italic;'
+        );
+    }
+}
+$a68=geshi_langfile_algol68_vars();
+
+$language_data = array(
+    'LANG_NAME' => 'ALGOL 68',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(
+        '¢' => '¢',
+        '£' => '£',
+        '#' => '#',
+        ),
+    'COMMENT_REGEXP' => array(
+        1 => '/\bCO((?:MMENT)?)\b.*?\bCO\\1\b/i',
+        2 => '/\bPR((?:AGMAT)?)\b.*?\bPR\\1\b/i',
+        3 => '/\bQUOTE\b.*?\bQUOTE\b/i'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '"',
+    'NUMBERS' => GESHI_NUMBER_HEX_SUFFIX,  # Warning: Feature!! #
+#                GESHI_NUMBER_HEX_SUFFIX, # Attempt ignore default #
+    'KEYWORDS' => array(
+# Extensions
+        1 => array('KEEP', 'FINISH', 'USE', 'SYSPROCS', 'IOSTATE', 'USING', 'ENVIRON', 'PROGRAM', 'CONTEXT'),
+#        2 => array('CASE', 'IN', 'OUSE', 'IN', 'OUT', 'ESAC', '(', '|', '|:', ')', 'FOR', 'FROM', 'TO', 'BY', 'WHILE', 'DO', 'OD', 'IF', 'THEN', 'ELIF', 'THEN', 'ELSE', 'FI', 'PAR', 'BEGIN', 'EXIT', 'END', 'GO', 'GOTO', 'FORALL', 'UPTO', 'DOWNTO', 'FOREACH', 'ASSERT'), #
+        2 => array('CASE', 'IN', 'OUSE', /* 'IN',*/ 'OUT', 'ESAC', 'PAR', 'BEGIN', 'EXIT', 'END', 'GO TO', 'GOTO', 'FOR', 'FROM', 'TO', 'BY', 'WHILE', 'DO', 'OD', 'IF', 'THEN', 'ELIF', /* 'THEN',*/ 'ELSE', 'FI' ),
+        3 => array('BITS', 'BOOL', 'BYTES', 'CHAR', 'COMPL', 'INT', 'REAL', 'SEMA', 'STRING', 'VOID'),
+        4 => array('MODE', 'OP', 'PRIO', 'PROC', 'FLEX', 'HEAP', 'LOC', 'REF', 'LONG', 'SHORT', 'EITHER'),
+# Extensions or deprecated keywords
+# 'PIPE': keyword somehow interferes with the internal operation of GeSHi
+        5 => array('FORALL', 'UPTO', 'DOWNTO', 'FOREACH', 'ASSERT', 'CTB', 'CT', 'CTAB', 'COMPLEX', 'VECTOR', 'SOUND' /*, 'PIPE'*/),
+        6 => array('CHANNEL', 'FILE', 'FORMAT', 'STRUCT', 'UNION', 'OF'),
+# '(', '|', '|:', ')',  #
+#        7 => array('OF', 'AT', '@', 'IS', ':=:', 'ISNT', ':/=:', ':≠:', 'CTB', 'CT', '::', 'CTAB', '::=', 'TRUE', 'FALSE', 'EMPTY', 'NIL', '○', 'SKIP', '~'),
+        7 => array('AT', 'IS', 'ISNT', 'TRUE', 'FALSE', 'EMPTY', 'NIL', 'SKIP'),
+        8 => array('NOT', 'UP', 'DOWN', 'LWB', 'UPB', /* '-',*/ 'ABS', 'ARG', 'BIN', 'ENTIER', 'LENG', 'LEVEL', 'ODD', 'REPR', 'ROUND', 'SHORTEN', 'CONJ', 'SIGN'),
+# OPERATORS ordered roughtly by PRIORITY #
+#       9 => array('¬', '↑', '↓', '⌊', '⌈', '~', '⎩', '⎧'),
+#        10 => array('+*', 'I', '+×', '⊥', '!', '⏨'),
+        10 => array('I'),
+#        11 => array('SHL', 'SHR', '**', 'UP', 'DOWN', 'LWB', 'UPB', '↑', '↓', '⌊', '⌈', '⎩', '⎧'),
+        11 => array('SHL', 'SHR', /*'UP', 'DOWN', 'LWB', 'UPB'*/),
+#        12 => array('*', '/', '%', 'OVER', '%*', 'MOD', 'ELEM', '×', '÷', '÷×', '÷*', '%×', '□', '÷:'),
+        12 => array('OVER', 'MOD', 'ELEM'),
+#        13 => array('-', '+'),
+#        14 => array('<', 'LT', '<=', 'LE', '>=', 'GE', '>', 'GT', '≤', '≥'),
+        14 => array('LT', 'LE', 'GE', 'GT'),
+#        15 => array('=', 'EQ', '/=', 'NE', '≠', '~='),
+        15 => array('EQ', 'NE'),
+#        16 => array('&', 'AND', '∧', 'OR', '∨', '/\\', '\\/'),
+        16 => array('AND', 'OR'),
+        17 => array('MINUSAB', 'PLUSAB', 'TIMESAB', 'DIVAB', 'OVERAB', 'MODAB', 'PLUSTO'),
+#        18 => array('-:=', '+:=', '*:=', '/:=', '%:=', '%*:=', '+=:', '×:=', '÷:=', '÷×:=', '÷*:=', '%×:=', '÷::=', 'MINUS', 'PLUS', 'DIV', 'MOD', 'PRUS'),
+# Extensions or deprecated keywords
+        18 => array('MINUS', 'PLUS', 'DIV', /* 'MOD',*/ 'PRUS', 'IS NOT'),
+# Extensions or deprecated keywords
+        19 => array('THEF', 'ANDF', 'ORF', 'ANDTH', 'OREL', 'ANDTHEN', 'ORELSE'),
+# Built in procedures - from standard prelude #
+        20 => array('int lengths', 'intlengths', 'int shorths', 'intshorths', 'max int', 'maxint', 'real lengths', 'reallengths', 'real shorths', 'realshorths', 'bits lengths', 'bitslengths', 'bits shorths', 'bitsshorths', 'bytes lengths', 'byteslengths', 'bytes shorths', 'bytesshorths', 'max abs char', 'maxabschar', 'int width', 'intwidth', 'long int width', 'longintwidth', 'long long int width', 'longlongintwidth', 'real width', 'realwidth', 'long real width', 'longrealwidth', 'long long real width', 'longlongrealwidth', 'exp width', 'expwidth', 'long exp width', 'longexpwidth', 'long long exp width', 'longlongexpwidth', 'bits width', 'bitswidth', 'long bits width', 'longbitswidth', 'long long bits width', 'longlongbitswidth', 'bytes width', 'byteswidth', 'long bytes width', 'longbyteswidth', 'max real', 'maxreal', 'small real', 'smallreal', 'long max int', 'longmaxint', 'long long max int', 'longlongmaxint', 'long max real', 'longmaxreal', 'long small real', 'longsmallreal', 'long long max real', 'longlongmaxreal', 'long long small real', 'longlongsmallreal', 'long max bits', 'longmaxbits', 'long long max bits', 'longlongmaxbits', 'null character', 'nullcharacter', 'blank', 'flip', 'flop', 'error char', 'errorchar', 'exp char', 'expchar', 'newline char', 'newlinechar', 'formfeed char', 'formfeedchar', 'tab char', 'tabchar'),
+        21 => array('stand in channel', 'standinchannel', 'stand out channel', 'standoutchannel', 'stand back channel', 'standbackchannel', 'stand draw channel', 'standdrawchannel', 'stand error channel', 'standerrorchannel'),
+        22 => array('put possible', 'putpossible', 'get possible', 'getpossible', 'bin possible', 'binpossible', 'set possible', 'setpossible', 'reset possible', 'resetpossible', 'reidf possible', 'reidfpossible', 'draw possible', 'drawpossible', 'compressible', 'on logical file end', 'onlogicalfileend', 'on physical file end', 'onphysicalfileend', 'on line end', 'onlineend', 'on page end', 'onpageend', 'on format end', 'onformatend', 'on value error', 'onvalueerror', 'on open error', 'onopenerror', 'on transput error', 'ontransputerror', 'on format error', 'onformaterror', 'open', 'establish', 'create', 'associate', 'close', 'lock', 'scratch', 'space', 'new line', 'newline', 'print', 'write f', 'writef', 'print f', 'printf', 'write bin', 'writebin', 'print bin', 'printbin', 'read f', 'readf', 'read bin', 'readbin', 'put f', 'putf', 'get f', 'getf', 'make term', 'maketerm', 'make device', 'makedevice', 'idf', 'term', 'read int', 'readint', 'read long int', 'readlongint', 'read long long int', 'readlonglongint', 'read real', 'readreal', 'read long real', 'readlongreal', 'read long long real', 'readlonglongreal', 'read complex', 'readcomplex', 'read long complex', 'readlongcomplex', 'read long long complex', 'readlonglongcomplex', 'read bool', 'readbool', 'read bits', 'readbits', 'read long bits', 'readlongbits', 'read long long bits', 'readlonglongbits', 'read char', 'readchar', 'read string', 'readstring', 'print int', 'printint', 'print long int', 'printlongint', 'print long long int', 'printlonglongint', 'print real', 'printreal', 'print long real', 'printlongreal', 'print long long real', 'printlonglongreal', 'print complex', 'printcomplex', 'print long complex', 'printlongcomplex', 'print long long complex', 'printlonglongcomplex', 'print bool', 'printbool', 'print bits', 'printbits', 'print long bits', 'printlongbits', 'print long long bits', 'printlonglongbits', 'print char', 'printchar', 'print string', 'printstring', 'whole', 'fixed', 'float'),
+        23 => array('pi', 'long pi', 'longpi', 'long long pi', 'longlongpi'),
+        24 => array('sqrt', 'curt', 'cbrt', 'exp', 'ln', 'log', 'sin', 'arc sin', 'arcsin', 'cos', 'arc cos', 'arccos', 'tan', 'arc tan', 'arctan', 'long sqrt', 'longsqrt', 'long curt', 'longcurt', 'long cbrt', 'longcbrt', 'long exp', 'longexp', 'long ln', 'longln', 'long log', 'longlog', 'long sin', 'longsin', 'long arc sin', 'longarcsin', 'long cos', 'longcos', 'long arc cos', 'longarccos', 'long tan', 'longtan', 'long arc tan', 'longarctan', 'long long sqrt', 'longlongsqrt', 'long long curt', 'longlongcurt', 'long long cbrt', 'longlongcbrt', 'long long exp', 'longlongexp', 'long long ln', 'longlongln', 'long long log', 'longlonglog', 'long long sin', 'longlongsin', 'long long arc sin', 'longlongarcsin', 'long long cos', 'longlongcos', 'long long arc cos', 'longlongarccos', 'long long tan', 'longlongtan', 'long long arc tan', 'longlongarctan'),
+        25 => array('first random', 'firstrandom', 'next random', 'nextrandom', 'long next random', 'longnextrandom', 'long long next random', 'longlongnextrandom'),
+        26 => array('real', 'bits pack', 'bitspack', 'long bits pack', 'longbitspack', 'long long bits pack', 'longlongbitspack', 'bytes pack', 'bytespack', 'long bytes pack', 'longbytespack', 'char in string', 'charinstring', 'last char in string', 'lastcharinstring', 'string in string', 'stringinstring'),
+        27 => array('utc time', 'utctime', 'local time', 'localtime', 'argc', 'argv', 'get env', 'getenv', 'reset errno', 'reseterrno', 'errno', 'strerror'),
+        28 => array('sinh', 'long sinh', 'longsinh', 'long long sinh', 'longlongsinh', 'arc sinh', 'arcsinh', 'long arc sinh', 'longarcsinh', 'long long arc sinh', 'longlongarcsinh', 'cosh', 'long cosh', 'longcosh', 'long long cosh', 'longlongcosh', 'arc cosh', 'arccosh', 'long arc cosh', 'longarccosh', 'long long arc cosh', 'longlongarccosh', 'tanh', 'long tanh', 'longtanh', 'long long tanh', 'longlongtanh', 'arc tanh', 'arctanh', 'long arc tanh', 'longarctanh', 'long long arc tanh', 'longlongarctanh', 'arc tan2', 'arctan2', 'long arc tan2', 'longarctan2', 'long long arc tan2', 'longlongarctan2'),
+        29 => array('complex sqrt', 'complexsqrt', 'long complex sqrt', 'longcomplexsqrt', 'long long complex sqrt', 'longlongcomplexsqrt', 'complex exp', 'complexexp', 'long complex exp', 'longcomplexexp', 'long long complex exp', 'longlongcomplexexp', 'complex ln', 'complexln', 'long complex ln', 'longcomplexln', 'long long complex ln', 'longlongcomplexln', 'complex sin', 'complexsin', 'long complex sin', 'longcomplexsin', 'long long complex sin', 'longlongcomplexsin', 'complex arc sin', 'complexarcsin', 'long complex arc sin', 'longcomplexarcsin', 'long long complex arc sin', 'longlongcomplexarcsin', 'complex cos', 'complexcos', 'long complex cos', 'longcomplexcos', 'long long complex cos', 'longlongcomplexcos', 'complex arc cos', 'complexarccos', 'long complex arc cos', 'longcomplexarccos', 'long long complex arc cos', 'longlongcomplexarccos', 'complex tan', 'complextan', 'long complex tan', 'longcomplextan', 'long long complex tan', 'longlongcomplextan', 'complex arc tan', 'complexarctan', 'long complex arc tan', 'longcomplexarctan', 'long long complex arc tan', 'longlongcomplexarctan', 'complex sinh', 'complexsinh', 'complex arc sinh', 'complexarcsinh', 'complex cosh', 'complexcosh', 'complex arc cosh', 'complexarccosh', 'complex tanh', 'complextanh', 'complex arc tanh', 'complexarctanh')
+        ),
+    'SYMBOLS' => array(
+        1 => array( /* reverse length sorted... */ '÷×:=', '%×:=', ':≠:', '÷*:=', '÷::=', '%*:=', ':/=:', '×:=', '÷:=', '÷×', '%:=', '%×', '*:=', '+:=', '+=:', '+×', '-:=', '/:=', '::=', ':=:', '÷*', '÷:', '↑', '↓', '∧', '∨', '≠', '≤', '≥', '⊥', '⌈', '⌊', '⎧', '⎩', /* '⏨', */ '□', '○', '%*', '**', '+*', '/=', '::', '/\\', '\\/', '<=', '>=', '|:', '~=', '¬', '×', '÷', '!', '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '=', '>', '?', '@', '[', ']', '^', '{', '|', '}', '~')
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+#        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+#        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+        17 => true,
+        18 => true,
+        19 => true,
+        20 => true,
+        21 => true,
+        22 => true,
+        23 => true,
+        24 => true,
+        25 => true,
+        26 => true,
+        27 => true,
+        28 => true,
+        29 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => $a68['NONSTD'], 2 => $a68['BOLD'], 3 => $a68['BOLD'], 4 => $a68['BOLD'],
+            5 => $a68['NONSTD'], 6 => $a68['BOLD'], 7 => $a68['BOLD'], 8 => $a68['BOLD'],
+            /* 9 => $a68['BOLD'],*/ 10 => $a68['BOLD'], 11 => $a68['BOLD'], 12 => $a68['BOLD'],
+            /* 13 => $a68['BOLD'],*/ 14 => $a68['BOLD'], 15 => $a68['BOLD'], 16 => $a68['BOLD'], 17 => $a68['BOLD'],
+            18 => $a68['NONSTD'], 19 => $a68['NONSTD'],
+            20 => $a68['ITALIC'], 21 => $a68['ITALIC'], 22 => $a68['ITALIC'], 23 => $a68['ITALIC'],
+            24 => $a68['ITALIC'], 25 => $a68['ITALIC'], 26 => $a68['ITALIC'], 27 => $a68['ITALIC'],
+            28 => $a68['ITALIC'], 29 => $a68['ITALIC']
+            ),
+        'COMMENTS' => array(
+            1 => $a68['COMMENT'], 2 => $a68['COMMENT'], 3 => $a68['COMMENT'], /* 4 => $a68['COMMENT'],
+            5 => $a68['COMMENT'],*/ 'MULTI' => $a68['COMMENT']
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;',
+            1 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0  => 'color: #cc66cc;',   # BITS #
+            1  => 'color: #cc66cc;',   # REAL #
+            /* 2  => 'color: #cc66cc;',   # INT # */
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+#        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+#        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => '',
+        18 => '',
+        19 => '',
+        20 => '',
+        21 => '',
+        22 => '',
+        23 => '',
+        24 => '',
+        25 => '',
+        26 => '',
+        27 => '',
+        28 => '',
+        29 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => '→',
+        1 => 'OF'
+        ),
+    'REGEXPS' => array(
+        0 => $a68['BITS'],
+        1 => $a68['REAL']
+        # 2 => $a68['INT'], # Breaks formatting for some reason #
+        # 2 => $GESHI_NUMBER_INT_BASIC # Also breaks formatting  #
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+unset($a68);
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/apache.php b/vendor/easybook/geshi/geshi/apache.php
new file mode 100755
index 000000000..c944443c7
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/apache.php
@@ -0,0 +1,483 @@
+<?php
+/*************************************************************************************
+ * apache.php
+ * ----------
+ * Author: Tux (tux@inmail.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/29/07
+ *
+ * Apache language file for GeSHi.
+ * Words are from SciTe configuration file
+ *
+ * CHANGES
+ * -------
+ * 2008/17/06 (1.0.8)
+ *  -  Added support for apache configuration sections (milian)
+ *  -  Added missing php keywords (milian)
+ *  -  Added some more keywords
+ *  -  Disabled highlighting of brackets by default
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/07/29)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Apache configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            //core.c
+            'AcceptFilter','AcceptPathInfo','AccessConfig','AccessFileName',
+            'AddDefaultCharset','AddOutputFilterByType','AllowEncodedSlashes',
+            'AllowOverride','AuthName','AuthType','ContentDigest',
+            'CoreDumpDirectory','DefaultType','DocumentRoot','EnableMMAP',
+            'EnableSendfile','ErrorDocument','ErrorLog','FileETag','ForceType',
+            'HostnameLookups','Include','LimitInternalRecursion',
+            'LimitRequestBody','LimitRequestFields','LimitRequestFieldsize',
+            'LimitRequestLine','LimitXMLRequestBody','LogLevel','MaxMemFree',
+            'MaxRequestsPerChild','NameVirtualHost','Options','PidFile','Port',
+            'Protocol','Require','RLimitCPU','RLimitMEM','RLimitNPROC',
+            'Satisfy','ScoreBoardFile','ServerAdmin','ServerAlias','ServerName',
+            'ServerPath','ServerRoot','ServerSignature','ServerTokens',
+            'SetHandler','SetInputFilter','SetOutputFilter','ThreadStackSize',
+            'Timeout','TraceEnable','UseCanonicalName',
+            'UseCanonicalPhysicalPort',
+
+            //http_core.c
+            'KeepAlive','KeepAliveTimeout','MaxKeepAliveRequests',
+
+            //mod_actions.c
+            'Action','Script',
+
+            //mod_alias.c
+            'Alias','AliasMatch','Redirect','RedirectMatch','RedirectPermanent',
+            'RedirectTemp','ScriptAlias','ScriptAliasMatch',
+
+            //mod_asis.c
+
+            //mod_auth_basic.c
+            'AuthBasicAuthoritative','AuthBasicProvider',
+
+            //mod_auth_digest.c
+            'AuthDigestAlgorithm','AuthDigestDomain','AuthDigestNcCheck',
+            'AuthDigestNonceFormat','AuthDigestNonceLifetime',
+            'AuthDigestProvider','AuthDigestQop','AuthDigestShmemSize',
+
+            //mod_authn_alias.c
+
+            //mod_authn_anon.c
+            'Anonymous','Anonymous_LogEmail','Anonymous_MustGiveEmail',
+            'Anonymous_NoUserId','Anonymous_VerifyEmail',
+
+            //mod_authn_dbd.c
+            'AuthDBDUserPWQuery','AuthDBDUserRealmQuery',
+
+            //mod_authn_dbm.c
+            'AuthDBMType','AuthDBMUserFile',
+
+            //mod_authn_default.c
+            'AuthDefaultAuthoritative',
+
+            //mod_authn_file.c
+            'AuthUserFile',
+
+            //mod_authnz_ldap.c
+            'AuthLDAPBindDN','AuthLDAPBindPassword','AuthLDAPCharsetConfig',
+            'AuthLDAPCompareDNOnServer','AuthLDAPDereferenceAliases',
+            'AuthLDAPGroupAttribute','AuthLDAPGroupAttributeIsDN',
+            'AuthLDAPRemoteUserAttribute','AuthLDAPRemoteUserIsDN',
+            'AuthLDAPURL','AuthzLDAPAuthoritative',
+
+            //mod_authz_dbm.c
+            'AuthDBMGroupFile','AuthzDBMAuthoritative','AuthzDBMType',
+
+            //mod_authz_default.c
+            'AuthzDefaultAuthoritative',
+
+            //mod_authz_groupfile.c
+            'AuthGroupFile','AuthzGroupFileAuthoritative',
+
+            //mod_authz_host.c
+            'Allow','Deny','Order',
+
+            //mod_authz_owner.c
+            'AuthzOwnerAuthoritative',
+
+            //mod_authz_svn.c
+            'AuthzForceUsernameCase','AuthzSVNAccessFile','AuthzSVNAnonymous',
+            'AuthzSVNAuthoritative','AuthzSVNNoAuthWhenAnonymousAllowed',
+
+            //mod_authz_user.c
+            'AuthzUserAuthoritative',
+
+            //mod_autoindex.c
+            'AddAlt','AddAltByEncoding','AddAltByType','AddDescription',
+            'AddIcon','AddIconByEncoding','AddIconByType','DefaultIcon',
+            'FancyIndexing','HeaderName','IndexHeadInsert','IndexIgnore',
+            'IndexOptions','IndexOrderDefault','IndexStyleSheet','ReadmeName',
+
+            //mod_bt.c
+            'Tracker','TrackerDetailURL','TrackerFlags','TrackerHashMaxAge',
+            'TrackerHashMinAge','TrackerHashWatermark','TrackerHome',
+            'TrackerReturnInterval','TrackerReturnMax',
+            'TrackerReturnPeerFactor','TrackerReturnPeers','TrackerRootInclude',
+            'TrackerStyleSheet',
+
+            //mod_bw.c
+            'BandWidth','BandWidthError','BandWidthModule','BandWidthPacket',
+            'ForceBandWidthModule','LargeFileLimit','MaxConnection',
+            'MinBandWidth',
+
+            //mod_cache.c
+            'CacheDefaultExpire','CacheDisable','CacheEnable',
+            'CacheIgnoreCacheControl','CacheIgnoreHeaders',
+            'CacheIgnoreNoLastMod','CacheIgnoreQueryString',
+            'CacheLastModifiedFactor','CacheMaxExpire','CacheStoreNoStore',
+            'CacheStorePrivate',
+
+            //mod_cern_meta.c
+            'MetaDir','MetaFiles','MetaSuffix',
+
+            //mod_cgi.c
+            'ScriptLog','ScriptLogBuffer','ScriptLogLength',
+
+            //mod_charset_lite.c
+            'CharsetDefault','CharsetOptions','CharsetSourceEnc',
+
+            //mod_dav.c
+            'DAV','DAVDepthInfinity','DAVMinTimeout',
+
+            //mod_dav_fs.c
+            'DAVLockDB',
+
+            //mod_dav_lock.c
+            'DAVGenericLockDB',
+
+            //mod_dav_svn.c
+            'SVNActivitiesDB','SVNAllowBulkUpdates','SVNAutoversioning',
+            'SVNIndexXSLT','SVNListParentPath','SVNMasterURI','SVNParentPath',
+            'SVNPath','SVNPathAuthz','SVNReposName','SVNSpecialURI',
+
+            //mod_dbd.c
+            'DBDExptime','DBDKeep','DBDMax','DBDMin','DBDParams','DBDPersist',
+            'DBDPrepareSQL','DBDriver',
+
+            //mod_deflate.c
+            'DeflateBufferSize','DeflateCompressionLevel','DeflateFilterNote',
+            'DeflateMemLevel','DeflateWindowSize',
+
+            //mod_dir.c
+            'DirectoryIndex','DirectorySlash',
+
+            //mod_disk_cache.c
+            'CacheDirLength','CacheDirLevels','CacheMaxFileSize',
+            'CacheMinFileSize','CacheRoot',
+
+            //mod_dumpio.c
+            'DumpIOInput','DumpIOLogLevel','DumpIOOutput',
+
+            //mod_env.c
+            'PassEnv','SetEnv','UnsetEnv',
+
+            //mod_expires.c
+            'ExpiresActive','ExpiresByType','ExpiresDefault',
+
+            //mod_ext_filter.c
+            'ExtFilterDefine','ExtFilterOptions',
+
+            //mod_file_cache.c
+            'cachefile','mmapfile',
+
+            //mod_filter.c
+            'FilterChain','FilterDeclare','FilterProtocol','FilterProvider',
+            'FilterTrace',
+
+            //mod_gnutls.c
+            'GnuTLSCache','GnuTLSCacheTimeout','GnuTLSCertificateFile',
+            'GnuTLSKeyFile','GnuTLSPGPCertificateFile','GnuTLSPGPKeyFile',
+            'GnuTLSClientVerify','GnuTLSClientCAFile','GnuTLSPGPKeyringFile',
+            'GnuTLSEnable','GnuTLSDHFile','GnuTLSRSAFile','GnuTLSSRPPasswdFile',
+            'GnuTLSSRPPasswdConfFile','GnuTLSPriorities',
+            'GnuTLSExportCertificates',
+
+            //mod_headers.c
+            'Header','RequestHeader',
+
+            //mod_imagemap.c
+            'ImapBase','ImapDefault','ImapMenu',
+
+            //mod_include.c
+            'SSIAccessEnable','SSIEndTag','SSIErrorMsg','SSIStartTag',
+            'SSITimeFormat','SSIUndefinedEcho','XBitHack',
+
+            //mod_ident.c
+            'IdentityCheck','IdentityCheckTimeout',
+
+            //mod_info.c
+            'AddModuleInfo',
+
+            //mod_isapi.c
+            'ISAPIAppendLogToErrors','ISAPIAppendLogToQuery','ISAPICacheFile',
+            'ISAPIFakeAsync','ISAPILogNotSupported','ISAPIReadAheadBuffer',
+
+            //mod_log_config.c
+            'BufferedLogs','CookieLog','CustomLog','LogFormat','TransferLog',
+
+            //mod_log_forensic.c
+            'ForensicLog',
+
+            //mod_log_rotate.c
+            'RotateInterval','RotateLogs','RotateLogsLocalTime',
+
+            //mod_logio.c
+
+            //mod_mem_cache.c
+            'MCacheMaxObjectCount','MCacheMaxObjectSize',
+            'MCacheMaxStreamingBuffer','MCacheMinObjectSize',
+            'MCacheRemovalAlgorithm','MCacheSize',
+
+            //mod_mime.c
+            'AddCharset','AddEncoding','AddHandler','AddInputFilter',
+            'AddLanguage','AddOutputFilter','AddType','DefaultLanguage',
+            'ModMimeUsePathInfo','MultiviewsMatch','RemoveCharset',
+            'RemoveEncoding','RemoveHandler','RemoveInputFilter',
+            'RemoveLanguage','RemoveOutputFilter','RemoveType','TypesConfig',
+
+            //mod_mime_magic.c
+            'MimeMagicFile',
+
+            //mod_negotiation.c
+            'CacheNegotiatedDocs','ForceLanguagePriority','LanguagePriority',
+
+            //mod_php5.c
+            'php_admin_flag','php_admin_value','php_flag','php_value',
+            'PHPINIDir',
+
+            //mod_proxy.c
+            'AllowCONNECT','BalancerMember','NoProxy','ProxyBadHeader',
+            'ProxyBlock','ProxyDomain','ProxyErrorOverride',
+            'ProxyFtpDirCharset','ProxyIOBufferSize','ProxyMaxForwards',
+            'ProxyPass','ProxyPassInterpolateEnv','ProxyPassMatch',
+            'ProxyPassReverse','ProxyPassReverseCookieDomain',
+            'ProxyPassReverseCookiePath','ProxyPreserveHost',
+            'ProxyReceiveBufferSize','ProxyRemote','ProxyRemoteMatch',
+            'ProxyRequests','ProxySet','ProxyStatus','ProxyTimeout','ProxyVia',
+
+            //mod_proxy_ajp.c
+
+            //mod_proxy_balancer.c
+
+            //mod_proxy_connect.c
+
+            //mod_proxy_ftp.c
+
+            //mod_proxy_http.c
+
+            //mod_rewrite.c
+            'RewriteBase','RewriteCond','RewriteEngine','RewriteLock',
+            'RewriteLog','RewriteLogLevel','RewriteMap','RewriteOptions',
+            'RewriteRule',
+
+            //mod_setenvif.c
+            'BrowserMatch','BrowserMatchNoCase','SetEnvIf','SetEnvIfNoCase',
+
+            //mod_so.c
+            'LoadFile','LoadModule',
+
+            //mod_speling.c
+            'CheckCaseOnly','CheckSpelling',
+
+            //mod_ssl.c
+            'SSLCACertificateFile','SSLCACertificatePath','SSLCADNRequestFile',
+            'SSLCADNRequestPath','SSLCARevocationFile','SSLCARevocationPath',
+            'SSLCertificateChainFile','SSLCertificateFile',
+            'SSLCertificateKeyFile','SSLCipherSuite','SSLCryptoDevice',
+            'SSLEngine','SSLHonorCipherOrder','SSLMutex','SSLOptions',
+            'SSLPassPhraseDialog','SSLProtocol','SSLProxyCACertificateFile',
+            'SSLProxyCACertificatePath','SSLProxyCARevocationFile',
+            'SSLProxyCARevocationPath','SSLProxyCipherSuite','SSLProxyEngine',
+            'SSLProxyMachineCertificateFile','SSLProxyMachineCertificatePath',
+            'SSLProxyProtocol','SSLProxyVerify','SSLProxyVerifyDepth',
+            'SSLRandomSeed','SSLRenegBufferSize','SSLRequire','SSLRequireSSL',
+            'SSLSessionCache','SSLSessionCacheTimeout','SSLUserName',
+            'SSLVerifyClient','SSLVerifyDepth',
+
+            //mod_status.c
+            'ExtendedStatus','SeeRequestTail',
+
+            //mod_substitute.c
+            'Substitute',
+
+            //mod_suexec.c
+            'SuexecUserGroup',
+
+            //mod_unique_id.c
+
+            //mod_upload_progress
+            'ReportUploads', 'TrackUploads', 'UploadProgressSharedMemorySize',
+
+            //mod_userdir.c
+            'UserDir',
+
+            //mod_usertrack.c
+            'CookieDomain','CookieExpires','CookieName','CookieStyle',
+            'CookieTracking',
+
+            //mod_version.c
+
+            //mod_vhost_alias.c
+            'VirtualDocumentRoot','VirtualDocumentRootIP',
+            'VirtualScriptAlias','VirtualScriptAliasIP',
+
+            //mod_view.c
+            'ViewEnable',
+
+            //mod_win32.c
+            'ScriptInterpreterSource',
+
+            //mpm_winnt.c
+            'Listen','ListenBacklog','ReceiveBufferSize','SendBufferSize',
+            'ThreadLimit','ThreadsPerChild','Win32DisableAcceptEx',
+
+            //mpm_common.c
+            'AcceptMutex','AddModule','ClearModuleList','EnableExceptionHook',
+            'Group','LockFile','MaxClients','MaxSpareServers','MaxSpareThreads',
+            'MinSpareServers','MinSpareThreads','ServerLimit','StartServers',
+            'StartThreads','User',
+
+            //util_ldap.c
+            'LDAPCacheEntries','LDAPCacheTTL','LDAPConnectionTimeout',
+            'LDAPOpCacheEntries','LDAPOpCacheTTL','LDAPSharedCacheFile',
+            'LDAPSharedCacheSize','LDAPTrustedClientCert',
+            'LDAPTrustedGlobalCert','LDAPTrustedMode','LDAPVerifyServerCert',
+
+            //Unknown Mods ...
+            'AgentLog','BindAddress','bs2000account','CacheForceCompletion',
+            'CacheGCInterval','CacheSize','NoCache','qsc','RefererIgnore',
+            'RefererLog','Resourceconfig','ServerType','SingleListen'
+            ),
+        /*keywords 2*/
+        2 => array(
+            'all','on','off','standalone','inetd','indexes',
+            'force-response-1.0','downgrade-1.0','nokeepalive',
+            'includes','followsymlinks','none',
+            'x-compress','x-gzip'
+        ),
+        /*keywords 3*/
+        3 => array(
+            //core.c
+            'Directory','DirectoryMatch','Files','FilesMatch','IfDefine',
+            'IfModule','Limit','LimitExcept','Location','LocationMatch',
+            'VirtualHost',
+
+            //mod_authn_alias.c
+            'AuthnProviderAlias',
+
+            //mod_proxy.c
+            'Proxy','ProxyMatch',
+
+            //mod_version.c
+            'IfVersion'
+        )
+    ),
+    'SYMBOLS' => array(
+        '+', '-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000000; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/applescript.php b/vendor/easybook/geshi/geshi/applescript.php
new file mode 100755
index 000000000..603fa4a3e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/applescript.php
@@ -0,0 +1,157 @@
+<?php
+/*************************************************************************************
+ * applescript.php
+ * --------
+ * Author: Stephan Klimek (http://www.initware.org)
+ * Copyright: Stephan Klimek (http://www.initware.org)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/07/20
+ *
+ * AppleScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *
+ * TODO
+ * -------------------------
+ * URL settings to references
+ *
+ **************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'AppleScript',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array( '(*' => '*)'),
+    'COMMENT_REGEXP' => array(
+        2 => '/(?<=[a-z])\'/i',
+        3 => '/(?<![a-z])\'.*?\'/i',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'application','close','count','delete','duplicate','exists','launch','make','move','open',
+            'print','quit','reopen','run','save','saving', 'idle', 'path to', 'number', 'alias', 'list', 'text', 'string',
+            'integer', 'it','me','version','pi','result','space','tab','anything','case','diacriticals','expansion',
+            'hyphens','punctuation','bold','condensed','expanded','hidden','italic','outline','plain',
+            'shadow','strikethrough','subscript','superscript','underline','ask','no','yes','false', 'id',
+            'true','weekday','monday','mon','tuesday','tue','wednesday','wed','thursday','thu','friday',
+            'fri','saturday','sat','sunday','sun','month','january','jan','february','feb','march',
+            'mar','april','apr','may','june','jun','july','jul','august','aug','september', 'quote', 'do JavaScript',
+            'sep','october','oct','november','nov','december','dec','minutes','hours', 'name', 'default answer',
+            'days','weeks', 'folder', 'folders', 'file', 'files', 'window', 'eject', 'disk', 'reveal', 'sleep',
+            'shut down', 'restart', 'display dialog', 'buttons', 'invisibles', 'item', 'items', 'delimiters', 'offset of',
+            'AppleScript\'s', 'choose file', 'choose folder', 'choose from list', 'beep', 'contents', 'do shell script',
+            'paragraph', 'paragraphs', 'missing value', 'quoted form', 'desktop', 'POSIX path', 'POSIX file',
+            'activate', 'document', 'adding', 'receiving', 'content', 'new', 'properties', 'info for', 'bounds',
+            'selection', 'extension', 'into', 'onto', 'by', 'between', 'against', 'set the clipboard to', 'the clipboard'
+            ),
+        2 => array(
+            'each','some','every','whose','where','index','first','second','third','fourth',
+            'fifth','sixth','seventh','eighth','ninth','tenth','last','front','back','st','nd',
+            'rd','th','middle','named','through','thru','before','after','beginning','the', 'as',
+            'div','mod','and','not','or','contains','equal','equals','isnt', 'less', 'greater'
+            ),
+        3 => array(
+            'script','property','prop','end','to','set','global','local','on','of',
+            'in','given','with','without','return','continue','tell','if','then','else','repeat',
+            'times','while','until','from','exit','try','error','considering','ignoring','timeout',
+            'transaction','my','get','put','is', 'copy'
+            )
+        ),
+    'SYMBOLS' => array(
+        ')','+','-','^','*','/','&','<','>=','<','<=','=','�'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0066ff;',
+            2 => 'color: #ff0033;',
+            3 => 'color: #ff0033; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => '',
+            3 => 'color: #ff0000;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #339933;',
+            4 => 'color: #0066ff;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => ',+-=&lt;&gt;/?^&amp;*'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        //File descriptors
+        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/apt_sources.php b/vendor/easybook/geshi/geshi/apt_sources.php
new file mode 100755
index 000000000..979d10ce9
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/apt_sources.php
@@ -0,0 +1,155 @@
+<?php
+/*************************************************************************************
+ * apt_sources.php
+ * ----------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/06/17
+ *
+ * Apt sources.list language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/17 (1.0.8)
+ *  -  Initial import
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Apt sources',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            'deb-src', 'deb'
+            ),
+        2 => array(
+            //Generic
+            'stable', 'old-stable', 'testing', 'testing-proposed-updates',
+            'unstable', 'unstable-proposed-updates', 'experimental',
+            'non-US', 'security', 'volatile', 'volatile-sloppy',
+            'apt-build',
+            'stable/updates',
+            //Debian
+            'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge',
+            'etch', 'lenny', 'wheezy', 'jessie', 'sid',
+            //Ubuntu
+            'warty', 'warty-updates', 'warty-security', 'warty-proposed', 'warty-backports',
+            'hoary', 'hoary-updates', 'hoary-security', 'hoary-proposed', 'hoary-backports',
+            'breezy', 'breezy-updates', 'breezy-security', 'breezy-proposed', 'breezy-backports',
+            'dapper', 'dapper-updates', 'dapper-security', 'dapper-proposed', 'dapper-backports',
+            'edgy', 'edgy-updates', 'edgy-security', 'edgy-proposed', 'edgy-backports',
+            'feisty', 'feisty-updates', 'feisty-security', 'feisty-proposed', 'feisty-backports',
+            'gutsy', 'gutsy-updates', 'gutsy-security', 'gutsy-proposed', 'gutsy-backports',
+            'hardy', 'hardy-updates', 'hardy-security', 'hardy-proposed', 'hardy-backports',
+            'intrepid', 'intrepid-updates', 'intrepid-security', 'intrepid-proposed', 'intrepid-backports',
+            'jaunty', 'jaunty-updates', 'jaunty-security', 'jaunty-proposed', 'jaunty-backports',
+            'karmic', 'karmic-updates', 'karmic-security', 'karmic-proposed', 'karmic-backports',
+            'lucid', 'lucid-updates', 'lucid-security', 'lucid-proposed', 'lucid-backports',
+            'maverick', 'maverick-updates', 'maverick-security', 'maverick-proposed', 'maverick-backports',
+            'natty', 'natty-updates', 'natty-security', 'natty-proposed', 'natty-backports',
+            'oneiric', 'oneiric-updates', 'oneiric-security', 'oneiric-proposed', 'oneiric-backports',
+            'precise', 'precise-updates', 'precise-security', 'precise-proposed', 'precise-backports',
+            'quantal', 'quantal-updates', 'quantal-security', 'quantal-proposed', 'quantal-backports',
+            'raring', 'raring-updates', 'raring-security', 'raring-proposed', 'raring-backports',
+            'saucy', 'saucy-updates', 'saucy-security', 'saucy-proposed', 'saucy-backports',
+            'trusty', 'trusty-updates', 'trusty-security', 'trusty-proposed', 'trusty-backports'
+            ),
+        3 => array(
+            'main', 'restricted', 'preview', 'contrib', 'non-free',
+            'commercial', 'universe', 'multiverse'
+            )
+    ),
+    'REGEXPS' => array(
+        0 => "(((http|ftp):\/\/|file:\/)[^\s]+)|(cdrom:\[[^\]]*\][^\s]*)",
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b16000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #009900;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+            'METHODS' => GESHI_NEVER,
+            'SCRIPT' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'ESCAPE_CHAR' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#;>|^\/])',
+            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\.])'
+        )
+    ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/arm.php b/vendor/easybook/geshi/geshi/arm.php
new file mode 100755
index 000000000..8e3c0a37e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/arm.php
@@ -0,0 +1,3318 @@
+<?php
+/*************************************************************************************
+ * arm.php
+ * -------
+ * Author: Marat Dukhan (mdukhan3.at.gatech.dot.edu)
+ * Copyright: (c) Marat Dukhan (mdukhan3.at.gatech.dot.edu)
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/10/06
+ *
+ * ARM Assembler language file for GeSHi.
+ * Based on the following documents:
+ *   - "ARM Architecture Reference Manual: ARMv7-A and ARMv7-R edition"
+ *   - "Intel XScale Technology: Intel Wireless MMX2 Coprocessor",
+ *       Revision 1.5, July 2006
+ *
+ * CHANGES
+ * -------
+ * 2011/10/06
+ *   -  First Release (supported UAL syntax for up to ARMv7 A/R, VFPv3, NEON, WMMX/WMMX2)
+ *
+ * TODO (updated 2011/10/06)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ARM ASSEMBLER',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array(),
+    //Line address prefix suppression
+    'COMMENT_REGEXP' => array(
+        2 => "/^(?:[0-9a-f]{0,4}:)?[0-9a-f]{4}(?:[0-9a-f]{4})?/mi"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Unconditional Data Processing Instructions */
+        1 => array(
+            /* Data Processing: Unconditional Addition & Subtraction */
+            'adc.w','adcal.w',
+            'adc','adcal',
+            'add.w','addal.w',
+            'add','addal',
+            'addw','addwal',
+            'rsb.w','rsbal.w',
+            'rsb','rsbal',
+            'rsc','rscal',
+            'sbc.w','sbcal.w',
+            'sbc','sbcal',
+            'sub.w','subal.w',
+            'sub','subal',
+            'neg.w','negal.w',
+            'neg','negal',
+            'adr.w','adral.w',
+            'adr','adral',
+            /* Data Processing: Unconditional Logical */
+            'and.w','andal.w',
+            'and','andal',
+            'bic.w','bical.w',
+            'bic','bical',
+            'orr.w','orral.w',
+            'orr','orral',
+            'orn.w','ornal.w',
+            'orn','ornal',
+            'eor.w','eoral.w',
+            'eor','eoral',
+            'mov.w','moval.w',
+            'mov','moval',
+            'movw','movwal',
+            'movt','movtal',
+            'cpy','cpyal',
+            'mvn.w','mvnal.w',
+            'mvn','mvnal',
+            /* Data Processing: Unconditional Shifts and Rotates */
+            'asr.w','asral.w',
+            'asr','asral',
+            'lsl.w','lslal.w',
+            'lsl','lslal',
+            'lsr.w','lsral.w',
+            'lsr','lsral',
+            'ror.w','roral.w',
+            'ror','roral',
+            'rrx','rrxal',
+            /* Data Processing: Unconditional Word Multiply and Multiply-Add */
+            'mul','mulal',
+            'mla','mlaal',
+            'mls','mlsal',
+            'smull','smullal',
+            'muls','mulsal',
+            'umull','umullal',
+            'smlal','smlalal',
+            'umlal','umlalal',
+            /* Data Processing: Unconditional Halfword Multiply and Multiply-Add (ARMv5TE) */
+            'smulbb','smulbbal',
+            'smulbt','smulbtal',
+            'smultb','smultbal',
+            'smultt','smulttal',
+            'smulwb','smulwbal',
+            'smulwt','smulwtal',
+            'smlalbb','smlalbbal',
+            'smlalbt','smlalbtal',
+            'smlaltb','smlaltbal',
+            'smlaltt','smlalttal',
+            'smlabb','smlabbal',
+            'smlabt','smlabtal',
+            'smlatb','smlatbal',
+            'smlatt','smlattal',
+            'smlawb','smlawbal',
+            'smlawt','smlawtal',
+            /* Data Processing: Unconditional Bit Operations */
+            'ubfx','ubfxal',
+            'sbfx','sbfxal',
+            'bfc','bfcal',
+            'bfi','bfial',
+            'clz','clzal',
+            /* Data Processing: Unconditional Divide (ARMv7-R) */
+            'sdiv','sdival',
+            'udiv','udival'
+            ),
+        /* Conditional Data Processing Instructions */
+        2 => array(
+            /* Data Processing: Conditional Addition & Subtraction */
+            'adceq.w','adcne.w','adccs.w','adchs.w','adccc.w','adclo.w','adcmi.w','adcpl.w','adcvs.w','adcvc.w','adchi.w','adcls.w','adcge.w','adclt.w','adcgt.w','adcle.w',
+            'adceq','adcne','adccs','adchs','adccc','adclo','adcmi','adcpl','adcvs','adcvc','adchi','adcls','adcge','adclt','adcgt','adcle',
+            'addeq.w','addne.w','addcs.w','addhs.w','addcc.w','addlo.w','addmi.w','addpl.w','addvs.w','addvc.w','addhi.w','addls.w','addge.w','addlt.w','addgt.w','addle.w',
+            'addeq','addne','addcs','addhs','addcc','addlo','addmi','addpl','addvs','addvc','addhi','addls','addge','addlt','addgt','addle',
+            'addweq','addwne','addwcs','addwhs','addwcc','addwlo','addwmi','addwpl','addwvs','addwvc','addwhi','addwls','addwge','addwlt','addwgt','addwle',
+            'rsbeq.w','rsbne.w','rsbcs.w','rsbhs.w','rsbcc.w','rsblo.w','rsbmi.w','rsbpl.w','rsbvs.w','rsbvc.w','rsbhi.w','rsbls.w','rsbge.w','rsblt.w','rsbgt.w','rsble.w',
+            'rsbeq','rsbne','rsbcs','rsbhs','rsbcc','rsblo','rsbmi','rsbpl','rsbvs','rsbvc','rsbhi','rsbls','rsbge','rsblt','rsbgt','rsble',
+            'rsceq','rscne','rsccs','rschs','rsccc','rsclo','rscmi','rscpl','rscvs','rscvc','rschi','rscls','rscge','rsclt','rscgt','rscle',
+            'sbceq.w','sbcne.w','sbccs.w','sbchs.w','sbccc.w','sbclo.w','sbcmi.w','sbcpl.w','sbcvs.w','sbcvc.w','sbchi.w','sbcls.w','sbcge.w','sbclt.w','sbcgt.w','sbcle.w',
+            'sbceq','sbcne','sbccs','sbchs','sbccc','sbclo','sbcmi','sbcpl','sbcvs','sbcvc','sbchi','sbcls','sbcge','sbclt','sbcgt','sbcle',
+            'subeq.w','subne.w','subcs.w','subhs.w','subcc.w','sublo.w','submi.w','subpl.w','subvs.w','subvc.w','subhi.w','subls.w','subge.w','sublt.w','subgt.w','suble.w',
+            'subeq','subne','subcs','subhs','subcc','sublo','submi','subpl','subvs','subvc','subhi','subls','subge','sublt','subgt','suble',
+            'negeq.w','negne.w','negcs.w','neghs.w','negcc.w','neglo.w','negmi.w','negpl.w','negvs.w','negvc.w','neghi.w','negls.w','negge.w','neglt.w','neggt.w','negle.w',
+            'negeq','negne','negcs','neghs','negcc','neglo','negmi','negpl','negvs','negvc','neghi','negls','negge','neglt','neggt','negle',
+            'adreq.w','adrne.w','adrcs.w','adrhs.w','adrcc.w','adrlo.w','adrmi.w','adrpl.w','adrvs.w','adrvc.w','adrhi.w','adrls.w','adrge.w','adrlt.w','adrgt.w','adrle.w',
+            'adreq','adrne','adrcs','adrhs','adrcc','adrlo','adrmi','adrpl','adrvs','adrvc','adrhi','adrls','adrge','adrlt','adrgt','adrle',
+            /* Data Processing: Conditional Logical */
+            'andeq.w','andne.w','andcs.w','andhs.w','andcc.w','andlo.w','andmi.w','andpl.w','andvs.w','andvc.w','andhi.w','andls.w','andge.w','andlt.w','andgt.w','andle.w',
+            'andeq','andne','andcs','andhs','andcc','andlo','andmi','andpl','andvs','andvc','andhi','andls','andge','andlt','andgt','andle',
+            'biceq.w','bicne.w','biccs.w','bichs.w','biccc.w','biclo.w','bicmi.w','bicpl.w','bicvs.w','bicvc.w','bichi.w','bicls.w','bicge.w','biclt.w','bicgt.w','bicle.w',
+            'biceq','bicne','biccs','bichs','biccc','biclo','bicmi','bicpl','bicvs','bicvc','bichi','bicls','bicge','biclt','bicgt','bicle',
+            'orreq.w','orrne.w','orrcs.w','orrhs.w','orrcc.w','orrlo.w','orrmi.w','orrpl.w','orrvs.w','orrvc.w','orrhi.w','orrls.w','orrge.w','orrlt.w','orrgt.w','orrle.w',
+            'orreq','orrne','orrcs','orrhs','orrcc','orrlo','orrmi','orrpl','orrvs','orrvc','orrhi','orrls','orrge','orrlt','orrgt','orrle',
+            'orneq.w','ornne.w','orncs.w','ornhs.w','orncc.w','ornlo.w','ornmi.w','ornpl.w','ornvs.w','ornvc.w','ornhi.w','ornls.w','ornge.w','ornlt.w','orngt.w','ornle.w',
+            'orneq','ornne','orncs','ornhs','orncc','ornlo','ornmi','ornpl','ornvs','ornvc','ornhi','ornls','ornge','ornlt','orngt','ornle',
+            'eoreq.w','eorne.w','eorcs.w','eorhs.w','eorcc.w','eorlo.w','eormi.w','eorpl.w','eorvs.w','eorvc.w','eorhi.w','eorls.w','eorge.w','eorlt.w','eorgt.w','eorle.w',
+            'eoreq','eorne','eorcs','eorhs','eorcc','eorlo','eormi','eorpl','eorvs','eorvc','eorhi','eorls','eorge','eorlt','eorgt','eorle',
+            'moveq.w','movne.w','movcs.w','movhs.w','movcc.w','movlo.w','movmi.w','movpl.w','movvs.w','movvc.w','movhi.w','movls.w','movge.w','movlt.w','movgt.w','movle.w',
+            'moveq','movne','movcs','movhs','movcc','movlo','movmi','movpl','movvs','movvc','movhi','movls','movge','movlt','movgt','movle',
+            'movweq','movwne','movwcs','movwhs','movwcc','movwlo','movwmi','movwpl','movwvs','movwvc','movwhi','movwls','movwge','movwlt','movwgt','movwle',
+            'movteq','movtne','movtcs','movths','movtcc','movtlo','movtmi','movtpl','movtvs','movtvc','movthi','movtls','movtge','movtlt','movtgt','movtle',
+            'cpyeq','cpyne','cpycs','cpyhs','cpycc','cpylo','cpymi','cpypl','cpyvs','cpyvc','cpyhi','cpyls','cpyge','cpylt','cpygt','cpyle',
+            'mvneq.w','mvnne.w','mvncs.w','mvnhs.w','mvncc.w','mvnlo.w','mvnmi.w','mvnpl.w','mvnvs.w','mvnvc.w','mvnhi.w','mvnls.w','mvnge.w','mvnlt.w','mvngt.w','mvnle.w',
+            'mvneq','mvnne','mvncs','mvnhs','mvncc','mvnlo','mvnmi','mvnpl','mvnvs','mvnvc','mvnhi','mvnls','mvnge','mvnlt','mvngt','mvnle',
+            /* Data Processing: Conditional Shifts and Rotates */
+            'asreq.w','asrne.w','asrcs.w','asrhs.w','asrcc.w','asrlo.w','asrmi.w','asrpl.w','asrvs.w','asrvc.w','asrhi.w','asrls.w','asrge.w','asrlt.w','asrgt.w','asrle.w',
+            'asreq','asrne','asrcs','asrhs','asrcc','asrlo','asrmi','asrpl','asrvs','asrvc','asrhi','asrls','asrge','asrlt','asrgt','asrle',
+            'lsleq.w','lslne.w','lslcs.w','lslhs.w','lslcc.w','lsllo.w','lslmi.w','lslpl.w','lslvs.w','lslvc.w','lslhi.w','lslls.w','lslge.w','lsllt.w','lslgt.w','lslle.w',
+            'lsleq','lslne','lslcs','lslhs','lslcc','lsllo','lslmi','lslpl','lslvs','lslvc','lslhi','lslls','lslge','lsllt','lslgt','lslle',
+            'lsreq.w','lsrne.w','lsrcs.w','lsrhs.w','lsrcc.w','lsrlo.w','lsrmi.w','lsrpl.w','lsrvs.w','lsrvc.w','lsrhi.w','lsrls.w','lsrge.w','lsrlt.w','lsrgt.w','lsrle.w',
+            'lsreq','lsrne','lsrcs','lsrhs','lsrcc','lsrlo','lsrmi','lsrpl','lsrvs','lsrvc','lsrhi','lsrls','lsrge','lsrlt','lsrgt','lsrle',
+            'roreq.w','rorne.w','rorcs.w','rorhs.w','rorcc.w','rorlo.w','rormi.w','rorpl.w','rorvs.w','rorvc.w','rorhi.w','rorls.w','rorge.w','rorlt.w','rorgt.w','rorle.w',
+            'roreq','rorne','rorcs','rorhs','rorcc','rorlo','rormi','rorpl','rorvs','rorvc','rorhi','rorls','rorge','rorlt','rorgt','rorle',
+            'rrxeq','rrxne','rrxcs','rrxhs','rrxcc','rrxlo','rrxmi','rrxpl','rrxvs','rrxvc','rrxhi','rrxls','rrxge','rrxlt','rrxgt','rrxle',
+            /* Data Processing: Conditional Word Multiply and Multiply-Add */
+            'muleq','mulne','mulcs','mulhs','mulcc','mullo','mulmi','mulpl','mulvs','mulvc','mulhi','mulls','mulge','mullt','mulgt','mulle',
+            'mlaeq','mlane','mlacs','mlahs','mlacc','mlalo','mlami','mlapl','mlavs','mlavc','mlahi','mlals','mlage','mlalt','mlagt','mlale',
+            'mlseq','mlsne','mlscs','mlshs','mlscc','mlslo','mlsmi','mlspl','mlsvs','mlsvc','mlshi','mlsls','mlsge','mlslt','mlsgt','mlsle',
+            'smulleq','smullne','smullcs','smullhs','smullcc','smulllo','smullmi','smullpl','smullvs','smullvc','smullhi','smullls','smullge','smulllt','smullgt','smullle',
+            'mulseq','mulsne','mulscs','mulshs','mulscc','mulslo','mulsmi','mulspl','mulsvs','mulsvc','mulshi','mulsls','mulsge','mulslt','mulsgt','mulsle',
+            'umulleq','umullne','umullcs','umullhs','umullcc','umulllo','umullmi','umullpl','umullvs','umullvc','umullhi','umullls','umullge','umulllt','umullgt','umullle',
+            'smlaleq','smlalne','smlalcs','smlalhs','smlalcc','smlallo','smlalmi','smlalpl','smlalvs','smlalvc','smlalhi','smlalls','smlalge','smlallt','smlalgt','smlalle',
+            'umlaleq','umlalne','umlalcs','umlalhs','umlalcc','umlallo','umlalmi','umlalpl','umlalvs','umlalvc','umlalhi','umlalls','umlalge','umlallt','umlalgt','umlalle',
+            /* Data Processing: Conditional Halfword Multiply and Multiply-Add (ARMv5TE) */
+            'smulbbeq','smulbbne','smulbbcs','smulbbhs','smulbbcc','smulbblo','smulbbmi','smulbbpl','smulbbvs','smulbbvc','smulbbhi','smulbbls','smulbbge','smulbblt','smulbbgt','smulbble',
+            'smulbteq','smulbtne','smulbtcs','smulbths','smulbtcc','smulbtlo','smulbtmi','smulbtpl','smulbtvs','smulbtvc','smulbthi','smulbtls','smulbtge','smulbtlt','smulbtgt','smulbtle',
+            'smultbeq','smultbne','smultbcs','smultbhs','smultbcc','smultblo','smultbmi','smultbpl','smultbvs','smultbvc','smultbhi','smultbls','smultbge','smultblt','smultbgt','smultble',
+            'smultteq','smulttne','smulttcs','smultths','smulttcc','smulttlo','smulttmi','smulttpl','smulttvs','smulttvc','smultthi','smulttls','smulttge','smulttlt','smulttgt','smulttle',
+            'smulwbeq','smulwbne','smulwbcs','smulwbhs','smulwbcc','smulwblo','smulwbmi','smulwbpl','smulwbvs','smulwbvc','smulwbhi','smulwbls','smulwbge','smulwblt','smulwbgt','smulwble',
+            'smulwteq','smulwtne','smulwtcs','smulwths','smulwtcc','smulwtlo','smulwtmi','smulwtpl','smulwtvs','smulwtvc','smulwthi','smulwtls','smulwtge','smulwtlt','smulwtgt','smulwtle',
+            'smlalbbeq','smlalbbne','smlalbbcs','smlalbbhs','smlalbbcc','smlalbblo','smlalbbmi','smlalbbpl','smlalbbvs','smlalbbvc','smlalbbhi','smlalbbls','smlalbbge','smlalbblt','smlalbbgt','smlalbble',
+            'smlalbteq','smlalbtne','smlalbtcs','smlalbths','smlalbtcc','smlalbtlo','smlalbtmi','smlalbtpl','smlalbtvs','smlalbtvc','smlalbthi','smlalbtls','smlalbtge','smlalbtlt','smlalbtgt','smlalbtle',
+            'smlaltbeq','smlaltbne','smlaltbcs','smlaltbhs','smlaltbcc','smlaltblo','smlaltbmi','smlaltbpl','smlaltbvs','smlaltbvc','smlaltbhi','smlaltbls','smlaltbge','smlaltblt','smlaltbgt','smlaltble',
+            'smlaltteq','smlalttne','smlalttcs','smlaltths','smlalttcc','smlalttlo','smlalttmi','smlalttpl','smlalttvs','smlalttvc','smlaltthi','smlalttls','smlalttge','smlalttlt','smlalttgt','smlalttle',
+            'smlabbeq','smlabbne','smlabbcs','smlabbhs','smlabbcc','smlabblo','smlabbmi','smlabbpl','smlabbvs','smlabbvc','smlabbhi','smlabbls','smlabbge','smlabblt','smlabbgt','smlabble',
+            'smlabteq','smlabtne','smlabtcs','smlabths','smlabtcc','smlabtlo','smlabtmi','smlabtpl','smlabtvs','smlabtvc','smlabthi','smlabtls','smlabtge','smlabtlt','smlabtgt','smlabtle',
+            'smlatbeq','smlatbne','smlatbcs','smlatbhs','smlatbcc','smlatblo','smlatbmi','smlatbpl','smlatbvs','smlatbvc','smlatbhi','smlatbls','smlatbge','smlatblt','smlatbgt','smlatble',
+            'smlatteq','smlattne','smlattcs','smlatths','smlattcc','smlattlo','smlattmi','smlattpl','smlattvs','smlattvc','smlatthi','smlattls','smlattge','smlattlt','smlattgt','smlattle',
+            'smlawbeq','smlawbne','smlawbcs','smlawbhs','smlawbcc','smlawblo','smlawbmi','smlawbpl','smlawbvs','smlawbvc','smlawbhi','smlawbls','smlawbge','smlawblt','smlawbgt','smlawble',
+            'smlawteq','smlawtne','smlawtcs','smlawths','smlawtcc','smlawtlo','smlawtmi','smlawtpl','smlawtvs','smlawtvc','smlawthi','smlawtls','smlawtge','smlawtlt','smlawtgt','smlawtle',
+            /* Data Processing: Conditional Bit Operations */
+            'ubfxeq','ubfxne','ubfxcs','ubfxhs','ubfxcc','ubfxlo','ubfxmi','ubfxpl','ubfxvs','ubfxvc','ubfxhi','ubfxls','ubfxge','ubfxlt','ubfxgt','ubfxle',
+            'sbfxeq','sbfxne','sbfxcs','sbfxhs','sbfxcc','sbfxlo','sbfxmi','sbfxpl','sbfxvs','sbfxvc','sbfxhi','sbfxls','sbfxge','sbfxlt','sbfxgt','sbfxle',
+            'bfceq','bfcne','bfccs','bfchs','bfccc','bfclo','bfcmi','bfcpl','bfcvs','bfcvc','bfchi','bfcls','bfcge','bfclt','bfcgt','bfcle',
+            'bfieq','bfine','bfics','bfihs','bficc','bfilo','bfimi','bfipl','bfivs','bfivc','bfihi','bfils','bfige','bfilt','bfigt','bfile',
+            'clzeq','clzne','clzcs','clzhs','clzcc','clzlo','clzmi','clzpl','clzvs','clzvc','clzhi','clzls','clzge','clzlt','clzgt','clzle',
+            /* ARMv7-R: Conditional Divide */
+            'sdiveq','sdivne','sdivcs','sdivhs','sdivcc','sdivlo','sdivmi','sdivpl','sdivvs','sdivvc','sdivhi','sdivls','sdivge','sdivlt','sdivgt','sdivle',
+            'udiveq','udivne','udivcs','udivhs','udivcc','udivlo','udivmi','udivpl','udivvs','udivvc','udivhi','udivls','udivge','udivlt','udivgt','udivle'
+            ),
+        /* Unconditional Memory Access */
+        3 => array(
+            /* Memory Access: Unconditional Memory Loads and Prefetches */
+            'ldm.w','ldmal.w',
+            'ldm','ldmal',
+            'ldmda','ldmdaal',
+            'ldmdb','ldmdbal',
+            'ldmib','ldmibal',
+            'ldmia','ldmiaal',
+            'ldmea','ldmeaal',
+            'ldmed','ldmedal',
+            'ldmfa','ldmfaal',
+            'ldmfd','ldmfdal',
+            'ldrd','ldrdal',
+            'ldr.w','ldral.w',
+            'ldr','ldral',
+            'ldrh.w','ldrhal.w',
+            'ldrh','ldrhal',
+            'ldrb.w','ldrbal.w',
+            'ldrb','ldrbal',
+            'ldrsh.w','ldrshal.w',
+            'ldrsh','ldrshal',
+            'ldrsb.w','ldrsbal.w',
+            'ldrsb','ldrsbal',
+            'ldrt','ldrtal',
+            'ldrht','ldrhtal',
+            'ldrbt','ldrbtal',
+            'ldrsht','ldrshtal',
+            'ldrsbt','ldrsbtal',
+            'pop.w','popal.w',
+            'pop','popal',
+            'pld','pldal',
+            'pldw','pldwal',
+            'pli','plial',
+            /* Memory Access: Unconditional Memory Stores */
+            'stm.w','stmal.w',
+            'stm','stmal',
+            'stmda','stmdaal',
+            'stmdb','stmdbal',
+            'stmib','stmibal',
+            'stmia','stmiaal',
+            'stmea','stmeaal',
+            'stmed','stmedal',
+            'stdfa','stdfaal',
+            'stdfd','stdfdal',
+            'strd','strdal',
+            'str.w','stral.w',
+            'str','stral',
+            'strh.w','strhal.w',
+            'strh','strhal',
+            'strb.w','strbal.w',
+            'strb','strbal',
+            'strt','strtal',
+            'strht','strhtal',
+            'strbt','strbtal',
+            'push.w','pushal.w',
+            'push','pushal'
+            ),
+        /* Conditional Memory Access */
+        4 => array(
+            /* Memory Access: Conditional Memory Loads and Prefetches */
+            'ldmeq.w','ldmne.w','ldmcs.w','ldmhs.w','ldmcc.w','ldmlo.w','ldmmi.w','ldmpl.w','ldmvs.w','ldmvc.w','ldmhi.w','ldmls.w','ldmge.w','ldmlt.w','ldmgt.w','ldmle.w',
+            'ldmeq','ldmne','ldmcs','ldmhs','ldmcc','ldmlo','ldmmi','ldmpl','ldmvs','ldmvc','ldmhi','ldmls','ldmge','ldmlt','ldmgt','ldmle',
+            'ldmdaeq','ldmdane','ldmdacs','ldmdahs','ldmdacc','ldmdalo','ldmdami','ldmdapl','ldmdavs','ldmdavc','ldmdahi','ldmdals','ldmdage','ldmdalt','ldmdagt','ldmdale',
+            'ldmdbeq','ldmdbne','ldmdbcs','ldmdbhs','ldmdbcc','ldmdblo','ldmdbmi','ldmdbpl','ldmdbvs','ldmdbvc','ldmdbhi','ldmdbls','ldmdbge','ldmdblt','ldmdbgt','ldmdble',
+            'ldmibeq','ldmibne','ldmibcs','ldmibhs','ldmibcc','ldmiblo','ldmibmi','ldmibpl','ldmibvs','ldmibvc','ldmibhi','ldmibls','ldmibge','ldmiblt','ldmibgt','ldmible',
+            'ldmiaeq','ldmiane','ldmiacs','ldmiahs','ldmiacc','ldmialo','ldmiami','ldmiapl','ldmiavs','ldmiavc','ldmiahi','ldmials','ldmiage','ldmialt','ldmiagt','ldmiale',
+            'ldmeaeq','ldmeane','ldmeacs','ldmeahs','ldmeacc','ldmealo','ldmeami','ldmeapl','ldmeavs','ldmeavc','ldmeahi','ldmeals','ldmeage','ldmealt','ldmeagt','ldmeale',
+            'ldmedeq','ldmedne','ldmedcs','ldmedhs','ldmedcc','ldmedlo','ldmedmi','ldmedpl','ldmedvs','ldmedvc','ldmedhi','ldmedls','ldmedge','ldmedlt','ldmedgt','ldmedle',
+            'ldmfaeq','ldmfane','ldmfacs','ldmfahs','ldmfacc','ldmfalo','ldmfami','ldmfapl','ldmfavs','ldmfavc','ldmfahi','ldmfals','ldmfage','ldmfalt','ldmfagt','ldmfale',
+            'ldmfdeq','ldmfdne','ldmfdcs','ldmfdhs','ldmfdcc','ldmfdlo','ldmfdmi','ldmfdpl','ldmfdvs','ldmfdvc','ldmfdhi','ldmfdls','ldmfdge','ldmfdlt','ldmfdgt','ldmfdle',
+            'ldrdeq','ldrdne','ldrdcs','ldrdhs','ldrdcc','ldrdlo','ldrdmi','ldrdpl','ldrdvs','ldrdvc','ldrdhi','ldrdls','ldrdge','ldrdlt','ldrdgt','ldrdle',
+            'ldreq.w','ldrne.w','ldrcs.w','ldrhs.w','ldrcc.w','ldrlo.w','ldrmi.w','ldrpl.w','ldrvs.w','ldrvc.w','ldrhi.w','ldrls.w','ldrge.w','ldrlt.w','ldrgt.w','ldrle.w',
+            'ldreq','ldrne','ldrcs','ldrhs','ldrcc','ldrlo','ldrmi','ldrpl','ldrvs','ldrvc','ldrhi','ldrls','ldrge','ldrlt','ldrgt','ldrle',
+            'ldrheq.w','ldrhne.w','ldrhcs.w','ldrhhs.w','ldrhcc.w','ldrhlo.w','ldrhmi.w','ldrhpl.w','ldrhvs.w','ldrhvc.w','ldrhhi.w','ldrhls.w','ldrhge.w','ldrhlt.w','ldrhgt.w','ldrhle.w',
+            'ldrheq','ldrhne','ldrhcs','ldrhhs','ldrhcc','ldrhlo','ldrhmi','ldrhpl','ldrhvs','ldrhvc','ldrhhi','ldrhls','ldrhge','ldrhlt','ldrhgt','ldrhle',
+            'ldrbeq.w','ldrbne.w','ldrbcs.w','ldrbhs.w','ldrbcc.w','ldrblo.w','ldrbmi.w','ldrbpl.w','ldrbvs.w','ldrbvc.w','ldrbhi.w','ldrbls.w','ldrbge.w','ldrblt.w','ldrbgt.w','ldrble.w',
+            'ldrbeq','ldrbne','ldrbcs','ldrbhs','ldrbcc','ldrblo','ldrbmi','ldrbpl','ldrbvs','ldrbvc','ldrbhi','ldrbls','ldrbge','ldrblt','ldrbgt','ldrble',
+            'ldrsheq.w','ldrshne.w','ldrshcs.w','ldrshhs.w','ldrshcc.w','ldrshlo.w','ldrshmi.w','ldrshpl.w','ldrshvs.w','ldrshvc.w','ldrshhi.w','ldrshls.w','ldrshge.w','ldrshlt.w','ldrshgt.w','ldrshle.w',
+            'ldrsheq','ldrshne','ldrshcs','ldrshhs','ldrshcc','ldrshlo','ldrshmi','ldrshpl','ldrshvs','ldrshvc','ldrshhi','ldrshls','ldrshge','ldrshlt','ldrshgt','ldrshle',
+            'ldrsbeq.w','ldrsbne.w','ldrsbcs.w','ldrsbhs.w','ldrsbcc.w','ldrsblo.w','ldrsbmi.w','ldrsbpl.w','ldrsbvs.w','ldrsbvc.w','ldrsbhi.w','ldrsbls.w','ldrsbge.w','ldrsblt.w','ldrsbgt.w','ldrsble.w',
+            'ldrsbeq','ldrsbne','ldrsbcs','ldrsbhs','ldrsbcc','ldrsblo','ldrsbmi','ldrsbpl','ldrsbvs','ldrsbvc','ldrsbhi','ldrsbls','ldrsbge','ldrsblt','ldrsbgt','ldrsble',
+            'ldrteq','ldrtne','ldrtcs','ldrths','ldrtcc','ldrtlo','ldrtmi','ldrtpl','ldrtvs','ldrtvc','ldrthi','ldrtls','ldrtge','ldrtlt','ldrtgt','ldrtle',
+            'ldrhteq','ldrhtne','ldrhtcs','ldrhths','ldrhtcc','ldrhtlo','ldrhtmi','ldrhtpl','ldrhtvs','ldrhtvc','ldrhthi','ldrhtls','ldrhtge','ldrhtlt','ldrhtgt','ldrhtle',
+            'ldrbteq','ldrbtne','ldrbtcs','ldrbths','ldrbtcc','ldrbtlo','ldrbtmi','ldrbtpl','ldrbtvs','ldrbtvc','ldrbthi','ldrbtls','ldrbtge','ldrbtlt','ldrbtgt','ldrbtle',
+            'ldrshteq','ldrshtne','ldrshtcs','ldrshths','ldrshtcc','ldrshtlo','ldrshtmi','ldrshtpl','ldrshtvs','ldrshtvc','ldrshthi','ldrshtls','ldrshtge','ldrshtlt','ldrshtgt','ldrshtle',
+            'ldrsbteq','ldrsbtne','ldrsbtcs','ldrsbths','ldrsbtcc','ldrsbtlo','ldrsbtmi','ldrsbtpl','ldrsbtvs','ldrsbtvc','ldrsbthi','ldrsbtls','ldrsbtge','ldrsbtlt','ldrsbtgt','ldrsbtle',
+            'popeq.w','popne.w','popcs.w','pophs.w','popcc.w','poplo.w','popmi.w','poppl.w','popvs.w','popvc.w','pophi.w','popls.w','popge.w','poplt.w','popgt.w','pople.w',
+            'popeq','popne','popcs','pophs','popcc','poplo','popmi','poppl','popvs','popvc','pophi','popls','popge','poplt','popgt','pople',
+            'pldeq','pldne','pldcs','pldhs','pldcc','pldlo','pldmi','pldpl','pldvs','pldvc','pldhi','pldls','pldge','pldlt','pldgt','pldle',
+            'pldweq','pldwne','pldwcs','pldwhs','pldwcc','pldwlo','pldwmi','pldwpl','pldwvs','pldwvc','pldwhi','pldwls','pldwge','pldwlt','pldwgt','pldwle',
+            'plieq','pline','plics','plihs','plicc','plilo','plimi','plipl','plivs','plivc','plihi','plils','plige','plilt','pligt','plile',
+            /* Memory Access: Conditional Memory Stores */
+            'stmeq.w','stmne.w','stmcs.w','stmhs.w','stmcc.w','stmlo.w','stmmi.w','stmpl.w','stmvs.w','stmvc.w','stmhi.w','stmls.w','stmge.w','stmlt.w','stmgt.w','stmle.w',
+            'stmeq','stmne','stmcs','stmhs','stmcc','stmlo','stmmi','stmpl','stmvs','stmvc','stmhi','stmls','stmge','stmlt','stmgt','stmle',
+            'stmdaeq','stmdane','stmdacs','stmdahs','stmdacc','stmdalo','stmdami','stmdapl','stmdavs','stmdavc','stmdahi','stmdals','stmdage','stmdalt','stmdagt','stmdale',
+            'stmdbeq','stmdbne','stmdbcs','stmdbhs','stmdbcc','stmdblo','stmdbmi','stmdbpl','stmdbvs','stmdbvc','stmdbhi','stmdbls','stmdbge','stmdblt','stmdbgt','stmdble',
+            'stmibeq','stmibne','stmibcs','stmibhs','stmibcc','stmiblo','stmibmi','stmibpl','stmibvs','stmibvc','stmibhi','stmibls','stmibge','stmiblt','stmibgt','stmible',
+            'stmiaeq','stmiane','stmiacs','stmiahs','stmiacc','stmialo','stmiami','stmiapl','stmiavs','stmiavc','stmiahi','stmials','stmiage','stmialt','stmiagt','stmiale',
+            'stmeaeq','stmeane','stmeacs','stmeahs','stmeacc','stmealo','stmeami','stmeapl','stmeavs','stmeavc','stmeahi','stmeals','stmeage','stmealt','stmeagt','stmeale',
+            'stmedeq','stmedne','stmedcs','stmedhs','stmedcc','stmedlo','stmedmi','stmedpl','stmedvs','stmedvc','stmedhi','stmedls','stmedge','stmedlt','stmedgt','stmedle',
+            'stdfaeq','stdfane','stdfacs','stdfahs','stdfacc','stdfalo','stdfami','stdfapl','stdfavs','stdfavc','stdfahi','stdfals','stdfage','stdfalt','stdfagt','stdfale',
+            'stdfdeq','stdfdne','stdfdcs','stdfdhs','stdfdcc','stdfdlo','stdfdmi','stdfdpl','stdfdvs','stdfdvc','stdfdhi','stdfdls','stdfdge','stdfdlt','stdfdgt','stdfdle',
+            'strdeq','strdne','strdcs','strdhs','strdcc','strdlo','strdmi','strdpl','strdvs','strdvc','strdhi','strdls','strdge','strdlt','strdgt','strdle',
+            'streq.w','strne.w','strcs.w','strhs.w','strcc.w','strlo.w','strmi.w','strpl.w','strvs.w','strvc.w','strhi.w','strls.w','strge.w','strlt.w','strgt.w','strle.w',
+            'streq','strne','strcs','strhs','strcc','strlo','strmi','strpl','strvs','strvc','strhi','strls','strge','strlt','strgt','strle',
+            'strheq.w','strhne.w','strhcs.w','strhhs.w','strhcc.w','strhlo.w','strhmi.w','strhpl.w','strhvs.w','strhvc.w','strhhi.w','strhls.w','strhge.w','strhlt.w','strhgt.w','strhle.w',
+            'strheq','strhne','strhcs','strhhs','strhcc','strhlo','strhmi','strhpl','strhvs','strhvc','strhhi','strhls','strhge','strhlt','strhgt','strhle',
+            'strbeq.w','strbne.w','strbcs.w','strbhs.w','strbcc.w','strblo.w','strbmi.w','strbpl.w','strbvs.w','strbvc.w','strbhi.w','strbls.w','strbge.w','strblt.w','strbgt.w','strble.w',
+            'strbeq','strbne','strbcs','strbhs','strbcc','strblo','strbmi','strbpl','strbvs','strbvc','strbhi','strbls','strbge','strblt','strbgt','strble',
+            'strteq','strtne','strtcs','strths','strtcc','strtlo','strtmi','strtpl','strtvs','strtvc','strthi','strtls','strtge','strtlt','strtgt','strtle',
+            'strhteq','strhtne','strhtcs','strhths','strhtcc','strhtlo','strhtmi','strhtpl','strhtvs','strhtvc','strhthi','strhtls','strhtge','strhtlt','strhtgt','strhtle',
+            'strbteq','strbtne','strbtcs','strbths','strbtcc','strbtlo','strbtmi','strbtpl','strbtvs','strbtvc','strbthi','strbtls','strbtge','strbtlt','strbtgt','strbtle',
+            'pusheq.w','pushne.w','pushcs.w','pushhs.w','pushcc.w','pushlo.w','pushmi.w','pushpl.w','pushvs.w','pushvc.w','pushhi.w','pushls.w','pushge.w','pushlt.w','pushgt.w','pushle.w',
+            'pusheq','pushne','pushcs','pushhs','pushcc','pushlo','pushmi','pushpl','pushvs','pushvc','pushhi','pushls','pushge','pushlt','pushgt','pushle'
+            ),
+        /* Unconditional Flags-Affecting Instructions */
+        5 => array(
+            /* Set Flags: Unconditional Addition and Subtraction */
+            'adds.w','addsal.w',
+            'adds','addsal',
+            'subs.w','subsal.w',
+            'subs','subsal',
+            'rsbs.w','rsbsal.w',
+            'rsbs','rsbsal',
+            'negs.w','negsal.w',
+            'negs','negsal',
+            'adcs.w','adcsal.w',
+            'adcs','adcsal',
+            'sbcs.w','sbcsal.w',
+            'sbcs','sbcsal',
+            'rscs','rscsal',
+            'cmp.w','cmpal.w',
+            'cmp','cmpal',
+            'cmn.w','cmnal.w',
+            'cmn','cmnal',
+            /* Set Flags: Unconditional Logical */
+            'ands.w','andsal.w',
+            'ands','andsal',
+            'bics.w','bicsal.w',
+            'bics','bicsal',
+            'orrs.w','orrsal.w',
+            'orrs','orrsal',
+            'orns.w','ornsal.w',
+            'orns','ornsal',
+            'eors.w','eorsal.w',
+            'eors','eorsal',
+            'mvns.w','mvnsal.w',
+            'mvns','mvnsal',
+            'movs.w','movsal.w',
+            'movs','movsal',
+            'teq','teqal',
+            'tst.w','tstal.w',
+            'tst','tstal',
+            'mrs','mrsal',
+            'msr','msral',
+            /* Set Flags: Unconditional Shifts and Rotates */
+            'asrs.w','asrsal.w',
+            'asrs','asrsal',
+            'lsls.w','lslsal.w',
+            'lsls','lslsal',
+            'lsrs.w','lsrsal.w',
+            'lsrs','lsrsal',
+            'rors.w','rorsal.w',
+            'rors','rorsal',
+            'rrxs','rrxsal',
+            /* Set Flags: Unconditional Multiply and Multiply-Add */
+            'mlas','mlasal',
+            'smulls','smullsal',
+            'umulls','umullsal',
+            'smlals','smlalsal',
+            'umlals','umlalsal'
+            ),
+        /* Conditional Flags-Affecting Instructions */
+        6 => array(
+            /* Set Flags: Conditional Addition and Subtraction */
+            'addseq.w','addsne.w','addscs.w','addshs.w','addscc.w','addslo.w','addsmi.w','addspl.w','addsvs.w','addsvc.w','addshi.w','addsls.w','addsge.w','addslt.w','addsgt.w','addsle.w',
+            'addseq','addsne','addscs','addshs','addscc','addslo','addsmi','addspl','addsvs','addsvc','addshi','addsls','addsge','addslt','addsgt','addsle',
+            'subseq.w','subsne.w','subscs.w','subshs.w','subscc.w','subslo.w','subsmi.w','subspl.w','subsvs.w','subsvc.w','subshi.w','subsls.w','subsge.w','subslt.w','subsgt.w','subsle.w',
+            'subseq','subsne','subscs','subshs','subscc','subslo','subsmi','subspl','subsvs','subsvc','subshi','subsls','subsge','subslt','subsgt','subsle',
+            'rsbseq.w','rsbsne.w','rsbscs.w','rsbshs.w','rsbscc.w','rsbslo.w','rsbsmi.w','rsbspl.w','rsbsvs.w','rsbsvc.w','rsbshi.w','rsbsls.w','rsbsge.w','rsbslt.w','rsbsgt.w','rsbsle.w',
+            'rsbseq','rsbsne','rsbscs','rsbshs','rsbscc','rsbslo','rsbsmi','rsbspl','rsbsvs','rsbsvc','rsbshi','rsbsls','rsbsge','rsbslt','rsbsgt','rsbsle',
+            'negseq.w','negsne.w','negscs.w','negshs.w','negscc.w','negslo.w','negsmi.w','negspl.w','negsvs.w','negsvc.w','negshi.w','negsls.w','negsge.w','negslt.w','negsgt.w','negsle.w',
+            'negseq','negsne','negscs','negshs','negscc','negslo','negsmi','negspl','negsvs','negsvc','negshi','negsls','negsge','negslt','negsgt','negsle',
+            'adcseq.w','adcsne.w','adcscs.w','adcshs.w','adcscc.w','adcslo.w','adcsmi.w','adcspl.w','adcsvs.w','adcsvc.w','adcshi.w','adcsls.w','adcsge.w','adcslt.w','adcsgt.w','adcsle.w',
+            'adcseq','adcsne','adcscs','adcshs','adcscc','adcslo','adcsmi','adcspl','adcsvs','adcsvc','adcshi','adcsls','adcsge','adcslt','adcsgt','adcsle',
+            'sbcseq.w','sbcsne.w','sbcscs.w','sbcshs.w','sbcscc.w','sbcslo.w','sbcsmi.w','sbcspl.w','sbcsvs.w','sbcsvc.w','sbcshi.w','sbcsls.w','sbcsge.w','sbcslt.w','sbcsgt.w','sbcsle.w',
+            'sbcseq','sbcsne','sbcscs','sbcshs','sbcscc','sbcslo','sbcsmi','sbcspl','sbcsvs','sbcsvc','sbcshi','sbcsls','sbcsge','sbcslt','sbcsgt','sbcsle',
+            'rscseq','rscsne','rscscs','rscshs','rscscc','rscslo','rscsmi','rscspl','rscsvs','rscsvc','rscshi','rscsls','rscsge','rscslt','rscsgt','rscsle',
+            'cmpeq.w','cmpne.w','cmpcs.w','cmphs.w','cmpcc.w','cmplo.w','cmpmi.w','cmppl.w','cmpvs.w','cmpvc.w','cmphi.w','cmpls.w','cmpge.w','cmplt.w','cmpgt.w','cmple.w',
+            'cmpeq','cmpne','cmpcs','cmphs','cmpcc','cmplo','cmpmi','cmppl','cmpvs','cmpvc','cmphi','cmpls','cmpge','cmplt','cmpgt','cmple',
+            'cmneq.w','cmnne.w','cmncs.w','cmnhs.w','cmncc.w','cmnlo.w','cmnmi.w','cmnpl.w','cmnvs.w','cmnvc.w','cmnhi.w','cmnls.w','cmnge.w','cmnlt.w','cmngt.w','cmnle.w',
+            'cmneq','cmnne','cmncs','cmnhs','cmncc','cmnlo','cmnmi','cmnpl','cmnvs','cmnvc','cmnhi','cmnls','cmnge','cmnlt','cmngt','cmnle',
+            /* Set Flags: Conditional Logical */
+            'andseq.w','andsne.w','andscs.w','andshs.w','andscc.w','andslo.w','andsmi.w','andspl.w','andsvs.w','andsvc.w','andshi.w','andsls.w','andsge.w','andslt.w','andsgt.w','andsle.w',
+            'andseq','andsne','andscs','andshs','andscc','andslo','andsmi','andspl','andsvs','andsvc','andshi','andsls','andsge','andslt','andsgt','andsle',
+            'bicseq.w','bicsne.w','bicscs.w','bicshs.w','bicscc.w','bicslo.w','bicsmi.w','bicspl.w','bicsvs.w','bicsvc.w','bicshi.w','bicsls.w','bicsge.w','bicslt.w','bicsgt.w','bicsle.w',
+            'bicseq','bicsne','bicscs','bicshs','bicscc','bicslo','bicsmi','bicspl','bicsvs','bicsvc','bicshi','bicsls','bicsge','bicslt','bicsgt','bicsle',
+            'orrseq.w','orrsne.w','orrscs.w','orrshs.w','orrscc.w','orrslo.w','orrsmi.w','orrspl.w','orrsvs.w','orrsvc.w','orrshi.w','orrsls.w','orrsge.w','orrslt.w','orrsgt.w','orrsle.w',
+            'orrseq','orrsne','orrscs','orrshs','orrscc','orrslo','orrsmi','orrspl','orrsvs','orrsvc','orrshi','orrsls','orrsge','orrslt','orrsgt','orrsle',
+            'ornseq.w','ornsne.w','ornscs.w','ornshs.w','ornscc.w','ornslo.w','ornsmi.w','ornspl.w','ornsvs.w','ornsvc.w','ornshi.w','ornsls.w','ornsge.w','ornslt.w','ornsgt.w','ornsle.w',
+            'ornseq','ornsne','ornscs','ornshs','ornscc','ornslo','ornsmi','ornspl','ornsvs','ornsvc','ornshi','ornsls','ornsge','ornslt','ornsgt','ornsle',
+            'eorseq.w','eorsne.w','eorscs.w','eorshs.w','eorscc.w','eorslo.w','eorsmi.w','eorspl.w','eorsvs.w','eorsvc.w','eorshi.w','eorsls.w','eorsge.w','eorslt.w','eorsgt.w','eorsle.w',
+            'eorseq','eorsne','eorscs','eorshs','eorscc','eorslo','eorsmi','eorspl','eorsvs','eorsvc','eorshi','eorsls','eorsge','eorslt','eorsgt','eorsle',
+            'mvnseq.w','mvnsne.w','mvnscs.w','mvnshs.w','mvnscc.w','mvnslo.w','mvnsmi.w','mvnspl.w','mvnsvs.w','mvnsvc.w','mvnshi.w','mvnsls.w','mvnsge.w','mvnslt.w','mvnsgt.w','mvnsle.w',
+            'mvnseq','mvnsne','mvnscs','mvnshs','mvnscc','mvnslo','mvnsmi','mvnspl','mvnsvs','mvnsvc','mvnshi','mvnsls','mvnsge','mvnslt','mvnsgt','mvnsle',
+            'movseq.w','movsne.w','movscs.w','movshs.w','movscc.w','movslo.w','movsmi.w','movspl.w','movsvs.w','movsvc.w','movshi.w','movsls.w','movsge.w','movslt.w','movsgt.w','movsle.w',
+            'movseq','movsne','movscs','movshs','movscc','movslo','movsmi','movspl','movsvs','movsvc','movshi','movsls','movsge','movslt','movsgt','movsle',
+            'teqeq','teqne','teqcs','teqhs','teqcc','teqlo','teqmi','teqpl','teqvs','teqvc','teqhi','teqls','teqge','teqlt','teqgt','teqle',
+            'tsteq.w','tstne.w','tstcs.w','tsths.w','tstcc.w','tstlo.w','tstmi.w','tstpl.w','tstvs.w','tstvc.w','tsthi.w','tstls.w','tstge.w','tstlt.w','tstgt.w','tstle.w',
+            'tsteq','tstne','tstcs','tsths','tstcc','tstlo','tstmi','tstpl','tstvs','tstvc','tsthi','tstls','tstge','tstlt','tstgt','tstle',
+            'mrseq','mrsne','mrscs','mrshs','mrscc','mrslo','mrsmi','mrspl','mrsvs','mrsvc','mrshi','mrsls','mrsge','mrslt','mrsgt','mrsle',
+            'msreq','msrne','msrcs','msrhs','msrcc','msrlo','msrmi','msrpl','msrvs','msrvc','msrhi','msrls','msrge','msrlt','msrgt','msrle',
+            /* Set Flags: Conditional Shifts and Rotates */
+            'asrseq.w','asrsne.w','asrscs.w','asrshs.w','asrscc.w','asrslo.w','asrsmi.w','asrspl.w','asrsvs.w','asrsvc.w','asrshi.w','asrsls.w','asrsge.w','asrslt.w','asrsgt.w','asrsle.w',
+            'asrseq','asrsne','asrscs','asrshs','asrscc','asrslo','asrsmi','asrspl','asrsvs','asrsvc','asrshi','asrsls','asrsge','asrslt','asrsgt','asrsle',
+            'lslseq.w','lslsne.w','lslscs.w','lslshs.w','lslscc.w','lslslo.w','lslsmi.w','lslspl.w','lslsvs.w','lslsvc.w','lslshi.w','lslsls.w','lslsge.w','lslslt.w','lslsgt.w','lslsle.w',
+            'lslseq','lslsne','lslscs','lslshs','lslscc','lslslo','lslsmi','lslspl','lslsvs','lslsvc','lslshi','lslsls','lslsge','lslslt','lslsgt','lslsle',
+            'lsrseq.w','lsrsne.w','lsrscs.w','lsrshs.w','lsrscc.w','lsrslo.w','lsrsmi.w','lsrspl.w','lsrsvs.w','lsrsvc.w','lsrshi.w','lsrsls.w','lsrsge.w','lsrslt.w','lsrsgt.w','lsrsle.w',
+            'lsrseq','lsrsne','lsrscs','lsrshs','lsrscc','lsrslo','lsrsmi','lsrspl','lsrsvs','lsrsvc','lsrshi','lsrsls','lsrsge','lsrslt','lsrsgt','lsrsle',
+            'rorseq.w','rorsne.w','rorscs.w','rorshs.w','rorscc.w','rorslo.w','rorsmi.w','rorspl.w','rorsvs.w','rorsvc.w','rorshi.w','rorsls.w','rorsge.w','rorslt.w','rorsgt.w','rorsle.w',
+            'rorseq','rorsne','rorscs','rorshs','rorscc','rorslo','rorsmi','rorspl','rorsvs','rorsvc','rorshi','rorsls','rorsge','rorslt','rorsgt','rorsle',
+            'rrxseq','rrxsne','rrxscs','rrxshs','rrxscc','rrxslo','rrxsmi','rrxspl','rrxsvs','rrxsvc','rrxshi','rrxsls','rrxsge','rrxslt','rrxsgt','rrxsle',
+            /* Set Flags: Conditional Multiply and Multiply-Add */
+            'mlaseq','mlasne','mlascs','mlashs','mlascc','mlaslo','mlasmi','mlaspl','mlasvs','mlasvc','mlashi','mlasls','mlasge','mlaslt','mlasgt','mlasle',
+            'smullseq','smullsne','smullscs','smullshs','smullscc','smullslo','smullsmi','smullspl','smullsvs','smullsvc','smullshi','smullsls','smullsge','smullslt','smullsgt','smullsle',
+            'umullseq','umullsne','umullscs','umullshs','umullscc','umullslo','umullsmi','umullspl','umullsvs','umullsvc','umullshi','umullsls','umullsge','umullslt','umullsgt','umullsle',
+            'smlalseq','smlalsne','smlalscs','smlalshs','smlalscc','smlalslo','smlalsmi','smlalspl','smlalsvs','smlalsvc','smlalshi','smlalsls','smlalsge','smlalslt','smlalsgt','smlalsle',
+            'umlalseq','umlalsne','umlalscs','umlalshs','umlalscc','umlalslo','umlalsmi','umlalspl','umlalsvs','umlalsvc','umlalshi','umlalsls','umlalsge','umlalslt','umlalsgt','umlalsle'
+            ),
+        /* Unconditional Flow Control Instructions */
+        7 => array(
+            /* Flow Control: Unconditional Branch and If-Then-Else */
+            'b.w','bal.w',
+            'b','bal',
+            'bl','blal',
+            'bx','bxal',
+            'blx','blxal',
+            'bxj','bxjal',
+            'cbnz',
+            'cbz',
+            'tbb','tbbal',
+            'tbh','tbhal',
+            'it',
+            'itt',
+            'ite',
+            'ittt',
+            'itet',
+            'itte',
+            'itee',
+            'itttt',
+            'itett',
+            'ittet',
+            'iteet',
+            'ittte',
+            'itete',
+            'ittee',
+            'iteee'
+            ),
+        /* Conditional Flow Control Instructions */
+        8 => array(
+            /* Flow Control: Conditional Branch and If-Then-Else */
+            'beq.w','bne.w','bcs.w','bhs.w','bcc.w','blo.w','bmi.w','bpl.w','bvs.w','bvc.w','bhi.w','bls.w','bge.w','blt.w','bgt.w','ble.w',
+            'beq','bne','bcs','bhs','bcc','blo','bmi','bpl','bvs','bvc','bhi','bls','bge','blt','bgt','ble',
+            'bleq','blne','blcs','blhs','blcc','bllo','blmi','blpl','blvs','blvc','blhi','blls','blge','bllt','blgt','blle',
+            'bxeq','bxne','bxcs','bxhs','bxcc','bxlo','bxmi','bxpl','bxvs','bxvc','bxhi','bxls','bxge','bxlt','bxgt','bxle',
+            'blxeq','blxne','blxcs','blxhs','blxcc','blxlo','blxmi','blxpl','blxvs','blxvc','blxhi','blxls','blxge','blxlt','blxgt','blxle',
+            'bxjeq','bxjne','bxjcs','bxjhs','bxjcc','bxjlo','bxjmi','bxjpl','bxjvs','bxjvc','bxjhi','bxjls','bxjge','bxjlt','bxjgt','bxjle',
+            'tbbeq','tbbne','tbbcs','tbbhs','tbbcc','tbblo','tbbmi','tbbpl','tbbvs','tbbvc','tbbhi','tbbls','tbbge','tbblt','tbbgt','tbble',
+            'tbheq','tbhne','tbhcs','tbhhs','tbhcc','tbhlo','tbhmi','tbhpl','tbhvs','tbhvc','tbhhi','tbhls','tbhge','tbhlt','tbhgt','tbhle'
+            ),
+        /* Unconditional Syncronization Instructions */
+        9 => array(
+            /* Synchronization: Unconditional Loads, Stores and Barriers */
+            'ldrexd','ldrexdal',
+            'ldrex','ldrexal',
+            'ldrexh','ldrexhal',
+            'ldrexb','ldrexbal',
+            'strexd','strexdal',
+            'strex','strexal',
+            'strexh','strexhal',
+            'strexb','strexbal',
+            'clrex','clrexal',
+            'swp','swpal',
+            'swpb','swpbal',
+            'dbc','dbcal',
+            'dsb','dsbal',
+            'isb','isbal',
+            'yield.w','yieldal.w',
+            'yield','yieldal',
+            'nop.w','nopal.w',
+            'nop','nopal'
+            ),
+        /* Conditional Syncronization Instructions */
+        10 => array(
+            /* Synchronization: Conditional Loads, Stores and Barriers */
+            'ldrexdeq','ldrexdne','ldrexdcs','ldrexdhs','ldrexdcc','ldrexdlo','ldrexdmi','ldrexdpl','ldrexdvs','ldrexdvc','ldrexdhi','ldrexdls','ldrexdge','ldrexdlt','ldrexdgt','ldrexdle',
+            'ldrexeq','ldrexne','ldrexcs','ldrexhs','ldrexcc','ldrexlo','ldrexmi','ldrexpl','ldrexvs','ldrexvc','ldrexhi','ldrexls','ldrexge','ldrexlt','ldrexgt','ldrexle',
+            'ldrexheq','ldrexhne','ldrexhcs','ldrexhhs','ldrexhcc','ldrexhlo','ldrexhmi','ldrexhpl','ldrexhvs','ldrexhvc','ldrexhhi','ldrexhls','ldrexhge','ldrexhlt','ldrexhgt','ldrexhle',
+            'ldrexbeq','ldrexbne','ldrexbcs','ldrexbhs','ldrexbcc','ldrexblo','ldrexbmi','ldrexbpl','ldrexbvs','ldrexbvc','ldrexbhi','ldrexbls','ldrexbge','ldrexblt','ldrexbgt','ldrexble',
+            'strexdeq','strexdne','strexdcs','strexdhs','strexdcc','strexdlo','strexdmi','strexdpl','strexdvs','strexdvc','strexdhi','strexdls','strexdge','strexdlt','strexdgt','strexdle',
+            'strexeq','strexne','strexcs','strexhs','strexcc','strexlo','strexmi','strexpl','strexvs','strexvc','strexhi','strexls','strexge','strexlt','strexgt','strexle',
+            'strexheq','strexhne','strexhcs','strexhhs','strexhcc','strexhlo','strexhmi','strexhpl','strexhvs','strexhvc','strexhhi','strexhls','strexhge','strexhlt','strexhgt','strexhle',
+            'strexbeq','strexbne','strexbcs','strexbhs','strexbcc','strexblo','strexbmi','strexbpl','strexbvs','strexbvc','strexbhi','strexbls','strexbge','strexblt','strexbgt','strexble',
+            'clrexeq','clrexne','clrexcs','clrexhs','clrexcc','clrexlo','clrexmi','clrexpl','clrexvs','clrexvc','clrexhi','clrexls','clrexge','clrexlt','clrexgt','clrexle',
+            'swpeq','swpne','swpcs','swphs','swpcc','swplo','swpmi','swppl','swpvs','swpvc','swphi','swpls','swpge','swplt','swpgt','swple',
+            'swpbeq','swpbne','swpbcs','swpbhs','swpbcc','swpblo','swpbmi','swpbpl','swpbvs','swpbvc','swpbhi','swpbls','swpbge','swpblt','swpbgt','swpble',
+            'dbceq','dbcne','dbccs','dbchs','dbccc','dbclo','dbcmi','dbcpl','dbcvs','dbcvc','dbchi','dbcls','dbcge','dbclt','dbcgt','dbcle',
+            'dsbeq','dsbne','dsbcs','dsbhs','dsbcc','dsblo','dsbmi','dsbpl','dsbvs','dsbvc','dsbhi','dsbls','dsbge','dsblt','dsbgt','dsble',
+            'isbeq','isbne','isbcs','isbhs','isbcc','isblo','isbmi','isbpl','isbvs','isbvc','isbhi','isbls','isbge','isblt','isbgt','isble',
+            'yieldeq.w','yieldne.w','yieldcs.w','yieldhs.w','yieldcc.w','yieldlo.w','yieldmi.w','yieldpl.w','yieldvs.w','yieldvc.w','yieldhi.w','yieldls.w','yieldge.w','yieldlt.w','yieldgt.w','yieldle.w',
+            'yieldeq','yieldne','yieldcs','yieldhs','yieldcc','yieldlo','yieldmi','yieldpl','yieldvs','yieldvc','yieldhi','yieldls','yieldge','yieldlt','yieldgt','yieldle',
+            'nopeq.w','nopne.w','nopcs.w','nophs.w','nopcc.w','noplo.w','nopmi.w','noppl.w','nopvs.w','nopvc.w','nophi.w','nopls.w','nopge.w','noplt.w','nopgt.w','nople.w',
+            'nopeq','nopne','nopcs','nophs','nopcc','noplo','nopmi','noppl','nopvs','nopvc','nophi','nopls','nopge','noplt','nopgt','nople'
+            ),
+        /* Unconditional ARMv6 SIMD */
+        11 => array(
+            /* ARMv6 SIMD: Unconditional Addition, Subtraction & Saturation */
+            'sadd16','sadd16al',
+            'sadd8','sadd8al',
+            'uadd16','uadd16al',
+            'uadd8','uadd8al',
+            'ssub16','ssub16al',
+            'ssub8','ssub8al',
+            'usub16','usub16al',
+            'usub8','usub8al',
+            'sasx','sasxal',
+            'ssax','ssaxal',
+            'uasx','uasxal',
+            'usax','usaxal',
+            'usad8','usad8al',
+            'usada8','usada8al',
+            /* ARMv6 SIMD: Unconditional Halving Addition & Subtraction */
+            'shadd16','shadd16al',
+            'shadd8','shadd8al',
+            'uhadd16','uhadd16al',
+            'uhadd8','uhadd8al',
+            'shsub16','shsub16al',
+            'shsub8','shsub8al',
+            'uhsub16','uhsub16al',
+            'uhsub8','uhsub8al',
+            'shasx','shasxal',
+            'shsax','shsaxal',
+            'uhasx','uhasxal',
+            'uhsax','uhsaxal',
+            /* ARMv6 SIMD: Unconditional Saturating Operations */
+            'qadd','qaddal',
+            'qadd16','qadd16al',
+            'qadd8','qadd8al',
+            'uqadd16','uqadd16al',
+            'uqadd8','uqadd8al',
+            'qsub','qsubal',
+            'qsub16','qsub16al',
+            'qsub8','qsub8al',
+            'uqsub16','uqsub16al',
+            'uqsub8','uqsub8al',
+            'qasx','qasxal',
+            'qsax','qsaxal',
+            'uqasx','uqasxal',
+            'uqsax','uqsaxal',
+            'qdadd','qdaddal',
+            'qdsub','qdsubal',
+            'ssat','ssatal',
+            'ssat16','ssat16al',
+            'usat','usatal',
+            'usat16','usat16al',
+            /* ARMv6 SIMD: Unconditional Permutation and Combine Operations */
+            'sxtah','sxtahal',
+            'sxtab','sxtabal',
+            'sxtab16','sxtab16al',
+            'uxtah','uxtahal',
+            'uxtab','uxtabal',
+            'uxtab16','uxtab16al',
+            'sxth.w','sxthal.w',
+            'sxth','sxthal',
+            'sxtb.w','sxtbal.w',
+            'sxtb','sxtbal',
+            'sxtb16','sxtb16al',
+            'uxth.w','uxthal.w',
+            'uxth','uxthal',
+            'uxtb.w','uxtbal.w',
+            'uxtb','uxtbal',
+            'uxtb16','uxtb16al',
+            'pkhbt','pkhbtal',
+            'pkhtb','pkhtbal',
+            'rbit','rbital',
+            'rev.w','reval.w',
+            'rev','reval',
+            'rev16.w','rev16al.w',
+            'rev16','rev16al',
+            'revsh.w','revshal.w',
+            'revsh','revshal',
+            'sel','selal',
+            /* ARMv6 SIMD: Unconditional Multiply and Multiply-Add */
+            'smlad','smladal',
+            'smladx','smladxal',
+            'smlsd','smlsdal',
+            'smlsdx','smlsdxal',
+            'smlald','smlaldal',
+            'smlaldx','smlaldxal',
+            'smlsld','smlsldal',
+            'smlsldx','smlsldxal',
+            'smmul','smmulal',
+            'smmulr','smmulral',
+            'smmla','smmlaal',
+            'smmlar','smmlaral',
+            'smmls','smmlsal',
+            'smmlsr','smmlsral',
+            'smuad','smuadal',
+            'smuadx','smuadxal',
+            'smusd','smusdal',
+            'smusdx','smusdxal',
+            'umaal','umaalal'
+            ),
+        /* Conditional ARMv6 SIMD */
+        12 => array(
+            /* ARMv6 SIMD: Conditional Addition, Subtraction & Saturation */
+            'sadd16eq','sadd16ne','sadd16cs','sadd16hs','sadd16cc','sadd16lo','sadd16mi','sadd16pl','sadd16vs','sadd16vc','sadd16hi','sadd16ls','sadd16ge','sadd16lt','sadd16gt','sadd16le',
+            'sadd8eq','sadd8ne','sadd8cs','sadd8hs','sadd8cc','sadd8lo','sadd8mi','sadd8pl','sadd8vs','sadd8vc','sadd8hi','sadd8ls','sadd8ge','sadd8lt','sadd8gt','sadd8le',
+            'uadd16eq','uadd16ne','uadd16cs','uadd16hs','uadd16cc','uadd16lo','uadd16mi','uadd16pl','uadd16vs','uadd16vc','uadd16hi','uadd16ls','uadd16ge','uadd16lt','uadd16gt','uadd16le',
+            'uadd8eq','uadd8ne','uadd8cs','uadd8hs','uadd8cc','uadd8lo','uadd8mi','uadd8pl','uadd8vs','uadd8vc','uadd8hi','uadd8ls','uadd8ge','uadd8lt','uadd8gt','uadd8le',
+            'ssub16eq','ssub16ne','ssub16cs','ssub16hs','ssub16cc','ssub16lo','ssub16mi','ssub16pl','ssub16vs','ssub16vc','ssub16hi','ssub16ls','ssub16ge','ssub16lt','ssub16gt','ssub16le',
+            'ssub8eq','ssub8ne','ssub8cs','ssub8hs','ssub8cc','ssub8lo','ssub8mi','ssub8pl','ssub8vs','ssub8vc','ssub8hi','ssub8ls','ssub8ge','ssub8lt','ssub8gt','ssub8le',
+            'usub16eq','usub16ne','usub16cs','usub16hs','usub16cc','usub16lo','usub16mi','usub16pl','usub16vs','usub16vc','usub16hi','usub16ls','usub16ge','usub16lt','usub16gt','usub16le',
+            'usub8eq','usub8ne','usub8cs','usub8hs','usub8cc','usub8lo','usub8mi','usub8pl','usub8vs','usub8vc','usub8hi','usub8ls','usub8ge','usub8lt','usub8gt','usub8le',
+            'sasxeq','sasxne','sasxcs','sasxhs','sasxcc','sasxlo','sasxmi','sasxpl','sasxvs','sasxvc','sasxhi','sasxls','sasxge','sasxlt','sasxgt','sasxle',
+            'ssaxeq','ssaxne','ssaxcs','ssaxhs','ssaxcc','ssaxlo','ssaxmi','ssaxpl','ssaxvs','ssaxvc','ssaxhi','ssaxls','ssaxge','ssaxlt','ssaxgt','ssaxle',
+            'uasxeq','uasxne','uasxcs','uasxhs','uasxcc','uasxlo','uasxmi','uasxpl','uasxvs','uasxvc','uasxhi','uasxls','uasxge','uasxlt','uasxgt','uasxle',
+            'usaxeq','usaxne','usaxcs','usaxhs','usaxcc','usaxlo','usaxmi','usaxpl','usaxvs','usaxvc','usaxhi','usaxls','usaxge','usaxlt','usaxgt','usaxle',
+            'usad8eq','usad8ne','usad8cs','usad8hs','usad8cc','usad8lo','usad8mi','usad8pl','usad8vs','usad8vc','usad8hi','usad8ls','usad8ge','usad8lt','usad8gt','usad8le',
+            'usada8eq','usada8ne','usada8cs','usada8hs','usada8cc','usada8lo','usada8mi','usada8pl','usada8vs','usada8vc','usada8hi','usada8ls','usada8ge','usada8lt','usada8gt','usada8le',
+            /* ARMv6 SIMD: Conditional Halving Addition & Subtraction */
+            'shadd16eq','shadd16ne','shadd16cs','shadd16hs','shadd16cc','shadd16lo','shadd16mi','shadd16pl','shadd16vs','shadd16vc','shadd16hi','shadd16ls','shadd16ge','shadd16lt','shadd16gt','shadd16le',
+            'shadd8eq','shadd8ne','shadd8cs','shadd8hs','shadd8cc','shadd8lo','shadd8mi','shadd8pl','shadd8vs','shadd8vc','shadd8hi','shadd8ls','shadd8ge','shadd8lt','shadd8gt','shadd8le',
+            'uhadd16eq','uhadd16ne','uhadd16cs','uhadd16hs','uhadd16cc','uhadd16lo','uhadd16mi','uhadd16pl','uhadd16vs','uhadd16vc','uhadd16hi','uhadd16ls','uhadd16ge','uhadd16lt','uhadd16gt','uhadd16le',
+            'uhadd8eq','uhadd8ne','uhadd8cs','uhadd8hs','uhadd8cc','uhadd8lo','uhadd8mi','uhadd8pl','uhadd8vs','uhadd8vc','uhadd8hi','uhadd8ls','uhadd8ge','uhadd8lt','uhadd8gt','uhadd8le',
+            'shsub16eq','shsub16ne','shsub16cs','shsub16hs','shsub16cc','shsub16lo','shsub16mi','shsub16pl','shsub16vs','shsub16vc','shsub16hi','shsub16ls','shsub16ge','shsub16lt','shsub16gt','shsub16le',
+            'shsub8eq','shsub8ne','shsub8cs','shsub8hs','shsub8cc','shsub8lo','shsub8mi','shsub8pl','shsub8vs','shsub8vc','shsub8hi','shsub8ls','shsub8ge','shsub8lt','shsub8gt','shsub8le',
+            'uhsub16eq','uhsub16ne','uhsub16cs','uhsub16hs','uhsub16cc','uhsub16lo','uhsub16mi','uhsub16pl','uhsub16vs','uhsub16vc','uhsub16hi','uhsub16ls','uhsub16ge','uhsub16lt','uhsub16gt','uhsub16le',
+            'uhsub8eq','uhsub8ne','uhsub8cs','uhsub8hs','uhsub8cc','uhsub8lo','uhsub8mi','uhsub8pl','uhsub8vs','uhsub8vc','uhsub8hi','uhsub8ls','uhsub8ge','uhsub8lt','uhsub8gt','uhsub8le',
+            'shasxeq','shasxne','shasxcs','shasxhs','shasxcc','shasxlo','shasxmi','shasxpl','shasxvs','shasxvc','shasxhi','shasxls','shasxge','shasxlt','shasxgt','shasxle',
+            'shsaxeq','shsaxne','shsaxcs','shsaxhs','shsaxcc','shsaxlo','shsaxmi','shsaxpl','shsaxvs','shsaxvc','shsaxhi','shsaxls','shsaxge','shsaxlt','shsaxgt','shsaxle',
+            'uhasxeq','uhasxne','uhasxcs','uhasxhs','uhasxcc','uhasxlo','uhasxmi','uhasxpl','uhasxvs','uhasxvc','uhasxhi','uhasxls','uhasxge','uhasxlt','uhasxgt','uhasxle',
+            'uhsaxeq','uhsaxne','uhsaxcs','uhsaxhs','uhsaxcc','uhsaxlo','uhsaxmi','uhsaxpl','uhsaxvs','uhsaxvc','uhsaxhi','uhsaxls','uhsaxge','uhsaxlt','uhsaxgt','uhsaxle',
+            /* ARMv6 SIMD: Conditional Saturating Operations */
+            'qaddeq','qaddne','qaddcs','qaddhs','qaddcc','qaddlo','qaddmi','qaddpl','qaddvs','qaddvc','qaddhi','qaddls','qaddge','qaddlt','qaddgt','qaddle',
+            'qadd16eq','qadd16ne','qadd16cs','qadd16hs','qadd16cc','qadd16lo','qadd16mi','qadd16pl','qadd16vs','qadd16vc','qadd16hi','qadd16ls','qadd16ge','qadd16lt','qadd16gt','qadd16le',
+            'qadd8eq','qadd8ne','qadd8cs','qadd8hs','qadd8cc','qadd8lo','qadd8mi','qadd8pl','qadd8vs','qadd8vc','qadd8hi','qadd8ls','qadd8ge','qadd8lt','qadd8gt','qadd8le',
+            'uqadd16eq','uqadd16ne','uqadd16cs','uqadd16hs','uqadd16cc','uqadd16lo','uqadd16mi','uqadd16pl','uqadd16vs','uqadd16vc','uqadd16hi','uqadd16ls','uqadd16ge','uqadd16lt','uqadd16gt','uqadd16le',
+            'uqadd8eq','uqadd8ne','uqadd8cs','uqadd8hs','uqadd8cc','uqadd8lo','uqadd8mi','uqadd8pl','uqadd8vs','uqadd8vc','uqadd8hi','uqadd8ls','uqadd8ge','uqadd8lt','uqadd8gt','uqadd8le',
+            'qsubeq','qsubne','qsubcs','qsubhs','qsubcc','qsublo','qsubmi','qsubpl','qsubvs','qsubvc','qsubhi','qsubls','qsubge','qsublt','qsubgt','qsuble',
+            'qsub16eq','qsub16ne','qsub16cs','qsub16hs','qsub16cc','qsub16lo','qsub16mi','qsub16pl','qsub16vs','qsub16vc','qsub16hi','qsub16ls','qsub16ge','qsub16lt','qsub16gt','qsub16le',
+            'qsub8eq','qsub8ne','qsub8cs','qsub8hs','qsub8cc','qsub8lo','qsub8mi','qsub8pl','qsub8vs','qsub8vc','qsub8hi','qsub8ls','qsub8ge','qsub8lt','qsub8gt','qsub8le',
+            'uqsub16eq','uqsub16ne','uqsub16cs','uqsub16hs','uqsub16cc','uqsub16lo','uqsub16mi','uqsub16pl','uqsub16vs','uqsub16vc','uqsub16hi','uqsub16ls','uqsub16ge','uqsub16lt','uqsub16gt','uqsub16le',
+            'uqsub8eq','uqsub8ne','uqsub8cs','uqsub8hs','uqsub8cc','uqsub8lo','uqsub8mi','uqsub8pl','uqsub8vs','uqsub8vc','uqsub8hi','uqsub8ls','uqsub8ge','uqsub8lt','uqsub8gt','uqsub8le',
+            'qasxeq','qasxne','qasxcs','qasxhs','qasxcc','qasxlo','qasxmi','qasxpl','qasxvs','qasxvc','qasxhi','qasxls','qasxge','qasxlt','qasxgt','qasxle',
+            'qsaxeq','qsaxne','qsaxcs','qsaxhs','qsaxcc','qsaxlo','qsaxmi','qsaxpl','qsaxvs','qsaxvc','qsaxhi','qsaxls','qsaxge','qsaxlt','qsaxgt','qsaxle',
+            'uqasxeq','uqasxne','uqasxcs','uqasxhs','uqasxcc','uqasxlo','uqasxmi','uqasxpl','uqasxvs','uqasxvc','uqasxhi','uqasxls','uqasxge','uqasxlt','uqasxgt','uqasxle',
+            'uqsaxeq','uqsaxne','uqsaxcs','uqsaxhs','uqsaxcc','uqsaxlo','uqsaxmi','uqsaxpl','uqsaxvs','uqsaxvc','uqsaxhi','uqsaxls','uqsaxge','uqsaxlt','uqsaxgt','uqsaxle',
+            'qdaddeq','qdaddne','qdaddcs','qdaddhs','qdaddcc','qdaddlo','qdaddmi','qdaddpl','qdaddvs','qdaddvc','qdaddhi','qdaddls','qdaddge','qdaddlt','qdaddgt','qdaddle',
+            'qdsubeq','qdsubne','qdsubcs','qdsubhs','qdsubcc','qdsublo','qdsubmi','qdsubpl','qdsubvs','qdsubvc','qdsubhi','qdsubls','qdsubge','qdsublt','qdsubgt','qdsuble',
+            'ssateq','ssatne','ssatcs','ssaths','ssatcc','ssatlo','ssatmi','ssatpl','ssatvs','ssatvc','ssathi','ssatls','ssatge','ssatlt','ssatgt','ssatle',
+            'ssat16eq','ssat16ne','ssat16cs','ssat16hs','ssat16cc','ssat16lo','ssat16mi','ssat16pl','ssat16vs','ssat16vc','ssat16hi','ssat16ls','ssat16ge','ssat16lt','ssat16gt','ssat16le',
+            'usateq','usatne','usatcs','usaths','usatcc','usatlo','usatmi','usatpl','usatvs','usatvc','usathi','usatls','usatge','usatlt','usatgt','usatle',
+            'usat16eq','usat16ne','usat16cs','usat16hs','usat16cc','usat16lo','usat16mi','usat16pl','usat16vs','usat16vc','usat16hi','usat16ls','usat16ge','usat16lt','usat16gt','usat16le',
+            /* ARMv6 SIMD: Conditional Permutation and Combine Operations */
+            'sxtaheq','sxtahne','sxtahcs','sxtahhs','sxtahcc','sxtahlo','sxtahmi','sxtahpl','sxtahvs','sxtahvc','sxtahhi','sxtahls','sxtahge','sxtahlt','sxtahgt','sxtahle',
+            'sxtabeq','sxtabne','sxtabcs','sxtabhs','sxtabcc','sxtablo','sxtabmi','sxtabpl','sxtabvs','sxtabvc','sxtabhi','sxtabls','sxtabge','sxtablt','sxtabgt','sxtable',
+            'sxtab16eq','sxtab16ne','sxtab16cs','sxtab16hs','sxtab16cc','sxtab16lo','sxtab16mi','sxtab16pl','sxtab16vs','sxtab16vc','sxtab16hi','sxtab16ls','sxtab16ge','sxtab16lt','sxtab16gt','sxtab16le',
+            'uxtaheq','uxtahne','uxtahcs','uxtahhs','uxtahcc','uxtahlo','uxtahmi','uxtahpl','uxtahvs','uxtahvc','uxtahhi','uxtahls','uxtahge','uxtahlt','uxtahgt','uxtahle',
+            'uxtabeq','uxtabne','uxtabcs','uxtabhs','uxtabcc','uxtablo','uxtabmi','uxtabpl','uxtabvs','uxtabvc','uxtabhi','uxtabls','uxtabge','uxtablt','uxtabgt','uxtable',
+            'uxtab16eq','uxtab16ne','uxtab16cs','uxtab16hs','uxtab16cc','uxtab16lo','uxtab16mi','uxtab16pl','uxtab16vs','uxtab16vc','uxtab16hi','uxtab16ls','uxtab16ge','uxtab16lt','uxtab16gt','uxtab16le',
+            'sxtheq.w','sxthne.w','sxthcs.w','sxthhs.w','sxthcc.w','sxthlo.w','sxthmi.w','sxthpl.w','sxthvs.w','sxthvc.w','sxthhi.w','sxthls.w','sxthge.w','sxthlt.w','sxthgt.w','sxthle.w',
+            'sxtheq','sxthne','sxthcs','sxthhs','sxthcc','sxthlo','sxthmi','sxthpl','sxthvs','sxthvc','sxthhi','sxthls','sxthge','sxthlt','sxthgt','sxthle',
+            'sxtbeq.w','sxtbne.w','sxtbcs.w','sxtbhs.w','sxtbcc.w','sxtblo.w','sxtbmi.w','sxtbpl.w','sxtbvs.w','sxtbvc.w','sxtbhi.w','sxtbls.w','sxtbge.w','sxtblt.w','sxtbgt.w','sxtble.w',
+            'sxtbeq','sxtbne','sxtbcs','sxtbhs','sxtbcc','sxtblo','sxtbmi','sxtbpl','sxtbvs','sxtbvc','sxtbhi','sxtbls','sxtbge','sxtblt','sxtbgt','sxtble',
+            'sxtb16eq','sxtb16ne','sxtb16cs','sxtb16hs','sxtb16cc','sxtb16lo','sxtb16mi','sxtb16pl','sxtb16vs','sxtb16vc','sxtb16hi','sxtb16ls','sxtb16ge','sxtb16lt','sxtb16gt','sxtb16le',
+            'uxtheq.w','uxthne.w','uxthcs.w','uxthhs.w','uxthcc.w','uxthlo.w','uxthmi.w','uxthpl.w','uxthvs.w','uxthvc.w','uxthhi.w','uxthls.w','uxthge.w','uxthlt.w','uxthgt.w','uxthle.w',
+            'uxtheq','uxthne','uxthcs','uxthhs','uxthcc','uxthlo','uxthmi','uxthpl','uxthvs','uxthvc','uxthhi','uxthls','uxthge','uxthlt','uxthgt','uxthle',
+            'uxtbeq.w','uxtbne.w','uxtbcs.w','uxtbhs.w','uxtbcc.w','uxtblo.w','uxtbmi.w','uxtbpl.w','uxtbvs.w','uxtbvc.w','uxtbhi.w','uxtbls.w','uxtbge.w','uxtblt.w','uxtbgt.w','uxtble.w',
+            'uxtbeq','uxtbne','uxtbcs','uxtbhs','uxtbcc','uxtblo','uxtbmi','uxtbpl','uxtbvs','uxtbvc','uxtbhi','uxtbls','uxtbge','uxtblt','uxtbgt','uxtble',
+            'uxtb16eq','uxtb16ne','uxtb16cs','uxtb16hs','uxtb16cc','uxtb16lo','uxtb16mi','uxtb16pl','uxtb16vs','uxtb16vc','uxtb16hi','uxtb16ls','uxtb16ge','uxtb16lt','uxtb16gt','uxtb16le',
+            'pkhbteq','pkhbtne','pkhbtcs','pkhbths','pkhbtcc','pkhbtlo','pkhbtmi','pkhbtpl','pkhbtvs','pkhbtvc','pkhbthi','pkhbtls','pkhbtge','pkhbtlt','pkhbtgt','pkhbtle',
+            'pkhtbeq','pkhtbne','pkhtbcs','pkhtbhs','pkhtbcc','pkhtblo','pkhtbmi','pkhtbpl','pkhtbvs','pkhtbvc','pkhtbhi','pkhtbls','pkhtbge','pkhtblt','pkhtbgt','pkhtble',
+            'rbiteq','rbitne','rbitcs','rbiths','rbitcc','rbitlo','rbitmi','rbitpl','rbitvs','rbitvc','rbithi','rbitls','rbitge','rbitlt','rbitgt','rbitle',
+            'reveq.w','revne.w','revcs.w','revhs.w','revcc.w','revlo.w','revmi.w','revpl.w','revvs.w','revvc.w','revhi.w','revls.w','revge.w','revlt.w','revgt.w','revle.w',
+            'reveq','revne','revcs','revhs','revcc','revlo','revmi','revpl','revvs','revvc','revhi','revls','revge','revlt','revgt','revle',
+            'rev16eq.w','rev16ne.w','rev16cs.w','rev16hs.w','rev16cc.w','rev16lo.w','rev16mi.w','rev16pl.w','rev16vs.w','rev16vc.w','rev16hi.w','rev16ls.w','rev16ge.w','rev16lt.w','rev16gt.w','rev16le.w',
+            'rev16eq','rev16ne','rev16cs','rev16hs','rev16cc','rev16lo','rev16mi','rev16pl','rev16vs','rev16vc','rev16hi','rev16ls','rev16ge','rev16lt','rev16gt','rev16le',
+            'revsheq.w','revshne.w','revshcs.w','revshhs.w','revshcc.w','revshlo.w','revshmi.w','revshpl.w','revshvs.w','revshvc.w','revshhi.w','revshls.w','revshge.w','revshlt.w','revshgt.w','revshle.w',
+            'revsheq','revshne','revshcs','revshhs','revshcc','revshlo','revshmi','revshpl','revshvs','revshvc','revshhi','revshls','revshge','revshlt','revshgt','revshle',
+            'seleq','selne','selcs','selhs','selcc','sello','selmi','selpl','selvs','selvc','selhi','sells','selge','sellt','selgt','selle',
+            /* ARMv6 SIMD: Conditional Multiply and Multiply-Add */
+            'smladeq','smladne','smladcs','smladhs','smladcc','smladlo','smladmi','smladpl','smladvs','smladvc','smladhi','smladls','smladge','smladlt','smladgt','smladle',
+            'smladxeq','smladxne','smladxcs','smladxhs','smladxcc','smladxlo','smladxmi','smladxpl','smladxvs','smladxvc','smladxhi','smladxls','smladxge','smladxlt','smladxgt','smladxle',
+            'smlsdeq','smlsdne','smlsdcs','smlsdhs','smlsdcc','smlsdlo','smlsdmi','smlsdpl','smlsdvs','smlsdvc','smlsdhi','smlsdls','smlsdge','smlsdlt','smlsdgt','smlsdle',
+            'smlsdxeq','smlsdxne','smlsdxcs','smlsdxhs','smlsdxcc','smlsdxlo','smlsdxmi','smlsdxpl','smlsdxvs','smlsdxvc','smlsdxhi','smlsdxls','smlsdxge','smlsdxlt','smlsdxgt','smlsdxle',
+            'smlaldeq','smlaldne','smlaldcs','smlaldhs','smlaldcc','smlaldlo','smlaldmi','smlaldpl','smlaldvs','smlaldvc','smlaldhi','smlaldls','smlaldge','smlaldlt','smlaldgt','smlaldle',
+            'smlaldxeq','smlaldxne','smlaldxcs','smlaldxhs','smlaldxcc','smlaldxlo','smlaldxmi','smlaldxpl','smlaldxvs','smlaldxvc','smlaldxhi','smlaldxls','smlaldxge','smlaldxlt','smlaldxgt','smlaldxle',
+            'smlsldeq','smlsldne','smlsldcs','smlsldhs','smlsldcc','smlsldlo','smlsldmi','smlsldpl','smlsldvs','smlsldvc','smlsldhi','smlsldls','smlsldge','smlsldlt','smlsldgt','smlsldle',
+            'smlsldxeq','smlsldxne','smlsldxcs','smlsldxhs','smlsldxcc','smlsldxlo','smlsldxmi','smlsldxpl','smlsldxvs','smlsldxvc','smlsldxhi','smlsldxls','smlsldxge','smlsldxlt','smlsldxgt','smlsldxle',
+            'smmuleq','smmulne','smmulcs','smmulhs','smmulcc','smmullo','smmulmi','smmulpl','smmulvs','smmulvc','smmulhi','smmulls','smmulge','smmullt','smmulgt','smmulle',
+            'smmulreq','smmulrne','smmulrcs','smmulrhs','smmulrcc','smmulrlo','smmulrmi','smmulrpl','smmulrvs','smmulrvc','smmulrhi','smmulrls','smmulrge','smmulrlt','smmulrgt','smmulrle',
+            'smmlaeq','smmlane','smmlacs','smmlahs','smmlacc','smmlalo','smmlami','smmlapl','smmlavs','smmlavc','smmlahi','smmlals','smmlage','smmlalt','smmlagt','smmlale',
+            'smmlareq','smmlarne','smmlarcs','smmlarhs','smmlarcc','smmlarlo','smmlarmi','smmlarpl','smmlarvs','smmlarvc','smmlarhi','smmlarls','smmlarge','smmlarlt','smmlargt','smmlarle',
+            'smmlseq','smmlsne','smmlscs','smmlshs','smmlscc','smmlslo','smmlsmi','smmlspl','smmlsvs','smmlsvc','smmlshi','smmlsls','smmlsge','smmlslt','smmlsgt','smmlsle',
+            'smmlsreq','smmlsrne','smmlsrcs','smmlsrhs','smmlsrcc','smmlsrlo','smmlsrmi','smmlsrpl','smmlsrvs','smmlsrvc','smmlsrhi','smmlsrls','smmlsrge','smmlsrlt','smmlsrgt','smmlsrle',
+            'smuadeq','smuadne','smuadcs','smuadhs','smuadcc','smuadlo','smuadmi','smuadpl','smuadvs','smuadvc','smuadhi','smuadls','smuadge','smuadlt','smuadgt','smuadle',
+            'smuadxeq','smuadxne','smuadxcs','smuadxhs','smuadxcc','smuadxlo','smuadxmi','smuadxpl','smuadxvs','smuadxvc','smuadxhi','smuadxls','smuadxge','smuadxlt','smuadxgt','smuadxle',
+            'smusdeq','smusdne','smusdcs','smusdhs','smusdcc','smusdlo','smusdmi','smusdpl','smusdvs','smusdvc','smusdhi','smusdls','smusdge','smusdlt','smusdgt','smusdle',
+            'smusdxeq','smusdxne','smusdxcs','smusdxhs','smusdxcc','smusdxlo','smusdxmi','smusdxpl','smusdxvs','smusdxvc','smusdxhi','smusdxls','smusdxge','smusdxlt','smusdxgt','smusdxle',
+            'umaaleq','umaalne','umaalcs','umaalhs','umaalcc','umaallo','umaalmi','umaalpl','umaalvs','umaalvc','umaalhi','umaalls','umaalge','umaallt','umaalgt','umaalle'
+            ),
+        /* Unconditional Coprocessor Instructions */
+        13 => array(
+            /* Data Processing: Unconditional Coprocessor Instructions */
+            'cdp','cdpal',
+            'cdp2','cdp2al',
+            'ldc','ldcal',
+            'ldcl','ldclal',
+            'ldc2','ldc2al',
+            'ldc2l','ldc2lal',
+            'stc','stcal',
+            'stcl','stclal',
+            'stc2','stc2al',
+            'stc2l','stc2lal',
+            'mcr','mcral',
+            'mcr2','mcr2al',
+            'mcrr','mcrral',
+            'mcrr2','mcrr2al',
+            'mrc','mrcal',
+            'mrc2','mrc2al',
+            'mrrc','mrrcal',
+            'mrrc2','mrrc2al'
+            ),
+        /* Conditional Coprocessor Instructions */
+        14 => array(
+            /* Data Processing: Conditional Coprocessor Instructions */
+            'cdpeq','cdpne','cdpcs','cdphs','cdpcc','cdplo','cdpmi','cdppl','cdpvs','cdpvc','cdphi','cdpls','cdpge','cdplt','cdpgt','cdple',
+            'cdp2eq','cdp2ne','cdp2cs','cdp2hs','cdp2cc','cdp2lo','cdp2mi','cdp2pl','cdp2vs','cdp2vc','cdp2hi','cdp2ls','cdp2ge','cdp2lt','cdp2gt','cdp2le',
+            'ldceq','ldcne','ldccs','ldchs','ldccc','ldclo','ldcmi','ldcpl','ldcvs','ldcvc','ldchi','ldcls','ldcge','ldclt','ldcgt','ldcle',
+            'ldcleq','ldclne','ldclcs','ldclhs','ldclcc','ldcllo','ldclmi','ldclpl','ldclvs','ldclvc','ldclhi','ldclls','ldclge','ldcllt','ldclgt','ldclle',
+            'ldc2eq','ldc2ne','ldc2cs','ldc2hs','ldc2cc','ldc2lo','ldc2mi','ldc2pl','ldc2vs','ldc2vc','ldc2hi','ldc2ls','ldc2ge','ldc2lt','ldc2gt','ldc2le',
+            'ldc2leq','ldc2lne','ldc2lcs','ldc2lhs','ldc2lcc','ldc2llo','ldc2lmi','ldc2lpl','ldc2lvs','ldc2lvc','ldc2lhi','ldc2lls','ldc2lge','ldc2llt','ldc2lgt','ldc2lle',
+            'stceq','stcne','stccs','stchs','stccc','stclo','stcmi','stcpl','stcvs','stcvc','stchi','stcls','stcge','stclt','stcgt','stcle',
+            'stcleq','stclne','stclcs','stclhs','stclcc','stcllo','stclmi','stclpl','stclvs','stclvc','stclhi','stclls','stclge','stcllt','stclgt','stclle',
+            'stc2eq','stc2ne','stc2cs','stc2hs','stc2cc','stc2lo','stc2mi','stc2pl','stc2vs','stc2vc','stc2hi','stc2ls','stc2ge','stc2lt','stc2gt','stc2le',
+            'stc2leq','stc2lne','stc2lcs','stc2lhs','stc2lcc','stc2llo','stc2lmi','stc2lpl','stc2lvs','stc2lvc','stc2lhi','stc2lls','stc2lge','stc2llt','stc2lgt','stc2lle',
+            'mcreq','mcrne','mcrcs','mcrhs','mcrcc','mcrlo','mcrmi','mcrpl','mcrvs','mcrvc','mcrhi','mcrls','mcrge','mcrlt','mcrgt','mcrle',
+            'mcr2eq','mcr2ne','mcr2cs','mcr2hs','mcr2cc','mcr2lo','mcr2mi','mcr2pl','mcr2vs','mcr2vc','mcr2hi','mcr2ls','mcr2ge','mcr2lt','mcr2gt','mcr2le',
+            'mcrreq','mcrrne','mcrrcs','mcrrhs','mcrrcc','mcrrlo','mcrrmi','mcrrpl','mcrrvs','mcrrvc','mcrrhi','mcrrls','mcrrge','mcrrlt','mcrrgt','mcrrle',
+            'mcrr2eq','mcrr2ne','mcrr2cs','mcrr2hs','mcrr2cc','mcrr2lo','mcrr2mi','mcrr2pl','mcrr2vs','mcrr2vc','mcrr2hi','mcrr2ls','mcrr2ge','mcrr2lt','mcrr2gt','mcrr2le',
+            'mrceq','mrcne','mrccs','mrchs','mrccc','mrclo','mrcmi','mrcpl','mrcvs','mrcvc','mrchi','mrcls','mrcge','mrclt','mrcgt','mrcle',
+            'mrc2eq','mrc2ne','mrc2cs','mrc2hs','mrc2cc','mrc2lo','mrc2mi','mrc2pl','mrc2vs','mrc2vc','mrc2hi','mrc2ls','mrc2ge','mrc2lt','mrc2gt','mrc2le',
+            'mrrceq','mrrcne','mrrccs','mrrchs','mrrccc','mrrclo','mrrcmi','mrrcpl','mrrcvs','mrrcvc','mrrchi','mrrcls','mrrcge','mrrclt','mrrcgt','mrrcle',
+            'mrrc2eq','mrrc2ne','mrrc2cs','mrrc2hs','mrrc2cc','mrrc2lo','mrrc2mi','mrrc2pl','mrrc2vs','mrrc2vc','mrrc2hi','mrrc2ls','mrrc2ge','mrrc2lt','mrrc2gt','mrrc2le'
+            ),
+        /* Unconditional System Instructions */
+        15 => array(
+            /* System: Unconditional Debug and State-Change Instructions */
+            'bkpt',
+            'dbg','dbgal',
+            'setend',
+            'svc','svcal',
+            'sev.w','seval.w',
+            'sev','seval',
+            'wfe.w','wfeal.w',
+            'wfe','wfeal',
+            'wfi.w','wfial.w',
+            'wfi','wfial',
+            /* System: Unconditional ThumbEE Instructions */
+            'enterx',
+            'leavex',
+            'chka.n','chkaal.n',
+            'chka','chkaal',
+            'hb.n','hbal.n',
+            'hb','hbal',
+            'hbl.n','hblal.n',
+            'hbl','hblal',
+            'hblp.n','hblpal.n',
+            'hblp','hblpal',
+            'hbp.n','hbpal.n',
+            'hbp','hbpal',
+            /* System: Unconditional Privileged Instructions */
+            'cpsie.n',
+            'cpsie.w',
+            'cpsie',
+            'cpsid.n',
+            'cpsid.w',
+            'cpsid',
+            'smc','smcal',
+            'rfeda','rfedaal',
+            'rfedb','rfedbal',
+            'rfeia','rfeiaal',
+            'rfeib','rfeibal',
+            'srsda','srsdaal',
+            'srsdb','srsdbal',
+            'srsia','srsiaal',
+            'srsib','srsibal'
+            ),
+        /* Conditional System Instructions */
+        16 => array(
+            /* System: Conditional Debug and State-Change Instructions */
+            'dbgeq','dbgne','dbgcs','dbghs','dbgcc','dbglo','dbgmi','dbgpl','dbgvs','dbgvc','dbghi','dbgls','dbgge','dbglt','dbggt','dbgle',
+            'svceq','svcne','svccs','svchs','svccc','svclo','svcmi','svcpl','svcvs','svcvc','svchi','svcls','svcge','svclt','svcgt','svcle',
+            'seveq.w','sevne.w','sevcs.w','sevhs.w','sevcc.w','sevlo.w','sevmi.w','sevpl.w','sevvs.w','sevvc.w','sevhi.w','sevls.w','sevge.w','sevlt.w','sevgt.w','sevle.w',
+            'seveq','sevne','sevcs','sevhs','sevcc','sevlo','sevmi','sevpl','sevvs','sevvc','sevhi','sevls','sevge','sevlt','sevgt','sevle',
+            'wfeeq.w','wfene.w','wfecs.w','wfehs.w','wfecc.w','wfelo.w','wfemi.w','wfepl.w','wfevs.w','wfevc.w','wfehi.w','wfels.w','wfege.w','wfelt.w','wfegt.w','wfele.w',
+            'wfeeq','wfene','wfecs','wfehs','wfecc','wfelo','wfemi','wfepl','wfevs','wfevc','wfehi','wfels','wfege','wfelt','wfegt','wfele',
+            'wfieq.w','wfine.w','wfics.w','wfihs.w','wficc.w','wfilo.w','wfimi.w','wfipl.w','wfivs.w','wfivc.w','wfihi.w','wfils.w','wfige.w','wfilt.w','wfigt.w','wfile.w',
+            'wfieq','wfine','wfics','wfihs','wficc','wfilo','wfimi','wfipl','wfivs','wfivc','wfihi','wfils','wfige','wfilt','wfigt','wfile',
+            /* System: Conditional ThumbEE Instructions */
+            'chkaeq.n','chkane.n','chkacs.n','chkahs.n','chkacc.n','chkalo.n','chkami.n','chkapl.n','chkavs.n','chkavc.n','chkahi.n','chkals.n','chkage.n','chkalt.n','chkagt.n','chkale.n',
+            'chkaeq','chkane','chkacs','chkahs','chkacc','chkalo','chkami','chkapl','chkavs','chkavc','chkahi','chkals','chkage','chkalt','chkagt','chkale',
+            'hbeq.n','hbne.n','hbcs.n','hbhs.n','hbcc.n','hblo.n','hbmi.n','hbpl.n','hbvs.n','hbvc.n','hbhi.n','hbls.n','hbge.n','hblt.n','hbgt.n','hble.n',
+            'hbeq','hbne','hbcs','hbhs','hbcc','hblo','hbmi','hbpl','hbvs','hbvc','hbhi','hbls','hbge','hblt','hbgt','hble',
+            'hbleq.n','hblne.n','hblcs.n','hblhs.n','hblcc.n','hbllo.n','hblmi.n','hblpl.n','hblvs.n','hblvc.n','hblhi.n','hblls.n','hblge.n','hbllt.n','hblgt.n','hblle.n',
+            'hbleq','hblne','hblcs','hblhs','hblcc','hbllo','hblmi','hblpl','hblvs','hblvc','hblhi','hblls','hblge','hbllt','hblgt','hblle',
+            'hblpeq.n','hblpne.n','hblpcs.n','hblphs.n','hblpcc.n','hblplo.n','hblpmi.n','hblppl.n','hblpvs.n','hblpvc.n','hblphi.n','hblpls.n','hblpge.n','hblplt.n','hblpgt.n','hblple.n',
+            'hblpeq','hblpne','hblpcs','hblphs','hblpcc','hblplo','hblpmi','hblppl','hblpvs','hblpvc','hblphi','hblpls','hblpge','hblplt','hblpgt','hblple',
+            'hbpeq.n','hbpne.n','hbpcs.n','hbphs.n','hbpcc.n','hbplo.n','hbpmi.n','hbppl.n','hbpvs.n','hbpvc.n','hbphi.n','hbpls.n','hbpge.n','hbplt.n','hbpgt.n','hbple.n',
+            'hbpeq','hbpne','hbpcs','hbphs','hbpcc','hbplo','hbpmi','hbppl','hbpvs','hbpvc','hbphi','hbpls','hbpge','hbplt','hbpgt','hbple',
+            /* System: Conditional Privileged Instructions */
+            'smceq','smcne','smccs','smchs','smccc','smclo','smcmi','smcpl','smcvs','smcvc','smchi','smcls','smcge','smclt','smcgt','smcle',
+            'rfedaeq','rfedane','rfedacs','rfedahs','rfedacc','rfedalo','rfedami','rfedapl','rfedavs','rfedavc','rfedahi','rfedals','rfedage','rfedalt','rfedagt','rfedale',
+            'rfedbeq','rfedbne','rfedbcs','rfedbhs','rfedbcc','rfedblo','rfedbmi','rfedbpl','rfedbvs','rfedbvc','rfedbhi','rfedbls','rfedbge','rfedblt','rfedbgt','rfedble',
+            'rfeiaeq','rfeiane','rfeiacs','rfeiahs','rfeiacc','rfeialo','rfeiami','rfeiapl','rfeiavs','rfeiavc','rfeiahi','rfeials','rfeiage','rfeialt','rfeiagt','rfeiale',
+            'rfeibeq','rfeibne','rfeibcs','rfeibhs','rfeibcc','rfeiblo','rfeibmi','rfeibpl','rfeibvs','rfeibvc','rfeibhi','rfeibls','rfeibge','rfeiblt','rfeibgt','rfeible',
+            'srsdaeq','srsdane','srsdacs','srsdahs','srsdacc','srsdalo','srsdami','srsdapl','srsdavs','srsdavc','srsdahi','srsdals','srsdage','srsdalt','srsdagt','srsdale',
+            'srsdbeq','srsdbne','srsdbcs','srsdbhs','srsdbcc','srsdblo','srsdbmi','srsdbpl','srsdbvs','srsdbvc','srsdbhi','srsdbls','srsdbge','srsdblt','srsdbgt','srsdble',
+            'srsiaeq','srsiane','srsiacs','srsiahs','srsiacc','srsialo','srsiami','srsiapl','srsiavs','srsiavc','srsiahi','srsials','srsiage','srsialt','srsiagt','srsiale',
+            'srsibeq','srsibne','srsibcs','srsibhs','srsibcc','srsiblo','srsibmi','srsibpl','srsibvs','srsibvc','srsibhi','srsibls','srsibge','srsiblt','srsibgt','srsible'
+            ),
+        /* Unconditional WMMX/WMMX2 instructions */
+        17 => array(
+            /* Unconditional WMMX/WMMX2 SIMD Instructions */
+            'tandcb','tandcbal',
+            'tandch','tandchal',
+            'tandcw','tandcwal',
+            'tbcstb','tbcstbal',
+            'tbcsth','tbcsthal',
+            'tbcstw','tbcstwal',
+            'textrcb','textrcbal',
+            'textrch','textrchal',
+            'textrcw','textrcwal',
+            'textrmsb','textrmsbal',
+            'textrmsh','textrmshal',
+            'textrmsw','textrmswal',
+            'textrmub','textrmubal',
+            'textrmuh','textrmuhal',
+            'textrmuw','textrmuwal',
+            'tinsrb','tinsrbal',
+            'tinsrh','tinsrhal',
+            'tinsrw','tinsrwal',
+            'tmcr','tmcral',
+            'tmcrr','tmcrral',
+            'tmia','tmiaal',
+            'tmiaph','tmiaphal',
+            'tmiabb','tmiabbal',
+            'tmiabt','tmiabtal',
+            'tmiatb','tmiatbal',
+            'tmiatt','tmiattal',
+            'tmovmskb','tmovmskbal',
+            'tmovmskh','tmovmskhal',
+            'tmovmskw','tmovmskwal',
+            'tmrc','tmrcal',
+            'tmrrc','tmrrcal',
+            'torcb','torcbal',
+            'torch','torchal',
+            'torcw','torcwal',
+            'torvscb','torvscbal',
+            'torvsch','torvschal',
+            'torvscw','torvscwal',
+            'wabsb','wabsbal',
+            'wabsh','wabshal',
+            'wabsw','wabswal',
+            'wabsdiffb','wabsdiffbal',
+            'wabsdiffh','wabsdiffhal',
+            'wabsdiffw','wabsdiffwal',
+            'waccb','waccbal',
+            'wacch','wacchal',
+            'waccw','waccwal',
+            'waddb','waddbal',
+            'waddh','waddhal',
+            'waddw','waddwal',
+            'waddbc','waddbcal',
+            'waddhc','waddhcal',
+            'waddwc','waddwcal',
+            'waddbss','waddbssal',
+            'waddhss','waddhssal',
+            'waddwss','waddwssal',
+            'waddbus','waddbusal',
+            'waddhus','waddhusal',
+            'waddwus','waddwusal',
+            'waddsubhx','waddsubhxal',
+            'waligni','walignial',
+            'walignr0','walignr0al',
+            'walignr1','walignr1al',
+            'walignr2','walignr2al',
+            'walignr3','walignr3al',
+            'wand','wandal',
+            'wandn','wandnal',
+            'wavg2b','wavg2bal',
+            'wavg2h','wavg2hal',
+            'wavg2br','wavg2bral',
+            'wavg2hr','wavg2hral',
+            'wavg4','wavg4al',
+            'wavg4r','wavg4ral',
+            'wcmpeqb','wcmpeqbal',
+            'wcmpeqh','wcmpeqhal',
+            'wcmpeqw','wcmpeqwal',
+            'wcmpgtsb','wcmpgtsbal',
+            'wcmpgtsh','wcmpgtshal',
+            'wcmpgtsw','wcmpgtswal',
+            'wcmpgtub','wcmpgtubal',
+            'wcmpgtuh','wcmpgtuhal',
+            'wcmpgtuw','wcmpgtuwal',
+            'wldrb','wldrbal',
+            'wldrh','wldrhal',
+            'wldrw','wldrwal',
+            'wldrd','wldrdal',
+            'wmacs','wmacsal',
+            'wmacu','wmacual',
+            'wmacsz','wmacszal',
+            'wmacuz','wmacuzal',
+            'wmadds','wmaddsal',
+            'wmaddu','wmaddual',
+            'wmaddsx','wmaddsxal',
+            'wmaddux','wmadduxal',
+            'wmaddsn','wmaddsnal',
+            'wmaddun','wmaddunal',
+            'wmaxsb','wmaxsbal',
+            'wmaxsh','wmaxshal',
+            'wmaxsw','wmaxswal',
+            'wmaxub','wmaxubal',
+            'wmaxuh','wmaxuhal',
+            'wmaxuw','wmaxuwal',
+            'wmerge','wmergeal',
+            'wmiabb','wmiabbal',
+            'wmiabt','wmiabtal',
+            'wmiatb','wmiatbal',
+            'wmiatt','wmiattal',
+            'wmiabbn','wmiabbnal',
+            'wmiabtn','wmiabtnal',
+            'wmiatbn','wmiatbnal',
+            'wmiattn','wmiattnal',
+            'wmiawbb','wmiawbbal',
+            'wmiawbt','wmiawbtal',
+            'wmiawtb','wmiawtbal',
+            'wmiawtt','wmiawttal',
+            'wmiawbbn','wmiawbbnal',
+            'wmiawbtn','wmiawbtnal',
+            'wmiawtbn','wmiawtbnal',
+            'wmiawttn','wmiawttnal',
+            'wminsb','wminsbal',
+            'wminsh','wminshal',
+            'wminsw','wminswal',
+            'wminub','wminubal',
+            'wminuh','wminuhal',
+            'wminuw','wminuwal',
+            'wmov','wmoval',
+            'wmulsm','wmulsmal',
+            'wmulsl','wmulslal',
+            'wmulum','wmulumal',
+            'wmulul','wmululal',
+            'wmulsmr','wmulsmral',
+            'wmulslr','wmulslral',
+            'wmulumr','wmulumral',
+            'wmululr','wmululral',
+            'wmulwum','wmulwumal',
+            'wmulwsm','wmulwsmal',
+            'wmulwl','wmulwlal',
+            'wmulwumr','wmulwumral',
+            'wmulwsmr','wmulwsmral',
+            'wor','woral',
+            'wpackhss','wpackhssal',
+            'wpackwss','wpackwssal',
+            'wpackdss','wpackdssal',
+            'wpackhus','wpackhusal',
+            'wpackwus','wpackwusal',
+            'wpackdus','wpackdusal',
+            'wqmiabb','wqmiabbal',
+            'wqmiabt','wqmiabtal',
+            'wqmiatb','wqmiatbal',
+            'wqmiatt','wqmiattal',
+            'wqmiabbn','wqmiabbnal',
+            'wqmiabtn','wqmiabtnal',
+            'wqmiatbn','wqmiatbnal',
+            'wqmiattn','wqmiattnal',
+            'wqmulm','wqmulmal',
+            'wqmulmr','wqmulmral',
+            'wqmulwm','wqmulwmal',
+            'wqmulwmr','wqmulwmral',
+            'wrorh','wrorhal',
+            'wrorw','wrorwal',
+            'wrord','wrordal',
+            'wrorhg','wrorhgal',
+            'wrorwg','wrorwgal',
+            'wrordg','wrordgal',
+            'wsadb','wsadbal',
+            'wsadh','wsadhal',
+            'wsadbz','wsadbzal',
+            'wsadhz','wsadhzal',
+            'wshufh','wshufhal',
+            'wsllh','wsllhal',
+            'wsllw','wsllwal',
+            'wslld','wslldal',
+            'wsllhg','wsllhgal',
+            'wsllwg','wsllwgal',
+            'wslldg','wslldgal',
+            'wsrah','wsrahal',
+            'wsraw','wsrawal',
+            'wsrad','wsradal',
+            'wsrahg','wsrahgal',
+            'wsrawg','wsrawgal',
+            'wsradg','wsradgal',
+            'wsrlh','wsrlhal',
+            'wsrlw','wsrlwal',
+            'wsrld','wsrldal',
+            'wsrlhg','wsrlhgal',
+            'wsrlwg','wsrlwgal',
+            'wsrldg','wsrldgal',
+            'wstrb','wstrbal',
+            'wstrh','wstrhal',
+            'wstrw','wstrwal',
+            'wstrd','wstrdal',
+            'wsubb','wsubbal',
+            'wsubh','wsubhal',
+            'wsubw','wsubwal',
+            'wsubbss','wsubbssal',
+            'wsubhss','wsubhssal',
+            'wsubwss','wsubwssal',
+            'wsubbus','wsubbusal',
+            'wsubhus','wsubhusal',
+            'wsubwus','wsubwusal',
+            'wsubaddhx','wsubaddhxal',
+            'wunpckehsb','wunpckehsbal',
+            'wunpckehsh','wunpckehshal',
+            'wunpckehsw','wunpckehswal',
+            'wunpckehub','wunpckehubal',
+            'wunpckehuh','wunpckehuhal',
+            'wunpckehuw','wunpckehuwal',
+            'wunpckihb','wunpckihbal',
+            'wunpckihh','wunpckihhal',
+            'wunpckihw','wunpckihwal',
+            'wunpckelsb','wunpckelsbal',
+            'wunpckelsh','wunpckelshal',
+            'wunpckelsw','wunpckelswal',
+            'wunpckelub','wunpckelubal',
+            'wunpckeluh','wunpckeluhal',
+            'wunpckeluw','wunpckeluwal',
+            'wunpckilb','wunpckilbal',
+            'wunpckilh','wunpckilhal',
+            'wunpckilw','wunpckilwal',
+            'wxor','wxoral',
+            'wzero','wzeroal'
+            ),
+        /* Conditional WMMX/WMMX2 SIMD Instructions */
+        18 => array(
+            /* Conditional WMMX/WMMX2 SIMD Instructions */
+            'tandcbeq','tandcbne','tandcbcs','tandcbhs','tandcbcc','tandcblo','tandcbmi','tandcbpl','tandcbvs','tandcbvc','tandcbhi','tandcbls','tandcbge','tandcblt','tandcbgt','tandcble',
+            'tandcheq','tandchne','tandchcs','tandchhs','tandchcc','tandchlo','tandchmi','tandchpl','tandchvs','tandchvc','tandchhi','tandchls','tandchge','tandchlt','tandchgt','tandchle',
+            'tandcweq','tandcwne','tandcwcs','tandcwhs','tandcwcc','tandcwlo','tandcwmi','tandcwpl','tandcwvs','tandcwvc','tandcwhi','tandcwls','tandcwge','tandcwlt','tandcwgt','tandcwle',
+            'tbcstbeq','tbcstbne','tbcstbcs','tbcstbhs','tbcstbcc','tbcstblo','tbcstbmi','tbcstbpl','tbcstbvs','tbcstbvc','tbcstbhi','tbcstbls','tbcstbge','tbcstblt','tbcstbgt','tbcstble',
+            'tbcstheq','tbcsthne','tbcsthcs','tbcsthhs','tbcsthcc','tbcsthlo','tbcsthmi','tbcsthpl','tbcsthvs','tbcsthvc','tbcsthhi','tbcsthls','tbcsthge','tbcsthlt','tbcsthgt','tbcsthle',
+            'tbcstweq','tbcstwne','tbcstwcs','tbcstwhs','tbcstwcc','tbcstwlo','tbcstwmi','tbcstwpl','tbcstwvs','tbcstwvc','tbcstwhi','tbcstwls','tbcstwge','tbcstwlt','tbcstwgt','tbcstwle',
+            'textrcbeq','textrcbne','textrcbcs','textrcbhs','textrcbcc','textrcblo','textrcbmi','textrcbpl','textrcbvs','textrcbvc','textrcbhi','textrcbls','textrcbge','textrcblt','textrcbgt','textrcble',
+            'textrcheq','textrchne','textrchcs','textrchhs','textrchcc','textrchlo','textrchmi','textrchpl','textrchvs','textrchvc','textrchhi','textrchls','textrchge','textrchlt','textrchgt','textrchle',
+            'textrcweq','textrcwne','textrcwcs','textrcwhs','textrcwcc','textrcwlo','textrcwmi','textrcwpl','textrcwvs','textrcwvc','textrcwhi','textrcwls','textrcwge','textrcwlt','textrcwgt','textrcwle',
+            'textrmsbeq','textrmsbne','textrmsbcs','textrmsbhs','textrmsbcc','textrmsblo','textrmsbmi','textrmsbpl','textrmsbvs','textrmsbvc','textrmsbhi','textrmsbls','textrmsbge','textrmsblt','textrmsbgt','textrmsble',
+            'textrmsheq','textrmshne','textrmshcs','textrmshhs','textrmshcc','textrmshlo','textrmshmi','textrmshpl','textrmshvs','textrmshvc','textrmshhi','textrmshls','textrmshge','textrmshlt','textrmshgt','textrmshle',
+            'textrmsweq','textrmswne','textrmswcs','textrmswhs','textrmswcc','textrmswlo','textrmswmi','textrmswpl','textrmswvs','textrmswvc','textrmswhi','textrmswls','textrmswge','textrmswlt','textrmswgt','textrmswle',
+            'textrmubeq','textrmubne','textrmubcs','textrmubhs','textrmubcc','textrmublo','textrmubmi','textrmubpl','textrmubvs','textrmubvc','textrmubhi','textrmubls','textrmubge','textrmublt','textrmubgt','textrmuble',
+            'textrmuheq','textrmuhne','textrmuhcs','textrmuhhs','textrmuhcc','textrmuhlo','textrmuhmi','textrmuhpl','textrmuhvs','textrmuhvc','textrmuhhi','textrmuhls','textrmuhge','textrmuhlt','textrmuhgt','textrmuhle',
+            'textrmuweq','textrmuwne','textrmuwcs','textrmuwhs','textrmuwcc','textrmuwlo','textrmuwmi','textrmuwpl','textrmuwvs','textrmuwvc','textrmuwhi','textrmuwls','textrmuwge','textrmuwlt','textrmuwgt','textrmuwle',
+            'tinsrbeq','tinsrbne','tinsrbcs','tinsrbhs','tinsrbcc','tinsrblo','tinsrbmi','tinsrbpl','tinsrbvs','tinsrbvc','tinsrbhi','tinsrbls','tinsrbge','tinsrblt','tinsrbgt','tinsrble',
+            'tinsrheq','tinsrhne','tinsrhcs','tinsrhhs','tinsrhcc','tinsrhlo','tinsrhmi','tinsrhpl','tinsrhvs','tinsrhvc','tinsrhhi','tinsrhls','tinsrhge','tinsrhlt','tinsrhgt','tinsrhle',
+            'tinsrweq','tinsrwne','tinsrwcs','tinsrwhs','tinsrwcc','tinsrwlo','tinsrwmi','tinsrwpl','tinsrwvs','tinsrwvc','tinsrwhi','tinsrwls','tinsrwge','tinsrwlt','tinsrwgt','tinsrwle',
+            'tmcreq','tmcrne','tmcrcs','tmcrhs','tmcrcc','tmcrlo','tmcrmi','tmcrpl','tmcrvs','tmcrvc','tmcrhi','tmcrls','tmcrge','tmcrlt','tmcrgt','tmcrle',
+            'tmcrreq','tmcrrne','tmcrrcs','tmcrrhs','tmcrrcc','tmcrrlo','tmcrrmi','tmcrrpl','tmcrrvs','tmcrrvc','tmcrrhi','tmcrrls','tmcrrge','tmcrrlt','tmcrrgt','tmcrrle',
+            'tmiaeq','tmiane','tmiacs','tmiahs','tmiacc','tmialo','tmiami','tmiapl','tmiavs','tmiavc','tmiahi','tmials','tmiage','tmialt','tmiagt','tmiale',
+            'tmiapheq','tmiaphne','tmiaphcs','tmiaphhs','tmiaphcc','tmiaphlo','tmiaphmi','tmiaphpl','tmiaphvs','tmiaphvc','tmiaphhi','tmiaphls','tmiaphge','tmiaphlt','tmiaphgt','tmiaphle',
+            'tmiabbeq','tmiabbne','tmiabbcs','tmiabbhs','tmiabbcc','tmiabblo','tmiabbmi','tmiabbpl','tmiabbvs','tmiabbvc','tmiabbhi','tmiabbls','tmiabbge','tmiabblt','tmiabbgt','tmiabble',
+            'tmiabteq','tmiabtne','tmiabtcs','tmiabths','tmiabtcc','tmiabtlo','tmiabtmi','tmiabtpl','tmiabtvs','tmiabtvc','tmiabthi','tmiabtls','tmiabtge','tmiabtlt','tmiabtgt','tmiabtle',
+            'tmiatbeq','tmiatbne','tmiatbcs','tmiatbhs','tmiatbcc','tmiatblo','tmiatbmi','tmiatbpl','tmiatbvs','tmiatbvc','tmiatbhi','tmiatbls','tmiatbge','tmiatblt','tmiatbgt','tmiatble',
+            'tmiatteq','tmiattne','tmiattcs','tmiatths','tmiattcc','tmiattlo','tmiattmi','tmiattpl','tmiattvs','tmiattvc','tmiatthi','tmiattls','tmiattge','tmiattlt','tmiattgt','tmiattle',
+            'tmovmskbeq','tmovmskbne','tmovmskbcs','tmovmskbhs','tmovmskbcc','tmovmskblo','tmovmskbmi','tmovmskbpl','tmovmskbvs','tmovmskbvc','tmovmskbhi','tmovmskbls','tmovmskbge','tmovmskblt','tmovmskbgt','tmovmskble',
+            'tmovmskheq','tmovmskhne','tmovmskhcs','tmovmskhhs','tmovmskhcc','tmovmskhlo','tmovmskhmi','tmovmskhpl','tmovmskhvs','tmovmskhvc','tmovmskhhi','tmovmskhls','tmovmskhge','tmovmskhlt','tmovmskhgt','tmovmskhle',
+            'tmovmskweq','tmovmskwne','tmovmskwcs','tmovmskwhs','tmovmskwcc','tmovmskwlo','tmovmskwmi','tmovmskwpl','tmovmskwvs','tmovmskwvc','tmovmskwhi','tmovmskwls','tmovmskwge','tmovmskwlt','tmovmskwgt','tmovmskwle',
+            'tmrceq','tmrcne','tmrccs','tmrchs','tmrccc','tmrclo','tmrcmi','tmrcpl','tmrcvs','tmrcvc','tmrchi','tmrcls','tmrcge','tmrclt','tmrcgt','tmrcle',
+            'tmrrceq','tmrrcne','tmrrccs','tmrrchs','tmrrccc','tmrrclo','tmrrcmi','tmrrcpl','tmrrcvs','tmrrcvc','tmrrchi','tmrrcls','tmrrcge','tmrrclt','tmrrcgt','tmrrcle',
+            'torcbeq','torcbne','torcbcs','torcbhs','torcbcc','torcblo','torcbmi','torcbpl','torcbvs','torcbvc','torcbhi','torcbls','torcbge','torcblt','torcbgt','torcble',
+            'torcheq','torchne','torchcs','torchhs','torchcc','torchlo','torchmi','torchpl','torchvs','torchvc','torchhi','torchls','torchge','torchlt','torchgt','torchle',
+            'torcweq','torcwne','torcwcs','torcwhs','torcwcc','torcwlo','torcwmi','torcwpl','torcwvs','torcwvc','torcwhi','torcwls','torcwge','torcwlt','torcwgt','torcwle',
+            'torvscbeq','torvscbne','torvscbcs','torvscbhs','torvscbcc','torvscblo','torvscbmi','torvscbpl','torvscbvs','torvscbvc','torvscbhi','torvscbls','torvscbge','torvscblt','torvscbgt','torvscble',
+            'torvscheq','torvschne','torvschcs','torvschhs','torvschcc','torvschlo','torvschmi','torvschpl','torvschvs','torvschvc','torvschhi','torvschls','torvschge','torvschlt','torvschgt','torvschle',
+            'torvscweq','torvscwne','torvscwcs','torvscwhs','torvscwcc','torvscwlo','torvscwmi','torvscwpl','torvscwvs','torvscwvc','torvscwhi','torvscwls','torvscwge','torvscwlt','torvscwgt','torvscwle',
+            'wabsbeq','wabsbne','wabsbcs','wabsbhs','wabsbcc','wabsblo','wabsbmi','wabsbpl','wabsbvs','wabsbvc','wabsbhi','wabsbls','wabsbge','wabsblt','wabsbgt','wabsble',
+            'wabsheq','wabshne','wabshcs','wabshhs','wabshcc','wabshlo','wabshmi','wabshpl','wabshvs','wabshvc','wabshhi','wabshls','wabshge','wabshlt','wabshgt','wabshle',
+            'wabsweq','wabswne','wabswcs','wabswhs','wabswcc','wabswlo','wabswmi','wabswpl','wabswvs','wabswvc','wabswhi','wabswls','wabswge','wabswlt','wabswgt','wabswle',
+            'wabsdiffbeq','wabsdiffbne','wabsdiffbcs','wabsdiffbhs','wabsdiffbcc','wabsdiffblo','wabsdiffbmi','wabsdiffbpl','wabsdiffbvs','wabsdiffbvc','wabsdiffbhi','wabsdiffbls','wabsdiffbge','wabsdiffblt','wabsdiffbgt','wabsdiffble',
+            'wabsdiffheq','wabsdiffhne','wabsdiffhcs','wabsdiffhhs','wabsdiffhcc','wabsdiffhlo','wabsdiffhmi','wabsdiffhpl','wabsdiffhvs','wabsdiffhvc','wabsdiffhhi','wabsdiffhls','wabsdiffhge','wabsdiffhlt','wabsdiffhgt','wabsdiffhle',
+            'wabsdiffweq','wabsdiffwne','wabsdiffwcs','wabsdiffwhs','wabsdiffwcc','wabsdiffwlo','wabsdiffwmi','wabsdiffwpl','wabsdiffwvs','wabsdiffwvc','wabsdiffwhi','wabsdiffwls','wabsdiffwge','wabsdiffwlt','wabsdiffwgt','wabsdiffwle',
+            'waccbeq','waccbne','waccbcs','waccbhs','waccbcc','waccblo','waccbmi','waccbpl','waccbvs','waccbvc','waccbhi','waccbls','waccbge','waccblt','waccbgt','waccble',
+            'waccheq','wacchne','wacchcs','wacchhs','wacchcc','wacchlo','wacchmi','wacchpl','wacchvs','wacchvc','wacchhi','wacchls','wacchge','wacchlt','wacchgt','wacchle',
+            'waccweq','waccwne','waccwcs','waccwhs','waccwcc','waccwlo','waccwmi','waccwpl','waccwvs','waccwvc','waccwhi','waccwls','waccwge','waccwlt','waccwgt','waccwle',
+            'waddbeq','waddbne','waddbcs','waddbhs','waddbcc','waddblo','waddbmi','waddbpl','waddbvs','waddbvc','waddbhi','waddbls','waddbge','waddblt','waddbgt','waddble',
+            'waddheq','waddhne','waddhcs','waddhhs','waddhcc','waddhlo','waddhmi','waddhpl','waddhvs','waddhvc','waddhhi','waddhls','waddhge','waddhlt','waddhgt','waddhle',
+            'waddweq','waddwne','waddwcs','waddwhs','waddwcc','waddwlo','waddwmi','waddwpl','waddwvs','waddwvc','waddwhi','waddwls','waddwge','waddwlt','waddwgt','waddwle',
+            'waddbceq','waddbcne','waddbccs','waddbchs','waddbccc','waddbclo','waddbcmi','waddbcpl','waddbcvs','waddbcvc','waddbchi','waddbcls','waddbcge','waddbclt','waddbcgt','waddbcle',
+            'waddhceq','waddhcne','waddhccs','waddhchs','waddhccc','waddhclo','waddhcmi','waddhcpl','waddhcvs','waddhcvc','waddhchi','waddhcls','waddhcge','waddhclt','waddhcgt','waddhcle',
+            'waddwceq','waddwcne','waddwccs','waddwchs','waddwccc','waddwclo','waddwcmi','waddwcpl','waddwcvs','waddwcvc','waddwchi','waddwcls','waddwcge','waddwclt','waddwcgt','waddwcle',
+            'waddbsseq','waddbssne','waddbsscs','waddbsshs','waddbsscc','waddbsslo','waddbssmi','waddbsspl','waddbssvs','waddbssvc','waddbsshi','waddbssls','waddbssge','waddbsslt','waddbssgt','waddbssle',
+            'waddhsseq','waddhssne','waddhsscs','waddhsshs','waddhsscc','waddhsslo','waddhssmi','waddhsspl','waddhssvs','waddhssvc','waddhsshi','waddhssls','waddhssge','waddhsslt','waddhssgt','waddhssle',
+            'waddwsseq','waddwssne','waddwsscs','waddwsshs','waddwsscc','waddwsslo','waddwssmi','waddwsspl','waddwssvs','waddwssvc','waddwsshi','waddwssls','waddwssge','waddwsslt','waddwssgt','waddwssle',
+            'waddbuseq','waddbusne','waddbuscs','waddbushs','waddbuscc','waddbuslo','waddbusmi','waddbuspl','waddbusvs','waddbusvc','waddbushi','waddbusls','waddbusge','waddbuslt','waddbusgt','waddbusle',
+            'waddhuseq','waddhusne','waddhuscs','waddhushs','waddhuscc','waddhuslo','waddhusmi','waddhuspl','waddhusvs','waddhusvc','waddhushi','waddhusls','waddhusge','waddhuslt','waddhusgt','waddhusle',
+            'waddwuseq','waddwusne','waddwuscs','waddwushs','waddwuscc','waddwuslo','waddwusmi','waddwuspl','waddwusvs','waddwusvc','waddwushi','waddwusls','waddwusge','waddwuslt','waddwusgt','waddwusle',
+            'waddsubhxeq','waddsubhxne','waddsubhxcs','waddsubhxhs','waddsubhxcc','waddsubhxlo','waddsubhxmi','waddsubhxpl','waddsubhxvs','waddsubhxvc','waddsubhxhi','waddsubhxls','waddsubhxge','waddsubhxlt','waddsubhxgt','waddsubhxle',
+            'walignieq','walignine','walignics','walignihs','walignicc','walignilo','walignimi','walignipl','walignivs','walignivc','walignihi','walignils','walignige','walignilt','walignigt','walignile',
+            'walignr0eq','walignr0ne','walignr0cs','walignr0hs','walignr0cc','walignr0lo','walignr0mi','walignr0pl','walignr0vs','walignr0vc','walignr0hi','walignr0ls','walignr0ge','walignr0lt','walignr0gt','walignr0le',
+            'walignr1eq','walignr1ne','walignr1cs','walignr1hs','walignr1cc','walignr1lo','walignr1mi','walignr1pl','walignr1vs','walignr1vc','walignr1hi','walignr1ls','walignr1ge','walignr1lt','walignr1gt','walignr1le',
+            'walignr2eq','walignr2ne','walignr2cs','walignr2hs','walignr2cc','walignr2lo','walignr2mi','walignr2pl','walignr2vs','walignr2vc','walignr2hi','walignr2ls','walignr2ge','walignr2lt','walignr2gt','walignr2le',
+            'walignr3eq','walignr3ne','walignr3cs','walignr3hs','walignr3cc','walignr3lo','walignr3mi','walignr3pl','walignr3vs','walignr3vc','walignr3hi','walignr3ls','walignr3ge','walignr3lt','walignr3gt','walignr3le',
+            'wandeq','wandne','wandcs','wandhs','wandcc','wandlo','wandmi','wandpl','wandvs','wandvc','wandhi','wandls','wandge','wandlt','wandgt','wandle',
+            'wandneq','wandnne','wandncs','wandnhs','wandncc','wandnlo','wandnmi','wandnpl','wandnvs','wandnvc','wandnhi','wandnls','wandnge','wandnlt','wandngt','wandnle',
+            'wavg2beq','wavg2bne','wavg2bcs','wavg2bhs','wavg2bcc','wavg2blo','wavg2bmi','wavg2bpl','wavg2bvs','wavg2bvc','wavg2bhi','wavg2bls','wavg2bge','wavg2blt','wavg2bgt','wavg2ble',
+            'wavg2heq','wavg2hne','wavg2hcs','wavg2hhs','wavg2hcc','wavg2hlo','wavg2hmi','wavg2hpl','wavg2hvs','wavg2hvc','wavg2hhi','wavg2hls','wavg2hge','wavg2hlt','wavg2hgt','wavg2hle',
+            'wavg2breq','wavg2brne','wavg2brcs','wavg2brhs','wavg2brcc','wavg2brlo','wavg2brmi','wavg2brpl','wavg2brvs','wavg2brvc','wavg2brhi','wavg2brls','wavg2brge','wavg2brlt','wavg2brgt','wavg2brle',
+            'wavg2hreq','wavg2hrne','wavg2hrcs','wavg2hrhs','wavg2hrcc','wavg2hrlo','wavg2hrmi','wavg2hrpl','wavg2hrvs','wavg2hrvc','wavg2hrhi','wavg2hrls','wavg2hrge','wavg2hrlt','wavg2hrgt','wavg2hrle',
+            'wavg4eq','wavg4ne','wavg4cs','wavg4hs','wavg4cc','wavg4lo','wavg4mi','wavg4pl','wavg4vs','wavg4vc','wavg4hi','wavg4ls','wavg4ge','wavg4lt','wavg4gt','wavg4le',
+            'wavg4req','wavg4rne','wavg4rcs','wavg4rhs','wavg4rcc','wavg4rlo','wavg4rmi','wavg4rpl','wavg4rvs','wavg4rvc','wavg4rhi','wavg4rls','wavg4rge','wavg4rlt','wavg4rgt','wavg4rle',
+            'wcmpeqbeq','wcmpeqbne','wcmpeqbcs','wcmpeqbhs','wcmpeqbcc','wcmpeqblo','wcmpeqbmi','wcmpeqbpl','wcmpeqbvs','wcmpeqbvc','wcmpeqbhi','wcmpeqbls','wcmpeqbge','wcmpeqblt','wcmpeqbgt','wcmpeqble',
+            'wcmpeqheq','wcmpeqhne','wcmpeqhcs','wcmpeqhhs','wcmpeqhcc','wcmpeqhlo','wcmpeqhmi','wcmpeqhpl','wcmpeqhvs','wcmpeqhvc','wcmpeqhhi','wcmpeqhls','wcmpeqhge','wcmpeqhlt','wcmpeqhgt','wcmpeqhle',
+            'wcmpeqweq','wcmpeqwne','wcmpeqwcs','wcmpeqwhs','wcmpeqwcc','wcmpeqwlo','wcmpeqwmi','wcmpeqwpl','wcmpeqwvs','wcmpeqwvc','wcmpeqwhi','wcmpeqwls','wcmpeqwge','wcmpeqwlt','wcmpeqwgt','wcmpeqwle',
+            'wcmpgtsbeq','wcmpgtsbne','wcmpgtsbcs','wcmpgtsbhs','wcmpgtsbcc','wcmpgtsblo','wcmpgtsbmi','wcmpgtsbpl','wcmpgtsbvs','wcmpgtsbvc','wcmpgtsbhi','wcmpgtsbls','wcmpgtsbge','wcmpgtsblt','wcmpgtsbgt','wcmpgtsble',
+            'wcmpgtsheq','wcmpgtshne','wcmpgtshcs','wcmpgtshhs','wcmpgtshcc','wcmpgtshlo','wcmpgtshmi','wcmpgtshpl','wcmpgtshvs','wcmpgtshvc','wcmpgtshhi','wcmpgtshls','wcmpgtshge','wcmpgtshlt','wcmpgtshgt','wcmpgtshle',
+            'wcmpgtsweq','wcmpgtswne','wcmpgtswcs','wcmpgtswhs','wcmpgtswcc','wcmpgtswlo','wcmpgtswmi','wcmpgtswpl','wcmpgtswvs','wcmpgtswvc','wcmpgtswhi','wcmpgtswls','wcmpgtswge','wcmpgtswlt','wcmpgtswgt','wcmpgtswle',
+            'wcmpgtubeq','wcmpgtubne','wcmpgtubcs','wcmpgtubhs','wcmpgtubcc','wcmpgtublo','wcmpgtubmi','wcmpgtubpl','wcmpgtubvs','wcmpgtubvc','wcmpgtubhi','wcmpgtubls','wcmpgtubge','wcmpgtublt','wcmpgtubgt','wcmpgtuble',
+            'wcmpgtuheq','wcmpgtuhne','wcmpgtuhcs','wcmpgtuhhs','wcmpgtuhcc','wcmpgtuhlo','wcmpgtuhmi','wcmpgtuhpl','wcmpgtuhvs','wcmpgtuhvc','wcmpgtuhhi','wcmpgtuhls','wcmpgtuhge','wcmpgtuhlt','wcmpgtuhgt','wcmpgtuhle',
+            'wcmpgtuweq','wcmpgtuwne','wcmpgtuwcs','wcmpgtuwhs','wcmpgtuwcc','wcmpgtuwlo','wcmpgtuwmi','wcmpgtuwpl','wcmpgtuwvs','wcmpgtuwvc','wcmpgtuwhi','wcmpgtuwls','wcmpgtuwge','wcmpgtuwlt','wcmpgtuwgt','wcmpgtuwle',
+            'wldrbeq','wldrbne','wldrbcs','wldrbhs','wldrbcc','wldrblo','wldrbmi','wldrbpl','wldrbvs','wldrbvc','wldrbhi','wldrbls','wldrbge','wldrblt','wldrbgt','wldrble',
+            'wldrheq','wldrhne','wldrhcs','wldrhhs','wldrhcc','wldrhlo','wldrhmi','wldrhpl','wldrhvs','wldrhvc','wldrhhi','wldrhls','wldrhge','wldrhlt','wldrhgt','wldrhle',
+            'wldrweq','wldrwne','wldrwcs','wldrwhs','wldrwcc','wldrwlo','wldrwmi','wldrwpl','wldrwvs','wldrwvc','wldrwhi','wldrwls','wldrwge','wldrwlt','wldrwgt','wldrwle',
+            'wldrdeq','wldrdne','wldrdcs','wldrdhs','wldrdcc','wldrdlo','wldrdmi','wldrdpl','wldrdvs','wldrdvc','wldrdhi','wldrdls','wldrdge','wldrdlt','wldrdgt','wldrdle',
+            'wmacseq','wmacsne','wmacscs','wmacshs','wmacscc','wmacslo','wmacsmi','wmacspl','wmacsvs','wmacsvc','wmacshi','wmacsls','wmacsge','wmacslt','wmacsgt','wmacsle',
+            'wmacueq','wmacune','wmacucs','wmacuhs','wmacucc','wmaculo','wmacumi','wmacupl','wmacuvs','wmacuvc','wmacuhi','wmaculs','wmacuge','wmacult','wmacugt','wmacule',
+            'wmacszeq','wmacszne','wmacszcs','wmacszhs','wmacszcc','wmacszlo','wmacszmi','wmacszpl','wmacszvs','wmacszvc','wmacszhi','wmacszls','wmacszge','wmacszlt','wmacszgt','wmacszle',
+            'wmacuzeq','wmacuzne','wmacuzcs','wmacuzhs','wmacuzcc','wmacuzlo','wmacuzmi','wmacuzpl','wmacuzvs','wmacuzvc','wmacuzhi','wmacuzls','wmacuzge','wmacuzlt','wmacuzgt','wmacuzle',
+            'wmaddseq','wmaddsne','wmaddscs','wmaddshs','wmaddscc','wmaddslo','wmaddsmi','wmaddspl','wmaddsvs','wmaddsvc','wmaddshi','wmaddsls','wmaddsge','wmaddslt','wmaddsgt','wmaddsle',
+            'wmaddueq','wmaddune','wmadducs','wmadduhs','wmadducc','wmaddulo','wmaddumi','wmaddupl','wmadduvs','wmadduvc','wmadduhi','wmadduls','wmadduge','wmaddult','wmaddugt','wmaddule',
+            'wmaddsxeq','wmaddsxne','wmaddsxcs','wmaddsxhs','wmaddsxcc','wmaddsxlo','wmaddsxmi','wmaddsxpl','wmaddsxvs','wmaddsxvc','wmaddsxhi','wmaddsxls','wmaddsxge','wmaddsxlt','wmaddsxgt','wmaddsxle',
+            'wmadduxeq','wmadduxne','wmadduxcs','wmadduxhs','wmadduxcc','wmadduxlo','wmadduxmi','wmadduxpl','wmadduxvs','wmadduxvc','wmadduxhi','wmadduxls','wmadduxge','wmadduxlt','wmadduxgt','wmadduxle',
+            'wmaddsneq','wmaddsnne','wmaddsncs','wmaddsnhs','wmaddsncc','wmaddsnlo','wmaddsnmi','wmaddsnpl','wmaddsnvs','wmaddsnvc','wmaddsnhi','wmaddsnls','wmaddsnge','wmaddsnlt','wmaddsngt','wmaddsnle',
+            'wmadduneq','wmaddunne','wmadduncs','wmaddunhs','wmadduncc','wmaddunlo','wmaddunmi','wmaddunpl','wmaddunvs','wmaddunvc','wmaddunhi','wmaddunls','wmaddunge','wmaddunlt','wmaddungt','wmaddunle',
+            'wmaxsbeq','wmaxsbne','wmaxsbcs','wmaxsbhs','wmaxsbcc','wmaxsblo','wmaxsbmi','wmaxsbpl','wmaxsbvs','wmaxsbvc','wmaxsbhi','wmaxsbls','wmaxsbge','wmaxsblt','wmaxsbgt','wmaxsble',
+            'wmaxsheq','wmaxshne','wmaxshcs','wmaxshhs','wmaxshcc','wmaxshlo','wmaxshmi','wmaxshpl','wmaxshvs','wmaxshvc','wmaxshhi','wmaxshls','wmaxshge','wmaxshlt','wmaxshgt','wmaxshle',
+            'wmaxsweq','wmaxswne','wmaxswcs','wmaxswhs','wmaxswcc','wmaxswlo','wmaxswmi','wmaxswpl','wmaxswvs','wmaxswvc','wmaxswhi','wmaxswls','wmaxswge','wmaxswlt','wmaxswgt','wmaxswle',
+            'wmaxubeq','wmaxubne','wmaxubcs','wmaxubhs','wmaxubcc','wmaxublo','wmaxubmi','wmaxubpl','wmaxubvs','wmaxubvc','wmaxubhi','wmaxubls','wmaxubge','wmaxublt','wmaxubgt','wmaxuble',
+            'wmaxuheq','wmaxuhne','wmaxuhcs','wmaxuhhs','wmaxuhcc','wmaxuhlo','wmaxuhmi','wmaxuhpl','wmaxuhvs','wmaxuhvc','wmaxuhhi','wmaxuhls','wmaxuhge','wmaxuhlt','wmaxuhgt','wmaxuhle',
+            'wmaxuweq','wmaxuwne','wmaxuwcs','wmaxuwhs','wmaxuwcc','wmaxuwlo','wmaxuwmi','wmaxuwpl','wmaxuwvs','wmaxuwvc','wmaxuwhi','wmaxuwls','wmaxuwge','wmaxuwlt','wmaxuwgt','wmaxuwle',
+            'wmergeeq','wmergene','wmergecs','wmergehs','wmergecc','wmergelo','wmergemi','wmergepl','wmergevs','wmergevc','wmergehi','wmergels','wmergege','wmergelt','wmergegt','wmergele',
+            'wmiabbeq','wmiabbne','wmiabbcs','wmiabbhs','wmiabbcc','wmiabblo','wmiabbmi','wmiabbpl','wmiabbvs','wmiabbvc','wmiabbhi','wmiabbls','wmiabbge','wmiabblt','wmiabbgt','wmiabble',
+            'wmiabteq','wmiabtne','wmiabtcs','wmiabths','wmiabtcc','wmiabtlo','wmiabtmi','wmiabtpl','wmiabtvs','wmiabtvc','wmiabthi','wmiabtls','wmiabtge','wmiabtlt','wmiabtgt','wmiabtle',
+            'wmiatbeq','wmiatbne','wmiatbcs','wmiatbhs','wmiatbcc','wmiatblo','wmiatbmi','wmiatbpl','wmiatbvs','wmiatbvc','wmiatbhi','wmiatbls','wmiatbge','wmiatblt','wmiatbgt','wmiatble',
+            'wmiatteq','wmiattne','wmiattcs','wmiatths','wmiattcc','wmiattlo','wmiattmi','wmiattpl','wmiattvs','wmiattvc','wmiatthi','wmiattls','wmiattge','wmiattlt','wmiattgt','wmiattle',
+            'wmiabbneq','wmiabbnne','wmiabbncs','wmiabbnhs','wmiabbncc','wmiabbnlo','wmiabbnmi','wmiabbnpl','wmiabbnvs','wmiabbnvc','wmiabbnhi','wmiabbnls','wmiabbnge','wmiabbnlt','wmiabbngt','wmiabbnle',
+            'wmiabtneq','wmiabtnne','wmiabtncs','wmiabtnhs','wmiabtncc','wmiabtnlo','wmiabtnmi','wmiabtnpl','wmiabtnvs','wmiabtnvc','wmiabtnhi','wmiabtnls','wmiabtnge','wmiabtnlt','wmiabtngt','wmiabtnle',
+            'wmiatbneq','wmiatbnne','wmiatbncs','wmiatbnhs','wmiatbncc','wmiatbnlo','wmiatbnmi','wmiatbnpl','wmiatbnvs','wmiatbnvc','wmiatbnhi','wmiatbnls','wmiatbnge','wmiatbnlt','wmiatbngt','wmiatbnle',
+            'wmiattneq','wmiattnne','wmiattncs','wmiattnhs','wmiattncc','wmiattnlo','wmiattnmi','wmiattnpl','wmiattnvs','wmiattnvc','wmiattnhi','wmiattnls','wmiattnge','wmiattnlt','wmiattngt','wmiattnle',
+            'wmiawbbeq','wmiawbbne','wmiawbbcs','wmiawbbhs','wmiawbbcc','wmiawbblo','wmiawbbmi','wmiawbbpl','wmiawbbvs','wmiawbbvc','wmiawbbhi','wmiawbbls','wmiawbbge','wmiawbblt','wmiawbbgt','wmiawbble',
+            'wmiawbteq','wmiawbtne','wmiawbtcs','wmiawbths','wmiawbtcc','wmiawbtlo','wmiawbtmi','wmiawbtpl','wmiawbtvs','wmiawbtvc','wmiawbthi','wmiawbtls','wmiawbtge','wmiawbtlt','wmiawbtgt','wmiawbtle',
+            'wmiawtbeq','wmiawtbne','wmiawtbcs','wmiawtbhs','wmiawtbcc','wmiawtblo','wmiawtbmi','wmiawtbpl','wmiawtbvs','wmiawtbvc','wmiawtbhi','wmiawtbls','wmiawtbge','wmiawtblt','wmiawtbgt','wmiawtble',
+            'wmiawtteq','wmiawttne','wmiawttcs','wmiawtths','wmiawttcc','wmiawttlo','wmiawttmi','wmiawttpl','wmiawttvs','wmiawttvc','wmiawtthi','wmiawttls','wmiawttge','wmiawttlt','wmiawttgt','wmiawttle',
+            'wmiawbbneq','wmiawbbnne','wmiawbbncs','wmiawbbnhs','wmiawbbncc','wmiawbbnlo','wmiawbbnmi','wmiawbbnpl','wmiawbbnvs','wmiawbbnvc','wmiawbbnhi','wmiawbbnls','wmiawbbnge','wmiawbbnlt','wmiawbbngt','wmiawbbnle',
+            'wmiawbtneq','wmiawbtnne','wmiawbtncs','wmiawbtnhs','wmiawbtncc','wmiawbtnlo','wmiawbtnmi','wmiawbtnpl','wmiawbtnvs','wmiawbtnvc','wmiawbtnhi','wmiawbtnls','wmiawbtnge','wmiawbtnlt','wmiawbtngt','wmiawbtnle',
+            'wmiawtbneq','wmiawtbnne','wmiawtbncs','wmiawtbnhs','wmiawtbncc','wmiawtbnlo','wmiawtbnmi','wmiawtbnpl','wmiawtbnvs','wmiawtbnvc','wmiawtbnhi','wmiawtbnls','wmiawtbnge','wmiawtbnlt','wmiawtbngt','wmiawtbnle',
+            'wmiawttneq','wmiawttnne','wmiawttncs','wmiawttnhs','wmiawttncc','wmiawttnlo','wmiawttnmi','wmiawttnpl','wmiawttnvs','wmiawttnvc','wmiawttnhi','wmiawttnls','wmiawttnge','wmiawttnlt','wmiawttngt','wmiawttnle',
+            'wminsbeq','wminsbne','wminsbcs','wminsbhs','wminsbcc','wminsblo','wminsbmi','wminsbpl','wminsbvs','wminsbvc','wminsbhi','wminsbls','wminsbge','wminsblt','wminsbgt','wminsble',
+            'wminsheq','wminshne','wminshcs','wminshhs','wminshcc','wminshlo','wminshmi','wminshpl','wminshvs','wminshvc','wminshhi','wminshls','wminshge','wminshlt','wminshgt','wminshle',
+            'wminsweq','wminswne','wminswcs','wminswhs','wminswcc','wminswlo','wminswmi','wminswpl','wminswvs','wminswvc','wminswhi','wminswls','wminswge','wminswlt','wminswgt','wminswle',
+            'wminubeq','wminubne','wminubcs','wminubhs','wminubcc','wminublo','wminubmi','wminubpl','wminubvs','wminubvc','wminubhi','wminubls','wminubge','wminublt','wminubgt','wminuble',
+            'wminuheq','wminuhne','wminuhcs','wminuhhs','wminuhcc','wminuhlo','wminuhmi','wminuhpl','wminuhvs','wminuhvc','wminuhhi','wminuhls','wminuhge','wminuhlt','wminuhgt','wminuhle',
+            'wminuweq','wminuwne','wminuwcs','wminuwhs','wminuwcc','wminuwlo','wminuwmi','wminuwpl','wminuwvs','wminuwvc','wminuwhi','wminuwls','wminuwge','wminuwlt','wminuwgt','wminuwle',
+            'wmoveq','wmovne','wmovcs','wmovhs','wmovcc','wmovlo','wmovmi','wmovpl','wmovvs','wmovvc','wmovhi','wmovls','wmovge','wmovlt','wmovgt','wmovle',
+            'wmulsmeq','wmulsmne','wmulsmcs','wmulsmhs','wmulsmcc','wmulsmlo','wmulsmmi','wmulsmpl','wmulsmvs','wmulsmvc','wmulsmhi','wmulsmls','wmulsmge','wmulsmlt','wmulsmgt','wmulsmle',
+            'wmulsleq','wmulslne','wmulslcs','wmulslhs','wmulslcc','wmulsllo','wmulslmi','wmulslpl','wmulslvs','wmulslvc','wmulslhi','wmulslls','wmulslge','wmulsllt','wmulslgt','wmulslle',
+            'wmulumeq','wmulumne','wmulumcs','wmulumhs','wmulumcc','wmulumlo','wmulummi','wmulumpl','wmulumvs','wmulumvc','wmulumhi','wmulumls','wmulumge','wmulumlt','wmulumgt','wmulumle',
+            'wmululeq','wmululne','wmululcs','wmululhs','wmululcc','wmulullo','wmululmi','wmululpl','wmululvs','wmululvc','wmululhi','wmululls','wmululge','wmulullt','wmululgt','wmululle',
+            'wmulsmreq','wmulsmrne','wmulsmrcs','wmulsmrhs','wmulsmrcc','wmulsmrlo','wmulsmrmi','wmulsmrpl','wmulsmrvs','wmulsmrvc','wmulsmrhi','wmulsmrls','wmulsmrge','wmulsmrlt','wmulsmrgt','wmulsmrle',
+            'wmulslreq','wmulslrne','wmulslrcs','wmulslrhs','wmulslrcc','wmulslrlo','wmulslrmi','wmulslrpl','wmulslrvs','wmulslrvc','wmulslrhi','wmulslrls','wmulslrge','wmulslrlt','wmulslrgt','wmulslrle',
+            'wmulumreq','wmulumrne','wmulumrcs','wmulumrhs','wmulumrcc','wmulumrlo','wmulumrmi','wmulumrpl','wmulumrvs','wmulumrvc','wmulumrhi','wmulumrls','wmulumrge','wmulumrlt','wmulumrgt','wmulumrle',
+            'wmululreq','wmululrne','wmululrcs','wmululrhs','wmululrcc','wmululrlo','wmululrmi','wmululrpl','wmululrvs','wmululrvc','wmululrhi','wmululrls','wmululrge','wmululrlt','wmululrgt','wmululrle',
+            'wmulwumeq','wmulwumne','wmulwumcs','wmulwumhs','wmulwumcc','wmulwumlo','wmulwummi','wmulwumpl','wmulwumvs','wmulwumvc','wmulwumhi','wmulwumls','wmulwumge','wmulwumlt','wmulwumgt','wmulwumle',
+            'wmulwsmeq','wmulwsmne','wmulwsmcs','wmulwsmhs','wmulwsmcc','wmulwsmlo','wmulwsmmi','wmulwsmpl','wmulwsmvs','wmulwsmvc','wmulwsmhi','wmulwsmls','wmulwsmge','wmulwsmlt','wmulwsmgt','wmulwsmle',
+            'wmulwleq','wmulwlne','wmulwlcs','wmulwlhs','wmulwlcc','wmulwllo','wmulwlmi','wmulwlpl','wmulwlvs','wmulwlvc','wmulwlhi','wmulwlls','wmulwlge','wmulwllt','wmulwlgt','wmulwlle',
+            'wmulwumreq','wmulwumrne','wmulwumrcs','wmulwumrhs','wmulwumrcc','wmulwumrlo','wmulwumrmi','wmulwumrpl','wmulwumrvs','wmulwumrvc','wmulwumrhi','wmulwumrls','wmulwumrge','wmulwumrlt','wmulwumrgt','wmulwumrle',
+            'wmulwsmreq','wmulwsmrne','wmulwsmrcs','wmulwsmrhs','wmulwsmrcc','wmulwsmrlo','wmulwsmrmi','wmulwsmrpl','wmulwsmrvs','wmulwsmrvc','wmulwsmrhi','wmulwsmrls','wmulwsmrge','wmulwsmrlt','wmulwsmrgt','wmulwsmrle',
+            'woreq','worne','worcs','worhs','worcc','worlo','wormi','worpl','worvs','worvc','worhi','worls','worge','worlt','worgt','worle',
+            'wpackhsseq','wpackhssne','wpackhsscs','wpackhsshs','wpackhsscc','wpackhsslo','wpackhssmi','wpackhsspl','wpackhssvs','wpackhssvc','wpackhsshi','wpackhssls','wpackhssge','wpackhsslt','wpackhssgt','wpackhssle',
+            'wpackwsseq','wpackwssne','wpackwsscs','wpackwsshs','wpackwsscc','wpackwsslo','wpackwssmi','wpackwsspl','wpackwssvs','wpackwssvc','wpackwsshi','wpackwssls','wpackwssge','wpackwsslt','wpackwssgt','wpackwssle',
+            'wpackdsseq','wpackdssne','wpackdsscs','wpackdsshs','wpackdsscc','wpackdsslo','wpackdssmi','wpackdsspl','wpackdssvs','wpackdssvc','wpackdsshi','wpackdssls','wpackdssge','wpackdsslt','wpackdssgt','wpackdssle',
+            'wpackhuseq','wpackhusne','wpackhuscs','wpackhushs','wpackhuscc','wpackhuslo','wpackhusmi','wpackhuspl','wpackhusvs','wpackhusvc','wpackhushi','wpackhusls','wpackhusge','wpackhuslt','wpackhusgt','wpackhusle',
+            'wpackwuseq','wpackwusne','wpackwuscs','wpackwushs','wpackwuscc','wpackwuslo','wpackwusmi','wpackwuspl','wpackwusvs','wpackwusvc','wpackwushi','wpackwusls','wpackwusge','wpackwuslt','wpackwusgt','wpackwusle',
+            'wpackduseq','wpackdusne','wpackduscs','wpackdushs','wpackduscc','wpackduslo','wpackdusmi','wpackduspl','wpackdusvs','wpackdusvc','wpackdushi','wpackdusls','wpackdusge','wpackduslt','wpackdusgt','wpackdusle',
+            'wqmiabbeq','wqmiabbne','wqmiabbcs','wqmiabbhs','wqmiabbcc','wqmiabblo','wqmiabbmi','wqmiabbpl','wqmiabbvs','wqmiabbvc','wqmiabbhi','wqmiabbls','wqmiabbge','wqmiabblt','wqmiabbgt','wqmiabble',
+            'wqmiabteq','wqmiabtne','wqmiabtcs','wqmiabths','wqmiabtcc','wqmiabtlo','wqmiabtmi','wqmiabtpl','wqmiabtvs','wqmiabtvc','wqmiabthi','wqmiabtls','wqmiabtge','wqmiabtlt','wqmiabtgt','wqmiabtle',
+            'wqmiatbeq','wqmiatbne','wqmiatbcs','wqmiatbhs','wqmiatbcc','wqmiatblo','wqmiatbmi','wqmiatbpl','wqmiatbvs','wqmiatbvc','wqmiatbhi','wqmiatbls','wqmiatbge','wqmiatblt','wqmiatbgt','wqmiatble',
+            'wqmiatteq','wqmiattne','wqmiattcs','wqmiatths','wqmiattcc','wqmiattlo','wqmiattmi','wqmiattpl','wqmiattvs','wqmiattvc','wqmiatthi','wqmiattls','wqmiattge','wqmiattlt','wqmiattgt','wqmiattle',
+            'wqmiabbneq','wqmiabbnne','wqmiabbncs','wqmiabbnhs','wqmiabbncc','wqmiabbnlo','wqmiabbnmi','wqmiabbnpl','wqmiabbnvs','wqmiabbnvc','wqmiabbnhi','wqmiabbnls','wqmiabbnge','wqmiabbnlt','wqmiabbngt','wqmiabbnle',
+            'wqmiabtneq','wqmiabtnne','wqmiabtncs','wqmiabtnhs','wqmiabtncc','wqmiabtnlo','wqmiabtnmi','wqmiabtnpl','wqmiabtnvs','wqmiabtnvc','wqmiabtnhi','wqmiabtnls','wqmiabtnge','wqmiabtnlt','wqmiabtngt','wqmiabtnle',
+            'wqmiatbneq','wqmiatbnne','wqmiatbncs','wqmiatbnhs','wqmiatbncc','wqmiatbnlo','wqmiatbnmi','wqmiatbnpl','wqmiatbnvs','wqmiatbnvc','wqmiatbnhi','wqmiatbnls','wqmiatbnge','wqmiatbnlt','wqmiatbngt','wqmiatbnle',
+            'wqmiattneq','wqmiattnne','wqmiattncs','wqmiattnhs','wqmiattncc','wqmiattnlo','wqmiattnmi','wqmiattnpl','wqmiattnvs','wqmiattnvc','wqmiattnhi','wqmiattnls','wqmiattnge','wqmiattnlt','wqmiattngt','wqmiattnle',
+            'wqmulmeq','wqmulmne','wqmulmcs','wqmulmhs','wqmulmcc','wqmulmlo','wqmulmmi','wqmulmpl','wqmulmvs','wqmulmvc','wqmulmhi','wqmulmls','wqmulmge','wqmulmlt','wqmulmgt','wqmulmle',
+            'wqmulmreq','wqmulmrne','wqmulmrcs','wqmulmrhs','wqmulmrcc','wqmulmrlo','wqmulmrmi','wqmulmrpl','wqmulmrvs','wqmulmrvc','wqmulmrhi','wqmulmrls','wqmulmrge','wqmulmrlt','wqmulmrgt','wqmulmrle',
+            'wqmulwmeq','wqmulwmne','wqmulwmcs','wqmulwmhs','wqmulwmcc','wqmulwmlo','wqmulwmmi','wqmulwmpl','wqmulwmvs','wqmulwmvc','wqmulwmhi','wqmulwmls','wqmulwmge','wqmulwmlt','wqmulwmgt','wqmulwmle',
+            'wqmulwmreq','wqmulwmrne','wqmulwmrcs','wqmulwmrhs','wqmulwmrcc','wqmulwmrlo','wqmulwmrmi','wqmulwmrpl','wqmulwmrvs','wqmulwmrvc','wqmulwmrhi','wqmulwmrls','wqmulwmrge','wqmulwmrlt','wqmulwmrgt','wqmulwmrle',
+            'wrorheq','wrorhne','wrorhcs','wrorhhs','wrorhcc','wrorhlo','wrorhmi','wrorhpl','wrorhvs','wrorhvc','wrorhhi','wrorhls','wrorhge','wrorhlt','wrorhgt','wrorhle',
+            'wrorweq','wrorwne','wrorwcs','wrorwhs','wrorwcc','wrorwlo','wrorwmi','wrorwpl','wrorwvs','wrorwvc','wrorwhi','wrorwls','wrorwge','wrorwlt','wrorwgt','wrorwle',
+            'wrordeq','wrordne','wrordcs','wrordhs','wrordcc','wrordlo','wrordmi','wrordpl','wrordvs','wrordvc','wrordhi','wrordls','wrordge','wrordlt','wrordgt','wrordle',
+            'wrorhgeq','wrorhgne','wrorhgcs','wrorhghs','wrorhgcc','wrorhglo','wrorhgmi','wrorhgpl','wrorhgvs','wrorhgvc','wrorhghi','wrorhgls','wrorhgge','wrorhglt','wrorhggt','wrorhgle',
+            'wrorwgeq','wrorwgne','wrorwgcs','wrorwghs','wrorwgcc','wrorwglo','wrorwgmi','wrorwgpl','wrorwgvs','wrorwgvc','wrorwghi','wrorwgls','wrorwgge','wrorwglt','wrorwggt','wrorwgle',
+            'wrordgeq','wrordgne','wrordgcs','wrordghs','wrordgcc','wrordglo','wrordgmi','wrordgpl','wrordgvs','wrordgvc','wrordghi','wrordgls','wrordgge','wrordglt','wrordggt','wrordgle',
+            'wsadbeq','wsadbne','wsadbcs','wsadbhs','wsadbcc','wsadblo','wsadbmi','wsadbpl','wsadbvs','wsadbvc','wsadbhi','wsadbls','wsadbge','wsadblt','wsadbgt','wsadble',
+            'wsadheq','wsadhne','wsadhcs','wsadhhs','wsadhcc','wsadhlo','wsadhmi','wsadhpl','wsadhvs','wsadhvc','wsadhhi','wsadhls','wsadhge','wsadhlt','wsadhgt','wsadhle',
+            'wsadbzeq','wsadbzne','wsadbzcs','wsadbzhs','wsadbzcc','wsadbzlo','wsadbzmi','wsadbzpl','wsadbzvs','wsadbzvc','wsadbzhi','wsadbzls','wsadbzge','wsadbzlt','wsadbzgt','wsadbzle',
+            'wsadhzeq','wsadhzne','wsadhzcs','wsadhzhs','wsadhzcc','wsadhzlo','wsadhzmi','wsadhzpl','wsadhzvs','wsadhzvc','wsadhzhi','wsadhzls','wsadhzge','wsadhzlt','wsadhzgt','wsadhzle',
+            'wshufheq','wshufhne','wshufhcs','wshufhhs','wshufhcc','wshufhlo','wshufhmi','wshufhpl','wshufhvs','wshufhvc','wshufhhi','wshufhls','wshufhge','wshufhlt','wshufhgt','wshufhle',
+            'wsllheq','wsllhne','wsllhcs','wsllhhs','wsllhcc','wsllhlo','wsllhmi','wsllhpl','wsllhvs','wsllhvc','wsllhhi','wsllhls','wsllhge','wsllhlt','wsllhgt','wsllhle',
+            'wsllweq','wsllwne','wsllwcs','wsllwhs','wsllwcc','wsllwlo','wsllwmi','wsllwpl','wsllwvs','wsllwvc','wsllwhi','wsllwls','wsllwge','wsllwlt','wsllwgt','wsllwle',
+            'wslldeq','wslldne','wslldcs','wslldhs','wslldcc','wslldlo','wslldmi','wslldpl','wslldvs','wslldvc','wslldhi','wslldls','wslldge','wslldlt','wslldgt','wslldle',
+            'wsllhgeq','wsllhgne','wsllhgcs','wsllhghs','wsllhgcc','wsllhglo','wsllhgmi','wsllhgpl','wsllhgvs','wsllhgvc','wsllhghi','wsllhgls','wsllhgge','wsllhglt','wsllhggt','wsllhgle',
+            'wsllwgeq','wsllwgne','wsllwgcs','wsllwghs','wsllwgcc','wsllwglo','wsllwgmi','wsllwgpl','wsllwgvs','wsllwgvc','wsllwghi','wsllwgls','wsllwgge','wsllwglt','wsllwggt','wsllwgle',
+            'wslldgeq','wslldgne','wslldgcs','wslldghs','wslldgcc','wslldglo','wslldgmi','wslldgpl','wslldgvs','wslldgvc','wslldghi','wslldgls','wslldgge','wslldglt','wslldggt','wslldgle',
+            'wsraheq','wsrahne','wsrahcs','wsrahhs','wsrahcc','wsrahlo','wsrahmi','wsrahpl','wsrahvs','wsrahvc','wsrahhi','wsrahls','wsrahge','wsrahlt','wsrahgt','wsrahle',
+            'wsraweq','wsrawne','wsrawcs','wsrawhs','wsrawcc','wsrawlo','wsrawmi','wsrawpl','wsrawvs','wsrawvc','wsrawhi','wsrawls','wsrawge','wsrawlt','wsrawgt','wsrawle',
+            'wsradeq','wsradne','wsradcs','wsradhs','wsradcc','wsradlo','wsradmi','wsradpl','wsradvs','wsradvc','wsradhi','wsradls','wsradge','wsradlt','wsradgt','wsradle',
+            'wsrahgeq','wsrahgne','wsrahgcs','wsrahghs','wsrahgcc','wsrahglo','wsrahgmi','wsrahgpl','wsrahgvs','wsrahgvc','wsrahghi','wsrahgls','wsrahgge','wsrahglt','wsrahggt','wsrahgle',
+            'wsrawgeq','wsrawgne','wsrawgcs','wsrawghs','wsrawgcc','wsrawglo','wsrawgmi','wsrawgpl','wsrawgvs','wsrawgvc','wsrawghi','wsrawgls','wsrawgge','wsrawglt','wsrawggt','wsrawgle',
+            'wsradgeq','wsradgne','wsradgcs','wsradghs','wsradgcc','wsradglo','wsradgmi','wsradgpl','wsradgvs','wsradgvc','wsradghi','wsradgls','wsradgge','wsradglt','wsradggt','wsradgle',
+            'wsrlheq','wsrlhne','wsrlhcs','wsrlhhs','wsrlhcc','wsrlhlo','wsrlhmi','wsrlhpl','wsrlhvs','wsrlhvc','wsrlhhi','wsrlhls','wsrlhge','wsrlhlt','wsrlhgt','wsrlhle',
+            'wsrlweq','wsrlwne','wsrlwcs','wsrlwhs','wsrlwcc','wsrlwlo','wsrlwmi','wsrlwpl','wsrlwvs','wsrlwvc','wsrlwhi','wsrlwls','wsrlwge','wsrlwlt','wsrlwgt','wsrlwle',
+            'wsrldeq','wsrldne','wsrldcs','wsrldhs','wsrldcc','wsrldlo','wsrldmi','wsrldpl','wsrldvs','wsrldvc','wsrldhi','wsrldls','wsrldge','wsrldlt','wsrldgt','wsrldle',
+            'wsrlhgeq','wsrlhgne','wsrlhgcs','wsrlhghs','wsrlhgcc','wsrlhglo','wsrlhgmi','wsrlhgpl','wsrlhgvs','wsrlhgvc','wsrlhghi','wsrlhgls','wsrlhgge','wsrlhglt','wsrlhggt','wsrlhgle',
+            'wsrlwgeq','wsrlwgne','wsrlwgcs','wsrlwghs','wsrlwgcc','wsrlwglo','wsrlwgmi','wsrlwgpl','wsrlwgvs','wsrlwgvc','wsrlwghi','wsrlwgls','wsrlwgge','wsrlwglt','wsrlwggt','wsrlwgle',
+            'wsrldgeq','wsrldgne','wsrldgcs','wsrldghs','wsrldgcc','wsrldglo','wsrldgmi','wsrldgpl','wsrldgvs','wsrldgvc','wsrldghi','wsrldgls','wsrldgge','wsrldglt','wsrldggt','wsrldgle',
+            'wstrbeq','wstrbne','wstrbcs','wstrbhs','wstrbcc','wstrblo','wstrbmi','wstrbpl','wstrbvs','wstrbvc','wstrbhi','wstrbls','wstrbge','wstrblt','wstrbgt','wstrble',
+            'wstrheq','wstrhne','wstrhcs','wstrhhs','wstrhcc','wstrhlo','wstrhmi','wstrhpl','wstrhvs','wstrhvc','wstrhhi','wstrhls','wstrhge','wstrhlt','wstrhgt','wstrhle',
+            'wstrweq','wstrwne','wstrwcs','wstrwhs','wstrwcc','wstrwlo','wstrwmi','wstrwpl','wstrwvs','wstrwvc','wstrwhi','wstrwls','wstrwge','wstrwlt','wstrwgt','wstrwle',
+            'wstrdeq','wstrdne','wstrdcs','wstrdhs','wstrdcc','wstrdlo','wstrdmi','wstrdpl','wstrdvs','wstrdvc','wstrdhi','wstrdls','wstrdge','wstrdlt','wstrdgt','wstrdle',
+            'wsubbeq','wsubbne','wsubbcs','wsubbhs','wsubbcc','wsubblo','wsubbmi','wsubbpl','wsubbvs','wsubbvc','wsubbhi','wsubbls','wsubbge','wsubblt','wsubbgt','wsubble',
+            'wsubheq','wsubhne','wsubhcs','wsubhhs','wsubhcc','wsubhlo','wsubhmi','wsubhpl','wsubhvs','wsubhvc','wsubhhi','wsubhls','wsubhge','wsubhlt','wsubhgt','wsubhle',
+            'wsubweq','wsubwne','wsubwcs','wsubwhs','wsubwcc','wsubwlo','wsubwmi','wsubwpl','wsubwvs','wsubwvc','wsubwhi','wsubwls','wsubwge','wsubwlt','wsubwgt','wsubwle',
+            'wsubbsseq','wsubbssne','wsubbsscs','wsubbsshs','wsubbsscc','wsubbsslo','wsubbssmi','wsubbsspl','wsubbssvs','wsubbssvc','wsubbsshi','wsubbssls','wsubbssge','wsubbsslt','wsubbssgt','wsubbssle',
+            'wsubhsseq','wsubhssne','wsubhsscs','wsubhsshs','wsubhsscc','wsubhsslo','wsubhssmi','wsubhsspl','wsubhssvs','wsubhssvc','wsubhsshi','wsubhssls','wsubhssge','wsubhsslt','wsubhssgt','wsubhssle',
+            'wsubwsseq','wsubwssne','wsubwsscs','wsubwsshs','wsubwsscc','wsubwsslo','wsubwssmi','wsubwsspl','wsubwssvs','wsubwssvc','wsubwsshi','wsubwssls','wsubwssge','wsubwsslt','wsubwssgt','wsubwssle',
+            'wsubbuseq','wsubbusne','wsubbuscs','wsubbushs','wsubbuscc','wsubbuslo','wsubbusmi','wsubbuspl','wsubbusvs','wsubbusvc','wsubbushi','wsubbusls','wsubbusge','wsubbuslt','wsubbusgt','wsubbusle',
+            'wsubhuseq','wsubhusne','wsubhuscs','wsubhushs','wsubhuscc','wsubhuslo','wsubhusmi','wsubhuspl','wsubhusvs','wsubhusvc','wsubhushi','wsubhusls','wsubhusge','wsubhuslt','wsubhusgt','wsubhusle',
+            'wsubwuseq','wsubwusne','wsubwuscs','wsubwushs','wsubwuscc','wsubwuslo','wsubwusmi','wsubwuspl','wsubwusvs','wsubwusvc','wsubwushi','wsubwusls','wsubwusge','wsubwuslt','wsubwusgt','wsubwusle',
+            'wsubaddhxeq','wsubaddhxne','wsubaddhxcs','wsubaddhxhs','wsubaddhxcc','wsubaddhxlo','wsubaddhxmi','wsubaddhxpl','wsubaddhxvs','wsubaddhxvc','wsubaddhxhi','wsubaddhxls','wsubaddhxge','wsubaddhxlt','wsubaddhxgt','wsubaddhxle',
+            'wunpckehsbeq','wunpckehsbne','wunpckehsbcs','wunpckehsbhs','wunpckehsbcc','wunpckehsblo','wunpckehsbmi','wunpckehsbpl','wunpckehsbvs','wunpckehsbvc','wunpckehsbhi','wunpckehsbls','wunpckehsbge','wunpckehsblt','wunpckehsbgt','wunpckehsble',
+            'wunpckehsheq','wunpckehshne','wunpckehshcs','wunpckehshhs','wunpckehshcc','wunpckehshlo','wunpckehshmi','wunpckehshpl','wunpckehshvs','wunpckehshvc','wunpckehshhi','wunpckehshls','wunpckehshge','wunpckehshlt','wunpckehshgt','wunpckehshle',
+            'wunpckehsweq','wunpckehswne','wunpckehswcs','wunpckehswhs','wunpckehswcc','wunpckehswlo','wunpckehswmi','wunpckehswpl','wunpckehswvs','wunpckehswvc','wunpckehswhi','wunpckehswls','wunpckehswge','wunpckehswlt','wunpckehswgt','wunpckehswle',
+            'wunpckehubeq','wunpckehubne','wunpckehubcs','wunpckehubhs','wunpckehubcc','wunpckehublo','wunpckehubmi','wunpckehubpl','wunpckehubvs','wunpckehubvc','wunpckehubhi','wunpckehubls','wunpckehubge','wunpckehublt','wunpckehubgt','wunpckehuble',
+            'wunpckehuheq','wunpckehuhne','wunpckehuhcs','wunpckehuhhs','wunpckehuhcc','wunpckehuhlo','wunpckehuhmi','wunpckehuhpl','wunpckehuhvs','wunpckehuhvc','wunpckehuhhi','wunpckehuhls','wunpckehuhge','wunpckehuhlt','wunpckehuhgt','wunpckehuhle',
+            'wunpckehuweq','wunpckehuwne','wunpckehuwcs','wunpckehuwhs','wunpckehuwcc','wunpckehuwlo','wunpckehuwmi','wunpckehuwpl','wunpckehuwvs','wunpckehuwvc','wunpckehuwhi','wunpckehuwls','wunpckehuwge','wunpckehuwlt','wunpckehuwgt','wunpckehuwle',
+            'wunpckihbeq','wunpckihbne','wunpckihbcs','wunpckihbhs','wunpckihbcc','wunpckihblo','wunpckihbmi','wunpckihbpl','wunpckihbvs','wunpckihbvc','wunpckihbhi','wunpckihbls','wunpckihbge','wunpckihblt','wunpckihbgt','wunpckihble',
+            'wunpckihheq','wunpckihhne','wunpckihhcs','wunpckihhhs','wunpckihhcc','wunpckihhlo','wunpckihhmi','wunpckihhpl','wunpckihhvs','wunpckihhvc','wunpckihhhi','wunpckihhls','wunpckihhge','wunpckihhlt','wunpckihhgt','wunpckihhle',
+            'wunpckihweq','wunpckihwne','wunpckihwcs','wunpckihwhs','wunpckihwcc','wunpckihwlo','wunpckihwmi','wunpckihwpl','wunpckihwvs','wunpckihwvc','wunpckihwhi','wunpckihwls','wunpckihwge','wunpckihwlt','wunpckihwgt','wunpckihwle',
+            'wunpckelsbeq','wunpckelsbne','wunpckelsbcs','wunpckelsbhs','wunpckelsbcc','wunpckelsblo','wunpckelsbmi','wunpckelsbpl','wunpckelsbvs','wunpckelsbvc','wunpckelsbhi','wunpckelsbls','wunpckelsbge','wunpckelsblt','wunpckelsbgt','wunpckelsble',
+            'wunpckelsheq','wunpckelshne','wunpckelshcs','wunpckelshhs','wunpckelshcc','wunpckelshlo','wunpckelshmi','wunpckelshpl','wunpckelshvs','wunpckelshvc','wunpckelshhi','wunpckelshls','wunpckelshge','wunpckelshlt','wunpckelshgt','wunpckelshle',
+            'wunpckelsweq','wunpckelswne','wunpckelswcs','wunpckelswhs','wunpckelswcc','wunpckelswlo','wunpckelswmi','wunpckelswpl','wunpckelswvs','wunpckelswvc','wunpckelswhi','wunpckelswls','wunpckelswge','wunpckelswlt','wunpckelswgt','wunpckelswle',
+            'wunpckelubeq','wunpckelubne','wunpckelubcs','wunpckelubhs','wunpckelubcc','wunpckelublo','wunpckelubmi','wunpckelubpl','wunpckelubvs','wunpckelubvc','wunpckelubhi','wunpckelubls','wunpckelubge','wunpckelublt','wunpckelubgt','wunpckeluble',
+            'wunpckeluheq','wunpckeluhne','wunpckeluhcs','wunpckeluhhs','wunpckeluhcc','wunpckeluhlo','wunpckeluhmi','wunpckeluhpl','wunpckeluhvs','wunpckeluhvc','wunpckeluhhi','wunpckeluhls','wunpckeluhge','wunpckeluhlt','wunpckeluhgt','wunpckeluhle',
+            'wunpckeluweq','wunpckeluwne','wunpckeluwcs','wunpckeluwhs','wunpckeluwcc','wunpckeluwlo','wunpckeluwmi','wunpckeluwpl','wunpckeluwvs','wunpckeluwvc','wunpckeluwhi','wunpckeluwls','wunpckeluwge','wunpckeluwlt','wunpckeluwgt','wunpckeluwle',
+            'wunpckilbeq','wunpckilbne','wunpckilbcs','wunpckilbhs','wunpckilbcc','wunpckilblo','wunpckilbmi','wunpckilbpl','wunpckilbvs','wunpckilbvc','wunpckilbhi','wunpckilbls','wunpckilbge','wunpckilblt','wunpckilbgt','wunpckilble',
+            'wunpckilheq','wunpckilhne','wunpckilhcs','wunpckilhhs','wunpckilhcc','wunpckilhlo','wunpckilhmi','wunpckilhpl','wunpckilhvs','wunpckilhvc','wunpckilhhi','wunpckilhls','wunpckilhge','wunpckilhlt','wunpckilhgt','wunpckilhle',
+            'wunpckilweq','wunpckilwne','wunpckilwcs','wunpckilwhs','wunpckilwcc','wunpckilwlo','wunpckilwmi','wunpckilwpl','wunpckilwvs','wunpckilwvc','wunpckilwhi','wunpckilwls','wunpckilwge','wunpckilwlt','wunpckilwgt','wunpckilwle',
+            'wxoreq','wxorne','wxorcs','wxorhs','wxorcc','wxorlo','wxormi','wxorpl','wxorvs','wxorvc','wxorhi','wxorls','wxorge','wxorlt','wxorgt','wxorle',
+            'wzeroeq','wzerone','wzerocs','wzerohs','wzerocc','wzerolo','wzeromi','wzeropl','wzerovs','wzerovc','wzerohi','wzerols','wzeroge','wzerolt','wzerogt','wzerole'
+            ),
+        /* Unconditional VFPv3 & NEON SIMD Memory Access Instructions */
+        19 => array(
+            /* Unconditional VFPv3 & NEON SIMD Memory Access: Loads */
+            'vld.8','vldal.8',
+            'vld.16','vldal.16',
+            'vld.32','vldal.32',
+            'vld.64','vldal.64',
+
+            'vld1.8','vld1al.8',
+            'vld1.16','vld1al.16',
+            'vld1.32','vld1al.32',
+
+            'vld2.8','vld2al.8',
+            'vld2.16','vld2al.16',
+            'vld2.32','vld2al.32',
+
+            'vld3.8','vld3al.8',
+            'vld3.16','vld3al.16',
+            'vld3.32','vld3al.32',
+
+            'vld4.8','vld4al.8',
+            'vld4.16','vld4al.16',
+            'vld4.32','vld4al.32',
+
+            'vldm','vldmal',
+            'vldm.32','vldmal.32',
+            'vldm.64','vldmal.64',
+
+            'vldmia','vldmiaal',
+            'vldmia.32','vldmiaal.32',
+            'vldmia.64','vldmiaal.64',
+
+            'vldmdb','vldmdbal',
+            'vldmdb.32','vldmdbal.32',
+            'vldmdb.64','vldmdbal.64',
+
+            'vldr','vldral',
+            'vldr.32','vldral.32',
+            'vldr.64','vldral.64',
+
+            'vpop','vpopal',
+            'vpop.32','vpopal.32',
+            'vpop.64','vpopal.64',
+
+            /* Unconditional VFPv3 & NEON SIMD Memory Access: Stores */
+            'vst1.8','vst1al.8',
+            'vst1.16','vst1al.16',
+            'vst1.32','vst1al.32',
+            'vst1.64','vst1al.64',
+
+            'vst2.8','vst2al.8',
+            'vst2.16','vst2al.16',
+            'vst2.32','vst2al.32',
+
+            'vst3.8','vst3al.8',
+            'vst3.16','vst3al.16',
+            'vst3.32','vst3al.32',
+
+            'vst4.8','vst4al.8',
+            'vst4.16','vst4al.16',
+            'vst4.32','vst4al.32',
+
+            'vstm','vstmal',
+            'vstm.32','vstmal.32',
+            'vstm.64','vstmal.64',
+
+            'vstmia','vstmiaal',
+            'vstmia.32','vstmiaal.32',
+            'vstmia.64','vstmiaal.64',
+
+            'vstmdb','vstmdbal',
+            'vstmdb.32','vstmdbal.32',
+            'vstmdb.64','vstmdbal.64',
+
+            'vstr','vstral',
+            'vstr.32','vstral.32',
+            'vstr.64','vstral.64',
+
+            'vpush','vpushal',
+            'vpush.32','vpushal.32',
+            'vpush.64','vpushal.64'
+            ),
+        /* Unconditional NEON SIMD Logical Instructions */
+        20 => array(
+            'vand','vandal',
+            'vand.i8','vandal.i8',
+            'vand.i16','vandal.i16',
+            'vand.i32','vandal.i32',
+            'vand.i64','vandal.i64',
+            'vand.s8','vandal.s8',
+            'vand.s16','vandal.s16',
+            'vand.s32','vandal.s32',
+            'vand.s64','vandal.s64',
+            'vand.u8','vandal.u8',
+            'vand.u16','vandal.u16',
+            'vand.u32','vandal.u32',
+            'vand.u64','vandal.u64',
+            'vand.f32','vandal.f32',
+            'vand.f64','vandal.f64',
+
+            'vbic','vbical',
+            'vbic.i8','vbical.i8',
+            'vbic.i16','vbical.i16',
+            'vbic.i32','vbical.i32',
+            'vbic.i64','vbical.i64',
+            'vbic.s8','vbical.s8',
+            'vbic.s16','vbical.s16',
+            'vbic.s32','vbical.s32',
+            'vbic.s64','vbical.s64',
+            'vbic.u8','vbical.u8',
+            'vbic.u16','vbical.u16',
+            'vbic.u32','vbical.u32',
+            'vbic.u64','vbical.u64',
+            'vbic.f32','vbical.f32',
+            'vbic.f64','vbical.f64',
+
+            'vbif','vbifal',
+            'vbif.i8','vbifal.i8',
+            'vbif.i16','vbifal.i16',
+            'vbif.i32','vbifal.i32',
+            'vbif.i64','vbifal.i64',
+            'vbif.s8','vbifal.s8',
+            'vbif.s16','vbifal.s16',
+            'vbif.s32','vbifal.s32',
+            'vbif.s64','vbifal.s64',
+            'vbif.u8','vbifal.u8',
+            'vbif.u16','vbifal.u16',
+            'vbif.u32','vbifal.u32',
+            'vbif.u64','vbifal.u64',
+            'vbif.f32','vbifal.f32',
+            'vbif.f64','vbifal.f64',
+
+            'vbit','vbital',
+            'vbit.i8','vbital.i8',
+            'vbit.i16','vbital.i16',
+            'vbit.i32','vbital.i32',
+            'vbit.i64','vbital.i64',
+            'vbit.s8','vbital.s8',
+            'vbit.s16','vbital.s16',
+            'vbit.s32','vbital.s32',
+            'vbit.s64','vbital.s64',
+            'vbit.u8','vbital.u8',
+            'vbit.u16','vbital.u16',
+            'vbit.u32','vbital.u32',
+            'vbit.u64','vbital.u64',
+            'vbit.f32','vbital.f32',
+            'vbit.f64','vbital.f64',
+
+            'vbsl','vbslal',
+            'vbsl.i8','vbslal.i8',
+            'vbsl.i16','vbslal.i16',
+            'vbsl.i32','vbslal.i32',
+            'vbsl.i64','vbslal.i64',
+            'vbsl.s8','vbslal.s8',
+            'vbsl.s16','vbslal.s16',
+            'vbsl.s32','vbslal.s32',
+            'vbsl.s64','vbslal.s64',
+            'vbsl.u8','vbslal.u8',
+            'vbsl.u16','vbslal.u16',
+            'vbsl.u32','vbslal.u32',
+            'vbsl.u64','vbslal.u64',
+            'vbsl.f32','vbslal.f32',
+            'vbsl.f64','vbslal.f64',
+
+            'veor','veoral',
+            'veor.i8','veoral.i8',
+            'veor.i16','veoral.i16',
+            'veor.i32','veoral.i32',
+            'veor.i64','veoral.i64',
+            'veor.s8','veoral.s8',
+            'veor.s16','veoral.s16',
+            'veor.s32','veoral.s32',
+            'veor.s64','veoral.s64',
+            'veor.u8','veoral.u8',
+            'veor.u16','veoral.u16',
+            'veor.u32','veoral.u32',
+            'veor.u64','veoral.u64',
+            'veor.f32','veoral.f32',
+            'veor.f64','veoral.f64',
+
+            'vmov','vmoval',
+            'vmov.8','vmoval.8',
+            'vmov.16','vmoval.16',
+            'vmov.32','vmoval.32',
+            'vmov.i8','vmoval.i8',
+            'vmov.i16','vmoval.i16',
+            'vmov.i32','vmoval.i32',
+            'vmov.i64','vmoval.i64',
+            'vmov.f32','vmoval.f32',
+            'vmov.f64','vmoval.f64',
+
+            'vmvn','vmvnal',
+            'vmvn.s8','vmvnal.s8',
+            'vmvn.s16','vmvnal.s16',
+            'vmvn.s32','vmvnal.s32',
+            'vmvn.s64','vmvnal.s64',
+            'vmvn.u8','vmvnal.u8',
+            'vmvn.u16','vmvnal.u16',
+            'vmvn.u32','vmvnal.u32',
+            'vmvn.u64','vmvnal.u64',
+            'vmvn.i8','vmvnal.i8',
+            'vmvn.i16','vmvnal.i16',
+            'vmvn.i32','vmvnal.i32',
+            'vmvn.i64','vmvnal.i64',
+            'vmvn.f32','vmvnal.f32',
+            'vmvn.f64','vmvnal.f64',
+
+            'vorn','vornal',
+            'vorn.s8','vornal.s8',
+            'vorn.s16','vornal.s16',
+            'vorn.s32','vornal.s32',
+            'vorn.s64','vornal.s64',
+            'vorn.u8','vornal.u8',
+            'vorn.u16','vornal.u16',
+            'vorn.u32','vornal.u32',
+            'vorn.u64','vornal.u64',
+            'vorn.i8','vornal.i8',
+            'vorn.i16','vornal.i16',
+            'vorn.i32','vornal.i32',
+            'vorn.i64','vornal.i64',
+            'vorn.f32','vornal.f32',
+            'vorn.f64','vornal.f64',
+
+            'vorr','vorral',
+            'vorr.s8','vorral.s8',
+            'vorr.s16','vorral.s16',
+            'vorr.s32','vorral.s32',
+            'vorr.s64','vorral.s64',
+            'vorr.u8','vorral.u8',
+            'vorr.u16','vorral.u16',
+            'vorr.u32','vorral.u32',
+            'vorr.u64','vorral.u64',
+            'vorr.i8','vorral.i8',
+            'vorr.i16','vorral.i16',
+            'vorr.i32','vorral.i32',
+            'vorr.i64','vorral.i64',
+            'vorr.f32','vorral.f32',
+            'vorr.f64','vorral.f64',
+
+            'vswp','vswpal',
+            'vswp.s8','vswpal.s8',
+            'vswp.s16','vswpal.s16',
+            'vswp.s32','vswpal.s32',
+            'vswp.s64','vswpal.s64',
+            'vswp.u8','vswpal.u8',
+            'vswp.u16','vswpal.u16',
+            'vswp.u32','vswpal.u32',
+            'vswp.u64','vswpal.u64',
+            'vswp.i8','vswpal.i8',
+            'vswp.i16','vswpal.i16',
+            'vswp.i32','vswpal.i32',
+            'vswp.i64','vswpal.i64',
+            'vswp.f32','vswpal.f32',
+            'vswp.f64','vswpal.f64'
+            ),
+        /* Unconditional NEON SIMD ARM Registers Interop Instructions */
+        21 => array(
+            'vmrs','vmrsal',
+            'vmsr','vmsral'
+            ),
+        /* Unconditional NEON SIMD Bit/Byte-Level Instructions */
+        22 => array(
+            'vcnt.8','vcntal.8',
+            'vdup.8','vdupal.8',
+
+            'vdup.16','vdupal.16',
+            'vdup.32','vdupal.32',
+
+            'vext.8','vextal.8',
+            'vext.16','vextal.16',
+
+            'vext.32','vextal.32',
+            'vext.64','vextal.64',
+
+            'vrev16.8','vrev16al.8',
+            'vrev32.8','vrev32al.8',
+            'vrev32.16','vrev32al.16',
+            'vrev64.8','vrev64al.8',
+            'vrev64.16','vrev64al.16',
+            'vrev64.32','vrev64al.32',
+
+            'vsli.8','vslial.8',
+            'vsli.16','vslial.16',
+            'vsli.32','vslial.32',
+            'vsli.64','vslial.64',
+
+            'vsri.8','vsrial.8',
+            'vsri.16','vsrial.16',
+            'vsri.32','vsrial.32',
+            'vsri.64','vsrial.64',
+
+            'vtbl.8','vtblal.8',
+
+            'vtbx','vtbxal',
+
+            'vtrn.8','vtrnal.8',
+            'vtrn.16','vtrnal.16',
+            'vtrn.32','vtrnal.32',
+
+            'vtst.8','vtstal.8',
+            'vtst.16','vtstal.16',
+            'vtst.32','vtstal.32',
+
+            'vuzp.8','vuzpal.8',
+            'vuzp.16','vuzpal.16',
+            'vuzp.32','vuzpal.32',
+
+            'vzip.8','vzipal.8',
+            'vzip.16','vzipal.16',
+            'vzip.32','vzipal.32',
+
+            'vmull.p8','vmullal.p8'
+            ),
+        /* Unconditional NEON SIMD Universal Integer Instructions */
+        23 => array(
+            'vadd.i8','vaddal.i8',
+            'vadd.i16','vaddal.i16',
+            'vadd.i32','vaddal.i32',
+            'vadd.i64','vaddal.i64',
+
+            'vsub.i8','vsubal.i8',
+            'vsub.i16','vsubal.i16',
+            'vsub.i32','vsubal.i32',
+            'vsub.i64','vsubal.i64',
+
+            'vaddhn.i16','vaddhnal.i16',
+            'vaddhn.i32','vaddhnal.i32',
+            'vaddhn.i64','vaddhnal.i64',
+
+            'vsubhn.i16','vsubhnal.i16',
+            'vsubhn.i32','vsubhnal.i32',
+            'vsubhn.i64','vsubhnal.i64',
+
+            'vraddhn.i16','vraddhnal.i16',
+            'vraddhn.i32','vraddhnal.i32',
+            'vraddhn.i64','vraddhnal.i64',
+
+            'vrsubhn.i16','vrsubhnal.i16',
+            'vrsubhn.i32','vrsubhnal.i32',
+            'vrsubhn.i64','vrsubhnal.i64',
+
+            'vpadd.i8','vpaddal.i8',
+            'vpadd.i16','vpaddal.i16',
+            'vpadd.i32','vpaddal.i32',
+
+            'vceq.i8','vceqal.i8',
+            'vceq.i16','vceqal.i16',
+            'vceq.i32','vceqal.i32',
+
+            'vclz.i8','vclzal.i8',
+            'vclz.i16','vclzal.i16',
+            'vclz.i32','vclzal.i32',
+
+            'vmovn.i16','vmovnal.i16',
+            'vmovn.i32','vmovnal.i32',
+            'vmovn.i64','vmovnal.i64',
+
+            'vmla.s8','vmlaal.s8',
+            'vmla.s16','vmlaal.s16',
+            'vmla.s32','vmlaal.s32',
+            'vmla.u8','vmlaal.u8',
+            'vmla.u16','vmlaal.u16',
+            'vmla.u32','vmlaal.u32',
+            'vmla.i8','vmlaal.i8',
+            'vmla.i16','vmlaal.i16',
+            'vmla.i32','vmlaal.i32',
+
+            'vmls.s8','vmlsal.s8',
+            'vmls.s16','vmlsal.s16',
+            'vmls.s32','vmlsal.s32',
+            'vmls.u8','vmlsal.u8',
+            'vmls.u16','vmlsal.u16',
+            'vmls.u32','vmlsal.u32',
+            'vmls.i8','vmlsal.i8',
+            'vmls.i16','vmlsal.i16',
+            'vmls.i32','vmlsal.i32',
+
+            'vmul.s8','vmulal.s8',
+            'vmul.s16','vmulal.s16',
+            'vmul.s32','vmulal.s32',
+            'vmul.u8','vmulal.u8',
+            'vmul.u16','vmulal.u16',
+            'vmul.u32','vmulal.u32',
+            'vmul.i8','vmulal.i8',
+            'vmul.i16','vmulal.i16',
+            'vmul.i32','vmulal.i32',
+            'vmul.p8','vmulal.p8',
+
+            'vrshrn.i16','vrshrnal.i16',
+            'vrshrn.i32','vrshrnal.i32',
+            'vrshrn.i64','vrshrnal.i64',
+
+            'vshrn.i16','vshrnal.i16',
+            'vshrn.i32','vshrnal.i32',
+            'vshrn.i64','vshrnal.i64',
+
+            'vshl.i8','vshlal.i8',
+            'vshl.i16','vshlal.i16',
+            'vshl.i32','vshlal.i32',
+            'vshl.i64','vshlal.i64',
+
+            'vshll.i8','vshllal.i8',
+            'vshll.i16','vshllal.i16',
+            'vshll.i32','vshllal.i32'
+            ),
+        /* Unconditional NEON SIMD Signed Integer Instructions */
+        24 => array(
+            'vaba.s8','vabaal.s8',
+            'vaba.s16','vabaal.s16',
+            'vaba.s32','vabaal.s32',
+
+            'vabal.s8','vabalal.s8',
+            'vabal.s16','vabalal.s16',
+            'vabal.s32','vabalal.s32',
+
+            'vabd.s8','vabdal.s8',
+            'vabd.s16','vabdal.s16',
+            'vabd.s32','vabdal.s32',
+
+            'vabs.s8','vabsal.s8',
+            'vabs.s16','vabsal.s16',
+            'vabs.s32','vabsal.s32',
+
+            'vaddl.s8','vaddlal.s8',
+            'vaddl.s16','vaddlal.s16',
+            'vaddl.s32','vaddlal.s32',
+
+            'vcge.s8','vcgeal.s8',
+            'vcge.s16','vcgeal.s16',
+            'vcge.s32','vcgeal.s32',
+
+            'vcle.s8','vcleal.s8',
+            'vcle.s16','vcleal.s16',
+            'vcle.s32','vcleal.s32',
+
+            'vcgt.s8','vcgtal.s8',
+            'vcgt.s16','vcgtal.s16',
+            'vcgt.s32','vcgtal.s32',
+
+            'vclt.s8','vcltal.s8',
+            'vclt.s16','vcltal.s16',
+            'vclt.s32','vcltal.s32',
+
+            'vcls.s8','vclsal.s8',
+            'vcls.s16','vclsal.s16',
+            'vcls.s32','vclsal.s32',
+
+            'vaddw.s8','vaddwal.s8',
+            'vaddw.s16','vaddwal.s16',
+            'vaddw.s32','vaddwal.s32',
+
+            'vhadd.s8','vhaddal.s8',
+            'vhadd.s16','vhaddal.s16',
+            'vhadd.s32','vhaddal.s32',
+
+            'vhsub.s8','vhsubal.s8',
+            'vhsub.s16','vhsubal.s16',
+            'vhsub.s32','vhsubal.s32',
+
+            'vmax.s8','vmaxal.s8',
+            'vmax.s16','vmaxal.s16',
+            'vmax.s32','vmaxal.s32',
+
+            'vmin.s8','vminal.s8',
+            'vmin.s16','vminal.s16',
+            'vmin.s32','vminal.s32',
+
+            'vmlal.s8','vmlalal.s8',
+            'vmlal.s16','vmlalal.s16',
+            'vmlal.s32','vmlalal.s32',
+
+            'vmlsl.s8','vmlslal.s8',
+            'vmlsl.s16','vmlslal.s16',
+            'vmlsl.s32','vmlslal.s32',
+
+            'vneg.s8','vnegal.s8',
+            'vneg.s16','vnegal.s16',
+            'vneg.s32','vnegal.s32',
+
+            'vpadal.s8','vpadalal.s8',
+            'vpadal.s16','vpadalal.s16',
+            'vpadal.s32','vpadalal.s32',
+
+            'vmovl.s8','vmovlal.s8',
+            'vmovl.s16','vmovlal.s16',
+            'vmovl.s32','vmovlal.s32',
+
+            'vmull.s8','vmullal.s8',
+            'vmull.s16','vmullal.s16',
+            'vmull.s32','vmullal.s32',
+
+            'vpaddl.s8','vpaddlal.s8',
+            'vpaddl.s16','vpaddlal.s16',
+            'vpaddl.s32','vpaddlal.s32',
+
+            'vpmax.s8','vpmaxal.s8',
+            'vpmax.s16','vpmaxal.s16',
+            'vpmax.s32','vpmaxal.s32',
+
+            'vpmin.s8','vpminal.s8',
+            'vpmin.s16','vpminal.s16',
+            'vpmin.s32','vpminal.s32',
+
+            'vqabs.s8','vqabsal.s8',
+            'vqabs.s16','vqabsal.s16',
+            'vqabs.s32','vqabsal.s32',
+
+            'vqadd.s8','vqaddal.s8',
+            'vqadd.s16','vqaddal.s16',
+            'vqadd.s32','vqaddal.s32',
+            'vqadd.s64','vqaddal.s64',
+
+            'vqdmlal.s16','vqdmlalal.s16',
+            'vqdmlal.s32','vqdmlalal.s32',
+
+            'vqdmlsl.s16','vqdmlslal.s16',
+            'vqdmlsl.s32','vqdmlslal.s32',
+
+            'vqdmulh.s16','vqdmulhal.s16',
+            'vqdmulh.s32','vqdmulhal.s32',
+
+            'vqdmull.s16','vqdmullal.s16',
+            'vqdmull.s32','vqdmullal.s32',
+
+            'vqmovn.s16','vqmovnal.s16',
+            'vqmovn.s32','vqmovnal.s32',
+            'vqmovn.s64','vqmovnal.s64',
+
+            'vqmovun.s16','vqmovunal.s16',
+            'vqmovun.s32','vqmovunal.s32',
+            'vqmovun.s64','vqmovunal.s64',
+
+            'vqneg.s8','vqnegal.s8',
+            'vqneg.s16','vqnegal.s16',
+            'vqneg.s32','vqnegal.s32',
+
+            'vqrdmulh.s16','vqrdmulhal.s16',
+            'vqrdmulh.s32','vqrdmulhal.s32',
+
+            'vqrshl.s8','vqrshlal.s8',
+            'vqrshl.s16','vqrshlal.s16',
+            'vqrshl.s32','vqrshlal.s32',
+            'vqrshl.s64','vqrshlal.s64',
+
+            'vqrshrn.s16','vqrshrnal.s16',
+            'vqrshrn.s32','vqrshrnal.s32',
+            'vqrshrn.s64','vqrshrnal.s64',
+
+            'vqrshrun.s16','vqrshrunal.s16',
+            'vqrshrun.s32','vqrshrunal.s32',
+            'vqrshrun.s64','vqrshrunal.s64',
+
+            'vqshl.s8','vqshlal.s8',
+            'vqshl.s16','vqshlal.s16',
+            'vqshl.s32','vqshlal.s32',
+            'vqshl.s64','vqshlal.s64',
+
+            'vqshlu.s8','vqshlual.s8',
+            'vqshlu.s16','vqshlual.s16',
+            'vqshlu.s32','vqshlual.s32',
+            'vqshlu.s64','vqshlual.s64',
+
+            'vqshrn.s16','vqshrnal.s16',
+            'vqshrn.s32','vqshrnal.s32',
+            'vqshrn.s64','vqshrnal.s64',
+
+            'vqshrun.s16','vqshrunal.s16',
+            'vqshrun.s32','vqshrunal.s32',
+            'vqshrun.s64','vqshrunal.s64',
+
+            'vqsub.s8','vqsubal.s8',
+            'vqsub.s16','vqsubal.s16',
+            'vqsub.s32','vqsubal.s32',
+            'vqsub.s64','vqsubal.s64',
+
+            'vrhadd.s8','vrhaddal.s8',
+            'vrhadd.s16','vrhaddal.s16',
+            'vrhadd.s32','vrhaddal.s32',
+
+            'vrshl.s8','vrshlal.s8',
+            'vrshl.s16','vrshlal.s16',
+            'vrshl.s32','vrshlal.s32',
+            'vrshl.s64','vrshlal.s64',
+
+            'vrshr.s8','vrshral.s8',
+            'vrshr.s16','vrshral.s16',
+            'vrshr.s32','vrshral.s32',
+            'vrshr.s64','vrshral.s64',
+
+            'vrsra.s8','vrsraal.s8',
+            'vrsra.s16','vrsraal.s16',
+            'vrsra.s32','vrsraal.s32',
+            'vrsra.s64','vrsraal.s64',
+
+            'vshl.s8','vshlal.s8',
+            'vshl.s16','vshlal.s16',
+            'vshl.s32','vshlal.s32',
+            'vshl.s64','vshlal.s64',
+
+            'vshll.s8','vshllal.s8',
+            'vshll.s16','vshllal.s16',
+            'vshll.s32','vshllal.s32',
+
+            'vshr.s8','vshral.s8',
+            'vshr.s16','vshral.s16',
+            'vshr.s32','vshral.s32',
+            'vshr.s64','vshral.s64',
+
+            'vsra.s8','vsraal.s8',
+            'vsra.s16','vsraal.s16',
+            'vsra.s32','vsraal.s32',
+            'vsra.s64','vsraal.s64',
+
+            'vsubl.s8','vsublal.s8',
+            'vsubl.s16','vsublal.s16',
+            'vsubl.s32','vsublal.s32',
+
+            'vsubh.s8','vsubhal.s8',
+            'vsubh.s16','vsubhal.s16',
+            'vsubh.s32','vsubhal.s32'
+            ),
+        /* Unconditional NEON SIMD Unsigned Integer Instructions */
+        25 => array(
+            'vaba.u8','vabaal.u8',
+            'vaba.u16','vabaal.u16',
+            'vaba.u32','vabaal.u32',
+
+            'vabal.u8','vabalal.u8',
+            'vabal.u16','vabalal.u16',
+            'vabal.u32','vabalal.u32',
+
+            'vabd.u8','vabdal.u8',
+            'vabd.u16','vabdal.u16',
+            'vabd.u32','vabdal.u32',
+
+            'vaddl.u8','vaddlal.u8',
+            'vaddl.u16','vaddlal.u16',
+            'vaddl.u32','vaddlal.u32',
+
+            'vsubl.u8','vsublal.u8',
+            'vsubl.u16','vsublal.u16',
+            'vsubl.u32','vsublal.u32',
+
+            'vaddw.u8','vaddwal.u8',
+            'vaddw.u16','vaddwal.u16',
+            'vaddw.u32','vaddwal.u32',
+
+            'vsubh.u8','vsubhal.u8',
+            'vsubh.u16','vsubhal.u16',
+            'vsubh.u32','vsubhal.u32',
+
+            'vhadd.u8','vhaddal.u8',
+            'vhadd.u16','vhaddal.u16',
+            'vhadd.u32','vhaddal.u32',
+
+            'vhsub.u8','vhsubal.u8',
+            'vhsub.u16','vhsubal.u16',
+            'vhsub.u32','vhsubal.u32',
+
+            'vpadal.u8','vpadalal.u8',
+            'vpadal.u16','vpadalal.u16',
+            'vpadal.u32','vpadalal.u32',
+
+            'vpaddl.u8','vpaddlal.u8',
+            'vpaddl.u16','vpaddlal.u16',
+            'vpaddl.u32','vpaddlal.u32',
+
+            'vcge.u8','vcgeal.u8',
+            'vcge.u16','vcgeal.u16',
+            'vcge.u32','vcgeal.u32',
+
+            'vcle.u8','vcleal.u8',
+            'vcle.u16','vcleal.u16',
+            'vcle.u32','vcleal.u32',
+
+            'vcgt.u8','vcgtal.u8',
+            'vcgt.u16','vcgtal.u16',
+            'vcgt.u32','vcgtal.u32',
+
+            'vclt.u8','vcltal.u8',
+            'vclt.u16','vcltal.u16',
+            'vclt.u32','vcltal.u32',
+
+            'vmax.u8','vmaxal.u8',
+            'vmax.u16','vmaxal.u16',
+            'vmax.u32','vmaxal.u32',
+
+            'vmin.u8','vminal.u8',
+            'vmin.u16','vminal.u16',
+            'vmin.u32','vminal.u32',
+
+            'vmlal.u8','vmlalal.u8',
+            'vmlal.u16','vmlalal.u16',
+            'vmlal.u32','vmlalal.u32',
+
+            'vmlsl.u8','vmlslal.u8',
+            'vmlsl.u16','vmlslal.u16',
+            'vmlsl.u32','vmlslal.u32',
+
+            'vmull.u8','vmullal.u8',
+            'vmull.u16','vmullal.u16',
+            'vmull.u32','vmullal.u32',
+
+            'vmovl.u8','vmovlal.u8',
+            'vmovl.u16','vmovlal.u16',
+            'vmovl.u32','vmovlal.u32',
+
+            'vshl.u8','vshlal.u8',
+            'vshl.u16','vshlal.u16',
+            'vshl.u32','vshlal.u32',
+            'vshl.u64','vshlal.u64',
+
+            'vshll.u8','vshllal.u8',
+            'vshll.u16','vshllal.u16',
+            'vshll.u32','vshllal.u32',
+
+            'vshr.u8','vshral.u8',
+            'vshr.u16','vshral.u16',
+            'vshr.u32','vshral.u32',
+            'vshr.u64','vshral.u64',
+
+            'vsra.u8','vsraal.u8',
+            'vsra.u16','vsraal.u16',
+            'vsra.u32','vsraal.u32',
+            'vsra.u64','vsraal.u64',
+
+            'vpmax.u8','vpmaxal.u8',
+            'vpmax.u16','vpmaxal.u16',
+            'vpmax.u32','vpmaxal.u32',
+
+            'vpmin.u8','vpminal.u8',
+            'vpmin.u16','vpminal.u16',
+            'vpmin.u32','vpminal.u32',
+
+            'vqadd.u8','vqaddal.u8',
+            'vqadd.u16','vqaddal.u16',
+            'vqadd.u32','vqaddal.u32',
+            'vqadd.u64','vqaddal.u64',
+
+            'vqsub.u8','vqsubal.u8',
+            'vqsub.u16','vqsubal.u16',
+            'vqsub.u32','vqsubal.u32',
+            'vqsub.u64','vqsubal.u64',
+
+            'vqmovn.u16','vqmovnal.u16',
+            'vqmovn.u32','vqmovnal.u32',
+            'vqmovn.u64','vqmovnal.u64',
+
+            'vqshl.u8','vqshlal.u8',
+            'vqshl.u16','vqshlal.u16',
+            'vqshl.u32','vqshlal.u32',
+            'vqshl.u64','vqshlal.u64',
+
+            'vqshrn.u16','vqshrnal.u16',
+            'vqshrn.u32','vqshrnal.u32',
+            'vqshrn.u64','vqshrnal.u64',
+
+            'vqrshl.u8','vqrshlal.u8',
+            'vqrshl.u16','vqrshlal.u16',
+            'vqrshl.u32','vqrshlal.u32',
+            'vqrshl.u64','vqrshlal.u64',
+
+            'vqrshrn.u16','vqrshrnal.u16',
+            'vqrshrn.u32','vqrshrnal.u32',
+            'vqrshrn.u64','vqrshrnal.u64',
+
+            'vrhadd.u8','vrhaddal.u8',
+            'vrhadd.u16','vrhaddal.u16',
+            'vrhadd.u32','vrhaddal.u32',
+
+            'vrshl.u8','vrshlal.u8',
+            'vrshl.u16','vrshlal.u16',
+            'vrshl.u32','vrshlal.u32',
+            'vrshl.u64','vrshlal.u64',
+
+            'vrshr.u8','vrshral.u8',
+            'vrshr.u16','vrshral.u16',
+            'vrshr.u32','vrshral.u32',
+            'vrshr.u64','vrshral.u64',
+
+            'vrsra.u8','vrsraal.u8',
+            'vrsra.u16','vrsraal.u16',
+            'vrsra.u32','vrsraal.u32',
+            'vrsra.u64','vrsraal.u64'
+            ),
+        /* Unconditional VFPv3 & NEON SIMD Floating-Point Instructions */
+        26 => array(
+            'vabd.f32','vabdal.f32',
+
+            'vabs.f32','vabsal.f32',
+            'vabs.f64','vabsal.f64',
+
+            'vacge.f32','vacgeal.f32',
+            'vacgt.f32','vacgtal.f32',
+            'vacle.f32','vacleal.f32',
+            'vaclt.f32','vacltal.f32',
+
+            'vadd.f32','vaddal.f32',
+            'vadd.f64','vaddal.f64',
+
+            'vceq.f32','vceqal.f32',
+            'vcge.f32','vcgeal.f32',
+            'vcle.f32','vcleal.f32',
+            'vcgt.f32','vcgtal.f32',
+            'vclt.f32','vcltal.f32',
+
+            'vcmp.f32','vcmpal.f32',
+            'vcmp.f64','vcmpal.f64',
+
+            'vcmpe.f32','vcmpeal.f32',
+            'vcmpe.f64','vcmpeal.f64',
+
+            'vcvt.s16.f32','vcvtal.s16.f32',
+            'vcvt.s16.f64','vcvtal.s16.f64',
+            'vcvt.s32.f32','vcvtal.s32.f32',
+            'vcvt.s32.f64','vcvtal.s32.f64',
+            'vcvt.u16.f32','vcvtal.u16.f32',
+            'vcvt.u16.f64','vcvtal.u16.f64',
+            'vcvt.u32.f32','vcvtal.u32.f32',
+            'vcvt.u32.f64','vcvtal.u32.f64',
+            'vcvt.f16.f32','vcvtal.f16.f32',
+            'vcvt.f32.s32','vcvtal.f32.s32',
+            'vcvt.f32.u32','vcvtal.f32.u32',
+            'vcvt.f32.f16','vcvtal.f32.f16',
+            'vcvt.f32.f64','vcvtal.f32.f64',
+            'vcvt.f64.s32','vcvtal.f64.s32',
+            'vcvt.f64.u32','vcvtal.f64.u32',
+            'vcvt.f64.f32','vcvtal.f64.f32',
+
+            'vcvtr.s32.f32','vcvtral.s32.f32',
+            'vcvtr.s32.f64','vcvtral.s32.f64',
+            'vcvtr.u32.f32','vcvtral.u32.f32',
+            'vcvtr.u32.f64','vcvtral.u32.f64',
+
+            'vcvtb.f16.f32','vcvtbal.f16.f32',
+            'vcvtb.f32.f16','vcvtbal.f32.f16',
+
+            'vcvtt.f16.f32','vcvttal.f16.f32',
+            'vcvtt.f32.f16','vcvttal.f32.f16',
+
+            'vdiv.f32','vdival.f32',
+            'vdiv.f64','vdival.f64',
+
+            'vmax.f32','vmaxal.f32',
+            'vmin.f32','vminal.f32',
+
+            'vmla.f32','vmlaal.f32',
+            'vmla.f64','vmlaal.f64',
+
+            'vmls.f32','vmlsal.f32',
+            'vmls.f64','vmlsal.f64',
+
+            'vmul.f32','vmulal.f32',
+            'vmul.f64','vmulal.f64',
+
+            'vneg.f32','vnegal.f32',
+            'vneg.f64','vnegal.f64',
+
+            'vnmla.f32','vnmlaal.f32',
+            'vnmla.f64','vnmlaal.f64',
+
+            'vnmls.f32','vnmlsal.f32',
+            'vnmls.f64','vnmlsal.f64',
+
+            'vnmul.f64','vnmulal.f64',
+            'vnmul.f32','vnmulal.f32',
+
+            'vpadd.f32','vpaddal.f32',
+
+            'vpmax.f32','vpmaxal.f32',
+            'vpmin.f32','vpminal.f32',
+
+            'vrecpe.u32','vrecpeal.u32',
+            'vrecpe.f32','vrecpeal.f32',
+            'vrecps.f32','vrecpsal.f32',
+
+            'vrsqrte.u32','vrsqrteal.u32',
+            'vrsqrte.f32','vrsqrteal.f32',
+            'vrsqrts.f32','vrsqrtsal.f32',
+
+            'vsqrt.f32','vsqrtal.f32',
+            'vsqrt.f64','vsqrtal.f64',
+
+            'vsub.f32','vsubal.f32',
+            'vsub.f64','vsubal.f64'
+            ),
+        /* Conditional VFPv3 & NEON SIMD Memory Access Instructions */
+        27 => array(
+            /* Conditional VFPv3 & NEON SIMD Memory Access: Loads */
+            'vldeq.8','vldne.8','vldcs.8','vldhs.8','vldcc.8','vldlo.8','vldmi.8','vldpl.8','vldvs.8','vldvc.8','vldhi.8','vldls.8','vldge.8','vldlt.8','vldgt.8','vldle.8',
+            'vldeq.16','vldne.16','vldcs.16','vldhs.16','vldcc.16','vldlo.16','vldmi.16','vldpl.16','vldvs.16','vldvc.16','vldhi.16','vldls.16','vldge.16','vldlt.16','vldgt.16','vldle.16',
+            'vldeq.32','vldne.32','vldcs.32','vldhs.32','vldcc.32','vldlo.32','vldmi.32','vldpl.32','vldvs.32','vldvc.32','vldhi.32','vldls.32','vldge.32','vldlt.32','vldgt.32','vldle.32',
+            'vldeq.64','vldne.64','vldcs.64','vldhs.64','vldcc.64','vldlo.64','vldmi.64','vldpl.64','vldvs.64','vldvc.64','vldhi.64','vldls.64','vldge.64','vldlt.64','vldgt.64','vldle.64',
+
+            'vld1eq.8','vld1ne.8','vld1cs.8','vld1hs.8','vld1cc.8','vld1lo.8','vld1mi.8','vld1pl.8','vld1vs.8','vld1vc.8','vld1hi.8','vld1ls.8','vld1ge.8','vld1lt.8','vld1gt.8','vld1le.8',
+            'vld1eq.16','vld1ne.16','vld1cs.16','vld1hs.16','vld1cc.16','vld1lo.16','vld1mi.16','vld1pl.16','vld1vs.16','vld1vc.16','vld1hi.16','vld1ls.16','vld1ge.16','vld1lt.16','vld1gt.16','vld1le.16',
+            'vld1eq.32','vld1ne.32','vld1cs.32','vld1hs.32','vld1cc.32','vld1lo.32','vld1mi.32','vld1pl.32','vld1vs.32','vld1vc.32','vld1hi.32','vld1ls.32','vld1ge.32','vld1lt.32','vld1gt.32','vld1le.32',
+
+            'vld2eq.8','vld2ne.8','vld2cs.8','vld2hs.8','vld2cc.8','vld2lo.8','vld2mi.8','vld2pl.8','vld2vs.8','vld2vc.8','vld2hi.8','vld2ls.8','vld2ge.8','vld2lt.8','vld2gt.8','vld2le.8',
+            'vld2eq.16','vld2ne.16','vld2cs.16','vld2hs.16','vld2cc.16','vld2lo.16','vld2mi.16','vld2pl.16','vld2vs.16','vld2vc.16','vld2hi.16','vld2ls.16','vld2ge.16','vld2lt.16','vld2gt.16','vld2le.16',
+            'vld2eq.32','vld2ne.32','vld2cs.32','vld2hs.32','vld2cc.32','vld2lo.32','vld2mi.32','vld2pl.32','vld2vs.32','vld2vc.32','vld2hi.32','vld2ls.32','vld2ge.32','vld2lt.32','vld2gt.32','vld2le.32',
+
+            'vld3eq.8','vld3ne.8','vld3cs.8','vld3hs.8','vld3cc.8','vld3lo.8','vld3mi.8','vld3pl.8','vld3vs.8','vld3vc.8','vld3hi.8','vld3ls.8','vld3ge.8','vld3lt.8','vld3gt.8','vld3le.8',
+            'vld3eq.16','vld3ne.16','vld3cs.16','vld3hs.16','vld3cc.16','vld3lo.16','vld3mi.16','vld3pl.16','vld3vs.16','vld3vc.16','vld3hi.16','vld3ls.16','vld3ge.16','vld3lt.16','vld3gt.16','vld3le.16',
+            'vld3eq.32','vld3ne.32','vld3cs.32','vld3hs.32','vld3cc.32','vld3lo.32','vld3mi.32','vld3pl.32','vld3vs.32','vld3vc.32','vld3hi.32','vld3ls.32','vld3ge.32','vld3lt.32','vld3gt.32','vld3le.32',
+
+            'vld4eq.8','vld4ne.8','vld4cs.8','vld4hs.8','vld4cc.8','vld4lo.8','vld4mi.8','vld4pl.8','vld4vs.8','vld4vc.8','vld4hi.8','vld4ls.8','vld4ge.8','vld4lt.8','vld4gt.8','vld4le.8',
+            'vld4eq.16','vld4ne.16','vld4cs.16','vld4hs.16','vld4cc.16','vld4lo.16','vld4mi.16','vld4pl.16','vld4vs.16','vld4vc.16','vld4hi.16','vld4ls.16','vld4ge.16','vld4lt.16','vld4gt.16','vld4le.16',
+            'vld4eq.32','vld4ne.32','vld4cs.32','vld4hs.32','vld4cc.32','vld4lo.32','vld4mi.32','vld4pl.32','vld4vs.32','vld4vc.32','vld4hi.32','vld4ls.32','vld4ge.32','vld4lt.32','vld4gt.32','vld4le.32',
+
+            'vldmeq','vldmne','vldmcs','vldmhs','vldmcc','vldmlo','vldmmi','vldmpl','vldmvs','vldmvc','vldmhi','vldmls','vldmge','vldmlt','vldmgt','vldmle',
+            'vldmeq.32','vldmne.32','vldmcs.32','vldmhs.32','vldmcc.32','vldmlo.32','vldmmi.32','vldmpl.32','vldmvs.32','vldmvc.32','vldmhi.32','vldmls.32','vldmge.32','vldmlt.32','vldmgt.32','vldmle.32',
+            'vldmeq.64','vldmne.64','vldmcs.64','vldmhs.64','vldmcc.64','vldmlo.64','vldmmi.64','vldmpl.64','vldmvs.64','vldmvc.64','vldmhi.64','vldmls.64','vldmge.64','vldmlt.64','vldmgt.64','vldmle.64',
+
+            'vldmiaeq','vldmiane','vldmiacs','vldmiahs','vldmiacc','vldmialo','vldmiami','vldmiapl','vldmiavs','vldmiavc','vldmiahi','vldmials','vldmiage','vldmialt','vldmiagt','vldmiale',
+            'vldmiaeq.32','vldmiane.32','vldmiacs.32','vldmiahs.32','vldmiacc.32','vldmialo.32','vldmiami.32','vldmiapl.32','vldmiavs.32','vldmiavc.32','vldmiahi.32','vldmials.32','vldmiage.32','vldmialt.32','vldmiagt.32','vldmiale.32',
+            'vldmiaeq.64','vldmiane.64','vldmiacs.64','vldmiahs.64','vldmiacc.64','vldmialo.64','vldmiami.64','vldmiapl.64','vldmiavs.64','vldmiavc.64','vldmiahi.64','vldmials.64','vldmiage.64','vldmialt.64','vldmiagt.64','vldmiale.64',
+
+            'vldmdbeq','vldmdbne','vldmdbcs','vldmdbhs','vldmdbcc','vldmdblo','vldmdbmi','vldmdbpl','vldmdbvs','vldmdbvc','vldmdbhi','vldmdbls','vldmdbge','vldmdblt','vldmdbgt','vldmdble',
+            'vldmdbeq.32','vldmdbne.32','vldmdbcs.32','vldmdbhs.32','vldmdbcc.32','vldmdblo.32','vldmdbmi.32','vldmdbpl.32','vldmdbvs.32','vldmdbvc.32','vldmdbhi.32','vldmdbls.32','vldmdbge.32','vldmdblt.32','vldmdbgt.32','vldmdble.32',
+            'vldmdbeq.64','vldmdbne.64','vldmdbcs.64','vldmdbhs.64','vldmdbcc.64','vldmdblo.64','vldmdbmi.64','vldmdbpl.64','vldmdbvs.64','vldmdbvc.64','vldmdbhi.64','vldmdbls.64','vldmdbge.64','vldmdblt.64','vldmdbgt.64','vldmdble.64',
+
+            'vldreq','vldrne','vldrcs','vldrhs','vldrcc','vldrlo','vldrmi','vldrpl','vldrvs','vldrvc','vldrhi','vldrls','vldrge','vldrlt','vldrgt','vldrle',
+            'vldreq.32','vldrne.32','vldrcs.32','vldrhs.32','vldrcc.32','vldrlo.32','vldrmi.32','vldrpl.32','vldrvs.32','vldrvc.32','vldrhi.32','vldrls.32','vldrge.32','vldrlt.32','vldrgt.32','vldrle.32',
+            'vldreq.64','vldrne.64','vldrcs.64','vldrhs.64','vldrcc.64','vldrlo.64','vldrmi.64','vldrpl.64','vldrvs.64','vldrvc.64','vldrhi.64','vldrls.64','vldrge.64','vldrlt.64','vldrgt.64','vldrle.64',
+
+            'vpopeq','vpopne','vpopcs','vpophs','vpopcc','vpoplo','vpopmi','vpoppl','vpopvs','vpopvc','vpophi','vpopls','vpopge','vpoplt','vpopgt','vpople',
+            'vpopeq.32','vpopne.32','vpopcs.32','vpophs.32','vpopcc.32','vpoplo.32','vpopmi.32','vpoppl.32','vpopvs.32','vpopvc.32','vpophi.32','vpopls.32','vpopge.32','vpoplt.32','vpopgt.32','vpople.32',
+            'vpopeq.64','vpopne.64','vpopcs.64','vpophs.64','vpopcc.64','vpoplo.64','vpopmi.64','vpoppl.64','vpopvs.64','vpopvc.64','vpophi.64','vpopls.64','vpopge.64','vpoplt.64','vpopgt.64','vpople.64',
+
+            /* Conditional VFPv3 & NEON SIMD Memory Access: Stores */
+            'vst1eq.8','vst1ne.8','vst1cs.8','vst1hs.8','vst1cc.8','vst1lo.8','vst1mi.8','vst1pl.8','vst1vs.8','vst1vc.8','vst1hi.8','vst1ls.8','vst1ge.8','vst1lt.8','vst1gt.8','vst1le.8',
+            'vst1eq.16','vst1ne.16','vst1cs.16','vst1hs.16','vst1cc.16','vst1lo.16','vst1mi.16','vst1pl.16','vst1vs.16','vst1vc.16','vst1hi.16','vst1ls.16','vst1ge.16','vst1lt.16','vst1gt.16','vst1le.16',
+            'vst1eq.32','vst1ne.32','vst1cs.32','vst1hs.32','vst1cc.32','vst1lo.32','vst1mi.32','vst1pl.32','vst1vs.32','vst1vc.32','vst1hi.32','vst1ls.32','vst1ge.32','vst1lt.32','vst1gt.32','vst1le.32',
+            'vst1eq.64','vst1ne.64','vst1cs.64','vst1hs.64','vst1cc.64','vst1lo.64','vst1mi.64','vst1pl.64','vst1vs.64','vst1vc.64','vst1hi.64','vst1ls.64','vst1ge.64','vst1lt.64','vst1gt.64','vst1le.64',
+
+            'vst2eq.8','vst2ne.8','vst2cs.8','vst2hs.8','vst2cc.8','vst2lo.8','vst2mi.8','vst2pl.8','vst2vs.8','vst2vc.8','vst2hi.8','vst2ls.8','vst2ge.8','vst2lt.8','vst2gt.8','vst2le.8',
+            'vst2eq.16','vst2ne.16','vst2cs.16','vst2hs.16','vst2cc.16','vst2lo.16','vst2mi.16','vst2pl.16','vst2vs.16','vst2vc.16','vst2hi.16','vst2ls.16','vst2ge.16','vst2lt.16','vst2gt.16','vst2le.16',
+            'vst2eq.32','vst2ne.32','vst2cs.32','vst2hs.32','vst2cc.32','vst2lo.32','vst2mi.32','vst2pl.32','vst2vs.32','vst2vc.32','vst2hi.32','vst2ls.32','vst2ge.32','vst2lt.32','vst2gt.32','vst2le.32',
+
+            'vst3eq.8','vst3ne.8','vst3cs.8','vst3hs.8','vst3cc.8','vst3lo.8','vst3mi.8','vst3pl.8','vst3vs.8','vst3vc.8','vst3hi.8','vst3ls.8','vst3ge.8','vst3lt.8','vst3gt.8','vst3le.8',
+            'vst3eq.16','vst3ne.16','vst3cs.16','vst3hs.16','vst3cc.16','vst3lo.16','vst3mi.16','vst3pl.16','vst3vs.16','vst3vc.16','vst3hi.16','vst3ls.16','vst3ge.16','vst3lt.16','vst3gt.16','vst3le.16',
+            'vst3eq.32','vst3ne.32','vst3cs.32','vst3hs.32','vst3cc.32','vst3lo.32','vst3mi.32','vst3pl.32','vst3vs.32','vst3vc.32','vst3hi.32','vst3ls.32','vst3ge.32','vst3lt.32','vst3gt.32','vst3le.32',
+
+            'vst4eq.8','vst4ne.8','vst4cs.8','vst4hs.8','vst4cc.8','vst4lo.8','vst4mi.8','vst4pl.8','vst4vs.8','vst4vc.8','vst4hi.8','vst4ls.8','vst4ge.8','vst4lt.8','vst4gt.8','vst4le.8',
+            'vst4eq.16','vst4ne.16','vst4cs.16','vst4hs.16','vst4cc.16','vst4lo.16','vst4mi.16','vst4pl.16','vst4vs.16','vst4vc.16','vst4hi.16','vst4ls.16','vst4ge.16','vst4lt.16','vst4gt.16','vst4le.16',
+            'vst4eq.32','vst4ne.32','vst4cs.32','vst4hs.32','vst4cc.32','vst4lo.32','vst4mi.32','vst4pl.32','vst4vs.32','vst4vc.32','vst4hi.32','vst4ls.32','vst4ge.32','vst4lt.32','vst4gt.32','vst4le.32',
+
+            'vstmeq','vstmne','vstmcs','vstmhs','vstmcc','vstmlo','vstmmi','vstmpl','vstmvs','vstmvc','vstmhi','vstmls','vstmge','vstmlt','vstmgt','vstmle',
+            'vstmeq.32','vstmne.32','vstmcs.32','vstmhs.32','vstmcc.32','vstmlo.32','vstmmi.32','vstmpl.32','vstmvs.32','vstmvc.32','vstmhi.32','vstmls.32','vstmge.32','vstmlt.32','vstmgt.32','vstmle.32',
+            'vstmeq.64','vstmne.64','vstmcs.64','vstmhs.64','vstmcc.64','vstmlo.64','vstmmi.64','vstmpl.64','vstmvs.64','vstmvc.64','vstmhi.64','vstmls.64','vstmge.64','vstmlt.64','vstmgt.64','vstmle.64',
+
+            'vstmiaeq','vstmiane','vstmiacs','vstmiahs','vstmiacc','vstmialo','vstmiami','vstmiapl','vstmiavs','vstmiavc','vstmiahi','vstmials','vstmiage','vstmialt','vstmiagt','vstmiale',
+            'vstmiaeq.32','vstmiane.32','vstmiacs.32','vstmiahs.32','vstmiacc.32','vstmialo.32','vstmiami.32','vstmiapl.32','vstmiavs.32','vstmiavc.32','vstmiahi.32','vstmials.32','vstmiage.32','vstmialt.32','vstmiagt.32','vstmiale.32',
+            'vstmiaeq.64','vstmiane.64','vstmiacs.64','vstmiahs.64','vstmiacc.64','vstmialo.64','vstmiami.64','vstmiapl.64','vstmiavs.64','vstmiavc.64','vstmiahi.64','vstmials.64','vstmiage.64','vstmialt.64','vstmiagt.64','vstmiale.64',
+
+            'vstmdbeq','vstmdbne','vstmdbcs','vstmdbhs','vstmdbcc','vstmdblo','vstmdbmi','vstmdbpl','vstmdbvs','vstmdbvc','vstmdbhi','vstmdbls','vstmdbge','vstmdblt','vstmdbgt','vstmdble',
+            'vstmdbeq.32','vstmdbne.32','vstmdbcs.32','vstmdbhs.32','vstmdbcc.32','vstmdblo.32','vstmdbmi.32','vstmdbpl.32','vstmdbvs.32','vstmdbvc.32','vstmdbhi.32','vstmdbls.32','vstmdbge.32','vstmdblt.32','vstmdbgt.32','vstmdble.32',
+            'vstmdbeq.64','vstmdbne.64','vstmdbcs.64','vstmdbhs.64','vstmdbcc.64','vstmdblo.64','vstmdbmi.64','vstmdbpl.64','vstmdbvs.64','vstmdbvc.64','vstmdbhi.64','vstmdbls.64','vstmdbge.64','vstmdblt.64','vstmdbgt.64','vstmdble.64',
+
+            'vstreq','vstrne','vstrcs','vstrhs','vstrcc','vstrlo','vstrmi','vstrpl','vstrvs','vstrvc','vstrhi','vstrls','vstrge','vstrlt','vstrgt','vstrle',
+            'vstreq.32','vstrne.32','vstrcs.32','vstrhs.32','vstrcc.32','vstrlo.32','vstrmi.32','vstrpl.32','vstrvs.32','vstrvc.32','vstrhi.32','vstrls.32','vstrge.32','vstrlt.32','vstrgt.32','vstrle.32',
+            'vstreq.64','vstrne.64','vstrcs.64','vstrhs.64','vstrcc.64','vstrlo.64','vstrmi.64','vstrpl.64','vstrvs.64','vstrvc.64','vstrhi.64','vstrls.64','vstrge.64','vstrlt.64','vstrgt.64','vstrle.64',
+
+            'vpusheq','vpushne','vpushcs','vpushhs','vpushcc','vpushlo','vpushmi','vpushpl','vpushvs','vpushvc','vpushhi','vpushls','vpushge','vpushlt','vpushgt','vpushle',
+            'vpusheq.32','vpushne.32','vpushcs.32','vpushhs.32','vpushcc.32','vpushlo.32','vpushmi.32','vpushpl.32','vpushvs.32','vpushvc.32','vpushhi.32','vpushls.32','vpushge.32','vpushlt.32','vpushgt.32','vpushle.32',
+            'vpusheq.64','vpushne.64','vpushcs.64','vpushhs.64','vpushcc.64','vpushlo.64','vpushmi.64','vpushpl.64','vpushvs.64','vpushvc.64','vpushhi.64','vpushls.64','vpushge.64','vpushlt.64','vpushgt.64','vpushle.64'
+            ),
+        /* Conditional NEON SIMD Logical Instructions */
+        28 => array(
+            'vandeq','vandne','vandcs','vandhs','vandcc','vandlo','vandmi','vandpl','vandvs','vandvc','vandhi','vandls','vandge','vandlt','vandgt','vandle',
+            'vandeq.i8','vandne.i8','vandcs.i8','vandhs.i8','vandcc.i8','vandlo.i8','vandmi.i8','vandpl.i8','vandvs.i8','vandvc.i8','vandhi.i8','vandls.i8','vandge.i8','vandlt.i8','vandgt.i8','vandle.i8',
+            'vandeq.i16','vandne.i16','vandcs.i16','vandhs.i16','vandcc.i16','vandlo.i16','vandmi.i16','vandpl.i16','vandvs.i16','vandvc.i16','vandhi.i16','vandls.i16','vandge.i16','vandlt.i16','vandgt.i16','vandle.i16',
+            'vandeq.i32','vandne.i32','vandcs.i32','vandhs.i32','vandcc.i32','vandlo.i32','vandmi.i32','vandpl.i32','vandvs.i32','vandvc.i32','vandhi.i32','vandls.i32','vandge.i32','vandlt.i32','vandgt.i32','vandle.i32',
+            'vandeq.i64','vandne.i64','vandcs.i64','vandhs.i64','vandcc.i64','vandlo.i64','vandmi.i64','vandpl.i64','vandvs.i64','vandvc.i64','vandhi.i64','vandls.i64','vandge.i64','vandlt.i64','vandgt.i64','vandle.i64',
+            'vandeq.s8','vandne.s8','vandcs.s8','vandhs.s8','vandcc.s8','vandlo.s8','vandmi.s8','vandpl.s8','vandvs.s8','vandvc.s8','vandhi.s8','vandls.s8','vandge.s8','vandlt.s8','vandgt.s8','vandle.s8',
+            'vandeq.s16','vandne.s16','vandcs.s16','vandhs.s16','vandcc.s16','vandlo.s16','vandmi.s16','vandpl.s16','vandvs.s16','vandvc.s16','vandhi.s16','vandls.s16','vandge.s16','vandlt.s16','vandgt.s16','vandle.s16',
+            'vandeq.s32','vandne.s32','vandcs.s32','vandhs.s32','vandcc.s32','vandlo.s32','vandmi.s32','vandpl.s32','vandvs.s32','vandvc.s32','vandhi.s32','vandls.s32','vandge.s32','vandlt.s32','vandgt.s32','vandle.s32',
+            'vandeq.s64','vandne.s64','vandcs.s64','vandhs.s64','vandcc.s64','vandlo.s64','vandmi.s64','vandpl.s64','vandvs.s64','vandvc.s64','vandhi.s64','vandls.s64','vandge.s64','vandlt.s64','vandgt.s64','vandle.s64',
+            'vandeq.u8','vandne.u8','vandcs.u8','vandhs.u8','vandcc.u8','vandlo.u8','vandmi.u8','vandpl.u8','vandvs.u8','vandvc.u8','vandhi.u8','vandls.u8','vandge.u8','vandlt.u8','vandgt.u8','vandle.u8',
+            'vandeq.u16','vandne.u16','vandcs.u16','vandhs.u16','vandcc.u16','vandlo.u16','vandmi.u16','vandpl.u16','vandvs.u16','vandvc.u16','vandhi.u16','vandls.u16','vandge.u16','vandlt.u16','vandgt.u16','vandle.u16',
+            'vandeq.u32','vandne.u32','vandcs.u32','vandhs.u32','vandcc.u32','vandlo.u32','vandmi.u32','vandpl.u32','vandvs.u32','vandvc.u32','vandhi.u32','vandls.u32','vandge.u32','vandlt.u32','vandgt.u32','vandle.u32',
+            'vandeq.u64','vandne.u64','vandcs.u64','vandhs.u64','vandcc.u64','vandlo.u64','vandmi.u64','vandpl.u64','vandvs.u64','vandvc.u64','vandhi.u64','vandls.u64','vandge.u64','vandlt.u64','vandgt.u64','vandle.u64',
+            'vandeq.f32','vandne.f32','vandcs.f32','vandhs.f32','vandcc.f32','vandlo.f32','vandmi.f32','vandpl.f32','vandvs.f32','vandvc.f32','vandhi.f32','vandls.f32','vandge.f32','vandlt.f32','vandgt.f32','vandle.f32',
+            'vandeq.f64','vandne.f64','vandcs.f64','vandhs.f64','vandcc.f64','vandlo.f64','vandmi.f64','vandpl.f64','vandvs.f64','vandvc.f64','vandhi.f64','vandls.f64','vandge.f64','vandlt.f64','vandgt.f64','vandle.f64',
+
+            'vbiceq','vbicne','vbiccs','vbichs','vbiccc','vbiclo','vbicmi','vbicpl','vbicvs','vbicvc','vbichi','vbicls','vbicge','vbiclt','vbicgt','vbicle',
+            'vbiceq.i8','vbicne.i8','vbiccs.i8','vbichs.i8','vbiccc.i8','vbiclo.i8','vbicmi.i8','vbicpl.i8','vbicvs.i8','vbicvc.i8','vbichi.i8','vbicls.i8','vbicge.i8','vbiclt.i8','vbicgt.i8','vbicle.i8',
+            'vbiceq.i16','vbicne.i16','vbiccs.i16','vbichs.i16','vbiccc.i16','vbiclo.i16','vbicmi.i16','vbicpl.i16','vbicvs.i16','vbicvc.i16','vbichi.i16','vbicls.i16','vbicge.i16','vbiclt.i16','vbicgt.i16','vbicle.i16',
+            'vbiceq.i32','vbicne.i32','vbiccs.i32','vbichs.i32','vbiccc.i32','vbiclo.i32','vbicmi.i32','vbicpl.i32','vbicvs.i32','vbicvc.i32','vbichi.i32','vbicls.i32','vbicge.i32','vbiclt.i32','vbicgt.i32','vbicle.i32',
+            'vbiceq.i64','vbicne.i64','vbiccs.i64','vbichs.i64','vbiccc.i64','vbiclo.i64','vbicmi.i64','vbicpl.i64','vbicvs.i64','vbicvc.i64','vbichi.i64','vbicls.i64','vbicge.i64','vbiclt.i64','vbicgt.i64','vbicle.i64',
+            'vbiceq.s8','vbicne.s8','vbiccs.s8','vbichs.s8','vbiccc.s8','vbiclo.s8','vbicmi.s8','vbicpl.s8','vbicvs.s8','vbicvc.s8','vbichi.s8','vbicls.s8','vbicge.s8','vbiclt.s8','vbicgt.s8','vbicle.s8',
+            'vbiceq.s16','vbicne.s16','vbiccs.s16','vbichs.s16','vbiccc.s16','vbiclo.s16','vbicmi.s16','vbicpl.s16','vbicvs.s16','vbicvc.s16','vbichi.s16','vbicls.s16','vbicge.s16','vbiclt.s16','vbicgt.s16','vbicle.s16',
+            'vbiceq.s32','vbicne.s32','vbiccs.s32','vbichs.s32','vbiccc.s32','vbiclo.s32','vbicmi.s32','vbicpl.s32','vbicvs.s32','vbicvc.s32','vbichi.s32','vbicls.s32','vbicge.s32','vbiclt.s32','vbicgt.s32','vbicle.s32',
+            'vbiceq.s64','vbicne.s64','vbiccs.s64','vbichs.s64','vbiccc.s64','vbiclo.s64','vbicmi.s64','vbicpl.s64','vbicvs.s64','vbicvc.s64','vbichi.s64','vbicls.s64','vbicge.s64','vbiclt.s64','vbicgt.s64','vbicle.s64',
+            'vbiceq.u8','vbicne.u8','vbiccs.u8','vbichs.u8','vbiccc.u8','vbiclo.u8','vbicmi.u8','vbicpl.u8','vbicvs.u8','vbicvc.u8','vbichi.u8','vbicls.u8','vbicge.u8','vbiclt.u8','vbicgt.u8','vbicle.u8',
+            'vbiceq.u16','vbicne.u16','vbiccs.u16','vbichs.u16','vbiccc.u16','vbiclo.u16','vbicmi.u16','vbicpl.u16','vbicvs.u16','vbicvc.u16','vbichi.u16','vbicls.u16','vbicge.u16','vbiclt.u16','vbicgt.u16','vbicle.u16',
+            'vbiceq.u32','vbicne.u32','vbiccs.u32','vbichs.u32','vbiccc.u32','vbiclo.u32','vbicmi.u32','vbicpl.u32','vbicvs.u32','vbicvc.u32','vbichi.u32','vbicls.u32','vbicge.u32','vbiclt.u32','vbicgt.u32','vbicle.u32',
+            'vbiceq.u64','vbicne.u64','vbiccs.u64','vbichs.u64','vbiccc.u64','vbiclo.u64','vbicmi.u64','vbicpl.u64','vbicvs.u64','vbicvc.u64','vbichi.u64','vbicls.u64','vbicge.u64','vbiclt.u64','vbicgt.u64','vbicle.u64',
+            'vbiceq.f32','vbicne.f32','vbiccs.f32','vbichs.f32','vbiccc.f32','vbiclo.f32','vbicmi.f32','vbicpl.f32','vbicvs.f32','vbicvc.f32','vbichi.f32','vbicls.f32','vbicge.f32','vbiclt.f32','vbicgt.f32','vbicle.f32',
+            'vbiceq.f64','vbicne.f64','vbiccs.f64','vbichs.f64','vbiccc.f64','vbiclo.f64','vbicmi.f64','vbicpl.f64','vbicvs.f64','vbicvc.f64','vbichi.f64','vbicls.f64','vbicge.f64','vbiclt.f64','vbicgt.f64','vbicle.f64',
+
+            'vbifeq','vbifne','vbifcs','vbifhs','vbifcc','vbiflo','vbifmi','vbifpl','vbifvs','vbifvc','vbifhi','vbifls','vbifge','vbiflt','vbifgt','vbifle',
+            'vbifeq.i8','vbifne.i8','vbifcs.i8','vbifhs.i8','vbifcc.i8','vbiflo.i8','vbifmi.i8','vbifpl.i8','vbifvs.i8','vbifvc.i8','vbifhi.i8','vbifls.i8','vbifge.i8','vbiflt.i8','vbifgt.i8','vbifle.i8',
+            'vbifeq.i16','vbifne.i16','vbifcs.i16','vbifhs.i16','vbifcc.i16','vbiflo.i16','vbifmi.i16','vbifpl.i16','vbifvs.i16','vbifvc.i16','vbifhi.i16','vbifls.i16','vbifge.i16','vbiflt.i16','vbifgt.i16','vbifle.i16',
+            'vbifeq.i32','vbifne.i32','vbifcs.i32','vbifhs.i32','vbifcc.i32','vbiflo.i32','vbifmi.i32','vbifpl.i32','vbifvs.i32','vbifvc.i32','vbifhi.i32','vbifls.i32','vbifge.i32','vbiflt.i32','vbifgt.i32','vbifle.i32',
+            'vbifeq.i64','vbifne.i64','vbifcs.i64','vbifhs.i64','vbifcc.i64','vbiflo.i64','vbifmi.i64','vbifpl.i64','vbifvs.i64','vbifvc.i64','vbifhi.i64','vbifls.i64','vbifge.i64','vbiflt.i64','vbifgt.i64','vbifle.i64',
+            'vbifeq.s8','vbifne.s8','vbifcs.s8','vbifhs.s8','vbifcc.s8','vbiflo.s8','vbifmi.s8','vbifpl.s8','vbifvs.s8','vbifvc.s8','vbifhi.s8','vbifls.s8','vbifge.s8','vbiflt.s8','vbifgt.s8','vbifle.s8',
+            'vbifeq.s16','vbifne.s16','vbifcs.s16','vbifhs.s16','vbifcc.s16','vbiflo.s16','vbifmi.s16','vbifpl.s16','vbifvs.s16','vbifvc.s16','vbifhi.s16','vbifls.s16','vbifge.s16','vbiflt.s16','vbifgt.s16','vbifle.s16',
+            'vbifeq.s32','vbifne.s32','vbifcs.s32','vbifhs.s32','vbifcc.s32','vbiflo.s32','vbifmi.s32','vbifpl.s32','vbifvs.s32','vbifvc.s32','vbifhi.s32','vbifls.s32','vbifge.s32','vbiflt.s32','vbifgt.s32','vbifle.s32',
+            'vbifeq.s64','vbifne.s64','vbifcs.s64','vbifhs.s64','vbifcc.s64','vbiflo.s64','vbifmi.s64','vbifpl.s64','vbifvs.s64','vbifvc.s64','vbifhi.s64','vbifls.s64','vbifge.s64','vbiflt.s64','vbifgt.s64','vbifle.s64',
+            'vbifeq.u8','vbifne.u8','vbifcs.u8','vbifhs.u8','vbifcc.u8','vbiflo.u8','vbifmi.u8','vbifpl.u8','vbifvs.u8','vbifvc.u8','vbifhi.u8','vbifls.u8','vbifge.u8','vbiflt.u8','vbifgt.u8','vbifle.u8',
+            'vbifeq.u16','vbifne.u16','vbifcs.u16','vbifhs.u16','vbifcc.u16','vbiflo.u16','vbifmi.u16','vbifpl.u16','vbifvs.u16','vbifvc.u16','vbifhi.u16','vbifls.u16','vbifge.u16','vbiflt.u16','vbifgt.u16','vbifle.u16',
+            'vbifeq.u32','vbifne.u32','vbifcs.u32','vbifhs.u32','vbifcc.u32','vbiflo.u32','vbifmi.u32','vbifpl.u32','vbifvs.u32','vbifvc.u32','vbifhi.u32','vbifls.u32','vbifge.u32','vbiflt.u32','vbifgt.u32','vbifle.u32',
+            'vbifeq.u64','vbifne.u64','vbifcs.u64','vbifhs.u64','vbifcc.u64','vbiflo.u64','vbifmi.u64','vbifpl.u64','vbifvs.u64','vbifvc.u64','vbifhi.u64','vbifls.u64','vbifge.u64','vbiflt.u64','vbifgt.u64','vbifle.u64',
+            'vbifeq.f32','vbifne.f32','vbifcs.f32','vbifhs.f32','vbifcc.f32','vbiflo.f32','vbifmi.f32','vbifpl.f32','vbifvs.f32','vbifvc.f32','vbifhi.f32','vbifls.f32','vbifge.f32','vbiflt.f32','vbifgt.f32','vbifle.f32',
+            'vbifeq.f64','vbifne.f64','vbifcs.f64','vbifhs.f64','vbifcc.f64','vbiflo.f64','vbifmi.f64','vbifpl.f64','vbifvs.f64','vbifvc.f64','vbifhi.f64','vbifls.f64','vbifge.f64','vbiflt.f64','vbifgt.f64','vbifle.f64',
+
+            'vbiteq','vbitne','vbitcs','vbiths','vbitcc','vbitlo','vbitmi','vbitpl','vbitvs','vbitvc','vbithi','vbitls','vbitge','vbitlt','vbitgt','vbitle',
+            'vbiteq.i8','vbitne.i8','vbitcs.i8','vbiths.i8','vbitcc.i8','vbitlo.i8','vbitmi.i8','vbitpl.i8','vbitvs.i8','vbitvc.i8','vbithi.i8','vbitls.i8','vbitge.i8','vbitlt.i8','vbitgt.i8','vbitle.i8',
+            'vbiteq.i16','vbitne.i16','vbitcs.i16','vbiths.i16','vbitcc.i16','vbitlo.i16','vbitmi.i16','vbitpl.i16','vbitvs.i16','vbitvc.i16','vbithi.i16','vbitls.i16','vbitge.i16','vbitlt.i16','vbitgt.i16','vbitle.i16',
+            'vbiteq.i32','vbitne.i32','vbitcs.i32','vbiths.i32','vbitcc.i32','vbitlo.i32','vbitmi.i32','vbitpl.i32','vbitvs.i32','vbitvc.i32','vbithi.i32','vbitls.i32','vbitge.i32','vbitlt.i32','vbitgt.i32','vbitle.i32',
+            'vbiteq.i64','vbitne.i64','vbitcs.i64','vbiths.i64','vbitcc.i64','vbitlo.i64','vbitmi.i64','vbitpl.i64','vbitvs.i64','vbitvc.i64','vbithi.i64','vbitls.i64','vbitge.i64','vbitlt.i64','vbitgt.i64','vbitle.i64',
+            'vbiteq.s8','vbitne.s8','vbitcs.s8','vbiths.s8','vbitcc.s8','vbitlo.s8','vbitmi.s8','vbitpl.s8','vbitvs.s8','vbitvc.s8','vbithi.s8','vbitls.s8','vbitge.s8','vbitlt.s8','vbitgt.s8','vbitle.s8',
+            'vbiteq.s16','vbitne.s16','vbitcs.s16','vbiths.s16','vbitcc.s16','vbitlo.s16','vbitmi.s16','vbitpl.s16','vbitvs.s16','vbitvc.s16','vbithi.s16','vbitls.s16','vbitge.s16','vbitlt.s16','vbitgt.s16','vbitle.s16',
+            'vbiteq.s32','vbitne.s32','vbitcs.s32','vbiths.s32','vbitcc.s32','vbitlo.s32','vbitmi.s32','vbitpl.s32','vbitvs.s32','vbitvc.s32','vbithi.s32','vbitls.s32','vbitge.s32','vbitlt.s32','vbitgt.s32','vbitle.s32',
+            'vbiteq.s64','vbitne.s64','vbitcs.s64','vbiths.s64','vbitcc.s64','vbitlo.s64','vbitmi.s64','vbitpl.s64','vbitvs.s64','vbitvc.s64','vbithi.s64','vbitls.s64','vbitge.s64','vbitlt.s64','vbitgt.s64','vbitle.s64',
+            'vbiteq.u8','vbitne.u8','vbitcs.u8','vbiths.u8','vbitcc.u8','vbitlo.u8','vbitmi.u8','vbitpl.u8','vbitvs.u8','vbitvc.u8','vbithi.u8','vbitls.u8','vbitge.u8','vbitlt.u8','vbitgt.u8','vbitle.u8',
+            'vbiteq.u16','vbitne.u16','vbitcs.u16','vbiths.u16','vbitcc.u16','vbitlo.u16','vbitmi.u16','vbitpl.u16','vbitvs.u16','vbitvc.u16','vbithi.u16','vbitls.u16','vbitge.u16','vbitlt.u16','vbitgt.u16','vbitle.u16',
+            'vbiteq.u32','vbitne.u32','vbitcs.u32','vbiths.u32','vbitcc.u32','vbitlo.u32','vbitmi.u32','vbitpl.u32','vbitvs.u32','vbitvc.u32','vbithi.u32','vbitls.u32','vbitge.u32','vbitlt.u32','vbitgt.u32','vbitle.u32',
+            'vbiteq.u64','vbitne.u64','vbitcs.u64','vbiths.u64','vbitcc.u64','vbitlo.u64','vbitmi.u64','vbitpl.u64','vbitvs.u64','vbitvc.u64','vbithi.u64','vbitls.u64','vbitge.u64','vbitlt.u64','vbitgt.u64','vbitle.u64',
+            'vbiteq.f32','vbitne.f32','vbitcs.f32','vbiths.f32','vbitcc.f32','vbitlo.f32','vbitmi.f32','vbitpl.f32','vbitvs.f32','vbitvc.f32','vbithi.f32','vbitls.f32','vbitge.f32','vbitlt.f32','vbitgt.f32','vbitle.f32',
+            'vbiteq.f64','vbitne.f64','vbitcs.f64','vbiths.f64','vbitcc.f64','vbitlo.f64','vbitmi.f64','vbitpl.f64','vbitvs.f64','vbitvc.f64','vbithi.f64','vbitls.f64','vbitge.f64','vbitlt.f64','vbitgt.f64','vbitle.f64',
+
+            'vbsleq','vbslne','vbslcs','vbslhs','vbslcc','vbsllo','vbslmi','vbslpl','vbslvs','vbslvc','vbslhi','vbslls','vbslge','vbsllt','vbslgt','vbslle',
+            'vbsleq.i8','vbslne.i8','vbslcs.i8','vbslhs.i8','vbslcc.i8','vbsllo.i8','vbslmi.i8','vbslpl.i8','vbslvs.i8','vbslvc.i8','vbslhi.i8','vbslls.i8','vbslge.i8','vbsllt.i8','vbslgt.i8','vbslle.i8',
+            'vbsleq.i16','vbslne.i16','vbslcs.i16','vbslhs.i16','vbslcc.i16','vbsllo.i16','vbslmi.i16','vbslpl.i16','vbslvs.i16','vbslvc.i16','vbslhi.i16','vbslls.i16','vbslge.i16','vbsllt.i16','vbslgt.i16','vbslle.i16',
+            'vbsleq.i32','vbslne.i32','vbslcs.i32','vbslhs.i32','vbslcc.i32','vbsllo.i32','vbslmi.i32','vbslpl.i32','vbslvs.i32','vbslvc.i32','vbslhi.i32','vbslls.i32','vbslge.i32','vbsllt.i32','vbslgt.i32','vbslle.i32',
+            'vbsleq.i64','vbslne.i64','vbslcs.i64','vbslhs.i64','vbslcc.i64','vbsllo.i64','vbslmi.i64','vbslpl.i64','vbslvs.i64','vbslvc.i64','vbslhi.i64','vbslls.i64','vbslge.i64','vbsllt.i64','vbslgt.i64','vbslle.i64',
+            'vbsleq.s8','vbslne.s8','vbslcs.s8','vbslhs.s8','vbslcc.s8','vbsllo.s8','vbslmi.s8','vbslpl.s8','vbslvs.s8','vbslvc.s8','vbslhi.s8','vbslls.s8','vbslge.s8','vbsllt.s8','vbslgt.s8','vbslle.s8',
+            'vbsleq.s16','vbslne.s16','vbslcs.s16','vbslhs.s16','vbslcc.s16','vbsllo.s16','vbslmi.s16','vbslpl.s16','vbslvs.s16','vbslvc.s16','vbslhi.s16','vbslls.s16','vbslge.s16','vbsllt.s16','vbslgt.s16','vbslle.s16',
+            'vbsleq.s32','vbslne.s32','vbslcs.s32','vbslhs.s32','vbslcc.s32','vbsllo.s32','vbslmi.s32','vbslpl.s32','vbslvs.s32','vbslvc.s32','vbslhi.s32','vbslls.s32','vbslge.s32','vbsllt.s32','vbslgt.s32','vbslle.s32',
+            'vbsleq.s64','vbslne.s64','vbslcs.s64','vbslhs.s64','vbslcc.s64','vbsllo.s64','vbslmi.s64','vbslpl.s64','vbslvs.s64','vbslvc.s64','vbslhi.s64','vbslls.s64','vbslge.s64','vbsllt.s64','vbslgt.s64','vbslle.s64',
+            'vbsleq.u8','vbslne.u8','vbslcs.u8','vbslhs.u8','vbslcc.u8','vbsllo.u8','vbslmi.u8','vbslpl.u8','vbslvs.u8','vbslvc.u8','vbslhi.u8','vbslls.u8','vbslge.u8','vbsllt.u8','vbslgt.u8','vbslle.u8',
+            'vbsleq.u16','vbslne.u16','vbslcs.u16','vbslhs.u16','vbslcc.u16','vbsllo.u16','vbslmi.u16','vbslpl.u16','vbslvs.u16','vbslvc.u16','vbslhi.u16','vbslls.u16','vbslge.u16','vbsllt.u16','vbslgt.u16','vbslle.u16',
+            'vbsleq.u32','vbslne.u32','vbslcs.u32','vbslhs.u32','vbslcc.u32','vbsllo.u32','vbslmi.u32','vbslpl.u32','vbslvs.u32','vbslvc.u32','vbslhi.u32','vbslls.u32','vbslge.u32','vbsllt.u32','vbslgt.u32','vbslle.u32',
+            'vbsleq.u64','vbslne.u64','vbslcs.u64','vbslhs.u64','vbslcc.u64','vbsllo.u64','vbslmi.u64','vbslpl.u64','vbslvs.u64','vbslvc.u64','vbslhi.u64','vbslls.u64','vbslge.u64','vbsllt.u64','vbslgt.u64','vbslle.u64',
+            'vbsleq.f32','vbslne.f32','vbslcs.f32','vbslhs.f32','vbslcc.f32','vbsllo.f32','vbslmi.f32','vbslpl.f32','vbslvs.f32','vbslvc.f32','vbslhi.f32','vbslls.f32','vbslge.f32','vbsllt.f32','vbslgt.f32','vbslle.f32',
+            'vbsleq.f64','vbslne.f64','vbslcs.f64','vbslhs.f64','vbslcc.f64','vbsllo.f64','vbslmi.f64','vbslpl.f64','vbslvs.f64','vbslvc.f64','vbslhi.f64','vbslls.f64','vbslge.f64','vbsllt.f64','vbslgt.f64','vbslle.f64',
+
+            'veoreq','veorne','veorcs','veorhs','veorcc','veorlo','veormi','veorpl','veorvs','veorvc','veorhi','veorls','veorge','veorlt','veorgt','veorle',
+            'veoreq.i8','veorne.i8','veorcs.i8','veorhs.i8','veorcc.i8','veorlo.i8','veormi.i8','veorpl.i8','veorvs.i8','veorvc.i8','veorhi.i8','veorls.i8','veorge.i8','veorlt.i8','veorgt.i8','veorle.i8',
+            'veoreq.i16','veorne.i16','veorcs.i16','veorhs.i16','veorcc.i16','veorlo.i16','veormi.i16','veorpl.i16','veorvs.i16','veorvc.i16','veorhi.i16','veorls.i16','veorge.i16','veorlt.i16','veorgt.i16','veorle.i16',
+            'veoreq.i32','veorne.i32','veorcs.i32','veorhs.i32','veorcc.i32','veorlo.i32','veormi.i32','veorpl.i32','veorvs.i32','veorvc.i32','veorhi.i32','veorls.i32','veorge.i32','veorlt.i32','veorgt.i32','veorle.i32',
+            'veoreq.i64','veorne.i64','veorcs.i64','veorhs.i64','veorcc.i64','veorlo.i64','veormi.i64','veorpl.i64','veorvs.i64','veorvc.i64','veorhi.i64','veorls.i64','veorge.i64','veorlt.i64','veorgt.i64','veorle.i64',
+            'veoreq.s8','veorne.s8','veorcs.s8','veorhs.s8','veorcc.s8','veorlo.s8','veormi.s8','veorpl.s8','veorvs.s8','veorvc.s8','veorhi.s8','veorls.s8','veorge.s8','veorlt.s8','veorgt.s8','veorle.s8',
+            'veoreq.s16','veorne.s16','veorcs.s16','veorhs.s16','veorcc.s16','veorlo.s16','veormi.s16','veorpl.s16','veorvs.s16','veorvc.s16','veorhi.s16','veorls.s16','veorge.s16','veorlt.s16','veorgt.s16','veorle.s16',
+            'veoreq.s32','veorne.s32','veorcs.s32','veorhs.s32','veorcc.s32','veorlo.s32','veormi.s32','veorpl.s32','veorvs.s32','veorvc.s32','veorhi.s32','veorls.s32','veorge.s32','veorlt.s32','veorgt.s32','veorle.s32',
+            'veoreq.s64','veorne.s64','veorcs.s64','veorhs.s64','veorcc.s64','veorlo.s64','veormi.s64','veorpl.s64','veorvs.s64','veorvc.s64','veorhi.s64','veorls.s64','veorge.s64','veorlt.s64','veorgt.s64','veorle.s64',
+            'veoreq.u8','veorne.u8','veorcs.u8','veorhs.u8','veorcc.u8','veorlo.u8','veormi.u8','veorpl.u8','veorvs.u8','veorvc.u8','veorhi.u8','veorls.u8','veorge.u8','veorlt.u8','veorgt.u8','veorle.u8',
+            'veoreq.u16','veorne.u16','veorcs.u16','veorhs.u16','veorcc.u16','veorlo.u16','veormi.u16','veorpl.u16','veorvs.u16','veorvc.u16','veorhi.u16','veorls.u16','veorge.u16','veorlt.u16','veorgt.u16','veorle.u16',
+            'veoreq.u32','veorne.u32','veorcs.u32','veorhs.u32','veorcc.u32','veorlo.u32','veormi.u32','veorpl.u32','veorvs.u32','veorvc.u32','veorhi.u32','veorls.u32','veorge.u32','veorlt.u32','veorgt.u32','veorle.u32',
+            'veoreq.u64','veorne.u64','veorcs.u64','veorhs.u64','veorcc.u64','veorlo.u64','veormi.u64','veorpl.u64','veorvs.u64','veorvc.u64','veorhi.u64','veorls.u64','veorge.u64','veorlt.u64','veorgt.u64','veorle.u64',
+            'veoreq.f32','veorne.f32','veorcs.f32','veorhs.f32','veorcc.f32','veorlo.f32','veormi.f32','veorpl.f32','veorvs.f32','veorvc.f32','veorhi.f32','veorls.f32','veorge.f32','veorlt.f32','veorgt.f32','veorle.f32',
+            'veoreq.f64','veorne.f64','veorcs.f64','veorhs.f64','veorcc.f64','veorlo.f64','veormi.f64','veorpl.f64','veorvs.f64','veorvc.f64','veorhi.f64','veorls.f64','veorge.f64','veorlt.f64','veorgt.f64','veorle.f64',
+
+            'vmoveq','vmovne','vmovcs','vmovhs','vmovcc','vmovlo','vmovmi','vmovpl','vmovvs','vmovvc','vmovhi','vmovls','vmovge','vmovlt','vmovgt','vmovle',
+            'vmoveq.8','vmovne.8','vmovcs.8','vmovhs.8','vmovcc.8','vmovlo.8','vmovmi.8','vmovpl.8','vmovvs.8','vmovvc.8','vmovhi.8','vmovls.8','vmovge.8','vmovlt.8','vmovgt.8','vmovle.8',
+            'vmoveq.16','vmovne.16','vmovcs.16','vmovhs.16','vmovcc.16','vmovlo.16','vmovmi.16','vmovpl.16','vmovvs.16','vmovvc.16','vmovhi.16','vmovls.16','vmovge.16','vmovlt.16','vmovgt.16','vmovle.16',
+            'vmoveq.32','vmovne.32','vmovcs.32','vmovhs.32','vmovcc.32','vmovlo.32','vmovmi.32','vmovpl.32','vmovvs.32','vmovvc.32','vmovhi.32','vmovls.32','vmovge.32','vmovlt.32','vmovgt.32','vmovle.32',
+            'vmoveq.i8','vmovne.i8','vmovcs.i8','vmovhs.i8','vmovcc.i8','vmovlo.i8','vmovmi.i8','vmovpl.i8','vmovvs.i8','vmovvc.i8','vmovhi.i8','vmovls.i8','vmovge.i8','vmovlt.i8','vmovgt.i8','vmovle.i8',
+            'vmoveq.i16','vmovne.i16','vmovcs.i16','vmovhs.i16','vmovcc.i16','vmovlo.i16','vmovmi.i16','vmovpl.i16','vmovvs.i16','vmovvc.i16','vmovhi.i16','vmovls.i16','vmovge.i16','vmovlt.i16','vmovgt.i16','vmovle.i16',
+            'vmoveq.i32','vmovne.i32','vmovcs.i32','vmovhs.i32','vmovcc.i32','vmovlo.i32','vmovmi.i32','vmovpl.i32','vmovvs.i32','vmovvc.i32','vmovhi.i32','vmovls.i32','vmovge.i32','vmovlt.i32','vmovgt.i32','vmovle.i32',
+            'vmoveq.i64','vmovne.i64','vmovcs.i64','vmovhs.i64','vmovcc.i64','vmovlo.i64','vmovmi.i64','vmovpl.i64','vmovvs.i64','vmovvc.i64','vmovhi.i64','vmovls.i64','vmovge.i64','vmovlt.i64','vmovgt.i64','vmovle.i64',
+            'vmoveq.f32','vmovne.f32','vmovcs.f32','vmovhs.f32','vmovcc.f32','vmovlo.f32','vmovmi.f32','vmovpl.f32','vmovvs.f32','vmovvc.f32','vmovhi.f32','vmovls.f32','vmovge.f32','vmovlt.f32','vmovgt.f32','vmovle.f32',
+            'vmoveq.f64','vmovne.f64','vmovcs.f64','vmovhs.f64','vmovcc.f64','vmovlo.f64','vmovmi.f64','vmovpl.f64','vmovvs.f64','vmovvc.f64','vmovhi.f64','vmovls.f64','vmovge.f64','vmovlt.f64','vmovgt.f64','vmovle.f64',
+
+            'vmvneq','vmvnne','vmvncs','vmvnhs','vmvncc','vmvnlo','vmvnmi','vmvnpl','vmvnvs','vmvnvc','vmvnhi','vmvnls','vmvnge','vmvnlt','vmvngt','vmvnle',
+            'vmvneq.s8','vmvnne.s8','vmvncs.s8','vmvnhs.s8','vmvncc.s8','vmvnlo.s8','vmvnmi.s8','vmvnpl.s8','vmvnvs.s8','vmvnvc.s8','vmvnhi.s8','vmvnls.s8','vmvnge.s8','vmvnlt.s8','vmvngt.s8','vmvnle.s8',
+            'vmvneq.s16','vmvnne.s16','vmvncs.s16','vmvnhs.s16','vmvncc.s16','vmvnlo.s16','vmvnmi.s16','vmvnpl.s16','vmvnvs.s16','vmvnvc.s16','vmvnhi.s16','vmvnls.s16','vmvnge.s16','vmvnlt.s16','vmvngt.s16','vmvnle.s16',
+            'vmvneq.s32','vmvnne.s32','vmvncs.s32','vmvnhs.s32','vmvncc.s32','vmvnlo.s32','vmvnmi.s32','vmvnpl.s32','vmvnvs.s32','vmvnvc.s32','vmvnhi.s32','vmvnls.s32','vmvnge.s32','vmvnlt.s32','vmvngt.s32','vmvnle.s32',
+            'vmvneq.s64','vmvnne.s64','vmvncs.s64','vmvnhs.s64','vmvncc.s64','vmvnlo.s64','vmvnmi.s64','vmvnpl.s64','vmvnvs.s64','vmvnvc.s64','vmvnhi.s64','vmvnls.s64','vmvnge.s64','vmvnlt.s64','vmvngt.s64','vmvnle.s64',
+            'vmvneq.u8','vmvnne.u8','vmvncs.u8','vmvnhs.u8','vmvncc.u8','vmvnlo.u8','vmvnmi.u8','vmvnpl.u8','vmvnvs.u8','vmvnvc.u8','vmvnhi.u8','vmvnls.u8','vmvnge.u8','vmvnlt.u8','vmvngt.u8','vmvnle.u8',
+            'vmvneq.u16','vmvnne.u16','vmvncs.u16','vmvnhs.u16','vmvncc.u16','vmvnlo.u16','vmvnmi.u16','vmvnpl.u16','vmvnvs.u16','vmvnvc.u16','vmvnhi.u16','vmvnls.u16','vmvnge.u16','vmvnlt.u16','vmvngt.u16','vmvnle.u16',
+            'vmvneq.u32','vmvnne.u32','vmvncs.u32','vmvnhs.u32','vmvncc.u32','vmvnlo.u32','vmvnmi.u32','vmvnpl.u32','vmvnvs.u32','vmvnvc.u32','vmvnhi.u32','vmvnls.u32','vmvnge.u32','vmvnlt.u32','vmvngt.u32','vmvnle.u32',
+            'vmvneq.u64','vmvnne.u64','vmvncs.u64','vmvnhs.u64','vmvncc.u64','vmvnlo.u64','vmvnmi.u64','vmvnpl.u64','vmvnvs.u64','vmvnvc.u64','vmvnhi.u64','vmvnls.u64','vmvnge.u64','vmvnlt.u64','vmvngt.u64','vmvnle.u64',
+            'vmvneq.i8','vmvnne.i8','vmvncs.i8','vmvnhs.i8','vmvncc.i8','vmvnlo.i8','vmvnmi.i8','vmvnpl.i8','vmvnvs.i8','vmvnvc.i8','vmvnhi.i8','vmvnls.i8','vmvnge.i8','vmvnlt.i8','vmvngt.i8','vmvnle.i8',
+            'vmvneq.i16','vmvnne.i16','vmvncs.i16','vmvnhs.i16','vmvncc.i16','vmvnlo.i16','vmvnmi.i16','vmvnpl.i16','vmvnvs.i16','vmvnvc.i16','vmvnhi.i16','vmvnls.i16','vmvnge.i16','vmvnlt.i16','vmvngt.i16','vmvnle.i16',
+            'vmvneq.i32','vmvnne.i32','vmvncs.i32','vmvnhs.i32','vmvncc.i32','vmvnlo.i32','vmvnmi.i32','vmvnpl.i32','vmvnvs.i32','vmvnvc.i32','vmvnhi.i32','vmvnls.i32','vmvnge.i32','vmvnlt.i32','vmvngt.i32','vmvnle.i32',
+            'vmvneq.i64','vmvnne.i64','vmvncs.i64','vmvnhs.i64','vmvncc.i64','vmvnlo.i64','vmvnmi.i64','vmvnpl.i64','vmvnvs.i64','vmvnvc.i64','vmvnhi.i64','vmvnls.i64','vmvnge.i64','vmvnlt.i64','vmvngt.i64','vmvnle.i64',
+            'vmvneq.f32','vmvnne.f32','vmvncs.f32','vmvnhs.f32','vmvncc.f32','vmvnlo.f32','vmvnmi.f32','vmvnpl.f32','vmvnvs.f32','vmvnvc.f32','vmvnhi.f32','vmvnls.f32','vmvnge.f32','vmvnlt.f32','vmvngt.f32','vmvnle.f32',
+            'vmvneq.f64','vmvnne.f64','vmvncs.f64','vmvnhs.f64','vmvncc.f64','vmvnlo.f64','vmvnmi.f64','vmvnpl.f64','vmvnvs.f64','vmvnvc.f64','vmvnhi.f64','vmvnls.f64','vmvnge.f64','vmvnlt.f64','vmvngt.f64','vmvnle.f64',
+
+            'vorneq','vornne','vorncs','vornhs','vorncc','vornlo','vornmi','vornpl','vornvs','vornvc','vornhi','vornls','vornge','vornlt','vorngt','vornle',
+            'vorneq.s8','vornne.s8','vorncs.s8','vornhs.s8','vorncc.s8','vornlo.s8','vornmi.s8','vornpl.s8','vornvs.s8','vornvc.s8','vornhi.s8','vornls.s8','vornge.s8','vornlt.s8','vorngt.s8','vornle.s8',
+            'vorneq.s16','vornne.s16','vorncs.s16','vornhs.s16','vorncc.s16','vornlo.s16','vornmi.s16','vornpl.s16','vornvs.s16','vornvc.s16','vornhi.s16','vornls.s16','vornge.s16','vornlt.s16','vorngt.s16','vornle.s16',
+            'vorneq.s32','vornne.s32','vorncs.s32','vornhs.s32','vorncc.s32','vornlo.s32','vornmi.s32','vornpl.s32','vornvs.s32','vornvc.s32','vornhi.s32','vornls.s32','vornge.s32','vornlt.s32','vorngt.s32','vornle.s32',
+            'vorneq.s64','vornne.s64','vorncs.s64','vornhs.s64','vorncc.s64','vornlo.s64','vornmi.s64','vornpl.s64','vornvs.s64','vornvc.s64','vornhi.s64','vornls.s64','vornge.s64','vornlt.s64','vorngt.s64','vornle.s64',
+            'vorneq.u8','vornne.u8','vorncs.u8','vornhs.u8','vorncc.u8','vornlo.u8','vornmi.u8','vornpl.u8','vornvs.u8','vornvc.u8','vornhi.u8','vornls.u8','vornge.u8','vornlt.u8','vorngt.u8','vornle.u8',
+            'vorneq.u16','vornne.u16','vorncs.u16','vornhs.u16','vorncc.u16','vornlo.u16','vornmi.u16','vornpl.u16','vornvs.u16','vornvc.u16','vornhi.u16','vornls.u16','vornge.u16','vornlt.u16','vorngt.u16','vornle.u16',
+            'vorneq.u32','vornne.u32','vorncs.u32','vornhs.u32','vorncc.u32','vornlo.u32','vornmi.u32','vornpl.u32','vornvs.u32','vornvc.u32','vornhi.u32','vornls.u32','vornge.u32','vornlt.u32','vorngt.u32','vornle.u32',
+            'vorneq.u64','vornne.u64','vorncs.u64','vornhs.u64','vorncc.u64','vornlo.u64','vornmi.u64','vornpl.u64','vornvs.u64','vornvc.u64','vornhi.u64','vornls.u64','vornge.u64','vornlt.u64','vorngt.u64','vornle.u64',
+            'vorneq.i8','vornne.i8','vorncs.i8','vornhs.i8','vorncc.i8','vornlo.i8','vornmi.i8','vornpl.i8','vornvs.i8','vornvc.i8','vornhi.i8','vornls.i8','vornge.i8','vornlt.i8','vorngt.i8','vornle.i8',
+            'vorneq.i16','vornne.i16','vorncs.i16','vornhs.i16','vorncc.i16','vornlo.i16','vornmi.i16','vornpl.i16','vornvs.i16','vornvc.i16','vornhi.i16','vornls.i16','vornge.i16','vornlt.i16','vorngt.i16','vornle.i16',
+            'vorneq.i32','vornne.i32','vorncs.i32','vornhs.i32','vorncc.i32','vornlo.i32','vornmi.i32','vornpl.i32','vornvs.i32','vornvc.i32','vornhi.i32','vornls.i32','vornge.i32','vornlt.i32','vorngt.i32','vornle.i32',
+            'vorneq.i64','vornne.i64','vorncs.i64','vornhs.i64','vorncc.i64','vornlo.i64','vornmi.i64','vornpl.i64','vornvs.i64','vornvc.i64','vornhi.i64','vornls.i64','vornge.i64','vornlt.i64','vorngt.i64','vornle.i64',
+            'vorneq.f32','vornne.f32','vorncs.f32','vornhs.f32','vorncc.f32','vornlo.f32','vornmi.f32','vornpl.f32','vornvs.f32','vornvc.f32','vornhi.f32','vornls.f32','vornge.f32','vornlt.f32','vorngt.f32','vornle.f32',
+            'vorneq.f64','vornne.f64','vorncs.f64','vornhs.f64','vorncc.f64','vornlo.f64','vornmi.f64','vornpl.f64','vornvs.f64','vornvc.f64','vornhi.f64','vornls.f64','vornge.f64','vornlt.f64','vorngt.f64','vornle.f64',
+
+            'vorreq','vorrne','vorrcs','vorrhs','vorrcc','vorrlo','vorrmi','vorrpl','vorrvs','vorrvc','vorrhi','vorrls','vorrge','vorrlt','vorrgt','vorrle',
+            'vorreq.s8','vorrne.s8','vorrcs.s8','vorrhs.s8','vorrcc.s8','vorrlo.s8','vorrmi.s8','vorrpl.s8','vorrvs.s8','vorrvc.s8','vorrhi.s8','vorrls.s8','vorrge.s8','vorrlt.s8','vorrgt.s8','vorrle.s8',
+            'vorreq.s16','vorrne.s16','vorrcs.s16','vorrhs.s16','vorrcc.s16','vorrlo.s16','vorrmi.s16','vorrpl.s16','vorrvs.s16','vorrvc.s16','vorrhi.s16','vorrls.s16','vorrge.s16','vorrlt.s16','vorrgt.s16','vorrle.s16',
+            'vorreq.s32','vorrne.s32','vorrcs.s32','vorrhs.s32','vorrcc.s32','vorrlo.s32','vorrmi.s32','vorrpl.s32','vorrvs.s32','vorrvc.s32','vorrhi.s32','vorrls.s32','vorrge.s32','vorrlt.s32','vorrgt.s32','vorrle.s32',
+            'vorreq.s64','vorrne.s64','vorrcs.s64','vorrhs.s64','vorrcc.s64','vorrlo.s64','vorrmi.s64','vorrpl.s64','vorrvs.s64','vorrvc.s64','vorrhi.s64','vorrls.s64','vorrge.s64','vorrlt.s64','vorrgt.s64','vorrle.s64',
+            'vorreq.u8','vorrne.u8','vorrcs.u8','vorrhs.u8','vorrcc.u8','vorrlo.u8','vorrmi.u8','vorrpl.u8','vorrvs.u8','vorrvc.u8','vorrhi.u8','vorrls.u8','vorrge.u8','vorrlt.u8','vorrgt.u8','vorrle.u8',
+            'vorreq.u16','vorrne.u16','vorrcs.u16','vorrhs.u16','vorrcc.u16','vorrlo.u16','vorrmi.u16','vorrpl.u16','vorrvs.u16','vorrvc.u16','vorrhi.u16','vorrls.u16','vorrge.u16','vorrlt.u16','vorrgt.u16','vorrle.u16',
+            'vorreq.u32','vorrne.u32','vorrcs.u32','vorrhs.u32','vorrcc.u32','vorrlo.u32','vorrmi.u32','vorrpl.u32','vorrvs.u32','vorrvc.u32','vorrhi.u32','vorrls.u32','vorrge.u32','vorrlt.u32','vorrgt.u32','vorrle.u32',
+            'vorreq.u64','vorrne.u64','vorrcs.u64','vorrhs.u64','vorrcc.u64','vorrlo.u64','vorrmi.u64','vorrpl.u64','vorrvs.u64','vorrvc.u64','vorrhi.u64','vorrls.u64','vorrge.u64','vorrlt.u64','vorrgt.u64','vorrle.u64',
+            'vorreq.i8','vorrne.i8','vorrcs.i8','vorrhs.i8','vorrcc.i8','vorrlo.i8','vorrmi.i8','vorrpl.i8','vorrvs.i8','vorrvc.i8','vorrhi.i8','vorrls.i8','vorrge.i8','vorrlt.i8','vorrgt.i8','vorrle.i8',
+            'vorreq.i16','vorrne.i16','vorrcs.i16','vorrhs.i16','vorrcc.i16','vorrlo.i16','vorrmi.i16','vorrpl.i16','vorrvs.i16','vorrvc.i16','vorrhi.i16','vorrls.i16','vorrge.i16','vorrlt.i16','vorrgt.i16','vorrle.i16',
+            'vorreq.i32','vorrne.i32','vorrcs.i32','vorrhs.i32','vorrcc.i32','vorrlo.i32','vorrmi.i32','vorrpl.i32','vorrvs.i32','vorrvc.i32','vorrhi.i32','vorrls.i32','vorrge.i32','vorrlt.i32','vorrgt.i32','vorrle.i32',
+            'vorreq.i64','vorrne.i64','vorrcs.i64','vorrhs.i64','vorrcc.i64','vorrlo.i64','vorrmi.i64','vorrpl.i64','vorrvs.i64','vorrvc.i64','vorrhi.i64','vorrls.i64','vorrge.i64','vorrlt.i64','vorrgt.i64','vorrle.i64',
+            'vorreq.f32','vorrne.f32','vorrcs.f32','vorrhs.f32','vorrcc.f32','vorrlo.f32','vorrmi.f32','vorrpl.f32','vorrvs.f32','vorrvc.f32','vorrhi.f32','vorrls.f32','vorrge.f32','vorrlt.f32','vorrgt.f32','vorrle.f32',
+            'vorreq.f64','vorrne.f64','vorrcs.f64','vorrhs.f64','vorrcc.f64','vorrlo.f64','vorrmi.f64','vorrpl.f64','vorrvs.f64','vorrvc.f64','vorrhi.f64','vorrls.f64','vorrge.f64','vorrlt.f64','vorrgt.f64','vorrle.f64',
+
+            'vswpeq','vswpne','vswpcs','vswphs','vswpcc','vswplo','vswpmi','vswppl','vswpvs','vswpvc','vswphi','vswpls','vswpge','vswplt','vswpgt','vswple',
+            'vswpeq.s8','vswpne.s8','vswpcs.s8','vswphs.s8','vswpcc.s8','vswplo.s8','vswpmi.s8','vswppl.s8','vswpvs.s8','vswpvc.s8','vswphi.s8','vswpls.s8','vswpge.s8','vswplt.s8','vswpgt.s8','vswple.s8',
+            'vswpeq.s16','vswpne.s16','vswpcs.s16','vswphs.s16','vswpcc.s16','vswplo.s16','vswpmi.s16','vswppl.s16','vswpvs.s16','vswpvc.s16','vswphi.s16','vswpls.s16','vswpge.s16','vswplt.s16','vswpgt.s16','vswple.s16',
+            'vswpeq.s32','vswpne.s32','vswpcs.s32','vswphs.s32','vswpcc.s32','vswplo.s32','vswpmi.s32','vswppl.s32','vswpvs.s32','vswpvc.s32','vswphi.s32','vswpls.s32','vswpge.s32','vswplt.s32','vswpgt.s32','vswple.s32',
+            'vswpeq.s64','vswpne.s64','vswpcs.s64','vswphs.s64','vswpcc.s64','vswplo.s64','vswpmi.s64','vswppl.s64','vswpvs.s64','vswpvc.s64','vswphi.s64','vswpls.s64','vswpge.s64','vswplt.s64','vswpgt.s64','vswple.s64',
+            'vswpeq.u8','vswpne.u8','vswpcs.u8','vswphs.u8','vswpcc.u8','vswplo.u8','vswpmi.u8','vswppl.u8','vswpvs.u8','vswpvc.u8','vswphi.u8','vswpls.u8','vswpge.u8','vswplt.u8','vswpgt.u8','vswple.u8',
+            'vswpeq.u16','vswpne.u16','vswpcs.u16','vswphs.u16','vswpcc.u16','vswplo.u16','vswpmi.u16','vswppl.u16','vswpvs.u16','vswpvc.u16','vswphi.u16','vswpls.u16','vswpge.u16','vswplt.u16','vswpgt.u16','vswple.u16',
+            'vswpeq.u32','vswpne.u32','vswpcs.u32','vswphs.u32','vswpcc.u32','vswplo.u32','vswpmi.u32','vswppl.u32','vswpvs.u32','vswpvc.u32','vswphi.u32','vswpls.u32','vswpge.u32','vswplt.u32','vswpgt.u32','vswple.u32',
+            'vswpeq.u64','vswpne.u64','vswpcs.u64','vswphs.u64','vswpcc.u64','vswplo.u64','vswpmi.u64','vswppl.u64','vswpvs.u64','vswpvc.u64','vswphi.u64','vswpls.u64','vswpge.u64','vswplt.u64','vswpgt.u64','vswple.u64',
+            'vswpeq.i8','vswpne.i8','vswpcs.i8','vswphs.i8','vswpcc.i8','vswplo.i8','vswpmi.i8','vswppl.i8','vswpvs.i8','vswpvc.i8','vswphi.i8','vswpls.i8','vswpge.i8','vswplt.i8','vswpgt.i8','vswple.i8',
+            'vswpeq.i16','vswpne.i16','vswpcs.i16','vswphs.i16','vswpcc.i16','vswplo.i16','vswpmi.i16','vswppl.i16','vswpvs.i16','vswpvc.i16','vswphi.i16','vswpls.i16','vswpge.i16','vswplt.i16','vswpgt.i16','vswple.i16',
+            'vswpeq.i32','vswpne.i32','vswpcs.i32','vswphs.i32','vswpcc.i32','vswplo.i32','vswpmi.i32','vswppl.i32','vswpvs.i32','vswpvc.i32','vswphi.i32','vswpls.i32','vswpge.i32','vswplt.i32','vswpgt.i32','vswple.i32',
+            'vswpeq.i64','vswpne.i64','vswpcs.i64','vswphs.i64','vswpcc.i64','vswplo.i64','vswpmi.i64','vswppl.i64','vswpvs.i64','vswpvc.i64','vswphi.i64','vswpls.i64','vswpge.i64','vswplt.i64','vswpgt.i64','vswple.i64',
+            'vswpeq.f32','vswpne.f32','vswpcs.f32','vswphs.f32','vswpcc.f32','vswplo.f32','vswpmi.f32','vswppl.f32','vswpvs.f32','vswpvc.f32','vswphi.f32','vswpls.f32','vswpge.f32','vswplt.f32','vswpgt.f32','vswple.f32',
+            'vswpeq.f64','vswpne.f64','vswpcs.f64','vswphs.f64','vswpcc.f64','vswplo.f64','vswpmi.f64','vswppl.f64','vswpvs.f64','vswpvc.f64','vswphi.f64','vswpls.f64','vswpge.f64','vswplt.f64','vswpgt.f64','vswple.f64'
+            ),
+        /* Conditional NEON SIMD ARM Registers Interop Instructions */
+        29 => array(
+            'vmrseq','vmrsne','vmrscs','vmrshs','vmrscc','vmrslo','vmrsmi','vmrspl','vmrsvs','vmrsvc','vmrshi','vmrsls','vmrsge','vmrslt','vmrsgt','vmrsle',
+            'vmsreq','vmsrne','vmsrcs','vmsrhs','vmsrcc','vmsrlo','vmsrmi','vmsrpl','vmsrvs','vmsrvc','vmsrhi','vmsrls','vmsrge','vmsrlt','vmsrgt','vmsrle'
+            ),
+        /* Conditional NEON SIMD Bit/Byte-Level Instructions */
+        30 => array(
+            'vcnteq.8','vcntne.8','vcntcs.8','vcnths.8','vcntcc.8','vcntlo.8','vcntmi.8','vcntpl.8','vcntvs.8','vcntvc.8','vcnthi.8','vcntls.8','vcntge.8','vcntlt.8','vcntgt.8','vcntle.8',
+            'vdupeq.8','vdupne.8','vdupcs.8','vduphs.8','vdupcc.8','vduplo.8','vdupmi.8','vduppl.8','vdupvs.8','vdupvc.8','vduphi.8','vdupls.8','vdupge.8','vduplt.8','vdupgt.8','vduple.8',
+
+            'vdupeq.16','vdupne.16','vdupcs.16','vduphs.16','vdupcc.16','vduplo.16','vdupmi.16','vduppl.16','vdupvs.16','vdupvc.16','vduphi.16','vdupls.16','vdupge.16','vduplt.16','vdupgt.16','vduple.16',
+            'vdupeq.32','vdupne.32','vdupcs.32','vduphs.32','vdupcc.32','vduplo.32','vdupmi.32','vduppl.32','vdupvs.32','vdupvc.32','vduphi.32','vdupls.32','vdupge.32','vduplt.32','vdupgt.32','vduple.32',
+
+            'vexteq.8','vextne.8','vextcs.8','vexths.8','vextcc.8','vextlo.8','vextmi.8','vextpl.8','vextvs.8','vextvc.8','vexthi.8','vextls.8','vextge.8','vextlt.8','vextgt.8','vextle.8',
+            'vexteq.16','vextne.16','vextcs.16','vexths.16','vextcc.16','vextlo.16','vextmi.16','vextpl.16','vextvs.16','vextvc.16','vexthi.16','vextls.16','vextge.16','vextlt.16','vextgt.16','vextle.16',
+
+            'vexteq.32','vextne.32','vextcs.32','vexths.32','vextcc.32','vextlo.32','vextmi.32','vextpl.32','vextvs.32','vextvc.32','vexthi.32','vextls.32','vextge.32','vextlt.32','vextgt.32','vextle.32',
+            'vexteq.64','vextne.64','vextcs.64','vexths.64','vextcc.64','vextlo.64','vextmi.64','vextpl.64','vextvs.64','vextvc.64','vexthi.64','vextls.64','vextge.64','vextlt.64','vextgt.64','vextle.64',
+
+            'vrev16eq.8','vrev16ne.8','vrev16cs.8','vrev16hs.8','vrev16cc.8','vrev16lo.8','vrev16mi.8','vrev16pl.8','vrev16vs.8','vrev16vc.8','vrev16hi.8','vrev16ls.8','vrev16ge.8','vrev16lt.8','vrev16gt.8','vrev16le.8',
+            'vrev32eq.8','vrev32ne.8','vrev32cs.8','vrev32hs.8','vrev32cc.8','vrev32lo.8','vrev32mi.8','vrev32pl.8','vrev32vs.8','vrev32vc.8','vrev32hi.8','vrev32ls.8','vrev32ge.8','vrev32lt.8','vrev32gt.8','vrev32le.8',
+            'vrev32eq.16','vrev32ne.16','vrev32cs.16','vrev32hs.16','vrev32cc.16','vrev32lo.16','vrev32mi.16','vrev32pl.16','vrev32vs.16','vrev32vc.16','vrev32hi.16','vrev32ls.16','vrev32ge.16','vrev32lt.16','vrev32gt.16','vrev32le.16',
+            'vrev64eq.8','vrev64ne.8','vrev64cs.8','vrev64hs.8','vrev64cc.8','vrev64lo.8','vrev64mi.8','vrev64pl.8','vrev64vs.8','vrev64vc.8','vrev64hi.8','vrev64ls.8','vrev64ge.8','vrev64lt.8','vrev64gt.8','vrev64le.8',
+            'vrev64eq.16','vrev64ne.16','vrev64cs.16','vrev64hs.16','vrev64cc.16','vrev64lo.16','vrev64mi.16','vrev64pl.16','vrev64vs.16','vrev64vc.16','vrev64hi.16','vrev64ls.16','vrev64ge.16','vrev64lt.16','vrev64gt.16','vrev64le.16',
+            'vrev64eq.32','vrev64ne.32','vrev64cs.32','vrev64hs.32','vrev64cc.32','vrev64lo.32','vrev64mi.32','vrev64pl.32','vrev64vs.32','vrev64vc.32','vrev64hi.32','vrev64ls.32','vrev64ge.32','vrev64lt.32','vrev64gt.32','vrev64le.32',
+
+            'vslieq.8','vsline.8','vslics.8','vslihs.8','vslicc.8','vslilo.8','vslimi.8','vslipl.8','vslivs.8','vslivc.8','vslihi.8','vslils.8','vslige.8','vslilt.8','vsligt.8','vslile.8',
+            'vslieq.16','vsline.16','vslics.16','vslihs.16','vslicc.16','vslilo.16','vslimi.16','vslipl.16','vslivs.16','vslivc.16','vslihi.16','vslils.16','vslige.16','vslilt.16','vsligt.16','vslile.16',
+            'vslieq.32','vsline.32','vslics.32','vslihs.32','vslicc.32','vslilo.32','vslimi.32','vslipl.32','vslivs.32','vslivc.32','vslihi.32','vslils.32','vslige.32','vslilt.32','vsligt.32','vslile.32',
+            'vslieq.64','vsline.64','vslics.64','vslihs.64','vslicc.64','vslilo.64','vslimi.64','vslipl.64','vslivs.64','vslivc.64','vslihi.64','vslils.64','vslige.64','vslilt.64','vsligt.64','vslile.64',
+
+            'vsrieq.8','vsrine.8','vsrics.8','vsrihs.8','vsricc.8','vsrilo.8','vsrimi.8','vsripl.8','vsrivs.8','vsrivc.8','vsrihi.8','vsrils.8','vsrige.8','vsrilt.8','vsrigt.8','vsrile.8',
+            'vsrieq.16','vsrine.16','vsrics.16','vsrihs.16','vsricc.16','vsrilo.16','vsrimi.16','vsripl.16','vsrivs.16','vsrivc.16','vsrihi.16','vsrils.16','vsrige.16','vsrilt.16','vsrigt.16','vsrile.16',
+            'vsrieq.32','vsrine.32','vsrics.32','vsrihs.32','vsricc.32','vsrilo.32','vsrimi.32','vsripl.32','vsrivs.32','vsrivc.32','vsrihi.32','vsrils.32','vsrige.32','vsrilt.32','vsrigt.32','vsrile.32',
+            'vsrieq.64','vsrine.64','vsrics.64','vsrihs.64','vsricc.64','vsrilo.64','vsrimi.64','vsripl.64','vsrivs.64','vsrivc.64','vsrihi.64','vsrils.64','vsrige.64','vsrilt.64','vsrigt.64','vsrile.64',
+
+            'vtbleq.8','vtblne.8','vtblcs.8','vtblhs.8','vtblcc.8','vtbllo.8','vtblmi.8','vtblpl.8','vtblvs.8','vtblvc.8','vtblhi.8','vtblls.8','vtblge.8','vtbllt.8','vtblgt.8','vtblle.8',
+
+            'vtbxeq','vtbxne','vtbxcs','vtbxhs','vtbxcc','vtbxlo','vtbxmi','vtbxpl','vtbxvs','vtbxvc','vtbxhi','vtbxls','vtbxge','vtbxlt','vtbxgt','vtbxle',
+
+            'vtrneq.8','vtrnne.8','vtrncs.8','vtrnhs.8','vtrncc.8','vtrnlo.8','vtrnmi.8','vtrnpl.8','vtrnvs.8','vtrnvc.8','vtrnhi.8','vtrnls.8','vtrnge.8','vtrnlt.8','vtrngt.8','vtrnle.8',
+            'vtrneq.16','vtrnne.16','vtrncs.16','vtrnhs.16','vtrncc.16','vtrnlo.16','vtrnmi.16','vtrnpl.16','vtrnvs.16','vtrnvc.16','vtrnhi.16','vtrnls.16','vtrnge.16','vtrnlt.16','vtrngt.16','vtrnle.16',
+            'vtrneq.32','vtrnne.32','vtrncs.32','vtrnhs.32','vtrncc.32','vtrnlo.32','vtrnmi.32','vtrnpl.32','vtrnvs.32','vtrnvc.32','vtrnhi.32','vtrnls.32','vtrnge.32','vtrnlt.32','vtrngt.32','vtrnle.32',
+
+            'vtsteq.8','vtstne.8','vtstcs.8','vtsths.8','vtstcc.8','vtstlo.8','vtstmi.8','vtstpl.8','vtstvs.8','vtstvc.8','vtsthi.8','vtstls.8','vtstge.8','vtstlt.8','vtstgt.8','vtstle.8',
+            'vtsteq.16','vtstne.16','vtstcs.16','vtsths.16','vtstcc.16','vtstlo.16','vtstmi.16','vtstpl.16','vtstvs.16','vtstvc.16','vtsthi.16','vtstls.16','vtstge.16','vtstlt.16','vtstgt.16','vtstle.16',
+            'vtsteq.32','vtstne.32','vtstcs.32','vtsths.32','vtstcc.32','vtstlo.32','vtstmi.32','vtstpl.32','vtstvs.32','vtstvc.32','vtsthi.32','vtstls.32','vtstge.32','vtstlt.32','vtstgt.32','vtstle.32',
+
+            'vuzpeq.8','vuzpne.8','vuzpcs.8','vuzphs.8','vuzpcc.8','vuzplo.8','vuzpmi.8','vuzppl.8','vuzpvs.8','vuzpvc.8','vuzphi.8','vuzpls.8','vuzpge.8','vuzplt.8','vuzpgt.8','vuzple.8',
+            'vuzpeq.16','vuzpne.16','vuzpcs.16','vuzphs.16','vuzpcc.16','vuzplo.16','vuzpmi.16','vuzppl.16','vuzpvs.16','vuzpvc.16','vuzphi.16','vuzpls.16','vuzpge.16','vuzplt.16','vuzpgt.16','vuzple.16',
+            'vuzpeq.32','vuzpne.32','vuzpcs.32','vuzphs.32','vuzpcc.32','vuzplo.32','vuzpmi.32','vuzppl.32','vuzpvs.32','vuzpvc.32','vuzphi.32','vuzpls.32','vuzpge.32','vuzplt.32','vuzpgt.32','vuzple.32',
+
+            'vzipeq.8','vzipne.8','vzipcs.8','vziphs.8','vzipcc.8','vziplo.8','vzipmi.8','vzippl.8','vzipvs.8','vzipvc.8','vziphi.8','vzipls.8','vzipge.8','vziplt.8','vzipgt.8','vziple.8',
+            'vzipeq.16','vzipne.16','vzipcs.16','vziphs.16','vzipcc.16','vziplo.16','vzipmi.16','vzippl.16','vzipvs.16','vzipvc.16','vziphi.16','vzipls.16','vzipge.16','vziplt.16','vzipgt.16','vziple.16',
+            'vzipeq.32','vzipne.32','vzipcs.32','vziphs.32','vzipcc.32','vziplo.32','vzipmi.32','vzippl.32','vzipvs.32','vzipvc.32','vziphi.32','vzipls.32','vzipge.32','vziplt.32','vzipgt.32','vziple.32',
+
+            'vmulleq.p8','vmullne.p8','vmullcs.p8','vmullhs.p8','vmullcc.p8','vmulllo.p8','vmullmi.p8','vmullpl.p8','vmullvs.p8','vmullvc.p8','vmullhi.p8','vmullls.p8','vmullge.p8','vmulllt.p8','vmullgt.p8','vmullle.p8'
+            ),
+        /* Conditional NEON SIMD Universal Integer Instructions */
+        31 => array(
+            'vaddeq.i8','vaddne.i8','vaddcs.i8','vaddhs.i8','vaddcc.i8','vaddlo.i8','vaddmi.i8','vaddpl.i8','vaddvs.i8','vaddvc.i8','vaddhi.i8','vaddls.i8','vaddge.i8','vaddlt.i8','vaddgt.i8','vaddle.i8',
+            'vaddeq.i16','vaddne.i16','vaddcs.i16','vaddhs.i16','vaddcc.i16','vaddlo.i16','vaddmi.i16','vaddpl.i16','vaddvs.i16','vaddvc.i16','vaddhi.i16','vaddls.i16','vaddge.i16','vaddlt.i16','vaddgt.i16','vaddle.i16',
+            'vaddeq.i32','vaddne.i32','vaddcs.i32','vaddhs.i32','vaddcc.i32','vaddlo.i32','vaddmi.i32','vaddpl.i32','vaddvs.i32','vaddvc.i32','vaddhi.i32','vaddls.i32','vaddge.i32','vaddlt.i32','vaddgt.i32','vaddle.i32',
+            'vaddeq.i64','vaddne.i64','vaddcs.i64','vaddhs.i64','vaddcc.i64','vaddlo.i64','vaddmi.i64','vaddpl.i64','vaddvs.i64','vaddvc.i64','vaddhi.i64','vaddls.i64','vaddge.i64','vaddlt.i64','vaddgt.i64','vaddle.i64',
+
+            'vsubeq.i8','vsubne.i8','vsubcs.i8','vsubhs.i8','vsubcc.i8','vsublo.i8','vsubmi.i8','vsubpl.i8','vsubvs.i8','vsubvc.i8','vsubhi.i8','vsubls.i8','vsubge.i8','vsublt.i8','vsubgt.i8','vsuble.i8',
+            'vsubeq.i16','vsubne.i16','vsubcs.i16','vsubhs.i16','vsubcc.i16','vsublo.i16','vsubmi.i16','vsubpl.i16','vsubvs.i16','vsubvc.i16','vsubhi.i16','vsubls.i16','vsubge.i16','vsublt.i16','vsubgt.i16','vsuble.i16',
+            'vsubeq.i32','vsubne.i32','vsubcs.i32','vsubhs.i32','vsubcc.i32','vsublo.i32','vsubmi.i32','vsubpl.i32','vsubvs.i32','vsubvc.i32','vsubhi.i32','vsubls.i32','vsubge.i32','vsublt.i32','vsubgt.i32','vsuble.i32',
+            'vsubeq.i64','vsubne.i64','vsubcs.i64','vsubhs.i64','vsubcc.i64','vsublo.i64','vsubmi.i64','vsubpl.i64','vsubvs.i64','vsubvc.i64','vsubhi.i64','vsubls.i64','vsubge.i64','vsublt.i64','vsubgt.i64','vsuble.i64',
+
+            'vaddhneq.i16','vaddhnne.i16','vaddhncs.i16','vaddhnhs.i16','vaddhncc.i16','vaddhnlo.i16','vaddhnmi.i16','vaddhnpl.i16','vaddhnvs.i16','vaddhnvc.i16','vaddhnhi.i16','vaddhnls.i16','vaddhnge.i16','vaddhnlt.i16','vaddhngt.i16','vaddhnle.i16',
+            'vaddhneq.i32','vaddhnne.i32','vaddhncs.i32','vaddhnhs.i32','vaddhncc.i32','vaddhnlo.i32','vaddhnmi.i32','vaddhnpl.i32','vaddhnvs.i32','vaddhnvc.i32','vaddhnhi.i32','vaddhnls.i32','vaddhnge.i32','vaddhnlt.i32','vaddhngt.i32','vaddhnle.i32',
+            'vaddhneq.i64','vaddhnne.i64','vaddhncs.i64','vaddhnhs.i64','vaddhncc.i64','vaddhnlo.i64','vaddhnmi.i64','vaddhnpl.i64','vaddhnvs.i64','vaddhnvc.i64','vaddhnhi.i64','vaddhnls.i64','vaddhnge.i64','vaddhnlt.i64','vaddhngt.i64','vaddhnle.i64',
+
+            'vsubhneq.i16','vsubhnne.i16','vsubhncs.i16','vsubhnhs.i16','vsubhncc.i16','vsubhnlo.i16','vsubhnmi.i16','vsubhnpl.i16','vsubhnvs.i16','vsubhnvc.i16','vsubhnhi.i16','vsubhnls.i16','vsubhnge.i16','vsubhnlt.i16','vsubhngt.i16','vsubhnle.i16',
+            'vsubhneq.i32','vsubhnne.i32','vsubhncs.i32','vsubhnhs.i32','vsubhncc.i32','vsubhnlo.i32','vsubhnmi.i32','vsubhnpl.i32','vsubhnvs.i32','vsubhnvc.i32','vsubhnhi.i32','vsubhnls.i32','vsubhnge.i32','vsubhnlt.i32','vsubhngt.i32','vsubhnle.i32',
+            'vsubhneq.i64','vsubhnne.i64','vsubhncs.i64','vsubhnhs.i64','vsubhncc.i64','vsubhnlo.i64','vsubhnmi.i64','vsubhnpl.i64','vsubhnvs.i64','vsubhnvc.i64','vsubhnhi.i64','vsubhnls.i64','vsubhnge.i64','vsubhnlt.i64','vsubhngt.i64','vsubhnle.i64',
+
+            'vraddhneq.i16','vraddhnne.i16','vraddhncs.i16','vraddhnhs.i16','vraddhncc.i16','vraddhnlo.i16','vraddhnmi.i16','vraddhnpl.i16','vraddhnvs.i16','vraddhnvc.i16','vraddhnhi.i16','vraddhnls.i16','vraddhnge.i16','vraddhnlt.i16','vraddhngt.i16','vraddhnle.i16',
+            'vraddhneq.i32','vraddhnne.i32','vraddhncs.i32','vraddhnhs.i32','vraddhncc.i32','vraddhnlo.i32','vraddhnmi.i32','vraddhnpl.i32','vraddhnvs.i32','vraddhnvc.i32','vraddhnhi.i32','vraddhnls.i32','vraddhnge.i32','vraddhnlt.i32','vraddhngt.i32','vraddhnle.i32',
+            'vraddhneq.i64','vraddhnne.i64','vraddhncs.i64','vraddhnhs.i64','vraddhncc.i64','vraddhnlo.i64','vraddhnmi.i64','vraddhnpl.i64','vraddhnvs.i64','vraddhnvc.i64','vraddhnhi.i64','vraddhnls.i64','vraddhnge.i64','vraddhnlt.i64','vraddhngt.i64','vraddhnle.i64',
+
+            'vrsubhneq.i16','vrsubhnne.i16','vrsubhncs.i16','vrsubhnhs.i16','vrsubhncc.i16','vrsubhnlo.i16','vrsubhnmi.i16','vrsubhnpl.i16','vrsubhnvs.i16','vrsubhnvc.i16','vrsubhnhi.i16','vrsubhnls.i16','vrsubhnge.i16','vrsubhnlt.i16','vrsubhngt.i16','vrsubhnle.i16',
+            'vrsubhneq.i32','vrsubhnne.i32','vrsubhncs.i32','vrsubhnhs.i32','vrsubhncc.i32','vrsubhnlo.i32','vrsubhnmi.i32','vrsubhnpl.i32','vrsubhnvs.i32','vrsubhnvc.i32','vrsubhnhi.i32','vrsubhnls.i32','vrsubhnge.i32','vrsubhnlt.i32','vrsubhngt.i32','vrsubhnle.i32',
+            'vrsubhneq.i64','vrsubhnne.i64','vrsubhncs.i64','vrsubhnhs.i64','vrsubhncc.i64','vrsubhnlo.i64','vrsubhnmi.i64','vrsubhnpl.i64','vrsubhnvs.i64','vrsubhnvc.i64','vrsubhnhi.i64','vrsubhnls.i64','vrsubhnge.i64','vrsubhnlt.i64','vrsubhngt.i64','vrsubhnle.i64',
+
+            'vpaddeq.i8','vpaddne.i8','vpaddcs.i8','vpaddhs.i8','vpaddcc.i8','vpaddlo.i8','vpaddmi.i8','vpaddpl.i8','vpaddvs.i8','vpaddvc.i8','vpaddhi.i8','vpaddls.i8','vpaddge.i8','vpaddlt.i8','vpaddgt.i8','vpaddle.i8',
+            'vpaddeq.i16','vpaddne.i16','vpaddcs.i16','vpaddhs.i16','vpaddcc.i16','vpaddlo.i16','vpaddmi.i16','vpaddpl.i16','vpaddvs.i16','vpaddvc.i16','vpaddhi.i16','vpaddls.i16','vpaddge.i16','vpaddlt.i16','vpaddgt.i16','vpaddle.i16',
+            'vpaddeq.i32','vpaddne.i32','vpaddcs.i32','vpaddhs.i32','vpaddcc.i32','vpaddlo.i32','vpaddmi.i32','vpaddpl.i32','vpaddvs.i32','vpaddvc.i32','vpaddhi.i32','vpaddls.i32','vpaddge.i32','vpaddlt.i32','vpaddgt.i32','vpaddle.i32',
+
+            'vceqeq.i8','vceqne.i8','vceqcs.i8','vceqhs.i8','vceqcc.i8','vceqlo.i8','vceqmi.i8','vceqpl.i8','vceqvs.i8','vceqvc.i8','vceqhi.i8','vceqls.i8','vceqge.i8','vceqlt.i8','vceqgt.i8','vceqle.i8',
+            'vceqeq.i16','vceqne.i16','vceqcs.i16','vceqhs.i16','vceqcc.i16','vceqlo.i16','vceqmi.i16','vceqpl.i16','vceqvs.i16','vceqvc.i16','vceqhi.i16','vceqls.i16','vceqge.i16','vceqlt.i16','vceqgt.i16','vceqle.i16',
+            'vceqeq.i32','vceqne.i32','vceqcs.i32','vceqhs.i32','vceqcc.i32','vceqlo.i32','vceqmi.i32','vceqpl.i32','vceqvs.i32','vceqvc.i32','vceqhi.i32','vceqls.i32','vceqge.i32','vceqlt.i32','vceqgt.i32','vceqle.i32',
+
+            'vclzeq.i8','vclzne.i8','vclzcs.i8','vclzhs.i8','vclzcc.i8','vclzlo.i8','vclzmi.i8','vclzpl.i8','vclzvs.i8','vclzvc.i8','vclzhi.i8','vclzls.i8','vclzge.i8','vclzlt.i8','vclzgt.i8','vclzle.i8',
+            'vclzeq.i16','vclzne.i16','vclzcs.i16','vclzhs.i16','vclzcc.i16','vclzlo.i16','vclzmi.i16','vclzpl.i16','vclzvs.i16','vclzvc.i16','vclzhi.i16','vclzls.i16','vclzge.i16','vclzlt.i16','vclzgt.i16','vclzle.i16',
+            'vclzeq.i32','vclzne.i32','vclzcs.i32','vclzhs.i32','vclzcc.i32','vclzlo.i32','vclzmi.i32','vclzpl.i32','vclzvs.i32','vclzvc.i32','vclzhi.i32','vclzls.i32','vclzge.i32','vclzlt.i32','vclzgt.i32','vclzle.i32',
+
+            'vmovneq.i16','vmovnne.i16','vmovncs.i16','vmovnhs.i16','vmovncc.i16','vmovnlo.i16','vmovnmi.i16','vmovnpl.i16','vmovnvs.i16','vmovnvc.i16','vmovnhi.i16','vmovnls.i16','vmovnge.i16','vmovnlt.i16','vmovngt.i16','vmovnle.i16',
+            'vmovneq.i32','vmovnne.i32','vmovncs.i32','vmovnhs.i32','vmovncc.i32','vmovnlo.i32','vmovnmi.i32','vmovnpl.i32','vmovnvs.i32','vmovnvc.i32','vmovnhi.i32','vmovnls.i32','vmovnge.i32','vmovnlt.i32','vmovngt.i32','vmovnle.i32',
+            'vmovneq.i64','vmovnne.i64','vmovncs.i64','vmovnhs.i64','vmovncc.i64','vmovnlo.i64','vmovnmi.i64','vmovnpl.i64','vmovnvs.i64','vmovnvc.i64','vmovnhi.i64','vmovnls.i64','vmovnge.i64','vmovnlt.i64','vmovngt.i64','vmovnle.i64',
+
+            'vmlaeq.s8','vmlane.s8','vmlacs.s8','vmlahs.s8','vmlacc.s8','vmlalo.s8','vmlami.s8','vmlapl.s8','vmlavs.s8','vmlavc.s8','vmlahi.s8','vmlals.s8','vmlage.s8','vmlalt.s8','vmlagt.s8','vmlale.s8',
+            'vmlaeq.s16','vmlane.s16','vmlacs.s16','vmlahs.s16','vmlacc.s16','vmlalo.s16','vmlami.s16','vmlapl.s16','vmlavs.s16','vmlavc.s16','vmlahi.s16','vmlals.s16','vmlage.s16','vmlalt.s16','vmlagt.s16','vmlale.s16',
+            'vmlaeq.s32','vmlane.s32','vmlacs.s32','vmlahs.s32','vmlacc.s32','vmlalo.s32','vmlami.s32','vmlapl.s32','vmlavs.s32','vmlavc.s32','vmlahi.s32','vmlals.s32','vmlage.s32','vmlalt.s32','vmlagt.s32','vmlale.s32',
+            'vmlaeq.u8','vmlane.u8','vmlacs.u8','vmlahs.u8','vmlacc.u8','vmlalo.u8','vmlami.u8','vmlapl.u8','vmlavs.u8','vmlavc.u8','vmlahi.u8','vmlals.u8','vmlage.u8','vmlalt.u8','vmlagt.u8','vmlale.u8',
+            'vmlaeq.u16','vmlane.u16','vmlacs.u16','vmlahs.u16','vmlacc.u16','vmlalo.u16','vmlami.u16','vmlapl.u16','vmlavs.u16','vmlavc.u16','vmlahi.u16','vmlals.u16','vmlage.u16','vmlalt.u16','vmlagt.u16','vmlale.u16',
+            'vmlaeq.u32','vmlane.u32','vmlacs.u32','vmlahs.u32','vmlacc.u32','vmlalo.u32','vmlami.u32','vmlapl.u32','vmlavs.u32','vmlavc.u32','vmlahi.u32','vmlals.u32','vmlage.u32','vmlalt.u32','vmlagt.u32','vmlale.u32',
+            'vmlaeq.i8','vmlane.i8','vmlacs.i8','vmlahs.i8','vmlacc.i8','vmlalo.i8','vmlami.i8','vmlapl.i8','vmlavs.i8','vmlavc.i8','vmlahi.i8','vmlals.i8','vmlage.i8','vmlalt.i8','vmlagt.i8','vmlale.i8',
+            'vmlaeq.i16','vmlane.i16','vmlacs.i16','vmlahs.i16','vmlacc.i16','vmlalo.i16','vmlami.i16','vmlapl.i16','vmlavs.i16','vmlavc.i16','vmlahi.i16','vmlals.i16','vmlage.i16','vmlalt.i16','vmlagt.i16','vmlale.i16',
+            'vmlaeq.i32','vmlane.i32','vmlacs.i32','vmlahs.i32','vmlacc.i32','vmlalo.i32','vmlami.i32','vmlapl.i32','vmlavs.i32','vmlavc.i32','vmlahi.i32','vmlals.i32','vmlage.i32','vmlalt.i32','vmlagt.i32','vmlale.i32',
+
+            'vmlseq.s8','vmlsne.s8','vmlscs.s8','vmlshs.s8','vmlscc.s8','vmlslo.s8','vmlsmi.s8','vmlspl.s8','vmlsvs.s8','vmlsvc.s8','vmlshi.s8','vmlsls.s8','vmlsge.s8','vmlslt.s8','vmlsgt.s8','vmlsle.s8',
+            'vmlseq.s16','vmlsne.s16','vmlscs.s16','vmlshs.s16','vmlscc.s16','vmlslo.s16','vmlsmi.s16','vmlspl.s16','vmlsvs.s16','vmlsvc.s16','vmlshi.s16','vmlsls.s16','vmlsge.s16','vmlslt.s16','vmlsgt.s16','vmlsle.s16',
+            'vmlseq.s32','vmlsne.s32','vmlscs.s32','vmlshs.s32','vmlscc.s32','vmlslo.s32','vmlsmi.s32','vmlspl.s32','vmlsvs.s32','vmlsvc.s32','vmlshi.s32','vmlsls.s32','vmlsge.s32','vmlslt.s32','vmlsgt.s32','vmlsle.s32',
+            'vmlseq.u8','vmlsne.u8','vmlscs.u8','vmlshs.u8','vmlscc.u8','vmlslo.u8','vmlsmi.u8','vmlspl.u8','vmlsvs.u8','vmlsvc.u8','vmlshi.u8','vmlsls.u8','vmlsge.u8','vmlslt.u8','vmlsgt.u8','vmlsle.u8',
+            'vmlseq.u16','vmlsne.u16','vmlscs.u16','vmlshs.u16','vmlscc.u16','vmlslo.u16','vmlsmi.u16','vmlspl.u16','vmlsvs.u16','vmlsvc.u16','vmlshi.u16','vmlsls.u16','vmlsge.u16','vmlslt.u16','vmlsgt.u16','vmlsle.u16',
+            'vmlseq.u32','vmlsne.u32','vmlscs.u32','vmlshs.u32','vmlscc.u32','vmlslo.u32','vmlsmi.u32','vmlspl.u32','vmlsvs.u32','vmlsvc.u32','vmlshi.u32','vmlsls.u32','vmlsge.u32','vmlslt.u32','vmlsgt.u32','vmlsle.u32',
+            'vmlseq.i8','vmlsne.i8','vmlscs.i8','vmlshs.i8','vmlscc.i8','vmlslo.i8','vmlsmi.i8','vmlspl.i8','vmlsvs.i8','vmlsvc.i8','vmlshi.i8','vmlsls.i8','vmlsge.i8','vmlslt.i8','vmlsgt.i8','vmlsle.i8',
+            'vmlseq.i16','vmlsne.i16','vmlscs.i16','vmlshs.i16','vmlscc.i16','vmlslo.i16','vmlsmi.i16','vmlspl.i16','vmlsvs.i16','vmlsvc.i16','vmlshi.i16','vmlsls.i16','vmlsge.i16','vmlslt.i16','vmlsgt.i16','vmlsle.i16',
+            'vmlseq.i32','vmlsne.i32','vmlscs.i32','vmlshs.i32','vmlscc.i32','vmlslo.i32','vmlsmi.i32','vmlspl.i32','vmlsvs.i32','vmlsvc.i32','vmlshi.i32','vmlsls.i32','vmlsge.i32','vmlslt.i32','vmlsgt.i32','vmlsle.i32',
+
+            'vmuleq.s8','vmulne.s8','vmulcs.s8','vmulhs.s8','vmulcc.s8','vmullo.s8','vmulmi.s8','vmulpl.s8','vmulvs.s8','vmulvc.s8','vmulhi.s8','vmulls.s8','vmulge.s8','vmullt.s8','vmulgt.s8','vmulle.s8',
+            'vmuleq.s16','vmulne.s16','vmulcs.s16','vmulhs.s16','vmulcc.s16','vmullo.s16','vmulmi.s16','vmulpl.s16','vmulvs.s16','vmulvc.s16','vmulhi.s16','vmulls.s16','vmulge.s16','vmullt.s16','vmulgt.s16','vmulle.s16',
+            'vmuleq.s32','vmulne.s32','vmulcs.s32','vmulhs.s32','vmulcc.s32','vmullo.s32','vmulmi.s32','vmulpl.s32','vmulvs.s32','vmulvc.s32','vmulhi.s32','vmulls.s32','vmulge.s32','vmullt.s32','vmulgt.s32','vmulle.s32',
+            'vmuleq.u8','vmulne.u8','vmulcs.u8','vmulhs.u8','vmulcc.u8','vmullo.u8','vmulmi.u8','vmulpl.u8','vmulvs.u8','vmulvc.u8','vmulhi.u8','vmulls.u8','vmulge.u8','vmullt.u8','vmulgt.u8','vmulle.u8',
+            'vmuleq.u16','vmulne.u16','vmulcs.u16','vmulhs.u16','vmulcc.u16','vmullo.u16','vmulmi.u16','vmulpl.u16','vmulvs.u16','vmulvc.u16','vmulhi.u16','vmulls.u16','vmulge.u16','vmullt.u16','vmulgt.u16','vmulle.u16',
+            'vmuleq.u32','vmulne.u32','vmulcs.u32','vmulhs.u32','vmulcc.u32','vmullo.u32','vmulmi.u32','vmulpl.u32','vmulvs.u32','vmulvc.u32','vmulhi.u32','vmulls.u32','vmulge.u32','vmullt.u32','vmulgt.u32','vmulle.u32',
+            'vmuleq.i8','vmulne.i8','vmulcs.i8','vmulhs.i8','vmulcc.i8','vmullo.i8','vmulmi.i8','vmulpl.i8','vmulvs.i8','vmulvc.i8','vmulhi.i8','vmulls.i8','vmulge.i8','vmullt.i8','vmulgt.i8','vmulle.i8',
+            'vmuleq.i16','vmulne.i16','vmulcs.i16','vmulhs.i16','vmulcc.i16','vmullo.i16','vmulmi.i16','vmulpl.i16','vmulvs.i16','vmulvc.i16','vmulhi.i16','vmulls.i16','vmulge.i16','vmullt.i16','vmulgt.i16','vmulle.i16',
+            'vmuleq.i32','vmulne.i32','vmulcs.i32','vmulhs.i32','vmulcc.i32','vmullo.i32','vmulmi.i32','vmulpl.i32','vmulvs.i32','vmulvc.i32','vmulhi.i32','vmulls.i32','vmulge.i32','vmullt.i32','vmulgt.i32','vmulle.i32',
+            'vmuleq.p8','vmulne.p8','vmulcs.p8','vmulhs.p8','vmulcc.p8','vmullo.p8','vmulmi.p8','vmulpl.p8','vmulvs.p8','vmulvc.p8','vmulhi.p8','vmulls.p8','vmulge.p8','vmullt.p8','vmulgt.p8','vmulle.p8',
+
+            'vrshrneq.i16','vrshrnne.i16','vrshrncs.i16','vrshrnhs.i16','vrshrncc.i16','vrshrnlo.i16','vrshrnmi.i16','vrshrnpl.i16','vrshrnvs.i16','vrshrnvc.i16','vrshrnhi.i16','vrshrnls.i16','vrshrnge.i16','vrshrnlt.i16','vrshrngt.i16','vrshrnle.i16',
+            'vrshrneq.i32','vrshrnne.i32','vrshrncs.i32','vrshrnhs.i32','vrshrncc.i32','vrshrnlo.i32','vrshrnmi.i32','vrshrnpl.i32','vrshrnvs.i32','vrshrnvc.i32','vrshrnhi.i32','vrshrnls.i32','vrshrnge.i32','vrshrnlt.i32','vrshrngt.i32','vrshrnle.i32',
+            'vrshrneq.i64','vrshrnne.i64','vrshrncs.i64','vrshrnhs.i64','vrshrncc.i64','vrshrnlo.i64','vrshrnmi.i64','vrshrnpl.i64','vrshrnvs.i64','vrshrnvc.i64','vrshrnhi.i64','vrshrnls.i64','vrshrnge.i64','vrshrnlt.i64','vrshrngt.i64','vrshrnle.i64',
+
+            'vshrneq.i16','vshrnne.i16','vshrncs.i16','vshrnhs.i16','vshrncc.i16','vshrnlo.i16','vshrnmi.i16','vshrnpl.i16','vshrnvs.i16','vshrnvc.i16','vshrnhi.i16','vshrnls.i16','vshrnge.i16','vshrnlt.i16','vshrngt.i16','vshrnle.i16',
+            'vshrneq.i32','vshrnne.i32','vshrncs.i32','vshrnhs.i32','vshrncc.i32','vshrnlo.i32','vshrnmi.i32','vshrnpl.i32','vshrnvs.i32','vshrnvc.i32','vshrnhi.i32','vshrnls.i32','vshrnge.i32','vshrnlt.i32','vshrngt.i32','vshrnle.i32',
+            'vshrneq.i64','vshrnne.i64','vshrncs.i64','vshrnhs.i64','vshrncc.i64','vshrnlo.i64','vshrnmi.i64','vshrnpl.i64','vshrnvs.i64','vshrnvc.i64','vshrnhi.i64','vshrnls.i64','vshrnge.i64','vshrnlt.i64','vshrngt.i64','vshrnle.i64',
+
+            'vshleq.i8','vshlne.i8','vshlcs.i8','vshlhs.i8','vshlcc.i8','vshllo.i8','vshlmi.i8','vshlpl.i8','vshlvs.i8','vshlvc.i8','vshlhi.i8','vshlls.i8','vshlge.i8','vshllt.i8','vshlgt.i8','vshlle.i8',
+            'vshleq.i16','vshlne.i16','vshlcs.i16','vshlhs.i16','vshlcc.i16','vshllo.i16','vshlmi.i16','vshlpl.i16','vshlvs.i16','vshlvc.i16','vshlhi.i16','vshlls.i16','vshlge.i16','vshllt.i16','vshlgt.i16','vshlle.i16',
+            'vshleq.i32','vshlne.i32','vshlcs.i32','vshlhs.i32','vshlcc.i32','vshllo.i32','vshlmi.i32','vshlpl.i32','vshlvs.i32','vshlvc.i32','vshlhi.i32','vshlls.i32','vshlge.i32','vshllt.i32','vshlgt.i32','vshlle.i32',
+            'vshleq.i64','vshlne.i64','vshlcs.i64','vshlhs.i64','vshlcc.i64','vshllo.i64','vshlmi.i64','vshlpl.i64','vshlvs.i64','vshlvc.i64','vshlhi.i64','vshlls.i64','vshlge.i64','vshllt.i64','vshlgt.i64','vshlle.i64',
+
+            'vshlleq.i8','vshllne.i8','vshllcs.i8','vshllhs.i8','vshllcc.i8','vshlllo.i8','vshllmi.i8','vshllpl.i8','vshllvs.i8','vshllvc.i8','vshllhi.i8','vshllls.i8','vshllge.i8','vshlllt.i8','vshllgt.i8','vshllle.i8',
+            'vshlleq.i16','vshllne.i16','vshllcs.i16','vshllhs.i16','vshllcc.i16','vshlllo.i16','vshllmi.i16','vshllpl.i16','vshllvs.i16','vshllvc.i16','vshllhi.i16','vshllls.i16','vshllge.i16','vshlllt.i16','vshllgt.i16','vshllle.i16',
+            'vshlleq.i32','vshllne.i32','vshllcs.i32','vshllhs.i32','vshllcc.i32','vshlllo.i32','vshllmi.i32','vshllpl.i32','vshllvs.i32','vshllvc.i32','vshllhi.i32','vshllls.i32','vshllge.i32','vshlllt.i32','vshllgt.i32','vshllle.i32'
+            ),
+        /* Conditional NEON SIMD Signed Integer Instructions */
+        32 => array(
+            'vabaeq.s8','vabane.s8','vabacs.s8','vabahs.s8','vabacc.s8','vabalo.s8','vabami.s8','vabapl.s8','vabavs.s8','vabavc.s8','vabahi.s8','vabals.s8','vabage.s8','vabalt.s8','vabagt.s8','vabale.s8',
+            'vabaeq.s16','vabane.s16','vabacs.s16','vabahs.s16','vabacc.s16','vabalo.s16','vabami.s16','vabapl.s16','vabavs.s16','vabavc.s16','vabahi.s16','vabals.s16','vabage.s16','vabalt.s16','vabagt.s16','vabale.s16',
+            'vabaeq.s32','vabane.s32','vabacs.s32','vabahs.s32','vabacc.s32','vabalo.s32','vabami.s32','vabapl.s32','vabavs.s32','vabavc.s32','vabahi.s32','vabals.s32','vabage.s32','vabalt.s32','vabagt.s32','vabale.s32',
+
+            'vabaleq.s8','vabalne.s8','vabalcs.s8','vabalhs.s8','vabalcc.s8','vaballo.s8','vabalmi.s8','vabalpl.s8','vabalvs.s8','vabalvc.s8','vabalhi.s8','vaballs.s8','vabalge.s8','vaballt.s8','vabalgt.s8','vaballe.s8',
+            'vabaleq.s16','vabalne.s16','vabalcs.s16','vabalhs.s16','vabalcc.s16','vaballo.s16','vabalmi.s16','vabalpl.s16','vabalvs.s16','vabalvc.s16','vabalhi.s16','vaballs.s16','vabalge.s16','vaballt.s16','vabalgt.s16','vaballe.s16',
+            'vabaleq.s32','vabalne.s32','vabalcs.s32','vabalhs.s32','vabalcc.s32','vaballo.s32','vabalmi.s32','vabalpl.s32','vabalvs.s32','vabalvc.s32','vabalhi.s32','vaballs.s32','vabalge.s32','vaballt.s32','vabalgt.s32','vaballe.s32',
+
+            'vabdeq.s8','vabdne.s8','vabdcs.s8','vabdhs.s8','vabdcc.s8','vabdlo.s8','vabdmi.s8','vabdpl.s8','vabdvs.s8','vabdvc.s8','vabdhi.s8','vabdls.s8','vabdge.s8','vabdlt.s8','vabdgt.s8','vabdle.s8',
+            'vabdeq.s16','vabdne.s16','vabdcs.s16','vabdhs.s16','vabdcc.s16','vabdlo.s16','vabdmi.s16','vabdpl.s16','vabdvs.s16','vabdvc.s16','vabdhi.s16','vabdls.s16','vabdge.s16','vabdlt.s16','vabdgt.s16','vabdle.s16',
+            'vabdeq.s32','vabdne.s32','vabdcs.s32','vabdhs.s32','vabdcc.s32','vabdlo.s32','vabdmi.s32','vabdpl.s32','vabdvs.s32','vabdvc.s32','vabdhi.s32','vabdls.s32','vabdge.s32','vabdlt.s32','vabdgt.s32','vabdle.s32',
+
+            'vabseq.s8','vabsne.s8','vabscs.s8','vabshs.s8','vabscc.s8','vabslo.s8','vabsmi.s8','vabspl.s8','vabsvs.s8','vabsvc.s8','vabshi.s8','vabsls.s8','vabsge.s8','vabslt.s8','vabsgt.s8','vabsle.s8',
+            'vabseq.s16','vabsne.s16','vabscs.s16','vabshs.s16','vabscc.s16','vabslo.s16','vabsmi.s16','vabspl.s16','vabsvs.s16','vabsvc.s16','vabshi.s16','vabsls.s16','vabsge.s16','vabslt.s16','vabsgt.s16','vabsle.s16',
+            'vabseq.s32','vabsne.s32','vabscs.s32','vabshs.s32','vabscc.s32','vabslo.s32','vabsmi.s32','vabspl.s32','vabsvs.s32','vabsvc.s32','vabshi.s32','vabsls.s32','vabsge.s32','vabslt.s32','vabsgt.s32','vabsle.s32',
+
+            'vaddleq.s8','vaddlne.s8','vaddlcs.s8','vaddlhs.s8','vaddlcc.s8','vaddllo.s8','vaddlmi.s8','vaddlpl.s8','vaddlvs.s8','vaddlvc.s8','vaddlhi.s8','vaddlls.s8','vaddlge.s8','vaddllt.s8','vaddlgt.s8','vaddlle.s8',
+            'vaddleq.s16','vaddlne.s16','vaddlcs.s16','vaddlhs.s16','vaddlcc.s16','vaddllo.s16','vaddlmi.s16','vaddlpl.s16','vaddlvs.s16','vaddlvc.s16','vaddlhi.s16','vaddlls.s16','vaddlge.s16','vaddllt.s16','vaddlgt.s16','vaddlle.s16',
+            'vaddleq.s32','vaddlne.s32','vaddlcs.s32','vaddlhs.s32','vaddlcc.s32','vaddllo.s32','vaddlmi.s32','vaddlpl.s32','vaddlvs.s32','vaddlvc.s32','vaddlhi.s32','vaddlls.s32','vaddlge.s32','vaddllt.s32','vaddlgt.s32','vaddlle.s32',
+
+            'vcgeeq.s8','vcgene.s8','vcgecs.s8','vcgehs.s8','vcgecc.s8','vcgelo.s8','vcgemi.s8','vcgepl.s8','vcgevs.s8','vcgevc.s8','vcgehi.s8','vcgels.s8','vcgege.s8','vcgelt.s8','vcgegt.s8','vcgele.s8',
+            'vcgeeq.s16','vcgene.s16','vcgecs.s16','vcgehs.s16','vcgecc.s16','vcgelo.s16','vcgemi.s16','vcgepl.s16','vcgevs.s16','vcgevc.s16','vcgehi.s16','vcgels.s16','vcgege.s16','vcgelt.s16','vcgegt.s16','vcgele.s16',
+            'vcgeeq.s32','vcgene.s32','vcgecs.s32','vcgehs.s32','vcgecc.s32','vcgelo.s32','vcgemi.s32','vcgepl.s32','vcgevs.s32','vcgevc.s32','vcgehi.s32','vcgels.s32','vcgege.s32','vcgelt.s32','vcgegt.s32','vcgele.s32',
+
+            'vcleeq.s8','vclene.s8','vclecs.s8','vclehs.s8','vclecc.s8','vclelo.s8','vclemi.s8','vclepl.s8','vclevs.s8','vclevc.s8','vclehi.s8','vclels.s8','vclege.s8','vclelt.s8','vclegt.s8','vclele.s8',
+            'vcleeq.s16','vclene.s16','vclecs.s16','vclehs.s16','vclecc.s16','vclelo.s16','vclemi.s16','vclepl.s16','vclevs.s16','vclevc.s16','vclehi.s16','vclels.s16','vclege.s16','vclelt.s16','vclegt.s16','vclele.s16',
+            'vcleeq.s32','vclene.s32','vclecs.s32','vclehs.s32','vclecc.s32','vclelo.s32','vclemi.s32','vclepl.s32','vclevs.s32','vclevc.s32','vclehi.s32','vclels.s32','vclege.s32','vclelt.s32','vclegt.s32','vclele.s32',
+
+            'vcgteq.s8','vcgtne.s8','vcgtcs.s8','vcgths.s8','vcgtcc.s8','vcgtlo.s8','vcgtmi.s8','vcgtpl.s8','vcgtvs.s8','vcgtvc.s8','vcgthi.s8','vcgtls.s8','vcgtge.s8','vcgtlt.s8','vcgtgt.s8','vcgtle.s8',
+            'vcgteq.s16','vcgtne.s16','vcgtcs.s16','vcgths.s16','vcgtcc.s16','vcgtlo.s16','vcgtmi.s16','vcgtpl.s16','vcgtvs.s16','vcgtvc.s16','vcgthi.s16','vcgtls.s16','vcgtge.s16','vcgtlt.s16','vcgtgt.s16','vcgtle.s16',
+            'vcgteq.s32','vcgtne.s32','vcgtcs.s32','vcgths.s32','vcgtcc.s32','vcgtlo.s32','vcgtmi.s32','vcgtpl.s32','vcgtvs.s32','vcgtvc.s32','vcgthi.s32','vcgtls.s32','vcgtge.s32','vcgtlt.s32','vcgtgt.s32','vcgtle.s32',
+
+            'vclteq.s8','vcltne.s8','vcltcs.s8','vclths.s8','vcltcc.s8','vcltlo.s8','vcltmi.s8','vcltpl.s8','vcltvs.s8','vcltvc.s8','vclthi.s8','vcltls.s8','vcltge.s8','vcltlt.s8','vcltgt.s8','vcltle.s8',
+            'vclteq.s16','vcltne.s16','vcltcs.s16','vclths.s16','vcltcc.s16','vcltlo.s16','vcltmi.s16','vcltpl.s16','vcltvs.s16','vcltvc.s16','vclthi.s16','vcltls.s16','vcltge.s16','vcltlt.s16','vcltgt.s16','vcltle.s16',
+            'vclteq.s32','vcltne.s32','vcltcs.s32','vclths.s32','vcltcc.s32','vcltlo.s32','vcltmi.s32','vcltpl.s32','vcltvs.s32','vcltvc.s32','vclthi.s32','vcltls.s32','vcltge.s32','vcltlt.s32','vcltgt.s32','vcltle.s32',
+
+            'vclseq.s8','vclsne.s8','vclscs.s8','vclshs.s8','vclscc.s8','vclslo.s8','vclsmi.s8','vclspl.s8','vclsvs.s8','vclsvc.s8','vclshi.s8','vclsls.s8','vclsge.s8','vclslt.s8','vclsgt.s8','vclsle.s8',
+            'vclseq.s16','vclsne.s16','vclscs.s16','vclshs.s16','vclscc.s16','vclslo.s16','vclsmi.s16','vclspl.s16','vclsvs.s16','vclsvc.s16','vclshi.s16','vclsls.s16','vclsge.s16','vclslt.s16','vclsgt.s16','vclsle.s16',
+            'vclseq.s32','vclsne.s32','vclscs.s32','vclshs.s32','vclscc.s32','vclslo.s32','vclsmi.s32','vclspl.s32','vclsvs.s32','vclsvc.s32','vclshi.s32','vclsls.s32','vclsge.s32','vclslt.s32','vclsgt.s32','vclsle.s32',
+
+            'vaddweq.s8','vaddwne.s8','vaddwcs.s8','vaddwhs.s8','vaddwcc.s8','vaddwlo.s8','vaddwmi.s8','vaddwpl.s8','vaddwvs.s8','vaddwvc.s8','vaddwhi.s8','vaddwls.s8','vaddwge.s8','vaddwlt.s8','vaddwgt.s8','vaddwle.s8',
+            'vaddweq.s16','vaddwne.s16','vaddwcs.s16','vaddwhs.s16','vaddwcc.s16','vaddwlo.s16','vaddwmi.s16','vaddwpl.s16','vaddwvs.s16','vaddwvc.s16','vaddwhi.s16','vaddwls.s16','vaddwge.s16','vaddwlt.s16','vaddwgt.s16','vaddwle.s16',
+            'vaddweq.s32','vaddwne.s32','vaddwcs.s32','vaddwhs.s32','vaddwcc.s32','vaddwlo.s32','vaddwmi.s32','vaddwpl.s32','vaddwvs.s32','vaddwvc.s32','vaddwhi.s32','vaddwls.s32','vaddwge.s32','vaddwlt.s32','vaddwgt.s32','vaddwle.s32',
+
+            'vhaddeq.s8','vhaddne.s8','vhaddcs.s8','vhaddhs.s8','vhaddcc.s8','vhaddlo.s8','vhaddmi.s8','vhaddpl.s8','vhaddvs.s8','vhaddvc.s8','vhaddhi.s8','vhaddls.s8','vhaddge.s8','vhaddlt.s8','vhaddgt.s8','vhaddle.s8',
+            'vhaddeq.s16','vhaddne.s16','vhaddcs.s16','vhaddhs.s16','vhaddcc.s16','vhaddlo.s16','vhaddmi.s16','vhaddpl.s16','vhaddvs.s16','vhaddvc.s16','vhaddhi.s16','vhaddls.s16','vhaddge.s16','vhaddlt.s16','vhaddgt.s16','vhaddle.s16',
+            'vhaddeq.s32','vhaddne.s32','vhaddcs.s32','vhaddhs.s32','vhaddcc.s32','vhaddlo.s32','vhaddmi.s32','vhaddpl.s32','vhaddvs.s32','vhaddvc.s32','vhaddhi.s32','vhaddls.s32','vhaddge.s32','vhaddlt.s32','vhaddgt.s32','vhaddle.s32',
+
+            'vhsubeq.s8','vhsubne.s8','vhsubcs.s8','vhsubhs.s8','vhsubcc.s8','vhsublo.s8','vhsubmi.s8','vhsubpl.s8','vhsubvs.s8','vhsubvc.s8','vhsubhi.s8','vhsubls.s8','vhsubge.s8','vhsublt.s8','vhsubgt.s8','vhsuble.s8',
+            'vhsubeq.s16','vhsubne.s16','vhsubcs.s16','vhsubhs.s16','vhsubcc.s16','vhsublo.s16','vhsubmi.s16','vhsubpl.s16','vhsubvs.s16','vhsubvc.s16','vhsubhi.s16','vhsubls.s16','vhsubge.s16','vhsublt.s16','vhsubgt.s16','vhsuble.s16',
+            'vhsubeq.s32','vhsubne.s32','vhsubcs.s32','vhsubhs.s32','vhsubcc.s32','vhsublo.s32','vhsubmi.s32','vhsubpl.s32','vhsubvs.s32','vhsubvc.s32','vhsubhi.s32','vhsubls.s32','vhsubge.s32','vhsublt.s32','vhsubgt.s32','vhsuble.s32',
+
+            'vmaxeq.s8','vmaxne.s8','vmaxcs.s8','vmaxhs.s8','vmaxcc.s8','vmaxlo.s8','vmaxmi.s8','vmaxpl.s8','vmaxvs.s8','vmaxvc.s8','vmaxhi.s8','vmaxls.s8','vmaxge.s8','vmaxlt.s8','vmaxgt.s8','vmaxle.s8',
+            'vmaxeq.s16','vmaxne.s16','vmaxcs.s16','vmaxhs.s16','vmaxcc.s16','vmaxlo.s16','vmaxmi.s16','vmaxpl.s16','vmaxvs.s16','vmaxvc.s16','vmaxhi.s16','vmaxls.s16','vmaxge.s16','vmaxlt.s16','vmaxgt.s16','vmaxle.s16',
+            'vmaxeq.s32','vmaxne.s32','vmaxcs.s32','vmaxhs.s32','vmaxcc.s32','vmaxlo.s32','vmaxmi.s32','vmaxpl.s32','vmaxvs.s32','vmaxvc.s32','vmaxhi.s32','vmaxls.s32','vmaxge.s32','vmaxlt.s32','vmaxgt.s32','vmaxle.s32',
+
+            'vmineq.s8','vminne.s8','vmincs.s8','vminhs.s8','vmincc.s8','vminlo.s8','vminmi.s8','vminpl.s8','vminvs.s8','vminvc.s8','vminhi.s8','vminls.s8','vminge.s8','vminlt.s8','vmingt.s8','vminle.s8',
+            'vmineq.s16','vminne.s16','vmincs.s16','vminhs.s16','vmincc.s16','vminlo.s16','vminmi.s16','vminpl.s16','vminvs.s16','vminvc.s16','vminhi.s16','vminls.s16','vminge.s16','vminlt.s16','vmingt.s16','vminle.s16',
+            'vmineq.s32','vminne.s32','vmincs.s32','vminhs.s32','vmincc.s32','vminlo.s32','vminmi.s32','vminpl.s32','vminvs.s32','vminvc.s32','vminhi.s32','vminls.s32','vminge.s32','vminlt.s32','vmingt.s32','vminle.s32',
+
+            'vmlaleq.s8','vmlalne.s8','vmlalcs.s8','vmlalhs.s8','vmlalcc.s8','vmlallo.s8','vmlalmi.s8','vmlalpl.s8','vmlalvs.s8','vmlalvc.s8','vmlalhi.s8','vmlalls.s8','vmlalge.s8','vmlallt.s8','vmlalgt.s8','vmlalle.s8',
+            'vmlaleq.s16','vmlalne.s16','vmlalcs.s16','vmlalhs.s16','vmlalcc.s16','vmlallo.s16','vmlalmi.s16','vmlalpl.s16','vmlalvs.s16','vmlalvc.s16','vmlalhi.s16','vmlalls.s16','vmlalge.s16','vmlallt.s16','vmlalgt.s16','vmlalle.s16',
+            'vmlaleq.s32','vmlalne.s32','vmlalcs.s32','vmlalhs.s32','vmlalcc.s32','vmlallo.s32','vmlalmi.s32','vmlalpl.s32','vmlalvs.s32','vmlalvc.s32','vmlalhi.s32','vmlalls.s32','vmlalge.s32','vmlallt.s32','vmlalgt.s32','vmlalle.s32',
+
+            'vmlsleq.s8','vmlslne.s8','vmlslcs.s8','vmlslhs.s8','vmlslcc.s8','vmlsllo.s8','vmlslmi.s8','vmlslpl.s8','vmlslvs.s8','vmlslvc.s8','vmlslhi.s8','vmlslls.s8','vmlslge.s8','vmlsllt.s8','vmlslgt.s8','vmlslle.s8',
+            'vmlsleq.s16','vmlslne.s16','vmlslcs.s16','vmlslhs.s16','vmlslcc.s16','vmlsllo.s16','vmlslmi.s16','vmlslpl.s16','vmlslvs.s16','vmlslvc.s16','vmlslhi.s16','vmlslls.s16','vmlslge.s16','vmlsllt.s16','vmlslgt.s16','vmlslle.s16',
+            'vmlsleq.s32','vmlslne.s32','vmlslcs.s32','vmlslhs.s32','vmlslcc.s32','vmlsllo.s32','vmlslmi.s32','vmlslpl.s32','vmlslvs.s32','vmlslvc.s32','vmlslhi.s32','vmlslls.s32','vmlslge.s32','vmlsllt.s32','vmlslgt.s32','vmlslle.s32',
+
+            'vnegeq.s8','vnegne.s8','vnegcs.s8','vneghs.s8','vnegcc.s8','vneglo.s8','vnegmi.s8','vnegpl.s8','vnegvs.s8','vnegvc.s8','vneghi.s8','vnegls.s8','vnegge.s8','vneglt.s8','vneggt.s8','vnegle.s8',
+            'vnegeq.s16','vnegne.s16','vnegcs.s16','vneghs.s16','vnegcc.s16','vneglo.s16','vnegmi.s16','vnegpl.s16','vnegvs.s16','vnegvc.s16','vneghi.s16','vnegls.s16','vnegge.s16','vneglt.s16','vneggt.s16','vnegle.s16',
+            'vnegeq.s32','vnegne.s32','vnegcs.s32','vneghs.s32','vnegcc.s32','vneglo.s32','vnegmi.s32','vnegpl.s32','vnegvs.s32','vnegvc.s32','vneghi.s32','vnegls.s32','vnegge.s32','vneglt.s32','vneggt.s32','vnegle.s32',
+
+            'vpadaleq.s8','vpadalne.s8','vpadalcs.s8','vpadalhs.s8','vpadalcc.s8','vpadallo.s8','vpadalmi.s8','vpadalpl.s8','vpadalvs.s8','vpadalvc.s8','vpadalhi.s8','vpadalls.s8','vpadalge.s8','vpadallt.s8','vpadalgt.s8','vpadalle.s8',
+            'vpadaleq.s16','vpadalne.s16','vpadalcs.s16','vpadalhs.s16','vpadalcc.s16','vpadallo.s16','vpadalmi.s16','vpadalpl.s16','vpadalvs.s16','vpadalvc.s16','vpadalhi.s16','vpadalls.s16','vpadalge.s16','vpadallt.s16','vpadalgt.s16','vpadalle.s16',
+            'vpadaleq.s32','vpadalne.s32','vpadalcs.s32','vpadalhs.s32','vpadalcc.s32','vpadallo.s32','vpadalmi.s32','vpadalpl.s32','vpadalvs.s32','vpadalvc.s32','vpadalhi.s32','vpadalls.s32','vpadalge.s32','vpadallt.s32','vpadalgt.s32','vpadalle.s32',
+
+            'vmovleq.s8','vmovlne.s8','vmovlcs.s8','vmovlhs.s8','vmovlcc.s8','vmovllo.s8','vmovlmi.s8','vmovlpl.s8','vmovlvs.s8','vmovlvc.s8','vmovlhi.s8','vmovlls.s8','vmovlge.s8','vmovllt.s8','vmovlgt.s8','vmovlle.s8',
+            'vmovleq.s16','vmovlne.s16','vmovlcs.s16','vmovlhs.s16','vmovlcc.s16','vmovllo.s16','vmovlmi.s16','vmovlpl.s16','vmovlvs.s16','vmovlvc.s16','vmovlhi.s16','vmovlls.s16','vmovlge.s16','vmovllt.s16','vmovlgt.s16','vmovlle.s16',
+            'vmovleq.s32','vmovlne.s32','vmovlcs.s32','vmovlhs.s32','vmovlcc.s32','vmovllo.s32','vmovlmi.s32','vmovlpl.s32','vmovlvs.s32','vmovlvc.s32','vmovlhi.s32','vmovlls.s32','vmovlge.s32','vmovllt.s32','vmovlgt.s32','vmovlle.s32',
+
+            'vmulleq.s8','vmullne.s8','vmullcs.s8','vmullhs.s8','vmullcc.s8','vmulllo.s8','vmullmi.s8','vmullpl.s8','vmullvs.s8','vmullvc.s8','vmullhi.s8','vmullls.s8','vmullge.s8','vmulllt.s8','vmullgt.s8','vmullle.s8',
+            'vmulleq.s16','vmullne.s16','vmullcs.s16','vmullhs.s16','vmullcc.s16','vmulllo.s16','vmullmi.s16','vmullpl.s16','vmullvs.s16','vmullvc.s16','vmullhi.s16','vmullls.s16','vmullge.s16','vmulllt.s16','vmullgt.s16','vmullle.s16',
+            'vmulleq.s32','vmullne.s32','vmullcs.s32','vmullhs.s32','vmullcc.s32','vmulllo.s32','vmullmi.s32','vmullpl.s32','vmullvs.s32','vmullvc.s32','vmullhi.s32','vmullls.s32','vmullge.s32','vmulllt.s32','vmullgt.s32','vmullle.s32',
+
+            'vpaddleq.s8','vpaddlne.s8','vpaddlcs.s8','vpaddlhs.s8','vpaddlcc.s8','vpaddllo.s8','vpaddlmi.s8','vpaddlpl.s8','vpaddlvs.s8','vpaddlvc.s8','vpaddlhi.s8','vpaddlls.s8','vpaddlge.s8','vpaddllt.s8','vpaddlgt.s8','vpaddlle.s8',
+            'vpaddleq.s16','vpaddlne.s16','vpaddlcs.s16','vpaddlhs.s16','vpaddlcc.s16','vpaddllo.s16','vpaddlmi.s16','vpaddlpl.s16','vpaddlvs.s16','vpaddlvc.s16','vpaddlhi.s16','vpaddlls.s16','vpaddlge.s16','vpaddllt.s16','vpaddlgt.s16','vpaddlle.s16',
+            'vpaddleq.s32','vpaddlne.s32','vpaddlcs.s32','vpaddlhs.s32','vpaddlcc.s32','vpaddllo.s32','vpaddlmi.s32','vpaddlpl.s32','vpaddlvs.s32','vpaddlvc.s32','vpaddlhi.s32','vpaddlls.s32','vpaddlge.s32','vpaddllt.s32','vpaddlgt.s32','vpaddlle.s32',
+
+            'vpmaxeq.s8','vpmaxne.s8','vpmaxcs.s8','vpmaxhs.s8','vpmaxcc.s8','vpmaxlo.s8','vpmaxmi.s8','vpmaxpl.s8','vpmaxvs.s8','vpmaxvc.s8','vpmaxhi.s8','vpmaxls.s8','vpmaxge.s8','vpmaxlt.s8','vpmaxgt.s8','vpmaxle.s8',
+            'vpmaxeq.s16','vpmaxne.s16','vpmaxcs.s16','vpmaxhs.s16','vpmaxcc.s16','vpmaxlo.s16','vpmaxmi.s16','vpmaxpl.s16','vpmaxvs.s16','vpmaxvc.s16','vpmaxhi.s16','vpmaxls.s16','vpmaxge.s16','vpmaxlt.s16','vpmaxgt.s16','vpmaxle.s16',
+            'vpmaxeq.s32','vpmaxne.s32','vpmaxcs.s32','vpmaxhs.s32','vpmaxcc.s32','vpmaxlo.s32','vpmaxmi.s32','vpmaxpl.s32','vpmaxvs.s32','vpmaxvc.s32','vpmaxhi.s32','vpmaxls.s32','vpmaxge.s32','vpmaxlt.s32','vpmaxgt.s32','vpmaxle.s32',
+
+            'vpmineq.s8','vpminne.s8','vpmincs.s8','vpminhs.s8','vpmincc.s8','vpminlo.s8','vpminmi.s8','vpminpl.s8','vpminvs.s8','vpminvc.s8','vpminhi.s8','vpminls.s8','vpminge.s8','vpminlt.s8','vpmingt.s8','vpminle.s8',
+            'vpmineq.s16','vpminne.s16','vpmincs.s16','vpminhs.s16','vpmincc.s16','vpminlo.s16','vpminmi.s16','vpminpl.s16','vpminvs.s16','vpminvc.s16','vpminhi.s16','vpminls.s16','vpminge.s16','vpminlt.s16','vpmingt.s16','vpminle.s16',
+            'vpmineq.s32','vpminne.s32','vpmincs.s32','vpminhs.s32','vpmincc.s32','vpminlo.s32','vpminmi.s32','vpminpl.s32','vpminvs.s32','vpminvc.s32','vpminhi.s32','vpminls.s32','vpminge.s32','vpminlt.s32','vpmingt.s32','vpminle.s32',
+
+            'vqabseq.s8','vqabsne.s8','vqabscs.s8','vqabshs.s8','vqabscc.s8','vqabslo.s8','vqabsmi.s8','vqabspl.s8','vqabsvs.s8','vqabsvc.s8','vqabshi.s8','vqabsls.s8','vqabsge.s8','vqabslt.s8','vqabsgt.s8','vqabsle.s8',
+            'vqabseq.s16','vqabsne.s16','vqabscs.s16','vqabshs.s16','vqabscc.s16','vqabslo.s16','vqabsmi.s16','vqabspl.s16','vqabsvs.s16','vqabsvc.s16','vqabshi.s16','vqabsls.s16','vqabsge.s16','vqabslt.s16','vqabsgt.s16','vqabsle.s16',
+            'vqabseq.s32','vqabsne.s32','vqabscs.s32','vqabshs.s32','vqabscc.s32','vqabslo.s32','vqabsmi.s32','vqabspl.s32','vqabsvs.s32','vqabsvc.s32','vqabshi.s32','vqabsls.s32','vqabsge.s32','vqabslt.s32','vqabsgt.s32','vqabsle.s32',
+
+            'vqaddeq.s8','vqaddne.s8','vqaddcs.s8','vqaddhs.s8','vqaddcc.s8','vqaddlo.s8','vqaddmi.s8','vqaddpl.s8','vqaddvs.s8','vqaddvc.s8','vqaddhi.s8','vqaddls.s8','vqaddge.s8','vqaddlt.s8','vqaddgt.s8','vqaddle.s8',
+            'vqaddeq.s16','vqaddne.s16','vqaddcs.s16','vqaddhs.s16','vqaddcc.s16','vqaddlo.s16','vqaddmi.s16','vqaddpl.s16','vqaddvs.s16','vqaddvc.s16','vqaddhi.s16','vqaddls.s16','vqaddge.s16','vqaddlt.s16','vqaddgt.s16','vqaddle.s16',
+            'vqaddeq.s32','vqaddne.s32','vqaddcs.s32','vqaddhs.s32','vqaddcc.s32','vqaddlo.s32','vqaddmi.s32','vqaddpl.s32','vqaddvs.s32','vqaddvc.s32','vqaddhi.s32','vqaddls.s32','vqaddge.s32','vqaddlt.s32','vqaddgt.s32','vqaddle.s32',
+            'vqaddeq.s64','vqaddne.s64','vqaddcs.s64','vqaddhs.s64','vqaddcc.s64','vqaddlo.s64','vqaddmi.s64','vqaddpl.s64','vqaddvs.s64','vqaddvc.s64','vqaddhi.s64','vqaddls.s64','vqaddge.s64','vqaddlt.s64','vqaddgt.s64','vqaddle.s64',
+
+            'vqdmlaleq.s16','vqdmlalne.s16','vqdmlalcs.s16','vqdmlalhs.s16','vqdmlalcc.s16','vqdmlallo.s16','vqdmlalmi.s16','vqdmlalpl.s16','vqdmlalvs.s16','vqdmlalvc.s16','vqdmlalhi.s16','vqdmlalls.s16','vqdmlalge.s16','vqdmlallt.s16','vqdmlalgt.s16','vqdmlalle.s16',
+            'vqdmlaleq.s32','vqdmlalne.s32','vqdmlalcs.s32','vqdmlalhs.s32','vqdmlalcc.s32','vqdmlallo.s32','vqdmlalmi.s32','vqdmlalpl.s32','vqdmlalvs.s32','vqdmlalvc.s32','vqdmlalhi.s32','vqdmlalls.s32','vqdmlalge.s32','vqdmlallt.s32','vqdmlalgt.s32','vqdmlalle.s32',
+
+            'vqdmlsleq.s16','vqdmlslne.s16','vqdmlslcs.s16','vqdmlslhs.s16','vqdmlslcc.s16','vqdmlsllo.s16','vqdmlslmi.s16','vqdmlslpl.s16','vqdmlslvs.s16','vqdmlslvc.s16','vqdmlslhi.s16','vqdmlslls.s16','vqdmlslge.s16','vqdmlsllt.s16','vqdmlslgt.s16','vqdmlslle.s16',
+            'vqdmlsleq.s32','vqdmlslne.s32','vqdmlslcs.s32','vqdmlslhs.s32','vqdmlslcc.s32','vqdmlsllo.s32','vqdmlslmi.s32','vqdmlslpl.s32','vqdmlslvs.s32','vqdmlslvc.s32','vqdmlslhi.s32','vqdmlslls.s32','vqdmlslge.s32','vqdmlsllt.s32','vqdmlslgt.s32','vqdmlslle.s32',
+
+            'vqdmulheq.s16','vqdmulhne.s16','vqdmulhcs.s16','vqdmulhhs.s16','vqdmulhcc.s16','vqdmulhlo.s16','vqdmulhmi.s16','vqdmulhpl.s16','vqdmulhvs.s16','vqdmulhvc.s16','vqdmulhhi.s16','vqdmulhls.s16','vqdmulhge.s16','vqdmulhlt.s16','vqdmulhgt.s16','vqdmulhle.s16',
+            'vqdmulheq.s32','vqdmulhne.s32','vqdmulhcs.s32','vqdmulhhs.s32','vqdmulhcc.s32','vqdmulhlo.s32','vqdmulhmi.s32','vqdmulhpl.s32','vqdmulhvs.s32','vqdmulhvc.s32','vqdmulhhi.s32','vqdmulhls.s32','vqdmulhge.s32','vqdmulhlt.s32','vqdmulhgt.s32','vqdmulhle.s32',
+
+            'vqdmulleq.s16','vqdmullne.s16','vqdmullcs.s16','vqdmullhs.s16','vqdmullcc.s16','vqdmulllo.s16','vqdmullmi.s16','vqdmullpl.s16','vqdmullvs.s16','vqdmullvc.s16','vqdmullhi.s16','vqdmullls.s16','vqdmullge.s16','vqdmulllt.s16','vqdmullgt.s16','vqdmullle.s16',
+            'vqdmulleq.s32','vqdmullne.s32','vqdmullcs.s32','vqdmullhs.s32','vqdmullcc.s32','vqdmulllo.s32','vqdmullmi.s32','vqdmullpl.s32','vqdmullvs.s32','vqdmullvc.s32','vqdmullhi.s32','vqdmullls.s32','vqdmullge.s32','vqdmulllt.s32','vqdmullgt.s32','vqdmullle.s32',
+
+            'vqmovneq.s16','vqmovnne.s16','vqmovncs.s16','vqmovnhs.s16','vqmovncc.s16','vqmovnlo.s16','vqmovnmi.s16','vqmovnpl.s16','vqmovnvs.s16','vqmovnvc.s16','vqmovnhi.s16','vqmovnls.s16','vqmovnge.s16','vqmovnlt.s16','vqmovngt.s16','vqmovnle.s16',
+            'vqmovneq.s32','vqmovnne.s32','vqmovncs.s32','vqmovnhs.s32','vqmovncc.s32','vqmovnlo.s32','vqmovnmi.s32','vqmovnpl.s32','vqmovnvs.s32','vqmovnvc.s32','vqmovnhi.s32','vqmovnls.s32','vqmovnge.s32','vqmovnlt.s32','vqmovngt.s32','vqmovnle.s32',
+            'vqmovneq.s64','vqmovnne.s64','vqmovncs.s64','vqmovnhs.s64','vqmovncc.s64','vqmovnlo.s64','vqmovnmi.s64','vqmovnpl.s64','vqmovnvs.s64','vqmovnvc.s64','vqmovnhi.s64','vqmovnls.s64','vqmovnge.s64','vqmovnlt.s64','vqmovngt.s64','vqmovnle.s64',
+
+            'vqmovuneq.s16','vqmovunne.s16','vqmovuncs.s16','vqmovunhs.s16','vqmovuncc.s16','vqmovunlo.s16','vqmovunmi.s16','vqmovunpl.s16','vqmovunvs.s16','vqmovunvc.s16','vqmovunhi.s16','vqmovunls.s16','vqmovunge.s16','vqmovunlt.s16','vqmovungt.s16','vqmovunle.s16',
+            'vqmovuneq.s32','vqmovunne.s32','vqmovuncs.s32','vqmovunhs.s32','vqmovuncc.s32','vqmovunlo.s32','vqmovunmi.s32','vqmovunpl.s32','vqmovunvs.s32','vqmovunvc.s32','vqmovunhi.s32','vqmovunls.s32','vqmovunge.s32','vqmovunlt.s32','vqmovungt.s32','vqmovunle.s32',
+            'vqmovuneq.s64','vqmovunne.s64','vqmovuncs.s64','vqmovunhs.s64','vqmovuncc.s64','vqmovunlo.s64','vqmovunmi.s64','vqmovunpl.s64','vqmovunvs.s64','vqmovunvc.s64','vqmovunhi.s64','vqmovunls.s64','vqmovunge.s64','vqmovunlt.s64','vqmovungt.s64','vqmovunle.s64',
+
+            'vqnegeq.s8','vqnegne.s8','vqnegcs.s8','vqneghs.s8','vqnegcc.s8','vqneglo.s8','vqnegmi.s8','vqnegpl.s8','vqnegvs.s8','vqnegvc.s8','vqneghi.s8','vqnegls.s8','vqnegge.s8','vqneglt.s8','vqneggt.s8','vqnegle.s8',
+            'vqnegeq.s16','vqnegne.s16','vqnegcs.s16','vqneghs.s16','vqnegcc.s16','vqneglo.s16','vqnegmi.s16','vqnegpl.s16','vqnegvs.s16','vqnegvc.s16','vqneghi.s16','vqnegls.s16','vqnegge.s16','vqneglt.s16','vqneggt.s16','vqnegle.s16',
+            'vqnegeq.s32','vqnegne.s32','vqnegcs.s32','vqneghs.s32','vqnegcc.s32','vqneglo.s32','vqnegmi.s32','vqnegpl.s32','vqnegvs.s32','vqnegvc.s32','vqneghi.s32','vqnegls.s32','vqnegge.s32','vqneglt.s32','vqneggt.s32','vqnegle.s32',
+
+            'vqrdmulheq.s16','vqrdmulhne.s16','vqrdmulhcs.s16','vqrdmulhhs.s16','vqrdmulhcc.s16','vqrdmulhlo.s16','vqrdmulhmi.s16','vqrdmulhpl.s16','vqrdmulhvs.s16','vqrdmulhvc.s16','vqrdmulhhi.s16','vqrdmulhls.s16','vqrdmulhge.s16','vqrdmulhlt.s16','vqrdmulhgt.s16','vqrdmulhle.s16',
+            'vqrdmulheq.s32','vqrdmulhne.s32','vqrdmulhcs.s32','vqrdmulhhs.s32','vqrdmulhcc.s32','vqrdmulhlo.s32','vqrdmulhmi.s32','vqrdmulhpl.s32','vqrdmulhvs.s32','vqrdmulhvc.s32','vqrdmulhhi.s32','vqrdmulhls.s32','vqrdmulhge.s32','vqrdmulhlt.s32','vqrdmulhgt.s32','vqrdmulhle.s32',
+
+            'vqrshleq.s8','vqrshlne.s8','vqrshlcs.s8','vqrshlhs.s8','vqrshlcc.s8','vqrshllo.s8','vqrshlmi.s8','vqrshlpl.s8','vqrshlvs.s8','vqrshlvc.s8','vqrshlhi.s8','vqrshlls.s8','vqrshlge.s8','vqrshllt.s8','vqrshlgt.s8','vqrshlle.s8',
+            'vqrshleq.s16','vqrshlne.s16','vqrshlcs.s16','vqrshlhs.s16','vqrshlcc.s16','vqrshllo.s16','vqrshlmi.s16','vqrshlpl.s16','vqrshlvs.s16','vqrshlvc.s16','vqrshlhi.s16','vqrshlls.s16','vqrshlge.s16','vqrshllt.s16','vqrshlgt.s16','vqrshlle.s16',
+            'vqrshleq.s32','vqrshlne.s32','vqrshlcs.s32','vqrshlhs.s32','vqrshlcc.s32','vqrshllo.s32','vqrshlmi.s32','vqrshlpl.s32','vqrshlvs.s32','vqrshlvc.s32','vqrshlhi.s32','vqrshlls.s32','vqrshlge.s32','vqrshllt.s32','vqrshlgt.s32','vqrshlle.s32',
+            'vqrshleq.s64','vqrshlne.s64','vqrshlcs.s64','vqrshlhs.s64','vqrshlcc.s64','vqrshllo.s64','vqrshlmi.s64','vqrshlpl.s64','vqrshlvs.s64','vqrshlvc.s64','vqrshlhi.s64','vqrshlls.s64','vqrshlge.s64','vqrshllt.s64','vqrshlgt.s64','vqrshlle.s64',
+
+            'vqrshrneq.s16','vqrshrnne.s16','vqrshrncs.s16','vqrshrnhs.s16','vqrshrncc.s16','vqrshrnlo.s16','vqrshrnmi.s16','vqrshrnpl.s16','vqrshrnvs.s16','vqrshrnvc.s16','vqrshrnhi.s16','vqrshrnls.s16','vqrshrnge.s16','vqrshrnlt.s16','vqrshrngt.s16','vqrshrnle.s16',
+            'vqrshrneq.s32','vqrshrnne.s32','vqrshrncs.s32','vqrshrnhs.s32','vqrshrncc.s32','vqrshrnlo.s32','vqrshrnmi.s32','vqrshrnpl.s32','vqrshrnvs.s32','vqrshrnvc.s32','vqrshrnhi.s32','vqrshrnls.s32','vqrshrnge.s32','vqrshrnlt.s32','vqrshrngt.s32','vqrshrnle.s32',
+            'vqrshrneq.s64','vqrshrnne.s64','vqrshrncs.s64','vqrshrnhs.s64','vqrshrncc.s64','vqrshrnlo.s64','vqrshrnmi.s64','vqrshrnpl.s64','vqrshrnvs.s64','vqrshrnvc.s64','vqrshrnhi.s64','vqrshrnls.s64','vqrshrnge.s64','vqrshrnlt.s64','vqrshrngt.s64','vqrshrnle.s64',
+
+            'vqrshruneq.s16','vqrshrunne.s16','vqrshruncs.s16','vqrshrunhs.s16','vqrshruncc.s16','vqrshrunlo.s16','vqrshrunmi.s16','vqrshrunpl.s16','vqrshrunvs.s16','vqrshrunvc.s16','vqrshrunhi.s16','vqrshrunls.s16','vqrshrunge.s16','vqrshrunlt.s16','vqrshrungt.s16','vqrshrunle.s16',
+            'vqrshruneq.s32','vqrshrunne.s32','vqrshruncs.s32','vqrshrunhs.s32','vqrshruncc.s32','vqrshrunlo.s32','vqrshrunmi.s32','vqrshrunpl.s32','vqrshrunvs.s32','vqrshrunvc.s32','vqrshrunhi.s32','vqrshrunls.s32','vqrshrunge.s32','vqrshrunlt.s32','vqrshrungt.s32','vqrshrunle.s32',
+            'vqrshruneq.s64','vqrshrunne.s64','vqrshruncs.s64','vqrshrunhs.s64','vqrshruncc.s64','vqrshrunlo.s64','vqrshrunmi.s64','vqrshrunpl.s64','vqrshrunvs.s64','vqrshrunvc.s64','vqrshrunhi.s64','vqrshrunls.s64','vqrshrunge.s64','vqrshrunlt.s64','vqrshrungt.s64','vqrshrunle.s64',
+
+            'vqshleq.s8','vqshlne.s8','vqshlcs.s8','vqshlhs.s8','vqshlcc.s8','vqshllo.s8','vqshlmi.s8','vqshlpl.s8','vqshlvs.s8','vqshlvc.s8','vqshlhi.s8','vqshlls.s8','vqshlge.s8','vqshllt.s8','vqshlgt.s8','vqshlle.s8',
+            'vqshleq.s16','vqshlne.s16','vqshlcs.s16','vqshlhs.s16','vqshlcc.s16','vqshllo.s16','vqshlmi.s16','vqshlpl.s16','vqshlvs.s16','vqshlvc.s16','vqshlhi.s16','vqshlls.s16','vqshlge.s16','vqshllt.s16','vqshlgt.s16','vqshlle.s16',
+            'vqshleq.s32','vqshlne.s32','vqshlcs.s32','vqshlhs.s32','vqshlcc.s32','vqshllo.s32','vqshlmi.s32','vqshlpl.s32','vqshlvs.s32','vqshlvc.s32','vqshlhi.s32','vqshlls.s32','vqshlge.s32','vqshllt.s32','vqshlgt.s32','vqshlle.s32',
+            'vqshleq.s64','vqshlne.s64','vqshlcs.s64','vqshlhs.s64','vqshlcc.s64','vqshllo.s64','vqshlmi.s64','vqshlpl.s64','vqshlvs.s64','vqshlvc.s64','vqshlhi.s64','vqshlls.s64','vqshlge.s64','vqshllt.s64','vqshlgt.s64','vqshlle.s64',
+
+            'vqshlueq.s8','vqshlune.s8','vqshlucs.s8','vqshluhs.s8','vqshlucc.s8','vqshlulo.s8','vqshlumi.s8','vqshlupl.s8','vqshluvs.s8','vqshluvc.s8','vqshluhi.s8','vqshluls.s8','vqshluge.s8','vqshlult.s8','vqshlugt.s8','vqshlule.s8',
+            'vqshlueq.s16','vqshlune.s16','vqshlucs.s16','vqshluhs.s16','vqshlucc.s16','vqshlulo.s16','vqshlumi.s16','vqshlupl.s16','vqshluvs.s16','vqshluvc.s16','vqshluhi.s16','vqshluls.s16','vqshluge.s16','vqshlult.s16','vqshlugt.s16','vqshlule.s16',
+            'vqshlueq.s32','vqshlune.s32','vqshlucs.s32','vqshluhs.s32','vqshlucc.s32','vqshlulo.s32','vqshlumi.s32','vqshlupl.s32','vqshluvs.s32','vqshluvc.s32','vqshluhi.s32','vqshluls.s32','vqshluge.s32','vqshlult.s32','vqshlugt.s32','vqshlule.s32',
+            'vqshlueq.s64','vqshlune.s64','vqshlucs.s64','vqshluhs.s64','vqshlucc.s64','vqshlulo.s64','vqshlumi.s64','vqshlupl.s64','vqshluvs.s64','vqshluvc.s64','vqshluhi.s64','vqshluls.s64','vqshluge.s64','vqshlult.s64','vqshlugt.s64','vqshlule.s64',
+
+            'vqshrneq.s16','vqshrnne.s16','vqshrncs.s16','vqshrnhs.s16','vqshrncc.s16','vqshrnlo.s16','vqshrnmi.s16','vqshrnpl.s16','vqshrnvs.s16','vqshrnvc.s16','vqshrnhi.s16','vqshrnls.s16','vqshrnge.s16','vqshrnlt.s16','vqshrngt.s16','vqshrnle.s16',
+            'vqshrneq.s32','vqshrnne.s32','vqshrncs.s32','vqshrnhs.s32','vqshrncc.s32','vqshrnlo.s32','vqshrnmi.s32','vqshrnpl.s32','vqshrnvs.s32','vqshrnvc.s32','vqshrnhi.s32','vqshrnls.s32','vqshrnge.s32','vqshrnlt.s32','vqshrngt.s32','vqshrnle.s32',
+            'vqshrneq.s64','vqshrnne.s64','vqshrncs.s64','vqshrnhs.s64','vqshrncc.s64','vqshrnlo.s64','vqshrnmi.s64','vqshrnpl.s64','vqshrnvs.s64','vqshrnvc.s64','vqshrnhi.s64','vqshrnls.s64','vqshrnge.s64','vqshrnlt.s64','vqshrngt.s64','vqshrnle.s64',
+
+            'vqshruneq.s16','vqshrunne.s16','vqshruncs.s16','vqshrunhs.s16','vqshruncc.s16','vqshrunlo.s16','vqshrunmi.s16','vqshrunpl.s16','vqshrunvs.s16','vqshrunvc.s16','vqshrunhi.s16','vqshrunls.s16','vqshrunge.s16','vqshrunlt.s16','vqshrungt.s16','vqshrunle.s16',
+            'vqshruneq.s32','vqshrunne.s32','vqshruncs.s32','vqshrunhs.s32','vqshruncc.s32','vqshrunlo.s32','vqshrunmi.s32','vqshrunpl.s32','vqshrunvs.s32','vqshrunvc.s32','vqshrunhi.s32','vqshrunls.s32','vqshrunge.s32','vqshrunlt.s32','vqshrungt.s32','vqshrunle.s32',
+            'vqshruneq.s64','vqshrunne.s64','vqshruncs.s64','vqshrunhs.s64','vqshruncc.s64','vqshrunlo.s64','vqshrunmi.s64','vqshrunpl.s64','vqshrunvs.s64','vqshrunvc.s64','vqshrunhi.s64','vqshrunls.s64','vqshrunge.s64','vqshrunlt.s64','vqshrungt.s64','vqshrunle.s64',
+
+            'vqsubeq.s8','vqsubne.s8','vqsubcs.s8','vqsubhs.s8','vqsubcc.s8','vqsublo.s8','vqsubmi.s8','vqsubpl.s8','vqsubvs.s8','vqsubvc.s8','vqsubhi.s8','vqsubls.s8','vqsubge.s8','vqsublt.s8','vqsubgt.s8','vqsuble.s8',
+            'vqsubeq.s16','vqsubne.s16','vqsubcs.s16','vqsubhs.s16','vqsubcc.s16','vqsublo.s16','vqsubmi.s16','vqsubpl.s16','vqsubvs.s16','vqsubvc.s16','vqsubhi.s16','vqsubls.s16','vqsubge.s16','vqsublt.s16','vqsubgt.s16','vqsuble.s16',
+            'vqsubeq.s32','vqsubne.s32','vqsubcs.s32','vqsubhs.s32','vqsubcc.s32','vqsublo.s32','vqsubmi.s32','vqsubpl.s32','vqsubvs.s32','vqsubvc.s32','vqsubhi.s32','vqsubls.s32','vqsubge.s32','vqsublt.s32','vqsubgt.s32','vqsuble.s32',
+            'vqsubeq.s64','vqsubne.s64','vqsubcs.s64','vqsubhs.s64','vqsubcc.s64','vqsublo.s64','vqsubmi.s64','vqsubpl.s64','vqsubvs.s64','vqsubvc.s64','vqsubhi.s64','vqsubls.s64','vqsubge.s64','vqsublt.s64','vqsubgt.s64','vqsuble.s64',
+
+            'vrhaddeq.s8','vrhaddne.s8','vrhaddcs.s8','vrhaddhs.s8','vrhaddcc.s8','vrhaddlo.s8','vrhaddmi.s8','vrhaddpl.s8','vrhaddvs.s8','vrhaddvc.s8','vrhaddhi.s8','vrhaddls.s8','vrhaddge.s8','vrhaddlt.s8','vrhaddgt.s8','vrhaddle.s8',
+            'vrhaddeq.s16','vrhaddne.s16','vrhaddcs.s16','vrhaddhs.s16','vrhaddcc.s16','vrhaddlo.s16','vrhaddmi.s16','vrhaddpl.s16','vrhaddvs.s16','vrhaddvc.s16','vrhaddhi.s16','vrhaddls.s16','vrhaddge.s16','vrhaddlt.s16','vrhaddgt.s16','vrhaddle.s16',
+            'vrhaddeq.s32','vrhaddne.s32','vrhaddcs.s32','vrhaddhs.s32','vrhaddcc.s32','vrhaddlo.s32','vrhaddmi.s32','vrhaddpl.s32','vrhaddvs.s32','vrhaddvc.s32','vrhaddhi.s32','vrhaddls.s32','vrhaddge.s32','vrhaddlt.s32','vrhaddgt.s32','vrhaddle.s32',
+
+            'vrshleq.s8','vrshlne.s8','vrshlcs.s8','vrshlhs.s8','vrshlcc.s8','vrshllo.s8','vrshlmi.s8','vrshlpl.s8','vrshlvs.s8','vrshlvc.s8','vrshlhi.s8','vrshlls.s8','vrshlge.s8','vrshllt.s8','vrshlgt.s8','vrshlle.s8',
+            'vrshleq.s16','vrshlne.s16','vrshlcs.s16','vrshlhs.s16','vrshlcc.s16','vrshllo.s16','vrshlmi.s16','vrshlpl.s16','vrshlvs.s16','vrshlvc.s16','vrshlhi.s16','vrshlls.s16','vrshlge.s16','vrshllt.s16','vrshlgt.s16','vrshlle.s16',
+            'vrshleq.s32','vrshlne.s32','vrshlcs.s32','vrshlhs.s32','vrshlcc.s32','vrshllo.s32','vrshlmi.s32','vrshlpl.s32','vrshlvs.s32','vrshlvc.s32','vrshlhi.s32','vrshlls.s32','vrshlge.s32','vrshllt.s32','vrshlgt.s32','vrshlle.s32',
+            'vrshleq.s64','vrshlne.s64','vrshlcs.s64','vrshlhs.s64','vrshlcc.s64','vrshllo.s64','vrshlmi.s64','vrshlpl.s64','vrshlvs.s64','vrshlvc.s64','vrshlhi.s64','vrshlls.s64','vrshlge.s64','vrshllt.s64','vrshlgt.s64','vrshlle.s64',
+
+            'vrshreq.s8','vrshrne.s8','vrshrcs.s8','vrshrhs.s8','vrshrcc.s8','vrshrlo.s8','vrshrmi.s8','vrshrpl.s8','vrshrvs.s8','vrshrvc.s8','vrshrhi.s8','vrshrls.s8','vrshrge.s8','vrshrlt.s8','vrshrgt.s8','vrshrle.s8',
+            'vrshreq.s16','vrshrne.s16','vrshrcs.s16','vrshrhs.s16','vrshrcc.s16','vrshrlo.s16','vrshrmi.s16','vrshrpl.s16','vrshrvs.s16','vrshrvc.s16','vrshrhi.s16','vrshrls.s16','vrshrge.s16','vrshrlt.s16','vrshrgt.s16','vrshrle.s16',
+            'vrshreq.s32','vrshrne.s32','vrshrcs.s32','vrshrhs.s32','vrshrcc.s32','vrshrlo.s32','vrshrmi.s32','vrshrpl.s32','vrshrvs.s32','vrshrvc.s32','vrshrhi.s32','vrshrls.s32','vrshrge.s32','vrshrlt.s32','vrshrgt.s32','vrshrle.s32',
+            'vrshreq.s64','vrshrne.s64','vrshrcs.s64','vrshrhs.s64','vrshrcc.s64','vrshrlo.s64','vrshrmi.s64','vrshrpl.s64','vrshrvs.s64','vrshrvc.s64','vrshrhi.s64','vrshrls.s64','vrshrge.s64','vrshrlt.s64','vrshrgt.s64','vrshrle.s64',
+
+            'vrsraeq.s8','vrsrane.s8','vrsracs.s8','vrsrahs.s8','vrsracc.s8','vrsralo.s8','vrsrami.s8','vrsrapl.s8','vrsravs.s8','vrsravc.s8','vrsrahi.s8','vrsrals.s8','vrsrage.s8','vrsralt.s8','vrsragt.s8','vrsrale.s8',
+            'vrsraeq.s16','vrsrane.s16','vrsracs.s16','vrsrahs.s16','vrsracc.s16','vrsralo.s16','vrsrami.s16','vrsrapl.s16','vrsravs.s16','vrsravc.s16','vrsrahi.s16','vrsrals.s16','vrsrage.s16','vrsralt.s16','vrsragt.s16','vrsrale.s16',
+            'vrsraeq.s32','vrsrane.s32','vrsracs.s32','vrsrahs.s32','vrsracc.s32','vrsralo.s32','vrsrami.s32','vrsrapl.s32','vrsravs.s32','vrsravc.s32','vrsrahi.s32','vrsrals.s32','vrsrage.s32','vrsralt.s32','vrsragt.s32','vrsrale.s32',
+            'vrsraeq.s64','vrsrane.s64','vrsracs.s64','vrsrahs.s64','vrsracc.s64','vrsralo.s64','vrsrami.s64','vrsrapl.s64','vrsravs.s64','vrsravc.s64','vrsrahi.s64','vrsrals.s64','vrsrage.s64','vrsralt.s64','vrsragt.s64','vrsrale.s64',
+
+            'vshleq.s8','vshlne.s8','vshlcs.s8','vshlhs.s8','vshlcc.s8','vshllo.s8','vshlmi.s8','vshlpl.s8','vshlvs.s8','vshlvc.s8','vshlhi.s8','vshlls.s8','vshlge.s8','vshllt.s8','vshlgt.s8','vshlle.s8',
+            'vshleq.s16','vshlne.s16','vshlcs.s16','vshlhs.s16','vshlcc.s16','vshllo.s16','vshlmi.s16','vshlpl.s16','vshlvs.s16','vshlvc.s16','vshlhi.s16','vshlls.s16','vshlge.s16','vshllt.s16','vshlgt.s16','vshlle.s16',
+            'vshleq.s32','vshlne.s32','vshlcs.s32','vshlhs.s32','vshlcc.s32','vshllo.s32','vshlmi.s32','vshlpl.s32','vshlvs.s32','vshlvc.s32','vshlhi.s32','vshlls.s32','vshlge.s32','vshllt.s32','vshlgt.s32','vshlle.s32',
+            'vshleq.s64','vshlne.s64','vshlcs.s64','vshlhs.s64','vshlcc.s64','vshllo.s64','vshlmi.s64','vshlpl.s64','vshlvs.s64','vshlvc.s64','vshlhi.s64','vshlls.s64','vshlge.s64','vshllt.s64','vshlgt.s64','vshlle.s64',
+
+            'vshlleq.s8','vshllne.s8','vshllcs.s8','vshllhs.s8','vshllcc.s8','vshlllo.s8','vshllmi.s8','vshllpl.s8','vshllvs.s8','vshllvc.s8','vshllhi.s8','vshllls.s8','vshllge.s8','vshlllt.s8','vshllgt.s8','vshllle.s8',
+            'vshlleq.s16','vshllne.s16','vshllcs.s16','vshllhs.s16','vshllcc.s16','vshlllo.s16','vshllmi.s16','vshllpl.s16','vshllvs.s16','vshllvc.s16','vshllhi.s16','vshllls.s16','vshllge.s16','vshlllt.s16','vshllgt.s16','vshllle.s16',
+            'vshlleq.s32','vshllne.s32','vshllcs.s32','vshllhs.s32','vshllcc.s32','vshlllo.s32','vshllmi.s32','vshllpl.s32','vshllvs.s32','vshllvc.s32','vshllhi.s32','vshllls.s32','vshllge.s32','vshlllt.s32','vshllgt.s32','vshllle.s32',
+
+            'vshreq.s8','vshrne.s8','vshrcs.s8','vshrhs.s8','vshrcc.s8','vshrlo.s8','vshrmi.s8','vshrpl.s8','vshrvs.s8','vshrvc.s8','vshrhi.s8','vshrls.s8','vshrge.s8','vshrlt.s8','vshrgt.s8','vshrle.s8',
+            'vshreq.s16','vshrne.s16','vshrcs.s16','vshrhs.s16','vshrcc.s16','vshrlo.s16','vshrmi.s16','vshrpl.s16','vshrvs.s16','vshrvc.s16','vshrhi.s16','vshrls.s16','vshrge.s16','vshrlt.s16','vshrgt.s16','vshrle.s16',
+            'vshreq.s32','vshrne.s32','vshrcs.s32','vshrhs.s32','vshrcc.s32','vshrlo.s32','vshrmi.s32','vshrpl.s32','vshrvs.s32','vshrvc.s32','vshrhi.s32','vshrls.s32','vshrge.s32','vshrlt.s32','vshrgt.s32','vshrle.s32',
+            'vshreq.s64','vshrne.s64','vshrcs.s64','vshrhs.s64','vshrcc.s64','vshrlo.s64','vshrmi.s64','vshrpl.s64','vshrvs.s64','vshrvc.s64','vshrhi.s64','vshrls.s64','vshrge.s64','vshrlt.s64','vshrgt.s64','vshrle.s64',
+
+            'vsraeq.s8','vsrane.s8','vsracs.s8','vsrahs.s8','vsracc.s8','vsralo.s8','vsrami.s8','vsrapl.s8','vsravs.s8','vsravc.s8','vsrahi.s8','vsrals.s8','vsrage.s8','vsralt.s8','vsragt.s8','vsrale.s8',
+            'vsraeq.s16','vsrane.s16','vsracs.s16','vsrahs.s16','vsracc.s16','vsralo.s16','vsrami.s16','vsrapl.s16','vsravs.s16','vsravc.s16','vsrahi.s16','vsrals.s16','vsrage.s16','vsralt.s16','vsragt.s16','vsrale.s16',
+            'vsraeq.s32','vsrane.s32','vsracs.s32','vsrahs.s32','vsracc.s32','vsralo.s32','vsrami.s32','vsrapl.s32','vsravs.s32','vsravc.s32','vsrahi.s32','vsrals.s32','vsrage.s32','vsralt.s32','vsragt.s32','vsrale.s32',
+            'vsraeq.s64','vsrane.s64','vsracs.s64','vsrahs.s64','vsracc.s64','vsralo.s64','vsrami.s64','vsrapl.s64','vsravs.s64','vsravc.s64','vsrahi.s64','vsrals.s64','vsrage.s64','vsralt.s64','vsragt.s64','vsrale.s64',
+
+            'vsubleq.s8','vsublne.s8','vsublcs.s8','vsublhs.s8','vsublcc.s8','vsubllo.s8','vsublmi.s8','vsublpl.s8','vsublvs.s8','vsublvc.s8','vsublhi.s8','vsublls.s8','vsublge.s8','vsubllt.s8','vsublgt.s8','vsublle.s8',
+            'vsubleq.s16','vsublne.s16','vsublcs.s16','vsublhs.s16','vsublcc.s16','vsubllo.s16','vsublmi.s16','vsublpl.s16','vsublvs.s16','vsublvc.s16','vsublhi.s16','vsublls.s16','vsublge.s16','vsubllt.s16','vsublgt.s16','vsublle.s16',
+            'vsubleq.s32','vsublne.s32','vsublcs.s32','vsublhs.s32','vsublcc.s32','vsubllo.s32','vsublmi.s32','vsublpl.s32','vsublvs.s32','vsublvc.s32','vsublhi.s32','vsublls.s32','vsublge.s32','vsubllt.s32','vsublgt.s32','vsublle.s32',
+
+            'vsubheq.s8','vsubhne.s8','vsubhcs.s8','vsubhhs.s8','vsubhcc.s8','vsubhlo.s8','vsubhmi.s8','vsubhpl.s8','vsubhvs.s8','vsubhvc.s8','vsubhhi.s8','vsubhls.s8','vsubhge.s8','vsubhlt.s8','vsubhgt.s8','vsubhle.s8',
+            'vsubheq.s16','vsubhne.s16','vsubhcs.s16','vsubhhs.s16','vsubhcc.s16','vsubhlo.s16','vsubhmi.s16','vsubhpl.s16','vsubhvs.s16','vsubhvc.s16','vsubhhi.s16','vsubhls.s16','vsubhge.s16','vsubhlt.s16','vsubhgt.s16','vsubhle.s16',
+            'vsubheq.s32','vsubhne.s32','vsubhcs.s32','vsubhhs.s32','vsubhcc.s32','vsubhlo.s32','vsubhmi.s32','vsubhpl.s32','vsubhvs.s32','vsubhvc.s32','vsubhhi.s32','vsubhls.s32','vsubhge.s32','vsubhlt.s32','vsubhgt.s32','vsubhle.s32'
+            ),
+        /* Conditional NEON SIMD Unsigned Integer Instructions */
+        33 => array(
+            'vabaeq.u8','vabane.u8','vabacs.u8','vabahs.u8','vabacc.u8','vabalo.u8','vabami.u8','vabapl.u8','vabavs.u8','vabavc.u8','vabahi.u8','vabals.u8','vabage.u8','vabalt.u8','vabagt.u8','vabale.u8',
+            'vabaeq.u16','vabane.u16','vabacs.u16','vabahs.u16','vabacc.u16','vabalo.u16','vabami.u16','vabapl.u16','vabavs.u16','vabavc.u16','vabahi.u16','vabals.u16','vabage.u16','vabalt.u16','vabagt.u16','vabale.u16',
+            'vabaeq.u32','vabane.u32','vabacs.u32','vabahs.u32','vabacc.u32','vabalo.u32','vabami.u32','vabapl.u32','vabavs.u32','vabavc.u32','vabahi.u32','vabals.u32','vabage.u32','vabalt.u32','vabagt.u32','vabale.u32',
+
+            'vabaleq.u8','vabalne.u8','vabalcs.u8','vabalhs.u8','vabalcc.u8','vaballo.u8','vabalmi.u8','vabalpl.u8','vabalvs.u8','vabalvc.u8','vabalhi.u8','vaballs.u8','vabalge.u8','vaballt.u8','vabalgt.u8','vaballe.u8',
+            'vabaleq.u16','vabalne.u16','vabalcs.u16','vabalhs.u16','vabalcc.u16','vaballo.u16','vabalmi.u16','vabalpl.u16','vabalvs.u16','vabalvc.u16','vabalhi.u16','vaballs.u16','vabalge.u16','vaballt.u16','vabalgt.u16','vaballe.u16',
+            'vabaleq.u32','vabalne.u32','vabalcs.u32','vabalhs.u32','vabalcc.u32','vaballo.u32','vabalmi.u32','vabalpl.u32','vabalvs.u32','vabalvc.u32','vabalhi.u32','vaballs.u32','vabalge.u32','vaballt.u32','vabalgt.u32','vaballe.u32',
+
+            'vabdeq.u8','vabdne.u8','vabdcs.u8','vabdhs.u8','vabdcc.u8','vabdlo.u8','vabdmi.u8','vabdpl.u8','vabdvs.u8','vabdvc.u8','vabdhi.u8','vabdls.u8','vabdge.u8','vabdlt.u8','vabdgt.u8','vabdle.u8',
+            'vabdeq.u16','vabdne.u16','vabdcs.u16','vabdhs.u16','vabdcc.u16','vabdlo.u16','vabdmi.u16','vabdpl.u16','vabdvs.u16','vabdvc.u16','vabdhi.u16','vabdls.u16','vabdge.u16','vabdlt.u16','vabdgt.u16','vabdle.u16',
+            'vabdeq.u32','vabdne.u32','vabdcs.u32','vabdhs.u32','vabdcc.u32','vabdlo.u32','vabdmi.u32','vabdpl.u32','vabdvs.u32','vabdvc.u32','vabdhi.u32','vabdls.u32','vabdge.u32','vabdlt.u32','vabdgt.u32','vabdle.u32',
+
+            'vaddleq.u8','vaddlne.u8','vaddlcs.u8','vaddlhs.u8','vaddlcc.u8','vaddllo.u8','vaddlmi.u8','vaddlpl.u8','vaddlvs.u8','vaddlvc.u8','vaddlhi.u8','vaddlls.u8','vaddlge.u8','vaddllt.u8','vaddlgt.u8','vaddlle.u8',
+            'vaddleq.u16','vaddlne.u16','vaddlcs.u16','vaddlhs.u16','vaddlcc.u16','vaddllo.u16','vaddlmi.u16','vaddlpl.u16','vaddlvs.u16','vaddlvc.u16','vaddlhi.u16','vaddlls.u16','vaddlge.u16','vaddllt.u16','vaddlgt.u16','vaddlle.u16',
+            'vaddleq.u32','vaddlne.u32','vaddlcs.u32','vaddlhs.u32','vaddlcc.u32','vaddllo.u32','vaddlmi.u32','vaddlpl.u32','vaddlvs.u32','vaddlvc.u32','vaddlhi.u32','vaddlls.u32','vaddlge.u32','vaddllt.u32','vaddlgt.u32','vaddlle.u32',
+
+            'vsubleq.u8','vsublne.u8','vsublcs.u8','vsublhs.u8','vsublcc.u8','vsubllo.u8','vsublmi.u8','vsublpl.u8','vsublvs.u8','vsublvc.u8','vsublhi.u8','vsublls.u8','vsublge.u8','vsubllt.u8','vsublgt.u8','vsublle.u8',
+            'vsubleq.u16','vsublne.u16','vsublcs.u16','vsublhs.u16','vsublcc.u16','vsubllo.u16','vsublmi.u16','vsublpl.u16','vsublvs.u16','vsublvc.u16','vsublhi.u16','vsublls.u16','vsublge.u16','vsubllt.u16','vsublgt.u16','vsublle.u16',
+            'vsubleq.u32','vsublne.u32','vsublcs.u32','vsublhs.u32','vsublcc.u32','vsubllo.u32','vsublmi.u32','vsublpl.u32','vsublvs.u32','vsublvc.u32','vsublhi.u32','vsublls.u32','vsublge.u32','vsubllt.u32','vsublgt.u32','vsublle.u32',
+
+            'vaddweq.u8','vaddwne.u8','vaddwcs.u8','vaddwhs.u8','vaddwcc.u8','vaddwlo.u8','vaddwmi.u8','vaddwpl.u8','vaddwvs.u8','vaddwvc.u8','vaddwhi.u8','vaddwls.u8','vaddwge.u8','vaddwlt.u8','vaddwgt.u8','vaddwle.u8',
+            'vaddweq.u16','vaddwne.u16','vaddwcs.u16','vaddwhs.u16','vaddwcc.u16','vaddwlo.u16','vaddwmi.u16','vaddwpl.u16','vaddwvs.u16','vaddwvc.u16','vaddwhi.u16','vaddwls.u16','vaddwge.u16','vaddwlt.u16','vaddwgt.u16','vaddwle.u16',
+            'vaddweq.u32','vaddwne.u32','vaddwcs.u32','vaddwhs.u32','vaddwcc.u32','vaddwlo.u32','vaddwmi.u32','vaddwpl.u32','vaddwvs.u32','vaddwvc.u32','vaddwhi.u32','vaddwls.u32','vaddwge.u32','vaddwlt.u32','vaddwgt.u32','vaddwle.u32',
+
+            'vsubheq.u8','vsubhne.u8','vsubhcs.u8','vsubhhs.u8','vsubhcc.u8','vsubhlo.u8','vsubhmi.u8','vsubhpl.u8','vsubhvs.u8','vsubhvc.u8','vsubhhi.u8','vsubhls.u8','vsubhge.u8','vsubhlt.u8','vsubhgt.u8','vsubhle.u8',
+            'vsubheq.u16','vsubhne.u16','vsubhcs.u16','vsubhhs.u16','vsubhcc.u16','vsubhlo.u16','vsubhmi.u16','vsubhpl.u16','vsubhvs.u16','vsubhvc.u16','vsubhhi.u16','vsubhls.u16','vsubhge.u16','vsubhlt.u16','vsubhgt.u16','vsubhle.u16',
+            'vsubheq.u32','vsubhne.u32','vsubhcs.u32','vsubhhs.u32','vsubhcc.u32','vsubhlo.u32','vsubhmi.u32','vsubhpl.u32','vsubhvs.u32','vsubhvc.u32','vsubhhi.u32','vsubhls.u32','vsubhge.u32','vsubhlt.u32','vsubhgt.u32','vsubhle.u32',
+
+            'vhaddeq.u8','vhaddne.u8','vhaddcs.u8','vhaddhs.u8','vhaddcc.u8','vhaddlo.u8','vhaddmi.u8','vhaddpl.u8','vhaddvs.u8','vhaddvc.u8','vhaddhi.u8','vhaddls.u8','vhaddge.u8','vhaddlt.u8','vhaddgt.u8','vhaddle.u8',
+            'vhaddeq.u16','vhaddne.u16','vhaddcs.u16','vhaddhs.u16','vhaddcc.u16','vhaddlo.u16','vhaddmi.u16','vhaddpl.u16','vhaddvs.u16','vhaddvc.u16','vhaddhi.u16','vhaddls.u16','vhaddge.u16','vhaddlt.u16','vhaddgt.u16','vhaddle.u16',
+            'vhaddeq.u32','vhaddne.u32','vhaddcs.u32','vhaddhs.u32','vhaddcc.u32','vhaddlo.u32','vhaddmi.u32','vhaddpl.u32','vhaddvs.u32','vhaddvc.u32','vhaddhi.u32','vhaddls.u32','vhaddge.u32','vhaddlt.u32','vhaddgt.u32','vhaddle.u32',
+
+            'vhsubeq.u8','vhsubne.u8','vhsubcs.u8','vhsubhs.u8','vhsubcc.u8','vhsublo.u8','vhsubmi.u8','vhsubpl.u8','vhsubvs.u8','vhsubvc.u8','vhsubhi.u8','vhsubls.u8','vhsubge.u8','vhsublt.u8','vhsubgt.u8','vhsuble.u8',
+            'vhsubeq.u16','vhsubne.u16','vhsubcs.u16','vhsubhs.u16','vhsubcc.u16','vhsublo.u16','vhsubmi.u16','vhsubpl.u16','vhsubvs.u16','vhsubvc.u16','vhsubhi.u16','vhsubls.u16','vhsubge.u16','vhsublt.u16','vhsubgt.u16','vhsuble.u16',
+            'vhsubeq.u32','vhsubne.u32','vhsubcs.u32','vhsubhs.u32','vhsubcc.u32','vhsublo.u32','vhsubmi.u32','vhsubpl.u32','vhsubvs.u32','vhsubvc.u32','vhsubhi.u32','vhsubls.u32','vhsubge.u32','vhsublt.u32','vhsubgt.u32','vhsuble.u32',
+
+            'vpadaleq.u8','vpadalne.u8','vpadalcs.u8','vpadalhs.u8','vpadalcc.u8','vpadallo.u8','vpadalmi.u8','vpadalpl.u8','vpadalvs.u8','vpadalvc.u8','vpadalhi.u8','vpadalls.u8','vpadalge.u8','vpadallt.u8','vpadalgt.u8','vpadalle.u8',
+            'vpadaleq.u16','vpadalne.u16','vpadalcs.u16','vpadalhs.u16','vpadalcc.u16','vpadallo.u16','vpadalmi.u16','vpadalpl.u16','vpadalvs.u16','vpadalvc.u16','vpadalhi.u16','vpadalls.u16','vpadalge.u16','vpadallt.u16','vpadalgt.u16','vpadalle.u16',
+            'vpadaleq.u32','vpadalne.u32','vpadalcs.u32','vpadalhs.u32','vpadalcc.u32','vpadallo.u32','vpadalmi.u32','vpadalpl.u32','vpadalvs.u32','vpadalvc.u32','vpadalhi.u32','vpadalls.u32','vpadalge.u32','vpadallt.u32','vpadalgt.u32','vpadalle.u32',
+
+            'vpaddleq.u8','vpaddlne.u8','vpaddlcs.u8','vpaddlhs.u8','vpaddlcc.u8','vpaddllo.u8','vpaddlmi.u8','vpaddlpl.u8','vpaddlvs.u8','vpaddlvc.u8','vpaddlhi.u8','vpaddlls.u8','vpaddlge.u8','vpaddllt.u8','vpaddlgt.u8','vpaddlle.u8',
+            'vpaddleq.u16','vpaddlne.u16','vpaddlcs.u16','vpaddlhs.u16','vpaddlcc.u16','vpaddllo.u16','vpaddlmi.u16','vpaddlpl.u16','vpaddlvs.u16','vpaddlvc.u16','vpaddlhi.u16','vpaddlls.u16','vpaddlge.u16','vpaddllt.u16','vpaddlgt.u16','vpaddlle.u16',
+            'vpaddleq.u32','vpaddlne.u32','vpaddlcs.u32','vpaddlhs.u32','vpaddlcc.u32','vpaddllo.u32','vpaddlmi.u32','vpaddlpl.u32','vpaddlvs.u32','vpaddlvc.u32','vpaddlhi.u32','vpaddlls.u32','vpaddlge.u32','vpaddllt.u32','vpaddlgt.u32','vpaddlle.u32',
+
+            'vcgeeq.u8','vcgene.u8','vcgecs.u8','vcgehs.u8','vcgecc.u8','vcgelo.u8','vcgemi.u8','vcgepl.u8','vcgevs.u8','vcgevc.u8','vcgehi.u8','vcgels.u8','vcgege.u8','vcgelt.u8','vcgegt.u8','vcgele.u8',
+            'vcgeeq.u16','vcgene.u16','vcgecs.u16','vcgehs.u16','vcgecc.u16','vcgelo.u16','vcgemi.u16','vcgepl.u16','vcgevs.u16','vcgevc.u16','vcgehi.u16','vcgels.u16','vcgege.u16','vcgelt.u16','vcgegt.u16','vcgele.u16',
+            'vcgeeq.u32','vcgene.u32','vcgecs.u32','vcgehs.u32','vcgecc.u32','vcgelo.u32','vcgemi.u32','vcgepl.u32','vcgevs.u32','vcgevc.u32','vcgehi.u32','vcgels.u32','vcgege.u32','vcgelt.u32','vcgegt.u32','vcgele.u32',
+
+            'vcleeq.u8','vclene.u8','vclecs.u8','vclehs.u8','vclecc.u8','vclelo.u8','vclemi.u8','vclepl.u8','vclevs.u8','vclevc.u8','vclehi.u8','vclels.u8','vclege.u8','vclelt.u8','vclegt.u8','vclele.u8',
+            'vcleeq.u16','vclene.u16','vclecs.u16','vclehs.u16','vclecc.u16','vclelo.u16','vclemi.u16','vclepl.u16','vclevs.u16','vclevc.u16','vclehi.u16','vclels.u16','vclege.u16','vclelt.u16','vclegt.u16','vclele.u16',
+            'vcleeq.u32','vclene.u32','vclecs.u32','vclehs.u32','vclecc.u32','vclelo.u32','vclemi.u32','vclepl.u32','vclevs.u32','vclevc.u32','vclehi.u32','vclels.u32','vclege.u32','vclelt.u32','vclegt.u32','vclele.u32',
+
+            'vcgteq.u8','vcgtne.u8','vcgtcs.u8','vcgths.u8','vcgtcc.u8','vcgtlo.u8','vcgtmi.u8','vcgtpl.u8','vcgtvs.u8','vcgtvc.u8','vcgthi.u8','vcgtls.u8','vcgtge.u8','vcgtlt.u8','vcgtgt.u8','vcgtle.u8',
+            'vcgteq.u16','vcgtne.u16','vcgtcs.u16','vcgths.u16','vcgtcc.u16','vcgtlo.u16','vcgtmi.u16','vcgtpl.u16','vcgtvs.u16','vcgtvc.u16','vcgthi.u16','vcgtls.u16','vcgtge.u16','vcgtlt.u16','vcgtgt.u16','vcgtle.u16',
+            'vcgteq.u32','vcgtne.u32','vcgtcs.u32','vcgths.u32','vcgtcc.u32','vcgtlo.u32','vcgtmi.u32','vcgtpl.u32','vcgtvs.u32','vcgtvc.u32','vcgthi.u32','vcgtls.u32','vcgtge.u32','vcgtlt.u32','vcgtgt.u32','vcgtle.u32',
+
+            'vclteq.u8','vcltne.u8','vcltcs.u8','vclths.u8','vcltcc.u8','vcltlo.u8','vcltmi.u8','vcltpl.u8','vcltvs.u8','vcltvc.u8','vclthi.u8','vcltls.u8','vcltge.u8','vcltlt.u8','vcltgt.u8','vcltle.u8',
+            'vclteq.u16','vcltne.u16','vcltcs.u16','vclths.u16','vcltcc.u16','vcltlo.u16','vcltmi.u16','vcltpl.u16','vcltvs.u16','vcltvc.u16','vclthi.u16','vcltls.u16','vcltge.u16','vcltlt.u16','vcltgt.u16','vcltle.u16',
+            'vclteq.u32','vcltne.u32','vcltcs.u32','vclths.u32','vcltcc.u32','vcltlo.u32','vcltmi.u32','vcltpl.u32','vcltvs.u32','vcltvc.u32','vclthi.u32','vcltls.u32','vcltge.u32','vcltlt.u32','vcltgt.u32','vcltle.u32',
+
+            'vmaxeq.u8','vmaxne.u8','vmaxcs.u8','vmaxhs.u8','vmaxcc.u8','vmaxlo.u8','vmaxmi.u8','vmaxpl.u8','vmaxvs.u8','vmaxvc.u8','vmaxhi.u8','vmaxls.u8','vmaxge.u8','vmaxlt.u8','vmaxgt.u8','vmaxle.u8',
+            'vmaxeq.u16','vmaxne.u16','vmaxcs.u16','vmaxhs.u16','vmaxcc.u16','vmaxlo.u16','vmaxmi.u16','vmaxpl.u16','vmaxvs.u16','vmaxvc.u16','vmaxhi.u16','vmaxls.u16','vmaxge.u16','vmaxlt.u16','vmaxgt.u16','vmaxle.u16',
+            'vmaxeq.u32','vmaxne.u32','vmaxcs.u32','vmaxhs.u32','vmaxcc.u32','vmaxlo.u32','vmaxmi.u32','vmaxpl.u32','vmaxvs.u32','vmaxvc.u32','vmaxhi.u32','vmaxls.u32','vmaxge.u32','vmaxlt.u32','vmaxgt.u32','vmaxle.u32',
+
+            'vmineq.u8','vminne.u8','vmincs.u8','vminhs.u8','vmincc.u8','vminlo.u8','vminmi.u8','vminpl.u8','vminvs.u8','vminvc.u8','vminhi.u8','vminls.u8','vminge.u8','vminlt.u8','vmingt.u8','vminle.u8',
+            'vmineq.u16','vminne.u16','vmincs.u16','vminhs.u16','vmincc.u16','vminlo.u16','vminmi.u16','vminpl.u16','vminvs.u16','vminvc.u16','vminhi.u16','vminls.u16','vminge.u16','vminlt.u16','vmingt.u16','vminle.u16',
+            'vmineq.u32','vminne.u32','vmincs.u32','vminhs.u32','vmincc.u32','vminlo.u32','vminmi.u32','vminpl.u32','vminvs.u32','vminvc.u32','vminhi.u32','vminls.u32','vminge.u32','vminlt.u32','vmingt.u32','vminle.u32',
+
+            'vmlaleq.u8','vmlalne.u8','vmlalcs.u8','vmlalhs.u8','vmlalcc.u8','vmlallo.u8','vmlalmi.u8','vmlalpl.u8','vmlalvs.u8','vmlalvc.u8','vmlalhi.u8','vmlalls.u8','vmlalge.u8','vmlallt.u8','vmlalgt.u8','vmlalle.u8',
+            'vmlaleq.u16','vmlalne.u16','vmlalcs.u16','vmlalhs.u16','vmlalcc.u16','vmlallo.u16','vmlalmi.u16','vmlalpl.u16','vmlalvs.u16','vmlalvc.u16','vmlalhi.u16','vmlalls.u16','vmlalge.u16','vmlallt.u16','vmlalgt.u16','vmlalle.u16',
+            'vmlaleq.u32','vmlalne.u32','vmlalcs.u32','vmlalhs.u32','vmlalcc.u32','vmlallo.u32','vmlalmi.u32','vmlalpl.u32','vmlalvs.u32','vmlalvc.u32','vmlalhi.u32','vmlalls.u32','vmlalge.u32','vmlallt.u32','vmlalgt.u32','vmlalle.u32',
+
+            'vmlsleq.u8','vmlslne.u8','vmlslcs.u8','vmlslhs.u8','vmlslcc.u8','vmlsllo.u8','vmlslmi.u8','vmlslpl.u8','vmlslvs.u8','vmlslvc.u8','vmlslhi.u8','vmlslls.u8','vmlslge.u8','vmlsllt.u8','vmlslgt.u8','vmlslle.u8',
+            'vmlsleq.u16','vmlslne.u16','vmlslcs.u16','vmlslhs.u16','vmlslcc.u16','vmlsllo.u16','vmlslmi.u16','vmlslpl.u16','vmlslvs.u16','vmlslvc.u16','vmlslhi.u16','vmlslls.u16','vmlslge.u16','vmlsllt.u16','vmlslgt.u16','vmlslle.u16',
+            'vmlsleq.u32','vmlslne.u32','vmlslcs.u32','vmlslhs.u32','vmlslcc.u32','vmlsllo.u32','vmlslmi.u32','vmlslpl.u32','vmlslvs.u32','vmlslvc.u32','vmlslhi.u32','vmlslls.u32','vmlslge.u32','vmlsllt.u32','vmlslgt.u32','vmlslle.u32',
+
+            'vmulleq.u8','vmullne.u8','vmullcs.u8','vmullhs.u8','vmullcc.u8','vmulllo.u8','vmullmi.u8','vmullpl.u8','vmullvs.u8','vmullvc.u8','vmullhi.u8','vmullls.u8','vmullge.u8','vmulllt.u8','vmullgt.u8','vmullle.u8',
+            'vmulleq.u16','vmullne.u16','vmullcs.u16','vmullhs.u16','vmullcc.u16','vmulllo.u16','vmullmi.u16','vmullpl.u16','vmullvs.u16','vmullvc.u16','vmullhi.u16','vmullls.u16','vmullge.u16','vmulllt.u16','vmullgt.u16','vmullle.u16',
+            'vmulleq.u32','vmullne.u32','vmullcs.u32','vmullhs.u32','vmullcc.u32','vmulllo.u32','vmullmi.u32','vmullpl.u32','vmullvs.u32','vmullvc.u32','vmullhi.u32','vmullls.u32','vmullge.u32','vmulllt.u32','vmullgt.u32','vmullle.u32',
+
+            'vmovleq.u8','vmovlne.u8','vmovlcs.u8','vmovlhs.u8','vmovlcc.u8','vmovllo.u8','vmovlmi.u8','vmovlpl.u8','vmovlvs.u8','vmovlvc.u8','vmovlhi.u8','vmovlls.u8','vmovlge.u8','vmovllt.u8','vmovlgt.u8','vmovlle.u8',
+            'vmovleq.u16','vmovlne.u16','vmovlcs.u16','vmovlhs.u16','vmovlcc.u16','vmovllo.u16','vmovlmi.u16','vmovlpl.u16','vmovlvs.u16','vmovlvc.u16','vmovlhi.u16','vmovlls.u16','vmovlge.u16','vmovllt.u16','vmovlgt.u16','vmovlle.u16',
+            'vmovleq.u32','vmovlne.u32','vmovlcs.u32','vmovlhs.u32','vmovlcc.u32','vmovllo.u32','vmovlmi.u32','vmovlpl.u32','vmovlvs.u32','vmovlvc.u32','vmovlhi.u32','vmovlls.u32','vmovlge.u32','vmovllt.u32','vmovlgt.u32','vmovlle.u32',
+
+            'vshleq.u8','vshlne.u8','vshlcs.u8','vshlhs.u8','vshlcc.u8','vshllo.u8','vshlmi.u8','vshlpl.u8','vshlvs.u8','vshlvc.u8','vshlhi.u8','vshlls.u8','vshlge.u8','vshllt.u8','vshlgt.u8','vshlle.u8',
+            'vshleq.u16','vshlne.u16','vshlcs.u16','vshlhs.u16','vshlcc.u16','vshllo.u16','vshlmi.u16','vshlpl.u16','vshlvs.u16','vshlvc.u16','vshlhi.u16','vshlls.u16','vshlge.u16','vshllt.u16','vshlgt.u16','vshlle.u16',
+            'vshleq.u32','vshlne.u32','vshlcs.u32','vshlhs.u32','vshlcc.u32','vshllo.u32','vshlmi.u32','vshlpl.u32','vshlvs.u32','vshlvc.u32','vshlhi.u32','vshlls.u32','vshlge.u32','vshllt.u32','vshlgt.u32','vshlle.u32',
+            'vshleq.u64','vshlne.u64','vshlcs.u64','vshlhs.u64','vshlcc.u64','vshllo.u64','vshlmi.u64','vshlpl.u64','vshlvs.u64','vshlvc.u64','vshlhi.u64','vshlls.u64','vshlge.u64','vshllt.u64','vshlgt.u64','vshlle.u64',
+
+            'vshlleq.u8','vshllne.u8','vshllcs.u8','vshllhs.u8','vshllcc.u8','vshlllo.u8','vshllmi.u8','vshllpl.u8','vshllvs.u8','vshllvc.u8','vshllhi.u8','vshllls.u8','vshllge.u8','vshlllt.u8','vshllgt.u8','vshllle.u8',
+            'vshlleq.u16','vshllne.u16','vshllcs.u16','vshllhs.u16','vshllcc.u16','vshlllo.u16','vshllmi.u16','vshllpl.u16','vshllvs.u16','vshllvc.u16','vshllhi.u16','vshllls.u16','vshllge.u16','vshlllt.u16','vshllgt.u16','vshllle.u16',
+            'vshlleq.u32','vshllne.u32','vshllcs.u32','vshllhs.u32','vshllcc.u32','vshlllo.u32','vshllmi.u32','vshllpl.u32','vshllvs.u32','vshllvc.u32','vshllhi.u32','vshllls.u32','vshllge.u32','vshlllt.u32','vshllgt.u32','vshllle.u32',
+
+            'vshreq.u8','vshrne.u8','vshrcs.u8','vshrhs.u8','vshrcc.u8','vshrlo.u8','vshrmi.u8','vshrpl.u8','vshrvs.u8','vshrvc.u8','vshrhi.u8','vshrls.u8','vshrge.u8','vshrlt.u8','vshrgt.u8','vshrle.u8',
+            'vshreq.u16','vshrne.u16','vshrcs.u16','vshrhs.u16','vshrcc.u16','vshrlo.u16','vshrmi.u16','vshrpl.u16','vshrvs.u16','vshrvc.u16','vshrhi.u16','vshrls.u16','vshrge.u16','vshrlt.u16','vshrgt.u16','vshrle.u16',
+            'vshreq.u32','vshrne.u32','vshrcs.u32','vshrhs.u32','vshrcc.u32','vshrlo.u32','vshrmi.u32','vshrpl.u32','vshrvs.u32','vshrvc.u32','vshrhi.u32','vshrls.u32','vshrge.u32','vshrlt.u32','vshrgt.u32','vshrle.u32',
+            'vshreq.u64','vshrne.u64','vshrcs.u64','vshrhs.u64','vshrcc.u64','vshrlo.u64','vshrmi.u64','vshrpl.u64','vshrvs.u64','vshrvc.u64','vshrhi.u64','vshrls.u64','vshrge.u64','vshrlt.u64','vshrgt.u64','vshrle.u64',
+
+            'vsraeq.u8','vsrane.u8','vsracs.u8','vsrahs.u8','vsracc.u8','vsralo.u8','vsrami.u8','vsrapl.u8','vsravs.u8','vsravc.u8','vsrahi.u8','vsrals.u8','vsrage.u8','vsralt.u8','vsragt.u8','vsrale.u8',
+            'vsraeq.u16','vsrane.u16','vsracs.u16','vsrahs.u16','vsracc.u16','vsralo.u16','vsrami.u16','vsrapl.u16','vsravs.u16','vsravc.u16','vsrahi.u16','vsrals.u16','vsrage.u16','vsralt.u16','vsragt.u16','vsrale.u16',
+            'vsraeq.u32','vsrane.u32','vsracs.u32','vsrahs.u32','vsracc.u32','vsralo.u32','vsrami.u32','vsrapl.u32','vsravs.u32','vsravc.u32','vsrahi.u32','vsrals.u32','vsrage.u32','vsralt.u32','vsragt.u32','vsrale.u32',
+            'vsraeq.u64','vsrane.u64','vsracs.u64','vsrahs.u64','vsracc.u64','vsralo.u64','vsrami.u64','vsrapl.u64','vsravs.u64','vsravc.u64','vsrahi.u64','vsrals.u64','vsrage.u64','vsralt.u64','vsragt.u64','vsrale.u64',
+
+            'vpmaxeq.u8','vpmaxne.u8','vpmaxcs.u8','vpmaxhs.u8','vpmaxcc.u8','vpmaxlo.u8','vpmaxmi.u8','vpmaxpl.u8','vpmaxvs.u8','vpmaxvc.u8','vpmaxhi.u8','vpmaxls.u8','vpmaxge.u8','vpmaxlt.u8','vpmaxgt.u8','vpmaxle.u8',
+            'vpmaxeq.u16','vpmaxne.u16','vpmaxcs.u16','vpmaxhs.u16','vpmaxcc.u16','vpmaxlo.u16','vpmaxmi.u16','vpmaxpl.u16','vpmaxvs.u16','vpmaxvc.u16','vpmaxhi.u16','vpmaxls.u16','vpmaxge.u16','vpmaxlt.u16','vpmaxgt.u16','vpmaxle.u16',
+            'vpmaxeq.u32','vpmaxne.u32','vpmaxcs.u32','vpmaxhs.u32','vpmaxcc.u32','vpmaxlo.u32','vpmaxmi.u32','vpmaxpl.u32','vpmaxvs.u32','vpmaxvc.u32','vpmaxhi.u32','vpmaxls.u32','vpmaxge.u32','vpmaxlt.u32','vpmaxgt.u32','vpmaxle.u32',
+
+            'vpmineq.u8','vpminne.u8','vpmincs.u8','vpminhs.u8','vpmincc.u8','vpminlo.u8','vpminmi.u8','vpminpl.u8','vpminvs.u8','vpminvc.u8','vpminhi.u8','vpminls.u8','vpminge.u8','vpminlt.u8','vpmingt.u8','vpminle.u8',
+            'vpmineq.u16','vpminne.u16','vpmincs.u16','vpminhs.u16','vpmincc.u16','vpminlo.u16','vpminmi.u16','vpminpl.u16','vpminvs.u16','vpminvc.u16','vpminhi.u16','vpminls.u16','vpminge.u16','vpminlt.u16','vpmingt.u16','vpminle.u16',
+            'vpmineq.u32','vpminne.u32','vpmincs.u32','vpminhs.u32','vpmincc.u32','vpminlo.u32','vpminmi.u32','vpminpl.u32','vpminvs.u32','vpminvc.u32','vpminhi.u32','vpminls.u32','vpminge.u32','vpminlt.u32','vpmingt.u32','vpminle.u32',
+
+            'vqaddeq.u8','vqaddne.u8','vqaddcs.u8','vqaddhs.u8','vqaddcc.u8','vqaddlo.u8','vqaddmi.u8','vqaddpl.u8','vqaddvs.u8','vqaddvc.u8','vqaddhi.u8','vqaddls.u8','vqaddge.u8','vqaddlt.u8','vqaddgt.u8','vqaddle.u8',
+            'vqaddeq.u16','vqaddne.u16','vqaddcs.u16','vqaddhs.u16','vqaddcc.u16','vqaddlo.u16','vqaddmi.u16','vqaddpl.u16','vqaddvs.u16','vqaddvc.u16','vqaddhi.u16','vqaddls.u16','vqaddge.u16','vqaddlt.u16','vqaddgt.u16','vqaddle.u16',
+            'vqaddeq.u32','vqaddne.u32','vqaddcs.u32','vqaddhs.u32','vqaddcc.u32','vqaddlo.u32','vqaddmi.u32','vqaddpl.u32','vqaddvs.u32','vqaddvc.u32','vqaddhi.u32','vqaddls.u32','vqaddge.u32','vqaddlt.u32','vqaddgt.u32','vqaddle.u32',
+            'vqaddeq.u64','vqaddne.u64','vqaddcs.u64','vqaddhs.u64','vqaddcc.u64','vqaddlo.u64','vqaddmi.u64','vqaddpl.u64','vqaddvs.u64','vqaddvc.u64','vqaddhi.u64','vqaddls.u64','vqaddge.u64','vqaddlt.u64','vqaddgt.u64','vqaddle.u64',
+
+            'vqsubeq.u8','vqsubne.u8','vqsubcs.u8','vqsubhs.u8','vqsubcc.u8','vqsublo.u8','vqsubmi.u8','vqsubpl.u8','vqsubvs.u8','vqsubvc.u8','vqsubhi.u8','vqsubls.u8','vqsubge.u8','vqsublt.u8','vqsubgt.u8','vqsuble.u8',
+            'vqsubeq.u16','vqsubne.u16','vqsubcs.u16','vqsubhs.u16','vqsubcc.u16','vqsublo.u16','vqsubmi.u16','vqsubpl.u16','vqsubvs.u16','vqsubvc.u16','vqsubhi.u16','vqsubls.u16','vqsubge.u16','vqsublt.u16','vqsubgt.u16','vqsuble.u16',
+            'vqsubeq.u32','vqsubne.u32','vqsubcs.u32','vqsubhs.u32','vqsubcc.u32','vqsublo.u32','vqsubmi.u32','vqsubpl.u32','vqsubvs.u32','vqsubvc.u32','vqsubhi.u32','vqsubls.u32','vqsubge.u32','vqsublt.u32','vqsubgt.u32','vqsuble.u32',
+            'vqsubeq.u64','vqsubne.u64','vqsubcs.u64','vqsubhs.u64','vqsubcc.u64','vqsublo.u64','vqsubmi.u64','vqsubpl.u64','vqsubvs.u64','vqsubvc.u64','vqsubhi.u64','vqsubls.u64','vqsubge.u64','vqsublt.u64','vqsubgt.u64','vqsuble.u64',
+
+            'vqmovneq.u16','vqmovnne.u16','vqmovncs.u16','vqmovnhs.u16','vqmovncc.u16','vqmovnlo.u16','vqmovnmi.u16','vqmovnpl.u16','vqmovnvs.u16','vqmovnvc.u16','vqmovnhi.u16','vqmovnls.u16','vqmovnge.u16','vqmovnlt.u16','vqmovngt.u16','vqmovnle.u16',
+            'vqmovneq.u32','vqmovnne.u32','vqmovncs.u32','vqmovnhs.u32','vqmovncc.u32','vqmovnlo.u32','vqmovnmi.u32','vqmovnpl.u32','vqmovnvs.u32','vqmovnvc.u32','vqmovnhi.u32','vqmovnls.u32','vqmovnge.u32','vqmovnlt.u32','vqmovngt.u32','vqmovnle.u32',
+            'vqmovneq.u64','vqmovnne.u64','vqmovncs.u64','vqmovnhs.u64','vqmovncc.u64','vqmovnlo.u64','vqmovnmi.u64','vqmovnpl.u64','vqmovnvs.u64','vqmovnvc.u64','vqmovnhi.u64','vqmovnls.u64','vqmovnge.u64','vqmovnlt.u64','vqmovngt.u64','vqmovnle.u64',
+
+            'vqshleq.u8','vqshlne.u8','vqshlcs.u8','vqshlhs.u8','vqshlcc.u8','vqshllo.u8','vqshlmi.u8','vqshlpl.u8','vqshlvs.u8','vqshlvc.u8','vqshlhi.u8','vqshlls.u8','vqshlge.u8','vqshllt.u8','vqshlgt.u8','vqshlle.u8',
+            'vqshleq.u16','vqshlne.u16','vqshlcs.u16','vqshlhs.u16','vqshlcc.u16','vqshllo.u16','vqshlmi.u16','vqshlpl.u16','vqshlvs.u16','vqshlvc.u16','vqshlhi.u16','vqshlls.u16','vqshlge.u16','vqshllt.u16','vqshlgt.u16','vqshlle.u16',
+            'vqshleq.u32','vqshlne.u32','vqshlcs.u32','vqshlhs.u32','vqshlcc.u32','vqshllo.u32','vqshlmi.u32','vqshlpl.u32','vqshlvs.u32','vqshlvc.u32','vqshlhi.u32','vqshlls.u32','vqshlge.u32','vqshllt.u32','vqshlgt.u32','vqshlle.u32',
+            'vqshleq.u64','vqshlne.u64','vqshlcs.u64','vqshlhs.u64','vqshlcc.u64','vqshllo.u64','vqshlmi.u64','vqshlpl.u64','vqshlvs.u64','vqshlvc.u64','vqshlhi.u64','vqshlls.u64','vqshlge.u64','vqshllt.u64','vqshlgt.u64','vqshlle.u64',
+
+            'vqshrneq.u16','vqshrnne.u16','vqshrncs.u16','vqshrnhs.u16','vqshrncc.u16','vqshrnlo.u16','vqshrnmi.u16','vqshrnpl.u16','vqshrnvs.u16','vqshrnvc.u16','vqshrnhi.u16','vqshrnls.u16','vqshrnge.u16','vqshrnlt.u16','vqshrngt.u16','vqshrnle.u16',
+            'vqshrneq.u32','vqshrnne.u32','vqshrncs.u32','vqshrnhs.u32','vqshrncc.u32','vqshrnlo.u32','vqshrnmi.u32','vqshrnpl.u32','vqshrnvs.u32','vqshrnvc.u32','vqshrnhi.u32','vqshrnls.u32','vqshrnge.u32','vqshrnlt.u32','vqshrngt.u32','vqshrnle.u32',
+            'vqshrneq.u64','vqshrnne.u64','vqshrncs.u64','vqshrnhs.u64','vqshrncc.u64','vqshrnlo.u64','vqshrnmi.u64','vqshrnpl.u64','vqshrnvs.u64','vqshrnvc.u64','vqshrnhi.u64','vqshrnls.u64','vqshrnge.u64','vqshrnlt.u64','vqshrngt.u64','vqshrnle.u64',
+
+            'vqrshleq.u8','vqrshlne.u8','vqrshlcs.u8','vqrshlhs.u8','vqrshlcc.u8','vqrshllo.u8','vqrshlmi.u8','vqrshlpl.u8','vqrshlvs.u8','vqrshlvc.u8','vqrshlhi.u8','vqrshlls.u8','vqrshlge.u8','vqrshllt.u8','vqrshlgt.u8','vqrshlle.u8',
+            'vqrshleq.u16','vqrshlne.u16','vqrshlcs.u16','vqrshlhs.u16','vqrshlcc.u16','vqrshllo.u16','vqrshlmi.u16','vqrshlpl.u16','vqrshlvs.u16','vqrshlvc.u16','vqrshlhi.u16','vqrshlls.u16','vqrshlge.u16','vqrshllt.u16','vqrshlgt.u16','vqrshlle.u16',
+            'vqrshleq.u32','vqrshlne.u32','vqrshlcs.u32','vqrshlhs.u32','vqrshlcc.u32','vqrshllo.u32','vqrshlmi.u32','vqrshlpl.u32','vqrshlvs.u32','vqrshlvc.u32','vqrshlhi.u32','vqrshlls.u32','vqrshlge.u32','vqrshllt.u32','vqrshlgt.u32','vqrshlle.u32',
+            'vqrshleq.u64','vqrshlne.u64','vqrshlcs.u64','vqrshlhs.u64','vqrshlcc.u64','vqrshllo.u64','vqrshlmi.u64','vqrshlpl.u64','vqrshlvs.u64','vqrshlvc.u64','vqrshlhi.u64','vqrshlls.u64','vqrshlge.u64','vqrshllt.u64','vqrshlgt.u64','vqrshlle.u64',
+
+            'vqrshrneq.u16','vqrshrnne.u16','vqrshrncs.u16','vqrshrnhs.u16','vqrshrncc.u16','vqrshrnlo.u16','vqrshrnmi.u16','vqrshrnpl.u16','vqrshrnvs.u16','vqrshrnvc.u16','vqrshrnhi.u16','vqrshrnls.u16','vqrshrnge.u16','vqrshrnlt.u16','vqrshrngt.u16','vqrshrnle.u16',
+            'vqrshrneq.u32','vqrshrnne.u32','vqrshrncs.u32','vqrshrnhs.u32','vqrshrncc.u32','vqrshrnlo.u32','vqrshrnmi.u32','vqrshrnpl.u32','vqrshrnvs.u32','vqrshrnvc.u32','vqrshrnhi.u32','vqrshrnls.u32','vqrshrnge.u32','vqrshrnlt.u32','vqrshrngt.u32','vqrshrnle.u32',
+            'vqrshrneq.u64','vqrshrnne.u64','vqrshrncs.u64','vqrshrnhs.u64','vqrshrncc.u64','vqrshrnlo.u64','vqrshrnmi.u64','vqrshrnpl.u64','vqrshrnvs.u64','vqrshrnvc.u64','vqrshrnhi.u64','vqrshrnls.u64','vqrshrnge.u64','vqrshrnlt.u64','vqrshrngt.u64','vqrshrnle.u64',
+
+            'vrhaddeq.u8','vrhaddne.u8','vrhaddcs.u8','vrhaddhs.u8','vrhaddcc.u8','vrhaddlo.u8','vrhaddmi.u8','vrhaddpl.u8','vrhaddvs.u8','vrhaddvc.u8','vrhaddhi.u8','vrhaddls.u8','vrhaddge.u8','vrhaddlt.u8','vrhaddgt.u8','vrhaddle.u8',
+            'vrhaddeq.u16','vrhaddne.u16','vrhaddcs.u16','vrhaddhs.u16','vrhaddcc.u16','vrhaddlo.u16','vrhaddmi.u16','vrhaddpl.u16','vrhaddvs.u16','vrhaddvc.u16','vrhaddhi.u16','vrhaddls.u16','vrhaddge.u16','vrhaddlt.u16','vrhaddgt.u16','vrhaddle.u16',
+            'vrhaddeq.u32','vrhaddne.u32','vrhaddcs.u32','vrhaddhs.u32','vrhaddcc.u32','vrhaddlo.u32','vrhaddmi.u32','vrhaddpl.u32','vrhaddvs.u32','vrhaddvc.u32','vrhaddhi.u32','vrhaddls.u32','vrhaddge.u32','vrhaddlt.u32','vrhaddgt.u32','vrhaddle.u32',
+
+            'vrshleq.u8','vrshlne.u8','vrshlcs.u8','vrshlhs.u8','vrshlcc.u8','vrshllo.u8','vrshlmi.u8','vrshlpl.u8','vrshlvs.u8','vrshlvc.u8','vrshlhi.u8','vrshlls.u8','vrshlge.u8','vrshllt.u8','vrshlgt.u8','vrshlle.u8',
+            'vrshleq.u16','vrshlne.u16','vrshlcs.u16','vrshlhs.u16','vrshlcc.u16','vrshllo.u16','vrshlmi.u16','vrshlpl.u16','vrshlvs.u16','vrshlvc.u16','vrshlhi.u16','vrshlls.u16','vrshlge.u16','vrshllt.u16','vrshlgt.u16','vrshlle.u16',
+            'vrshleq.u32','vrshlne.u32','vrshlcs.u32','vrshlhs.u32','vrshlcc.u32','vrshllo.u32','vrshlmi.u32','vrshlpl.u32','vrshlvs.u32','vrshlvc.u32','vrshlhi.u32','vrshlls.u32','vrshlge.u32','vrshllt.u32','vrshlgt.u32','vrshlle.u32',
+            'vrshleq.u64','vrshlne.u64','vrshlcs.u64','vrshlhs.u64','vrshlcc.u64','vrshllo.u64','vrshlmi.u64','vrshlpl.u64','vrshlvs.u64','vrshlvc.u64','vrshlhi.u64','vrshlls.u64','vrshlge.u64','vrshllt.u64','vrshlgt.u64','vrshlle.u64',
+
+            'vrshreq.u8','vrshrne.u8','vrshrcs.u8','vrshrhs.u8','vrshrcc.u8','vrshrlo.u8','vrshrmi.u8','vrshrpl.u8','vrshrvs.u8','vrshrvc.u8','vrshrhi.u8','vrshrls.u8','vrshrge.u8','vrshrlt.u8','vrshrgt.u8','vrshrle.u8',
+            'vrshreq.u16','vrshrne.u16','vrshrcs.u16','vrshrhs.u16','vrshrcc.u16','vrshrlo.u16','vrshrmi.u16','vrshrpl.u16','vrshrvs.u16','vrshrvc.u16','vrshrhi.u16','vrshrls.u16','vrshrge.u16','vrshrlt.u16','vrshrgt.u16','vrshrle.u16',
+            'vrshreq.u32','vrshrne.u32','vrshrcs.u32','vrshrhs.u32','vrshrcc.u32','vrshrlo.u32','vrshrmi.u32','vrshrpl.u32','vrshrvs.u32','vrshrvc.u32','vrshrhi.u32','vrshrls.u32','vrshrge.u32','vrshrlt.u32','vrshrgt.u32','vrshrle.u32',
+            'vrshreq.u64','vrshrne.u64','vrshrcs.u64','vrshrhs.u64','vrshrcc.u64','vrshrlo.u64','vrshrmi.u64','vrshrpl.u64','vrshrvs.u64','vrshrvc.u64','vrshrhi.u64','vrshrls.u64','vrshrge.u64','vrshrlt.u64','vrshrgt.u64','vrshrle.u64',
+
+            'vrsraeq.u8','vrsrane.u8','vrsracs.u8','vrsrahs.u8','vrsracc.u8','vrsralo.u8','vrsrami.u8','vrsrapl.u8','vrsravs.u8','vrsravc.u8','vrsrahi.u8','vrsrals.u8','vrsrage.u8','vrsralt.u8','vrsragt.u8','vrsrale.u8',
+            'vrsraeq.u16','vrsrane.u16','vrsracs.u16','vrsrahs.u16','vrsracc.u16','vrsralo.u16','vrsrami.u16','vrsrapl.u16','vrsravs.u16','vrsravc.u16','vrsrahi.u16','vrsrals.u16','vrsrage.u16','vrsralt.u16','vrsragt.u16','vrsrale.u16',
+            'vrsraeq.u32','vrsrane.u32','vrsracs.u32','vrsrahs.u32','vrsracc.u32','vrsralo.u32','vrsrami.u32','vrsrapl.u32','vrsravs.u32','vrsravc.u32','vrsrahi.u32','vrsrals.u32','vrsrage.u32','vrsralt.u32','vrsragt.u32','vrsrale.u32',
+            'vrsraeq.u64','vrsrane.u64','vrsracs.u64','vrsrahs.u64','vrsracc.u64','vrsralo.u64','vrsrami.u64','vrsrapl.u64','vrsravs.u64','vrsravc.u64','vrsrahi.u64','vrsrals.u64','vrsrage.u64','vrsralt.u64','vrsragt.u64','vrsrale.u64',
+            ),
+        /* Conditional VFPv3 & NEON SIMD Floating-Point Instructions */
+        34 => array(
+            'vabdeq.f32','vabdne.f32','vabdcs.f32','vabdhs.f32','vabdcc.f32','vabdlo.f32','vabdmi.f32','vabdpl.f32','vabdvs.f32','vabdvc.f32','vabdhi.f32','vabdls.f32','vabdge.f32','vabdlt.f32','vabdgt.f32','vabdle.f32',
+
+            'vabseq.f32','vabsne.f32','vabscs.f32','vabshs.f32','vabscc.f32','vabslo.f32','vabsmi.f32','vabspl.f32','vabsvs.f32','vabsvc.f32','vabshi.f32','vabsls.f32','vabsge.f32','vabslt.f32','vabsgt.f32','vabsle.f32',
+            'vabseq.f64','vabsne.f64','vabscs.f64','vabshs.f64','vabscc.f64','vabslo.f64','vabsmi.f64','vabspl.f64','vabsvs.f64','vabsvc.f64','vabshi.f64','vabsls.f64','vabsge.f64','vabslt.f64','vabsgt.f64','vabsle.f64',
+
+            'vacgeeq.f32','vacgene.f32','vacgecs.f32','vacgehs.f32','vacgecc.f32','vacgelo.f32','vacgemi.f32','vacgepl.f32','vacgevs.f32','vacgevc.f32','vacgehi.f32','vacgels.f32','vacgege.f32','vacgelt.f32','vacgegt.f32','vacgele.f32',
+            'vacgteq.f32','vacgtne.f32','vacgtcs.f32','vacgths.f32','vacgtcc.f32','vacgtlo.f32','vacgtmi.f32','vacgtpl.f32','vacgtvs.f32','vacgtvc.f32','vacgthi.f32','vacgtls.f32','vacgtge.f32','vacgtlt.f32','vacgtgt.f32','vacgtle.f32',
+            'vacleeq.f32','vaclene.f32','vaclecs.f32','vaclehs.f32','vaclecc.f32','vaclelo.f32','vaclemi.f32','vaclepl.f32','vaclevs.f32','vaclevc.f32','vaclehi.f32','vaclels.f32','vaclege.f32','vaclelt.f32','vaclegt.f32','vaclele.f32',
+            'vaclteq.f32','vacltne.f32','vacltcs.f32','vaclths.f32','vacltcc.f32','vacltlo.f32','vacltmi.f32','vacltpl.f32','vacltvs.f32','vacltvc.f32','vaclthi.f32','vacltls.f32','vacltge.f32','vacltlt.f32','vacltgt.f32','vacltle.f32',
+
+            'vaddeq.f32','vaddne.f32','vaddcs.f32','vaddhs.f32','vaddcc.f32','vaddlo.f32','vaddmi.f32','vaddpl.f32','vaddvs.f32','vaddvc.f32','vaddhi.f32','vaddls.f32','vaddge.f32','vaddlt.f32','vaddgt.f32','vaddle.f32',
+            'vaddeq.f64','vaddne.f64','vaddcs.f64','vaddhs.f64','vaddcc.f64','vaddlo.f64','vaddmi.f64','vaddpl.f64','vaddvs.f64','vaddvc.f64','vaddhi.f64','vaddls.f64','vaddge.f64','vaddlt.f64','vaddgt.f64','vaddle.f64',
+
+            'vceqeq.f32','vceqne.f32','vceqcs.f32','vceqhs.f32','vceqcc.f32','vceqlo.f32','vceqmi.f32','vceqpl.f32','vceqvs.f32','vceqvc.f32','vceqhi.f32','vceqls.f32','vceqge.f32','vceqlt.f32','vceqgt.f32','vceqle.f32',
+            'vcgeeq.f32','vcgene.f32','vcgecs.f32','vcgehs.f32','vcgecc.f32','vcgelo.f32','vcgemi.f32','vcgepl.f32','vcgevs.f32','vcgevc.f32','vcgehi.f32','vcgels.f32','vcgege.f32','vcgelt.f32','vcgegt.f32','vcgele.f32',
+            'vcleeq.f32','vclene.f32','vclecs.f32','vclehs.f32','vclecc.f32','vclelo.f32','vclemi.f32','vclepl.f32','vclevs.f32','vclevc.f32','vclehi.f32','vclels.f32','vclege.f32','vclelt.f32','vclegt.f32','vclele.f32',
+            'vcgteq.f32','vcgtne.f32','vcgtcs.f32','vcgths.f32','vcgtcc.f32','vcgtlo.f32','vcgtmi.f32','vcgtpl.f32','vcgtvs.f32','vcgtvc.f32','vcgthi.f32','vcgtls.f32','vcgtge.f32','vcgtlt.f32','vcgtgt.f32','vcgtle.f32',
+            'vclteq.f32','vcltne.f32','vcltcs.f32','vclths.f32','vcltcc.f32','vcltlo.f32','vcltmi.f32','vcltpl.f32','vcltvs.f32','vcltvc.f32','vclthi.f32','vcltls.f32','vcltge.f32','vcltlt.f32','vcltgt.f32','vcltle.f32',
+
+            'vcmpeq.f32','vcmpne.f32','vcmpcs.f32','vcmphs.f32','vcmpcc.f32','vcmplo.f32','vcmpmi.f32','vcmppl.f32','vcmpvs.f32','vcmpvc.f32','vcmphi.f32','vcmpls.f32','vcmpge.f32','vcmplt.f32','vcmpgt.f32','vcmple.f32',
+            'vcmpeq.f64','vcmpne.f64','vcmpcs.f64','vcmphs.f64','vcmpcc.f64','vcmplo.f64','vcmpmi.f64','vcmppl.f64','vcmpvs.f64','vcmpvc.f64','vcmphi.f64','vcmpls.f64','vcmpge.f64','vcmplt.f64','vcmpgt.f64','vcmple.f64',
+
+            'vcmpeeq.f32','vcmpene.f32','vcmpecs.f32','vcmpehs.f32','vcmpecc.f32','vcmpelo.f32','vcmpemi.f32','vcmpepl.f32','vcmpevs.f32','vcmpevc.f32','vcmpehi.f32','vcmpels.f32','vcmpege.f32','vcmpelt.f32','vcmpegt.f32','vcmpele.f32',
+            'vcmpeeq.f64','vcmpene.f64','vcmpecs.f64','vcmpehs.f64','vcmpecc.f64','vcmpelo.f64','vcmpemi.f64','vcmpepl.f64','vcmpevs.f64','vcmpevc.f64','vcmpehi.f64','vcmpels.f64','vcmpege.f64','vcmpelt.f64','vcmpegt.f64','vcmpele.f64',
+
+            'vcvteq.s16.f32','vcvtne.s16.f32','vcvtcs.s16.f32','vcvths.s16.f32','vcvtcc.s16.f32','vcvtlo.s16.f32','vcvtmi.s16.f32','vcvtpl.s16.f32','vcvtvs.s16.f32','vcvtvc.s16.f32','vcvthi.s16.f32','vcvtls.s16.f32','vcvtge.s16.f32','vcvtlt.s16.f32','vcvtgt.s16.f32','vcvtle.s16.f32',
+            'vcvteq.s16.f64','vcvtne.s16.f64','vcvtcs.s16.f64','vcvths.s16.f64','vcvtcc.s16.f64','vcvtlo.s16.f64','vcvtmi.s16.f64','vcvtpl.s16.f64','vcvtvs.s16.f64','vcvtvc.s16.f64','vcvthi.s16.f64','vcvtls.s16.f64','vcvtge.s16.f64','vcvtlt.s16.f64','vcvtgt.s16.f64','vcvtle.s16.f64',
+            'vcvteq.s32.f32','vcvtne.s32.f32','vcvtcs.s32.f32','vcvths.s32.f32','vcvtcc.s32.f32','vcvtlo.s32.f32','vcvtmi.s32.f32','vcvtpl.s32.f32','vcvtvs.s32.f32','vcvtvc.s32.f32','vcvthi.s32.f32','vcvtls.s32.f32','vcvtge.s32.f32','vcvtlt.s32.f32','vcvtgt.s32.f32','vcvtle.s32.f32',
+            'vcvteq.s32.f64','vcvtne.s32.f64','vcvtcs.s32.f64','vcvths.s32.f64','vcvtcc.s32.f64','vcvtlo.s32.f64','vcvtmi.s32.f64','vcvtpl.s32.f64','vcvtvs.s32.f64','vcvtvc.s32.f64','vcvthi.s32.f64','vcvtls.s32.f64','vcvtge.s32.f64','vcvtlt.s32.f64','vcvtgt.s32.f64','vcvtle.s32.f64',
+            'vcvteq.u16.f32','vcvtne.u16.f32','vcvtcs.u16.f32','vcvths.u16.f32','vcvtcc.u16.f32','vcvtlo.u16.f32','vcvtmi.u16.f32','vcvtpl.u16.f32','vcvtvs.u16.f32','vcvtvc.u16.f32','vcvthi.u16.f32','vcvtls.u16.f32','vcvtge.u16.f32','vcvtlt.u16.f32','vcvtgt.u16.f32','vcvtle.u16.f32',
+            'vcvteq.u16.f64','vcvtne.u16.f64','vcvtcs.u16.f64','vcvths.u16.f64','vcvtcc.u16.f64','vcvtlo.u16.f64','vcvtmi.u16.f64','vcvtpl.u16.f64','vcvtvs.u16.f64','vcvtvc.u16.f64','vcvthi.u16.f64','vcvtls.u16.f64','vcvtge.u16.f64','vcvtlt.u16.f64','vcvtgt.u16.f64','vcvtle.u16.f64',
+            'vcvteq.u32.f32','vcvtne.u32.f32','vcvtcs.u32.f32','vcvths.u32.f32','vcvtcc.u32.f32','vcvtlo.u32.f32','vcvtmi.u32.f32','vcvtpl.u32.f32','vcvtvs.u32.f32','vcvtvc.u32.f32','vcvthi.u32.f32','vcvtls.u32.f32','vcvtge.u32.f32','vcvtlt.u32.f32','vcvtgt.u32.f32','vcvtle.u32.f32',
+            'vcvteq.u32.f64','vcvtne.u32.f64','vcvtcs.u32.f64','vcvths.u32.f64','vcvtcc.u32.f64','vcvtlo.u32.f64','vcvtmi.u32.f64','vcvtpl.u32.f64','vcvtvs.u32.f64','vcvtvc.u32.f64','vcvthi.u32.f64','vcvtls.u32.f64','vcvtge.u32.f64','vcvtlt.u32.f64','vcvtgt.u32.f64','vcvtle.u32.f64',
+            'vcvteq.f16.f32','vcvtne.f16.f32','vcvtcs.f16.f32','vcvths.f16.f32','vcvtcc.f16.f32','vcvtlo.f16.f32','vcvtmi.f16.f32','vcvtpl.f16.f32','vcvtvs.f16.f32','vcvtvc.f16.f32','vcvthi.f16.f32','vcvtls.f16.f32','vcvtge.f16.f32','vcvtlt.f16.f32','vcvtgt.f16.f32','vcvtle.f16.f32',
+            'vcvteq.f32.s32','vcvtne.f32.s32','vcvtcs.f32.s32','vcvths.f32.s32','vcvtcc.f32.s32','vcvtlo.f32.s32','vcvtmi.f32.s32','vcvtpl.f32.s32','vcvtvs.f32.s32','vcvtvc.f32.s32','vcvthi.f32.s32','vcvtls.f32.s32','vcvtge.f32.s32','vcvtlt.f32.s32','vcvtgt.f32.s32','vcvtle.f32.s32',
+            'vcvteq.f32.u32','vcvtne.f32.u32','vcvtcs.f32.u32','vcvths.f32.u32','vcvtcc.f32.u32','vcvtlo.f32.u32','vcvtmi.f32.u32','vcvtpl.f32.u32','vcvtvs.f32.u32','vcvtvc.f32.u32','vcvthi.f32.u32','vcvtls.f32.u32','vcvtge.f32.u32','vcvtlt.f32.u32','vcvtgt.f32.u32','vcvtle.f32.u32',
+            'vcvteq.f32.f16','vcvtne.f32.f16','vcvtcs.f32.f16','vcvths.f32.f16','vcvtcc.f32.f16','vcvtlo.f32.f16','vcvtmi.f32.f16','vcvtpl.f32.f16','vcvtvs.f32.f16','vcvtvc.f32.f16','vcvthi.f32.f16','vcvtls.f32.f16','vcvtge.f32.f16','vcvtlt.f32.f16','vcvtgt.f32.f16','vcvtle.f32.f16',
+            'vcvteq.f32.f64','vcvtne.f32.f64','vcvtcs.f32.f64','vcvths.f32.f64','vcvtcc.f32.f64','vcvtlo.f32.f64','vcvtmi.f32.f64','vcvtpl.f32.f64','vcvtvs.f32.f64','vcvtvc.f32.f64','vcvthi.f32.f64','vcvtls.f32.f64','vcvtge.f32.f64','vcvtlt.f32.f64','vcvtgt.f32.f64','vcvtle.f32.f64',
+            'vcvteq.f64.s32','vcvtne.f64.s32','vcvtcs.f64.s32','vcvths.f64.s32','vcvtcc.f64.s32','vcvtlo.f64.s32','vcvtmi.f64.s32','vcvtpl.f64.s32','vcvtvs.f64.s32','vcvtvc.f64.s32','vcvthi.f64.s32','vcvtls.f64.s32','vcvtge.f64.s32','vcvtlt.f64.s32','vcvtgt.f64.s32','vcvtle.f64.s32',
+            'vcvteq.f64.u32','vcvtne.f64.u32','vcvtcs.f64.u32','vcvths.f64.u32','vcvtcc.f64.u32','vcvtlo.f64.u32','vcvtmi.f64.u32','vcvtpl.f64.u32','vcvtvs.f64.u32','vcvtvc.f64.u32','vcvthi.f64.u32','vcvtls.f64.u32','vcvtge.f64.u32','vcvtlt.f64.u32','vcvtgt.f64.u32','vcvtle.f64.u32',
+            'vcvteq.f64.f32','vcvtne.f64.f32','vcvtcs.f64.f32','vcvths.f64.f32','vcvtcc.f64.f32','vcvtlo.f64.f32','vcvtmi.f64.f32','vcvtpl.f64.f32','vcvtvs.f64.f32','vcvtvc.f64.f32','vcvthi.f64.f32','vcvtls.f64.f32','vcvtge.f64.f32','vcvtlt.f64.f32','vcvtgt.f64.f32','vcvtle.f64.f32',
+
+            'vcvtreq.s32.f32','vcvtrne.s32.f32','vcvtrcs.s32.f32','vcvtrhs.s32.f32','vcvtrcc.s32.f32','vcvtrlo.s32.f32','vcvtrmi.s32.f32','vcvtrpl.s32.f32','vcvtrvs.s32.f32','vcvtrvc.s32.f32','vcvtrhi.s32.f32','vcvtrls.s32.f32','vcvtrge.s32.f32','vcvtrlt.s32.f32','vcvtrgt.s32.f32','vcvtrle.s32.f32',
+            'vcvtreq.s32.f64','vcvtrne.s32.f64','vcvtrcs.s32.f64','vcvtrhs.s32.f64','vcvtrcc.s32.f64','vcvtrlo.s32.f64','vcvtrmi.s32.f64','vcvtrpl.s32.f64','vcvtrvs.s32.f64','vcvtrvc.s32.f64','vcvtrhi.s32.f64','vcvtrls.s32.f64','vcvtrge.s32.f64','vcvtrlt.s32.f64','vcvtrgt.s32.f64','vcvtrle.s32.f64',
+            'vcvtreq.u32.f32','vcvtrne.u32.f32','vcvtrcs.u32.f32','vcvtrhs.u32.f32','vcvtrcc.u32.f32','vcvtrlo.u32.f32','vcvtrmi.u32.f32','vcvtrpl.u32.f32','vcvtrvs.u32.f32','vcvtrvc.u32.f32','vcvtrhi.u32.f32','vcvtrls.u32.f32','vcvtrge.u32.f32','vcvtrlt.u32.f32','vcvtrgt.u32.f32','vcvtrle.u32.f32',
+            'vcvtreq.u32.f64','vcvtrne.u32.f64','vcvtrcs.u32.f64','vcvtrhs.u32.f64','vcvtrcc.u32.f64','vcvtrlo.u32.f64','vcvtrmi.u32.f64','vcvtrpl.u32.f64','vcvtrvs.u32.f64','vcvtrvc.u32.f64','vcvtrhi.u32.f64','vcvtrls.u32.f64','vcvtrge.u32.f64','vcvtrlt.u32.f64','vcvtrgt.u32.f64','vcvtrle.u32.f64',
+
+            'vcvtbeq.f16.f32','vcvtbne.f16.f32','vcvtbcs.f16.f32','vcvtbhs.f16.f32','vcvtbcc.f16.f32','vcvtblo.f16.f32','vcvtbmi.f16.f32','vcvtbpl.f16.f32','vcvtbvs.f16.f32','vcvtbvc.f16.f32','vcvtbhi.f16.f32','vcvtbls.f16.f32','vcvtbge.f16.f32','vcvtblt.f16.f32','vcvtbgt.f16.f32','vcvtble.f16.f32',
+            'vcvtbeq.f32.f16','vcvtbne.f32.f16','vcvtbcs.f32.f16','vcvtbhs.f32.f16','vcvtbcc.f32.f16','vcvtblo.f32.f16','vcvtbmi.f32.f16','vcvtbpl.f32.f16','vcvtbvs.f32.f16','vcvtbvc.f32.f16','vcvtbhi.f32.f16','vcvtbls.f32.f16','vcvtbge.f32.f16','vcvtblt.f32.f16','vcvtbgt.f32.f16','vcvtble.f32.f16',
+
+            'vcvtteq.f16.f32','vcvttne.f16.f32','vcvttcs.f16.f32','vcvtths.f16.f32','vcvttcc.f16.f32','vcvttlo.f16.f32','vcvttmi.f16.f32','vcvttpl.f16.f32','vcvttvs.f16.f32','vcvttvc.f16.f32','vcvtthi.f16.f32','vcvttls.f16.f32','vcvttge.f16.f32','vcvttlt.f16.f32','vcvttgt.f16.f32','vcvttle.f16.f32',
+            'vcvtteq.f32.f16','vcvttne.f32.f16','vcvttcs.f32.f16','vcvtths.f32.f16','vcvttcc.f32.f16','vcvttlo.f32.f16','vcvttmi.f32.f16','vcvttpl.f32.f16','vcvttvs.f32.f16','vcvttvc.f32.f16','vcvtthi.f32.f16','vcvttls.f32.f16','vcvttge.f32.f16','vcvttlt.f32.f16','vcvttgt.f32.f16','vcvttle.f32.f16',
+
+            'vdiveq.f32','vdivne.f32','vdivcs.f32','vdivhs.f32','vdivcc.f32','vdivlo.f32','vdivmi.f32','vdivpl.f32','vdivvs.f32','vdivvc.f32','vdivhi.f32','vdivls.f32','vdivge.f32','vdivlt.f32','vdivgt.f32','vdivle.f32',
+            'vdiveq.f64','vdivne.f64','vdivcs.f64','vdivhs.f64','vdivcc.f64','vdivlo.f64','vdivmi.f64','vdivpl.f64','vdivvs.f64','vdivvc.f64','vdivhi.f64','vdivls.f64','vdivge.f64','vdivlt.f64','vdivgt.f64','vdivle.f64',
+
+            'vmaxeq.f32','vmaxne.f32','vmaxcs.f32','vmaxhs.f32','vmaxcc.f32','vmaxlo.f32','vmaxmi.f32','vmaxpl.f32','vmaxvs.f32','vmaxvc.f32','vmaxhi.f32','vmaxls.f32','vmaxge.f32','vmaxlt.f32','vmaxgt.f32','vmaxle.f32',
+            'vmineq.f32','vminne.f32','vmincs.f32','vminhs.f32','vmincc.f32','vminlo.f32','vminmi.f32','vminpl.f32','vminvs.f32','vminvc.f32','vminhi.f32','vminls.f32','vminge.f32','vminlt.f32','vmingt.f32','vminle.f32',
+
+            'vmlaeq.f32','vmlane.f32','vmlacs.f32','vmlahs.f32','vmlacc.f32','vmlalo.f32','vmlami.f32','vmlapl.f32','vmlavs.f32','vmlavc.f32','vmlahi.f32','vmlals.f32','vmlage.f32','vmlalt.f32','vmlagt.f32','vmlale.f32',
+            'vmlaeq.f64','vmlane.f64','vmlacs.f64','vmlahs.f64','vmlacc.f64','vmlalo.f64','vmlami.f64','vmlapl.f64','vmlavs.f64','vmlavc.f64','vmlahi.f64','vmlals.f64','vmlage.f64','vmlalt.f64','vmlagt.f64','vmlale.f64',
+
+            'vmlseq.f32','vmlsne.f32','vmlscs.f32','vmlshs.f32','vmlscc.f32','vmlslo.f32','vmlsmi.f32','vmlspl.f32','vmlsvs.f32','vmlsvc.f32','vmlshi.f32','vmlsls.f32','vmlsge.f32','vmlslt.f32','vmlsgt.f32','vmlsle.f32',
+            'vmlseq.f64','vmlsne.f64','vmlscs.f64','vmlshs.f64','vmlscc.f64','vmlslo.f64','vmlsmi.f64','vmlspl.f64','vmlsvs.f64','vmlsvc.f64','vmlshi.f64','vmlsls.f64','vmlsge.f64','vmlslt.f64','vmlsgt.f64','vmlsle.f64',
+
+            'vmuleq.f32','vmulne.f32','vmulcs.f32','vmulhs.f32','vmulcc.f32','vmullo.f32','vmulmi.f32','vmulpl.f32','vmulvs.f32','vmulvc.f32','vmulhi.f32','vmulls.f32','vmulge.f32','vmullt.f32','vmulgt.f32','vmulle.f32',
+            'vmuleq.f64','vmulne.f64','vmulcs.f64','vmulhs.f64','vmulcc.f64','vmullo.f64','vmulmi.f64','vmulpl.f64','vmulvs.f64','vmulvc.f64','vmulhi.f64','vmulls.f64','vmulge.f64','vmullt.f64','vmulgt.f64','vmulle.f64',
+
+            'vnegeq.f32','vnegne.f32','vnegcs.f32','vneghs.f32','vnegcc.f32','vneglo.f32','vnegmi.f32','vnegpl.f32','vnegvs.f32','vnegvc.f32','vneghi.f32','vnegls.f32','vnegge.f32','vneglt.f32','vneggt.f32','vnegle.f32',
+            'vnegeq.f64','vnegne.f64','vnegcs.f64','vneghs.f64','vnegcc.f64','vneglo.f64','vnegmi.f64','vnegpl.f64','vnegvs.f64','vnegvc.f64','vneghi.f64','vnegls.f64','vnegge.f64','vneglt.f64','vneggt.f64','vnegle.f64',
+
+            'vnmlaeq.f32','vnmlane.f32','vnmlacs.f32','vnmlahs.f32','vnmlacc.f32','vnmlalo.f32','vnmlami.f32','vnmlapl.f32','vnmlavs.f32','vnmlavc.f32','vnmlahi.f32','vnmlals.f32','vnmlage.f32','vnmlalt.f32','vnmlagt.f32','vnmlale.f32',
+            'vnmlaeq.f64','vnmlane.f64','vnmlacs.f64','vnmlahs.f64','vnmlacc.f64','vnmlalo.f64','vnmlami.f64','vnmlapl.f64','vnmlavs.f64','vnmlavc.f64','vnmlahi.f64','vnmlals.f64','vnmlage.f64','vnmlalt.f64','vnmlagt.f64','vnmlale.f64',
+
+            'vnmlseq.f32','vnmlsne.f32','vnmlscs.f32','vnmlshs.f32','vnmlscc.f32','vnmlslo.f32','vnmlsmi.f32','vnmlspl.f32','vnmlsvs.f32','vnmlsvc.f32','vnmlshi.f32','vnmlsls.f32','vnmlsge.f32','vnmlslt.f32','vnmlsgt.f32','vnmlsle.f32',
+            'vnmlseq.f64','vnmlsne.f64','vnmlscs.f64','vnmlshs.f64','vnmlscc.f64','vnmlslo.f64','vnmlsmi.f64','vnmlspl.f64','vnmlsvs.f64','vnmlsvc.f64','vnmlshi.f64','vnmlsls.f64','vnmlsge.f64','vnmlslt.f64','vnmlsgt.f64','vnmlsle.f64',
+
+            'vnmuleq.f64','vnmulne.f64','vnmulcs.f64','vnmulhs.f64','vnmulcc.f64','vnmullo.f64','vnmulmi.f64','vnmulpl.f64','vnmulvs.f64','vnmulvc.f64','vnmulhi.f64','vnmulls.f64','vnmulge.f64','vnmullt.f64','vnmulgt.f64','vnmulle.f64',
+            'vnmuleq.f32','vnmulne.f32','vnmulcs.f32','vnmulhs.f32','vnmulcc.f32','vnmullo.f32','vnmulmi.f32','vnmulpl.f32','vnmulvs.f32','vnmulvc.f32','vnmulhi.f32','vnmulls.f32','vnmulge.f32','vnmullt.f32','vnmulgt.f32','vnmulle.f32',
+
+            'vpaddeq.f32','vpaddne.f32','vpaddcs.f32','vpaddhs.f32','vpaddcc.f32','vpaddlo.f32','vpaddmi.f32','vpaddpl.f32','vpaddvs.f32','vpaddvc.f32','vpaddhi.f32','vpaddls.f32','vpaddge.f32','vpaddlt.f32','vpaddgt.f32','vpaddle.f32',
+
+            'vpmaxeq.f32','vpmaxne.f32','vpmaxcs.f32','vpmaxhs.f32','vpmaxcc.f32','vpmaxlo.f32','vpmaxmi.f32','vpmaxpl.f32','vpmaxvs.f32','vpmaxvc.f32','vpmaxhi.f32','vpmaxls.f32','vpmaxge.f32','vpmaxlt.f32','vpmaxgt.f32','vpmaxle.f32',
+            'vpmineq.f32','vpminne.f32','vpmincs.f32','vpminhs.f32','vpmincc.f32','vpminlo.f32','vpminmi.f32','vpminpl.f32','vpminvs.f32','vpminvc.f32','vpminhi.f32','vpminls.f32','vpminge.f32','vpminlt.f32','vpmingt.f32','vpminle.f32',
+
+            'vrecpeeq.u32','vrecpene.u32','vrecpecs.u32','vrecpehs.u32','vrecpecc.u32','vrecpelo.u32','vrecpemi.u32','vrecpepl.u32','vrecpevs.u32','vrecpevc.u32','vrecpehi.u32','vrecpels.u32','vrecpege.u32','vrecpelt.u32','vrecpegt.u32','vrecpele.u32',
+            'vrecpeeq.f32','vrecpene.f32','vrecpecs.f32','vrecpehs.f32','vrecpecc.f32','vrecpelo.f32','vrecpemi.f32','vrecpepl.f32','vrecpevs.f32','vrecpevc.f32','vrecpehi.f32','vrecpels.f32','vrecpege.f32','vrecpelt.f32','vrecpegt.f32','vrecpele.f32',
+            'vrecpseq.f32','vrecpsne.f32','vrecpscs.f32','vrecpshs.f32','vrecpscc.f32','vrecpslo.f32','vrecpsmi.f32','vrecpspl.f32','vrecpsvs.f32','vrecpsvc.f32','vrecpshi.f32','vrecpsls.f32','vrecpsge.f32','vrecpslt.f32','vrecpsgt.f32','vrecpsle.f32',
+
+            'vrsqrteeq.u32','vrsqrtene.u32','vrsqrtecs.u32','vrsqrtehs.u32','vrsqrtecc.u32','vrsqrtelo.u32','vrsqrtemi.u32','vrsqrtepl.u32','vrsqrtevs.u32','vrsqrtevc.u32','vrsqrtehi.u32','vrsqrtels.u32','vrsqrtege.u32','vrsqrtelt.u32','vrsqrtegt.u32','vrsqrtele.u32',
+            'vrsqrteeq.f32','vrsqrtene.f32','vrsqrtecs.f32','vrsqrtehs.f32','vrsqrtecc.f32','vrsqrtelo.f32','vrsqrtemi.f32','vrsqrtepl.f32','vrsqrtevs.f32','vrsqrtevc.f32','vrsqrtehi.f32','vrsqrtels.f32','vrsqrtege.f32','vrsqrtelt.f32','vrsqrtegt.f32','vrsqrtele.f32',
+            'vrsqrtseq.f32','vrsqrtsne.f32','vrsqrtscs.f32','vrsqrtshs.f32','vrsqrtscc.f32','vrsqrtslo.f32','vrsqrtsmi.f32','vrsqrtspl.f32','vrsqrtsvs.f32','vrsqrtsvc.f32','vrsqrtshi.f32','vrsqrtsls.f32','vrsqrtsge.f32','vrsqrtslt.f32','vrsqrtsgt.f32','vrsqrtsle.f32',
+
+            'vsqrteq.f32','vsqrtne.f32','vsqrtcs.f32','vsqrths.f32','vsqrtcc.f32','vsqrtlo.f32','vsqrtmi.f32','vsqrtpl.f32','vsqrtvs.f32','vsqrtvc.f32','vsqrthi.f32','vsqrtls.f32','vsqrtge.f32','vsqrtlt.f32','vsqrtgt.f32','vsqrtle.f32',
+            'vsqrteq.f64','vsqrtne.f64','vsqrtcs.f64','vsqrths.f64','vsqrtcc.f64','vsqrtlo.f64','vsqrtmi.f64','vsqrtpl.f64','vsqrtvs.f64','vsqrtvc.f64','vsqrthi.f64','vsqrtls.f64','vsqrtge.f64','vsqrtlt.f64','vsqrtgt.f64','vsqrtle.f64',
+
+            'vsubeq.f32','vsubne.f32','vsubcs.f32','vsubhs.f32','vsubcc.f32','vsublo.f32','vsubmi.f32','vsubpl.f32','vsubvs.f32','vsubvc.f32','vsubhi.f32','vsubls.f32','vsubge.f32','vsublt.f32','vsubgt.f32','vsuble.f32',
+            'vsubeq.f64','vsubne.f64','vsubcs.f64','vsubhs.f64','vsubcc.f64','vsublo.f64','vsubmi.f64','vsubpl.f64','vsubvs.f64','vsubvc.f64','vsubhi.f64','vsubls.f64','vsubge.f64','vsublt.f64','vsubgt.f64','vsuble.f64'
+            ),
+        /* Registers */
+        35 => array(
+            /* General-Purpose Registers */
+            'r0','r1','r2','r3','r4','r5','r6','r7',
+            'r8','r9','r10','r11','r12','r13','r14','r15',
+            /* Scratch Registers */
+            'a1','a2','a3','a4',
+            /* Variable Registers */
+            'v1','v2','v3','v4','v5','v6','v7','v8',
+            /* Other Synonims for General-Purpose Registers */
+            'sb','sl','fp','ip','sp','lr','pc',
+            /* WMMX Data Registers */
+            'wr0','wr1','wr2','wr3','wr4','wr5','wr6','wr7',
+            'wr8','wr9','wr10','wr11','wr12','wr13','wr14','wr15',
+            /* WMMX Control Registers */
+            'wcid','wcon','wcssf','wcasf',
+            /* WMMX-Mapped General-Purpose Registers */
+            'wcgr0','wcgr1','wcgr2','wcgr3',
+            /* VFPv3 Registers */
+            's0','s1','s2','s3','s4','s5','s6','s7',
+            's8','s9','s10','s11','s12','s13','s14','s15',
+            's16','s17','s18','s19','s20','s21','s22','s23',
+            's24','s25','s26','s27','s28','s29','s30','s31',
+            /* VFPv3/NEON Registers */
+            'd0','d1','d2','d3','d4','d5','d6','d7',
+            'd8','d9','d10','d11','d12','d13','d14','d15',
+            'd16','d17','d18','d19','d20','d21','d22','d23',
+            'd24','d25','d26','d27','d28','d29','d30','d31',
+            /* NEON Registers */
+            'q0','q1','q2','q3','q4','q5','q6','q7',
+            'q8','q9','q10','q11','q12','q13','q14','q15'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        '+', '-', '*', '/', '%',
+        '.', ',', ';', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false,
+        13 => false,
+        14 => false,
+        15 => false,
+        16 => false,
+        17 => false,
+        18 => false,
+        19 => false,
+        20 => false,
+        21 => false,
+        22 => false,
+        23 => false,
+        24 => false,
+        25 => false,
+        26 => false,
+        27 => false,
+        28 => false,
+        29 => false,
+        30 => false,
+        31 => false,
+        32 => false,
+        33 => false,
+        34 => false,
+        35 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            /* Unconditional Data Processing Instructions */
+            1 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Data Processing Instructions */
+            2 => 'color: #00007f; font-weight: normal; font-style: italic;',
+            /* Unconditional Memory Access Instructions */
+            3 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Memory Access Instructions */
+            4 => 'color: #00007f; font-weight: normal; font-style: italic;',
+            /* Unconditional Flags Changing Instructions */
+            5 => 'color: #00007f; font-weight: bold; font-style: normal;',
+            /* Conditional Flags Changing Instructions */
+            6 => 'color: #00007f; font-weight: bold; font-style: italic;',
+            /* Unconditional Flow Control Instructions */
+            7 => 'color: #0000ff; font-weight: normal; font-style: normal;',
+            /* Conditional Flow Control Instructions */
+            8 => 'color: #0000ff; font-weight: normal; font-style: italic;',
+            /* Unconditional Syncronization Instructions */
+            9 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Syncronization Instructions */
+            10 => 'color: #00007f; font-weight: normal; font-style: italic;',
+            /* Unonditional ARMv6 SIMD */
+            11 => 'color: #b00040; font-weight: normal; font-style: normal;',
+            /* Conditional ARMv6 SIMD */
+            12 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional Coprocessor Instructions */
+            13 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Coprocessor Instructions */
+            14 => 'color: #00007f; font-weight: bold; font-style: italic;',
+            /* Unconditional System Instructions */
+            15 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional System Instructions */
+            16 => 'color: #00007f; font-weight: bold; font-style: italic;',
+            /* Unconditional WMMX/WMMX2 SIMD Instructions */
+            17 => 'color: #b00040; font-weight: normal; font-style: normal;',
+            /* Conditional WMMX/WMMX2 SIMD Instructions */
+            18 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional VFPv3 & NEON SIMD Memory Access Instructions */
+            19 => 'color: #b00040; font-weight: normal; font-style: normal;',
+            /* Unconditional NEON SIMD Logical Instructions */
+            20 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD ARM Registers Interop Instructions */
+            21 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Bit/Byte-Level Instructions */
+            22 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Universal Integer Instructions */
+            23 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Signed Integer Instructions */
+            24 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Unsigned Integer Instructions */
+            25 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional VFPv3 & NEON SIMD Floating-Point Instructions */
+            26 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional VFPv3 & NEON SIMD Memory Access Instructions */
+            27 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Logical Instructions */
+            28 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD ARM Registers Interop Instructions */
+            29 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Bit/Byte-Level Instructions */
+            30 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Universal Integer Instructions */
+            31 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Signed Integer Instructions */
+            32 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Unsigned Integer Instructions */
+            33 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional VFPv3 & NEON SIMD Floating-Point Instructions */
+            34 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Registers */
+            35 => 'color: #46aa03; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #adadad; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => '',
+        18 => '',
+        19 => '',
+        20 => '',
+        21 => '',
+        22 => '',
+        23 => '',
+        24 => '',
+        25 => '',
+        26 => '',
+        27 => '',
+        28 => '',
+        29 => '',
+        30 => '',
+        31 => '',
+        32 => '',
+        33 => '',
+        34 => '',
+        35 => ''
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_BIN_PREFIX_PERCENT |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX |
+        GESHI_NUMBER_OCT_SUFFIX |
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/asm.php b/vendor/easybook/geshi/geshi/asm.php
new file mode 100755
index 000000000..dd0a7ec50
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/asm.php
@@ -0,0 +1,603 @@
+<?php
+/*************************************************************************************
+ * asm.php
+ * -------
+ * Author: Tux (tux@inmail.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/),
+ *                2004-2009 Nigel McNie (http://qbnz.com/highlighter),
+ *                2009-2011 Benny Baumann (http://qbnz.com/highlighter),
+ *                2011 Dennis Yurichev (dennis@conus.info),
+ *                2011 Marat Dukhan (mdukhan3.at.gatech.dot.edu)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/27
+ *
+ * x86 Assembler language file for GeSHi.
+ * Based on the following documents:
+ *   - "Intel64 and IA-32 Architectures Programmer's Reference Manual
+ *       Volume 2 (2A & 2B): Instructions Set Reference, A-Z",
+ *       Order Number 25383-039US, May 2011
+ *   - "Intel Advanced Vector Extensions Programming Reference",
+ *       Order Number 319433-011, June 2011
+ *   - "AMD64 Architecture Programmer's Manual Volume 3:
+ *       General-Purpose and System Instructions", Publication No. 24594,
+ *       Revision 3.15, November 2009
+ *   - "AMD64 Architecture Programmer's Manual Volume 4:
+ *       128-Bit and 256-Bit Media Instructions", Publication No. 26568,
+ *       Revision 3.12, May 2011
+ *   - "AMD64 Architecture Programmer's Manual Volume 5:
+ *       64-Bit Media and x87 Floating-Point Instructions",
+ *       Publication No. 26569, Revision 3.11, December 2009
+ *   - "AMD64 Technology Lightweight Profiling Specification",
+ *       Publication No. 43724, Revision 3.08, August 2010
+ *   - "Application Note 108: Cyrix Extended MMX Instruction Set"
+ *   - "VIA Padlock Programming Guide", 3rd May 2005
+ *   - http://en.wikipedia.org/wiki/X86_instruction_listings
+ *   - NASM 2.10rc8 Online Documenation at
+ *       http://www.nasm.us/xdoc/2.10rc8/html/nasmdoc0.html
+ * Color scheme is taken from SciTE. Previous versions of this file
+ * also used words from SciTE configuration file (based on NASM syntax)
+ *
+ * CHANGES
+ * -------
+ * 2011/10/07
+ *   -  Rearranged instructions and registers into groups
+ *   -  Updated to support the following extensions
+ *          - CMOV, BMI1, BMI2, TBM, FSGSBASE
+ *          - LZCNT, TZCNT, POPCNT, MOVBE, CRC32
+ *          - MMX, MMX+, EMMX
+ *          - 3dnow!, 3dnow!+, 3dnow! Geode, 3dnow! Prefetch
+ *          - SSE, SSE2, SSE3, SSSE3, SSE4A, SSE4.1, SSE4.2
+ *          - AVX, AVX2, XOP, FMA3, FMA4, CVT16
+ *          - VMX, SVM
+ *          - AES, PCLMULQDQ, Padlock, RDRAND
+ *   -  Updated NASM macros and directives
+ * 2010/07/01 (1.0.8.11)
+ *   -  Added MMX/SSE/new x86-64 registers, MMX/SSE (up to 4.2) instructions
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.2)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ *   -  Added binary and hexadecimal regexps
+ * 2004/08/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ASM',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    //Line address prefix suppression
+    'COMMENT_REGEXP' => array(2 => "/^(?:[0-9a-f]{0,4}:)?[0-9a-f]{4}(?:[0-9a-f]{4})?/mi"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* General-Purpose */
+        1 => array(
+            /* BCD instructions */
+            'aaa','aad','aam','aas','daa','das',
+            /* Control flow instructions */
+            'ja','jae','jb','jbe','jc','je','jg','jge','jl','jle','jmp','jna',
+            'jnae','jnb','jnbe','jnc','jne','jng','jnge','jnl','jnle','jno','jnp','jns','jnz',
+            'jo','jp','jpe','jpo','js','jz','jcxz','jecxz','jrcxz','loop','loope','loopne',
+            'call','ret','enter','leave','syscall','sysenter','int','into',
+            /* Predicate instructions */
+            'seta','setae','setb','setbe','setc','sete','setg','setge','setl','setle','setna',
+            'setnae','setnb','setnbe','setnc','setne','setng','setnge','setnl','setnle','setno',
+            'setnp','setns','setnz','seto','setp','setpe','setpo','sets','setz','salc',
+            /* Conditional move instructions */
+            'cmovo','cmovno','cmovb','cmovc','cmovnae','cmovae','cmovnb','cmovnc','cmove','cmovz',
+            'cmovne','cmovnz','cmovbe','cmovna','cmova','cmovnbe','cmovs','cmovns','cmovp','cmovpe',
+            'cmovnp','cmovpo','cmovl','cmovnge','cmovge','cmovnl','cmovle','cmovng','cmovg','cmovnle',
+            /* ALU instructions */
+            'add','sub','adc','sbb','neg','cmp','inc','dec','and','or','xor','not','test',
+            'shl','shr','sal','sar','shld','shrd','rol','ror','rcl','rcr',
+            'cbw','cwd','cwde','cdq','cdqe','cqo','bsf','bsr','bt','btc','btr','bts',
+            'idiv','imul','div','mul','bswap','nop',
+            /* Memory instructions */
+            'lea','mov','movsx','movsxd','movzx','xlatb','bound','xchg','xadd','cmpxchg','cmpxchg8b','cmpxchg16b',
+            /* Stack instructions */
+            'push','pop','pusha','popa','pushad','popad','pushf','popf','pushfd','popfd','pushfq','popfq',
+            /* EFLAGS manipulations instructions */
+            'clc','cld','stc','std','cmc','lahf','sahf',
+            /* Prefix instructions */
+            'lock','rep','repe','repz','repne','repnz',
+            /* String instructions */
+            'cmps','cmpsb','cmpsw',/*'cmpsd',*/ 'cmpsq', /*CMPSD conflicts with the SSE2 instructions of the same name*/
+            'movs','movsb','movsw',/*'movsd',*/ 'movsq', /*MOVSD conflicts with the SSE2 instructions of the same name*/
+            'scas','scasb','scasw','scasd','scasq',
+            'stos','stosb','stosw','stosd','stosq',
+            'lods','lodsb','lodsw','lodsd','lodsq',
+            /* Information instructions */
+            'cpuid','rdtsc','rdtscp','rdpmc','xgetbv',
+            'sgdt','sidt','sldt','smsw','str','lar',
+            /* LWP instructions */
+            'llwpcb','slwpcb','lwpval','lwpins',
+            /* Instructions from miscellaneous extensions */
+            'crc32','popcnt','lzcnt','tzcnt','movbe','pclmulqdq','rdrand',
+            /* FSGSBASE instructions */
+            'rdfsbase','rdgsbase','wrfsbase','wrgsbase',
+            /* BMI1 instructions */
+            'andn','bextr','blsi','blsmk','blsr',
+            /* BMI2 instructions */
+            'bzhi','mulx','pdep','pext','rorx','sarx','shlx','shrx',
+            /* TBM instructions */
+            'blcfill','blci','blcic','blcmsk','blcs','blsfill','blsic','t1mskc','tzmsk',
+            /* Legacy instructions */
+            'arpl','ud2','lds','les','lfs','lgs','lss','lsl','verr','verw',
+            /* Privileged instructions */
+            'cli','sti','clts','hlt','rsm','in','insb','insw','insd',
+            'out','outsb','outsw','outsd','clflush','invd','invlpg','invpcid','wbinvd',
+            'iret','iretd','iretq','sysexit','sysret','lidt','lgdt','lldt','lmsw','ltr',
+            'monitor','mwait','rdmsr','wrmsr','swapgs',
+            'fxsave','fxsave64','fxrstor','fxrstor64',
+            'xsave','xsaveopt','xrstor','xsetbv','getsec',
+            /* VMX instructions */
+            'invept','invvpid','vmcall','vmclear','vmlaunch','vmresume',
+            'vmptrld','vmptrst','vmread','vmwrite','vmxoff','vmxon',
+            /* SVM (AMD-V) instructions */
+            'invlpga','skinit','clgi','stgi','vmload','vmsave','vmmcall','vmrun'
+            ),
+        /*FPU*/
+        2 => array(
+            'f2xm1','fabs','fadd','faddp','fbld','fbstp','fchs','fclex','fcom','fcomp','fcompp','fdecstp',
+            'fdisi','fdiv','fdivp','fdivr','fdivrp','feni','ffree','fiadd','ficom','ficomp','fidiv',
+            'fidivr','fild','fimul','fincstp','finit','fist','fistp','fisub','fisubr','fld','fld1',
+            'fldcw','fldenv','fldenvw','fldl2e','fldl2t','fldlg2','fldln2','fldpi','fldz','fmul',
+            'fmulp','fnclex','fndisi','fneni','fninit','fnop','fnsave','fnsavew','fnstcw','fnstenv',
+            'fnstenvw','fnstsw','fpatan','fprem','fptan','frndint','frstor','frstorw','fsave',
+            'fsavew','fscale','fsqrt','fst','fstcw','fstenv','fstenvw','fstp','fstsw','fsub','fsubp',
+            'fsubr','fsubrp','ftst','fwait','fxam','fxch','fxtract','fyl2x','fyl2xp1',
+            'fsetpm','fcos','fldenvd','fnsaved','fnstenvd','fprem1','frstord','fsaved','fsin','fsincos',
+            'fstenvd','fucom','fucomp','fucompp','ffreep',
+            /* FCMOV instructions */
+            'fcomi','fcomip','fucomi','fucomip',
+            'fcmovb','fcmove','fcmovbe','fcmovu','fcmovnb','fcmovne','fcmovnbe','fcmovnu',
+            /* SSE3 instructions */
+            'fisttp'
+            ),
+        /*SIMD*/
+        3 => array(
+            /* MMX instructions */
+            'movd','movq',
+            'paddb','paddw','paddd','paddsb','paddsw','paddusb','paddusw',
+            'psubb','psubw','psubd','psubsb','psubsw','psubusb','psubusw',
+            'pand','pandn','por','pxor',
+            'pcmpeqb','pcmpeqd','pcmpeqw','pcmpgtb','pcmpgtd','pcmpgtw',
+            'pmaddwd','pmulhw','pmullw',
+            'psllw','pslld','psllq','psrlw','psrld','psrlq','psraw','psrad',
+            'packuswb','packsswb','packssdw',
+            'punpcklbw','punpcklwd','punpckldq','punpckhbw','punpckhwd','punpckhdq',
+            'emms',
+            /* MMX+ instructions */
+            'pavgb','pavgw',
+            'pextrw','pinsrw','pmovmskb',
+            'pmaxsw','pmaxub','pminsw','pminub',
+            'pmulhuw','psadbw','pshufw',
+            'prefetchnta','prefetcht0','prefetcht1','prefetcht2',
+            'maskmovq','movntq','sfence',
+            /* EMMX instructions (only available on Cyrix MediaGXm) */
+            'paddsiw','psubsiw',
+            /*'pmulhrw',*/'pmachriw','pmulhriw', /* PMULHRW conflicts with the 3dnow! instruction of the same name */
+            'pmagw','pdistib','paveb',
+            'pmvzb','pmvnzb','pmvlzb','pmvgezb',
+            /* 3dnow! instructions! */
+            'pfacc','pfadd','pfsub','pfsubr','pfmul',
+            'pfcmpeq','pfcmpge','pfcmpgt',
+            'pfmax','pfmin',
+            'pfrcp','pfrcpit1','pfrcpit2','pfrsqit1','pfrsqrt',
+            'pi2fd','pf2id',
+            'pavgusb','pmulhrw',
+            'femms',
+            /* 3dnow!+ instructions */
+            'pfnacc','pfpnacc','pi2fw','pf2iw','pswapd',
+            /* 3dnow! Geode instructions */
+            'pfrsqrtv','pfrcpv',
+            /* 3dnow! Prefetch instructions */
+            'prefetch','prefetchw',
+            /* SSE instructions */
+            'addss','addps','subss','subps',
+            'mulss','mulps','divss','divps','sqrtss','sqrtps',
+            'rcpss','rcpps','rsqrtss','rsqrtps',
+            'maxss','maxps','minss','minps',
+            'cmpss','comiss','ucomiss','cmpps',
+            'cmpeqss','cmpltss','cmpless','cmpunordss','cmpneqss','cmpnltss','cmpnless','cmpordss',
+            'cmpeqps','cmpltps','cmpleps','cmpunordps','cmpneqps','cmpnltps','cmpnleps','cmpordps',
+            'andnps','andps','orps','xorps',
+            'cvtsi2ss','cvtss2si','cvttss2si',
+            'cvtpi2ps','cvtps2pi','cvttps2pi',
+            'movss','movlps','movhps','movlhps','movhlps','movaps','movups','movntps','movmskps',
+            'shufps','unpckhps','unpcklps',
+            'ldmxcsr','stmxcsr',
+            /* SSE2 instructions */
+            'addpd','addsd','subpd','subsd',
+            'mulsd','mulpd','divsd','divpd','sqrtsd','sqrtpd',
+            'maxsd','maxpd','minsd','minpd',
+            'cmpsd','comisd','ucomisd','cmppd',
+            'cmpeqsd','cmpltsd','cmplesd','cmpunordsd','cmpneqsd','cmpnltsd','cmpnlesd','cmpordsd',
+            'cmpeqpd','cmpltpd','cmplepd','cmpunordpd','cmpneqpd','cmpnltpd','cmpnlepd','cmpordpd',
+            'andnpd','andpd','orpd','xorpd',
+            'cvtsd2ss','cvtpd2ps','cvtss2sd','cvtps2pd',
+            'cvtdq2ps','cvtps2dq','cvttps2dq',
+            'cvtdq2pd','cvtpd2dq','cvttpd2dq',
+            'cvtsi2sd','cvtsd2si','cvttsd2si',
+            'cvtpi2pd','cvtpd2pi','cvttpd2pi',
+            'movsd','movlpd','movhpd','movapd','movupd','movntpd','movmskpd',
+            'shufpd','unpckhpd','unpcklpd',
+            'movnti','movdqa','movdqu','movntdq','maskmovdqu',
+            'movdq2q','movq2dq',
+            'paddq','psubq','pmuludq',
+            'pslldq','psrldq',
+            'punpcklqdq','punpckhqdq',
+            'pshufhw','pshuflw','pshufd',
+            'lfence','mfence',
+            /* SSE3 instructions */
+            'addsubps','addsubpd',
+            'haddps','haddpd','hsubps','hsubpd',
+            'movsldup','movshdup','movddup',
+            'lddqu',
+            /* SSSE3 instructions */
+            'psignb','psignw','psignd',
+            'pabsb','pabsw','pabsd',
+            'palignr','pshufb',
+            'pmulhrsw','pmaddubsw',
+            'phaddw','phaddd','phaddsw',
+            'phsubw','phsubd','phsubsw',
+            /* SSE4A instructions */
+            'extrq','insertq','movntsd','movntss',
+            /* SSE4.1 instructions */
+            'mpsadbw','phminposuw',
+            'pmuldq','pmulld',
+            'dpps','dppd',
+            'blendps','blendpd','blendvps','blendvpd','pblendvb','pblendw',
+            'pmaxsb','pmaxuw','pmaxsd','pmaxud','pminsb','pminuw','pminsd','pminud',
+            'roundps','roundss','roundpd','roundsd',
+            'insertps','pinsrb','pinsrd','pinsrq',
+            'extractps','pextrb','pextrd','pextrq',
+            'pmovsxbw','pmovsxbd','pmovsxbq','pmovsxwd','pmovsxwq','pmovsxdq',
+            'pmovzxbw','pmovzxbd','pmovzxbq','pmovzxwd','pmovzxwq','pmovzxdq',
+            'ptest',
+            'pcmpeqq',
+            'packusdw',
+            'movntdqa',
+            /* SSE4.2 instructions */
+            'pcmpgtq',
+            'pcmpestri','pcmpestrm','pcmpistri','pcmpistrm',
+            /* AES instructions */
+            'aesenc','aesenclast','aesdec','aesdeclast','aeskeygenassist','aesimc',
+            /* VIA Padlock instructions */
+            'xcryptcbc','xcryptcfb','xcryptctr','xcryptecb','xcryptofb',
+            'xsha1','xsha256','montmul','xstore',
+            /* AVX instructions */
+            'vaddss','vaddps','vaddsd','vaddpd','vsubss','vsubps','vsubsd','vsubpd',
+            'vaddsubps','vaddsubpd',
+            'vhaddps','vhaddpd','vhsubps','vhsubpd',
+            'vmulss','vmulps','vmulsd','vmulpd',
+            'vmaxss','vmaxps','vmaxsd','vmaxpd','vminss','vminps','vminsd','vminpd',
+            'vandps','vandpd','vandnps','vandnpd','vorps','vorpd','vxorps','vxorpd',
+            'vblendps','vblendpd','vblendvps','vblendvpd',
+            'vcmpss','vcomiss','vucomiss','vcmpsd','vcomisd','vucomisd','vcmpps','vcmppd',
+            'vcmpeqss','vcmpltss','vcmpless','vcmpunordss','vcmpneqss','vcmpnltss','vcmpnless','vcmpordss',
+            'vcmpeq_uqss','vcmpngess','vcmpngtss','vcmpfalsess','vcmpneq_oqss','vcmpgess','vcmpgtss','vcmptruess',
+            'vcmpeq_osss','vcmplt_oqss','vcmple_oqss','vcmpunord_sss','vcmpneq_usss','vcmpnlt_uqss','vcmpnle_uqss','vcmpord_sss',
+            'vcmpeq_usss','vcmpnge_uqss','vcmpngt_uqss','vcmpfalse_osss','vcmpneq_osss','vcmpge_oqss','vcmpgt_oqss','vcmptrue_usss',
+            'vcmpeqps','vcmpltps','vcmpleps','vcmpunordps','vcmpneqps','vcmpnltps','vcmpnleps','vcmpordps',
+            'vcmpeq_uqps','vcmpngeps','vcmpngtps','vcmpfalseps','vcmpneq_oqps','vcmpgeps','vcmpgtps','vcmptrueps',
+            'vcmpeq_osps','vcmplt_oqps','vcmple_oqps','vcmpunord_sps','vcmpneq_usps','vcmpnlt_uqps','vcmpnle_uqps','vcmpord_sps',
+            'vcmpeq_usps','vcmpnge_uqps','vcmpngt_uqps','vcmpfalse_osps','vcmpneq_osps','vcmpge_oqps','vcmpgt_oqps','vcmptrue_usps',
+            'vcmpeqsd','vcmpltsd','vcmplesd','vcmpunordsd','vcmpneqsd','vcmpnltsd','vcmpnlesd','vcmpordsd',
+            'vcmpeq_uqsd','vcmpngesd','vcmpngtsd','vcmpfalsesd','vcmpneq_oqsd','vcmpgesd','vcmpgtsd','vcmptruesd',
+            'vcmpeq_ossd','vcmplt_oqsd','vcmple_oqsd','vcmpunord_ssd','vcmpneq_ussd','vcmpnlt_uqsd','vcmpnle_uqsd','vcmpord_ssd',
+            'vcmpeq_ussd','vcmpnge_uqsd','vcmpngt_uqsd','vcmpfalse_ossd','vcmpneq_ossd','vcmpge_oqsd','vcmpgt_oqsd','vcmptrue_ussd',
+            'vcmpeqpd','vcmpltpd','vcmplepd','vcmpunordpd','vcmpneqpd','vcmpnltpd','vcmpnlepd','vcmpordpd',
+            'vcmpeq_uqpd','vcmpngepd','vcmpngtpd','vcmpfalsepd','vcmpneq_oqpd','vcmpgepd','vcmpgtpd','vcmptruepd',
+            'vcmpeq_ospd','vcmplt_oqpd','vcmple_oqpd','vcmpunord_spd','vcmpneq_uspd','vcmpnlt_uqpd','vcmpnle_uqpd','vcmpord_spd',
+            'vcmpeq_uspd','vcmpnge_uqpd','vcmpngt_uqpd','vcmpfalse_ospd','vcmpneq_ospd','vcmpge_oqpd','vcmpgt_oqpd','vcmptrue_uspd',
+            'vcvtsd2ss','vcvtpd2ps','vcvtss2sd','vcvtps2pd',
+            'vcvtsi2ss','vcvtss2si','vcvttss2si',
+            'vcvtpi2ps','vcvtps2pi','vcvttps2pi',
+            'vcvtdq2ps','vcvtps2dq','vcvttps2dq',
+            'vcvtdq2pd','vcvtpd2dq','vcvttpd2dq',
+            'vcvtsi2sd','vcvtsd2si','vcvttsd2si',
+            'vcvtpi2pd','vcvtpd2pi','vcvttpd2pi',
+            'vdivss','vdivps','vdivsd','vdivpd','vsqrtss','vsqrtps','vsqrtsd','vsqrtpd',
+            'vdpps','vdppd',
+            'vmaskmovps','vmaskmovpd',
+            'vmovss','vmovsd','vmovaps','vmovapd','vmovups','vmovupd','vmovntps','vmovntpd',
+            'vmovhlps','vmovlhps','vmovlps','vmovlpd','vmovhps','vmovhpd',
+            'vmovsldup','vmovshdup','vmovddup',
+            'vmovmskps','vmovmskpd',
+            'vroundss','vroundps','vroundsd','vroundpd',
+            'vrcpss','vrcpps','vrsqrtss','vrsqrtps',
+            'vunpcklps','vunpckhps','vunpcklpd','vunpckhpd',
+            'vbroadcastss','vbroadcastsd','vbroadcastf128',
+            'vextractps','vinsertps','vextractf128','vinsertf128',
+            'vshufps','vshufpd','vpermilps','vpermilpd','vperm2f128',
+            'vtestps','vtestpd',
+            'vpaddb','vpaddusb','vpaddsb','vpaddw','vpaddusw','vpaddsw','vpaddd','vpaddq',
+            'vpsubb','vpsubusb','vpsubsb','vpsubw','vpsubusw','vpsubsw','vpsubd','vpsubq',
+            'vphaddw','vphaddsw','vphaddd','vphsubw','vphsubsw','vphsubd',
+            'vpsllw','vpslld','vpsllq','vpsrlw','vpsrld','vpsrlq','vpsraw','vpsrad',
+            'vpand','vpandn','vpor','vpxor',
+            'vpblendwb','vpblendw',
+            'vpsignb','vpsignw','vpsignd',
+            'vpavgb','vpavgw',
+            'vpabsb','vpabsw','vpabsd',
+            'vmovd','vmovq','vmovdqa','vmovdqu','vlddqu','vmovntdq','vmovntdqa','vmaskmovdqu',
+            'vpmovsxbw','vpmovsxbd','vpmovsxbq','vpmovsxwd','vpmovsxwq','vpmovsxdq',
+            'vpmovzxbw','vpmovzxbd','vpmovzxbq','vpmovzxwd','vpmovzxwq','vpmovzxdq',
+            'vpackuswb','vpacksswb','vpackusdw','vpackssdw',
+            'vpcmpeqb','vpcmpeqw','vpcmpeqd','vpcmpeqq','vpcmpgtb','vpcmpgtw','vpcmpgtd','vpcmpgtq',
+            'vpmaddubsw','vpmaddwd',
+            'vpmullw','vpmulhuw','vpmulhw','vpmulhrsw','vpmulld','vpmuludq','vpmuldq',
+            'vpmaxub','vpmaxsb','vpmaxuw','vpmaxsw','vpmaxud','vpmaxsd',
+            'vpminub','vpminsb','vpminuw','vpminsw','vpminud','vpminsd',
+            'vpmovmskb','vptest',
+            'vpunpcklbw','vpunpcklwd','vpunpckldq','vpunpcklqdq',
+            'vpunpckhbw','vpunpckhwd','vpunpckhdq','vpunpckhqdq',
+            'vpslldq','vpsrldq','vpalignr',
+            'vpshufb','vpshuflw','vpshufhw','vpshufd',
+            'vpextrb','vpextrw','vpextrd','vpextrq','vpinsrb','vpinsrw','vpinsrd','vpinsrq',
+            'vpsadbw','vmpsadbw','vphminposuw',
+            'vpcmpestri','vpcmpestrm','vpcmpistri','vpcmpistrm',
+            'vpclmulqdq','vaesenc','vaesenclast','vaesdec','vaesdeclast','vaeskeygenassist','vaesimc',
+            'vldmxcsr','vstmxcsr','vzeroall','vzeroupper',
+            /* AVX2 instructions */
+            'vbroadcasti128','vpbroadcastb','vpbroadcastw','vpbroadcastd','vpbroadcastq',
+            'vpblendd',
+            'vpermd','vpermq','vperm2i128',
+            'vextracti128','vinserti128',
+            'vpmaskmovd','vpmaskmovq',
+            'vpsllvd','vpsllvq','vpsravd','vpsrlvd',
+            'vpgatherdd','vpgatherqd','vgatherdq','vgatherqq',
+            'vpermps','vpermpd',
+            'vgatherdpd','vgatherqpd','vgatherdps','vgatherqps',
+            /* XOP instructions */
+            'vfrczss','vfrczps','vfrczsd','vfrczpd',
+            'vpermil2ps','vperlil2pd',
+            'vpcomub','vpcomb','vpcomuw','vpcomw','vpcomud','vpcomd','vpcomuq','vpcomq',
+            'vphaddubw','vphaddbw','vphaddubd','vphaddbd','vphaddubq','vphaddbq',
+            'vphadduwd','vphaddwd','vphadduwq','vphaddwq','vphaddudq','vphadddq',
+            'vphsubbw','vphsubwd','vphsubdq',
+            'vpmacsdd','vpmacssdd','vpmacsdql','vpmacssdql','vpmacsdqh','vpmacssdqh',
+            'vpmacsww','vpmacssww','vpmacswd','vpmacsswd',
+            'vpmadcswd','vpmadcsswd',
+            'vpcmov','vpperm',
+            'vprotb','vprotw','vprotd','vprotq',
+            'vpshab','vpshaw','vpshad','vpshaq',
+            'vpshlb','vpshlw','vpshld','vpshlq',
+            /* CVT16 instructions */
+            'vcvtph2ps','vcvtps2ph',
+            /* FMA4 instructions */
+            'vfmaddss','vfmaddps','vfmaddsd','vfmaddpd',
+            'vfmsubss','vfmsubps','vfmsubsd','vfmsubpd',
+            'vnfmaddss','vnfmaddps','vnfmaddsd','vnfmaddpd',
+            'vnfmsubss','vnfmsubps','vnfmsubsd','vnfmsubpd',
+            'vfmaddsubps','vfmaddsubpd','vfmsubaddps','vfmsubaddpd',
+            /* FMA3 instructions */
+            'vfmadd132ss','vfmadd213ss','vfmadd231ss',
+            'vfmadd132ps','vfmadd213ps','vfmadd231ps',
+            'vfmadd132sd','vfmadd213sd','vfmadd231sd',
+            'vfmadd132pd','vfmadd213pd','vfmadd231pd',
+            'vfmaddsub132ps','vfmaddsub213ps','vfmaddsub231ps',
+            'vfmaddsub132pd','vfmaddsub213pd','vfmaddsub231pd',
+            'vfmsubadd132ps','vfmsubadd213ps','vfmsubadd231ps',
+            'vfmsubadd132pd','vfmsubadd213pd','vfmsubadd231pd',
+            'vfmsub132ss','vfmsub213ss','vfmsub231ss',
+            'vfmsub132ps','vfmsub213ps','vfmsub231ps',
+            'vfmsub132sd','vfmsub213sd','vfmsub231sd',
+            'vfmsub132pd','vfmsub213pd','vfmsub231pd',
+            'vfnmadd132ss','vfnmadd213ss','vfnmadd231ss',
+            'vfnmadd132ps','vfnmadd213ps','vfnmadd231ps',
+            'vfnmadd132sd','vfnmadd213sd','vfnmadd231sd',
+            'vfnmadd132pd','vfnmadd213pd','vfnmadd231pd',
+            'vfnmsub132ss','vfnmsub213ss','vfnmsub231ss',
+            'vfnmsub132ps','vfnmsub213ps','vfnmsub231ps',
+            'vfnmsub132sd','vfnmsub213sd','vfnmsub231sd',
+            'vfnmsub132pd','vfnmsub213pd','vfnmsub231pd'
+            ),
+        /*registers*/
+        4 => array(
+            /* General-Purpose Registers */
+            'al','ah','bl','bh','cl','ch','dl','dh','sil','dil','bpl','spl',
+            'r8b','r9b','r10b','r11b','r12b','r13b','r14b','r15b',
+            'ax','bx','cx','dx','si','di','bp','sp',
+            'r8w','r9w','r10w','r11w','r12w','r13w','r14w','r15w',
+            'eax','ebx','ecx','edx','esi','edi','ebp','esp',
+            'r8d','r9d','r10d','r11d','r12d','r13d','r14d','r15d',
+            'rax','rcx','rdx','rbx','rsp','rbp','rsi','rdi',
+            'r8','r9','r10','r11','r12','r13','r14','r15',
+            /* Debug Registers */
+            'dr0','dr1','dr2','dr3','dr6','dr7',
+            /* Control Registers */
+            'cr0','cr2','cr3','cr4','cr8',
+            /* Test Registers (Supported on Intel 486 only) */
+            'tr3','tr4','tr5','tr6','tr7',
+            /* Segment Registers */
+            'cs','ds','es','fs','gs','ss',
+            /* FPU Registers */
+            'st','st0','st1','st2','st3','st4','st5','st6','st7',
+            /* MMX Registers */
+            'mm0','mm1','mm2','mm3','mm4','mm5','mm6','mm7',
+            /* SSE Registers */
+            'xmm0','xmm1','xmm2','xmm3','xmm4','xmm5','xmm6','xmm7',
+            'xmm8','xmm9','xmm10','xmm11','xmm12','xmm13','xmm14','xmm15',
+            /* AVX Registers */
+            'ymm0','ymm1','ymm2','ymm3','ymm4','ymm5','ymm6','ymm7',
+            'ymm8','ymm9','ymm10','ymm11','ymm12','ymm13','ymm14','ymm15'
+            ),
+        /*Directive*/
+        5 => array(
+            'db','dw','dd','dq','dt','do','dy',
+            'resb','resw','resd','resq','rest','reso','resy','incbin','equ','times','safeseh',
+            '__utf16__','__utf32__',
+            'default','cpu','float','start','imagebase','osabi',
+            '..start','..imagebase','..gotpc','..gotoff','..gottpoff','..got','..plt','..sym','..tlsie',
+            'section','segment','__sect__','group','absolute',
+            '.bss','.comment','.data','.lbss','.ldata','.lrodata','.rdata','.rodata','.tbss','.tdata','.text',
+            'alloc','bss','code','exec','data','noalloc','nobits','noexec','nowrite','progbits','rdata','tls','write',
+            'private','public','common','stack','overlay','class',
+            'extern','global','import','export',
+            '%define','%idefine','%xdefine','%ixdefine','%assign','%undef',
+            '%defstr','%idefstr','%deftok','%ideftok',
+            '%strcat','%strlen','%substr',
+            '%macro','%imacro','%rmacro','%exitmacro','%endmacro','%unmacro',
+            '%if','%ifn','%elif','%elifn','%else','%endif',
+            '%ifdef','%ifndef','%elifdef','%elifndef',
+            '%ifmacro','%ifnmacro','%elifmacro','%elifnmacro',
+            '%ifctx','%ifnctx','%elifctx','%elifnctx',
+            '%ifidn','%ifnidn','%elifidn','%elifnidn',
+            '%ifidni','%ifnidni','%elifidni','%elifnidni',
+            '%ifid','%ifnid','%elifid','%elifnid',
+            '%ifnum','%ifnnum','%elifnum','%elifnnum',
+            '%ifstr','%ifnstr','%elifstr','%elifnstr',
+            '%iftoken','%ifntoken','%eliftoken','%elifntoken',
+            '%ifempty','%ifnempty','%elifempty','%elifnempty',
+            '%ifenv','%ifnenv','%elifenv','%elifnenv',
+            '%rep','%exitrep','%endrep',
+            '%while','%exitwhile','%endwhile',
+            '%include','%pathsearch','%depend','%use',
+            '%push','%pop','%repl','%arg','%local','%stacksize','flat','flat64','large','small',
+            '%error','%warning','%fatal',
+            '%00','.nolist','%rotate','%line','%!','%final','%clear',
+            'struc','endstruc','istruc','at','iend',
+            'align','alignb','sectalign',
+            'bits','use16','use32','use64',
+            '__nasm_major__','__nasm_minor__','__nasm_subminor__','___nasm_patchlevel__',
+            '__nasm_version_id__','__nasm_ver__',
+            '__file__','__line__','__pass__','__bits__','__output_format__',
+            '__date__','__time__','__date_num__','__time_num__','__posix_time__',
+            '__utc_date__','__utc_time__','__utc_date_num__','__utc_time_num__',
+            '__float_daz__','__float_round__','__float__',
+            /* Keywords from standard packages */
+            '__use_altreg__',
+            '__use_smartalign__','smartalign','__alignmode__',
+            '__use_fp__','__infinity__','__nan__','__qnan__','__snan__',
+            '__float8__','__float16__','__float32__','__float64__','__float80m__','__float80e__','__float128l__','__float128h__'
+            ),
+        /*Operands*/
+        6 => array(
+            'a16','a32','a64','o16','o32','o64','strict',
+            'byte','word','dword','qword','tword','oword','yword','nosplit',
+            '%0','%1','%2','%3','%4','%5','%6','%7','%8','%9',
+            'abs','rel',
+            'seg','wrt'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+                '[', ']', '(', ')',
+                '+', '-', '*', '/', '%',
+                '.', ',', ';', ':'
+            ),
+        2 => array(
+                '$','$$','%+','%?','%??'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f; font-weight: bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #b00040;',
+            4 => 'color: #46aa03; font-weight: bold;',
+            5 => 'color: #0000ff; font-weight: bold;',
+            6 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #adadad; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;',
+            2 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_BIN_PREFIX_PERCENT |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX |
+        GESHI_NUMBER_OCT_SUFFIX |
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/asp.php b/vendor/easybook/geshi/geshi/asp.php
new file mode 100755
index 000000000..0096a169c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/asp.php
@@ -0,0 +1,164 @@
+<?php
+/*************************************************************************************
+ * asp.php
+ * --------
+ * Author: Amit Gupta (http://blog.igeek.info/)
+ * Copyright: (c) 2004 Amit Gupta (http://blog.igeek.info/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/13
+ *
+ * ASP language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/30 (1.0.3)
+ *   -  Strings only delimited by ", comments by '
+ * 2004/11/27 (1.0.2)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/13 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Include all the functions, keywords etc that I have missed
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ASP',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'include', 'file', 'Const', 'Dim', 'Option', 'Explicit', 'Implicit', 'Set', 'Select', 'ReDim', 'Preserve',
+            'ByVal', 'ByRef', 'End', 'Private', 'Public', 'If', 'Then', 'Else', 'ElseIf', 'Case', 'With', 'NOT',
+            'While', 'Wend', 'For', 'Loop', 'Do', 'Request', 'Response', 'Server', 'ADODB', 'Session', 'Application',
+            'Each', 'In', 'Get', 'Next', 'INT', 'CINT', 'CBOOL', 'CDATE', 'CBYTE', 'CCUR', 'CDBL', 'CLNG', 'CSNG',
+            'CSTR', 'Fix', 'Is', 'Sgn', 'String', 'Boolean', 'Currency', 'Me', 'Single', 'Long', 'Integer', 'Byte',
+            'Variant', 'Double', 'To', 'Let', 'Xor', 'Resume', 'On', 'Error', 'Imp', 'GoTo', 'Call', 'Global'
+            ),
+        2 => array(
+            'Null', 'Nothing', 'And',
+            'False',
+            'True', 'var', 'Or', 'BOF', 'EOF', 'xor',
+            'Function', 'Class', 'New', 'Sub'
+            ),
+        3 => array(
+            'CreateObject', 'Write', 'Redirect', 'Cookies', 'BinaryRead', 'ClientCertificate', 'Form', 'QueryString',
+            'ServerVariables', 'TotalBytes', 'AddHeader', 'AppendToLog', 'BinaryWrite', 'Buffer', 'CacheControl',
+            'Charset', 'Clear', 'ContentType', 'End()', 'Expires', 'ExpiresAbsolute', 'Flush()', 'IsClientConnected',
+            'PICS', 'Status', 'Connection', 'Recordset', 'Execute', 'Abandon', 'Lock', 'UnLock', 'Command', 'Fields',
+            'Properties', 'Property', 'Send', 'Replace', 'InStr', 'TRIM', 'NOW', 'Day', 'Month', 'Hour', 'Minute', 'Second',
+            'Year', 'MonthName', 'LCase', 'UCase', 'Abs', 'Array', 'As', 'LEN', 'MoveFirst', 'MoveLast', 'MovePrevious',
+            'MoveNext', 'LBound', 'UBound', 'Transfer', 'Open', 'Close', 'MapPath', 'FileExists', 'OpenTextFile', 'ReadAll'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
+            ';', ':', '?', '='),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990099; font-weight: bold;',
+            2 => 'color: #0000ff; font-weight: bold;',
+            3 => 'color: #330066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            2 => 'color: #ff6600;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #cc0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #9900cc;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600; font-weight: bold;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            ),
+        1 => array(
+            '<script language="vbscript" runat="server">' => '</script>'
+            ),
+        2 => array(
+            '<script language="javascript" runat="server">' => '</script>'
+            ),
+        3 => "/(?P<start><%=?)(?:\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(?P<end>%>|\Z)/sm"
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/asymptote.php b/vendor/easybook/geshi/geshi/asymptote.php
new file mode 100755
index 000000000..295cb0a56
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/asymptote.php
@@ -0,0 +1,192 @@
+<?php
+/*************************************************************************************
+ * asymptote.php
+ * -------------
+ * Author: Manuel Yguel (manuel.yguel.robotics@gmail.com)
+ * Copyright: (c) 2012 Manuel Yguel (http://manuelyguel.eu)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/05/24
+ *
+ * asymptote language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/05/24 (1.0.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2012/05/24)
+ * -------------------------
+ * * Split to several files - php4, php5 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'asymptote',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'and','controls','tension','atleast','curl','if','else','while','for','do','return','break','continue','struct','typedef','new','access','import','unravel','from','include','quote','static','public','private','restricted','this','explicit','true','false','null','cycle','newframe','operator'
+            ),
+        2 => array(
+            'Braid','FitResult','Label','Legend','Segment','Solution','TreeNode','abscissa','arc','arrowhead','binarytree','binarytreeNode','block','bool','bool3','bounds','bqe','circle','conic','coord','coordsys','cputime','ellipse','file','filltype','frame','grid3','guide','horner','hsv','hyperbola','indexedTransform','int','inversion','key','light','line','linefit','marginT','marker','mass','object','pair','parabola','path','path3','pen','picture','point','position','projection','real','revolution','scaleT','scientific','segment','side','slice','solution','splitface','string','surface','tensionSpecifier','ticklocate','ticksgridT','tickvalues','transform','transformation','tree','triangle','trilinear','triple','vector','vertex','void'),
+        3 => array(
+            'AND','Arc','ArcArrow','ArcArrows','Arrow','Arrows','Automatic','AvantGarde','BBox','BWRainbow','BWRainbow2','Bar','Bars','BeginArcArrow','BeginArrow','BeginBar','BeginDotMargin','BeginMargin','BeginPenMargin','Blank','Bookman','Bottom','BottomTop','Bounds','Break','Broken','BrokenLog','CLZ','CTZ','Ceil','Circle','CircleBarIntervalMarker','Cos','Courier','CrossIntervalMarker','DOSendl','DOSnewl','DefaultFormat','DefaultLogFormat','Degrees','Dir','DotMargin','DotMargins','Dotted','Draw','Drawline','Embed','EndArcArrow','EndArrow','EndBar','EndDotMargin','EndMargin','EndPenMargin','Fill','FillDraw','Floor','Format','Full','Gaussian','Gaussrand','Gaussrandpair',
+            'Gradient','Grayscale','Helvetica','Hermite','HookHead','InOutTicks','InTicks','Jn','Label','Landscape','Left','LeftRight','LeftTicks','Legend','Linear','Link','Log','LogFormat','Margin','Margins','Mark','MidArcArrow','MidArrow','NOT','NewCenturySchoolBook','NoBox','NoMargin','NoModifier','NoTicks','NoTicks3','NoZero','NoZeroFormat','None','OR','OmitFormat','OmitTick','OmitTickInterval','OmitTickIntervals','OutTicks','Ox','Oy','Palatino','PaletteTicks','Pen','PenMargin','PenMargins','Pentype','Portrait','RadialShade','RadialShadeDraw','Rainbow','Range','Relative','Right','RightTicks','Rotate','Round','SQR','Scale','ScaleX','ScaleY','ScaleZ','Seascape','Segment','Shift','Sin','Slant','Spline','StickIntervalMarker','Straight','Symbol','Tan','TeXify','Ticks','Ticks3','TildeIntervalMarker','TimesRoman','Top','TrueMargin','UnFill','UpsideDown','Wheel','X','XEquals','XOR','XY','XYEquals','XYZero','XYgrid','XZEquals','XZZero','XZero','XZgrid','Y','YEquals','YXgrid','YZ','YZEquals','YZZero','YZero','YZgrid','Yn','Z','ZX','ZXgrid','ZYgrid','ZapfChancery','ZapfDingbats','_begingroup3','_cputime','_draw','_eval','_image','_labelpath','_projection','_strokepath','_texpath','aCos','aSin','aTan','abort','abs','accel','acos','acosh','acot','acsc','activatequote','add',
+            'addArrow','addMargins','addSaveFunction','addpenarc','addpenline','adjust','alias','align','all','altitude','angabscissa','angle','angpoint','animate','annotate','anticomplementary','antipedal','apply','approximate','arc','arcarrowsize','arccircle','arcdir','arcfromcenter','arcfromfocus','arclength','arcnodesnumber','arcpoint','arcsubtended','arcsubtendedcenter','arctime','arctopath','array','arrow','arrow2','arrowbase','arrowbasepoints','arrowsize','asec','asin','asinh','ask','assert','asy','asycode','asydir','asyfigure','asyfilecode','asyinclude','asywrite','atan','atan2','atanh','atbreakpoint','atexit','attach','attract','atupdate','autoformat','autoscale','autoscale3','axes','axes3','axialshade','axis','axiscoverage','azimuth','babel','background','bangles','bar','barmarksize','barsize','basealign','baseline','bbox','beep','begin','beginclip','begingroup','beginpoint','between','bevel','bezier','bezierP','bezierPP','bezierPPP','bezulate','bibliography','bibliographystyle','binarytree','binarytreeNode','binomial','binput','bins','bisector','bisectorpoint','bispline','blend','blockconnector','boutput','box','bqe','breakpoint','breakpoints','brick','buildRestoreDefaults','buildRestoreThunk','buildcycle','bulletcolor','byte','calculateScaling','canonical','canonicalcartesiansystem','cartesiansystem','case1','case2','case3','case4','cbrt','cd','ceil','center','centerToFocus',
+            'centroid','cevian','change2','changecoordsys','checkSegment','checkconditionlength','checker','checkincreasing','checklengths','checkposition','checktriangle','choose','circle','circlebarframe','circlemarkradius','circlenodesnumber','circumcenter','circumcircle','clamped','clear','clip','clipdraw','close','cmyk','code','colatitude','collect','collinear','color','colorless','colors','colorspace','comma','compassmark','complement','complementary','concat','concurrent','cone','conic','conicnodesnumber','conictype','conj','connect','connected','connectedindex','containmentTree','contains','contour','contour3','contouredges','controlSpecifier','convert','coordinates','coordsys','copy','copyPairOrTriple','cos','cosh','cot','countIntersections','cputime','crop','cropcode','cross',
+            'crossframe','crosshatch','crossmarksize','csc','cubicroots','curabscissa','curlSpecifier','curpoint','currentarrow','currentexitfunction','currentmomarrow','currentpolarconicroutine','curve','cut','cutafter','cutbefore','cyclic','cylinder','deactivatequote','debugger','deconstruct','defaultdir','defaultformat','defaultpen','defined','degenerate','degrees','delete','deletepreamble','determinant','diagonal','diamond','diffdiv','dir','dirSpecifier','dirtime','display','distance',
+            'divisors','do_overpaint','dot','dotframe','dotsize','downcase','draw','drawAll','drawDoubleLine','drawFermion','drawGhost','drawGluon','drawMomArrow','drawPRCcylinder','drawPRCdisk','drawPRCsphere','drawPRCtube','drawPhoton','drawScalar','drawVertex','drawVertexBox','drawVertexBoxO','drawVertexBoxX','drawVertexO','drawVertexOX','drawVertexTriangle','drawVertexTriangleO','drawVertexX','drawarrow','drawarrow2','drawline','drawpixel','drawtick','duplicate','elle','ellipse','ellipsenodesnumber','embed','embed3','empty','enclose','end','endScript','endclip','endgroup','endgroup3','endl','endpoint','endpoints','eof','eol','equation','equations','erase','erasestep','erf','erfc','error','errorbar','errorbars','eval','excenter','excircle','exit','exitXasyMode','exitfunction','exp','expfactors','expi','expm1','exradius','extend','extension','extouch','fabs','factorial','fermat','fft','fhorner','figure','file','filecode','fill','filldraw','filloutside','fillrule','filltype','find','finite','finiteDifferenceJacobian','firstcut','firstframe','fit','fit2','fixedscaling','floor','flush','fmdefaults','fmod','focusToCenter','font','fontcommand','fontsize','foot','format','frac','frequency','fromCenter','fromFocus','fspline','functionshade','gamma','generate_random_backtrace','generateticks','gergonne','getc','getint','getpair','getreal','getstring','gettriple','gluon','gouraudshade','graph','graphic','gray','grestore','grid','grid3','gsave','halfbox','hatch','hdiffdiv','hermite','hex','histogram','history','hline','hprojection',
+            'hsv','hyperbola','hyperbolanodesnumber','hyperlink','hypot','identity','image','incenter','incentral','incircle','increasing','incrementposition','indexedTransform','indexedfigure','initXasyMode','initdefaults','input','inradius','insert','inside','integrate','interactive','interior','interp','interpolate','intersect','intersection','intersectionpoint','intersectionpoints','intersections','intouch','inverse','inversion','invisible','is3D','isCCW','isDuplicate','isogonal','isogonalconjugate','isotomic','isotomicconjugate','isparabola','italic','item','jobname','key','kurtosis','kurtosisexcess','label','labelaxis','labelmargin','labelpath','labels','labeltick','labelx','labelx3','labely','labely3','labelz','labelz3','lastcut','latex','latitude','latticeshade','layer','layout','ldexp','leastsquares','legend','legenditem','length','lexorder','lift','light','limits','line','linear','linecap','lineinversion','linejoin','linemargin','lineskip','linetype','linewidth','link','list','lm_enorm','lm_evaluate_default','lm_lmdif','lm_lmpar','lm_minimize','lm_print_default','lm_print_quiet','lm_qrfac','lm_qrsolv','locale','locate',
+            'locatefile','location','log','log10','log1p','logaxiscoverage','longitude','lookup','makeNode','makedraw','makepen','map','margin','markangle','markangleradius','markanglespace','markarc','marker','markinterval','marknodes','markrightangle','markuniform','mass','masscenter','massformat','math','max','max3','maxAfterTransform','maxbezier','maxbound','maxcoords','maxlength','maxratio','maxtimes','mean','medial','median','midpoint','min','min3','minAfterTransform','minbezier','minbound','minipage','minratio','mintimes','miterlimit','mktemp','momArrowPath','momarrowsize','monotonic','multifigure','nativeformat','natural','needshipout','newl','newpage','newslide','newton','newtree','nextframe','nextnormal','nextpage','nib','nodabscissa','none','norm','normalvideo','notaknot','nowarn','numberpage','nurb','object','offset','onpath','opacity','opposite','orientation','origin','orthic','orthocentercenter','outformat','outline','outname','outprefix','output','overloadedMessage','overwrite','pack','pad','pairs','palette','parabola','parabolanodesnumber','parallel','parallelogram','partialsum','path','path3','pattern','pause','pdf','pedal','periodic','perp','perpendicular','perpendicularmark','phantom','phi1','phi2','phi3','photon','piecewisestraight','point','polar','polarconicroutine','polargraph','polygon','postcontrol','postscript','pow10','ppoint','prc','prc0','precision','precontrol','prepend','printBytecode','print_random_addresses','project','projection','purge','pwhermite','quadrant','quadraticroots','quantize','quarticroots','quotient','radialshade','radians','radicalcenter','radicalline','radius','rand','randompath','rd','readline','realmult','realquarticroots','rectangle','rectangular','rectify','reflect','relabscissa','relative','relativedistance','reldir','relpoint','reltime','remainder','remark','removeDuplicates','rename','replace','report','resetdefaultpen','restore','restoredefaults','reverse','reversevideo','rf','rfind','rgb','rgba','rgbint','rms',
+            'rotate','rotateO','rotation','round','roundbox','roundedpath','roundrectangle','same','samecoordsys','sameside','sample','save','savedefaults','saveline','scale','scale3','scaleO','scaleT','scaleless','scientific','search','searchindex','searchtree','sec','secondaryX','secondaryY','seconds','section','sector','seek','seekeof','segment','sequence','setcontour','setpens','sgn','sgnd','sharpangle','sharpdegrees','shift','shiftless','shipout','shipout3','show','side','simeq','simpson','sin','sinh','size','size3','skewness','skip','slant','sleep','slope','slopefield','solve','solveBVP','sort','sourceline','sphere','split','sqrt','square','srand','standardizecoordsys','startScript','stdev','step','stickframe','stickmarksize','stickmarkspace','stop','straight','straightness','string','stripdirectory','stripextension','stripfile','stripsuffix','strokepath','subdivide','subitem','subpath','substr','sum','surface','symmedial','symmedian','system',
+            'tab','tableau','tan','tangent','tangential','tangents','tanh','tell','tensionSpecifier','tensorshade','tex','texcolor','texify','texpath','texpreamble','texreset','texshipout','texsize','textpath','thick','thin','tick','tickMax','tickMax3','tickMin','tickMin3','ticklabelshift','ticklocate','tildeframe','tildemarksize','tile','tiling','time','times','title','titlepage','topbox','transform','transformation','transpose','trembleFuzz','triangle','triangleAbc','triangleabc','triangulate','tricoef','tridiagonal','trilinear','trim','truepoint','tube','uncycle','unfill','uniform','unique','unit','unitrand','unitsize','unityroot','unstraighten','upcase','updatefunction','uperiodic','upscale','uptodate','usepackage','usersetting','usetypescript','usleep','value','variance','variancebiased','vbox','vector','vectorfield','verbatim','view','vline','vperiodic','vprojection','warn','warning','windingnumber','write','xaxis','xaxis3','xaxis3At','xaxisAt','xequals','xinput','xlimits','xoutput','xpart','xscale','xscaleO','xtick','xtick3','xtrans','yaxis','yaxis3','yaxis3At','yaxisAt','yequals','ylimits','ypart','yscale','yscaleO','ytick','ytick3','ytrans','zaxis3','zaxis3At','zero','zero3','zlimits','zpart','ztick','ztick3','ztrans'
+            ),
+        4 => array(
+            'AliceBlue','Align','Allow','AntiqueWhite','Apricot','Aqua','Aquamarine','Aspect','Azure','BeginPoint','Beige','Bisque','Bittersweet','Black','BlanchedAlmond','Blue','BlueGreen','BlueViolet','Both','Break','BrickRed','Brown','BurlyWood','BurntOrange','CCW','CW','CadetBlue','CarnationPink','Center','Centered','Cerulean','Chartreuse','Chocolate','Coeff','Coral','CornflowerBlue','Cornsilk','Crimson','Crop','Cyan','Dandelion','DarkBlue','DarkCyan','DarkGoldenrod','DarkGray','DarkGreen','DarkKhaki','DarkMagenta','DarkOliveGreen','DarkOrange','DarkOrchid','DarkRed','DarkSalmon','DarkSeaGreen','DarkSlateBlue','DarkSlateGray','DarkTurquoise','DarkViolet','DeepPink','DeepSkyBlue','DefaultHead','DimGray','DodgerBlue','Dotted','Down','Draw','E','ENE','EPS','ESE','E_Euler','E_PC','E_RK2','E_RK3BS','Emerald','EndPoint','Euler','Fill','FillDraw','FireBrick','FloralWhite','ForestGreen','Fuchsia','Gainsboro','GhostWhite','Gold','Goldenrod','Gray','Green','GreenYellow','Honeydew','HookHead','Horizontal','HotPink','I','IgnoreAspect','IndianRed','Indigo','Ivory','JOIN_IN','JOIN_OUT','JungleGreen','Khaki','LM_DWARF','LM_MACHEP','LM_SQRT_DWARF','LM_SQRT_GIANT','LM_USERTOL','Label','Lavender','LavenderBlush','LawnGreen','Left','LeftJustified','LeftSide','LemonChiffon','LightBlue','LightCoral','LightCyan','LightGoldenrodYellow',
+            'LightGreen','LightGrey','LightPink','LightSalmon','LightSeaGreen','LightSkyBlue','LightSlateGray','LightSteelBlue','LightYellow','Lime','LimeGreen','Linear','Linen','Log','Logarithmic','Magenta','Mahogany','Mark','MarkFill','Maroon','Max','MediumAquamarine','MediumBlue','MediumOrchid','MediumPurple','MediumSeaGreen','MediumSlateBlue','MediumSpringGreen','MediumTurquoise','MediumVioletRed','Melon','MidPoint','MidnightBlue','Min','MintCream','MistyRose','Moccasin','Move','MoveQuiet','Mulberry','N','NE','NNE','NNW','NW','NavajoWhite','Navy','NavyBlue','NoAlign','NoCrop','NoFill','NoSide','OldLace','Olive','OliveDrab','OliveGreen','Orange','OrangeRed','Orchid','Ox','Oy','PC','PaleGoldenrod','PaleGreen','PaleTurquoise','PaleVioletRed','PapayaWhip','Peach','PeachPuff','Periwinkle','Peru','PineGreen','Pink','Plum','PowderBlue','ProcessBlue','Purple','RK2','RK3','RK3BS','RK4','RK5','RK5DP','RK5F','RawSienna','Red','RedOrange','RedViolet','Rhodamine','Right','RightJustified','RightSide','RosyBrown','RoyalBlue','RoyalPurple','RubineRed','S','SE','SSE','SSW','SW','SaddleBrown','Salmon','SandyBrown','SeaGreen','Seashell','Sepia','Sienna','Silver','SimpleHead','SkyBlue','SlateBlue','SlateGray','Snow','SpringGreen','SteelBlue','Suppress','SuppressQuiet','Tan','TeXHead','Teal','TealBlue','Thistle','Ticksize','Tomato',
+            'Turquoise','UnFill','Up','VERSION','Value','Vertical','Violet','VioletRed','W','WNW','WSW','Wheat','White','WhiteSmoke','WildStrawberry','XYAlign','YAlign','Yellow','YellowGreen','YellowOrange','addpenarc','addpenline','align','allowstepping','angularsystem','animationdelay','appendsuffix','arcarrowangle','arcarrowfactor','arrow2sizelimit','arrowangle','arrowbarb','arrowdir','arrowfactor','arrowhookfactor','arrowlength','arrowsizelimit','arrowtexfactor','authorpen','axis','axiscoverage','axislabelfactor','background','backgroundcolor','backgroundpen','barfactor','barmarksizefactor','basealign','baselinetemplate','beveljoin','bigvertexpen','bigvertexsize','black','blue','bm','bottom','bp','brown','bullet','byfoci','byvertices','camerafactor','chartreuse','circlemarkradiusfactor','circlenodesnumberfactor','circleprecision','circlescale','cm','codefile','codepen','codeskip','colorPen','coloredNodes','coloredSegments',
+            'conditionlength','conicnodesfactor','count','cputimeformat','crossmarksizefactor','currentcoordsys','currentlight','currentpatterns','currentpen','currentpicture','currentposition','currentprojection','curvilinearsystem','cuttings','cyan','darkblue','darkbrown','darkcyan','darkgray','darkgreen','darkgrey','darkmagenta','darkolive','darkred','dashdotted','dashed','datepen','dateskip','debuggerlines','debugging','deepblue','deepcyan','deepgray','deepgreen','deepgrey','deepmagenta','deepred','default','defaultControl','defaultS','defaultbackpen','defaultcoordsys','defaultexcursion','defaultfilename','defaultformat','defaultmassformat','defaultpen','diagnostics','differentlengths','dot','dotfactor','dotframe','dotted','doublelinepen','doublelinespacing','down','duplicateFuzz','edge','ellipsenodesnumberfactor','eps','epsgeo','epsilon','evenodd','expansionfactor','extendcap','exterior','fermionpen','figureborder','figuremattpen','file3','firstnode','firststep','foregroundcolor','fuchsia','fuzz','gapfactor','ghostpen','gluonamplitude','gluonpen','gluonratio','gray','green','grey','hatchepsilon','havepagenumber','heavyblue','heavycyan','heavygray','heavygreen','heavygrey','heavymagenta','heavyred','hline','hwratio','hyperbola','hyperbolanodesnumberfactor','identity4','ignore','inXasyMode','inch','inches','includegraphicscommand','inf','infinity','institutionpen','intMax','intMin','interior','invert','invisible','itempen','itemskip','itemstep','labelmargin','landscape','lastnode','left','legendhskip','legendlinelength',
+            'legendmargin','legendmarkersize','legendmaxrelativewidth','legendvskip','lightblue','lightcyan','lightgray','lightgreen','lightgrey','lightmagenta','lightolive','lightred','lightyellow','line','linemargin','lm_infmsg','lm_shortmsg','longdashdotted','longdashed','magenta','magneticRadius','mantissaBits','markangleradius','markangleradiusfactor','markanglespace','markanglespacefactor','mediumblue','mediumcyan','mediumgray','mediumgreen','mediumgrey','mediummagenta','mediumred','mediumyellow','middle','minDistDefault','minblockheight','minblockwidth','mincirclediameter','minipagemargin','minipagewidth','minvertexangle','miterjoin','mm','momarrowfactor','momarrowlength','momarrowmargin','momarrowoffset','momarrowpen','monoPen','morepoints','nCircle','newbulletcolor','ngraph','nil','nmesh','nobasealign','nodeMarginDefault','nodesystem','nomarker','nopoint','noprimary','nullpath','nullpen','numarray','ocgindex','oldbulletcolor','olive','orange','origin','overpaint','page','pageheight','pagemargin','pagenumberalign','pagenumberpen','pagenumberposition','pagewidth','paleblue','palecyan','palegray','palegreen','palegrey',
+            'palemagenta','palered','paleyellow','parabolanodesnumberfactor','perpfactor','phi','photonamplitude','photonpen','photonratio','pi','pink','plain','plain_bounds','plain_scaling','plus','preamblenodes','pt','purple','r3','r4a','r4b','randMax','realDigits','realEpsilon','realMax','realMin','red','relativesystem','reverse','right','roundcap','roundjoin','royalblue','salmon','saveFunctions','scalarpen','sequencereal','settings','shipped','signedtrailingzero','solid','springgreen','sqrtEpsilon','squarecap','squarepen','startposition','stdin','stdout','stepfactor','stepfraction','steppagenumberpen','stepping','stickframe','stickmarksizefactor','stickmarkspacefactor','swap','textpen','ticksize','tildeframe','tildemarksizefactor','tinv','titlealign','titlepagepen','titlepageposition','titlepen','titleskip','top','trailingzero','treeLevelStep','treeMinNodeWidth','treeNodeStep','trembleAngle','trembleFrequency','trembleRandom','undefined','unitcircle','unitsquare','up','urlpen','urlskip','version','vertexpen','vertexsize','viewportmargin','viewportsize','vline','white','wye','xformStack','yellow','ylabelwidth','zerotickfuzz','zerowinding'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '{', '}', '[', ']'
+            ),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/', '%'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';'),
+        5 => array('..')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000;',
+            4 => 'color: #009900; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;',
+            5 => 'color: #009080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/autoconf.php b/vendor/easybook/geshi/geshi/autoconf.php
new file mode 100755
index 000000000..7a0f1ee9c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/autoconf.php
@@ -0,0 +1,512 @@
+<?php
+/*************************************************************************************
+ * autoconf.php
+ * -----
+ * Author: Mihai Vasilian (grayasm@gmail.com)
+ * Copyright: (c) 2010 Mihai Vasilian
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/01/25
+ *
+ * autoconf language file for GeSHi.
+ *
+ ***********************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Autoconf',
+    'COMMENT_SINGLE' => array(2 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Single Line comment started by dnl
+        3 => '/(?<!\$)\bdnl\b.*$/m',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'AC_ACT_IFELSE',
+            'AC_AIX',
+            'AC_ALLOCA',
+            'AC_ARG_ARRAY',
+            'AC_ARG_ENABLE',
+            'AC_ARG_PROGRAM',
+            'AC_ARG_VAR',
+            'AC_ARG_WITH',
+            'AC_AUTOCONF_VERSION',
+            'AC_BEFORE',
+            'AC_C_BACKSLASH_A',
+            'AC_C_BIGENDIAN',
+            'AC_C_CHAR_UNSIGNED',
+            'AC_C_CONST',
+            'AC_C_CROSS',
+            'AC_C_FLEXIBLE_ARRAY_MEMBER',
+            'AC_C_INLINE',
+            'AC_C_LONG_DOUBLE',
+            'AC_C_PROTOTYPES',
+            'AC_C_RESTRICT',
+            'AC_C_STRINGIZE',
+            'AC_C_TYPEOF',
+            'AC_C_VARARRAYS',
+            'AC_C_VOLATILE',
+            'AC_CACHE_CHECK',
+            'AC_CACHE_LOAD',
+            'AC_CACHE_SAVE',
+            'AC_CACHE_VAL',
+            'AC_CANONICAL_BUILD',
+            'AC_CANONICAL_HOST',
+            'AC_CANONICAL_SYSTEM',
+            'AC_CANONICAL_TARGET',
+            'AC_CHAR_UNSIGNED',
+            'AC_CHECK_ALIGNOF',
+            'AC_CHECK_DECL',
+            'AC_CHECK_DECLS',
+            'AC_CHECK_DECLS_ONCE',
+            'AC_CHECK_FILE',
+            'AC_CHECK_FILES',
+            'AC_CHECK_FUNC',
+            'AC_CHECK_FUNCS',
+            'AC_CHECK_FUNCS_ONCE',
+            'AC_CHECK_HEADER',
+            'AC_CHECK_HEADERS',
+            'AC_CHECK_HEADERS_ONCE',
+            'AC_CHECK_LIB',
+            'AC_CHECK_MEMBER',
+            'AC_CHECK_MEMBERS',
+            'AC_CHECK_PROG',
+            'AC_CHECK_PROGS',
+            'AC_CHECK_SIZEOF',
+            'AC_CHECK_TARGET_TOOL',
+            'AC_CHECK_TARGET_TOOLS',
+            'AC_CHECK_TOOL',
+            'AC_CHECK_TOOLS',
+            'AC_CHECK_TYPE',
+            'AC_CHECK_TYPES',
+            'AC_CHECKING',
+            'AC_COMPILE_CHECK',
+            'AC_COMPILE_IFELSE',
+            'AC_COMPUTE_INT',
+            'AC_CONFIG_AUX_DIR',
+            'AC_CONFIG_COMMANDS',
+            'AC_CONFIG_COMMANDS_POST',
+            'AC_CONFIG_COMMANDS_PRE',
+            'AC_CONFIG_FILES',
+            'AC_CONFIG_HEADERS',
+            'AC_CONFIG_ITEMS',
+            'AC_CONFIG_LIBOBJ_DIR',
+            'AC_CONFIG_LINKS',
+            'AC_CONFIG_MACRO_DIR',
+            'AC_CONFIG_SRCDIR',
+            'AC_CONFIG_SUBDIRS',
+            'AC_CONFIG_TESTDIR',
+            'AC_CONST',
+            'AC_COPYRIGHT',
+            'AC_CROSS_CHECK',
+            'AC_CYGWIN',
+            'AC_DATAROOTDIR_CHECKED',
+            'AC_DECL_SYS_SIGLIST',
+            'AC_DECL_YYTEXT',
+            'AC_DEFINE',
+            'AC_DEFINE_UNQUOTED',
+            'AC_DEFUN',
+            'AC_DEFUN_ONCE',
+            'AC_DIAGNOSE',
+            'AC_DIR_HEADER',
+            'AC_DISABLE_OPTION_CHECKING',
+            'AC_DYNIX_SEQ',
+            'AC_EGREP_CPP',
+            'AC_EGREP_HEADER',
+            'AC_EMXOS2',
+            'AC_ENABLE',
+            'AC_ERLANG_CHECK_LIB',
+            'AC_ERLANG_NEED_ERL',
+            'AC_ERLANG_NEED_ERLC',
+            'AC_ERLANG_PATH_ERL',
+            'AC_ERLANG_PATH_ERLC',
+            'AC_ERLANG_SUBST_ERTS_VER',
+            'AC_ERLANG_SUBST_INSTALL_LIB_DIR',
+            'AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR',
+            'AC_ERLANG_SUBST_LIB_DIR',
+            'AC_ERLANG_SUBST_ROOT_DIR',
+            'AC_ERROR',
+            'AC_EXEEXT',
+            'AC_F77_DUMMY_MAIN',
+            'AC_F77_FUNC',
+            'AC_F77_LIBRARY_LDFLAGS',
+            'AC_F77_MAIN',
+            'AC_F77_WRAPPERS',
+            'AC_FATAL',
+            'AC_FC_FREEFORM',
+            'AC_FC_FUNC',
+            'AC_FC_LIBRARY_LDFLAGS',
+            'AC_FC_MAIN',
+            'AC_FC_SRCEXT',
+            'AC_FC_WRAPPERS',
+            'AC_FIND_X',
+            'AC_FIND_XTRA',
+            'AC_FOREACH',
+            'AC_FUNC_ALLOCA',
+            'AC_FUNC_CHECK',
+            'AC_FUNC_CHOWN',
+            'AC_FUNC_CLOSEDIR_VOID',
+            'AC_FUNC_ERROR_AT_LINE',
+            'AC_FUNC_FNMATCH',
+            'AC_FUNC_FNMATCH_GNU',
+            'AC_FUNC_FORK',
+            'AC_FUNC_FSEEKO',
+            'AC_FUNC_GETGROUPS',
+            'AC_FUNC_GETLOADAVG',
+            'AC_FUNC_GETMNTENT',
+            'AC_FUNC_GETPGRP',
+            'AC_FUNC_LSTAT',
+            'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK',
+            'AC_FUNC_MALLOC',
+            'AC_FUNC_MBRTOWC',
+            'AC_FUNC_MEMCMP',
+            'AC_FUNC_MKTIME',
+            'AC_FUNC_MMAP',
+            'AC_FUNC_OBSTACK',
+            'AC_FUNC_REALLOC',
+            'AC_FUNC_SELECT_ARGTYPES',
+            'AC_FUNC_SETPGRP',
+            'AC_FUNC_SETVBUF_REVERSED',
+            'AC_FUNC_STAT',
+            'AC_FUNC_STRCOLL',
+            'AC_FUNC_STRERROR_R',
+            'AC_FUNC_STRFTIME',
+            'AC_FUNC_STRNLEN',
+            'AC_FUNC_STRTOD',
+            'AC_FUNC_STRTOLD',
+            'AC_FUNC_UTIME_NULL',
+            'AC_FUNC_VPRINTF',
+            'AC_FUNC_WAIT3',
+            'AC_GCC_TRADITIONAL',
+            'AC_GETGROUPS_T',
+            'AC_GETLOADAVG',
+            'AC_GNU_SOURCE',
+            'AC_HAVE_FUNCS',
+            'AC_HAVE_HEADERS',
+            'AC_HAVE_LIBRARY',
+            'AC_HAVE_POUNDBANG',
+            'AC_HEADER_ASSERT',
+            'AC_HEADER_CHECK',
+            'AC_HEADER_DIRENT',
+            'AC_HEADER_EGREP',
+            'AC_HEADER_MAJOR',
+            'AC_HEADER_RESOLV',
+            'AC_HEADER_STAT',
+            'AC_HEADER_STDBOOL',
+            'AC_HEADER_STDC',
+            'AC_HEADER_SYS_WAIT',
+            'AC_HEADER_TIME',
+            'AC_HEADER_TIOCGWINSZ',
+            'AC_HELP_STRING',
+            'AC_INCLUDES_DEFAULT',
+            'AC_INIT',
+            'AC_INLINE',
+            'AC_INT_16_BITS',
+            'AC_IRIX_SUN',
+            'AC_ISC_POSIX',
+            'AC_LANG_ASSERT',
+            'AC_LANG_C',
+            'AC_LANG_CALL',
+            'AC_LANG_CONFTEST',
+            'AC_LANG_CPLUSPLUS',
+            'AC_LANG_FORTRAN77',
+            'AC_LANG_FUNC_LINK_TRY',
+            'AC_LANG_POP',
+            'AC_LANG_PROGRAM',
+            'AC_LANG_PUSH',
+            'AC_LANG_RESTORE',
+            'AC_LANG_SAVE',
+            'AC_LANG_SOURCE',
+            'AC_LANG_WERROR',
+            'AC_LIBOBJ',
+            'AC_LIBSOURCE',
+            'AC_LIBSOURCES',
+            'AC_LINK_FILES',
+            'AC_LINK_IFELSE',
+            'AC_LN_S',
+            'AC_LONG_64_BITS',
+            'AC_LONG_DOUBLE',
+            'AC_LONG_FILE_NAMES',
+            'AC_MAJOR_HEADER',
+            'AC_MEMORY_H',
+            'AC_MINGW32',
+            'AC_MINIX',
+            'AC_MINUS_C_MINUS_O',
+            'AC_MMAP',
+            'AC_MODE_T',
+            'AC_MSG_CHECKING',
+            'AC_MSG_ERROR',
+            'AC_MSG_FAILURE',
+            'AC_MSG_NOTICE',
+            'AC_MSG_RESULT',
+            'AC_MSG_WARN',
+            'AC_OBJEXT',
+            'AC_OBSOLETE',
+            'AC_OFF_T',
+            'AC_OPENMP',
+            'AC_OUTPUT',
+            'AC_OUTPUT_COMMANDS',
+            'AC_PACKAGE_BUGREPORT',
+            'AC_PACKAGE_NAME',
+            'AC_PACKAGE_STRING',
+            'AC_PACKAGE_TARNAME',
+            'AC_PACKAGE_URL',
+            'AC_PACKAGE_VERSION',
+            'AC_PATH_PROG',
+            'AC_PATH_PROGS',
+            'AC_PATH_PROGS_FEATURE_CHECK',
+            'AC_PATH_TARGET_TOOL',
+            'AC_PATH_TOOL',
+            'AC_PATH_X',
+            'AC_PATH_XTRA',
+            'AC_PID_T',
+            'AC_PREFIX',
+            'AC_PREFIX_DEFAULT',
+            'AC_PREFIX_PROGRAM',
+            'AC_PREPROC_IFELSE',
+            'AC_PREREQ',
+            'AC_PRESERVE_HELP_ORDER',
+            'AC_PROG_AWK',
+            'AC_PROG_CC',
+            'AC_PROG_CC_C89',
+            'AC_PROG_CC_C99',
+            'AC_PROG_CC_C_O',
+            'AC_PROG_CC_STDC',
+            'AC_PROG_CPP',
+            'AC_PROG_CPP_WERROR',
+            'AC_PROG_CXX',
+            'AC_PROG_CXX_C_O',
+            'AC_PROG_CXXCPP',
+            'AC_PROG_EGREP',
+            'AC_PROG_F77',
+            'AC_PROG_F77_C_O',
+            'AC_PROG_FC',
+            'AC_PROG_FC_C_O',
+            'AC_PROG_FGREP',
+            'AC_PROG_GCC_TRADITIONAL',
+            'AC_PROG_GREP',
+            'AC_PROG_INSTALL',
+            'AC_PROG_LEX',
+            'AC_PROG_LN_S',
+            'AC_PROG_MAKE_SET',
+            'AC_PROG_MKDIR_P',
+            'AC_PROG_OBJC',
+            'AC_PROG_OBJCPP',
+            'AC_PROG_OBJCXX',
+            'AC_PROG_OBJCXXCPP',
+            'AC_PROG_RANLIB',
+            'AC_PROG_SED',
+            'AC_PROG_YACC',
+            'AC_PROGRAM_CHECK',
+            'AC_PROGRAM_EGREP',
+            'AC_PROGRAM_PATH',
+            'AC_PROGRAMS_CHECK',
+            'AC_PROGRAMS_PATH',
+            'AC_REMOTE_TAPE',
+            'AC_REPLACE_FNMATCH',
+            'AC_REPLACE_FUNCS',
+            'AC_REQUIRE',
+            'AC_REQUIRE_AUX_FILE',
+            'AC_REQUIRE_CPP',
+            'AC_RESTARTABLE_SYSCALLS',
+            'AC_RETSIGTYPE',
+            'AC_REVISION',
+            'AC_RSH',
+            'AC_RUN_IFELSE',
+            'AC_SCO_INTL',
+            'AC_SEARCH_LIBS',
+            'AC_SET_MAKE',
+            'AC_SETVBUF_REVERSED',
+            'AC_SIZE_T',
+            'AC_SIZEOF_TYPE',
+            'AC_ST_BLKSIZE',
+            'AC_ST_BLOCKS',
+            'AC_ST_RDEV',
+            'AC_STAT_MACROS_BROKEN',
+            'AC_STDC_HEADERS',
+            'AC_STRCOLL',
+            'AC_STRUCT_DIRENT_D_INO',
+            'AC_STRUCT_DIRENT_D_TYPE',
+            'AC_STRUCT_ST_BLKSIZE',
+            'AC_STRUCT_ST_BLOCKS',
+            'AC_STRUCT_ST_RDEV',
+            'AC_STRUCT_TIMEZONE',
+            'AC_STRUCT_TM',
+            'AC_SUBST',
+            'AC_SUBST_FILE',
+            'AC_SYS_INTERPRETER',
+            'AC_SYS_LARGEFILE',
+            'AC_SYS_LONG_FILE_NAMES',
+            'AC_SYS_POSIX_TERMIOS',
+            'AC_SYS_RESTARTABLE_SYSCALLS',
+            'AC_SYS_SIGLIST_DECLARED',
+            'AC_TEST_CPP',
+            'AC_TEST_PROGRAM',
+            'AC_TIME_WITH_SYS_TIME',
+            'AC_TIMEZONE',
+            'AC_TRY_ACT',
+            'AC_TRY_COMPILE',
+            'AC_TRY_CPP',
+            'AC_TRY_LINK',
+            'AC_TRY_LINK_FUNC',
+            'AC_TRY_RUN',
+            'AC_TYPE_GETGROUPS',
+            'AC_TYPE_INT16_T',
+            'AC_TYPE_INT32_T',
+            'AC_TYPE_INT64_T',
+            'AC_TYPE_INT8_T',
+            'AC_TYPE_INTMAX_T',
+            'AC_TYPE_INTPTR_T',
+            'AC_TYPE_LONG_DOUBLE',
+            'AC_TYPE_LONG_DOUBLE_WIDER',
+            'AC_TYPE_LONG_LONG_INT',
+            'AC_TYPE_MBSTATE_T',
+            'AC_TYPE_MODE_T',
+            'AC_TYPE_OFF_T',
+            'AC_TYPE_PID_T',
+            'AC_TYPE_SIGNAL',
+            'AC_TYPE_SIZE_T',
+            'AC_TYPE_SSIZE_T',
+            'AC_TYPE_UID_T',
+            'AC_TYPE_UINT16_T',
+            'AC_TYPE_UINT32_T',
+            'AC_TYPE_UINT64_T',
+            'AC_TYPE_UINT8_T',
+            'AC_TYPE_UINTMAX_T',
+            'AC_TYPE_UINTPTR_T',
+            'AC_TYPE_UNSIGNED_LONG_LONG_INT',
+            'AC_UID_T',
+            'AC_UNISTD_H',
+            'AC_USE_SYSTEM_EXTENSIONS',
+            'AC_USG',
+            'AC_UTIME_NULL',
+            'AC_VALIDATE_CACHED_SYSTEM_TUPLE',
+            'AC_VERBOSE',
+            'AC_VFORK',
+            'AC_VPRINTF',
+            'AC_WAIT3',
+            'AC_WARN',
+            'AC_WARNING',
+            'AC_WITH',
+            'AC_WORDS_BIGENDIAN',
+            'AC_XENIX_DIR',
+            'AC_YYTEXT_POINTER',
+            'AH_BOTTOM',
+            'AH_HEADER',
+            'AH_TEMPLATE',
+            'AH_TOP',
+            'AH_VERBATIM',
+            'AU_ALIAS',
+            'AU_DEFUN'),
+            ),
+    'SYMBOLS' => array('(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`'),
+    'CASE_SENSITIVE' => array(
+            GESHI_COMMENTS => false,
+                1 => true,
+                ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00ffff;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            3 => 'color: #666666;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #000099;',
+            2 => 'color: #660099;',
+            3 => 'color: #660099;',
+            4 => 'color: #660099;',
+            5 => 'color: #006699;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#])",
+            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%\\/])"
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/autohotkey.php b/vendor/easybook/geshi/geshi/autohotkey.php
new file mode 100755
index 000000000..970684daf
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/autohotkey.php
@@ -0,0 +1,373 @@
+<?php
+/*************************************************************************************
+ * autohotkey.php
+ * --------
+ * Author: Naveen Garg (naveen.garg@gmail.com)
+ * Copyright: (c) 2009 Naveen Garg and GeSHi
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/06/11
+ *
+ * Autohotkey language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * Release 1.0.8.5 (2009/06/11)
+ * - First Release
+ *
+ * TODO
+ * ----
+ * Reference: http://www.autohotkey.com/docs/
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Autohotkey',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'while','if','and','or','else','return'
+            ),
+        2 => array(
+            // built in variables
+            'A_AhkPath','A_AhkVersion','A_AppData','A_AppDataCommon',
+            'A_AutoTrim','A_BatchLines','A_CaretX','A_CaretY',
+            'A_ComputerName','A_ControlDelay','A_Cursor','A_DD',
+            'A_DDD','A_DDDD','A_DefaultMouseSpeed','A_Desktop',
+            'A_DesktopCommon','A_DetectHiddenText','A_DetectHiddenWindows','A_EndChar',
+            'A_EventInfo','A_ExitReason','A_FormatFloat','A_FormatInteger',
+            'A_Gui','A_GuiEvent','A_GuiControl','A_GuiControlEvent',
+            'A_GuiHeight','A_GuiWidth','A_GuiX','A_GuiY',
+            'A_Hour','A_IconFile','A_IconHidden','A_IconNumber',
+            'A_IconTip','A_Index','A_IPAddress1','A_IPAddress2',
+            'A_IPAddress3','A_IPAddress4','A_ISAdmin','A_IsCompiled',
+            'A_IsCritical','A_IsPaused','A_IsSuspended','A_KeyDelay',
+            'A_Language','A_LastError','A_LineFile','A_LineNumber',
+            'A_LoopField','A_LoopFileAttrib','A_LoopFileDir','A_LoopFileExt',
+            'A_LoopFileFullPath','A_LoopFileLongPath','A_LoopFileName','A_LoopFileShortName',
+            'A_LoopFileShortPath','A_LoopFileSize','A_LoopFileSizeKB','A_LoopFileSizeMB',
+            'A_LoopFileTimeAccessed','A_LoopFileTimeCreated','A_LoopFileTimeModified','A_LoopReadLine',
+            'A_LoopRegKey','A_LoopRegName','A_LoopRegSubkey','A_LoopRegTimeModified',
+            'A_LoopRegType','A_MDAY','A_Min','A_MM',
+            'A_MMM','A_MMMM','A_Mon','A_MouseDelay',
+            'A_MSec','A_MyDocuments','A_Now','A_NowUTC',
+            'A_NumBatchLines','A_OSType','A_OSVersion','A_PriorHotkey',
+            'A_ProgramFiles','A_Programs','A_ProgramsCommon','A_ScreenHeight',
+            'A_ScreenWidth','A_ScriptDir','A_ScriptFullPath','A_ScriptName',
+            'A_Sec','A_Space','A_StartMenu','A_StartMenuCommon',
+            'A_Startup','A_StartupCommon','A_StringCaseSense','A_Tab',
+            'A_Temp','A_ThisFunc','A_ThisHotkey','A_ThisLabel',
+            'A_ThisMenu','A_ThisMenuItem','A_ThisMenuItemPos','A_TickCount',
+            'A_TimeIdle','A_TimeIdlePhysical','A_TimeSincePriorHotkey','A_TimeSinceThisHotkey',
+            'A_TitleMatchMode','A_TitleMatchModeSpeed','A_UserName','A_WDay',
+            'A_WinDelay','A_WinDir','A_WorkingDir','A_YDay',
+            'A_YEAR','A_YWeek','A_YYYY','Clipboard',
+            'ClipboardAll','ComSpec','ErrorLevel','ProgramFiles',
+            ),
+        3 => array(
+            'AutoTrim',
+            'BlockInput','Break','Click',
+            'ClipWait','Continue','Control',
+            'ControlClick','ControlFocus','ControlGet',
+            'ControlGetFocus','ControlGetPos','ControlGetText',
+            'ControlMove','ControlSend','ControlSendRaw',
+            'ControlSetText','CoordMode','Critical',
+            'DetectHiddenText','DetectHiddenWindows','DllCall','Drive',
+            'DriveGet','DriveSpaceFree',
+            'Else','EnvAdd','EnvDiv',
+            'EnvGet','EnvMult','EnvSet',
+            'EnvSub','EnvUpdate','Exit',
+            'ExitApp','FileAppend','FileCopy',
+            'FileCopyDir','FileCreateDir','FileCreateShortcut',
+            'FileDelete','FileGetAttrib','FileGetShortcut',
+            'FileGetSize','FileGetTime','FileGetVersion',
+            'FileInstall','FileMove','FileMoveDir',
+            'FileRead','FileReadLine','FileRecycle',
+            'FileRecycleEmpty','FileRemoveDir','FileSelectFile',
+            'FileSelectFolder','FileSetAttrib','FileSetTime',
+            'FormatTime','Gosub',
+            'Goto','GroupActivate','GroupAdd',
+            'GroupClose','GroupDeactivate','Gui',
+            'GuiControl','GuiControlGet','Hotkey',
+            'IfExist','IfGreater','IfGreaterOrEqual',
+            'IfInString','IfLess','IfLessOrEqual',
+            'IfMsgBox','IfNotEqual','IfNotExist',
+            'IfNotInString','IfWinActive','IfWinExist',
+            'IfWinNotActive','IfWinNotExist','ImageSearch',
+            'IniDelete','IniRead','IniWrite',
+            'Input','InputBox','KeyHistory',
+            'KeyWait','ListHotkeys','ListLines',
+            'ListVars','Loop',
+            'Menu','MouseClick','MouseClickDrag',
+            'MouseGetPos','MouseMove','MsgBox',
+            'OnMessage','OnExit','OutputDebug',
+            'PixelGetColor','PixelSearch','PostMessage',
+            'Process','Progress','Random',
+            'RegExMatch','RegExReplace','RegisterCallback',
+            'RegDelete','RegRead','RegWrite',
+            'Reload','Repeat','Return',
+            'Run','RunAs','RunWait',
+            'Send','SendEvent','SendInput',
+            'SendMessage','SendMode','SendPlay',
+            'SendRaw','SetBatchLines','SetCapslockState',
+            'SetControlDelay','SetDefaultMouseSpeed','SetEnv',
+            'SetFormat','SetKeyDelay','SetMouseDelay',
+            'SetNumlockState','SetScrollLockState','SetStoreCapslockMode',
+            'SetTimer','SetTitleMatchMode','SetWinDelay',
+            'SetWorkingDir','Shutdown','Sleep',
+            'Sort','SoundBeep','SoundGet',
+            'SoundGetWaveVolume','SoundPlay','SoundSet',
+            'SoundSetWaveVolume','SplashImage','SplashTextOff',
+            'SplashTextOn','SplitPath','StatusBarGetText',
+            'StatusBarWait','StringCaseSense','StringGetPos',
+            'StringLeft','StringLen','StringLower',
+            'StringMid','StringReplace','StringRight',
+            'StringSplit','StringTrimLeft','StringTrimRight',
+            'StringUpper','Suspend','SysGet',
+            'Thread','ToolTip','Transform',
+            'TrayTip','URLDownloadToFile','While',
+            'VarSetCapacity',
+            'WinActivate','WinActivateBottom','WinClose',
+            'WinGet','WinGetActiveStats','WinGetActiveTitle',
+            'WinGetClass','WinGetPos','WinGetText',
+            'WinGetTitle','WinHide','WinKill',
+            'WinMaximize','WinMenuSelectItem','WinMinimize',
+            'WinMinimizeAll','WinMinimizeAllUndo','WinMove',
+            'WinRestore','WinSet','WinSetTitle',
+            'WinShow','WinWait','WinWaitActive',
+            'WinWaitClose','WinWaitNotActive'
+            ),
+        4 => array(
+            'Abs','ACos','Asc','ASin',
+            'ATan','Ceil','Chr','Cos',
+            'Exp','FileExist','Floor',
+            'GetKeyState','IL_Add','IL_Create','IL_Destroy',
+            'InStr','IsFunc','IsLabel','Ln',
+            'Log','LV_Add','LV_Delete','LV_DeleteCol',
+            'LV_GetCount','LV_GetNext','LV_GetText','LV_Insert',
+            'LV_InsertCol','LV_Modify','LV_ModifyCol','LV_SetImageList',
+            'Mod','NumGet','NumPut',
+            'Round',
+            'SB_SetIcon','SB_SetParts','SB_SetText','Sin',
+            'Sqrt','StrLen','SubStr','Tan',
+            'TV_Add','TV_Delete','TV_GetChild','TV_GetCount',
+            'TV_GetNext','TV_Get','TV_GetParent','TV_GetPrev',
+            'TV_GetSelection','TV_GetText','TV_Modify',
+            'WinActive','WinExist'
+            ),
+        5 => array(
+            // #Directives
+            'AllowSameLineComments','ClipboardTimeout','CommentFlag',
+            'ErrorStdOut','EscapeChar','HotkeyInterval',
+            'HotkeyModifierTimeout','Hotstring','IfWinActive',
+            'IfWinExist','IfWinNotActive','IfWinNotExist',
+            'Include','IncludeAgain','InstallKeybdHook',
+            'InstallMouseHook','KeyHistory','LTrim',
+            'MaxHotkeysPerInterval','MaxMem','MaxThreads',
+            'MaxThreadsBuffer','MaxThreadsPerHotkey','NoEnv',
+            'NoTrayIcon','Persistent','SingleInstance',
+            'UseHook','WinActivateForce'
+            ),
+        6 => array(
+            'Shift','LShift','RShift',
+            'Alt','LAlt','RAlt',
+            'LControl','RControl',
+            'Ctrl','LCtrl','RCtrl',
+            'LWin','RWin','AppsKey',
+            'AltDown','AltUp','ShiftDown',
+            'ShiftUp','CtrlDown','CtrlUp',
+            'LWinDown','LWinUp','RWinDown',
+            'RWinUp','LButton','RButton',
+            'MButton','WheelUp','WheelDown',
+            'WheelLeft','WheelRight','XButton1',
+            'XButton2','Joy1','Joy2',
+            'Joy3','Joy4','Joy5',
+            'Joy6','Joy7','Joy8',
+            'Joy9','Joy10','Joy11',
+            'Joy12','Joy13','Joy14',
+            'Joy15','Joy16','Joy17',
+            'Joy18','Joy19','Joy20',
+            'Joy21','Joy22','Joy23',
+            'Joy24','Joy25','Joy26',
+            'Joy27','Joy28','Joy29',
+            'Joy30','Joy31','Joy32',
+            'JoyX','JoyY','JoyZ',
+            'JoyR','JoyU','JoyV',
+            'JoyPOV','JoyName','JoyButtons',
+            'JoyAxes','JoyInfo','Space',
+            'Tab','Enter',
+            'Escape','Esc','BackSpace',
+            'BS','Delete','Del',
+            'Insert','Ins','PGUP',
+            'PGDN','Home','End',
+            'Up','Down','Left',
+            'Right','PrintScreen','CtrlBreak',
+            'Pause','ScrollLock','CapsLock',
+            'NumLock','Numpad0','Numpad1',
+            'Numpad2','Numpad3','Numpad4',
+            'Numpad5','Numpad6','Numpad7',
+            'Numpad8','Numpad9','NumpadMult',
+            'NumpadAdd','NumpadSub','NumpadDiv',
+            'NumpadDot','NumpadDel','NumpadIns',
+            'NumpadClear','NumpadUp','NumpadDown',
+            'NumpadLeft','NumpadRight','NumpadHome',
+            'NumpadEnd','NumpadPgup','NumpadPgdn',
+            'NumpadEnter','F1','F2',
+            'F3','F4','F5',
+            'F6','F7','F8',
+            'F9','F10','F11',
+            'F12','F13','F14',
+            'F15','F16','F17',
+            'F18','F19','F20',
+            'F21','F22','F23',
+            'F24','Browser_Back','Browser_Forward',
+            'Browser_Refresh','Browser_Stop','Browser_Search',
+            'Browser_Favorites','Browser_Home','Volume_Mute',
+            'Volume_Down','Volume_Up','Media_Next',
+            'Media_Prev','Media_Stop','Media_Play_Pause',
+            'Launch_Mail','Launch_Media','Launch_App1',
+            'Launch_App2'
+            ),
+        7 => array(
+            // Gui commands
+            'Add',
+            'Show', 'Submit', 'Cancel', 'Destroy',
+            'Font', 'Color', 'Margin', 'Flash', 'Default',
+            'GuiEscape','GuiClose','GuiSize','GuiContextMenu','GuiDropFilesTabStop',
+            ),
+        8 => array(
+            // Gui Controls
+            'Button',
+            'Checkbox','Radio','DropDownList','DDL',
+            'ComboBox','ListBox','ListView',
+            'Text', 'Edit', 'UpDown', 'Picture',
+            'TreeView','DateTime', 'MonthCal',
+            'Slider'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')','[',']',
+        '+','-','*','/','&','^',
+        '=','+=','-=','*=','/=','&=',
+        '==','<','<=','>','>=',':=',
+        ',','.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #AAAAFF; font-weight: bold;',       // reserved #blue
+            2 => 'color: #88FF88;',                         // BIV yellow
+            3 => 'color: #FF00FF; font-style: italic;',       // commands purple
+            4 => 'color: #888844; font-weight: bold;',       // functions #0080FF
+            5 => 'color: #000000; font-style: italic;',    // directives #black
+            6 => 'color: #FF0000; font-style: italic;',      // hotkeys #red
+            7 => 'color: #000000; font-style: italic;',    // gui commands #black
+            8 => 'color: #000000; font-style: italic;'      // gui controls
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'font-style: italic; color: #669900;',
+            1 => 'font-style: italic; color: #009933;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00FF00; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'font-weight: bold; color: #008080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF; font-style: italic; font-weight: italic;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: italic;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: italic; color: #A00A0;',
+            1 => 'color: #CC0000; font-style: italic;',
+            2 => 'color: #DD0000; font-style: italic;',
+            3 => 'color: #88FF88;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '_'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '%[a-zA-Z_][a-zA-Z0-9_]*%',
+        //hotstrings
+        1 => '::[\w\d]+::',
+        //labels
+        2 => '\w[\w\d]+:\s',
+        //Built-in Variables
+        3 => '\bA_\w+\b(?![^<]*>)'
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.autohotkey.com/docs/Variables.htm#{FNAME}',
+        3 => 'http://www.autohotkey.com/docs/commands/{FNAME}.htm',
+        4 => 'http://www.autohotkey.com/docs/Functions.htm#BuiltIn',
+        5 => 'http://www.autohotkey.com/docs/commands/_{FNAME}.htm',
+        6 => '',
+        7 => 'http://www.autohotkey.com/docs/commands/Gui.htm#{FNAME}',
+        8 => 'http://www.autohotkey.com/docs/commands/GuiControls.htm#{FNAME}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/autoit.php b/vendor/easybook/geshi/geshi/autoit.php
new file mode 100755
index 000000000..ab401b4cd
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/autoit.php
@@ -0,0 +1,1175 @@
+<?php
+/*************************************************************************************
+ * autoit.php
+ * --------
+ * Author: big_daddy (robert.i.anthony@gmail.com)
+ * Copyright: (c) 2006 and to GESHi ;)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/01/26
+ *
+ * AutoIT language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * Release 1.0.8.1 (2008/09/15)
+ * - Updated on 22.03.2008 By Tlem (tlem@tuxolem.fr)
+ * - The link on functions will now correctly re-direct to
+ * - http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm
+ * - Updated whith au3.api (09.02.2008).
+ * - Updated - 16 Mai 2008 - v3.2.12.0
+ * - Updated - 12 June 2008 - v3.2.12.1
+ * Release 1.0.7.20 (2006/01/26)
+ * - First Release
+ *
+ * Current bugs & todo:
+ * ----------
+ * - not sure how to get sendkeys to work " {!}, {SPACE} etc... "
+ * - just copyied the regexp for variable from php so this HAVE to be checked and fixed to a better one ;)
+ *
+ * Reference: http://www.autoitscript.com/autoit3/docs/
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License,
+or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not,
+write to the Free Software
+ *   Foundation,
+Inc.,
+59 Temple Place,
+Suite 330,
+Boston,
+MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'AutoIt',
+    'COMMENT_SINGLE' => array(';'),
+    'COMMENT_MULTI' => array(
+        '#comments-start' => '#comments-end',
+        '#cs' => '#ce'),
+    'COMMENT_REGEXP' => array(
+        0 => '/(?<!#)#(\s.*)?$/m',
+        1 => '/(?<=include)\s+<.*?>/'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'And','ByRef','Case','Const','ContinueCase','ContinueLoop',
+            'Default','Dim','Do','Else','ElseIf','EndFunc','EndIf','EndSelect',
+            'EndSwitch','EndWith','Enum','Exit','ExitLoop','False','For','Func',
+            'Global','If','In','Local','Next','Not','Or','ReDim','Return',
+            'Select','Step','Switch','Then','To','True','Until','WEnd','While',
+            'With'
+            ),
+        2 => array(
+            '@AppDataCommonDir','@AppDataDir','@AutoItExe','@AutoItPID',
+            '@AutoItUnicode','@AutoItVersion','@AutoItX64','@COM_EventObj',
+            '@CommonFilesDir','@Compiled','@ComputerName','@ComSpec','@CR',
+            '@CRLF','@DesktopCommonDir','@DesktopDepth','@DesktopDir',
+            '@DesktopHeight','@DesktopRefresh','@DesktopWidth',
+            '@DocumentsCommonDir','@error','@exitCode','@exitMethod',
+            '@extended','@FavoritesCommonDir','@FavoritesDir','@GUI_CtrlHandle',
+            '@GUI_CtrlId','@GUI_DragFile','@GUI_DragId','@GUI_DropId',
+            '@GUI_WinHandle','@HomeDrive','@HomePath','@HomeShare',
+            '@HotKeyPressed','@HOUR','@InetGetActive','@InetGetBytesRead',
+            '@IPAddress1','@IPAddress2','@IPAddress3','@IPAddress4','@KBLayout',
+            '@LF','@LogonDNSDomain','@LogonDomain','@LogonServer','@MDAY',
+            '@MIN','@MON','@MyDocumentsDir','@NumParams','@OSBuild','@OSLang',
+            '@OSServicePack','@OSTYPE','@OSVersion','@ProcessorArch',
+            '@ProgramFilesDir','@ProgramsCommonDir','@ProgramsDir','@ScriptDir',
+            '@ScriptFullPath','@ScriptLineNumber','@ScriptName','@SEC',
+            '@StartMenuCommonDir','@StartMenuDir','@StartupCommonDir',
+            '@StartupDir','@SW_DISABLE','@SW_ENABLE','@SW_HIDE','@SW_LOCK',
+            '@SW_MAXIMIZE','@SW_MINIMIZE','@SW_RESTORE','@SW_SHOW',
+            '@SW_SHOWDEFAULT','@SW_SHOWMAXIMIZED','@SW_SHOWMINIMIZED',
+            '@SW_SHOWMINNOACTIVE','@SW_SHOWNA','@SW_SHOWNOACTIVATE',
+            '@SW_SHOWNORMAL','@SW_UNLOCK','@SystemDir','@TAB','@TempDir',
+            '@TRAY_ID','@TrayIconFlashing','@TrayIconVisible','@UserName',
+            '@UserProfileDir','@WDAY','@WindowsDir','@WorkingDir','@YDAY',
+            '@YEAR'
+            ),
+        3 => array(
+            'Abs','ACos','AdlibDisable','AdlibEnable','Asc','AscW','ASin',
+            'Assign','ATan','AutoItSetOption','AutoItWinGetTitle',
+            'AutoItWinSetTitle','Beep','Binary','BinaryLen','BinaryMid',
+            'BinaryToString','BitAND','BitNOT','BitOR','BitRotate','BitShift',
+            'BitXOR','BlockInput','Break','Call','CDTray','Ceiling','Chr',
+            'ChrW','ClipGet','ClipPut','ConsoleRead','ConsoleWrite',
+            'ConsoleWriteError','ControlClick','ControlCommand',
+            'ControlDisable','ControlEnable','ControlFocus','ControlGetFocus',
+            'ControlGetHandle','ControlGetPos','ControlGetText','ControlHide',
+            'ControlListView','ControlMove','ControlSend','ControlSetText',
+            'ControlShow','ControlTreeView','Cos','Dec','DirCopy','DirCreate',
+            'DirGetSize','DirMove','DirRemove','DllCall','DllCallbackFree',
+            'DllCallbackGetPtr','DllCallbackRegister','DllClose','DllOpen',
+            'DllStructCreate','DllStructGetData','DllStructGetPtr',
+            'DllStructGetSize','DllStructSetData','DriveGetDrive',
+            'DriveGetFileSystem','DriveGetLabel','DriveGetSerial',
+            'DriveGetType','DriveMapAdd','DriveMapDel','DriveMapGet',
+            'DriveSetLabel','DriveSpaceFree','DriveSpaceTotal','DriveStatus',
+            'EnvGet','EnvSet','EnvUpdate','Eval','Execute','Exp',
+            'FileChangeDir','FileClose','FileCopy','FileCreateNTFSLink',
+            'FileCreateShortcut','FileDelete','FileExists','FileFindFirstFile',
+            'FileFindNextFile','FileGetAttrib','FileGetLongName',
+            'FileGetShortcut','FileGetShortName','FileGetSize','FileGetTime',
+            'FileGetVersion','FileInstall','FileMove','FileOpen',
+            'FileOpenDialog','FileRead','FileReadLine','FileRecycle',
+            'FileRecycleEmpty','FileSaveDialog','FileSelectFolder',
+            'FileSetAttrib','FileSetTime','FileWrite','FileWriteLine','Floor',
+            'FtpSetProxy','GUICreate','GUICtrlCreateAvi','GUICtrlCreateButton',
+            'GUICtrlCreateCheckbox','GUICtrlCreateCombo',
+            'GUICtrlCreateContextMenu','GUICtrlCreateDate','GUICtrlCreateDummy',
+            'GUICtrlCreateEdit','GUICtrlCreateGraphic','GUICtrlCreateGroup',
+            'GUICtrlCreateIcon','GUICtrlCreateInput','GUICtrlCreateLabel',
+            'GUICtrlCreateList','GUICtrlCreateListView',
+            'GUICtrlCreateListViewItem','GUICtrlCreateMenu',
+            'GUICtrlCreateMenuItem','GUICtrlCreateMonthCal','GUICtrlCreateObj',
+            'GUICtrlCreatePic','GUICtrlCreateProgress','GUICtrlCreateRadio',
+            'GUICtrlCreateSlider','GUICtrlCreateTab','GUICtrlCreateTabItem',
+            'GUICtrlCreateTreeView','GUICtrlCreateTreeViewItem',
+            'GUICtrlCreateUpdown','GUICtrlDelete','GUICtrlGetHandle',
+            'GUICtrlGetState','GUICtrlRead','GUICtrlRecvMsg',
+            'GUICtrlRegisterListViewSort','GUICtrlSendMsg','GUICtrlSendToDummy',
+            'GUICtrlSetBkColor','GUICtrlSetColor','GUICtrlSetCursor',
+            'GUICtrlSetData','GUICtrlSetFont','GUICtrlSetDefColor',
+            'GUICtrlSetDefBkColor','GUICtrlSetGraphic','GUICtrlSetImage',
+            'GUICtrlSetLimit','GUICtrlSetOnEvent','GUICtrlSetPos',
+            'GUICtrlSetResizing','GUICtrlSetState','GUICtrlSetStyle',
+            'GUICtrlSetTip','GUIDelete','GUIGetCursorInfo','GUIGetMsg',
+            'GUIGetStyle','GUIRegisterMsg','GUISetAccelerators()',
+            'GUISetBkColor','GUISetCoord','GUISetCursor','GUISetFont',
+            'GUISetHelp','GUISetIcon','GUISetOnEvent','GUISetState',
+            'GUISetStyle','GUIStartGroup','GUISwitch','Hex','HotKeySet',
+            'HttpSetProxy','HWnd','InetGet','InetGetSize','IniDelete','IniRead',
+            'IniReadSection','IniReadSectionNames','IniRenameSection',
+            'IniWrite','IniWriteSection','InputBox','Int','IsAdmin','IsArray',
+            'IsBinary','IsBool','IsDeclared','IsDllStruct','IsFloat','IsHWnd',
+            'IsInt','IsKeyword','IsNumber','IsObj','IsPtr','IsString','Log',
+            'MemGetStats','Mod','MouseClick','MouseClickDrag','MouseDown',
+            'MouseGetCursor','MouseGetPos','MouseMove','MouseUp','MouseWheel',
+            'MsgBox','Number','ObjCreate','ObjEvent','ObjGet','ObjName','Opt',
+            'Ping','PixelChecksum','PixelGetColor','PixelSearch','PluginClose',
+            'PluginOpen','ProcessClose','ProcessExists','ProcessGetStats',
+            'ProcessList','ProcessSetPriority','ProcessWait','ProcessWaitClose',
+            'ProgressOff','ProgressOn','ProgressSet','Ptr','Random','RegDelete',
+            'RegEnumKey','RegEnumVal','RegRead','RegWrite','Round','Run',
+            'RunAs','RunAsWait','RunWait','Send','SendKeepActive','SetError',
+            'SetExtended','ShellExecute','ShellExecuteWait','Shutdown','Sin',
+            'Sleep','SoundPlay','SoundSetWaveVolume','SplashImageOn',
+            'SplashOff','SplashTextOn','Sqrt','SRandom','StatusbarGetText',
+            'StderrRead','StdinWrite','StdioClose','StdoutRead','String',
+            'StringAddCR','StringCompare','StringFormat','StringInStr',
+            'StringIsAlNum','StringIsAlpha','StringIsASCII','StringIsDigit',
+            'StringIsFloat','StringIsInt','StringIsLower','StringIsSpace',
+            'StringIsUpper','StringIsXDigit','StringLeft','StringLen',
+            'StringLower','StringMid','StringRegExp','StringRegExpReplace',
+            'StringReplace','StringRight','StringSplit','StringStripCR',
+            'StringStripWS','StringToBinary','StringTrimLeft','StringTrimRight',
+            'StringUpper','Tan','TCPAccept','TCPCloseSocket','TCPConnect',
+            'TCPListen','TCPNameToIP','TCPRecv','TCPSend','TCPShutdown',
+            'TCPStartup','TimerDiff','TimerInit','ToolTip','TrayCreateItem',
+            'TrayCreateMenu','TrayGetMsg','TrayItemDelete','TrayItemGetHandle',
+            'TrayItemGetState','TrayItemGetText','TrayItemSetOnEvent',
+            'TrayItemSetState','TrayItemSetText','TraySetClick','TraySetIcon',
+            'TraySetOnEvent','TraySetPauseIcon','TraySetState','TraySetToolTip',
+            'TrayTip','UBound','UDPBind','UDPCloseSocket','UDPOpen','UDPRecv',
+            'UDPSend','UDPShutdown','UDPStartup','VarGetType','WinActivate',
+            'WinActive','WinClose','WinExists','WinFlash','WinGetCaretPos',
+            'WinGetClassList','WinGetClientSize','WinGetHandle','WinGetPos',
+            'WinGetProcess','WinGetState','WinGetText','WinGetTitle','WinKill',
+            'WinList','WinMenuSelectItem','WinMinimizeAll','WinMinimizeAllUndo',
+            'WinMove','WinSetOnTop','WinSetState','WinSetTitle','WinSetTrans',
+            'WinWait','WinWaitActive','WinWaitClose','WinWaitNotActive'
+            ),
+        4 => array(
+            'ArrayAdd','ArrayBinarySearch','ArrayConcatenate','ArrayDelete',
+            'ArrayDisplay','ArrayFindAll','ArrayInsert','ArrayMax',
+            'ArrayMaxIndex','ArrayMin','ArrayMinIndex','ArrayPop','ArrayPush',
+            'ArrayReverse','ArraySearch','ArraySort','ArraySwap','ArrayToClip',
+            'ArrayToString','ArrayTrim','ChooseColor','ChooseFont',
+            'ClipBoard_ChangeChain','ClipBoard_Close','ClipBoard_CountFormats',
+            'ClipBoard_Empty','ClipBoard_EnumFormats','ClipBoard_FormatStr',
+            'ClipBoard_GetData','ClipBoard_GetDataEx','ClipBoard_GetFormatName',
+            'ClipBoard_GetOpenWindow','ClipBoard_GetOwner',
+            'ClipBoard_GetPriorityFormat','ClipBoard_GetSequenceNumber',
+            'ClipBoard_GetViewer','ClipBoard_IsFormatAvailable',
+            'ClipBoard_Open','ClipBoard_RegisterFormat','ClipBoard_SetData',
+            'ClipBoard_SetDataEx','ClipBoard_SetViewer','ClipPutFile',
+            'ColorConvertHSLtoRGB','ColorConvertRGBtoHSL','ColorGetBlue',
+            'ColorGetGreen','ColorGetRed','Date_Time_CompareFileTime',
+            'Date_Time_DOSDateTimeToArray','Date_Time_DOSDateTimeToFileTime',
+            'Date_Time_DOSDateTimeToStr','Date_Time_DOSDateToArray',
+            'Date_Time_DOSDateToStr','Date_Time_DOSTimeToArray',
+            'Date_Time_DOSTimeToStr','Date_Time_EncodeFileTime',
+            'Date_Time_EncodeSystemTime','Date_Time_FileTimeToArray',
+            'Date_Time_FileTimeToDOSDateTime',
+            'Date_Time_FileTimeToLocalFileTime','Date_Time_FileTimeToStr',
+            'Date_Time_FileTimeToSystemTime','Date_Time_GetFileTime',
+            'Date_Time_GetLocalTime','Date_Time_GetSystemTime',
+            'Date_Time_GetSystemTimeAdjustment',
+            'Date_Time_GetSystemTimeAsFileTime',
+            'Date_Time_GetSystemTimes','Date_Time_GetTickCount',
+            'Date_Time_GetTimeZoneInformation',
+            'Date_Time_LocalFileTimeToFileTime','Date_Time_SetFileTime',
+            'Date_Time_SetLocalTime','Date_Time_SetSystemTime',
+            'Date_Time_SetSystemTimeAdjustment',
+            'Date_Time_SetTimeZoneInformation','Date_Time_SystemTimeToArray',
+            'Date_Time_SystemTimeToDateStr','Date_Time_SystemTimeToDateTimeStr',
+            'Date_Time_SystemTimeToFileTime','Date_Time_SystemTimeToTimeStr',
+            'Date_Time_SystemTimeToTzSpecificLocalTime',
+            'Date_Time_TzSpecificLocalTimeToSystemTime','DateAdd',
+            'DateDayOfWeek','DateDaysInMonth','DateDiff','DateIsLeapYear',
+            'DateIsValid','DateTimeFormat','DateTimeSplit','DateToDayOfWeek',
+            'DateToDayOfWeekISO','DateToDayValue','DateToMonth',
+            'DayValueToDate','DebugBugReportEnv','DebugOut','DebugSetup',
+            'Degree','EventLog__Backup','EventLog__Clear','EventLog__Close',
+            'EventLog__Count','EventLog__DeregisterSource','EventLog__Full',
+            'EventLog__Notify','EventLog__Oldest','EventLog__Open',
+            'EventLog__OpenBackup','EventLog__Read','EventLog__RegisterSource',
+            'EventLog__Report','FileCountLines','FileCreate','FileListToArray',
+            'FilePrint','FileReadToArray','FileWriteFromArray',
+            'FileWriteLog','FileWriteToLine','GDIPlus_ArrowCapCreate',
+            'GDIPlus_ArrowCapDispose','GDIPlus_ArrowCapGetFillState',
+            'GDIPlus_ArrowCapGetHeight','GDIPlus_ArrowCapGetMiddleInset',
+            'GDIPlus_ArrowCapGetWidth','GDIPlus_ArrowCapSetFillState',
+            'GDIPlus_ArrowCapSetHeight','GDIPlus_ArrowCapSetMiddleInset',
+            'GDIPlus_ArrowCapSetWidth','GDIPlus_BitmapCloneArea',
+            'GDIPlus_BitmapCreateFromFile','GDIPlus_BitmapCreateFromGraphics',
+            'GDIPlus_BitmapCreateFromHBITMAP',
+            'GDIPlus_BitmapCreateHBITMAPFromBitmap','GDIPlus_BitmapDispose',
+            'GDIPlus_BitmapLockBits','GDIPlus_BitmapUnlockBits',
+            'GDIPlus_BrushClone','GDIPlus_BrushCreateSolid',
+            'GDIPlus_BrushDispose','GDIPlus_BrushGetType',
+            'GDIPlus_CustomLineCapDispose','GDIPlus_Decoders',
+            'GDIPlus_DecodersGetCount','GDIPlus_DecodersGetSize',
+            'GDIPlus_Encoders','GDIPlus_EncodersGetCLSID',
+            'GDIPlus_EncodersGetCount','GDIPlus_EncodersGetParamList',
+            'GDIPlus_EncodersGetParamListSize','GDIPlus_EncodersGetSize',
+            'GDIPlus_FontCreate','GDIPlus_FontDispose',
+            'GDIPlus_FontFamilyCreate','GDIPlus_FontFamilyDispose',
+            'GDIPlus_GraphicsClear','GDIPlus_GraphicsCreateFromHDC',
+            'GDIPlus_GraphicsCreateFromHWND','GDIPlus_GraphicsDispose',
+            'GDIPlus_GraphicsDrawArc','GDIPlus_GraphicsDrawBezier',
+            'GDIPlus_GraphicsDrawClosedCurve','GDIPlus_GraphicsDrawCurve',
+            'GDIPlus_GraphicsDrawEllipse','GDIPlus_GraphicsDrawImage',
+            'GDIPlus_GraphicsDrawImageRect','GDIPlus_GraphicsDrawImageRectRect',
+            'GDIPlus_GraphicsDrawLine','GDIPlus_GraphicsDrawPie',
+            'GDIPlus_GraphicsDrawPolygon','GDIPlus_GraphicsDrawRect',
+            'GDIPlus_GraphicsDrawString','GDIPlus_GraphicsDrawStringEx',
+            'GDIPlus_GraphicsFillClosedCurve','GDIPlus_GraphicsFillEllipse',
+            'GDIPlus_GraphicsFillPie','GDIPlus_GraphicsFillRect',
+            'GDIPlus_GraphicsGetDC','GDIPlus_GraphicsGetSmoothingMode',
+            'GDIPlus_GraphicsMeasureString','GDIPlus_GraphicsReleaseDC',
+            'GDIPlus_GraphicsSetSmoothingMode','GDIPlus_GraphicsSetTransform',
+            'GDIPlus_ImageDispose','GDIPlus_ImageGetGraphicsContext',
+            'GDIPlus_ImageGetHeight','GDIPlus_ImageGetWidth',
+            'GDIPlus_ImageLoadFromFile','GDIPlus_ImageSaveToFile',
+            'GDIPlus_ImageSaveToFileEx','GDIPlus_MatrixCreate',
+            'GDIPlus_MatrixDispose','GDIPlus_MatrixRotate','GDIPlus_ParamAdd',
+            'GDIPlus_ParamInit','GDIPlus_PenCreate','GDIPlus_PenDispose',
+            'GDIPlus_PenGetAlignment','GDIPlus_PenGetColor',
+            'GDIPlus_PenGetCustomEndCap','GDIPlus_PenGetDashCap',
+            'GDIPlus_PenGetDashStyle','GDIPlus_PenGetEndCap',
+            'GDIPlus_PenGetWidth','GDIPlus_PenSetAlignment',
+            'GDIPlus_PenSetColor','GDIPlus_PenSetCustomEndCap',
+            'GDIPlus_PenSetDashCap','GDIPlus_PenSetDashStyle',
+            'GDIPlus_PenSetEndCap','GDIPlus_PenSetWidth','GDIPlus_RectFCreate',
+            'GDIPlus_Shutdown','GDIPlus_Startup','GDIPlus_StringFormatCreate',
+            'GDIPlus_StringFormatDispose','GetIP','GUICtrlAVI_Close',
+            'GUICtrlAVI_Create','GUICtrlAVI_Destroy','GUICtrlAVI_Open',
+            'GUICtrlAVI_OpenEx','GUICtrlAVI_Play','GUICtrlAVI_Seek',
+            'GUICtrlAVI_Show','GUICtrlAVI_Stop','GUICtrlButton_Click',
+            'GUICtrlButton_Create','GUICtrlButton_Destroy',
+            'GUICtrlButton_Enable','GUICtrlButton_GetCheck',
+            'GUICtrlButton_GetFocus','GUICtrlButton_GetIdealSize',
+            'GUICtrlButton_GetImage','GUICtrlButton_GetImageList',
+            'GUICtrlButton_GetState','GUICtrlButton_GetText',
+            'GUICtrlButton_GetTextMargin','GUICtrlButton_SetCheck',
+            'GUICtrlButton_SetFocus','GUICtrlButton_SetImage',
+            'GUICtrlButton_SetImageList','GUICtrlButton_SetSize',
+            'GUICtrlButton_SetState','GUICtrlButton_SetStyle',
+            'GUICtrlButton_SetText','GUICtrlButton_SetTextMargin',
+            'GUICtrlButton_Show','GUICtrlComboBox_AddDir',
+            'GUICtrlComboBox_AddString','GUICtrlComboBox_AutoComplete',
+            'GUICtrlComboBox_BeginUpdate','GUICtrlComboBox_Create',
+            'GUICtrlComboBox_DeleteString','GUICtrlComboBox_Destroy',
+            'GUICtrlComboBox_EndUpdate','GUICtrlComboBox_FindString',
+            'GUICtrlComboBox_FindStringExact','GUICtrlComboBox_GetComboBoxInfo',
+            'GUICtrlComboBox_GetCount','GUICtrlComboBox_GetCurSel',
+            'GUICtrlComboBox_GetDroppedControlRect',
+            'GUICtrlComboBox_GetDroppedControlRectEx',
+            'GUICtrlComboBox_GetDroppedState','GUICtrlComboBox_GetDroppedWidth',
+            'GUICtrlComboBox_GetEditSel','GUICtrlComboBox_GetEditText',
+            'GUICtrlComboBox_GetExtendedUI',
+            'GUICtrlComboBox_GetHorizontalExtent',
+            'GUICtrlComboBox_GetItemHeight','GUICtrlComboBox_GetLBText',
+            'GUICtrlComboBox_GetLBTextLen','GUICtrlComboBox_GetList',
+            'GUICtrlComboBox_GetListArray','GUICtrlComboBox_GetLocale',
+            'GUICtrlComboBox_GetLocaleCountry','GUICtrlComboBox_GetLocaleLang',
+            'GUICtrlComboBox_GetLocalePrimLang',
+            'GUICtrlComboBox_GetLocaleSubLang','GUICtrlComboBox_GetMinVisible',
+            'GUICtrlComboBox_GetTopIndex','GUICtrlComboBox_InitStorage',
+            'GUICtrlComboBox_InsertString','GUICtrlComboBox_LimitText',
+            'GUICtrlComboBox_ReplaceEditSel','GUICtrlComboBox_ResetContent',
+            'GUICtrlComboBox_SelectString','GUICtrlComboBox_SetCurSel',
+            'GUICtrlComboBox_SetDroppedWidth','GUICtrlComboBox_SetEditSel',
+            'GUICtrlComboBox_SetEditText','GUICtrlComboBox_SetExtendedUI',
+            'GUICtrlComboBox_SetHorizontalExtent',
+            'GUICtrlComboBox_SetItemHeight','GUICtrlComboBox_SetMinVisible',
+            'GUICtrlComboBox_SetTopIndex','GUICtrlComboBox_ShowDropDown',
+            'GUICtrlComboBoxEx_AddDir','GUICtrlComboBoxEx_AddString',
+            'GUICtrlComboBoxEx_BeginUpdate','GUICtrlComboBoxEx_Create',
+            'GUICtrlComboBoxEx_CreateSolidBitMap',
+            'GUICtrlComboBoxEx_DeleteString','GUICtrlComboBoxEx_Destroy',
+            'GUICtrlComboBoxEx_EndUpdate','GUICtrlComboBoxEx_FindStringExact',
+            'GUICtrlComboBoxEx_GetComboBoxInfo',
+            'GUICtrlComboBoxEx_GetComboControl','GUICtrlComboBoxEx_GetCount',
+            'GUICtrlComboBoxEx_GetCurSel',
+            'GUICtrlComboBoxEx_GetDroppedControlRect',
+            'GUICtrlComboBoxEx_GetDroppedControlRectEx',
+            'GUICtrlComboBoxEx_GetDroppedState',
+            'GUICtrlComboBoxEx_GetDroppedWidth',
+            'GUICtrlComboBoxEx_GetEditControl','GUICtrlComboBoxEx_GetEditSel',
+            'GUICtrlComboBoxEx_GetEditText',
+            'GUICtrlComboBoxEx_GetExtendedStyle',
+            'GUICtrlComboBoxEx_GetExtendedUI','GUICtrlComboBoxEx_GetImageList',
+            'GUICtrlComboBoxEx_GetItem','GUICtrlComboBoxEx_GetItemEx',
+            'GUICtrlComboBoxEx_GetItemHeight','GUICtrlComboBoxEx_GetItemImage',
+            'GUICtrlComboBoxEx_GetItemIndent',
+            'GUICtrlComboBoxEx_GetItemOverlayImage',
+            'GUICtrlComboBoxEx_GetItemParam',
+            'GUICtrlComboBoxEx_GetItemSelectedImage',
+            'GUICtrlComboBoxEx_GetItemText','GUICtrlComboBoxEx_GetItemTextLen',
+            'GUICtrlComboBoxEx_GetList','GUICtrlComboBoxEx_GetListArray',
+            'GUICtrlComboBoxEx_GetLocale','GUICtrlComboBoxEx_GetLocaleCountry',
+            'GUICtrlComboBoxEx_GetLocaleLang',
+            'GUICtrlComboBoxEx_GetLocalePrimLang',
+            'GUICtrlComboBoxEx_GetLocaleSubLang',
+            'GUICtrlComboBoxEx_GetMinVisible','GUICtrlComboBoxEx_GetTopIndex',
+            'GUICtrlComboBoxEx_InitStorage','GUICtrlComboBoxEx_InsertString',
+            'GUICtrlComboBoxEx_LimitText','GUICtrlComboBoxEx_ReplaceEditSel',
+            'GUICtrlComboBoxEx_ResetContent','GUICtrlComboBoxEx_SetCurSel',
+            'GUICtrlComboBoxEx_SetDroppedWidth','GUICtrlComboBoxEx_SetEditSel',
+            'GUICtrlComboBoxEx_SetEditText',
+            'GUICtrlComboBoxEx_SetExtendedStyle',
+            'GUICtrlComboBoxEx_SetExtendedUI','GUICtrlComboBoxEx_SetImageList',
+            'GUICtrlComboBoxEx_SetItem','GUICtrlComboBoxEx_SetItemEx',
+            'GUICtrlComboBoxEx_SetItemHeight','GUICtrlComboBoxEx_SetItemImage',
+            'GUICtrlComboBoxEx_SetItemIndent',
+            'GUICtrlComboBoxEx_SetItemOverlayImage',
+            'GUICtrlComboBoxEx_SetItemParam',
+            'GUICtrlComboBoxEx_SetItemSelectedImage',
+            'GUICtrlComboBoxEx_SetMinVisible','GUICtrlComboBoxEx_SetTopIndex',
+            'GUICtrlComboBoxEx_ShowDropDown','GUICtrlDTP_Create',
+            'GUICtrlDTP_Destroy','GUICtrlDTP_GetMCColor','GUICtrlDTP_GetMCFont',
+            'GUICtrlDTP_GetMonthCal','GUICtrlDTP_GetRange',
+            'GUICtrlDTP_GetRangeEx','GUICtrlDTP_GetSystemTime',
+            'GUICtrlDTP_GetSystemTimeEx','GUICtrlDTP_SetFormat',
+            'GUICtrlDTP_SetMCColor','GUICtrlDTP_SetMCFont',
+            'GUICtrlDTP_SetRange','GUICtrlDTP_SetRangeEx',
+            'GUICtrlDTP_SetSystemTime','GUICtrlDTP_SetSystemTimeEx',
+            'GUICtrlEdit_AppendText','GUICtrlEdit_BeginUpdate',
+            'GUICtrlEdit_CanUndo','GUICtrlEdit_CharFromPos',
+            'GUICtrlEdit_Create','GUICtrlEdit_Destroy',
+            'GUICtrlEdit_EmptyUndoBuffer','GUICtrlEdit_EndUpdate',
+            'GUICtrlEdit_Find','GUICtrlEdit_FmtLines',
+            'GUICtrlEdit_GetFirstVisibleLine','GUICtrlEdit_GetLimitText',
+            'GUICtrlEdit_GetLine','GUICtrlEdit_GetLineCount',
+            'GUICtrlEdit_GetMargins','GUICtrlEdit_GetModify',
+            'GUICtrlEdit_GetPasswordChar','GUICtrlEdit_GetRECT',
+            'GUICtrlEdit_GetRECTEx','GUICtrlEdit_GetSel','GUICtrlEdit_GetText',
+            'GUICtrlEdit_GetTextLen','GUICtrlEdit_HideBalloonTip',
+            'GUICtrlEdit_InsertText','GUICtrlEdit_LineFromChar',
+            'GUICtrlEdit_LineIndex','GUICtrlEdit_LineLength',
+            'GUICtrlEdit_LineScroll','GUICtrlEdit_PosFromChar',
+            'GUICtrlEdit_ReplaceSel','GUICtrlEdit_Scroll',
+            'GUICtrlEdit_SetLimitText','GUICtrlEdit_SetMargins',
+            'GUICtrlEdit_SetModify','GUICtrlEdit_SetPasswordChar',
+            'GUICtrlEdit_SetReadOnly','GUICtrlEdit_SetRECT',
+            'GUICtrlEdit_SetRECTEx','GUICtrlEdit_SetRECTNP',
+            'GUICtrlEdit_SetRectNPEx','GUICtrlEdit_SetSel',
+            'GUICtrlEdit_SetTabStops','GUICtrlEdit_SetText',
+            'GUICtrlEdit_ShowBalloonTip','GUICtrlEdit_Undo',
+            'GUICtrlHeader_AddItem','GUICtrlHeader_ClearFilter',
+            'GUICtrlHeader_ClearFilterAll','GUICtrlHeader_Create',
+            'GUICtrlHeader_CreateDragImage','GUICtrlHeader_DeleteItem',
+            'GUICtrlHeader_Destroy','GUICtrlHeader_EditFilter',
+            'GUICtrlHeader_GetBitmapMargin','GUICtrlHeader_GetImageList',
+            'GUICtrlHeader_GetItem','GUICtrlHeader_GetItemAlign',
+            'GUICtrlHeader_GetItemBitmap','GUICtrlHeader_GetItemCount',
+            'GUICtrlHeader_GetItemDisplay','GUICtrlHeader_GetItemFlags',
+            'GUICtrlHeader_GetItemFormat','GUICtrlHeader_GetItemImage',
+            'GUICtrlHeader_GetItemOrder','GUICtrlHeader_GetItemParam',
+            'GUICtrlHeader_GetItemRect','GUICtrlHeader_GetItemRectEx',
+            'GUICtrlHeader_GetItemText','GUICtrlHeader_GetItemWidth',
+            'GUICtrlHeader_GetOrderArray','GUICtrlHeader_GetUnicodeFormat',
+            'GUICtrlHeader_HitTest','GUICtrlHeader_InsertItem',
+            'GUICtrlHeader_Layout','GUICtrlHeader_OrderToIndex',
+            'GUICtrlHeader_SetBitmapMargin',
+            'GUICtrlHeader_SetFilterChangeTimeout',
+            'GUICtrlHeader_SetHotDivider','GUICtrlHeader_SetImageList',
+            'GUICtrlHeader_SetItem','GUICtrlHeader_SetItemAlign',
+            'GUICtrlHeader_SetItemBitmap','GUICtrlHeader_SetItemDisplay',
+            'GUICtrlHeader_SetItemFlags','GUICtrlHeader_SetItemFormat',
+            'GUICtrlHeader_SetItemImage','GUICtrlHeader_SetItemOrder',
+            'GUICtrlHeader_SetItemParam','GUICtrlHeader_SetItemText',
+            'GUICtrlHeader_SetItemWidth','GUICtrlHeader_SetOrderArray',
+            'GUICtrlHeader_SetUnicodeFormat','GUICtrlIpAddress_ClearAddress',
+            'GUICtrlIpAddress_Create','GUICtrlIpAddress_Destroy',
+            'GUICtrlIpAddress_Get','GUICtrlIpAddress_GetArray',
+            'GUICtrlIpAddress_GetEx','GUICtrlIpAddress_IsBlank',
+            'GUICtrlIpAddress_Set','GUICtrlIpAddress_SetArray',
+            'GUICtrlIpAddress_SetEx','GUICtrlIpAddress_SetFocus',
+            'GUICtrlIpAddress_SetFont','GUICtrlIpAddress_SetRange',
+            'GUICtrlIpAddress_ShowHide','GUICtrlListBox_AddFile',
+            'GUICtrlListBox_AddString','GUICtrlListBox_BeginUpdate',
+            'GUICtrlListBox_Create','GUICtrlListBox_DeleteString',
+            'GUICtrlListBox_Destroy','GUICtrlListBox_Dir',
+            'GUICtrlListBox_EndUpdate','GUICtrlListBox_FindInText',
+            'GUICtrlListBox_FindString','GUICtrlListBox_GetAnchorIndex',
+            'GUICtrlListBox_GetCaretIndex','GUICtrlListBox_GetCount',
+            'GUICtrlListBox_GetCurSel','GUICtrlListBox_GetHorizontalExtent',
+            'GUICtrlListBox_GetItemData','GUICtrlListBox_GetItemHeight',
+            'GUICtrlListBox_GetItemRect','GUICtrlListBox_GetItemRectEx',
+            'GUICtrlListBox_GetListBoxInfo','GUICtrlListBox_GetLocale',
+            'GUICtrlListBox_GetLocaleCountry','GUICtrlListBox_GetLocaleLang',
+            'GUICtrlListBox_GetLocalePrimLang',
+            'GUICtrlListBox_GetLocaleSubLang','GUICtrlListBox_GetSel',
+            'GUICtrlListBox_GetSelCount','GUICtrlListBox_GetSelItems',
+            'GUICtrlListBox_GetSelItemsText','GUICtrlListBox_GetText',
+            'GUICtrlListBox_GetTextLen','GUICtrlListBox_GetTopIndex',
+            'GUICtrlListBox_InitStorage','GUICtrlListBox_InsertString',
+            'GUICtrlListBox_ItemFromPoint','GUICtrlListBox_ReplaceString',
+            'GUICtrlListBox_ResetContent','GUICtrlListBox_SelectString',
+            'GUICtrlListBox_SelItemRange','GUICtrlListBox_SelItemRangeEx',
+            'GUICtrlListBox_SetAnchorIndex','GUICtrlListBox_SetCaretIndex',
+            'GUICtrlListBox_SetColumnWidth','GUICtrlListBox_SetCurSel',
+            'GUICtrlListBox_SetHorizontalExtent','GUICtrlListBox_SetItemData',
+            'GUICtrlListBox_SetItemHeight','GUICtrlListBox_SetLocale',
+            'GUICtrlListBox_SetSel','GUICtrlListBox_SetTabStops',
+            'GUICtrlListBox_SetTopIndex','GUICtrlListBox_Sort',
+            'GUICtrlListBox_SwapString','GUICtrlListBox_UpdateHScroll',
+            'GUICtrlListView_AddArray','GUICtrlListView_AddColumn',
+            'GUICtrlListView_AddItem','GUICtrlListView_AddSubItem',
+            'GUICtrlListView_ApproximateViewHeight',
+            'GUICtrlListView_ApproximateViewRect',
+            'GUICtrlListView_ApproximateViewWidth','GUICtrlListView_Arrange',
+            'GUICtrlListView_BeginUpdate','GUICtrlListView_CancelEditLabel',
+            'GUICtrlListView_ClickItem','GUICtrlListView_CopyItems',
+            'GUICtrlListView_Create','GUICtrlListView_CreateDragImage',
+            'GUICtrlListView_CreateSolidBitMap',
+            'GUICtrlListView_DeleteAllItems','GUICtrlListView_DeleteColumn',
+            'GUICtrlListView_DeleteItem','GUICtrlListView_DeleteItemsSelected',
+            'GUICtrlListView_Destroy','GUICtrlListView_DrawDragImage',
+            'GUICtrlListView_EditLabel','GUICtrlListView_EnableGroupView',
+            'GUICtrlListView_EndUpdate','GUICtrlListView_EnsureVisible',
+            'GUICtrlListView_FindInText','GUICtrlListView_FindItem',
+            'GUICtrlListView_FindNearest','GUICtrlListView_FindParam',
+            'GUICtrlListView_FindText','GUICtrlListView_GetBkColor',
+            'GUICtrlListView_GetBkImage','GUICtrlListView_GetCallbackMask',
+            'GUICtrlListView_GetColumn','GUICtrlListView_GetColumnCount',
+            'GUICtrlListView_GetColumnOrder',
+            'GUICtrlListView_GetColumnOrderArray',
+            'GUICtrlListView_GetColumnWidth','GUICtrlListView_GetCounterPage',
+            'GUICtrlListView_GetEditControl',
+            'GUICtrlListView_GetExtendedListViewStyle',
+            'GUICtrlListView_GetGroupInfo',
+            'GUICtrlListView_GetGroupViewEnabled','GUICtrlListView_GetHeader',
+            'GUICtrlListView_GetHotCursor','GUICtrlListView_GetHotItem',
+            'GUICtrlListView_GetHoverTime','GUICtrlListView_GetImageList',
+            'GUICtrlListView_GetISearchString','GUICtrlListView_GetItem',
+            'GUICtrlListView_GetItemChecked','GUICtrlListView_GetItemCount',
+            'GUICtrlListView_GetItemCut','GUICtrlListView_GetItemDropHilited',
+            'GUICtrlListView_GetItemEx','GUICtrlListView_GetItemFocused',
+            'GUICtrlListView_GetItemGroupID','GUICtrlListView_GetItemImage',
+            'GUICtrlListView_GetItemIndent','GUICtrlListView_GetItemParam',
+            'GUICtrlListView_GetItemPosition',
+            'GUICtrlListView_GetItemPositionX',
+            'GUICtrlListView_GetItemPositionY','GUICtrlListView_GetItemRect',
+            'GUICtrlListView_GetItemRectEx','GUICtrlListView_GetItemSelected',
+            'GUICtrlListView_GetItemSpacing','GUICtrlListView_GetItemSpacingX',
+            'GUICtrlListView_GetItemSpacingY','GUICtrlListView_GetItemState',
+            'GUICtrlListView_GetItemStateImage','GUICtrlListView_GetItemText',
+            'GUICtrlListView_GetItemTextArray',
+            'GUICtrlListView_GetItemTextString','GUICtrlListView_GetNextItem',
+            'GUICtrlListView_GetNumberOfWorkAreas','GUICtrlListView_GetOrigin',
+            'GUICtrlListView_GetOriginX','GUICtrlListView_GetOriginY',
+            'GUICtrlListView_GetOutlineColor',
+            'GUICtrlListView_GetSelectedColumn',
+            'GUICtrlListView_GetSelectedCount',
+            'GUICtrlListView_GetSelectedIndices',
+            'GUICtrlListView_GetSelectionMark','GUICtrlListView_GetStringWidth',
+            'GUICtrlListView_GetSubItemRect','GUICtrlListView_GetTextBkColor',
+            'GUICtrlListView_GetTextColor','GUICtrlListView_GetToolTips',
+            'GUICtrlListView_GetTopIndex','GUICtrlListView_GetUnicodeFormat',
+            'GUICtrlListView_GetView','GUICtrlListView_GetViewDetails',
+            'GUICtrlListView_GetViewLarge','GUICtrlListView_GetViewList',
+            'GUICtrlListView_GetViewRect','GUICtrlListView_GetViewSmall',
+            'GUICtrlListView_GetViewTile','GUICtrlListView_HideColumn',
+            'GUICtrlListView_HitTest','GUICtrlListView_InsertColumn',
+            'GUICtrlListView_InsertGroup','GUICtrlListView_InsertItem',
+            'GUICtrlListView_JustifyColumn','GUICtrlListView_MapIDToIndex',
+            'GUICtrlListView_MapIndexToID','GUICtrlListView_RedrawItems',
+            'GUICtrlListView_RegisterSortCallBack',
+            'GUICtrlListView_RemoveAllGroups','GUICtrlListView_RemoveGroup',
+            'GUICtrlListView_Scroll','GUICtrlListView_SetBkColor',
+            'GUICtrlListView_SetBkImage','GUICtrlListView_SetCallBackMask',
+            'GUICtrlListView_SetColumn','GUICtrlListView_SetColumnOrder',
+            'GUICtrlListView_SetColumnOrderArray',
+            'GUICtrlListView_SetColumnWidth',
+            'GUICtrlListView_SetExtendedListViewStyle',
+            'GUICtrlListView_SetGroupInfo','GUICtrlListView_SetHotItem',
+            'GUICtrlListView_SetHoverTime','GUICtrlListView_SetIconSpacing',
+            'GUICtrlListView_SetImageList','GUICtrlListView_SetItem',
+            'GUICtrlListView_SetItemChecked','GUICtrlListView_SetItemCount',
+            'GUICtrlListView_SetItemCut','GUICtrlListView_SetItemDropHilited',
+            'GUICtrlListView_SetItemEx','GUICtrlListView_SetItemFocused',
+            'GUICtrlListView_SetItemGroupID','GUICtrlListView_SetItemImage',
+            'GUICtrlListView_SetItemIndent','GUICtrlListView_SetItemParam',
+            'GUICtrlListView_SetItemPosition',
+            'GUICtrlListView_SetItemPosition32',
+            'GUICtrlListView_SetItemSelected','GUICtrlListView_SetItemState',
+            'GUICtrlListView_SetItemStateImage','GUICtrlListView_SetItemText',
+            'GUICtrlListView_SetOutlineColor',
+            'GUICtrlListView_SetSelectedColumn',
+            'GUICtrlListView_SetSelectionMark','GUICtrlListView_SetTextBkColor',
+            'GUICtrlListView_SetTextColor','GUICtrlListView_SetToolTips',
+            'GUICtrlListView_SetUnicodeFormat','GUICtrlListView_SetView',
+            'GUICtrlListView_SetWorkAreas','GUICtrlListView_SimpleSort',
+            'GUICtrlListView_SortItems','GUICtrlListView_SubItemHitTest',
+            'GUICtrlListView_UnRegisterSortCallBack',
+            'GUICtrlMenu_AddMenuItem','GUICtrlMenu_AppendMenu',
+            'GUICtrlMenu_CheckMenuItem','GUICtrlMenu_CheckRadioItem',
+            'GUICtrlMenu_CreateMenu','GUICtrlMenu_CreatePopup',
+            'GUICtrlMenu_DeleteMenu','GUICtrlMenu_DestroyMenu',
+            'GUICtrlMenu_DrawMenuBar','GUICtrlMenu_EnableMenuItem',
+            'GUICtrlMenu_FindItem','GUICtrlMenu_FindParent',
+            'GUICtrlMenu_GetItemBmp','GUICtrlMenu_GetItemBmpChecked',
+            'GUICtrlMenu_GetItemBmpUnchecked','GUICtrlMenu_GetItemChecked',
+            'GUICtrlMenu_GetItemCount','GUICtrlMenu_GetItemData',
+            'GUICtrlMenu_GetItemDefault','GUICtrlMenu_GetItemDisabled',
+            'GUICtrlMenu_GetItemEnabled','GUICtrlMenu_GetItemGrayed',
+            'GUICtrlMenu_GetItemHighlighted','GUICtrlMenu_GetItemID',
+            'GUICtrlMenu_GetItemInfo','GUICtrlMenu_GetItemRect',
+            'GUICtrlMenu_GetItemRectEx','GUICtrlMenu_GetItemState',
+            'GUICtrlMenu_GetItemStateEx','GUICtrlMenu_GetItemSubMenu',
+            'GUICtrlMenu_GetItemText','GUICtrlMenu_GetItemType',
+            'GUICtrlMenu_GetMenu','GUICtrlMenu_GetMenuBackground',
+            'GUICtrlMenu_GetMenuBarInfo','GUICtrlMenu_GetMenuContextHelpID',
+            'GUICtrlMenu_GetMenuData','GUICtrlMenu_GetMenuDefaultItem',
+            'GUICtrlMenu_GetMenuHeight','GUICtrlMenu_GetMenuInfo',
+            'GUICtrlMenu_GetMenuStyle','GUICtrlMenu_GetSystemMenu',
+            'GUICtrlMenu_InsertMenuItem','GUICtrlMenu_InsertMenuItemEx',
+            'GUICtrlMenu_IsMenu','GUICtrlMenu_LoadMenu',
+            'GUICtrlMenu_MapAccelerator','GUICtrlMenu_MenuItemFromPoint',
+            'GUICtrlMenu_RemoveMenu','GUICtrlMenu_SetItemBitmaps',
+            'GUICtrlMenu_SetItemBmp','GUICtrlMenu_SetItemBmpChecked',
+            'GUICtrlMenu_SetItemBmpUnchecked','GUICtrlMenu_SetItemChecked',
+            'GUICtrlMenu_SetItemData','GUICtrlMenu_SetItemDefault',
+            'GUICtrlMenu_SetItemDisabled','GUICtrlMenu_SetItemEnabled',
+            'GUICtrlMenu_SetItemGrayed','GUICtrlMenu_SetItemHighlighted',
+            'GUICtrlMenu_SetItemID','GUICtrlMenu_SetItemInfo',
+            'GUICtrlMenu_SetItemState','GUICtrlMenu_SetItemSubMenu',
+            'GUICtrlMenu_SetItemText','GUICtrlMenu_SetItemType',
+            'GUICtrlMenu_SetMenu','GUICtrlMenu_SetMenuBackground',
+            'GUICtrlMenu_SetMenuContextHelpID','GUICtrlMenu_SetMenuData',
+            'GUICtrlMenu_SetMenuDefaultItem','GUICtrlMenu_SetMenuHeight',
+            'GUICtrlMenu_SetMenuInfo','GUICtrlMenu_SetMenuStyle',
+            'GUICtrlMenu_TrackPopupMenu','GUICtrlMonthCal_Create',
+            'GUICtrlMonthCal_Destroy','GUICtrlMonthCal_GetColor',
+            'GUICtrlMonthCal_GetColorArray','GUICtrlMonthCal_GetCurSel',
+            'GUICtrlMonthCal_GetCurSelStr','GUICtrlMonthCal_GetFirstDOW',
+            'GUICtrlMonthCal_GetFirstDOWStr','GUICtrlMonthCal_GetMaxSelCount',
+            'GUICtrlMonthCal_GetMaxTodayWidth',
+            'GUICtrlMonthCal_GetMinReqHeight','GUICtrlMonthCal_GetMinReqRect',
+            'GUICtrlMonthCal_GetMinReqRectArray',
+            'GUICtrlMonthCal_GetMinReqWidth','GUICtrlMonthCal_GetMonthDelta',
+            'GUICtrlMonthCal_GetMonthRange','GUICtrlMonthCal_GetMonthRangeMax',
+            'GUICtrlMonthCal_GetMonthRangeMaxStr',
+            'GUICtrlMonthCal_GetMonthRangeMin',
+            'GUICtrlMonthCal_GetMonthRangeMinStr',
+            'GUICtrlMonthCal_GetMonthRangeSpan','GUICtrlMonthCal_GetRange',
+            'GUICtrlMonthCal_GetRangeMax','GUICtrlMonthCal_GetRangeMaxStr',
+            'GUICtrlMonthCal_GetRangeMin','GUICtrlMonthCal_GetRangeMinStr',
+            'GUICtrlMonthCal_GetSelRange','GUICtrlMonthCal_GetSelRangeMax',
+            'GUICtrlMonthCal_GetSelRangeMaxStr',
+            'GUICtrlMonthCal_GetSelRangeMin',
+            'GUICtrlMonthCal_GetSelRangeMinStr','GUICtrlMonthCal_GetToday',
+            'GUICtrlMonthCal_GetTodayStr','GUICtrlMonthCal_GetUnicodeFormat',
+            'GUICtrlMonthCal_HitTest','GUICtrlMonthCal_SetColor',
+            'GUICtrlMonthCal_SetCurSel','GUICtrlMonthCal_SetDayState',
+            'GUICtrlMonthCal_SetFirstDOW','GUICtrlMonthCal_SetMaxSelCount',
+            'GUICtrlMonthCal_SetMonthDelta','GUICtrlMonthCal_SetRange',
+            'GUICtrlMonthCal_SetSelRange','GUICtrlMonthCal_SetToday',
+            'GUICtrlMonthCal_SetUnicodeFormat','GUICtrlRebar_AddBand',
+            'GUICtrlRebar_AddToolBarBand','GUICtrlRebar_BeginDrag',
+            'GUICtrlRebar_Create','GUICtrlRebar_DeleteBand',
+            'GUICtrlRebar_Destroy','GUICtrlRebar_DragMove',
+            'GUICtrlRebar_EndDrag','GUICtrlRebar_GetBandBackColor',
+            'GUICtrlRebar_GetBandBorders','GUICtrlRebar_GetBandBordersEx',
+            'GUICtrlRebar_GetBandChildHandle','GUICtrlRebar_GetBandChildSize',
+            'GUICtrlRebar_GetBandCount','GUICtrlRebar_GetBandForeColor',
+            'GUICtrlRebar_GetBandHeaderSize','GUICtrlRebar_GetBandID',
+            'GUICtrlRebar_GetBandIdealSize','GUICtrlRebar_GetBandLength',
+            'GUICtrlRebar_GetBandLParam','GUICtrlRebar_GetBandMargins',
+            'GUICtrlRebar_GetBandMarginsEx','GUICtrlRebar_GetBandRect',
+            'GUICtrlRebar_GetBandRectEx','GUICtrlRebar_GetBandStyle',
+            'GUICtrlRebar_GetBandStyleBreak',
+            'GUICtrlRebar_GetBandStyleChildEdge',
+            'GUICtrlRebar_GetBandStyleFixedBMP',
+            'GUICtrlRebar_GetBandStyleFixedSize',
+            'GUICtrlRebar_GetBandStyleGripperAlways',
+            'GUICtrlRebar_GetBandStyleHidden',
+            'GUICtrlRebar_GetBandStyleHideTitle',
+            'GUICtrlRebar_GetBandStyleNoGripper',
+            'GUICtrlRebar_GetBandStyleTopAlign',
+            'GUICtrlRebar_GetBandStyleUseChevron',
+            'GUICtrlRebar_GetBandStyleVariableHeight',
+            'GUICtrlRebar_GetBandText','GUICtrlRebar_GetBarHeight',
+            'GUICtrlRebar_GetBKColor','GUICtrlRebar_GetColorScheme',
+            'GUICtrlRebar_GetRowCount','GUICtrlRebar_GetRowHeight',
+            'GUICtrlRebar_GetTextColor','GUICtrlRebar_GetToolTips',
+            'GUICtrlRebar_GetUnicodeFormat','GUICtrlRebar_HitTest',
+            'GUICtrlRebar_IDToIndex','GUICtrlRebar_MaximizeBand',
+            'GUICtrlRebar_MinimizeBand','GUICtrlRebar_MoveBand',
+            'GUICtrlRebar_SetBandBackColor','GUICtrlRebar_SetBandForeColor',
+            'GUICtrlRebar_SetBandHeaderSize','GUICtrlRebar_SetBandID',
+            'GUICtrlRebar_SetBandIdealSize','GUICtrlRebar_SetBandLength',
+            'GUICtrlRebar_SetBandLParam','GUICtrlRebar_SetBandStyle',
+            'GUICtrlRebar_SetBandStyleBreak',
+            'GUICtrlRebar_SetBandStyleChildEdge',
+            'GUICtrlRebar_SetBandStyleFixedBMP',
+            'GUICtrlRebar_SetBandStyleFixedSize',
+            'GUICtrlRebar_SetBandStyleGripperAlways',
+            'GUICtrlRebar_SetBandStyleHidden',
+            'GUICtrlRebar_SetBandStyleHideTitle',
+            'GUICtrlRebar_SetBandStyleNoGripper',
+            'GUICtrlRebar_SetBandStyleTopAlign',
+            'GUICtrlRebar_SetBandStyleUseChevron',
+            'GUICtrlRebar_SetBandStyleVariableHeight',
+            'GUICtrlRebar_SetBandText','GUICtrlRebar_SetBKColor',
+            'GUICtrlRebar_SetColorScheme','GUICtrlRebar_SetTextColor',
+            'GUICtrlRebar_SetToolTips','GUICtrlRebar_SetUnicodeFormat',
+            'GUICtrlRebar_ShowBand','GUICtrlSlider_ClearSel',
+            'GUICtrlSlider_ClearTics','GUICtrlSlider_Create',
+            'GUICtrlSlider_Destroy','GUICtrlSlider_GetBuddy',
+            'GUICtrlSlider_GetChannelRect','GUICtrlSlider_GetLineSize',
+            'GUICtrlSlider_GetNumTics','GUICtrlSlider_GetPageSize',
+            'GUICtrlSlider_GetPos','GUICtrlSlider_GetPTics',
+            'GUICtrlSlider_GetRange','GUICtrlSlider_GetRangeMax',
+            'GUICtrlSlider_GetRangeMin','GUICtrlSlider_GetSel',
+            'GUICtrlSlider_GetSelEnd','GUICtrlSlider_GetSelStart',
+            'GUICtrlSlider_GetThumbLength','GUICtrlSlider_GetThumbRect',
+            'GUICtrlSlider_GetThumbRectEx','GUICtrlSlider_GetTic',
+            'GUICtrlSlider_GetTicPos','GUICtrlSlider_GetToolTips',
+            'GUICtrlSlider_GetUnicodeFormat','GUICtrlSlider_SetBuddy',
+            'GUICtrlSlider_SetLineSize','GUICtrlSlider_SetPageSize',
+            'GUICtrlSlider_SetPos','GUICtrlSlider_SetRange',
+            'GUICtrlSlider_SetRangeMax','GUICtrlSlider_SetRangeMin',
+            'GUICtrlSlider_SetSel','GUICtrlSlider_SetSelEnd',
+            'GUICtrlSlider_SetSelStart','GUICtrlSlider_SetThumbLength',
+            'GUICtrlSlider_SetTic','GUICtrlSlider_SetTicFreq',
+            'GUICtrlSlider_SetTipSide','GUICtrlSlider_SetToolTips',
+            'GUICtrlSlider_SetUnicodeFormat','GUICtrlStatusBar_Create',
+            'GUICtrlStatusBar_Destroy','GUICtrlStatusBar_EmbedControl',
+            'GUICtrlStatusBar_GetBorders','GUICtrlStatusBar_GetBordersHorz',
+            'GUICtrlStatusBar_GetBordersRect','GUICtrlStatusBar_GetBordersVert',
+            'GUICtrlStatusBar_GetCount','GUICtrlStatusBar_GetHeight',
+            'GUICtrlStatusBar_GetIcon','GUICtrlStatusBar_GetParts',
+            'GUICtrlStatusBar_GetRect','GUICtrlStatusBar_GetRectEx',
+            'GUICtrlStatusBar_GetText','GUICtrlStatusBar_GetTextFlags',
+            'GUICtrlStatusBar_GetTextLength','GUICtrlStatusBar_GetTextLengthEx',
+            'GUICtrlStatusBar_GetTipText','GUICtrlStatusBar_GetUnicodeFormat',
+            'GUICtrlStatusBar_GetWidth','GUICtrlStatusBar_IsSimple',
+            'GUICtrlStatusBar_Resize','GUICtrlStatusBar_SetBkColor',
+            'GUICtrlStatusBar_SetIcon','GUICtrlStatusBar_SetMinHeight',
+            'GUICtrlStatusBar_SetParts','GUICtrlStatusBar_SetSimple',
+            'GUICtrlStatusBar_SetText','GUICtrlStatusBar_SetTipText',
+            'GUICtrlStatusBar_SetUnicodeFormat','GUICtrlStatusBar_ShowHide',
+            'GUICtrlTab_Create','GUICtrlTab_DeleteAllItems',
+            'GUICtrlTab_DeleteItem','GUICtrlTab_DeselectAll',
+            'GUICtrlTab_Destroy','GUICtrlTab_FindTab','GUICtrlTab_GetCurFocus',
+            'GUICtrlTab_GetCurSel','GUICtrlTab_GetDisplayRect',
+            'GUICtrlTab_GetDisplayRectEx','GUICtrlTab_GetExtendedStyle',
+            'GUICtrlTab_GetImageList','GUICtrlTab_GetItem',
+            'GUICtrlTab_GetItemCount','GUICtrlTab_GetItemImage',
+            'GUICtrlTab_GetItemParam','GUICtrlTab_GetItemRect',
+            'GUICtrlTab_GetItemRectEx','GUICtrlTab_GetItemState',
+            'GUICtrlTab_GetItemText','GUICtrlTab_GetRowCount',
+            'GUICtrlTab_GetToolTips','GUICtrlTab_GetUnicodeFormat',
+            'GUICtrlTab_HighlightItem','GUICtrlTab_HitTest',
+            'GUICtrlTab_InsertItem','GUICtrlTab_RemoveImage',
+            'GUICtrlTab_SetCurFocus','GUICtrlTab_SetCurSel',
+            'GUICtrlTab_SetExtendedStyle','GUICtrlTab_SetImageList',
+            'GUICtrlTab_SetItem','GUICtrlTab_SetItemImage',
+            'GUICtrlTab_SetItemParam','GUICtrlTab_SetItemSize',
+            'GUICtrlTab_SetItemState','GUICtrlTab_SetItemText',
+            'GUICtrlTab_SetMinTabWidth','GUICtrlTab_SetPadding',
+            'GUICtrlTab_SetToolTips','GUICtrlTab_SetUnicodeFormat',
+            'GUICtrlToolbar_AddBitmap','GUICtrlToolbar_AddButton',
+            'GUICtrlToolbar_AddButtonSep','GUICtrlToolbar_AddString',
+            'GUICtrlToolbar_ButtonCount','GUICtrlToolbar_CheckButton',
+            'GUICtrlToolbar_ClickAccel','GUICtrlToolbar_ClickButton',
+            'GUICtrlToolbar_ClickIndex','GUICtrlToolbar_CommandToIndex',
+            'GUICtrlToolbar_Create','GUICtrlToolbar_Customize',
+            'GUICtrlToolbar_DeleteButton','GUICtrlToolbar_Destroy',
+            'GUICtrlToolbar_EnableButton','GUICtrlToolbar_FindToolbar',
+            'GUICtrlToolbar_GetAnchorHighlight','GUICtrlToolbar_GetBitmapFlags',
+            'GUICtrlToolbar_GetButtonBitmap','GUICtrlToolbar_GetButtonInfo',
+            'GUICtrlToolbar_GetButtonInfoEx','GUICtrlToolbar_GetButtonParam',
+            'GUICtrlToolbar_GetButtonRect','GUICtrlToolbar_GetButtonRectEx',
+            'GUICtrlToolbar_GetButtonSize','GUICtrlToolbar_GetButtonState',
+            'GUICtrlToolbar_GetButtonStyle','GUICtrlToolbar_GetButtonText',
+            'GUICtrlToolbar_GetColorScheme',
+            'GUICtrlToolbar_GetDisabledImageList',
+            'GUICtrlToolbar_GetExtendedStyle','GUICtrlToolbar_GetHotImageList',
+            'GUICtrlToolbar_GetHotItem','GUICtrlToolbar_GetImageList',
+            'GUICtrlToolbar_GetInsertMark','GUICtrlToolbar_GetInsertMarkColor',
+            'GUICtrlToolbar_GetMaxSize','GUICtrlToolbar_GetMetrics',
+            'GUICtrlToolbar_GetPadding','GUICtrlToolbar_GetRows',
+            'GUICtrlToolbar_GetString','GUICtrlToolbar_GetStyle',
+            'GUICtrlToolbar_GetStyleAltDrag',
+            'GUICtrlToolbar_GetStyleCustomErase','GUICtrlToolbar_GetStyleFlat',
+            'GUICtrlToolbar_GetStyleList','GUICtrlToolbar_GetStyleRegisterDrop',
+            'GUICtrlToolbar_GetStyleToolTips',
+            'GUICtrlToolbar_GetStyleTransparent',
+            'GUICtrlToolbar_GetStyleWrapable','GUICtrlToolbar_GetTextRows',
+            'GUICtrlToolbar_GetToolTips','GUICtrlToolbar_GetUnicodeFormat',
+            'GUICtrlToolbar_HideButton','GUICtrlToolbar_HighlightButton',
+            'GUICtrlToolbar_HitTest','GUICtrlToolbar_IndexToCommand',
+            'GUICtrlToolbar_InsertButton','GUICtrlToolbar_InsertMarkHitTest',
+            'GUICtrlToolbar_IsButtonChecked','GUICtrlToolbar_IsButtonEnabled',
+            'GUICtrlToolbar_IsButtonHidden',
+            'GUICtrlToolbar_IsButtonHighlighted',
+            'GUICtrlToolbar_IsButtonIndeterminate',
+            'GUICtrlToolbar_IsButtonPressed','GUICtrlToolbar_LoadBitmap',
+            'GUICtrlToolbar_LoadImages','GUICtrlToolbar_MapAccelerator',
+            'GUICtrlToolbar_MoveButton','GUICtrlToolbar_PressButton',
+            'GUICtrlToolbar_SetAnchorHighlight','GUICtrlToolbar_SetBitmapSize',
+            'GUICtrlToolbar_SetButtonBitMap','GUICtrlToolbar_SetButtonInfo',
+            'GUICtrlToolbar_SetButtonInfoEx','GUICtrlToolbar_SetButtonParam',
+            'GUICtrlToolbar_SetButtonSize','GUICtrlToolbar_SetButtonState',
+            'GUICtrlToolbar_SetButtonStyle','GUICtrlToolbar_SetButtonText',
+            'GUICtrlToolbar_SetButtonWidth','GUICtrlToolbar_SetCmdID',
+            'GUICtrlToolbar_SetColorScheme',
+            'GUICtrlToolbar_SetDisabledImageList',
+            'GUICtrlToolbar_SetDrawTextFlags','GUICtrlToolbar_SetExtendedStyle',
+            'GUICtrlToolbar_SetHotImageList','GUICtrlToolbar_SetHotItem',
+            'GUICtrlToolbar_SetImageList','GUICtrlToolbar_SetIndent',
+            'GUICtrlToolbar_SetIndeterminate','GUICtrlToolbar_SetInsertMark',
+            'GUICtrlToolbar_SetInsertMarkColor','GUICtrlToolbar_SetMaxTextRows',
+            'GUICtrlToolbar_SetMetrics','GUICtrlToolbar_SetPadding',
+            'GUICtrlToolbar_SetParent','GUICtrlToolbar_SetRows',
+            'GUICtrlToolbar_SetStyle','GUICtrlToolbar_SetStyleAltDrag',
+            'GUICtrlToolbar_SetStyleCustomErase','GUICtrlToolbar_SetStyleFlat',
+            'GUICtrlToolbar_SetStyleList','GUICtrlToolbar_SetStyleRegisterDrop',
+            'GUICtrlToolbar_SetStyleToolTips',
+            'GUICtrlToolbar_SetStyleTransparent',
+            'GUICtrlToolbar_SetStyleWrapable','GUICtrlToolbar_SetToolTips',
+            'GUICtrlToolbar_SetUnicodeFormat','GUICtrlToolbar_SetWindowTheme',
+            'GUICtrlTreeView_Add','GUICtrlTreeView_AddChild',
+            'GUICtrlTreeView_AddChildFirst','GUICtrlTreeView_AddFirst',
+            'GUICtrlTreeView_BeginUpdate','GUICtrlTreeView_ClickItem',
+            'GUICtrlTreeView_Create','GUICtrlTreeView_CreateDragImage',
+            'GUICtrlTreeView_CreateSolidBitMap','GUICtrlTreeView_Delete',
+            'GUICtrlTreeView_DeleteAll','GUICtrlTreeView_DeleteChildren',
+            'GUICtrlTreeView_Destroy','GUICtrlTreeView_DisplayRect',
+            'GUICtrlTreeView_DisplayRectEx','GUICtrlTreeView_EditText',
+            'GUICtrlTreeView_EndEdit','GUICtrlTreeView_EndUpdate',
+            'GUICtrlTreeView_EnsureVisible','GUICtrlTreeView_Expand',
+            'GUICtrlTreeView_ExpandedOnce','GUICtrlTreeView_FindItem',
+            'GUICtrlTreeView_FindItemEx','GUICtrlTreeView_GetBkColor',
+            'GUICtrlTreeView_GetBold','GUICtrlTreeView_GetChecked',
+            'GUICtrlTreeView_GetChildCount','GUICtrlTreeView_GetChildren',
+            'GUICtrlTreeView_GetCount','GUICtrlTreeView_GetCut',
+            'GUICtrlTreeView_GetDropTarget','GUICtrlTreeView_GetEditControl',
+            'GUICtrlTreeView_GetExpanded','GUICtrlTreeView_GetFirstChild',
+            'GUICtrlTreeView_GetFirstItem','GUICtrlTreeView_GetFirstVisible',
+            'GUICtrlTreeView_GetFocused','GUICtrlTreeView_GetHeight',
+            'GUICtrlTreeView_GetImageIndex',
+            'GUICtrlTreeView_GetImageListIconHandle',
+            'GUICtrlTreeView_GetIndent','GUICtrlTreeView_GetInsertMarkColor',
+            'GUICtrlTreeView_GetISearchString','GUICtrlTreeView_GetItemByIndex',
+            'GUICtrlTreeView_GetItemHandle','GUICtrlTreeView_GetItemParam',
+            'GUICtrlTreeView_GetLastChild','GUICtrlTreeView_GetLineColor',
+            'GUICtrlTreeView_GetNext','GUICtrlTreeView_GetNextChild',
+            'GUICtrlTreeView_GetNextSibling','GUICtrlTreeView_GetNextVisible',
+            'GUICtrlTreeView_GetNormalImageList',
+            'GUICtrlTreeView_GetParentHandle','GUICtrlTreeView_GetParentParam',
+            'GUICtrlTreeView_GetPrev','GUICtrlTreeView_GetPrevChild',
+            'GUICtrlTreeView_GetPrevSibling','GUICtrlTreeView_GetPrevVisible',
+            'GUICtrlTreeView_GetScrollTime','GUICtrlTreeView_GetSelected',
+            'GUICtrlTreeView_GetSelectedImageIndex',
+            'GUICtrlTreeView_GetSelection','GUICtrlTreeView_GetSiblingCount',
+            'GUICtrlTreeView_GetState','GUICtrlTreeView_GetStateImageIndex',
+            'GUICtrlTreeView_GetStateImageList','GUICtrlTreeView_GetText',
+            'GUICtrlTreeView_GetTextColor','GUICtrlTreeView_GetToolTips',
+            'GUICtrlTreeView_GetTree','GUICtrlTreeView_GetUnicodeFormat',
+            'GUICtrlTreeView_GetVisible','GUICtrlTreeView_GetVisibleCount',
+            'GUICtrlTreeView_HitTest','GUICtrlTreeView_HitTestEx',
+            'GUICtrlTreeView_HitTestItem','GUICtrlTreeView_Index',
+            'GUICtrlTreeView_InsertItem','GUICtrlTreeView_IsFirstItem',
+            'GUICtrlTreeView_IsParent','GUICtrlTreeView_Level',
+            'GUICtrlTreeView_SelectItem','GUICtrlTreeView_SelectItemByIndex',
+            'GUICtrlTreeView_SetBkColor','GUICtrlTreeView_SetBold',
+            'GUICtrlTreeView_SetChecked','GUICtrlTreeView_SetCheckedByIndex',
+            'GUICtrlTreeView_SetChildren','GUICtrlTreeView_SetCut',
+            'GUICtrlTreeView_SetDropTarget','GUICtrlTreeView_SetFocused',
+            'GUICtrlTreeView_SetHeight','GUICtrlTreeView_SetIcon',
+            'GUICtrlTreeView_SetImageIndex','GUICtrlTreeView_SetIndent',
+            'GUICtrlTreeView_SetInsertMark',
+            'GUICtrlTreeView_SetInsertMarkColor',
+            'GUICtrlTreeView_SetItemHeight','GUICtrlTreeView_SetItemParam',
+            'GUICtrlTreeView_SetLineColor','GUICtrlTreeView_SetNormalImageList',
+            'GUICtrlTreeView_SetScrollTime','GUICtrlTreeView_SetSelected',
+            'GUICtrlTreeView_SetSelectedImageIndex','GUICtrlTreeView_SetState',
+            'GUICtrlTreeView_SetStateImageIndex',
+            'GUICtrlTreeView_SetStateImageList','GUICtrlTreeView_SetText',
+            'GUICtrlTreeView_SetTextColor','GUICtrlTreeView_SetToolTips',
+            'GUICtrlTreeView_SetUnicodeFormat','GUICtrlTreeView_Sort',
+            'GUIImageList_Add','GUIImageList_AddBitmap','GUIImageList_AddIcon',
+            'GUIImageList_AddMasked','GUIImageList_BeginDrag',
+            'GUIImageList_Copy','GUIImageList_Create','GUIImageList_Destroy',
+            'GUIImageList_DestroyIcon','GUIImageList_DragEnter',
+            'GUIImageList_DragLeave','GUIImageList_DragMove',
+            'GUIImageList_Draw','GUIImageList_DrawEx','GUIImageList_Duplicate',
+            'GUIImageList_EndDrag','GUIImageList_GetBkColor',
+            'GUIImageList_GetIcon','GUIImageList_GetIconHeight',
+            'GUIImageList_GetIconSize','GUIImageList_GetIconSizeEx',
+            'GUIImageList_GetIconWidth','GUIImageList_GetImageCount',
+            'GUIImageList_GetImageInfoEx','GUIImageList_Remove',
+            'GUIImageList_ReplaceIcon','GUIImageList_SetBkColor',
+            'GUIImageList_SetIconSize','GUIImageList_SetImageCount',
+            'GUIImageList_Swap','GUIScrollBars_EnableScrollBar',
+            'GUIScrollBars_GetScrollBarInfoEx','GUIScrollBars_GetScrollBarRect',
+            'GUIScrollBars_GetScrollBarRGState',
+            'GUIScrollBars_GetScrollBarXYLineButton',
+            'GUIScrollBars_GetScrollBarXYThumbBottom',
+            'GUIScrollBars_GetScrollBarXYThumbTop',
+            'GUIScrollBars_GetScrollInfo','GUIScrollBars_GetScrollInfoEx',
+            'GUIScrollBars_GetScrollInfoMax','GUIScrollBars_GetScrollInfoMin',
+            'GUIScrollBars_GetScrollInfoPage','GUIScrollBars_GetScrollInfoPos',
+            'GUIScrollBars_GetScrollInfoTrackPos','GUIScrollBars_GetScrollPos',
+            'GUIScrollBars_GetScrollRange','GUIScrollBars_Init',
+            'GUIScrollBars_ScrollWindow','GUIScrollBars_SetScrollInfo',
+            'GUIScrollBars_SetScrollInfoMax','GUIScrollBars_SetScrollInfoMin',
+            'GUIScrollBars_SetScrollInfoPage','GUIScrollBars_SetScrollInfoPos',
+            'GUIScrollBars_SetScrollRange','GUIScrollBars_ShowScrollBar',
+            'GUIToolTip_Activate','GUIToolTip_AddTool','GUIToolTip_AdjustRect',
+            'GUIToolTip_BitsToTTF','GUIToolTip_Create','GUIToolTip_DelTool',
+            'GUIToolTip_Destroy','GUIToolTip_EnumTools',
+            'GUIToolTip_GetBubbleHeight','GUIToolTip_GetBubbleSize',
+            'GUIToolTip_GetBubbleWidth','GUIToolTip_GetCurrentTool',
+            'GUIToolTip_GetDelayTime','GUIToolTip_GetMargin',
+            'GUIToolTip_GetMarginEx','GUIToolTip_GetMaxTipWidth',
+            'GUIToolTip_GetText','GUIToolTip_GetTipBkColor',
+            'GUIToolTip_GetTipTextColor','GUIToolTip_GetTitleBitMap',
+            'GUIToolTip_GetTitleText','GUIToolTip_GetToolCount',
+            'GUIToolTip_GetToolInfo','GUIToolTip_HitTest',
+            'GUIToolTip_NewToolRect','GUIToolTip_Pop','GUIToolTip_PopUp',
+            'GUIToolTip_SetDelayTime','GUIToolTip_SetMargin',
+            'GUIToolTip_SetMaxTipWidth','GUIToolTip_SetTipBkColor',
+            'GUIToolTip_SetTipTextColor','GUIToolTip_SetTitle',
+            'GUIToolTip_SetToolInfo','GUIToolTip_SetWindowTheme',
+            'GUIToolTip_ToolExists','GUIToolTip_ToolToArray',
+            'GUIToolTip_TrackActivate','GUIToolTip_TrackPosition',
+            'GUIToolTip_TTFToBits','GUIToolTip_Update',
+            'GUIToolTip_UpdateTipText','HexToString','IE_Example',
+            'IE_Introduction','IE_VersionInfo','IEAction','IEAttach',
+            'IEBodyReadHTML','IEBodyReadText','IEBodyWriteHTML','IECreate',
+            'IECreateEmbedded','IEDocGetObj','IEDocInsertHTML',
+            'IEDocInsertText','IEDocReadHTML','IEDocWriteHTML',
+            'IEErrorHandlerDeRegister','IEErrorHandlerRegister','IEErrorNotify',
+            'IEFormElementCheckBoxSelect','IEFormElementGetCollection',
+            'IEFormElementGetObjByName','IEFormElementGetValue',
+            'IEFormElementOptionSelect','IEFormElementRadioSelect',
+            'IEFormElementSetValue','IEFormGetCollection','IEFormGetObjByName',
+            'IEFormImageClick','IEFormReset','IEFormSubmit',
+            'IEFrameGetCollection','IEFrameGetObjByName','IEGetObjById',
+            'IEGetObjByName','IEHeadInsertEventScript','IEImgClick',
+            'IEImgGetCollection','IEIsFrameSet','IELinkClickByIndex',
+            'IELinkClickByText','IELinkGetCollection','IELoadWait',
+            'IELoadWaitTimeout','IENavigate','IEPropertyGet','IEPropertySet',
+            'IEQuit','IETableGetCollection','IETableWriteToArray',
+            'IETagNameAllGetCollection','IETagNameGetCollection','Iif',
+            'INetExplorerCapable','INetGetSource','INetMail','INetSmtpMail',
+            'IsPressed','MathCheckDiv','Max','MemGlobalAlloc','MemGlobalFree',
+            'MemGlobalLock','MemGlobalSize','MemGlobalUnlock','MemMoveMemory',
+            'MemMsgBox','MemShowError','MemVirtualAlloc','MemVirtualAllocEx',
+            'MemVirtualFree','MemVirtualFreeEx','Min','MouseTrap',
+            'NamedPipes_CallNamedPipe','NamedPipes_ConnectNamedPipe',
+            'NamedPipes_CreateNamedPipe','NamedPipes_CreatePipe',
+            'NamedPipes_DisconnectNamedPipe',
+            'NamedPipes_GetNamedPipeHandleState','NamedPipes_GetNamedPipeInfo',
+            'NamedPipes_PeekNamedPipe','NamedPipes_SetNamedPipeHandleState',
+            'NamedPipes_TransactNamedPipe','NamedPipes_WaitNamedPipe',
+            'Net_Share_ConnectionEnum','Net_Share_FileClose',
+            'Net_Share_FileEnum','Net_Share_FileGetInfo','Net_Share_PermStr',
+            'Net_Share_ResourceStr','Net_Share_SessionDel',
+            'Net_Share_SessionEnum','Net_Share_SessionGetInfo',
+            'Net_Share_ShareAdd','Net_Share_ShareCheck','Net_Share_ShareDel',
+            'Net_Share_ShareEnum','Net_Share_ShareGetInfo',
+            'Net_Share_ShareSetInfo','Net_Share_StatisticsGetSvr',
+            'Net_Share_StatisticsGetWrk','Now','NowCalc','NowCalcDate',
+            'NowDate','NowTime','PathFull','PathMake','PathSplit',
+            'ProcessGetName','ProcessGetPriority','Radian',
+            'ReplaceStringInFile','RunDOS','ScreenCapture_Capture',
+            'ScreenCapture_CaptureWnd','ScreenCapture_SaveImage',
+            'ScreenCapture_SetBMPFormat','ScreenCapture_SetJPGQuality',
+            'ScreenCapture_SetTIFColorDepth','ScreenCapture_SetTIFCompression',
+            'Security__AdjustTokenPrivileges','Security__GetAccountSid',
+            'Security__GetLengthSid','Security__GetTokenInformation',
+            'Security__ImpersonateSelf','Security__IsValidSid',
+            'Security__LookupAccountName','Security__LookupAccountSid',
+            'Security__LookupPrivilegeValue','Security__OpenProcessToken',
+            'Security__OpenThreadToken','Security__OpenThreadTokenEx',
+            'Security__SetPrivilege','Security__SidToStringSid',
+            'Security__SidTypeStr','Security__StringSidToSid','SendMessage',
+            'SendMessageA','SetDate','SetTime','Singleton','SoundClose',
+            'SoundLength','SoundOpen','SoundPause','SoundPlay','SoundPos',
+            'SoundResume','SoundSeek','SoundStatus','SoundStop',
+            'SQLite_Changes','SQLite_Close','SQLite_Display2DResult',
+            'SQLite_Encode','SQLite_ErrCode','SQLite_ErrMsg','SQLite_Escape',
+            'SQLite_Exec','SQLite_FetchData','SQLite_FetchNames',
+            'SQLite_GetTable','SQLite_GetTable2d','SQLite_LastInsertRowID',
+            'SQLite_LibVersion','SQLite_Open','SQLite_Query',
+            'SQLite_QueryFinalize','SQLite_QueryReset','SQLite_QuerySingleRow',
+            'SQLite_SaveMode','SQLite_SetTimeout','SQLite_Shutdown',
+            'SQLite_SQLiteExe','SQLite_Startup','SQLite_TotalChanges',
+            'StringAddComma','StringBetween','StringEncrypt','StringInsert',
+            'StringProper','StringRepeat','StringReverse','StringSplit',
+            'StringToHex','TCPIpToName','TempFile','TicksToTime','Timer_Diff',
+            'Timer_GetTimerID','Timer_Init','Timer_KillAllTimers',
+            'Timer_KillTimer','Timer_SetTimer','TimeToTicks','VersionCompare',
+            'viClose','viExecCommand','viFindGpib','viGpibBusReset','viGTL',
+            'viOpen','viSetAttribute','viSetTimeout','WeekNumberISO',
+            'WinAPI_AttachConsole','WinAPI_AttachThreadInput','WinAPI_Beep',
+            'WinAPI_BitBlt','WinAPI_CallNextHookEx','WinAPI_Check',
+            'WinAPI_ClientToScreen','WinAPI_CloseHandle',
+            'WinAPI_CommDlgExtendedError','WinAPI_CopyIcon',
+            'WinAPI_CreateBitmap','WinAPI_CreateCompatibleBitmap',
+            'WinAPI_CreateCompatibleDC','WinAPI_CreateEvent',
+            'WinAPI_CreateFile','WinAPI_CreateFont','WinAPI_CreateFontIndirect',
+            'WinAPI_CreateProcess','WinAPI_CreateSolidBitmap',
+            'WinAPI_CreateSolidBrush','WinAPI_CreateWindowEx',
+            'WinAPI_DefWindowProc','WinAPI_DeleteDC','WinAPI_DeleteObject',
+            'WinAPI_DestroyIcon','WinAPI_DestroyWindow','WinAPI_DrawEdge',
+            'WinAPI_DrawFrameControl','WinAPI_DrawIcon','WinAPI_DrawIconEx',
+            'WinAPI_DrawText','WinAPI_EnableWindow','WinAPI_EnumDisplayDevices',
+            'WinAPI_EnumWindows','WinAPI_EnumWindowsPopup',
+            'WinAPI_EnumWindowsTop','WinAPI_ExpandEnvironmentStrings',
+            'WinAPI_ExtractIconEx','WinAPI_FatalAppExit','WinAPI_FillRect',
+            'WinAPI_FindExecutable','WinAPI_FindWindow','WinAPI_FlashWindow',
+            'WinAPI_FlashWindowEx','WinAPI_FloatToInt',
+            'WinAPI_FlushFileBuffers','WinAPI_FormatMessage','WinAPI_FrameRect',
+            'WinAPI_FreeLibrary','WinAPI_GetAncestor','WinAPI_GetAsyncKeyState',
+            'WinAPI_GetClassName','WinAPI_GetClientHeight',
+            'WinAPI_GetClientRect','WinAPI_GetClientWidth',
+            'WinAPI_GetCurrentProcess','WinAPI_GetCurrentProcessID',
+            'WinAPI_GetCurrentThread','WinAPI_GetCurrentThreadId',
+            'WinAPI_GetCursorInfo','WinAPI_GetDC','WinAPI_GetDesktopWindow',
+            'WinAPI_GetDeviceCaps','WinAPI_GetDIBits','WinAPI_GetDlgCtrlID',
+            'WinAPI_GetDlgItem','WinAPI_GetFileSizeEx','WinAPI_GetFocus',
+            'WinAPI_GetForegroundWindow','WinAPI_GetIconInfo',
+            'WinAPI_GetLastError','WinAPI_GetLastErrorMessage',
+            'WinAPI_GetModuleHandle','WinAPI_GetMousePos','WinAPI_GetMousePosX',
+            'WinAPI_GetMousePosY','WinAPI_GetObject','WinAPI_GetOpenFileName',
+            'WinAPI_GetOverlappedResult','WinAPI_GetParent',
+            'WinAPI_GetProcessAffinityMask','WinAPI_GetSaveFileName',
+            'WinAPI_GetStdHandle','WinAPI_GetStockObject','WinAPI_GetSysColor',
+            'WinAPI_GetSysColorBrush','WinAPI_GetSystemMetrics',
+            'WinAPI_GetTextExtentPoint32','WinAPI_GetWindow',
+            'WinAPI_GetWindowDC','WinAPI_GetWindowHeight',
+            'WinAPI_GetWindowLong','WinAPI_GetWindowRect',
+            'WinAPI_GetWindowText','WinAPI_GetWindowThreadProcessId',
+            'WinAPI_GetWindowWidth','WinAPI_GetXYFromPoint',
+            'WinAPI_GlobalMemStatus','WinAPI_GUIDFromString',
+            'WinAPI_GUIDFromStringEx','WinAPI_HiWord','WinAPI_InProcess',
+            'WinAPI_IntToFloat','WinAPI_InvalidateRect','WinAPI_IsClassName',
+            'WinAPI_IsWindow','WinAPI_IsWindowVisible','WinAPI_LoadBitmap',
+            'WinAPI_LoadImage','WinAPI_LoadLibrary','WinAPI_LoadLibraryEx',
+            'WinAPI_LoadShell32Icon','WinAPI_LoadString','WinAPI_LocalFree',
+            'WinAPI_LoWord','WinAPI_MakeDWord','WinAPI_MAKELANGID',
+            'WinAPI_MAKELCID','WinAPI_MakeLong','WinAPI_MessageBeep',
+            'WinAPI_Mouse_Event','WinAPI_MoveWindow','WinAPI_MsgBox',
+            'WinAPI_MulDiv','WinAPI_MultiByteToWideChar',
+            'WinAPI_MultiByteToWideCharEx','WinAPI_OpenProcess',
+            'WinAPI_PointFromRect','WinAPI_PostMessage','WinAPI_PrimaryLangId',
+            'WinAPI_PtInRect','WinAPI_ReadFile','WinAPI_ReadProcessMemory',
+            'WinAPI_RectIsEmpty','WinAPI_RedrawWindow',
+            'WinAPI_RegisterWindowMessage','WinAPI_ReleaseCapture',
+            'WinAPI_ReleaseDC','WinAPI_ScreenToClient','WinAPI_SelectObject',
+            'WinAPI_SetBkColor','WinAPI_SetCapture','WinAPI_SetCursor',
+            'WinAPI_SetDefaultPrinter','WinAPI_SetDIBits','WinAPI_SetEvent',
+            'WinAPI_SetFocus','WinAPI_SetFont','WinAPI_SetHandleInformation',
+            'WinAPI_SetLastError','WinAPI_SetParent',
+            'WinAPI_SetProcessAffinityMask','WinAPI_SetSysColors',
+            'WinAPI_SetTextColor','WinAPI_SetWindowLong','WinAPI_SetWindowPos',
+            'WinAPI_SetWindowsHookEx','WinAPI_SetWindowText',
+            'WinAPI_ShowCursor','WinAPI_ShowError','WinAPI_ShowMsg',
+            'WinAPI_ShowWindow','WinAPI_StringFromGUID','WinAPI_SubLangId',
+            'WinAPI_SystemParametersInfo','WinAPI_TwipsPerPixelX',
+            'WinAPI_TwipsPerPixelY','WinAPI_UnhookWindowsHookEx',
+            'WinAPI_UpdateLayeredWindow','WinAPI_UpdateWindow',
+            'WinAPI_ValidateClassName','WinAPI_WaitForInputIdle',
+            'WinAPI_WaitForMultipleObjects','WinAPI_WaitForSingleObject',
+            'WinAPI_WideCharToMultiByte','WinAPI_WindowFromPoint',
+            'WinAPI_WriteConsole','WinAPI_WriteFile',
+            'WinAPI_WriteProcessMemory','WinNet_AddConnection',
+            'WinNet_AddConnection2','WinNet_AddConnection3',
+            'WinNet_CancelConnection','WinNet_CancelConnection2',
+            'WinNet_CloseEnum','WinNet_ConnectionDialog',
+            'WinNet_ConnectionDialog1','WinNet_DisconnectDialog',
+            'WinNet_DisconnectDialog1','WinNet_EnumResource',
+            'WinNet_GetConnection','WinNet_GetConnectionPerformance',
+            'WinNet_GetLastError','WinNet_GetNetworkInformation',
+            'WinNet_GetProviderName','WinNet_GetResourceInformation',
+            'WinNet_GetResourceParent','WinNet_GetUniversalName',
+            'WinNet_GetUser','WinNet_OpenEnum','WinNet_RestoreConnection',
+            'WinNet_UseConnection','Word_VersionInfo','WordAttach','WordCreate',
+            'WordDocAdd','WordDocAddLink','WordDocAddPicture','WordDocClose',
+            'WordDocFindReplace','WordDocGetCollection',
+            'WordDocLinkGetCollection','WordDocOpen','WordDocPrint',
+            'WordDocPropertyGet','WordDocPropertySet','WordDocSave',
+            'WordDocSaveAs','WordErrorHandlerDeRegister',
+            'WordErrorHandlerRegister','WordErrorNotify','WordMacroRun',
+            'WordPropertyGet','WordPropertySet','WordQuit'
+            ),
+        5 => array(
+            'ce','comments-end','comments-start','cs','include','include-once',
+            'NoTrayIcon','RequireAdmin'
+            ),
+        6 => array(
+            'AutoIt3Wrapper_Au3Check_Parameters',
+            'AutoIt3Wrapper_Au3Check_Stop_OnWarning',
+            'AutoIt3Wrapper_Change2CUI','AutoIt3Wrapper_Compression',
+            'AutoIt3Wrapper_cvsWrapper_Parameters','AutoIt3Wrapper_Icon',
+            'AutoIt3Wrapper_Outfile','AutoIt3Wrapper_Outfile_Type',
+            'AutoIt3Wrapper_Plugin_Funcs','AutoIt3Wrapper_Res_Comment',
+            'AutoIt3Wrapper_Res_Description','AutoIt3Wrapper_Res_Field',
+            'AutoIt3Wrapper_Res_File_Add','AutoIt3Wrapper_Res_Fileversion',
+            'AutoIt3Wrapper_Res_FileVersion_AutoIncrement',
+            'AutoIt3Wrapper_Res_Icon_Add','AutoIt3Wrapper_Res_Language',
+            'AutoIt3Wrapper_Res_LegalCopyright',
+            'AutoIt3Wrapper_res_requestedExecutionLevel',
+            'AutoIt3Wrapper_Res_SaveSource','AutoIt3Wrapper_Run_After',
+            'AutoIt3Wrapper_Run_Au3check','AutoIt3Wrapper_Run_Before',
+            'AutoIt3Wrapper_Run_cvsWrapper','AutoIt3Wrapper_Run_Debug_Mode',
+            'AutoIt3Wrapper_Run_Obfuscator','AutoIt3Wrapper_Run_Tidy',
+            'AutoIt3Wrapper_Tidy_Stop_OnError','AutoIt3Wrapper_UseAnsi',
+            'AutoIt3Wrapper_UseUpx','AutoIt3Wrapper_UseX64',
+            'AutoIt3Wrapper_Version','EndRegion','forceref',
+            'Obfuscator_Ignore_Funcs','Obfuscator_Ignore_Variables',
+            'Obfuscator_Parameters','Region','Tidy_Parameters'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')','[',']',
+        '+','-','*','/','&','^',
+        '=','+=','-=','*=','/=','&=',
+        '==','<','<=','>','>=',
+        ',','.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #800000; font-weight: bold;',
+            3 => 'color: #000080; font-style: italic; font-weight: bold;',
+            4 => 'color: #0080FF; font-style: italic; font-weight: bold;',
+            5 => 'color: #F000FF; font-style: italic;',
+            6 => 'color: #A00FF0; font-style: italic;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'font-style: italic; color: #669900;',
+            0 => 'font-style: italic; color: #009933;',
+            1 => 'font-style: italic; color: #9977BB;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'font-weight: bold; color: #9977BB;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #AC00A9; font-style: italic; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF; font-style: italic; font-weight: bold;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF0000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: bold; color: #AA0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.autoitscript.com/autoit3/docs/keywords.htm',
+        2 => 'http://www.autoitscript.com/autoit3/docs/macros.htm',
+        3 => 'http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\_'
+            ),
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#'
+            ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#'
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/avisynth.php b/vendor/easybook/geshi/geshi/avisynth.php
new file mode 100755
index 000000000..88f662886
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/avisynth.php
@@ -0,0 +1,194 @@
+<?php
+/*************************************************************************************
+ * avisynth.php
+ * --------
+ * Author: Ryan Jones (sciguyryan@gmail.com)
+ * Copyright: (c) 2008 Ryan Jones
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/10/08
+ *
+ * AviSynth language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/08 (1.0.8.1)
+ *  -  First Release
+ *
+ * TODO (updated 2008/10/08)
+ * -------------------------
+ * * There are also some special words that can't currently be specified directly in GeSHi as they may
+ *      also be used as variables which would really mess things up.
+ * * Also there is an issue with the escape character as this language uses a muti-character escape system. Escape char should be """ but has been left
+ *      as empty due to this restiction.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'AviSynth',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/', '[*' => '*]'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //  Reserved words.
+        1 => array(
+            'try', 'cache', 'function', 'global', 'return'
+            ),
+        // Constants / special variables.
+        2 => array(
+            'true', 'yes', 'false', 'no', '__END__'
+            ),
+        // Internal Filters.
+        3 => array(
+            'AviSource', 'AviFileSource', 'AddBorders', 'AlignedSplice', 'AssumeFPS', 'AssumeScaledFPS',
+            'AssumeFrameBased', 'AssumeFieldBased', 'AssumeBFF', 'AssumeTFF', 'Amplify', 'AmplifydB',
+            'AssumeSampleRate', 'AudioDub', 'AudioDubEx', 'Animate', 'ApplyRange',
+            'BicubicResize', 'BilinearResize', 'BlackmanResize', 'Blur', 'Bob', 'BlankClip', 'Blackness',
+            'ColorYUV', 'ConvertBackToYUY2', 'ConvertToRGB', 'ConvertToRGB24', 'ConvertToRGB32',
+            'ConvertToYUY2', 'ConvertToY8', 'ConvertToYV411', 'ConvertToYV12', 'ConvertToYV16', 'ConvertToYV24',
+            'ColorKeyMask', 'Crop', 'CropBottom', 'ChangeFPS', 'ConvertFPS', 'ComplementParity', 'ConvertAudioTo8bit',
+            'ConvertAudioTo16bit', 'ConvertAudioTo24bit', 'ConvertAudioTo32bit', 'ConvertAudioToFloat', 'ConvertToMono',
+            'ConditionalFilter', 'ConditionalReader', 'ColorBars', 'Compare',
+            'DirectShowSource', 'DeleteFrame', 'Dissolve', 'DuplicateFrame', 'DoubleWeave', 'DelayAudio',
+            'EnsureVBRMP3Sync',
+            'FixLuminance', 'FlipHorizontal', 'FlipVertical', 'FixBrokenChromaUpsampling', 'FadeIn0', 'FadeIn',
+            'FadeIn2', 'FadeOut0', 'FadeOut', 'FadeOut2', 'FadeIO0', 'FadeIO', 'FadeIO2', 'FreezeFrame', 'FrameEvaluate',
+            'GreyScale', 'GaussResize', 'GeneralConvolution', 'GetChannel', 'GetLeftChannel', 'GetRightChannel',
+            'HorizontalReduceBy2', 'Histogram',
+            'ImageReader', 'ImageSource', 'ImageWriter', 'Invert', 'Interleave', 'Info',
+            'KillAudio', 'KillVideo',
+            'Levels', 'Limiter', 'Layer', 'Letterbox', 'LanczosResize', 'Lanczos4Resize', 'Loop',
+            'MergeARGB', 'MergeRGB', 'MergeChroma', 'MergeLuma', 'Merge', 'Mask', 'MaskHS', 'MergeChannels', 'MixAudio',
+            'MonoToStereo', 'MessageClip',
+            'Normalize',
+            'OpenDMLSource', 'Overlay',
+            'PointResize', 'PeculiarBlend', 'Pulldown',
+            'RGBAdjust', 'ResetMask', 'Reverse', 'ResampleAudio', 'ReduceBy2',
+            'SegmentedAviSource', 'SegmentedDirectShowSource', 'SoundOut', 'ShowAlpha', 'ShowRed', 'ShowGreen',
+            'ShowBlue', 'SwapUV', 'Subtract', 'SincResize', 'Spline16Resize', 'Spline36Resize', 'Spline64Resize',
+            'SelectEven', 'SelectOdd', 'SelectEvery', 'SelectRangeEvery', 'Sharpen', 'SpatialSoften', 'SeparateFields',
+            'ShowFiveVersions', 'ShowFrameNumber', 'ShowSMPTE', 'ShowTime', 'StackHorizontal', 'StackVertical', 'Subtitle',
+            'SwapFields', 'SuperEQ', 'SSRC', 'ScriptClip',
+            'Tweak', 'TurnLeft', 'TurnRight', 'Turn180', 'TemporalSoften', 'TimeStretch', 'TCPServer', 'TCPSource', 'Trim',
+            'Tone',
+            'UToY', 'UToY8', 'UnalignedSplice',
+            'VToY', 'VToY8', 'VerticalReduceBy2', 'Version',
+            'WavSource', 'Weave', 'WriteFile', 'WriteFileIf', 'WriteFileStart', 'WriteFileEnd',
+            'YToUV'
+            ),
+        // Internal functions.
+        4 => array(
+            'Abs', 'Apply', 'Assert', 'AverageLuma', 'AverageChromaU', 'AverageChromaV',
+            'Ceil', 'Cos', 'Chr', 'ChromaUDifference', 'ChromaVDifference',
+            'Defined', 'Default',
+            'Exp', 'Exist', 'Eval',
+            'Floor', 'Frac', 'Float', 'Findstr', 'GetMTMode',
+            'HexValue',
+            'Int', 'IsBool', 'IsClip', 'IsFloat', 'IsInt', 'IsString', 'Import',
+            'LoadPlugin', 'Log', 'LCase', 'LeftStr', 'LumaDifference', 'LoadVirtualDubPlugin', 'LoadVFAPIPlugin',
+            'LoadCPlugin', 'Load_Stdcall_Plugin',
+            'Max', 'MulDiv', 'MidStr',
+            'NOP',
+            'OPT_AllowFloatAudio', 'OPT_UseWaveExtensible',
+            'Pi', 'Pow',
+            'Round', 'Rand', 'RevStr', 'RightStr', 'RGBDifference', 'RGBDifferenceFromPrevious', 'RGBDifferenceToNext',
+            'Sin', 'Sqrt', 'Sign', 'Spline', 'StrLen', 'String', 'Select', 'SetMemoryMax', 'SetWorkingDir', 'SetMTMode',
+            'SetPlanarLegacyAlignment',
+            'Time',
+            'UCase', 'UDifferenceFromPrevious', 'UDifferenceToNext', 'UPlaneMax', 'UPlaneMin', 'UPlaneMedian',
+            'UPlaneMinMaxDifference',
+            'Value', 'VersionNumber', 'VersionString', 'VDifferenceFromPrevious', 'VDifferenceToNext', 'VPlaneMax',
+            'VPlaneMin', 'VPlaneMedian', 'VPlaneMinMaxDifference',
+            'YDifferenceFromPrevious', 'YDifferenceToNext', 'YPlaneMax', 'YPlaneMin', 'YPlaneMedian',
+            'YPlaneMinMaxDifference'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+', '++', '-', '--', '/', '*', '%',
+        '=', '==', '<', '<=', '>', '>=', '<>', '!=',
+        '!', '?', ':',
+        '|', '||', '&&',
+        '\\',
+        '(', ')', '{', '}',
+        '.', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC3300; font-weight:bold;',
+            4 => 'color:#660000; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            'MULTI' => 'color:#000080; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#006666;'
+            ),
+        'METHODS' => array(
+            1 => 'color:#9900CC;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://avisynth.org/mediawiki/{FNAME}',
+        4 => ''
+        ),
+    'REGEXPS' => array(
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+?>
diff --git a/vendor/easybook/geshi/geshi/awk.php b/vendor/easybook/geshi/geshi/awk.php
new file mode 100755
index 000000000..46fe49f87
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/awk.php
@@ -0,0 +1,156 @@
+<?php
+/************************************************
+ * awk.php
+ * -------
+ * Author: George Pollard (porges@porg.es)
+ * Copyright: (c) 2009 George Pollard
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/01/28
+ *
+ * Awk language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/01/28 (1.0.8.5)
+ *   -  First Release
+ *
+ * TODO (updated 2009/01/28)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'awk',
+    'COMMENT_SINGLE' => array(
+        1 => '#'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array (
+        1 => array(
+            'for', 'in', 'if', 'else', 'while', 'do', 'continue', 'break'
+            ),
+        2 => array(
+            'BEGIN', 'END'
+            ),
+        3 => array(
+            'ARGC', 'ARGV', 'CONVFMT', 'ENVIRON',
+            'FILENAME', 'FNR', 'FS', 'NF', 'NR', 'OFMT',
+            'OFS','ORS','RLENGTH','RS','RSTART','SUBSEP'
+            ),
+        4 => array(
+            'gsub','index','length','match','split',
+            'sprintf','sub','substr','tolower','toupper',
+            'atan2','cos','exp','int','log','rand',
+            'sin','sqrt','srand'
+            ),
+        5 => array(
+            'print','printf','getline','close','fflush','system'
+            ),
+        6 => array(
+            'function', 'return'
+            )
+        ),
+    'SYMBOLS' => array (
+        0 => array(
+            '(',')','[',']','{','}'
+            ),
+        1 => array(
+            '!','||','&&'
+            ),
+        2 => array(
+            '<','>','<=','>=','==','!='
+            ),
+        3 => array(
+            '+','-','*','/','%','^','++','--'
+            ),
+        4 => array(
+            '~','!~'
+            ),
+        5 => array(
+            '?',':'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #C20CB9; font-weight: bold;',
+            3 => 'color: #4107D5; font-weight: bold;',
+            4 => 'color: #07D589; font-weight: bold;',
+            5 => 'color: #0BD507; font-weight: bold;',
+            6 => 'color: #078CD5; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#808080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:black;',
+            1 => 'color:black;',
+            2 => 'color:black;',
+            3 => 'color:black;',
+            4 => 'color:#C4C364;',
+            5 => 'color:black;font-weight:bold;'),
+        'SCRIPT' => array(),
+        'REGEXPS' => array(
+            0 => 'color:#000088;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'METHODS' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array (),
+    'REGEXPS' => array(
+        0 => "\\$[a-zA-Z0-9_]+"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array (),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/bascomavr.php b/vendor/easybook/geshi/geshi/bascomavr.php
new file mode 100755
index 000000000..864f74e8d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/bascomavr.php
@@ -0,0 +1,185 @@
+<?php
+/*************************************************************************************
+ * bascomavr.php
+ * ---------------------------------
+ * Author: aquaticus.info
+ * Copyright: (c) 2008 aquaticus.info
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/01/09
+ *
+ * BASCOM AVR language file for GeSHi.
+ *
+ * You can find the BASCOM AVR Website at (www.mcselec.com/bascom-avr.htm)
+ *
+ * CHANGES
+ * -------
+ * 2008/01/09 (1.0.8.10)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'BASCOM AVR',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Navy Blue Bold Keywords
+            '1WRESET' , '1WREAD' , '1WWRITE' , '1WSEARCHFIRST' , '1WSEARCHNEXT' ,'1WVERIFY' , '1WIRECOUNT',
+            'CONFIG' , 'ACI' , 'ADC' , 'BCCARD' , 'CLOCK' , 'COM1' ,
+            'COM2' , 'PS2EMU' , 'ATEMU' , 'I2CSLAVE' ,
+            'INPUT', 'OUTPUT', 'GRAPHLCD' , 'KEYBOARD' , 'TIMER0' , 'TIMER1' ,
+            'LCDBUS' , 'LCDMODE' , '1WIRE' , 'LCD' , 'SERIALOUT' ,
+            'SERIALIN' , 'SPI' , 'LCDPIN' , 'SDA' , 'SCL' ,
+            'WATCHDOG' , 'PORT' , 'COUNTER0', 'COUNTER1' , 'TCPIP' , 'TWISLAVE' ,
+            'X10' , 'XRAM' , 'USB',
+            'BCD' , 'GRAY2BIN' , 'BIN2GRAY' , 'BIN' , 'MAKEBCD' , 'MAKEDEC' , 'MAKEINT' , 'FORMAT' , 'FUSING' , 'BINVAL' ,
+            'CRC8' , 'CRC16' , 'CRC16UNI' , 'CRC32' , 'HIGH' , 'HIGHW' , 'LOW',
+            'DATE' , 'TIME'  , 'DATE$' , 'TIME$' , 'DAYOFWEEK' , 'DAYOFYEAR' , 'SECOFDAY' , 'SECELAPSED' , 'SYSDAY' , 'SYSSEC' , 'SYSSECELAPSED',
+            'WAIT'  , 'WAITMS' , 'WAITUS' , 'DELAY',
+            'BSAVE' , 'BLOAD' , 'GET' , 'VER' , 'DISKFREE' , 'DIR' , 'DriveReset' , 'DriveInit' , 'LINE' , 'INITFILESYSTEM' ,
+            'EOF' , 'WRITE' , 'FLUSH' , 'FREEFILE' , 'FILEATTR' , 'FILEDATE' , 'FILETIME' , 'FILEDATETIME' , 'FILELEN' , 'SEEK' ,
+            'KILL' , 'DriveGetIdentity' , 'DriveWriteSector' , 'DriveReadSector' , 'LOC' , 'LOF' , 'PUT' , 'OPEN' , 'CLOSE',
+            'GLCDCMD' , 'GLCDDATA' , 'SETFONT' , 'PSET' , 'SHOWPIC' , 'SHOWPICE' , 'CIRCLE' , 'BOX',
+            'I2CINIT' , 'I2CRECEIVE' , 'I2CSEND' , 'I2CSTART','I2CSTOP','I2CRBYTE','I2CWBYTE',
+            'ALIAS' , 'BITWAIT' , 'TOGGLE' , 'RESET' , 'SET' , 'SHIFTIN' , 'SHIFTOUT' , 'DEBOUNCE' , 'PULSEIN' , 'PULSEOUT',
+            'IDLE' , 'POWERDOWN' , 'POWERSAVE' , 'ON', 'INTERRUPT' , 'ENABLE' , 'DISABLE' , 'START' , 'VERSION' , 'CLOCKDIVISION' , 'CRYSTAL' , 'STOP',
+            'ADR' , 'ADR2' , 'WRITEEEPROM' , 'CPEEK' , 'CPEEKH' , 'PEEK' , 'POKE' , 'OUT' , 'READEEPROM' , 'DATA' , 'INP' , 'READ' , 'RESTORE' , 'LOOKDOWN' , 'LOOKUP' , 'LOOKUPSTR' , 'LOAD' , 'LOADADR' , 'LOADLABEL' , 'LOADWORDADR' , 'MEMCOPY',
+            'RC5SEND' , 'RC6SEND' , 'GETRC5' , 'SONYSEND',
+            'BAUD' , 'BAUD1', 'BUFSPACE' , 'CLEAR', 'ECHO' , 'WAITKEY' , 'ISCHARWAITING' , 'INKEY' , 'INPUTBIN' , 'INPUTHEX' , 'PRINT', 'PRINT1','PRINT0', 'PRINTBIN' , 'SERIN' , 'SEROUT' , 'SPC' , 'MAKEMODBUS',
+            'SPIIN' , 'SPIINIT' , 'SPIMOVE' , 'SPIOUT', 'SINGLE',
+            'ASC' , 'UCASE' , 'LCASE' , 'TRIM' , 'SPLIT' , 'LTRIM' , 'INSTR' , 'SPACE' , 'RTRIM' , 'LEFT' , 'LEN' , 'MID' , 'RIGHT' , 'VAL' , 'STR' , 'CHR' , 'CHECKSUM' , 'HEX' , 'HEXVAL',
+            'BASE64DEC' , 'BASE64ENC' , 'IP2STR' , 'UDPREAD' , 'UDPWRITE' , 'UDPWRITESTR' , 'TCPWRITE' , 'TCPWRITESTR' , 'TCPREAD' , 'GETDSTIP' , 'GETDSTPORT' , 'SOCKETSTAT' , 'SOCKETCONNECT' , 'SOCKETLISTEN' , 'GETSOCKET' , 'CLOSESOCKET' ,
+            'SETTCP' , 'GETTCPREGS' , 'SETTCPREGS' , 'SETIPPROTOCOL' , 'TCPCHECKSUM',
+            'HOME' , 'CURSOR' , 'UPPERLINE' , 'THIRDLINE' , 'INITLCD' , 'LOWERLINE' , 'LCDAT' , 'FOURTHLINE' , 'DISPLAY' , 'LCDCONTRAST' , 'LOCATE' , 'SHIFTCURSOR' , 'DEFLCDCHAR' , 'SHIFTLCD' , 'CLS',
+            'ACOS' , 'ASIN' , 'ATN' , 'ATN2' , 'EXP' , 'RAD2DEG' , 'FRAC' , 'TAN' , 'TANH' , 'COS' , 'COSH' , 'LOG' , 'LOG10' , 'ROUND' , 'ABS' , 'INT' , 'MAX' , 'MIN' , 'SQR' , 'SGN' , 'POWER' , 'SIN' , 'SINH' , 'FIX' , 'INCR' , 'DECR' , 'DEG2RAD',
+            'DBG' , 'DEBUG', 'DTMFOUT' , 'ENCODER' , 'GETADC' , 'GETKBD' , 'GETATKBD' , 'GETRC' , 'VALUE' , 'POPALL' , 'PS2MOUSEXY' , 'PUSHALL' ,
+            'RETURN'  , 'RND' , 'ROTATE' , 'SENDSCAN' , 'SENDSCANKBD' , 'SHIFT' , 'SOUND' , 'STCHECK' , 'SWAP' , 'VARPTR' , 'X10DETECT' , 'X10SEND' , 'READMAGCARD' , 'REM' , 'BITS' , 'BYVAL' , 'CALL' , 'READHITAG',
+            'Buffered', 'Size', 'Dummy', 'Parity', 'None', 'Stopbits', 'Databits', 'Clockpol', 'Synchrone', 'Prescaler', 'Reference', 'int0', 'int1', 'Interrupts',
+            'Auto', 'avcc', 'ack', 'nack', 'Pin', 'Db4', 'Db3', 'Db2', 'Db1', 'Db7', 'Db6', 'Db5', 'Db0',  'e', 'rs', 'twi',
+            ),
+        2 => array(
+            // Red Lowercase Keywords
+            '$ASM' , '$BAUD' , '$BAUD1' , '$BGF' , '$BOOT' , '$CRYSTAL' , '$DATA' , '$DBG' , '$DEFAULT' , '$EEPLEAVE' , '$EEPROM' ,
+            '$EEPROMHEX' , '$EXTERNAL' , '$HWSTACK' , '$INC' , '$INCLUDE' , '$INITMICRO' , '$LCD' , '$LCDRS' , '$LCDPUTCTRL' ,
+            '$LCDPUTDATA' , '$LCDVFO' , '$LIB' , '$LOADER' , '$LOADERSIZE' , '$MAP' , '$NOCOMPILE' , '$NOINIT' , '$NORAMCLEAR' ,
+            '$PROG' , '$PROGRAMMER' , '$REGFILE' , '$RESOURCE' , '$ROMSTART', '$SERIALINPUT', '$SERIALINPUT1' , '$SERIALINPUT2LCD' ,
+            '$SERIALOUTPUT' , '$SERIALOUTPUT1' , '$SIM' , '$SWSTACK' , '$TIMEOUT' , '$TINY' , '$WAITSTATE' , '$XRAMSIZE' , '$XRAMSTART', '$XA',
+            '#IF' , '#ELSE' , '#ENDIF', '$framesize'
+            ),
+        3 => array(
+            // Blue Lowercase Keywords
+            'IF', 'THEN', 'ELSE', 'END', 'WHILE', 'WEND', 'DO', 'LOOP', 'SELECT', 'CASE', 'FOR', 'NEXT',
+            'GOSUB' , 'GOTO' , 'LOCAL' , 'SUB' , 'DEFBIT', 'DEFBYTE', 'DEFINT', 'DEFWORD', 'DEFLNG', 'DEFSNG', 'DEFDBL',
+            'CONST', 'DECLARE', 'FUNCTION', 'DIM', 'EXIT', 'LONG', 'INTEGER', 'BYTE', 'AS', 'STRING', 'WORD'
+            ),
+        4 => array(
+            //light blue
+            'PINA.0', 'PINA.1', 'PINA.2', 'PINA.3', 'PINA.4', 'PINA.5', 'PINA.6', 'PINA.7',
+            'PINB.0', 'PINB.1', 'PINB.2', 'PINB.3', 'PINB.4', 'PINB.5', 'PINB.6', 'PINB.7',
+            'PINC.0', 'PINC.1', 'PINC.2', 'PINC.3', 'PINC.4', 'PINC.5', 'PINC.6', 'PINC.7',
+            'PIND.0', 'PIND.1', 'PIND.2', 'PIND.3', 'PIND.4', 'PIND.5', 'PIND.6', 'PIND.7',
+            'PINE.0', 'PINE.1', 'PINE.2', 'PINE.3', 'PINE.4', 'PINE.5', 'PINE.6', 'PINE.7',
+            'PINF.0', 'PINF.1', 'PINF.2', 'PINF.3', 'PINF.4', 'PINF.5', 'PINF.6', 'PINF.7',
+
+            'PORTA.0', 'PORTA.1', 'PORTA.2', 'PORTA.3', 'PORTA.4', 'PORTA.5', 'PORTA.6', 'PORTA.7',
+            'PORTB.0', 'PORTB.1', 'PORTB.2', 'PORTB.3', 'PORTB.4', 'PORTB.5', 'PORTB.6', 'PORTB.7',
+            'PORTC.0', 'PORTC.1', 'PORTC.2', 'PORTC.3', 'PORTC.4', 'PORTC.5', 'PORTC.6', 'PORTC.7',
+            'PORTD.0', 'PORTD.1', 'PORTD.2', 'PORTD.3', 'PORTD.4', 'PORTD.5', 'PORTD.6', 'PORTD.7',
+            'PORTE.0', 'PORTE.1', 'PORTE.2', 'PORTE.3', 'PORTE.4', 'PORTE.5', 'PORTE.6', 'PORTE.7',
+            'PORTF.0', 'PORTF.1', 'PORTF.2', 'PORTF.3', 'PORTF.4', 'PORTF.5', 'PORTF.6', 'PORTF.7',
+
+            'DDRA.0', 'DDRA.1', 'DDRA.2', 'DDRA.3', 'DDRA.4', 'DDRA.5', 'DDRA.6', 'DDRA.7',
+            'DDRB.0', 'DDRB.1', 'DDRB.2', 'DDRB.3', 'DDRB.4', 'DDRB.5', 'DDRB.6', 'DDRB.7',
+            'DDRC.0', 'DDRC.1', 'DDRC.2', 'DDRC.3', 'DDRC.4', 'DDRC.5', 'DDRC.6', 'DDRC.7',
+            'DDRD.0', 'DDRD.1', 'DDRD.2', 'DDRD.3', 'DDRD.4', 'DDRD.5', 'DDRD.6', 'DDRD.7',
+            'DDRE.0', 'DDRE.1', 'DDRE.2', 'DDRE.3', 'DDRE.4', 'DDRE.5', 'DDRE.6', 'DDRE.7',
+            'DDRF.0', 'DDRF.1', 'DDRF.2', 'DDRF.3', 'DDRF.4', 'DDRF.5', 'DDRF.6', 'DDRF.7',
+
+            'DDRA','DDRB','DDRC','DDRD','DDRE','DDRF',
+            'PORTA','PORTB','PORTC','PORTD','PORTE','PORTF',
+            'PINA','PINB','PINC','PIND','PINE','PINF',
+            )
+        ),
+    'SYMBOLS' => array(
+        '=', '<', '>', '>=', '<=', '+', '-', '*', '/', '%', '(', ')', '{', '}', '[', ']',  ';', ':', '$', '&H'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #FF0000;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #0080FF;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #657CC4; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000080; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/bash.php b/vendor/easybook/geshi/geshi/bash.php
new file mode 100755
index 000000000..eba70028b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/bash.php
@@ -0,0 +1,474 @@
+<?php
+/*************************************************************************************
+ * bash.php
+ * --------
+ * Author: Andreas Gohr (andi@splitbrain.org)
+ * Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/20
+ *
+ * BASH language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/21 (1.0.8)
+ *  -  Added loads of keywords and commands of GNU/Linux
+ *  -  Added support for parameters starting with a dash
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2007/09/05 (1.0.7.21)
+ *  -  PARSER_CONTROL patch using SF #1788408 (BenBE)
+ * 2007/06/11 (1.0.7.20)
+ *  -  Added a lot of keywords (BenBE / Jan G)
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/20 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Get symbols working
+ * * Highlight builtin vars
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Bash',
+    // Bash DOES have single line comments with # markers. But bash also has
+    // the  $# variable, so comments need special handling (see sf.net
+    // 1564839)
+    'COMMENT_SINGLE' => array('#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Variables
+        1 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        //BASH-style Heredoc
+        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Escaped String Starters
+        3 => "/\\\\['\"]/siU",
+        // Single-Line Shell usage: Hide the prompt at the beginning
+        /* 4 => "/\A(?!#!)\s*(?>[\w:@\\/\\-\\._~]*[$#]\s?)?(?=[^\n]+\n?\Z)|^(?!#!)(\w+@)?[\w\\-\\.]+(:~?)[\w\\/\\-\\._]*?[$#]\s?/ms" */
+        4 => "/\A(?!#!)(?:(?>[\w:@\\/\\-\\._~]*)[$#]\s?)(?=(?>[^\n]+)\n?\Z)|^(?!#!)(?:\w+@)?(?>[\w\\-\\.]+)(?>:~?[\w\\/\\-\\._]*?)?[$#]\s?/sm"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\\$\\\"\n]#i",
+        // $var
+        2 => "#\\$[a-z_][a-z0-9_]*#i",
+        // ${...}
+        3 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        // $(...)
+        4 => "/\\$\\([^\\n\\)]*?\\)/i",
+        // `...`
+        5 => "/`[^`]*`/"
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'done', 'elif', 'else', 'esac', 'fi', 'for', 'function',
+            'if', 'in', 'select', 'set', 'then', 'until', 'while', 'time'
+            ),
+        2 => array(
+            'aclocal', 'aconnect', 'apachectl', 'apache2ctl', 'aplay', 'apm',
+            'apmsleep', 'apropos', 'apt-cache', 'apt-cdrom', 'apt-config',
+            'apt-file', 'apt-ftparchive', 'apt-get', 'apt-key', 'apt-listbugs',
+            'apt-listchanges', 'apt-mark', 'apt-mirror', 'apt-sortpkgs',
+            'apt-src', 'apticron', 'aptitude', 'aptsh', 'apxs', 'apxs2', 'ar',
+            'arch', 'arecord', 'as', 'as86', 'ash', 'autoconf', 'autoheader',
+            'automake', 'awk',
+
+            'apachectl start', 'apachectl stop', 'apachectl restart',
+            'apachectl graceful', 'apachectl graceful-stop',
+            'apachectl configtest', 'apachectl status', 'apachectl fullstatus',
+            'apachectl help', 'apache2ctl start', 'apache2ctl stop',
+            'apache2ctl restart', 'apache2ctl graceful',
+            'apache2ctl graceful-stop', 'apache2ctl configtest',
+            'apache2ctl status', 'apache2ctl fullstatus', 'apache2ctl help',
+
+            'apt-cache add', 'apt-cache depends', 'apt-cache dotty',
+            'apt-cache dump', 'apt-cache dumpavail', 'apt-cache gencaches',
+            'apt-cache pkgnames', 'apt-cache policy', 'apt-cache rdepends',
+            'apt-cache search', 'apt-cache show', 'apt-cache showauto',
+            'apt-cache showpkg', 'apt-cache showsrc', 'apt-cache stats',
+            'apt-cache unmet', 'apt-cache xvcg', 'apt-cdrom add',
+            'apt-cdrom ident', 'apt-config dump', 'apt-config shell',
+            'apt-file find', 'apt-file list', 'apt-file purge',
+            'apt-file search', 'apt-file shot', 'apt-file update',
+            'apt-get autoclean', 'apt-get autoremove', 'apt-get build-dep',
+            'apt-get check', 'apt-get clean', 'apt-get dist-upgrade',
+            'apt-get dselect-upgrade', 'apt-get install', 'apt-get markauto',
+            'apt-get purge', 'apt-get remove', 'apt-get source',
+            'apt-get unmarkauto', 'apt-get update', 'apt-get upgrade',
+            'apt-key add', 'apt-key adv', 'apt-key del', 'apt-key export',
+            'apt-key exportall', 'apt-key finger', 'apt-key list',
+            'apt-key net-update', 'apt-key update', 'apt-listbugs apt',
+            'apt-listbugs list', 'apt-listbugs rss', 'apt-src build',
+            'apt-src clean', 'apt-src import', 'apt-src install',
+            'apt-src list', 'apt-src location', 'apt-src name',
+            'apt-src remove', 'apt-src update', 'apt-src upgrade',
+            'apt-src version',
+
+            'aptitude autoclean', 'aptitude build-dep', 'aptitude changelog',
+            'aptitude clean', 'aptitude download', 'aptitude forbid-version',
+            'aptitude forget-new', 'aptitude full-upgrade', 'aptitude hold',
+            'aptitude install', 'aptitude markauto', 'aptitude purge',
+            'aptitude reinstall', 'aptitude remove', 'aptitude safe-upgrade',
+            'aptitude search', 'aptitude show', 'aptitude unhold',
+            'aptitude unmarkauto', 'aptitude update', 'aptitude versions',
+            'aptitude why', 'aptitude why-not',
+
+            'basename', 'bash', 'batctl', 'bc', 'bison', 'bunzip2', 'bzcat',
+            'bzcmp', 'bzdiff', 'bzegrep', 'bzfgrep', 'bzgrep',
+            'bzip2', 'bzip2recover', 'bzless', 'bzmore',
+
+            'c++', 'cal', 'cat', 'chattr', 'cc', 'cdda2wav', 'cdparanoia',
+            'cdrdao', 'cd-read', 'cdrecord', 'chfn', 'chgrp', 'chmod',
+            'chown', 'chroot', 'chsh', 'chvt', 'clear', 'cmp', 'comm', 'co',
+            'col', 'cp', 'cpio', 'cpp', 'csh', 'cut', 'cvs', 'cvs-pserver',
+
+            'cvs add', 'cvs admin', 'cvs annotate', 'cvs checkout',
+            'cvs commit', 'cvs diff', 'cvs edit', 'cvs editors', 'cvs export',
+            'cvs history', 'cvs import', 'cvs init', 'cvs log', 'cvs login',
+            'cvs logout', 'cvs ls', 'cvs pserver', 'cvs rannotate',
+            'cvs rdiff', 'cvs release', 'cvs remove', 'cvs rlog', 'cvs rls',
+            'cvs rtag', 'cvs server', 'cvs status', 'cvs tag', 'cvs unedit',
+            'cvs update', 'cvs version', 'cvs watch', 'cvs watchers',
+
+            'dash', 'date', 'dc', 'dch', 'dcop', 'dd', 'ddate', 'ddd',
+            'deallocvt', 'debconf', 'defoma', 'depmod', 'df', 'dh',
+            'dialog', 'diff', 'diff3', 'dig', 'dir', 'dircolors', 'directomatic',
+            'dirname', 'dmesg', 'dnsdomainname', 'domainname', 'dpkg',
+            'dselect', 'du', 'dumpkeys',
+
+            'ed', 'egrep', 'env', 'expr',
+
+            'false', 'fbset', 'fdisk', 'ffmpeg', 'fgconsole','fgrep', 'file',
+            'find', 'flex', 'flex++', 'fmt', 'free', 'ftp', 'funzip', 'fuser',
+
+            'g++', 'gawk', 'gc','gcc', 'gdb', 'getent', 'getkeycodes',
+            'getopt', 'gettext', 'gettextize', 'gimp', 'gimp-remote',
+            'gimptool', 'gmake', 'gocr', 'grep', 'groups', 'gs', 'gunzip',
+            'gzexe', 'gzip',
+
+            'git', 'git add', 'git add--interactive', 'git am', 'git annotate',
+            'git apply', 'git archive', 'git bisect', 'git bisect--helper',
+            'git blame', 'git branch', 'git bundle', 'git cat-file',
+            'git check-attr', 'git checkout', 'git checkout-index',
+            'git check-ref-format', 'git cherry', 'git cherry-pick',
+            'git clean', 'git clone', 'git commit', 'git commit-tree',
+            'git config', 'git count-objects', 'git daemon', 'git describe',
+            'git diff', 'git diff-files', 'git diff-index', 'git difftool',
+            'git difftool--helper', 'git diff-tree', 'git fast-export',
+            'git fast-import', 'git fetch', 'git fetch-pack',
+            'git filter-branch', 'git fmt-merge-msg', 'git for-each-ref',
+            'git format-patch', 'git fsck', 'git fsck-objects', 'git gc',
+            'git get-tar-commit-id', 'git grep', 'git hash-object', 'git help',
+            'git http-backend', 'git http-fetch', 'git http-push',
+            'git imap-send', 'git index-pack', 'git init', 'git init-db',
+            'git instaweb', 'git log', 'git lost-found', 'git ls-files',
+            'git ls-remote', 'git ls-tree', 'git mailinfo', 'git mailsplit',
+            'git merge', 'git merge-base', 'git merge-file', 'git merge-index',
+            'git merge-octopus', 'git merge-one-file', 'git merge-ours',
+            'git merge-recursive', 'git merge-resolve', 'git merge-subtree',
+            'git mergetool', 'git merge-tree', 'git mktag', 'git mktree',
+            'git mv', 'git name-rev', 'git notes', 'git pack-objects',
+            'git pack-redundant', 'git pack-refs', 'git patch-id',
+            'git peek-remote', 'git prune', 'git prune-packed', 'git pull',
+            'git push', 'git quiltimport', 'git read-tree', 'git rebase',
+            'git rebase--interactive', 'git receive-pack', 'git reflog',
+            'git relink', 'git remote', 'git remote-ftp', 'git remote-ftps',
+            'git remote-http', 'git remote-https', 'git remote-testgit',
+            'git repack', 'git replace', 'git repo-config', 'git request-pull',
+            'git rerere', 'git reset', 'git revert', 'git rev-list',
+            'git rev-parse', 'git rm', 'git send-pack', 'git shell',
+            'git shortlog', 'git show', 'git show-branch', 'git show-index',
+            'git show-ref', 'git stage', 'git stash', 'git status',
+            'git stripspace', 'git submodule', 'git symbolic-ref', 'git tag',
+            'git tar-tree', 'git unpack-file', 'git unpack-objects',
+            'git update-index', 'git update-ref', 'git update-server-info',
+            'git upload-archive', 'git upload-pack', 'git var',
+            'git verify-pack', 'git verify-tag', 'git web--browse',
+            'git whatchanged', 'git write-tree',
+
+            'gitaction', 'git-add', 'git-add--interactive', 'git-am',
+            'git-annotate', 'git-apply', 'git-archive', 'git-bisect',
+            'git-bisect--helper', 'git-blame', 'git-branch', 'git-bundle',
+            'git-cat-file', 'git-check-attr', 'git-checkout',
+            'git-checkout-index', 'git-check-ref-format', 'git-cherry',
+            'git-cherry-pick', 'git-clean', 'git-clone', 'git-commit',
+            'git-commit-tree', 'git-config', 'git-count-objects', 'git-daemon',
+            'git-describe', 'git-diff', 'git-diff-files', 'git-diff-index',
+            'git-difftool', 'git-difftool--helper', 'git-diff-tree',
+            'gitdpkgname', 'git-fast-export', 'git-fast-import', 'git-fetch',
+            'git-fetch-pack', 'git-fetch--tool', 'git-filter-branch', 'gitfm',
+            'git-fmt-merge-msg', 'git-for-each-ref', 'git-format-patch',
+            'git-fsck', 'git-fsck-objects', 'git-gc', 'git-get-tar-commit-id',
+            'git-grep', 'git-hash-object', 'git-help', 'git-http-fetch',
+            'git-http-push', 'git-imap-send', 'git-index-pack', 'git-init',
+            'git-init-db', 'git-instaweb', 'gitkeys', 'git-log',
+            'git-lost-found', 'git-ls-files', 'git-ls-remote', 'git-ls-tree',
+            'git-mailinfo', 'git-mailsplit', 'git-merge', 'git-merge-base',
+            'git-merge-file', 'git-merge-index', 'git-merge-octopus',
+            'git-merge-one-file', 'git-merge-ours', 'git-merge-recursive',
+            'git-merge-resolve', 'git-merge-subtree', 'git-mergetool',
+            'git-mergetool--lib', 'git-merge-tree', 'gitmkdirs', 'git-mktag',
+            'git-mktree', 'gitmount', 'git-mv', 'git-name-rev',
+            'git-pack-objects', 'git-pack-redundant', 'git-pack-refs',
+            'git-parse-remote', 'git-patch-id', 'git-peek-remote', 'git-prune',
+            'git-prune-packed', 'gitps', 'git-pull', 'git-push',
+            'git-quiltimport', 'git-read-tree', 'git-rebase',
+            'git-rebase--interactive', 'git-receive-pack', 'git-reflog',
+            'gitregrep', 'git-relink', 'git-remote', 'git-repack',
+            'git-repo-config', 'git-request-pull', 'git-rerere', 'git-reset',
+            'git-revert', 'git-rev-list', 'git-rev-parse', 'gitrfgrep',
+            'gitrgrep', 'git-rm', 'git-send-pack', 'git-shell', 'git-shortlog',
+            'git-show', 'git-show-branch', 'git-show-index', 'git-show-ref',
+            'git-sh-setup', 'git-stage', 'git-stash', 'git-status',
+            'git-stripspace', 'git-submodule', 'git-svn', 'git-symbolic-ref',
+            'git-tag', 'git-tar-tree', 'gitunpack', 'git-unpack-file',
+            'git-unpack-objects', 'git-update-index', 'git-update-ref',
+            'git-update-server-info', 'git-upload-archive', 'git-upload-pack',
+            'git-var', 'git-verify-pack', 'git-verify-tag', 'gitview',
+            'git-web--browse', 'git-whatchanged', 'gitwhich', 'gitwipe',
+            'git-write-tree', 'gitxgrep',
+
+            'head', 'hexdump', 'hostname', 'htop',
+
+            'id', 'ifconfig', 'ifdown', 'ifup', 'igawk', 'install',
+
+            'ip', 'ip addr', 'ip addrlabel', 'ip link', 'ip maddr', 'ip mroute',
+            'ip neigh', 'ip route', 'ip rule', 'ip tunnel', 'ip xfrm',
+
+            'jar', 'java', 'javac', 'join',
+
+            'kbd_mode','kbdrate', 'kdialog', 'kfile', 'kill', 'killall',
+
+            'lame', 'last', 'lastb', 'ld', 'ld86', 'ldd', 'less', 'lex', 'link',
+            'ln', 'loadkeys', 'loadunimap', 'locate', 'lockfile', 'login',
+            'logname', 'lp', 'lpr', 'ls', 'lsattr', 'lsmod', 'lsmod.old',
+            'lspci', 'ltrace', 'lynx',
+
+            'm4', 'make', 'man', 'mapscrn', 'mesg', 'mkdir', 'mkfifo',
+            'mknod', 'mktemp', 'more', 'mount', 'mplayer', 'msgfmt', 'mv',
+
+            'namei', 'nano', 'nasm', 'nawk', 'netstat', 'nice',
+            'nisdomainname', 'nl', 'nm', 'nm86', 'nmap', 'nohup', 'nop',
+
+            'od', 'openvt',
+
+            'passwd', 'patch', 'pbzip2', 'pcregrep', 'pcretest', 'perl',
+            'perror', 'pgawk', 'pidof', 'pigz', 'ping', 'pr', 'procmail',
+            'prune', 'ps', 'pstree', 'ps2ascii', 'ps2epsi', 'ps2frag',
+            'ps2pdf', 'ps2ps', 'psbook', 'psmerge', 'psnup', 'psresize',
+            'psselect', 'pstops',
+
+            'rbash', 'rcs', 'rcs2log', 'read', 'readlink', 'red', 'resizecons',
+            'rev', 'rm', 'rmdir', 'rsh', 'run-parts',
+
+            'sash', 'scp', 'screen', 'sed', 'seq', 'sendmail', 'setfont',
+            'setkeycodes', 'setleds', 'setmetamode', 'setserial', 'setterm',
+            'sh', 'showkey', 'shred', 'size', 'size86', 'skill', 'sleep',
+            'slogin', 'snice', 'sort', 'sox', 'split', 'ssed', 'ssh', 'ssh-add',
+            'ssh-agent', 'ssh-keygen', 'ssh-keyscan', 'sshfs', 'stat', 'strace',
+            'strings', 'strip', 'stty', 'su', 'sudo', 'suidperl', 'sum', 'svn',
+            'svnadmin', 'svndumpfilter', 'svnlook', 'svnmerge', 'svnmucc',
+            'svnserve', 'svnshell', 'svnsync', 'svnversion', 'svnwrap', 'sync',
+
+            'svn add', 'svn ann', 'svn annotate', 'svn blame', 'svn cat',
+            'svn changelist', 'svn checkout', 'svn ci', 'svn cl', 'svn cleanup',
+            'svn co', 'svn commit', 'svn copy', 'svn cp', 'svn del',
+            'svn delete', 'svn di', 'svn diff', 'svn export', 'svn help',
+            'svn import', 'svn info', 'svn list', 'svn lock', 'svn log',
+            'svn ls', 'svn merge', 'svn mergeinfo', 'svn mkdir', 'svn move',
+            'svn mv', 'svn patch', 'svn pd', 'svn pdel', 'svn pe', 'svn pedit',
+            'svn pg', 'svn pget', 'svn pl', 'svn plist', 'svn praise',
+            'svn propdel', 'svn propedit', 'svn propget', 'svn proplist',
+            'svn propset', 'svn ps', 'svn pset', 'svn relocate', 'svn remove',
+            'svn rename', 'svn resolve', 'svn resolved', 'svn revert', 'svn rm',
+            'svn st', 'svn stat', 'svn status', 'svn sw', 'svn switch',
+            'svn unlock', 'svn up', 'svn update', 'svn upgrade',
+
+            'svnadmin crashtest', 'svnadmin create', 'svnadmin deltify',
+            'svnadmin dump', 'svnadmin help', 'svnadmin hotcopy',
+            'svnadmin list-dblogs', 'svnadmin list-unused-dblogs',
+            'svnadmin load', 'svnadmin lslocks', 'svnadmin lstxns',
+            'svnadmin pack', 'svnadmin recover', 'svnadmin rmlocks',
+            'svnadmin rmtxns', 'svnadmin setlog', 'svnadmin setrevprop',
+            'svnadmin setuuid', 'svnadmin upgrade', 'svnadmin verify',
+
+            'svndumpfilter exclude', 'svndumpfilter help',
+            'svndumpfilter include',
+
+            'svnlook author', 'svnlook cat', 'svnlook changed', 'svnlook date',
+            'svnlook diff', 'svnlook dirs-changed', 'svnlook filesize',
+            'svnlook help', 'svnlook history', 'svnlook info', 'svnlook lock',
+            'svnlook log', 'svnlook pg', 'svnlook pget', 'svnlook pl',
+            'svnlook plist', 'svnlook propget', 'svnlook proplist',
+            'svnlook tree', 'svnlook uuid', 'svnlook youngest',
+
+            'svnrdump dump', 'svnrdump help', 'svnrdump load',
+
+            'svnsync copy-revprops', 'svnsync help', 'svnsync info',
+            'svnsync init', 'svnsync initialize', 'svnsync sync',
+            'svnsync synchronize',
+
+            'tac', 'tail', 'tar', 'tee', 'tempfile', 'touch', 'tr', 'tree',
+            'true',
+
+            'umount', 'uname', 'unicode_start', 'unicode_stop', 'uniq',
+            'unlink', 'unzip', 'updatedb', 'updmap', 'uptime', 'users',
+            'utmpdump', 'uuidgen',
+
+            'valgrind', 'vdir', 'vi', 'vim', 'vmstat',
+
+            'w', 'wall', 'watch', 'wc', 'wget', 'whatis', 'whereis',
+            'which', 'whiptail', 'who', 'whoami', 'whois', 'wine', 'wineboot',
+            'winebuild', 'winecfg', 'wineconsole', 'winedbg', 'winedump',
+            'winefile', 'wodim', 'write',
+
+            'xargs', 'xhost', 'xmodmap', 'xset',
+
+            'yacc', 'yes', 'ypdomainname', 'yum',
+
+            'yum check-update', 'yum clean', 'yum deplist', 'yum erase',
+            'yum groupinfo', 'yum groupinstall', 'yum grouplist',
+            'yum groupremove', 'yum groupupdate', 'yum info', 'yum install',
+            'yum list', 'yum localinstall', 'yum localupdate', 'yum makecache',
+            'yum provides', 'yum remove', 'yum resolvedep', 'yum search',
+            'yum shell', 'yum update', 'yum upgrade', 'yum whatprovides',
+
+            'zcat', 'zcmp', 'zdiff', 'zdump', 'zegrep', 'zfgrep', 'zforce',
+            'zgrep', 'zip', 'zipgrep', 'zipinfo', 'zless', 'zmore', 'znew',
+            'zsh', 'zsoelim'
+            ),
+        3 => array(
+            'alias', 'bg', 'bind', 'break', 'builtin', 'cd', 'command',
+            'compgen', 'complete', 'continue', 'declare', 'dirs', 'disown',
+            'echo', 'enable', 'eval', 'exec', 'exit', 'export', 'fc',
+            'fg', 'getopts', 'hash', 'help', 'history', 'jobs', 'let',
+            'local', 'logout', 'popd', 'printf', 'pushd', 'pwd', 'readonly',
+            'return', 'shift', 'shopt', 'source', 'suspend', 'test', 'times',
+            'trap', 'type', 'typeset', 'ulimit', 'umask', 'unalias', 'unset',
+            'wait'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #c20cb9; font-weight: bold;',
+            3 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;',
+            1 => 'color: #800000;',
+            2 => 'color: #cc0000; font-style: italic;',
+            3 => 'color: #000000; font-weight: bold;',
+            4 => 'color: #666666;'
+            ),
+        'ESCAPE_CHAR' => array(
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #007800;',
+            3 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #780078;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #007800;',
+            2 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #660033;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables (will be handled by comment_regexps)
+        0 => "\\$\\{[a-zA-Z_][a-zA-Z0-9_]*?\\}",
+        //Variables without braces
+        1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
+        //Variable assignment
+        2 => "(?<![\.a-zA-Z_\-])([a-zA-Z_][a-zA-Z0-9_]*?)(?==)",
+        //Shorthand shell variables
+        4 => "\\$[*#\$\\-\\?!\d]",
+        //Parameters of commands
+        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|<(?:SEMI|PIPE)>|$)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#:])",
+            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%=\\/:])",
+            2 => array(
+                'SPACE_AS_WHITESPACE' => false
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/basic4gl.php b/vendor/easybook/geshi/geshi/basic4gl.php
new file mode 100755
index 000000000..112fb6967
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/basic4gl.php
@@ -0,0 +1,339 @@
+<?php
+/*************************************************************************************
+ * basic4gl.php
+ * ---------------------------------
+ * Author: Matthew Webb (bmatthew1@blueyonder.co.uk)
+ * Copyright: (c) 2004 Matthew Webb (http://matthew-4gl.wikispaces.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/09/15
+ *
+ * Basic4GL language file for GeSHi.
+ *
+ * You can find the Basic4GL Website at (http://www.basic4gl.net/)
+ *
+ * CHANGES
+ * -------
+ * 2007/09/17 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/09/17)
+ * -------------------------
+ * Make sure all the OpenGL and Basic4GL commands have been added and are complete.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Basic4GL',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+
+            // Navy Blue Bold Keywords
+
+            'true','rnd_max','m_pi','m_e','false','VK_ZOOM','VK_UP','VK_TAB','VK_SUBTRACT','VK_SPACE','VK_SNAPSHOT',
+            'VK_SHIFT','VK_SEPARATOR','VK_SELECT','VK_SCROLL','VK_RWIN','VK_RSHIFT','VK_RMENU','VK_RIGHT','VK_RETURN',
+            'VK_RCONTROL','VK_RBUTTON','VK_PROCESSKEY','VK_PRIOR','VK_PRINT','VK_PLAY','VK_PAUSE','VK_NUMPAD9','VK_NUMPAD8',
+            'VK_NUMPAD7','VK_NUMPAD6','VK_NUMPAD5','VK_NUMPAD4','VK_NUMPAD3','VK_NUMPAD2','VK_NUMPAD1','VK_NUMPAD0',
+            'VK_NUMLOCK','VK_NONCONVERT','VK_NEXT','VK_MULTIPLY','VK_MODECHANGE','VK_MENU','VK_MBUTTON','VK_LWIN',
+            'VK_LSHIFT','VK_LMENU','VK_LEFT','VK_LCONTROL','VK_LBUTTON','VK_KANJI','VK_KANA','VK_JUNJA','VK_INSERT',
+            'VK_HOME','VK_HELP','VK_HANJA','VK_HANGUL','VK_HANGEUL','VK_FINAL','VK_F9','VK_F8','VK_F7','VK_F6','VK_F5',
+            'VK_F4','VK_F3','VK_F24','VK_F23','VK_F22','VK_F21','VK_F20','VK_F2','VK_F19','VK_F18','VK_F17','VK_F16',
+            'VK_F15','VK_F14','VK_F13','VK_F12','VK_F11','VK_F10','VK_F1','VK_EXSEL','VK_EXECUTE','VK_ESCAPE','VK_EREOF',
+            'VK_END','VK_DOWN','VK_DIVIDE','VK_DELETE','VK_DECIMAL','VK_CRSEL','VK_CONVERT','VK_CONTROL','VK_CLEAR',
+            'VK_CAPITAL','VK_CANCEL','VK_BACK','VK_ATTN','VK_APPS','VK_ADD','VK_ACCEPT','TEXT_SIMPLE','TEXT_OVERLAID',
+            'TEXT_BUFFERED','SPR_TILEMAP','SPR_SPRITE','SPR_INVALID','MOUSE_RBUTTON','MOUSE_MBUTTON','MOUSE_LBUTTON',
+            'GL_ZOOM_Y','GL_ZOOM_X','GL_ZERO','GL_XOR','GL_WIN_swap_hint','GL_WIN_draw_range_elements','GL_VIEWPORT_BIT',
+            'GL_VIEWPORT','GL_VERTEX_ARRAY_TYPE_EXT','GL_VERTEX_ARRAY_TYPE','GL_VERTEX_ARRAY_STRIDE_EXT','GL_VERTEX_ARRAY_STRIDE',
+            'GL_VERTEX_ARRAY_SIZE_EXT','GL_VERTEX_ARRAY_SIZE','GL_VERTEX_ARRAY_POINTER_EXT','GL_VERTEX_ARRAY_POINTER',
+            'GL_VERTEX_ARRAY_EXT','GL_VERTEX_ARRAY_COUNT_EXT','GL_VERTEX_ARRAY','GL_VERSION_1_1','GL_VERSION','GL_VENDOR',
+            'GL_V3F','GL_V2F','GL_UNSIGNED_SHORT','GL_UNSIGNED_INT','GL_UNSIGNED_BYTE','GL_UNPACK_SWAP_BYTES','GL_UNPACK_SKIP_ROWS',
+            'GL_UNPACK_SKIP_PIXELS','GL_UNPACK_ROW_LENGTH','GL_UNPACK_LSB_FIRST','GL_UNPACK_ALIGNMENT','GL_TRUE','GL_TRIANGLE_STRIP',
+            'GL_TRIANGLE_FAN','GL_TRIANGLES','GL_TRANSFORM_BIT','GL_TEXTURE_WRAP_T','GL_TEXTURE_WRAP_S','GL_TEXTURE_WIDTH',
+            'GL_TEXTURE_STACK_DEPTH','GL_TEXTURE_RESIDENT','GL_TEXTURE_RED_SIZE','GL_TEXTURE_PRIORITY','GL_TEXTURE_MIN_FILTER',
+            'GL_TEXTURE_MATRIX','GL_TEXTURE_MAG_FILTER','GL_TEXTURE_LUMINANCE_SIZE','GL_TEXTURE_INTERNAL_FORMAT','GL_TEXTURE_INTENSITY_SIZE',
+            'GL_TEXTURE_HEIGHT','GL_TEXTURE_GREEN_SIZE','GL_TEXTURE_GEN_T','GL_TEXTURE_GEN_S','GL_TEXTURE_GEN_R','GL_TEXTURE_GEN_Q',
+            'GL_TEXTURE_GEN_MODE','GL_TEXTURE_ENV_MODE','GL_TEXTURE_ENV_COLOR','GL_TEXTURE_ENV','GL_TEXTURE_COORD_ARRAY_TYPE_EXT',
+            'GL_TEXTURE_COORD_ARRAY_TYPE','GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','GL_TEXTURE_COORD_ARRAY_STRIDE','GL_TEXTURE_COORD_ARRAY_SIZE_EXT',
+            'GL_TEXTURE_COORD_ARRAY_SIZE','GL_TEXTURE_COORD_ARRAY_POINTER_EXT','GL_TEXTURE_COORD_ARRAY_POINTER','GL_TEXTURE_COORD_ARRAY_EXT',
+            'GL_TEXTURE_COORD_ARRAY_COUNT_EXT','GL_TEXTURE_COORD_ARRAY','GL_TEXTURE_COMPONENTS','GL_TEXTURE_BORDER_COLOR','GL_TEXTURE_BORDER',
+            'GL_TEXTURE_BLUE_SIZE','GL_TEXTURE_BIT','GL_TEXTURE_BINDING_2D','GL_TEXTURE_BINDING_1D','GL_TEXTURE_ALPHA_SIZE',
+            'GL_TEXTURE_2D','GL_TEXTURE_1D','GL_TEXTURE9_ARB','GL_TEXTURE9','GL_TEXTURE8_ARB','GL_TEXTURE8','GL_TEXTURE7_ARB',
+            'GL_TEXTURE7','GL_TEXTURE6_ARB','GL_TEXTURE6','GL_TEXTURE5_ARB','GL_TEXTURE5','GL_TEXTURE4_ARB','GL_TEXTURE4',
+            'GL_TEXTURE3_ARB','GL_TEXTURE31_ARB','GL_TEXTURE31','GL_TEXTURE30_ARB','GL_TEXTURE30','GL_TEXTURE3','GL_TEXTURE2_ARB',
+            'GL_TEXTURE29_ARB','GL_TEXTURE29','GL_TEXTURE28_ARB','GL_TEXTURE28','GL_TEXTURE27_ARB','GL_TEXTURE27','GL_TEXTURE26_ARB',
+            'GL_TEXTURE26','GL_TEXTURE25_ARB','GL_TEXTURE25','GL_TEXTURE24_ARB','GL_TEXTURE24','GL_TEXTURE23_ARB','GL_TEXTURE23',
+            'GL_TEXTURE22_ARB','GL_TEXTURE22','GL_TEXTURE21_ARB','GL_TEXTURE21','GL_TEXTURE20_ARB','GL_TEXTURE20','GL_TEXTURE2',
+            'GL_TEXTURE1_ARB','GL_TEXTURE19_ARB','GL_TEXTURE19','GL_TEXTURE18_ARB','GL_TEXTURE18','GL_TEXTURE17_ARB',
+            'GL_TEXTURE17','GL_TEXTURE16_ARB','GL_TEXTURE16','GL_TEXTURE15_ARB','GL_TEXTURE15','GL_TEXTURE14_ARB','GL_TEXTURE14',
+            'GL_TEXTURE13_ARB','GL_TEXTURE13','GL_TEXTURE12_ARB','GL_TEXTURE12','GL_TEXTURE11_ARB','GL_TEXTURE11','GL_TEXTURE10_ARB',
+            'GL_TEXTURE10','GL_TEXTURE1','GL_TEXTURE0_ARB','GL_TEXTURE0','GL_TEXTURE','GL_T4F_V4F','GL_T4F_C4F_N3F_V4F','GL_T2F_V3F',
+            'GL_T2F_N3F_V3F','GL_T2F_C4UB_V3F','GL_T2F_C4F_N3F_V3F','GL_T2F_C3F_V3F','GL_T','GL_SUBPIXEL_BITS','GL_STEREO',
+            'GL_STENCIL_WRITEMASK','GL_STENCIL_VALUE_MASK','GL_STENCIL_TEST','GL_STENCIL_REF','GL_STENCIL_PASS_DEPTH_PASS',
+            'GL_STENCIL_PASS_DEPTH_FAIL','GL_STENCIL_INDEX','GL_STENCIL_FUNC','GL_STENCIL_FAIL','GL_STENCIL_CLEAR_VALUE',
+            'GL_STENCIL_BUFFER_BIT','GL_STENCIL_BITS','GL_STENCIL','GL_STACK_UNDERFLOW','GL_STACK_OVERFLOW','GL_SRC_COLOR',
+            'GL_SRC_ALPHA_SATURATE','GL_SRC_ALPHA','GL_SPOT_EXPONENT','GL_SPOT_DIRECTION','GL_SPOT_CUTOFF','GL_SPHERE_MAP',
+            'GL_SPECULAR','GL_SOURCE2_RGB_EXT','GL_SOURCE2_RGB','GL_SOURCE2_ALPHA_EXT','GL_SOURCE2_ALPHA','GL_SOURCE1_RGB_EXT',
+            'GL_SOURCE1_RGB','GL_SOURCE1_ALPHA_EXT','GL_SOURCE1_ALPHA','GL_SOURCE0_RGB_EXT','GL_SOURCE0_RGB','GL_SOURCE0_ALPHA_EXT',
+            'GL_SOURCE0_ALPHA','GL_SMOOTH','GL_SHORT','GL_SHININESS','GL_SHADE_MODEL','GL_SET','GL_SELECTION_BUFFER_SIZE',
+            'GL_SELECTION_BUFFER_POINTER','GL_SELECT','GL_SCISSOR_TEST','GL_SCISSOR_BOX','GL_SCISSOR_BIT','GL_S','GL_RIGHT',
+            'GL_RGB_SCALE_EXT','GL_RGB_SCALE','GL_RGBA_MODE','GL_RGBA8','GL_RGBA4','GL_RGBA2','GL_RGBA16','GL_RGBA12','GL_RGBA',
+            'GL_RGB8','GL_RGB5_A1','GL_RGB5','GL_RGB4','GL_RGB16','GL_RGB12','GL_RGB10_A2','GL_RGB10','GL_RGB','GL_RETURN',
+            'GL_REPLACE','GL_REPEAT','GL_RENDER_MODE','GL_RENDERER','GL_RENDER','GL_RED_SCALE','GL_RED_BITS','GL_RED_BIAS',
+            'GL_RED','GL_READ_BUFFER','GL_R3_G3_B2','GL_R','GL_QUAD_STRIP','GL_QUADS','GL_QUADRATIC_ATTENUATION','GL_Q',
+            'GL_PROXY_TEXTURE_2D','GL_PROXY_TEXTURE_1D','GL_PROJECTION_STACK_DEPTH','GL_PROJECTION_MATRIX','GL_PROJECTION',
+            'GL_PRIMARY_COLOR_EXT','GL_PRIMARY_COLOR','GL_PREVIOUS_EXT','GL_PREVIOUS','GL_POSITION','GL_POLYGON_TOKEN',
+            'GL_POLYGON_STIPPLE_BIT','GL_POLYGON_STIPPLE','GL_POLYGON_SMOOTH_HINT','GL_POLYGON_SMOOTH','GL_POLYGON_OFFSET_UNITS',
+            'GL_POLYGON_OFFSET_POINT','GL_POLYGON_OFFSET_LINE','GL_POLYGON_OFFSET_FILL','GL_POLYGON_OFFSET_FACTOR','GL_POLYGON_MODE',
+            'GL_POLYGON_BIT','GL_POLYGON','GL_POINT_TOKEN','GL_POINT_SMOOTH_HINT','GL_POINT_SMOOTH','GL_POINT_SIZE_RANGE',
+            'GL_POINT_SIZE_GRANULARITY','GL_POINT_SIZE','GL_POINT_BIT','GL_POINTS','GL_POINT','GL_PIXEL_MODE_BIT',
+            'GL_PIXEL_MAP_S_TO_S_SIZE','GL_PIXEL_MAP_S_TO_S','GL_PIXEL_MAP_R_TO_R_SIZE','GL_PIXEL_MAP_R_TO_R','GL_PIXEL_MAP_I_TO_R_SIZE',
+            'GL_PIXEL_MAP_I_TO_R','GL_PIXEL_MAP_I_TO_I_SIZE','GL_PIXEL_MAP_I_TO_I','GL_PIXEL_MAP_I_TO_G_SIZE','GL_PIXEL_MAP_I_TO_G',
+            'GL_PIXEL_MAP_I_TO_B_SIZE','GL_PIXEL_MAP_I_TO_B','GL_PIXEL_MAP_I_TO_A_SIZE','GL_PIXEL_MAP_I_TO_A','GL_PIXEL_MAP_G_TO_G_SIZE',
+            'GL_PIXEL_MAP_G_TO_G','GL_PIXEL_MAP_B_TO_B_SIZE','GL_PIXEL_MAP_B_TO_B','GL_PIXEL_MAP_A_TO_A_SIZE','GL_PIXEL_MAP_A_TO_A',
+            'GL_PHONG_WIN','GL_PHONG_HINT_WIN','GL_PERSPECTIVE_CORRECTION_HINT','GL_PASS_THROUGH_TOKEN','GL_PACK_SWAP_BYTES',
+            'GL_PACK_SKIP_ROWS','GL_PACK_SKIP_PIXELS','GL_PACK_ROW_LENGTH','GL_PACK_LSB_FIRST','GL_PACK_ALIGNMENT','GL_OUT_OF_MEMORY',
+            'GL_OR_REVERSE','GL_OR_INVERTED','GL_ORDER','GL_OR','GL_OPERAND2_RGB_EXT','GL_OPERAND2_RGB','GL_OPERAND2_ALPHA_EXT',
+            'GL_OPERAND2_ALPHA','GL_OPERAND1_RGB_EXT','GL_OPERAND1_RGB','GL_OPERAND1_ALPHA_EXT','GL_OPERAND1_ALPHA','GL_OPERAND0_RGB_EXT',
+            'GL_OPERAND0_RGB','GL_OPERAND0_ALPHA_EXT','GL_OPERAND0_ALPHA','GL_ONE_MINUS_SRC_COLOR','GL_ONE_MINUS_SRC_ALPHA',
+            'GL_ONE_MINUS_DST_COLOR','GL_ONE_MINUS_DST_ALPHA','GL_ONE','GL_OBJECT_PLANE','GL_OBJECT_LINEAR','GL_NO_ERROR',
+            'GL_NOTEQUAL','GL_NORMAL_ARRAY_TYPE_EXT','GL_NORMAL_ARRAY_TYPE','GL_NORMAL_ARRAY_STRIDE_EXT','GL_NORMAL_ARRAY_STRIDE',
+            'GL_NORMAL_ARRAY_POINTER_EXT','GL_NORMAL_ARRAY_POINTER','GL_NORMAL_ARRAY_EXT','GL_NORMAL_ARRAY_COUNT_EXT',
+            'GL_NORMAL_ARRAY','GL_NORMALIZE','GL_NOR','GL_NOOP','GL_NONE','GL_NICEST','GL_NEVER','GL_NEAREST_MIPMAP_NEAREST','GL_NEAREST_MIPMAP_LINEAR',
+            'GL_NEAREST','GL_NAND','GL_NAME_STACK_DEPTH','GL_N3F_V3F','GL_MULT','GL_MODULATE','GL_MODELVIEW_STACK_DEPTH','GL_MODELVIEW_MATRIX',
+            'GL_MODELVIEW','GL_MAX_VIEWPORT_DIMS','GL_MAX_TEXTURE_UNITS_ARB','GL_MAX_TEXTURE_UNITS','GL_MAX_TEXTURE_STACK_DEPTH',
+            'GL_MAX_TEXTURE_SIZE','GL_MAX_PROJECTION_STACK_DEPTH','GL_MAX_PIXEL_MAP_TABLE','GL_MAX_NAME_STACK_DEPTH','GL_MAX_MODELVIEW_STACK_DEPTH',
+            'GL_MAX_LIST_NESTING','GL_MAX_LIGHTS','GL_MAX_EVAL_ORDER','GL_MAX_ELEMENTS_VERTICES_WIN','GL_MAX_ELEMENTS_INDICES_WIN',
+            'GL_MAX_CLIP_PLANES','GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','GL_MAX_ATTRIB_STACK_DEPTH','GL_MATRIX_MODE','GL_MAP_STENCIL',
+            'GL_MAP_COLOR','GL_MAP2_VERTEX_4','GL_MAP2_VERTEX_3','GL_MAP2_TEXTURE_COORD_4','GL_MAP2_TEXTURE_COORD_3','GL_MAP2_TEXTURE_COORD_2',
+            'GL_MAP2_TEXTURE_COORD_1','GL_MAP2_NORMAL','GL_MAP2_INDEX','GL_MAP2_GRID_SEGMENTS','GL_MAP2_GRID_DOMAIN','GL_MAP2_COLOR_4',
+            'GL_MAP1_VERTEX_4','GL_MAP1_VERTEX_3','GL_MAP1_TEXTURE_COORD_4','GL_MAP1_TEXTURE_COORD_3','GL_MAP1_TEXTURE_COORD_2',
+            'GL_MAP1_TEXTURE_COORD_1','GL_MAP1_NORMAL','GL_MAP1_INDEX','GL_MAP1_GRID_SEGMENTS','GL_MAP1_GRID_DOMAIN',
+            'GL_MAP1_COLOR_4','GL_LUMINANCE_ALPHA','GL_LUMINANCE8_ALPHA8','GL_LUMINANCE8','GL_LUMINANCE6_ALPHA2','GL_LUMINANCE4_ALPHA4',
+            'GL_LUMINANCE4','GL_LUMINANCE16_ALPHA16','GL_LUMINANCE16','GL_LUMINANCE12_ALPHA4','GL_LUMINANCE12_ALPHA12','GL_LUMINANCE12',
+            'GL_LUMINANCE','GL_LOGIC_OP_MODE','GL_LOGIC_OP','GL_LOAD','GL_LIST_MODE','GL_LIST_INDEX','GL_LIST_BIT',
+            'GL_LIST_BASE','GL_LINE_WIDTH_RANGE','GL_LINE_WIDTH_GRANULARITY','GL_LINE_WIDTH','GL_LINE_TOKEN','GL_LINE_STRIP','GL_LINE_STIPPLE_REPEAT',
+            'GL_LINE_STIPPLE_PATTERN','GL_LINE_STIPPLE','GL_LINE_SMOOTH_HINT','GL_LINE_SMOOTH','GL_LINE_RESET_TOKEN','GL_LINE_LOOP',
+            'GL_LINE_BIT','GL_LINES','GL_LINEAR_MIPMAP_NEAREST','GL_LINEAR_MIPMAP_LINEAR','GL_LINEAR_ATTENUATION','GL_LINEAR',
+            'GL_LINE','GL_LIGHT_MODEL_TWO_SIDE','GL_LIGHT_MODEL_LOCAL_VIEWER','GL_LIGHT_MODEL_AMBIENT','GL_LIGHTING_BIT',
+            'GL_LIGHTING','GL_LIGHT7','GL_LIGHT6','GL_LIGHT5','GL_LIGHT4','GL_LIGHT3','GL_LIGHT2','GL_LIGHT1','GL_LIGHT0',
+            'GL_LESS','GL_LEQUAL','GL_LEFT','GL_KEEP','GL_INVERT','GL_INVALID_VALUE','GL_INVALID_OPERATION','GL_INVALID_ENUM','GL_INTERPOLATE_EXT',
+            'GL_INTERPOLATE','GL_INTENSITY8','GL_INTENSITY4','GL_INTENSITY16','GL_INTENSITY12','GL_INTENSITY','GL_INT',
+            'GL_INDEX_WRITEMASK','GL_INDEX_SHIFT','GL_INDEX_OFFSET','GL_INDEX_MODE','GL_INDEX_LOGIC_OP','GL_INDEX_CLEAR_VALUE','GL_INDEX_BITS',
+            'GL_INDEX_ARRAY_TYPE_EXT','GL_INDEX_ARRAY_TYPE','GL_INDEX_ARRAY_STRIDE_EXT','GL_INDEX_ARRAY_STRIDE','GL_INDEX_ARRAY_POINTER_EXT',
+            'GL_INDEX_ARRAY_POINTER','GL_INDEX_ARRAY_EXT','GL_INDEX_ARRAY_COUNT_EXT','GL_INDEX_ARRAY','GL_INCR','GL_HINT_BIT',
+            'GL_GREEN_SCALE','GL_GREEN_BITS','GL_GREEN_BIAS','GL_GREEN','GL_GREATER','GL_GEQUAL','GL_FRONT_RIGHT','GL_FRONT_LEFT',
+            'GL_FRONT_FACE','GL_FRONT_AND_BACK','GL_FRONT','GL_FOG_START','GL_FOG_SPECULAR_TEXTURE_WIN','GL_FOG_MODE','GL_FOG_INDEX',
+            'GL_FOG_HINT','GL_FOG_END','GL_FOG_DENSITY','GL_FOG_COLOR','GL_FOG_BIT','GL_FOG','GL_FLOAT','GL_FLAT','GL_FILL',
+            'GL_FEEDBACK_BUFFER_TYPE','GL_FEEDBACK_BUFFER_SIZE','GL_FEEDBACK_BUFFER_POINTER','GL_FEEDBACK','GL_FASTEST','GL_FALSE',
+            'GL_EYE_PLANE','GL_EYE_LINEAR','GL_EXT_vertex_array','GL_EXT_paletted_texture','GL_EXT_bgra','GL_EXTENSIONS','GL_EXP2',
+            'GL_EXP','GL_EVAL_BIT','GL_EQUIV','GL_EQUAL','GL_ENABLE_BIT','GL_EMISSION','GL_EDGE_FLAG_ARRAY_STRIDE_EXT','GL_EDGE_FLAG_ARRAY_STRIDE',
+            'GL_EDGE_FLAG_ARRAY_POINTER_EXT','GL_EDGE_FLAG_ARRAY_POINTER','GL_EDGE_FLAG_ARRAY_EXT','GL_EDGE_FLAG_ARRAY_COUNT_EXT','GL_EDGE_FLAG_ARRAY',
+            'GL_EDGE_FLAG','GL_DST_COLOR','GL_DST_ALPHA','GL_DRAW_PIXEL_TOKEN','GL_DRAW_BUFFER','GL_DOUBLE_EXT','GL_DOUBLEBUFFER',
+            'GL_DOUBLE','GL_DONT_CARE','GL_DOMAIN','GL_DITHER','GL_DIFFUSE','GL_DEPTH_WRITEMASK','GL_DEPTH_TEST','GL_DEPTH_SCALE',
+            'GL_DEPTH_RANGE','GL_DEPTH_FUNC','GL_DEPTH_COMPONENT','GL_DEPTH_CLEAR_VALUE','GL_DEPTH_BUFFER_BIT','GL_DEPTH_BITS',
+            'GL_DEPTH_BIAS','GL_DEPTH','GL_DECR','GL_DECAL','GL_CW','GL_CURRENT_TEXTURE_COORDS','GL_CURRENT_RASTER_TEXTURE_COORDS','GL_CURRENT_RASTER_POSITION_VALID',
+            'GL_CURRENT_RASTER_POSITION','GL_CURRENT_RASTER_INDEX','GL_CURRENT_RASTER_DISTANCE','GL_CURRENT_RASTER_COLOR','GL_CURRENT_NORMAL',
+            'GL_CURRENT_INDEX','GL_CURRENT_COLOR','GL_CURRENT_BIT','GL_CULL_FACE_MODE','GL_CULL_FACE','GL_COPY_PIXEL_TOKEN',
+            'GL_COPY_INVERTED','GL_COPY','GL_CONSTANT_EXT','GL_CONSTANT_ATTENUATION','GL_CONSTANT','GL_COMPILE_AND_EXECUTE','GL_COMPILE','GL_COMBINE_RGB_EXT',
+            'GL_COMBINE_RGB','GL_COMBINE_EXT','GL_COMBINE_ALPHA_EXT','GL_COMBINE_ALPHA','GL_COMBINE','GL_COLOR_WRITEMASK',
+            'GL_COLOR_TABLE_WIDTH_EXT','GL_COLOR_TABLE_RED_SIZE_EXT','GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','GL_COLOR_TABLE_INTENSITY_SIZE_EXT',
+            'GL_COLOR_TABLE_GREEN_SIZE_EXT','GL_COLOR_TABLE_FORMAT_EXT','GL_COLOR_TABLE_BLUE_SIZE_EXT','GL_COLOR_TABLE_ALPHA_SIZE_EXT',
+            'GL_COLOR_MATERIAL_PARAMETER','GL_COLOR_MATERIAL_FACE','GL_COLOR_MATERIAL','GL_COLOR_LOGIC_OP','GL_COLOR_INDEXES',
+            'GL_COLOR_INDEX8_EXT','GL_COLOR_INDEX4_EXT','GL_COLOR_INDEX2_EXT','GL_COLOR_INDEX1_EXT','GL_COLOR_INDEX16_EXT',
+            'GL_COLOR_INDEX12_EXT','GL_COLOR_INDEX','GL_COLOR_CLEAR_VALUE','GL_COLOR_BUFFER_BIT','GL_COLOR_ARRAY_TYPE_EXT',
+            'GL_COLOR_ARRAY_TYPE','GL_COLOR_ARRAY_STRIDE_EXT','GL_COLOR_ARRAY_STRIDE','GL_COLOR_ARRAY_SIZE_EXT','GL_COLOR_ARRAY_SIZE',
+            'GL_COLOR_ARRAY_POINTER_EXT','GL_COLOR_ARRAY_POINTER','GL_COLOR_ARRAY_EXT','GL_COLOR_ARRAY_COUNT_EXT','GL_COLOR_ARRAY',
+            'GL_COLOR','GL_COEFF','GL_CLIP_PLANE5','GL_CLIP_PLANE4','GL_CLIP_PLANE3','GL_CLIP_PLANE2','GL_CLIP_PLANE1','GL_CLIP_PLANE0',
+            'GL_CLIENT_VERTEX_ARRAY_BIT','GL_CLIENT_PIXEL_STORE_BIT','GL_CLIENT_ATTRIB_STACK_DEPTH','GL_CLIENT_ALL_ATTRIB_BITS',
+            'GL_CLIENT_ACTIVE_TEXTURE_ARB','GL_CLIENT_ACTIVE_TEXTURE','GL_CLEAR','GL_CLAMP','GL_CCW','GL_C4UB_V3F','GL_C4UB_V2F',
+            'GL_C4F_N3F_V3F','GL_C3F_V3F','GL_BYTE','GL_BLUE_SCALE','GL_BLUE_BITS','GL_BLUE_BIAS','GL_BLUE','GL_BLEND_SRC','GL_BLEND_DST',
+            'GL_BLEND','GL_BITMAP_TOKEN','GL_BITMAP','GL_BGR_EXT','GL_BGRA_EXT','GL_BACK_RIGHT','GL_BACK_LEFT','GL_BACK',
+            'GL_AUX_BUFFERS','GL_AUX3','GL_AUX2','GL_AUX1','GL_AUX0','GL_AUTO_NORMAL','GL_ATTRIB_STACK_DEPTH','GL_AND_REVERSE',
+            'GL_AND_INVERTED','GL_AND','GL_AMBIENT_AND_DIFFUSE','GL_AMBIENT','GL_ALWAYS','GL_ALPHA_TEST_REF','GL_ALPHA_TEST_FUNC',
+            'GL_ALPHA_TEST','GL_ALPHA_SCALE','GL_ALPHA_BITS','GL_ALPHA_BIAS','GL_ALPHA8','GL_ALPHA4','GL_ALPHA16','GL_ALPHA12',
+            'GL_ALPHA','GL_ALL_ATTRIB_BITS','GL_ADD_SIGNED_EXT','GL_ADD_SIGNED','GL_ADD','GL_ACTIVE_TEXTURE_ARB','GL_ACTIVE_TEXTURE',
+            'GL_ACCUM_RED_BITS','GL_ACCUM_GREEN_BITS','GL_ACCUM_CLEAR_VALUE','GL_ACCUM_BUFFER_BIT','GL_ACCUM_BLUE_BITS','GL_ACCUM_ALPHA_BITS',
+            'GL_ACCUM','GL_4_BYTES','GL_4D_COLOR_TEXTURE','GL_3_BYTES','GL_3D_COLOR_TEXTURE','GL_3D_COLOR','GL_3D','GL_2_BYTES',
+            'GL_2D','GLU_V_STEP','GLU_VERTEX','GLU_VERSION_1_2','GLU_VERSION_1_1','GLU_VERSION','GLU_U_STEP','GLU_UNKNOWN','GLU_TRUE',
+            'GLU_TESS_WINDING_RULE','GLU_TESS_WINDING_POSITIVE','GLU_TESS_WINDING_ODD','GLU_TESS_WINDING_NONZERO','GLU_TESS_WINDING_NEGATIVE',
+            'GLU_TESS_WINDING_ABS_GEQ_TWO','GLU_TESS_VERTEX_DATA','GLU_TESS_VERTEX','GLU_TESS_TOLERANCE','GLU_TESS_NEED_COMBINE_CALLBACK','GLU_TESS_MISSING_END_POLYGON',
+            'GLU_TESS_MISSING_END_CONTOUR','GLU_TESS_MISSING_BEGIN_POLYGON','GLU_TESS_MISSING_BEGIN_CONTOUR','GLU_TESS_ERROR_DATA',
+            'GLU_TESS_ERROR8','GLU_TESS_ERROR7','GLU_TESS_ERROR6','GLU_TESS_ERROR5','GLU_TESS_ERROR4','GLU_TESS_ERROR3','GLU_TESS_ERROR2',
+            'GLU_TESS_ERROR1','GLU_TESS_ERROR','GLU_TESS_END_DATA','GLU_TESS_END','GLU_TESS_EDGE_FLAG_DATA','GLU_TESS_EDGE_FLAG',
+            'GLU_TESS_COORD_TOO_LARGE','GLU_TESS_COMBINE_DATA','GLU_TESS_COMBINE','GLU_TESS_BOUNDARY_ONLY','GLU_TESS_BEGIN_DATA',
+            'GLU_TESS_BEGIN','GLU_SMOOTH','GLU_SILHOUETTE','GLU_SAMPLING_TOLERANCE','GLU_SAMPLING_METHOD','GLU_POINT','GLU_PATH_LENGTH',
+            'GLU_PARAMETRIC_TOLERANCE','GLU_PARAMETRIC_ERROR','GLU_OUT_OF_MEMORY','GLU_OUTSIDE','GLU_OUTLINE_POLYGON','GLU_OUTLINE_PATCH',
+            'GLU_NURBS_ERROR9','GLU_NURBS_ERROR8','GLU_NURBS_ERROR7','GLU_NURBS_ERROR6','GLU_NURBS_ERROR5','GLU_NURBS_ERROR4',
+            'GLU_NURBS_ERROR37','GLU_NURBS_ERROR36','GLU_NURBS_ERROR35','GLU_NURBS_ERROR34','GLU_NURBS_ERROR33','GLU_NURBS_ERROR32',
+            'GLU_NURBS_ERROR31','GLU_NURBS_ERROR30','GLU_NURBS_ERROR3','GLU_NURBS_ERROR29','GLU_NURBS_ERROR28','GLU_NURBS_ERROR27','GLU_NURBS_ERROR26',
+            'GLU_NURBS_ERROR25','GLU_NURBS_ERROR24','GLU_NURBS_ERROR23','GLU_NURBS_ERROR22','GLU_NURBS_ERROR21','GLU_NURBS_ERROR20',
+            'GLU_NURBS_ERROR2','GLU_NURBS_ERROR19','GLU_NURBS_ERROR18','GLU_NURBS_ERROR17','GLU_NURBS_ERROR16','GLU_NURBS_ERROR15','GLU_NURBS_ERROR14',
+            'GLU_NURBS_ERROR13','GLU_NURBS_ERROR12','GLU_NURBS_ERROR11','GLU_NURBS_ERROR10','GLU_NURBS_ERROR1','GLU_NONE',
+            'GLU_MAP1_TRIM_3','GLU_MAP1_TRIM_2','GLU_LINE','GLU_INVALID_VALUE','GLU_INVALID_ENUM','GLU_INTERIOR','GLU_INSIDE','GLU_INCOMPATIBLE_GL_VERSION',
+            'GLU_FLAT','GLU_FILL','GLU_FALSE','GLU_EXTERIOR','GLU_EXTENSIONS','GLU_ERROR','GLU_END','GLU_EDGE_FLAG','GLU_DOMAIN_DISTANCE',
+            'GLU_DISPLAY_MODE','GLU_CW','GLU_CULLING','GLU_CCW','GLU_BEGIN','GLU_AUTO_LOAD_MATRIX','CHANNEL_UNORDERED','CHANNEL_ORDERED',
+            'CHANNEL_MAX'
+            ),
+        2 => array(
+
+            // Red Lowercase Keywords
+
+            'WriteWord','WriteString','WriteReal','WriteLine','WriteInt','WriteFloat','WriteDouble','WriteChar','WriteByte',
+            'windowwidth','windowheight','waittimer','Vec4','Vec3','Vec2','val','UpdateJoystick','ucase$','Transpose','tickcount',
+            'textscroll','textrows','textmode','textcols','tanh','tand','tan','synctimercatchup','synctimer','swapbuffers',
+            'str$','stopsoundvoice','stopsounds','stopmusic','sqrt','sqr','sprzorder','spryvel','sprytiles','sprysize','spryrepeat',
+            'spryflip','sprycentre','spry','sprxvel','sprxtiles','sprxsize','sprxrepeat','sprxflip','sprxcentre','sprx',
+            'sprvisible','sprvel','sprtype','sprtop','sprspin','sprsolid','sprsetzorder','sprsetyvel','sprsetysize','sprsetyrepeat',
+            'sprsetyflip','sprsetycentre','sprsety','sprsetxvel','sprsetxsize','sprsetxrepeat','sprsetxflip','sprsetxcentre',
+            'sprsetx','sprsetvisible','sprsetvel','sprsettiles','sprsettextures','sprsettexture','sprsetspin','sprsetsolid',
+            'sprsetsize','sprsetscale','sprsetpos','sprsetparallax','sprsetframe','sprsetcolor','sprsetanimspeed','sprsetanimloop',
+            'sprsetangle','sprsetalpha','sprscale','sprright','sprpos','sprparallax','sprleft','spriteareawidth','spriteareaheight',
+            'sprframe','sprcolor','sprcameraz','sprcameray','sprcamerax','sprcamerasetz','sprcamerasety','sprcamerasetx',
+            'sprcamerasetpos','sprcamerasetfov','sprcamerasetangle','sprcamerapos','sprcamerafov','sprcameraangle',
+            'sprbottom','spranimspeed','spranimloop','spranimdone','sprangle','spralpha','spraddtextures','spraddtexture',
+            'sounderror','sleep','sind','sin','showcursor','sgn','settextscroll','setmusicvolume','SendMessage','Seek',
+            'scankeydown','RTInvert','rnd','right$','resizetext','resizespritearea','RejectConnection','ReceiveMessage','ReadWord',
+            'ReadText','ReadReal','ReadLine','ReadInt','ReadFloat','ReadDouble','ReadChar','ReadByte','randomize','printr',
+            'print','pow','playsound','playmusic','performancecounter','Orthonormalize','OpenFileWrite','OpenFileRead','Normalize',
+            'newtilemap','newsprite','NewServer','NewConnection','musicplaying','mouse_yd','mouse_y','mouse_xd','mouse_x',
+            'mouse_wheel','mouse_button','mid$','MessageSmoothed','MessageReliable','MessagePending','MessageChannel','maxtextureunits',
+            'MatrixZero','MatrixTranslate','MatrixScale','MatrixRotateZ','MatrixRotateY','MatrixRotateX','MatrixRotate','MatrixIdentity',
+            'MatrixCrossProduct','MatrixBasis','log','locate','loadtexture','loadsound','loadmipmaptexture','loadmipmapimagestrip',
+            'loadimagestrip','loadimage','Length','len','left$','lcase$','keydown','Joy_Y','Joy_X','Joy_Up','Joy_Right','Joy_Left',
+            'Joy_Keys','Joy_Down','Joy_Button','Joy_3','Joy_2','Joy_1','Joy_0','int','inscankey','input$','inkey$','inittimer',
+            'imagewidth','imagestripframes','imageheight','imageformat','imagedatatype','hidecursor','glViewport','glVertex4sv',
+            'glVertex4s','glVertex4iv','glVertex4i','glVertex4fv','glVertex4f','glVertex4dv','glVertex4d','glVertex3sv','glVertex3s',
+            'glVertex3iv','glVertex3i','glVertex3fv','glVertex3f','glVertex3dv','glVertex3d','glVertex2sv','glVertex2s','glVertex2iv',
+            'glVertex2i','glVertex2fv','glVertex2f','glVertex2dv','glVertex2d','gluPerspective','gluOrtho2D','gluLookAt',
+            'glubuild2dmipmaps','glTranslatef','glTranslated','gltexsubimage2d','glTexParameteriv','glTexParameteri',
+            'glTexParameterfv','glTexParameterf','glteximage2d','glTexGeniv','glTexGeni','glTexGenfv','glTexGenf','glTexGendv',
+            'glTexGend','glTexEnviv','glTexEnvi','glTexEnvfv','glTexEnvf','glTexCoord4sv','glTexCoord4s','glTexCoord4iv','glTexCoord4i',
+            'glTexCoord4fv','glTexCoord4f','glTexCoord4dv','glTexCoord4d','glTexCoord3sv','glTexCoord3s','glTexCoord3iv','glTexCoord3i',
+            'glTexCoord3fv','glTexCoord3f','glTexCoord3dv','glTexCoord3d','glTexCoord2sv','glTexCoord2s','glTexCoord2iv','glTexCoord2i',
+            'glTexCoord2fv','glTexCoord2f','glTexCoord2dv','glTexCoord2d','glTexCoord1sv','glTexCoord1s','glTexCoord1iv','glTexCoord1i','glTexCoord1fv',
+            'glTexCoord1f','glTexCoord1dv','glTexCoord1d','glStencilOp','glStencilMask','glStencilFunc','glShadeModel','glSelectBuffer',
+            'glScissor','glScalef','glScaled','glRotatef','glRotated','glRenderMode','glRectsv','glRects','glRectiv','glRecti',
+            'glRectfv','glRectf','glRectdv','glRectd','glReadBuffer','glRasterPos4sv','glRasterPos4s','glRasterPos4iv',
+            'glRasterPos4i','glRasterPos4fv','glRasterPos4f','glRasterPos4dv','glRasterPos4d','glRasterPos3sv','glRasterPos3s',
+            'glRasterPos3iv','glRasterPos3i','glRasterPos3fv','glRasterPos3f','glRasterPos3dv','glRasterPos3d','glRasterPos2sv',
+            'glRasterPos2s','glRasterPos2iv','glRasterPos2i','glRasterPos2fv','glRasterPos2f','glRasterPos2dv','glRasterPos2d',
+            'glPushName','glPushMatrix','glPushClientAttrib','glPushAttrib','glPrioritizeTextures','glPopName','glPopMatrix',
+            'glPopClientAttrib','glPopAttrib','glpolygonstipple','glPolygonOffset','glPolygonMode','glPointSize','glPixelZoom',
+            'glPixelTransferi','glPixelTransferf','glPixelStorei','glPixelStoref','glPassThrough','glOrtho','glNormal3sv','glNormal3s',
+            'glNormal3iv','glNormal3i','glNormal3fv','glNormal3f','glNormal3dv','glNormal3d','glNormal3bv','glNormal3b','glNewList',
+            'glMultMatrixf','glMultMatrixd','glmultitexcoord2f','glmultitexcoord2d','glMatrixMode','glMaterialiv','glMateriali',
+            'glMaterialfv','glMaterialf','glMapGrid2f','glMapGrid2d','glMapGrid1f','glMapGrid1d','glLogicOp','glLoadName','glLoadMatrixf',
+            'glLoadMatrixd','glLoadIdentity','glListBase','glLineWidth','glLineStipple','glLightModeliv','glLightModeli','glLightModelfv',
+            'glLightModelf','glLightiv','glLighti','glLightfv','glLightf','glIsTexture','glIsList','glIsEnabled','glInitNames',
+            'glIndexubv','glIndexub','glIndexsv','glIndexs','glIndexMask','glIndexiv','glIndexi','glIndexfv','glIndexf','glIndexdv',
+            'glIndexd','glHint','glGetTexParameteriv','glGetTexParameterfv','glGetTexLevelParameteriv','glGetTexLevelParameterfv',
+            'glGetTexGeniv','glGetTexGenfv','glGetTexGendv','glGetTexEnviv','glGetTexEnvfv','glgetstring','glgetpolygonstipple','glGetPixelMapuiv',
+            'glGetMaterialiv','glGetMaterialfv','glGetLightiv','glGetLightfv','glGetIntegerv','glGetFloatv',
+            'glGetError','glGetDoublev','glGetClipPlane','glGetBooleanv','glgentextures','glgentexture',
+            'glgenlists','glFrustum','glFrontFace','glFogiv','glFogi','glFogfv','glFogf','glFlush','glFinish','glFeedbackBuffer',
+            'glEvalPoint2','glEvalPoint1','glEvalMesh2','glEvalMesh1','glEvalCoord2fv','glEvalCoord2f','glEvalCoord2dv','glEvalCoord2d',
+            'glEvalCoord1fv','glEvalCoord1f','glEvalCoord1dv','glEvalCoord1d','glEndList','glEnd','glEnableClientState','glEnable',
+            'glEdgeFlagv','glEdgeFlag','glDrawBuffer','glDrawArrays','glDisableClientState','glDisable','glDepthRange','glDepthMask',
+            'glDepthFunc','gldeletetextures','gldeletetexture','gldeletelists','glCullFace','glCopyTexSubImage2D','glCopyTexSubImage1D',
+            'glCopyTexImage2D','glCopyTexImage1D','glColorMaterial','glColorMask','glColor4usv','glColor4us','glColor4uiv','glColor4ui',
+            'glColor4ubv','glColor4ub','glColor4sv','glColor4s','glColor4iv','glColor4i','glColor4fv','glColor4f','glColor4dv',
+            'glColor4d','glColor4bv','glColor4b','glColor3usv','glColor3us','glColor3uiv','glColor3ui','glColor3ubv','glColor3ub',
+            'glColor3sv','glColor3s','glColor3iv','glColor3i','glColor3fv','glColor3f','glColor3dv','glColor3d','glColor3bv',
+            'glColor3b','glClipPlane','glClearStencil','glClearIndex','glClearDepth','glClearColor','glClearAccum','glClear',
+            'glcalllists','glCallList','glBlendFunc','glBindTexture','glBegin','glArrayElement','glAreTexturesResident',
+            'glAlphaFunc','glactivetexture','glAccum','font','FindNextFile','FindFirstFile','FindClose','FileError',
+            'extensionsupported','exp','execute','EndOfFile','drawtext','divbyzero','Determinant','deletesprite','deletesound',
+            'DeleteServer','deleteimage','DeleteConnection','defaultfont','CrossProduct','cosd','cos','copysprite','ConnectionPending',
+            'ConnectionHandShaking','ConnectionConnected','ConnectionAddress','compilererrorline','compilererrorcol','compilererror',
+            'compilefile','compile','color','cls','CloseFile','clearregion','clearline','clearkeys','chr$','charat$','bindsprite',
+            'beep','atnd','atn2d','atn2','atn','atand','asc','argcount','arg','animatesprites','AcceptConnection','abs'
+            ),
+        3 => array(
+
+            // Blue Lowercase Keywords
+
+            'xor','while','wend','until','type','traditional_print','traditional','to','then','struc','string','step','single',
+            'run','return','reset','read','or','null','not','next','lor','loop','language','land','integer','input','if',
+            'goto','gosub','for','endstruc','endif','end','elseif','else','double','do','dim','data','const','basic4gl','as',
+            'and','alloc'
+            )
+
+        ),
+    'SYMBOLS' => array(
+        '=', '<', '>', '>=', '<=', '+', '-', '*', '/', '%', '(', ')', '{', '}', '[', ']', '&', ';', ':', '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #FF0000;',
+            3 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #657CC4; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000080; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/batch.php b/vendor/easybook/geshi/geshi/batch.php
new file mode 100644
index 000000000..7d1ca635b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/batch.php
@@ -0,0 +1,138 @@
+<?php
+/*************************************************************************************
+ * batch.php
+ * ------------
+ * Author: FraidZZ ( fraidzz [@] bk.ru )
+ * Copyright: (c) 2015 FraidZZ ( http://vk.com/fraidzz , http://www.cyberforum.ru/members/340557.html )
+ * Release Version: 1.0.8.11
+ * Date Started: 2015/03/28
+ *
+ * Windows batch file language file for GeSHi.
+ *
+ *************************************************************************************
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Windows Batch file',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+	'COMMENT_REGEXP' => array(
+		100 => '/(?:^|[&|])\\s*(?:rem|::)[^\\n]*/msi',
+		101 => '/[\\/-]\\S*/si',
+		102 => '/^\s*:[^:]\\S*/msi',
+		103 => '/(?:([%!])[^"\'~ ][^"\' ]*\\1|%%?(?:~[dpnxsatz]*)?[^"\'])/si'
+	),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+	'ESCAPE_REGEXP' => array(
+		100 => '/(?:([%!])\\S+\\1|%%(?:~[dpnxsatz]*)?[^"\'])/si'
+	),
+    'KEYWORDS' => array(
+        1 => array(
+            'echo', 'set', 'for', 'if', 'exit', 'else', 'do', 'not', 'defined', 'exist'
+            ),
+        2 => array(
+            "ASSOC", "ATTRIB", "BREAK", "BCDEDIT", "CACLS", "CD",
+			"CHCP", "CHDIR", "CHKDSK", "CHKNTFS", "CLS", "CMD", "COLOR",
+			"COMP", "COMPACT", "CONVERT", "COPY", "DATE", "DEL", "DIR",
+			"DISKCOMP", "DISKCOPY", "DISKPART", "DOSKEY", "DRIVERQUERY", "ECHO", "ENDLOCAL",
+			"ERASE", "EXIT", "FC", "FIND", "FINDSTR", "FOR", "FORMAT",
+			"FSUTIL", "FTYPE", "GPRESULT", "GRAFTABL", "HELP", "ICACLS",
+			"IF", "LABEL", "MD", "MKDIR", "MKLINK", "MODE", "MORE",
+			"MOVE", "OPENFILES", "PATH", "PAUSE", "POPD", "PRINT", "PROMPT",
+			"PUSHD", "RD", "RECOVER", "REN", "RENAME", "REPLACE", "RMDIR",
+			"ROBOCOPY", "SET", "SETLOCAL", "SC", "SCHTASKS", "SHIFT", "SHUTDOWN",
+			"SORT", "START", "SUBST", "SYSTEMINFO", "TASKLIST", "TASKKILL", "TIME",
+			"TITLE", "TREE", "TYPE", "VER", "VERIFY", "VOL", "XCOPY",
+			"WMIC", "CSCRIPT"
+            ),
+        3 => array(
+            "enabledelayedexpansion", "enableextensions"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '+', '-', '~', '^', '@', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800080; font-weight: bold;',
+            2 => 'color: #0080FF; font-weight: bold;',
+            3 => 'color: #0000FF; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #888888;',
+            2 => 'color: #FF1010; font-weight: bold;',
+			101 => 'color: #44aa44; font-weight: bold;',
+			100 => 'color: #888888;',
+			102 => 'color: #990000; font-weight: bold;',
+			103 => 'color: #000099; font-weight: bold;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            100 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;', 
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #44aa44; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #990000; font-weight: bold',
+			1 => 'color: #800080; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => array(
+				GESHI_SEARCH => "((?:goto|call)\\s*)(\\S+)",
+				GESHI_REPLACE => "\\2",
+				GESHI_BEFORE => "\\1",
+				GESHI_MODIFIERS => "si",
+				GESHI_AFTER => ""
+			) ,
+		1 => "goto|call"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/bf.php b/vendor/easybook/geshi/geshi/bf.php
new file mode 100755
index 000000000..c06ca5bf6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/bf.php
@@ -0,0 +1,115 @@
+<?php
+/*************************************************************************************
+ * bf.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/31
+ *
+ * Brainfuck language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'Brainfuck',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => '/[^\n+\-<>\[\]\.\,Y]+/s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        0 => array('+', '-'),
+        1 => array('[', ']'),
+        2 => array('<', '>'),
+        3 => array('.', ','),
+        4 => array('Y') //Brainfork Extension ;-)
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #660000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600;',
+            1 => 'color: #660000;',
+            2 => 'color: #000066;',
+            3 => 'color: #666600;',
+            4 => 'color: #660066;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'STRINGS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            'DISALLOW_BEFORE' => '',
+            'DISALLOW_AFTER' => ''
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/bibtex.php b/vendor/easybook/geshi/geshi/bibtex.php
new file mode 100755
index 000000000..51cb4cebd
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/bibtex.php
@@ -0,0 +1,183 @@
+<?php
+/********************************************************************************
+ * bibtex.php
+ * -----
+ * Author: Quinn Taylor (quinntaylor@mac.com)
+ * Copyright: (c) 2009 Quinn Taylor (quinntaylor@mac.com), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/04/29
+ *
+ * BibTeX language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/04/29 (1.0.8.4)
+ *  -  First Release
+ *
+ * TODO
+ * -------------------------
+ *  - Add regex for matching and replacing URLs with corresponding hyperlinks
+ *  - Add regex for matching more LaTeX commands that may be embedded in BibTeX
+ *    (Someone who understands regex better than I should borrow from latex.php)
+ ********************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *
+*******************************************************************************/
+
+// http://en.wikipedia.org/wiki/BibTeX
+// http://www.fb10.uni-bremen.de/anglistik/langpro/bibliographies/jacobsen-bibtex.html
+
+$language_data = array (
+    'LANG_NAME' => 'BibTeX',
+    'OOLANG' => false,
+    'COMMENT_SINGLE' => array(
+        1 => '%%'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        0 => array(
+            '@comment','@preamble','@string'
+            ),
+        // Standard entry types
+        1 => array(
+            '@article','@book','@booklet','@conference','@inbook',
+            '@incollection','@inproceedings','@manual','@mastersthesis',
+            '@misc','@phdthesis','@proceedings','@techreport','@unpublished'
+            ),
+        // Custom entry types
+        2 => array(
+            '@collection','@patent','@webpage'
+            ),
+        // Standard entry field names
+        3 => array(
+            'address','annote','author','booktitle','chapter','crossref',
+            'edition','editor','howpublished','institution','journal','key',
+            'month','note','number','organization','pages','publisher','school',
+            'series','title','type','volume','year'
+            ),
+        // Custom entry field names
+        4 => array(
+            'abstract','affiliation','chaptername','cited-by','cites',
+            'contents','copyright','date-added','date-modified','doi','eprint',
+            'isbn','issn','keywords','language','lccn','lib-congress',
+            'location','price','rating','read','size','source','url'
+            )
+        ),
+    'URLS' => array(
+        0 => '',
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'SYMBOLS' => array(
+        '{', '}', '#', '=', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        GESHI_COMMENTS => false,
+        ),
+    // Define the colors for the groups listed above
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #C02020;', // Standard entry types
+            2 => 'color: #C02020;', // Custom entry types
+            3 => 'color: #C08020;', // Standard entry field names
+            4 => 'color: #C08020;'  // Custom entry field names
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #2C922C; font-style: italic;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #2020C0;'
+            ),
+        'SYMBOLS' => array(
+            0 =>  'color: #E02020;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #2020C0;', // {...}
+            2 => 'color: #C08020;',  // BibDesk fields
+            3 => 'color: #800000;'   // LaTeX commands
+            ),
+        'ESCAPE_CHAR' => array(
+            0 =>  'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 =>  'color: #E02020;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'REGEXPS' => array(
+        // {parameters}
+        1 => array(
+            GESHI_SEARCH => "(?<=\\{)(?:\\{(?R)\\}|[^\\{\\}])*(?=\\})",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => "\bBdsk-(File|Url)-\d+",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => "\\\\[A-Za-z0-9]*+",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)'
+                ),
+            4 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)'
+                ),
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/blitzbasic.php b/vendor/easybook/geshi/geshi/blitzbasic.php
new file mode 100755
index 000000000..c90f45bfa
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/blitzbasic.php
@@ -0,0 +1,183 @@
+<?php
+/*************************************************************************************
+ * blitzbasic.php
+ * --------------
+ * Author: P�draig O`Connel (info@moonsword.info)
+ * Copyright: (c) 2005 P�draig O`Connel (http://moonsword.info)
+ * Release Version: 1.0.8.11
+ * Date Started: 16.10.2005
+ *
+ * BlitzBasic language file for GeSHi.
+ *
+ * It is a simple Basic dialect. Released for Games and Network Connections.
+ * In this Language File are all functions included (2D BB and 3D BB)
+ *
+ *
+ * CHANGES
+ * -------
+ * 2005/12/28 (1.0.1)
+ *   -  Remove unnecessary style index for regexps
+ * 2005/10/22 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/10/22)
+ * -------------------------
+ * * Sort out the Basic commands for splitting up.
+ * * To set up the right colors.
+ *      (the colors are ok, but not the correct ones)
+ * * Split to BlitzBasic 2D and BlitzBasic 3D.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'BlitzBasic',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'If','EndIf','ElseIf','Else','While','Wend','Return','Next','Include','End Type','End Select','End If','End Function','End','Select',
+            'Type','Forever','For','Or','And','AppTitle','Case','Goto','Gosub','Step','Stop','Int','Last','False','Then','To','True','Until','Float',
+            'String','Before','Not'
+            ),
+        2 => array(
+            // All Functions - 2D BB and 3D BB
+            'Xor','WriteString','WriteShort','WritePixelFast','WritePixel','WriteLine','WriteInt','WriteFloat','WriteFile','WriteBytes',
+            'WriteByte','Write','WaitTimer','WaitMouse','WaitKey','WaitJoy','VWait','Viewport',
+            'Upper','UpdateGamma','UnlockBuffer','UDPTimeouts','UDPStreamPort','UDPStreamIP','UDPMsgPort','UDPMsgIP',
+            'Trim','TotalVidMem','TileImage','TileBlock','TFormImage','TFormFilter','Text',
+            'TCPTimeouts','TCPStreamPort','TCPStreamIP','Tan','SystemProperty','StringWidth','StringHeight','Str','StopNetGame',
+            'StopChannel','StartNetGame','Sqr','SoundVolume','SoundPitch','SoundPan','Sin','Shr',
+            'ShowPointer','Shl','Sgn','SetGfxDriver','SetGamma','SetFont','SetEnv','SetBuffer','SendUDPMsg','SendNetMsg',
+            'SeekFile','SeedRnd','ScanLine','ScaleImage','SaveImage','SaveBuffer','Sar','RuntimeError','RSet',
+            'RotateImage','RndSeed','Rnd','Right','ResumeChannel','Restore','ResizeImage','ResizeBank','Replace',
+            'Repeat','RecvUDPMsg','RecvNetMsg','RectsOverlap','Rect','ReadString','ReadShort','ReadPixelFast','ReadPixel','ReadLine',
+            'ReadInt','ReadFloat','ReadFile','ReadDir','ReadBytes','ReadByte','ReadAvail','Read','Rand','Print',
+            'PokeShort','PokeInt','PokeFloat','PokeByte','Plot','PlaySound','PlayMusic','PlayCDTrack','Pi','PeekShort',
+            'PeekInt','PeekFloat','PeekByte','PauseChannel','Oval','Origin','OpenTCPStream','OpenMovie','OpenFile',
+            'Null','NextFile','New','NetPlayerName','NetPlayerLocal','NetMsgType','NetMsgTo','NetMsgFrom',
+            'NetMsgData','MovieWidth','MoviePlaying','MovieHeight','MoveMouse','MouseZSpeed','MouseZ','MouseYSpeed','MouseY','MouseXSpeed',
+            'MouseX','MouseHit','MouseDown','Mod','Millisecs','MidHandle','Mid','MaskImage','LSet','Lower',
+            'LoopSound','Log10','Log','LockBuffer','Locate','Local','LoadSound','LoadImage','LoadFont','LoadBuffer',
+            'LoadAnimImage','Line','Len','Left','KeyHit','KeyDown','JoyZDir','JoyZ','JoyYDir',
+            'JoyYaw','JoyY','JoyXDir','JoyX','JoyVDir','JoyV','JoyUDir','JoyU','JoyType','JoyRoll',
+            'JoyPitch','JoyHit','JoyHat','JoyDown','JoinNetGame','Instr','Insert','Input',
+            'ImageYHandle','ImageXHandle','ImageWidth','ImagesOverlap','ImagesCollide','ImageRectOverlap','ImageRectCollide','ImageHeight','ImageBuffer',
+            'HostNetGame','HostIP','HidePointer','Hex','HandleImage','GraphicsWidth','GraphicsHeight','GraphicsDepth','GraphicsBuffer','Graphics',
+            'GrabImage','Global','GFXModeWidth','GFXModeHeight','GfxModeExists','GFXModeDepth','GfxDriverName','GetMouse',
+            'GetKey','GetJoy','GetEnv','GetColor','GammaRed','GammaGreen','GammaBlue','Function','FrontBuffer','FreeTimer',
+            'FreeSound','FreeImage','FreeFont','FreeBank','FontWidth','FontHeight','FlushMouse','FlushKeys',
+            'FlushJoy','Floor','Flip','First','FileType','FileSize','FilePos','Field',
+            'Exp','Exit','ExecFile','Eof','EndGraphics','Each','DrawMovie','DrawImageRect','DrawImage','DrawBlockRect','DrawBlock',
+            'DottedIP','Dim','DeleteNetPlayer','DeleteFile','DeleteDir','Delete','Delay','Default','DebugLog','Data',
+            'CurrentTime','CurrentDir','CurrentDate','CreateUDPStream','CreateTimer','CreateTCPServer','CreateNetPlayer','CreateImage','CreateDir','CreateBank',
+            'CountHostIPs','CountGFXModes','CountGfxDrivers','Cos','CopyStream','CopyRect','CopyPixelFast','CopyPixel','CopyImage','CopyFile',
+            'CopyBank','Const','CommandLine','ColorRed','ColorGreen','ColorBlue','Color','ClsColor','Cls','CloseUDPStream',
+            'CloseTCPStream','CloseTCPServer','CloseMovie','CloseFile','CloseDir','Chr','ChannelVolume','ChannelPlaying','ChannelPitch','ChannelPan',
+            'ChangeDir','Ceil','CallDLL','Bin','BankSize','BackBuffer','AvailVidMem','AutoMidHandle',
+            'ATan2','ATan','ASin','Asc','After','ACos','AcceptTCPStream','Abs',
+            // 3D Commands
+            'Wireframe','Windowed3D','WBuffer','VertexZ','VertexY',
+            'VertexX','VertexW','VertexV','VertexU','VertexTexCoords','VertexRed','VertexNZ','VertexNY','VertexNX','VertexNormal',
+            'VertexGreen','VertexCoords','VertexColor','VertexBlue','VertexAlpha','VectorYaw','VectorPitch','UpdateWorld','UpdateNormals','TurnEntity',
+            'TrisRendered','TriangleVertex','TranslateEntity','TFormVector','TFormPoint','TFormNormal','TFormedZ','TFormedY','TFormedX','TextureWidth',
+            'TextureName','TextureHeight','TextureFilter','TextureCoords','TextureBuffer','TextureBlend','TerrainZ','TerrainY','TerrainX','TerrainSize',
+            'TerrainShading','TerrainHeight','TerrainDetail','SpriteViewMode','ShowEntity','SetCubeFace','SetAnimTime','SetAnimKey','ScaleTexture','ScaleSprite',
+            'ScaleMesh','ScaleEntity','RotateTexture','RotateSprite','RotateMesh','RotateEntity','ResetEntity','RenderWorld','ProjectedZ','ProjectedY',
+            'ProjectedX','PositionTexture','PositionMesh','PositionEntity','PointEntity','PickedZ','PickedY','PickedX','PickedTriangle','PickedTime',
+            'PickedSurface','PickedNZ','PickedNY','PickedNX','PickedEntity','PaintSurface','PaintMesh','PaintEntity','NameEntity','MoveEntity',
+            'ModifyTerrain','MeshWidth','MeshHeight','MeshesIntersect','MeshDepth','MD2AnimTime','MD2AnimLength','MD2Animating','LoadTexture','LoadTerrain',
+            'LoadSprite','LoadMesh','LoadMD2','LoaderMatrix','LoadBSP','LoadBrush','LoadAnimTexture','LoadAnimSeq','LoadAnimMesh','Load3DSound',
+            'LinePick','LightRange','LightMesh','LightConeAngles','LightColor','HWMultiTex','HideEntity','HandleSprite','Graphics3D','GfxMode3DExists',
+            'GfxMode3D','GfxDriverCaps3D','GfxDriver3D','GetSurfaceBrush','GetSurface','GetParent','GetMatElement','GetEntityType','GetEntityBrush','GetChild',
+            'GetBrushTexture','FreeTexture','FreeEntity','FreeBrush','FlipMesh','FitMesh','FindSurface','FindChild','ExtractAnimSeq','EntityZ',
+            'EntityYaw','EntityY','EntityX','EntityVisible','EntityType','EntityTexture','EntityShininess','EntityRoll','EntityRadius','EntityPitch',
+            'EntityPickMode','EntityPick','EntityParent','EntityOrder','EntityName','EntityInView','EntityFX','EntityDistance','EntityColor','EntityCollided',
+            'EntityBox','EntityBlend','EntityAutoFade','EntityAlpha','EmitSound','Dither','DeltaYaw','DeltaPitch','CreateTexture','CreateTerrain',
+            'CreateSurface','CreateSprite','CreateSphere','CreatePlane','CreatePivot','CreateMirror','CreateMesh','CreateListener','CreateLight','CreateCylinder',
+            'CreateCube','CreateCone','CreateCamera','CreateBrush','CountVertices','CountTriangles','CountSurfaces','CountGfxModes3D','CountCollisions','CountChildren',
+            'CopyMesh','CopyEntity','CollisionZ','CollisionY','CollisionX','CollisionTriangle','CollisionTime','CollisionSurface','Collisions','CollisionNZ',
+            'CollisionNY','CollisionNX','CollisionEntity','ClearWorld','ClearTextureFilters','ClearSurface','ClearCollisions','CaptureWorld','CameraZoom','CameraViewport',
+            'CameraRange','CameraProjMode','CameraProject','CameraPick','CameraFogRange','CameraFogMode','CameraFogColor','CameraClsMode','CameraClsColor','BSPLighting',
+            'BSPAmbientLight','BrushTexture','BrushShininess','BrushFX','BrushColor','BrushBlend','BrushAlpha','AntiAlias','AnimTime','AnimSeq',
+            'AnimLength','Animating','AnimateMD2','Animate','AmbientLight','AlignToVector','AddVertex','AddTriangle','AddMesh','AddAnimSeq',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #D9D100; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '\\'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/bnf.php b/vendor/easybook/geshi/geshi/bnf.php
new file mode 100755
index 000000000..ca15cf9eb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/bnf.php
@@ -0,0 +1,119 @@
+<?php
+/*************************************************************************************
+ * bnf.php
+ * --------
+ * Author: Rowan Rodrik van der Molen (rowan@bigsmoke.us)
+ * Copyright: (c) 2006 Rowan Rodrik van der Molen (http://www.bigsmoke.us/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/09/28
+ *
+ * BNF (Backus-Naur form) language file for GeSHi.
+ *
+ * See http://en.wikipedia.org/wiki/Backus-Naur_form for more info on BNF.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *  -  Removed superflicious regexps
+ * 2006/09/18 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/09/18)
+ * -------------------------
+ * * Nothing I can think of
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'bnf',
+    'COMMENT_SINGLE' => array(';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(),
+    'SYMBOLS' => array(
+        0 => array('(', ')'),
+        1 => array('<', '>'),
+        2 => array('[', ']'),
+        3 => array('{', '}'),
+        4 => array('=', '*', '/', '|', ':'),
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;', // Single Line comments
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a00;',
+            1 => 'color: #a00;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight: bold;', // Round brackets
+            1 => 'color: #000066; font-weight: bold;', // Angel Brackets
+            2 => 'color: #000066; font-weight: bold;', // Square Brackets
+            3 => 'color: #000066; font-weight: bold;', // BRaces
+            4 => 'color: #006600; font-weight: bold;', // Other operator symbols
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #007;',
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        //terminal symbols
+        0 => array(
+            GESHI_SEARCH => '(&lt;)([^&]+?)(&gt;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/boo.php b/vendor/easybook/geshi/geshi/boo.php
new file mode 100755
index 000000000..15944f42a
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/boo.php
@@ -0,0 +1,215 @@
+<?php
+/*************************************************************************************
+ * boo.php
+ * --------
+ * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
+ * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/09/10
+ *
+ * Boo language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/09/10 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2007/09/10)
+ * -------------------------
+ * Regular Expression Literal matching
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Boo',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'''", "'", '"""', '"'),
+    'HARDQUOTE' => array('"""', '"""'),
+    'HARDESCAPE' => array('\"""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//Namespace
+            'namespace', 'import', 'from'
+            ),
+        2 => array(//Jump
+            'yield', 'return', 'goto', 'continue', 'break'
+            ),
+        3 => array(//Conditional
+            'while', 'unless', 'then', 'in', 'if', 'for', 'else', 'elif'
+            ),
+        4 => array(//Property
+            'set', 'get'
+            ),
+        5 => array(//Exception
+            'try', 'raise', 'failure', 'except', 'ensure'
+            ),
+        6 => array(//Visibility
+            'public', 'private', 'protected', 'internal'
+            ),
+        7 => array(//Define
+            'struct', 'ref', 'of', 'interface', 'event', 'enum', 'do', 'destructor', 'def', 'constructor', 'class'
+            ),
+        8 => array(//Cast
+            'typeof', 'cast', 'as'
+            ),
+        9 => array(//BiMacro
+            'yieldAll', 'using', 'unchecked', 'rawArayIndexing', 'print', 'normalArrayIndexing', 'lock',
+            'debug', 'checked', 'assert'
+            ),
+        10 => array(//BiAttr
+            'required', 'property', 'meta', 'getter', 'default'
+            ),
+        11 => array(//BiFunc
+            'zip', 'shellp', 'shellm', 'shell', 'reversed', 'range', 'prompt',
+            'matrix', 'map', 'len', 'join', 'iterator', 'gets', 'enumerate', 'cat', 'array'
+            ),
+        12 => array(//HiFunc
+            '__switch__', '__initobj__', '__eval__', '__addressof__', 'quack'
+            ),
+        13 => array(//Primitive
+            'void', 'ushort', 'ulong', 'uint', 'true', 'timespan', 'string', 'single',
+            'short', 'sbyte', 'regex', 'object', 'null', 'long', 'int', 'false', 'duck',
+            'double', 'decimal', 'date', 'char', 'callable', 'byte', 'bool'
+            ),
+        14 => array(//Operator
+            'not', 'or', 'and', 'is', 'isa',
+            ),
+        15 => array(//Modifier
+            'virtual', 'transient', 'static', 'partial', 'override', 'final', 'abstract'
+            ),
+        16 => array(//Access
+            'super', 'self'
+            ),
+        17 => array(//Pass
+            'pass'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[|', '|]', '${', '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', '+', '-', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+        17 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:green;font-weight:bold;',
+            2 => 'color:navy;',
+            3 => 'color:blue;font-weight:bold;',
+            4 => 'color:#8B4513;',
+            5 => 'color:teal;font-weight:bold;',
+            6 => 'color:blue;font-weight:bold;',
+            7 => 'color:blue;font-weight:bold;',
+            8 => 'color:blue;font-weight:bold;',
+            9 => 'color:maroon;',
+            10 => 'color:maroon;',
+            11 => 'color:purple;',
+            12 => 'color:#4B0082;',
+            13 => 'color:purple;font-weight:bold;',
+            14 => 'color:#008B8B;font-weight:bold;',
+            15 => 'color:brown;',
+            16 => 'color:black;font-weight:bold;',
+            17 => 'color:gray;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999999; font-style: italic;',
+            2 => 'color: #999999; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #0000FF; font-weight: bold;',
+            'HARD' => 'color: #0000FF; font-weight: bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;',
+            'HARD' => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            0 => 'color: 000000;',
+            1 => 'color: 000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006400;'
+            ),
+        'REGEXPS' => array(
+            #0 => 'color: #0066ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => '.',
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        #0 => '%(@)?\/(?:(?(1)[^\/\\\\\r\n]+|[^\/\\\\\r\n \t]+)|\\\\[\/\\\\\w+()|.*?$^[\]{}\d])+\/%'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/c.php b/vendor/easybook/geshi/geshi/c.php
new file mode 100755
index 000000000..35d5b019d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/c.php
@@ -0,0 +1,281 @@
+<?php
+/*************************************************************************************
+ * c.php
+ * -----
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Contributors:
+ *  - Jack Lloyd (lloyd@randombit.net)
+ *  - Michael Mol (mikemol@gmail.com)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * C language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/01/22 (1.0.8.3)
+ *   -  Made keywords case-sensitive.
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/XX/XX (1.0.4)
+ *   -  Added a couple of new keywords (Jack Lloyd)
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2009/02/08)
+ * -------------------------
+ *  -  Get a list of inbuilt functions to add (and explore C more
+ *     to complete this rather bare language file
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto'
+            ),
+        2 => array(
+            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
+            ),
+        3 => array(
+            // assert.h
+            'assert',
+
+            //complex.h
+            'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan',
+            'catanh', 'ccos', 'ccosh', 'cexp', 'cimag', 'cis', 'clog', 'conj',
+            'cpow', 'cproj', 'creal', 'csin', 'csinh', 'csqrt', 'ctan', 'ctanh',
+
+            //ctype.h
+            'digittoint', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl',
+            'isdigit', 'isgraph', 'islower', 'isprint', 'ispunct', 'isspace',
+            'isupper', 'isxdigit', 'toascii', 'tolower', 'toupper',
+
+            //inttypes.h
+            'imaxabs', 'imaxdiv', 'strtoimax', 'strtoumax', 'wcstoimax',
+            'wcstoumax',
+
+            //locale.h
+            'localeconv', 'setlocale',
+
+            //math.h
+            'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
+            'fabs', 'floor', 'frexp', 'ldexp', 'log', 'log10', 'modf', 'pow',
+            'sin', 'sinh', 'sqrt', 'tan', 'tanh',
+
+            //setjmp.h
+            'longjmp', 'setjmp',
+
+            //signal.h
+            'raise',
+
+            //stdarg.h
+            'va_arg', 'va_copy', 'va_end', 'va_start',
+
+            //stddef.h
+            'offsetof',
+
+            //stdio.h
+            'clearerr', 'fclose', 'fdopen', 'feof', 'ferror', 'fflush', 'fgetc',
+            'fgetpos', 'fgets', 'fopen', 'fprintf', 'fputc', 'fputchar',
+            'fputs', 'fread', 'freopen', 'fscanf', 'fseek', 'fsetpos', 'ftell',
+            'fwrite', 'getc', 'getch', 'getchar', 'gets', 'perror', 'printf',
+            'putc', 'putchar', 'puts', 'remove', 'rename', 'rewind', 'scanf',
+            'setbuf', 'setvbuf', 'snprintf', 'sprintf', 'sscanf', 'tmpfile',
+            'tmpnam', 'ungetc', 'vfprintf', 'vfscanf', 'vprintf', 'vscanf',
+            'vsprintf', 'vsscanf',
+
+            //stdlib.h
+            'abort', 'abs', 'atexit', 'atof', 'atoi', 'atol', 'bsearch',
+            'calloc', 'div', 'exit', 'free', 'getenv', 'itoa', 'labs', 'ldiv',
+            'ltoa', 'malloc', 'qsort', 'rand', 'realloc', 'srand', 'strtod',
+            'strtol', 'strtoul', 'system',
+
+            //string.h
+            'memchr', 'memcmp', 'memcpy', 'memmove', 'memset', 'strcat',
+            'strchr', 'strcmp', 'strcoll', 'strcpy', 'strcspn', 'strerror',
+            'strlen', 'strncat', 'strncmp', 'strncpy', 'strpbrk', 'strrchr',
+            'strspn', 'strstr', 'strtok', 'strxfrm',
+
+            //time.h
+            'asctime', 'clock', 'ctime', 'difftime', 'gmtime', 'localtime',
+            'mktime', 'strftime', 'time',
+
+            //wchar.h
+            'btowc', 'fgetwc', 'fgetws', 'fputwc', 'fputws', 'fwide',
+            'fwprintf', 'fwscanf', 'getwc', 'getwchar', 'mbrlen', 'mbrtowc',
+            'mbsinit', 'mbsrtowcs', 'putwc', 'putwchar', 'swprintf', 'swscanf',
+            'ungetwc', 'vfwprintf', 'vswprintf', 'vwprintf', 'wcrtomb',
+            'wcscat', 'wcschr', 'wcscmp', 'wcscoll', 'wcscpy', 'wcscspn',
+            'wcsftime', 'wcslen', 'wcsncat', 'wcsncmp', 'wcsncpy', 'wcspbrk',
+            'wcsrchr', 'wcsrtombs', 'wcsspn', 'wcsstr', 'wcstod', 'wcstok',
+            'wcstol', 'wcstoul', 'wcsxfrm', 'wctob', 'wmemchr', 'wmemcmp',
+            'wmemcpy', 'wmemmove', 'wmemset', 'wprintf', 'wscanf',
+
+            //wctype.h
+            'iswalnum', 'iswalpha', 'iswcntrl', 'iswctype', 'iswdigit',
+            'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace',
+            'iswupper', 'iswxdigit', 'towctrans', 'towlower', 'towupper',
+            'wctrans', 'wctype'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
+            'size_t', 'off_t'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>',
+        '!', '^', '&', '|',
+        '?', ':',
+        ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/c_loadrunner.php b/vendor/easybook/geshi/geshi/c_loadrunner.php
new file mode 100755
index 000000000..42b3d7721
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/c_loadrunner.php
@@ -0,0 +1,323 @@
+<?php
+/*************************************************************************************
+ * c_loadrunner.php
+ * ---------------------------------
+ * Author: Stuart Moncrieff (stuart at myloadtest dot com)
+ * Copyright: (c) 2010 Stuart Moncrieff (http://www.myloadtest.com/loadrunner-syntax-highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010-07-25
+ *
+ * C (for LoadRunner) language file for GeSHi.
+ *
+ * Based on LoadRunner 9.52.
+ *
+ * CHANGES
+ * -------
+ * 2010-08-01 (1.0.8.9)
+ *  -  Added highlighting support for LoadRunner {parameters}.
+ * 2010-07-25 (1.0.8.8)
+ *  -  First Release. Syntax highlighting support for lr_, web_, and sapgui_ functions only.
+ *
+ * TODO (updated 2010-07-25)
+ * -------------------------
+ *  - Add support for other vuser types: MMS, FTP, etc.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ************************************************************************************/
+
+$language_data = array (
+    // The First Indices
+    'LANG_NAME' => 'C (LoadRunner)',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    // Escape characters within strings (like \\) are not highlighted differently in LoadRunner, so
+    // I am using GeSHi escape characters (or regular expressions) to highlight LoadRunner {parameters}.
+    // LoadRunner {parameters} must begin with a letter and contain only alphanumeric characters and '_'
+    'ESCAPE_REGEXP' => array(
+        0 => "#\{[a-zA-Z]{1}[a-zA-Z_]{0,}\}#",
+    ),
+
+    // Keywords
+    'KEYWORDS' => array(
+        // Keywords from http://en.wikipedia.org/wiki/C_syntax
+        1 => array(
+            'auto', 'break', 'case', 'char', 'const', 'continue', 'default',
+            'do', 'double', 'else', 'enum', 'extern', 'float', 'for', 'goto',
+            'if', 'inline', 'int', 'long', 'register', 'restrict', 'return',
+            'short', 'signed', 'sizeof', 'static', 'struct', 'switch',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'while',
+            '_Bool', '_Complex', '_Imaginary'
+            ),
+        // C preprocessor directives from http://en.wikipedia.org/wiki/C_preprocessor
+        2 => array(
+            '#define', '#if', '#ifdef', '#ifndef', '#include', '#else', '#elif', '#endif', '#pragma', '#undef'
+            ),
+        // Functions from lrun.h
+        3 => array(
+            'lr_start_transaction', 'lr_start_sub_transaction', 'lr_start_transaction_instance', 'lr_end_transaction',
+            'lr_end_sub_transaction', 'lr_end_transaction_instance', 'lr_stop_transaction', 'lr_stop_transaction_instance',
+            'lr_resume_transaction', 'lr_resume_transaction_instance', 'lr_wasted_time', 'lr_set_transaction', 'lr_user_data_point',
+            'lr_user_data_point_instance', 'lr_user_data_point_ex', 'lr_user_data_point_instance_ex', 'lr_get_transaction_duration',
+            'lr_get_trans_instance_duration', 'lr_get_transaction_think_time', 'lr_get_trans_instance_think_time',
+            'lr_get_transaction_wasted_time', 'lr_get_trans_instance_wasted_time', 'lr_get_transaction_status',
+            'lr_get_trans_instance_status', 'lr_set_transaction_status', 'lr_set_transaction_status_by_name',
+            'lr_set_transaction_instance_status', 'lr_start_timer', 'lr_end_timer', 'lr_rendezvous', 'lr_rendezvous_ex',
+            'lr_get_vuser_ip', 'lr_whoami', 'lr_get_host_name', 'lr_get_master_host_name', 'lr_get_attrib_long',
+            'lr_get_attrib_string', 'lr_get_attrib_double', 'lr_paramarr_idx', 'lr_paramarr_random', 'lr_paramarr_len',
+            'lr_param_unique', 'lr_param_sprintf', 'lr_load_dll', 'lr_continue_on_error', 'lr_decrypt', 'lr_abort', 'lr_exit',
+            'lr_peek_events', 'lr_think_time', 'lr_debug_message', 'lr_log_message', 'lr_message', 'lr_error_message',
+            'lr_output_message', 'lr_vuser_status_message', 'lr_fail_trans_with_error', 'lr_next_row', 'lr_advance_param',
+            'lr_eval_string', 'lr_eval_string_ext', 'lr_eval_string_ext_free', 'lr_param_increment', 'lr_save_var',
+            'lr_save_string', 'lr_save_int', 'lr_save_datetime', 'lr_save_searched_string', 'lr_set_debug_message',
+            'lr_get_debug_message', 'lr_enable_ip_spoofing', 'lr_disable_ip_spoofing', 'lr_convert_string_encoding'
+            ),
+        // Constants from lrun.h
+        4 => array(
+            'DP_FLAGS_NO_LOG', 'DP_FLAGS_STANDARD_LOG', 'DP_FLAGS_EXTENDED_LOG', 'merc_timer_handle_t', 'LR_EXIT_VUSER',
+            'LR_EXIT_ACTION_AND_CONTINUE', 'LR_EXIT_ITERATION_AND_CONTINUE', 'LR_EXIT_VUSER_AFTER_ITERATION',
+            'LR_EXIT_VUSER_AFTER_ACTION', 'LR_EXIT_MAIN_ITERATION_AND_CONTINUE', 'LR_MSG_CLASS_DISABLE_LOG',
+            'LR_MSG_CLASS_STANDARD_LOG', 'LR_MSG_CLASS_RETURNED_DATA', 'LR_MSG_CLASS_PARAMETERS', 'LR_MSG_CLASS_ADVANCED_TRACE',
+            'LR_MSG_CLASS_EXTENDED_LOG', 'LR_MSG_CLASS_SENT_DATA', 'LR_MSG_CLASS_JIT_LOG_ON_ERROR', 'LR_SWITCH_OFF', 'LR_SWITCH_ON',
+            'LR_SWITCH_DEFAULT', 'ONE_DAY', 'ONE_HOUR', 'ONE_MIN', 'DATE_NOW', 'TIME_NOW', 'LR_MSG_CLASS_BRIEF_LOG',
+            'LR_MSG_CLASS_RESULT_DATA', 'LR_MSG_CLASS_FULL_TRACE', 'LR_MSG_CLASS_AUTO_LOG', 'LR_MSG_OFF', 'LR_MSG_ON',
+            'LR_MSG_DEFAULT'
+            ),
+        // Functions from web_api.h
+        5 => array(
+            'web_reg_add_cookie', 'web_report_data_point', 'web_text_link', 'web_element', 'web_image_link', 'web_static_image',
+            'web_image_submit', 'web_button', 'web_edit_field', 'web_radio_group', 'web_check_box', 'web_list', 'web_text_area',
+            'web_map_area', 'web_eval_java_script', 'web_reg_dialog', 'web_reg_cross_step_download', 'web_browser',
+            'web_set_rts_key', 'web_save_param_length', 'web_save_timestamp_param', 'web_load_cache', 'web_dump_cache',
+            'web_add_cookie_ex'
+            ),
+        // Constants from web_api.h
+        6 => array(
+            'DESCRIPTION', 'ACTION', 'VERIFICATION', 'LR_NOT_FOUND', 'HTTP_INFO_TOTAL_REQUEST_STAT',
+            'HTTP_INFO_TOTAL_RESPONSE_STAT', 'LRW_OPT_STOP_VUSER_ON_ERROR', 'LRW_OPT_DISPLAY_IMAGE_BODY'
+            ),
+        // Functions from as_web.h
+        7 => array(
+            'web_add_filter', 'web_add_auto_filter', 'web_add_auto_header', 'web_add_header', 'web_add_cookie',
+            'web_cleanup_auto_headers', 'web_cleanup_cookies', 'web_concurrent_end', 'web_concurrent_start', 'web_create_html_param',
+            'web_create_html_param_ex', 'web_custom_request', 'web_disable_keep_alive', 'web_enable_keep_alive', 'web_find',
+            'web_get_int_property', 'web_image', 'web_image_check', 'web_link', 'web_global_verification', 'web_reg_find',
+            'web_reg_save_param', 'web_convert_param', 'web_remove_auto_filter', 'web_remove_auto_header', 'web_revert_auto_header',
+            'web_remove_cookie', 'web_save_header', 'web_set_certificate', 'web_set_certificate_ex', 'web_set_connections_limit',
+            'web_set_max_html_param_len', 'web_set_max_retries', 'web_set_proxy', 'web_set_proxy_bypass', 'web_set_secure_proxy',
+            'web_set_sockets_option', 'web_set_option', 'web_set_timeout', 'web_set_user', 'web_sjis_to_euc_param',
+            'web_submit_data', 'web_submit_form', 'web_url', 'web_set_proxy_bypass_local', 'web_cache_cleanup',
+            'web_create_html_query', 'web_create_radio_button_param', 'web_switch_net_layer'
+            ),
+        // Constants from as_web.h
+        8 => array(
+            'ENDFORM', 'LAST', 'ENDITEM', 'EXTRARES', 'ITEMDATA', 'STARTHIDDENS', 'ENDHIDDENS', 'CONNECT', 'RECEIVE', 'RESOLVE',
+            'STEP', 'REQUEST', 'RESPONSE', 'STARTQUERY', 'ENDQUERY', 'INPROPS', 'OUTPROPS', 'ENDPROPS', 'RAW_BODY_START',
+            'RAW_BODY_END', 'HTTP_INFO_RETURN_CODE', 'HTTP_INFO_DOWNLOAD_SIZE', 'HTTP_INFO_DOWNLOAD_TIME',
+            'LRW_NET_SOCKET_OPT_LOAD_VERIFY_FILE', 'LRW_NET_SOCKET_OPT_DEFAULT_VERIFY_PATH', 'LRW_NET_SOCKET_OPT_SSL_VERSION',
+            'LRW_NET_SOCKET_OPT_SSL_CIPHER_LIST', 'LRW_NET_SOCKET_OPT_SO_REUSE_ADDRESS', 'LRW_NET_SOCKET_OPT_USER_IP_ADDRESS',
+            'LRW_NET_SOCKET_OPT_IP_ADDRESS_BY_INDEX', 'LRW_NET_SOCKET_OPT_HELP', 'LRW_NET_SOCKET_OPT_PRINT_USER_IP_ADDRESS_LIST',
+            'LRW_OPT_HTML_CHAR_REF_BACKWARD_COMPATIBILITY', 'LRW_OPT_VALUE_YES', 'LRW_OPT_VALUE_NO'
+            ),
+        // Functions from as_sapgui.h
+        9 => array(
+            'sapgui_open_connection', 'sapgui_open_connection_ex', 'sapgui_logon', 'sapgui_create_session',
+            'sapgui_create_new_session', 'sapgui_call_method', 'sapgui_call_method_ex', 'sapgui_set_property',
+            'sapgui_get_property', 'sapgui_set_collection_property', 'sapgui_active_object_from_parent_method',
+            'sapgui_active_object_from_parent_property', 'sapgui_call_method_of_active_object',
+            'sapgui_call_method_of_active_object_ex', 'sapgui_set_property_of_active_object', 'sapgui_get_property_of_active_object',
+            'sapgui_select_active_connection', 'sapgui_select_active_session', 'sapgui_select_active_window ',
+            'sapgui_status_bar_get_text', 'sapgui_status_bar_get_param', 'sapgui_status_bar_get_type', 'sapgui_get_status_bar_text',
+            'sapgui_get_active_window_title', 'sapgui_is_object_available', 'sapgui_is_tab_selected', 'sapgui_is_object_changeable',
+            'sapgui_set_ok_code', 'sapgui_send_vkey', 'sapgui_resize_window', 'sapgui_window_resize', 'sapgui_window_maximize',
+            'sapgui_window_close', 'sapgui_window_restore', 'sapgui_window_scroll_to_row', 'sapgui_press_button',
+            'sapgui_select_radio_button', 'sapgui_set_password', 'sapgui_set_text', 'sapgui_select_menu', 'sapgui_select_tab',
+            'sapgui_set_checkbox', 'sapgui_set_focus', 'sapgui_select_combobox_entry', 'sapgui_get_ok_code',
+            'sapgui_is_radio_button_selected', 'sapgui_get_text', 'sapgui_is_checkbox_selected', 'sapgui_table_set_focus',
+            'sapgui_table_press_button', 'sapgui_table_select_radio_button', 'sapgui_table_set_password', 'sapgui_table_set_text',
+            'sapgui_table_set_checkbox', 'sapgui_table_select_combobox_entry', 'sapgui_table_set_row_selected',
+            'sapgui_table_set_column_selected', 'sapgui_table_set_column_width', 'sapgui_table_reorder', 'sapgui_table_fill_data',
+            'sapgui_table_get_text', 'sapgui_table_is_radio_button_selected', 'sapgui_table_is_checkbox_selected',
+            'sapgui_table_is_row_selected', 'sapgui_table_is_column_selected', 'sapgui_table_get_column_width',
+            'sapgui_grid_clear_selection', 'sapgui_grid_select_all', 'sapgui_grid_selection_changed',
+            'sapgui_grid_press_column_header', 'sapgui_grid_select_cell', 'sapgui_grid_select_rows', 'sapgui_grid_select_column',
+            'sapgui_grid_deselect_column', 'sapgui_grid_select_columns', 'sapgui_grid_select_cells', 'sapgui_grid_select_cell_row',
+            'sapgui_grid_select_cell_column', 'sapgui_grid_set_column_order', 'sapgui_grid_set_column_width',
+            'sapgui_grid_scroll_to_row', 'sapgui_grid_double_click', 'sapgui_grid_click', 'sapgui_grid_press_button',
+            'sapgui_grid_press_total_row', 'sapgui_grid_set_cell_data', 'sapgui_grid_set_checkbox',
+            'sapgui_grid_double_click_current_cell', 'sapgui_grid_click_current_cell', 'sapgui_grid_press_button_current_cell',
+            'sapgui_grid_press_total_row_current_cell', 'sapgui_grid_press_F1', 'sapgui_grid_press_F4', 'sapgui_grid_press_ENTER',
+            'sapgui_grid_press_toolbar_button', 'sapgui_grid_press_toolbar_context_button', 'sapgui_grid_open_context_menu',
+            'sapgui_grid_select_context_menu', 'sapgui_grid_select_toolbar_menu', 'sapgui_grid_fill_data',
+            'sapgui_grid_get_current_cell_row', 'sapgui_grid_get_current_cell_column', 'sapgui_grid_get_rows_count',
+            'sapgui_grid_get_columns_count', 'sapgui_grid_get_cell_data', 'sapgui_grid_is_checkbox_selected',
+            'sapgui_tree_scroll_to_node', 'sapgui_tree_set_hierarchy_header_width', 'sapgui_tree_set_selected_node',
+            'sapgui_tree_double_click_node', 'sapgui_tree_press_key', 'sapgui_tree_press_button', 'sapgui_tree_set_checkbox',
+            'sapgui_tree_double_click_item', 'sapgui_tree_click_link', 'sapgui_tree_open_default_context_menu',
+            'sapgui_tree_open_node_context_menu', 'sapgui_tree_open_header_context_menu', 'sapgui_tree_open_item_context_menu',
+            'sapgui_tree_select_context_menu', 'sapgui_tree_select_item', 'sapgui_tree_select_node', 'sapgui_tree_unselect_node',
+            'sapgui_tree_unselect_all', 'sapgui_tree_select_column', 'sapgui_tree_unselect_column', 'sapgui_tree_set_column_order',
+            'sapgui_tree_collapse_node', 'sapgui_tree_expand_node', 'sapgui_tree_scroll_to_item', 'sapgui_tree_set_column_width',
+            'sapgui_tree_press_header', 'sapgui_tree_is_checkbox_selected', 'sapgui_tree_get_node_text', 'sapgui_tree_get_item_text',
+            'sapgui_calendar_scroll_to_date', 'sapgui_calendar_focus_date', 'sapgui_calendar_select_interval',
+            'sapgui_apogrid_select_all', 'sapgui_apogrid_clear_selection', 'sapgui_apogrid_select_cell',
+            'sapgui_apogrid_deselect_cell', 'sapgui_apogrid_select_row', 'sapgui_apogrid_deselect_row',
+            'sapgui_apogrid_select_column', 'sapgui_apogrid_deselect_column', 'sapgui_apogrid_scroll_to_row',
+            'sapgui_apogrid_scroll_to_column', 'sapgui_apogrid_double_click', 'sapgui_apogrid_set_cell_data',
+            'sapgui_apogrid_get_cell_data', 'sapgui_apogrid_is_cell_changeable', 'sapgui_apogrid_get_cell_format',
+            'sapgui_apogrid_get_cell_tooltip', 'sapgui_apogrid_press_ENTER', 'sapgui_apogrid_open_cell_context_menu',
+            'sapgui_apogrid_select_context_menu_item', 'sapgui_text_edit_scroll_to_line', 'sapgui_text_edit_set_selection_indexes',
+            'sapgui_text_edit_set_unprotected_text_part', 'sapgui_text_edit_get_first_visible_line',
+            'sapgui_text_edit_get_selection_index_start', 'sapgui_text_edit_get_selection_index_end',
+            'sapgui_text_edit_get_number_of_unprotected_text_parts', 'sapgui_text_edit_double_click',
+            'sapgui_text_edit_single_file_dropped', 'sapgui_text_edit_multiple_files_dropped', 'sapgui_text_edit_press_F1',
+            'sapgui_text_edit_press_F4', 'sapgui_text_edit_open_context_menu', 'sapgui_text_edit_select_context_menu',
+            'sapgui_text_edit_modified_status_changed', 'sapgui_htmlviewer_send_event', 'sapgui_htmlviewer_dom_get_property',
+            'sapgui_toolbar_press_button', 'sapgui_toolbar_press_context_button', 'sapgui_toolbar_select_menu_item',
+            'sapgui_toolbar_select_menu_item_by_text', 'sapgui_toolbar_select_context_menu_item',
+            'sapgui_toolbar_select_context_menu_item_by_text'
+            ),
+        // Constants from as_sapgui.h
+        10 => array(
+            'BEGIN_OPTIONAL', 'END_OPTIONAL', 'al-keys', 'ENTER', 'HELP', 'F2', 'BACK', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9',
+            'F10', 'F11', 'ESC', 'SHIFT_F1', 'SHIFT_F2', 'SHIFT_F3', 'SHIFT_F4', 'SHIFT_F5', 'SHIFT_F6', 'SHIFT_F7', 'SHIFT_F8',
+            'SHIFT_F9', 'SHIFT_F10', 'SHIFT_F11', 'SHIFT_F12', 'CTRL_F1', 'CTRL_F2', 'CTRL_F3', 'CTRL_F4', 'CTRL_F5', 'CTRL_F6',
+            'CTRL_F7', 'CTRL_F8', 'CTRL_F9', 'CTRL_F10', 'CTRL_F11', 'CTRL_F12', 'CTRL_SHIFT_F1', 'CTRL_SHIFT_F2', 'CTRL_SHIFT_F3',
+            'CTRL_SHIFT_F4', 'CTRL_SHIFT_F5', 'CTRL_SHIFT_F6', 'CTRL_SHIFT_F7', 'CTRL_SHIFT_F8', 'CTRL_SHIFT_F9', 'CTRL_SHIFT_F10',
+            'CTRL_SHIFT_F11', 'CTRL_SHIFT_F12', 'CANCEL', 'CTRL_F', 'CTRL_PAGE_UP', 'PAGE_UP', 'PAGE_DOWN', 'CTRL_PAGE_DOWN',
+            'CTRL_G', 'CTRL_P'
+            ),
+        ),
+
+    // Symbols and Case Sensitivity
+    // Symbols from: http://en.wikipedia.org/wiki/C_syntax
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true, // Standard C reserved keywords
+        2 => true, // C preprocessor directives
+        3 => true, // Functions from lrun.h
+        4 => true, // Constants from lrun.h
+        5 => true, // Functions from web_api.h
+        6 => true, // Constants from web_api.h
+        7 => true, // Functions from as_web.h
+        8 => true, // Constants from as_web.h
+        9 => true, // Functions from as_sapgui.h
+        10 => true, // Constants from as_sapgui.h
+        ),
+
+    // Styles
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            // Functions are brown, constants and reserved words are blue
+            1 => 'color: #0000ff;', // Standard C reserved keywords
+            2 => 'color: #0000ff;', // C preprocessor directives
+            3 => 'color: #8a0000;', // Functions from lrun.h
+            4 => 'color: #0000ff;', // Constants from lrun.h
+            5 => 'color: #8a0000;', // Functions from web_api.h
+            6 => 'color: #0000ff;', // Constants from web_api.h
+            7 => 'color: #8a0000;', // Functions from as_web.h
+            8 => 'color: #0000ff;', // Constants from as_web.h
+            9 => 'color: #8a0000;', // Functions from as_sapgui.h
+            10 => 'color: #0000ff;', // Constants from as_sapgui.h
+            ),
+        'COMMENTS' => array(
+            // Comments are grey
+            1 => 'color: #9b9b9b;',
+            'MULTI' => 'color: #9b9b9b;'
+            ),
+        'ESCAPE_CHAR' => array(
+            // GeSHi cannot define a separate style for ESCAPE_REGEXP. The style for ESCAPE_CHAR also applies to ESCAPE_REGEXP.
+            // This is used for LoadRunner {parameters}
+            // {parameters} are pink
+            0 => 'color: #c000c0;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            // Strings are green
+            0 => 'color: #008080;'
+            ),
+        'NUMBERS' => array(
+            // Numbers are green
+            0 => 'color: #008080;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #008080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #008080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #008080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#008080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#008080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#008080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#008080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+
+    // URLs for Functions
+    'URLS' => array(
+        1 => '', // Standard C reserved keywords
+        2 => '', // C preprocessor directives
+        3 => '', // Functions from lrun.h
+        4 => '', // Constants from lrun.h
+        5 => '', // Functions from web_api.h
+        6 => '', // Constants from web_api.h
+        7 => '', // Functions from as_web.h
+        8 => '', // Constants from as_web.h
+        9 => '', // Functions from as_sapgui.h
+        10 => '', // Constants from as_sapgui.h
+        ),
+
+    // Object Orientation
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+
+    // Regular Expressions
+    // Note that REGEXPS are not applied within strings.
+    'REGEXPS' => array(
+        ),
+
+    // Contextual Highlighting and Strict Mode
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+
+    // Tabs
+    // Note that if you are using <pre> tags for your code, then the browser chooses how many spaces your tabs will translate to.
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/c_mac.php b/vendor/easybook/geshi/geshi/c_mac.php
new file mode 100755
index 000000000..41c21ce54
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/c_mac.php
@@ -0,0 +1,227 @@
+<?php
+/*************************************************************************************
+ * c_mac.php
+ * ---------
+ * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
+ * Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * C for Macs language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/11/27
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C (Mac)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto'
+            ),
+        2 => array(
+            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            // Mac-specific constants:
+            'kCFAllocatorDefault'
+            ),
+        3 => array(
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
+
+            // Mac-specific types:
+            'CFArrayRef', 'CFDictionaryRef', 'CFMutableDictionaryRef', 'CFBundleRef', 'CFSetRef', 'CFStringRef',
+            'CFURLRef', 'CFLocaleRef', 'CFDateFormatterRef', 'CFNumberFormatterRef', 'CFPropertyListRef',
+            'CFTreeRef', 'CFWriteStreamRef', 'CFCharacterSetRef', 'CFMutableStringRef', 'CFNotificationRef',
+            'CFReadStreamRef', 'CFNull', 'CFAllocatorRef', 'CFBagRef', 'CFBinaryHeapRef',
+            'CFBitVectorRef', 'CFBooleanRef', 'CFDataRef', 'CFDateRef', 'CFMachPortRef', 'CFMessagePortRef',
+            'CFMutableArrayRef', 'CFMutableBagRef', 'CFMutableBitVectorRef', 'CFMutableCharacterSetRef',
+            'CFMutableDataRef', 'CFMutableSetRef', 'CFNumberRef', 'CFPlugInRef', 'CFPlugInInstanceRef',
+            'CFRunLoopRef', 'CFRunLoopObserverRef', 'CFRunLoopSourceRef', 'CFRunLoopTimerRef', 'CFSocketRef',
+            'CFTimeZoneRef', 'CFTypeRef', 'CFUserNotificationRef', 'CFUUIDRef', 'CFXMLNodeRef', 'CFXMLParserRef',
+            'CFXMLTreeRef'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff0000;',
+            2 => 'color: #339900;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #00eeff;',
+            2 => 'color: #00eeff;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/c_winapi.php b/vendor/easybook/geshi/geshi/c_winapi.php
new file mode 100644
index 000000000..1252e7b92
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/c_winapi.php
@@ -0,0 +1,870 @@
+<?php
+/*************************************************************************************
+ * c_winapi.php
+ * -----
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Contributors:
+ *  - Jack Lloyd (lloyd@randombit.net)
+ *  - Michael Mol (mikemol@gmail.com)
+ * Copyright: (c) 2012 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/08/12
+ *
+ * C (WinAPI) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/01/22 (1.0.8.3)
+ *   -  Made keywords case-sensitive.
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/XX/XX (1.0.4)
+ *   -  Added a couple of new keywords (Jack Lloyd)
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2009/02/08)
+ * -------------------------
+ *  -  Get a list of inbuilt functions to add (and explore C more
+ *     to complete this rather bare language file
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C (WinAPI)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto'
+            ),
+        2 => array(
+            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
+            ),
+        3 => array(
+            // assert.h
+            'assert',
+
+            //complex.h
+            'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan',
+            'catanh', 'ccos', 'ccosh', 'cexp', 'cimag', 'cis', 'clog', 'conj',
+            'cpow', 'cproj', 'creal', 'csin', 'csinh', 'csqrt', 'ctan', 'ctanh',
+
+            //ctype.h
+            'digittoint', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl',
+            'isdigit', 'isgraph', 'islower', 'isprint', 'ispunct', 'isspace',
+            'isupper', 'isxdigit', 'toascii', 'tolower', 'toupper',
+
+            //inttypes.h
+            'imaxabs', 'imaxdiv', 'strtoimax', 'strtoumax', 'wcstoimax',
+            'wcstoumax',
+
+            //locale.h
+            'localeconv', 'setlocale',
+
+            //math.h
+            'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
+            'fabs', 'floor', 'frexp', 'ldexp', 'log', 'log10', 'modf', 'pow',
+            'sin', 'sinh', 'sqrt', 'tan', 'tanh',
+
+            //setjmp.h
+            'longjmp', 'setjmp',
+
+            //signal.h
+            'raise',
+
+            //stdarg.h
+            'va_arg', 'va_copy', 'va_end', 'va_start',
+
+            //stddef.h
+            'offsetof',
+
+            //stdio.h
+            'clearerr', 'fclose', 'fdopen', 'feof', 'ferror', 'fflush', 'fgetc',
+            'fgetpos', 'fgets', 'fopen', 'fprintf', 'fputc', 'fputchar',
+            'fputs', 'fread', 'freopen', 'fscanf', 'fseek', 'fsetpos', 'ftell',
+            'fwrite', 'getc', 'getch', 'getchar', 'gets', 'perror', 'printf',
+            'putc', 'putchar', 'puts', 'remove', 'rename', 'rewind', 'scanf',
+            'setbuf', 'setvbuf', 'snprintf', 'sprintf', 'sscanf', 'tmpfile',
+            'tmpnam', 'ungetc', 'vfprintf', 'vfscanf', 'vprintf', 'vscanf',
+            'vsprintf', 'vsscanf',
+
+            //stdlib.h
+            'abort', 'abs', 'atexit', 'atof', 'atoi', 'atol', 'bsearch',
+            'calloc', 'div', 'exit', 'free', 'getenv', 'itoa', 'labs', 'ldiv',
+            'ltoa', 'malloc', 'qsort', 'rand', 'realloc', 'srand', 'strtod',
+            'strtol', 'strtoul', 'system',
+
+            //string.h
+            'memchr', 'memcmp', 'memcpy', 'memmove', 'memset', 'strcat',
+            'strchr', 'strcmp', 'strcoll', 'strcpy', 'strcspn', 'strerror',
+            'strlen', 'strncat', 'strncmp', 'strncpy', 'strpbrk', 'strrchr',
+            'strspn', 'strstr', 'strtok', 'strxfrm',
+
+            //time.h
+            'asctime', 'clock', 'ctime', 'difftime', 'gmtime', 'localtime',
+            'mktime', 'strftime', 'time',
+
+            //wchar.h
+            'btowc', 'fgetwc', 'fgetws', 'fputwc', 'fputws', 'fwide',
+            'fwprintf', 'fwscanf', 'getwc', 'getwchar', 'mbrlen', 'mbrtowc',
+            'mbsinit', 'mbsrtowcs', 'putwc', 'putwchar', 'swprintf', 'swscanf',
+            'ungetwc', 'vfwprintf', 'vswprintf', 'vwprintf', 'wcrtomb',
+            'wcscat', 'wcschr', 'wcscmp', 'wcscoll', 'wcscpy', 'wcscspn',
+            'wcsftime', 'wcslen', 'wcsncat', 'wcsncmp', 'wcsncpy', 'wcspbrk',
+            'wcsrchr', 'wcsrtombs', 'wcsspn', 'wcsstr', 'wcstod', 'wcstok',
+            'wcstol', 'wcstoul', 'wcsxfrm', 'wctob', 'wmemchr', 'wmemcmp',
+            'wmemcpy', 'wmemmove', 'wmemset', 'wprintf', 'wscanf',
+
+            //wctype.h
+            'iswalnum', 'iswalpha', 'iswcntrl', 'iswctype', 'iswdigit',
+            'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace',
+            'iswupper', 'iswxdigit', 'towctrans', 'towlower', 'towupper',
+            'wctrans', 'wctype'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
+            'size_t', 'off_t'
+            ),
+        // Public API
+        5 => array(
+            'AssignProcessToJobObject', 'CommandLineToArgvW', 'ConvertThreadToFiber',
+            'CreateFiber', 'CreateJobObjectA', 'CreateJobObjectW', 'CreateProcessA',
+            'CreateProcessAsUserA', 'CreateProcessAsUserW', 'CreateProcessW',
+            'CreateRemoteThread', 'CreateThread', 'DeleteFiber', 'ExitProcess',
+            'ExitThread', 'FreeEnvironmentStringsA', 'FreeEnvironmentStringsW',
+            'GetCommandLineA', 'GetCommandLineW', 'GetCurrentProcess',
+            'GetCurrentProcessId', 'GetCurrentThread', 'GetCurrentThreadId',
+            'GetEnvironmentStringsA', 'GetEnvironmentStringsW',
+            'GetEnvironmentVariableA', 'GetEnvironmentVariableW', 'GetExitCodeProcess',
+            'GetExitCodeThread', 'GetGuiResources', 'GetPriorityClass',
+            'GetProcessAffinityMask', 'GetProcessPriorityBoost',
+            'GetProcessShutdownParameters', 'GetProcessTimes', 'GetProcessVersion',
+            'GetProcessWorkingSetSize', 'GetStartupInfoA', 'GetStartupInfoW',
+            'GetThreadPriority', 'GetThreadPriorityBoost', 'GetThreadTimes',
+            'OpenJobObjectA', 'OpenJobObjectW', 'OpenProcess',
+            'QueryInformationJobObject', 'ResumeThread', 'SetEnvironmentVariableA',
+            'SetEnvironmentVariableW', 'SetInformationJobObject', 'SetPriorityClass',
+            'SetProcessAffinityMask', 'SetProcessPriorityBoost',
+            'SetProcessShutdownParameters', 'SetProcessWorkingSetSize',
+            'SetThreadAffinityMask', 'SetThreadIdealProcessor', 'SetThreadPriority',
+            'SetThreadPriorityBoost', 'Sleep', 'SleepEx', 'SuspendThread',
+            'SwitchToFiber', 'SwitchToThread', 'TerminateJobObject', 'TerminateProcess',
+            'TerminateThread', 'WaitForInputIdle', 'WinExec',
+
+            '_hread', '_hwrite', '_lclose', '_lcreat', '_llseek', '_lopen', '_lread',
+            '_lwrite', 'AreFileApisANSI', 'CancelIo', 'CopyFileA', 'CopyFileW',
+            'CreateDirectoryA', 'CreateDirectoryExA', 'CreateDirectoryExW',
+            'CreateDirectoryW', 'CreateFileA', 'CreateFileW', 'DeleteFileA',
+            'DeleteFileW', 'FindClose', 'FindCloseChangeNotification',
+            'FindFirstChangeNotificationA', 'FindFirstChangeNotificationW',
+            'FindFirstFileA', 'FindFirstFileW', 'FindNextFileA', 'FindNextFileW',
+            'FlushFileBuffers', 'GetCurrentDirectoryA', 'GetCurrentDirectoryW',
+            'GetDiskFreeSpaceA', 'GetDiskFreeSpaceExA', 'GetDiskFreeSpaceExW',
+            'GetDiskFreeSpaceW', 'GetDriveTypeA', 'GetDriveTypeW', 'GetFileAttributesA',
+            'GetFileAttributesExA', 'GetFileAttributesExW', 'GetFileAttributesW',
+            'GetFileInformationByHandle', 'GetFileSize', 'GetFileType',
+            'GetFullPathNameA', 'GetFullPathNameW', 'GetLogicalDrives',
+            'GetLogicalDriveStringsA', 'GetLogicalDriveStringsW', 'GetLongPathNameA',
+            'GetLongPathNameW', 'GetShortPathNameA', 'GetShortPathNameW',
+            'GetTempFileNameA', 'GetTempFileNameW', 'GetTempPathA', 'GetTempPathW',
+            'LockFile', 'MoveFileA', 'MoveFileW', 'MulDiv', 'OpenFile',
+            'QueryDosDeviceA', 'QueryDosDeviceW', 'ReadFile', 'ReadFileEx',
+            'RemoveDirectoryA', 'RemoveDirectoryW', 'SearchPathA', 'SearchPathW',
+            'SetCurrentDirectoryA', 'SetCurrentDirectoryW', 'SetEndOfFile',
+            'SetFileApisToANSI', 'SetFileApisToOEM', 'SetFileAttributesA',
+            'SetFileAttributesW', 'SetFilePointer', 'SetHandleCount',
+            'SetVolumeLabelA', 'SetVolumeLabelW', 'UnlockFile', 'WriteFile',
+            'WriteFileEx',
+
+            'DeviceIoControl',
+
+            'GetModuleFileNameA', 'GetModuleFileNameW', 'GetProcAddress',
+            'LoadLibraryA', 'LoadLibraryExA', 'LoadLibraryExW', 'LoadLibraryW',
+            'LoadModule',
+
+            'GetPrivateProfileIntA', 'GetPrivateProfileIntW',
+            'GetPrivateProfileSectionA', 'GetPrivateProfileSectionNamesA',
+            'GetPrivateProfileSectionNamesW', 'GetPrivateProfileSectionW',
+            'GetPrivateProfileStringA', 'GetPrivateProfileStringW',
+            'GetPrivateProfileStructA', 'GetPrivateProfileStructW',
+            'GetProfileIntA', 'GetProfileIntW', 'GetProfileSectionA',
+            'GetProfileSectionW', 'GetProfileStringA', 'GetProfileStringW',
+            'RegCloseKey', 'RegConnectRegistryA', 'RegConnectRegistryW',
+            'RegCreateKeyA', 'RegCreateKeyExA', 'RegCreateKeyExW',
+            'RegCreateKeyW', 'RegDeleteKeyA', 'RegDeleteKeyW', 'RegDeleteValueA',
+            'RegDeleteValueW', 'RegEnumKeyA', 'RegEnumKeyExA', 'RegEnumKeyExW',
+            'RegEnumKeyW', 'RegEnumValueA', 'RegEnumValueW', 'RegFlushKey',
+            'RegGetKeySecurity', 'RegLoadKeyA', 'RegLoadKeyW',
+            'RegNotifyChangeKeyValue', 'RegOpenKeyA', 'RegOpenKeyExA', 'RegOpenKeyExW',
+            'RegOpenKeyW', 'RegOverridePredefKey', 'RegQueryInfoKeyA',
+            'RegQueryInfoKeyW', 'RegQueryMultipleValuesA', 'RegQueryMultipleValuesW',
+            'RegQueryValueA', 'RegQueryValueExA', 'RegQueryValueExW', 'RegQueryValueW',
+            'RegReplaceKeyA', 'RegReplaceKeyW', 'RegRestoreKeyA', 'RegRestoreKeyW',
+            'RegSaveKeyA', 'RegSaveKeyW', 'RegSetKeySecurity', 'RegSetValueA',
+            'RegSetValueExA', 'RegSetValueExW', 'RegSetValueW', 'RegUnLoadKeyA',
+            'RegUnLoadKeyW', 'WritePrivateProfileSectionA', 'WritePrivateProfileSectionW',
+            'WritePrivateProfileStringA', 'WritePrivateProfileStringW',
+            'WritePrivateProfileStructA', 'WritePrivateProfileStructW',
+            'WriteProfileSectionA', 'WriteProfileSectionW', 'WriteProfileStringA',
+            'WriteProfileStringW',
+
+            'AccessCheck', 'AccessCheckAndAuditAlarmA', 'AccessCheckAndAuditAlarmW',
+            'AccessCheckByType', 'AccessCheckByTypeAndAuditAlarmA',
+            'AccessCheckByTypeAndAuditAlarmW', 'AccessCheckByTypeResultList',
+            'AccessCheckByTypeResultListAndAuditAlarmA', 'AccessCheckByTypeResultListAndAuditAlarmW',
+            'AddAccessAllowedAce', 'AddAccessAllowedAceEx', 'AddAccessAllowedObjectAce',
+            'AddAccessDeniedAce', 'AddAccessDeniedAceEx', 'AddAccessDeniedObjectAce',
+            'AddAce', 'AddAuditAccessAce', 'AddAuditAccessAceEx', 'AddAuditAccessObjectAce',
+            'AdjustTokenGroups', 'AdjustTokenPrivileges', 'AllocateAndInitializeSid',
+            'AllocateLocallyUniqueId', 'AreAllAccessesGranted', 'AreAnyAccessesGranted',
+            'BuildExplicitAccessWithNameA', 'BuildExplicitAccessWithNameW',
+            'BuildImpersonateExplicitAccessWithNameA', 'BuildImpersonateExplicitAccessWithNameW',
+            'BuildImpersonateTrusteeA', 'BuildImpersonateTrusteeW', 'BuildSecurityDescriptorA',
+            'BuildSecurityDescriptorW', 'BuildTrusteeWithNameA', 'BuildTrusteeWithNameW',
+            'BuildTrusteeWithSidA', 'BuildTrusteeWithSidW',
+            'ConvertToAutoInheritPrivateObjectSecurity', 'CopySid', 'CreatePrivateObjectSecurity',
+            'CreatePrivateObjectSecurityEx', 'CreateRestrictedToken', 'DeleteAce',
+            'DestroyPrivateObjectSecurity', 'DuplicateToken', 'DuplicateTokenEx',
+            'EqualPrefixSid', 'EqualSid', 'FindFirstFreeAce', 'FreeSid', 'GetAce',
+            'GetAclInformation', 'GetAuditedPermissionsFromAclA', 'GetAuditedPermissionsFromAclW',
+            'GetEffectiveRightsFromAclA', 'GetEffectiveRightsFromAclW',
+            'GetExplicitEntriesFromAclA', 'GetExplicitEntriesFromAclW', 'GetFileSecurityA',
+            'GetFileSecurityW', 'GetKernelObjectSecurity', 'GetLengthSid', 'GetMultipleTrusteeA',
+            'GetMultipleTrusteeOperationA', 'GetMultipleTrusteeOperationW', 'GetMultipleTrusteeW',
+            'GetNamedSecurityInfoA', 'GetNamedSecurityInfoW', 'GetPrivateObjectSecurity',
+            'GetSecurityDescriptorControl', 'GetSecurityDescriptorDacl',
+            'GetSecurityDescriptorGroup', 'GetSecurityDescriptorLength',
+            'GetSecurityDescriptorOwner', 'GetSecurityDescriptorSacl', 'GetSecurityInfo',
+            'GetSidIdentifierAuthority', 'GetSidLengthRequired', 'GetSidSubAuthority',
+            'GetSidSubAuthorityCount', 'GetTokenInformation', 'GetTrusteeFormA',
+            'GetTrusteeFormW', 'GetTrusteeNameA', 'GetTrusteeNameW', 'GetTrusteeTypeA',
+            'GetTrusteeTypeW', 'GetUserObjectSecurity', 'ImpersonateLoggedOnUser',
+            'ImpersonateNamedPipeClient', 'ImpersonateSelf', 'InitializeAcl',
+            'InitializeSecurityDescriptor', 'InitializeSid', 'IsTokenRestricted', 'IsValidAcl',
+            'IsValidSecurityDescriptor', 'IsValidSid', 'LogonUserA', 'LogonUserW',
+            'LookupAccountNameA', 'LookupAccountNameW', 'LookupAccountSidA', 'LookupAccountSidW',
+            'LookupPrivilegeDisplayNameA', 'LookupPrivilegeDisplayNameW', 'LookupPrivilegeNameA',
+            'LookupPrivilegeNameW', 'LookupPrivilegeValueA', 'LookupPrivilegeValueW',
+            'LookupSecurityDescriptorPartsA', 'LookupSecurityDescriptorPartsW', 'MakeAbsoluteSD',
+            'MakeSelfRelativeSD', 'MapGenericMask', 'ObjectCloseAuditAlarmA',
+            'ObjectCloseAuditAlarmW', 'ObjectDeleteAuditAlarmA', 'ObjectDeleteAuditAlarmW',
+            'ObjectOpenAuditAlarmA', 'ObjectOpenAuditAlarmW', 'ObjectPrivilegeAuditAlarmA',
+            'ObjectPrivilegeAuditAlarmW', 'OpenProcessToken', 'OpenThreadToken', 'PrivilegeCheck',
+            'PrivilegedServiceAuditAlarmA', 'PrivilegedServiceAuditAlarmW', 'RevertToSelf',
+            'SetAclInformation', 'SetEntriesInAclA', 'SetEntriesInAclW', 'SetFileSecurityA',
+            'SetFileSecurityW', 'SetKernelObjectSecurity', 'SetNamedSecurityInfoA',
+            'SetNamedSecurityInfoW', 'SetPrivateObjectSecurity', 'SetPrivateObjectSecurityEx',
+            'SetSecurityDescriptorControl', 'SetSecurityDescriptorDacl',
+            'SetSecurityDescriptorGroup', 'SetSecurityDescriptorOwner',
+            'SetSecurityDescriptorSacl', 'SetSecurityInfo', 'SetThreadToken',
+            'SetTokenInformation', 'SetUserObjectSecurity', 'ChangeServiceConfig2A',
+            'ChangeServiceConfig2W', 'ChangeServiceConfigA', 'ChangeServiceConfigW',
+            'CloseServiceHandle', 'ControlService', 'CreateServiceA', 'CreateServiceW',
+            'DeleteService', 'EnumDependentServicesA', 'EnumDependentServicesW',
+            'EnumServicesStatusA', 'EnumServicesStatusW', 'GetServiceDisplayNameA',
+            'GetServiceDisplayNameW', 'GetServiceKeyNameA', 'GetServiceKeyNameW',
+            'LockServiceDatabase', 'NotifyBootConfigStatus', 'OpenSCManagerA', 'OpenSCManagerW',
+            'OpenServiceA', 'OpenServiceW', 'QueryServiceConfig2A', 'QueryServiceConfig2W',
+            'QueryServiceConfigA', 'QueryServiceConfigW', 'QueryServiceLockStatusA',
+            'QueryServiceLockStatusW', 'QueryServiceObjectSecurity', 'QueryServiceStatus',
+            'RegisterServiceCtrlHandlerA', 'RegisterServiceCtrlHandlerW',
+            'SetServiceObjectSecurity', 'SetServiceStatus', 'StartServiceA',
+            'StartServiceCtrlDispatcherA', 'StartServiceCtrlDispatcherW', 'StartServiceW',
+            'UnlockServiceDatabase',
+
+            'MultinetGetConnectionPerformanceA', 'MultinetGetConnectionPerformanceW',
+            'NetAlertRaise', 'NetAlertRaiseEx', 'NetApiBufferAllocate', 'NetApiBufferFree',
+            'NetApiBufferReallocate', 'NetApiBufferSize', 'NetConnectionEnum', 'NetFileClose',
+            'NetFileGetInfo', 'NetGetAnyDCName', 'NetGetDCName', 'NetGetDisplayInformationIndex',
+            'NetGroupAdd', 'NetGroupAddUser', 'NetGroupDel', 'NetGroupDelUser', 'NetGroupEnum',
+            'NetGroupGetInfo', 'NetGroupGetUsers', 'NetGroupSetInfo', 'NetGroupSetUsers',
+            'NetLocalGroupAdd', 'NetLocalGroupAddMember', 'NetLocalGroupAddMembers',
+            'NetLocalGroupDel', 'NetLocalGroupDelMember', 'NetLocalGroupDelMembers',
+            'NetLocalGroupEnum', 'NetLocalGroupGetInfo', 'NetLocalGroupGetMembers',
+            'NetLocalGroupSetInfo', 'NetLocalGroupSetMembers', 'NetMessageBufferSend',
+            'NetMessageNameAdd', 'NetMessageNameDel', 'NetMessageNameEnum',
+            'NetMessageNameGetInfo', 'NetQueryDisplayInformation', 'NetRemoteComputerSupports',
+            'NetRemoteTOd', 'NetReplExportDirAdd', 'NetReplExportDirDel', 'NetReplExportDirEnum',
+            'NetReplExportDirGetInfo', 'NetReplExportDirLock', 'NetReplExportDirSetInfo',
+            'NetReplExportDirUnlock', 'NetReplGetInfo', 'NetReplImportDirAdd',
+            'NetReplImportDirDel', 'NetReplImportDirEnum', 'NetReplImportDirGetInfo',
+            'NetReplImportDirLock', 'NetReplImportDirUnlock', 'NetReplSetInfo',
+            'NetScheduleJobAdd', 'NetScheduleJobDel', 'NetScheduleJobEnum',
+            'NetScheduleJobGetInfo', 'NetServerComputerNameAdd', 'NetServerComputerNameDel',
+            'NetServerDiskEnum', 'NetServerEnum', 'NetServerEnumEx', 'NetServerGetInfo',
+            'NetServerSetInfo', 'NetServerTransportAdd', 'NetServerTransportAddEx',
+            'NetServerTransportDel', 'NetServerTransportEnum', 'NetSessionDel', 'NetSessionEnum',
+            'NetSessionGetInfo', 'NetShareAdd', 'NetShareCheck', 'NetShareDel', 'NetShareEnum',
+            'NetShareGetInfo', 'NetShareSetInfo', 'NetStatisticsGet', 'NetUseAdd', 'NetUseDel',
+            'NetUseEnum', 'NetUseGetInfo', 'NetUserAdd', 'NetUserChangePassword', 'NetUserDel',
+            'NetUserEnum', 'NetUserGetGroups', 'NetUserGetInfo', 'NetUserGetLocalGroups',
+            'NetUserModalsGet', 'NetUserModalsSet', 'NetUserSetGroups', 'NetUserSetInfo',
+            'NetWkstaGetInfo', 'NetWkstaSetInfo', 'NetWkstaTransportAdd', 'NetWkstaTransportDel',
+            'NetWkstaTransportEnum', 'NetWkstaUserEnum', 'NetWkstaUserGetInfo',
+            'NetWkstaUserSetInfo', 'WNetAddConnection2A', 'WNetAddConnection2W',
+            'WNetAddConnection3A', 'WNetAddConnection3W', 'WNetAddConnectionA',
+            'WNetAddConnectionW', 'WNetCancelConnection2A', 'WNetCancelConnection2W',
+            'WNetCancelConnectionA', 'WNetCancelConnectionW', 'WNetCloseEnum',
+            'WNetConnectionDialog', 'WNetConnectionDialog1A', 'WNetConnectionDialog1W',
+            'WNetDisconnectDialog', 'WNetDisconnectDialog1A', 'WNetDisconnectDialog1W',
+            'WNetEnumResourceA', 'WNetEnumResourceW', 'WNetGetConnectionA', 'WNetGetConnectionW',
+            'WNetGetLastErrorA', 'WNetGetLastErrorW', 'WNetGetNetworkInformationA',
+            'WNetGetNetworkInformationW', 'WNetGetProviderNameA', 'WNetGetProviderNameW',
+            'WNetGetResourceInformationA', 'WNetGetResourceInformationW',
+            'WNetGetResourceParentA', 'WNetGetResourceParentW', 'WNetGetUniversalNameA',
+            'WNetGetUniversalNameW', 'WNetGetUserA', 'WNetGetUserW', 'WNetOpenEnumA',
+            'WNetOpenEnumW', 'WNetUseConnectionA', 'WnetUseConnectionW',
+
+            'accept', 'bind', 'closesocket', 'connect', 'gethostbyaddr', 'gethostbyname',
+            'gethostname', 'getpeername', 'getprotobyname', 'getprotobynumber', 'getservbyname',
+            'getservbyport', 'getsockname', 'getsockopt', 'htonl', 'htons', 'inet_addr',
+            'inet_ntoa', 'ioctlsocket', 'listen', 'ntohl', 'ntohs', 'recv', 'recvfrom', 'select',
+            'send', 'sendto', 'setsockopt', 'shutdown', 'socket', 'WSAAccept',
+            'WSAAddressToStringA', 'WSAAddressToStringW', 'WSAAsyncGetHostByAddr',
+            'WSAAsyncGetHostByName', 'WSAAsyncGetProtoByName', 'WSAAsyncGetProtoByNumber',
+            'WSAAsyncGetServByName', 'WSAAsyncGetServByPort', 'WSAAsyncSelect',
+            'WSACancelAsyncRequest', 'WSACancelBlockingCall', 'WSACleanup', 'WSACloseEvent',
+            'WSAConnect', 'WSACreateEvent', 'WSADuplicateSocketA', 'WSADuplicateSocketW',
+            'WSAEnumNameSpaceProvidersA', 'WSAEnumNameSpaceProvidersW', 'WSAEnumNetworkEvents',
+            'WSAEnumProtocolsA', 'WSAEnumProtocolsW', 'WSAEventSelect', 'WSAGetLastError',
+            'WSAGetOverlappedResult', 'WSAGetQOSByName', 'WSAGetServiceClassInfoA',
+            'WSAGetServiceClassInfoW', 'WSAGetServiceClassNameByClassIdA',
+            'WSAGetServiceClassNameByClassIdW', 'WSAHtonl', 'WSAHtons', 'WSAInstallServiceClassA',
+            'WSAInstallServiceClassW', 'WSAIoctl', 'WSAIsBlocking', 'WSAJoinLeaf',
+            'WSALookupServiceBeginA', 'WSALookupServiceBeginW', 'WSALookupServiceEnd',
+            'WSALookupServiceNextA', 'WSALookupServiceNextW', 'WSANtohl', 'WSANtohs',
+            'WSAProviderConfigChange', 'WSARecv', 'WSARecvDisconnect', 'WSARecvFrom',
+            'WSARemoveServiceClass', 'WSAResetEvent', 'WSASend', 'WSASendDisconnect', 'WSASendTo',
+            'WSASetBlockingHook', 'WSASetEvent', 'WSASetLastError', 'WSASetServiceA',
+            'WSASetServiceW', 'WSASocketA', 'WSASocketW', 'WSAStartup', 'WSAStringToAddressA',
+            'WSAStringToAddressW', 'WSAUnhookBlockingHook', 'WSAWaitForMultipleEvents',
+            'WSCDeinstallProvider', 'WSCEnableNSProvider', 'WSCEnumProtocols',
+            'WSCGetProviderPath', 'WSCInstallNameSpace', 'WSCInstallProvider',
+            'WSCUnInstallNameSpace',
+
+            'ContinueDebugEvent', 'DebugActiveProcess', 'DebugBreak', 'FatalExit',
+            'FlushInstructionCache', 'GetThreadContext', 'GetThreadSelectorEntry',
+            'IsDebuggerPresent', 'OutputDebugStringA', 'OutputDebugStringW', 'ReadProcessMemory',
+            'SetDebugErrorLevel', 'SetThreadContext', 'WaitForDebugEvent', 'WriteProcessMemory',
+
+            'CloseHandle', 'DuplicateHandle', 'GetHandleInformation', 'SetHandleInformation',
+
+            'AdjustWindowRect', 'AdjustWindowRectEx', 'AllowSetForegroundWindow',
+            'AnimateWindow', 'AnyPopup', 'ArrangeIconicWindows', 'BeginDeferWindowPos',
+            'BringWindowToTop', 'CascadeWindows', 'ChildWindowFromPoint',
+            'ChildWindowFromPointEx', 'CloseWindow', 'CreateWindowExA', 'CreateWindowExW',
+            'DeferWindowPos', 'DestroyWindow', 'EndDeferWindowPos', 'EnumChildWindows',
+            'EnumThreadWindows', 'EnumWindows', 'FindWindowA', 'FindWindowExA', 'FindWindowExW',
+            'FindWindowW', 'GetAltTabInfoA', 'GetAltTabInfoW', 'GetAncestor', 'GetClientRect',
+            'GetDesktopWindow', 'GetForegroundWindow', 'GetGUIThreadInfo', 'GetLastActivePopup',
+            'GetLayout', 'GetParent', 'GetProcessDefaultLayout', 'GetTitleBarInf', 'GetTopWindow',
+            'GetWindow', 'GetWindowInfo', 'GetWindowModuleFileNameA', 'GetWindowModuleFileNameW',
+            'GetWindowPlacement', 'GetWindowRect', 'GetWindowTextA', 'GetWindowTextLengthA',
+            'GetWindowTextLengthW', 'GetWindowTextW', 'GetWindowThreadProcessId', 'IsChild',
+            'IsIconic', 'IsWindow', 'IsWindowUnicode', 'IsWindowVisible', 'IsZoomed',
+            'LockSetForegroundWindow', 'MoveWindow', 'OpenIcon', 'RealChildWindowFromPoint',
+            'RealGetWindowClassA', 'RealGetWindowClassW', 'SetForegroundWindow',
+            'SetLayeredWindowAttributes', 'SetLayout', 'SetParent', 'SetProcessDefaultLayout',
+            'SetWindowPlacement', 'SetWindowPos', 'SetWindowTextA', 'SetWindowTextW',
+            'ShowOwnedPopups', 'ShowWindow', 'ShowWindowAsync', 'TileWindows',
+            'UpdateLayeredWindow', 'WindowFromPoint',
+
+            'CreateDialogIndirectParamA', 'CreateDialogIndirectParamW', 'CreateDialogParamA',
+            'CreateDialogParamW', 'DefDlgProcA', 'DefDlgProcW', 'DialogBoxIndirectParamA',
+            'DialogBoxIndirectParamW', 'DialogBoxParamA', 'DialogBoxParamW', 'EndDialog',
+            'GetDialogBaseUnits', 'GetDlgCtrlID', 'GetDlgItem', 'GetDlgItemInt',
+            'GetDlgItemTextA', 'GetDlgItemTextW', 'GetNextDlgGroupItem', 'GetNextDlgTabItem',
+            'IsDialogMessageA', 'IsDialogMessageW', 'MapDialogRect', 'MessageBoxA',
+            'MessageBoxExA', 'MessageBoxExW', 'MessageBoxIndirectA', 'MessageBoxIndirectW',
+            'MessageBoxW', 'SendDlgItemMessageA', 'SendDlgItemMessageW', 'SetDlgItemInt',
+            'SetDlgItemTextA', 'SetDlgItemTextW',
+
+            'GetWriteWatch', 'GlobalMemoryStatus', 'GlobalMemoryStatusEx', 'IsBadCodePtr',
+            'IsBadReadPtr', 'IsBadStringPtrA', 'IsBadStringPtrW', 'IsBadWritePtr',
+            'ResetWriteWatch', 'AllocateUserPhysicalPages', 'FreeUserPhysicalPages',
+            'MapUserPhysicalPages', 'MapUserPhysicalPagesScatter', 'GlobalAlloc', 'GlobalFlags',
+            'GlobalFree', 'GlobalHandle', 'GlobalLock', 'GlobalReAlloc', 'GlobalSize',
+            'GlobalUnlock', 'LocalAlloc', 'LocalFlags', 'LocalFree', 'LocalHandle', 'LocalLock',
+            'LocalReAlloc', 'LocalSize', 'LocalUnlock', 'GetProcessHeap', 'GetProcessHeaps',
+            'HeapAlloc', 'HeapCompact', 'HeapCreate', 'HeapDestroy', 'HeapFree', 'HeapLock',
+            'HeapReAlloc', 'HeapSize', 'HeapUnlock', 'HeapValidate', 'HeapWalk', 'VirtualAlloc',
+            'VirtualAllocEx', 'VirtualFree', 'VirtualFreeEx', 'VirtualLock', 'VirtualProtect',
+            'VirtualProtectEx', 'VirtualQuery', 'VirtualQueryEx', 'VirtualUnlock',
+            'GetFreeSpace', 'GlobalCompact', 'GlobalFix', 'GlobalUnfix', 'GlobalUnWire',
+            'GlobalWire', 'IsBadHugeReadPtr', 'IsBadHugeWritePtr', 'LocalCompact', 'LocalShrink',
+
+            'GetClassInfoA', 'GetClassInfoW', 'GetClassInfoExA', 'GetClassInfoExW',
+            'GetClassLongA', 'GetClassLongW', 'GetClassLongPtrA', 'GetClassLongPtrW',
+            'RegisterClassA', 'RegisterClassW', 'RegisterClassExA', 'RegisterClassExW',
+            'SetClassLongA', 'SetClassLongW', 'SetClassLongPtrA', 'SetClassLongPtrW',
+            'SetWindowLongA', 'SetWindowLongW', 'SetWindowLongPtrA', 'SetWindowLongPtrW',
+            'UnregisterClassA', 'UnregisterClassW', 'GetClassWord', 'GetWindowWord',
+            'SetClassWord', 'SetWindowWord'
+            ),
+        // Native API
+        6 => array(
+            'CsrAllocateCaptureBuffer', 'CsrAllocateCapturePointer', 'CsrAllocateMessagePointer',
+            'CsrCaptureMessageBuffer', 'CsrCaptureMessageString', 'CsrCaptureTimeout',
+            'CsrClientCallServer', 'CsrClientConnectToServer', 'CsrFreeCaptureBuffer',
+            'CsrIdentifyAlertableThread', 'CsrNewThread', 'CsrProbeForRead', 'CsrProbeForWrite',
+            'CsrSetPriorityClass',
+
+            'LdrAccessResource', 'LdrDisableThreadCalloutsForDll', 'LdrEnumResources',
+            'LdrFindEntryForAddress', 'LdrFindResource_U', 'LdrFindResourceDirectory_U',
+            'LdrGetDllHandle', 'LdrGetProcedureAddress', 'LdrInitializeThunk', 'LdrLoadDll',
+            'LdrProcessRelocationBlock', 'LdrQueryImageFileExecutionOptions',
+            'LdrQueryProcessModuleInformation', 'LdrShutdownProcess', 'LdrShutdownThread',
+            'LdrUnloadDll', 'LdrVerifyImageMatchesChecksum',
+
+            'NtAcceptConnectPort', 'ZwAcceptConnectPort', 'NtCompleteConnectPort',
+            'ZwCompleteConnectPort', 'NtConnectPort', 'ZwConnectPort', 'NtCreatePort',
+            'ZwCreatePort', 'NtImpersonateClientOfPort', 'ZwImpersonateClientOfPort',
+            'NtListenPort', 'ZwListenPort', 'NtQueryInformationPort', 'ZwQueryInformationPort',
+            'NtReadRequestData', 'ZwReadRequestData', 'NtReplyPort', 'ZwReplyPort',
+            'NtReplyWaitReceivePort', 'ZwReplyWaitReceivePort', 'NtReplyWaitReplyPort',
+            'ZwReplyWaitReplyPort', 'NtRequestPort', 'ZwRequestPort', 'NtRequestWaitReplyPort',
+            'ZwRequestWaitReplyPort', 'NtSecureConnectPort', 'ZwSecureConnectPort',
+            'NtWriteRequestData', 'ZwWriteRequestData',
+
+            'NtAccessCheck', 'ZwAccessCheck', 'NtAccessCheckAndAuditAlarm',
+            'ZwAccessCheckAndAuditAlarm', 'NtAccessCheckByType', 'ZwAccessCheckByType',
+            'NtAccessCheckByTypeAndAuditAlarm', 'ZwAccessCheckByTypeAndAuditAlarm',
+            'NtAccessCheckByTypeResultList', 'ZwAccessCheckByTypeResultList',
+            'NtAdjustGroupsToken', 'ZwAdjustGroupsToken', 'NtAdjustPrivilegesToken',
+            'ZwAdjustPrivilegesToken', 'NtCloseObjectAuditAlarm', 'ZwCloseObjectAuditAlarm',
+            'NtCreateToken', 'ZwCreateToken', 'NtDeleteObjectAuditAlarm',
+            'ZwDeleteObjectAuditAlarm', 'NtDuplicateToken', 'ZwDuplicateToken',
+            'NtFilterToken', 'ZwFilterToken', 'NtImpersonateThread', 'ZwImpersonateThread',
+            'NtOpenObjectAuditAlarm', 'ZwOpenObjectAuditAlarm', 'NtOpenProcessToken',
+            'ZwOpenProcessToken', 'NtOpenThreadToken', 'ZwOpenThreadToken', 'NtPrivilegeCheck',
+            'ZwPrivilegeCheck', 'NtPrivilegedServiceAuditAlarm', 'ZwPrivilegedServiceAuditAlarm',
+            'NtPrivilegeObjectAuditAlarm', 'ZwPrivilegeObjectAuditAlarm',
+            'NtQueryInformationToken', 'ZwQueryInformationToken', 'NtQuerySecurityObject',
+            'ZwQuerySecurityObject', 'NtSetInformationToken', 'ZwSetInformationToken',
+            'NtSetSecurityObject', 'ZwSetSecurityObject',
+
+            'NtAddAtom', 'ZwAddAtom', 'NtDeleteAtom', 'ZwDeleteAtom', 'NtFindAtom', 'ZwFindAtom',
+            'NtQueryInformationAtom', 'ZwQueryInformationAtom',
+
+            'NtAlertResumeThread', 'ZwAlertResumeThread', 'NtAlertThread', 'ZwAlertThread',
+            'NtCreateProcess', 'ZwCreateProcess', 'NtCreateThread', 'ZwCreateThread',
+            'NtCurrentTeb', 'NtDelayExecution', 'ZwDelayExecution', 'NtGetContextThread',
+            'ZwGetContextThread', 'NtOpenProcess', 'ZwOpenProcess', 'NtOpenThread',
+            'ZwOpenThread', 'NtQueryInformationProcess', 'ZwQueryInformationProcess',
+            'NtQueryInformationThread', 'ZwQueryInformationThread', 'NtQueueApcThread',
+            'ZwQueueApcThread', 'NtResumeThread', 'ZwResumeThread', 'NtSetContextThread',
+            'ZwSetContextThread', 'NtSetHighWaitLowThread', 'ZwSetHighWaitLowThread',
+            'NtSetInformationProcess', 'ZwSetInformationProcess', 'NtSetInformationThread',
+            'ZwSetInformationThread', 'NtSetLowWaitHighThread', 'ZwSetLowWaitHighThread',
+            'NtSuspendThread', 'ZwSuspendThread', 'NtTerminateProcess', 'ZwTerminateProcess',
+            'NtTerminateThread', 'ZwTerminateThread', 'NtTestAlert', 'ZwTestAlert',
+            'NtYieldExecution', 'ZwYieldExecution',
+
+            'NtAllocateVirtualMemory', 'ZwAllocateVirtualMemory', 'NtAllocateVirtualMemory64',
+            'ZwAllocateVirtualMemory64', 'NtAreMappedFilesTheSame', 'ZwAreMappedFilesTheSame',
+            'NtCreateSection', 'ZwCreateSection', 'NtExtendSection', 'ZwExtendSection',
+            'NtFlushVirtualMemory', 'ZwFlushVirtualMemory', 'NtFreeVirtualMemory',
+            'ZwFreeVirtualMemory', 'NtFreeVirtualMemory64', 'ZwFreeVirtualMemory64',
+            'NtLockVirtualMemory', 'ZwLockVirtualMemory', 'NtMapViewOfSection',
+            'ZwMapViewOfSection', 'NtMapViewOfVlmSection', 'ZwMapViewOfVlmSection',
+            'NtOpenSection', 'ZwOpenSection', 'NtProtectVirtualMemory', 'ZwProtectVirtualMemory',
+            'NtProtectVirtualMemory64', 'ZwProtectVirtualMemory64', 'NtQueryVirtualMemory',
+            'ZwQueryVirtualMemory', 'NtQueryVirtualMemory64', 'ZwQueryVirtualMemory64',
+            'NtReadVirtualMemory', 'ZwReadVirtualMemory', 'NtReadVirtualMemory64',
+            'ZwReadVirtualMemory64', 'NtUnlockVirtualMemory', 'ZwUnlockVirtualMemory',
+            'NtUnmapViewOfSection', 'ZwUnmapViewOfSection', 'NtUnmapViewOfVlmSection',
+            'ZwUnmapViewOfVlmSection', 'NtWriteVirtualMemory', 'ZwWriteVirtualMemory',
+            'NtWriteVirtualMemory64', 'ZwWriteVirtualMemory64',
+
+            'NtAssignProcessToJobObject', 'ZwAssignProcessToJobObject', 'NtCreateJobObject',
+            'ZwCreateJobObject', 'NtOpenJobObject', 'ZwOpenJobObject',
+            'NtQueryInformationJobObject', 'ZwQueryInformationJobObject',
+            'NtSetInformationJobObject', 'ZwSetInformationJobObject', 'NtTerminateJobObject',
+            'ZwTerminateJobObject',
+
+            'NtCancelIoFile', 'ZwCancelIoFile', 'NtCreateFile', 'ZwCreateFile',
+            'NtCreateIoCompletion', 'ZwCreateIoCompletion', 'NtDeleteFile', 'ZwDeleteFile',
+            'NtDeviceIoControlFile', 'ZwDeviceIoControlFile', 'NtFlushBuffersFile',
+            'ZwFlushBuffersFile', 'NtFsControlFile', 'ZwFsControlFile', 'NtLockFile', 'ZwLockFile',
+            'NtNotifyChangeDirectoryFile', 'ZwNotifyChangeDirectoryFile', 'NtOpenFile',
+            'ZwOpenFile', 'NtOpenIoCompletion', 'ZwOpenIoCompletion', 'NtQueryAttributesFile',
+            'ZwQueryAttributesFile', 'NtQueryDirectoryFile', 'ZwQueryDirectoryFile',
+            'NtQueryEaFile', 'ZwQueryEaFile', 'NtQueryIoCompletion', 'ZwQueryIoCompletion',
+            'NtQueryQuotaInformationFile', 'ZwQueryQuotaInformationFile',
+            'NtQueryVolumeInformationFile', 'ZwQueryVolumeInformationFile', 'NtReadFile',
+            'ZwReadFile', 'NtReadFile64', 'ZwReadFile64', 'NtReadFileScatter', 'ZwReadFileScatter',
+            'NtRemoveIoCompletion', 'ZwRemoveIoCompletion', 'NtSetEaFile', 'ZwSetEaFile',
+            'NtSetInformationFile', 'ZwSetInformationFile', 'NtSetIoCompletion',
+            'ZwSetIoCompletion', 'NtSetQuotaInformationFile', 'ZwSetQuotaInformationFile',
+            'NtSetVolumeInformationFile', 'ZwSetVolumeInformationFile', 'NtUnlockFile',
+            'ZwUnlockFile', 'NtWriteFile', 'ZwWriteFile', 'NtWriteFile64','ZwWriteFile64',
+            'NtWriteFileGather', 'ZwWriteFileGather', 'NtQueryFullAttributesFile',
+            'ZwQueryFullAttributesFile', 'NtQueryInformationFile', 'ZwQueryInformationFile',
+
+            'RtlAbortRXact', 'RtlAbsoluteToSelfRelativeSD', 'RtlAcquirePebLock',
+            'RtlAcquireResourceExclusive', 'RtlAcquireResourceShared', 'RtlAddAccessAllowedAce',
+            'RtlAddAccessDeniedAce', 'RtlAddAce', 'RtlAddActionToRXact', 'RtlAddAtomToAtomTable',
+            'RtlAddAttributeActionToRXact', 'RtlAddAuditAccessAce', 'RtlAddCompoundAce',
+            'RtlAdjustPrivilege', 'RtlAllocateAndInitializeSid', 'RtlAllocateHandle',
+            'RtlAllocateHeap', 'RtlAnsiCharToUnicodeChar', 'RtlAnsiStringToUnicodeSize',
+            'RtlAnsiStringToUnicodeString', 'RtlAppendAsciizToString', 'RtlAppendStringToString',
+            'RtlAppendUnicodeStringToString', 'RtlAppendUnicodeToString', 'RtlApplyRXact',
+            'RtlApplyRXactNoFlush', 'RtlAreAllAccessesGranted', 'RtlAreAnyAccessesGranted',
+            'RtlAreBitsClear', 'RtlAreBitsSet', 'RtlAssert', 'RtlCaptureStackBackTrace',
+            'RtlCharToInteger', 'RtlCheckRegistryKey', 'RtlClearAllBits', 'RtlClearBits',
+            'RtlClosePropertySet', 'RtlCompactHeap', 'RtlCompareMemory', 'RtlCompareMemoryUlong',
+            'RtlCompareString', 'RtlCompareUnicodeString', 'RtlCompareVariants',
+            'RtlCompressBuffer', 'RtlConsoleMultiByteToUnicodeN', 'RtlConvertExclusiveToShared',
+            'RtlConvertLongToLargeInteger', 'RtlConvertPropertyToVariant',
+            'RtlConvertSharedToExclusive', 'RtlConvertSidToUnicodeString',
+            'RtlConvertUiListToApiList', 'RtlConvertUlongToLargeInteger',
+            'RtlConvertVariantToProperty', 'RtlCopyLuid', 'RtlCopyLuidAndAttributesArray',
+            'RtlCopySecurityDescriptor', 'RtlCopySid', 'RtlCopySidAndAttributesArray',
+            'RtlCopyString', 'RtlCopyUnicodeString', 'RtlCreateAcl', 'RtlCreateAndSetSD',
+            'RtlCreateAtomTable', 'RtlCreateEnvironment', 'RtlCreateHeap',
+            'RtlCreateProcessParameters', 'RtlCreatePropertySet', 'RtlCreateQueryDebugBuffer',
+            'RtlCreateRegistryKey', 'RtlCreateSecurityDescriptor', 'RtlCreateTagHeap',
+            'RtlCreateUnicodeString', 'RtlCreateUnicodeStringFromAsciiz', 'RtlCreateUserProcess',
+            'RtlCreateUserSecurityObject', 'RtlCreateUserThread', 'RtlCustomCPToUnicodeN',
+            'RtlCutoverTimeToSystemTime', 'RtlDecompressBuffer', 'RtlDecompressFragment',
+            'RtlDelete', 'RtlDeleteAce', 'RtlDeleteAtomFromAtomTable', 'RtlDeleteCriticalSection',
+            'RtlDeleteElementGenericTable', 'RtlDeleteNoSplay', 'RtlDeleteRegistryValue',
+            'RtlDeleteResource', 'RtlDeleteSecurityObject', 'RtlDeNormalizeProcessParams',
+            'RtlDestroyAtomTable', 'RtlDestroyEnvironment', 'RtlDestroyHandleTable',
+            'RtlDestroyHeap', 'RtlDestroyProcessParameters', 'RtlDestroyQueryDebugBuffer',
+            'RtlDetermineDosPathNameType_U', 'RtlDoesFileExists_U', 'RtlDosPathNameToNtPathName_U',
+            'RtlDosSearchPath_U', 'RtlDowncaseUnicodeString', 'RtlDumpResource',
+            'RtlEmptyAtomTable', 'RtlEnlargedIntegerMultiply', 'RtlEnlargedUnsignedDivide',
+            'RtlEnlargedUnsignedMultiply', 'RtlEnterCriticalSection', 'RtlEnumerateGenericTable',
+            'RtlEnumerateGenericTableWithoutSplaying', 'RtlEnumerateProperties',
+            'RtlEnumProcessHeaps', 'RtlEqualComputerName', 'RtlEqualDomainName', 'RtlEqualLuid',
+            'RtlEqualPrefixSid', 'RtlEqualSid', 'RtlEqualString', 'RtlEqualUnicodeString',
+            'RtlEraseUnicodeString', 'RtlExpandEnvironmentStrings_U', 'RtlExtendedIntegerMultiply',
+            'RtlExtendedLargeIntegerDivide', 'RtlExtendedMagicDivide', 'RtlExtendHeap',
+            'RtlFillMemory', 'RtlFillMemoryUlong', 'RtlFindClearBits', 'RtlFindClearBitsAndSet',
+            'RtlFindLongestRunClear', 'RtlFindLongestRunSet', 'RtlFindMessage', 'RtlFindSetBits',
+            'RtlFindSetBitsAndClear', 'RtlFirstFreeAce', 'RtlFlushPropertySet',
+            'RtlFormatCurrentUserKeyPath', 'RtlFormatMessage', 'RtlFreeAnsiString',
+            'RtlFreeHandle', 'RtlFreeHeap', 'RtlFreeOemString', 'RtlFreeSid',
+            'RtlFreeUnicodeString', 'RtlFreeUserThreadStack', 'RtlGenerate8dot3Name', 'RtlGetAce',
+            'RtlGetCallersAddress', 'RtlGetCompressionWorkSpaceSize',
+            'RtlGetControlSecurityDescriptor', 'RtlGetCurrentDirectory_U',
+            'RtlGetDaclSecurityDescriptor', 'RtlGetElementGenericTable', 'RtlGetFullPathName_U',
+            'RtlGetGroupSecurityDescriptor', 'RtlGetLongestNtPathLength', 'RtlGetNtGlobalFlags',
+            'RtlGetNtProductType', 'RtlGetOwnerSecurityDescriptor', 'RtlGetProcessHeaps',
+            'RtlGetSaclSecurityDescriptor', 'RtlGetUserInfoHeap', 'RtlGuidToPropertySetName',
+            'RtlIdentifierAuthoritySid', 'RtlImageDirectoryEntryToData', 'RtlImageNtHeader',
+            'RtlImageRvaToSection', 'RtlImageRvaToVa', 'RtlImpersonateSelf', 'RtlInitAnsiString',
+            'RtlInitCodePageTable', 'RtlInitializeAtomPackage', 'RtlInitializeBitMap',
+            'RtlInitializeContext', 'RtlInitializeCriticalSection',
+            'RtlInitializeCriticalSectionAndSpinCount', 'RtlInitializeGenericTable',
+            'RtlInitializeHandleTable', 'RtlInitializeResource', 'RtlInitializeRXact',
+            'RtlInitializeSid', 'RtlInitNlsTables', 'RtlInitString', 'RtlInitUnicodeString',
+            'RtlInsertElementGenericTable', 'RtlIntegerToChar', 'RtlIntegerToUnicodeString',
+            'RtlIsDosDeviceName_U', 'RtlIsGenericTableEmpty', 'RtlIsNameLegalDOS8Dot3',
+            'RtlIsTextUnicode', 'RtlIsValidHandle', 'RtlIsValidIndexHandle', 'RtlLargeIntegerAdd',
+            'RtlLargeIntegerArithmeticShift', 'RtlLargeIntegerDivide', 'RtlLargeIntegerNegate',
+            'RtlLargeIntegerShiftLeft', 'RtlLargeIntegerShiftRight', 'RtlLargeIntegerSubtract',
+            'RtlLargeIntegerToChar', 'RtlLeaveCriticalSection', 'RtlLengthRequiredSid',
+            'RtlLengthSecurityDescriptor', 'RtlLengthSid', 'RtlLocalTimeToSystemTime',
+            'RtlLockHeap', 'RtlLookupAtomInAtomTable', 'RtlLookupElementGenericTable',
+            'RtlMakeSelfRelativeSD', 'RtlMapGenericMask', 'RtlMoveMemory',
+            'RtlMultiByteToUnicodeN', 'RtlMultiByteToUnicodeSize', 'RtlNewInstanceSecurityObject',
+            'RtlNewSecurityGrantedAccess', 'RtlNewSecurityObject', 'RtlNormalizeProcessParams',
+            'RtlNtStatusToDosError', 'RtlNumberGenericTableElements', 'RtlNumberOfClearBits',
+            'RtlNumberOfSetBits', 'RtlOemStringToUnicodeSize', 'RtlOemStringToUnicodeString',
+            'RtlOemToUnicodeN', 'RtlOnMappedStreamEvent', 'RtlOpenCurrentUser',
+            'RtlPcToFileHeader', 'RtlPinAtomInAtomTable', 'RtlpNtCreateKey',
+            'RtlpNtEnumerateSubKey', 'RtlpNtMakeTemporaryKey', 'RtlpNtOpenKey',
+            'RtlpNtQueryValueKey', 'RtlpNtSetValueKey', 'RtlPrefixString',
+            'RtlPrefixUnicodeString', 'RtlPropertySetNameToGuid', 'RtlProtectHeap',
+            'RtlpUnWaitCriticalSection', 'RtlpWaitForCriticalSection', 'RtlQueryAtomInAtomTable',
+            'RtlQueryEnvironmentVariable_U', 'RtlQueryInformationAcl',
+            'RtlQueryProcessBackTraceInformation', 'RtlQueryProcessDebugInformation',
+            'RtlQueryProcessHeapInformation', 'RtlQueryProcessLockInformation',
+            'RtlQueryProperties', 'RtlQueryPropertyNames', 'RtlQueryPropertySet',
+            'RtlQueryRegistryValues', 'RtlQuerySecurityObject', 'RtlQueryTagHeap',
+            'RtlQueryTimeZoneInformation', 'RtlRaiseException', 'RtlRaiseStatus', 'RtlRandom',
+            'RtlReAllocateHeap', 'RtlRealPredecessor', 'RtlRealSuccessor', 'RtlReleasePebLock',
+            'RtlReleaseResource', 'RtlRemoteCall', 'RtlResetRtlTranslations',
+            'RtlRunDecodeUnicodeString', 'RtlRunEncodeUnicodeString', 'RtlSecondsSince1970ToTime',
+            'RtlSecondsSince1980ToTime', 'RtlSelfRelativeToAbsoluteSD', 'RtlSetAllBits',
+            'RtlSetAttributesSecurityDescriptor', 'RtlSetBits', 'RtlSetCriticalSectionSpinCount',
+            'RtlSetCurrentDirectory_U', 'RtlSetCurrentEnvironment', 'RtlSetDaclSecurityDescriptor',
+            'RtlSetEnvironmentVariable', 'RtlSetGroupSecurityDescriptor', 'RtlSetInformationAcl',
+            'RtlSetOwnerSecurityDescriptor', 'RtlSetProperties', 'RtlSetPropertyNames',
+            'RtlSetPropertySetClassId', 'RtlSetSaclSecurityDescriptor', 'RtlSetSecurityObject',
+            'RtlSetTimeZoneInformation', 'RtlSetUnicodeCallouts', 'RtlSetUserFlagsHeap',
+            'RtlSetUserValueHeap', 'RtlSizeHeap', 'RtlSplay', 'RtlStartRXact',
+            'RtlSubAuthorityCountSid', 'RtlSubAuthoritySid', 'RtlSubtreePredecessor',
+            'RtlSubtreeSuccessor', 'RtlSystemTimeToLocalTime', 'RtlTimeFieldsToTime',
+            'RtlTimeToElapsedTimeFields', 'RtlTimeToSecondsSince1970', 'RtlTimeToSecondsSince1980',
+            'RtlTimeToTimeFields', 'RtlTryEnterCriticalSection', 'RtlUnicodeStringToAnsiSize',
+            'RtlUnicodeStringToAnsiString', 'RtlUnicodeStringToCountedOemString',
+            'RtlUnicodeStringToInteger', 'RtlUnicodeStringToOemSize',
+            'RtlUnicodeStringToOemString', 'RtlUnicodeToCustomCPN', 'RtlUnicodeToMultiByteN',
+            'RtlUnicodeToMultiByteSize', 'RtlUnicodeToOemN', 'RtlUniform', 'RtlUnlockHeap',
+            'RtlUnwind', 'RtlUpcaseUnicodeChar', 'RtlUpcaseUnicodeString',
+            'RtlUpcaseUnicodeStringToAnsiString', 'RtlUpcaseUnicodeStringToCountedOemString',
+            'RtlUpcaseUnicodeStringToOemString', 'RtlUpcaseUnicodeToCustomCPN',
+            'RtlUpcaseUnicodeToMultiByteN', 'RtlUpcaseUnicodeToOemN', 'RtlUpperChar',
+            'RtlUpperString', 'RtlUsageHeap', 'RtlValidAcl', 'RtlValidateHeap',
+            'RtlValidateProcessHeaps', 'RtlValidSecurityDescriptor', 'RtlValidSid', 'RtlWalkHeap',
+            'RtlWriteRegistryValue', 'RtlxAnsiStringToUnicodeSize', 'RtlxOemStringToUnicodeSize',
+            'RtlxUnicodeStringToAnsiSize', 'RtlxUnicodeStringToOemSize', 'RtlZeroHeap',
+            'RtlZeroMemory',
+
+            'NtCancelTimer', 'ZwCancelTimer', 'NtCreateTimer', 'ZwCreateTimer', 'NtGetTickCount',
+            'ZwGetTickCount', 'NtOpenTimer', 'ZwOpenTimer', 'NtQueryPerformanceCounter',
+            'ZwQueryPerformanceCounter', 'NtQuerySystemTime', 'ZwQuerySystemTime', 'NtQueryTimer',
+            'ZwQueryTimer', 'NtQueryTimerResolution', 'ZwQueryTimerResolution', 'NtSetSystemTime',
+            'ZwSetSystemTime', 'NtSetTimer', 'ZwSetTimer', 'NtSetTimerResolution',
+            'ZwSetTimerResolution',
+
+            'NtClearEvent', 'ZwClearEvent', 'NtCreateEvent', 'ZwCreateEvent', 'NtCreateEventPair',
+            'ZwCreateEventPair', 'NtCreateMutant', 'ZwCreateMutant', 'NtCreateSemaphore',
+            'ZwCreateSemaphore', 'NtOpenEvent', 'ZwOpenEvent', 'NtOpenEventPair',
+            'ZwOpenEventPair', 'NtOpenMutant', 'ZwOpenMutant', 'NtOpenSemaphore',
+            'ZwOpenSemaphore', 'NtPulseEvent', 'ZwPulseEvent', 'NtQueryEvent', 'ZwQueryEvent',
+            'NtQueryMutant', 'ZwQueryMutant', 'NtQuerySemaphore', 'ZwQuerySemaphore',
+            'NtReleaseMutant', 'ZwReleaseMutant', 'NtReleaseProcessMutant',
+            'ZwReleaseProcessMutant', 'NtReleaseSemaphore', 'ZwReleaseSemaphore',
+            'NtReleaseThreadMutant', 'ZwReleaseThreadMutant', 'NtResetEvent', 'ZwResetEvent',
+            'NtSetEvent', 'ZwSetEvent', 'NtSetHighEventPair', 'ZwSetHighEventPair',
+            'NtSetHighWaitLowEventPair', 'ZwSetHighWaitLowEventPair', 'NtSetLowEventPair',
+            'ZwSetLowEventPair', 'NtSetLowWaitHighEventPair', 'ZwSetLowWaitHighEventPair',
+            'NtSignalAndWaitForSingleObject', 'ZwSignalAndWaitForSingleObject',
+            'NtWaitForMultipleObjects', 'ZwWaitForMultipleObjects', 'NtWaitForSingleObject',
+            'ZwWaitForSingleObject', 'NtWaitHighEventPair', 'ZwWaitHighEventPair',
+            'NtWaitLowEventPair', 'ZwWaitLowEventPair',
+
+            'NtClose', 'ZwClose', 'NtCreateDirectoryObject', 'ZwCreateDirectoryObject',
+            'NtCreateSymbolicLinkObject', 'ZwCreateSymbolicLinkObject',
+            'NtDuplicateObject', 'ZwDuplicateObject', 'NtMakeTemporaryObject',
+            'ZwMakeTemporaryObject', 'NtOpenDirectoryObject', 'ZwOpenDirectoryObject',
+            'NtOpenSymbolicLinkObject', 'ZwOpenSymbolicLinkObject', 'NtQueryDirectoryObject',
+            'ZwQueryDirectoryObject', 'NtQueryObject', 'ZwQueryObject',
+            'NtQuerySymbolicLinkObject', 'ZwQuerySymbolicLinkObject', 'NtSetInformationObject',
+            'ZwSetInformationObject',
+
+            'NtContinue', 'ZwContinue', 'NtRaiseException', 'ZwRaiseException',
+            'NtRaiseHardError', 'ZwRaiseHardError', 'NtSetDefaultHardErrorPort',
+            'ZwSetDefaultHardErrorPort',
+
+            'NtCreateChannel', 'ZwCreateChannel', 'NtListenChannel', 'ZwListenChannel',
+            'NtOpenChannel', 'ZwOpenChannel', 'NtReplyWaitSendChannel', 'ZwReplyWaitSendChannel',
+            'NtSendWaitReplyChannel', 'ZwSendWaitReplyChannel', 'NtSetContextChannel',
+            'ZwSetContextChannel',
+
+            'NtCreateKey', 'ZwCreateKey', 'NtDeleteKey', 'ZwDeleteKey', 'NtDeleteValueKey',
+            'ZwDeleteValueKey', 'NtEnumerateKey', 'ZwEnumerateKey', 'NtEnumerateValueKey',
+            'ZwEnumerateValueKey', 'NtFlushKey', 'ZwFlushKey', 'NtInitializeRegistry',
+            'ZwInitializeRegistry', 'NtLoadKey', 'ZwLoadKey', 'NtLoadKey2', 'ZwLoadKey2',
+            'NtNotifyChangeKey', 'ZwNotifyChangeKey', 'NtOpenKey', 'ZwOpenKey', 'NtQueryKey',
+            'ZwQueryKey', 'NtQueryMultipleValueKey', 'ZwQueryMultipleValueKey',
+            'NtQueryMultiplValueKey', 'ZwQueryMultiplValueKey', 'NtQueryValueKey',
+            'ZwQueryValueKey', 'NtReplaceKey', 'ZwReplaceKey', 'NtRestoreKey', 'ZwRestoreKey',
+            'NtSaveKey', 'ZwSaveKey', 'NtSetInformationKey', 'ZwSetInformationKey',
+            'NtSetValueKey', 'ZwSetValueKey', 'NtUnloadKey', 'ZwUnloadKey',
+
+            'NtCreateMailslotFile', 'ZwCreateMailslotFile', 'NtCreateNamedPipeFile',
+            'ZwCreateNamedPipeFile', 'NtCreatePagingFile', 'ZwCreatePagingFile',
+
+            'NtCreateProfile', 'ZwCreateProfile', 'NtQueryIntervalProfile',
+            'ZwQueryIntervalProfile', 'NtRegisterThreadTerminatePort',
+            'ZwRegisterThreadTerminatePort', 'NtSetIntervalProfile', 'ZwSetIntervalProfile',
+            'NtStartProfile', 'ZwStartProfile', 'NtStopProfile', 'ZwStopProfile',
+            'NtSystemDebugControl', 'ZwSystemDebugControl',
+
+            'NtEnumerateBus', 'ZwEnumerateBus', 'NtFlushInstructionCache',
+            'ZwFlushInstructionCache', 'NtFlushWriteBuffer', 'ZwFlushWriteBuffer',
+            'NtSetLdtEntries', 'ZwSetLdtEntries',
+
+            'NtGetPlugPlayEvent', 'ZwGetPlugPlayEvent', 'NtPlugPlayControl', 'ZwPlugPlayControl',
+
+            'NtInitiatePowerAction', 'ZwInitiatePowerAction', 'NtPowerInformation',
+            'ZwPowerInformation', 'NtRequestWakeupLatency', 'ZwRequestWakeupLatency',
+            'NtSetSystemPowerState', 'ZwSetSystemPowerState', 'NtSetThreadExecutionState',
+            'ZwSetThreadExecutionState',
+
+            'NtLoadDriver', 'ZwLoadDriver', 'NtRegisterNewDevice', 'ZwRegisterNewDevice',
+            'NtUnloadDriver', 'ZwUnloadDriver',
+
+            'NtQueryDefaultLocale', 'ZwQueryDefaultLocale', 'NtQueryDefaultUILanguage',
+            'ZwQueryDefaultUILanguage', 'NtQuerySystemEnvironmentValue',
+            'ZwQuerySystemEnvironmentValue', 'NtSetDefaultLocale', 'ZwSetDefaultLocale',
+            'NtSetDefaultUILanguage', 'ZwSetDefaultUILanguage', 'NtSetSystemEnvironmentValue',
+            'ZwSetSystemEnvironmentValue',
+
+            'DbgBreakPoint', 'DbgPrint', 'DbgPrompt', 'DbgSsHandleKmApiMsg', 'DbgSsInitialize',
+            'DbgUiConnectToDbg', 'DbgUiContinue', 'DbgUiWaitStateChange', 'DbgUserBreakPoint',
+            'KiRaiseUserExceptionDispatcher', 'KiUserApcDispatcher', 'KiUserCallbackDispatcher',
+            'KiUserExceptionDispatcher', 'NlsAnsiCodePage', 'NlsMbCodePageTag',
+            'NlsMbOemCodePageTag', 'NtAllocateLocallyUniqueId', 'ZwAllocateLocallyUniqueId',
+            'NtAllocateUuids', 'ZwAllocateUuids', 'NtCallbackReturn', 'ZwCallbackReturn',
+            'NtDisplayString', 'ZwDisplayString', 'NtQueryOleDirectoryFile',
+            'ZwQueryOleDirectoryFile', 'NtQuerySection', 'ZwQuerySection',
+            'NtQuerySystemInformation', 'ZwQuerySystemInformation', 'NtSetSystemInformation',
+            'ZwSetSystemInformation', 'NtShutdownSystem', 'ZwShutdownSystem', 'NtVdmControl',
+            'ZwVdmControl', 'NtW32Call', 'ZwW32Call', 'PfxFindPrefix', 'PfxInitialize',
+            'PfxInsertPrefix', 'PfxRemovePrefix', 'PropertyLengthAsVariant', 'RestoreEm87Context',
+            'SaveEm87Context'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>',
+        '!', '^', '&', '|',
+        '?', ':',
+        ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;',
+            5 => 'color: #4000dd;',
+            6 => 'color: #4000dd;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => '',
+        5 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com',
+        6 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/caddcl.php b/vendor/easybook/geshi/geshi/caddcl.php
new file mode 100755
index 000000000..0135a7aec
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/caddcl.php
@@ -0,0 +1,124 @@
+<?php
+/*************************************************************************************
+ * caddcl.php
+ * ----------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/30
+ *
+ * CAD DCL (Dialog Control Language) language file for GeSHi.
+ *
+ * DCL for AutoCAD 12 or later and IntelliCAD all versions.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/1!/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CAD DCL',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'boxed_column','boxed_radio_column','boxed_radio_row','boxed_row',
+            'column','concatenation','button','dialog','edit_box','image','image_button',
+            'errtile','list_box','ok_cancel','ok_cancel_help','ok_cancel_help_errtile',
+            'ok_cancel_help_info','ok_only','paragraph','popup_list','radio_button',
+            'radio_column','radio_row','row','slider','spacer','spacer_0','spacer_1','text',
+            'text_part','toggle',
+            'action','alignment','allow_accept','aspect_ratio','big_increment',
+            'children_alignment','children_fixed_height',
+            'children_fixed_width','color',
+            'edit_limit','edit_width','fixed_height','fixed_width',
+            'height','initial_focus','is_cancel','is_default',
+            'is_enabled','is_tab_stop','is-bold','key','label','layout','list',
+            'max_value','min_value','mnemonic','multiple_select','password_char',
+            'small_increment','tabs','tab_truncate','value','width',
+            'false','true','left','right','centered','top','bottom',
+            'dialog_line','dialog_foreground','dialog_background',
+            'graphics_background','black','red','yellow','green','cyan',
+            'blue','magenta','whitegraphics_foreground',
+            'horizontal','vertical'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/cadlisp.php b/vendor/easybook/geshi/geshi/cadlisp.php
new file mode 100755
index 000000000..41d72ca27
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cadlisp.php
@@ -0,0 +1,184 @@
+<?php
+/*************************************************************************************
+ * cadlisp.php
+ * -----------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/30
+ *
+ * AutoCAD/IntelliCAD Lisp language file for GeSHi.
+ *
+ * For AutoCAD V.12..2005 and IntelliCAD all versions.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CAD Lisp',
+    'COMMENT_SINGLE' => array(1 => ";"),
+    'COMMENT_MULTI' => array(";|" => "|;"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abs','acad_colordlg','acad_helpdlg','acad_strlsort','action_tile',
+            'add_list','alert','alloc','and','angle','angtof','angtos','append','apply',
+            'arx','arxload','arxunload','ascii','assoc','atan','atof','atoi','atom',
+            'atoms-family','autoarxload','autoload','Boole','boundp','caddr',
+            'cadr','car','cdr','chr','client_data_tile','close','command','cond',
+            'cons','cos','cvunit','defun','defun-q','defun-q-list-ref',
+            'defun-q-list-set','dictadd','dictnext','dictremove','dictrename',
+            'dictsearch','dimx_tile','dimy_tile','distance','distof','done_dialog',
+            'end_image','end_list','entdel','entget','entlast','entmake',
+            'entmakex','entmod','entnext','entsel','entupd','eq','equal','eval','exit',
+            'exp','expand','expt','fill_image','findfile','fix','float','foreach','function',
+            'gc','gcd','get_attr','get_tile','getangle','getcfg','getcname','getcorner',
+            'getdist','getenv','getfiled','getint','getkword','getorient','getpoint',
+            'getreal','getstring','getvar','graphscr','grclear','grdraw','grread','grtext',
+            'grvecs','handent','help','if','initdia','initget','inters','itoa','lambda','last',
+            'layoutlist','length','list','listp','load','load_dialog','log','logand','logior',
+            'lsh','mapcar','max','mem','member','menucmd','menugroup','min','minusp','mode_tile',
+            'namedobjdict','nentsel','nentselp','new_dialog','nil','not','nth','null',
+            'numberp','open','or','osnap','polar','prin1','princ','print','progn','prompt',
+            'quit','quote','read','read-char','read-line','redraw','regapp','rem','repeat',
+            'reverse','rtos','set','set_tile','setcfg','setenv','setfunhelp','setq','setvar',
+            'setview','sin','slide_image','snvalid','sqrt','ssadd','ssdel','ssget','ssgetfirst',
+            'sslength','ssmemb','ssname','ssnamex','sssetfirst','start_dialog','start_image',
+            'start_list','startapp','strcase','strcat','strlen','subst','substr','t','tablet',
+            'tblnext','tblobjname','tblsearch','term_dialog','terpri','textbox','textpage',
+            'textscr','trace','trans','type','unload_dialog','untrace','vector_image','ver',
+            'vports','wcmatch','while','write-char','write-line','xdroom','xdsize','zerop',
+            'vl-acad-defun','vl-acad-undefun','vl-arx-import','vlax-3D-point',
+            'vlax-add-cmd','vlax-create-object','vlax-curve-getArea',
+            'vlax-curve-getClosestPointTo','vlax-curve-getClosestPointToProjection',
+            'vlax-curve-getDistAtParam','vlax-curve-getDistAtPoint',
+            'vlax-curve-getEndParam','vlax-curve-getEndPoint',
+            'vlax-curve-getFirstDeriv','vlax-curve-getParamAtDist',
+            'vlax-curve-getParamAtPoint','vlax-curve-getPointAtDist',
+            'vlax-curve-getPointAtParam','vlax-curve-getSecondDeriv',
+            'vlax-curve-getStartParam','vlax-curve-getStartPoint',
+            'vlax-curve-isClosed','vlax-curve-isPeriodic','vlax-curve-isPlanar',
+            'vlax-dump-object','vlax-erased-p','vlax-for','vlax-get-acad-object',
+            'vlax-get-object','vlax-get-or-create-object','vlax-get-property',
+            'vlax-import-type-library','vlax-invoke-method','vlax-ldata-delete',
+            'vlax-ldata-get','vlax-ldata-list','vlax-ldata-put','vlax-ldata-test',
+            'vlax-make-safearray','vlax-make-variant','vlax-map-collection',
+            'vlax-method-applicable-p','vlax-object-released-p','vlax-product-key',
+            'vlax-property-available-p','vlax-put-property','vlax-read-enabled-p',
+            'vlax-release-object','vlax-remove-cmd','vlax-safearray-fill',
+            'vlax-safearray-get-dim','vlax-safearray-get-element',
+            'vlax-safearray-get-l-bound','vlax-safearray-get-u-bound',
+            'vlax-safearray-put-element','vlax-safearray-type','vlax-tmatrix',
+            'vlax-typeinfo-available-p','vlax-variant-change-type',
+            'vlax-variant-type','vlax-variant-value','vlax-write-enabled-p',
+            'vl-bb-ref','vl-bb-set','vl-catch-all-apply','vl-catch-all-error-message',
+            'vl-catch-all-error-p','vl-cmdf','vl-consp','vl-directory-files','vl-doc-export',
+            'vl-doc-import','vl-doc-ref','vl-doc-set','vl-every','vl-exit-with-error',
+            'vl-exit-with-value','vl-file-copy','vl-file-delete','vl-file-directory-p',
+            'vl-filename-base','vl-filename-directory','vl-filename-extension',
+            'vl-filename-mktemp','vl-file-rename','vl-file-size','vl-file-systime',
+            'vl-get-resource','vlisp-compile','vl-list-exported-functions',
+            'vl-list-length','vl-list-loaded-vlx','vl-load-all','vl-load-com',
+            'vl-load-reactors','vl-member-if','vl-member-if-not','vl-position',
+            'vl-prin1-to-string','vl-princ-to-string','vl-propagate','vlr-acdb-reactor',
+            'vlr-add','vlr-added-p','vlr-beep-reaction','vlr-command-reactor',
+            'vlr-current-reaction-name','vlr-data','vlr-data-set',
+            'vlr-deepclone-reactor','vlr-docmanager-reactor','vlr-dwg-reactor',
+            'vlr-dxf-reactor','vlr-editor-reactor','vl-registry-delete',
+            'vl-registry-descendents','vl-registry-read','vl-registry-write',
+            'vl-remove','vl-remove-if','vl-remove-if-not','vlr-insert-reactor',
+            'vlr-linker-reactor','vlr-lisp-reactor','vlr-miscellaneous-reactor',
+            'vlr-mouse-reactor','vlr-notification','vlr-object-reactor',
+            'vlr-owner-add','vlr-owner-remove','vlr-owners','vlr-pers','vlr-pers-list',
+            'vlr-pers-p','vlr-pers-release','vlr-reaction-names','vlr-reactions',
+            'vlr-reaction-set','vlr-reactors','vlr-remove','vlr-remove-all',
+            'vlr-set-notification','vlr-sysvar-reactor','vlr-toolbar-reactor',
+            'vlr-trace-reaction','vlr-type','vlr-types','vlr-undo-reactor',
+            'vlr-wblock-reactor','vlr-window-reactor','vlr-xref-reactor',
+            'vl-some','vl-sort','vl-sort-i','vl-string-elt','vl-string-left-trim',
+            'vl-string-mismatch','vl-string-position','vl-string-right-trim',
+            'vl-string-search','vl-string-subst','vl-string-translate','vl-string-trim',
+            'vl-symbol-name','vl-symbolp','vl-symbol-value','vl-unload-vlx','vl-vbaload',
+            'vl-vbarun','vl-vlx-loaded-p'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/cfdg.php b/vendor/easybook/geshi/geshi/cfdg.php
new file mode 100755
index 000000000..eeb7c2f3d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cfdg.php
@@ -0,0 +1,122 @@
+<?php
+/*************************************************************************************
+ * cfdg.php
+ * --------
+ * Author: John Horigan <john@glyphic.com>
+ * Copyright: (c) 2006 John Horigan http://www.ozonehouse.com/john/
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/03/11
+ *
+ * CFDG language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/03/11 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/03/11)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CFDG',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'include', 'startshape', 'rule', 'background'
+            ),
+        2 => array(
+            'SQUARE', 'CIRCLE', 'TRIANGLE',
+            ),
+        3 => array(
+            'b','brightness','h','hue','sat','saturation',
+            'a','alpha','x','y','z','s','size',
+            'r','rotate','f','flip','skew','xml_set_object'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '{', '}', '*', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #717100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006666;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/cfm.php b/vendor/easybook/geshi/geshi/cfm.php
new file mode 100755
index 000000000..2d165bd68
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cfm.php
@@ -0,0 +1,299 @@
+<?php
+/*************************************************************************************
+ * cfm.php
+ * -------
+ * Author: Diego
+ * Copyright: (c) 2006 Diego
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/02/25
+ *
+ * ColdFusion language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/02/25 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2006/02/25)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ColdFusion',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /* CFM Tags */
+        1 => array(
+            'cfabort', 'cfapplet', 'cfapplication', 'cfargument', 'cfassociate',
+            'cfbreak', 'cfcache', 'cfcase', 'cfcatch', 'cfchart', 'cfchartdata',
+            'cfchartseries', 'cfcol', 'cfcollection', 'cfcomponent',
+            'cfcontent', 'cfcookie', 'cfdefaultcase', 'cfdirectory',
+            'cfdocument', 'cfdocumentitem', 'cfdocumentsection', 'cfdump',
+            'cfelse', 'cfelseif', 'cferror', 'cfexecute', 'cfexit', 'cffile',
+            'cfflush', 'cfform', 'cfformgroup', 'cfformitem', 'cfftp',
+            'cffunction', 'cfgrid', 'cfgridcolumn', 'cfgridrow', 'cfgridupdate',
+            'cfheader', 'cfhtmlhead', 'cfhttp', 'cfhttpparam', 'cfif',
+            'cfimport', 'cfinclude', 'cfindex', 'cfinput', 'cfinsert',
+            'cfinvoke', 'cfinvokeargument', 'cfldap', 'cflocation', 'cflock',
+            'cflog', 'cflogin', 'cfloginuser', 'cflogout', 'cfloop', 'cfmail',
+            'cfmailparam', 'cfmailpart', 'cfmodule', 'cfNTauthenticate',
+            'cfobject', 'cfobjectcache', 'cfoutput', 'cfparam', 'cfpop',
+            'cfprocessingdirective', 'cfprocparam',
+            'cfprocresult', 'cfproperty', 'cfquery', 'cfqueryparam',
+            'cfregistry', 'cfreport', 'cfreportparam', 'cfrethrow', 'cfreturn',
+            'cfsavecontent', 'cfschedule', 'cfscript', 'cfsearch', 'cfselect',
+            'cfset', 'cfsetting', 'cfsilent', 'cfstoredproc',
+            'cfswitch', 'cftable', 'cftextarea', 'cfthrow', 'cftimer',
+            'cftrace', 'cftransaction', 'cftree', 'cftreeitem', 'cftry',
+            'cfupdate', 'cfwddx'
+            ),
+        /* HTML Tags */
+        2 => array(
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        /* HTML attributes */
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            ),
+        /* CFM Script delimeters */
+        4 => array(
+            'var', 'function', 'while', 'if','else'
+            ),
+        /* CFM Functions */
+        5 => array(
+            'Abs', 'GetFunctionList', 'LSTimeFormat','ACos','GetGatewayHelper','LTrim','AddSOAPRequestHeader','GetHttpRequestData',
+            'Max','AddSOAPResponseHeader','GetHttpTimeString','Mid','ArrayAppend','GetLocale','Min','ArrayAvg','GetLocaleDisplayName',
+            'Minute','ArrayClear','GetMetaData','Month','ArrayDeleteAt','GetMetricData','MonthAsString','ArrayInsertAt','GetPageContext',
+            'Now','ArrayIsEmpty','GetProfileSections','NumberFormat','ArrayLen','GetProfileString','ParagraphFormat','ArrayMax',
+            'GetLocalHostIP','ParseDateTime','ArrayMin','GetSOAPRequest','Pi','ArrayNew','GetSOAPRequestHeader','PreserveSingleQuotes',
+            'ArrayPrepend','GetSOAPResponse','Quarter','ArrayResize','GetSOAPResponseHeader','QueryAddColumn','ArraySet',
+            'GetTempDirectory','QueryAddRow','ArraySort','QueryNew','ArraySum','GetTempFile','QuerySetCell',
+            'ArraySwap','GetTickCount','QuotedValueList','ArrayToList','GetTimeZoneInfo','Rand','Asc','GetToken','Randomize',
+            'ASin','Hash','RandRange','Atn','Hour','REFind','BinaryDecode','HTMLCodeFormat','REFindNoCase','BinaryEncode',
+            'HTMLEditFormat','ReleaseComObject','BitAnd','IIf','RemoveChars','BitMaskClear','IncrementValue','RepeatString',
+            'BitMaskRead','InputBaseN','Replace','BitMaskSet','Insert','ReplaceList','BitNot','Int','ReplaceNoCase','BitOr',
+            'IsArray','REReplace','BitSHLN','IsBinary','REReplaceNoCase','BitSHRN','IsBoolean','Reverse','BitXor','IsCustomFunction',
+            'Right','Ceiling','IsDate','RJustify','CharsetDecode','IsDebugMode','Round','CharsetEncode','IsDefined','RTrim',
+            'Chr','IsLeapYear','Second','CJustify','IsLocalHost','SendGatewayMessage','Compare','IsNumeric','SetEncoding',
+            'CompareNoCase','IsNumericDate','SetLocale','Cos','IsObject','SetProfileString','CreateDate','IsQuery','SetVariable',
+            'CreateDateTime','IsSimpleValue','Sgn','CreateObject','IsSOAPRequest','Sin','CreateODBCDate','IsStruct','SpanExcluding',
+            'CreateODBCDateTime','IsUserInRole','SpanIncluding','CreateODBCTime','IsValid','Sqr','CreateTime','IsWDDX','StripCR',
+            'CreateTimeSpan','IsXML','StructAppend','CreateUUID','IsXmlAttribute','StructClear','DateAdd','IsXmlDoc','StructCopy',
+            'DateCompare','IsXmlElem','StructCount','DateConvert','IsXmlNode','StructDelete','DateDiff','IsXmlRoot','StructFind',
+            'DateFormat','JavaCast','StructFindKey','DatePart','JSStringFormat','StructFindValue','Day','LCase','StructGet',
+            'DayOfWeek','Left','StructInsert','DayOfWeekAsString','Len','StructIsEmpty','DayOfYear','ListAppend','StructKeyArray',
+            'DaysInMonth','ListChangeDelims','StructKeyExists','DaysInYear','ListContains','StructKeyList','DE','ListContainsNoCase',
+            'StructNew','DecimalFormat','ListDeleteAt','StructSort','DecrementValue','ListFind','StructUpdate','Decrypt','ListFindNoCase',
+            'Tan','DecryptBinary','ListFirst','TimeFormat','DeleteClientVariable','ListGetAt','ToBase64','DirectoryExists',
+            'ListInsertAt','ToBinary','DollarFormat','ListLast','ToScript','Duplicate','ListLen','ToString','Encrypt','ListPrepend',
+            'Trim','EncryptBinary','ListQualify','UCase','Evaluate','ListRest','URLDecode','Exp','ListSetAt','URLEncodedFormat',
+            'ExpandPath','ListSort','URLSessionFormat','FileExists','ListToArray','Val','Find','ListValueCount','ValueList',
+            'FindNoCase','ListValueCountNoCase','Week','FindOneOf','LJustify','Wrap','FirstDayOfMonth','Log','WriteOutput',
+            'Fix','Log10','XmlChildPos','FormatBaseN','LSCurrencyFormat','XmlElemNew','GetAuthUser','LSDateFormat','XmlFormat',
+            'GetBaseTagData','LSEuroCurrencyFormat','XmlGetNodeType','GetBaseTagList','LSIsCurrency','XmlNew','GetBaseTemplatePath',
+            'LSIsDate','XmlParse','GetClientVariablesList','LSIsNumeric','XmlSearch','GetCurrentTemplatePath','LSNumberFormat',
+            'XmlTransform','GetDirectoryFromPath','LSParseCurrency','XmlValidate','GetEncoding','LSParseDateTime','Year',
+            'GetException','LSParseEuroCurrency','YesNoFormat','GetFileFromPath','LSParseNumber'
+            ),
+        /* CFM Attributes */
+        6 => array(
+            'dbtype','connectstring','datasource','username','password','query','delimeter','description','required','hint','default','access','from','to','list','index'
+            ),
+        7 => array(
+            'EQ', 'GT', 'LT', 'GTE', 'LTE', 'IS', 'LIKE', 'NEQ'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '=', '{', '}', '(', ')', '[', ']', '<', '>', '&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #000000; font-weight: bold;',
+            5 => 'color: #0000FF;',
+            6 => 'color: #0000FF;',
+            7 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #808080; font-style: italic;',
+            1 => 'color: #00bbdd;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #000099;',
+            4 => 'color: #333333;',
+            5 => 'color: #333333;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<!--' => '-->'
+            ),
+        1 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        2 => "/(?!<#)(?:(?:##)*)(#)[a-zA-Z0-9_\.\(\)]+(#)/",
+        3 => array(
+            '<cfscript>' => '</cfscript>'
+            ),
+        4 => array(
+            '<' => '>'
+            ),
+        5 => '/((?!<!)<)(?:"[^"]*"|\'[^\']*\'|(?R)|[^">])+?(>)/si'
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+                ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+                ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^])', // allow ; before keywords
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
+                ),
+            7 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>&|^])', // allow ; before keywords
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/chaiscript.php b/vendor/easybook/geshi/geshi/chaiscript.php
new file mode 100755
index 000000000..f9d0a8681
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/chaiscript.php
@@ -0,0 +1,140 @@
+<?php
+/*************************************************************************************
+ * chaiscript.php
+ * --------------
+ * Author: Jason Turner & Jonathan Turner
+ * Copyright: (c) 2010 Jason Turner (lefticus@gmail.com),
+ *            (c) 2009 Jonathan Turner,
+ *            (c) 2004 Ben Keen (ben.keen@gmail.com), Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/07/03
+ *
+ * ChaiScript language file for GeSHi.
+ *
+ * Based on JavaScript by Ben Keen (ben.keen@gmail.com)
+ *
+ * CHANGES
+ * -------
+ * 2010/03/30 (1.0.8.8)
+ *  -  Updated to include more language features
+ *  -  Removed left over pieces from JavaScript
+ * 2009/07/03 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ChaiScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Regular Expressions
+    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'else', 'elseif', 'eval', 'for', 'if', 'return', 'while', 'try', 'catch', 'finally',
+            ),
+        2 => array(
+            'def', 'false', 'fun', 'true', 'var', 'attr',
+            ),
+        3 => array(
+            // built in functions
+            'throw',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '@', '&', '|', '^',
+        '<', '>', '=',
+        ',', ';', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #003366; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ),
+        1 => array(
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/chapel.php b/vendor/easybook/geshi/geshi/chapel.php
new file mode 100644
index 000000000..d0e50e614
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/chapel.php
@@ -0,0 +1,169 @@
+<?php
+/*************************************************************************************
+ * chapel.php
+ * -----
+ * Author: Richard Molitor (richard.molitor@student.kit.edu)
+ * Copyright: (c) 2013 Richard Molitor
+ * Release Version: 1.0.8.12
+ * Date Started: 2013/06/22
+ *
+ * Chapel language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2013/06/22 (1.0.8.12)
+ *   -  First Release
+ *
+ * TODO (updated 2013/06/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Chapel',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI | GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // statements
+        1 => array(
+            'atomic', 'begin', 'break', 'class', 'cobegin', 'coforall',
+            'continue', 'do', 'else', 'export', 'extern', 'for', 'forall', 'if',
+            'iter', 'inline', 'label', 'let', 'local', 'module',
+            'otherwise', 'proc', 'record', 'return', 'select', 'serial',
+            'then', 'use', 'var', 'when', 'where', 'while', 'yield'
+            ),
+        // literals
+        2 => array(
+            'nil', 'true', 'false'
+            ),
+        // built-in functions
+        3 => array(
+            'by', 'delete', 'dmapped', 'domain', 'enum', 'index', 'min',
+            'minloc', 'max', 'maxloc', 'new', 'range', 'reduce', 'scan',
+            'sparse', 'subdomain', 'sync', 'union', 'zip'
+            ),
+        // built-in types
+        4 => array(
+            'config', 'const', 'in', 'inout', 'opaque', 'on', 'out', 'param',
+            'ref', 'single', 'type'
+            ),
+        // library types
+        5 => array(
+            'void', 'bool', 'int', 'uint', 'real', 'imag', 'complex', 'string',
+            'locale'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>',
+        '!', '^', '&', '|',
+        '?', ':',
+        ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            //2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/cil.php b/vendor/easybook/geshi/geshi/cil.php
new file mode 100755
index 000000000..a108f2498
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cil.php
@@ -0,0 +1,194 @@
+<?php
+/*************************************************************************************
+ * cil.php
+ * --------
+ * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
+ * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/10/24
+ *
+ * CIL (Common Intermediate Language) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/10/24 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2007/10/24)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CIL',
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'COMMENT_SINGLE' => array('//'),
+    'COMMENT_MULTI' => array(),
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//Dotted
+            '.zeroinit', '.vtfixup', '.vtentry', '.vtable', '.ver', '.try', '.subsystem', '.size', '.set', '.removeon',
+            '.publickeytoken', '.publickey', '.property', '.permissionset', '.permission', '.pdirect', '.param', '.pack',
+            '.override', '.other', '.namespace', '.mresource', '.module', '.method', '.maxstack', '.manifestres', '.locals',
+            '.localized', '.locale', '.line', '.language', '.import', '.imagebase', '.hash', '.get', '.fire', '.file', '.field',
+            '.export', '.event', '.entrypoint', '.emitbyte', '.data', '.custom', '.culture', '.ctor', '.corflags', '.class',
+            '.cctor', '.assembly', '.addon'
+            ),
+        2 => array(//Attributes
+            'wrapper', 'with', 'winapi', 'virtual', 'vector', 'vararg', 'value', 'userdefined', 'unused', 'unmanagedexp',
+            'unmanaged', 'unicode', 'to', 'tls', 'thiscall', 'synchronized', 'struct', 'strict', 'storage', 'stdcall',
+            'static', 'specialname', 'special', 'serializable', 'sequential', 'sealed', 'runtime', 'rtspecialname', 'request',
+            'reqsecobj', 'reqrefuse', 'reqopt', 'reqmin', 'record', 'public', 'privatescope', 'private', 'preservesig',
+            'prejitgrant', 'prejitdeny', 'platformapi', 'pinvokeimpl', 'pinned', 'permitonly', 'out', 'optil', 'opt',
+            'notserialized', 'notremotable', 'not_in_gc_heap', 'noprocess', 'noncaslinkdemand', 'noncasinheritance',
+            'noncasdemand', 'nometadata', 'nomangle', 'nomachine', 'noinlining', 'noappdomain', 'newslot', 'nested', 'native',
+            'modreq', 'modopt', 'marshal', 'managed', 'literal', 'linkcheck', 'lcid', 'lasterr', 'internalcall', 'interface',
+            'instance', 'initonly', 'init', 'inheritcheck', 'in', 'import', 'implicitres', 'implicitcom', 'implements',
+            'illegal', 'il', 'hidebysig', 'handler', 'fromunmanaged', 'forwardref', 'fixed', 'finally', 'final', 'filter',
+            'filetime', 'field', 'fault', 'fastcall', 'famorassem', 'family', 'famandassem', 'extern', 'extends', 'explicit',
+            'error', 'enum', 'endmac', 'deny', 'demand', 'default', 'custom', 'compilercontrolled', 'clsid', 'class', 'cil',
+            'cf', 'cdecl', 'catch', 'beforefieldinit', 'autochar', 'auto', 'at', 'assert', 'assembly', 'as', 'any', 'ansi',
+            'alignment', 'algorithm', 'abstract'
+            ),
+        3 => array(//Types
+            'wchar', 'void', 'variant', 'unsigned', 'valuetype', 'typedref', 'tbstr', 'sysstring', 'syschar', 'string',
+            'streamed_object', 'stream', 'stored_object', 'safearray', 'objectref', 'object', 'nullref', 'method', 'lpwstr',
+            'lpvoid', 'lptstr', 'lpstruct', 'lpstr', 'iunknown', 'int64', 'int32', 'int16', 'int8', 'int', 'idispatch',
+            'hresult', 'float64', 'float32', 'float', 'decimal', 'date', 'currency', 'char', 'carray', 'byvalstr',
+            'bytearray', 'boxed', 'bool', 'blob_object', 'blob', 'array'
+            ),
+        4 => array(//Prefix
+            'volatile', 'unaligned', 'tail', 'readonly', 'no', 'constrained'
+            ),
+        5 => array(//Suffix
+            'un', 'u8', 'u4', 'u2', 'u1', 'u', 's', 'ref', 'r8', 'r4', 'm1', 'i8', 'i4', 'i2', 'i1', 'i'#, '.8', '.7', '.6', '.5', '.4', '.3', '.2', '.1', '.0'
+            ),
+        6 => array(//Base
+            'xor', 'switch', 'sub', 'stloc',
+            'stind', 'starg',
+            'shr', 'shl', 'ret', 'rem', 'pop', 'or', 'not', 'nop', 'neg', 'mul',
+            'localloc', 'leave', 'ldnull', 'ldloca',
+            'ldloc', 'ldind', 'ldftn', 'ldc', 'ldarga',
+            'ldarg', 'jmp', 'initblk', 'endfinally', 'endfilter',
+            'endfault', 'dup', 'div', 'cpblk', 'conv', 'clt', 'ckfinite', 'cgt', 'ceq', 'calli',
+            'call', 'brzero', 'brtrue', 'brnull', 'brinst',
+            'brfalse', 'break', 'br', 'bne', 'blt', 'ble', 'bgt', 'bge', 'beq', 'arglist',
+            'and', 'add'
+            ),
+        7 => array(//Object
+            'unbox.any', 'unbox', 'throw', 'stsfld', 'stobj', 'stfld', 'stelem', 'sizeof', 'rethrow', 'refanyval', 'refanytype', 'newobj',
+            'newarr', 'mkrefany', 'ldvirtftn', 'ldtoken', 'ldstr', 'ldsflda', 'ldsfld', 'ldobj', 'ldlen', 'ldflda', 'ldfld',
+            'ldelema', 'ldelem', 'isinst', 'initobj', 'cpobj', 'castclass',
+            'callvirt', 'callmostderived', 'box'
+            ),
+        8 => array(//Other
+            'prefixref', 'prefix7', 'prefix6', 'prefix5', 'prefix4', 'prefix3', 'prefix2', 'prefix1', 'prefix0'
+            ),
+        9 => array(//Literal
+            'true', 'null', 'false'
+            ),
+        10 => array(//Comment-like
+            '#line', '^THE_END^'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:maroon;font-weight:bold;',
+            2 => 'color:blue;font-weight:bold;',
+            3 => 'color:purple;font-weight:bold;',
+            4 => 'color:teal;',
+            5 => 'color:blue;',
+            6 => 'color:blue;',
+            7 => 'color:blue;',
+            8 => 'color:blue;',
+            9 => 'color:00008B',
+            10 => 'color:gray'
+            ),
+        'COMMENTS' => array(
+            0 => 'color:gray;font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000033;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:blue;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => '(?<=ldc\\.i4\\.)[0-8]|(?<=(?:ldarg|ldloc|stloc)\\.)[0-3]' # Pickup the opcodes that end with integers
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/clojure.php b/vendor/easybook/geshi/geshi/clojure.php
new file mode 100755
index 000000000..0ad4e4ad7
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/clojure.php
@@ -0,0 +1,134 @@
+<?php
+/*************************************************************************************
+ * clojure.php
+ * --------
+ * Author: Jess Johnson (jess@grok-code.com)
+ * Copyright: (c) 2009 Jess Johnson (http://grok-code.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/09/20
+ *
+ * Clojure language file for GeSHi.
+ *
+ * This file borrows significantly from the lisp language file for GeSHi
+ *
+ * CHANGES
+ * -------
+ * 2009/09/20 (1.0.8.6)
+ *  -  First Release
+ *
+ * TODO (updated 2009/09/20)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Clojure',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(';|' => '|;'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'defn', 'defn-', 'defmulti', 'defmethod', 'defmacro', 'deftest',
+            'defstruct', 'def', 'defonce', 'let', 'letfn', 'do', 'cond', 'condp',
+            'for', 'loop', 'recur', 'when', 'when-not', 'when-let', 'when-first',
+            'if', 'if-let', 'if-not', 'doto', 'and', 'or','not','aget','aset',
+            'dosync', 'doseq', 'dotimes', 'dorun', 'doall',
+            'load', 'import', 'unimport', 'ns', 'in-ns', 'refer', 'print',
+            'try', 'catch', 'finally', 'throw', 'fn', 'update-in',
+            'with-open', 'with-local-vars', 'binding',
+            'gen-class', 'gen-and-load-class', 'gen-and-save-class',
+            'implement', 'proxy', 'lazy-cons', 'with-meta',
+            'struct', 'struct-map', 'delay', 'locking', 'sync', 'time', 'apply',
+            'remove', 'merge', 'interleave', 'interpose', 'distinct',
+            'cons', 'concat', 'lazy-cat', 'cycle', 'rest', 'frest', 'drop',
+            'drop-while', 'nthrest', 'take', 'take-while', 'take-nth', 'butlast',
+            'reverse', 'sort', 'sort-by', 'split-at', 'partition', 'split-with',
+            'first', 'ffirst', 'rfirst', 'zipmap', 'into', 'set', 'vec',
+            'to-array-2d', 'not-empty', 'seq?', 'not-every?', 'every?', 'not-any?',
+            'map', 'mapcat', 'vector?', 'list?', 'hash-map', 'reduce', 'filter',
+            'vals', 'keys', 'rseq', 'subseq', 'rsubseq', 'count', 'empty?',
+            'fnseq', 'repeatedly', 'iterate', 'drop-last',
+            'repeat', 'replicate', 'range',  'into-array',
+            'line-seq', 'resultset-seq', 're-seq', 're-find', 'tree-seq', 'file-seq',
+            'iterator-seq', 'enumeration-seq', 'declare',  'xml-seq',
+            'symbol?', 'string?', 'vector', 'conj', 'str',
+            'pos?', 'neg?', 'zero?', 'nil?', 'inc', 'dec', 'format',
+            'alter', 'commute', 'ref-set', 'floor', 'assoc', 'send', 'send-off'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|', '.', '..', '->',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #555;',
+            1 => 'color: #555;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+            '::', ':'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/cmake.php b/vendor/easybook/geshi/geshi/cmake.php
new file mode 100755
index 000000000..67277aa9c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cmake.php
@@ -0,0 +1,181 @@
+<?php
+/*************************************************************************************
+ * cmake.php
+ * -------
+ * Author: Daniel Nelson (danieln@eng.utah.edu)
+ * Copyright: (c) 2009 Daniel Nelson
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/04/06
+ *
+ * CMake language file for GeSHi.
+ *
+ * Keyword list generated using CMake 2.6.3.
+ *
+ * CHANGES
+ * -------
+ * <date-of-release> (<GeSHi release>)
+ *  -  First Release
+ *
+ * TODO (updated <date-of-release>)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CMake',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'ESCAPE_REGEXP' => array(
+        // Quoted variables ${...}
+        1 => "/\\$(ENV)?\\{[^\\n\\}]*?\\}/i",
+        // Quoted registry keys [...]
+        2 => "/\\[HKEY[^\n\\]]*?]/i"
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'add_custom_command', 'add_custom_target', 'add_definitions',
+            'add_dependencies', 'add_executable', 'add_library',
+            'add_subdirectory', 'add_test', 'aux_source_directory', 'break',
+            'build_command', 'cmake_minimum_required', 'cmake_policy',
+            'configure_file', 'create_test_sourcelist', 'define_property',
+            'else', 'elseif', 'enable_language', 'enable_testing',
+            'endforeach', 'endfunction', 'endif', 'endmacro',
+            'endwhile', 'execute_process', 'export', 'file', 'find_file',
+            'find_library', 'find_package', 'find_path', 'find_program',
+            'fltk_wrap_ui', 'foreach', 'function', 'get_cmake_property',
+            'get_directory_property', 'get_filename_component', 'get_property',
+            'get_source_file_property', 'get_target_property',
+            'get_test_property', 'if', 'include', 'include_directories',
+            'include_external_msproject', 'include_regular_expression',
+            'install', 'link_directories', 'list', 'load_cache',
+            'load_command', 'macro', 'mark_as_advanced', 'math', 'message',
+            'option', 'output_required_files', 'project', 'qt_wrap_cpp',
+            'qt_wrap_ui', 'remove_definitions', 'return', 'separate_arguments',
+            'set', 'set_directory_properties', 'set_property',
+            'set_source_files_properties', 'set_target_properties',
+            'set_tests_properties', 'site_name', 'source_group', 'string',
+            'target_link_libraries', 'try_compile', 'try_run', 'unset',
+            'variable_watch', 'while'
+            ),
+        2 => array(
+            // Deprecated commands
+            'build_name', 'exec_program', 'export_library_dependencies',
+            'install_files', 'install_programs', 'install_targets',
+            'link_libraries', 'make_directory', 'remove', 'subdir_depends',
+            'subdirs', 'use_mangled_mesa', 'utility_source',
+            'variable_requires', 'write_file'
+            ),
+        3 => array(
+            // Special command arguments, this list is not comprehesive.
+            'AND', 'APPEND', 'ASCII', 'BOOL', 'CACHE', 'COMMAND', 'COMMENT',
+            'COMPARE', 'CONFIGURE', 'DEFINED', 'DEPENDS', 'DIRECTORY',
+            'EQUAL', 'EXCLUDE_FROM_ALL', 'EXISTS', 'FALSE', 'FATAL_ERROR',
+            'FILEPATH', 'FIND', 'FORCE', 'GET', 'GLOBAL', 'GREATER',
+            'IMPLICIT_DEPENDS', 'INSERT', 'INTERNAL', 'IS_ABSOLUTE',
+            'IS_DIRECTORY', 'IS_NEWER_THAN', 'LENGTH', 'LESS',
+            'MAIN_DEPENDENCY', 'MATCH', 'MATCHALL', 'MATCHES', 'MODULE', 'NOT',
+            'NOTFOUND', 'OFF', 'ON', 'OR', 'OUTPUT', 'PARENT_SCOPE', 'PATH',
+            'POLICY', 'POST_BUILD', 'PRE_BUILD', 'PRE_LINK', 'PROPERTY',
+            'RANDOM', 'REGEX', 'REMOVE_AT', 'REMOVE_DUPLICATES', 'REMOVE_ITEM',
+            'REPLACE', 'REVERSE', 'SEND_ERROR', 'SHARED', 'SORT', 'SOURCE',
+            'STATIC', 'STATUS', 'STREQUAL', 'STRGREATER', 'STRING', 'STRIP',
+            'STRLESS', 'SUBSTRING', 'TARGET', 'TEST', 'TOLOWER', 'TOUPPER',
+            'TRUE', 'VERBATIM', 'VERSION', 'VERSION_EQUAL', 'VERSION_GREATOR',
+            'VERSION_LESS', 'WORKING_DIRECTORY',
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')')
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #1f3f81; font-style: bold;',
+            2 => 'color: #1f3f81;',
+            3 => 'color: #077807; font-sytle: italic;'
+            ),
+        'BRACKETS' => array(),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #b08000;',
+            2 => 'color: #0000cd;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #912f11;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #197d8b;'
+            ),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'REGEXPS' => array(
+            0 => 'color: #b08000;',
+            1 => 'color: #0000cd;'
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => 'http://www.cmake.org/cmake/help/cmake2.6docs.html#command:{FNAMEL}',
+        2 => 'http://www.cmake.org/cmake/help/cmake2.6docs.html#command:{FNAMEL}',
+        3 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        // Unquoted variables
+        0 => "\\$(ENV)?\\{[^\\n}]*?\\}",
+        // Unquoted registry keys
+        1 => "\\[HKEY[^\n\\]]*?]"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            // These keywords cannot come after a open paren
+            1 => array(
+                'DISALLOWED_AFTER' =>  '(?= *\()'
+                ),
+            2 => array(
+                'DISALLOWED_AFTER' =>  '(?= *\()'
+                )
+            ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'METHODS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/cobol.php b/vendor/easybook/geshi/geshi/cobol.php
new file mode 100755
index 000000000..1280a4c7e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cobol.php
@@ -0,0 +1,457 @@
+<?php
+/*************************************************************************************
+ * cobol.php
+ * ----------
+ * Author: BenBE (BenBE@omorphia.org)
+ * Copyright: (c) 2007-2008 BenBE (http://www.omorphia.de/)
+ * Release Version: 1.0.8.12
+ * Date Started: 2007/07/02
+ *
+ * COBOL language file for GeSHi.
+ *
+ * Most of the compiler directives, reserved words and intrinsic functions are
+ * from the 2009 COBOL Draft Standard, Micro Focus, and GNU Cobol. The lists of
+ * these were found in the draft standard (Sections 8.9, 8.10, 8.11 and 8.12),
+ * Micro Focus' COBOL Language Reference and the GNU Cobol FAQ.
+ *
+ * CHANGES
+ * -------
+ * 2013/11/17 (1.0.8.12)
+ *  -  Changed compiler directives to be handled like comments.
+ *  -  Fixed bug where keywords in identifiers were highlighted.
+ * 2013/08/19 (1.0.8.12)
+ *  -  Added more intrinsic functions, reserved words, and compiler directives
+ *     from the (upcoming) standard.
+ * 2013/07/07 (1.0.8.12)
+ *  -  Added more reserved words, compiler directives and intrinsic functions.
+ *  -  Added modern comment syntax and corrected the other one.
+ *  -  Set OOLANG to true and added an object splitter.
+ *  -  Added extra symbols.
+ *  -  Fixed bug where scope terminators were only the statement in
+ *     end-statement was highlighted.
+ *
+ * TODO (updated 2013/11/17)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'COBOL',
+    'COMMENT_SINGLE' => array(
+        1 => '*>', // COBOL 2002 inline comment
+        2 => '>>'  // COBOL compiler directive indicator
+        ),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => '/^......(\*.*?$)/m', // Fixed-form comment
+        2 => '/\$SET.*/i'          // MF compiler directive indicator
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // Statements containing spaces. These are separate to other statements
+        // so that they are highlighted correctly.
+        1 => array(
+            'DELETE FILE', 'GO TO', 'NEXT SENTENCE', 'XML GENERATE',
+            'XML PARSE'
+            ),
+
+        2 => array( // Other Reserved Words
+            '3-D', 'ABSENT', 'ABSTRACT', 'ACCESS', 'ACQUIRE',
+            'ACTION', 'ACTIVE-CLASS', 'ACTIVE-X', 'ACTUAL', 'ADDRESS',
+            'ADDRESS-ARRAY', 'ADDRESS-OFFSET', 'ADJUSTABLE-COLUMNS',
+            'ADVANCING', 'AFP-5A', 'AFTER', 'ALIGNED', 'ALIGNMENT', 'ALL',
+            'ALLOW', 'ALLOWING', 'ALPHABET', 'ALPHABETIC',
+            'ALPHABETIC-LOWER', 'ALPHABETIC-UPPER', 'ALPHANUMERIC',
+            'ALPHANUMERIC-EDITED', 'ALSO', 'ALTERNATE', 'AND', 'ANY',
+            'ANYCASE',
+            'APPLY', 'ARE', 'AREA', 'AREAS', 'ARGUMENT-NUMBER',
+            'ARGUMENT-VALUE',
+            'ARITHMETIC', 'AS', 'ASCENDING',
+            'ASSEMBLY-ATTRIBUTES', 'ASSIGN', 'AT', 'ATTRIBUTE', 'AUTHOR',
+            'AUTO', 'AUTO-DECIMAL', 'AUTO-HYPHEN-SKIP', 'AUTO-MINIMIZE',
+            'AUTO-RESIZE', 'AUTO-SKIP', 'AUTO-SPIN', 'AUTOMATIC',
+            'AUTOTERMINATE', 'AWAY-FROM-ZERO',
+            'AX-EVENT-LIST', 'B-AND', 'B-EXOR', 'B-LEFT',
+            'B-NOT', 'B-OR', 'B-RIGHT', 'B-XOR', 'BACKGROUND-COLOR',
+            'BACKGROUND-COLOUR', 'BACKGROUND-HIGH', 'BACKGROUND-LOW',
+            'BACKGROUND-STANDARD', 'BACKWARD', 'BAR', 'BASED', 'BASIS', 'BEEP',
+            'BEFORE', 'BEGINNING', 'BELL', 'BINARY', 'BINARY-CHAR',
+            'BINARY-DOUBLE', 'BINARY-LONG', 'BINARY-SHORT', 'BIND', 'BIT',
+            'BITMAP', 'BITMAP-END', 'BITMAP-HANDLE', 'BITMAP-NUMBER',
+            'BITMAP-RAW-HEIGHT', 'BITMAP-RAW-WIDTH', 'BITMAP-SCALE',
+            'BITMAP-START', 'BITMAP-TIMER', 'BITMAP-TRAILING', 'BITMAP-WIDTH',
+            'BLANK', 'BLINK', 'BLINKING', 'BLOB', 'BLOB-FILE', 'BLOB-LOCATOR',
+            'BLOCK', 'BOLD', 'BOOLEAN', 'BOTTOM', 'BOX', 'BOXED', 'BROWSING',
+            'BUSY', 'BUTTONS', 'BY', 'C01', 'C02', 'C03', 'C04',
+            'C05',
+            'C06', 'C07', 'C08', 'C09', 'C10', 'C11', 'C12', 'CALENDAR-FONT',
+            'CALLED', 'CANCEL-BUTTON', 'CAPACITY', 'CATCH', 'CBL',
+            'CBL-CTR', 'CCOL', 'CD', 'CELL', 'CELL-COLOR', 'CELL-DATA',
+            'CELL-FONT', 'CELL-PROTECTION', 'CELLS', 'CENTER', 'CENTERED',
+            'CENTERED-HEADINGS', 'CENTURY-DATE', 'CENTURY-DAY', 'CF', 'CH',
+            'CHAINING', 'CHANGED', 'CHAR-VARYING',
+            'CHARACTER',
+            'CHARACTERS', 'CHART', 'CHECK-BOX', 'CHECKING', 'CLASS',
+            'CLASS-ATTRIBUTES', 'CLASS-CONTROL', 'CLASS-ID', 'CLASS-OBJECT',
+            'CLASSIFICATION',
+            'CLEAR-SELECTION', 'CLINE', 'CLINES', 'CLOB', 'CLOB-FILE',
+            'CLOB-LOCATOR', 'CLOCK-UNITS', 'COBOL', 'CODE', 'CODE-SET',
+            'COERCION', 'COL', 'COLLATING', 'COLORS', 'COLOUR',
+            'COLOURS', 'COLS', 'COLUMN', 'COLUMN-COLOR', 'COLUMN-DIVIDERS',
+            'COLUMN-FONT', 'COLUMN-HEADINGS', 'COLUMN-PROTECTION', 'COLUMNS',
+            'COM-REG', 'COMBO-BOX', 'COMMA', 'COMMITMENT', 'COMMON',
+            'COMMUNICATION', 'COMP', 'COMP-0', 'COMP-1', 'COMP-2', 'COMP-3',
+            'COMP-4', 'COMP-5', 'COMP-6', 'COMP-X', 'COMPRESSION',
+            'COMPUTATIONAL', 'COMPUTATIONAL-0', 'COMPUTATIONAL-1',
+            'COMPUTATIONAL-2', 'COMPUTATIONAL-3', 'COMPUTATIONAL-4',
+            'COMPUTATIONAL-5', 'COMPUTATIONAL-6', 'COMPUTATIONAL-X',
+            'CONDITION-VALUE', 'CONFIGURATION', 'CONSOLE', 'CONSTANT',
+            'CONSTRAIN', 'CONSTRAINTS', 'CONTAINS', 'CONTENT',
+            'CONTROL', 'CONTROL-AREA', 'CONTROLS', 'CONTROLS-UNCROPPED',
+            'CONVERSION', 'CONVERT', 'CONVERTING', 'COPY-SELECTION',
+            'CORE-INDEX', 'CORR', 'CORRESPONDING', 'COUNT',
+            'CREATING', 'CRT', 'CRT-UNDER', 'CSIZE', 'CSP', 'CURRENCY',
+            'CURSOR', 'CURSOR-COL', 'CURSOR-COLOR',
+            'CURSOR-FRAME-WIDTH', 'CURSOR-ROW', 'CURSOR-X', 'CURSOR-Y',
+            'CUSTOM-ATTRIBUTE', 'CUSTOM-PRINT-TEMPLATE', 'CYCLE', 'CYL-INDEX',
+            'CYL-OVERFLOW', 'DASHED', 'DATA', 'DATA-COLUMNS',
+            'DATA-POINTER', 'DATA-TYPES', 'DATABASE-KEY', 'DATABASE-KEY-LONG',
+            'DATE', 'DATE-COMPILED', 'DATE-ENTRY', 'DATE-RECORD',
+            'DATE-WRITTEN', 'DAY', 'DAY-OF-WEEK', 'DBCLOB', 'DBCLOB-FILE',
+            'DBCLOB-LOCATOR', 'DBCS', 'DE', 'DEBUG', 'DEBUG-CONTENTS',
+            'DEBUG-ITEM', 'DEBUG-LINE', 'DEBUG-NAME', 'DEBUG-SUB-1',
+            'DEBUG-SUB-2', 'DEBUG-SUB-3', 'DEBUGGING', 'DECIMAL',
+            'DECIMAL-POINT', 'DECLARATIVES', 'DEFAULT',
+            'DEFAULT-BUTTON', 'DEFAULT-FONT', 'DEFINITION',
+            'DELEGATE-ID', 'DELIMITED', 'DELIMITER', 'DEPENDING',
+            'DESCENDING', 'DESTINATION', 'DESTROY', 'DETAIL', 'DICTIONARY',
+            'DISABLE', 'DISC', 'DISJOINING', 'DISK', 'DISP',
+            'DISPLAY-1', 'DISPLAY-COLUMNS', 'DISPLAY-FORMAT', 'DISPLAY-ST',
+            'DIVIDER-COLOR', 'DIVIDERS', 'DIVISION', 'DOT-DASH',
+            'DOTTED', 'DOWN', 'DRAG-COLOR', 'DRAW', 'DROP', 'DROP-DOWN',
+            'DROP-LIST', 'DUPLICATES', 'DYNAMIC', 'EBCDIC', 'EC', 'ECHO', 'EGCS',
+            'EGI', 'EJECT', 'ELEMENTARY', 'ELSE', 'EMI', 'EMPTY-CHECK',
+            'ENABLE', 'ENABLED', 'END', 'END-ACCEPT', 'END-ADD', 'END-CALL',
+            'END-CHAIN', 'END-COLOR', 'END-COMPUTE', 'END-DELEGATE',
+            'END-DELETE', 'END-DISPLAY', 'END-DIVIDE', 'END-EVALUATE',
+            'END-IF', 'END-INVOKE', 'END-MODIFY', 'END-MOVE', 'END-MULTIPLY',
+            'END-OF-PAGE', 'END-PERFORM', 'END-READ', 'END-RECEIVE',
+            'END-RETURN', 'END-REWRITE', 'END-SEARCH', 'END-START',
+            'END-STRING', 'END-SUBTRACT', 'END-SYNC', 'END-TRY',
+            'END-UNSTRING', 'END-WAIT', 'END-WRITE', 'END-XML', 'ENDING',
+            'ENGRAVED', 'ENSURE-VISIBLE', 'ENTRY-CONVENTION',
+            'ENTRY-FIELD',
+            'ENTRY-REASON', 'ENUM', 'ENUM-ID', 'ENVIRONMENT',
+            'ENVIRONMENT-NAME', 'ENVIRONMENT-VALUE', 'EOL', 'EOP',
+            'EOS', 'EQUAL', 'EQUALS', 'ERASE', 'ERROR', 'ESCAPE',
+            'ESCAPE-BUTTON', 'ESI', 'EVENT', 'EVENT-LIST',
+            'EVENT-POINTER', 'EVERY', 'EXCEEDS', 'EXCEPTION',
+            'EXCEPTION-OBJECT', 'EXCEPTION-VALUE', 'EXCESS-3',
+            'EXCLUDE-EVENT-LIST', 'EXCLUSIVE',
+            'EXPAND', 'EXPANDS', 'EXTEND', 'EXTENDED',
+            'EXTENDED-SEARCH', 'EXTENSION', 'EXTERNAL', 'EXTERNAL-FORM',
+            'EXTERNALLY-DESCRIBED-KEY', 'FACTORY', 'FALSE', 'FD',
+            'FH--FCD', 'FH--KEYDEF', 'FILE', 'FILE-CONTROL', 'FILE-ID',
+            'FILE-LIMIT', 'FILE-LIMITS', 'FILE-NAME', 'FILE-POS', 'FILL-COLOR',
+            'FILL-COLOR2', 'FILL-PERCENT', 'FILLER', 'FINAL', 'FINALLY',
+            'FINISH-REASON', 'FIRST', 'FIXED', 'FIXED-FONT', 'FIXED-WIDTH',
+            'FLAT', 'FLAT-BUTTONS', 'FLOAT-BINARY-7', 'FLOAT-BINARY-16',
+            'FLOAT-BINARY-34', 'FLOAT-DECIMAL-16', 'FLOAT-DECIMAL-34',
+            'FLOAT-EXTENDED', 'FLOAT-LONG',
+            'FLOAT-SHORT', 'FLOATING', 'FONT', 'FOOTING', 'FOR',
+            'FOREGROUND-COLOR', 'FOREGROUND-COLOUR', 'FOREVER', 'FORMAT',
+            'FRAME', 'FRAMED', 'FROM', 'FULL', 'FULL-HEIGHT',
+            'FUNCTION', 'FUNCTION-ID', 'FUNCTION-POINTER', 'GENERATE',
+            'GET', 'GETTER', 'GIVING', 'GLOBAL', 'GO-BACK', 'GO-FORWARD',
+            'GO-HOME', 'GO-SEARCH', 'GRAPHICAL', 'GREATER', 'GRID',
+            'GRIP', 'GROUP', 'GROUP-USAGE', 'GROUP-VALUE', 'HANDLE',
+            'HAS-CHILDREN', 'HEADING', 'HEADING-COLOR', 'HEADING-DIVIDER-COLOR',
+            'HEADING-FONT', 'HEAVY', 'HEIGHT', 'HEIGHT-IN-CELLS', 'HELP-ID',
+            'HIDDEN-DATA', 'HIGH', 'HIGH-COLOR', 'HIGH-VALUE', 'HIGH-VALUES',
+            'HIGHLIGHT', 'HORIZONTAL', 'HOT-TRACK', 'HSCROLL', 'HSCROLL-POS',
+            'I-O', 'I-O-CONTROL', 'ICON', 'ID', 'IDENTIFICATION',
+            'IDENTIFIED', 'IFINITY', 'IGNORE', 'IGNORING', 'IMPLEMENTS', 'IN',
+            'INDEPENDENT', 'INDEX', 'INDEXED', 'INDEXER', 'INDEXER-ID', 'INDIC',
+            'INDICATE', 'INDICATOR', 'INDICATORS', 'INDIRECT',
+            'INHERITING', 'INHERITS',
+            'INITIAL', 'INITIALIZED', 'INPUT',
+            'INPUT-OUTPUT', 'INQUIRE', 'INSERT', 'INSERT-ROWS',
+            'INSERTION-INDEX', 'INSTALLATION', 'INSTANCE',
+            'INTERFACE', 'INTERFACE-ID', 'INTERMEDIATE',
+            'INTERNAL', 'INTO', 'INTRINSIC',
+            'INVALID', 'INVOKED', 'IS', 'ITEM', 'ITEM-BOLD',
+            'ITEM-ID', 'ITEM-TEXT', 'ITEM-TO-ADD', 'ITEM-TO-DELETE',
+            'ITEM-TO-EMPTY', 'ITEM-VALUE', 'ITERATOR', 'ITERATOR-ID', 'J',
+            'JOINED', 'JOINING', 'JUST', 'JUSTIFIED', 'KANJI',
+            'KEPT', 'KEY', 'KEY-YY', 'KEYBOARD', 'LABEL', 'LABEL-OFFSET',
+            'LARGE-FONT', 'LAST', 'LAST-ROW', 'LAYOUT-DATA', 'LAYOUT-MANAGER',
+            'LC_ALL', 'LC_COLLATE', 'LC_CTYPE', 'LC_CURRENCY', 'LC_MESSAGES',
+            'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME', 'LEADING', 'LEADING-SHIFT',
+            'LEAVE', 'LEFT', 'LEFT-JUSTIFY', 'LEFT-TEXT', 'LEFTLINE',
+            'LENGTH-CHECK', 'LESS', 'LIMIT', 'LIMITS', 'LIN', 'LINAGE',
+            'LINAGE-COUNTER', 'LINE', 'LINE-COUNTER', 'LINES', 'LINES-AT-ROOT',
+            'LINK', 'LINKAGE', 'LIST', 'LIST-BOX', 'LM-RESIZE', 'LOCAL-STORAGE',
+            'LOCALE', 'LOCK', 'LOCKING', 'LONG-DATE', 'LONG-VARBINARY',
+            'LONG-VARCHAR', 'LOW', 'LOW-COLOR', 'LOW-VALUE', 'LOW-VALUES',
+            'LOWER', 'LOWERED', 'LOWLIGHT', 'MANUAL', 'MASS-UPDATE',
+            'MASTER-INDEX', 'MAX-HEIGHT', 'MAX-LINES', 'MAX-PROGRESS',
+            'MAX-SIZE', 'MAX-TEXT', 'MAX-VAL', 'MAX-WIDTH', 'MDI-CHILD',
+            'MDI-FRAME', 'MEDIUM-FONT', 'MEMORY', 'MENU', 'MESSAGE',
+            'MESSAGES', 'METACLASS', 'METHOD', 'METHOD-ID', 'MIN-HEIGHT',
+            'MIN-LINES', 'MIN-SIZE', 'MIN-VAL', 'MIN-WIDTH', 'MODAL', 'MODE',
+            'MODELESS', 'MODIFIED', 'MODULES', 'MONITOR-POINTER',
+            'MORE-LABELS', 'MULTILINE',
+            'MUTEX-POINTER', 'NAME', 'NAMED', 'NATIONAL',
+            'NATIONAL-EDITED', 'NATIVE', 'NAVIGATE-URL', 'NCHAR',
+            'NEAREST-AWAY-FROM-ZERO', 'NEAREST-EVEN', 'NEAREST-TOWARD-ZERO',
+            'NEGATIVE', 'NEGATIVE-INFINITY',
+            'NESTED', 'NET-EVENT-LIST', 'NEW', 'NEWABLE', 'NEXT ', 'NEXT-ITEM',
+            'NO', 'NO-AUTO-DEFAULT', 'NO-AUTOSEL', 'NO-BOX', 'NO-CELL-DRAG',
+            'NO-CLOSE', 'NO-DIVIDERS', 'NO-ECHO', 'NO-F4', 'NO-FOCUS',
+            'NO-GROUP-TAB', 'NO-KEY-LETTER', 'NO-SEARCH', 'NO-TAB', 'NO-UPDOWN',
+            'NOMINAL', 'NONE', 'NORMAL', 'NOT', 'NOT-A-NUMBER', 'NOTIFY',
+            'NOTIFY-CHANGE', 'NOTIFY-DBLCLICK', 'NOTIFY-SELCHANGE',
+            'NSTD-REELS', 'NULL', 'NULLS', 'NUM-COL-HEADINGS',
+            'NUM-ROW-HEADINGS', 'NUM-ROWS', 'NUMBER', 'NUMBERS', 'NUMERIC',
+            'NUMERIC-EDITED', 'NUMERIC-FILL', 'O-FILL', 'OBJECT',
+            'OBJECT-COMPUTER', 'OBJECT-ID', 'OBJECT-REFERENCE',
+            'OBJECT-STORAGE', 'OCCURS', 'OF', 'OFF', 'OK-BUTTON', 'OMITTED',
+            'ONLY', 'OOSTACKPTR', 'OPERATOR', 'OPERATOR-ID',
+            'OPTIONAL', 'OPTIONS', 'OR', 'ORDER', 'ORGANIZATION', 'OTHER',
+            'OTHERWISE', 'OUTPUT', 'OVERFLOW', 'OVERLAP-LEFT', 'OVERLAP-TOP',
+            'OVERLAPPED', 'OVERLINE', 'OVERRIDE', 'PACKED-DECIMAL',
+            'PADDING', 'PAGE', 'PAGE-COUNTER', 'PAGE-SETUP', 'PAGE-SIZE',
+            'PAGED', 'PANEL-INDEX', 'PANEL-STYLE', 'PANEL-TEXT', 'PANEL-WIDTHS',
+            'PARAGRAPH', 'PARAMS', 'PARENT', 'PARSE', 'PARTIAL', 'PASSWORD',
+            'PERMANENT', 'PF', 'PH', 'PIC', 'PICTURE', 'PIXEL',
+            'PIXELS', 'PLACEMENT', 'PLUS', 'POINTER', 'POP-UP', 'POSITION',
+            'POSITION-SHIFT', 'POSITIONING', 'POSITIVE', 'POSITIVE-INFINITY',
+            'PREFIXED', 'PREFIXING', 'PRESENT',
+            'PREVIOUS', 'PRINT', 'PRINT-CONTROL', 'PRINT-NO-PROMPT',
+            'PRINT-PREVIEW', 'PRINT-SWITCH', 'PRINTER', 'PRINTER-1', 'PRINTING',
+            'PRIOR', 'PRIORITY', 'PRIVATE', 'PROCEDURE', 'PROCEDURE-POINTER',
+            'PROCEDURES', 'PROCEED', 'PROCESS', 'PROCESSING', 'PROGRAM',
+            'PROGRAM-ID', 'PROGRAM-POINTER', 'PROGRESS', 'PROHIBITED',
+            'PROMPT', 'PROPERTIES',
+            'PROPERTY', 'PROPERTY-ID', 'PROPERTY-VALUE', 'PROTECTED',
+            'PROTOTYPE', 'PUBLIC', 'PURGE', 'PUSH-BUTTON', 'QUERY-INDEX',
+            'QUEUE', 'QUOTE', 'QUOTES', 'RADIO-BUTTON', 'RAISED',
+            'RAISING', 'RD', 'READ-ONLY', 'READING',
+            'READY', 'RECORD', 'RECORD-DATA', 'RECORD-OVERFLOW',
+            'RECORD-TO-ADD', 'RECORD-TO-DELETE', 'RECORDING', 'RECORDS',
+            'RECURSIVE', 'REDEFINE', 'REDEFINES', 'REDEFINITION', 'REEL',
+            'REFERENCE', 'REFERENCES', 'REFRESH', 'REGION-COLOR', 'RELATION',
+            'RELATIVE', 'RELOAD', 'REMAINDER', 'REMARKS', 'REMOVAL',
+            'RENAMES', 'REORG-CRITERIA', 'REPEATED', 'REPLACE', 'REPLACING',
+            'REPORT', 'REPORTING', 'REPORTS', 'REPOSITORY', 'REQUIRED',
+            'REPRESENTS-NOT-A-NUMBER',
+            'REREAD', 'RERUN', 'RESERVE', 'RESET-GRID', 'RESET-LIST',
+            'RESET-TABS', 'RESIZABLE', 'RESTRICTED', 'RESULT-SET-LOCATOR',
+            'RETRY', 'RETURN-CODE', 'RETURNING',
+            'REVERSE-VIDEO', 'REVERSED', 'REWIND', 'RF', 'RH',
+            'RIGHT', 'RIGHT-ALIGN', 'RIGHT-JUSTIFY', 'RIMMED',
+            'ROLLING', 'ROUNDED', 'ROUNDING', 'ROW-COLOR', 'ROW-COLOR-PATTERN',
+            'ROW-DIVIDERS', 'ROW-FONT', 'ROW-HEADINGS', 'ROW-PROTECTION',
+            'ROWID', 'RUN', 'S01', 'S02', 'S03', 'S04', 'S05', 'SAME',
+            'SAVE-AS', 'SAVE-AS-NO-PROMPT', 'SCREEN', 'SCROLL', 'SCROLL-BAR',
+            'SD', 'SEARCH-OPTIONS', 'SEARCH-TEXT', 'SECONDS',
+            'SECTION', 'SECURE', 'SECURITY', 'SEEK', 'SEGMENT', 'SEGMENT-LIMIT',
+            'SELECT-ALL', 'SELECTION-INDEX', 'SELECTION-TEXT',
+            'SELECTIVE', 'SELF', 'SELF-ACT', 'SELFCLASS', 'SEMAPHORE-POINTER',
+            'SEND', 'SENTENCE', 'SEPARATE', 'SEPARATION', 'SEQUENCE',
+            'SEQUENTIAL', 'SETTER', 'SHADING', 'SHADOW',
+            'SHARING', 'SHIFT-IN', 'SHIFT-OUT', 'SHORT-DATE', 'SHOW-LINES',
+            'SHOW-NONE', 'SHOW-SEL-ALWAYS', 'SIGNED', 'SIGNED-INT',
+            'SIGNED-LONG', 'SIGNED-SHORT', 'SIZE', 'SKIP1',
+            'SKIP2', 'SKIP3', 'SMALL-FONT', 'SORT-CONTROL',
+            'SORT-CORE-SIZE', 'SORT-FILE-SIZE', 'SORT-MERGE', 'SORT-MESSAGE',
+            'SORT-MODE-SIZE', 'SORT-OPTION', 'SORT-ORDER', 'SORT-RETURN',
+            'SORT-TAPE', 'SORT-TAPES', 'SOURCE', 'SOURCE-COMPUTER', 'SOURCES',
+            'SPACE', 'SPACE-FILL', 'SPACES', 'SPECIAL-NAMES', 'SPINNER', 'SQL',
+            'SQUARE', 'STANDARD', 'STANDARD-1', 'STANDARD-2', 'STANDARD-3',
+            'STANDARD-BINARY', 'STANDARD-DECIMAL',
+            'START-X', 'START-Y', 'STARTING', 'STATEMENT', 'STATIC',
+            'STATIC-LIST',
+            'STATUS', 'STATUS-BAR', 'STATUS-TEXT', 'STEP',
+            'STOP-BROWSER', 'STRONG', 'STYLE', 'SUB-QUEUE-1',
+            'SUB-QUEUE-2', 'SUB-QUEUE-3', 'SUBFILE', 'SUBWINDOW',
+            'SUFFIXING', 'SUPER', 'SYMBOL', 'SYMBOLIC',
+            'SYNCHRONIZED', 'SYSIN', 'SYSIPT', 'SYSLST', 'SYSOUT',
+            'SYSPCH', 'SYSPUNCH', 'SYSTEM', 'SYSTEM-DEFAULT', 'SYSTEM-INFO',
+            'TAB', 'TAB-CONTROL', 'TAB-TO-ADD', 'TAB-TO-DELETE', 'TABLE',
+            'TALLY', 'TALLYING', 'TAPE', 'TAPES', 'TEMPORARY', 'TERMINAL',
+            'TERMINAL-INFO', 'TERMINATION-VALUE', 'TEST', 'TEXT',
+            'THAN', 'THEN', 'THREAD', 'THREAD-LOCAL', 'THREAD-LOCAL-STORAGE',
+            'THREAD-POINTER', 'THROUGH', 'THRU', 'THUMB-POSITION',
+            'TILED-HEADINGS', 'TIME', 'TIME-OF-DAY', 'TIME-OUT', 'TIME-RECORD',
+            'TIMEOUT', 'TIMES', 'TIMESTAMP', 'TIMESTAMP-OFFSET',
+            'TIMESTAMP-OFFSET-RECORD', 'TIMESTAMP-RECORD', 'TITLE', 'TITLE-BAR',
+            'TITLE-POSITION', 'TO', 'TOOL-BAR', 'TOP', 'TOTALED', 'TOTALING',
+            'TOWARD-GREATER', 'TOWARD-LESSER',
+            'TRACE', 'TRACK-AREA', 'TRACK-LIMIT', 'TRACK-THUMB', 'TRACKS',
+            'TRADITIONAL-FONT', 'TRAILING', 'TRAILING-SHIFT', 'TRAILING-SIGN',
+            'TRANSACTION', 'TRANSPARENT', 'TRANSPARENT-COLOR',
+            'TREE-VIEW', 'TRUE', 'TRUNCATION', 'TYPE', 'TYPEDEF', 'UCS-4',
+            'UNDERLINE', 'UNDERLINED', 'UNEQUAL', 'UNFRAMED', 'UNIT', 'UNITS',
+            'UNIVERSAL', 'UNSIGNED', 'UNSIGNED-INT', 'UNSIGNED-LONG',
+            'UNSIGNED-SHORT',
+            'UNSORTED', 'UP', 'UPDATE', 'UNTIL', 'UPON', 'UPPER',
+            'UPSI-0', 'UPSI-1', 'UPSI-2', 'UPSI-3', 'UPSI-4', 'UPSI-5',
+            'UPSI-6', 'UPSI-7', 'USAGE', 'USE-ALT', 'USE-RETURN',
+            'USE-TAB', 'USER', 'USER-COLORS', 'USER-DEFAULT', 'USER-GRAY',
+            'USER-WHITE', 'USING', 'UTF-16', 'UTF-8', 'VALID',
+            'VAL-STATUS', 'VALIDATE-STATUS',
+            'VALUE', 'VALUE-FORMAT', 'VALUES', 'VALUETYPE', 'VALUETYPE-ID',
+            'VARBINARY', 'VARIABLE', 'VARIANT', 'VARYING', 'VERTICAL',
+            'VERY-HEAVY', 'VIRTUAL-WIDTH', 'VISIBLE', 'VPADDING', 'VSCROLL',
+            'VSCROLL-BAR', 'VSCROLL-POS', 'VTOP', 'WEB-BROWSER', 'WHEN',
+            'WHERE', 'WIDTH', 'WIDTH-IN-CELLS', 'WINDOW',
+            'WITH', 'WORDS', 'WORKING-STORAGE', 'WRAP', 'WRITE-ONLY',
+            'WRITE-VERIFY', 'WRITING', ' XML', 'XML ', 'XML-CODE', 'XML-EVENT',
+            'XML-NTEXT', 'XML-TEXT', 'YIELDING', 'YYYYDDD', 'YYYYMMDD', 'ZERO',
+            'ZERO-FILL', 'ZEROES', 'ZEROS'
+            ),
+        3 => array( // Statement Keywords containing no spaces.
+            'ACCEPT', 'ADD', 'ALTER', 'ALLOCATE', 'ATTACH', 'CALL', 'CANCEL',
+            'CHAIN', 'CREATE',
+            'CLOSE', 'COLOR', 'COMPUTE', 'COMMIT', 'CONTINUE',
+            'COPY', 'DECLARE', 'DELEGATE', 'DELETE', 'DETACH', 'DISPLAY',
+            'DIVIDE',
+            'ENTER', 'ENTRY', 'EVALUATE', 'EXAMINE',
+            'EXEC', 'EXECUTE', 'EXHIBIT', 'EXIT', 'FREE', 'GOBACK',
+            'IF',  'INITIALIZE', 'INITIATE', 'INSPECT', 'INVOKE', 'MERGE',
+            'MODIFY', 'MOVE', 'MULTIPLY', 'NOTE', 'ON', 'OPEN',
+            'PERFORM', 'RAISE', 'READ', 'RECEIVE', 'RELEASE', 'RETURN',
+            'RESET', 'RESUME',
+            'REWRITE', 'ROLLBACK', 'SEARCH', 'SELECT', 'SERVICE', 'SET', 'SORT',
+            'START', 'STOP', 'STRING', 'SUBTRACT', 'SYNC',
+            'SUPPRESS', 'TERMINATE',
+            'TRANSFORM', 'TRY', 'UNLOCKFILE', 'UNLOCK', 'UNSTRING', 'USE',
+            'VALIDATE', 'WAIT', 'WRITE'
+            ),
+        4 => array( // Intrinsic functions
+            'ABS', 'ACOS', 'ANNUITY', 'ASIN', 'ATAN', 'BOOLEAN-OF-INTEGER',
+            'BYTE-LENGTH', 'CHAR', 'CHAR-NATIONAL',
+            'COS', 'COMBINED-DATETIME', 'CONCATENATE', 'CURRENT-DATE',
+            'DATE-OF-INTEGER', 'DATE-TO-YYYYMMDD', 'DAY-TO-YYYYDDD',
+            'DAY-OF-INTEGER', 'DISPLAY-OF', 'E', 'EXCEPTION-FILE',
+            'EXCEPTION-FILE-N', 'EXCEPTION-LOCATION',
+            'EXCEPTION-LOCATION-N', 'EXCEPTION-STATEMENT', 'EXCEPTION-STATUS',
+            'EXP', 'EXP10', 'FACTORIAL', 'FORMATTED-CURRENT-DATE',
+            'FORMATTED-DATE', 'FORMATTED-DATETIME', 'FORMATTED-TIME',
+            'FRACTION-PART', 'HIGHEST-ALGEBRAIC', 'INTEGER',
+            'INTEGER-OF-BOOLEAN', 'INTEGER-OF-DATE', 'INTEGER-OF-DAY',
+            'INTEGER-OF-FORMATTED-DATE', 'INTEGER-PART', 'LENGTH',
+            'LOCALE-COMPARE',
+            'LOCALE-DATE', 'LOCALE-TIME', 'LOCALE-TIME-FROM-SECONDS',
+            'LOCALE-TIME-FROM-SECS', 'LOG',
+            'LOG10', 'LOWER-CASE', 'LOWEST-ALGEBRAIC',
+            'MAX', 'MEAN', 'MEDIAN', 'MIDRANGE',
+            'MIN', 'MOD', 'NATIONAL-OF', 'NUMVAL', 'NUMVAL-C', 'NUMVAL-F',
+            'ORD', 'ORD-MAX', 'ORD-MIN',
+            'PI', 'PRESENT-VALUE', 'RANDOM', 'RANGE', 'REM', 'REVERSE',
+            'SECONDS-FROM-FORMATTED-TIME', 'SIGN', 'SIN', 'SQRT',
+            'SECONDS-PAST-MIDNIGHT', 'STANDARD-DEVIATION', 'STANDARD-COMPARE',
+            'STORED-CHAR-LENGTH',
+            'SUBSTITUTE', 'SUBSTITUE-CASE', 'SUM', 'TAN', 'TEST-DATE-YYYYMMDD',
+            'TEST-DAY-YYYYDDD', 'TEST-FORMATTED-TIME', 'TEST-NUMVAL',
+            'TEST-NUMVAL-C', 'TEST-NUMVAL-F',
+            'TRIM', 'UPPER-CASE', 'VARIANCE', 'YEAR-TO-YYYY', 'WHEN-COMPILED'
+            ),
+        ),
+    'SYMBOLS' => array(
+        //  Arithmetic and comparison operators must be surrounded by spaces.
+        ' + ', ' - ', ' * ', ' / ', ' ** ', ' ^ ',
+        '.', ',',
+        ' = ', ' < ', ' > ', ' >= ', ' <= ', ' <> ',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #008000; font-weight: bold;',
+            3 => 'color: #000000; font-weight: bold;',
+            4 => 'color: #9d7700;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #a0a0a0; font-style: italic;',
+            2 => 'color: #000080; font-weight: bold;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #993399;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #800080;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9-\$_\|\#|^&])',
+        ),
+    ),
+);
diff --git a/vendor/easybook/geshi/geshi/coffeescript.php b/vendor/easybook/geshi/geshi/coffeescript.php
new file mode 100755
index 000000000..194aecd08
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/coffeescript.php
@@ -0,0 +1,146 @@
+<?php
+/*************************************************************************************
+ * coffeescript.php
+ * ----------
+ * Author: Trevor Burnham (trevorburnham@gmail.com)
+ * Copyright: (c) 2010 Trevor Burnham (http://iterative.ly)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/06/08
+ *
+ * CoffeeScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/06/08 (1.0.8.9)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CoffeeScript',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('###' => '###'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    //Longest quotemarks ALWAYS first
+    'QUOTEMARKS' => array('"""', "'''", '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+
+        /*
+        ** Set 1: control keywords
+        */
+        1 => array(
+            'break', 'by', 'catch', 'continue', 'else', 'finally', 'for', 'in', 'of', 'if',
+            'return', 'switch', 'then', 'throw', 'try', 'unless', 'when', 'while', 'until'
+            ),
+
+        /*
+        ** Set 2: logic keywords
+        */
+        2 => array(
+            'and', 'or', 'is', 'isnt', 'not'
+            ),
+
+        /*
+        ** Set 3: other keywords
+        */
+        3 => array(
+            'instanceof', 'new', 'delete', 'typeof',
+            'class', 'super', 'this', 'extends'
+            ),
+
+        /*
+        ** Set 4: constants
+        */
+        4 => array(
+            'true', 'false', 'on', 'off', 'yes', 'no',
+            'Infinity', 'NaN', 'undefined', 'null'
+            )
+        ),
+    'SYMBOLS' => array(
+            '(', ')', '[', ']', '{', '}', '*', '&', '|', '%', '!', ',', ';', '<', '>', '?', '`',
+            '+', '-', '*', '/', '->', '=>', '<<', '>>', '@', ':', '^'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',
+            2 => 'color: #008000;',
+            3 => 'color: #dc143c;',
+            4 => 'color: #0000cd;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<script type="text/coffeescript">' => '</script>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/cpp-qt.php b/vendor/easybook/geshi/geshi/cpp-qt.php
new file mode 100755
index 000000000..5a23f5854
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cpp-qt.php
@@ -0,0 +1,570 @@
+<?php
+/*************************************************************************************
+ * cpp.php
+ * -------
+ * Author: Iulian M
+ * Copyright: (c) 2006 Iulian M
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/09/27
+ *
+ * C++ (with Qt extensions) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/06/28 (1.0.8.4)
+ *   -  Updated list of Keywords from Qt 4.5
+ *
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C++ (Qt)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //C++ 11 string literal extensions
+        3 => '/(?:L|u8?|U)(?=")/',
+        //C++ 11 string literal extensions (raw)
+        4 => '/R"([^()\s\\\\]*)\((?:(?!\)\\1").)*\)\\1"/ms'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
+            'switch', 'while', 'delete', 'new', 'this'
+            ),
+        2 => array(
+            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class' ,
+            'foreach','connect', 'Q_OBJECT' , 'slots' , 'signals', 'Q_SIGNALS', 'Q_SLOTS',
+            'Q_FOREACH', 'QCOMPARE', 'QVERIFY', 'qDebug', 'kDebug', 'QBENCHMARK'
+            ),
+        3 => array(
+            'cin', 'cerr', 'clog', 'cout',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
+            ),
+        5 => array(
+            "Q_UINT16", "Q_UINT32", "Q_UINT64", "Q_UINT8", "Q_ULLONG",
+            "Q_ULONG", "Q3Accel", "Q3Action", "Q3ActionGroup", "Q3AsciiBucket",
+            "Q3AsciiCache", "Q3AsciiCacheIterator", "Q3AsciiDict",
+            "Q3AsciiDictIterator", "Q3BaseBucket", "Q3BoxLayout", "Q3Button",
+            "Q3ButtonGroup", "Q3Cache", "Q3CacheIterator", "Q3Canvas",
+            "Q3CanvasEllipse", "Q3CanvasItem", "Q3CanvasItemList",
+            "Q3CanvasLine", "Q3CanvasPixmap", "Q3CanvasPixmapArray",
+            "Q3CanvasPolygon", "Q3CanvasPolygonalItem", "Q3CanvasRectangle",
+            "Q3CanvasSpline", "Q3CanvasSprite", "Q3CanvasText", "Q3CanvasView",
+            "Q3CheckListItem", "Q3CheckTableItem", "Q3CleanupHandler",
+            "Q3ColorDrag", "Q3ComboBox", "Q3ComboTableItem", "Q3CString",
+            "Q3DataBrowser", "Q3DataTable", "Q3DataView", "Q3DateEdit",
+            "Q3DateTimeEdit", "Q3DateTimeEditBase", "Q3DeepCopy", "Q3Dict",
+            "Q3DictIterator", "Q3Dns", "Q3DnsSocket", "Q3DockArea",
+            "Q3DockAreaLayout", "Q3DockWindow", "Q3DragObject", "Q3DropSite",
+            "Q3EditorFactory", "Q3FileDialog", "Q3FileIconProvider",
+            "Q3FilePreview", "Q3Frame", "Q3Ftp", "Q3GArray", "Q3GCache",
+            "Q3GCacheIterator", "Q3GDict", "Q3GDictIterator", "Q3GList",
+            "Q3GListIterator", "Q3GListStdIterator", "Q3Grid", "Q3GridLayout",
+            "Q3GridView", "Q3GroupBox", "Q3GVector", "Q3HBox", "Q3HBoxLayout",
+            "Q3HButtonGroup", "Q3Header", "Q3HGroupBox", "Q3Http",
+            "Q3HttpHeader", "Q3HttpRequestHeader", "Q3HttpResponseHeader",
+            "Q3IconDrag", "Q3IconDragItem", "Q3IconView", "Q3IconViewItem",
+            "Q3ImageDrag", "Q3IntBucket", "Q3IntCache", "Q3IntCacheIterator",
+            "Q3IntDict", "Q3IntDictIterator", "Q3ListBox", "Q3ListBoxItem",
+            "Q3ListBoxPixmap", "Q3ListBoxText", "Q3ListView", "Q3ListViewItem",
+            "Q3ListViewItemIterator", "Q3LNode", "Q3LocalFs", "Q3MainWindow",
+            "Q3MemArray", "Q3MimeSourceFactory", "Q3MultiLineEdit",
+            "Q3NetworkOperation", "Q3NetworkProtocol", "Q3NetworkProtocolDict",
+            "Q3NetworkProtocolFactory", "Q3NetworkProtocolFactoryBase",
+            "Q3ObjectDictionary", "Q3PaintDeviceMetrics", "Q3Painter",
+            "Q3Picture", "Q3PointArray", "Q3PolygonScanner", "Q3PopupMenu",
+            "Q3Process", "Q3ProgressBar", "Q3ProgressDialog", "Q3PtrBucket",
+            "Q3PtrCollection", "Q3PtrDict", "Q3PtrDictIterator", "Q3PtrList",
+            "Q3PtrListIterator", "Q3PtrListStdIterator", "Q3PtrQueue",
+            "Q3PtrStack", "Q3PtrVector", "Q3RangeControl", "Q3ScrollView",
+            "Q3Semaphore", "Q3ServerSocket", "Q3Shared", "Q3Signal",
+            "Q3SimpleRichText", "Q3SingleCleanupHandler", "Q3Socket",
+            "Q3SocketDevice", "Q3SortedList", "Q3SpinWidget", "Q3SqlCursor",
+            "Q3SqlEditorFactory", "Q3SqlFieldInfo", "Q3SqlFieldInfoList",
+            "Q3SqlForm", "Q3SqlPropertyMap", "Q3SqlRecordInfo",
+            "Q3SqlSelectCursor", "Q3StoredDrag", "Q3StrIList", "Q3StringBucket",
+            "Q3StrIVec", "Q3StrList", "Q3StrListIterator", "Q3StrVec",
+            "Q3StyleSheet", "Q3StyleSheetItem", "Q3SyntaxHighlighter",
+            "Q3TabDialog", "Q3Table", "Q3TableItem", "Q3TableSelection",
+            "Q3TextBrowser", "Q3TextDrag", "Q3TextEdit",
+            "Q3TextEditOptimPrivate", "Q3TextStream", "Q3TextView",
+            "Q3TimeEdit", "Q3ToolBar", "Q3TSFUNC", "Q3UriDrag", "Q3Url",
+            "Q3UrlOperator", "Q3ValueList", "Q3ValueListConstIterator",
+            "Q3ValueListIterator", "Q3ValueStack", "Q3ValueVector", "Q3VBox",
+            "Q3VBoxLayout", "Q3VButtonGroup", "Q3VGroupBox", "Q3WhatsThis",
+            "Q3WidgetStack", "Q3Wizard", "QAbstractButton",
+            "QAbstractEventDispatcher", "QAbstractExtensionFactory",
+            "QAbstractExtensionManager", "QAbstractFileEngine",
+            "QAbstractFileEngineHandler", "QAbstractFileEngineIterator",
+            "QAbstractFormBuilder", "QAbstractGraphicsShapeItem",
+            "QAbstractItemDelegate", "QAbstractItemModel", "QAbstractItemView",
+            "QAbstractListModel", "QAbstractMessageHandler",
+            "QAbstractNetworkCache", "QAbstractPageSetupDialog",
+            "QAbstractPrintDialog", "QAbstractProxyModel",
+            "QAbstractScrollArea", "QAbstractSlider", "QAbstractSocket",
+            "QAbstractSpinBox", "QAbstractTableModel",
+            "QAbstractTextDocumentLayout", "QAbstractUndoItem",
+            "QAbstractUriResolver", "QAbstractXmlNodeModel",
+            "QAbstractXmlReceiver", "QAccessible", "QAccessible2Interface",
+            "QAccessibleApplication", "QAccessibleBridge",
+            "QAccessibleBridgeFactoryInterface", "QAccessibleBridgePlugin",
+            "QAccessibleEditableTextInterface", "QAccessibleEvent",
+            "QAccessibleFactoryInterface", "QAccessibleInterface",
+            "QAccessibleInterfaceEx", "QAccessibleObject",
+            "QAccessibleObjectEx", "QAccessiblePlugin",
+            "QAccessibleSimpleEditableTextInterface",
+            "QAccessibleTableInterface", "QAccessibleTextInterface",
+            "QAccessibleValueInterface", "QAccessibleWidget",
+            "QAccessibleWidgetEx", "QAction", "QActionEvent", "QActionGroup",
+            "QApplication", "QArgument", "QAssistantClient", "QAtomicInt",
+            "QAtomicPointer", "QAuthenticator", "QBasicAtomicInt",
+            "QBasicAtomicPointer", "QBasicTimer", "QBitArray", "QBitmap",
+            "QBitRef", "QBool", "QBoxLayout", "QBrush", "QBrushData", "QBuffer",
+            "QButtonGroup", "QByteArray", "QByteArrayMatcher", "QByteRef",
+            "QCache", "QCalendarWidget", "QCDEStyle", "QChar", "QCharRef",
+            "QCheckBox", "QChildEvent", "QCleanlooksStyle", "QClipboard",
+            "QClipboardEvent", "QCloseEvent", "QColor", "QColorDialog",
+            "QColorGroup", "QColormap", "QColumnView", "QComboBox",
+            "QCommandLinkButton", "QCommonStyle", "QCompleter",
+            "QConicalGradient", "QConstString", "QContextMenuEvent", "QCOORD",
+            "QCoreApplication", "QCryptographicHash", "QCursor", "QCursorShape",
+            "QCustomEvent", "QDataStream", "QDataWidgetMapper", "QDate",
+            "QDateEdit", "QDateTime", "QDateTimeEdit", "QDB2Driver",
+            "QDB2Result", "QDBusAbstractAdaptor", "QDBusAbstractInterface",
+            "QDBusArgument", "QDBusConnection", "QDBusConnectionInterface",
+            "QDBusContext", "QDBusError", "QDBusInterface", "QDBusMessage",
+            "QDBusMetaType", "QDBusObjectPath", "QDBusPendingCall",
+            "QDBusPendingCallWatcher", "QDBusPendingReply",
+            "QDBusPendingReplyData", "QDBusReply", "QDBusServer",
+            "QDBusSignature", "QDBusVariant", "QDebug",
+            "QDesignerActionEditorInterface", "QDesignerBrushManagerInterface",
+            "QDesignerComponents", "QDesignerContainerExtension",
+            "QDesignerCustomWidgetCollectionInterface",
+            "QDesignerCustomWidgetInterface", "QDesignerDnDItemInterface",
+            "QDesignerDynamicPropertySheetExtension", "QDesignerExportWidget",
+            "QDesignerExtraInfoExtension", "QDesignerFormEditorInterface",
+            "QDesignerFormEditorPluginInterface", "QDesignerFormWindowCursorInterface",
+            "QDesignerFormWindowInterface", "QDesignerFormWindowManagerInterface",
+            "QDesignerFormWindowToolInterface",
+            "QDesignerIconCacheInterface", "QDesignerIntegrationInterface",
+            "QDesignerLanguageExtension", "QDesignerLayoutDecorationExtension",
+            "QDesignerMemberSheetExtension", "QDesignerMetaDataBaseInterface",
+            "QDesignerMetaDataBaseItemInterface",
+            "QDesignerObjectInspectorInterface", "QDesignerPromotionInterface",
+            "QDesignerPropertyEditorInterface",
+            "QDesignerPropertySheetExtension", "QDesignerResourceBrowserInterface",
+            "QDesignerTaskMenuExtension", "QDesignerWidgetBoxInterface",
+            "QDesignerWidgetDataBaseInterface", "QDesignerWidgetDataBaseItemInterface",
+            "QDesignerWidgetFactoryInterface", "QDesktopServices",
+            "QDesktopWidget", "QDial", "QDialog", "QDialogButtonBox", "QDir",
+            "QDirIterator", "QDirModel", "QDockWidget", "QDomAttr",
+            "QDomCDATASection", "QDomCharacterData", "QDomComment",
+            "QDomDocument", "QDomDocumentFragment", "QDomDocumentType",
+            "QDomElement", "QDomEntity", "QDomEntityReference",
+            "QDomImplementation", "QDomNamedNodeMap", "QDomNode",
+            "QDomNodeList", "QDomNotation", "QDomProcessingInstruction",
+            "QDomText", "QDoubleSpinBox", "QDoubleValidator", "QDrag",
+            "QDragEnterEvent", "QDragLeaveEvent", "QDragMoveEvent",
+            "QDragResponseEvent", "QDropEvent", "QDynamicPropertyChangeEvent",
+            "QErrorMessage", "QEvent", "QEventLoop", "QEventSizeOfChecker",
+            "QExplicitlySharedDataPointer", "QExtensionFactory",
+            "QExtensionManager", "QFactoryInterface", "QFile", "QFileDialog",
+            "QFileIconProvider", "QFileInfo", "QFileInfoList",
+            "QFileInfoListIterator", "QFileOpenEvent", "QFileSystemModel",
+            "QFileSystemWatcher", "QFlag", "QFlags", "QFocusEvent",
+            "QFocusFrame", "QFont", "QFontComboBox", "QFontDatabase",
+            "QFontDialog", "QFontInfo", "QFontMetrics", "QFontMetricsF",
+            "QForeachContainer", "QForeachContainerBase", "QFormBuilder",
+            "QFormLayout", "QFrame", "QFSFileEngine", "QFtp", "QFuture",
+            "QFutureInterface", "QFutureInterfaceBase", "QFutureIterator",
+            "QFutureSynchronizer", "QFutureWatcher", "QFutureWatcherBase",
+            "QGenericArgument", "QGenericReturnArgument", "QGLColormap",
+            "QGLContext", "QGLFormat", "QGLFramebufferObject", "QGlobalStatic",
+            "QGlobalStaticDeleter", "QGLPixelBuffer", "QGLWidget", "QGradient",
+            "QGradientStop", "QGradientStops", "QGraphicsEllipseItem",
+            "QGraphicsGridLayout", "QGraphicsItem", "QGraphicsItemAnimation",
+            "QGraphicsItemGroup", "QGraphicsLayout", "QGraphicsLayoutItem",
+            "QGraphicsLinearLayout", "QGraphicsLineItem", "QGraphicsPathItem",
+            "QGraphicsPixmapItem", "QGraphicsPolygonItem",
+            "QGraphicsProxyWidget", "QGraphicsRectItem", "QGraphicsScene",
+            "QGraphicsSceneContextMenuEvent", "QGraphicsSceneDragDropEvent",
+            "QGraphicsSceneEvent", "QGraphicsSceneHelpEvent",
+            "QGraphicsSceneHoverEvent", "QGraphicsSceneMouseEvent",
+            "QGraphicsSceneMoveEvent", "QGraphicsSceneResizeEvent",
+            "QGraphicsSceneWheelEvent", "QGraphicsSimpleTextItem",
+            "QGraphicsSvgItem", "QGraphicsTextItem", "QGraphicsView",
+            "QGraphicsWidget", "QGridLayout", "QGroupBox", "QGtkStyle", "QHash",
+            "QHashData", "QHashDummyNode", "QHashDummyValue", "QHashIterator",
+            "QHashNode", "QHBoxLayout", "QHeaderView", "QHelpContentItem",
+            "QHelpContentModel", "QHelpContentWidget", "QHelpEngine",
+            "QHelpEngineCore", "QHelpEvent", "QHelpGlobal", "QHelpIndexModel",
+            "QHelpIndexWidget", "QHelpSearchEngine", "QHelpSearchQuery",
+            "QHelpSearchQueryWidget", "QHelpSearchResultWidget", "QHideEvent",
+            "QHostAddress", "QHostInfo", "QHoverEvent", "QHttp", "QHttpHeader",
+            "QHttpRequestHeader", "QHttpResponseHeader", "QIBaseDriver",
+            "QIBaseResult", "QIcon", "QIconDragEvent", "QIconEngine",
+            "QIconEngineFactoryInterface", "QIconEngineFactoryInterfaceV2",
+            "QIconEnginePlugin", "QIconEnginePluginV2", "QIconEngineV2",
+            "QIconSet", "QImage", "QImageIOHandler",
+            "QImageIOHandlerFactoryInterface", "QImageIOPlugin", "QImageReader",
+            "QImageTextKeyLang", "QImageWriter", "QIncompatibleFlag",
+            "QInputContext", "QInputContextFactory",
+            "QInputContextFactoryInterface", "QInputContextPlugin",
+            "QInputDialog", "QInputEvent", "QInputMethodEvent", "Q_INT16",
+            "Q_INT32", "Q_INT64", "Q_INT8", "QInternal", "QIntForSize",
+            "QIntForType", "QIntValidator", "QIODevice", "Q_IPV6ADDR",
+            "QIPv6Address", "QItemDelegate", "QItemEditorCreator",
+            "QItemEditorCreatorBase", "QItemEditorFactory", "QItemSelection",
+            "QItemSelectionModel", "QItemSelectionRange", "QKeyEvent",
+            "QKeySequence", "QLabel", "QLatin1Char", "QLatin1String", "QLayout",
+            "QLayoutItem", "QLayoutIterator", "QLCDNumber", "QLibrary",
+            "QLibraryInfo", "QLine", "QLinearGradient", "QLineEdit", "QLineF",
+            "QLinkedList", "QLinkedListData", "QLinkedListIterator",
+            "QLinkedListNode", "QList", "QListData", "QListIterator",
+            "QListView", "QListWidget", "QListWidgetItem", "Q_LLONG", "QLocale",
+            "QLocalServer", "QLocalSocket", "Q_LONG", "QMacCompatGLenum",
+            "QMacCompatGLint", "QMacCompatGLuint", "QMacGLCompatTypes",
+            "QMacMime", "QMacPasteboardMime", "QMainWindow", "QMap", "QMapData",
+            "QMapIterator", "QMapNode", "QMapPayloadNode", "QMatrix",
+            "QMdiArea", "QMdiSubWindow", "QMenu", "QMenuBar",
+            "QMenubarUpdatedEvent", "QMenuItem", "QMessageBox",
+            "QMetaClassInfo", "QMetaEnum", "QMetaMethod", "QMetaObject",
+            "QMetaObjectExtraData", "QMetaProperty", "QMetaType", "QMetaTypeId",
+            "QMetaTypeId2", "QMimeData", "QMimeSource", "QModelIndex",
+            "QModelIndexList", "QMotifStyle", "QMouseEvent", "QMoveEvent",
+            "QMovie", "QMultiHash", "QMultiMap", "QMutableFutureIterator",
+            "QMutableHashIterator", "QMutableLinkedListIterator",
+            "QMutableListIterator", "QMutableMapIterator",
+            "QMutableSetIterator", "QMutableStringListIterator",
+            "QMutableVectorIterator", "QMutex", "QMutexLocker", "QMYSQLDriver",
+            "QMYSQLResult", "QNetworkAccessManager", "QNetworkAddressEntry",
+            "QNetworkCacheMetaData", "QNetworkCookie", "QNetworkCookieJar",
+            "QNetworkDiskCache", "QNetworkInterface", "QNetworkProxy",
+            "QNetworkProxyFactory", "QNetworkProxyQuery", "QNetworkReply",
+            "QNetworkRequest", "QNoDebug", "QNoImplicitBoolCast", "QObject",
+            "QObjectCleanupHandler", "QObjectData", "QObjectList",
+            "QObjectUserData", "QOCIDriver", "QOCIResult", "QODBCDriver",
+            "QODBCResult", "QPageSetupDialog", "QPaintDevice", "QPaintEngine",
+            "QPaintEngineState", "QPainter", "QPainterPath",
+            "QPainterPathPrivate", "QPainterPathStroker", "QPaintEvent",
+            "QPair", "QPalette", "QPen", "QPersistentModelIndex", "QPicture",
+            "QPictureFormatInterface", "QPictureFormatPlugin", "QPictureIO",
+            "Q_PID", "QPixmap", "QPixmapCache", "QPlainTextDocumentLayout",
+            "QPlainTextEdit", "QPlastiqueStyle", "QPluginLoader", "QPoint",
+            "QPointer", "QPointF", "QPolygon", "QPolygonF", "QPrintDialog",
+            "QPrintEngine", "QPrinter", "QPrinterInfo", "QPrintPreviewDialog",
+            "QPrintPreviewWidget", "QProcess", "QProgressBar",
+            "QProgressDialog", "QProxyModel", "QPSQLDriver", "QPSQLResult",
+            "QPushButton", "QQueue", "QRadialGradient", "QRadioButton",
+            "QReadLocker", "QReadWriteLock", "QRect", "QRectF", "QRegExp",
+            "QRegExpValidator", "QRegion", "QResizeEvent", "QResource",
+            "QReturnArgument", "QRgb", "QRubberBand", "QRunnable",
+            "QScriptable", "QScriptClass", "QScriptClassPropertyIterator",
+            "QScriptContext", "QScriptContextInfo", "QScriptContextInfoList",
+            "QScriptEngine", "QScriptEngineAgent", "QScriptEngineDebugger",
+            "QScriptExtensionInterface", "QScriptExtensionPlugin",
+            "QScriptString", "QScriptSyntaxCheckResult", "QScriptValue",
+            "QScriptValueIterator", "QScriptValueList", "QScrollArea",
+            "QScrollBar", "QSemaphore", "QSessionManager", "QSet",
+            "QSetIterator", "QSettings", "QSharedData", "QSharedDataPointer",
+            "QSharedMemory", "QSharedPointer", "QShortcut", "QShortcutEvent",
+            "QShowEvent", "QSignalMapper", "QSignalSpy", "QSimpleXmlNodeModel",
+            "QSize", "QSizeF", "QSizeGrip", "QSizePolicy", "QSlider",
+            "QSocketNotifier", "QSortFilterProxyModel", "QSound",
+            "QSourceLocation", "QSpacerItem", "QSpinBox", "QSplashScreen",
+            "QSplitter", "QSplitterHandle", "QSpontaneKeyEvent", "QSqlDatabase",
+            "QSqlDriver", "QSqlDriverCreator", "QSqlDriverCreatorBase",
+            "QSqlDriverFactoryInterface", "QSqlDriverPlugin", "QSqlError",
+            "QSqlField", "QSqlIndex", "QSQLite2Driver", "QSQLite2Result",
+            "QSQLiteDriver", "QSQLiteResult", "QSqlQuery", "QSqlQueryModel",
+            "QSqlRecord", "QSqlRelation", "QSqlRelationalDelegate",
+            "QSqlRelationalTableModel", "QSqlResult", "QSqlTableModel", "QSsl",
+            "QSslCertificate", "QSslCipher", "QSslConfiguration", "QSslError",
+            "QSslKey", "QSslSocket", "QStack", "QStackedLayout",
+            "QStackedWidget", "QStandardItem", "QStandardItemEditorCreator",
+            "QStandardItemModel", "QStatusBar", "QStatusTipEvent",
+            "QStdWString", "QString", "QStringList", "QStringListIterator",
+            "QStringListModel", "QStringMatcher", "QStringRef", "QStyle",
+            "QStyledItemDelegate", "QStyleFactory", "QStyleFactoryInterface",
+            "QStyleHintReturn", "QStyleHintReturnMask",
+            "QStyleHintReturnVariant", "QStyleOption", "QStyleOptionButton",
+            "QStyleOptionComboBox", "QStyleOptionComplex",
+            "QStyleOptionDockWidget", "QStyleOptionDockWidgetV2",
+            "QStyleOptionFocusRect", "QStyleOptionFrame", "QStyleOptionFrameV2",
+            "QStyleOptionFrameV3", "QStyleOptionGraphicsItem",
+            "QStyleOptionGroupBox", "QStyleOptionHeader",
+            "QStyleOptionMenuItem", "QStyleOptionProgressBar",
+            "QStyleOptionProgressBarV2", "QStyleOptionQ3DockWindow",
+            "QStyleOptionQ3ListView", "QStyleOptionQ3ListViewItem",
+            "QStyleOptionRubberBand", "QStyleOptionSizeGrip",
+            "QStyleOptionSlider", "QStyleOptionSpinBox", "QStyleOptionTab",
+            "QStyleOptionTabBarBase", "QStyleOptionTabBarBaseV2",
+            "QStyleOptionTabV2", "QStyleOptionTabV3",
+            "QStyleOptionTabWidgetFrame", "QStyleOptionTitleBar",
+            "QStyleOptionToolBar", "QStyleOptionToolBox",
+            "QStyleOptionToolBoxV2", "QStyleOptionToolButton",
+            "QStyleOptionViewItem", "QStyleOptionViewItemV2",
+            "QStyleOptionViewItemV3", "QStyleOptionViewItemV4", "QStylePainter",
+            "QStylePlugin", "QSvgGenerator", "QSvgRenderer", "QSvgWidget",
+            "QSyntaxHighlighter", "QSysInfo", "QSystemLocale",
+            "QSystemSemaphore", "QSystemTrayIcon", "Qt", "Qt3Support",
+            "QTabBar", "QTabletEvent", "QTableView", "QTableWidget",
+            "QTableWidgetItem", "QTableWidgetSelectionRange", "QTabWidget",
+            "QtAlgorithms", "QtAssistant", "QtCleanUpFunction",
+            "QtConcurrentFilter", "QtConcurrentMap", "QtConcurrentRun",
+            "QtContainerFwd", "QtCore", "QTcpServer", "QTcpSocket", "QtDBus",
+            "QtDebug", "QtDesigner", "QTDSDriver", "QTDSResult",
+            "QTemporaryFile", "QtEndian", "QTest", "QTestAccessibility",
+            "QTestAccessibilityEvent", "QTestData", "QTestDelayEvent",
+            "QTestEvent", "QTestEventList", "QTestEventLoop",
+            "QTestKeyClicksEvent", "QTestKeyEvent", "QTestMouseEvent",
+            "QtEvents", "QTextBlock", "QTextBlockFormat", "QTextBlockGroup",
+            "QTextBlockUserData", "QTextBoundaryFinder", "QTextBrowser",
+            "QTextCharFormat", "QTextCodec", "QTextCodecFactoryInterface",
+            "QTextCodecPlugin", "QTextCursor", "QTextDecoder", "QTextDocument",
+            "QTextDocumentFragment", "QTextDocumentWriter", "QTextEdit",
+            "QTextEncoder", "QTextFormat", "QTextFragment", "QTextFrame",
+            "QTextFrameFormat", "QTextFrameLayoutData", "QTextImageFormat",
+            "QTextInlineObject", "QTextIStream", "QTextItem", "QTextLayout",
+            "QTextLength", "QTextLine", "QTextList", "QTextListFormat",
+            "QTextObject", "QTextObjectInterface", "QTextOption",
+            "QTextOStream", "QTextStream", "QTextStreamFunction",
+            "QTextStreamManipulator", "QTextTable", "QTextTableCell",
+            "QTextTableCellFormat", "QTextTableFormat", "QtGlobal", "QtGui",
+            "QtHelp", "QThread", "QThreadPool", "QThreadStorage",
+            "QThreadStorageData", "QTime", "QTimeEdit", "QTimeLine", "QTimer",
+            "QTimerEvent", "QtMsgHandler", "QtNetwork", "QToolBar",
+            "QToolBarChangeEvent", "QToolBox", "QToolButton", "QToolTip",
+            "QtOpenGL", "QtPlugin", "QtPluginInstanceFunction", "QTransform",
+            "QTranslator", "QTreeView", "QTreeWidget", "QTreeWidgetItem",
+            "QTreeWidgetItemIterator", "QTS", "QtScript", "QtScriptTools",
+            "QtSql", "QtSvg", "QtTest", "QtUiTools", "QtWebKit", "QtXml",
+            "QtXmlPatterns", "QTypeInfo", "QUdpSocket", "QUiLoader",
+            "QUintForSize", "QUintForType", "QUndoCommand", "QUndoGroup",
+            "QUndoStack", "QUndoView", "QUnixPrintWidget", "QUpdateLaterEvent",
+            "QUrl", "QUrlInfo", "QUuid", "QValidator", "QVariant",
+            "QVariantComparisonHelper", "QVariantHash", "QVariantList",
+            "QVariantMap", "QVarLengthArray", "QVBoxLayout", "QVector",
+            "QVectorData", "QVectorIterator", "QVectorTypedData",
+            "QWaitCondition", "QWeakPointer", "QWebDatabase", "QWebFrame",
+            "QWebHistory", "QWebHistoryInterface", "QWebHistoryItem",
+            "QWebHitTestResult", "QWebPage", "QWebPluginFactory",
+            "QWebSecurityOrigin", "QWebSettings", "QWebView", "QWhatsThis",
+            "QWhatsThisClickedEvent", "QWheelEvent", "QWidget", "QWidgetAction",
+            "QWidgetData", "QWidgetItem", "QWidgetItemV2", "QWidgetList",
+            "QWidgetMapper", "QWidgetSet", "QWindowsCEStyle", "QWindowsMime",
+            "QWindowsMobileStyle", "QWindowsStyle", "QWindowStateChangeEvent",
+            "QWindowsVistaStyle", "QWindowsXPStyle", "QWizard", "QWizardPage",
+            "QWMatrix", "QWorkspace", "QWriteLocker", "QX11EmbedContainer",
+            "QX11EmbedWidget", "QX11Info", "QXmlAttributes",
+            "QXmlContentHandler", "QXmlDeclHandler", "QXmlDefaultHandler",
+            "QXmlDTDHandler", "QXmlEntityResolver", "QXmlErrorHandler",
+            "QXmlFormatter", "QXmlInputSource", "QXmlItem",
+            "QXmlLexicalHandler", "QXmlLocator", "QXmlName", "QXmlNamePool",
+            "QXmlNamespaceSupport", "QXmlNodeModelIndex", "QXmlParseException",
+            "QXmlQuery", "QXmlReader", "QXmlResultItems", "QXmlSerializer",
+            "QXmlSimpleReader", "QXmlStreamAttribute", "QXmlStreamAttributes",
+            "QXmlStreamEntityDeclaration", "QXmlStreamEntityDeclarations",
+            "QXmlStreamEntityResolver", "QXmlStreamNamespaceDeclaration",
+            "QXmlStreamNamespaceDeclarations", "QXmlStreamNotationDeclaration",
+            "QXmlStreamNotationDeclarations", "QXmlStreamReader",
+            "QXmlStreamStringRef", "QXmlStreamWriter"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', ';', '|', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight:bold;',
+            2 => 'color: #0057AE;',
+            3 => 'color: #2B74C7;',
+            4 => 'color: #0057AE;',
+            5 => 'color: #22aadd;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #888888;',
+            2 => 'color: #006E28;',
+            3 => 'color: #BF0303;',
+            4 => 'color: #BF0303;',
+            'MULTI' => 'color: #888888; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006E28;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #BF0303;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #B08000;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #2B74C7;',
+            2 => 'color: #2B74C7;',
+            3 => 'color: #2B74C7;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006E28;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://doc.trolltech.com/latest/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::',
+        3 => '-&gt;',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        ),
+        'OOLANG' => array(
+            'MATCH_AFTER' => '~?[a-zA-Z][a-zA-Z0-9_]*',
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/cpp-winapi.php b/vendor/easybook/geshi/geshi/cpp-winapi.php
new file mode 100644
index 000000000..ddc70b688
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cpp-winapi.php
@@ -0,0 +1,836 @@
+<?php
+/*************************************************************************************
+ * cpp-winapi.php
+ * -------
+ * Author: Dennis Bayer (Dennis.Bayer@mnifh-giessen.de)
+ * Contributors:
+ *  - M. Uli Kusterer (witness.of.teachtext@gmx.net)
+ *  - Jack Lloyd (lloyd@randombit.net)
+ *  - Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2004 Dennis Bayer, Nigel McNie, 2012 Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/09/27
+ *
+ * C++ language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/XX/XX (1.0.2)
+ *  -  Added several new keywords (Jack Lloyd)
+ * 2004/11/27 (1.0.1)
+ *  -  Added StdCLib function and constant names, changed color scheme to
+ *     a cleaner one. (M. Uli Kusterer)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C++ (WinAPI)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //C++ 11 string literal extensions
+        3 => '/(?:L|u8?|U)(?=")/',
+        //C++ 11 string literal extensions (raw)
+        4 => '/R"([^()\s\\\\]*)\((?:(?!\)\\1").)*\)\\1"/ms'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
+            'switch', 'throw', 'while'
+            ),
+        2 => array(
+            'NULL', 'false', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class'
+            ),
+        3 => array(
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
+            ),
+        // Public API
+        5 => array(
+            'AssignProcessToJobObject', 'CommandLineToArgvW', 'ConvertThreadToFiber',
+            'CreateFiber', 'CreateJobObjectA', 'CreateJobObjectW', 'CreateProcessA',
+            'CreateProcessAsUserA', 'CreateProcessAsUserW', 'CreateProcessW',
+            'CreateRemoteThread', 'CreateThread', 'DeleteFiber', 'ExitProcess',
+            'ExitThread', 'FreeEnvironmentStringsA', 'FreeEnvironmentStringsW',
+            'GetCommandLineA', 'GetCommandLineW', 'GetCurrentProcess',
+            'GetCurrentProcessId', 'GetCurrentThread', 'GetCurrentThreadId',
+            'GetEnvironmentStringsA', 'GetEnvironmentStringsW',
+            'GetEnvironmentVariableA', 'GetEnvironmentVariableW', 'GetExitCodeProcess',
+            'GetExitCodeThread', 'GetGuiResources', 'GetPriorityClass',
+            'GetProcessAffinityMask', 'GetProcessPriorityBoost',
+            'GetProcessShutdownParameters', 'GetProcessTimes', 'GetProcessVersion',
+            'GetProcessWorkingSetSize', 'GetStartupInfoA', 'GetStartupInfoW',
+            'GetThreadPriority', 'GetThreadPriorityBoost', 'GetThreadTimes',
+            'OpenJobObjectA', 'OpenJobObjectW', 'OpenProcess',
+            'QueryInformationJobObject', 'ResumeThread', 'SetEnvironmentVariableA',
+            'SetEnvironmentVariableW', 'SetInformationJobObject', 'SetPriorityClass',
+            'SetProcessAffinityMask', 'SetProcessPriorityBoost',
+            'SetProcessShutdownParameters', 'SetProcessWorkingSetSize',
+            'SetThreadAffinityMask', 'SetThreadIdealProcessor', 'SetThreadPriority',
+            'SetThreadPriorityBoost', 'Sleep', 'SleepEx', 'SuspendThread',
+            'SwitchToFiber', 'SwitchToThread', 'TerminateJobObject', 'TerminateProcess',
+            'TerminateThread', 'WaitForInputIdle', 'WinExec',
+
+            '_hread', '_hwrite', '_lclose', '_lcreat', '_llseek', '_lopen', '_lread',
+            '_lwrite', 'AreFileApisANSI', 'CancelIo', 'CopyFileA', 'CopyFileW',
+            'CreateDirectoryA', 'CreateDirectoryExA', 'CreateDirectoryExW',
+            'CreateDirectoryW', 'CreateFileA', 'CreateFileW', 'DeleteFileA',
+            'DeleteFileW', 'FindClose', 'FindCloseChangeNotification',
+            'FindFirstChangeNotificationA', 'FindFirstChangeNotificationW',
+            'FindFirstFileA', 'FindFirstFileW', 'FindNextFileA', 'FindNextFileW',
+            'FlushFileBuffers', 'GetCurrentDirectoryA', 'GetCurrentDirectoryW',
+            'GetDiskFreeSpaceA', 'GetDiskFreeSpaceExA', 'GetDiskFreeSpaceExW',
+            'GetDiskFreeSpaceW', 'GetDriveTypeA', 'GetDriveTypeW', 'GetFileAttributesA',
+            'GetFileAttributesExA', 'GetFileAttributesExW', 'GetFileAttributesW',
+            'GetFileInformationByHandle', 'GetFileSize', 'GetFileType',
+            'GetFullPathNameA', 'GetFullPathNameW', 'GetLogicalDrives',
+            'GetLogicalDriveStringsA', 'GetLogicalDriveStringsW', 'GetLongPathNameA',
+            'GetLongPathNameW', 'GetShortPathNameA', 'GetShortPathNameW',
+            'GetTempFileNameA', 'GetTempFileNameW', 'GetTempPathA', 'GetTempPathW',
+            'LockFile', 'MoveFileA', 'MoveFileW', 'MulDiv', 'OpenFile',
+            'QueryDosDeviceA', 'QueryDosDeviceW', 'ReadFile', 'ReadFileEx',
+            'RemoveDirectoryA', 'RemoveDirectoryW', 'SearchPathA', 'SearchPathW',
+            'SetCurrentDirectoryA', 'SetCurrentDirectoryW', 'SetEndOfFile',
+            'SetFileApisToANSI', 'SetFileApisToOEM', 'SetFileAttributesA',
+            'SetFileAttributesW', 'SetFilePointer', 'SetHandleCount',
+            'SetVolumeLabelA', 'SetVolumeLabelW', 'UnlockFile', 'WriteFile',
+            'WriteFileEx',
+
+            'DeviceIoControl',
+
+            'GetModuleFileNameA', 'GetModuleFileNameW', 'GetProcAddress',
+            'LoadLibraryA', 'LoadLibraryExA', 'LoadLibraryExW', 'LoadLibraryW',
+            'LoadModule',
+
+            'GetPrivateProfileIntA', 'GetPrivateProfileIntW',
+            'GetPrivateProfileSectionA', 'GetPrivateProfileSectionNamesA',
+            'GetPrivateProfileSectionNamesW', 'GetPrivateProfileSectionW',
+            'GetPrivateProfileStringA', 'GetPrivateProfileStringW',
+            'GetPrivateProfileStructA', 'GetPrivateProfileStructW',
+            'GetProfileIntA', 'GetProfileIntW', 'GetProfileSectionA',
+            'GetProfileSectionW', 'GetProfileStringA', 'GetProfileStringW',
+            'RegCloseKey', 'RegConnectRegistryA', 'RegConnectRegistryW',
+            'RegCreateKeyA', 'RegCreateKeyExA', 'RegCreateKeyExW',
+            'RegCreateKeyW', 'RegDeleteKeyA', 'RegDeleteKeyW', 'RegDeleteValueA',
+            'RegDeleteValueW', 'RegEnumKeyA', 'RegEnumKeyExA', 'RegEnumKeyExW',
+            'RegEnumKeyW', 'RegEnumValueA', 'RegEnumValueW', 'RegFlushKey',
+            'RegGetKeySecurity', 'RegLoadKeyA', 'RegLoadKeyW',
+            'RegNotifyChangeKeyValue', 'RegOpenKeyA', 'RegOpenKeyExA', 'RegOpenKeyExW',
+            'RegOpenKeyW', 'RegOverridePredefKey', 'RegQueryInfoKeyA',
+            'RegQueryInfoKeyW', 'RegQueryMultipleValuesA', 'RegQueryMultipleValuesW',
+            'RegQueryValueA', 'RegQueryValueExA', 'RegQueryValueExW', 'RegQueryValueW',
+            'RegReplaceKeyA', 'RegReplaceKeyW', 'RegRestoreKeyA', 'RegRestoreKeyW',
+            'RegSaveKeyA', 'RegSaveKeyW', 'RegSetKeySecurity', 'RegSetValueA',
+            'RegSetValueExA', 'RegSetValueExW', 'RegSetValueW', 'RegUnLoadKeyA',
+            'RegUnLoadKeyW', 'WritePrivateProfileSectionA', 'WritePrivateProfileSectionW',
+            'WritePrivateProfileStringA', 'WritePrivateProfileStringW',
+            'WritePrivateProfileStructA', 'WritePrivateProfileStructW',
+            'WriteProfileSectionA', 'WriteProfileSectionW', 'WriteProfileStringA',
+            'WriteProfileStringW',
+
+            'AccessCheck', 'AccessCheckAndAuditAlarmA', 'AccessCheckAndAuditAlarmW',
+            'AccessCheckByType', 'AccessCheckByTypeAndAuditAlarmA',
+            'AccessCheckByTypeAndAuditAlarmW', 'AccessCheckByTypeResultList',
+            'AccessCheckByTypeResultListAndAuditAlarmA', 'AccessCheckByTypeResultListAndAuditAlarmW',
+            'AddAccessAllowedAce', 'AddAccessAllowedAceEx', 'AddAccessAllowedObjectAce',
+            'AddAccessDeniedAce', 'AddAccessDeniedAceEx', 'AddAccessDeniedObjectAce',
+            'AddAce', 'AddAuditAccessAce', 'AddAuditAccessAceEx', 'AddAuditAccessObjectAce',
+            'AdjustTokenGroups', 'AdjustTokenPrivileges', 'AllocateAndInitializeSid',
+            'AllocateLocallyUniqueId', 'AreAllAccessesGranted', 'AreAnyAccessesGranted',
+            'BuildExplicitAccessWithNameA', 'BuildExplicitAccessWithNameW',
+            'BuildImpersonateExplicitAccessWithNameA', 'BuildImpersonateExplicitAccessWithNameW',
+            'BuildImpersonateTrusteeA', 'BuildImpersonateTrusteeW', 'BuildSecurityDescriptorA',
+            'BuildSecurityDescriptorW', 'BuildTrusteeWithNameA', 'BuildTrusteeWithNameW',
+            'BuildTrusteeWithSidA', 'BuildTrusteeWithSidW',
+            'ConvertToAutoInheritPrivateObjectSecurity', 'CopySid', 'CreatePrivateObjectSecurity',
+            'CreatePrivateObjectSecurityEx', 'CreateRestrictedToken', 'DeleteAce',
+            'DestroyPrivateObjectSecurity', 'DuplicateToken', 'DuplicateTokenEx',
+            'EqualPrefixSid', 'EqualSid', 'FindFirstFreeAce', 'FreeSid', 'GetAce',
+            'GetAclInformation', 'GetAuditedPermissionsFromAclA', 'GetAuditedPermissionsFromAclW',
+            'GetEffectiveRightsFromAclA', 'GetEffectiveRightsFromAclW',
+            'GetExplicitEntriesFromAclA', 'GetExplicitEntriesFromAclW', 'GetFileSecurityA',
+            'GetFileSecurityW', 'GetKernelObjectSecurity', 'GetLengthSid', 'GetMultipleTrusteeA',
+            'GetMultipleTrusteeOperationA', 'GetMultipleTrusteeOperationW', 'GetMultipleTrusteeW',
+            'GetNamedSecurityInfoA', 'GetNamedSecurityInfoW', 'GetPrivateObjectSecurity',
+            'GetSecurityDescriptorControl', 'GetSecurityDescriptorDacl',
+            'GetSecurityDescriptorGroup', 'GetSecurityDescriptorLength',
+            'GetSecurityDescriptorOwner', 'GetSecurityDescriptorSacl', 'GetSecurityInfo',
+            'GetSidIdentifierAuthority', 'GetSidLengthRequired', 'GetSidSubAuthority',
+            'GetSidSubAuthorityCount', 'GetTokenInformation', 'GetTrusteeFormA',
+            'GetTrusteeFormW', 'GetTrusteeNameA', 'GetTrusteeNameW', 'GetTrusteeTypeA',
+            'GetTrusteeTypeW', 'GetUserObjectSecurity', 'ImpersonateLoggedOnUser',
+            'ImpersonateNamedPipeClient', 'ImpersonateSelf', 'InitializeAcl',
+            'InitializeSecurityDescriptor', 'InitializeSid', 'IsTokenRestricted', 'IsValidAcl',
+            'IsValidSecurityDescriptor', 'IsValidSid', 'LogonUserA', 'LogonUserW',
+            'LookupAccountNameA', 'LookupAccountNameW', 'LookupAccountSidA', 'LookupAccountSidW',
+            'LookupPrivilegeDisplayNameA', 'LookupPrivilegeDisplayNameW', 'LookupPrivilegeNameA',
+            'LookupPrivilegeNameW', 'LookupPrivilegeValueA', 'LookupPrivilegeValueW',
+            'LookupSecurityDescriptorPartsA', 'LookupSecurityDescriptorPartsW', 'MakeAbsoluteSD',
+            'MakeSelfRelativeSD', 'MapGenericMask', 'ObjectCloseAuditAlarmA',
+            'ObjectCloseAuditAlarmW', 'ObjectDeleteAuditAlarmA', 'ObjectDeleteAuditAlarmW',
+            'ObjectOpenAuditAlarmA', 'ObjectOpenAuditAlarmW', 'ObjectPrivilegeAuditAlarmA',
+            'ObjectPrivilegeAuditAlarmW', 'OpenProcessToken', 'OpenThreadToken', 'PrivilegeCheck',
+            'PrivilegedServiceAuditAlarmA', 'PrivilegedServiceAuditAlarmW', 'RevertToSelf',
+            'SetAclInformation', 'SetEntriesInAclA', 'SetEntriesInAclW', 'SetFileSecurityA',
+            'SetFileSecurityW', 'SetKernelObjectSecurity', 'SetNamedSecurityInfoA',
+            'SetNamedSecurityInfoW', 'SetPrivateObjectSecurity', 'SetPrivateObjectSecurityEx',
+            'SetSecurityDescriptorControl', 'SetSecurityDescriptorDacl',
+            'SetSecurityDescriptorGroup', 'SetSecurityDescriptorOwner',
+            'SetSecurityDescriptorSacl', 'SetSecurityInfo', 'SetThreadToken',
+            'SetTokenInformation', 'SetUserObjectSecurity', 'ChangeServiceConfig2A',
+            'ChangeServiceConfig2W', 'ChangeServiceConfigA', 'ChangeServiceConfigW',
+            'CloseServiceHandle', 'ControlService', 'CreateServiceA', 'CreateServiceW',
+            'DeleteService', 'EnumDependentServicesA', 'EnumDependentServicesW',
+            'EnumServicesStatusA', 'EnumServicesStatusW', 'GetServiceDisplayNameA',
+            'GetServiceDisplayNameW', 'GetServiceKeyNameA', 'GetServiceKeyNameW',
+            'LockServiceDatabase', 'NotifyBootConfigStatus', 'OpenSCManagerA', 'OpenSCManagerW',
+            'OpenServiceA', 'OpenServiceW', 'QueryServiceConfig2A', 'QueryServiceConfig2W',
+            'QueryServiceConfigA', 'QueryServiceConfigW', 'QueryServiceLockStatusA',
+            'QueryServiceLockStatusW', 'QueryServiceObjectSecurity', 'QueryServiceStatus',
+            'RegisterServiceCtrlHandlerA', 'RegisterServiceCtrlHandlerW',
+            'SetServiceObjectSecurity', 'SetServiceStatus', 'StartServiceA',
+            'StartServiceCtrlDispatcherA', 'StartServiceCtrlDispatcherW', 'StartServiceW',
+            'UnlockServiceDatabase',
+
+            'MultinetGetConnectionPerformanceA', 'MultinetGetConnectionPerformanceW',
+            'NetAlertRaise', 'NetAlertRaiseEx', 'NetApiBufferAllocate', 'NetApiBufferFree',
+            'NetApiBufferReallocate', 'NetApiBufferSize', 'NetConnectionEnum', 'NetFileClose',
+            'NetFileGetInfo', 'NetGetAnyDCName', 'NetGetDCName', 'NetGetDisplayInformationIndex',
+            'NetGroupAdd', 'NetGroupAddUser', 'NetGroupDel', 'NetGroupDelUser', 'NetGroupEnum',
+            'NetGroupGetInfo', 'NetGroupGetUsers', 'NetGroupSetInfo', 'NetGroupSetUsers',
+            'NetLocalGroupAdd', 'NetLocalGroupAddMember', 'NetLocalGroupAddMembers',
+            'NetLocalGroupDel', 'NetLocalGroupDelMember', 'NetLocalGroupDelMembers',
+            'NetLocalGroupEnum', 'NetLocalGroupGetInfo', 'NetLocalGroupGetMembers',
+            'NetLocalGroupSetInfo', 'NetLocalGroupSetMembers', 'NetMessageBufferSend',
+            'NetMessageNameAdd', 'NetMessageNameDel', 'NetMessageNameEnum',
+            'NetMessageNameGetInfo', 'NetQueryDisplayInformation', 'NetRemoteComputerSupports',
+            'NetRemoteTOd', 'NetReplExportDirAdd', 'NetReplExportDirDel', 'NetReplExportDirEnum',
+            'NetReplExportDirGetInfo', 'NetReplExportDirLock', 'NetReplExportDirSetInfo',
+            'NetReplExportDirUnlock', 'NetReplGetInfo', 'NetReplImportDirAdd',
+            'NetReplImportDirDel', 'NetReplImportDirEnum', 'NetReplImportDirGetInfo',
+            'NetReplImportDirLock', 'NetReplImportDirUnlock', 'NetReplSetInfo',
+            'NetScheduleJobAdd', 'NetScheduleJobDel', 'NetScheduleJobEnum',
+            'NetScheduleJobGetInfo', 'NetServerComputerNameAdd', 'NetServerComputerNameDel',
+            'NetServerDiskEnum', 'NetServerEnum', 'NetServerEnumEx', 'NetServerGetInfo',
+            'NetServerSetInfo', 'NetServerTransportAdd', 'NetServerTransportAddEx',
+            'NetServerTransportDel', 'NetServerTransportEnum', 'NetSessionDel', 'NetSessionEnum',
+            'NetSessionGetInfo', 'NetShareAdd', 'NetShareCheck', 'NetShareDel', 'NetShareEnum',
+            'NetShareGetInfo', 'NetShareSetInfo', 'NetStatisticsGet', 'NetUseAdd', 'NetUseDel',
+            'NetUseEnum', 'NetUseGetInfo', 'NetUserAdd', 'NetUserChangePassword', 'NetUserDel',
+            'NetUserEnum', 'NetUserGetGroups', 'NetUserGetInfo', 'NetUserGetLocalGroups',
+            'NetUserModalsGet', 'NetUserModalsSet', 'NetUserSetGroups', 'NetUserSetInfo',
+            'NetWkstaGetInfo', 'NetWkstaSetInfo', 'NetWkstaTransportAdd', 'NetWkstaTransportDel',
+            'NetWkstaTransportEnum', 'NetWkstaUserEnum', 'NetWkstaUserGetInfo',
+            'NetWkstaUserSetInfo', 'WNetAddConnection2A', 'WNetAddConnection2W',
+            'WNetAddConnection3A', 'WNetAddConnection3W', 'WNetAddConnectionA',
+            'WNetAddConnectionW', 'WNetCancelConnection2A', 'WNetCancelConnection2W',
+            'WNetCancelConnectionA', 'WNetCancelConnectionW', 'WNetCloseEnum',
+            'WNetConnectionDialog', 'WNetConnectionDialog1A', 'WNetConnectionDialog1W',
+            'WNetDisconnectDialog', 'WNetDisconnectDialog1A', 'WNetDisconnectDialog1W',
+            'WNetEnumResourceA', 'WNetEnumResourceW', 'WNetGetConnectionA', 'WNetGetConnectionW',
+            'WNetGetLastErrorA', 'WNetGetLastErrorW', 'WNetGetNetworkInformationA',
+            'WNetGetNetworkInformationW', 'WNetGetProviderNameA', 'WNetGetProviderNameW',
+            'WNetGetResourceInformationA', 'WNetGetResourceInformationW',
+            'WNetGetResourceParentA', 'WNetGetResourceParentW', 'WNetGetUniversalNameA',
+            'WNetGetUniversalNameW', 'WNetGetUserA', 'WNetGetUserW', 'WNetOpenEnumA',
+            'WNetOpenEnumW', 'WNetUseConnectionA', 'WnetUseConnectionW',
+
+            'accept', 'bind', 'closesocket', 'connect', 'gethostbyaddr', 'gethostbyname',
+            'gethostname', 'getpeername', 'getprotobyname', 'getprotobynumber', 'getservbyname',
+            'getservbyport', 'getsockname', 'getsockopt', 'htonl', 'htons', 'inet_addr',
+            'inet_ntoa', 'ioctlsocket', 'listen', 'ntohl', 'ntohs', 'recv', 'recvfrom', 'select',
+            'send', 'sendto', 'setsockopt', 'shutdown', 'socket', 'WSAAccept',
+            'WSAAddressToStringA', 'WSAAddressToStringW', 'WSAAsyncGetHostByAddr',
+            'WSAAsyncGetHostByName', 'WSAAsyncGetProtoByName', 'WSAAsyncGetProtoByNumber',
+            'WSAAsyncGetServByName', 'WSAAsyncGetServByPort', 'WSAAsyncSelect',
+            'WSACancelAsyncRequest', 'WSACancelBlockingCall', 'WSACleanup', 'WSACloseEvent',
+            'WSAConnect', 'WSACreateEvent', 'WSADuplicateSocketA', 'WSADuplicateSocketW',
+            'WSAEnumNameSpaceProvidersA', 'WSAEnumNameSpaceProvidersW', 'WSAEnumNetworkEvents',
+            'WSAEnumProtocolsA', 'WSAEnumProtocolsW', 'WSAEventSelect', 'WSAGetLastError',
+            'WSAGetOverlappedResult', 'WSAGetQOSByName', 'WSAGetServiceClassInfoA',
+            'WSAGetServiceClassInfoW', 'WSAGetServiceClassNameByClassIdA',
+            'WSAGetServiceClassNameByClassIdW', 'WSAHtonl', 'WSAHtons', 'WSAInstallServiceClassA',
+            'WSAInstallServiceClassW', 'WSAIoctl', 'WSAIsBlocking', 'WSAJoinLeaf',
+            'WSALookupServiceBeginA', 'WSALookupServiceBeginW', 'WSALookupServiceEnd',
+            'WSALookupServiceNextA', 'WSALookupServiceNextW', 'WSANtohl', 'WSANtohs',
+            'WSAProviderConfigChange', 'WSARecv', 'WSARecvDisconnect', 'WSARecvFrom',
+            'WSARemoveServiceClass', 'WSAResetEvent', 'WSASend', 'WSASendDisconnect', 'WSASendTo',
+            'WSASetBlockingHook', 'WSASetEvent', 'WSASetLastError', 'WSASetServiceA',
+            'WSASetServiceW', 'WSASocketA', 'WSASocketW', 'WSAStartup', 'WSAStringToAddressA',
+            'WSAStringToAddressW', 'WSAUnhookBlockingHook', 'WSAWaitForMultipleEvents',
+            'WSCDeinstallProvider', 'WSCEnableNSProvider', 'WSCEnumProtocols',
+            'WSCGetProviderPath', 'WSCInstallNameSpace', 'WSCInstallProvider',
+            'WSCUnInstallNameSpace',
+
+            'ContinueDebugEvent', 'DebugActiveProcess', 'DebugBreak', 'FatalExit',
+            'FlushInstructionCache', 'GetThreadContext', 'GetThreadSelectorEntry',
+            'IsDebuggerPresent', 'OutputDebugStringA', 'OutputDebugStringW', 'ReadProcessMemory',
+            'SetDebugErrorLevel', 'SetThreadContext', 'WaitForDebugEvent', 'WriteProcessMemory',
+
+            'CloseHandle', 'DuplicateHandle', 'GetHandleInformation', 'SetHandleInformation',
+
+            'AdjustWindowRect', 'AdjustWindowRectEx', 'AllowSetForegroundWindow',
+            'AnimateWindow', 'AnyPopup', 'ArrangeIconicWindows', 'BeginDeferWindowPos',
+            'BringWindowToTop', 'CascadeWindows', 'ChildWindowFromPoint',
+            'ChildWindowFromPointEx', 'CloseWindow', 'CreateWindowExA', 'CreateWindowExW',
+            'DeferWindowPos', 'DestroyWindow', 'EndDeferWindowPos', 'EnumChildWindows',
+            'EnumThreadWindows', 'EnumWindows', 'FindWindowA', 'FindWindowExA', 'FindWindowExW',
+            'FindWindowW', 'GetAltTabInfoA', 'GetAltTabInfoW', 'GetAncestor', 'GetClientRect',
+            'GetDesktopWindow', 'GetForegroundWindow', 'GetGUIThreadInfo', 'GetLastActivePopup',
+            'GetLayout', 'GetParent', 'GetProcessDefaultLayout', 'GetTitleBarInf', 'GetTopWindow',
+            'GetWindow', 'GetWindowInfo', 'GetWindowModuleFileNameA', 'GetWindowModuleFileNameW',
+            'GetWindowPlacement', 'GetWindowRect', 'GetWindowTextA', 'GetWindowTextLengthA',
+            'GetWindowTextLengthW', 'GetWindowTextW', 'GetWindowThreadProcessId', 'IsChild',
+            'IsIconic', 'IsWindow', 'IsWindowUnicode', 'IsWindowVisible', 'IsZoomed',
+            'LockSetForegroundWindow', 'MoveWindow', 'OpenIcon', 'RealChildWindowFromPoint',
+            'RealGetWindowClassA', 'RealGetWindowClassW', 'SetForegroundWindow',
+            'SetLayeredWindowAttributes', 'SetLayout', 'SetParent', 'SetProcessDefaultLayout',
+            'SetWindowPlacement', 'SetWindowPos', 'SetWindowTextA', 'SetWindowTextW',
+            'ShowOwnedPopups', 'ShowWindow', 'ShowWindowAsync', 'TileWindows',
+            'UpdateLayeredWindow', 'WindowFromPoint',
+
+            'CreateDialogIndirectParamA', 'CreateDialogIndirectParamW', 'CreateDialogParamA',
+            'CreateDialogParamW', 'DefDlgProcA', 'DefDlgProcW', 'DialogBoxIndirectParamA',
+            'DialogBoxIndirectParamW', 'DialogBoxParamA', 'DialogBoxParamW', 'EndDialog',
+            'GetDialogBaseUnits', 'GetDlgCtrlID', 'GetDlgItem', 'GetDlgItemInt',
+            'GetDlgItemTextA', 'GetDlgItemTextW', 'GetNextDlgGroupItem', 'GetNextDlgTabItem',
+            'IsDialogMessageA', 'IsDialogMessageW', 'MapDialogRect', 'MessageBoxA',
+            'MessageBoxExA', 'MessageBoxExW', 'MessageBoxIndirectA', 'MessageBoxIndirectW',
+            'MessageBoxW', 'SendDlgItemMessageA', 'SendDlgItemMessageW', 'SetDlgItemInt',
+            'SetDlgItemTextA', 'SetDlgItemTextW',
+
+            'GetWriteWatch', 'GlobalMemoryStatus', 'GlobalMemoryStatusEx', 'IsBadCodePtr',
+            'IsBadReadPtr', 'IsBadStringPtrA', 'IsBadStringPtrW', 'IsBadWritePtr',
+            'ResetWriteWatch', 'AllocateUserPhysicalPages', 'FreeUserPhysicalPages',
+            'MapUserPhysicalPages', 'MapUserPhysicalPagesScatter', 'GlobalAlloc', 'GlobalFlags',
+            'GlobalFree', 'GlobalHandle', 'GlobalLock', 'GlobalReAlloc', 'GlobalSize',
+            'GlobalUnlock', 'LocalAlloc', 'LocalFlags', 'LocalFree', 'LocalHandle', 'LocalLock',
+            'LocalReAlloc', 'LocalSize', 'LocalUnlock', 'GetProcessHeap', 'GetProcessHeaps',
+            'HeapAlloc', 'HeapCompact', 'HeapCreate', 'HeapDestroy', 'HeapFree', 'HeapLock',
+            'HeapReAlloc', 'HeapSize', 'HeapUnlock', 'HeapValidate', 'HeapWalk', 'VirtualAlloc',
+            'VirtualAllocEx', 'VirtualFree', 'VirtualFreeEx', 'VirtualLock', 'VirtualProtect',
+            'VirtualProtectEx', 'VirtualQuery', 'VirtualQueryEx', 'VirtualUnlock',
+            'GetFreeSpace', 'GlobalCompact', 'GlobalFix', 'GlobalUnfix', 'GlobalUnWire',
+            'GlobalWire', 'IsBadHugeReadPtr', 'IsBadHugeWritePtr', 'LocalCompact', 'LocalShrink',
+
+            'GetClassInfoA', 'GetClassInfoW', 'GetClassInfoExA', 'GetClassInfoExW',
+            'GetClassLongA', 'GetClassLongW', 'GetClassLongPtrA', 'GetClassLongPtrW',
+            'RegisterClassA', 'RegisterClassW', 'RegisterClassExA', 'RegisterClassExW',
+            'SetClassLongA', 'SetClassLongW', 'SetClassLongPtrA', 'SetClassLongPtrW',
+            'SetWindowLongA', 'SetWindowLongW', 'SetWindowLongPtrA', 'SetWindowLongPtrW',
+            'UnregisterClassA', 'UnregisterClassW', 'GetClassWord', 'GetWindowWord',
+            'SetClassWord', 'SetWindowWord'
+            ),
+        // Native API
+        6 => array(
+            'CsrAllocateCaptureBuffer', 'CsrAllocateCapturePointer', 'CsrAllocateMessagePointer',
+            'CsrCaptureMessageBuffer', 'CsrCaptureMessageString', 'CsrCaptureTimeout',
+            'CsrClientCallServer', 'CsrClientConnectToServer', 'CsrFreeCaptureBuffer',
+            'CsrIdentifyAlertableThread', 'CsrNewThread', 'CsrProbeForRead', 'CsrProbeForWrite',
+            'CsrSetPriorityClass',
+
+            'LdrAccessResource', 'LdrDisableThreadCalloutsForDll', 'LdrEnumResources',
+            'LdrFindEntryForAddress', 'LdrFindResource_U', 'LdrFindResourceDirectory_U',
+            'LdrGetDllHandle', 'LdrGetProcedureAddress', 'LdrInitializeThunk', 'LdrLoadDll',
+            'LdrProcessRelocationBlock', 'LdrQueryImageFileExecutionOptions',
+            'LdrQueryProcessModuleInformation', 'LdrShutdownProcess', 'LdrShutdownThread',
+            'LdrUnloadDll', 'LdrVerifyImageMatchesChecksum',
+
+            'NtAcceptConnectPort', 'ZwAcceptConnectPort', 'NtCompleteConnectPort',
+            'ZwCompleteConnectPort', 'NtConnectPort', 'ZwConnectPort', 'NtCreatePort',
+            'ZwCreatePort', 'NtImpersonateClientOfPort', 'ZwImpersonateClientOfPort',
+            'NtListenPort', 'ZwListenPort', 'NtQueryInformationPort', 'ZwQueryInformationPort',
+            'NtReadRequestData', 'ZwReadRequestData', 'NtReplyPort', 'ZwReplyPort',
+            'NtReplyWaitReceivePort', 'ZwReplyWaitReceivePort', 'NtReplyWaitReplyPort',
+            'ZwReplyWaitReplyPort', 'NtRequestPort', 'ZwRequestPort', 'NtRequestWaitReplyPort',
+            'ZwRequestWaitReplyPort', 'NtSecureConnectPort', 'ZwSecureConnectPort',
+            'NtWriteRequestData', 'ZwWriteRequestData',
+
+            'NtAccessCheck', 'ZwAccessCheck', 'NtAccessCheckAndAuditAlarm',
+            'ZwAccessCheckAndAuditAlarm', 'NtAccessCheckByType', 'ZwAccessCheckByType',
+            'NtAccessCheckByTypeAndAuditAlarm', 'ZwAccessCheckByTypeAndAuditAlarm',
+            'NtAccessCheckByTypeResultList', 'ZwAccessCheckByTypeResultList',
+            'NtAdjustGroupsToken', 'ZwAdjustGroupsToken', 'NtAdjustPrivilegesToken',
+            'ZwAdjustPrivilegesToken', 'NtCloseObjectAuditAlarm', 'ZwCloseObjectAuditAlarm',
+            'NtCreateToken', 'ZwCreateToken', 'NtDeleteObjectAuditAlarm',
+            'ZwDeleteObjectAuditAlarm', 'NtDuplicateToken', 'ZwDuplicateToken',
+            'NtFilterToken', 'ZwFilterToken', 'NtImpersonateThread', 'ZwImpersonateThread',
+            'NtOpenObjectAuditAlarm', 'ZwOpenObjectAuditAlarm', 'NtOpenProcessToken',
+            'ZwOpenProcessToken', 'NtOpenThreadToken', 'ZwOpenThreadToken', 'NtPrivilegeCheck',
+            'ZwPrivilegeCheck', 'NtPrivilegedServiceAuditAlarm', 'ZwPrivilegedServiceAuditAlarm',
+            'NtPrivilegeObjectAuditAlarm', 'ZwPrivilegeObjectAuditAlarm',
+            'NtQueryInformationToken', 'ZwQueryInformationToken', 'NtQuerySecurityObject',
+            'ZwQuerySecurityObject', 'NtSetInformationToken', 'ZwSetInformationToken',
+            'NtSetSecurityObject', 'ZwSetSecurityObject',
+
+            'NtAddAtom', 'ZwAddAtom', 'NtDeleteAtom', 'ZwDeleteAtom', 'NtFindAtom', 'ZwFindAtom',
+            'NtQueryInformationAtom', 'ZwQueryInformationAtom',
+
+            'NtAlertResumeThread', 'ZwAlertResumeThread', 'NtAlertThread', 'ZwAlertThread',
+            'NtCreateProcess', 'ZwCreateProcess', 'NtCreateThread', 'ZwCreateThread',
+            'NtCurrentTeb', 'NtDelayExecution', 'ZwDelayExecution', 'NtGetContextThread',
+            'ZwGetContextThread', 'NtOpenProcess', 'ZwOpenProcess', 'NtOpenThread',
+            'ZwOpenThread', 'NtQueryInformationProcess', 'ZwQueryInformationProcess',
+            'NtQueryInformationThread', 'ZwQueryInformationThread', 'NtQueueApcThread',
+            'ZwQueueApcThread', 'NtResumeThread', 'ZwResumeThread', 'NtSetContextThread',
+            'ZwSetContextThread', 'NtSetHighWaitLowThread', 'ZwSetHighWaitLowThread',
+            'NtSetInformationProcess', 'ZwSetInformationProcess', 'NtSetInformationThread',
+            'ZwSetInformationThread', 'NtSetLowWaitHighThread', 'ZwSetLowWaitHighThread',
+            'NtSuspendThread', 'ZwSuspendThread', 'NtTerminateProcess', 'ZwTerminateProcess',
+            'NtTerminateThread', 'ZwTerminateThread', 'NtTestAlert', 'ZwTestAlert',
+            'NtYieldExecution', 'ZwYieldExecution',
+
+            'NtAllocateVirtualMemory', 'ZwAllocateVirtualMemory', 'NtAllocateVirtualMemory64',
+            'ZwAllocateVirtualMemory64', 'NtAreMappedFilesTheSame', 'ZwAreMappedFilesTheSame',
+            'NtCreateSection', 'ZwCreateSection', 'NtExtendSection', 'ZwExtendSection',
+            'NtFlushVirtualMemory', 'ZwFlushVirtualMemory', 'NtFreeVirtualMemory',
+            'ZwFreeVirtualMemory', 'NtFreeVirtualMemory64', 'ZwFreeVirtualMemory64',
+            'NtLockVirtualMemory', 'ZwLockVirtualMemory', 'NtMapViewOfSection',
+            'ZwMapViewOfSection', 'NtMapViewOfVlmSection', 'ZwMapViewOfVlmSection',
+            'NtOpenSection', 'ZwOpenSection', 'NtProtectVirtualMemory', 'ZwProtectVirtualMemory',
+            'NtProtectVirtualMemory64', 'ZwProtectVirtualMemory64', 'NtQueryVirtualMemory',
+            'ZwQueryVirtualMemory', 'NtQueryVirtualMemory64', 'ZwQueryVirtualMemory64',
+            'NtReadVirtualMemory', 'ZwReadVirtualMemory', 'NtReadVirtualMemory64',
+            'ZwReadVirtualMemory64', 'NtUnlockVirtualMemory', 'ZwUnlockVirtualMemory',
+            'NtUnmapViewOfSection', 'ZwUnmapViewOfSection', 'NtUnmapViewOfVlmSection',
+            'ZwUnmapViewOfVlmSection', 'NtWriteVirtualMemory', 'ZwWriteVirtualMemory',
+            'NtWriteVirtualMemory64', 'ZwWriteVirtualMemory64',
+
+            'NtAssignProcessToJobObject', 'ZwAssignProcessToJobObject', 'NtCreateJobObject',
+            'ZwCreateJobObject', 'NtOpenJobObject', 'ZwOpenJobObject',
+            'NtQueryInformationJobObject', 'ZwQueryInformationJobObject',
+            'NtSetInformationJobObject', 'ZwSetInformationJobObject', 'NtTerminateJobObject',
+            'ZwTerminateJobObject',
+
+            'NtCancelIoFile', 'ZwCancelIoFile', 'NtCreateFile', 'ZwCreateFile',
+            'NtCreateIoCompletion', 'ZwCreateIoCompletion', 'NtDeleteFile', 'ZwDeleteFile',
+            'NtDeviceIoControlFile', 'ZwDeviceIoControlFile', 'NtFlushBuffersFile',
+            'ZwFlushBuffersFile', 'NtFsControlFile', 'ZwFsControlFile', 'NtLockFile', 'ZwLockFile',
+            'NtNotifyChangeDirectoryFile', 'ZwNotifyChangeDirectoryFile', 'NtOpenFile',
+            'ZwOpenFile', 'NtOpenIoCompletion', 'ZwOpenIoCompletion', 'NtQueryAttributesFile',
+            'ZwQueryAttributesFile', 'NtQueryDirectoryFile', 'ZwQueryDirectoryFile',
+            'NtQueryEaFile', 'ZwQueryEaFile', 'NtQueryIoCompletion', 'ZwQueryIoCompletion',
+            'NtQueryQuotaInformationFile', 'ZwQueryQuotaInformationFile',
+            'NtQueryVolumeInformationFile', 'ZwQueryVolumeInformationFile', 'NtReadFile',
+            'ZwReadFile', 'NtReadFile64', 'ZwReadFile64', 'NtReadFileScatter', 'ZwReadFileScatter',
+            'NtRemoveIoCompletion', 'ZwRemoveIoCompletion', 'NtSetEaFile', 'ZwSetEaFile',
+            'NtSetInformationFile', 'ZwSetInformationFile', 'NtSetIoCompletion',
+            'ZwSetIoCompletion', 'NtSetQuotaInformationFile', 'ZwSetQuotaInformationFile',
+            'NtSetVolumeInformationFile', 'ZwSetVolumeInformationFile', 'NtUnlockFile',
+            'ZwUnlockFile', 'NtWriteFile', 'ZwWriteFile', 'NtWriteFile64','ZwWriteFile64',
+            'NtWriteFileGather', 'ZwWriteFileGather', 'NtQueryFullAttributesFile',
+            'ZwQueryFullAttributesFile', 'NtQueryInformationFile', 'ZwQueryInformationFile',
+
+            'RtlAbortRXact', 'RtlAbsoluteToSelfRelativeSD', 'RtlAcquirePebLock',
+            'RtlAcquireResourceExclusive', 'RtlAcquireResourceShared', 'RtlAddAccessAllowedAce',
+            'RtlAddAccessDeniedAce', 'RtlAddAce', 'RtlAddActionToRXact', 'RtlAddAtomToAtomTable',
+            'RtlAddAttributeActionToRXact', 'RtlAddAuditAccessAce', 'RtlAddCompoundAce',
+            'RtlAdjustPrivilege', 'RtlAllocateAndInitializeSid', 'RtlAllocateHandle',
+            'RtlAllocateHeap', 'RtlAnsiCharToUnicodeChar', 'RtlAnsiStringToUnicodeSize',
+            'RtlAnsiStringToUnicodeString', 'RtlAppendAsciizToString', 'RtlAppendStringToString',
+            'RtlAppendUnicodeStringToString', 'RtlAppendUnicodeToString', 'RtlApplyRXact',
+            'RtlApplyRXactNoFlush', 'RtlAreAllAccessesGranted', 'RtlAreAnyAccessesGranted',
+            'RtlAreBitsClear', 'RtlAreBitsSet', 'RtlAssert', 'RtlCaptureStackBackTrace',
+            'RtlCharToInteger', 'RtlCheckRegistryKey', 'RtlClearAllBits', 'RtlClearBits',
+            'RtlClosePropertySet', 'RtlCompactHeap', 'RtlCompareMemory', 'RtlCompareMemoryUlong',
+            'RtlCompareString', 'RtlCompareUnicodeString', 'RtlCompareVariants',
+            'RtlCompressBuffer', 'RtlConsoleMultiByteToUnicodeN', 'RtlConvertExclusiveToShared',
+            'RtlConvertLongToLargeInteger', 'RtlConvertPropertyToVariant',
+            'RtlConvertSharedToExclusive', 'RtlConvertSidToUnicodeString',
+            'RtlConvertUiListToApiList', 'RtlConvertUlongToLargeInteger',
+            'RtlConvertVariantToProperty', 'RtlCopyLuid', 'RtlCopyLuidAndAttributesArray',
+            'RtlCopySecurityDescriptor', 'RtlCopySid', 'RtlCopySidAndAttributesArray',
+            'RtlCopyString', 'RtlCopyUnicodeString', 'RtlCreateAcl', 'RtlCreateAndSetSD',
+            'RtlCreateAtomTable', 'RtlCreateEnvironment', 'RtlCreateHeap',
+            'RtlCreateProcessParameters', 'RtlCreatePropertySet', 'RtlCreateQueryDebugBuffer',
+            'RtlCreateRegistryKey', 'RtlCreateSecurityDescriptor', 'RtlCreateTagHeap',
+            'RtlCreateUnicodeString', 'RtlCreateUnicodeStringFromAsciiz', 'RtlCreateUserProcess',
+            'RtlCreateUserSecurityObject', 'RtlCreateUserThread', 'RtlCustomCPToUnicodeN',
+            'RtlCutoverTimeToSystemTime', 'RtlDecompressBuffer', 'RtlDecompressFragment',
+            'RtlDelete', 'RtlDeleteAce', 'RtlDeleteAtomFromAtomTable', 'RtlDeleteCriticalSection',
+            'RtlDeleteElementGenericTable', 'RtlDeleteNoSplay', 'RtlDeleteRegistryValue',
+            'RtlDeleteResource', 'RtlDeleteSecurityObject', 'RtlDeNormalizeProcessParams',
+            'RtlDestroyAtomTable', 'RtlDestroyEnvironment', 'RtlDestroyHandleTable',
+            'RtlDestroyHeap', 'RtlDestroyProcessParameters', 'RtlDestroyQueryDebugBuffer',
+            'RtlDetermineDosPathNameType_U', 'RtlDoesFileExists_U', 'RtlDosPathNameToNtPathName_U',
+            'RtlDosSearchPath_U', 'RtlDowncaseUnicodeString', 'RtlDumpResource',
+            'RtlEmptyAtomTable', 'RtlEnlargedIntegerMultiply', 'RtlEnlargedUnsignedDivide',
+            'RtlEnlargedUnsignedMultiply', 'RtlEnterCriticalSection', 'RtlEnumerateGenericTable',
+            'RtlEnumerateGenericTableWithoutSplaying', 'RtlEnumerateProperties',
+            'RtlEnumProcessHeaps', 'RtlEqualComputerName', 'RtlEqualDomainName', 'RtlEqualLuid',
+            'RtlEqualPrefixSid', 'RtlEqualSid', 'RtlEqualString', 'RtlEqualUnicodeString',
+            'RtlEraseUnicodeString', 'RtlExpandEnvironmentStrings_U', 'RtlExtendedIntegerMultiply',
+            'RtlExtendedLargeIntegerDivide', 'RtlExtendedMagicDivide', 'RtlExtendHeap',
+            'RtlFillMemory', 'RtlFillMemoryUlong', 'RtlFindClearBits', 'RtlFindClearBitsAndSet',
+            'RtlFindLongestRunClear', 'RtlFindLongestRunSet', 'RtlFindMessage', 'RtlFindSetBits',
+            'RtlFindSetBitsAndClear', 'RtlFirstFreeAce', 'RtlFlushPropertySet',
+            'RtlFormatCurrentUserKeyPath', 'RtlFormatMessage', 'RtlFreeAnsiString',
+            'RtlFreeHandle', 'RtlFreeHeap', 'RtlFreeOemString', 'RtlFreeSid',
+            'RtlFreeUnicodeString', 'RtlFreeUserThreadStack', 'RtlGenerate8dot3Name', 'RtlGetAce',
+            'RtlGetCallersAddress', 'RtlGetCompressionWorkSpaceSize',
+            'RtlGetControlSecurityDescriptor', 'RtlGetCurrentDirectory_U',
+            'RtlGetDaclSecurityDescriptor', 'RtlGetElementGenericTable', 'RtlGetFullPathName_U',
+            'RtlGetGroupSecurityDescriptor', 'RtlGetLongestNtPathLength', 'RtlGetNtGlobalFlags',
+            'RtlGetNtProductType', 'RtlGetOwnerSecurityDescriptor', 'RtlGetProcessHeaps',
+            'RtlGetSaclSecurityDescriptor', 'RtlGetUserInfoHeap', 'RtlGuidToPropertySetName',
+            'RtlIdentifierAuthoritySid', 'RtlImageDirectoryEntryToData', 'RtlImageNtHeader',
+            'RtlImageRvaToSection', 'RtlImageRvaToVa', 'RtlImpersonateSelf', 'RtlInitAnsiString',
+            'RtlInitCodePageTable', 'RtlInitializeAtomPackage', 'RtlInitializeBitMap',
+            'RtlInitializeContext', 'RtlInitializeCriticalSection',
+            'RtlInitializeCriticalSectionAndSpinCount', 'RtlInitializeGenericTable',
+            'RtlInitializeHandleTable', 'RtlInitializeResource', 'RtlInitializeRXact',
+            'RtlInitializeSid', 'RtlInitNlsTables', 'RtlInitString', 'RtlInitUnicodeString',
+            'RtlInsertElementGenericTable', 'RtlIntegerToChar', 'RtlIntegerToUnicodeString',
+            'RtlIsDosDeviceName_U', 'RtlIsGenericTableEmpty', 'RtlIsNameLegalDOS8Dot3',
+            'RtlIsTextUnicode', 'RtlIsValidHandle', 'RtlIsValidIndexHandle', 'RtlLargeIntegerAdd',
+            'RtlLargeIntegerArithmeticShift', 'RtlLargeIntegerDivide', 'RtlLargeIntegerNegate',
+            'RtlLargeIntegerShiftLeft', 'RtlLargeIntegerShiftRight', 'RtlLargeIntegerSubtract',
+            'RtlLargeIntegerToChar', 'RtlLeaveCriticalSection', 'RtlLengthRequiredSid',
+            'RtlLengthSecurityDescriptor', 'RtlLengthSid', 'RtlLocalTimeToSystemTime',
+            'RtlLockHeap', 'RtlLookupAtomInAtomTable', 'RtlLookupElementGenericTable',
+            'RtlMakeSelfRelativeSD', 'RtlMapGenericMask', 'RtlMoveMemory',
+            'RtlMultiByteToUnicodeN', 'RtlMultiByteToUnicodeSize', 'RtlNewInstanceSecurityObject',
+            'RtlNewSecurityGrantedAccess', 'RtlNewSecurityObject', 'RtlNormalizeProcessParams',
+            'RtlNtStatusToDosError', 'RtlNumberGenericTableElements', 'RtlNumberOfClearBits',
+            'RtlNumberOfSetBits', 'RtlOemStringToUnicodeSize', 'RtlOemStringToUnicodeString',
+            'RtlOemToUnicodeN', 'RtlOnMappedStreamEvent', 'RtlOpenCurrentUser',
+            'RtlPcToFileHeader', 'RtlPinAtomInAtomTable', 'RtlpNtCreateKey',
+            'RtlpNtEnumerateSubKey', 'RtlpNtMakeTemporaryKey', 'RtlpNtOpenKey',
+            'RtlpNtQueryValueKey', 'RtlpNtSetValueKey', 'RtlPrefixString',
+            'RtlPrefixUnicodeString', 'RtlPropertySetNameToGuid', 'RtlProtectHeap',
+            'RtlpUnWaitCriticalSection', 'RtlpWaitForCriticalSection', 'RtlQueryAtomInAtomTable',
+            'RtlQueryEnvironmentVariable_U', 'RtlQueryInformationAcl',
+            'RtlQueryProcessBackTraceInformation', 'RtlQueryProcessDebugInformation',
+            'RtlQueryProcessHeapInformation', 'RtlQueryProcessLockInformation',
+            'RtlQueryProperties', 'RtlQueryPropertyNames', 'RtlQueryPropertySet',
+            'RtlQueryRegistryValues', 'RtlQuerySecurityObject', 'RtlQueryTagHeap',
+            'RtlQueryTimeZoneInformation', 'RtlRaiseException', 'RtlRaiseStatus', 'RtlRandom',
+            'RtlReAllocateHeap', 'RtlRealPredecessor', 'RtlRealSuccessor', 'RtlReleasePebLock',
+            'RtlReleaseResource', 'RtlRemoteCall', 'RtlResetRtlTranslations',
+            'RtlRunDecodeUnicodeString', 'RtlRunEncodeUnicodeString', 'RtlSecondsSince1970ToTime',
+            'RtlSecondsSince1980ToTime', 'RtlSelfRelativeToAbsoluteSD', 'RtlSetAllBits',
+            'RtlSetAttributesSecurityDescriptor', 'RtlSetBits', 'RtlSetCriticalSectionSpinCount',
+            'RtlSetCurrentDirectory_U', 'RtlSetCurrentEnvironment', 'RtlSetDaclSecurityDescriptor',
+            'RtlSetEnvironmentVariable', 'RtlSetGroupSecurityDescriptor', 'RtlSetInformationAcl',
+            'RtlSetOwnerSecurityDescriptor', 'RtlSetProperties', 'RtlSetPropertyNames',
+            'RtlSetPropertySetClassId', 'RtlSetSaclSecurityDescriptor', 'RtlSetSecurityObject',
+            'RtlSetTimeZoneInformation', 'RtlSetUnicodeCallouts', 'RtlSetUserFlagsHeap',
+            'RtlSetUserValueHeap', 'RtlSizeHeap', 'RtlSplay', 'RtlStartRXact',
+            'RtlSubAuthorityCountSid', 'RtlSubAuthoritySid', 'RtlSubtreePredecessor',
+            'RtlSubtreeSuccessor', 'RtlSystemTimeToLocalTime', 'RtlTimeFieldsToTime',
+            'RtlTimeToElapsedTimeFields', 'RtlTimeToSecondsSince1970', 'RtlTimeToSecondsSince1980',
+            'RtlTimeToTimeFields', 'RtlTryEnterCriticalSection', 'RtlUnicodeStringToAnsiSize',
+            'RtlUnicodeStringToAnsiString', 'RtlUnicodeStringToCountedOemString',
+            'RtlUnicodeStringToInteger', 'RtlUnicodeStringToOemSize',
+            'RtlUnicodeStringToOemString', 'RtlUnicodeToCustomCPN', 'RtlUnicodeToMultiByteN',
+            'RtlUnicodeToMultiByteSize', 'RtlUnicodeToOemN', 'RtlUniform', 'RtlUnlockHeap',
+            'RtlUnwind', 'RtlUpcaseUnicodeChar', 'RtlUpcaseUnicodeString',
+            'RtlUpcaseUnicodeStringToAnsiString', 'RtlUpcaseUnicodeStringToCountedOemString',
+            'RtlUpcaseUnicodeStringToOemString', 'RtlUpcaseUnicodeToCustomCPN',
+            'RtlUpcaseUnicodeToMultiByteN', 'RtlUpcaseUnicodeToOemN', 'RtlUpperChar',
+            'RtlUpperString', 'RtlUsageHeap', 'RtlValidAcl', 'RtlValidateHeap',
+            'RtlValidateProcessHeaps', 'RtlValidSecurityDescriptor', 'RtlValidSid', 'RtlWalkHeap',
+            'RtlWriteRegistryValue', 'RtlxAnsiStringToUnicodeSize', 'RtlxOemStringToUnicodeSize',
+            'RtlxUnicodeStringToAnsiSize', 'RtlxUnicodeStringToOemSize', 'RtlZeroHeap',
+            'RtlZeroMemory',
+
+            'NtCancelTimer', 'ZwCancelTimer', 'NtCreateTimer', 'ZwCreateTimer', 'NtGetTickCount',
+            'ZwGetTickCount', 'NtOpenTimer', 'ZwOpenTimer', 'NtQueryPerformanceCounter',
+            'ZwQueryPerformanceCounter', 'NtQuerySystemTime', 'ZwQuerySystemTime', 'NtQueryTimer',
+            'ZwQueryTimer', 'NtQueryTimerResolution', 'ZwQueryTimerResolution', 'NtSetSystemTime',
+            'ZwSetSystemTime', 'NtSetTimer', 'ZwSetTimer', 'NtSetTimerResolution',
+            'ZwSetTimerResolution',
+
+            'NtClearEvent', 'ZwClearEvent', 'NtCreateEvent', 'ZwCreateEvent', 'NtCreateEventPair',
+            'ZwCreateEventPair', 'NtCreateMutant', 'ZwCreateMutant', 'NtCreateSemaphore',
+            'ZwCreateSemaphore', 'NtOpenEvent', 'ZwOpenEvent', 'NtOpenEventPair',
+            'ZwOpenEventPair', 'NtOpenMutant', 'ZwOpenMutant', 'NtOpenSemaphore',
+            'ZwOpenSemaphore', 'NtPulseEvent', 'ZwPulseEvent', 'NtQueryEvent', 'ZwQueryEvent',
+            'NtQueryMutant', 'ZwQueryMutant', 'NtQuerySemaphore', 'ZwQuerySemaphore',
+            'NtReleaseMutant', 'ZwReleaseMutant', 'NtReleaseProcessMutant',
+            'ZwReleaseProcessMutant', 'NtReleaseSemaphore', 'ZwReleaseSemaphore',
+            'NtReleaseThreadMutant', 'ZwReleaseThreadMutant', 'NtResetEvent', 'ZwResetEvent',
+            'NtSetEvent', 'ZwSetEvent', 'NtSetHighEventPair', 'ZwSetHighEventPair',
+            'NtSetHighWaitLowEventPair', 'ZwSetHighWaitLowEventPair', 'NtSetLowEventPair',
+            'ZwSetLowEventPair', 'NtSetLowWaitHighEventPair', 'ZwSetLowWaitHighEventPair',
+            'NtSignalAndWaitForSingleObject', 'ZwSignalAndWaitForSingleObject',
+            'NtWaitForMultipleObjects', 'ZwWaitForMultipleObjects', 'NtWaitForSingleObject',
+            'ZwWaitForSingleObject', 'NtWaitHighEventPair', 'ZwWaitHighEventPair',
+            'NtWaitLowEventPair', 'ZwWaitLowEventPair',
+
+            'NtClose', 'ZwClose', 'NtCreateDirectoryObject', 'ZwCreateDirectoryObject',
+            'NtCreateSymbolicLinkObject', 'ZwCreateSymbolicLinkObject',
+            'NtDuplicateObject', 'ZwDuplicateObject', 'NtMakeTemporaryObject',
+            'ZwMakeTemporaryObject', 'NtOpenDirectoryObject', 'ZwOpenDirectoryObject',
+            'NtOpenSymbolicLinkObject', 'ZwOpenSymbolicLinkObject', 'NtQueryDirectoryObject',
+            'ZwQueryDirectoryObject', 'NtQueryObject', 'ZwQueryObject',
+            'NtQuerySymbolicLinkObject', 'ZwQuerySymbolicLinkObject', 'NtSetInformationObject',
+            'ZwSetInformationObject',
+
+            'NtContinue', 'ZwContinue', 'NtRaiseException', 'ZwRaiseException',
+            'NtRaiseHardError', 'ZwRaiseHardError', 'NtSetDefaultHardErrorPort',
+            'ZwSetDefaultHardErrorPort',
+
+            'NtCreateChannel', 'ZwCreateChannel', 'NtListenChannel', 'ZwListenChannel',
+            'NtOpenChannel', 'ZwOpenChannel', 'NtReplyWaitSendChannel', 'ZwReplyWaitSendChannel',
+            'NtSendWaitReplyChannel', 'ZwSendWaitReplyChannel', 'NtSetContextChannel',
+            'ZwSetContextChannel',
+
+            'NtCreateKey', 'ZwCreateKey', 'NtDeleteKey', 'ZwDeleteKey', 'NtDeleteValueKey',
+            'ZwDeleteValueKey', 'NtEnumerateKey', 'ZwEnumerateKey', 'NtEnumerateValueKey',
+            'ZwEnumerateValueKey', 'NtFlushKey', 'ZwFlushKey', 'NtInitializeRegistry',
+            'ZwInitializeRegistry', 'NtLoadKey', 'ZwLoadKey', 'NtLoadKey2', 'ZwLoadKey2',
+            'NtNotifyChangeKey', 'ZwNotifyChangeKey', 'NtOpenKey', 'ZwOpenKey', 'NtQueryKey',
+            'ZwQueryKey', 'NtQueryMultipleValueKey', 'ZwQueryMultipleValueKey',
+            'NtQueryMultiplValueKey', 'ZwQueryMultiplValueKey', 'NtQueryValueKey',
+            'ZwQueryValueKey', 'NtReplaceKey', 'ZwReplaceKey', 'NtRestoreKey', 'ZwRestoreKey',
+            'NtSaveKey', 'ZwSaveKey', 'NtSetInformationKey', 'ZwSetInformationKey',
+            'NtSetValueKey', 'ZwSetValueKey', 'NtUnloadKey', 'ZwUnloadKey',
+
+            'NtCreateMailslotFile', 'ZwCreateMailslotFile', 'NtCreateNamedPipeFile',
+            'ZwCreateNamedPipeFile', 'NtCreatePagingFile', 'ZwCreatePagingFile',
+
+            'NtCreateProfile', 'ZwCreateProfile', 'NtQueryIntervalProfile',
+            'ZwQueryIntervalProfile', 'NtRegisterThreadTerminatePort',
+            'ZwRegisterThreadTerminatePort', 'NtSetIntervalProfile', 'ZwSetIntervalProfile',
+            'NtStartProfile', 'ZwStartProfile', 'NtStopProfile', 'ZwStopProfile',
+            'NtSystemDebugControl', 'ZwSystemDebugControl',
+
+            'NtEnumerateBus', 'ZwEnumerateBus', 'NtFlushInstructionCache',
+            'ZwFlushInstructionCache', 'NtFlushWriteBuffer', 'ZwFlushWriteBuffer',
+            'NtSetLdtEntries', 'ZwSetLdtEntries',
+
+            'NtGetPlugPlayEvent', 'ZwGetPlugPlayEvent', 'NtPlugPlayControl', 'ZwPlugPlayControl',
+
+            'NtInitiatePowerAction', 'ZwInitiatePowerAction', 'NtPowerInformation',
+            'ZwPowerInformation', 'NtRequestWakeupLatency', 'ZwRequestWakeupLatency',
+            'NtSetSystemPowerState', 'ZwSetSystemPowerState', 'NtSetThreadExecutionState',
+            'ZwSetThreadExecutionState',
+
+            'NtLoadDriver', 'ZwLoadDriver', 'NtRegisterNewDevice', 'ZwRegisterNewDevice',
+            'NtUnloadDriver', 'ZwUnloadDriver',
+
+            'NtQueryDefaultLocale', 'ZwQueryDefaultLocale', 'NtQueryDefaultUILanguage',
+            'ZwQueryDefaultUILanguage', 'NtQuerySystemEnvironmentValue',
+            'ZwQuerySystemEnvironmentValue', 'NtSetDefaultLocale', 'ZwSetDefaultLocale',
+            'NtSetDefaultUILanguage', 'ZwSetDefaultUILanguage', 'NtSetSystemEnvironmentValue',
+            'ZwSetSystemEnvironmentValue',
+
+            'DbgBreakPoint', 'DbgPrint', 'DbgPrompt', 'DbgSsHandleKmApiMsg', 'DbgSsInitialize',
+            'DbgUiConnectToDbg', 'DbgUiContinue', 'DbgUiWaitStateChange', 'DbgUserBreakPoint',
+            'KiRaiseUserExceptionDispatcher', 'KiUserApcDispatcher', 'KiUserCallbackDispatcher',
+            'KiUserExceptionDispatcher', 'NlsAnsiCodePage', 'NlsMbCodePageTag',
+            'NlsMbOemCodePageTag', 'NtAllocateLocallyUniqueId', 'ZwAllocateLocallyUniqueId',
+            'NtAllocateUuids', 'ZwAllocateUuids', 'NtCallbackReturn', 'ZwCallbackReturn',
+            'NtDisplayString', 'ZwDisplayString', 'NtQueryOleDirectoryFile',
+            'ZwQueryOleDirectoryFile', 'NtQuerySection', 'ZwQuerySection',
+            'NtQuerySystemInformation', 'ZwQuerySystemInformation', 'NtSetSystemInformation',
+            'ZwSetSystemInformation', 'NtShutdownSystem', 'ZwShutdownSystem', 'NtVdmControl',
+            'ZwVdmControl', 'NtW32Call', 'ZwW32Call', 'PfxFindPrefix', 'PfxInitialize',
+            'PfxInsertPrefix', 'PfxRemovePrefix', 'PropertyLengthAsVariant', 'RestoreEm87Context',
+            'SaveEm87Context'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '{', '}', '[', ']'),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/', '%'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;',
+            5 => 'color: #4000dd;',
+            6 => 'color: #4000dd;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            3 => 'color: #FF0000;',
+            4 => 'color: #FF0000;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com',
+        6 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/cpp.php b/vendor/easybook/geshi/geshi/cpp.php
new file mode 100755
index 000000000..52e4be6ea
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cpp.php
@@ -0,0 +1,246 @@
+<?php
+/*************************************************************************************
+ * cpp.php
+ * -------
+ * Author: Dennis Bayer (Dennis.Bayer@mnifh-giessen.de)
+ * Contributors:
+ *  - M. Uli Kusterer (witness.of.teachtext@gmx.net)
+ *  - Jack Lloyd (lloyd@randombit.net)
+ * Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/09/27
+ *
+ * C++ language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/XX/XX (1.0.2)
+ *  -  Added several new keywords (Jack Lloyd)
+ * 2004/11/27 (1.0.1)
+ *  -  Added StdCLib function and constant names, changed color scheme to
+ *     a cleaner one. (M. Uli Kusterer)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C++',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //C++ 11 string literal extensions
+        3 => '/(?:L|u8?|U)(?=")/',
+        //C++ 11 string literal extensions (raw)
+        4 => '/R"([^()\s\\\\]*)\((?:(?!\)\\1").)*\)\\1"/ms'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\\'\"?\n]#",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
+            'switch', 'throw', 'while'
+            ),
+        2 => array(
+            'NULL', 'false', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class'
+            ),
+        3 => array(
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '{', '}', '[', ']'),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/', '%'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            3 => 'color: #FF0000;',
+            4 => 'color: #FF0000;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/csharp.php b/vendor/easybook/geshi/geshi/csharp.php
new file mode 100755
index 000000000..a73d01d6b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/csharp.php
@@ -0,0 +1,259 @@
+<?php
+/*************************************************************************************
+ * csharp.php
+ * ----------
+ * Author: Alan Juden (alan@judenware.org)
+ * Revised by: Michael Mol (mikemol@gmail.com)
+ * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * C# language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2015/04/14
+ *  -  Added C# 5.0 and 6.0 missing keywords and #pragma directive
+ * 2012/06/18 (1.0.8.11)
+ *  -  Added missing keywords (Christian Stelzmann)
+ * 2009/04/03 (1.0.8.6)
+ *  -  Added missing keywords identified by Rosetta Code users.
+ * 2008/05/25 (1.0.7.22)
+ *  -  Added highlighting of using and namespace directives as non-OOP
+ * 2005/01/05 (1.0.1)
+ *  -  Used hardquote support for @"..." strings (Cliff Stanford)
+ * 2004/11/27 (1.0.0)
+ *  -  Initial release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C#',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Using and Namespace directives (basic support)
+        //Please note that the alias syntax for using is not supported
+        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('"'),
+    'HARDCHAR' => '"',
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abstract', 'add', 'as', 'async', 'await', 'base',
+            'break', 'by', 'case', 'catch', 'const', 'continue',
+            'default', 'do', 'else', 'event', 'explicit', 'extern', 'false',
+            'finally', 'fixed', 'for', 'foreach', 'from', 'get', 'goto', 'group', 'if',
+            'implicit', 'in', 'into', 'internal', 'join', 'lock', 'namespace', 'null',
+            'operator', 'out', 'override', 'params', 'partial', 'private',
+            'protected', 'public', 'readonly', 'remove', 'ref', 'return', 'sealed',
+            'select', 'set', 'stackalloc', 'static', 'switch', 'this', 'throw', 'true',
+            'try', 'unsafe', 'using', 'var', 'value', 'virtual', 'volatile', 'where',
+            'while', 'yield'
+            ),
+        2 => array(
+            '#elif', '#endif', '#endregion', '#else', '#error', '#define', '#if',
+            '#line', '#pragma', '#region', '#undef', '#warning'
+            ),
+        3 => array(
+            'checked', 'is', 'new', 'nameof', 'sizeof', 'typeof', 'unchecked'
+            ),
+        4 => array(
+            'bool', 'byte', 'char', 'class', 'decimal', 'delegate', 'double',
+            'dynamic', 'enum', 'float', 'int', 'interface', 'long', 'object', 'sbyte',
+            'short', 'string', 'struct', 'uint', 'ulong', 'ushort', 'void'
+            ),
+        5 => array(
+            'Microsoft.Win32',
+            'System',
+            'System.CodeDOM',
+            'System.CodeDOM.Compiler',
+            'System.Collections',
+            'System.Collections.Bases',
+            'System.ComponentModel',
+            'System.ComponentModel.Design',
+            'System.ComponentModel.Design.CodeModel',
+            'System.Configuration',
+            'System.Configuration.Assemblies',
+            'System.Configuration.Core',
+            'System.Configuration.Install',
+            'System.Configuration.Interceptors',
+            'System.Configuration.Schema',
+            'System.Configuration.Web',
+            'System.Core',
+            'System.Data',
+            'System.Data.ADO',
+            'System.Data.Design',
+            'System.Data.Internal',
+            'System.Data.SQL',
+            'System.Data.SQLTypes',
+            'System.Data.XML',
+            'System.Data.XML.DOM',
+            'System.Data.XML.XPath',
+            'System.Data.XML.XSLT',
+            'System.Diagnostics',
+            'System.Diagnostics.SymbolStore',
+            'System.DirectoryServices',
+            'System.Drawing',
+            'System.Drawing.Design',
+            'System.Drawing.Drawing2D',
+            'System.Drawing.Imaging',
+            'System.Drawing.Printing',
+            'System.Drawing.Text',
+            'System.Globalization',
+            'System.IO',
+            'System.IO.IsolatedStorage',
+            'System.Messaging',
+            'System.Net',
+            'System.Net.Sockets',
+            'System.NewXml',
+            'System.NewXml.XPath',
+            'System.NewXml.Xsl',
+            'System.Reflection',
+            'System.Reflection.Emit',
+            'System.Resources',
+            'System.Runtime.InteropServices',
+            'System.Runtime.InteropServices.Expando',
+            'System.Runtime.Remoting',
+            'System.Runtime.Serialization',
+            'System.Runtime.Serialization.Formatters',
+            'System.Runtime.Serialization.Formatters.Binary',
+            'System.Security',
+            'System.Security.Cryptography',
+            'System.Security.Cryptography.X509Certificates',
+            'System.Security.Permissions',
+            'System.Security.Policy',
+            'System.Security.Principal',
+            'System.ServiceProcess',
+            'System.Text',
+            'System.Text.RegularExpressions',
+            'System.Threading',
+            'System.Timers',
+            'System.Web',
+            'System.Web.Caching',
+            'System.Web.Configuration',
+            'System.Web.Security',
+            'System.Web.Services',
+            'System.Web.Services.Description',
+            'System.Web.Services.Discovery',
+            'System.Web.Services.Protocols',
+            'System.Web.UI',
+            'System.Web.UI.Design',
+            'System.Web.UI.Design.WebControls',
+            'System.Web.UI.Design.WebControls.ListControls',
+            'System.Web.UI.HtmlControls',
+            'System.Web.UI.WebControls',
+            'System.WinForms',
+            'System.WinForms.ComponentModel',
+            'System.WinForms.Design',
+            'System.Xml',
+            'System.Xml.Serialization',
+            'System.Xml.Serialization.Code',
+            'System.Xml.Serialization.Schema'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
+        '(', ')', '{', '}', '[', ']', '|', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF; font-weight: bold;',
+            2 => 'color: #FF8000; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #6666cc; font-weight: bold;',
+            5 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            3 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;',
+            'HARD' => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;',
+            'HARD' => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_%\\-])"
+        )
+    )
+);
+
+?>
diff --git a/vendor/easybook/geshi/geshi/css.php b/vendor/easybook/geshi/geshi/css.php
new file mode 100755
index 000000000..d09bea7da
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/css.php
@@ -0,0 +1,226 @@
+<?php
+/*************************************************************************************
+ * css.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/18
+ *
+ * CSS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Changed regexps to catch "-" symbols
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Improve or drop regexps for class/id/psuedoclass highlighting
+ * * Re-look at keywords - possibly to make several CSS language
+ *   files, all with different versions of CSS in them
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CSS',
+    'COMMENT_SINGLE' => array(1 => '@'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<=\\()\\s*(?:(?:[a-z0-9]+?:\\/\\/)?[a-z0-9_\\-\\.\\/:]+?)?[a-z]+?\\.[a-z]+?(\\?[^\)]+?)?\\s*?(?=\\))/i"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        //1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\[\da-fA-F]{1,6}\s?#i",
+        //Unicode Char Specs
+        //3 => "#\\\\u[\da-fA-F]{1,8}#i",
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'aqua', 'azimuth', 'background-attachment', 'background-color',
+            'background-image', 'background-position', 'background-repeat',
+            'background', 'black', 'blue', 'border-bottom-color',
+            'border-radius', 'border-top-left-radius', 'border-top-right-radius',
+            'border-bottom-right-radius', 'border-bottom-left-radius',
+            'border-bottom-style', 'border-bottom-width', 'border-left-color',
+            'border-left-style', 'border-left-width', 'border-right',
+            'border-right-color', 'border-right-style', 'border-right-width',
+            'border-top-color', 'border-top-style',
+            'border-top-width','border-bottom', 'border-collapse',
+            'border-left', 'border-width', 'border-color', 'border-spacing',
+            'border-style', 'border-top', 'border', 'caption-side', 'clear',
+            'clip', 'color', 'content', 'counter-increment', 'counter-reset',
+            'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
+            'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
+            'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
+            'font-weight', 'font', 'line-height', 'letter-spacing',
+            'list-style', 'list-style-image', 'list-style-position',
+            'list-style-type', 'margin-bottom', 'margin-left', 'margin-right',
+            'margin-top', 'margin', 'marker-offset', 'marks', 'max-height',
+            'max-width', 'min-height', 'min-width', 'orphans', 'outline',
+            'outline-color', 'outline-style', 'outline-width', 'overflow',
+            'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
+            'padding', 'page', 'page-break-after', 'page-break-before',
+            'page-break-inside', 'pause-after', 'pause-before', 'pause',
+            'pitch', 'pitch-range', 'play-during', 'position', 'quotes',
+            'richness', 'right', 'size', 'speak-header', 'speak-numeral',
+            'speak-punctuation', 'speak', 'speech-rate', 'stress',
+            'table-layout', 'text-align', 'text-decoration', 'text-indent',
+            'text-shadow', 'text-transform', 'top', 'unicode-bidi',
+            'vertical-align', 'visibility', 'voice-family', 'volume',
+            'white-space', 'widows', 'width', 'word-spacing', 'z-index',
+            'bottom', 'left', 'height'
+            ),
+        2 => array(
+            'above', 'absolute', 'always', 'armenian', 'aural', 'auto',
+            'avoid', 'baseline', 'behind', 'below', 'bidi-override', 'blink',
+            'block', 'bold', 'bolder', 'both', 'capitalize', 'center-left',
+            'center-right', 'center', 'circle', 'cjk-ideographic',
+            'close-quote', 'collapse', 'condensed', 'continuous', 'crop',
+            'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero',
+            'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
+            'e-resize', 'embed', 'extra-condensed', 'extra-expanded',
+            'expanded', 'fantasy', 'far-left', 'far-right', 'faster', 'fast',
+            'fixed', 'fuchsia', 'georgian', 'gray', 'green', 'groove',
+            'hebrew', 'help', 'hidden', 'hide', 'higher', 'high',
+            'hiragana-iroha', 'hiragana', 'icon', 'inherit', 'inline-table',
+            'inline', 'inset', 'inside', 'invert', 'italic', 'justify',
+            'katakana-iroha', 'katakana', 'landscape', 'larger', 'large',
+            'left-side', 'leftwards', 'level', 'lighter', 'lime',
+            'line-through', 'list-item', 'loud', 'lower-alpha', 'lower-greek',
+            'lower-roman', 'lowercase', 'ltr', 'lower', 'low', 'maroon',
+            'medium', 'message-box', 'middle', 'mix', 'monospace', 'n-resize',
+            'narrower', 'navy', 'ne-resize', 'no-close-quote',
+            'no-open-quote', 'no-repeat', 'none', 'normal', 'nowrap',
+            'nw-resize', 'oblique', 'olive', 'once', 'open-quote', 'outset',
+            'outside', 'overline', 'pointer', 'portrait', 'purple', 'px',
+            'red', 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb',
+            'ridge', 'right-side', 'rightwards', 's-resize', 'sans-serif',
+            'scroll', 'se-resize', 'semi-condensed', 'semi-expanded',
+            'separate', 'serif', 'show', 'silent', 'silver', 'slow', 'slower',
+            'small-caps', 'small-caption', 'smaller', 'soft', 'solid',
+            'spell-out', 'square', 'static', 'status-bar', 'super',
+            'sw-resize', 'table-caption', 'table-cell', 'table-column',
+            'table-column-group', 'table-footer-group', 'table-header-group',
+            'table-row', 'table-row-group', 'teal', 'text', 'text-bottom',
+            'text-top', 'thick', 'thin', 'transparent', 'ultra-condensed',
+            'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin',
+            'upper-roman', 'uppercase', 'url', 'visible', 'w-resize', 'wait',
+            'white', 'wider', 'x-fast', 'x-high', 'x-large', 'x-loud',
+            'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small', 'yellow',
+            'yes'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', ':', ';',
+        '>', '+', '*', ',', '^', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #a1a100;',
+            2 => 'color: #ff0000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            //1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #000099; font-weight: bold;'
+            //3 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #cc00cc;',
+            1 => 'color: #6666ff;',
+            2 => 'color: #3333ff;',
+            3 => 'color: #933;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //DOM Node ID
+        0 => '\#[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*',
+        //CSS classname
+        1 => '\.(?!\d)[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*\b(?=[\{\.#\s,:].|<\|)',
+        //CSS Pseudo classes
+        //note: & is needed for &gt; (i.e. > )
+        2 => '(?<!\\\\):(?!\d)[a-zA-Z0-9\-]+\b(?:\s*(?=[\{\.#a-zA-Z,:+*&](.|\n)|<\|))',
+        //Measurements
+        3 => '[+\-]?(\d+|(\d*\.\d+))(em|ex|pt|px|cm|in|%)',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_AFTER' => '(?![\-a-zA-Z0-9_\|%\\-&\.])',
+            'DISALLOWED_BEFORE' => '(?<![\-a-zA-Z0-9_\|%\\~&\.])'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/cuesheet.php b/vendor/easybook/geshi/geshi/cuesheet.php
new file mode 100755
index 000000000..ebaca955f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/cuesheet.php
@@ -0,0 +1,138 @@
+<?php
+/*************************************************************************************
+ * cuesheet.php
+ * ----------
+ * Author: Benny Baumann (benbe@geshi.org)
+ * Copyright: (c) 2009 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/12/21
+ *
+ * Cuesheet language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/12/21 (1.0.8.6)
+ *   -  First Release
+ *
+ * TODO (updated 2009/12/21)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Cuesheet',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Single-Line Comments using REM command
+        1 => "/(?<=\bREM\b).*?$/im",
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'CATALOG','CDTEXTFILE','FILE','FLAGS','INDEX','ISRC','PERFORMER',
+            'POSTGAP','PREGAP','REM','SONGWRITER','TITLE','TRACK'
+            ),
+        2 => array(
+            'AIFF', 'BINARY', 'MOTOROLA', 'MP3', 'WAVE'
+            ),
+        3 => array(
+            '4CH', 'DCP', 'PRE', 'SCMS'
+            ),
+        4 => array(
+            'AUDIO', 'CDG', 'MODE1/2048', 'MODE1/2336', 'MODE2/2336',
+            'MODE2/2352', 'CDI/2336', 'CDI/2352'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #006600;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #000099;',
+            2 => 'color: #009900;',
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://digitalx.org/cuesheetsyntax.php#{FNAMEL}',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        2 => '\b[A-Za-z0-9]{5}\d{7}\b',
+        1 => '(?<=[\s:]|^)\d+(?=[\s:]|$)',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![\w\.])',
+            'DISALLOWED_AFTER' => '(?![\w\.])',
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/d.php b/vendor/easybook/geshi/geshi/d.php
new file mode 100755
index 000000000..7f3e9857a
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/d.php
@@ -0,0 +1,252 @@
+<?php
+/*************************************************************************************
+ * d.php
+ * -----
+ * Author: Thomas Kuehne (thomas@kuehne.cn)
+ * Contributors:
+ *  - Jimmy Cao
+ * Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/04/22
+ *
+ * D language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/06/28 (0.0.3) (Jimmy Cao)
+ *  -  added D2 features
+ * 2005/04/22 (0.0.2)
+ *  -  added _d_* and sizeof/ptrdiff_t
+ * 2005/04/20 (0.0.1)
+ *  -  First release
+ *
+ * TODO (updated 2005/04/22)
+ * -------------------------
+ * * nested comments
+ * * correct handling of r"" and ``
+ * * correct handling of ... and ..
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'D',
+    'COMMENT_SINGLE' => array(2 => '///', 1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/', '/+' => '+/'),
+    'COMMENT_REGEXP' => array(
+        // doxygen comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU',
+        // raw strings
+        4 => '#r"[^"]*"#s',
+        // Script Style interpreter comment
+        5 => "/\A#!(?=\\/).*?$/m"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\'\"?\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#",
+        //Named entity escapes
+        /*6 => "#\\\\&(?:quot|amp|lt|gt|OElig|oelig|Scaron|scaron|Yuml|circ|tilde|".
+            "ensp|emsp|thinsp|zwnj|zwj|lrm|rlm|ndash|mdash|lsquo|rsquo|sbquo|".
+            "ldquo|rdquo|bdquo|dagger|Dagger|permil|lsaquo|rsaquo|euro|nbsp|".
+            "iexcl|cent|pound|curren|yen|brvbar|sect|uml|copy|ordf|laquo|not|".
+            "shy|reg|macr|deg|plusmn|sup2|sup3|acute|micro|para|middot|cedil|".
+            "sup1|ordm|raquo|frac14|frac12|frac34|iquest|Agrave|Aacute|Acirc|".
+            "Atilde|Auml|Aring|AElig|Ccedil|Egrave|Eacute|Ecirc|Euml|Igrave|".
+            "Iacute|Icirc|Iuml|ETH|Ntilde|Ograve|Oacute|Ocirc|Otilde|Ouml|".
+            "times|Oslash|Ugrave|Uacute|Ucirc|Uuml|Yacute|THORN|szlig|agrave|".
+            "aacute|acirc|atilde|auml|aring|aelig|ccedil|egrave|eacute|ecirc|".
+            "euml|igrave|iacute|icirc|iuml|eth|ntilde|ograve|oacute|ocirc|".
+            "otilde|ouml|divide|oslash|ugrave|uacute|ucirc|uuml|yacute|thorn|".
+            "yuml|fnof|Alpha|Beta|Gamma|Delta|Epsilon|Zeta|Eta|Theta|Iota|".
+            "Kappa|Lambda|Mu|Nu|Xi|Omicron|Pi|Rho|Sigma|Tau|Upsilon|Phi|Chi|".
+            "Psi|Omega|alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|".
+            "kappa|lambda|mu|nu|xi|omicron|pi|rho|sigmaf|sigma|tau|upsilon|".
+            "phi|chi|psi|omega|thetasym|upsih|piv|bull|hellip|prime|Prime|".
+            "oline|frasl|weierp|image|real|trade|alefsym|larr|uarr|rarr|darr|".
+            "harr|crarr|lArr|uArr|rArr|dArr|hArr|forall|part|exist|empty|".
+            "nabla|isin|notin|ni|prod|sum|minus|lowast|radic|prop|infin|ang|".
+            "and|or|cap|cup|int|there4|sim|cong|asymp|ne|equiv|le|ge|sub|sup|".
+            "nsub|sube|supe|oplus|otimes|perp|sdot|lceil|rceil|lfloor|rfloor|".
+            "lang|rang|loz|spades|clubs|hearts|diams);#",*/
+        // optimized:
+        6 => "#\\\\&(?:A(?:Elig|acute|circ|grave|lpha|ring|tilde|uml)|Beta|".
+            "C(?:cedil|hi)|D(?:agger|elta)|E(?:TH|acute|circ|grave|psilon|ta|uml)|".
+            "Gamma|I(?:acute|circ|grave|ota|uml)|Kappa|Lambda|Mu|N(?:tilde|u)|".
+            "O(?:Elig|acute|circ|grave|m(?:ega|icron)|slash|tilde|uml)|".
+            "P(?:hi|i|rime|si)|Rho|S(?:caron|igma)|T(?:HORN|au|heta)|".
+            "U(?:acute|circ|grave|psilon|uml)|Xi|Y(?:acute|uml)|Zeta|".
+            "a(?:acute|c(?:irc|ute)|elig|grave|l(?:efsym|pha)|mp|n[dg]|ring|".
+            "symp|tilde|uml)|b(?:dquo|eta|rvbar|ull)|c(?:ap|cedil|e(?:dil|nt)|".
+            "hi|irc|lubs|o(?:ng|py)|rarr|u(?:p|rren))|d(?:Arr|a(?:gger|rr)|".
+            "e(?:g|lta)|i(?:ams|vide))|e(?:acute|circ|grave|m(?:pty|sp)|nsp|".
+            "psilon|quiv|t[ah]|u(?:ml|ro)|xist)|f(?:nof|orall|ra(?:c(?:1[24]|34)|sl))|".
+            "g(?:amma|e|t)|h(?:Arr|arr|e(?:arts|llip))|i(?:acute|circ|excl|grave|mage|".
+            "n(?:fin|t)|ota|quest|sin|uml)|kappa|l(?:Arr|a(?:mbda|ng|quo|rr)|ceil|".
+            "dquo|e|floor|o(?:wast|z)|rm|s(?:aquo|quo)|t)|m(?:acr|dash|".
+            "i(?:cro|ddot|nus)|u)|n(?:abla|bsp|dash|e|i|ot(?:in)?|sub|tilde|u)|".
+            "o(?:acute|circ|elig|grave|line|m(?:ega|icron)|plus|r(?:d[fm])?|".
+            "slash|ti(?:lde|mes)|uml)|p(?:ar[at]|er(?:mil|p)|hi|iv?|lusmn|ound|".
+            "r(?:ime|o[dp])|si)|quot|r(?:Arr|a(?:dic|ng|quo|rr)|ceil|dquo|e(?:al|g)|".
+            "floor|ho|lm|s(?:aquo|quo))|s(?:bquo|caron|dot|ect|hy|i(?:gmaf?|m)|".
+            "pades|u(?:be?|m|p[123e]?)|zlig)|t(?:au|h(?:e(?:re4|ta(?:sym)?)|insp|".
+            "orn)|i(?:lde|mes)|rade)|u(?:Arr|a(?:cute|rr)|circ|grave|ml|".
+            "psi(?:h|lon)|uml)|weierp|xi|y(?:acute|en|uml)|z(?:eta|w(?:j|nj)));#",
+        ),
+    'HARDQUOTE' => array('`', '`'),
+    'HARDESCAPE' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+                'break', 'case', 'continue', 'do', 'else',
+                'for', 'foreach', 'goto', 'if', 'return',
+                'switch', 'while', 'foreach_reverse'
+            ),
+        2 => array(
+                'alias', 'asm', 'assert', 'body', 'cast',
+                'catch', 'default', 'delegate', 'delete',
+                'extern', 'false', 'finally', 'function',
+                'import', 'in', 'inout',
+                'invariant', 'is', 'lazy', 'mixin', 'module', 'new',
+                'null', 'out', 'pragma', 'ref', 'super', 'this',
+                'throw', 'true', 'try', 'typeid',
+                'typeof', 'union', 'with', 'scope'
+            ),
+        3 => array(
+                'ClassInfo', 'Error', 'Exception',
+                'Interface', 'Object', 'IMonitor',
+                'OffsetTypeInfo', 'Throwable',
+                'TypeInfo_Class', 'TypeInfo', '__traits',
+                '__EOF__', '__FILE__', '__LINE__',
+            ),
+        4 => array(
+                'abstract', 'align', 'auto', 'bit', 'bool',
+                'byte', 'cdouble', 'cfloat', 'char',
+                'class', 'const', 'creal', 'dchar', 'dstring', 'debug',
+                'deprecated', 'double', 'enum', 'export',
+                'final', 'float', 'idouble', 'ifloat', 'immutable', 'int',
+                'interface', 'ireal', 'long', 'nothrow', 'override',
+                'package', 'private', 'protected', 'ptrdiff_t',
+                'public', 'real', 'short', 'shared', 'size_t',
+                'static', 'string', 'struct', 'synchronized',
+                'template', 'ubyte', 'ucent', 'uint',
+                'ulong', 'unittest', 'ushort', 'version',
+                'void', 'volatile', 'wchar', 'wstring',
+                '__gshared', '@disable', '@property', 'pure', 'safe'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '?', '!', ';', ':', ',', '...', '..',
+        '+', '-', '*', '/', '%', '&', '|', '^', '<', '>', '=', '~',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #aaaadd; font-weight: bold;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009933; font-style: italic;',
+            3 => 'color: #009933; font-style: italic;',
+            4 => 'color: #ff0000;',
+            5 => 'color: #0040ff;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            6 => 'color: #666699; font-weight: bold; font-style: italic;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/dart.php b/vendor/easybook/geshi/geshi/dart.php
new file mode 100644
index 000000000..932e13e87
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/dart.php
@@ -0,0 +1,159 @@
+<?php
+/*************************************************************************************
+ * dart.php
+ * --------
+ * Author: Edward Hart (edward.dan.hart@gmail.com)
+ * Copyright: (c) 2013 Edward Hart
+ * Release Version: 1.0.8.12
+ * Date Started: 2013/10/25
+ *
+ * Dart language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2013/10/25
+ *   -  First Release
+ *
+ * TODO (updated 2013/10/25)
+ * -------------------------
+ *   -  Highlight standard library types.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Dart',
+
+    'COMMENT_SINGLE' => array('//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(),
+
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\nrfbtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        4 => "#\\\\u\\{[\da-fA-F]*\\}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE |
+        GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+
+    'KEYWORDS' => array(
+        1 => array(
+            'abstract', 'as', 'assert', 'break', 'case', 'catch', 'class',
+            'const', 'continue', 'default', 'do', 'dynamic', 'else', 'export',
+            'extends', 'external', 'factory', 'false', 'final', 'finally',
+            'for', 'get', 'if', 'implements', 'import', 'in', 'is', 'library',
+            'new', 'null', 'operator', 'part', 'return', 'set', 'static',
+            'super', 'switch', 'this', 'throw', 'true', 'try', 'typedef', 'var',
+            'while', 'with'
+            ),
+        2 => array(
+            'double', 'bool', 'int', 'num', 'void'
+            ),
+        ),
+
+    'SYMBOLS' => array(
+        0 => array('(', ')', '{', '}', '[', ']'),
+        1 => array('+', '-', '*', '/', '%', '~'),
+        2 => array('&', '|', '^'),
+        3 => array('=', '!', '<', '>'),
+        4 => array('?', ':'),
+        5 => array('..'),
+        6 => array(';', ',')
+        ),
+
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        ),
+
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold;',
+            2 => 'color: #445588; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #999988; font-style: italic;',
+            'MULTI' => 'color: #999988; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #d14;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #009999;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'BRACKETS' => array(''),
+        'METHODS' => array(
+            1 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'font-weight: bold;',
+            1 => 'font-weight: bold;',
+            2 => 'font-weight: bold;',
+            3 => 'font-weight: bold;',
+            4 => 'font-weight: bold;',
+            5 => 'font-weight: bold;',
+            6 => 'font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/dcl.php b/vendor/easybook/geshi/geshi/dcl.php
new file mode 100755
index 000000000..db12a4c4e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/dcl.php
@@ -0,0 +1,192 @@
+<?php
+/*************************************************************************************
+ * dcl.php
+ * --------
+ * Author: Petr Hendl (petr@hendl.cz)
+ * Copyright: (c) 2011 Petr Hendl http://hendl.cz/geshi/
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/02/17
+ *
+ * DCL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011-02-17 (1.0.8.11)
+ *   - First Release
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DCL',
+    'COMMENT_SINGLE' => array('$!', '!'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        2 => '/(?<=\$)\s*sql\s+.*?(?:quit|exit);?\s*?$/sim' // do not highlight inline sql
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDESCAPE' => array(),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => "/''[a-zA-Z\\-_]+'/"
+        ),
+    'KEYWORDS' => array(
+        1 => array( // commands
+            'ACCOUNTING', 'ALLOCATE', 'ANALYZE', 'APPEND', 'ASSIGN', 'ATTACH', 'BACKUP',
+            'CALL', 'CANCEL', 'CHECKSUM', 'CLOSE', 'CONNECT', 'CONTINUE', 'CONVERT',
+            'COPY', 'CREATE', 'DEALLOCATE', 'DEASSIGN', 'DEBUG', 'DECK',
+            'DECRYPT', 'DEFINE', 'DELETE', 'DEPOSIT', 'DIFFERENCES', 'DIRECTORY',
+            'DISABLE',  'AUTOSTART', 'DISCONNECT', 'DISMOUNT', 'DUMP', 'EDIT', 'ENABLE',
+            'ENCRYPT', 'ENDSUBROUTINE', 'EOD', 'EOJ', 'EXAMINE', 'EXCHANGE',
+            'EXIT', 'FONT', 'GOSUB', 'GOTO', 'HELP', 'IF', 'THEN', 'ELSE', 'ENDIF', 'INITIALIZE', 'INQUIRE',
+            'INSTALL', 'JAVA', 'JOB', 'LIBRARY', 'LICENSE', 'LINK', 'LOGIN', 'LOGOUT',
+            'MACRO', 'MAIL', 'MERGE', 'MESSAGE', 'MONITOR', 'MOUNT', 'NCS', 'ON', 'OPEN',
+            'PASSWORD', 'PATCH', 'PHONE', 'PIPE', 'PPPD', 'PRINT', 'PRODUCT', 'PURGE',
+            'READ', 'RECALL', 'RENAME', 'REPLY', 'REQUEST', 'RETURN', 'RMU', 'RUN', 'RUNOFF',
+            'SEARCH', 'SET', 'SET AUDIT', 'SET BOOTBLOCK', 'SET BROADCAST',
+            'SET CACHE', 'SET CARD_READER', 'SET CLUSTER', 'SET COMMAND', 'SET CONTROL',
+            'SET CPU', 'SET DAY', 'SET DEFAULT', 'SET DEVICE', 'SET DIRECTORY',
+            'SET DISPLAY', 'SET ENTRY', 'SET FILE', 'SET HOST', 'SET IMAGE', 'SET KEY',
+            'SET LOGINS', 'SET MAGTAPE', 'SET MESSAGE', 'SET NETWORK', 'SET ON', 'SET OUTPUT_RATE',
+            'SET PASSWORD', 'SET PREFERRED_PATH', 'SET PREFIX', 'SET PRINTER', 'SET PROCESS',
+            'SET PROMPT', 'SET PROTECTION', 'SET QUEUE', 'SET RESTART_VALUE',
+            'SET RIGHTS_LIST', 'SET RMS_DEFAULT', 'SET ROOT', 'SET SECURITY',
+            'SET SERVER ACME_SERVER', 'SET SERVER REGISTRY_SERVER', 'SET SERVER SECURITY_SERVER',
+            'SET SHADOW', 'SET SYMBOL', 'SET TERMINAL', 'SET TIME', 'SET VERIFY',
+            'SET VOLUME', 'SET WORKING_SET', 'SHOW', 'SHOW AUDIT',
+            'SHOW BROADCAST', 'SHOW CLUSTER', 'SHOW CPU', 'SHOW DEFAULT', 'SHOW DEVICES',
+            'SHOW DISPLAY', 'SHOW ENTRY', 'SHOW ERROR', 'SHOW FASTPATH', 'SHOW IMAGE',
+            'SHOW INTRUSION', 'SHOW KEY', 'SHOW LICENSE', 'SHOW LOGICAL', 'SHOW MEMORY',
+            'SHOW NETWORK', 'SHOW PRINTER', 'SHOW PROCESS', 'SHOW PROTECTION', 'SHOW QUEUE',
+            'SHOW QUOTA', 'SHOW RMS_DEFAULT', 'SHOW ROOT', 'SHOW SECURITY',
+            'SHOW SERVER ACME_SERVER', 'SHOW SERVER REGISTRY_SERVER', 'SHOW SHADOW',
+            'SHOW STATUS', 'SHOW SYMBOL', 'SHOW SYSTEM', 'SHOW TERMINAL', 'SHOW TIME',
+            'SHOW TRANSLATION', 'SHOW USERS', 'SHOW WORKING_SET', 'SHOW ZONE', 'SORT',
+            'SPAWN', 'START', 'STOP', 'SUBMIT', 'SUBROUTINE', 'SYNCHRONIZE', 'TYPE',
+            'UNLOCK', 'VIEW', 'WAIT', 'WRITE', 'XAUTH'
+            ),
+        2 => array( // lexical functions
+            'F$CONTEXT', 'F$CSID', 'F$CUNITS', 'F$CVSI', 'F$CVTIME', 'F$CVUI',
+            'F$DELTA_TIME', 'F$DEVICE', 'F$DIRECTORY', 'F$EDIT', 'F$ELEMENT',
+            'F$ENVIRONMENT', 'F$EXTRACT', 'F$FAO', 'F$FID_TO_NAME', 'F$FILE_ATTRIBUTES',
+            'F$GETDVI', 'F$GETENV', 'F$GETJPI', 'F$GETQUI', 'F$GETSYI', 'F$IDENTIFIER',
+            'F$INTEGER', 'F$LENGTH', 'F$LICENSE', 'F$LOCATE', 'F$MATCH_WILD', 'F$MESSAGE',
+            'F$MODE', 'F$MULTIPATH', 'F$PARSE', 'F$PID', 'F$PRIVILEGE', 'F$PROCESS',
+            'F$SEARCH', 'F$SETPRV', 'F$STRING', 'F$TIME', 'F$TRNLNM', 'F$TYPE', 'F$UNIQUE',
+            'F$USER', 'F$VERIFY'
+            ),
+        3 => array( // special variables etc
+            'sql$database', 'P1', 'P2', 'P3', 'P4', 'P5', 'P6', 'P7', 'P8', 'P9',
+            '$status', '$severity', 'sys$login', 'sys$system',
+            'sys$input', 'sys$output', 'sys$pipe'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '@', '&', '|', '<', '>', '-',
+        '.eqs.', '.eq.', '.lt.', '.lts.', '.gt.', '.gts.', '.ne.', '.nes.',
+        '.le.', '.ge.', '.ges.', '.les.',
+        '.EQS.', '.EQ.', '.LT.', '.LTS.', '.GT.', '.GTS.', '.NE.', '.NES.',
+        '.LE.', '.GE.', '.GES.', '.LES.',
+        '.and.', '.or.', '.not.',
+        '.AND.', '.OR.', '.NOT.',
+        '==', ':==', '=', ':='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #0066FF;',
+            3 => 'color: #993300;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;',
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #9999FF; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #006666;',
+            1 => 'color: #0099FF;',
+            2 => 'color: red;',
+            3 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #780078;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0099FF;',                     // variables
+            1 => 'color: #0000FF;',                     // qualifiers
+            2 => 'color: #FF6600; font-weight: bold;'   // labels
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // variables
+        0 => "'[a-zA-Z_\\-$]+'",
+        // qualifiers and parameters
+        1 => "(?:\/[a-zA-Z_\/]+)[\s=]",
+        // labels
+        2 => '(?<=\$)\s*[a-zA-Z\-_]+:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+        ),
+        'KEYWORDS' => array(
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/dcpu16.php b/vendor/easybook/geshi/geshi/dcpu16.php
new file mode 100755
index 000000000..5fcb25e51
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/dcpu16.php
@@ -0,0 +1,131 @@
+<?php
+/*************************************************************************************
+ * dcpu16.php
+ * -------
+ * Author: Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2007-2012 Benny Baumann (http://geshi.org/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/04/12
+ *
+ * DCPU/16 Assembly language file for GeSHi.
+ * Syntax definition based on http://0x10c.com/doc/dcpu-16.txt
+ *
+ * CHANGES
+ * -------
+ * 2012/04/12 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2012/04/12)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DCPU-16 Assembly',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_HEX_PREFIX,
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'set','add','sub','mul','div','mod','shl','shr','and','bor','xor',
+            'ife','ifn','ifg','ifb',
+            'jsr'
+            ),
+        /*registers*/
+        2 => array(
+            'a','b','c','x','y','z','i','j',
+            'pc','sp','o',
+            'pop','peek','push' //Special cases with DCPU-16
+            ),
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '+', '-', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000088; font-weight:bold;',
+            2 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000088;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #880000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://0x10c.com/doc/dcpu-16.txt',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        //0 => '0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        //1 => '\%[01]{1,64}|[01]{1,64}[bB]?(?![^<]*>)',
+        //Labels
+        2 => '^:[_a-zA-Z][_a-zA-Z0-9]?(?=\s|$)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#\/])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/dcs.php b/vendor/easybook/geshi/geshi/dcs.php
new file mode 100755
index 000000000..d32cfc5b9
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/dcs.php
@@ -0,0 +1,182 @@
+<?php
+/*************************************************************************************
+ * dcs.php
+ * ---------------------------------
+ * Author: Stelio Passaris (GeSHi@stelio.net)
+ * Copyright: (c) 2009 Stelio Passaris (http://stelio.net/stiki/GeSHi)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/01/20
+ *
+ * DCS language file for GeSHi.
+ *
+ * DCS (Data Conversion System) is part of Sungard iWorks' Prophet suite and is used
+ * to convert external data files into a format that Prophet and Glean can read.
+ * See http://www.prophet-web.com/Products/DCS for product information.
+ * This language file is current for DCS version 7.3.2.
+ *
+ * Note that the DCS IDE does not handle escape characters correctly. The IDE thinks
+ * that a backslash '\' is an escape character, but in practice the backslash does
+ * not escape the string delimiter character '"' when the program runs. A '\\' is
+ * escaped to '\' when the program runs, but '\"' is treated as '\' at the end of a
+ * string. Therefore in this language file, we do not recognise the backslash as an
+ * escape character. For the purposes of GeSHi, there is no character escaping.
+ *
+ * CHANGES
+ * -------
+ * 2009/02/21 (1.0.8.3)
+ *  -  First Release
+ *
+ * TODO (updated 2009/02/21)
+ * -------------------------
+ * * Add handling for embedded C code. Note that the DCS IDE does not highlight C code
+ *   correctly, but that doesn't mean that we can't! This will be included for a
+ *   stable release of GeSHi of version 1.1.x (or later) that allows for highlighting
+ *   embedded code using that code's appropriate language file.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DCS',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array(
+        ),
+    'COMMENT_REGEXP' => array(
+        // Highlight embedded C code in a separate color:
+        2 => '/\bINSERT_C_CODE\b.*?\bEND_C_CODE\b/ims'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(
+        '"'
+        ),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'ascii_value', 'bit_value', 'blank_date', 'calc_unit_values', 'cm',
+            'complete_months', 'complete_years', 'correct', 'create_input_file', 'cy',
+            'date_convert', 'day', 'del_output_separator',
+            'delete_existing_output_files', 'div', 'ex', 'exact_years', 'exp',
+            'extract_date', 'failed_validation', 'file_number', 'first_record',
+            'fract', 'fund_fac_a', 'fund_fac_b', 'fund_fac_c', 'fund_fac_d',
+            'fund_fac_e', 'fund_fac_f', 'fund_fac_g', 'fund_fac_h', 'fund_fac_i',
+            'fund_fac_j', 'fund_fac_k', 'fund_fac_l', 'fund_fac_m', 'fund_fac_n',
+            'fund_fac_o', 'fund_fac_p', 'fund_fac_q', 'fund_fac_r', 'fund_fac_s',
+            'fund_fac_t', 'fund_fac_u', 'fund_fac_v', 'fund_fac_w', 'fund_fac_x',
+            'fund_fac_y', 'fund_fac_z', 'group', 'group_record',
+            'input_file_date_time', 'input_file_extension', 'input_file_location',
+            'input_file_name', 'int', 'invalid', 'last_record', 'leap_year', 'len',
+            'ln', 'log', 'main_format_name', 'max', 'max_num_subrecords', 'message',
+            'min', 'mod', 'month', 'months_add', 'months_sub', 'nearest_months',
+            'nearest_years', 'next_record', 'nm', 'no_of_current_records',
+            'no_of_records', 'numval', 'ny', 'output', 'output_array_as_constants',
+            'output_file_path', 'output_record', 'pmdf_output', 'previous', 'rand',
+            're_start', 'read_generic_table', 'read_generic_table_text',
+            'read_input_footer', 'read_input_footer_text', 'read_input_header',
+            'read_input_header_text', 'record_count', 'record_suppressed', 'round',
+            'round_down', 'round_near', 'round_up', 'run_dcs_program', 'run_parameter',
+            'run_parameter_text', 'set_main_record', 'set_num_subrecords',
+            'sort_array', 'sort_current_records', 'sort_input', 'strval', 'substr',
+            'summarise', 'summarise_record', 'summarise_units',
+            'summarise_units_record', 'suppress_record', 'table_correct',
+            'table_validate', 'terminate', 'time', 'today', 'trim', 'ubound', 'year',
+            'years_add', 'years_sub'
+            ),
+        2 => array(
+            'and', 'as', 'begin', 'boolean', 'byref', 'byval', 'call', 'case', 'date',
+            'default', 'do', 'else', 'elseif', 'end_c_code', 'endfor', 'endfunction',
+            'endif', 'endproc', 'endswitch', 'endwhile', 'eq',
+            'explicit_declarations', 'false', 'for', 'from', 'function', 'ge', 'gt',
+            'if', 'insert_c_code', 'integer', 'le', 'loop', 'lt', 'ne', 'not',
+            'number', 'or', 'private', 'proc', 'public', 'quitloop', 'return',
+            'short', 'step', 'switch', 'text', 'then', 'to', 'true', 'while'
+            ),
+        3 => array(
+            // These keywords are not highlighted by the DCS IDE but we may as well
+            // keep track of them anyway:
+            'mp_file', 'odbc_file'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']',
+        '=', '<', '>',
+        '+', '-', '*', '/', '^',
+        ':', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: red;',
+            2 => 'color: blue;',
+            3 => 'color: black;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: black; background-color: silver;',
+            // Colors for highlighting embedded C code:
+            2 => 'color: maroon; background-color: pink;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: green;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: green;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: black;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/delphi.php b/vendor/easybook/geshi/geshi/delphi.php
new file mode 100755
index 000000000..34d0fd7bf
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/delphi.php
@@ -0,0 +1,299 @@
+<?php
+/*************************************************************************************
+ * delphi.php
+ * ----------
+ * Author: J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/26
+ *
+ * Delphi (Object Pascal) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/06/27 (1.0.8.11)
+ *   -  Added some keywords
+ *   -  fixed hex numbers and hex char literals (including WideChar)
+ *   -  Added support for FPC-Style generics
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/11/19 (1.0.3)
+ *   -  Updated the very incomplete keyword and type lists
+ * 2005/09/03 (1.0.2)
+ *   -  Added support for hex numbers and string entities
+ * 2004/11/27 (1.0.1)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Delphi',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
+    //Compiler directives
+    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+
+    'KEYWORDS' => array(
+        1 => array(
+            'Abstract', 'And', 'Array', 'As', 'Asm', 'At', 'Begin', 'Case',
+            'Class', 'Const', 'Constructor', 'Contains', 'Default', 'delayed', 'Destructor',
+            'DispInterface', 'Div', 'Do', 'DownTo', 'Else', 'End', 'Except',
+            'Export', 'Exports', 'External', 'File', 'Finalization', 'Finally', 'For',
+            'Function', 'Generic', 'Goto', 'If', 'Implementation', 'In', 'Inherited',
+            'Initialization', 'Inline', 'Interface', 'Is', 'Label', 'Library', 'Message',
+            'Mod', 'Nil', 'Not', 'Object', 'Of', 'On', 'Or', 'Overload', 'Override',
+            'Package', 'Packed', 'Private', 'Procedure', 'Program', 'Property',
+            'Protected', 'Public', 'Published', 'Read', 'Raise', 'Record', 'Register',
+            'Repeat', 'Requires', 'Resourcestring', 'Set', 'Shl', 'Shr', 'Specialize', 'Stored',
+            'Then', 'ThreadVar', 'To', 'Try', 'Type', 'Unit', 'Until', 'Uses', 'Var',
+            'Virtual', 'While', 'With', 'Write', 'Xor', 'assembler', 'far',
+            'near', 'pascal', 'cdecl', 'safecall', 'stdcall', 'varargs'
+            ),
+        2 => array(
+            'false', 'self', 'true',
+            ),
+        3 => array(
+            'Abs', 'AcquireExceptionObject', 'Addr', 'AnsiToUtf8', 'Append', 'ArcTan',
+            'Assert', 'AssignFile', 'Assigned', 'BeginThread', 'BlockRead',
+            'BlockWrite', 'Break', 'ChDir', 'Chr', 'Close', 'CloseFile',
+            'CompToCurrency', 'CompToDouble', 'Concat', 'Continue', 'Copy', 'Cos',
+            'Dec', 'Delete', 'Dispose', 'DoubleToComp', 'EndThread', 'EnumModules',
+            'EnumResourceModules', 'Eof', 'Eoln', 'Erase', 'ExceptAddr',
+            'ExceptObject', 'Exclude', 'Exit', 'Exp', 'FilePos', 'FileSize',
+            'FillChar', 'Finalize', 'FindClassHInstance', 'FindHInstance',
+            'FindResourceHInstance', 'Flush', 'Frac', 'FreeMem', 'Get8087CW',
+            'GetDir', 'GetLastError', 'GetMem', 'GetMemoryManager',
+            'GetModuleFileName', 'GetVariantManager', 'Halt', 'Hi', 'High',
+            'IOResult', 'Inc', 'Include', 'Initialize', 'Insert', 'Int',
+            'IsMemoryManagerSet', 'IsVariantManagerSet', 'Length', 'Ln', 'Lo', 'Low',
+            'MkDir', 'Move', 'New', 'Odd', 'OleStrToStrVar', 'OleStrToString', 'Ord',
+            'PUCS4Chars', 'ParamCount', 'ParamStr', 'Pi', 'Pos', 'Pred', 'Ptr',
+            'Random', 'Randomize', 'Read', 'ReadLn', 'ReallocMem',
+            'ReleaseExceptionObject', 'Rename', 'Reset', 'Rewrite', 'RmDir', 'Round',
+            'RunError', 'Seek', 'SeekEof', 'SeekEoln', 'Set8087CW', 'SetLength',
+            'SetLineBreakStyle', 'SetMemoryManager', 'SetString', 'SetTextBuf',
+            'SetVariantManager', 'Sin', 'SizeOf', 'Slice', 'Sqr', 'Sqrt', 'Str',
+            'StringOfChar', 'StringToOleStr', 'StringToWideChar', 'Succ', 'Swap',
+            'Trunc', 'Truncate', 'TypeInfo', 'UCS4StringToWideString', 'UTF8Decode',
+            'UTF8Encode', 'UnicodeToUtf8', 'UniqueString', 'UpCase', 'Utf8ToAnsi',
+            'Utf8ToUnicode', 'Val', 'VarArrayRedim', 'VarClear',
+            'WideCharLenToStrVar', 'WideCharLenToString', 'WideCharToStrVar',
+            'WideCharToString', 'WideStringToUCS4String', 'Write', 'WriteLn',
+
+            'Abort', 'AddExitProc', 'AddTerminateProc', 'AdjustLineBreaks', 'AllocMem',
+            'AnsiCompareFileName', 'AnsiCompareStr', 'AnsiCompareText',
+            'AnsiDequotedStr', 'AnsiExtractQuotedStr', 'AnsiLastChar',
+            'AnsiLowerCase', 'AnsiLowerCaseFileName', 'AnsiPos', 'AnsiQuotedStr',
+            'AnsiSameStr', 'AnsiSameText', 'AnsiStrComp', 'AnsiStrIComp',
+            'AnsiStrLComp', 'AnsiStrLIComp', 'AnsiStrLastChar', 'AnsiStrLower',
+            'AnsiStrPos', 'AnsiStrRScan', 'AnsiStrScan', 'AnsiStrUpper',
+            'AnsiUpperCase', 'AnsiUpperCaseFileName', 'AppendStr', 'AssignStr',
+            'Beep', 'BoolToStr', 'ByteToCharIndex', 'ByteToCharLen', 'ByteType',
+            'CallTerminateProcs', 'ChangeFileExt', 'CharLength', 'CharToByteIndex',
+            'CharToByteLen', 'CompareMem', 'CompareStr', 'CompareText', 'CreateDir',
+            'CreateGUID', 'CurrToStr', 'CurrToStrF', 'CurrentYear', 'Date',
+            'DateTimeToFileDate', 'DateTimeToStr', 'DateTimeToString',
+            'DateTimeToSystemTime', 'DateTimeToTimeStamp', 'DateToStr', 'DayOfWeek',
+            'DecodeDate', 'DecodeDateFully', 'DecodeTime', 'DeleteFile',
+            'DirectoryExists', 'DiskFree', 'DiskSize', 'DisposeStr', 'EncodeDate',
+            'EncodeTime', 'ExceptionErrorMessage', 'ExcludeTrailingBackslash',
+            'ExcludeTrailingPathDelimiter', 'ExpandFileName', 'ExpandFileNameCase',
+            'ExpandUNCFileName', 'ExtractFileDir', 'ExtractFileDrive',
+            'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath',
+            'ExtractRelativePath', 'ExtractShortPathName', 'FileAge', 'FileClose',
+            'FileCreate', 'FileDateToDateTime', 'FileExists', 'FileGetAttr',
+            'FileGetDate', 'FileIsReadOnly', 'FileOpen', 'FileRead', 'FileSearch',
+            'FileSeek', 'FileSetAttr', 'FileSetDate', 'FileSetReadOnly', 'FileWrite',
+            'FinalizePackage', 'FindClose', 'FindCmdLineSwitch', 'FindFirst',
+            'FindNext', 'FloatToCurr', 'FloatToDateTime', 'FloatToDecimal',
+            'FloatToStr', 'FloatToStrF', 'FloatToText', 'FloatToTextFmt',
+            'FmtLoadStr', 'FmtStr', 'ForceDirectories', 'Format', 'FormatBuf',
+            'FormatCurr', 'FormatDateTime', 'FormatFloat', 'FreeAndNil',
+            'GUIDToString', 'GetCurrentDir', 'GetEnvironmentVariable',
+            'GetFileVersion', 'GetFormatSettings', 'GetLocaleFormatSettings',
+            'GetModuleName', 'GetPackageDescription', 'GetPackageInfo', 'GetTime',
+            'IncAMonth', 'IncMonth', 'IncludeTrailingBackslash',
+            'IncludeTrailingPathDelimiter', 'InitializePackage', 'IntToHex',
+            'IntToStr', 'InterlockedDecrement', 'InterlockedExchange',
+            'InterlockedExchangeAdd', 'InterlockedIncrement', 'IsDelimiter',
+            'IsEqualGUID', 'IsLeapYear', 'IsPathDelimiter', 'IsValidIdent',
+            'Languages', 'LastDelimiter', 'LoadPackage', 'LoadStr', 'LowerCase',
+            'MSecsToTimeStamp', 'NewStr', 'NextCharIndex', 'Now', 'OutOfMemoryError',
+            'QuotedStr', 'RaiseLastOSError', 'RaiseLastWin32Error', 'RemoveDir',
+            'RenameFile', 'ReplaceDate', 'ReplaceTime', 'SafeLoadLibrary',
+            'SameFileName', 'SameText', 'SetCurrentDir', 'ShowException', 'Sleep',
+            'StrAlloc', 'StrBufSize', 'StrByteType', 'StrCat', 'StrCharLength',
+            'StrComp', 'StrCopy', 'StrDispose', 'StrECopy', 'StrEnd', 'StrFmt',
+            'StrIComp', 'StrLCat', 'StrLComp', 'StrLCopy', 'StrLFmt', 'StrLIComp',
+            'StrLen', 'StrLower', 'StrMove', 'StrNew', 'StrNextChar', 'StrPCopy',
+            'StrPLCopy', 'StrPas', 'StrPos', 'StrRScan', 'StrScan', 'StrToBool',
+            'StrToBoolDef', 'StrToCurr', 'StrToCurrDef', 'StrToDate', 'StrToDateDef',
+            'StrToDateTime', 'StrToDateTimeDef', 'StrToFloat', 'StrToFloatDef',
+            'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime',
+            'StrToTimeDef', 'StrUpper', 'StringReplace', 'StringToGUID', 'Supports',
+            'SysErrorMessage', 'SystemTimeToDateTime', 'TextToFloat', 'Time',
+            'TimeStampToDateTime', 'TimeStampToMSecs', 'TimeToStr', 'Trim',
+            'TrimLeft', 'TrimRight', 'TryEncodeDate', 'TryEncodeTime',
+            'TryFloatToCurr', 'TryFloatToDateTime', 'TryStrToBool', 'TryStrToCurr',
+            'TryStrToDate', 'TryStrToDateTime', 'TryStrToFloat', 'TryStrToInt',
+            'TryStrToInt64', 'TryStrToTime', 'UnloadPackage', 'UpperCase',
+            'WideCompareStr', 'WideCompareText', 'WideFmtStr', 'WideFormat',
+            'WideFormatBuf', 'WideLowerCase', 'WideSameStr', 'WideSameText',
+            'WideUpperCase', 'Win32Check', 'WrapText',
+
+            'ActivateClassGroup', 'AllocateHwnd', 'BinToHex', 'CheckSynchronize',
+            'CollectionsEqual', 'CountGenerations', 'DeallocateHwnd', 'EqualRect',
+            'ExtractStrings', 'FindClass', 'FindGlobalComponent', 'GetClass',
+            'GroupDescendantsWith', 'HexToBin', 'IdentToInt',
+            'InitInheritedComponent', 'IntToIdent', 'InvalidPoint',
+            'IsUniqueGlobalComponentName', 'LineStart', 'ObjectBinaryToText',
+            'ObjectResourceToText', 'ObjectTextToBinary', 'ObjectTextToResource',
+            'PointsEqual', 'ReadComponentRes', 'ReadComponentResEx',
+            'ReadComponentResFile', 'Rect', 'RegisterClass', 'RegisterClassAlias',
+            'RegisterClasses', 'RegisterComponents', 'RegisterIntegerConsts',
+            'RegisterNoIcon', 'RegisterNonActiveX', 'SmallPoint', 'StartClassGroup',
+            'TestStreamFormat', 'UnregisterClass', 'UnregisterClasses',
+            'UnregisterIntegerConsts', 'UnregisterModuleClasses',
+            'WriteComponentResFile',
+
+            'ArcCos', 'ArcCosh', 'ArcCot', 'ArcCotH', 'ArcCsc', 'ArcCscH', 'ArcSec',
+            'ArcSecH', 'ArcSin', 'ArcSinh', 'ArcTan2', 'ArcTanh', 'Ceil',
+            'CompareValue', 'Cosecant', 'Cosh', 'Cot', 'CotH', 'Cotan', 'Csc', 'CscH',
+            'CycleToDeg', 'CycleToGrad', 'CycleToRad', 'DegToCycle', 'DegToGrad',
+            'DegToRad', 'DivMod', 'DoubleDecliningBalance', 'EnsureRange', 'Floor',
+            'Frexp', 'FutureValue', 'GetExceptionMask', 'GetPrecisionMode',
+            'GetRoundMode', 'GradToCycle', 'GradToDeg', 'GradToRad', 'Hypot',
+            'InRange', 'IntPower', 'InterestPayment', 'InterestRate',
+            'InternalRateOfReturn', 'IsInfinite', 'IsNan', 'IsZero', 'Ldexp', 'LnXP1',
+            'Log10', 'Log2', 'LogN', 'Max', 'MaxIntValue', 'MaxValue', 'Mean',
+            'MeanAndStdDev', 'Min', 'MinIntValue', 'MinValue', 'MomentSkewKurtosis',
+            'NetPresentValue', 'Norm', 'NumberOfPeriods', 'Payment', 'PeriodPayment',
+            'Poly', 'PopnStdDev', 'PopnVariance', 'Power', 'PresentValue',
+            'RadToCycle', 'RadToDeg', 'RadToGrad', 'RandG', 'RandomRange', 'RoundTo',
+            'SLNDepreciation', 'SYDDepreciation', 'SameValue', 'Sec', 'SecH',
+            'Secant', 'SetExceptionMask', 'SetPrecisionMode', 'SetRoundMode', 'Sign',
+            'SimpleRoundTo', 'SinCos', 'Sinh', 'StdDev', 'Sum', 'SumInt',
+            'SumOfSquares', 'SumsAndSquares', 'Tan', 'Tanh', 'TotalVariance',
+            'Variance'
+            ),
+        4 => array(
+            'AnsiChar', 'AnsiString', 'Bool', 'Boolean', 'Byte', 'ByteBool', 'Cardinal', 'Char',
+            'Comp', 'Currency', 'DWORD', 'Double', 'Extended', 'Int64', 'Integer', 'IUnknown',
+            'LongBool', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PBool', 'PBoolean', 'PByte',
+            'PByteArray', 'PCardinal', 'PChar', 'PComp', 'PCurrency', 'PDWORD', 'PDate', 'PDateTime',
+            'PDouble', 'PExtended', 'PInt64', 'PInteger', 'PLongInt', 'PLongWord', 'Pointer', 'PPointer',
+            'PShortInt', 'PShortString', 'PSingle', 'PSmallInt', 'PString', 'PHandle', 'PVariant', 'PWord',
+            'PWordArray', 'PWordBool', 'PWideChar', 'PWideString', 'Real', 'Real48', 'ShortInt', 'ShortString',
+            'Single', 'SmallInt', 'String', 'TClass', 'TDate', 'TDateTime', 'TextFile', 'THandle',
+            'TObject', 'TTime', 'Variant', 'WideChar', 'WideString', 'Word', 'WordBool'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('.', ',', ':', ';'),
+        2 => array('@', '^'),
+        3 => array('=', '+', '-', '*', '/')
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000cc;',
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000066;',
+            2 => 'color: #000066;',
+            3 => 'color: #000066;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '(?<!\#)\$[0-9a-fA-F]+(?!\w)',
+        //Characters
+        1 => '\#(?:\$[0-9a-fA-F]{1,4}|\d{1,5})'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_AFTER' => '(?=\s*[(;])'
+                )
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/diff.php b/vendor/easybook/geshi/geshi/diff.php
new file mode 100755
index 000000000..5b6817178
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/diff.php
@@ -0,0 +1,196 @@
+<?php
+/*************************************************************************************
+ * diff.php
+ * --------
+ * Author: Conny Brunnkvist (conny@fuchsia.se), W. Tasin (tasin@fhm.edu)
+ * Copyright: (c) 2004 Fuchsia Open Source Solutions (http://www.fuchsia.se/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/12/29
+ *
+ * Diff-output language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2006/02/27
+ *  -  changing language file to use matching of start (^) and end ($) (wt)
+ * 2004/12/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/02/27)
+ * -------------------------
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+
+$language_data = array (
+    'LANG_NAME' => 'Diff',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => ' ',
+    'KEYWORDS' => array(
+            1 => array(
+                '\ No newline at end of file'
+            ),
+//            2 => array(
+//                '***************' /* This only seems to works in some cases? */
+//            ),
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => false,
+//        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #aaaaaa; font-style: italic;',
+//            2 => 'color: #dd6611;',
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => ''
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => ''
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #440088;',
+            1 => 'color: #991111;',
+            2 => 'color: #00b000;',
+            3 => 'color: #888822;',
+            4 => 'color: #888822;',
+            5 => 'color: #0011dd;',
+            6 => 'color: #440088;',
+            7 => 'color: #991111;',
+            8 => 'color: #00b000;',
+            9 => 'color: #888822;',
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+//        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => "[0-9,]+[acd][0-9,]+",
+        //Removed lines
+        1 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\&lt;.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted lines
+        2 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\&gt;.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Location line
+        3 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))-{3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted line
+        4 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))(\\+){3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Modified line
+        5 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\!.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //File specification
+        6 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))[\\@]{2}.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Removed line
+        7 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\-.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted line
+        8 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\+.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //File specification
+        9 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))(\\*){3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/div.php b/vendor/easybook/geshi/geshi/div.php
new file mode 100755
index 000000000..fb8a72a16
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/div.php
@@ -0,0 +1,124 @@
+<?php
+/*************************************************************************************
+ * div.php
+ * ---------------------------------
+ * Author: Gabriel Lorenzo (ermakina@gmail.com)
+ * Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/06/19
+ *
+ * DIV language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/06/22 (1.0.0)
+ *  -  First Release, includes "2nd gen" ELSEIF statement
+ *
+ * TODO (updated 2005/06/22)
+ * -------------------------
+ *  -  I'm pretty satisfied with this, so nothing for now... :P
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DIV',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'while','until','to','switch','step','return','repeat','loop','if','from','frame','for','end','elseif',
+            'else','default','debug','continue','clone','case','break','begin'
+            ),
+        2 => array(
+            'xor','whoami','type','sizeof','pointer','or','offset','not','neg','mod','id','dup','and','_ne','_lt',
+            '_le','_gt','_ge','_eq'
+            ),
+        3 => array(
+            'setup_program','program','process','private','local','import','global','function','const',
+            'compiler_options'
+            ),
+        4 => array(
+            'word','struct','string','int','byte'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(',')','[',']','=','+','-','*','/','!','%','^','&',':',';',',','<','>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0040b1;',
+            2 => 'color: #000000;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #44aa44;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #202020;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #44aa44;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/dos.php b/vendor/easybook/geshi/geshi/dos.php
new file mode 100755
index 000000000..36d99836b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/dos.php
@@ -0,0 +1,227 @@
+<?php
+/*************************************************************************************
+ * dos.php
+ * -------
+ * Author: Alessandro Staltari (staltari@geocities.com)
+ * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/07/05
+ *
+ * DOS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/07/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2005/07/05)
+ * -------------------------
+ *
+ * - Highlight pipes and redirection (do we really need this?)
+ * - Add missing keywords.
+ * - Find a good hyperlink for keywords.
+ * - Improve styles.
+ *
+ * KNOWN ISSUES (updated 2005/07/07)
+ * ---------------------------------
+ *
+ * - Doesn't even try to handle spaces in variables name or labels (I can't
+ *   find a reliable way to establish if a sting is a name or not, in some
+ *   cases it depends on the contex or enviroment status).
+ * - Doesn't handle %%[letter] pseudo variable used inside FOR constructs
+ *   (it should be done only into its scope: how to handle variable it?).
+ * - Doesn't handle %~[something] pseudo arguments.
+ * - If the same keyword is placed at the end of the line and the
+ *   beginning of the next, the second occourrence is not highlighted
+ *   (this should be a GeSHi bug, not related to the language definition).
+ * - I can't avoid to have keyword highlighted even when they are not used
+ *   as keywords but, for example, as arguments to the echo command.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DOS',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    //DOS comment lines
+    'COMMENT_REGEXP' => array(
+        1 => "/^\s*@?REM\b.*$/mi",
+        2 => "/^\s*::.*$/m",
+        3 => "/\^./"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Flow control keywords */
+        1 => array(
+            'if', 'else', 'goto', 'shift',
+            'for', 'in', 'do',
+            'call', 'exit'
+            ),
+        /* IF statement keywords */
+        2 => array(
+            'not', 'exist', 'errorlevel',
+            'defined',
+            'equ', 'neq', 'lss', 'leq', 'gtr', 'geq'
+            ),
+        /* Internal commands */
+        3 => array(
+            'cd', 'md', 'rd', 'chdir', 'mkdir', 'rmdir', 'dir',
+            'del', 'copy', 'move', 'ren', 'rename',
+            'echo',
+            'setlocal', 'endlocal', 'set',
+            'pause',
+            'pushd', 'popd', 'title', 'verify'
+            ),
+        /* Special files */
+        4 => array(
+            'prn', 'nul', 'lpt3', 'lpt2', 'lpt1', 'con',
+            'com4', 'com3', 'com2', 'com1', 'aux'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '@', '%', '!', '|', '<', '>', '&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00b100; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #b1b100; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #b100b1; font-style: italic;',
+            3 => 'color: #33cc33;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #33cc33;',
+            1 => 'color: #33cc33;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #b100b1; font-weight: bold;',
+            1 => 'color: #448844;',
+            2 => 'color: #448888;',
+            3 => 'color: #448888;'
+            )
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'URLS' => array(
+        1 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        2 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        3 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        4 => 'http://www.ss64.com/nt/{FNAMEL}.html'
+        ),
+    'REGEXPS' => array(
+        /* Label */
+        0 => array(
+/*            GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\s\n]*)',*/
+            GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\s\n]*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+        ),
+        /* Variable assignement */
+        1 => array(
+/*            GESHI_SEARCH => '(SET[\s]+(?si:\/A[\s]+|\/P[\s]+|))([^=\s\n]+)([\s]*=)',*/
+            GESHI_SEARCH => '(SET\s+(?si:\\/A\s+|\\/P\s+)?)([^=\n]+)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        /* Arguments or variable evaluation */
+        2 => array(
+/*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((?<!%\d)%|)',*/
+            GESHI_SEARCH => '(!(?:!(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^!>\n]*(?=!))((?<!%\d)%|)(?!!>)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        /* Arguments or variable evaluation */
+        3 => array(
+/*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((?<!%\d)%|)',*/
+            GESHI_SEARCH => '(%(?:%(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^%\n]*(?=%))((?<!%\d)%|)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<![\w\-])'
+                ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<![\w\-])'
+                ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<![\w\-])'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/dot.php b/vendor/easybook/geshi/geshi/dot.php
new file mode 100755
index 000000000..bdf240a1f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/dot.php
@@ -0,0 +1,164 @@
+<?php
+/*************************************************************************************
+ * dot.php
+ * ---------------------------------
+ * Author: Adrien Friggeri (adrien@friggeri.net)
+ * Copyright: (c) 2007 Adrien Friggeri (http://www.friggeri.net)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/05/30
+ *
+ * dot language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/05/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/05/30)
+ * -------------------------
+ * Everything
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'dot',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'URL', 'arrowhead', 'arrowsize', 'arrowtail', 'bb', 'bgcolor', 'bottomlabel',
+            'center', 'clusterrank', 'color', 'comment', 'constraint', 'decorate',
+            'dir', 'distortion', 'fillcolor', 'fixedsize', 'fontcolor',
+            'fontname', 'fontsize', 'group', 'headclip', 'headlabel', 'headport',
+            'height', 'id', 'label', 'labelangle', 'labeldistance', 'labelfontcolor',
+            'labelfontname', 'labelfontsize', 'layer', 'layers', 'margin', 'mclimit',
+            'minlen', 'nodesep', 'nslimit', 'ordering', 'orientation', 'page',
+            'pagedir', 'peripheries', 'port_label_distance', 'quantum', 'rank', 'rankdir',
+            'ranksep', 'ratio', 'regular', 'rotate', 'samehead', 'sametail', 'searchsize',
+            'shape', 'shapefile', 'showboxes', 'sides', 'size', 'skew', 'style',
+            'tailclip', 'taillabel', 'tailport', 'toplabel', 'weight', 'width'
+            ),
+        2 => array(
+            'node', 'graph', 'digraph', 'strict', 'edge', 'subgraph'
+            ),
+        3 => array(
+            'Mcircle', 'Mdiamond', 'Mrecord', 'Msquare', 'auto', 'back', 'bold',
+            'both', 'box', 'circle', 'compress', 'dashed', 'diamond', 'dot',
+            'dotted', 'doublecircle', 'doubleoctagon', 'egg', 'ellipse', 'epsf',
+            'false', 'fill', 'filled', 'forward', 'global', 'hexagon', 'house',
+            'inv', 'invdot', 'invhouse', 'invis', 'invodot', 'invtrapezium',
+            'invtriangle', 'local', 'max', 'min', 'none', 'normal', 'octagon',
+            'odot', 'out', 'parallelogram', 'plaintext', 'polygon', 'record',
+            'same', 'solid', 'trapezium', 'triangle', 'tripleoctagon', 'true'
+            ),
+        4 => array(
+            'aliceblue', 'antiquewhite', 'aquamarine', 'azure', 'beige', 'bisque', 'black',
+            'blanchedalmond', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue',
+            'chartreuse', 'chocolate', 'coral', 'cornflowerblue', 'cornsilk', 'crimson',
+            'cyan', 'darkgoldenrod', 'darkgreen', 'darkkhaki', 'darkolivegreen',
+            'darkorange', 'darkorchid', 'darksalmon', 'darkseagreen', 'darkslateblue',
+            'darkslategray', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue',
+            'dimgray', 'dodgerblue', 'firebrick', 'forestgreen', 'gainsboro', 'ghostwhite',
+            'gold', 'goldenrod', 'gray', 'green', 'greenyellow', 'honeydew', 'hotpink',
+            'indianred', 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush',
+            'lawngreen', 'lemonchiffon', 'lightblue', 'lightcyan', 'lightgoldenrod',
+            'lightgoldenrodyellow', 'lightgray', 'lightpink', 'lightsalmon',
+            'lightseagreen', 'lightskyblue', 'lightslateblue', 'lightslategray',
+            'lightyellow', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine',
+            'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen',
+            'mediumslateblue', 'mediumspringgreen', 'mediumturquoise', 'mediumvioletred',
+            'midnightblue', 'mintcream', 'mistyrose', 'moccasin', 'navajowhite', 'navy',
+            'navyblue', 'oldlace', 'olivedrab', 'oralwhite', 'orange', 'orangered',
+            'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise', 'palevioletred',
+            'papayawhip', 'peachpuff', 'peru', 'pink', 'plum', 'powderblue', 'purple',
+            'red', 'rosybrown', 'royalblue', 'saddlebrown', 'salmon', 'salmon2', 'sandybrown',
+            'seagreen', 'seashell', 'sienna', 'skyblue', 'slateblue', 'slategray', 'snow',
+            'springgreen', 'steelblue', 'tan', 'thistle', 'tomato', 'turquoise', 'violet',
+            'violetred', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '{', '}', '-', '+', '*', '/', '<', '>', '!', '~', '%', '&', '|', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #993333;',
+            4 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #af624d; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'METHODS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/e.php b/vendor/easybook/geshi/geshi/e.php
new file mode 100755
index 000000000..319bee016
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/e.php
@@ -0,0 +1,208 @@
+<?php
+/*************************************************************************************
+ * e.php
+ * --------
+ * Author: Kevin Reid (kpreid@switchb.org)
+ * Copyright: (c) 2010 Kevin Reid (http://switchb.org/kpreid/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/04/16
+ *
+ * E language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010-04-21 (1.0.8.8)
+ *  -  Fixing langcheck-reported bugs.
+ * 2010-04-14 (0.1)
+ *  -  First Release
+ *
+ * TODO (updated 2010-04-21)
+ * -------------------------
+ *  -  Do something useful with the keyword groups. Since RC uses CSS classes named
+ *     by the group numbers, either
+ *     - change the numbering to match conventional uses by other languages,
+ *     - or find or create some way to produce usefully named classes.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'E',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('/**' => '*/'), // Note: This is method doc, not a general comment syntax.
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+
+    // FIXME: The escaping inside ` is actually doubling of any interior `, $, or @ -- backslash is NOT special
+    'QUOTEMARKS' => array('\'', '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+
+    'KEYWORDS' => array(
+        // builtin control structures
+        1 => array(
+            'accum', 'break', 'try', 'continue', 'if', 'while', 'for', 'switch'
+            ),
+
+        // control structures subsidiary keywords
+        2 => array(
+            'catch', 'else', 'finally', 'in', 'exit'
+            ),
+
+        // named operators
+        3 => array(
+            'fn', 'via'
+            ),
+
+        // variable/function/object definers
+        4 => array(
+            'def', 'bind', 'var'
+            ),
+
+        // object definition subsidiary keywords
+        5 => array(
+            'extends', 'as', 'implements', 'guards', 'match', 'to', 'method'
+            ),
+
+        // builtin nouns in safeEnv
+        6 => array(
+            'null', 'false', 'true', 'throw', '__loop', '__makeList',
+            '__makeMap', '__makeProtocolDesc', '__makeMessageDesc',
+            '__makeParamDesc', 'any', 'void', 'boolean', '__makeOrderedSpace',
+            'ValueGuard', '__MatchContext', 'require', '__makeVerbFacet', 'NaN',
+            'Infinity', '__identityFunc', '__makeInt', '__makeFinalSlot',
+            '__makeVarSlot', '__makeGuardedSlot', '__makeGuard', '__makeTwine',
+            '__makeSourceSpan', '__auditedBy', 'Guard', 'near', 'pbc',
+            'PassByCopy', 'DeepPassByCopy', 'Data', 'Persistent', 'DeepFrozen',
+            'int', 'float64', 'char', 'String', 'Twine', 'TextWriter', 'List',
+            'Map', 'nullOk', 'Tuple', '__Portrayal', 'notNull', 'vow', 'rcvr',
+            'SturdyRef', 'simple__quasiParser', 'twine__quasiParser',
+            'rx__quasiParser', 'e__quasiParser', 'epatt__quasiParser',
+            'sml__quasiParser', 'term__quasiParser', 'traceln', '__equalizer',
+            '__comparer', 'Ref', 'E', 'promiseAllFulfilled', 'EIO', 'help',
+            'safeScope', '__eval', 'resource__uriGetter', 'type__uriGetter',
+            'import__uriGetter', 'elib__uriGetter', 'elang__uriGetter',
+            'opaque__uriGetter'
+            ),
+
+        // builtin nouns in privilegedEnv
+        7 => array(
+            'file__uriGetter', 'fileURL__uriGetter', 'jar__uriGetter',
+            'http__uriGetter', 'ftp__uriGetter', 'gopher__uriGetter',
+            'news__uriGetter', 'cap__uriGetter', 'makeCommand', 'stdout',
+            'stderr', 'stdin', 'print', 'println', 'interp', 'entropy', 'timer',
+            'introducer', 'identityMgr', 'makeSturdyRef', 'timeMachine',
+            'unsafe__uriGetter', 'currentVat', 'rune', 'awt__uriGetter',
+            'swing__uriGetter', 'JPanel__quasiParser', 'swt__uriGetter',
+            'currentDisplay', 'swtGrid__quasiParser', 'swtGrid`',
+            'privilegedScope'
+            ),
+
+        // reserved keywords
+        8 => array(
+            'abstract', 'an', 'assert', 'attribute', 'be', 'begin', 'behalf',
+            'belief', 'believe', 'believes', 'case', 'class', 'const',
+            'constructor', 'declare', 'default', 'define', 'defmacro',
+            'delicate', 'deprecated', 'dispatch', 'do', 'encapsulate',
+            'encapsulated', 'encapsulates', 'end', 'ensure', 'enum', 'eventual',
+            'eventually', 'export', 'facet', 'forall', 'function', 'given',
+            'hidden', 'hides', 'inline', 'is', 'know', 'knows', 'lambda', 'let',
+            'methods', 'module', 'namespace', 'native', 'obeys', 'octet',
+            'oneway', 'operator', 'package', 'private', 'protected', 'public',
+            'raises', 'reliance', 'reliant', 'relies', 'rely', 'reveal', 'sake',
+            'signed', 'static', 'struct', 'suchthat', 'supports', 'suspect',
+            'suspects', 'synchronized', 'this', 'transient', 'truncatable',
+            'typedef', 'unsigned', 'unum', 'uses', 'using', 'utf8', 'utf16',
+            'virtual', 'volatile', 'wstring'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;',
+            4 => 'color: #b1b100;',
+            5 => 'color: #b1b100;',
+            6 => 'color: #b1b100;',
+            7 => 'color: #b1b100;',
+            8 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => 'http://wiki.erights.org/wiki/{FNAME}',
+        2 => 'http://wiki.erights.org/wiki/{FNAME}',
+        3 => 'http://wiki.erights.org/wiki/{FNAME}',
+        4 => 'http://wiki.erights.org/wiki/{FNAME}',
+        5 => 'http://wiki.erights.org/wiki/{FNAME}',
+        6 => 'http://wiki.erights.org/wiki/{FNAME}',
+        7 => 'http://wiki.erights.org/wiki/{FNAME}',
+        8 => 'http://wiki.erights.org/wiki/{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '<-',
+        3 => '::'
+        ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/ecmascript.php b/vendor/easybook/geshi/geshi/ecmascript.php
new file mode 100755
index 000000000..69a55c9aa
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ecmascript.php
@@ -0,0 +1,210 @@
+<?php
+/*************************************************************************************
+ * ecmascript.php
+ * --------------
+ * Author: Michel Mariani (http://www.tonton-pixel.com/site/)
+ * Copyright: (c) 2010 Michel Mariani (http://www.tonton-pixel.com/site/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/01/08
+ *
+ * ECMAScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/01/08 (1.0.8.6)
+ *  -  First Release
+ *  -  Adapted from javascript.php to support plain ECMAScript/JavaScript (no HTML, no DOM)
+ *  -  Fixed regular expression for 'COMMENT_REGEXP' to exclude 'COMMENT_MULTI' syntax
+ *  -  Added '~' and removed '@' from 'SYMBOLS'
+ *  -  Cleaned up and expanded the list of 'KEYWORDS'
+ *  -  Added support for 'ESCAPE_REGEXP' and 'NUMBERS' (from c.php)
+ *  -  Selected colors to match my web site color chart
+ *  -  Added full number highlighting in all C language style formats
+ *  -  Added highlighting of escape sequences in strings, in all C language style formats including Unicode (\uXXXX).
+ *
+ * TODO (updated 2010/01/08)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ECMAScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    // Regular Expression Literals
+    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array( // Reserved literals
+            'false', 'true',
+            'null'
+            ),
+        2 => array( // Main keywords
+            'break', 'case', 'catch', 'continue', 'default', 'delete', 'do', 'else',
+            'finally', 'for', 'function', 'if', 'in', 'instanceof', 'new', 'return',
+            'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void', 'while',
+            'with'
+            ),
+        3 => array( // Extra keywords or keywords reserved for future use
+            'abstract', 'as', 'boolean', 'byte', 'char', 'class', 'const', 'debugger',
+            'double', 'enum', 'export', 'extends', 'final', 'float', 'goto', 'implements',
+            'import', 'int', 'interface', 'is', 'long', 'native', 'namespace', 'package',
+            'private', 'protected', 'public', 'short', 'static', 'super', 'synchronized', 'throws',
+            'transient', 'use', 'volatile'
+            ),
+        4 => array( // Operators
+            'get', 'set'
+            ),
+        5 => array( // Built-in object classes
+            'Array', 'Boolean', 'Date', 'EvalError', 'Error', 'Function', 'Math', 'Number',
+            'Object', 'RangeError', 'ReferenceError', 'RegExp', 'String', 'SyntaxError', 'TypeError', 'URIError'
+            ),
+        6 => array( // Global properties
+            'Infinity', 'NaN', 'undefined'
+            ),
+        7 => array( // Global methods
+            'decodeURI', 'decodeURIComponent', 'encodeURI', 'encodeURIComponent',
+            'eval', 'isFinite', 'isNaN', 'parseFloat', 'parseInt',
+            // The escape and unescape functions do not work properly for non-ASCII characters and have been deprecated.
+            // In JavaScript 1.5 and later, use encodeURI, decodeURI, encodeURIComponent, and decodeURIComponent.
+            'escape', 'unescape'
+            ),
+        8 => array( // Function's arguments
+            'arguments'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '.', '&', '|', '^',
+        '<', '>', '=', '~',
+        ',', ';', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #009999;',
+            2 => 'color: #1500C8;',
+            3 => 'color: #1500C8;',
+            4 => 'color: #1500C8;',
+            5 => 'color: #1500C8;',
+            6 => 'color: #1500C8;',
+            7 => 'color: #1500C8;',
+            8 => 'color: #1500C8;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #CC0000;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #3366CC;',
+            1 => 'color: #3366CC;',
+            2 => 'color: #3366CC;',
+            3 => 'color: #3366CC;',
+            4 => 'color: #3366CC;',
+            5 => 'color: #3366CC;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008800;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #9900FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #FF00FF;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #FF00FF;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_NONSCI => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/eiffel.php b/vendor/easybook/geshi/geshi/eiffel.php
new file mode 100755
index 000000000..807d23f94
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/eiffel.php
@@ -0,0 +1,393 @@
+<?php
+/*************************************************************************************
+ * eiffel.php
+ * ----------
+ * Author: Zoran Simic (zsimic@axarosenberg.com)
+ * Copyright: (c) 2005 Zoran Simic
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/06/30
+ *
+ * Eiffel language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/06/30 (1.0.7)
+ *  -  Initial release
+ *
+ * TODO (updated 2005/06/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Eiffel',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '%',
+    'KEYWORDS' => array(
+        1 => array(
+            'separate',
+            'invariant',
+            'inherit',
+            'indexing',
+            'feature',
+            'expanded',
+            'deferred',
+            'class'
+            ),
+        2 => array(
+            'xor',
+            'when',
+            'variant',
+            'until',
+            'unique',
+            'undefine',
+            'then',
+            'strip',
+            'select',
+            'retry',
+            'rescue',
+            'require',
+            'rename',
+            'reference',
+            'redefine',
+            'prefix',
+            'or',
+            'once',
+            'old',
+            'obsolete',
+            'not',
+            'loop',
+            'local',
+            'like',
+            'is',
+            'inspect',
+            'infix',
+            'include',
+            'implies',
+            'if',
+            'frozen',
+            'from',
+            'external',
+            'export',
+            'ensure',
+            'end',
+            'elseif',
+            'else',
+            'do',
+            'creation',
+            'create',
+            'check',
+            'as',
+            'and',
+            'alias',
+            'agent'
+            ),
+        3 => array(
+            'Void',
+            'True',
+            'Result',
+            'Precursor',
+            'False',
+            'Current'
+            ),
+        4 => array(
+            'UNIX_SIGNALS',
+            'UNIX_FILE_INFO',
+            'UNBOUNDED',
+            'TWO_WAY_TREE_CURSOR',
+            'TWO_WAY_TREE',
+            'TWO_WAY_SORTED_SET',
+            'TWO_WAY_LIST',
+            'TWO_WAY_CURSOR_TREE',
+            'TWO_WAY_CIRCULAR',
+            'TWO_WAY_CHAIN_ITERATOR',
+            'TUPLE',
+            'TREE',
+            'TRAVERSABLE',
+            'TO_SPECIAL',
+            'THREAD_CONTROL',
+            'THREAD_ATTRIBUTES',
+            'THREAD',
+            'TABLE',
+            'SUBSET',
+            'STRING_HANDLER',
+            'STRING',
+            'STREAM',
+            'STORABLE',
+            'STD_FILES',
+            'STACK',
+            'SPECIAL',
+            'SORTED_TWO_WAY_LIST',
+            'SORTED_STRUCT',
+            'SORTED_LIST',
+            'SINGLE_MATH',
+            'SET',
+            'SEQUENCE',
+            'SEQ_STRING',
+            'SEMAPHORE',
+            'ROUTINE',
+            'RESIZABLE',
+            'RECURSIVE_TREE_CURSOR',
+            'RECURSIVE_CURSOR_TREE',
+            'REAL_REF',
+            'REAL',
+            'RAW_FILE',
+            'RANDOM',
+            'QUEUE',
+            'PROXY',
+            'PROFILING_SETTING',
+            'PROCEDURE',
+            'PRIORITY_QUEUE',
+            'PRIMES',
+            'PRECOMP',
+            'POINTER_REF',
+            'POINTER',
+            'PLATFORM',
+            'PLAIN_TEXT_FILE',
+            'PATH_NAME',
+            'PART_SORTED_TWO_WAY_LIST',
+            'PART_SORTED_SET',
+            'PART_SORTED_LIST',
+            'PART_COMPARABLE',
+            'OPERATING_ENVIRONMENT',
+            'ONCE_CONTROL',
+            'OBJECT_OWNER',
+            'OBJECT_CONTROL',
+            'NUMERIC',
+            'NONE',
+            'MUTEX',
+            'MULTI_ARRAY_LIST',
+            'MULTAR_LIST_CURSOR',
+            'MEMORY',
+            'MEM_INFO',
+            'MEM_CONST',
+            'MATH_CONST',
+            'LIST',
+            'LINKED_TREE_CURSOR',
+            'LINKED_TREE',
+            'LINKED_STACK',
+            'LINKED_SET',
+            'LINKED_QUEUE',
+            'LINKED_PRIORITY_QUEUE',
+            'LINKED_LIST_CURSOR',
+            'LINKED_LIST',
+            'LINKED_CURSOR_TREE',
+            'LINKED_CIRCULAR',
+            'LINKABLE',
+            'LINEAR_ITERATOR',
+            'LINEAR',
+            'ITERATOR',
+            'IO_MEDIUM',
+            'INTERNAL',
+            'INTEGER_REF',
+            'INTEGER_INTERVAL',
+            'INTEGER',
+            'INFINITE',
+            'INDEXABLE',
+            'IDENTIFIED_CONTROLLER',
+            'IDENTIFIED',
+            'HIERARCHICAL',
+            'HEAP_PRIORITY_QUEUE',
+            'HASHABLE',
+            'HASH_TABLE_CURSOR',
+            'HASH_TABLE',
+            'GENERAL',
+            'GC_INFO',
+            'FUNCTION',
+            'FORMAT_INTEGER',
+            'FORMAT_DOUBLE',
+            'FIXED_TREE',
+            'FIXED_LIST',
+            'FIXED',
+            'FINITE',
+            'FILE_NAME',
+            'FILE',
+            'FIBONACCI',
+            'EXECUTION_ENVIRONMENT',
+            'EXCEPTIONS',
+            'EXCEP_CONST',
+            'DYNAMIC_TREE',
+            'DYNAMIC_LIST',
+            'DYNAMIC_CIRCULAR',
+            'DYNAMIC_CHAIN',
+            'DOUBLE_REF',
+            'DOUBLE_MATH',
+            'DOUBLE',
+            'DISPENSER',
+            'DIRECTORY_NAME',
+            'DIRECTORY',
+            'DECLARATOR',
+            'DEBUG_OUTPUT',
+            'CURSOR_TREE_ITERATOR',
+            'CURSOR_TREE',
+            'CURSOR_STRUCTURE',
+            'CURSOR',
+            'COUNTABLE_SEQUENCE',
+            'COUNTABLE',
+            'CONTAINER',
+            'CONSOLE',
+            'CONDITION_VARIABLE',
+            'COMPARABLE_STRUCT',
+            'COMPARABLE_SET',
+            'COMPARABLE',
+            'COMPACT_TREE_CURSOR',
+            'COMPACT_CURSOR_TREE',
+            'COLLECTION',
+            'CIRCULAR_CURSOR',
+            'CIRCULAR',
+            'CHARACTER_REF',
+            'CHARACTER',
+            'CHAIN',
+            'CELL',
+            'BOX',
+            'BOUNDED_STACK',
+            'BOUNDED_QUEUE',
+            'BOUNDED',
+            'BOOLEAN_REF',
+            'BOOLEAN',
+            'BOOL_STRING',
+            'BIT_REF',
+            'BINARY_TREE',
+            'BINARY_SEARCH_TREE_SET',
+            'BINARY_SEARCH_TREE',
+            'BILINEAR',
+            'BI_LINKABLE',
+            'BASIC_ROUTINES',
+            'BAG',
+            'ASCII',
+            'ARRAYED_TREE',
+            'ARRAYED_STACK',
+            'ARRAYED_QUEUE',
+            'ARRAYED_LIST_CURSOR',
+            'ARRAYED_LIST',
+            'ARRAYED_CIRCULAR',
+            'ARRAY2',
+            'ARRAY',
+            'ARGUMENTS',
+            'ANY',
+            'ACTIVE'
+            ),
+        5 => array(
+            'yes',
+            'visible',
+            'trace',
+            'system',
+            'root',
+            'profile',
+            'override_cluster',
+            'object',
+            'no',
+            'multithreaded',
+            'msil_generation_type',
+            'line_generation',
+            'library',
+            'inlining_size',
+            'inlining',
+            'include_path',
+            'il_verifiable',
+            'exclude',
+            'exception_trace',
+            'dynamic_runtime',
+            'dotnet_naming_convention',
+            'disabled_debug',
+            'default',
+            'debug',
+            'dead_code_removal',
+            'console_application',
+            'cluster',
+            'cls_compliant',
+            'check_vape',
+            'assertion',
+            'array_optimization',
+            'all',
+            'address_expression'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', '|', ':',
+        '(', ')', '{', '}', '[', ']', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF; font-weight: bold;',
+            2 => 'color: #0600FF; font-weight: bold;',
+            3 => 'color: #800080;',
+            4 => 'color: #800000',
+            5 => 'color: #603000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            'MULTI' => ''
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #005070; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0080A0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000060;',
+            2 => 'color: #000050;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #600000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => 'http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+{FNAMEL}&amp;btnI=I%27m+Feeling+Lucky',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/email.php b/vendor/easybook/geshi/geshi/email.php
new file mode 100755
index 000000000..8a313d483
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/email.php
@@ -0,0 +1,222 @@
+<?php
+/*************************************************************************************
+ * email.php
+ * ---------------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/10/19
+ *
+ * Email (mbox \ eml \ RFC format) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/19 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO (updated 2008/10/19)
+ * -------------------------
+ * * Better checks when a header field should be expected
+ * * Fix the bound checks for kw groups 2 and 3, as well as rx group 1
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'eMail (mbox)',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'HTTP', 'SMTP', 'ASMTP', 'ESMTP'
+            ),
+        2 => array(
+            'Authentication-Results','Comment','Content-Description','Content-Type',
+            'Content-Disposition','Content-Transfer-Encoding','Delivered-To',
+            'Dkim-Signature','Domainkey-Signature','In-Reply-To','Message-Id',
+            'MIME-Version','OpenPGP','Received','Received-SPF','References',
+            'Reply-To', 'Resend-From','Resend-To','Return-Path','User-Agent'
+            ),
+        3 => array(
+            'Date','From','Sender','Subject','To','CC'
+            ),
+        4 => array(
+            'by', 'for', 'from', 'id', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':', ';', '<', '>', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => false,
+        3 => false,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #800000; font-weight: bold;',
+            4 => 'font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #000040;',
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #008000;',
+            4 => 'color: #0000FF; font-weight: bold;',
+            5 => 'font-weight: bold;',
+            6 => 'color: #400080;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Non-Standard-Header
+        1 => array(
+            GESHI_SEARCH => "(?<=\A\x20|\n)x-[a-z0-9\-]*(?=\s*:|\s*<)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "smi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Email-Adresses or Mail-IDs
+        2 => array(
+            GESHI_SEARCH => "\b(?<!\\/)(?P<q>\"?)[\w\.\-]+\k<q>@(?!-)[\w\-]+(?<!-)(?:(?:\.(?!-)[\w\-]+(?<!-))*)?",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Date values in RFC format
+        3 => array(
+            GESHI_SEARCH => "\b(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s+\d\d?\s+" .
+                "(?:Jan|Feb|Mar|apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+" .
+                "\d{4}\s+\d\d?:\d\d:\d\d\s+[+\-]\d{4}(?:\s+\(\w+\))?",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //IP addresses
+        4 => array(
+            GESHI_SEARCH => "(?<=\s)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\s)|".
+                "(?<=\[)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\])|".
+                "(?<==)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=<)|".
+
+                "(?<=\s)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=\s)|".
+                "(?<=\[)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=\])|".
+                "(?<==)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=<)|".
+
+                "(?<=\s)\:(?:\:[a-f\d]{1,4})+(?=\s)|".
+                "(?<=\[)\:(?:\:[a-f\d]{1,4})+(?=\])|".
+                "(?<==)\:(?:\:[a-f\d]{1,4})+(?=<)|".
+
+                "(?<=\s)(?:[a-f\d]{1,4}\:)+\:(?=\s)|".
+                "(?<=\[)(?:[a-f\d]{1,4}\:)+\:(?=\])|".
+                "(?<==)(?:[a-f\d]{1,4}\:)+\:(?=<)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "i",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Field-Assignments
+        5 => array(
+            GESHI_SEARCH => "(?<=\s)[A-Z0-9\-\.]+(?==(?:$|\s$|[^\s=]))",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //MIME type
+        6 => array(
+            GESHI_SEARCH => "(?<=\s)(?:audio|application|image|multipart|text|".
+                "video|x-[a-z0-9\-]+)\/[a-z0-9][a-z0-9\-]*(?=\s|<|$)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "m",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => "/(?P<start>^)[A-Za-z][a-zA-Z0-9\-]*\s*:\s*(?:.|(?=\n\s)\n)*(?P<end>$)/m"
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
+                'DISALLOWED_AFTER' => '(?=\s*:)',
+            ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
+                'DISALLOWED_AFTER' => '(?=\s*:)',
+            ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)',
+                'DISALLOWED_AFTER' => '(?=\s|\b)',
+            )
+        ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'COMMENTS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/epc.php b/vendor/easybook/geshi/geshi/epc.php
new file mode 100755
index 000000000..c575c0c63
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/epc.php
@@ -0,0 +1,154 @@
+<?php
+/*************************************************************************************
+ * epc.php
+ * --------
+ * Author: Thorsten Muehlfelder (muehlfelder@enertex.de)
+ * Copyright: (c) 2010 Enertex Bayern GmbH
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/08/26
+ *
+ * Enerscript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/08/26 (1.0.8.10)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'EPC',
+    'COMMENT_SINGLE' => array('//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //[Sections]
+        //1 => "/^\\[.*\\]/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(
+        0 => '"',
+        1 => '$'
+        ),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'then', 'else', 'endif',
+            'and', 'or', 'xor', 'hysteresis'
+            ),
+        2 => array(
+            'read', 'write', 'event',
+            'gettime', 'settime', 'getdate', 'setdate', 'gettimedate', 'settimedate',
+            'hour', 'minute', 'second', 'changehour', 'changeminute', 'changesecond',
+            'date', 'month', 'day', 'dayofweek', 'sun', 'azimuth', 'elevation',
+            'sunrisehour', 'sunriseminute', 'sunsethour', 'sunsetminute',
+            'wtime', 'htime', 'mtime', 'stime',
+            'cwtime', 'chtime', 'cmtime', 'cstime',
+            'delay', 'after', 'cycle',
+            'readflash', 'writeflash',
+            'abs', 'acos', 'asin', 'atan', 'cos', 'ceil', 'average', 'exp', 'floor',
+            'log', 'max', 'min', 'mod', 'pow', 'sqrt', 'sin', 'tan', 'change', 'convert',
+            'eval', 'systemstart', 'random', 'comobject', 'sleep', 'scene', 'storescene', 'callscene',
+            'find', 'stringcast', 'stringset', 'stringformat', 'split', 'size',
+            'readrs232'. 'sendrs232', 'address', 'readknx',
+            'readudp', 'sendudp', 'connecttcp', 'closetcp', 'readtcp', 'sendtcp',
+            'resolve', 'sendmail',
+            'button', 'webbutton', 'chart', 'webchart', 'webdisplay', 'getslider', 'pshifter', 'mpshifter',
+            'getpslider', 'mbutton', 'mbbutton', 'mchart', 'mpchart', 'mpbutton', 'pdisplay', 'pchart',
+            'pbutton', 'setslider', 'setpslider', 'slider', 'pslider', 'page', 'line', 'header',
+            'footer', 'none', 'plink', 'link', 'frame', 'dframe'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '%', 'b01',
+            ),
+        1 => array(
+            '+', '-', '==', '>=', '=<',
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #e63ec3;',
+            2 => 'color: #e63ec3;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #0000ff;'
+            //1 => 'color: #ffa500;'
+            ),
+        'ESCAPE_CHAR' => array(
+            1 => 'color: #000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #8a0808;',
+            1 => 'color: #6e6e6e;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0b610b;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0b610b;',
+            1 => 'color: #e63ec3;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #0b610b;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Numbers, e.g. 255u08
+        1 => "[0-9]*[subf][0136][12468]"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#])",
+            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%=\\/])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/erlang.php b/vendor/easybook/geshi/geshi/erlang.php
new file mode 100755
index 000000000..4b8d406b0
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/erlang.php
@@ -0,0 +1,441 @@
+<?php
+/*************************************************************************************
+ * erlang.php
+ * --------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Contributions:
+ * - Uwe Dauernheim (uwe@dauernheim.net)
+ * - Dan Forest-Barbier (dan@twisted.in)
+ * Copyright: (c) 2008 Uwe Dauernheim (http://www.kreisquadratur.de/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008-09-27
+ *
+ * Erlang language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/05/02 (1.0.8.3)
+ *  -  Now using 'PARSER_CONTROL' instead of huge rexgexps, better and cleaner
+ *
+ * 2009/04/26 (1.0.8.3)
+ *  -  Only link to existing docs / Fixes
+ *
+ * 2008-09-28 (1.0.0.1)
+ *   [!] Bug fixed with keyword module.
+ *   [+] Added more function names
+ *
+ * 2008-09-27 (1.0.0)
+ *   [ ] First Release
+ *
+ * TODO (updated 2008-09-27)
+ * -------------------------
+ *   [!] Stop ';' from being transformed to '<SEMI>'
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Erlang',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'", "\\"),
+    'HARDCHAR' => "\\",
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        //Control flow keywrods
+        1 => array(
+            'after', 'andalso', 'begin', 'case', 'catch', 'end', 'fun', 'if',
+            'of', 'orelse', 'receive', 'try', 'when', 'query'
+            ),
+        //Binary operators
+        2 => array(
+            'and', 'band', 'bnot', 'bor', 'bsl', 'bsr', 'bxor', 'div', 'not',
+            'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abs', 'alive', 'apply', 'atom_to_list', 'binary_to_list',
+            'binary_to_term', 'concat_binary', 'date', 'disconnect_node',
+            'element', 'erase', 'exit', 'float', 'float_to_list', 'get',
+            'get_keys', 'group_leader', 'halt', 'hd', 'integer_to_list',
+            'is_alive', 'length', 'link', 'list_to_atom', 'list_to_binary',
+            'list_to_float', 'list_to_integer', 'list_to_pid', 'list_to_tuple',
+            'load_module', 'make_ref', 'monitor_node', 'node', 'nodes', 'now',
+            'open_port', 'pid_to_list', 'process_flag', 'process_info',
+            'process', 'put', 'register', 'registered', 'round', 'self',
+            'setelement', 'size', 'spawn', 'spawn_link', 'split_binary',
+            'statistics', 'term_to_binary', 'throw', 'time', 'tl', 'trunc',
+            'tuple_to_list', 'unlink', 'unregister', 'whereis'
+            ),
+        // Built-In Functions
+        4 => array(
+            'atom', 'binary', 'constant', 'function', 'integer', 'is_atom',
+            'is_binary', 'is_constant', 'is_function', 'is_integer', 'is_list',
+            'is_number', 'is_pid', 'is_reference', 'is_record', 'list',
+            'number', 'pid', 'ports', 'port_close', 'port_info', 'reference'
+            ),
+        // Erlang/OTP internal modules (scary one)
+        5 => array(
+            'alarm_handler', 'any', 'app', 'application', 'appmon', 'appup',
+            'array', 'asn1ct', 'asn1rt', 'auth', 'base64', 'beam_lib', 'c',
+            'calendar', 'code', 'common_test_app', 'compile', 'config',
+            'corba', 'corba_object', 'cosEventApp', 'CosEventChannelAdmin',
+            'CosEventChannelAdmin_ConsumerAdmin',
+            'CosEventChannelAdmin_EventChannel',
+            'CosEventChannelAdmin_ProxyPullConsumer',
+            'CosEventChannelAdmin_ProxyPullSupplier',
+            'CosEventChannelAdmin_ProxyPushConsumer',
+            'CosEventChannelAdmin_ProxyPushSupplier',
+            'CosEventChannelAdmin_SupplierAdmin', 'CosEventDomainAdmin',
+            'CosEventDomainAdmin_EventDomain',
+            'CosEventDomainAdmin_EventDomainFactory',
+            'cosEventDomainApp', 'CosFileTransfer_Directory',
+            'CosFileTransfer_File', 'CosFileTransfer_FileIterator',
+            'CosFileTransfer_FileTransferSession',
+            'CosFileTransfer_VirtualFileSystem',
+            'cosFileTransferApp', 'CosNaming', 'CosNaming_BindingIterator',
+            'CosNaming_NamingContext', 'CosNaming_NamingContextExt',
+            'CosNotification', 'CosNotification_AdminPropertiesAdmin',
+            'CosNotification_QoSAdmin', 'cosNotificationApp',
+            'CosNotifyChannelAdmin_ConsumerAdmin',
+            'CosNotifyChannelAdmin_EventChannel',
+            'CosNotifyChannelAdmin_EventChannelFactory',
+            'CosNotifyChannelAdmin_ProxyConsumer',
+            'CosNotifyChannelAdmin_ProxyPullConsumer',
+            'CosNotifyChannelAdmin_ProxyPullSupplier',
+            'CosNotifyChannelAdmin_ProxyPushConsumer',
+            'CosNotifyChannelAdmin_ProxyPushSupplier',
+            'CosNotifyChannelAdmin_ProxySupplier',
+            'CosNotifyChannelAdmin_SequenceProxyPullConsumer',
+            'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
+            'CosNotifyChannelAdmin_SequenceProxyPushConsumer',
+            'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
+            'CosNotifyChannelAdmin_StructuredProxyPullConsumer',
+            'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
+            'CosNotifyChannelAdmin_StructuredProxyPushConsumer',
+            'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
+            'CosNotifyChannelAdmin_SupplierAdmin',
+            'CosNotifyComm_NotifyPublish', 'CosNotifyComm_NotifySubscribe',
+            'CosNotifyFilter_Filter', 'CosNotifyFilter_FilterAdmin',
+            'CosNotifyFilter_FilterFactory', 'CosNotifyFilter_MappingFilter',
+            'cosProperty', 'CosPropertyService_PropertiesIterator',
+            'CosPropertyService_PropertyNamesIterator',
+            'CosPropertyService_PropertySet',
+            'CosPropertyService_PropertySetDef',
+            'CosPropertyService_PropertySetDefFactory',
+            'CosPropertyService_PropertySetFactory', 'cosTime',
+            'CosTime_TimeService', 'CosTime_TIO', 'CosTime_UTO',
+            'CosTimerEvent_TimerEventHandler',
+            'CosTimerEvent_TimerEventService', 'cosTransactions',
+            'CosTransactions_Control', 'CosTransactions_Coordinator',
+            'CosTransactions_RecoveryCoordinator', 'CosTransactions_Resource',
+            'CosTransactions_SubtransactionAwareResource',
+            'CosTransactions_Terminator', 'CosTransactions_TransactionFactory',
+            'cover', 'cprof', 'cpu_sup', 'crashdump', 'crypto', 'crypto_app',
+            'ct', 'ct_cover', 'ct_ftp', 'ct_master', 'ct_rpc', 'ct_snmp',
+            'ct_ssh', 'ct_telnet', 'dbg', 'debugger', 'dets', 'dialyzer',
+            'dict', 'digraph', 'digraph_utils', 'disk_log', 'disksup',
+            'docb_gen', 'docb_transform', 'docb_xml_check', 'docbuilder_app',
+            'driver_entry', 'edoc', 'edoc_doclet', 'edoc_extract',
+            'edoc_layout', 'edoc_lib', 'edoc_run', 'egd', 'ei', 'ei_connect',
+            'epmd', 'epp', 'epp_dodger', 'eprof', 'erl', 'erl_boot_server',
+            'erl_call', 'erl_comment_scan', 'erl_connect', 'erl_ddll',
+            'erl_driver', 'erl_error', 'erl_eterm', 'erl_eval',
+            'erl_expand_records', 'erl_format', 'erl_global', 'erl_id_trans',
+            'erl_internal', 'erl_lint', 'erl_malloc', 'erl_marshal',
+            'erl_parse', 'erl_pp', 'erl_prettypr', 'erl_prim_loader',
+            'erl_prim_loader_stub', 'erl_recomment', 'erl_scan',
+            'erl_set_memory_block', 'erl_syntax', 'erl_syntax_lib', 'erl_tar',
+            'erl_tidy', 'erlang', 'erlang_mode', 'erlang_stub', 'erlc',
+            'erlsrv', 'error_handler', 'error_logger', 'erts_alloc',
+            'erts_alloc_config', 'escript', 'et', 'et_collector',
+            'et_selector', 'et_viewer', 'etop', 'ets', 'eunit', 'file',
+            'file_sorter', 'filelib', 'filename', 'fixed', 'fprof', 'ftp',
+            'gb_sets', 'gb_trees', 'gen_event', 'gen_fsm', 'gen_sctp',
+            'gen_server', 'gen_tcp', 'gen_udp', 'gl', 'global', 'global_group',
+            'glu', 'gs', 'heart', 'http', 'httpd', 'httpd_conf',
+            'httpd_socket', 'httpd_util', 'i', 'ic', 'ic_c_protocol',
+            'ic_clib', 'igor', 'inet', 'inets', 'init', 'init_stub',
+            'instrument', 'int', 'interceptors', 'inviso', 'inviso_as_lib',
+            'inviso_lfm', 'inviso_lfm_tpfreader', 'inviso_rt',
+            'inviso_rt_meta', 'io', 'io_lib', 'kernel_app', 'lib', 'lists',
+            'lname', 'lname_component', 'log_mf_h', 'make', 'math', 'megaco',
+            'megaco_codec_meas', 'megaco_codec_transform',
+            'megaco_edist_compress', 'megaco_encoder', 'megaco_flex_scanner',
+            'megaco_tcp', 'megaco_transport', 'megaco_udp', 'megaco_user',
+            'memsup', 'mnesia', 'mnesia_frag_hash', 'mnesia_registry',
+            'mod_alias', 'mod_auth', 'mod_esi', 'mod_security',
+            'Module_Interface', 'ms_transform', 'net_adm', 'net_kernel',
+            'new_ssl', 'nteventlog', 'observer_app', 'odbc', 'orber',
+            'orber_acl', 'orber_diagnostics', 'orber_ifr', 'orber_tc',
+            'orddict', 'ordsets', 'os', 'os_mon', 'os_mon_mib', 'os_sup',
+            'otp_mib', 'overload', 'packages', 'percept', 'percept_profile',
+            'pg', 'pg2', 'pman', 'pool', 'prettypr', 'proc_lib', 'proplists',
+            'public_key', 'qlc', 'queue', 'random', 'rb', 're', 'regexp',
+            'registry', 'rel', 'release_handler', 'reltool', 'relup', 'rpc',
+            'run_erl', 'run_test', 'runtime_tools_app', 'sasl_app', 'script',
+            'seq_trace', 'sets', 'shell', 'shell_default', 'slave', 'snmp',
+            'snmp_app', 'snmp_community_mib', 'snmp_framework_mib',
+            'snmp_generic', 'snmp_index', 'snmp_notification_mib', 'snmp_pdus',
+            'snmp_standard_mib', 'snmp_target_mib', 'snmp_user_based_sm_mib',
+            'snmp_view_based_acm_mib', 'snmpa', 'snmpa_conf', 'snmpa_error',
+            'snmpa_error_io', 'snmpa_error_logger', 'snmpa_error_report',
+            'snmpa_local_db', 'snmpa_mpd', 'snmpa_network_interface',
+            'snmpa_network_interface_filter',
+            'snmpa_notification_delivery_info_receiver',
+            'snmpa_notification_filter', 'snmpa_supervisor', 'snmpc', 'snmpm',
+            'snmpm_conf', 'snmpm_mpd', 'snmpm_network_interface', 'snmpm_user',
+            'sofs', 'ssh', 'ssh_channel', 'ssh_connection', 'ssh_sftp',
+            'ssh_sftpd', 'ssl', 'ssl_app', 'ssl_pkix', 'start', 'start_erl',
+            'start_webtool', 'stdlib_app', 'string', 'supervisor',
+            'supervisor_bridge', 'sys', 'systools', 'tags', 'test_server',
+            'test_server_app', 'test_server_ctrl', 'tftp', 'timer', 'toolbar',
+            'ttb', 'tv', 'unicode', 'unix_telnet', 'user', 'webtool', 'werl',
+            'win32reg', 'wrap_log_reader', 'wx', 'wx_misc', 'wx_object',
+            'wxAcceleratorEntry', 'wxAcceleratorTable', 'wxArtProvider',
+            'wxAuiDockArt', 'wxAuiManager', 'wxAuiNotebook', 'wxAuiPaneInfo',
+            'wxAuiTabArt', 'wxBitmap', 'wxBitmapButton', 'wxBitmapDataObject',
+            'wxBoxSizer', 'wxBrush', 'wxBufferedDC', 'wxBufferedPaintDC',
+            'wxButton', 'wxCalendarCtrl', 'wxCalendarDateAttr',
+            'wxCalendarEvent', 'wxCaret', 'wxCheckBox', 'wxCheckListBox',
+            'wxChildFocusEvent', 'wxChoice', 'wxClientDC', 'wxClipboard',
+            'wxCloseEvent', 'wxColourData', 'wxColourDialog',
+            'wxColourPickerCtrl', 'wxColourPickerEvent', 'wxComboBox',
+            'wxCommandEvent', 'wxContextMenuEvent', 'wxControl',
+            'wxControlWithItems', 'wxCursor', 'wxDataObject', 'wxDateEvent',
+            'wxDatePickerCtrl', 'wxDC', 'wxDialog', 'wxDirDialog',
+            'wxDirPickerCtrl', 'wxDisplayChangedEvent', 'wxEraseEvent',
+            'wxEvent', 'wxEvtHandler', 'wxFileDataObject', 'wxFileDialog',
+            'wxFileDirPickerEvent', 'wxFilePickerCtrl', 'wxFindReplaceData',
+            'wxFindReplaceDialog', 'wxFlexGridSizer', 'wxFocusEvent', 'wxFont',
+            'wxFontData', 'wxFontDialog', 'wxFontPickerCtrl',
+            'wxFontPickerEvent', 'wxFrame', 'wxGauge', 'wxGBSizerItem',
+            'wxGenericDirCtrl', 'wxGLCanvas', 'wxGraphicsBrush',
+            'wxGraphicsContext', 'wxGraphicsFont', 'wxGraphicsMatrix',
+            'wxGraphicsObject', 'wxGraphicsPath', 'wxGraphicsPen',
+            'wxGraphicsRenderer', 'wxGrid', 'wxGridBagSizer', 'wxGridCellAttr',
+            'wxGridCellEditor', 'wxGridCellRenderer', 'wxGridEvent',
+            'wxGridSizer', 'wxHelpEvent', 'wxHtmlEasyPrinting', 'wxIcon',
+            'wxIconBundle', 'wxIconizeEvent', 'wxIdleEvent', 'wxImage',
+            'wxImageList', 'wxJoystickEvent', 'wxKeyEvent',
+            'wxLayoutAlgorithm', 'wxListBox', 'wxListCtrl', 'wxListEvent',
+            'wxListItem', 'wxListView', 'wxMask', 'wxMaximizeEvent',
+            'wxMDIChildFrame', 'wxMDIClientWindow', 'wxMDIParentFrame',
+            'wxMemoryDC', 'wxMenu', 'wxMenuBar', 'wxMenuEvent', 'wxMenuItem',
+            'wxMessageDialog', 'wxMiniFrame', 'wxMirrorDC',
+            'wxMouseCaptureChangedEvent', 'wxMouseEvent', 'wxMoveEvent',
+            'wxMultiChoiceDialog', 'wxNavigationKeyEvent', 'wxNcPaintEvent',
+            'wxNotebook', 'wxNotebookEvent', 'wxNotifyEvent',
+            'wxPageSetupDialog', 'wxPageSetupDialogData', 'wxPaintDC',
+            'wxPaintEvent', 'wxPalette', 'wxPaletteChangedEvent', 'wxPanel',
+            'wxPasswordEntryDialog', 'wxPen', 'wxPickerBase', 'wxPostScriptDC',
+            'wxPreviewCanvas', 'wxPreviewControlBar', 'wxPreviewFrame',
+            'wxPrintData', 'wxPrintDialog', 'wxPrintDialogData', 'wxPrinter',
+            'wxPrintout', 'wxPrintPreview', 'wxProgressDialog',
+            'wxQueryNewPaletteEvent', 'wxRadioBox', 'wxRadioButton',
+            'wxRegion', 'wxSashEvent', 'wxSashLayoutWindow', 'wxSashWindow',
+            'wxScreenDC', 'wxScrollBar', 'wxScrolledWindow', 'wxScrollEvent',
+            'wxScrollWinEvent', 'wxSetCursorEvent', 'wxShowEvent',
+            'wxSingleChoiceDialog', 'wxSizeEvent', 'wxSizer', 'wxSizerFlags',
+            'wxSizerItem', 'wxSlider', 'wxSpinButton', 'wxSpinCtrl',
+            'wxSpinEvent', 'wxSplashScreen', 'wxSplitterEvent',
+            'wxSplitterWindow', 'wxStaticBitmap', 'wxStaticBox',
+            'wxStaticBoxSizer', 'wxStaticLine', 'wxStaticText', 'wxStatusBar',
+            'wxStdDialogButtonSizer', 'wxStyledTextCtrl', 'wxStyledTextEvent',
+            'wxSysColourChangedEvent', 'wxTextAttr', 'wxTextCtrl',
+            'wxTextDataObject', 'wxTextEntryDialog', 'wxToggleButton',
+            'wxToolBar', 'wxToolTip', 'wxTopLevelWindow', 'wxTreeCtrl',
+            'wxTreeEvent', 'wxUpdateUIEvent', 'wxWindow', 'wxWindowCreateEvent',
+            'wxWindowDC', 'wxWindowDestroyEvent', 'wxXmlResource', 'xmerl',
+            'xmerl_eventp', 'xmerl_scan', 'xmerl_xpath', 'xmerl_xs',
+            'xmerl_xsd', 'xref', 'yecc', 'zip', 'zlib', 'zlib_stub'
+            ),
+        // Binary modifiers
+        6 => array(
+            'big', 'binary', 'float', 'integer', 'little', 'signed', 'unit', 'unsigned'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}'),
+        1 => array('->', ',', ';', '.'),
+        2 => array('<<', '>>'),
+        3 => array('=', '||', '-', '+', '*', '/', '++', '--', '!', '<', '>', '>=',
+                    '=<', '==', '/=', '=:=', '=/=')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #186895;',
+            2 => 'color: #014ea4;',
+            3 => 'color: #fa6fff;',
+            4 => 'color: #fa6fff;',
+            5 => 'color: #ff4e18;',
+            6 => 'color: #9d4f37;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #109ab8;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff7800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff9600;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #004866;',
+            1 => 'color: #6bb810;',
+            2 => 'color: #ee3800;',
+            3 => 'color: #014ea4;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #6941fd;',
+            1 => 'color: #d400ed;',
+            2 => 'color: #5400b3;',
+            3 => 'color: #ff3c00;',
+            4 => 'color: #6941fd;',
+            5 => 'color: #45b3e6;',
+            6 => 'color: #ff9600;',
+            7 => 'color: #d400ed;',
+            8 => 'color: #ff9600;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://erlang.org/doc/man/{FNAME}.html',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => ':'
+        ),
+    'REGEXPS' => array(
+        //�Macro definitions
+        0 => array(
+            GESHI_SEARCH => '(-define\s*\()([a-zA-Z0-9_]+)(\(|,)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Record definitions
+        1 => array(
+            GESHI_SEARCH => '(-record\s*\()([a-zA-Z0-9_]+)(,)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Precompiler directives
+        2 => array(
+            GESHI_SEARCH => '(-)([a-z][a-zA-Z0-9_]*)(\()',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Functions
+        3 => array(
+            GESHI_SEARCH => '([a-z]\w*|\'\w*\')(\s*\()',
+            GESHI_REPLACE => '\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\2'
+            ),
+        // Macros
+        4 => array(
+            GESHI_SEARCH => '(\?)([a-zA-Z0-9_]+)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => ''
+            ),
+        // Variables - With hack to avoid interfering wish GeSHi internals
+        5 => array(
+            GESHI_SEARCH => '([([{,<+*-\/=\s!]|&lt;)(?!(?:PIPE|SEMI|DOT|NUM|REG3XP\d*)\W)([A-Z_]\w*)(?!\w)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => ''
+            ),
+        // ASCII�codes
+        6 => '(\$[a-zA-Z0-9_])',
+        // Records
+        7 => array(
+            GESHI_SEARCH => '(#)([a-z][a-zA-Z0-9_]*)(\.|\{)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Numbers with a different radix
+        8 => '(?<=>)(#[a-zA-Z0-9]*)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<![\w])',
+                'DISALLOWED_AFTER' => ''//'(?=\s*\()'
+            ),
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?<=\'|)',
+                'DISALLOWED_AFTER' => '(?=(\'|):)'
+            ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=\/|-)',
+                'DISALLOWED_AFTER' => ''
+            )
+        )
+    ),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/euphoria.php b/vendor/easybook/geshi/geshi/euphoria.php
new file mode 100755
index 000000000..7bbf88460
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/euphoria.php
@@ -0,0 +1,140 @@
+<?php
+/*************************************************************************************
+ * euphoria.php
+ * ---------------------------------
+ * Author: Nicholas Koceja (nerketur@hotmail.com)
+ * Copyright: (c) 2010 Nicholas Koceja
+ * Release Version: 1.0.8.11
+ * Date Started: 11/24/2010
+ *
+ * Euphoria language file for GeSHi.
+ *
+ * Author's note:  The colors are based off of the Euphoria Editor (ed.ex) colors.
+ * Also, I added comments in places so I could remember a few things about Euphoria.
+ *
+ *
+ * CHANGES
+ * -------
+ * <date-of-release> (1.0.8.9)
+ *  -  First Release
+ *
+ * TODO (updated <date-of-release>)
+ * -------------------------
+ * seperate the funtions from the procedures, and have a slight color change for each.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Euphoria',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array(), //Euphoria doesn't support multi-line comments
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // keywords
+            'and', 'by', 'constant', 'do', 'else', 'elsif', 'end', 'exit',
+            'for', 'function', 'global', 'if', 'include', 'not', 'or',
+            'procedure', 'return', 'then', 'to', 'type', 'while', 'with',
+            'without', 'xor'
+            ),
+        2 => array( // built-ins
+            'abort', 'and_bits', 'append', 'arctan', 'atom', 'c_func', 'call',
+            'c_proc', 'call_func', 'call_proc', 'clear_screen', 'close', 'compare',
+            'command_line', 'cos', 'date', 'equal', 'find', 'find_from', 'floor',
+            'getc', 'getenv', 'gets', 'get_key', 'get_pixel', 'integer', 'length',
+            'log', 'machine_func', 'machine_proc', 'match', 'match_from',
+            'mem_copy', 'mem_set', 'not_bits', 'object', 'open', 'or_bits', 'peek',
+            'peek4s', 'peek4u', 'pixel', 'platform', 'poke', 'poke4', 'position',
+            'power', 'prepend', 'print', 'printf', 'profile', 'puts', 'rand',
+            'remainder', 'repeat', 'routine_id', 'sequence', 'sin', 'sprintf',
+            'sqrt', 'system', 'system_exec', 'tan', 'task_clock_stop',
+            'task_clock_start', 'task_create', 'task_list', 'task_schedule',
+            'task_self', 'task_status', 'task_suspend', 'task_yield', 'time',
+            'trace', 'xor_bits'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '{', '}', '[', ']'
+            ),
+        1 => array(
+            '+', '-', '*', '/', '=', '&', '^'
+            ),
+        2 => array(
+            '&', '?', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;', // keywords
+            2 => 'color: #cc33ff; font-weight: bold;', // builtins
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff0000; font-style: italic;',
+            'MULTI' => '' // doesn't exist
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #999900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00cc00;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc33cc; font-style: italic'
+            ),
+        'METHODS' => array( // Doesn't exist in Euphoria.  Everything is a function =)
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #999900;', // brackets
+            1 => 'color: #333333;', // operators
+            2 => 'color: #333333; font-style: bold' // print+concat
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array( // Never included in scripts.
+            )
+        ),
+    'REGEXPS' => array(
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/ezt.php b/vendor/easybook/geshi/geshi/ezt.php
new file mode 100644
index 000000000..74d8d5204
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ezt.php
@@ -0,0 +1,134 @@
+<?php
+/*************************************************************************************
+ * ezt.php
+ * -----------
+ * Author: Ramesh Vishveshwar (ramesh.vishveshwar@gmail.com)
+ * Copyright: (c) 2012 Ramesh Vishveshwar (http://thecodeisclear.in)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/09/01
+ *
+ * Easytrieve language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/09/22 (1.0.0)
+ *   - First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'EZT',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'COMMENT_REGEXP' => array(
+        // First character of the line is an asterisk. Rest of the line is spaces/null
+        0 => '/\*(\s|\D)?(\n)/',
+        // Asterisk followed by any character & then a non numeric character.
+        // This is to prevent expressions such as 25 * 4 from being marked as a comment
+        // Note: 25*4 - 100 will mark *4 - 100 as a comment. Pls. space out expressions
+        // In any case, 25*4 will result in an Easytrieve error
+        1 => '/\*.([^0-9\n])+.*(\n)/'
+        ),
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'CONTROL','DEFINE','DISPLAY','DO','ELSE','END-DO','END-IF',
+            'END-PROC','FILE','GET','GOTO','HEADING','IF','JOB','LINE',
+            'PARM','PERFORM','POINT','PRINT','PROC','PUT','READ','RECORD',
+            'REPORT','RETRIEVE','SEARCH','SELECT','SEQUENCE','SORT','STOP',
+            'TITLE','WRITE'
+            ),
+        // Procedure Keywords (Names of specific procedures)
+        2 => array (
+            'AFTER-BREAK','AFTER-LINE','BEFORE-BREAK','BEFORE-LINE',
+            'ENDPAGE','REPORT-INPUT','TERMINATION',
+            ),
+        // Macro names, Parameters
+        3 => array (
+            'COMPILE','CONCAT','DESC','GETDATE','MASK','PUNCH',
+            'VALUE','SYNTAX','NEWPAGE','SKIP','COL','TALLY',
+            'WITH'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')','=','&',',','*','>','<','%'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        //4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #FF0000;',
+            2 => 'color: #21A502;',
+            3 => 'color: #FF00FF;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #0000FF; font-style: italic;',
+            1 => 'color: #0000FF; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF7400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #66CC66;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #736205;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF7400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #E01B6A;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        // We are trying to highlight Macro names here which preceded by %
+        0 => '(%)([a-zA-Z0-9])+(\s|\n)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/f1.php b/vendor/easybook/geshi/geshi/f1.php
new file mode 100755
index 000000000..7d7676085
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/f1.php
@@ -0,0 +1,151 @@
+<?php
+/*************************************************************************************
+ * f1.php
+ * -------
+ * Author: Juro Bystricky (juro@f1compiler.com)
+ * Copyright: K2 Software Corp.
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/07/06
+ *
+ * Formula One language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/06 (1.0.8.9)
+ *  -  First Release
+ *
+ * TODO
+ * -------------------------
+ *  -  Add more RTL functions with URLs
+ *
+ *************************************************************************************
+ *
+ * This file is part of GeSHi.
+ *
+ * GeSHi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GeSHi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GeSHi; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Formula One',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'COMMENT_REGEXP' => array(
+        //Nested Comments
+        2 =>  "/(\{(?:\{.*\}|[^\{])*\})/m"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'",'"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\nrt\'\"?\n]#i",
+        //Hexadecimal Char Specs (Utf16 codes, Unicode versions only)
+        2 => "#\\\\u[\da-fA-F]{4}#",
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE |
+        GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX_0O |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'pred','proc','subr','else','elsif','iff','if','then','false','true',
+            'case','of','use','local','mod','end','list','file','all','one','max','min','rel',
+            'external','Nil','_stdcall','_cdecl','_addressof','_pred','_file','_line'
+            ),
+        2 => array(
+            'Ascii','Bin','I','L','P','R','S','U'
+            ),
+        3 => array(
+            'Append','in','Dupl','Len','Print','_AllDifferent','_AllAscending',
+            '_AllDescending','_Ascending','_Descending'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/'),
+        3 => array('&', '|'),
+        4 => array(':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #000080;',
+            3 => 'color: #000080;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #009999; font-weight: bold;',
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000;',
+            2 => 'color: #000000;',
+            3 => 'color: #000000;',
+            4 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.f1compiler.com/f1helponline/f1_runtime_library.html#{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/falcon.php b/vendor/easybook/geshi/geshi/falcon.php
new file mode 100755
index 000000000..2111d9e8e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/falcon.php
@@ -0,0 +1,218 @@
+<?php
+/*************************************************************************************
+ * falcon.php
+ * ---------------------------------
+ * Author: billykater (billykater+geshi@gmail.com)
+ * Copyright: (c) 2010 billykater (http://falconpl.org/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/06/07
+ *
+ * Falcon language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * <2010/8/1> (1.0.8.10)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Falcon',
+    'COMMENT_SINGLE' => array( 1 => '//' ),
+    'COMMENT_MULTI' => array( '/*' => '*/' ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array( "'", '"' ),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break','case','catch','class','const','continue','def','default',
+            'dropping','elif','else','end','enum','for','forfirst','forlast',
+            'formiddle','from','function','global','if','init','innerfunc',
+            'launch','loop','object','raise','return','select','state','static',
+            'switch','try','while'
+        ),
+        2 => array(
+            'false','nil','true',
+        ),
+        3 => array(
+            'and','as','eq','fself','in','not','notin','or','provides','self','to'
+        ),
+        4 => array(
+            'directive','export','import','load','macro'
+        ),
+        5 => array(
+            'ArrayType','BooleanType','ClassMethodType','ClassType','DictionaryType',
+            'FunctionType','MemBufType','MethodType','NilType','NumericType','ObjectType',
+            'RangeType','StringType','LBindType'
+        ),
+        6 => array(
+            "CurrentTime","IOStream","InputStream","MemBufFromPtr","OutputStream",
+            "PageDict","ParseRFC2822","abs","acos","all",
+            "allp","any","anyp","argd","argv",
+            "arrayAdd","arrayBuffer","arrayCompact","arrayDel","arrayDelAll",
+            "arrayFill","arrayFind","arrayHead","arrayIns","arrayMerge",
+            "arrayNM","arrayRemove","arrayResize","arrayScan","arraySort",
+            "arrayTail","asin","assert","atan","atan2",
+            "attributes","baseClass","beginCritical","bless","brigade",
+            "broadcast","cascade","ceil","choice","chr",
+            "className","clone","combinations","compare","consume",
+            "cos","deg2rad","deoob","derivedFrom","describe",
+            "deserialize","dictBack","dictBest","dictClear","dictFill",
+            "dictFind","dictFront","dictGet","dictKeys","dictMerge",
+            "dictRemove","dictSet","dictValues","dirChange","dirCurrent",
+            "dirMake","dirMakeLink","dirReadLink","dirRemove","dolist",
+            "endCritical","epoch","eval","exit","exp",
+            "factorial","fileChgroup","fileChmod","fileChown","fileCopy",
+            "fileExt","fileMove","fileName","fileNameMerge","filePath",
+            "fileRemove","fileType","fileUnit","filter","fint",
+            "firstOf","floop","floor","fract","getAssert",
+            "getEnviron","getProperty","getSlot","getSystemEncoding","getenv",
+            "iff","include","input","inspect","int",
+            "isBound","isCallable","isoob","lbind","len",
+            "let","lit","log","map","max",
+            "metaclass","min","numeric","oob","ord",
+            "paramCount","paramIsRef","paramSet","parameter","passvp",
+            "permutations","pow","print","printl","properties",
+            "rad2deg","random","randomChoice","randomDice","randomGrab",
+            "randomPick","randomSeed","randomWalk","readURI","reduce",
+            "retract","round","seconds","serialize","set",
+            "setProperty","setenv","sin","sleep","stdErr",
+            "stdErrRaw","stdIn","stdInRaw","stdOut","stdOutRaw",
+            "strBack","strBackFind","strBackTrim","strBuffer","strCmpIgnoreCase",
+            "strEndsWith","strEscape","strEsq","strFill","strFind",
+            "strFromMemBuf","strFront","strFrontTrim","strLower","strMerge",
+            "strReplace","strReplicate","strSplit","strSplitTrimmed","strStartsWith",
+            "strToMemBuf","strTrim","strUnescape","strUnesq","strUpper",
+            "strWildcardMatch","subscribe","systemErrorDescription","tan","times",
+            "toString","transcodeFrom","transcodeTo","typeOf","unsetenv",
+            "unsubscribe","valof","vmFalconPath","vmIsMain","vmModuleName",
+            "vmModuleVersionInfo","vmSearchPath","vmSystemType","vmVersionInfo","vmVersionName",
+            "writeURI","xmap","yield","yieldOut"
+        ),
+        7 => array(
+            "AccessError","Array","BOM","Base64","Class",
+            "ClassMethod","CloneError","CmdlineParser","CodeError","Continuation",
+            "Dictionary","Directory","Error","FileStat","Format",
+            "Function","GarbagePointer","GenericError","Integer","InterruptedError",
+            "IoError","Iterator","LateBinding","List","MathError",
+            "MemoryBuffer","MessageError","Method","Numeric","Object",
+            "ParamError","ParseError","Path","Range","Semaphore",
+            "Sequence","Set","Stream","String","StringStream",
+            "SyntaxError","Table","TableError","TimeStamp","TimeZone",
+            "Tokenizer","TypeError","URI","VMSlot"
+        ),
+        8 => array(
+            "args","scriptName","scriptPath"
+        ),
+        9 => array(
+            "GC"
+        ),
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://falconpl.org/project_docs/core/functions.html#typeOf',
+        6 => 'http://falconpl.org/project_docs/core/functions.html#{FNAME}',
+        7 => 'http://falconpl.org/project_docs/core/class_{FNAME}.html',
+        8 => 'http://falconpl.org/project_docs/core/globals.html#{FNAME}',
+        9 => 'http://falconpl.org/project_docs/core/object_{FNAME}.html)'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+    ),
+    'SYMBOLS' => array(
+        '(',')','$','%','&','/','{','[',']','=','}','?','+','-','#','*','@',
+        '<','>','|',',',':',';','\\','^'
+    ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '(\[)([a-zA-Z_]|\c{C})(?:[a-zA-Z0-9_]|\p{C})*(\])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+
+        ),
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array( '<?' => '?>' )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080;font-weight:bold;',
+            2 => 'color: #800000;font-weight:bold;',
+            3 => 'color: #800000;font-weight:bold;',
+            4 => 'color: #000080;font-weight:bold;',
+            5 => 'color: #000000;font-weight:bold;',
+            6 => 'font-weight:bold;',
+            7 => 'font-weight:bold;',
+            8 => 'font-weight:bold;'
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #29B900;',
+            'MULTI' => 'color: #008080'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #800000'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #000000'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #000000'
+        ),
+        'METHODS' => array(
+            0 => 'color: #000000'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #8B0513'
+        ),
+        'SCRIPT' => array(
+            0 => ''
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #FF00FF'
+        )
+    ),
+
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        '.'
+    )
+);
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/fo.php b/vendor/easybook/geshi/geshi/fo.php
new file mode 100755
index 000000000..ba4a59244
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/fo.php
@@ -0,0 +1,327 @@
+<?php
+/*************************************************************************************
+ * fo.php
+ * --------
+ * Author: Tan-Vinh Nguyen (tvnguyen@web.de)
+ * Copyright: (c) 2009 Tan-Vinh Nguyen
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/03/23
+ *
+ * fo language file for GeSHi.
+ *
+ * FO stands for "Flexible Oberflaechen" (Flexible Surfaces) and
+ * is part of the abas-ERP.
+ *
+ * CHANGES
+ * -------
+ * 2009/03/23 (1.0.0)
+ *   -  First Release
+ *      Basic commands in German and English
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'FO (abas-ERP)',
+    'COMMENT_SINGLE' => array(1 => '..'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        //Control Flow
+        1 => array(
+            /* see http://www.abas.de/sub_de/kunden/help/hd/html/9.html */
+
+            /* fo keywords, part 1: control flow */
+            '.weiter', '.continue'
+
+            /* this language works with goto's only*/
+            ),
+
+        //FO Keywords
+        2 => array(
+            /* fo keywords, part 2 */
+            '.fo', '.formel', '.formula',
+            '.zuweisen', '.assign',
+            '.fehler', '.error',
+            '.ende', '.end'
+            ),
+
+        //Java Keywords
+        3 => array(
+            /* Java keywords, part 3: primitive data types */
+            '.art', '.type',
+            'integer', 'real', 'bool', 'text', 'datum', 'woche', 'termin', 'zeit',
+            'mehr', 'MEHR'
+            ),
+
+        //Reserved words in fo literals
+        4 => array(
+            /* other reserved words in fo literals */
+            /* should be styled to look similar to numbers and Strings */
+            'false', 'null', 'true',
+            'OBJEKT',
+            'VORGANG', 'PROCESS',
+            'OFFEN', 'OPEN',
+            'ABORT',
+            'AN', 'ADDEDTO',
+            'AUF', 'NEW',
+            'BILDSCHIRM', 'TERMINAL',
+            'PC',
+            'MASKE', 'SCREEN',
+            'ZEILE', 'LINE'
+            ),
+
+        // interpreter settings
+        5 => array (
+            '..!INTERPRETER', 'DEBUG'
+            ),
+
+        // database commands
+        6 => array (
+            '.hole', '.hol', '.select',
+            '.lade', '.load',
+            '.aktion', '.action',
+            '.belegen', '.occupy',
+            '.bringe', '.rewrite',
+            '.dazu', '.add',
+            '.löschen', '.delete',
+            '.mache', '.make',
+            '.merke', '.reserve',
+            '.setze', '.set',
+            'SPERREN', 'LOCK',
+            'TEIL', 'PART',
+            'KEINESPERRE',
+            'AMASKE', 'ASCREEN',
+            'BETRIEB', 'WORK-ORDER',
+            'NUMERISCH', 'NUMERICAL',
+            'VORSCHLAG', 'SUGGESTION',
+            'OBLIGO', 'OUTSTANDING',
+            'LISTE', 'LIST',
+            'DRUCK', 'PRINT',
+            'ÜBERNAHME', 'TAGEOVER',
+            'ABLAGE', 'FILINGSYSTEM',
+            'BDE', 'PDC',
+            'BINDUNG', 'ALLOCATION',
+            'BUCHUNG', 'ENTRY',
+            'COLLI', 'SERIAL',
+            'DATEI', 'FILE',
+            'VERKAUF', 'SALES',
+            'EINKAUF', 'PURCHASING',
+            'EXEMPLAR', 'EXAMPLE',
+            'FERTIGUNG', 'PRODUCTION',
+            'FIFO',
+            'GRUPPE', 'GROUP',
+            'JAHR', 'YEAR',
+            'JOURNAL',
+            'KOPF', 'HEADER',
+            'KOSTEN',
+            'LIFO',
+            'LMENGE', 'SQUANTITY',
+            'LOHNFERTIGUNG', 'SUBCONTRACTING',
+            'LPLATZ', 'LOCATION',
+            'MBELEGUNG', 'MACHLOADING',
+            'MONAT', 'MONTH', 'MZ',
+            'NACHRICHT', 'MESSAGE',
+            'PLAN', 'TARGET',
+            'REGIONEN', 'REGIONS',
+            'SERVICEANFRAGE', 'SERVICEREQUEST',
+            'VERWENDUNG', 'APPLICATION',
+            'WEITER', 'CONTINUE',
+            'ABBRUCH', 'CANCEL',
+            'ABLAGEKENNZEICHEN', 'FILLINGCODE',
+            'ALLEIN', 'SINGLEUSER',
+            'AUFZAEHLTYP', 'ENUMERATION-TYPE',
+            'AUSGABE', 'OUTPUT',
+            'DEZPUNKT', 'DECPOINT'
+            ),
+
+        // output settings
+        7 => array (
+            '.absatz', '.para',
+            '.blocksatz', '.justified',
+            '.flattersatz', '.unjustified',
+            '.format',
+            '.box',
+            '.drucken', '.print',
+            '.gedruckt', '.printed',
+            '.länge', '.length',
+            '.links', '.left',
+            '.rechts', '.right',
+            '.oben', '.up',
+            '.unten', '.down',
+            '.seite', '.page',
+            '.tabellensatz', '.tablerecord',
+            '.trenner', '.separator',
+            'ARCHIV'
+            ),
+
+        // text commands
+        8 => array (
+            '.text',
+            '.atext',
+            '.println',
+            '.uebersetzen', '.translate'
+            ),
+
+        // I/O commands
+        9 => array (
+            '.aus', '.ausgabe', '.output',
+            '.ein', '.eingabe', '.input',
+            '.datei', '.file',
+            '.lesen', '.read',
+            '.sortiere', '.sort',
+            '-ÖFFNEN', '-OPEN',
+            '-TEST',
+            '-LESEN', '-READ',
+            'VON', 'FROM'
+            ),
+
+        //system
+        10 => array (
+            '.browser',
+            '.kommando', '.command',
+            '.system', '.dde',
+            '.editiere', '.edit',
+            '.hilfe', '.help',
+            '.kopieren', '.copy',
+            '.pc.clip',
+            '.pc.copy',
+            '.pc.dll',
+            '.pc.exec',
+            '.pc.open',
+            'DIAGNOSE', 'ERRORREPORT',
+            'DOPPELPUNKT', 'COLON',
+            'ERSETZUNG', 'REPLACEMENT',
+            'WARTEN', 'PARALLEL'
+            ),
+
+        //fibu/accounting specific commands
+        11 => array (
+            '.budget',
+            '.chart',
+            'VKZ',
+            'KONTO', 'ACCOUNT',
+            'AUSZUG', 'STATEMENT',
+            'WAEHRUNG', 'CURRENCY',
+            'WAEHRUNGSKURS', 'EXCHANGERATE',
+            'AUSWAEHR', 'FORCURR',
+            'BUCHUNGSKREIS', 'SET OF BOOKS'
+            ),
+
+        // efop - extended flexible surface
+        12 => array (
+            '.cursor',
+            '.farbe', '.colour',
+            '.fenster', '.window',
+            '.hinweis', '.note',
+            '.menue', '.menu',
+            '.schutz', '.protection',
+            '.zeigen', '.view',
+            '.zeile', '.line',
+            'VORDERGRUND', 'FOREGROUND',
+            'HINTERGRUND', 'BACKGROUND',
+            'SOFORT', 'IMMEDIATELY',
+            'AKTUALISIEREN', 'UPDATE',
+            'FENSTERSCHLIESSEN', 'CLOSEWINDOWS'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}', '*', '&', '%', ';', '<', '>'),
+        1 => array('?', '!')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        /* all fo keywords are case sensitive, don't have to but I like this type of coding */
+        1 => true, 2 => true, 3 => true, 4 => true,
+        5 => true, 6 => true, 7 => true, 8 => true, 9 => true,
+        10 => true, 11 => true, 12 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006600; font-weight: bold;',
+            4 => 'color: #006600; font-weight: bold;',
+            5 => 'color: #003399; font-weight: bold;',
+            6 => 'color: #003399; font-weight: bold;',
+            7 => 'color: #003399; font-weight: bold;',
+            8 => 'color: #003399; font-weight: bold;',
+            9 => 'color: #003399; font-weight: bold;',
+            10 => 'color: #003399; font-weight: bold;',
+            11 => 'color: #003399; font-weight: bold;',
+            12 => 'color: #003399; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            //2 => 'color: #006699;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/fortran.php b/vendor/easybook/geshi/geshi/fortran.php
new file mode 100755
index 000000000..a77b6e7fa
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/fortran.php
@@ -0,0 +1,158 @@
+<?php
+/*************************************************************************************
+ * fortran.php
+ * -----------
+ * Author: Cedric Arrabie (cedric.arrabie@univ-pau.fr)
+ * Copyright: (C) 2006 Cetric Arrabie
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/04/22
+ *
+ * Fortran language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/04/20 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ *  -  Get a list of inbuilt functions to add (and explore fortran more
+ *     to complete this rather bare language file)
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME'=>'Fortran',
+    'COMMENT_SINGLE'=> array(1 =>'!',2=>'Cf2py'),
+    'COMMENT_MULTI'=> array(),
+    //Fortran Comments
+    'COMMENT_REGEXP' => array(1 => '/^C.*?$/mi'),
+    'CASE_KEYWORDS'=> GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS'=> array("'",'"'),
+    'ESCAPE_CHAR'=>'\\',
+    'KEYWORDS'=> array(
+        1 => array(
+            'allocate','block','call','case','contains','continue','cycle','deallocate',
+            'default','do','else','elseif','elsewhere','end','enddo','endif','endwhere',
+            'entry','exit','function','go','goto','if','interface','module','nullify','only',
+            'operator','procedure','program','recursive','return','select','stop',
+            'subroutine','then','to','where','while',
+            'access','action','advance','blank','blocksize','carriagecontrol',
+            'delim','direct','eor','err','exist','file','flen','fmt','form','formatted',
+            'iostat','name','named','nextrec','nml','number','opened','pad','position',
+            'readwrite','recl','sequential','status','unformatted','unit'
+            ),
+        2 => array(
+            '.AND.','.EQ.','.EQV.','.GE.','.GT.','.LE.','.LT.','.NE.','.NEQV.','.NOT.',
+            '.OR.','.TRUE.','.FALSE.'
+            ),
+        3 => array(
+            'allocatable','character','common','complex','data','dimension','double',
+            'equivalence','external','implicit','in','inout','integer','intent','intrinsic',
+            'kind','logical','namelist','none','optional','out','parameter','pointer',
+            'private','public','real','result','save','sequence','target','type','use'
+            ),
+        4 => array(
+            'abs','achar','acos','adjustl','adjustr','aimag','aint','all','allocated',
+            'anint','any','asin','atan','atan2','bit_size','break','btest','carg',
+            'ceiling','char','cmplx','conjg','cos','cosh','cpu_time','count','cshift',
+            'date_and_time','dble','digits','dim','dot_product','dprod dvchk',
+            'eoshift','epsilon','error','exp','exponent','floor','flush','fraction',
+            'getcl','huge','iachar','iand','ibclr','ibits','ibset','ichar','ieor','index',
+            'int','intrup','invalop','ior','iostat_msg','ishft','ishftc','lbound',
+            'len','len_trim','lge','lgt','lle','llt','log','log10','matmul','max','maxexponent',
+            'maxloc','maxval','merge','min','minexponent','minloc','minval','mod','modulo',
+            'mvbits','nbreak','ndperr','ndpexc','nearest','nint','not','offset','ovefl',
+            'pack','precfill','precision','present','product','prompt','radix',
+            'random_number','random_seed','range','repeat','reshape','rrspacing',
+            'scale','scan','segment','selected_int_kind','selected_real_kind',
+            'set_exponent','shape','sign','sin','sinh','size','spacing','spread','sqrt',
+            'sum system','system_clock','tan','tanh','timer','tiny','transfer','transpose',
+            'trim','ubound','undfl','unpack','val','verify'
+            ),
+        ),
+    'SYMBOLS'=> array(
+        '(',')','{','}','[',']','=','+','-','*','/','!','%','^','&',':'
+        ),
+    'CASE_SENSITIVE'=> array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES'=> array(
+        'KEYWORDS'=> array(
+            1 =>'color: #b1b100;',
+            2 =>'color: #000000; font-weight: bold;',
+            3 =>'color: #000066;',
+            4 =>'color: #993333;'
+            ),
+        'COMMENTS'=> array(
+            1 =>'color: #666666; font-style: italic;',
+            2 =>'color: #339933;',
+            'MULTI'=>'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR'=> array(
+            0 =>'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS'=> array(
+            0 =>'color: #009900;'
+            ),
+        'STRINGS'=> array(
+            0 =>'color: #ff0000;'
+            ),
+        'NUMBERS'=> array(
+            0 =>'color: #cc66cc;'
+            ),
+        'METHODS'=> array(
+            1 =>'color: #202020;',
+            2 =>'color: #202020;'
+            ),
+        'SYMBOLS'=> array(
+            0 =>'color: #339933;'
+            ),
+        'REGEXPS'=> array(
+            ),
+        'SCRIPT'=> array(
+            )
+        ),
+    'URLS'=> array(
+        1 =>'',
+        2 =>'',
+        3 =>'',
+        4 =>''
+        ),
+    'OOLANG'=> true,
+    'OBJECT_SPLITTERS'=> array(
+        1 =>'.',
+        2 =>'::'
+        ),
+    'REGEXPS'=> array(
+        ),
+    'STRICT_MODE_APPLIES'=> GESHI_NEVER,
+    'SCRIPT_DELIMITERS'=> array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK'=> array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/freebasic.php b/vendor/easybook/geshi/geshi/freebasic.php
new file mode 100755
index 000000000..c54264496
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/freebasic.php
@@ -0,0 +1,139 @@
+<?php
+/*************************************************************************************
+ * freebasic.php
+ * -------------
+ * Author: Roberto Rossi
+ * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/08/19
+ *
+ * FreeBasic (http://www.freebasic.net/) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/19 (1.0.0)
+ *  -  First Release
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'FreeBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "append", "as", "asc", "asin", "asm", "atan2", "atn", "beep", "bin", "binary", "bit",
+            "bitreset", "bitset", "bload", "bsave", "byref", "byte", "byval", "call",
+            "callocate", "case", "cbyte", "cdbl", "cdecl", "chain", "chdir", "chr", "cint",
+            "circle", "clear", "clng", "clngint", "close", "cls", "color", "command",
+            "common", "cons", "const", "continue", "cos", "cshort", "csign", "csng",
+            "csrlin", "cubyte", "cuint", "culngint", "cunsg", "curdir", "cushort", "custom",
+            "cvd", "cvi", "cvl", "cvlongint", "cvs", "cvshort", "data", "date",
+            "deallocate", "declare", "defbyte", "defdbl", "defined", "defint", "deflng",
+            "deflngint", "defshort", "defsng", "defstr", "defubyte", "defuint",
+            "defulngint", "defushort", "dim", "dir", "do", "double", "draw", "dylibload",
+            "dylibsymbol", "else", "elseif", "end", "enum", "environ", 'environ$', "eof",
+            "eqv", "erase", "err", "error", "exec", "exepath", "exit", "exp", "export",
+            "extern", "field", "fix", "flip", "for", "fre", "freefile", "function", "get",
+            "getjoystick", "getkey", "getmouse", "gosub", "goto", "hex", "hibyte", "hiword",
+            "if", "iif", "imagecreate", "imagedestroy", "imp", "inkey", "inp", "input",
+            "instr", "int", "integer", "is", "kill", "lbound", "lcase", "left", "len",
+            "let", "lib", "line", "lobyte", "loc", "local", "locate", "lock", "lof", "log",
+            "long", "longint", "loop", "loword", "lset", "ltrim", "mid", "mkd", "mkdir",
+            "mki", "mkl", "mklongint", "mks", "mkshort", "mod", "multikey", "mutexcreate",
+            "mutexdestroy", "mutexlock", "mutexunlock", "name", "next", "not", "oct", "on",
+            "once", "open", "option", "or", "out", "output", "overload", "paint", "palette",
+            "pascal", "pcopy", "peek", "peeki", "peeks", "pipe", "pmap", "point", "pointer",
+            "poke", "pokei", "pokes", "pos", "preserve", "preset", "print", "private",
+            "procptr", "pset", "ptr", "public", "put", "random", "randomize", "read",
+            "reallocate", "redim", "rem", "reset", "restore", "resume",
+            "return", "rgb", "rgba", "right", "rmdir", "rnd", "rset", "rtrim", "run",
+            "sadd", "screen", "screencopy", "screeninfo", "screenlock", "screenptr",
+            "screenres", "screenset", "screensync", "screenunlock", "seek", "statement",
+            "selectcase", "setdate", "setenviron", "setmouse",
+            "settime", "sgn", "shared", "shell", "shl", "short", "shr", "sin", "single",
+            "sizeof", "sleep", "space", "spc", "sqr", "static", "stdcall", "step", "stop",
+            "str", "string", "strptr", "sub", "swap", "system", "tab", "tan",
+            "then", "threadcreate", "threadwait", "time", "timer", "to", "trans",
+            "trim", "type", "ubound", "ubyte", "ucase", "uinteger", "ulongint", "union",
+            "unlock", "unsigned", "until", "ushort", "using", "va_arg", "va_first",
+            "va_next", "val", "val64", "valint", "varptr", "view", "viewprint", "wait",
+            "wend", "while", "width", "window", "windowtitle", "with", "write", "xor",
+            "zstring", "explicit", "escape", "true", "false"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #339933;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/freeswitch.php b/vendor/easybook/geshi/geshi/freeswitch.php
new file mode 100755
index 000000000..5412e6d69
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/freeswitch.php
@@ -0,0 +1,166 @@
+<?php
+/*************************************************************************************
+ * freeswitch.php
+ * --------
+ * Author: James Rose (james.gs@stubbornroses.com)
+ * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
+ * Release Version: 1.0.8.11n/a
+ * Date Started: 2011/11/18
+ *
+ * FreeSWITCH language file for GeSHi.
+ *
+ * This file is based on robots.php
+ *
+ * 2011/11/18 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'FreeSWITCH',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => "/^Comment:.*?$/m"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+//        1 => array(
+//            'Disallow', 'Request-rate', 'Robot-version',
+//            'Sitemap', 'User-agent', 'Visit-time'
+//            )
+        ),
+    'SYMBOLS' => array(
+//        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+
+//order is important. regexes will overwrite most things....
+    'STYLES' => array(
+        'KEYWORDS' => array(
+//            1 => 'color: #FF0000; font-weight: bold;',//red
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+//            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+//            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+//            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+//            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: firebrick; font-weight: bold;',
+            1 => 'color: cornflowerblue; font-weight: bold;',
+            2 => 'color: goldenrod; font-weight: bold;',
+            3 => 'color: green; font-weight: bold;',
+            4 => 'color: dimgrey; font-style: italic;',
+            5 => 'color: green; font-weight: bold;',
+            6 => 'color: firebrick; font-weight: bold;',
+            7 => 'color: indigo; font-weight: italic;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+//        1 => 'http://www.robotstxt.org/wc/norobots.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '(^.*ERROR.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => '(^.*NOTICE.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(^.*DEBUG.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '(^.*INFO.*|.*info\(.*|^Channel.*|^Caller.*|^variable.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '(^Dialplan.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        5 => array(
+            GESHI_SEARCH => '(Regex\ \(PASS\))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        6 => array(
+            GESHI_SEARCH => '(Regex\ \(FAIL\))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        7 => array(
+            GESHI_SEARCH => '(\d{7,15})',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/fsharp.php b/vendor/easybook/geshi/geshi/fsharp.php
new file mode 100755
index 000000000..d85a7c757
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/fsharp.php
@@ -0,0 +1,213 @@
+<?php
+/*************************************************************************************
+ * fsharp.php
+ * ----------
+ * Author: julien ortin (jo_spam-divers@yahoo.fr)
+ * Copyright: (c) 2009 julien ortin
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/09/20
+ *
+ * F# language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/09/22 (1.0.1)
+ *  -  added rules for single char handling (generics ['a] vs char ['x'])
+ *  -  added symbols and keywords
+ * 2009/09/20 (1.0.0)
+ *  -  Initial release
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'F#',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(3 => '/\(\*(?!\)).*?\*\)/s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('"'),
+    'HARDCHAR' => '"',
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /* main F# keywords */
+        /* section 3.4 */
+        1 => array(
+            'abstract', 'and', 'as', 'assert', 'base', 'begin', 'class', 'default', 'delegate', 'do', 'done',
+            'downcast', 'downto', 'elif', 'else', 'end', 'exception', 'extern', 'false', 'finally', 'for',
+            'fun', 'function', 'if', 'in', 'inherit', 'inline', 'interface', 'internal', 'lazy', 'let',
+            'match', 'member', 'module', 'mutable', 'namespace', 'new', 'not', 'null', 'of', 'open', 'or',
+            'override', 'private', 'public', 'rec', 'return', 'sig', 'static', 'struct', 'then', 'to',
+            'true', 'try', 'type', 'upcast', 'use', 'val', 'void', 'when', 'while', 'with', 'yield',
+            'asr', 'land', 'lor', 'lsl', 'lsr', 'lxor', 'mod',
+            /* identifiers are reserved for future use by F# */
+            'atomic', 'break', 'checked', 'component', 'const', 'constraint', 'constructor',
+            'continue', 'eager', 'fixed', 'fori', 'functor', 'global', 'include', 'method', 'mixin',
+            'object', 'parallel', 'params', 'process', 'protected', 'pure', 'sealed', 'tailcall',
+            'trait', 'virtual', 'volatile',
+            /* take monads into account */
+            'let!', 'yield!'
+            ),
+        /* define names of main libraries in F# Core, so we can link to it
+         * http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/namespaces.html
+         */
+        2 => array(
+            'Array', 'Array2D', 'Array3D', 'Array4D', 'ComparisonIdentity', 'HashIdentity', 'List',
+            'Map', 'Seq', 'SequenceExpressionHelpers', 'Set', 'CommonExtensions', 'Event',
+            'ExtraTopLevelOperators', 'LanguagePrimitives', 'NumericLiterals', 'Operators',
+            'OptimizedClosures', 'Option', 'String', 'NativePtr', 'Printf'
+            ),
+        /* 17.2 & 17.3 */
+        3 => array(
+            'abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
+            'floor', 'log', 'log10', 'pown', 'round', 'sign', 'sin', 'sinh', 'sqrt',
+            'tan', 'tanh',
+            'ignore',
+            'fst', 'snd',
+            'stdin', 'stdout', 'stderr',
+            'KeyValue',
+            'max', 'min'
+            ),
+        /* Pervasives Types & Overloaded Conversion Functions */
+        4 => array(
+            'bool', 'byref', 'byte', 'char', 'decimal', 'double', 'exn', 'float', 'float32',
+            'FuncConvert', 'ilsigptr', 'int', 'int16', 'int32', 'int64', 'int8',
+            'nativeint', 'nativeptr', 'obj', 'option', 'ref', 'sbyte', 'single', 'string', 'uint16',
+            'uint32', 'uint64', 'uint8', 'unativeint', 'unit',
+            'enum',
+            'async', 'seq', 'dict'
+            ),
+        /* 17.2 Exceptions */
+        5 => array (
+            'failwith', 'invalidArg', 'raise', 'rethrow'
+            ),
+        /* 3.3 Conditional compilation & 13.3 Compiler Directives + light / light off */
+        6 => array(
+            '(*IF-FSHARP', 'ENDIF-FSHARP*)', '(*F#', 'F#*)', '(*IF-OCAML', 'ENDIF-OCAML*)',
+            '#light',
+            '#if', '#else', '#endif', '#indent', '#nowarn', '#r', '#reference',
+            '#I', '#Include', '#load', '#time', '#help', '#q', '#quit',
+            ),
+        /* 3.11 Pre-processor Declarations / Identifier Replacements */
+        7 => array(
+            '__SOURCE_DIRECTORY__', '__SOURCE_FILE__', '__LINE__'
+            ),
+        /* 17.2 Object Transformation Operators */
+        8 => array(
+            'box', 'hash', 'sizeof', 'typeof', 'typedefof', 'unbox'
+            )
+        ),
+    /* 17.2 basic operators + the yield and yield! arrows */
+    'SYMBOLS' => array(
+        1 => array('+', '-', '/', '*', '**', '%', '~-'),
+        2 => array('<', '<=', '>', '<=', '=', '<>'),
+        3 => array('<<<', '>>>', '^^^', '&&&', '|||', '~~~'),
+        4 => array('|>', '>>', '<|', '<<'),
+        5 => array('!', '->', '->>'),
+        6 => array('[',']','(',')','{','}', '[|', '|]', '(|', '|)'),
+        7 => array(':=', ';', ';;')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true, /* keywords */
+        2 => true, /* modules */
+        3 => true, /* pervasives functions */
+        4 => true, /* types and overloaded conversion operators */
+        5 => true, /* exceptions */
+        6 => true, /* conditional compilation & compiler Directives */
+        7 => true, /* pre-processor declarations / identifier replacements */
+        8 => true  /* object transformation operators */
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* nice blue */
+            3 => 'color: #06c; font-weight: bold;', /* nice blue */
+            4 => 'color: #06c; font-weight: bold;', /* nice blue */
+            5 => 'color: #06c; font-weight: bold;', /* nice blue */
+            6 => 'color: #06c; font-weight: bold;', /* nice blue */
+            7 => 'color: #06c; font-weight: bold;', /* nice blue */
+            8 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;', /* light purple */
+            1 => 'color: #5d478b; font-style: italic;',
+            2 => 'color: #5d478b; font-style: italic;', /* light purple */
+            3 => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #6c6;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Pervasives functions (land, lxor, asr, ...) */
+        1 => '',
+        2 => 'http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/namespaces.html',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/gambas.php b/vendor/easybook/geshi/geshi/gambas.php
new file mode 100755
index 000000000..352830ebb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/gambas.php
@@ -0,0 +1,214 @@
+<?php
+/*************************************************************************************
+ * gambas.php
+ * ---------
+ * Author: Jesus Guardon (jguardon@telefonica.net)
+ * Copyright: (c) 2009 Jesus Guardon (http://gambas-es.org),
+ *                     Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/20
+ *
+ * GAMBAS language file for GeSHi.
+ * GAMBAS Official Site: http://gambas.sourceforge.net
+ *
+ * CHANGES
+ * -------
+ * 2009/09/26 (1.0.1)
+ *  -  Splitted dollar-ended keywords in another group to match with or without '$'
+ *  -  Modified URL for object/components keywords search through Google "I'm feeling lucky"
+ * 2009/09/23 (1.0.0)
+ *  -  Initial release
+ *
+ * TODO (updated 2009/09/26)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GAMBAS',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        //keywords
+        1 => array(
+            'APPEND', 'AS', 'BREAK', 'BYREF', 'CASE', 'CATCH', 'CLASS', 'CLOSE', 'CONST', 'CONTINUE', 'COPY',
+            'CREATE', 'DEBUG', 'DEC', 'DEFAULT', 'DIM', 'DO', 'EACH', 'ELSE', 'END', 'ENDIF', 'ERROR', 'EVENT', 'EXEC',
+            'EXPORT', 'EXTERN', 'FALSE', 'FINALLY', 'FLUSH', 'FOR', 'FUNCTION', 'GOTO', 'IF', 'IN', 'INC', 'INHERITS',
+            'INPUT', 'FROM', 'IS', 'KILL', 'LAST', 'LIBRARY', 'LIKE', 'LINE INPUT', 'LINK', 'LOCK', 'LOOP', 'ME',
+            'MKDIR', 'MOVE', 'NEW', 'NEXT', 'NULL', 'OPEN', 'OPTIONAL', 'OUTPUT', 'PIPE', 'PRINT', 'PRIVATE',
+            'PROCEDURE', 'PROPERTY', 'PUBLIC', 'QUIT', 'RAISE', 'RANDOMIZE', 'READ', 'REPEAT', 'RETURN', 'RMDIR',
+            'SEEK', 'SELECT', 'SHELL', 'SLEEP', 'STATIC', 'STEP', 'STOP', 'SUB', 'SUPER', 'SWAP', 'THEN', 'TO',
+            'TRUE', 'TRY', 'UNLOCK', 'UNTIL', 'WAIT', 'WATCH', 'WEND', 'WHILE', 'WITH', 'WRITE'
+            ),
+        //functions
+        2 => array(
+            'Abs', 'Access', 'Acos', 'Acosh', 'Alloc', 'Ang', 'Asc', 'ASin', 'ASinh', 'Asl', 'Asr', 'Assign', 'Atan',
+            'ATan2', 'ATanh',
+            'BChg', 'BClr', 'Bin', 'BSet', 'BTst',
+            'CBool', 'Cbr', 'CByte', 'CDate', 'CFloat', 'Choose', 'Chr', 'CInt', 'CLong', 'Comp', 'Conv', 'Cos',
+            'Cosh', 'CShort', 'CSng', 'CStr',
+            'DateAdd', 'DateDiff', 'Day', 'DConv', 'Deg', 'DFree', 'Dir',
+            'Eof', 'Eval', 'Exist', 'Exp', 'Exp10', 'Exp2', 'Expm',
+            'Fix', 'Format', 'Frac', 'Free',
+            'Hex', 'Hour', 'Hyp',
+            'Iif', 'InStr', 'Int', 'IsAscii', 'IsBlank', 'IsBoolean', 'IsByte', 'IsDate', 'IsDigit', 'IsDir',
+            'IsFloat', 'IsHexa', 'IsInteger', 'IsLCase', 'IsLetter', 'IsLong', 'IsNull', 'IsNumber', 'IsObject',
+            'IsPunct', 'IsShort', 'IsSingle', 'IsSpace', 'IsString', 'IsUCase', 'IsVariant',
+            'LCase', 'Left', 'Len', 'Lof', 'Log', 'Log10', 'Log2', 'Logp', 'Lsl', 'Lsr', 'LTrim',
+            'Mag', 'Max', 'Mid', 'Min', 'Minute', 'Month', 'Now', 'Quote',
+            'Rad', 'RDir', 'Realloc', 'Replace', 'Right', 'RInStr', 'Rnd', 'Rol', 'Ror', 'Round', 'RTrim',
+            'Scan', 'SConv', 'Second', 'Seek', 'Sgn', 'Shl', 'Shr', 'Sin', 'Sinh', 'Space', 'Split', 'Sqr',
+            'Stat', 'Str', 'StrPtr', 'Subst',
+            'Tan', 'Tanh', 'Temp$', 'Time', 'Timer', 'Tr', 'Trim', 'TypeOf',
+            'UCase', 'Unquote', 'Val', 'VarPtr', 'Week', 'WeekDay', 'Year'
+            ),
+        //string functions
+        3 => array(
+            'Bin$', 'Chr$', 'Conv$', 'DConv$', 'Format$', 'Hex$', 'LCase$', 'Left$', 'LTrim$', 'Mid$', 'Quote$',
+            'Replace$', 'Right$', 'SConv$', 'Space$', 'Str$', 'String$', 'Subst$', 'Tr$', 'Trim$', 'UCase$',
+            'Unquote$'
+            ),
+        //datatypes
+        4 => array(
+            'Boolean', 'Byte', 'Short', 'Integer', 'Long', 'Single', 'Float', 'Date', 'String', 'Variant', 'Object',
+            'Pointer', 'File'
+            ),
+        //operators
+        5 => array(
+            'AND', 'DIV', 'MOD', 'NOT', 'OR', 'XOR'
+            ),
+        //objects/classes
+        6 => array(
+            'Application', 'Array', 'Byte[]', 'Collection', 'Component', 'Enum', 'Observer', 'Param', 'Process',
+            'Stream', 'System', 'User', 'Chart', 'Compress', 'Crypt', 'Blob', 'Connection', 'DB', 'Database',
+            'DatabaseUser', 'Field', 'Index', 'Result', 'ResultField', 'Table', 'DataBrowser', 'DataCombo',
+            'DataControl', 'DataSource', 'DataView', 'Desktop', 'DesktopFile', 'Balloon', 'ColorButton',
+            'ColorChooser', 'DateChooser', 'DirChooser', 'DirView', 'Expander', 'FileChooser', 'FileView',
+            'FontChooser', 'InputBox', 'ListContainer', 'SidePanel', 'Stock', 'TableView', 'ToolPanel', 'ValueBox',
+            'Wizard', 'Dialog', 'ToolBar', 'WorkSpace', 'DnsClient', 'SerialPort', 'ServerSocket', 'Socket',
+            'UdpSocket', 'FtpClient', 'HttpClient', 'SmtpClient', 'Regexp', 'Action', 'Button', 'CheckBox',
+            'ColumnView', 'ComboBox', 'Draw', 'Container', 'Control', 'Cursor', 'DrawingArea', 'Embedder',
+            'Font', 'Form', 'Frame', 'GridView', 'HBox', 'HPanel', 'HSplit', 'IconView', 'Image', 'Key', 'Label',
+            'Line', 'ListBox', 'ListView', 'Menu', 'Message', 'Mouse', 'MovieBox', 'Panel', 'Picture', 'PictureBox',
+            'ProgressBar', 'RadioButton', 'ScrollBar', 'ScrollView', 'Separator', 'Slider', 'SpinBox', 'TabStrip',
+            'TextArea', 'TextBox', 'TextLabel', 'ToggleButton', 'TrayIcon', 'TreeView', 'VBox', 'VPanel', 'VSplit',
+            'Watcher', 'Window', 'Dial', 'Editor', 'LCDNumber', 'Printer', 'TextEdit', 'WebBrowser', 'GLarea',
+            'Report', 'ReportCloner', 'ReportContainer', 'ReportControl', 'ReportDrawing', 'ReportField', 'ReportHBox',
+            'ReportImage', 'ReportLabel', 'ReportSection', 'ReportSpecialField', 'ReportTextLabel', 'ReportVBox',
+            'CDRom', 'Channel', 'Music', 'Sound', 'Settings', 'VideoDevice', 'Vb', 'CGI', 'HTML', 'Request', 'Response',
+            'Session', 'XmlDocument', 'XmlNode', 'XmlReader', 'XmlReaderNodeType', 'XmlWriter', 'RpcArray', 'RpcClient',
+            'RpcFunction', 'RpcServer', 'RpcStruct', 'RpcType', 'XmlRpc', 'Xslt'
+            ),
+        //constants
+        7 => array(
+            'Pi'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '&', '&=', '&/', '*', '*=', '+', '+=', '-', '-=', '//', '/', '/=', '=', '==', '\\', '\\=',
+        '^', '^=', '[', ']', '{', '}', '<', '>', '<>', '<=', '>='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF; font-weight: bold;',          // Keywords
+            2 => 'color: #8B1433;',                             // Functions
+            3 => 'color: #8B1433;',                             // String Functions
+            4 => 'color: #0600FF;',                             // Data Types
+            5 => 'color: #1E90FF;',                             // Operators
+            6 => 'color: #0600FF;',                             // Objects/Components
+            7 => 'color: #0600FF;'                              // Constants
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #1A5B1A; font-style: italic;',
+            'MULTI' => 'color: #1A5B1A; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #612188;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7E4B05;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;',
+            GESHI_NUMBER_INT_BASIC => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #6132B2;'
+            ),
+        'REGEXPS' => array(
+            //3 => 'color: #8B1433;'  //fakes '$' colour matched by REGEXP
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
+        2 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
+        3 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:http://gambasdoc.org/help/lang/&amp;btnI=I%27m%20Feeling%20Lucky',
+        4 => 'http://gambasdoc.org/help/lang/type/{FNAMEL}',
+        5 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
+        6 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:http://gambasdoc.org/&amp;btnI=I%27m%20Feeling%20Lucky',
+        7 => 'http://gambasdoc.org/help/lang/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 =>'.'
+        ),
+    'REGEXPS' => array(
+        //3 => "\\$(?!\\w)"   //matches '$' at the end of Keyword
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-&;\$])"
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/gdb.php b/vendor/easybook/geshi/geshi/gdb.php
new file mode 100755
index 000000000..9f63d25b0
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/gdb.php
@@ -0,0 +1,196 @@
+<?php
+/*************************************************************************************
+ * gdb.php
+ * --------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2009 Milian Wolff
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/06/24
+ *
+ * GDB language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/06/24 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2009/06/24)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GDB',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        0 => array(
+            'Application',
+            'signal',
+            ),
+        1 => array(
+            'Segmentation fault',
+            '[KCrash Handler]',
+            ),
+        ),
+    'NUMBERS' => false,
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        0 => true,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            0 => 'font-weight:bold;',
+            1 => 'font-weight:bold; color: #ff0000;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066; font-weight:bold;',
+            1 => 'color: #006600;',
+            2 => 'color: #B07E00;',
+            3 => 'color: #0057AE; text-style:italic;',
+            4 => 'color: #0057AE; text-style:italic;',
+            5 => 'color: #442886;',
+            6 => 'color: #442886; font-weight:bold;',
+            7 => 'color: #FF0000; font-weight:bold;',
+            8 => 'color: #006E26;',
+            9 => 'color: #555;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        0 => '',
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //[Current Thread...], [KCrash Handler] etc.
+        0 => array(
+            GESHI_SEARCH => '^\[.+\]',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //stack number
+        1 => array(
+            GESHI_SEARCH => '^#\d+',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Thread X (Thread...)
+        2 => array(
+            GESHI_SEARCH => '^Thread \d.+$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Files with linenumbers
+        3 => array(
+            GESHI_SEARCH => '(at\s+)(.+)(:\d+\s*)$',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Libs without linenumbers
+        4 => array(
+            GESHI_SEARCH => '(from\s+)(.+)(\s*)$',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Line numbers
+        5 => array(
+            GESHI_SEARCH => '(:)(\d+)(\s*)$',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Location
+        6 => array(
+            GESHI_SEARCH => '(\s+)(in\s+)?([^ 0-9][^ ]*)([ \n]+\()',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1\\2',
+            GESHI_AFTER => '\\4'
+            ),
+        // interesting parts: abort, qFatal, assertions, null ptrs, ...
+        7 => array(
+            GESHI_SEARCH => '\b((?:\*__GI_)?(?:__assert_fail|abort)|qFatal|0x0)\b([^\.]|$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+        // Namespace / Classes
+        8 => array(
+            GESHI_SEARCH => '\b(\w+)(::)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'U',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+        // make ptr adresses and <value optimized out> uninteresting
+        9 => '\b(?:0x[a-f0-9]{2,}|value\s+optimized\s+out)\b'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => false
+            ),
+        )
+);
+
+// kate: replace-tabs on; indent-width 4;
diff --git a/vendor/easybook/geshi/geshi/genero.php b/vendor/easybook/geshi/geshi/genero.php
new file mode 100755
index 000000000..2ab24855f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/genero.php
@@ -0,0 +1,461 @@
+<?php
+/*************************************************************************************
+ * genero.php
+ * ----------
+ * Author: Lars Gersmann (lars.gersmann@gmail.com)
+ * Copyright: (c) 2007 Lars Gersmann, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/07/01
+ *
+ * Genero (FOURJ's Genero 4GL) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/07/01 (1.0.0)
+ *  -  Initial release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'genero',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ABSOLUTE",
+            "ACCEPT",
+            "ACTION",
+            "ADD",
+            "AFTER",
+            "ALL",
+            "ALTER",
+            "AND",
+            "ANY",
+            "APPEND",
+            "APPLICATION",
+            "AS",
+            "AT",
+            "ATTRIBUTE",
+            "ATTRIBUTES",
+            "AUDIT",
+            "AVG",
+            "BEFORE",
+            "BEGIN",
+            "BETWEEN",
+            "BORDER",
+            "BOTTOM",
+            "BREAKPOINT",
+            "BUFFER",
+            "BUFFERED",
+            "BY",
+            "CALL",
+            "CANCEL",
+            "CASE",
+            "CENTURY",
+            "CHANGE",
+            "CHECK",
+            "CLEAR",
+            "CLIPPED",
+            "CLOSE",
+            "CLUSTER",
+            "COLUMN",
+            "COLUMNS",
+            "COMMAND",
+            "COMMENT",
+            "COMMIT",
+            "COMMITTED",
+            "CONCURRENT ",
+            "CONNECT",
+            "CONNECTION",
+            "CONSTANT",
+            "CONSTRAINED",
+            "CONSTRAINT",
+            "CONSTRUCT",
+            "CONTINUE",
+            "CONTROL",
+            "COUNT",
+            "CREATE",
+            "CROSS",
+            "CURRENT",
+            "DATABASE",
+            "DBA",
+            "DEC",
+            "DECLARE",
+            "DEFAULT",
+            "DEFAULTS",
+            "DEFER",
+            "DEFINE",
+            "DELETE",
+            "DELIMITER",
+            "DESCRIBE",
+            "DESTINATION",
+            "DIM",
+            "DIALOG",
+            "DIMENSION",
+            "DIRTY",
+            "DISCONNECT",
+            "DISPLAY",
+            "DISTINCT",
+            "DORMANT",
+            "DOWN",
+            "DROP",
+            "DYNAMIC",
+            "ELSE",
+            "END",
+            "ERROR",
+            "ESCAPE",
+            "EVERY",
+            "EXCLUSIVE",
+            "EXECUTE",
+            "EXISTS",
+            "EXIT",
+            "EXPLAIN",
+            "EXTEND",
+            "EXTENT",
+            "EXTERNAL",
+            "FETCH",
+            "FGL_DRAWBOX",
+            "FIELD",
+            "FIELD_TOUCHED",
+            "FILE",
+            "FILL",
+            "FINISH",
+            "FIRST",
+            "FLOAT",
+            "FLUSH",
+            "FOR",
+            "FOREACH",
+            "FORM",
+            "FORMAT",
+            "FOUND",
+            "FRACTION",
+            "FREE",
+            "FROM",
+            "FULL",
+            "FUNCTION",
+            "GET_FLDBUF",
+            "GLOBALS",
+            "GO",
+            "GOTO",
+            "GRANT",
+            "GROUP",
+            "HAVING",
+            "HEADER",
+            "HELP",
+            "HIDE",
+            "HOLD",
+            "HOUR",
+            "IDLE",
+            "IF",
+            "IMAGE",
+            "IMMEDIATE",
+            "IN",
+            "INDEX",
+            "INFIELD",
+            "INITIALIZE",
+            "INNER",
+            "INPUT",
+            "INSERT",
+            "INTERRUPT",
+            "INTERVAL",
+            "INTO",
+            "INVISIBLE",
+            "IS",
+            "ISOLATION",
+            "JOIN",
+            "KEEP",
+            "KEY",
+            "LABEL",
+            "LAST",
+            "LEFT",
+            "LENGTH",
+            "LET",
+            "LIKE",
+            "LINE",
+            "LINENO",
+            "LINES",
+            "LOAD",
+            "LOCATE",
+            "LOCK",
+            "LOG",
+            "LSTR",
+            "MAIN",
+            "MARGIN",
+            "MATCHES",
+            "MAX",
+            "MAXCOUNT",
+            "MDY",
+            "MEMORY",
+            "MENU",
+            "MESSAGE",
+            "MIN",
+            "MINUTE",
+            "MOD",
+            "MODE",
+            "MODIFY",
+            "MONEY",
+            "NAME",
+            "NEED",
+            "NEXT",
+            "NO",
+            "NORMAL",
+            "NOT",
+            "NOTFOUND",
+            "NULL",
+            "NUMERIC",
+            "OF",
+            "ON",
+            "OPEN",
+            "OPTION",
+            "OPTIONS",
+            "OR",
+            "ORDER",
+            "OTHERWISE",
+            "OUTER",
+            "OUTPUT",
+            "PAGE",
+            "PAGENO",
+            "PAUSE",
+            "PERCENT",
+            "PICTURE",
+            "PIPE",
+            "PRECISION",
+            "PREPARE",
+            "PREVIOUS",
+            "PRINT",
+            "PRINTER",
+            "PRINTX",
+            "PRIOR",
+            "PRIVILEGES",
+            "PROCEDURE",
+            "PROGRAM",
+            "PROMPT",
+            "PUBLIC",
+            "PUT",
+            "QUIT",
+            "READ",
+            "REAL",
+            "RECORD",
+            "RECOVER",
+            "RED ",
+            "RELATIVE",
+            "RENAME",
+            "REOPTIMIZATION",
+            "REPEATABLE",
+            "REPORT",
+            "RESOURCE",
+            "RETURN",
+            "RETURNING",
+            "REVERSE",
+            "REVOKE",
+            "RIGHT",
+            "ROLLBACK",
+            "ROLLFORWARD",
+            "ROW",
+            "ROWS",
+            "RUN",
+            "SCHEMA",
+            "SCREEN",
+            "SCROLL",
+            "SECOND",
+            "SELECT",
+            "SERIAL",
+            "SET",
+            "SFMT",
+            "SHARE",
+            "SHIFT",
+            "SHOW",
+            "SIGNAL ",
+            "SIZE",
+            "SKIP",
+            "SLEEP",
+            "SOME",
+            "SPACE",
+            "SPACES",
+            "SQL",
+            "SQLERRMESSAGE",
+            "SQLERROR",
+            "SQLSTATE",
+            "STABILITY",
+            "START",
+            "STATISTICS",
+            "STEP",
+            "STOP",
+            "STYLE",
+            "SUM",
+            "SYNONYM",
+            "TABLE",
+            "TEMP",
+            "TERMINATE",
+            "TEXT",
+            "THEN",
+            "THROUGH",
+            "THRU",
+            "TO",
+            "TODAY",
+            "TOP",
+            "TRAILER",
+            "TRANSACTION ",
+            "UNBUFFERED",
+            "UNCONSTRAINED",
+            "UNDERLINE",
+            "UNION",
+            "UNIQUE",
+            "UNITS",
+            "UNLOAD",
+            "UNLOCK",
+            "UP",
+            "UPDATE",
+            "USE",
+            "USER",
+            "USING",
+            "VALIDATE",
+            "VALUE",
+            "VALUES",
+            "VARCHAR",
+            "VIEW",
+            "WAIT",
+            "WAITING",
+            "WARNING",
+            "WHEN",
+            "WHENEVER",
+            "WHERE",
+            "WHILE",
+            "WINDOW",
+            "WITH",
+            "WITHOUT",
+            "WORDWRAP",
+            "WORK",
+            "WRAP"
+            ),
+        2 => array(
+            '&amp;IFDEF', '&amp;ENDIF'
+            ),
+        3 => array(
+            "ARRAY",
+            "BYTE",
+            "CHAR",
+            "CHARACTER",
+            "CURSOR",
+            "DATE",
+            "DATETIME",
+            "DECIMAL",
+            "DOUBLE",
+            "FALSE",
+            "INT",
+            "INTEGER",
+            "SMALLFLOAT",
+            "SMALLINT",
+            "STRING",
+            "TIME",
+            "TRUE"
+            ),
+        4 => array(
+            "BLACK",
+            "BLINK",
+            "BLUE",
+            "BOLD",
+            "ANSI",
+            "ASC",
+            "ASCENDING",
+            "ASCII",
+            "CYAN",
+            "DESC",
+            "DESCENDING",
+            "GREEN",
+            "MAGENTA",
+            "OFF",
+            "WHITE",
+            "YELLOW",
+            "YEAR",
+            "DAY",
+            "MONTH",
+            "WEEKDAY"
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/genie.php b/vendor/easybook/geshi/geshi/genie.php
new file mode 100755
index 000000000..3bab1b7b7
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/genie.php
@@ -0,0 +1,155 @@
+<?php
+/*************************************************************************************
+ * genie.php
+ * ----------
+ * Author: Nicolas Joseph (nicolas.joseph@valaide.org)
+ * Copyright: (c) 2009 Nicolas Joseph
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/04/29
+ *
+ * Genie language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Genie',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Using and Namespace directives (basic support)
+        //Please note that the alias syntax for using is not supported
+        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'and', 'as', 'abstract', 'break', 'case', 'cast', 'catch', 'const',
+            'construct', 'continue', 'default', 'def', 'delete', 'div',
+            'dynamic', 'do', 'downto', 'else', 'ensures', 'except', 'extern',
+            'false', 'final', 'finally', 'for', 'foreach', 'get', 'if', 'in',
+            'init', 'inline', 'internal', 'implements', 'lock', 'not', 'null',
+            'of', 'or', 'otherwise', 'out', 'override', 'pass', 'raise',
+            'raises', 'readonly', 'ref', 'requires', 'self', 'set', 'static',
+            'super', 'switch', 'to', 'true', 'try', 'unless', 'uses', 'var', 'virtual',
+            'volatile', 'void', 'when', 'while'
+            ),
+//        2 => array(
+//            ),
+        3 => array(
+            'is', 'isa', 'new', 'owned', 'sizeof', 'typeof', 'unchecked',
+            'unowned', 'weak'
+            ),
+        4 => array(
+            'bool', 'byte', 'class', 'char', 'date', 'datetime', 'decimal', 'delegate',
+            'double', 'enum', 'event', 'exception', 'float', 'int', 'interface',
+            'long', 'object', 'prop', 'sbyte', 'short', 'single', 'string',
+            'struct', 'ulong', 'ushort'
+            ),
+//        5 => array(
+//            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
+        '(', ')', '{', '}', '[', ']', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+//        2 => false,
+        3 => false,
+        4 => false,
+//        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+//            2 => 'color: #FF8000; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;',
+//            5 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+//            2 => 'color: #008080;',
+            3 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;',
+            'HARD' => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;',
+            'HARD' => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+//        2 => '',
+        3 => '',
+        4 => '',
+//        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/gettext.php b/vendor/easybook/geshi/geshi/gettext.php
new file mode 100755
index 000000000..eb928bf6c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/gettext.php
@@ -0,0 +1,95 @@
+<?php
+/*************************************************************************************
+ * gettext.php
+ * --------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/05/25
+ *
+ * GNU Gettext .po/.pot language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/02 (1.0.8)
+ *  -  New comments: flags and previous-fields
+ *  -  New keywords: msgctxt, msgid_plural
+ *  -  Msgstr array indices
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GNU Gettext',
+    'COMMENT_SINGLE' => array('#:', '#.', '#,', '#|', '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array('msgctxt', 'msgid_plural', 'msgid', 'msgstr'),
+    ),
+    'SYMBOLS' => array(),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;'
+        ),
+        'COMMENTS' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #000099;',
+            2 => 'color: #000099;',
+            3 => 'color: #006666;',
+            4 => 'color: #666666; font-style: italic;',
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+        ),
+        'REGEXPS' => array(),
+        'SYMBOLS' => array(),
+        'NUMBERS' => array(
+            0 => 'color: #000099;'
+        ),
+        'METHODS' => array(),
+        'SCRIPT' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #000099;'
+        ),
+    ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+);
diff --git a/vendor/easybook/geshi/geshi/glsl.php b/vendor/easybook/geshi/geshi/glsl.php
new file mode 100755
index 000000000..3615cfe71
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/glsl.php
@@ -0,0 +1,205 @@
+<?php
+/*************************************************************************************
+ * glsl.php
+ * -----
+ * Author: Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2008 Benny Baumann (BenBE@omorphia.de)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/03/20
+ *
+ * glSlang language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/03/20 (1.0.7.21)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'glSlang',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'else', 'for', 'while', 'do', 'break', 'continue', 'asm',
+            'switch', 'case', 'default', 'return', 'discard',
+            'namespace', 'using', 'sizeof', 'cast'
+            ),
+        2 => array(
+            'const', 'uniform', 'attribute', 'centroid', 'varying', 'invariant',
+            'in', 'out', 'inout', 'input', 'output', 'typedef', 'volatile',
+            'public', 'static', 'extern', 'external', 'packed',
+            'inline', 'noinline', 'noperspective', 'flat'
+            ),
+        3 => array(
+            'void', 'bool', 'int', 'long', 'short', 'float', 'half', 'fixed',
+            'unsigned', 'lowp', 'mediump', 'highp', 'precision',
+            'vec2', 'vec3', 'vec4', 'bvec2', 'bvec3', 'bvec4',
+            'dvec2', 'dvec3', 'dvec4', 'fvec2', 'fvec3', 'fvec4',
+            'hvec2', 'hvec3', 'hvec4', 'ivec2', 'ivec3', 'ivec4',
+            'mat2', 'mat3', 'mat4', 'mat2x2', 'mat3x2', 'mat4x2',
+            'mat2x3', 'mat3x3', 'mat4x3', 'mat2x4', 'mat3x4', 'mat4x4',
+            'sampler1D', 'sampler2D', 'sampler3D', 'samplerCube',
+            'sampler1DShadow', 'sampler2DShadow',
+            'struct', 'class', 'union', 'enum', 'interface', 'template'
+            ),
+        4 => array(
+            'this', 'false', 'true'
+            ),
+        5 => array(
+            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan',
+            'pow', 'exp2', 'log2', 'sqrt', 'inversesqrt', 'abs', 'sign', 'ceil',
+            'floor', 'fract', 'mod', 'min', 'max', 'clamp', 'mix', 'step',
+            'smoothstep', 'length', 'distance', 'dot', 'cross', 'normalize',
+            'ftransform', 'faceforward', 'reflect', 'matrixCompMult', 'equal',
+            'lessThan', 'lessThanEqual', 'greaterThan', 'greaterThanEqual',
+            'notEqual', 'any', 'all', 'not', 'texture1D', 'texture1DProj',
+            'texture1DLod', 'texture1DProjLod', 'texture2D', 'texture2DProj',
+            'texture2DLod', 'texture2DProjLod', 'texture3D', 'texture3DProj',
+            'texture3DLod', 'texture3DProjLod', 'textureCube', 'textureCubeLod',
+            'shadow1D', 'shadow1DProj', 'shadow1DLod', 'shadow1DProjLod',
+            'shadow2D', 'shadow2DProj', 'shadow2DLod', 'shadow2DProjLod',
+            'noise1', 'noise2', 'noise3', 'noise4'
+            ),
+        6 => array(
+            'gl_Position', 'gl_PointSize', 'gl_ClipVertex', 'gl_FragColor',
+            'gl_FragData', 'gl_FragDepth', 'gl_FragCoord', 'gl_FrontFacing',
+            'gl_Color', 'gl_SecondaryColor', 'gl_Normal', 'gl_Vertex',
+            'gl_MultiTexCoord0', 'gl_MultiTexCoord1', 'gl_MultiTexCoord2',
+            'gl_MultiTexCoord3', 'gl_MultiTexCoord4', 'gl_MultiTexCoord5',
+            'gl_MultiTexCoord6', 'gl_MultiTexCoord7', 'gl_FogCoord',
+            'gl_MaxLights', 'gl_MaxClipPlanes', 'gl_MaxTextureUnits',
+            'gl_MaxTextureCoords', 'gl_MaxVertexAttribs', 'gl_MaxVaryingFloats',
+            'gl_MaxVertexUniformComponents', 'gl_MaxVertexTextureImageUnits',
+            'gl_MaxCombinedTextureImageUnits', 'gl_MaxTextureImageUnits',
+            'gl_MaxFragmentUniformComponents', 'gl_MaxDrawBuffers', 'gl_Point',
+            'gl_ModelViewMatrix', 'gl_ProjectionMatrix', 'gl_FrontMaterial',
+            'gl_ModelViewProjectionMatrix', 'gl_TextureMatrix', 'gl_ClipPlane',
+            'gl_NormalMatrix', 'gl_ModelViewMatrixInverse', 'gl_BackMaterial',
+            'gl_ProjectionMatrixInverse', 'gl_ModelViewProjectionMatrixInverse',
+            'gl_TextureMatrixInverse', 'gl_ModelViewMatrixTranspose', 'gl_Fog',
+            'gl_ProjectionMatrixTranspose', 'gl_NormalScale', 'gl_DepthRange',
+            'gl_odelViewProjectionMatrixTranspose', 'gl_TextureMatrixTranspose',
+            'gl_ModelViewMatrixInverseTranspose', 'gl_LightSource',
+            'gl_ProjectionMatrixInverseTranspose', 'gl_LightModel',
+            'gl_ModelViewProjectionMatrixInverseTranspose', 'gl_TexCoord',
+            'gl_TextureMatrixInverseTranspose', 'gl_TextureEnvColor',
+            'gl_FrontLightModelProduct', 'gl_BackLightModelProduct',
+            'gl_FrontLightProduct', 'gl_BackLightProduct', 'gl_ObjectPlaneS',
+            'gl_ObjectPlaneT', 'gl_ObjectPlaneR', 'gl_ObjectPlaneQ',
+            'gl_EyePlaneS', 'gl_EyePlaneT', 'gl_EyePlaneR', 'gl_EyePlaneQ',
+            'gl_FrontColor', 'gl_BackColor', 'gl_FrontSecondaryColor',
+            'gl_BackSecondaryColor', 'gl_FogFragCoord', 'gl_PointCoord'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^',
+        '&', '?', ':', '.', '|', ';', ',', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #333399; font-weight: bold;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #333399; font-weight: bold;',
+            5 => 'color: #993333; font-weight: bold;',
+            6 => 'color: #551111;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #009900;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_BEFORE' => '',
+            'MATCH_AFTER' => '[a-zA-Z_][a-zA-Z0-9_]*',
+            'MATCH_SPACES' => '[\s]*'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/gml.php b/vendor/easybook/geshi/geshi/gml.php
new file mode 100755
index 000000000..58387b38a
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/gml.php
@@ -0,0 +1,504 @@
+<?php
+/*************************************************************************************
+ * gml.php
+ * --------
+ * Author: Jos� Jorge Enr�quez (jenriquez@users.sourceforge.net)
+ * Copyright: (c) 2005 Jos� Jorge Enr�quez Rodr�guez (http://www.zonamakers.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/06/21
+ *
+ * GML language file for GeSHi.
+ *
+ * GML (Game Maker Language) is a script language that is built-in into Game Maker,
+ * a game creation program, more info about Game Maker can be found at
+ * http://www.gamemaker.nl/
+ * All GML keywords were extracted from the Game Maker HTML Help file using a PHP
+ * script (one section at a time). I love PHP for saving me that bunch of work :P!.
+ * I think all GML functions have been indexed here, but I'm not sure about it, so
+ * please let me know of any issue you may find.
+ *
+ * CHANGES
+ * -------
+ * 2005/11/11
+ *  -  Changed 'CASE_KEYWORDS' fom 'GESHI_CAPS_LOWER' to 'GESHI_CAPS_NO_CHANGE',
+ *     so that MCI_command appears correctly (the only GML function using capitals).
+ *  -  Changed 'CASE_SENSITIVE' options, 'GESHI_COMMENTS' from true to false and all
+ *     of the others from false to true.
+ *  -  Deleted repeated entries.
+ *  -  div and mod are language keywords, moved (from symbols) to the appropiate section (1).
+ *  -  Moved self, other, all, noone and global identifiers to language keywords section 1.
+ *  -  Edited this file lines to a maximum width of 100 characters (as stated in
+ *     the GeSHi docs). Well, not strictly to 100 but around it.
+ *  -  Corrected some minor issues (the vk_f1...vk_f12 keys and similar).
+ *  -  Deleted the KEYWORDS=>5 and KEYWORDS=>6 sections (actually, they were empty).
+ *     I was planning of using those for the GML functions available only in the
+ *     registered version of the program, but not anymore.
+ *
+ * 2005/06/26 (1.0.3)
+ *  -  First Release.
+ *
+ * TODO (updated 2005/11/11)
+ * -------------------------
+ *  -  Test it for a while and make the appropiate corrections.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GML',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // language keywords
+        1 => array(
+            'break', 'continue', 'do', 'until', 'if', 'else',
+            'exit', 'for', 'repeat', 'return', 'switch',
+            'case', 'default', 'var', 'while', 'with', 'div', 'mod',
+            // GML Language overview
+            'self', 'other', 'all', 'noone', 'global',
+            ),
+        // modifiers and built-in variables
+        2 => array(
+            // Game play
+            'x','y','xprevious','yprevious','xstart','ystart','hspeed','vspeed','direction','speed',
+            'friction','gravity','gravity_direction',
+            'path_index','path_position','path_positionprevious','path_speed','path_orientation',
+            'path_endaction',
+            'object_index','id','mask_index','solid','persistent','instance_count','instance_id',
+            'room_speed','fps','current_time','current_year','current_month','current_day','current_weekday',
+            'current_hour','current_minute','current_second','alarm','timeline_index','timeline_position',
+            'timeline_speed',
+            'room','room_first','room_last','room_width','room_height','room_caption','room_persistent',
+            'score','lives','health','show_score','show_lives','show_health','caption_score','caption_lives',
+            'caption_health',
+            'event_type','event_number','event_object','event_action',
+            'error_occurred','error_last',
+            // User interaction
+            'keyboard_lastkey','keyboard_key','keyboard_lastchar','keyboard_string',
+            'mouse_x','mouse_y','mouse_button','mouse_lastbutton',
+            // Game Graphics
+            'sprite_index','sprite_width','sprite_height','sprite_xoffset','sprite_yoffset',
+            'image_number','image_index','image_speed','image_xscale','image_yscale','image_angle',
+            'image_alpha','image_blend','bbox_left','bbox_right','bbox_top','bbox_bottom',
+            'background_color','background_showcolor','background_visible','background_foreground',
+            'background_index','background_x','background_y','background_width','background_height',
+            'background_htiled','background_vtiled','background_xscale','background_yscale',
+            'background_hspeed','background_vspeed','background_blend','background_alpha',
+            'background','left, top, width, height','depth','visible','xscale','yscale','blend','alpha',
+            'view_enabled','view_current','view_visible','view_yview','view_wview','view_hview','view_xport',
+            'view_yport','view_wport','view_hport','view_angle','view_hborder','view_vborder','view_hspeed',
+            'view_vspeed','view_object',
+            'transition_kind',
+            // Files, registry and executing programs
+            'game_id','working_directory','temp_directory',
+            'secure_mode',
+            // Creating particles
+            'xmin', 'xmax', 'ymin', 'ymax','shape','distribution','particle type','number',
+            'force','dist','kind','additive', 'parttype1', 'parttype2'
+            ),
+        // functions
+        3 => array(
+            // Computing things
+            'random','choose','abs','sign','round','floor','ceil','frac','sqrt','sqr','power','exp','ln',
+            'log2','log10','logn','sin','cos','tan','arcsin','arccos','arctan','arctan2','degtorad',
+            'radtodeg','min','max','mean','median','point_distance','point_direction','lengthdir_x',
+            'lengthdir_y','is_real','is_string',
+            'chr','ord','real','string','string_format','string_length','string_pos','string_copy',
+            'string_char_at','string_delete','string_insert','string_replace','string_replace_all',
+            'string_count','string_lower','string_upper','string_repeat','string_letters','string_digits',
+            'string_lettersdigits','clipboard_has_text','clipboard_get_text','clipboard_set_text',
+            'date_current_datetime','date_current_date','date_current_time','date_create_datetime',
+            'date_create_date','date_create_time','date_valid_datetime','date_valid_date','date_valid_time',
+            'date_inc_year','date_inc_month','date_inc_week','date_inc_day','date_inc_hour',
+            'date_inc_minute','date_inc_second','date_get_year','date_get_month','date_get_week',
+            'date_get_day','date_get_hour', 'date_get_minute','date_get_second','date_get_weekday',
+            'date_get_day_of_year','date_get_hour_of_year','date_get_minute_of_year',
+            'date_get_second_of_year','date_year_span','date_month_span','date_week_span','date_day_span',
+            'date_hour_span','date_minute_span','date_second_span','date_compare_datetime',
+            'date_compare_date','date_compare_time','date_date_of','date_time_of','date_datetime_string',
+            'date_date_string','date_time_string','date_days_in_month','date_days_in_year','date_leap_year',
+            'date_is_today',
+            // Game play
+            'motion_set','motion_add','place_free','place_empty','place_meeting','place_snapped',
+            'move_random','move_snap','move_wrap','move_towards_point','move_bounce_solid','move_bounce_all',
+            'move_contact_solid','move_contact_all','move_outside_solid','move_outside_all',
+            'distance_to_point','distance_to_object','position_empty','position_meeting',
+            'path_start','path_end',
+            'mp_linear_step','mp_linear_step_object','mp_potential_step','mp_potential_step_object',
+            'mp_potential_settings','mp_linear_path','mp_linear_path_object', 'mp_potential_path',
+            'mp_potential_path_object','mp_grid_create','mp_grid_destroy','mp_grid_clear_all',
+            'mp_grid_clear_cell','mp_grid_clear_rectangle','mp_grid_add_cell','mp_grid_add_rectangle',
+            'mp_grid_add_instances','mp_grid_path','mp_grid_draw',
+            'collision_point','collision_rectangle','collision_circle','collision_ellipse','collision_line',
+            'instance_find','instance_exists','instance_number','instance_position','instance_nearest',
+            'instance_furthest','instance_place','instance_create','instance_copy','instance_destroy',
+            'instance_change','position_destroy','position_change',
+            'instance_deactivate_all','instance_deactivate_object','instance_deactivate_region',
+            'instance_activate_all','instance_activate_object','instance_activate_region',
+            'sleep',
+            'room_goto','room_goto_previous','room_goto_next','room_restart','room_previous','room_next',
+            'game_end','game_restart','game_save','game_load',
+            'event_perform', 'event_perform_object','event_user','event_inherited',
+            'show_debug_message','variable_global_exists','variable_local_exists','variable_global_get',
+            'variable_global_array_get','variable_global_array2_get','variable_local_get',
+            'variable_local_array_get','variable_local_array2_get','variable_global_set',
+            'variable_global_array_set','variable_global_array2_set','variable_local_set',
+            'variable_local_array_set','variable_local_array2_set','set_program_priority',
+            // User interaction
+            'keyboard_set_map','keyboard_get_map','keyboard_unset_map','keyboard_check',
+            'keyboard_check_pressed','keyboard_check_released','keyboard_check_direct',
+            'keyboard_get_numlock','keyboard_set_numlock','keyboard_key_press','keyboard_key_release',
+            'keyboard_clear','io_clear','io_handle','keyboard_wait',
+            'mouse_check_button','mouse_check_button_pressed','mouse_check_button_released','mouse_clear',
+            'mouse_wait',
+            'joystick_exists','joystick_name','joystick_axes','joystick_buttons','joystick_has_pov',
+            'joystick_direction','joystick_check_button','joystick_xpos','joystick_ypos','joystick_zpos',
+            'joystick_rpos','joystick_upos','joystick_vpos','joystick_pov',
+            // Game Graphics
+            'draw_sprite','draw_sprite_stretched','draw_sprite_tiled','draw_sprite_part','draw_background',
+            'draw_background_stretched','draw_background_tiled','draw_background_part','draw_sprite_ext',
+            'draw_sprite_stretched_ext','draw_sprite_tiled_ext','draw_sprite_part_ext','draw_sprite_general',
+            'draw_background_ext','draw_background_stretched_ext','draw_background_tiled_ext',
+            'draw_background_part_ext','draw_background_general',
+            'draw_clear','draw_clear_alpha','draw_point','draw_line','draw_rectangle','draw_roundrect',
+            'draw_triangle','draw_circle','draw_ellipse','draw_arrow','draw_button','draw_path',
+            'draw_healthbar','draw_set_color','draw_set_alpha','draw_get_color','draw_get_alpha',
+            'make_color_rgb','make_color_hsv','color_get_red','color_get_green','color_get_blue',
+            'color_get_hue','color_get_saturation','color_get_value','merge_color','draw_getpixel',
+            'screen_save','screen_save_part',
+            'draw_set_font','draw_set_halign','draw_set_valign','draw_text','draw_text_ext','string_width',
+            'string_height','string_width_ext','string_height_ext','draw_text_transformed',
+            'draw_text_ext_transformed','draw_text_color','draw_text_ext_color',
+            'draw_text_transformed_color','draw_text_ext_transformed_color',
+            'draw_point_color','draw_line_color','draw_rectangle_color','draw_roundrect_color',
+            'draw_triangle_color','draw_circle_color','draw_ellipse_color','draw_primitive_begin',
+            'draw_vertex','draw_vertex_color','draw_primitive_end','sprite_get_texture',
+            'background_get_texture','texture_preload','texture_set_priority',
+            'texture_get_width','texture_get_height','draw_primitive_begin_texture','draw_vertex_texture',
+            'draw_vertex_texture_color','texture_set_interpolation',
+            'texture_set_blending','texture_set_repeat','draw_set_blend_mode','draw_set_blend_mode_ext',
+            'surface_create','surface_free','surface_exists','surface_get_width','surface_get_height',
+            'surface_get_texture','surface_set_target','surface_reset_target','surface_getpixel',
+            'surface_save','surface_save_part','draw_surface','draw_surface_stretched','draw_surface_tiled',
+            'draw_surface_part','draw_surface_ext','draw_surface_stretched_ext','draw_surface_tiled_ext',
+            'draw_surface_part_ext','draw_surface_general','surface_copy','surface_copy_part',
+            'tile_add','tile_delete','tile_exists','tile_get_x','tile_get_y','tile_get_left','tile_get_top',
+            'tile_get_width','tile_get_height','tile_get_depth','tile_get_visible','tile_get_xscale',
+            'tile_get_yscale','tile_get_background','tile_get_blend','tile_get_alpha','tile_set_position',
+            'tile_set_region','tile_set_background','tile_set_visible','tile_set_depth','tile_set_scale',
+            'tile_set_blend','tile_set_alpha','tile_layer_hide','tile_layer_show','tile_layer_delete',
+            'tile_layer_shift','tile_layer_find','tile_layer_delete_at','tile_layer_depth',
+            'display_get_width','display_get_height','display_get_colordepth','display_get_frequency',
+            'display_set_size','display_set_colordepth','display_set_frequency','display_set_all',
+            'display_test_all','display_reset','display_mouse_get_x','display_mouse_get_y','display_mouse_set',
+            'window_set_visible','window_get_visible','window_set_fullscreen','window_get_fullscreen',
+            'window_set_showborder','window_get_showborder','window_set_showicons','window_get_showicons',
+            'window_set_stayontop','window_get_stayontop','window_set_sizeable','window_get_sizeable',
+            'window_set_caption','window_get_caption','window_set_cursor', 'window_get_cursor',
+            'window_set_color','window_get_color','window_set_region_scale','window_get_region_scale',
+            'window_set_position','window_set_size','window_set_rectangle','window_center','window_default',
+            'window_get_x','window_get_y','window_get_width','window_get_height','window_mouse_get_x',
+            'window_mouse_get_y','window_mouse_set',
+            'window_set_region_size','window_get_region_width','window_get_region_height',
+            'window_view_mouse_get_x','window_view_mouse_get_y','window_view_mouse_set',
+            'window_views_mouse_get_x','window_views_mouse_get_y','window_views_mouse_set',
+            'screen_redraw','screen_refresh','set_automatic_draw','set_synchronization','screen_wait_vsync',
+            // Sound and music)
+            'sound_play','sound_loop','sound_stop','sound_stop_all','sound_isplaying','sound_volume',
+            'sound_global_volume','sound_fade','sound_pan','sound_background_tempo','sound_set_search_directory',
+            'sound_effect_set','sound_effect_chorus','sound_effect_echo',    'sound_effect_flanger',
+            'sound_effect_gargle','sound_effect_reverb','sound_effect_compressor','sound_effect_equalizer',
+            'sound_3d_set_sound_position','sound_3d_set_sound_velocity','sound_3d_set_sound_distance',
+            'sound_3d_set_sound_cone',
+            'cd_init','cd_present','cd_number','cd_playing','cd_paused','cd_track','cd_length',
+            'cd_track_length','cd_position','cd_track_position','cd_play','cd_stop','cd_pause','cd_resume',
+            'cd_set_position','cd_set_track_position','cd_open_door','cd_close_door','MCI_command',
+            // Splash screens, highscores, and other pop-ups
+            'show_text','show_image','show_video','show_info','load_info',
+            'show_message','show_message_ext','show_question','get_integer','get_string',
+            'message_background','message_alpha','message_button','message_text_font','message_button_font',
+            'message_input_font','message_mouse_color','message_input_color','message_caption',
+            'message_position','message_size','show_menu','show_menu_pos','get_color','get_open_filename',
+            'get_save_filename','get_directory','get_directory_alt','show_error',
+            'highscore_show','highscore_set_background','highscore_set_border','highscore_set_font',
+            'highscore_set_colors','highscore_set_strings','highscore_show_ext','highscore_clear',
+            'highscore_add','highscore_add_current','highscore_value','highscore_name','draw_highscore',
+            // Resources
+            'sprite_exists','sprite_get_name','sprite_get_number','sprite_get_width','sprite_get_height',
+            'sprite_get_transparent','sprite_get_smooth','sprite_get_preload','sprite_get_xoffset',
+            'sprite_get_yoffset','sprite_get_bbox_left','sprite_get_bbox_right','sprite_get_bbox_top',
+            'sprite_get_bbox_bottom','sprite_get_bbox_mode','sprite_get_precise',
+            'sound_exists','sound_get_name','sound_get_kind','sound_get_preload','sound_discard',
+            'sound_restore',
+            'background_exists','background_get_name','background_get_width','background_get_height',
+            'background_get_transparent','background_get_smooth','background_get_preload',
+            'font_exists','font_get_name','font_get_fontname','font_get_bold','font_get_italic',
+            'font_get_first','font_get_last',
+            'path_exists','path_get_name','path_get_length','path_get_kind','path_get_closed',
+            'path_get_precision','path_get_number','path_get_point_x','path_get_point_y',
+            'path_get_point_speed','path_get_x','path_get_y','path_get_speed',
+            'script_exists','script_get_name','script_get_text',
+            'timeline_exists','timeline_get_name',
+            'object_exists','object_get_name','object_get_sprite','object_get_solid','object_get_visible',
+            'object_get_depth','object_get_persistent','object_get_mask','object_get_parent',
+            'object_is_ancestor',
+            'room_exists','room_get_name',
+            // Changing resources
+            'sprite_set_offset','sprite_set_bbox_mode','sprite_set_bbox','sprite_set_precise',
+            'sprite_duplicate','sprite_assign','sprite_merge','sprite_add','sprite_replace',
+            'sprite_create_from_screen','sprite_add_from_screen','sprite_create_from_surface',
+            'sprite_add_from_surface','sprite_delete','sprite_set_alpha_from_sprite',
+            'sound_add','sound_replace','sound_delete',
+            'background_duplicate','background_assign','background_add','background_replace',
+            'background_create_color','background_create_gradient','background_create_from_screen',
+            'background_create_from_surface','background_delete','background_set_alpha_from_background',
+            'font_add','font_add_sprite','font_replace_sprite','font_delete',
+            'path_set_kind','path_set_closed','path_set_precision','path_add','path_delete','path_duplicate',
+            'path_assign','path_append','path_add_point','path_insert_point','path_change_point',
+            'path_delete_point','path_clear_points','path_reverse','path_mirror','path_flip','path_rotate',
+            'path_scale','path_shift',
+            'execute_string','execute_file','script_execute',
+            'timeline_add','timeline_delete','timeline_moment_add','timeline_moment_clear',
+            'object_set_sprite','object_set_solid','object_set_visible','object_set_depth',
+            'object_set_persistent','object_set_mask','object_set_parent','object_add','object_delete',
+            'object_event_add','object_event_clear',
+            'room_set_width','room_set_height','room_set_caption','room_set_persistent','room_set_code',
+            'room_set_background_color','room_set_background','room_set_view','room_set_view_enabled',
+            'room_add','room_duplicate','room_assign','room_instance_add','room_instance_clear',
+            'room_tile_add','room_tile_add_ext','room_tile_clear',
+            // Files, registry and executing programs
+            'file_text_open_read','file_text_open_write','file_text_open_append','file_text_close',
+            'file_text_write_string','file_text_write_real','file_text_writeln','file_text_read_string',
+            'file_text_read_real','file_text_readln','file_text_eof','file_exists','file_delete',
+            'file_rename','file_copy','directory_exists','directory_create','file_find_first',
+            'file_find_next','file_find_close','file_attributes', 'filename_name','filename_path',
+            'filename_dir','filename_drive','filename_ext','filename_change_ext','file_bin_open',
+            'file_bin_rewrite','file_bin_close','file_bin_size','file_bin_position','file_bin_seek',
+            'file_bin_write_byte','file_bin_read_byte','parameter_count','parameter_string',
+            'environment_get_variable',
+            'registry_write_string','registry_write_real','registry_read_string','registry_read_real',
+            'registry_exists','registry_write_string_ext','registry_write_real_ext',
+            'registry_read_string_ext','registry_read_real_ext','registry_exists_ext','registry_set_root',
+            'ini_open','ini_close','ini_read_string','ini_read_real','ini_write_string','ini_write_real',
+            'ini_key_exists','ini_section_exists','ini_key_delete','ini_section_delete',
+            'execute_program','execute_shell',
+            // Data structures
+            'ds_stack_create','ds_stack_destroy','ds_stack_clear','ds_stack_size','ds_stack_empty',
+            'ds_stack_push','ds_stack_pop','ds_stack_top',
+            'ds_queue_create','ds_queue_destroy','ds_queue_clear','ds_queue_size','ds_queue_empty',
+            'ds_queue_enqueue','ds_queue_dequeue','ds_queue_head','ds_queue_tail',
+            'ds_list_create','ds_list_destroy','ds_list_clear','ds_list_size','ds_list_empty','ds_list_add',
+            'ds_list_insert','ds_list_replace','ds_list_delete','ds_list_find_index','ds_list_find_value',
+            'ds_list_sort',
+            'ds_map_create','ds_map_destroy','ds_map_clear','ds_map_size','ds_map_empty','ds_map_add',
+            'ds_map_replace','ds_map_delete','ds_map_exists','ds_map_find_value','ds_map_find_previous',
+            'ds_map_find_next','ds_map_find_first','ds_map_find_last',
+            'ds_priority_create','ds_priority_destroy','ds_priority_clear','ds_priority_size',
+            'ds_priority_empty','ds_priority_add','ds_priority_change_priority','ds_priority_find_priority',
+            'ds_priority_delete_value','ds_priority_delete_min','ds_priority_find_min',
+            'ds_priority_delete_max','ds_priority_find_max',
+            'ds_grid_create','ds_grid_destroy','ds_grid_resize','ds_grid_width','ds_grid_height',
+            'ds_grid_clear','ds_grid_set','ds_grid_add','ds_grid_multiply','ds_grid_set_region',
+            'ds_grid_add_region','ds_grid_multiply_region','ds_grid_set_disk','ds_grid_add_disk',
+            'ds_grid_multiply_disk','ds_grid_get','ds_grid_get_sum','ds_grid_get_max','ds_grid_get_min',
+            'ds_grid_get_mean','ds_grid_get_disk_sum','ds_grid_get_disk_min','ds_grid_get_disk_max',
+            'ds_grid_get_disk_mean','ds_grid_value_exists','ds_grid_value_x','ds_grid_value_y',
+            'ds_grid_value_disk_exists','ds_grid_value_disk_x','ds_grid_value_disk_y',
+            // Creating particles
+            'effect_create_below','effect_create_above','effect_clear',
+            'part_type_create','part_type_destroy','part_type_exists','part_type_clear','part_type_shape',
+            'part_type_sprite','part_type_size','part_type_scale',
+            'part_type_orientation','part_type_color1','part_type_color2','part_type_color3',
+            'part_type_color_mix','part_type_color_rgb','part_type_color_hsv',
+            'part_type_alpha1','part_type_alpha2','part_type_alpha3','part_type_blend','part_type_life',
+            'part_type_step','part_type_death','part_type_speed','part_type_direction','part_type_gravity',
+            'part_system_create','part_system_destroy','part_system_exists','part_system_clear',
+            'part_system_draw_order','part_system_depth','part_system_position',
+            'part_system_automatic_update','part_system_automatic_draw','part_system_update',
+            'part_system_drawit','part_particles_create','part_particles_create_color',
+            'part_particles_clear','part_particles_count',
+            'part_emitter_create','part_emitter_destroy','part_emitter_destroy_all','part_emitter_exists',
+            'part_emitter_clear','part_emitter_region','part_emitter_burst','part_emitter_stream',
+            'part_attractor_create','part_attractor_destroy','part_attractor_destroy_all',
+            'part_attractor_exists','part_attractor_clear','part_attractor_position','part_attractor_force',
+            'part_destroyer_create','part_destroyer_destroy','part_destroyer_destroy_all',
+            'part_destroyer_exists','part_destroyer_clear','part_destroyer_region',
+            'part_deflector_create','part_deflector_destroy','part_deflector_destroy_all',
+            'part_deflector_exists','part_deflector_clear','part_deflector_region','part_deflector_kind',
+            'part_deflector_friction',
+            'part_changer_create','part_changer_destroy','part_changer_destroy_all','part_changer_exists',
+            'part_changer_clear','part_changer_region','part_changer_types','part_changer_kind',
+            // Multiplayer games
+            'mplay_init_ipx','mplay_init_tcpip','mplay_init_modem','mplay_init_serial',
+            'mplay_connect_status','mplay_end','mplay_ipaddress',
+            'mplay_session_create','mplay_session_find','mplay_session_name','mplay_session_join',
+            'mplay_session_mode','mplay_session_status','mplay_session_end',
+            'mplay_player_find','mplay_player_name','mplay_player_id',
+            'mplay_data_write','mplay_data_read','mplay_data_mode',
+            'mplay_message_send','mplay_message_send_guaranteed','mplay_message_receive','mplay_message_id',
+            'mplay_message_value','mplay_message_player','mplay_message_name','mplay_message_count',
+            'mplay_message_clear',
+            // Using DLL's
+            'external_define','external_call','external_free','window_handle',
+            // 3D Graphics
+            'd3d_start','d3d_end','d3d_set_hidden','d3d_set_perspective',
+            'd3d_set_depth',
+            'd3d_primitive_begin','d3d_vertex','d3d_vertex_color','d3d_primitive_end',
+            'd3d_primitive_begin_texture','d3d_vertex_texture','d3d_vertex_texture_color','d3d_set_culling',
+            'd3d_draw_block','d3d_draw_cylinder','d3d_draw_cone','d3d_draw_ellipsoid','d3d_draw_wall',
+            'd3d_draw_floor',
+            'd3d_set_projection','d3d_set_projection_ext','d3d_set_projection_ortho',
+            'd3d_set_projection_perspective',
+            'd3d_transform_set_identity','d3d_transform_set_translation','d3d_transform_set_scaling',
+            'd3d_transform_set_rotation_x','d3d_transform_set_rotation_y','d3d_transform_set_rotation_z',
+            'd3d_transform_set_rotation_axis','d3d_transform_add_translation','d3d_transform_add_scaling',
+            'd3d_transform_add_rotation_x','d3d_transform_add_rotation_y','d3d_transform_add_rotation_z',
+            'd3d_transform_add_rotation_axis','d3d_transform_stack_clear','d3d_transform_stack_empty',
+            'd3d_transform_stack_push','d3d_transform_stack_pop','d3d_transform_stack_top',
+            'd3d_transform_stack_discard',
+            'd3d_set_fog',
+            'd3d_set_lighting','d3d_set_shading','d3d_light_define_direction','d3d_light_define_point',
+            'd3d_light_enable','d3d_vertex_normal','d3d_vertex_normal_color','d3d_vertex_normal_texture',
+            'd3d_vertex_normal_texture_color',
+            'd3d_model_create','d3d_model_destroy','d3d_model_clear','d3d_model_save','d3d_model_load',
+            'd3d_model_draw','d3d_model_primitive_begin','d3d_model_vertex','d3d_model_vertex_color',
+            'd3d_model_vertex_texture','d3d_model_vertex_texture_color','d3d_model_vertex_normal',
+            'd3d_model_vertex_normal_color','d3d_model_vertex_normal_texture',
+            'd3d_model_vertex_normal_texture_color','d3d_model_primitive_end','d3d_model_block',
+            'd3d_model_cylinder','d3d_model_cone','d3d_model_ellipsoid','d3d_model_wall','d3d_model_floor'
+            ),
+        // constants
+        4 => array(
+            'true', 'false', 'pi',
+            'ev_destroy','ev_step','ev_alarm','ev_keyboard','ev_mouse','ev_collision','ev_other','ev_draw',
+            'ev_keypress','ev_keyrelease','ev_left_button','ev_right_button','ev_middle_button',
+            'ev_no_button','ev_left_press','ev_right_press','ev_middle_press','ev_left_release',
+            'ev_right_release','ev_middle_release','ev_mouse_enter','ev_mouse_leave','ev_mouse_wheel_up',
+            'ev_mouse_wheel_down','ev_global_left_button','ev_global_right_button','ev_global_middle_button',
+            'ev_global_left_press','ev_global_right_press','ev_global_middle_press','ev_global_left_release',
+            'ev_global_right_release','ev_global_middle_release','ev_joystick1_left','ev_joystick1_right',
+            'ev_joystick1_up','ev_joystick1_down','ev_joystick1_button1','ev_joystick1_button2',
+            'ev_joystick1_button3','ev_joystick1_button4','ev_joystick1_button5','ev_joystick1_button6',
+            'ev_joystick1_button7','ev_joystick1_button8','ev_joystick2_left','ev_joystick2_right',
+            'ev_joystick2_up','ev_joystick2_down','ev_joystick2_button1','ev_joystick2_button2',
+            'ev_joystick2_button3','ev_joystick2_button4','ev_joystick2_button5','ev_joystick2_button6',
+            'ev_joystick2_button7','ev_joystick2_button8',
+            'ev_outside','ev_boundary','ev_game_start','ev_game_end','ev_room_start','ev_room_end',
+            'ev_no_more_lives','ev_no_more_health','ev_animation_end','ev_end_of_path','ev_user0','ev_user1',
+            'ev_user2','ev_user3','ev_user4','ev_user5','ev_user6','ev_user7','ev_user8','ev_user9',
+            'ev_user10','ev_user11','ev_user12','ev_user13','ev_user14','ev_user15','ev_step_normal',
+            'ev_step_begin','ev_step_end',
+            'vk_nokey','vk_anykey','vk_left','vk_right','vk_up','vk_down','vk_enter','vk_escape','vk_space',
+            'vk_shift','vk_control','vk_alt','vk_backspace','vk_tab','vk_home','vk_end','vk_delete',
+            'vk_insert','vk_pageup','vk_pagedown','vk_pause','vk_printscreen',
+            'vk_f1','vk_f2','vk_f3','vk_f4','vk_f5','vk_f6','vk_f7','vk_f8','vk_f9','vk_f10','vk_f11','vk_f12',
+            'vk_numpad0','vk_numpad1','vk_numpad2','vk_numpad3','vk_numpad4','vk_numpad5','vk_numpad6',
+            'vk_numpad7','vk_numpad8','vk_numpad9', 'vk_multiply','vk_divide','vk_add','vk_subtract',
+            'vk_decimal','vk_lshift','vk_lcontrol','vk_lalt','vk_rshift','vk_rcontrol','vk_ralt',
+            'c_aqua','c_black','c_blue','c_dkgray','c_fuchsia','c_gray','c_green','c_lime','c_ltgray',
+            'c_maroon','c_navy','c_olive','c_purple','c_red','c_silver','c_teal','c_white','c_yellow',
+            'fa_left', 'fa_center','fa_right','fa_top','fa_middle','fa_bottom',
+            'pr_pointlist','pr_linelist','pr_linestrip','pr_trianglelist','pr_trianglestrip',
+            'pr_trianglefan',
+            'cr_none','cr_arrow','cr_cross','cr_beam','cr_size_nesw','cr_size_ns','cr_size_nwse',
+            'cr_size_we','cr_uparrow','cr_hourglass','cr_drag','cr_nodrop','cr_hsplit','cr_vsplit',
+            'cr_multidrag','cr_sqlwait','cr_no','cr_appstart','cr_help','cr_handpoint','cr_size_all',
+            'se_chorus','se_echo','se_flanger','se_gargle','se_reverb','se_compressor','se_equalizer',
+            'fa_readonly','fa_hidden','fa_sysfile','fa_volumeid','fa_directory','fa_archive',
+            'pt_shape_pixel','pt_shape_disk','pt_shape_square','pt_shape_line','pt_shape_star',
+            'pt_shape_circle','pt_shape_ring','pt_shape_sphere','pt_shape_flare','pt_shape_spark',
+            'pt_shape_explosion','pt_shape_cloud','pt_shape_smoke','pt_shape_snow',
+            'ps_shape_rectangle','ps_shape_ellipse ','ps_shape_diamond','ps_shape_line',
+            'ps_distr_linear','ps_distr_gaussian','ps_force_constant','ps_force_linear','ps_force_quadratic',
+            'ps_deflect_horizontal', 'ps_deflect_vertical',
+            'ps_change_motion','ps_change_shape','ps_change_all'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '&&', '||', '^^', '&', '|', '^',
+        '<', '<=', '==', '!=', '>', '>=', '=',
+        '<<', '>>',
+        '+=', '-=', '*=', '/=',
+        '+', '-', '*', '/',
+        '!', '~', ',', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold; color: #000000;',
+            2 => 'font-weight: bold; color: #000000;',
+            3 => 'color: navy;',
+            4 => 'color: #663300;',
+            ),
+        'COMMENTS' => array(
+            1 => 'font-style: italic; color: green;',
+            'MULTI' => 'font-style: italic; color: green;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;' //'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/gnuplot.php b/vendor/easybook/geshi/geshi/gnuplot.php
new file mode 100755
index 000000000..d8445eabb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/gnuplot.php
@@ -0,0 +1,296 @@
+<?php
+/*************************************************************************************
+ * gnuplot.php
+ * ----------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/07/07
+ *
+ * Gnuplot script language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/07 (1.0.8)
+ *  -  Initial import
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Gnuplot',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('`', '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // copy output of help command, indent properly and use this replace regexp:
+        // ([a-z0-9_\-]+)(( )+|$)          =>     '\1',\3
+
+        // commands as found in `help commands`
+        1 => array(
+            'bind', 'call', 'cd', 'clear',
+            'exit', 'fit', 'help', 'history',
+            'if', 'load', 'lower', 'pause',
+            'plot', 'print', 'pwd', 'quit',
+            'raise', 'replot', 'reread', 'reset',
+            'save', 'set', 'shell', 'show',
+            'splot', 'system', 'test', 'unset',
+            'update'
+            ),
+        2 => array(
+            // set commands as returned by `help set`
+            'angles', 'arrow', 'autoscale', 'bars',
+            'bmargin', 'border', 'boxwidth', 'cbdata',
+            'cbdtics', 'cblabel', 'cbmtics', 'cbrange',
+            'cbtics', 'clabel', 'clip', 'cntrparam',
+            'colorbox', 'contour', 'datafile', 'date_specifiers',
+            'decimalsign', 'dgrid3d', 'dummy', 'encoding',
+            'fontpath', 'format', 'grid',
+            'hidden3d', 'historysize', 'isosamples', 'key',
+            'label', 'lmargin', 'loadpath', 'locale',
+            'log', 'logscale', 'macros', 'mapping',
+            'margin', 'missing', 'mouse', 'multiplot',
+            'mx2tics', 'mxtics', 'my2tics', 'mytics',
+            'mztics', 'object', 'offsets', 'origin',
+            'output', 'palette', 'parametric', 'pm3d',
+            'pointsize', 'polar', 'rmargin',
+            'rrange', 'samples', 'size', 'style',
+            'surface', 'table', 'term', 'terminal',
+            'termoption', 'tics', 'ticscale', 'ticslevel',
+            'time_specifiers', 'timefmt', 'timestamp', 'title',
+            'trange', 'urange', 'view',
+            'vrange', 'x2data', 'x2dtics', 'x2label',
+            'x2mtics', 'x2range', 'x2tics', 'x2zeroaxis',
+            'xdata', 'xdtics', 'xlabel', 'xmtics',
+            'xrange', 'xtics', 'xyplane', 'xzeroaxis',
+            'y2data', 'y2dtics', 'y2label', 'y2mtics',
+            'y2range', 'y2tics', 'y2zeroaxis', 'ydata',
+            'ydtics', 'ylabel', 'ymtics', 'yrange',
+            'ytics', 'yzeroaxis', 'zdata', 'zdtics',
+            'zero', 'zeroaxis', 'zlabel', 'zmtics',
+            'zrange', 'ztics', 'zzeroaxis',
+            // same but with leading no
+            'noangles', 'noarrow', 'noautoscale', 'nobars',
+            'nobmargin', 'noborder', 'noboxwidth', 'nocbdata',
+            'nocbdtics', 'nocblabel', 'nocbmtics', 'nocbrange',
+            'nocbtics', 'noclabel', 'noclip', 'nocntrparam',
+            'nocolorbox', 'nocontour', 'nodatafile', 'nodate_specifiers',
+            'nodecimalsign', 'nodgrid3d', 'nodummy', 'noencoding',
+            'nofit', 'nofontpath', 'noformat', 'nogrid',
+            'nohidden3d', 'nohistorysize', 'noisosamples', 'nokey',
+            'nolabel', 'nolmargin', 'noloadpath', 'nolocale',
+            'nolog', 'nologscale', 'nomacros', 'nomapping',
+            'nomargin', 'nomissing', 'nomouse', 'nomultiplot',
+            'nomx2tics', 'nomxtics', 'nomy2tics', 'nomytics',
+            'nomztics', 'noobject', 'nooffsets', 'noorigin',
+            'nooutput', 'nopalette', 'noparametric', 'nopm3d',
+            'nopointsize', 'nopolar', 'noprint', 'normargin',
+            'norrange', 'nosamples', 'nosize', 'nostyle',
+            'nosurface', 'notable', 'noterm', 'noterminal',
+            'notermoption', 'notics', 'noticscale', 'noticslevel',
+            'notime_specifiers', 'notimefmt', 'notimestamp', 'notitle',
+            'notmargin', 'notrange', 'nourange', 'noview',
+            'novrange', 'nox2data', 'nox2dtics', 'nox2label',
+            'nox2mtics', 'nox2range', 'nox2tics', 'nox2zeroaxis',
+            'noxdata', 'noxdtics', 'noxlabel', 'noxmtics',
+            'noxrange', 'noxtics', 'noxyplane', 'noxzeroaxis',
+            'noy2data', 'noy2dtics', 'noy2label', 'noy2mtics',
+            'noy2range', 'noy2tics', 'noy2zeroaxis', 'noydata',
+            'noydtics', 'noylabel', 'noymtics', 'noyrange',
+            'noytics', 'noyzeroaxis', 'nozdata', 'nozdtics',
+            'nozero', 'nozeroaxis', 'nozlabel', 'nozmtics',
+            'nozrange', 'noztics', 'nozzeroaxis',
+            ),
+        3 => array(
+            // predefined variables
+            'pi', 'NaN', 'GNUTERM',
+            'GPVAL_X_MIN', 'GPVAL_X_MAX', 'GPVAL_Y_MIN', 'GPVAL_Y_MAX',
+            'GPVAL_TERM', 'GPVAL_TERMOPTIONS', 'GPVAL_OUTPUT',
+            'GPVAL_VERSION', 'GPVAL_PATcHLEVEL', 'GPVAL_COMPILE_OPTIONS',
+            'MOUSE_KEY', 'MOUSE_X', 'MOUSE_X2', 'MOUSE_Y', 'MOUSE_Y2',
+            'MOUSE_BUTTON', 'MOUSE_SHIFT', 'MOUSE_ALT', 'MOUSE_CTRL'
+            ),
+        4 => array(
+            // predefined functions `help functions`
+            'abs', 'acos', 'acosh', 'arg',
+            'asin', 'asinh', 'atan', 'atan2',
+            'atanh', 'besj0', 'besj1', 'besy0',
+            'besy1', 'ceil', 'column', 'cos',
+            'cosh', 'defined', 'erf', 'erfc',
+            'exists', 'exp', 'floor', 'gamma',
+            'gprintf', 'ibeta', 'igamma', 'imag',
+            'int', 'inverf', 'invnorm', 'lambertw',
+            'lgamma', 'log10', 'norm',
+            'rand', 'random', 'real', 'sgn',
+            'sin', 'sinh', 'sprintf', 'sqrt',
+            'stringcolumn', 'strlen', 'strstrt', 'substr',
+            'tan', 'tanh', 'timecolumn',
+            'tm_hour', 'tm_mday', 'tm_min', 'tm_mon',
+            'tm_sec', 'tm_wday', 'tm_yday', 'tm_year',
+            'valid', 'word', 'words',
+            ),
+        5 => array(
+            // mixed arguments
+            // there is no sane way to get these ones easily...
+            'autofreq', 'x', 'y', 'z',
+            'lt', 'linetype', 'lw', 'linewidth', 'ls', 'linestyle',
+            'out', 'rotate by', 'screen',
+            'enhanced', 'via',
+            // `help set key`
+            'on', 'off', 'default', 'inside', 'outside', 'tmargin',
+            'at', 'left', 'right', 'center', 'top', 'bottom', 'vertical', 'horizontal', 'Left', 'Right',
+            'noreverse', 'reverse', 'noinvert', 'invert', 'samplen', 'spacing', 'width', 'height',
+            'noautotitle', 'autotitle', 'noenhanced', 'nobox', 'box',
+
+            // help set terminal postscript
+            'landscape', 'portrait', 'eps', 'defaultplex', 'simplex', 'duplex',
+            'fontfile', 'add', 'delete', 'nofontfiles', 'level1', 'leveldefault',
+            'color', 'colour', 'monochrome', 'solid', 'dashed', 'dashlength', 'dl',
+            'rounded', 'butt', 'palfuncparam', 'blacktext', 'colortext', 'colourtext',
+            'font',
+
+            // help set terminal png
+            'notransparent', 'transparent', 'nointerlace', 'interlace',
+            'notruecolor', 'truecolor', 'tiny', 'small', 'medium', 'large', 'giant',
+            'nocrop', 'crop',
+
+            // `help plot`
+            'acsplines', 'bezier', 'binary', 'csplines',
+            'every',
+            'example', 'frequency', 'index', 'matrix',
+            'ranges', 'sbezier', 'smooth',
+            'special-filenames', 'thru',
+            'unique', 'using', 'with',
+
+            // `help plotting styles`
+            'boxerrorbars', 'boxes', 'boxxyerrorbars', 'candlesticks',
+            'dots', 'errorbars', 'errorlines', 'filledcurves',
+            'financebars', 'fsteps', 'histeps', 'histograms',
+            'image', 'impulses', 'labels', 'lines',
+            'linespoints', 'points', 'rgbimage', 'steps',
+            'vectors', 'xerrorbars', 'xerrorlines', 'xyerrorbars',
+            'xyerrorlines', 'yerrorbars', 'yerrorlines',
+
+
+            // terminals `help terminals`
+            'aed512', 'aed767', 'aifm', 'bitgraph',
+            'cgm', 'corel', 'dumb', 'dxf',
+            'eepic', 'emf', 'emtex', 'epslatex',
+            'epson-180dpi', 'epson-60dpi', 'epson-lx800', 'fig',
+            'gif', 'gpic', 'hp2623a', 'hp2648',
+            'hp500c', 'hpdj', 'hpgl', 'hpljii',
+            'hppj', 'imagen', 'jpeg', 'kc-tek40xx',
+            'km-tek40xx', 'latex', 'mf', 'mif',
+            'mp', 'nec-cp6', 'okidata', 'pbm',
+            'pcl5', 'png', 'pop', 'postscript',
+            'pslatex', 'pstex', 'pstricks', 'push',
+            'qms', 'regis', 'selanar', 'starc',
+            'svg', 'tandy-60dpi', 'tek40xx', 'tek410x',
+            'texdraw', 'tgif', 'tkcanvas', 'tpic',
+            'vttek', 'x11', 'xlib',
+            )
+        ),
+    'REGEXPS' => array(
+        //Variable assignment
+        0 => "(?<![?;>\w])([a-zA-Z_][a-zA-Z0-9_]*)\s*=",
+        //Numbers with unit
+        1 => "(?<=^|\s)([0-9]*\.?[0-9]+\s*cm)"
+        ),
+    'SYMBOLS' => array(
+        '-', '+', '~', '!', '$',
+        '*', '/', '%', '=', '<', '>', '&',
+        '^', '|', '.', 'eq', 'ne', '?:', ':', '`', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #990000;',
+            3 => 'color: #550000;',
+            4 => 'color: #7a0874;',
+            5 => 'color: #448888;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight:bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000099; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #cc66cc;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.google.com/search?q=%22set+{FNAME}%22+site%3Ahttp%3A%2F%2Fwww.gnuplot.info%2Fdocs%2F&amp;btnI=lucky',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%])"
+            )
+        )
+    ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/go.php b/vendor/easybook/geshi/geshi/go.php
new file mode 100755
index 000000000..5b7a47db6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/go.php
@@ -0,0 +1,375 @@
+<?php
+/*************************************************************************************
+ * go.php
+ * --------
+ * Author: Markus Jarderot (mizardx at gmail dot com)
+ * Copyright: (c) 2010 Markus Jarderot
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/05/20
+ *
+ * Go language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/05/20 (1.0.8.9)
+ *  -  First Release
+ *
+ * TODO (updated 2010/05/20)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Go',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        # Raw strings (escapes and linebreaks ignored)
+        2 => "#`[^`]*`#"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => "#\\\\[abfnrtv\\\\\'\"]#",
+        2 => "#\\\\[0-7]{3}#",
+        3 => "#\\\\x[0-9a-fA-F]{2}#",
+        4 => "#\\\\u[0-9a-fA-F]{4}#",
+        5 => "#\\\\U[0-9a-fA-F]{8}#"
+        ),
+    'NUMBERS' => array(
+        # integer literals (possibly imaginary)
+        0 => '\b([1-9][0-9]*i?|0[0-7]*|0[xX][0-9a-f]+|0[0-9]*i)\b',
+        # real floating point literals
+        1 => '\b((?:\d+\.\d*(?:[Ee][+-]?\d+\b)?|\.\d+(?:[Ee][+-]?\d+)?|\d+[Ee][+-]?\d+)?)\b',
+        # imaginary floating point literals
+        2 => '\b((?:\d+\.\d*(?:[Ee][+-]?\d+)?|\.\d+(?:[Ee][+-]?\d+)?|\d+[Ee][+-]?\d+)?i)\b'
+        ),
+    'KEYWORDS' => array(
+        # statements
+        1 => array(
+            'break', 'case', 'const', 'continue', 'default', 'defer', 'else',
+            'fallthrough', 'for', 'go', 'goto', 'if', 'import', 'package',
+            'range', 'return', 'select', 'switch', 'type', 'var'
+            ),
+        # literals
+        2 => array(
+            'nil', 'true', 'false'
+            ),
+        # built-in functions
+        3 => array(
+            'close', 'closed', 'len', 'cap', 'new', 'make', 'copy', 'cmplx',
+            'real', 'imag', 'panic', 'recover', 'print', 'println'
+            ),
+        # built-in types
+        4 => array(
+            'chan', 'func', 'interface', 'map', 'struct', 'bool', 'uint8',
+            'uint16', 'uint32', 'uint64', 'int8', 'int16', 'int32', 'int64',
+            'float32', 'float64', 'complex64', 'complex128', 'byte', 'uint',
+            'int', 'float', 'complex', 'uintptr', 'string'
+            ),
+        # library types
+        5 => array(
+            'aes.Cipher', 'aes.KeySizeError', 'ascii85.CorruptInputError', 'asn1.BitString',
+            'asn1.RawValue', 'asn1.StructuralError', 'asn1.SyntaxError', 'ast.ChanDir',
+            'ast.Comment', 'ast.CommentGroup', 'ast.Decl', 'ast.Expr', 'ast.Field',
+            'ast.FieldList', 'ast.File', 'ast.Filter', 'ast.MergeMode', 'ast.Node',
+            'ast.ObjKind', 'ast.Object', 'ast.Package', 'ast.Scope', 'ast.Stmt',
+            'ast.Visitor', 'av.Color', 'av.Image', 'av.Window', 'base64.CorruptInputError',
+            'base64.Encoding', 'big.Int', 'big.Word', 'bignum.Integer', 'bignum.Rational',
+            'binary.ByteOrder', 'block.Cipher', 'block.EAXTagError', 'blowfish.Cipher',
+            'blowfish.KeySizeError', 'bufio.BufSizeError', 'bufio.Error', 'bufio.ReadWriter',
+            'bufio.Reader', 'bufio.Writer', 'bytes.Buffer', 'datafmt.Environment',
+            'datafmt.Format', 'datafmt.Formatter', 'datafmt.FormatterMap', 'datafmt.State',
+            'doc.Filter', 'doc.FuncDoc', 'doc.PackageDoc', 'doc.TypeDoc', 'doc.ValueDoc',
+            'draw.Color', 'draw.Context', 'draw.Image', 'draw.Mouse', 'draw.Op',
+            'draw.Point', 'draw.Rectangle', 'dwarf.AddrType', 'dwarf.ArrayType',
+            'dwarf.Attr', 'dwarf.BasicType', 'dwarf.BoolType', 'dwarf.CharType',
+            'dwarf.CommonType', 'dwarf.ComplexType', 'dwarf.Data', 'dwarf.DecodeError',
+            'dwarf.DotDotDotType', 'dwarf.Entry', 'dwarf.EnumType', 'dwarf.EnumValue',
+            'dwarf.Field', 'dwarf.FloatType', 'dwarf.FuncType', 'dwarf.IntType',
+            'dwarf.Offset', 'dwarf.PtrType', 'dwarf.QualType', 'dwarf.Reader',
+            'dwarf.StructField', 'dwarf.StructType', 'dwarf.Tag', 'dwarf.Type',
+            'dwarf.TypedefType', 'dwarf.UcharType', 'dwarf.UintType', 'dwarf.VoidType',
+            'elf.Class', 'elf.Data', 'elf.Dyn32', 'elf.Dyn64', 'elf.DynFlag', 'elf.DynTag',
+            'elf.File', 'elf.FileHeader', 'elf.FormatError', 'elf.Header32', 'elf.Header64',
+            'elf.Machine', 'elf.NType', 'elf.OSABI', 'elf.Prog', 'elf.Prog32', 'elf.Prog64',
+            'elf.ProgFlag', 'elf.ProgHeader', 'elf.ProgType', 'elf.R_386', 'elf.R_ALPHA',
+            'elf.R_ARM', 'elf.R_PPC', 'elf.R_SPARC', 'elf.R_X86_64', 'elf.Rel32',
+            'elf.Rel64', 'elf.Rela32', 'elf.Rela64', 'elf.Section', 'elf.Section32',
+            'elf.Section64', 'elf.SectionFlag', 'elf.SectionHeader', 'elf.SectionIndex',
+            'elf.SectionType', 'elf.Sym32', 'elf.Sym64', 'elf.SymBind', 'elf.SymType',
+            'elf.SymVis', 'elf.Symbol', 'elf.Type', 'elf.Version', 'eval.ArrayType',
+            'eval.ArrayValue', 'eval.BoolValue', 'eval.BoundedType', 'eval.ChanType',
+            'eval.Code', 'eval.Constant', 'eval.Def', 'eval.DivByZeroError',
+            'eval.FloatValue', 'eval.Frame', 'eval.Func', 'eval.FuncDecl', 'eval.FuncType',
+            'eval.FuncValue', 'eval.IMethod', 'eval.IdealFloatValue', 'eval.IdealIntValue',
+            'eval.IndexError', 'eval.IntValue', 'eval.Interface', 'eval.InterfaceType',
+            'eval.InterfaceValue', 'eval.KeyError', 'eval.Map', 'eval.MapType',
+            'eval.MapValue', 'eval.Method', 'eval.MultiType', 'eval.NamedType',
+            'eval.NegativeCapacityError', 'eval.NegativeLengthError', 'eval.NilPointerError',
+            'eval.PtrType', 'eval.PtrValue', 'eval.RedefinitionError', 'eval.Scope',
+            'eval.Slice', 'eval.SliceError', 'eval.SliceType', 'eval.SliceValue',
+            'eval.StringValue', 'eval.StructField', 'eval.StructType', 'eval.StructValue',
+            'eval.Thread', 'eval.Type', 'eval.UintValue', 'eval.Value', 'eval.Variable',
+            'eval.World', 'exec.Cmd', 'expvar.Int', 'expvar.IntFunc', 'expvar.KeyValue',
+            'expvar.Map', 'expvar.String', 'expvar.StringFunc', 'expvar.Var', 'flag.Flag',
+            'flag.Value', 'flate.CorruptInputError', 'flate.InternalError',
+            'flate.ReadError', 'flate.Reader', 'flate.WriteError', 'flate.WrongValueError',
+            'fmt.Formatter', 'fmt.GoStringer', 'fmt.State', 'fmt.Stringer',
+            'git85.CorruptInputError', 'gob.Decoder', 'gob.Encoder', 'gosym.DecodingError',
+            'gosym.Func', 'gosym.LineTable', 'gosym.Obj', 'gosym.Sym', 'gosym.Table',
+            'gosym.UnknownFileError', 'gosym.UnknownLineError', 'gzip.Deflater',
+            'gzip.Header', 'gzip.Inflater', 'hash.Hash', 'hash.Hash32', 'hash.Hash64',
+            'heap.Interface', 'hex.InvalidHexCharError', 'hex.OddLengthInputError',
+            'http.ClientConn', 'http.Conn', 'http.Handler', 'http.HandlerFunc',
+            'http.ProtocolError', 'http.Request', 'http.Response', 'http.ServeMux',
+            'http.ServerConn', 'http.URL', 'http.URLError', 'http.URLEscapeError',
+            'image.Alpha', 'image.AlphaColor', 'image.Color', 'image.ColorImage',
+            'image.ColorModel', 'image.ColorModelFunc', 'image.Image', 'image.NRGBA',
+            'image.NRGBA64', 'image.NRGBA64Color', 'image.NRGBAColor', 'image.Paletted',
+            'image.RGBA', 'image.RGBA64', 'image.RGBA64Color', 'image.RGBAColor',
+            'io.Closer', 'io.Error', 'io.PipeReader', 'io.PipeWriter', 'io.ReadByter',
+            'io.ReadCloser', 'io.ReadSeeker', 'io.ReadWriteCloser', 'io.ReadWriteSeeker',
+            'io.ReadWriter', 'io.Reader', 'io.ReaderAt', 'io.ReaderFrom', 'io.SectionReader',
+            'io.Seeker', 'io.WriteCloser', 'io.WriteSeeker', 'io.Writer', 'io.WriterAt',
+            'io.WriterTo', 'iterable.Func', 'iterable.Group', 'iterable.Grouper',
+            'iterable.Injector', 'iterable.Iterable', 'jpeg.FormatError', 'jpeg.Reader',
+            'jpeg.UnsupportedError', 'json.Decoder', 'json.Encoder',
+            'json.InvalidUnmarshalError', 'json.Marshaler', 'json.MarshalerError',
+            'json.SyntaxError', 'json.UnmarshalTypeError', 'json.Unmarshaler',
+            'json.UnsupportedTypeError', 'list.Element', 'list.List', 'log.Logger',
+            'macho.Cpu', 'macho.File', 'macho.FileHeader', 'macho.FormatError', 'macho.Load',
+            'macho.LoadCmd', 'macho.Regs386', 'macho.RegsAMD64', 'macho.Section',
+            'macho.Section32', 'macho.Section64', 'macho.SectionHeader', 'macho.Segment',
+            'macho.Segment32', 'macho.Segment64', 'macho.SegmentHeader', 'macho.Thread',
+            'macho.Type', 'net.Addr', 'net.AddrError', 'net.Conn', 'net.DNSConfigError',
+            'net.DNSError', 'net.Error', 'net.InvalidAddrError', 'net.InvalidConnError',
+            'net.Listener', 'net.OpError', 'net.PacketConn', 'net.TCPAddr', 'net.TCPConn',
+            'net.TCPListener', 'net.UDPAddr', 'net.UDPConn', 'net.UnixAddr', 'net.UnixConn',
+            'net.UnixListener', 'net.UnknownNetworkError', 'net.UnknownSocketError',
+            'netchan.Dir', 'netchan.Exporter', 'netchan.Importer', 'nntp.Article',
+            'nntp.Conn', 'nntp.Error', 'nntp.Group', 'nntp.ProtocolError', 'ogle.Arch',
+            'ogle.ArchAlignedMultiple', 'ogle.ArchLSB', 'ogle.Breakpoint', 'ogle.Event',
+            'ogle.EventAction', 'ogle.EventHandler', 'ogle.EventHook', 'ogle.FormatError',
+            'ogle.Frame', 'ogle.Goroutine', 'ogle.GoroutineCreate', 'ogle.GoroutineExit',
+            'ogle.NoCurrentGoroutine', 'ogle.NotOnStack', 'ogle.Process',
+            'ogle.ProcessNotStopped', 'ogle.ReadOnlyError', 'ogle.RemoteMismatchError',
+            'ogle.UnknownArchitecture', 'ogle.UnknownGoroutine', 'ogle.UsageError',
+            'os.Errno', 'os.Error', 'os.ErrorString', 'os.File', 'os.FileInfo',
+            'os.LinkError', 'os.PathError', 'os.SyscallError', 'os.Waitmsg', 'patch.Diff',
+            'patch.File', 'patch.GitBinaryLiteral', 'patch.Op', 'patch.Set',
+            'patch.SyntaxError', 'patch.TextChunk', 'patch.Verb', 'path.Visitor',
+            'pdp1.HaltError', 'pdp1.LoopError', 'pdp1.Trapper', 'pdp1.UnknownInstrError',
+            'pdp1.Word', 'pem.Block', 'png.FormatError', 'png.IDATDecodingError',
+            'png.UnsupportedError', 'printer.Config', 'printer.HTMLTag', 'printer.Styler',
+            'proc.Breakpoint', 'proc.Cause', 'proc.Process', 'proc.ProcessExited',
+            'proc.Regs', 'proc.Signal', 'proc.Stopped', 'proc.Thread', 'proc.ThreadCreate',
+            'proc.ThreadExit', 'proc.Word', 'quick.CheckEqualError', 'quick.CheckError',
+            'quick.Config', 'quick.Generator', 'quick.SetupError', 'rand.Rand',
+            'rand.Source', 'rand.Zipf', 'rc4.Cipher', 'rc4.KeySizeError',
+            'reflect.ArrayOrSliceType', 'reflect.ArrayOrSliceValue', 'reflect.ArrayType',
+            'reflect.ArrayValue', 'reflect.BoolType', 'reflect.BoolValue', 'reflect.ChanDir',
+            'reflect.ChanType', 'reflect.ChanValue', 'reflect.Complex128Type',
+            'reflect.Complex128Value', 'reflect.Complex64Type', 'reflect.Complex64Value',
+            'reflect.ComplexType', 'reflect.ComplexValue', 'reflect.Float32Type',
+            'reflect.Float32Value', 'reflect.Float64Type', 'reflect.Float64Value',
+            'reflect.FloatType', 'reflect.FloatValue', 'reflect.FuncType',
+            'reflect.FuncValue', 'reflect.Int16Type', 'reflect.Int16Value',
+            'reflect.Int32Type', 'reflect.Int32Value', 'reflect.Int64Type',
+            'reflect.Int64Value', 'reflect.Int8Type', 'reflect.Int8Value', 'reflect.IntType',
+            'reflect.IntValue', 'reflect.InterfaceType', 'reflect.InterfaceValue',
+            'reflect.MapType', 'reflect.MapValue', 'reflect.Method', 'reflect.PtrType',
+            'reflect.PtrValue', 'reflect.SliceHeader', 'reflect.SliceType',
+            'reflect.SliceValue', 'reflect.StringHeader', 'reflect.StringType',
+            'reflect.StringValue', 'reflect.StructField', 'reflect.StructType',
+            'reflect.StructValue', 'reflect.Type', 'reflect.Uint16Type',
+            'reflect.Uint16Value', 'reflect.Uint32Type', 'reflect.Uint32Value',
+            'reflect.Uint64Type', 'reflect.Uint64Value', 'reflect.Uint8Type',
+            'reflect.Uint8Value', 'reflect.UintType', 'reflect.UintValue',
+            'reflect.UintptrType', 'reflect.UintptrValue', 'reflect.UnsafePointerType',
+            'reflect.UnsafePointerValue', 'reflect.Value', 'regexp.Error', 'regexp.Regexp',
+            'ring.Ring', 'rpc.Call', 'rpc.Client', 'rpc.ClientCodec', 'rpc.InvalidRequest',
+            'rpc.Request', 'rpc.Response', 'rpc.ServerCodec', 'rsa.DecryptionError',
+            'rsa.MessageTooLongError', 'rsa.PKCS1v15Hash', 'rsa.PrivateKey', 'rsa.PublicKey',
+            'rsa.VerificationError', 'runtime.ArrayType', 'runtime.BoolType',
+            'runtime.ChanDir', 'runtime.ChanType', 'runtime.Complex128Type',
+            'runtime.Complex64Type', 'runtime.ComplexType', 'runtime.Error',
+            'runtime.Float32Type', 'runtime.Float64Type', 'runtime.FloatType',
+            'runtime.Func', 'runtime.FuncType', 'runtime.Int16Type', 'runtime.Int32Type',
+            'runtime.Int64Type', 'runtime.Int8Type', 'runtime.IntType',
+            'runtime.InterfaceType', 'runtime.Itable', 'runtime.MapType',
+            'runtime.MemProfileRecord', 'runtime.MemStatsType', 'runtime.PtrType',
+            'runtime.SliceType', 'runtime.StringType', 'runtime.StructType', 'runtime.Type',
+            'runtime.TypeAssertionError', 'runtime.Uint16Type', 'runtime.Uint32Type',
+            'runtime.Uint64Type', 'runtime.Uint8Type', 'runtime.UintType',
+            'runtime.UintptrType', 'runtime.UnsafePointerType', 'scanner.Error',
+            'scanner.ErrorHandler', 'scanner.ErrorVector', 'scanner.Position',
+            'scanner.Scanner', 'script.Close', 'script.Closed', 'script.Event',
+            'script.ReceivedUnexpected', 'script.Recv', 'script.RecvMatch', 'script.Send',
+            'script.SetupError', 'signal.Signal', 'signal.UnixSignal', 'sort.Interface',
+            'srpc.Client', 'srpc.Errno', 'srpc.Handler', 'srpc.RPC', 'strconv.NumError',
+            'strings.Reader', 'sync.Mutex', 'sync.RWMutex',
+            'syscall.ByHandleFileInformation', 'syscall.Cmsghdr', 'syscall.Dirent',
+            'syscall.EpollEvent', 'syscall.Fbootstraptransfer_t', 'syscall.FdSet',
+            'syscall.Filetime', 'syscall.Flock_t', 'syscall.Fstore_t', 'syscall.Iovec',
+            'syscall.Kevent_t', 'syscall.Linger', 'syscall.Log2phys_t', 'syscall.Msghdr',
+            'syscall.Overlapped', 'syscall.PtraceRegs', 'syscall.Radvisory_t',
+            'syscall.RawSockaddr', 'syscall.RawSockaddrAny', 'syscall.RawSockaddrInet4',
+            'syscall.RawSockaddrInet6', 'syscall.RawSockaddrUnix', 'syscall.Rlimit',
+            'syscall.Rusage', 'syscall.Sockaddr', 'syscall.SockaddrInet4',
+            'syscall.SockaddrInet6', 'syscall.SockaddrUnix', 'syscall.Stat_t',
+            'syscall.Statfs_t', 'syscall.Sysinfo_t', 'syscall.Time_t', 'syscall.Timespec',
+            'syscall.Timeval', 'syscall.Timex', 'syscall.Tms', 'syscall.Ustat_t',
+            'syscall.Utimbuf', 'syscall.Utsname', 'syscall.WaitStatus',
+            'syscall.Win32finddata', 'syslog.Priority', 'syslog.Writer', 'tabwriter.Writer',
+            'tar.Header', 'tar.Reader', 'tar.Writer', 'template.Error',
+            'template.FormatterMap', 'template.Template', 'testing.Benchmark',
+            'testing.Regexp', 'testing.Test', 'time.ParseError', 'time.Ticker', 'time.Time',
+            'tls.CASet', 'tls.Certificate', 'tls.Config', 'tls.Conn', 'tls.ConnectionState',
+            'tls.Listener', 'token.Position', 'token.Token', 'unicode.CaseRange',
+            'unicode.Range', 'unsafe.ArbitraryType', 'vector.LessInterface',
+            'websocket.Conn', 'websocket.Draft75Handler', 'websocket.Handler',
+            'websocket.ProtocolError', 'websocket.WebSocketAddr', 'x509.Certificate',
+            'x509.ConstraintViolationError', 'x509.KeyUsage', 'x509.Name',
+            'x509.PublicKeyAlgorithm', 'x509.SignatureAlgorithm',
+            'x509.UnhandledCriticalExtension', 'x509.UnsupportedAlgorithmError', 'xml.Attr',
+            'xml.EndElement', 'xml.Name', 'xml.Parser', 'xml.ProcInst', 'xml.StartElement',
+            'xml.SyntaxError', 'xml.Token', 'xml.UnmarshalError', 'xtea.Cipher',
+            'xtea.KeySizeError'
+            )
+        ),
+    'SYMBOLS' => array(
+        # delimiters
+        1 => array(
+            '(', ')', '{', '}', '[', ']', ',', ':', ';'
+            ),
+        # assignments
+        2 => array(
+            '<<=', '!=', '%=', '&=', '&^=', '*=', '+=', '-=', '/=', ':=', '>>=',
+            '^=', '|=', '=', '++', '--'
+            ),
+        # operators
+        3 => array(
+            '<=', '<', '==', '>', '>=', '&&', '!', '||', '&', '&^', '|', '^',
+            '>>', '<<', '*', '%', '+', '-', '.', '/', '<-'),
+        # vararg
+        4 => array(
+            '...'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            # statements
+            1 => 'color: #b1b100; font-weight: bold;',
+            # literals
+            2 => 'color: #000000; font-weight: bold;',
+            # built-in functions
+            3 => 'color: #000066;',
+            # built-in types
+            4 => 'color: #993333;',
+            # library types
+            5 => 'color: #003399;'
+            ),
+        'COMMENTS' => array(
+            # single-line comments
+            1 => 'color: #666666; font-style: italic;',
+            # raw strings
+            2 => 'color: #0000ff;',
+            # multi-line comments
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            # simple escape
+            1 => 'color: #000099; font-weight: bold;',
+            # octal escape
+            2 => 'color: #000099;',
+            # hex escape
+            3 => 'color: #000099;',
+            # unicode escape
+            4 => 'color: #000099;',
+            # long unicode escape
+            5 => 'color: #000099;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            0 => 'color: #cc66cc;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            # delimiters
+            1 => 'color: #339933;',
+            # assignments
+            2 => 'color: #339933;',
+            # operators
+            3 => 'color: #339933;',
+            # vararg (highlighted as a keyword)
+            4 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            # If CSS classes are enabled, these would be highlighted as numbers (nu0)
+            # integer literals (possibly imaginary)
+            //0 => 'color: #cc66cc;',
+            # real floating point literals
+            //1 => 'color: #cc66cc;',
+            # imaginary floating point literals
+            //2 => 'color: #cc66cc;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://golang.org/search?q={FNAME}'
+        ),
+    'REGEXPS' => array(
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER, # handled by symbols
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/groovy.php b/vendor/easybook/geshi/geshi/groovy.php
new file mode 100755
index 000000000..45290d2fc
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/groovy.php
@@ -0,0 +1,1011 @@
+<?php
+/*************************************************************************************
+ * groovy.php
+ * ----------
+ * Author: Ivan F. Villanueva B. (geshi_groovy@artificialidea.com)
+ * Copyright: (c) 2006 Ivan F. Villanueva B.(http://www.artificialidea.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/04/29
+ *
+ * Groovy language file for GeSHi.
+ *
+ * Keywords from http: http://docs.codehaus.org/download/attachments/2715/groovy-reference-card.pdf?version=1
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/04/29 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2006/04/29)
+ * -------------------------
+ * Testing
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Groovy',
+    'COMMENT_SINGLE' => array(1 => '//', 3 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'''", '"""', "'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'else', 'for', 'foreach', 'if', 'in', 'switch',
+            'while',
+            ),
+        2 => array(
+            'abstract', 'as', 'assert', 'break', 'catch', 'class', 'const',
+            'continue', 'def', 'default', 'enum', 'extends',
+            'false', 'final', 'finally', 'goto', 'implements', 'import',
+            'instanceof', 'interface', 'native', 'new', 'null',
+            'package', 'private', 'property', 'protected',
+            'public', 'return', 'static', 'strictfp', 'super',
+            'synchronized', 'this', 'throw', 'throws',
+            'transient', 'true', 'try', 'volatile'
+            ),
+        3 => array(
+            'AbstractAction', 'AbstractBorder', 'AbstractButton',
+            'AbstractCellEditor', 'AbstractCollection',
+            'AbstractColorChooserPanel', 'AbstractDocument',
+            'AbstractDocument.AttributeContext',
+            'AbstractDocument.Content',
+            'AbstractDocument.ElementEdit',
+            'AbstractLayoutCache',
+            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
+            'AbstractListModel', 'AbstractMap',
+            'AbstractMethodError', 'AbstractSequentialList',
+            'AbstractSet', 'AbstractTableModel',
+            'AbstractUndoableEdit', 'AbstractWriter',
+            'AccessControlContext', 'AccessControlException',
+            'AccessController', 'AccessException', 'Accessible',
+            'AccessibleAction', 'AccessibleBundle',
+            'AccessibleComponent', 'AccessibleContext',
+            'AccessibleHyperlink', 'AccessibleHypertext',
+            'AccessibleIcon', 'AccessibleObject',
+            'AccessibleRelation', 'AccessibleRelationSet',
+            'AccessibleResourceBundle', 'AccessibleRole',
+            'AccessibleSelection', 'AccessibleState',
+            'AccessibleStateSet', 'AccessibleTable',
+            'AccessibleTableModelChange', 'AccessibleText',
+            'AccessibleValue', 'Acl', 'AclEntry',
+            'AclNotFoundException', 'Action', 'ActionEvent',
+            'ActionListener', 'ActionMap', 'ActionMapUIResource',
+            'Activatable', 'ActivateFailedException',
+            'ActivationDesc', 'ActivationException',
+            'ActivationGroup', 'ActivationGroupDesc',
+            'ActivationGroupDesc.CommandEnvironment',
+            'ActivationGroupID', 'ActivationID',
+            'ActivationInstantiator', 'ActivationMonitor',
+            'ActivationSystem', 'Activator', 'ActiveEvent',
+            'Adjustable', 'AdjustmentEvent',
+            'AdjustmentListener', 'Adler32', 'AffineTransform',
+            'AffineTransformOp', 'AlgorithmParameterGenerator',
+            'AlgorithmParameterGeneratorSpi',
+            'AlgorithmParameters', 'AlgorithmParameterSpec',
+            'AlgorithmParametersSpi', 'AllPermission',
+            'AlphaComposite', 'AlreadyBound',
+            'AlreadyBoundException', 'AlreadyBoundHelper',
+            'AlreadyBoundHolder', 'AncestorEvent',
+            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
+            'AnySeqHelper', 'AnySeqHolder', 'Applet',
+            'AppletContext', 'AppletInitializer', 'AppletStub',
+            'ApplicationException', 'Arc2D', 'Arc2D.Double',
+            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
+            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
+            'ArithmeticException', 'Array',
+            'ArrayIndexOutOfBoundsException', 'ArrayList',
+            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
+            'Attribute', 'AttributedCharacterIterator',
+            'AttributedCharacterIterator.Attribute',
+            'AttributedString', 'AttributeInUseException',
+            'AttributeList', 'AttributeModificationException',
+            'Attributes', 'Attributes.Name', 'AttributeSet',
+            'AttributeSet.CharacterAttribute',
+            'AttributeSet.ColorAttribute',
+            'AttributeSet.FontAttribute',
+            'AttributeSet.ParagraphAttribute', 'AudioClip',
+            'AudioFileFormat', 'AudioFileFormat.Type',
+            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
+            'AudioFormat.Encoding', 'AudioInputStream',
+            'AudioPermission', 'AudioSystem',
+            'AuthenticationException',
+            'AuthenticationNotSupportedException',
+            'Authenticator', 'Autoscroll', 'AWTError',
+            'AWTEvent', 'AWTEventListener',
+            'AWTEventMulticaster', 'AWTException',
+            'AWTPermission', 'BadKind', 'BadLocationException',
+            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
+            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
+            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
+            'BandedSampleModel', 'BasicArrowButton',
+            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
+            'BasicBorders.ButtonBorder',
+            'BasicBorders.FieldBorder',
+            'BasicBorders.MarginBorder',
+            'BasicBorders.MenuBarBorder',
+            'BasicBorders.RadioButtonBorder',
+            'BasicBorders.SplitPaneBorder',
+            'BasicBorders.ToggleButtonBorder',
+            'BasicButtonListener', 'BasicButtonUI',
+            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
+            'BasicColorChooserUI', 'BasicComboBoxEditor',
+            'BasicComboBoxEditor.UIResource',
+            'BasicComboBoxRenderer',
+            'BasicComboBoxRenderer.UIResource',
+            'BasicComboBoxUI', 'BasicComboPopup',
+            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
+            'BasicDirectoryModel', 'BasicEditorPaneUI',
+            'BasicFileChooserUI', 'BasicGraphicsUtils',
+            'BasicHTML', 'BasicIconFactory',
+            'BasicInternalFrameTitlePane',
+            'BasicInternalFrameUI', 'BasicLabelUI',
+            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
+            'BasicMenuItemUI', 'BasicMenuUI',
+            'BasicOptionPaneUI',
+            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
+            'BasicPasswordFieldUI', 'BasicPermission',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
+            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
+            'BasicRadioButtonUI', 'BasicRootPaneUI',
+            'BasicScrollBarUI', 'BasicScrollPaneUI',
+            'BasicSeparatorUI', 'BasicSliderUI',
+            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
+            'BasicStroke', 'BasicTabbedPaneUI',
+            'BasicTableHeaderUI', 'BasicTableUI',
+            'BasicTextAreaUI', 'BasicTextFieldUI',
+            'BasicTextPaneUI', 'BasicTextUI',
+            'BasicTextUI.BasicCaret',
+            'BasicTextUI.BasicHighlighter',
+            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
+            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
+            'BasicViewportUI', 'BatchUpdateException',
+            'BeanContext', 'BeanContextChild',
+            'BeanContextChildComponentProxy',
+            'BeanContextChildSupport',
+            'BeanContextContainerProxy', 'BeanContextEvent',
+            'BeanContextMembershipEvent',
+            'BeanContextMembershipListener', 'BeanContextProxy',
+            'BeanContextServiceAvailableEvent',
+            'BeanContextServiceProvider',
+            'BeanContextServiceProviderBeanInfo',
+            'BeanContextServiceRevokedEvent',
+            'BeanContextServiceRevokedListener',
+            'BeanContextServices', 'BeanContextServicesListener',
+            'BeanContextServicesSupport',
+            'BeanContextServicesSupport.BCSSServiceProvider',
+            'BeanContextSupport',
+            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
+            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
+            'BigInteger', 'BinaryRefAddr', 'BindException',
+            'Binding', 'BindingHelper', 'BindingHolder',
+            'BindingIterator', 'BindingIteratorHelper',
+            'BindingIteratorHolder', 'BindingIteratorOperations',
+            'BindingListHelper', 'BindingListHolder',
+            'BindingType', 'BindingTypeHelper',
+            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
+            'Book', 'Boolean', 'BooleanControl',
+            'BooleanControl.Type', 'BooleanHolder',
+            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
+            'BorderFactory', 'BorderLayout', 'BorderUIResource',
+            'BorderUIResource.BevelBorderUIResource',
+            'BorderUIResource.CompoundBorderUIResource',
+            'BorderUIResource.EmptyBorderUIResource',
+            'BorderUIResource.EtchedBorderUIResource',
+            'BorderUIResource.LineBorderUIResource',
+            'BorderUIResource.MatteBorderUIResource',
+            'BorderUIResource.TitledBorderUIResource',
+            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
+            'BoxedValueHelper', 'BoxLayout', 'BoxView',
+            'BreakIterator', 'BufferedImage',
+            'BufferedImageFilter', 'BufferedImageOp',
+            'BufferedInputStream', 'BufferedOutputStream',
+            'BufferedReader', 'BufferedWriter', 'Button',
+            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
+            'ByteArrayInputStream', 'ByteArrayOutputStream',
+            'ByteHolder', 'ByteLookupTable', 'Calendar',
+            'CallableStatement', 'CannotProceed',
+            'CannotProceedException', 'CannotProceedHelper',
+            'CannotProceedHolder', 'CannotRedoException',
+            'CannotUndoException', 'Canvas', 'CardLayout',
+            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
+            'CellEditorListener', 'CellRendererPane',
+            'Certificate', 'Certificate.CertificateRep',
+            'CertificateEncodingException',
+            'CertificateException',
+            'CertificateExpiredException', 'CertificateFactory',
+            'CertificateFactorySpi',
+            'CertificateNotYetValidException',
+            'CertificateParsingException',
+            'ChangedCharSetException', 'ChangeEvent',
+            'ChangeListener', 'Character', 'Character.Subset',
+            'Character.UnicodeBlock', 'CharacterIterator',
+            'CharArrayReader', 'CharArrayWriter',
+            'CharConversionException', 'CharHolder',
+            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
+            'CheckboxGroup', 'CheckboxMenuItem',
+            'CheckedInputStream', 'CheckedOutputStream',
+            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
+            'ClassCastException', 'ClassCircularityError',
+            'ClassDesc', 'ClassFormatError', 'ClassLoader',
+            'ClassNotFoundException', 'Clip', 'Clipboard',
+            'ClipboardOwner', 'Clob', 'Cloneable',
+            'CloneNotSupportedException', 'CMMException',
+            'CodeSource', 'CollationElementIterator',
+            'CollationKey', 'Collator', 'Collection',
+            'Collections', 'Color',
+            'ColorChooserComponentFactory', 'ColorChooserUI',
+            'ColorConvertOp', 'ColorModel',
+            'ColorSelectionModel', 'ColorSpace',
+            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
+            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
+            'COMM_FAILURE', 'Comparable', 'Comparator',
+            'Compiler', 'CompletionStatus',
+            'CompletionStatusHelper', 'Component',
+            'ComponentAdapter', 'ComponentColorModel',
+            'ComponentEvent', 'ComponentInputMap',
+            'ComponentInputMapUIResource', 'ComponentListener',
+            'ComponentOrientation', 'ComponentSampleModel',
+            'ComponentUI', 'ComponentView', 'Composite',
+            'CompositeContext', 'CompositeName', 'CompositeView',
+            'CompoundBorder', 'CompoundControl',
+            'CompoundControl.Type', 'CompoundEdit',
+            'CompoundName', 'ConcurrentModificationException',
+            'ConfigurationException', 'ConnectException',
+            'ConnectIOException', 'Connection', 'Constructor',
+            'Container', 'ContainerAdapter', 'ContainerEvent',
+            'ContainerListener', 'ContentHandler',
+            'ContentHandlerFactory', 'ContentModel', 'Context',
+            'ContextList', 'ContextNotEmptyException',
+            'ContextualRenderedImageFactory', 'Control',
+            'Control.Type', 'ControlFactory',
+            'ControllerEventListener', 'ConvolveOp', 'CRC32',
+            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
+            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
+            'CubicCurve2D', 'CubicCurve2D.Double',
+            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
+            'CurrentHolder', 'CurrentOperations', 'Cursor',
+            'Customizer', 'CustomMarshal', 'CustomValue',
+            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
+            'DataBufferInt', 'DataBufferShort',
+            'DataBufferUShort', 'DataFlavor',
+            'DataFormatException', 'DatagramPacket',
+            'DatagramSocket', 'DatagramSocketImpl',
+            'DatagramSocketImplFactory', 'DataInput',
+            'DataInputStream', 'DataLine', 'DataLine.Info',
+            'DataOutput', 'DataOutputStream', 'DataTruncation',
+            'DATA_CONVERSION', 'Date', 'DateFormat',
+            'DateFormatSymbols', 'DebugGraphics',
+            'DecimalFormat', 'DecimalFormatSymbols',
+            'DefaultBoundedRangeModel', 'DefaultButtonModel',
+            'DefaultCaret', 'DefaultCellEditor',
+            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
+            'DefaultDesktopManager', 'DefaultEditorKit',
+            'DefaultEditorKit.BeepAction',
+            'DefaultEditorKit.CopyAction',
+            'DefaultEditorKit.CutAction',
+            'DefaultEditorKit.DefaultKeyTypedAction',
+            'DefaultEditorKit.InsertBreakAction',
+            'DefaultEditorKit.InsertContentAction',
+            'DefaultEditorKit.InsertTabAction',
+            'DefaultEditorKit.PasteAction,',
+            'DefaultFocusManager', 'DefaultHighlighter',
+            'DefaultHighlighter.DefaultHighlightPainter',
+            'DefaultListCellRenderer',
+            'DefaultListCellRenderer.UIResource',
+            'DefaultListModel', 'DefaultListSelectionModel',
+            'DefaultMenuLayout', 'DefaultMetalTheme',
+            'DefaultMutableTreeNode',
+            'DefaultSingleSelectionModel',
+            'DefaultStyledDocument',
+            'DefaultStyledDocument.AttributeUndoableEdit',
+            'DefaultStyledDocument.ElementSpec',
+            'DefaultTableCellRenderer',
+            'DefaultTableCellRenderer.UIResource',
+            'DefaultTableColumnModel', 'DefaultTableModel',
+            'DefaultTextUI', 'DefaultTreeCellEditor',
+            'DefaultTreeCellRenderer', 'DefaultTreeModel',
+            'DefaultTreeSelectionModel', 'DefinitionKind',
+            'DefinitionKindHelper', 'Deflater',
+            'DeflaterOutputStream', 'Delegate', 'DesignMode',
+            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
+            'DGC', 'Dialog', 'Dictionary', 'DigestException',
+            'DigestInputStream', 'DigestOutputStream',
+            'Dimension', 'Dimension2D', 'DimensionUIResource',
+            'DirContext', 'DirectColorModel', 'DirectoryManager',
+            'DirObjectFactory', 'DirStateFactory',
+            'DirStateFactory.Result', 'DnDConstants', 'Document',
+            'DocumentEvent', 'DocumentEvent.ElementChange',
+            'DocumentEvent.EventType', 'DocumentListener',
+            'DocumentParser', 'DomainCombiner', 'DomainManager',
+            'DomainManagerOperations', 'Double', 'DoubleHolder',
+            'DoubleSeqHelper', 'DoubleSeqHolder',
+            'DragGestureEvent', 'DragGestureListener',
+            'DragGestureRecognizer', 'DragSource',
+            'DragSourceContext', 'DragSourceDragEvent',
+            'DragSourceDropEvent', 'DragSourceEvent',
+            'DragSourceListener', 'Driver', 'DriverManager',
+            'DriverPropertyInfo', 'DropTarget',
+            'DropTarget.DropTargetAutoScroller',
+            'DropTargetContext', 'DropTargetDragEvent',
+            'DropTargetDropEvent', 'DropTargetEvent',
+            'DropTargetListener', 'DSAKey',
+            'DSAKeyPairGenerator', 'DSAParameterSpec',
+            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
+            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
+            'DTDConstants', 'DynamicImplementation', 'DynAny',
+            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
+            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
+            'Element', 'ElementIterator', 'Ellipse2D',
+            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
+            'EmptyStackException', 'EncodedKeySpec', 'Entity',
+            'EnumControl', 'EnumControl.Type', 'Enumeration',
+            'Environment', 'EOFException', 'Error',
+            'EtchedBorder', 'Event', 'EventContext',
+            'EventDirContext', 'EventListener',
+            'EventListenerList', 'EventObject', 'EventQueue',
+            'EventSetDescriptor', 'Exception',
+            'ExceptionInInitializerError', 'ExceptionList',
+            'ExpandVetoException', 'ExportException',
+            'ExtendedRequest', 'ExtendedResponse',
+            'Externalizable', 'FeatureDescriptor', 'Field',
+            'FieldNameHelper', 'FieldPosition', 'FieldView',
+            'File', 'FileChooserUI', 'FileDescriptor',
+            'FileDialog', 'FileFilter', 'FileInputStream',
+            'FilenameFilter', 'FileNameMap',
+            'FileNotFoundException', 'FileOutputStream',
+            'FilePermission', 'FileReader', 'FileSystemView',
+            'FileView', 'FileWriter', 'FilteredImageSource',
+            'FilterInputStream', 'FilterOutputStream',
+            'FilterReader', 'FilterWriter',
+            'FixedHeightLayoutCache', 'FixedHolder',
+            'FlatteningPathIterator', 'FlavorMap', 'Float',
+            'FloatControl', 'FloatControl.Type', 'FloatHolder',
+            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
+            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
+            'FocusEvent', 'FocusListener', 'FocusManager',
+            'Font', 'FontFormatException', 'FontMetrics',
+            'FontRenderContext', 'FontUIResource', 'Format',
+            'FormatConversionProvider', 'FormView', 'Frame',
+            'FREE_MEM', 'GapContent', 'GeneralPath',
+            'GeneralSecurityException', 'GlyphJustificationInfo',
+            'GlyphMetrics', 'GlyphVector', 'GlyphView',
+            'GlyphView.GlyphPainter', 'GradientPaint',
+            'GraphicAttribute', 'Graphics', 'Graphics2D',
+            'GraphicsConfigTemplate', 'GraphicsConfiguration',
+            'GraphicsDevice', 'GraphicsEnvironment',
+            'GrayFilter', 'GregorianCalendar',
+            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
+            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
+            'GZIPOutputStream', 'HasControls', 'HashMap',
+            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
+            'HierarchyBoundsListener', 'HierarchyEvent',
+            'HierarchyListener', 'Highlighter',
+            'Highlighter.Highlight',
+            'Highlighter.HighlightPainter', 'HTML',
+            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
+            'HTMLDocument', 'HTMLDocument.Iterator',
+            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
+            'HTMLEditorKit.HTMLTextAction',
+            'HTMLEditorKit.InsertHTMLTextAction',
+            'HTMLEditorKit.LinkController',
+            'HTMLEditorKit.Parser',
+            'HTMLEditorKit.ParserCallback',
+            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
+            'HttpURLConnection', 'HyperlinkEvent',
+            'HyperlinkEvent.EventType', 'HyperlinkListener',
+            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
+            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
+            'IconView', 'IdentifierHelper', 'Identity',
+            'IdentityScope', 'IDLEntity', 'IDLType',
+            'IDLTypeHelper', 'IDLTypeOperations',
+            'IllegalAccessError', 'IllegalAccessException',
+            'IllegalArgumentException',
+            'IllegalComponentStateException',
+            'IllegalMonitorStateException',
+            'IllegalPathStateException', 'IllegalStateException',
+            'IllegalThreadStateException', 'Image',
+            'ImageConsumer', 'ImageFilter',
+            'ImageGraphicAttribute', 'ImageIcon',
+            'ImageObserver', 'ImageProducer',
+            'ImagingOpException', 'IMP_LIMIT',
+            'IncompatibleClassChangeError',
+            'InconsistentTypeCode', 'IndexColorModel',
+            'IndexedPropertyDescriptor',
+            'IndexOutOfBoundsException', 'IndirectionException',
+            'InetAddress', 'Inflater', 'InflaterInputStream',
+            'InheritableThreadLocal', 'InitialContext',
+            'InitialContextFactory',
+            'InitialContextFactoryBuilder', 'InitialDirContext',
+            'INITIALIZE', 'Initializer', 'InitialLdapContext',
+            'InlineView', 'InputContext', 'InputEvent',
+            'InputMap', 'InputMapUIResource', 'InputMethod',
+            'InputMethodContext', 'InputMethodDescriptor',
+            'InputMethodEvent', 'InputMethodHighlight',
+            'InputMethodListener', 'InputMethodRequests',
+            'InputStream', 'InputStreamReader', 'InputSubset',
+            'InputVerifier', 'Insets', 'InsetsUIResource',
+            'InstantiationError', 'InstantiationException',
+            'Instrument', 'InsufficientResourcesException',
+            'Integer', 'INTERNAL', 'InternalError',
+            'InternalFrameAdapter', 'InternalFrameEvent',
+            'InternalFrameListener', 'InternalFrameUI',
+            'InterruptedException', 'InterruptedIOException',
+            'InterruptedNamingException', 'INTF_REPOS',
+            'IntHolder', 'IntrospectionException',
+            'Introspector', 'Invalid',
+            'InvalidAlgorithmParameterException',
+            'InvalidAttributeIdentifierException',
+            'InvalidAttributesException',
+            'InvalidAttributeValueException',
+            'InvalidClassException',
+            'InvalidDnDOperationException',
+            'InvalidKeyException', 'InvalidKeySpecException',
+            'InvalidMidiDataException', 'InvalidName',
+            'InvalidNameException', 'InvalidNameHelper',
+            'InvalidNameHolder', 'InvalidObjectException',
+            'InvalidParameterException',
+            'InvalidParameterSpecException',
+            'InvalidSearchControlsException',
+            'InvalidSearchFilterException', 'InvalidSeq',
+            'InvalidTransactionException', 'InvalidValue',
+            'INVALID_TRANSACTION', 'InvocationEvent',
+            'InvocationHandler', 'InvocationTargetException',
+            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
+            'INV_OBJREF', 'INV_POLICY', 'IOException',
+            'IRObject', 'IRObjectOperations', 'IstringHelper',
+            'ItemEvent', 'ItemListener', 'ItemSelectable',
+            'Iterator', 'JApplet', 'JarEntry', 'JarException',
+            'JarFile', 'JarInputStream', 'JarOutputStream',
+            'JarURLConnection', 'JButton', 'JCheckBox',
+            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
+            'JComboBox.KeySelectionManager', 'JComponent',
+            'JDesktopPane', 'JDialog', 'JEditorPane',
+            'JFileChooser', 'JFrame', 'JInternalFrame',
+            'JInternalFrame.JDesktopIcon', 'JLabel',
+            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
+            'JMenuItem', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType',
+            'JobAttributes.DestinationType',
+            'JobAttributes.DialogType',
+            'JobAttributes.MultipleDocumentHandlingType',
+            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
+            'JPasswordField', 'JPopupMenu',
+            'JPopupMenu.Separator', 'JProgressBar',
+            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
+            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
+            'JSplitPane', 'JTabbedPane', 'JTable',
+            'JTableHeader', 'JTextArea', 'JTextComponent',
+            'JTextComponent.KeyBinding', 'JTextField',
+            'JTextPane', 'JToggleButton',
+            'JToggleButton.ToggleButtonModel', 'JToolBar',
+            'JToolBar.Separator', 'JToolTip', 'JTree',
+            'JTree.DynamicUtilTreeNode',
+            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
+            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
+            'KeyException', 'KeyFactory', 'KeyFactorySpi',
+            'KeyListener', 'KeyManagementException', 'Keymap',
+            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
+            'KeySpec', 'KeyStore', 'KeyStoreException',
+            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
+            'LabelView', 'LastOwnerException',
+            'LayeredHighlighter',
+            'LayeredHighlighter.LayerPainter', 'LayoutManager',
+            'LayoutManager2', 'LayoutQueue', 'LdapContext',
+            'LdapReferralException', 'Lease',
+            'LimitExceededException', 'Line', 'Line.Info',
+            'Line2D', 'Line2D.Double', 'Line2D.Float',
+            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
+            'LineEvent.Type', 'LineListener', 'LineMetrics',
+            'LineNumberInputStream', 'LineNumberReader',
+            'LineUnavailableException', 'LinkageError',
+            'LinkedList', 'LinkException', 'LinkLoopException',
+            'LinkRef', 'List', 'ListCellRenderer',
+            'ListDataEvent', 'ListDataListener', 'ListIterator',
+            'ListModel', 'ListResourceBundle',
+            'ListSelectionEvent', 'ListSelectionListener',
+            'ListSelectionModel', 'ListUI', 'ListView',
+            'LoaderHandler', 'Locale', 'LocateRegistry',
+            'LogStream', 'Long', 'LongHolder',
+            'LongLongSeqHelper', 'LongLongSeqHolder',
+            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
+            'LookupOp', 'LookupTable', 'MalformedLinkException',
+            'MalformedURLException', 'Manifest', 'Map',
+            'Map.Entry', 'MARSHAL', 'MarshalException',
+            'MarshalledObject', 'Math', 'MatteBorder',
+            'MediaTracker', 'Member', 'MemoryImageSource',
+            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
+            'MenuContainer', 'MenuDragMouseEvent',
+            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
+            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
+            'MenuKeyListener', 'MenuListener',
+            'MenuSelectionManager', 'MenuShortcut',
+            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
+            'MetaEventListener', 'MetalBorders',
+            'MetalBorders.ButtonBorder',
+            'MetalBorders.Flush3DBorder',
+            'MetalBorders.InternalFrameBorder',
+            'MetalBorders.MenuBarBorder',
+            'MetalBorders.MenuItemBorder',
+            'MetalBorders.OptionDialogBorder',
+            'MetalBorders.PaletteBorder',
+            'MetalBorders.PopupMenuBorder',
+            'MetalBorders.RolloverButtonBorder',
+            'MetalBorders.ScrollPaneBorder',
+            'MetalBorders.TableHeaderBorder',
+            'MetalBorders.TextFieldBorder',
+            'MetalBorders.ToggleButtonBorder',
+            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
+            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
+            'MetalComboBoxButton', 'MetalComboBoxEditor',
+            'MetalComboBoxEditor.UIResource',
+            'MetalComboBoxIcon', 'MetalComboBoxUI',
+            'MetalDesktopIconUI', 'MetalFileChooserUI',
+            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
+            'MetalIconFactory.FolderIcon16',
+            'MetalIconFactory.PaletteCloseIcon',
+            'MetalIconFactory.TreeControlIcon',
+            'MetalIconFactory.TreeFolderIcon',
+            'MetalIconFactory.TreeLeafIcon',
+            'MetalInternalFrameTitlePane',
+            'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
+            'MetalProgressBarUI', 'MetalRadioButtonUI',
+            'MetalScrollBarUI', 'MetalScrollButton',
+            'MetalScrollPaneUI', 'MetalSeparatorUI',
+            'MetalSliderUI', 'MetalSplitPaneUI',
+            'MetalTabbedPaneUI', 'MetalTextFieldUI',
+            'MetalTheme', 'MetalToggleButtonUI',
+            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
+            'MetaMessage', 'Method', 'MethodDescriptor',
+            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
+            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
+            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
+            'MidiSystem', 'MidiUnavailableException',
+            'MimeTypeParseException', 'MinimalHTMLWriter',
+            'MissingResourceException', 'Mixer', 'Mixer.Info',
+            'MixerProvider', 'ModificationItem', 'Modifier',
+            'MouseAdapter', 'MouseDragGestureRecognizer',
+            'MouseEvent', 'MouseInputAdapter',
+            'MouseInputListener', 'MouseListener',
+            'MouseMotionAdapter', 'MouseMotionListener',
+            'MultiButtonUI', 'MulticastSocket',
+            'MultiColorChooserUI', 'MultiComboBoxUI',
+            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
+            'MultiFileChooserUI', 'MultiInternalFrameUI',
+            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
+            'MultiMenuBarUI', 'MultiMenuItemUI',
+            'MultiOptionPaneUI', 'MultiPanelUI',
+            'MultiPixelPackedSampleModel', 'MultipleMaster',
+            'MultiPopupMenuUI', 'MultiProgressBarUI',
+            'MultiScrollBarUI', 'MultiScrollPaneUI',
+            'MultiSeparatorUI', 'MultiSliderUI',
+            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
+            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
+            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
+            'MultiViewportUI', 'MutableAttributeSet',
+            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
+            'NameAlreadyBoundException', 'NameClassPair',
+            'NameComponent', 'NameComponentHelper',
+            'NameComponentHolder', 'NamedValue', 'NameHelper',
+            'NameHolder', 'NameNotFoundException', 'NameParser',
+            'NamespaceChangeListener', 'NameValuePair',
+            'NameValuePairHelper', 'Naming', 'NamingContext',
+            'NamingContextHelper', 'NamingContextHolder',
+            'NamingContextOperations', 'NamingEnumeration',
+            'NamingEvent', 'NamingException',
+            'NamingExceptionEvent', 'NamingListener',
+            'NamingManager', 'NamingSecurityException',
+            'NegativeArraySizeException', 'NetPermission',
+            'NoClassDefFoundError', 'NoInitialContextException',
+            'NoninvertibleTransformException',
+            'NoPermissionException', 'NoRouteToHostException',
+            'NoSuchAlgorithmException',
+            'NoSuchAttributeException', 'NoSuchElementException',
+            'NoSuchFieldError', 'NoSuchFieldException',
+            'NoSuchMethodError', 'NoSuchMethodException',
+            'NoSuchObjectException', 'NoSuchProviderException',
+            'NotActiveException', 'NotBoundException',
+            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
+            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
+            'NotFoundHolder', 'NotFoundReason',
+            'NotFoundReasonHelper', 'NotFoundReasonHolder',
+            'NotOwnerException', 'NotSerializableException',
+            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
+            'NO_RESOURCES', 'NO_RESPONSE',
+            'NullPointerException', 'Number', 'NumberFormat',
+            'NumberFormatException', 'NVList', 'Object',
+            'ObjectChangeListener', 'ObjectFactory',
+            'ObjectFactoryBuilder', 'ObjectHelper',
+            'ObjectHolder', 'ObjectImpl', 'ObjectInput',
+            'ObjectInputStream', 'ObjectInputStream.GetField',
+            'ObjectInputValidation', 'ObjectOutput',
+            'ObjectOutputStream', 'ObjectOutputStream.PutField',
+            'ObjectStreamClass', 'ObjectStreamConstants',
+            'ObjectStreamException', 'ObjectStreamField',
+            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
+            'OBJ_ADAPTER', 'Observable', 'Observer',
+            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
+            'OpenType', 'Operation',
+            'OperationNotSupportedException', 'Option',
+            'OptionalDataException', 'OptionPaneUI', 'ORB',
+            'OutOfMemoryError', 'OutputStream',
+            'OutputStreamWriter', 'OverlayLayout', 'Owner',
+            'Package', 'PackedColorModel', 'Pageable',
+            'PageAttributes', 'PageAttributes.ColorType',
+            'PageAttributes.MediaType',
+            'PageAttributes.OrientationRequestedType',
+            'PageAttributes.OriginType',
+            'PageAttributes.PrintQualityType', 'PageFormat',
+            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
+            'PanelUI', 'Paper', 'ParagraphView',
+            'ParameterBlock', 'ParameterDescriptor',
+            'ParseException', 'ParsePosition', 'Parser',
+            'ParserDelegator', 'PartialResultException',
+            'PasswordAuthentication', 'PasswordView', 'Patch',
+            'PathIterator', 'Permission', 'PermissionCollection',
+            'Permissions', 'PERSIST_STORE', 'PhantomReference',
+            'PipedInputStream', 'PipedOutputStream',
+            'PipedReader', 'PipedWriter', 'PixelGrabber',
+            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
+            'PlainDocument', 'PlainView', 'Point', 'Point2D',
+            'Point2D.Double', 'Point2D.Float', 'Policy',
+            'PolicyError', 'PolicyHelper', 'PolicyHolder',
+            'PolicyListHelper', 'PolicyListHolder',
+            'PolicyOperations', 'PolicyTypeHelper', 'Polygon',
+            'PopupMenu', 'PopupMenuEvent', 'PopupMenuListener',
+            'PopupMenuUI', 'Port', 'Port.Info',
+            'PortableRemoteObject',
+            'PortableRemoteObjectDelegate', 'Position',
+            'Position.Bias', 'PreparedStatement', 'Principal',
+            'PrincipalHolder', 'Printable',
+            'PrinterAbortException', 'PrinterException',
+            'PrinterGraphics', 'PrinterIOException',
+            'PrinterJob', 'PrintGraphics', 'PrintJob',
+            'PrintStream', 'PrintWriter', 'PrivateKey',
+            'PRIVATE_MEMBER', 'PrivilegedAction',
+            'PrivilegedActionException',
+            'PrivilegedExceptionAction', 'Process',
+            'ProfileDataException', 'ProgressBarUI',
+            'ProgressMonitor', 'ProgressMonitorInputStream',
+            'Properties', 'PropertyChangeEvent',
+            'PropertyChangeListener', 'PropertyChangeSupport',
+            'PropertyDescriptor', 'PropertyEditor',
+            'PropertyEditorManager', 'PropertyEditorSupport',
+            'PropertyPermission', 'PropertyResourceBundle',
+            'PropertyVetoException', 'ProtectionDomain',
+            'ProtocolException', 'Provider', 'ProviderException',
+            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
+            'PushbackInputStream', 'PushbackReader',
+            'QuadCurve2D', 'QuadCurve2D.Double',
+            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
+            'Raster', 'RasterFormatException', 'RasterOp',
+            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
+            'Rectangle2D.Double', 'Rectangle2D.Float',
+            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
+            'Referenceable', 'ReferenceQueue',
+            'ReferralException', 'ReflectPermission', 'Registry',
+            'RegistryHandler', 'RemarshalException', 'Remote',
+            'RemoteCall', 'RemoteException', 'RemoteObject',
+            'RemoteRef', 'RemoteServer', 'RemoteStub',
+            'RenderableImage', 'RenderableImageOp',
+            'RenderableImageProducer', 'RenderContext',
+            'RenderedImage', 'RenderedImageFactory', 'Renderer',
+            'RenderingHints', 'RenderingHints.Key',
+            'RepaintManager', 'ReplicateScaleFilter',
+            'Repository', 'RepositoryIdHelper', 'Request',
+            'RescaleOp', 'Resolver', 'ResolveResult',
+            'ResourceBundle', 'ResponseHandler', 'ResultSet',
+            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
+            'RMIClassLoader', 'RMIClientSocketFactory',
+            'RMIFailureHandler', 'RMISecurityException',
+            'RMISecurityManager', 'RMIServerSocketFactory',
+            'RMISocketFactory', 'Robot', 'RootPaneContainer',
+            'RootPaneUI', 'RoundRectangle2D',
+            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
+            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
+            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
+            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
+            'RSAPublicKeySpec', 'RTFEditorKit',
+            'RuleBasedCollator', 'Runnable', 'Runtime',
+            'RunTime', 'RuntimeException', 'RunTimeOperations',
+            'RuntimePermission', 'SampleModel',
+            'SchemaViolationException', 'Scrollable',
+            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
+            'ScrollPaneConstants', 'ScrollPaneLayout',
+            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
+            'SearchControls', 'SearchResult',
+            'SecureClassLoader', 'SecureRandom',
+            'SecureRandomSpi', 'Security', 'SecurityException',
+            'SecurityManager', 'SecurityPermission', 'Segment',
+            'SeparatorUI', 'Sequence', 'SequenceInputStream',
+            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
+            'SerializablePermission', 'ServantObject',
+            'ServerCloneException', 'ServerError',
+            'ServerException', 'ServerNotActiveException',
+            'ServerRef', 'ServerRequest',
+            'ServerRuntimeException', 'ServerSocket',
+            'ServiceDetail', 'ServiceDetailHelper',
+            'ServiceInformation', 'ServiceInformationHelper',
+            'ServiceInformationHolder',
+            'ServiceUnavailableException', 'Set',
+            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
+            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
+            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
+            'ShortSeqHolder', 'Signature', 'SignatureException',
+            'SignatureSpi', 'SignedObject', 'Signer',
+            'SimpleAttributeSet', 'SimpleBeanInfo',
+            'SimpleDateFormat', 'SimpleTimeZone',
+            'SinglePixelPackedSampleModel',
+            'SingleSelectionModel', 'SizeLimitExceededException',
+            'SizeRequirements', 'SizeSequence', 'Skeleton',
+            'SkeletonMismatchException',
+            'SkeletonNotFoundException', 'SliderUI', 'Socket',
+            'SocketException', 'SocketImpl', 'SocketImplFactory',
+            'SocketOptions', 'SocketPermission',
+            'SocketSecurityException', 'SoftBevelBorder',
+            'SoftReference', 'SortedMap', 'SortedSet',
+            'Soundbank', 'SoundbankReader', 'SoundbankResource',
+            'SourceDataLine', 'SplitPaneUI', 'SQLData',
+            'SQLException', 'SQLInput', 'SQLOutput',
+            'SQLPermission', 'SQLWarning', 'Stack',
+            'StackOverflowError', 'StateEdit', 'StateEditable',
+            'StateFactory', 'Statement', 'Streamable',
+            'StreamableValue', 'StreamCorruptedException',
+            'StreamTokenizer', 'StrictMath', 'String',
+            'StringBuffer', 'StringBufferInputStream',
+            'StringCharacterIterator', 'StringContent',
+            'StringHolder', 'StringIndexOutOfBoundsException',
+            'StringReader', 'StringRefAddr', 'StringSelection',
+            'StringTokenizer', 'StringValueHelper',
+            'StringWriter', 'Stroke', 'Struct', 'StructMember',
+            'StructMemberHelper', 'Stub', 'StubDelegate',
+            'StubNotFoundException', 'Style', 'StyleConstants',
+            'StyleConstants.CharacterConstants',
+            'StyleConstants.ColorConstants',
+            'StyleConstants.FontConstants',
+            'StyleConstants.ParagraphConstants', 'StyleContext',
+            'StyledDocument', 'StyledEditorKit',
+            'StyledEditorKit.AlignmentAction',
+            'StyledEditorKit.BoldAction',
+            'StyledEditorKit.FontFamilyAction',
+            'StyledEditorKit.FontSizeAction',
+            'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction',
+            'StyledEditorKit.StyledTextAction',
+            'StyledEditorKit.UnderlineAction', 'StyleSheet',
+            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
+            'SwingConstants', 'SwingPropertyChangeSupport',
+            'SwingUtilities', 'SyncFailedException',
+            'Synthesizer', 'SysexMessage', 'System',
+            'SystemColor', 'SystemException', 'SystemFlavorMap',
+            'TabableView', 'TabbedPaneUI', 'TabExpander',
+            'TableCellEditor', 'TableCellRenderer',
+            'TableColumn', 'TableColumnModel',
+            'TableColumnModelEvent', 'TableColumnModelListener',
+            'TableHeaderUI', 'TableModel', 'TableModelEvent',
+            'TableModelListener', 'TableUI', 'TableView',
+            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
+            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
+            'TextComponent', 'TextEvent', 'TextField',
+            'TextHitInfo', 'TextLayout',
+            'TextLayout.CaretPolicy', 'TextListener',
+            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
+            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
+            'Throwable', 'Tie', 'TileObserver', 'Time',
+            'TimeLimitExceededException', 'Timer', 'TimerTask',
+            'Timestamp', 'TimeZone', 'TitledBorder', 'ToolBarUI',
+            'Toolkit', 'ToolTipManager', 'ToolTipUI',
+            'TooManyListenersException', 'Track',
+            'TransactionRequiredException',
+            'TransactionRolledbackException',
+            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
+            'Transferable', 'TransformAttribute', 'TRANSIENT',
+            'Transmitter', 'Transparency', 'TreeCellEditor',
+            'TreeCellRenderer', 'TreeExpansionEvent',
+            'TreeExpansionListener', 'TreeMap', 'TreeModel',
+            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
+            'TreePath', 'TreeSelectionEvent',
+            'TreeSelectionListener', 'TreeSelectionModel',
+            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
+            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
+            'Types', 'UID', 'UIDefaults',
+            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
+            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
+            'UIManager', 'UIManager.LookAndFeelInfo',
+            'UIResource', 'ULongLongSeqHelper',
+            'ULongLongSeqHolder', 'ULongSeqHelper',
+            'ULongSeqHolder', 'UndeclaredThrowableException',
+            'UndoableEdit', 'UndoableEditEvent',
+            'UndoableEditListener', 'UndoableEditSupport',
+            'UndoManager', 'UnexpectedException',
+            'UnicastRemoteObject', 'UnionMember',
+            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
+            'UnknownException', 'UnknownGroupException',
+            'UnknownHostException', 'UnknownObjectException',
+            'UnknownServiceException', 'UnknownUserException',
+            'UnmarshalException', 'UnrecoverableKeyException',
+            'Unreferenced', 'UnresolvedPermission',
+            'UnsatisfiedLinkError', 'UnsolicitedNotification',
+            'UnsolicitedNotificationEvent',
+            'UnsolicitedNotificationListener',
+            'UnsupportedAudioFileException',
+            'UnsupportedClassVersionError',
+            'UnsupportedEncodingException',
+            'UnsupportedFlavorException',
+            'UnsupportedLookAndFeelException',
+            'UnsupportedOperationException',
+            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
+            'URL', 'URLClassLoader', 'URLConnection',
+            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
+            'URLStreamHandlerFactory', 'UserException',
+            'UShortSeqHelper', 'UShortSeqHolder',
+            'UTFDataFormatException', 'Util', 'UtilDelegate',
+            'Utilities', 'ValueBase', 'ValueBaseHelper',
+            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
+            'ValueMember', 'ValueMemberHelper',
+            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
+            'VersionSpecHelper', 'VetoableChangeListener',
+            'VetoableChangeSupport', 'View', 'ViewFactory',
+            'ViewportLayout', 'ViewportUI',
+            'VirtualMachineError', 'Visibility',
+            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
+            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
+            'VoiceStatus', 'Void', 'WCharSeqHelper',
+            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
+            'Window', 'WindowAdapter', 'WindowConstants',
+            'WindowEvent', 'WindowListener', 'WrappedPlainView',
+            'WritableRaster', 'WritableRenderedImage',
+            'WriteAbortedException', 'Writer',
+            'WrongTransaction', 'WStringValueHelper',
+            'X509Certificate', 'X509CRL', 'X509CRLEntry',
+            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
+            'ZipException', 'ZipFile', 'ZipInputStream',
+            'ZipOutputStream', 'ZoneView',
+            '_BindingIteratorImplBase', '_BindingIteratorStub',
+            '_IDLTypeStub', '_NamingContextImplBase',
+            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
+            ),
+        4 => array(
+            'boolean', 'byte', 'char', 'double', 'float', 'int', 'long',
+            'short', 'void'
+            ),
+        5 => array(
+            'allProperties', 'asImmutable', 'asSynchronized', 'collect',
+            'count', 'each', 'eachProperty', 'eachPropertyName',
+            'eachWithIndex', 'find', 'findAll', 'findIndexOf',
+            'flatten', 'get', 'grep', 'inject', 'intersect',
+            'join', 'max', 'min', 'pop', 'reverse',
+            'reverseEach', 'size', 'sort', 'subMap', 'toList'
+            ),
+        6 => array(
+            'center', 'contains', 'eachMatch', 'padLeft', 'padRight',
+            'toCharacter', 'tokenize', 'toLong', 'toURL'
+            ),
+        7 => array(
+            'append', 'eachByte', 'eachFile', 'eachFileRecurse', 'eachLine',
+            'eachLines', 'encodeBase64', 'filterLine', 'getText',
+            'splitEachLine', 'transformChar', 'transformLine',
+            'withOutputStream', 'withPrintWriter', 'withReader',
+            'withStream', 'withStreams', 'withWriter',
+            'withWriterAppend', 'write', 'writeLine'
+            ),
+        8 => array(
+            'dump', 'getLastMatcher', 'inspect', 'invokeMethod', 'print',
+            'println', 'start', 'startDaemon', 'step', 'times',
+            'upto', 'use'
+            ),
+        9 => array(
+            'call', 'close', 'eachRow', 'execute', 'executeUpdate', 'Sql'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '|', '=',
+        '=>', '||', '-', '+', '<<', '<<<', '&&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #aaaadd; font-weight: bold;',
+            4 => 'color: #993333;',
+            5 => 'color: #663399;',
+            6 => 'color: #CC0099;',
+            7 => 'color: #FFCC33;',
+            8 => 'color: #993399;',
+            9 => 'color: #993399; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1=> 'color: #808080; font-style: italic;',
+            2=> 'color: #a1a100;',
+            3=> 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAMEL}',
+        2 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAMEL}',
+        3 => 'http://www.google.de/search?as_q={FNAME}&amp;num=100&amp;hl=en&amp;as_occt=url&amp;as_sitesearch=java.sun.com%2Fj2se%2F1%2E5%2E0%2Fdocs%2Fapi%2F',
+        4 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        5 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        6 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        7 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        8 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        9 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '\\$\\{[a-zA-Z_][a-zA-Z0-9_]*\\}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/gwbasic.php b/vendor/easybook/geshi/geshi/gwbasic.php
new file mode 100755
index 000000000..ecc16341d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/gwbasic.php
@@ -0,0 +1,153 @@
+<?php
+/*************************************************************************************
+ * gwbasic.php
+ * ----------
+ * Author: José Gabriel Moya Yangüela (josemoya@gmail.com)
+ * Copyright: (c) 2010 José Gabriel Moya Yangüela (http://doc.apagada.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/01/30
+ *
+ * GwBasic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * REM was not classified as comment.
+ * APPEND and RANDOM missing.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GwBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2=> "REM"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+    /* Statements */
+        1 => array('END','FOR','NEXT','DATA','INPUT','DIM','READ','LET',
+            'GOTO','RUN','IF','RESTORE','GOSUB','RETURN','REM',
+            'STOP','PRINT','CLEAR','LIST','NEW','ON','WAIT','DEF',
+            'POKE','CONT','OUT','LPRINT','LLIST','WIDTH','ELSE',
+            'TRON','TROFF','SWAP','ERASE','EDIT','ERROR','RESUME',
+            'DELETE','AUTO','RENUM','DEFSTR','DEFINT','DEFSNG',
+            'DEFDBL','LINE','WHILE','WEND','CALL','WRITE','OPTION',
+            'RANDOMIZE','OPEN','CLOSE','LOAD','MERGE','SAVE',
+            'COLOR','CLS','MOTOR','BSAVE','BLOAD','SOUND','BEEP',
+            'PSET','PRESET','SCREEN','KEY','LOCATE','TO','THEN',
+            'STEP','USR','FN','SPC','NOT','ERL','ERR','STRING',
+            'USING','INSTR','VARPTR','CSRLIN','POINT','OFF',
+            'FILES','FIELD','SYSTEM','NAME','LSET','RSET','KILL',
+            'PUT','GET','RESET','COMMON','CHAIN','PAINT','COM',
+            'CIRCLE','DRAW','PLAY','TIMER','IOCTL','CHDIR','MKDIR',
+            'RMDIR','SHELL','VIEW','WINDOW','PMAP','PALETTE','LCOPY',
+            'CALLS','PCOPY','LOCK','UNLOCK','RANDOM','APPEND',
+            ),
+        2 => array(
+            /* Functions */
+            'CVI','CVS','CVD','MKI','MKS','MKD','ENVIRON',
+            'LEFT','RIGHT','MID','SGN','INT','ABS',
+            'SQR','SIN','LOG','EXP','COS','TAN','ATN',
+            'FRE','INP','POS','LEN','STR','VAL','ASC',
+            'CHR','PEEK','SPACE','OCT','HEX','LPOS',
+            'CINT','CSNG','CDBL','FIX','PEN','STICK',
+            'STRIG','EOF','LOC','LOF'
+            ),
+        3 => array(
+            /* alpha Operators */
+            'AND','OR','XOR','EQV','IMP','MOD'
+            ),
+        4 => array(
+            /* parameterless functions */
+            'INKEY','DATE','TIME','ERDEV','RND'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '>','=','<','+','-','*','/','^','\\'
+            ),
+        1 => array(
+            '?'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+            GESHI_COMMENTS => false,
+            1 => false,
+            2 => false,
+            3 => false,
+            4 => false
+            ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00a1a1;font-weight: bold',
+            2 => 'color: #000066;font-weight: bold',
+            3 => 'color: #00a166;font-weight: bold',
+            4 => 'color: #0066a1;font-weight: bold'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+        /* Same as KEYWORDS[3] (and, or, not...) */
+            0 => 'color: #00a166;font-weight: bold',
+            1 => 'color: #00a1a1;font-weight: bold',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #708090'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '^[0-9]+ '
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/haskell.php b/vendor/easybook/geshi/geshi/haskell.php
new file mode 100755
index 000000000..adae11168
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/haskell.php
@@ -0,0 +1,202 @@
+<?php
+/*************************************************************************************
+ * haskell.php
+ * ----------
+ * Author: Jason Dagit (dagit@codersbase.com) based on ocaml.php by Flaie (fireflaie@gmail.com)
+ * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/08/27
+ *
+ * Haskell language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/08/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Haskell',
+    'COMMENT_SINGLE' => array( 1 => '--'),
+    'COMMENT_MULTI' => array('{-' => '-}'),
+    'COMMENT_REGEXP' => array(
+        2 => "/-->/",
+        3 => "/{-(?:(?R)|.)-}/s", //Nested Comments
+        ),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"',"'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /* main haskell keywords */
+        1 => array(
+            'as',
+            'case', 'of', 'class', 'data', 'default',
+            'deriving', 'do', 'forall', 'hiding', 'if', 'then',
+            'else', 'import', 'infix', 'infixl', 'infixr',
+            'instance', 'let', 'in', 'module', 'newtype',
+            'qualified', 'type', 'where'
+            ),
+        /* define names of main librarys, so we can link to it */
+        2 => array(
+            'Foreign', 'Numeric', 'Prelude'
+            ),
+        /* just link to Prelude functions, cause it's the default opened library when starting Haskell */
+        3 => array(
+            'not', 'otherwise', 'maybe',
+            'either', 'fst', 'snd', 'curry', 'uncurry',
+            'compare',
+            'max', 'min', 'succ', 'pred', 'toEnum', 'fromEnum',
+            'enumFrom', 'enumFromThen', 'enumFromTo',
+            'enumFromThenTo', 'minBound', 'maxBound',
+            'negate', 'abs', 'signum',
+            'fromInteger', 'toRational', 'quot', 'rem',
+            'div', 'mod', 'quotRem', 'divMod', 'toInteger',
+            'recip', 'fromRational', 'pi', 'exp',
+            'log', 'sqrt', 'logBase', 'sin', 'cos',
+            'tan', 'asin', 'acos', 'atan', 'sinh', 'cosh',
+            'tanh', 'asinh', 'acosh', 'atanh',
+            'properFraction', 'truncate', 'round', 'ceiling',
+            'floor', 'floatRadix', 'floatDigits', 'floatRange',
+            'decodeFloat', 'encodeFloat', 'exponent',
+            'significand', 'scaleFloat', 'isNaN', 'isInfinite',
+            'isDenomalized', 'isNegativeZero', 'isIEEE',
+            'atan2', 'subtract', 'even', 'odd', 'gcd',
+            'lcm', 'fromIntegral', 'realToFrac',
+            'return', 'fail', 'fmap',
+            'mapM', 'mapM_', 'sequence', 'sequence_',
+            'id', 'const','flip',
+            'until', 'asTypeOf', 'error', 'undefined',
+            'seq','map','filter', 'head',
+            'last', 'tail', 'init', 'null', 'length',
+            'reverse', 'foldl', 'foldl1', 'foldr',
+            'foldr1', 'and', 'or', 'any', 'all', 'sum',
+            'product', 'concat', 'concatMap', 'maximum',
+            'minimum', 'scanl', 'scanl1', 'scanr', 'scanr1',
+            'iterate', 'repeat', 'cycle', 'take', 'drop',
+            'splitAt', 'takeWhile', 'dropWhile', 'span',
+            'break', 'elem', 'notElem', 'lookup', 'zip',
+            'zip3', 'zipWith', 'zipWith3', 'unzip', 'unzip3',
+            'lines', 'words', 'unlines',
+            'unwords', 'showPrec', 'show', 'showList',
+            'shows', 'showChar', 'showString', 'showParen',
+            'readsPrec', 'readList', 'reads', 'readParen',
+            'read', 'lex', 'putChar', 'putStr', 'putStrLn',
+            'print', 'getChar', 'getLine', 'getContents',
+            'interact', 'readFile', 'writeFile', 'appendFile',
+            'readIO', 'readLn', 'ioError', 'userError', 'catch'
+            ),
+        /* here Prelude Types */
+        4 => array (
+            'Bool', 'Maybe', 'Either', 'Ord', 'Ordering',
+            'Char', 'String', 'Eq', 'Enum', 'Bounded',
+            'Int', 'Integer', 'Float', 'Double', 'Rational',
+            'Num', 'Real', 'Integral', 'Fractional',
+            'Floating', 'RealFrac', 'RealFloat', 'Monad',
+            'Functor', 'Show', 'ShowS', 'Read', 'ReadS',
+            'IO'
+            ),
+        /* finally Prelude Exceptions */
+        5 => array (
+            'IOError', 'IOException'
+            )
+        ),
+    /* highlighting symbols is really important in Haskell */
+    'SYMBOLS' => array(
+        '|', '->', '<-', '@', '!', '::', '_', '~', '=', '?',
+        '&&', '||', '==', '/=', '<', '<=', '>',
+        '>=','+', '-', '*','/', '%', '**', '^', '^^',
+        '>>=', '>>', '=<<',  '$', '.', ',', '$!',
+        '++', '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true, /* functions name are case seinsitive */
+        3 => true, /* types name too */
+        4 => true, /* finally exceptions too */
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* blue as well */
+            3 => 'font-weight: bold;', /* make the preduled functions bold */
+            4 => 'color: #cccc00; font-weight: bold;', /* give types a different bg */
+            5 => 'color: maroon;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #5d478b; font-style: italic;',
+            2 => 'color: #339933; font-weight: bold;',
+            3 => 'color: #5d478b; font-style: italic;', /* light purple */
+            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'background-color: #3cb371; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: green;'
+            ),
+        'STRINGS' => array(
+            0 => 'background-color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: red;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Prelude functions */
+        1 => '',
+        /* link to the wanted library */
+        2 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/{FNAME}.html',
+        /* link to Prelude functions */
+        3 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#v:{FNAME}',
+        /* link to Prelude types */
+        4 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
+        /* link to Prelude exceptions */
+        5 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/haxe.php b/vendor/easybook/geshi/geshi/haxe.php
new file mode 100755
index 000000000..778637e2b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/haxe.php
@@ -0,0 +1,161 @@
+<?php
+/*************************************************************************************
+ * haxe.php
+ * --------
+ * Author: Andy Li (andy@onthewings.net)
+ *         John Liao (colorhook@gmail.com)
+ * Copyright: (c) 2012 onthewings (http://www.onthewings.net/)
+ *                2010 colorhook (http://colorhook.com/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/10/05
+ *
+ * Haxe language file for GeSHi.
+ * Haxe version: 2.10
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Haxe',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=using[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // Haxe comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            //http://haxe.org/ref/keywords
+            'break', 'callback', 'case', 'cast', 'catch', 'class', 'continue', 'default', 'do', 'dynamic',
+            'else', 'enum', 'extends', 'extern', /*'false',*/ 'for', 'function', 'here', 'if',
+            'implements', 'import', 'in', 'inline', 'interface', 'never', 'new', /*'null',*/ 'override',
+            'package', 'private', 'public', 'return', 'static', 'super', 'switch', 'this', 'throw',
+            'trace', /*'true',*/ 'try', 'typedef', 'untyped', 'using', 'var', 'while',
+            'macro', '$type',
+            ),
+        2 => array(
+            //primitive values
+            'null', 'false', 'true',
+            ),
+        3 => array(
+            //global types
+            'Array', 'ArrayAccess', /*'Bool',*/ 'Class', 'Date', 'DateTools', 'Dynamic',
+            'EReg', 'Enum', 'EnumValue', /*'Float',*/ 'Hash', /*'Int',*/ 'IntHash', 'IntIter',
+            'Iterable', 'Iterator', 'Lambda', 'List', 'Math', 'Null', 'Reflect', 'Std',
+            /*'String',*/ 'StringBuf', 'StringTools', 'Sys', 'Type', /*'UInt',*/ 'ValueType',
+            /*'Void',*/ 'Xml', 'XmlType',
+            ),
+        4 => array(
+            //primitive types
+            'Void', 'Bool', 'Int', 'Float', 'UInt', 'String',
+            ),
+        5 => array(
+            //compiler switches
+            "#if", "#elseif", "#else", "#end", "#error",
+            ),
+        ),
+    'SYMBOLS' => array(
+        //http://haxe.org/manual/operators
+        '++', '--',
+        '%',
+        '*', '/',
+        '+', '-',
+        '<<', '>>', '>>>',
+        '|', '&', '^',
+        '==', '!=', '>', '>=', '<', '<=',
+        '...',
+        '&&',
+        '||',
+        '?', ':',
+        '=', '+=', '-=', '/=', '*=', '<<=', '>>=', '>>>=', '|=', '&=', '^=',
+        '(', ')', '[', ']', '{', '}', ';',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #6699cc; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #03F; ',
+            4 => 'color: #000033; font-weight: bold;',
+            5 => 'color: #330000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #006699;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            'MULTI' => 'color: #666666; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;',
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/hicest.php b/vendor/easybook/geshi/geshi/hicest.php
new file mode 100755
index 000000000..78a2bc206
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/hicest.php
@@ -0,0 +1,108 @@
+<?php
+/*************************************************************************************
+ * hicest.php
+ * --------
+ * Author: Georg Petrich (spt@hicest.com)
+ * Copyright: (c) 2010 Georg Petrich (http://www.HicEst.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/03/15
+ *
+ * HicEst language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * yyyy/mm/dd (v.v.v.v)
+ *  -  First Release
+ *
+ * TODO (updated yyyy/mm/dd)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'HicEst',
+    'COMMENT_SINGLE' => array(1 => '!'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '$cmd_line', 'abs', 'acos', 'alarm', 'alias', 'allocate', 'appendix', 'asin', 'atan', 'axis', 'beep',
+            'call', 'ceiling', 'char', 'character', 'com', 'continue', 'cos', 'cosh', 'data', 'diffeq', 'dimension', 'dlg', 'dll',
+            'do', 'edit', 'else', 'elseif', 'end', 'enddo', 'endif', 'exp', 'floor', 'function', 'fuz', 'goto', 'iand', 'ichar',
+            'ieor', 'if', 'index', 'init', 'int', 'intpol', 'ior', 'key', 'len', 'len_trim', 'line', 'lock', 'log', 'max', 'maxloc',
+            'min', 'minloc', 'mod', 'nint', 'not', 'open', 'pop', 'ran', 'read', 'real', 'return', 'rgb', 'roots', 'sign', 'sin',
+            'sinh', 'solve', 'sort', 'subroutine', 'sum', 'system', 'tan', 'tanh', 'then', 'time', 'use', 'window', 'write', 'xeq'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '+', '-', '*', '/', '=', '<', '>', '!', '^', ':', ','
+            ),
+        2 => array(
+            '$', '$$'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;',
+            2 => 'color: #ff0000;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/hq9plus.php b/vendor/easybook/geshi/geshi/hq9plus.php
new file mode 100755
index 000000000..5b62589cc
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/hq9plus.php
@@ -0,0 +1,102 @@
+<?php
+/*************************************************************************************
+ * hq9plus.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/31
+ *
+ * HQ9+ language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'HQ9+',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        'H', 'Q', '9', '+', 'h', 'q'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a16000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'KEYWORDS' => GESHI_NEVER,
+            'COMMENTS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'REGEXPS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/html4strict.php b/vendor/easybook/geshi/geshi/html4strict.php
new file mode 100755
index 000000000..97392fa84
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/html4strict.php
@@ -0,0 +1,190 @@
+<?php
+/*************************************************************************************
+ * html4strict.php
+ * ---------------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/10
+ *
+ * HTML 4.01 strict language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/28 (1.0.4)
+ *   -  Removed escape character for strings
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added INS and DEL
+ *   -  Removed the background colour from tags' styles
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Check that only HTML4 strict attributes are highlighted
+ * * Eliminate empty tags that aren't allowed in HTML4 strict
+ * * Split to several files - html4trans, xhtml1 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'HTML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        2 => array(
+            'a', 'abbr', 'acronym', 'address', 'applet', 'area',
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+            'em',
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+            'kbd',
+            'label', 'legend', 'link', 'li',
+            'map', 'meta',
+            'noframes', 'noscript',
+            'object', 'ol', 'optgroup', 'option',
+            'param', 'pre', 'p',
+            'q',
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+            'ul', 'u',
+            'var',
+            ),
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            -2 => 'color: #404040;', // CDATA
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -2 => array(
+            '<![CDATA[' => ']]>'
+            ),
+        -1 => array(
+            '<!--' => '-->'
+            ),
+        0 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -2 => false,
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/html5.php b/vendor/easybook/geshi/geshi/html5.php
new file mode 100755
index 000000000..0d9755945
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/html5.php
@@ -0,0 +1,212 @@
+<?php
+/*************************************************************************************
+ * html5.php
+ * ---------------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/10
+ *
+ * HTML 5 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/28 (1.0.4)
+ *   -  Removed escape character for strings
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added INS and DEL
+ *   -  Removed the background colour from tags' styles
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Check that only HTML4 strict attributes are highlighted
+ * * Eliminate empty tags that aren't allowed in HTML4 strict
+ * * Split to several files - html4trans, xhtml1 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'HTML5',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        2 => array(
+            'a', 'abbr', 'address', 'article', 'area', 'aside', 'audio',
+
+            'base', 'bdo', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'cite', 'code', 'colgroup', 'col', 'canvas', 'command', 'datalist', 'details',
+
+            'dd', 'del', 'dfn', 'div', 'dl', 'dt',
+
+            'em', 'embed',
+
+            'fieldset', 'form', 'figcaption', 'figure', 'footer',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'header', 'hgroup',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd', 'keygen',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta', 'mark', 'meter',
+
+            'noscript', 'nav',
+
+            'object', 'ol', 'optgroup', 'option', 'output',
+
+            'param', 'pre', 'p', 'progress',
+
+            'q',
+
+            'rp', 'rt', 'ruby',
+
+            'samp', 'script', 'select', 'small', 'span', 'strong', 'style', 'sub', 'sup', 's', 'section', 'source', 'summary',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'time',
+
+            'ul',
+
+            'var', 'video',
+
+            'wbr',
+            ),
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis', 'autocomplete', 'autofocus',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords', 'contenteditable', 'contextmenu',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled', 'draggable', 'dropzone',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder', 'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv', 'hidden',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple', 'min', 'max',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap', 'novalidate',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onselect', 'onsubmit', 'onunload', 'onafterprint', 'onbeforeprint', 'onbeforeonload', 'onerror', 'onhaschange', 'onmessage', 'onoffline', 'ononline', 'onpagehide', 'onpageshow', 'onpopstate', 'onredo', 'onresize', 'onstorage', 'onundo', 'oncontextmenu', 'onformchange', 'onforminput', 'oninput', 'oninvalid', 'ondrag', 'ondragend', 'ondragenter', 'ondragleave', 'ondragover', 'ondragstart', 'ondrop', 'onmousewheel', 'onscroll', 'oncanplay', 'oncanplaythrough', 'ondurationchange', 'onemptied', 'onended', 'onloadeddata', 'onloadedmetadata', 'onloadstart', 'onpause', 'onplay', 'onplaying', 'onprogress', 'onratechange', 'onreadystatechange', 'onseeked', 'onseeking', 'onstalled', 'onsuspend', 'ontimeupdate', 'onvolumechange', 'onwaiting',
+            'profile', 'prompt', 'pattern', 'placeholder',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules', 'required',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary', 'spellcheck', 'step',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            -2 => 'color: #404040;', // CDATA
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -2 => array(
+            '<![CDATA[' => ']]>'
+            ),
+        -1 => array(
+            '<!--' => '-->'
+            ),
+        0 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -2 => false,
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/icon.php b/vendor/easybook/geshi/geshi/icon.php
new file mode 100755
index 000000000..06383ea5d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/icon.php
@@ -0,0 +1,212 @@
+<?php
+/*************************************************************************************
+ * icon.php
+ * --------
+ * Author: Matt Oates (mattoates@gmail.com)
+ * Copyright: (c) 2010 Matt Oates (http://mattoates.co.uk)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/04/24
+ *
+ * Icon language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/04/24 (0.0.0.2)
+ *  -  Validated with Geshi langcheck.php FAILED due to preprocessor keywords looking like symbols
+ *  -  Hard wrapped to improve readability
+ * 2010/04/20 (0.0.0.1)
+ *  -  First Release
+ *
+ * TODO (updated 2010/04/20)
+ * -------------------------
+ * - Do the &amp; need replacing with &?
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Icon',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'continue', 'create', 'default', 'do', 'else',
+            'end', 'every', 'fail', 'for', 'if', 'import', 'initial',
+            'initially', 'invocable', 'link', 'next', 'not', 'of', 'package',
+            'procedure', 'record', 'repeat', 'return', 'switch', 'suspend',
+            'then', 'to', 'until', 'while'
+            ),
+        2 => array(
+            'global', 'local', 'static'
+            ),
+        3 => array(
+            'allocated', 'ascii', 'clock', 'collections',
+            'column', 'cset', 'current', 'date', 'dateline', 'digits',
+            'dump', 'e', 'error', 'errornumber', 'errortext',
+            'errorvalue', 'errout', 'eventcode', 'eventsource', 'eventvalue',
+            'fail', 'features', 'file', 'host', 'input', 'lcase',
+            'letters', 'level', 'line', 'main', 'now', 'null',
+            'output', 'phi', 'pi', 'pos', 'progname', 'random',
+            'regions', 'source', 'storage', 'subject', 'syserr', 'time',
+            'trace', 'ucase', 'version', 'col', 'control', 'interval',
+            'ldrag', 'lpress', 'lrelease', 'mdrag', 'meta', 'mpress',
+            'mrelease', 'rdrag', 'resize', 'row', 'rpress', 'rrelease',
+            'shift', 'window', 'x', 'y'
+            ),
+        4 => array(
+            'abs', 'acos', 'any', 'args', 'asin', 'atan', 'bal', 'center', 'char',
+            'chmod', 'close', 'cofail', 'collect', 'copy', 'cos', 'cset', 'ctime', 'delay', 'delete',
+            'detab', 'display', 'dtor', 'entab', 'errorclear', 'event', 'eventmask', 'EvGet', 'exit',
+            'exp', 'fetch', 'fieldnames', 'find', 'flock', 'flush', 'function', 'get', 'getch',
+            'getche', 'getenv', 'gettimeofday', 'globalnames', 'gtime', 'iand', 'icom', 'image',
+            'insert', 'integer', 'ior', 'ishift', 'ixor', 'key', 'left', 'list', 'load', 'loadfunc',
+            'localnames', 'log', 'many', 'map', 'match', 'member', 'mkdir', 'move', 'name', 'numeric',
+            'open', 'opmask', 'ord', 'paramnames', 'parent', 'pipe', 'pop', 'pos', 'proc', 'pull',
+            'push', 'put', 'read', 'reads', 'real', 'receive', 'remove', 'rename', 'repl', 'reverse',
+            'right', 'rmdir', 'rtod', 'runerr', 'seek', 'select', 'send', 'seq', 'serial', 'set',
+            'setenv', 'sort', 'sortf', 'sql', 'sqrt', 'stat', 'stop', 'string', 'system', 'tab',
+            'table', 'tan', 'trap', 'trim', 'truncate', 'type', 'upto', 'utime', 'variable', 'where',
+            'write', 'writes'
+            ),
+        5 => array(
+            'Active', 'Alert', 'Bg', 'Clip', 'Clone', 'Color', 'ColorValue',
+            'CopyArea', 'Couple', 'DrawArc', 'DrawCircle', 'DrawCurve', 'DrawCylinder', 'DrawDisk',
+            'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon', 'DrawRectangle', 'DrawSegment',
+            'DrawSphere', 'DrawString', 'DrawTorus', 'EraseArea', 'Event', 'Fg', 'FillArc',
+            'FillCircle', 'FillPolygon', 'FillRectangle', 'Font', 'FreeColor', 'GotoRC', 'GotoXY',
+            'IdentifyMatrix', 'Lower', 'MatrixMode', 'NewColor', 'PaletteChars', 'PaletteColor',
+            'PaletteKey', 'Pattern', 'Pending', 'Pixel', 'PopMatrix', 'PushMatrix', 'PushRotate',
+            'PushScale', 'PushTranslate', 'QueryPointer', 'Raise', 'ReadImage', 'Refresh', 'Rotate',
+            'Scale', 'Texcoord', 'TextWidth', 'Texture', 'Translate', 'Uncouple', 'WAttrib',
+            'WDefault', 'WFlush', 'WindowContents', 'WriteImage', 'WSync'
+            ),
+        6 => array(
+            'define', 'include', 'ifdef', 'ifndef', 'else', 'endif', 'error',
+            'line', 'undef'
+            ),
+        7 => array(
+            '_V9', '_AMIGA', '_ACORN', '_CMS', '_MACINTOSH', '_MSDOS_386',
+            '_MS_WINDOWS_NT', '_MSDOS', '_MVS', '_OS2', '_POR', 'T', '_UNIX', '_POSIX', '_DBM',
+            '_VMS', '_ASCII', '_EBCDIC', '_CO_EXPRESSIONS', '_CONSOLE_WINDOW', '_DYNAMIC_LOADING',
+            '_EVENT_MONITOR', '_EXTERNAL_FUNCTIONS', '_KEYBOARD_FUNCTIONS', '_LARGE_INTEGERS',
+            '_MULTITASKING', '_PIPES', '_RECORD_IO', '_SYSTEM_FUNCTION', '_MESSAGING', '_GRAPHICS',
+            '_X_WINDOW_SYSTEM', '_MS_WINDOWS', '_WIN32', '_PRESENTATION_MGR', '_ARM_FUNCTIONS',
+            '_DOS_FUNCTIONS'
+            ),
+        8 => array(
+            'line'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '\\', '%', '=', '<', '>', '!', '^',
+            '&', '|', '?', ':', ';', ',', '.', '~', '@'
+            ),
+        2 => array(
+            '$(', '$)', '$<', '$>', '$'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;',
+            4 => 'color: #b1b100;',
+            5 => 'color: #b1b100;',
+            6 => 'color: #b1b100;',
+            7 => 'color: #b1b100;',
+            8 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;',
+            2 => 'color: #b1b100;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=&amp;)'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9_\"\'])",
+                'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\"\'])"
+                ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=\$)'
+                ),
+            8 => array(
+                'DISALLOWED_BEFORE' => '(?<=#)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/idl.php b/vendor/easybook/geshi/geshi/idl.php
new file mode 100755
index 000000000..a2b6f57e1
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/idl.php
@@ -0,0 +1,121 @@
+<?php
+/*************************************************************************************
+ * idl.php
+ * -------
+ * Author: Cedric Bosdonnat (cedricbosdo@openoffice.org)
+ * Copyright: (c) 2006 Cedric Bosdonnat
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/08/20
+ *
+ * Unoidl language file for GeSHi.
+ *
+ * 2006/08/20 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+
+$language_data = array (
+    'LANG_NAME' => 'Uno Idl',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'published', 'get', 'set', 'service', 'singleton', 'type', 'module', 'interface', 'struct',
+            'const', 'constants', 'exception', 'enum', 'raises', 'typedef'
+            ),
+        2 => array(
+            'bound', 'maybeambiguous', 'maybedefault', 'maybevoid', 'oneway', 'optional',
+            'readonly', 'in', 'out', 'inout', 'attribute', 'transient', 'removable'
+            ),
+        3 => array(
+            'True', 'False', 'TRUE', 'FALSE'
+            ),
+        4 => array(
+            'string', 'long', 'byte', 'hyper', 'boolean', 'any', 'char', 'double',
+            'void', 'sequence', 'unsigned'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ';', '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990078; font-weight: bold',
+            2 => 'color: #36dd1c;',
+            3 => 'color: #990078; font-weight: bold',
+            4 => 'color: #0000ec;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #3f7f5f;',
+            2 => 'color: #808080;',
+            'MULTI' => 'color: #4080ff; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #666666; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/ini.php b/vendor/easybook/geshi/geshi/ini.php
new file mode 100755
index 000000000..f0a8edeaa
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ini.php
@@ -0,0 +1,127 @@
+<?php
+/*************************************************************************************
+ * ini.php
+ * --------
+ * Author: deguix (cevo_deguix@yahoo.com.br)
+ * Copyright: (c) 2005 deguix
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/03/27
+ *
+ * INI language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/12/28 (1.0.1)
+ *   -  Removed unnecessary keyword style index
+ *   -  Added support for " strings
+ * 2005/04/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/03/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'INI',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(0 => '/^\s*;.*?$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066; font-weight:bold;',
+            1 => 'color: #000099;',
+            2 => 'color: #660066;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Section names
+        0 => '\[.+\]',
+        //Entry names
+        1 => array(
+            GESHI_SEARCH => '^(\s*)([a-zA-Z0-9_\-]+)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Entry values
+        2 => array(
+            // Evil hackery to get around GeSHi bug: <>" and ; are added so <span>s can be matched
+            // Explicit match on variable names because if a comment is before the first < of the span
+            // gets chewed up...
+            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1=',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/inno.php b/vendor/easybook/geshi/geshi/inno.php
new file mode 100755
index 000000000..192054cf1
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/inno.php
@@ -0,0 +1,210 @@
+<?php
+/*************************************************************************************
+ * Inno.php
+ * ----------
+ * Author: Thomas Klingler (hotline@theratech.de) based on delphi.php from J�rja Norbert (jnorbi@vipmail.hu)
+ * Copyright: (c) 2004 J�rja Norbert, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/07/29
+ *
+ * Inno Script language inkl. Delphi (Object Pascal) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/09/03
+ *   -  First Release
+ *
+ * TODO (updated 2005/07/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Inno',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Setup','Types','Components','Tasks','Dirs','Files','Icons','INI',
+            'InstallDelete','Languages','Messages','CustomMessage',
+            'LangOptions','Registry','RUN','UninstallDelete','UninstallRun',
+            'app','win','sys','syswow64','src','sd','pf','pf32','pf64','cf',
+            'cf32','cf64','tmp','fonts','dao','group','localappdata','sendto',
+            'userappdata','commonappdata','userdesktop','commondesktop',
+            'userdocs','commondocs','userfavorites','commonfavorites',
+            'userprograms','commonprograms','userstartmenu','commonstartmenu',
+            'userstartup','commonstartup','usertemplates','commontemplates'
+            ),
+        2 => array(
+            'nil', 'false', 'true', 'var', 'type', 'const','And', 'Array', 'As', 'Begin', 'Case', 'Class', 'Constructor', 'Destructor', 'Div', 'Do', 'DownTo', 'Else',
+            'End', 'Except', 'File', 'Finally', 'For', 'Function', 'Goto', 'If', 'Implementation', 'In', 'Inherited', 'Interface',
+            'Is', 'Mod', 'Not', 'Object', 'Of', 'On', 'Or', 'Packed', 'Procedure', 'Property', 'Raise', 'Record',
+            'Repeat', 'Set', 'Shl', 'Shr', 'Then', 'ThreadVar', 'To', 'Try', 'Unit', 'Until', 'Uses', 'While', 'With', 'Xor',
+
+            'HKCC','HKCR','HKCU','HKLM','HKU','alwaysoverwrite','alwaysskipifsameorolder','append',
+            'binary','classic','closeonexit','comparetimestamp','confirmoverwrite',
+            'createkeyifdoesntexist','createonlyiffileexists','createvalueifdoesntexist',
+            'deleteafterinstall','deletekey','deletevalue','dirifempty','dontcloseonexit',
+            'dontcopy','dontcreatekey','disablenouninstallwarning','dword','exclusive','expandsz',
+            'external','files','filesandordirs','fixed','fontisnttruetype','ignoreversion','iscustom','isreadme',
+            'modern','multisz','new','noerror','none','normal','nowait','onlyifdestfileexists',
+            'onlyifdoesntexist','onlyifnewer','overwrite','overwritereadonly','postinstall',
+            'preservestringtype','promptifolder','regserver','regtypelib','restart','restartreplace',
+            'runhidden','runmaximized','runminimized','sharedfile','shellexec','showcheckbox',
+            'skipifnotsilent','skipifsilent','silent','skipifdoesntexist',
+            'skipifsourcedoesntexist','sortfilesbyextension','unchecked','uninsalwaysuninstall',
+            'uninsclearvalue','uninsdeleteentry','uninsdeletekey','uninsdeletekeyifempty',
+            'uninsdeletesection','uninsdeletesectionifempty','uninsdeletevalue',
+            'uninsneveruninstall','useapppaths','verysilent','waituntilidle'
+            ),
+        3 => array(
+            'Abs', 'Addr', 'AnsiCompareStr', 'AnsiCompareText', 'AnsiContainsStr', 'AnsiEndsStr', 'AnsiIndexStr', 'AnsiLeftStr',
+            'AnsiLowerCase', 'AnsiMatchStr', 'AnsiMidStr', 'AnsiPos', 'AnsiReplaceStr', 'AnsiReverseString', 'AnsiRightStr',
+            'AnsiStartsStr', 'AnsiUpperCase', 'ArcCos', 'ArcSin', 'ArcTan', 'Assigned', 'BeginThread', 'Bounds', 'CelsiusToFahrenheit',
+            'ChangeFileExt', 'Chr', 'CompareStr', 'CompareText', 'Concat', 'Convert', 'Copy', 'Cos', 'CreateDir', 'CurrToStr',
+            'CurrToStrF', 'Date', 'DateTimeToFileDate', 'DateTimeToStr', 'DateToStr', 'DayOfTheMonth', 'DayOfTheWeek', 'DayOfTheYear',
+            'DayOfWeek', 'DaysBetween', 'DaysInAMonth', 'DaysInAYear', 'DaySpan', 'DegToRad', 'DeleteFile', 'DiskFree', 'DiskSize',
+            'DupeString', 'EncodeDate', 'EncodeDateTime', 'EncodeTime', 'EndOfADay', 'EndOfAMonth', 'Eof', 'Eoln', 'Exp', 'ExtractFileDir',
+            'ExtractFileDrive', 'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath', 'FahrenheitToCelsius', 'FileAge',
+            'FileDateToDateTime', 'FileExists', 'FilePos', 'FileSearch', 'FileSetDate', 'FileSize', 'FindClose', 'FindCmdLineSwitch',
+            'FindFirst', 'FindNext', 'FloatToStr', 'FloatToStrF', 'Format', 'FormatCurr', 'FormatDateTime', 'FormatFloat', 'Frac',
+            'GetCurrentDir', 'GetLastError', 'GetMem', 'High', 'IncDay', 'IncMinute', 'IncMonth', 'IncYear', 'InputBox',
+            'InputQuery', 'Int', 'IntToHex', 'IntToStr', 'IOResult', 'IsInfinite', 'IsLeapYear', 'IsMultiThread', 'IsNaN',
+            'LastDelimiter', 'Length', 'Ln', 'Lo', 'Log10', 'Low', 'LowerCase', 'Max', 'Mean', 'MessageDlg', 'MessageDlgPos',
+            'MonthOfTheYear', 'Now', 'Odd', 'Ord', 'ParamCount', 'ParamStr', 'Pi', 'Point', 'PointsEqual', 'Pos', 'Pred',
+            'Printer', 'PromptForFileName', 'PtInRect', 'RadToDeg', 'Random', 'RandomRange', 'RecodeDate', 'RecodeTime', 'Rect',
+            'RemoveDir', 'RenameFile', 'Round', 'SeekEof', 'SeekEoln', 'SelectDirectory', 'SetCurrentDir', 'Sin', 'SizeOf',
+            'Slice', 'Sqr', 'Sqrt', 'StringOfChar', 'StringReplace', 'StringToWideChar', 'StrToCurr', 'StrToDate', 'StrToDateTime',
+            'StrToFloat', 'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime', 'StuffString', 'Succ', 'Sum', 'Tan',
+            'Time', 'TimeToStr', 'Tomorrow', 'Trunc', 'UpCase', 'UpperCase', 'VarType', 'WideCharToString', 'WrapText', 'Yesterday',
+            'Append', 'AppendStr', 'Assign', 'AssignFile', 'AssignPrn', 'Beep', 'BlockRead', 'BlockWrite', 'Break',
+            'ChDir', 'Close', 'CloseFile', 'Continue', 'DateTimeToString', 'Dec', 'DecodeDate', 'DecodeDateTime',
+            'DecodeTime', 'Delete', 'Dispose', 'EndThread', 'Erase', 'Exclude', 'Exit', 'FillChar', 'Flush', 'FreeAndNil',
+            'FreeMem', 'GetDir', 'GetLocaleFormatSettings', 'Halt', 'Inc', 'Include', 'Insert', 'MkDir', 'Move', 'New',
+            'ProcessPath', 'Randomize', 'Read', 'ReadLn', 'ReallocMem', 'Rename', 'ReplaceDate', 'ReplaceTime',
+            'Reset', 'ReWrite', 'RmDir', 'RunError', 'Seek', 'SetLength', 'SetString', 'ShowMessage', 'ShowMessageFmt',
+            'ShowMessagePos', 'Str', 'Truncate', 'Val', 'Write', 'WriteLn',
+
+            'AdminPrivilegesRequired','AfterInstall','AllowCancelDuringInstall','AllowNoIcons','AllowRootDirectory','AllowUNCPath','AlwaysRestart','AlwaysShowComponentsList','AlwaysShowDirOnReadyPage','AlwaysShowGroupOnReadyPage ','AlwaysUsePersonalGroup','AppComments','AppContact','AppCopyright','AppendDefaultDirName',
+            'AppendDefaultGroupName','AppId','AppModifyPath','AppMutex','AppName','AppPublisher',
+            'AppPublisherURL','AppReadmeFile','AppSupportURL','AppUpdatesURL','AppVerName','AppVersion',
+            'Attribs','BackColor','BackColor2','BackColorDirection','BackSolid','BeforeInstall',
+            'ChangesAssociations','ChangesEnvironment','Check','CodeFile','Comment','Compression','CopyMode',
+            'CreateAppDir','CreateUninstallRegKey','DefaultDirName','DefaultGroupName',
+            'DefaultUserInfoName','DefaultUserInfoOrg','DefaultUserInfoSerial',
+            'Description','DestDir','DestName','DirExistsWarning',
+            'DisableDirPage','DisableFinishedPage',
+            'DisableProgramGroupPage','DisableReadyMemo','DisableReadyPage',
+            'DisableStartupPrompt','DiskClusterSize','DiskSliceSize','DiskSpaceMBLabel',
+            'DiskSpanning','DontMergeDuplicateFiles','EnableDirDoesntExistWarning','Encryption',
+            'Excludes','ExtraDiskSpaceRequired','Filename','Flags','FlatComponentsList','FontInstall',
+            'GroupDescription','HotKey','IconFilename','IconIndex','InfoAfterFile','InfoBeforeFile',
+            'InternalCompressLevel','Key','LanguageDetectionMethod',
+            'LicenseFile','MergeDuplicateFiles','MessagesFile','MinVersion','Name',
+            'OnlyBelowVersion','OutputBaseFilename','OutputManifestFile','OutputDir',
+            'Parameters','Password','Permissions','PrivilegesRequired','ReserveBytes',
+            'RestartIfNeededByRun','Root','RunOnceId','Section','SetupIconFile',
+            'ShowComponentSizes','ShowLanguageDialog','ShowTasksTreeLines','SlicesPerDisk',
+            'SolidCompression','Source','SourceDir','StatusMsg','Subkey',
+            'TimeStampRounding','TimeStampsInUTC','TouchDate','TouchTime','Type',
+            'UninstallDisplayIcon','UninstallDisplayName','UninstallFilesDir','UninstallIconFile',
+            'UninstallLogMode','UninstallRestartComputer','UninstallStyle','Uninstallable',
+            'UpdateUninstallLogAppName','UsePreviousAppDir','UsePreviousGroup',
+            'UsePreviousTasks','UsePreviousSetupType','UsePreviousUserInfo',
+            'UserInfoPage','UseSetupLdr','ValueData','ValueName','ValueType',
+            'VersionInfoVersion','VersionInfoCompany','VersionInfoDescription','VersionInfoTextVersion',
+            'WindowResizable','WindowShowCaption','WindowStartMaximized',
+            'WindowVisible','WizardImageBackColor','WizardImageFile','WizardImageStretch','WizardSmallImageBackColor','WizardSmallImageFile','WizardStyle','WorkingDir'
+            ),
+        4 => array(
+            'AnsiChar', 'AnsiString', 'Boolean', 'Byte', 'Cardinal', 'Char', 'Comp', 'Currency', 'Double', 'Extended',
+            'Int64', 'Integer', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PChar', 'PCurrency', 'PDateTime',
+            'PExtended', 'PInt64', 'Pointer', 'PShortString', 'PString', 'PVariant', 'PWideChar', 'PWideString',
+            'Real', 'Real48', 'ShortInt', 'ShortString', 'Single', 'SmallInt', 'String', 'TBits', 'TConvType', 'TDateTime',
+            'Text', 'TextFile', 'TFloatFormat', 'TFormatSettings', 'TList', 'TObject', 'TOpenDialog', 'TPoint',
+            'TPrintDialog', 'TRect', 'TReplaceFlags', 'TSaveDialog', 'TSearchRec', 'TStringList', 'TSysCharSet',
+            'TThreadFunc', 'Variant', 'WideChar', 'WideString', 'Word'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',/*bold Black*/
+            2 => 'color: #000000;font-style: italic;',/*Black*/
+            3 => 'color: #0000FF;',/*blue*/
+            4 => 'color: #CC0000;'/*red*/
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #33FF00; font-style: italic;',
+            'MULTI' => 'color: #33FF00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/intercal.php b/vendor/easybook/geshi/geshi/intercal.php
new file mode 100755
index 000000000..3c81b81cc
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/intercal.php
@@ -0,0 +1,122 @@
+<?php
+/*************************************************************************************
+ * intercal.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/31
+ *
+ * INTERCAL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'INTERCAL',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //Politeness
+        1 => array(
+            'DO', 'DOES', 'DONT', 'DON\'T', 'NOT', 'PLEASE', 'PLEASENT', 'PLEASEN\'T', 'MAYBE'
+            ),
+        //Statements
+        2 => array(
+            'STASH', 'RETRIEVE', 'NEXT', 'RESUME', 'FORGET', 'ABSTAIN', 'ABSTAINING',
+            'COME', 'FROM', 'CALCULATING', 'REINSTATE', 'IGNORE', 'REMEMBER',
+            'WRITE', 'IN', 'READ', 'OUT', 'GIVE', 'UP'
+            )
+        ),
+    'SYMBOLS' => array(
+        '.', ',', ':', ';', '#',
+        '~', '$', '&', '?',
+        '\'', '"', '<-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #000080; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '^\(\d+\)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'COMMENTS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/io.php b/vendor/easybook/geshi/geshi/io.php
new file mode 100755
index 000000000..d23984e8f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/io.php
@@ -0,0 +1,136 @@
+<?php
+/*************************************************************************************
+ * io.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2006 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/09/23
+ *
+ * Io language file for GeSHi. Thanks to Johnathan Wright for the suggestion and help
+ * with this language :)
+ *
+ * CHANGES
+ * -------
+ * 2006/09/23(1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Io',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'and', 'break', 'else', 'elseif', 'exit', 'for', 'foreach', 'if', 'ifFalse', 'ifNil',
+            'ifTrue', 'or', 'pass', 'raise', 'return', 'then', 'try', 'wait', 'while', 'yield'
+            ),
+        2 => array(
+            'activate', 'activeCoroCount', 'asString', 'block', 'catch', 'clone', 'collectGarbage',
+            'compileString', 'continue', 'do', 'doFile', 'doMessage', 'doString', 'forward',
+            'getSlot', 'getenv', 'hasSlot', 'isActive', 'isNil', 'isResumable', 'list', 'message',
+            'method', 'parent', 'pause', 'perform', 'performWithArgList', 'print', 'proto',
+            'raiseResumable', 'removeSlot', 'resend', 'resume', 'schedulerSleepSeconds', 'self',
+            'sender', 'setSchedulerSleepSeconds', 'setSlot', 'shallowCopy', 'slotNames', 'super',
+            'system', 'thisBlock', 'thisContext', 'thisMessage', 'type', 'uniqueId', 'updateSlot',
+            'write'
+            ),
+        3 => array(
+            'Array', 'AudioDevice', 'AudioMixer', 'Block', 'Box', 'Buffer', 'CFunction', 'CGI',
+            'Color', 'Curses', 'DBM', 'DNSResolver', 'DOConnection', 'DOProxy', 'DOServer',
+            'Date', 'Directory', 'Duration', 'DynLib', 'Error', 'Exception', 'FFT', 'File',
+            'Fnmatch', 'Font', 'Future', 'GL', 'GLE', 'GLScissor', 'GLU', 'GLUCylinder',
+            'GLUQuadric', 'GLUSphere', 'GLUT', 'Host', 'Image', 'Importer', 'LinkList', 'List',
+            'Lobby', 'Locals', 'MD5', 'MP3Decoder', 'MP3Encoder', 'Map', 'Message', 'Movie',
+            'NULL', 'Nil', 'Nop', 'Notifiction', 'Number', 'Object', 'OpenGL', 'Point', 'Protos',
+            'Regex', 'SGMLTag', 'SQLite', 'Server', 'ShowMessage', 'SleepyCat', 'SleepyCatCursor',
+            'Socket', 'SocketManager', 'Sound', 'Soup', 'Store', 'String', 'Tree', 'UDPSender',
+            'UDPReceiver', 'URL', 'User', 'Warning', 'WeakLink'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/ispfpanel.php b/vendor/easybook/geshi/geshi/ispfpanel.php
new file mode 100644
index 000000000..c02897850
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ispfpanel.php
@@ -0,0 +1,165 @@
+<?php
+/*************************************************************************************
+ * ispfpanel.php
+ * -------------
+ * Author: Ramesh Vishveshwar (ramesh.vishveshwar@gmail.com)
+ * Copyright: (c) 2012 Ramesh Vishveshwar (http://thecodeisclear.in)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/09/18
+ *
+ * ISPF Panel Definition (MVS) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/09/22 (1.0.0)
+ *   -  First Release
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ISPF Panel',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        // Panel Definition Statements
+        1 => array(
+            ')CCSID',')PANEL',')ATTR',')ABC',')ABCINIT',')ABCPROC',')BODY',')MODEL',
+            ')AREA',')INIT',')REINIT',')PROC',')FIELD',')HELP',')LIST',')PNTS',')END'
+            ),
+        // File-Tailoring Skeletons
+        2 => array (
+            ')DEFAULT',')BLANK', ')CM', ')DO', ')DOT', ')ELSE', ')ENDSEL',
+            ')ENDDO', ')ENDDOT', ')IF', ')IM', ')ITERATE', ')LEAVE', ')NOP', ')SEL',
+            ')SET', ')TB', ')TBA'
+            ),
+        // Control Variables
+        3 => array (
+            '.ALARM','.ATTR','.ATTRCHAR','.AUTOSEL','.CSRPOS','.CSRROW','.CURSOR','.HELP',
+            '.HHELP','.KANA','.MSG','.NRET','.PFKEY','.RESP','.TRAIL','.ZVARS'
+            ),
+        // Keywords
+        4 => array (
+            'WINDOW','ALARM','ATTN','BARRIER','HILITE','CAPS',
+            'CKBOX','CLEAR','CMD','COLOR','COMBO','CSRGRP','CUADYN',
+            'SKIP','INTENS','AREA','EXTEND',
+            'DESC','ASIS','VGET','VPUT','JUST','BATSCRD','BATSCRW',
+            'BDBCS','BDISPMAX','BIT','BKGRND','BREDIMAX','PAD','PADC',
+            'PAS','CHINESES','CHINESET','DANISH','DATAMOD','DDLIST',
+            'DEPTH','DUMP','ENGLISH','ERROR','EXIT','EXPAND','FIELD',
+            'FORMAT','FRENCH','GE','GERMAN','IMAGE','IND','TYPE',
+            'ITALIAN','JAPANESE','KOREAN','LCOL','LEN','LIND','LISTBOX',
+            'MODE','NEST','NOJUMP','NOKANA','NUMERIC','OUTLINE','PARM',
+            'PGM','PORTUGESE','RADIO','RCOL','REP','RIND','ROWS',
+            'SCALE','SCROLL','SFIHDR','SGERMAN','SIND','SPANISH',
+            'UPPERENG','WIDTH'
+            ),
+        // Parameters
+        5 => array (
+            'ADDPOP','ALPHA','ALPHAB','DYNAMIC','SCRL',
+            'CCSID','COMMAND','DSNAME','DSNAMEF','DSNAMEFM',
+            'DSNAMEPQ','DSNAMEQ','EBCDIC','ENBLDUMP','ENUM',// 'EXTEND',
+            'FI','FILEID','FRAME','GUI','GUISCRD','GUISCRW','HEX',
+            'HIGH','IDATE','IN','INCLUDE','INPUT','ITIME','JDATE',
+            'JSTD','KEYLIST','LANG','LEFT','LIST','LISTV','LISTVX',
+            'LISTX','LMSG','LOGO','LOW','MIX','NAME','NAMEF','NB',
+            'NEWAPPL','NEWPOOL','NOCHECK','NOLOGO','NON','NONBLANK',
+            'NULLS','NUM','OFF','ON','OPT','OUT','OUTPUT','PANEL',
+            /* 'PGM',*/'PICT','PICTN','POSITION','TBDISPL','PROFILE',
+            'QUERY','RANGE','REVERSE','RIGHT','SHARED','SMSG',
+            'STDDATE','STDTIME','TERMSTAT','TERMTRAC','TEST',
+            'TESTX','TEXT','TRACE','TRACEX','USCORE','USER',
+            'USERMOD','WSCMD','WSCMDV'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(',')','=','&',',','*','#','+','&','%','_','-','@','!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'BKGROUND' => 'background-color: #000000; color: #00FFFF;',
+        'KEYWORDS' => array(
+            1 => 'color: #FF0000;',
+            2 => 'color: #21A502;',
+            3 => 'color: #FF00FF;',
+            4 => 'color: #876C00;',
+            5 => 'color: #00FF00;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #002EB8; font-style: italic;',
+            //1 => 'color: #002EB8; font-style: italic;',
+            //2 => 'color: #002EB8; font-style: italic;',
+            'MULTI' => 'color: #002EB8; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF7400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #700000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF6633;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF7400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #6B1F6B;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        // Variables Defined in the Panel
+        0 => '&amp;[a-zA-Z]{1,8}[0-9]{0,}',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/j.php b/vendor/easybook/geshi/geshi/j.php
new file mode 100755
index 000000000..fe8cb11a6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/j.php
@@ -0,0 +1,188 @@
+<?php
+/*************************************************************************************
+ * j.php
+ * --------
+ * Author: Ric Sherlock (tikkanz@gmail.com)
+ * Copyright: (c) 2009 Ric Sherlock
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/11/10
+ *
+ * J language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *  2010/07/18 (1.0.8.10)
+ *   - Infinity and negative infinity recognized as numbers
+ *  2010/03/01 (1.0.8.8)
+ *   - Add support for label_xyz. and goto_xyz.
+ *   - Fix highlighting of for_i.
+ *   - Use alternative method for highlighting for_xyz. construct
+ *  2010/02/14 (1.0.8.7)
+ *   - Add support for primitives
+ *  2010/01/12 (1.0.2)
+ *   - Use HARDQUOTE for strings
+ *   - Highlight open quotes/incomplete strings
+ *   - Highlight multi-line comments that use Note
+ *   - Refinements for NUMBERS and Argument keywords
+ *   - Highlight infinity and neg. infinity using REGEXPS
+ *   - Highlight "for_myvar." style Control keyword using REGEXPS
+ *  2009/12/14 (1.0.1)
+ *   -  Regex for NUMBERS, SYMBOLS for () and turn off BRACKETS
+ *  2009/11/12 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2010/01/27)
+ * -------------------------
+ *  * combine keyword categories by using conditional regex statement in PARSER CONTROL?
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'J',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => '/(?<!\w)NB\..*?$/m',                //singleline comments NB.
+        2 => '/(?<=\bNote\b).*?$\s+\)(?:(?!\n)\s)*$/sm',   //multiline comments in Note
+        3 => "/'[^']*?$/m"                        //incomplete strings/open quotes
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'"),
+    'HARDCHAR' => "'",
+    'NUMBERS' => array(
+        0 => '\b(?:_?\d+(?:\.\d+)?(?:x|[bejprx]_?[\da-z]+(?:\.[\da-z]+)?)?|__?)(?![\w\.\:])',
+        ),
+    'KEYWORDS' => array(
+        //Control words
+        1 => array(
+            'assert.', 'break.', 'case.', 'catch.', 'catcht.', 'continue.', 'do.',
+            'else.', 'elseif.', 'end.', 'fcase.', 'for.', 'goto.', 'if.', 'label.',
+            'return.', 'select.', 'throw.', 'trap.', 'try.', 'while.', 'whilst.'
+            ),
+        //Arguments
+        2 => array(
+            'm', 'n', 'u', 'v', 'x', 'y'
+            ),
+        ),
+    'SYMBOLS' => array(
+        //Punctuation
+        0 => array(
+            '(', ')'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        //6 => true,
+        //7 => true,
+        //8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #0000cc; font-weight: bold;',
+            //6 => 'color: #000000; font-weight: bold;',
+            //7 => 'color: #000000; font-weight: bold;',
+            //8 => 'color: #000000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic; font-weight: bold;',
+            3 => 'color: #ff00ff; ',                      //open quote
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            'HARD' => 'font-weight: bold;',
+            0 => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            'HARD' => 'color: #ff0000;',
+            0 => 'color: #ff0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #009999; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;',   //for_xyz. - same as kw1
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '', //'http://www.jsoftware.com/help/dictionary/ctrl.htm',
+        2 => '',
+        //6 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
+        //7 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
+        //8 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => '\b(for|goto|label)_[a-zA-Z]\w*\.',   //for_xyz. - should be kw1
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            ),
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '#[\d_]#',            // underscore is valid number
+            ),
+        'KEYWORDS' => array(
+            //Control words
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)',
+                'DISALLOWED_AFTER' => '(?![\w\.\:])',
+                ),
+            //Primtives starting with a symbol (except . or :)
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?!K)',    // effect should be to allow anything
+                'DISALLOWED_AFTER' => '(?=.*)',
+                ),
+            //Primtives starting with a letter
+            7 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)',
+                'DISALLOWED_AFTER' => '(?=.*)',
+                ),
+            //Primtives starting with symbol . or :
+            8 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)',
+                'DISALLOWED_AFTER' => '(?=.*)',
+                ),
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/java.php b/vendor/easybook/geshi/geshi/java.php
new file mode 100755
index 000000000..f384c4d84
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/java.php
@@ -0,0 +1,981 @@
+<?php
+/*************************************************************************************
+ * java.php
+ * --------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/10
+ *
+ * Java language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/25 (1.0.7.22)
+ *   -  Added highlighting of import and package directives as non-OOP
+ * 2005/12/28 (1.0.4)
+ *   -  Added instanceof keyword
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/08/05 (1.0.2)
+ *   -  Added URL support
+ *   -  Added keyword "this", as bugs in GeSHi class ironed out
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ *   -  Added extra missed keywords
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Compact the class names like the first few have been
+ *   and eliminate repeats
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Java',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // javadoc comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'for', 'foreach', 'if', 'else', 'while', 'do',
+            'switch', 'case',  'return', 'public',
+            'private', 'protected', 'extends', 'break', 'class',
+            'new', 'try', 'catch', 'throws', 'finally', 'implements',
+            'interface', 'throw', 'final', 'native', 'synchronized', 'this',
+            'abstract', 'transient', 'instanceof', 'assert', 'continue',
+            'default', 'enum', 'package', 'static', 'strictfp', 'super',
+            'volatile', 'const', 'goto', 'import'
+            ),
+        2 => array(
+            'null', 'false', 'true'
+            ),
+        3 => array(
+            'AbstractAction', 'AbstractBorder', 'AbstractButton',
+            'AbstractCellEditor', 'AbstractCollection',
+            'AbstractColorChooserPanel', 'AbstractDocument',
+            'AbstractDocument.AttributeContext',
+            'AbstractDocument.Content',
+            'AbstractDocument.ElementEdit',
+            'AbstractLayoutCache',
+            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
+            'AbstractListModel', 'AbstractMap',
+            'AbstractMethodError', 'AbstractSequentialList',
+            'AbstractSet', 'AbstractTableModel',
+            'AbstractUndoableEdit', 'AbstractWriter',
+            'AccessControlContext', 'AccessControlException',
+            'AccessController', 'AccessException', 'Accessible',
+            'AccessibleAction', 'AccessibleBundle',
+            'AccessibleComponent', 'AccessibleContext',
+            'AccessibleHyperlink', 'AccessibleHypertext',
+            'AccessibleIcon', 'AccessibleObject',
+            'AccessibleRelation', 'AccessibleRelationSet',
+            'AccessibleResourceBundle', 'AccessibleRole',
+            'AccessibleSelection', 'AccessibleState',
+            'AccessibleStateSet', 'AccessibleTable',
+            'AccessibleTableModelChange', 'AccessibleText',
+            'AccessibleValue', 'Acl', 'AclEntry',
+            'AclNotFoundException', 'Action', 'ActionEvent',
+            'ActionListener', 'ActionMap', 'ActionMapUIResource',
+            'Activatable', 'ActivateFailedException',
+            'ActivationDesc', 'ActivationException',
+            'ActivationGroup', 'ActivationGroupDesc',
+            'ActivationGroupDesc.CommandEnvironment',
+            'ActivationGroupID', 'ActivationID',
+            'ActivationInstantiator', 'ActivationMonitor',
+            'ActivationSystem', 'Activator', 'ActiveEvent',
+            'Adjustable', 'AdjustmentEvent',
+            'AdjustmentListener', 'Adler32', 'AffineTransform',
+            'AffineTransformOp', 'AlgorithmParameterGenerator',
+            'AlgorithmParameterGeneratorSpi',
+            'AlgorithmParameters', 'AlgorithmParameterSpec',
+            'AlgorithmParametersSpi', 'AllPermission',
+            'AlphaComposite', 'AlreadyBound',
+            'AlreadyBoundException', 'AlreadyBoundHelper',
+            'AlreadyBoundHolder', 'AncestorEvent',
+            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
+            'AnySeqHelper', 'AnySeqHolder', 'Applet',
+            'AppletContext', 'AppletInitializer', 'AppletStub',
+            'ApplicationException', 'Arc2D', 'Arc2D.Double',
+            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
+            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
+            'ArithmeticException', 'Array',
+            'ArrayIndexOutOfBoundsException', 'ArrayList',
+            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
+            'Attribute', 'AttributedCharacterIterator',
+            'AttributedCharacterIterator.Attribute',
+            'AttributedString', 'AttributeInUseException',
+            'AttributeList', 'AttributeModificationException',
+            'Attributes', 'Attributes.Name', 'AttributeSet',
+            'AttributeSet.CharacterAttribute',
+            'AttributeSet.ColorAttribute',
+            'AttributeSet.FontAttribute',
+            'AttributeSet.ParagraphAttribute', 'AudioClip',
+            'AudioFileFormat', 'AudioFileFormat.Type',
+            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
+            'AudioFormat.Encoding', 'AudioInputStream',
+            'AudioPermission', 'AudioSystem',
+            'AuthenticationException',
+            'AuthenticationNotSupportedException',
+            'Authenticator', 'Autoscroll', 'AWTError',
+            'AWTEvent', 'AWTEventListener',
+            'AWTEventMulticaster', 'AWTException',
+            'AWTPermission', 'BadKind', 'BadLocationException',
+            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
+            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
+            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
+            'BandedSampleModel', 'BasicArrowButton',
+            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
+            'BasicBorders.ButtonBorder',
+            'BasicBorders.FieldBorder',
+            'BasicBorders.MarginBorder',
+            'BasicBorders.MenuBarBorder',
+            'BasicBorders.RadioButtonBorder',
+            'BasicBorders.SplitPaneBorder',
+            'BasicBorders.ToggleButtonBorder',
+            'BasicButtonListener', 'BasicButtonUI',
+            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
+            'BasicColorChooserUI', 'BasicComboBoxEditor',
+            'BasicComboBoxEditor.UIResource',
+            'BasicComboBoxRenderer',
+            'BasicComboBoxRenderer.UIResource',
+            'BasicComboBoxUI', 'BasicComboPopup',
+            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
+            'BasicDirectoryModel', 'BasicEditorPaneUI',
+            'BasicFileChooserUI', 'BasicGraphicsUtils',
+            'BasicHTML', 'BasicIconFactory',
+            'BasicInternalFrameTitlePane',
+            'BasicInternalFrameUI', 'BasicLabelUI',
+            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
+            'BasicMenuItemUI', 'BasicMenuUI',
+            'BasicOptionPaneUI',
+            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
+            'BasicPasswordFieldUI', 'BasicPermission',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
+            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
+            'BasicRadioButtonUI', 'BasicRootPaneUI',
+            'BasicScrollBarUI', 'BasicScrollPaneUI',
+            'BasicSeparatorUI', 'BasicSliderUI',
+            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
+            'BasicStroke', 'BasicTabbedPaneUI',
+            'BasicTableHeaderUI', 'BasicTableUI',
+            'BasicTextAreaUI', 'BasicTextFieldUI',
+            'BasicTextPaneUI', 'BasicTextUI',
+            'BasicTextUI.BasicCaret',
+            'BasicTextUI.BasicHighlighter',
+            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
+            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
+            'BasicViewportUI', 'BatchUpdateException',
+            'BeanContext', 'BeanContextChild',
+            'BeanContextChildComponentProxy',
+            'BeanContextChildSupport',
+            'BeanContextContainerProxy', 'BeanContextEvent',
+            'BeanContextMembershipEvent',
+            'BeanContextMembershipListener', 'BeanContextProxy',
+            'BeanContextServiceAvailableEvent',
+            'BeanContextServiceProvider',
+            'BeanContextServiceProviderBeanInfo',
+            'BeanContextServiceRevokedEvent',
+            'BeanContextServiceRevokedListener',
+            'BeanContextServices', 'BeanContextServicesListener',
+            'BeanContextServicesSupport',
+            'BeanContextServicesSupport.BCSSServiceProvider',
+            'BeanContextSupport',
+            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
+            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
+            'BigInteger', 'BinaryRefAddr', 'BindException',
+            'Binding', 'BindingHelper', 'BindingHolder',
+            'BindingIterator', 'BindingIteratorHelper',
+            'BindingIteratorHolder', 'BindingIteratorOperations',
+            'BindingListHelper', 'BindingListHolder',
+            'BindingType', 'BindingTypeHelper',
+            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
+            'Book', 'Boolean', 'BooleanControl',
+            'BooleanControl.Type', 'BooleanHolder',
+            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
+            'BorderFactory', 'BorderLayout', 'BorderUIResource',
+            'BorderUIResource.BevelBorderUIResource',
+            'BorderUIResource.CompoundBorderUIResource',
+            'BorderUIResource.EmptyBorderUIResource',
+            'BorderUIResource.EtchedBorderUIResource',
+            'BorderUIResource.LineBorderUIResource',
+            'BorderUIResource.MatteBorderUIResource',
+            'BorderUIResource.TitledBorderUIResource',
+            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
+            'BoxedValueHelper', 'BoxLayout', 'BoxView',
+            'BreakIterator', 'BufferedImage',
+            'BufferedImageFilter', 'BufferedImageOp',
+            'BufferedInputStream', 'BufferedOutputStream',
+            'BufferedReader', 'BufferedWriter', 'Button',
+            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
+            'ByteArrayInputStream', 'ByteArrayOutputStream',
+            'ByteHolder', 'ByteLookupTable', 'Calendar',
+            'CallableStatement', 'CannotProceed',
+            'CannotProceedException', 'CannotProceedHelper',
+            'CannotProceedHolder', 'CannotRedoException',
+            'CannotUndoException', 'Canvas', 'CardLayout',
+            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
+            'CellEditorListener', 'CellRendererPane',
+            'Certificate', 'Certificate.CertificateRep',
+            'CertificateEncodingException',
+            'CertificateException',
+            'CertificateExpiredException', 'CertificateFactory',
+            'CertificateFactorySpi',
+            'CertificateNotYetValidException',
+            'CertificateParsingException',
+            'ChangedCharSetException', 'ChangeEvent',
+            'ChangeListener', 'Character', 'Character.Subset',
+            'Character.UnicodeBlock', 'CharacterIterator',
+            'CharArrayReader', 'CharArrayWriter',
+            'CharConversionException', 'CharHolder',
+            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
+            'CheckboxGroup', 'CheckboxMenuItem',
+            'CheckedInputStream', 'CheckedOutputStream',
+            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
+            'ClassCastException', 'ClassCircularityError',
+            'ClassDesc', 'ClassFormatError', 'ClassLoader',
+            'ClassNotFoundException', 'Clip', 'Clipboard',
+            'ClipboardOwner', 'Clob', 'Cloneable',
+            'CloneNotSupportedException', 'CMMException',
+            'CodeSource', 'CollationElementIterator',
+            'CollationKey', 'Collator', 'Collection',
+            'Collections', 'Color',
+            'ColorChooserComponentFactory', 'ColorChooserUI',
+            'ColorConvertOp', 'ColorModel',
+            'ColorSelectionModel', 'ColorSpace',
+            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
+            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
+            'COMM_FAILURE', 'Comparable', 'Comparator',
+            'Compiler', 'CompletionStatus',
+            'CompletionStatusHelper', 'Component',
+            'ComponentAdapter', 'ComponentColorModel',
+            'ComponentEvent', 'ComponentInputMap',
+            'ComponentInputMapUIResource', 'ComponentListener',
+            'ComponentOrientation', 'ComponentSampleModel',
+            'ComponentUI', 'ComponentView', 'Composite',
+            'CompositeContext', 'CompositeName', 'CompositeView',
+            'CompoundBorder', 'CompoundControl',
+            'CompoundControl.Type', 'CompoundEdit',
+            'CompoundName', 'ConcurrentModificationException',
+            'ConfigurationException', 'ConnectException',
+            'ConnectIOException', 'Connection', 'Constructor', 'Container',
+            'ContainerAdapter', 'ContainerEvent',
+            'ContainerListener', 'ContentHandler',
+            'ContentHandlerFactory', 'ContentModel', 'Context',
+            'ContextList', 'ContextNotEmptyException',
+            'ContextualRenderedImageFactory', 'Control',
+            'Control.Type', 'ControlFactory',
+            'ControllerEventListener', 'ConvolveOp', 'CRC32',
+            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
+            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
+            'CubicCurve2D', 'CubicCurve2D.Double',
+            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
+            'CurrentHolder', 'CurrentOperations', 'Cursor',
+            'Customizer', 'CustomMarshal', 'CustomValue',
+            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
+            'DataBufferInt', 'DataBufferShort',
+            'DataBufferUShort', 'DataFlavor',
+            'DataFormatException', 'DatagramPacket',
+            'DatagramSocket', 'DatagramSocketImpl',
+            'DatagramSocketImplFactory', 'DataInput',
+            'DataInputStream', 'DataLine', 'DataLine.Info',
+            'DataOutput', 'DataOutputStream',
+            'DataTruncation', 'DATA_CONVERSION', 'Date',
+            'DateFormat', 'DateFormatSymbols', 'DebugGraphics',
+            'DecimalFormat', 'DecimalFormatSymbols',
+            'DefaultBoundedRangeModel', 'DefaultButtonModel',
+            'DefaultCaret', 'DefaultCellEditor',
+            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
+            'DefaultDesktopManager', 'DefaultEditorKit',
+            'DefaultEditorKit.BeepAction',
+            'DefaultEditorKit.CopyAction',
+            'DefaultEditorKit.CutAction',
+            'DefaultEditorKit.DefaultKeyTypedAction',
+            'DefaultEditorKit.InsertBreakAction',
+            'DefaultEditorKit.InsertContentAction',
+            'DefaultEditorKit.InsertTabAction',
+            'DefaultEditorKit.PasteAction,',
+            'DefaultFocusManager', 'DefaultHighlighter',
+            'DefaultHighlighter.DefaultHighlightPainter',
+            'DefaultListCellRenderer',
+            'DefaultListCellRenderer.UIResource',
+            'DefaultListModel', 'DefaultListSelectionModel',
+            'DefaultMenuLayout', 'DefaultMetalTheme',
+            'DefaultMutableTreeNode',
+            'DefaultSingleSelectionModel',
+            'DefaultStyledDocument',
+            'DefaultStyledDocument.AttributeUndoableEdit',
+            'DefaultStyledDocument.ElementSpec',
+            'DefaultTableCellRenderer',
+            'DefaultTableCellRenderer.UIResource',
+            'DefaultTableColumnModel', 'DefaultTableModel',
+            'DefaultTextUI', 'DefaultTreeCellEditor',
+            'DefaultTreeCellRenderer', 'DefaultTreeModel',
+            'DefaultTreeSelectionModel', 'DefinitionKind',
+            'DefinitionKindHelper', 'Deflater',
+            'DeflaterOutputStream', 'Delegate', 'DesignMode',
+            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
+            'DGC', 'Dialog', 'Dictionary', 'DigestException',
+            'DigestInputStream', 'DigestOutputStream',
+            'Dimension', 'Dimension2D', 'DimensionUIResource',
+            'DirContext', 'DirectColorModel', 'DirectoryManager',
+            'DirObjectFactory', 'DirStateFactory',
+            'DirStateFactory.Result', 'DnDConstants', 'Document',
+            'DocumentEvent', 'DocumentEvent.ElementChange',
+            'DocumentEvent.EventType', 'DocumentListener',
+            'DocumentParser', 'DomainCombiner', 'DomainManager',
+            'DomainManagerOperations', 'Double', 'DoubleHolder',
+            'DoubleSeqHelper', 'DoubleSeqHolder',
+            'DragGestureEvent', 'DragGestureListener',
+            'DragGestureRecognizer', 'DragSource',
+            'DragSourceContext', 'DragSourceDragEvent',
+            'DragSourceDropEvent', 'DragSourceEvent',
+            'DragSourceListener', 'Driver', 'DriverManager',
+            'DriverPropertyInfo', 'DropTarget',
+            'DropTarget.DropTargetAutoScroller',
+            'DropTargetContext', 'DropTargetDragEvent',
+            'DropTargetDropEvent', 'DropTargetEvent',
+            'DropTargetListener', 'DSAKey',
+            'DSAKeyPairGenerator', 'DSAParameterSpec',
+            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
+            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
+            'DTDConstants', 'DynamicImplementation', 'DynAny',
+            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
+            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
+            'Element', 'ElementIterator', 'Ellipse2D',
+            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
+            'EmptyStackException', 'EncodedKeySpec', 'Entity',
+            'EnumControl', 'EnumControl.Type', 'Enumeration',
+            'Environment', 'EOFException', 'Error',
+            'EtchedBorder', 'Event', 'EventContext',
+            'EventDirContext', 'EventListener',
+            'EventListenerList', 'EventObject', 'EventQueue',
+            'EventSetDescriptor', 'Exception',
+            'ExceptionInInitializerError', 'ExceptionList',
+            'ExpandVetoException', 'ExportException',
+            'ExtendedRequest', 'ExtendedResponse',
+            'Externalizable', 'FeatureDescriptor', 'Field',
+            'FieldNameHelper', 'FieldPosition', 'FieldView',
+            'File', 'FileChooserUI', 'FileDescriptor',
+            'FileDialog', 'FileFilter',
+            'FileInputStream', 'FilenameFilter', 'FileNameMap',
+            'FileNotFoundException', 'FileOutputStream',
+            'FilePermission', 'FileReader', 'FileSystemView',
+            'FileView', 'FileWriter', 'FilteredImageSource',
+            'FilterInputStream', 'FilterOutputStream',
+            'FilterReader', 'FilterWriter',
+            'FixedHeightLayoutCache', 'FixedHolder',
+            'FlatteningPathIterator', 'FlavorMap', 'Float',
+            'FloatControl', 'FloatControl.Type', 'FloatHolder',
+            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
+            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
+            'FocusEvent', 'FocusListener', 'FocusManager',
+            'Font', 'FontFormatException', 'FontMetrics',
+            'FontRenderContext', 'FontUIResource', 'Format',
+            'FormatConversionProvider', 'FormView', 'Frame',
+            'FREE_MEM', 'GapContent', 'GeneralPath',
+            'GeneralSecurityException', 'GlyphJustificationInfo',
+            'GlyphMetrics', 'GlyphVector', 'GlyphView',
+            'GlyphView.GlyphPainter', 'GradientPaint',
+            'GraphicAttribute', 'Graphics', 'Graphics2D',
+            'GraphicsConfigTemplate', 'GraphicsConfiguration',
+            'GraphicsDevice', 'GraphicsEnvironment',
+            'GrayFilter', 'GregorianCalendar',
+            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
+            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
+            'GZIPOutputStream', 'HasControls', 'HashMap',
+            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
+            'HierarchyBoundsListener', 'HierarchyEvent',
+            'HierarchyListener', 'Highlighter',
+            'Highlighter.Highlight',
+            'Highlighter.HighlightPainter', 'HTML',
+            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
+            'HTMLDocument', 'HTMLDocument.Iterator',
+            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
+            'HTMLEditorKit.HTMLTextAction',
+            'HTMLEditorKit.InsertHTMLTextAction',
+            'HTMLEditorKit.LinkController',
+            'HTMLEditorKit.Parser',
+            'HTMLEditorKit.ParserCallback',
+            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
+            'HttpURLConnection', 'HyperlinkEvent',
+            'HyperlinkEvent.EventType', 'HyperlinkListener',
+            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
+            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
+            'IconView', 'IdentifierHelper', 'Identity',
+            'IdentityScope', 'IDLEntity', 'IDLType',
+            'IDLTypeHelper', 'IDLTypeOperations',
+            'IllegalAccessError', 'IllegalAccessException',
+            'IllegalArgumentException',
+            'IllegalComponentStateException',
+            'IllegalMonitorStateException',
+            'IllegalPathStateException', 'IllegalStateException',
+            'IllegalThreadStateException', 'Image',
+            'ImageConsumer', 'ImageFilter',
+            'ImageGraphicAttribute', 'ImageIcon',
+            'ImageObserver', 'ImageProducer',
+            'ImagingOpException', 'IMP_LIMIT',
+            'IncompatibleClassChangeError',
+            'InconsistentTypeCode', 'IndexColorModel',
+            'IndexedPropertyDescriptor',
+            'IndexOutOfBoundsException', 'IndirectionException',
+            'InetAddress', 'Inflater', 'InflaterInputStream',
+            'InheritableThreadLocal', 'InitialContext',
+            'InitialContextFactory',
+            'InitialContextFactoryBuilder', 'InitialDirContext',
+            'INITIALIZE', 'Initializer', 'InitialLdapContext',
+            'InlineView', 'InputContext', 'InputEvent',
+            'InputMap', 'InputMapUIResource', 'InputMethod',
+            'InputMethodContext', 'InputMethodDescriptor',
+            'InputMethodEvent', 'InputMethodHighlight',
+            'InputMethodListener', 'InputMethodRequests',
+            'InputStream',
+            'InputStreamReader', 'InputSubset', 'InputVerifier',
+            'Insets', 'InsetsUIResource', 'InstantiationError',
+            'InstantiationException', 'Instrument',
+            'InsufficientResourcesException', 'Integer',
+            'INTERNAL', 'InternalError', 'InternalFrameAdapter',
+            'InternalFrameEvent', 'InternalFrameListener',
+            'InternalFrameUI', 'InterruptedException',
+            'InterruptedIOException',
+            'InterruptedNamingException', 'INTF_REPOS',
+            'IntHolder', 'IntrospectionException',
+            'Introspector', 'Invalid',
+            'InvalidAlgorithmParameterException',
+            'InvalidAttributeIdentifierException',
+            'InvalidAttributesException',
+            'InvalidAttributeValueException',
+            'InvalidClassException',
+            'InvalidDnDOperationException',
+            'InvalidKeyException', 'InvalidKeySpecException',
+            'InvalidMidiDataException', 'InvalidName',
+            'InvalidNameException',
+            'InvalidNameHelper', 'InvalidNameHolder',
+            'InvalidObjectException',
+            'InvalidParameterException',
+            'InvalidParameterSpecException',
+            'InvalidSearchControlsException',
+            'InvalidSearchFilterException', 'InvalidSeq',
+            'InvalidTransactionException', 'InvalidValue',
+            'INVALID_TRANSACTION', 'InvocationEvent',
+            'InvocationHandler', 'InvocationTargetException',
+            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
+            'INV_OBJREF', 'INV_POLICY', 'IOException',
+            'IRObject', 'IRObjectOperations', 'IstringHelper',
+            'ItemEvent', 'ItemListener', 'ItemSelectable',
+            'Iterator', 'JApplet', 'JarEntry', 'JarException',
+            'JarFile', 'JarInputStream', 'JarOutputStream',
+            'JarURLConnection', 'JButton', 'JCheckBox',
+            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
+            'JComboBox.KeySelectionManager', 'JComponent',
+            'JDesktopPane', 'JDialog', 'JEditorPane',
+            'JFileChooser', 'JFrame', 'JInternalFrame',
+            'JInternalFrame.JDesktopIcon', 'JLabel',
+            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
+            'JMenuItem', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType',
+            'JobAttributes.DestinationType',
+            'JobAttributes.DialogType',
+            'JobAttributes.MultipleDocumentHandlingType',
+            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
+            'JPasswordField', 'JPopupMenu',
+            'JPopupMenu.Separator', 'JProgressBar',
+            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
+            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
+            'JSplitPane', 'JTabbedPane', 'JTable',
+            'JTableHeader', 'JTextArea', 'JTextComponent',
+            'JTextComponent.KeyBinding', 'JTextField',
+            'JTextPane', 'JToggleButton',
+            'JToggleButton.ToggleButtonModel', 'JToolBar',
+            'JToolBar.Separator', 'JToolTip', 'JTree',
+            'JTree.DynamicUtilTreeNode',
+            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
+            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
+            'KeyException', 'KeyFactory', 'KeyFactorySpi',
+            'KeyListener', 'KeyManagementException', 'Keymap',
+            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
+            'KeySpec', 'KeyStore', 'KeyStoreException',
+            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
+            'LabelView', 'LastOwnerException',
+            'LayeredHighlighter',
+            'LayeredHighlighter.LayerPainter', 'LayoutManager',
+            'LayoutManager2', 'LayoutQueue', 'LdapContext',
+            'LdapReferralException', 'Lease',
+            'LimitExceededException', 'Line', 'Line.Info',
+            'Line2D', 'Line2D.Double', 'Line2D.Float',
+            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
+            'LineEvent.Type', 'LineListener', 'LineMetrics',
+            'LineNumberInputStream', 'LineNumberReader',
+            'LineUnavailableException', 'LinkageError',
+            'LinkedList', 'LinkException', 'LinkLoopException',
+            'LinkRef', 'List', 'ListCellRenderer',
+            'ListDataEvent', 'ListDataListener', 'ListIterator',
+            'ListModel', 'ListResourceBundle',
+            'ListSelectionEvent', 'ListSelectionListener',
+            'ListSelectionModel', 'ListUI', 'ListView',
+            'LoaderHandler', 'Locale', 'LocateRegistry',
+            'LogStream', 'Long', 'LongHolder',
+            'LongLongSeqHelper', 'LongLongSeqHolder',
+            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
+            'LookupOp', 'LookupTable', 'MalformedLinkException',
+            'MalformedURLException', 'Manifest', 'Map',
+            'Map.Entry', 'MARSHAL', 'MarshalException',
+            'MarshalledObject', 'Math', 'MatteBorder',
+            'MediaTracker', 'Member', 'MemoryImageSource',
+            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
+            'MenuContainer', 'MenuDragMouseEvent',
+            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
+            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
+            'MenuKeyListener', 'MenuListener',
+            'MenuSelectionManager', 'MenuShortcut',
+            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
+            'MetaEventListener', 'MetalBorders',
+            'MetalBorders.ButtonBorder',
+            'MetalBorders.Flush3DBorder',
+            'MetalBorders.InternalFrameBorder',
+            'MetalBorders.MenuBarBorder',
+            'MetalBorders.MenuItemBorder',
+            'MetalBorders.OptionDialogBorder',
+            'MetalBorders.PaletteBorder',
+            'MetalBorders.PopupMenuBorder',
+            'MetalBorders.RolloverButtonBorder',
+            'MetalBorders.ScrollPaneBorder',
+            'MetalBorders.TableHeaderBorder',
+            'MetalBorders.TextFieldBorder',
+            'MetalBorders.ToggleButtonBorder',
+            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
+            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
+            'MetalComboBoxButton', 'MetalComboBoxEditor',
+            'MetalComboBoxEditor.UIResource',
+            'MetalComboBoxIcon', 'MetalComboBoxUI',
+            'MetalDesktopIconUI', 'MetalFileChooserUI',
+            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
+            'MetalIconFactory.FolderIcon16',
+            'MetalIconFactory.PaletteCloseIcon',
+            'MetalIconFactory.TreeControlIcon',
+            'MetalIconFactory.TreeFolderIcon',
+            'MetalIconFactory.TreeLeafIcon',
+            'MetalInternalFrameTitlePane',
+            'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
+            'MetalProgressBarUI', 'MetalRadioButtonUI',
+            'MetalScrollBarUI', 'MetalScrollButton',
+            'MetalScrollPaneUI', 'MetalSeparatorUI',
+            'MetalSliderUI', 'MetalSplitPaneUI',
+            'MetalTabbedPaneUI', 'MetalTextFieldUI',
+            'MetalTheme', 'MetalToggleButtonUI',
+            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
+            'MetaMessage', 'Method', 'MethodDescriptor',
+            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
+            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
+            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
+            'MidiSystem', 'MidiUnavailableException',
+            'MimeTypeParseException', 'MinimalHTMLWriter',
+            'MissingResourceException', 'Mixer', 'Mixer.Info',
+            'MixerProvider', 'ModificationItem', 'Modifier',
+            'MouseAdapter', 'MouseDragGestureRecognizer',
+            'MouseEvent', 'MouseInputAdapter',
+            'MouseInputListener', 'MouseListener',
+            'MouseMotionAdapter', 'MouseMotionListener',
+            'MultiButtonUI', 'MulticastSocket',
+            'MultiColorChooserUI', 'MultiComboBoxUI',
+            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
+            'MultiFileChooserUI', 'MultiInternalFrameUI',
+            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
+            'MultiMenuBarUI', 'MultiMenuItemUI',
+            'MultiOptionPaneUI', 'MultiPanelUI',
+            'MultiPixelPackedSampleModel', 'MultipleMaster',
+            'MultiPopupMenuUI', 'MultiProgressBarUI',
+            'MultiScrollBarUI', 'MultiScrollPaneUI',
+            'MultiSeparatorUI', 'MultiSliderUI',
+            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
+            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
+            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
+            'MultiViewportUI', 'MutableAttributeSet',
+            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
+            'NameAlreadyBoundException', 'NameClassPair',
+            'NameComponent', 'NameComponentHelper',
+            'NameComponentHolder', 'NamedValue', 'NameHelper',
+            'NameHolder', 'NameNotFoundException', 'NameParser',
+            'NamespaceChangeListener', 'NameValuePair',
+            'NameValuePairHelper', 'Naming', 'NamingContext',
+            'NamingContextHelper', 'NamingContextHolder',
+            'NamingContextOperations', 'NamingEnumeration',
+            'NamingEvent', 'NamingException',
+            'NamingExceptionEvent', 'NamingListener',
+            'NamingManager', 'NamingSecurityException',
+            'NegativeArraySizeException', 'NetPermission',
+            'NoClassDefFoundError', 'NoInitialContextException',
+            'NoninvertibleTransformException',
+            'NoPermissionException', 'NoRouteToHostException',
+            'NoSuchAlgorithmException',
+            'NoSuchAttributeException', 'NoSuchElementException',
+            'NoSuchFieldError', 'NoSuchFieldException',
+            'NoSuchMethodError', 'NoSuchMethodException',
+            'NoSuchObjectException', 'NoSuchProviderException',
+            'NotActiveException', 'NotBoundException',
+            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
+            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
+            'NotFoundHolder', 'NotFoundReason',
+            'NotFoundReasonHelper', 'NotFoundReasonHolder',
+            'NotOwnerException', 'NotSerializableException',
+            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
+            'NO_RESOURCES', 'NO_RESPONSE',
+            'NullPointerException', 'Number', 'NumberFormat',
+            'NumberFormatException', 'NVList', 'Object',
+            'ObjectChangeListener', 'ObjectFactory',
+            'ObjectFactoryBuilder', 'ObjectHelper',
+            'ObjectHolder', 'ObjectImpl',
+            'ObjectInput', 'ObjectInputStream',
+            'ObjectInputStream.GetField',
+            'ObjectInputValidation', 'ObjectOutput',
+            'ObjectOutputStream', 'ObjectOutputStream.PutField',
+            'ObjectStreamClass', 'ObjectStreamConstants',
+            'ObjectStreamException', 'ObjectStreamField',
+            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
+            'OBJ_ADAPTER', 'Observable', 'Observer',
+            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
+            'OpenType', 'Operation',
+            'OperationNotSupportedException', 'Option',
+            'OptionalDataException', 'OptionPaneUI', 'ORB',
+            'OutOfMemoryError', 'OutputStream',
+            'OutputStreamWriter', 'OverlayLayout', 'Owner',
+            'Package', 'PackedColorModel', 'Pageable',
+            'PageAttributes', 'PageAttributes.ColorType',
+            'PageAttributes.MediaType',
+            'PageAttributes.OrientationRequestedType',
+            'PageAttributes.OriginType',
+            'PageAttributes.PrintQualityType', 'PageFormat',
+            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
+            'PanelUI', 'Paper', 'ParagraphView',
+            'ParameterBlock', 'ParameterDescriptor',
+            'ParseException', 'ParsePosition', 'Parser',
+            'ParserDelegator', 'PartialResultException',
+            'PasswordAuthentication', 'PasswordView', 'Patch',
+            'PathIterator', 'Permission',
+            'PermissionCollection', 'Permissions',
+            'PERSIST_STORE', 'PhantomReference',
+            'PipedInputStream', 'PipedOutputStream',
+            'PipedReader', 'PipedWriter', 'PixelGrabber',
+            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
+            'PlainDocument', 'PlainView', 'Point', 'Point2D',
+            'Point2D.Double', 'Point2D.Float', 'Policy',
+            'PolicyError', 'PolicyHelper',
+            'PolicyHolder', 'PolicyListHelper',
+            'PolicyListHolder', 'PolicyOperations',
+            'PolicyTypeHelper', 'Polygon', 'PopupMenu',
+            'PopupMenuEvent', 'PopupMenuListener', 'PopupMenuUI',
+            'Port', 'Port.Info', 'PortableRemoteObject',
+            'PortableRemoteObjectDelegate', 'Position',
+            'Position.Bias', 'PreparedStatement', 'Principal',
+            'PrincipalHolder', 'Printable',
+            'PrinterAbortException', 'PrinterException',
+            'PrinterGraphics', 'PrinterIOException',
+            'PrinterJob', 'PrintGraphics', 'PrintJob',
+            'PrintStream', 'PrintWriter', 'PrivateKey',
+            'PRIVATE_MEMBER', 'PrivilegedAction',
+            'PrivilegedActionException',
+            'PrivilegedExceptionAction', 'Process',
+            'ProfileDataException', 'ProgressBarUI',
+            'ProgressMonitor', 'ProgressMonitorInputStream',
+            'Properties', 'PropertyChangeEvent',
+            'PropertyChangeListener', 'PropertyChangeSupport',
+            'PropertyDescriptor', 'PropertyEditor',
+            'PropertyEditorManager', 'PropertyEditorSupport',
+            'PropertyPermission', 'PropertyResourceBundle',
+            'PropertyVetoException', 'ProtectionDomain',
+            'ProtocolException', 'Provider', 'ProviderException',
+            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
+            'PushbackInputStream', 'PushbackReader',
+            'QuadCurve2D', 'QuadCurve2D.Double',
+            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
+            'Raster', 'RasterFormatException', 'RasterOp',
+            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
+            'Rectangle2D.Double', 'Rectangle2D.Float',
+            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
+            'Referenceable', 'ReferenceQueue',
+            'ReferralException', 'ReflectPermission', 'Registry',
+            'RegistryHandler', 'RemarshalException', 'Remote',
+            'RemoteCall', 'RemoteException', 'RemoteObject',
+            'RemoteRef', 'RemoteServer', 'RemoteStub',
+            'RenderableImage', 'RenderableImageOp',
+            'RenderableImageProducer', 'RenderContext',
+            'RenderedImage', 'RenderedImageFactory', 'Renderer',
+            'RenderingHints', 'RenderingHints.Key',
+            'RepaintManager', 'ReplicateScaleFilter',
+            'Repository', 'RepositoryIdHelper', 'Request',
+            'RescaleOp', 'Resolver', 'ResolveResult',
+            'ResourceBundle', 'ResponseHandler', 'ResultSet',
+            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
+            'RMIClassLoader', 'RMIClientSocketFactory',
+            'RMIFailureHandler', 'RMISecurityException',
+            'RMISecurityManager', 'RMIServerSocketFactory',
+            'RMISocketFactory', 'Robot', 'RootPaneContainer',
+            'RootPaneUI', 'RoundRectangle2D',
+            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
+            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
+            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
+            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
+            'RSAPublicKeySpec', 'RTFEditorKit',
+            'RuleBasedCollator', 'Runnable', 'RunTime',
+            'Runtime', 'RuntimeException', 'RunTimeOperations',
+            'RuntimePermission', 'SampleModel',
+            'SchemaViolationException', 'Scrollable',
+            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
+            'ScrollPaneConstants', 'ScrollPaneLayout',
+            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
+            'SearchControls', 'SearchResult',
+            'SecureClassLoader', 'SecureRandom',
+            'SecureRandomSpi', 'Security', 'SecurityException',
+            'SecurityManager', 'SecurityPermission', 'Segment',
+            'SeparatorUI', 'Sequence', 'SequenceInputStream',
+            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
+            'SerializablePermission', 'ServantObject',
+            'ServerCloneException', 'ServerError',
+            'ServerException', 'ServerNotActiveException',
+            'ServerRef', 'ServerRequest',
+            'ServerRuntimeException', 'ServerSocket',
+            'ServiceDetail', 'ServiceDetailHelper',
+            'ServiceInformation', 'ServiceInformationHelper',
+            'ServiceInformationHolder',
+            'ServiceUnavailableException', 'Set',
+            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
+            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
+            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
+            'ShortSeqHolder', 'Signature', 'SignatureException',
+            'SignatureSpi', 'SignedObject', 'Signer',
+            'SimpleAttributeSet', 'SimpleBeanInfo',
+            'SimpleDateFormat', 'SimpleTimeZone',
+            'SinglePixelPackedSampleModel',
+            'SingleSelectionModel', 'SizeLimitExceededException',
+            'SizeRequirements', 'SizeSequence', 'Skeleton',
+            'SkeletonMismatchException',
+            'SkeletonNotFoundException', 'SliderUI', 'Socket',
+            'SocketException', 'SocketImpl', 'SocketImplFactory',
+            'SocketOptions', 'SocketPermission',
+            'SocketSecurityException', 'SoftBevelBorder',
+            'SoftReference', 'SortedMap', 'SortedSet',
+            'Soundbank', 'SoundbankReader', 'SoundbankResource',
+            'SourceDataLine', 'SplitPaneUI', 'SQLData',
+            'SQLException', 'SQLInput', 'SQLOutput',
+            'SQLPermission', 'SQLWarning', 'Stack',
+            'StackOverflowError', 'StateEdit', 'StateEditable',
+            'StateFactory', 'Statement', 'Streamable',
+            'StreamableValue', 'StreamCorruptedException',
+            'StreamTokenizer', 'StrictMath', 'String',
+            'StringBuffer', 'StringBufferInputStream',
+            'StringCharacterIterator', 'StringContent',
+            'StringHolder', 'StringIndexOutOfBoundsException',
+            'StringReader', 'StringRefAddr', 'StringSelection',
+            'StringTokenizer', 'StringValueHelper',
+            'StringWriter', 'Stroke', 'Struct', 'StructMember',
+            'StructMemberHelper', 'Stub', 'StubDelegate',
+            'StubNotFoundException', 'Style', 'StyleConstants',
+            'StyleConstants.CharacterConstants',
+            'StyleConstants.ColorConstants',
+            'StyleConstants.FontConstants',
+            'StyleConstants.ParagraphConstants', 'StyleContext',
+            'StyledDocument', 'StyledEditorKit',
+            'StyledEditorKit.AlignmentAction',
+            'StyledEditorKit.BoldAction',
+            'StyledEditorKit.FontFamilyAction',
+            'StyledEditorKit.FontSizeAction',
+            'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction',
+            'StyledEditorKit.StyledTextAction',
+            'StyledEditorKit.UnderlineAction', 'StyleSheet',
+            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
+            'SwingConstants', 'SwingPropertyChangeSupport',
+            'SwingUtilities', 'SyncFailedException',
+            'Synthesizer', 'SysexMessage', 'System',
+            'SystemColor', 'SystemException', 'SystemFlavorMap',
+            'TabableView', 'TabbedPaneUI', 'TabExpander',
+            'TableCellEditor', 'TableCellRenderer',
+            'TableColumn', 'TableColumnModel',
+            'TableColumnModelEvent', 'TableColumnModelListener',
+            'TableHeaderUI', 'TableModel', 'TableModelEvent',
+            'TableModelListener', 'TableUI', 'TableView',
+            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
+            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
+            'TextComponent', 'TextEvent', 'TextField',
+            'TextHitInfo', 'TextLayout',
+            'TextLayout.CaretPolicy', 'TextListener',
+            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
+            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
+            'Throwable', 'Tie', 'TileObserver', 'Time',
+            'TimeLimitExceededException', 'Timer',
+            'TimerTask', 'Timestamp', 'TimeZone', 'TitledBorder',
+            'ToolBarUI', 'Toolkit', 'ToolTipManager',
+            'ToolTipUI', 'TooManyListenersException', 'Track',
+            'TransactionRequiredException',
+            'TransactionRolledbackException',
+            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
+            'Transferable', 'TransformAttribute', 'TRANSIENT',
+            'Transmitter', 'Transparency', 'TreeCellEditor',
+            'TreeCellRenderer', 'TreeExpansionEvent',
+            'TreeExpansionListener', 'TreeMap', 'TreeModel',
+            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
+            'TreePath', 'TreeSelectionEvent',
+            'TreeSelectionListener', 'TreeSelectionModel',
+            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
+            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
+            'Types', 'UID', 'UIDefaults',
+            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
+            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
+            'UIManager', 'UIManager.LookAndFeelInfo',
+            'UIResource', 'ULongLongSeqHelper',
+            'ULongLongSeqHolder', 'ULongSeqHelper',
+            'ULongSeqHolder', 'UndeclaredThrowableException',
+            'UndoableEdit', 'UndoableEditEvent',
+            'UndoableEditListener', 'UndoableEditSupport',
+            'UndoManager', 'UnexpectedException',
+            'UnicastRemoteObject', 'UnionMember',
+            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
+            'UnknownException', 'UnknownGroupException',
+            'UnknownHostException',
+            'UnknownObjectException', 'UnknownServiceException',
+            'UnknownUserException', 'UnmarshalException',
+            'UnrecoverableKeyException', 'Unreferenced',
+            'UnresolvedPermission', 'UnsatisfiedLinkError',
+            'UnsolicitedNotification',
+            'UnsolicitedNotificationEvent',
+            'UnsolicitedNotificationListener',
+            'UnsupportedAudioFileException',
+            'UnsupportedClassVersionError',
+            'UnsupportedEncodingException',
+            'UnsupportedFlavorException',
+            'UnsupportedLookAndFeelException',
+            'UnsupportedOperationException',
+            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
+            'URL', 'URLClassLoader', 'URLConnection',
+            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
+            'URLStreamHandlerFactory', 'UserException',
+            'UShortSeqHelper', 'UShortSeqHolder',
+            'UTFDataFormatException', 'Util', 'UtilDelegate',
+            'Utilities', 'ValueBase', 'ValueBaseHelper',
+            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
+            'ValueMember', 'ValueMemberHelper',
+            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
+            'VersionSpecHelper', 'VetoableChangeListener',
+            'VetoableChangeSupport', 'View', 'ViewFactory',
+            'ViewportLayout', 'ViewportUI',
+            'VirtualMachineError', 'Visibility',
+            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
+            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
+            'VoiceStatus', 'Void', 'WCharSeqHelper',
+            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
+            'Window', 'WindowAdapter', 'WindowConstants',
+            'WindowEvent', 'WindowListener', 'WrappedPlainView',
+            'WritableRaster', 'WritableRenderedImage',
+            'WriteAbortedException', 'Writer',
+            'WrongTransaction', 'WStringValueHelper',
+            'X509Certificate', 'X509CRL', 'X509CRLEntry',
+            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
+            'ZipException', 'ZipFile', 'ZipInputStream',
+            'ZipOutputStream', 'ZoneView',
+            '_BindingIteratorImplBase', '_BindingIteratorStub',
+            '_IDLTypeStub', '_NamingContextImplBase',
+            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
+            ),
+        4 => array(
+            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '&', '|', '^',
+        '<', '>', '=',
+        '?', ':', ';',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #003399;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #006699;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?hl=en&amp;q=allinurl%3Adocs.oracle.com+javase+docs+api+{FNAMEL}',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/java5.php b/vendor/easybook/geshi/geshi/java5.php
new file mode 100755
index 000000000..5d74d988b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/java5.php
@@ -0,0 +1,1035 @@
+<?php
+/*************************************************************************************
+ * java.php
+ * --------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/10
+ *
+ * Java language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/25 (1.0.7.22)
+ *   -  Added highlighting of import and package directives as non-OOP
+ * 2005/12/28 (1.0.4)
+ *   -  Added instanceof keyword
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/08/05 (1.0.2)
+ *   -  Added URL support
+ *   -  Added keyword "this", as bugs in GeSHi class ironed out
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ *   -  Added extra missed keywords
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Java(TM) 2 Platform Standard Edition 5.0',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s](?!static))|(?<=import[\\n\\s]static[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // javadoc comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            /* see the authoritative list of all 50 Java keywords at */
+            /* http://java.sun.com/docs/books/jls/third_edition/html/lexical.html#229308 */
+
+            /* java keywords, part 1: control flow */
+            'case', 'default', 'do', 'else', 'for',
+            'goto', 'if', 'switch', 'while'
+
+            /* IMO 'break', 'continue', 'return' and 'throw' */
+                        /* should also be added to this group, as they   */
+            /* also manage the control flow,                 */
+            /* arguably 'try'/'catch'/'finally' as well      */
+            ),
+        2 => array(
+            /* java keywords, part 2 */
+
+            'break', 'continue', 'return', 'throw',
+            'try', 'catch', 'finally',
+
+            'abstract', 'assert', 'class', 'const', 'enum', 'extends',
+            'final', 'implements', 'import', 'instanceof', 'interface',
+            'native', 'new', 'package', 'private', 'protected',
+            'public', 'static', 'strictfp', 'super', 'synchronized',
+            'this', 'throws', 'transient', 'volatile'
+            ),
+        3 => array(
+            /* Java keywords, part 3: primitive data types and 'void' */
+            'boolean', 'byte', 'char', 'double',
+            'float', 'int', 'long', 'short', 'void'
+            ),
+        4 => array(
+            /* other reserved words in Java: literals */
+            /* should be styled to look similar to numbers and Strings */
+            'false', 'null', 'true'
+            ),
+        5 => array (
+            'Applet', 'AppletContext', 'AppletStub', 'AudioClip'
+            ),
+        6 => array (
+            'AWTError', 'AWTEvent', 'AWTEventMulticaster', 'AWTException', 'AWTKeyStroke', 'AWTPermission', 'ActiveEvent', 'Adjustable', 'AlphaComposite', 'BasicStroke', 'BorderLayout', 'BufferCapabilities', 'BufferCapabilities.FlipContents', 'Button', 'Canvas', 'CardLayout', 'Checkbox', 'CheckboxGroup', 'CheckboxMenuItem', 'Choice', 'Color', 'Component', 'ComponentOrientation', 'Composite', 'CompositeContext', 'Container', 'ContainerOrderFocusTraversalPolicy', 'Cursor', 'DefaultFocusTraversalPolicy', 'DefaultKeyboardFocusManager', 'Dialog', 'Dimension', 'DisplayMode', 'EventQueue', 'FileDialog', 'FlowLayout', 'FocusTraversalPolicy', 'Font', 'FontFormatException', 'FontMetrics', 'Frame', 'GradientPaint', 'Graphics', 'Graphics2D', 'GraphicsConfigTemplate', 'GraphicsConfiguration', 'GraphicsDevice', 'GraphicsEnvironment', 'GridBagConstraints', 'GridBagLayout', 'GridLayout', 'HeadlessException', 'IllegalComponentStateException', 'Image', 'ImageCapabilities', 'Insets', 'ItemSelectable', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType', 'JobAttributes.DestinationType', 'JobAttributes.DialogType', 'JobAttributes.MultipleDocumentHandlingType', 'JobAttributes.SidesType', 'KeyEventDispatcher', 'KeyEventPostProcessor', 'KeyboardFocusManager', 'Label', 'LayoutManager', 'LayoutManager2', 'MediaTracker', 'Menu', 'MenuBar', 'MenuComponent', 'MenuContainer', 'MenuItem', 'MenuShortcut', 'MouseInfo', 'PageAttributes', 'PageAttributes.ColorType', 'PageAttributes.MediaType', 'PageAttributes.OrientationRequestedType', 'PageAttributes.OriginType', 'PageAttributes.PrintQualityType', 'Paint', 'PaintContext', 'Panel', 'Point', 'PointerInfo', 'Polygon', 'PopupMenu', 'PrintGraphics', 'PrintJob', 'Rectangle', 'RenderingHints', 'RenderingHints.Key', 'Robot', 'ScrollPane', 'ScrollPaneAdjustable', 'Scrollbar', 'Shape', 'Stroke', 'SystemColor', 'TextArea', 'TextComponent', 'TextField', 'TexturePaint', 'Toolkit', 'Transparency', 'Window'
+            ),
+        7 => array (
+            'CMMException', 'ColorSpace', 'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray', 'ICC_ProfileRGB', 'ProfileDataException'
+            ),
+        8 => array (
+            'Clipboard', 'ClipboardOwner', 'DataFlavor', 'FlavorEvent', 'FlavorListener', 'FlavorMap', 'FlavorTable', 'MimeTypeParseException', 'StringSelection', 'SystemFlavorMap', 'Transferable', 'UnsupportedFlavorException'
+            ),
+        9 => array (
+            'Autoscroll', 'DnDConstants', 'DragGestureEvent', 'DragGestureListener', 'DragGestureRecognizer', 'DragSource', 'DragSourceAdapter', 'DragSourceContext', 'DragSourceDragEvent', 'DragSourceDropEvent', 'DragSourceEvent', 'DragSourceListener', 'DragSourceMotionListener', 'DropTarget', 'DropTarget.DropTargetAutoScroller', 'DropTargetAdapter', 'DropTargetContext', 'DropTargetDragEvent', 'DropTargetDropEvent', 'DropTargetEvent', 'DropTargetListener', 'InvalidDnDOperationException', 'MouseDragGestureRecognizer'
+            ),
+        10 => array (
+            'AWTEventListener', 'AWTEventListenerProxy', 'ActionEvent', 'ActionListener', 'AdjustmentEvent', 'AdjustmentListener', 'ComponentAdapter', 'ComponentEvent', 'ComponentListener', 'ContainerAdapter', 'ContainerEvent', 'ContainerListener', 'FocusAdapter', 'FocusEvent', 'FocusListener', 'HierarchyBoundsAdapter', 'HierarchyBoundsListener', 'HierarchyEvent', 'HierarchyListener', 'InputEvent', 'InputMethodEvent', 'InputMethodListener', 'InvocationEvent', 'ItemEvent', 'ItemListener', 'KeyAdapter', 'KeyEvent', 'KeyListener', 'MouseAdapter', 'MouseListener', 'MouseMotionAdapter', 'MouseMotionListener', 'MouseWheelEvent', 'MouseWheelListener', 'PaintEvent', 'TextEvent', 'TextListener', 'WindowAdapter', 'WindowEvent', 'WindowFocusListener', 'WindowListener', 'WindowStateListener'
+            ),
+        11 => array (
+            'FontRenderContext', 'GlyphJustificationInfo', 'GlyphMetrics', 'GlyphVector', 'GraphicAttribute', 'ImageGraphicAttribute', 'LineBreakMeasurer', 'LineMetrics', 'MultipleMaster', 'NumericShaper', 'ShapeGraphicAttribute', 'TextAttribute', 'TextHitInfo', 'TextLayout', 'TextLayout.CaretPolicy', 'TextMeasurer', 'TransformAttribute'
+            ),
+        12 => array (
+            'AffineTransform', 'Arc2D', 'Arc2D.Double', 'Arc2D.Float', 'Area', 'CubicCurve2D', 'CubicCurve2D.Double', 'CubicCurve2D.Float', 'Dimension2D', 'Ellipse2D', 'Ellipse2D.Double', 'Ellipse2D.Float', 'FlatteningPathIterator', 'GeneralPath', 'IllegalPathStateException', 'Line2D', 'Line2D.Double', 'Line2D.Float', 'NoninvertibleTransformException', 'PathIterator', 'Point2D', 'Point2D.Double', 'Point2D.Float', 'QuadCurve2D', 'QuadCurve2D.Double', 'QuadCurve2D.Float', 'Rectangle2D', 'Rectangle2D.Double', 'Rectangle2D.Float', 'RectangularShape', 'RoundRectangle2D', 'RoundRectangle2D.Double', 'RoundRectangle2D.Float'
+            ),
+        13 => array (
+            'InputContext', 'InputMethodHighlight', 'InputMethodRequests', 'InputSubset'
+            ),
+        14 => array (
+            'InputMethod', 'InputMethodContext', 'InputMethodDescriptor'
+            ),
+        15 => array (
+            'AffineTransformOp', 'AreaAveragingScaleFilter', 'BandCombineOp', 'BandedSampleModel', 'BufferStrategy', 'BufferedImage', 'BufferedImageFilter', 'BufferedImageOp', 'ByteLookupTable', 'ColorConvertOp', 'ColorModel', 'ComponentColorModel', 'ComponentSampleModel', 'ConvolveOp', 'CropImageFilter', 'DataBuffer', 'DataBufferByte', 'DataBufferDouble', 'DataBufferFloat', 'DataBufferInt', 'DataBufferShort', 'DataBufferUShort', 'DirectColorModel', 'FilteredImageSource', 'ImageConsumer', 'ImageFilter', 'ImageObserver', 'ImageProducer', 'ImagingOpException', 'IndexColorModel', 'Kernel', 'LookupOp', 'LookupTable', 'MemoryImageSource', 'MultiPixelPackedSampleModel', 'PackedColorModel', 'PixelGrabber', 'PixelInterleavedSampleModel', 'RGBImageFilter', 'Raster', 'RasterFormatException', 'RasterOp', 'RenderedImage', 'ReplicateScaleFilter', 'RescaleOp', 'SampleModel', 'ShortLookupTable', 'SinglePixelPackedSampleModel', 'TileObserver', 'VolatileImage', 'WritableRaster', 'WritableRenderedImage'
+            ),
+        16 => array (
+            'ContextualRenderedImageFactory', 'ParameterBlock', 'RenderContext', 'RenderableImage', 'RenderableImageOp', 'RenderableImageProducer', 'RenderedImageFactory'
+            ),
+        17 => array (
+            'Book', 'PageFormat', 'Pageable', 'Paper', 'Printable', 'PrinterAbortException', 'PrinterException', 'PrinterGraphics', 'PrinterIOException', 'PrinterJob'
+            ),
+        18 => array (
+            'AppletInitializer', 'BeanDescriptor', 'BeanInfo', 'Beans', 'Customizer', 'DefaultPersistenceDelegate', 'DesignMode', 'Encoder', 'EventHandler', 'EventSetDescriptor', 'ExceptionListener', 'Expression', 'FeatureDescriptor', 'IndexedPropertyChangeEvent', 'IndexedPropertyDescriptor', 'Introspector', 'MethodDescriptor', 'ParameterDescriptor', 'PersistenceDelegate', 'PropertyChangeEvent', 'PropertyChangeListener', 'PropertyChangeListenerProxy', 'PropertyChangeSupport', 'PropertyDescriptor', 'PropertyEditor', 'PropertyEditorManager', 'PropertyEditorSupport', 'PropertyVetoException', 'SimpleBeanInfo', 'VetoableChangeListener', 'VetoableChangeListenerProxy', 'VetoableChangeSupport', 'Visibility', 'XMLDecoder', 'XMLEncoder'
+            ),
+        19 => array (
+            'BeanContext', 'BeanContextChild', 'BeanContextChildComponentProxy', 'BeanContextChildSupport', 'BeanContextContainerProxy', 'BeanContextEvent', 'BeanContextMembershipEvent', 'BeanContextMembershipListener', 'BeanContextProxy', 'BeanContextServiceAvailableEvent', 'BeanContextServiceProvider', 'BeanContextServiceProviderBeanInfo', 'BeanContextServiceRevokedEvent', 'BeanContextServiceRevokedListener', 'BeanContextServices', 'BeanContextServicesListener', 'BeanContextServicesSupport', 'BeanContextServicesSupport.BCSSServiceProvider', 'BeanContextSupport', 'BeanContextSupport.BCSIterator'
+            ),
+        20 => array (
+            'BufferedInputStream', 'BufferedOutputStream', 'BufferedReader', 'BufferedWriter', 'ByteArrayInputStream', 'ByteArrayOutputStream', 'CharArrayReader', 'CharArrayWriter', 'CharConversionException', 'Closeable', 'DataInput', 'DataOutput', 'EOFException', 'Externalizable', 'File', 'FileDescriptor', 'FileInputStream', 'FileNotFoundException', 'FileOutputStream', 'FilePermission', 'FileReader', 'FileWriter', 'FilenameFilter', 'FilterInputStream', 'FilterOutputStream', 'FilterReader', 'FilterWriter', 'Flushable', 'IOException', 'InputStreamReader', 'InterruptedIOException', 'InvalidClassException', 'InvalidObjectException', 'LineNumberInputStream', 'LineNumberReader', 'NotActiveException', 'NotSerializableException', 'ObjectInput', 'ObjectInputStream', 'ObjectInputStream.GetField', 'ObjectInputValidation', 'ObjectOutput', 'ObjectOutputStream', 'ObjectOutputStream.PutField', 'ObjectStreamClass', 'ObjectStreamConstants', 'ObjectStreamException', 'ObjectStreamField', 'OptionalDataException', 'OutputStreamWriter',
+            'PipedInputStream', 'PipedOutputStream', 'PipedReader', 'PipedWriter', 'PrintStream', 'PrintWriter', 'PushbackInputStream', 'PushbackReader', 'RandomAccessFile', 'Reader', 'SequenceInputStream', 'Serializable', 'SerializablePermission', 'StreamCorruptedException', 'StreamTokenizer', 'StringBufferInputStream', 'StringReader', 'StringWriter', 'SyncFailedException', 'UTFDataFormatException', 'UnsupportedEncodingException', 'WriteAbortedException', 'Writer'
+            ),
+        21 => array (
+            'AbstractMethodError', 'Appendable', 'ArithmeticException', 'ArrayIndexOutOfBoundsException', 'ArrayStoreException', 'AssertionError', 'Boolean', 'Byte', 'CharSequence', 'Character', 'Character.Subset', 'Character.UnicodeBlock', 'Class', 'ClassCastException', 'ClassCircularityError', 'ClassFormatError', 'ClassLoader', 'ClassNotFoundException', 'CloneNotSupportedException', 'Cloneable', 'Comparable', 'Compiler', 'Deprecated', 'Double', 'Enum', 'EnumConstantNotPresentException', 'Error', 'Exception', 'ExceptionInInitializerError', 'Float', 'IllegalAccessError', 'IllegalAccessException', 'IllegalArgumentException', 'IllegalMonitorStateException', 'IllegalStateException', 'IllegalThreadStateException', 'IncompatibleClassChangeError', 'IndexOutOfBoundsException', 'InheritableThreadLocal', 'InstantiationError', 'InstantiationException', 'Integer', 'InternalError', 'InterruptedException', 'Iterable', 'LinkageError', 'Long', 'Math', 'NegativeArraySizeException', 'NoClassDefFoundError', 'NoSuchFieldError',
+            'NoSuchFieldException', 'NoSuchMethodError', 'NoSuchMethodException', 'NullPointerException', 'Number', 'NumberFormatException', 'OutOfMemoryError', 'Override', 'Package', 'Process', 'ProcessBuilder', 'Readable', 'Runnable', 'Runtime', 'RuntimeException', 'RuntimePermission', 'SecurityException', 'SecurityManager', 'Short', 'StackOverflowError', 'StackTraceElement', 'StrictMath', 'String', 'StringBuffer', 'StringBuilder', 'StringIndexOutOfBoundsException', 'SuppressWarnings', 'System', 'Thread', 'Thread.State', 'Thread.UncaughtExceptionHandler', 'ThreadDeath', 'ThreadGroup', 'ThreadLocal', 'Throwable', 'TypeNotPresentException', 'UnknownError', 'UnsatisfiedLinkError', 'UnsupportedClassVersionError', 'UnsupportedOperationException', 'VerifyError', 'VirtualMachineError', 'Void'
+            ),
+        22 => array (
+            'AnnotationFormatError', 'AnnotationTypeMismatchException', 'Documented', 'ElementType', 'IncompleteAnnotationException', 'Inherited', 'Retention', 'RetentionPolicy', 'Target'
+            ),
+        23 => array (
+            'ClassDefinition', 'ClassFileTransformer', 'IllegalClassFormatException', 'Instrumentation', 'UnmodifiableClassException'
+            ),
+        24 => array (
+            'ClassLoadingMXBean', 'CompilationMXBean', 'GarbageCollectorMXBean', 'ManagementFactory', 'ManagementPermission', 'MemoryMXBean', 'MemoryManagerMXBean', 'MemoryNotificationInfo', 'MemoryPoolMXBean', 'MemoryType', 'MemoryUsage', 'OperatingSystemMXBean', 'RuntimeMXBean', 'ThreadInfo', 'ThreadMXBean'
+            ),
+        25 => array (
+            'PhantomReference', 'ReferenceQueue', 'SoftReference', 'WeakReference'
+            ),
+        26 => array (
+            'AccessibleObject', 'AnnotatedElement', 'Constructor', 'Field', 'GenericArrayType', 'GenericDeclaration', 'GenericSignatureFormatError', 'InvocationHandler', 'InvocationTargetException', 'MalformedParameterizedTypeException', 'Member', 'Method', 'Modifier', 'ParameterizedType', 'ReflectPermission', 'Type', 'TypeVariable', 'UndeclaredThrowableException', 'WildcardType'
+            ),
+        27 => array (
+            'BigDecimal', 'BigInteger', 'MathContext', 'RoundingMode'
+            ),
+        28 => array (
+            'Authenticator', 'Authenticator.RequestorType', 'BindException', 'CacheRequest', 'CacheResponse', 'ContentHandlerFactory', 'CookieHandler', 'DatagramPacket', 'DatagramSocket', 'DatagramSocketImpl', 'DatagramSocketImplFactory', 'FileNameMap', 'HttpRetryException', 'HttpURLConnection', 'Inet4Address', 'Inet6Address', 'InetAddress', 'InetSocketAddress', 'JarURLConnection', 'MalformedURLException', 'MulticastSocket', 'NetPermission', 'NetworkInterface', 'NoRouteToHostException', 'PasswordAuthentication', 'PortUnreachableException', 'ProtocolException', 'Proxy.Type', 'ProxySelector', 'ResponseCache', 'SecureCacheResponse', 'ServerSocket', 'Socket', 'SocketAddress', 'SocketException', 'SocketImpl', 'SocketImplFactory', 'SocketOptions', 'SocketPermission', 'SocketTimeoutException', 'URI', 'URISyntaxException', 'URL', 'URLClassLoader', 'URLConnection', 'URLDecoder', 'URLEncoder', 'URLStreamHandler', 'URLStreamHandlerFactory', 'UnknownServiceException'
+            ),
+        29 => array (
+            'Buffer', 'BufferOverflowException', 'BufferUnderflowException', 'ByteBuffer', 'ByteOrder', 'CharBuffer', 'DoubleBuffer', 'FloatBuffer', 'IntBuffer', 'InvalidMarkException', 'LongBuffer', 'MappedByteBuffer', 'ReadOnlyBufferException', 'ShortBuffer'
+            ),
+        30 => array (
+            'AlreadyConnectedException', 'AsynchronousCloseException', 'ByteChannel', 'CancelledKeyException', 'Channel', 'Channels', 'ClosedByInterruptException', 'ClosedChannelException', 'ClosedSelectorException', 'ConnectionPendingException', 'DatagramChannel', 'FileChannel', 'FileChannel.MapMode', 'FileLock', 'FileLockInterruptionException', 'GatheringByteChannel', 'IllegalBlockingModeException', 'IllegalSelectorException', 'InterruptibleChannel', 'NoConnectionPendingException', 'NonReadableChannelException', 'NonWritableChannelException', 'NotYetBoundException', 'NotYetConnectedException', 'OverlappingFileLockException', 'Pipe', 'Pipe.SinkChannel', 'Pipe.SourceChannel', 'ReadableByteChannel', 'ScatteringByteChannel', 'SelectableChannel', 'SelectionKey', 'Selector', 'ServerSocketChannel', 'SocketChannel', 'UnresolvedAddressException', 'UnsupportedAddressTypeException', 'WritableByteChannel'
+            ),
+        31 => array (
+            'AbstractInterruptibleChannel', 'AbstractSelectableChannel', 'AbstractSelectionKey', 'AbstractSelector', 'SelectorProvider'
+            ),
+        32 => array (
+            'CharacterCodingException', 'Charset', 'CharsetDecoder', 'CharsetEncoder', 'CoderMalfunctionError', 'CoderResult', 'CodingErrorAction', 'IllegalCharsetNameException', 'MalformedInputException', 'UnmappableCharacterException', 'UnsupportedCharsetException'
+            ),
+        33 => array (
+            'CharsetProvider'
+            ),
+        34 => array (
+            'AccessException', 'AlreadyBoundException', 'ConnectIOException', 'MarshalException', 'MarshalledObject', 'Naming', 'NoSuchObjectException', 'NotBoundException', 'RMISecurityException', 'RMISecurityManager', 'Remote', 'RemoteException', 'ServerError', 'ServerException', 'ServerRuntimeException', 'StubNotFoundException', 'UnexpectedException', 'UnmarshalException'
+            ),
+        35 => array (
+            'Activatable', 'ActivateFailedException', 'ActivationDesc', 'ActivationException', 'ActivationGroup', 'ActivationGroupDesc', 'ActivationGroupDesc.CommandEnvironment', 'ActivationGroupID', 'ActivationGroup_Stub', 'ActivationID', 'ActivationInstantiator', 'ActivationMonitor', 'ActivationSystem', 'Activator', 'UnknownGroupException', 'UnknownObjectException'
+            ),
+        36 => array (
+            'DGC', 'Lease', 'VMID'
+            ),
+        37 => array (
+            'LocateRegistry', 'Registry', 'RegistryHandler'
+            ),
+        38 => array (
+            'ExportException', 'LoaderHandler', 'LogStream', 'ObjID', 'Operation', 'RMIClassLoader', 'RMIClassLoaderSpi', 'RMIClientSocketFactory', 'RMIFailureHandler', 'RMIServerSocketFactory', 'RMISocketFactory', 'RemoteCall', 'RemoteObject', 'RemoteObjectInvocationHandler', 'RemoteRef', 'RemoteServer', 'RemoteStub', 'ServerCloneException', 'ServerNotActiveException', 'ServerRef', 'Skeleton', 'SkeletonMismatchException', 'SkeletonNotFoundException', 'SocketSecurityException', 'UID', 'UnicastRemoteObject', 'Unreferenced'
+            ),
+        39 => array (
+            'AccessControlContext', 'AccessControlException', 'AccessController', 'AlgorithmParameterGenerator', 'AlgorithmParameterGeneratorSpi', 'AlgorithmParameters', 'AlgorithmParametersSpi', 'AllPermission', 'AuthProvider', 'BasicPermission', 'CodeSigner', 'CodeSource', 'DigestException', 'DigestInputStream', 'DigestOutputStream', 'DomainCombiner', 'GeneralSecurityException', 'Guard', 'GuardedObject', 'Identity', 'IdentityScope', 'InvalidAlgorithmParameterException', 'InvalidParameterException', 'Key', 'KeyException', 'KeyFactory', 'KeyFactorySpi', 'KeyManagementException', 'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi', 'KeyRep', 'KeyRep.Type', 'KeyStore', 'KeyStore.Builder', 'KeyStore.CallbackHandlerProtection', 'KeyStore.Entry', 'KeyStore.LoadStoreParameter', 'KeyStore.PasswordProtection', 'KeyStore.PrivateKeyEntry', 'KeyStore.ProtectionParameter', 'KeyStore.SecretKeyEntry', 'KeyStore.TrustedCertificateEntry', 'KeyStoreException', 'KeyStoreSpi', 'MessageDigest', 'MessageDigestSpi',
+            'NoSuchAlgorithmException', 'NoSuchProviderException', 'PermissionCollection', 'Permissions', 'PrivateKey', 'PrivilegedAction', 'PrivilegedActionException', 'PrivilegedExceptionAction', 'ProtectionDomain', 'Provider', 'Provider.Service', 'ProviderException', 'PublicKey', 'SecureClassLoader', 'SecureRandom', 'SecureRandomSpi', 'Security', 'SecurityPermission', 'Signature', 'SignatureException', 'SignatureSpi', 'SignedObject', 'Signer', 'UnrecoverableEntryException', 'UnrecoverableKeyException', 'UnresolvedPermission'
+            ),
+        40 => array (
+            'Acl', 'AclEntry', 'AclNotFoundException', 'Group', 'LastOwnerException', 'NotOwnerException', 'Owner'
+            ),
+        41 => array (
+            'CRL', 'CRLException', 'CRLSelector', 'CertPath', 'CertPath.CertPathRep', 'CertPathBuilder', 'CertPathBuilderException', 'CertPathBuilderResult', 'CertPathBuilderSpi', 'CertPathParameters', 'CertPathValidator', 'CertPathValidatorException', 'CertPathValidatorResult', 'CertPathValidatorSpi', 'CertSelector', 'CertStore', 'CertStoreException', 'CertStoreParameters', 'CertStoreSpi', 'Certificate.CertificateRep', 'CertificateFactory', 'CertificateFactorySpi', 'CollectionCertStoreParameters', 'LDAPCertStoreParameters', 'PKIXBuilderParameters', 'PKIXCertPathBuilderResult', 'PKIXCertPathChecker', 'PKIXCertPathValidatorResult', 'PKIXParameters', 'PolicyNode', 'PolicyQualifierInfo', 'TrustAnchor', 'X509CRL', 'X509CRLEntry', 'X509CRLSelector', 'X509CertSelector', 'X509Extension'
+            ),
+        42 => array (
+            'DSAKey', 'DSAKeyPairGenerator', 'DSAParams', 'DSAPrivateKey', 'DSAPublicKey', 'ECKey', 'ECPrivateKey', 'ECPublicKey', 'RSAKey', 'RSAMultiPrimePrivateCrtKey', 'RSAPrivateCrtKey', 'RSAPrivateKey', 'RSAPublicKey'
+            ),
+        43 => array (
+            'AlgorithmParameterSpec', 'DSAParameterSpec', 'DSAPrivateKeySpec', 'DSAPublicKeySpec', 'ECField', 'ECFieldF2m', 'ECFieldFp', 'ECGenParameterSpec', 'ECParameterSpec', 'ECPoint', 'ECPrivateKeySpec', 'ECPublicKeySpec', 'EllipticCurve', 'EncodedKeySpec', 'InvalidKeySpecException', 'InvalidParameterSpecException', 'KeySpec', 'MGF1ParameterSpec', 'PKCS8EncodedKeySpec', 'PSSParameterSpec', 'RSAKeyGenParameterSpec', 'RSAMultiPrimePrivateCrtKeySpec', 'RSAOtherPrimeInfo', 'RSAPrivateCrtKeySpec', 'RSAPrivateKeySpec', 'RSAPublicKeySpec', 'X509EncodedKeySpec'
+            ),
+        44 => array (
+            'BatchUpdateException', 'Blob', 'CallableStatement', 'Clob', 'Connection', 'DataTruncation', 'DatabaseMetaData', 'Driver', 'DriverManager', 'DriverPropertyInfo', 'ParameterMetaData', 'PreparedStatement', 'Ref', 'ResultSet', 'ResultSetMetaData', 'SQLData', 'SQLException', 'SQLInput', 'SQLOutput', 'SQLPermission', 'SQLWarning', 'Savepoint', 'Struct', 'Time', 'Types'
+            ),
+        45 => array (
+            'AttributedCharacterIterator', 'AttributedCharacterIterator.Attribute', 'AttributedString', 'Bidi', 'BreakIterator', 'CharacterIterator', 'ChoiceFormat', 'CollationElementIterator', 'CollationKey', 'Collator', 'DateFormat', 'DateFormat.Field', 'DateFormatSymbols', 'DecimalFormat', 'DecimalFormatSymbols', 'FieldPosition', 'Format', 'Format.Field', 'MessageFormat', 'MessageFormat.Field', 'NumberFormat', 'NumberFormat.Field', 'ParseException', 'ParsePosition', 'RuleBasedCollator', 'SimpleDateFormat', 'StringCharacterIterator'
+            ),
+        46 => array (
+            'AbstractCollection', 'AbstractList', 'AbstractMap', 'AbstractQueue', 'AbstractSequentialList', 'AbstractSet', 'ArrayList', 'Arrays', 'BitSet', 'Calendar', 'Collection', 'Collections', 'Comparator', 'ConcurrentModificationException', 'Currency', 'Dictionary', 'DuplicateFormatFlagsException', 'EmptyStackException', 'EnumMap', 'EnumSet', 'Enumeration', 'EventListenerProxy', 'EventObject', 'FormatFlagsConversionMismatchException', 'Formattable', 'FormattableFlags', 'Formatter.BigDecimalLayoutForm', 'FormatterClosedException', 'GregorianCalendar', 'HashMap', 'HashSet', 'Hashtable', 'IdentityHashMap', 'IllegalFormatCodePointException', 'IllegalFormatConversionException', 'IllegalFormatException', 'IllegalFormatFlagsException', 'IllegalFormatPrecisionException', 'IllegalFormatWidthException', 'InputMismatchException', 'InvalidPropertiesFormatException', 'Iterator', 'LinkedHashMap', 'LinkedHashSet', 'LinkedList', 'ListIterator', 'ListResourceBundle', 'Locale', 'Map', 'Map.Entry', 'MissingFormatArgumentException',
+            'MissingFormatWidthException', 'MissingResourceException', 'NoSuchElementException', 'Observable', 'Observer', 'PriorityQueue', 'Properties', 'PropertyPermission', 'PropertyResourceBundle', 'Queue', 'Random', 'RandomAccess', 'ResourceBundle', 'Scanner', 'Set', 'SimpleTimeZone', 'SortedMap', 'SortedSet', 'Stack', 'StringTokenizer', 'TimeZone', 'TimerTask', 'TooManyListenersException', 'TreeMap', 'TreeSet', 'UUID', 'UnknownFormatConversionException', 'UnknownFormatFlagsException', 'Vector', 'WeakHashMap'
+            ),
+        47 => array (
+            'AbstractExecutorService', 'ArrayBlockingQueue', 'BlockingQueue', 'BrokenBarrierException', 'Callable', 'CancellationException', 'CompletionService', 'ConcurrentHashMap', 'ConcurrentLinkedQueue', 'ConcurrentMap', 'CopyOnWriteArrayList', 'CopyOnWriteArraySet', 'CountDownLatch', 'CyclicBarrier', 'DelayQueue', 'Delayed', 'Exchanger', 'ExecutionException', 'Executor', 'ExecutorCompletionService', 'ExecutorService', 'Executors', 'Future', 'FutureTask', 'LinkedBlockingQueue', 'PriorityBlockingQueue', 'RejectedExecutionException', 'RejectedExecutionHandler', 'ScheduledExecutorService', 'ScheduledFuture', 'ScheduledThreadPoolExecutor', 'Semaphore', 'SynchronousQueue', 'ThreadFactory', 'ThreadPoolExecutor', 'ThreadPoolExecutor.AbortPolicy', 'ThreadPoolExecutor.CallerRunsPolicy', 'ThreadPoolExecutor.DiscardOldestPolicy', 'ThreadPoolExecutor.DiscardPolicy', 'TimeUnit', 'TimeoutException'
+            ),
+        48 => array (
+            'AtomicBoolean', 'AtomicInteger', 'AtomicIntegerArray', 'AtomicIntegerFieldUpdater', 'AtomicLong', 'AtomicLongArray', 'AtomicLongFieldUpdater', 'AtomicMarkableReference', 'AtomicReference', 'AtomicReferenceArray', 'AtomicReferenceFieldUpdater', 'AtomicStampedReference'
+            ),
+        49 => array (
+            'AbstractQueuedSynchronizer', 'Condition', 'Lock', 'LockSupport', 'ReadWriteLock', 'ReentrantLock', 'ReentrantReadWriteLock', 'ReentrantReadWriteLock.ReadLock', 'ReentrantReadWriteLock.WriteLock'
+            ),
+        50 => array (
+            'Attributes.Name', 'JarEntry', 'JarException', 'JarFile', 'JarInputStream', 'JarOutputStream', 'Manifest', 'Pack200', 'Pack200.Packer', 'Pack200.Unpacker'
+            ),
+        51 => array (
+            'ConsoleHandler', 'ErrorManager', 'FileHandler', 'Filter', 'Handler', 'Level', 'LogManager', 'LogRecord', 'Logger', 'LoggingMXBean', 'LoggingPermission', 'MemoryHandler', 'SimpleFormatter', 'SocketHandler', 'StreamHandler', 'XMLFormatter'
+            ),
+        52 => array (
+            'AbstractPreferences', 'BackingStoreException', 'InvalidPreferencesFormatException', 'NodeChangeEvent', 'NodeChangeListener', 'PreferenceChangeEvent', 'PreferenceChangeListener', 'Preferences', 'PreferencesFactory'
+            ),
+        53 => array (
+            'MatchResult', 'Matcher', 'Pattern', 'PatternSyntaxException'
+            ),
+        54 => array (
+            'Adler32', 'CRC32', 'CheckedInputStream', 'CheckedOutputStream', 'Checksum', 'DataFormatException', 'Deflater', 'DeflaterOutputStream', 'GZIPInputStream', 'GZIPOutputStream', 'Inflater', 'InflaterInputStream', 'ZipEntry', 'ZipException', 'ZipFile', 'ZipInputStream', 'ZipOutputStream'
+            ),
+        55 => array (
+            'Accessible', 'AccessibleAction', 'AccessibleAttributeSequence', 'AccessibleBundle', 'AccessibleComponent', 'AccessibleContext', 'AccessibleEditableText', 'AccessibleExtendedComponent', 'AccessibleExtendedTable', 'AccessibleExtendedText', 'AccessibleHyperlink', 'AccessibleHypertext', 'AccessibleIcon', 'AccessibleKeyBinding', 'AccessibleRelation', 'AccessibleRelationSet', 'AccessibleResourceBundle', 'AccessibleRole', 'AccessibleSelection', 'AccessibleState', 'AccessibleStateSet', 'AccessibleStreamable', 'AccessibleTable', 'AccessibleTableModelChange', 'AccessibleText', 'AccessibleTextSequence', 'AccessibleValue'
+            ),
+        56 => array (
+            'ActivityCompletedException', 'ActivityRequiredException', 'InvalidActivityException'
+            ),
+        57 => array (
+            'BadPaddingException', 'Cipher', 'CipherInputStream', 'CipherOutputStream', 'CipherSpi', 'EncryptedPrivateKeyInfo', 'ExemptionMechanism', 'ExemptionMechanismException', 'ExemptionMechanismSpi', 'IllegalBlockSizeException', 'KeyAgreement', 'KeyAgreementSpi', 'KeyGenerator', 'KeyGeneratorSpi', 'Mac', 'MacSpi', 'NoSuchPaddingException', 'NullCipher', 'SealedObject', 'SecretKey', 'SecretKeyFactory', 'SecretKeyFactorySpi', 'ShortBufferException'
+            ),
+        58 => array (
+            'DHKey', 'DHPrivateKey', 'DHPublicKey', 'PBEKey'
+            ),
+        59 => array (
+            'DESKeySpec', 'DESedeKeySpec', 'DHGenParameterSpec', 'DHParameterSpec', 'DHPrivateKeySpec', 'DHPublicKeySpec', 'IvParameterSpec', 'OAEPParameterSpec', 'PBEKeySpec', 'PBEParameterSpec', 'PSource', 'PSource.PSpecified', 'RC2ParameterSpec', 'RC5ParameterSpec', 'SecretKeySpec'
+            ),
+        60 => array (
+            'IIOException', 'IIOImage', 'IIOParam', 'IIOParamController', 'ImageIO', 'ImageReadParam', 'ImageReader', 'ImageTranscoder', 'ImageTypeSpecifier', 'ImageWriteParam', 'ImageWriter'
+            ),
+        61 => array (
+            'IIOReadProgressListener', 'IIOReadUpdateListener', 'IIOReadWarningListener', 'IIOWriteProgressListener', 'IIOWriteWarningListener'
+            ),
+        62 => array (
+            'IIOInvalidTreeException', 'IIOMetadata', 'IIOMetadataController', 'IIOMetadataFormat', 'IIOMetadataFormatImpl', 'IIOMetadataNode'
+            ),
+        63 => array (
+            'BMPImageWriteParam'
+            ),
+        64 => array (
+            'JPEGHuffmanTable', 'JPEGImageReadParam', 'JPEGImageWriteParam', 'JPEGQTable'
+            ),
+        65 => array (
+            'IIORegistry', 'IIOServiceProvider', 'ImageInputStreamSpi', 'ImageOutputStreamSpi', 'ImageReaderSpi', 'ImageReaderWriterSpi', 'ImageTranscoderSpi', 'ImageWriterSpi', 'RegisterableService', 'ServiceRegistry', 'ServiceRegistry.Filter'
+            ),
+        66 => array (
+            'FileCacheImageInputStream', 'FileCacheImageOutputStream', 'FileImageInputStream', 'FileImageOutputStream', 'IIOByteBuffer', 'ImageInputStream', 'ImageInputStreamImpl', 'ImageOutputStream', 'ImageOutputStreamImpl', 'MemoryCacheImageInputStream', 'MemoryCacheImageOutputStream'
+            ),
+        67 => array (
+            'AttributeChangeNotification', 'AttributeChangeNotificationFilter', 'AttributeNotFoundException', 'AttributeValueExp', 'BadAttributeValueExpException', 'BadBinaryOpValueExpException', 'BadStringOperationException', 'Descriptor', 'DescriptorAccess', 'DynamicMBean', 'InstanceAlreadyExistsException', 'InstanceNotFoundException', 'InvalidApplicationException', 'JMException', 'JMRuntimeException', 'ListenerNotFoundException', 'MBeanAttributeInfo', 'MBeanConstructorInfo', 'MBeanException', 'MBeanFeatureInfo', 'MBeanInfo', 'MBeanNotificationInfo', 'MBeanOperationInfo', 'MBeanParameterInfo', 'MBeanPermission', 'MBeanRegistration', 'MBeanRegistrationException', 'MBeanServer', 'MBeanServerBuilder', 'MBeanServerConnection', 'MBeanServerDelegate', 'MBeanServerDelegateMBean', 'MBeanServerFactory', 'MBeanServerInvocationHandler', 'MBeanServerNotification', 'MBeanServerPermission', 'MBeanTrustPermission', 'MalformedObjectNameException', 'NotCompliantMBeanException', 'Notification', 'NotificationBroadcaster',
+            'NotificationBroadcasterSupport', 'NotificationEmitter', 'NotificationFilter', 'NotificationFilterSupport', 'NotificationListener', 'ObjectInstance', 'ObjectName', 'OperationsException', 'PersistentMBean', 'Query', 'QueryEval', 'QueryExp', 'ReflectionException', 'RuntimeErrorException', 'RuntimeMBeanException', 'RuntimeOperationsException', 'ServiceNotFoundException', 'StandardMBean', 'StringValueExp', 'ValueExp'
+            ),
+        68 => array (
+            'ClassLoaderRepository', 'MLet', 'MLetMBean', 'PrivateClassLoader', 'PrivateMLet'
+            ),
+        69 => array (
+            'DescriptorSupport', 'InvalidTargetObjectTypeException', 'ModelMBean', 'ModelMBeanAttributeInfo', 'ModelMBeanConstructorInfo', 'ModelMBeanInfo', 'ModelMBeanInfoSupport', 'ModelMBeanNotificationBroadcaster', 'ModelMBeanNotificationInfo', 'ModelMBeanOperationInfo', 'RequiredModelMBean', 'XMLParseException'
+            ),
+        70 => array (
+            'CounterMonitor', 'CounterMonitorMBean', 'GaugeMonitor', 'GaugeMonitorMBean', 'Monitor', 'MonitorMBean', 'MonitorNotification', 'MonitorSettingException', 'StringMonitor', 'StringMonitorMBean'
+            ),
+        71 => array (
+            'ArrayType', 'CompositeData', 'CompositeDataSupport', 'CompositeType', 'InvalidOpenTypeException', 'KeyAlreadyExistsException', 'OpenDataException', 'OpenMBeanAttributeInfo', 'OpenMBeanAttributeInfoSupport', 'OpenMBeanConstructorInfo', 'OpenMBeanConstructorInfoSupport', 'OpenMBeanInfo', 'OpenMBeanInfoSupport', 'OpenMBeanOperationInfo', 'OpenMBeanOperationInfoSupport', 'OpenMBeanParameterInfo', 'OpenMBeanParameterInfoSupport', 'SimpleType', 'TabularData', 'TabularDataSupport', 'TabularType'
+            ),
+        72 => array (
+            'InvalidRelationIdException', 'InvalidRelationServiceException', 'InvalidRelationTypeException', 'InvalidRoleInfoException', 'InvalidRoleValueException', 'MBeanServerNotificationFilter', 'Relation', 'RelationException', 'RelationNotFoundException', 'RelationNotification', 'RelationService', 'RelationServiceMBean', 'RelationServiceNotRegisteredException', 'RelationSupport', 'RelationSupportMBean', 'RelationType', 'RelationTypeNotFoundException', 'RelationTypeSupport', 'Role', 'RoleInfo', 'RoleInfoNotFoundException', 'RoleList', 'RoleNotFoundException', 'RoleResult', 'RoleStatus', 'RoleUnresolved', 'RoleUnresolvedList'
+            ),
+        73 => array (
+            'JMXAuthenticator', 'JMXConnectionNotification', 'JMXConnector', 'JMXConnectorFactory', 'JMXConnectorProvider', 'JMXConnectorServer', 'JMXConnectorServerFactory', 'JMXConnectorServerMBean', 'JMXConnectorServerProvider', 'JMXPrincipal', 'JMXProviderException', 'JMXServerErrorException', 'JMXServiceURL', 'MBeanServerForwarder', 'NotificationResult', 'SubjectDelegationPermission', 'TargetedNotification'
+            ),
+        74 => array (
+            'RMIConnection', 'RMIConnectionImpl', 'RMIConnectionImpl_Stub', 'RMIConnector', 'RMIConnectorServer', 'RMIIIOPServerImpl', 'RMIJRMPServerImpl', 'RMIServer', 'RMIServerImpl', 'RMIServerImpl_Stub'
+            ),
+        75 => array (
+            'TimerAlarmClockNotification', 'TimerMBean', 'TimerNotification'
+            ),
+        76 => array (
+            'AuthenticationNotSupportedException', 'BinaryRefAddr', 'CannotProceedException', 'CommunicationException', 'CompositeName', 'CompoundName', 'ConfigurationException', 'ContextNotEmptyException', 'InitialContext', 'InsufficientResourcesException', 'InterruptedNamingException', 'InvalidNameException', 'LimitExceededException', 'LinkException', 'LinkLoopException', 'LinkRef', 'MalformedLinkException', 'Name', 'NameAlreadyBoundException', 'NameClassPair', 'NameNotFoundException', 'NameParser', 'NamingEnumeration', 'NamingException', 'NamingSecurityException', 'NoInitialContextException', 'NoPermissionException', 'NotContextException', 'OperationNotSupportedException', 'PartialResultException', 'RefAddr', 'Referenceable', 'ReferralException', 'ServiceUnavailableException', 'SizeLimitExceededException', 'StringRefAddr', 'TimeLimitExceededException'
+            ),
+        77 => array (
+            'AttributeInUseException', 'AttributeModificationException', 'BasicAttribute', 'BasicAttributes', 'DirContext', 'InitialDirContext', 'InvalidAttributeIdentifierException', 'InvalidAttributesException', 'InvalidSearchControlsException', 'InvalidSearchFilterException', 'ModificationItem', 'NoSuchAttributeException', 'SchemaViolationException', 'SearchControls', 'SearchResult'
+            ),
+        78 => array (
+            'EventContext', 'EventDirContext', 'NamespaceChangeListener', 'NamingEvent', 'NamingExceptionEvent', 'NamingListener', 'ObjectChangeListener'
+            ),
+        79 => array (
+            'BasicControl', 'ControlFactory', 'ExtendedRequest', 'ExtendedResponse', 'HasControls', 'InitialLdapContext', 'LdapContext', 'LdapName', 'LdapReferralException', 'ManageReferralControl', 'PagedResultsControl', 'PagedResultsResponseControl', 'Rdn', 'SortControl', 'SortKey', 'SortResponseControl', 'StartTlsRequest', 'StartTlsResponse', 'UnsolicitedNotification', 'UnsolicitedNotificationEvent', 'UnsolicitedNotificationListener'
+            ),
+        80 => array (
+            'DirObjectFactory', 'DirStateFactory', 'DirStateFactory.Result', 'DirectoryManager', 'InitialContextFactory', 'InitialContextFactoryBuilder', 'NamingManager', 'ObjectFactory', 'ObjectFactoryBuilder', 'ResolveResult', 'Resolver', 'StateFactory'
+            ),
+        81 => array (
+            'ServerSocketFactory', 'SocketFactory'
+            ),
+        82 => array (
+            'CertPathTrustManagerParameters', 'HandshakeCompletedEvent', 'HandshakeCompletedListener', 'HostnameVerifier', 'HttpsURLConnection', 'KeyManager', 'KeyManagerFactory', 'KeyManagerFactorySpi', 'KeyStoreBuilderParameters', 'ManagerFactoryParameters', 'SSLContext', 'SSLContextSpi', 'SSLEngine', 'SSLEngineResult', 'SSLEngineResult.HandshakeStatus', 'SSLEngineResult.Status', 'SSLException', 'SSLHandshakeException', 'SSLKeyException', 'SSLPeerUnverifiedException', 'SSLPermission', 'SSLProtocolException', 'SSLServerSocket', 'SSLServerSocketFactory', 'SSLSession', 'SSLSessionBindingEvent', 'SSLSessionBindingListener', 'SSLSessionContext', 'SSLSocket', 'SSLSocketFactory', 'TrustManager', 'TrustManagerFactory', 'TrustManagerFactorySpi', 'X509ExtendedKeyManager', 'X509KeyManager', 'X509TrustManager'
+            ),
+        83 => array (
+            'AttributeException', 'CancelablePrintJob', 'Doc', 'DocFlavor', 'DocFlavor.BYTE_ARRAY', 'DocFlavor.CHAR_ARRAY', 'DocFlavor.INPUT_STREAM', 'DocFlavor.READER', 'DocFlavor.SERVICE_FORMATTED', 'DocFlavor.STRING', 'DocFlavor.URL', 'DocPrintJob', 'FlavorException', 'MultiDoc', 'MultiDocPrintJob', 'MultiDocPrintService', 'PrintException', 'PrintService', 'PrintServiceLookup', 'ServiceUI', 'ServiceUIFactory', 'SimpleDoc', 'StreamPrintService', 'StreamPrintServiceFactory', 'URIException'
+            ),
+        84 => array (
+            'AttributeSetUtilities', 'DateTimeSyntax', 'DocAttribute', 'DocAttributeSet', 'EnumSyntax', 'HashAttributeSet', 'HashDocAttributeSet', 'HashPrintJobAttributeSet', 'HashPrintRequestAttributeSet', 'HashPrintServiceAttributeSet', 'IntegerSyntax', 'PrintJobAttribute', 'PrintJobAttributeSet', 'PrintRequestAttribute', 'PrintRequestAttributeSet', 'PrintServiceAttribute', 'PrintServiceAttributeSet', 'ResolutionSyntax', 'SetOfIntegerSyntax', 'Size2DSyntax', 'SupportedValuesAttribute', 'TextSyntax', 'URISyntax', 'UnmodifiableSetException'
+            ),
+        85 => array (
+            'Chromaticity', 'ColorSupported', 'Compression', 'Copies', 'CopiesSupported', 'DateTimeAtCompleted', 'DateTimeAtCreation', 'DateTimeAtProcessing', 'Destination', 'DocumentName', 'Fidelity', 'Finishings', 'JobHoldUntil', 'JobImpressions', 'JobImpressionsCompleted', 'JobImpressionsSupported', 'JobKOctets', 'JobKOctetsProcessed', 'JobKOctetsSupported', 'JobMediaSheets', 'JobMediaSheetsCompleted', 'JobMediaSheetsSupported', 'JobMessageFromOperator', 'JobName', 'JobOriginatingUserName', 'JobPriority', 'JobPrioritySupported', 'JobSheets', 'JobState', 'JobStateReason', 'JobStateReasons', 'Media', 'MediaName', 'MediaPrintableArea', 'MediaSize', 'MediaSize.Engineering', 'MediaSize.ISO', 'MediaSize.JIS', 'MediaSize.NA', 'MediaSize.Other', 'MediaSizeName', 'MediaTray', 'MultipleDocumentHandling', 'NumberOfDocuments', 'NumberOfInterveningJobs', 'NumberUp', 'NumberUpSupported', 'OrientationRequested', 'OutputDeviceAssigned', 'PDLOverrideSupported', 'PageRanges', 'PagesPerMinute', 'PagesPerMinuteColor',
+            'PresentationDirection', 'PrintQuality', 'PrinterInfo', 'PrinterIsAcceptingJobs', 'PrinterLocation', 'PrinterMakeAndModel', 'PrinterMessageFromOperator', 'PrinterMoreInfo', 'PrinterMoreInfoManufacturer', 'PrinterName', 'PrinterResolution', 'PrinterState', 'PrinterStateReason', 'PrinterStateReasons', 'PrinterURI', 'QueuedJobCount', 'ReferenceUriSchemesSupported', 'RequestingUserName', 'Severity', 'SheetCollate', 'Sides'
+            ),
+        86 => array (
+            'PrintEvent', 'PrintJobAdapter', 'PrintJobAttributeEvent', 'PrintJobAttributeListener', 'PrintJobEvent', 'PrintJobListener', 'PrintServiceAttributeEvent', 'PrintServiceAttributeListener'
+            ),
+        87 => array (
+            'PortableRemoteObject'
+            ),
+        88 => array (
+            'ClassDesc', 'PortableRemoteObjectDelegate', 'Stub', 'StubDelegate', 'Tie', 'Util', 'UtilDelegate', 'ValueHandler', 'ValueHandlerMultiFormat'
+            ),
+        89 => array (
+            'SslRMIClientSocketFactory', 'SslRMIServerSocketFactory'
+            ),
+        90 => array (
+            'AuthPermission', 'DestroyFailedException', 'Destroyable', 'PrivateCredentialPermission', 'RefreshFailedException', 'Refreshable', 'Subject', 'SubjectDomainCombiner'
+            ),
+        91 => array (
+            'Callback', 'CallbackHandler', 'ChoiceCallback', 'ConfirmationCallback', 'LanguageCallback', 'NameCallback', 'PasswordCallback', 'TextInputCallback', 'TextOutputCallback', 'UnsupportedCallbackException'
+            ),
+        92 => array (
+            'DelegationPermission', 'KerberosKey', 'KerberosPrincipal', 'KerberosTicket', 'ServicePermission'
+            ),
+        93 => array (
+            'AccountException', 'AccountExpiredException', 'AccountLockedException', 'AccountNotFoundException', 'AppConfigurationEntry', 'AppConfigurationEntry.LoginModuleControlFlag', 'Configuration', 'CredentialException', 'CredentialExpiredException', 'CredentialNotFoundException', 'FailedLoginException', 'LoginContext', 'LoginException'
+            ),
+        94 => array (
+            'LoginModule'
+            ),
+        95 => array (
+            'X500Principal', 'X500PrivateCredential'
+            ),
+        96 => array (
+            'AuthorizeCallback', 'RealmCallback', 'RealmChoiceCallback', 'Sasl', 'SaslClient', 'SaslClientFactory', 'SaslException', 'SaslServer', 'SaslServerFactory'
+            ),
+        97 => array (
+            'ControllerEventListener', 'Instrument', 'InvalidMidiDataException', 'MetaEventListener', 'MetaMessage', 'MidiChannel', 'MidiDevice', 'MidiDevice.Info', 'MidiEvent', 'MidiFileFormat', 'MidiMessage', 'MidiSystem', 'MidiUnavailableException', 'Patch', 'Receiver', 'Sequence', 'Sequencer', 'Sequencer.SyncMode', 'ShortMessage', 'Soundbank', 'SoundbankResource', 'Synthesizer', 'SysexMessage', 'Track', 'Transmitter', 'VoiceStatus'
+            ),
+        98 => array (
+            'MidiDeviceProvider', 'MidiFileReader', 'MidiFileWriter', 'SoundbankReader'
+            ),
+        99 => array (
+            'AudioFileFormat', 'AudioFileFormat.Type', 'AudioFormat', 'AudioFormat.Encoding', 'AudioInputStream', 'AudioPermission', 'AudioSystem', 'BooleanControl', 'BooleanControl.Type', 'Clip', 'CompoundControl', 'CompoundControl.Type', 'Control.Type', 'DataLine', 'DataLine.Info', 'EnumControl', 'EnumControl.Type', 'FloatControl', 'FloatControl.Type', 'Line', 'Line.Info', 'LineEvent', 'LineEvent.Type', 'LineListener', 'LineUnavailableException', 'Mixer', 'Mixer.Info', 'Port', 'Port.Info', 'ReverbType', 'SourceDataLine', 'TargetDataLine', 'UnsupportedAudioFileException'
+            ),
+        100 => array (
+            'AudioFileReader', 'AudioFileWriter', 'FormatConversionProvider', 'MixerProvider'
+            ),
+        101 => array (
+            'ConnectionEvent', 'ConnectionEventListener', 'ConnectionPoolDataSource', 'DataSource', 'PooledConnection', 'RowSet', 'RowSetEvent', 'RowSetInternal', 'RowSetListener', 'RowSetMetaData', 'RowSetReader', 'RowSetWriter', 'XAConnection', 'XADataSource'
+            ),
+        102 => array (
+            'BaseRowSet', 'CachedRowSet', 'FilteredRowSet', 'JdbcRowSet', 'JoinRowSet', 'Joinable', 'Predicate', 'RowSetMetaDataImpl', 'RowSetWarning', 'WebRowSet'
+            ),
+        103 => array (
+            'SQLInputImpl', 'SQLOutputImpl', 'SerialArray', 'SerialBlob', 'SerialClob', 'SerialDatalink', 'SerialException', 'SerialJavaObject', 'SerialRef', 'SerialStruct'
+            ),
+        104 => array (
+            'SyncFactory', 'SyncFactoryException', 'SyncProvider', 'SyncProviderException', 'SyncResolver', 'TransactionalWriter', 'XmlReader', 'XmlWriter'
+            ),
+        105 => array (
+            'AbstractAction', 'AbstractButton', 'AbstractCellEditor', 'AbstractListModel', 'AbstractSpinnerModel', 'Action', 'ActionMap', 'BorderFactory', 'BoundedRangeModel', 'Box', 'Box.Filler', 'BoxLayout', 'ButtonGroup', 'ButtonModel', 'CellEditor', 'CellRendererPane', 'ComboBoxEditor', 'ComboBoxModel', 'ComponentInputMap', 'DebugGraphics', 'DefaultBoundedRangeModel', 'DefaultButtonModel', 'DefaultCellEditor', 'DefaultComboBoxModel', 'DefaultDesktopManager', 'DefaultFocusManager', 'DefaultListCellRenderer', 'DefaultListCellRenderer.UIResource', 'DefaultListModel', 'DefaultListSelectionModel', 'DefaultSingleSelectionModel', 'DesktopManager', 'FocusManager', 'GrayFilter', 'Icon', 'ImageIcon', 'InputMap', 'InputVerifier', 'InternalFrameFocusTraversalPolicy', 'JApplet', 'JButton', 'JCheckBox', 'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox', 'JComboBox.KeySelectionManager', 'JComponent', 'JDesktopPane', 'JDialog', 'JEditorPane', 'JFileChooser', 'JFormattedTextField', 'JFormattedTextField.AbstractFormatter',
+            'JFormattedTextField.AbstractFormatterFactory', 'JFrame', 'JInternalFrame', 'JInternalFrame.JDesktopIcon', 'JLabel', 'JLayeredPane', 'JList', 'JMenu', 'JMenuBar', 'JMenuItem', 'JOptionPane', 'JPanel', 'JPasswordField', 'JPopupMenu', 'JPopupMenu.Separator', 'JProgressBar', 'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane', 'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider', 'JSpinner', 'JSpinner.DateEditor', 'JSpinner.DefaultEditor', 'JSpinner.ListEditor', 'JSpinner.NumberEditor', 'JSplitPane', 'JTabbedPane', 'JTable', 'JTable.PrintMode', 'JTextArea', 'JTextField', 'JTextPane', 'JToggleButton', 'JToggleButton.ToggleButtonModel', 'JToolBar', 'JToolBar.Separator', 'JToolTip', 'JTree', 'JTree.DynamicUtilTreeNode', 'JTree.EmptySelectionModel', 'JViewport', 'JWindow', 'KeyStroke', 'LayoutFocusTraversalPolicy', 'ListCellRenderer', 'ListModel', 'ListSelectionModel', 'LookAndFeel', 'MenuElement', 'MenuSelectionManager', 'MutableComboBoxModel', 'OverlayLayout', 'Popup', 'PopupFactory', 'ProgressMonitor',
+            'ProgressMonitorInputStream', 'Renderer', 'RepaintManager', 'RootPaneContainer', 'ScrollPaneConstants', 'ScrollPaneLayout', 'ScrollPaneLayout.UIResource', 'Scrollable', 'SingleSelectionModel', 'SizeRequirements', 'SizeSequence', 'SortingFocusTraversalPolicy', 'SpinnerDateModel', 'SpinnerListModel', 'SpinnerModel', 'SpinnerNumberModel', 'Spring', 'SpringLayout', 'SpringLayout.Constraints', 'SwingConstants', 'SwingUtilities', 'ToolTipManager', 'TransferHandler', 'UIDefaults', 'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap', 'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue', 'UIManager', 'UIManager.LookAndFeelInfo', 'UnsupportedLookAndFeelException', 'ViewportLayout', 'WindowConstants'
+            ),
+        106 => array (
+            'AbstractBorder', 'BevelBorder', 'Border', 'CompoundBorder', 'EmptyBorder', 'EtchedBorder', 'LineBorder', 'MatteBorder', 'SoftBevelBorder', 'TitledBorder'
+            ),
+        107 => array (
+            'AbstractColorChooserPanel', 'ColorChooserComponentFactory', 'ColorSelectionModel', 'DefaultColorSelectionModel'
+            ),
+        108 => array (
+            'AncestorEvent', 'AncestorListener', 'CaretEvent', 'CaretListener', 'CellEditorListener', 'ChangeEvent', 'ChangeListener', 'DocumentEvent.ElementChange', 'DocumentEvent.EventType', 'DocumentListener', 'EventListenerList', 'HyperlinkEvent', 'HyperlinkEvent.EventType', 'HyperlinkListener', 'InternalFrameAdapter', 'InternalFrameEvent', 'InternalFrameListener', 'ListDataEvent', 'ListDataListener', 'ListSelectionEvent', 'ListSelectionListener', 'MenuDragMouseEvent', 'MenuDragMouseListener', 'MenuEvent', 'MenuKeyEvent', 'MenuKeyListener', 'MenuListener', 'MouseInputAdapter', 'MouseInputListener', 'PopupMenuEvent', 'PopupMenuListener', 'SwingPropertyChangeSupport', 'TableColumnModelEvent', 'TableColumnModelListener', 'TableModelEvent', 'TableModelListener', 'TreeExpansionEvent', 'TreeExpansionListener', 'TreeModelEvent', 'TreeModelListener', 'TreeSelectionEvent', 'TreeSelectionListener', 'TreeWillExpandListener', 'UndoableEditEvent', 'UndoableEditListener'
+            ),
+        109 => array (
+            'FileSystemView', 'FileView'
+            ),
+        110 => array (
+            'ActionMapUIResource', 'BorderUIResource', 'BorderUIResource.BevelBorderUIResource', 'BorderUIResource.CompoundBorderUIResource', 'BorderUIResource.EmptyBorderUIResource', 'BorderUIResource.EtchedBorderUIResource', 'BorderUIResource.LineBorderUIResource', 'BorderUIResource.MatteBorderUIResource', 'BorderUIResource.TitledBorderUIResource', 'ButtonUI', 'ColorChooserUI', 'ColorUIResource', 'ComboBoxUI', 'ComponentInputMapUIResource', 'ComponentUI', 'DesktopIconUI', 'DesktopPaneUI', 'DimensionUIResource', 'FileChooserUI', 'FontUIResource', 'IconUIResource', 'InputMapUIResource', 'InsetsUIResource', 'InternalFrameUI', 'LabelUI', 'ListUI', 'MenuBarUI', 'MenuItemUI', 'OptionPaneUI', 'PanelUI', 'PopupMenuUI', 'ProgressBarUI', 'RootPaneUI', 'ScrollBarUI', 'ScrollPaneUI', 'SeparatorUI', 'SliderUI', 'SpinnerUI', 'SplitPaneUI', 'TabbedPaneUI', 'TableHeaderUI', 'TableUI', 'TextUI', 'ToolBarUI', 'ToolTipUI', 'TreeUI', 'UIResource', 'ViewportUI'
+            ),
+        111 => array (
+            'BasicArrowButton', 'BasicBorders', 'BasicBorders.ButtonBorder', 'BasicBorders.FieldBorder', 'BasicBorders.MarginBorder', 'BasicBorders.MenuBarBorder', 'BasicBorders.RadioButtonBorder', 'BasicBorders.RolloverButtonBorder', 'BasicBorders.SplitPaneBorder', 'BasicBorders.ToggleButtonBorder', 'BasicButtonListener', 'BasicButtonUI', 'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI', 'BasicColorChooserUI', 'BasicComboBoxEditor', 'BasicComboBoxEditor.UIResource', 'BasicComboBoxRenderer', 'BasicComboBoxRenderer.UIResource', 'BasicComboBoxUI', 'BasicComboPopup', 'BasicDesktopIconUI', 'BasicDesktopPaneUI', 'BasicDirectoryModel', 'BasicEditorPaneUI', 'BasicFileChooserUI', 'BasicFormattedTextFieldUI', 'BasicGraphicsUtils', 'BasicHTML', 'BasicIconFactory', 'BasicInternalFrameTitlePane', 'BasicInternalFrameUI', 'BasicLabelUI', 'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI', 'BasicMenuItemUI', 'BasicMenuUI', 'BasicOptionPaneUI', 'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI', 'BasicPasswordFieldUI',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI', 'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI', 'BasicRadioButtonUI', 'BasicRootPaneUI', 'BasicScrollBarUI', 'BasicScrollPaneUI', 'BasicSeparatorUI', 'BasicSliderUI', 'BasicSpinnerUI', 'BasicSplitPaneDivider', 'BasicSplitPaneUI', 'BasicTabbedPaneUI', 'BasicTableHeaderUI', 'BasicTableUI', 'BasicTextAreaUI', 'BasicTextFieldUI', 'BasicTextPaneUI', 'BasicTextUI', 'BasicTextUI.BasicCaret', 'BasicTextUI.BasicHighlighter', 'BasicToggleButtonUI', 'BasicToolBarSeparatorUI', 'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI', 'BasicViewportUI', 'ComboPopup', 'DefaultMenuLayout'
+            ),
+        112 => array (
+            'DefaultMetalTheme', 'MetalBorders', 'MetalBorders.ButtonBorder', 'MetalBorders.Flush3DBorder', 'MetalBorders.InternalFrameBorder', 'MetalBorders.MenuBarBorder', 'MetalBorders.MenuItemBorder', 'MetalBorders.OptionDialogBorder', 'MetalBorders.PaletteBorder', 'MetalBorders.PopupMenuBorder', 'MetalBorders.RolloverButtonBorder', 'MetalBorders.ScrollPaneBorder', 'MetalBorders.TableHeaderBorder', 'MetalBorders.TextFieldBorder', 'MetalBorders.ToggleButtonBorder', 'MetalBorders.ToolBarBorder', 'MetalButtonUI', 'MetalCheckBoxIcon', 'MetalCheckBoxUI', 'MetalComboBoxButton', 'MetalComboBoxEditor', 'MetalComboBoxEditor.UIResource', 'MetalComboBoxIcon', 'MetalComboBoxUI', 'MetalDesktopIconUI', 'MetalFileChooserUI', 'MetalIconFactory', 'MetalIconFactory.FileIcon16', 'MetalIconFactory.FolderIcon16', 'MetalIconFactory.PaletteCloseIcon', 'MetalIconFactory.TreeControlIcon', 'MetalIconFactory.TreeFolderIcon', 'MetalIconFactory.TreeLeafIcon', 'MetalInternalFrameTitlePane', 'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalMenuBarUI', 'MetalPopupMenuSeparatorUI', 'MetalProgressBarUI', 'MetalRadioButtonUI', 'MetalRootPaneUI', 'MetalScrollBarUI', 'MetalScrollButton', 'MetalScrollPaneUI', 'MetalSeparatorUI', 'MetalSliderUI', 'MetalSplitPaneUI', 'MetalTabbedPaneUI', 'MetalTextFieldUI', 'MetalTheme', 'MetalToggleButtonUI', 'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI', 'OceanTheme'
+            ),
+        113 => array (
+            'MultiButtonUI', 'MultiColorChooserUI', 'MultiComboBoxUI', 'MultiDesktopIconUI', 'MultiDesktopPaneUI', 'MultiFileChooserUI', 'MultiInternalFrameUI', 'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel', 'MultiMenuBarUI', 'MultiMenuItemUI', 'MultiOptionPaneUI', 'MultiPanelUI', 'MultiPopupMenuUI', 'MultiProgressBarUI', 'MultiRootPaneUI', 'MultiScrollBarUI', 'MultiScrollPaneUI', 'MultiSeparatorUI', 'MultiSliderUI', 'MultiSpinnerUI', 'MultiSplitPaneUI', 'MultiTabbedPaneUI', 'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI', 'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI', 'MultiViewportUI'
+            ),
+        114 => array (
+            'ColorType', 'Region', 'SynthConstants', 'SynthContext', 'SynthGraphicsUtils', 'SynthLookAndFeel', 'SynthPainter', 'SynthStyle', 'SynthStyleFactory'
+            ),
+        115 => array (
+            'AbstractTableModel', 'DefaultTableCellRenderer', 'DefaultTableCellRenderer.UIResource', 'DefaultTableColumnModel', 'DefaultTableModel', 'JTableHeader', 'TableCellEditor', 'TableCellRenderer', 'TableColumn', 'TableColumnModel', 'TableModel'
+            ),
+        116 => array (
+            'AbstractDocument', 'AbstractDocument.AttributeContext', 'AbstractDocument.Content', 'AbstractDocument.ElementEdit', 'AbstractWriter', 'AsyncBoxView', 'AttributeSet.CharacterAttribute', 'AttributeSet.ColorAttribute', 'AttributeSet.FontAttribute', 'AttributeSet.ParagraphAttribute', 'BadLocationException', 'BoxView', 'Caret', 'ChangedCharSetException', 'ComponentView', 'CompositeView', 'DateFormatter', 'DefaultCaret', 'DefaultEditorKit', 'DefaultEditorKit.BeepAction', 'DefaultEditorKit.CopyAction', 'DefaultEditorKit.CutAction', 'DefaultEditorKit.DefaultKeyTypedAction', 'DefaultEditorKit.InsertBreakAction', 'DefaultEditorKit.InsertContentAction', 'DefaultEditorKit.InsertTabAction', 'DefaultEditorKit.PasteAction', 'DefaultFormatter', 'DefaultFormatterFactory', 'DefaultHighlighter', 'DefaultHighlighter.DefaultHighlightPainter', 'DefaultStyledDocument', 'DefaultStyledDocument.AttributeUndoableEdit', 'DefaultStyledDocument.ElementSpec', 'DefaultTextUI', 'DocumentFilter', 'DocumentFilter.FilterBypass',
+            'EditorKit', 'ElementIterator', 'FieldView', 'FlowView', 'FlowView.FlowStrategy', 'GapContent', 'GlyphView', 'GlyphView.GlyphPainter', 'Highlighter', 'Highlighter.Highlight', 'Highlighter.HighlightPainter', 'IconView', 'InternationalFormatter', 'JTextComponent', 'JTextComponent.KeyBinding', 'Keymap', 'LabelView', 'LayeredHighlighter', 'LayeredHighlighter.LayerPainter', 'LayoutQueue', 'MaskFormatter', 'MutableAttributeSet', 'NavigationFilter', 'NavigationFilter.FilterBypass', 'NumberFormatter', 'PasswordView', 'PlainDocument', 'PlainView', 'Position', 'Position.Bias', 'Segment', 'SimpleAttributeSet', 'StringContent', 'Style', 'StyleConstants', 'StyleConstants.CharacterConstants', 'StyleConstants.ColorConstants', 'StyleConstants.FontConstants', 'StyleConstants.ParagraphConstants', 'StyleContext', 'StyledDocument', 'StyledEditorKit', 'StyledEditorKit.AlignmentAction', 'StyledEditorKit.BoldAction', 'StyledEditorKit.FontFamilyAction', 'StyledEditorKit.FontSizeAction', 'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction', 'StyledEditorKit.StyledTextAction', 'StyledEditorKit.UnderlineAction', 'TabExpander', 'TabSet', 'TabStop', 'TabableView', 'TableView', 'TextAction', 'Utilities', 'View', 'ViewFactory', 'WrappedPlainView', 'ZoneView'
+            ),
+        117 => array (
+            'BlockView', 'CSS', 'CSS.Attribute', 'FormSubmitEvent', 'FormSubmitEvent.MethodType', 'FormView', 'HTML', 'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag', 'HTMLDocument', 'HTMLDocument.Iterator', 'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory', 'HTMLEditorKit.HTMLTextAction', 'HTMLEditorKit.InsertHTMLTextAction', 'HTMLEditorKit.LinkController', 'HTMLEditorKit.Parser', 'HTMLEditorKit.ParserCallback', 'HTMLFrameHyperlinkEvent', 'HTMLWriter', 'ImageView', 'InlineView', 'ListView', 'MinimalHTMLWriter', 'ObjectView', 'Option', 'StyleSheet', 'StyleSheet.BoxPainter', 'StyleSheet.ListPainter'
+            ),
+        118 => array (
+            'ContentModel', 'DTD', 'DTDConstants', 'DocumentParser', 'ParserDelegator', 'TagElement'
+            ),
+        119 => array (
+            'RTFEditorKit'
+            ),
+        120 => array (
+            'AbstractLayoutCache', 'AbstractLayoutCache.NodeDimensions', 'DefaultMutableTreeNode', 'DefaultTreeCellEditor', 'DefaultTreeCellRenderer', 'DefaultTreeModel', 'DefaultTreeSelectionModel', 'ExpandVetoException', 'FixedHeightLayoutCache', 'MutableTreeNode', 'RowMapper', 'TreeCellEditor', 'TreeCellRenderer', 'TreeModel', 'TreeNode', 'TreePath', 'TreeSelectionModel', 'VariableHeightLayoutCache'
+            ),
+        121 => array (
+            'AbstractUndoableEdit', 'CannotRedoException', 'CannotUndoException', 'CompoundEdit', 'StateEdit', 'StateEditable', 'UndoManager', 'UndoableEdit', 'UndoableEditSupport'
+            ),
+        122 => array (
+            'InvalidTransactionException', 'TransactionRequiredException', 'TransactionRolledbackException'
+            ),
+        123 => array (
+            'XAException', 'XAResource', 'Xid'
+            ),
+        124 => array (
+            'XMLConstants'
+            ),
+        125 => array (
+            'DatatypeConfigurationException', 'DatatypeConstants', 'DatatypeConstants.Field', 'DatatypeFactory', 'Duration', 'XMLGregorianCalendar'
+            ),
+        126 => array (
+            'NamespaceContext', 'QName'
+            ),
+        127 => array (
+            'DocumentBuilder', 'DocumentBuilderFactory', 'FactoryConfigurationError', 'ParserConfigurationException', 'SAXParser', 'SAXParserFactory'
+            ),
+        128 => array (
+            'ErrorListener', 'OutputKeys', 'Result', 'Source', 'SourceLocator', 'Templates', 'Transformer', 'TransformerConfigurationException', 'TransformerException', 'TransformerFactory', 'TransformerFactoryConfigurationError', 'URIResolver'
+            ),
+        129 => array (
+            'DOMResult', 'DOMSource'
+            ),
+        130 => array (
+            'SAXResult', 'SAXSource', 'SAXTransformerFactory', 'TemplatesHandler', 'TransformerHandler'
+            ),
+        131 => array (
+            'StreamResult', 'StreamSource'
+            ),
+        132 => array (
+            'Schema', 'SchemaFactory', 'SchemaFactoryLoader', 'TypeInfoProvider', 'Validator', 'ValidatorHandler'
+            ),
+        133 => array (
+            'XPath', 'XPathConstants', 'XPathException', 'XPathExpression', 'XPathExpressionException', 'XPathFactory', 'XPathFactoryConfigurationException', 'XPathFunction', 'XPathFunctionException', 'XPathFunctionResolver', 'XPathVariableResolver'
+            ),
+        134 => array (
+            'ChannelBinding', 'GSSContext', 'GSSCredential', 'GSSException', 'GSSManager', 'GSSName', 'MessageProp', 'Oid'
+            ),
+        135 => array (
+            'ACTIVITY_COMPLETED', 'ACTIVITY_REQUIRED', 'ARG_IN', 'ARG_INOUT', 'ARG_OUT', 'Any', 'AnyHolder', 'AnySeqHolder', 'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION', 'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE', 'BAD_POLICY_VALUE', 'BAD_QOS', 'BAD_TYPECODE', 'BooleanHolder', 'BooleanSeqHelper', 'BooleanSeqHolder', 'ByteHolder', 'CODESET_INCOMPATIBLE', 'COMM_FAILURE', 'CTX_RESTRICT_SCOPE', 'CharHolder', 'CharSeqHelper', 'CharSeqHolder', 'CompletionStatus', 'CompletionStatusHelper', 'ContextList', 'CurrentHolder', 'CustomMarshal', 'DATA_CONVERSION', 'DefinitionKind', 'DefinitionKindHelper', 'DomainManager', 'DomainManagerOperations', 'DoubleHolder', 'DoubleSeqHelper', 'DoubleSeqHolder', 'Environment', 'ExceptionList', 'FREE_MEM', 'FixedHolder', 'FloatHolder', 'FloatSeqHelper', 'FloatSeqHolder', 'IDLType', 'IDLTypeHelper', 'IDLTypeOperations', 'IMP_LIMIT', 'INITIALIZE', 'INTERNAL', 'INTF_REPOS', 'INVALID_ACTIVITY', 'INVALID_TRANSACTION', 'INV_FLAG', 'INV_IDENT', 'INV_OBJREF', 'INV_POLICY', 'IRObject',
+            'IRObjectOperations', 'IdentifierHelper', 'IntHolder', 'LocalObject', 'LongHolder', 'LongLongSeqHelper', 'LongLongSeqHolder', 'LongSeqHelper', 'LongSeqHolder', 'MARSHAL', 'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION', 'NO_RESOURCES', 'NO_RESPONSE', 'NVList', 'NamedValue', 'OBJECT_NOT_EXIST', 'OBJ_ADAPTER', 'OMGVMCID', 'ObjectHelper', 'ObjectHolder', 'OctetSeqHelper', 'OctetSeqHolder', 'PERSIST_STORE', 'PRIVATE_MEMBER', 'PUBLIC_MEMBER', 'ParameterMode', 'ParameterModeHelper', 'ParameterModeHolder', 'PolicyError', 'PolicyErrorCodeHelper', 'PolicyErrorHelper', 'PolicyErrorHolder', 'PolicyHelper', 'PolicyHolder', 'PolicyListHelper', 'PolicyListHolder', 'PolicyOperations', 'PolicyTypeHelper', 'PrincipalHolder', 'REBIND', 'RepositoryIdHelper', 'Request', 'ServerRequest', 'ServiceDetail', 'ServiceDetailHelper', 'ServiceInformation', 'ServiceInformationHelper', 'ServiceInformationHolder', 'SetOverrideType', 'SetOverrideTypeHelper', 'ShortHolder', 'ShortSeqHelper', 'ShortSeqHolder', 'StringHolder',
+            'StringSeqHelper', 'StringSeqHolder', 'StringValueHelper', 'StructMember', 'StructMemberHelper', 'SystemException', 'TCKind', 'TIMEOUT', 'TRANSACTION_MODE', 'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK', 'TRANSACTION_UNAVAILABLE', 'TRANSIENT', 'TypeCode', 'TypeCodeHolder', 'ULongLongSeqHelper', 'ULongLongSeqHolder', 'ULongSeqHelper', 'ULongSeqHolder', 'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE', 'UShortSeqHelper', 'UShortSeqHolder', 'UnionMember', 'UnionMemberHelper', 'UnknownUserException', 'UnknownUserExceptionHelper', 'UnknownUserExceptionHolder', 'UserException', 'VM_ABSTRACT', 'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE', 'ValueBaseHelper', 'ValueBaseHolder', 'ValueMember', 'ValueMemberHelper', 'VersionSpecHelper', 'VisibilityHelper', 'WCharSeqHelper', 'WCharSeqHolder', 'WStringSeqHelper', 'WStringSeqHolder', 'WStringValueHelper', 'WrongTransaction', 'WrongTransactionHelper', 'WrongTransactionHolder', '_IDLTypeStub', '_PolicyStub'
+            ),
+        136 => array (
+            'Invalid', 'InvalidSeq'
+            ),
+        137 => array (
+            'BadKind'
+            ),
+        138 => array (
+            'ApplicationException', 'BoxedValueHelper', 'CustomValue', 'IDLEntity', 'IndirectionException', 'InvokeHandler', 'RemarshalException', 'ResponseHandler', 'ServantObject', 'Streamable', 'StreamableValue', 'UnknownException', 'ValueBase', 'ValueFactory', 'ValueInputStream', 'ValueOutputStream'
+            ),
+        139 => array (
+            'BindingHelper', 'BindingHolder', 'BindingIterator', 'BindingIteratorHelper', 'BindingIteratorHolder', 'BindingIteratorOperations', 'BindingIteratorPOA', 'BindingListHelper', 'BindingListHolder', 'BindingType', 'BindingTypeHelper', 'BindingTypeHolder', 'IstringHelper', 'NameComponent', 'NameComponentHelper', 'NameComponentHolder', 'NameHelper', 'NameHolder', 'NamingContext', 'NamingContextExt', 'NamingContextExtHelper', 'NamingContextExtHolder', 'NamingContextExtOperations', 'NamingContextExtPOA', 'NamingContextHelper', 'NamingContextHolder', 'NamingContextOperations', 'NamingContextPOA', '_BindingIteratorImplBase', '_BindingIteratorStub', '_NamingContextExtStub', '_NamingContextImplBase', '_NamingContextStub'
+            ),
+        140 => array (
+            'AddressHelper', 'InvalidAddress', 'InvalidAddressHelper', 'InvalidAddressHolder', 'StringNameHelper', 'URLStringHelper'
+            ),
+        141 => array (
+            'AlreadyBound', 'AlreadyBoundHelper', 'AlreadyBoundHolder', 'CannotProceed', 'CannotProceedHelper', 'CannotProceedHolder', 'InvalidNameHolder', 'NotEmpty', 'NotEmptyHelper', 'NotEmptyHolder', 'NotFound', 'NotFoundHelper', 'NotFoundHolder', 'NotFoundReason', 'NotFoundReasonHelper', 'NotFoundReasonHolder'
+            ),
+        142 => array (
+            'Parameter'
+            ),
+        143 => array (
+            'DynAnyFactory', 'DynAnyFactoryHelper', 'DynAnyFactoryOperations', 'DynAnyHelper', 'DynAnyOperations', 'DynAnySeqHelper', 'DynArrayHelper', 'DynArrayOperations', 'DynEnumHelper', 'DynEnumOperations', 'DynFixedHelper', 'DynFixedOperations', 'DynSequenceHelper', 'DynSequenceOperations', 'DynStructHelper', 'DynStructOperations', 'DynUnionHelper', 'DynUnionOperations', 'DynValueBox', 'DynValueBoxOperations', 'DynValueCommon', 'DynValueCommonOperations', 'DynValueHelper', 'DynValueOperations', 'NameDynAnyPair', 'NameDynAnyPairHelper', 'NameDynAnyPairSeqHelper', 'NameValuePairSeqHelper', '_DynAnyFactoryStub', '_DynAnyStub', '_DynArrayStub', '_DynEnumStub', '_DynFixedStub', '_DynSequenceStub', '_DynStructStub', '_DynUnionStub', '_DynValueStub'
+            ),
+        144 => array (
+            'InconsistentTypeCodeHelper'
+            ),
+        145 => array (
+            'InvalidValueHelper'
+            ),
+        146 => array (
+            'CodeSets', 'Codec', 'CodecFactory', 'CodecFactoryHelper', 'CodecFactoryOperations', 'CodecOperations', 'ComponentIdHelper', 'ENCODING_CDR_ENCAPS', 'Encoding', 'ExceptionDetailMessage', 'IOR', 'IORHelper', 'IORHolder', 'MultipleComponentProfileHelper', 'MultipleComponentProfileHolder', 'ProfileIdHelper', 'RMICustomMaxStreamFormat', 'ServiceContext', 'ServiceContextHelper', 'ServiceContextHolder', 'ServiceContextListHelper', 'ServiceContextListHolder', 'ServiceIdHelper', 'TAG_ALTERNATE_IIOP_ADDRESS', 'TAG_CODE_SETS', 'TAG_INTERNET_IOP', 'TAG_JAVA_CODEBASE', 'TAG_MULTIPLE_COMPONENTS', 'TAG_ORB_TYPE', 'TAG_POLICIES', 'TAG_RMI_CUSTOM_MAX_STREAM_FORMAT', 'TaggedComponent', 'TaggedComponentHelper', 'TaggedComponentHolder', 'TaggedProfile', 'TaggedProfileHelper', 'TaggedProfileHolder', 'TransactionService'
+            ),
+        147 => array (
+            'UnknownEncoding', 'UnknownEncodingHelper'
+            ),
+        148 => array (
+            'FormatMismatch', 'FormatMismatchHelper', 'InvalidTypeForEncoding', 'InvalidTypeForEncodingHelper'
+            ),
+        149 => array (
+            'SYNC_WITH_TRANSPORT', 'SyncScopeHelper'
+            ),
+        150 => array (
+            'ACTIVE', 'AdapterManagerIdHelper', 'AdapterNameHelper', 'AdapterStateHelper', 'ClientRequestInfo', 'ClientRequestInfoOperations', 'ClientRequestInterceptor', 'ClientRequestInterceptorOperations', 'DISCARDING', 'HOLDING', 'INACTIVE', 'IORInfo', 'IORInfoOperations', 'IORInterceptor', 'IORInterceptorOperations', 'IORInterceptor_3_0', 'IORInterceptor_3_0Helper', 'IORInterceptor_3_0Holder', 'IORInterceptor_3_0Operations', 'Interceptor', 'InterceptorOperations', 'InvalidSlot', 'InvalidSlotHelper', 'LOCATION_FORWARD', 'NON_EXISTENT', 'ORBIdHelper', 'ORBInitInfo', 'ORBInitInfoOperations', 'ORBInitializer', 'ORBInitializerOperations', 'ObjectReferenceFactory', 'ObjectReferenceFactoryHelper', 'ObjectReferenceFactoryHolder', 'ObjectReferenceTemplate', 'ObjectReferenceTemplateHelper', 'ObjectReferenceTemplateHolder', 'ObjectReferenceTemplateSeqHelper', 'ObjectReferenceTemplateSeqHolder', 'PolicyFactory', 'PolicyFactoryOperations', 'RequestInfo', 'RequestInfoOperations', 'SUCCESSFUL', 'SYSTEM_EXCEPTION',
+            'ServerIdHelper', 'ServerRequestInfo', 'ServerRequestInfoOperations', 'ServerRequestInterceptor', 'ServerRequestInterceptorOperations', 'TRANSPORT_RETRY', 'USER_EXCEPTION'
+            ),
+        151 => array (
+            'DuplicateName', 'DuplicateNameHelper'
+            ),
+        152 => array (
+            'AdapterActivator', 'AdapterActivatorOperations', 'ID_ASSIGNMENT_POLICY_ID', 'ID_UNIQUENESS_POLICY_ID', 'IMPLICIT_ACTIVATION_POLICY_ID', 'IdAssignmentPolicy', 'IdAssignmentPolicyOperations', 'IdAssignmentPolicyValue', 'IdUniquenessPolicy', 'IdUniquenessPolicyOperations', 'IdUniquenessPolicyValue', 'ImplicitActivationPolicy', 'ImplicitActivationPolicyOperations', 'ImplicitActivationPolicyValue', 'LIFESPAN_POLICY_ID', 'LifespanPolicy', 'LifespanPolicyOperations', 'LifespanPolicyValue', 'POA', 'POAHelper', 'POAManager', 'POAManagerOperations', 'POAOperations', 'REQUEST_PROCESSING_POLICY_ID', 'RequestProcessingPolicy', 'RequestProcessingPolicyOperations', 'RequestProcessingPolicyValue', 'SERVANT_RETENTION_POLICY_ID', 'Servant', 'ServantActivator', 'ServantActivatorHelper', 'ServantActivatorOperations', 'ServantActivatorPOA', 'ServantLocator', 'ServantLocatorHelper', 'ServantLocatorOperations', 'ServantLocatorPOA', 'ServantManager', 'ServantManagerOperations', 'ServantRetentionPolicy',
+            'ServantRetentionPolicyOperations', 'ServantRetentionPolicyValue', 'THREAD_POLICY_ID', 'ThreadPolicy', 'ThreadPolicyOperations', 'ThreadPolicyValue', '_ServantActivatorStub', '_ServantLocatorStub'
+            ),
+        153 => array (
+            'NoContext', 'NoContextHelper'
+            ),
+        154 => array (
+            'AdapterInactive', 'AdapterInactiveHelper', 'State'
+            ),
+        155 => array (
+            'AdapterAlreadyExists', 'AdapterAlreadyExistsHelper', 'AdapterNonExistent', 'AdapterNonExistentHelper', 'InvalidPolicy', 'InvalidPolicyHelper', 'NoServant', 'NoServantHelper', 'ObjectAlreadyActive', 'ObjectAlreadyActiveHelper', 'ObjectNotActive', 'ObjectNotActiveHelper', 'ServantAlreadyActive', 'ServantAlreadyActiveHelper', 'ServantNotActive', 'ServantNotActiveHelper', 'WrongAdapter', 'WrongAdapterHelper', 'WrongPolicy', 'WrongPolicyHelper'
+            ),
+        156 => array (
+            'CookieHolder'
+            ),
+        157 => array (
+            'RunTime', 'RunTimeOperations'
+            ),
+        158 => array (
+            '_Remote_Stub'
+            ),
+        159 => array (
+            'Attr', 'CDATASection', 'CharacterData', 'Comment', 'DOMConfiguration', 'DOMError', 'DOMErrorHandler', 'DOMException', 'DOMImplementation', 'DOMImplementationList', 'DOMImplementationSource', 'DOMStringList', 'DocumentFragment', 'DocumentType', 'EntityReference', 'NameList', 'NamedNodeMap', 'Node', 'NodeList', 'Notation', 'ProcessingInstruction', 'Text', 'TypeInfo', 'UserDataHandler'
+            ),
+        160 => array (
+            'DOMImplementationRegistry'
+            ),
+        161 => array (
+            'EventException', 'EventTarget', 'MutationEvent', 'UIEvent'
+            ),
+        162 => array (
+            'DOMImplementationLS', 'LSException', 'LSInput', 'LSLoadEvent', 'LSOutput', 'LSParser', 'LSParserFilter', 'LSProgressEvent', 'LSResourceResolver', 'LSSerializer', 'LSSerializerFilter'
+            ),
+        163 => array (
+            'DTDHandler', 'DocumentHandler', 'EntityResolver', 'ErrorHandler', 'HandlerBase', 'InputSource', 'Locator', 'SAXException', 'SAXNotRecognizedException', 'SAXNotSupportedException', 'SAXParseException', 'XMLFilter', 'XMLReader'
+            ),
+        164 => array (
+            'Attributes2', 'Attributes2Impl', 'DeclHandler', 'DefaultHandler2', 'EntityResolver2', 'LexicalHandler', 'Locator2', 'Locator2Impl'
+            ),
+        165 => array (
+            'AttributeListImpl', 'AttributesImpl', 'DefaultHandler', 'LocatorImpl', 'NamespaceSupport', 'ParserAdapter', 'ParserFactory', 'XMLFilterImpl', 'XMLReaderAdapter', 'XMLReaderFactory'
+            ),
+        /* ambiguous class names (appear in more than one package) */
+        166 => array (
+            'Annotation', 'AnySeqHelper', 'Array', 'Attribute', 'AttributeList', 'AttributeSet', 'Attributes', 'AuthenticationException', 'Binding', 'Bounds', 'Certificate', 'CertificateEncodingException', 'CertificateException', 'CertificateExpiredException', 'CertificateNotYetValidException', 'CertificateParsingException', 'ConnectException', 'ContentHandler', 'Context', 'Control', 'Current', 'CurrentHelper', 'CurrentOperations', 'DOMLocator', 'DataInputStream', 'DataOutputStream', 'Date', 'DefaultLoaderRepository', 'Delegate', 'Document', 'DocumentEvent', 'DynAny', 'DynArray', 'DynEnum', 'DynFixed', 'DynSequence', 'DynStruct', 'DynUnion', 'DynValue', 'DynamicImplementation', 'Element', 'Entity', 'Event', 'EventListener', 'FieldNameHelper', 'FileFilter', 'Formatter', 'ForwardRequest', 'ForwardRequestHelper', 'InconsistentTypeCode', 'InputStream', 'IntrospectionException', 'InvalidAttributeValueException', 'InvalidKeyException', 'InvalidName', 'InvalidNameHelper', 'InvalidValue', 'List', 'MouseEvent',
+            'NameValuePair', 'NameValuePairHelper', 'ORB', 'Object', 'ObjectIdHelper', 'ObjectImpl', 'OpenType', 'OutputStream', 'ParagraphView', 'Parser', 'Permission', 'Policy', 'Principal', 'Proxy', 'Reference', 'Statement', 'Timer', 'Timestamp', 'TypeMismatch', 'TypeMismatchHelper', 'UNKNOWN', 'UnknownHostException', 'X509Certificate'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        /* all Java keywords are case sensitive */
+        1 => true, 2 => true, 3 => true, 4 => true,
+        5 => true, 6 => true, 7 => true, 8 => true, 9 => true,
+        10 => true, 11 => true, 12 => true, 13 => true, 14 => true,
+        15 => true, 16 => true, 17 => true, 18 => true, 19 => true,
+        20 => true, 21 => true, 22 => true, 23 => true, 24 => true,
+        25 => true, 26 => true, 27 => true, 28 => true, 29 => true,
+        30 => true, 31 => true, 32 => true, 33 => true, 34 => true,
+        35 => true, 36 => true, 37 => true, 38 => true, 39 => true,
+        40 => true, 41 => true, 42 => true, 43 => true, 44 => true,
+        45 => true, 46 => true, 47 => true, 48 => true, 49 => true,
+        50 => true, 51 => true, 52 => true, 53 => true, 54 => true,
+        55 => true, 56 => true, 57 => true, 58 => true, 59 => true,
+        60 => true, 61 => true, 62 => true, 63 => true, 64 => true,
+        65 => true, 66 => true, 67 => true, 68 => true, 69 => true,
+        70 => true, 71 => true, 72 => true, 73 => true, 74 => true,
+        75 => true, 76 => true, 77 => true, 78 => true, 79 => true,
+        80 => true, 81 => true, 82 => true, 83 => true, 84 => true,
+        85 => true, 86 => true, 87 => true, 88 => true, 89 => true,
+        90 => true, 91 => true, 92 => true, 93 => true, 94 => true,
+        95 => true, 96 => true, 97 => true, 98 => true, 99 => true,
+        100 => true, 101 => true, 102 => true, 103 => true, 104 => true,
+        105 => true, 106 => true, 107 => true, 108 => true, 109 => true,
+        110 => true, 111 => true, 112 => true, 113 => true, 114 => true,
+        115 => true, 116 => true, 117 => true, 118 => true, 119 => true,
+        120 => true, 121 => true, 122 => true, 123 => true, 124 => true,
+        125 => true, 126 => true, 127 => true, 128 => true, 129 => true,
+        130 => true, 131 => true, 132 => true, 133 => true, 134 => true,
+        135 => true, 136 => true, 137 => true, 138 => true, 139 => true,
+        140 => true, 141 => true, 142 => true, 143 => true, 144 => true,
+        145 => true, 146 => true, 147 => true, 148 => true, 149 => true,
+        150 => true, 151 => true, 152 => true, 153 => true, 154 => true,
+        155 => true, 156 => true, 157 => true, 158 => true, 159 => true,
+        160 => true, 161 => true, 162 => true, 163 => true, 164 => true,
+        165 => true, 166 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000;  font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006600; font-weight: bold;',
+            4 => 'color: #006600; font-weight: bold;',
+            5 => 'color: #003399; font-weight: bold;',
+            6 => 'color: #003399; font-weight: bold;',
+            7 => 'color: #003399; font-weight: bold;',
+            8 => 'color: #003399; font-weight: bold;',
+            9 => 'color: #003399; font-weight: bold;',
+            10 => 'color: #003399; font-weight: bold;',
+            11 => 'color: #003399; font-weight: bold;',
+            12 => 'color: #003399; font-weight: bold;',
+            13 => 'color: #003399; font-weight: bold;',
+            14 => 'color: #003399; font-weight: bold;',
+            15 => 'color: #003399; font-weight: bold;',
+            16 => 'color: #003399; font-weight: bold;',
+            17 => 'color: #003399; font-weight: bold;',
+            18 => 'color: #003399; font-weight: bold;',
+            19 => 'color: #003399; font-weight: bold;',
+            20 => 'color: #003399; font-weight: bold;',
+            21 => 'color: #003399; font-weight: bold;',
+            22 => 'color: #003399; font-weight: bold;',
+            23 => 'color: #003399; font-weight: bold;',
+            24 => 'color: #003399; font-weight: bold;',
+            25 => 'color: #003399; font-weight: bold;',
+            26 => 'color: #003399; font-weight: bold;',
+            27 => 'color: #003399; font-weight: bold;',
+            28 => 'color: #003399; font-weight: bold;',
+            29 => 'color: #003399; font-weight: bold;',
+            30 => 'color: #003399; font-weight: bold;',
+            31 => 'color: #003399; font-weight: bold;',
+            32 => 'color: #003399; font-weight: bold;',
+            33 => 'color: #003399; font-weight: bold;',
+            34 => 'color: #003399; font-weight: bold;',
+            35 => 'color: #003399; font-weight: bold;',
+            36 => 'color: #003399; font-weight: bold;',
+            37 => 'color: #003399; font-weight: bold;',
+            38 => 'color: #003399; font-weight: bold;',
+            39 => 'color: #003399; font-weight: bold;',
+            40 => 'color: #003399; font-weight: bold;',
+            41 => 'color: #003399; font-weight: bold;',
+            42 => 'color: #003399; font-weight: bold;',
+            43 => 'color: #003399; font-weight: bold;',
+            44 => 'color: #003399; font-weight: bold;',
+            45 => 'color: #003399; font-weight: bold;',
+            46 => 'color: #003399; font-weight: bold;',
+            47 => 'color: #003399; font-weight: bold;',
+            48 => 'color: #003399; font-weight: bold;',
+            49 => 'color: #003399; font-weight: bold;',
+            50 => 'color: #003399; font-weight: bold;',
+            51 => 'color: #003399; font-weight: bold;',
+            52 => 'color: #003399; font-weight: bold;',
+            53 => 'color: #003399; font-weight: bold;',
+            54 => 'color: #003399; font-weight: bold;',
+            55 => 'color: #003399; font-weight: bold;',
+            56 => 'color: #003399; font-weight: bold;',
+            57 => 'color: #003399; font-weight: bold;',
+            58 => 'color: #003399; font-weight: bold;',
+            59 => 'color: #003399; font-weight: bold;',
+            60 => 'color: #003399; font-weight: bold;',
+            61 => 'color: #003399; font-weight: bold;',
+            62 => 'color: #003399; font-weight: bold;',
+            63 => 'color: #003399; font-weight: bold;',
+            64 => 'color: #003399; font-weight: bold;',
+            65 => 'color: #003399; font-weight: bold;',
+            66 => 'color: #003399; font-weight: bold;',
+            67 => 'color: #003399; font-weight: bold;',
+            68 => 'color: #003399; font-weight: bold;',
+            69 => 'color: #003399; font-weight: bold;',
+            70 => 'color: #003399; font-weight: bold;',
+            71 => 'color: #003399; font-weight: bold;',
+            72 => 'color: #003399; font-weight: bold;',
+            73 => 'color: #003399; font-weight: bold;',
+            74 => 'color: #003399; font-weight: bold;',
+            75 => 'color: #003399; font-weight: bold;',
+            76 => 'color: #003399; font-weight: bold;',
+            77 => 'color: #003399; font-weight: bold;',
+            78 => 'color: #003399; font-weight: bold;',
+            79 => 'color: #003399; font-weight: bold;',
+            80 => 'color: #003399; font-weight: bold;',
+            81 => 'color: #003399; font-weight: bold;',
+            82 => 'color: #003399; font-weight: bold;',
+            83 => 'color: #003399; font-weight: bold;',
+            84 => 'color: #003399; font-weight: bold;',
+            85 => 'color: #003399; font-weight: bold;',
+            86 => 'color: #003399; font-weight: bold;',
+            87 => 'color: #003399; font-weight: bold;',
+            88 => 'color: #003399; font-weight: bold;',
+            89 => 'color: #003399; font-weight: bold;',
+            90 => 'color: #003399; font-weight: bold;',
+            91 => 'color: #003399; font-weight: bold;',
+            92 => 'color: #003399; font-weight: bold;',
+            93 => 'color: #003399; font-weight: bold;',
+            94 => 'color: #003399; font-weight: bold;',
+            95 => 'color: #003399; font-weight: bold;',
+            96 => 'color: #003399; font-weight: bold;',
+            97 => 'color: #003399; font-weight: bold;',
+            98 => 'color: #003399; font-weight: bold;',
+            99 => 'color: #003399; font-weight: bold;',
+            100 => 'color: #003399; font-weight: bold;',
+            101 => 'color: #003399; font-weight: bold;',
+            102 => 'color: #003399; font-weight: bold;',
+            103 => 'color: #003399; font-weight: bold;',
+            104 => 'color: #003399; font-weight: bold;',
+            105 => 'color: #003399; font-weight: bold;',
+            106 => 'color: #003399; font-weight: bold;',
+            107 => 'color: #003399; font-weight: bold;',
+            108 => 'color: #003399; font-weight: bold;',
+            109 => 'color: #003399; font-weight: bold;',
+            110 => 'color: #003399; font-weight: bold;',
+            111 => 'color: #003399; font-weight: bold;',
+            112 => 'color: #003399; font-weight: bold;',
+            113 => 'color: #003399; font-weight: bold;',
+            114 => 'color: #003399; font-weight: bold;',
+            115 => 'color: #003399; font-weight: bold;',
+            116 => 'color: #003399; font-weight: bold;',
+            117 => 'color: #003399; font-weight: bold;',
+            118 => 'color: #003399; font-weight: bold;',
+            119 => 'color: #003399; font-weight: bold;',
+            120 => 'color: #003399; font-weight: bold;',
+            121 => 'color: #003399; font-weight: bold;',
+            122 => 'color: #003399; font-weight: bold;',
+            123 => 'color: #003399; font-weight: bold;',
+            124 => 'color: #003399; font-weight: bold;',
+            125 => 'color: #003399; font-weight: bold;',
+            126 => 'color: #003399; font-weight: bold;',
+            127 => 'color: #003399; font-weight: bold;',
+            128 => 'color: #003399; font-weight: bold;',
+            129 => 'color: #003399; font-weight: bold;',
+            130 => 'color: #003399; font-weight: bold;',
+            131 => 'color: #003399; font-weight: bold;',
+            132 => 'color: #003399; font-weight: bold;',
+            133 => 'color: #003399; font-weight: bold;',
+            134 => 'color: #003399; font-weight: bold;',
+            135 => 'color: #003399; font-weight: bold;',
+            136 => 'color: #003399; font-weight: bold;',
+            137 => 'color: #003399; font-weight: bold;',
+            138 => 'color: #003399; font-weight: bold;',
+            139 => 'color: #003399; font-weight: bold;',
+            140 => 'color: #003399; font-weight: bold;',
+            141 => 'color: #003399; font-weight: bold;',
+            142 => 'color: #003399; font-weight: bold;',
+            143 => 'color: #003399; font-weight: bold;',
+            144 => 'color: #003399; font-weight: bold;',
+            145 => 'color: #003399; font-weight: bold;',
+            146 => 'color: #003399; font-weight: bold;',
+            147 => 'color: #003399; font-weight: bold;',
+            148 => 'color: #003399; font-weight: bold;',
+            149 => 'color: #003399; font-weight: bold;',
+            150 => 'color: #003399; font-weight: bold;',
+            151 => 'color: #003399; font-weight: bold;',
+            152 => 'color: #003399; font-weight: bold;',
+            153 => 'color: #003399; font-weight: bold;',
+            154 => 'color: #003399; font-weight: bold;',
+            155 => 'color: #003399; font-weight: bold;',
+            156 => 'color: #003399; font-weight: bold;',
+            157 => 'color: #003399; font-weight: bold;',
+            158 => 'color: #003399; font-weight: bold;',
+            159 => 'color: #003399; font-weight: bold;',
+            160 => 'color: #003399; font-weight: bold;',
+            161 => 'color: #003399; font-weight: bold;',
+            162 => 'color: #003399; font-weight: bold;',
+            163 => 'color: #003399; font-weight: bold;',
+            164 => 'color: #003399; font-weight: bold;',
+            165 => 'color: #003399; font-weight: bold;',
+            166 => 'color: #003399; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #006699;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://docs.oracle.com/javase/7/docs/api/java/applet/{FNAME}.html',
+        6 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/{FNAME}.html',
+        7 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/color/{FNAME}.html',
+        8 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/datatransfer/{FNAME}.html',
+        9 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/dnd/{FNAME}.html',
+        10 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/event/{FNAME}.html',
+        11 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/font/{FNAME}.html',
+        12 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/geom/{FNAME}.html',
+        13 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/im/{FNAME}.html',
+        14 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/im/spi/{FNAME}.html',
+        15 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/image/{FNAME}.html',
+        16 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/image/renderable/{FNAME}.html',
+        17 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/print/{FNAME}.html',
+        18 => 'http://docs.oracle.com/javase/7/docs/api/java/beans/{FNAME}.html',
+        19 => 'http://docs.oracle.com/javase/7/docs/api/java/beans/beancontext/{FNAME}.html',
+        20 => 'http://docs.oracle.com/javase/7/docs/api/java/io/{FNAME}.html',
+        21 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/{FNAME}.html',
+        22 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/{FNAME}.html',
+        23 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/{FNAME}.html',
+        24 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/management/{FNAME}.html',
+        25 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/ref/{FNAME}.html',
+        26 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/{FNAME}.html',
+        27 => 'http://docs.oracle.com/javase/7/docs/api/java/math/{FNAME}.html',
+        28 => 'http://docs.oracle.com/javase/7/docs/api/java/net/{FNAME}.html',
+        29 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/{FNAME}.html',
+        30 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/channels/{FNAME}.html',
+        31 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/channels/spi/{FNAME}.html',
+        32 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/charset/{FNAME}.html',
+        33 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/charset/spi/{FNAME}.html',
+        34 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/{FNAME}.html',
+        35 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/activation/{FNAME}.html',
+        36 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/dgc/{FNAME}.html',
+        37 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/registry/{FNAME}.html',
+        38 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/server/{FNAME}.html',
+        39 => 'http://docs.oracle.com/javase/7/docs/api/java/security/{FNAME}.html',
+        40 => 'http://docs.oracle.com/javase/7/docs/api/java/security/acl/{FNAME}.html',
+        41 => 'http://docs.oracle.com/javase/7/docs/api/java/security/cert/{FNAME}.html',
+        42 => 'http://docs.oracle.com/javase/7/docs/api/java/security/interfaces/{FNAME}.html',
+        43 => 'http://docs.oracle.com/javase/7/docs/api/java/security/spec/{FNAME}.html',
+        44 => 'http://docs.oracle.com/javase/7/docs/api/java/sql/{FNAME}.html',
+        45 => 'http://docs.oracle.com/javase/7/docs/api/java/text/{FNAME}.html',
+        46 => 'http://docs.oracle.com/javase/7/docs/api/java/util/{FNAME}.html',
+        47 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/{FNAME}.html',
+        48 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/{FNAME}.html',
+        49 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/locks/{FNAME}.html',
+        50 => 'http://docs.oracle.com/javase/7/docs/api/java/util/jar/{FNAME}.html',
+        51 => 'http://docs.oracle.com/javase/7/docs/api/java/util/logging/{FNAME}.html',
+        52 => 'http://docs.oracle.com/javase/7/docs/api/java/util/prefs/{FNAME}.html',
+        53 => 'http://docs.oracle.com/javase/7/docs/api/java/util/regex/{FNAME}.html',
+        54 => 'http://docs.oracle.com/javase/7/docs/api/java/util/zip/{FNAME}.html',
+        55 => 'http://docs.oracle.com/javase/7/docs/api/javax/accessibility/{FNAME}.html',
+        56 => 'http://docs.oracle.com/javase/7/docs/api/javax/activity/{FNAME}.html',
+        57 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/{FNAME}.html',
+        58 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/interfaces/{FNAME}.html',
+        59 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/spec/{FNAME}.html',
+        60 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/{FNAME}.html',
+        61 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/event/{FNAME}.html',
+        62 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/{FNAME}.html',
+        63 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/plugins/bmp/{FNAME}.html',
+        64 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/plugins/jpeg/{FNAME}.html',
+        65 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/spi/{FNAME}.html',
+        66 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/stream/{FNAME}.html',
+        67 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/{FNAME}.html',
+        68 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/loading/{FNAME}.html',
+        69 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/modelmbean/{FNAME}.html',
+        70 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/monitor/{FNAME}.html',
+        71 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/openmbean/{FNAME}.html',
+        72 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/relation/{FNAME}.html',
+        73 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/remote/{FNAME}.html',
+        74 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/remote/rmi/{FNAME}.html',
+        75 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/timer/{FNAME}.html',
+        76 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/{FNAME}.html',
+        77 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/directory/{FNAME}.html',
+        78 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/event/{FNAME}.html',
+        79 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/ldap/{FNAME}.html',
+        80 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/spi/{FNAME}.html',
+        81 => 'http://docs.oracle.com/javase/7/docs/api/javax/net/{FNAME}.html',
+        82 => 'http://docs.oracle.com/javase/7/docs/api/javax/net/ssl/{FNAME}.html',
+        83 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/{FNAME}.html',
+        84 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/attribute/{FNAME}.html',
+        85 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/attribute/standard/{FNAME}.html',
+        86 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/event/{FNAME}.html',
+        87 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/{FNAME}.html',
+        88 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/CORBA/{FNAME}.html',
+        89 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/ssl/{FNAME}.html',
+        90 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/{FNAME}.html',
+        91 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/callback/{FNAME}.html',
+        92 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/kerberos/{FNAME}.html',
+        93 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/{FNAME}.html',
+        94 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/spi/{FNAME}.html',
+        95 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/x500/{FNAME}.html',
+        96 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/sasl/{FNAME}.html',
+        97 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/midi/{FNAME}.html',
+        98 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/midi/spi/{FNAME}.html',
+        99 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/sampled/{FNAME}.html',
+        100 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/sampled/spi/{FNAME}.html',
+        101 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/{FNAME}.html',
+        102 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/{FNAME}.html',
+        103 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/serial/{FNAME}.html',
+        104 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/spi/{FNAME}.html',
+        105 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/{FNAME}.html',
+        106 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/border/{FNAME}.html',
+        107 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/colorchooser/{FNAME}.html',
+        108 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/event/{FNAME}.html',
+        109 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/filechooser/{FNAME}.html',
+        110 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/{FNAME}.html',
+        111 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/basic/{FNAME}.html',
+        112 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/metal/{FNAME}.html',
+        113 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/multi/{FNAME}.html',
+        114 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/synth/{FNAME}.html',
+        115 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/table/{FNAME}.html',
+        116 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/{FNAME}.html',
+        117 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/html/{FNAME}.html',
+        118 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/html/parser/{FNAME}.html',
+        119 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/rtf/{FNAME}.html',
+        120 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/tree/{FNAME}.html',
+        121 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/undo/{FNAME}.html',
+        122 => 'http://docs.oracle.com/javase/7/docs/api/javax/transaction/{FNAME}.html',
+        123 => 'http://docs.oracle.com/javase/7/docs/api/javax/transaction/xa/{FNAME}.html',
+        124 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/{FNAME}.html',
+        125 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/datatype/{FNAME}.html',
+        126 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/namespace/{FNAME}.html',
+        127 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/parsers/{FNAME}.html',
+        128 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/{FNAME}.html',
+        129 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/dom/{FNAME}.html',
+        130 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/sax/{FNAME}.html',
+        131 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/stream/{FNAME}.html',
+        132 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/validation/{FNAME}.html',
+        133 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/xpath/{FNAME}.html',
+        134 => 'http://docs.oracle.com/javase/7/docs/api/org/ietf/jgss/{FNAME}.html',
+        135 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/{FNAME}.html',
+        136 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/DynAnyPackage/{FNAME}.html',
+        137 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/TypeCodePackage/{FNAME}.html',
+        138 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/portable/{FNAME}.html',
+        139 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/{FNAME}.html',
+        140 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/NamingContextExtPackage/{FNAME}.html',
+        141 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/NamingContextPackage/{FNAME}.html',
+        142 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/Dynamic/{FNAME}.html',
+        143 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/{FNAME}.html',
+        144 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/DynAnyFactoryPackage/{FNAME}.html',
+        145 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/DynAnyPackage/{FNAME}.html',
+        146 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/{FNAME}.html',
+        147 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/CodecFactoryPackage/{FNAME}.html',
+        148 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/CodecPackage/{FNAME}.html',
+        149 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/Messaging/{FNAME}.html',
+        150 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableInterceptor/{FNAME}.html',
+        151 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableInterceptor/ORBInitInfoPackage/{FNAME}.html',
+        152 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/{FNAME}.html',
+        153 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/CurrentPackage/{FNAME}.html',
+        154 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/POAManagerPackage/{FNAME}.html',
+        155 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/POAPackage/{FNAME}.html',
+        156 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/ServantLocatorPackage/{FNAME}.html',
+        157 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/SendingContext/{FNAME}.html',
+        158 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/stub/java/rmi/{FNAME}.html',
+        159 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/{FNAME}.html',
+        160 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/bootstrap/{FNAME}.html',
+        161 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/events/{FNAME}.html',
+        162 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/ls/{FNAME}.html',
+        163 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/{FNAME}.html',
+        164 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/ext/{FNAME}.html',
+        165 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/helpers/{FNAME}.html',
+        /* ambiguous class names (appear in more than one package) */
+        166 => 'http://www.google.com/search?sitesearch=docs.oracle.com&amp;q=allinurl%3Ajavase+docs+api+{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        /* Java does not use '::' */
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&"\'])',
+            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-;"\'])'
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/javascript.php b/vendor/easybook/geshi/geshi/javascript.php
new file mode 100755
index 000000000..b96d1b5b6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/javascript.php
@@ -0,0 +1,174 @@
+<?php
+/*************************************************************************************
+ * javascript.php
+ * --------------
+ * Author: Ben Keen (ben.keen@gmail.com)
+ * Copyright: (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/20
+ *
+ * JavaScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/06/27 (1.0.8.11)
+ *  -  Reordered Keyword Groups to reflect syntactical meaning of keywords
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Javascript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Regular Expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\*)(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])*(?<!\s)\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?!\*)(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(?<!\s)\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            //reserved/keywords; also some non-reserved keywords
+            'break','case','catch','const','continue',
+            'default','delete','do',
+            'else',
+            'finally','for','function',
+            'get','goto',
+            'if','in','instanceof',
+            'new',
+            'prototype',
+            'return',
+            'set','static','switch',
+            'this','throw','try','typeof',
+            'var','void'
+            ),
+        2 => array(
+            //reserved/non-keywords; metaconstants
+            'false','null','true','undefined','NaN','Infinity'
+            ),
+        3 => array(
+            //magic properties/functions
+            '__proto__','__defineGetter__','__defineSetter__','hasOwnProperty','hasProperty'
+            ),
+        4 => array(
+            //type constructors
+            'Object', 'Function', 'Date', 'Math', 'String', 'Number', 'Boolean', 'Array'
+            ),
+        5 => array(
+            //reserved, but invalid in language
+            'abstract','boolean','byte','char','class','debugger','double','enum','export','extends',
+            'final','float','implements','import','int','interface','long','native',
+            'short','super','synchronized','throws','transient','volatile'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '@', '&', '|', '^',
+        '<', '>', '=',
+        ',', ';', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #003366; font-weight: bold;',
+            3 => 'color: #000066;',
+            5 => 'color: #FF0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+    ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<script type="text/javascript">' => '</script>'
+            ),
+        1 => array(
+            '<script language="javascript">' => '</script>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/jcl.php b/vendor/easybook/geshi/geshi/jcl.php
new file mode 100644
index 000000000..7d9c54825
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/jcl.php
@@ -0,0 +1,155 @@
+<?php
+/*************************************************************************************
+ * jcl.php
+ * -----------
+ * Author: Ramesh Vishveshwar (ramesh.vishveshwar@gmail.com)
+ * Copyright: (c) 2012 Ramesh Vishveshwar (http://thecodeisclear.in)
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/09/16
+ *
+ * JCL (MVS), DFSORT, IDCAMS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/09/16 (1.0.0)
+ *   -  Internal Release (for own blog/testing)
+ * 2012/09/22 (1.0.1)
+ *   - Released with support for DFSORT, ICETOOL, IDCAMS
+ *   - Added support for Symbolic variables in JCL
+ *   - Added support for TWS OPC variables
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'JCL',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // Comments identified using REGEX
+        // Comments start with //* but should not be followed by % (TWS) or + (some JES3 stmts)
+        3 => "\/\/\*[^%](.*?)(\n)"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'COMMAND', 'CNTL', 'DD', 'ENDCNTL', 'EXEC', 'IF', 'THEN', 'ELSE',
+            'ENDIF', 'JCLLIB', 'JOB', 'OUTPUT', 'PEND',
+            'PROC', 'SET', 'XMIT'
+            ),
+        2 => array (
+            'PGM','CLASS','NOTIFY','MSGCLASS','DSN','KEYLEN','LABEL','LIKE',
+            'RECFM','LRECL','DCB','DSORG','BLKSIZE','SPACE','STORCLAS',
+            'DUMMY','DYNAM','AVGREC','BURST','DISP','UNIT','VOLUME',
+            'MSGLEVEL','REGION'
+            ),
+        // Keywords set 3: DFSORT, ICETOOL
+        3 => array (
+            'ALTSEQ','DEBUG','END','INCLUDE','INREC','MERGE','MODS','OMIT',
+            'OPTION','OUTFIL','OUTREC','RECORD','SORT','SUM',
+            'COPY','COUNT','DEFAULTS','DISPLAY','MODE','OCCUR','RANGE',
+            'SELECT','STATS','UNIQUE','VERIFY'
+            ),
+        // Keywords set 4: IDCAMS
+        4 => array (
+            'ALTER','BLDINDEX','CNVTCAT','DEFINE','ALIAS','ALTERNATEINDEX',
+            'CLUSTER','GENERATIONDATAGROUP','GDG','NONVSAM','PAGESPACE','PATH',
+            /* 'SPACE',*/'USERCATALOG','DELETE','EXAMINE','EXPORT','DISCONNECT',
+            'EXPORTRA','IMPORT','CONNECT','IMPORTRA','LISTCAT','LISTCRA',
+            'PRINT','REPRO','RESETCAT'//,'VERIFY'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')','=',',','>','<'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #FF0000;',
+            2 => 'color: #21A502;',
+            3 => 'color: #FF00FF;',
+            4 => 'color: #876C00;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #0000FF;',
+            //1 => 'color: #0000FF;',
+            //2 => 'color: #0000FF;',
+            3 => 'color: #0000FF;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF7400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #66CC66;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #336633;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF7400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #6B1F6B;',
+            1 => 'color: #6B1F6B;',
+            2 => 'color: #6B1F6B;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        // JCL book at IBM Bookshelf is http://publibz.boulder.ibm.com/cgi-bin/bookmgr_OS390/handheld/Connected/BOOKS/IEA2B680/CONTENTS?SHELF=&DT=20080604022956#3.1
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        // The following regular expressions solves three purposes
+        // - Identify Temp Variables in JCL (e.g. &&TEMP)
+        // - Symbolic variables in JCL (e.g. &SYSUID)
+        // - TWS OPC Variables (e.g. %OPC)
+        // Thanks to Simon for pointing me to this
+        0 => '&amp;&amp;[a-zA-Z]{1,8}[0-9]{0,}',
+        1 => '&amp;[a-zA-Z]{1,8}[0-9]{0,}',
+        2 => '&amp;|\?|%[a-zA-Z]{1,8}[0-9]{0,}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/jquery.php b/vendor/easybook/geshi/geshi/jquery.php
new file mode 100755
index 000000000..a75320d5c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/jquery.php
@@ -0,0 +1,238 @@
+<?php
+/*************************************************************************************
+ * jquery.php
+ * --------------
+ * Author: Rob Loach (http://www.robloach.net)
+ * Copyright: (c) 2009 Rob Loach (http://www.robloach.net)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/07/20
+ *
+ * jQuery 1.3 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/07/20 (1.0.8.5)
+ *  -  First Release
+ *
+ * TODO (updated 2009/07/20)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'jQuery',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Regular Expressions
+    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
+            'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
+            'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
+            'while', 'write', 'with'
+            ),
+        2 => array(
+            'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
+            'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
+            'protected', 'public', 'super', 'true', 'use', 'var'
+            ),
+        3 => array(
+            // common functions for Window object
+            'alert', 'back', 'close', 'confirm', 'forward', 'home',
+            'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
+            'onresize', 'onunload', 'open', 'print', 'prompt', 'status',
+            //'blur', 'focus', 'scroll', // Duplicate with kw9
+            //'stop', //Duplicate with kw10
+            ),
+        4 => array(
+            // jQuery Core Functions
+            'jQuery', 'each', 'size', 'length', 'selector', 'context', 'eq',
+            'index', 'data', 'removeData', 'queue', 'dequeue', 'noConflict'
+            //'get', //Duplicate with kw11
+            ),
+        5 => array(
+            // jQuery Attribute Functions
+            'attr', 'removeAttr', 'addClass', 'hasClass', 'removeClass', 'toggleClass',
+            'html', 'text', 'val',
+            ),
+        6 => array(
+            // jQuery Traversing Functions
+            'filter', 'not', 'slice', 'add', 'children', 'closest',
+            'contents', 'find', 'next', 'nextAll', 'parent', 'parents',
+            'prev', 'prevAll', 'siblings', 'andSelf', 'end',
+            //'is',  //Dup with kw1
+            //'offsetParent', //Duplicate with kw8
+            //'map', //Duplicate with kw12
+            ),
+        7 => array(
+            // jQuery Manipulation Functions
+            'append', 'appendTo', 'prepend', 'prependTo', 'after', 'before', 'insertAfter',
+            'insertBefore', 'wrap', 'wrapAll', 'wrapInner', 'replaceWith', 'replaceAll',
+            'empty', 'remove', 'clone',
+            ),
+        8 => array(
+            // jQuery CSS Functions
+            'css', 'offset', 'offsetParent', 'position', 'scrollTop', 'scrollLeft',
+            'height', 'width', 'innerHeight', 'innerWidth', 'outerHeight', 'outerWidth',
+            ),
+        9 => array(
+            // jQuery Events Functions
+            'ready', 'bind', 'one', 'trigger', 'triggerHandler', 'unbind', 'live',
+            'die', 'hover', 'blur', 'change', 'click', 'dblclick', 'error',
+            'focus', 'keydown', 'keypress', 'keyup', 'mousedown', 'mouseenter',
+            'mouseleave', 'mousemove', 'mouseout', 'mouseover', 'mouseup', 'resize',
+            'scroll', 'select', 'submit', 'unload',
+            //'toggle', //Duplicate with kw10
+            //'load', //Duplicate with kw11
+            ),
+        10 => array(
+            // jQuery Effects Functions
+            'show', 'hide', 'toggle', 'slideDown', 'slideUp', 'slideToggle', 'fadeIn',
+            'fadeOut', 'fadeTo', 'animate', 'stop',
+            ),
+        11 => array(
+            // jQuery Ajax Functions
+            'ajax', 'load', 'get', 'getJSON', 'getScript', 'post', 'ajaxComplete',
+            'ajaxError', 'ajaxSend', 'ajaxStart', 'ajaxStop', 'ajaxSuccess', 'ajaxSetup',
+            'serialize', 'serializeArray',
+            ),
+        12 => array(
+            // jQuery Utility Functions
+            'support', 'browser', 'version', 'boxModal', 'extend', 'grep', 'makeArray',
+            'map', 'inArray', 'merge', 'unique', 'isArray', 'isFunction', 'trim',
+            'param',
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '+', '-', '*', '/', '%',
+            '!', '@', '&', '|', '^',
+            '<', '>', '=',
+            ',', ';', '?', ':'
+            ),
+        1 => array(
+            '$'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #003366; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066;',
+            5 => 'color: #000066;',
+            6 => 'color: #000066;',
+            7 => 'color: #000066;',
+            8 => 'color: #000066;',
+            9 => 'color: #000066;',
+            10 => 'color: #000066;',
+            11 => 'color: #000066;',
+            12 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => 'http://docs.jquery.com/Core/{FNAME}',
+        5 => 'http://docs.jquery.com/Attributes/{FNAME}',
+        6 => 'http://docs.jquery.com/Traversing/{FNAME}',
+        7 => 'http://docs.jquery.com/Manipulation/{FNAME}',
+        8 => 'http://docs.jquery.com/CSS/{FNAME}',
+        9 => 'http://docs.jquery.com/Events/{FNAME}',
+        10 => 'http://docs.jquery.com/Effects/{FNAME}',
+        11 => 'http://docs.jquery.com/Ajax/{FNAME}',
+        12 => 'http://docs.jquery.com/Utilities/{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<script type="text/javascript">' => '</script>'
+            ),
+        1 => array(
+            '<script language="javascript">' => '</script>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/kixtart.php b/vendor/easybook/geshi/geshi/kixtart.php
new file mode 100755
index 000000000..42ffa42ec
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/kixtart.php
@@ -0,0 +1,327 @@
+<?php
+/*************************************************************************************
+ * kixtart.php
+ * --------
+ * Author: Riley McArdle (riley@glyff.net)
+ * Copyright: (c) 2007 Riley McArdle (http://www.glyff.net/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/08/31
+ *
+ * PHP language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/08/31 (1.0.7.22)
+ *  -  First Release
+ *
+ * TODO (updated 2007/08/31)
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'KiXtart',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'While', 'Loop',
+            'Use',
+            'Small',
+            'Sleep',
+            'Shell',
+            'SetTime',
+            'SetM',
+            'SetL',
+            'Set',
+            'Select', 'Case',
+            'Run',
+            'Return',
+            'Redim',
+            'RD',
+            'Quit',
+            'Play',
+            'Move',
+            'MD',
+            'Include',
+            'If', 'Else', 'Endif',
+            'GoTo',
+            'GoSub',
+            'Go',
+            'Global',
+            'GetS',
+            'Get',
+            'Function', 'Endfunction',
+            'For', 'Next',
+            'Each',
+            'FlushKb',
+            'Exit',
+            'Do', 'Until',
+            'Display',
+            'Dim',
+            'Del',
+            'Debug',
+            'Copy',
+            'Cookie1',
+            'Color',
+            'CLS',
+            'CD',
+            'Call',
+            'Break',
+            'Big',
+            'Beep',
+            ),
+        2 => array(
+            '@Address',
+            '@Build',
+            '@Color',
+            '@Comment',
+            '@CPU',
+            '@CRLF',
+            '@CSD',
+            '@CurDir',
+            '@Date',
+            '@Day',
+            '@Domain',
+            '@DOS',
+            '@Error',
+            '@FullName',
+            '@HomeDir',
+            '@HomeDrive',
+            '@HomeShr',
+            '@HostName',
+            '@InWin',
+            '@IPaddressX',
+            '@KiX',
+            '@LanRoot',
+            '@LDomain',
+            '@LDrive',
+            '@LM',
+            '@LogonMode',
+            '@LongHomeDir',
+            '@LServer',
+            '@MaxPWAge',
+            '@MDayNo',
+            '@MHz',
+            '@MonthNo',
+            '@Month',
+            '@MSecs',
+            '@OnWoW64',
+            '@PID',
+            '@PrimaryGroup',
+            '@Priv',
+            '@ProductSuite',
+            '@ProductType',
+            '@PWAge',
+            '@RAS',
+            '@Result',
+            '@RServer',
+            '@ScriptDir',
+            '@ScriptExe',
+            '@ScriptName',
+            '@SError',
+            '@SID',
+            '@Site',
+            '@StartDir',
+            '@SysLang',
+            '@Ticks',
+            '@Time',
+            '@TsSession',
+            '@UserID',
+            '@UserLang',
+            '@WDayNo',
+            '@Wksta',
+            '@WUserID',
+            '@YDayNo',
+            '@Year',
+            ),
+        3 => array(
+            'WriteValue',
+            'WriteProfileString',
+            'WriteLine',
+            'VarTypeName',
+            'VarType',
+            'Val',
+            'UnloadHive',
+            'UCase',
+            'Ubound',
+            'Trim',
+            'Substr',
+            'SRnd',
+            'Split',
+            'SidToName',
+            'ShutDown',
+            'ShowProgramGroup',
+            'SetWallpaper',
+            'SetTitle',
+            'SetSystemState',
+            'SetOption',
+            'SetFocus',
+            'SetFileAttr',
+            'SetDefaultPrinter',
+            'SetConsole',
+            'SetAscii',
+            'SendMessage',
+            'SendKeys',
+            'SaveKey',
+            'RTrim',
+            'Round',
+            'Rnd',
+            'Right',
+            'RedirectOutput',
+            'ReadValue',
+            'ReadType',
+            'ReadProfileString',
+            'ReadLine',
+            'Open',
+            'MessageBox',
+            'MemorySize',
+            'LTrim',
+            'Logoff',
+            'LogEvent',
+            'LoadKey',
+            'LoadHive',
+            'Len',
+            'Left',
+            'LCase',
+            'KeyExist',
+            'KbHit',
+            'Join',
+            'IsDeclared',
+            'Int',
+            'InStrRev',
+            'InStr',
+            'InGroup',
+            'IIF',
+            'GetObject',
+            'GetFileVersion',
+            'GetFileTime',
+            'GetFileSize',
+            'GetFileAttr',
+            'GetDiskSpace',
+            'FreeFileHandle',
+            'FormatNumber',
+            'Fix',
+            'ExpandEnvironmentVars',
+            'Exist',
+            'Execute',
+            'EnumValue',
+            'EnumLocalGroup',
+            'EnumKey',
+            'EnumIpInfo',
+            'EnumGroup',
+            'Dir',
+            'DelValue',
+            'DelTree',
+            'DelProgramItem',
+            'DelProgramGroup',
+            'DelPrinterConnection',
+            'DelKey',
+            'DecToHex',
+            'CStr',
+            'CreateObject',
+            'CompareFileTimes',
+            'Close',
+            'ClearEventLog',
+            'CInt',
+            'Chr',
+            'CDbl',
+            'Box',
+            'BackupEventLog',
+            'At',
+            'AScan',
+            'Asc',
+            'AddProgramItem',
+            'AddProgramGroup',
+            'AddPrinterConnection',
+            'AddKey',
+            'Abs'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '?', ':', '+', '-', '*', '/', '&', '|', '^', '~', '<', '>', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.kixtart.org/manual/Commands/{FNAMEL}.htm',
+        2 => '',
+        3 => 'http://www.kixtart.org/manual/Functions/{FNAMEL}.htm'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/klonec.php b/vendor/easybook/geshi/geshi/klonec.php
new file mode 100755
index 000000000..4831b13b7
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/klonec.php
@@ -0,0 +1,280 @@
+<?php
+/*************************************************************************************
+ * klonec.php
+ * --------
+ * Author: AUGER Mickael
+ * Copyright: Synchronic
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/04/16
+ *
+ * KLone with C language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/04/16 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2008/04/16)
+ * -------------------------
+ * A tester et a completer si besoin
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'KLone C',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
+    'COMMENT_MULTI' => array('/*' => '*/', '<!--' => '-->' ),//comentaires C et KLone suivi de ceux pour HTML
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//mots-cles C
+            'if', 'return', 'while', 'case', 'class', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto',
+            'null', 'break', 'true', 'enum', 'extern', 'inline', 'false'
+            ),
+        2 => array(//mots-cles KLone
+            'out', 'request', 'response',
+            ),
+        3 => array(//fonctions C usuelles
+            'printf', 'malloc', 'fopen', 'fclose', 'free', 'fputs', 'fgets', 'feof', 'fwrite',
+            'perror', 'ferror', 'qsort', 'stats', 'sscanf', 'scanf',
+            'strdup', 'strcpy', 'strcmp', 'strncpy', 'strcasecmp', 'cat', 'strcat', 'strstr',
+            'strlen', 'strtof', 'strtod', 'strtok', 'towlower', 'towupper',
+            'cd', 'system', 'exit', 'exec', 'fork', 'vfork', 'kill', 'signal', 'syslog',
+            'usleep', 'utime', 'wait', 'waitpid', 'waitid',
+            'ceil', 'eval', 'round', 'floor',
+            'atoi', 'atol', 'abs', 'cos', 'sin', 'tan', 'acos', 'asin', 'atan', 'exp',
+            'time', 'ctime', 'localtime', 'asctime', 'gmtime', 'difftime', 'date'
+            ),
+        4 => array(//fonctions KLone usuelles
+            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
+            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
+            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
+            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
+            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
+            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
+            'request_get_header', 'request_get_field', 'request_get_field_value',
+            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
+            'response_set_cookie', 'response_set_method', 'response_get_method',
+            'response_print_header', 'response_set_field', 'response_del_field',
+            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
+            'response_set_content_length', 'response_get_status', 'response_get_header',
+            'response_io', 'response_redirect', 'response_set_status',
+            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
+            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
+            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
+            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
+            'io_codecs_remove', 'io_name_set', 'io_name_get'
+            ),
+        5 => array(//types C
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'string', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile',
+            'wchar_t', 'time_t', 'FILE'
+            ),
+        6 => array(//mots-cles HTML
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        7 => array(//autres mots-cles HTML
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C
+            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
+            3 => 'color: #6600FF;',//pour les fonctions C
+            4 => 'color: #6600FF;',//pour les fonctions Klone
+            5 => 'color: #0099FF; font-weight: bold;',//pour les types C
+            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
+            7 => 'color: #000066;'//pour les autres mots-cles HTML
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C et KLone
+            2 => 'color: #339933;',//pour les #... en C
+            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C et KLone
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(
+            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
+            1 => '',
+            2 => '',
+            3 => 'color: #00bbdd; font-weight: bold;',
+            4 => 'color: #ddbb00;',
+            5 => 'color: #009900;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
+        5 => '',
+        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        //delimiteurs pour KLone
+        0 => array(
+            '<%=' => '%>'
+            ),
+        1 => array(
+            '<%!' => '%>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        //delimiteur pour HTML
+        3 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        4 => array(
+            '&' => ';'
+            ),
+        5 => array(
+            '<' => '>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => true,
+        2 => true,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
+            )
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/klonecpp.php b/vendor/easybook/geshi/geshi/klonecpp.php
new file mode 100755
index 000000000..d0368202d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/klonecpp.php
@@ -0,0 +1,308 @@
+<?php
+/*************************************************************************************
+ * klonecpp.php
+ * --------
+ * Author: AUGER Mickael
+ * Copyright: Synchronic
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/04/16
+ *
+ * KLone with C++ language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/04/16 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2008/04/16)
+ * -------------------------
+ * A tester et a completer si besoin
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'KLone C++',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
+    'COMMENT_MULTI' => array('/*' => '*/', '<!--' => '-->' ),//comentaires C et KLone suivi de ceux pour HTML
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//mots-cles C++
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto',
+            'break', 'true', 'enum', 'extern', 'inline', 'false',
+            'errno', 'stdin', 'stdout', 'stderr',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class',
+            'EDOM', 'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam', 'NULL',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC'
+            ),
+        2 => array(//mots-cles KLone
+            'out', 'request', 'response',
+            ),
+        3 => array(//fonctions C++ usuelles
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(//fonctions KLone usuelles
+            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
+            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
+            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
+            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
+            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
+            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
+            'request_get_header', 'request_get_field', 'request_get_field_value',
+            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
+            'response_set_cookie', 'response_set_method', 'response_get_method',
+            'response_print_header', 'response_set_field', 'response_del_field',
+            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
+            'response_set_content_length', 'response_get_status', 'response_get_header',
+            'response_io', 'response_redirect', 'response_set_status',
+            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
+            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
+            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
+            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
+            'io_codecs_remove', 'io_name_set', 'io_name_get'
+            ),
+        5 => array(//types C++
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm',
+            'string', 'wchar_t'
+            ),
+        6 => array(//mots-cles HTML
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        7 => array(//autres mots-cles HTML
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C++
+            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
+            3 => 'color: #6600FF;',//pour les fonctions C++
+            4 => 'color: #6600FF;',//pour les fonctions Klone
+            5 => 'color: #0099FF; font-weight: bold;',//pour les types C++
+            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
+            7 => 'color: #000066;'//pour les autres mots-cles HTML
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C++ et KLone
+            2 => 'color: #339933;',//pour les #... en C++
+            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C++ et KLone
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(
+            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
+            1 => '',
+            2 => '',
+            3 => 'color: #00bbdd; font-weight: bold;',
+            4 => 'color: #ddbb00;',
+            5 => 'color: #009900;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
+        5 => '',
+        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        //delimiteurs pour KLone
+        0 => array(
+            '<%=' => '%>'
+            ),
+        1 => array(
+            '<%!' => '%>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        //delimiteur pour HTML
+        3 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        4 => array(
+            '&' => ';'
+            ),
+        5 => array(
+            '<' => '>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => true,
+        2 => true,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
+            )
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/latex.php b/vendor/easybook/geshi/geshi/latex.php
new file mode 100755
index 000000000..386a0b989
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/latex.php
@@ -0,0 +1,223 @@
+<?php
+/*************************************************************************************
+ * latex.php
+ * -----
+ * Author: efi, Matthias Pospiech (matthias@pospiech.eu)
+ * Copyright: (c) 2006 efi, Matthias Pospiech (matthias@pospiech.eu), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/09/23
+ *
+ * LaTeX language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/18 (1.0.8.1)
+ *  - Changes in color and some additional command recognition
+ *  - No special Color for Brackets, it is only distracting
+ *    if color should be reintroduced it should be less bright
+ *  - Math color changed from green to violett, since green is now used for comments
+ *  - Comments are now colored and the only green. The reason for coloring the comments
+ *    is that often important information is in the comments und was merely unvisible before.
+ *  - New Color for [Options]
+ *  - color for labels not specialised anymore. It makes sence in large documents but less in
+ *    small web examples.
+ *  - \@keyword introduced
+ *  - Fixed \& escaped ampersand
+ * 2006/09/23 (1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LaTeX',
+    'COMMENT_SINGLE' => array(
+        1 => '%'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'addlinespace','and','address','appendix','author','backmatter',
+            'bfseries','bibitem','bigskip','blindtext','caption','captionabove',
+            'captionbelow','cdot','centering','chapter','cite','color',
+            'colorbox','date','dedication','def','definecolor','documentclass',
+            'edef','else','email','emph','eqref','extratitle','fbox','fi',
+            'flushleft','flushright','footnote','frac','frontmatter',
+            'graphicspath','hfil','hfill','hfilll','hline','hspace','huge','ifx','include',
+            'includegraphics','infty','input','int','item','itemsep',
+            'KOMAoption','KOMAoptions','label','LaTeX','left','let','limits',
+            'listfiles','listoffigures','listoftables','lowertitleback',
+            'mainmatter','makeatletter','makeatother','makebox','makeindex',
+            'maketitle','mbox','mediumskip','newcommand','newenvironment',
+            'newpage','nocite','nonumber','pagestyle','par','paragraph',
+            'parbox','parident','parskip','partial','publishers','raggedleft',
+            'raggedright','raisebox','ref','renewcommand','renewenvironment',
+            'right','rule','section','setlength','sffamily','subject',
+            'subparagraph','subsection','subsubsection','subtitle','sum',
+            'table','tableofcontents','textbf','textcolor','textit',
+            'textnormal','textsuperscript','texttt','textwidth','thanks','title',
+            'titlehead','today','ttfamily','uppertitleback','urlstyle',
+            'usepackage','vfil','vfill','vfilll','vspace'
+            )
+        ),
+    'SYMBOLS' => array(
+        "&", "\\", "{", "}", "[", "]"
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => true,
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #2C922C; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 =>  'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 =>  'color: #000000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 =>  'color: #E02020; '
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #8020E0; font-weight: normal;',  // Math inner
+            2 => 'color: #C08020; font-weight: normal;', // [Option]
+            3 => 'color: #8020E0; font-weight: normal;', // Maths
+            4 => 'color: #800000; font-weight: normal;', // Structure: Labels
+            5 => 'color: #00008B; font-weight: bold;',  // Structure (\section{->x<-})
+            6 => 'color: #800000; font-weight: normal;', // Structure (\section)
+            7 => 'color: #0000D0; font-weight: normal;', // Environment \end or \begin{->x<-} (brighter blue)
+            8 => 'color: #C00000; font-weight: normal;', // Structure \end or \begin
+            9 => 'color: #2020C0; font-weight: normal;', // {...}
+            10 => 'color: #800000; font-weight: normal;', // \%, \& etc.
+            11 => 'color: #E00000; font-weight: normal;', // \@keyword
+            12 => 'color: #800000; font-weight: normal;', // \keyword
+        ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.golatex.de/wiki/index.php?title=%5C{FNAME}',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Math inner
+        1 => array(
+            GESHI_SEARCH => "(\\\\begin\\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign)\\})(.*)(\\\\end\\{\\2\\})",
+            GESHI_REPLACE => '\3',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\4'
+            ),
+        // [options]
+        2 => array(
+            GESHI_SEARCH => "(?<=\[).*(?=\])",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // Math mode with $ ... $
+        3 => array(
+            GESHI_SEARCH => "\\$.+\\$",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // Structure: Label
+        4 => "\\\\(?:label|pageref|ref|cite)(?=[^a-zA-Z])",
+        // Structure: sections
+        5 => array(
+            GESHI_SEARCH => "(\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?\\{)(.*)(?=\\})",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'U',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        // Structure: sections
+        6 => "\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?(?=[^a-zA-Z])",
+        // environment \begin{} and \end{} (i.e. the things inside the {})
+        7 => array(
+            GESHI_SEARCH => "(\\\\(?:begin|end)\\{)(.*)(?=\\})",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'U',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        // Structure \begin and \end
+        8 => "\\\\(?:end|begin)(?=[^a-zA-Z])",
+        // {parameters}
+        9 => array(
+            GESHI_SEARCH => "(?<=\\{)(?!<\|!REG3XP5!>).*?(?=\\})",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // \%, \& usw.
+        10 => "\\\\(?:[_$%]|&amp;)",
+        //  \@keywords
+        11 => "(?<!<\|!REG3XP[8]!>)\\\\@[a-zA-Z]+\*?",
+        // \keywords
+        12 => "(?<!<\|!REG3XP[468]!>)\\\\[a-zA-Z]+\*?",
+
+// ---------------------------------------------
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<=\\\\)",
+            'DISALLOWED_AFTER' => "(?![A-Za-z0-9])"
+        ),
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/lb.php b/vendor/easybook/geshi/geshi/lb.php
new file mode 100755
index 000000000..6c2882894
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lb.php
@@ -0,0 +1,162 @@
+<?php
+/*************************************************************************************
+ * lb.php
+ * --------
+ * Author: Chris Iverson (cj.no.one@gmail.com)
+ * Copyright: (c) 2010 Chris Iverson
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/07/18
+ *
+ * Liberty BASIC language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/22
+ *  -  First Release
+ *
+ * 2010/08/23
+ *  -  Added missing default variables
+ *
+ * TODO (updated 2010/07/20)
+ * -------------------------
+ * Prevent highlighting numbers in handle names(constants beginning with #)
+ * Allow number highlighting after a single period(e.g.  .9 = 0.9, should be
+ *     highlighted
+ * Prevent highlighting keywords within branch labels(within brackets)
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Liberty BASIC',
+    'COMMENT_SINGLE' => array(1 => '\''),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'and', 'append', 'as', 'beep', 'bmpbutton', 'bmpsave', 'boolean',
+            'button', 'byref', 'call', 'callback', 'calldll', 'callfn', 'case',
+            'checkbox', 'close', 'cls', 'colordialog', 'combobox', 'confirm',
+            'cursor', 'data', 'dialog', 'dim', 'dll', 'do', 'double', 'dump',
+            'dword', 'else', 'end', 'error', 'exit', 'field', 'filedialog',
+            'files', 'fontdialog', 'for', 'function', 'get', 'gettrim',
+            'global', 'gosub', 'goto', 'graphicbox', 'graphics', 'groupbox',
+            'if', 'input', 'kill', 'let', 'line', 'listbox', 'loadbmp',
+            'locate', 'long', 'loop', 'lprint', 'mainwin', 'maphandle', 'menu',
+            'mod', 'name', 'next', 'nomainwin', 'none', 'notice', 'on',
+            'oncomerror', 'or', 'open', 'out', 'output', 'password', 'playmidi',
+            'playwave', 'popupmenu', 'print', 'printerdialog', 'prompt', 'ptr',
+            'put', 'radiobutton', 'random', 'randomize', 'read', 'readjoystick',
+            'redim', 'rem', 'restore', 'resume', 'return', 'run', 'scan',
+            'seek', 'select', 'short', 'sort', 'statictext', 'stop', 'stopmidi',
+            'struct', 'stylebits', 'sub', 'text', 'textbox', 'texteditor',
+            'then', 'timer', 'titlebar', 'to', 'trace', 'ulong', 'unloadbmp',
+            'until', 'ushort', 'void', 'wait', 'window', 'wend', 'while',
+            'word', 'xor'
+            ),
+        2 => array(
+            'abs', 'acs', 'asc', 'asn', 'atn', 'chr$', 'cos', 'date$',
+            'dechex$', 'eof', 'eval', 'eval$', 'exp', 'hbmp', 'hexdec', 'hwnd',
+            'inp', 'input$', 'inputto$', 'instr', 'int', 'left$', 'len', 'lof',
+            'log', 'lower$', 'max', 'midipos', 'mid$', 'min', 'mkdir', 'not',
+            'right$', 'rmdir', 'rnd', 'sin', 'space$', 'sqr', 'str$', 'tab',
+            'tan', 'time$', 'trim$', 'txcount', 'upper$', 'using', 'val',
+            'winstring', 'word$'
+            ),
+        3 => array(
+            'BackgroundColor$', 'Com', 'ComboboxColor$', 'ComError', 'ComErrorNumber',
+            'CommandLine$', 'ComPortNumber', 'DefaultDir$',
+            'DisplayHeight', 'DisplayWidth', 'Drives$', 'Err', 'Err$',
+            'ForegroundColor$', 'Inkey$', 'Joy1x', 'Joy1y', 'Joy1z',
+            'Joy1button1', 'Joy1button2', 'Joy2x', 'Joy2y', 'Joy2z',
+            'Joy2button1', 'Joy2button2', 'ListboxColor$', 'MouseX', 'MouseY', 'Platform$',
+            'PrintCollate', 'PrintCopies', 'PrinterFont$', 'PrinterName$', 'StartupDir$',
+            'TextboxColor$', 'TexteditorColor$', 'Version$', 'WindowHeight',
+            'WindowWidth', 'UpperLeftX', 'UpperLeftY'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', ':', ',', '#'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #AD0080;',
+            3 => 'color: #008080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                //In LB, the second keyword list is a list of built-in functions,
+                //and their names should not be highlighted unless being used
+                //as a function name.
+                'DISALLOWED_AFTER' => '(?=\s*\()'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/ldif.php b/vendor/easybook/geshi/geshi/ldif.php
new file mode 100755
index 000000000..424818380
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ldif.php
@@ -0,0 +1,116 @@
+<?php
+/*************************************************************************************
+ * ldif.php
+ * --------
+ * Author: Bruno Harbulot (Bruno.Harbulot@manchester.ac.uk)
+ * Copyright: (c) 2005 deguix, (c) 2010 Bruno Harbulot
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/03/01
+ *
+ * LDIF language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/03/01 (1.0.8.11)
+ *   -  First Release
+ *   -  Derived from ini.php (INI language), (c) 2005 deguix
+ *
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LDIF',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066; font-weight: bold;',
+            1 => 'color: #FF0000;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '([a-zA-Z0-9_]+):(.+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ':\\2'
+            ),
+        1 => array(
+            // Evil hackery to get around GeSHi bug: <>" and ; are added so <span>s can be matched
+            // Explicit match on variable names because if a comment is before the first < of the span
+            // gets chewed up...
+            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+):(.+)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1:',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/lisp.php b/vendor/easybook/geshi/geshi/lisp.php
new file mode 100755
index 000000000..a2301914e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lisp.php
@@ -0,0 +1,147 @@
+<?php
+/*************************************************************************************
+ * lisp.php
+ * --------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.12
+ * Date Started: 2004/08/30
+ *
+ * Generic Lisp language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2013/11/13 (1.0.8.12)
+ *  -  Fixed bug where a keyword was highlighted in identifiers (Edward Hart)
+ * 2005/12/9  (1.0.2)
+ *  -  Added support for :keywords and ::access (Denis Mashkevich)
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/08/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Lisp',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(';|' => '|;'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'not','defun','princ','when',
+            'eval','apply','funcall','quote','identity','function',
+            'complement','backquote','lambda','set','setq','setf',
+            'defmacro','gensym','make','symbol','intern',
+            'name','value','plist','get',
+            'getf','putprop','remprop','hash','array','aref',
+            'car','cdr','caar','cadr','cdar','cddr','caaar','caadr','cadar',
+            'caddr','cdaar','cdadr','cddar','cdddr','caaaar','caaadr',
+            'caadar','caaddr','cadaar','cadadr','caddar','cadddr',
+            'cdaaar','cdaadr','cdadar','cdaddr','cddaar','cddadr',
+            'cdddar','cddddr','cons','list','append','reverse','last','nth',
+            'nthcdr','member','assoc','subst','sublis','nsubst',
+            'nsublis','remove','length',
+            'mapc','mapcar','mapl','maplist','mapcan','mapcon','rplaca',
+            'rplacd','nconc','delete','atom','symbolp','numberp',
+            'boundp','null','listp','consp','minusp','zerop','plusp',
+            'evenp','oddp','eq','eql','equal','cond','case','and','or',
+            'let','l','if','prog','prog1','prog2','progn','go','return',
+            'do','dolist','dotimes','catch','throw','error','cerror','break',
+            'continue','errset','baktrace','evalhook','truncate','float',
+            'rem','min','max','abs','sin','cos','tan','expt','exp','sqrt',
+            'random','logand','logior','logxor','lognot','bignums','logeqv',
+            'lognand','lognor','logorc2','logtest','logbitp','logcount',
+            'integer','nil','parse-integer','make-list','print','write'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '!', '%', '^', '&',
+        ' + ',' - ',' * ',' / ',
+        '=','<','>',
+        '.',':',',',';',
+        '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #555;',
+            1 => 'color: #555;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        '::', ':'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9-\$_\|\#|^&])',
+            ),
+        'OOLANG' => array(
+            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/llvm.php b/vendor/easybook/geshi/geshi/llvm.php
new file mode 100755
index 000000000..580099b52
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/llvm.php
@@ -0,0 +1,385 @@
+<?php
+/*************************************************************************************
+ * llvm.php
+ * --------
+ * Author: Benny Baumann (BenBE@geshi.org), Azriel Fasten (azriel.fasten@gmail.com)
+ * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/), Azriel Fasten (azriel.fasten@gmail.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/10/14
+ *
+ * LLVM language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/10/14 (1.0.8.10)
+ *  -  First Release
+ *
+ * TODO (updated 2010/10/14)
+ * -------------------------
+ * * Check if all links aren't broken
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'LLVM Intermediate Representation',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'HARDQUOTE' => array("\"", "\""),
+    'HARDESCAPE' => array("\"", "\\"),
+    'HARDCHAR' => "\\",
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        // 1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        // 2 => "#\\\\x[\da-fA-F]{1,2}#i",
+        //Octal Char Specs
+        // 3 => "#\\\\[0-7]{1,3}#",
+        //String Parsing of Variable Names
+        // 4 => "#\\$[a-z0-9_]+(?:\\[[a-z0-9_]+\\]|->[a-z0-9_]+)?|(?:\\{\\$|\\$\\{)[a-z0-9_]+(?:\\[('?)[a-z0-9_]*\\1\\]|->[a-z0-9_]+)*\\}#i",
+        //Experimental extension supporting cascaded {${$var}} syntax
+        // 5 => "#\$[a-z0-9_]+(?:\[[a-z0-9_]+\]|->[a-z0-9_]+)?|(?:\{\$|\$\{)[a-z0-9_]+(?:\[('?)[a-z0-9_]*\\1\]|->[a-z0-9_]+)*\}|\{\$(?R)\}#i",
+        //Format String support in ""-Strings
+        // 6 => "#%(?:%|(?:\d+\\\\\\\$)?\\+?(?:\x20|0|'.)?-?(?:\d+|\\*)?(?:\.\d+)?[bcdefFosuxX])#"
+        ),
+    'NUMBERS' =>
+    GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        0 => array(
+            'to', 'nuw', 'nsw', 'align', 'inbounds', 'entry', 'return'
+            ),
+        //Terminator Instructions
+        1 => array(
+            'ret', 'br', 'switch', 'indirectbr', 'invoke', 'unwind', 'unreachable'
+            ),
+        //Binary Operations
+        2 => array(
+            'add', 'fadd', 'sub', 'fsub', 'mul', 'fmul', 'udiv', 'sdiv', 'fdiv', 'urem', 'frem', 'srem'
+            ),
+        //Bitwise Binary Operations
+        3 => array(
+            'shl', 'lshr', 'ashr', 'and', 'or', 'xor'
+            ),
+        //Vector Operations
+        4 => array(
+            'extractelement', 'insertelement', 'shufflevector'
+            ),
+        //Aggregate Operations
+        5 => array(
+            'extractvalue', 'insertvalue'
+            ),
+        //Memory Access and Addressing Operations
+        6 => array(
+            'alloca', 'load', 'store', 'getelementptr'
+            ),
+        //Conversion Operations
+        7 => array(
+            'trunc', 'zext', 'sext', 'fptrunc', 'fpext', 'fptoui', 'fptosi',
+            'uitofp', 'sitofp', 'ptrtoint', 'inttoptr', 'bitcast'
+            ),
+        //Other Operations
+        8 => array(
+            'icmp', 'fcmp', 'phi', 'select', 'call', 'va_arg'
+            ),
+        //Linkage Types
+        9 => array(
+            'private', 'linker_private', 'linker_private_weak', 'linker_private_weak_def_auto',
+            'internal', 'available_externally', 'linkonce', 'common', 'weak', 'appending',
+            'extern_weak', 'linkonce_odr', 'weak_odr', 'externally visible', 'dllimport', 'dllexport',
+            ),
+        //Calling Conventions
+        10 => array(
+            'ccc', 'fastcc', 'coldcc', 'cc 10'
+            ),
+        //Named Types
+        11 => array(
+            'type'
+            ),
+        //Parameter Attributes
+        12 => array(
+            'zeroext', 'signext', 'inreg', 'byval', 'sret', 'noalias', 'nocapture', 'nest'
+            ),
+        //Function Attributes
+        13 => array(
+            'alignstack', 'alwaysinline', 'inlinehint', 'naked', 'noimplicitfloat', 'noinline', 'noredzone', 'noreturn',
+            'nounwind', 'optsize', 'readnone', 'readonly', 'ssp', 'sspreq',
+            ),
+        //Module-Level Inline Assembly
+        14 => array(
+            'module asm'
+            ),
+        //Data Layout
+        15 => array(
+            'target datalayout'
+            ),
+        //Primitive Types
+        16 => array(
+            'x86mmx',
+            'void',
+            'label',
+            'metadata',
+            'opaque'
+            ),
+        //Floating Point Types
+        17 => array(
+            'float', 'double', 'fp128', 'x86_fp80', 'ppc_fp128',
+            ),
+        //Simple Constants
+        18 => array(
+            'false', 'true', 'null'
+            ),
+        //Global Variable and Function Addresses
+        19 => array(
+            'global', 'addrspace', 'constant', 'section'
+            ),
+        //Functions
+        20 => array(
+            'declare', 'define'
+            ),
+        //Complex Constants
+        21 => array(
+            'zeroinitializer'
+            ),
+        //Undefined Values
+        22 => array(
+            'undef'
+            ),
+        //Addresses of Basic Blocks
+        23 => array(
+            'blockaddress'
+            ),
+        //Visibility Styles
+        24 => array(
+            'default', 'hidden', 'protected'
+            ),
+        25 => array(
+            'volatile'
+            ),
+        26 => array(
+            'tail'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+        17 => true,
+        18 => true,
+        19 => true,
+        20 => true,
+        21 => true,
+        22 => true,
+        23 => true,
+        24 => true,
+        25 => true,
+        26 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            0 => 'color: #209090;',
+            1 => 'color: #0000F0;',
+            2 => 'color: #00F000; font-weight: bold;',
+            3 => 'color: #F00000;',
+            4 => 'color: #00F0F0; font-weight: bold;',
+            5 => 'color: #F000F0; font-weight: bold;',
+            6 => 'color: #403020; font-weight: bold;',
+            7 => 'color: #909090; font-weight: bold;',
+            8 => 'color: #009090; font-weight: bold;',
+            9 => 'color: #900090; font-weight: bold;',
+            10 => 'color: #909000; font-weight: bold;',
+            11 => 'color: #000090; font-weight: bold;',
+            12 => 'color: #900000; font-weight: bold;',
+            13 => 'color: #009000; font-weight: bold;',
+            14 => 'color: #F0F090; font-weight: bold;',
+            15 => 'color: #F090F0; font-weight: bold;',
+            16 => 'color: #90F0F0; font-weight: bold;',
+            17 => 'color: #9090F0; font-weight: bold;',
+            18 => 'color: #90F090; font-weight: bold;',
+            19 => 'color: #F09090; font-weight: bold;',
+            20 => 'color: #4040F0; font-weight: bold;',
+            21 => 'color: #40F040; font-weight: bold;',
+            22 => 'color: #F04040; font-weight: bold;',
+            23 => 'color: #F0F040; font-weight: bold;',
+            24 => 'color: #F040F0; font-weight: bold;',
+            25 => 'color: #40F0F0; font-weight: bold;',
+            26 => 'color: #904040; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #006699; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold; font-style: italic;',
+            6 => 'color: #009933; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007088;',
+            1 => 'color: #007088;',
+            // 2 => 'color: #000088;',
+            3 => 'color: #700088;',
+            4 => 'color: #010088;',
+            // 5 => 'color: #610088;',
+            // 6 => 'color: #616088;',
+            // 7 => 'color: #616988;',
+            // 8 => 'color: #616908;',
+            9 => 'color: #6109F8;',
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        0 => '',
+        1 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        2 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        3 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        4 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        5 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        6 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        7 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        8 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        9 => 'http://llvm.org/docs/LangRef.html#linkage_{FNAME}',
+        10 => 'http://llvm.org/docs/LangRef.html#callingconv',
+        11 => 'http://llvm.org/docs/LangRef.html#namedtypes',
+        12 => 'http://llvm.org/docs/LangRef.html#paramattrs',
+        13 => 'http://llvm.org/docs/LangRef.html#fnattrs',
+        14 => 'http://llvm.org/docs/LangRef.html#moduleasm',
+        15 => 'http://llvm.org/docs/LangRef.html#datalayout',
+        16 => 'http://llvm.org/docs/LangRef.html#t_{FNAME}',
+        17 => 'http://llvm.org/docs/LangRef.html#t_floating',
+        18 => 'http://llvm.org/docs/LangRef.html#simpleconstants',
+        19 => 'http://llvm.org/docs/LangRef.html#globalvars',
+        20 => 'http://llvm.org/docs/LangRef.html#functionstructure',
+        21 => 'http://llvm.org/docs/LangRef.html#complexconstants',
+        22 => 'http://llvm.org/docs/LangRef.html#undefvalues',
+        23 => 'http://llvm.org/docs/LangRef.html#blockaddress',
+        24 => 'http://llvm.org/docs/LangRef.html#visibility',
+        25 => 'http://llvm.org/docs/LangRef.html#volatile',
+        26 => 'http://llvm.org/docs/LangRef.html#i_call',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '%[-a-zA-Z$\._][-a-zA-Z$\._0-9]*',
+        //Labels
+        // 1 => '[-a-zA-Z$\._0-9]+:',
+        1 => '(?<!\w)[\-\w\$\.]+:(?![^">]*<)',
+        //Strings
+        // 2 => '"[^"]+"',
+        //Unnamed variable slots
+        3 => '%[-]?[0-9]+',
+        //Integer Types
+        4 => array(
+            GESHI_SEARCH => '(?<!\w)i\d+(?!\w)',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '<a href="http://llvm.org/docs/LangRef.html#t_integer">',
+            GESHI_AFTER => '</a>'
+            ),
+        //Comments
+        // 5 => ';.*',
+        //Integer literals
+        // 6 => '\\b[-]?[0-9]+\\b',
+        //Floating point constants
+        // 7 => '\\b[-+]?[0-9]+\.[0-9]*\([eE][-+]?[0-9]+\)?\\b',
+        //Hex constants
+        // 8 => '\\b0x[0-9A-Fa-f]+\\b',
+        //Global variables
+        9 => array(
+            GESHI_SEARCH => '@[-a-zA-Z$\._][-a-zA-Z$\._0-9]*',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '<a href="http://llvm.org/docs/LangRef.html#globalvars">',
+            GESHI_AFTER => '</a>'
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'SCRIPT_DELIMITERS' => array(),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/locobasic.php b/vendor/easybook/geshi/geshi/locobasic.php
new file mode 100755
index 000000000..61c8a3c83
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/locobasic.php
@@ -0,0 +1,130 @@
+<?php
+/*************************************************************************************
+ * locobasic.php
+ * -------------
+ * Author: Nacho Cabanes
+ * Copyright: (c) 2009 Nacho Cabanes (http://www.nachocabanes.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/03/22
+ *
+ * Locomotive Basic (Amstrad CPC series) language file for GeSHi.
+ *
+ * More details at http://en.wikipedia.org/wiki/Locomotive_BASIC
+ *
+ * CHANGES
+ * -------
+ * 2009/03/22 (1.0.8.3)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Locomotive Basic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => 'REM'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "AFTER", "AND", "AUTO", "BORDER", "BREAK", "CALL", "CAT", "CHAIN",
+            "CLEAR", "CLG", "CLS", "CLOSEIN", "CLOSEOUT", "CONT", "CURSOR",
+            "DATA", "DEF", "DEFINT", "DEFREAL", "DEFSTR", "DEG", "DELETE",
+            "DERR", "DI", "DIM", "DRAW", "DRAWR", "EDIT", "EI", "ELSE", "END",
+            "ENV", "ENT", "EOF", "ERASE", "ERL", "ERR", "ERROR", "EVERY",
+            "FILL", "FN", "FOR", "FRAME", "GOSUB", "GOTO", "GRAPHICS", "HIMEM",
+            "IF", "INK", "INPUT", "KEY", "LET", "LINE", "LIST", "LOAD",
+            "LOCATE", "MASK", "MEMORY", "MERGE", "MODE", "MOVE", "MOVER", "NEW",
+            "NEXT", "NOT", "ON", "OPENIN", "OPENOUT", "OR", "ORIGIN", "PAPER",
+            "PEEK", "PEN", "PLOT", "PLOTR", "POKE", "PRINT", "RAD", "RANDOMIZE",
+            "READ", "RELEASE", "REMAIN", "RENUM", "RESTORE", "RESUME", "RETURN",
+            "RUN", "SAVE", "SPEED", "SOUND", "SPC", "SQ", "STEP", "STOP", "SWAP",
+            "SYMBOL", "TAB", "TAG", "TAGOFF", "TEST", "TESTR", "TIME", "TO",
+            "THEN", "TRON", "TROFF", "USING", "WAIT", "WEND", "WHILE", "WIDTH",
+            "WINDOW", "WRITE", "XOR", "ZONE"
+            ),
+        2 => array(
+            "ABS", "ASC", "ATN", "BIN", "CHR", "CINT", "COPYCHR", "COS",
+            "CREAL", "DEC", "FIX", "FRE", "EXP", "HEX", "INKEY", "INP", "INSTR",
+            "INT", "JOY", "LEFT", "LEN", "LOG", "LOG10", "LOWER", "MAX", "MID",
+            "MIN", "MOD", "OUT", "PI", "POS", "RIGHT", "RND", "ROUND", "SGN",
+            "SIN", "SPACE", "SQR", "STR", "STRING", "TAN", "UNT", "UPPER",
+            "VAL", "VPOS", "XPOS", "YPOS"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000088; font-weight: bold;',
+            2 => 'color: #AA00AA; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0044ff;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/logtalk.php b/vendor/easybook/geshi/geshi/logtalk.php
new file mode 100755
index 000000000..05734663e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/logtalk.php
@@ -0,0 +1,345 @@
+<?php
+/*************************************************************************************
+ * logtalk.php
+ * -----------
+ *
+ * Author: Paulo Moura (pmoura@logtalk.org)
+ * Copyright: (c) 2009-2011 Paulo Moura (http://logtalk.org/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/24
+ *
+ * Logtalk language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/01/18 (1.1.4)
+ *  -  Added syntax coloring of ignore/1
+ * 2010/11/28 (1.1.3)
+ *  -  Added syntax coloring of conforms_to_protocol/2-3
+ * 2010/09/14 (1.1.2)
+ *  -  Added syntax coloring of coinductive/1
+ * 2010/06/23 (1.1.1)
+ *  -  Added syntax coloring of e/0 and pi/0
+ *  -  Added syntax coloring of ground/1, numbervars/3, keysort/2, and sort/2
+ * 2010/05/15 (1.1.0)
+ *  -  Added syntax coloring of callable/1 and compare/3
+ * 2009/10/28 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Logtalk',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => "/0'./sim"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'HARDQUOTE' => array('"', '"'),
+    'HARDESCAPE' => array(),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]+\\\\#",
+        //Octal Char Specs
+        3 => "#\\\\[0-7]+\\\\#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX_0O |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // Directives (with arguments)
+        1 => array(
+            // file directives
+            'encoding', 'ensure_loaded',
+            // flag directives
+            'set_logtalk_flag', 'set_prolog_flag',
+            // entity opening directives
+            'category', 'object', 'protocol',
+            // predicate scope directives
+            'private', 'protected', 'public',
+            // conditional compilation directives
+            'elif', 'if',
+            // entity directives
+            'calls', 'initialization', 'op', 'uses',
+            // predicate directives
+            'alias', 'coinductive', 'discontiguous', 'dynamic', 'mode', 'info', 'meta_predicate', 'multifile', 'synchronized',
+            // module directives
+            'export', 'module', 'reexport', 'use_module'
+            ),
+        // Directives (no arguments)
+        2 => array(
+            // entity directives
+            'dynamic',
+            // multi-threading directives
+            'synchronized', 'threaded',
+            // entity closing directives
+            'end_category', 'end_object', 'end_protocol',
+            // conditional compilation directives
+            'else', 'endif'
+            ),
+        // Entity relations
+        3 => array(
+            'complements', 'extends', 'imports', 'implements','instantiates', 'specializes'
+            ),
+        // Built-in predicates (with arguments)
+        4 => array(
+            // event handlers
+            'after', 'before',
+            // execution-context methods
+            'parameter', 'self', 'sender', 'this',
+            // predicate reflection
+            'current_predicate', 'predicate_property',
+            // DCGs and term expansion
+            'expand_goal', 'expand_term', 'goal_expansion', 'phrase', 'term_expansion',
+            // entity
+            'abolish_category', 'abolish_object', 'abolish_protocol',
+            'create_category', 'create_object', 'create_protocol',
+            'current_category', 'current_object', 'current_protocol',
+            'category_property', 'object_property', 'protocol_property',
+            // entity relations
+            'complements_object', 'conforms_to_protocol',
+            'extends_category', 'extends_object', 'extends_protocol',
+            'implements_protocol', 'imports_category',
+            'instantiates_class', 'specializes_class',
+            // events
+            'abolish_events', 'current_event', 'define_events',
+            // flags
+            'current_logtalk_flag', 'set_logtalk_flag',
+            'current_prolog_flag', 'set_prolog_flag',
+            // compiling, loading, and library path
+            'logtalk_compile', 'logtalk_library_path', 'logtalk_load',
+            // database
+            'abolish', 'asserta', 'assertz', 'clause', 'retract', 'retractall',
+            // control
+            'call', 'catch', 'ignore', 'once', 'throw',
+            // all solutions predicates
+            'bagof', 'findall', 'forall', 'setof',
+            // multi-threading meta-predicates
+            'threaded',
+            'threaded_call', 'threaded_once', 'threaded_ignore', 'threaded_exit', 'threaded_peek',
+            'threaded_wait', 'threaded_notify',
+            // term unification
+            'unify_with_occurs_check',
+            // atomic term processing
+            'atom_chars', 'atom_codes', 'atom_concat', 'atom_length',
+            'number_chars', 'number_codes',
+            'char_code',
+            // term creation and decomposition
+            'arg', 'copy_term', 'functor', 'numbervars',
+            // term testing
+            'atom', 'atomic', 'callable', 'compound', 'float', 'ground', 'integer', 'nonvar', 'number', 'sub_atom', 'var',
+            // term comparison
+            'compare',
+            // stream selection and control
+            'current_input', 'current_output', 'set_input', 'set_output',
+            'open', 'close', 'flush_output', 'stream_property',
+            'at_end_of_stream', 'set_stream_position',
+            // character and byte input/output predicates
+            'get_byte', 'get_char', 'get_code',
+            'peek_byte', 'peek_char', 'peek_code',
+            'put_byte', 'put_char', 'put_code',
+            'nl',
+            // term input/output predicates
+            'current_op', 'op',
+            'write', 'writeq', 'write_canonical', 'write_term',
+            'read', 'read_term',
+            'char_conversion', 'current_char_conversion',
+            // hooks
+            'halt',
+            // sorting
+            'keysort', 'sort'
+            ),
+        // Built-in predicates (no arguments)
+        5 => array(
+            // control
+            'fail', 'repeat', 'true',
+            // character and byte input/output predicates
+            'nl',
+            // implementation defined hooks functions
+            'halt',
+            // arithemtic evaluation
+            'is',
+            // stream selection and control
+            'at_end_of_stream', 'flush_output'
+            ),
+        // Evaluable functors (with arguments)
+        6 => array(
+            'float_integer_part', 'float_fractional_part',
+            'rem', 'mod', 'abs', 'sign', 'floor', 'truncate', 'round', 'ceiling',
+            'cos', 'atan', 'exp', 'log', 'sin', 'sqrt'
+            ),
+        // Evaluable functors (no arguments)
+        7 => array(
+            'e', 'pi', 'mod', 'rem'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            // external call
+            '{', '}'
+            ),
+        1 => array(
+            // arithemtic comparison
+            '=:=', '=\=', '<', '=<', '>=', '>',
+            // term comparison
+            '<<', '>>', '/\\', '\\/', '\\',
+            // bitwise functors
+            '==', '\==', '@<', '@=<', '@>=', '@>',
+            // evaluable functors
+            '+', '-', '*', '/', '**',
+            // logic and control
+            '!', '\\+', ';',
+            // message sending operators
+            '::', '^^', ':',
+            // grammar rule and conditional functors
+            '-->', '->',
+            // mode operators
+            '@', '?',
+            // term to list predicate
+            '=..',
+            // unification
+            '=', '\\='
+            ),
+        2 => array(
+            // clause and directive functors
+            ':-'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #2e4dc9;',
+            2 => 'color: #2e4dc9;',
+            3 => 'color: #2e4dc9;',
+            4 => 'color: #9d4f37;',
+            5 => 'color: #9d4f37;',
+            6 => 'color: #9d4f37;',
+            7 => 'color: #9d4f37;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #430000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #60a0b0; font-style: italic;',
+            2 => 'color: #430000;',
+            'MULTI' => 'color: #60a0b0; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #9f0000; font-weight: bold;',
+            1 => 'color: #9f0000; font-weight: bold;',
+            2 => 'color: #9f0000; font-weight: bold;',
+            3 => 'color: #9f0000; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #666666;font-weight: bold;',
+            1 => 'color: #666666;font-weight: bold;',
+            2 => 'color: #000000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #9f0000;',
+            'HARD' => 'color: #9f0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #848484;'
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        // variables
+        0 => '\b(?!(?:PIPE|SEMI|REG3XP\d*)[^a-zA-Z0-9_])[A-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_])'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=:-\s)',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=:-\s)',
+                'DISALLOWED_AFTER' => '(?=\.)'
+            ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&\'"])',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&\'"])',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^&\'"])',
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\'"])'
+            ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#;>|^&\'"])',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            7 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#;>|^&\'"])',
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\'"])'
+            )
+        )
+    ),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/lolcode.php b/vendor/easybook/geshi/geshi/lolcode.php
new file mode 100755
index 000000000..ab6088b18
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lolcode.php
@@ -0,0 +1,152 @@
+<?php
+/*************************************************************************************
+ * lolcode.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/31
+ *
+ * LOLcode language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'LOLcode',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/\bBTW\b.*$/im",
+        2 => "/(^|\b)(?:OBTW\b.+?\bTLDR|LOL\b.+?\/LOL)(\b|$)/si"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => '/:[)>o":]/',
+        2 => '/:\([\da-f]+\)/i',
+        3 => '/:\{\w+\}/i',
+        4 => '/:\[\w+\]/i',
+        ),
+    'KEYWORDS' => array(
+        //Statements
+        1 => array(
+            'VISIBLE', 'HAI', 'KTHX', 'KTHXBYE', 'SMOOSH', 'GIMMEH', 'PLZ',
+            'ON', 'INVISIBLE', 'R', 'ITZ', 'GTFO', 'COMPLAIN', 'GIMME',
+
+            'OPEN', 'FILE', 'I HAS A', 'AWSUM THX', 'O NOES', 'CAN', 'HAS', 'HAZ',
+            'HOW DOES I', 'IF U SAY SO', 'FOUND YR', 'BORROW', 'OWN', 'ALONG',
+            'WITH', 'WIT', 'LOOK', 'AT', 'AWSUM', 'THX'
+            ),
+        //Conditionals
+        2 => array(
+            'IZ', 'YARLY', 'NOWAI', 'WTF?', 'MEBBE', 'OMG', 'OMGWTF',
+            'ORLY?', 'OF', 'NOPE', 'SO', 'IM', 'MAI',
+
+            'O RLY?', 'SUM', 'BOTH SAEM', 'DIFFRINT', 'BOTH', 'EITHER', 'WON',
+            'DIFF', 'PRODUKT', 'QUOSHUNT', 'MOD', 'MKAY', 'OK', 'THING',
+            'BIGNESS'
+            ),
+        //Repetition
+        3 => array(
+            'IN', 'OUTTA', 'LOOP', 'WHILE'
+            ),
+        //Operators \Math
+        4 => array(
+            'AN', 'AND', 'NOT', 'UP', 'YR', 'UPPIN', 'NERF', 'NERFIN', 'NERFZ',
+            'SMASHING', 'UR', 'KINDA', 'LIKE', 'SAEM', 'BIG', 'SMALL',
+            'BIGGR', 'SMALLR', 'BIGGER', 'SMALLER', 'GOOD', 'CUTE', 'THAN'
+            )
+        ),
+    'SYMBOLS' => array(
+        '.', ',', '?',
+        '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008000;',
+            2 => 'color: #000080;',
+            3 => 'color: #000080;',
+            4 => 'color: #800000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; style: italic;',
+            2 => 'color: #666666; style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/lotusformulas.php b/vendor/easybook/geshi/geshi/lotusformulas.php
new file mode 100755
index 000000000..18d6f7822
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lotusformulas.php
@@ -0,0 +1,316 @@
+<?php
+/*************************************************************************************
+ * lotusformulas.php
+ * ------------------------
+ * Author: Richard Civil (info@richardcivil.net)
+ * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/04/12
+ *
+ * @Formula/@Command language file for GeSHi.
+ *
+ * @Formula/@Command source: IBM Lotus Notes/Domino 8 Designer Help
+ *
+ * CHANGES
+ * -------
+ * 2008/04/12 (1.0.7.22)
+ *  -  First Release
+ *
+ * TODO (updated 2008/04/12)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Lotus Notes @Formulas',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array('REM' => ';'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array (
+            '[ZoomPreview]', '[WorkspaceStackReplicaIcons]',
+            '[WorkspaceProperties]', '[WindowWorkspace]',
+            '[WindowTile]', '[WindowRestore]', '[WindowNext]',
+            '[WindowMinimizeAll]', '[WindowMinimize]', '[WindowMaximizeAll]',
+            '[WindowMaximize]', '[WindowCascade]', '[ViewSwitchForm]',
+            '[ViewShowUnread]', '[ViewShowServerNames]', '[ViewShowSearchBar]',
+            '[ViewShowRuler]', '[ViewShowPageBreaks]', '[ViewShowOnlyUnread]',
+            '[ViewShowOnlySelected]', '[ViewShowOnlySearchResults]',
+            '[ViewShowOnlyCategories]', '[ViewShowObject]',
+            '[ViewShowFieldHelp]', '[ViewRenamePerson]', '[ViewRefreshUnread]',
+            '[ViewRefreshFields]', '[ViewNavigatorsNone]',
+            '[ViewNavigatorsFolders]', '[ViewMoveName]', '[ViewHorizScrollbar]',
+            '[ViewExpandWithChildren]', '[ViewExpandAll]', '[ViewExpand]',
+            '[ViewCollapseAll]', '[ViewCollapse]', '[ViewChange]',
+            '[ViewCertify]', '[ViewBesideFolders]', '[ViewBelowFolders]',
+            '[ViewArrangeIcons]', '[V3EditPrevField]', '[V3EditNextField]',
+            '[UserIDSwitch]', '[UserIDSetPassword]', '[UserIDMergeCopy]',
+            '[UserIDInfo]', '[UserIDEncryptionKeys]', '[UserIDCreateSafeCopy]',
+            '[UserIDClearPassword]', '[UserIDCertificates]',
+            '[ToolsUserLogoff]', '[ToolsSpellCheck]', '[ToolsSmartIcons]',
+            '[ToolsSetupUserSetup]', '[ToolsSetupPorts]', '[ToolsSetupMail]',
+            '[ToolsSetupLocation]', '[ToolsScanUnreadSelected]',
+            '[ToolsScanUnreadPreferred]', '[ToolsScanUnreadChoose]',
+            '[ToolsRunMacro]', '[ToolsRunBackgroundMacros]', '[ToolsReplicate]',
+            '[ToolsRefreshSelectedDocs]', '[ToolsRefreshAllDocs]',
+            '[ToolsMarkSelectedUnread]', '[ToolsMarkSelectedRead]',
+            '[ToolsMarkAllUnread]', '[ToolsMarkAllRead]', '[ToolsHangUp]',
+            '[ToolsCategorize]', '[ToolsCall]', '[TextUnderline]',
+            '[TextSpacingSingle]', '[TextSpacingOneAndaHalf]',
+            '[TextSpacingDouble]', '[TextSetFontSize]', '[TextSetFontFace]',
+            '[TextSetFontColor]', '[TextReduceFont]', '[TextPermanentPen]',
+            '[TextParagraphStyles]', '[TextParagraph]', '[TextOutdent]',
+            '[TextNumbers]', '[TextNormal]', '[TextItalic]', '[TextFont]',
+            '[TextEnlargeFont]', '[TextCycleSpacing]', '[TextBullet]',
+            '[TextBold]', '[TextAlignRight]', '[TextAlignNone]',
+            '[TextAlignLeft]', '[TextAlignFull]', '[TextAlignCenter]',
+            '[SwitchView]', '[SwitchForm]', '[StyleCycleKey]',
+            '[SmartIconsNextSet]', '[SmartIconsFloating]', '[ShowProperties]',
+            '[ShowHidePreviewPane]', '[ShowHideParentPreview]',
+            '[ShowHideLinkPreview]', '[ShowHideIMContactList]',
+            '[SetCurrentLocation]', '[SendInstantMessage]',
+            '[SectionRemoveHeader]', '[SectionProperties]',
+            '[SectionExpandAll]', '[SectionExpand]', '[SectionDefineEditors]',
+            '[SectionCollapseAll]', '[SectionCollapse]', '[RunScheduledAgents]',
+            '[RunAgent]', '[ReplicatorStop]', '[ReplicatorStart]',
+            '[ReplicatorSendReceiveMail]', '[ReplicatorSendMail]',
+            '[ReplicatorReplicateWithServer]', '[ReplicatorReplicateSelected]',
+            '[ReplicatorReplicateNext]', '[ReplicatorReplicateHigh]',
+            '[Replicator]', '[RenameDatabase]', '[RemoveFromFolder]',
+            '[RemoteDebugLotusScript]', '[ReloadWindow]', '[RefreshWindow]',
+            '[RefreshParentNote]', '[RefreshHideFormulas]', '[RefreshFrame]',
+            '[PublishDatabase]', '[PictureProperties]', '[PasteBitmapAsObject]',
+            '[PasteBitmapAsBackground]', '[OpenView]', '[OpenPage]',
+            '[OpenNavigator]', '[OpenInNewWindow]', '[OpenHelpDocument]',
+            '[OpenFrameset]', '[OpenDocument]', '[OpenCalendar]',
+            '[ObjectProperties]', '[ObjectOpen]', '[ObjectDisplayAs]',
+            '[NavPrevUnread]', '[NavPrevSelected]', '[NavPrevMain]',
+            '[NavPrev]', '[NavNextUnread]', '[NavNextSelected]',
+            '[NavNextMain]', '[NavNext]', '[NavigatorTest]',
+            '[NavigatorProperties]', '[NavigateToBacklink]',
+            '[NavigatePrevUnread]', '[NavigatePrevSelected]',
+            '[NavigatePrevMain]', '[NavigatePrevHighlight]', '[NavigatePrev]',
+            '[NavigateNextUnread]', '[NavigateNextSelected]',
+            '[NavigateNextMain]', '[NavigateNextHighlight]', '[NavigateNext]',
+            '[MoveToTrash]', '[MailSendPublicKey]', '[MailSendEncryptionKey]',
+            '[MailSendCertificateRequest]', '[MailSend]', '[MailScanUnread]',
+            '[MailRequestNewPublicKey]', '[MailRequestNewName]',
+            '[MailRequestCrossCert]', '[MailOpen]', '[MailForwardAsAttachment]',
+            '[MailForward]', '[MailComposeMemo]', '[MailAddress]',
+            '[LayoutProperties]', '[LayoutElementSendToBack]',
+            '[LayoutElementProperties]', '[LayoutElementBringToFront]',
+            '[LayoutAddText]', '[LayoutAddGraphic]', '[InsertSubform]',
+            '[HotspotProperties]', '[HotspotClear]', '[HelpUsingDatabase]',
+            '[HelpAboutNotes]', '[HelpAboutDatabase]', '[GoUpLevel]',
+            '[FormTestDocument]', '[FormActions]', '[FolderRename]',
+            '[FolderProperties]', '[FolderMove]', '[FolderExpandWithChildren]',
+            '[FolderExpandAll]', '[FolderExpand]', '[FolderDocuments]',
+            '[FolderCustomize]', '[FolderCollapse]', '[Folder]',
+            '[FindFreeTimeDialog]', '[FileSaveNewVersion]', '[FileSave]',
+            '[FilePrintSetup]', '[FilePrint]', '[FilePageSetup]',
+            '[FileOpenDBRepID]', '[FileOpenDatabase]', '[FileNewReplica]',
+            '[FileNewDatabase]', '[FileImport]', '[FileFullTextUpdate]',
+            '[FileFullTextInfo]', '[FileFullTextDelete]',
+            '[FileFullTextCreate]', '[FileExport]', '[FileExit]',
+            '[FileDatabaseUseServer]', '[FileDatabaseRemove]',
+            '[FileDatabaseInfo]', '[FileDatabaseDelete]', '[FileDatabaseCopy]',
+            '[FileDatabaseCompact]', '[FileDatabaseACL]', '[FileCloseWindow]',
+            '[ExitNotes]', '[Execute]', '[ExchangeUnreadMarks]', '[EmptyTrash]',
+            '[EditUp]', '[EditUntruncate]', '[EditUndo]', '[EditTop]',
+            '[EditTableInsertRowColumn]', '[EditTableFormat]',
+            '[EditTableDeleteRowColumn]', '[EditShowHideHiddenChars]',
+            '[EditSelectByDate]', '[EditSelectAll]', '[EditRight]',
+            '[EditRestoreDocument]', '[EditResizePicture]',
+            '[EditQuoteSelection]', '[EditProfileDocument]', '[EditProfile]',
+            '[EditPrevField]', '[EditPhoneNumbers]', '[EditPasteSpecial]',
+            '[EditPaste]', '[EditOpenLink]', '[EditNextField]',
+            '[EditMakeDocLink]', '[EditLocations]', '[EditLinks]', '[EditLeft]',
+            '[EditInsertText]', '[EditInsertTable]', '[EditInsertPopup]',
+            '[EditInsertPageBreak]', '[EditInsertObject]',
+            '[EditInsertFileAttachment]', '[EditInsertButton]',
+            '[EditIndentFirstLine]', '[EditIndent]', '[EditHorizScrollbar]',
+            '[EditHeaderFooter]', '[EditGotoField]', '[EditFindNext]',
+            '[EditFindInPreview]', '[EditFind]', '[EditEncryptionKeys]',
+            '[EditDown]', '[EditDocument]', '[EditDetach]', '[EditDeselectAll]',
+            '[EditCut]', '[EditCopy]', '[EditClear]', '[EditButton]',
+            '[EditBottom]', '[DiscoverFolders]', '[Directories]',
+            '[DialingRules]', '[DesignViewSelectFormula]', '[DesignViews]',
+            '[DesignViewNewColumn]', '[DesignViewFormFormula]',
+            '[DesignViewEditActions]', '[DesignViewColumnDef]',
+            '[DesignViewAttributes]', '[DesignViewAppendColumn]',
+            '[DesignSynopsis]', '[DesignSharedFields]', '[DesignReplace]',
+            '[DesignRefresh]', '[DesignMacros]', '[DesignIcon]',
+            '[DesignHelpUsingDocument]', '[DesignHelpAboutDocument]',
+            '[DesignFormWindowTitle]', '[DesignFormUseField]',
+            '[DesignFormShareField]', '[DesignForms]', '[DesignFormNewField]',
+            '[DesignFormFieldDef]', '[DesignFormAttributes]',
+            '[DesignDocumentInfo]', '[DebugLotusScript]',
+            '[DatabaseReplSettings]', '[DatabaseDelete]', '[CreateView]',
+            '[CreateTextbox]', '[CreateSubForm]', '[CreateSection]',
+            '[CreateRectangularHotspot]', '[CreateRectangle]',
+            '[CreatePolyline]', '[CreatePolygon]', '[CreateNavigator]',
+            '[CreateLayoutRegion]', '[CreateForm]', '[CreateFolder]',
+            '[CreateEllipse]', '[CreateControlledAccessSection]',
+            '[CreateAgent]', '[CreateAction]', '[CopySelectedAsTable]',
+            '[ComposeWithReference]', '[Compose]', '[CloseWindow]', '[Clear]',
+            '[ChooseFolders]', '[CalendarGoTo]', '[CalendarFormat]',
+            '[AttachmentView]', '[AttachmentProperties]', '[AttachmentLaunch]',
+            '[AttachmentDetachAll]', '[AgentTestRun]', '[AgentSetServerName]',
+            '[AgentRun]', '[AgentLog]', '[AgentEnableDisable]', '[AgentEdit]',
+            '[AdminTraceConnection]', '[AdminStatisticsConfig]',
+            '[AdminSendMailTrace]', '[AdminRemoteConsole]',
+            '[AdminRegisterUser]', '[AdminRegisterServer]',
+            '[AdminRegisterFromFile]', '[AdminOutgoingMail]',
+            '[AdminOpenUsersView]', '[AdminOpenStatistics]',
+            '[AdminOpenServersView]', '[AdminOpenServerLog]',
+            '[AdminOpenGroupsView]', '[AdminOpenCertLog]', '[AdminOpenCatalog]',
+            '[AdminOpenAddressBook]', '[AdminNewOrgUnit]',
+            '[AdminNewOrganization]', '[Administration]',
+            '[AdminIDFileSetPassword]', '[AdminIDFileExamine]',
+            '[AdminIDFileClearPassword]', '[AdminDatabaseQuotas]',
+            '[AdminDatabaseAnalysis]', '[AdminCrossCertifyKey]',
+            '[AdminCrossCertifyIDFile]', '[AdminCreateGroup]', '[AdminCertify]',
+            '[AddToIMContactList]', '[AddDatabaseRepID]', '[AddDatabase]',
+            '[AddBookmark]'
+            ),
+        2 => array(
+            'SELECT', 'FIELD', 'ENVIRONMENT', 'DEFAULT', '@Zone ', '@Yesterday',
+            '@Yes', '@Year', '@Word', '@Wide', '@While', '@Weekday',
+            '@WebDbName', '@ViewTitle', '@ViewShowThisUnread', '@Version',
+            '@VerifyPassword', '@ValidateInternetAddress', '@V4UserAccess',
+            '@V3UserName', '@V2If', '@UserRoles', '@UserPrivileges',
+            '@UserNamesList', '@UserNameLanguage', '@UserName', '@UserAccess',
+            '@UrlQueryString', '@URLOpen', '@URLHistory', '@URLGetHeader',
+            '@URLEncode', '@URLDecode', '@UpperCase', '@UpdateFormulaContext',
+            '@Unique', '@UndeleteDocument', '@Unavailable', '@True', '@Trim',
+            '@Transform', '@ToTime', '@ToNumber', '@Tomorrow', '@Today',
+            '@TimeZoneToText', '@TimeToTextInZone', '@TimeMerge', '@Time',
+            '@ThisValue', '@ThisName', '@TextToTime', '@TextToNumber', '@Text',
+            '@TemplateVersion', '@Tan', '@Sum', '@Success', '@Subset',
+            '@StatusBar', '@Sqrt', '@Soundex', '@Sort', '@Sin', '@Sign',
+            '@SetViewInfo', '@SetTargetFrame', '@SetProfileField',
+            '@SetHTTPHeader', '@SetField', '@SetEnvironment', '@SetDocField',
+            '@Set', '@ServerName', '@ServerAccess', '@Select', '@Second',
+            '@Round', '@RightBack', '@Right', '@Return', '@Responses',
+            '@ReplicaID', '@ReplaceSubstring', '@Replace', '@Repeat',
+            '@RegQueryValue', '@RefreshECL', '@Random', '@ProperCase',
+            '@Prompt', '@Power', '@PostedCommand', '@PolicyIsFieldLocked',
+            '@Platform', '@PickList', '@Pi', '@PasswordQuality', '@Password',
+            '@OrgDir', '@OptimizeMailAddress', '@OpenInNewWindow', '@Now',
+            '@Nothing', '@NoteID', '@No', '@NewLine', '@Narrow', '@NameLookup',
+            '@Name', '@Month', '@Modulo', '@Modified', '@Minute', '@Min',
+            '@MiddleBack', '@Middle', '@Member', '@Max', '@Matches',
+            '@MailSignPreference', '@MailSend', '@MailSavePreference',
+            '@MailEncryptSentPreference', '@MailEncryptSavedPreference',
+            '@MailDbName', '@LowerCase', '@Log', '@Locale', '@Ln', '@Like',
+            '@Length', '@LeftBack', '@Left', '@LDAPServer', '@LaunchApp',
+            '@LanguagePreference', '@Keywords', '@IsVirtualizedDirectory',
+            '@IsValid', '@IsUsingJavaElement', '@IsUnavailable', '@IsTime',
+            '@IsText', '@IsResponseDoc', '@IsNumber', '@IsNull', '@IsNotMember',
+            '@IsNewDoc', '@IsModalHelp', '@IsMember', '@IsExpandable',
+            '@IsError', '@IsEmbeddedInsideWCT', '@IsDocTruncated',
+            '@IsDocBeingSaved', '@IsDocBeingRecalculated', '@IsDocBeingMailed',
+            '@IsDocBeingLoaded', '@IsDocBeingEdited', '@IsDB2', '@IsCategory',
+            '@IsAvailable', '@IsAppInstalled', '@IsAgentEnabled', '@Integer',
+            '@InheritedDocumentUniqueID', '@Implode', '@IfError', '@If',
+            '@Hour', '@HashPassword', '@HardDeleteDocument', '@GetViewInfo',
+            '@GetProfileField', '@GetPortsList', '@GetIMContactListGroupNames',
+            '@GetHTTPHeader', '@GetFocusTable', '@GetField', '@GetDocField',
+            '@GetCurrentTimeZone', '@GetAddressBooks', '@FormLanguage', '@For',
+            '@FontList', '@FloatEq', '@FileDir', '@False', '@Failure',
+            '@Explode', '@Exp', '@Eval', '@Error', '@Environment', '@Ends',
+            '@EnableAlarms', '@Elements', '@EditUserECL', '@EditECL',
+            '@DoWhile', '@Domain', '@DocumentUniqueID', '@DocSiblings',
+            '@DocParentNumber', '@DocOmmittedLength', '@DocNumber', '@DocMark',
+            '@DocLock', '@DocLevel', '@DocLength', '@DocFields',
+            '@DocDescendants', '@DocChildren', '@Do', '@DialogBox',
+            '@DeleteField', '@DeleteDocument', '@DDETerminate', '@DDEPoke',
+            '@DDEInitiate', '@DDEExecute', '@DbTitle', '@DbName', '@DbManager',
+            '@DbLookup', '@DbExists', '@DbCommand', '@DbColumn', '@DB2Schema',
+            '@Day', '@Date', '@Created', '@Count', '@Cos', '@Contains',
+            '@ConfigFile', '@Compare', '@Command', '@ClientType',
+            '@CheckFormulaSyntax', '@CheckAlarms', '@Char', '@Certificate',
+            '@BusinessDays', '@BrowserInfo', '@Begins', '@Author',
+            '@Attachments', '@AttachmentNames', '@AttachmentModifiedTimes',
+            '@AttachmentLengths', '@ATan2', '@ATan', '@ASin', '@Ascii',
+            '@AllDescendants', '@AllChildren', '@All', '@AdminECLIsLocked',
+            '@Adjust', '@AddToFolder', '@ACos', '@Accessed', '@AbstractSimple',
+            '@Abstract', '@Abs'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800000;',
+            2 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2
+    );
diff --git a/vendor/easybook/geshi/geshi/lotusscript.php b/vendor/easybook/geshi/geshi/lotusscript.php
new file mode 100755
index 000000000..5d8b6d596
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lotusscript.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * lotusscript.php
+ * ------------------------
+ * Author: Richard Civil (info@richardcivil.net)
+ * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/04/12
+ *
+ * LotusScript language file for GeSHi.
+ *
+ * LotusScript source: IBM Lotus Notes/Domino 8 Designer Help
+ *
+ * CHANGES
+ * -------
+ * 2008/04/12 (1.0.7.22)
+ *     -  First Release
+ *
+ * TODO (2008/04/12)
+ * -----------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LotusScript',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array('%REM' => '%END REM'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"' , "|"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array (
+            'Yield', 'Year', 'Xor', 'Write', 'With', 'Width', 'While', 'Wend',
+            'Weekday', 'VarType', 'Variant', 'Val', 'UString', 'UString$',
+            'UseLSX', 'Use', 'Until', 'Unlock', 'Unicode', 'Uni', 'UChr',
+            'UChr$', 'UCase', 'UCase$', 'UBound', 'TypeName', 'Type', 'TRUE',
+            'Trim', 'Trim$', 'Today', 'To', 'TimeValue', 'TimeSerial', 'Timer',
+            'TimeNumber', 'Time', 'Time$', 'Then', 'Text', 'Tan', 'Tab', 'Sub',
+            'StrToken', 'StrToken$', 'StrRightBack', 'StrRightBack$',
+            'StrRight', 'StrRight$', 'StrLeftBack', 'StrLeftBack$', 'StrLeft',
+            'StrLeft$', 'String', 'String$', 'StrConv', 'StrCompare', 'StrComp',
+            'Str', 'Str$', 'Stop', 'Step', 'Static', 'Sqr', 'Split', 'Spc',
+            'Space', 'Space$', 'Sleep', 'Single', 'Sin', 'Shell', 'Shared',
+            'Sgn', 'SetFileAttr', 'SetAttr', 'Set', 'SendKeys', 'Select',
+            'Seek', 'Second', 'RTrim', 'RTrim$', 'RSet', 'Round', 'Rnd',
+            'RmDir', 'RightC', 'RightC$', 'RightBP', 'RightBP$', 'RightB',
+            'RightB$', 'Right', 'Right$', 'Return', 'Resume', 'Reset',
+            'Replace', 'Remove', 'Rem', 'ReDim', 'Read', 'Randomize',
+            'Random', 'Put', 'Public', 'Property', 'Private', 'Print',
+            'Preserve', 'Pitch', 'PI', 'Output', 'Or', 'Option', 'Open', 'On',
+            'Oct', 'Oct$', 'NULL', 'Now', 'NOTHING', 'Not', 'NoPitch', 'NoCase',
+            'Next', 'New', 'Name', 'MsgBox', 'Month', 'Mod', 'MkDir', 'Minute',
+            'MidC', 'MidC$', 'MidBP', 'MidBP$', 'MidB', 'MidB$', 'Mid', 'Mid$',
+            'MessageBox', 'Me', 'LTrim', 'LTrim$', 'LSServer', 'LSI_Info',
+            'LSet', 'Loop', 'Long', 'Log', 'LOF', 'Lock', 'LOC', 'LMBCS',
+            'ListTag', 'List', 'Line', 'Like', 'Lib', 'Let', 'LenC', 'LenBP',
+            'LenB', 'Len', 'LeftC', 'LeftC$', 'LeftBP', 'LeftBP$', 'LeftB',
+            'LeftB$', 'Left', 'Left$', 'LCase', 'LCase$', 'LBound', 'Kill',
+            'Join', 'IsUnknown', 'IsScalar', 'IsObject', 'IsNumeric', 'IsNull',
+            'IsList', 'IsEmpty', 'IsElement', 'IsDate', 'IsArray', 'IsA', 'Is',
+            'Integer', 'Int', 'InStrC', 'InStrBP', 'InStrB', 'InStr', 'InputBP',
+            'InputBP$', 'InputBox', 'InputBox$', 'InputB', 'InputB$', 'Input',
+            'Input$', 'In', 'IMSetMode', 'Implode', 'Implode$', 'Imp',
+            'IMEStatus', 'If', 'Hour', 'Hex', 'Hex$', 'Goto', 'GoSub',
+            'GetThreadInfo', 'GetFileAttr', 'GetAttr', 'Get', 'Function',
+            'FullTrim', 'From', 'FreeFile', 'Fraction', 'Format', 'Format$',
+            'ForAll', 'For', 'Fix', 'FileLen', 'FileDateTime', 'FileCopy',
+            'FileAttr', 'FALSE', 'Explicit', 'Exp', 'Exit', 'Execute', 'Event',
+            'Evaluate', 'Error', 'Error$', 'Err', 'Erl', 'Erase', 'Eqv', 'EOF',
+            'Environ', 'Environ$', 'End', 'ElseIf', 'Else', 'Double', 'DoEvents',
+            'Do', 'Dir', 'Dir$', 'Dim', 'DestroyLock', 'Delete', 'DefVar',
+            'DefStr', 'DefSng', 'DefLng', 'DefInt', 'DefDbl', 'DefCur',
+            'DefByte', 'DefBool', 'Declare', 'Day', 'DateValue', 'DateSerial',
+            'DateNumber', 'Date', 'Date$', 'DataType', 'CVDate', 'CVar',
+            'Currency', 'CurDrive', 'CurDrive$', 'CurDir', 'CurDir$', 'CStr',
+            'CSng', 'CreateLock', 'Cos', 'Const', 'Compare', 'Command',
+            'Command$', 'CodeUnlock', 'CodeLockCheck', 'CodeLock', 'Close',
+            'CLng', 'Class', 'CInt', 'Chr', 'Chr$', 'ChDrive', 'ChDir', 'CDbl',
+            'CDat', 'CCur', 'CByte', 'CBool', 'Case', 'Call', 'ByVal', 'Byte',
+            'Boolean', 'Bind', 'Binary', 'Bin', 'Bin$', 'Beep', 'Base', 'Atn2',
+            'Atn', 'ASin', 'Asc', 'As', 'ArrayUnique', 'ArrayReplace',
+            'ArrayGetIndex', 'ArrayAppend', 'Append', 'AppActivate', 'Any',
+            'And', 'Alias', 'ActivateApp', 'ACos', 'Access', 'Abs', '%Include',
+            '%If', '%END', '%ElseIf', '%Else'
+            ),
+        2 => array (
+            'NotesXSLTransformer', 'NotesXMLProcessor', 'NotesViewNavigator',
+            'NotesViewEntryCollection', 'NotesViewEntry', 'NotesViewColumn',
+            'NotesView', 'NotesUIWorkspace', 'NotesUIView', 'NotesUIScheduler',
+            'NotesUIDocument', 'NotesUIDatabase', 'NotesTimer', 'NotesStream',
+            'NotesSession', 'NotesSAXParser', 'NotesSAXException',
+            'NotesSAXAttributeList', 'NotesRichTextTable', 'NotesRichTextTab',
+            'NotesRichTextStyle', 'NotesRichTextSection', 'NotesRichTextRange',
+            'NotesRichTextParagraphStyle', 'NotesRichTextNavigator',
+            'NotesRichTextItem', 'NotesRichTextDocLink',
+            'NotesReplicationEntry', 'NotesReplication', 'NotesRegistration',
+            'NotesOutlineEntry', 'NotesOutline', 'NotesNoteCollection',
+            'NotesNewsLetter', 'NotesName', 'NotesMIMEHeader',
+            'NotesMIMEEntity', 'NotesLog', 'NotesItem', 'NotesInternational',
+            'NotesForm', 'NotesEmbeddedObject', 'NotesDXLImporter',
+            'NotesDXLExporter', 'NotesDOMXMLDeclNode', 'NotesDOMTextNode',
+            'NotesDOMProcessingInstructionNode', 'NotesDOMParser',
+            'NotesDOMNotationNode', 'NotesDOMNodeList', 'NotesDOMNode',
+            'NotesDOMNamedNodeMap', 'NotesDOMEntityReferenceNode',
+            'NotesDOMEntityNode', 'NotesDOMElementNode',
+            'NotesDOMDocumentTypeNode', 'NotesDOMDocumentNode',
+            'NotesDOMDocumentFragmentNode', 'NotesDOMCommentNode',
+            'NotesDOMCharacterDataNote', 'NotesDOMCDATASectionNode',
+            'NotesDOMAttributeNode', 'NotesDocumentCollection', 'NotesDocument',
+            'NotesDbDirectory', 'NotesDateTime', 'NotesDateRange',
+            'NotesDatabase', 'NotesColorObject', 'NotesAgent',
+            'NotesAdministrationProcess', 'NotesACLEntry', 'NotesACL',
+            'Navigator', 'Field', 'Button'
+            )
+        ) ,
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000EE;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #000000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2
+);
diff --git a/vendor/easybook/geshi/geshi/lscript.php b/vendor/easybook/geshi/geshi/lscript.php
new file mode 100755
index 000000000..298af618c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lscript.php
@@ -0,0 +1,387 @@
+<?php
+/*************************************************************************************
+ * lscript.php
+ * ---------
+ * Author: Arendedwinter (admin@arendedwinter.com)
+ * Copyright: (c) 2008 Beau McGuigan (http://www.arendedwinter.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 15/11/2008
+ *
+ * Lightwave Script language file for GeSHi.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+    //Yes, I'm aware these are out of order,
+    //I had to rearrange and couldn't be bothered changing the numbers...
+        7 => array(
+            '@data', '@define', '@else', '@end', '@fpdepth', '@if', '@include',
+            '@insert', '@library', '@localipc', '@name', '@save', '@script',
+            '@sequence', '@version', '@warnings'
+            ),
+        1 => array(
+            'break', 'case', 'continue', 'else', 'end', 'false', 'for',
+            'foreach', 'if', 'return', 'switch', 'true', 'while',
+            ),
+        3 => array(
+            'active', 'alertlevel', 'alpha', 'alphaprefix', 'animfilename', 'autokeycreate',
+            'backdroptype', 'blue', 'boxthreshold', 'button',
+            'channelsvisible', 'childrenvisible', 'compfg', 'compbg', 'compfgalpha',
+            'coneangles', 'cosine', 'count', 'ctl', 'curFilename', 'curFrame',
+            'currenttime', 'curTime', 'curType',
+            'depth', 'diffshade', 'diffuse', 'dimensions', 'displayopts', 'dynamicupdate',
+            'end', 'eta',
+            'filename', 'flags', 'fogtype', 'fps', 'frame', 'frameend', 'frameheight',
+            'framestart', 'framestep', 'framewidth',
+            'generalopts', 'genus', 'geometry', 'gNorm', 'goal', 'green',
+            'h', 'hasAlpha', 'height',
+            'id', 'innerlimit', 'isColor',
+            'keyCount', 'keys',
+            'limiteregion', 'locked', 'luminous',
+            'maxsamplesperpixel', 'minsamplesperpixel', 'mirror', 'motionx', 'motiony',
+            'name', 'newFilename', 'newFrame', 'newTime', 'newType', 'null', 'numthreads',
+            'objID', 'oPos', 'outerlimit', 'oXfrm',
+            'parent', 'pixel', 'pixelaspect', 'point', 'points', 'pointcount', 'polNum',
+            'polycount', 'polygon', 'polygons', 'postBehavior', 'preBehavior', 'previewend',
+            'previewstart', 'previewstep',
+            'range', 'rawblue', 'rawgreen', 'rawred', 'rayLength', 'raySource', 'red',
+            'reflectblue', 'reflectgreen', 'reflectred', 'recursiondepth', 'renderend',
+            'renderopts', 'renderstart', 'renderstep', 'rendertype', 'restlength',
+            'rgbprefix', 'roughness',
+            'selected', 'setColor', 'setPattern', 'shading', 'shadow', 'shadows',
+            'shadowtype', 'size', 'source', 'special', 'specshade', 'specular',
+            'spotsize', 'start', 'sx', 'sy', 'sz',
+            'target', 'totallayers', 'totalpoints', 'totalpolygons', 'trans', 'transparency',
+            'type',
+            'value', 'view', 'visible', 'visibility',
+            'w', 'width', 'wNorm', 'wPos', 'wXfrm',
+            'x', 'xoffset',
+            'y', 'yoffset',
+            'z'
+            ),
+        4 => array(
+            'addLayer', 'addParticle', 'alphaspot', 'ambient', 'asAsc', 'asBin',
+            'asInt', 'asNum', 'asStr', 'asVec', 'attach', 'axislocks',
+            'backdropColor', 'backdropRay', 'backdropSqueeze', 'bone', 'blurLength',
+            'close', 'color', 'contains', 'copy', 'createKey',
+            'deleteKey', 'detach', 'drawCircle', 'drawLine', 'drawPoint', 'drawText',
+            'drawTriangle',
+            'edit', 'eof', 'event',
+            'firstChannel', 'firstLayer', 'firstSelect', 'focalLength', 'fogColor',
+            'fogMaxAmount', 'fogMaxDist', 'fogMinAmount', 'fogMinDist',
+            'fovAngles', 'fStop', 'firstChild', 'focalDistance',
+            'get', 'getChannelGroup', 'getEnvelope', 'getForward', 'getKeyBias',
+            'getKeyContinuity', 'getKeyCurve', 'getKeyHermite', 'getKeyTension',
+            'getKeyTime', 'getKeyValue', 'getParticle', 'getPivot', 'getPosition',
+            'getRight', 'getRotation', 'getSelect', 'getScaling', 'getTag', 'getTexture',
+            'getUp', 'getValue', 'getWorldPosition', 'getWorldForward', 'getWorldRight',
+            'getWorldRotation', 'getWorldUp', 'globalBlur', 'globalMask', 'globalResolution',
+            'hasCCEnd', 'hasCCStart',
+            'illuminate', 'indexOf', 'isAscii', 'isAlnum', 'isAlpha', 'isBone',
+            'isCamera', 'isChannel', 'isChannelGroup', 'isCntrl', 'isCurve', 'isDigit',
+            'isEnvelope', 'isImage', 'isInt', 'isLight', 'isLower', 'isMapped', 'isMesh',
+            'isNil', 'isNum', 'IsOpen', 'isOriginal', 'isPrint', 'isPunct', 'isScene',
+            'isSpace', 'isStr', 'isUpper', 'isValid', 'isVMap', 'isVec', 'isXDigit',
+            'keyExists',
+            'layer', 'layerName', 'layerVisible', 'limits', 'line', 'linecount', 'load', 'luma',
+            'next', 'nextLayer', 'nextSelect', 'nextChannel', 'nextChild', 'nl',
+            'offset', 'open',
+            'pack', 'param', 'parse', 'paste', 'persist', 'polygonCount', 'position',
+            'rayCast', 'rayTrace', 'read', 'readByte', 'readInt', 'readNumber',
+            'readDouble', 'readShort', 'readString', 'readVector', 'reduce',
+            'remParticle', 'renderCamera', 'reopen', 'replace', 'reset', 'restParam',
+            'rewind', 'rgb', 'rgbambient', 'rgbcolor', 'rgbspot',
+            'save', 'schemaPosition', 'select', 'set', 'setChannelGroup', 'setKeyBias',
+            'setKeyContinuity', 'setKeyCurve',
+            'setKeyHermite', 'setKeyTension', 'setKeyValue', 'setParticle', 'setPoints',
+            'setTag', 'setValue', 'server', 'serverFlags', 'sortA', 'sortD', 'surface',
+            'trunc',
+            'write', 'writeln', 'writeByte', 'writeData', 'writeNumber', 'writeDouble',
+            'writeShort', 'writeString', 'writeVector',
+            'vertex', 'vertexCount',
+            'zoomFactor'
+            ),
+        2 => array(
+            'abs', 'acos', 'angle', 'append', 'ascii', 'asin', 'atan',
+            'binary',
+            'ceil', 'center', 'chdir', 'clearimage', 'cloned', 'comringattach',
+            'comringdecode', 'comringdetach', 'comringencode', 'comringmsg', 'cos',
+            'cosh', 'cot', 'cross2d', 'cross3d', 'csc', 'ctlstring', 'ctlinteger',
+            'ctlnumber', 'ctlvector', 'ctldistance', 'ctlchoice', 'ctltext',
+            'ctlcolor', 'ctlsurface', 'ctlfont', 'ctlpopup', 'ctledit', 'ctlpercent',
+            'ctlangle', 'ctlrgb', 'ctlhsv', 'ctlcheckbox', 'ctlstate', 'ctlfilename',
+            'ctlbutton', 'ctllistbox', 'ctlslider', 'ctlminislider', 'ctlsep', 'ctlimage',
+            'ctltab', 'ctlallitems', 'ctlmeshitems', 'ctlcameraitems', 'ctllightitems',
+            'ctlboneitems', 'ctlimageitems', 'ctlchannel', 'ctlviewport', 'Control_Management',
+            'ctlpage', 'ctlgroup', 'ctlposition', 'ctlactive', 'ctlvisible', 'ctlalign',
+            'ctlrefresh', 'ctlmenu', 'ctlinfo',
+            'date', 'debug', 'deg', 'dot2d', 'dot3d', 'drawborder', 'drawbox', 'drawcircle',
+            'drawelipse', 'drawerase', 'drawfillcircle', 'drawfillelipse', 'drawline',
+            'drawpixel', 'drawtext', 'drawtextwidth', 'drawtextheight', 'dump',
+            'error', 'exp', 'expose', 'extent',
+            'fac', 'filecrc', 'filedelete', 'fileexists', 'filefind', 'filerename',
+            'filestat', 'floor', 'format', 'frac', 'fullpath',
+            'gamma', 'getdir', 'getenv', 'getfile', 'getfirstitem', 'getsep', 'getvalue',
+            'globalrecall', 'globalstore',
+            'hash', 'hex', 'hostBuild', 'hostVersion', 'hypot',
+            'info', 'integer',
+            'library', 'licenseId', 'lscriptVersion', 'load', 'loadimage', 'log', 'log10',
+            'matchdirs', 'matchfiles', 'max', 'min', 'mkdir', 'mod', 'monend', 'moninit', 'monstep',
+            'nil', 'normalize', 'number',
+            'octal', 'overlayglyph',
+            'parse', 'platform', 'pow',
+            'rad', 'random', 'randu', 'range', 'read', 'readdouble', 'readInt', 'readNumber',
+            'readShort', 'recall', 'regexp', 'reqabort', 'reqbegin', 'reqend', 'reqisopen',
+            'reqkeyboard', 'reqopen', 'reqposition', 'reqpost', 'reqredraw',
+            'reqsize', 'reqresize', 'requpdate', 'rmdir', 'round', 'runningUnder',
+            'save', 'sec', 'select', 'selector', 'setdesc', 'setvalue', 'sin', 'sinh', 'size',
+            'sizeof', 'sleep', 'spawn', 'split', 'sqrt', 'step', 'store', 'string', 'strleft',
+            'strlower', 'strright', 'strsub', 'strupper',
+            'tan', 'tanh', 'targetobject', 'terminate', 'text', 'time',
+            'wait', 'warn', 'when', 'write', 'writeDouble', 'writeInt', 'writeNumber', 'writeShort',
+            'var', 'vector', 'visitnodes', 'vmag',
+            ),
+        5 => array(
+            'addcurve', 'addpoint', 'addpolygon', 'addquad', 'addtriangle', 'alignpols',
+            'autoflex', 'axisdrill',
+            'bend', 'bevel', 'boolean', 'boundingbox',
+            'changepart', 'changesurface', 'close', 'closeall', 'cmdseq', 'copy', 'copysurface',
+            'createsurface', 'cut',
+            'deformregion', 'delete',
+            'editbegin', 'editend', 'exit', 'extrude',
+            'fixedflex', 'flip', 'fontclear', 'fontcount', 'fontindex', 'fontload',
+            'fontname', 'fracsubdivide', 'freezecurves',
+            'getdefaultsurface',
+            'jitter',
+            'lathe', 'layerName', 'layerVisible', 'lyrbg', 'lyrdata', 'lyrempty', 'lyremptybg',
+            'lyremptyfg', 'lyrfg', 'lyrsetbg', 'lyrsetfg', 'lyrswap',
+            'magnet', 'make4patch', 'makeball', 'makebox', 'makecone', 'makedisc',
+            'maketesball', 'maketext', 'mergepoints', 'mergepols', 'meshedit', 'mirror',
+            'morphpols', 'move',
+            'new', 'nextsurface',
+            'paste', 'pathclone', 'pathextrude', 'pixel', 'pointcount', 'pointinfo',
+            'pointmove', 'pole', 'polycount', 'polyinfo', 'polynormal', 'polypointcount',
+            'polypoints', 'polysurface',
+            'quantize',
+            'railclone', 'railextrude', 'redo', 'removepols', 'rempoint', 'rempoly',
+            'renamesurface', 'revert', 'rotate',
+            'scale', 'selhide', 'selinvert', 'selmode', 'selpoint', 'selpolygon', 'selunhide',
+            'selectvmap', 'setlayername', 'setobject', 'setpivot', 'setsurface', 'shapebevel',
+            'shear', 'skinpols', 'smooth', 'smoothcurves', 'smoothscale', 'smoothshift',
+            'soliddrill', 'splitpols', 'subdivide', 'swaphidden',
+            'taper', 'triple', 'toggleCCend', 'toggleCCstart', 'togglepatches', 'twist',
+            'undo', 'undogroupend', 'undogroupbegin', 'unifypols', 'unweld',
+            'vortex',
+            'weldaverage', 'weldpoints'
+            ),
+        6 => array(
+            'About', 'AboutOpenGL', 'AdaptiveSampling', 'AdaptiveThreshold',
+            'AddAreaLight', 'AddBone', 'AddButton', 'AddCamera', 'AddChildBone',
+            'AddDistantLight', 'AddEnvelope', 'AddLinearLight', 'AddNull',
+            'AddPartigon', 'AddPlugins', 'AddPointLight', 'AddPosition',
+            'AddRotation', 'AddScale', 'AddSpotlight', 'AddToSelection',
+            'AdjustRegionTool', 'AffectCaustics', 'AffectDiffuse', 'AffectOpenGL',
+            'AffectSpecular', 'AlertLevel', 'AmbientColor', 'AmbientIntensity',
+            'Antialiasing', 'ApertureHeight', 'ApplyServer', 'AreaLight',
+            'AutoConfirm', 'AutoFrameAdvance', 'AutoKey',
+            'BackdropColor', 'BackView', 'BController', 'BLimits', 'BLurLength', 'BoneActive',
+            'BoneFalloffType', 'BoneJointComp', 'BoneJointCompAmounts', 'BoneJointCompParent',
+            'BoneLimitedRange', 'BoneMaxRange', 'BoneMinRange', 'BoneMuscleFlex',
+            'BoneMuscleFlexAmounts', 'BoneMuscleFlexParent', 'BoneNormalization',
+            'BoneRestLength', 'BoneRestPosition', 'BoneRestRotation', 'BoneSource',
+            'BoneStrength', 'BoneStrengthMultiply', 'BoneWeightMapName', 'BoneWeightMapOnly',
+            'BoneWeightShade', 'BoneXRay', 'BottomView', 'BoundingBoxThreshold',
+            'BStiffness',
+            'CacheCaustics', 'CacheRadiosity', 'CacheShadowMap',
+            'CameraMask', 'CameraView', 'CameraZoomTool', 'CastShadow', 'CausticIntensity',
+            'CenterItem', 'CenterMouse', 'ChangeTool', 'ClearAllBones', 'ClearAllCameras',
+            'ClearAllLights', 'ClearAllObjects', 'ClearAudio', 'ClearScene', 'ClearSelected',
+            'Clone', 'CommandHistory', 'CommandInput', 'Compositing', 'ConeAngleTool',
+            'ContentDirectory', 'CreateKey',
+            'DecreaseGrid', 'DeleteKey', 'DepthBufferAA', 'DepthOfField', 'DisplayOptions',
+            'DistantLight', 'DrawAntialiasing', 'DrawBones', 'DrawChildBones', 'DynamicUpdate',
+            'EditBones', 'EditCameras', 'EditKeys', 'EditLights',
+            'EditMenus', 'EditObjects', 'EditPlugins', 'EditServer', 'EnableCaustics',
+            'EnableDeformations', 'EnableIK', 'EnableLensFlares', 'EnableRadiosity', 'EnableServer',
+            'EnableShadowMaps', 'EnableVIPER', 'EnableVolumetricLights', 'EnableXH',
+            'EnableYP', 'EnableZB', 'EnahancedAA', 'ExcludeLight', 'ExcludeObject',
+            'EyeSeparation',
+            'FasterBones', 'FirstFrame', 'FirstItem', 'FitAll', 'FitSelected',
+            'FlareIntensity', 'FlareOptions', 'FocalDistance', 'FogColor', 'FogMaxAmount',
+            'FogMaxDistance', 'FogMinAmount', 'FogMinDistance', 'FogType', 'FractionalFrames',
+            'FrameSize', 'FramesPerSecond', 'FrameStep', 'FreePreview', 'FrontView', 'FullTimeIK',
+            'GeneralOptions', 'Generics', 'GlobalApertureHeight', 'GlobalBlurLength',
+            'GlobalFrameSize', 'GlobalIllumination', 'GlobalMaskPosition', 'GlobalMotionBlur',
+            'GlobalParticleBlur', 'GlobalPixelAspect', 'GlobalResolutionMulitplier', 'GoalItem',
+            'GoalStrength', 'GoToFrame', 'GradientBackdrop', 'GraphEditor', 'GridSize', 'GroundColor',
+            'HController', 'HideToolbar', 'HideWindows', 'HLimits', 'HStiffness',
+            'ImageEditor', 'ImageProcessing', 'IncludeLight', 'IncludeObject', 'IncreaseGrid',
+            'IndirectBounces', 'Item_SetWindowPos', 'ItemActive', 'ItemColor', 'ItemLock',
+            'ItemProperties', 'ItemVisibilty',
+            'KeepGoalWithinReach',
+            'LastFrame', 'LastItem', 'LastPluginInterface', 'Layout_SetWindowPos',
+            'Layout_SetWindowSize', 'LeftView', 'LensFlare', 'LensFStop', 'LightColor',
+            'LightConeAngle', 'LightEdgeAngle', 'LightFalloffType', 'LightIntensity',
+            'LightIntensityTool', 'LightQuality', 'LightRange', 'LightView', 'LimitB',
+            'LimitDynamicRange', 'LimitedRegion', 'LimitH', 'LimitP', 'LinearLight',
+            'LoadAudio', 'LoadFromScene', 'LoadMotion', 'LoadObject', 'LoadObjectLayer',
+            'LoadPreview', 'LoadScene', 'LocalCoordinateSystem',
+            'MakePreview', 'MaskColor', 'MaskPosition', 'MasterPlugins', 'MatchGoalOrientation',
+            'MatteColor', 'MatteObject', 'MetaballResolution', 'Model', 'MorphAmount',
+            'MorphAmountTool', 'MorphMTSE', 'MorphSurfaces', 'MorphTarget', 'MotionBlur',
+            'MotionBlurDOFPreview', 'MotionOptions', 'MovePathTool', 'MovePivotTool', 'MoveTool',
+            'NadirColor', 'NetRender', 'NextFrame', 'NextItem', 'NextKey', 'NextSibling',
+            'NextViewLayout', 'NoiseReduction', 'Numeric',
+            'ObjectDissolve',
+            'ParentCoordinateSystem', 'ParentInPlace', 'ParentItem',
+            'ParticleBlur', 'PathAlignLookAhead', 'PathAlignMaxLookSteps', 'PathAlignReliableDist',
+            'Pause', 'PController', 'PerspectiveView',
+            'PivotPosition', 'PivotRotation', 'PixelAspect', 'PlayAudio', 'PlayBackward',
+            'PlayForward', 'PlayPreview', 'PLimits', 'PointLight', 'PolygonEdgeColor',
+            'PolygonEdgeFlags', 'PolygonEdgeThickness', 'PolygonEdgeZScale', 'PolygonSize',
+            'Position', 'Presets', 'PreviewFirstFrame', 'PreviewFrameStep', 'PreviewLastFrame',
+            'PreviewOptions', 'PreviousFrame', 'PreviousItem', 'PreviousKey', 'PreviousSibling',
+            'PreviousViewLayout', 'PStiffness',
+            'Quit',
+            'RadiosityIntensity', 'RadiosityTolerance', 'RadiosityType', 'RayRecursionLimit',
+            'RayTraceReflection', 'RayTraceShadows',
+            'RayTraceTransparency', 'ReceiveShadow', 'RecentContentDirs', 'RecentScenes',
+            'ReconstructionFilter', 'RecordMaxAngles', 'RecordMinAngles', 'RecordPivotRotation',
+            'RecordRestPosition', 'Redraw', 'RedrawNow', 'Refresh', 'RefreshNow', 'RegionPosition',
+            'RemoveEnvelope', 'RemoveFromSelection', 'RemoveServer', 'Rename', 'RenderFrame',
+            'RenderOptions', 'RenderScene', 'RenderSelected', 'RenderThreads',
+            'ReplaceObjectLayer', 'ReplaceWithNull', 'ReplaceWithObject', 'Reset',
+            'ResolutionMultiplier', 'RestLengthTool', 'RightView', 'RotatePivotTool',
+            'RotateTool', 'Rotation',
+            'SaveAllObjects', 'SaveCommandList', 'SaveCommandMessages',
+            'SaveEndomorph', 'SaveLight', 'SaveLWSC1', 'SaveMotion', 'SaveObject', 'SaveObjectCopy',
+            'SavePreview', 'SaveScene', 'SaveSceneAs', 'SaveSceneCopy', 'SaveTransformed',
+            'SaveViewLayout', 'Scale', 'Scene_SetWindowPos', 'Scene_SetWindowSize',
+            'SceneEditor', 'SchematicPosition', 'SchematicView', 'SelectAllBones',
+            'SelectAllCameras', 'SelectAllLights', 'SelectAllObjects', 'SelectByName',
+            'SelectChild', 'SelectItem', 'SelectParent', 'SelfShadow', 'ShadowColor',
+            'ShadowExclusion', 'ShadowMapAngle', 'ShadowMapFitCone', 'ShadowMapFuzziness',
+            'ShadowMapSize', 'ShadowType', 'ShowCages', 'ShowFieldChart', 'ShowHandles',
+            'ShowIKChains', 'ShowMotionPaths', 'ShowSafeAreas', 'ShowTargetLines',
+            'ShrinkEdgesWithDistance', 'SingleView', 'SizeTool', 'SkelegonsToBones', 'SkyColor',
+            'Spotlight', 'SquashTool', 'Statistics', 'StatusMsg', 'Stereoscopic', 'StretchTool',
+            'SubdivisionOrder', 'SubPatchLevel', 'SurfaceEditor', 'Synchronize',
+            'TargetItem', 'TopView',
+            'UnaffectedByFog', 'UnaffectedByIK', 'Undo', 'UnseenByAlphaChannel', 'UnseenByCamera',
+            'UnseenByRays', 'UseGlobalResolution', 'UseGlobalBlur', 'UseGlobalMask',
+            'UseMorphedPositions',
+            'ViewLayout', 'VIPER', 'VolumetricLighting',
+            'VolumetricLightingOptions', 'VolumetricRadiosity', 'Volumetrics',
+            'WorldCoordinateSystem',
+            'XYView', 'XZView',
+            'ZenithColor', 'ZoomFactor', 'ZoomIn', 'ZoomInX2', 'ZoomOut', 'ZoomOutX2', 'ZYView',
+            'Camera', 'Channel', 'ChannelGroup', 'Envelope', 'File', 'Glyph', 'Icon', 'Image',
+            'Light', 'Mesh', 'Scene', 'Surface', 'VMap'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '<', '>', '+', '-', '*', '/', '!', '%', '&', '@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #FF6820; font-weight: bold;', //LS_COMMANDS
+            3 => 'color: #007F7F; font-weight: bold;', //LS_MEMBERS
+            4 => 'color: #800080; font-weight: bold;', //LS_METHODS
+            5 => 'color: #51BD95; font-weight: bold;', //LS_MODELER
+            6 => 'color: #416F85; font-weight: bold;', //LS_GENERAL
+            7 => 'color: #C92929; font-weight: bold;'  //LS_COMMANDS (cont)
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #7F7F7F;',
+            'MULTI' => 'color: #7F7F7F;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0040A0;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00C800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #6953AC;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0040A0;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=\.)'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\.)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/lsl2.php b/vendor/easybook/geshi/geshi/lsl2.php
new file mode 100755
index 000000000..dd0bcce8b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lsl2.php
@@ -0,0 +1,1257 @@
+<?php
+/*************************************************************************************
+ * lsl2.php
+ * --------
+ * Author: William Fry (william.fry@nyu.edu)
+ * Copyright: (c) 2009 William Fry
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/02/04
+ *
+ * Linden Scripting Language (LSL2) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009-02-05 (1.0.0)
+ *   -  First Release
+ * 2013-01-01
+ *   -  Modified by Sei Lisa for compatibility with the geshi.py output module
+ *      which is part of the LSL2 Derived Files Generator, available at:
+ *      http://code.google.com/p/lsl-keywords
+ *
+ * TODO (updated 2009/02/05)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LSL2',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+// Generated by LSL2 Derived Files Generator. Database version: 0.0.20130627001; output module version: 0.0.20130619000
+        1 => array( // flow control
+            'do',
+            'else',
+            'for',
+            'if',
+            'jump',
+            'return',
+            'state',
+            'while',
+            ),
+        2 => array( // manifest constants
+            'ACTIVE',
+            'AGENT',
+            'AGENT_ALWAYS_RUN',
+            'AGENT_ATTACHMENTS',
+            'AGENT_AUTOPILOT',
+            'AGENT_AWAY',
+            'AGENT_BUSY',
+            'AGENT_BY_LEGACY_NAME',
+            'AGENT_BY_USERNAME',
+            'AGENT_CROUCHING',
+            'AGENT_FLYING',
+            'AGENT_IN_AIR',
+            'AGENT_LIST_PARCEL',
+            'AGENT_LIST_PARCEL_OWNER',
+            'AGENT_LIST_REGION',
+            'AGENT_MOUSELOOK',
+            'AGENT_ON_OBJECT',
+            'AGENT_SCRIPTED',
+            'AGENT_SITTING',
+            'AGENT_TYPING',
+            'AGENT_WALKING',
+            'ALL_SIDES',
+            'ANIM_ON',
+            'ATTACH_AVATAR_CENTER',
+            'ATTACH_BACK',
+            'ATTACH_BELLY',
+            'ATTACH_CHEST',
+            'ATTACH_CHIN',
+            'ATTACH_HEAD',
+            'ATTACH_HUD_BOTTOM',
+            'ATTACH_HUD_BOTTOM_LEFT',
+            'ATTACH_HUD_BOTTOM_RIGHT',
+            'ATTACH_HUD_CENTER_1',
+            'ATTACH_HUD_CENTER_2',
+            'ATTACH_HUD_TOP_CENTER',
+            'ATTACH_HUD_TOP_LEFT',
+            'ATTACH_HUD_TOP_RIGHT',
+            'ATTACH_LEAR',
+            'ATTACH_LEFT_PEC',
+            'ATTACH_LEYE',
+            'ATTACH_LFOOT',
+            'ATTACH_LHAND',
+            'ATTACH_LHIP',
+            'ATTACH_LLARM',
+            'ATTACH_LLLEG',
+            'ATTACH_LSHOULDER',
+            'ATTACH_LUARM',
+            'ATTACH_LULEG',
+            'ATTACH_MOUTH',
+            'ATTACH_NECK',
+            'ATTACH_NOSE',
+            'ATTACH_PELVIS',
+            'ATTACH_REAR',
+            'ATTACH_REYE',
+            'ATTACH_RFOOT',
+            'ATTACH_RHAND',
+            'ATTACH_RHIP',
+            'ATTACH_RIGHT_PEC',
+            'ATTACH_RLARM',
+            'ATTACH_RLLEG',
+            'ATTACH_RSHOULDER',
+            'ATTACH_RUARM',
+            'ATTACH_RULEG',
+            'AVOID_CHARACTERS',
+            'AVOID_DYNAMIC_OBSTACLES',
+            'AVOID_NONE',
+            'CAMERA_ACTIVE',
+            'CAMERA_BEHINDNESS_ANGLE',
+            'CAMERA_BEHINDNESS_LAG',
+            'CAMERA_DISTANCE',
+            'CAMERA_FOCUS',
+            'CAMERA_FOCUS_LAG',
+            'CAMERA_FOCUS_LOCKED',
+            'CAMERA_FOCUS_OFFSET',
+            'CAMERA_FOCUS_THRESHOLD',
+            'CAMERA_PITCH',
+            'CAMERA_POSITION',
+            'CAMERA_POSITION_LAG',
+            'CAMERA_POSITION_LOCKED',
+            'CAMERA_POSITION_THRESHOLD',
+            'CHANGED_ALLOWED_DROP',
+            'CHANGED_COLOR',
+            'CHANGED_INVENTORY',
+            'CHANGED_LINK',
+            'CHANGED_MEDIA',
+            'CHANGED_OWNER',
+            'CHANGED_REGION',
+            'CHANGED_REGION_START',
+            'CHANGED_SCALE',
+            'CHANGED_SHAPE',
+            'CHANGED_TELEPORT',
+            'CHANGED_TEXTURE',
+            'CHARACTER_ACCOUNT_FOR_SKIPPED_FRAMES',
+            'CHARACTER_AVOIDANCE_MODE',
+            'CHARACTER_CMD_JUMP',
+            'CHARACTER_CMD_SMOOTH_STOP',
+            'CHARACTER_CMD_STOP',
+            'CHARACTER_DESIRED_SPEED',
+            'CHARACTER_DESIRED_TURN_SPEED',
+            'CHARACTER_LENGTH',
+            'CHARACTER_MAX_ACCEL',
+            'CHARACTER_MAX_DECEL',
+            'CHARACTER_MAX_SPEED',
+            'CHARACTER_MAX_TURN_RADIUS',
+            'CHARACTER_ORIENTATION',
+            'CHARACTER_RADIUS',
+            'CHARACTER_STAY_WITHIN_PARCEL',
+            'CHARACTER_TYPE',
+            'CHARACTER_TYPE_A',
+            'CHARACTER_TYPE_B',
+            'CHARACTER_TYPE_C',
+            'CHARACTER_TYPE_D',
+            'CHARACTER_TYPE_NONE',
+            'CLICK_ACTION_BUY',
+            'CLICK_ACTION_NONE',
+            'CLICK_ACTION_OPEN',
+            'CLICK_ACTION_OPEN_MEDIA',
+            'CLICK_ACTION_PAY',
+            'CLICK_ACTION_PLAY',
+            'CLICK_ACTION_SIT',
+            'CLICK_ACTION_TOUCH',
+            'CONTENT_TYPE_ATOM',
+            'CONTENT_TYPE_FORM',
+            'CONTENT_TYPE_HTML',
+            'CONTENT_TYPE_JSON',
+            'CONTENT_TYPE_LLSD',
+            'CONTENT_TYPE_RSS',
+            'CONTENT_TYPE_TEXT',
+            'CONTENT_TYPE_XHTML',
+            'CONTENT_TYPE_XML',
+            'CONTROL_BACK',
+            'CONTROL_DOWN',
+            'CONTROL_FWD',
+            'CONTROL_LBUTTON',
+            'CONTROL_LEFT',
+            'CONTROL_ML_LBUTTON',
+            'CONTROL_RIGHT',
+            'CONTROL_ROT_LEFT',
+            'CONTROL_ROT_RIGHT',
+            'CONTROL_UP',
+            'DATA_BORN',
+            'DATA_NAME',
+            'DATA_ONLINE',
+            'DATA_PAYINFO',
+            'DATA_SIM_POS',
+            'DATA_SIM_RATING',
+            'DATA_SIM_STATUS',
+            'DEBUG_CHANNEL',
+            'DEG_TO_RAD',
+            'DENSITY',
+            'EOF',
+            'ERR_GENERIC',
+            'ERR_MALFORMED_PARAMS',
+            'ERR_PARCEL_PERMISSIONS',
+            'ERR_RUNTIME_PERMISSIONS',
+            'ERR_THROTTLED',
+            'ESTATE_ACCESS_ALLOWED_AGENT_ADD',
+            'ESTATE_ACCESS_ALLOWED_AGENT_REMOVE',
+            'ESTATE_ACCESS_ALLOWED_GROUP_ADD',
+            'ESTATE_ACCESS_ALLOWED_GROUP_REMOVE',
+            'ESTATE_ACCESS_BANNED_AGENT_ADD',
+            'ESTATE_ACCESS_BANNED_AGENT_REMOVE',
+            'FALSE',
+            'FORCE_DIRECT_PATH',
+            'FRICTION',
+            'GCNP_RADIUS',
+            'GCNP_STATIC',
+            'GRAVITY_MULTIPLIER',
+            'HORIZONTAL',
+            'HTTP_BODY_MAXLENGTH',
+            'HTTP_BODY_TRUNCATED',
+            'HTTP_CUSTOM_HEADER',
+            'HTTP_METHOD',
+            'HTTP_MIMETYPE',
+            'HTTP_PRAGMA_NO_CACHE',
+            'HTTP_VERBOSE_THROTTLE',
+            'HTTP_VERIFY_CERT',
+            'INVENTORY_ALL',
+            'INVENTORY_ANIMATION',
+            'INVENTORY_BODYPART',
+            'INVENTORY_CLOTHING',
+            'INVENTORY_GESTURE',
+            'INVENTORY_LANDMARK',
+            'INVENTORY_NONE',
+            'INVENTORY_NOTECARD',
+            'INVENTORY_OBJECT',
+            'INVENTORY_SCRIPT',
+            'INVENTORY_SOUND',
+            'INVENTORY_TEXTURE',
+            'JSON_APPEND',
+            'JSON_ARRAY',
+            'JSON_FALSE',
+            'JSON_INVALID',
+            'JSON_NULL',
+            'JSON_NUMBER',
+            'JSON_OBJECT',
+            'JSON_STRING',
+            'JSON_TRUE',
+            'KFM_CMD_PAUSE',
+            'KFM_CMD_PLAY',
+            'KFM_CMD_SET_MODE',
+            'KFM_CMD_STOP',
+            'KFM_COMMAND',
+            'KFM_DATA',
+            'KFM_FORWARD',
+            'KFM_LOOP',
+            'KFM_MODE',
+            'KFM_PING_PONG',
+            'KFM_REVERSE',
+            'KFM_ROTATION',
+            'KFM_TRANSLATION',
+            'LAND_LARGE_BRUSH',
+            'LAND_LEVEL',
+            'LAND_LOWER',
+            'LAND_MEDIUM_BRUSH',
+            'LAND_NOISE',
+            'LAND_RAISE',
+            'LAND_REVERT',
+            'LAND_SMALL_BRUSH',
+            'LAND_SMOOTH',
+            'LINK_ALL_CHILDREN',
+            'LINK_ALL_OTHERS',
+            'LINK_ROOT',
+            'LINK_SET',
+            'LINK_THIS',
+            'LIST_STAT_GEOMETRIC_MEAN',
+            'LIST_STAT_MAX',
+            'LIST_STAT_MEAN',
+            'LIST_STAT_MEDIAN',
+            'LIST_STAT_MIN',
+            'LIST_STAT_NUM_COUNT',
+            'LIST_STAT_RANGE',
+            'LIST_STAT_STD_DEV',
+            'LIST_STAT_SUM',
+            'LIST_STAT_SUM_SQUARES',
+            'LOOP',
+            'MASK_BASE',
+            'MASK_EVERYONE',
+            'MASK_GROUP',
+            'MASK_NEXT',
+            'MASK_OWNER',
+            'NULL_KEY',
+            'OBJECT_ATTACHED_POINT',
+            'OBJECT_CHARACTER_TIME',
+            'OBJECT_CREATOR',
+            'OBJECT_DESC',
+            'OBJECT_GROUP',
+            'OBJECT_NAME',
+            'OBJECT_OWNER',
+            'OBJECT_PATHFINDING_TYPE',
+            'OBJECT_PHANTOM',
+            'OBJECT_PHYSICS',
+            'OBJECT_PHYSICS_COST',
+            'OBJECT_POS',
+            'OBJECT_PRIM_EQUIVALENCE',
+            'OBJECT_RETURN_PARCEL',
+            'OBJECT_RETURN_PARCEL_OWNER',
+            'OBJECT_RETURN_REGION',
+            'OBJECT_ROOT',
+            'OBJECT_ROT',
+            'OBJECT_RUNNING_SCRIPT_COUNT',
+            'OBJECT_SCRIPT_MEMORY',
+            'OBJECT_SCRIPT_TIME',
+            'OBJECT_SERVER_COST',
+            'OBJECT_STREAMING_COST',
+            'OBJECT_TEMP_ON_REZ',
+            'OBJECT_TOTAL_SCRIPT_COUNT',
+            'OBJECT_UNKNOWN_DETAIL',
+            'OBJECT_VELOCITY',
+            'OPT_AVATAR',
+            'OPT_CHARACTER',
+            'OPT_EXCLUSION_VOLUME',
+            'OPT_LEGACY_LINKSET',
+            'OPT_MATERIAL_VOLUME',
+            'OPT_OTHER',
+            'OPT_STATIC_OBSTACLE',
+            'OPT_WALKABLE',
+            'PARCEL_COUNT_GROUP',
+            'PARCEL_COUNT_OTHER',
+            'PARCEL_COUNT_OWNER',
+            'PARCEL_COUNT_SELECTED',
+            'PARCEL_COUNT_TEMP',
+            'PARCEL_COUNT_TOTAL',
+            'PARCEL_DETAILS_AREA',
+            'PARCEL_DETAILS_DESC',
+            'PARCEL_DETAILS_GROUP',
+            'PARCEL_DETAILS_ID',
+            'PARCEL_DETAILS_NAME',
+            'PARCEL_DETAILS_OWNER',
+            'PARCEL_DETAILS_SEE_AVATARS',
+            'PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY',
+            'PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS',
+            'PARCEL_FLAG_ALLOW_CREATE_OBJECTS',
+            'PARCEL_FLAG_ALLOW_DAMAGE',
+            'PARCEL_FLAG_ALLOW_FLY',
+            'PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY',
+            'PARCEL_FLAG_ALLOW_GROUP_SCRIPTS',
+            'PARCEL_FLAG_ALLOW_LANDMARK',
+            'PARCEL_FLAG_ALLOW_SCRIPTS',
+            'PARCEL_FLAG_ALLOW_TERRAFORM',
+            'PARCEL_FLAG_LOCAL_SOUND_ONLY',
+            'PARCEL_FLAG_RESTRICT_PUSHOBJECT',
+            'PARCEL_FLAG_USE_ACCESS_GROUP',
+            'PARCEL_FLAG_USE_ACCESS_LIST',
+            'PARCEL_FLAG_USE_BAN_LIST',
+            'PARCEL_FLAG_USE_LAND_PASS_LIST',
+            'PARCEL_MEDIA_COMMAND_AGENT',
+            'PARCEL_MEDIA_COMMAND_AUTO_ALIGN',
+            'PARCEL_MEDIA_COMMAND_DESC',
+            'PARCEL_MEDIA_COMMAND_LOOP',
+            'PARCEL_MEDIA_COMMAND_LOOP_SET',
+            'PARCEL_MEDIA_COMMAND_PAUSE',
+            'PARCEL_MEDIA_COMMAND_PLAY',
+            'PARCEL_MEDIA_COMMAND_SIZE',
+            'PARCEL_MEDIA_COMMAND_STOP',
+            'PARCEL_MEDIA_COMMAND_TEXTURE',
+            'PARCEL_MEDIA_COMMAND_TIME',
+            'PARCEL_MEDIA_COMMAND_TYPE',
+            'PARCEL_MEDIA_COMMAND_UNLOAD',
+            'PARCEL_MEDIA_COMMAND_URL',
+            'PASSIVE',
+            'PATROL_PAUSE_AT_WAYPOINTS',
+            'PAYMENT_INFO_ON_FILE',
+            'PAYMENT_INFO_USED',
+            'PAY_DEFAULT',
+            'PAY_HIDE',
+            'PERMISSION_ATTACH',
+            'PERMISSION_CHANGE_LINKS',
+            'PERMISSION_CONTROL_CAMERA',
+            'PERMISSION_DEBIT',
+            'PERMISSION_OVERRIDE_ANIMATIONS',
+            'PERMISSION_RETURN_OBJECTS',
+            'PERMISSION_SILENT_ESTATE_MANAGEMENT',
+            'PERMISSION_TAKE_CONTROLS',
+            'PERMISSION_TELEPORT',
+            'PERMISSION_TRACK_CAMERA',
+            'PERMISSION_TRIGGER_ANIMATION',
+            'PERM_ALL',
+            'PERM_COPY',
+            'PERM_MODIFY',
+            'PERM_MOVE',
+            'PERM_TRANSFER',
+            'PI',
+            'PING_PONG',
+            'PI_BY_TWO',
+            'PRIM_BUMP_BARK',
+            'PRIM_BUMP_BLOBS',
+            'PRIM_BUMP_BRICKS',
+            'PRIM_BUMP_BRIGHT',
+            'PRIM_BUMP_CHECKER',
+            'PRIM_BUMP_CONCRETE',
+            'PRIM_BUMP_DARK',
+            'PRIM_BUMP_DISKS',
+            'PRIM_BUMP_GRAVEL',
+            'PRIM_BUMP_LARGETILE',
+            'PRIM_BUMP_NONE',
+            'PRIM_BUMP_SHINY',
+            'PRIM_BUMP_SIDING',
+            'PRIM_BUMP_STONE',
+            'PRIM_BUMP_STUCCO',
+            'PRIM_BUMP_SUCTION',
+            'PRIM_BUMP_TILE',
+            'PRIM_BUMP_WEAVE',
+            'PRIM_BUMP_WOOD',
+            'PRIM_COLOR',
+            'PRIM_DESC',
+            'PRIM_FLEXIBLE',
+            'PRIM_FULLBRIGHT',
+            'PRIM_GLOW',
+            'PRIM_HOLE_CIRCLE',
+            'PRIM_HOLE_DEFAULT',
+            'PRIM_HOLE_SQUARE',
+            'PRIM_HOLE_TRIANGLE',
+            'PRIM_LINK_TARGET',
+            'PRIM_MATERIAL',
+            'PRIM_MATERIAL_FLESH',
+            'PRIM_MATERIAL_GLASS',
+            'PRIM_MATERIAL_METAL',
+            'PRIM_MATERIAL_PLASTIC',
+            'PRIM_MATERIAL_RUBBER',
+            'PRIM_MATERIAL_STONE',
+            'PRIM_MATERIAL_WOOD',
+            'PRIM_MEDIA_ALT_IMAGE_ENABLE',
+            'PRIM_MEDIA_AUTO_LOOP',
+            'PRIM_MEDIA_AUTO_PLAY',
+            'PRIM_MEDIA_AUTO_SCALE',
+            'PRIM_MEDIA_AUTO_ZOOM',
+            'PRIM_MEDIA_CONTROLS',
+            'PRIM_MEDIA_CONTROLS_MINI',
+            'PRIM_MEDIA_CONTROLS_STANDARD',
+            'PRIM_MEDIA_CURRENT_URL',
+            'PRIM_MEDIA_FIRST_CLICK_INTERACT',
+            'PRIM_MEDIA_HEIGHT_PIXELS',
+            'PRIM_MEDIA_HOME_URL',
+            'PRIM_MEDIA_MAX_HEIGHT_PIXELS',
+            'PRIM_MEDIA_MAX_URL_LENGTH',
+            'PRIM_MEDIA_MAX_WHITELIST_COUNT',
+            'PRIM_MEDIA_MAX_WHITELIST_SIZE',
+            'PRIM_MEDIA_MAX_WIDTH_PIXELS',
+            'PRIM_MEDIA_PARAM_MAX',
+            'PRIM_MEDIA_PERMS_CONTROL',
+            'PRIM_MEDIA_PERMS_INTERACT',
+            'PRIM_MEDIA_PERM_ANYONE',
+            'PRIM_MEDIA_PERM_GROUP',
+            'PRIM_MEDIA_PERM_NONE',
+            'PRIM_MEDIA_PERM_OWNER',
+            'PRIM_MEDIA_WHITELIST',
+            'PRIM_MEDIA_WHITELIST_ENABLE',
+            'PRIM_MEDIA_WIDTH_PIXELS',
+            'PRIM_NAME',
+            'PRIM_OMEGA',
+            'PRIM_PHANTOM',
+            'PRIM_PHYSICS',
+            'PRIM_PHYSICS_SHAPE_CONVEX',
+            'PRIM_PHYSICS_SHAPE_NONE',
+            'PRIM_PHYSICS_SHAPE_PRIM',
+            'PRIM_PHYSICS_SHAPE_TYPE',
+            'PRIM_POINT_LIGHT',
+            'PRIM_POSITION',
+            'PRIM_POS_LOCAL',
+            'PRIM_ROTATION',
+            'PRIM_ROT_LOCAL',
+            'PRIM_SCULPT_FLAG_INVERT',
+            'PRIM_SCULPT_FLAG_MIRROR',
+            'PRIM_SCULPT_TYPE_CYLINDER',
+            'PRIM_SCULPT_TYPE_MASK',
+            'PRIM_SCULPT_TYPE_PLANE',
+            'PRIM_SCULPT_TYPE_SPHERE',
+            'PRIM_SCULPT_TYPE_TORUS',
+            'PRIM_SHINY_HIGH',
+            'PRIM_SHINY_LOW',
+            'PRIM_SHINY_MEDIUM',
+            'PRIM_SHINY_NONE',
+            'PRIM_SIZE',
+            'PRIM_SLICE',
+            'PRIM_TEMP_ON_REZ',
+            'PRIM_TEXGEN',
+            'PRIM_TEXGEN_DEFAULT',
+            'PRIM_TEXGEN_PLANAR',
+            'PRIM_TEXT',
+            'PRIM_TEXTURE',
+            'PRIM_TYPE',
+            'PRIM_TYPE_BOX',
+            'PRIM_TYPE_CYLINDER',
+            'PRIM_TYPE_PRISM',
+            'PRIM_TYPE_RING',
+            'PRIM_TYPE_SCULPT',
+            'PRIM_TYPE_SPHERE',
+            'PRIM_TYPE_TORUS',
+            'PRIM_TYPE_TUBE',
+            'PROFILE_NONE',
+            'PROFILE_SCRIPT_MEMORY',
+            'PSYS_PART_BOUNCE_MASK',
+            'PSYS_PART_EMISSIVE_MASK',
+            'PSYS_PART_END_ALPHA',
+            'PSYS_PART_END_COLOR',
+            'PSYS_PART_END_SCALE',
+            'PSYS_PART_FLAGS',
+            'PSYS_PART_FOLLOW_SRC_MASK',
+            'PSYS_PART_FOLLOW_VELOCITY_MASK',
+            'PSYS_PART_INTERP_COLOR_MASK',
+            'PSYS_PART_INTERP_SCALE_MASK',
+            'PSYS_PART_MAX_AGE',
+            'PSYS_PART_START_ALPHA',
+            'PSYS_PART_START_COLOR',
+            'PSYS_PART_START_SCALE',
+            'PSYS_PART_TARGET_LINEAR_MASK',
+            'PSYS_PART_TARGET_POS_MASK',
+            'PSYS_PART_WIND_MASK',
+            'PSYS_SRC_ACCEL',
+            'PSYS_SRC_ANGLE_BEGIN',
+            'PSYS_SRC_ANGLE_END',
+            'PSYS_SRC_BURST_PART_COUNT',
+            'PSYS_SRC_BURST_RADIUS',
+            'PSYS_SRC_BURST_RATE',
+            'PSYS_SRC_BURST_SPEED_MAX',
+            'PSYS_SRC_BURST_SPEED_MIN',
+            'PSYS_SRC_MAX_AGE',
+            'PSYS_SRC_OMEGA',
+            'PSYS_SRC_PATTERN',
+            'PSYS_SRC_PATTERN_ANGLE',
+            'PSYS_SRC_PATTERN_ANGLE_CONE',
+            'PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY',
+            'PSYS_SRC_PATTERN_DROP',
+            'PSYS_SRC_PATTERN_EXPLODE',
+            'PSYS_SRC_TARGET_KEY',
+            'PSYS_SRC_TEXTURE',
+            'PUBLIC_CHANNEL',
+            'PURSUIT_FUZZ_FACTOR',
+            'PURSUIT_GOAL_TOLERANCE',
+            'PURSUIT_INTERCEPT',
+            'PURSUIT_OFFSET',
+            'PU_EVADE_HIDDEN',
+            'PU_EVADE_SPOTTED',
+            'PU_FAILURE_DYNAMIC_PATHFINDING_DISABLED',
+            'PU_FAILURE_INVALID_GOAL',
+            'PU_FAILURE_INVALID_START',
+            'PU_FAILURE_NO_NAVMESH',
+            'PU_FAILURE_NO_VALID_DESTINATION',
+            'PU_FAILURE_OTHER',
+            'PU_FAILURE_PARCEL_UNREACHABLE',
+            'PU_FAILURE_TARGET_GONE',
+            'PU_FAILURE_UNREACHABLE',
+            'PU_GOAL_REACHED',
+            'PU_SLOWDOWN_DISTANCE_REACHED',
+            'RAD_TO_DEG',
+            'RCERR_CAST_TIME_EXCEEDED',
+            'RCERR_SIM_PERF_LOW',
+            'RCERR_UNKNOWN',
+            'RC_DATA_FLAGS',
+            'RC_DETECT_PHANTOM',
+            'RC_GET_LINK_NUM',
+            'RC_GET_NORMAL',
+            'RC_GET_ROOT_KEY',
+            'RC_MAX_HITS',
+            'RC_REJECT_AGENTS',
+            'RC_REJECT_LAND',
+            'RC_REJECT_NONPHYSICAL',
+            'RC_REJECT_PHYSICAL',
+            'RC_REJECT_TYPES',
+            'REGION_FLAG_ALLOW_DAMAGE',
+            'REGION_FLAG_ALLOW_DIRECT_TELEPORT',
+            'REGION_FLAG_BLOCK_FLY',
+            'REGION_FLAG_BLOCK_TERRAFORM',
+            'REGION_FLAG_DISABLE_COLLISIONS',
+            'REGION_FLAG_DISABLE_PHYSICS',
+            'REGION_FLAG_FIXED_SUN',
+            'REGION_FLAG_RESTRICT_PUSHOBJECT',
+            'REGION_FLAG_SANDBOX',
+            'REMOTE_DATA_CHANNEL',
+            'REMOTE_DATA_REPLY',
+            'REMOTE_DATA_REQUEST',
+            'REQUIRE_LINE_OF_SIGHT',
+            'RESTITUTION',
+            'REVERSE',
+            'ROTATE',
+            'SCALE',
+            'SCRIPTED',
+            'SIM_STAT_PCT_CHARS_STEPPED',
+            'SMOOTH',
+            'SQRT2',
+            'STATUS_BLOCK_GRAB',
+            'STATUS_BLOCK_GRAB_OBJECT',
+            'STATUS_BOUNDS_ERROR',
+            'STATUS_CAST_SHADOWS',
+            'STATUS_DIE_AT_EDGE',
+            'STATUS_INTERNAL_ERROR',
+            'STATUS_MALFORMED_PARAMS',
+            'STATUS_NOT_FOUND',
+            'STATUS_NOT_SUPPORTED',
+            'STATUS_OK',
+            'STATUS_PHANTOM',
+            'STATUS_PHYSICS',
+            'STATUS_RETURN_AT_EDGE',
+            'STATUS_ROTATE_X',
+            'STATUS_ROTATE_Y',
+            'STATUS_ROTATE_Z',
+            'STATUS_SANDBOX',
+            'STATUS_TYPE_MISMATCH',
+            'STATUS_WHITELIST_FAILED',
+            'STRING_TRIM',
+            'STRING_TRIM_HEAD',
+            'STRING_TRIM_TAIL',
+            'TEXTURE_BLANK',
+            'TEXTURE_DEFAULT',
+            'TEXTURE_MEDIA',
+            'TEXTURE_PLYWOOD',
+            'TEXTURE_TRANSPARENT',
+            'TOUCH_INVALID_FACE',
+            'TOUCH_INVALID_TEXCOORD',
+            'TOUCH_INVALID_VECTOR',
+            'TRAVERSAL_TYPE',
+            'TRAVERSAL_TYPE_FAST',
+            'TRAVERSAL_TYPE_NONE',
+            'TRAVERSAL_TYPE_SLOW',
+            'TRUE',
+            'TWO_PI',
+            'TYPE_FLOAT',
+            'TYPE_INTEGER',
+            'TYPE_INVALID',
+            'TYPE_KEY',
+            'TYPE_ROTATION',
+            'TYPE_STRING',
+            'TYPE_VECTOR',
+            'URL_REQUEST_DENIED',
+            'URL_REQUEST_GRANTED',
+            'VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY',
+            'VEHICLE_ANGULAR_DEFLECTION_TIMESCALE',
+            'VEHICLE_ANGULAR_FRICTION_TIMESCALE',
+            'VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE',
+            'VEHICLE_ANGULAR_MOTOR_DIRECTION',
+            'VEHICLE_ANGULAR_MOTOR_TIMESCALE',
+            'VEHICLE_BANKING_EFFICIENCY',
+            'VEHICLE_BANKING_MIX',
+            'VEHICLE_BANKING_TIMESCALE',
+            'VEHICLE_BUOYANCY',
+            'VEHICLE_FLAG_CAMERA_DECOUPLED',
+            'VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT',
+            'VEHICLE_FLAG_HOVER_TERRAIN_ONLY',
+            'VEHICLE_FLAG_HOVER_UP_ONLY',
+            'VEHICLE_FLAG_HOVER_WATER_ONLY',
+            'VEHICLE_FLAG_LIMIT_MOTOR_UP',
+            'VEHICLE_FLAG_LIMIT_ROLL_ONLY',
+            'VEHICLE_FLAG_MOUSELOOK_BANK',
+            'VEHICLE_FLAG_MOUSELOOK_STEER',
+            'VEHICLE_FLAG_NO_DEFLECTION_UP',
+            'VEHICLE_HOVER_EFFICIENCY',
+            'VEHICLE_HOVER_HEIGHT',
+            'VEHICLE_HOVER_TIMESCALE',
+            'VEHICLE_LINEAR_DEFLECTION_EFFICIENCY',
+            'VEHICLE_LINEAR_DEFLECTION_TIMESCALE',
+            'VEHICLE_LINEAR_FRICTION_TIMESCALE',
+            'VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE',
+            'VEHICLE_LINEAR_MOTOR_DIRECTION',
+            'VEHICLE_LINEAR_MOTOR_OFFSET',
+            'VEHICLE_LINEAR_MOTOR_TIMESCALE',
+            'VEHICLE_REFERENCE_FRAME',
+            'VEHICLE_TYPE_AIRPLANE',
+            'VEHICLE_TYPE_BALLOON',
+            'VEHICLE_TYPE_BOAT',
+            'VEHICLE_TYPE_CAR',
+            'VEHICLE_TYPE_NONE',
+            'VEHICLE_TYPE_SLED',
+            'VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY',
+            'VEHICLE_VERTICAL_ATTRACTION_TIMESCALE',
+            'VERTICAL',
+            'WANDER_PAUSE_AT_WAYPOINTS',
+            'ZERO_ROTATION',
+            'ZERO_VECTOR',
+            ),
+        3 => array( // handlers
+            'at_rot_target',
+            'at_target',
+            'attach',
+            'changed',
+            'collision',
+            'collision_end',
+            'collision_start',
+            'control',
+            'dataserver',
+            'email',
+            'http_request',
+            'http_response',
+            'land_collision',
+            'land_collision_end',
+            'land_collision_start',
+            'link_message',
+            'listen',
+            'money',
+            'moving_end',
+            'moving_start',
+            'no_sensor',
+            'not_at_rot_target',
+            'not_at_target',
+            'object_rez',
+            'on_rez',
+            'path_update',
+            'remote_data',
+            'run_time_permissions',
+            'sensor',
+            'state_entry',
+            'state_exit',
+            'timer',
+            'touch',
+            'touch_end',
+            'touch_start',
+            'transaction_result',
+            ),
+        4 => array( // data types
+            'float',
+            'integer',
+            'key',
+            'list',
+            'quaternion',
+            'rotation',
+            'string',
+            'vector',
+            ),
+        5 => array( // library
+            'default',
+            'llAbs',
+            'llAcos',
+            'llAddToLandBanList',
+            'llAddToLandPassList',
+            'llAdjustSoundVolume',
+            'llAllowInventoryDrop',
+            'llAngleBetween',
+            'llApplyImpulse',
+            'llApplyRotationalImpulse',
+            'llAsin',
+            'llAtan2',
+            'llAttachToAvatar',
+            'llAttachToAvatarTemp',
+            'llAvatarOnLinkSitTarget',
+            'llAvatarOnSitTarget',
+            'llAxes2Rot',
+            'llAxisAngle2Rot',
+            'llBase64ToInteger',
+            'llBase64ToString',
+            'llBreakAllLinks',
+            'llBreakLink',
+            'llCastRay',
+            'llCeil',
+            'llClearCameraParams',
+            'llClearLinkMedia',
+            'llClearPrimMedia',
+            'llCloseRemoteDataChannel',
+            'llCollisionFilter',
+            'llCollisionSound',
+            'llCos',
+            'llCreateCharacter',
+            'llCreateLink',
+            'llCSV2List',
+            'llDeleteCharacter',
+            'llDeleteSubList',
+            'llDeleteSubString',
+            'llDetachFromAvatar',
+            'llDetectedGrab',
+            'llDetectedGroup',
+            'llDetectedKey',
+            'llDetectedLinkNumber',
+            'llDetectedName',
+            'llDetectedOwner',
+            'llDetectedPos',
+            'llDetectedRot',
+            'llDetectedTouchBinormal',
+            'llDetectedTouchFace',
+            'llDetectedTouchNormal',
+            'llDetectedTouchPos',
+            'llDetectedTouchST',
+            'llDetectedTouchUV',
+            'llDetectedType',
+            'llDetectedVel',
+            'llDialog',
+            'llDie',
+            'llDumpList2String',
+            'llEdgeOfWorld',
+            'llEjectFromLand',
+            'llEmail',
+            'llEscapeURL',
+            'llEuler2Rot',
+            'llEvade',
+            'llExecCharacterCmd',
+            'llFabs',
+            'llFleeFrom',
+            'llFloor',
+            'llForceMouselook',
+            'llFrand',
+            'llGenerateKey',
+            'llGetAccel',
+            'llGetAgentInfo',
+            'llGetAgentLanguage',
+            'llGetAgentList',
+            'llGetAgentSize',
+            'llGetAlpha',
+            'llGetAndResetTime',
+            'llGetAnimation',
+            'llGetAnimationList',
+            'llGetAnimationOverride',
+            'llGetAttached',
+            'llGetBoundingBox',
+            'llGetCameraPos',
+            'llGetCameraRot',
+            'llGetCenterOfMass',
+            'llGetClosestNavPoint',
+            'llGetColor',
+            'llGetCreator',
+            'llGetDate',
+            'llGetDisplayName',
+            'llGetEnergy',
+            'llGetEnv',
+            'llGetForce',
+            'llGetFreeMemory',
+            'llGetFreeURLs',
+            'llGetGeometricCenter',
+            'llGetGMTclock',
+            'llGetHTTPHeader',
+            'llGetInventoryCreator',
+            'llGetInventoryKey',
+            'llGetInventoryName',
+            'llGetInventoryNumber',
+            'llGetInventoryPermMask',
+            'llGetInventoryType',
+            'llGetKey',
+            'llGetLandOwnerAt',
+            'llGetLinkKey',
+            'llGetLinkMedia',
+            'llGetLinkName',
+            'llGetLinkNumber',
+            'llGetLinkNumberOfSides',
+            'llGetLinkPrimitiveParams',
+            'llGetListEntryType',
+            'llGetListLength',
+            'llGetLocalPos',
+            'llGetLocalRot',
+            'llGetMass',
+            'llGetMassMKS',
+            'llGetMemoryLimit',
+            'llGetNextEmail',
+            'llGetNotecardLine',
+            'llGetNumberOfNotecardLines',
+            'llGetNumberOfPrims',
+            'llGetNumberOfSides',
+            'llGetObjectDesc',
+            'llGetObjectDetails',
+            'llGetObjectMass',
+            'llGetObjectName',
+            'llGetObjectPermMask',
+            'llGetObjectPrimCount',
+            'llGetOmega',
+            'llGetOwner',
+            'llGetOwnerKey',
+            'llGetParcelDetails',
+            'llGetParcelFlags',
+            'llGetParcelMaxPrims',
+            'llGetParcelMusicURL',
+            'llGetParcelPrimCount',
+            'llGetParcelPrimOwners',
+            'llGetPermissions',
+            'llGetPermissionsKey',
+            'llGetPhysicsMaterial',
+            'llGetPos',
+            'llGetPrimitiveParams',
+            'llGetPrimMediaParams',
+            'llGetRegionAgentCount',
+            'llGetRegionCorner',
+            'llGetRegionFlags',
+            'llGetRegionFPS',
+            'llGetRegionName',
+            'llGetRegionTimeDilation',
+            'llGetRootPosition',
+            'llGetRootRotation',
+            'llGetRot',
+            'llGetScale',
+            'llGetScriptName',
+            'llGetScriptState',
+            'llGetSimStats',
+            'llGetSimulatorHostname',
+            'llGetSPMaxMemory',
+            'llGetStartParameter',
+            'llGetStaticPath',
+            'llGetStatus',
+            'llGetSubString',
+            'llGetSunDirection',
+            'llGetTexture',
+            'llGetTextureOffset',
+            'llGetTextureRot',
+            'llGetTextureScale',
+            'llGetTime',
+            'llGetTimeOfDay',
+            'llGetTimestamp',
+            'llGetTorque',
+            'llGetUnixTime',
+            'llGetUsedMemory',
+            'llGetUsername',
+            'llGetVel',
+            'llGetWallclock',
+            'llGiveInventory',
+            'llGiveInventoryList',
+            'llGiveMoney',
+            'llGround',
+            'llGroundContour',
+            'llGroundNormal',
+            'llGroundRepel',
+            'llGroundSlope',
+            'llHTTPRequest',
+            'llHTTPResponse',
+            'llInsertString',
+            'llInstantMessage',
+            'llIntegerToBase64',
+            'llJson2List',
+            'llJsonGetValue',
+            'llJsonSetValue',
+            'llJsonValueType',
+            'llKey2Name',
+            'llLinkParticleSystem',
+            'llLinkSitTarget',
+            'llList2CSV',
+            'llList2Float',
+            'llList2Integer',
+            'llList2Json',
+            'llList2Key',
+            'llList2List',
+            'llList2ListStrided',
+            'llList2Rot',
+            'llList2String',
+            'llList2Vector',
+            'llListen',
+            'llListenControl',
+            'llListenRemove',
+            'llListFindList',
+            'llListInsertList',
+            'llListRandomize',
+            'llListReplaceList',
+            'llListSort',
+            'llListStatistics',
+            'llLoadURL',
+            'llLog',
+            'llLog10',
+            'llLookAt',
+            'llLoopSound',
+            'llLoopSoundMaster',
+            'llLoopSoundSlave',
+            'llManageEstateAccess',
+            'llMapDestination',
+            'llMD5String',
+            'llMessageLinked',
+            'llMinEventDelay',
+            'llModifyLand',
+            'llModPow',
+            'llMoveToTarget',
+            'llNavigateTo',
+            'llOffsetTexture',
+            'llOpenRemoteDataChannel',
+            'llOverMyLand',
+            'llOwnerSay',
+            'llParcelMediaCommandList',
+            'llParcelMediaQuery',
+            'llParseString2List',
+            'llParseStringKeepNulls',
+            'llParticleSystem',
+            'llPassCollisions',
+            'llPassTouches',
+            'llPatrolPoints',
+            'llPlaySound',
+            'llPlaySoundSlave',
+            'llPow',
+            'llPreloadSound',
+            'llPursue',
+            'llPushObject',
+            'llRegionSay',
+            'llRegionSayTo',
+            'llReleaseControls',
+            'llReleaseURL',
+            'llRemoteDataReply',
+            'llRemoteLoadScriptPin',
+            'llRemoveFromLandBanList',
+            'llRemoveFromLandPassList',
+            'llRemoveInventory',
+            'llRemoveVehicleFlags',
+            'llRequestAgentData',
+            'llRequestDisplayName',
+            'llRequestInventoryData',
+            'llRequestPermissions',
+            'llRequestSecureURL',
+            'llRequestSimulatorData',
+            'llRequestURL',
+            'llRequestUsername',
+            'llResetAnimationOverride',
+            'llResetLandBanList',
+            'llResetLandPassList',
+            'llResetOtherScript',
+            'llResetScript',
+            'llResetTime',
+            'llReturnObjectsByID',
+            'llReturnObjectsByOwner',
+            'llRezAtRoot',
+            'llRezObject',
+            'llRot2Angle',
+            'llRot2Axis',
+            'llRot2Euler',
+            'llRot2Fwd',
+            'llRot2Left',
+            'llRot2Up',
+            'llRotateTexture',
+            'llRotBetween',
+            'llRotLookAt',
+            'llRotTarget',
+            'llRotTargetRemove',
+            'llRound',
+            'llSameGroup',
+            'llSay',
+            'llScaleTexture',
+            'llScriptDanger',
+            'llScriptProfiler',
+            'llSendRemoteData',
+            'llSensor',
+            'llSensorRemove',
+            'llSensorRepeat',
+            'llSetAlpha',
+            'llSetAngularVelocity',
+            'llSetAnimationOverride',
+            'llSetBuoyancy',
+            'llSetCameraAtOffset',
+            'llSetCameraEyeOffset',
+            'llSetCameraParams',
+            'llSetClickAction',
+            'llSetColor',
+            'llSetContentType',
+            'llSetDamage',
+            'llSetForce',
+            'llSetForceAndTorque',
+            'llSetHoverHeight',
+            'llSetKeyframedMotion',
+            'llSetLinkAlpha',
+            'llSetLinkCamera',
+            'llSetLinkColor',
+            'llSetLinkMedia',
+            'llSetLinkPrimitiveParams',
+            'llSetLinkPrimitiveParamsFast',
+            'llSetLinkTexture',
+            'llSetLinkTextureAnim',
+            'llSetLocalRot',
+            'llSetMemoryLimit',
+            'llSetObjectDesc',
+            'llSetObjectName',
+            'llSetParcelMusicURL',
+            'llSetPayPrice',
+            'llSetPhysicsMaterial',
+            'llSetPos',
+            'llSetPrimitiveParams',
+            'llSetPrimMediaParams',
+            'llSetRegionPos',
+            'llSetRemoteScriptAccessPin',
+            'llSetRot',
+            'llSetScale',
+            'llSetScriptState',
+            'llSetSitText',
+            'llSetSoundQueueing',
+            'llSetSoundRadius',
+            'llSetStatus',
+            'llSetText',
+            'llSetTexture',
+            'llSetTextureAnim',
+            'llSetTimerEvent',
+            'llSetTorque',
+            'llSetTouchText',
+            'llSetVehicleFlags',
+            'llSetVehicleFloatParam',
+            'llSetVehicleRotationParam',
+            'llSetVehicleType',
+            'llSetVehicleVectorParam',
+            'llSetVelocity',
+            'llSHA1String',
+            'llShout',
+            'llSin',
+            'llSitTarget',
+            'llSleep',
+            'llSqrt',
+            'llStartAnimation',
+            'llStopAnimation',
+            'llStopHover',
+            'llStopLookAt',
+            'llStopMoveToTarget',
+            'llStopSound',
+            'llStringLength',
+            'llStringToBase64',
+            'llStringTrim',
+            'llSubStringIndex',
+            'llTakeControls',
+            'llTan',
+            'llTarget',
+            'llTargetOmega',
+            'llTargetRemove',
+            'llTeleportAgent',
+            'llTeleportAgentGlobalCoords',
+            'llTeleportAgentHome',
+            'llTextBox',
+            'llToLower',
+            'llToUpper',
+            'llTransferLindenDollars',
+            'llTriggerSound',
+            'llTriggerSoundLimited',
+            'llUnescapeURL',
+            'llUnSit',
+            'llUpdateCharacter',
+            'llVecDist',
+            'llVecMag',
+            'llVecNorm',
+            'llVolumeDetect',
+            'llWanderWithin',
+            'llWater',
+            'llWhisper',
+            'llWind',
+            'llXorBase64',
+            'print',
+            ),
+        6 => array( // deprecated
+            'ATTACH_LPEC',
+            'ATTACH_RPEC',
+            'DATA_RATING',
+            'PERMISSION_CHANGE_JOINTS',
+            'PERMISSION_CHANGE_PERMISSIONS',
+            'PERMISSION_RELEASE_OWNERSHIP',
+            'PERMISSION_REMAP_CONTROLS',
+            'PRIM_CAST_SHADOWS',
+            'PRIM_MATERIAL_LIGHT',
+            'PSYS_SRC_INNERANGLE',
+            'PSYS_SRC_OBJ_REL_MASK',
+            'PSYS_SRC_OUTERANGLE',
+            'VEHICLE_FLAG_NO_FLY_UP',
+            'llCloud',
+            'llMakeExplosion',
+            'llMakeFire',
+            'llMakeFountain',
+            'llMakeSmoke',
+            'llRemoteDataSetRegion',
+            'llSound',
+            'llSoundPreload',
+            'llXorBase64Strings',
+            'llXorBase64StringsCorrect',
+            ),
+        7 => array( // unimplemented
+            'event',
+            'llCollisionSprite',
+            'llPointAt',
+            'llRefreshPrimURL',
+            'llReleaseCamera',
+            'llRemoteLoadScript',
+            'llSetPrimURL',
+            'llStopPointAt',
+            'llTakeCamera',
+            ),
+        8 => array( // God mode
+            'llGodLikeRezObject',
+            'llSetInventoryPermMask',
+            'llSetObjectPermMask',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '{', '}', '(', ')', '[', ']',
+        '=', '+', '-', '*', '/',
+        '+=', '-=', '*=', '/=', '++', '--',
+        '!', '%', '&', '|', '&&', '||',
+        '==', '!=', '<', '>', '<=', '>=',
+        '~', '<<', '>>', '^', ':',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #000080;',
+            3 => 'color: #008080;',
+            4 => 'color: #228b22;',
+            5 => 'color: #b22222;',
+            6 => 'color: #8b0000; background-color: #ffff00;',
+            7 => 'color: #8b0000; background-color: #fa8072;',
+            8 => 'color: #000000; background-color: #ba55d3;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff7f50; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #006400;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://wiki.secondlife.com/wiki/{FNAME}',
+        4 => 'http://wiki.secondlife.com/wiki/{FNAME}',
+        5 => 'http://wiki.secondlife.com/wiki/{FNAME}',
+        6 => 'http://wiki.secondlife.com/wiki/{FNAME}',
+        7 => 'http://wiki.secondlife.com/wiki/{FNAME}',
+        8 => 'http://wiki.secondlife.com/wiki/{FNAME}',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/lua.php b/vendor/easybook/geshi/geshi/lua.php
new file mode 100755
index 000000000..985cb8c27
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/lua.php
@@ -0,0 +1,175 @@
+<?php
+/*************************************************************************************
+ * lua.php
+ * -------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/10
+ *
+ * LUA language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/26 (1.0.2)
+ *  -  Added support for objects and methods
+ *  -  Removed unusable keywords
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Lua',
+    'COMMENT_SINGLE' => array(1 => "--"),
+    'COMMENT_MULTI' => array('--[[' => ']]'),
+    'COMMENT_REGEXP' => array(2 => '/\[(=*)\[.*?\]\1\]/s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"]#i",
+        //Octal Char Specs
+        2 => "#\\\\\\d{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI | GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'break','do','else','elseif','end','for','function','if',
+            'local','repeat','return','then','until','while'
+            ),
+        2 => array(
+            'and','in','not','or'
+            ),
+        3 => array(
+            '_VERSION','assert','collectgarbage','dofile','error','gcinfo','loadfile','loadstring',
+            'print','tonumber','tostring','type','unpack',
+            '_ALERT','_ERRORMESSAGE','_INPUT','_PROMPT','_OUTPUT',
+            '_STDERR','_STDIN','_STDOUT','call','dostring','foreach','foreachi','getn','globals','newtype',
+            'rawget','rawset','require','sort','tinsert','tremove',
+            'abs','acos','asin','atan','atan2','ceil','cos','deg','exp',
+            'floor','format','frexp','gsub','ldexp','log','log10','max','min','mod','rad','random','randomseed',
+            'sin','sqrt','strbyte','strchar','strfind','strlen','strlower','strrep','strsub','strupper','tan',
+            'openfile','closefile','readfrom','writeto','appendto',
+            'remove','rename','flush','seek','tmpfile','tmpname','read','write',
+            'clock','date','difftime','execute','exit','getenv','setlocale','time',
+            '_G','getfenv','getmetatable','ipairs','loadlib','next','pairs','pcall',
+            'rawegal','setfenv','setmetatable','xpcall',
+            'string.byte','string.char','string.dump','string.find','string.len',
+            'string.lower','string.rep','string.sub','string.upper','string.format','string.gfind','string.gsub',
+            'table.concat','table.foreach','table.foreachi','table.getn','table.sort','table.insert','table.remove','table.setn',
+            'math.abs','math.acos','math.asin','math.atan','math.atan2','math.ceil','math.cos','math.deg','math.exp',
+            'math.floor','math.frexp','math.ldexp','math.log','math.log10','math.max','math.min','math.mod',
+            'math.pi','math.rad','math.random','math.randomseed','math.sin','math.sqrt','math.tan',
+            'coroutine.create','coroutine.resume','coroutine.status',
+            'coroutine.wrap','coroutine.yield',
+            'io.close','io.flush','io.input','io.lines','io.open','io.output','io.read','io.tmpfile','io.type','io.write',
+            'io.stdin','io.stdout','io.stderr',
+            'os.clock','os.date','os.difftime','os.execute','os.exit','os.getenv','os.remove','os.rename',
+            'os.setlocale','os.time','os.tmpname',
+            'string','table','math','coroutine','io','os','debug'
+            ),
+        4 => array(
+            'nil', 'false', 'true'
+            ),
+        5 => array(
+            'Nil', 'Boolean', 'Number', 'String', 'Userdata', 'Thread', 'Table'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '/', '%', '^', '#',
+        '==', '~=', '<=', '>=', '<', '>', '=',
+        '(', ')', '{', '}', '[', ']',
+        ';', ':', ',', '.', '..', '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #aa9900; font-weight: bold;',
+            2 => 'color: #aa9900; font-weight: bold;',
+            3 => 'color: #0000aa;',
+            4 => 'color: #aa9900;',
+            5 => 'color: #aa9900;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #ff0000;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff6666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #aa9900;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/m68k.php b/vendor/easybook/geshi/geshi/m68k.php
new file mode 100755
index 000000000..983c288ec
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/m68k.php
@@ -0,0 +1,141 @@
+<?php
+/*************************************************************************************
+ * m68k.php
+ * --------
+ * Author: Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2007 Benny Baumann (http://www.omorphia.de/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/02/06
+ *
+ * Motorola 68000 Assembler language file for GeSHi.
+ *
+ * Syntax definition as commonly used by the motorola documentation for the
+ * MC68HC908GP32 Microcontroller (and maybe others).
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2007/06/02 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2007/06/02)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Motorola 68000 Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'adc','add','ais','aix','and','asl','asr','bcc','bclr','bcs','beq',
+            'bge','bgt','bhcc','bhcs','bhi','bhs','bih','bil','bit','ble','blo',
+            'bls','blt','bmc','bmi','bms','bne','bpl','bra','brclr','brn',
+            'brset','bset','bsr','cbeq','clc','cli','clr','cmp','com','cphx',
+            'cpx','daa','dbnz','dec','div','eor','inc','jmp','jsr','lda','ldhx',
+            'ldx','lsl','lsr','mov','mul','neg','nop','nsa','ora','psha','pshh',
+            'pshx','pula','pulh','pulx','rol','ror','rsp','rti','rts','sbc',
+            'sec','sei','sta','sthx','stop','stx','sub','swi','tap','tax','tpa',
+            'tst','tsx','txa','txs','wait'
+        ),
+        /*registers*/
+        2 => array(
+            'a','h','x',
+            'hx','sp'
+            ),
+        /*Directive*/
+        3 => array(
+            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
+            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight:bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #dd22dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #22bbff;',
+            1 => 'color: #22bbff;',
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '#?0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '\%[01]{1,64}[bB]',
+        //Labels
+        2 => '^[_a-zA-Z][_a-zA-Z0-9]*?\:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
diff --git a/vendor/easybook/geshi/geshi/magiksf.php b/vendor/easybook/geshi/geshi/magiksf.php
new file mode 100755
index 000000000..612e1603e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/magiksf.php
@@ -0,0 +1,193 @@
+<?php
+/*************************************************************************************
+ * magiksf.php
+ * --------
+ * Author: Sjoerd van Leent (svanleent@gmail.com)
+ * Copyright: (c) 2010 Sjoerd van Leent
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/02/15
+ *
+ * MagikSF language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/02/22 (1.0.0.2)
+ *   - Symbols also accept the ! and ? characters properly
+ *   - Labels (identifiers starting with !) are also coloured
+ * 2010/02/17 (1.0.0.1)
+ *   -  Parsing out symbols better
+ *   -  Add package identifiers
+ * 2010/02/15 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'ESCAPE_CHAR' => null,
+    'LANG_NAME' => 'MagikSF',
+    'COMMENT_SINGLE' => array(1 => '##', 2 => '#%', 3 => '#'),
+    'COMMENT_MULTI' => array("_pragma(" => ")"),
+    //Multiline-continued single-line comments
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '_block', '_endblock', '_proc', '_endproc', '_loop', '_endloop',
+            '_method', '_endmethod',
+            '_protect', '_endprotect', '_protection', '_locking',
+            '_continue',
+            ),
+        2 => array(
+            '_self', '_thisthread', '_pragma', '_private', '_abstract',
+            '_local', '_global', '_dynamic', '_package', '_constant',
+            '_import', '_iter', '_lock', '_optional', '_recursive', '_super'
+            ),
+        3 => array(
+            '_if', '_endif', '_then', '_else', '_elif', '_orif', '_andif', '_for', '_over',
+            '_try', '_endtry', '_when', '_throw', '_catch', '_endcatch', '_handling',
+            '_finally', '_loopbody', '_return', '_leave', '_with'
+            ),
+        4 => array(
+            '_false', '_true', '_maybe', '_unset', '_no_way'
+            ),
+        5 => array(
+            '_mod', '_div', '_or', '_and', '_cf', '_is', '_isnt', '_not', '_gather', '_scatter',
+            '_allresults', '_clone', '_xor'
+            ),
+        6 => array(
+            'def_slotted_exemplar', 'write_string', 'write', 'condition',
+            'record_transaction', 'gis_program_manager', 'perform', 'define_shared_constant',
+            'property_list', 'rope', 'def_property', 'def_mixin'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '**',
+        '=', '<', '>', '<<', '>>',
+        ',', '$',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #ff3f3f;',
+            3 => 'color: #3f7f3f; font-weight: bold;',
+            4 => 'color: #cc66cc;',
+            5 => 'color: #ff3fff; font-weight: bold;',
+            6 => 'font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #339933; font-weight: bold;',
+            2 => 'color: #993333;',
+            3 => 'color: #339933;',
+            'MULTI' => 'color: #7f7f7f; font-style: italic',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #ff3f3f;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #ff3f3f;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #3f3fff;',
+            2 => 'color: #3f3fff;',
+            3 => 'color: #cc66cc;',
+            4 => 'color: #7f3f7f; font-style: italic;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        1 => array(
+            GESHI_SEARCH => '\b[a-zA-Z0-9_]+:', // package identifiers
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => ':(?:[a-zA-Z0-9!?_]+|(?:[<pipe>].*?[<pipe>]))*', //symbols
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '%space|%tab|%newline|%.', //characters
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '@(?:[a-zA-Z0-9!?_]+|(?:[<pipe>].*?[<pipe>]))*', //symbols
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/make.php b/vendor/easybook/geshi/geshi/make.php
new file mode 100755
index 000000000..885fa1765
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/make.php
@@ -0,0 +1,151 @@
+<?php
+/*************************************************************************************
+ * make.php
+ * --------
+ * Author: Neil Bird <phoenix@fnxweb.com>
+ * Copyright: (c) 2008 Neil Bird
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/08/26
+ *
+ * make language file for GeSHi.
+ *
+ * (GNU make specific)
+ *
+ * CHANGES
+ * -------
+ * 2008/09/05 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GNU make',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_REGEXP' => array(
+        //Escaped String Starters
+        2 => "/\\\\['\"]/siU"
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            // core
+            'ifeq', 'else', 'endif', 'ifneq', 'ifdef', 'ifndef',
+            'include', 'vpath', 'export', 'unexport', 'override',
+            'info', 'warning', 'error'
+            ),
+        2 => array(
+            // macros, literals
+            '.SUFFIXES', '.PHONY', '.DEFAULT', '.PRECIOUS', '.IGNORE', '.SILENT', '.EXPORT_ALL_VARIABLES', '.KEEP_STATE',
+            '.LIBPATTERNS', '.NOTPARALLEL', '.DELETE_ON_ERROR', '.INTERMEDIATE', '.POSIX', '.SECONDARY'
+            ),
+        /*
+        3 => array(
+            // funcs - see regex
+            //'subst', 'addprefix', 'addsuffix', 'basename', 'call', 'dir', 'error', 'eval', 'filter-out', 'filter',
+            //'findstring', 'firstword', 'foreach', 'if', 'join', 'notdir', 'origin', 'patsubst', 'shell', 'sort', 'strip',
+            //'suffix', 'warning', 'wildcard', 'word', 'wordlist', 'words'
+            )*/
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '!', '@', '%', '&', '|', '/',
+        '<', '>',
+        '=', '-', '+', '*',
+        '.', ':', ',', ';',
+        '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        //3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #666622; font-weight: bold;',
+            2 => 'color: #990000;',
+            //3 => 'color: #000000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #339900; font-style: italic;',
+            2 => 'color: #000099; font-weight: bold;',
+            'MULTI' => ''
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(  # keep same as symbols so as to make ${} and $() equiv.
+            0 => 'color: #004400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #CC2200;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC2200;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #004400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088; font-weight: bold;',
+            1 => 'color: #0000CC; font-weight: bold;',
+            2 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(),
+        'METHODS' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        //3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        //Simple variables
+        0 => "\\$(?:[^{(&]|&(?:amp|lt|gt);)",
+        //Complex variables/functions [built-ins]
+        1 => array(
+            GESHI_SEARCH => '(\\$[({])(subst|addprefix|addsuffix|basename|call|dir|error|eval|filter-out|filter,|findstring|firstword|foreach|if|join|notdir|origin|patsubst|shell|sort|strip,|suffix|warning|wildcard|word|wordlist|words)([ })])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+            //Complex variables/functions [others]
+        2 => array(
+            GESHI_SEARCH => '(\\$[({])([A-Za-z_][A-Za-z_0-9]*)([ })])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 8
+// vim: set sw=4 sts=4 :
+);
+?>
diff --git a/vendor/easybook/geshi/geshi/mapbasic.php b/vendor/easybook/geshi/geshi/mapbasic.php
new file mode 100755
index 000000000..8859c4831
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/mapbasic.php
@@ -0,0 +1,908 @@
+<?php
+/*************************************************************************************
+ * mapbasic.php
+ * ------
+ * Author: Tomasz Berus (t.berus@gisodkuchni.pl)
+ * Copyright: (c) 2009 Tomasz Berus (http://sourceforge.net/projects/mbsyntax/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/11/25
+ *
+ * MapBasic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/09/17 (1.0.1)
+ *  -  Replaced all tabs with spaces
+ *  -  Fixed 'URLS' array
+ * 2008/11/25 (1.0.0)
+ *  -  First Release (MapBasic v9.5)
+ *
+ * TODO (updated 2008/11/25)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MapBasic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+/*
+        1 - Statements + Clauses + Data Types + Logical Operators, Geographical Operators + SQL
+        2 - Special Procedures
+        3 - Functions
+        4 - Constants
+        5 - Extended keywords (case sensitive)
+*/
+        1 => array(
+            'Add', 'Alias', 'All', 'Alter', 'And', 'Any', 'Application', 'Arc',
+            'Area', 'As', 'AutoLabel', 'Bar', 'Beep', 'Begin', 'Bind',
+            'Browse', 'Brush', 'BrushPicker', 'Button', 'ButtonPad',
+            'ButtonPads', 'BY', 'Call', 'CancelButton', 'Cartographic', 'Case',
+            'CharSet', 'Check', 'CheckBox', 'Clean', 'Close', 'Collection',
+            'Column', 'Combine', 'Command', 'Commit', 'Connection',
+            'ConnectionNumber', 'Contains', 'Continue', 'Control', 'CoordSys',
+            'Create', 'Cutter', 'Date', 'Datum', 'DDEExecute', 'DDEPoke',
+            'DDETerminate', 'DDETerminateAll', 'Declare', 'Default', 'Define',
+            'Delete', 'Dialog', 'Digitizer', 'Dim', 'Disaggregate',
+            'Disconnect', 'Distance', 'Do', 'Document', 'DocumentWindow',
+            'Drag', 'Drop', 'EditText', 'Ellipse', 'Enclose', 'End', 'Entire',
+            'Entirely', 'Erase', 'Error', 'Event', 'Exit', 'Export',
+            'Farthest', 'Fetch', 'File', 'Find', 'Float', 'FME', 'Font',
+            'FontPicker', 'For', 'Format', 'Frame', 'From', 'Function',
+            'Geocode', 'Get', 'Global', 'Goto', 'Graph', 'Grid', 'GROUP',
+            'GroupBox', 'Handler', 'If', 'Import', 'In', 'Include', 'Index',
+            'Info', 'Input', 'Insert', 'Integer', 'Intersect', 'Intersects',
+            'INTO', 'Isogram', 'Item', 'Kill', 'Layout', 'Legend', 'Line',
+            'Link', 'ListBox', 'Logical', 'Loop', 'Map', 'Map3D', 'MapInfo',
+            'MapInfoDialog', 'Menu', 'Merge', 'Metadata', 'Method', 'Mod',
+            'Move', 'MultiListBox', 'MultiPoint', 'MWS', 'Nearest', 'Next',
+            'NOSELECT', 'Not', 'Note', 'Object', 'Objects', 'Offset',
+            'OKButton', 'OnError', 'Open', 'Or', 'ORDER', 'Overlay', 'Pack',
+            'Paper', 'Part', 'Partly', 'Pen', 'PenPicker', 'Pline', 'Point',
+            'PopupMenu', 'Preserve', 'Print', 'PrintWin', 'PrismMap',
+            'Processing', 'Program', 'ProgressBar', 'ProgressBars', 'Put',
+            'RadioGroup', 'Randomize', 'Ranges', 'Rect', 'ReDim',
+            'Redistricter', 'Refresh', 'Region', 'Register', 'Relief',
+            'Reload', 'Remove', 'Rename', 'Report', 'Reproject', 'Resolution',
+            'Resume', 'Rollback', 'RoundRect', 'RowID', 'Run', 'Save', 'Seek',
+            'Select', 'Selection', 'Server', 'Set', 'Shade', 'SmallInt',
+            'Snap', 'Split', 'StaticText', 'StatusBar', 'Stop', 'String',
+            'Style', 'Styles', 'Sub', 'Symbol', 'SymbolPicker', 'Symbols',
+            'Table', 'Target', 'Terminate', 'Text', 'Then', 'Threshold',
+            'Timeout', 'To', 'Transaction', 'Transform', 'Type', 'UnDim',
+            'Units', 'Unlink', 'Update', 'Using', 'VALUES', 'Version',
+            'Versioning', 'Wend', 'WFS', 'WHERE', 'While', 'Window', 'Within',
+            'Workspace', 'Write'
+            ),
+        2 => array(
+            'EndHandler', 'ForegroundTaskSwitchHandler', 'Main',
+            'RemoteMapGenHandler', 'RemoteMsgHandler', 'SelChangedHandler',
+            'ToolHandler', 'WinChangedHandler', 'WinClosedHandler',
+            'WinFocusChangedHandler'
+            ),
+        3 => array(
+            'Abs', 'Acos', 'ApplicationDirectory$', 'AreaOverlap', 'Asc',
+            'Asin', 'Ask', 'Atn', 'Avg', 'Buffer', 'ButtonPadInfo',
+            'CartesianArea', 'CartesianBuffer', 'CartesianConnectObjects',
+            'CartesianDistance', 'CartesianObjectDistance',
+            'CartesianObjectLen', 'CartesianOffset', 'CartesianOffsetXY',
+            'CartesianPerimeter', 'Centroid', 'CentroidX', 'CentroidY',
+            'ChooseProjection$', 'Chr$', 'ColumnInfo', 'CommandInfo',
+            'ConnectObjects', 'ControlPointInfo', 'ConvertToPline',
+            'ConvertToRegion', 'ConvexHull', 'CoordSysName$', 'Cos', 'Count',
+            'CreateCircle', 'CreateLine', 'CreatePoint', 'CreateText',
+            'CurDate', 'CurrentBorderPen', 'CurrentBrush', 'CurrentFont',
+            'CurrentLinePen', 'CurrentPen', 'CurrentSymbol', 'DateWindow',
+            'Day', 'DDEInitiate', 'DDERequest$', 'DeformatNumber$', 'EOF',
+            'EOT', 'EPSGToCoordSysString$', 'Err', 'Error$', 'Exp',
+            'ExtractNodes', 'FileAttr', 'FileExists', 'FileOpenDlg',
+            'FileSaveAsDlg', 'Fix', 'Format$', 'FormatDate$', 'FormatNumber$',
+            'FrontWindow', 'GeocodeInfo', 'GetFolderPath$', 'GetGridCellValue',
+            'GetMetadata$', 'GetSeamlessSheet', 'GridTableInfo',
+            'HomeDirectory$', 'InStr', 'Int', 'IntersectNodes',
+            'IsGridCellNull', 'IsogramInfo', 'IsPenWidthPixels',
+            'LabelFindByID', 'LabelFindFirst', 'LabelFindNext', 'LabelInfo',
+            'LayerInfo', 'LCase$', 'Left$', 'LegendFrameInfo', 'LegendInfo',
+            'LegendStyleInfo', 'Len', 'Like', 'LocateFile$', 'LOF', 'Log',
+            'LTrim$', 'MakeBrush', 'MakeCustomSymbol', 'MakeFont',
+            'MakeFontSymbol', 'MakePen', 'MakeSymbol', 'Map3DInfo',
+            'MapperInfo', 'Max', 'Maximum', 'MBR', 'MenuItemInfoByHandler',
+            'MenuItemInfoByID', 'MGRSToPoint', 'MICloseContent',
+            'MICloseFtpConnection', 'MICloseFtpFileFind',
+            'MICloseHttpConnection', 'MICloseHttpFile', 'MICloseSession',
+            'MICreateSession', 'MICreateSessionFull', 'Mid$', 'MidByte$',
+            'MIErrorDlg', 'MIFindFtpFile', 'MIFindNextFtpFile', 'MIGetContent',
+            'MIGetContentBuffer', 'MIGetContentLen', 'MIGetContentString',
+            'MIGetContentToFile', 'MIGetContentType',
+            'MIGetCurrentFtpDirectory', 'MIGetErrorCode', 'MIGetErrorMessage',
+            'MIGetFileURL', 'MIGetFtpConnection', 'MIGetFtpFile',
+            'MIGetFtpFileFind', 'MIGetFtpFileName', 'MIGetHttpConnection',
+            'MIIsFtpDirectory', 'MIIsFtpDots', 'Min', 'Minimum',
+            'MIOpenRequest', 'MIOpenRequestFull', 'MIParseURL', 'MIPutFtpFile',
+            'MIQueryInfo', 'MIQueryInfoStatusCode', 'MISaveContent',
+            'MISendRequest', 'MISendSimpleRequest', 'MISetCurrentFtpDirectory',
+            'MISetSessionTimeout', 'MIXmlAttributeListDestroy',
+            'MIXmlDocumentCreate', 'MIXmlDocumentDestroy',
+            'MIXmlDocumentGetNamespaces', 'MIXmlDocumentGetRootNode',
+            'MIXmlDocumentLoad', 'MIXmlDocumentLoadXML',
+            'MIXmlDocumentLoadXMLString', 'MIXmlDocumentSetProperty',
+            'MIXmlGetAttributeList', 'MIXmlGetChildList',
+            'MIXmlGetNextAttribute', 'MIXmlGetNextNode', 'MIXmlNodeDestroy',
+            'MIXmlNodeGetAttributeValue', 'MIXmlNodeGetFirstChild',
+            'MIXmlNodeGetName', 'MIXmlNodeGetParent', 'MIXmlNodeGetText',
+            'MIXmlNodeGetValue', 'MIXmlNodeListDestroy', 'MIXmlSCDestroy',
+            'MIXmlSCGetLength', 'MIXmlSCGetNamespace', 'MIXmlSelectNodes',
+            'MIXmlSelectSingleNode', 'Month', 'NumAllWindows', 'NumberToDate',
+            'NumCols', 'NumTables', 'NumWindows', 'ObjectDistance',
+            'ObjectGeography', 'ObjectInfo', 'ObjectLen', 'ObjectNodeHasM',
+            'ObjectNodeHasZ', 'ObjectNodeM', 'ObjectNodeX', 'ObjectNodeY',
+            'ObjectNodeZ', 'OffsetXY', 'Overlap', 'OverlayNodes',
+            'PathToDirectory$', 'PathToFileName$', 'PathToTableName$',
+            'PenWidthToPoints', 'Perimeter', 'PointsToPenWidth',
+            'PointToMGRS$', 'PrismMapInfo', 'ProgramDirectory$', 'Proper$',
+            'ProportionOverlap', 'RasterTableInfo', 'ReadControlValue',
+            'RegionInfo', 'RemoteQueryHandler', 'RGB', 'Right$', 'Rnd',
+            'Rotate', 'RotateAtPoint', 'Round', 'RTrim$', 'SearchInfo',
+            'SearchPoint', 'SearchRect', 'SelectionInfo', 'Server_ColumnInfo',
+            'Server_Connect', 'Server_ConnectInfo', 'Server_DriverInfo',
+            'Server_EOT', 'Server_Execute', 'Server_GetODBCHConn',
+            'Server_GetODBCHStmt', 'Server_NumCols', 'Server_NumDrivers',
+            'SessionInfo', 'Sgn', 'Sin', 'Space$', 'SphericalArea',
+            'SphericalConnectObjects', 'SphericalDistance',
+            'SphericalObjectDistance', 'SphericalObjectLen', 'SphericalOffset',
+            'SphericalOffsetXY', 'SphericalPerimeter', 'Sqr', 'Str$',
+            'String$', 'StringCompare', 'StringCompareIntl', 'StringToDate',
+            'StyleAttr', 'Sum', 'SystemInfo', 'TableInfo', 'Tan',
+            'TempFileName$', 'TextSize', 'Time', 'Timer', 'TriggerControl',
+            'TrueFileName$', 'UBound', 'UCase$', 'UnitAbbr$', 'UnitName$',
+            'Val', 'Weekday', 'WindowID', 'WindowInfo', 'WtAvg', 'Year'
+            ),
+        4 => array(
+            'BLACK', 'BLUE', 'BRUSH_BACKCOLOR', 'BRUSH_FORECOLOR',
+            'BRUSH_PATTERN', 'BTNPAD_INFO_FLOATING', 'BTNPAD_INFO_NBTNS',
+            'BTNPAD_INFO_WIDTH', 'BTNPAD_INFO_WINID', 'BTNPAD_INFO_X',
+            'BTNPAD_INFO_Y', 'CLS', 'CMD_INFO_CTRL', 'CMD_INFO_CUSTOM_OBJ',
+            'CMD_INFO_DLG_DBL', 'CMD_INFO_DLG_OK', 'CMD_INFO_EDIT_ASK',
+            'CMD_INFO_EDIT_DISCARD', 'CMD_INFO_EDIT_SAVE',
+            'CMD_INFO_EDIT_STATUS', 'CMD_INFO_EDIT_TABLE', 'CMD_INFO_FIND_RC',
+            'CMD_INFO_FIND_ROWID', 'CMD_INFO_HL_FILE_NAME',
+            'CMD_INFO_HL_LAYER_ID', 'CMD_INFO_HL_ROWID',
+            'CMD_INFO_HL_TABLE_NAME', 'CMD_INFO_HL_WINDOW_ID',
+            'CMD_INFO_INTERRUPT', 'CMD_INFO_MENUITEM', 'CMD_INFO_MSG',
+            'CMD_INFO_ROWID', 'CMD_INFO_SELTYPE', 'CMD_INFO_SHIFT',
+            'CMD_INFO_STATUS', 'CMD_INFO_TASK_SWITCH', 'CMD_INFO_TOOLBTN',
+            'CMD_INFO_WIN', 'CMD_INFO_X', 'CMD_INFO_X2', 'CMD_INFO_XCMD',
+            'CMD_INFO_Y', 'CMD_INFO_Y2', 'COL_INFO_DECPLACES',
+            'COL_INFO_EDITABLE', 'COL_INFO_INDEXED', 'COL_INFO_NAME',
+            'COL_INFO_NUM', 'COL_INFO_TYPE', 'COL_INFO_WIDTH', 'COL_TYPE_CHAR',
+            'COL_TYPE_DATE', 'COL_TYPE_DATETIME', 'COL_TYPE_DECIMAL',
+            'COL_TYPE_FLOAT', 'COL_TYPE_GRAPHIC', 'COL_TYPE_INTEGER',
+            'COL_TYPE_LOGICAL', 'COL_TYPE_SMALLINT', 'COL_TYPE_TIME', 'CYAN',
+            'DATE_WIN_CURPROG', 'DATE_WIN_SESSION', 'DEG_2_RAD',
+            'DICTIONARY_ADDRESS_ONLY', 'DICTIONARY_ALL',
+            'DICTIONARY_PREFER_ADDRESS', 'DICTIONARY_PREFER_USER',
+            'DICTIONARY_USER_ONLY', 'DM_CUSTOM_CIRCLE', 'DM_CUSTOM_ELLIPSE',
+            'DM_CUSTOM_LINE', 'DM_CUSTOM_POINT', 'DM_CUSTOM_POLYGON',
+            'DM_CUSTOM_POLYLINE', 'DM_CUSTOM_RECT', 'DMPAPER_10X11',
+            'DMPAPER_10X14', 'DMPAPER_11X17', 'DMPAPER_12X11', 'DMPAPER_15X11',
+            'DMPAPER_9X11', 'DMPAPER_A_PLUS', 'DMPAPER_A2', 'DMPAPER_A3',
+            'DMPAPER_A3_EXTRA', 'DMPAPER_A3_EXTRA_TRANSVERSE',
+            'DMPAPER_A3_ROTATED', 'DMPAPER_A3_TRANSVERSE', 'DMPAPER_A4',
+            'DMPAPER_A4_EXTRA', 'DMPAPER_A4_PLUS', 'DMPAPER_A4_ROTATED',
+            'DMPAPER_A4_TRANSVERSE', 'DMPAPER_A4SMALL', 'DMPAPER_A5',
+            'DMPAPER_A5_EXTRA', 'DMPAPER_A5_ROTATED', 'DMPAPER_A5_TRANSVERSE',
+            'DMPAPER_A6', 'DMPAPER_A6_ROTATED', 'DMPAPER_B_PLUS', 'DMPAPER_B4',
+            'DMPAPER_B4_JIS_ROTATED', 'DMPAPER_B5', 'DMPAPER_B5_EXTRA',
+            'DMPAPER_B5_JIS_ROTATED', 'DMPAPER_B5_TRANSVERSE',
+            'DMPAPER_B6_JIS', 'DMPAPER_B6_JIS_ROTATED', 'DMPAPER_CSHEET',
+            'DMPAPER_DBL_JAPANESE_POSTCARD',
+            'DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED', 'DMPAPER_DSHEET',
+            'DMPAPER_ENV_10', 'DMPAPER_ENV_11', 'DMPAPER_ENV_12',
+            'DMPAPER_ENV_14', 'DMPAPER_ENV_9', 'DMPAPER_ENV_B4',
+            'DMPAPER_ENV_B5', 'DMPAPER_ENV_B6', 'DMPAPER_ENV_C3',
+            'DMPAPER_ENV_C4', 'DMPAPER_ENV_C5', 'DMPAPER_ENV_C6',
+            'DMPAPER_ENV_C65', 'DMPAPER_ENV_DL', 'DMPAPER_ENV_INVITE',
+            'DMPAPER_ENV_ITALY', 'DMPAPER_ENV_MONARCH', 'DMPAPER_ENV_PERSONAL',
+            'DMPAPER_ESHEET', 'DMPAPER_EXECUTIVE',
+            'DMPAPER_FANFOLD_LGL_GERMAN', 'DMPAPER_FANFOLD_STD_GERMAN',
+            'DMPAPER_FANFOLD_US', 'DMPAPER_FIRST', 'DMPAPER_FOLIO',
+            'DMPAPER_ISO_B4', 'DMPAPER_JAPANESE_POSTCARD',
+            'DMPAPER_JAPANESE_POSTCARD_ROTATED', 'DMPAPER_JENV_CHOU3',
+            'DMPAPER_JENV_CHOU3_ROTATED', 'DMPAPER_JENV_CHOU4',
+            'DMPAPER_JENV_CHOU4_ROTATED', 'DMPAPER_JENV_KAKU2',
+            'DMPAPER_JENV_KAKU2_ROTATED', 'DMPAPER_JENV_KAKU3',
+            'DMPAPER_JENV_KAKU3_ROTATED', 'DMPAPER_JENV_YOU4',
+            'DMPAPER_JENV_YOU4_ROTATED', 'DMPAPER_LEDGER', 'DMPAPER_LEGAL',
+            'DMPAPER_LEGAL_EXTRA', 'DMPAPER_LETTER', 'DMPAPER_LETTER_EXTRA',
+            'DMPAPER_LETTER_EXTRA_TRANSVERSE', 'DMPAPER_LETTER_PLUS',
+            'DMPAPER_LETTER_ROTATED', 'DMPAPER_LETTER_TRANSVERSE',
+            'DMPAPER_LETTERSMALL', 'DMPAPER_NOTE', 'DMPAPER_P16K',
+            'DMPAPER_P16K_ROTATED', 'DMPAPER_P32K', 'DMPAPER_P32K_ROTATED',
+            'DMPAPER_P32KBIG', 'DMPAPER_P32KBIG_ROTATED', 'DMPAPER_PENV_1',
+            'DMPAPER_PENV_1_ROTATED', 'DMPAPER_PENV_10',
+            'DMPAPER_PENV_10_ROTATED', 'DMPAPER_PENV_2',
+            'DMPAPER_PENV_2_ROTATED', 'DMPAPER_PENV_3',
+            'DMPAPER_PENV_3_ROTATED', 'DMPAPER_PENV_4',
+            'DMPAPER_PENV_4_ROTATED', 'DMPAPER_PENV_5',
+            'DMPAPER_PENV_5_ROTATED', 'DMPAPER_PENV_6',
+            'DMPAPER_PENV_6_ROTATED', 'DMPAPER_PENV_7',
+            'DMPAPER_PENV_7_ROTATED', 'DMPAPER_PENV_8',
+            'DMPAPER_PENV_8_ROTATED', 'DMPAPER_PENV_9',
+            'DMPAPER_PENV_9_ROTATED', 'DMPAPER_QUARTO', 'DMPAPER_RESERVED_48',
+            'DMPAPER_RESERVED_49', 'DMPAPER_STATEMENT', 'DMPAPER_TABLOID',
+            'DMPAPER_TABLOID_EXTRA', 'DMPAPER_USER', 'ERR_BAD_WINDOW',
+            'ERR_BAD_WINDOW_NUM', 'ERR_CANT_ACCESS_FILE',
+            'ERR_CANT_INITIATE_LINK', 'ERR_CMD_NOT_SUPPORTED',
+            'ERR_FCN_ARG_RANGE', 'ERR_FCN_INVALID_FMT',
+            'ERR_FCN_OBJ_FETCH_FAILED', 'ERR_FILEMGR_NOTOPEN',
+            'ERR_FP_MATH_LIB_DOMAIN', 'ERR_FP_MATH_LIB_RANGE',
+            'ERR_INVALID_CHANNEL', 'ERR_INVALID_READ_CONTROL',
+            'ERR_INVALID_TRIG_CONTROL', 'ERR_NO_FIELD',
+            'ERR_NO_RESPONSE_FROM_APP', 'ERR_NULL_SELECTION',
+            'ERR_PROCESS_FAILED_IN_APP', 'ERR_TABLE_NOT_FOUND',
+            'ERR_WANT_MAPPER_WIN', 'FALSE', 'FILE_ATTR_FILESIZE',
+            'FILE_ATTR_MODE', 'FILTER_ALL_DIRECTIONS_1',
+            'FILTER_ALL_DIRECTIONS_2', 'FILTER_DIAGONALLY',
+            'FILTER_HORIZONTALLY', 'FILTER_VERTICALLY',
+            'FILTER_VERTICALLY_AND_HORIZONTALLY', 'FOLDER_APPDATA',
+            'FOLDER_COMMON_APPDATA', 'FOLDER_COMMON_DOCS',
+            'FOLDER_LOCAL_APPDATA', 'FOLDER_MI_APPDATA',
+            'FOLDER_MI_COMMON_APPDATA', 'FOLDER_MI_LOCAL_APPDATA',
+            'FOLDER_MI_PREFERENCE', 'FOLDER_MYDOCS', 'FOLDER_MYPICS',
+            'FONT_BACKCOLOR', 'FONT_FORECOLOR', 'FONT_NAME', 'FONT_POINTSIZE',
+            'FONT_STYLE', 'FRAME_INFO_BORDER_PEN', 'FRAME_INFO_COLUMN',
+            'FRAME_INFO_HEIGHT', 'FRAME_INFO_LABEL', 'FRAME_INFO_MAP_LAYER_ID',
+            'FRAME_INFO_NUM_STYLES', 'FRAME_INFO_POS_X', 'FRAME_INFO_POS_Y',
+            'FRAME_INFO_REFRESHABLE', 'FRAME_INFO_SUBTITLE',
+            'FRAME_INFO_SUBTITLE_FONT', 'FRAME_INFO_TITLE',
+            'FRAME_INFO_TITLE_FONT', 'FRAME_INFO_TYPE', 'FRAME_INFO_VISIBLE',
+            'FRAME_INFO_WIDTH', 'FRAME_TYPE_STYLE', 'FRAME_TYPE_THEME',
+            'GEO_CONTROL_POINT_X', 'GEO_CONTROL_POINT_Y', 'GEOCODE_BATCH_SIZE',
+            'GEOCODE_COUNT_GEOCODED', 'GEOCODE_COUNT_NOTGEOCODED',
+            'GEOCODE_COUNTRY_SUBDIVISION', 'GEOCODE_COUNTRY_SUBDIVISION2',
+            'GEOCODE_DICTIONARY', 'GEOCODE_FALLBACK_GEOGRAPHIC',
+            'GEOCODE_FALLBACK_POSTAL', 'GEOCODE_MAX_BATCH_SIZE',
+            'GEOCODE_MIXED_CASE', 'GEOCODE_MUNICIPALITY',
+            'GEOCODE_MUNICIPALITY2', 'GEOCODE_OFFSET_CENTER',
+            'GEOCODE_OFFSET_CENTER_UNITS', 'GEOCODE_OFFSET_END',
+            'GEOCODE_OFFSET_END_UNITS', 'GEOCODE_PASSTHROUGH',
+            'GEOCODE_POSTAL_CODE', 'GEOCODE_RESULT_MARK_MULTIPLE',
+            'GEOCODE_STREET_NAME', 'GEOCODE_STREET_NUMBER',
+            'GEOCODE_UNABLE_TO_CONVERT_DATA', 'GREEN',
+            'GRID_TAB_INFO_HAS_HILLSHADE', 'GRID_TAB_INFO_MAX_VALUE',
+            'GRID_TAB_INFO_MIN_VALUE', 'HOTLINK_INFO_ENABLED',
+            'HOTLINK_INFO_EXPR', 'HOTLINK_INFO_MODE', 'HOTLINK_INFO_RELATIVE',
+            'HOTLINK_MODE_BOTH', 'HOTLINK_MODE_LABEL', 'HOTLINK_MODE_OBJ',
+            'IMAGE_CLASS_BILEVEL', 'IMAGE_CLASS_GREYSCALE',
+            'IMAGE_CLASS_PALETTE', 'IMAGE_CLASS_RGB', 'IMAGE_TYPE_GRID',
+            'IMAGE_TYPE_RASTER', 'INCL_ALL', 'INCL_COMMON', 'INCL_CROSSINGS',
+            'ISOGRAM_AMBIENT_SPEED_DIST_UNIT',
+            'ISOGRAM_AMBIENT_SPEED_TIME_UNIT', 'ISOGRAM_BANDING',
+            'ISOGRAM_BATCH_SIZE', 'ISOGRAM_DEFAULT_AMBIENT_SPEED',
+            'ISOGRAM_MAJOR_POLYGON_ONLY', 'ISOGRAM_MAJOR_ROADS_ONLY',
+            'ISOGRAM_MAX_BANDS', 'ISOGRAM_MAX_BATCH_SIZE',
+            'ISOGRAM_MAX_DISTANCE', 'ISOGRAM_MAX_DISTANCE_UNITS',
+            'ISOGRAM_MAX_OFFROAD_DIST', 'ISOGRAM_MAX_OFFROAD_DIST_UNITS',
+            'ISOGRAM_MAX_TIME', 'ISOGRAM_MAX_TIME_UNITS',
+            'ISOGRAM_POINTS_ONLY', 'ISOGRAM_PROPAGATION_FACTOR',
+            'ISOGRAM_RECORDS_INSERTED', 'ISOGRAM_RECORDS_NOTINSERTED',
+            'ISOGRAM_RETURN_HOLES', 'ISOGRAM_SIMPLIFICATION_FACTOR',
+            'LABEL_INFO_ANCHORX', 'LABEL_INFO_ANCHORY', 'LABEL_INFO_DRAWN',
+            'LABEL_INFO_EDIT', 'LABEL_INFO_EDIT_ANCHOR',
+            'LABEL_INFO_EDIT_ANGLE', 'LABEL_INFO_EDIT_FONT',
+            'LABEL_INFO_EDIT_OFFSET', 'LABEL_INFO_EDIT_PEN',
+            'LABEL_INFO_EDIT_POSITION', 'LABEL_INFO_EDIT_TEXT',
+            'LABEL_INFO_EDIT_TEXTARROW', 'LABEL_INFO_EDIT_TEXTLINE',
+            'LABEL_INFO_EDIT_VISIBILITY', 'LABEL_INFO_OBJECT',
+            'LABEL_INFO_OFFSET', 'LABEL_INFO_ORIENTATION',
+            'LABEL_INFO_POSITION', 'LABEL_INFO_ROWID', 'LABEL_INFO_SELECT',
+            'LABEL_INFO_TABLE', 'LAYER_INFO_ARROWS', 'LAYER_INFO_CENTROIDS',
+            'LAYER_INFO_COSMETIC', 'LAYER_INFO_DISPLAY',
+            'LAYER_INFO_DISPLAY_GLOBAL', 'LAYER_INFO_DISPLAY_GRAPHIC',
+            'LAYER_INFO_DISPLAY_OFF', 'LAYER_INFO_DISPLAY_VALUE',
+            'LAYER_INFO_EDITABLE', 'LAYER_INFO_HOTLINK_COUNT',
+            'LAYER_INFO_HOTLINK_EXPR', 'LAYER_INFO_HOTLINK_MODE',
+            'LAYER_INFO_HOTLINK_RELATIVE', 'LAYER_INFO_LABEL_ALPHA',
+            'LAYER_INFO_LABEL_ORIENT_CURVED',
+            'LAYER_INFO_LABEL_ORIENT_HORIZONTAL',
+            'LAYER_INFO_LABEL_ORIENT_PARALLEL', 'LAYER_INFO_LAYER_ALPHA',
+            'LAYER_INFO_LAYER_TRANSLUCENCY', 'LAYER_INFO_LBL_AUTODISPLAY',
+            'LAYER_INFO_LBL_CURFONT', 'LAYER_INFO_LBL_DUPLICATES',
+            'LAYER_INFO_LBL_EXPR', 'LAYER_INFO_LBL_FONT', 'LAYER_INFO_LBL_LT',
+            'LAYER_INFO_LBL_LT_ARROW', 'LAYER_INFO_LBL_LT_NONE',
+            'LAYER_INFO_LBL_LT_SIMPLE', 'LAYER_INFO_LBL_MAX',
+            'LAYER_INFO_LBL_OFFSET', 'LAYER_INFO_LBL_ORIENTATION',
+            'LAYER_INFO_LBL_OVERLAP', 'LAYER_INFO_LBL_PARALLEL',
+            'LAYER_INFO_LBL_PARTIALSEGS', 'LAYER_INFO_LBL_POS',
+            'LAYER_INFO_LBL_POS_BC', 'LAYER_INFO_LBL_POS_BL',
+            'LAYER_INFO_LBL_POS_BR', 'LAYER_INFO_LBL_POS_CC',
+            'LAYER_INFO_LBL_POS_CL', 'LAYER_INFO_LBL_POS_CR',
+            'LAYER_INFO_LBL_POS_TC', 'LAYER_INFO_LBL_POS_TL',
+            'LAYER_INFO_LBL_POS_TR', 'LAYER_INFO_LBL_VIS_OFF',
+            'LAYER_INFO_LBL_VIS_ON', 'LAYER_INFO_LBL_VIS_ZOOM',
+            'LAYER_INFO_LBL_VISIBILITY', 'LAYER_INFO_LBL_ZOOM_MAX',
+            'LAYER_INFO_LBL_ZOOM_MIN', 'LAYER_INFO_NAME', 'LAYER_INFO_NODES',
+            'LAYER_INFO_OVR_BRUSH', 'LAYER_INFO_OVR_FONT',
+            'LAYER_INFO_OVR_LINE', 'LAYER_INFO_OVR_PEN',
+            'LAYER_INFO_OVR_SYMBOL', 'LAYER_INFO_PATH',
+            'LAYER_INFO_SELECTABLE', 'LAYER_INFO_TYPE',
+            'LAYER_INFO_TYPE_COSMETIC', 'LAYER_INFO_TYPE_GRID',
+            'LAYER_INFO_TYPE_IMAGE', 'LAYER_INFO_TYPE_NORMAL',
+            'LAYER_INFO_TYPE_THEMATIC', 'LAYER_INFO_TYPE_WMS',
+            'LAYER_INFO_ZOOM_LAYERED', 'LAYER_INFO_ZOOM_MAX',
+            'LAYER_INFO_ZOOM_MIN', 'LEGEND_INFO_MAP_ID',
+            'LEGEND_INFO_NUM_FRAMES', 'LEGEND_INFO_ORIENTATION',
+            'LEGEND_INFO_STYLE_SAMPLE_SIZE', 'LEGEND_STYLE_INFO_FONT',
+            'LEGEND_STYLE_INFO_OBJ', 'LEGEND_STYLE_INFO_TEXT',
+            'LOCATE_ABB_FILE', 'LOCATE_CLR_FILE', 'LOCATE_CUSTSYMB_DIR',
+            'LOCATE_DEF_WOR', 'LOCATE_FNT_FILE', 'LOCATE_GEOCODE_SERVERLIST',
+            'LOCATE_GRAPH_DIR', 'LOCATE_LAYOUT_TEMPLATE_DIR',
+            'LOCATE_MNU_FILE', 'LOCATE_PEN_FILE', 'LOCATE_PREF_FILE',
+            'LOCATE_PRJ_FILE', 'LOCATE_ROUTING_SERVERLIST',
+            'LOCATE_THMTMPLT_DIR', 'LOCATE_WFS_SERVERLIST',
+            'LOCATE_WMS_SERVERLIST', 'M_3DMAP_CLONE_VIEW',
+            'M_3DMAP_PREVIOUS_VIEW', 'M_3DMAP_PROPERTIES',
+            'M_3DMAP_REFRESH_GRID_TEXTURE', 'M_3DMAP_VIEW_ENTIRE_GRID',
+            'M_3DMAP_VIEWPOINT_CONTROL', 'M_3DMAP_WIREFRAME',
+            'M_ANALYZE_CALC_STATISTICS', 'M_ANALYZE_CUSTOMIZE_LEGEND',
+            'M_ANALYZE_FIND', 'M_ANALYZE_FIND_SELECTION',
+            'M_ANALYZE_INVERTSELECT', 'M_ANALYZE_SELECT',
+            'M_ANALYZE_SELECTALL', 'M_ANALYZE_SHADE', 'M_ANALYZE_SQLQUERY',
+            'M_ANALYZE_UNSELECT', 'M_BROWSE_EDIT', 'M_BROWSE_GRID',
+            'M_BROWSE_NEW_RECORD', 'M_BROWSE_OPTIONS', 'M_BROWSE_PICK_FIELDS',
+            'M_DBMS_OPEN_ODBC', 'M_EDIT_CLEAR', 'M_EDIT_CLEAROBJ',
+            'M_EDIT_COPY', 'M_EDIT_CUT', 'M_EDIT_GETINFO', 'M_EDIT_NEW_ROW',
+            'M_EDIT_PASTE', 'M_EDIT_PREFERENCES', 'M_EDIT_PREFERENCES_COUNTRY',
+            'M_EDIT_PREFERENCES_FILE', 'M_EDIT_PREFERENCES_IMAGE_PROC',
+            'M_EDIT_PREFERENCES_LAYOUT', 'M_EDIT_PREFERENCES_LEGEND',
+            'M_EDIT_PREFERENCES_MAP', 'M_EDIT_PREFERENCES_OUTPUT',
+            'M_EDIT_PREFERENCES_PATH', 'M_EDIT_PREFERENCES_PRINTER',
+            'M_EDIT_PREFERENCES_STYLES', 'M_EDIT_PREFERENCES_SYSTEM',
+            'M_EDIT_PREFERENCES_WEBSERVICES', 'M_EDIT_RESHAPE', 'M_EDIT_UNDO',
+            'M_FILE_ABOUT', 'M_FILE_ADD_WORKSPACE', 'M_FILE_CLOSE',
+            'M_FILE_CLOSE_ALL', 'M_FILE_CLOSE_ODBC', 'M_FILE_EXIT',
+            'M_FILE_HELP', 'M_FILE_NEW', 'M_FILE_OPEN', 'M_FILE_OPEN_ODBC',
+            'M_FILE_OPEN_ODBC_CONN', 'M_FILE_OPEN_UNIVERSAL_DATA',
+            'M_FILE_OPEN_WFS', 'M_FILE_OPEN_WMS', 'M_FILE_PAGE_SETUP',
+            'M_FILE_PRINT', 'M_FILE_PRINT_SETUP', 'M_FILE_REVERT',
+            'M_FILE_RUN', 'M_FILE_SAVE', 'M_FILE_SAVE_COPY_AS',
+            'M_FILE_SAVE_QUERY', 'M_FILE_SAVE_WINDOW_AS',
+            'M_FILE_SAVE_WORKSPACE', 'M_FORMAT_CUSTOM_COLORS',
+            'M_FORMAT_PICK_FILL', 'M_FORMAT_PICK_FONT', 'M_FORMAT_PICK_LINE',
+            'M_FORMAT_PICK_SYMBOL', 'M_GRAPH_3D_VIEWING_ANGLE',
+            'M_GRAPH_FORMATING', 'M_GRAPH_GENERAL_OPTIONS',
+            'M_GRAPH_GRID_SCALES', 'M_GRAPH_LABEL_AXIS',
+            'M_GRAPH_SAVE_AS_TEMPLATE', 'M_GRAPH_SERIES',
+            'M_GRAPH_SERIES_OPTIONS', 'M_GRAPH_TITLES', 'M_GRAPH_TYPE',
+            'M_GRAPH_VALUE_AXIS', 'M_HELP_ABOUT', 'M_HELP_CHECK_FOR_UPDATE',
+            'M_HELP_CONNECT_MIFORUM', 'M_HELP_CONTENTS',
+            'M_HELP_CONTEXTSENSITIVE', 'M_HELP_HELPMODE',
+            'M_HELP_MAPINFO_3DGRAPH_HELP', 'M_HELP_MAPINFO_CONNECT_SERVICES',
+            'M_HELP_MAPINFO_WWW', 'M_HELP_MAPINFO_WWW_STORE',
+            'M_HELP_MAPINFO_WWW_TUTORIAL', 'M_HELP_SEARCH',
+            'M_HELP_TECHSUPPORT', 'M_HELP_USE_HELP', 'M_LAYOUT_ACTUAL',
+            'M_LAYOUT_ALIGN', 'M_LAYOUT_AUTOSCROLL_ONOFF',
+            'M_LAYOUT_BRING2FRONT', 'M_LAYOUT_CHANGE_VIEW',
+            'M_LAYOUT_DISPLAYOPTIONS', 'M_LAYOUT_DROPSHADOWS',
+            'M_LAYOUT_ENTIRE', 'M_LAYOUT_LAYOUT_SIZE', 'M_LAYOUT_PREVIOUS',
+            'M_LAYOUT_SEND2BACK', 'M_LEGEND_ADD_FRAMES', 'M_LEGEND_DELETE',
+            'M_LEGEND_PROPERTIES', 'M_LEGEND_REFRESH', 'M_MAP_AUTOLABEL',
+            'M_MAP_AUTOSCROLL_ONOFF', 'M_MAP_CHANGE_VIEW',
+            'M_MAP_CLEAR_COSMETIC', 'M_MAP_CLEAR_CUSTOM_LABELS',
+            'M_MAP_CLIP_REGION_ONOFF', 'M_MAP_CLONE_MAPPER',
+            'M_MAP_CREATE_3DMAP', 'M_MAP_CREATE_LEGEND',
+            'M_MAP_CREATE_PRISMMAP', 'M_MAP_ENTIRE_LAYER',
+            'M_MAP_LAYER_CONTROL', 'M_MAP_MODIFY_THEMATIC', 'M_MAP_OPTIONS',
+            'M_MAP_PREVIOUS', 'M_MAP_PROJECTION', 'M_MAP_SAVE_COSMETIC',
+            'M_MAP_SET_CLIP_REGION', 'M_MAP_SETUNITS', 'M_MAP_SETUPDIGITIZER',
+            'M_MAP_THEMATIC', 'M_MAPBASIC_CLEAR', 'M_MAPBASIC_SAVECONTENTS',
+            'M_OBJECTS_BREAKPOLY', 'M_OBJECTS_BUFFER',
+            'M_OBJECTS_CHECK_REGIONS', 'M_OBJECTS_CLEAN',
+            'M_OBJECTS_CLEAR_TARGET', 'M_OBJECTS_COMBINE',
+            'M_OBJECTS_CONVEX_HULL', 'M_OBJECTS_CVT_PGON',
+            'M_OBJECTS_CVT_PLINE', 'M_OBJECTS_DISAGG',
+            'M_OBJECTS_DRIVE_REGION', 'M_OBJECTS_ENCLOSE', 'M_OBJECTS_ERASE',
+            'M_OBJECTS_ERASE_OUT', 'M_OBJECTS_MERGE', 'M_OBJECTS_OFFSET',
+            'M_OBJECTS_OVERLAY', 'M_OBJECTS_POLYLINE_SPLIT',
+            'M_OBJECTS_POLYLINE_SPLIT_AT_NODE', 'M_OBJECTS_RESHAPE',
+            'M_OBJECTS_ROTATE', 'M_OBJECTS_SET_TARGET', 'M_OBJECTS_SMOOTH',
+            'M_OBJECTS_SNAP', 'M_OBJECTS_SPLIT', 'M_OBJECTS_UNSMOOTH',
+            'M_OBJECTS_VORONOI', 'M_ORACLE_CREATE_WORKSPACE',
+            'M_ORACLE_DELETE_WORKSPACE', 'M_ORACLE_MERGE_PARENT',
+            'M_ORACLE_REFRESH_FROM_PARENT', 'M_ORACLE_VERSION_ENABLE_OFF',
+            'M_ORACLE_VERSION_ENABLE_ON', 'M_QUERY_CALC_STATISTICS',
+            'M_QUERY_FIND', 'M_QUERY_FIND_ADDRESS', 'M_QUERY_FIND_SELECTION',
+            'M_QUERY_FIND_SELECTION_CURRENT_MAP', 'M_QUERY_INVERTSELECT',
+            'M_QUERY_SELECT', 'M_QUERY_SELECTALL', 'M_QUERY_SQLQUERY',
+            'M_QUERY_UNSELECT', 'M_REDISTRICT_ADD', 'M_REDISTRICT_ASSIGN',
+            'M_REDISTRICT_DELETE', 'M_REDISTRICT_OPTIONS',
+            'M_REDISTRICT_TARGET', 'M_SENDMAIL_CURRENTWINDOW',
+            'M_SENDMAIL_WORKSPACE', 'M_TABLE_APPEND', 'M_TABLE_BUFFER',
+            'M_TABLE_CHANGESYMBOL', 'M_TABLE_CREATE_POINTS', 'M_TABLE_DELETE',
+            'M_TABLE_DRIVE_REGION', 'M_TABLE_EXPORT', 'M_TABLE_GEOCODE',
+            'M_TABLE_IMPORT', 'M_TABLE_MAKEMAPPABLE',
+            'M_TABLE_MERGE_USING_COLUMN', 'M_TABLE_MODIFY_STRUCTURE',
+            'M_TABLE_PACK', 'M_TABLE_RASTER_REG', 'M_TABLE_RASTER_STYLE',
+            'M_TABLE_REFRESH', 'M_TABLE_RENAME',
+            'M_TABLE_UNIVERSAL_DATA_REFRESH', 'M_TABLE_UNLINK',
+            'M_TABLE_UPDATE_COLUMN', 'M_TABLE_VORONOI', 'M_TABLE_WEB_GEOCODE',
+            'M_TABLE_WFS_PROPS', 'M_TABLE_WFS_REFRESH', 'M_TABLE_WMS_PROPS',
+            'M_TOOLS_ADD_NODE', 'M_TOOLS_ARC', 'M_TOOLS_CRYSTAL_REPORTS_NEW',
+            'M_TOOLS_CRYSTAL_REPORTS_OPEN', 'M_TOOLS_DRAGWINDOW',
+            'M_TOOLS_ELLIPSE', 'M_TOOLS_EXPAND', 'M_TOOLS_FRAME',
+            'M_TOOLS_HOTLINK', 'M_TOOLS_LABELER', 'M_TOOLS_LINE',
+            'M_TOOLS_MAPBASIC', 'M_TOOLS_PNT_QUERY', 'M_TOOLS_POINT',
+            'M_TOOLS_POLYGON', 'M_TOOLS_POLYLINE', 'M_TOOLS_RASTER_REG',
+            'M_TOOLS_RECENTER', 'M_TOOLS_RECTANGLE', 'M_TOOLS_ROUNDEDRECT',
+            'M_TOOLS_RULER', 'M_TOOLS_RUN', 'M_TOOLS_SEARCH_BOUNDARY',
+            'M_TOOLS_SEARCH_POLYGON', 'M_TOOLS_SEARCH_RADIUS',
+            'M_TOOLS_SEARCH_RECT', 'M_TOOLS_SELECTOR', 'M_TOOLS_SHRINK',
+            'M_TOOLS_TEXT', 'M_TOOLS_TOOL_MANAGER', 'M_WINDOW_ARRANGEICONS',
+            'M_WINDOW_BROWSE', 'M_WINDOW_BUTTONPAD', 'M_WINDOW_CASCADE',
+            'M_WINDOW_EXPORT_WINDOW', 'M_WINDOW_FIRST', 'M_WINDOW_GRAPH',
+            'M_WINDOW_LAYOUT', 'M_WINDOW_LEGEND', 'M_WINDOW_MAP',
+            'M_WINDOW_MAPBASIC', 'M_WINDOW_MORE', 'M_WINDOW_REDISTRICT',
+            'M_WINDOW_REDRAW', 'M_WINDOW_STATISTICS', 'M_WINDOW_STATUSBAR',
+            'M_WINDOW_TILE', 'M_WINDOW_TOOL_PALETTE', 'MAGENTA',
+            'MAP3D_INFO_BACKGROUND', 'MAP3D_INFO_CAMERA_CLIP_FAR',
+            'MAP3D_INFO_CAMERA_CLIP_NEAR', 'MAP3D_INFO_CAMERA_FOCAL_X',
+            'MAP3D_INFO_CAMERA_FOCAL_Y', 'MAP3D_INFO_CAMERA_FOCAL_Z',
+            'MAP3D_INFO_CAMERA_VPN_1', 'MAP3D_INFO_CAMERA_VPN_2',
+            'MAP3D_INFO_CAMERA_VPN_3', 'MAP3D_INFO_CAMERA_VU_1',
+            'MAP3D_INFO_CAMERA_VU_2', 'MAP3D_INFO_CAMERA_VU_3',
+            'MAP3D_INFO_CAMERA_X', 'MAP3D_INFO_CAMERA_Y',
+            'MAP3D_INFO_CAMERA_Z', 'MAP3D_INFO_LIGHT_COLOR',
+            'MAP3D_INFO_LIGHT_X', 'MAP3D_INFO_LIGHT_Y', 'MAP3D_INFO_LIGHT_Z',
+            'MAP3D_INFO_RESOLUTION_X', 'MAP3D_INFO_RESOLUTION_Y',
+            'MAP3D_INFO_SCALE', 'MAP3D_INFO_UNITS', 'MAPPER_INFO_AREAUNITS',
+            'MAPPER_INFO_CENTERX', 'MAPPER_INFO_CENTERY',
+            'MAPPER_INFO_CLIP_DISPLAY_ALL', 'MAPPER_INFO_CLIP_DISPLAY_POLYOBJ',
+            'MAPPER_INFO_CLIP_OVERLAY', 'MAPPER_INFO_CLIP_REGION',
+            'MAPPER_INFO_CLIP_TYPE', 'MAPPER_INFO_COORDSYS_CLAUSE',
+            'MAPPER_INFO_COORDSYS_CLAUSE_WITH_BOUNDS',
+            'MAPPER_INFO_COORDSYS_NAME', 'MAPPER_INFO_DISPLAY',
+            'MAPPER_INFO_DISPLAY_DECIMAL', 'MAPPER_INFO_DISPLAY_DEGMINSEC',
+            'MAPPER_INFO_DISPLAY_DMS', 'MAPPER_INFO_DISPLAY_MGRS',
+            'MAPPER_INFO_DISPLAY_POSITION', 'MAPPER_INFO_DISPLAY_SCALE',
+            'MAPPER_INFO_DISPLAY_ZOOM', 'MAPPER_INFO_DIST_CALC_TYPE',
+            'MAPPER_INFO_DIST_CARTESIAN', 'MAPPER_INFO_DIST_SPHERICAL',
+            'MAPPER_INFO_DISTUNITS', 'MAPPER_INFO_EDIT_LAYER',
+            'MAPPER_INFO_LAYERS', 'MAPPER_INFO_MAXX', 'MAPPER_INFO_MAXY',
+            'MAPPER_INFO_MERGE_MAP', 'MAPPER_INFO_MINX', 'MAPPER_INFO_MINY',
+            'MAPPER_INFO_MOVE_DUPLICATE_NODES', 'MAPPER_INFO_NUM_THEMATIC',
+            'MAPPER_INFO_REPROJECTION', 'MAPPER_INFO_RESAMPLING',
+            'MAPPER_INFO_SCALE', 'MAPPER_INFO_SCROLLBARS',
+            'MAPPER_INFO_XYUNITS', 'MAPPER_INFO_ZOOM', 'MAX_STRING_LENGTH',
+            'MENUITEM_INFO_ACCELERATOR', 'MENUITEM_INFO_CHECKABLE',
+            'MENUITEM_INFO_CHECKED', 'MENUITEM_INFO_ENABLED',
+            'MENUITEM_INFO_HANDLER', 'MENUITEM_INFO_HELPMSG',
+            'MENUITEM_INFO_ID', 'MENUITEM_INFO_SHOWHIDEABLE',
+            'MENUITEM_INFO_TEXT', 'MI_CURSOR_ARROW', 'MI_CURSOR_CHANGE_WIDTH',
+            'MI_CURSOR_CROSSHAIR', 'MI_CURSOR_DRAG_OBJ',
+            'MI_CURSOR_FINGER_LEFT', 'MI_CURSOR_FINGER_UP',
+            'MI_CURSOR_GRABBER', 'MI_CURSOR_IBEAM', 'MI_CURSOR_IBEAM_CROSS',
+            'MI_CURSOR_ZOOM_IN', 'MI_CURSOR_ZOOM_OUT', 'MI_ICON_ADD_NODE',
+            'MI_ICON_ARC', 'MI_ICON_ARROW', 'MI_ICON_ARROW_1',
+            'MI_ICON_ARROW_10', 'MI_ICON_ARROW_11', 'MI_ICON_ARROW_12',
+            'MI_ICON_ARROW_13', 'MI_ICON_ARROW_14', 'MI_ICON_ARROW_15',
+            'MI_ICON_ARROW_16', 'MI_ICON_ARROW_17', 'MI_ICON_ARROW_18',
+            'MI_ICON_ARROW_19', 'MI_ICON_ARROW_2', 'MI_ICON_ARROW_20',
+            'MI_ICON_ARROW_21', 'MI_ICON_ARROW_3', 'MI_ICON_ARROW_4',
+            'MI_ICON_ARROW_5', 'MI_ICON_ARROW_6', 'MI_ICON_ARROW_7',
+            'MI_ICON_ARROW_8', 'MI_ICON_ARROW_9', 'MI_ICON_CLIP_MODE',
+            'MI_ICON_CLIP_REGION', 'MI_ICON_CLOSE_ALL',
+            'MI_ICON_COMMUNICATION_1', 'MI_ICON_COMMUNICATION_10',
+            'MI_ICON_COMMUNICATION_11', 'MI_ICON_COMMUNICATION_12',
+            'MI_ICON_COMMUNICATION_2', 'MI_ICON_COMMUNICATION_3',
+            'MI_ICON_COMMUNICATION_4', 'MI_ICON_COMMUNICATION_5',
+            'MI_ICON_COMMUNICATION_6', 'MI_ICON_COMMUNICATION_7',
+            'MI_ICON_COMMUNICATION_8', 'MI_ICON_COMMUNICATION_9',
+            'MI_ICON_COMPASS_CIRCLE_TA', 'MI_ICON_COMPASS_CONTRACT',
+            'MI_ICON_COMPASS_EXPAND', 'MI_ICON_COMPASS_POLY_TA',
+            'MI_ICON_COMPASS_TAG', 'MI_ICON_COMPASS_UNTAG', 'MI_ICON_COPY',
+            'MI_ICON_CROSSHAIR', 'MI_ICON_CUT', 'MI_ICON_DISTRICT_MANY',
+            'MI_ICON_DISTRICT_SAME', 'MI_ICON_DRAG_HANDLE', 'MI_ICON_ELLIPSE',
+            'MI_ICON_EMERGENCY_1', 'MI_ICON_EMERGENCY_10',
+            'MI_ICON_EMERGENCY_11', 'MI_ICON_EMERGENCY_12',
+            'MI_ICON_EMERGENCY_13', 'MI_ICON_EMERGENCY_14',
+            'MI_ICON_EMERGENCY_15', 'MI_ICON_EMERGENCY_16',
+            'MI_ICON_EMERGENCY_17', 'MI_ICON_EMERGENCY_18',
+            'MI_ICON_EMERGENCY_2', 'MI_ICON_EMERGENCY_3',
+            'MI_ICON_EMERGENCY_4', 'MI_ICON_EMERGENCY_5',
+            'MI_ICON_EMERGENCY_6', 'MI_ICON_EMERGENCY_7',
+            'MI_ICON_EMERGENCY_8', 'MI_ICON_EMERGENCY_9', 'MI_ICON_GRABBER',
+            'MI_ICON_GRAPH_SELECT', 'MI_ICON_HELP', 'MI_ICON_HOT_LINK',
+            'MI_ICON_INFO', 'MI_ICON_INVERTSELECT', 'MI_ICON_LABEL',
+            'MI_ICON_LAYERS', 'MI_ICON_LEGEND', 'MI_ICON_LETTERS_A',
+            'MI_ICON_LETTERS_B', 'MI_ICON_LETTERS_C', 'MI_ICON_LETTERS_D',
+            'MI_ICON_LETTERS_E', 'MI_ICON_LETTERS_F', 'MI_ICON_LETTERS_G',
+            'MI_ICON_LETTERS_H', 'MI_ICON_LETTERS_I', 'MI_ICON_LETTERS_J',
+            'MI_ICON_LETTERS_K', 'MI_ICON_LETTERS_L', 'MI_ICON_LETTERS_M',
+            'MI_ICON_LETTERS_N', 'MI_ICON_LETTERS_O', 'MI_ICON_LETTERS_P',
+            'MI_ICON_LETTERS_Q', 'MI_ICON_LETTERS_R', 'MI_ICON_LETTERS_S',
+            'MI_ICON_LETTERS_T', 'MI_ICON_LETTERS_U', 'MI_ICON_LETTERS_V',
+            'MI_ICON_LETTERS_W', 'MI_ICON_LETTERS_X', 'MI_ICON_LETTERS_Y',
+            'MI_ICON_LETTERS_Z', 'MI_ICON_LINE', 'MI_ICON_LINE_STYLE',
+            'MI_ICON_MAPSYMB_1', 'MI_ICON_MAPSYMB_10', 'MI_ICON_MAPSYMB_11',
+            'MI_ICON_MAPSYMB_12', 'MI_ICON_MAPSYMB_13', 'MI_ICON_MAPSYMB_14',
+            'MI_ICON_MAPSYMB_15', 'MI_ICON_MAPSYMB_16', 'MI_ICON_MAPSYMB_17',
+            'MI_ICON_MAPSYMB_18', 'MI_ICON_MAPSYMB_19', 'MI_ICON_MAPSYMB_2',
+            'MI_ICON_MAPSYMB_20', 'MI_ICON_MAPSYMB_21', 'MI_ICON_MAPSYMB_22',
+            'MI_ICON_MAPSYMB_23', 'MI_ICON_MAPSYMB_24', 'MI_ICON_MAPSYMB_25',
+            'MI_ICON_MAPSYMB_26', 'MI_ICON_MAPSYMB_3', 'MI_ICON_MAPSYMB_4',
+            'MI_ICON_MAPSYMB_5', 'MI_ICON_MAPSYMB_6', 'MI_ICON_MAPSYMB_7',
+            'MI_ICON_MAPSYMB_8', 'MI_ICON_MAPSYMB_9', 'MI_ICON_MARITIME_1',
+            'MI_ICON_MARITIME_10', 'MI_ICON_MARITIME_2', 'MI_ICON_MARITIME_3',
+            'MI_ICON_MARITIME_4', 'MI_ICON_MARITIME_5', 'MI_ICON_MARITIME_6',
+            'MI_ICON_MARITIME_7', 'MI_ICON_MARITIME_8', 'MI_ICON_MARITIME_9',
+            'MI_ICON_MB_1', 'MI_ICON_MB_10', 'MI_ICON_MB_11', 'MI_ICON_MB_12',
+            'MI_ICON_MB_13', 'MI_ICON_MB_14', 'MI_ICON_MB_2', 'MI_ICON_MB_3',
+            'MI_ICON_MB_4', 'MI_ICON_MB_5', 'MI_ICON_MB_6', 'MI_ICON_MB_7',
+            'MI_ICON_MB_8', 'MI_ICON_MB_9', 'MI_ICON_MISC_1',
+            'MI_ICON_MISC_10', 'MI_ICON_MISC_11', 'MI_ICON_MISC_12',
+            'MI_ICON_MISC_13', 'MI_ICON_MISC_14', 'MI_ICON_MISC_15',
+            'MI_ICON_MISC_16', 'MI_ICON_MISC_17', 'MI_ICON_MISC_18',
+            'MI_ICON_MISC_19', 'MI_ICON_MISC_2', 'MI_ICON_MISC_20',
+            'MI_ICON_MISC_21', 'MI_ICON_MISC_22', 'MI_ICON_MISC_23',
+            'MI_ICON_MISC_24', 'MI_ICON_MISC_25', 'MI_ICON_MISC_26',
+            'MI_ICON_MISC_27', 'MI_ICON_MISC_28', 'MI_ICON_MISC_29',
+            'MI_ICON_MISC_3', 'MI_ICON_MISC_30', 'MI_ICON_MISC_31',
+            'MI_ICON_MISC_4', 'MI_ICON_MISC_5', 'MI_ICON_MISC_6',
+            'MI_ICON_MISC_7', 'MI_ICON_MISC_8', 'MI_ICON_MISC_9',
+            'MI_ICON_NEW_DOC', 'MI_ICON_NUMBERS_1', 'MI_ICON_NUMBERS_10',
+            'MI_ICON_NUMBERS_11', 'MI_ICON_NUMBERS_12', 'MI_ICON_NUMBERS_13',
+            'MI_ICON_NUMBERS_14', 'MI_ICON_NUMBERS_15', 'MI_ICON_NUMBERS_16',
+            'MI_ICON_NUMBERS_17', 'MI_ICON_NUMBERS_18', 'MI_ICON_NUMBERS_19',
+            'MI_ICON_NUMBERS_2', 'MI_ICON_NUMBERS_20', 'MI_ICON_NUMBERS_21',
+            'MI_ICON_NUMBERS_22', 'MI_ICON_NUMBERS_23', 'MI_ICON_NUMBERS_24',
+            'MI_ICON_NUMBERS_25', 'MI_ICON_NUMBERS_26', 'MI_ICON_NUMBERS_27',
+            'MI_ICON_NUMBERS_28', 'MI_ICON_NUMBERS_29', 'MI_ICON_NUMBERS_3',
+            'MI_ICON_NUMBERS_30', 'MI_ICON_NUMBERS_31', 'MI_ICON_NUMBERS_32',
+            'MI_ICON_NUMBERS_4', 'MI_ICON_NUMBERS_5', 'MI_ICON_NUMBERS_6',
+            'MI_ICON_NUMBERS_7', 'MI_ICON_NUMBERS_8', 'MI_ICON_NUMBERS_9',
+            'MI_ICON_ODBC_DISCONNECT', 'MI_ICON_ODBC_MAPPABLE',
+            'MI_ICON_ODBC_OPEN', 'MI_ICON_ODBC_REFRESH', 'MI_ICON_ODBC_SYMBOL',
+            'MI_ICON_ODBC_UNLINK', 'MI_ICON_OPEN_FILE', 'MI_ICON_OPEN_WOR',
+            'MI_ICON_OPENWFS', 'MI_ICON_OPENWMS', 'MI_ICON_PASTE',
+            'MI_ICON_POLYGON', 'MI_ICON_POLYLINE', 'MI_ICON_PRINT',
+            'MI_ICON_REALESTATE_1', 'MI_ICON_REALESTATE_10',
+            'MI_ICON_REALESTATE_11', 'MI_ICON_REALESTATE_12',
+            'MI_ICON_REALESTATE_13', 'MI_ICON_REALESTATE_14',
+            'MI_ICON_REALESTATE_15', 'MI_ICON_REALESTATE_16',
+            'MI_ICON_REALESTATE_17', 'MI_ICON_REALESTATE_18',
+            'MI_ICON_REALESTATE_19', 'MI_ICON_REALESTATE_2',
+            'MI_ICON_REALESTATE_20', 'MI_ICON_REALESTATE_21',
+            'MI_ICON_REALESTATE_22', 'MI_ICON_REALESTATE_23',
+            'MI_ICON_REALESTATE_3', 'MI_ICON_REALESTATE_4',
+            'MI_ICON_REALESTATE_5', 'MI_ICON_REALESTATE_6',
+            'MI_ICON_REALESTATE_7', 'MI_ICON_REALESTATE_8',
+            'MI_ICON_REALESTATE_9', 'MI_ICON_RECT', 'MI_ICON_REGION_STYLE',
+            'MI_ICON_RESHAPE', 'MI_ICON_ROUND_RECT', 'MI_ICON_RULER',
+            'MI_ICON_RUN', 'MI_ICON_SAVE_FILE', 'MI_ICON_SAVE_WIN',
+            'MI_ICON_SAVE_WOR', 'MI_ICON_SEARCH_BDY', 'MI_ICON_SEARCH_POLYGON',
+            'MI_ICON_SEARCH_RADIUS', 'MI_ICON_SEARCH_RECT', 'MI_ICON_SIGNS_1',
+            'MI_ICON_SIGNS_10', 'MI_ICON_SIGNS_11', 'MI_ICON_SIGNS_12',
+            'MI_ICON_SIGNS_13', 'MI_ICON_SIGNS_14', 'MI_ICON_SIGNS_15',
+            'MI_ICON_SIGNS_16', 'MI_ICON_SIGNS_17', 'MI_ICON_SIGNS_18',
+            'MI_ICON_SIGNS_19', 'MI_ICON_SIGNS_2', 'MI_ICON_SIGNS_3',
+            'MI_ICON_SIGNS_4', 'MI_ICON_SIGNS_5', 'MI_ICON_SIGNS_6',
+            'MI_ICON_SIGNS_7', 'MI_ICON_SIGNS_8', 'MI_ICON_SIGNS_9',
+            'MI_ICON_STATISTICS', 'MI_ICON_SYMBOL', 'MI_ICON_SYMBOL_STYLE',
+            'MI_ICON_TEXT', 'MI_ICON_TEXT_STYLE', 'MI_ICON_TRANSPORT_1',
+            'MI_ICON_TRANSPORT_10', 'MI_ICON_TRANSPORT_11',
+            'MI_ICON_TRANSPORT_12', 'MI_ICON_TRANSPORT_13',
+            'MI_ICON_TRANSPORT_14', 'MI_ICON_TRANSPORT_15',
+            'MI_ICON_TRANSPORT_16', 'MI_ICON_TRANSPORT_17',
+            'MI_ICON_TRANSPORT_18', 'MI_ICON_TRANSPORT_19',
+            'MI_ICON_TRANSPORT_2', 'MI_ICON_TRANSPORT_20',
+            'MI_ICON_TRANSPORT_21', 'MI_ICON_TRANSPORT_22',
+            'MI_ICON_TRANSPORT_23', 'MI_ICON_TRANSPORT_24',
+            'MI_ICON_TRANSPORT_25', 'MI_ICON_TRANSPORT_26',
+            'MI_ICON_TRANSPORT_27', 'MI_ICON_TRANSPORT_3',
+            'MI_ICON_TRANSPORT_4', 'MI_ICON_TRANSPORT_5',
+            'MI_ICON_TRANSPORT_6', 'MI_ICON_TRANSPORT_7',
+            'MI_ICON_TRANSPORT_8', 'MI_ICON_TRANSPORT_9', 'MI_ICON_UNDO',
+            'MI_ICON_UNSELECT_ALL', 'MI_ICON_WINDOW_FRAME', 'MI_ICON_WRENCH',
+            'MI_ICON_ZOOM_IN', 'MI_ICON_ZOOM_OUT', 'MI_ICON_ZOOM_QUESTION',
+            'MI_ICONS_MAPS_1', 'MI_ICONS_MAPS_10', 'MI_ICONS_MAPS_11',
+            'MI_ICONS_MAPS_12', 'MI_ICONS_MAPS_13', 'MI_ICONS_MAPS_14',
+            'MI_ICONS_MAPS_15', 'MI_ICONS_MAPS_2', 'MI_ICONS_MAPS_3',
+            'MI_ICONS_MAPS_4', 'MI_ICONS_MAPS_5', 'MI_ICONS_MAPS_6',
+            'MI_ICONS_MAPS_7', 'MI_ICONS_MAPS_8', 'MI_ICONS_MAPS_9',
+            'MIPLATFORM_HP', 'MIPLATFORM_MAC68K', 'MIPLATFORM_POWERMAC',
+            'MIPLATFORM_SPECIAL', 'MIPLATFORM_SUN', 'MIPLATFORM_WIN16',
+            'MIPLATFORM_WIN32', 'MODE_APPEND', 'MODE_BINARY', 'MODE_INPUT',
+            'MODE_OUTPUT', 'MODE_RANDOM', 'OBJ_ARC', 'OBJ_ELLIPSE',
+            'OBJ_FRAME', 'OBJ_GEO_ARCBEGANGLE', 'OBJ_GEO_ARCENDANGLE',
+            'OBJ_GEO_CENTROID', 'OBJ_GEO_LINEBEGX', 'OBJ_GEO_LINEBEGY',
+            'OBJ_GEO_LINEENDX', 'OBJ_GEO_LINEENDY', 'OBJ_GEO_MAXX',
+            'OBJ_GEO_MAXY', 'OBJ_GEO_MINX', 'OBJ_GEO_MINY', 'OBJ_GEO_POINTM',
+            'OBJ_GEO_POINTX', 'OBJ_GEO_POINTY', 'OBJ_GEO_POINTZ',
+            'OBJ_GEO_ROUNDRADIUS', 'OBJ_GEO_TEXTANGLE', 'OBJ_GEO_TEXTLINEX',
+            'OBJ_GEO_TEXTLINEY', 'OBJ_INFO_BRUSH', 'OBJ_INFO_FILLFRAME',
+            'OBJ_INFO_FRAMETITLE', 'OBJ_INFO_FRAMEWIN', 'OBJ_INFO_HAS_M',
+            'OBJ_INFO_HAS_Z', 'OBJ_INFO_MPOINT', 'OBJ_INFO_NONEMPTY',
+            'OBJ_INFO_NPNTS', 'OBJ_INFO_NPOLYGONS', 'OBJ_INFO_PEN',
+            'OBJ_INFO_PLINE', 'OBJ_INFO_REGION', 'OBJ_INFO_SMOOTH',
+            'OBJ_INFO_SYMBOL', 'OBJ_INFO_TEXTARROW', 'OBJ_INFO_TEXTFONT',
+            'OBJ_INFO_TEXTJUSTIFY', 'OBJ_INFO_TEXTSPACING',
+            'OBJ_INFO_TEXTSTRING', 'OBJ_INFO_TYPE', 'OBJ_INFO_Z_UNIT',
+            'OBJ_INFO_Z_UNIT_SET', 'OBJ_LINE', 'OBJ_PLINE', 'OBJ_POINT',
+            'OBJ_RECT', 'OBJ_REGION', 'OBJ_ROUNDRECT', 'OBJ_TEXT',
+            'OBJ_TYPE_ARC', 'OBJ_TYPE_COLLECTION', 'OBJ_TYPE_ELLIPSE',
+            'OBJ_TYPE_FRAME', 'OBJ_TYPE_LINE', 'OBJ_TYPE_MPOINT',
+            'OBJ_TYPE_PLINE', 'OBJ_TYPE_POINT', 'OBJ_TYPE_RECT',
+            'OBJ_TYPE_REGION', 'OBJ_TYPE_ROUNDRECT', 'OBJ_TYPE_TEXT',
+            'ORIENTATION_CUSTOM', 'ORIENTATION_LANDSCAPE',
+            'ORIENTATION_PORTRAIT', 'PEN_COLOR', 'PEN_INDEX',
+            'PEN_INTERLEAVED', 'PEN_PATTERN', 'PEN_WIDTH', 'PLATFORM_MAC',
+            'PLATFORM_MOTIF', 'PLATFORM_SPECIAL', 'PLATFORM_WIN',
+            'PLATFORM_X11', 'PLATFORM_XOL', 'PRISMMAP_INFO_BACKGROUND',
+            'PRISMMAP_INFO_CAMERA_CLIP_FAR', 'PRISMMAP_INFO_CAMERA_CLIP_NEAR',
+            'PRISMMAP_INFO_CAMERA_FOCAL_X', 'PRISMMAP_INFO_CAMERA_FOCAL_Y',
+            'PRISMMAP_INFO_CAMERA_FOCAL_Z', 'PRISMMAP_INFO_CAMERA_VPN_1',
+            'PRISMMAP_INFO_CAMERA_VPN_2', 'PRISMMAP_INFO_CAMERA_VPN_3',
+            'PRISMMAP_INFO_CAMERA_VU_1', 'PRISMMAP_INFO_CAMERA_VU_2',
+            'PRISMMAP_INFO_CAMERA_VU_3', 'PRISMMAP_INFO_CAMERA_X',
+            'PRISMMAP_INFO_CAMERA_Y', 'PRISMMAP_INFO_CAMERA_Z',
+            'PRISMMAP_INFO_INFOTIP_EXPR', 'PRISMMAP_INFO_LIGHT_COLOR',
+            'PRISMMAP_INFO_LIGHT_X', 'PRISMMAP_INFO_LIGHT_Y',
+            'PRISMMAP_INFO_LIGHT_Z', 'PRISMMAP_INFO_SCALE', 'RAD_2_DEG',
+            'RASTER_CONTROL_POINT_X', 'RASTER_CONTROL_POINT_Y',
+            'RASTER_TAB_INFO_ALPHA', 'RASTER_TAB_INFO_BITS_PER_PIXEL',
+            'RASTER_TAB_INFO_BRIGHTNESS', 'RASTER_TAB_INFO_CONTRAST',
+            'RASTER_TAB_INFO_DISPLAY_TRANSPARENT', 'RASTER_TAB_INFO_GREYSCALE',
+            'RASTER_TAB_INFO_HEIGHT', 'RASTER_TAB_INFO_IMAGE_CLASS',
+            'RASTER_TAB_INFO_IMAGE_NAME', 'RASTER_TAB_INFO_IMAGE_TYPE',
+            'RASTER_TAB_INFO_NUM_CONTROL_POINTS',
+            'RASTER_TAB_INFO_TRANSPARENT_COLOR', 'RASTER_TAB_INFO_WIDTH',
+            'RED', 'REGION_INFO_IS_CLOCKWISE', 'SEARCH_INFO_ROW',
+            'SEARCH_INFO_TABLE', 'SECONDS_PER_DAY', 'SEL_INFO_NROWS',
+            'SEL_INFO_SELNAME', 'SEL_INFO_TABLENAME',
+            'SESSION_INFO_AREA_UNITS', 'SESSION_INFO_COORDSYS_CLAUSE',
+            'SESSION_INFO_DISTANCE_UNITS', 'SESSION_INFO_PAPER_UNITS',
+            'SRV_COL_INFO_ALIAS', 'SRV_COL_INFO_NAME',
+            'SRV_COL_INFO_PRECISION', 'SRV_COL_INFO_SCALE',
+            'SRV_COL_INFO_STATUS', 'SRV_COL_INFO_TYPE', 'SRV_COL_INFO_VALUE',
+            'SRV_COL_INFO_WIDTH', 'SRV_COL_TYPE_BIN_STRING',
+            'SRV_COL_TYPE_CHAR', 'SRV_COL_TYPE_DATE', 'SRV_COL_TYPE_DECIMAL',
+            'SRV_COL_TYPE_FIXED_LEN_STRING', 'SRV_COL_TYPE_FLOAT',
+            'SRV_COL_TYPE_INTEGER', 'SRV_COL_TYPE_LOGICAL',
+            'SRV_COL_TYPE_NONE', 'SRV_COL_TYPE_SMALLINT',
+            'SRV_CONNECT_INFO_DB_NAME', 'SRV_CONNECT_INFO_DRIVER_NAME',
+            'SRV_CONNECT_INFO_DS_NAME', 'SRV_CONNECT_INFO_QUOTE_CHAR',
+            'SRV_CONNECT_INFO_SQL_USER_ID', 'SRV_DRV_DATA_SOURCE',
+            'SRV_DRV_INFO_NAME', 'SRV_DRV_INFO_NAME_LIST', 'SRV_ERROR',
+            'SRV_FETCH_FIRST', 'SRV_FETCH_LAST', 'SRV_FETCH_NEXT',
+            'SRV_FETCH_PREV', 'SRV_INVALID_HANDLE', 'SRV_NEED_DATA',
+            'SRV_NO_MORE_DATA', 'SRV_NULL_DATA', 'SRV_SUCCESS',
+            'SRV_SUCCESS_WITH_INFO', 'SRV_TRUNCATED_DATA',
+            'SRV_WM_HIST_NO_OVERWRITE', 'SRV_WM_HIST_NONE',
+            'SRV_WM_HIST_OVERWRITE', 'STR_EQ', 'STR_GT', 'STR_LT',
+            'STYLE_SAMPLE_SIZE_LARGE', 'STYLE_SAMPLE_SIZE_SMALL',
+            'SWITCHING_INTO_MAPINFO', 'SWITCHING_OUT_OF_MAPINFO',
+            'SYMBOL_ANGLE', 'SYMBOL_CODE', 'SYMBOL_COLOR',
+            'SYMBOL_CUSTOM_NAME', 'SYMBOL_CUSTOM_STYLE', 'SYMBOL_FONT_NAME',
+            'SYMBOL_FONT_STYLE', 'SYMBOL_KIND', 'SYMBOL_KIND_CUSTOM',
+            'SYMBOL_KIND_FONT', 'SYMBOL_KIND_VECTOR', 'SYMBOL_POINTSIZE',
+            'SYS_INFO_APPIDISPATCH', 'SYS_INFO_APPLICATIONWND',
+            'SYS_INFO_APPVERSION', 'SYS_INFO_CHARSET',
+            'SYS_INFO_COPYPROTECTED', 'SYS_INFO_DATE_FORMAT',
+            'SYS_INFO_DDESTATUS', 'SYS_INFO_DIG_INSTALLED',
+            'SYS_INFO_DIG_MODE', 'SYS_INFO_MAPINFOWND',
+            'SYS_INFO_MDICLIENTWND', 'SYS_INFO_MIBUILD_NUMBER',
+            'SYS_INFO_MIPLATFORM', 'SYS_INFO_MIVERSION',
+            'SYS_INFO_NUMBER_FORMAT', 'SYS_INFO_PLATFORM',
+            'SYS_INFO_PRODUCTLEVEL', 'SYS_INFO_RUNTIME',
+            'TAB_GEO_CONTROL_POINT_X', 'TAB_GEO_CONTROL_POINT_Y',
+            'TAB_INFO_BROWSER_LIST', 'TAB_INFO_COORDSYS_CLAUSE',
+            'TAB_INFO_COORDSYS_CLAUSE_WITHOUT_BOUNDS',
+            'TAB_INFO_COORDSYS_MAXX', 'TAB_INFO_COORDSYS_MAXY',
+            'TAB_INFO_COORDSYS_MINX', 'TAB_INFO_COORDSYS_MINY',
+            'TAB_INFO_COORDSYS_NAME', 'TAB_INFO_EDITED', 'TAB_INFO_FASTEDIT',
+            'TAB_INFO_MAPPABLE', 'TAB_INFO_MAPPABLE_TABLE', 'TAB_INFO_MAXX',
+            'TAB_INFO_MAXY', 'TAB_INFO_MINX', 'TAB_INFO_MINY', 'TAB_INFO_NAME',
+            'TAB_INFO_NCOLS', 'TAB_INFO_NREFS', 'TAB_INFO_NROWS',
+            'TAB_INFO_NUM', 'TAB_INFO_READONLY', 'TAB_INFO_SEAMLESS',
+            'TAB_INFO_SUPPORT_MZ', 'TAB_INFO_TABFILE', 'TAB_INFO_TEMP',
+            'TAB_INFO_THEME_METADATA', 'TAB_INFO_TYPE', 'TAB_INFO_UNDO',
+            'TAB_INFO_USERBROWSE', 'TAB_INFO_USERCLOSE',
+            'TAB_INFO_USERDISPLAYMAP', 'TAB_INFO_USEREDITABLE',
+            'TAB_INFO_USERMAP', 'TAB_INFO_USERREMOVEMAP', 'TAB_INFO_Z_UNIT',
+            'TAB_INFO_Z_UNIT_SET', 'TAB_TYPE_BASE', 'TAB_TYPE_FME',
+            'TAB_TYPE_IMAGE', 'TAB_TYPE_LINKED', 'TAB_TYPE_RESULT',
+            'TAB_TYPE_VIEW', 'TAB_TYPE_WFS', 'TAB_TYPE_WMS', 'TRUE', 'WHITE',
+            'WIN_3DMAP', 'WIN_BROWSER', 'WIN_BUTTONPAD', 'WIN_CART_LEGEND',
+            'WIN_GRAPH', 'WIN_HELP', 'WIN_INFO', 'WIN_INFO_AUTOSCROLL',
+            'WIN_INFO_CLONEWINDOW', 'WIN_INFO_ENHANCED_RENDERING',
+            'WIN_INFO_EXPORT_ANTIALIASING', 'WIN_INFO_EXPORT_BORDER',
+            'WIN_INFO_EXPORT_DITHER', 'WIN_INFO_EXPORT_FILTER',
+            'WIN_INFO_EXPORT_MASKSIZE', 'WIN_INFO_EXPORT_THRESHOLD',
+            'WIN_INFO_EXPORT_TRANSPRASTER', 'WIN_INFO_EXPORT_TRANSPVECTOR',
+            'WIN_INFO_EXPORT_TRUECOLOR', 'WIN_INFO_HEIGHT',
+            'WIN_INFO_LEGENDS_MAP', 'WIN_INFO_NAME', 'WIN_INFO_OPEN',
+            'WIN_INFO_PRINTER_BORDER', 'WIN_INFO_PRINTER_BOTTOMMARGIN',
+            'WIN_INFO_PRINTER_COPIES', 'WIN_INFO_PRINTER_DITHER',
+            'WIN_INFO_PRINTER_LEFTMARGIN', 'WIN_INFO_PRINTER_METHOD',
+            'WIN_INFO_PRINTER_NAME', 'WIN_INFO_PRINTER_ORIENT',
+            'WIN_INFO_PRINTER_PAPERSIZE', 'WIN_INFO_PRINTER_RIGHTMARGIN',
+            'WIN_INFO_PRINTER_SCALE_PATTERNS', 'WIN_INFO_PRINTER_TOPMARGIN',
+            'WIN_INFO_PRINTER_TRANSPRASTER', 'WIN_INFO_PRINTER_TRANSPVECTOR',
+            'WIN_INFO_PRINTER_TRUECOLOR', 'WIN_INFO_SMARTPAN',
+            'WIN_INFO_SMOOTH_IMAGE', 'WIN_INFO_SMOOTH_TEXT',
+            'WIN_INFO_SMOOTH_VECTOR', 'WIN_INFO_SNAPMODE',
+            'WIN_INFO_SNAPTHRESHOLD', 'WIN_INFO_STATE',
+            'WIN_INFO_SYSMENUCLOSE', 'WIN_INFO_TABLE', 'WIN_INFO_TOPMOST',
+            'WIN_INFO_TYPE', 'WIN_INFO_WIDTH', 'WIN_INFO_WINDOWID',
+            'WIN_INFO_WND', 'WIN_INFO_WORKSPACE', 'WIN_INFO_X', 'WIN_INFO_Y',
+            'WIN_LAYOUT', 'WIN_LEGEND', 'WIN_MAPBASIC', 'WIN_MAPINFO',
+            'WIN_MAPPER', 'WIN_MESSAGE', 'WIN_PENPICKER',
+            'WIN_PRINTER_LANDSCAPE', 'WIN_PRINTER_PORTRAIT', 'WIN_RULER',
+            'WIN_STATE_MAXIMIZED', 'WIN_STATE_MINIMIZED', 'WIN_STATE_NORMAL',
+            'WIN_STATISTICS', 'WIN_STYLE_CHILD', 'WIN_STYLE_POPUP',
+            'WIN_STYLE_POPUP_FULLCAPTION', 'WIN_STYLE_STANDARD',
+            'WIN_SYMBOLPICKER', 'WIN_TOOLBAR', 'WIN_TOOLPICKER', 'YELLOW'
+            ),
+        5 => array(
+            'Abbrs', 'Above', 'Access', 'Active', 'Address', 'Advanced',
+            'Affine', 'Align', 'Alpha', 'alpha_value', 'Always', 'Angle',
+            'Animate', 'Antialiasing', 'Append', 'Apply', 'ApplyUpdates',
+            'Arrow', 'Ascending', 'ASCII', 'At', 'AttributeData', 'Auto',
+            'Autoflip', 'Autokey', 'Automatic', 'Autoscroll', 'Axis',
+            'Background', 'Banding', 'Batch', 'Behind', 'Below', 'Bend',
+            'Binary', 'Blocks', 'Border', 'BorderPen', 'Bottom', 'Bounds',
+            'ByteOrder', 'ByVal', 'Calling', 'Camera', 'Candidates',
+            'Cartesian', 'Cell', 'Center', 'Change', 'Char', 'Circle',
+            'Clipping', 'CloseMatchesOnly', 'ClosestAddr', 'Color', 'Columns',
+            'Contents', 'ControlPoints', 'Copies', 'Copyright', 'Counter',
+            'Country', 'CountrySecondarySubdivision', 'CountrySubdivision',
+            'Cross', 'CubicConvolution', 'Cull', 'Cursor', 'Custom', 'Data',
+            'DBF', 'DDE', 'Decimal', 'DecimalPlaces', 'DefaultAmbientSpeed',
+            'DefaultPropagationFactor', 'DeformatNumber', 'Delimiter',
+            'Density', 'DenyWrite', 'Descending', 'Destroy', 'Device',
+            'Dictionary', 'DInfo', 'Disable', 'DiscardUpdates', 'Display',
+            'Dither', 'DrawMode', 'DropKey', 'Droplines', 'Duplicates',
+            'Dynamic', 'Earth', 'East', 'EditLayerPopup', 'Elevation', 'Else',
+            'ElseIf', 'Emf', 'Enable', 'Envinsa', 'ErrorDiffusion', 'Extents',
+            'Fallback', 'FastEdit', 'FillFrame', 'Filter', 'First', 'Fit',
+            'Fixed', 'FocalPoint', 'Footnote', 'Force', 'FromMapCatalog',
+            'Front', 'Gap', 'Geographic', 'Geography', 'Graduated', 'Graphic',
+            'Gutter', 'Half', 'Halftone', 'Handles', 'Height', 'Help',
+            'HelpMsg', 'Hide', 'Hierarchical', 'HIGHLOW', 'History', 'Icon',
+            'ID', 'Ignore', 'Image', 'Inflect', 'Inset', 'Inside',
+            'Interactive', 'Internal', 'Interpolate', 'IntersectingStreet',
+            'Justify', 'Key', 'Label', 'Labels', 'Landscape', 'Large', 'Last',
+            'Layer', 'Left', 'Lib', 'Light', 'LinePen', 'Lines', 'Linestyle',
+            'Longitude', 'LOWHIGH', 'Major', 'MajorPolygonOnly',
+            'MajorRoadsOnly', 'MapBounds', 'MapMarker', 'MapString', 'Margins',
+            'MarkMultiple', 'MaskSize', 'Match', 'MaxOffRoadDistance',
+            'Message', 'MICODE', 'Minor', 'MixedCase', 'Mode', 'ModifierKeys',
+            'Modify', 'Multiple', 'MultiPolygonRgns', 'Municipality',
+            'MunicipalitySubdivision', 'Name', 'NATIVE', 'NearestNeighbor',
+            'NoCollision', 'Node', 'Nodes', 'NoIndex', 'None', 'Nonearth',
+            'NoRefresh', 'Normalized', 'North', 'Number', 'ObjectType', 'ODBC',
+            'Off', 'OK', 'OLE', 'On', 'Options', 'Orientation', 'OtherBdy',
+            'Output', 'Outside', 'Overlapped', 'Overwrite', 'Pagebreaks',
+            'Pan', 'Papersize', 'Parent', 'PassThrough', 'Password',
+            'Patterns', 'Per', 'Percent', 'Percentage', 'Permanent',
+            'PersistentCache', 'Pie', 'Pitch', 'Placename', 'PointsOnly',
+            'PolyObj', 'Portrait', 'Position', 'PostalCode', 'Prefer',
+            'Preferences', 'Prev', 'Printer', 'Projection', 'PushButton',
+            'Quantile', 'Query', 'Random', 'Range', 'Raster', 'Read',
+            'ReadOnly', 'Rec', 'Redraw', 'Refine', 'Regionstyle', 'RemoveData',
+            'Replace', 'Reprojection', 'Resampling', 'Restore', 'ResultCode',
+            'ReturnHoles', 'Right', 'Roll', 'ROP', 'Rotated', 'Row', 'Ruler',
+            'Scale', 'ScrollBars', 'Seamless', 'SecondaryPostalCode',
+            'SelfInt', 'Separator', 'Series', 'Service', 'SetKey',
+            'SetTraverse', 'Shades', 'Show', 'Simple', 'SimplificationFactor',
+            'Size', 'Small', 'Smart', 'Smooth', 'South', 'Spacing',
+            'SPATIALWARE', 'Spherical', 'Square', 'Stacked', 'Step', 'Store',
+            'Street', 'StreetName', 'StreetNumber', 'StyleType', 'Subtitle',
+            'SysMenuClose', 'Thin', 'Tick', 'Title', 'TitleAxisY',
+            'TitleGroup', 'Titles', 'TitleSeries', 'ToggleButton', 'Tolerance',
+            'ToolbarPosition', 'ToolButton', 'Toolkit', 'Top', 'Translucency',
+            'translucency_percent', 'Transparency', 'Transparent', 'Traverse',
+            'TrueColor', 'Uncheck', 'Undo', 'Union', 'Unit', 'Until', 'URL',
+            'Use', 'User', 'UserBrowse', 'UserClose', 'UserDisplayMap',
+            'UserEdit', 'UserMap', 'UserRemoveMap', 'Value', 'Variable',
+            'Vary', 'Vector', 'Versioned', 'View', 'ViewDisplayPopup',
+            'VisibleOnly', 'VMDefault', 'VMGrid', 'VMRaster', 'Voronoi',
+            'Warnings', 'Wedge', 'West', 'Width', 'With', 'XY', 'XYINDEX',
+            'Yaw', 'Zoom'
+            )
+        ),
+    'SYMBOLS' => array(
+            //Numeric/String Operators + Comparison Operators
+            '(', ')', '[', ']', '+', '-', '*', '/', '\\', '^', '&',
+            '=', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',        //Statements + Clauses + Data Types + Logical Operators, Geographical Operators + SQL
+            2 => 'color: #2391af;',        //Special Procedures
+            3 => 'color: #2391af;',        //Functions
+            4 => 'color: #c635cb;',        //Constants
+            5 => 'color: #0000ff;'         //Extended keywords (case sensitive)
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a31515;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #12198b;',            //Table Attributes
+            1 => 'color: #2391af;'             //Data Types
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+            //Table Attribute
+            0 => "[\\.]{1}[a-zA-Z0-9_]+",
+            //Data Type
+            1 => "(?xi) \\s+ as \\s+ (Alias|Brush|Date|Float|Font|Integer|Logical|Object|Pen|SmallInt|String|Symbol)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/matlab.php b/vendor/easybook/geshi/geshi/matlab.php
new file mode 100755
index 000000000..7cdd50e5e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/matlab.php
@@ -0,0 +1,227 @@
+<?php
+/*************************************************************************************
+ * matlab.php
+ * -----------
+ * Author: Florian Knorn (floz@gmx.de)
+ * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/02/09
+ *
+ * Matlab M-file language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006-03-25 (1.0.7.22)
+ *   - support for the transpose operator
+ *   - many keywords added
+ *   - links to the matlab documentation at mathworks
+ *      by: Olivier Verdier (olivier.verdier@free.fr)
+ * 2005/05/07 (1.0.0)
+ *   -  First Release
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Matlab M',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array(),
+    //Matlab Strings
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<![\\w\\)\\]\\}\\.])('[^\\n']*?')/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'catch', 'continue', 'elseif', 'else', 'end', 'for',
+            'function', 'global', 'if', 'otherwise', 'persistent', 'return',
+            'switch', 'try', 'while'
+            ),
+        2 => array(
+            'all','any','exist','is','logical','mislocked',
+
+            'abs','acos','acosh','acot','acoth','acsc','acsch','airy','angle',
+            'ans','area','asec','asech','asin','asinh','atan','atan2','atanh',
+            'auread','autumn','auwrite','axes','axis','balance','bar','bar3',
+            'bar3h','barh','besselh','besseli','besselj','besselk','Bessely',
+            'beta','betainc','betaln','bicg','bicgstab','bin2dec','bitand',
+            'bitcmp','bitget','bitmax','bitor','bitset','bitshift','bitxor',
+            'blkdiag','bone','box','brighten','builtin','bwcontr','calendar',
+            'camdolly','camlight','camlookat','camorbit','campan','campos',
+            'camproj','camroll','camtarget','camup','camva','camzoom','capture',
+            'cart2pol','cart2sph','cat','caxis','cdf2rdf','ceil','cell',
+            'cell2struct','celldisp','cellfun','cellplot','cellstr','cgs',
+            'char','chol','cholinc','cholupdate','cla','clabel','class','clc',
+            'clf','clg','clock','close','colmmd','colorbar','colorcube',
+            'colordef','colormap','colperm','comet','comet3','compan','compass',
+            'complex','computer','cond','condeig','condest','coneplot','conj',
+            'contour','contourc','contourf','contourslice','contrast','conv',
+            'conv2','convhull','cool','copper','copyobj','corrcoef','cos',
+            'cosh','cot','coth','cov','cplxpair','cputime','cross','csc','csch',
+            'cumprod','cumsum','cumtrapz','cylinder','daspect','date','datenum',
+            'datestr','datetick','datevec','dbclear','dbcont','dbdown',
+            'dblquad','dbmex','dbquit','dbstack','dbstatus','dbstep','dbstop',
+            'dbtype','dbup','deblank','dec2bin','dec2hex','deconv','del2',
+            'delaunay','det','diag','dialog','diff','diffuse','dlmread',
+            'dlmwrite','dmperm','double','dragrect','drawnow','dsearch','eig',
+            'eigs','ellipj','ellipke','eomday','eps','erf','erfc','erfcx',
+            'erfiny','error','errorbar','errordlg','etime','eval','evalc',
+            'evalin','exp','expint','expm','eye','ezcontour','ezcontourf',
+            'ezmesh','ezmeshc','ezplot','ezplot3','ezpolar','ezsurf','ezsurfc',
+            'factor','factorial','fclose','feather','feof','ferror','feval',
+            'fft','fft2','fftshift','fgetl','fgets','fieldnames','figure',
+            'fill','fill3','filter','filter2','find','findfigs','findobj',
+            'findstr','fix','flag','flipdim','fliplr','flipud','floor','flops',
+            'fmin','fmins','fopen','fplot','fprintf','fread','frewind','fscanf',
+            'fseek','ftell','full','funm','fwrite','fzero','gallery','gamma',
+            'gammainc','gammaln','gca','gcbo','gcd','gcf','gco','get',
+            'getfield','ginput','gmres','gradient','gray','graymon','grid',
+            'griddata','gsvd','gtext','hadamard','hankel','hdf','helpdlg',
+            'hess','hex2dec','hex2num','hidden','hilb','hist','hold','hot',
+            'hsv','hsv2rgb','i','ifft','ifft2','ifftn','ifftshift','imag',
+            'image','imfinfo','imread','imwrite','ind2sub','Inf','inferiorto',
+            'inline','inpolygon','input','inputdlg','inputname','int16',
+            'int2str','int32','int8','interp1','interp2','interp3','interpft',
+            'interpn','intersect','inv','invhilb','ipermute','isa','ishandle',
+            'ismember','isocaps','isonormals','isosurface','j','jet','keyboard',
+            'lcm','legend','legendre','light','lighting','lightingangle',
+            'lin2mu','line','lines','linspace','listdlg','loadobj','log',
+            'log10','log2','loglog','logm','logspace','lower','lscov','lu',
+            'luinc','magic','mat2str','material','max','mean','median','menu',
+            'menuedit','mesh','meshc','meshgrid','min','mod','msgbox','mu2lin',
+            'NaN','nargchk','nargin','nargout','nchoosek','ndgrid','ndims',
+            'newplot','nextpow2','nnls','nnz','nonzeros','norm','normest','now',
+            'null','num2cell','num2str','nzmax','ode113,','ode15s,','ode23s,',
+            'ode23t,','ode23tb','ode45,','odefile','odeget','odeset','ones',
+            'orient','orth','pagedlg','pareto','pascal','patch','pause',
+            'pbaspect','pcg','pcolor','peaks','perms','permute','pi','pie',
+            'pie3','pinv','plot','plot3','plotmatrix','plotyy','pol2cart',
+            'polar','poly','polyarea','polyder','polyeig','polyfit','polyval',
+            'polyvalm','pow2','primes','print','printdlg','printopt','prism',
+            'prod','propedit','qmr','qr','qrdelete','qrinsert','qrupdate',
+            'quad','questdlg','quiver','quiver3','qz','rand','randn','randperm',
+            'rank','rat','rats','rbbox','rcond','real','realmax','realmin',
+            'rectangle','reducepatch','reducevolume','refresh','rem','repmat',
+            'reset','reshape','residue','rgb2hsv','rgbplot','ribbon','rmfield',
+            'roots','rose','rot90','rotate','rotate3d','round','rref',
+            'rrefmovie','rsf2csf','saveobj','scatter','scatter3','schur',
+            'script','sec','sech','selectmoveresize','semilogx','semilogy',
+            'set','setdiff','setfield','setxor','shading','shg','shiftdim',
+            'shrinkfaces','sign','sin','single','sinh','slice','smooth3','sort',
+            'sortrows','sound','soundsc','spalloc','sparse','spconvert',
+            'spdiags','specular','speye','spfun','sph2cart','sphere','spinmap',
+            'spline','spones','spparms','sprand','sprandn','sprandsym','spring',
+            'sprintf','sqrt','sqrtm','squeeze','sscanf','stairs','std','stem',
+            'stem3','str2double','str2num','strcat','strcmp','strcmpi',
+            'stream2','stream3','streamline','strings','strjust','strmatch',
+            'strncmp','strrep','strtok','struct','struct2cell','strvcat',
+            'sub2ind','subplot','subspace','subvolume','sum','summer',
+            'superiorto','surf','surf2patch','surface','surfc','surfl',
+            'surfnorm','svd','svds','symmmd','symrcm','symvar','tan','tanh',
+            'texlabel','text Create','textread','textwrap','tic','title','toc',
+            'toeplitz','trace','trapz','tril','trimesh','trisurf','triu',
+            'tsearch','uicontext Create','uicontextmenu','uicontrol',
+            'uigetfile','uimenu','uint32','uint8','uiputfile','uiresume',
+            'uisetcolor','uisetfont','uiwait Used','union','unique','unwrap',
+            'upper','var','varargin','varargout','vectorize','view','viewmtx',
+            'voronoi','waitbar','waitforbuttonpress','warndlg','warning',
+            'waterfall','wavread','wavwrite','weekday','whitebg','wilkinson',
+            'winter','wk1read','wk1write','xlabel','xlim','ylabel','ylim',
+            'zeros','zlabel','zlim','zoom',
+            //'[Keywords 6]',
+            'addpath','cd','clear','copyfile','delete','diary','dir','disp',
+            'doc','docopt','echo','edit','fileparts','format','fullfile','help',
+            'helpdesk','helpwin','home','inmem','lasterr','lastwarn','length',
+            'load','lookfor','ls','matlabrc','matlabroot','mkdir','mlock',
+            'more','munlock','open','openvar','pack','partialpath','path',
+            'pathtool','profile','profreport','pwd','quit','rmpath','save',
+            'saveas','size','tempdir','tempname','type','ver','version','web',
+            'what','whatsnew','which','who','whos','workspace'
+            )
+        ),
+    'SYMBOLS' => array(
+        '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        //3 => false,
+        //4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #228B22;',
+            2 => 'color:#A020F0;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #080;'
+            ),
+        'STRINGS' => array(
+            //0 => 'color: #A020F0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #33f;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #33f;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Complex numbers
+        0 => '(?<![\\w\\/])[+-]?[\\d]*([\\d]\\.|\\.[\\d])?[\\d]*[ij](?![\\w]|\<DOT>html)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/mirc.php b/vendor/easybook/geshi/geshi/mirc.php
new file mode 100755
index 000000000..fa2f307ee
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/mirc.php
@@ -0,0 +1,171 @@
+<?php
+/*************************************************************************************
+ * mirc.php
+ * -----
+ * Author: Alberto 'Birckin' de Areba (Birckin@hotmail.com)
+ * Copyright: (c) 2006 Alberto de Areba
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/05/29
+ *
+ * mIRC Scripting language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/05/29 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'mIRC Scripting',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'alias', 'menu', 'dialog',
+            ),
+        2 => array(
+            'if', 'elseif', 'else', 'while', 'return', 'goto', 'var'
+            ),
+        3 => array(
+            'action','ajinvite','amsg','ame','anick','aop','auser',
+            'avoice','auto','autojoin','away','background','ban','beep',
+            'channel','clear','clearall','clipboard','close','closemsg','color',
+            'copy','creq','ctcp','ctcpreply','ctcps','dcc','dde','ddeserver',
+            'debug','describe','disable','disconnect','dlevel','dll','dns',
+            'dqwindow','ebeeps','echo','editbox','emailaddr','enable','events',
+            'exit','filter','findtext','finger','flash','flood','flush',
+            'flushini','font','fsend','fserve','fullname','ghide','gload',
+            'gmove','gopts','gplay','gpoint','gqreq','groups','gshow','gsize',
+            'gstop','gtalk','gunload','guser','help','hop','ignore','invite',
+            'join','kick','linesep','links','list','load','loadbuf','localinfo',
+            'log','me','mdi','mkdir','mnick','mode','msg','names','nick','noop',
+            'notice','notify','omsg','onotice','part','partall','pdcc',
+            'perform','ping','play','pop','protect','pvoice','qmsg','qme',
+            'query','queryrn','quit','raw','remini','remote','remove','rename',
+            'enwin','resetidle','rlevel','rmdir','run','ruser','save','savebuf',
+            'saveini','say','server','showmirc','sline','sound','speak','splay',
+            'sreq','strip','time',
+            //'timer[N/name]', //Handled as a regular expression below ...
+            'timers','timestamp','titlebar','tnick','tokenize','topic','ulist',
+            'unload','updatenl','url','uwho','window','winhelp','write',
+            'writeini','who','whois','whowas'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '/'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #994444;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'STRINGS' => array(
+            ),
+        'NUMBERS' => array(
+            0 => '',
+            ),
+        'METHODS' => array(
+            0 => 'color: #008000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #990000;',
+            2 => 'color: #000099;',
+            3 => 'color: #888800;',
+            4 => 'color: #888800;',
+            5 => 'color: #000099;',
+            6 => 'color: #990000; font-weight: bold;',
+            7 => 'color: #990000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.mirc.com/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(
+        //Variable names
+        0 => '\$[a-zA-Z0-9]+',
+        //Variable names
+        1 => '(%|&amp;)[\w\x80-\xFE]+',
+        //Client to Client Protocol handling
+        2 => '(on|ctcp) (!|@|&amp;)?(\d|\*):[a-zA-Z]+:',
+        /*4 => array(
+            GESHI_SEARCH => '((on|ctcp) (!|@|&)?(\d|\*):(Action|Active|Agent|AppActive|Ban|Chat|Close|Connect|Ctcp|CtcpReply|DccServer|DeHelp|DeOp|DeVoice|Dialog|Dns|Error|Exit|FileRcvd|FileSent|GetFail|Help|Hotlink|Input|Invite|Join|KeyDown|KeyUp|Kick|Load|Logon|MidiEnd|Mode|Mp3End|Nick|NoSound|Notice|Notify|Op|Open|Part|Ping|Pong|PlayEnd|Quit|Raw|RawMode|SendFail|Serv|ServerMode|ServerOp|Signal|Snotice|Start|Text|Topic|UnBan|Unload|Unotify|User|Mode|Voice|Wallops|WaveEnd):)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),*/
+        //Channel names
+        3 => '(#|@)[a-zA-Z0-9]+',
+        4 => '-[a-z\d]+',
+        //Raw protocol handling
+        5 => 'raw (\d|\*):',
+        //Timer handling
+        6 => '(?<!>|:|\/)\/timer(?!s\b)[0-9a-zA-Z_]+',
+        // /...
+        7 => '(?<!>|:|\/|\w)\/[a-zA-Z][a-zA-Z0-9]*(?!>)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![\w\$\|\#;<^&])'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/mmix.php b/vendor/easybook/geshi/geshi/mmix.php
new file mode 100755
index 000000000..60b6e28ce
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/mmix.php
@@ -0,0 +1,193 @@
+<?php
+/*************************************************************************************
+ * mmix.php
+ * -------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2009 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/16
+ *
+ * MMIX Assembler language file for GeSHi.
+ *
+ * This is an implementation of the MMIX language as designed by Donald E. Knuth
+ *
+ * CHANGES
+ * -------
+ * 2004/08/05 (1.0.8.6)
+ *   -  First Release
+ *
+ * TODO (updated 2009/10/16)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MMIX',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '%'),
+    'COMMENT_MULTI' => array(),
+    //Line address prefix suppression
+    'COMMENT_REGEXP' => array(
+        3 => "/^\s*(?!\s)[^\w].*$/m",
+        4 => "/^\s*[0-9a-f]{12,16}+(?:\s+[0-9a-f]+(?:\.{3}[0-9a-f]{2,})?)?:/mi"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' => array(
+        1 => '(?<![\d\$#\w])[\da-fA-F]+(?!\w)',
+        2 => '#[\da-fA-F]+',
+        3 => '\$\d+'
+        ),
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            '16ADDU','2ADDU','4ADDU','8ADDU','ADD','ADDU','AND','ANDN','ANDNH',
+            'ANDNL','ANDNMH','ANDNML','BDIF','BEV','BN','BNN','BNP','BNZ','BOD',
+            'BP','BZ','CMP','CMPU','CSEV','CSN','CSNN','CSNP','CSNZ','CSOD',
+            'CSP','CSWAP','CSZ','DIV','DIVU','FADD','FCMP','FCMPE','FDIV',
+            'FEQL','FEQLE','FINT','FIX','FIXU','FLOT','FLOTU','FMUL','FREM',
+            'FSQRT','FSUB','FUN','FUNE','GET','GETA','GO','INCH','INCL','INCMH',
+            'INCML','JMP','LDA','LDB','LDBU','LDHT','LDO','LDOU','LDSF','LDT',
+            'LDTU','LDUNC','LDVTS','LDW','LDWU','MOR','MUL','MULU','MUX','MXOR',
+            'NAND','NEG','NEGU','NOR','NXOR','ODIF','OR','ORH','ORL','ORMH',
+            'ORML','ORN','PBEV','PBN','PBNN','PBNP','PBNZ','PBOD','PBP','PBZ',
+            'POP','PREGO','PRELD','PREST','PUSHGO','PUSHJ','PUT','RESUME','SADD',
+            'SAVE','SETH','SETL','SETMH','SETML','SFLOT','SFLOTU','SL','SLU',
+            'SR','SRU','STB','STBU','STCO','STHT','STO','STOU','STSF','STT',
+            'STTU','STUNC','STW','STWU','SUB','SUBU','SWYM','SYNC','SYNCD',
+            'SYNCID','TDIF','TRAP','TRIP','UNSAVE','WDIF','XOR','ZSEV','ZSN',
+            'ZSNN','ZSNP','ZSNZ','ZSOD','ZSP','ZSZ'
+            ),
+        2 => array(
+            'BSPEC','BYTE','ESPEC','GREG','IS','LOC','LOCAL','OCTA',
+            'PREFIX','SET','TETRA','WYDE'
+            ),
+        /*registers*/
+        3 => array(
+            'rA','rB','rC','rD','rE','rF','rG','rH','rI','rJ','rK','rL','rM',
+            'rN','rO','rP','rQ','rR','rS','rT','rU','rV','rW','rX','rY','rZ',
+            'rBB','rTT','rWW','rXX','rYY','rZZ'
+            ),
+//        /*Directive*/
+//        4 => array(
+//            ),
+//        /*Operands*/
+//        5 => array(
+//            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        '+', '-', '*', '/', '%',
+        '.', ',', ';', ':',
+        '<<','>>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => false,
+        3 => true,
+//        4 => false,
+//        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f; font-weight: bold;',
+            2 => 'color: #0000ff; font-weight: bold;',
+            3 => 'color: #00007f;',
+//            4 => 'color: #000000; font-weight: bold;',
+//            5 => 'color: #000000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #666666; font-style: italic;',
+            4 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;',
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #00007f;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+//            0 => 'color: #0000ff;',
+//            1 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+//        4 => '',
+//        5 => ''
+        ),
+/*
+    'NUMBERS' =>
+        GESHI_NUMBER_BIN_PREFIX_PERCENT |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX |
+        GESHI_NUMBER_OCT_SUFFIX |
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+*/
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+//        0 => /*  */ "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))(?:[0-9][0-9a-fA-F]{0,31}[hH]|0x[0-9a-fA-F]{1,32})(?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))",
+        //Binary numbers
+//        1 => "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))[01]{1,64}[bB](?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/modula2.php b/vendor/easybook/geshi/geshi/modula2.php
new file mode 100755
index 000000000..18508340b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/modula2.php
@@ -0,0 +1,136 @@
+<?php
+/****************************************************************************
+ * modula2.php
+ * -----------
+ * Author: Benjamin Kowarsch (benjamin@modula2.net)
+ * Copyright: (c) 2009 Benjamin Kowarsch (benjamin@modula2.net)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/11/05
+ *
+ * Modula-2 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/05/22 (1.0.8.8)
+ *   -  First Release
+ *
+ * TODO (updated 2010/05/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Modula-2',
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'COMMENT_SINGLE' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( /* reserved words */
+            'AND', 'ARRAY', 'BEGIN', 'BY', 'CASE', 'CONST', 'DEFINITION',
+            'DIV', 'DO', 'ELSE', 'ELSIF', 'END', 'EXIT', 'EXPORT', 'FOR',
+            'FROM', 'IF', 'IMPLEMENTATION', 'IMPORT', 'IN', 'LOOP', 'MOD',
+            'MODULE', 'NOT', 'OF', 'OR', 'POINTER', 'PROCEDURE', 'QUALIFIED',
+            'RECORD', 'REPEAT', 'RETURN', 'SET', 'THEN', 'TO', 'TYPE',
+            'UNTIL', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array( /* pervasive constants */
+            'NIL', 'FALSE', 'TRUE',
+            ),
+        3 => array( /* pervasive types */
+            'BITSET', 'CAP', 'CHR', 'DEC', 'DISPOSE', 'EXCL', 'FLOAT',
+            'HALT', 'HIGH', 'INC', 'INCL', 'MAX', 'MIN', 'NEW', 'ODD', 'ORD',
+            'SIZE', 'TRUNC', 'VAL'
+            ),
+        4 => array( /* pervasive functions and macros */
+            'ABS', 'BOOLEAN', 'CARDINAL', 'CHAR', 'INTEGER',
+            'LONGCARD', 'LONGINT', 'LONGREAL', 'PROC', 'REAL'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/', '#', '~'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/modula3.php b/vendor/easybook/geshi/geshi/modula3.php
new file mode 100755
index 000000000..ae08dcf97
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/modula3.php
@@ -0,0 +1,135 @@
+<?php
+/*************************************************************************************
+ * modula3.php
+ * ----------
+ * Author: mbishop (mbishop@esoteriq.org)
+ * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/01/21
+ *
+ * Modula-3 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Modula-3',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'AND', 'ANY', 'ARRAY', 'AS', 'BEGIN', 'BITS', 'BRANDED', 'BY', 'CASE',
+            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END', 'EVAL', 'EXCEPT', 'EXCEPTION',
+            'EXIT', 'EXPORTS', 'FINALLY', 'FOR', 'FROM', 'GENERIC', 'IF', 'IMPORT', 'IN',
+            'INTERFACE', 'LOCK', 'LOOP', 'METHODS', 'MOD', 'MODULE', 'NOT', 'OBJECT', 'OF',
+            'OR', 'OVERRIDES', 'PROCEDURE', 'RAISE', 'RAISES', 'READONLY', 'RECORD', 'REF',
+            'REPEAT', 'RETURN', 'REVEAL', 'ROOT', 'SET', 'THEN', 'TO', 'TRY', 'TYPE', 'TYPECASE',
+            'UNSAFE', 'UNTIL', 'UNTRACED', 'VALUE', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array(
+            'NIL', 'NULL', 'FALSE', 'TRUE',
+            ),
+        3 => array(
+            'ABS','ADR','ADRSIZE','BITSIZE','BYTESIZE','CEILING','DEC','DISPOSE',
+            'EXTENDED','FIRST','FLOAT','FLOOR','INC','ISTYPE','LAST','LOOPHOLE','MAX','MIN',
+            'NARROW','NEW','NUMBER','ORD','ROUND','SUBARRAY','TRUNC','TYPECODE', 'VAL'
+            ),
+        4 => array(
+            'ADDRESS', 'BOOLEAN', 'CARDINAL', 'CHAR', 'INTEGER',
+            'LONGREAL', 'MUTEX', 'REAL', 'REFANY', 'TEXT'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/mpasm.php b/vendor/easybook/geshi/geshi/mpasm.php
new file mode 100755
index 000000000..a0e1ef8ff
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/mpasm.php
@@ -0,0 +1,162 @@
+<?php
+/*************************************************************************************
+ * mpasm.php
+ * ---------
+ * Author: Bakalex (bakalex@gmail.com)
+ * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/12/6
+ *
+ * Microchip Assembler language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  - Added description of extra language features (SF#1970248)
+ * 2005/01/29 (1.0.0)
+ *  - First Release
+ *
+ * TODO (updated 2005/12/6)
+ * -------------------------
+ *
+ * For the moment, i've only added PIC16C6X registers. We need more (PIC16F/C7x/8x,
+ * PIC10, PIC18 and dsPIC registers).
+ * Must take a look to dsPIC instructions.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Microchip Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*Directive Language*/
+        4 => array(
+            'CONSTANT', '#DEFINE', 'END', 'EQU', 'ERROR', 'ERROR-LEVEL', '#INCLUDE', 'LIST',
+            'MESSG', 'NOLIST', 'ORG', 'PAGE', 'PROCESSOR', 'RADIX', 'SET', 'SPACE', 'SUBTITLE',
+            'TITLE', '#UNDEFINE', 'VARIABLE', 'ELSE', 'ENDIF', 'ENDW', 'IF', 'IFDEF', 'IFNDEF',
+            'WHILE', '__BADRAM', 'CBLOCK', '__CONFIG', 'DA', 'DATA', 'DB', 'DE', 'DT', 'DW',
+            'ENDC', 'FILL', '__IDLOCS', '__MAXRAM', 'RES', 'ENDM', 'EXITM', 'EXPAND', 'LOCAL',
+            'MACRO', 'NOEXPAND', 'BANKISEL', 'BANKSEL', 'CODE', 'EXTERN', 'GLOBAL', 'IDATA',
+            'PAGESEL', 'UDATA', 'UDATA_ACS', 'UDATA_OVR', 'UDATA_SHR'
+            ),
+        /* 12&14-bit Specific Instruction Set*/
+        1 => array(
+            'andlw', 'call', 'clrwdt', 'goto', 'iorlw', 'movlw', 'option', 'retlw', 'sleep',
+            'tris', 'xorlw', 'addwf', 'andwf', 'clrf', 'clrw', 'comf', 'decf', 'decfsz', 'incf',
+            'incfsz', 'iorwf', 'movf', 'nop', 'rlf', 'rrf', 'subwf', 'swapf', 'xorwf',
+            'bcf', 'bsf', 'btfsc', 'btfss',
+            'addlw', 'retfie', 'return', 'sublw', 'addcf', 'adddcf', 'b', 'bc', 'bdc',
+            'bnc', 'bndc', 'bnz', 'bz', 'clrc', 'clrdc', 'clrz', 'lcall', 'lgoto', 'movfw',
+            'negf', 'setc', 'setdc', 'setz', 'skpc', 'skpdc', 'skpnc', 'skpndc', 'skpnz', 'skpz',
+            'subcf', 'subdcf', 'tstf'
+            ),
+        /* 16-bit Specific Instructiob Set */
+        2 => array (
+            'movfp', 'movlb', 'movlp', 'movpf', 'movwf', 'tablrd', 'tablwt', 'tlrd', 'tlwt',
+            'addwfc', 'daw', 'mullw', 'negw', 'rlcf', 'rlncf', 'rrcf', 'rrncf', 'setf', 'subwfb',
+            'btg', 'cpfseq', 'cpfsgt', 'cpfslt', 'dcfsnz', 'infsnz', 'tstfsz', 'lfsr', 'bnn',
+            'bnov', 'bra', 'pop', 'push', 'rcall', 'reset'
+            ),
+        /* Registers */
+        3 => array(
+            'INDF', 'TMR0', 'PCL', 'STATUS', 'FSR', 'PORTA', 'PORTB', 'PORTC', 'PORTD', 'PORTE',
+            'PCLATH', 'INTCON', 'PIR1', 'PIR2', 'TMR1L', 'TMR1H', 'T1CON', 'TMR2', 'T2CON', 'TMR2L',
+            'TMR2H', 'TMR0H', 'TMR0L', 'SSPBUF', 'SSPCON', 'CCPR1L', 'CCPR1H', 'CCP1CON', 'RCSTA',
+            'TXREG', 'RCREG', 'CCPR2L', 'CCPR2H', 'CCP2CON', 'OPTION', 'TRISA', 'TRISB', 'TRISC',
+            'TRISD', 'TRISE', 'PIE2', 'PIE1', 'PR2', 'SSPADD', 'SSPSTAT', 'TXSTA', 'SPBRG'
+            ),
+        /*Operands*/
+        5 => array(
+            'high','low'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #007f00;',
+            4 => 'color: #46aa03; font-weight:bold;',
+            5 => 'color: #7f0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #ff0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '[01]{1,64}[bB]'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/mxml.php b/vendor/easybook/geshi/geshi/mxml.php
new file mode 100755
index 000000000..60dfe5f32
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/mxml.php
@@ -0,0 +1,143 @@
+<?php
+/*************************************************************************************
+ * mxml.php
+ * -------
+ * Author: David Spurr
+ * Copyright: (c) 2007 David Spurr (http://www.defusion.org.uk/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/10/04
+ *
+ * MXML language file for GeSHi. Based on the XML file by Nigel McNie
+ *
+ * CHANGES
+ * -------
+ * 2007/10/04 (1.0.7.22)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MXML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('<!--' => '-->'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #339933;',
+            3 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: bold; color: black;',
+            1 => 'color: #7400FF;',
+            2 => 'color: #7400FF;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // xml declaration
+        0 => array(
+            GESHI_SEARCH => '(&lt;[\/?|(\?xml)]?[a-z0-9_\-:]*(\?&gt;))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // opening tags
+        1 => array(
+            GESHI_SEARCH => '(&lt;\/?[a-z]+:[a-z]+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // closing tags
+        2 => array(
+            GESHI_SEARCH => '(\/?&gt;)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            //'<![CDATA[' => ']]>'
+            '<mx:Script>' => '</mx:Script>'
+            ),
+        3 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/mysql.php b/vendor/easybook/geshi/geshi/mysql.php
new file mode 100755
index 000000000..507da2d09
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/mysql.php
@@ -0,0 +1,475 @@
+<?php
+/*************************************************************************************
+ * mysql.php
+ * ---------
+ * Author: Marjolein Katsma (marjolein.is.back@gmail.com)
+ * Copyright: (c) 2008 Marjolein Katsma (http://blog.marjoleinkatsma.com/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008-12-12
+ *
+ * MySQL language file for GeSHi.
+ *
+ * Based on original MySQL language file by Carl Fürstenberg (2004); brought
+ * up-to-date for current MySQL versions, and with more classes for different
+ * types of keywords; several minor errors were corrected as well.
+ *
+ * Some "classes" have two groups here: this is to allow for the fact that some
+ * keywords in MySQL have a double function: many of those are either a function
+ * (must be immediately followed by an opening bracket) or some other keyword:
+ * so they can be distinguished by the presence (or not) of that opening bracket.
+ * (An immediately following opening bracket is a default rule for functions in
+ * MySQL, though this may be overridden; because it's only a default, we use a
+ * regex lookahead only where necessary to distinguish homonyms, not generally
+ * to match any function.)
+ * Other keywords with double usage cannot be distinguished and are classified
+ * in the "Mix" category.
+ *
+ *************************************************************************************
+ *
+ * This file is part of GeSHi.
+ *
+ * GeSHi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GeSHi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GeSHi; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MySQL',
+    //'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),    // '--' MUST be folowed by whitespace,not necessarily a space
+    'COMMENT_SINGLE' => array(
+        1 =>'-- ',
+        2 => '#'
+        ),
+    'COMMENT_REGEXP' => array(
+        1 => "/(?:--\s).*?$/",                          // double dash followed by any whitespace
+        ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,            // @@@ would be nice if this could be defined per group!
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',                              // by default only, can be specified
+    'ESCAPE_REGEXP' => array(
+        1 => "/[_%]/",                                  // search wildcards
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_OCT_PREFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            // Mix: statement keywords and keywords that don't fit in any other
+            // category, or have multiple usage/meanings
+            'ACTION','ADD','AFTER','ALGORITHM','ALL','ALTER','ANALYZE','ANY',
+            'ASC','AS','BDB','BEGIN','BERKELEYDB','BINARY','BTREE','CALL',
+            'CASCADED','CASCADE','CHAIN','CHANGE','CHECK','COLUMNS','COLUMN',
+            'COMMENT','COMMIT','COMMITTED','CONSTRAINT','CONTAINS SQL',
+            'CONSISTENT','CONVERT','CREATE','CROSS','DATA','DATABASES',
+            'DECLARE','DEFINER','DELAYED','DELETE','DESCRIBE','DESC',
+            'DETERMINISTIC','DISABLE','DISCARD','DISTINCTROW','DISTINCT','DO',
+            'DROP','DUMPFILE','DUPLICATE KEY','ENABLE','ENCLOSED BY','ENGINE',
+            'ERRORS','ESCAPED BY','EXISTS','EXPLAIN','EXTENDED','FIELDS',
+            'FIRST','FOR EACH ROW','FORCE','FOREIGN KEY','FROM','FULL',
+            'FUNCTION','GLOBAL','GRANT','GROUP BY','HANDLER','HASH','HAVING',
+            'HELP','HIGH_PRIORITY','IF NOT EXISTS','IGNORE','IMPORT','INDEX',
+            'INFILE','INNER','INNODB','INOUT','INTO','INVOKER',
+            'ISOLATION LEVEL','JOIN','KEYS','KEY','KILL','LANGUAGE SQL','LAST',
+            'LIMIT','LINES','LOAD','LOCAL','LOCK','LOW_PRIORITY',
+            'MASTER_SERVER_ID','MATCH','MERGE','MIDDLEINT','MODIFIES SQL DATA',
+            'MODIFY','MRG_MYISAM','NATURAL','NEXT','NO SQL','NO','ON',
+            'OPTIMIZE','OPTIONALLY','OPTION','ORDER BY','OUTER','OUTFILE','OUT',
+            'PARTIAL','PARTITION','PREV','PRIMARY KEY','PRIVILEGES','PROCEDURE',
+            'PURGE','QUICK','READS SQL DATA','READ','REFERENCES','RELEASE',
+            'RENAME','REORGANIZE','REPEATABLE','REQUIRE','RESTRICT','RETURNS',
+            'REVOKE','ROLLBACK','ROUTINE','RTREE','SAVEPOINT','SELECT',
+            'SERIALIZABLE','SESSION','SET','SHARE MODE','SHOW','SIMPLE',
+            'SNAPSHOT','SOME','SONAME','SQL SECURITY','SQL_BIG_RESULT',
+            'SQL_BUFFER_RESULT','SQL_CACHE','SQL_CALC_FOUND_ROWS',
+            'SQL_NO_CACHE','SQL_SMALL_RESULT','SSL','START','STARTING BY',
+            'STATUS','STRAIGHT_JOIN','STRIPED','TABLESPACE','TABLES','TABLE',
+            'TEMPORARY','TEMPTABLE','TERMINATED BY','TO','TRANSACTIONS',
+            'TRANSACTION','TRIGGER','TYPES','TYPE','UNCOMMITTED','UNDEFINED',
+            'UNION','UNLOCK_TABLES','UPDATE','USAGE','USE','USER_RESOURCES',
+            'USING','VALUES','VALUE','VIEW','WARNINGS','WHERE','WITH ROLLUP',
+            'WITH','WORK','WRITE',
+            ),
+        2 => array(     //No ( must follow
+            // Mix: statement keywords distinguished from functions by the same name
+            "CURRENT_USER", "DATABASE", "IN", "INSERT", "DEFAULT", "REPLACE", "SCHEMA", "TRUNCATE"
+            ),
+        3 => array(
+            // Values (Constants)
+            'FALSE','NULL','TRUE',
+            ),
+        4 => array(
+            // Column Data Types
+            'BIGINT','BIT','BLOB','BOOLEAN','BOOL','CHARACTER VARYING',
+            'CHAR VARYING','DATETIME','DECIMAL','DEC','DOUBLE PRECISION',
+            'DOUBLE','ENUM','FIXED','FLOAT','GEOMETRYCOLLECTION','GEOMETRY',
+            'INTEGER','INT','LINESTRING','LONGBLOB','LONGTEXT','MEDIUMBLOB',
+            'MEDIUMINT','MEDIUMTEXT','MULTIPOINT','MULTILINESTRING',
+            'MULTIPOLYGON','NATIONAL CHARACTER','NATIONAL CHARACTER VARYING',
+            'NATIONAL CHAR VARYING','NATIONAL VARCHAR','NCHAR VARCHAR','NCHAR',
+            'NUMERIC','POINT','POLYGON','REAL','SERIAL',
+            'SMALLINT','TEXT','TIMESTAMP','TINYBLOB','TINYINT',
+            'TINYTEXT','VARBINARY','VARCHARACTER','VARCHAR',
+            ),
+        5 => array(     //No ( must follow
+            // Column data types distinguished from functions by the same name
+            "CHAR", "DATE", "TIME"
+            ),
+        6 => array(
+            // Table, Column & Index Attributes
+            'AUTO_INCREMENT','AVG_ROW_LENGTH','BOTH','CHECKSUM','CONNECTION',
+            'DATA DIRECTORY','DEFAULT NULL','DELAY_KEY_WRITE','FULLTEXT',
+            'INDEX DIRECTORY','INSERT_METHOD','LEADING','MAX_ROWS','MIN_ROWS',
+            'NOT NULL','PACK_KEYS','ROW_FORMAT','SERIAL DEFAULT VALUE','SIGNED',
+            'SPATIAL','TRAILING','UNIQUE','UNSIGNED','ZEROFILL'
+            ),
+        7 => array(     //No ( must follow
+            // Column attribute distinguished from function by the same name
+            "CHARSET"
+            ),
+        8 => array(
+            // Date and Time Unit Specifiers
+            'DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND',
+            'HOUR_MICROSECOND','HOUR_MINUTE','HOUR_SECOND',
+            'MINUTE_MICROSECOND','MINUTE_SECOND',
+            'SECOND_MICROSECOND','YEAR_MONTH'
+            ),
+        9 => array(     //No ( must follow
+            // Date-time unit specifiers distinguished from functions by the same name
+            "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER", "SECOND", "WEEK", "YEAR"
+            ),
+        10 => array(
+            // Operators (see also Symbols)
+            'AND','BETWEEN','CHARACTER SET','COLLATE','DIV','IS NOT NULL',
+            'IS NOT','IS NULL','IS','LIKE','NOT','OFFSET','OR','REGEXP','RLIKE',
+            'SOUNDS LIKE','XOR'
+            ),
+        11 => array(     //No ( must follow
+            // Operator distinghuished from function by the same name
+            "INTERVAL"
+            ),
+        12 => array(
+            // Control Flow (functions)
+            'CASE','ELSE','END','IFNULL','IF','NULLIF','THEN','WHEN',
+            ),
+        13 => array(
+            // String Functions
+            'ASCII','BIN','BIT_LENGTH','CHAR_LENGTH','CHARACTER_LENGTH',
+            'CONCAT_WS','CONCAT','ELT','EXPORT_SET','FIELD',
+            'FIND_IN_SET','FORMAT','HEX','INSTR','LCASE','LEFT','LENGTH',
+            'LOAD_FILE','LOCATE','LOWER','LPAD','LTRIM','MAKE_SET','MID',
+            'OCTET_LENGTH','ORD','POSITION','QUOTE','REPEAT','REVERSE',
+            'RIGHT','RPAD','RTRIM','SOUNDEX','SPACE','STRCMP','SUBSTRING_INDEX',
+            'SUBSTRING','TRIM','UCASE','UNHEX','UPPER',
+            ),
+        14 => array(     //A ( must follow
+            // String functions distinguished from other keywords by the same name
+            "INSERT", "REPLACE", "CHAR"
+            ),
+        15 => array(
+            // Numeric Functions
+            'ABS','ACOS','ASIN','ATAN2','ATAN','CEILING','CEIL',
+            'CONV','COS','COT','CRC32','DEGREES','EXP','FLOOR','LN','LOG10',
+            'LOG2','LOG','MOD','OCT','PI','POWER','POW','RADIANS','RAND',
+            'ROUND','SIGN','SIN','SQRT','TAN',
+            ),
+        16 => array(     //A ( must follow
+            // Numeric function distinguished from other keyword by the same name
+            "TRUNCATE"
+            ),
+        17 => array(
+            // Date and Time Functions
+            'ADDDATE','ADDTIME','CONVERT_TZ','CURDATE','CURRENT_DATE',
+            'CURRENT_TIME','CURRENT_TIMESTAMP','CURTIME','DATE_ADD',
+            'DATE_FORMAT','DATE_SUB','DATEDIFF','DAYNAME','DAYOFMONTH',
+            'DAYOFWEEK','DAYOFYEAR','EXTRACT','FROM_DAYS','FROM_UNIXTIME',
+            'GET_FORMAT','LAST_DAY','LOCALTIME','LOCALTIMESTAMP','MAKEDATE',
+            'MAKETIME','MONTHNAME','NOW','PERIOD_ADD',
+            'PERIOD_DIFF','SEC_TO_TIME','STR_TO_DATE','SUBDATE','SUBTIME',
+            'SYSDATE','TIME_FORMAT','TIME_TO_SEC',
+            'TIMESTAMPADD','TIMESTAMPDIFF','TO_DAYS',
+            'UNIX_TIMESTAMP','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','WEEKDAY',
+            'WEEKOFYEAR','YEARWEEK',
+            ),
+        18 => array(     //A ( must follow
+            // Date-time functions distinguished from other keywords by the same name
+            "DATE", "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER",
+            "SECOND", "TIME", "WEEK", "YEAR"
+            ),
+        19 => array(
+            // Comparison Functions
+            'COALESCE','GREATEST','ISNULL','LEAST',
+            ),
+        20 => array(     //A ( must follow
+            // Comparison functions distinguished from other keywords by the same name
+            "IN", "INTERVAL"
+            ),
+        21 => array(
+            // Encryption and Compression Functions
+            'AES_DECRYPT','AES_ENCRYPT','COMPRESS','DECODE','DES_DECRYPT',
+            'DES_ENCRYPT','ENCODE','ENCRYPT','MD5','OLD_PASSWORD','PASSWORD',
+            'SHA1','SHA','UNCOMPRESS','UNCOMPRESSED_LENGTH',
+            ),
+        22 => array(
+            // GROUP BY (aggregate) Functions
+            'AVG','BIT_AND','BIT_OR','BIT_XOR','COUNT','GROUP_CONCAT',
+            'MAX','MIN','STDDEV_POP','STDDEV_SAMP','STDDEV','STD','SUM',
+            'VAR_POP','VAR_SAMP','VARIANCE',
+            ),
+        23 => array(
+            // Information Functions
+            'BENCHMARK','COERCIBILITY','COLLATION','CONNECTION_ID',
+            'FOUND_ROWS','LAST_INSERT_ID','ROW_COUNT',
+            'SESSION_USER','SYSTEM_USER','USER','VERSION',
+            ),
+        24 => array(     //A ( must follow
+            // Information functions distinguished from other keywords by the same name
+            "CURRENT_USER", "DATABASE", "SCHEMA", "CHARSET"
+            ),
+        25 => array(
+            // Miscellaneous Functions
+            'ExtractValue','BIT_COUNT','GET_LOCK','INET_ATON','INET_NTOA',
+            'IS_FREE_LOCK','IS_USED_LOCK','MASTER_POS_WAIT','NAME_CONST',
+            'RELEASE_LOCK','SLEEP','UpdateXML','UUID',
+            ),
+        26 => array(     //A ( must follow
+            // Miscellaneous function distinguished from other keyword by the same name
+            "DEFAULT"
+            ),
+        27 => array(
+            // Geometry Functions
+            'Area','AsBinary','AsText','AsWKB','AsWKT','Boundary','Buffer',
+            'Centroid','Contains','ConvexHull','Crosses',
+            'Difference','Dimension','Disjoint','Distance',
+            'EndPoint','Envelope','Equals','ExteriorRing',
+            'GLength','GeomCollFromText','GeomCollFromWKB','GeomFromText',
+            'GeomFromWKB','GeometryCollectionFromText',
+            'GeometryCollectionFromWKB','GeometryFromText','GeometryFromWKB',
+            'GeometryN','GeometryType',
+            'InteriorRingN','Intersection','Intersects','IsClosed','IsEmpty',
+            'IsRing','IsSimple',
+            'LineFromText','LineFromWKB','LineStringFromText',
+            'LineStringFromWKB',
+            'MBRContains','MBRDisjoint','MBREqual','MBRIntersects',
+            'MBROverlaps','MBRTouches','MBRWithin','MLineFromText',
+            'MLineFromWKB','MPointFromText','MPointFromWKB','MPolyFromText',
+            'MPolyFromWKB','MultiLineStringFromText','MultiLineStringFromWKB',
+            'MultiPointFromText','MultiPointFromWKB','MultiPolygonFromText',
+            'MultiPolygonFromWKB',
+            'NumGeometries','NumInteriorRings','NumPoints',
+            'Overlaps',
+            'PointFromText','PointFromWKB','PointN','PointOnSurface',
+            'PolyFromText','PolyFromWKB','PolygonFromText','PolygonFromWKB',
+            'Related','SRID','StartPoint','SymDifference',
+            'Touches',
+            'Union',
+            'Within',
+            'X',
+            'Y',
+            ),
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            /* Operators */
+            '=', ':=',                                      // assignment operators
+            '||', '&&', '!',                                // locical operators
+            '=', '<=>', '>=', '>', '<=', '<', '<>', '!=',   // comparison operators
+            '|', '&', '^', '~', '<<', '>>',                 // bitwise operators
+            '-', '+', '*', '/', '%',                        // numerical operators
+            ),
+        2 => array(
+            /* Other syntactical symbols */
+            '(', ')',
+            ',', ';',
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false,
+        13 => false,
+        13 => false,
+        14 => false,
+        15 => false,
+        16 => false,
+        17 => false,
+        18 => false,
+        19 => false,
+        20 => false,
+        21 => false,
+        22 => false,
+        23 => false,
+        24 => false,
+        25 => false,
+        26 => false,
+        27 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990099; font-weight: bold;',      // mix
+            2 => 'color: #990099; font-weight: bold;',      // mix
+            3 => 'color: #9900FF; font-weight: bold;',      // constants
+            4 => 'color: #999900; font-weight: bold;',      // column data types
+            5 => 'color: #999900; font-weight: bold;',      // column data types
+            6 => 'color: #FF9900; font-weight: bold;',      // attributes
+            7 => 'color: #FF9900; font-weight: bold;',      // attributes
+            8 => 'color: #9900FF; font-weight: bold;',      // date-time units
+            9 => 'color: #9900FF; font-weight: bold;',      // date-time units
+
+            10 => 'color: #CC0099; font-weight: bold;',      // operators
+            11 => 'color: #CC0099; font-weight: bold;',      // operators
+
+            12 => 'color: #009900;',     // control flow (functions)
+            13 => 'color: #000099;',     // string functions
+            14 => 'color: #000099;',     // string functions
+            15 => 'color: #000099;',     // numeric functions
+            16 => 'color: #000099;',     // numeric functions
+            17 => 'color: #000099;',     // date-time functions
+            18 => 'color: #000099;',     // date-time functions
+            19 => 'color: #000099;',     // comparison functions
+            20 => 'color: #000099;',     // comparison functions
+            21 => 'color: #000099;',     // encryption functions
+            22 => 'color: #000099;',     // aggregate functions
+            23 => 'color: #000099;',     // information functions
+            24 => 'color: #000099;',     // information functions
+            25 => 'color: #000099;',     // miscellaneous functions
+            26 => 'color: #000099;',     // miscellaneous functions
+            27 => 'color: #00CC00;',     // geometry functions
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #808000; font-style: italic;',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #004000; font-weight: bold;',
+            1 => 'color: #008080; font-weight: bold;'       // search wildcards
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #008080;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #CC0099;',         // operators
+            2 => 'color: #000033;',         // syntax
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        2 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        3 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        4 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        5 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        6 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        7 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        8 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+        9 => 'http://search.oracle.com/search/search?group=MySQL&amp;q={FNAME}',
+
+        10 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/non-typed-operators.html',
+        11 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/non-typed-operators.html',
+
+        12 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/control-flow-functions.html',
+        13 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/string-functions.html',
+        14 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/string-functions.html',
+        15 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/numeric-functions.html',
+        16 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/numeric-functions.html',
+        17 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/date-and-time-functions.html',
+        18 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/date-and-time-functions.html',
+        19 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/comparison-operators.html',
+        20 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/comparison-operators.html',
+        21 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/encryption-functions.html',
+        22 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/group-by-functions-and-modifiers.html',
+        23 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/information-functions.html',
+        24 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/information-functions.html',
+        25 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/func-op-summary-ref.html',
+        26 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/func-op-summary-ref.html',
+        27 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/analysing-spatial-information.html',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            5 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            9 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            11 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+
+            14 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            16 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            18 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            20 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            24 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            26 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/nagios.php b/vendor/easybook/geshi/geshi/nagios.php
new file mode 100755
index 000000000..47254311c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/nagios.php
@@ -0,0 +1,223 @@
+<?php
+/*************************************************************************************
+ * nagios.php
+ * --------
+ * Author: Albéric de Pertat <alberic@depertat.net>
+ * Copyright: (c) 2012 Albéric de Pertat (https://github.com/adepertat/geshi-nagios)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/01/19
+ *
+ * Nagios language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/01/19 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2012/01/19)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Nagios',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'HARDQUOTE' => array("'", "'"),
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\'',
+    'KEYWORDS' => array(
+        1 => array(
+            'define'
+            ),
+        2 => array(
+            'command', 'contact', 'contactgroup', 'host', 'hostdependency',
+            'hostescalation', 'hostextinfo', 'hostgroup', 'service',
+            'servicedependency', 'serviceescalation',
+            'serviceextinfo', 'servicegroup', 'timeperiod'
+            ),
+        3 => array(
+            'active_checks_enabled', 'passive_checks_enabled', 'alias',
+            'display_name', 'host_name', 'address', 'hostgroups', 'parents',
+            'hostgroup_members', 'members', 'service_description',
+            'servicegroups', 'is_volatile', 'servicegroup_name',
+            'servicegroup_members', 'contact_name', 'contactgroups', 'email',
+            'pager', 'can_submit_commands', 'contactgroup_name',
+            'contactgroup_members', 'host_notifications_enabled',
+            'service_notifications_enabled', 'host_notification_period',
+            'service_notification_period', 'host_notification_options',
+            'service_notification_options', 'host_notification_commands',
+            'service_notification_commands', 'check_command',
+            'check_freshness', 'check_interval', 'check_period', 'contacts',
+            'contact_groups', 'event_handler', 'event_handler_enabled',
+            'flap_detection_enabled', 'flap_detection_options',
+            'freshness_threshold', 'initial_state', 'low_flap_threshold',
+            'high_flap_threshold', 'max_check_attempts',
+            'notification_interval', 'first_notification_delay',
+            'notification_period', 'notification_options',
+            'notifications_enabled', 'stalking_options', 'notes', 'notes_url',
+            'action_url', 'icon_image', 'icon_image_alt', 'vrml_image',
+            'statusmap_image', '2d_coords', '3d_coords', 'obsess_over_host',
+            'obsess_over_hostver_service', 'process_perf_data',
+            'retain_status_information', 'retain_nonstatus_information',
+            'retry_interval', 'register', 'use', 'name', 'timeperiod_name',
+            'exclude', 'command_name', 'command_line', 'dependent_host_name',
+            'dependent_hostgroup_name', 'dependent_service_description',
+            'inherits_parent', 'execution_failure_criteria',
+            'notification_failure_criteria', 'dependency_period',
+            'first_notification', 'last_notification', 'escalation_period',
+            'escalation_options'
+            ),
+        4 => array(
+            'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday',
+            'sunday', 'january', 'february', 'march', 'april', 'may', 'june',
+            'july', 'august', 'september', 'october', 'november', 'december',
+            'day'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '{', '}', ',', '+'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight:bold;color:#FFDCA8;',
+            2 => 'font-weight:bold;color #FFA858;',
+            3 => 'font-weight:bold;color:#00C0C0;',
+            4 => 'font-weight:bold;color:#C0C0FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'font-weight:bold;color:#000000;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #AAAAAA; font-style: italic;',
+            1 => 'color: #AAAAAA; font-style: italic;',
+            2 => 'color: #AAAAAA; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #660066;',
+            'HARD' => 'color: #660066;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight:bold;color:#808080;',
+            1 => 'font-weight:bold;color:#000080;',
+            2 => 'font-weight:bold;color:red;',
+            3 => 'font-weight:bold;color:#808000;',
+            4 => 'font-weight:bold;color:blue;',
+            5 => 'font-weight:bold;color:#C0FFC0;',
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            )
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '\\'
+        ),
+    'REGEXPS' => array(
+        // Custom macros
+        0 => array(
+            GESHI_SEARCH => '(\$[a-zA-Z_]+\$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // Custom macro definitions
+        1 => array(
+            GESHI_SEARCH => '(\A|\s)(_[a-zA-Z_]+)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '',
+            ),
+        // $USERxx$
+        2 => array(
+            GESHI_SEARCH => '(\$USER[0-9]+\$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // $ARGxx$
+        3 => array(
+            GESHI_SEARCH => '(\$ARG[1-9]\$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // register 0
+        4 => array(
+            GESHI_SEARCH => '(\bregister[\\x20\\t]+[01])',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // use
+        5 => array(
+            GESHI_SEARCH => '(use[\\x20\\t]+[^\\x20\\t]+)([\\x20\\t]*[$;#])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '',
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/netrexx.php b/vendor/easybook/geshi/geshi/netrexx.php
new file mode 100755
index 000000000..b038aa4d5
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/netrexx.php
@@ -0,0 +1,161 @@
+<?php
+/*************************************************************************************
+ * netrexx.php
+ * ---------------------------------
+ * Author: Jon Wolfers (sahananda@windhorse.biz)
+ * Contributors:
+ *    - Walter Pachl (pachl@chello.at)
+ * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/01/07
+ *
+ * NetRexx language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/07/29 (1.0.0)
+ *    -  tried to get it syntactically right
+ *
+ * TODO (updated 2012/07/29)
+ * -------------------------
+ *   -  Get it working on rosettacode.org
+ *
+ *************************************************************************************
+ *
+ *      This file is part of GeSHi.
+ *
+ *    GeSHi is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    GeSHi is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with GeSHi; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'NetRexx',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'class', 'do', 'exit', 'if', 'import', 'iterate', 'leave',
+            'loop', 'nop', 'numeric', 'package', 'parse', 'properties',
+            'return', 'say', 'select', 'signal', 'trace'
+            ),
+        2 => array(
+            'abstract', 'adapter', 'all', 'ask', 'binary', 'case',
+            'constant', 'dependent', 'deprecated', 'extends', 'final',
+            'implements', 'inheritable', 'interface', 'label', 'methods',
+            'native', 'off', 'private', 'protect', 'public', 'results',
+            'returns', 'shared', 'signals', 'source', 'static',
+            'transient', 'unused', 'uses', 'version', 'volatile'
+            ),
+        3 => array(
+            'catch', 'else', 'end', 'finally', 'otherwise', 'then', 'when'
+            ),
+        4 => array(
+            'rc', 'result', 'self', 'sigl', 'super'
+            ),
+        5 => array(
+            'placeholderforoorexxdirectives'
+            ),
+        6 => array(
+            'abbrev', 'abs', 'b2x', 'c2d', 'c2x', 'center', 'centre',
+            'changestr', 'compare', 'copies', 'copyindexed', 'countstr',
+            'd2c', 'd2x', 'datatype', 'delstr', 'delword', 'exists',
+            'formword', 'hashcode', 'insert', 'lastpos', 'left', 'lower',
+            'max', 'min', 'noteq', 'noteqs', 'opadd', 'opand', 'opcc',
+            'opccblank', 'opdiv', 'opdivi', 'opeq', 'opeqs', 'opgt',
+            'opgteq', 'opgteqs', 'opgts', 'oplt', 'oplteq', 'oplteqs',
+            'oplts', 'opminus', 'opmult', 'opnot', 'opor', 'opplus',
+            'oppow', 'oprem', 'opsub', 'opxor', 'overlay', 'pos position',
+            'reverse', 'right', 'sequence', 'setdigits', 'setform',
+            'sign', 'space', 'strip', 'substr', 'subword', 'toboolean',
+            'tobyte', 'tochar', 'todouble', 'tofloat', 'toint', 'tolong',
+            'toshort', 'tostring', 'translate', 'trunc', 'upper',
+            'verify', 'word', 'wordindex', 'wordlength', 'wordpos',
+            'words', 'x2b', 'x2c', 'x2d'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '<', '>', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':',
+        '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            3 => 'color: #00ff00; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;',
+            5 => 'color: #880088; font-weight: bold;',
+            6 => 'color: #888800; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            'MULTI' => 'color: #808080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/newlisp.php b/vendor/easybook/geshi/geshi/newlisp.php
new file mode 100755
index 000000000..0dc6c1619
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/newlisp.php
@@ -0,0 +1,191 @@
+<?php
+/*************************************************************************************
+ * newlisp.php
+ * ----------
+ * Author: cormullion (cormullion@mac.com) Sept 2009
+ * Copyright: (c) 2009 Cormullion (http://unbalanced-parentheses.nfshost.com/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/09/30
+ *
+ * newLISP language file for GeSHi.
+ *
+ * based on work by Lutz Mueller and Jeff Ober
+ *
+ * CHANGES
+ * -------
+ * 2009/09/30 (1.0.8.6)
+ *  -  First Release
+ *
+ * TODO (updated 2009/09/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'newlisp',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
+    'COMMENT_MULTI' => array('[text]' => '[/text]', '{' => '}'), // also used for strings
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_SCI_ZERO,
+    'TAB_WIDTH' => 2,
+    'KEYWORDS' => array(
+        1 => array(
+            'NaN?','abort','abs','acos','acosh','add','address','amb','and',
+            'append','append-file','apply','args','array','array-list','array?',
+            'asin','asinh','assoc','atan','atan2','atanh','atom?','base64-dec',
+            'base64-enc','bayes-query','bayes-train','begin','beta','betai',
+            'bind','binomial','bits','callback','case','catch','ceil',
+            'change-dir','char','chop','clean','close','command-event','cond',
+            'cons','constant','context','context?','copy','copy-file','cos',
+            'cosh','count','cpymem','crc32','crit-chi2','crit-z','current-line',
+            'curry','date','date-value','debug','dec','def-new','default',
+            'define','define-macro','delete','delete-file','delete-url',
+            'destroy','det','device','difference','directory','directory?',
+            'div','do-until','do-while','doargs','dolist','dostring','dotimes',
+            'dotree','dump','dup','empty?','encrypt','ends-with','env','erf',
+            'error-event','estack','eval','eval-string','exec','exists','exit',
+            'exp','expand','explode','factor','fft','file-info','file?',
+            'filter','find','find-all','first','flat','float','float?','floor',
+            'flt','for','for-all','fork','format','fv','gammai','gammaln','gcd',
+            'get-char','get-float','get-int','get-long','get-string','get-url',
+            'global','global?','if','if-not','ifft','import','inc','index',
+            'inf?','int','integer','integer?','intersect','invert','irr','join',
+            'lambda','lambda?','last','last-error','legal?','length','let',
+            'letex','letn','list','list?','load','local','log','lookup',
+            'lower-case','macro?','main-args','make-dir','map','mat','match',
+            'max','member','min','mod','mul','multiply','name','net-accept',
+            'net-close','net-connect','net-error','net-eval','net-interface',
+            'net-listen','net-local','net-lookup','net-peek','net-peer',
+            'net-ping','net-receive','net-receive-from','net-receive-udp',
+            'net-select','net-send','net-send-to','net-send-udp','net-service',
+            'net-sessions','new','nil','nil?','normal','not','now','nper','npv',
+            'nth','null?','number?','open','or','pack','parse','parse-date',
+            'peek','pipe','pmt','pop','pop-assoc','post-url','pow',
+            'pretty-print','primitive?','print','println','prob-chi2','prob-z',
+            'process','prompt-event','protected?','push','put-url','pv','quote',
+            'quote?','rand','random','randomize','read-buffer','read-char',
+            'read-expr','read-file','read-key','read-line','read-utf8',
+            'real-path','receive','ref','ref-all','regex','regex-comp',
+            'remove-dir','rename-file','replace','reset','rest','reverse',
+            'rotate','round','save','search','seed','seek','select','semaphore',
+            'send','sequence','series','set','set-locale','set-ref',
+            'set-ref-all','setf','setq','sgn','share','signal','silent','sin',
+            'sinh','sleep','slice','sort','source','spawn','sqrt','starts-with',
+            'string','string?','sub','swap','sym','symbol?','symbols','sync',
+            'sys-error','sys-info','tan','tanh','throw','throw-error','time',
+            'time-of-day','timer','title-case','trace','trace-highlight',
+            'transpose','trim','true','true?','unicode','unify','unique',
+            'unless','unpack','until','upper-case','utf8','utf8len','uuid',
+            'wait-pid','when','while','write-buffer','write-char','write-file',
+            'write-line','xfer-event','xml-error','xml-parse','xml-type-tags',
+            'zero?'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')','\''
+            ),
+        1 => array(
+            '!','!=','$','%','&','*','+','-','/',':',
+            '<','<<','<=','=','>','>=','>>','^','|'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #00aa00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009900;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #777700;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000099;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #AA0000;',
+            1 => 'color: #0000AA;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00aa00;',
+            1 => 'color: #00aa00;',
+            2 => 'color: #00aa00;',
+            3 => 'color: #00aa00;',
+            4 => 'color: #00aa00;',
+            5 => 'color: #AA0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.newlisp.org/downloads/newlisp_manual.html#{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(':'),
+    'REGEXPS' => array(
+        // tags in newlispdoc
+        0 => "\s+@\S*?\s+",
+        // dollar sign symbols
+        1 => "[\\$]\w*",
+        // curly-braced string literals
+        2 => "{[^{}]*?}",
+        // [text] multi-line strings
+        3 => "(?s)\[text\].*\[\/text\](?-s)",
+        // [code] multi-line blocks
+        4 => "(?s)\[code\].*\[\/code\](?-s)",
+        // variable references
+        5 => "'[\w\-]+"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<=[^\w\-])',
+            )
+        ),
+
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/nginx.php b/vendor/easybook/geshi/geshi/nginx.php
new file mode 100644
index 000000000..0d4fe3b4f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/nginx.php
@@ -0,0 +1,868 @@
+<?php
+/*************************************************************************************
+ * nginx.php
+ * ------
+ * Author: Cliff Wells (cliff@nginx.org)
+ * Copyright: (c) Cliff Wells (http://wiki.nginx.org/CliffWells)
+ * Contributors:
+ *  - Deoren Moor (http://www.whyaskwhy.org/blog/)
+ *  - Thomas Joiner
+ * Release Version: 1.0.8.12
+ * Date Started: 2010/08/24
+ *
+ * nginx language file for GeSHi.
+ *
+ * Original release found at http://forum.nginx.org/read.php?2,123194,123210
+ *
+ * CHANGES
+ * -------
+ * 2012/08/29
+ *   - Clean up the duplicate keywords
+ *
+ * 2012/08/26
+ *   - Synchronized with directives listed on wiki/doc pages
+ *   - Misc formatting tweaks and language fixes to pass langcheck
+ *
+ * 2010/08/24
+ *   - First Release
+ *
+ * TODO (updated 2012/08/26)
+ * -------------------------
+ *  - Verify PARSER_CONTROL items are correct
+ *  - Verify REGEXPS
+ *  - Verify ['STYLES']['REGEXPS'] entries
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'nginx',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // core module
+            // http://wiki.nginx.org/CoreModule
+            // http://nginx.org/en/docs/ngx_core_module.html
+            'daemon',
+            'debug_points',
+            'env',
+            'error_log',
+            'events',
+            'include',
+            'lock_file',
+            'master_process',
+            'pcre_jit',
+            'pid',
+            'ssl_engine',
+            'timer_resolution',
+            'user',
+            'worker_cpu_affinity',
+            'worker_priority',
+            'worker_processes',
+            'worker_rlimit_core',
+            'worker_rlimit_nofile',
+            'worker_rlimit_sigpending',
+            'working_directory',
+            // see EventsModule due to organization of wiki
+            //'accept_mutex',
+            //'accept_mutex_delay',
+            //'debug_connection',
+            //'multi_accept',
+            //'use',
+            //'worker_connections',
+            ),
+        2 => array( // events module
+            // http://wiki.nginx.org/EventsModule
+            // http://nginx.org/en/docs/ngx_core_module.html
+            'accept_mutex',
+            'accept_mutex_delay',
+            'debug_connection',
+            'devpoll_changes',
+            'devpoll_events',
+            'kqueue_changes',
+            'kqueue_events',
+            'epoll_events',
+            'multi_accept',
+            'rtsig_signo',
+            'rtsig_overflow_events',
+            'rtsig_overflow_test',
+            'rtsig_overflow_threshold',
+            'use',
+            'worker_connections',
+            ),
+        3 => array( // http module
+            // http://wiki.nginx.org/HttpCoreModule
+            // http://nginx.org/en/docs/http/ngx_http_core_module.html
+            'aio',
+            'alias',
+            'chunked_transfer_encoding',
+            'client_body_buffer_size',
+            'client_body_in_file_only',
+            'client_body_in_single_buffer',
+            'client_body_temp_path',
+            'client_body_timeout',
+            'client_header_buffer_size',
+            'client_header_timeout',
+            'client_max_body_size',
+            'connection_pool_size',
+            'default_type',
+            'directio',
+            'directio_alignment',
+            'disable_symlinks',
+            'error_page',
+            'etag',
+            'http',
+            'if_modified_since',
+            'ignore_invalid_headers',
+            'internal',
+            'keepalive_disable',
+            'keepalive_requests',
+            'keepalive_timeout',
+            'large_client_header_buffers',
+            'limit_except',
+            'limit_rate',
+            'limit_rate_after',
+            'lingering_close',
+            'lingering_time',
+            'lingering_timeout',
+            'listen',
+            'location',
+            'log_not_found',
+            'log_subrequest',
+            'max_ranges',
+            'merge_slashes',
+            'msie_padding',
+            'msie_refresh',
+            'open_file_cache',
+            'open_file_cache_errors',
+            'open_file_cache_min_uses',
+            'open_file_cache_valid',
+            'optimize_server_names',
+            'port_in_redirect',
+            'postpone_output',
+            'read_ahead',
+            'recursive_error_pages',
+            'request_pool_size',
+            'reset_timedout_connection',
+            'resolver',
+            'resolver_timeout',
+            'root',
+            'satisfy',
+            'satisfy_any',
+            'send_lowat',
+            'send_timeout',
+            'sendfile',
+            'sendfile_max_chunk',
+            'server',
+            'server_name',
+            'server_name_in_redirect',
+            'server_names_hash_bucket_size',
+            'server_names_hash_max_size',
+            'server_tokens',
+            'tcp_nodelay',
+            'tcp_nopush',
+            'try_files',
+            'types',
+            'types_hash_bucket_size',
+            'types_hash_max_size',
+            'underscores_in_headers',
+            'variables_hash_bucket_size',
+            'variables_hash_max_size',
+            ),
+        4 => array( // upstream module
+            // http://wiki.nginx.org/HttpUpstreamModule
+            // http://nginx.org/en/docs/http/ngx_http_upstream_module.html
+            'ip_hash',
+            'keepalive',
+            'least_conn',
+            // Use the documentation from the core module since every conf will have at least one of those.
+            //'server',
+            'upstream',
+            ),
+        5 => array( // access module
+            // http://wiki.nginx.org/HttpAccessModule
+            // http://nginx.org/en/docs/http/ngx_http_access_module.html
+            'deny',
+            'allow',
+            ),
+        6 => array( // auth basic module
+            // http://wiki.nginx.org/HttpAuthBasicModule
+            // http://nginx.org/en/docs/http/ngx_http_auth_basic_module.html
+            'auth_basic',
+            'auth_basic_user_file'
+            ),
+        7 => array( // auto index module
+            // http://wiki.nginx.org/HttpAutoindexModule
+            // http://nginx.org/en/docs/http/ngx_http_autoindex_module.html
+            'autoindex',
+            'autoindex_exact_size',
+            'autoindex_localtime',
+            ),
+        8 => array( // browser module
+            // http://wiki.nginx.org/HttpBrowserModule
+            // http://nginx.org/en/docs/http/ngx_http_browser_module.html
+            'ancient_browser',
+            'ancient_browser_value',
+            'modern_browser',
+            'modern_browser_value',
+            ),
+        9 => array( // charset module
+            // http://wiki.nginx.org/HttpCharsetModule
+            // http://nginx.org/en/docs/http/ngx_http_charset_module.html
+            'charset',
+            'charset_map',
+            'charset_types',
+            'override_charset',
+            'source_charset',
+            ),
+        10 => array( // empty gif module
+            // http://wiki.nginx.org/HttpEmptyGifModule
+            // http://nginx.org/en/docs/http/ngx_http_empty_gif_module.html
+            'empty_gif',
+            ),
+        11 => array( // fastcgi module
+            // http://wiki.nginx.org/HttpFastcgiModule
+            // http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html
+            'fastcgi_bind',
+            'fastcgi_buffer_size',
+            'fastcgi_buffers',
+            'fastcgi_busy_buffers_size',
+            'fastcgi_cache',
+            'fastcgi_cache_bypass',
+            'fastcgi_cache_key',
+            'fastcgi_cache_lock',
+            'fastcgi_cache_lock_timeout',
+            'fastcgi_cache_methods',
+            'fastcgi_cache_min_uses',
+            'fastcgi_cache_path',
+            'fastcgi_cache_use_stale',
+            'fastcgi_cache_valid',
+            'fastcgi_connect_timeout',
+            'fastcgi_hide_header',
+            'fastcgi_ignore_client_abort',
+            'fastcgi_ignore_headers',
+            'fastcgi_index',
+            'fastcgi_intercept_errors',
+            'fastcgi_keep_conn',
+            'fastcgi_max_temp_file_size',
+            'fastcgi_next_upstream',
+            'fastcgi_no_cache',
+            'fastcgi_param',
+            'fastcgi_pass',
+            'fastcgi_pass_header',
+            'fastcgi_pass_request_body',
+            'fastcgi_pass_request_headers',
+            'fastcgi_read_timeout',
+            'fastcgi_redirect_errors',
+            'fastcgi_send_timeout',
+            'fastcgi_split_path_info',
+            'fastcgi_store',
+            'fastcgi_store_access',
+            'fastcgi_temp_file_write_size',
+            'fastcgi_temp_path',
+            ),
+        12 => array( // geo module
+            // http://wiki.nginx.org/HttpGeoModule
+            // http://nginx.org/en/docs/http/ngx_http_geo_module.html
+            'geo'
+            ),
+        13 => array( // gzip module
+            // http://wiki.nginx.org/HttpGzipModule
+            // http://nginx.org/en/docs/http/ngx_http_gzip_module.html
+            'gzip',
+            'gzip_buffers',
+            'gzip_comp_level',
+            'gzip_disable',
+            'gzip_min_length',
+            'gzip_http_version',
+            'gzip_proxied',
+            'gzip_types',
+            'gzip_vary',
+            ),
+        14 => array( // headers module
+            // http://wiki.nginx.org/HttpHeadersModule
+            // http://nginx.org/en/docs/http/ngx_http_headers_module.html
+            'add_header',
+            'expires',
+            ),
+        15 => array( // index module
+            // http://wiki.nginx.org/HttpIndexModule
+            // http://nginx.org/en/docs/http/ngx_http_index_module.html
+            'index',
+            ),
+        16 => array( // limit requests module
+            // http://wiki.nginx.org/HttpLimitReqModule
+            // http://nginx.org/en/docs/http/ngx_http_limit_req_module.html
+            'limit_req',
+            'limit_req_log_level',
+            'limit_req_zone',
+            ),
+        17 => array( // referer module
+            // http://wiki.nginx.org/HttpRefererModule
+            // http://nginx.org/en/docs/http/ngx_http_referer_module.html
+            'referer_hash_bucket_size',
+            'referer_hash_max_size',
+            'valid_referers',
+            ),
+        18 => array( // limit zone module
+            // deprecated in 1.1.8
+            // http://wiki.nginx.org/HttpLimitZoneModule
+            'limit_zone',
+            // Covered by documentation for ngx_http_limit_conn_module
+            //'limit_conn',
+            ),
+        19 => array( // limit connection module
+            // http://wiki.nginx.org/HttpLimitConnModule
+            // http://nginx.org/en/docs/http/ngx_http_limit_conn_module.html
+            'limit_conn',
+            'limit_conn_zone',
+            'limit_conn_log_level',
+            ),
+        20 => array( // log module
+            // http://wiki.nginx.org/HttpLogModule
+            // http://nginx.org/en/docs/http/ngx_http_log_module.html
+            'access_log',
+            'log_format',
+            // Appears to be deprecated
+            'log_format_combined',
+            'open_log_file_cache',
+            ),
+        21 => array( // map module
+            // http://wiki.nginx.org/HttpMapModule
+            // http://nginx.org/en/docs/http/ngx_http_map_module.html
+            'map',
+            'map_hash_max_size',
+            'map_hash_bucket_size',
+            ),
+        22 => array( // memcached module
+            // http://wiki.nginx.org/HttpMemcachedModule
+            // http://nginx.org/en/docs/http/ngx_http_memcached_module.html
+            'memcached_buffer_size',
+            'memcached_connect_timeout',
+            'memcached_next_upstream',
+            'memcached_pass',
+            'memcached_read_timeout',
+            'memcached_send_timeout',
+            ),
+        23 => array( // proxy module
+            // http://wiki.nginx.org/HttpProxyModule
+            // http://nginx.org/en/docs/http/ngx_http_proxy_module.html
+            'proxy_bind',
+            'proxy_buffer_size',
+            'proxy_buffering',
+            'proxy_buffers',
+            'proxy_busy_buffers_size',
+            'proxy_cache',
+            'proxy_cache_bypass',
+            'proxy_cache_key',
+            'proxy_cache_lock',
+            'proxy_cache_lock_timeout',
+            'proxy_cache_methods',
+            'proxy_cache_min_uses',
+            'proxy_cache_path',
+            'proxy_cache_use_stale',
+            'proxy_cache_valid',
+            'proxy_connect_timeout',
+            'proxy_cookie_domain',
+            'proxy_cookie_path',
+            'proxy_headers_hash_bucket_size',
+            'proxy_headers_hash_max_size',
+            'proxy_hide_header',
+            'proxy_http_version',
+            'proxy_ignore_client_abort',
+            'proxy_ignore_headers',
+            'proxy_intercept_errors',
+            'proxy_max_temp_file_size',
+            'proxy_method',
+            'proxy_next_upstream',
+            'proxy_no_cache',
+            'proxy_pass',
+            'proxy_pass_header',
+            'proxy_pass_request_body',
+            'proxy_pass_request_headers',
+            'proxy_redirect',
+            'proxy_read_timeout',
+            'proxy_redirect_errors',
+            'proxy_send_lowat',
+            'proxy_send_timeout',
+            'proxy_set_body',
+            'proxy_set_header',
+            'proxy_ssl_session_reuse',
+            'proxy_store',
+            'proxy_store_access',
+            'proxy_temp_file_write_size',
+            'proxy_temp_path',
+            'proxy_upstream_fail_timeout',
+            'proxy_upstream_max_fails',
+            ),
+        24 => array( // rewrite module
+            // http://wiki.nginx.org/HttpRewriteModule
+            // http://nginx.org/en/docs/http/ngx_http_rewrite_module.html
+            'break',
+            'if',
+            'return',
+            'rewrite',
+            'rewrite_log',
+            'set',
+            'uninitialized_variable_warn',
+            ),
+        25 => array( // ssi module
+            // http://wiki.nginx.org/HttpSsiModule
+            // http://nginx.org/en/docs/http/ngx_http_ssi_module.html
+            'ssi',
+            'ssi_silent_errors',
+            'ssi_types',
+            'ssi_value_length',
+            ),
+        26 => array( // user id module
+            // http://wiki.nginx.org/HttpUseridModule
+            // http://nginx.org/en/docs/http/ngx_http_userid_module.html
+            'userid',
+            'userid_domain',
+            'userid_expires',
+            'userid_name',
+            'userid_p3p',
+            'userid_path',
+            'userid_service',
+            ),
+        27 => array( // addition module
+            // http://wiki.nginx.org/HttpAdditionModule
+            // http://nginx.org/en/docs/http/ngx_http_addition_module.html
+            'add_before_body',
+            'add_after_body',
+            'addition_types',
+            ),
+        28 => array( // embedded Perl module
+            // http://wiki.nginx.org/HttpPerlModule
+            // http://nginx.org/en/docs/http/ngx_http_perl_module.html
+            'perl',
+            'perl_modules',
+            'perl_require',
+            'perl_set',
+            ),
+        29 => array( // flash video files module
+            // http://wiki.nginx.org/HttpFlvModule
+            // http://nginx.org/en/docs/http/ngx_http_flv_module.html
+            'flv',
+            ),
+        30 => array( // gzip precompression module
+            // http://wiki.nginx.org/HttpGzipStaticModule
+            // http://nginx.org/en/docs/http/ngx_http_gzip_static_module.html
+            'gzip_static',
+            // Removed to remove duplication with ngx_http_gzip_module
+            //'gzip_http_version',
+            //'gzip_proxied',
+            //'gzip_disable',
+            //'gzip_vary',
+            ),
+        31 => array( // random index module
+            // http://wiki.nginx.org/HttpRandomIndexModule
+            // http://nginx.org/en/docs/http/ngx_http_random_index_module.html
+            'random_index',
+            ),
+        32 => array( // real ip module
+            // http://wiki.nginx.org/HttpRealipModule
+            // http://nginx.org/en/docs/http/ngx_http_realip_module.html
+            'set_real_ip_from',
+            'real_ip_header',
+            'real_ip_recursive',
+            ),
+        33 => array( // https module
+            // http://wiki.nginx.org/HttpSslModule
+            // http://nginx.org/en/docs/http/ngx_http_ssl_module.html
+            'ssl',
+            'ssl_certificate',
+            'ssl_certificate_key',
+            'ssl_ciphers',
+            'ssl_client_certificate',
+            'ssl_crl',
+            'ssl_dhparam',
+            // Use the documentation for the core module since it links to the
+            // original properly
+            //'ssl_engine',
+            'ssl_prefer_server_ciphers',
+            'ssl_protocols',
+            'ssl_session_cache',
+            'ssl_session_timeout',
+            'ssl_verify_client',
+            'ssl_verify_depth',
+            ),
+        34 => array( // status module
+            // http://wiki.nginx.org/HttpStubStatusModule
+            'stub_status',
+            ),
+        35 => array( // substitution module
+            // http://wiki.nginx.org/HttpSubModule
+            // http://nginx.org/en/docs/http/ngx_http_sub_module.html
+            'sub_filter',
+            'sub_filter_once',
+            'sub_filter_types',
+            ),
+        36 => array( // NginxHttpDavModule
+            // http://wiki.nginx.org/HttpDavModule
+            // http://nginx.org/en/docs/http/ngx_http_dav_module.html
+            'dav_access',
+            'dav_methods',
+            'create_full_put_path',
+            'min_delete_depth',
+            ),
+        37 => array( // Google performance tools module
+            // http://wiki.nginx.org/GooglePerftoolsModule
+            'google_perftools_profiles',
+            ),
+        38 => array( // xslt module
+            // http://wiki.nginx.org/HttpXsltModule
+            // http://nginx.org/en/docs/http/ngx_http_xslt_module.html
+            'xslt_entities',
+            'xslt_param',
+            'xslt_string_param',
+            'xslt_stylesheet',
+            'xslt_types',
+            ),
+        39 => array( // uWSGI module
+            // http://wiki.nginx.org/HttpUwsgiModule
+            'uwsgi_bind',
+            'uwsgi_buffer_size',
+            'uwsgi_buffering',
+            'uwsgi_buffers',
+            'uwsgi_busy_buffers_size',
+            'uwsgi_cache',
+            'uwsgi_cache_bypass',
+            'uwsgi_cache_key',
+            'uwsgi_cache_lock',
+            'uwsgi_cache_lock_timeout',
+            'uwsgi_cache_methods',
+            'uwsgi_cache_min_uses',
+            'uwsgi_cache_path',
+            'uwsgi_cache_use_stale',
+            'uwsgi_cache_valid',
+            'uwsgi_connect_timeout',
+            'uwsgi_hide_header',
+            'uwsgi_ignore_client_abort',
+            'uwsgi_ignore_headers',
+            'uwsgi_intercept_errors',
+            'uwsgi_max_temp_file_size',
+            'uwsgi_modifier',
+            'uwsgi_next_upstream',
+            'uwsgi_no_cache',
+            'uwsgi_param',
+            'uwsgi_pass',
+            'uwsgi_pass_header',
+            'uwsgi_pass_request_body',
+            'uwsgi_pass_request_headers',
+            'uwsgi_read_timeout',
+            'uwsgi_send_timeout',
+            'uwsgi_store',
+            'uwsgi_store_access',
+            'uwsgi_string',
+            'uwsgi_temp_file_write_size',
+            'uwsgi_temp_path',
+            ),
+        40 => array( // SCGI module
+            // http://wiki.nginx.org/HttpScgiModule
+            // Note: These directives were pulled from nginx 1.2.3
+            //       ngx_http_scgi_module.c source file.
+            'scgi_bind',
+            'scgi_buffering',
+            'scgi_buffers',
+            'scgi_buffer_size',
+            'scgi_busy_buffers_size',
+            'scgi_cache',
+            'scgi_cache_bypass',
+            'scgi_cache_key',
+            'scgi_cache_lock',
+            'scgi_cache_lock_timeout',
+            'scgi_cache_methods',
+            'scgi_cache_min_uses',
+            'scgi_cache_path',
+            'scgi_cache_use_stale',
+            'scgi_cache_valid',
+            'scgi_connect_timeout',
+            'scgi_hide_header',
+            'scgi_ignore_client_abort',
+            'scgi_ignore_headers',
+            'scgi_intercept_errors',
+            'scgi_max_temp_file_size',
+            'scgi_next_upstream',
+            'scgi_no_cache',
+            'scgi_param',
+            'scgi_pass',
+            'scgi_pass_header',
+            'scgi_pass_request_body',
+            'scgi_pass_request_headers',
+            'scgi_read_timeout',
+            'scgi_send_timeout',
+            'scgi_store',
+            'scgi_store_access',
+            'scgi_temp_file_write_size',
+            'scgi_temp_path',
+            ),
+        41 => array( // split clients module
+            // http://wiki.nginx.org/HttpSplitClientsModule
+            // http://nginx.org/en/docs/http/ngx_http_split_clients_module.html
+            'split_clients',
+            ),
+        42 => array( // X-Accel module
+            // http://wiki.nginx.org/X-accel
+            'X-Accel-Redirect',
+            'X-Accel-Buffering',
+            'X-Accel-Charset',
+            'X-Accel-Expires',
+            'X-Accel-Limit-Rate',
+            ),
+        43 => array( // degradation module
+            // http://wiki.nginx.org/HttpDegradationModule
+            'degradation',
+            'degrade',
+            ),
+        44 => array( // GeoIP module
+            // http://wiki.nginx.org/HttpGeoipModule
+            // http://nginx.org/en/docs/http/ngx_http_geoip_module.html
+            'geoip_country',
+            'geoip_city',
+            'geoip_proxy',
+            'geoip_proxy_recursive',
+            ),
+        45 => array( // Image filter module
+            // http://wiki.nginx.org/HttpImageFilterModule
+            // http://nginx.org/en/docs/http/ngx_http_image_filter_module.html
+            'image_filter',
+            'image_filter_buffer',
+            'image_filter_jpeg_quality',
+            'image_filter_sharpen',
+            'image_filter_transparency',
+            ),
+        46 => array( // MP4 module
+            // http://wiki.nginx.org/HttpMp4Module
+            // http://nginx.org/en/docs/http/ngx_http_mp4_module.html
+            'mp4',
+            'mp4_buffer_size',
+            'mp4_max_buffer_size',
+            ),
+        47 => array( // Secure Link module
+            // http://wiki.nginx.org/HttpSecureLinkModule
+            // http://nginx.org/en/docs/http/ngx_http_secure_link_module.html
+            'secure_link',
+            'secure_link_md',
+            'secure_link_secret',
+            ),
+        48 => array( // Mail Core module
+            // http://wiki.nginx.org/MailCoreModule
+            'auth',
+            'imap_capabilities',
+            'imap_client_buffer',
+            'pop_auth',
+            'pop_capabilities',
+            'protocol',
+            'smtp_auth',
+            'smtp_capabilities',
+            'so_keepalive',
+            'timeout',
+            // Removed to prioritize documentation for core module
+            //'listen',
+            //'server',
+            //'server_name',
+            ),
+        49 => array( // Mail Auth module
+            // http://wiki.nginx.org/MailAuthModule
+            'auth_http',
+            'auth_http_header',
+            'auth_http_timeout',
+            ),
+        50 => array( // Mail Proxy module
+            // http://wiki.nginx.org/MailProxyModule
+            'proxy',
+            'proxy_buffer',
+            'proxy_pass_error_message',
+            'proxy_timeout',
+            'xclient',
+            ),
+        51 => array( // Mail SSL module
+            // http://wiki.nginx.org/MailSslModule
+            // Removed to prioritize documentation for http
+            //'ssl',
+            //'ssl_certificate',
+            //'ssl_certificate_key',
+            //'ssl_ciphers',
+            //'ssl_prefer_server_ciphers',
+            //'ssl_protocols',
+            //'ssl_session_cache',
+            //'ssl_session_timeout',
+            'starttls',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '=', '~', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+        17 => true,
+        18 => true,
+        19 => true,
+        20 => true,
+        21 => true,
+        22 => true,
+        23 => true,
+        24 => true,
+        25 => true,
+        26 => true,
+        27 => true,
+        28 => true,
+        29 => true,
+        30 => true,
+        31 => true,
+        32 => true,
+        33 => true,
+        34 => true,
+        35 => true,
+        36 => true,
+        37 => true,
+        38 => true,
+        39 => true,
+        40 => true,
+        41 => true,
+        42 => true,
+        43 => true,
+        44 => true,
+        45 => true,
+        46 => true,
+        47 => true,
+        48 => true,
+        49 => true,
+        50 => true,
+        51 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066;',
+            4 => 'color: #000000; font-weight: bold;',
+        ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => 'http://wiki.nginx.org/CoreModule#{FNAME}',
+        2 => 'http://wiki.nginx.org/NginxHttpEventsModule#{FNAME}',
+        3 => 'http://wiki.nginx.org/NginxHttpCoreModule#{FNAME}',
+        4 => 'http://wiki.nginx.org/NginxHttpUpstreamModule#{FNAME}',
+        5 => 'http://wiki.nginx.org/NginxHttpAccessModule#{FNAME}',
+        6 => 'http://wiki.nginx.org/NginxHttpAuthBasicModule#{FNAME}',
+        7 => 'http://wiki.nginx.org/NginxHttpAutoIndexModule#{FNAME}',
+        8 => 'http://wiki.nginx.org/NginxHttpBrowserModule#{FNAME}',
+        9 => 'http://wiki.nginx.org/NginxHttpCharsetModule#{FNAME}',
+        10 => 'http://wiki.nginx.org/NginxHttpEmptyGifModule#{FNAME}',
+        11 => 'http://wiki.nginx.org/NginxHttpFcgiModule#{FNAME}',
+        12 => 'http://wiki.nginx.org/NginxHttpGeoModule#{FNAME}',
+        13 => 'http://wiki.nginx.org/NginxHttpGzipModule#{FNAME}',
+        14 => 'http://wiki.nginx.org/NginxHttpHeadersModule#{FNAME}',
+        15 => 'http://wiki.nginx.org/NginxHttpIndexModule#{FNAME}',
+        16 => 'http://wiki.nginx.org/HttpLimitReqModule#{FNAME}',
+        17 => 'http://wiki.nginx.org/NginxHttpRefererModule#{FNAME}',
+        18 => 'http://wiki.nginx.org/NginxHttpLimitZoneModule#{FNAME}',
+        19 => 'http://wiki.nginx.org/HttpLimitConnModule#{FNAME}',
+        20 => 'http://wiki.nginx.org/NginxHttpLogModule#{FNAME}',
+        21 => 'http://wiki.nginx.org/NginxHttpMapModule#{FNAME}',
+        22 => 'http://wiki.nginx.org/NginxHttpMemcachedModule#{FNAME}',
+        23 => 'http://wiki.nginx.org/NginxHttpProxyModule#{FNAME}',
+        24 => 'http://wiki.nginx.org/NginxHttpRewriteModule#{FNAME}',
+        25 => 'http://wiki.nginx.org/NginxHttpSsiModule#{FNAME}',
+        26 => 'http://wiki.nginx.org/NginxHttpUserIdModule#{FNAME}',
+        27 => 'http://wiki.nginx.org/NginxHttpAdditionModule#{FNAME}',
+        28 => 'http://wiki.nginx.org/NginxHttpEmbeddedPerlModule#{FNAME}',
+        29 => 'http://wiki.nginx.org/NginxHttpFlvStreamModule#{FNAME}',
+        30 => 'http://wiki.nginx.org/NginxHttpGzipStaticModule#{FNAME}',
+        31 => 'http://wiki.nginx.org/NginxHttpRandomIndexModule#{FNAME}',
+        32 => 'http://wiki.nginx.org/NginxHttpRealIpModule#{FNAME}',
+        33 => 'http://wiki.nginx.org/NginxHttpSslModule#{FNAME}',
+        34 => 'http://wiki.nginx.org/NginxHttpStubStatusModule#{FNAME}',
+        35 => 'http://wiki.nginx.org/NginxHttpSubModule#{FNAME}',
+        36 => 'http://wiki.nginx.org/NginxHttpDavModule#{FNAME}',
+        37 => 'http://wiki.nginx.org/NginxHttpGooglePerfToolsModule#{FNAME}',
+        38 => 'http://wiki.nginx.org/NginxHttpXsltModule#{FNAME}',
+        39 => 'http://wiki.nginx.org/NginxHttpUwsgiModule#{FNAME}',
+        40 => 'http://wiki.nginx.org/HttpScgiModule',
+        41 => 'http://wiki.nginx.org/HttpSplitClientsModule#{FNAME}',
+        42 => 'http://wiki.nginx.org/X-accel#{FNAME}',
+        43 => 'http://wiki.nginx.org/HttpDegradationModule#{FNAME}',
+        44 => 'http://wiki.nginx.org/HttpGeoipModule#{FNAME}',
+        45 => 'http://wiki.nginx.org/HttpImageFilterModule#{FNAME}',
+        46 => 'http://wiki.nginx.org/HttpMp4Module#{FNAME}',
+        47 => 'http://wiki.nginx.org/HttpSecureLinkModule#{FNAME}',
+        48 => 'http://wiki.nginx.org/MailCoreModule#{FNAME}',
+        49 => 'http://wiki.nginx.org/MailAuthModule#{FNAME}',
+        50 => 'http://wiki.nginx.org/MailProxyModule#{FNAME}',
+        51 => 'http://wiki.nginx.org/MailSslModule#{FNAME}',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/nsis.php b/vendor/easybook/geshi/geshi/nsis.php
new file mode 100755
index 000000000..29ba952b4
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/nsis.php
@@ -0,0 +1,349 @@
+<?php
+/*************************************************************************************
+ * nsis.php
+ * --------
+ * Author: deguix (cevo_deguix@yahoo.com.br), Tux (http://tux.a4.cz/)
+ * Copyright: (c) 2005 deguix, 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/12/03
+ *
+ * Nullsoft Scriptable Install System language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/03 (2.0.2)
+ *   - Updated to NSIS 2.11.
+ * 2005/06/17 (2.0.1)
+ *   - Updated to NSIS 2.07b0.
+ * 2005/04/05 (2.0.0)
+ *   - Updated to NSIS 2.06.
+ * 2004/11/27 (1.0.2)
+ *   - Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   - Added support for URLs
+ * 2004/08/05 (1.0.0)
+ *   - First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'NSIS',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'",'"','`'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '!appendfile', '!addIncludeDir', '!addplugindir', '!cd', '!define', '!delfile', '!echo', '!else',
+            '!endif', '!error', '!execute', '!ifdef', '!ifmacrodef', '!ifmacrondef', '!ifndef', '!include',
+            '!insertmacro', '!macro', '!macroend', '!packhdr', '!tempfile', '!system', '!undef', '!verbose',
+            '!warning'
+            ),
+        2 => array(
+            'AddBrandingImage', 'AllowRootDirInstall', 'AutoCloseWindow', 'BGFont',
+            'BGGradient', 'BrandingText', 'Caption', 'ChangeUI', 'CheckBitmap', 'CompletedText', 'ComponentText',
+            'CRCCheck', 'DetailsButtonText', 'DirShow', 'DirText', 'DirVar', 'DirVerify', 'FileErrorText',
+            'Function', 'FunctionEnd', 'Icon', 'InstallButtonText', 'InstallColors', 'InstallDir',
+            'InstallDirRegKey', 'InstProgressFlags', 'InstType', 'LangString', 'LangStringUP', 'LicenseBkColor',
+            'LicenseData', 'LicenseForceSelection', 'LicenseLangString', 'LicenseText', 'LoadLanguageFile',
+            'MiscButtonText', 'Name', 'OutFile', 'Page', 'PageEx', 'PageExEnd', 'Section',
+            'SectionEnd', 'SectionGroup', 'SectionGroupEnd', 'SetCompressor', 'SetFont', 'ShowInstDetails',
+            'ShowUninstDetails', 'SilentInstall', 'SilentUnInstall', 'SpaceTexts', 'SubCaption', 'SubSection',
+            'SubSectionEnd', 'UninstallButtonText', 'UninstallCaption', 'UninstallIcon', 'UninstallSubCaption',
+            'UninstallText', 'UninstPage', 'Var', 'VIAddVersionKey', 'VIProductVersion', 'WindowIcon', 'XPStyle'
+            ),
+        3 => array(
+            'AddSize', 'AllowSkipFiles', 'FileBufSize', 'GetInstDirError', 'PageCallbacks',
+            'SectionIn', 'SetCompress', 'SetCompressionLevel', 'SetCompressorDictSize',
+            'SetDatablockOptimize', 'SetDateSave', 'SetOverwrite', 'SetPluginUnload'
+            ),
+        4 => array(
+            'Abort', 'BringToFront', 'Call', 'CallInstDLL', 'ClearErrors', 'CopyFiles','CreateDirectory',
+            'CreateFont', 'CreateShortCut', 'Delete', 'DeleteINISec', 'DeleteINIStr', 'DeleteRegKey',
+            'DeleteRegValue', 'DetailPrint', 'EnableWindow', 'EnumRegKey', 'EnumRegValue', 'Exch', 'Exec',
+            'ExecShell', 'ExecWait', 'ExpandEnvStrings', 'File', 'FileClose', 'FileOpen', 'FileRead',
+            'FileReadByte', 'FileSeek', 'FileWrite', 'FileWriteByte', 'FindClose', 'FindFirst', 'FindNext',
+            'FindWindow', 'FlushINI', 'GetCurInstType', 'GetCurrentAddress', 'GetDlgItem', 'GetDLLVersion',
+            'GetDLLVersionLocal', 'GetErrorLevel', 'GetFileTime', 'GetFileTimeLocal', 'GetFullPathName',
+            'GetFunctionAddress', 'GetLabelAddress', 'GetTempFileName', 'GetWindowText', 'Goto', 'HideWindow',
+            'IfAbort', 'IfErrors', 'IfFileExists', 'IfRebootFlag', 'IfSilent', 'InitPluginsDir', 'InstTypeGetText',
+            'InstTypeSetText', 'IntCmp', 'IntCmpU', 'IntFmt', 'IntOp', 'IsWindow', 'LockWindow', 'LogSet', 'LogText',
+            'MessageBox', 'Nop', 'Pop', 'Push', 'Quit', 'ReadEnvStr', 'ReadIniStr', 'ReadRegDWORD', 'ReadRegStr',
+            'Reboot', 'RegDLL', 'Rename', 'ReserveFile', 'Return', 'RMDir', 'SearchPath', 'SectionGetFlags',
+            'SectionGetInstTypes', 'SectionGetSize', 'SectionGetText', 'SectionSetFlags', 'SectionSetInstTypes',
+            'SectionSetSize', 'SectionSetText', 'SendMessage', 'SetAutoClose', 'SetBrandingImage', 'SetCtlColors',
+            'SetCurInstType', 'SetDetailsPrint', 'SetDetailsView', 'SetErrorLevel', 'SetErrors', 'SetFileAttributes',
+            'SetOutPath', 'SetRebootFlag', 'SetShellVarContext', 'SetSilent', 'ShowWindow', 'Sleep', 'StrCmp',
+            'StrCpy', 'StrLen', 'UnRegDLL', 'WriteINIStr', 'WriteRegBin', 'WriteRegDWORD', 'WriteRegExpandStr',
+            'WriteRegStr', 'WriteUninstaller'
+            ),
+        5 => array(
+            'all', 'alwaysoff', 'ARCHIVE', 'auto', 'both', 'bzip2', 'checkbox', 'components', 'current',
+            'custom', 'directory', 'false', 'FILE_ATTRIBUTE_ARCHIVE', 'FILE_ATTRIBUTE_HIDDEN', 'FILE_ATTRIBUTE_NORMAL',
+            'FILE_ATTRIBUTE_OFFLINE', 'FILE_ATTRIBUTE_READONLY', 'FILE_ATTRIBUTE_SYSTEM,TEMPORARY',
+            'FILE_ATTRIBUTE_TEMPORARY', 'force', 'HIDDEN', 'hide', 'HKCC', 'HKCR', 'HKCU', 'HKDD', 'HKEY_CLASSES_ROOT',
+            'HKEY_CURRENT_CONFIG', 'HKEY_CURRENT_USER', 'HKEY_DYN_DATA', 'HKEY_LOCAL_MACHINE', 'HKEY_PERFORMANCE_DATA',
+            'HKEY_USERS', 'HKLM', 'HKPD', 'HKU', 'IDABORT', 'IDCANCEL', 'IDIGNORE', 'IDNO', 'IDOK', 'IDRETRY', 'IDYES',
+            'ifdiff', 'ifnewer', 'instfiles', 'lastused', 'leave', 'license', 'listonly', 'lzma', 'manual',
+            'MB_ABORTRETRYIGNORE', 'MB_DEFBUTTON1', 'MB_DEFBUTTON2', 'MB_DEFBUTTON3', 'MB_DEFBUTTON4',
+            'MB_ICONEXCLAMATION', 'MB_ICONINFORMATION', 'MB_ICONQUESTION', 'MB_ICONSTOP', 'MB_OK', 'MB_OKCANCEL',
+            'MB_RETRYCANCEL', 'MB_RIGHT', 'MB_SETFOREGROUND', 'MB_TOPMOST', 'MB_YESNO', 'MB_YESNOCANCEL', 'nevershow',
+            'none', 'normal', 'off', 'OFFLINE', 'on', 'radiobuttons', 'READONLY', 'RO', 'SHCTX', 'SHELL_CONTEXT', 'show',
+            'silent', 'silentlog', 'SW_HIDE', 'SW_SHOWMAXIMIZED', 'SW_SHOWMINIMIZED', 'SW_SHOWNORMAL', 'SYSTEM',
+            'textonly', 'true', 'try', 'uninstConfirm', 'zlib'
+            ),
+        6 => array(
+            '/a', '/components', '/COMPONENTSONLYONCUSTOM', '/CUSTOMSTRING', '/e', '/FILESONLY', '/FINAL', '/gray', '/GLOBAL',
+            '/ifempty', '/IMGID', '/ITALIC', '/lang', '/NOCUSTOM', '/nonfatal', '/NOUNLOAD', '/oname', '/r', '/REBOOTOK',
+            '/RESIZETOFIT', '/SOLID', '/SD', '/SHORT', '/silent', '/STRIKE', '/TIMEOUT', '/TRIMCENTER', '/TRIMLEFT',
+            '/TRIMRIGHT', '/UNDERLINE', '/windows', '/x'
+            ),
+        7 => array(
+            '.onGUIEnd', '.onGUIInit', '.onInit', '.onInstFailed', '.onInstSuccess', '.onMouseOverSection',
+            '.onRebootFailed', '.onSelChange', '.onUserAbort', '.onVerifyInstDir', 'un.onGUIEnd', 'un.onGUIInit',
+            'un.onInit', 'un.onRebootFailed', 'un.onUninstFailed', 'un.onUninstSuccess', 'un.onUserAbort'
+            ),
+        8 => array(
+            'MUI.nsh', '"${NSISDIR}\Contrib\Modern UI\System.nsh"', 'MUI_SYSVERSION', 'MUI_ICON', 'MUI_UNICON',
+            'MUI_HEADERIMAGE', 'MUI_HEADERIMAGE_BITMAP', 'MUI_HEADERIMAGE_BITMAP_NOSTRETCH', 'MUI_HEADERIMAGE_BITMAP_RTL',
+            'MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_UNBITMAP', 'MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH',
+            'MUI_HEADERIMAGE_UNBITMAP_RTL', 'MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_RIGHT', 'MUI_BGCOLOR',
+            'MUI_UI', 'MUI_UI_HEADERIMAGE', 'MUI_UI_HEADERIMAGE_RIGHT', 'MUI_UI_COMPONENTSPAGE_SMALLDESC',
+            'MUI_UI_COMPONENTSPAGE_NODESC', 'MUI_WELCOMEFINISHPAGE_BITMAP', 'MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
+            'MUI_WELCOMEFINISHPAGE_INI', 'MUI_UNWELCOMEFINISHPAGE_BITMAP', 'MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
+            'MUI_UNWELCOMEFINISHPAGE_INI', 'MUI_LICENSEPAGE_BGCOLOR', 'MUI_COMPONENTSPAGE_CHECKBITMAP',
+            'MUI_COMPONENTSPAGE_SMALLDESC', 'MUI_COMPONENTSPAGE_NODESC', 'MUI_INSTFILESPAGE_COLORS',
+            'MUI_INSTFILESPAGE_PROGRESSBAR', 'MUI_FINISHPAGE_NOAUTOCLOSE', 'MUI_UNFINISHPAGE_NOAUTOCLOSE',
+            'MUI_ABORTWARNING', 'MUI_ABORTWARNING_TEXT', 'MUI_UNABORTWARNING', 'MUI_UNABORTWARNING_TEXT',
+            'MUI_PAGE_WELCOME', 'MUI_PAGE_LICENSE', 'MUI_PAGE_COMPONENTS', 'MUI_PAGE_DIRECTORY',
+            'MUI_PAGE_STARTMENU', 'MUI_PAGE_INSTFILES', 'MUI_PAGE_FINISH', 'MUI_UNPAGE_WELCOME',
+            'MUI_UNPAGE_CONFIRM', 'MUI_UNPAGE_LICENSE', 'MUI_UNPAGE_COMPONENTS', 'MUI_UNPAGE_DIRECTORY',
+            'MUI_UNPAGE_INSTFILES', 'MUI_UNPAGE_FINISH', 'MUI_PAGE_HEADER_TEXT', 'MUI_PAGE_HEADER_SUBTEXT',
+            'MUI_WELCOMEPAGE_TITLE', 'MUI_WELCOMEPAGE_TITLE_3LINES', 'MUI_WELCOMEPAGE_TEXT',
+            'MUI_LICENSEPAGE_TEXT_TOP', 'MUI_LICENSEPAGE_TEXT_BOTTOM', 'MUI_LICENSEPAGE_BUTTON',
+            'MUI_LICENSEPAGE_CHECKBOX', 'MUI_LICENSEPAGE_CHECKBOX_TEXT', 'MUI_LICENSEPAGE_RADIOBUTTONS',
+            'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT', 'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE',
+            'MUI_COMPONENTSPAGE_TEXT_TOP', 'MUI_COMPONENTSPAGE_TEXT_COMPLIST', 'MUI_COMPONENTSPAGE_TEXT_INSTTYPE',
+            'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_TITLE', 'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO',
+            'MUI_DIRECTORYPAGE_TEXT_TOP', 'MUI_DIRECTORYPAGE_TEXT_DESTINATION', 'MUI_DIRECTORYPAGE_VARIABLE',
+            'MUI_DIRECTORYPAGE_VERIFYONLEAVE', 'MUI_STARTMENU_WRITE_BEGIN', 'MUI_STARTMENU_WRITE_END',
+            'MUI_STARTMENUPAGE_TEXT_TOP', 'MUI_STARTMENUPAGE_TEXT_CHECKBOX', 'MUI_STARTMENUPAGE_DEFAULTFOLDER',
+            'MUI_STARTMENUPAGE_NODISABLE', 'MUI_STARTMENUPAGE_REGISTRY_ROOT', 'MUI_STARTMENUPAGE_REGISTRY_KEY',
+            'MUI_STARTMENUPAGE_REGISTRY_VALUENAME', 'MUI_INSTFILESPAGE_FINISHHEADER_TEXT',
+            'MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT', 'MUI_INSTFILESPAGE_ABORTHEADER_TEXT',
+            'MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT', 'MUI_FINISHPAGE_TITLE', 'MUI_FINISHPAGE_TITLE_3LINES',
+            'MUI_FINISHPAGE_TEXT', 'MUI_FINISHPAGE_TEXT_LARGE', 'MUI_FINISHPAGE_BUTTON',
+            'MUI_FINISHPAGE_TEXT_REBOOT', 'MUI_FINISHPAGE_TEXT_REBOOTNOW', 'MUI_FINISHPAGE_TEXT_REBOOTLATER',
+            'MUI_FINISHPAGE_RUN', 'MUI_FINISHPAGE_RUN_TEXT', 'MUI_FINISHPAGE_RUN_PARAMETERS',
+            'MUI_FINISHPAGE_RUN_NOTCHECKED', 'MUI_FINISHPAGE_RUN_FUNCTION', 'MUI_FINISHPAGE_SHOWREADME',
+            'MUI_FINISHPAGE_SHOWREADME_TEXT', 'MUI_FINISHPAGE_SHOWREADME_NOTCHECKED',
+            'MUI_FINISHPAGE_SHOWREADME_FUNCTION', 'MUI_FINISHPAGE_LINK', 'MUI_FINISHPAGE_LINK_LOCATION',
+            'MUI_FINISHPAGE_LINK_COLOR', 'MUI_FINISHPAGE_NOREBOOTSUPPORT', 'MUI_UNCONFIRMPAGE_TEXT_TOP',
+            'MUI_UNCONFIRMPAGE_TEXT_LOCATION', 'MUI_LANGUAGE', 'MUI_LANGDLL_DISPLAY',
+            'MUI_LANGDLL_REGISTRY_ROOT', 'MUI_LANGDLL_REGISTRY_KEY', 'MUI_LANGDLL_REGISTRY_VALUENAME',
+            'MUI_LANGDLL_WINDOWTITLE', 'MUI_LANGDLL_INFO', 'MUI_LANGDLL_ALWAYSSHOW',
+            'MUI_RESERVEFILE_INSTALLOPTIONS', 'MUI_RESERVEFILE_LANGDLL', 'MUI_FUNCTION_DESCRIPTION_BEGIN',
+            'MUI_DESCRIPTION_TEXT', 'MUI_FUNCTION_DESCRIPTION_END', 'MUI_INSTALLOPTIONS_EXTRACT',
+            'MUI_INSTALLOPTIONS_EXTRACT_AS', 'MUI_HEADER_TEXT', 'MUI_INSTALLOPTIONS_DISPLAY',
+            'MUI_INSTALLOPTIONS_INITDIALOG', 'MUI_INSTALLOPTIONS_SHOW',
+            'MUI_INSTALLOPTIONS_DISPLAY_RETURN', 'MUI_INSTALLOPTIONS_SHOW_RETURN',
+            'MUI_INSTALLOPTIONS_READ', 'MUI_INSTALLOPTIONS_WRITE',
+            'MUI_CUSTOMFUNCTION_GUIINIT', 'MUI_CUSTOMFUNCTION_UNGUIINIT',
+            'MUI_CUSTOMFUNCTION_ABORT', 'MUI_CUSTOMFUNCTION_UNABORT',
+            'MUI_PAGE_CUSTOMFUNCTION_PRE', 'MUI_PAGE_CUSTOMFUNCTION_SHOW', 'MUI_PAGE_CUSTOMFUNCTION_LEAVE',
+            'MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT'
+            ),
+        9 => array(
+            'LogicLib.nsh', '${LOGICLIB}', 'LOGICLIB_STRCMP', 'LOGICLIB_INT64CMP', 'LOGICLIB_SECTIONCMP', '${If}', '${Unless}',
+            '${ElseIf}', '${ElseUnless}', '${Else}', '${EndIf}', '${EndUnless}', '${AndIf}', '${AndUnless}',
+            '${OrIf}', '${OrUnless}', '${IfThen}', '${IfCmd}', '${Select}', '${Case2}', '${Case3}',
+            '${Case4}', '${Case5}', '${CaseElse}', '${Default}', '${EndSelect}', '${Switch}',
+            '${Case}', '${EndSwitch}', '${Do}', '${DoWhile}', '${UntilWhile}', '${Continue}', '${Break}',
+            '${Loop}', '${LoopWhile}', '${LoopUntil}', '${While}', '${ExitWhile}', '${EndWhile}', '${For}',
+            '${ForEach}', '${ExitFor}', '${Next}', '${Abort}', '${Errors}', '${RebootFlag}', '${Silent}',
+            '${FileExists}', '${Cmd}', '${SectionIsSelected}', '${SectionIsSectionGroup}',
+            '${SectionIsSectionGroupEnd}', '${SectionIsBold}', '${SectionIsReadOnly}',
+            '${SectionIsExpanded}', '${SectionIsPartiallySelected}'
+            ),
+        10 => array(
+            'StrFunc.nsh', '${STRFUNC}', '${StrCase}', '${StrClb}', '${StrIOToNSIS}', '${StrLoc}', '${StrNSISToIO}', '${StrRep}',
+            '${StrSort}', '${StrStr}', '${StrStrAdv}', '${StrTok}', '${StrTrimNewLines}'
+            ),
+        11 => array(
+            'UpgradeDLL.nsh', 'UPGRADEDLL_INCLUDED', 'UpgradeDLL'
+            ),
+        12 => array(
+            'Sections.nsh', 'SECTIONS_INCLUDED', '${SF_SELECTED}', '${SF_SECGRP}', '${SF_SUBSEC}', '${SF_SECGRPEND}',
+            '${SF_SUBSECEND}', '${SF_BOLD}', '${SF_RO}', '${SF_EXPAND}', '${SF_PSELECTED}', '${SF_TOGGLED}',
+            '${SF_NAMECHG}', '${SECTION_OFF}', 'SelectSection', 'UnselectSection', 'ReverseSection',
+            'StartRadioButtons', 'RadioButton', 'EndRadioButtons', '${INSTTYPE_0}', '${INSTTYPE_1}', '${INSTTYPE_2}',
+            '${INSTTYPE_3}', '${INSTTYPE_4}', '${INSTTYPE_5}', '${INSTTYPE_6}', '${INSTTYPE_7}', '${INSTTYPE_8}',
+            '${INSTTYPE_9}', '${INSTTYPE_10}', '${INSTTYPE_11}', '${INSTTYPE_12}', '${INSTTYPE_13}', '${INSTTYPE_14}',
+            '${INSTTYPE_15}', '${INSTTYPE_16}', '${INSTTYPE_17}', '${INSTTYPE_18}', '${INSTTYPE_19}', '${INSTTYPE_20}',
+            '${INSTTYPE_21}', '${INSTTYPE_22}', '${INSTTYPE_23}', '${INSTTYPE_24}', '${INSTTYPE_25}', '${INSTTYPE_26}',
+            '${INSTTYPE_27}', '${INSTTYPE_28}', '${INSTTYPE_29}', '${INSTTYPE_30}', '${INSTTYPE_31}', '${INSTTYPE_32}',
+            'SetSectionInInstType', 'ClearSectionInInstType', 'SetSectionFlag', 'ClearSectionFlag', 'SectionFlagIsSet'
+            ),
+        13 => array(
+            'Colors.nsh', 'WHITE', 'BLACK', 'YELLOW', 'RED', 'GREEN', 'BLUE', 'MAGENTA', 'CYAN', 'rgb2hex'
+            ),
+        14 => array(
+            'FileFunc.nsh', '${Locate}', '${GetSize}', '${DriveSpace}', '${GetDrives}', '${GetTime}', '${GetFileAttributes}', '${GetFileVersion}', '${GetExeName}', '${GetExePath}', '${GetParameters}', '${GetOptions}', '${GetRoot}', '${GetParent}', '${GetFileName}', '${GetBaseName}', '${GetFileExt}', '${BannerTrimPath}', '${DirState}', '${RefreshShellIcons}'
+            ),
+        15 => array(
+            'TextFunc.nsh', '${LineFind}', '${LineRead}', '${FileReadFromEnd}', '${LineSum}', '${FileJoin}', '${TextCompare}', '${ConfigRead}', '${ConfigWrite}', '${FileRecode}', '${TrimNewLines}'
+            ),
+        16 => array(
+            'WordFunc.nsh', '${WordFind}', '${WordFind2X}', '${WordFind3X}', '${WordReplace}', '${WordAdd}', '${WordInsert}', '${StrFilter}', '${VersionCompare}', '${VersionConvert}'
+            )
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false,
+        13 => false,
+        14 => false,
+        15 => false,
+        16 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight:bold;',
+            2 => 'color: #000066;',
+            3 => 'color: #003366;',
+            4 => 'color: #000099;',
+            5 => 'color: #ff6600;',
+            6 => 'color: #ff6600;',
+            7 => 'color: #006600;',
+            8 => 'color: #006600;',
+            9 => 'color: #006600;',
+            10 => 'color: #006600;',
+            11 => 'color: #006600;',
+            12 => 'color: #006600;',
+            13 => 'color: #006600;',
+            14 => 'color: #006600;',
+            15 => 'color: #006600;',
+            16 => 'color: #006600;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #660066; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #660066;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #660000;',
+            1 => 'color: #660000;',
+            2 => 'color: #660000;',
+            3 => 'color: #660000;',
+            4 => 'color: #660000;',
+            5 => 'color: #660000;',
+            6 => 'color: #660000;',
+            7 => 'color: #000099;',
+            8 => 'color: #003399;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => '\$\$',
+        1 => '\$\\r',
+        2 => '\$\\n',
+        3 => '\$\\t',
+        4 => '\$[a-zA-Z0-9_]+',
+        5 => '\$\{.{1,256}\}',
+        6 => '\$\\\(.{1,256}\\\)',
+        7 => array(
+            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2\\3'
+            ),
+        8 => array(
+            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:<PIPE>)]*?\s)',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1\\2',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/oberon2.php b/vendor/easybook/geshi/geshi/oberon2.php
new file mode 100755
index 000000000..b43f81408
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/oberon2.php
@@ -0,0 +1,135 @@
+<?php
+/*************************************************************************************
+ * oberon2.php
+ * ----------
+ * Author: mbishop (mbishop@esoteriq.org)
+ * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/02/10
+ *
+ * Oberon-2 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Oberon-2',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'ARRAY', 'BEGIN', 'BY', 'CASE',
+            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END',
+            'EXIT', 'FOR', 'IF', 'IMPORT', 'IN', 'IS',
+            'LOOP', 'MOD', 'MODULE', 'OF',
+            'OR', 'POINTER', 'PROCEDURE', 'RECORD',
+            'REPEAT', 'RETURN', 'THEN', 'TO',
+            'TYPE', 'UNTIL', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array(
+            'NIL', 'FALSE', 'TRUE',
+            ),
+        3 => array(
+            'ABS', 'ASH', 'ASSERT', 'CAP', 'CHR', 'COPY', 'DEC',
+            'ENTIER', 'EXCL', 'HALT', 'INC', 'INCL', 'LEN',
+            'LONG', 'MAX', 'MIN', 'NEW', 'ODD', 'ORD', 'SHORT', 'SIZE'
+            ),
+        4 => array(
+            'BOOLEAN', 'CHAR', 'SHORTINT', 'LONGINT',
+            'INTEGER', 'LONGREAL', 'REAL', 'SET', 'PTR'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/', '#', '~'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/objc.php b/vendor/easybook/geshi/geshi/objc.php
new file mode 100755
index 000000000..52576c16a
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/objc.php
@@ -0,0 +1,356 @@
+<?php
+/*************************************************************************************
+ * objc.php
+ * --------
+ * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
+ * Contributors: Quinn Taylor (quinntaylor@mac.com)
+ * Copyright: (c) 2008 Quinn Taylor, 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * Objective-C language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ *   -  Added support for @ before strings being highlighted
+ * 2008/06/10 (1.0.7.22)
+ *   -  Added keywords for Objective-C 2.0 (Leopard+).
+ *   -  Changed colors to match Xcode 3 highlighting more closely.
+ *   -  Updated API for AppKit and Foundation; added CoreData classes.
+ *   -  Updated URLs for AppKit and Foundation; split classes and protocols.
+ *   -  Sorted all keyword group in reverse-alpha order for correct matching.
+ *   -  Changed all keyword groups to be case-sensitive.
+ * 2004/11/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Objective-C',
+    'COMMENT_SINGLE' => array(
+        //Compiler directives
+        1 => '#',
+        //Single line C-Comments
+        2 => '//'
+        ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline Continuation for single-line comment
+        2 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Pseudo-Highlighting of the @-sign before strings
+        3 => "/@(?=\")/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+
+    'KEYWORDS' => array(
+        // Objective-C keywords
+        1 => array(
+            'while', 'switch', 'return', 'in', 'if', 'goto', 'foreach', 'for',
+            'else', 'do', 'default', 'continue', 'case', '@try', '@throw',
+            '@synthesize', '@synchronized', '@selector', '@public', '@protocol',
+            '@protected', '@property', '@private', '@interface',
+            '@implementation', '@finally', '@end', '@encode', '@defs', '@class',
+            '@catch'
+            ),
+        // Macros and constants
+        2 => array(
+            'YES', 'USHRT_MAX', 'ULONG_MAX', 'UINT_MAX', 'UCHAR_MAX', 'true',
+            'TMP_MAX', 'stdout', 'stdin', 'stderr', 'SIGTERM', 'SIGSEGV',
+            'SIGINT', 'SIGILL', 'SIG_IGN', 'SIGFPE', 'SIG_ERR', 'SIG_DFL',
+            'SIGABRT', 'SHRT_MIN', 'SHRT_MAX', 'SEEK_SET', 'SEEK_END',
+            'SEEK_CUR', 'SCHAR_MIN', 'SCHAR_MAX', 'RAND_MAX', 'NULL',
+            'NO', 'nil', 'Nil', 'L_tmpnam', 'LONG_MIN', 'LONG_MAX',
+            'LDBL_MIN_EXP', 'LDBL_MIN', 'LDBL_MAX_EXP', 'LDBL_MAX',
+            'LDBL_MANT_DIG', 'LDBL_EPSILON', 'LDBL_DIG', 'INT_MIN', 'INT_MAX',
+            'HUGE_VAL', 'FOPEN_MAX', 'FLT_ROUNDS', 'FLT_RADIX', 'FLT_MIN_EXP',
+            'FLT_MIN', 'FLT_MAX_EXP', 'FLT_MAX', 'FLT_MANT_DIG', 'FLT_EPSILON',
+            'FLT_DIG', 'FILENAME_MAX', 'false', 'EXIT_SUCCESS', 'EXIT_FAILURE',
+            'errno', 'ERANGE', 'EOF', 'enum', 'EDOM', 'DBL_MIN_EXP', 'DBL_MIN',
+            'DBL_MAX_EXP', 'DBL_MAX', 'DBL_MANT_DIG', 'DBL_EPSILON', 'DBL_DIG',
+            'CLOCKS_PER_SEC', 'CHAR_MIN', 'CHAR_MAX', 'CHAR_BIT', 'BUFSIZ',
+            'break'
+            ),
+        // C standard library functions
+        3 => array(
+            'vsprintf', 'vprintf', 'vfprintf', 'va_start', 'va_end', 'va_arg',
+            'ungetc', 'toupper', 'tolower', 'tmpname', 'tmpfile', 'time',
+            'tanh', 'tan', 'system', 'strxfrm', 'strtoul', 'strtol', 'strtok',
+            'strtod', 'strstr', 'strspn', 'strrchr', 'strpbrk', 'strncpy',
+            'strncmp', 'strncat', 'strlen', 'strftime', 'strerror', 'strcspn',
+            'strcpy', 'strcoll', 'strcmp', 'strchr', 'strcat', 'sscanf',
+            'srand', 'sqrt', 'sprintf', 'snprintf', 'sizeof', 'sinh', 'sin',
+            'setvbuf', 'setjmp', 'setbuf', 'scanf', 'rewind', 'rename',
+            'remove', 'realloc', 'rand', 'qsort', 'puts', 'putchar', 'putc',
+            'printf', 'pow', 'perror', 'offsetof', 'modf', 'mktime', 'memset',
+            'memmove', 'memcpy', 'memcmp', 'memchr', 'malloc', 'longjmp',
+            'log10', 'log', 'localtime', 'ldiv', 'ldexp', 'labs', 'isxdigit',
+            'isupper', 'isspace', 'ispunct', 'isprint', 'islower',
+            'isgraph', 'isdigit', 'iscntrl', 'isalpha', 'isalnum', 'gmtime',
+            'gets', 'getenv', 'getchar', 'getc', 'fwrite', 'ftell', 'fsetpos',
+            'fseek', 'fscanf', 'frexp', 'freopen', 'free', 'fread', 'fputs',
+            'fputc', 'fprintf', 'fopen', 'fmod', 'floor', 'fgets', 'fgetpos',
+            'fgetc', 'fflush', 'ferror', 'feof', 'fclose', 'fabs', 'exp',
+            'exit', 'div', 'difftime', 'ctime', 'cosh', 'cos', 'clock',
+            'clearerr', 'ceil', 'calloc', 'bsearch', 'atol', 'atoi', 'atof',
+            'atexit', 'atan2', 'atan', 'assert', 'asin', 'asctime', 'acos',
+            'abs', 'abort'
+            ),
+        // Data types (C, Objective-C, Cocoa)
+        4 => array(
+            'volatile', 'void', 'va_list', 'unsigned', 'union', 'typedef', 'tm',
+            'time_t', 'struct', 'string', 'static', 'size_t',
+            'signed', 'signal', 'short', 'SEL', 'register', 'raise',
+            'ptrdiff_t', 'NSZone', 'NSRect', 'NSRange', 'NSPoint', 'long',
+            'ldiv_t', 'jmp_buf', 'int', 'IMP', 'id', 'fpos_t', 'float', 'FILE',
+            'extern', 'double', 'div_t', 'const', 'clock_t', 'Class', 'char',
+            'BOOL', 'auto'
+            ),
+        // Foundation classes
+        5 => array(
+            'NSXMLParser', 'NSXMLNode', 'NSXMLElement', 'NSXMLDTDNode',
+            'NSXMLDTD', 'NSXMLDocument', 'NSWhoseSpecifier',
+            'NSValueTransformer', 'NSValue', 'NSUserDefaults', 'NSURLResponse',
+            'NSURLRequest', 'NSURLProtocol', 'NSURLProtectionSpace',
+            'NSURLHandle', 'NSURLDownload', 'NSURLCredentialStorage',
+            'NSURLCredential', 'NSURLConnection', 'NSURLCache',
+            'NSURLAuthenticationChallenge', 'NSURL', 'NSUniqueIDSpecifier',
+            'NSUndoManager', 'NSUnarchiver', 'NSTimeZone', 'NSTimer',
+            'NSThread', 'NSTask', 'NSString', 'NSStream', 'NSSpellServer',
+            'NSSpecifierTest', 'NSSortDescriptor', 'NSSocketPortNameServer',
+            'NSSocketPort', 'NSSetCommand', 'NSSet', 'NSSerializer',
+            'NSScriptWhoseTest', 'NSScriptSuiteRegistry',
+            'NSScriptObjectSpecifier', 'NSScriptExecutionContext',
+            'NSScriptCommandDescription', 'NSScriptCommand',
+            'NSScriptCoercionHandler', 'NSScriptClassDescription', 'NSScanner',
+            'NSRunLoop', 'NSRelativeSpecifier', 'NSRecursiveLock',
+            'NSRangeSpecifier', 'NSRandomSpecifier', 'NSQuitCommand', 'NSProxy',
+            'NSProtocolChecker', 'NSPropertySpecifier',
+            'NSPropertyListSerialization', 'NSProcessInfo', 'NSPredicate',
+            'NSPositionalSpecifier', 'NSPortNameServer', 'NSPortMessage',
+            'NSPortCoder', 'NSPort', 'NSPointerFunctions', 'NSPointerArray',
+            'NSPipe', 'NSOutputStream', 'NSOperationQueue', 'NSOperation',
+            'NSObject', 'NSNumberFormatter', 'NSNumber', 'NSNull',
+            'NSNotificationQueue', 'NSNotificationCenter', 'NSNotification',
+            'NSNetServiceBrowser', 'NSNetService', 'NSNameSpecifier',
+            'NSMutableURLRequest', 'NSMutableString', 'NSMutableSet',
+            'NSMutableIndexSet', 'NSMutableDictionary', 'NSMutableData',
+            'NSMutableCharacterSet', 'NSMutableAttributedString',
+            'NSMutableArray', 'NSMoveCommand', 'NSMiddleSpecifier',
+            'NSMethodSignature', 'NSMetadataQueryResultGroup',
+            'NSMetadataQueryAttributeValueTuple', 'NSMetadataQuery',
+            'NSMetadataItem', 'NSMessagePortNameServer', 'NSMessagePort',
+            'NSMapTable', 'NSMachPort', 'NSMachBootstrapServer',
+            'NSLogicalTest', 'NSLock', 'NSLocale', 'NSKeyedUnarchiver',
+            'NSKeyedArchiver', 'NSInvocationOperation', 'NSInvocation',
+            'NSInputStream', 'NSIndexSpecifier', 'NSIndexSet', 'NSIndexPath',
+            'NSHTTPURLResponse', 'NSHTTPCookieStorage', 'NSHTTPCookie',
+            'NSHost', 'NSHashTable', 'NSGetCommand', 'NSGarbageCollector',
+            'NSFormatter', 'NSFileManager', 'NSFileHandle', 'NSExpression',
+            'NSExistsCommand', 'NSException', 'NSError', 'NSEnumerator',
+            'NSDistributedNotificationCenter', 'NSDistributedLock',
+            'NSDistantObjectRequest', 'NSDistantObject',
+            'NSDirectoryEnumerator', 'NSDictionary', 'NSDeserializer',
+            'NSDeleteCommand', 'NSDecimalNumberHandler', 'NSDecimalNumber',
+            'NSDateFormatter', 'NSDateComponents', 'NSDate', 'NSData',
+            'NSCreateCommand', 'NSCountedSet', 'NSCountCommand', 'NSConnection',
+            'NSConditionLock', 'NSCondition', 'NSCompoundPredicate',
+            'NSComparisonPredicate', 'NSCoder', 'NSCloseCommand',
+            'NSCloneCommand', 'NSClassDescription', 'NSCharacterSet',
+            'NSCalendarDate', 'NSCalendar', 'NSCachedURLResponse', 'NSBundle',
+            'NSAutoreleasePool', 'NSAttributedString', 'NSAssertionHandler',
+            'NSArray', 'NSArchiver', 'NSAppleScript', 'NSAppleEventManager',
+            'NSAppleEventDescriptor', 'NSAffineTransform'
+            ),
+        // Foundation protocols
+        6 => array(
+            'NSURLProtocolClient', 'NSURLHandleClient', 'NSURLClient',
+            'NSURLAuthenticationChallengeSender', 'NSScriptObjectSpecifiers',
+            'NSScriptKeyValueCoding', 'NSScriptingComparisonMethods',
+            'NSObjCTypeSerializationCallBack', 'NSMutableCopying',
+            'NSLocking', 'NSKeyValueObserving', 'NSKeyValueCoding',
+            'NSFastEnumeration', 'NSErrorRecoveryAttempting',
+            'NSDecimalNumberBehaviors', 'NSCopying', 'NSComparisonMethods',
+            'NSCoding'
+            ),
+        // AppKit classes
+        7 => array(
+            'NSWorkspace', 'NSWindowController', 'NSWindow', 'NSViewController',
+            'NSViewAnimation', 'NSView', 'NSUserDefaultsController',
+            'NSTypesetter', 'NSTreeNode', 'NSTreeController', 'NSTrackingArea',
+            'NSToolbarItemGroup', 'NSToolbarItem', 'NSToolbar',
+            'NSTokenFieldCell', 'NSTokenField', 'NSTextView',
+            'NSTextTableBlock', 'NSTextTable', 'NSTextTab', 'NSTextStorage',
+            'NSTextList', 'NSTextFieldCell', 'NSTextField', 'NSTextContainer',
+            'NSTextBlock', 'NSTextAttachmentCell', 'NSTextAttachment', 'NSText',
+            'NSTabViewItem', 'NSTabView', 'NSTableView', 'NSTableHeaderView',
+            'NSTableHeaderCell', 'NSTableColumn', 'NSStepperCell', 'NSStepper',
+            'NSStatusItem', 'NSStatusBar', 'NSSplitView', 'NSSpellChecker',
+            'NSSpeechSynthesizer', 'NSSpeechRecognizer', 'NSSound',
+            'NSSliderCell', 'NSSlider', 'NSSimpleHorizontalTypesetter',
+            'NSShadow', 'NSSegmentedControl', 'NSSegmentedCell',
+            'NSSecureTextFieldCell', 'NSSecureTextField', 'NSSearchFieldCell',
+            'NSSearchField', 'NSScrollView', 'NSScroller', 'NSScreen',
+            'NSSavePanel', 'NSRulerView', 'NSRulerMarker', 'NSRuleEditor',
+            'NSResponder', 'NSQuickDrawView', 'NSProgressIndicator',
+            'NSPrintPanel', 'NSPrintOperation', 'NSPrintInfo', 'NSPrinter',
+            'NSPredicateEditorRowTemplate', 'NSPredicateEditor',
+            'NSPopUpButtonCell', 'NSPopUpButton', 'NSPICTImageRep',
+            'NSPersistentDocument', 'NSPDFImageRep', 'NSPathControl',
+            'NSPathComponentCell', 'NSPathCell', 'NSPasteboard',
+            'NSParagraphStyle', 'NSPanel', 'NSPageLayout', 'NSOutlineView',
+            'NSOpenPanel', 'NSOpenGLView', 'NSOpenGLPixelFormat',
+            'NSOpenGLPixelBuffer', 'NSOpenGLContext', 'NSObjectController',
+            'NSNibOutletConnector', 'NSNibControlConnector', 'NSNibConnector',
+            'NSNib', 'NSMutableParagraphStyle', 'NSMovieView', 'NSMovie',
+            'NSMenuView', 'NSMenuItemCell', 'NSMenuItem', 'NSMenu', 'NSMatrix',
+            'NSLevelIndicatorCell', 'NSLevelIndicator', 'NSLayoutManager',
+            'NSInputServer', 'NSInputManager', 'NSImageView', 'NSImageRep',
+            'NSImageCell', 'NSImage', 'NSHelpManager', 'NSGraphicsContext',
+            'NSGradient', 'NSGlyphInfo', 'NSGlyphGenerator', 'NSFormCell',
+            'NSForm', 'NSFontPanel', 'NSFontManager', 'NSFontDescriptor',
+            'NSFont', 'NSFileWrapper', 'NSEvent', 'NSEPSImageRep', 'NSDrawer',
+            'NSDocumentController', 'NSDocument', 'NSDockTile',
+            'NSDictionaryController', 'NSDatePickerCell', 'NSDatePicker',
+            'NSCustomImageRep', 'NSCursor', 'NSController', 'NSControl',
+            'NSComboBoxCell', 'NSComboBox', 'NSColorWell', 'NSColorSpace',
+            'NSColorPicker', 'NSColorPanel', 'NSColorList', 'NSColor',
+            'NSCollectionViewItem', 'NSCollectionView', 'NSClipView',
+            'NSCIImageRep', 'NSCell', 'NSCachedImageRep', 'NSButtonCell',
+            'NSButton', 'NSBrowserCell', 'NSBrowser', 'NSBox',
+            'NSBitmapImageRep', 'NSBezierPath', 'NSATSTypesetter',
+            'NSArrayController', 'NSApplication', 'NSAnimationContext',
+            'NSAnimation', 'NSAlert', 'NSActionCell'
+            ),
+        // AppKit protocols
+        8 => array(
+            'NSWindowScripting', 'NSValidatedUserInterfaceItem',
+            'NSUserInterfaceValidations', 'NSToolTipOwner',
+            'NSToolbarItemValidation', 'NSTextInput',
+            'NSTableDataSource', 'NSServicesRequests',
+            'NSPrintPanelAccessorizing', 'NSPlaceholders',
+            'NSPathControlDelegate', 'NSPathCellDelegate',
+            'NSOutlineViewDataSource', 'NSNibAwaking', 'NSMenuValidation',
+            'NSKeyValueBindingCreation', 'NSInputServiceProvider',
+            'NSInputServerMouseTracker', 'NSIgnoreMisspelledWords',
+            'NSGlyphStorage', 'NSFontPanelValidation', 'NSEditorRegistration',
+            'NSEditor', 'NSDraggingSource', 'NSDraggingInfo',
+            'NSDraggingDestination', 'NSDictionaryControllerKeyValuePair',
+            'NSComboBoxDataSource', 'NSComboBoxCellDataSource',
+            'NSColorPickingDefault', 'NSColorPickingCustom', 'NSChangeSpelling',
+            'NSAnimatablePropertyContainer', 'NSAccessibility'
+            ),
+        // CoreData classes
+        9 => array(
+            'NSRelationshipDescription', 'NSPropertyMapping',
+            'NSPropertyDescription', 'NSPersistentStoreCoordinator',
+            'NSPersistentStore', 'NSMigrationManager', 'NSMappingModel',
+            'NSManagedObjectModel', 'NSManagedObjectID',
+            'NSManagedObjectContext', 'NSManagedObject',
+            'NSFetchRequestExpression', 'NSFetchRequest',
+            'NSFetchedPropertyDescription', 'NSEntityMigrationPolicy',
+            'NSEntityMapping', 'NSEntityDescription', 'NSAttributeDescription',
+            'NSAtomicStoreCacheNode', 'NSAtomicStore'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    // Define the colors for the groups listed above
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a61390;', // Objective-C keywords
+            2 => 'color: #a61390;', // Macros and constants
+            3 => 'color: #a61390;', // C standard library functions
+            4 => 'color: #a61390;', // data types
+            5 => 'color: #400080;', // Foundation classes
+            6 => 'color: #2a6f76;', // Foundation protocols
+            7 => 'color: #400080;', // AppKit classes
+            8 => 'color: #2a6f76;', // AppKit protocols
+            9 => 'color: #400080;' // CoreData classes
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #6e371a;', // Preprocessor directives
+            2 => 'color: #11740a; font-style: italic;', // Normal C single-line comments
+            3 => 'color: #bf1d1a;', // Q-sign in front of Strings
+            'MULTI' => 'color: #11740a; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #2400d9;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #002200;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #bf1d1a;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2400d9;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #002200;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAME}.html',
+        4 => '',
+        5 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Classes/{FNAME}_Class/',
+        6 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Protocols/{FNAME}_Protocol/',
+        7 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/{FNAME}_Class/',
+        8 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Protocols/{FNAME}_Protocol/',
+        9 => 'http://developer.apple.com/documentation/Cocoa/Reference/CoreDataFramework/Classes/{FNAME}_Class/'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/objeck.php b/vendor/easybook/geshi/geshi/objeck.php
new file mode 100755
index 000000000..bf9dab564
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/objeck.php
@@ -0,0 +1,116 @@
+<?php
+/*************************************************************************************
+ * objeck.php
+ * --------
+ * Author: Randy Hollines (objeck@gmail.com)
+ * Copyright: (c) 2010 Randy Hollines (http://code.google.com/p/objeck-lang/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/07/01
+ *
+ * Objeck Programming Language language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/26 (1.0.8.10)
+ *  -  Added new and missing keywords and symbols: 'String', 'each', '+=', '-=', '*=' and '/='.
+ * 2010/07/01 (1.0.8.9)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Objeck Programming Language',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('#~' => '~#'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'virtual', 'if', 'else', 'do', 'while', 'use', 'bundle', 'native',
+            'static', 'public', 'private', 'class', 'function', 'method',
+            'select', 'other', 'enum', 'for', 'each', 'label', 'return', 'from'
+            ),
+        2 => array(
+            'Byte', 'Int', 'Nil', 'Float', 'Char', 'Bool', 'String'
+            ),
+        3 => array(
+            'true', 'false'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', '&', '|', ':', ';', ',', '+=', '-=', '*=', '/=',
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;'
+        ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/ocaml-brief.php b/vendor/easybook/geshi/geshi/ocaml-brief.php
new file mode 100755
index 000000000..c5fee2fec
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ocaml-brief.php
@@ -0,0 +1,110 @@
+<?php
+/*************************************************************************************
+ * ocaml.php
+ * ----------
+ * Author: Flaie (fireflaie@gmail.com)
+ * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/08/27
+ *
+ * OCaml (Objective Caml) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/08/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'OCaml (brief)',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => "",
+    'KEYWORDS' => array(
+        /* main OCaml keywords */
+        1 => array(
+            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
+            'end', 'exception', 'external', 'failwith', 'false', 'flush', 'for', 'fun', 'function', 'functor',
+            'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
+            'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
+            'private', 'ref', 'rec', 'raise', 'regexp', 'sig', 'struct', 'stdout', 'stdin', 'stderr', 'then',
+            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
+            )
+        ),
+    /* highlighting symbols is really important in OCaml */
+    'SYMBOLS' => array(
+        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
+        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #6c6;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/ocaml.php b/vendor/easybook/geshi/geshi/ocaml.php
new file mode 100755
index 000000000..ac6c29bcc
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ocaml.php
@@ -0,0 +1,187 @@
+<?php
+/*************************************************************************************
+ * ocaml.php
+ * ----------
+ * Author: Flaie (fireflaie@gmail.com)
+ * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/08/27
+ *
+ * OCaml (Objective Caml) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/03/29 (1.0.7.22)
+ *   -  Fixed warnings resulting from missing style information
+ * 2005/08/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/08/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'OCaml',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'COMMENT_REGEXP' => array(1 => '/\(\*(?:(?R)|.)+?\*\)/s'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => "",
+    'KEYWORDS' => array(
+        /* main OCaml keywords */
+        1 => array(
+            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
+            'end', 'exception', 'external', 'failwith', 'false', 'for', 'fun', 'function', 'functor',
+            'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
+            'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
+            'private', 'ref', 'rec', 'raise', 'regexp', 'sig', 'struct', 'stdout', 'stdin', 'stderr', 'then',
+            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
+            ),
+        /* define names of main librarys, so we can link to it */
+        2 => array(
+            'Arg', 'Arith_status', 'Array', //'Array1', 'Array2', 'Array3',
+            'ArrayLabels', 'Big_int', 'Bigarray', 'Buffer', 'Callback',
+            'CamlinternalLazy', 'CamlinternalMod', 'CamlinternalOO', 'Char',
+            'Complex', 'Condition', 'Dbm', 'Digest', 'Dynlink', 'Event',
+            'Filename', 'Format', 'Gc', 'Genlex', 'Graphics', 'GraphicsX11',
+            'Hashtbl', 'Int32', 'Int64', 'Lazy', 'Lexing', 'List', 'ListLabels',
+            'Map', 'Marshal', 'MoreLabels', 'Mutex', 'Nativeint', 'Num', 'Obj',
+            'Oo', 'Parsing', 'Pervasives', 'Printexc', 'Printf', 'Queue',
+            'Random', 'Scanf', 'Set', 'Sort', 'Stack', 'StdLabels', 'Str',
+            'Stream', 'String', 'StringLabels', 'Sys', 'Thread', 'ThreadUnix',
+            'Tk', 'Unix', 'UnixLabels', 'Weak'
+            ),
+        /* just link to the Pervasives functions library, cause it's the default opened library when starting OCaml */
+        3 => array(
+            'abs', 'abs_float', 'acos', 'asin', 'at_exit', 'atan', 'atan2',
+            'bool_of_string', 'ceil', 'char_of_int', 'classify_float',
+            'close_in', 'close_in_noerr', 'close_out', 'close_out_noerr',
+            'compare', 'cos', 'cosh', 'decr', 'epsilon_float', 'exit', 'exp',
+            'float', 'float_of_int', 'float_of_string', 'floor', 'flush',
+            'flush_all', 'format_of_string', 'frexp', 'fst', 'ignore',
+            'in_channel_length', 'infinity', 'input', 'input_binary_int',
+            'input_byte', 'input_char', 'input_line', 'input_value',
+            'int_of_char', 'int_of_float', 'int_of_string', 'invalid_arg',
+            'ldexp', 'log', 'log10', 'max', 'max_float', 'max_int', 'min',
+            'min_float', 'min_int', 'mod_float', 'modf', 'nan', 'open_in',
+            'open_in_bin', 'open_in_gen', 'open_out', 'open_out_bin',
+            'open_out_gen', 'out_channel_length', 'output', 'output_binary_int',
+            'output_byte', 'output_char', 'output_string', 'output_value',
+            'pos_in', 'pos_out',  'pred', 'prerr_char', 'prerr_endline',
+            'prerr_float', 'prerr_int', 'prerr_newline', 'prerr_string',
+            'print_char', 'print_endline', 'print_float', 'print_int',
+            'print_newline', 'print_string', 'read_float', 'read_int',
+            'read_line', 'really_input', 'seek_in', 'seek_out',
+            'set_binary_mode_in', 'set_binary_mode_out', 'sin', 'sinh', 'snd',
+            'sqrt', 'string_of_bool', 'string_of_float', 'string_of_format',
+            'string_of_int', 'succ', 'tan', 'tanh', 'truncate'
+            ),
+        /* here Pervasives Types */
+        4 => array (
+            'array','bool','char','exn','file_descr','format','fpclass',
+            'in_channel','int','int32','int64','list','nativeint','open_flag',
+            'out_channel','string','Sys_error','unit'
+            ),
+        /* finally Pervasives Exceptions */
+        5 => array (
+            'Exit', 'Invalid_Argument', 'Failure', 'Division_by_zero'
+            )
+        ),
+    /* highlighting symbols is really important in OCaml */
+    'SYMBOLS' => array(
+        '+.', '-.', '*.', '/.', '[<', '>]',
+        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
+        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'",
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => true, /* functions name are case sensitive */
+        3 => true, /* types name too */
+        4 => true, /* pervasives types */
+        5 => true  /* pervasives exceptions */
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* nice blue */
+            3 => 'color: #06c; font-weight: bold;', /* nice blue */
+            4 => 'color: #06c; font-weight: bold;', /* nice blue */
+            5 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;', /* light purple */
+            1 => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #a52a2a;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            1 => 'font-weight:bold; color:#339933;',
+            2 => 'font-weight:bold; color:#993399;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Pervasives functions (land, lxor, asr, ...) */
+        1 => '',
+        /* link to the wanted library */
+        2 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/{FNAME}.html',
+        /* link to Pervasives functions */
+        3 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#VAL{FNAME}',
+        /* link to Pervasives type */
+        4 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#TYPE{FNAME}',
+        /* link to Pervasives exceptions */
+        5 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#EXCEPTION{FNAME}'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        1 => '~\w+',
+        2 => '`(?=(?-i:[a-z]))\w*',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/octave.php b/vendor/easybook/geshi/geshi/octave.php
new file mode 100755
index 000000000..7bab9b138
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/octave.php
@@ -0,0 +1,513 @@
+<?php
+/*************************************************************************************
+ * octave.php
+ * -----------
+ * Author: Carnë Draug (carandraug+dev@gmail.com)
+ *         Juan Pablo Carbajal (carbajal@ifi.uzh.ch)
+ * Copyright: (c) 2012 Carnë Draug
+ *            (c) 2012 Juan Pablo Carbajal
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/05/22
+ *
+ * GNU Octave M-file language file for GeSHi.
+ *
+ * This file was heavily based on octave.lang from gtksourceview. If bugs are
+ * found and/or fixed on this file, please send them to the gtksourceview
+ * project or e-mail them to this file authors. Thanks in advance
+ *
+ * CHANGES
+ * -------
+ * 2012/05/22 (1.0.8.11)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GNU Octave',
+    'COMMENT_SINGLE' => array(1 => '#', 2 => '%'),
+    // we can't use COMMENT_MULTI since start and end of block comments need to
+    // be alone on the line (optionally, with whitespace). See COMMENT_REGEXP
+    'COMMENT_MULTI' => array(),
+    // we can't use QUOTEMARKS, not even HARDQUOTE, see COMMENT_REGEXP
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'COMMENT_REGEXP' => array(
+        // Single quote strings: we can't use QUOTEMARKS here since new
+        // lines will break the string. Plus, single quote strings do not even
+        // allow for continuation markers, only double quote strings allow it.
+        // Also, to do not misdetect the transpose operator ' as the start of a
+        // string we assert to not follow a variable name (letters, digits and
+        // underscores) or a closing bracket (round, square or curly) or a dot
+        // (to form the array transpose operator ".'" ).
+        3 => "/(?<![0-9a-zA-Z_\)\]}\.])'.*?'/",
+        // Double quote strings: we also can't use QUOTEMARKS here (see single
+        // line quotes). However, with double quote strings both \ and ... can
+        // be used to make multiline strings. Continuation markers can be
+        // followed by whitespace
+        4 => '/"(.|(\.\.\.|\\\)(\s)*?\n)*?(?<!\\\)"/',
+        // Block comments: the ms modifiers treat strings as multiple lines (to
+        // be able to use ^ and $ instead of newline and thus support block
+        // comments on the first and last line of source) and make . also match
+        // a newline
+        5 => "/^\s*?[%#]{\s*?$.*?^\s*?[%#]}\s*?$/ms",
+        // Packaging system: comes here so that pkg can also be used in the
+        // function form. The list of pkg commands is optional to the match so
+        // that at least pkg is highlighted if new commands are implemented
+        6 => "/\bpkg(?!\s*\()\s+((un)?install|update|(un)?load|list|(global|local)_list|describe|prefix|(re)?build)?\b/",
+        // Function handles
+        7 => "/@([a-z_][a-z1-9_]*)?/i",
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_OCT_PREFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'KEYWORDS' => array(
+        // Data types
+        1 => array(
+            'cell', 'char', 'double', 'uint8', 'uint16', 'uint32', 'uint64',
+            'int8','int16', 'int32', 'int64', 'logical', 'single', 'struct'
+            ),
+        // Storage type
+        2 => array(
+            'global', 'persistent', 'static'
+            ),
+        // Internal variable
+        3 => array(
+            'ans'
+            ),
+        // Reserved words
+        4 => array(
+            'break', 'case', 'catch', 'continue', 'do', 'else', 'elseif', 'end',
+            'end_try_catch', 'end_unwind_protect', 'endfor', 'endfunction',
+            'endif', 'endparfor', 'endswitch', 'endwhile', 'for', 'function',
+            'if', 'otherwise', 'parfor', 'return',
+            'switch', 'try', 'until', 'unwind_protect',
+            'unwind_protect_cleanup', 'varargin', 'varargout', 'while'
+            ),
+        // Built in
+        5 => array(
+            'P_tmpdir', 'abs', 'acos', 'acosh',
+            'add_input_event_hook', 'addlistener', 'addpath', 'addproperty',
+            'all', 'allow_noninteger_range_as_index', 'and', 'angle', 'any',
+            'arg', 'argnames', 'argv', 'asin', 'asinh', 'assignin', 'atan',
+            'atan2', 'atanh', 'atexit', 'autoload', 'available_graphics_toolkits',
+            'beep_on_error', 'bitand', 'bitmax', 'bitor', 'bitshift', 'bitxor',
+            'builtin', 'canonicalize_file_name', 'cat', 'cbrt', 'cd', 'ceil',
+            'cell2struct', 'cellstr', 'chdir', 'class', 'clc',
+            'clear', 'columns', 'command_line_path', 'completion_append_char',
+            'completion_matches', 'complex', 'confirm_recursive_rmdir', 'conj',
+            'cos', 'cosh', 'cputime', 'crash_dumps_octave_core', 'ctranspose',
+            'cumprod', 'cumsum', 'dbclear', 'dbcont', 'dbdown', 'dbnext',
+            'dbquit', 'dbstack', 'dbstatus', 'dbstep', 'dbstop', 'dbtype', 'dbup',
+            'dbwhere', 'debug_on_error', 'debug_on_interrupt', 'debug_on_warning',
+            'default_save_options', 'dellistener', 'diag', 'diary', 'diff',
+            'disp', 'do_braindead_shortcircuit_evaluation', 'do_string_escapes',
+            'doc_cache_file', 'drawnow', 'dup2', 'echo',
+            'echo_executing_commands', 'edit_history','eq', 'erf', 'erfc',
+            'erfcx', 'erfinv', 'errno', 'errno_list', 'error', 'eval', 'evalin',
+            'exec', 'exist', 'exit', 'exp', 'expm1', 'eye', 'fclear',
+            'fclose', 'fcntl', 'fdisp', 'feof', 'ferror', 'feval', 'fflush',
+            'fgetl', 'fgets', 'fieldnames', 'file_in_loadpath', 'file_in_path',
+            'filemarker', 'filesep', 'find_dir_in_path', 'finite', 'fix',
+            'fixed_point_format', 'floor', 'fmod', 'fnmatch', 'fopen', 'fork',
+            'format', 'formula', 'fprintf', 'fputs', 'fread', 'freport',
+            'frewind', 'fscanf', 'fseek', 'fskipl', 'ftell', 'full', 'func2str',
+            'functions', 'fwrite', 'gamma', 'gammaln', 'ge', 'genpath', 'get',
+            'get_help_text', 'get_help_text_from_file', 'getegid', 'getenv',
+            'geteuid', 'getgid', 'gethostname', 'getpgrp', 'getpid', 'getppid',
+            'getuid', 'glob', 'gt', 'history', 'history_control', 'history_file',
+            'history_size', 'history_timestamp_format_string', 'home', 'horzcat',
+            'hypot', 'ifelse', 'ignore_function_time_stamp', 'imag',
+            'inferiorto', 'info_file', 'info_program', 'inline', 'input',
+            'intmax', 'intmin', 'ipermute',
+            'is_absolute_filename', 'is_dq_string', 'is_function_handle',
+            'is_rooted_relative_filename', 'is_sq_string', 'isalnum', 'isalpha',
+            'isargout', 'isascii', 'isbool', 'iscell', 'iscellstr', 'ischar',
+            'iscntrl', 'iscomplex', 'isdebugmode', 'isdigit', 'isempty',
+            'isfield', 'isfinite', 'isfloat', 'isglobal', 'isgraph', 'ishandle',
+            'isieee', 'isindex', 'isinf', 'isinteger', 'iskeyword', 'islogical',
+            'islower', 'ismatrix', 'ismethod', 'isna', 'isnan', 'isnull',
+            'isnumeric', 'isobject', 'isprint', 'ispunct', 'isreal', 'issorted',
+            'isspace', 'issparse', 'isstruct', 'isupper', 'isvarname', 'isxdigit',
+            'kbhit', 'keyboard', 'kill', 'lasterr', 'lasterror', 'lastwarn',
+            'ldivide', 'le', 'length', 'lgamma', 'link', 'linspace',
+            'list_in_columns', 'load', 'loaded_graphics_toolkits', 'log', 'log10',
+            'log1p', 'log2', 'lower', 'lstat', 'lt',
+            'make_absolute_filename', 'makeinfo_program', 'max_recursion_depth',
+            'merge', 'methods', 'mfilename', 'minus', 'mislocked',
+            'missing_function_hook', 'mkdir', 'mkfifo', 'mkstemp', 'mldivide',
+            'mlock', 'mod', 'more', 'mpower', 'mrdivide', 'mtimes', 'munlock',
+            'nargin', 'nargout', 'native_float_format', 'ndims', 'ne',
+            'nfields', 'nnz', 'norm', 'not', 'nth_element', 'numel', 'nzmax',
+            'octave_config_info', 'octave_core_file_limit',
+            'octave_core_file_name', 'octave_core_file_options',
+            'octave_tmp_file_name', 'onCleanup', 'ones',
+            'optimize_subsasgn_calls', 'or', 'output_max_field_width',
+            'output_precision', 'page_output_immediately', 'page_screen_output',
+            'path', 'pathsep', 'pause', 'pclose', 'permute', 'pipe', 'plus',
+            'popen', 'popen2', 'power', 'print_empty_dimensions',
+            'print_struct_array_contents', 'printf', 'prod',
+            'program_invocation_name', 'program_name', 'putenv', 'puts', 'pwd',
+            'quit', 'rats', 'rdivide', 're_read_readline_init_file',
+            'read_readline_init_file', 'readdir', 'readlink', 'real', 'realmax',
+            'realmin', 'register_graphics_toolkit', 'rehash', 'rem',
+            'remove_input_event_hook', 'rename', 'repelems', 'reset', 'reshape',
+            'resize', 'restoredefaultpath', 'rethrow', 'rmdir', 'rmfield',
+            'rmpath', 'round', 'roundb', 'rows', 'run_history', 'save',
+            'save_header_format_string', 'save_precision', 'saving_history',
+            'scanf', 'set', 'setenv', 'sighup_dumps_octave_core', 'sign',
+            'sigterm_dumps_octave_core', 'silent_functions', 'sin',
+            'sinh', 'size', 'size_equal', 'sizemax', 'sizeof', 'sleep', 'sort',
+            'source', 'spalloc', 'sparse', 'sparse_auto_mutate',
+            'split_long_rows', 'sprintf', 'sqrt', 'squeeze', 'sscanf', 'stat',
+            'stderr', 'stdin', 'stdout', 'str2func', 'strcmp', 'strcmpi',
+            'string_fill_char', 'strncmp', 'strncmpi', 'struct2cell',
+            'struct_levels_to_print', 'strvcat', 'subsasgn', 'subsref', 'sum',
+            'sumsq', 'superiorto', 'suppress_verbose_help_message', 'symlink',
+            'system', 'tan', 'tanh', 'terminal_size', 'tic', 'tilde_expand',
+            'times', 'tmpfile', 'tmpnam', 'toascii', 'toc', 'tolower', 'toupper',
+            'transpose', 'typeinfo',
+            'umask', 'uminus', 'uname', 'undo_string_escapes', 'unlink',
+            'uplus', 'upper', 'usage', 'usleep', 'vec', 'vectorize', 'vertcat',
+            'waitfor', 'waitpid', 'warning', 'warranty', 'who', 'whos',
+            'whos_line_format', 'yes_or_no', 'zeros'
+            ),
+        // Octave functions
+        6 => array(
+            'accumarray', 'accumdim', 'acosd', 'acot', 'acotd', 'acoth', 'acsc',
+            'acscd', 'acsch', 'addpref', 'addtodate', 'allchild', 'amd',
+            'ancestor', 'anova', 'arch_fit', 'arch_rnd', 'arch_test',
+            'area', 'arma_rnd', 'asctime', 'asec', 'asecd', 'asech', 'asind',
+            'assert', 'atand', 'autoreg_matrix', 'autumn',
+            'axes', 'axis', 'balance', 'bar', 'barh', 'bartlett', 'bartlett_test',
+            'base2dec', 'beep', 'bessel', 'besselj', 'beta', 'betacdf',
+            'betainc', 'betainv', 'betaln', 'betapdf', 'betarnd', 'bicg',
+            'bicgstab', 'bicubic', 'bin2dec', 'bincoeff', 'binocdf', 'binoinv',
+            'binopdf', 'binornd', 'bitcmp', 'bitget', 'bitset', 'blackman',
+            'blanks', 'blkdiag', 'bone', 'box', 'brighten', 'bsxfun',
+            'bug_report', 'bunzip2', 'bzip2', 'calendar', 'cart2pol', 'cart2sph',
+            'cast', 'cauchy_cdf', 'cauchy_inv', 'cauchy_pdf', 'cauchy_rnd',
+            'caxis', 'ccolamd', 'cell2mat', 'celldisp', 'cellfun',
+            'center', 'cgs', 'chi2cdf', 'chi2inv', 'chi2pdf', 'chi2rnd',
+            'chisquare_test_homogeneity', 'chisquare_test_independence', 'chol',
+            'chop', 'circshift', 'cla', 'clabel', 'clf', 'clock',
+            'cloglog', 'close', 'closereq', 'colamd', 'colloc', 'colon',
+            'colorbar', 'colormap', 'colperm', 'colstyle', 'comet', 'comet3',
+            'comma', 'common_size', 'commutation_matrix', 'compan',
+            'compare_versions', 'compass', 'computer', 'cond', 'condest',
+            'contour', 'contour3', 'contourc', 'contourf', 'contrast', 'conv',
+            'conv2', 'convhull', 'convhulln', 'cool', 'copper', 'copyfile',
+            'cor_test', 'corr', 'cosd', 'cot', 'cotd', 'coth', 'cov',
+            'cplxpair', 'cross', 'csc', 'cscd', 'csch', 'cstrcat',
+            'csvread', 'csvwrite', 'ctime', 'cumtrapz', 'curl', 'cylinder',
+            'daspect', 'daspk', 'dasrt', 'dassl', 'date', 'datenum', 'datestr',
+            'datetick', 'datevec', 'dblquad', 'deal', 'deblank', 'debug',
+            'dec2base', 'dec2bin', 'dec2hex', 'deconv', 'del2', 'delaunay',
+            'delaunay3', 'delaunayn', 'delete', 'demo', 'det', 'detrend',
+            'diffpara', 'diffuse', 'dir', 'discrete_cdf', 'discrete_inv',
+            'discrete_pdf', 'discrete_rnd', 'display', 'divergence',
+            'dlmread', 'dlmwrite', 'dmperm', 'doc', 'dos', 'dot', 'dsearch',
+            'dsearchn', 'dump_prefs', 'duplication_matrix', 'durbinlevinson',
+            'edit', 'eig', 'eigs', 'ellipsoid', 'empirical_cdf', 'empirical_inv',
+            'empirical_pdf', 'empirical_rnd', 'eomday', 'errorbar',
+            'etime', 'etreeplot', 'example', 'expcdf', 'expinv', 'expm', 'exppdf',
+            'exprnd', 'ezcontour', 'ezcontourf', 'ezmesh', 'ezmeshc', 'ezplot',
+            'ezplot3', 'ezpolar', 'ezsurf', 'ezsurfc', 'f_test_regression',
+            'fact', 'factor', 'factorial', 'fail', 'fcdf', 'feather', 'fft',
+            'fft2', 'fftconv', 'fftfilt', 'fftn', 'fftshift', 'fftw', 'figure',
+            'fileattrib', 'fileparts', 'fileread', 'fill', 'filter', 'filter2',
+            'find', 'findall', 'findobj', 'findstr', 'finv', 'flag', 'flipdim',
+            'fliplr', 'flipud', 'fminbnd', 'fminunc', 'fpdf', 'fplot',
+            'fractdiff', 'freqz', 'freqz_plot', 'frnd', 'fsolve',
+            'fullfile', 'fzero', 'gamcdf', 'gaminv', 'gammainc',
+            'gampdf', 'gamrnd', 'gca', 'gcbf', 'gcbo', 'gcd', 'gcf',
+            'gen_doc_cache', 'genvarname', 'geocdf', 'geoinv', 'geopdf', 'geornd',
+            'get_first_help_sentence', 'getappdata', 'getfield', 'getgrent',
+            'getpref', 'getpwent', 'getrusage', 'ginput', 'givens', 'glpk',
+            'gls', 'gmap40', 'gmres', 'gnuplot_binary', 'gplot',
+            'gradient', 'graphics_toolkit', 'gray', 'gray2ind', 'grid',
+            'griddata', 'griddata3', 'griddatan', 'gtext', 'guidata',
+            'guihandles', 'gunzip', 'gzip', 'hadamard', 'hamming', 'hankel',
+            'hanning', 'help', 'hess', 'hex2dec', 'hex2num', 'hggroup', 'hidden',
+            'hilb', 'hist', 'histc', 'hold', 'hot', 'hotelling_test',
+            'hotelling_test_2', 'housh', 'hsv', 'hsv2rgb', 'hurst', 'hygecdf',
+            'hygeinv', 'hygepdf', 'hygernd', 'idivide', 'ifftshift', 'image',
+            'imagesc', 'imfinfo', 'imread', 'imshow', 'imwrite', 'ind2gray',
+            'ind2rgb', 'index', 'info', 'inpolygon', 'inputname', 'int2str',
+            'interp1', 'interp1q', 'interp2', 'interp3', 'interpft', 'interpn',
+            'intersect', 'inv', 'invhilb', 'iqr',
+            'is_leap_year', 'is_valid_file_id',
+            'isa', 'isappdata', 'iscolumn', 'isdefinite', 'isdeployed', 'isdir',
+            'isequal', 'isequalwithequalnans', 'isfigure', 'ishermitian',
+            'ishghandle', 'ishold', 'isletter', 'ismac', 'ismember', 'isocolors',
+            'isonormals', 'isosurface', 'ispc', 'ispref', 'isprime', 'isprop',
+            'isrow', 'isscalar', 'issquare', 'isstrprop', 'issymmetric',
+            'isunix', 'isvector', 'jet', 'kendall', 'kolmogorov_smirnov_cdf',
+            'kolmogorov_smirnov_test', 'kolmogorov_smirnov_test_2', 'kron',
+            'kruskal_wallis_test', 'krylov', 'kurtosis', 'laplace_cdf',
+            'laplace_inv', 'laplace_pdf', 'laplace_rnd', 'lcm', 'legend',
+            'legendre', 'license', 'lin2mu', 'line', 'linkprop', 'list_primes',
+            'loadaudio', 'loadobj', 'logistic_cdf', 'logistic_inv',
+            'logistic_pdf', 'logistic_regression', 'logistic_rnd', 'logit',
+            'loglog', 'loglogerr', 'logm', 'logncdf', 'logninv', 'lognpdf',
+            'lognrnd', 'logspace', 'lookfor', 'lookup', 'ls', 'ls_command',
+            'lsode', 'lsqnonneg', 'lu', 'luinc', 'magic', 'mahalanobis', 'manova',
+            'mat2str', 'matlabroot', 'matrix_type', 'max', 'mcnemar_test',
+            'md5sum', 'mean', 'meansq', 'median', 'menu', 'mesh', 'meshc',
+            'meshgrid', 'meshz', 'mex', 'mexext', 'mgorth', 'mkoctfile', 'mkpp',
+            'mode', 'moment', 'movefile', 'mpoles', 'mu2lin', 'namelengthmax',
+            'nargchk', 'narginchk', 'nargoutchk', 'nbincdf', 'nbininv', 'nbinpdf',
+            'nbinrnd', 'nchoosek', 'ndgrid', 'newplot', 'news', 'nextpow2',
+            'nonzeros', 'normcdf', 'normest', 'norminv', 'normpdf', 'normrnd',
+            'now', 'nproc', 'nthargout', 'nthroot', 'ntsc2rgb', 'null', 'num2str',
+            'ocean', 'ols', 'onenormest', 'optimget', 'optimset', 'orderfields',
+            'orient', 'orth', 'pack', 'paren', 'pareto', 'parseparams', 'pascal',
+            'patch', 'pathdef', 'pbaspect', 'pcg', 'pchip', 'pcolor', 'pcr',
+            'peaks', 'periodogram', 'perl', 'perms', 'pie', 'pie3',
+            'pink', 'pinv', 'pkg', 'planerot', 'playaudio', 'plot', 'plot3',
+            'plotmatrix', 'plotyy', 'poisscdf', 'poissinv', 'poisspdf',
+            'poissrnd', 'pol2cart', 'polar', 'poly', 'polyaffine', 'polyarea',
+            'polyder', 'polyfit', 'polygcd', 'polyint', 'polyout',
+            'polyreduce', 'polyval', 'polyvalm', 'postpad', 'pow2', 'powerset',
+            'ppder', 'ppint', 'ppjumps', 'ppplot', 'ppval', 'pqpnonneg',
+            'prctile', 'prepad', 'primes', 'print', 'printAllBuiltins',
+            'print_usage', 'prism', 'probit', 'profexplore', 'profile',
+            'profshow', 'prop_test_2', 'python', 'qp', 'qqplot', 'qr', 'quad',
+            'quadcc', 'quadgk', 'quadl', 'quadv', 'quantile', 'quiver', 'quiver3',
+            'qz', 'qzhess', 'rainbow', 'rand', 'randi', 'range', 'rank', 'ranks',
+            'rat', 'rcond', 'reallog', 'realpow', 'realsqrt', 'record',
+            'rectangle', 'rectint', 'recycle', 'refresh', 'refreshdata', 'regexp',
+            'regexptranslate', 'repmat', 'residue', 'rgb2hsv',
+            'rgb2ind', 'rgb2ntsc', 'ribbon', 'rindex', 'rmappdata', 'rmpref',
+            'roots', 'rose', 'rosser', 'rot90', 'rotdim', 'rref', 'run',
+            'run_count', 'run_test', 'rundemos', 'runlength', 'runtests',
+            'saveas', 'saveaudio', 'saveobj', 'savepath', 'scatter',
+            'scatter3', 'schur', 'sec', 'secd', 'sech', 'semicolon', 'semilogx',
+            'semilogxerr', 'semilogy', 'semilogyerr', 'setappdata', 'setaudio',
+            'setdiff', 'setfield', 'setpref', 'setxor', 'shading',
+            'shg', 'shift', 'shiftdim', 'sign_test', 'sinc', 'sind',
+            'sinetone', 'sinewave', 'skewness', 'slice', 'sombrero', 'sortrows',
+            'spaugment', 'spconvert', 'spdiags', 'spearman', 'spectral_adf',
+            'spectral_xdf', 'specular', 'speed', 'spencer', 'speye', 'spfun',
+            'sph2cart', 'sphere', 'spinmap', 'spline', 'spones', 'spparms',
+            'sprand', 'sprandn', 'sprandsym', 'spring', 'spstats', 'spy', 'sqp',
+            'sqrtm', 'stairs', 'statistics', 'std', 'stdnormal_cdf',
+            'stdnormal_inv', 'stdnormal_pdf', 'stdnormal_rnd', 'stem', 'stem3',
+            'stft', 'str2double', 'str2num', 'strcat', 'strchr',
+            'strfind', 'strjust', 'strmatch', 'strread', 'strsplit', 'strtok',
+            'strtrim', 'strtrunc', 'structfun', 'sub2ind',
+            'subplot', 'subsindex', 'subspace', 'substr', 'substruct', 'summer',
+            'surf', 'surface', 'surfc', 'surfl', 'surfnorm', 'svd', 'svds',
+            'swapbytes', 'syl', 'symbfact', 'symrcm',
+            'symvar', 'synthesis', 't_test', 't_test_2', 't_test_regression',
+            'table', 'tand', 'tar', 'tcdf', 'tempdir', 'tempname', 'test', 'text',
+            'textread', 'textscan', 'time', 'tinv', 'title', 'toeplitz', 'tpdf',
+            'trace', 'trapz', 'treelayout', 'treeplot', 'tril', 'trimesh',
+            'triplequad', 'triplot', 'trisurf', 'trnd', 'tsearch', 'tsearchn',
+            'type', 'typecast', 'u_test', 'uicontextmenu', 'uicontrol',
+            'uigetdir', 'uigetfile', 'uimenu', 'uipanel', 'uipushtool',
+            'uiputfile', 'uiresume', 'uitoggletool', 'uitoolbar', 'uiwait',
+            'unidcdf', 'unidinv', 'unidpdf', 'unidrnd', 'unifcdf', 'unifinv',
+            'unifpdf', 'unifrnd', 'unimplemented', 'union', 'unique', 'unix',
+            'unmkpp', 'unpack', 'untabify', 'untar', 'unwrap', 'unzip',
+            'urlwrite', 'usejava', 'validatestring', 'vander', 'var',
+            'var_test', 'vech', 'ver', 'version', 'view', 'voronoi', 'voronoin',
+            'waitbar', 'waitforbuttonpress', 'warning_ids', 'wavread', 'wavwrite',
+            'wblcdf', 'wblinv', 'wblpdf', 'wblrnd', 'weekday',
+            'welch_test', 'what', 'which',
+            'white', 'whitebg', 'wienrnd', 'wilcoxon_test', 'wilkinson', 'winter',
+            'xlabel', 'xlim', 'xor', 'ylabel', 'ylim', 'yulewalker', 'z_test',
+            'z_test_2', 'zip', 'zlabel', 'zlim', 'zscore', 'airy', 'arrayfun',
+            'besselh', 'besseli', 'besselk', 'bessely', 'bitpack', 'bitunpack',
+            'blkmm', 'cellindexmat', 'cellslices', 'chol2inv', 'choldelete',
+            'cholinsert', 'cholinv', 'cholshift', 'cholupdate', 'convn',
+            'csymamd', 'cummax', 'cummin', 'daspk_options', 'dasrt_options',
+            'dassl_options', 'endgrent', 'endpwent', 'etree', 'getgrgid',
+            'getgrnam', 'getpwnam', 'getpwuid', 'gmtime', 'gui_mode', 'ifft',
+            'ifft2', 'ifftn', 'ind2sub', 'inverse', 'localtime', 'lsode_options',
+            'luupdate', 'mat2cell', 'min', 'mktime', 'mouse_wheel_zoom',
+            'num2cell', 'num2hex', 'qrdelete', 'qrinsert', 'qrshift', 'qrupdate',
+            'quad_options', 'rande', 'randg', 'randn', 'randp', 'randperm',
+            'regexpi', 'regexprep', 'rsf2csf', 'setgrent', 'setpwent', 'sprank',
+            'strftime', 'strptime', 'strrep', 'svd_driver', 'symamd', 'triu',
+            'urlread'
+            ),
+        // Private builtin
+        7 => array(
+            '__accumarray_max__', '__accumarray_min__', '__accumarray_sum__',
+            '__accumdim_sum__', '__builtins__', '__calc_dimensions__',
+            '__current_scope__', '__display_tokens__', '__dump_symtab_info__',
+            '__end__', '__get__', '__go_axes__', '__go_axes_init__',
+            '__go_delete__', '__go_execute_callback__', '__go_figure__',
+            '__go_figure_handles__', '__go_handles__', '__go_hggroup__',
+            '__go_image__', '__go_line__', '__go_patch__', '__go_surface__',
+            '__go_text__', '__go_uicontextmenu__', '__go_uicontrol__',
+            '__go_uimenu__', '__go_uipanel__', '__go_uipushtool__',
+            '__go_uitoggletool__', '__go_uitoolbar__', '__gud_mode__',
+            '__image_pixel_size__', '__is_handle_visible__', '__isa_parent__',
+            '__keywords__', '__lexer_debug_flag__', '__list_functions__',
+            '__operators__', '__parent_classes__', '__parser_debug_flag__',
+            '__pathorig__', '__profiler_data__', '__profiler_enable__',
+            '__profiler_reset__', '__request_drawnow__', '__sort_rows_idx__',
+            '__token_count__', '__varval__', '__version_info__', '__which__'
+        ),
+        // Private Octave functions
+        8 => array(
+            '__all_opts__', '__contourc__', '__delaunayn__', '__dispatch__',
+            '__dsearchn__', '__finish__', '__fltk_uigetfile__',
+            '__glpk__', '__gnuplot_drawnow__', '__init_fltk__',
+            '__init_gnuplot__', '__lin_interpn__', '__magick_read__',
+            '__makeinfo__', '__pchip_deriv__', '__plt_get_axis_arg__', '__qp__',
+            '__voronoi__', '__fltk_maxtime__', '__fltk_redraw__', '__ftp__',
+            '__ftp_ascii__', '__ftp_binary__', '__ftp_close__', '__ftp_cwd__',
+            '__ftp_delete__', '__ftp_dir__', '__ftp_mget__', '__ftp_mkdir__',
+            '__ftp_mode__', '__ftp_mput__', '__ftp_pwd__', '__ftp_rename__',
+            '__ftp_rmdir__', '__magick_finfo__', '__magick_format_list__',
+            '__magick_write__'
+            ),
+        // Builtin Global Variables
+        9 => array(
+            'EDITOR', 'EXEC_PATH', 'F_DUPFD', 'F_GETFD', 'F_GETFL', 'F_SETFD',
+            'F_SETFL', 'IMAGE_PATH', 'OCTAVE_HOME',
+            'OCTAVE_VERSION', 'O_APPEND', 'O_ASYNC', 'O_CREAT', 'O_EXCL',
+            'O_NONBLOCK', 'O_RDONLY', 'O_RDWR', 'O_SYNC', 'O_TRUNC', 'O_WRONLY',
+            'PAGER', 'PAGER_FLAGS', 'PS1', 'PS2', 'PS4', 'SEEK_CUR', 'SEEK_END',
+            'SEEK_SET', 'SIG', 'S_ISBLK', 'S_ISCHR', 'S_ISDIR', 'S_ISFIFO',
+            'S_ISLNK', 'S_ISREG', 'S_ISSOCK', 'WCONTINUE', 'WCOREDUMP',
+            'WEXITSTATUS', 'WIFCONTINUED', 'WIFEXITED', 'WIFSIGNALED',
+            'WIFSTOPPED', 'WNOHANG', 'WSTOPSIG', 'WTERMSIG', 'WUNTRACED'
+            ),
+        // Constant functions
+        10 => array (
+            'e', 'eps', 'inf', 'Inf', 'nan', 'NaN', 'NA', 'pi', 'i', 'I', 'j',
+            'J', 'true', 'false'
+            ),
+        ),
+    'SYMBOLS' => array(
+        // Comparison & logical
+        0 => array(
+            '!', '!=', '&', '&&','|', '||', '~', '~=',
+            '<', '<=', '==', '>', '>='
+            ),
+        // Aritmethical
+        1 => array(
+            '*', '**', '+', '++', '-', '--', '/', "\\","'"
+            ),
+        // Elementwise arithmetical
+        2 => array(
+            '.*', '.**','./', '.^', '^',".\\",".'"
+            ),
+        // Arithmetical & assignation
+        3 => array(
+            '*=','+=','-=','/=','\=','**=','^=',
+            '.*=','.+=','.-=','./=','.\=','.**=','.^=','='
+            ),
+        // Indexer
+        4 => array(
+            ':'
+            ),
+        // Delimiters
+        5 => array(
+            ',', '...', ';'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        ),
+    'URLS' => array(
+        1 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        6 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        7 => '',
+        8 => '',
+        9 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        10 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'STYLES' => array(
+        'COMMENTS' => array(
+            1 => 'color: #0000FF; font-style: italic;', // single quote strings
+            2 => 'color: #0000FF; font-style: italic;', // double quote strings
+            3 => 'color: #FF00FF; font-style: italic;', // single quote strings
+            4 => 'color: #FF00FF; font-style: italic;', // double quote strings
+            5 => 'color: #0000FF; font-style: italic;', // block comments
+            6 => 'color: #996600; font-weight:bold;',   // packaging system
+            7 => 'color: #006600; font-weight:bold;',   // function handles
+            'MULTI' => 'color: #0000FF; font-style: italic;',
+            ),
+        'KEYWORDS' => array(
+            1 => 'color: #2E8B57; font-weight:bold;',   // Data types
+            2 => 'color: #2E8B57;',                     // Storage type
+            3 => 'color: #0000FF; font-weight:bold;',   // Internal variable
+            4 => 'color: #990000; font-weight:bold;',   // Reserved words
+            5 => 'color: #008A8C; font-weight:bold;',   // Built-in
+            6 => 'color: #008A8C;',                     // Octave functions
+            9 => 'color: #000000; font-weight:bold;',   // Builtin Global Variables
+            10 => 'color: #008A8C; font-weight:bold;',  // Constant functions
+            ),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #080;',
+            ),
+        'STRINGS' => array(
+            // strings were specified on the COMMENT_REGEXP section
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(),
+        'SYMBOLS' => array(
+            0 => 'color: #FF9696; font-weight:bold;',   // Comparison & logical
+            1 => 'color: #CC0000; font-weight:bold;',   // Aritmethical
+            2 => 'color: #993333; font-weight:bold;',   // Elementwise arithmetical
+            3 => 'color: #FF0000; font-weight:bold;',   // Arithmetical & assignation
+            4 => 'color: #33F;',                        // Indexer
+            5 => 'color: #33F;',                        // Delimiters
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(),
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/oobas.php b/vendor/easybook/geshi/geshi/oobas.php
new file mode 100755
index 000000000..25c345bbb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/oobas.php
@@ -0,0 +1,133 @@
+<?php
+/*************************************************************************************
+ * oobas.php
+ * ---------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/30
+ *
+ * OpenOffice.org Basic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'OpenOffice.org Basic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    //Single-Line comments using REM keyword
+    'COMMENT_REGEXP' => array(2 => '/\bREM.*?$/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'dim','private','public','global','as','if','redim','true','set','byval',
+            'false','bool','double','integer','long','object','single','variant',
+            'msgbox','print','inputbox','green','blue','red','qbcolor',
+            'rgb','open','close','reset','freefile','get','input','line',
+            'put','write','loc','seek','eof','lof','chdir','chdrive',
+            'curdir','dir','fileattr','filecopy','filedatetime','fileexists',
+            'filelen','getattr','kill','mkdir','name','rmdir','setattr',
+            'dateserial','datevalue','day','month','weekday','year','cdatetoiso',
+            'cdatefromiso','hour','minute','second','timeserial','timevalue',
+            'date','now','time','timer','erl','err','error','on','goto','resume',
+            'and','eqv','imp','not','or','xor','mod','atn','cos','sin','tan','log',
+            'exp','rnd','randomize','sqr','fix','int','abs','sgn','hex','oct',
+            'it','then','else','select','case','iif','do','loop','for','next','to',
+            'while','wend','gosub','return','call','choose','declare',
+            'end','exit','freelibrary','function','rem','stop','sub','switch','with',
+            'cbool','cdate','cdbl','cint','clng','const','csng','cstr','defbool',
+            'defdate','defdbl','defint','deflng','asc','chr','str','val','cbyte',
+            'space','string','format','lcase','left','lset','ltrim','mid','right',
+            'rset','rtrim','trim','ucase','split','join','converttourl','convertfromurl',
+            'instr','len','strcomp','beep','shell','wait','getsystemticks','environ',
+            'getsolarversion','getguitype','twipsperpixelx','twipsperpixely',
+            'createunostruct','createunoservice','getprocessservicemanager',
+            'createunodialog','createunolistener','createunovalue','thiscomponent',
+            'globalscope'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/oorexx.php b/vendor/easybook/geshi/geshi/oorexx.php
new file mode 100755
index 000000000..15cdd92e7
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/oorexx.php
@@ -0,0 +1,169 @@
+<?php
+/*************************************************************************************
+ * oorexx.php
+ * ---------------------------------
+ * Author: Jon Wolfers (sahananda@windhorse.biz)
+ * Contributors:
+ *    - Walter Pachl (pachl@chello.at)
+ * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/01/07
+ *
+ * ooRexx language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/07/29 (1.0.0)
+ *    -  tried to get it syntactically right
+ *
+ * TODO (updated 2012/07/29)
+ * -------------------------
+ *   -  Get it working on rosettacode.org
+ *
+ *************************************************************************************
+ *
+ *      This file is part of GeSHi.
+ *
+ *    GeSHi is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    GeSHi is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with GeSHi; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ooRexx',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'address', 'arg', 'attribute', 'call', 'constant', 'do',
+            'drop', 'exit', 'if',
+            'interpret', 'iterate', 'leave', 'loop', 'nop', 'numeric',
+            'parse', 'procedure', 'pull', 'push', 'queue',
+            'raise', 'reply', 'return', 'say', 'select', 'signal',
+            'use'
+            ),
+        2 => array(
+            'abstract', 'any', 'arguments', 'array', 'by',
+            'continue', 'digits', 'engineering', 'error',
+            'expose', 'external', 'failure', 'for', 'forever',
+            'forward', 'get', 'guard', 'guarded', 'halt',
+            'inherit', 'library', 'lostdigits', 'message',
+            'metaclass', 'mixinclass', 'name', 'nomethod', 'nostring',
+            'notready', 'novalue', 'off', 'on', 'options', 'over',
+            'private', 'protected', 'public', 'scientific', 'set',
+            'source', 'subclass', 'syntax', 'to', 'unguarded',
+            'unprotected', 'until', 'user',
+            'version', 'while', 'with'
+            ),
+        3 => array(
+            'else', 'end', 'otherwise', 'then', 'when'
+            ),
+        4 => array(
+            'rc', 'result', 'self', 'sigl', 'super'
+            ),
+        5 => array(
+            '::attribute', '::class', '::constant', '::method',
+            '::optins', '::requires', '::routine'
+            ),
+        6 => array(
+            'abbrev', 'abs', 'beep', 'bitand', 'bitor',
+            'bitxor', 'b2x', 'center', 'centre', 'changestr', 'charin',
+            'charout', 'chars', 'compare', 'condition', 'copies',
+            'countstr', 'c2d', 'c2x', 'datatype', 'date', 'delstr',
+            'delword', 'directory', 'd2c', 'd2x', 'endlocal',
+            'errortext', 'filespec', 'form', 'format', 'fuzz', 'insert',
+            'lastpos', 'left', 'length', 'linein', 'lineout', 'lines',
+            'lower', 'max', 'min', 'overlay', 'pos', 'qualify', 'queued',
+            'random', 'reverse', 'right', 'rxfuncadd', 'rxfuncdrop',
+            'rxfuncquery', 'rxqueue', 'setlocal', 'sign', 'sourceline',
+            'space', 'stream', 'strip', 'substr', 'subword', 'symbol',
+            'time', 'trace', 'translate', 'trunc', 'upper', 'userid',
+            'value', 'var', 'verify', 'word', 'wordindex', 'wordlength',
+            'wordpos', 'words', 'xrange', 'x2b', 'x2c', 'x2d'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '<', '>', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':',
+        '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            3 => 'color: #00ff00; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;',
+            5 => 'color: #880088; font-weight: bold;',
+            6 => 'color: #888800; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            'MULTI' => 'color: #808080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/oracle11.php b/vendor/easybook/geshi/geshi/oracle11.php
new file mode 100755
index 000000000..97b147f5d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/oracle11.php
@@ -0,0 +1,612 @@
+<?php
+/*************************************************************************************
+ * oracle11.php
+ * -----------
+ * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
+ * Contributions:
+ * - Updated for 11i by Simon Redhead
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * Oracle 11i language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/04/08 (1.0.8)
+ *  -  SR changes to oracle8.php to support Oracle 11i reserved words.
+ * 2005/01/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Oracle 11 SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
+//        6 => array(
+//            ),
+
+//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
+//        5 => array(
+//            ),
+
+//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
+//        4 => array(
+//            ),
+
+//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
+//        3 => array(
+//            ),
+
+        //Put ORACLE reserved keywords here (11i).  I like mine uppercase.
+        1 => array(
+            'ABS',
+            'ACCESS',
+            'ACOS',
+            'ADD',
+            'ADD_MONTHS',
+            'ALL',
+            'ALTER',
+            'ANALYZE',
+            'AND',
+            'ANY',
+            'APPENDCHILDXML',
+            'ARRAY',
+            'AS',
+            'ASC',
+            'ASCII',
+            'ASCIISTR',
+            'ASIN',
+            'ASSOCIATE',
+            'AT',
+            'ATAN',
+            'ATAN2',
+            'AUDIT',
+            'AUTHID',
+            'AVG',
+            'BEGIN',
+            'BETWEEN',
+            'BFILENAME',
+            'BIN_TO_NUM',
+            'BINARY_INTEGER',
+            'BITAND',
+            'BODY',
+            'BOOLEAN',
+            'BULK',
+            'BY',
+            'CALL',
+            'CARDINALITY',
+            'CASCADE',
+            'CASE',
+            'CAST',
+            'CEIL',
+            'CHAR',
+            'CHAR_BASE',
+            'CHARTOROWID',
+            'CHECK',
+            'CHR',
+            'CLOSE',
+            'CLUSTER',
+            'CLUSTER_ID',
+            'CLUSTER_PROBABILITY',
+            'CLUSTER_SET',
+            'COALESCE',
+            'COLLECT',
+            'COLUMN',
+            'COMMENT',
+            'COMMIT',
+            'COMPOSE',
+            'COMPRESS',
+            'CONCAT',
+            'CONNECT',
+            'CONSTANT',
+            'CONSTRAINT',
+            'CONSTRAINTS',
+            'CONTEXT',
+            'CONTROLFILE',
+            'CONVERT',
+            'CORR',
+            'CORR_K',
+            'CORR_S',
+            'COS',
+            'COSH',
+            'COST',
+            'COUNT',
+            'COVAR_POP',
+            'COVAR_SAMP',
+            'CREATE',
+            'CUBE_TABLE',
+            'CUME_DIST',
+            'CURRENT',
+            'CURRENT_DATE',
+            'CURRENT_TIMESTAMP',
+            'CURRVAL',
+            'CURSOR',
+            'CV',
+            'DATABASE',
+            'DATAOBJ_TO_PARTITION',
+            'DATE',
+            'DAY',
+            'DBTIMEZONE',
+            'DECIMAL',
+            'DECLARE',
+            'DECODE',
+            'DECOMPOSE',
+            'DEFAULT',
+            'DELETE',
+            'DELETEXML',
+            'DENSE_RANK',
+            'DEPTH',
+            'DEREF',
+            'DESC',
+            'DIMENSION',
+            'DIRECTORY',
+            'DISASSOCIATE',
+            'DISTINCT',
+            'DO',
+            'DROP',
+            'DUMP',
+            'ELSE',
+            'ELSIF',
+            'EMPTY_BLOB',
+            'EMPTY_CLOB',
+            'END',
+            'EXCEPTION',
+            'EXCLUSIVE',
+            'EXEC',
+            'EXECUTE',
+            'EXISTS',
+            'EXISTSNODE',
+            'EXIT',
+            'EXP',
+            'EXPLAIN',
+            'EXTENDS',
+            'EXTRACT',
+            'EXTRACTVALUE',
+            'FALSE',
+            'FEATURE_ID',
+            'FEATURE_SET',
+            'FEATURE_VALUE',
+            'FETCH',
+            'FILE',
+            'FIRST',
+            'FIRST_VALUE',
+            'FLOAT',
+            'FLOOR',
+            'FOR',
+            'FORALL',
+            'FROM',
+            'FROM_TZ',
+            'FUNCTION',
+            'GOTO',
+            'GRANT',
+            'GREATEST',
+            'GROUP',
+            'GROUP_ID',
+            'GROUPING',
+            'GROUPING_ID',
+            'HAVING',
+            'HEAP',
+            'HEXTORAW',
+            'HOUR',
+            'IDENTIFIED',
+            'IF',
+            'IMMEDIATE',
+            'IN',
+            'INCREMENT',
+            'INDEX',
+            'INDEXTYPE',
+            'INDICATOR',
+            'INITCAP',
+            'INITIAL',
+            'INSERT',
+            'INSERTCHILDXML',
+            'INSERTXMLBEFORE',
+            'INSTR',
+            'INSTRB',
+            'INTEGER',
+            'INTERFACE',
+            'INTERSECT',
+            'INTERVAL',
+            'INTO',
+            'IS',
+            'ISOLATION',
+            'ITERATION_NUMBER',
+            'JAVA',
+            'KEY',
+            'LAG',
+            'LAST',
+            'LAST_DAY',
+            'LAST_VALUE',
+            'LEAD',
+            'LEAST',
+            'LENGTH',
+            'LENGTHB',
+            'LEVEL',
+            'LIBRARY',
+            'LIKE',
+            'LIMITED',
+            'LINK',
+            'LN',
+            'LNNVL',
+            'LOCALTIMESTAMP',
+            'LOCK',
+            'LOG',
+            'LONG',
+            'LOOP',
+            'LOWER',
+            'LPAD',
+            'LTRIM',
+            'MAKE_REF',
+            'MATERIALIZED',
+            'MAX',
+            'MAXEXTENTS',
+            'MEDIAN',
+            'MIN',
+            'MINUS',
+            'MINUTE',
+            'MLSLABEL',
+            'MOD',
+            'MODE',
+            'MODIFY',
+            'MONTH',
+            'MONTHS_BETWEEN',
+            'NANVL',
+            'NATURAL',
+            'NATURALN',
+            'NCHR',
+            'NEW',
+            'NEW_TIME',
+            'NEXT_DAY',
+            'NEXTVAL',
+            'NLS_CHARSET_DECL_LEN',
+            'NLS_CHARSET_ID',
+            'NLS_CHARSET_NAME',
+            'NLS_INITCAP',
+            'NLS_LOWER',
+            'NLS_UPPER',
+            'NLSSORT',
+            'NOAUDIT',
+            'NOCOMPRESS',
+            'NOCOPY',
+            'NOT',
+            'NOWAIT',
+            'NTILE',
+            'NULL',
+            'NULLIF',
+            'NUMBER',
+            'NUMBER_BASE',
+            'NUMTODSINTERVAL',
+            'NUMTOYMINTERVAL',
+            'NVL',
+            'NVL2',
+            'OCIROWID',
+            'OF',
+            'OFFLINE',
+            'ON',
+            'ONLINE',
+            'OPAQUE',
+            'OPEN',
+            'OPERATOR',
+            'OPTION',
+            'OR',
+            'ORA_HASH',
+            'ORDER',
+            'ORGANIZATION',
+            'OTHERS',
+            'OUT',
+            'OUTLINE',
+            'PACKAGE',
+            'PARTITION',
+            'PATH',
+            'PCTFREE',
+            'PERCENT_RANK',
+            'PERCENTILE_CONT',
+            'PERCENTILE_DISC',
+            'PLAN',
+            'PLS_INTEGER',
+            'POSITIVE',
+            'POSITIVEN',
+            'POWER',
+            'POWERMULTISET',
+            'POWERMULTISET_BY_CARDINALITY',
+            'PRAGMA',
+            'PREDICTION',
+            'PREDICTION_BOUNDS',
+            'PREDICTION_COST',
+            'PREDICTION_DETAILS',
+            'PREDICTION_PROBABILITY',
+            'PREDICTION_SET',
+            'PRESENTNNV',
+            'PRESENTV',
+            'PREVIOUS',
+            'PRIMARY',
+            'PRIOR',
+            'PRIVATE',
+            'PRIVILEGES',
+            'PROCEDURE',
+            'PROFILE',
+            'PUBLIC',
+            'RAISE',
+            'RANGE',
+            'RANK',
+            'RATIO_TO_REPORT',
+            'RAW',
+            'RAWTOHEX',
+            'RAWTONHEX',
+            'REAL',
+            'RECORD',
+            'REF',
+            'REFTOHEX',
+            'REGEXP_COUNT',
+            'REGEXP_INSTR',
+            'REGEXP_REPLACE',
+            'REGEXP_SUBSTR',
+            'REGR_AVGX',
+            'REGR_AVGY',
+            'REGR_COUNT',
+            'REGR_INTERCEPT',
+            'REGR_R2',
+            'REGR_SLOPE',
+            'REGR_SXX',
+            'REGR_SXY',
+            'REGR_SYY',
+            'RELEASE',
+            'REMAINDER',
+            'RENAME',
+            'REPLACE',
+            'RESOURCE',
+            'RETURN',
+            'RETURNING',
+            'REVERSE',
+            'REVOKE',
+            'ROLE',
+            'ROLLBACK',
+            'ROUND',
+            'ROW',
+            'ROW_NUMBER',
+            'ROWID',
+            'ROWIDTOCHAR',
+            'ROWIDTONCHAR',
+            'ROWNUM',
+            'ROWS',
+            'ROWTYPE',
+            'RPAD',
+            'RTRIM',
+            'SAVEPOINT',
+            'SCHEMA',
+            'SCN_TO_TIMESTAMP',
+            'SECOND',
+            'SEGMENT',
+            'SELECT',
+            'SEPERATE',
+            'SEQUENCE',
+            'SESSION',
+            'SESSIONTIMEZONE',
+            'SET',
+            'SHARE',
+            'SIGN',
+            'SIN',
+            'SINH',
+            'SIZE',
+            'SMALLINT',
+            'SOUNDEX',
+            'SPACE',
+            'SQL',
+            'SQLCODE',
+            'SQLERRM',
+            'SQRT',
+            'START',
+            'STATISTICS',
+            'STATS_BINOMIAL_TEST',
+            'STATS_CROSSTAB',
+            'STATS_F_TEST',
+            'STATS_KS_TEST',
+            'STATS_MODE',
+            'STATS_MW_TEST',
+            'STATS_ONE_WAY_ANOVA',
+            'STATS_T_TEST_INDEP',
+            'STATS_T_TEST_INDEPU',
+            'STATS_T_TEST_ONE',
+            'STATS_T_TEST_PAIRED',
+            'STATS_WSR_TEST',
+            'STDDEV',
+            'STDDEV_POP',
+            'STDDEV_SAMP',
+            'STOP',
+            'SUBSTR',
+            'SUBSTRB',
+            'SUBTYPE',
+            'SUCCESSFUL',
+            'SUM',
+            'SYNONYM',
+            'SYS_CONNECT_BY_PATH',
+            'SYS_CONTEXT',
+            'SYS_DBURIGEN',
+            'SYS_EXTRACT_UTC',
+            'SYS_GUID',
+            'SYS_TYPEID',
+            'SYS_XMLAGG',
+            'SYS_XMLGEN',
+            'SYSDATE',
+            'SYSTEM',
+            'SYSTIMESTAMP',
+            'TABLE',
+            'TABLESPACE',
+            'TAN',
+            'TANH',
+            'TEMPORARY',
+            'THEN',
+            'TIME',
+            'TIMESTAMP',
+            'TIMESTAMP_TO_SCN',
+            'TIMEZONE_ABBR',
+            'TIMEZONE_HOUR',
+            'TIMEZONE_MINUTE',
+            'TIMEZONE_REGION',
+            'TIMING',
+            'TO',
+            'TO_BINARY_DOUBLE',
+            'TO_BINARY_FLOAT',
+            'TO_CHAR',
+            'TO_CLOB',
+            'TO_DATE',
+            'TO_DSINTERVAL',
+            'TO_LOB',
+            'TO_MULTI_BYTE',
+            'TO_NCHAR',
+            'TO_NCLOB',
+            'TO_NUMBER',
+            'TO_SINGLE_BYTE',
+            'TO_TIMESTAMP',
+            'TO_TIMESTAMP_TZ',
+            'TO_YMINTERVAL',
+            'TRANSACTION',
+            'TRANSLATE',
+            'TREAT',
+            'TRIGGER',
+            'TRIM',
+            'TRUE',
+            'TRUNC',
+            'TRUNCATE',
+            'TYPE',
+            'TZ_OFFSET',
+            'UI',
+            'UID',
+            'UNION',
+            'UNIQUE',
+            'UNISTR',
+            'UPDATE',
+            'UPDATEXML',
+            'UPPER',
+            'USE',
+            'USER',
+            'USERENV',
+            'USING',
+            'VALIDATE',
+            'VALUE',
+            'VALUES',
+            'VAR_POP',
+            'VAR_SAMP',
+            'VARCHAR',
+            'VARCHAR2',
+            'VARIANCE',
+            'VIEW',
+            'VSIZE',
+            'WHEN',
+            'WHENEVER',
+            'WHERE',
+            'WHILE',
+            'WIDTH_BUCKET',
+            'WITH',
+            'WORK',
+            'WRITE',
+            'XMLAGG',
+            'XMLCAST',
+            'XMLCDATA',
+            'XMLCOLATTVAL',
+            'XMLCOMMENT',
+            'XMLCONCAT',
+            'XMLDIFF',
+            'XMLELEMENT',
+            'XMLEXISTS',
+            'XMLFOREST',
+            'XMLPARSE',
+            'XMLPATCH',
+            'XMLPI',
+            'XMLQUERY',
+            'XMLROOT',
+            'XMLSEQUENCE',
+            'XMLSERIALIZE',
+            'XMLTABLE',
+            'XMLTRANSFORM',
+            'YEAR',
+            'ZONE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', '+', '-', '*', '/', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+//        3 => false,
+//        4 => false,
+//        5 => false,
+//        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+//        3 => '',
+//        4 => '',
+//        5 => '',
+//        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/oracle8.php b/vendor/easybook/geshi/geshi/oracle8.php
new file mode 100755
index 000000000..b49390806
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/oracle8.php
@@ -0,0 +1,494 @@
+<?php
+/*************************************************************************************
+ * oracle8.php
+ * -----------
+ * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * Oracle 8 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/01/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Oracle 8 SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
+//        6 => array(
+//            ),
+
+//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
+//        5 => array(
+//            ),
+
+//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
+//        4 => array(
+//            ),
+
+//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
+//        3 => array(
+//            ),
+
+//Put ORACLE reserved keywords here (8.1.7).  I like mine uppercase.
+        1 => array(
+            'ABS',
+            'ACCESS',
+            'ACOS',
+            'ADD',
+            'ADD_MONTHS',
+            'ALL',
+            'ALTER',
+            'ANALYZE',
+            'AND',
+            'ANY',
+            'ARRAY',
+            'AS',
+            'ASC',
+            'ASCII',
+            'ASIN',
+            'ASSOCIATE',
+            'AT',
+            'ATAN',
+            'ATAN2',
+            'AUDIT',
+            'AUTHID',
+            'AVG',
+            'BEGIN',
+            'BETWEEN',
+            'BFILENAME',
+            'BINARY_INTEGER',
+            'BITAND',
+            'BODY',
+            'BOOLEAN',
+            'BULK',
+            'BY',
+            'CALL',
+            'CASCADE',
+            'CASE',
+            'CEIL',
+            'CHAR',
+            'CHAR_BASE',
+            'CHARTOROWID',
+            'CHECK',
+            'CHR',
+            'CLOSE',
+            'CLUSTER',
+            'COALESCE',
+            'COLLECT',
+            'COLUMN',
+            'COMMENT',
+            'COMMIT',
+            'COMPRESS',
+            'CONCAT',
+            'CONNECT',
+            'CONSTANT',
+            'CONSTRAINT',
+            'CONSTRAINTS',
+            'CONTEXT',
+            'CONTROLFILE',
+            'CONVERT',
+            'CORR',
+            'COS',
+            'COSH',
+            'COST',
+            'COUNT',
+            'COVAR_POP',
+            'COVAR_SAMP',
+            'CREATE',
+            'CUME_DIST',
+            'CURRENT',
+            'CURRVAL',
+            'CURSOR',
+            'DATABASE',
+            'DATE',
+            'DAY',
+            'DECIMAL',
+            'DECLARE',
+            'DECODE',
+            'DEFAULT',
+            'DELETE',
+            'DENSE_RANK',
+            'DEREF',
+            'DESC',
+            'DIMENSION',
+            'DIRECTORY',
+            'DISASSOCIATE',
+            'DISTINCT',
+            'DO',
+            'DROP',
+            'DUMP',
+            'ELSE',
+            'ELSIF',
+            'EMPTY_BLOB',
+            'EMPTY_CLOB',
+            'END',
+            'EXCEPTION',
+            'EXCLUSIVE',
+            'EXEC',
+            'EXECUTE',
+            'EXISTS',
+            'EXIT',
+            'EXP',
+            'EXPLAIN',
+            'EXTENDS',
+            'EXTRACT',
+            'FALSE',
+            'FETCH',
+            'FILE',
+            'FIRST_VALUE',
+            'FLOAT',
+            'FLOOR',
+            'FOR',
+            'FORALL',
+            'FROM',
+            'FUNCTION',
+            'GOTO',
+            'GRANT',
+            'GREATEST',
+            'GROUP',
+            'GROUPING',
+            'HAVING',
+            'HEAP',
+            'HEXTORAW',
+            'HOUR',
+            'IDENTIFIED',
+            'IF',
+            'IMMEDIATE',
+            'IN',
+            'INCREMENT',
+            'INDEX',
+            'INDEXTYPE',
+            'INDICATOR',
+            'INITCAP',
+            'INITIAL',
+            'INSERT',
+            'INSTR',
+            'INSTRB',
+            'INTEGER',
+            'INTERFACE',
+            'INTERSECT',
+            'INTERVAL',
+            'INTO',
+            'IS',
+            'ISOLATION',
+            'JAVA',
+            'KEY',
+            'LAG',
+            'LAST_DAY',
+            'LAST_VALUE',
+            'LEAD',
+            'LEAST',
+            'LENGTH',
+            'LENGTHB',
+            'LEVEL',
+            'LIBRARY',
+            'LIKE',
+            'LIMITED',
+            'LINK',
+            'LN',
+            'LOCK',
+            'LOG',
+            'LONG',
+            'LOOP',
+            'LOWER',
+            'LPAD',
+            'LTRIM',
+            'MAKE_REF',
+            'MATERIALIZED',
+            'MAX',
+            'MAXEXTENTS',
+            'MIN',
+            'MINUS',
+            'MINUTE',
+            'MLSLABEL',
+            'MOD',
+            'MODE',
+            'MODIFY',
+            'MONTH',
+            'MONTHS_BETWEEN',
+            'NATURAL',
+            'NATURALN',
+            'NEW',
+            'NEW_TIME',
+            'NEXT_DAY',
+            'NEXTVAL',
+            'NLS_CHARSET_DECL_LEN',
+            'NLS_CHARSET_ID',
+            'NLS_CHARSET_NAME',
+            'NLS_INITCAP',
+            'NLS_LOWER',
+            'NLS_UPPER',
+            'NLSSORT',
+            'NOAUDIT',
+            'NOCOMPRESS',
+            'NOCOPY',
+            'NOT',
+            'NOWAIT',
+            'NTILE',
+            'NULL',
+            'NULLIF',
+            'NUMBER',
+            'NUMBER_BASE',
+            'NUMTODSINTERVAL',
+            'NUMTOYMINTERVAL',
+            'NVL',
+            'NVL2',
+            'OCIROWID',
+            'OF',
+            'OFFLINE',
+            'ON',
+            'ONLINE',
+            'OPAQUE',
+            'OPEN',
+            'OPERATOR',
+            'OPTION',
+            'OR',
+            'ORDER',
+            'ORGANIZATION',
+            'OTHERS',
+            'OUT',
+            'OUTLINE',
+            'PACKAGE',
+            'PARTITION',
+            'PCTFREE',
+            'PERCENT_RANK',
+            'PLAN',
+            'PLS_INTEGER',
+            'POSITIVE',
+            'POSITIVEN',
+            'POWER',
+            'PRAGMA',
+            'PRIMARY',
+            'PRIOR',
+            'PRIVATE',
+            'PRIVILEGES',
+            'PROCEDURE',
+            'PROFILE',
+            'PUBLIC',
+            'RAISE',
+            'RANGE',
+            'RANK',
+            'RATIO_TO_REPORT',
+            'RAW',
+            'RAWTOHEX',
+            'REAL',
+            'RECORD',
+            'REF',
+            'REFTOHEX',
+            'REGR_AVGX',
+            'REGR_AVGY',
+            'REGR_COUNT',
+            'REGR_INTERCEPT',
+            'REGR_R2',
+            'REGR_SLOPE',
+            'REGR_SXX',
+            'REGR_SXY',
+            'REGR_SYY',
+            'RELEASE',
+            'RENAME',
+            'REPLACE',
+            'RESOURCE',
+            'RETURN',
+            'RETURNING',
+            'REVERSE',
+            'REVOKE',
+            'ROLE',
+            'ROLLBACK',
+            'ROUND',
+            'ROW',
+            'ROW_NUMBER',
+            'ROWID',
+            'ROWIDTOCHAR',
+            'ROWNUM',
+            'ROWS',
+            'ROWTYPE',
+            'RPAD',
+            'RTRIM',
+            'SAVEPOINT',
+            'SCHEMA',
+            'SECOND',
+            'SEGMENT',
+            'SELECT',
+            'SEPERATE',
+            'SEQUENCE',
+            'SESSION',
+            'SET',
+            'SHARE',
+            'SIGN',
+            'SIN',
+            'SINH',
+            'SIZE',
+            'SMALLINT',
+            'SOUNDEX',
+            'SPACE',
+            'SQL',
+            'SQLCODE',
+            'SQLERRM',
+            'SQRT',
+            'START',
+            'STATISTICS',
+            'STDDEV',
+            'STDDEV_POP',
+            'STDDEV_SAMP',
+            'STOP',
+            'SUBSTR',
+            'SUBSTRB',
+            'SUBTYPE',
+            'SUCCESSFUL',
+            'SUM',
+            'SYNONYM',
+            'SYS_CONTEXT',
+            'SYS_GUID',
+            'SYSDATE',
+            'SYSTEM',
+            'TABLE',
+            'TABLESPACE',
+            'TAN',
+            'TANH',
+            'TEMPORARY',
+            'THEN',
+            'TIME',
+            'TIMESTAMP',
+            'TIMEZONE_ABBR',
+            'TIMEZONE_HOUR',
+            'TIMEZONE_MINUTE',
+            'TIMEZONE_REGION',
+            'TIMING',
+            'TO',
+            'TO_CHAR',
+            'TO_DATE',
+            'TO_LOB',
+            'TO_MULTI_BYTE',
+            'TO_NUMBER',
+            'TO_SINGLE_BYTE',
+            'TRANSACTION',
+            'TRANSLATE',
+            'TRIGGER',
+            'TRIM',
+            'TRUE',
+            'TRUNC',
+            'TRUNCATE',
+            'TYPE',
+            'UI',
+            'UID',
+            'UNION',
+            'UNIQUE',
+            'UPDATE',
+            'UPPER',
+            'USE',
+            'USER',
+            'USERENV',
+            'USING',
+            'VALIDATE',
+            'VALUE',
+            'VALUES',
+            'VAR_POP',
+            'VAR_SAMP',
+            'VARCHAR',
+            'VARCHAR2',
+            'VARIANCE',
+            'VIEW',
+            'VSIZE',
+            'WHEN',
+            'WHENEVER',
+            'WHERE',
+            'WHILE',
+            'WITH',
+            'WORK',
+            'WRITE',
+            'YEAR',
+            'ZONE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', '+', '-', '*', '/', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+//        3 => false,
+//        4 => false,
+//        5 => false,
+//        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
+//Add the styles for groups 3-6 here when used
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+//        3 => '',
+//        4 => '',
+//        5 => '',
+//        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/oxygene.php b/vendor/easybook/geshi/geshi/oxygene.php
new file mode 100755
index 000000000..bc2ee6563
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/oxygene.php
@@ -0,0 +1,154 @@
+<?php
+/*************************************************************************************
+ * oxygene.php
+ * ----------
+ * Author: Carlo Kok (ck@remobjects.com), J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/01/11
+ *
+ * Delphi Prism (Oxygene) language file for GeSHi.
+ * Based on the original Delphi language file.
+ *
+ * CHANGES
+ * -------
+ * 2012/06/28 (1.0.8.11)
+ *   -  Added "write" keyword for properties
+ * 2010/01/11 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Oxygene (Delphi Prism)',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
+    //Compiler directives
+    'COMMENT_REGEXP' => array(2 => '/{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'and',   'begin', 'case', 'const',  'div', 'do', 'downto', 'else',
+            'end',  'for',  'function', 'if', 'in', 'mod', 'not', 'of', 'or',
+            'procedure', 'repeat', 'record', 'set', 'shl', 'shr', 'then', 'to',
+            'type', 'until', 'uses', 'var','while', 'with', 'xor', 'exit', 'break',
+            'class', 'constructor', 'inherited', 'private', 'public', 'protected',
+            'property', 'As', 'Is', 'Unit', 'Continue', 'Try', 'Except', 'Forward',
+            'Interface','Implementation', 'nil', 'out', 'loop', 'namespace', 'true',
+            'false', 'new', 'ensure', 'require', 'on', 'event', 'delegate', 'method',
+            'raise', 'assembly', 'module', 'using','locking', 'old', 'invariants', 'operator',
+            'self', 'async', 'finalizer', 'where', 'yield', 'nullable', 'Future',
+            'From',  'Finally', 'dynamic'
+            ),
+        2 => array(
+            'override', 'virtual', 'External', 'read', 'add', 'remove','final', 'abstract',
+            'empty', 'global', 'locked', 'sealed', 'reintroduce', 'implements', 'each',
+            'default', 'partial', 'finalize', 'enum', 'flags', 'result', 'readonly', 'unsafe',
+            'pinned', 'matching', 'static', 'has', 'step', 'iterator', 'inline', 'nested',
+            'Implies', 'Select', 'Order', 'By', 'Desc', 'Asc', 'Group', 'Join', 'Take',
+            'Skip', 'Concat', 'Union', 'Reverse', 'Distinct', 'Into', 'Equals', 'params',
+            'sequence', 'index', 'notify', 'Parallel', 'create', 'array', 'Queryable', 'Aspect',
+            'volatile', 'write'
+            ),
+        3 => array(
+            'chr', 'ord', 'inc', 'dec', 'assert', 'iff', 'assigned','futureAssigned', 'length', 'low', 'high', 'typeOf', 'sizeOf', 'disposeAndNil', 'Coalesce', 'unquote'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+//        4 => false,
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('.', ',', ':', ';'),
+        2 => array('@', '^'),
+        3 => array('=', '+', '-', '*', '/')
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+//            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #9ac;',
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000066;',
+            2 => 'color: #000066;',
+            3 => 'color: #000066;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+//        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '\$[0-9a-fA-F]+',
+        //Characters
+        1 => '\#\$?[0-9]{1,3}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/oz.php b/vendor/easybook/geshi/geshi/oz.php
new file mode 100755
index 000000000..d24561bf0
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/oz.php
@@ -0,0 +1,144 @@
+<?php
+/*************************************************************************************
+ * oz.php
+ * --------
+ * Author: Wolfgang Meyer (Wolfgang.Meyer@gmx.net)
+ * Copyright: (c) 2010 Wolfgang Meyer
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/01/03
+ *
+ * Oz language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'OZ',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"','\''),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => array(),
+    'KEYWORDS' => array(
+        1 => array(
+            'declare','local','in','end','proc','fun','functor','require','prepare',
+            'import','export','define','at','case','then','else','of','elseof',
+            'elsecase','if','elseif','class','from','prop','attr','feat','meth',
+            'self','true','false','unit','div','mod','andthen','orelse','cond','or',
+            'dis','choice','not','thread','try','catch','finally','raise','lock',
+            'skip','fail','for','do'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'SYMBOLS' => array(
+        '@', '!', '|', '<-', ':=', '<', '>', '=<', '>=', '<=', '#', '~', '.',
+        '*', '-', '+', '/', '<:', '>:', '=:', '=<:', '>=:', '\\=', '\\=:', ',',
+        '!!', '...', '==', '::', ':::'
+        ),
+    'STYLES' => array(
+        'REGEXPS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #00a030;',
+            3 => 'color: #bc8f8f;',
+            4 => 'color: #0000ff;',
+            5 => 'color: #a020f0;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #bc8f8f;'
+            ),
+        'KEYWORDS' => array(
+            1 => 'color: #a020f0;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #B22222;',
+            'MULTI' => 'color: #B22222;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #bc8f8f;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a020f0;'
+            ),
+        'BRACKETS' => array(),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'SCRIPT' => array()
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'URLS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        // function and procedure definition
+        1 => array(
+            GESHI_SEARCH => "(proc|fun)([^{}\n\)]*)(\\{)([\$A-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9_.]*)",
+            GESHI_REPLACE => '\4',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1\2\3',
+            GESHI_AFTER => ''
+            ),
+        // class definition
+        2 => array(
+            GESHI_SEARCH => "(class)([^A-Z\$]*)([\$A-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9_.]*)",
+            GESHI_REPLACE => '\3\4',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1\2',
+            GESHI_AFTER => ''
+            ),
+        // single character
+        3 => array(
+            GESHI_SEARCH => "&amp;.",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // method definition
+        4 => array(
+            GESHI_SEARCH => "(meth)([^a-zA-Z]+)([a-zA-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9]*)",
+            GESHI_REPLACE => '\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1\2',
+            GESHI_AFTER => ''
+            ),
+        // highlight "[]"
+        // ([] is actually a keyword, but that causes problems in validation; putting it into symbols doesn't work.)
+        5 => array(
+            GESHI_SEARCH => "\[\]",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/parasail.php b/vendor/easybook/geshi/geshi/parasail.php
new file mode 100755
index 000000000..864eba1e9
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/parasail.php
@@ -0,0 +1,133 @@
+<?php
+/*************************************************************************************
+ * parasail.php
+ * -------
+ * Author: T. Taft (taft@adacore.com)
+ * Copyright: (c) 2012 AdaCore (http://adacore.com/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/08/02
+ *
+ * ParaSail language file for GeSHi.
+ *
+ * Words are from SciTe configuration file
+ *
+ * CHANGES
+ * -------
+ * 2012/08/02 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2012/08/02)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ParaSail',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'all', 'block', 'case', 'continue', 'each',
+            'else', 'elsif', 'exit', 'for',
+            'forward', 'if', 'loop', 'return', 'reverse', 'some',
+            'then', 'until', 'while', 'with'
+            ),
+        2 => array(
+            'abs', 'and','in', 'mod', 'not', 'null', 'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abstract', 'class',
+            'concurrent', 'const', 
+            'end', 'extends', 'exports', 
+            'func', 'global', 'implements', 'import',
+            'interface', 'is', 'lambda', 'locked', 
+            'new', 'of', 'op', 'optional',
+            'private', 'queued', 'ref',
+            'separate', 'type', 'var',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/parigp.php b/vendor/easybook/geshi/geshi/parigp.php
new file mode 100755
index 000000000..1a5d4a73e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/parigp.php
@@ -0,0 +1,293 @@
+<?php
+/*************************************************************************************
+ * parigp.php
+ * --------
+ * Author: Charles R Greathouse IV (charles@crg4.com)
+ * Copyright: 2011-2013 Charles R Greathouse IV (http://math.crg4.com/)
+ * Release Version: 1.0.8.12
+ * Date Started: 2011/05/11
+ *
+ * PARI/GP language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/07/09 (1.0.8.11)
+ *  -  First Release
+ * 2013/02/05 (1.0.8.12)
+ *  -  Added 2.6.0 commands, default, member functions, and error-handling
+ *
+ * TODO (updated 2011/07/09)
+ * -------------------------
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'PARI/GP',
+    'COMMENT_SINGLE' => array(1 => '\\\\'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => array(
+        # Integers
+        1 => GESHI_NUMBER_INT_BASIC,
+        # Reals
+        2 => GESHI_NUMBER_FLT_SCI_ZERO
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'abs','acos','acosh','addhelp','addprimes','agm','alarm','algdep',
+            'alias','allocatemem','apply','arg','asin','asinh','atan','atanh',
+            'bernfrac','bernpol','bernreal','bernvec','besselh1','besselh2',
+            'besseli','besselj','besseljh','besselk','besseln','bestappr',
+            'bestapprPade','bezout','bezoutres','bigomega','binary','binomial',
+            'bitand','bitneg','bitnegimply','bitor','bittest','bitxor',
+            'bnfcertify','bnfcompress','bnfdecodemodule','bnfinit',
+            'bnfisintnorm','bnfisnorm','bnfisprincipal','bnfissunit',
+            'bnfisunit','bnfnarrow','bnfsignunit','bnfsunit','bnrclassno',
+            'bnrclassnolist','bnrconductor','bnrconductorofchar','bnrdisc',
+            'bnrdisclist','bnrinit','bnrisconductor','bnrisprincipal','bnrL1',
+            'bnrrootnumber','bnrstark','break','breakpoint','Catalan','ceil',
+            'centerlift','charpoly','chinese','cmp','Col','component','concat',
+            'conj','conjvec','content','contfrac','contfracpnqn','core',
+            'coredisc','cos','cosh','cotan','dbg_down','dbg_err','dbg_up',
+            'dbg_x','default','denominator','deriv','derivnum','diffop',
+            'digits','dilog','dirdiv','direuler','dirmul','dirzetak','divisors',
+            'divrem','eint1','elladd','ellak','ellan','ellanalyticrank','ellap',
+            'ellbil','ellcard','ellchangecurve','ellchangepoint',
+            'ellconvertname','elldivpol','elleisnum','elleta','ellffinit',
+            'ellfromj','ellgenerators','ellglobalred','ellgroup','ellheegner',
+            'ellheight','ellheightmatrix','ellidentify','ellinit',
+            'ellisoncurve','ellj','ellL1','elllocalred','elllog','elllseries',
+            'ellminimalmodel','ellmodulareqn','ellmul','ellneg','ellorder',
+            'ellordinate','ellpointtoz','ellrootno','ellsearch','ellsigma',
+            'ellsub','elltaniyama','elltatepairing','elltors','ellweilpairing',
+            'ellwp','ellzeta','ellztopoint','erfc','errname','error','eta','Euler',
+            'eulerphi','eval','exp','extern','externstr','factor','factorback',
+            'factorcantor','factorff','factorial','factorint','factormod',
+            'factornf','factorpadic','ffgen','ffinit','fflog','ffnbirred',
+            'fforder','ffprimroot','fibonacci','floor','for','forcomposite','fordiv','forell',
+            'forprime','forqfvec','forstep','forsubgroup','forvec','frac','galoisexport',
+            'galoisfixedfield','galoisgetpol','galoisidentify','galoisinit',
+            'galoisisabelian','galoisisnormal','galoispermtopol',
+            'galoissubcyclo','galoissubfields','galoissubgroups','gamma',
+            'gammah','gcd','getenv','getheap','getrand','getstack','gettime',
+            'global','hammingweight','hilbert','hyperu','I','idealadd',
+            'idealaddtoone','idealappr','idealchinese','idealcoprime',
+            'idealdiv','idealfactor','idealfactorback','idealfrobenius',
+            'idealhnf','idealintersect','idealinv','ideallist','ideallistarch',
+            'ideallog','idealmin','idealmul','idealnorm','idealnumden',
+            'idealpow','idealprimedec','idealramgroups','idealred','idealstar',
+            'idealtwoelt','idealval','if','iferr','iferrname','imag','incgam','incgamc','input',
+            'install','intcirc','intformal','intfouriercos','intfourierexp',
+            'intfouriersin','intfuncinit','intlaplaceinv','intmellininv',
+            'intmellininvshort','intnum','intnuminit','intnuminitgen',
+            'intnumromb','intnumstep','isfundamental','ispolygonal','ispower','ispowerful',
+            'isprime','isprimepower','ispseudoprime','issquare','issquarefree','istotient',
+            'kill','kronecker','lcm','length','lex','lift','lindep','List',
+            'listcreate','listinsert','listkill','listpop','listput','listsort',
+            'lngamma','local','log','Mat','matadjoint','matalgtobasis',
+            'matbasistoalg','matcompanion','matconcat','matcontent','matdet','matdetint',
+            'matdiagonal','mateigen','matfrobenius','mathess','mathilbert',
+            'mathnf','mathnfmod','mathnfmodid','matid','matimage',
+            'matimagecompl','matindexrank','matintersect','matinverseimage',
+            'matisdiagonal','matker','matkerint','matmuldiagonal',
+            'matmultodiagonal','matpascal','matrank','matrix','matrixqz',
+            'matsize','matsnf','matsolve','matsolvemod','matsupplement',
+            'mattranspose','max','min','minpoly','Mod','modreverse','moebius',
+            'my','newtonpoly','next','nextprime','nfalgtobasis','nfbasis',
+            'nfbasistoalg','nfdetint','nfdisc','nfeltadd','nfeltdiv',
+            'nfeltdiveuc','nfeltdivmodpr','nfeltdivrem','nfeltmod','nfeltmul',
+            'nfeltmulmodpr','nfeltnorm','nfeltpow','nfeltpowmodpr',
+            'nfeltreduce','nfeltreducemodpr','nfelttrace','nfeltval','nffactor',
+            'nffactorback','nffactormod','nfgaloisapply','nfgaloisconj',
+            'nfhilbert','nfhnf','nfhnfmod','nfinit','nfisideal','nfisincl',
+            'nfisisom','nfkermodpr','nfmodprinit','nfnewprec','nfroots',
+            'nfrootsof1','nfsnf','nfsolvemodpr','nfsubfields','norm','norml2',
+            'numbpart','numdiv','numerator','numtoperm','O','omega','padicappr',
+            'padicfields','padicprec','partitions','permtonum','Pi','plot',
+            'plotbox','plotclip','plotcolor','plotcopy','plotcursor','plotdraw',
+            'ploth','plothraw','plothsizes','plotinit','plotkill','plotlines',
+            'plotlinetype','plotmove','plotpoints','plotpointsize',
+            'plotpointtype','plotrbox','plotrecth','plotrecthraw','plotrline',
+            'plotrmove','plotrpoint','plotscale','plotstring','Pol',
+            'polchebyshev','polcoeff','polcompositum','polcyclo','polcyclofactors','poldegree',
+            'poldisc','poldiscreduced','polgalois','polgraeffe','polhensellift',
+            'polhermite','polinterpolate','poliscyclo','poliscycloprod',
+            'polisirreducible','pollead','pollegendre','polrecip','polred',
+            'polredabs','polredbest','polredord','polresultant','Polrev','polroots',
+            'polrootsff','polrootsmod','polrootspadic','polsturm','polsubcyclo',
+            'polsylvestermatrix','polsym','poltchebi','poltschirnhaus',
+            'polylog','polzagier','precision','precprime','prime','primepi',
+            'primes','print','print1','printf','printsep','printtex','prod','prodeuler',
+            'prodinf','psdraw','psi','psploth','psplothraw','Qfb','qfbclassno',
+            'qfbcompraw','qfbhclassno','qfbnucomp','qfbnupow','qfbpowraw',
+            'qfbprimeform','qfbred','qfbsolve','qfgaussred','qfjacobi','qflll',
+            'qflllgram','qfminim','qfperfection','qfrep','qfsign',
+            'quadclassunit','quaddisc','quadgen','quadhilbert','quadpoly',
+            'quadray','quadregulator','quadunit','quit','random','randomprime','read',
+            'readvec','real','removeprimes','return','rnfalgtobasis','rnfbasis',
+            'rnfbasistoalg','rnfcharpoly','rnfconductor','rnfdedekind','rnfdet',
+            'rnfdisc','rnfeltabstorel','rnfeltdown','rnfeltreltoabs','rnfeltup',
+            'rnfequation','rnfhnfbasis','rnfidealabstorel','rnfidealdown',
+            'rnfidealhnf','rnfidealmul','rnfidealnormabs','rnfidealnormrel',
+            'rnfidealreltoabs','rnfidealtwoelt','rnfidealup','rnfinit',
+            'rnfisabelian','rnfisfree','rnfisnorm','rnfisnorminit','rnfkummer',
+            'rnflllgram','rnfnormgroup','rnfpolred','rnfpolredabs',
+            'rnfpseudobasis','rnfsteinitz','round','select','Ser','serconvol',
+            'serlaplace','serreverse','Set','setbinop','setintersect',
+            'setisset','setminus','setrand','setsearch','setunion','shift',
+            'shiftmul','sigma','sign','simplify','sin','sinh','sizebyte',
+            'sizedigit','solve','sqr','sqrt','sqrtint','sqrtn','sqrtnint','stirling','Str',
+            'Strchr','Strexpand','Strprintf','Strtex','subgrouplist','subst',
+            'substpol','substvec','sum','sumalt','sumdedekind','sumdiv','sumdivmult','sumdigits',
+            'sumformal','suminf','sumnum','sumnumalt','sumnuminit','sumpos','system','tan',
+            'tanh','taylor','teichmuller','theta','thetanullk','thue',
+            'thueinit','trace','trap','truncate','type','until','valuation',
+            'variable','Vec','vecextract','vecmax','vecmin','Vecrev',
+            'vecsearch','Vecsmall','vecsort','vector','vectorsmall','vectorv',
+            'version','warning','weber','whatnow','while','write','write1',
+            'writebin','writetex','zeta','zetak','zetakinit','zncoppersmith',
+            'znlog','znorder','znprimroot','znstar'
+            ),
+
+        2 => array(
+            'void','bool','negbool','small','int',/*'real',*/'mp','var','lg','pol',
+            'vecsmall','vec','list','str','genstr','gen','typ'
+            ),
+
+        3 => array(
+            'TeXstyle','breakloop','colors','compatible','datadir','debug',
+            'debugfiles','debugmem','echo','factor_add_primes','factor_proven',
+            'format','graphcolormap','graphcolors','help','histfile','histsize',
+            'lines','linewrap',/*'log',*/'logfile','new_galois_format','output',
+            'parisize','path','prettyprinter','primelimit','prompt_cont',
+            'prompt','psfile','readline','realprecision','recover','secure',
+            'seriesprecision',/*'simplify',*/'sopath','strictmatch','timer'
+            ),
+
+        4 => array(
+            '"e_ARCH"','"e_BUG"','"e_FILE"','"e_IMPL"','"e_PACKAGE"','"e_DIM"',
+            '"e_FLAG"','"e_NOTFUNC"','"e_OP"','"e_TYPE"','"e_TYPE2"',
+            '"e_PRIORITY"','"e_VAR"','"e_DOMAIN"','"e_MAXPRIME"','"e_MEM"',
+            '"e_OVERFLOW"','"e_PREC"','"e_STACK"','"e_ALARM"','"e_USER"',
+            '"e_CONSTPOL"','"e_COPRIME"','"e_INV"','"e_IRREDPOL"','"e_MISC"',
+            '"e_MODULUS"','"e_NEGVAL"','"e_PRIME"','"e_ROOTS0"','"e_SQRTN"'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(',')','{','}','[',']','+','-','*','/','%','=','<','>','!','^','&','|','?',';',':',',','\\','\''
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #e07022;',
+            3 => 'color: #00d2d2;',
+            4 => 'color: #00d2d2;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #111111; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #002222;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #666666;',
+            1 => 'color: #666666;',
+            2 => 'color: #666666;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #e07022',    # Should be the same as keyword group 2
+            1 => 'color: #555555',
+            2 => 'color: #0000ff'     # Should be the same as keyword group 1
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array( # types marked on variables
+            GESHI_SEARCH => '(?<!\\\\ )"(t_(?:INT|REAL|INTMOD|FRAC|FFELT|COMPLEX|PADIC|QUAD|POLMOD|POL|SER|RFRAC|QFR|QFI|VEC|COL|MAT|LIST|STR|VECSMALL|CLOSURE|ERROR))"',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '"',
+            GESHI_AFTER => '"'
+            ),
+        1 => array( # literal variables
+            GESHI_SEARCH => '(?<!\\\\)(\'[a-zA-Z][a-zA-Z0-9_]*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array( # member functions
+            GESHI_SEARCH => '(?<=[.])(a[1-6]|b[2-8]|c[4-6]|area|bid|bnf|clgp|cyc|diff|disc|[efjp]|fu|gen|index|mod|nf|no|omega|pol|reg|roots|sign|r[12]|t2|tate|tu|zk|zkst)\b',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        2 => array(
+            '[a-zA-Z][a-zA-Z0-9_]*:' => ''
+            ),
+        3 => array(
+            'default(' => ''
+            ),
+        4 => array(
+            'iferrname(' => ''
+            ),
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/pascal.php b/vendor/easybook/geshi/geshi/pascal.php
new file mode 100755
index 000000000..de5ca8717
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pascal.php
@@ -0,0 +1,165 @@
+<?php
+/*************************************************************************************
+ * pascal.php
+ * ----------
+ * Author: Tux (tux@inamil.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/26
+ *
+ * Pascal language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.0)
+ *   -  Added support for symbols
+ * 2004/07/27 (0.9.1)
+ *   -  Pascal is OO language. Some new words.
+ * 2004/07/26 (0.9.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Pascal',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
+    //Compiler directives
+    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+
+    'KEYWORDS' => array(
+        1 => array(
+            'absolute','asm','assembler','begin','break','case','catch','cdecl',
+            'const','constructor','default','destructor','div','do','downto',
+            'else','end','except','export','exports','external','far',
+            'finalization','finally','for','forward','function','goto','if',
+            'implementation','in','index','inherited','initialization','inline',
+            'interface','interrupt','label','library','mod','name','not','of',
+            'or','overload','override','private','procedure','program',
+            'property','protected','public','published','raise','repeat',
+            'resourcestring','shl','shr','stdcall','stored','switch','then',
+            'to','try','type','unit','until','uses','var','while','with','xor'
+            ),
+        2 => array(
+            'nil', 'false', 'true',
+            ),
+        3 => array(
+            'abs','and','arc','arctan','blockread','blockwrite','chr','dispose',
+            'cos','eof','eoln','exp','get','ln','new','odd','ord','ordinal',
+            'pred','read','readln','sin','sqrt','succ','write','writeln'
+            ),
+        4 => array(
+            'ansistring','array','boolean','byte','bytebool','char','file',
+            'integer','longbool','longint','object','packed','pointer','real',
+            'record','set','shortint','smallint','string','union','word'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('.', ',', ':', ';'),
+        2 => array('@', '^'),
+        3 => array('=', '+', '-', '*', '/')
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            //'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000cc;',
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000066;',
+            2 => 'color: #000066;',
+            3 => 'color: #000066;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '\$[0-9a-fA-F]+',
+        //Characters
+        1 => '\#(?:\$[0-9a-fA-F]{1,2}|\d{1,3})'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/pcre.php b/vendor/easybook/geshi/geshi/pcre.php
new file mode 100755
index 000000000..13a2e024d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pcre.php
@@ -0,0 +1,188 @@
+<?php
+/*************************************************************************************
+ * pcre.php
+ * --------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/05/22
+ *
+ * PCRE language file for GeSHi.
+ *
+ * NOTE: This language file handles plain PCRE expressions without delimiters.
+ * If you want to highlight PCRE with delimiters you should use the
+ * Perl language file instead.
+ *
+ * CHANGES
+ * -------
+ * 2010/05/22 (1.0.8.8)
+ *   -  First Release
+ *
+ * TODO (updated 2010/05/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PCRE',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(
+        ),
+    'COMMENT_REGEXP' => array(
+        // Non-matching groups
+        1 => "/(?<=\()\?(?::|(?=\())/",
+
+        // Modifier groups
+        2 => "/(?<=\()\?[cdegimopsuxUX\-]+(?::|(?=\)))/",
+
+        // Look-Aheads
+        3 => "/(?<=\()\?[!=]/",
+
+        // Look-Behinds
+        4 => "/(?<=\()\?<[!=]/",
+
+        // Forward Matching
+        5 => "/(?<=\()\?>/",
+
+        // Recursive Matching
+        6 => "/(?<=\()\?R(?=\))/",
+
+        // Named Subpattern
+        7 => "/(?<=\()\?(?:P?<\w+>|\d+(?=\))|P[=>]\w+(?=\)))/",
+
+        // Back Reference
+        8 => "/\\\\(?:[1-9]\d?|g\d+|g\{(?:-?\d+|\w+)\}|k<\w+>|k'\w+'|k\{\w+\})/",
+
+        // Byte sequence: Octal
+        9 => "/\\\\[0-7]{2,3}/",
+
+        // Byte sequence: Hex
+        10 => "/\\\\x[0-9a-fA-F]{2}/",
+
+        // Byte sequence: Hex
+        11 => "/\\\\u[0-9a-fA-F]{4}/",
+
+        // Byte sequence: Hex
+        12 => "/\\\\U[0-9a-fA-F]{8}/",
+
+        // Byte sequence: Unicode
+        13 => "/\\\\[pP]\{[^}\n]+\}/",
+
+        // One-Char Escapes
+        14 => "/\\\\[abdefnrstvwzABCDGSWXZ\\\\\\.\[\]\(\)\{\}\^\\\$\?\+\*]/",
+
+        // Byte sequence: Control-X sequence
+        15 => "/\\\\c./",
+
+        // Quantifier
+        16 => "/\{(?:\d+,?|\d*,\d+)\}/",
+
+        // Comment Subpattern
+        17 => "/(?<=\()\?#[^\)]*/",
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        0 => array('.'),
+        1 => array('(', ')'),
+        2 => array('[', ']', '|'),
+        3 => array('^', '$'),
+        4 => array('?', '+', '*'),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #993333; font-weight: bold;',
+            2 => 'color: #cc3300; font-weight: bold;',
+            3 => 'color: #cc0066; font-weight: bold;',
+            4 => 'color: #cc0066; font-weight: bold;',
+            5 => 'color: #cc6600; font-weight: bold;',
+            6 => 'color: #cc00cc; font-weight: bold;',
+            7 => 'color: #cc9900; font-weight: bold; font-style: italic;',
+            8 => 'color: #cc9900; font-style: italic;',
+            9 => 'color: #669933; font-style: italic;',
+            10 => 'color: #339933; font-style: italic;',
+            11 => 'color: #339966; font-style: italic;',
+            12 => 'color: #339999; font-style: italic;',
+            13 => 'color: #663399; font-style: italic;',
+            14 => 'color: #999933; font-style: italic;',
+            15 => 'color: #993399; font-style: italic;',
+            16 => 'color: #333399; font-style: italic;',
+            17 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #333399; font-weight: bold;',
+            1 => 'color: #993333; font-weight: bold;',
+            2 => 'color: #339933; font-weight: bold;',
+            3 => 'color: #333399; font-weight: bold;',
+            4 => 'color: #333399; font-style: italic;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/per.php b/vendor/easybook/geshi/geshi/per.php
new file mode 100755
index 000000000..c3b5d1508
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/per.php
@@ -0,0 +1,300 @@
+<?php
+/*************************************************************************************
+ * per.php
+ * --------
+ * Author: Lars Gersmann (lars.gersmann@gmail.com)
+ * Copyright: (c) 2007 Lars Gersmann
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/06/03
+ *
+ * Per (forms) (FOURJ's Genero 4GL) language file for GeSHi.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'per',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ACCELERATOR",
+            "ACCELERATOR2",
+            "ACTION",
+            "ALT",
+            "AND",
+            "AUTO",
+            "AUTONEXT",
+            "AUTOSCALE",
+            "BETWEEN",
+            "BOTH",
+            "BUTTON",
+            "BUTTONEDIT",
+            "BUTTONTEXTHIDDEN",
+            "BY",
+            "BYTE",
+            "CANVAS",
+            "CENTER",
+            "CHECKBOX",
+            "CLASS",
+            "COLOR",
+            "COLUMNS",
+            "COMBOBOX",
+            "COMMAND",
+            "COMMENT",
+            "COMMENTS",
+            "COMPACT",
+            "COMPRESS",
+            "CONFIG",
+            "CONTROL",
+            "CURRENT",
+            "DATABASE",
+            "DATEEDIT",
+            "DEC",
+            "DEFAULT",
+            "DEFAULTS",
+            "DELIMITERS",
+            "DISPLAY",
+            "DISPLAYONLY",
+            "DOWNSHIFT",
+            "DYNAMIC",
+            "EDIT",
+            "FIXED",
+            "FOLDER",
+            "FONTPITCH",
+            "FORMAT",
+            "FORMONLY",
+            "GRID",
+            "GRIDCHILDRENINPARENT",
+            "GROUP",
+            "HBOX",
+            "HEIGHT",
+            "HIDDEN",
+            "HORIZONTAL",
+            "INCLUDE",
+            "INITIAL",
+            "INITIALIZER",
+            "INPUT",
+            "INSTRUCTIONS",
+            "INTERVAL",
+            "INVISIBLE",
+            "IS",
+            "ITEM",
+            "ITEMS",
+            "JUSTIFY",
+            "KEY",
+            "KEYS",
+            "LABEL",
+            "LEFT",
+            "LIKE",
+            "LINES",
+            "MATCHES",
+            "NAME",
+            "NOENTRY",
+            "NONCOMPRESS",
+            "NORMAL",
+            "NOT",
+            "NOUPDATE",
+            "OPTIONS",
+            "OR",
+            "ORIENTATION",
+            "PACKED",
+            "PAGE",
+            "PICTURE",
+            "PIXELHEIGHT",
+            "PIXELS",
+            "PIXELWIDTH",
+            "POINTS",
+            "PROGRAM",
+            "PROGRESSBAR",
+            "QUERYCLEAR",
+            "QUERYEDITABLE",
+            "RADIOGROUP",
+            "RECORD",
+            "REQUIRED",
+            "REVERSE",
+            "RIGHT",
+            "SAMPLE",
+            "SCREEN",
+            "SCROLL",
+            "SCROLLBARS",
+            "SCROLLGRID",
+            "SECOND",
+            "SEPARATOR",
+            "SHIFT",
+            "SIZE",
+            "SIZEPOLICY",
+            "SMALLFLOAT",
+            "SMALLINT",
+            "SPACING",
+            "STRETCH",
+            "STYLE",
+            "TABINDEX",
+            "TABLE",
+            "TAG",
+            "TEXT",
+            "TEXTEDIT",
+            "THROUGH",
+            "THRU",
+            "TITLE",
+            "TO",
+            "TOOLBAR",
+            "TOPMENU",
+            "TYPE",
+            "UNHIDABLE",
+            "UNHIDABLECOLUMNS",
+            "UNMOVABLE",
+            "UNMOVABLECOLUMNS",
+            "UNSIZABLE",
+            "UNSIZABLECOLUMNS",
+            "UNSORTABLE",
+            "UNSORTABLECOLUMNS",
+            "UPSHIFT",
+            "USER",
+            "VALIDATE",
+            "VALUECHECKED",
+            "VALUEMAX",
+            "VALUEMIN",
+            "VALUEUNCHECKED",
+            "VARCHAR",
+            "VARIABLE",
+            "VBOX",
+            "VERIFY",
+            "VERSION",
+            "VERTICAL",
+            "TIMESTAMP",
+            "WANTCOLUMNSANCHORED", /* to be removed! */
+            "WANTFIXEDPAGESIZE",
+            "WANTNORETURNS",
+            "WANTTABS",
+            "WHERE",
+            "WIDGET",
+            "WIDTH",
+            "WINDOWSTYLE",
+            "WITHOUT",
+            "WORDWRAP",
+            "X",
+            "Y",
+            "ZEROFILL",
+            "SCHEMA",
+            "ATTRIBUTES",
+            "TABLES",
+            "LAYOUT",
+            "END"
+            ),
+        2 => array(
+            "YEAR",
+            "BLACK",
+            "BLINK",
+            "BLUE",
+            "YELLOW",
+            "WHITE",
+            "UNDERLINE",
+            "CENTURY",
+            "FRACTION",
+            "CHAR",
+            "CHARACTER",
+            "CHARACTERS",
+            "CYAN",
+            "DATE",
+            "DATETIME",
+            "DAY",
+            "DECIMAL",
+            "FALSE",
+            "FLOAT",
+            "GREEN",
+            "HOUR",
+            "INT",
+            "INTEGER",
+            "MAGENTA",
+            "MINUTE",
+            "MONEY",
+            "NONE",
+            "NULL",
+            "REAL",
+            "RED",
+            "TRUE",
+            "TODAY",
+            "MONTH",
+            "IMAGE"
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: green'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/perl.php b/vendor/easybook/geshi/geshi/perl.php
new file mode 100755
index 000000000..2c3dc92fe
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/perl.php
@@ -0,0 +1,219 @@
+<?php
+/*************************************************************************************
+ * perl.php
+ * --------
+ * Author: Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
+ * Copyright: (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/20
+ *
+ * Perl language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/22 (1.0.8)
+ *   -  Added support for system calls in backticks (Corley Kinnane)
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ *   -  Added comment_regexp for predefined variables
+ * 2008/02/15 (1.003)
+ *   -  Fixed SF#1891630 with placebo patch
+ * 2006/01/05 (1.0.2)
+ *   -  Used hardescape feature for ' strings (Cliff Stanford)
+ * 2004/11/27 (1.0.1)
+ *   -  Added support for multiple object splitters
+ * 2004/08/20 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * LABEL:
+ * * string comparison operators
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Perl',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(
+        '=back' => '=cut',
+        '=head' => '=cut',
+        '=item' => '=cut',
+        '=over' => '=cut',
+        '=begin' => '=cut',
+        '=end' => '=cut',
+        '=for' => '=cut',
+        '=encoding' => '=cut',
+        '=pod' => '=cut'
+        ),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        //Regular expression match variables
+        3 => '/\$\d+/',
+        //Heredoc
+        4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Predefined variables
+        5 => '/\$(\^[a-zA-Z]?|[\*\$`\'&_\.,+\-~:;\\\\\/"\|%=\?!@#<>\(\)\[\]])(?!\w)|@[_+\-]|%[!]|\$(?=\{)/',
+        ),
+    'NUMBERS' => array(
+        // Includes rules for decimal, octal (0777), hexidecimal (0xDEADBEEF),
+        // binary (0b101010) numbers, amended to work with underscores (since
+        // Perl allows you to use underscores in number literals)
+        0 => '(?:(?<![0-9a-z_\.%$@])|(?<=\.\.))(?<![\d\._]e[+\-])([1-9][\d_]*?|0)(?![0-9a-z_]|\.(?:[eE][+\-]?)?[\d_])|(?<![0-9a-z_\.%])(?<![\d\._]e[+\-])0b[01_]+?(?![0-9a-z_]|\.(?:[eE][+\-]?)?[\d_])|(?<![0-9a-z_\.])(?<![\d\._]e[+\-])0[0-7_]+?(?![0-9a-z_]|\.(?:[eE][+\-]?)?[\d_])|(?<![0-9a-z_\.])(?<![\d\._]e[+\-])0x[0-9a-fA-F_]+?(?![0-9a-z_]|\.(?:[eE][+\-]?)?[\d_])|(?<![0-9a-z_\.])(?<![\d\._]e[+\-])[\d_]+?\.[\d_]+?(?![0-9a-z_]|\.(?:[eE][+\-]?)?[\d_])',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"','`'),
+    'HARDQUOTE' => array("'", "'"),            // An optional 2-element array defining the beginning and end of a hard-quoted string
+    'HARDESCAPE' => array('\\\'',),
+        // Things that must still be escaped inside a hard-quoted string
+        // If HARDQUOTE is defined, HARDESCAPE must be defined
+        // This will not work unless the first character of each element is either in the
+        // QUOTEMARKS array or is the ESCAPE_CHAR
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'else', 'elsif', 'for', 'if', 'then', 'until', 'while', 'foreach', 'my',
+            'xor', 'or', 'and', 'unless', 'next', 'last', 'redo', 'not', 'our',
+            'reset', 'continue', 'cmp', 'ne', 'eq', 'lt', 'gt', 'le', 'ge',
+            ),
+        2 => array(
+            'use', 'sub', 'new', '__END__', '__DATA__', '__DIE__', '__WARN__', 'BEGIN',
+            'STDIN', 'STDOUT', 'STDERR', 'ARGV', 'ARGVOUT'
+            ),
+        3 => array(
+            'abs', 'accept', 'alarm', 'atan2', 'bind', 'binmode', 'bless',
+            'caller', 'chdir', 'chmod', 'chomp', 'chop', 'chown', 'chr',
+            'chroot', 'close', 'closedir', 'connect', 'cos',
+            'crypt', 'dbmclose', 'dbmopen', 'defined', 'delete', 'die',
+            'dump', 'each', 'endgrent', 'endhostent', 'endnetent', 'endprotoent',
+            'endpwent', 'endservent', 'eof', 'eval', 'exec', 'exists', 'exit',
+            'exp', 'fcntl', 'fileno', 'flock', 'fork', 'format', 'formline',
+            'getc', 'getgrent', 'getgrgid', 'getgrnam', 'gethostbyaddr',
+            'gethostbyname', 'gethostent', 'getlogin', 'getnetbyaddr', 'getnetbyname',
+            'getnetent', 'getpeername', 'getpgrp', 'getppid', 'getpriority',
+            'getprotobyname', 'getprotobynumber', 'getprotoent', 'getpwent',
+            'getpwnam', 'getpwuid', 'getservbyname', 'getservbyport', 'getservent',
+            'getsockname', 'getsockopt', 'given', 'glob', 'gmtime', 'goto', 'grep',
+            'hex', 'import', 'index', 'int', 'ioctl', 'join', 'keys', 'kill',
+            'lc', 'lcfirst', 'length', 'link', 'listen', 'local',
+            'localtime', 'log', 'lstat', 'm', 'map', 'mkdir', 'msgctl', 'msgget',
+            'msgrcv', 'msgsnd', 'no', 'oct', 'open', 'opendir',
+            'ord', 'pack', 'package', 'pipe', 'pop', 'pos', 'print',
+            'printf', 'prototype', 'push', 'qq', 'qr', 'quotemeta', 'qw',
+            'qx', 'q', 'rand', 'read', 'readdir', 'readline', 'readlink', 'readpipe',
+            'recv', 'ref', 'rename', 'require', 'return',
+            'reverse', 'rewinddir', 'rindex', 'rmdir', 's', 'say', 'scalar', 'seek',
+            'seekdir', 'select', 'semctl', 'semget', 'semop', 'send', 'setgrent',
+            'sethostent', 'setnetent', 'setpgrp', 'setpriority', 'setprotoent',
+            'setpwent', 'setservent', 'setsockopt', 'shift', 'shmctl', 'shmget',
+            'shmread', 'shmwrite', 'shutdown', 'sin', 'sleep', 'socket', 'socketpair',
+            'sort', 'splice', 'split', 'sprintf', 'sqrt', 'srand', 'stat', 'state',
+            'study', 'substr', 'symlink', 'syscall', 'sysopen', 'sysread',
+            'sysseek', 'system', 'syswrite', 'tell', 'telldir', 'tie', 'tied',
+            'time', 'times', 'tr', 'truncate', 'uc', 'ucfirst', 'umask', 'undef',
+            'unlink', 'unpack', 'unshift', 'untie', 'utime', 'values',
+            'vec', 'wait', 'waitpid', 'wantarray', 'warn', 'when', 'write', 'y'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|', '^',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', '.', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #cc0000; font-style: italic;',
+            5 => 'color: #0000ff;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            4 => 'color: #009999;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://perldoc.perl.org/functions/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variable
+        0 => '(?:\$[\$#]?|\\\\(?:[@%*]?|\\\\*\$|&amp;)|%[$]?|@[$]?|\*[$]?|&amp;[$]?)[a-zA-Z_][a-zA-Z0-9_]*',
+        //File Descriptor
+        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/perl6.php b/vendor/easybook/geshi/geshi/perl6.php
new file mode 100755
index 000000000..706eabcb5
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/perl6.php
@@ -0,0 +1,197 @@
+<?php
+/*************************************************************************************
+ * perl6.php
+ * ---------
+ * Author: Kodi Arfer (kodiarfer {at} warpmail {period} net); forked from perl.php 1.0.8 by Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
+ * Copyright: (c) 2009 Kodi Arfer, (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/11/07
+ *
+ * Perl 6 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/12/25 (1.0.8.6)
+ *   - First Release
+ *
+ * TODO (updated 2009/11/07)
+ * -------------------------
+ * * It's all pretty rough. Perl 6 is complicated; this'll never be more
+ *   than reasonably accurate unless it's carefully written to match
+ *   STD.pm.
+ * * It's largely incomplete. Lots of keywords are no doubt missing.
+ * * Recognize comments like #`( Hello! ).
+ * * Recognize qw-ing angle brackets.
+ * * ! should probably be in OBJECT_SPLITTERS too, but putting it there
+ *   gives bizarre results. What to do?.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Perl 6',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('=begin' => '=end'),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        //Regular expression match variables
+        3 => '/\$\d+/',
+        //Heredoc
+        4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Beastly hack to finish highlighting each POD block
+        5 => '((?<==end) .+)'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),            // An optional 2-element array defining the beginning and end of a hard-quoted string
+    'HARDESCAPE' => array('\\\''),
+        // Things that must still be escaped inside a hard-quoted string
+        // If HARDQUOTE is defined, HARDESCAPE must be defined
+        // This will not work unless the first character of each element is either in the
+        // QUOTEMARKS array or is the ESCAPE_CHAR
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'do', 'else', 'elsif', 'for', 'if', 'then', 'until',
+            'while', 'loop', 'repeat', 'my', 'xor', 'or', 'and',
+            'unless', 'next', 'last', 'redo', 'not', 'our', 'let',
+            'temp', 'state', 'enum', 'constant', 'continue', 'cmp',
+            'ne', 'eq', 'lt', 'gt', 'le', 'ge', 'leg', 'div', 'X',
+            'Z', 'x', 'xx', 'given', 'when', 'default', 'has',
+            'returns', 'of', 'is', 'does', 'where', 'subset', 'but',
+            'True', 'False', 'return', 'die', 'fail'
+            ),
+        2 => array(
+            'use', 'sub', 'multi', 'method', 'submethod', 'proto',
+            'class', 'role', 'grammar', 'regex', 'token', 'rule',
+            'new', 'BEGIN', 'END', 'CHECK', 'INIT', 'START', 'FIRST',
+            'ENTER', 'LEAVE', 'KEEP', 'UNDO', 'NEXT', 'LAST', 'PRE',
+            'POST', 'CATCH', 'CONTROL', 'BUILD'
+            ),
+        3 => array(
+            'all', 'any', 'cat', 'classify', 'defined', 'grep', 'first',
+            'keys', 'kv', 'join', 'map', 'max', 'min', 'none', 'one', 'pairs',
+            'print', 'printf', 'roundrobin', 'pick', 'reduce', 'reverse', 'say',
+            'shape', 'sort', 'srand', 'undefine', 'uri', 'values', 'warn', 'zip',
+
+            # Container
+            'rotate', 'comb', 'end', 'elems', 'delete',
+            'exists', 'pop', 'push', 'shift', 'splice',
+            'unshift', 'invert', 'decode',
+
+            # Numeric
+            'succ', 'pred', 'abs', 'exp', 'log',
+            'log10', 'rand', 'roots', 'cis', 'unpolar', 'i', 'floor',
+            'ceiling', 'round', 'truncate', 'sign', 'sqrt',
+            'polar', 're', 'im', 'I', 'atan2', 'nude',
+            'denominator', 'numerator',
+
+            # Str
+            'p5chop', 'chop', 'p5chomp', 'chomp', 'lc', 'lcfirst',
+            'uc', 'ucfirst', 'normalize', 'samecase', 'sameaccent',
+            'capitalize', 'length', 'chars', 'graphs', 'codes',
+            'bytes', 'encode', 'index', 'pack', 'quotemeta', 'rindex',
+            'split', 'words', 'flip', 'sprintf', 'fmt',
+            'substr', 'trim', 'unpack', 'match', 'subst', 'trans'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|', '^',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', '.', ':',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #cc0000; font-style: italic;',
+            5 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variable
+        0 => '(?:[$@%]|&amp;)(?:(?:[\^:*?!~]|&lt;)?[a-zA-Z_][a-zA-Z0-9_]*|(?=\.))'
+        # We treat the . twigil specially so the name can be highlighted as an
+        # object field (via OBJECT_SPLITTERS).
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/pf.php b/vendor/easybook/geshi/geshi/pf.php
new file mode 100755
index 000000000..818e11bcb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pf.php
@@ -0,0 +1,178 @@
+<?php
+/*************************************************************************************
+ * pf.php
+ * --------
+ * Author: David Berard (david@nfrance.com)
+ * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/16
+ * Based on bash.php
+ *
+ * OpenBSD PACKET FILTER language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/10/16 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ * * Support ALTQ
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'OpenBSD Packet Filter',
+    'COMMENT_SINGLE' => array('#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        3 => "/\\\\['\"]/siU"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => "#\\\\[nfrtv\\$\\\"\n]#i",
+        2 => "#\\$[a-z_][a-z0-9_]*#i",
+        3 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        4 => "/\\$\\([^\\n\\)]*?\\)/i",
+        5 => "/`[^`]*`/"
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'pass'
+        ),
+        2 => array(
+            'block'
+            ),
+        3 => array(
+            'quick','keep','state','antispoof','table','persist','file','scrub',
+            'set','skip','flags','on'
+            ),
+        4 => array(
+            'in','out','proto'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`','='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #009900; font-weight: bold;',
+            2 => 'color: #990000; font-weight: bold;',
+            3 => 'color: #7a0874;',
+            4 => 'color: #336699;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;',
+            1 => 'color: #800000;',
+            2 => 'color: #cc0000; font-style: italic;',
+            3 => 'color: #000000; font-weight: bold;'
+            ),
+        'ESCAPE_CHAR' => array(
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #007800;',
+            3 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #780078;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #CC0000;',
+            'HARD' => 'color: #CC0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff00cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #007800;',
+            2 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #660033;',
+            6 => 'color: #000099; font-weight: bold;',
+            7 => 'color: #0000ff;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables (will be handled by comment_regexps)
+        0 => "\\$\\{[a-zA-Z_][a-zA-Z0-9_]*?\\}",
+        //Variables without braces
+        1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
+        //Variable assignment
+        2 => "(?<![\.a-zA-Z_\-])([a-zA-Z_][a-zA-Z0-9_]*?)(?==)",
+        //Shorthand shell variables
+        4 => "\\$[*#\$\\-\\?!]",
+        //Parameters of commands
+        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|$)",
+        //IPs
+        6 => "([0-9]{1,3}\.){3}[0-9]{1,3}",
+        //Tables
+        7 => "(&lt;(.*)&gt;)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#])",
+            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%\\/])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/php-brief.php b/vendor/easybook/geshi/geshi/php-brief.php
new file mode 100755
index 000000000..a4804b4da
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/php-brief.php
@@ -0,0 +1,222 @@
+<?php
+/*************************************************************************************
+ * php-brief.php
+ * -------------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/02
+ *
+ * PHP (brief version) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ *  -  Fixed &new problem
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * * Remove more functions that are hardly used
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PHP (brief)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Heredoc and Nowdoc syntax
+    'COMMENT_REGEXP' => array(3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'include', 'require', 'include_once', 'require_once',
+            'for', 'as', 'foreach', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch',
+            'return', 'break'
+            ),
+        2 => array(
+            'null', '__LINE__', '__FILE__',
+            'false', '&lt;?php',
+            'true', 'var', 'default',
+            'function', 'class', 'new', '&amp;new', 'public', 'private', 'interface', 'extends',
+            'const', 'self'
+            ),
+        3 => array(
+            'func_num_args', 'func_get_arg', 'func_get_args', 'strlen', 'strcmp', 'strncmp', 'strcasecmp', 'strncasecmp', 'each', 'error_reporting', 'define', 'defined',
+            'trigger_error', 'user_error', 'set_error_handler', 'restore_error_handler', 'get_declared_classes', 'get_loaded_extensions',
+            'extension_loaded', 'get_extension_funcs', 'debug_backtrace',
+            'constant', 'bin2hex', 'sleep', 'usleep', 'time', 'mktime', 'gmmktime', 'strftime', 'gmstrftime', 'strtotime', 'date', 'gmdate', 'getdate', 'localtime', 'checkdate', 'flush', 'wordwrap', 'htmlspecialchars', 'htmlentities', 'html_entity_decode', 'md5', 'md5_file', 'crc32', 'getimagesize', 'image_type_to_mime_type', 'phpinfo', 'phpversion', 'phpcredits', 'strnatcmp', 'strnatcasecmp', 'substr_count', 'strspn', 'strcspn', 'strtok', 'strtoupper', 'strtolower', 'strpos', 'strrpos', 'strrev', 'hebrev', 'hebrevc', 'nl2br', 'basename', 'dirname', 'pathinfo', 'stripslashes', 'stripcslashes', 'strstr', 'stristr', 'strrchr', 'str_shuffle', 'str_word_count', 'strcoll', 'substr', 'substr_replace', 'quotemeta', 'ucfirst', 'ucwords', 'strtr', 'addslashes', 'addcslashes', 'rtrim', 'str_replace', 'str_repeat', 'count_chars', 'chunk_split', 'trim', 'ltrim', 'strip_tags', 'similar_text', 'explode', 'implode', 'setlocale', 'localeconv',
+            'parse_str', 'str_pad', 'chop', 'strchr', 'sprintf', 'printf', 'vprintf', 'vsprintf', 'sscanf', 'fscanf', 'parse_url', 'urlencode', 'urldecode', 'rawurlencode', 'rawurldecode', 'readlink', 'linkinfo', 'link', 'unlink', 'exec', 'system', 'escapeshellcmd', 'escapeshellarg', 'passthru', 'shell_exec', 'proc_open', 'proc_close', 'rand', 'srand', 'getrandmax', 'mt_rand', 'mt_srand', 'mt_getrandmax', 'base64_decode', 'base64_encode', 'abs', 'ceil', 'floor', 'round', 'is_finite', 'is_nan', 'is_infinite', 'bindec', 'hexdec', 'octdec', 'decbin', 'decoct', 'dechex', 'base_convert', 'number_format', 'fmod', 'ip2long', 'long2ip', 'getenv', 'putenv', 'getopt', 'microtime', 'gettimeofday', 'getrusage', 'uniqid', 'quoted_printable_decode', 'set_time_limit', 'get_cfg_var', 'magic_quotes_runtime', 'set_magic_quotes_runtime', 'get_magic_quotes_gpc', 'get_magic_quotes_runtime',
+            'import_request_variables', 'error_log', 'serialize', 'unserialize', 'memory_get_usage', 'var_dump', 'var_export', 'debug_zval_dump', 'print_r','highlight_file', 'show_source', 'highlight_string', 'ini_get', 'ini_get_all', 'ini_set', 'ini_alter', 'ini_restore', 'get_include_path', 'set_include_path', 'restore_include_path', 'setcookie', 'header', 'headers_sent', 'connection_aborted', 'connection_status', 'ignore_user_abort', 'parse_ini_file', 'is_uploaded_file', 'move_uploaded_file', 'intval', 'floatval', 'doubleval', 'strval', 'gettype', 'settype', 'is_null', 'is_resource', 'is_bool', 'is_long', 'is_float', 'is_int', 'is_integer', 'is_double', 'is_real', 'is_numeric', 'is_string', 'is_array', 'is_object', 'is_scalar',
+            'ereg', 'ereg_replace', 'eregi', 'eregi_replace', 'split', 'spliti', 'join', 'sql_regcase', 'dl', 'pclose', 'popen', 'readfile', 'rewind', 'rmdir', 'umask', 'fclose', 'feof', 'fgetc', 'fgets', 'fgetss', 'fread', 'fopen', 'fpassthru', 'ftruncate', 'fstat', 'fseek', 'ftell', 'fflush', 'fwrite', 'fputs', 'mkdir', 'rename', 'copy', 'tempnam', 'tmpfile', 'file', 'file_get_contents', 'stream_select', 'stream_context_create', 'stream_context_set_params', 'stream_context_set_option', 'stream_context_get_options', 'stream_filter_prepend', 'stream_filter_append', 'fgetcsv', 'flock', 'get_meta_tags', 'stream_set_write_buffer', 'set_file_buffer', 'set_socket_blocking', 'stream_set_blocking', 'socket_set_blocking', 'stream_get_meta_data', 'stream_register_wrapper', 'stream_wrapper_register', 'stream_set_timeout', 'socket_set_timeout', 'socket_get_status', 'realpath', 'fnmatch', 'fsockopen', 'pfsockopen', 'pack', 'unpack', 'get_browser', 'crypt', 'opendir', 'closedir', 'chdir', 'getcwd', 'rewinddir', 'readdir', 'dir', 'glob', 'fileatime', 'filectime', 'filegroup', 'fileinode', 'filemtime', 'fileowner', 'fileperms', 'filesize', 'filetype', 'file_exists', 'is_writable', 'is_writeable', 'is_readable', 'is_executable', 'is_file', 'is_dir', 'is_link', 'stat', 'lstat', 'chown',
+            'touch', 'clearstatcache', 'mail', 'ob_start', 'ob_flush', 'ob_clean', 'ob_end_flush', 'ob_end_clean', 'ob_get_flush', 'ob_get_clean', 'ob_get_length', 'ob_get_level', 'ob_get_status', 'ob_get_contents', 'ob_implicit_flush', 'ob_list_handlers', 'ksort', 'krsort', 'natsort', 'natcasesort', 'asort', 'arsort', 'sort', 'rsort', 'usort', 'uasort', 'uksort', 'shuffle', 'array_walk', 'count', 'end', 'prev', 'next', 'reset', 'current', 'key', 'min', 'max', 'in_array', 'array_search', 'extract', 'compact', 'array_fill', 'range', 'array_multisort', 'array_push', 'array_pop', 'array_shift', 'array_unshift', 'array_splice', 'array_slice', 'array_merge', 'array_merge_recursive', 'array_keys', 'array_values', 'array_count_values', 'array_reverse', 'array_reduce', 'array_pad', 'array_flip', 'array_change_key_case', 'array_rand', 'array_unique', 'array_intersect', 'array_intersect_assoc', 'array_diff', 'array_diff_assoc', 'array_sum', 'array_filter', 'array_map', 'array_chunk', 'array_key_exists', 'pos', 'sizeof', 'key_exists', 'assert', 'assert_options', 'version_compare', 'ftok', 'str_rot13', 'aggregate',
+            'session_name', 'session_module_name', 'session_save_path', 'session_id', 'session_regenerate_id', 'session_decode', 'session_register', 'session_unregister', 'session_is_registered', 'session_encode',
+            'session_start', 'session_destroy', 'session_unset', 'session_set_save_handler', 'session_cache_limiter', 'session_cache_expire', 'session_set_cookie_params', 'session_get_cookie_params', 'session_write_close', 'preg_match', 'preg_match_all', 'preg_replace', 'preg_replace_callback', 'preg_split', 'preg_quote', 'preg_grep', 'overload', 'ctype_alnum', 'ctype_alpha', 'ctype_cntrl', 'ctype_digit', 'ctype_lower', 'ctype_graph', 'ctype_print', 'ctype_punct', 'ctype_space', 'ctype_upper', 'ctype_xdigit', 'virtual', 'apache_request_headers', 'apache_note', 'apache_lookup_uri', 'apache_child_terminate', 'apache_setenv', 'apache_response_headers', 'apache_get_version', 'getallheaders', 'mysql_connect', 'mysql_pconnect', 'mysql_close', 'mysql_select_db', 'mysql_create_db', 'mysql_drop_db', 'mysql_query', 'mysql_unbuffered_query', 'mysql_db_query', 'mysql_list_dbs', 'mysql_list_tables', 'mysql_list_fields', 'mysql_list_processes', 'mysql_error', 'mysql_errno', 'mysql_affected_rows', 'mysql_insert_id', 'mysql_result', 'mysql_num_rows', 'mysql_num_fields', 'mysql_fetch_row', 'mysql_fetch_array', 'mysql_fetch_assoc', 'mysql_fetch_object', 'mysql_data_seek', 'mysql_fetch_lengths', 'mysql_fetch_field', 'mysql_field_seek', 'mysql_free_result', 'mysql_field_name', 'mysql_field_table', 'mysql_field_len', 'mysql_field_type', 'mysql_field_flags', 'mysql_escape_string', 'mysql_real_escape_string', 'mysql_stat',
+            'mysql_thread_id', 'mysql_client_encoding', 'mysql_get_client_info', 'mysql_get_host_info', 'mysql_get_proto_info', 'mysql_get_server_info', 'mysql_info', 'mysql', 'mysql_fieldname', 'mysql_fieldtable', 'mysql_fieldlen', 'mysql_fieldtype', 'mysql_fieldflags', 'mysql_selectdb', 'mysql_createdb', 'mysql_dropdb', 'mysql_freeresult', 'mysql_numfields', 'mysql_numrows', 'mysql_listdbs', 'mysql_listtables', 'mysql_listfields', 'mysql_db_name', 'mysql_dbname', 'mysql_tablename', 'mysql_table_name', 'pg_connect', 'pg_pconnect', 'pg_close', 'pg_connection_status', 'pg_connection_busy', 'pg_connection_reset', 'pg_host', 'pg_dbname', 'pg_port', 'pg_tty', 'pg_options', 'pg_ping', 'pg_query', 'pg_send_query', 'pg_cancel_query', 'pg_fetch_result', 'pg_fetch_row', 'pg_fetch_assoc', 'pg_fetch_array', 'pg_fetch_object', 'pg_fetch_all', 'pg_affected_rows', 'pg_get_result', 'pg_result_seek', 'pg_result_status', 'pg_free_result', 'pg_last_oid', 'pg_num_rows', 'pg_num_fields', 'pg_field_name', 'pg_field_num', 'pg_field_size', 'pg_field_type', 'pg_field_prtlen', 'pg_field_is_null', 'pg_get_notify', 'pg_get_pid', 'pg_result_error', 'pg_last_error', 'pg_last_notice', 'pg_put_line', 'pg_end_copy', 'pg_copy_to', 'pg_copy_from',
+            'pg_trace', 'pg_untrace', 'pg_lo_create', 'pg_lo_unlink', 'pg_lo_open', 'pg_lo_close', 'pg_lo_read', 'pg_lo_write', 'pg_lo_read_all', 'pg_lo_import', 'pg_lo_export', 'pg_lo_seek', 'pg_lo_tell', 'pg_escape_string', 'pg_escape_bytea', 'pg_unescape_bytea', 'pg_client_encoding', 'pg_set_client_encoding', 'pg_meta_data', 'pg_convert', 'pg_insert', 'pg_update', 'pg_delete', 'pg_select', 'pg_exec', 'pg_getlastoid', 'pg_cmdtuples', 'pg_errormessage', 'pg_numrows', 'pg_numfields', 'pg_fieldname', 'pg_fieldsize', 'pg_fieldtype', 'pg_fieldnum', 'pg_fieldprtlen', 'pg_fieldisnull', 'pg_freeresult', 'pg_result', 'pg_loreadall', 'pg_locreate', 'pg_lounlink', 'pg_loopen', 'pg_loclose', 'pg_loread', 'pg_lowrite', 'pg_loimport', 'pg_loexport',
+            'echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%', '<%=', '%>', '<?', '<?=', '?>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #0000cc; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.php.net/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<?php' => '?>'
+            ),
+        1 => array(
+            '<?' => '?>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        3 => array(
+            '<script language="php">' => '</script>'
+            ),
+        4 => "/(?P<start><\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?P<end>\\?>|\Z)/sm",
+        5 => "/(?P<start><%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?P<end>%>)/sm"
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/php.php b/vendor/easybook/geshi/geshi/php.php
new file mode 100755
index 000000000..7b5c16e18
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/php.php
@@ -0,0 +1,1115 @@
+<?php
+/*************************************************************************************
+ * php.php
+ * --------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/20
+ *
+ * PHP language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/25 (1.0.3)
+ *  -  Added support for multiple object splitters
+ *  -  Fixed &new problem
+ * 2004/10/27 (1.0.2)
+ *  -  Added URL support
+ *  -  Added extra constants
+ * 2004/08/05 (1.0.1)
+ *  -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * * Make sure the last few function I may have missed
+ *   (like eval()) are included for highlighting
+ * * Split to several files - php4, php5 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'PHP',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Heredoc and Nowdoc syntax
+        3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+?)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        // phpdoc comments
+        4 => '#/\*\*(?![\*\/]).*\*/#sU',
+        // Advanced # handling
+        2 => "/#.*?(?:(?=\?\>)|^)/smi"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{1,2}#i",
+        //Octal Char Specs
+        3 => "#\\\\[0-7]{1,3}#",
+        //String Parsing of Variable Names
+        4 => "#\\$[a-z0-9_]+(?:\\[[a-z0-9_]+\\]|->[a-z0-9_]+)?|(?:\\{\\$|\\$\\{)[a-z0-9_]+(?:\\[('?)[a-z0-9_]*\\1\\]|->[a-z0-9_]+)*\\}#i",
+        //Experimental extension supporting cascaded {${$var}} syntax
+        5 => "#\$[a-z0-9_]+(?:\[[a-z0-9_]+\]|->[a-z0-9_]+)?|(?:\{\$|\$\{)[a-z0-9_]+(?:\[('?)[a-z0-9_]*\\1\]|->[a-z0-9_]+)*\}|\{\$(?R)\}#i",
+        //Format String support in ""-Strings
+        6 => "#%(?:%|(?:\d+\\\\\\\$)?\\+?(?:\x20|0|'.)?-?(?:\d+|\\*)?(?:\.\d+)?[bcdefFosuxX])#"
+        ),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'", "\\"),
+    'HARDCHAR' => "\\",
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'as','break','case','continue','default','do','else','elseif',
+            'endfor','endforeach','endif','endswitch','endwhile','for',
+            'foreach','if','include','include_once','require','require_once',
+            'return','switch','throw','while',
+
+            'echo','print'
+            ),
+        2 => array(
+            '&amp;new','&lt;/script&gt;','&lt;?php','&lt;script language',
+            'abstract','class','const','declare','extends','function','global',
+            'interface','namespace','new','private','protected','public','self',
+            'use','var'
+            ),
+        3 => array(
+            'abs','acos','acosh','addcslashes','addslashes','aggregate',
+            'aggregate_methods','aggregate_methods_by_list',
+            'aggregate_methods_by_regexp','aggregate_properties',
+            'aggregate_properties_by_list','aggregate_properties_by_regexp',
+            'aggregation_info','apache_child_terminate','apache_get_modules',
+            'apache_get_version','apache_getenv','apache_lookup_uri',
+            'apache_note','apache_request_headers','apache_response_headers',
+            'apache_setenv','array','array_change_key_case','array_chunk',
+            'array_combine','array_count_values','array_diff',
+            'array_diff_assoc','array_diff_key','array_diff_uassoc',
+            'array_diff_ukey','array_fill','array_fill_keys','array_filter',
+            'array_flip','array_intersect','array_intersect_assoc',
+            'array_intersect_key','array_intersect_uassoc',
+            'array_intersect_ukey','array_key_exists','array_keys','array_map',
+            'array_merge','array_merge_recursive','array_multisort','array_pad',
+            'array_pop','array_product','array_push','array_rand',
+            'array_reduce','array_reverse','array_search','array_shift',
+            'array_slice','array_splice','array_sum','array_udiff',
+            'array_udiff_assoc','array_udiff_uassoc','array_uintersect',
+            'array_uintersect_assoc','array_uintersect_uassoc','array_unique',
+            'array_unshift','array_values','array_walk','array_walk_recursive',
+            'arsort','asin','asinh','asort','assert','assert_options','atan',
+            'atan2','atanh','base_convert','base64_decode','base64_encode',
+            'basename','bcadd','bccomp','bcdiv','bcmod','bcmul',
+            'bcompiler_load','bcompiler_load_exe','bcompiler_parse_class',
+            'bcompiler_read','bcompiler_write_class','bcompiler_write_constant',
+            'bcompiler_write_exe_footer','bcompiler_write_file',
+            'bcompiler_write_footer','bcompiler_write_function',
+            'bcompiler_write_functions_from_file','bcompiler_write_header',
+            'bcompiler_write_included_filename','bcpow','bcpowmod','bcscale',
+            'bcsqrt','bcsub','bin2hex','bindec','bindtextdomain',
+            'bind_textdomain_codeset','bitset_empty','bitset_equal',
+            'bitset_excl','bitset_fill','bitset_from_array','bitset_from_hash',
+            'bitset_from_string','bitset_in','bitset_incl',
+            'bitset_intersection','bitset_invert','bitset_is_empty',
+            'bitset_subset','bitset_to_array','bitset_to_hash',
+            'bitset_to_string','bitset_union','blenc_encrypt','bzclose',
+            'bzcompress','bzdecompress','bzerrno','bzerror','bzerrstr',
+            'bzflush','bzopen','bzread','bzwrite','cal_days_in_month',
+            'cal_from_jd','cal_info','cal_to_jd','call_user_func',
+            'call_user_func_array','call_user_method','call_user_method_array',
+            'ceil','chdir','checkdate','checkdnsrr','chgrp','chmod','chop',
+            'chown','chr','chunk_split','class_exists','class_implements',
+            'class_parents','classkit_aggregate_methods',
+            'classkit_doc_comments','classkit_import','classkit_method_add',
+            'classkit_method_copy','classkit_method_redefine',
+            'classkit_method_remove','classkit_method_rename','clearstatcache',
+            'closedir','closelog','com_create_guid','com_event_sink',
+            'com_get_active_object','com_load_typelib','com_message_pump',
+            'com_print_typeinfo','compact','confirm_phpdoc_compiled',
+            'connection_aborted','connection_status','constant',
+            'convert_cyr_string','convert_uudecode','convert_uuencode','copy',
+            'cos','cosh','count','count_chars','cpdf_add_annotation',
+            'cpdf_add_outline','cpdf_arc','cpdf_begin_text','cpdf_circle',
+            'cpdf_clip','cpdf_close','cpdf_closepath',
+            'cpdf_closepath_fill_stroke','cpdf_closepath_stroke',
+            'cpdf_continue_text','cpdf_curveto','cpdf_end_text','cpdf_fill',
+            'cpdf_fill_stroke','cpdf_finalize','cpdf_finalize_page',
+            'cpdf_global_set_document_limits','cpdf_import_jpeg','cpdf_lineto',
+            'cpdf_moveto','cpdf_newpath','cpdf_open','cpdf_output_buffer',
+            'cpdf_page_init','cpdf_rect','cpdf_restore','cpdf_rlineto',
+            'cpdf_rmoveto','cpdf_rotate','cpdf_rotate_text','cpdf_save',
+            'cpdf_save_to_file','cpdf_scale','cpdf_set_action_url',
+            'cpdf_set_char_spacing','cpdf_set_creator','cpdf_set_current_page',
+            'cpdf_set_font','cpdf_set_font_directories',
+            'cpdf_set_font_map_file','cpdf_set_horiz_scaling',
+            'cpdf_set_keywords','cpdf_set_leading','cpdf_set_page_animation',
+            'cpdf_set_subject','cpdf_set_text_matrix','cpdf_set_text_pos',
+            'cpdf_set_text_rendering','cpdf_set_text_rise','cpdf_set_title',
+            'cpdf_set_viewer_preferences','cpdf_set_word_spacing',
+            'cpdf_setdash','cpdf_setflat','cpdf_setgray','cpdf_setgray_fill',
+            'cpdf_setgray_stroke','cpdf_setlinecap','cpdf_setlinejoin',
+            'cpdf_setlinewidth','cpdf_setmiterlimit','cpdf_setrgbcolor',
+            'cpdf_setrgbcolor_fill','cpdf_setrgbcolor_stroke','cpdf_show',
+            'cpdf_show_xy','cpdf_stringwidth','cpdf_stroke','cpdf_text',
+            'cpdf_translate','crack_check','crack_closedict',
+            'crack_getlastmessage','crack_opendict','crc32','create_function',
+            'crypt','ctype_alnum','ctype_alpha','ctype_cntrl','ctype_digit',
+            'ctype_graph','ctype_lower','ctype_print','ctype_punct',
+            'ctype_space','ctype_upper','ctype_xdigit','curl_close',
+            'curl_copy_handle','curl_errno','curl_error','curl_exec',
+            'curl_getinfo','curl_init','curl_multi_add_handle',
+            'curl_multi_close','curl_multi_exec','curl_multi_getcontent',
+            'curl_multi_info_read','curl_multi_init','curl_multi_remove_handle',
+            'curl_multi_select','curl_setopt','curl_setopt_array',
+            'curl_version','current','cvsclient_connect','cvsclient_log',
+            'cvsclient_login','cvsclient_retrieve','date','date_create',
+            'date_date_set','date_default_timezone_get',
+            'date_default_timezone_set','date_format','date_isodate_set',
+            'date_modify','date_offset_get','date_parse','date_sun_info',
+            'date_sunrise','date_sunset','date_time_set','date_timezone_get',
+            'date_timezone_set','db_id_list','dba_close','dba_delete',
+            'dba_exists','dba_fetch','dba_firstkey','dba_handlers','dba_insert',
+            'dba_key_split','dba_list','dba_nextkey','dba_open','dba_optimize',
+            'dba_popen','dba_replace','dba_sync','dbase_add_record',
+            'dbase_close','dbase_create','dbase_delete_record',
+            'dbase_get_header_info','dbase_get_record',
+            'dbase_get_record_with_names','dbase_numfields','dbase_numrecords',
+            'dbase_open','dbase_pack','dbase_replace_record',
+            'dbg_get_all_contexts','dbg_get_all_module_names',
+            'dbg_get_all_source_lines','dbg_get_context_name',
+            'dbg_get_module_name','dbg_get_profiler_results',
+            'dbg_get_source_context','dblist','dbmclose','dbmdelete',
+            'dbmexists','dbmfetch','dbmfirstkey','dbminsert','dbmnextkey',
+            'dbmopen','dbmreplace','dbx_close','dbx_compare','dbx_connect',
+            'dbx_error','dbx_escape_string','dbx_fetch_row','dbx_query',
+            'dbx_sort','dcgettext','dcngettext','deaggregate','debug_backtrace',
+            'debug_zval_dump','debugbreak','decbin','dechex','decoct','define',
+            'defined','define_syslog_variables','deg2rad','dgettext','die',
+            'dio_close','dio_open','dio_read','dio_seek','dio_stat','dio_write',
+            'dir','dirname','disk_free_space','disk_total_space',
+            'diskfreespace','dl','dngettext','docblock_token_name',
+            'docblock_tokenize','dom_import_simplexml','domxml_add_root',
+            'domxml_attributes','domxml_children','domxml_doc_add_root',
+            'domxml_doc_document_element','domxml_doc_get_element_by_id',
+            'domxml_doc_get_elements_by_tagname','domxml_doc_get_root',
+            'domxml_doc_set_root','domxml_doc_validate','domxml_doc_xinclude',
+            'domxml_dump_mem','domxml_dump_mem_file','domxml_dump_node',
+            'domxml_dumpmem','domxml_elem_get_attribute',
+            'domxml_elem_set_attribute','domxml_get_attribute','domxml_getattr',
+            'domxml_html_dump_mem','domxml_new_child','domxml_new_doc',
+            'domxml_new_xmldoc','domxml_node','domxml_node_add_namespace',
+            'domxml_node_attributes','domxml_node_children',
+            'domxml_node_get_content','domxml_node_has_attributes',
+            'domxml_node_new_child','domxml_node_set_content',
+            'domxml_node_set_namespace','domxml_node_unlink_node',
+            'domxml_open_file','domxml_open_mem','domxml_parser',
+            'domxml_parser_add_chunk','domxml_parser_cdata_section',
+            'domxml_parser_characters','domxml_parser_comment',
+            'domxml_parser_end','domxml_parser_end_document',
+            'domxml_parser_end_element','domxml_parser_entity_reference',
+            'domxml_parser_get_document','domxml_parser_namespace_decl',
+            'domxml_parser_processing_instruction',
+            'domxml_parser_start_document','domxml_parser_start_element',
+            'domxml_root','domxml_set_attribute','domxml_setattr',
+            'domxml_substitute_entities_default','domxml_unlink_node',
+            'domxml_version','domxml_xmltree','doubleval','each','easter_date',
+            'easter_days','empty','end','ereg','ereg_replace','eregi',
+            'eregi_replace','error_get_last','error_log','error_reporting',
+            'escapeshellarg','escapeshellcmd','eval','event_deschedule',
+            'event_dispatch','event_free','event_handle_signal',
+            'event_have_events','event_init','event_new','event_pending',
+            'event_priority_set','event_schedule','event_set','event_timeout',
+            'exec','exif_imagetype','exif_read_data','exif_tagname',
+            'exif_thumbnail','exit','exp','explode','expm1','extension_loaded',
+            'extract','ezmlm_hash','fbird_add_user','fbird_affected_rows',
+            'fbird_backup','fbird_blob_add','fbird_blob_cancel',
+            'fbird_blob_close','fbird_blob_create','fbird_blob_echo',
+            'fbird_blob_get','fbird_blob_import','fbird_blob_info',
+            'fbird_blob_open','fbird_close','fbird_commit','fbird_commit_ret',
+            'fbird_connect','fbird_db_info','fbird_delete_user','fbird_drop_db',
+            'fbird_errcode','fbird_errmsg','fbird_execute','fbird_fetch_assoc',
+            'fbird_fetch_object','fbird_fetch_row','fbird_field_info',
+            'fbird_free_event_handler','fbird_free_query','fbird_free_result',
+            'fbird_gen_id','fbird_maintain_db','fbird_modify_user',
+            'fbird_name_result','fbird_num_fields','fbird_num_params',
+            'fbird_param_info','fbird_pconnect','fbird_prepare','fbird_query',
+            'fbird_restore','fbird_rollback','fbird_rollback_ret',
+            'fbird_server_info','fbird_service_attach','fbird_service_detach',
+            'fbird_set_event_handler','fbird_trans','fbird_wait_event','fclose',
+            'fdf_add_doc_javascript','fdf_add_template','fdf_close',
+            'fdf_create','fdf_enum_values','fdf_errno','fdf_error','fdf_get_ap',
+            'fdf_get_attachment','fdf_get_encoding','fdf_get_file',
+            'fdf_get_flags','fdf_get_opt','fdf_get_status','fdf_get_value',
+            'fdf_get_version','fdf_header','fdf_next_field_name','fdf_open',
+            'fdf_open_string','fdf_remove_item','fdf_save','fdf_save_string',
+            'fdf_set_ap','fdf_set_encoding','fdf_set_file','fdf_set_flags',
+            'fdf_set_javascript_action','fdf_set_on_import_javascript',
+            'fdf_set_opt','fdf_set_status','fdf_set_submit_form_action',
+            'fdf_set_target_frame','fdf_set_value','fdf_set_version','feof',
+            'fflush','fgetc','fgetcsv','fgets','fgetss','file','file_exists',
+            'file_get_contents','file_put_contents','fileatime','filectime',
+            'filegroup','fileinode','filemtime','fileowner','fileperms',
+            'filepro','filepro_fieldcount','filepro_fieldname',
+            'filepro_fieldtype','filepro_fieldwidth','filepro_retrieve',
+            'filepro_rowcount','filesize','filetype','filter_has_var',
+            'filter_id','filter_input','filter_input_array','filter_list',
+            'filter_var','filter_var_array','finfo_buffer','finfo_close',
+            'finfo_file','finfo_open','finfo_set_flags','floatval','flock',
+            'floor','flush','fmod','fnmatch','fopen','fpassthru','fprintf',
+            'fputcsv','fputs','fread','frenchtojd','fribidi_charset_info',
+            'fribidi_get_charsets','fribidi_log2vis','fscanf','fseek',
+            'fsockopen','fstat','ftell','ftok','ftp_alloc','ftp_cdup',
+            'ftp_chdir','ftp_chmod','ftp_close','ftp_connect','ftp_delete',
+            'ftp_exec','ftp_fget','ftp_fput','ftp_get','ftp_get_option',
+            'ftp_login','ftp_mdtm','ftp_mkdir','ftp_nb_continue','ftp_nb_fget',
+            'ftp_nb_fput','ftp_nb_get','ftp_nb_put','ftp_nlist','ftp_pasv',
+            'ftp_put','ftp_pwd','ftp_quit','ftp_raw','ftp_rawlist','ftp_rename',
+            'ftp_rmdir','ftp_set_option','ftp_site','ftp_size',
+            'ftp_ssl_connect','ftp_systype','ftruncate','function_exists',
+            'func_get_arg','func_get_args','func_num_args','fwrite','gd_info',
+            'getallheaders','getcwd','getdate','getenv','gethostbyaddr',
+            'gethostbyname','gethostbynamel','getimagesize','getlastmod',
+            'getmxrr','getmygid','getmyinode','getmypid','getmyuid','getopt',
+            'getprotobyname','getprotobynumber','getrandmax','getrusage',
+            'getservbyname','getservbyport','gettext','gettimeofday','gettype',
+            'get_browser','get_cfg_var','get_class','get_class_methods',
+            'get_class_vars','get_current_user','get_declared_classes',
+            'get_defined_constants','get_defined_functions','get_defined_vars',
+            'get_extension_funcs','get_headers','get_html_translation_table',
+            'get_included_files','get_include_path','get_loaded_extensions',
+            'get_magic_quotes_gpc','get_magic_quotes_runtime','get_meta_tags',
+            'get_object_vars','get_parent_class','get_required_files',
+            'get_resource_type','glob','gmdate','gmmktime','gmp_abs','gmp_add',
+            'gmp_and','gmp_clrbit','gmp_cmp','gmp_com','gmp_div','gmp_div_q',
+            'gmp_div_qr','gmp_div_r','gmp_divexact','gmp_fact','gmp_gcd',
+            'gmp_gcdext','gmp_hamdist','gmp_init','gmp_intval','gmp_invert',
+            'gmp_jacobi','gmp_legendre','gmp_mod','gmp_mul','gmp_neg',
+            'gmp_nextprime','gmp_or','gmp_perfect_square','gmp_popcount',
+            'gmp_pow','gmp_powm','gmp_prob_prime','gmp_random','gmp_scan0',
+            'gmp_scan1','gmp_setbit','gmp_sign','gmp_sqrt','gmp_sqrtrem',
+            'gmp_strval','gmp_sub','gmp_xor','gmstrftime','gopher_parsedir',
+            'gregoriantojd','gzclose','gzcompress','gzdeflate','gzencode',
+            'gzeof','gzfile','gzgetc','gzgets','gzgetss','gzinflate','gzopen',
+            'gzpassthru','gzputs','gzread','gzrewind','gzseek','gztell',
+            'gzuncompress','gzwrite','hash','hash_algos','hash_file',
+            'hash_final','hash_hmac','hash_hmac_file','hash_init','hash_update',
+            'hash_update_file','hash_update_stream','header','headers_list',
+            'headers_sent','hebrev','hebrevc','hexdec','highlight_file',
+            'highlight_string','html_doc','html_doc_file','html_entity_decode',
+            'htmlentities','htmlspecialchars','htmlspecialchars_decode',
+            'http_build_cookie','http_build_query','http_build_str',
+            'http_build_url','http_cache_etag','http_cache_last_modified',
+            'http_chunked_decode','http_date','http_deflate','http_get',
+            'http_get_request_body','http_get_request_body_stream',
+            'http_get_request_headers','http_head','http_inflate',
+            'http_match_etag','http_match_modified','http_match_request_header',
+            'http_negotiate_charset','http_negotiate_content_type',
+            'http_negotiate_language','http_parse_cookie','http_parse_headers',
+            'http_parse_message','http_parse_params',
+            'http_persistent_handles_clean','http_persistent_handles_count',
+            'http_persistent_handles_ident','http_post_data','http_post_fields',
+            'http_put_data','http_put_file','http_put_stream','http_redirect',
+            'http_request','http_request_body_encode',
+            'http_request_method_exists','http_request_method_name',
+            'http_request_method_register','http_request_method_unregister',
+            'http_send_content_disposition','http_send_content_type',
+            'http_send_data','http_send_file','http_send_last_modified',
+            'http_send_status','http_send_stream','http_support',
+            'http_throttle','hypot','i18n_convert','i18n_discover_encoding',
+            'i18n_http_input','i18n_http_output','i18n_internal_encoding',
+            'i18n_ja_jp_hantozen','i18n_mime_header_decode',
+            'i18n_mime_header_encode','ibase_add_user','ibase_affected_rows',
+            'ibase_backup','ibase_blob_add','ibase_blob_cancel',
+            'ibase_blob_close','ibase_blob_create','ibase_blob_echo',
+            'ibase_blob_get','ibase_blob_import','ibase_blob_info',
+            'ibase_blob_open','ibase_close','ibase_commit','ibase_commit_ret',
+            'ibase_connect','ibase_db_info','ibase_delete_user','ibase_drop_db',
+            'ibase_errcode','ibase_errmsg','ibase_execute','ibase_fetch_assoc',
+            'ibase_fetch_object','ibase_fetch_row','ibase_field_info',
+            'ibase_free_event_handler','ibase_free_query','ibase_free_result',
+            'ibase_gen_id','ibase_maintain_db','ibase_modify_user',
+            'ibase_name_result','ibase_num_fields','ibase_num_params',
+            'ibase_param_info','ibase_pconnect','ibase_prepare','ibase_query',
+            'ibase_restore','ibase_rollback','ibase_rollback_ret',
+            'ibase_server_info','ibase_service_attach','ibase_service_detach',
+            'ibase_set_event_handler','ibase_trans','ibase_wait_event','iconv',
+            'iconv_get_encoding','iconv_mime_decode',
+            'iconv_mime_decode_headers','iconv_mime_encode',
+            'iconv_set_encoding','iconv_strlen','iconv_strpos','iconv_strrpos',
+            'iconv_substr','id3_get_frame_long_name','id3_get_frame_short_name',
+            'id3_get_genre_id','id3_get_genre_list','id3_get_genre_name',
+            'id3_get_tag','id3_get_version','id3_remove_tag','id3_set_tag',
+            'idate','ignore_user_abort','image_type_to_extension',
+            'image_type_to_mime_type','image2wbmp','imagealphablending',
+            'imageantialias','imagearc','imagechar','imagecharup',
+            'imagecolorallocate','imagecolorallocatealpha','imagecolorat',
+            'imagecolorclosest','imagecolorclosestalpha','imagecolordeallocate',
+            'imagecolorexact','imagecolorexactalpha','imagecolormatch',
+            'imagecolorresolve','imagecolorresolvealpha','imagecolorset',
+            'imagecolorsforindex','imagecolorstotal','imagecolortransparent',
+            'imageconvolution','imagecopy','imagecopymerge',
+            'imagecopymergegray','imagecopyresampled','imagecopyresized',
+            'imagecreate','imagecreatefromgd','imagecreatefromgd2',
+            'imagecreatefromgd2part','imagecreatefromgif','imagecreatefromjpeg',
+            'imagecreatefrompng','imagecreatefromstring','imagecreatefromwbmp',
+            'imagecreatefromxbm','imagecreatetruecolor','imagedashedline',
+            'imagedestroy','imageellipse','imagefill','imagefilledarc',
+            'imagefilledellipse','imagefilledpolygon','imagefilledrectangle',
+            'imagefilltoborder','imagefilter','imagefontheight',
+            'imagefontwidth','imageftbbox','imagefttext','imagegammacorrect',
+            'imagegd','imagegd2','imagegif','imagegrabscreen','imagegrabwindow',
+            'imageinterlace','imageistruecolor','imagejpeg','imagelayereffect',
+            'imageline','imageloadfont','imagepalettecopy','imagepng',
+            'imagepolygon','imagepsbbox','imagepsencodefont',
+            'imagepsextendfont','imagepsfreefont','imagepsloadfont',
+            'imagepsslantfont','imagepstext','imagerectangle','imagerotate',
+            'imagesavealpha','imagesetbrush','imagesetpixel','imagesetstyle',
+            'imagesetthickness','imagesettile','imagestring','imagestringup',
+            'imagesx','imagesy','imagetruecolortopalette','imagettfbbox',
+            'imagettftext','imagetypes','imagewbmp','imagexbm','imap_8bit',
+            'imap_alerts','imap_append','imap_base64','imap_binary','imap_body',
+            'imap_bodystruct','imap_check','imap_clearflag_full','imap_close',
+            'imap_create','imap_createmailbox','imap_delete',
+            'imap_deletemailbox','imap_errors','imap_expunge',
+            'imap_fetch_overview','imap_fetchbody','imap_fetchheader',
+            'imap_fetchstructure','imap_fetchtext','imap_get_quota',
+            'imap_get_quotaroot','imap_getacl','imap_getmailboxes',
+            'imap_getsubscribed','imap_header','imap_headerinfo','imap_headers',
+            'imap_last_error','imap_list','imap_listmailbox',
+            'imap_listsubscribed','imap_lsub','imap_mail','imap_mail_compose',
+            'imap_mail_copy','imap_mail_move','imap_mailboxmsginfo',
+            'imap_mime_header_decode','imap_msgno','imap_num_msg',
+            'imap_num_recent','imap_open','imap_ping','imap_qprint',
+            'imap_rename','imap_renamemailbox','imap_reopen',
+            'imap_rfc822_parse_adrlist','imap_rfc822_parse_headers',
+            'imap_rfc822_write_address','imap_savebody','imap_scan',
+            'imap_scanmailbox','imap_search','imap_set_quota','imap_setacl',
+            'imap_setflag_full','imap_sort','imap_status','imap_subscribe',
+            'imap_thread','imap_timeout','imap_uid','imap_undelete',
+            'imap_unsubscribe','imap_utf7_decode','imap_utf7_encode',
+            'imap_utf8','implode','import_request_variables','in_array',
+            'ini_alter','ini_get','ini_get_all','ini_restore','ini_set',
+            'intval','ip2long','iptcembed','iptcparse','isset','is_a',
+            'is_array','is_bool','is_callable','is_dir','is_double',
+            'is_executable','is_file','is_finite','is_float','is_infinite',
+            'is_int','is_integer','is_link','is_long','is_nan','is_null',
+            'is_numeric','is_object','is_readable','is_real','is_resource',
+            'is_scalar','is_soap_fault','is_string','is_subclass_of',
+            'is_uploaded_file','is_writable','is_writeable','iterator_apply',
+            'iterator_count','iterator_to_array','java_last_exception_clear',
+            'java_last_exception_get','jddayofweek','jdmonthname','jdtofrench',
+            'jdtogregorian','jdtojewish','jdtojulian','jdtounix','jewishtojd',
+            'join','jpeg2wbmp','json_decode','json_encode','juliantojd','key',
+            'key_exists','krsort','ksort','lcg_value','ldap_add','ldap_bind',
+            'ldap_close','ldap_compare','ldap_connect','ldap_count_entries',
+            'ldap_delete','ldap_dn2ufn','ldap_err2str','ldap_errno',
+            'ldap_error','ldap_explode_dn','ldap_first_attribute',
+            'ldap_first_entry','ldap_first_reference','ldap_free_result',
+            'ldap_get_attributes','ldap_get_dn','ldap_get_entries',
+            'ldap_get_option','ldap_get_values','ldap_get_values_len',
+            'ldap_list','ldap_mod_add','ldap_mod_del','ldap_mod_replace',
+            'ldap_modify','ldap_next_attribute','ldap_next_entry',
+            'ldap_next_reference','ldap_parse_reference','ldap_parse_result',
+            'ldap_read','ldap_rename','ldap_search','ldap_set_option',
+            'ldap_sort','ldap_start_tls','ldap_unbind','levenshtein',
+            'libxml_clear_errors','libxml_get_errors','libxml_get_last_error',
+            'libxml_set_streams_context','libxml_use_internal_errors','link',
+            'linkinfo','list','localeconv','localtime','log','log1p','log10',
+            'long2ip','lstat','ltrim','lzf_compress','lzf_decompress',
+            'lzf_optimized_for','magic_quotes_runtime','mail','max','mbereg',
+            'mberegi','mberegi_replace','mbereg_match','mbereg_replace',
+            'mbereg_search','mbereg_search_getpos','mbereg_search_getregs',
+            'mbereg_search_init','mbereg_search_pos','mbereg_search_regs',
+            'mbereg_search_setpos','mbregex_encoding','mbsplit','mbstrcut',
+            'mbstrlen','mbstrpos','mbstrrpos','mbsubstr','mb_check_encoding',
+            'mb_convert_case','mb_convert_encoding','mb_convert_kana',
+            'mb_convert_variables','mb_decode_mimeheader',
+            'mb_decode_numericentity','mb_detect_encoding','mb_detect_order',
+            'mb_encode_mimeheader','mb_encode_numericentity','mb_ereg',
+            'mb_eregi','mb_eregi_replace','mb_ereg_match','mb_ereg_replace',
+            'mb_ereg_search','mb_ereg_search_getpos','mb_ereg_search_getregs',
+            'mb_ereg_search_init','mb_ereg_search_pos','mb_ereg_search_regs',
+            'mb_ereg_search_setpos','mb_get_info','mb_http_input',
+            'mb_http_output','mb_internal_encoding','mb_language',
+            'mb_list_encodings','mb_output_handler','mb_parse_str',
+            'mb_preferred_mime_name','mb_regex_encoding','mb_regex_set_options',
+            'mb_send_mail','mb_split','mb_strcut','mb_strimwidth','mb_stripos',
+            'mb_stristr','mb_strlen','mb_strpos','mb_strrchr','mb_strrichr',
+            'mb_strripos','mb_strrpos','mb_strstr','mb_strtolower',
+            'mb_strtoupper','mb_strwidth','mb_substitute_character','mb_substr',
+            'mb_substr_count','mcrypt_cbc','mcrypt_cfb','mcrypt_create_iv',
+            'mcrypt_decrypt','mcrypt_ecb','mcrypt_enc_get_algorithms_name',
+            'mcrypt_enc_get_block_size','mcrypt_enc_get_iv_size',
+            'mcrypt_enc_get_key_size','mcrypt_enc_get_modes_name',
+            'mcrypt_enc_get_supported_key_sizes',
+            'mcrypt_enc_is_block_algorithm',
+            'mcrypt_enc_is_block_algorithm_mode','mcrypt_enc_is_block_mode',
+            'mcrypt_enc_self_test','mcrypt_encrypt','mcrypt_generic',
+            'mcrypt_generic_deinit','mcrypt_generic_end','mcrypt_generic_init',
+            'mcrypt_get_block_size','mcrypt_get_cipher_name',
+            'mcrypt_get_iv_size','mcrypt_get_key_size','mcrypt_list_algorithms',
+            'mcrypt_list_modes','mcrypt_module_close',
+            'mcrypt_module_get_algo_block_size',
+            'mcrypt_module_get_algo_key_size',
+            'mcrypt_module_get_supported_key_sizes',
+            'mcrypt_module_is_block_algorithm',
+            'mcrypt_module_is_block_algorithm_mode',
+            'mcrypt_module_is_block_mode','mcrypt_module_open',
+            'mcrypt_module_self_test','mcrypt_ofb','md5','md5_file',
+            'mdecrypt_generic','memcache_add','memcache_add_server',
+            'memcache_close','memcache_connect','memcache_debug',
+            'memcache_decrement','memcache_delete','memcache_flush',
+            'memcache_get','memcache_get_extended_stats',
+            'memcache_get_server_status','memcache_get_stats',
+            'memcache_get_version','memcache_increment','memcache_pconnect',
+            'memcache_replace','memcache_set','memcache_set_compress_threshold',
+            'memcache_set_server_params','memory_get_peak_usage',
+            'memory_get_usage','metaphone','mhash','mhash_count',
+            'mhash_get_block_size','mhash_get_hash_name','mhash_keygen_s2k',
+            'method_exists','microtime','mime_content_type','min',
+            'ming_keypress','ming_setcubicthreshold','ming_setscale',
+            'ming_useconstants','ming_useswfversion','mkdir','mktime',
+            'money_format','move_uploaded_file','msql','msql_affected_rows',
+            'msql_close','msql_connect','msql_create_db','msql_createdb',
+            'msql_data_seek','msql_db_query','msql_dbname','msql_drop_db',
+            'msql_dropdb','msql_error','msql_fetch_array','msql_fetch_field',
+            'msql_fetch_object','msql_fetch_row','msql_field_flags',
+            'msql_field_len','msql_field_name','msql_field_seek',
+            'msql_field_table','msql_field_type','msql_fieldflags',
+            'msql_fieldlen','msql_fieldname','msql_fieldtable','msql_fieldtype',
+            'msql_free_result','msql_freeresult','msql_list_dbs',
+            'msql_list_fields','msql_list_tables','msql_listdbs',
+            'msql_listfields','msql_listtables','msql_num_fields',
+            'msql_num_rows','msql_numfields','msql_numrows','msql_pconnect',
+            'msql_query','msql_regcase','msql_result','msql_select_db',
+            'msql_selectdb','msql_tablename','mssql_bind','mssql_close',
+            'mssql_connect','mssql_data_seek','mssql_execute',
+            'mssql_fetch_array','mssql_fetch_assoc','mssql_fetch_batch',
+            'mssql_fetch_field','mssql_fetch_object','mssql_fetch_row',
+            'mssql_field_length','mssql_field_name','mssql_field_seek',
+            'mssql_field_type','mssql_free_result','mssql_free_statement',
+            'mssql_get_last_message','mssql_guid_string','mssql_init',
+            'mssql_min_error_severity','mssql_min_message_severity',
+            'mssql_next_result','mssql_num_fields','mssql_num_rows',
+            'mssql_pconnect','mssql_query','mssql_result','mssql_rows_affected',
+            'mssql_select_db','mt_getrandmax','mt_rand','mt_srand','mysql',
+            'mysql_affected_rows','mysql_client_encoding','mysql_close',
+            'mysql_connect','mysql_createdb','mysql_create_db',
+            'mysql_data_seek','mysql_dbname','mysql_db_name','mysql_db_query',
+            'mysql_dropdb','mysql_drop_db','mysql_errno','mysql_error',
+            'mysql_escape_string','mysql_fetch_array','mysql_fetch_assoc',
+            'mysql_fetch_field','mysql_fetch_lengths','mysql_fetch_object',
+            'mysql_fetch_row','mysql_fieldflags','mysql_fieldlen',
+            'mysql_fieldname','mysql_fieldtable','mysql_fieldtype',
+            'mysql_field_flags','mysql_field_len','mysql_field_name',
+            'mysql_field_seek','mysql_field_table','mysql_field_type',
+            'mysql_freeresult','mysql_free_result','mysql_get_client_info',
+            'mysql_get_host_info','mysql_get_proto_info',
+            'mysql_get_server_info','mysql_info','mysql_insert_id',
+            'mysql_listdbs','mysql_listfields','mysql_listtables',
+            'mysql_list_dbs','mysql_list_fields','mysql_list_processes',
+            'mysql_list_tables','mysql_numfields','mysql_numrows',
+            'mysql_num_fields','mysql_num_rows','mysql_pconnect','mysql_ping',
+            'mysql_query','mysql_real_escape_string','mysql_result',
+            'mysql_selectdb','mysql_select_db','mysql_set_charset','mysql_stat',
+            'mysql_tablename','mysql_table_name','mysql_thread_id',
+            'mysql_unbuffered_query','mysqli_affected_rows','mysqli_autocommit',
+            'mysqli_bind_param','mysqli_bind_result','mysqli_change_user',
+            'mysqli_character_set_name','mysqli_client_encoding','mysqli_close',
+            'mysqli_commit','mysqli_connect','mysqli_connect_errno',
+            'mysqli_connect_error','mysqli_data_seek','mysqli_debug',
+            'mysqli_disable_reads_from_master','mysqli_disable_rpl_parse',
+            'mysqli_dump_debug_info','mysqli_embedded_server_end',
+            'mysqli_embedded_server_start','mysqli_enable_reads_from_master',
+            'mysqli_enable_rpl_parse','mysqli_errno','mysqli_error',
+            'mysqli_escape_string','mysqli_execute','mysqli_fetch',
+            'mysqli_fetch_array','mysqli_fetch_assoc','mysqli_fetch_field',
+            'mysqli_fetch_field_direct','mysqli_fetch_fields',
+            'mysqli_fetch_lengths','mysqli_fetch_object','mysqli_fetch_row',
+            'mysqli_field_count','mysqli_field_seek','mysqli_field_tell',
+            'mysqli_free_result','mysqli_get_charset','mysqli_get_client_info',
+            'mysqli_get_client_version','mysqli_get_host_info',
+            'mysqli_get_metadata','mysqli_get_proto_info',
+            'mysqli_get_server_info','mysqli_get_server_version',
+            'mysqli_get_warnings','mysqli_info','mysqli_init',
+            'mysqli_insert_id','mysqli_kill','mysqli_master_query',
+            'mysqli_more_results','mysqli_multi_query','mysqli_next_result',
+            'mysqli_num_fields','mysqli_num_rows','mysqli_options',
+            'mysqli_param_count','mysqli_ping','mysqli_prepare','mysqli_query',
+            'mysqli_real_connect','mysqli_real_escape_string',
+            'mysqli_real_query','mysqli_report','mysqli_rollback',
+            'mysqli_rpl_parse_enabled','mysqli_rpl_probe',
+            'mysqli_rpl_query_type','mysqli_select_db','mysqli_send_long_data',
+            'mysqli_send_query','mysqli_set_charset',
+            'mysqli_set_local_infile_default','mysqli_set_local_infile_handler',
+            'mysqli_set_opt','mysqli_slave_query','mysqli_sqlstate',
+            'mysqli_ssl_set','mysqli_stat','mysqli_stmt_affected_rows',
+            'mysqli_stmt_attr_get','mysqli_stmt_attr_set',
+            'mysqli_stmt_bind_param','mysqli_stmt_bind_result',
+            'mysqli_stmt_close','mysqli_stmt_data_seek','mysqli_stmt_errno',
+            'mysqli_stmt_error','mysqli_stmt_execute','mysqli_stmt_fetch',
+            'mysqli_stmt_field_count','mysqli_stmt_free_result',
+            'mysqli_stmt_get_warnings','mysqli_stmt_init',
+            'mysqli_stmt_insert_id','mysqli_stmt_num_rows',
+            'mysqli_stmt_param_count','mysqli_stmt_prepare','mysqli_stmt_reset',
+            'mysqli_stmt_result_metadata','mysqli_stmt_send_long_data',
+            'mysqli_stmt_sqlstate','mysqli_stmt_store_result',
+            'mysqli_store_result','mysqli_thread_id','mysqli_thread_safe',
+            'mysqli_use_result','mysqli_warning_count','natcasesort','natsort',
+            'new_xmldoc','next','ngettext','nl2br','nl_langinfo',
+            'ntuser_getdomaincontroller','ntuser_getusergroups',
+            'ntuser_getuserinfo','ntuser_getuserlist','number_format',
+            'ob_clean','ob_deflatehandler','ob_end_clean','ob_end_flush',
+            'ob_etaghandler','ob_flush','ob_get_clean','ob_get_contents',
+            'ob_get_flush','ob_get_length','ob_get_level','ob_get_status',
+            'ob_gzhandler','ob_iconv_handler','ob_implicit_flush',
+            'ob_inflatehandler','ob_list_handlers','ob_start','ob_tidyhandler',
+            'octdec','odbc_autocommit','odbc_binmode','odbc_close',
+            'odbc_close_all','odbc_columnprivileges','odbc_columns',
+            'odbc_commit','odbc_connect','odbc_cursor','odbc_data_source',
+            'odbc_do','odbc_error','odbc_errormsg','odbc_exec','odbc_execute',
+            'odbc_fetch_array','odbc_fetch_into','odbc_fetch_object',
+            'odbc_fetch_row','odbc_field_len','odbc_field_name',
+            'odbc_field_num','odbc_field_precision','odbc_field_scale',
+            'odbc_field_type','odbc_foreignkeys','odbc_free_result',
+            'odbc_gettypeinfo','odbc_longreadlen','odbc_next_result',
+            'odbc_num_fields','odbc_num_rows','odbc_pconnect','odbc_prepare',
+            'odbc_primarykeys','odbc_procedurecolumns','odbc_procedures',
+            'odbc_result','odbc_result_all','odbc_rollback','odbc_setoption',
+            'odbc_specialcolumns','odbc_statistics','odbc_tableprivileges',
+            'odbc_tables','opendir','openlog','openssl_csr_export',
+            'openssl_csr_export_to_file','openssl_csr_get_public_key',
+            'openssl_csr_get_subject','openssl_csr_new','openssl_csr_sign',
+            'openssl_error_string','openssl_free_key','openssl_get_privatekey',
+            'openssl_get_publickey','openssl_open','openssl_pkcs12_export',
+            'openssl_pkcs12_export_to_file','openssl_pkcs12_read',
+            'openssl_pkcs7_decrypt','openssl_pkcs7_encrypt',
+            'openssl_pkcs7_sign','openssl_pkcs7_verify','openssl_pkey_export',
+            'openssl_pkey_export_to_file','openssl_pkey_free',
+            'openssl_pkey_get_details','openssl_pkey_get_private',
+            'openssl_pkey_get_public','openssl_pkey_new',
+            'openssl_private_decrypt','openssl_private_encrypt',
+            'openssl_public_decrypt','openssl_public_encrypt','openssl_seal',
+            'openssl_sign','openssl_verify','openssl_x509_checkpurpose',
+            'openssl_x509_check_private_key','openssl_x509_export',
+            'openssl_x509_export_to_file','openssl_x509_free',
+            'openssl_x509_parse','openssl_x509_read','ord',
+            'output_add_rewrite_var','output_reset_rewrite_vars','overload',
+            'outputdebugstring','pack','parse_ini_file','parse_str','parse_url',
+            'parsekit_compile_file','parsekit_compile_string',
+            'parsekit_func_arginfo','parsekit_opcode_flags',
+            'parsekit_opcode_name','passthru','pathinfo','pclose',
+            'pdf_add_bookmark','pdf_add_launchlink','pdf_add_locallink',
+            'pdf_add_nameddest','pdf_add_note','pdf_add_pdflink',
+            'pdf_add_thumbnail','pdf_add_weblink','pdf_arc','pdf_arcn',
+            'pdf_attach_file','pdf_begin_font','pdf_begin_glyph',
+            'pdf_begin_page','pdf_begin_pattern','pdf_begin_template',
+            'pdf_circle','pdf_clip','pdf_close','pdf_close_image',
+            'pdf_close_pdi','pdf_close_pdi_page','pdf_closepath',
+            'pdf_closepath_fill_stroke','pdf_closepath_stroke','pdf_concat',
+            'pdf_continue_text','pdf_create_gstate','pdf_create_pvf',
+            'pdf_curveto','pdf_delete','pdf_delete_pvf','pdf_encoding_set_char',
+            'pdf_end_font','pdf_end_glyph','pdf_end_page','pdf_end_pattern',
+            'pdf_end_template','pdf_endpath','pdf_fill','pdf_fill_imageblock',
+            'pdf_fill_pdfblock','pdf_fill_stroke','pdf_fill_textblock',
+            'pdf_findfont','pdf_fit_image','pdf_fit_pdi_page',
+            'pdf_fit_textline','pdf_get_apiname','pdf_get_buffer',
+            'pdf_get_errmsg','pdf_get_errnum','pdf_get_parameter',
+            'pdf_get_pdi_parameter','pdf_get_pdi_value','pdf_get_value',
+            'pdf_initgraphics','pdf_lineto','pdf_load_font',
+            'pdf_load_iccprofile','pdf_load_image','pdf_makespotcolor',
+            'pdf_moveto','pdf_new','pdf_open_ccitt','pdf_open_file',
+            'pdf_open_image','pdf_open_image_file','pdf_open_pdi',
+            'pdf_open_pdi_page','pdf_place_image','pdf_place_pdi_page',
+            'pdf_process_pdi','pdf_rect','pdf_restore','pdf_rotate','pdf_save',
+            'pdf_scale','pdf_set_border_color','pdf_set_border_dash',
+            'pdf_set_border_style','pdf_set_gstate','pdf_set_info',
+            'pdf_set_parameter','pdf_set_text_pos','pdf_set_value',
+            'pdf_setcolor','pdf_setdash','pdf_setdashpattern','pdf_setflat',
+            'pdf_setfont','pdf_setlinecap','pdf_setlinejoin','pdf_setlinewidth',
+            'pdf_setmatrix','pdf_setmiterlimit','pdf_setpolydash','pdf_shading',
+            'pdf_shading_pattern','pdf_shfill','pdf_show','pdf_show_boxed',
+            'pdf_show_xy','pdf_skew','pdf_stringwidth','pdf_stroke',
+            'pdf_translate','pdo_drivers','pfsockopen','pg_affected_rows',
+            'pg_cancel_query','pg_clientencoding','pg_client_encoding',
+            'pg_close','pg_cmdtuples','pg_connect','pg_connection_busy',
+            'pg_connection_reset','pg_connection_status','pg_convert',
+            'pg_copy_from','pg_copy_to','pg_dbname','pg_delete','pg_end_copy',
+            'pg_errormessage','pg_escape_bytea','pg_escape_string','pg_exec',
+            'pg_execute','pg_fetch_all','pg_fetch_all_columns','pg_fetch_array',
+            'pg_fetch_assoc','pg_fetch_object','pg_fetch_result','pg_fetch_row',
+            'pg_fieldisnull','pg_fieldname','pg_fieldnum','pg_fieldprtlen',
+            'pg_fieldsize','pg_fieldtype','pg_field_is_null','pg_field_name',
+            'pg_field_num','pg_field_prtlen','pg_field_size','pg_field_table',
+            'pg_field_type','pg_field_type_oid','pg_free_result',
+            'pg_freeresult','pg_get_notify','pg_get_pid','pg_get_result',
+            'pg_getlastoid','pg_host','pg_insert','pg_last_error',
+            'pg_last_notice','pg_last_oid','pg_loclose','pg_locreate',
+            'pg_loexport','pg_loimport','pg_loopen','pg_loread','pg_loreadall',
+            'pg_lounlink','pg_lowrite','pg_lo_close','pg_lo_create',
+            'pg_lo_export','pg_lo_import','pg_lo_open','pg_lo_read',
+            'pg_lo_read_all','pg_lo_seek','pg_lo_tell','pg_lo_unlink',
+            'pg_lo_write','pg_meta_data','pg_numfields','pg_numrows',
+            'pg_num_fields','pg_num_rows','pg_options','pg_parameter_status',
+            'pg_pconnect','pg_ping','pg_port','pg_prepare','pg_put_line',
+            'pg_query','pg_query_params','pg_result','pg_result_error',
+            'pg_result_error_field','pg_result_seek','pg_result_status',
+            'pg_select','pg_send_execute','pg_send_prepare','pg_send_query',
+            'pg_send_query_params','pg_set_client_encoding',
+            'pg_set_error_verbosity','pg_setclientencoding','pg_trace',
+            'pg_transaction_status','pg_tty','pg_unescape_bytea','pg_untrace',
+            'pg_update','pg_version','php_egg_logo_guid','php_ini_loaded_file',
+            'php_ini_scanned_files','php_logo_guid','php_real_logo_guid',
+            'php_sapi_name','php_strip_whitespace','php_uname','phpcredits',
+            'phpdoc_xml_from_string','phpinfo','phpversion','pi','png2wbmp',
+            'pop3_close','pop3_delete_message','pop3_get_account_size',
+            'pop3_get_message','pop3_get_message_count',
+            'pop3_get_message_header','pop3_get_message_ids',
+            'pop3_get_message_size','pop3_get_message_sizes','pop3_open',
+            'pop3_undelete','popen','pos','posix_ctermid','posix_errno',
+            'posix_getcwd','posix_getegid','posix_geteuid','posix_getgid',
+            'posix_getgrgid','posix_getgrnam','posix_getgroups',
+            'posix_getlogin','posix_getpgid','posix_getpgrp','posix_getpid',
+            'posix_getppid','posix_getpwnam','posix_getpwuid','posix_getrlimit',
+            'posix_getsid','posix_getuid','posix_get_last_error','posix_isatty',
+            'posix_kill','posix_mkfifo','posix_setegid','posix_seteuid',
+            'posix_setgid','posix_setpgid','posix_setsid','posix_setuid',
+            'posix_strerror','posix_times','posix_ttyname','posix_uname','pow',
+            'preg_grep','preg_last_error','preg_match','preg_match_all',
+            'preg_quote','preg_replace','preg_replace_callback','preg_split',
+            'prev','print_r','printf','proc_close','proc_get_status',
+            'proc_open','proc_terminate','putenv','quoted_printable_decode',
+            'quotemeta','rad2deg','radius_acct_open','radius_add_server',
+            'radius_auth_open','radius_close','radius_config',
+            'radius_create_request','radius_cvt_addr','radius_cvt_int',
+            'radius_cvt_string','radius_demangle','radius_demangle_mppe_key',
+            'radius_get_attr','radius_get_vendor_attr','radius_put_addr',
+            'radius_put_attr','radius_put_int','radius_put_string',
+            'radius_put_vendor_addr','radius_put_vendor_attr',
+            'radius_put_vendor_int','radius_put_vendor_string',
+            'radius_request_authenticator','radius_send_request',
+            'radius_server_secret','radius_strerror','rand','range',
+            'rawurldecode','rawurlencode','read_exif_data','readdir','readfile',
+            'readgzfile','readlink','realpath','reg_close_key','reg_create_key',
+            'reg_enum_key','reg_enum_value','reg_get_value','reg_open_key',
+            'reg_set_value','register_shutdown_function',
+            'register_tick_function','rename','res_close','res_get','res_list',
+            'res_list_type','res_open','res_set','reset',
+            'restore_error_handler','restore_include_path','rewind','rewinddir',
+            'rmdir','round','rsort','rtrim','runkit_class_adopt',
+            'runkit_class_emancipate','runkit_constant_add',
+            'runkit_constant_redefine','runkit_constant_remove',
+            'runkit_default_property_add','runkit_function_add',
+            'runkit_function_copy','runkit_function_redefine',
+            'runkit_function_remove','runkit_function_rename','runkit_import',
+            'runkit_lint','runkit_lint_file','runkit_method_add',
+            'runkit_method_copy','runkit_method_redefine',
+            'runkit_method_remove','runkit_method_rename','runkit_object_id',
+            'runkit_return_value_used','runkit_sandbox_output_handler',
+            'runkit_superglobals','runkit_zval_inspect','scandir','sem_acquire',
+            'sem_get','sem_release','sem_remove','serialize',
+            'session_cache_expire','session_cache_limiter','session_commit',
+            'session_decode','session_destroy','session_encode',
+            'session_get_cookie_params','session_id','session_is_registered',
+            'session_module_name','session_name','session_regenerate_id',
+            'session_register','session_save_path','session_set_cookie_params',
+            'session_set_save_handler','session_start','session_unregister',
+            'session_unset','session_write_close','set_content',
+            'set_error_handler','set_file_buffer','set_include_path',
+            'set_magic_quotes_runtime','set_socket_blocking','set_time_limit',
+            'setcookie','setlocale','setrawcookie','settype','sha1','sha1_file',
+            'shell_exec','shmop_close','shmop_delete','shmop_open','shmop_read',
+            'shmop_size','shmop_write','shm_attach','shm_detach','shm_get_var',
+            'shm_put_var','shm_remove','shm_remove_var','show_source','shuffle',
+            'similar_text','simplexml_import_dom','simplexml_load_file',
+            'simplexml_load_string','sin','sinh','sizeof','sleep','smtp_close',
+            'smtp_cmd_data','smtp_cmd_mail','smtp_cmd_rcpt','smtp_connect',
+            'snmp_get_quick_print','snmp_get_valueretrieval','snmp_read_mib',
+            'snmp_set_quick_print','snmp_set_valueretrieval','snmp2_get',
+            'snmp2_getnext','snmp2_real_walk','snmp2_set','snmp2_walk',
+            'snmp3_get','snmp3_getnext','snmp3_real_walk','snmp3_set',
+            'snmp3_walk','snmpget','snmpgetnext','snmprealwalk','snmpset',
+            'snmpwalk','snmpwalkoid','socket_accept','socket_bind',
+            'socket_clear_error','socket_close','socket_connect',
+            'socket_create','socket_create_listen','socket_create_pair',
+            'socket_getopt','socket_getpeername','socket_getsockname',
+            'socket_get_option','socket_get_status','socket_iovec_add',
+            'socket_iovec_alloc','socket_iovec_delete','socket_iovec_fetch',
+            'socket_iovec_free','socket_iovec_set','socket_last_error',
+            'socket_listen','socket_read','socket_readv','socket_recv',
+            'socket_recvfrom','socket_recvmsg','socket_select','socket_send',
+            'socket_sendmsg','socket_sendto','socket_setopt','socket_set_block',
+            'socket_set_blocking','socket_set_nonblock','socket_set_option',
+            'socket_set_timeout','socket_shutdown','socket_strerror',
+            'socket_write','socket_writev','sort','soundex','spl_autoload',
+            'spl_autoload_call','spl_autoload_extensions',
+            'spl_autoload_functions','spl_autoload_register',
+            'spl_autoload_unregister','spl_classes','spl_object_hash','split',
+            'spliti','sprintf','sql_regcase','sqlite_array_query',
+            'sqlite_busy_timeout','sqlite_changes','sqlite_close',
+            'sqlite_column','sqlite_create_aggregate','sqlite_create_function',
+            'sqlite_current','sqlite_error_string','sqlite_escape_string',
+            'sqlite_exec','sqlite_factory','sqlite_fetch_all',
+            'sqlite_fetch_array','sqlite_fetch_column_types',
+            'sqlite_fetch_object','sqlite_fetch_single','sqlite_fetch_string',
+            'sqlite_field_name','sqlite_has_more','sqlite_has_prev',
+            'sqlite_last_error','sqlite_last_insert_rowid','sqlite_libencoding',
+            'sqlite_libversion','sqlite_next','sqlite_num_fields',
+            'sqlite_num_rows','sqlite_open','sqlite_popen','sqlite_prev',
+            'sqlite_query','sqlite_rewind','sqlite_seek','sqlite_single_query',
+            'sqlite_udf_decode_binary','sqlite_udf_encode_binary',
+            'sqlite_unbuffered_query','sqlite_valid','sqrt','srand','sscanf',
+            'ssh2_auth_hostbased_file','ssh2_auth_none','ssh2_auth_password',
+            'ssh2_auth_pubkey_file','ssh2_connect','ssh2_exec',
+            'ssh2_fetch_stream','ssh2_fingerprint','ssh2_forward_accept',
+            'ssh2_forward_listen','ssh2_methods_negotiated','ssh2_poll',
+            'ssh2_publickey_add','ssh2_publickey_init','ssh2_publickey_list',
+            'ssh2_publickey_remove','ssh2_scp_recv','ssh2_scp_send','ssh2_sftp',
+            'ssh2_sftp_lstat','ssh2_sftp_mkdir','ssh2_sftp_readlink',
+            'ssh2_sftp_realpath','ssh2_sftp_rename','ssh2_sftp_rmdir',
+            'ssh2_sftp_stat','ssh2_sftp_symlink','ssh2_sftp_unlink',
+            'ssh2_shell','ssh2_tunnel','stat','stats_absolute_deviation',
+            'stats_cdf_beta','stats_cdf_binomial','stats_cdf_cauchy',
+            'stats_cdf_chisquare','stats_cdf_exponential','stats_cdf_f',
+            'stats_cdf_gamma','stats_cdf_laplace','stats_cdf_logistic',
+            'stats_cdf_negative_binomial','stats_cdf_noncentral_chisquare',
+            'stats_cdf_noncentral_f','stats_cdf_noncentral_t',
+            'stats_cdf_normal','stats_cdf_poisson','stats_cdf_t',
+            'stats_cdf_uniform','stats_cdf_weibull','stats_covariance',
+            'stats_dens_beta','stats_dens_cauchy','stats_dens_chisquare',
+            'stats_dens_exponential','stats_dens_f','stats_dens_gamma',
+            'stats_dens_laplace','stats_dens_logistic','stats_dens_normal',
+            'stats_dens_pmf_binomial','stats_dens_pmf_hypergeometric',
+            'stats_dens_pmf_negative_binomial','stats_dens_pmf_poisson',
+            'stats_dens_t','stats_dens_uniform','stats_dens_weibull',
+            'stats_harmonic_mean','stats_kurtosis','stats_rand_gen_beta',
+            'stats_rand_gen_chisquare','stats_rand_gen_exponential',
+            'stats_rand_gen_f','stats_rand_gen_funiform','stats_rand_gen_gamma',
+            'stats_rand_gen_ipoisson','stats_rand_gen_iuniform',
+            'stats_rand_gen_noncenral_f','stats_rand_gen_noncentral_chisquare',
+            'stats_rand_gen_noncentral_t','stats_rand_gen_normal',
+            'stats_rand_gen_t','stats_rand_getsd','stats_rand_ibinomial',
+            'stats_rand_ibinomial_negative','stats_rand_ignlgi',
+            'stats_rand_phrase_to_seeds','stats_rand_ranf','stats_rand_setall',
+            'stats_skew','stats_standard_deviation','stats_stat_binomial_coef',
+            'stats_stat_correlation','stats_stat_factorial',
+            'stats_stat_independent_t','stats_stat_innerproduct',
+            'stats_stat_paired_t','stats_stat_percentile','stats_stat_powersum',
+            'stats_variance','strcasecmp','strchr','strcmp','strcoll','strcspn',
+            'stream_bucket_append','stream_bucket_make_writeable',
+            'stream_bucket_new','stream_bucket_prepend','stream_context_create',
+            'stream_context_get_default','stream_context_get_options',
+            'stream_context_set_default','stream_context_set_option',
+            'stream_context_set_params','stream_copy_to_stream',
+            'stream_encoding','stream_filter_append','stream_filter_prepend',
+            'stream_filter_register','stream_filter_remove',
+            'stream_get_contents','stream_get_filters','stream_get_line',
+            'stream_get_meta_data','stream_get_transports',
+            'stream_get_wrappers','stream_is_local',
+            'stream_notification_callback','stream_register_wrapper',
+            'stream_resolve_include_path','stream_select','stream_set_blocking',
+            'stream_set_timeout','stream_set_write_buffer',
+            'stream_socket_accept','stream_socket_client',
+            'stream_socket_enable_crypto','stream_socket_get_name',
+            'stream_socket_pair','stream_socket_recvfrom',
+            'stream_socket_sendto','stream_socket_server',
+            'stream_socket_shutdown','stream_supports_lock',
+            'stream_wrapper_register','stream_wrapper_restore',
+            'stream_wrapper_unregister','strftime','stripcslashes','stripos',
+            'stripslashes','strip_tags','stristr','strlen','strnatcasecmp',
+            'strnatcmp','strpbrk','strncasecmp','strncmp','strpos','strrchr',
+            'strrev','strripos','strrpos','strspn','strstr','strtok',
+            'strtolower','strtotime','strtoupper','strtr','strval',
+            'str_ireplace','str_pad','str_repeat','str_replace','str_rot13',
+            'str_split','str_shuffle','str_word_count','substr',
+            'substr_compare','substr_count','substr_replace','svn_add',
+            'svn_auth_get_parameter','svn_auth_set_parameter','svn_cat',
+            'svn_checkout','svn_cleanup','svn_client_version','svn_commit',
+            'svn_diff','svn_export','svn_fs_abort_txn','svn_fs_apply_text',
+            'svn_fs_begin_txn2','svn_fs_change_node_prop','svn_fs_check_path',
+            'svn_fs_contents_changed','svn_fs_copy','svn_fs_delete',
+            'svn_fs_dir_entries','svn_fs_file_contents','svn_fs_file_length',
+            'svn_fs_is_dir','svn_fs_is_file','svn_fs_make_dir',
+            'svn_fs_make_file','svn_fs_node_created_rev','svn_fs_node_prop',
+            'svn_fs_props_changed','svn_fs_revision_prop',
+            'svn_fs_revision_root','svn_fs_txn_root','svn_fs_youngest_rev',
+            'svn_import','svn_info','svn_log','svn_ls','svn_repos_create',
+            'svn_repos_fs','svn_repos_fs_begin_txn_for_commit',
+            'svn_repos_fs_commit_txn','svn_repos_hotcopy','svn_repos_open',
+            'svn_repos_recover','svn_status','svn_update','symlink',
+            'sys_get_temp_dir','syslog','system','tan','tanh','tempnam',
+            'textdomain','thread_get','thread_include','thread_lock',
+            'thread_lock_try','thread_mutex_destroy','thread_mutex_init',
+            'thread_set','thread_start','thread_unlock','tidy_access_count',
+            'tidy_clean_repair','tidy_config_count','tidy_diagnose',
+            'tidy_error_count','tidy_get_body','tidy_get_config',
+            'tidy_get_error_buffer','tidy_get_head','tidy_get_html',
+            'tidy_get_html_ver','tidy_get_output','tidy_get_release',
+            'tidy_get_root','tidy_get_status','tidy_getopt','tidy_is_xhtml',
+            'tidy_is_xml','tidy_parse_file','tidy_parse_string',
+            'tidy_repair_file','tidy_repair_string','tidy_warning_count','time',
+            'timezone_abbreviations_list','timezone_identifiers_list',
+            'timezone_name_from_abbr','timezone_name_get','timezone_offset_get',
+            'timezone_open','timezone_transitions_get','tmpfile',
+            'token_get_all','token_name','touch','trigger_error',
+            'transliterate','transliterate_filters_get','trim','uasort',
+            'ucfirst','ucwords','uksort','umask','uniqid','unixtojd','unlink',
+            'unpack','unregister_tick_function','unserialize','unset',
+            'urldecode','urlencode','user_error','use_soap_error_handler',
+            'usleep','usort','utf8_decode','utf8_encode','var_dump',
+            'var_export','variant_abs','variant_add','variant_and',
+            'variant_cast','variant_cat','variant_cmp',
+            'variant_date_from_timestamp','variant_date_to_timestamp',
+            'variant_div','variant_eqv','variant_fix','variant_get_type',
+            'variant_idiv','variant_imp','variant_int','variant_mod',
+            'variant_mul','variant_neg','variant_not','variant_or',
+            'variant_pow','variant_round','variant_set','variant_set_type',
+            'variant_sub','variant_xor','version_compare','virtual','vfprintf',
+            'vprintf','vsprintf','wddx_add_vars','wddx_deserialize',
+            'wddx_packet_end','wddx_packet_start','wddx_serialize_value',
+            'wddx_serialize_vars','win_beep','win_browse_file',
+            'win_browse_folder','win_create_link','win_message_box',
+            'win_play_wav','win_shell_execute','win32_create_service',
+            'win32_delete_service','win32_get_last_control_message',
+            'win32_ps_list_procs','win32_ps_stat_mem','win32_ps_stat_proc',
+            'win32_query_service_status','win32_scheduler_delete_task',
+            'win32_scheduler_enum_tasks','win32_scheduler_get_task_info',
+            'win32_scheduler_run','win32_scheduler_set_task_info',
+            'win32_set_service_status','win32_start_service',
+            'win32_start_service_ctrl_dispatcher','win32_stop_service',
+            'wordwrap','xml_error_string','xml_get_current_byte_index',
+            'xml_get_current_column_number','xml_get_current_line_number',
+            'xml_get_error_code','xml_parse','xml_parser_create',
+            'xml_parser_create_ns','xml_parser_free','xml_parser_get_option',
+            'xml_parser_set_option','xml_parse_into_struct',
+            'xml_set_character_data_handler','xml_set_default_handler',
+            'xml_set_element_handler','xml_set_end_namespace_decl_handler',
+            'xml_set_external_entity_ref_handler',
+            'xml_set_notation_decl_handler','xml_set_object',
+            'xml_set_processing_instruction_handler',
+            'xml_set_start_namespace_decl_handler',
+            'xml_set_unparsed_entity_decl_handler','xmldoc','xmldocfile',
+            'xmlrpc_decode','xmlrpc_decode_request','xmlrpc_encode',
+            'xmlrpc_encode_request','xmlrpc_get_type','xmlrpc_is_fault',
+            'xmlrpc_parse_method_descriptions',
+            'xmlrpc_server_add_introspection_data','xmlrpc_server_call_method',
+            'xmlrpc_server_create','xmlrpc_server_destroy',
+            'xmlrpc_server_register_introspection_callback',
+            'xmlrpc_server_register_method','xmlrpc_set_type','xmltree',
+            'xmlwriter_end_attribute','xmlwriter_end_cdata',
+            'xmlwriter_end_comment','xmlwriter_end_document',
+            'xmlwriter_end_dtd','xmlwriter_end_dtd_attlist',
+            'xmlwriter_end_dtd_element','xmlwriter_end_dtd_entity',
+            'xmlwriter_end_element','xmlwriter_end_pi','xmlwriter_flush',
+            'xmlwriter_full_end_element','xmlwriter_open_memory',
+            'xmlwriter_open_uri','xmlwriter_output_memory',
+            'xmlwriter_set_indent','xmlwriter_set_indent_string',
+            'xmlwriter_start_attribute','xmlwriter_start_attribute_ns',
+            'xmlwriter_start_cdata','xmlwriter_start_comment',
+            'xmlwriter_start_document','xmlwriter_start_dtd',
+            'xmlwriter_start_dtd_attlist','xmlwriter_start_dtd_element',
+            'xmlwriter_start_dtd_entity','xmlwriter_start_element',
+            'xmlwriter_start_element_ns','xmlwriter_start_pi','xmlwriter_text',
+            'xmlwriter_write_attribute','xmlwriter_write_attribute_ns',
+            'xmlwriter_write_cdata','xmlwriter_write_comment',
+            'xmlwriter_write_dtd','xmlwriter_write_dtd_attlist',
+            'xmlwriter_write_dtd_element','xmlwriter_write_dtd_entity',
+            'xmlwriter_write_element','xmlwriter_write_element_ns',
+            'xmlwriter_write_pi','xmlwriter_write_raw','xpath_eval',
+            'xpath_eval_expression','xpath_new_context','xpath_register_ns',
+            'xpath_register_ns_auto','xptr_eval','xptr_new_context','yp_all',
+            'yp_cat','yp_errno','yp_err_string','yp_first',
+            'yp_get_default_domain','yp_master','yp_match','yp_next','yp_order',
+            'zend_current_obfuscation_level','zend_get_cfg_var','zend_get_id',
+            'zend_loader_current_file','zend_loader_enabled',
+            'zend_loader_file_encoded','zend_loader_file_licensed',
+            'zend_loader_install_license','zend_loader_version',
+            'zend_logo_guid','zend_match_hostmasks','zend_obfuscate_class_name',
+            'zend_obfuscate_function_name','zend_optimizer_version',
+            'zend_runtime_obfuscate','zend_version','zip_close',
+            'zip_entry_close','zip_entry_compressedsize',
+            'zip_entry_compressionmethod','zip_entry_filesize','zip_entry_name',
+            'zip_entry_open','zip_entry_read','zip_open','zip_read',
+            'zlib_get_coding_type'
+            ),
+        4 => array(
+            'DEFAULT_INCLUDE_PATH', 'DIRECTORY_SEPARATOR', 'E_ALL',
+            'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_CORE_ERROR',
+            'E_CORE_WARNING', 'E_ERROR', 'E_NOTICE', 'E_PARSE', 'E_STRICT',
+            'E_USER_ERROR', 'E_USER_NOTICE', 'E_USER_WARNING', 'E_WARNING',
+            'ENT_COMPAT','ENT_QUOTES','ENT_NOQUOTES',
+            'false', 'null', 'PEAR_EXTENSION_DIR', 'PEAR_INSTALL_DIR',
+            'PHP_BINDIR', 'PHP_CONFIG_FILE_PATH', 'PHP_DATADIR',
+            'PHP_EXTENSION_DIR', 'PHP_LIBDIR',
+            'PHP_LOCALSTATEDIR', 'PHP_OS',
+            'PHP_OUTPUT_HANDLER_CONT', 'PHP_OUTPUT_HANDLER_END',
+            'PHP_OUTPUT_HANDLER_START', 'PHP_SYSCONFDIR',
+            'PHP_VERSION', 'true', '__CLASS__', '__FILE__', '__FUNCTION__',
+            '__LINE__', '__METHOD__'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<'.'%', '<'.'%=', '%'.'>', '<'.'?', '<'.'?=', '?'.'>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000;',
+            4 => 'color: #009900; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #0000cc; font-style: italic;',
+            4 => 'color: #009933; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #006699; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold; font-style: italic;',
+            6 => 'color: #009933; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.php.net/{FNAMEL}',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<'.'?php' => '?'.'>'
+            ),
+        1 => array(
+            '<'.'?' => '?'.'>'
+            ),
+        2 => array(
+            '<'.'%' => '%'.'>'
+            ),
+        3 => array(
+            '<script language="php">' => '</script>'
+            ),
+        4 => "/(?P<start><\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?(?:\\?>|$))|".
+            "#(?>.*?(?:\\?>|$))|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*?(?P<end>\\?>|\Z)/sm",
+        5 => "/(?P<start><%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?(?:%>|$))|".
+            "#(?>.*?(?:%>|$))|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*?(?P<end>%>|\Z)/sm",
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/pic16.php b/vendor/easybook/geshi/geshi/pic16.php
new file mode 100755
index 000000000..2e28f17b6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pic16.php
@@ -0,0 +1,139 @@
+<?php
+/*************************************************************************************
+ * pic16.php
+ * -------
+ * Author: Phil Mattison (mattison@ohmikron.com)
+ * Copyright: (c) 2008 Ohmikron Corp. (http://www.ohmikron.com/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/07/30
+ *
+ * PIC16 Assembler language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/30 (1.0.8)
+ *   -  First Release
+ *
+ * TODO (updated 2008/07/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PIC16',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*Instructions*/
+        1 => array(
+            'addcf','adddcf','addlw','addwf','andlw','andwf','bc','bcf','bdc',
+            'bnc','bndc','bnz','bsf','btfsc','btfss','bz','call','clrc','clrdc',
+            'clrf','clrw','clrwdt','clrz','comf','decf','goto','incf','incfsz',
+            'iorlw','iorwf','lcall','lgoto','movf','movfw','movlw','movwf',
+            'option','negf','nop','retfie','retlw','return','rlf','rrf','setc',
+            'setdc','setz','skpc','skpdc','skpnc','skpndc','skpnz','skpz',
+            'sleep','subcf','subdcf','sublw','subwf','swapf','tris','tstf',
+            'xorlw','xorwf'
+            ),
+        /*Registers*/
+        2 => array(
+            'INDF','TMR0','OPTION','PCL','STATUS','FSR','PORTA','PORTB','PORTC',
+            'PORTD','PORTE','PORTF','TRISA','TRISB','TRISC','TRISD','TRISE',
+            'TRISF','PCLATH','INTCON','PIR1','PIE1','PCON','CMCON','VRCON',
+            'F','W'
+            ),
+        /*Directives*/
+        3 => array(
+            '_BADRAM','BANKISEL','BANKSEL','CBLOCK','CODE','_CONFIG','CONSTANT',
+            'DA','DATA','DB','DE','#DEFINE','DT','DW','ELSE','END','ENDC',
+            'ENDIF','ENDM','ENDW','EQU','ERROR','ERRORLEVEL','EXITM','EXPAND',
+            'EXTERN','FILL','GLOBAL','IDATA','_IDLOCS','IF','IFDEF','IFNDEF',
+            'INCLUDE','#INCLUDE','LIST','LOCAL','MACRO','_MAXRAM','MESSG',
+            'NOEXPAND','NOLIST','ORG','PAGE','PAGESEL','PROCESSOR','RADIX',
+            'RES','SET','SPACE','SUBTITLE','TITLE','UDATA','UDATA_ACS',
+            'UDATA_OVR','UDATA_SHR','#UNDEFINE','VARIABLE','WHILE',
+            'D','H','O','B','A'
+            ),
+        ),
+    'SYMBOLS' => array('=','.',',',':'),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000a0; font-weight: bold;',
+            2 => 'color: #aa3300; font-weight: bold;',
+            3 => 'color: #0000ff;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00a000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff7700;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff7700;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #7777ff;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX,
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "a-zA-Z0-9\$_\|\#>|^",
+            'DISALLOWED_AFTER' => "a-zA-Z0-9_<\|%"
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/pike.php b/vendor/easybook/geshi/geshi/pike.php
new file mode 100755
index 000000000..dcc53092d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pike.php
@@ -0,0 +1,101 @@
+<?php
+/*************************************************************************************
+ * pike.php
+ * --------
+ * Author: Rick E. (codeblock@eighthbit.net)
+ * Copyright: (c) 2009 Rick E.
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/12/10
+ *
+ * Pike language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/12/25 (1.0.8.6)
+ *  -  First Release
+ *
+ * TODO (updated 2009/12/25)
+ * -------------------------
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Pike',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'goto', 'break', 'continue', 'return', 'case', 'default', 'if',
+            'else', 'switch', 'while', 'foreach', 'do', 'for', 'gauge',
+            'destruct', 'lambda', 'inherit', 'import', 'typeof', 'catch',
+            'inline', 'nomask', 'private', 'protected', 'public', 'static'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '!', '&', '|', '?', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/pixelbender.php b/vendor/easybook/geshi/geshi/pixelbender.php
new file mode 100755
index 000000000..6a2c8dea0
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pixelbender.php
@@ -0,0 +1,174 @@
+<?php
+/*************************************************************************************
+ * pixelbender.php
+ * ----------------
+ * Author: Richard Olsson (r@richardolsson.se)
+ * Copyright: (c) 2008 Richard Olsson (richardolsson.se)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/11/16
+ *
+ * Pixel Bender 1.0 language file for GeSHi.
+ *
+ *
+ * Please feel free to modify this file, although I would greatly appreciate
+ * it if you would then send some feedback on why the file needed to be
+ * changed, using the e-mail address above.
+ *
+ *
+ * The colors are inspired by those used in the Pixel Bender Toolkit, with
+ * some slight modifications.
+ *
+ * For more info on Pixel Bender, see the Adobe Labs Wiki article at
+ * http://labs.adobe.com/wiki/index.php/Pixel_Bender_Toolkit.
+ *
+ * Keyword groups are defined as follows (groups marked with an asterisk
+ * inherit their names from terminology used in the language specification
+ * included with the Pixel Bender Toolkit, see URL above.)
+ *
+ *  1. languageVersion & kernel keywords
+ *  2. Kernel Members *
+ *  3. Types *
+ *  4. Statements * & qualifiers (in, out, inout)
+ *  5. Built-in functions *
+ *  6. Meta-data names
+ *  7. Preprocessor & Pre-defined symbols *
+ *
+ *
+ * CHANGES
+ * -------
+ * 2008/11/16 (1.0.8.2)
+ *  - Initial release
+ *
+ * TODO (updated 2008/11/16)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Pixel Bender 1.0',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'languageVersion', 'kernel'
+            ),
+        2 => array(
+            'import', 'parameter', 'dependent', 'const', 'input', 'output',
+            'evaluatePixel', 'evaluateDependents', 'needed', 'changed', 'generated'
+            ),
+        3 => array(
+            'bool', 'bool2', 'bool3', 'bool4', 'int', 'int2', 'int3', 'int4',
+            'float', 'float2', 'float3', 'float4', 'float2x2', 'float3x3', 'float4x4',
+            'pixel2', 'pixel3', 'pixel4', 'region', 'image1', 'image2', 'image3', 'image4',
+            'imageRef', 'void'
+            ),
+        4 => array(
+            'in', 'out', 'inout', 'if', 'else', 'for', 'while', 'do', 'break',
+            'continue', 'return'
+            ),
+        5 => array(
+            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'pow',
+            'exp', 'exp2', 'log', 'log2', 'sqrt', 'inverseSqrt', 'abs', 'sign', 'floor',
+            'ceil', 'fract', 'mod', 'min', 'max', 'step', 'clamp', 'mix', 'smoothStep',
+            'length', 'distance', 'dot', 'cross', 'normalize', 'matrixCompMult', 'lessThan',
+            'lessThanEqual', 'greaterThan', 'greaterThanEqual', 'equal', 'notEqual', 'any',
+            'all', 'not', 'nowhere', 'everywhere', 'transform', 'union', 'intersect',
+            'outset', 'inset', 'bounds', 'isEmpty', 'sample', 'sampleLinear', 'sampleNearest',
+            'outCoord', 'dod', 'pixelSize', 'pixelAspectRatio'
+            ),
+        6 => array(
+            'namespace', 'vendor', 'version', 'minValue', 'maxValue', 'defaultValue', 'description'
+            ),
+        7 => array(
+            '#if', '#endif', '#ifdef', '#elif', 'defined', '#define',
+            'AIF_ATI', 'AIF_NVIDIA', 'AIF_FLASH_TARGET'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '|', '+', '-', '*', '/', '=', '<', '>', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0033ff;',
+            2 => 'color: #0033ff; font-weight: bold;',
+            3 => 'color: #0033ff;',
+            4 => 'color: #9900cc; font-weight: bold;',
+            5 => 'color: #333333;',
+            6 => 'color: #666666;',
+            7 => 'color: #990000;',
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #009900;',
+            'MULTI' => 'color: #3f5fbf;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #990000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
diff --git a/vendor/easybook/geshi/geshi/pli.php b/vendor/easybook/geshi/geshi/pli.php
new file mode 100755
index 000000000..c29985140
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pli.php
@@ -0,0 +1,200 @@
+<?php
+/*************************************************************************************
+ * pli.php
+ * --------
+ * Author: Robert AH Prins (robert@prino.org)
+ * Copyright: (c) 2011 Robert AH Prins (http://hitchwiki.org/en/User:Prino)
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/02/09
+ *
+ * PL/I language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/02/09 (1.0.8.10)
+ *  -  First Release - machine(ish) generated by http://rosettacode.org/geshi/
+ *
+ * TODO (updated 2011/02/09)
+ * -------------------------
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'PL/I',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'abnormal', 'abs', 'acos', 'acosf', 'add', 'addbuff', 'addr',
+            'addrdata', 'alias', 'aligned', 'all', 'alloc', 'allocate',
+            'allocation', 'allocn', 'allocsize', 'any', 'anycondition', 'area',
+            'ascii', 'asin', 'asinf', 'asm', 'asmtdli', 'assembler',
+            'assignable', 'atan', 'atand', 'atanf', 'atanh', 'attach',
+            'attention', 'attn', 'auto', 'automatic', 'availablearea',
+            'backwards', 'based', 'begin', 'bigendian', 'bin', 'binary',
+            'binaryvalue', 'bind', 'binvalue', 'bit', 'bitloc', 'bitlocation',
+            'bkwd', 'blksize', 'bool', 'buf', 'buffered', 'buffers', 'bufnd',
+            'bufni', 'bufoff', 'bufsp', 'builtin', 'bx', 'by', 'byaddr', 'byte',
+            'byvalue', 'b4', 'call', 'cast', 'cds', 'ceil', 'center',
+            'centerleft', 'centerright', 'centre', 'centreleft', 'centreright',
+            'char', 'character', 'charg', 'chargraphic', 'charval', 'check',
+            'checkstg', 'close', 'cmpat', 'cobol', 'col', 'collate', 'column',
+            'comment', 'compare', 'compiledate', 'compiletime', 'completion',
+            'complex', 'cond', 'condition', 'conjg', 'conn', 'connected',
+            'consecutive', 'controlled', 'conv', 'conversion', 'copy', 'cos',
+            'cosd', 'cosf', 'cosh', 'count', 'counter', 'cpln', 'cplx', 'cs',
+            'cstg', 'ctl', 'ctlasa', 'ctl360', 'currentsize', 'currentstorage',
+            'data', 'datafield', 'date', 'datetime', 'days', 'daystodate',
+            'daystosecs', 'db', 'dcl', 'dec', 'decimal', 'declare', 'def',
+            'default', 'define', 'defined', 'delay', 'delete', 'descriptor',
+            'descriptors', 'detach', 'dft', 'dim', 'dimacross', 'dimension',
+            'direct', 'display', 'divide', 'do', 'downthru', 'edit', 'else',
+            'empty', 'end', 'endfile', 'endpage', 'entry', 'entryaddr', 'env',
+            'environment', 'epsilon', 'erf', 'erfc', 'error', 'event', 'excl',
+            'exclusive', 'exit', 'exp', 'expf', 'exponent', 'exports', 'ext',
+            'external', 'fb', 'fbs', 'fetch', 'file', 'fileddint', 'fileddtest',
+            'fileddword', 'fileid', 'fileopen', 'fileread', 'fileseek',
+            'filetell', 'filewrite', 'finish', 'first', 'fixed', 'fixedbin',
+            'fixeddec', 'fixedoverflow', 'float', 'floatbin', 'floatdec',
+            'floor', 'flush', 'fofl', 'format', 'fortran', 'free', 'from',
+            'fromalien', 'fs', 'gamma', 'generic', 'genkey', 'get', 'getenv',
+            'go', 'goto', 'graphic', 'gx', 'handle', 'hbound', 'hex', 'hexadec',
+            'heximage', 'high', 'huge', 'iand', 'ieee', 'ieor', 'if', 'ignore',
+            'imag', 'in', 'index', 'indexarea', 'indexed', 'init', 'initial',
+            'inline', 'inonly', 'inot', 'inout', 'input', 'int', 'inter',
+            'internal', 'into', 'invalidop', 'ior', 'irred', 'irreducible',
+            'isfinite', 'isigned', 'isinf', 'isll', 'ismain', 'isnan',
+            'isnormal', 'isrl', 'iszero', 'iunsigned', 'key', 'keyed',
+            'keyfrom', 'keylength', 'keyloc', 'keyto', 'label', 'last',
+            'lbound', 'leave', 'left', 'length', 'like', 'limited', 'line',
+            'lineno', 'linesize', 'linkage', 'list', 'littleendian', 'loc',
+            'locate', 'location', 'log', 'logf', 'loggamma', 'log10', 'log10f',
+            'log2', 'low', 'lowercase', 'lower2', 'maccol', 'maclmar',
+            'macname', 'macrmar', 'main', 'max', 'maxexp', 'maxlength',
+            'memconvert', 'memcu12', 'memcu14', 'memcu21', 'memcu24', 'memcu41',
+            'memcu42', 'memindex', 'memsearch', 'memsearchr', 'memverify',
+            'memverifyr', 'min', 'minexp', 'mod', 'mpstr', 'multiply', 'name',
+            'native', 'ncp', 'new', 'nocharg', 'nochargraphic', 'nocheck',
+            'nocmpat', 'noconv', 'noconversion', 'nodescriptor', 'noexecops',
+            'nofixedoverflow', 'nofofl', 'noinline', 'nolock', 'nomap',
+            'nomapin', 'nomapout', 'nonasgn', 'nonassignable', 'nonconnected',
+            'nonnative', 'noofl', 'nooverflow', 'norescan', 'normal', 'nosize',
+            'nostrg', 'nostringrange', 'nostringsize', 'nostrz', 'nosubrg',
+            'nosubscriptrange', 'noufl', 'nounderflow', 'nowrite', 'nozdiv',
+            'nozerodivide', 'null', 'offset', 'offsetadd', 'offsetdiff',
+            'offsetsubtract', 'offsetvalue', 'ofl', 'omitted', 'on', 'onarea',
+            'onchar', 'oncode', 'oncondcond', 'oncondid', 'oncount', 'onfile',
+            'ongsource', 'onkey', 'online', 'onloc', 'onoffset', 'onsource',
+            'onsubcode', 'onwchar', 'onwsource', 'open', 'optional', 'options',
+            'order', 'ordinal', 'ordinalname', 'ordinalpred', 'ordinalsucc',
+            'other', 'otherwise', 'outonly', 'output', 'overflow', 'package',
+            'packagename', 'page', 'pageno', 'pagesize', 'parameter', 'parmset',
+            'password', 'pending', 'pic', 'picspec', 'picture', 'places',
+            'pliascii', 'plicanc', 'plickpt', 'plidelete', 'plidump',
+            'pliebcdic', 'plifill', 'plifree', 'plimove', 'pliover', 'plirest',
+            'pliretc', 'pliretv', 'plisaxa', 'plisaxb', 'plisaxc', 'plisaxd',
+            'plisrta', 'plisrtb', 'plisrtc', 'plisrtd', 'plitdli', 'plitran11',
+            'plitran12', 'plitran21', 'plitran22', 'pointer', 'pointeradd',
+            'pointerdiff', 'pointersubtract', 'pointervalue', 'poly', 'pos',
+            'position', 'prec', 'precision', 'pred', 'present', 'print',
+            'priority', 'proc', 'procedure', 'procedurename', 'procname',
+            'prod', 'ptr', 'ptradd', 'ptrdiff', 'ptrsubtract', 'ptrvalue',
+            'put', 'putenv', 'quote', 'radix', 'raise2', 'random', 'range',
+            'rank', 'read', 'real', 'record', 'recsize', 'recursive', 'red',
+            'reducible', 'reentrant', 'refer', 'regional', 'reg12', 'release',
+            'rem', 'reorder', 'repattern', 'repeat', 'replaceby2', 'reply',
+            'reread', 'rescan', 'reserved', 'reserves', 'resignal', 'respec',
+            'retcode', 'return', 'returns', 'reuse', 'reverse', 'revert',
+            'rewrite', 'right', 'round', 'rounddec', 'samekey', 'scalarvarying',
+            'scale', 'search', 'searchr', 'secs', 'secstodate', 'secstodays',
+            'select', 'seql', 'sequential', 'serialize4', 'set', 'sign',
+            'signal', 'signed', 'sin', 'sind', 'sinf', 'sinh', 'sis', 'size',
+            'skip', 'snap', 'sourcefile', 'sourceline', 'sqrt', 'sqrtf',
+            'stackaddr', 'statement', 'static', 'status', 'stg', 'stmt', 'stop',
+            'storage', 'stream', 'strg', 'string', 'stringrange', 'stringsize',
+            'structure', 'strz', 'subrg', 'subscriptrange', 'substr',
+            'subtract', 'succ', 'sum', 'suppress', 'sysin', 'sysnull',
+            'sysparm', 'sysprint', 'system', 'sysversion', 'tally', 'tan',
+            'tand', 'tanf', 'tanh', 'task', 'then', 'thread', 'threadid',
+            'time', 'tiny', 'title', 'to', 'total', 'tpk', 'tpm', 'transient',
+            'translate', 'transmit', 'trim', 'trkofl', 'trunc', 'type', 'ufl',
+            'ulength', 'ulength16', 'ulength8', 'unal', 'unaligned',
+            'unallocated', 'unbuf', 'unbuffered', 'undefinedfile', 'underflow',
+            'undf', 'unlock', 'unsigned', 'unspec', 'until', 'update', 'upos',
+            'uppercase', 'upthru', 'usubstr', 'usurrogate', 'uvalid', 'uwidth',
+            'valid', 'validdate', 'value', 'var', 'varglist', 'vargsize',
+            'variable', 'varying', 'varyingz', 'vb', 'vbs', 'verify', 'verifyr',
+            'vs', 'vsam', 'wait', 'wchar', 'wcharval', 'weekday', 'when',
+            'whigh', 'while', 'widechar', 'wlow', 'write', 'xmlchar', 'y4date',
+            'y4julian', 'y4year', 'zdiv', 'zerodivide'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '+', '-', '*', '/', '=', '<', '>', '&', '^', '|', ':', '(', ')', ';', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/plsql.php b/vendor/easybook/geshi/geshi/plsql.php
new file mode 100755
index 000000000..58f7c90f4
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/plsql.php
@@ -0,0 +1,254 @@
+<?php
+/*************************************************************************************
+ * plsql.php
+ * -------
+ * Author: Victor Engmark <victor.engmark@gmail.com>
+ * Copyright: (c) 2006 Victor Engmark (http://l0b0.net/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/10/26
+ *
+ * Oracle 9.2 PL/SQL language file for GeSHi.
+ * Formatting is based on the default setup of TOAD 8.6.
+ *
+ * CHANGES
+ * -------
+ * 2006/10/27 (1.0.0)
+ *    -    First Release
+ *
+ * TODO (updated 2006/10/27)
+ * -------------------------
+ * * Add < and > to brackets
+ * * Remove symbols which are also comment delimiters / quote marks?
+ *
+ *************************************************************************************
+ *
+ *         This file is part of GeSHi.
+ *
+ *     GeSHi is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     GeSHi is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with GeSHi; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA    02111-1307    USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PL/SQL',
+    'COMMENT_SINGLE' => array(1 =>'--'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2930
+    'COMMENT_MULTI' => array('/*' => '*/'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2950
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        //PL/SQL reserved keywords (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/f_words.htm#LNPLS019)
+        1 => array('ZONE', 'YEAR', 'WRITE', 'WORK', 'WITH', 'WHILE', 'WHERE',
+        'WHENEVER', 'WHEN', 'VIEW', 'VARCHAR2', 'VARCHAR', 'VALUES',
+        'VALIDATE', 'USE', 'UPDATE', 'UNIQUE', 'UNION', 'TYPE', 'TRUE',
+        'TRIGGER', 'TO', 'TIMEZONE_REGION', 'TIMEZONE_MINUTE', 'TIMEZONE_HOUR',
+        'TIMEZONE_ABBR', 'TIMESTAMP', 'TIME', 'THEN', 'TABLE', 'SYNONYM',
+        'SUCCESSFUL', 'SUBTYPE', 'START', 'SQLERRM', 'SQLCODE', 'SQL', 'SPACE',
+        'SMALLINT', 'SHARE', 'SET', 'SEPARATE', 'SELECT', 'SECOND',
+        'SAVEPOINT', 'ROWTYPE', 'ROWNUM', 'ROWID', 'ROW', 'ROLLBACK',
+        'REVERSE', 'RETURN', 'RELEASE', 'RECORD', 'REAL', 'RAW', 'RANGE',
+        'RAISE', 'PUBLIC', 'PROCEDURE', 'PRIVATE', 'PRIOR', 'PRAGMA',
+        'POSITIVEN', 'POSITIVE', 'PLS_INTEGER', 'PCTFREE', 'PARTITION',
+        'PACKAGE', 'OUT', 'OTHERS', 'ORGANIZATION', 'ORDER', 'OR', 'OPTION',
+        'OPERATOR', 'OPEN', 'OPAQUE', 'ON', 'OF', 'OCIROWID', 'NUMBER_BASE',
+        'NUMBER', 'NULL', 'NOWAIT', 'NOT', 'NOCOPY', 'NEXTVAL', 'NEW',
+        'NATURALN', 'NATURAL', 'MONTH', 'MODE', 'MLSLABEL', 'MINUTE', 'MINUS',
+        'LOOP', 'LONG', 'LOCK', 'LIMITED', 'LIKE', 'LEVEL', 'JAVA',
+        'ISOLATION', 'IS', 'INTO', 'INTERVAL', 'INTERSECT', 'INTERFACE',
+        'INTEGER', 'INSERT', 'INDICATOR', 'INDEX', 'IN', 'IMMEDIATE', 'IF',
+        'HOUR', 'HEAP', 'HAVING', 'GROUP', 'GOTO', 'FUNCTION', 'FROM',
+        'FORALL', 'FOR', 'FLOAT', 'FETCH', 'FALSE', 'EXTENDS', 'EXIT',
+        'EXISTS', 'EXECUTE', 'EXCLUSIVE', 'EXCEPTION', 'END', 'ELSIF', 'ELSE',
+        'DROP', 'DO', 'DISTINCT', 'DESC', 'DELETE', 'DEFAULT', 'DECLARE',
+        'DECIMAL', 'DAY', 'DATE', 'CURSOR', 'CURRVAL', 'CURRENT', 'CREATE',
+        'CONSTANT', 'CONNECT', 'COMPRESS', 'COMMIT', 'COMMENT', 'COLLECT',
+        'CLUSTER', 'CLOSE', 'CHECK', 'CHAR_BASE', 'CHAR', 'CASE', 'BY', 'BULK',
+        'BOOLEAN', 'BODY', 'BINARY_INTEGER', 'BETWEEN', 'BEGIN', 'AUTHID',
+        'AT', 'ASC', 'AS', 'ARRAY', 'ANY', 'AND', 'ALTER', 'ALL'),
+        //SQL functions (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/toc.htm & http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/functions101a.htm#85925)
+        2 => array('XMLTRANSFORM', 'XMLSEQUENCE', 'XMLFOREST', 'XMLELEMENT',
+        'XMLCONCAT', 'XMLCOLATTVAL', 'XMLAGG', 'WIDTH_BUCKET', 'VSIZE',
+        'VARIANCE', 'VAR_SAMP', 'VAR_POP', 'VALUE', 'USERENV', 'USER', 'UPPER',
+        'UPDATEXML', 'UNISTR', 'UID', 'TZ_OFFSET', 'TRUNC', 'TRIM', 'TREAT',
+        'TRANSLATE', 'TO_YMINTERVAL', 'TO_TIMESTAMP_TZ', 'TO_TIMESTAMP',
+        'TO_SINGLE_BYTE', 'TO_NUMBER', 'TO_NCLOB', 'TO_NCHAR', 'TO_MULTI_BYTE',
+        'TO_LOB', 'TO_DSINTERVAL', 'TO_DATE', 'TO_CLOB', 'TO_CHAR', 'TANH',
+        'TAN', 'SYSTIMESTAMP', 'SYSDATE', 'SYS_XMLGEN', 'SYS_XMLAGG',
+        'SYS_TYPEID', 'SYS_GUID', 'SYS_EXTRACT_UTC', 'SYS_DBURIGEN',
+        'SYS_CONTEXT', 'SYS_CONNECT_BY_PATH', 'SUM', 'SUBSTR', 'STDDEV_SAMP',
+        'STDDEV_POP', 'STDDEV', 'SQRT', 'SOUNDEX', 'SINH', 'SIN', 'SIGN',
+        'SESSIONTIMEZONE', 'RTRIM', 'RPAD', 'ROWIDTONCHAR', 'ROWIDTOCHAR',
+        'ROW_NUMBER', 'ROUND', 'REPLACE', 'REGR_SYY', 'REGR_SXY', 'REGR_SXX',
+        'REGR_SLOPE', 'REGR_R2', 'REGR_INTERCEPT', 'REGR_COUNT', 'REGR_AVGY',
+        'REGR_AVGX', 'REFTOHEX', 'REF', 'RAWTONHEX', 'RAWTOHEX',
+        'RATIO_TO_REPORT', 'RANK', 'POWER', 'PERCENTILE_DISC',
+        'PERCENTILE_CONT', 'PERCENT_RANK', 'PATH', 'NVL2', 'NVL',
+        'NUMTOYMINTERVAL', 'NUMTODSINTERVAL', 'NULLIF', 'NTILE', 'NLSSORT',
+        'NLS_UPPER', 'NLS_LOWER', 'NLS_INITCAP', 'NLS_CHARSET_NAME',
+        'NLS_CHARSET_ID', 'NLS_CHARSET_DECL_LEN', 'NEXT_DAY', 'NEW_TIME',
+        'NCHR', 'MONTHS_BETWEEN', 'MOD', 'MIN', 'MAX', 'MAKE_REF', 'LTRIM',
+        'LPAD', 'LOWER', 'LOG', 'LOCALTIMESTAMP', 'LN', 'LENGTH', 'LEAST',
+        'LEAD', 'LAST_VALUE', 'LAST_DAY', 'LAST', 'LAG', 'INSTR', 'INITCAP',
+        'HEXTORAW', 'GROUPING_ID', 'GROUPING', 'GROUP_ID', 'GREATEST',
+        'FROM_TZ', 'FLOOR', 'FIRST_VALUE', 'FIRST', 'EXTRACTVALUE', 'EXTRACT',
+        'EXP', 'EXISTSNODE', 'EMPTY_CLOB', 'EMPTY_BLOB', 'DUMP', 'DEREF',
+        'DEPTH', 'DENSE_RANK', 'DECOMPOSE', 'DECODE', 'DBTIMEZONE',
+        'CURRENT_TIMESTAMP', 'CURRENT_DATE', 'CUME_DIST', 'COVAR_SAMP',
+        'COVAR_POP', 'COUNT', 'COSH', 'COS', 'CORR', 'CONVERT', 'CONCAT',
+        'COMPOSE', 'COALESCE', 'CHR', 'CHARTOROWID', 'CEIL', 'CAST', 'BITAND',
+        'BIN_TO_NUM', 'BFILENAME', 'AVG', 'ATAN2', 'ATAN', 'ASIN', 'ASCIISTR',
+        'ASCII', 'ADD_MONTHS', 'ACOS', 'ABS'),
+        //PL/SQL packages (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96612/intro2.htm#1025672)
+        3 => array('UTL_URL', 'UTL_TCP', 'UTL_SMTP', 'UTL_REF', 'UTL_RAW',
+        'UTL_PG', 'UTL_INADDR', 'UTL_HTTP', 'UTL_FILE', 'UTL_ENCODE',
+        'UTL_COLL', 'SDO_UTIL', 'SDO_TUNE', 'SDO_MIGRATE', 'SDO_LRS',
+        'SDO_GEOM', 'SDO_CS', 'DMBS_XMLQUERY', 'DMBS_FLASHBACK',
+        'DMBS_DEFER_SYS', 'DEBUG_EXTPROC', 'DBMS_XSLPROCESSOR', 'DBMS_XPLAN',
+        'DBMS_XMLSCHEMA', 'DBMS_XMLSAVE', 'DBMS_XMLPARSER', 'DBMS_XMLGEN',
+        'DBMS_XMLDOM', 'DBMS_XDBT', 'DBMS_XDB_VERSION', 'DBMS_XDB', 'DBMS_WM',
+        'DBMS_UTILITY', 'DBMS_TYPES', 'DBMS_TTS', 'DBMS_TRANSFORM',
+        'DBMS_TRANSACTION', 'DBMS_TRACE', 'DBMS_STRM_A', 'DBMS_STRM',
+        'DBMS_STORAGE_MAP', 'DBMS_STATS', 'DBMS_SQL', 'DBMS_SPACE_ADMIN',
+        'DBMS_SPACE', 'DBMS_SHARED_POOL', 'DBMS_SESSION', 'DBMS_RULE_ADM',
+        'DBMS_RULE', 'DBMS_ROWID', 'DBMS_RLS', 'DBMS_RESUMABLE',
+        'DBMS_RESOURCE_MANAGER_PRIVS', 'DBMS_RESOURCE_MANAGER', 'DBMS_REPUTIL',
+        'DBMS_REPCAT_RGT', 'DBMS_REPCAT_INSTATIATE', 'DBMS_REPCAT_ADMIN',
+        'DBMS_REPCAT', 'DBMS_REPAIR', 'DBMS_REFRESH', 'DBMS_REDEFINITION',
+        'DBMS_RECTIFIER_DIFF', 'DBMS_RANDOM', 'DBMS_PROPAGATION_ADM',
+        'DBMS_PROFILER', 'DBMS_PIPE', 'DBMS_PCLXUTIL', 'DBMS_OUTPUT',
+        'DBMS_OUTLN_EDIT', 'DBMS_OUTLN', 'DBMS_ORACLE_TRACE_USER',
+        'DBMS_ORACLE_TRACE_AGENT', 'DBMS_OLAP', 'DBMS_OFFLINE_SNAPSHOT',
+        'DBMS_OFFLINE_OG', 'DBMS_ODCI', 'DBMS_OBFUSCATION_TOOLKIT',
+        'DBMS_MVIEW', 'DBMS_MGWMSG', 'DBMS_MGWADM', 'DBMS_METADATA',
+        'DBMS_LOGSTDBY', 'DBMS_LOGMNR_D', 'DBMS_LOGMNR_CDC_SUBSCRIBE',
+        'DBMS_LOGMNR_CDC_PUBLISH', 'DBMS_LOGMNR', 'DBMS_LOCK', 'DBMS_LOB',
+        'DBMS_LIBCACHE', 'DBMS_LDAP', 'DBMS_JOB', 'DBMS_IOT',
+        'DBMS_HS_PASSTHROUGH', 'DBMS_FGA', 'DBMS_DISTRIBUTED_TRUST_ADMIN',
+        'DBMS_DESCRIBE', 'DBMS_DEFER_QUERY', 'DBMS_DEFER', 'DBMS_DEBUG',
+        'DBMS_DDL', 'DBMS_CAPTURE_ADM', 'DBMS_AW', 'DBMS_AQELM', 'DBMS_AQADM',
+        'DBMS_AQ', 'DBMS_APPLY_ADM', 'DBMS_APPLICATION_INFO', 'DBMS_ALERT',
+        'CWM2_OLAP_AW_ACCESS'),
+        //PL/SQL predefined exceptions (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/07_errs.htm#784)
+        4 => array('ZERO_DIVIDE', 'VALUE_ERROR', 'TOO_MANY_ROWS',
+        'TIMEOUT_ON_RESOURCE', 'SYS_INVALID_ROWID', 'SUBSCRIPT_OUTSIDE_LIMIT',
+        'SUBSCRIPT_BEYOND_COUNT', 'STORAGE_ERROR', 'SELF_IS_NULL',
+        'ROWTYPE_MISMATCH', 'PROGRAM_ERROR', 'NOT_LOGGED_ON', 'NO_DATA_FOUND',
+        'LOGIN_DENIED', 'INVALID_NUMBER', 'INVALID_CURSOR', 'DUP_VAL_ON_INDEX',
+        'CURSOR_ALREADY_OPEN', 'COLLECTION_IS_NULL', 'CASE_NOT_FOUND',
+        'ACCESS_INTO_NULL'),
+        //Static data dictionary views (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96536/ch2.htm)
+        5 => array('USER_REPSITES', 'USER_REPSCHEMA',
+        'USER_REPRESOLUTION_STATISTICS', 'USER_REPRESOLUTION_METHOD',
+        'USER_REPRESOLUTION', 'USER_REPRESOL_STATS_CONTROL', 'USER_REPPROP',
+        'USER_REPPRIORITY_GROUP', 'USER_REPPRIORITY',
+        'USER_REPPARAMETER_COLUMN', 'USER_REPOBJECT', 'USER_REPKEY_COLUMNS',
+        'USER_REPGROUPED_COLUMN', 'USER_REPGROUP_PRIVILEGES', 'USER_REPGROUP',
+        'USER_REPGENOBJECTS', 'USER_REPGENERATED', 'USER_REPFLAVORS',
+        'USER_REPFLAVOR_OBJECTS', 'USER_REPFLAVOR_COLUMNS', 'USER_REPDDL',
+        'USER_REPCONFLICT', 'USER_REPCOLUMN_GROUP', 'USER_REPCOLUMN',
+        'USER_REPCATLOG', 'USER_REPCAT_USER_PARM_VALUES',
+        'USER_REPCAT_USER_AUTHORIZATIONS', 'USER_REPCAT_TEMPLATE_SITES',
+        'USER_REPCAT_TEMPLATE_PARMS', 'USER_REPCAT_TEMPLATE_OBJECTS',
+        'USER_REPCAT_REFRESH_TEMPLATES', 'USER_REPCAT', 'USER_REPAUDIT_COLUMN',
+        'USER_REPAUDIT_ATTRIBUTE', 'DBA_REPSITES_NEW', 'DBA_REPSITES',
+        'DBA_REPSCHEMA', 'DBA_REPRESOLUTION_STATISTICS',
+        'DBA_REPRESOLUTION_METHOD', 'DBA_REPRESOLUTION',
+        'DBA_REPRESOL_STATS_CONTROL', 'DBA_REPPROP', 'DBA_REPPRIORITY_GROUP',
+        'DBA_REPPRIORITY', 'DBA_REPPARAMETER_COLUMN', 'DBA_REPOBJECT',
+        'DBA_REPKEY_COLUMNS', 'DBA_REPGROUPED_COLUMN',
+        'DBA_REPGROUP_PRIVILEGES', 'DBA_REPGROUP', 'DBA_REPGENOBJECTS',
+        'DBA_REPGENERATED', 'DBA_REPFLAVORS', 'DBA_REPFLAVOR_OBJECTS',
+        'DBA_REPFLAVOR_COLUMNS', 'DBA_REPEXTENSIONS', 'DBA_REPDDL',
+        'DBA_REPCONFLICT', 'DBA_REPCOLUMN_GROUP', 'DBA_REPCOLUMN',
+        'DBA_REPCATLOG', 'DBA_REPCAT_USER_PARM_VALUES',
+        'DBA_REPCAT_USER_AUTHORIZATIONS', 'DBA_REPCAT_TEMPLATE_SITES',
+        'DBA_REPCAT_TEMPLATE_PARMS', 'DBA_REPCAT_TEMPLATE_OBJECTS',
+        'DBA_REPCAT_REFRESH_TEMPLATES', 'DBA_REPCAT_EXCEPTIONS', 'DBA_REPCAT',
+        'DBA_REPAUDIT_COLUMN', 'DBA_REPAUDIT_ATTRIBUTE', 'ALL_REPSITES',
+        'ALL_REPSCHEMA', 'ALL_REPRESOLUTION_STATISTICS',
+        'ALL_REPRESOLUTION_METHOD', 'ALL_REPRESOLUTION',
+        'ALL_REPRESOL_STATS_CONTROL', 'ALL_REPPROP', 'ALL_REPPRIORITY_GROUP',
+        'ALL_REPPRIORITY', 'ALL_REPPARAMETER_COLUMN', 'ALL_REPOBJECT',
+        'ALL_REPKEY_COLUMNS', 'ALL_REPGROUPED_COLUMN',
+        'ALL_REPGROUP_PRIVILEGES', 'ALL_REPGROUP', 'ALL_REPGENOBJECTS',
+        'ALL_REPGENERATED', 'ALL_REPFLAVORS', 'ALL_REPFLAVOR_OBJECTS',
+        'ALL_REPFLAVOR_COLUMNS', 'ALL_REPDDL', 'ALL_REPCONFLICT',
+        'ALL_REPCOLUMN_GROUP', 'ALL_REPCOLUMN', 'ALL_REPCATLOG',
+        'ALL_REPCAT_USER_PARM_VALUES', 'ALL_REPCAT_USER_AUTHORIZATIONS',
+        'ALL_REPCAT_TEMPLATE_SITES', 'ALL_REPCAT_TEMPLATE_PARMS',
+        'ALL_REPCAT_TEMPLATE_OBJECTS', 'ALL_REPCAT_REFRESH_TEMPLATES',
+        'ALL_REPCAT', 'ALL_REPAUDIT_COLUMN', 'ALL_REPAUDIT_ATTRIBUTE')
+        ),
+    'SYMBOLS' => array(
+        //PL/SQL delimiters (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2732)
+        '+', '%', "'", '.', '/', '(', ')', ':', ',', '*', '"', '=', '<', '>', '@', ';', '-', ':=', '=>', '||', '**', '<<', '>>', '/*', '*/', '..', '<>', '!=', '~=', '^=', '<=', '>='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00F;',
+            2 => 'color: #000;',
+            3 => 'color: #00F;',
+            4 => 'color: #F00;',
+            5 => 'color: #800;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #080; font-style: italic;',
+            'MULTI' => 'color: #080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00F;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #F00;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #0F0;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00F;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #0F0;'
+            )
+        ),
+        'URLS' => array(
+            1 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            2 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            3 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            4 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            5 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}'
+            ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/postgresql.php b/vendor/easybook/geshi/geshi/postgresql.php
new file mode 100755
index 000000000..662fdd760
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/postgresql.php
@@ -0,0 +1,288 @@
+<?php
+/*************************************************************************************
+ * postgresql.php
+ * -----------
+ * Author: Christophe Chauvet (christophe_at_kryskool_dot_org)
+ * Contributors: Leif Biberg Kristensen <leif_at_solumslekt_dot_org> 2010-05-03
+ * Copyright: (c) 2007 Christophe Chauvet (http://kryskool.org/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/07/20
+ *
+ * PostgreSQL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/07/20 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/07/20)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PostgreSQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        //Put PostgreSQL reserved keywords here.  I like mine uppercase.
+        1 => array(
+            'ABORT','ABSOLUTE','ACCESS','ACTION','ADD','ADMIN','AFTER',
+            'AGGREGATE','ALL','ALSO','ALTER','ALWAYS','ANALYSE','ANALYZE','AND',
+            'ANY','AS','ASC,','ASSERTION','ASSIGNMENT','ASYMMETRIC','AT',
+            'AUTHORIZATION','BACKWARD','BEFORE','BEGIN','BETWEEN','BOTH','BY',
+            'CACHE','CALLED','CASCADE','CASCADED','CASE','CAST','CATALOG',
+            'CHAIN','CHARACTERISTICS','CHECK','CHECKPOINT','CLASS','CLOSE',
+            'CLUSTER','COALESCE','COLLATE','COLUMN','COMMENT','COMMIT',
+            'COMMITTED','CONCURRENTLY','CONFIGURATION','CONNECTION',
+            'CONSTRAINT','CONSTRAINTS','CONTENT','CONTINUE','CONVERSION','COPY',
+            'COST','CREATE','CREATEDB','CREATEROLE','CREATEUSER','CROSS','CSV',
+            'CURRENT','CURRENT_CATALOG','CURRENT_DATE','CURRENT_ROLE',
+            'CURRENT_SCHEMA','CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER',
+            'CURSOR','CYCLE','DATA','DATABASE','DAY','DEALLOCATE','DEC',
+            'DECLARE','DEFAULT','DEFAULTS','DEFERRABLE','DEFERRED','DEFINER',
+            'DELETE','DELIMITER','DELIMITERS','DESC','DICTIONARY','DISABLE',
+            'DISCARD','DISTINCT','DO','DOCUMENT','DOMAIN','DOUBLE','DROP',
+            'EACH','ELSE','ENABLE','ENCODING','ENCRYPTED','END','ESCAPE',
+            'EXCEPT','EXCLUDING','EXCLUSIVE','EXECUTE','EXISTS','EXPLAIN',
+            'EXTERNAL','EXTRACT','FALSE','FAMILY','FETCH','FIRST','FOLLOWING',
+            'FOR','FORCE','FOREIGN','FORWARD','FREEZE','FROM','FULL','FUNCTION',
+            'GLOBAL','GRANT','GRANTED','GREATEST','GROUP','HANDLER','HAVING',
+            'HEADER','HOLD','HOUR','IDENTITY','IF','ILIKE','IMMEDIATE',
+            'IMMUTABLE','IMPLICIT','IN','INCLUDING','INCREMENT','INDEX',
+            'INDEXES','INHERIT','INHERITS','INITIALLY','INNER','INOUT','INPUT',
+            'INSENSITIVE','INSERT','INSTEAD','INTERSECT','INTO','INVOKER','IS',
+            'ISNULL','ISOLATION','JOIN','KEY','LANCOMPILER','LANGUAGE','LARGE',
+            'LAST','LC_COLLATE','LC_CTYPE','LEADING','LEAST','LEFT','LEVEL',
+            'LIKE','LIMIT','LISTEN','LOAD','LOCAL','LOCALTIME','LOCALTIMESTAMP',
+            'LOCATION','LOCK','LOGIN','LOOP','MAPPING','MATCH','MAXVALUE',
+            'MINUTE','MINVALUE','MODE','MONTH','MOVE','NAME','NAMES','NATIONAL',
+            'NATURAL','NEW','NEXT','NO','NOCREATEDB','NOCREATEROLE',
+            'NOCREATEUSER','NOINHERIT','NOLOGIN','NONE','NOSUPERUSER','NOT',
+            'NOTHING','NOTIFY','NOTNULL','NOWAIT','NULL','NULLIF','NULLS',
+            'NUMERIC','OBJECT','OF','OFF','OFFSET','OIDS','OLD','ON','ONLY',
+            'OPERATOR','OPTION','OPTIONS','OR','ORDER','OUT','OUTER','OVER',
+            'OVERLAPS','OVERLAY','OWNED','OWNER','PARSER','PARTIAL','PARTITION',
+            'PASSWORD','PLACING','PLANS','POSITION','PRECEDING','PRECISION',
+            'PREPARE','PREPARED','PRESERVE','PRIMARY','PRIOR','PRIVILEGES',
+            'PROCEDURAL','PROCEDURE','QUOTE','RANGE','READ','REASSIGN',
+            'RECHECK','RECURSIVE','REFERENCES','REINDEX','RELATIVE','RELEASE',
+            'RENAME','REPEATABLE','REPLACE','REPLICA','RESET','RESTART',
+            'RESTRICT','RETURN','RETURNING','RETURNS','REVOKE','RIGHT','ROLE',
+            'ROLLBACK','ROW','ROWS','RULE','SAVEPOINT','SCHEMA','SCROLL',
+            'SEARCH','SECOND',
+            'SECURITY','SELECT','SEQUENCE','SERIALIZABLE','SERVER','SESSION',
+            'SESSION_USER','SET','SETOF','SHARE','SHOW','SIMILAR','SIMPLE',
+            'SOME','STABLE','STANDALONE','START','STATEMENT','STATISTICS',
+            'STDIN','STDOUT','STORAGE','STRICT','STRIP','SUPERUSER',
+            'SYMMETRIC','SYSID','SYSTEM','TABLE','TABLESPACE','TEMP','TEMPLATE',
+            'TEMPORARY','THEN','TO','TRAILING','TRANSACTION','TREAT','TRIGGER',
+            'TRUE','TRUNCATE','TRUSTED','TYPE','UNBOUNDED','UNCOMMITTED',
+            'UNENCRYPTED','UNION','UNIQUE','UNKNOWN','UNLISTEN','UNTIL',
+            'UPDATE','USER','USING','VACUUM','VALID','VALIDATOR','VALUE',
+            'VALUES','VARIADIC','VERBOSE','VERSION','VIEW','VOLATILE','WHEN',
+            'WHERE','WHILE','WHITESPACE','WINDOW','WITH','WITHOUT','WORK','WRAPPER',
+            'WRITE','XMLATTRIBUTES','XMLCONCAT','XMLELEMENT','XMLFOREST',
+            'XMLPARSE','XMLPI','XMLROOT','XMLSERIALIZE','YEAR','YES','ZONE'
+            ),
+
+        //Put functions here
+        3 => array(
+            // mathematical functions
+            'ABS','CBRT','CEIL','CEILING','DEGREES','DIV','EXP','FLOOR','LN',
+            'LOG','MOD','PI','POWER','RADIANS','RANDOM','ROUND','SETSEED',
+            'SIGN','SQRT','TRUNC','WIDTH_BUCKET',
+            // trigonometric functions
+            'ACOS','ASIN','ATAN','ATAN2','COS','COT','SIN','TAN',
+            // string functions
+            'BIT_LENGTH','CHAR_LENGTH','CHARACTER_LENGTH','LOWER',
+            'OCTET_LENGTH','POSITION','SUBSTRING','TRIM','UPPER',
+            // other string functions
+            'ASCII','BTRIM','CHR','CONVERT','CONVERT_FROM','CONVERT_TO',
+            'DECODE','ENCODE','INITCAP','LENGTH','LPAD','LTRIM','MD5',
+            'PG_CLIENT_ENCODING','QUOTE_IDENT','QUOTE_LITERAL','QUOTE_NULLABLE',
+            'REGEXP_MATCHES','REGEXP_REPLACE','REGEXP_SPLIT_TO_ARRAY',
+            'REGEXP_SPLIT_TO_TABLE','REPEAT','RPAD','RTRIM','SPLIT_PART',
+            'STRPOS','SUBSTR','TO_ASCII','TO_HEX','TRANSLATE',
+            // binary string functions
+            'GET_BIT','GET_BYTE','SET_BIT','SET_BYTE',
+            // data type formatting functions
+            'TO_CHAR','TO_DATE','TO_NUMBER','TO_TIMESTAMP',
+            // date/time functions
+            'AGE','CLOCK_TIMESTAMP','DATE_PART','DATE_TRUNC','EXTRACT',
+            'ISFINITE','JUSTIFY_DAYS','JUSTIFY_HOURS','JUSTIFY_INTERVAL','NOW',
+            'STATEMENT_TIMESTAMP','TIMEOFDAY','TRANSACTION_TIMESTAMP',
+            // enum support functions
+            'ENUM_FIRST','ENUM_LAST','ENUM_RANGE',
+            // geometric functions
+            'AREA','CENTER','DIAMETER','HEIGHT','ISCLOSED','ISOPEN','NPOINTS',
+            'PCLOSE','POPEN','RADIUS','WIDTH',
+            'BOX','CIRCLE','LSEG','PATH','POINT','POLYGON',
+            // cidr and inet functions
+            'ABBREV','BROADCAST','FAMILY','HOST','HOSTMASK','MASKLEN','NETMASK',
+            'NETWORK','SET_MASKLEN',
+            // text search functions
+            'TO_TSVECTOR','SETWEIGHT','STRIP','TO_TSQUERY','PLAINTO_TSQUERY',
+            'NUMNODE','QUERYTREE','TS_RANK','TS_RANK_CD','TS_HEADLINE',
+            'TS_REWRITE','GET_CURRENT_TS_CONFIG','TSVECTOR_UPDATE_TRIGGER',
+            'TSVECTOR_UPDATE_TRIGGER_COLUMN',
+            'TS_DEBUG','TS_LEXISE','TS_PARSE','TS_TOKEN_TYPE','TS_STAT',
+            // XML functions
+            'XMLCOMMENT','XMLCONCAT','XMLELEMENT','XMLFOREST','XMLPI','XMLROOT',
+            'XMLAGG','XPATH','TABLE_TO_XMLSCHEMA','QUERY_TO_XMLSCHEMA',
+            'CURSOR_TO_XMLSCHEMA','TABLE_TO_XML_AND_XMLSCHEMA',
+            'QUERY_TO_XML_AND_XMLSCHEMA','SCHEMA_TO_XML','SCHEMA_TO_XMLSCHEMA',
+            'SCHEMA_TO_XML_AND_XMLSCHEMA','DATABASE_TO_XML',
+            'DATABASE_TO_XMLSCHEMA','DATABASE_TO_XML_AND_XMLSCHEMA',
+            // sequence manipulating functions
+            'CURRVAL','LASTVAL','NEXTVAL','SETVAL',
+            // conditional expressions
+            'COALESCE','NULLIF','GREATEST','LEAST',
+            // array functions
+            'ARRAY_APPEND','ARRAY_CAT','ARRAY_NDIMS','ARRAY_DIMS','ARRAY_FILL',
+            'ARRAY_LENGTH','ARRAY_LOWER','ARRAY_PREPEND','ARRAY_TO_STRING',
+            'ARRAY_UPPER','STRING_TO_ARRAY','UNNEST',
+            // aggregate functions
+            'ARRAY_AGG','AVG','BIT_AND','BIT_OR','BOOL_AND','BOOL_OR','COUNT',
+            'EVERY','MAX','MIN','STRING_AGG','SUM',
+            // statistic aggregate functions
+            'CORR','COVAR_POP','COVAR_SAMP','REGR_AVGX','REGR_AVGY',
+            'REGR_COUNT','REGR_INTERCEPT','REGR_R2','REGR_SLOPE','REGR_SXX',
+            'REGR_SXY','REGR_SYY','STDDEV','STDDEV_POP','STDDEV_SAMP',
+            'VARIANCE','VAR_POP','VAR_SAMP',
+            // window functions
+            'ROW_NUMBER','RANK','DENSE_RANK','PERCENT_RANK','CUME_DIST','NTILE',
+            'LAG','LEAD','FIRST_VALUE','LAST_VALUE','NTH_VALUE',
+            // set returning functions
+            'GENERATE_SERIES','GENERATE_SUBSCRIPTS'
+            // system information functions not currently included
+            ),
+
+        //Put your postgresql var
+        4 => array(
+            'client_encoding',
+            'standard_conforming_strings'
+            ),
+
+        //Put your data types here
+        5 => array(
+            'ARRAY','ABSTIME','BIGINT','BIGSERIAL','BINARY','BIT','BIT VARYING',
+            'BOOLEAN','BOX','BYTEA','CHAR','CHARACTER','CHARACTER VARYING',
+            'CIDR','CIRCLE','DATE','DECIMAL','DOUBLE PRECISION','ENUM','FLOAT',
+            'INET','INT','INTEGER','INTERVAL','NCHAR','REAL','SMALLINT','TEXT',
+            'TIME','TIMESTAMP','VARCHAR','XML',
+            ),
+
+        //        //Put your package names here
+        //        6 => array(
+        //            ),
+
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            // regular keywords
+            1 => 'color: #000000; font-weight: bold; text-transform: uppercase;',
+            // inbuilt functions
+            3 => 'color: #333399; font-weight: bold; text-transform: uppercase;',
+            // postgresql var(?)
+            4 => 'color: #993333; font-weight: bold; text-transform: uppercase;',
+            // data types
+            5 => 'color: #993333; font-weight: bold; text-transform: uppercase;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        3 => '',
+        4 => 'http://paste.postgresql.fr/wiki/desc.php?def={FNAME}',
+        5 => '',
+        ),
+
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+
+            3 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+
+            4 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+
+            5 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            )
+        )
+
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/povray.php b/vendor/easybook/geshi/geshi/povray.php
new file mode 100755
index 000000000..c0ce35ca1
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/povray.php
@@ -0,0 +1,199 @@
+<?php
+/*************************************************************************************
+ * povray.php
+ * --------
+ * Author: Carl Fürstenberg (azatoth@gmail.com)
+ * Copyright: © 2007 Carl Fürstenberg
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/07/11
+ *
+ * Povray language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ *   -  initial import to GeSHi SVN
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'POVRAY',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'yes', 'wrinkles', 'wood', 'width', 'waves', 'water_level', 'warp', 'vturbulence',
+            'vstr', 'vrotate', 'vnormalize', 'vlength', 'vcross', 'vaxis_rotate', 'variance', 'v_steps',
+            'uv_mapping', 'utf8', 'use_index', 'use_colour', 'use_color', 'use_alpha', 'up', 'undef',
+            'ultra_wide_angle', 'u_steps', 'type', 'turbulence', 'turb_depth', 'ttf', 'true', 'triangle_wave',
+            'translate', 'transform', 'trace', 'toroidal', 'tolerance', 'tiles', 'tile2', 'tightness',
+            'tiff', 'threshold', 'thickness', 'tga', 'texture_map', 'target', 'sys', 'sum',
+            'substr', 'sturm', 'strupr', 'strlwr', 'strength', 'str', 'statistics', 'sqr',
+            'spotted', 'spotlight', 'split_union', 'spline', 'spiral2', 'spiral1', 'spherical', 'specular',
+            'spacing', 'solid', 'smooth', 'slope', 'slice', 'sky', 'size', 'sine_wave',
+            'shadowless', 'scattering', 'scallop_wave', 'scale', 'save_file', 'samples', 'roughness', 'rotate',
+            'ripples', 'right', 'rgbt', 'rgbft', 'rgbf', 'rgb', 'repeat', 'render',
+            'refraction', 'reflection_exponent', 'recursion_limit', 'reciprocal', 'ratio', 'ramp_wave', 'radius', 'radial',
+            'quilted', 'quick_colour', 'quick_color', 'quaternion', 'quadratic_spline', 'pwr', 'projected_through', 'prod',
+            'pretrace_start', 'pretrace_end', 'precompute', 'precision', 'ppm', 'pow', 'pot', 'poly_wave',
+            'point_at', 'png', 'planar', 'pigment_pattern', 'pi', 'phong_size', 'phong', 'phase',
+            'pgm', 'perspective', 'pattern', 'pass_through', 'parallel', 'panoramic', 'orthographic', 'orientation',
+            'orient', 'open', 'onion', 'once', 'on', 'omnimax', 'omega', 'offset',
+            'off', 'octaves', 'number_of_waves', 'noise_generator', 'no_shadow', 'no_reflection', 'no_image', 'no_bump_scale',
+            'no', 'nearest_count', 'natural_spline', 'mortar', 'minimum_reuse', 'min_extent', 'metric', 'method',
+            'metallic', 'media_interaction', 'media_attenuation', 'media', 'max_trace_level', 'max_trace', 'max_sample', 'max_iteration',
+            'max_intersections', 'max_gradient', 'max_extent', 'matrix', 'material_map', 'marble', 'map_type', 'mandel',
+            'major_radius', 'magnet', 'low_error_factor', 'look_at', 'location', 'load_file', 'linear_sweep', 'linear_spline',
+            'leopard', 'lambda', 'julia', 'jpeg', 'jitter', 'irid_wavelength', 'ior', 'inverse',
+            'intervals', 'interpolate', 'internal', 'inside_vector', 'inside', 'initial_frame', 'initial_clock', 'image_width',
+            'image_pattern', 'image_height', 'iff', 'hypercomplex', 'hollow', 'hierarchy', 'hf_gray_16', 'hexagon',
+            'gray_threshold', 'granite', 'gradient', 'global_lights', 'gif', 'gather', 'fresnel', 'frequency',
+            'frame_number', 'form', 'fog_type', 'fog_offset', 'fog_alt', 'focal_point', 'flip', 'flatness',
+            'fisheye', 'final_frame', 'final_clock', 'false', 'falloff_angle', 'falloff', 'fade_power', 'fade_distance',
+            'fade_colour', 'fade_color', 'facets', 'extinction', 'exterior', 'exponent', 'expand_thresholds', 'evaluate',
+            'error_bound', 'emission', 'eccentricity', 'double_illuminate', 'distance', 'dist_exp', 'dispersion_samples', 'dispersion',
+            'direction', 'diffuse', 'df3', 'dents', 'density_map', 'density_file', 'density', 'cylindrical',
+            'cutaway_textures', 'cubic_wave', 'cubic_spline', 'cube', 'crand', 'crackle', 'count', 'coords',
+            'control1', 'control0', 'conserve_energy', 'conic_sweep', 'confidence', 'concat', 'composite', 'component',
+            'colour_map', 'colour', 'color', 'collect', 'clock_on', 'clock_delta', 'clock', 'circular',
+            'chr', 'checker', 'charset', 'cells', 'caustics', 'bumps', 'bump_size', 'brilliance',
+            'brightness', 'brick_size', 'brick', 'bozo', 'boxed', 'blur_samples', 'black_hole', 'bezier_spline',
+            'b_spline', 'average', 'autostop', 'assumed_gamma', 'ascii', 'array', 'area_light', 'arc_angle',
+            'append', 'aperture', 'angle', 'ambient_light', 'ambient', 'always_sample', 'altitude', 'alpha',
+            'all_intersections', 'all', 'agate_turb', 'agate', 'adc_bailout', 'adaptive', 'accuracy', 'absorption',
+            'aa_threshold', 'aa_level', 'reflection'
+            ),
+        2 => array(
+            'abs', 'acos', 'acosh', 'asc', 'asin', 'asinh', 'atan', 'atanh',
+            'atan2', 'ceil', 'cos', 'cosh', 'defined', 'degrees', 'dimensions', 'dimension_size',
+            'div', 'exp', 'file_exists', 'floor', 'int', 'ln', 'log', 'max',
+            'min', 'mod', 'pov', 'radians', 'rand', 'seed', 'select', 'sin',
+            'sinh', 'sqrt', 'strcmp', 'strlen', 'tan', 'tanh', 'val', 'vdot',
+            'vlenght',
+            ),
+        3 => array (
+            'x', 'y', 'z', 't', 'u', 'v', 'red', 'blue',
+            'green', 'filter', 'transmit', 'gray', 'e',
+            ),
+        4 => array (
+            'camera', 'background', 'fog', 'sky_sphere', 'rainbow', 'global_settings', 'radiosity', 'photon',
+            'object', 'blob', 'sphere', 'cylinder', 'box', 'cone', 'height_field', 'julia_fractal',
+            'lathe', 'prism', 'sphere_sweep', 'superellipsoid', 'sor', 'text', 'torus', 'bicubic_patch',
+            'disc', 'mesh', 'triangle', 'smooth_triangle', 'mesh2', 'vertex_vectors', 'normal_vectors', 'uv_vectors',
+            'texture_list', 'face_indices', 'normal_indices', 'uv_indices', 'texture', 'polygon', 'plane', 'poly',
+            'cubic', 'quartic', 'quadric', 'isosurface', 'function', 'contained_by', 'parametric', 'pigment',
+            'union', 'intersection', 'difference', 'merge', 'light_source', 'looks_like', 'light_group', 'clipped_by',
+            'bounded_by', 'interior', 'material', 'interior_texture', 'normal', 'finish', 'color_map', 'pigment_map',
+            'image_map', 'bump_map', 'slope_map', 'normal_map', 'irid', 'photons',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!',
+        '@', '%', '&', '*', '|', '/', '<',
+        '>', '+', '-', '.', '=', '<=', '>=',
+        '!=',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a63123;',
+            2 => 'color: #2312bc;',
+            3 => 'color: #cc1122; font-weight: bold;',
+            4 => 'color: #116688; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66aa;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #6666cc; font-weight: bold;',
+            1 => 'color: #66cc66; font-weight: bold;',
+            2 => 'color: #66cc66; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        # normal hash lines
+        0 => '\#(?!(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro) )[[:word:]]*',
+        # syntax functions hash thingis
+        1 => "\#(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro)",
+        2 => array(
+            GESHI_SEARCH  => "([a-zA-Z]+)(\n)(.*)(\n)(\\1;?)",
+            GESHI_REPLACE => '\3',
+            GESHI_BEFORE => '\1\2',
+            GESHI_AFTER => '\4\5',
+            GESHI_MODIFIERS => 'siU'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+?>
diff --git a/vendor/easybook/geshi/geshi/powerbuilder.php b/vendor/easybook/geshi/geshi/powerbuilder.php
new file mode 100755
index 000000000..d3fcf615f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/powerbuilder.php
@@ -0,0 +1,418 @@
+<?php
+/*************************************************************************************
+ * powerbuilder.php
+ * ------
+ * Author: Doug Porter (powerbuilder.geshi@gmail.com)
+ * Copyright: (c) 2009 Doug Porter
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/07/13
+ *
+ * PowerBuilder (PowerScript) language file for GeSHi.
+ *
+ * Based on the TextPad Syntax file for PowerBuilder
+ * built by Rafi Avital
+ *
+ * CHANGES
+ * -------
+ * 2009/07/13 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2009/07/13)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PowerBuilder',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '~',
+    'KEYWORDS' => array(
+        1 => array(
+            'alias', 'and', 'autoinstantiate', 'call',
+            'case', 'catch', 'choose', 'close', 'commit', 'connect',
+            'constant', 'continue', 'create', 'cursor', 'declare',
+            'delete', 'describe', 'descriptor', 'destroy', 'disconnect',
+            'do', 'dynamic', 'else', 'elseif', 'end', 'enumerated',
+            'event', 'execute', 'exit', 'external', 'false', 'fetch',
+            'first', 'for', 'forward', 'from', 'function', 'global',
+            'goto', 'halt', 'if', 'immediate', 'indirect', 'insert',
+            'into', 'intrinsic', 'is', 'last', 'library', 'loop', 'next',
+            'not', 'of', 'on', 'open', 'or', 'parent', 'post', 'prepare',
+            'prior', 'private', 'privateread', 'privatewrite', 'procedure',
+            'protected', 'protectedread', 'protectedwrite', 'prototypes',
+            'public', 'readonly', 'ref', 'return', 'rollback', 'rpcfunc',
+            'select', 'selectblob', 'shared', 'static', 'step', 'subroutine',
+            'super', 'system', 'systemread', 'systemwrite', 'then', 'this',
+            'to', 'trigger', 'true', 'try', 'type', 'until', 'update', 'updateblob',
+            'using', 'variables', 'where', 'while', 'with', 'within'
+            ),
+        2 => array (
+            'blob', 'boolean', 'char', 'character', 'date', 'datetime',
+            'dec', 'decimal',
+            'double', 'int', 'integer', 'long', 'real', 'string', 'time',
+            'uint', 'ulong', 'unsignedint', 'unsignedinteger', 'unsignedlong'
+            ),
+        3 => array (
+            'abortretryignore!', 'actbegin!', 'acterror!', 'actesql!',
+            'actgarbagecollect!', 'activate!', 'activatemanually!',
+            'activateondoubleclick!',
+            'activateongetfocus!', 'actline!', 'actobjectcreate!', 'actobjectdestroy!',
+            'actprofile!', 'actroutine!', 'acttrace!', 'actual!',
+            'actuser!', 'adoresultset!', 'adtdate!', 'adtdatetime!',
+            'adtdefault!', 'adtdouble!', 'adttext!', 'adttime!',
+            'aix!', 'alignatbottom!', 'alignatleft!', 'alignatright!',
+            'alignattop!', 'all!', 'allowpartialchanges!', 'alpha!',
+            'ansi!', 'any!', 'anycase!', 'anyfont!',
+            'append!', 'application!', 'arabiccharset!', 'area3d!',
+            'areagraph!', 'arraybounds!', 'arrow!', 'ascending!',
+            'asstatement!', 'atbottom!', 'atleft!', 'atright!',
+            'attop!', 'autosize!', 'background!', 'balticcharset!',
+            'bar3dgraph!', 'bar3dobjgraph!', 'bargraph!', 'barstack3dobjgraph!',
+            'barstackgraph!', 'bdiagonal!', 'beam!', 'begin!',
+            'begindrag!', 'beginlabeledit!', 'beginrightdrag!', 'behind!',
+            'blob!', 'bold!', 'boolean!', 'bottom!',
+            'boundedarray!', 'box!', 'byreferenceargument!', 'byvalueargument!',
+            'cancel!', 'cascade!', 'cascaded!', 'category!',
+            'center!', 'character!', 'charsetansi!', 'charsetansiarabic!',
+            'charsetansihebrew!', 'charsetdbcsjapanese!', 'charsetunicode!', 'checkbox!',
+            'child!', 'childtreeitem!', 'chinesebig5!', 'classdefinition!',
+            'classdefinitionobject!', 'classorstructuretype!', 'clicked!', 'clip!',
+            'clipboard!', 'clipformatbitmap!', 'clipformatdib!', 'clipformatdif!',
+            'clipformatenhmetafile!', 'clipformathdrop!', 'clipformatlocale!',
+            'clipformatmetafilepict!',
+            'clipformatoemtext!', 'clipformatpalette!', 'clipformatpendata!', 'clipformatriff!',
+            'clipformatsylk!', 'clipformattext!', 'clipformattiff!', 'clipformatunicodetext!',
+            'clipformatwave!', 'clock!', 'close!', 'closequery!',
+            'col3dgraph!', 'col3dobjgraph!', 'colgraph!',
+            'colstack3dobjgraph!', 'colstackgraph!', 'columnclick!', 'commandbutton!',
+            'connection!', 'connectioninfo!', 'connectobject!', 'connectprivilege!',
+            'connectwithadminprivilege!', 'constructor!', 'containsany!', 'containsembeddedonly!',
+            'containslinkedonly!', 'contextinformation!', 'contextkeyword!', 'continuous!',
+            'corbaobject!', 'corbaunion!', 'cplusplus!', 'cross!',
+            'csv!', 'cumulative!', 'cumulativepercent!', 'currenttreeitem!',
+            'customvisual!', 'dash!', 'dashdot!', 'dashdotdot!',
+            'data!', 'datachange!', 'datamodified!', 'datastore!',
+            'datawindow!', 'datawindowchild!', 'date!', 'datemask!',
+            'datetime!', 'datetimemask!', 'dbase2!', 'dbase3!',
+            'dberror!', 'deactivate!', 'decimal!', 'decimalmask!',
+            'decorative!', 'default!', 'defaultcharset!', 'delete!',
+            'deleteallitems!', 'deleteitem!', 'descending!', 'desktop!',
+            'destructor!', 'detail!', 'diamond!', 'dif!',
+            'dirall!', 'dirapplication!', 'dirdatawindow!', 'directionall!',
+            'directiondown!', 'directionleft!', 'directionright!', 'directionup!',
+            'dirfunction!', 'dirmenu!', 'dirpipeline!', 'dirproject!',
+            'dirquery!', 'dirstructure!', 'diruserobject!', 'dirwindow!',
+            'displayasactivexdocument!', 'displayascontent!', 'displayasicon!', 'dot!',
+            'double!', 'doubleclicked!', 'dragdrop!', 'dragenter!',
+            'dragleave!', 'dragobject!', 'dragwithin!', 'drawobject!',
+            'dropdownlistbox!', 'dropdownpicturelistbox!', 'drophighlighttreeitem!', 'dwobject!',
+            'dynamicdescriptionarea!', 'dynamicstagingarea!', 'easteuropecharset!', 'editchanged!',
+            'editmask!', 'editmenu!', 'end!', 'endlabeledit!',
+            'enterprise!', 'enterpriseonlyfeature!', 'enumeratedtype!', 'enumerationdefinition!',
+            'enumerationitemdefinition!', 'environment!', 'error!', 'errorlogging!',
+            'eventnotexisterror!', 'eventwrongprototypeerror!', 'excel!', 'excel5!',
+            'exceptionfail!', 'exceptionignore!', 'exceptionretry!',
+            'exceptionsubstitutereturnvalue!',
+            'exclamation!', 'exclude!', 'exportapplication!', 'exportdatawindow!',
+            'exportfunction!', 'exportmenu!', 'exportpipeline!', 'exportproject!',
+            'exportquery!', 'exportstructure!', 'exportuserobject!', 'exportwindow!',
+            'externalvisual!', 'extobject!', 'failonanyconflict!', 'fdiagonal!',
+            'featurenotsupportederror!', 'filealreadyopenerror!', 'filecloseerror!',
+            'fileexists!',
+            'fileinvalidformaterror!', 'filemenu!', 'filenotopenerror!', 'filenotseterror!',
+            'filereaderror!', 'filetyperichtext!', 'filetypetext!', 'filewriteerror!',
+            'filter!', 'first!', 'firstvisibletreeitem!', 'fixed!',
+            'floating!', 'focusrect!', 'footer!', 'foreground!',
+            'frombeginning!', 'fromcurrent!', 'fromend!', 'functionobject!',
+            'gb231charset!', 'getfocus!', 'graph!', 'graphicobject!',
+            'graxis!', 'grdispattr!', 'greekcharset!', 'groupbox!',
+            'hand!', 'hangeul!', 'header!', 'hebrewcharset!',
+            'helpmenu!', 'hide!', 'horizontal!', 'hotlinkalarm!',
+            'hourglass!', 'hppa!', 'hprogressbar!', 'hpux!',
+            'hscrollbar!', 'hticksonboth!', 'hticksonbottom!', 'hticksonneither!',
+            'hticksontop!', 'htmltable!', 'htrackbar!', 'i286!',
+            'i386!', 'i486!', 'icon!', 'icons!',
+            'idle!', 'importdatawindow!', 'indent!', 'index!',
+            'inet!', 'information!', 'inplace!', 'inputfieldselected!',
+            'insertitem!', 'inside!', 'integer!', 'internetresult!',
+            'italic!', 'itemchanged!', 'itemchanging!', 'itemcollapsed!',
+            'itemcollapsing!', 'itemerror!', 'itemexpanded!', 'itemexpanding!',
+            'itemfocuschanged!', 'itempopulate!', 'jaguarorb!', 'johabcharset!',
+            'justify!', 'key!', 'key0!', 'key1!',
+            'key2!', 'key3!', 'key4!', 'key5!',
+            'key6!', 'key7!', 'key8!', 'key9!',
+            'keya!', 'keyadd!', 'keyalt!', 'keyapps!',
+            'keyb!', 'keyback!', 'keybackquote!', 'keybackslash!',
+            'keyc!', 'keycapslock!', 'keycomma!', 'keycontrol!',
+            'keyd!', 'keydash!', 'keydecimal!', 'keydelete!',
+            'keydivide!', 'keydownarrow!', 'keye!', 'keyend!',
+            'keyenter!', 'keyequal!', 'keyescape!', 'keyf!',
+            'keyf1!', 'keyf10!', 'keyf11!', 'keyf12!',
+            'keyf2!', 'keyf3!', 'keyf4!', 'keyf5!',
+            'keyf6!', 'keyf7!', 'keyf8!', 'keyf9!',
+            'keyg!', 'keyh!', 'keyhome!', 'keyi!',
+            'keyinsert!', 'keyj!', 'keyk!', 'keyl!',
+            'keyleftarrow!', 'keyleftbracket!', 'keyleftbutton!', 'keyleftwindows!',
+            'keym!', 'keymiddlebutton!', 'keymultiply!', 'keyn!',
+            'keynull!', 'keynumlock!', 'keynumpad0!', 'keynumpad1!',
+            'keynumpad2!', 'keynumpad3!', 'keynumpad4!', 'keynumpad5!',
+            'keynumpad6!', 'keynumpad7!', 'keynumpad8!', 'keynumpad9!',
+            'keyo!', 'keyp!', 'keypagedown!', 'keypageup!',
+            'keypause!', 'keyperiod!', 'keyprintscreen!', 'keyq!',
+            'keyquote!', 'keyr!', 'keyrightarrow!', 'keyrightbracket!',
+            'keyrightbutton!', 'keyrightwindows!', 'keys!', 'keyscrolllock!',
+            'keysemicolon!', 'keyshift!', 'keyslash!', 'keyspacebar!',
+            'keysubtract!', 'keyt!', 'keytab!', 'keyu!',
+            'keyuparrow!', 'keyv!', 'keyw!', 'keyword!',
+            'keyx!', 'keyy!', 'keyz!', 'languageafrikaans!',
+            'languagealbanian!', 'languagearabicalgeria!', 'languagearabicbahrain!',
+            'languagearabicegypt!',
+            'languagearabiciraq!', 'languagearabicjordan!', 'languagearabickuwait!',
+            'languagearabiclebanon!',
+            'languagearabiclibya!', 'languagearabicmorocco!', 'languagearabicoman!',
+            'languagearabicqatar!',
+            'languagearabicsaudiarabia!', 'languagearabicsyria!', 'languagearabictunisia!',
+            'languagearabicuae!',
+            'languagearabicyemen!', 'languagebasque!', 'languagebulgarian!', 'languagebyelorussian!',
+            'languagecatalan!', 'languagechinese!', 'languagechinesehongkong!', 'languagechinesesimplified!',
+            'languagechinesesingapore!', 'languagechinesetraditional!', 'languagecroatian!', 'languageczech!',
+            'languagedanish!', 'languagedutch!', 'languagedutchbelgian!', 'languagedutchneutral!',
+            'languageenglish!', 'languageenglishaustralian!', 'languageenglishcanadian!',
+            'languageenglishirish!',
+            'languageenglishnewzealand!', 'languageenglishsouthafrica!', 'languageenglishuk!',
+            'languageenglishus!',
+            'languageestonian!', 'languagefaeroese!', 'languagefarsi!', 'languagefinnish!',
+            'languagefrench!', 'languagefrenchbelgian!', 'languagefrenchcanadian!', 'languagefrenchluxembourg!',
+            'languagefrenchneutral!', 'languagefrenchswiss!', 'languagegerman!', 'languagegermanaustrian!',
+            'languagegermanliechtenstein!', 'languagegermanluxembourg!', 'languagegermanneutral!',
+            'languagegermanswiss!',
+            'languagegreek!', 'languagehebrew!', 'languagehindi!', 'languagehungarian!',
+            'languageicelandic!', 'languageindonesian!', 'languageitalian!', 'languageitalianneutral!',
+            'languageitalianswiss!', 'languagejapanese!', 'languagekorean!', 'languagekoreanjohab!',
+            'languagelatvian!', 'languagelithuanian!', 'languagemacedonian!', 'languagemaltese!',
+            'languageneutral!', 'languagenorwegian!', 'languagenorwegianbokmal!', 'languagenorwegiannynorsk!',
+            'languagepolish!', 'languageportuguese!', 'languageportuguese_brazilian!',
+            'languageportugueseneutral!',
+            'languagerhaetoromanic!', 'languageromanian!', 'languageromanianmoldavia!', 'languagerussian!',
+            'languagerussianmoldavia!', 'languagesami!', 'languageserbian!', 'languageslovak!',
+            'languageslovenian!', 'languagesorbian!', 'languagesortnative!', 'languagesortunicode!',
+            'languagespanish!', 'languagespanishcastilian!', 'languagespanishmexican!', 'languagespanishmodern!',
+            'languagesutu!', 'languageswedish!', 'languagesystemdefault!', 'languagethai!',
+            'languagetsonga!', 'languagetswana!', 'languageturkish!', 'languageukrainian!',
+            'languageurdu!', 'languageuserdefault!', 'languagevenda!', 'languagexhosa!',
+            'languagezulu!', 'last!', 'layer!', 'layered!',
+            'Left!', 'leftmargin!', 'line!', 'line3d!',
+            'linear!', 'linecolor!', 'linedown!', 'linegraph!',
+            'lineleft!', 'linemode!', 'lineright!', 'lineup!',
+            'linkupdateautomatic!', 'linkupdatemanual!', 'listbox!', 'listview!',
+            'listviewitem!', 'listviewlargeicon!', 'listviewlist!', 'listviewreport!',
+            'listviewsmallicon!', 'lockread!', 'lockreadwrite!', 'lockwrite!',
+            'log10!', 'loge!', 'long!', 'losefocus!',
+            'lower!', 'lowered!', 'm68000!', 'm68020!',
+            'm68030!', 'm68040!', 'maccharset!', 'macintosh!',
+            'mailattach!', 'mailbcc!', 'mailbodyasfile!', 'mailcc!',
+            'maildownload!', 'mailentiremessage!', 'mailenvelopeonly!', 'mailfiledescription!',
+            'mailmessage!', 'mailnewsession!', 'mailnewsessionwithdownload!', 'mailole!',
+            'mailolestatic!', 'mailoriginator!', 'mailrecipient!', 'mailreturnaccessdenied!',
+            'mailreturnattachmentnotfound!', 'mailreturnattachmentopenfailure!',
+            'mailreturnattachmentwritefailure!', 'mailreturndiskfull!',
+            'mailreturnfailure!', 'mailreturninsufficientmemory!', 'mailreturninvalidmessage!',
+            'mailreturnloginfailure!',
+            'mailreturnmessageinuse!', 'mailreturnnomessages!', 'mailreturnsuccess!', 'mailreturntexttoolarge!',
+            'mailreturntoomanyfiles!', 'mailreturntoomanyrecipients!', 'mailreturntoomanysessions!',
+            'mailreturnunknownrecipient!',
+            'mailreturnuserabort!', 'mailsession!', 'mailsuppressattachments!', 'mailto!',
+            'main!', 'maximized!', 'mdi!', 'mdiclient!',
+            'mdihelp!', 'menu!', 'menucascade!', 'menuitemtypeabout!',
+            'menuitemtypeexit!', 'menuitemtypehelp!', 'menuitemtypenormal!', 'merge!',
+            'message!', 'minimized!', 'mips!', 'modelexistserror!',
+            'modelnotexistserror!', 'modern!', 'modified!', 'mousedown!',
+            'mousemove!', 'mouseup!', 'moved!', 'multiline!',
+            'multilineedit!', 'mutexcreateerror!', 'new!', 'newmodified!',
+            'next!', 'nexttreeitem!', 'nextvisibletreeitem!', 'noborder!',
+            'noconnectprivilege!', 'nolegend!', 'none!', 'nonvisualobject!',
+            'normal!', 'nosymbol!', 'notic!', 'notmodified!',
+            'notopmost!', 'notype!', 'numericmask!', 'objhandle!',
+            'oem!', 'off!', 'offsite!', 'ok!',
+            'okcancel!', 'olecontrol!', 'olecustomcontrol!', 'oleobject!',
+            'olestorage!', 'olestream!', 'oletxnobject!', 'omcontrol!',
+            'omcustomcontrol!', 'omembeddedcontrol!', 'omobject!', 'omstorage!',
+            'omstream!', 'open!', 'orb!', 'original!',
+            'osf1!', 'other!', 'outside!', 'oval!',
+            'pagedown!', 'pageleft!', 'pageright!', 'pageup!',
+            'parenttreeitem!', 'pbtocppobject!', 'pentium!', 'percentage!',
+            'picture!', 'picturebutton!', 'picturehyperlink!', 'picturelistbox!',
+            'pictureselected!', 'pie3d!', 'piegraph!', 'pipeend!',
+            'pipeline!', 'pipemeter!', 'pipestart!', 'popup!',
+            'powerobject!', 'powerpc!', 'powerrs!', 'ppc601!',
+            'ppc603!', 'ppc604!', 'previewdelete!', 'previewfunctionreselectrow!',
+            'previewfunctionretrieve!', 'previewfunctionupdate!', 'previewinsert!', 'previewselect!',
+            'previewupdate!', 'previoustreeitem!', 'previousvisibletreeitem!', 'primary!',
+            'printend!', 'printfooter!', 'printheader!', 'printpage!',
+            'printstart!', 'prior!', 'private!', 'process!',
+            'profilecall!', 'profileclass!', 'profileline!', 'profileroutine!',
+            'profiling!', 'protected!', 'psreport!', 'public!',
+            'question!', 'radiobutton!', 'raised!', 'rbuttondown!',
+            'rbuttonup!', 'read!', 'readonlyargument!', 'real!',
+            'rectangle!', 'regbinary!', 'regexpandstring!', 'reglink!',
+            'regmultistring!', 'regstring!', 'regulong!', 'regulongbigendian!',
+            'remoteexec!', 'remotehotlinkstart!', 'remotehotlinkstop!', 'remoteobject!',
+            'remoterequest!', 'remotesend!', 'rename!', 'replace!',
+            'resize!', 'resizeborder!', 'response!', 'resultset!',
+            'resultsets!', 'retrieveend!', 'retrieverow!', 'retrievestart!',
+            'retrycancel!', 'richtextedit!', 'Right!', 'rightclicked!',
+            'rightdoubleclicked!', 'rightmargin!', 'rnddays!', 'rnddefault!',
+            'rndhours!', 'rndmicroseconds!', 'rndminutes!', 'rndmonths!',
+            'rndnumber!', 'rndseconds!', 'rndyears!', 'roman!',
+            'roottreeitem!', 'roundrectangle!', 'routineesql!', 'routineevent!',
+            'routinefunction!', 'routinegarbagecollection!', 'routineobjectcreation!',
+            'routineobjectdestruction!',
+            'routineroot!', 'rowfocuschanged!', 'russiancharset!', 'save!',
+            'scalartype!', 'scattergraph!', 'script!', 'scriptdefinition!',
+            'scriptevent!', 'scriptfunction!', 'scrollhorizontal!', 'scrollvertical!',
+            'selected!', 'selectionchanged!', 'selectionchanging!', 'series!',
+            'service!', 'shade!', 'shadowbox!', 'shared!',
+            'sharedobjectcreateinstanceerror!', 'sharedobjectcreatepbsessionerror!',
+            'sharedobjectexistserror!', 'sharedobjectnotexistserror!',
+            'shiftjis!', 'show!', 'simpletype!', 'simpletypedefinition!',
+            'singlelineedit!', 'size!', 'sizenesw!', 'sizens!',
+            'sizenwse!', 'sizewe!', 'sol2!', 'solid!',
+            'sort!', 'sourcepblerror!', 'spacing1!', 'spacing15!',
+            'spacing2!', 'sparc!', 'sqlinsert!', 'sqlpreview!',
+            'square!', 'sslcallback!', 'sslserviceprovider!', 'statichyperlink!',
+            'statictext!', 'stgdenynone!', 'stgdenyread!', 'stgdenywrite!',
+            'stgexclusive!', 'stgread!', 'stgreadwrite!', 'stgwrite!',
+            'stopsign!', 'straddle!', 'streammode!', 'stretch!',
+            'strikeout!', 'string!', 'stringmask!', 'structure!',
+            'stylebox!', 'stylelowered!', 'styleraised!', 'styleshadowbox!',
+            'subscript!', 'success!', 'superscript!', 'swiss!',
+            'sylk!', 'symbol!', 'symbolhollowbox!', 'symbolhollowcircle!',
+            'symbolhollowdiamond!', 'symbolhollowdownarrow!', 'symbolhollowuparrow!', 'symbolplus!',
+            'symbolsolidbox!', 'symbolsolidcircle!', 'symbolsoliddiamond!', 'symbolsoliddownarrow!',
+            'symbolsoliduparrow!', 'symbolstar!', 'symbolx!', 'system!',
+            'systemerror!', 'systemfunctions!', 'systemkey!', 'tab!',
+            'tabsonbottom!', 'tabsonbottomandtop!', 'tabsonleft!', 'tabsonleftandright!',
+            'tabsonright!', 'tabsonrightandleft!', 'tabsontop!', 'tabsontopandbottom!',
+            'text!', 'thaicharset!', 'thread!', 'tile!',
+            'tilehorizontal!', 'time!', 'timemask!', 'timer!',
+            'timernone!', 'timing!', 'tobottom!', 'toolbarmoved!',
+            'top!', 'topic!', 'topmost!', 'totop!',
+            'traceactivitynode!', 'traceatomic!', 'tracebeginend!', 'traceerror!',
+            'traceesql!', 'tracefile!', 'tracegarbagecollect!', 'tracegeneralerror!',
+            'tracein!', 'traceline!', 'tracenomorenodes!', 'tracenotstartederror!',
+            'traceobject!', 'traceout!', 'traceroutine!', 'tracestartederror!',
+            'tracetree!', 'tracetreeerror!', 'tracetreeesql!', 'tracetreegarbagecollect!',
+            'tracetreeline!', 'tracetreenode!', 'tracetreeobject!', 'tracetreeroutine!',
+            'tracetreeuser!', 'traceuser!', 'transaction!', 'transactionserver!',
+            'transparent!', 'transport!', 'treeview!', 'treeviewitem!',
+            'turkishcharset!', 'typeboolean!', 'typecategory!', 'typecategoryaxis!',
+            'typecategorylabel!', 'typedata!', 'typedate!', 'typedatetime!',
+            'typedecimal!', 'typedefinition!', 'typedouble!', 'typegraph!',
+            'typeinteger!', 'typelegend!', 'typelong!', 'typereal!',
+            'typeseries!', 'typeseriesaxis!', 'typeserieslabel!', 'typestring!',
+            'typetime!', 'typetitle!', 'typeuint!', 'typeulong!',
+            'typeunknown!', 'typevalueaxis!', 'typevaluelabel!', 'ultrasparc!',
+            'unboundedarray!', 'underline!', 'underlined!', 'unsignedinteger!',
+            'unsignedlong!', 'unsorted!', 'uparrow!', 'updateend!',
+            'updatestart!', 'upper!', 'userdefinedsort!', 'userobject!',
+            'variable!', 'variableargument!', 'variablecardinalitydefinition!', 'variabledefinition!',
+            'variableglobal!', 'variableinstance!', 'variablelocal!', 'variableshared!',
+            'varlistargument!', 'vbxvisual!', 'vcenter!', 'vertical!',
+            'vietnamesecharset!', 'viewchange!', 'vprogressbar!', 'vscrollbar!',
+            'vticksonboth!', 'vticksonleft!', 'vticksonneither!', 'vticksonright!',
+            'vtrackbar!', 'window!', 'windowmenu!', 'windowobject!',
+            'windows!', 'windowsnt!', 'wk1!', 'wks!',
+            'wmf!', 'write!', 'xpixelstounits!', 'xunitstopixels!',
+            'xvalue!', 'yesno!', 'yesnocancel!', 'ypixelstounits!',
+            'yunitstopixels!',
+            'yvalue!',
+            'zoom!'
+            )
+        ),
+    'SYMBOLS' => array(
+            0 => array('(', ')', '[', ']', '{', '}'),
+            1 => array('|'),
+            2 => array('+', '-', '*', '/'),
+            3 => array('=', '&lt;', '>', '^')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008000; font-weight: bold;',
+            2 => 'color: #990099; font-weight: bold;',
+            3 => 'color: #330099; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            'MULTI' => 'color: #0000ff; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #330099; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #ffff00; background-color:#993300; font-weight: bold',
+            2 => 'color: #000000;',
+            3 => 'color: #000000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/powershell.php b/vendor/easybook/geshi/geshi/powershell.php
new file mode 100755
index 000000000..bd78d7392
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/powershell.php
@@ -0,0 +1,277 @@
+<?php
+/*************************************************************************************
+ * powershell.php
+ * ---------------------------------
+ * Author: Frode Aarebrot (frode@aarebrot.net)
+ * Copyright: (c) 2008 Frode Aarebrot (http://www.aarebrot.net)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/06/20
+ *
+ * PowerShell language file for GeSHi.
+ *
+ * I've tried to make this language file as true to the highlighting in PowerGUI as
+ * possible. Unfortunately it's not 100% complete, although it is pretty close.
+ *
+ * I've included some classes and their members, but there's tons and tons of these.
+ * I suggest you add the ones you need yourself. I've included a few Sharepoint ones
+ * in this language file.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/20 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2008/06/20)
+ * -------------------------
+ * - Color text between Cmdlets/Aliases and pipe/end-of-line
+ * - Try and get -- and ++ to work in the KEYWORDS array with the other operators
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PowerShell',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('<#' => '#>'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '`',
+    'KEYWORDS' => array(
+        1 => array(
+            // Cmdlets
+            'Add-Content', 'Add-History', 'Add-Member', 'Add-PSSnapin', 'Clear-Content', 'Clear-Item',
+            'Clear-ItemProperty', 'Clear-Variable', 'Compare-Object', 'ConvertFrom-SecureString',
+            'Convert-Path', 'ConvertTo-Html', 'ConvertTo-SecureString', 'Copy-Item', 'Copy-ItemProperty',
+            'Export-Alias', 'Export-Clixml', 'Export-Console', 'Export-Csv', 'ForEach-Object',
+            'Format-Custom', 'Format-List', 'Format-Table', 'Format-Wide', 'Get-Acl', 'Get-Alias',
+            'Get-AuthenticodeSignature', 'Get-ChildItem', 'Get-Command', 'Get-Content', 'Get-Credential',
+            'Get-Culture', 'Get-Date', 'Get-EventLog', 'Get-ExecutionPolicy', 'Get-Help', 'Get-History',
+            'Get-Host', 'Get-Item', 'Get-ItemProperty', 'Get-Location', 'Get-Member',
+            'Get-PfxCertificate', 'Get-Process', 'Get-PSDrive', 'Get-PSProvider', 'Get-PSSnapin',
+            'Get-Service', 'Get-TraceSource', 'Get-UICulture', 'Get-Unique', 'Get-Variable',
+            'Get-WmiObject', 'Group-Object', 'Import-Alias', 'Import-Clixml', 'Import-Csv',
+            'Invoke-Expression', 'Invoke-History', 'Invoke-Item', 'Join-Path', 'Measure-Command',
+            'Measure-Object', 'Move-Item', 'Move-ItemProperty', 'New-Alias', 'New-Item',
+            'New-ItemProperty', 'New-Object', 'New-PSDrive', 'New-Service', 'New-TimeSpan',
+            'New-Variable', 'Out-Default', 'Out-File', 'Out-Host', 'Out-Null', 'Out-Printer',
+            'Out-String', 'Pop-Location', 'Push-Location', 'Read-Host', 'Remove-Item',
+            'Remove-ItemProperty', 'Remove-PSDrive', 'Remove-PSSnapin', 'Remove-Variable', 'Rename-Item',
+            'Rename-ItemProperty', 'Resolve-Path', 'Restart-Service', 'Resume-Service', 'Select-Object',
+            'Select-String', 'Set-Acl', 'Set-Alias', 'Set-AuthenticodeSignature', 'Set-Content',
+            'Set-Date', 'Set-ExecutionPolicy', 'Set-Item', 'Set-ItemProperty', 'Set-Location',
+            'Set-PSDebug', 'Set-Service', 'Set-TraceSource', 'Set-Variable', 'Sort-Object', 'Split-Path',
+            'Start-Service', 'Start-Sleep', 'Start-Transcript', 'Stop-Process', 'Stop-Service',
+            'Stop-Transcript', 'Suspend-Service', 'Tee-Object', 'Test-Path', 'Trace-Command',
+            'Update-FormatData', 'Update-TypeData', 'Where-Object', 'Write-Debug', 'Write-Error',
+            'Write-Host', 'Write-Output', 'Write-Progress', 'Write-Verbose', 'Write-Warning'
+            ),
+        2 => array(
+            // Aliases
+            'ac', 'asnp', 'clc', 'cli', 'clp', 'clv', 'cpi', 'cpp', 'cvpa', 'diff', 'epal', 'epcsv', 'fc',
+            'fl', 'ft', 'fw', 'gal', 'gc', 'gci', 'gcm', 'gdr', 'ghy', 'gi', 'gl', 'gm',
+            'gp', 'gps', 'group', 'gsv', 'gsnp', 'gu', 'gv', 'gwmi', 'iex', 'ihy', 'ii', 'ipal', 'ipcsv',
+            'mi', 'mp', 'nal', 'ndr', 'ni', 'nv', 'oh', 'rdr', 'ri', 'rni', 'rnp', 'rp', 'rsnp', 'rv',
+            'rvpa', 'sal', 'sasv', 'sc', 'select', 'si', 'sl', 'sleep', 'sort', 'sp', 'spps', 'spsv', 'sv',
+            'tee', 'write', 'cat', 'cd', 'clear', 'cp', 'h', 'history', 'kill', 'lp', 'ls',
+            'mount', 'mv', 'popd', 'ps', 'pushd', 'pwd', 'r', 'rm', 'rmdir', 'echo', 'cls', 'chdir',
+            'copy', 'del', 'dir', 'erase', 'move', 'rd', 'ren', 'set', 'type'
+            ),
+        3 => array(
+            // Reserved words
+            'break', 'continue', 'do', 'for', 'foreach', 'while', 'if', 'switch', 'until', 'where',
+            'function', 'filter', 'else', 'elseif', 'in', 'return', 'param', 'throw', 'trap'
+            ),
+        4 => array(
+            // Operators
+            '-eq', '-ne', '-gt', '-ge', '-lt', '-le', '-ieq', '-ine', '-igt', '-ige', '-ilt', '-ile',
+            '-ceq', '-cne', '-cgt', '-cge', '-clt', '-cle', '-like', '-notlike', '-match', '-notmatch',
+            '-ilike', '-inotlike', '-imatch', '-inotmatch', '-clike', '-cnotlike', '-cmatch', '-cnotmatch',
+            '-contains', '-notcontains', '-icontains', '-inotcontains', '-ccontains', '-cnotcontains',
+            '-isnot', '-is', '-as', '-replace', '-ireplace', '-creplace', '-and', '-or', '-band', '-bor',
+            '-not', '-bnot', '-f', '-casesensitive', '-exact', '-file', '-regex', '-wildcard'
+            ),
+        5 => array(
+            // Options
+            '-Year', '-Wrap', '-Word', '-Width', '-WhatIf', '-Wait', '-View', '-Verbose', '-Verb',
+            '-Variable', '-ValueOnly', '-Value', '-Unique', '-UFormat', '-TypeName', '-Trace', '-TotalCount',
+            '-Title', '-TimestampServer', '-TargetObject', '-Syntax', '-SyncWindow', '-Sum', '-String',
+            '-Strict', '-Stream', '-Step', '-Status', '-Static', '-StartupType', '-Start', '-StackName',
+            '-Stack', '-SourceId', '-SimpleMatch', '-ShowError', '-Separator', '-SecureString', '-SecureKey',
+            '-SecondValue', '-SecondsRemaining', '-Seconds', '-Second', '-Scope', '-Root', '-Role',
+            '-Resolve', '-RemoveListener', '-RemoveFileListener', '-Registered', '-ReferenceObject',
+            '-Recurse', '-RecommendedAction', '-ReadCount', '-Quiet', '-Query', '-Qualifier', '-PSSnapin',
+            '-PSProvider', '-PSHost', '-PSDrive', '-PropertyType', '-Property', '-Prompt', '-Process',
+            '-PrependPath', '-PercentComplete', '-Pattern', '-PathType', '-Path', '-PassThru', '-ParentId',
+            '-Parent', '-Parameter', '-Paging', '-OutVariable', '-OutBuffer', '-Option', '-OnType', '-Off',
+            '-Object', '-Noun', '-NoTypeInformation', '-NoQualifier', '-NoNewline', '-NoElement',
+            '-NoClobber', '-NewName', '-Newest', '-Namespace', '-Name', '-Month', '-Minutes', '-Minute',
+            '-Minimum', '-Milliseconds', '-Message', '-MemberType', '-Maximum', '-LogName', '-LiteralPath',
+            '-LiteralName', '-ListenerOption', '-List', '-Line', '-Leaf', '-Last', '-Key', '-ItemType',
+            '-IsValid', '-IsAbsolute', '-InputObject', '-IncludeEqual', '-IncludeChain', '-Include',
+            '-IgnoreWhiteSpace', '-Id', '-Hours', '-Hour', '-HideTableHeaders', '-Head', '-GroupBy',
+            '-Functionality', '-Full', '-Format', '-ForegroundColor', '-Force', '-First', '-FilterScript',
+            '-Filter', '-FilePath', '-Expression', '-ExpandProperty', '-Expand', '-ExecutionPolicy',
+            '-ExcludeProperty', '-ExcludeDifferent', '-Exclude', '-Exception', '-Examples', '-ErrorVariable',
+            '-ErrorRecord', '-ErrorId', '-ErrorAction', '-End', '-Encoding', '-DisplayName', '-DisplayHint',
+            '-DisplayError', '-DifferenceObject', '-Detailed', '-Destination', '-Description', '-Descending',
+            '-Depth', '-DependsOn', '-Delimiter', '-Debugger', '-Debug', '-Days', '-Day', '-Date',
+            '-CurrentOperation', '-Culture', '-Credential', '-Count', '-Container', '-Confirm',
+            '-ComputerName', '-Component', '-Completed', '-ComObject', '-CommandType', '-Command',
+            '-Column', '-Class', '-ChildPath', '-Character', '-Certificate', '-CategoryTargetType',
+            '-CategoryTargetName', '-CategoryReason', '-CategoryActivity', '-Category', '-CaseSensitive',
+            '-Body', '-BinaryPathName', '-Begin', '-BackgroundColor', '-Average', '-AutoSize', '-Audit',
+            '-AsString', '-AsSecureString', '-AsPlainText', '-As', '-ArgumentList', '-AppendPath', '-Append',
+            '-Adjust', '-Activity', '-AclObject'
+            ),
+        6 => array(
+            '_','args','DebugPreference','Error','ErrorActionPreference',
+            'foreach','Home','Host','Input','LASTEXITCODE','MaximumAliasCount',
+            'MaximumDriveCount','MaximumFunctionCount','MaximumHistoryCount',
+            'MaximumVariableCount','OFS','PsHome',
+            'ReportErrorShowExceptionClass','ReportErrorShowInnerException',
+            'ReportErrorShowSource','ReportErrorShowStackTrace',
+            'ShouldProcessPreference','ShouldProcessReturnPreference',
+            'StackTrace','VerbosePreference','WarningPreference','PWD'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '=', '<', '>', '@', '|', '&', ',', '?',
+        '+=', '-=', '*=', '/=', '%=', '*', '/', '%', '!', '+', '-', '++', '--'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008080; font-weight: bold;',
+            2 => 'color: #008080; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #FF0000;',
+            5 => 'color: #008080; font-style: italic;',
+            6 => 'color: #000080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #804000;'
+            ),
+        'METHODS' => array(
+            0 => 'color: pink;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: pink;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #800080;',
+            3 => 'color: #008080;',
+            4 => 'color: #008080;',
+            5 => 'color: #800000;',
+            6 => 'color: #000080;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => 'about:blank',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // special after pipe
+        3 => array(
+            GESHI_SEARCH => '(\[)(int|long|string|char|bool|byte|double|decimal|float|single|regex|array|xml|scriptblock|switch|hashtable|type|ref|psobject|wmi|wmisearcher|wmiclass|object)((\[.*\])?\])',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Classes
+        4 => array(
+            GESHI_SEARCH => '(\[)(System\.Reflection\.Assembly|System\.Net\.CredentialCache|Microsoft\.SharePoint\.SPFileLevel|Microsoft\.SharePoint\.Publishing\.PublishingWeb|Microsoft\.SharePoint\.Publishing|Microsoft\.SharePoint\.SPWeb)(\])',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Members
+        // There's about a hundred million of these, add the ones you need as you need them
+        5 => array (
+            GESHI_SEARCH => '(::)(ReflectionOnlyLoadFrom|ReflectionOnlyLoad|ReferenceEquals|LoadWithPartialName|LoadFrom|LoadFile|Load|GetExecutingAssembly|GetEntryAssembly|GetCallingAssembly|GetAssembly|Equals|DefaultNetworkCredentials|DefaultCredentials|CreateQualifiedName|Checkout|Draft|Published|IsPublishingWeb)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => ''
+            ),
+        // Special variables
+        6 => array(
+            GESHI_SEARCH => '(\$)(\$[_\^]?|\?)(?!\w)',
+            GESHI_REPLACE => '\1\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // variables
+        //BenBE: Please note that changes here and in Keyword group 6 have to be synchronized in order to work properly.
+        //This Regexp must only match, if keyword group 6 doesn't. If this assumption fails
+        //Highlighting of the keywords will be incomplete or incorrect!
+        0 => "(?<!\\\$|>)[\\\$](\w+)(?=[^|\w])",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_AFTER' => '(?![a-zA-Z])',
+                'DISALLOWED_BEFORE' => ''
+                ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<!\$>)\$'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/proftpd.php b/vendor/easybook/geshi/geshi/proftpd.php
new file mode 100755
index 000000000..330db4b27
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/proftpd.php
@@ -0,0 +1,374 @@
+<?php
+/*************************************************************************************
+ * proftpd.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2010 Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/01/25
+ *
+ * ProFTPd language file for GeSHi.
+ * Words are scraped from their documentation
+ *
+ * CHANGES
+ * -------
+ * 2004/08/05 (1.0.8.10)
+ *   -  First Release
+ *
+ * TODO (updated 2011/01/25)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ProFTPd configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            //mod_auth
+            'AccessDenyMsg', 'AccessGrantMsg', 'AnonRejectePasswords',
+            'AnonRequirePassword', 'AuthAliasOnly', 'AuthUsingAlias',
+            'CreateHome', 'DefaultChdir', 'DefaultRoot', 'GroupPassword',
+            'LoginPasswordPrompt', 'MaxClients', 'MaxClientsPerClass',
+            'MaxClientsPerHost', 'MaxClientsPerUser', 'MaxConnectionsPerHost',
+            'MaxHostsPerUser', 'MaxLoginAttempts', 'RequireValidShell',
+            'RootLogin', 'RootRevoke', 'TimeoutLogin', 'TimeoutSession',
+            'UseFtpUsers', 'UserAlias', 'UserDirRoot', 'UserPassword',
+
+            //mod_auth_file
+            'AuthGroupFile', 'AuthUserFile',
+
+            //mod_auth_pam
+            'AuthPAM', 'AuthPAMConfig',
+
+            //mod_auth_unix
+            'PersistentPasswd',
+
+            //mod_ban
+            'BanControlsACLs', 'BanEngine', 'BanLog', 'BanMessage', 'BanOnEvent',
+            'BanTable',
+
+            //mod_cap
+            'CapabilitiesEngine', 'CapabilitiesSet',
+
+            //mod_core
+            'Allow', 'AllowAll', 'AllowClass', 'AllowFilter',
+            'AllowForeignAddress', 'AllowGroup', 'AllowOverride',
+            'AllowRetrieveRestart', 'AllowStoreRestart', 'AllowUser',
+            'AnonymousGroup', 'AuthOrder', 'Bind', 'CDPath', 'Class', 'Classes',
+            'CommandBufferSize', 'DebugLevel', 'DefaultAddress',
+            'DefaultServer', 'DefaultTransferMode', 'DeferWelcome', 'Define',
+            'Deny', 'DenyAll', 'DenyClass', 'DenyFilter', 'DenyGroup',
+            'DenyUser', 'DisplayChdir', 'DisplayConnect', 'DisplayFirstChdir',
+            'DisplayGoAway', 'DisplayLogin', 'DisplayQuit', 'From', 'Group',
+            'GroupOwner', 'HideFiles', 'HideGroup', 'HideNoAccess', 'HideUser',
+            'IdentLookups', 'IgnoreHidden', 'Include', 'MasqueradeAddress',
+            'MaxConnectionRate', 'MaxInstances', 'MultilineRFC2228', 'Order',
+            'PassivePorts', 'PathAllowFilter', 'PathDenyFilter', 'PidFile',
+            'Port', 'RLimitCPU', 'RLimitMemory', 'RLimitOpenFiles', 'Satisfy',
+            'ScoreboardFile', 'ServerAdmin', 'ServerIdent', 'ServerName',
+            'ServerType', 'SetEnv', 'SocketBindTight', 'SocketOptions',
+            'SyslogFacility', 'SyslogLevel', 'tcpBackLog', 'tcpNoDelay',
+            'TimeoutIdle', 'TimeoutLinger', 'TimesGMT', 'TransferLog', 'Umask',
+            'UnsetEnv', 'UseIPv6', 'User', 'UseReverseDNS', 'UserOwner',
+            'UseUTF8', 'WtmpLog',
+
+            //mod_ctrls_admin
+            'AdminControlsACLs', 'AdminControlsEngine',
+
+            //mod_delay
+            'DelayEngine', 'DelayTable',
+
+            //mod_dynmasq
+            'DynMasqRefresh',
+
+            //mod_exec
+            'ExecBeforeCommand', 'ExecEngine', 'ExecEnviron', 'ExecLog',
+            'ExecOnCommand', 'ExecOnConnect', 'ExecOnError', 'ExecOnEvent',
+            'ExecOnExit', 'ExecOnRestart', 'ExecOptions', 'ExecTimeout',
+
+            //mod_ldap
+            'LDAPAliasDereference', 'LDAPAttr', 'LDAPAuthBinds',
+            'LDAPDefaultAuthScheme', 'LDAPDefaultGID', 'LDAPDefaultUID',
+            'LDAPDNInfo', 'LDAPDoAuth', 'LDAPDoGIDLookups',
+            'LDAPDoQuotaLookups', 'LDAPDoUIDLookups',
+            'LDAPForceGeneratedHomedir', 'LDAPForceHomedirOnDemand',
+            'LDAPGenerateHomedir', 'LDAPGenerateHomedirPrefix',
+            'LDAPGenerateHomedirPrefixNoUsername', 'LDAPHomedirOnDemand',
+            'LDAPHomedirOnDemandPrefix', 'LDAPHomedirOnDemandPrefixNoUsername',
+            'LDAPHomedirOnDemandSuffix', 'LDAPNegativeCache',
+            'LDAPProtocolVersion', 'LDAPQueryTimeout', 'LDAPSearchScope',
+            'LDAPServer',
+
+            //mod_load
+            'MaxLoad',
+
+            //mod_log
+            'AllowLogSymlinks', 'ExtendedLog', 'LogFormat', 'ServerLog',
+            'SystemLog',
+
+            //mod_ls'
+            'DirFakeGroup', 'DirFakeMode', 'DirFakeUser', 'ListOptions',
+            'ShowSymlinks', 'UseGlobbing',
+
+            //mod_quotatab
+            'QuotaDirectoryTally', 'QuotaDisplayUnits', 'QuotaEngine',
+            'QuotaExcludeFilter', 'QuotaLimitTable', 'QuotaLock', 'QuotaLog',
+            'QuotaOptions', 'QuotaShowQuotas', 'QuotaTallyTable',
+
+            //mod_quotatab_file
+
+            //mod_quotatab_ldap
+
+            //mod_quotatab_sql
+
+            //mod_radius
+            'RadiusAcctServer', 'RadiusAuthServer', 'RadiusEngine',
+            'RadiusGroupInfo', 'RadiusLog', 'RadiusNASIdentifier',
+            'RadiusQuotaInfo', 'RadiusRealm', 'RadiusUserInfo', 'RadiusVendor',
+
+            //mod_ratio
+            'AnonRatio', 'ByteRatioErrMsg', 'CwdRatioMsg', 'FileRatioErrMsg',
+            'GroupRatio', 'HostRatio', 'LeechRatioMsg', 'RatioFile', 'Ratios',
+            'RatioTempFile', 'SaveRatios', 'UserRatio',
+
+            //mod_readme
+            'DisplayReadme',
+
+            //mod_rewrite
+            'RewriteCondition', 'RewriteEngine', 'RewriteLock', 'RewriteLog',
+            'RewriteMap', 'RewriteRule',
+
+            //mod_sftp
+            'SFTPAcceptEnv', 'SFTPAuthMethods', 'SFTPAuthorizedHostKeys',
+            'SFTPAuthorizedUserKeys', 'SFTPCiphers', 'SFTPClientMatch',
+            'SFTPCompression', 'SFTPCryptoDevice', 'SFTPDHParamFile',
+            'SFTPDigests', 'SFTPDisplayBanner', 'SFTPEngine', 'SFTPExtensions',
+            'SFTPHostKey', 'SFTPKeyBlacklist', 'SFTPKeyExchanges', 'SFTPLog',
+            'SFTPMaxChannels', 'SFTPOptions', 'SFTPPassPhraseProvider',
+            'SFTPRekey', 'SFTPTrafficPolicy',
+
+            //mod_sftp_pam
+            'SFTPPAMEngine', 'SFTPPAMOptions', 'SFTPPAMServiceName',
+
+            //mod_sftp_sql
+
+            //mod_shaper
+            'ShaperAll', 'ShaperControlsACLs', 'ShaperEngine', 'ShaperLog',
+            'ShaperSession', 'ShaperTable',
+
+            //mod_sql
+            'SQLAuthenticate', 'SQLAuthTypes', 'SQLBackend', 'SQLConnectInfo',
+            'SQLDefaultGID', 'SQLDefaultHomedir', 'SQLDefaultUID', 'SQLEngine',
+            'SQLGroupInfo', 'SQLGroupWhereClause', 'SQLHomedirOnDemand',
+            'SQLLog', 'SQLLogFile', 'SQLMinID', 'SQLMinUserGID',
+            'SQLMinUserUID', 'SQLNamedQuery', 'SQLNegativeCache', 'SQLOptions',
+            'SQLRatios', 'SQLRatioStats', 'SQLShowInfo', 'SQLUserInfo',
+            'SQLUserWhereClause',
+
+            //mod_sql_passwd
+            'SQLPasswordEncoding', 'SQLPasswordEngine', 'SQLPasswordSaltFile',
+            'SQLPasswordUserSalt',
+
+            //mod_tls
+            'TLSCACertificateFile', 'TLSCACertificatePath',
+            'TLSCARevocationFile', 'TLSCARevocationPath',
+            'TLSCertificateChainFile', 'TLSCipherSuite', 'TLSControlsACLs',
+            'TLSCryptoDevice', 'TLSDHParamFile', 'TLSDSACertificateFile',
+            'TLSDSACertificateKeyFile', 'TLSEngine', 'TLSLog', 'TLSOptions',
+            'TLSPKCS12File', 'TLSPassPhraseProvider', 'TLSProtocol',
+            'TLSRandomSeed', 'TLSRenegotiate', 'TLSRequired',
+            'TLSRSACertificateFile', 'TLSRSACertificateKeyFile',
+            'TLSSessionCache', 'TLSTimeoutHandshake', 'TLSVerifyClient',
+            'TLSVerifyDepth', 'TLSVerifyOrder',
+
+            //mod_tls_shmcache
+
+            //mod_unique_id
+            'UniqueIDEngine',
+
+            //mod_wrap
+            'TCPAccessFiles', 'TCPAccessSyslogLevels', 'TCPGroupAccessFiles',
+            'TCPServiceName', 'TCPUserAccessFiles',
+
+            //mod_wrap2
+            'WrapAllowMsg', 'WrapDenyMsg', 'WrapEngine', 'WrapGroupTables',
+            'WrapLog', 'WrapServiceName', 'WrapTables', 'WrapUserTables',
+
+            //mod_wrap2_file
+
+            //mod_wrap2_sql
+
+            //mod_xfer
+            'AllowOverwrite', 'DeleteAbortedStores', 'DisplayFileTransfer',
+            'HiddenStor', 'HiddenStores', 'MaxRetrieveFileSize',
+            'MaxStoreFileSize', 'StoreUniquePrefix', 'TimeoutNoTransfer',
+            'TimeoutStalled', 'TransferRate', 'UseSendfile',
+
+            //unknown
+            'ScoreboardPath', 'ScoreboardScrub'
+            ),
+        /*keywords 3*/
+        3 => array(
+            //mod_core
+            'Anonymous',
+            'Class',
+            'Directory',
+            'IfDefine',
+            'IfModule',
+            'Limit',
+            'VirtualHost',
+
+            //mod_ifsession
+            'IfClass', 'IfGroup', 'IfUser',
+
+            //mod_version
+            'IfVersion'
+            ),
+        /*permissions*/
+        4 => array(
+            //mod_core
+            'ALL',
+            'CDUP',
+            'CMD',
+            'CWD',
+            'DELE',
+            'DIRS',
+            'LOGIN',
+            'MKD',
+            'READ',
+            'RETR',
+            'RMD',
+            'RNFR',
+            'RNTO',
+            'STOR',
+            'WRITE',
+            'XCWD',
+            'XMKD',
+            'XRMD',
+
+            //mod_copy
+            'SITE_CPFR', 'SITE_CPTO',
+
+            //mod_quotatab
+            'SITE_QUOTA',
+
+            //mod_site
+            'SITE_HELP', 'SITE_CHMOD', 'SITE_CHGRP',
+
+            //mod_site_misc
+            'SITE_MKDIR', 'SITE_RMDIR', 'SITE_SYMLINK', 'SITE_UTIME',
+            ),
+        /*keywords 2*/
+        2 => array(
+            'all','on','off','yes','no',
+            'standalone', 'inetd',
+            'default', 'auth', 'write',
+            'internet', 'local', 'limit', 'ip',
+            'from'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000000; font-weight:bold;',
+            4 => 'color: #000080; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:www.proftpd.org+inurl:docs&amp;btnI=I%27m%20Feeling%20Lucky',
+        2 => '',
+        3 => 'http://www.google.com/search?hl=en&amp;q={FNAMEL}+site:www.proftpd.org+inurl:docs&amp;btnI=I%27m%20Feeling%20Lucky',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)(?<!=)',
+                'DISALLOWED_AFTER' => '(?!\+)(?!\w)',
+            ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)(?<!=)',
+                'DISALLOWED_AFTER' => '(?!\+)(?=\/|(?:\s+\w+)*\s*&gt;)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/progress.php b/vendor/easybook/geshi/geshi/progress.php
new file mode 100755
index 000000000..79900261b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/progress.php
@@ -0,0 +1,485 @@
+<?php
+/*************************************************************************************
+ * progress.php
+ * --------
+ * Author: Marco Aurelio de Pasqual (marcop@hdi.com.br)
+ * Copyright: (c) 2008 Marco Aurelio de Pasqual, Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/07/11
+ *
+ * Progress language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ *   -  First Release
+ *
+ * TODO (updated 2008/07/11)
+ * -------------------------
+ * * Clean up the keyword list
+ * * Sort Keyword lists by Control Structures, Predefined functions and other important keywords
+ * * Complete language support
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Progress',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array (
+        1 => array(
+            'ACCUMULATE','APPLY','ASSIGN','BELL','QUERY',
+            'BUFFER-COMPARE','BUFFER-COPY','CALL','CASE',
+            'CHOOSE','CLASS','CLOSE QUERY','each','WHERE',
+            'CLOSE STORED-PROCEDURE','COLOR','COMPILE','CONNECT',
+            'CONSTRUCTOR','COPY-LOB','CREATE','CREATE ALIAS',
+            'CREATE BROWSE','CREATE BUFFER','CREATE CALL','CREATE CLIENT-PRINCIPAL',
+            'CREATE DATABASE','CREATE DATASET','CREATE DATA-SOURCE','CREATE QUERY',
+            'CREATE SAX-attributeS','CREATE SAX-READER','CREATE SAX-WRITER','CREATE SERVER',
+            'CREATE SERVER-SOCKET','CREATE SOAP-HEADER','CREATE SOAP-HEADER-ENTRYREF','CREATE SOCKET',
+            'CREATE TEMP-TABLE','CREATE WIDGET','CREATE widget-POOL','CREATE X-DOCUMENT',
+            'CREATE X-NODEREF','CURRENT-LANGUAGE','CURRENT-VALUE','DDE ADVISE',
+            'DDE EXECUTE','DDE GET','DDE INITIATE','DDE REQUEST',
+            'DDE SEND','DDE TERMINATE','DEFINE BROWSE','DEFINE BUFFER','DEFINE',
+            'DEFINE BUTTON','DEFINE DATASET','DEFINE DATA-SOURCE','DEFINE FRAME','DEF','VAR',
+            'DEFINE IMAGE','DEFINE MENU','DEFINE PARAMETER','DEFINE property','PARAM',
+            'DEFINE QUERY','DEFINE RECTANGLE','DEFINE STREAM','DEFINE SUB-MENU',
+            'DEFINE TEMP-TABLE','DEFINE WORKFILE','DEFINE WORK-TABLE',
+            'DELETE','DELETE ALIAS','DELETE object','DELETE PROCEDURE',
+            'DELETE widget','DELETE widget-POOL','DESTRUCTOR','DICTIONARY',
+            'DISABLE','DISABLE TRIGGERS','DISCONNECT','DISPLAY',
+            'DO','DOS','DOWN','DYNAMIC-CURRENT-VALUE',
+            'ELSE','EMPTY TEMP-TABLE','ENABLE','END',
+            'ENTRY','FIND','AND',
+            'FIX-CODEPAGE','FOR','FORM','FRAME-VALUE',
+            'GET','GET-KEY-VALUE','HIDE','IF',
+            'IMPORT','INPUT CLEAR','INPUT CLOSE','INPUT FROM','input',
+            'INPUT THROUGH','INPUT-OUTPUT CLOSE','INPUT-OUTPUT THROUGH',
+            'INTERFACE','LEAVE','BREAK',
+            'LOAD-PICTURE','MESSAGE','method','NEXT','prev',
+            'NEXT-PROMPT','ON','OPEN QUERY','OS-APPEND',
+            'OS-COMMAND','OS-COPY','OS-CREATE-DIR','OS-DELETE',
+            'OS-RENAME','OUTPUT CLOSE','OUTPUT THROUGH','OUTPUT TO',
+            'OVERLAY','PAGE','PAUSE','PROCEDURE',
+            'PROCESS EVENTS','PROMPT-FOR','PROMSGS','PROPATH',
+            'PUBLISH','PUT','PUT CURSOR','PUT SCREEN',
+            'PUT-BITS','PUT-BYTE','PUT-BYTES','PUT-DOUBLE',
+            'PUT-FLOAT','PUT-INT64','PUT-KEY-VALUE','PUT-LONG',
+            'PUT-SHORT','PUT-STRING','PUT-UNSIGNED-LONG','PUT-UNSIGNED-SHORT',
+            'QUIT','RAW-TRANSFER','READKEY','RELEASE',
+            'RELEASE EXTERNAL','RELEASE object','REPEAT','REPOSITION',
+            'RUN','RUN STORED-PROCEDURE','RUN SUPER',
+            'SAVE CACHE','SCROLL','SEEK','SET',
+            'SET-BYTE-ORDER','SET-POINTER-VALUE','SET-SIZE','SHOW-STATS',
+            'STATUS','STOP','SUBSCRIBE','SUBSTRING',
+            'system-DIALOG COLOR','system-DIALOG FONT','system-DIALOG GET-DIR','system-DIALOG GET-FILE',
+            'system-DIALOG PRINTER-SETUP','system-HELP','THEN','THIS-object',
+            'TRANSACTION-MODE AUTOMATIC','TRIGGER PROCEDURE','UNDERLINE','UNDO',
+            'UNIX','UNLOAD','UNSUBSCRIBE','UP','STRING',
+            'UPDATE','USE','USING','substr','SKIP','CLOSE',
+            'VIEW','WAIT-FOR','MODULO','NE','AVAIL',
+            'NOT','OR','&GLOBAL-DEFINE','&IF','UNFORMATTED','NO-PAUSE',
+            '&THEN','&ELSEIF','&ELSE','&ENDIF','OPEN','NO-WAIT',
+            '&MESSAGE','&SCOPED-DEFINE','&UNDEFINE','DEFINED',
+            'BROWSE','BUTTON','COMBO-BOX','CONTROL-FRAME',
+            'DIALOG-BOX','EDITOR','FIELD-GROUP','FILL-IN',
+            'FRAME','IMAGE','LITERAL','MENU',
+            'MENU-ITEM','RADIO-SET','RECTANGLE','SELECTION-LIST',
+            'SLIDER','SUB-MENU','TEXT','TOGGLE-BOX',
+            'WINDOW','WITH','AT','OF','EDITING','ON ENDKEY','output',
+            'ON ERROR','ON QUIT','ON STOP','PRESELECT',
+            'QUERY-TUNING','SIZE','Trigger','VIEW-AS','ALERT-BOX',
+            'Buffer','Data-relation','ProDataSet','SAX-attributes',
+            'SAX-reader','SAX-writer','Server socket','SOAP-fault',
+            'SOAP-header','SOAP-header-entryref','Socket','Temp-table',
+            'X-noderef','Height','Left','Top','TO',
+            'Width','ACTIVE-WINDOW','AUDIT-CONTROL','FIRST','LAST',
+            'AUDIT-POLICY','CLIPBOARD','CODEBASE-LOCATOR','COLOR-TABLE',
+            'COMPILER','COM-SELF','DEBUGGER','DEFAULT-WINDOW',
+            'ERROR-STATUS','FILE-INFO','FOCUS','FONT-TABLE',
+            'LAST-EVENT','LOG-MANAGER','RCODE-INFO','SECURITY-POLICY',
+            'SELF','SESSION','SOURCE-PROCEDURE','TARGET-PROCEDURE','NO-LOCK','NO-error',
+            'THIS-PROCEDURE','WEB-CONTEXT','FUNCTION','RETURNS','NO-UNDO'
+            ),
+        2 => array(
+            'ACCEPT-CHANGES','ACCEPT-ROW-CHANGES','ADD-BUFFER','ADD-CALC-COLUMN',
+            'ADD-COLUMNS-FROM','ADD-EVENTS-PROCEDURE','ADD-FIELDS-FROM','ADD-FIRST',
+            'ADD-HEADER-ENTRY','ADD-INDEX-FIELD','ADD-LAST','ADD-LIKE-COLUMN',
+            'ADD-LIKE-FIELD','ADD-LIKE-INDEX','ADD-NEW-FIELD','ADD-NEW-INDEX',
+            'ADD-RELATION','ADD-SCHEMA-LOCATION','ADD-SOURCE-BUFFER','ADD-SUPER-PROCEDURE',
+            'APPEND-CHILD','APPLY-CALLBACK','ATTACH-DATA-SOURCE','AUTHENTICATION-FAILED',
+            'BEGIN-EVENT-GROUP','BUFFER-CREATE',
+            'BUFFER-DELETE','BUFFER-RELEASE','BUFFER-VALIDATE',
+            'CANCEL-BREAK','CANCEL-REQUESTS','CLEAR','CLEAR-APPL-CONTEXT',
+            'CLEAR-LOG','CLEAR-SELECTION','CLEAR-SORT-ARROWS','CLONE-NODE',
+            'CLOSE-LOG','CONNECTED','CONVERT-TO-OFFSET',
+            'COPY-DATASET','COPY-SAX-attributeS','COPY-TEMP-TABLE','CREATE-LIKE',
+            'CREATE-NODE','CREATE-NODE-NAMESPACE','CREATE-RESULT-LIST-ENTRY','DEBUG',
+            'DECLARE-NAMESPACE','DELETE-CHAR','DELETE-CURRENT-ROW',
+            'DELETE-HEADER-ENTRY','DELETE-LINE','DELETE-NODE','DELETE-RESULT-LIST-ENTRY',
+            'DELETE-SELECTED-ROW','DELETE-SELECTED-ROWS','DESELECT-FOCUSED-ROW','DESELECT-ROWS',
+            'DESELECT-SELECTED-ROW','DETACH-DATA-SOURCE','DISABLE-CONNECTIONS',
+            'DISABLE-DUMP-TRIGGERS','DISABLE-LOAD-TRIGGERS','DISPLAY-MESSAGE',
+            'DUMP-LOGGING-NOW','EDIT-CLEAR','EDIT-COPY','EDIT-CUT',
+            'EDIT-PASTE','EDIT-UNDO','EMPTY-DATASET','EMPTY-TEMP-TABLE',
+            'ENABLE-CONNECTIONS','ENABLE-EVENTS','ENCRYPT-AUDIT-MAC-KEY',
+            'END-DOCUMENT','END-ELEMENT','END-EVENT-GROUP','END-FILE-DROP',
+            'EXPORT','EXPORT-PRINCIPAL','FETCH-SELECTED-ROW',
+            'FILL','FIND-BY-ROWID','FIND-CURRENT','FIND-FIRST',
+            'FIND-LAST','FIND-UNIQUE','GET-attribute','GET-attribute-NODE',
+            'GET-BINARY-DATA','GET-BLUE-VALUE','GET-BROWSE-COLUMN','GET-BUFFER-HANDLE',
+            'GET-BYTES-AVAILABLE','GET-CALLBACK-PROC-CONTEXT','GET-CALLBACK-PROC-NAME','GET-CGI-LIST',
+            'GET-CGI-LONG-VALUE','GET-CGI-VALUE','GET-CHANGES','GET-CHILD',
+            'GET-CHILD-RELATION','GET-CONFIG-VALUE','GET-CURRENT','GET-DATASET-BUFFER',
+            'GET-DOCUMENT-ELEMENT','GET-DROPPED-FILE','GET-DYNAMIC','GET-ERROR-COLUMN ',
+            'GET-ERROR-ROW ','GET-FILE-NAME ','GET-FILE-OFFSET ','GET-FIRST',
+            'GET-GREEN-VALUE','GET-HEADER-ENTRY','GET-INDEX-BY-NAMESPACE-NAME','GET-INDEX-BY-QNAME',
+            'GET-ITERATION','GET-LAST','GET-LOCALNAME-BY-INDEX','GET-MESSAGE',
+            'GET-NEXT','GET-NODE','GET-NUMBER','GET-PARENT',
+            'GET-PREV','GET-PRINTERS','GET-property','GET-QNAME-BY-INDEX',
+            'GET-RED-VALUE','GET-RELATION','GET-REPOSITIONED-ROW','GET-RGB-VALUE',
+            'GET-SELECTED-widget','GET-SERIALIZED','GET-SIGNATURE','GET-SOCKET-OPTION',
+            'GET-SOURCE-BUFFER','GET-TAB-ITEM','GET-TEXT-HEIGHT-CHARS','GET-TEXT-HEIGHT-PIXELS',
+            'GET-TEXT-WIDTH-CHARS','GET-TEXT-WIDTH-PIXELS','GET-TOP-BUFFER','GET-TYPE-BY-INDEX',
+            'GET-TYPE-BY-NAMESPACE-NAME','GET-TYPE-BY-QNAME','GET-URI-BY-INDEX','GET-VALUE-BY-INDEX',
+            'GET-VALUE-BY-NAMESPACE-NAME','GET-VALUE-BY-QNAME','GET-WAIT-STATE','IMPORT-NODE',
+            'IMPORT-PRINCIPAL','INCREMENT-EXCLUSIVE-ID','INITIALIZE-DOCUMENT-TYPE',
+            'INITIATE','INSERT','INSERT-attribute','INSERT-BACKTAB',
+            'INSERT-BEFORE','INSERT-FILE','INSERT-ROW','INSERT-STRING',
+            'INSERT-TAB','INVOKE','IS-ROW-SELECTED','IS-SELECTED',
+            'LIST-property-NAMES','LOAD','LoadControls','LOAD-DOMAINS',
+            'LOAD-ICON','LOAD-IMAGE','LOAD-IMAGE-DOWN','LOAD-IMAGE-INSENSITIVE',
+            'LOAD-IMAGE-UP','LOAD-MOUSE-POINTER','LOAD-SMALL-ICON','LOCK-REGISTRATION',
+            'LOG-AUDIT-EVENT','LOGOUT','LONGCHAR-TO-NODE-VALUE','LOOKUP',
+            'MEMPTR-TO-NODE-VALUE','MERGE-CHANGES','MERGE-ROW-CHANGES','MOVE-AFTER-TAB-ITEM',
+            'MOVE-BEFORE-TAB-ITEM','MOVE-COLUMN','MOVE-TO-BOTTOM','MOVE-TO-EOF',
+            'MOVE-TO-TOP','NODE-VALUE-TO-LONGCHAR','NODE-VALUE-TO-MEMPTR','NORMALIZE',
+            'QUERY-CLOSE','QUERY-OPEN','QUERY-PREPARE',
+            'READ','READ-FILE','READ-XML','READ-XMLSCHEMA',
+            'REFRESH','REFRESH-AUDIT-POLICY','REGISTER-DOMAIN','REJECT-CHANGES',
+            'REJECT-ROW-CHANGES','REMOVE-attribute','REMOVE-CHILD','REMOVE-EVENTS-PROCEDURE',
+            'REMOVE-SUPER-PROCEDURE','REPLACE','REPLACE-CHILD','REPLACE-SELECTION-TEXT',
+            'REPOSITION-BACKWARD','REPOSITION-FORWARD','REPOSITION-TO-ROW','REPOSITION-TO-ROWID',
+            'RESET','SAVE','SAVE-FILE','SAVE-ROW-CHANGES',
+            'SAX-PARSE','SAX-PARSE-FIRST','SAX-PARSE-NEXT','SCROLL-TO-CURRENT-ROW',
+            'SCROLL-TO-ITEM','SCROLL-TO-SELECTED-ROW','SEAL','SEARCH',
+            'SELECT-ALL','SELECT-FOCUSED-ROW','SELECT-NEXT-ROW','SELECT-PREV-ROW',
+            'SELECT-ROW','SET-ACTOR','SET-APPL-CONTEXT','SET-attribute',
+            'SET-attribute-NODE','SET-BLUE-VALUE','SET-BREAK','SET-BUFFERS',
+            'SET-CALLBACK','SET-CALLBACK-PROCEDURE','SET-CLIENT','SET-COMMIT',
+            'SET-CONNECT-PROCEDURE','SET-DYNAMIC','SET-GREEN-VALUE','SET-INPUT-SOURCE',
+            'SET-MUST-UNDERSTAND','SET-NODE','SET-NUMERIC-FORMAT','SET-OUTPUT-DESTINATION',
+            'SET-PARAMETER','SET-property','SET-READ-RESPONSE-PROCEDURE','SET-RED-VALUE',
+            'SET-REPOSITIONED-ROW','SET-RGB-VALUE','SET-ROLLBACK','SET-SELECTION',
+            'SET-SERIALIZED','SET-SOCKET-OPTION','SET-SORT-ARROW','SET-WAIT-STATE',
+            'START-DOCUMENT','START-ELEMENT','STOP-PARSING','SYNCHRONIZE',
+            'TEMP-TABLE-PREPARE','UPDATE-attribute','URL-DECODE','URL-ENCODE',
+            'VALIDATE','VALIDATE-SEAL','WRITE','WRITE-CDATA','USE-INDEX',
+            'WRITE-CHARACTERS','WRITE-COMMENT','WRITE-DATA-ELEMENT','WRITE-EMPTY-ELEMENT',
+            'WRITE-ENTITY-REF','WRITE-EXTERNAL-DTD','WRITE-FRAGMENT','WRITE-MESSAGE',
+            'WRITE-PROCESSING-INSTRUCTION','WRITE-XML','WRITE-XMLSCHEMA','FALSE','true'
+            ),
+        3 => array(
+            'ABSOLUTE','ACCUM','ADD-INTERVAL','ALIAS','mod',
+            'AMBIGUOUS','ASC','AUDIT-ENABLED','AVAILABLE',
+            'BASE64-DECODE','BASE64-ENCODE','CAN-DO','CAN-FIND',
+            'CAN-QUERY','CAN-SET','CAPS','CAST','OS-DIR',
+            'CHR','CODEPAGE-CONVERT','COMPARE',
+            'COUNT-OF','CURRENT-CHANGED','CURRENT-RESULT-ROW','DATASERVERS',
+            'DATA-SOURCE-MODIFIED','DATETIME','DATETIME-TZ',
+            'DAY','DBCODEPAGE','DBCOLLATION','DBNAME',
+            'DBPARAM','DBRESTRICTIONS','DBTASKID','DBTYPE',
+            'DBVERSION','DECIMAL','DECRYPT','DYNAMIC-function',
+            'DYNAMIC-NEXT-VALUE','ENCODE','ENCRYPT','ENTERED',
+            'ERROR','ETIME','EXP','ENDKEY','END-error',
+            'FIRST-OF','FRAME-DB','FRAME-DOWN',
+            'FRAME-FIELD','FRAME-FILE','FRAME-INDEX','FRAME-LINE',
+            'GATEWAYS','GENERATE-PBE-KEY','GENERATE-PBE-SALT','GENERATE-RANDOM-KEY',
+            'GENERATE-UUID','GET-BITS','GET-BYTE','GET-BYTE-ORDER',
+            'GET-BYTES','GET-CODEPAGE','GET-CODEPAGES','GET-COLLATION',
+            'GET-COLLATIONS','GET-DOUBLE','GET-FLOAT','GET-INT64',
+            'GET-LONG','GET-POINTER-VALUE','GET-SHORT','GET-SIZE',
+            'GET-STRING','GET-UNSIGNED-LONG','GET-UNSIGNED-SHORT','GO-PENDING',
+            'GUID','HEX-DECODE','INDEX',
+            'INT64','INTEGER','INTERVAL','IS-ATTR-SPACE',
+            'IS-CODEPAGE-FIXED','IS-COLUMN-CODEPAGE','IS-LEAD-BYTE','ISO-DATE',
+            'KBLABEL','KEYCODE','KEYFUNCTION','KEYLABEL',
+            'KEYWORD','KEYWORD-ALL','LASTKEY',
+            'LAST-OF','LC','LDBNAME','LEFT-TRIM',
+            'LIBRARY','LINE-COUNTER','LIST-EVENTS','LIST-QUERY-ATTRS',
+            'LIST-SET-ATTRS','LIST-widgetS','LOCKED',
+            'LOGICAL','MAXIMUM','MD5-DIGEST',
+            'MEMBER','MESSAGE-LINES','MINIMUM','MONTH',
+            'MTIME','NEW','NEXT-VALUE','SHARED',
+            'NOT ENTERED','NOW','NUM-ALIASES','NUM-DBS',
+            'NUM-ENTRIES','NUM-RESULTS','OPSYS','OS-DRIVES',
+            'OS-ERROR','OS-GETENV','PAGE-NUMBER','PAGE-SIZE',
+            'PDBNAME','PROC-HANDLE','PROC-STATUS','PROGRAM-NAME',
+            'PROGRESS','PROVERSION','QUERY-OFF-END','QUOTER',
+            'RANDOM','RAW','RECID','REJECTED',
+            'RETRY','RETURN-VALUE','RGB-VALUE',
+            'RIGHT-TRIM','R-INDEX','ROUND','ROWID','LENGTH',
+            'SDBNAME','SET-DB-CLIENT','SETUSERID',
+            'SHA1-DIGEST','SQRT','SUBSTITUTE','VARIABLE',
+            'SUPER','TERMINAL','TIME','TIMEZONE','external',
+            'TODAY','TO-ROWID','TRIM','TRUNCATE','return',
+            'TYPE-OF','USERID','VALID-EVENT','VALID-HANDLE',
+            'VALID-object','WEEKDAY','YEAR','BEGINS','VALUE',
+            'EQ','GE','GT','LE','LT','MATCHES','AS','BY','LIKE'
+            ),
+        4 => array(
+            'ACCELERATOR','ACTIVE','ACTOR','ADM-DATA',
+            'AFTER-BUFFER','AFTER-ROWID','AFTER-TABLE','ALLOW-COLUMN-SEARCHING',
+            'ALWAYS-ON-TOP','APPL-ALERT-BOXES','APPL-CONTEXT-ID','APPSERVER-INFO',
+            'APPSERVER-PASSWORD','APPSERVER-USERID','ASYNCHRONOUS','ASYNC-REQUEST-COUNT',
+            'ASYNC-REQUEST-HANDLE','ATTACHED-PAIRLIST','attribute-NAMES','ATTR-SPACE',
+            'AUDIT-EVENT-CONTEXT','AUTO-COMPLETION','AUTO-DELETE','AUTO-DELETE-XML',
+            'AUTO-END-KEY','AUTO-GO','AUTO-INDENT','AUTO-RESIZE',
+            'AUTO-RETURN','AUTO-SYNCHRONIZE','AUTO-VALIDATE','AUTO-ZAP',
+            'AVAILABLE-FORMATS','BACKGROUND','BASE-ADE','BASIC-LOGGING',
+            'BATCH-MODE','BATCH-SIZE','BEFORE-BUFFER','BEFORE-ROWID',
+            'BEFORE-TABLE','BGCOLOR','BLANK','BLOCK-ITERATION-DISPLAY',
+            'BORDER-BOTTOM-CHARS','BORDER-BOTTOM-PIXELS','BORDER-LEFT-CHARS','BORDER-LEFT-PIXELS',
+            'BORDER-RIGHT-CHARS','BORDER-RIGHT-PIXELS','BORDER-TOP-CHARS','BORDER-TOP-PIXELS',
+            'BOX','BOX-SELECTABLE','BUFFER-CHARS','BUFFER-FIELD',
+            'BUFFER-HANDLE','BUFFER-LINES','BUFFER-NAME','BUFFER-VALUE',
+            'BYTES-READ','BYTES-WRITTEN','CACHE','CALL-NAME',
+            'CALL-TYPE','CANCEL-BUTTON','CANCELLED','CAN-CREATE',
+            'CAN-DELETE','CAN-READ','CAN-WRITE','CAREFUL-PAINT',
+            'CASE-SENSITIVE','CENTERED','CHARSET','CHECKED',
+            'CHILD-BUFFER','CHILD-NUM','CLASS-TYPE','CLIENT-CONNECTION-ID',
+            'CLIENT-TTY','CLIENT-TYPE','CLIENT-WORKSTATION','CODE',
+            'CODEPAGE','COLUMN','COLUMN-BGCOLOR','COLUMN-DCOLOR',
+            'COLUMN-FGCOLOR','COLUMN-FONT','COLUMN-LABEL','COLUMN-MOVABLE',
+            'COLUMN-PFCOLOR','COLUMN-READ-ONLY','COLUMN-RESIZABLE','COLUMN-SCROLLING',
+            'COM-HANDLE','COMPLETE','CONFIG-NAME','CONTEXT-HELP',
+            'CONTEXT-HELP-FILE','CONTEXT-HELP-ID','CONTROL-BOX','CONVERT-3D-COLORS',
+            'CPCASE','CPCOLL','CPINTERNAL','CPLOG',
+            'CPPRINT','CPRCODEIN','CPRCODEOUT','CPSTREAM',
+            'CPTERM','CRC-VALUE','CURRENT-COLUMN','CURRENT-ENVIRONMENT',
+            'CURRENT-ITERATION','CURRENT-ROW-MODIFIED','CURRENT-WINDOW','CURSOR-CHAR',
+            'CURSOR-LINE','CURSOR-OFFSET','DATA-ENTRY-RETURN','DATASET',
+            'DATA-SOURCE','DATA-SOURCE-COMPLETE-MAP','DATA-TYPE','DATE-FORMAT',
+            'DB-REFERENCES','DCOLOR','DDE-ERROR','DDE-ID',
+            'DDE-ITEM','DDE-NAME','DDE-TOPIC','DEBLANK',
+            'DEBUG-ALERT','DECIMALS','DEFAULT','DEFAULT-BUFFER-HANDLE',
+            'DEFAULT-BUTTON','DEFAULT-COMMIT','DELIMITER','DISABLE-AUTO-ZAP',
+            'DISPLAY-TIMEZONE','DISPLAY-TYPE','DOMAIN-DESCRIPTION','DOMAIN-NAME',
+            'DOMAIN-TYPE','DRAG-ENABLED','DROP-TARGET','DYNAMIC',
+            'EDGE-CHARS','EDGE-PIXELS','EDIT-CAN-PASTE','EDIT-CAN-UNDO',
+            'EMPTY','ENCODING','ENCRYPTION-SALT','END-USER-PROMPT',
+            'ENTRY-TYPES-LIST','ERROR-COLUMN','ERROR-object-DETAIL','ERROR-ROW',
+            'ERROR-STRING','EVENT-GROUP-ID','EVENT-PROCEDURE','EVENT-PROCEDURE-CONTEXT',
+            'EVENT-TYPE','EXCLUSIVE-ID','EXECUTION-LOG','EXPAND',
+            'EXPANDABLE','FGCOLOR','FILE-CREATE-DATE','FILE-CREATE-TIME',
+            'FILE-MOD-DATE','FILE-MOD-TIME','FILE-NAME','FILE-OFFSET',
+            'FILE-SIZE','FILE-TYPE','FILLED','FILL-MODE',
+            'FILL-WHERE-STRING','FIRST-ASYNC-REQUEST','FIRST-BUFFER','FIRST-CHILD',
+            'FIRST-COLUMN','FIRST-DATASET','FIRST-DATA-SOURCE','FIRST-object',
+            'FIRST-PROCEDURE','FIRST-QUERY','FIRST-SERVER','FIRST-SERVER-SOCKET',
+            'FIRST-SOCKET','FIRST-TAB-ITEM','FIT-LAST-COLUMN','FLAT-BUTTON',
+            'FOCUSED-ROW','FOCUSED-ROW-SELECTED','FONT','FOREGROUND',
+            'FORMAT','FORMATTED','FORM-INPUT','FORM-LONG-INPUT',
+            'FORWARD-ONLY','FRAGMENT','FRAME-COL','FRAME-NAME',
+            'FRAME-ROW','FRAME-SPACING','FRAME-X','FRAME-Y',
+            'FREQUENCY','FULL-HEIGHT-CHARS','FULL-HEIGHT-PIXELS','FULL-PATHNAME',
+            'FULL-WIDTH-CHARS','FULL-WIDTH-PIXELS','GRAPHIC-EDGE',
+            'GRID-FACTOR-HORIZONTAL','GRID-FACTOR-VERTICAL','GRID-SNAP','GRID-UNIT-HEIGHT-CHARS',
+            'GRID-UNIT-HEIGHT-PIXELS','GRID-UNIT-WIDTH-CHARS','GRID-UNIT-WIDTH-PIXELS','GRID-VISIBLE',
+            'GROUP-BOX','HANDLE','HANDLER','HAS-LOBS',
+            'HAS-RECORDS','HEIGHT-CHARS','HEIGHT-PIXELS','HELP',
+            'HIDDEN','HORIZONTAL','HTML-CHARSET','HTML-END-OF-LINE',
+            'HTML-END-OF-PAGE','HTML-FRAME-BEGIN','HTML-FRAME-END','HTML-HEADER-BEGIN',
+            'HTML-HEADER-END','HTML-TITLE-BEGIN','HTML-TITLE-END','HWND',
+            'ICFPARAMETER','ICON','IGNORE-CURRENT-MODIFIED','IMAGE-DOWN',
+            'IMAGE-INSENSITIVE','IMAGE-UP','IMMEDIATE-DISPLAY','INDEX-INFORMATION',
+            'IN-HANDLE','INHERIT-BGCOLOR','INHERIT-FGCOLOR','INITIAL','INIT',
+            'INNER-CHARS','INNER-LINES','INPUT-VALUE','INSTANTIATING-PROCEDURE',
+            'INTERNAL-ENTRIES','IS-CLASS','IS-OPEN','IS-PARAMETER-SET',
+            'IS-XML','ITEMS-PER-ROW','KEEP-CONNECTION-OPEN','KEEP-FRAME-Z-ORDER',
+            'KEEP-SECURITY-CACHE','KEY','KEYS','LABEL',
+            'LABEL-BGCOLOR','LABEL-DCOLOR','LABEL-FGCOLOR','LABEL-FONT',
+            'LABELS','LANGUAGES','LARGE','LARGE-TO-SMALL',
+            'LAST-ASYNC-REQUEST','LAST-BATCH','LAST-CHILD','LAST-object',
+            'LAST-PROCEDURE','LAST-SERVER','LAST-SERVER-SOCKET','LAST-SOCKET',
+            'LAST-TAB-ITEM','LINE','LIST-ITEM-PAIRS','LIST-ITEMS',
+            'LITERAL-QUESTION','LOCAL-HOST','LOCAL-NAME','LOCAL-PORT',
+            'LOCATOR-COLUMN-NUMBER','LOCATOR-LINE-NUMBER','LOCATOR-PUBLIC-ID','LOCATOR-system-ID',
+            'LOCATOR-TYPE','LOG-ENTRY-TYPES','LOGFILE-NAME','LOGGING-LEVEL',
+            'LOGIN-EXPIRATION-TIMESTAMP','LOGIN-HOST','LOGIN-STATE','LOG-THRESHOLD',
+            'MANDATORY','MANUAL-HIGHLIGHT','MAX-BUTTON','MAX-CHARS',
+            'MAX-DATA-GUESS','MAX-HEIGHT-CHARS','MAX-HEIGHT-PIXELS','MAX-VALUE',
+            'MAX-WIDTH-CHARS','MAX-WIDTH-PIXELS','MD5-VALUE','MENU-BAR',
+            'MENU-KEY','MENU-MOUSE','MERGE-BY-FIELD','MESSAGE-AREA',
+            'MESSAGE-AREA-FONT','MIN-BUTTON','MIN-COLUMN-WIDTH-CHARS','MIN-COLUMN-WIDTH-PIXELS',
+            'MIN-HEIGHT-CHARS','MIN-HEIGHT-PIXELS','MIN-SCHEMA-MARSHAL','MIN-VALUE',
+            'MIN-WIDTH-CHARS','MIN-WIDTH-PIXELS','MODIFIED','MOUSE-POINTER',
+            'MOVABLE','MULTI-COMPILE','MULTIPLE','MULTITASKING-INTERVAL',
+            'MUST-UNDERSTAND','NAME','NAMESPACE-PREFIX','NAMESPACE-URI',
+            'NEEDS-APPSERVER-PROMPT','NEEDS-PROMPT','NESTED','NEW-ROW',
+            'NEXT-COLUMN','NEXT-ROWID','NEXT-SIBLING','NEXT-TAB-ITEM', 'NO-BOX',
+            'NO-CURRENT-VALUE','NODE-VALUE','NO-EMPTY-SPACE','NO-FOCUS',
+            'NONAMESPACE-SCHEMA-LOCATION','NO-SCHEMA-MARSHAL','NO-VALIDATE','NUM-BUFFERS',
+            'NUM-BUTTONS','NUM-CHILD-RELATIONS','NUM-CHILDREN','NUM-COLUMNS',
+            'NUM-DROPPED-FILES','NUMERIC-DECIMAL-POINT','NUMERIC-FORMAT','NUMERIC-SEPARATOR',
+            'NUM-FIELDS','NUM-FORMATS','NUM-HEADER-ENTRIES','NUM-ITEMS',
+            'NUM-ITERATIONS','NUM-LINES','NUM-LOCKED-COLUMNS','NUM-LOG-FILES',
+            'NUM-MESSAGES','NUM-PARAMETERS','NUM-REFERENCES','NUM-RELATIONS',
+            'NUM-REPLACED','NUM-SELECTED-ROWS','NUM-SELECTED-WIDGETS','NUM-SOURCE-BUFFERS',
+            'NUM-TABS','NUM-TOP-BUFFERS','NUM-TO-RETAIN','NUM-VISIBLE-COLUMNS',
+            'ON-FRAME-BORDER','ORIGIN-HANDLE','ORIGIN-ROWID','OWNER',
+            'OWNER-DOCUMENT','PAGE-BOTTOM','PAGE-TOP','PARAMETER',
+            'PARENT','PARENT-BUFFER','PARENT-RELATION','PARSE-STATUS',
+            'PASSWORD-FIELD','PATHNAME','PBE-HASH-ALGORITHM','PBE-KEY-ROUNDS',
+            'PERSISTENT','PERSISTENT-CACHE-DISABLED','PERSISTENT-PROCEDURE','PFCOLOR',
+            'PIXELS-PER-COLUMN','PIXELS-PER-ROW','POPUP-MENU','POPUP-ONLY',
+            'POSITION','PREFER-DATASET','PREPARED','PREPARE-STRING',
+            'PREV-COLUMN','PREV-SIBLING','PREV-TAB-ITEM','PRIMARY',
+            'PRINTER-CONTROL-HANDLE','PRINTER-HDC','PRINTER-NAME','PRINTER-PORT',
+            'PRIVATE-DATA','PROCEDURE-NAME','PROGRESS-SOURCE','PROXY',
+            'PROXY-PASSWORD','PROXY-USERID','PUBLIC-ID','PUBLISHED-EVENTS',
+            'RADIO-BUTTONS','READ-ONLY','RECORD-LENGTH',
+            'REFRESHABLE','RELATION-FIELDS','RELATIONS-ACTIVE','REMOTE',
+            'REMOTE-HOST','REMOTE-PORT','RESIZABLE','RESIZE',
+            'RESTART-ROWID','RETAIN-SHAPE','RETURN-INSERTED','RETURN-VALUE-DATA-TYPE',
+            'ROLES','ROUNDED','COL','ROW','ROW-HEIGHT-CHARS',
+            'ROW-HEIGHT-PIXELS','ROW-MARKERS','ROW-RESIZABLE','ROW-STATE',
+            'SAVE-WHERE-STRING','SCHEMA-CHANGE','SCHEMA-LOCATION','SCHEMA-MARSHAL',
+            'SCHEMA-PATH','SCREEN-LINES','SCREEN-VALUE','SCROLLABLE',
+            'SCROLLBAR-HORIZONTAL','SCROLL-BARS','SCROLLBAR-VERTICAL','SEAL-TIMESTAMP',
+            'SELECTABLE','SELECTED','SELECTION-END','SELECTION-START',
+            'SELECTION-TEXT','SENSITIVE','SEPARATOR-FGCOLOR','SEPARATORS',
+            'SERVER','SERVER-CONNECTION-BOUND','SERVER-CONNECTION-BOUND-REQUEST','SERVER-CONNECTION-CONTEXT',
+            'SERVER-CONNECTION-ID','SERVER-OPERATING-MODE','SESSION-END','SESSION-ID',
+            'SHOW-IN-TASKBAR','SIDE-LABEL-HANDLE','SIDE-LABELS','SKIP-DELETED-RECORD',
+            'SMALL-ICON','SMALL-TITLE','SOAP-FAULT-ACTOR','SOAP-FAULT-CODE',
+            'SOAP-FAULT-DETAIL','SOAP-FAULT-STRING','SORT','SORT-ASCENDING',
+            'SORT-NUMBER','SSL-SERVER-NAME','STANDALONE','STARTUP-PARAMETERS',
+            'STATE-DETAIL','STATUS-AREA','STATUS-AREA-FONT','STOPPED',
+            'STREAM','STRETCH-TO-FIT','STRICT','STRING-VALUE',
+            'SUBTYPE','SUPER-PROCEDURES','SUPPRESS-NAMESPACE-PROCESSING','SUPPRESS-WARNINGS',
+            'SYMMETRIC-ENCRYPTION-ALGORITHM','SYMMETRIC-ENCRYPTION-IV','SYMMETRIC-ENCRYPTION-KEY','SYMMETRIC-SUPPORT',
+            'system-ALERT-BOXES','system-ID','TABLE','TABLE-CRC-LIST',
+            'TABLE-HANDLE','TABLE-LIST','TABLE-NUMBER','TAB-POSITION',
+            'TAB-STOP','TEMP-DIRECTORY','TEXT-SELECTED','THREE-D',
+            'TIC-MARKS','TIME-SOURCE','TITLE','TITLE-BGCOLOR','FIELD',
+            'TITLE-DCOLOR','TITLE-FGCOLOR','TITLE-FONT','TOOLTIP',
+            'TOOLTIPS','TOP-ONLY','TRACKING-CHANGES','TRANSACTION',
+            'TRANS-INIT-PROCEDURE','TRANSPARENT','TYPE','UNIQUE-ID',
+            'UNIQUE-MATCH','URL','URL-PASSWORD','URL-USERID','EXTENT',
+            'USER-ID','V6DISPLAY','VALIDATE-EXPRESSION','VALIDATE-MESSAGE',
+            'VALIDATE-XML','VALIDATION-ENABLED','VIEW-FIRST-COLUMN-ON-REOPEN',
+            'VIRTUAL-HEIGHT-CHARS','VIRTUAL-HEIGHT-PIXELS','VIRTUAL-WIDTH-CHARS','VIRTUAL-WIDTH-PIXELS',
+            'VISIBLE','WARNING','WHERE-STRING','widget-ENTER','DATE',
+            'widget-LEAVE','WIDTH-CHARS','WIDTH-PIXELS','WINDOW-STATE',
+            'WINDOW-system','WORD-WRAP','WORK-AREA-HEIGHT-PIXELS','WORK-AREA-WIDTH-PIXELS',
+            'WORK-AREA-X','WORK-AREA-Y','WRITE-STATUS','X','widget-Handle',
+            'X-DOCUMENT','XML-DATA-TYPE','XML-NODE-TYPE','XML-SCHEMA-PATH',
+            'XML-SUPPRESS-NAMESPACE-PROCESSING','Y','YEAR-OFFSET','CHARACTER',
+            'LONGCHAR','MEMPTR','CHAR','DEC','INT','LOG','DECI','INTE','LOGI','long'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '<', '>', '=',
+        '+', '-', '*', '/',
+        '!', '@', '%', '|', '$',
+        ':', '.', ';', ',',
+        '?', '<=','<>','>=', '\\'
+        ),
+    'CASE_SENSITIVE' => array (
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array (
+        'KEYWORDS' => array (
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #1D16B2;',
+            3 => 'color: #993333;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array (
+//            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array (
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array (
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array (
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array (
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array (
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array (
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array (
+            ),
+        'SCRIPT' => array (
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => ':'
+        ),
+    'REGEXPS' => array (
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array (
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array (
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#&])",
+            'DISALLOWED_AFTER' =>  "(?![\-a-zA-Z0-9_%])",
+            1 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            2 => array(
+                'SPACE_AS_WHITESPACE' => true
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/prolog.php b/vendor/easybook/geshi/geshi/prolog.php
new file mode 100755
index 000000000..a106a4e4e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/prolog.php
@@ -0,0 +1,143 @@
+<?php
+/*************************************************************************************
+ * prolog.php
+ * --------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/10/02
+ *
+ * Prolog language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/02 (1.0.8.1)
+ *  -  First Release
+ *
+ * TODO (updated 2008/10/02)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Prolog',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'abolish','abs','arg','asserta','assertz','at_end_of_stream','atan',
+            'atom','atom_chars','atom_codes','atom_concat','atom_length',
+            'atomic','bagof','call','catch','ceiling','char_code',
+            'char_conversion','clause','close','compound','consult','copy_term',
+            'cos','current_char_conversion','current_input','current_op',
+            'current_output','current_predicate','current_prolog_flag',
+            'discontiguous','dynamic','ensure_loaded','exp','fail','findall',
+            'float','float_fractional_part','float_integer_part','floor',
+            'flush_output','functor','get_byte','get_char','get_code','halt',
+            'include','initialization','integer','is','listing','log','mod',
+            'multifile','nl','nonvar','notrace','number','number_chars',
+            'number_codes','once','op','open','peek_byte','peek_char',
+            'peek_code','put_byte','put_char','put_code','read','read_term',
+            'rem','repeat','retract','round','set_input','set_output',
+            'set_prolog_flag','set_stream_position','setof','sign','sin','sqrt',
+            'stream_property','sub_atom','throw','trace','true','truncate',
+            'unify_with_occurs_check','univ','var','write','write_canonical',
+            'write_term','writeq'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}',),
+        1 => array('?-', ':-', '=:='),
+        2 => array('\-', '\+', '\*', '\/'),
+        3 => array('-', '+', '*', '/'),
+        4 => array('.', ':', ',', ';'),
+        5 => array('!', '@', '&', '|'),
+        6 => array('<', '>', '=')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800080;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #339933;',
+            2 => 'color: #339933;',
+            3 => 'color: #339933;',
+            4 => 'color: #339933;',
+            5 => 'color: #339933;',
+            6 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #008080;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://pauillac.inria.fr/~deransar/prolog/bips.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "(?<![a-zA-Z0-9_])(?!(?:PIPE|SEMI|DOT)[^a-zA-Z0-9_])[A-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_])(?!\x7C)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/properties.php b/vendor/easybook/geshi/geshi/properties.php
new file mode 100755
index 000000000..e1317b227
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/properties.php
@@ -0,0 +1,127 @@
+<?php
+/*************************************************************************************
+ * properties.php
+ * --------
+ * Author: Edy Hinzen
+ * Copyright: (c) 2009 Edy Hinzen
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/04/03
+ *
+ * Property language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/04/03 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PROPERTIES',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Common used variables */
+        1 => array(
+            '${user.home}'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000080; font-weight:bold;',
+            1 => 'color: #008000; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Entry names
+        0 => array(
+            GESHI_SEARCH => '^(\s*)([.a-zA-Z0-9_\-]+)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Entry values
+        1 => array(
+            // Evil hackery to get around GeSHi bug: <>" and ; are added so <span>s can be matched
+            // Explicit match on variable names because if a comment is before the first < of the span
+            // gets chewed up...
+            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1=',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/providex.php b/vendor/easybook/geshi/geshi/providex.php
new file mode 100755
index 000000000..1a7b08bbe
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/providex.php
@@ -0,0 +1,297 @@
+<?php
+/******************************************************************************
+ * providex.php
+ * ----------
+ * Author: Jeff Wilder (jeff@coastallogix.com)
+ * Copyright:  (c) 2008 Coastal Logix (http://www.coastallogix.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/10/18
+ *
+ * ProvideX language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/21 (1.0.0)
+ *  - First Release
+ *
+ * TODO
+ * -------------------------
+ * 1. Create a regexp for numeric global variables (ex: %VarName = 3)
+ * 2. Add standard object control properties
+ *
+ ******************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *****************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'ProvideX',
+    'COMMENT_SINGLE' => array(1 => '!'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        // Single-Line Comments using REM command
+        2 => "/\bREM\b.*?$/i"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Directives
+            '*break', '*continue', '*end', '*escape', '*next', '*proceed',
+            '*retry', '*return', '*same', 'accept', 'add index', 'addr',
+            'auto', 'begin', 'break', 'button', 'bye', 'call', 'case',
+            'chart', 'check_box', 'class', 'clear', 'clip_board', 'close',
+            'continue', 'control', 'create required', 'create table',
+            'cwdir', 'data', 'day_format', 'def', 'default', 'defctl',
+            'defprt', 'deftty', 'delete required', 'dictionary', 'dim', 'direct',
+            'directory', 'disable', 'drop', 'drop_box', 'dump', 'edit',
+            'else', 'enable', 'end switch', 'end', 'end_if', 'endtrace',
+            'enter', 'erase', 'error_handler', 'escape', 'event', 'execute',
+            'exit', 'exitto', 'extract', 'file', 'find', 'floating point',
+            'for', 'function', 'get_file_box', 'gosub', 'goto', 'grid',
+            'h_scrollbar', 'hide', 'if', 'index', 'indexed', 'input',
+            'insert', 'invoke', 'iolist', 'keyed', 'let', 'like',
+            'line_switch', 'list', 'list_box', 'load', 'local', 'lock',
+            'long_form', 'menu_bar', 'merge', 'message_lib', 'mnemonic',
+            'msgbox', 'multi_line', 'multi_media', 'next', 'object', 'obtain',
+            'on', 'open', 'password', 'perform', 'pop', 'popup_menu',
+            'precision', 'prefix', 'preinput', 'print', 'process', 'program',
+            'property', 'purge', 'quit', 'radio_button', 'randomize',
+            'read', 'record', 'redim', 'refile', 'release', 'rem', 'remove',
+            'rename', 'renumber', 'repeat', 'reset', 'restore', 'retry',
+            'return', 'round', 'run', 'save', 'select', 'serial', 'server',
+            'set_focus', 'set_nbf', 'set_param', 'setctl', 'setday', 'setdev',
+            'setdrive', 'seterr', 'setesc', 'setfid', 'setmouse', 'settime',
+            'settrace', 'short_form', 'show', 'sort', 'start', 'static',
+            'step', 'stop', 'switch', 'system_help', 'system_jrnl', 'table',
+            'then', 'to', 'translate', 'tristate_box', 'unlock', 'until',
+            'update', 'user_lex', 'v_scrollbar', 'vardrop_box', 'varlist_box',
+            'via', 'video_palette', 'wait', 'wend', 'while', 'winprt_setup',
+            'with', 'write'
+            ),
+        2 => array(
+            // System Functions
+            '@x', '@y', 'abs', 'acs', 'and', 'arg', 'asc', 'asn', 'ath',
+            'atn', 'bin', 'bsz', 'chg', 'chr', 'cmp', 'cos', 'cpl',
+            'crc', 'cse', 'ctl', 'cvs', 'dec', 'dir', 'dll', 'dsk',
+            'dte', 'env', 'ept', 'err', 'evn', 'evs', 'exp', 'ffn',
+            'fib', 'fid', 'fin', 'fpt', 'gap', 'gbl', 'gep', 'hsa',
+            'hsh', 'hta', 'hwn', 'i3e', 'ind', 'int', 'iol', 'ior',
+            'jul', 'jst', 'kec', 'kef', 'kel', 'ken', 'kep', 'key',
+            'kgn', 'lcs', 'len', 'lno', 'log', 'lrc', 'lst', 'max',
+            'mem', 'mid', 'min', 'mnm', 'mod', 'msg', 'msk', 'mxc',
+            'mxl', 'new', 'not', 'nul', 'num', 'obj', 'opt', 'pad',
+            'pck', 'pfx', 'pgm', 'pos', 'prc', 'prm', 'pth', 'pub',
+            'rcd', 'rdx', 'rec', 'ref', 'rnd', 'rno', 'sep', 'sgn',
+            'sin', 'sqr', 'srt', 'ssz', 'stk', 'stp', 'str', 'sub',
+            'swp', 'sys', 'tan', 'tbl', 'tcb', 'tmr', 'trx', 'tsk',
+            'txh', 'txw', 'ucp', 'ucs', 'upk', 'vin', 'vis', 'xeq',
+            'xfa', 'xor', '_obj'
+            ),
+        3 => array(
+            // System Variables
+            // Vars that are duplicates of functions
+            // 'ctl', 'err', 'pfx', 'prm', 'rnd', 'sep', 'sys',
+            'bkg', 'chn', 'day', 'dlm', 'dsz', 'eom', 'ers', 'esc',
+            'gfn', 'gid', 'hfn', 'hlp', 'hwd', 'lfa', 'lfo', 'lip',
+            'lpg', 'lwd', 'mse', 'msl', 'nar', 'nid', 'pgn', 'psz',
+            'quo', 'ret', 'sid', 'ssn', 'tim', 'tme', 'tms', 'tsm',
+            'uid', 'unt', 'who'
+
+            ),
+        4 => array(
+            // Nomads Variables
+            '%Flmaint_Lib$', '%Flmaint_Msg$', '%Nomads_Activation_Ok',
+            '%Nomads_Auto_Qry', '%Nomads_Disable_Debug',
+            '%Nomads_Disable_Trace', '%Nomads_Fkey_Handler$',
+            '%Nomads_Fkey_Tbl$', '%Nomads_Notest', '%Nomads_Onexit$',
+            '%Nomads_Post_Display', '%Nomads_Pre_Display$',
+            '%Nomads_Process$', '%Nomads_Trace_File$',
+            '%Nomad_Actv_Folder_Colors$', '%Nomad_Automation_Enabled',
+            '%Nomad_Auto_Close', '%Nomad_Center_Wdw', '%Nomad_Concurrent_Wdw',
+            '%Nomad_Custom_Define', '%Nomad_Custom_Dir$',
+            '%Nomad_Custom_Genmtc', '%Nomad_Custom_Skip_Definition',
+            '%Nomad_Def_Sfx$', '%Nomad_Enter_Tab', '%Nomad_Esc_Sel',
+            '%Nomad_Isjavx', '%Nomad_Iswindx', '%Nomad_Iswindx$',
+            '%Nomad_Menu$', '%Nomad_Menu_Leftedge_Clr$',
+            '%Nomad_Menu_Textbackground_Clr$', '%Nomad_Mln_Sep$',
+            '%Nomad_Msgmnt$', '%Nomad_Noplusw', '%Nomad_No_Customize',
+            '%Nomad_Object_Persistence', '%Nomad_Object_Resize',
+            '%Nomad_Open_Load', '%Nomad_Override_Font$',
+            '%Nomad_Palette_Loaded', '%Nomad_Panel_Info_Force',
+            '%Nomad_Panel_Info_Prog$', '%Nomad_Pnl_Def_Colour$',
+            '%Nomad_Pnl_Def_Font$', '%Nomad_Prg_Cache', '%Nomad_Qry_Attr$',
+            '%Nomad_Qry_Btn$', '%Nomad_Qry_Clear_Start', '%Nomad_Qry_Tip$',
+            '%Nomad_Qry_Wide', '%Nomad_Query_Clear_Status', '%Nomad_Query_Kno',
+            '%Nomad_Query_No_Gray', '%Nomad_Query_Odb_Ignore',
+            '%Nomad_Query_Retkno', '%Nomad_Query_Sbar_Max',
+            '%Nomad_Relative_Wdw', '%Nomad_Save_Qry_Path', '%Nomad_Script_Fn',
+            '%Nomad_Script_Log', '%Nomad_Script_Wdw',
+            '%Nomad_Skip_Change_Logic', '%Nomad_Skip_Onselect_Logic',
+            '%Nomad_Stk$', '%Nomad_Tab_Dir', '%Nomad_Timeout',
+            '%Nomad_Turbo_Off', '%Nomad_Visual_Effect',
+            '%Nomad_Visual_Override', '%Nomad_Win_Ver', '%Nomad_Xchar',
+            '%Nomad_Xmax', '%Nomad_Ychar', '%Nomad_Ymax', '%Scr_Def_Attr$',
+            '%Scr_Def_H_Fl$', '%Scr_Def_H_Id$', '%Scr_Lib', '%Scr_Lib$',
+            '%Z__Usr_Sec$', 'Alternate_Panel$', 'Alternate_Panel_Type$',
+            'Arg_1$', 'Arg_10$', 'Arg_11$', 'Arg_12$', 'Arg_13$', 'Arg_14$',
+            'Arg_15$', 'Arg_16$', 'Arg_17$', 'Arg_18$', 'Arg_19$', 'Arg_2$',
+            'Arg_20$', 'Arg_3$', 'Arg_4$', 'Arg_5$', 'Arg_6$', 'Arg_7$',
+            'Arg_8$', 'Arg_9$', 'Change_Flg', 'Cmd_Str$', 'Default_Prog$',
+            'Disp_Cmd$', 'Entire_Record$', 'Exit_Cmd$', 'Fldr_Default_Prog$',
+            'Folder_Id$', 'Id', 'Id$', 'Ignore_Exit', 'Initialize_Flg',
+            'Init_Text$', 'Init_Val$', 'Main_Scrn_K$', 'Mnu_Ln$',
+            'Next_Folder', 'Next_Id', 'Next_Id$', 'No_Flush', 'Prime_Key$',
+            'Prior_Val', 'Prior_Val$', 'Qry_Val$', 'Refresh_Flg',
+            'Replacement_Folder$', 'Replacement_Lib$', 'Replacement_Scrn$',
+            'Scrn_Id$', 'Scrn_K$', 'Scrn_Lib$', 'Tab_Table$', '_Eom$'
+            ),
+        5 => array(
+            // Mnemonics
+            "'!w'", "'*c'", "'*h'", "'*i'", "'*o'", "'*r'", "'*x'",
+            "'+b'", "'+d'", "'+e'", "'+f'", "'+i'", "'+n'",
+            "'+p'", "'+s'", "'+t'", "'+u'", "'+v'", "'+w'", "'+x'",
+            "'+z'", "'-b'", "'-d'", "'-e'", "'-f'", "'-i'",
+            "'-n'", "'-p'", "'-s'", "'-t'", "'-u'", "'-v'", "'-w'",
+            "'-x'", "'-z'", "'2d'", "'3d'", "'4d'", "'@@'", "'ab'",
+            "'arc'", "'at'", "'backgr'", "'bb'", "'be'", "'beep'",
+            "'bg'", "'bi'", "'bj'", "'bk'", "'black'", "'blue'",
+            "'bm'", "'bo'", "'box'", "'br'", "'bs'", "'bt'", "'bu'",
+            "'bw'", "'bx'", "'caption'", "'ce'", "'cf'", "'ch'",
+            "'ci'", "'circle'", "'cl'", "'colour'", "'cp'", "'cpi'",
+            "'cr'", "'cs'", "'cursor'", "'cyan''_cyan'", "'dc'",
+            "'default'", "'df'", "'dialogue'", "'dn'", "'do'",
+            "'drop'", "'eb'", "'ee'", "'ef'", "'eg'", "'ei'", "'ej'",
+            "'el'", "'em'", "'eo'", "'ep'", "'er'", "'es'", "'et'",
+            "'eu'", "'ew'", "'ff'", "'fill'", "'fl'", "'font'",
+            "'frame'", "'gd'", "'ge'", "'gf'", "'goto'", "'green'",
+            "'gs'", "'hide'", "'ic'", "'image'", "'jc'",
+            "'jd'", "'jl'", "'jn'", "'jr'", "'js'", "'l6'", "'l8'",
+            "'lc'", "'ld'", "'lf'", "'li'", "'line'", "'lm'",
+            "'lpi'", "'lt'", "'magenta'", "'maxsize'", "'me'",
+            "'message'", "'minsize'", "'mn'", "'mode'",
+            "'move'", "'mp'", "'ms'", "'ni'", "'offset'", "'option'",
+            "'pe'", "'pen'", "'picture'", "'pie'", "'pm'", "'polygon'",
+            "'pop'", "'ps'", "'push'", "'rb'", "'rc'", "'rectangle'",
+            "'red'", "'rl'", "'rm'", "'rp'", "'rs'", "'rt'", "'sb'",
+            "'scroll'", "'sd'", "'se'", "'sf'", "'show'", "'size'",
+            "'sl'", "'sn'", "'sp'", "'sr'", "'swap'", "'sx'", "'text'",
+            "'textwdw'", "'tr'", "'tw'", "'uc'", "'up'", "'vt'", "'wa'",
+            "'wc'", "'wd'", "'wg'", "'white'", "'window'", "'wm'",
+            "'wp'", "'wr'", "'wrap'", "'ws'", "'wx'", "'xp'", "'yellow'",
+            "'zx'", "'_black'", "'_blue'", "'_colour'", "'_green'",
+            "'_magenta'", "'_red'", "'_white'", "'_yellow'"
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('+', '-', '*', '/', '^', '|'),
+        1 => array('++', '--', '+=', '-=', '*=', '/=', '^=', '|='),
+        2 => array('&lt;', '&gt;', '='),
+        3 => array('(', ')', '[', ']', '{', '}'),
+        4 => array(',', '@', ';', '\\')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: navy;', // Directives
+            2 => 'color: blue;', // System Functions
+            3 => 'color: blue;', // System Variables
+            4 => 'color: #6A5ACD; font-style: italic;', // Nomads Global Variables
+            5 => 'color: #BDB76B;', // Mnemonics
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: green;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000099;',
+            2 => 'color: #000099;',
+            3 => 'color: #0000C9;',
+            4 => 'color: #000099;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #006400; font-weight: bold',
+            2 => 'color: #6A5ACD;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.allbasic.info./wiki/index.php/PX:Directive_{FNAME}',
+        2 => 'http://www.allbasic.info./wiki/index.php/PX:System_function_{FNAME}',
+        3 => 'http://www.allbasic.info./wiki/index.php/PX:System_variable_{FNAME}',
+        4 => 'http://www.allbasic.info./wiki/index.php/PX:Nomads_{FNAME}',
+        5 => 'http://www.allbasic.info./wiki/index.php/PX:Mnemonic_{FNAMEU}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => "'"
+        ),
+    'REGEXPS' => array(
+        1 => array(
+            // Line Labels
+            GESHI_SEARCH => '([[:space:]])([a-zA-Z_][a-zA-Z0-9_]+)(:)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        2 => array(
+            // Global String Variables
+            GESHI_SEARCH => '(\%)([a-zA-Z_][a-zA-Z0-9_]+)(\$)',
+            GESHI_REPLACE => '\\1\\2\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/purebasic.php b/vendor/easybook/geshi/geshi/purebasic.php
new file mode 100755
index 000000000..d78ffe97b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/purebasic.php
@@ -0,0 +1,303 @@
+<?php
+/*************************************************************************************
+ * purebasic.php
+ * -------
+ * Author: GuShH
+ * Copyright: (c) 2009 Gustavo Julio Fiorenza
+ * Release Version: 1.0.8.11
+ * Date Started: 13/06/2009
+ *
+ * PureBasic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 13/06/2009 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2009/06/13)
+ * -------------------------
+ * Add the remaining ASM mnemonics and the 4.3x functions/etc.
+ * Better coloring (perhaps match the default scheme of PB?)
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PureBasic',
+    'COMMENT_SINGLE' => array( 1 => ";"  ),
+    'COMMENT_MULTI' => array( ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Keywords
+            'And', 'As', 'Break', 'CallDebugger', 'Case', 'CompilerCase', 'CompilerDefault', 'CompilerElse', 'CompilerEndIf', 'CompilerEndSelect',
+            'CompilerError', 'CompilerIf', 'CompilerSelect', 'Continue', 'Data', 'DataSection', 'EndDataSection', 'Debug', 'DebugLevel', 'Declare',
+            'DeclareCDLL', 'DeclareDLL', 'Default', 'Define', 'Dim', 'DisableASM', 'DisableDebugger', 'DisableExplicit', 'Else', 'ElseIf', 'EnableASM',
+            'EnableDebugger', 'EnableExplicit', 'End', 'EndEnumeration', 'EndIf', 'EndImport', 'EndInterface', 'EndMacro', 'EndProcedure',
+            'EndSelect', 'EndStructure', 'EndStructureUnion', 'EndWith', 'Enumeration', 'Extends', 'FakeReturn', 'For', 'Next', 'ForEach',
+            'ForEver', 'Global', 'Gosub', 'Goto', 'If', 'Import', 'ImportC', 'IncludeBinary', 'IncludeFile', 'IncludePath', 'Interface', 'Macro',
+            'NewList', 'Not', 'Or', 'Procedure', 'ProcedureC', 'ProcedureCDLL', 'ProcedureDLL', 'ProcedureReturn', 'Protected', 'Prototype',
+            'PrototypeC', 'Read', 'ReDim', 'Repeat', 'Until', 'Restore', 'Return', 'Select', 'Shared', 'Static', 'Step', 'Structure', 'StructureUnion',
+            'Swap', 'To', 'Wend', 'While', 'With', 'XIncludeFile', 'XOr'
+            ),
+        2 => array(
+            // All Functions
+            'Abs', 'ACos', 'Add3DArchive', 'AddBillboard', 'AddDate', 'AddElement', 'AddGadgetColumn', 'AddGadgetItem',
+            'AddKeyboardShortcut', 'AddMaterialLayer', 'AddPackFile', 'AddPackMemory', 'AddStatusBarField', 'AddSysTrayIcon',
+            'AllocateMemory', 'AmbientColor', 'AnimateEntity', 'Asc', 'ASin', 'ATan', 'AudioCDLength', 'AudioCDName', 'AudioCDStatus',
+            'AudioCDTrackLength', 'AudioCDTracks', 'AudioCDTrackSeconds', 'AvailableProgramOutput', 'AvailableScreenMemory',
+            'BackColor', 'Base64Decoder', 'Base64Encoder', 'BillboardGroupLocate', 'BillboardGroupMaterial', 'BillboardGroupX',
+            'BillboardGroupY', 'BillboardGroupZ', 'BillboardHeight', 'BillboardLocate', 'BillboardWidth', 'BillboardX', 'BillboardY', 'BillboardZ',
+            'Bin', 'BinQ', 'Blue', 'Box', 'ButtonGadget', 'ButtonImageGadget', 'CalendarGadget', 'CallCFunction', 'CallCFunctionFast',
+            'CallFunction', 'CallFunctionFast', 'CameraBackColor', 'CameraFOV', 'CameraLocate', 'CameraLookAt', 'CameraProjection',
+            'CameraRange', 'CameraRenderMode', 'CameraX', 'CameraY', 'CameraZ', 'CatchImage', 'CatchSound', 'CatchSprite',
+            'CatchXML', 'ChangeAlphaIntensity', 'ChangeCurrentElement', 'ChangeGamma', 'ChangeListIconGadgetDisplay',
+            'ChangeSysTrayIcon', 'CheckBoxGadget', 'CheckEntityCollision', 'CheckFilename', 'ChildXMLNode', 'Chr', 'Circle',
+            'ClearBillboards', 'ClearClipboard', 'ClearConsole', 'ClearError', 'ClearGadgetItemList', 'ClearList', 'ClearScreen', 'ClipSprite',
+            'CloseConsole', 'CloseDatabase', 'CloseFile', 'CloseGadgetList', 'CloseHelp', 'CloseLibrary', 'CloseNetworkConnection',
+            'CloseNetworkServer', 'ClosePack', 'ClosePreferences', 'CloseProgram', 'CloseScreen', 'CloseSubMenu', 'CloseWindow',
+            'ColorRequester', 'ComboBoxGadget', 'CompareMemory', 'CompareMemoryString', 'ConnectionID', 'ConsoleColor',
+            'ConsoleCursor', 'ConsoleError', 'ConsoleLocate', 'ConsoleTitle', 'ContainerGadget', 'CopyDirectory', 'CopyEntity',
+            'CopyFile', 'CopyImage', 'CopyLight', 'CopyMaterial', 'CopyMemory', 'CopyMemoryString', 'CopyMesh', 'CopySprite',
+            'CopyTexture', 'CopyXMLNode', 'Cos', 'CountBillboards', 'CountGadgetItems', 'CountLibraryFunctions', 'CountList',
+            'CountMaterialLayers', 'CountProgramParameters', 'CountRenderedTriangles', 'CountString', 'CRC32Fingerprint',
+            'CreateBillboardGroup', 'CreateCamera', 'CreateDirectory', 'CreateEntity', 'CreateFile', 'CreateGadgetList',
+            'CreateImage', 'CreateLight', 'CreateMaterial', 'CreateMenu', 'CreateMesh', 'CreateMutex', 'CreateNetworkServer',
+            'CreatePack', 'CreatePalette', 'CreateParticleEmitter', 'CreatePopupMenu', 'CreatePreferences', 'CreateSprite',
+            'CreateSprite3D', 'CreateStatusBar', 'CreateTerrain', 'CreateTexture', 'CreateThread', 'CreateToolBar', 'CreateXML',
+            'CreateXMLNode', 'DatabaseColumnName', 'DatabaseColumns', 'DatabaseColumnType', 'DatabaseDriverDescription',
+            'DatabaseDriverName', 'DatabaseError', 'DatabaseQuery', 'DatabaseUpdate', 'Date', 'DateGadget', 'Day', 'DayOfWeek',
+            'DayOfYear', 'DefaultPrinter', 'Defined', 'Delay', 'DeleteDirectory', 'DeleteElement', 'DeleteFile', 'DeleteXMLNode',
+            'DESFingerprint', 'DesktopDepth', 'DesktopFrequency', 'DesktopHeight', 'DesktopMouseX', 'DesktopMouseY', 'DesktopName',
+            'DesktopWidth', 'DirectoryEntryAttributes', 'DirectoryEntryDate', 'DirectoryEntryName', 'DirectoryEntrySize',
+            'DirectoryEntryType', 'DisableGadget', 'DisableMaterialLighting', 'DisableMenuItem', 'DisableToolBarButton', 'DisableWindow',
+            'DisASMCommand', 'DisplayAlphaSprite', 'DisplayPalette', 'DisplayPopupMenu', 'DisplayRGBFilter', 'DisplayShadowSprite',
+            'DisplaySolidSprite', 'DisplaySprite', 'DisplaySprite3D', 'DisplayTranslucentSprite', 'DisplayTransparentSprite', 'DragFiles',
+            'DragImage', 'DragOSFormats', 'DragPrivate', 'DragText', 'DrawAlphaImage', 'DrawImage', 'DrawingBuffer',
+            'DrawingBufferPitch', 'DrawingBufferPixelFormat', 'DrawingFont', 'DrawingMode', 'DrawText', 'EditorGadget',
+            'egrid_AddColumn', 'egrid_AddRows', 'egrid_AppendCells', 'egrid_ClearRows', 'egrid_CopyCells',
+            'egrid_CreateCellCallback', 'egrid_CreateGrid', 'egrid_DeleteCells', 'egrid_FastDeleteCells', 'egrid_FreeGrid',
+            'egrid_GetCellSelection', 'egrid_GetCellText', 'egrid_GetColumnOrderArray', 'egrid_HasSelectedCellChanged', 'egrid_Height',
+            'egrid_HideEdit', 'egrid_HideGrid', 'egrid_MakeCellVisible', 'egrid_NumberOfColumns', 'egrid_NumberOfRows',
+            'egrid_PasteCells', 'egrid_Register', 'egrid_RemoveCellCallback', 'egrid_RemoveColumn', 'egrid_RemoveRow', 'egrid_Resize',
+            'egrid_SelectCell', 'egrid_SelectedColumn', 'egrid_SelectedRow', 'egrid_SetCellSelection', 'egrid_SetCellText',
+            'egrid_SetColumnOrderArray', 'egrid_SetHeaderFont', 'egrid_SetHeaderHeight', 'egrid_SetOption', 'egrid_Width', 'egrid_x',
+            'egrid_y', 'EjectAudioCD', 'ElapsedMilliseconds', 'Ellipse', 'EnableGadgetDrop', 'EnableGraphicalConsole',
+            'EnableWindowDrop', 'EnableWorldCollisions', 'EnableWorldPhysics', 'Engine3DFrameRate', 'EntityAngleX',
+            'EntityAnimationLength', 'EntityLocate', 'EntityMaterial', 'EntityMesh', 'EntityPhysicBody', 'EntityRenderMode',
+            'EntityX', 'EntityY', 'EntityZ', 'EnvironmentVariableName', 'EnvironmentVariableValue', 'Eof', 'EventClient',
+            'EventDropAction', 'EventDropBuffer', 'EventDropFiles', 'EventDropImage', 'EventDropPrivate', 'EventDropSize',
+            'EventDropText', 'EventDropType', 'EventDropX', 'EventDropY', 'EventGadget', 'EventlParam', 'EventMenu', 'EventServer',
+            'EventType', 'EventWindow', 'EventwParam', 'ExamineDatabaseDrivers', 'ExamineDesktops', 'ExamineDirectory',
+            'ExamineEnvironmentVariables', 'ExamineIPAddresses', 'ExamineJoystick', 'ExamineKeyboard', 'ExamineLibraryFunctions',
+            'ExamineMouse', 'ExaminePreferenceGroups', 'ExaminePreferenceKeys', 'ExamineScreenModes', 'ExamineWorldCollisions',
+            'ExamineXMLAttributes', 'ExplorerComboGadget', 'ExplorerListGadget', 'ExplorerTreeGadget', 'ExportXML',
+            'ExportXMLSize', 'FileBuffersSize', 'FileID', 'FileSeek', 'FileSize', 'FillArea', 'FindString', 'FinishDirectory',
+            'FirstDatabaseRow', 'FirstElement', 'FirstWorldCollisionEntity', 'FlipBuffers', 'FlushFileBuffers', 'Fog', 'FontID',
+            'FontRequester', 'FormatDate', 'FormatXML', 'Frame3DGadget', 'FreeBillboardGroup', 'FreeCamera', 'FreeEntity',
+            'FreeFont', 'FreeGadget', 'FreeImage', 'FreeLight', 'FreeMaterial', 'FreeMemory', 'FreeMenu', 'FreeMesh',
+            'FreeModule', 'FreeMovie', 'FreeMutex', 'FreePalette', 'FreeParticleEmitter', 'FreeSound', 'FreeSprite',
+            'FreeSprite3D', 'FreeStatusBar', 'FreeTexture', 'FreeToolBar', 'FreeXML', 'FrontColor', 'GadgetHeight', 'GadgetID',
+            'GadgetItemID', 'GadgetToolTip', 'GadgetType', 'GadgetWidth', 'GadgetX', 'GadgetY', 'GetActiveGadget',
+            'GetActiveWindow', 'GetClientIP', 'GetClientPort', 'GetClipboardImage', 'GetClipboardText', 'GetCurrentDirectory',
+            'GetCurrentEIP', 'GetDatabaseDouble', 'GetDatabaseFloat', 'GetDatabaseLong', 'GetDatabaseQuad', 'GetDatabaseString',
+            'GetDisASMString', 'GetEntityAnimationTime', 'GetEntityFriction', 'GetEntityMass', 'GetEnvironmentVariable',
+            'GetErrorAddress', 'GetErrorCounter', 'GetErrorDescription', 'GetErrorDLL', 'GetErrorLineNR', 'GetErrorModuleName',
+            'GetErrorNumber', 'GetErrorRegister', 'GetExtensionPart', 'GetFileAttributes', 'GetFileDate', 'GetFilePart', 'GetFunction',
+            'GetFunctionEntry', 'GetGadgetAttribute', 'GetGadgetColor', 'GetGadgetData', 'GetGadgetFont',
+            'GetGadgetItemAttribute', 'GetGadgetItemColor', 'GetGadgetItemData', 'GetGadgetItemState', 'GetGadgetItemText',
+            'GetGadgetState', 'GetGadgetText', 'GetHomeDirectory', 'GetMenuItemState', 'GetMenuItemText', 'GetMenuTitleText',
+            'GetModulePosition', 'GetModuleRow', 'GetPaletteColor', 'GetPathPart', 'GetTemporaryDirectory',
+            'GetToolBarButtonState', 'GetWindowColor', 'GetWindowState', 'GetWindowTitle', 'GetXMLAttribute', 'GetXMLEncoding',
+            'GetXMLNodeName', 'GetXMLNodeOffset', 'GetXMLNodeText', 'GetXMLStandalone', 'GoToEIP', 'GrabImage', 'GrabSprite',
+            'Green', 'Hex', 'HexQ', 'HideBillboardGroup', 'HideEntity', 'HideGadget', 'HideLight', 'HideMenu', 'HideParticleEmitter',
+            'HideWindow', 'Hostname', 'Hour', 'HyperLinkGadget', 'ImageDepth', 'ImageGadget', 'ImageHeight', 'ImageID',
+            'ImageOutput', 'ImageWidth', 'InitAudioCD', 'InitEngine3D', 'InitJoystick', 'InitKeyboard', 'InitMouse', 'InitMovie',
+            'InitNetwork', 'InitPalette', 'InitScintilla', 'InitSound', 'InitSprite', 'InitSprite3D', 'Inkey', 'Input', 'InputRequester',
+            'InsertElement', 'Int', 'IntQ', 'IPAddressField', 'IPAddressGadget', 'IPString', 'IsBillboardGroup', 'IsCamera', 'IsDatabase',
+            'IsDirectory', 'IsEntity', 'IsFile', 'IsFont', 'IsGadget', 'IsImage', 'IsLibrary', 'IsLight', 'IsMaterial', 'IsMenu', 'IsMesh',
+            'IsModule', 'IsMovie', 'IsPalette', 'IsParticleEmitter', 'IsProgram', 'IsScreenActive', 'IsSound', 'IsSprite', 'IsSprite3D',
+            'IsStatusBar', 'IsSysTrayIcon', 'IsTexture', 'IsThread', 'IsToolBar', 'IsWindow', 'IsXML', 'JoystickAxisX', 'JoystickAxisY',
+            'JoystickButton', 'KeyboardInkey', 'KeyboardMode', 'KeyboardPushed', 'KeyboardReleased', 'KillProgram', 'KillThread',
+            'LastElement', 'LCase', 'Left', 'Len', 'LibraryFunctionAddress', 'LibraryFunctionName', 'LibraryID', 'LightColor',
+            'LightLocate', 'LightSpecularColor', 'Line', 'LineXY', 'ListIconGadget', 'ListIndex', 'ListViewGadget', 'LoadFont',
+            'LoadImage', 'LoadMesh', 'LoadModule', 'LoadMovie', 'LoadPalette', 'LoadSound', 'LoadSprite', 'LoadTexture',
+            'LoadWorld', 'LoadXML', 'Loc', 'LockMutex', 'Lof', 'Log', 'Log10', 'LSet', 'LTrim', 'MainXMLNode', 'MakeIPAddress',
+            'MaterialAmbientColor', 'MaterialBlendingMode', 'MaterialDiffuseColor', 'MaterialFilteringMode', 'MaterialID',
+            'MaterialShadingMode', 'MaterialSpecularColor', 'MD5FileFingerprint', 'MD5Fingerprint', 'MDIGadget', 'MemorySize',
+            'MemoryStringLength', 'MenuBar', 'MenuHeight', 'MenuID', 'MenuItem', 'MenuTitle', 'MeshID', 'MessageRequester',
+            'Mid', 'Minute', 'ModuleVolume', 'Month', 'MouseButton', 'MouseDeltaX', 'MouseDeltaY', 'MouseLocate', 'MouseWheel',
+            'MouseX', 'MouseY', 'MoveBillboard', 'MoveBillboardGroup', 'MoveCamera', 'MoveEntity', 'MoveLight', 'MoveMemory',
+            'MoveParticleEmitter', 'MoveXMLNode', 'MovieAudio', 'MovieHeight', 'MovieInfo', 'MovieLength', 'MovieSeek',
+            'MovieStatus', 'MovieWidth', 'NetworkClientEvent', 'NetworkServerEvent', 'NewPrinterPage', 'NextDatabaseDriver',
+            'NextDatabaseRow', 'NextDirectoryEntry', 'NextElement', 'NextEnvironmentVariable', 'NextIPAddress',
+            'NextLibraryFunction', 'NextPackFile', 'NextPreferenceGroup', 'NextPreferenceKey', 'NextScreenMode',
+            'NextSelectedFileName', 'NextWorldCollision', 'NextXMLAttribute', 'NextXMLNode', 'OffsetOf', 'OnErrorExit',
+            'OnErrorGosub', 'OnErrorGoto', 'OnErrorResume', 'OpenComPort', 'OpenConsole', 'OpenDatabase',
+            'OpenDatabaseRequester', 'OpenFile', 'OpenFileRequester', 'OpenGadgetList', 'OpenHelp', 'OpenLibrary',
+            'OpenNetworkConnection', 'OpenPack', 'OpenPreferences', 'OpenScreen', 'OpenSubMenu', 'OpenWindow',
+            'OpenWindowedScreen', 'OptionGadget', 'OSVersion', 'PackerCallback', 'PackFileSize', 'PackMemory', 'PanelGadget',
+            'ParentXMLNode', 'Parse3DScripts', 'ParseDate', 'ParticleColorFader', 'ParticleColorRange', 'ParticleEmissionRate',
+            'ParticleEmitterDirection', 'ParticleEmitterLocate', 'ParticleEmitterX', 'ParticleEmitterY', 'ParticleEmitterZ',
+            'ParticleMaterial', 'ParticleSize', 'ParticleTimeToLive', 'ParticleVelocity', 'PathRequester', 'PauseAudioCD',
+            'PauseMovie', 'PauseThread', 'PeekB', 'PeekC', 'PeekD', 'PeekF', 'PeekL', 'PeekQ', 'PeekS', 'PeekW', 'PlayAudioCD',
+            'PlayModule', 'PlayMovie', 'PlaySound', 'Plot', 'Point', 'PokeB', 'PokeC', 'PokeD', 'PokeF', 'PokeL', 'PokeQ', 'PokeS',
+            'PokeW', 'Pow', 'PreferenceComment', 'PreferenceGroup', 'PreferenceGroupName', 'PreferenceKeyName',
+            'PreferenceKeyValue', 'PreviousDatabaseRow', 'PreviousElement', 'PreviousXMLNode', 'Print', 'PrinterOutput',
+            'PrinterPageHeight', 'PrinterPageWidth', 'PrintN', 'PrintRequester', 'ProgramExitCode', 'ProgramFilename',
+            'ProgramID', 'ProgramParameter', 'ProgramRunning', 'ProgressBarGadget', 'Random', 'RandomSeed', 'RawKey',
+            'ReadByte', 'ReadCharacter', 'ReadConsoleData', 'ReadData', 'ReadDouble', 'ReadFile', 'ReadFloat', 'ReadLong',
+            'ReadPreferenceDouble', 'ReadPreferenceFloat', 'ReadPreferenceLong', 'ReadPreferenceQuad',
+            'ReadPreferenceString', 'ReadProgramData', 'ReadProgramError', 'ReadProgramString', 'ReadQuad', 'ReadString',
+            'ReadStringFormat', 'ReadWord', 'ReAllocateMemory', 'ReceiveNetworkData', 'ReceiveNetworkFile', 'Red',
+            'Reg_DeleteEmptyKey', 'Reg_DeleteKey', 'Reg_DeleteValue', 'Reg_GetErrorMsg', 'Reg_GetErrorNr',
+            'Reg_GetValueTyp', 'Reg_ListSubKey', 'Reg_ListSubValue', 'Reg_ReadBinary', 'Reg_ReadExpandString',
+            'Reg_ReadLong', 'Reg_ReadMultiLineString', 'Reg_ReadQuad', 'Reg_ReadString', 'Reg_WriteBinary',
+            'Reg_WriteExpandString', 'Reg_WriteLong', 'Reg_WriteMultiLineString', 'Reg_WriteQuad', 'Reg_WriteString',
+            'ReleaseMouse', 'RemoveBillboard', 'RemoveEnvironmentVariable', 'RemoveGadgetColumn', 'RemoveGadgetItem',
+            'RemoveKeyboardShortcut', 'RemoveMaterialLayer', 'RemovePreferenceGroup', 'RemovePreferenceKey',
+            'RemoveString', 'RemoveSysTrayIcon', 'RemoveXMLAttribute', 'RenameFile', 'RenderMovieFrame', 'RenderWorld',
+            'ReplaceString', 'ResetList', 'ResizeBillboard', 'ResizeEntity', 'ResizeGadget', 'ResizeImage', 'ResizeMovie',
+            'ResizeParticleEmitter', 'ResizeWindow', 'ResolveXMLAttributeName', 'ResolveXMLNodeName', 'ResumeAudioCD',
+            'ResumeMovie', 'ResumeThread', 'RGB', 'Right', 'RootXMLNode', 'RotateBillboardGroup', 'RotateCamera',
+            'RotateEntity', 'RotateMaterial', 'RotateSprite3D', 'Round', 'RSet', 'RTrim', 'RunProgram', 'SaveFileRequester',
+            'SaveImage', 'SaveSprite', 'SaveXML', 'ScaleEntity', 'ScaleMaterial', 'ScintillaGadget', 'ScintillaSendMessage',
+            'ScreenID', 'ScreenModeDepth', 'ScreenModeHeight', 'ScreenModeRefreshRate', 'ScreenModeWidth',
+            'ScreenOutput', 'ScrollAreaGadget', 'ScrollBarGadget', 'ScrollMaterial', 'Second', 'SecondWorldCollisionEntity',
+            'SelectedFilePattern', 'SelectedFontColor', 'SelectedFontName', 'SelectedFontSize', 'SelectedFontStyle',
+            'SelectElement', 'SendNetworkData', 'SendNetworkFile', 'SendNetworkString', 'SetActiveGadget',
+            'SetActiveWindow', 'SetClipboardImage', 'SetClipboardText', 'SetCurrentDirectory', 'SetDragCallback',
+            'SetDropCallback', 'SetEntityAnimationTime', 'SetEntityFriction', 'SetEntityMass', 'SetEnvironmentVariable',
+            'SetErrorNumber', 'SetFileAttributes', 'SetFileDate', 'SetFrameRate', 'SetGadgetAttribute', 'SetGadgetColor',
+            'SetGadgetData', 'SetGadgetFont', 'SetGadgetItemAttribute', 'SetGadgetItemColor', 'SetGadgetItemData',
+            'SetGadgetItemState', 'SetGadgetItemText', 'SetGadgetState', 'SetGadgetText', 'SetMenuItemState',
+            'SetMenuItemText', 'SetMenuTitleText', 'SetMeshData', 'SetModulePosition', 'SetPaletteColor', 'SetRefreshRate',
+            'SetToolBarButtonState', 'SetWindowCallback', 'SetWindowColor', 'SetWindowState', 'SetWindowTitle',
+            'SetXMLAttribute', 'SetXMLEncoding', 'SetXMLNodeName', 'SetXMLNodeOffset', 'SetXMLNodeText',
+            'SetXMLStandalone', 'Sin', 'SizeOf', 'SkyBox', 'SkyDome', 'SmartWindowRefresh', 'SortArray', 'SortList',
+            'SortStructuredArray', 'SortStructuredList', 'SoundFrequency', 'SoundPan', 'SoundVolume', 'Space',
+            'SpinGadget', 'SplitterGadget', 'Sprite3DBlendingMode', 'Sprite3DQuality', 'SpriteCollision', 'SpriteDepth',
+            'SpriteHeight', 'SpriteID', 'SpriteOutput', 'SpritePixelCollision', 'SpriteWidth', 'Sqr', 'Start3D', 'StartDrawing',
+            'StartPrinting', 'StartSpecialFX', 'StatusBarHeight', 'StatusBarIcon', 'StatusBarID', 'StatusBarText',
+            'StickyWindow', 'Stop3D', 'StopAudioCD', 'StopDrawing', 'StopModule', 'StopMovie', 'StopPrinting',
+            'StopSound', 'StopSpecialFX', 'Str', 'StrD', 'StrF', 'StringByteLength', 'StringField', 'StringGadget', 'StrQ',
+            'StrU', 'Subsystem', 'SwapElements', 'SysTrayIconToolTip', 'Tan', 'TerrainHeight', 'TextGadget', 'TextHeight',
+            'TextureHeight', 'TextureID', 'TextureOutput', 'TextureWidth', 'TextWidth', 'ThreadID', 'ThreadPriority',
+            'ToolBarHeight', 'ToolBarID', 'ToolBarImageButton', 'ToolBarSeparator', 'ToolBarStandardButton',
+            'ToolBarToolTip', 'TrackBarGadget', 'TransformSprite3D', 'TransparentSpriteColor', 'TreeGadget', 'Trim',
+            'TruncateFile', 'TryLockMutex', 'UCase', 'UnlockMutex', 'UnpackMemory', 'UseAudioCD', 'UseBuffer',
+            'UseGadgetList', 'UseJPEGImageDecoder', 'UseJPEGImageEncoder', 'UseODBCDatabase', 'UseOGGSoundDecoder',
+            'UsePNGImageDecoder', 'UsePNGImageEncoder', 'UseTGAImageDecoder', 'UseTIFFImageDecoder', 'Val', 'ValD',
+            'ValF', 'ValQ', 'WaitProgram', 'WaitThread', 'WaitWindowEvent', 'WebGadget', 'WebGadgetPath', 'WindowEvent',
+            'WindowHeight', 'WindowID', 'WindowMouseX', 'WindowMouseY', 'WindowOutput', 'WindowWidth', 'WindowX',
+            'WindowY', 'WorldGravity', 'WorldShadows', 'WriteByte', 'WriteCharacter', 'WriteConsoleData', 'WriteData',
+            'WriteDouble', 'WriteFloat', 'WriteLong', 'WritePreferenceDouble', 'WritePreferenceFloat', 'WritePreferenceLong',
+            'WritePreferenceQuad', 'WritePreferenceString', 'WriteProgramData', 'WriteProgramString', 'WriteProgramStringN',
+            'WriteQuad', 'WriteString', 'WriteStringFormat', 'WriteStringN', 'WriteWord', 'XMLAttributeName', 'XMLAttributeValue',
+            'XMLChildCount', 'XMLError', 'XMLErrorLine', 'XMLErrorPosition', 'XMLNodeFromID', 'XMLNodeFromPath', 'XMLNodePath',
+            'XMLNodeType', 'XMLStatus', 'Year', 'ZoomSprite3D'
+            ),
+        3 => array(
+            // some ASM instructions
+            'AAA', 'AAD', 'AAM', 'AAS', 'ADC', 'ADD', 'AND', 'ARPL', 'BOUND', 'BSF', 'BSR', 'BSWAP', 'BT', 'BTC', 'BTR',
+            'BTS', 'CALL', 'CBW', 'CDQ', 'CLC', 'CLD', 'CLI', 'CLTS', 'CMC', 'CMP', 'CMPS', 'CMPXCHG', 'CWD', 'CWDE',
+            'DAA', 'DAS', 'DB', 'DD', 'DEC', 'DIV', 'DW', 'ENTER', 'ESC', 'F2XM1', 'FABS', 'FADD', 'FCHS', 'FCLEX',
+            'FCOM', 'FDIV', 'FDIVR', 'FFREE', 'FINCSTP', 'FINIT', 'FLD', 'FLD1', 'FLDCW', 'FMUL', 'FNOP', 'FPATAN',
+            'FPREM', 'FRNDINT', 'FSAVE', 'FSCALE', 'FSETPM', 'FSIN', 'FSQRT', 'FST', 'FSTENV', 'FSTSW', 'FSUB',
+            'FSUBR', 'FTST', 'FUCOM', 'FWAIT', 'FXAM', 'FXCH', 'FXTRACT', 'FYL2X', 'FYL2XP1', 'HLT', 'IDIV', 'IMUL',
+            'IN', 'INC', 'INS', 'INT', 'INTO', 'INVLPG', 'IRET', 'IRETD', 'JA', 'JAE', 'JB', 'JBE', 'JC', 'JCXZ', 'JE', 'JECXZ',
+            'JG', 'JGE', 'JL', 'JLE', 'JMP', 'JNA', 'JNAE', 'JNB', 'JNBE', 'JNC', 'JNE', 'JNG', 'JNGE', 'JNL', 'JNLE', 'JNO', 'JNP',
+            'JNS', 'JNZ', 'JO', 'JP', 'JPE', 'JPO', 'JS', 'JZ', 'LAHF', 'LAR', 'LDS', 'LEA', 'LEAVE', 'LES', 'LFS', 'LGDT', 'LGS',
+            'LIDT', 'LLDT', 'LMSW', 'LOCK', 'LODS', 'LOOP', 'LOOPE', 'LOOPNE', 'LOOPNZ', 'LOOPZ', 'LSL', 'LSS', 'LTR',
+            'MOV', 'MOVS', 'MOVSX', 'MOVZX', 'MUL', 'NEG', 'NOP', 'NOT', 'OR', 'OUT', 'OUTS', 'POP', 'POPA', 'POPAD',
+            'POPF', 'POPFD', 'PUSH', 'PUSHA', 'PUSHAD', 'PUSHF', 'PUSHFD', 'RCL', 'RCR', 'REP', 'REPE', 'REPNE',
+            'REPNZ', 'REPZ', 'RET', 'RETF', 'ROL', 'ROR', 'SAHF', 'SAL', 'SAR', 'SBB', 'SCAS', 'SETAE', 'SETB', 'SETBE',
+            'SETC', 'SETE', 'SETG', 'SETGE', 'SETL', 'SETLE', 'SETNA', 'SETNAE', 'SETNB', 'SETNC', 'SETNE', 'SETNG',
+            'SETNGE', 'SETNL', 'SETNLE', 'SETNO', 'SETNP', 'SETNS', 'SETNZ', 'SETO', 'SETP', 'SETPE', 'SETPO',
+            'SETS', 'SETZ', 'SGDT', 'SHL', 'SHLD', 'SHR', 'SHRD', 'SIDT', 'SLDT', 'SMSW', 'STC', 'STD', 'STI',
+            'STOS', 'STR', 'SUB', 'TEST', 'VERR', 'VERW', 'WAIT', 'WBINVD', 'XCHG', 'XLAT', 'XLATB', 'XOR'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '+', '-', '*', '/', '\\', '>', '<', '=', '<=', '>=', '&', '|', '!', '~', '<>', '>>', '<<', '%'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000fff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff0000; font-style: italic;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '\\'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/pycon.php b/vendor/easybook/geshi/geshi/pycon.php
new file mode 100755
index 000000000..ac2b34d07
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pycon.php
@@ -0,0 +1,64 @@
+<?php
+/*************************************************************************************
+ * python.php
+ * ----------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/30
+ *
+ * Python language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/12/18
+ *  -  Added missing functions and keywords. Also added two new Python 3.0 types. SF#2441839
+ * 2005/05/26
+ *  -  Modifications by Tim (tim@skreak.com): added more keyword categories, tweaked colors
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/08/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+//This
+require(dirname(__FILE__).'/python.php');
+
+$language_data['LANG_NAME'] = 'Python (console mode)';
+
+$language_data['STRICT_MODE_APPLIES'] = GESHI_ALWAYS;
+$language_data['SCRIPT_DELIMITERS'][-1] = '/^(>>>).*?$(?:\n\.\.\..*?$)*($)/m';
+$language_data['HIGHLIGHT_STRICT_BLOCK'][-1] = true;
+
+$language_data['STYLES']['SCRIPT'][-1] = 'color: #222222;';
+
+if(!isset($language_data['COMMENT_REGEXP'])) {
+    $language_data['COMMENT_REGEXP'] = array();
+}
+
+$language_data['COMMENT_REGEXP'][-1] = '/(?:^|\A\s)(?:>>>|\.\.\.)/m';
+$language_data['STYLES']['COMMENTS'][-1] = 'color: #444444;';
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/pys60.php b/vendor/easybook/geshi/geshi/pys60.php
new file mode 100755
index 000000000..865b59adb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/pys60.php
@@ -0,0 +1,271 @@
+<?php
+/**************************************************************************************
+ * pys60.php
+ * ----------
+ * Author: Sohan Basak (ronnie.basak96 @gmail.com)
+ * Copyright: (c) 2012 Sohan Basak (http://tothepower.tk),  Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/05/03
+ *
+ * Python for S60 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * No Changes Till Date
+ *
+ * The python.php file is extended to pys60.php with required modifications
+ *
+ * NOTES
+ *
+ * -I have kept the ":" in Reserved chars, so that it gets highlighted differently than brackets and/or symbols
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Python for S60',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'", '"""',"'''",'""','""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+
+        /*
+         ** Set 1: reserved words
+         ** http://python.org/doc/current/ref/keywords.html
+         */
+        1 => array(
+            'and', 'del', 'for', 'is', 'raise', 'assert', 'elif', 'from', 'lambda', 'return', 'break',
+            'else', 'global', 'not', 'try', 'class', 'except', 'if', 'or', 'while', 'continue', 'exec',
+            'import', 'pass', 'yield', 'def', 'finally', 'in', 'print', "<<", ">>", "as"
+            ),
+
+        /*
+         ** Set 2: builtins
+         ** http://python.org/doc/current/lib/built-in-funcs.html
+         */
+        2 => array(
+            '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
+            'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
+            'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
+            'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
+            'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
+            'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
+            'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
+            'vars', 'xrange', 'zip',
+            // Built-in constants: http://python.org/doc/current/lib/node35.html
+            'False', 'True', 'None', 'NotImplemented', 'Ellipsis',
+            // Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
+            'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
+            'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
+            'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
+            'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
+            'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
+            'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
+            'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
+            'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
+            'RuntimeWarning', 'FutureWarning',
+            //Symbian Errors
+            "SymbianError", "KernelError",
+            // self: this is a common python convention (but not a reserved word)
+            'self'
+            ),
+
+        /*
+         ** Set 3: standard library
+         ** http://python.org/doc/current/lib/modindex.html
+         */
+        3 => array(
+            '__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
+            'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
+            'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
+            'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
+            'collections', 'colorsys', 'commands', 'compileall', 'compiler',
+            'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
+            'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
+            'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
+            'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
+            'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
+            'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
+            'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
+            'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
+            'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
+            'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
+            'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
+            'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
+            'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
+            'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
+            're', 'readline', 'resource', 'rexec', 'rgbimg', 'rlcompleter',
+            'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
+            'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
+            'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
+            'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
+            'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
+            'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
+            'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
+            'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
+            'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
+            'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib', "os.path", "sys.path",
+
+            //PythonS60 Standard Library
+            //http://pys60.garage.maemo.org/doc/s60/
+            //These are the standard modules in the archive
+
+            "appuifw", "globalui","e32", "telephone", "aosocket", "btsocket",
+            "sysinfo","camera","graphics","keycapture","key_codes","topwindow", "gles",
+            "glcanvas","sensor", "audio","messaging", "inbox","location","positioning",
+            "contacts", "e32calendar", "e32db","e32dbm","logs","scriptext",
+            "series60_console",
+
+            //These are external but very often usable modules
+
+            "appuifw2","ArchetypeUI","elementtree","lightblue",
+            "activaprofile","Adjustor","akntextutils","aosocketnativenew",
+            "appreciation","applicationmanager","appswitch","atextit","bt_teror","btconsole",
+            "btswitch","cElementTree","cenrep","cerealizer","cl_gui","clipboard",
+            "clipboard_CHN","debugger","decompile2",
+            "dir_iter","download","easydb","ECenrep","Edit_find","efeature","elocation","envy",
+            "EProfile","erestart","error","esyagent","Execwap","exprofile","fastcamera",
+            "feature","fgimage","filebrowser","firmware","fold","fonts","fraction","FTP",
+            "ftplibnew","fy_manager","fy_menu","gles_utils","gps_location","hack",
+            "HTML2TXT","iapconnect","icon_image","image_decoder",
+            "ini","interactive_console","inting","key_modifiers","key_tricks","keypress",
+            "landmarks","lite_fm","locationacq","locationrequestor",
+            "logo","markupbase","mbm","mbm2","minidb","miniinfo","MISC",
+            "misty","Msg","ntpath","odict","Paintbox","pathinfo","pexif","pickcolor",
+            "powlite_fm","powlite_fm2","powlite_fm3","powlite_fme","prgbar","prodb",
+            "profileengine","progressbar","progressbartw","progressnotes",
+            "ProgressBarTW2","proshivka","py_upload","pyConnection","PyFileMan",
+            "pykeylock","PyPyc","pyqq","pys60crypto","pys60usb","rfc822",
+            "RUSOS","scmk","scrollpage","SISFIELDS","SISFIELD","sisfile",
+            "SISINFO","sisreader","Sistools","smidi","smsreject","speechy","sre_compile",
+            "sre_constants","sre_parse","sre","sysagent","syslang","TextMan",
+            "textrenderer","TextWrap","topwind","tsocket","uikludge","uikludges","uitricks",
+            "walkfile","wallpaper","wfm_lite",
+            "wif_keys","wif","window","wlanmgmt","wlantools","wt_color","wt_requesters",
+            "zhkey",
+
+            //These are recent additions
+            "miffile"
+            ),
+
+        /*
+         ** Set 4: special methods
+         ** http://python.org/doc/current/ref/specialnames.html
+         */
+        4 => array(
+            ///*
+            //// Iterator types: http://python.org/doc/current/lib/typeiter.html
+            //'__iter__', 'next',
+            //// String types: http://python.org/doc/current/lib/string-methods.html
+            //'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
+            //'find', 'index', 'isalnum', 'isalpha', 'isdigit', 'islower', 'isspace', 'istitle',
+            //'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
+            //'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
+            //'translate', 'upper', 'zfill',
+            // */
+
+            // Basic customization: http://python.org/doc/current/ref/customization.html
+            '__new__', '__init__', '__del__', '__repr__', '__str__',
+            '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
+            '__hash__', '__nonzero__', '__unicode__', '__dict__',
+            // Attribute access: http://python.org/doc/current/ref/attribute-access.html
+            '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
+            '__delete__', '__slots__',
+            // Class creation, callable objects
+            '__metaclass__', '__call__',
+            // Container types: http://python.org/doc/current/ref/sequence-types.html
+            '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
+            '__getslice__', '__setslice__', '__delslice__',
+            // Numeric types: http://python.org/doc/current/ref/numeric-types.html
+            '__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
+            '__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
+            '__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
+            '__long__','__lshift__',
+            '__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
+            '__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
+            '__rshift__','__rsub__','__rmul__','__rand__','__rxor__','__ror__',
+            '__sub__','__xor__'
+            )
+
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '`'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #006000;font-weight:bold;',   // Reserved
+            2 => 'color: #800950;font-size:105%',                  // Built-ins + self
+            3 => 'color: #003399;font-size:106%',                  // Standard lib
+            4 => 'color: #0000cd;'                  // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style:italic;font-size:92%',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #930; font-weight: bold;font-size:105%'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: maroon;font-size:102%;padding:2px'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2356F8;'
+            ),
+        'METHODS' => array(
+            1 => 'color: navy;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66ccFF;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/python.php b/vendor/easybook/geshi/geshi/python.php
new file mode 100755
index 000000000..ec9b17e6f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/python.php
@@ -0,0 +1,244 @@
+<?php
+/*************************************************************************************
+ * python.php
+ * ----------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/30
+ *
+ * Python language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/12/18
+ *  -  Added missing functions and keywords. Also added two new Python 3.0 types. SF#2441839
+ * 2005/05/26
+ *  -  Modifications by Tim (tim@skreak.com): added more keyword categories, tweaked colors
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/08/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Python',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    //Longest quotemarks ALWAYS first
+    'QUOTEMARKS' => array('"""', "'''", '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX_0O | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI | GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+
+        /*
+        ** Set 1: reserved words
+        ** http://python.org/doc/current/ref/keywords.html
+        */
+        1 => array(
+            'and', 'del', 'for', 'is', 'raise', 'assert', 'elif', 'from', 'lambda', 'return', 'break',
+            'else', 'global', 'not', 'try', 'class', 'except', 'if', 'or', 'while', 'continue', 'exec',
+            'import', 'pass', 'yield', 'def', 'finally', 'in', 'print', 'with', 'as', 'nonlocal'
+            ),
+
+        /*
+        ** Set 2: builtins
+        ** http://python.org/doc/current/lib/built-in-funcs.html
+        */
+        2 => array(
+            '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
+            'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
+            'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
+            'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
+            'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
+            'raw_input', 'reduce', 'reload', 'reversed', 'round', 'set', 'setattr', 'slice',
+            'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
+            'vars', 'xrange', 'zip',
+            // Built-in constants: http://python.org/doc/current/lib/node35.html
+            'False', 'True', 'None', 'NotImplemented', 'Ellipsis',
+            // Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
+            'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
+            'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
+            'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
+            'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
+            'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
+            'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
+            'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
+            'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
+            'RuntimeWarning', 'FutureWarning',
+            // self: this is a common python convention (but not a reserved word)
+            'self',
+            // other
+            'any', 'all'
+            ),
+
+        /*
+        ** Set 3: standard library
+        ** http://python.org/doc/current/lib/modindex.html
+        */
+        3 => array(
+            '__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
+            'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
+            'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
+            'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
+            'collections', 'colorsys', 'commands', 'compileall', 'compiler',
+            'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
+            'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
+            'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
+            'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
+            'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
+            'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
+            'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
+            'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
+            'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
+            'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
+            'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
+            'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
+            'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
+            'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
+            're', 'readline', 'repr', 'resource', 'rexec', 'rfc822', 'rgbimg', 'rlcompleter',
+            'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
+            'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
+            'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
+            'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
+            'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
+            'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
+            'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
+            'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
+            'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
+            'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib',
+            // Python 3.0
+            'bytes', 'bytearray'
+            ),
+
+        /*
+        ** Set 4: special methods
+        ** http://python.org/doc/current/ref/specialnames.html
+        */
+        4 => array(
+            /*
+            // Iterator types: http://python.org/doc/current/lib/typeiter.html
+            '__iter__', 'next',
+            // String types: http://python.org/doc/current/lib/string-methods.html
+            'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
+            'find', 'index', 'isalnum', 'isalpha', 'isdigit', 'islower', 'isspace', 'istitle',
+            'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
+            'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
+            'translate', 'upper', 'zfill',
+            */
+            // Basic customization: http://python.org/doc/current/ref/customization.html
+            '__new__', '__init__', '__del__', '__repr__', '__str__',
+            '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
+            '__hash__', '__nonzero__', '__unicode__', '__dict__',
+            // Attribute access: http://python.org/doc/current/ref/attribute-access.html
+            '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
+            '__delete__', '__slots__',
+            // Class creation, callable objects
+            '__metaclass__', '__call__',
+            // Container types: http://python.org/doc/current/ref/sequence-types.html
+            '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
+            '__getslice__', '__setslice__', '__delslice__',
+            // Numeric types: http://python.org/doc/current/ref/numeric-types.html
+            '__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
+            '__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
+            '__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
+            '__long__','__lshift__',
+            '__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
+            '__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
+            '__rshift__','__rsub__','__rmul__','__rand__','__rxor__','__ror__',
+            '__sub__','__xor__'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=', '!', '<=', '>=',             //·comparison·operators
+        '~', '@',                                   //·unary·operators
+        ';', ','                                    //·statement·separator
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
+            2 => 'color: #008000;',                        // Built-ins + self
+            3 => 'color: #dc143c;',                        // Standard lib
+            4 => 'color: #0000cd;'                        // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/q.php b/vendor/easybook/geshi/geshi/q.php
new file mode 100755
index 000000000..ade9928d0
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/q.php
@@ -0,0 +1,149 @@
+<?php
+/*************************************************************************************
+ * q.php
+ * -----
+ * Author: Ian Roddis (ian.roddis@proteanmind.net)
+ * Copyright: (c) 2008 Ian Roddis (http://proteanmind.net)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/01/21
+ *
+ * q/kdb+ language file for GeSHi.
+ *
+ * Based on information available from code.kx.com
+ *
+ * CHANGES
+ * -------
+ * 2010/01/21 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated <1.0.0>)
+ * -------------------------
+ *  - Fix the handling of single line comments
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME'                 => 'q/kdb+',
+    'COMMENT_SINGLE'            => array(1 => '//'),
+    'COMMENT_MULTI'             => array(),
+    'COMMENT_REGEXP'            => array(
+        2 => '/ \s\/.*/',         # This needs to get fixed up, since it won't catch some instances
+        # Multi line comments (Moved from REGEXPS)
+        3 => '/^\/\s*?\n.*?\n\\\s*?\n/smi'
+        ),
+    'CASE_KEYWORDS'             => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS'                => array('"'),
+    'ESCAPE_CHAR'               => '\\',
+    'OOLANG'                    => false,
+    'OBJECT_SPLITTERS'          => array(),
+    'STRICT_MODE_APPLIES'       => GESHI_NEVER,
+    'SCRIPT_DELIMITERS'         => array(),
+    'HIGHLIGHT_STRICT_BLOCK'    => array(),
+    'TAB_WIDTH'                 => 4,
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'acos', 'all', 'and', 'any', 'asc', 'asin', 'asof', 'atan', 'attr', 'avg', 'avgs', 'bin', 'ceiling',
+            'cols', 'cor', 'cos', 'count', 'cov', 'cross', 'cut', 'deltas', 'desc', 'dev', 'differ', 'distinct',
+            'div', 'each', 'enlist', 'eval', 'except', 'exec', 'exit', 'exp', 'fills', 'first', 'flip', 'floor',
+            'fkeys', 'get', 'getenv', 'group', 'gtime', 'hclose', 'hcount', 'hdel', 'hopen', 'hsym', 'iasc', 'idesc',
+            'in', 'insert', 'inter', 'inv', 'joins', 'key', 'keys', 'last', 'like', 'load', 'log', 'lower',
+            'lsq', 'ltime', 'ltrim', 'mavg', 'max', 'maxs', 'mcount', 'md5', 'mdev', 'med', 'meta', 'min', 'mins',
+            'mmax', 'mmin', 'mmu', 'mod', 'msum', 'neg', 'next', 'not', 'null', 'or', 'over', 'parse', 'peach',
+            'plist', 'prd', 'prds', 'prev', 'rand', 'rank', 'ratios', 'raze', 'read0', 'read1', 'reciprocal',
+            'reverse', 'rload', 'rotate', 'rsave', 'rtrim', 'save', 'scan', 'set', 'setenv', 'show', 'signum',
+            'sin', 'sqrt', 'ss', 'ssr', 'string', 'sublist', 'sum', 'sums', 'sv', 'system', 'tables', 'tan', 'til', 'trim',
+            'txf', 'type', 'ungroup', 'union', 'upper', 'upsert', 'value', 'var', 'view', 'views', 'vs',
+            'wavg', 'within', 'wsum', 'xasc', 'xbar', 'xcol', 'xcols', 'xdesc', 'xexp', 'xgroup', 'xkey',
+            'xlog', 'xprev', 'xrank'
+            ),
+        # kdb database template keywords
+        2 => array(
+            'aj', 'by', 'delete', 'fby', 'from', 'ij', 'lj', 'pj', 'select', 'uj', 'update', 'where', 'wj',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '?', '#', ',', '_', '@', '.', '^', '~', '$', '!', '\\', '\\', '/:', '\:', "'", "':", '::', '+', '-', '%', '*'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #009900; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #990000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            2   => 'color: #999900;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'REGEXPS' => array(
+        # Symbols
+        2 => '`[^\s"]*',
+        ),
+    'URLS'  => array(
+        1   => '',
+        2   => '',
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/qbasic.php b/vendor/easybook/geshi/geshi/qbasic.php
new file mode 100755
index 000000000..3345e3c69
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/qbasic.php
@@ -0,0 +1,162 @@
+<?php
+/*************************************************************************************
+ * qbasic.php
+ * ----------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/20
+ *
+ * QBasic/QuickBASIC language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ *   -  Removed unnessecary slashes from some keywords
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Make sure all possible combinations of keywords with
+ *   a space in them (EXIT FOR, END SELECT) are added
+ *   to the first keyword group
+ * * Update colours, especially for the first keyword group
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'QBasic/QuickBASIC',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Single-Line Comments using REM command
+        2 => "/\bREM.*?$/i",
+        //Line numbers
+        3 => "/^\s*\d+/im"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'DO', 'LOOP', 'WHILE', 'WEND', 'THEN', 'ELSE', 'ELSEIF', 'IF',
+            'FOR', 'TO', 'NEXT', 'STEP', 'GOTO', 'GOSUB', 'CALL', 'CALLS',
+            'SUB', 'FUNCTION', 'RETURN', 'RESUME', 'SELECT', 'CASE', 'UNTIL'
+            ),
+        3 => array(
+            'ABS', 'ABSOLUTE', 'ACCESS', 'ALIAS', 'AND', 'ANY', 'APPEND', 'AS', 'ASC', 'ATN',
+            'BASE', 'BEEP', 'BINARY', 'BLOAD', 'BSAVE', 'BYVAL',
+            'CDBL', 'CDECL', 'CHAIN', 'CHDIR', 'CHR$', 'CINT', 'CIRCLE', 'CLEAR',
+            'CLNG', 'CLOSE', 'CLS', 'COM', 'COMMAND$', 'COMMON', 'CONST', 'COS', 'CSNG',
+            'CSRLIN', 'CVD', 'CVDMBF', 'CVI', 'CVL', 'CVS', 'CVSMDF', 'DATA', 'DATE$',
+            'DECLARE', 'DEF', 'FN', 'SEG', 'DEFDBL', 'DEFINT', 'DEFLNG', 'DEFSNG', 'DEFSTR',
+            'DIM', 'DOUBLE', 'DRAW', 'END', 'ENVIRON', 'ENVIRON$', 'EOF', 'EQV', 'ERASE',
+            'ERDEV', 'ERDEV$', 'ERL', 'ERR', 'ERROR', 'EXIT', 'EXP', 'FIELD', 'FILEATTR',
+            'FILES', 'FIX', 'FRE', 'FREEFILE', 'GET', 'HEX$', 'IMP', 'INKEY$',
+            'INP', 'INPUT', 'INPUT$', 'INSTR', 'INT', 'INTEGER', 'IOCTL', 'IOCTL$', 'IS',
+            'KEY', 'KILL', 'LBOUND', 'LCASE$', 'LEFT$', 'LEN', 'LET', 'LINE', 'LIST', 'LOC',
+            'LOCAL', 'LOCATE', 'LOCK', 'LOF', 'LOG', 'LONG', 'LPOS', 'LPRINT',
+            'LSET', 'LTRIM$', 'MID$', 'MKD$', 'MKDIR', 'MKDMBF$', 'MKI$', 'MKL$',
+            'MKS$', 'MKSMBF$', 'MOD', 'NAME', 'NOT', 'OCT$', 'OFF', 'ON', 'PEN', 'PLAY',
+            'OPEN', 'OPTION', 'OR', 'OUT', 'OUTPUT',
+            'PAINT', 'PALETTE', 'PCOPY', 'PEEK', 'PMAP', 'POINT', 'POKE', 'POS', 'PRESET',
+            'PRINT', 'PSET', 'PUT', 'RANDOM', 'RANDOMIZE', 'READ', 'REDIM', 'RESET',
+            'RESTORE', 'RIGHT$', 'RMDIR', 'RND', 'RSET', 'RTRIM$', 'RUN', 'SADD', 'SCREEN',
+            'SEEK', 'SETMEM', 'SGN', 'SHARED', 'SHELL', 'SIGNAL', 'SIN', 'SINGLE', 'SLEEP',
+            'SOUND', 'SPACE$', 'SPC', 'SQR', 'STATIC', 'STICK', 'STOP', 'STR$', 'STRIG',
+            'STRING', 'STRING$', 'SWAP', 'SYSTEM', 'TAB', 'TAN', 'TIME$', 'TIMER',
+            'TROFF', 'TRON', 'TYPE', 'UBOUND', 'UCASE$', 'UEVENT', 'UNLOCK', 'USING', 'VAL',
+            'VARPTR', 'VARPTR$', 'VARSEG', 'VIEW', 'WAIT', 'WIDTH', 'WINDOW', 'WRITE', 'XOR'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', ',', '+', '-', '*', '/', '=', '<', '>', '^'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a1a100;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;',
+            3 => 'color: #8080C0;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #cc66cc;',
+            2 => 'color: #339933;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        3 => 'http://www.qbasicnews.com/qboho/qck{FNAMEL}.shtml'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '&amp;(?:H[0-9a-fA-F]+|O[0-7]+)(?!\w)',
+        2 => '#[0-9]+(?!\w)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/racket.php b/vendor/easybook/geshi/geshi/racket.php
new file mode 100644
index 000000000..c0d931b41
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/racket.php
@@ -0,0 +1,964 @@
+<?php
+/*************************************************************************************
+ * racket.php
+ * ----------
+ * Author:          Tim Brown (tim@timb.net)
+ * Copyright:   (c) 2013 Tim Brown ((https://github.com/tim-brown/geshi-racket))
+ * Release Version: 1.0.8.12
+ * Date Started:    2013-03-01
+ *
+ * Racket language file for GeSHi.
+ *
+ * This file was built automatically from the scripts in
+ * https://github.com/tim-brown/geshi-racket (you didn't think
+ * I typed those NUMBER regular expressions in myself, did you?).
+ * Use those scripts to regenerate the file.
+ *
+ * CHANGES
+ * -------
+ *   1.0 (2013-03-31)
+ *   - Initial Release1.1 (2013-03-31)
+ *   - Added URLs, "symbol"-like identifiers moved to SYMBOLS*
+ *
+ * TODO (updated 2013-04-25)
+ * -------------------------
+ *   * better handling of empty and short arrays
+ *   * care more about indentation and line lengths
+ *   * most compound regexps are possibly over-bracketed: (or ...)
+ *   * most compound regexps are possibly over-bracketed: (: ...)
+ *   * URLs should be formed more smartly by discovering which module they came from.
+ *   * '|...| identifiers
+ *   * #<<HERE strings
+ *   * #;(...) comments -- (note: requires balanced parenthesis regexp)
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Racket',
+    'COMMENT_SINGLE' => array(
+        1 => ';',
+        ),
+    'COMMENT_MULTI' => array(
+        '#|' => '|#',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"',
+        ),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abort-current-continuation', 'abs', 'absolute-path?', 'acos', 'add1',
+            'alarm-evt', 'always-evt', 'andmap', 'angle', 'append',
+            'arithmetic-shift', 'arity-at-least-value', 'arity-at-least?',
+            'asin', 'assf', 'assoc', 'assq', 'assv', 'atan', 'banner',
+            'bitwise-and', 'bitwise-bit-field', 'bitwise-bit-set?',
+            'bitwise-ior', 'bitwise-not', 'bitwise-xor', 'boolean?',
+            'bound-identifier=?', 'box', 'box-cas!', 'box-immutable', 'box?',
+            'break-enabled', 'break-thread', 'build-list', 'build-path',
+            'build-path/convention-type', 'build-string', 'build-vector',
+            'byte-pregexp', 'byte-pregexp?', 'byte-ready?', 'byte-regexp',
+            'byte-regexp?', 'byte?', 'bytes', 'bytes&gt;?', 'bytes&lt;?',
+            'bytes-&gt;immutable-bytes', 'bytes-&gt;list', 'bytes-&gt;path',
+            'bytes-&gt;path-element', 'bytes-&gt;string/latin-1',
+            'bytes-&gt;string/locale', 'bytes-&gt;string/utf-8',
+            'bytes-append', 'bytes-close-converter', 'bytes-convert',
+            'bytes-convert-end', 'bytes-converter?', 'bytes-copy',
+            'bytes-copy!', 'bytes-fill!', 'bytes-length',
+            'bytes-open-converter', 'bytes-ref', 'bytes-set!',
+            'bytes-utf-8-index', 'bytes-utf-8-length', 'bytes-utf-8-ref',
+            'bytes=?', 'bytes?', 'caaaar', 'caaadr', 'caaar', 'caadar',
+            'caaddr', 'caadr', 'caar', 'cadaar', 'cadadr', 'cadar', 'caddar',
+            'cadddr', 'caddr', 'cadr', 'call-in-nested-thread',
+            'call-with-break-parameterization',
+            'call-with-composable-continuation',
+            'call-with-continuation-barrier', 'call-with-continuation-prompt',
+            'call-with-current-continuation', 'call-with-escape-continuation',
+            'call-with-exception-handler',
+            'call-with-immediate-continuation-mark',
+            'call-with-parameterization', 'call-with-semaphore',
+            'call-with-semaphore/enable-break', 'call-with-values', 'call/cc',
+            'call/ec', 'car', 'cdaaar', 'cdaadr', 'cdaar', 'cdadar', 'cdaddr',
+            'cdadr', 'cdar', 'cddaar', 'cddadr', 'cddar', 'cdddar', 'cddddr',
+            'cdddr', 'cddr', 'cdr', 'ceiling', 'channel-get', 'channel-put',
+            'channel-put-evt', 'channel-put-evt?', 'channel-try-get',
+            'channel?', 'chaperone-box', 'chaperone-continuation-mark-key',
+            'chaperone-evt', 'chaperone-hash', 'chaperone-of?',
+            'chaperone-procedure', 'chaperone-prompt-tag', 'chaperone-struct',
+            'chaperone-struct-type', 'chaperone-vector', 'chaperone?',
+            'char&gt;=?', 'char&gt;?', 'char&lt;=?', 'char&lt;?',
+            'char-&gt;integer', 'char-alphabetic?', 'char-blank?',
+            'char-ci&gt;=?', 'char-ci&gt;?', 'char-ci&lt;=?', 'char-ci&lt;?',
+            'char-ci=?', 'char-downcase', 'char-foldcase',
+            'char-general-category', 'char-graphic?', 'char-iso-control?',
+            'char-lower-case?', 'char-numeric?', 'char-punctuation?',
+            'char-ready?', 'char-symbolic?', 'char-title-case?',
+            'char-titlecase', 'char-upcase', 'char-upper-case?',
+            'char-utf-8-length', 'char-whitespace?', 'char=?', 'char?',
+            'check-duplicate-identifier',
+            'checked-procedure-check-and-extract', 'choice-evt',
+            'cleanse-path', 'close-input-port', 'close-output-port',
+            'collect-garbage', 'collection-file-path', 'collection-path',
+            'compile', 'compile-allow-set!-undefined',
+            'compile-context-preservation-enabled',
+            'compile-enforce-module-constants', 'compile-syntax',
+            'compiled-expression?', 'compiled-module-expression?',
+            'complete-path?', 'complex?', 'compose', 'compose1', 'cons',
+            'continuation-mark-key?', 'continuation-mark-set-&gt;context',
+            'continuation-mark-set-&gt;list',
+            'continuation-mark-set-&gt;list*', 'continuation-mark-set-first',
+            'continuation-mark-set?', 'continuation-marks',
+            'continuation-prompt-available?', 'continuation-prompt-tag?',
+            'continuation?', 'copy-file', 'cos',
+            'current-break-parameterization', 'current-code-inspector',
+            'current-command-line-arguments', 'current-compile',
+            'current-compiled-file-roots', 'current-continuation-marks',
+            'current-custodian', 'current-directory', 'current-drive',
+            'current-error-port', 'current-eval',
+            'current-evt-pseudo-random-generator', 'current-gc-milliseconds',
+            'current-get-interaction-input-port',
+            'current-inexact-milliseconds', 'current-input-port',
+            'current-inspector', 'current-library-collection-paths',
+            'current-load', 'current-load-extension',
+            'current-load-relative-directory', 'current-load/use-compiled',
+            'current-locale', 'current-logger', 'current-memory-use',
+            'current-milliseconds', 'current-module-declare-name',
+            'current-module-declare-source', 'current-module-name-resolver',
+            'current-namespace', 'current-output-port',
+            'current-parameterization', 'current-preserved-thread-cell-values',
+            'current-print', 'current-process-milliseconds',
+            'current-prompt-read', 'current-pseudo-random-generator',
+            'current-read-interaction', 'current-reader-guard',
+            'current-readtable', 'current-seconds', 'current-security-guard',
+            'current-subprocess-custodian-mode', 'current-thread',
+            'current-thread-group', 'current-thread-initial-stack-size',
+            'current-write-relative-directory', 'custodian-box-value',
+            'custodian-box?', 'custodian-limit-memory',
+            'custodian-managed-list', 'custodian-memory-accounting-available?',
+            'custodian-require-memory', 'custodian-shutdown-all', 'custodian?',
+            'custom-print-quotable-accessor', 'custom-print-quotable?',
+            'custom-write-accessor', 'custom-write?', 'date*-nanosecond',
+            'date*-time-zone-name', 'date*?', 'date-day', 'date-dst?',
+            'date-hour', 'date-minute', 'date-month', 'date-second',
+            'date-time-zone-offset', 'date-week-day', 'date-year',
+            'date-year-day', 'date?', 'datum-&gt;syntax',
+            'datum-intern-literal', 'default-continuation-prompt-tag',
+            'delete-directory', 'delete-file', 'denominator',
+            'directory-exists?', 'directory-list', 'display', 'displayln',
+            'double-flonum?', 'dump-memory-stats', 'dynamic-require',
+            'dynamic-require-for-syntax', 'dynamic-wind', 'eof', 'eof-object?',
+            'ephemeron-value', 'ephemeron?', 'eprintf', 'eq-hash-code', 'eq?',
+            'equal-hash-code', 'equal-secondary-hash-code', 'equal?',
+            'equal?/recur', 'eqv-hash-code', 'eqv?', 'error',
+            'error-display-handler', 'error-escape-handler',
+            'error-print-context-length', 'error-print-source-location',
+            'error-print-width', 'error-value-&gt;string-handler', 'eval',
+            'eval-jit-enabled', 'eval-syntax', 'even?', 'evt?',
+            'exact-&gt;inexact', 'exact-integer?',
+            'exact-nonnegative-integer?', 'exact-positive-integer?', 'exact?',
+            'executable-yield-handler', 'exit', 'exit-handler',
+            'exn-continuation-marks', 'exn-message', 'exn:break-continuation',
+            'exn:break:hang-up?', 'exn:break:terminate?', 'exn:break?',
+            'exn:fail:contract:arity?', 'exn:fail:contract:continuation?',
+            'exn:fail:contract:divide-by-zero?',
+            'exn:fail:contract:non-fixnum-result?',
+            'exn:fail:contract:variable-id', 'exn:fail:contract:variable?',
+            'exn:fail:contract?', 'exn:fail:filesystem:errno-errno',
+            'exn:fail:filesystem:errno?', 'exn:fail:filesystem:exists?',
+            'exn:fail:filesystem:version?', 'exn:fail:filesystem?',
+            'exn:fail:network:errno-errno', 'exn:fail:network:errno?',
+            'exn:fail:network?', 'exn:fail:out-of-memory?',
+            'exn:fail:read-srclocs', 'exn:fail:read:eof?',
+            'exn:fail:read:non-char?', 'exn:fail:read?',
+            'exn:fail:syntax-exprs', 'exn:fail:syntax:unbound?',
+            'exn:fail:syntax?', 'exn:fail:unsupported?', 'exn:fail:user?',
+            'exn:fail?', 'exn:srclocs-accessor', 'exn:srclocs?', 'exn?', 'exp',
+            'expand', 'expand-once', 'expand-syntax', 'expand-syntax-once',
+            'expand-syntax-to-top-form', 'expand-to-top-form',
+            'expand-user-path', 'expt', 'file-exists?',
+            'file-or-directory-identity', 'file-or-directory-modify-seconds',
+            'file-or-directory-permissions', 'file-position', 'file-position*',
+            'file-size', 'file-stream-buffer-mode', 'file-stream-port?',
+            'filesystem-root-list', 'filter', 'find-executable-path',
+            'find-library-collection-paths', 'find-system-path', 'findf',
+            'fixnum?', 'floating-point-bytes-&gt;real', 'flonum?', 'floor',
+            'flush-output', 'foldl', 'foldr', 'for-each', 'format', 'fprintf',
+            'free-identifier=?', 'free-label-identifier=?',
+            'free-template-identifier=?', 'free-transformer-identifier=?',
+            'gcd', 'generate-temporaries', 'gensym', 'get-output-bytes',
+            'get-output-string', 'getenv', 'global-port-print-handler',
+            'guard-evt', 'handle-evt', 'handle-evt?', 'hash', 'hash-&gt;list',
+            'hash-copy', 'hash-count', 'hash-eq?', 'hash-equal?', 'hash-eqv?',
+            'hash-for-each', 'hash-has-key?', 'hash-iterate-first',
+            'hash-iterate-key', 'hash-iterate-next', 'hash-iterate-value',
+            'hash-keys', 'hash-map', 'hash-placeholder?', 'hash-ref',
+            'hash-ref!', 'hash-remove', 'hash-remove!', 'hash-set',
+            'hash-set!', 'hash-set*', 'hash-set*!', 'hash-update',
+            'hash-update!', 'hash-values', 'hash-weak?', 'hash?', 'hasheq',
+            'hasheqv', 'identifier-binding', 'identifier-label-binding',
+            'identifier-prune-lexical-context',
+            'identifier-prune-to-source-module',
+            'identifier-remove-from-definition-context',
+            'identifier-template-binding', 'identifier-transformer-binding',
+            'identifier?', 'imag-part', 'immutable?', 'impersonate-box',
+            'impersonate-continuation-mark-key', 'impersonate-hash',
+            'impersonate-procedure', 'impersonate-prompt-tag',
+            'impersonate-struct', 'impersonate-vector', 'impersonator-of?',
+            'impersonator-prop:application-mark',
+            'impersonator-property-accessor-procedure?',
+            'impersonator-property?', 'impersonator?', 'in-cycle',
+            'in-directory', 'in-hash', 'in-hash-keys', 'in-hash-pairs',
+            'in-hash-values', 'in-parallel', 'in-sequences',
+            'in-values*-sequence', 'in-values-sequence', 'inexact-&gt;exact',
+            'inexact-real?', 'inexact?', 'input-port?', 'inspector?',
+            'integer-&gt;char', 'integer-&gt;integer-bytes',
+            'integer-bytes-&gt;integer', 'integer-length', 'integer-sqrt',
+            'integer-sqrt/remainder', 'integer?',
+            'internal-definition-context-seal', 'internal-definition-context?',
+            'keyword&lt;?', 'keyword-&gt;string', 'keyword-apply', 'keyword?',
+            'kill-thread', 'lcm', 'length', 'liberal-define-context?',
+            'link-exists?', 'list', 'list*', 'list-&gt;bytes',
+            'list-&gt;string', 'list-&gt;vector', 'list-ref', 'list-tail',
+            'list?', 'load', 'load-extension', 'load-on-demand-enabled',
+            'load-relative', 'load-relative-extension', 'load/cd',
+            'load/use-compiled', 'local-expand', 'local-expand/capture-lifts',
+            'local-transformer-expand',
+            'local-transformer-expand/capture-lifts', 'locale-string-encoding',
+            'log', 'log-level?', 'log-max-level', 'log-message',
+            'log-receiver?', 'logger-name', 'logger?', 'magnitude',
+            'make-arity-at-least', 'make-base-empty-namespace',
+            'make-base-namespace', 'make-bytes', 'make-channel',
+            'make-continuation-mark-key', 'make-continuation-prompt-tag',
+            'make-custodian', 'make-custodian-box', 'make-date', 'make-date*',
+            'make-derived-parameter', 'make-directory', 'make-do-sequence',
+            'make-empty-namespace', 'make-ephemeron', 'make-exn',
+            'make-exn:break', 'make-exn:break:hang-up',
+            'make-exn:break:terminate', 'make-exn:fail',
+            'make-exn:fail:contract', 'make-exn:fail:contract:arity',
+            'make-exn:fail:contract:continuation',
+            'make-exn:fail:contract:divide-by-zero',
+            'make-exn:fail:contract:non-fixnum-result',
+            'make-exn:fail:contract:variable', 'make-exn:fail:filesystem',
+            'make-exn:fail:filesystem:errno',
+            'make-exn:fail:filesystem:exists',
+            'make-exn:fail:filesystem:version', 'make-exn:fail:network',
+            'make-exn:fail:network:errno', 'make-exn:fail:out-of-memory',
+            'make-exn:fail:read', 'make-exn:fail:read:eof',
+            'make-exn:fail:read:non-char', 'make-exn:fail:syntax',
+            'make-exn:fail:syntax:unbound', 'make-exn:fail:unsupported',
+            'make-exn:fail:user', 'make-file-or-directory-link', 'make-hash',
+            'make-hash-placeholder', 'make-hasheq', 'make-hasheq-placeholder',
+            'make-hasheqv', 'make-hasheqv-placeholder', 'make-immutable-hash',
+            'make-immutable-hasheq', 'make-immutable-hasheqv',
+            'make-impersonator-property', 'make-input-port', 'make-inspector',
+            'make-keyword-procedure', 'make-known-char-range-list',
+            'make-log-receiver', 'make-logger', 'make-output-port',
+            'make-parameter', 'make-phantom-bytes', 'make-pipe',
+            'make-placeholder', 'make-polar', 'make-prefab-struct',
+            'make-pseudo-random-generator', 'make-reader-graph',
+            'make-readtable', 'make-rectangular', 'make-rename-transformer',
+            'make-resolved-module-path', 'make-security-guard',
+            'make-semaphore', 'make-set!-transformer', 'make-shared-bytes',
+            'make-sibling-inspector', 'make-special-comment', 'make-srcloc',
+            'make-string', 'make-struct-field-accessor',
+            'make-struct-field-mutator', 'make-struct-type',
+            'make-struct-type-property', 'make-syntax-delta-introducer',
+            'make-syntax-introducer', 'make-thread-cell', 'make-thread-group',
+            'make-vector', 'make-weak-box', 'make-weak-hash',
+            'make-weak-hasheq', 'make-weak-hasheqv', 'make-will-executor',
+            'map', 'max', 'mcar', 'mcdr', 'mcons', 'member', 'memf', 'memq',
+            'memv', 'min', 'module-&gt;exports', 'module-&gt;imports',
+            'module-&gt;language-info', 'module-&gt;namespace',
+            'module-compiled-exports', 'module-compiled-imports',
+            'module-compiled-language-info', 'module-compiled-name',
+            'module-compiled-submodules', 'module-declared?',
+            'module-path-index-join', 'module-path-index-resolve',
+            'module-path-index-split', 'module-path-index-submodule',
+            'module-path-index?', 'module-path?', 'module-predefined?',
+            'module-provide-protected?', 'modulo', 'mpair?', 'nack-guard-evt',
+            'namespace-anchor-&gt;empty-namespace',
+            'namespace-anchor-&gt;namespace', 'namespace-anchor?',
+            'namespace-attach-module', 'namespace-attach-module-declaration',
+            'namespace-base-phase', 'namespace-mapped-symbols',
+            'namespace-module-identifier', 'namespace-module-registry',
+            'namespace-require', 'namespace-require/constant',
+            'namespace-require/copy', 'namespace-require/expansion-time',
+            'namespace-set-variable-value!', 'namespace-symbol-&gt;identifier',
+            'namespace-syntax-introduce', 'namespace-undefine-variable!',
+            'namespace-unprotect-module', 'namespace-variable-value',
+            'namespace?', 'negative?', 'never-evt', 'newline',
+            'normal-case-path', 'not', 'null', 'null?', 'number-&gt;string',
+            'number?', 'numerator', 'object-name', 'odd?', 'open-input-bytes',
+            'open-input-string', 'open-output-bytes', 'open-output-string',
+            'ormap', 'output-port?', 'pair?', 'parameter-procedure=?',
+            'parameter?', 'parameterization?', 'path-&gt;bytes',
+            'path-&gt;complete-path', 'path-&gt;directory-path',
+            'path-&gt;string', 'path-add-suffix', 'path-convention-type',
+            'path-element-&gt;bytes', 'path-element-&gt;string',
+            'path-for-some-system?', 'path-list-string-&gt;path-list',
+            'path-replace-suffix', 'path-string?', 'path?', 'peek-byte',
+            'peek-byte-or-special', 'peek-bytes', 'peek-bytes!',
+            'peek-bytes-avail!', 'peek-bytes-avail!*',
+            'peek-bytes-avail!/enable-break', 'peek-char',
+            'peek-char-or-special', 'peek-string', 'peek-string!',
+            'phantom-bytes?', 'pipe-content-length', 'placeholder-get',
+            'placeholder-set!', 'placeholder?', 'poll-guard-evt',
+            'port-closed-evt', 'port-closed?', 'port-commit-peeked',
+            'port-count-lines!', 'port-count-lines-enabled',
+            'port-display-handler', 'port-file-identity', 'port-file-unlock',
+            'port-next-location', 'port-print-handler', 'port-progress-evt',
+            'port-provides-progress-evts?', 'port-read-handler',
+            'port-try-file-lock?', 'port-write-handler', 'port-writes-atomic?',
+            'port-writes-special?', 'port?', 'positive?',
+            'prefab-key-&gt;struct-type', 'prefab-key?', 'prefab-struct-key',
+            'pregexp', 'pregexp?', 'primitive-closure?',
+            'primitive-result-arity', 'primitive?', 'print',
+            'print-as-expression', 'print-boolean-long-form', 'print-box',
+            'print-graph', 'print-hash-table', 'print-mpair-curly-braces',
+            'print-pair-curly-braces', 'print-reader-abbreviations',
+            'print-struct', 'print-syntax-width', 'print-unreadable',
+            'print-vector-length', 'printf', 'procedure-&gt;method',
+            'procedure-arity', 'procedure-arity-includes?', 'procedure-arity?',
+            'procedure-closure-contents-eq?', 'procedure-extract-target',
+            'procedure-keywords', 'procedure-reduce-arity',
+            'procedure-reduce-keyword-arity', 'procedure-rename',
+            'procedure-struct-type?', 'procedure?', 'progress-evt?',
+            'prop:arity-string', 'prop:checked-procedure',
+            'prop:custom-print-quotable', 'prop:custom-write',
+            'prop:equal+hash', 'prop:evt', 'prop:exn:srclocs',
+            'prop:impersonator-of', 'prop:input-port',
+            'prop:liberal-define-context', 'prop:output-port',
+            'prop:procedure', 'prop:rename-transformer', 'prop:sequence',
+            'prop:set!-transformer', 'pseudo-random-generator-&gt;vector',
+            'pseudo-random-generator-vector?', 'pseudo-random-generator?',
+            'putenv', 'quotient', 'quotient/remainder', 'raise',
+            'raise-argument-error', 'raise-arguments-error',
+            'raise-arity-error', 'raise-mismatch-error', 'raise-range-error',
+            'raise-result-error', 'raise-syntax-error', 'raise-type-error',
+            'raise-user-error', 'random', 'random-seed', 'rational?',
+            'rationalize', 'read', 'read-accept-bar-quote', 'read-accept-box',
+            'read-accept-compiled', 'read-accept-dot', 'read-accept-graph',
+            'read-accept-infix-dot', 'read-accept-lang',
+            'read-accept-quasiquote', 'read-accept-reader', 'read-byte',
+            'read-byte-or-special', 'read-bytes', 'read-bytes!',
+            'read-bytes-avail!', 'read-bytes-avail!*',
+            'read-bytes-avail!/enable-break', 'read-bytes-line',
+            'read-case-sensitive', 'read-char', 'read-char-or-special',
+            'read-curly-brace-as-paren', 'read-decimal-as-inexact',
+            'read-eval-print-loop', 'read-language', 'read-line',
+            'read-on-demand-source', 'read-square-bracket-as-paren',
+            'read-string', 'read-string!', 'read-syntax',
+            'read-syntax/recursive', 'read/recursive', 'readtable-mapping',
+            'readtable?', 'real-&gt;decimal-string', 'real-&gt;double-flonum',
+            'real-&gt;floating-point-bytes', 'real-&gt;single-flonum',
+            'real-part', 'real?', 'regexp', 'regexp-match',
+            'regexp-match-exact?', 'regexp-match-peek',
+            'regexp-match-peek-immediate', 'regexp-match-peek-positions',
+            'regexp-match-peek-positions-immediate',
+            'regexp-match-peek-positions-immediate/end',
+            'regexp-match-peek-positions/end', 'regexp-match-positions',
+            'regexp-match-positions/end', 'regexp-match/end', 'regexp-match?',
+            'regexp-max-lookbehind', 'regexp-quote', 'regexp-replace',
+            'regexp-replace*', 'regexp-replace-quote', 'regexp-replaces',
+            'regexp-split', 'regexp-try-match', 'regexp?', 'relative-path?',
+            'remainder', 'remove', 'remove*', 'remq', 'remq*', 'remv', 'remv*',
+            'rename-file-or-directory', 'rename-transformer-target',
+            'rename-transformer?', 'reroot-path', 'resolve-path',
+            'resolved-module-path-name', 'resolved-module-path?', 'reverse',
+            'round', 'seconds-&gt;date', 'security-guard?',
+            'semaphore-peek-evt', 'semaphore-peek-evt?', 'semaphore-post',
+            'semaphore-try-wait?', 'semaphore-wait',
+            'semaphore-wait/enable-break', 'semaphore?', 'sequence-&gt;stream',
+            'sequence-generate', 'sequence-generate*', 'sequence?',
+            'set!-transformer-procedure', 'set!-transformer?', 'set-box!',
+            'set-mcar!', 'set-mcdr!', 'set-phantom-bytes!',
+            'set-port-next-location!', 'shared-bytes', 'shell-execute',
+            'simplify-path', 'sin', 'single-flonum?', 'sleep',
+            'special-comment-value', 'special-comment?', 'split-path', 'sqrt',
+            'srcloc-column', 'srcloc-line', 'srcloc-position', 'srcloc-source',
+            'srcloc-span', 'srcloc?', 'stop-after', 'stop-before', 'string',
+            'string&gt;=?', 'string&gt;?', 'string&lt;=?', 'string&lt;?',
+            'string-&gt;bytes/latin-1', 'string-&gt;bytes/locale',
+            'string-&gt;bytes/utf-8', 'string-&gt;immutable-string',
+            'string-&gt;keyword', 'string-&gt;list', 'string-&gt;number',
+            'string-&gt;path', 'string-&gt;path-element', 'string-&gt;symbol',
+            'string-&gt;uninterned-symbol', 'string-&gt;unreadable-symbol',
+            'string-append', 'string-ci&gt;=?', 'string-ci&gt;?',
+            'string-ci&lt;=?', 'string-ci&lt;?', 'string-ci=?', 'string-copy',
+            'string-copy!', 'string-downcase', 'string-fill!',
+            'string-foldcase', 'string-length', 'string-locale&gt;?',
+            'string-locale&lt;?', 'string-locale-ci&gt;?',
+            'string-locale-ci&lt;?', 'string-locale-ci=?',
+            'string-locale-downcase', 'string-locale-upcase',
+            'string-locale=?', 'string-normalize-nfc', 'string-normalize-nfd',
+            'string-normalize-nfkc', 'string-normalize-nfkd', 'string-ref',
+            'string-set!', 'string-titlecase', 'string-upcase',
+            'string-utf-8-length', 'string=?', 'string?', 'struct-&gt;vector',
+            'struct-accessor-procedure?', 'struct-constructor-procedure?',
+            'struct-info', 'struct-mutator-procedure?',
+            'struct-predicate-procedure?', 'struct-type-info',
+            'struct-type-make-constructor', 'struct-type-make-predicate',
+            'struct-type-property-accessor-procedure?',
+            'struct-type-property?', 'struct-type?', 'struct:arity-at-least',
+            'struct:date', 'struct:date*', 'struct:exn', 'struct:exn:break',
+            'struct:exn:break:hang-up', 'struct:exn:break:terminate',
+            'struct:exn:fail', 'struct:exn:fail:contract',
+            'struct:exn:fail:contract:arity',
+            'struct:exn:fail:contract:continuation',
+            'struct:exn:fail:contract:divide-by-zero',
+            'struct:exn:fail:contract:non-fixnum-result',
+            'struct:exn:fail:contract:variable', 'struct:exn:fail:filesystem',
+            'struct:exn:fail:filesystem:errno',
+            'struct:exn:fail:filesystem:exists',
+            'struct:exn:fail:filesystem:version', 'struct:exn:fail:network',
+            'struct:exn:fail:network:errno', 'struct:exn:fail:out-of-memory',
+            'struct:exn:fail:read', 'struct:exn:fail:read:eof',
+            'struct:exn:fail:read:non-char', 'struct:exn:fail:syntax',
+            'struct:exn:fail:syntax:unbound', 'struct:exn:fail:unsupported',
+            'struct:exn:fail:user', 'struct:srcloc', 'struct?', 'sub1',
+            'subbytes', 'subprocess', 'subprocess-group-enabled',
+            'subprocess-kill', 'subprocess-pid', 'subprocess-status',
+            'subprocess-wait', 'subprocess?', 'substring', 'symbol-&gt;string',
+            'symbol-interned?', 'symbol-unreadable?', 'symbol?', 'sync',
+            'sync/enable-break', 'sync/timeout', 'sync/timeout/enable-break',
+            'syntax-&gt;datum', 'syntax-&gt;list', 'syntax-arm',
+            'syntax-column', 'syntax-disarm', 'syntax-e', 'syntax-line',
+            'syntax-local-bind-syntaxes', 'syntax-local-certifier',
+            'syntax-local-context', 'syntax-local-expand-expression',
+            'syntax-local-get-shadower', 'syntax-local-introduce',
+            'syntax-local-lift-context', 'syntax-local-lift-expression',
+            'syntax-local-lift-module-end-declaration',
+            'syntax-local-lift-provide', 'syntax-local-lift-require',
+            'syntax-local-lift-values-expression',
+            'syntax-local-make-definition-context',
+            'syntax-local-make-delta-introducer',
+            'syntax-local-module-defined-identifiers',
+            'syntax-local-module-exports',
+            'syntax-local-module-required-identifiers', 'syntax-local-name',
+            'syntax-local-phase-level', 'syntax-local-submodules',
+            'syntax-local-transforming-module-provides?', 'syntax-local-value',
+            'syntax-local-value/immediate', 'syntax-original?',
+            'syntax-position', 'syntax-property',
+            'syntax-property-symbol-keys', 'syntax-protect', 'syntax-rearm',
+            'syntax-recertify', 'syntax-shift-phase-level', 'syntax-source',
+            'syntax-source-module', 'syntax-span', 'syntax-taint',
+            'syntax-tainted?', 'syntax-track-origin',
+            'syntax-transforming-module-expression?', 'syntax-transforming?',
+            'syntax?', 'system-big-endian?', 'system-idle-evt',
+            'system-language+country', 'system-library-subpath',
+            'system-path-convention-type', 'system-type', 'tan',
+            'terminal-port?', 'thread', 'thread-cell-ref', 'thread-cell-set!',
+            'thread-cell-values?', 'thread-cell?', 'thread-dead-evt',
+            'thread-dead?', 'thread-group?', 'thread-receive',
+            'thread-receive-evt', 'thread-resume', 'thread-resume-evt',
+            'thread-rewind-receive', 'thread-running?', 'thread-send',
+            'thread-suspend', 'thread-suspend-evt', 'thread-try-receive',
+            'thread-wait', 'thread/suspend-to-kill', 'thread?', 'time-apply',
+            'truncate', 'unbox', 'uncaught-exception-handler',
+            'use-collection-link-paths', 'use-compiled-file-paths',
+            'use-user-specific-search-paths', 'values',
+            'variable-reference-&gt;empty-namespace',
+            'variable-reference-&gt;module-base-phase',
+            'variable-reference-&gt;module-declaration-inspector',
+            'variable-reference-&gt;module-path-index',
+            'variable-reference-&gt;module-source',
+            'variable-reference-&gt;namespace', 'variable-reference-&gt;phase',
+            'variable-reference-&gt;resolved-module-path',
+            'variable-reference-constant?', 'variable-reference?', 'vector',
+            'vector-&gt;immutable-vector', 'vector-&gt;list',
+            'vector-&gt;pseudo-random-generator',
+            'vector-&gt;pseudo-random-generator!', 'vector-&gt;values',
+            'vector-copy!', 'vector-fill!', 'vector-immutable',
+            'vector-length', 'vector-ref', 'vector-set!',
+            'vector-set-performance-stats!', 'vector?', 'version', 'void',
+            'void?', 'weak-box-value', 'weak-box?', 'will-execute',
+            'will-executor?', 'will-register', 'will-try-execute', 'wrap-evt',
+            'write', 'write-byte', 'write-bytes', 'write-bytes-avail',
+            'write-bytes-avail*', 'write-bytes-avail-evt',
+            'write-bytes-avail/enable-break', 'write-char', 'write-special',
+            'write-special-avail*', 'write-special-evt', 'write-string',
+            'zero?',
+            ),
+
+        2 => array(
+            '#%app', '#%datum', '#%expression', '#%module-begin', '#%plain-app',
+            '#%plain-lambda', '#%plain-module-begin', '#%provide', '#%require',
+            '#%stratified-body', '#%top', '#%top-interaction',
+            '#%variable-reference', ':do-in', 'all-defined-out',
+            'all-from-out', 'and', 'apply', 'arity-at-least', 'begin',
+            'begin-for-syntax', 'begin0', 'call-with-input-file',
+            'call-with-input-file*', 'call-with-output-file',
+            'call-with-output-file*', 'case', 'case-lambda', 'combine-in',
+            'combine-out', 'cond', 'date', 'date*', 'define',
+            'define-for-syntax', 'define-logger', 'define-namespace-anchor',
+            'define-sequence-syntax', 'define-struct', 'define-struct/derived',
+            'define-syntax', 'define-syntax-rule', 'define-syntaxes',
+            'define-values', 'define-values-for-syntax', 'do', 'else',
+            'except-in', 'except-out', 'exn', 'exn:break', 'exn:break:hang-up',
+            'exn:break:terminate', 'exn:fail', 'exn:fail:contract',
+            'exn:fail:contract:arity', 'exn:fail:contract:continuation',
+            'exn:fail:contract:divide-by-zero',
+            'exn:fail:contract:non-fixnum-result',
+            'exn:fail:contract:variable', 'exn:fail:filesystem',
+            'exn:fail:filesystem:errno', 'exn:fail:filesystem:exists',
+            'exn:fail:filesystem:version', 'exn:fail:network',
+            'exn:fail:network:errno', 'exn:fail:out-of-memory',
+            'exn:fail:read', 'exn:fail:read:eof', 'exn:fail:read:non-char',
+            'exn:fail:syntax', 'exn:fail:syntax:unbound',
+            'exn:fail:unsupported', 'exn:fail:user', 'file', 'for', 'for*',
+            'for*/and', 'for*/first', 'for*/fold', 'for*/fold/derived',
+            'for*/hash', 'for*/hasheq', 'for*/hasheqv', 'for*/last',
+            'for*/list', 'for*/lists', 'for*/or', 'for*/product', 'for*/sum',
+            'for*/vector', 'for-label', 'for-meta', 'for-syntax',
+            'for-template', 'for/and', 'for/first', 'for/fold',
+            'for/fold/derived', 'for/hash', 'for/hasheq', 'for/hasheqv',
+            'for/last', 'for/list', 'for/lists', 'for/or', 'for/product',
+            'for/sum', 'for/vector', 'gen:custom-write', 'gen:equal+hash',
+            'if', 'in-bytes', 'in-bytes-lines', 'in-indexed',
+            'in-input-port-bytes', 'in-input-port-chars', 'in-lines',
+            'in-list', 'in-mlist', 'in-naturals', 'in-port', 'in-producer',
+            'in-range', 'in-string', 'in-value', 'in-vector', 'lambda', 'let',
+            'let*', 'let*-values', 'let-syntax', 'let-syntaxes', 'let-values',
+            'let/cc', 'let/ec', 'letrec', 'letrec-syntax', 'letrec-syntaxes',
+            'letrec-syntaxes+values', 'letrec-values', 'lib', 'local-require',
+            'log-debug', 'log-error', 'log-fatal', 'log-info', 'log-warning',
+            'module', 'module*', 'module+', 'only-in', 'only-meta-in',
+            'open-input-file', 'open-input-output-file', 'open-output-file',
+            'or', 'parameterize', 'parameterize*', 'parameterize-break',
+            'planet', 'prefix-in', 'prefix-out', 'protect-out', 'provide',
+            'quasiquote', 'quasisyntax', 'quasisyntax/loc', 'quote',
+            'quote-syntax', 'quote-syntax/prune', 'regexp-match*',
+            'regexp-match-peek-positions*', 'regexp-match-positions*',
+            'relative-in', 'rename-in', 'rename-out', 'require', 'set!',
+            'set!-values', 'sort', 'srcloc', 'struct', 'struct-copy',
+            'struct-field-index', 'struct-out', 'submod', 'syntax',
+            'syntax-case', 'syntax-case*', 'syntax-id-rules', 'syntax-rules',
+            'syntax/loc', 'time', 'unless', 'unquote', 'unquote-splicing',
+            'unsyntax', 'unsyntax-splicing', 'when', 'with-continuation-mark',
+            'with-handlers', 'with-handlers*', 'with-input-from-file',
+            'with-output-to-file', 'with-syntax', '?',
+            ),
+
+        3 => array(
+            '&gt;/c', '&lt;/c', 'append*', 'append-map', 'argmax', 'argmin',
+            'bad-number-of-results', 'base-&gt;-doms/c', 'base-&gt;-rngs/c',
+            'base-&gt;?', 'blame-add-unknown-context', 'blame-context',
+            'blame-contract', 'blame-fmt-&gt;-string', 'blame-negative',
+            'blame-original?', 'blame-positive', 'blame-replace-negative',
+            'blame-source', 'blame-swap', 'blame-swapped?', 'blame-value',
+            'blame?', 'boolean=?', 'build-chaperone-contract-property',
+            'build-compound-type-name', 'build-contract-property',
+            'build-flat-contract-property', 'bytes-append*', 'bytes-join',
+            'bytes-no-nuls?', 'call-with-input-bytes',
+            'call-with-input-string', 'call-with-output-bytes',
+            'call-with-output-string', 'chaperone-contract-property?',
+            'chaperone-contract?', 'class-&gt;interface', 'class-info',
+            'class?', 'coerce-chaperone-contract',
+            'coerce-chaperone-contracts', 'coerce-contract',
+            'coerce-contract/f', 'coerce-contracts', 'coerce-flat-contract',
+            'coerce-flat-contracts', 'conjugate', 'cons?', 'const',
+            'contract-first-order', 'contract-first-order-passes?',
+            'contract-name', 'contract-proc', 'contract-projection',
+            'contract-property?', 'contract-random-generate',
+            'contract-stronger?', 'contract-struct-exercise',
+            'contract-struct-generate', 'contract?', 'convert-stream',
+            'copy-directory/files', 'copy-port', 'cosh', 'count',
+            'current-blame-format', 'current-future', 'curry', 'curryr',
+            'degrees-&gt;radians', 'delete-directory/files',
+            'deserialize-info:set-v0', 'dict-iter-contract',
+            'dict-key-contract', 'dict-value-contract', 'drop', 'drop-right',
+            'dup-input-port', 'dup-output-port', 'dynamic-get-field',
+            'dynamic-send', 'dynamic-set-field!', 'eighth', 'empty',
+            'empty-sequence', 'empty-stream', 'empty?', 'env-stash',
+            'eq-contract-val', 'eq-contract?', 'equal&lt;%&gt;',
+            'equal-contract-val', 'equal-contract?', 'exact-ceiling',
+            'exact-floor', 'exact-round', 'exact-truncate',
+            'exn:fail:contract:blame-object', 'exn:fail:contract:blame?',
+            'exn:fail:object?', 'exn:misc:match?', 'explode-path',
+            'externalizable&lt;%&gt;', 'false', 'false/c', 'false?',
+            'field-names', 'fifth', 'file-name-from-path',
+            'filename-extension', 'filter-map', 'filter-not',
+            'filter-read-input-port', 'find-files', 'first', 'flat-contract',
+            'flat-contract-predicate', 'flat-contract-property?',
+            'flat-contract?', 'flat-named-contract', 'flatten', 'fold-files',
+            'force', 'fourth', 'fsemaphore-count', 'fsemaphore-post',
+            'fsemaphore-try-wait?', 'fsemaphore-wait', 'fsemaphore?', 'future',
+            'future?', 'futures-enabled?', 'generate-ctc-fail?',
+            'generate-env', 'generate-member-key', 'generate/choose',
+            'generate/direct', 'generic?', 'group-execute-bit',
+            'group-read-bit', 'group-write-bit', 'has-contract?', 'identity',
+            'impersonator-contract?', 'impersonator-prop:contracted',
+            'implementation?', 'implementation?/c', 'in-dict', 'in-dict-keys',
+            'in-dict-pairs', 'in-dict-values', 'infinite?',
+            'input-port-append', 'instanceof/c', 'interface-&gt;method-names',
+            'interface-extension?', 'interface?', 'is-a?', 'is-a?/c', 'last',
+            'last-pair', 'list-&gt;set', 'list-&gt;seteq', 'list-&gt;seteqv',
+            'make-chaperone-contract', 'make-contract', 'make-custom-hash',
+            'make-directory*', 'make-exn:fail:contract:blame',
+            'make-exn:fail:object', 'make-flat-contract', 'make-fsemaphore',
+            'make-generate-ctc-fail', 'make-generic',
+            'make-immutable-custom-hash', 'make-input-port/read-to-peek',
+            'make-limited-input-port', 'make-list', 'make-lock-file-name',
+            'make-mixin-contract', 'make-none/c', 'make-pipe-with-specials',
+            'make-primitive-class', 'make-proj-contract',
+            'make-tentative-pretty-print-output-port', 'make-weak-custom-hash',
+            'match-equality-test', 'matches-arity-exactly?',
+            'member-name-key-hash-code', 'member-name-key=?',
+            'member-name-key?', 'merge-input', 'method-in-interface?',
+            'mixin-contract', 'n-&gt;th', 'nan?', 'natural-number/c', 'negate',
+            'new-?/c', 'new-?/c', 'ninth', 'normalize-path', 'object%',
+            'object-&gt;vector', 'object-info', 'object-interface',
+            'object-method-arity-includes?', 'object=?', 'object?',
+            'open-output-nowhere', 'order-of-magnitude', 'other-execute-bit',
+            'other-read-bit', 'other-write-bit', 'parse-command-line',
+            'partition', 'path-element?', 'path-only', 'pathlist-closure',
+            'pi', 'pi.f', 'place-break', 'place-channel', 'place-channel-get',
+            'place-channel-put', 'place-channel-put/get', 'place-channel?',
+            'place-dead-evt', 'place-enabled?', 'place-kill',
+            'place-message-allowed?', 'place-sleep', 'place-wait', 'place?',
+            'port-&gt;bytes', 'port-&gt;list', 'port-&gt;string',
+            'predicate/c', 'preferences-lock-file-mode', 'pretty-display',
+            'pretty-format', 'pretty-print',
+            'pretty-print-.-symbol-without-bars',
+            'pretty-print-abbreviate-read-macros', 'pretty-print-columns',
+            'pretty-print-current-style-table', 'pretty-print-depth',
+            'pretty-print-exact-as-decimal', 'pretty-print-extend-style-table',
+            'pretty-print-handler', 'pretty-print-newline',
+            'pretty-print-post-print-hook', 'pretty-print-pre-print-hook',
+            'pretty-print-print-hook', 'pretty-print-print-line',
+            'pretty-print-remap-stylable', 'pretty-print-show-inexactness',
+            'pretty-print-size-hook', 'pretty-print-style-table?',
+            'pretty-printing', 'pretty-write', 'printable&lt;%&gt;',
+            'printable/c', 'process', 'process*', 'process*/ports',
+            'process/ports', 'processor-count', 'promise-forced?',
+            'promise-running?', 'promise?', 'prop:chaperone-contract',
+            'prop:contract', 'prop:contracted', 'prop:dict',
+            'prop:flat-contract', 'prop:opt-chaperone-contract',
+            'prop:opt-chaperone-contract-get-test',
+            'prop:opt-chaperone-contract?', 'prop:stream', 'proper-subset?',
+            'put-preferences', 'radians-&gt;degrees', 'raise-blame-error',
+            'raise-contract-error', 'range', 'reencode-input-port',
+            'reencode-output-port', 'relocate-input-port',
+            'relocate-output-port', 'rest', 'second', 'sequence-&gt;list',
+            'sequence-add-between', 'sequence-andmap', 'sequence-append',
+            'sequence-count', 'sequence-filter', 'sequence-fold',
+            'sequence-for-each', 'sequence-length', 'sequence-map',
+            'sequence-ormap', 'sequence-ref', 'sequence-tail', 'set',
+            'set-&gt;list', 'set-add', 'set-count', 'set-empty?', 'set-eq?',
+            'set-equal?', 'set-eqv?', 'set-first', 'set-for-each',
+            'set-intersect', 'set-map', 'set-member?', 'set-remove',
+            'set-rest', 'set-subtract', 'set-symmetric-difference',
+            'set-union', 'set/c', 'set=?', 'set?', 'seteq', 'seteqv',
+            'seventh', 'sgn', 'shuffle', 'simple-form-path', 'sinh', 'sixth',
+            'skip-projection-wrapper?', 'some-system-path-&gt;string',
+            'special-filter-input-port', 'split-at', 'split-at-right', 'sqr',
+            'stream-&gt;list', 'stream-add-between', 'stream-andmap',
+            'stream-append', 'stream-count', 'stream-empty?', 'stream-filter',
+            'stream-first', 'stream-fold', 'stream-for-each', 'stream-length',
+            'stream-map', 'stream-ormap', 'stream-ref', 'stream-rest',
+            'stream-tail', 'stream?', 'string-&gt;some-system-path',
+            'string-append*', 'string-no-nuls?', 'struct-type-property/c',
+            'struct:exn:fail:contract:blame', 'struct:exn:fail:object',
+            'subclass?', 'subclass?/c', 'subset?', 'symbol=?', 'system',
+            'system*', 'system*/exit-code', 'system/exit-code', 'take',
+            'take-right', 'tanh', 'tcp-abandon-port', 'tcp-accept',
+            'tcp-accept-evt', 'tcp-accept-ready?', 'tcp-accept/enable-break',
+            'tcp-addresses', 'tcp-close', 'tcp-connect',
+            'tcp-connect/enable-break', 'tcp-listen', 'tcp-listener?',
+            'tcp-port?', 'tentative-pretty-print-port-cancel',
+            'tentative-pretty-print-port-transfer', 'tenth',
+            'the-unsupplied-arg', 'third', 'touch', 'transplant-input-port',
+            'transplant-output-port', 'true', 'udp-addresses', 'udp-bind!',
+            'udp-bound?', 'udp-close', 'udp-connect!', 'udp-connected?',
+            'udp-open-socket', 'udp-receive!', 'udp-receive!*',
+            'udp-receive!-evt', 'udp-receive!/enable-break',
+            'udp-receive-ready-evt', 'udp-send', 'udp-send*', 'udp-send-evt',
+            'udp-send-ready-evt', 'udp-send-to', 'udp-send-to*',
+            'udp-send-to-evt', 'udp-send-to/enable-break',
+            'udp-send/enable-break', 'udp?', 'unit?', 'unsupplied-arg?',
+            'user-execute-bit', 'user-read-bit', 'user-write-bit',
+            'value-contract', 'vector-append', 'vector-argmax',
+            'vector-argmin', 'vector-copy', 'vector-count', 'vector-drop',
+            'vector-drop-right', 'vector-filter', 'vector-filter-not',
+            'vector-map', 'vector-map!', 'vector-member', 'vector-memq',
+            'vector-memv', 'vector-set*!', 'vector-split-at',
+            'vector-split-at-right', 'vector-take', 'vector-take-right',
+            'with-input-from-bytes', 'with-input-from-string',
+            'with-output-to-bytes', 'with-output-to-string', 'would-be-future',
+            'writable&lt;%&gt;', 'xor',
+            ),
+        4 => array(
+            '&gt;=/c', '&lt;=/c', '-&gt;*m', '-&gt;d', '-&gt;dm', '-&gt;i', '-&gt;m',
+            '=/c', 'absent', 'abstract', 'add-between', 'and/c', 'any',
+            'any/c', 'augment', 'augment*', 'augment-final', 'augment-final*',
+            'augride', 'augride*', 'between/c', 'blame-add-context',
+            'box-immutable/c', 'box/c', 'call-with-file-lock/timeout',
+            'case-&gt;', 'case-&gt;m', 'class', 'class*',
+            'class-field-accessor', 'class-field-mutator', 'class/c',
+            'class/derived', 'command-line', 'compound-unit',
+            'compound-unit/infer', 'cons/c', 'continuation-mark-key/c',
+            'contract', 'contract-out', 'contract-struct', 'contracted',
+            'current-contract-region', 'define-compound-unit',
+            'define-compound-unit/infer', 'define-contract-struct',
+            'define-local-member-name', 'define-match-expander',
+            'define-member-name', 'define-opt/c', 'define-serializable-class',
+            'define-serializable-class*', 'define-signature',
+            'define-signature-form', 'define-struct/contract', 'define-unit',
+            'define-unit-binding', 'define-unit-from-context',
+            'define-unit/contract', 'define-unit/new-import-export',
+            'define-unit/s', 'define-values-for-export',
+            'define-values/invoke-unit', 'define-values/invoke-unit/infer',
+            'define/augment', 'define/augment-final', 'define/augride',
+            'define/contract', 'define/final-prop', 'define/match',
+            'define/overment', 'define/override', 'define/override-final',
+            'define/private', 'define/public', 'define/public-final',
+            'define/pubment', 'define/subexpression-pos-prop', 'delay',
+            'delay/idle', 'delay/name', 'delay/strict', 'delay/sync',
+            'delay/thread', 'dict-&gt;list', 'dict-can-functional-set?',
+            'dict-can-remove-keys?', 'dict-count', 'dict-for-each',
+            'dict-has-key?', 'dict-iterate-first', 'dict-iterate-key',
+            'dict-iterate-next', 'dict-iterate-value', 'dict-keys', 'dict-map',
+            'dict-mutable?', 'dict-ref', 'dict-ref!', 'dict-remove',
+            'dict-remove!', 'dict-set', 'dict-set!', 'dict-set*', 'dict-set*!',
+            'dict-update', 'dict-update!', 'dict-values', 'dict?',
+            'display-lines', 'display-lines-to-file', 'display-to-file',
+            'dynamic-place', 'dynamic-place*', 'eof-evt', 'except',
+            'exn:fail:contract:blame', 'exn:fail:object', 'export', 'extends',
+            'field', 'field-bound?', 'file-&gt;bytes', 'file-&gt;bytes-lines',
+            'file-&gt;lines', 'file-&gt;list', 'file-&gt;string',
+            'file-&gt;value', 'find-relative-path', 'flat-murec-contract',
+            'flat-rec-contract', 'for*/set', 'for*/seteq', 'for*/seteqv',
+            'for/set', 'for/seteq', 'for/seteqv', 'gen:dict', 'gen:stream',
+            'generic', 'get-field', 'get-preference', 'hash/c', 'implies',
+            'import', 'in-set', 'in-stream', 'include',
+            'include-at/relative-to', 'include-at/relative-to/reader',
+            'include/reader', 'inherit', 'inherit-field', 'inherit/inner',
+            'inherit/super', 'init', 'init-depend', 'init-field', 'init-rest',
+            'inner', 'inspect', 'instantiate', 'integer-in', 'interface',
+            'interface*', 'invoke-unit', 'invoke-unit/infer', 'lazy', 'link',
+            'list/c', 'listof', 'local', 'make-handle-get-preference-locked',
+            'make-object', 'make-temporary-file', 'match', 'match*',
+            'match*/derived', 'match-define', 'match-define-values',
+            'match-lambda', 'match-lambda*', 'match-lambda**', 'match-let',
+            'match-let*', 'match-let*-values', 'match-let-values',
+            'match-letrec', 'match/derived', 'match/values', 'member-name-key',
+            'method-contract?', 'mixin', 'nand', 'new', 'non-empty-listof',
+            'none/c', 'nor', 'not/c', 'object-contract', 'object/c',
+            'one-of/c', 'only', 'open', 'opt/c', 'or/c', 'overment',
+            'overment*', 'override', 'override*', 'override-final',
+            'override-final*', 'parameter/c', 'parametric-&gt;/c',
+            'peek-bytes!-evt', 'peek-bytes-avail!-evt', 'peek-bytes-evt',
+            'peek-string!-evt', 'peek-string-evt', 'peeking-input-port',
+            'place', 'place*', 'port-&gt;bytes-lines', 'port-&gt;lines',
+            'prefix', 'private', 'private*', 'procedure-arity-includes/c',
+            'promise/c', 'prompt-tag/c', 'prop:dict/contract',
+            'provide-signature-elements', 'provide/contract', 'public',
+            'public*', 'public-final', 'public-final*', 'pubment', 'pubment*',
+            'read-bytes!-evt', 'read-bytes-avail!-evt', 'read-bytes-evt',
+            'read-bytes-line-evt', 'read-line-evt', 'read-string!-evt',
+            'read-string-evt', 'real-in', 'recursive-contract',
+            'regexp-match-evt', 'remove-duplicates', 'rename', 'rename-inner',
+            'rename-super', 'send', 'send*', 'send+', 'send-generic',
+            'send/apply', 'send/keyword-apply', 'set-field!', 'shared',
+            'stream', 'stream-cons', 'string-join', 'string-len/c',
+            'string-normalize-spaces', 'string-replace', 'string-split',
+            'string-trim', 'struct*', 'struct/c', 'struct/ctc', 'struct/dc',
+            'super', 'super-instantiate', 'super-make-object', 'super-new',
+            'symbols', 'syntax/c', 'tag', 'this', 'this%', 'thunk', 'thunk*',
+            'unconstrained-domain-&gt;', 'unit', 'unit-from-context', 'unit/c',
+            'unit/new-import-export', 'unit/s', 'vector-immutable/c',
+            'vector-immutableof', 'vector/c', 'vectorof', 'with-contract',
+            'with-method', 'write-to-file', '~.a', '~.s', '~.v', '~a', '~e',
+            '~r', '~s', '~v',
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '&gt;', '&gt;=', '&lt;', '&lt;=', '*', '+', '-', '-&gt;', '-&gt;*', '...', '/',
+            '=', '=&gt;', '==', '_', '#fl', '#fx', '#s', '#', '#f', '#F',
+            '#false', '#t', '#T', '#true', '#lang', '#reader', '.', '\'', '#`',
+            '#,@', '#,', '#\'', '`', '@', ',', '#%', '#$', '#&', '#~', '#rx',
+            '#px', '#<<', '#;', '#hash', '#',
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'NUMBERS' => array(
+        1 => '(((#x#e)|(#e#x)|(#x#i)|(#i#x)|(#x))((((((((((((-)|(\+)))?(((('.
+            '(([0-9])+)?(\.)?(([0-9a-fA-F])+(#)*)))|(((([0-9a-fA-F])+(#)*)'.
+            '(\.)?(#)*))|(((([0-9a-fA-F])+(#)*)\\/(([0-9a-fA-F])+(#)*))))('.
+            '([sl]((((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan'.
+            '\.))[0f])))))?((-)|(\+))(((((((([0-9])+)?(\.)?(([0-9a-fA-F])+'.
+            '(#)*)))|(((([0-9a-fA-F])+(#)*)(\.)?(#)*))|(((([0-9a-fA-F])+(#'.
+            ')*)\\/(([0-9a-fA-F])+(#)*))))(([sl]((((-)|(\+)))?([0-9])+)))?'.
+            '))|((((inf\.)|(nan\.))[0f])))i))|((((((((-)|(\+)))?(((((([0-9'.
+            '])+)?(\.)?(([0-9a-fA-F])+(#)*)))|(((([0-9a-fA-F])+(#)*)(\.)?('.
+            '#)*))|(((([0-9a-fA-F])+(#)*)\\/(([0-9a-fA-F])+(#)*))))(([sl]('.
+            '(((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0'.
+            'f]))))@((((((-)|(\+)))?(((((([0-9])+)?(\.)?(([0-9a-fA-F])+(#)'.
+            '*)))|(((([0-9a-fA-F])+(#)*)(\.)?(#)*))|(((([0-9a-fA-F])+(#)*)'.
+            '\\/(([0-9a-fA-F])+(#)*))))(([sl]((((-)|(\+)))?([0-9])+)))?)))'.
+            '|((((-)|(\+))(((inf\.)|(nan\.))[0f]))))))))|((((((-)|(\+)))?('.
+            '([0-9])+\\/([0-9])+))((-)|(\+))(([0-9])+\\/([0-9])+)i))|((((('.
+            '-)|(\+)))?(([0-9])+\\/([0-9])+)))|(((((((-)|(\+)))?(((((([0-9'.
+            '])+)?(\.)?(([0-9a-fA-F])+(#)*)))|(((([0-9a-fA-F])+(#)*)(\.)?('.
+            '#)*))|(((([0-9a-fA-F])+(#)*)\\/(([0-9a-fA-F])+(#)*))))(([sl]('.
+            '(((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0'.
+            'f])))))|(((((-)|(\+)))?([0-9])+))))',
+        2 => '(((#o#e)|(#e#o)|(#o#i)|(#i#o)|(#o))((((((((((((-)|(\+)))?(((('.
+            '(([0-9])+)?(\.)?(([0-7])+(#)*)))|(((([0-7])+(#)*)(\.)?(#)*))|'.
+            '(((([0-7])+(#)*)\\/(([0-7])+(#)*))))(((([sl])|([def]))((((-)|'.
+            '(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0f]))))'.
+            ')?((-)|(\+))(((((((([0-9])+)?(\.)?(([0-7])+(#)*)))|(((([0-7])'.
+            '+(#)*)(\.)?(#)*))|(((([0-7])+(#)*)\\/(([0-7])+(#)*))))(((([sl'.
+            '])|([def]))((((-)|(\+)))?([0-9])+)))?))|((((inf\.)|(nan\.))[0'.
+            'f])))i))|((((((((-)|(\+)))?(((((([0-9])+)?(\.)?(([0-7])+(#)*)'.
+            '))|(((([0-7])+(#)*)(\.)?(#)*))|(((([0-7])+(#)*)\\/(([0-7])+(#'.
+            ')*))))(((([sl])|([def]))((((-)|(\+)))?([0-9])+)))?)))|((((-)|'.
+            '(\+))(((inf\.)|(nan\.))[0f]))))@((((((-)|(\+)))?(((((([0-9])+'.
+            ')?(\.)?(([0-7])+(#)*)))|(((([0-7])+(#)*)(\.)?(#)*))|(((([0-7]'.
+            ')+(#)*)\\/(([0-7])+(#)*))))(((([sl])|([def]))((((-)|(\+)))?(['.
+            '0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0f]))))))))|(((('.
+            '((-)|(\+)))?(([0-9])+\\/([0-9])+))((-)|(\+))(([0-9])+\\/([0-9'.
+            '])+)i))|(((((-)|(\+)))?(([0-9])+\\/([0-9])+)))|(((((((-)|(\+)'.
+            '))?(((((([0-9])+)?(\.)?(([0-7])+(#)*)))|(((([0-7])+(#)*)(\.)?'.
+            '(#)*))|(((([0-7])+(#)*)\\/(([0-7])+(#)*))))(((([sl])|([def]))'.
+            '((((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))['.
+            '0f])))))|(((((-)|(\+)))?([0-9])+))))',
+        3 => '(((#b#e)|(#e#b)|(#b#i)|(#i#b)|(#b))((((((((((((-)|(\+)))?(((('.
+            '(([0-9])+)?(\.)?(([0-1])+(#)*)))|(((([0-1])+(#)*)(\.)?(#)*))|'.
+            '(((([0-1])+(#)*)\\/(([0-1])+(#)*))))(((([sl])|([def]))((((-)|'.
+            '(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0f]))))'.
+            ')?((-)|(\+))(((((((([0-9])+)?(\.)?(([0-1])+(#)*)))|(((([0-1])'.
+            '+(#)*)(\.)?(#)*))|(((([0-1])+(#)*)\\/(([0-1])+(#)*))))(((([sl'.
+            '])|([def]))((((-)|(\+)))?([0-9])+)))?))|((((inf\.)|(nan\.))[0'.
+            'f])))i))|((((((((-)|(\+)))?(((((([0-9])+)?(\.)?(([0-1])+(#)*)'.
+            '))|(((([0-1])+(#)*)(\.)?(#)*))|(((([0-1])+(#)*)\\/(([0-1])+(#'.
+            ')*))))(((([sl])|([def]))((((-)|(\+)))?([0-9])+)))?)))|((((-)|'.
+            '(\+))(((inf\.)|(nan\.))[0f]))))@((((((-)|(\+)))?(((((([0-9])+'.
+            ')?(\.)?(([0-1])+(#)*)))|(((([0-1])+(#)*)(\.)?(#)*))|(((([0-1]'.
+            ')+(#)*)\\/(([0-1])+(#)*))))(((([sl])|([def]))((((-)|(\+)))?(['.
+            '0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0f]))))))))|(((('.
+            '((-)|(\+)))?(([0-9])+\\/([0-9])+))((-)|(\+))(([0-9])+\\/([0-9'.
+            '])+)i))|(((((-)|(\+)))?(([0-9])+\\/([0-9])+)))|(((((((-)|(\+)'.
+            '))?(((((([0-9])+)?(\.)?(([0-1])+(#)*)))|(((([0-1])+(#)*)(\.)?'.
+            '(#)*))|(((([0-1])+(#)*)\\/(([0-1])+(#)*))))(((([sl])|([def]))'.
+            '((((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))['.
+            '0f])))))|(((((-)|(\+)))?([0-9])+))))',
+        4 => '((((#d#e)|(#e#d)|(#d#i)|(#i#d)|(#e)|(#i)|(#d)))?((((((((((((-'.
+            ')|(\+)))?(((((([0-9])+)?(\.)?(([0-9])+(#)*)))|(((([0-9])+(#)*'.
+            ')(\.)?(#)*))|(((([0-9])+(#)*)\\/(([0-9])+(#)*))))(((([sl])|(['.
+            'def]))((((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(na'.
+            'n\.))[0f])))))?((-)|(\+))(((((((([0-9])+)?(\.)?(([0-9])+(#)*)'.
+            '))|(((([0-9])+(#)*)(\.)?(#)*))|(((([0-9])+(#)*)\\/(([0-9])+(#'.
+            ')*))))(((([sl])|([def]))((((-)|(\+)))?([0-9])+)))?))|((((inf'.
+            '\.)|(nan\.))[0f])))i))|((((((((-)|(\+)))?(((((([0-9])+)?(\.)?'.
+            '(([0-9])+(#)*)))|(((([0-9])+(#)*)(\.)?(#)*))|(((([0-9])+(#)*)'.
+            '\\/(([0-9])+(#)*))))(((([sl])|([def]))((((-)|(\+)))?([0-9])+)'.
+            '))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0f]))))@((((((-)|(\+)))'.
+            '?(((((([0-9])+)?(\.)?(([0-9])+(#)*)))|(((([0-9])+(#)*)(\.)?(#'.
+            ')*))|(((([0-9])+(#)*)\\/(([0-9])+(#)*))))(((([sl])|([def]))(('.
+            '((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((inf\.)|(nan\.))[0f'.
+            ']))))))))|((((((-)|(\+)))?(([0-9])+\\/([0-9])+))((-)|(\+))((['.
+            '0-9])+\\/([0-9])+)i))|(((((-)|(\+)))?(([0-9])+\\/([0-9])+)))|'.
+            '(((((((-)|(\+)))?(((((([0-9])+)?(\.)?(([0-9])+(#)*)))|(((([0-'.
+            '9])+(#)*)(\.)?(#)*))|(((([0-9])+(#)*)\\/(([0-9])+(#)*))))(((('.
+            '[sl])|([def]))((((-)|(\+)))?([0-9])+)))?)))|((((-)|(\+))(((in'.
+            'f\.)|(nan\.))[0f])))))|(((((-)|(\+)))?([0-9])+))))',
+            ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: blue;',
+            2 => 'color: rgb(34, 34, 139);',
+            3 => 'color: blue;',
+            4 => 'color: rgb(34, 34, 139);',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: rgb(194, 116, 31);',
+            'MULTI' => 'color: rgb(194, 116, 31);',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: rgb(132, 60,36);',
+            ),
+        'STRINGS' => array(
+            0 => 'color: rgb(34, 139, 34);',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: rgb(34, 139, 34);',
+            1 => 'color: rgb(34, 139, 34);',
+            2 => 'color: rgb(34, 139, 34);',
+            3 => 'color: rgb(34, 139, 34);',
+            4 => 'color: rgb(34, 139, 34);',
+            ),
+        'METHODS' => array(
+            0 => 'color: #202020;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: rgb(132, 60,36);',
+            ),
+        'REGEXPS' => array(
+            1 => 'color: rgb(34, 139, 34);',
+            2 => 'color: rgb(132, 60,36);',
+            3 => 'color: rgb(34, 139, 34);',
+            ),
+        'SCRIPT' => array(
+            ),
+        ),
+    'URLS' => array(
+        1 => 'http://docs.racket-lang.org/reference/',
+        2 => 'http://docs.racket-lang.org/reference/',
+        3 => 'http://docs.racket-lang.org/reference/',
+        4 => 'http://docs.racket-lang.org/reference/',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '#\\\\(nul|null|backspace|tab|newline|linefeed|vtab|page|retur'.
+            'n|space|rubout|([0-7]{1,3})|(u[[:xdigit:]]{1,4})|(U[[:xdigit:'.
+            ']]{1,6})|[a-z])',
+        2 => '#:[^[:space:]()[\\]{}",\']+',
+        3 => '\'((\\\\ )|([^[:space:]()[\\]{}",\']))+',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '[[:space:]()[\\]{}",\']',
+            ),
+        'ENABLE_FLAGS' => array(
+            'SYMBOLS' => GESHI_MAYBE,
+            'BRACKETS' => GESHI_MAYBE,
+            'REGEXPS' => GESHI_MAYBE,
+            'ESCAPE_CHAR' => GESHI_MAYBE,
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/rails.php b/vendor/easybook/geshi/geshi/rails.php
new file mode 100755
index 000000000..d41bd9a6f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/rails.php
@@ -0,0 +1,404 @@
+<?php
+/*************************************************************************************
+ * rails.php
+ * ---------
+ * Author: Moises Deniz
+ * Copyright: (c) 2005 Moises Deniz
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/03/21
+ *
+ * Ruby (with Ruby on Rails Framework) language file for GeSHi.
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Rails',
+    'COMMENT_SINGLE' => array(1 => "#"),
+    'COMMENT_MULTI' => array("=begin" => "=end"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'alias', 'and', 'begin', 'break', 'case', 'class',
+            'def', 'defined', 'do', 'else', 'elsif', 'end',
+            'ensure', 'for', 'if', 'in', 'module', 'while',
+            'next', 'not', 'or', 'redo', 'rescue', 'yield',
+            'retry', 'super', 'then', 'undef', 'unless',
+            'until', 'when', 'BEGIN', 'END', 'include'
+            ),
+        2 => array(
+            '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
+            'return'
+            ),
+        3 => array(
+            'Array', 'Float', 'Integer', 'String', 'at_exit',
+            'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
+            'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
+            'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
+            'iterator?', 'lambda', 'load', 'local_variables', 'loop',
+            'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
+            'raise', 'rand', 'readline', 'readlines', 'require', 'select',
+            'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
+            'system', 'trace_var', 'trap', 'untrace_var'
+            ),
+        4 => array(
+            'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
+            'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
+            'CGI::HtmlExtension', 'CGI::QueryExtension',
+            'CGI::Session', 'CGI::Session::FileStore',
+            'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
+            'ConditionVariable', 'Continuation', 'Data',
+            'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
+            'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
+            'Exception', 'FalseClass', 'File',
+            'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
+            'FileUtils::DryRun', 'FileUtils::NoWrite',
+            'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
+            'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
+            'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
+            'Iconv::Failure', 'Iconv::IllegalSequence',
+            'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
+            'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
+            'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
+            'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
+            'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
+            'Logger::ShiftingError', 'Marshal', 'MatchData',
+            'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
+            'NameError::message', 'NilClass', 'NoMemoryError',
+            'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
+            'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
+            'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
+            'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
+            'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
+            'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
+            'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
+            'SingleForwardable', 'Singleton', 'SingletonClassMethods',
+            'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
+            'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
+            'SyncEnumerator', 'SyntaxError', 'SystemCallError',
+            'SystemExit', 'SystemStackError', 'Tempfile',
+            'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
+            'ThreadError', 'ThreadGroup',
+            'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
+            'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
+            'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
+            'URI::InvalidComponentError', 'URI::InvalidURIError',
+            'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
+            'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
+            'ZeroDivisionError', 'Zlib',
+            'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
+            'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
+            'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
+            'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
+            'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
+            'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
+            'Zlib::VersionError',
+            'Zlib::ZStream',
+            'ActionController::AbstractRequest',
+            'ActionController::Assertions::DomAssertions',
+            'ActionController::Assertions::ModelAssertions',
+            'ActionController::Assertions::ResponseAssertions',
+            'ActionController::Assertions::RoutingAssertions',
+            'ActionController::Assertions::SelectorAssertions',
+            'ActionController::Assertions::TagAssertions',
+            'ActionController::Base',
+            'ActionController::Benchmarking::ClassMethods',
+            'ActionController::Caching',
+            'ActionController::Caching::Actions',
+            'ActionController::Caching::Actions::ActionCachePath',
+            'ActionController::Caching::Fragments',
+            'ActionController::Caching::Pages',
+            'ActionController::Caching::Pages::ClassMethods',
+            'ActionController::Caching::Sweeping',
+            'ActionController::Components',
+            'ActionController::Components::ClassMethods',
+            'ActionController::Components::InstanceMethods',
+            'ActionController::Cookies',
+            'ActionController::Filters::ClassMethods',
+            'ActionController::Flash',
+            'ActionController::Flash::FlashHash',
+            'ActionController::Helpers::ClassMethods',
+            'ActionController::Integration::Session',
+            'ActionController::IntegrationTest',
+            'ActionController::Layout::ClassMethods',
+            'ActionController::Macros',
+            'ActionController::Macros::AutoComplete::ClassMethods',
+            'ActionController::Macros::InPlaceEditing::ClassMethods',
+            'ActionController::MimeResponds::InstanceMethods',
+            'ActionController::Pagination',
+            'ActionController::Pagination::ClassMethods',
+            'ActionController::Pagination::Paginator',
+            'ActionController::Pagination::Paginator::Page',
+            'ActionController::Pagination::Paginator::Window',
+            'ActionController::Rescue', 'ActionController::Resources',
+            'ActionController::Routing',
+            'ActionController::Scaffolding::ClassMethods',
+            'ActionController::SessionManagement::ClassMethods',
+            'ActionController::Streaming', 'ActionController::TestProcess',
+            'ActionController::TestUploadedFile',
+            'ActionController::UrlWriter',
+            'ActionController::Verification::ClassMethods',
+            'ActionMailer::Base', 'ActionView::Base',
+            'ActionView::Helpers::ActiveRecordHelper',
+            'ActionView::Helpers::AssetTagHelper',
+            'ActionView::Helpers::BenchmarkHelper',
+            'ActionView::Helpers::CacheHelper',
+            'ActionView::Helpers::CaptureHelper',
+            'ActionView::Helpers::DateHelper',
+            'ActionView::Helpers::DebugHelper',
+            'ActionView::Helpers::FormHelper',
+            'ActionView::Helpers::FormOptionsHelper',
+            'ActionView::Helpers::FormTagHelper',
+            'ActionView::Helpers::JavaScriptHelper',
+            'ActionView::Helpers::JavaScriptMacrosHelper',
+            'ActionView::Helpers::NumberHelper',
+            'ActionView::Helpers::PaginationHelper',
+            'ActionView::Helpers::PrototypeHelper',
+            'ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods',
+            'ActionView::Helpers::ScriptaculousHelper',
+            'ActionView::Helpers::TagHelper',
+            'ActionView::Helpers::TextHelper',
+            'ActionView::Helpers::UrlHelper', 'ActionView::Partials',
+            'ActionWebService::API::Method', 'ActionWebService::Base',
+            'ActionWebService::Client::Soap',
+            'ActionWebService::Client::XmlRpc',
+            'ActionWebService::Container::ActionController::ClassMethods',
+            'ActionWebService::Container::Delegated::ClassMethods',
+            'ActionWebService::Container::Direct::ClassMethods',
+            'ActionWebService::Invocation::ClassMethods',
+            'ActionWebService::Scaffolding::ClassMethods',
+            'ActionWebService::SignatureTypes', 'ActionWebService::Struct',
+            'ActiveRecord::Acts::List::ClassMethods',
+            'ActiveRecord::Acts::List::InstanceMethods',
+            'ActiveRecord::Acts::NestedSet::ClassMethods',
+            'ActiveRecord::Acts::NestedSet::InstanceMethods',
+            'ActiveRecord::Acts::Tree::ClassMethods',
+            'ActiveRecord::Acts::Tree::InstanceMethods',
+            'ActiveRecord::Aggregations::ClassMethods',
+            'ActiveRecord::Associations::ClassMethods',
+            'ActiveRecord::AttributeMethods::ClassMethods',
+            'ActiveRecord::Base',
+            'ActiveRecord::Calculations::ClassMethods',
+            'ActiveRecord::Callbacks',
+            'ActiveRecord::ConnectionAdapters::AbstractAdapter',
+            'ActiveRecord::ConnectionAdapters::Column',
+            'ActiveRecord::ConnectionAdapters::DB2Adapter',
+            'ActiveRecord::ConnectionAdapters::DatabaseStatements',
+            'ActiveRecord::ConnectionAdapters::FirebirdAdapter',
+            'ActiveRecord::ConnectionAdapters::FrontBaseAdapter',
+            'ActiveRecord::ConnectionAdapters::MysqlAdapter',
+            'ActiveRecord::ConnectionAdapters::OpenBaseAdapter',
+            'ActiveRecord::ConnectionAdapters::OracleAdapter',
+            'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
+            'ActiveRecord::ConnectionAdapters::Quoting',
+            'ActiveRecord::ConnectionAdapters::SQLServerAdapter',
+            'ActiveRecord::ConnectionAdapters::SQLiteAdapter',
+            'ActiveRecord::ConnectionAdapters::SchemaStatements',
+            'ActiveRecord::ConnectionAdapters::SybaseAdapter::ColumnWithIdentity',
+            'ActiveRecord::ConnectionAdapters::SybaseAdapterContext',
+            'ActiveRecord::ConnectionAdapters::TableDefinition',
+            'ActiveRecord::Errors', 'ActiveRecord::Locking',
+            'ActiveRecord::Locking::Optimistic',
+            'ActiveRecord::Locking::Optimistic::ClassMethods',
+            'ActiveRecord::Locking::Pessimistic',
+            'ActiveRecord::Migration', 'ActiveRecord::Observer',
+            'ActiveRecord::Observing::ClassMethods',
+            'ActiveRecord::Reflection::ClassMethods',
+            'ActiveRecord::Reflection::MacroReflection',
+            'ActiveRecord::Schema', 'ActiveRecord::Timestamp',
+            'ActiveRecord::Transactions::ClassMethods',
+            'ActiveRecord::Validations',
+            'ActiveRecord::Validations::ClassMethods',
+            'ActiveRecord::XmlSerialization',
+            'ActiveSupport::CachingTools::HashCaching',
+            'ActiveSupport::CoreExtensions::Array::Conversions',
+            'ActiveSupport::CoreExtensions::Array::Grouping',
+            'ActiveSupport::CoreExtensions::Date::Conversions',
+            'ActiveSupport::CoreExtensions::Hash::Conversions',
+            'ActiveSupport::CoreExtensions::Hash::Conversions::ClassMethods',
+            'ActiveSupport::CoreExtensions::Hash::Diff',
+            'ActiveSupport::CoreExtensions::Hash::Keys',
+            'ActiveSupport::CoreExtensions::Hash::ReverseMerge',
+            'ActiveSupport::CoreExtensions::Integer::EvenOdd',
+            'ActiveSupport::CoreExtensions::Integer::Inflections',
+            'ActiveSupport::CoreExtensions::Numeric::Bytes',
+            'ActiveSupport::CoreExtensions::Numeric::Time',
+            'ActiveSupport::CoreExtensions::Pathname::CleanWithin',
+            'ActiveSupport::CoreExtensions::Range::Conversions',
+            'ActiveSupport::CoreExtensions::String::Access',
+            'ActiveSupport::CoreExtensions::String::Conversions',
+            'ActiveSupport::CoreExtensions::String::Inflections',
+            'ActiveSupport::CoreExtensions::String::Iterators',
+            'ActiveSupport::CoreExtensions::String::StartsEndsWith',
+            'ActiveSupport::CoreExtensions::String::Unicode',
+            'ActiveSupport::CoreExtensions::Time::Calculations',
+            'ActiveSupport::CoreExtensions::Time::Calculations::ClassMethods',
+            'ActiveSupport::CoreExtensions::Time::Conversions',
+            'ActiveSupport::Multibyte::Chars',
+            'ActiveSupport::Multibyte::Handlers::UTF8Handler',
+            'Breakpoint', 'Builder::BlankSlate', 'Builder::XmlMarkup',
+            'Fixtures',
+            'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
+            'Inflector::Inflections', 'Mime', 'Mime::Type',
+            'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
+            ),
+        5 => array(
+            'image_tag', 'link_to', 'link_to_remote', 'javascript_include_tag',
+            'assert_equal', 'assert_not_equal', 'before_filter',
+            'after_filter', 'render', 'redirect_to', 'hide_action',
+            'render_to_string', 'url_for', 'controller_name',
+            'controller_class_name', 'controller_path', 'session',
+            'render_component', 'render_component_as_string', 'cookie',
+            'layout', 'flash', 'auto_complete_for', 'in_place_editor_for',
+            'respond_to', 'paginate', 'current_page', 'each', 'first',
+            'first_page', 'last_page', 'last', 'length', 'new', 'page_count',
+            'previous', 'scaffold', 'send_data',
+            'send_file', 'deliver', 'receive', 'error_messages_for',
+            'error_message_on', 'form', 'input', 'stylesheet_link_tag',
+            'stylesheet_path', 'content_for', 'select_date', 'ago',
+            'month', 'day', 'check_box', 'fields_for', 'file_field',
+            'form_for', 'hidden_field', 'text_area', 'password_field',
+            'collection_select', 'options_for_select',
+            'options_from_collection_for_select', 'file_field_tag',
+            'form_for_tag', 'hidden_field_tag', 'text_area_tag',
+            'password_field_tag', 'link_to_function', 'javascript_tag',
+            'human_size', 'number_to_currency', 'pagination_links',
+            'form_remote_tag', 'form_remote_for',
+            'submit_to_remote', 'remote_function', 'observe_form',
+            'observe_field', 'remote_form_for', 'options_for_ajax', 'alert',
+            'call', 'assign', 'show', 'hide', 'insert_html', 'sortable',
+            'toggle', 'visual_effect', 'replace', 'replace_html', 'remove',
+            'save', 'save!', 'draggable', 'drop_receiving', 'literal',
+            'draggable_element', 'drop_receiving_element', 'sortable_element',
+            'content_tag', 'tag', 'link_to_image', 'link_to_if',
+            'link_to_unless', 'mail_to', 'link_image_to', 'button_to',
+            'current_page?', 'act_as_list', 'act_as_nested', 'act_as_tree',
+            'has_many', 'has_one', 'belongs_to', 'has_many_and_belogns_to',
+            'delete', 'destroy', 'destroy_all', 'clone', 'deep_clone', 'copy',
+            'update', 'table_name', 'primary_key', 'sum', 'maximun', 'minimum',
+            'count', 'size', 'after_save', 'after_create', 'before_save',
+            'before_create', 'add_to_base', 'errors', 'add', 'validate',
+            'validates_presence_of', 'validates_numericality_of',
+            'validates_uniqueness_of', 'validates_length_of',
+            'validates_format_of', 'validates_size_of', 'to_a', 'to_s',
+            'to_xml', 'to_i'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
+        '+', '-', '=>', '<<'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC0066; font-weight:bold;',
+            4 => 'color:#CC00FF; font-weight:bold;',
+            5 => 'color:#5A0A0A; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+                    'MULTI' => 'color:#000080; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#006666;'
+            ),
+        'METHODS' => array(
+            1 => 'color:#9900CC;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*", //Static OOP References
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/rbs.php b/vendor/easybook/geshi/geshi/rbs.php
new file mode 100644
index 000000000..02c2fcfa8
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/rbs.php
@@ -0,0 +1,224 @@
+<?php
+/*************************************************************************************
+ * rbs.php
+ * ------
+ * Author: Deng Wen Gang (deng@priity.com)
+ * Copyright: (c) 2013 Deng Wen Gang
+ * Release Version: 1.0.8.12
+ * Date Started: 2013/01/15
+ *
+ * RBScript language file for GeSHi.
+ *
+ * RBScript official website: http://docs.realsoftware.com/index.php/Rbscript
+ *
+ * CHANGES
+ * -------
+ * 2013/01/15 (1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'RBScript',
+    'COMMENT_SINGLE' => array( 1 => '//', 2 => "'" ),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        3 => '/REM\s.*$/im',
+        4 => '/&b[01]+/',
+        5 => '/&o[0-7]+/',
+        6 => '/&h[a-f0-9]+/i',
+        7 => '/&c[a-f0-9]+/i',
+        8 => '/&u[a-f0-9]+/i',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Int8', 'Int16', 'Int32', 'Int64', 'Uint8', 'Uint16', 'Uint32', 'Uint64', 'Byte', 'Integer',
+            'Single', 'Double', 'Boolean', 'String', 'Color', 'Object', 'Variant'
+            ),
+        2 => array(
+            'Private', 'Public', 'Protected',
+            'Sub', 'Function', 'Delegate', 'Exception',
+            ),
+        3 => array(
+            'IsA',
+            'And', 'Or', 'Not', 'Xor',
+            'If', 'Then', 'Else', 'ElseIf',
+            'Select', 'Case',
+            'For', 'Each', 'In', 'To', 'Step', 'Next',
+            'Do', 'Loop', 'Until',
+            'While', 'Wend',
+            'Continue', 'Exit', 'Goto', 'End',
+            ),
+        4 => array(
+            'Const', 'Static',
+            'Dim', 'As', 'Redim',
+            'Me', 'Self', 'Super', 'Extends', 'Implements',
+            'ByRef', 'ByVal', 'Assigns', 'ParamArray',
+            'Mod',
+            'Raise',
+            ),
+        5 => array(
+            'False', 'True', 'Nil'
+            ),
+        6 => array(
+            'Abs',
+            'Acos',
+            'Asc',
+            'AscB',
+            'Asin',
+            'Atan',
+            'Atan2',
+            'CDbl',
+            'Ceil',
+            'Chr',
+            'ChrB',
+            'CMY',
+            'Cos',
+            'CountFields',
+            'CStr',
+            'Exp',
+            'Floor',
+            'Format',
+            'Hex',
+            'HSV',
+            'InStr',
+            'InStrB',
+            'Left',
+            'LeftB',
+            'Len',
+            'LenB',
+            'Log',
+            'Lowercase',
+            'LTrim',
+            'Max',
+            'Microseconds',
+            'Mid',
+            'MidB',
+            'Min',
+            'NthField',
+            'Oct',
+            'Pow',
+            'Replace',
+            'ReplaceB',
+            'ReplaceAll',
+            'ReplaceAllB',
+            'RGB',
+            'Right',
+            'RightB',
+            'Rnd',
+            'Round',
+            'RTrim',
+            'Sin',
+            'Sqrt',
+            'Str',
+            'StrComp',
+            'Tan',
+            'Ticks',
+            'Titlecase',
+            'Trim',
+            'UBound',
+            'Uppercase',
+            'Val',
+            ),
+        ),
+    'SYMBOLS' => array(
+            '+', '-', '*', '/', '\\', '^', '<', '>', '=', '<>', '&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #F660AB; font-weight: bold;',
+            2 => 'color: #E56717; font-weight: bold;',
+            3 => 'color: #8D38C9; font-weight: bold;',
+            4 => 'color: #151B8D; font-weight: bold;',
+            5 => 'color: #00C2FF; font-weight: bold;',
+            6 => 'color: #3EA99F; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            2 => 'color: #008000;',
+            3 => 'color: #008000;',
+
+            4 => 'color: #800000;',
+            5 => 'color: #800000;',
+            6 => 'color: #800000;',
+            7 => 'color: #800000;',
+            8 => 'color: #800000;',
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/rebol.php b/vendor/easybook/geshi/geshi/rebol.php
new file mode 100755
index 000000000..ea86c21cd
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/rebol.php
@@ -0,0 +1,196 @@
+<?php
+/*************************************************************************************
+ * rebol.php
+ * --------
+ * Author: Lecanu Guillaume (Guillaume@LyA.fr)
+ * Copyright: (c) 2004-2005 Lecanu Guillaume (Guillaume@LyA.fr)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/12/22
+ *
+ * Rebol language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/01/26 (1.0.8.3)
+ *  -  Adapted language file to comply to GeSHi language file guidelines
+ * 2004/11/25 (1.0.3)
+ *  -  Added support for multiple object splitters
+ *  -  Fixed &new problem
+ * 2004/10/27 (1.0.2)
+ *  -  Added URL support
+ *  -  Added extra constants
+ * 2004/08/05 (1.0.1)
+ *  -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * * Make sure the last few function I may have missed
+ *   (like eval()) are included for highlighting
+ * * Split to several files - php4, php5 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'REBOL',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('rebol [' => ']', 'comment [' => ']'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'binary!','block!','char!','date!','decimal!','email!','file!',
+            'hash!','integer!','issue!','list!','logic!','money!','none!',
+            'object!','paren!','pair!','path!','string!','tag!','time!',
+            'tuple!','url!',
+            ),
+        2 => array(
+            'all','any','attempt','break','catch','compose','disarm','dispatch',
+            'do','do-events','does','either','else','exit','for','forall',
+            'foreach','forever','forskip','func','function','halt','has','if',
+            'launch','loop','next','quit','reduce','remove-each','repeat',
+            'return','secure','switch','throw','try','until','wait','while',
+            ),
+        3 => array(
+            'about','abs','absolute','add','alert','alias','alter','and',
+            'any-block?','any-function?','any-string?','any-type?','any-word?',
+            'append','arccosine','arcsine','arctangent','array','as-pair',
+            'ask','at','back','binary?','bind','bitset?','block?','brightness?',
+            'browse','build-tag','caret-to-offset','center-face','change',
+            'change-dir','char?','charset','checksum','choose','clean-path',
+            'clear','clear-fields','close','comment','complement','component?',
+            'compress','confirm','connected?','construct','context','copy',
+            'cosine','datatype?','date?','debase','decimal?','decode-cgi',
+            'decompress','dehex','delete','detab','difference','dir?','dirize',
+            'divide','dump-face','dump-obj','echo','email?','empty?','enbase',
+            'entab','equal?','error?','even?','event?','exclude','exists?',
+            'exp','extract','fifth','file?','find','first','flash','focus',
+            'form','found?','fourth','free','function?','get','get-modes',
+            'get-word?','greater-or-equal?','greater?','hash?','head','head?',
+            'help','hide','hide-popup','image?','import-email','in',
+            'in-window?','index?','info?','inform','input','input?','insert',
+            'integer?','intersect','issue?','join','last','layout','length?',
+            'lesser-or-equal?','lesser?','library?','license','link?',
+            'list-dir','list?','lit-path?','lit-word?','load','load-image',
+            'log-10','log-2','log-e','logic?','lowercase','make','make-dir',
+            'make-face','max','maximum','maximum-of','min','minimum',
+            'minimum-of','modified?','mold','money?','multiply','native?',
+            'negate','negative?','none?','not','not-equal?','now','number?',
+            'object?','odd?','offset-to-caret','offset?','op?','open','or',
+            'pair?','paren?','parse','parse-xml','path?','pick','poke','port?',
+            'positive?','power','prin','print','probe','protect',
+            'protect-system','query','random','read','read-io','recycle',
+            'refinement?','reform','rejoin','remainder','remold','remove',
+            'rename',
+            //'repeat',
+            'repend','replace','request','request-color','request-date',
+            'request-download','request-file','request-list','request-pass',
+            'request-text','resend','reverse','routine?','same?','save',
+            'script?','second','select','send','series?','set','set-modes',
+            'set-net','set-path?','set-word?','show','show-popup','sign?',
+            'sine','size-text','size?','skip','sort','source','span?',
+            'split-path','square-root','strict-equal?','strict-not-equal?',
+            'string?','struct?','stylize','subtract','suffix?','tag?','tail',
+            'tail?','tangent','third','time?','to','to-binary','to-bitset',
+            'to-block','to-char','to-date','to-decimal','to-email','to-file',
+            'to-get-word','to-hash','to-hex','to-idate','to-image','to-integer',
+            'to-issue','to-list','to-lit-path','to-lit-word','to-local-file',
+            'to-logic','to-money','to-pair','to-paren','to-path',
+            'to-rebol-file','to-refinement','to-set-path','to-set-word',
+            'to-string','to-tag','to-time','to-tuple','to-url','to-word',
+            'trace','trim','tuple?','type?','unfocus','union','unique',
+            'unprotect','unset','unset?','unview','update','upgrade',
+            'uppercase','url?','usage','use','value?','view','viewed?','what',
+            'what-dir','within?','word?','write','write-io','xor','zero?',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+//        2 => 'includes/dico_rebol.php?word={FNAME}',
+//        3 => 'includes/dico_rebol.php?word={FNAME}'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/reg.php b/vendor/easybook/geshi/geshi/reg.php
new file mode 100755
index 000000000..2034d5adb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/reg.php
@@ -0,0 +1,231 @@
+<?php
+/*************************************************************************************
+ * reg.php
+ * -------
+ * Author: Sean Hanna (smokingrope@gmail.com)
+ * Copyright: (c) 2006 Sean Hanna
+ * Release Version: 1.0.8.11
+ * Date Started: 03/15/2006
+ *
+ * Microsoft Registry Editor language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *  -  Updated and optimized most regular expressions
+ * 03/15/2006 (0.5.0)
+ *  -  Syntax File Created
+ * 04/27/2006 (0.9.5)
+ *  -  Syntax Coloring Cleaned Up
+ *  -  First Release
+ * 04/29/2006 (1.0.0)
+ *  -  Updated a few coloring settings
+ *
+ * TODO (updated 4/27/2006)
+ * -------------------------
+ * - Add a verification to the multi-line portion of the hex field regex
+ *    for a '\' character on the line preceding the line of the multi-line
+ *    hex field.
+ *
+ * KNOWN ISSUES (updated 4/27/2006)
+ * ---------------------------------
+ *
+ * - There are two regexes for the multiline hex value regex. The regex for
+ *        all lines after the first does not verify that the previous line contains
+ *        a line continuation character '\'. This regex also does not check for
+ *        end of line as it should.
+ *
+ * - If number_highlighting is enabled during processing of this syntax file
+ *    many of the regexps used will appear slightly incorrect.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'Microsoft Registry',
+    'COMMENT_SINGLE' => array(1 =>';'),
+    'COMMENT_MULTI' => array( ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+//        1 => array(),
+//        2 => array(),
+        /* Registry Key Constants Not Used */
+        3 => array(
+            'HKEY_LOCAL_MACHINE',
+            'HKEY_CLASSES_ROOT',
+            'HKEY_CURRENT_USER',
+            'HKEY_USERS',
+            'HKEY_CURRENT_CONFIG',
+            'HKEY_DYN_DATA',
+            'HKLM', 'HKCR', 'HKCU', 'HKU', 'HKCC', 'HKDD'
+            )
+        ),
+    'SYMBOLS' => array(
+        '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+//        1 => false,
+//        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+//            1 => 'color: #00CCFF;',
+//            2 => 'color: #0000FF;',
+            3 => 'color: #800000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #009900;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00CCFF;',
+            1 => 'color: #0000FF;',
+            2 => '',
+            3 => 'color: #0000FF;',
+            4 => 'color: #0000FF;',
+            5 => '',
+            6 => '',
+            7 => '',
+            8 => 'color: #FF6600;',
+            )
+        ),
+    'URLS' => array(
+//        1 => '',
+//        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Highlight Key Delimiters
+        0 => array(
+            GESHI_SEARCH => '((^|\\n)\\s*)(\\\\\\[(.*)\\\\\\])(\\s*(\\n|$))',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\5'
+//            GESHI_CLASS => 'kw1'
+            ),
+        // Highlight File Format Header Version 5
+        1 => array(
+            GESHI_SEARCH => '(^\s*)(Windows Registry Editor Version \d+\.\d+)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_registry_header'
+            ),
+        // Highlight File Format Header Version 4
+        2 => array(
+            GESHI_SEARCH => '(^\\s*)(REGEDIT\s?\d+)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_registry_header'
+            ),
+        // Highlight dword: 32 bit integer values
+        3 => array(
+            GESHI_SEARCH => '(=\s*)(dword:[0-9a-fA-F]{8})(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+//            GESHI_CLASS => 'kw2'
+            ),
+        // Highlight variable names
+        4 => array(
+            GESHI_SEARCH => '(^\s*)(\&quot;.*?\&quot;)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_variable'
+            ),
+        // Highlight String Values
+        5 => array(
+            GESHI_SEARCH => '(=\s*)(\&quot;.*?\&quot;)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'st0'
+            ),
+        // Highlight Hexadecimal Values (Single-Line and Multi-Line)
+        6 => array(
+            GESHI_SEARCH => '(=\s*\n?\s*)(hex:[0-9a-fA-F]{2}(,(\\\s*\n\s*)?[0-9a-fA-F]{2})*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '',
+            GESHI_CLASS => 'kw2'
+            ),
+        // Highlight Default Variable
+        7 => array(
+            GESHI_SEARCH => '(^\s*)(@)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_variable'
+            ),
+        // Highlight GUID's found anywhere.
+        8 => array(
+            GESHI_SEARCH => '(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\})',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            GESHI_CLASS => 'geshi_guid'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/rexx.php b/vendor/easybook/geshi/geshi/rexx.php
new file mode 100755
index 000000000..1189ac5be
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/rexx.php
@@ -0,0 +1,160 @@
+<?php
+/*************************************************************************************
+ * rexx.php
+ * ---------------------------------
+ * Author: Jon Wolfers (sahananda@windhorse.biz)
+ * Contributors:
+ *    - Walter Pachl (pachl@chello.at)
+ * Copyright: (c) 2008 Jon Wolfers, (c) 2012 Walter Pachl
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/01/07
+ *
+ * Rexx language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/07/29 (1.0.0)
+ *    -  tried to get it syntactically right
+ *
+ * TODO (updated 2012/07/29)
+ * -------------------------
+ *   -  Get it working on rosettacode.org
+ *
+ *************************************************************************************
+ *
+ *      This file is part of GeSHi.
+ *
+ *    GeSHi is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    GeSHi is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with GeSHi; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'rexx',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'address', 'arg', 'attribute', 'call', 'constant', 'do',
+            'drop', 'exit', 'forward', 'if',
+            'interpret', 'iterate', 'leave', 'loop', 'nop', 'numeric',
+            'options', 'parse', 'procedure', 'pull', 'push', 'queue',
+            'raise', 'return', 'say', 'select', 'signal', 'trace'
+            ),
+        2 => array(
+            'by', 'digits', 'engineering', 'error', 'expose',
+            'failure', 'for', 'forever', 'form', 'fuzz', 'halt',
+            'name', 'novalue', 'off', 'on', 'over', 'scientific', 'source',
+            'syntax', 'to', 'until', 'upper', 'version',
+            'while', 'with'
+            ),
+        3 => array(
+            'else', 'end', 'otherwise', 'then', 'when'
+            ),
+        4 => array(
+            'rc', 'result', 'sigl'
+            ),
+        5 => array(
+            'placeholderforoorexxdirectives'
+            ),
+        6 => array(
+            'abbrev', 'abs', 'beep', 'bitand', 'bitor',
+            'bitxor', 'b2x', 'center', 'centre', 'changestr', 'charin',
+            'charout', 'chars', 'compare', 'condition', 'copies',
+            'countstr', 'c2d', 'c2x', 'datatype', 'date', 'delstr',
+            'delword', 'directory', 'd2c', 'd2x', 'endlocal',
+            'errortext', 'filespec', 'format', 'insert',
+            'lastpos', 'left', 'length', 'linein', 'lineout', 'lines',
+            'lower', 'max', 'min', 'overlay', 'pos', 'queued', 'random',
+            'reverse', 'right', 'rxfuncadd', 'rxfuncdrop', 'rxfuncquery',
+            'rxqueue', 'setlocal', 'sign', 'sourceline', 'space',
+            'stream', 'strip', 'substr', 'subword', 'symbol', 'time',
+            'translate', 'trunc', 'userid', 'value',
+            'var', 'verify', 'word', 'wordindex', 'wordlength', 'wordpos',
+            'words', 'xrange', 'x2b', 'x2c', 'x2d'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '<', '>', '=', '+', '-', '*', '**', '/', '|', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            3 => 'color: #00ff00; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;',
+            5 => 'color: #880088; font-weight: bold;',
+            6 => 'color: #888800; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            'MULTI' => 'color: #808080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/robots.php b/vendor/easybook/geshi/geshi/robots.php
new file mode 100755
index 000000000..0b75f7111
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/robots.php
@@ -0,0 +1,100 @@
+<?php
+/*************************************************************************************
+ * robots.php
+ * --------
+ * Author: Christian Lescuyer (cl@goelette.net)
+ * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/02/17
+ *
+ * robots.txt language file for GeSHi.
+ *
+ * 2006/02/17 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'robots.txt',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => "/^Comment:.*?/m"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Allow', 'Crawl-delay', 'Disallow', 'Request-rate', 'Robot-version',
+            'Sitemap', 'User-agent', 'Visit-time'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.robotstxt.org/wc/norobots.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/rpmspec.php b/vendor/easybook/geshi/geshi/rpmspec.php
new file mode 100755
index 000000000..fd6a561f8
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/rpmspec.php
@@ -0,0 +1,133 @@
+<?php
+/*************************************************************************************
+ * rpmspec.php
+ * ---------------------------------
+ * Author: Paul Grinberg (gri6507 TA unity-linux TOD org)
+ * Copyright: (c) 2010 Paul Grinberg
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/04/27
+ *
+ * RPM Spec language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/04/27 (0.1)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'RPM Specification File',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'QUOTEMARKS' => array('"','`'),
+    'ESCAPE_CHAR' => '\\',
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|', '^',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', '.', ':'
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #009999;',
+            3 => 'color: #000000; font-weight: bold;',
+            4 => 'color: #ff6600; font-style: italic;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'REGEXPS' => array(
+        1 => array(
+            // search for generic macros
+            GESHI_SEARCH => '(%{?[a-zA-Z0-9_]+}?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        2 => array(
+            // search for special macros
+            GESHI_SEARCH => '(%(?:define|patch\d*|mklibname|mkrel|configure\S+|makeinstall\S+|make_session|make|defattr|config|doc|setup))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        3 => array (
+            // special definitions
+            GESHI_SEARCH => '((?:summary|license|buildroot|buildrequires|provides|version|release|source\d*|group|buildarch|autoreqprov|provides|obsoletes|vendor|distribution|suggests|autoreq|autoprov|conflicts|name|url|requires|patch\d*):)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        4 => array (
+            // section delimiting words
+            GESHI_SEARCH => '(%(?:description|package|prep|build|install|clean|postun|preun|post|pre|files|changelog))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/rsplus.php b/vendor/easybook/geshi/geshi/rsplus.php
new file mode 100755
index 000000000..e8a4e722b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/rsplus.php
@@ -0,0 +1,483 @@
+<?php
+/*************************************************************************************
+ * rsplus.php
+ * ———–
+ * Author: Ron Fredericks (ronf@LectureMaker.com)
+ * Contributors:
+ *  - Benilton Carvalho (beniltoncarvalho@gmail.com)
+ *  - Fernando Henrique Ferraz Pereira da Rosa (mentus@gmail.com)
+ * Copyright: (c) 2009 Ron Fredericks (http://www.LectureMaker.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/03/28
+ *
+ * R language file for GeSHi.
+ *
+ * CHANGES
+ * ——-
+ * 2009/04/06
+ *   -  Add references to Sekhon’s R Package docs
+ * 2009/03/29 (1.0.8.5)
+ *   -  First Release
+ * 2009/07/16 (1.0.8.6)
+ *   - Added functions from base packages (Benilton Carvalho - carvalho@bclab.org)
+ *
+ * References
+ * ———-
+ * Some online R Package documentation:
+ *     http://sekhon.berkeley.edu/library/index.html         2.4 docs
+ *     http://astrostatistics.psu.edu/su07/R/html            2.5 docs
+ *
+ * Another R GeSHi with no meat?
+ *     http://organicdesign.co.nz/GeSHi/R.php
+ * SourceForge R discussion:
+ *     http://sourceforge.net/tracker/?func=detail&aid=2276025&group_id=114997&atid=670234
+ *
+ * TODO (updated 2007/02/06)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'R / S+',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'else','global','in', 'otherwise','persistent',
+            ),
+        2 => array( // base package
+            '$.package_version', '$<-', '$<-.data.frame', 'abbreviate', 'abs', 'acos', 'acosh', 'addNA', 'addTaskCallback',
+            'agrep', 'alist', 'all', 'all.equal', 'all.equal.character', 'all.equal.default', 'all.equal.factor',
+            'all.equal.formula', 'all.equal.language', 'all.equal.list', 'all.equal.numeric', 'all.equal.POSIXct',
+            'all.equal.raw', 'all.names', 'all.vars', 'any', 'aperm', 'append', 'apply', 'Arg', 'args', 'array', 'as.array',
+            'as.array.default', 'as.call', 'as.character', 'as.character.condition', 'as.character.Date', 'as.character.default',
+            'as.character.error', 'as.character.factor', 'as.character.hexmode', 'as.character.numeric_version', 'as.character.octmode',
+            'as.character.POSIXt', 'as.character.srcref', 'as.complex', 'as.data.frame', 'as.data.frame.array', 'as.data.frame.AsIs',
+            'as.data.frame.character', 'as.data.frame.complex', 'as.data.frame.data.frame', 'as.data.frame.Date', 'as.data.frame.default',
+            'as.data.frame.difftime', 'as.data.frame.factor', 'as.data.frame.integer', 'as.data.frame.list', 'as.data.frame.logical',
+            'as.data.frame.matrix', 'as.data.frame.model.matrix', 'as.data.frame.numeric', 'as.data.frame.numeric_version',
+            'as.data.frame.ordered', 'as.data.frame.POSIXct', 'as.data.frame.POSIXlt', 'as.data.frame.raw', 'as.data.frame.table',
+            'as.data.frame.ts', 'as.data.frame.vector', 'as.Date', 'as.Date.character', 'as.Date.date', 'as.Date.dates',
+            'as.Date.default', 'as.Date.factor', 'as.Date.numeric', 'as.Date.POSIXct', 'as.Date.POSIXlt', 'as.difftime', 'as.double',
+            'as.double.difftime', 'as.double.POSIXlt', 'as.environment', 'as.expression', 'as.expression.default', 'as.factor',
+            'as.function', 'as.function.default', 'as.hexmode', 'as.integer', 'as.list', 'as.list.data.frame', 'as.list.default',
+            'as.list.environment', 'as.list.factor', 'as.list.function', 'as.list.numeric_version', 'as.logical', 'as.matrix',
+            'as.matrix.data.frame', 'as.matrix.default', 'as.matrix.noquote', 'as.matrix.POSIXlt', 'as.name', 'as.null', 'as.null.default',
+            'as.numeric', 'as.numeric_version', 'as.octmode', 'as.ordered', 'as.package_version', 'as.pairlist', 'as.POSIXct',
+            'as.POSIXct.date', 'as.POSIXct.Date', 'as.POSIXct.dates', 'as.POSIXct.default', 'as.POSIXct.numeric', 'as.POSIXct.POSIXlt',
+            'as.POSIXlt', 'as.POSIXlt.character', 'as.POSIXlt.date', 'as.POSIXlt.Date', 'as.POSIXlt.dates', 'as.POSIXlt.default',
+            'as.POSIXlt.factor', 'as.POSIXlt.numeric', 'as.POSIXlt.POSIXct', 'as.qr', 'as.raw', 'as.real', 'as.single',
+            'as.single.default', 'as.symbol', 'as.table', 'as.table.default', 'as.vector', 'as.vector.factor', 'asin', 'asinh',
+            'asNamespace', 'asS4', 'assign', 'atan', 'atan2', 'atanh', 'attach', 'attachNamespace', 'attr', 'attr.all.equal',
+            'attr<-', 'attributes', 'attributes<-', 'autoload', 'autoloader', 'backsolve', 'baseenv', 'basename', 'besselI',
+            'besselJ', 'besselK', 'besselY', 'beta', 'bindingIsActive', 'bindingIsLocked', 'bindtextdomain', 'body', 'body<-',
+            'bquote', 'break', 'browser', 'builtins', 'by', 'by.data.frame', 'by.default', 'bzfile', 'c', 'c.Date', 'c.noquote',
+            'c.numeric_version', 'c.POSIXct', 'c.POSIXlt', 'call', 'callCC', 'capabilities', 'casefold', 'cat', 'category',
+            'cbind', 'cbind.data.frame', 'ceiling', 'char.expand', 'character', 'charmatch', 'charToRaw', 'chartr', 'check_tzones',
+            'chol', 'chol.default', 'chol2inv', 'choose', 'class', 'class<-', 'close', 'close.connection', 'close.srcfile',
+            'closeAllConnections', 'codes', 'codes.factor', 'codes.ordered', 'codes<-', 'col', 'colMeans', 'colnames',
+            'colnames<-', 'colSums', 'commandArgs', 'comment', 'comment<-', 'complex', 'computeRestarts', 'conditionCall',
+            'conditionCall.condition', 'conditionMessage', 'conditionMessage.condition', 'conflicts', 'Conj', 'contributors',
+            'cos', 'cosh', 'crossprod', 'Cstack_info', 'cummax', 'cummin', 'cumprod', 'cumsum', 'cut', 'cut.Date', 'cut.default',
+            'cut.POSIXt', 'data.class', 'data.frame', 'data.matrix', 'date', 'debug', 'default.stringsAsFactors', 'delay',
+            'delayedAssign', 'deparse', 'det', 'detach', 'determinant', 'determinant.matrix', 'dget', 'diag', 'diag<-', 'diff',
+            'diff.Date', 'diff.default', 'diff.POSIXt', 'difftime', 'digamma', 'dim', 'dim.data.frame', 'dim<-', 'dimnames',
+            'dimnames.data.frame', 'dimnames<-', 'dimnames<-.data.frame', 'dir', 'dir.create', 'dirname', 'do.call', 'double',
+            'dput', 'dQuote', 'drop', 'dump', 'duplicated', 'duplicated.array', 'duplicated.data.frame', 'duplicated.default',
+            'duplicated.matrix', 'duplicated.numeric_version', 'duplicated.POSIXlt', 'dyn.load', 'dyn.unload', 'eapply', 'eigen',
+            'emptyenv', 'encodeString', 'Encoding', 'Encoding<-', 'env.profile', 'environment', 'environment<-', 'environmentIsLocked',
+            'environmentName', 'eval', 'eval.parent', 'evalq', 'exists', 'exp', 'expand.grid', 'expm1', 'expression', 'F', 'factor',
+            'factorial', 'fifo', 'file', 'file.access', 'file.append', 'file.choose', 'file.copy', 'file.create', 'file.exists',
+            'file.info', 'file.path', 'file.remove', 'file.rename', 'file.show', 'file.symlink', 'Filter', 'Find', 'findInterval',
+            'findPackageEnv', 'findRestart', 'floor', 'flush', 'flush.connection', 'for', 'force', 'formals', 'formals<-',
+            'format', 'format.AsIs', 'format.char', 'format.data.frame', 'format.Date', 'format.default', 'format.difftime',
+            'format.factor', 'format.hexmode', 'format.info', 'format.octmode', 'format.POSIXct', 'format.POSIXlt',
+            'format.pval', 'formatC', 'formatDL', 'forwardsolve', 'function', 'gamma', 'gammaCody', 'gc', 'gc.time',
+            'gcinfo', 'gctorture', 'get', 'getAllConnections', 'getCallingDLL', 'getCallingDLLe', 'getCConverterDescriptions',
+            'getCConverterStatus', 'getConnection', 'getDLLRegisteredRoutines', 'getDLLRegisteredRoutines.character',
+            'getDLLRegisteredRoutines.DLLInfo', 'getenv', 'geterrmessage', 'getExportedValue', 'getHook', 'getLoadedDLLs',
+            'getNamespace', 'getNamespaceExports', 'getNamespaceImports', 'getNamespaceInfo', 'getNamespaceName',
+            'getNamespaceUsers', 'getNamespaceVersion', 'getNativeSymbolInfo', 'getNumCConverters', 'getOption', 'getRversion',
+            'getSrcLines', 'getTaskCallbackNames', 'gettext', 'gettextf', 'getwd', 'gl', 'globalenv', 'gregexpr', 'grep',
+            'grepl', 'gsub', 'gzcon', 'gzfile', 'httpclient', 'I', 'iconv', 'iconvlist', 'icuSetCollate', 'identical', 'identity',
+            'if', 'ifelse', 'Im', 'importIntoEnv', 'inherits', 'integer', 'interaction', 'interactive', 'intersect', 'intToBits',
+            'intToUtf8', 'inverse.rle', 'invisible', 'invokeRestart', 'invokeRestartInteractively', 'is.array', 'is.atomic',
+            'is.call', 'is.character', 'is.complex', 'is.data.frame', 'is.double', 'is.element', 'is.environment',
+            'is.expression', 'is.factor', 'is.finite', 'is.function', 'is.infinite', 'is.integer', 'is.language',
+            'is.list', 'is.loaded', 'is.logical', 'is.matrix', 'is.na', 'is.na.data.frame', 'is.na.POSIXlt', 'is.na<-',
+            'is.na<-.default', 'is.na<-.factor', 'is.name', 'is.nan', 'is.null', 'is.numeric', 'is.numeric_version',
+            'is.numeric.Date', 'is.numeric.POSIXt', 'is.object', 'is.ordered', 'is.package_version', 'is.pairlist', 'is.primitive',
+            'is.qr', 'is.R', 'is.raw', 'is.real', 'is.recursive', 'is.single', 'is.symbol', 'is.table', 'is.unsorted', 'is.vector',
+            'isBaseNamespace', 'isdebugged', 'isIncomplete', 'isNamespace', 'ISOdate', 'ISOdatetime', 'isOpen', 'isRestart', 'isS4',
+            'isSeekable', 'isSymmetric', 'isSymmetric.matrix', 'isTRUE', 'jitter', 'julian', 'julian.Date', 'julian.POSIXt', 'kappa',
+            'kappa.default', 'kappa.lm', 'kappa.qr', 'kappa.tri', 'kronecker', 'l10n_info', 'La.chol', 'La.chol2inv', 'La.eigen',
+            'La.svd', 'labels', 'labels.default', 'lapply', 'lazyLoad', 'lazyLoadDBfetch', 'lbeta', 'lchoose', 'length', 'length<-',
+            'length<-.factor', 'letters', 'LETTERS', 'levels', 'levels.default', 'levels<-', 'levels<-.factor', 'lfactorial', 'lgamma',
+            'library', 'library.dynam', 'library.dynam.unload', 'licence', 'license', 'list', 'list.files', 'load', 'loadedNamespaces',
+            'loadingNamespaceInfo', 'loadNamespace', 'loadURL', 'local', 'lockBinding', 'lockEnvironment', 'log', 'log10', 'log1p', 'log2',
+            'logb', 'logical', 'lower.tri', 'ls', 'machine', 'Machine', 'make.names', 'make.unique', 'makeActiveBinding', 'manglePackageName',
+            'Map', 'mapply', 'margin.table', 'mat.or.vec', 'match', 'match.arg', 'match.call', 'match.fun', 'Math.data.frame', 'Math.Date',
+            'Math.difftime', 'Math.factor', 'Math.POSIXt', 'matrix', 'max', 'max.col', 'mean', 'mean.data.frame', 'mean.Date', 'mean.default',
+            'mean.difftime', 'mean.POSIXct', 'mean.POSIXlt', 'mem.limits', 'memory.profile', 'merge', 'merge.data.frame', 'merge.default',
+            'message', 'mget', 'min', 'missing', 'Mod', 'mode', 'mode<-', 'month.abb', 'month.name', 'months', 'months.Date',
+            'months.POSIXt', 'mostattributes<-', 'names', 'names<-', 'namespaceExport', 'namespaceImport', 'namespaceImportClasses',
+            'namespaceImportFrom', 'namespaceImportMethods', 'nargs', 'nchar', 'ncol', 'NCOL', 'Negate', 'new.env', 'next', 'NextMethod',
+            'ngettext', 'nlevels', 'noquote', 'nrow', 'NROW', 'numeric', 'numeric_version', 'nzchar', 'objects', 'oldClass',
+            'oldClass<-', 'on.exit', 'open', 'open.connection', 'open.srcfile', 'open.srcfilecopy', 'Ops.data.frame', 'Ops.Date',
+            'Ops.difftime', 'Ops.factor', 'Ops.numeric_version', 'Ops.ordered', 'Ops.POSIXt', 'options', 'order', 'ordered',
+            'outer', 'package_version', 'package.description', 'packageEvent', 'packageHasNamespace', 'packageStartupMessage',
+            'packBits', 'pairlist', 'parent.env', 'parent.env<-', 'parent.frame', 'parse', 'parse.dcf', 'parseNamespaceFile',
+            'paste', 'path.expand', 'pentagamma', 'pi', 'pipe', 'Platform', 'pmatch', 'pmax', 'pmax.int', 'pmin', 'pmin.int',
+            'polyroot', 'pos.to.env', 'Position', 'pretty', 'prettyNum', 'print', 'print.AsIs', 'print.atomic', 'print.by',
+            'print.condition', 'print.connection', 'print.data.frame', 'print.Date', 'print.default', 'print.difftime',
+            'print.DLLInfo', 'print.DLLInfoList', 'print.DLLRegisteredRoutines', 'print.factor', 'print.hexmode', 'print.libraryIQR',
+            'print.listof', 'print.NativeRoutineList', 'print.noquote', 'print.numeric_version', 'print.octmode', 'print.packageInfo',
+            'print.POSIXct', 'print.POSIXlt', 'print.proc_time', 'print.restart', 'print.rle', 'print.simple.list',
+            'print.srcfile', 'print.srcref', 'print.summary.table', 'print.table', 'print.warnings', 'printNoClass',
+            'prmatrix', 'proc.time', 'prod', 'prop.table', 'provide', 'psigamma', 'pushBack', 'pushBackLength', 'q', 'qr',
+            'qr.coef', 'qr.default', 'qr.fitted', 'qr.Q', 'qr.qty', 'qr.qy', 'qr.R', 'qr.resid', 'qr.solve', 'qr.X', 'quarters',
+            'quarters.Date', 'quarters.POSIXt', 'quit', 'quote', 'R_system_version', 'R.home', 'R.version', 'R.Version',
+            'R.version.string', 'range', 'range.default', 'rank', 'rapply', 'raw', 'rawConnection', 'rawConnectionValue',
+            'rawShift', 'rawToBits', 'rawToChar', 'rbind', 'rbind.data.frame', 'rcond', 'Re', 'read.dcf', 'read.table.url',
+            'readBin', 'readChar', 'readline', 'readLines', 'real', 'Recall', 'Reduce', 'reg.finalizer', 'regexpr',
+            'registerS3method', 'registerS3methods', 'remove', 'removeCConverter', 'removeTaskCallback', 'rep', 'rep.Date',
+            'rep.factor', 'rep.int', 'rep.numeric_version', 'rep.POSIXct', 'rep.POSIXlt', 'repeat', 'replace', 'replicate',
+            'require', 'restart', 'restartDescription', 'restartFormals', 'retracemem', 'return', 'rev', 'rev.default', 'rle',
+            'rm', 'RNGkind', 'RNGversion', 'round', 'round.Date', 'round.difftime', 'round.POSIXt', 'row', 'row.names',
+            'row.names.data.frame', 'row.names.default', 'row.names<-', 'row.names<-.data.frame', 'row.names<-.default',
+            'rowMeans', 'rownames', 'rownames<-', 'rowsum', 'rowsum.data.frame', 'rowsum.default', 'rowSums', 'sample',
+            'sample.int', 'sapply', 'save', 'save.image', 'saveNamespaceImage', 'scale', 'scale.default', 'scan', 'scan.url',
+            'search', 'searchpaths', 'seek', 'seek.connection', 'seq', 'seq_along', 'seq_len', 'seq.Date', 'seq.default',
+            'seq.int', 'seq.POSIXt', 'sequence', 'serialize', 'set.seed', 'setCConverterStatus', 'setdiff', 'setequal',
+            'setHook', 'setNamespaceInfo', 'setSessionTimeLimit', 'setTimeLimit', 'setwd', 'showConnections', 'shQuote',
+            'sign', 'signalCondition', 'signif', 'simpleCondition', 'simpleError', 'simpleMessage', 'simpleWarning', 'sin',
+            'single', 'sinh', 'sink', 'sink.number', 'slice.index', 'socketConnection', 'socketSelect', 'solve', 'solve.default',
+            'solve.qr', 'sort', 'sort.default', 'sort.int', 'sort.list', 'sort.POSIXlt', 'source', 'source.url', 'split',
+            'split.data.frame', 'split.Date', 'split.default', 'split.POSIXct', 'split<-', 'split<-.data.frame', 'split<-.default',
+            'sprintf', 'sqrt', 'sQuote', 'srcfile', 'srcfilecopy', 'srcref', 'standardGeneric', 'stderr', 'stdin', 'stdout',
+            'stop', 'stopifnot', 'storage.mode', 'storage.mode<-', 'strftime', 'strptime', 'strsplit', 'strtrim', 'structure',
+            'strwrap', 'sub', 'subset', 'subset.data.frame', 'subset.default', 'subset.matrix', 'substitute', 'substr',
+            'substr<-', 'substring', 'substring<-', 'sum', 'summary', 'summary.connection', 'summary.data.frame',
+            'Summary.data.frame', 'summary.Date', 'Summary.Date', 'summary.default', 'Summary.difftime',
+            'summary.factor', 'Summary.factor', 'summary.matrix', 'Summary.numeric_version', 'summary.POSIXct',
+            'Summary.POSIXct', 'summary.POSIXlt', 'Summary.POSIXlt', 'summary.table', 'suppressMessages',
+            'suppressPackageStartupMessages', 'suppressWarnings', 'svd', 'sweep', 'switch', 'symbol.C',
+            'symbol.For', 'sys.call', 'sys.calls', 'Sys.chmod', 'Sys.Date', 'sys.frame', 'sys.frames',
+            'sys.function', 'Sys.getenv', 'Sys.getlocale', 'Sys.getpid', 'Sys.glob', 'Sys.info', 'sys.load.image',
+            'Sys.localeconv', 'sys.nframe', 'sys.on.exit', 'sys.parent', 'sys.parents', 'Sys.putenv',
+            'sys.save.image', 'Sys.setenv', 'Sys.setlocale', 'Sys.sleep', 'sys.source', 'sys.status',
+            'Sys.time', 'Sys.timezone', 'Sys.umask', 'Sys.unsetenv', 'Sys.which', 'system', 'system.file',
+            'system.time', 't', 'T', 't.data.frame', 't.default', 'table', 'tabulate', 'tan', 'tanh', 'tapply',
+            'taskCallbackManager', 'tcrossprod', 'tempdir', 'tempfile', 'testPlatformEquivalence', 'tetragamma',
+            'textConnection', 'textConnectionValue', 'tolower', 'topenv', 'toString', 'toString.default', 'toupper',
+            'trace', 'traceback', 'tracemem', 'tracingState', 'transform', 'transform.data.frame', 'transform.default',
+            'trigamma', 'trunc', 'trunc.Date', 'trunc.POSIXt', 'truncate', 'truncate.connection', 'try', 'tryCatch',
+            'typeof', 'unclass', 'undebug', 'union', 'unique', 'unique.array', 'unique.data.frame', 'unique.default',
+            'unique.matrix', 'unique.numeric_version', 'unique.POSIXlt', 'units', 'units.difftime', 'units<-',
+            'units<-.difftime', 'unix', 'unix.time', 'unlink', 'unlist', 'unloadNamespace', 'unlockBinding',
+            'unname', 'unserialize', 'unsplit', 'untrace', 'untracemem', 'unz', 'upper.tri', 'url', 'UseMethod',
+            'utf8ToInt', 'vector', 'Vectorize', 'version', 'Version', 'warning', 'warnings', 'weekdays',
+            'weekdays.Date', 'weekdays.POSIXt', 'which', 'which.max', 'which.min', 'while', 'with',
+            'with.default', 'withCallingHandlers', 'within', 'within.data.frame', 'within.list', 'withRestarts',
+            'withVisible', 'write', 'write.dcf', 'write.table0', 'writeBin', 'writeChar', 'writeLines', 'xor',
+            'xpdrows.data.frame', 'xtfrm', 'xtfrm.Date', 'xtfrm.default', 'xtfrm.factor', 'xtfrm.numeric_version',
+            'xtfrm.POSIXct', 'xtfrm.POSIXlt', 'xtfrm.Surv', 'zapsmall',
+            ),
+        3 => array( // Datasets
+            'ability.cov', 'airmiles', 'AirPassengers', 'airquality',
+            'anscombe', 'attenu', 'attitude', 'austres', 'beaver1',
+            'beaver2', 'BJsales', 'BJsales.lead', 'BOD', 'cars',
+            'ChickWeight', 'chickwts', 'co2', 'crimtab',
+            'discoveries', 'DNase', 'esoph', 'euro', 'euro.cross',
+            'eurodist', 'EuStockMarkets', 'faithful', 'fdeaths',
+            'Formaldehyde', 'freeny', 'freeny.x', 'freeny.y',
+            'HairEyeColor', 'Harman23.cor', 'Harman74.cor', 'Indometh',
+            'infert', 'InsectSprays', 'iris', 'iris3', 'islands',
+            'JohnsonJohnson', 'LakeHuron', 'ldeaths', 'lh', 'LifeCycleSavings',
+            'Loblolly', 'longley', 'lynx', 'mdeaths', 'morley', 'mtcars',
+            'nhtemp', 'Nile', 'nottem', 'occupationalStatus', 'Orange',
+            'OrchardSprays', 'PlantGrowth', 'precip', 'presidents',
+            'pressure', 'Puromycin', 'quakes', 'randu', 'rivers', 'rock',
+            'Seatbelts', 'sleep', 'stack.loss', 'stack.x', 'stackloss',
+            'state.abb', 'state.area', 'state.center', 'state.division',
+            'state.name', 'state.region', 'state.x77', 'sunspot.month',
+            'sunspot.year', 'sunspots', 'swiss', 'Theoph', 'Titanic', 'ToothGrowth',
+            'treering', 'trees', 'UCBAdmissions', 'UKDriverDeaths', 'UKgas',
+            'USAccDeaths', 'USArrests', 'USJudgeRatings', 'USPersonalExpenditure',
+            'uspop', 'VADeaths', 'volcano', 'warpbreaks', 'women', 'WorldPhones',
+            'WWWusage',
+            ),
+        4 => array( // graphics package
+            'abline', 'arrows', 'assocplot', 'axis', 'Axis', 'axis.Date', 'axis.POSIXct',
+            'axTicks', 'barplot', 'barplot.default', 'box', 'boxplot', 'boxplot.default',
+            'boxplot.matrix', 'bxp', 'cdplot', 'clip', 'close.screen', 'co.intervals',
+            'contour', 'contour.default', 'coplot', 'curve', 'dotchart', 'erase.screen',
+            'filled.contour', 'fourfoldplot', 'frame', 'grconvertX', 'grconvertY', 'grid',
+            'hist', 'hist.default', 'identify', 'image', 'image.default', 'layout',
+            'layout.show', 'lcm', 'legend', 'lines', 'lines.default', 'locator', 'matlines',
+            'matplot', 'matpoints', 'mosaicplot', 'mtext', 'pairs', 'pairs.default',
+            'panel.smooth', 'par', 'persp', 'pie', 'piechart', 'plot', 'plot.default',
+            'plot.design', 'plot.new', 'plot.window', 'plot.xy', 'points', 'points.default',
+            'polygon', 'rect', 'rug', 'screen', 'segments', 'smoothScatter', 'spineplot',
+            'split.screen', 'stars', 'stem', 'strheight', 'stripchart', 'strwidth', 'sunflowerplot',
+            'symbols', 'text', 'text.default', 'title', 'xinch', 'xspline', 'xyinch', 'yinch',
+            ),
+        5 => array( // grDevices pkg
+            'as.graphicsAnnot', 'bitmap', 'blues9', 'bmp', 'boxplot.stats', 'cairo_pdf', 'cairo_ps', 'check.options',
+            'chull', 'CIDFont', 'cm', 'cm.colors', 'col2rgb', 'colorConverter', 'colorRamp', 'colorRampPalette',
+            'colors', 'colorspaces', 'colours', 'contourLines', 'convertColor', 'densCols', 'dev.control', 'dev.copy',
+            'dev.copy2eps', 'dev.copy2pdf', 'dev.cur', 'dev.interactive', 'dev.list', 'dev.new', 'dev.next', 'dev.off',
+            'dev.prev', 'dev.print', 'dev.set', 'dev.size', 'dev2bitmap', 'devAskNewPage', 'deviceIsInteractive',
+            'embedFonts', 'extendrange', 'getGraphicsEvent', 'graphics.off', 'gray', 'gray.colors', 'grey', 'grey.colors',
+            'hcl', 'heat.colors', 'Hershey', 'hsv', 'jpeg', 'make.rgb', 'n2mfrow', 'nclass.FD', 'nclass.scott',
+            'nclass.Sturges', 'palette', 'pdf', 'pdf.options', 'pdfFonts', 'pictex', 'png', 'postscript', 'postscriptFont',
+            'postscriptFonts', 'ps.options', 'quartz', 'quartz.options', 'quartzFont', 'quartzFonts', 'rainbow',
+            'recordGraphics', 'recordPlot', 'replayPlot', 'rgb', 'rgb2hsv', 'savePlot', 'setEPS', 'setPS', 'svg',
+            'terrain.colors', 'tiff', 'topo.colors', 'trans3d', 'Type1Font', 'x11', 'X11', 'X11.options', 'X11Font',
+            'X11Fonts', 'xfig', 'xy.coords', 'xyTable', 'xyz.coords',
+            ),
+        6 => array( // methods package
+            'addNextMethod', 'allGenerics', 'allNames', 'Arith', 'as', 'as<-',
+            'asMethodDefinition', 'assignClassDef', 'assignMethodsMetaData', 'balanceMethodsList',
+            'cacheGenericsMetaData', 'cacheMetaData', 'cacheMethod', 'callGeneric',
+            'callNextMethod', 'canCoerce', 'cbind2', 'checkSlotAssignment', 'classesToAM',
+            'classMetaName', 'coerce', 'coerce<-', 'Compare', 'completeClassDefinition',
+            'completeExtends', 'completeSubclasses', 'Complex', 'conformMethod', 'defaultDumpName',
+            'defaultPrototype', 'doPrimitiveMethod', 'dumpMethod', 'dumpMethods', 'el', 'el<-',
+            'elNamed', 'elNamed<-', 'empty.dump', 'emptyMethodsList', 'existsFunction', 'existsMethod',
+            'extends', 'finalDefaultMethod', 'findClass', 'findFunction', 'findMethod', 'findMethods',
+            'findMethodSignatures', 'findUnique', 'fixPre1.8', 'formalArgs', 'functionBody',
+            'functionBody<-', 'generic.skeleton', 'getAccess', 'getAllMethods', 'getAllSuperClasses',
+            'getClass', 'getClassDef', 'getClasses', 'getClassName', 'getClassPackage', 'getDataPart',
+            'getExtends', 'getFunction', 'getGeneric', 'getGenerics', 'getGroup', 'getGroupMembers',
+            'getMethod', 'getMethods', 'getMethodsForDispatch', 'getMethodsMetaData', 'getPackageName',
+            'getProperties', 'getPrototype', 'getSlots', 'getSubclasses', 'getValidity', 'getVirtual',
+            'hasArg', 'hasMethod', 'hasMethods', 'implicitGeneric', 'initialize', 'insertMethod', 'is',
+            'isClass', 'isClassDef', 'isClassUnion', 'isGeneric', 'isGrammarSymbol', 'isGroup',
+            'isSealedClass', 'isSealedMethod', 'isVirtualClass', 'isXS3Class', 'languageEl', 'languageEl<-',
+            'linearizeMlist', 'listFromMethods', 'listFromMlist', 'loadMethod', 'Logic',
+            'makeClassRepresentation', 'makeExtends', 'makeGeneric', 'makeMethodsList',
+            'makePrototypeFromClassDef', 'makeStandardGeneric', 'matchSignature', 'Math', 'Math2', 'mergeMethods',
+            'metaNameUndo', 'method.skeleton', 'MethodAddCoerce', 'methodSignatureMatrix', 'MethodsList',
+            'MethodsListSelect', 'methodsPackageMetaName', 'missingArg', 'mlistMetaName', 'new', 'newBasic',
+            'newClassRepresentation', 'newEmptyObject', 'Ops', 'packageSlot', 'packageSlot<-', 'possibleExtends',
+            'prohibitGeneric', 'promptClass', 'promptMethods', 'prototype', 'Quote', 'rbind2',
+            'reconcilePropertiesAndPrototype', 'registerImplicitGenerics', 'rematchDefinition',
+            'removeClass', 'removeGeneric', 'removeMethod', 'removeMethods', 'removeMethodsObject', 'representation',
+            'requireMethods', 'resetClass', 'resetGeneric', 'S3Class', 'S3Class<-', 'S3Part', 'S3Part<-', 'sealClass',
+            'seemsS4Object', 'selectMethod', 'selectSuperClasses', 'sessionData', 'setAs', 'setClass', 'setClassUnion',
+            'setDataPart', 'setGeneric', 'setGenericImplicit', 'setGroupGeneric', 'setIs', 'setMethod', 'setOldClass',
+            'setPackageName', 'setPrimitiveMethods', 'setReplaceMethod', 'setValidity', 'show', 'showClass', 'showDefault',
+            'showExtends', 'showMethods', 'showMlist', 'signature', 'SignatureMethod', 'sigToEnv', 'slot', 'slot<-',
+            'slotNames', 'slotsFromS3', 'substituteDirect', 'substituteFunctionArgs', 'Summary', 'superClassDepth',
+            'testInheritedMethods', 'testVirtual', 'traceOff', 'traceOn', 'tryNew', 'trySilent', 'unRematchDefinition',
+            'validObject', 'validSlotNames',
+            ),
+        7 => array( // stats pkg
+            'acf', 'acf2AR', 'add.scope', 'add1', 'addmargins', 'aggregate',
+            'aggregate.data.frame', 'aggregate.default', 'aggregate.ts', 'AIC',
+            'alias', 'anova', 'anova.glm', 'anova.glmlist', 'anova.lm', 'anova.lmlist',
+            'anova.mlm', 'anovalist.lm', 'ansari.test', 'aov', 'approx', 'approxfun',
+            'ar', 'ar.burg', 'ar.mle', 'ar.ols', 'ar.yw', 'arima', 'arima.sim',
+            'arima0', 'arima0.diag', 'ARMAacf', 'ARMAtoMA', 'as.dendrogram', 'as.dist',
+            'as.formula', 'as.hclust', 'as.stepfun', 'as.ts', 'asOneSidedFormula', 'ave',
+            'bandwidth.kernel', 'bartlett.test', 'binom.test', 'binomial', 'biplot',
+            'Box.test', 'bw.bcv', 'bw.nrd', 'bw.nrd0', 'bw.SJ', 'bw.ucv', 'C', 'cancor',
+            'case.names', 'ccf', 'chisq.test', 'clearNames', 'cmdscale', 'coef', 'coefficients',
+            'complete.cases', 'confint', 'confint.default', 'constrOptim', 'contr.helmert',
+            'contr.poly', 'contr.SAS', 'contr.sum', 'contr.treatment', 'contrasts', 'contrasts<-',
+            'convolve', 'cooks.distance', 'cophenetic', 'cor', 'cor.test', 'cov', 'cov.wt',
+            'cov2cor', 'covratio', 'cpgram', 'cutree', 'cycle', 'D', 'dbeta', 'dbinom', 'dcauchy',
+            'dchisq', 'decompose', 'delete.response', 'deltat', 'dendrapply', 'density', 'density.default',
+            'deriv', 'deriv.default', 'deriv.formula', 'deriv3', 'deriv3.default', 'deriv3.formula',
+            'deviance', 'dexp', 'df', 'df.kernel', 'df.residual', 'dfbeta', 'dfbetas', 'dffits',
+            'dgamma', 'dgeom', 'dhyper', 'diff.ts', 'diffinv', 'dist', 'dlnorm', 'dlogis',
+            'dmultinom', 'dnbinom', 'dnorm', 'dpois', 'drop.scope', 'drop.terms', 'drop1',
+            'dsignrank', 'dt', 'dummy.coef', 'dunif', 'dweibull', 'dwilcox', 'ecdf', 'eff.aovlist',
+            'effects', 'embed', 'end', 'estVar', 'expand.model.frame', 'extractAIC', 'factanal',
+            'factor.scope', 'family', 'fft', 'filter', 'fisher.test', 'fitted', 'fitted.values',
+            'fivenum', 'fligner.test', 'formula', 'frequency', 'friedman.test', 'ftable', 'Gamma',
+            'gaussian', 'get_all_vars', 'getInitial', 'glm', 'glm.control', 'glm.fit', 'glm.fit.null',
+            'hasTsp', 'hat', 'hatvalues', 'hatvalues.lm', 'hclust', 'heatmap', 'HoltWinters', 'influence',
+            'influence.measures', 'integrate', 'interaction.plot', 'inverse.gaussian', 'IQR',
+            'is.empty.model', 'is.leaf', 'is.mts', 'is.stepfun', 'is.ts', 'is.tskernel', 'isoreg',
+            'KalmanForecast', 'KalmanLike', 'KalmanRun', 'KalmanSmooth', 'kernapply', 'kernel', 'kmeans',
+            'knots', 'kruskal.test', 'ks.test', 'ksmooth', 'lag', 'lag.plot', 'line', 'lines.ts', 'lm',
+            'lm.fit', 'lm.fit.null', 'lm.influence', 'lm.wfit', 'lm.wfit.null', 'loadings', 'loess',
+            'loess.control', 'loess.smooth', 'logLik', 'loglin', 'lowess', 'ls.diag', 'ls.print', 'lsfit',
+            'mad', 'mahalanobis', 'make.link', 'makeARIMA', 'makepredictcall', 'manova', 'mantelhaen.test',
+            'mauchley.test', 'mauchly.test', 'mcnemar.test', 'median', 'median.default', 'medpolish',
+            'model.extract', 'model.frame', 'model.frame.aovlist', 'model.frame.default', 'model.frame.glm',
+            'model.frame.lm', 'model.matrix', 'model.matrix.default', 'model.matrix.lm', 'model.offset',
+            'model.response', 'model.tables', 'model.weights', 'monthplot', 'mood.test', 'mvfft', 'na.action',
+            'na.contiguous', 'na.exclude', 'na.fail', 'na.omit', 'na.pass', 'napredict', 'naprint', 'naresid',
+            'nextn', 'nlm', 'nlminb', 'nls', 'nls.control', 'NLSstAsymptotic', 'NLSstClosestX', 'NLSstLfAsymptote',
+            'NLSstRtAsymptote', 'numericDeriv', 'offset', 'oneway.test', 'optim', 'optimise', 'optimize',
+            'order.dendrogram', 'p.adjust', 'p.adjust.methods', 'pacf', 'pairwise.prop.test', 'pairwise.t.test',
+            'pairwise.table', 'pairwise.wilcox.test', 'pbeta', 'pbinom', 'pbirthday', 'pcauchy', 'pchisq', 'pexp',
+            'pf', 'pgamma', 'pgeom', 'phyper', 'plclust', 'plnorm', 'plogis', 'plot.density', 'plot.ecdf', 'plot.lm',
+            'plot.mlm', 'plot.spec', 'plot.spec.coherency', 'plot.spec.phase', 'plot.stepfun', 'plot.ts', 'plot.TukeyHSD',
+            'pnbinom', 'pnorm', 'poisson', 'poisson.test', 'poly', 'polym', 'power', 'power.anova.test', 'power.prop.test',
+            'power.t.test', 'PP.test', 'ppoints', 'ppois', 'ppr', 'prcomp', 'predict', 'predict.glm', 'predict.lm',
+            'predict.mlm', 'predict.poly', 'preplot', 'princomp', 'print.anova', 'print.coefmat', 'print.density',
+            'print.family', 'print.formula', 'print.ftable', 'print.glm', 'print.infl', 'print.integrate', 'print.lm',
+            'print.logLik', 'print.terms', 'print.ts', 'printCoefmat', 'profile', 'proj', 'promax', 'prop.test',
+            'prop.trend.test', 'psignrank', 'pt', 'ptukey', 'punif', 'pweibull', 'pwilcox', 'qbeta', 'qbinom',
+            'qbirthday', 'qcauchy', 'qchisq', 'qexp', 'qf', 'qgamma', 'qgeom', 'qhyper', 'qlnorm', 'qlogis',
+            'qnbinom', 'qnorm', 'qpois', 'qqline', 'qqnorm', 'qqnorm.default', 'qqplot', 'qsignrank', 'qt',
+            'qtukey', 'quade.test', 'quantile', 'quantile.default', 'quasi', 'quasibinomial', 'quasipoisson',
+            'qunif', 'qweibull', 'qwilcox', 'r2dtable', 'rbeta', 'rbinom', 'rcauchy', 'rchisq', 'read.ftable',
+            'rect.hclust', 'reformulate', 'relevel', 'reorder', 'replications', 'reshape', 'reshapeLong', 'reshapeWide',
+            'resid', 'residuals', 'residuals.default', 'residuals.glm', 'residuals.lm', 'rexp', 'rf', 'rgamma', 'rgeom',
+            'rhyper', 'rlnorm', 'rlogis', 'rmultinom', 'rnbinom', 'rnorm', 'rpois', 'rsignrank', 'rstandard', 'rstandard.glm',
+            'rstandard.lm', 'rstudent', 'rstudent.glm', 'rstudent.lm', 'rt', 'runif', 'runmed', 'rweibull', 'rwilcox',
+            'scatter.smooth', 'screeplot', 'sd', 'se.contrast', 'selfStart', 'setNames', 'shapiro.test', 'simulate',
+            'smooth', 'smooth.spline', 'smoothEnds', 'sortedXyData', 'spec.ar', 'spec.pgram', 'spec.taper', 'spectrum',
+            'spline', 'splinefun', 'splinefunH', 'SSasymp', 'SSasympOff', 'SSasympOrig', 'SSbiexp', 'SSD', 'SSfol',
+            'SSfpl', 'SSgompertz', 'SSlogis', 'SSmicmen', 'SSweibull', 'start', 'stat.anova', 'step', 'stepfun', 'stl',
+            'StructTS', 'summary.aov', 'summary.aovlist', 'summary.glm', 'summary.infl', 'summary.lm', 'summary.manova',
+            'summary.mlm', 'summary.stepfun', 'supsmu', 'symnum', 't.test', 'termplot', 'terms', 'terms.aovlist',
+            'terms.default', 'terms.formula', 'terms.terms', 'time', 'toeplitz', 'ts', 'ts.intersect', 'ts.plot',
+            'ts.union', 'tsdiag', 'tsp', 'tsp<-', 'tsSmooth', 'TukeyHSD', 'TukeyHSD.aov', 'uniroot', 'update',
+            'update.default', 'update.formula', 'var', 'var.test', 'variable.names', 'varimax', 'vcov', 'weighted.mean',
+            'weighted.residuals', 'weights', 'wilcox.test', 'window', 'window<-', 'write.ftable', 'xtabs',
+            ),
+        8 => array( // utils pkg
+            'alarm', 'apropos', 'argsAnywhere', 'as.person', 'as.personList', 'as.relistable', 'as.roman',
+            'assignInNamespace', 'available.packages', 'browseEnv', 'browseURL', 'browseVignettes', 'bug.report',
+            'capture.output', 'checkCRAN', 'chooseCRANmirror', 'citation', 'citEntry', 'citFooter', 'citHeader',
+            'close.socket', 'combn', 'compareVersion', 'contrib.url', 'count.fields', 'CRAN.packages', 'data',
+            'data.entry', 'dataentry', 'de', 'de.ncols', 'de.restore', 'de.setup', 'debugger', 'demo', 'download.file',
+            'download.packages', 'dump.frames', 'edit', 'emacs', 'example', 'file_test', 'file.edit', 'find', 'fix',
+            'fixInNamespace', 'flush.console', 'formatOL', 'formatUL', 'getAnywhere', 'getCRANmirrors', 'getFromNamespace',
+            'getS3method', 'getTxtProgressBar', 'glob2rx', 'head', 'head.matrix', 'help', 'help.request', 'help.search',
+            'help.start', 'history', 'index.search', 'install.packages', 'installed.packages', 'is.relistable',
+            'limitedLabels', 'loadhistory', 'localeToCharset', 'ls.str', 'lsf.str', 'make.packages.html', 'make.socket',
+            'makeRweaveLatexCodeRunner', 'memory.limit', 'memory.size', 'menu', 'methods', 'mirror2html', 'modifyList',
+            'new.packages', 'normalizePath', 'nsl', 'object.size', 'old.packages', 'package.contents', 'package.skeleton',
+            'packageDescription', 'packageStatus', 'page', 'person', 'personList', 'pico', 'prompt', 'promptData',
+            'promptPackage', 'rc.getOption', 'rc.options', 'rc.settings', 'rc.status', 'read.csv', 'read.csv2', 'read.delim',
+            'read.delim2', 'read.DIF', 'read.fortran', 'read.fwf', 'read.socket', 'read.table', 'readCitationFile', 'recover',
+            'relist', 'remove.packages', 'Rprof', 'Rprofmem', 'RShowDoc', 'RSiteSearch', 'rtags', 'Rtangle', 'RtangleSetup',
+            'RtangleWritedoc', 'RweaveChunkPrefix', 'RweaveEvalWithOpt', 'RweaveLatex', 'RweaveLatexFinish', 'RweaveLatexOptions',
+            'RweaveLatexSetup', 'RweaveLatexWritedoc', 'RweaveTryStop', 'savehistory', 'select.list', 'sessionInfo',
+            'setRepositories', 'setTxtProgressBar', 'stack', 'Stangle', 'str', 'strOptions', 'summaryRprof', 'Sweave',
+            'SweaveHooks', 'SweaveSyntaxLatex', 'SweaveSyntaxNoweb', 'SweaveSyntConv', 'tail', 'tail.matrix', 'timestamp',
+            'toBibtex', 'toLatex', 'txtProgressBar', 'type.convert', 'unstack', 'unzip', 'update.packages', 'update.packageStatus',
+            'upgrade', 'url.show', 'URLdecode', 'URLencode', 'vi', 'View', 'vignette', 'write.csv', 'write.csv2', 'write.socket',
+            'write.table', 'wsbrowser', 'xedit', 'xemacs', 'zip.file.extract',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|','<-','->',
+        '^', '-', ':', '::', ':::', '!', '!=', '*', '?',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            3 => 'color: #CC9900; font-weight: bold;',
+            4 => 'color: #0000FF; font-weight: bold;',
+            5 => 'color: #0000FF; font-weight: bold;',
+            6 => 'color: #0000FF; font-weight: bold;',
+            7 => 'color: #0000FF; font-weight: bold;',
+            8 => 'color: #0000FF; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #228B22;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#A020F0;'
+            ),
+        'SCRIPT' => array(
+            0 => ''            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://stat.ethz.ch/R-manual/R-devel/library/base/html/{FNAME}.html', // Base Package
+        3 => 'http://stat.ethz.ch/R-manual/R-devel/library/datasets/html/{FNAME}.html', // Datasets
+        4 => 'http://stat.ethz.ch/R-manual/R-devel/library/graphics/html/{FNAME}.html', // Graphics Package
+        5 => 'http://stat.ethz.ch/R-manual/R-devel/library/grDevices/html/{FNAME}.html', // grDevices
+        6 => 'http://stat.ethz.ch/R-manual/R-devel/library/methods/html/{FNAME}.html', // methods
+        7 => 'http://stat.ethz.ch/R-manual/R-devel/library/stats/html/{FNAME}.html', // stats
+        8 => 'http://stat.ethz.ch/R-manual/R-devel/library/utils/html/{FNAME}.html' // utils
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([^\w])'([^\\n\\r']*)'",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => "\\1'",
+            GESHI_AFTER => "'"
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#;>|^&\\.])(?<!\/html\/)",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-&;\\.])"
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/ruby.php b/vendor/easybook/geshi/geshi/ruby.php
new file mode 100755
index 000000000..f6eb1b1e3
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/ruby.php
@@ -0,0 +1,231 @@
+<?php
+/*************************************************************************************
+ * ruby.php
+ * --------
+ * Author: Moises Deniz
+ * Copyright: (c) 2007 Moises Deniz
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/03/21
+ *
+ * Ruby language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2007/03/21 (1.0.7.19)
+ *   -  Initial release
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Ruby',
+    'COMMENT_SINGLE' => array(1 => "#"),
+    'COMMENT_MULTI' => array("=begin" => "=end"),
+    'COMMENT_REGEXP' => array(
+        //Heredoc
+        4 => '/<<\s*?(\w+)\\n.*?\\n\\1(?![a-zA-Z0-9])/si',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+                'alias', 'and', 'begin', 'break', 'case', 'class',
+                'def', 'defined', 'do', 'else', 'elsif', 'end',
+                'ensure', 'for', 'if', 'in', 'module', 'while',
+                'next', 'not', 'or', 'redo', 'rescue', 'yield',
+                'retry', 'super', 'then', 'undef', 'unless',
+                'until', 'when', 'include'
+            ),
+        2 => array(
+                '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
+                'return'
+            ),
+        3 => array(
+                'Array', 'Float', 'Integer', 'String', 'at_exit',
+                'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
+                'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
+                'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
+                'iterator?', 'lambda', 'load', 'local_variables', 'loop',
+                'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
+                'raise', 'rand', 'readline', 'readlines', 'require', 'select',
+                'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
+                'system', 'trace_var', 'trap', 'untrace_var'
+            ),
+        4 => array(
+                'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
+                'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
+                'CGI::HtmlExtension', 'CGI::QueryExtension',
+                'CGI::Session', 'CGI::Session::FileStore',
+                'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
+                'ConditionVariable', 'Continuation', 'Data',
+                'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
+                'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
+                'Exception', 'FalseClass', 'File',
+                'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
+                'FileUtils::DryRun', 'FileUtils::NoWrite',
+                'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
+                'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
+                'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
+                'Iconv::Failure', 'Iconv::IllegalSequence',
+                'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
+                'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
+                'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
+                'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
+                'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
+                'Logger::ShiftingError', 'Marshal', 'MatchData',
+                'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
+                'NameError::message', 'NilClass', 'NoMemoryError',
+                'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
+                'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
+                'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
+                'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
+                'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
+                'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
+                'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
+                'SingleForwardable', 'Singleton', 'SingletonClassMethods',
+                'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
+                'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
+                'SyncEnumerator', 'SyntaxError', 'SystemCallError',
+                'SystemExit', 'SystemStackError', 'Tempfile',
+                'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
+                'ThreadError', 'ThreadGroup',
+                'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
+                'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
+                'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
+                'URI::InvalidComponentError', 'URI::InvalidURIError',
+                'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
+                'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
+                'ZeroDivisionError', 'Zlib',
+                'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
+                'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
+                'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
+                'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
+                'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
+                'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
+                'Zlib::VersionError',
+                'Zlib::ZStream',
+                'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
+                'Inflector::Inflections', 'Mime', 'Mime::Type',
+                'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
+        '+', '-', '=>', '<<'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC0066; font-weight:bold;',
+            4 => 'color:#CC00FF; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            4 => 'color: #cc0000; font-style: italic;',
+            'MULTI' => 'color:#000080; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#006666;'
+            ),
+        'METHODS' => array(
+            1 => 'color:#9900CC;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(//Variables
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(//Arrays
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*",//Static OOP symbols
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/rust.php b/vendor/easybook/geshi/geshi/rust.php
new file mode 100644
index 000000000..07ba51a02
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/rust.php
@@ -0,0 +1,228 @@
+<?php
+/*************************************************************************************
+ * rust.php
+ * --------
+ * Author: Edward Hart (edward.dan.hart@gmail.com)
+ * Copyright: (c) 2013 Edward Hart
+ * Release Version: 1.0.8.12
+ * Date Started: 2013/10/20
+ *
+ * Rust language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2013/10/20
+ *   -  First Release
+ *
+ * TODO (updated 2013/10/20)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Rust',
+
+    'COMMENT_SINGLE' => array('//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(),
+
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\nrt\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+
+    'KEYWORDS' => array(
+        // Keywords
+        1 => array(
+            'alt', 'as', 'assert', 'break', 'const', 'continue', 'copy', 'do',
+            'else', 'enum', 'extern', 'fn', 'for', 'if',
+            'impl', 'in', 'let', 'log', 'loop', 'match', 'mod', 'mut', 'of',
+            'priv', 'pub', 'ref', 'return', 'self', 'static', 'struct', 'super',
+            'to', 'trait', 'type', 'unsafe', 'use', 'with', 'while'
+            ),
+        // Boolean values
+        2 => array( 'true', 'false' ),
+        // Structs and built-in types
+        3 => array(
+            'u8', 'i8',
+            'u16', 'i16',
+            'u32', 'i32',
+            'u64', 'i64',
+            'f32', 'f64',
+            'int', 'uint',
+            'float',
+            'bool',
+            'str', 'char',
+            'Argument', 'AsyncWatcher', 'BorrowRecord', 'BufReader',
+            'BufWriter', 'BufferedReader', 'BufferedStream', 'BufferedWriter',
+            'ByRef', 'ByteIterator', 'CFile', 'CString', 'CStringIterator',
+            'Cell', 'Chain', 'Chan', 'ChanOne', 'CharIterator',
+            'CharOffsetIterator', 'CharRange', 'CharSplitIterator',
+            'CharSplitNIterator', 'ChunkIter', 'Condition', 'ConnectRequest',
+            'Coroutine', 'Counter', 'CrateMap', 'Cycle', 'DeflateWriter',
+            'Display', 'ElementSwaps', 'Enumerate', 'Exp', 'Exp1', 'FileDesc',
+            'FileReader', 'FileStat', 'FileStream', 'FileWriter', 'Filter',
+            'FilterMap', 'FlatMap', 'FormatSpec', 'Formatter', 'FsRequest',
+            'Fuse', 'GarbageCollector', 'GetAddrInfoRequest', 'Handle',
+            'HashMap', 'HashMapIterator', 'HashMapMoveIterator',
+            'HashMapMutIterator', 'HashSet', 'HashSetIterator',
+            'HashSetMoveIterator', 'Hint', 'IdleWatcher', 'InflateReader',
+            'Info', 'Inspect', 'Invert', 'IoError', 'Isaac64Rng', 'IsaacRng',
+            'LineBufferedWriter', 'Listener', 'LocalHeap', 'LocalStorage',
+            'Loop', 'Map', 'MatchesIndexIterator', 'MemReader', 'MemWriter',
+            'MemoryMap', 'ModEntry', 'MoveIterator', 'MovePtrAdaptor',
+            'MoveRevIterator', 'NoOpRunnable', 'NonCopyable', 'Normal',
+            'OSRng', 'OptionIterator', 'Parser', 'Path', 'Peekable',
+            'Permutations', 'Pipe', 'PipeStream', 'PluralArm', 'Port',
+            'PortOne', 'Process', 'ProcessConfig', 'ProcessOptions',
+            'ProcessOutput', 'RC', 'RSplitIterator', 'RandSample', 'Range',
+            'RangeInclusive', 'RangeStep', 'RangeStepInclusive', 'Rc', 'RcMut',
+            'ReaderRng', 'Repeat', 'ReprVisitor', 'RequestData',
+            'ReseedWithDefault', 'ReseedingRng', 'Scan', 'SchedOpts',
+            'SelectArm', 'SharedChan', 'SharedPort', 'SignalWatcher',
+            'SipState', 'Skip', 'SkipWhile', 'SocketAddr', 'SplitIterator',
+            'StackPool', 'StackSegment', 'StandardNormal', 'StdErrLogger',
+            'StdIn', 'StdOut', 'StdReader', 'StdRng', 'StdWriter',
+            'StrSplitIterator', 'StreamWatcher', 'TTY', 'Take', 'TakeWhile',
+            'Task', 'TaskBuilder', 'TaskOpts', 'TcpAcceptor', 'TcpListener',
+            'TcpStream', 'TcpWatcher', 'Timer', 'TimerWatcher', 'TrieMap',
+            'TrieMapIterator', 'TrieSet', 'TrieSetIterator', 'Tube',
+            'UdpSendRequest', 'UdpSocket', 'UdpStream', 'UdpWatcher', 'Unfold',
+            'UnixAcceptor', 'UnixListener', 'UnixStream', 'Unwinder',
+            'UvAddrInfo', 'UvError', 'UvEventLoop', 'UvFileStream',
+            'UvIoFactory', 'UvPausibleIdleCallback', 'UvPipeStream',
+            'UvProcess', 'UvRemoteCallback', 'UvSignal', 'UvTTY',
+            'UvTcpAcceptor', 'UvTcpListener', 'UvTcpStream', 'UvTimer',
+            'UvUdpSocket', 'UvUnboundPipe', 'UvUnixAcceptor', 'UvUnixListener',
+            'VecIterator', 'VecMutIterator', 'Weighted', 'WeightedChoice',
+            'WindowIter', 'WriteRequest', 'XorShiftRng', 'Zip', 'addrinfo',
+            'uv_buf_t', 'uv_err_data', 'uv_process_options_t', 'uv_stat_t',
+            'uv_stdio_container_t', 'uv_timespec_t'
+            ),
+        // Enums
+        4 => array(
+            'Alignment', 'Count', 'Either', 'ExponentFormat', 'FPCategory',
+            'FileAccess', 'FileMode', 'Flag', 'IoErrorKind', 'IpAddr',
+            'KeyValue', 'MapError', 'MapOption', 'MemoryMapKind', 'Method',
+            'NullByteResolution', 'Option', 'Ordering', 'PathPrefix', 'Piece',
+            'PluralKeyword', 'Position', 'Protocol', 'Result', 'SchedHome',
+            'SchedMode', 'SeekStyle', 'SendStr', 'SignFormat',
+            'SignificantDigits', 'Signum', 'SocketType', 'StdioContainer',
+            'TaskResult', 'TaskType', 'UvSocketAddr', 'Void', 'uv_handle_type',
+            'uv_membership', 'uv_req_type'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '&', '|', '^', '!', '<', '>', '~', '@',
+        ':',
+        ';', ',',
+        '='
+        ),
+
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #708;',
+            2 => 'color: #219;',
+            3 => 'color: #05a;',
+            4 => 'color: #800;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #a50; font-style: italic;',
+            'MULTI' => 'color: #a50; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a11;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'BRACKETS' => array(''),
+        'METHODS' => array(
+            1 => 'color: #164;'
+            ),
+        'SYMBOLS' => array(
+            0 => ''
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/sas.php b/vendor/easybook/geshi/geshi/sas.php
new file mode 100755
index 000000000..dbf95a14e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/sas.php
@@ -0,0 +1,290 @@
+<?php
+/*************************************************************************************
+ * sas.php
+ * -------
+ * Author: Galen Johnson (solitaryr@gmail.com)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/12/27
+ *
+ * SAS language file for GeSHi. Based on the sas vim file.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ *   -  Cleaned up code style
+ * 2005/12/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/12/27)
+ * -------------------------
+ * * Check highlighting stuff works
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SAS',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/', '*' => ';'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '_ALL_','_CHARACTER_','_INFILE_','_N_','_NULL_','_NUMERIC_',
+            '_WEBOUT_'
+            ),
+        2 => array(
+            '%BQUOTE','%CMPRES','%COMPSTOR','%DATATYP','%DISPLAY','%DO','%ELSE',
+            '%END','%EVAL','%GLOBAL','%GOTO','%IF','%INDEX','%INPUT','%KEYDEF',
+            '%LABEL','%LEFT','%LENGTH','%LET','%LOCAL','%LOWCASE','%MACRO',
+            '%MEND','%NRBQUOTE','%NRQUOTE','%NRSTR','%PUT','%QCMPRES','%QLEFT',
+            '%QLOWCASE','%QSCAN','%QSUBSTR','%QSYSFUNC','%QTRIM','%QUOTE',
+            '%QUPCASE','%SCAN','%STR','%SUBSTR','%SUPERQ','%SYSCALL',
+            '%SYSEVALF','%SYSEXEC','%SYSFUNC','%SYSGET','%SYSLPUT','%SYSPROD',
+            '%SYSRC','%SYSRPUT','%THEN','%TO','%TRIM','%UNQUOTE','%UNTIL',
+            '%UPCASE','%VERIFY','%WHILE','%WINDOW'
+            ),
+        3 => array(
+            'ABS','ADDR','AIRY','ARCOS','ARSIN','ATAN','ATTRC','ATTRN','BAND',
+            'BETAINV','BLSHIFT','BNOT','BOR','BRSHIFT','BXOR','BYTE','CDF',
+            'CEIL','CEXIST','CINV','CLOSE','CNONCT','COLLATE','COMPBL',
+            'COMPOUND','COMPRESS','COSH','COS','CSS','CUROBS','CV','DACCDBSL',
+            'DACCDB','DACCSL','DACCSYD','DACCTAB','DAIRY','DATETIME','DATEJUL',
+            'DATEPART','DATE','DAY','DCLOSE','DEPDBSL','DEPDB','DEPSL','DEPSYD',
+            'DEPTAB','DEQUOTE','DHMS','DIF','DIGAMMA','DIM','DINFO','DNUM',
+            'DOPEN','DOPTNAME','DOPTNUM','DREAD','DROPNOTE','DSNAME','ERFC',
+            'ERF','EXIST','EXP','FAPPEND','FCLOSE','FCOL','FDELETE','FETCHOBS',
+            'FETCH','FEXIST','FGET','FILEEXIST','FILENAME','FILEREF','FINFO',
+            'FINV','FIPNAMEL','FIPNAME','FIPSTATE','FLOOR','FNONCT','FNOTE',
+            'FOPEN','FOPTNAME','FOPTNUM','FPOINT','FPOS','FPUT','FREAD',
+            'FREWIND','FRLEN','FSEP','FUZZ','FWRITE','GAMINV','GAMMA',
+            'GETOPTION','GETVARC','GETVARN','HBOUND','HMS','HOSTHELP','HOUR',
+            'IBESSEL','INDEXW','INDEXC','INDEX','INPUTN','INPUTC','INPUT',
+            'INTRR','INTCK','INTNX','INT','IRR','JBESSEL','JULDATE','KURTOSIS',
+            'LAG','LBOUND','LEFT','LENGTH','LGAMMA','LIBNAME','LIBREF','LOG10',
+            'LOG2','LOGPDF','LOGPMF','LOGSDF','LOG','LOWCASE','MAX','MDY',
+            'MEAN','MINUTE','MIN','MOD','MONTH','MOPEN','MORT','NETPV','NMISS',
+            'NORMAL','NPV','N','OPEN','ORDINAL','PATHNAME','PDF','PEEKC','PEEK',
+            'PMF','POINT','POISSON','POKE','PROBBETA','PROBBNML','PROBCHI',
+            'PROBF','PROBGAM','PROBHYPR','PROBIT','PROBNEGB','PROBNORM','PROBT',
+            'PUTN','PUTC','PUT','QTR','QUOTE','RANBIN','RANCAU','RANEXP',
+            'RANGAM','RANGE','RANK','RANNOR','RANPOI','RANTBL','RANTRI',
+            'RANUNI','REPEAT','RESOLVE','REVERSE','REWIND','RIGHT','ROUND',
+            'SAVING','SCAN','SDF','SECOND','SIGN','SINH','SIN','SKEWNESS',
+            'SOUNDEX','SPEDIS','SQRT','STDERR','STD','STFIPS','STNAME',
+            'STNAMEL','SUBSTR','SUM','SYMGET','SYSGET','SYSMSG','SYSPROD',
+            'SYSRC','SYSTEM','TANH','TAN','TIMEPART','TIME','TINV','TNONCT',
+            'TODAY','TRANSLATE','TRANWRD','TRIGAMMA','TRIMN','TRIM','TRUNC',
+            'UNIFORM','UPCASE','USS','VARFMT','VARINFMT','VARLABEL','VARLEN',
+            'VARNAME','VARNUM','VARRAYX','VARRAY','VARTYPE','VAR','VERIFY',
+            'VFORMATX','VFORMATDX','VFORMATD','VFORMATNX','VFORMATN',
+            'VFORMATWX','VFORMATW','VFORMAT','VINARRAYX','VINARRAY',
+            'VINFORMATX','VINFORMATDX','VINFORMATD','VINFORMATNX','VINFORMATN',
+            'VINFORMATWX','VINFORMATW','VINFORMAT','VLABELX','VLABEL',
+            'VLENGTHX','VLENGTH','VNAMEX','VNAME','VTYPEX','VTYPE','WEEKDAY',
+            'YEAR','YYQ','ZIPFIPS','ZIPNAME','ZIPNAMEL','ZIPSTATE'
+            ),
+        4 => array(
+            'ABORT','ADD','ALTER','AND','ARRAY','AS','ATTRIB','BY','CALL',
+            'CARDS4','CASCADE','CATNAME','CHECK','CONTINUE','CREATE',
+            'DATALINES4','DELETE','DESCRIBE','DISPLAY','DISTINCT','DM','DROP',
+            'ENDSAS','FILE','FOOTNOTE','FOREIGN','FORMAT','FROM',
+            'GOTO','GROUP','HAVING','IN','INFILE','INFORMAT',
+            'INSERT','INTO','KEEP','KEY','LABEL','LEAVE',
+            'LIKE','LINK','LIST','LOSTCARD','MERGE','MESSAGE','MISSING',
+            'MODIFY','MSGTYPE','NOT','NULL','ON','OPTIONS','OR','ORDER',
+            'OUTPUT','PAGE','PRIMARY','REDIRECT','REFERENCES','REMOVE',
+            'RENAME','REPLACE','RESET','RESTRICT','RETAIN','RETURN','SELECT',
+            'SET','SKIP','STARTSAS','STOP','SYSTASK','TABLE','TITLE','UNIQUE',
+            'UPDATE','VALIDATE','VIEW','WAITSAS','WHERE','WINDOW','X'
+            ),
+        5 => array(
+            'DO','ELSE','END','IF','THEN','UNTIL','WHILE'
+            ),
+        6 => array(
+            'RUN','QUIT','DATA'
+            ),
+        7 => array(
+            'ERROR'
+            ),
+        8 => array(
+            'WARNING'
+            ),
+        9 => array(
+            'NOTE'
+            )
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #0000ff;',
+            5 => 'color: #0000ff;',
+            6 => 'color: #000080; font-weight: bold;',
+            7 => 'color: #ff0000;',
+            8 => 'color: #00ff00;',
+            9 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+//            1 => 'color: #006400; font-style: italic;',
+            'MULTI' => 'color: #006400; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a020f0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2e8b57; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;',
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #006400; font-style: italic;',
+            3 => 'color: #006400; font-style: italic;',
+            4 => 'color: #006400; font-style: italic;',
+            5 => 'color: #ff0000; font-weight: bold;',
+            6 => 'color: #00ff00; font-style: italic;',
+            7 => 'color: #0000ff; font-style: normal;',
+            8 => 'color: #b218b2; font-weight: bold;',
+            9 => 'color: #b218b2; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => "&amp;[a-zA-Z_][a-zA-Z0-9_]*",
+        1 => array(//Procedures
+            GESHI_SEARCH => '(^\\s*)(PROC \\w+)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(^\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '(.*;\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '(^\\s*)(%\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        5 => array(//Error messages
+            GESHI_SEARCH => '(^ERROR.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        6 => array(//Warning messages
+            GESHI_SEARCH => '(^WARNING.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        7 => array(//Notice messages
+            GESHI_SEARCH => '(^NOTE.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        8 => array(
+            GESHI_SEARCH => '(^\\s*)(CARDS.*)(^\\s*;\\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        9 => array(
+            GESHI_SEARCH => '(^\\s*)(DATALINES.*)(^\\s*;\\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/sass.php b/vendor/easybook/geshi/geshi/sass.php
new file mode 100644
index 000000000..286f4bfab
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/sass.php
@@ -0,0 +1,248 @@
+<?php
+/*************************************************************************************
+ * sass.php
+ * -------
+ * Author: Javier Eguiluz (javier.eguiluz@gmail.com)
+ * Release Version: 1.0.8.12
+ * Date Started: 2014/05/10
+ *
+ * SASS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2014/05/10 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Sass',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // properties
+        1 => array(
+            'azimuth', 'background-attachment', 'background-color',
+            'background-image', 'background-position', 'background-repeat',
+            'background', 'border-bottom-color', 'border-radius',
+            'border-top-left-radius', 'border-top-right-radius',
+            'border-bottom-right-radius', 'border-bottom-left-radius',
+            'border-bottom-style', 'border-bottom-width', 'border-left-color',
+            'border-left-style', 'border-left-width', 'border-right',
+            'border-right-color', 'border-right-style', 'border-right-width',
+            'border-top-color', 'border-top-style',
+            'border-top-width','border-bottom', 'border-collapse',
+            'border-left', 'border-width', 'border-color', 'border-spacing',
+            'border-style', 'border-top', 'border', 'box-shadow', 'caption-side', 'clear',
+            'clip', 'color', 'content', 'counter-increment', 'counter-reset',
+            'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
+            'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
+            'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
+            'font-weight', 'font', 'line-height', 'letter-spacing',
+            'list-style', 'list-style-image', 'list-style-position',
+            'list-style-type', 'margin-bottom', 'margin-left', 'margin-right',
+            'margin-top', 'margin', 'marker-offset', 'marks', 'max-height',
+            'max-width', 'min-height', 'min-width', 'orphans', 'outline',
+            'outline-color', 'outline-style', 'outline-width', 'overflow',
+            'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
+            'padding', 'page', 'page-break-after', 'page-break-before',
+            'page-break-inside', 'pause-after', 'pause-before', 'pause',
+            'pitch', 'pitch-range', 'play-during', 'position', 'quotes',
+            'richness', 'right', 'size', 'speak-header', 'speak-numeral',
+            'speak-punctuation', 'speak', 'speech-rate', 'stress',
+            'table-layout', 'text-align', 'text-decoration', 'text-indent',
+            'text-shadow', 'text-transform', 'top', 'unicode-bidi',
+            'vertical-align', 'visibility', 'voice-family', 'volume',
+            'white-space', 'widows', 'width', 'word-spacing', 'z-index',
+            'bottom', 'left', 'height',
+            // media queries
+            'screen', 'orientation', 'min-device-width', 'max-device-width',
+            ),
+        // reserved words for values
+        2 => array(
+            // colors
+            'aqua', 'black', 'blue', 'fuchsia', 'gray', 'green', 'lime',
+            'maroon', 'navy', 'olive', 'orange', 'purple', 'red', 'silver',
+            'teal', 'white', 'yellow',
+            // media queries
+            'landscape', 'portrait', 
+            // other
+            'above', 'absolute', 'always', 'armenian', 'aural', 'auto',
+            'avoid', 'baseline', 'behind', 'below', 'bidi-override', 'blink',
+            'block', 'bold', 'bolder', 'both', 'capitalize', 'center-left',
+            'center-right', 'center', 'circle', 'cjk-ideographic',
+            'close-quote', 'collapse', 'condensed', 'continuous', 'crop',
+            'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero',
+            'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
+            'e-resize', 'embed', 'extra-condensed', 'extra-expanded',
+            'expanded', 'fantasy', 'far-left', 'far-right', 'faster', 'fast',
+            'fixed',  'georgian', 'groove', 'hebrew', 'help', 'hidden',
+            'hide', 'higher', 'high', 'hiragana-iroha', 'hiragana', 'icon',
+            'inherit', 'inline-table', 'inline', 'inline-block', 'inset', 'inside',
+            'invert', 'italic', 'justify', 'katakana-iroha', 'katakana', 'landscape',
+            'larger', 'large', 'left-side', 'leftwards', 'level', 'lighter', 
+            'line-through', 'list-item', 'loud', 'lower-alpha', 'lower-greek',
+            'lower-roman', 'lowercase', 'ltr', 'lower', 'low', 
+            'medium', 'message-box', 'middle', 'mix', 'monospace', 'n-resize',
+            'narrower', 'ne-resize', 'no-close-quote',
+            'no-open-quote', 'no-repeat', 'none', 'normal', 'nowrap',
+            'nw-resize', 'oblique', 'once', 'open-quote', 'outset',
+            'outside', 'overline', 'pointer', 'portrait', 'px',
+             'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb',
+            'ridge', 'right-side', 'rightwards', 's-resize', 'sans-serif',
+            'scroll', 'se-resize', 'semi-condensed', 'semi-expanded',
+            'separate', 'serif', 'show', 'silent',  'slow', 'slower',
+            'small-caps', 'small-caption', 'smaller', 'soft', 'solid',
+            'spell-out', 'square', 'static', 'status-bar', 'super',
+            'sw-resize', 'table-caption', 'table-cell', 'table-column',
+            'table-column-group', 'table-footer-group', 'table-header-group',
+            'table-row', 'table-row-group',  'text', 'text-bottom',
+            'text-top', 'thick', 'thin', 'transparent', 'ultra-condensed',
+            'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin',
+            'upper-roman', 'uppercase', 'url', 'visible', 'w-resize', 'wait',
+             'wider', 'x-fast', 'x-high', 'x-large', 'x-loud', 'x-low',
+             'x-small', 'x-soft', 'xx-large', 'xx-small', 'yellow', 'yes'
+            ),
+        // directives
+        3 => array(
+            '@at-root', '@charset', '@content', '@debug', '@each', '@else', '@elseif',
+            '@else if', '@extend', '@font-face', '@for', '@function', '@if',
+            '@import', '@include', '@media', '@mixin', '@namespace', '@page',
+            '@return', '@warn', '@while', 
+            ),
+        // built-in Sass functions
+        4 => array(
+            'rgb', 'rgba', 'red', 'green', 'blue', 'mix',
+            'hsl', 'hsla', 'hue', 'saturation', 'lightness', 'adjust-hue',
+            'lighten', 'darken', 'saturate', 'desaturate', 'grayscale',
+            'complement', 'invert',
+            'alpha', 'rgba', 'opacify', 'transparentize',
+            'adjust-color', 'scale-color', 'change-color', 'ie-hex-str',
+            'unquote', 'quote', 'str-length', 'str-insert', 'str-index',
+            'str-slice', 'to-upper-case', 'to-lower-case',
+            'percentage', 'round', 'ceil', 'floor', 'abs', 'min', 'max', 'random',
+            'length', 'nth', 'join', 'append', 'zip', 'index', 'list-separator',
+            'map-get', 'map-merge', 'map-remove', 'map-keys', 'map-values',
+            'map-has-key', 'keywords',
+            'feature-exists', 'variable-exists', 'global-variable-exists',
+            'function-exists', 'mixin-exists', 'inspect', 'type-of', 'unit',
+            'unitless', 'comparable', 'call',
+            'if', 'unique-id',
+            ),
+        // reserved words
+        5 => array(
+            '!important', '!default', '!optional', 'true', 'false', 'with',
+            'without', 'null', 'from', 'through', 'to', 'in', 'and', 'or',
+            'only', 'not',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', ':', ';',
+        '>', '+', '*', ',', '^', '=',
+        '&', '~', '!', '%', '?', '...',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #993333;',
+            3 => 'color: #990000;',
+            4 => 'color: #000000; font-weight: bold;',
+            5 => 'color: #009900;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #cc00cc;',
+            1 => 'color: #6666ff;',
+            2 => 'color: #3333ff;',
+            3 => 'color: #933;',
+            4 => 'color: #ff6633;',
+            5 => 'color: #0066ff;',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Variables
+        0 => "[$][a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*",
+        // Hexadecimal colors
+        1 => "\#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})",
+        // CSS Pseudo classes
+        // note: & is needed for &gt; (i.e. > )
+        2 => "(?<!\\\\):(?!\d)[a-zA-Z0-9\-]+\b(?:\s*(?=[\{\.#a-zA-Z,:+*&](.|\n)|<\|))",
+        // Measurements
+        3 => "[+\-]?(\d+|(\d*\.\d+))(em|ex|pt|px|cm|in|%)",
+        // Interpolation
+        4 => "(\#\{.*\})",
+        // Browser prefixed properties
+        5 => "(\-(moz|ms|o|webkit)\-[a-z\-]*)",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2,
+);
diff --git a/vendor/easybook/geshi/geshi/scala.php b/vendor/easybook/geshi/geshi/scala.php
new file mode 100755
index 000000000..405f59de0
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/scala.php
@@ -0,0 +1,138 @@
+<?php
+/*************************************************************************************
+ * scala.php
+ * ----------
+ * Author: Franco Lombardo (franco@francolombardo.net)
+ * Copyright: (c) 2008 Franco Lombardo, Benny Baumann
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/02/08
+ *
+ * Scala language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/02/08 (1.0.7.22)
+ *   -  First Release
+ *
+ * TODO (updated 2007/04/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Scala',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => "/\\'(?!\w\\'|\\\\)\w+(?=\s)/"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'",'"'),
+    'ESCAPE_CHAR' => '\\',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{1,2}#i",
+        //Hexadecimal Char Specs (unicode)
+        3 => "#\\\\u[\da-fA-F]{1,4}#",
+        //Hexadecimal Char Specs (Extended Unicode)
+        4 => "#\\\\U[\da-fA-F]{1,8}#",
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'abstract', 'case', 'catch', 'class', 'def',
+            'do', 'else', 'extends', 'false', 'final',
+            'finally', 'for', 'forSome', 'if', 'implicit',
+            'import', 'match', 'new', 'null', 'object',
+            'override', 'package', 'private', 'protected', 'requires',
+            'return', 'sealed', 'super', 'this', 'throw',
+            'trait', 'try', 'true', 'type', 'val',
+            'var', 'while', 'with', 'yield'
+            ),
+        2 => array(
+            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?',
+        '_', ':', '=', '=>', '<<:',
+        '<%', '>:', '#', '@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #9999cc; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #CC66FF;',
+            'MULTI' => 'color: #00ff00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #6666ff; font-weight: bold;',
+            1 => 'color: #6666ff; font-weight: bold;',
+            2 => 'color: #5555ff; font-weight: bold;',
+            3 => 'color: #4444ff; font-weight: bold;',
+            4 => 'color: #3333ff; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #F78811;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #6666FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #F78811;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;',
+            2 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000080;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://scala-lang.org',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/scheme.php b/vendor/easybook/geshi/geshi/scheme.php
new file mode 100755
index 000000000..59870846b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/scheme.php
@@ -0,0 +1,168 @@
+<?php
+/*************************************************************************************
+ * scheme.php
+ * ----------
+ * Author: Jon Raphaelson (jonraphaelson@gmail.com)
+ * Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/30
+ *
+ * Scheme language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/09/22 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2005/09/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Scheme',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('#|' => '|#'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'acos', 'and', 'angle', 'append', 'appply', 'approximate',
+            'asin', 'assoc', 'assq', 'assv', 'atan',
+
+            'begin', 'boolean?', 'bound-identifier=?',
+
+            'caar', 'caddr', 'cadr', 'call-with-current-continuation',
+            'call-with-input-file', 'call-with-output-file', 'call/cc', 'car',
+            'case', 'catch', 'cdddar', 'cddddr', 'cdr', 'ceiling', 'char->integer',
+            'char-alphabetic?', 'char-ci<=?', 'char-ci<?', 'char-ci?', 'char-ci>=?',
+            'char-ci>?', 'char-ci=?', 'char-downcase', 'char-lower-case?',
+            'char-numeric', 'char-ready', 'char-ready?', 'char-upcase',
+            'char-upper-case?', 'char-whitespace?', 'char<=?', 'char<?', 'char=?',
+            'char>=?', 'char>?', 'char?', 'close-input-port', 'close-output-port',
+            'complex?', 'cond', 'cons', 'construct-identifier', 'cos',
+            'current-input-port', 'current-output-port',
+
+            'd', 'define', 'define-syntax', 'delay', 'denominator', 'display', 'do',
+
+            'e', 'eof-object?', 'eq?', 'equal?', 'eqv?', 'even?', 'exact->inexact',
+            'exact?', 'exp', 'expt', 'else',
+
+            'f', 'floor', 'for-each', 'force', 'free-identifer=?',
+
+            'gcd', 'gen-counter', 'gen-loser', 'generate-identifier',
+
+            'identifier->symbol', 'identifier', 'if', 'imag-part', 'inexact->exact',
+            'inexact?', 'input-port?', 'integer->char', 'integer?', 'integrate-system',
+
+            'l', 'lambda', 'last-pair', 'lcm', 'length', 'let', 'let*', 'letrec',
+            'list', 'list->string', 'list->vector', 'list-ref', 'list-tail', 'list?',
+            'load', 'log',
+
+            'magnitude', 'make-polar', 'make-promise', 'make-rectangular',
+            'make-string', 'make-vector', 'map', 'map-streams', 'max', 'member',
+            'memq', 'memv', 'min', 'modulo',
+
+            'negative', 'newline', 'nil', 'not', 'null?', 'number->string', 'number?',
+            'numerator',
+
+            'odd?', 'open-input-file', 'open-output-file', 'or', 'output-port',
+
+            'pair?', 'peek-char', 'positive?', 'procedure?',
+
+            'quasiquote', 'quote', 'quotient',
+
+            'rational', 'rationalize', 'read', 'read-char', 'real-part', 'real?',
+            'remainder', 'return', 'reverse',
+
+            's', 'sequence', 'set!', 'set-char!', 'set-cdr!', 'sin', 'sqrt', 'string',
+            'string->list', 'string->number', 'string->symbol', 'string-append',
+            'string-ci<=?', 'string-ci<?', 'string-ci=?', 'string-ci>=?',
+            'string-ci>?', 'string-copy', 'string-fill!', 'string-length',
+            'string-ref', 'string-set!', 'string<=?', 'string<?', 'string=?',
+            'string>=?', 'string>?', 'string?', 'substring', 'symbol->string',
+            'symbol?', 'syntax', 'syntax-rules',
+
+            't', 'tan', 'template', 'transcript-off', 'transcript-on', 'truncate',
+
+            'unquote', 'unquote-splicing', 'unwrap-syntax',
+
+            'vector', 'vector->list', 'vector-fill!', 'vector-length', 'vector-ref',
+            'vector-set!', 'vector?',
+
+            'with-input-from-file', 'with-output-to-file', 'write', 'write-char',
+
+            'zero?'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/scilab.php b/vendor/easybook/geshi/geshi/scilab.php
new file mode 100755
index 000000000..f011497dd
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/scilab.php
@@ -0,0 +1,295 @@
+<?php
+/*************************************************************************************
+ * scilab.php
+ * --------
+ * Author: Christophe David (geshi@christophedavid.org)
+ * Copyright: (c) 2008 Christophe David (geshi@christophedavid.org)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/08/04
+ *
+ * SciLab language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/25 (1.0.8.1)
+ *   - Corrected with the help of Benny Baumann (BenBE@geshi.org)
+ * 2008/08/04 (0.0.0.1)
+ *   - First beta Release - known problem with ' used to transpose matrices considered as start of strings
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SciLab',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<=\)|\]|\w)'/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array(),
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'else', 'elseif', 'end', 'select', 'case', 'for', 'while', 'break'
+            ),
+        2 => array(
+            'STDIN', 'STDOUT', 'STDERR',
+            '%i', '%pi', '%e', '%eps', '%nan', '%inf', '%s', '%t', '%f',
+            'usual', 'polynomial', 'boolean', 'character', 'function', 'rational', 'state-space',
+            'sparse', 'boolean sparse', 'list', 'tlist', 'library', 'endfunction'
+            ),
+        3 => array(
+            '%asn', '%helps', '%k', '%sn', 'abcd', 'abinv', 'abort', 'about', 'About_M2SCI_tools',
+            'abs', 'acos', 'acosh', 'acoshm', 'acosm', 'AdCommunications', 'add_demo', 'add_edge',
+            'add_help_chapter', 'add_node', 'add_palette', 'addcolor', 'addf', 'addinter', 'addmenu',
+            'adj_lists', 'adj2sp', 'aff2ab', 'alufunctions', 'amell', 'analpf', 'analyze', 'and',
+            'ans', 'apropos', 'arc_graph', 'arc_number', 'arc_properties', 'argn', 'arhnk', 'arl2',
+            'arma', 'arma2p', 'armac', 'armax', 'armax1', 'arsimul', 'artest', 'articul', 'ascii',
+            'asciimat', 'asin', 'asinh', 'asinhm', 'asinm', 'assignation', 'atan', 'atanh', 'atanhm',
+            'atanm', 'augment', 'auread', 'auwrite', 'axes_properties', 'axis_properties', 'backslash',
+            'balanc', 'balreal', 'bandwr', 'banner','bar', 'barh', 'barhomogenize', 'basename', 'bdiag',
+            'beep', 'besselh', 'besseli', 'besselj', 'besselk', 'bessely', 'best_match', 'beta','bezout',
+            'bifish', 'bilin', 'binomial', 'black', 'bloc2exp', 'bloc2ss', 'bode', 'bool2s',
+            'boucle', 'brackets', 'browsevar', 'bsplin3val', 'bstap', 'buttmag', 'buttondialog',
+            'bvode', 'bvodeS', 'c_link', 'cainv', 'calendar', 'calerf', 'calfrq', 'call', 'canon', 'casc',
+            'cat', 'catch', 'ccontrg', 'cd', 'cdfbet', 'cdfbin', 'cdfchi', 'cdfchn', 'cdff', 'cdffnc',
+            'cdfgam', 'cdfnbn', 'cdfnor', 'cdfpoi', 'cdft', 'ceil', 'cell', 'cell2mat', 'cellstr', 'center',
+            'cepstrum', 'chain_struct', 'chaintest', 'champ', 'champ_properties', 'champ1', 'char', 'chart',
+            'chartooem', 'chdir', 'cheb1mag', 'cheb2mag', 'check_graph', 'chepol', 'chfact', 'chol', 'chsolve',
+            'circuit', 'classmarkov', 'clc', 'clean', 'clear', 'clear_pixmap', 'clearfun', 'clearglobal','clf',
+            'clipboard', 'close', 'cls2dls', 'cmb_lin', 'cmndred', 'cmoment', 'code2str', 'coeff', 'coff', 'coffg',
+            'colcomp', 'colcompr', 'colinout', 'colon', 'color', 'color_list', 'colorbar', 'colordef', 'colormap',
+            'colregul', 'comma', 'comments', 'comp', 'companion', 'comparison', 'Compound_properties', 'con_nodes',
+            'cond', 'config', 'configure_msvc', 'conj', 'connex', 'console', 'cont_frm', 'cont_mat', 'Contents',
+            'continue', 'contour', 'contour2d', 'contour2di', 'contourf', 'contr', 'contract_edge', 'contrss',
+            'convex_hull', 'convol', 'convstr', 'copfac', 'copy', 'corr', 'correl', 'cos', 'cosh', 'coshm',
+            'cosm', 'cotg', 'coth', 'cothm', 'covar', 'create_palette', 'cshep2d', 'csim', 'cspect', 'Cste',
+            'ctr_gram', 'cumprod', 'cumsum', 'cycle_basis', 'czt', 'dasrt', 'dassl', 'datafit', 'date', 'datenum',
+            'datevec', 'dbphi', 'dcf', 'ddp', 'debug', 'dec2hex', 'deff', 'definedfields', 'degree', 'delbpt',
+            'delete', 'delete_arcs', 'delete_nodes', 'delip', 'delmenu', 'demoplay', 'denom', 'derivat', 'derivative',
+            'des2ss', 'des2tf', 'det', 'determ', 'detr', 'detrend', 'dft', 'dhinf', 'dhnorm', 'diag', 'diary',
+            'diff', 'diophant', 'dir', 'dirname', 'disp', 'dispbpt', 'dispfiles', 'dlgamma', 'dnaupd', 'do', 'dot',
+            'double', 'dragrect', 'draw', 'drawaxis', 'drawlater', 'drawnow', 'driver', 'dsaupd', 'dscr',
+            'dsearch', 'dsimul', 'dt_ility', 'dtsi', 'edge_number', 'edit', 'edit_curv', 'edit_error',
+            'edit_graph', 'edit_graph_menus', 'editvar', 'eigenmarkov', 'ell1mag',
+            'empty', 'emptystr', 'eqfir', 'eqiir', 'equal', 'Equal', 'equil', 'equil1',
+            'ereduc', 'erf', 'erfc', 'erfcx', 'errbar', 'errcatch', 'errclear', 'error', 'error_table', 'etime',
+            'eval', 'eval_cshep2d', 'eval3d', 'eval3dp', 'evans', 'evstr', 'excel2sci', 'exec', 'execstr', 'exists',
+            'exit', 'exp', 'expm', 'external', 'extraction', 'eye', 'fac3d', 'factorial', 'factors', 'faurre', 'fchamp',
+            'fcontour', 'fcontour2d', 'fec', 'fec_properties', 'feedback', 'feval', 'ffilt', 'fft', 'fft2', 'fftshift',
+            'fgrayplot', 'figure', 'figure_properties', 'figure_style', 'file', 'fileinfo', 'fileparts', 'filter', 'find',
+            'find_freq', 'find_path', 'findABCD', 'findAC', 'findBD', 'findBDK', 'findm', 'findmsvccompiler', 'findobj',
+            'findR', 'findx0BD', 'firstnonsingleton', 'fit_dat', 'fix', 'floor', 'flts', 'foo', 'format',
+            'formatman', 'fort', 'fourplan', 'fplot2d', 'fplot3d', 'fplot3d1', 'fprintf', 'fprintfMat', 'frep2tf',
+            'freq', 'freson', 'frexp', 'frfit', 'frmag', 'fscanf', 'fscanfMat', 'fsfirlin', 'fsolve', 'fspecg',
+            'fstabst', 'fstair', 'ftest', 'ftuneq', 'full', 'fullfile', 'fullrf', 'fullrfk', 'fun2string', 'Funcall',
+            'funcprot', 'functions', 'funptr', 'fusee', 'G_make', 'g_margin', 'gainplot', 'gamitg',
+            'gamma', 'gammaln', 'gca', 'gcare', 'gcd', 'gce', 'gcf', 'gda', 'gdf', 'gen_net', 'genfac3d', 'genlib',
+            'genmarkov', 'geom3d', 'geomean', 'get', 'get_contents_infer', 'get_function_path', 'getcolor', 'getcwd',
+            'getd', 'getdate', 'getenv', 'getf', 'getfield', 'getfont', 'gethistory', 'getio', 'getlinestyle',
+            'getlongpathname', 'getmark', 'getmemory', 'getos', 'getpid', 'getscilabkeywords', 'getshell',
+            'getshortpathname', 'getsymbol', 'getvalue', 'getversion', 'gfare', 'gfrancis', 'girth', 'givens',
+            'glever', 'glist', 'global', 'GlobalProperty', 'glue', 'gmres', 'gpeche', 'gr_menu', 'graduate', 'grand',
+            'graph_2_mat', 'graph_center', 'graph_complement', 'graph_diameter', 'graph_power', 'graph_simp', 'graph_sum',
+            'graph_union', 'graphic', 'Graphics', 'graphics_entities', 'graph-list', 'graycolormap', 'grayplot',
+            'grayplot_properties', 'graypolarplot', 'great', 'grep', 'group', 'gschur', 'gsort', 'gspec', 'gstacksize',
+            'gtild', 'h_cl', 'h_inf', 'h_inf_st', 'h_norm', 'h2norm', 'halt', 'hamilton', 'hank', 'hankelsv', 'harmean',
+            'hat', 'havewindow', 'head_comments', 'help', 'help_skeleton', 'hermit', 'hess', 'hex2dec', 'hilb', 'hinf',
+            'hist3d', 'histplot', 'horner', 'host', 'hotcolormap', 'householder', 'hrmt', 'hsv2rgb', 'hsvcolormap',
+            'htrianr', 'hypermat', 'hypermatrices', 'iconvert', 'ieee', 'ifft', 'iir', 'iirgroup', 'iirlp',
+            'ilib_build', 'ilib_compile', 'ilib_for_link', 'ilib_gen_gateway', 'ilib_gen_loader', 'ilib_gen_Make',
+            'im_inv', 'imag', 'impl', 'imrep2ss', 'imult', 'ind2sub', 'Infer', 'inistate', 'input', 'insertion', 'int',
+            'int16', 'int2d', 'int32', 'int3d', 'int8', 'intc', 'intdec', 'integrate', 'interp', 'interp1', 'interp2d',
+            'interp3d', 'interpln', 'intersci', 'intersect', 'intg', 'intl', 'intppty', 'intsplin', 'inttrap', 'inttype',
+            'inv', 'inv_coeff', 'invr', 'invsyslin', 'iqr', 'is_connex', 'iscellstr', 'isdef', 'isdir', 'isempty',
+            'isequal', 'isequalbitwise', 'iserror', 'isglobal', 'isinf', 'isnan', 'isoview', 'isreal', 'javasci',
+            'jetcolormap', 'jmat', 'justify', 'kalm', 'karmarkar', 'kernel', 'keyboard', 'knapsack', 'kpure', 'krac2',
+            'kron', 'kroneck', 'label_properties', 'labostat', 'LANGUAGE', 'lasterror', 'lattn', 'lattp', 'lcf', 'lcm',
+            'lcmdiag', 'ldiv', 'ldivf', 'leastsq', 'left', 'legend', 'legend_properties', 'legendre', 'legends', 'length',
+            'leqr', 'less', 'lev', 'levin', 'lex_sort', 'lft', 'lgfft', 'lib', 'lin', 'lin2mu', 'lindquist',
+            'line_graph', 'linear_interpn', 'lines', 'LineSpec', 'linf', 'linfn', 'link', 'linmeq', 'linpro', 'linsolve',
+            'linspace', 'listfiles', 'listvarinfile', 'lmisolver', 'lmitool', 'load', 'load_graph', 'loadhistory',
+            'loadmatfile', 'loadplots', 'loadwave', 'locate', 'log', 'log10', 'log1p', 'log2', 'logm', 'logspace',
+            'lotest', 'lqe', 'lqg', 'lqg_ltr', 'lqg2stan', 'lqr', 'ls', 'lsq', 'lsq_splin', 'lsqrsolve', 'lsslist',
+            'lstcat', 'lstsize', 'ltitr', 'lu', 'ludel', 'lufact', 'luget', 'lusolve', 'lyap', 'm_circle', 'm2scideclare',
+            'macglov', 'macr2lst', 'macr2tree', 'macro', 'macrovar', 'mad', 'make_graph', 'make_index', 'makecell', 'man',
+            'manedit', 'mapsound', 'markp2ss', 'mat_2_graph', 'matfile2sci', 'Matlab-Scilab_character_strings', 'Matplot',
+            'Matplot_properties', 'Matplot1', 'matrices', 'matrix', 'max', 'max_cap_path', 'max_clique', 'max_flow',
+            'maxi', 'mcisendstring', 'mclearerr', 'mclose', 'mdelete', 'mean', 'meanf', 'median', 'menus', 'meof',
+            'merror', 'mese', 'mesh', 'mesh2d', 'meshgrid', 'mfft', 'mfile2sci', 'mfprintf', 'mfscanf', 'mget', 'mgeti',
+            'mgetl', 'mgetstr', 'milk_drop', 'min', 'min_lcost_cflow', 'min_lcost_flow1', 'min_lcost_flow2',
+            'min_qcost_flow', 'min_weight_tree', 'mine', 'mini', 'minreal', 'minss', 'minus', 'mkdir', 'mlist', 'mode',
+            'modulo', 'moment', 'mopen', 'move', 'mprintf', 'mps2linpro', 'mput', 'mputl', 'mputstr', 'mrfit', 'mscanf',
+            'msd', 'mseek', 'msprintf', 'msscanf', 'mstr2sci', 'mtell', 'mtlb_0', 'mtlb_a', 'mtlb_all', 'mtlb_any',
+            'mtlb_axis', 'mtlb_beta', 'mtlb_box', 'mtlb_close', 'mtlb_colordef', 'mtlb_conv', 'mtlb_cumprod', 'mtlb_cumsum',
+            'mtlb_dec2hex', 'mtlb_delete', 'mtlb_diag', 'mtlb_diff', 'mtlb_dir', 'mtlb_double', 'mtlb_e', 'mtlb_echo',
+            'mtlb_eig', 'mtlb_eval', 'mtlb_exist', 'mtlb_eye', 'mtlb_false', 'mtlb_fft', 'mtlb_fftshift', 'mtlb_find',
+            'mtlb_findstr', 'mtlb_fliplr', 'mtlb_fopen', 'mtlb_format', 'mtlb_fprintf', 'mtlb_fread', 'mtlb_fscanf',
+            'mtlb_full', 'mtlb_fwrite', 'mtlb_grid', 'mtlb_hold', 'mtlb_i', 'mtlb_ifft', 'mtlb_imp', 'mtlb_int16',
+            'mtlb_int32', 'mtlb_int8', 'mtlb_is', 'mtlb_isa', 'mtlb_isfield', 'mtlb_isletter', 'mtlb_isspace', 'mtlb_l',
+            'mtlb_legendre', 'mtlb_linspace', 'mtlb_load', 'mtlb_logic', 'mtlb_logical', 'mtlb_lower', 'mtlb_max',
+            'mtlb_min', 'mtlb_mode', 'mtlb_more', 'mtlb_num2str', 'mtlb_ones', 'mtlb_plot', 'mtlb_prod', 'mtlb_rand',
+            'mtlb_randn', 'mtlb_rcond', 'mtlb_realmax', 'mtlb_realmin', 'mtlb_repmat', 'mtlb_s', 'mtlb_save',
+            'mtlb_setstr', 'mtlb_size', 'mtlb_sort', 'mtlb_sparse', 'mtlb_strcmp', 'mtlb_strcmpi', 'mtlb_strfind',
+            'mtlb_strrep', 'mtlb_sum', 'mtlb_t', 'mtlb_toeplitz', 'mtlb_tril', 'mtlb_triu', 'mtlb_true', 'mtlb_uint16',
+            'mtlb_uint32', 'mtlb_uint8', 'mtlb_upper', 'mtlb_zeros', 'mu2lin', 'mucomp', 'mulf', 'mvvacov', 'name2rgb',
+            'names', 'nancumsum', 'nand2mean', 'nanmax', 'nanmean', 'nanmeanf', 'nanmedian', 'nanmin', 'nanstdev',
+            'nansum', 'narsimul', 'NDcost', 'ndgrid', 'ndims', 'nearfloat', 'nehari', 'neighbors', 'netclose', 'netwindow',
+            'netwindows', 'new', 'newaxes', 'newest', 'newfun', 'nextpow2', 'nf3d', 'nfreq', 'nlev', 'nnz', 'node_number',
+            'nodes_2_path', 'nodes_degrees', 'noisegen', 'norm', 'not', 'null', 'number_properties', 'numdiff', 'numer',
+            'nyquist', 'object_editor', 'obs_gram', 'obscont', 'obscont1', 'observer', 'obsv_mat', 'obsvss', 'ode',
+            'ode_discrete', 'ode_optional_output', 'ode_root', 'odedc', 'odeoptions', 'oemtochar', 'old_style',
+            'oldbesseli', 'oldbesselj', 'oldbesselk', 'oldbessely', 'oldload', 'oldplot', 'oldsave', 'ones',
+            'Operation', 'optim', 'or', 'orth', 'overloading', 'p_margin', 'param3d', 'param3d_properties',
+            'param3d1', 'paramfplot2d', 'parents', 'parrot', 'part', 'path_2_nodes', 'pathconvert', 'pause', 'pbig',
+            'pca', 'pcg', 'pdiv', 'pen2ea', 'pencan', 'penlaur', 'percent', 'perctl', 'perfect_match', 'perl',
+            'perms', 'permute', 'pertrans', 'pfss', 'phasemag', 'phc', 'pie', 'pinv', 'pipe_network', 'playsnd', 'plot',
+            'plot_graph', 'plot2d', 'plot2d_old_version', 'plot2d1', 'plot2d2', 'plot2d3', 'plot2d4', 'plot3d',
+            'plot3d_old_version', 'plot3d1', 'plot3d2', 'plot3d3', 'plotframe', 'plotprofile', 'plus', 'plzr',
+            'pmodulo', 'pol2des', 'pol2str', 'pol2tex', 'polar', 'polarplot', 'polfact', 'poly', 'polyline_properties',
+            'portr3d', 'portrait', 'power', 'ppol', 'prbs_a', 'predecessors', 'predef', 'print', 'printf',
+            'printf_conversion', 'printing', 'printsetupbox', 'prod', 'profile', 'progressionbar', 'proj', 'projsl',
+            'projspec', 'psmall', 'pspect', 'pvm', 'pvm_addhosts', 'pvm_barrier', 'pvm_bcast', 'pvm_bufinfo', 'pvm_config',
+            'pvm_delhosts', 'pvm_error', 'pvm_exit', 'pvm_f772sci', 'pvm_get_timer', 'pvm_getinst', 'pvm_gettid',
+            'pvm_gsize', 'pvm_halt', 'pvm_joingroup', 'pvm_kill', 'pvm_lvgroup', 'pvm_mytid', 'pvm_parent', 'pvm_probe',
+            'pvm_recv', 'pvm_reduce', 'pvm_sci2f77', 'pvm_send', 'pvm_set_timer', 'pvm_spawn', 'pvm_spawn_independent',
+            'pvm_start', 'pvm_tasks', 'pvm_tidtohost', 'pvmd3', 'pwd', 'qassign', 'qld', 'qmr', 'qr', 'quapro', 'quart',
+            'quaskro', 'quit', 'quote', 'rand', 'randpencil', 'range', 'rank', 'rankqr', 'rat',  'rcond',
+            'rdivf', 'read', 'read4b', 'readb', 'readc_', 'readmps', 'readxls', 'real', 'realtime', 'realtimeinit',
+            'rectangle_properties', 'recur', 'reglin', 'regress', 'remez', 'remezb', 'repfreq', 'replot', 'resethistory',
+            'residu', 'resume', 'return', 'rgb2name', 'ric_desc', 'ricc', 'riccati', 'rlist', 'rmdir', 'roots', 'rotate',
+            'round', 'routh_t', 'rowcomp', 'rowcompr', 'rowinout', 'rowregul', 'rowshuff', 'rpem', 'rref', 'rtitr',
+            'rubberbox', 'salesman', 'sample', 'samplef', 'samwr', 'save', 'save_format', 'save_graph', 'savehistory',
+            'savematfile', 'savewave', 'sca', 'scaling', 'scanf', 'scanf_conversion', 'scf', 'schur', 'sci_files',
+            'sci2exp', 'sci2for', 'sci2map', 'sciargs', 'SciComplex', 'SciComplexArray', 'SciDouble', 'SciDoubleArray',
+            'scilab', 'Scilab', 'ScilabEval', 'scilink', 'scipad', 'SciString', 'SciStringArray', 'sd2sci', 'sda', 'sdf',
+            'secto3d', 'segs_properties', 'semi', 'semicolon', 'semidef', 'sensi', 'set', 'set_posfig_dim',
+            'setbpt', 'setdiff', 'setenv', 'seteventhandler', 'setfield', 'sethomedirectory', 'setlanguage', 'setmenu',
+            'sfact', 'Sfgrayplot', 'Sgrayplot', 'sgrid', 'shortest_path', 'show_arcs', 'show_graph', 'show_nodes',
+            'show_pixmap', 'showprofile', 'sident', 'sign', 'Signal', 'signm', 'simp', 'simp_mode', 'sin', 'sinc',
+            'sincd', 'sinh', 'sinhm', 'sinm', 'size', 'slash', 'sleep', 'sm2des', 'sm2ss', 'smooth', 'solve',
+            'sorder', 'sort', 'sound', 'soundsec', 'sp2adj', 'spaninter', 'spanplus', 'spantwo', 'spchol',
+            'spcompack', 'spec', 'specfact', 'speye', 'spget', 'splin', 'splin2d', 'splin3d', 'split_edge', 'spones',
+            'sprand', 'sprintf', 'spzeros', 'sqroot', 'sqrt', 'sqrtm', 'square', 'squarewave', 'srfaur', 'srkf', 'ss2des',
+            'ss2ss', 'ss2tf', 'sscanf', 'sskf', 'ssprint', 'ssrand', 'st_deviation', 'st_ility', 'stabil', 'stacksize',
+            'star', 'startup', 'stdev', 'stdevf', 'str2code', 'strange', 'strcat', 'strindex', 'string', 'stringbox',
+            'strings', 'stripblanks', 'strong_con_nodes', 'strong_connex', 'strsplit', 'strsubst', 'struct', 'sub2ind',
+            'subf', 'subgraph', 'subplot', 'successors', 'sum', 'supernode', 'surf', 'surface_properties', 'sva',
+            'svd', 'svplot', 'sylm', 'sylv', 'symbols', 'sysconv', 'sysdiag', 'sysfact', 'syslin', 'syssize', 'system',
+            'systems', 'systmat', 'tabul', 'tan', 'tangent', 'tanh', 'tanhm', 'tanm', 'TCL_CreateSlave', 'TCL_DeleteInterp',
+            'TCL_EvalFile', 'TCL_EvalStr', 'TCL_ExistInterp', 'TCL_ExistVar', 'TCL_GetVar', 'TCL_GetVersion', 'TCL_SetVar',
+            'TCL_UnsetVar', 'TCL_UpVar', 'tdinit', 'testmatrix', 'texprint', 'text_properties', 'tf2des', 'tf2ss', 'then',
+            'thrownan', 'tic', 'tilda', 'time_id', 'timer', 'title', 'titlepage', 'TK_EvalFile', 'TK_EvalStr', 'tk_getdir',
+            'tk_getfile', 'TK_GetVar', 'tk_savefile', 'TK_SetVar',  'toc', 'toeplitz', 'tohome', 'tokenpos',
+            'tokens', 'toolbar', 'toprint', 'trace', 'trans', 'trans_closure', 'translatepaths', 'tree2code', 'trfmod',
+            'trianfml', 'tril', 'trimmean', 'trisolve', 'triu', 'try', 'trzeros', 'twinkle', 'type', 'Type', 'typename',
+            'typeof', 'ui_observer', 'uicontrol', 'uimenu', 'uint16', 'uint32', 'uint8', 'ulink', 'unglue', 'union',
+            'unique', 'unix', 'unix_g', 'unix_s', 'unix_w', 'unix_x', 'unobs', 'unsetmenu', 'unzoom', 'user', 'varargin',
+            'varargout', 'Variable', 'variance', 'variancef', 'varn', 'vectorfind', 'waitbar', 'warning', 'wavread',
+            'wavwrite', 'wcenter', 'wfir', 'what', 'where', 'whereami', 'whereis', 'who', 'who_user', 'whos',
+            'wiener', 'wigner', 'winclose', 'window', 'winlist', 'winopen', 'winqueryreg', 'winsid', 'with_atlas',
+            'with_gtk', 'with_javasci', 'with_pvm', 'with_texmacs', 'with_tk', 'writb', 'write', 'write4b', 'x_choices',
+            'x_choose', 'x_dialog', 'x_matrix', 'x_mdialog', 'x_message', 'x_message_modeless', 'xarc', 'xarcs', 'xarrows',
+            'xaxis', 'xbasc', 'xbasimp', 'xbasr', 'xchange', 'xclea', 'xclear', 'xclick', 'xclip', 'xdel', 'xend',
+            'xfarc', 'xfarcs', 'xfpoly', 'xfpolys', 'xfrect', 'xget', 'xgetech', 'xgetfile', 'xgetmouse', 'xgraduate',
+            'xgrid', 'xinfo', 'xinit', 'xlfont', 'xload', 'xls_open', 'xls_read', 'xmltohtml', 'xname', 'xnumb', 'xpause',
+            'xpoly', 'xpolys', 'xrect', 'xrects', 'xrpoly', 'xs2bmp', 'xs2emf', 'xs2eps', 'xs2fig', 'xs2gif', 'xs2ppm',
+            'xs2ps', 'xsave', 'xsegs', 'xselect', 'xset', 'xsetech', 'xsetm', 'xstring', 'xstringb', 'xstringl', 'xtape',
+            'xtitle', 'yulewalk', 'zeropen', 'zeros', 'zgrid', 'zoom_rect', 'zpbutt', 'zpch1', 'zpch2', 'zpell'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', ':', "'"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => '',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            4 => 'color: #009999;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
+        2 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
+        3 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variable
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        //File Descriptor
+        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/scl.php b/vendor/easybook/geshi/geshi/scl.php
new file mode 100644
index 000000000..6b0e494f2
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/scl.php
@@ -0,0 +1,148 @@
+<?php
+/*************************************************************************************
+ * <scl.php>
+ * ---------------------------------
+ * Author: Leonhard H�sch (leonhard.hoesch@siemens.com)
+ * Copyright: (c) 2008 by Leonhard H�sch (siemens.de)
+ * Release Version: 1.0.8.12
+ * Date Started: 2012/09/25
+ *
+ * SCL language file for GeSHi.
+ *
+ * A SCL langauge file.
+ *
+ * CHANGES
+ * -------
+ * <date-of-release> (<GeSHi release>)
+ *  -  First Release
+ *
+ * TODO (updated <date-of-release>)
+ * -------------------------
+ * <things-to-do>
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SCL',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '$',
+    'KEYWORDS' => array(
+        1 => array(
+            'AND','ANY','ARRAY','AT','BEGIN','BLOCK_DB','BLOCK_FB','BLOCK_FC','BLOCK_SDB',
+            'BLOCK_SFB','BLOCK_SFC','BOOL','BY','BYTE','CASE','CHAR','CONST','CONTINUE','COUNTER',
+            'DATA_BLOCK','DATE','DATE_AND_TIME','DINT','DIV','DO','DT','DWORD','ELSE','ELSIF',
+            'EN','END_CASE','END_CONST','END_DATA_BLOCK','END_FOR','END_FUNCTION',
+            'END_FUNCTION_BLOCK','END_IF','END_LABEL','END_TYPE','END_ORGANIZATION_BLOCK',
+            'END_REPEAT','END_STRUCT','END_VAR','END_WHILE','ENO','EXIT','FALSE','FOR','FUNCTION',
+            'FUNCTION_BLOCK','GOTO','IF','INT','LABEL','MOD','NIL','NOT','OF','OK','OR',
+            'ORGANIZATION_BLOCK','POINTER','PROGRAM','REAL','REPEAT','RETURN','S5TIME','STRING',
+            'STRUCT','THEN','TIME','TIMER','TIME_OF_DAY','TO','TOD','TRUE','TYPE','VAR',
+            'VAR_TEMP','UNTIL','VAR_INPUT','VAR_IN_OUT','VAR_OUTPUT','VOID','WHILE','WORD','XOR'
+            ),
+        2 =>array(
+            'UBLKMOV','FILL','CREAT_DB','DEL_DB','TEST_DB','COMPRESS','REPL_VAL','CREA_DBL','READ_DBL',
+            'WRIT_DBL','CREA_DB','RE_TRIGR','STP','WAIT','MP_ALM','CiR','PROTECT','SET_CLK','READ_CLK',
+            'SNC_RTCB','SET_CLKS','RTM','SET_RTM','CTRL_RTM','READ_RTM','TIME_TCK','RD_DPARM',
+            'RD_DPARA','WR_PARM','WR_DPARM','PARM_MOD','WR_REC','RD_REC','RD_DPAR','RDREC','WRREC','RALRM',
+            'SALRM','RCVREC','PRVREC','SET_TINT','CAN_TINT','ACT_TINT','QRY_TINT','SRT_DINT','QRY_DINT',
+            'CAN_DINT','MSK_FLT','DMSK_FLT','READ_ERR','DIS_IRT','EN_IRT','DIS_AIRT','EN_AIRT','RD_SINFO',
+            'RDSYSST','WR_USMSG','OB_RT','C_DIAG','DP_TOPOL','UPDAT_PI','UPDAT_PO','SYNC_PI','SYNC_PO',
+            'SET','RSET','DRUM','GADR_LGC','LGC_GADR','RD_LGADR','GEO_LOG','LOG_GEO','DP_PRAL','DPSYC_FR',
+            'D_ACT_DP','DPNRM_DG','DPRD_DAT','DPWR_DAT','PN_IN','PN_OUT','PN_DP','WWW','IP_CONF','GETIO',
+            'SETIO','GETIO_PART','SETIO_PART','GD_SND','GD_RCV','USEND','URCV','BSEND','BRCV','PUT','GET',
+            'PRINT','START','STOP','RESUME','STATUS','USTATUS','CONTROL','C_CNTRL','X_SEND','X_RCV',
+            'X_GET','X_PUT','X_ABORT','I_GET','I_PUT','I_ABORT','TCON','TDISCON','TSEND','TRCV','TUSEND',
+            'TURCV','NOTIFY','NOTIFY_8P','ALARM','ALARM_8P','ALARM_8','AR_SEND','DIS_MSG','EN_MSG',
+            'ALARM_SQ','ALARM_S','ALARM_SC','ALARM_DQ','LARM_D','READ_SI','DEL_SI','TP','TON','TOF','CTU',
+            'CTD','CTUD','CONT_C','CONT_S','PULSEGEN','Analog','DIGITAL','COUNT','FREQUENC','PULSE',
+            'SEND_PTP','RECV_PTP','RES_RECV','SEND_RK','FETCH_RK','SERVE_RK','H_CTRL','state'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '.', '"', '|', ';', ',', '=>', '>=', '<=', ':=', '=', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #ff6f00;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #009600; font-style: italic;',
+            'MULTI' => 'color: #009600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'NUMBERS' => GESHI_NUMBER_INT_BASIC,
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<?php11!!' => '!!11?>'
+            ),
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/sdlbasic.php b/vendor/easybook/geshi/geshi/sdlbasic.php
new file mode 100755
index 000000000..b95003fcc
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/sdlbasic.php
@@ -0,0 +1,163 @@
+<?php
+/*************************************************************************************
+ * sdlbasic.php
+ * ------------
+ * Author: Roberto Rossi
+ * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/08/19
+ *
+ * sdlBasic (http://sdlbasic.sf.net) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/19 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'sdlBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => "rem", 3 => "!", 4 => "#"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'const', 'option', 'explicit', 'qbasic', 'include', 'argc',
+            'argv', 'command', 'command$', 'run', 'shell', 'os', 'declare',
+            'sub', 'function', 'return', 'while', 'wend', 'exit', 'end',
+            'continue', 'if', 'then', 'else', 'elseif',
+            'select', 'case', 'for', 'each', 'step',
+            'next', 'to', 'dim', 'shared', 'common', 'lbound', 'bound',
+            'erase', 'asc', 'chr', 'chr$', 'insert', 'insert$', 'instr', 'lcase',
+            'lcase$', 'left', 'left$', 'len', 'length', 'ltrim', 'ltrim$', 'mid',
+            'mid$', 'replace', 'replace$', 'replacesubstr', 'replacesubstr$',
+            'reverse', 'reverse$', 'right', 'right$', 'rinstr', 'rtrim', 'rtrim$',
+            'space', 'space$', 'str', 'str$', 'strf', 'strf$', 'string', 'string$',
+            'tally', 'trim', 'trim$', 'typeof', 'typeof$', 'ucase', 'ucase$', 'val',
+            'abs', 'acos', 'andbit', 'asin', 'atan', 'bitwiseand', 'bitwiseor',
+            'bitwisexor', 'cos', 'exp', 'fix', 'floor', 'frac', 'hex', 'hex$', 'int',
+            'log', 'min', 'max', 'orbit', 'randomize', 'rnd', 'round', 'sgn', 'sin',
+            'sqr', 'tan', 'xorbit', 'open', 'as', 'file', 'input', 'close', 'output',
+            'append', 'eof', 'fileexists', 'filecopy', 'filemove', 'filerename',
+            'freefile', 'kill', 'loc', 'lof', 'readbyte', 'rename', 'seek',
+            'writebyte', 'chdir', 'dir', 'dir$', 'direxists', 'dirfirst', 'dirnext',
+            'mkdir', 'rmdir', 'print', 'date', 'date$', 'time', 'time$', 'ticks',
+            'data', 'read', 'reservebank', 'freebank', 'copybank', 'loadbank',
+            'savebank', 'setbank', 'sizebank', 'poke', 'doke', 'loke', 'peek', 'deek',
+            'leek', 'memcopy', 'setdisplay', 'setcaption', 'caption', 'displaywidth',
+            'displayheight', 'displaybpp', 'screen', 'directscreen', 'screenopen',
+            'screenclose', 'screenclone', 'screencopy', 'screenfade', 'screenfadein',
+            'screencrossfade', 'screenalpha', 'screenlock', 'screenunlock',
+            'screenrect', 'xscreenrect', 'yscreenrect', 'wscreenrect', 'hscreenrect',
+            'flagscreenrect', 'screenwidth', 'screenheight', 'offset', 'xoffset',
+            'yoffset', 'cls', 'screenswap', 'autoback', 'setautoback',
+            'dualplayfield', 'waitvbl', 'fps', 'rgb', 'enablepalette', 'color',
+            'palette', 'colorcycling', 'ink', 'point', 'dot', 'plot', 'line', 'box',
+            'bar', 'circle', 'fillcircle', 'ellipse', 'fillellipse', 'paint',
+            'loadimage', 'saveimage', 'loadsound', 'savesound', 'loadmusic',
+            'hotspot', 'setcolorkey', 'imageexists', 'imagewidth', 'imageheight',
+            'deleteimage', 'copyimage', 'setalpha', 'zoomimage', 'rotateimage',
+            'rotozoomimage', 'blt', 'pastebob', 'pasteicon', 'grab', 'spriteclip',
+            'sprite', 'deletesprite', 'xsprite', 'ysprite', 'spritewidth',
+            'spriteheight', 'frsprite', 'livesprite', 'spritehit', 'autoupdatesprite',
+            'updatesprite', 'setbob', 'bob', 'deletebob', 'xbob', 'ybob', 'bobwidth',
+            'bobheight', 'frbob', 'livebob', 'bobhit', 'autoupdatebob', 'updatebob',
+            'text', 'setfont', 'textrender', 'pen', 'paper', 'prints', 'locate',
+            'atx', 'aty', 'curson', 'cursoff', 'inputs', 'zoneinputs',
+            'isenabledsound', 'soundexists', 'deletesound', 'copysound',
+            'musicexists', 'playsound', 'volumesound', 'stopsound', 'pausesound',
+            'resumesound', 'vumetersound', 'positionsound', 'soundchannels',
+            'playmusic', 'positionmusic', 'stopmusic', 'fademusic', 'pausemusic',
+            'resumemusic', 'rewindmusic', 'volumemusic', 'speedmusic', 'numdrivescd',
+            'namecd', 'getfreecd', 'opencd', 'indrivecd', 'trackscd', 'curtrackcd',
+            'curframecd', 'playcd', 'playtrackscd',
+            'pausecd', 'resumecd', 'stopcd', 'ejectcd', 'closecd', 'tracktypecd',
+            'tracklengthcd', 'trackoffsetcd', 'key', 'inkey', 'waitkey', 'xmouse',
+            'ymouse', 'xmousescreen', 'ymousescreen', 'bmouse', 'changemouse',
+            'locatemouse', 'mouseshow', 'mousehide', 'mousezone', 'numjoysticks',
+            'namejoystick', 'numaxesjoystick', 'numballsjoystick', 'numhatsjoystick',
+            'numbuttonsjoystick', 'getaxisjoystick', 'gethatjoystick',
+            'getbuttonjoystick', 'xgetballjoystick', 'ygetballjoystick', 'joy',
+            'bjoy', 'wait', 'timer', 'isenabledsock', 'getfreesock', 'opensock',
+            'acceptsock', 'isserverready', 'connectsock', 'connectionreadysock',
+            'isclientready', 'losesock', 'peeksock', 'readsock', 'readbytesock',
+            'readlinesock', 'writesock', 'writebytesock', 'writelinesock',
+            'getremoteip', 'getremoteport', 'getlocalip'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;',
+            3 => 'color: #808080;',
+            4 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/smalltalk.php b/vendor/easybook/geshi/geshi/smalltalk.php
new file mode 100755
index 000000000..5b61badaf
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/smalltalk.php
@@ -0,0 +1,154 @@
+<?php
+/*************************************************************************************
+ * smalltalk.php
+ * --------
+ * Author: Bananeweizen (Bananeweizen@gmx.de)
+ * Copyright: (c) 2005 Bananeweizen (www.bananeweizen.de)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/03/27
+ *
+ * Smalltalk language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006-05-24 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ * * recognize nested array symbols correctly
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Smalltalk',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('"' => '"'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'self','super','true','false','nil'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '=' , ':=', '(', ')', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #7f007f;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #007f00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #7f0000;'
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            1 => 'color: #7f0000;',
+            2 => 'color: #7f0000;',
+            3 => 'color: #00007f;',
+            5 => 'color: #00007f;',
+            6 => 'color: #00007f;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '([^a-zA-Z0-9_#<])([A-Z]+[a-zA-Z0-9_]*)(?!>)', //class names
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => '(#+)([a-zA-Z0-9_]+)', //symbols
+            GESHI_REPLACE => '\\1\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(#\s*\([^)]*\))', //array symbols
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '<PIPE>([a-zA-Z0-9_\s]+)<PIPE>', //temporary variables
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '|',
+            GESHI_AFTER => '|'
+            ),
+        5 => array(
+            GESHI_SEARCH => '([:(,=[.*\/+-]\s*(?!\d+\/))([a-zA-Z0-9_]+)', //message parameters, message receivers
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        6 => array(
+            GESHI_SEARCH => '([a-zA-Z0-9_]+)(\s*:=)', //assignment targets
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/smarty.php b/vendor/easybook/geshi/geshi/smarty.php
new file mode 100755
index 000000000..883b3eb7c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/smarty.php
@@ -0,0 +1,190 @@
+<?php
+/*************************************************************************************
+ * smarty.php
+ * ----------
+ * Author: Alan Juden (alan@judenware.org)
+ * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/07/10
+ *
+ * Smarty template language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.0)
+ *  -  Initial Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Smarty',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('{*' => '*}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '$smarty', 'now', 'const', 'capture', 'config', 'section', 'foreach', 'template', 'version', 'ldelim', 'rdelim',
+            'foreachelse', 'include', 'include_php', 'insert', 'if', 'elseif', 'else', 'php',
+            'sectionelse', 'is_cached',
+            ),
+        2 => array(
+            'capitalize', 'count_characters', 'cat', 'count_paragraphs', 'count_sentences', 'count_words', 'date_format',
+            'default', 'escape', 'indent', 'lower', 'nl2br', 'regex_replace', 'replace', 'spacify', 'string_format',
+            'strip', 'strip_tags', 'truncate', 'upper', 'wordwrap',
+            ),
+        3 => array(
+            'counter', 'cycle', 'debug', 'eval', 'html_checkboxes', 'html_image', 'html_options',
+            'html_radios', 'html_select_date', 'html_select_time', 'html_table', 'math', 'mailto', 'popup_init',
+            'popup', 'textformat'
+            ),
+        4 => array(
+            '$template_dir', '$compile_dir', '$config_dir', '$plugins_dir', '$debugging', '$debug_tpl',
+            '$debugging_ctrl', '$autoload_filters', '$compile_check', '$force_compile', '$caching', '$cache_dir',
+            '$cache_lifetime', '$cache_handler_func', '$cache_modified_check', '$config_overwrite',
+            '$config_booleanize', '$config_read_hidden', '$config_fix_newlines', '$default_template_handler_func',
+            '$php_handling', '$security', '$secure_dir', '$security_settings', '$trusted_dir', '$left_delimiter',
+            '$right_delimiter', '$compiler_class', '$request_vars_order', '$request_use_auto_globals',
+            '$error_reporting', '$compile_id', '$use_sub_dirs', '$default_modifiers', '$default_resource_type'
+            ),
+        5 => array(
+            'append', 'append_by_ref', 'assign', 'assign_by_ref', 'clear_all_assign', 'clear_all_cache',
+            'clear_assign', 'clear_cache', 'clear_compiled_tpl', 'clear_config', 'config_load', 'display',
+            'fetch', 'get_config_vars', 'get_registered_object', 'get_template_vars',
+            'load_filter', 'register_block', 'register_compiler_function', 'register_function',
+            'register_modifier', 'register_object', 'register_outputfilter', 'register_postfilter',
+            'register_prefilter', 'register_resource', 'trigger_error', 'template_exists', 'unregister_block',
+            'unregister_compiler_function', 'unregister_function', 'unregister_modifier', 'unregister_object',
+            'unregister_outputfilter', 'unregister_postfilter', 'unregister_prefilter', 'unregister_resource'
+            ),
+        6 => array(
+            'name', 'file', 'scope', 'global', 'key', 'once', 'script',
+            'loop', 'start', 'step', 'max', 'show', 'values', 'value', 'from', 'item'
+            ),
+        7 => array(
+            'eq', 'neq', 'ne', 'lte', 'gte', 'ge', 'le', 'not', 'mod'
+            ),
+        8 => array(
+            // some common php functions
+            'isset', 'is_array', 'empty', 'count', 'sizeof'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '=', '==', '!=', '>', '<', '>=', '<=', '!', '%'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',        //Functions
+            2 => 'color: #008000;',        //Modifiers
+            3 => 'color: #0600FF;',        //Custom Functions
+            4 => 'color: #804040;',        //Variables
+            5 => 'color: #008000;',        //Methods
+            6 => 'color: #6A0A0A;',        //Attributes
+            7 => 'color: #D36900;',        //Text-based symbols
+            8 => 'color: #0600FF;'        //php functions
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #D36900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #D36900;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00aaff;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://smarty.php.net/{FNAMEL}',
+        2 => 'http://smarty.php.net/{FNAMEL}',
+        3 => 'http://smarty.php.net/{FNAMEL}',
+        4 => 'http://smarty.php.net/{FNAMEL}',
+        5 => 'http://smarty.php.net/{FNAMEL}',
+        6 => '',
+        7 => 'http://smarty.php.net/{FNAMEL}',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        // variables
+        0 => '\$[a-zA-Z][a-zA-Z0-9_]*'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '{' => '}'
+            ),
+        1 => array(
+            '<!--' => '-->',
+        ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => false,
+        2 => false
+    ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#;>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-&])"
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/spark.php b/vendor/easybook/geshi/geshi/spark.php
new file mode 100755
index 000000000..0284a1a47
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/spark.php
@@ -0,0 +1,132 @@
+<?php
+/*************************************************************************************
+ * ada.php
+ * -------
+ * Author: Phil Thornley (tux@inmail.cz)
+ * Copyright: (c) 2004 Phil Thornley (http://www.sparksure.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/08/22
+ *
+ * SPARK language file for GeSHi.
+ *
+ * Created by modifying Ada file version 1.0.2
+ * Words are from SciTe configuration file
+ *
+ * CHANGES
+ * -------
+ * 2010/08/28 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2010/08/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SPARK',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '--#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'begin', 'declare', 'do', 'else', 'elsif', 'exception', 'for', 'if',
+            'is', 'loop', 'while', 'then', 'end', 'select', 'case', 'until',
+            'goto', 'return'
+            ),
+        2 => array(
+            'abs', 'and', 'at', 'mod', 'not', 'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abort', 'abstract', 'accept', 'access', 'aliased', 'all', 'array',
+            'body', 'constant', 'delay', 'delta', 'digits', 'entry', 'exit',
+            'function', 'generic', 'in', 'interface', 'limited', 'new', 'null',
+            'of', 'others', 'out', 'overriding', 'package', 'pragma', 'private',
+            'procedure', 'protected', 'raise', 'range', 'record', 'renames',
+            'requeue', 'reverse', 'separate', 'subtype', 'synchronized',
+            'tagged', 'task', 'terminate', 'type', 'use', 'when', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            2 => 'color: #adadad; font-style: italic; font-weight: bold;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/sparql.php b/vendor/easybook/geshi/geshi/sparql.php
new file mode 100755
index 000000000..282165a01
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/sparql.php
@@ -0,0 +1,155 @@
+<?php
+/*************************************************************************************
+ * sparql.php
+ * -------
+ * Author: Karima Rafes (karima.rafes@bordercloud.com)
+ * Copyright: (c) 2011 Bourdercloud.com
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/11/05
+ *
+ * SPARQL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/11/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SPARQL',
+    'COMMENT_SINGLE' => array('#'),
+    'COMMENT_MULTI' => array('/*' => '*/' ),
+    'COMMENT_REGEXP' => array(
+        //IRI (it's not a comment ;)
+        1 => "/<[^> ]*>/i"
+        ),
+    'CASE_KEYWORDS' => 1,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'BASE','PREFIX','SELECT','DISTINCT','REDUCED','CONSTRUCT','DESCRIBE','ASK','FROM',
+            'NAMED','WHERE','ORDER','BY','ASC','DESC','LIMIT','OFFSET','OPTIONAL','GRAPH',
+            'UNION','FILTER','STR','LANG','LANGMATCHES','DATATYPE','BOUND','SAMETERM',
+            'ISIRI','ISURI','ISBLANK',
+            'ISLITERAL','REGEX','SUBSTR','TRUE',
+            'FALSE','LOAD','CLEAR',
+            'DROP','ADD','MOVE','COPY',
+            'CREATE','DELETE','INSERT',
+            'USING','SILENT','DEFAULT','ALL',
+            'DATA','WITH','INTO','TO',
+            'AS','GROUP','HAVING','UNDEF',
+            'BINDINGS','SERVICE','BIND','MINUS_KEYWORD',
+            'IRI','URI', 'BNODE',
+            'RAND','ABS','CEIL','FLOOR','ROUND',
+            'CONCAT','STRLEN',
+            'UCASE','LCASE','ENCODE_FOR_URI',
+            'CONTAINS','STRSTARTS',
+            'STRENDS','STRBEFORE',
+            'STRAFTER','REPLACE',
+            'YEAR','MONTH',
+            'DAY','HOURS',
+            'MINUTES','SECONDS',
+            'TIMEZONE','TZ',
+            'NOW','MD5',
+            'SHA1','SHA224',
+            'SHA256','SHA384',
+            'SHA512','COALESCE',
+            'IF','STRLANG','STRDT',
+            'ISNUMERIC','COUNT',
+            'SUM','MIN',
+            'MAX','AVG','SAMPLE',
+            'GROUP_CONCAT ','NOT',
+            'IN','EXISTS','SEPARATOR'
+            )
+        ),
+    'REGEXPS' => array(
+        //Variables without braces
+        1 => "\\?[a-zA-Z_][a-zA-Z0-9_]*",
+        //prefix
+        2 => "[a-zA-Z_.\\-0-9]*:",
+        //tag lang
+        3 => "@[^ .)}]*",
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '{', '}' , '.', ';'
+            ),
+        1 => array(
+            '^^',
+            '<=','>=','!=','=','<','>','|',
+            '&&','||',
+            '(',')','[', ']',
+            '+','-','*','!','/'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #808080; font-style: italic;',
+            1 => 'color: #000078;',
+            //2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF63C3;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;',
+            1 => 'color: #FF8000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(),
+        'REGEXPS' => array(
+            1 => 'color: #007800;',
+            2 => 'color: #780078;',
+            3 => 'color: #005078;'
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/sql.php b/vendor/easybook/geshi/geshi/sql.php
new file mode 100755
index 000000000..f4d130eb9
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/sql.php
@@ -0,0 +1,170 @@
+<?php
+/*************************************************************************************
+ * sql.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Contributors:
+ *  - Jürgen Thomas (Juergen.Thomas@vs-polis.de)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * SQL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/07/19 (1.0.8.9)
+ *  -  Added many more keywords
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added additional symbols for highlighting
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *  -  Added "`" string delimiter
+ *  -  Added "#" single comment starter
+ * 2004/08/05 (1.0.1)
+ *  -  Added support for symbols
+ *  -  Added many more keywords (mostly MYSQL keywords)
+ * 2004/07/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Add all keywords
+ * * Split this to several sql files - mysql-sql, ansi-sql etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SQL',
+    'COMMENT_SINGLE' => array(1 =>'--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => 1,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC', 'AUTO_INCREMENT',
+            'BEFORE', 'BEGIN', 'BETWEEN', 'BIGINT', 'BINARY', 'BLOB', 'BOOLEAN', 'BOTH', 'BY',
+            'CALL', 'CASE', 'CAST', 'CEIL', 'CEILING', 'CHANGE', 'CHAR', 'CHAR_LENGTH', 'CHARACTER',
+            'CHARACTER_LENGTH', 'CHECK', 'CLOB', 'COALESCE', 'COLLATE', 'COLUMN', 'COLUMNS',
+            'CONNECT', 'CONSTRAINT', 'CONVERT', 'COUNT', 'CREATE', 'CROSS', 'CURRENT',
+            'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
+            'DATA', 'DATABASE', 'DATABASES', 'DATE', 'DAY', 'DEC', 'DECIMAL', 'DECLARE',
+            'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE', 'DISTINCT', 'DOUBLE',
+            'DOMAIN', 'DROP',
+            'ELSE', 'ENCLOSED', 'END', 'ESCAPED', 'EXCEPT', 'EXEC', 'EXECUTE', 'EXISTS', 'EXP',
+            'EXPLAIN', 'EXTRACT',
+            'FALSE', 'FIELD', 'FIELDS', 'FILTER', 'FIRST', 'FLOAT', 'FLOOR', 'FLUSH', 'FOR',
+            'FOREIGN', 'FROM', 'FULL', 'FUNCTION',
+            'GET', 'GROUP', 'GROUPING', 'GO', 'GOTO', 'GRANT', 'GRANTED',
+            'HAVING', 'HOUR',
+            'IDENTIFIED', 'IDENTITY', 'IF', 'IGNORE', 'IN', 'INCREMENT', 'INDEX', 'INFILE', 'INNER',
+            'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERSECTION', 'INTERVAL',
+            'INTO', 'IS',
+            'JOIN',
+            'KEY', 'KEYS', 'KILL',
+            'LANGUAGE', 'LARGE', 'LAST', 'LEADING', 'LEFT', 'LENGTH', 'LIKE', 'LIMIT', 'LINES', 'LOAD',
+            'LOCAL', 'LOCK', 'LOW_PRIORITY', 'LOWER',
+            'MATCH', 'MAX', 'MERGE', 'MIN', 'MINUTE', 'MOD', 'MODIFIES', 'MODIFY', 'MONTH',
+            'NATIONAL', 'NATURAL', 'NCHAR', 'NEW', 'NEXT', 'NEXTVAL', 'NONE', 'NOT',
+            'NULL', 'NULLABLE', 'NULLIF', 'NULLS', 'NUMBER', 'NUMERIC',
+            'OF', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPTIMIZE', 'OPTION',
+            'OPTIONALLY', 'OR', 'ORDER', 'OUT', 'OUTER', 'OUTFILE', 'OVER',
+            'POSITION', 'POWER', 'PRECISION', 'PREPARE', 'PRIMARY', 'PROCEDURAL', 'PROCEDURE',
+            'READ', 'REAL', 'REF', 'REFERENCES', 'REFERENCING', 'REGEXP', 'RENAME', 'REPLACE',
+            'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'RLIKE', 'ROLLBACK', 'ROW',
+            'ROW_NUMBER', 'ROWS', 'RESTRICT', 'ROLE', 'ROUTINE', 'ROW_COUNT',
+            'SAVEPOINT', 'SEARCH', 'SECOND', 'SECTION', 'SELECT', 'SELF', 'SEQUENCE',
+            'SESSION', 'SET', 'SETVAL', 'SHOW', 'SIMILAR', 'SIZE', 'SMALLINT', 'SOME',
+            'SONAME', 'SOURCE', 'SPACE', 'SQL', 'SQRT', 'START', 'STATUS',
+            'STRAIGHT_JOIN', 'STRUCTURE', 'STYLE', 'SUBSTRING', 'SUM',
+            'TABLE', 'TABLE_NAME', 'TABLES', 'TERMINATED', 'TEMPORARY', 'THEN', 'TIME',
+            'TIMESTAMP', 'TO', 'TRAILING', 'TRANSACTION', 'TRIGGER', 'TRIM', 'TRUE', 'TRUNCATE',
+            'TRUSTED', 'TYPE',
+            'UNDER', 'UNION', 'UNIQUE', 'UNKNOWN', 'UNLOCK', 'UNSIGNED',
+            'UPDATE', 'UPPER', 'USE', 'USER', 'USING',
+            'VALUE', 'VALUES', 'VARCHAR', 'VARIABLES', 'VARYING', 'VIEW',
+            'WHEN', 'WHERE', 'WITH', 'WITHIN', 'WITHOUT', 'WORK', 'WRITE',
+            'XOR',
+            'YEAR',
+            'ZEROFILL'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', ',', '.', '+', '-', '*', '/'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            //2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array( //'
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\.\|\#|^&])"
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/stonescript.php b/vendor/easybook/geshi/geshi/stonescript.php
new file mode 100755
index 000000000..2844e885e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/stonescript.php
@@ -0,0 +1,307 @@
+<?php
+/*************************************************************************************
+ * stonescript.php
+ * --------
+ * Author: Archimmersion ( based on ruby.php by Moises Deniz )
+ * Copyright: (c) 2011 Archimmersion ( http://www.archimmersion.com )
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/03/30
+ *
+ * StoneScript language file for GeSHi.
+ *
+ * StonesCript is a Lua based script language for the ShiVa3D game engine ( http://www.stonetrip.com )
+ *
+ * More information can be found at http://www.stonetrip.com/developer/doc/api/introduction
+ *
+ * CHANGES
+ * -------
+ * 2011/04/18 (1.0.8.11)
+ *   -  Initial release
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'StoneScript',
+    'COMMENT_SINGLE' => array(1 => "--"),
+    'COMMENT_MULTI' => array("--[[" => "]]"),
+    'COMMENT_REGEXP' => array(
+        4 => '/<<\s*?(\w+)\\n.*?\\n\\1(?![a-zA-Z0-9])/si',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // Blue - General Keywords
+        1 => array(
+                'and', 'begin', 'break', 'do', 'else', 'elseif', 'end',
+                'for', 'if', 'in', 'while', 'next', 'not', 'or', 'redo',
+                'then', 'unless', 'until', 'when', 'false', 'nil', 'self',
+                'true', 'local', 'this', 'return',
+            ),
+        // Dark Blue - Main API names
+        2 => array(
+                'animation', 'application', 'cache', 'camera', 'debug',
+                'dynamics', 'group', 'hashtable', 'hud', 'input', 'light',
+                'log', 'math', 'mesh', 'microphone', 'music', 'navigation',
+                'network', 'object', 'pixelmap', 'projector', 'scene',
+                'sensor', 'server', 'session', 'sfx', 'shape', 'sound',
+                'string', 'system', 'table', 'user', 'video', 'xml',
+                // Plugin API names
+                'plasma', 'watersim',
+                'winDirectories',
+                'ActionSheet', 'Alert', 'Mail', 'Picker', 'StatusBar',
+            ),
+        // Constants
+        // Can be commented out if performance is crucial -> then these keywords will appear in a slightly lighter color
+        3 => array(
+                //Animation
+                'kPlaybackModeLoop', 'kPlaybackModeLoopMirrored', 'kPlaybackModeLoopReversed',
+                'kPlaybackModeOnce', 'kPlaybackModeOnceReversed',
+                //Application - Environment
+                'kStatusLoading', 'kStatusReady', 'kStatusSaving', // 'kStatusNone'
+                //Application - Options
+                'kOptionAudioMasterVolume', 'kOptionAutomaticVirtualKeyboard', 'kOptionDynamicShadowsBufferCount',
+                'kOptionDynamicShadowsBufferSize', 'kOptionDynamicShadowsConstantSampling', 'kOptionDynamicShadowsPCFSampleCount',
+                'kOptionDynamicShadowsQuality', 'kOptionDynamicShadowsScreenSpaceBlur', 'kOptionFullscreen',
+                'kOptionFullscreenHeight', 'kOptionFullscreenWidth', 'kOptionHardwareOcclusion',
+                'kOptionMaxEventBouncesPerFrame', 'kOptionNetworkStreams', 'kOptionNetworkStreamsUseBrowser',
+                'kOptionPrioritizeEventBounces', 'kOptionRenderingEnabled', 'kOptionShadersQuality',
+                'kOptionSwapInterval', 'kOptionTerrainsQuality', 'kOptionTexturesAnisotropyLevel',
+                'kOptionTexturesMipmapBias', 'kOptionTexturesQuality', 'kOptionViewportRotation',
+                //Application - Resource Types
+                'kResourceTypeAnimBank', 'kResourceTypeFont', 'kResourceTypeHUD',
+                'kResourceTypeMaterial', 'kResourceTypeMesh', 'kResourceTypeParticle',
+                'kResourceTypePixelMap', 'kResourceTypeSoundBank', 'kResourceTypeTexture',
+                'kResourceTypeTextureClip', 'kResourceTypeTrail',
+                //Cache
+                'kPropertyHeight', 'kPropertySize', 'kPropertyWidth',
+                //Dynamics
+                'kAxisX', 'kAxisY', 'kAxisZ',
+                'kTypeBox', 'kTypeCapsule', 'kTypeSphere',
+                //HUD
+                'kAddressingModeClamp', 'kAddressingModeRepeat', 'kAlignCenter', 'kAlignJustify','kAlignLeft', 'kAlignRight',
+                'kAlignTop', 'kBlendModeAdd', 'kBlendModeDefault', 'kBlendModeModulate', 'kCaseFixed', 'kCaseVariable',
+                'kCommandTypeCallAction', 'kCommandTypeCopyCheckStateToRegister', 'kCommandTypeCopyEditTextToRegister',
+                'kCommandTypeCopyListItemTextToRegister', 'kCommandTypeCopyListLastSelectedItemToRegister',
+                'kCommandTypeCopyProgressValueToRegister', 'kCommandTypeCopySliderValueToRegister', 'kCommandTypeCopyTagToRegister',
+                'kCommandTypeEnterModalMode', 'kCommandTypeInterpolateBackgroundColor', 'kCommandTypeInterpolateBorderColor',
+                'kCommandTypeInterpolateForegroundColor', 'kCommandTypeInterpolateHeight', 'kCommandTypeInterpolateOpacity',
+                'kCommandTypeInterpolatePosition', 'kCommandTypeInterpolateProgressValue', 'kCommandTypeInterpolateRotation',
+                'kCommandTypeInterpolateSize', 'kCommandTypeInterpolateWidth', 'kCommandTypeLeaveModalMode',
+                'kCommandTypeMatchScreenSpaceBottomLeftCorner', 'kCommandTypeMatchScreenSpaceBottomRightCorner',
+                'kCommandTypeMatchScreenSpaceCenter', 'kCommandTypeMatchScreenSpaceHeight', 'kCommandTypeMatchScreenSpaceTopLeftCorner',
+                'kCommandTypeMatchScreenSpaceTopRightCorner', 'kCommandTypeMatchScreenSpaceWidth', 'kCommandTypePauseMovie',
+                'kCommandTypePauseSound', 'kCommandTypePauseTimer', 'kCommandTypePlayMovie', 'kCommandTypePlaySound',
+                'kCommandTypePlaySoundLoop', 'kCommandTypeResumeSound', 'kCommandTypeSendEventToUser', 'kCommandTypeSetActive',
+                'kCommandTypeSetBackgroundColor', 'kCommandTypeSetBackgroundImage', 'kCommandTypeSetBackgroundImageUVOffset',
+                'kCommandTypeSetBackgroundImageUVScale', 'kCommandTypeSetBorderColor', 'kCommandTypeSetButtonText',
+                'kCommandTypeSetCheckState', 'kCommandTypeSetCheckText', 'kCommandTypeSetCursorPosition', 'kCommandTypeSetCursorVisible',
+                'kCommandTypeSetEditText', 'kCommandTypeSetFocus', 'kCommandTypeSetForegroundColor', 'kCommandTypeSetHeight',
+                'kCommandTypeSetLabelText', 'kCommandTypeSetOpacity', 'kCommandTypeSetPosition', 'kCommandTypeSetRotation',
+                'kCommandTypeSetSize', 'kCommandTypeSetVisible', 'kCommandTypeSetWidth', 'kCommandTypeSleep', 'kCommandTypeStartTimer',
+                'kCommandTypeStopAction', 'kCommandTypeStopMovie', 'kCommandTypeStopSound', 'kCommandTypeStopTimer',
+                'kComponentTypeButton', 'kComponentTypeCheck', 'kComponentTypeContainer', 'kComponentTypeEdit', 'kComponentTypeLabel',
+                'kComponentTypeList', 'kComponentTypeMovie', 'kComponentTypePicture', 'kComponentTypePixelMap', 'kComponentTypeProgress',
+                'kComponentTypeRenderMap', 'kComponentTypeSlider', 'kCursorShapeCross', 'kCursorShapeDefault', 'kCursorShapeHandPointing',
+                'kCursorShapeIBeam', 'kCursorShapeNone', 'kCursorShapeWaiting', 'kDirectionLeftToRight', 'kDirectionRightToLeft',
+                'kEncodingASCII', 'kEncodingUTF8', 'kEventTypeGainFocus', 'kEventTypeLooseFocus', 'kEventTypeMouseEnter',
+                'kEventTypeMouseLeave', 'kFillModeSolid', 'kInterpolatorTypeLinear', 'kInterpolatorTypePower2', 'kInterpolatorTypePower3',
+                'kInterpolatorTypePower4', 'kInterpolatorTypeRoot2', 'kInterpolatorTypeRoot3', 'kInterpolatorTypeRoot4',
+                'kInterpolatorTypeSpring1', 'kInterpolatorTypeSpring2', 'kInterpolatorTypeSpring3', 'kInterpolatorTypeSpring4',
+                'kInterpolatorTypeSpring5', 'kInterpolatorTypeSpring6',
+                'kOriginBottom', 'kOriginBottomLeft', 'kOriginBottomRight', 'kOriginCenter', 'kOriginLeft', 'kOriginRight',
+                'kOriginTop', 'kOriginTopLeft', 'kOriginTopRight', 'kProgressTypeBottomToTop', 'kProgressTypeLeftToRight',
+                'kProgressTypeRightToLeft', 'kProgressTypeTopToBottom', 'kRuntimeValueCallArgument0', 'kRuntimeValueCallArgument1',
+                'kRuntimeValueCallArgument2', 'kRuntimeValueCallArgument3', 'kRuntimeValueCurrentUser', 'kRuntimeValueCurrentUserMainCamera',
+                'kRuntimeValueRegister0', 'kRuntimeValueRegister1', 'kRuntimeValueRegister2', 'kRuntimeValueRegister3',
+                'kShapeTypeEllipsoid', 'kShapeTypeRectangle', 'kShapeTypeRoundRectangle', 'kSliderTypeBottomToTop',
+                'kSliderTypeLeftToRight', 'kSliderTypeRightToLeft', 'kSliderTypeTopToBottom', 'kWaveTypeConstant',
+                'kWaveTypeSawtooth', 'kWaveTypeSawtoothInv', 'kWaveTypeSinus', 'kWaveTypeSinusNoise', 'kWaveTypeSquare', 'kWaveTypeTriangle',
+                //Input
+                'kJoypadTypeIPhone', 'kJoypadTypeNone', 'kJoypadTypePhone', 'kJoypadTypeStandard', 'kJoypadTypeWiimote',
+                'kKey0', 'kKey1', 'kKey2', 'kKey3', 'kKey4', 'kKey5', 'kKey6', 'kKey7', 'kKey8', 'kKey9', 'kKeyA', 'kKeyB',
+                'kKeyBackspace', 'kKeyC', 'kKeyD', 'kKeyDelete', 'kKeyDown', 'kKeyE', 'kKeyEnd', 'kKeyEscape', 'kKeyF',
+                'kKeyF1', 'kKeyF10', 'kKeyF11', 'kKeyF12', 'kKeyF2', 'kKeyF3', 'kKeyF4', 'kKeyF5', 'kKeyF6', 'kKeyF7',
+                'kKeyF8', 'kKeyF9', 'kKeyG', 'kKeyH', 'kKeyHome', 'kKeyI', 'kKeyInsert', 'kKeyJ', 'kKeyK', 'kKeyL',
+                'kKeyLAlt', 'kKeyLControl', 'kKeyLeft', 'kKeyLShift', 'kKeyM', 'kKeyN', 'kKeyO', 'kKeyP', 'kKeyPageDown',
+                'kKeyPageUp', 'kKeyQ', 'kKeyR', 'kKeyRAlt', 'kKeyRControl', 'kKeyReturn', 'kKeyRight', 'kKeyRShift',
+                'kKeyS', 'kKeySpace', 'kKeyT', 'kKeyTab', 'kKeyU', 'kKeyUp', 'kKeyV', 'kKeyW', 'kKeyX', 'kKeyY',
+                'kKeyZ', 'kJoypadButtonPSPCircle', 'kJoypadButtonPSPCross', 'kJoypadButtonPSPDown', 'kJoypadButtonPSPL',
+                'kJoypadButtonPSPLeft', 'kJoypadButtonPSPR', 'kJoypadButtonPSPRight', 'kJoypadButtonPSPSelect',
+                'kJoypadButtonPSPSquare', 'kJoypadButtonPSPStart', 'kJoypadButtonPSPTriangle', 'kJoypadButtonPSPUp',
+                'kJoypadTypePSP', 'kJoypadButtonWiimoteA', 'kJoypadButtonWiimoteB', 'kJoypadButtonWiimoteC',
+                'kJoypadButtonWiimoteDown', 'kJoypadButtonWiimoteHome', 'kJoypadButtonWiimoteLeft',
+                'kJoypadButtonWiimoteMinus', 'kJoypadButtonWiimoteOne', 'kJoypadButtonWiimotePlus',
+                'kJoypadButtonWiimoteRight', 'kJoypadButtonWiimoteTwo', 'kJoypadButtonWiimoteUp', 'kJoypadButtonWiimoteZ',
+                //Light
+                'kTypeDirectional', 'kTypePoint',
+                //Math
+                'kEpsilon', 'kInfinity', 'kPi',
+                //Mesh
+                'kLockModeRead', 'kLockModeWrite', 'kLockReadWrite',
+                //Network
+                'kBluetoothServerPort', 'kDefaultServerPort', 'kStatusAuthenticated', 'kStatusSearchFinished', // 'kStatusNone', 'kStatusPending',
+                //Object
+                'kControllerTypeAI', 'kControllerTypeAnimation', 'kControllerTypeAny', 'kControllerTypeDynamics',
+                'kControllerTypeNavigation', 'kControllerTypeSound', 'kGlobalSpace', 'kLocalSpace', 'kParentSpace',
+                'kTransformOptionInheritsParentRotation', 'kTransformOptionInheritsParentScale', 'kTransformOptionInheritsParentTranslation',
+                'kTransformOptionTranslationAffectedByParentRotation', 'kTransformOptionTranslationAffectedByParentScale', 'kTypeCamera',
+                'kTypeCollider', 'kTypeDummy', 'kTypeGroup', 'kTypeLight', 'kTypeOccluder', 'kTypeProjector', 'kTypeReflector',
+                'kTypeSensor', 'kTypeSfx', 'kTypeShape',
+                //Pixelmap
+                'kBlendModeDecal', 'kBlendModeReplace', 'kFillModeBrush', 'kFillModeNone', 'kPenModeBrush', // 'kFillModeSolid',
+                'kPenModeNone', 'kPenModeSolid',
+                //Projector
+                'kMapTypeMovie', 'kMapTypePixelMap', 'kMapTypeRenderMap', 'kMapTypeTexture', 'kMapTypeTextureClip',
+                //Scene
+                'kFilteringModeBilinear', 'kFilteringModeNearest', 'kFilteringModeTrilinear', // 'kAddressingModeClamp', 'kAddressingModeRepeat',
+                'kSkyBoxFaceBack', 'kSkyBoxFaceBottom', 'kSkyBoxFaceFront', 'kSkyBoxFaceLeft', 'kSkyBoxFaceRight', 'kSkyBoxFaceTop',
+                //Sensor
+                'kShapeTypeBox', 'kShapeTypeSphere',
+                //Server
+                'kStatusConnected', 'kStatusNone', 'kStatusPending',
+                //Session - duplicate keywords
+                //'kStatusConnected', 'kStatusNone', 'kStatusPending',
+                //Shape
+                'kMapTypeUnknown', 'kCurveTypeBezier', 'kCurveTypeBSpline', 'kCurveTypeCatmullRom', 'kCurveTypePolyLine',
+                // 'kMapTypeMovie', 'kMapTypePixelMap', 'kMapTypeRenderMap', 'kMapTypeTexture',  'kMapTypeTextureClip',
+
+                //System
+                'kOSType3DS', 'kOSTypeBada', 'kOSTypeBrew', 'kOSTypePalm', 'kOSTypePS3',
+                'kClientTypeEditor', 'kClientTypeEmbedded', 'kClientTypeStandalone',
+                'kGPUCapabilityBloomFilterSupport', 'kGPUCapabilityContrastFilterSupport', 'kGPUCapabilityDepthBlurFilterSupport',
+                'kGPUCapabilityDistortionFilterSupport', 'kGPUCapabilityDynamicShadowsSupport', 'kGPUCapabilityHardwareOcclusionSupport',
+                'kGPUCapabilityHardwareRenderingSupport', 'kGPUCapabilityMonochromeFilterSupport', 'kGPUCapabilityMotionBlurFilterSupport',
+                'kGPUCapabilityPixelShaderSupport', 'kGPUCapabilityVelocityBlurFilterSupport', 'kGPUCapabilityVertexShaderSupport',
+                'kLanguageAlbanian', 'kLanguageArabic', 'kLanguageBulgarian', 'kLanguageCatalan', 'kLanguageCzech', 'kLanguageDanish',
+                'kLanguageDutch', 'kLanguageEnglish', 'kLanguageFinnish', 'kLanguageFrench', 'kLanguageGerman', 'kLanguageGreek',
+                'kLanguageHebrew', 'kLanguageHungarian', 'kLanguageIcelandic', 'kLanguageItalian', 'kLanguageJapanese', 'kLanguageKorean',
+                'kLanguageNorwegian', 'kLanguagePolish', 'kLanguagePortuguese', 'kLanguageRomanian', 'kLanguageRussian',
+                'kLanguageSerboCroatian', 'kLanguageSlovak', 'kLanguageSpanish', 'kLanguageSwedish', 'kLanguageThai',
+                'kLanguageTurkish', 'kLanguageUnknown', 'kLanguageUrdu', 'kOSTypeAndroid', 'kOSTypeAngstrom', 'kOSTypeIPhone',
+                'kOSTypeLinux', 'kOSTypeMac', 'kOSTypePSP', 'kOSTypeSymbian', 'kOSTypeWii', 'kOSTypeWindows', 'kOSTypeWindowsCE',
+            ),
+        // Not used yet
+        4 => array(
+                'dummycommand',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
+        '+', '-', '=>', '<<'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#0000FF; font-weight:bold;',
+            2 => 'color:#000088; font-weight:bold;',
+            3 => 'color:#C088C0; font-weight:bold;',
+            4 => 'color:#00FEFE; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            4 => 'color: #cc0000; font-style: italic;',
+            'MULTI' => 'color:#008000; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#000000; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#888800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#AA0000;'
+            ),
+        // names after "."
+        'METHODS' => array(
+            1 => 'color:#FF00FF; font-weight:bold;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#000000; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(//Variables
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(//Arrays
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*",//Static OOP symbols
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/systemverilog.php b/vendor/easybook/geshi/geshi/systemverilog.php
new file mode 100755
index 000000000..f2ba92b19
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/systemverilog.php
@@ -0,0 +1,317 @@
+<?php
+/************************************************************************************
+ * systemverilog.php
+ * -------
+ * Author: Sean O'Boyle
+ * Copyright: (C) 2008 IntelligentDV
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/06/25
+ *
+ * SystemVerilog IEEE 1800-2009(draft8) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/25 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2008/06/25)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *  GeSHi is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ************************************************************************
+ * Title:        SystemVerilog Language Keywords File for GeSHi
+ * Description:  This file contains the SV keywords defined in the
+ *               IEEE1800-2009 Draft Standard in the format expected by
+ *               GeSHi.
+ *
+ * Original Author: Sean O'Boyle
+ * Contact:         seanoboyle@intelligentdv.com
+ * Company:         Intelligent Design Verification
+ * Company URL:     http://intelligentdv.com
+ *
+ * Download the most recent version here:
+ *                  http://intelligentdv.com/downloads
+ *
+ * File Bugs Here:  http://bugs.intelligentdv.com
+ *        Project:  SyntaxFiles
+ *
+ * File: systemverilog.php
+ * $LastChangedBy: benbe $
+ * $LastChangedDate: 2012-08-18 01:56:20 +0200 (Sa, 18. Aug 2012) $
+ * $LastChangedRevision: 2542 $
+ *
+ ************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SystemVerilog',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // system tasks
+        1 => array(
+            'acos','acosh','asin','asinh','assertfailoff','assertfailon',
+            'assertkill','assertnonvacuouson','assertoff','asserton',
+            'assertpassoff','assertpasson','assertvacuousoff','async$and$array',
+            'async$and$plane','async$nand$array','async$nand$plane',
+            'async$nor$array','async$nor$plane','async$or$array',
+            'async$or$plane','atan','atan2','atanh','bits','bitstoreal',
+            'bitstoshortreal','cast','ceil','changed','changed_gclk',
+            'changing_gclk','clog2','cos','cosh','countones','coverage_control',
+            'coverage_get','coverage_get_max','coverage_merge','coverage_save',
+            'dimensions','display','displayb','displayh','displayo',
+            'dist_chi_square','dist_erlang','dist_exponential','dist_normal',
+            'dist_poisson','dist_t','dist_uniform','dumpall','dumpfile',
+            'dumpflush','dumplimit','dumpoff','dumpon','dumpports',
+            'dumpportsall','dumpportsflush','dumpportslimit','dumpportsoff',
+            'dumpportson','dumpvars','error','exit','exp','falling_gclk',
+            'fclose','fdisplay','fdisplayb','fdisplayh','fdisplayo','fell',
+            'fell_gclk','feof','ferror','fflush','fgetc','fgets','finish',
+            'floor','fmonitor','fmonitorb','fmonitorh','fmonitoro','fopen',
+            'fread','fscanf','fseek','fstrobe','fstrobeb','fstrobeh','fstrobeo',
+            'ftell','future_gclk','fwrite','fwriteb','fwriteh','fwriteo',
+            'get_coverage','high','hypot','increment','info','isunbounded',
+            'isunknown','itor','left','ln','load_coverage_db','log10','low',
+            'monitor','monitorb','monitorh','monitoro','monitoroff','monitoron',
+            'onehot','onehot0','past','past_gclk','pow','printtimescale',
+            'q_add','q_exam','q_full','q_initialize','q_remove','random',
+            'readmemb','readmemh','realtime','realtobits','rewind','right',
+            'rising_gclk','rose','rose_gclk','rtoi','sampled',
+            'set_coverage_db_name','sformat','sformatf','shortrealtobits',
+            'signed','sin','sinh','size','sqrt','sscanf','stable','stable_gclk',
+            'steady_gclk','stime','stop','strobe','strobeb','strobeh','strobeo',
+            'swrite','swriteb','swriteh','swriteo','sync$and$array',
+            'sync$and$plane','sync$nand$array','sync$nand$plane',
+            'sync$nor$array','sync$nor$plane','sync$or$array','sync$or$plane',
+            'system','tan','tanh','test$plusargs','time','timeformat',
+            'typename','ungetc','unpacked_dimensions','unsigned',
+            'value$plusargs','warning','write','writeb','writeh','writememb',
+            'writememh','writeo',
+            ),
+        // compiler directives
+        2 => array(
+            '`__FILE__', '`__LINE__', '`begin_keywords', '`case', '`celldefine',
+            '`endcelldefine', '`default_nettype', '`define', '`default', '`else',
+            '`elsif', '`end_keywords', '`endfor', '`endif',
+            '`endprotect', '`endswitch', '`endwhile', '`for', '`format',
+            '`if', '`ifdef', '`ifndef', '`include', '`let',
+            '`line', '`nounconnected_drive', '`pragma', '`protect', '`resetall',
+            '`switch', '`timescale', '`unconnected_drive', '`undef', '`undefineall',
+            '`while'
+            ),
+        // keywords
+        3 => array(
+            'assert', 'assume', 'cover', 'expect', 'disable',
+            'iff', 'binsof', 'intersect', 'first_match', 'throughout',
+            'within', 'coverpoint', 'cross', 'wildcard', 'bins',
+            'ignore_bins', 'illegal_bins', 'genvar', 'if', 'else',
+            'unique', 'priority', 'matches', 'default', 'forever',
+            'repeat', 'while', 'for', 'do', 'foreach',
+            'break', 'continue', 'return', 'pulsestyle_onevent', 'pulsestyle_ondetect',
+            'noshowcancelled', 'showcancelled', 'ifnone', 'posedge', 'negedge',
+            'edge', 'wait', 'wait_order', 'timeunit', 'timeprecision',
+            's', 'ms', 'us', 'ns',
+            'ps', 'fs', 'step', 'new', 'extends',
+            'this', 'super', 'protected', 'local', 'rand',
+            'randc', 'bind', 'constraint', 'solve', 'before',
+            'dist', 'inside', 'with', 'virtual', 'extern',
+            'pure', 'forkjoin', 'design', 'instance', 'cell',
+            'liblist', 'use', 'library', 'incdir', 'include',
+            'modport', 'sync_accept_on', 'reject_on', 'accept_on',
+            'sync_reject_on', 'restrict', 'let', 'until', 'until_with',
+            'unique0', 'eventually', 's_until', 's_always', 's_eventually',
+            's_nexttime', 's_until_with', 'global', 'untyped', 'implies',
+            'weak', 'strong', 'nexttime'
+            ),
+        // block keywords
+        4 => array(
+            'begin', 'end', 'package', 'endpackage', 'macromodule',
+            'module', 'endmodule', 'generate', 'endgenerate', 'program',
+            'endprogram', 'class', 'endclass', 'function', 'endfunction',
+            'case', 'casex', 'casez', 'randcase', 'endcase',
+            'interface', 'endinterface', 'clocking', 'endclocking', 'task',
+            'endtask', 'primitive', 'endprimitive', 'fork', 'join',
+            'join_any', 'join_none', 'covergroup', 'endgroup', 'checker',
+            'endchecker', 'property', 'endproperty', 'randsequence', 'sequence',
+            'endsequence', 'specify', 'endspecify', 'config', 'endconfig',
+            'table', 'endtable', 'initial', 'final', 'always',
+            'always_comb', 'always_ff', 'always_latch', 'alias', 'assign',
+            'force', 'release'
+            ),
+
+        // types
+        5 => array(
+            'parameter', 'localparam', 'specparam', 'input', 'output',
+            'inout', 'ref', 'byte', 'shortint', 'int',
+            'integer', 'longint', 'time', 'bit', 'logic',
+            'reg', 'supply0', 'supply1', 'tri', 'triand',
+            'trior', 'trireg', 'tri0', 'tri1', 'wire',
+            'uwire', 'wand', 'wor', 'signed', 'unsigned',
+            'shortreal', 'real', 'realtime', 'type', 'void',
+            'struct', 'union', 'tagged', 'const', 'var',
+            'automatic', 'static', 'packed', 'vectored', 'scalared',
+            'typedef', 'enum', 'string', 'chandle', 'event',
+            'null', 'pullup', 'pulldown', 'cmos', 'rcmos',
+            'nmos', 'pmos', 'rnmos', 'rpmos', 'and',
+            'nand', 'or', 'nor', 'xor', 'xnor',
+            'not', 'buf', 'tran', 'rtran', 'tranif0',
+            'tranif1', 'rtranif0', 'rtranif1', 'bufif0', 'bufif1',
+            'notif0', 'notif1', 'strong0', 'strong1', 'pull0',
+            'pull1', 'weak0', 'weak1', 'highz0', 'highz1',
+            'small', 'medium', 'large'
+            ),
+
+        // DPI
+        6 => array(
+            'DPI', 'DPI-C', 'import', 'export', 'context'
+            ),
+
+        // stdlib
+        7 => array(
+            'randomize', 'mailbox', 'semaphore', 'put', 'get',
+            'try_put', 'try_get', 'peek', 'try_peek', 'process',
+            'state', 'self', 'status', 'kill', 'await',
+            'suspend', 'resume', 'size', 'delete', 'insert',
+            'num', 'first', 'last', 'next', 'prev',
+            'pop_front', 'pop_back', 'push_front', 'push_back', 'find',
+            'find_index', 'find_first', 'find_last', 'find_last_index', 'min',
+            'max', 'unique_index', 'reverse', 'sort', 'rsort',
+            'shuffle', 'sum', 'product', 'List', 'List_Iterator',
+            'neq', 'eq', 'data', 'empty', 'front',
+            'back', 'start', 'finish', 'insert_range', 'erase',
+            'erase_range', 'set', 'swap', 'clear', 'purge'
+            ),
+
+        // key_deprecated
+        8 => array(
+            'defparam', 'deassign', 'TODO'
+        ),
+
+        ),
+    'SYMBOLS' => array(
+            '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%',
+            '^', '&', '|', '~',
+            '?', ':',
+            '#', '<<', '<<<',
+            '>', '<', '>=', '<=',
+            '@', ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #996666; font-weight: bold;',
+            2 => 'color: #336600; font-weight: bold;',
+            3 => 'color: #996600; font-weight: bold;',
+            4 => 'color: #000033; font-weight: bold;',
+            5 => 'color: #330033; font-weight: bold;',
+            6 => 'color: #996600; font-weight: bold;',
+            7 => 'color: #CC9900; font-weight: bold;',
+            8 => 'color: #990000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00008B; font-style: italic;',
+            'MULTI' => 'color: #00008B; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #9F79EE'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #9F79EE;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0055;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #5D478B;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0055;',
+            1 => 'color: #ff0055;',
+            2 => 'color: #ff0055;',
+            3 => 'color: #ff0055;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        // integer
+        0 => "\d'[bdh][0-9_a-fA-FxXzZ]+",
+        // realtime
+        1 => "\d*\.\d+[munpf]?s",
+        // time s, ms, us, ns, ps, of fs
+        2 => "\d+[munpf]?s",
+        // real
+        3 => "\d*\.\d+"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        0 => ''
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true
+        ),
+    'TAB_WIDTH' => 3,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=$)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/tcl.php b/vendor/easybook/geshi/geshi/tcl.php
new file mode 100755
index 000000000..4dd7be87b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/tcl.php
@@ -0,0 +1,194 @@
+<?php
+/*************************************************************************************
+ * tcl.php
+ * ---------------------------------
+ * Author: Reid van Melle (rvanmelle@gmail.com)
+ * Copyright: (c) 2004 Reid van Melle (sorry@nowhere)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/05/05
+ *
+ * TCL/iTCL language file for GeSHi.
+ *
+ * This was thrown together in about an hour so I don't expect
+ * really great things.  However, it is a good start.  I never
+ * got a change to try out the iTCL or object-based support but
+ * this is not widely used anyway.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2006/05/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/05/05)
+ * -------------------------
+ * - Get TCL built-in special variables highlighted with a new color..
+ *   currently, these are listed in //special variables in the keywords
+ *   section, but they get covered by the general REGEXP for symbols
+ * - General cleanup, testing, and verification
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'TCL',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => '/(?<!\\\\)#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //2 => '/{[^}\n]+}/'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*
+         * Set 1: reserved words
+         * http://python.org/doc/current/ref/keywords.html
+         */
+        1 => array(
+            'proc', 'global', 'upvar', 'if', 'then', 'else', 'elseif', 'for', 'foreach',
+            'break', 'continue', 'while', 'set', 'eval', 'case', 'in', 'switch',
+            'default', 'exit', 'error', 'return', 'uplevel', 'loop',
+            'for_array_keys', 'for_recursive_glob', 'for_file', 'unwind_protect',
+            'expr', 'catch', 'namespace', 'rename', 'variable',
+            // itcl
+            'method', 'itcl_class', 'public', 'protected'),
+
+        /*
+         * Set 2: builtins
+         * http://asps.activatestate.com/ASPN/docs/ActiveTcl/8.4/tcl/tcl_2_contents.htm
+         */
+        2 => array(
+            // string handling
+            'append', 'binary', 'format', 're_syntax', 'regexp', 'regsub',
+            'scan', 'string', 'subst',
+            // list handling
+            'concat', 'join', 'lappend', 'lindex', 'list', 'llength', 'lrange',
+            'lreplace', 'lsearch', 'lset', 'lsort', 'split',
+            // procedures and output
+            'incr', 'close', 'eof', 'fblocked', 'fconfigure', 'fcopy', 'file',
+            'fileevent', 'flush', 'gets', 'open', 'puts', 'read', 'seek',
+            'socket', 'tell',
+            // packages and source files
+            'load', 'loadTk', 'package', 'pgk::create', 'pgk_mkIndex', 'source',
+            // interpreter routines
+            'bgerror', 'history', 'info', 'interp', 'memory', 'unknown',
+            // library routines
+            'enconding', 'http', 'msgcat',
+            // system related
+            'cd', 'clock', 'exec', 'glob', 'pid', 'pwd', 'time',
+            // platform specified
+            'dde', 'registry', 'resource',
+            // special variables
+            '$argc', '$argv', '$errorCode', '$errorInfo', '$argv0',
+            '$auto_index', '$auto_oldpath', '$auto_path', '$env',
+            '$tcl_interactive', '$tcl_libpath', '$tcl_library',
+            '$tcl_pkgPath', '$tcl_platform', '$tcl_precision', '$tcl_traceExec',
+            ),
+
+        /*
+         * Set 3: standard library
+         */
+        3 => array(
+            'comment', 'filename', 'library', 'packagens', 'tcltest', 'tclvars',
+            ),
+
+        /*
+         * Set 4: special methods
+         */
+//        4 => array(
+//            )
+
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '$', '*', '&', '%', '!', ';', '<', '>', '?'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+//        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
+            2 => 'color: #008000;',                        // Built-ins + self
+            3 => 'color: #dc143c;',                        // Standard lib
+//            4 => 'color: #0000cd;'                        // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #483d8b;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff3333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+//        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        //Special variables
+        0 => '[\\$]+[a-zA-Z_][a-zA-Z0-9_]*',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/teraterm.php b/vendor/easybook/geshi/geshi/teraterm.php
new file mode 100755
index 000000000..f125642d5
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/teraterm.php
@@ -0,0 +1,354 @@
+<?php
+/*************************************************************************************
+ * teraterm.php
+ * --------
+ * Author: Boris Maisuradze (boris at logmett.com)
+ * Copyright: (c) 2008 Boris Maisuradze (http://logmett.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/09/26
+ *
+ * Tera Term Macro language file for GeSHi.
+ *
+ *
+ * This version of teraterm.php was created for Tera Term 4.62 and LogMeTT 2.9.4.
+ * Newer versions of these application can contain additional Macro commands
+ * and/or keywords that are not listed here. The latest release of teraterm.php
+ * can be downloaded from Download section of LogMeTT.com
+ *
+ * CHANGES
+ * -------
+ * 2008/09/26 (1.0.0)
+ *   -  First Release for Tera Term 4.60 and below.
+ * 2009/03/22 (1.1.0)
+ *   -  First Release for Tera Term 4.62 and below.
+ * 2009/04/25 (1.1.1)
+ *   -  Second Release for Tera Term 4.62 and below.
+ * 2010/09/12 (1.1.2)
+ *   -  Second Release for Tera Term 4.67, LogMeTT 2.97, TTLEditor 1.2.1 and below.
+ *
+ * TODO (updated 2010/09/12)
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Tera Term Macro',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Commands */
+        1 => array(
+            'Beep',
+            'BplusRecv',
+            'BplusSend',
+            'Break',
+            'Call',
+            'CallMenu',
+            'ChangeDir',
+            'ClearScreen',
+            'Clipb2Var',
+            'ClosesBox',
+            'CloseTT',
+            'Code2Str',
+            'Connect',
+            'CRC32',
+            'CRC32File',
+            'CygConnect',
+            'DelPassword',
+            'Disconnect',
+            'DispStr',
+            'Do',
+            'Else',
+            'ElseIf',
+            'EnableKeyb',
+            'End',
+            'EndIf',
+            'EndUntil',
+            'EndWhile',
+            'Exec',
+            'ExecCmnd',
+            'Exit',
+            'FileClose',
+            'FileConcat',
+            'FileCopy',
+            'FileCreate',
+            'FileDelete',
+            'FileMarkPtr',
+            'FileNameBox',
+            'FileOpen',
+            'FileRead',
+            'FileReadln',
+            'FileRename',
+            'FileSearch',
+            'FileSeek',
+            'FileSeekBack',
+            'FileStat',
+            'FileStrSeek',
+            'FileStrSeek2',
+            'FileTruncate',
+            'FileWrite',
+            'FileWriteLn',
+            'FindClose',
+            'FindFirst',
+            'FindNext',
+            'FlushRecv',
+            'For',
+            'GetDate',
+            'GetDir',
+            'GetEnv',
+            'GetHostname',
+            'GetPassword',
+            'GetTime',
+            'GetTitle',
+            'GetTTDir',
+            'Getver',
+            'GoTo',
+            'If',
+            'IfDefined',
+            'Include',
+            'InputBox',
+            'Int2Str',
+            'KmtFinish',
+            'KmtGet',
+            'KmtRecv',
+            'KmtSend',
+            'LoadKeymap',
+            'LogClose',
+            'LogOpen',
+            'LogPause',
+            'LogStart',
+            'LogWrite',
+            'Loop',
+            'MakePath',
+            'MessageBox',
+            'MPause',
+            'Next',
+            'PasswordBox',
+            'Pause',
+            'QuickVANRecv',
+            'QuickVANSend',
+            'Random',
+            'RecvLn',
+            'RestoreSetup',
+            'Return',
+            'RotateLeft',
+            'RotateRight',
+            'ScpRecv',
+            'ScpSend',
+            'Send',
+            'SendBreak',
+            'SendBroadcast',
+            'SendFile',
+            'SendKCode',
+            'SendLn',
+            'SendLnBroadcast',
+            'SendMulticast',
+            'SetBaud',
+            'SetDate',
+            'SetDebug',
+            'SetDir',
+            'SetDlgPos',
+            'SetDTR',
+            'SetEcho',
+            'SetEnv',
+            'SetExitCode',
+            'SetMulticastName',
+            'SetRTS',
+            'SetSync',
+            'SetTime',
+            'SetTitle',
+            'Show',
+            'ShowTT',
+            'SPrintF',
+            'SPrintF2',
+            'StatusBox',
+            'Str2Code',
+            'Str2Int',
+            'StrCompare',
+            'StrConcat',
+            'StrCopy',
+            'StrInsert',
+            'StrJoin',
+            'StrLen',
+            'StrMatch',
+            'StrRemove',
+            'StrReplace',
+            'StrScan',
+            'StrSpecial',
+            'StrSplit',
+            'StrTrim',
+            'TestLink',
+            'Then',
+            'ToLower',
+            'ToUpper',
+            'UnLink',
+            'Until',
+            'Var2Clipb',
+            'Wait',
+            'Wait4All',
+            'WaitEvent',
+            'WaitLn',
+            'WaitN',
+            'WaitRecv',
+            'WaitRegEx',
+            'While',
+            'XmodemRecv',
+            'XmodemSend',
+            'YesNoBox',
+            'YmodemRecv',
+            'YmodemSend',
+            'ZmodemRecv',
+            'ZmodemSend'
+            ),
+        /* System Variables */
+        2 => array(
+            'groupmatchstr1',
+            'groupmatchstr2',
+            'groupmatchstr3',
+            'groupmatchstr4',
+            'groupmatchstr5',
+            'groupmatchstr6',
+            'groupmatchstr7',
+            'groupmatchstr8',
+            'groupmatchstr9',
+            'inputstr',
+            'matchstr',
+            'mtimeout',
+            'param2',
+            'param3',
+            'param4',
+            'param5',
+            'param6',
+            'param7',
+            'param8',
+            'param9',
+            'result',
+            'timeout'
+            ),
+        /* LogMeTT Key Words */
+        3 => array(
+            '$[1]',
+            '$[2]',
+            '$[3]',
+            '$[4]',
+            '$[5]',
+            '$[6]',
+            '$[7]',
+            '$[8]',
+            '$[9]',
+            '$branch$',
+            '$computername$',
+            '$connection$',
+            '$email$',
+            '$logdir$',
+            '$logfilename$',
+            '$lttfilename$',
+            '$mobile$',
+            '$name$',
+            '$pager$',
+            '$parent$',
+            '$phone$',
+            '$snippet$',
+            '$ttdir$',
+            '$user$',
+            '$windir$',
+        ),
+        /* Keyword Symbols */
+        4 => array(
+            'and',
+            'not',
+            'or',
+            'xor'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '&', '|', '^',
+        '<', '>', '=',
+        '?', ':', ';',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold!important;',
+            2 => 'color: #808000; font-weight: bold;',  // System Variables
+            3 => 'color: #ff0000; font-weight: bold;',  // LogMeTT Key Words
+            4 => 'color: #ff00ff; font-weight: bold;'   // Keyword Symbols
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #ff00ff; font-weight: bold;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #008080;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #ff00ff; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => array (
+            GESHI_SEARCH => '(\:[_a-zA-Z][_a-zA-Z0-9]+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/text.php b/vendor/easybook/geshi/geshi/text.php
new file mode 100755
index 000000000..3c7f17c62
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/text.php
@@ -0,0 +1,82 @@
+<?php
+/*************************************************************************************
+ * text.php
+ * --------
+ * Author: Sean Hanna (smokingrope@gmail.com)
+ * Copyright: (c) 2006 Sean Hanna
+ * Release Version: 1.0.8.11
+ * Date Started: 04/23/2006
+ *
+ * Standard Text File (No Syntax Highlighting).
+ * Plaintext language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 04/23/2006 (0.5.0)
+ * - Syntax File Created
+ *
+ * 04/27/2006 (1.0.0)
+ * - Documentation Cleaned Up
+ * - First Release
+ *
+ * TODO (updated 04/27/2006)
+ * -------------------------
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Text',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(),
+    'SYMBOLS' => array(),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(),
+        'COMMENTS' => array(),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(),
+        'STRINGS' => array(),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'SYMBOLS' => array(),
+        'SCRIPT' => array(),
+        'REGEXPS' => array()
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'ALL' => GESHI_NEVER
+        ),
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/thinbasic.php b/vendor/easybook/geshi/geshi/thinbasic.php
new file mode 100755
index 000000000..3d2034921
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/thinbasic.php
@@ -0,0 +1,866 @@
+<?php
+/*************************************************************************************
+ * thinbasic.php
+ * ------
+ * Author: Eros Olmi (eros.olmi@thinbasic.com)
+ * Copyright: (c) 2006 Eros Olmi (http://www.thinbasic.com), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/05/12
+ *
+ * thinBasic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/05/12 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/05/12)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'thinBasic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'XOR','XML_TREETOSTRING','XML_PARSEFILE','XML_PARSE','XML_PARENT','XML_NODETYPE','XML_NODETOSTRING','XML_NEXTSIBLING',
+            'XML_LASTERROR','XML_GETTAG','XML_FREE','XML_FINDNODE','XML_DECODEPARAM','XML_CHILDDATA','XML_CHILD','XML_ATTRIBVALUE',
+            'XML_ATTRIBNAME','XML_ATTRIBCOUNT','WORD','WITH','WIN_SHOW','WIN_SETTITLE','WIN_SETFOREGROUND','WIN_ISZOOMED',
+            'WIN_ISVISIBLE','WIN_ISICONIC','WIN_GETTITLE','WIN_GETFOREGROUND','WIN_GETCLASS','WIN_GETACTIVE','WIN_FLASH','WIN_FINDBYTITLE',
+            'WIN_FINDBYCLASS','WHILE','WEND','VERIFY','VARPTR','VARIANTVT$','VARIANTVT','VARIANT',
+            'VARIABLE_GETINFO','VARIABLE_EXISTS','VARIABLE_EXIST','VALUE','VAL','USING$','USING','USES',
+            'USER','UNTIL','UNITS','UNION','UNICODE2ASCII','UDP_SEND','UDP_RECV','UDP_OPENSERVER',
+            'UDP_OPEN','UDP_FREEFILE','UDP_CLOSE','UCODE$','UCASE$','UBOUND','TYPE','TRIMFULL$',
+            'TRIM$','TOOLTIP','TOKENIZER_MOVETOEOL','TOKENIZER_KEYSETUSERSTRING','TOKENIZER_KEYSETUSERNUMBER','TOKENIZER_KEYGETUSERSTRING','TOKENIZER_KEYGETUSERNUMBER','TOKENIZER_KEYGETSUBTYPE',
+            'TOKENIZER_KEYGETNAME','TOKENIZER_KEYGETMAINTYPE','TOKENIZER_KEYFIND','TOKENIZER_KEYADD','TOKENIZER_GETNEXTTOKEN','TOKENIZER_DEFAULT_SET','TOKENIZER_DEFAULT_GET','TOKENIZER_DEFAULT_CODE',
+            'TOKENIZER_DEFAULT_CHAR','TO','TIMER','TIME$','THEN','TEXTBOX','TEXT','TCP_SEND',
+            'TCP_RECV','TCP_PRINT','TCP_OPEN','TCP_LINEINPUT','TCP_FREEFILE','TCP_CLOSE','TB_IMGCTX_SETIMAGEADJUSTMENT','TB_IMGCTX_LOADIMAGE',
+            'TB_IMGCTX_GETIMAGEADJUSTMENT','TBGL_VIEWPORT','TBGL_VERTEX','TBGL_USETEXTUREFLAG','TBGL_USETEXTURE','TBGL_USELINESTIPPLEFLAG','TBGL_USELINESTIPPLE','TBGL_USELIGHTSOURCEFLAG',
+            'TBGL_USELIGHTSOURCE','TBGL_USELIGHTINGFLAG','TBGL_USELIGHTING','TBGL_USEFOGFLAG','TBGL_USEFOG','TBGL_USEDEPTHMASK','TBGL_USEDEPTHFLAG','TBGL_USEDEPTH',
+            'TBGL_USECLIPPLANEFLAG','TBGL_USECLIPPLANE','TBGL_USEBLENDFLAG','TBGL_USEBLEND','TBGL_USEALPHATEST','TBGL_TRANSLATE','TBGL_TORUS','TBGL_TEXCOORD2D',
+            'TBGL_SPHERE','TBGL_SHOWWINDOW','TBGL_SHOWCURSOR','TBGL_SETWINDOWTITLE','TBGL_SETUPLIGHTSOURCE','TBGL_SETUPFOG','TBGL_SETUPCLIPPLANE','TBGL_SETPRIMITIVEQUALITY',
+            'TBGL_SETLIGHTPARAMETER','TBGL_SETDRAWDISTANCE','TBGL_SCALE','TBGL_SAVESCREENSHOT','TBGL_ROTATEXYZ','TBGL_ROTATE','TBGL_RESETMATRIX','TBGL_RENDERTOTEXTURE',
+            'TBGL_RENDERMATRIX3D','TBGL_RENDERMATRIX2D','TBGL_PUSHMATRIX','TBGL_PRINTFONT','TBGL_PRINTBMP','TBGL_PRINT','TBGL_POS3DTOPOS2D','TBGL_POPMATRIX',
+            'TBGL_POLYGONLOOK','TBGL_POINTSIZE','TBGL_POINTINSIDE3D','TBGL_NORMAL','TBGL_NEWLIST','TBGL_MOUSEGETWHEELDELTA','TBGL_MOUSEGETRBUTTON','TBGL_MOUSEGETPOSY',
+            'TBGL_MOUSEGETPOSX','TBGL_MOUSEGETMBUTTON','TBGL_MOUSEGETLBUTTON','TBGL_M15SETVERTEXZ','TBGL_M15SETVERTEXY','TBGL_M15SETVERTEXXYZ','TBGL_M15SETVERTEXX','TBGL_M15SETVERTEXTEXY',
+            'TBGL_M15SETVERTEXTEXXY','TBGL_M15SETVERTEXTEXX','TBGL_M15SETVERTEXTEXN','TBGL_M15SETVERTEXRGB','TBGL_M15SETVERTEXR','TBGL_M15SETVERTEXPSTOP','TBGL_M15SETVERTEXPARAM','TBGL_M15SETVERTEXLAYER',
+            'TBGL_M15SETVERTEXG','TBGL_M15SETVERTEXB','TBGL_M15SETMODELVERTEXCOUNT','TBGL_M15SETBONECHILD','TBGL_M15ROTBONEZ','TBGL_M15ROTBONEY','TBGL_M15ROTBONEX','TBGL_M15ROTBONE',
+            'TBGL_M15RESETBONES','TBGL_M15RECALCNORMALS','TBGL_M15LOADMODEL','TBGL_M15INITMODELBUFFERS','TBGL_M15GETVERTEXZ','TBGL_M15GETVERTEXY','TBGL_M15GETVERTEXXYZ','TBGL_M15GETVERTEXX',
+            'TBGL_M15GETVERTEXTEXY','TBGL_M15GETVERTEXTEXXY','TBGL_M15GETVERTEXTEXX','TBGL_M15GETVERTEXTEXN','TBGL_M15GETVERTEXRGB','TBGL_M15GETVERTEXR','TBGL_M15GETVERTEXPSTOP','TBGL_M15GETVERTEXPARAM',
+            'TBGL_M15GETVERTEXLAYER','TBGL_M15GETVERTEXG','TBGL_M15GETVERTEXB','TBGL_M15GETMODELVERTEXCOUNT','TBGL_M15GETMODELPOLYCOUNT','TBGL_M15ERASECHILDBONES','TBGL_M15DRAWMODEL','TBGL_M15DEFBONERESET',
+            'TBGL_M15DEFBONELAYER','TBGL_M15DEFBONEBOX','TBGL_M15DEFBONEANCHOR','TBGL_M15DEFBONEADDVERTEX','TBGL_M15CLEARMODEL','TBGL_M15APPLYBONES','TBGL_M15ADDBONETREEITEM','TBGL_LOADTEXTURE',
+            'TBGL_LOADFONT','TBGL_LOADBMPFONT','TBGL_LINEWIDTH','TBGL_LINESTIPPLE','TBGL_KILLFONT','TBGL_ISWINDOW','TBGL_ISPOINTVISIBLE','TBGL_ISPOINTBEHINDVIEW',
+            'TBGL_GETWINDOWMULTIKEYSTATE','TBGL_GETWINDOWKEYSTATE','TBGL_GETWINDOWKEYONCE','TBGL_GETWINDOWCLIENT','TBGL_GETTEXTURENAME','TBGL_GETTEXTURELIST','TBGL_GETPIXELINFO','TBGL_GETMULTIASYNCKEYSTATE',
+            'TBGL_GETLASTGLERROR','TBGL_GETFRAMERATE','TBGL_GETDESKTOPINFO','TBGL_GETASYNCKEYSTATE','TBGL_ERRORMESSAGES','TBGL_ENDPOLY','TBGL_ENDLIST','TBGL_DRAWFRAME',
+            'TBGL_DESTROYWINDOW','TBGL_DELETELIST','TBGL_CYLINDER','TBGL_CREATEWINDOWEX','TBGL_CREATEWINDOW','TBGL_COLORALPHA','TBGL_COLOR','TBGL_CLEARFRAME',
+            'TBGL_CAMERA','TBGL_CALLLIST','TBGL_BUILDFONT','TBGL_BOX','TBGL_BLENDFUNC','TBGL_BINDTEXTURE','TBGL_BEGINPOLY','TBGL_BACKCOLOR',
+            'TBGL_ALPHAFUNC','TBDI_JOYZ','TBDI_JOYY','TBDI_JOYX','TBDI_JOYSTOPEFFECT','TBDI_JOYSLIDER','TBDI_JOYSETRANGEZ','TBDI_JOYSETRANGEY',
+            'TBDI_JOYSETRANGEXYZ','TBDI_JOYSETRANGEX','TBDI_JOYSETDEADZONEZ','TBDI_JOYSETDEADZONEY','TBDI_JOYSETDEADZONEXYZ','TBDI_JOYSETDEADZONEX','TBDI_JOYSETAUTOCENTER','TBDI_JOYRZ',
+            'TBDI_JOYRY','TBDI_JOYRX','TBDI_JOYPOV','TBDI_JOYPLAYEFFECT','TBDI_JOYLOADEFFECT','TBDI_JOYHASFF','TBDI_JOYHASEFFECT','TBDI_JOYGETEFFECTNAME',
+            'TBDI_JOYGETEFFECTGUID','TBDI_JOYCREATEEFFECT','TBDI_JOYCOUNTPOV','TBDI_JOYCOUNTEFFECTS','TBDI_JOYCOUNTBTN','TBDI_JOYCOUNTAXES','TBDI_JOYBUTTON','TBDI_JOYAVAIL',
+            'TBDI_INIT','TBASS_STREAMFREE','TBASS_STREAMCREATEFILE','TBASS_SETVOLUME','TBASS_SETEAXPRESET','TBASS_SETEAXPARAMETERS','TBASS_SETCONFIG','TBASS_SET3DPOSITION',
+            'TBASS_SET3DFACTORS','TBASS_SAMPLELOAD','TBASS_SAMPLEGETCHANNEL','TBASS_MUSICLOAD','TBASS_MUSICFREE','TBASS_INIT','TBASS_GETVOLUME','TBASS_GETVERSION',
+            'TBASS_GETCONFIG','TBASS_FREE','TBASS_ERRORGETCODE','TBASS_CHANNELSTOP','TBASS_CHANNELSETPOSITION','TBASS_CHANNELSETATTRIBUTES','TBASS_CHANNELSET3DPOSITION','TBASS_CHANNELPLAY',
+            'TBASS_CHANNELPAUSE','TBASS_CHANNELISACTIVE','TBASS_CHANNELGETPOSITION','TBASS_CHANNELGETLENGTH','TBASS_CHANNELGETATTRIBUTES','TBASS_APPLY3D','TANH','TANGENT',
+            'TAN','TALLY','TABCTRL_ONNOTIFY','TABCTRL_INSERTITEM','TABCTRL_GETCURSEL','SWAP','SUB','STRZIP$',
+            'STRUNZIP$','STRREVERSE$','STRPTRLEN','STRPTR','STRINSERT$','STRING$','STRING','STRDELETE$',
+            'STR$','STOP','STEP','STDOUT','STDIN','STAT_SUM','STAT_STDERROR','STAT_STDDEVIATION',
+            'STAT_RANDOM','STAT_PRODUCT','STAT_MIN','STAT_MEDIAN','STAT_MEANHARMONIC','STAT_MEANGEOMETRIC','STAT_MEANARITHMETIC','STAT_MAX',
+            'STAT_INVERSESUM','STAT_HISTOGRAM','STAT_FILLARRAY','STAT_COUNT','STAT_COPYARRAY','STAT_CLONEARRAY','STAT_CHISQUARE','STATIC',
+            'STATE','SQR','SPLIT','SORT','SMTP_STATISTICS','SMTP_SETOPTION','SMTP_SETLOGFILE','SMTP_SENDHTML',
+            'SMTP_SENDEMAIL','SMTP_GETERROR','SMTP_FINISHED','SMTP_DEBUG','SMTP_CONNECT','SMTP_CLOSE','SLEEP','SIZEOF',
+            'SIZE','SINH','SINGLE','SIN','SIGNED','SHOW','SHIFT','SHAPETOBMP',
+            'SGN','SETAT','SET','SENDMESSAGE','SENDKEYSBULK','SENDKEYS','SEND','SELECTEXPRESSION',
+            'SELECT','SECH','SEC','SCAN','SAPI_SPEAK','SAPI_SETVOLUME','SAPI_SETRATE','SAPI_MODULELOADED',
+            'SAPI_GETVOLUME','SAPI_GETRATE','RTRIM$','RTF_SETTEXT','RTF_SETFONTSIZE','RTF_SETFONTNAME','RTF_SETFGCOLOR','RTF_SETEFFECT',
+            'RTF_SETBGCOLOR','RTF_SETALIGN','RTF_SAVETOFILE','RTF_LOADFROMFILE','RTF_GETTEXT','RTF_GETFONTSIZE','RTF_GETFONTNAME','RTF_GETEFFECT',
+            'RTF_GETCLASS','RTF_APPENDTEXT','RSET$','ROUND','RNDF','RND','RIGHT$','RIGHT',
+            'RGB','RESOURCE','RESIZE','RESET','REPLACE$','REPEAT$','REMOVE$','REM',
+            'REGISTRY_SETVALUE','REGISTRY_SETTXTNUM','REGISTRY_SETTXTBOOL','REGISTRY_SETDWORD','REGISTRY_GETVALUE','REGISTRY_GETTXTNUM','REGISTRY_GETTXTBOOL','REGISTRY_GETDWORD',
+            'REGISTRY_GETALLKEYS','REGISTRY_DELVALUE','REGISTRY_DELKEY','REFERENCE','REF','REDRAW','REDIM','RAS_SETPARAMS',
+            'RAS_OPENDIALUPDIALOG','RAS_LOADENTRIES','RAS_HANGUPALL','RAS_HANGUP','RAS_GETENTRY','RAS_BEGINDIAL','RANDOMIZE','RADTODEG',
+            'QUERYPERFORMANCEFREQUENCY','QUERYPERFORMANCECOUNTER','QUAD','PTR','PRESERVE','POST','POPUP','POKE$',
+            'POKE','PIXELS','PI','PERMUTATIONS','PEEKMESSAGE','PEEK$','PEEK','PC_SYSTEMUPFROM',
+            'PC_SUSPENDSTATE','PC_SHUTDOWN','PC_SHOWCARET','PC_SETCARETBLINKTIME','PC_RESTARTDIALOG','PC_PREVENTSHUTDOWN','PC_LOCK','PC_INSERTCD',
+            'PC_HIDECARET','PC_GETSTATEONOFF','PC_GETSCROLLLOCKKEYSTATE','PC_GETNUMLOCKKEYSTATE','PC_GETCARETBLINKTIME','PC_GETCAPSLOCKKEYSTATE','PC_EMPTYBIN','PC_EJECTCD',
+            'PC_DECODECDERROR','PCT','PARSESET$','PARSECOUNT','PARSE$','PARSE','PARAMETERS','OUTSIDE',
+            'OS_WINVERSIONTEXT','OS_WINGETVERSIONTIMELINE','OS_SHELLEXECUTE','OS_SHELLABOUT','OS_SHELL','OS_SETLASTCALLDLLERROR','OS_SERVICESTOP','OS_SERVICESTATUSDESCRIPTION',
+            'OS_SERVICESTARTTYPEDESCRIPTION','OS_SERVICESTART','OS_SERVICESETSTARTTYPE','OS_SERVICEQUERY','OS_SERVICEGETSTARTTYPE','OS_SERVICEGETLIST','OS_PROCESSKILLBYNAME','OS_PROCESSKILLBYID',
+            'OS_PROCESSISRUNNING','OS_PROCESSGETLIST','OS_PROCESSGETID','OS_PROCESSARERUNNING','OS_MESSAGEBEEP','OS_ISWOW64','OS_ISFEATUREPRESENT','OS_IEVERSION',
+            'OS_GETWINDOWSDIR','OS_GETUSERNAME','OS_GETTEMPDIR','OS_GETSYSTEMDIR','OS_GETSPECIALFOLDER','OS_GETLASTCALLDLLSTATUS','OS_GETLASTCALLDLLERROR','OS_GETCURRENTTHREADID',
+            'OS_GETCURRENTPROCESSID','OS_GETCOMPUTERNAME','OS_GETCOMMANDS','OS_GETCOMMAND','OS_FLASHWINDOW','OS_FATALAPPEXIT','OS_ENVIRON','OS_CALLDLL',
+            'OR','OPTIONAL','OPTION','OPT','ONCE','ON','OFF','NUMBER',
+            'NOT','NEXT','NEW','MSGBOX','MOUSEPTR','MODULE','MODELESS','MODAL',
+            'MOD','MKWRD$','MKS$','MKQ$','MKL$','MKI$','MKE$','MKDWD$',
+            'MKD$','MKCUX$','MKCUR$','MKBYT$','MIN$','MIN','MID$','MENU',
+            'MDI_CREATE','MCASE$','MAX$','MAX','MAKWRD','MAKLNG','MAKINT','MAKDWR',
+            'LTRIM$','LSET$','LOWRD','LOOP','LONG','LOINT','LOG_WRITE','LOGB',
+            'LOG2','LOG10','LOG','LOCAL','LOC','LL_UPDATEBYNAME','LL_UPDATE','LL_TOSTRING',
+            'LL_TOFILE','LL_NAME','LL_GETITEM','LL_GETBYNUMBER','LL_FROMFILE','LL_FREE','LL_FINDLAST','LL_FINDBYNAME',
+            'LL_FINDBYDATA','LL_DELETELIKE','LL_DELETEBYNAME','LL_DELETE','LL_DATABYNAME','LL_DATA','LL_COUNT','LL_ADD',
+            'LISTBOX','LINE','LIBRARY_EXISTS','LIB','LEN','LEFT$','LEFT','LCASE$',
+            'LBOUND','LABEL','KILL','JOIN$','ITERATE','ISWINDOW','ISUNICODE','ISTRUE',
+            'ISODD','ISLIKE','ISFALSE','ISEVEN','IP_TOSTRING','IP_ADDR','INTERNALINFO','INTEGER',
+            'INT','INSTR','INSIDE','INPUTBOX$','INI_SETKEY','INI_GETSECTIONSLIST','INI_GETSECTIONKEYLIST','INI_GETKEY',
+            'INET_URLDOWNLOAD','INET_PING','INET_OPENDIALUPDIALOG','INET_GETSTATE','INET_GETREMOTEMACADDRESS','INET_GETIP','INET_GETCONNECTIONMODE','INCR',
+            'IN','IMAGE','IIF$','IIF','IF','ICRYPTO_TESTSHA1','ICRYPTO_TESTMD5','ICRYPTO_TESTCRC32',
+            'ICRYPTO_TESTCRC16','ICRYPTO_STRING2ASCII','ICRYPTO_SHA1','ICRYPTO_MD5','ICRYPTO_ENCRYPTRIJNDAEL','ICRYPTO_ENCRYPTRC4','ICRYPTO_DECRYPTRIJNDAEL','ICRYPTO_DECRYPTRC4',
+            'ICRYPTO_CRC32','ICRYPTO_CRC16','ICRYPTO_BYTEXOR','ICRYPTO_BIN2ASCII','ICRYPTO_ASCII2STRING','ICRYPTO_ASCII2BIN','HOST_ADDR','HOSTNAME_TOIP',
+            'HOSTIP_TONAME','HIWRD','HIINT','HEX$','HASH','HANDLE','GUIDTXT$','GUID$',
+            'GRAPHIC','GLVOID','GLUSHORT','GLUINT','GLUBYTE','GLSIZEI','GLSHORT','GLOBAL',
+            'GLINT','GLFLOAT','GLENUM','GLDOUBLE','GLCLAMPF','GLCLAMPD','GLBYTE','GLBOOLEAN',
+            'GLBITFIELD','GETWINDOWMULTIKEYSTATE','GETWINDOWKEYSTATE','GETTICKCOUNT','GETS','GETMULTIASYNCKEYSTATE','GETMESSAGE','GETCURRENTINSTANCE',
+            'GETAT','GETASYNCKEYSTATE','GET','FUNCTION_NPARAMS','FUNCTION_EXISTS','FUNCTION_CPARAMS','FUNCTION','FTP_SETSTRING',
+            'FTP_SETSERVERDIR','FTP_SETNUMBER','FTP_SETMODE','FTP_SETLOGFILE','FTP_SETLOCALDIR','FTP_QUIT','FTP_PUTFILE','FTP_GETSTRING',
+            'FTP_GETSERVERDIR','FTP_GETNUMBER','FTP_GETLOCALDIR','FTP_GETLIST','FTP_GETFILE','FTP_GETERRORSTRING','FTP_GETERRORNUMBER','FTP_FINISHED',
+            'FTP_EXTRACT','FTP_DELFILE','FTP_CONNECT','FTP_COMMAND','FRAME','FRAC','FORMAT$','FOR',
+            'FONT_LIST','FONT_CREATE','FONT','FOCUS','FLUSH','FIX','FILE_SIZE','FILE_SHELLDELETE',
+            'FILE_SHELLCOPY','FILE_SETDATETIME','FILE_SEEK','FILE_SAVE','FILE_RENAME','FILE_PUT','FILE_PATHSPLIT','FILE_OPEN',
+            'FILE_LOF','FILE_LOAD','FILE_LINEPRINT','FILE_LINEINPUT','FILE_KILL','FILE_GETVERSIONSTRING','FILE_GETVERSION','FILE_GETTIME',
+            'FILE_GETDATETIMESTAMP','FILE_GETDATETIME','FILE_GETDATE','FILE_GET','FILE_EXISTS','FILE_EOF','FILE_COPY','FILE_CLOSE',
+            'FILE_CHANGED','FILE_APPEND','FACTORIAL','EXTRACT$','EXT','EXPORT','EXP2','EXP10',
+            'EXP','EXIT','EVAL_STRING','EVAL_SETSTRING','EVAL_SETNUMBER','EVAL_MATH','EVAL_LINKEXT','EVAL_GETSTRING',
+            'EVAL_GETNUMBER','EVAL_ERRORGETTOKEN','EVAL_ERRORDESCRIPTION','EVAL_ERRORCLEAR','EVAL','ERRCLEAR','ERR','ENGINE_GETCURRENTTOKEN',
+            'ENDIF','END','ENABLE','ELSEIF','ELSE','ECHO','DWORD','DT_YEAR',
+            'DT_TIMETOSEC','DT_TIMESUBSECONDS','DT_TIMEFORMAT','DT_TIMEADDSECONDS','DT_SETTIMESEPARATOR','DT_SETDATESEPARATOR','DT_SETDATECENTURY','DT_SECTOTIME',
+            'DT_SECTODATE','DT_SECOND','DT_MONTH','DT_MINUTE','DT_LASTDAYOFMONTH','DT_ISVALIDDATE','DT_ISLEAPYEAR','DT_HOUR',
+            'DT_GETWEEKDAYNAME','DT_GETWEEKDAY','DT_GETTIMESTAMP','DT_GETTIMESEPARATOR','DT_GETMONTHNAME','DT_GETDATESEPARATOR','DT_GETDATECENTURY','DT_DAY',
+            'DT_DATETOSEC','DT_DATETIMESUBSECONDS','DT_DATETIMEADDSECONDS','DT_DATESUBDAYS','DT_DATEFORMAT','DT_DATEDIFF','DT_DATEADDDAYS','DT_COOKIEDATE',
+            'DRAW','DOUBLE','DOEVENTS','DO','DISABLE','DIR_REMOVE','DIR_MAKEALL','DIR_MAKE',
+            'DIR_LISTARRAY','DIR_LIST','DIR_ISEMPTY','DIR_ISDIR','DIR_GETCURRENT','DIR_EXISTS','DIR_CHANGEDRIVE','DIR_CHANGE',
+            'DIM','DICTIONARY_MEMINFO','DICTIONARY_LISTKEYS','DICTIONARY_FREE','DICTIONARY_FIND','DICTIONARY_EXISTS','DICTIONARY_CREATE','DICTIONARY_COUNT',
+            'DICTIONARY_ADD','DIALOG_STOPEVENTS','DIALOG_SAVEFILE','DIALOG_OPENFILE','DIALOG_GETCONTROL','DIALOG_CHOOSECOLOR','DIALOG_BROWSEFORFOLDER','DIALOG',
+            'DESKTOP','DESCENDING','DESCEND','DELETEOBJECT','DELETE','DEGTORAD','DECR','DECLARE',
+            'DATE$','CVWRD','CVS','CVQ','CVL','CVI','CVE','CVDWD',
+            'CVD','CVCUX','CVCUR','CVBYT','CURRENCY','CUR','CSET$','CSCH',
+            'CSC','CRYPTO_GETPROVIDERTYPESCOUNT','CRYPTO_GETPROVIDERSCOUNT','CRYPTO_GETDEFAULTPROVIDER','CRYPTO_GENRANDOMSTRING','CRYPTO_ENUMPROVIDERTYPES','CRYPTO_ENUMPROVIDERS','CRYPTO_ENCRYPT',
+            'CRYPTO_DECRYPT','CREATEFONT','COTH','COTAN','COSH','COS','CONTROL_SETTEXT','CONTROL_GETTEXT',
+            'CONTROL_GETNUMBER','CONTROL','CONST','CONSOLE_WRITELINE','CONSOLE_WRITE','CONSOLE_WAITKEY','CONSOLE_SHOWWINDOW','CONSOLE_SHOWCURSOR',
+            'CONSOLE_SETTITLE','CONSOLE_SETTEXTATTRIBUTE','CONSOLE_SETSTDHANDLE','CONSOLE_SETSCREENBUFFERSIZE','CONSOLE_SETPROGRESSBARCHAR','CONSOLE_SETOUTPUTMODE','CONSOLE_SETOUTPUTCP','CONSOLE_SETINPUTMODE',
+            'CONSOLE_SETFILEAPISTOOEM','CONSOLE_SETFILEAPISTOANSI','CONSOLE_SETCURSORSIZE','CONSOLE_SETCURSORPOSITION','CONSOLE_SETCP','CONSOLE_SETACTIVESCREENBUFFER','CONSOLE_SCROLLWINDOW','CONSOLE_SCROLLBUFFERONEROW',
+            'CONSOLE_SCROLLBUFFER','CONSOLE_SAVESCREEN','CONSOLE_RESTORESCREEN','CONSOLE_READLINE','CONSOLE_READ','CONSOLE_PROGRESSBAR','CONSOLE_PRINTLINE','CONSOLE_PRINTAT',
+            'CONSOLE_PRINT','CONSOLE_NORMALSCREEN','CONSOLE_LINE','CONSOLE_INKEYB','CONSOLE_INKEY','CONSOLE_HIDECURSOR','CONSOLE_GETTITLE','CONSOLE_GETTEXTATTRIBUTE',
+            'CONSOLE_GETSTDHANDLE','CONSOLE_GETSIZEY','CONSOLE_GETSIZEX','CONSOLE_GETPROGRESSBARCHAR','CONSOLE_GETOUTPUTMODE','CONSOLE_GETOUTPUTCP','CONSOLE_GETNUMBEROFMOUSEBUTTONS','CONSOLE_GETINPUTMODE',
+            'CONSOLE_GETCURSORY','CONSOLE_GETCURSORX','CONSOLE_GETCURSORSIZE','CONSOLE_GETCURRENTFONTINDEX','CONSOLE_GETCP','CONSOLE_GENERATECTRLEVENT','CONSOLE_FULLSCREEN','CONSOLE_FREE',
+            'CONSOLE_FOREGROUNDRGB','CONSOLE_ENABLECTRLC','CONSOLE_DISABLECTRLC','CONSOLE_CREATESCREENBUFFER','CONSOLE_COLORAT','CONSOLE_CLS','CONSOLE_BOX','CONSOLE_BACKGROUNDRGB',
+            'CONSOLE_ATTACH','CONSOLE_AREFILEAPISANSI','CONSOLE_ALLOC','COM_VARIANTINIT','COM_VARIANTCOPY','COM_VARIANTCLEAR','COM_SUCCEEDED','COM_STRINGFROMCLSID',
+            'COM_RELEASE','COM_QUERYINTERFACE','COM_PROGIDFROMCLSID','COM_ISEQUALIID','COM_ISEQUALGUID','COM_ISEQUALCLSID','COM_GETOBJECT','COM_GETENGINEGUID',
+            'COM_EXECUTE','COM_DISPLAYERROR','COM_CREATEOBJECT','COM_CLSIDFROMSTRING','COM_CLSIDFROMPROGID','COM_BUILDVARIANT','COMBOBOX','COMBINATIONS',
+            'COLOR','CLIPBOARD_SETTEXT','CLIPBOARD_GETTEXT','CLIENT','CLEARMESSAGES','CHR$','CHOOSE$','CHOOSE',
+            'CHECKBOX','CHECK3STATE','CHECK','CGI_WRITELOGFILE','CGI_WRITE','CGI_URLDECODESTRING','CGI_UPLOADFILESTIME','CGI_UPLOADFILESNUMBER',
+            'CGI_UPLOADFILESIZE','CGI_STARTSESSION','CGI_SETSESSIONVARIABLE','CGI_RESETDEFAULTSETTINGS','CGI_REMOVESPECIALCHARSPREFIX','CGI_REMOVEQUOTE','CGI_READ','CGI_LOADCONFIGFILE',
+            'CGI_HEADER','CGI_GETSESSIONVARIABLE','CGI_GETREQUESTMETHOD','CGI_GETQUERYVALUE','CGI_GETCURRENTSESSION','CGI_GETCURRENTGUID','CGI_ENVIRON','CGI_CFGSETOPTION',
+            'CGI_CFGGETOPTION','CGI_ADDSPECIALCHARSPREFIX','CGI_ADDQUOTE','CEIL','CASE','CALL','BYVAL','BYTE',
+            'BYREF','BYCMD','BUTTON','BUNDLE_SETSCRIPTPARAMETERS','BUNDLE_SETSCRIPTNAME','BUNDLE_SETFLAGOBFUSCATEMAINSCRIPT','BUNDLE_SETFLAGDELETEAFTERRUN','BUNDLE_SETFLAGCOMPRESSALLFILES',
+            'BUNDLE_SETFLAGASKBEFOREEXTRACT','BUNDLE_SETEXTRACTIONFOLDER','BUNDLE_SETCREATIONFOLDER','BUNDLE_SETBUNDLENAME','BUNDLE_RESET','BUNDLE_MAKE','BUNDLE_BUILDER','BUNDLE_ADDFOLDER',
+            'BUNDLE_ADDFILE','BOUNDCHECK','BIN$','BIFF_WRITETEXT','BIFF_WRITENUMBER','BIFF_WRITEDATE','BIFF_SETROWHEIGHT','BIFF_SETCOLWIDTH',
+            'BIFF_SETBUFFER','BIFF_CREATEFILE','BIFF_CLOSEFILE','BETWEEN','BEEP','BAR','ATTACH','ATN',
+            'AT','ASSIGN','ASCIZ','ASCIIZ','ASCII2UNICODE','ASCENDING','ASCEND','ASC',
+            'AS','ARRAY','ARCTANH','ARCSINH','ARCSIN','ARCSECH','ARCSEC','ARCCSCH',
+            'ARCCSC','ARCCOTH','ARCCOT','ARCCOSH','ARCCOS','APP_TIMER','APP_SOURCEPATH','APP_SOURCENAME',
+            'APP_SOURCEFULLNAME','APP_PATH','APP_NAME','APP_LISTVARIABLES','APP_LISTKEYWORDS','APP_LISTFUNCTIONS','APP_LISTEQUATES','APP_INCLUDEPATH',
+            'APP_GETMODULEFULLPATH','APP_COUNTER','APPEND','ANY','ANIMATE_STOP','ANIMATE_PLAY','ANIMATE_OPEN','AND',
+            'ALIAS','ALERT','ADD','ACODE$','ABS','%DEF','#MINVERSION','#IF',
+            '#ENDIF','#ELSEIF','#ELSE','#DEFAULT','#DEF','SQLWRITEPRIVATEPROFILESTRING','SQLWRITEFILEDSN','SQLWRITEDSNTOINI',
+            'SQLVALIDDSN','SQLTRANSACT','SQLTABLES','SQLTABLEPRIVILEGES','SQLSTATISTICS','SQLSPECIALCOLUMNS','SQLSETSTMTOPTION','SQLSETSTMTATTR',
+            'SQLSETSCROLLOPTIONS','SQLSETPOS','SQLSETPARAM','SQLSETENVATTR','SQLSETDESCREC','SQLSETDESCFIELD','SQLSETCURSORNAME','SQLSETCONNECTOPTION',
+            'SQLSETCONNECTATTR','SQLSETCONFIGMODE','SQLROWCOUNT','SQLREMOVETRANSLATOR','SQLREMOVEDSNFROMINI','SQLREMOVEDRIVERMANAGER','SQLREMOVEDRIVER','SQLREADFILEDSN',
+            'SQLPUTDATA','SQLPROCEDURES','SQLPROCEDURECOLUMNS','SQLPRIMARYKEYS','SQLPREPARE','SQLPOSTINSTALLERERROR','SQLPARAMOPTIONS','SQLPARAMDATA',
+            'SQLNUMRESULTCOLS','SQLNUMPARAMS','SQLNATIVESQL','SQLMORERESULTS','SQLMANAGEDATASOURCES','SQLINSTALLTRANSLATOREX','SQLINSTALLERERROR','SQLINSTALLDRIVERMANAGER',
+            'SQLINSTALLDRIVEREX','SQLGETTYPEINFO','SQLGETTRANSLATOR','SQLGETSTMTOPTION','SQLGETSTMTATTR','SQLGETPRIVATEPROFILESTRING','SQLGETINSTALLEDDRIVERS','SQLGETINFO',
+            'SQLGETFUNCTIONS','SQLGETENVATTR','SQLGETDIAGREC','SQLGETDIAGFIELD','SQLGETDESCREC','SQLGETDESCFIELD','SQLGETDATA','SQLGETCURSORNAME',
+            'SQLGETCONNECTOPTION','SQLGETCONNECTATTR','SQLGETCONFIGMODE','SQLFREESTMT','SQLFREEHANDLE','SQLFREEENV','SQLFREECONNECT','SQLFOREIGNKEYS',
+            'SQLFETCHSCROLL','SQLFETCH','SQLEXTENDEDFETCH','SQLEXECUTE','SQLEXECDIRECT','SQLERROR','SQLENDTRAN','SQLDRIVERS',
+            'SQLDRIVERCONNECT','SQLDISCONNECT','SQLDESCRIBEPARAM','SQLDESCRIBECOL','SQLDATASOURCES','SQLCREATEDATASOURCE','SQLCOPYDESC','SQLCONNECT',
+            'SQLCONFIGDRIVER','SQLCONFIGDATASOURCE','SQLCOLUMNS','SQLCOLUMNPRIVILEGES','SQLCOLATTRIBUTES','SQLCOLATTRIBUTE','SQLCLOSECURSOR','SQLCANCEL',
+            'SQLBULKOPERATIONS','SQLBROWSECONNECT','SQLBINDPARAMETER','SQLBINDPARAM','SQLBINDCOL','SQLALLOCSTMT','SQLALLOCHANDLE','SQLALLOCENV',
+            'SQLALLOCCONNECT','ODBCWRONGDRIVER','ODBCWRITEPRIVATEPROFILESTRING','ODBCWRITEFILEDSN','ODBCWRITEDSNTOINI','ODBCVALIDDSN','ODBCUPDATERECORD','ODBCUPDATEBYBOOKMARK',
+            'ODBCUNLOCKRECORD','ODBCUNBINDCOLUMNS','ODBCUNBINDCOL','ODBCTABLESCOUNT','ODBCTABLES','ODBCTABLEPRIVILEGESCOUNT','ODBCTABLEPRIVILEGES','ODBCSUPPORTS',
+            'ODBCSTATTABLESCHEMANAME','ODBCSTATTABLEPAGES','ODBCSTATTABLECATALOGNAME','ODBCSTATTABLECARDINALITY','ODBCSTATISTICSCOUNT','ODBCSTATISTICS','ODBCSTATINDEXSORTSEQUENCE','ODBCSTATINDEXSCHEMANAME',
+            'ODBCSTATINDEXQUALIFIER','ODBCSTATINDEXPAGES','ODBCSTATINDEXFILTERCONDITION','ODBCSTATINDEXCOLUMNORDINALPOSITION','ODBCSTATINDEXCOLUMNNAME','ODBCSTATINDEXCATALOGNAME','ODBCSTATINDEXCARDINALITY','ODBCSTATINDEXALLOWDUPLICATES',
+            'ODBCSPECIALCOLUMNSCOUNT','ODBCSPECIALCOLUMNS','ODBCSETTXNISOLATION','ODBCSETTRANSLATELIB','ODBCSETTRACEFILE','ODBCSETTRACE','ODBCSETSTMTUSEBOOKMARKS','ODBCSETSTMTSIMULATECURSOR',
+            'ODBCSETSTMTROWSTATUSPTR','ODBCSETSTMTROWSFETCHEDPTR','ODBCSETSTMTROWOPERATIONPTR','ODBCSETSTMTROWBINDTYPE','ODBCSETSTMTROWBINDOFFSETPTR','ODBCSETSTMTROWARRAYSIZE','ODBCSETSTMTRETRIEVEDATA','ODBCSETSTMTQUERYTIMEOUT',
+            'ODBCSETSTMTPARAMSTATUSPTR','ODBCSETSTMTPARAMSPROCESSEDPTR','ODBCSETSTMTPARAMSETSIZE','ODBCSETSTMTPARAMOPERATIONPTR','ODBCSETSTMTPARAMBINDTYPE','ODBCSETSTMTPARAMBINDOFFSETPTR','ODBCSETSTMTNOSCAN','ODBCSETSTMTMETADATAID',
+            'ODBCSETSTMTMAXROWS','ODBCSETSTMTMAXLENGTH','ODBCSETSTMTKEYSETSIZE','ODBCSETSTMTFETCHBOOKMARKPTR','ODBCSETSTMTENABLEAUTOIPD','ODBCSETSTMTCURSORTYPE','ODBCSETSTMTCURSORSENSITIVITY','ODBCSETSTMTCURSORSCROLLABLE',
+            'ODBCSETSTMTCONCURRENCY','ODBCSETSTMTATTR','ODBCSETSTMTASYNCENABLE','ODBCSETSTMTAPPROWDESC','ODBCSETSTMTAPPPARAMDESC','ODBCSETSTATICCURSOR','ODBCSETROWVERCONCURRENCY','ODBCSETRESULT',
+            'ODBCSETRELATIVEPOSITION','ODBCSETREADONLYCONCURRENCY','ODBCSETQUIETMODE','ODBCSETPOSITION','ODBCSETPOS','ODBCSETPACKETMODE','ODBCSETOPTIMISTICCONCURRENCY','ODBCSETODBCCURSORS',
+            'ODBCSETMULTIUSERKEYSETCURSOR','ODBCSETMETADATAID','ODBCSETLOGINTIMEOUT','ODBCSETLOCKCONCURRENCY','ODBCSETKEYSETDRIVENCURSOR','ODBCSETFORWARDONLYCURSOR','ODBCSETENVOUTPUTNTS','ODBCSETENVODBCVERSION',
+            'ODBCSETENVCPMATCH','ODBCSETENVCONNECTIONPOOLING','ODBCSETENVATTR','ODBCSETDYNAMICCURSOR','ODBCSETDESCREC','ODBCSETDESCFIELD','ODBCSETCURSORTYPE','ODBCSETCURSORSENSITIVITY',
+            'ODBCSETCURSORSCROLLABILITY','ODBCSETCURSORNAME','ODBCSETCURSORLOCKTYPE','ODBCSETCURSORKEYSETSIZE','ODBCSETCURSORCONCURRENCY','ODBCSETCURRENTCATALOG','ODBCSETCONNECTIONTIMEOUT','ODBCSETCONNECTATTR',
+            'ODBCSETCONFIGMODE','ODBCSETCONCURVALUESCONCURRENCY','ODBCSETAUTOCOMMITON','ODBCSETAUTOCOMMITOFF','ODBCSETAUTOCOMMIT','ODBCSETASYNCENABLE','ODBCSETACCESSMODE','ODBCSETABSOLUTEPOSITION',
+            'ODBCROWCOUNT','ODBCROLLBACKTRAN','ODBCROLLBACKENVTRAN','ODBCROLLBACKDBCTRAN','ODBCRESULT','ODBCRESETPARAMS','ODBCREMOVETRANSLATOR','ODBCREMOVEDSNFROMINI',
+            'ODBCREMOVEDRIVERMANAGER','ODBCREMOVEDRIVER','ODBCREFRESHRECORD','ODBCRECORDCOUNT','ODBCREADFILEDSN','ODBCQUOTEDIDENTIFIERCASE','ODBCPUTDATA','ODBCPROCEDURESCOUNT',
+            'ODBCPROCEDURES','ODBCPROCEDURECOLUMNSCOUNT','ODBCPROCEDURECOLUMNS','ODBCPRIMARYKEYSCOUNT','ODBCPRIMARYKEYS','ODBCPREPARE','ODBCPOSTINSTALLERERROR','ODBCPARAMDATA',
+            'ODBCOPENSTMT','ODBCOPENCONNECTION','ODBCNUMRESULTCOLS','ODBCNUMPARAMS','ODBCNATIVESQL','ODBCMOVEPREVIOUS','ODBCMOVENEXT','ODBCMOVELAST',
+            'ODBCMOVEFIRST','ODBCMOVE','ODBCMORERESULTS','ODBCMANAGEDATASOURCES','ODBCLOCKRECORD','ODBCINSTALLTRANSLATOREX','ODBCINSTALLERERROR','ODBCINSTALLDRIVERMANAGER',
+            'ODBCINSTALLDRIVEREX','ODBCGETXOPENCLIYEAR','ODBCGETUSERNAME','ODBCGETUNION','ODBCGETTYPEINFOCOUNT','ODBCGETTYPEINFO','ODBCGETTXNISOLATIONOPTION','ODBCGETTXNISOLATION',
+            'ODBCGETTXNCAPABLE','ODBCGETTRANSLATOR','ODBCGETTRANSLATELIB','ODBCGETTRACEFILE','ODBCGETTRACE','ODBCGETTIMEDATEFUNCTIONS','ODBCGETTIMEDATEDIFFINTERVALS','ODBCGETTIMEDATEADDINTERVALS',
+            'ODBCGETTABLETERM','ODBCGETSYSTEMFUNCTIONS','ODBCGETSUBQUERIES','ODBCGETSTRINGFUNCTIONS','ODBCGETSTMTUSEBOOKMARKS','ODBCGETSTMTSQLSTATE','ODBCGETSTMTSIMULATECURSOR','ODBCGETSTMTROWSTATUSPTR',
+            'ODBCGETSTMTROWSFETCHEDPTR','ODBCGETSTMTROWOPERATIONPTR','ODBCGETSTMTROWNUMBER','ODBCGETSTMTROWBINDTYPE','ODBCGETSTMTROWBINDOFFSETPTR','ODBCGETSTMTROWARRAYSIZE','ODBCGETSTMTRETRIEVEDATA','ODBCGETSTMTQUERYTIMEOUT',
+            'ODBCGETSTMTPARAMSTATUSPTR','ODBCGETSTMTPARAMSPROCESSEDPTR','ODBCGETSTMTPARAMSETSIZE','ODBCGETSTMTPARAMOPERATIONPTR','ODBCGETSTMTPARAMBINDTYPE','ODBCGETSTMTPARAMBINDOFFSETPTR','ODBCGETSTMTNOSCAN','ODBCGETSTMTMETADATAID',
+            'ODBCGETSTMTMAXROWS','ODBCGETSTMTMAXLENGTH','ODBCGETSTMTKEYSETSIZE','ODBCGETSTMTIMPROWDESC','ODBCGETSTMTIMPPARAMDESC','ODBCGETSTMTFETCHBOOKMARKPTR','ODBCGETSTMTERRORINFO','ODBCGETSTMTENABLEAUTOIPD',
+            'ODBCGETSTMTCURSORTYPE','ODBCGETSTMTCURSORSENSITIVITY','ODBCGETSTMTCURSORSCROLLABLE','ODBCGETSTMTCONCURRENCY','ODBCGETSTMTATTR','ODBCGETSTMTASYNCENABLE','ODBCGETSTMTAPPROWDESC','ODBCGETSTMTAPPPARAMDESC',
+            'ODBCGETSTATICCURSORATTRIBUTES2','ODBCGETSTATICCURSORATTRIBUTES1','ODBCGETSTATEMENTSQLSTATE','ODBCGETSTATEMENTERRORINFO','ODBCGETSTANDARDCLICONFORMANCE','ODBCGETSQLSTATE','ODBCGETSQLCONFORMANCE','ODBCGETSQL92VALUEEXPRESSIONS',
+            'ODBCGETSQL92STRINGFUNCTIONS','ODBCGETSQL92ROWVALUECONSTRUCTOR','ODBCGETSQL92REVOKE','ODBCGETSQL92RELATIONALJOINOPERATORS','ODBCGETSQL92PREDICATES','ODBCGETSQL92NUMERICVALUEFUNCTIONS','ODBCGETSQL92GRANT','ODBCGETSQL92FOREIGNKEYUPDATERULE',
+            'ODBCGETSQL92FOREIGNKEYDELETERULE','ODBCGETSQL92DATETIMEFUNCTIONS','ODBCGETSPECIALCHARACTERS','ODBCGETSERVERNAME','ODBCGETSEARCHPATTERNESCAPE','ODBCGETSCROLLOPTIONS','ODBCGETSCHEMAUSAGE','ODBCGETSCHEMATERM',
+            'ODBCGETROWUPDATES','ODBCGETQUIETMODE','ODBCGETPROCEDURETERM','ODBCGETPROCEDURESSUPPORT','ODBCGETPRIVATEPROFILESTRING','ODBCGETPOSOPERATIONS','ODBCGETPARAMARRAYSELECTS','ODBCGETPARAMARRAYROWCOUNTS',
+            'ODBCGETPACKETMODE','ODBCGETOUTERJOINS','ODBCGETORDERBYCOLUMNSINSELECT','ODBCGETOJCAPABILITIES','ODBCGETODBCVER','ODBCGETODBCINTERFACECONFORMANCE','ODBCGETODBCCURSORS','ODBCGETNUMERICFUNCTIONS',
+            'ODBCGETNULLCOLLATION','ODBCGETNONNULLABLECOLUMNS','ODBCGETNEEDLONGDATALEN','ODBCGETMULTRESULTSETS','ODBCGETMULTIPLEACTIVETXN','ODBCGETMETADATAID','ODBCGETMAXUSERNAMELEN','ODBCGETMAXTABLESINSELECT',
+            'ODBCGETMAXTABLENAMELEN','ODBCGETMAXSTATEMENTLEN','ODBCGETMAXSCHEMANAMELEN','ODBCGETMAXROWSIZEINCLUDESLONG','ODBCGETMAXROWSIZE','ODBCGETMAXPROCEDURENAMELEN','ODBCGETMAXINDEXSIZE','ODBCGETMAXIDENTIFIERLEN',
+            'ODBCGETMAXDRIVERCONNECTIONS','ODBCGETMAXCURSORNAMELEN','ODBCGETMAXCONCURRENTACTIVITIES','ODBCGETMAXCOLUMNSINTABLE','ODBCGETMAXCOLUMNSINSELECT','ODBCGETMAXCOLUMNSINORDERBY','ODBCGETMAXCOLUMNSININDEX','ODBCGETMAXCOLUMNSINGROUPBY',
+            'ODBCGETMAXCOLUMNNAMELEN','ODBCGETMAXCHARLITERALLEN','ODBCGETMAXCATALOGNAMELEN','ODBCGETMAXBINARYLITERALLEN','ODBCGETMAXASYNCCONCURRENTSTATEMENTS','ODBCGETLONGVARCHARDATABYCOLNAME','ODBCGETLONGVARCHARDATA','ODBCGETLOGINTIMEOUT',
+            'ODBCGETLIKEESCAPECLAUSE','ODBCGETKEYWORDS','ODBCGETKEYSETCURSORATTRIBUTES2','ODBCGETKEYSETCURSORATTRIBUTES1','ODBCGETINTEGRITY','ODBCGETINSTALLERERRORMESSAGE','ODBCGETINSTALLERERRORCODE','ODBCGETINSTALLEDDRIVERS',
+            'ODBCGETINSERTSTATEMENT','ODBCGETINFOSTR','ODBCGETINFOSCHEMAVIEWS','ODBCGETINFOLONG','ODBCGETINFOINT','ODBCGETINFO','ODBCGETINDEXKEYWORDS','ODBCGETIMPROWDESCREC',
+            'ODBCGETIMPROWDESCFIELDTYPE','ODBCGETIMPROWDESCFIELDSCALE','ODBCGETIMPROWDESCFIELDPRECISION','ODBCGETIMPROWDESCFIELDOCTETLENGTH','ODBCGETIMPROWDESCFIELDNULLABLE','ODBCGETIMPROWDESCFIELDNAME','ODBCGETIMPROWDESCFIELD','ODBCGETIMPPARAMDESCREC',
+            'ODBCGETIMPPARAMDESCFIELDTYPE','ODBCGETIMPPARAMDESCFIELDSCALE','ODBCGETIMPPARAMDESCFIELDPRECISION','ODBCGETIMPPARAMDESCFIELDOCTETLENGTH','ODBCGETIMPPARAMDESCFIELDNULLABLE','ODBCGETIMPPARAMDESCFIELDNAME','ODBCGETIMPPARAMDESCFIELD','ODBCGETIDENTIFIERQUOTECHAR',
+            'ODBCGETIDENTIFIERCASE','ODBCGETGROUPBY','ODBCGETFUNCTIONS','ODBCGETFORWARDONLYCURSORATTRIBUTES2','ODBCGETFORWARDONLYCURSORATTRIBUTES1','ODBCGETFILEUSAGE','ODBCGETEXPRESSIONSINORDERBY','ODBCGETERRORINFO',
+            'ODBCGETENVSQLSTATE','ODBCGETENVOUTPUTNTS','ODBCGETENVODBCVERSION','ODBCGETENVIRONMENTSQLSTATE','ODBCGETENVIRONMENTERRORINFO','ODBCGETENVERRORINFO','ODBCGETENVCPMATCH','ODBCGETENVCONNECTIONPOOLING',
+            'ODBCGETENVATTR','ODBCGETDYNAMICCURSORATTRIBUTES2','ODBCGETDYNAMICCURSORATTRIBUTES1','ODBCGETDROPVIEW','ODBCGETDROPTRANSLATION','ODBCGETDROPTABLE','ODBCGETDROPSCHEMA','ODBCGETDROPDOMAIN',
+            'ODBCGETDROPCOLLATION','ODBCGETDROPCHARACTERSET','ODBCGETDROPASSERTION','ODBCGETDRIVERVER','ODBCGETDRIVERODBCVER','ODBCGETDRIVERNAME','ODBCGETDRIVERMANAGERINSTALLPATH','ODBCGETDRIVERHLIB',
+            'ODBCGETDRIVERHENV','ODBCGETDRIVERHDBC','ODBCGETDMVERMINOR','ODBCGETDMVERMAJOR','ODBCGETDMVER','ODBCGETDIAGREC','ODBCGETDIAGFIELD','ODBCGETDESCSQLSTATE',
+            'ODBCGETDESCRIPTORSQLSTATE','ODBCGETDESCRIPTORERRORINFO','ODBCGETDESCRIBEPARAMETER','ODBCGETDESCREC','ODBCGETDESCFIELD','ODBCGETDESCERRORINFO','ODBCGETDEFAULTTXNISOLATION','ODBCGETDDLINDEX',
+            'ODBCGETDBMSVER','ODBCGETDBMSNAME','ODBCGETDBCSQLSTATE','ODBCGETDBCERRORINFO','ODBCGETDATETIMELITERALS','ODBCGETDATASTRINGBYCOLNAME','ODBCGETDATASTRING','ODBCGETDATASOURCEREADONLY',
+            'ODBCGETDATASOURCENAME','ODBCGETDATAEXTENSIONS','ODBCGETDATABASENAME','ODBCGETDATA','ODBCGETCURSORTYPE','ODBCGETCURSORSENSITIVITYSUPPORT','ODBCGETCURSORSENSITIVITY','ODBCGETCURSORSCROLLABILITY',
+            'ODBCGETCURSORROLLBACKBEHAVIOR','ODBCGETCURSORNAME','ODBCGETCURSORLOCKTYPE','ODBCGETCURSORKEYSETSIZE','ODBCGETCURSORCONCURRENCY','ODBCGETCURSORCOMMITBEHAVIOR','ODBCGETCURRENTCATALOG','ODBCGETCREATEVIEW',
+            'ODBCGETCREATETRANSLATION','ODBCGETCREATETABLE','ODBCGETCREATESCHEMA','ODBCGETCREATEDOMAIN','ODBCGETCREATECOLLATION','ODBCGETCREATECHARACTERSET','ODBCGETCREATEASSERTION','ODBCGETCORRELATIONNAME',
+            'ODBCGETCONVERTVARCHAR','ODBCGETCONVERTVARBINARY','ODBCGETCONVERTTINYINT','ODBCGETCONVERTTIMESTAMP','ODBCGETCONVERTTIME','ODBCGETCONVERTSMALLINT','ODBCGETCONVERTREAL','ODBCGETCONVERTNUMERIC',
+            'ODBCGETCONVERTLONGVARCHAR','ODBCGETCONVERTLONGVARBINARY','ODBCGETCONVERTINTERVALYEARMONTH','ODBCGETCONVERTINTERVALDAYTIME','ODBCGETCONVERTINTEGER','ODBCGETCONVERTFUNCTIONS','ODBCGETCONVERTFLOAT','ODBCGETCONVERTDOUBLE',
+            'ODBCGETCONVERTDECIMAL','ODBCGETCONVERTDATE','ODBCGETCONVERTCHAR','ODBCGETCONVERTBIT','ODBCGETCONVERTBINARY','ODBCGETCONVERTBIGINT','ODBCGETCONNECTIONTIMEOUT','ODBCGETCONNECTIONSQLSTATE',
+            'ODBCGETCONNECTIONERRORINFO','ODBCGETCONNECTIONDEAD','ODBCGETCONNECTATTR','ODBCGETCONFIGMODE','ODBCGETCONCATNULLBEHAVIOR','ODBCGETCOLUMNALIAS','ODBCGETCOLLATIONSEQ','ODBCGETCATALOGUSAGE',
+            'ODBCGETCATALOGTERM','ODBCGETCATALOGNAMESEPARATOR','ODBCGETCATALOGNAME','ODBCGETCATALOGLOCATION','ODBCGETBOOKMARKPERSISTENCE','ODBCGETBATCHSUPPORT','ODBCGETBATCHROWCOUNT','ODBCGETAUTOIPD',
+            'ODBCGETAUTOCOMMIT','ODBCGETASYNCMODE','ODBCGETASYNCENABLE','ODBCGETALTERTABLE','ODBCGETALTERDOMAIN','ODBCGETAGGREGATEFUNCTIONS','ODBCGETACTIVEENVIRONMENTS','ODBCGETACCESSMODE',
+            'ODBCGETACCESSIBLETABLES','ODBCGETACCESSIBLEPROCEDURES','ODBCFREESTMT','ODBCFREEHANDLE','ODBCFREEENV','ODBCFREEDESC','ODBCFREEDBC','ODBCFREECONNECT',
+            'ODBCFOREIGNKEYSCOUNT','ODBCFOREIGNKEYS','ODBCFETCHSCROLL','ODBCFETCHBYBOOKMARK','ODBCFETCH','ODBCEXTENDEDFETCH','ODBCEXECUTE','ODBCEXECDIRECT',
+            'ODBCERROR','ODBCEOF','ODBCENDTRAN','ODBCDRIVERSCOUNT','ODBCDRIVERS','ODBCDRIVERCONNECT','ODBCDISCONNECT','ODBCDESCRIBEPARAM',
+            'ODBCDESCRIBECOL','ODBCDELETERECORD','ODBCDELETEBYBOOKMARK','ODBCDATASOURCES','ODBCCREATEDATASOURCE','ODBCCOPYDESC','ODBCCONNECTIONISDEAD','ODBCCONNECTIONISALIVE',
+            'ODBCCONNECT','ODBCCONFIGDRIVER','ODBCCONFIGDATASOURCE','ODBCCOMMITTRAN','ODBCCOMMITENVTRAN','ODBCCOMMITDBCTRAN','ODBCCOLUPDATABLE','ODBCCOLUNSIGNED',
+            'ODBCCOLUNNAMED','ODBCCOLUMNSCOUNT','ODBCCOLUMNS','ODBCCOLUMNPRIVILEGESCOUNT','ODBCCOLUMNPRIVILEGES','ODBCCOLUMN','ODBCCOLTYPENAME','ODBCCOLTYPE',
+            'ODBCCOLTABLENAME','ODBCCOLSEARCHABLE','ODBCCOLSCHEMANAME','ODBCCOLSCALE','ODBCCOLPRECISION','ODBCCOLOCTETLENGTH','ODBCCOLNUMPRECRADIX','ODBCCOLNULLABLE',
+            'ODBCCOLNAME','ODBCCOLLOCALTYPENAME','ODBCCOLLITERALSUFFIX','ODBCCOLLITERALPREFIX','ODBCCOLLENGTH','ODBCCOLLABEL','ODBCCOLISNULL','ODBCCOLFIXEDPRECSCALE',
+            'ODBCCOLDISPLAYSIZE','ODBCCOLCOUNT','ODBCCOLCONCISETYPE','ODBCCOLCATALOGNAME','ODBCCOLCASESENSITIVE','ODBCCOLBASETABLENAME','ODBCCOLBASECOLUMNNAME','ODBCCOLAUTOUNIQUEVALUE',
+            'ODBCCOLATTRIBUTE','ODBCCLOSESTMTCURSOR','ODBCCLOSESTMT','ODBCCLOSECURSOR','ODBCCLOSECONNECTION','ODBCCLEARRESULT','ODBCCANCEL','ODBCBULKOPERATIONS',
+            'ODBCBROWSECONNECT','ODBCBINDPARAMETER','ODBCBINDCOLTOWORD','ODBCBINDCOLTOTIMESTAMP','ODBCBINDCOLTOTIME','ODBCBINDCOLTOSTRING','ODBCBINDCOLTOSINGLE','ODBCBINDCOLTOQUAD',
+            'ODBCBINDCOLTONUMERIC','ODBCBINDCOLTOLONG','ODBCBINDCOLTOINTEGER','ODBCBINDCOLTODWORD','ODBCBINDCOLTODOUBLE','ODBCBINDCOLTODECIMAL','ODBCBINDCOLTODATE','ODBCBINDCOLTOCURRENCY',
+            'ODBCBINDCOLTOBYTE','ODBCBINDCOLTOBIT','ODBCBINDCOLTOBINARY','ODBCBINDCOL','ODBCALLOCSTMT','ODBCALLOCHANDLE','ODBCALLOCENV','ODBCALLOCDESC',
+            'ODBCALLOCDBC','ODBCALLOCCONNECT','ODBCADDRECORD','GLVIEWPORT','GLVERTEXPOINTER','GLVERTEX4SV','GLVERTEX4S','GLVERTEX4IV',
+            'GLVERTEX4I','GLVERTEX4FV','GLVERTEX4F','GLVERTEX4DV','GLVERTEX4D','GLVERTEX3SV','GLVERTEX3S','GLVERTEX3IV',
+            'GLVERTEX3I','GLVERTEX3FV','GLVERTEX3F','GLVERTEX3DV','GLVERTEX3D','GLVERTEX2SV','GLVERTEX2S','GLVERTEX2IV',
+            'GLVERTEX2I','GLVERTEX2FV','GLVERTEX2F','GLVERTEX2DV','GLVERTEX2D','GLUUNPROJECT','GLUTESSVERTEX','GLUTESSPROPERTY',
+            'GLUTESSNORMAL','GLUTESSENDPOLYGON','GLUTESSENDCONTOUR','GLUTESSCALLBACK','GLUTESSBEGINPOLYGON','GLUTESSBEGINCONTOUR','GLUSPHERE','GLUSCALEIMAGE',
+            'GLUQUADRICTEXTURE','GLUQUADRICORIENTATION','GLUQUADRICNORMALS','GLUQUADRICDRAWSTYLE','GLUQUADRICCALLBACK','GLUPWLCURVE','GLUPROJECT','GLUPICKMATRIX',
+            'GLUPERSPECTIVE','GLUPARTIALDISK','GLUORTHO2D','GLUNURBSSURFACE','GLUNURBSPROPERTY','GLUNURBSCURVE','GLUNURBSCALLBACK','GLUNEXTCONTOUR',
+            'GLUNEWTESS','GLUNEWQUADRIC','GLUNEWNURBSRENDERER','GLULOOKAT','GLULOADSAMPLINGMATRICES','GLUGETTESSPROPERTY','GLUGETSTRING','GLUGETNURBSPROPERTY',
+            'GLUERRORSTRING','GLUENDTRIM','GLUENDSURFACE','GLUENDPOLYGON','GLUENDCURVE','GLUDISK','GLUDELETETESS','GLUDELETEQUADRIC',
+            'GLUDELETENURBSRENDERER','GLUCYLINDER','GLUBUILD2DMIPMAPS','GLUBUILD1DMIPMAPS','GLUBEGINTRIM','GLUBEGINSURFACE','GLUBEGINPOLYGON','GLUBEGINCURVE',
+            'GLTRANSLATEF','GLTRANSLATED','GLTEXSUBIMAGE2D','GLTEXSUBIMAGE1D','GLTEXPARAMETERIV','GLTEXPARAMETERI','GLTEXPARAMETERFV','GLTEXPARAMETERF',
+            'GLTEXIMAGE2D','GLTEXIMAGE1D','GLTEXGENIV','GLTEXGENI','GLTEXGENFV','GLTEXGENF','GLTEXGENDV','GLTEXGEND',
+            'GLTEXENVIV','GLTEXENVI','GLTEXENVFV','GLTEXENVF','GLTEXCOORDPOINTER','GLTEXCOORD4SV','GLTEXCOORD4S','GLTEXCOORD4IV',
+            'GLTEXCOORD4I','GLTEXCOORD4FV','GLTEXCOORD4F','GLTEXCOORD4DV','GLTEXCOORD4D','GLTEXCOORD3SV','GLTEXCOORD3S','GLTEXCOORD3IV',
+            'GLTEXCOORD3I','GLTEXCOORD3FV','GLTEXCOORD3F','GLTEXCOORD3DV','GLTEXCOORD3D','GLTEXCOORD2SV','GLTEXCOORD2S','GLTEXCOORD2IV',
+            'GLTEXCOORD2I','GLTEXCOORD2FV','GLTEXCOORD2F','GLTEXCOORD2DV','GLTEXCOORD2D','GLTEXCOORD1SV','GLTEXCOORD1S','GLTEXCOORD1IV',
+            'GLTEXCOORD1I','GLTEXCOORD1FV','GLTEXCOORD1F','GLTEXCOORD1DV','GLTEXCOORD1D','GLSTENCILOP','GLSTENCILMASK','GLSTENCILFUNC',
+            'GLSHADEMODEL','GLSELECTBUFFER','GLSCISSOR','GLSCALEF','GLSCALED','GLROTATEF','GLROTATED','GLRENDERMODE',
+            'GLRECTSV','GLRECTS','GLRECTIV','GLRECTI','GLRECTFV','GLRECTF','GLRECTDV','GLRECTD',
+            'GLREADPIXELS','GLREADBUFFER','GLRASTERPOS4SV','GLRASTERPOS4S','GLRASTERPOS4IV','GLRASTERPOS4I','GLRASTERPOS4FV','GLRASTERPOS4F',
+            'GLRASTERPOS4DV','GLRASTERPOS4D','GLRASTERPOS3SV','GLRASTERPOS3S','GLRASTERPOS3IV','GLRASTERPOS3I','GLRASTERPOS3FV','GLRASTERPOS3F',
+            'GLRASTERPOS3DV','GLRASTERPOS3D','GLRASTERPOS2SV','GLRASTERPOS2S','GLRASTERPOS2IV','GLRASTERPOS2I','GLRASTERPOS2FV','GLRASTERPOS2F',
+            'GLRASTERPOS2DV','GLRASTERPOS2D','GLPUSHNAME','GLPUSHMATRIX','GLPUSHCLIENTATTRIB','GLPUSHATTRIB','GLPRIORITIZETEXTURES','GLPOPNAME',
+            'GLPOPMATRIX','GLPOPCLIENTATTRIB','GLPOPATTRIB','GLPOLYGONSTIPPLE','GLPOLYGONOFFSET','GLPOLYGONMODE','GLPOINTSIZE','GLPIXELZOOM',
+            'GLPIXELTRANSFERI','GLPIXELTRANSFERF','GLPIXELSTOREI','GLPIXELSTOREF','GLPIXELMAPUSV','GLPIXELMAPUIV','GLPIXELMAPFV','GLPASSTHROUGH',
+            'GLORTHO','GLNORMALPOINTER','GLNORMAL3SV','GLNORMAL3S','GLNORMAL3IV','GLNORMAL3I','GLNORMAL3FV','GLNORMAL3F',
+            'GLNORMAL3DV','GLNORMAL3D','GLNORMAL3BV','GLNORMAL3B','GLNEWLIST','GLMULTMATRIXF','GLMULTMATRIXD','GLMATRIXMODE',
+            'GLMATERIALIV','GLMATERIALI','GLMATERIALFV','GLMATERIALF','GLMAPGRID2F','GLMAPGRID2D','GLMAPGRID1F','GLMAPGRID1D',
+            'GLMAP2F','GLMAP2D','GLMAP1F','GLMAP1D','GLLOGICOP','GLLOADNAME','GLLOADMATRIXF','GLLOADMATRIXD',
+            'GLLOADIDENTITY','GLLISTBASE','GLLINEWIDTH','GLLINESTIPPLE','GLLIGHTMODELIV','GLLIGHTMODELI','GLLIGHTMODELFV','GLLIGHTMODELF',
+            'GLLIGHTIV','GLLIGHTI','GLLIGHTFV','GLLIGHTF','GLISTEXTURE','GLISLIST','GLISENABLED','GLINTERLEAVEDARRAYS',
+            'GLINITNAMES','GLINDEXUBV','GLINDEXUB','GLINDEXSV','GLINDEXS','GLINDEXPOINTER','GLINDEXMASK','GLINDEXIV',
+            'GLINDEXI','GLINDEXFV','GLINDEXF','GLINDEXDV','GLINDEXD','GLHINT','GLGETTEXPARAMETERIV','GLGETTEXPARAMETERFV',
+            'GLGETTEXLEVELPARAMETERIV','GLGETTEXLEVELPARAMETERFV','GLGETTEXIMAGE','GLGETTEXGENIV','GLGETTEXGENFV','GLGETTEXGENDV','GLGETTEXENVIV','GLGETTEXENVFV',
+            'GLGETSTRING','GLGETPOLYGONSTIPPLE','GLGETPOINTERV','GLGETPIXELMAPUSV','GLGETPIXELMAPUIV','GLGETPIXELMAPFV','GLGETMATERIALIV','GLGETMATERIALFV',
+            'GLGETMAPIV','GLGETMAPFV','GLGETMAPDV','GLGETLIGHTIV','GLGETLIGHTFV','GLGETINTEGERV','GLGETFLOATV','GLGETERROR',
+            'GLGETDOUBLEV','GLGETCLIPPLANE','GLGETBOOLEANV','GLGENTEXTURES','GLGENLISTS','GLFRUSTUM','GLFRONTFACE','GLFOGIV',
+            'GLFOGI','GLFOGFV','GLFOGF','GLFLUSH','GLFINISH','GLFEEDBACKBUFFER','GLEVALPOINT2','GLEVALPOINT1',
+            'GLEVALMESH2','GLEVALMESH1','GLEVALCOORD2FV','GLEVALCOORD2F','GLEVALCOORD2DV','GLEVALCOORD2D','GLEVALCOORD1FV','GLEVALCOORD1F',
+            'GLEVALCOORD1DV','GLEVALCOORD1D','GLENDLIST','GLEND','GLENABLECLIENTSTATE','GLENABLE','GLEDGEFLAGV','GLEDGEFLAGPOINTER',
+            'GLEDGEFLAG','GLDRAWPIXELS','GLDRAWELEMENTS','GLDRAWBUFFER','GLDRAWARRAYS','GLDISABLECLIENTSTATE','GLDISABLE','GLDEPTHRANGE',
+            'GLDEPTHMASK','GLDEPTHFUNC','GLDELETETEXTURES','GLDELETELISTS','GLCULLFACE','GLCOPYTEXSUBIMAGE2D','GLCOPYTEXSUBIMAGE1D','GLCOPYTEXIMAGE2D',
+            'GLCOPYTEXIMAGE1D','GLCOPYPIXELS','GLCOLORPOINTER','GLCOLORMATERIAL','GLCOLORMASK','GLCOLOR4USV','GLCOLOR4US','GLCOLOR4UIV',
+            'GLCOLOR4UI','GLCOLOR4UBV','GLCOLOR4UB','GLCOLOR4SV','GLCOLOR4S','GLCOLOR4IV','GLCOLOR4I','GLCOLOR4FV',
+            'GLCOLOR4F','GLCOLOR4DV','GLCOLOR4D','GLCOLOR4BV','GLCOLOR4B','GLCOLOR3USV','GLCOLOR3US','GLCOLOR3UIV',
+            'GLCOLOR3UI','GLCOLOR3UBV','GLCOLOR3UB','GLCOLOR3SV','GLCOLOR3S','GLCOLOR3IV','GLCOLOR3I','GLCOLOR3FV',
+            'GLCOLOR3F','GLCOLOR3DV','GLCOLOR3D','GLCOLOR3BV','GLCOLOR3B','GLCLIPPLANE','GLCLEARSTENCIL','GLCLEARINDEX',
+            'GLCLEARDEPTH','GLCLEARCOLOR','GLCLEARACCUM','GLCLEAR','GLCALLLISTS','GLCALLLIST','GLBLENDFUNC','GLBITMAP',
+            'GLBINDTEXTURE','GLBEGIN','GLARRAYELEMENT','GLARETEXTURESRESIDENT','GLALPHAFUNC','GLACCUM'),
+        2 => array(
+            '$BEL','$BS','$CR','$CRLF','$DQ','$DT_DATE_SEPARATOR','$DT_LANGUAGE','$DT_TIME_SEPARATOR',
+            '$ESC','$FF','$LF','$NUL','$PC_SD_MY_PC','$SPC','$SQL_OPT_TRACE_FILE_DEFAULT','$SQL_SPEC_STRING',
+            '$TAB','$TRACKBAR_CLASS','$VT','%ACM_OPEN','%ACM_OPENW','%ACM_PLAY','%ACM_STOP','%ACN_START',
+            '%ACN_STOP','%ACS_AUTOPLAY','%ACS_CENTER','%ACS_TIMER','%ACS_TRANSPARENT','%APP_COUNTER_FUNLOOKUP','%APP_COUNTER_KEYLOOKUP','%APP_COUNTER_LOOKUP',
+            '%APP_COUNTER_TESTALPHA','%APP_COUNTER_UDTLOOKUP','%APP_COUNTER_VARLOOKUP','%APP_TIMER_EXECTOTAL','%APP_TIMER_INIT','%APP_TIMER_LOAD','%APP_TIMER_PREPROCESSOR','%AW_ACTIVATE',
+            '%AW_BLEND','%AW_CENTER','%AW_HIDE','%AW_HOR_NEGATIVE','%AW_HOR_POSITIVE','%AW_SLIDE','%AW_VER_NEGATIVE','%AW_VER_POSITIVE',
+            '%BCM_FIRST','%BLACK','%BLUE','%BM_GETCHECK','%BM_SETCHECK','%BST_CHECKED','%BST_UNCHECKED','%BS_AUTOCHECKBOX',
+            '%BS_BOTTOM','%BS_CENTER','%BS_DEFAULT','%BS_DEFPUSHBUTTON','%BS_FLAT','%BS_LEFT','%BS_LEFTTEXT','%BS_MULTILINE',
+            '%BS_NOTIFY','%BS_OWNERDRAW','%BS_PUSHLIKE','%BS_RIGHT','%BS_TOP','%BS_VCENTER','%BUNDLE_BUILDER_CANCELLED','%CBM_FIRST',
+            '%CBN_CLOSEUP','%CBN_DBLCLK','%CBN_DROPDOWN','%CBN_EDITCHANGE','%CBN_EDITUPDATE','%CBN_ERRSPACE','%CBN_KILLFOCUS','%CBN_SELCANCEL',
+            '%CBN_SELCHANGE','%CBN_SELENDCANCEL','%CBN_SELENDOK','%CBN_SETFOCUS','%CBS_AUTOHSCROLL','%CBS_DISABLENOSCROLL','%CBS_DROPDOWN','%CBS_DROPDOWNLIST',
+            '%CBS_HASSTRINGS','%CBS_LOWERCASE','%CBS_NOINTEGRALHEIGHT','%CBS_SIMPLE','%CBS_SORT','%CBS_UPPERCASE','%CB_SELECTSTRING','%CCM_FIRST',
+            '%CC_ANYCOLOR','%CC_ENABLEHOOK','%CC_ENABLETEMPLATE','%CC_ENABLETEMPLATEHANDLE','%CC_FULLOPEN','%CC_PREVENTFULLOPEN','%CC_RGBINIT','%CC_SHOWHELP',
+            '%CC_SOLIDCOLOR','%CFE_BOLD','%CFE_ITALIC','%CFE_LINK','%CFE_PROTECTED','%CFE_STRIKEOUT','%CFE_UNDERLINE','%CFM_ANIMATION',
+            '%CFM_BACKCOLOR','%CFM_BOLD','%CFM_CHARSET','%CFM_COLOR','%CFM_FACE','%CFM_ITALIC','%CFM_KERNING','%CFM_LCID',
+            '%CFM_LINK','%CFM_OFFSET','%CFM_PROTECTED','%CFM_REVAUTHOR','%CFM_SIZE','%CFM_SPACING','%CFM_STRIKEOUT','%CFM_STYLE',
+            '%CFM_UNDERLINE','%CFM_UNDERLINETYPE','%CFM_WEIGHT','%CGI_ACCEPT_FILE_UPLOAD','%CGI_AUTO_ADD_SPECIAL_CHARS_PREFIX','%CGI_AUTO_CREATE_VARS','%CGI_BUFFERIZE_OUTPUT','%CGI_DOUBLE_QUOTE',
+            '%CGI_FILE_UPLOAD_BASEPATH','%CGI_FORCE_SESSION_VALIDATION','%CGI_MAX_BYTE_FROM_STD_IN','%CGI_REQUEST_METHOD_GET','%CGI_REQUEST_METHOD_POST','%CGI_SESSION_FILE_BASEPATH','%CGI_SINGLE_QUOTE','%CGI_SPECIAL_CHARS_PREFIX',
+            '%CGI_TEMPORARY_UPLOAD_PATH','%CGI_UPLOAD_CAN_OVERWRITE','%CGI_WRITE_LOG_FILE','%CGI_WRITE_VARS_INTO_LOG_FILE','%CONOLE_ATTACH_PARENT_PROCESS','%CONSOLE_BACKGROUND_BLUE','%CONSOLE_BACKGROUND_GREEN','%CONSOLE_BACKGROUND_INTENSITY',
+            '%CONSOLE_BACKGROUND_RED','%CONSOLE_BOX_FLAG_3DOFF','%CONSOLE_BOX_FLAG_3DON','%CONSOLE_BOX_FLAG_SHADOW','%CONSOLE_COMMON_LVB_GRID_HORIZONTAL','%CONSOLE_COMMON_LVB_GRID_LVERTICAL','%CONSOLE_COMMON_LVB_GRID_RVERTICAL','%CONSOLE_COMMON_LVB_LEADING_BYTE',
+            '%CONSOLE_COMMON_LVB_REVERSE_VIDEO','%CONSOLE_COMMON_LVB_TRAILING_BYTE','%CONSOLE_COMMON_LVB_UNDERSCORE','%CONSOLE_CTRL_BREAK_EVENT','%CONSOLE_CTRL_C_EVENT','%CONSOLE_DOUBLE_CLICK','%CONSOLE_ENABLE_AUTO_POSITION','%CONSOLE_ENABLE_ECHO_INPUT',
+            '%CONSOLE_ENABLE_EXTENDED_FLAGS','%CONSOLE_ENABLE_INSERT_MODE','%CONSOLE_ENABLE_LINE_INPUT','%CONSOLE_ENABLE_MOUSE_INPUT','%CONSOLE_ENABLE_PROCESSED_INPUT','%CONSOLE_ENABLE_PROCESSED_OUTPUT','%CONSOLE_ENABLE_QUICK_EDIT_MODE','%CONSOLE_ENABLE_WINDOW_INPUT',
+            '%CONSOLE_ENABLE_WRAP_AT_EOL_OUTPUT','%CONSOLE_FOREGROUND_BLUE','%CONSOLE_FOREGROUND_GREEN','%CONSOLE_FOREGROUND_INTENSITY','%CONSOLE_FOREGROUND_RED','%CONSOLE_LBUTTON','%CONSOLE_LINE_HORIZONTAL','%CONSOLE_LINE_VERTICAL',
+            '%CONSOLE_MBUTTON','%CONSOLE_MOUSE_MOVED','%CONSOLE_MOUSE_WHEELED','%CONSOLE_RBUTTON','%CONSOLE_SCROLLBUF_DOWN','%CONSOLE_SCROLLBUF_UP','%CONSOLE_SCROLLWND_ABSOLUTE','%CONSOLE_SCROLLWND_RELATIVE',
+            '%CONSOLE_STD_ERROR_HANDLE','%CONSOLE_STD_INPUT_HANDLE','%CONSOLE_STD_OUTPUT_HANDLE','%CONSOLE_SW_FORCEMINIMIZE','%CONSOLE_SW_HIDE','%CONSOLE_SW_MAXIMIZE','%CONSOLE_SW_MINIMIZE','%CONSOLE_SW_RESTORE',
+            '%CONSOLE_SW_SHOW','%CONSOLE_SW_SHOWDEFAULT','%CONSOLE_SW_SHOWMAXIMIZED','%CONSOLE_SW_SHOWMINIMIZED','%CONSOLE_SW_SHOWMINNOACTIVE','%CONSOLE_SW_SHOWNA','%CONSOLE_SW_SHOWNOACTIVATE','%CONSOLE_SW_SHOWNORMAL',
+            '%CONSOLE_UNAVAILABLE','%CRYPTO_CALG_DES','%CRYPTO_CALG_RC2','%CRYPTO_CALG_RC4','%CRYPTO_PROV_DH_SCHANNEL','%CRYPTO_PROV_DSS','%CRYPTO_PROV_DSS_DH','%CRYPTO_PROV_FORTEZZA',
+            '%CRYPTO_PROV_MS_EXCHANGE','%CRYPTO_PROV_RSA_FULL','%CRYPTO_PROV_RSA_SCHANNEL','%CRYPTO_PROV_RSA_SIG','%CRYPTO_PROV_SSL','%CSIDL_ADMINTOOLS','%CSIDL_ALTSTARTUP','%CSIDL_APPDATA',
+            '%CSIDL_BITBUCKET','%CSIDL_CDBURN_AREA','%CSIDL_COMMON_ADMINTOOLS','%CSIDL_COMMON_ALTSTARTUP','%CSIDL_COMMON_APPDATA','%CSIDL_COMMON_DESKTOPDIRECTORY','%CSIDL_COMMON_DOCUMENTS','%CSIDL_COMMON_FAVORITES',
+            '%CSIDL_COMMON_MUSIC','%CSIDL_COMMON_PICTURES','%CSIDL_COMMON_PROGRAMS','%CSIDL_COMMON_STARTMENU','%CSIDL_COMMON_STARTUP','%CSIDL_COMMON_TEMPLATES','%CSIDL_COMMON_VIDEO','%CSIDL_CONTROLS',
+            '%CSIDL_COOKIES','%CSIDL_DESKTOP','%CSIDL_DESKTOPDIRECTORY','%CSIDL_DRIVES','%CSIDL_FAVORITES','%CSIDL_FLAG_CREATE','%CSIDL_FONTS','%CSIDL_HISTORY',
+            '%CSIDL_INTERNET','%CSIDL_INTERNET_CACHE','%CSIDL_LOCAL_APPDATA','%CSIDL_MYDOCUMENTS','%CSIDL_MYMUSIC','%CSIDL_MYPICTURES','%CSIDL_MYVIDEO','%CSIDL_NETHOOD',
+            '%CSIDL_NETWORK','%CSIDL_PERSONAL','%CSIDL_PRINTERS','%CSIDL_PRINTHOOD','%CSIDL_PROFILE','%CSIDL_PROGRAMS','%CSIDL_PROGRAM_FILES','%CSIDL_PROGRAM_FILES_COMMON',
+            '%CSIDL_RECENT','%CSIDL_SENDTO','%CSIDL_STARTMENU','%CSIDL_STARTUP','%CSIDL_SYSTEM','%CSIDL_TEMPLATES','%CSIDL_WINDOWS','%CW_USEDEFAULT',
+            '%CYAN','%DATE_TIME_FILE_CREATION','%DATE_TIME_LAST_FILE_ACCESS','%DATE_TIME_LAST_FILE_WRITE','%DICTIONARY_MEMINFO_DATA','%DICTIONARY_MEMINFO_KEYS','%DICTIONARY_MEMINFO_TOTAL','%DICTIONARY_SORTDESCENDING',
+            '%DICTIONARY_SORTKEYS','%DSCAPS_CERTIFIED','%DSCAPS_CONTINUOUSRATE','%DSCAPS_EMULDRIVER','%DSCAPS_SECONDARY16BIT','%DSCAPS_SECONDARY8BIT','%DSCAPS_SECONDARYMONO','%DSCAPS_SECONDARYSTEREO',
+            '%DSCCAPS_CERTIFIED','%DSCCAPS_EMULDRIVER','%DS_3DLOOK','%DS_ABSALIGN','%DS_CENTER','%DS_CENTERMOUSE','%DS_CONTEXTHELP','%DS_CONTROL',
+            '%DS_MODALFRAME','%DS_NOFAILCREATE','%DS_SETFONT','%DS_SETFOREGROUND','%DS_SYSMODAL','%DTM_FIRST','%DTM_GETMCCOLOR','%DTM_GETMCFONT',
+            '%DTM_GETMONTHCAL','%DTM_GETRANGE','%DTM_GETSYSTEMTIME','%DTM_SETFORMAT','%DTM_SETFORMATW','%DTM_SETMCCOLOR','%DTM_SETMCFONT','%DTM_SETRANGE',
+            '%DTM_SETSYSTEMTIME','%DTN_CLOSEUP','%DTN_DATETIMECHANGE','%DTN_DROPDOWN','%DTN_FORMAT','%DTN_FORMATQUERY','%DTN_FORMATQUERYW','%DTN_FORMATW',
+            '%DTN_USERSTRING','%DTN_USERSTRINGW','%DTN_WMKEYDOWN','%DTN_WMKEYDOWNW','%DTS_APPCANPARSE','%DTS_LONGDATEFORMAT','%DTS_RIGHTALIGN','%DTS_SHORTDATECENTURYFORMAT',
+            '%DTS_SHORTDATEFORMAT','%DTS_SHOWNONE','%DTS_TIMEFORMAT','%DTS_UPDOWN','%DT_DATE_CENTURY','%DT_DATE_OK','%DT_DAY_IN_YEAR','%DT_DIFF_IN_DAYS',
+            '%DT_DIFF_IN_HOURS','%DT_DIFF_IN_MINUTES','%DT_DIFF_IN_SECONDS','%DT_HOURS_IN_DAY','%DT_MINUTES_IN_HOUR','%DT_SECONDS_IN_DAY','%DT_SECONDS_IN_HOUR','%DT_SECONDS_IN_MINUTE',
+            '%DT_SECONDS_IN_YEAR','%DT_USE_LONG_FORM','%DT_USE_SHORT_FORM','%DT_WRONG_DATE','%DT_WRONG_DAY','%DT_WRONG_MONTH','%ECM_FIRST','%ECOOP_AND',
+            '%ECOOP_OR','%ECOOP_SET','%ECOOP_XOR','%ECO_AUTOHSCROLL','%ECO_AUTOVSCROLL','%ECO_AUTOWORDSELECTION','%ECO_NOHIDESEL','%ECO_READONLY',
+            '%ECO_SELECTIONBAR','%ECO_WANTRETURN','%EM_AUTOURLDETECT','%EM_CANPASTE','%EM_CANREDO','%EM_CANUNDO','%EM_CHARFROMPOS','%EM_DISPLAYBAND',
+            '%EM_EMPTYUNDOBUFFER','%EM_EXGETSEL','%EM_EXLIMITTEXT','%EM_EXLINEFROMCHAR','%EM_EXSETSEL','%EM_FINDTEXT','%EM_FINDTEXTEX','%EM_FINDWORDBREAK',
+            '%EM_FMTLINES','%EM_FORMATRANGE','%EM_GETAUTOURLDETECT','%EM_GETCHARFORMAT','%EM_GETEDITSTYLE','%EM_GETEVENTMASK','%EM_GETFIRSTVISIBLELINE','%EM_GETHANDLE',
+            '%EM_GETIMESTATUS','%EM_GETLIMITTEXT','%EM_GETLINE','%EM_GETLINECOUNT','%EM_GETMARGINS','%EM_GETMODIFY','%EM_GETOLEINTERFACE','%EM_GETOPTIONS',
+            '%EM_GETPARAFORMAT','%EM_GETPASSWORDCHAR','%EM_GETRECT','%EM_GETREDONAME','%EM_GETSCROLLPOS','%EM_GETSEL','%EM_GETSELTEXT','%EM_GETTEXTMODE',
+            '%EM_GETTEXTRANGE','%EM_GETTHUMB','%EM_GETUNDONAME','%EM_GETWORDBREAKPROC','%EM_GETWORDBREAKPROCEX','%EM_HIDESELECTION','%EM_LIMITTEXT','%EM_LINEFROMCHAR',
+            '%EM_LINEINDEX','%EM_LINELENGTH','%EM_LINESCROLL','%EM_PASTESPECIAL','%EM_POSFROMCHAR','%EM_REDO','%EM_REPLACESEL','%EM_REQUESTRESIZE',
+            '%EM_SCROLL','%EM_SCROLLCARET','%EM_SELECTIONTYPE','%EM_SETBKGNDCOLOR','%EM_SETCHARFORMAT','%EM_SETEDITSTYLE','%EM_SETEVENTMASK','%EM_SETHANDLE',
+            '%EM_SETIMESTATUS','%EM_SETLIMITTEXT','%EM_SETMARGINS','%EM_SETMODIFY','%EM_SETOLECALLBACK','%EM_SETOPTIONS','%EM_SETPARAFORMAT','%EM_SETPASSWORDCHAR',
+            '%EM_SETREADONLY','%EM_SETRECT','%EM_SETRECTNP','%EM_SETSCROLLPOS','%EM_SETSEL','%EM_SETTABSTOPS','%EM_SETTARGETDEVICE','%EM_SETTEXTMODE',
+            '%EM_SETUNDOLIMIT','%EM_SETWORDBREAKPROC','%EM_SETWORDBREAKPROCEX','%EM_SETWORDWRAPMODE','%EM_SETZOOM','%EM_STOPGROUPTYPING','%EM_STREAMIN','%EM_STREAMOUT',
+            '%EM_UNDO','%ENM_CHANGE','%ENM_CORRECTTEXT','%ENM_DRAGDROPDONE','%ENM_DROPFILES','%ENM_KEYEVENTS','%ENM_MOUSEEVENTS','%ENM_NONE',
+            '%ENM_PARAGRAPHEXPANDED','%ENM_PROTECTED','%ENM_REQUESTRESIZE','%ENM_SCROLL','%ENM_SCROLLEVENTS','%ENM_SELCHANGE','%ENM_UPDATE','%EN_CHANGE',
+            '%EN_MSGFILTER','%EN_SELCHANGE','%EN_UPDATE','%ES_AUTOHSCROLL','%ES_AUTOVSCROLL','%ES_CENTER','%ES_DISABLENOSCROLL','%ES_EX_NOCALLOLEINIT',
+            '%ES_LEFT','%ES_LOWERCASE','%ES_MULTILINE','%ES_NOHIDESEL','%ES_NOOLEDRAGDROP','%ES_NUMBER','%ES_OEMCONVERT','%ES_PASSWORD',
+            '%ES_READONLY','%ES_RIGHT','%ES_SAVESEL','%ES_SELECTIONBAR','%ES_SUNKEN','%ES_UPPERCASE','%ES_WANTRETURN','%EVAL_EXEC_STRING',
+            '%FALSE','%FILE_ADDPATH','%FILE_ARCHIVE','%FILE_BUILDVERSION','%FILE_HIDDEN','%FILE_MAJORVERSION','%FILE_MINORVERSION','%FILE_NORMAL',
+            '%FILE_READONLY','%FILE_REVISIONVERSION','%FILE_SUBDIR','%FILE_SYSTEM','%FILE_VLABEL','%FTP_GET_CONNECT_STATUS','%FTP_GET_FILE_BYTES_RCVD','%FTP_GET_FILE_BYTES_SENT',
+            '%FTP_GET_LAST_RESPONSE','%FTP_GET_LOCAL_IP','%FTP_GET_SERVER_IP','%FTP_GET_TOTAL_BYTES_RCVD','%FTP_GET_TOTAL_BYTES_SENT','%FTP_LIST_FULLLIST','%FTP_LIST_FULLLISTDIR','%FTP_LIST_FULLLISTFILE',
+            '%FTP_SET_ASYNC','%FTP_SET_CONNECT_WAIT','%FTP_SET_MAX_LISTEN_WAIT','%FTP_SET_MAX_RESPONSE_WAIT','%FTP_SET_PASSIVE','%FTP_SET_SYNC','%FW_BLACK','%FW_BOLD',
+            '%FW_DEMIBOLD','%FW_DONTCARE','%FW_EXTRABOLD','%FW_EXTRALIGHT','%FW_HEAVY','%FW_LIGHT','%FW_MEDIUM','%FW_NORMAL',
+            '%FW_REGULAR','%FW_SEMIBOLD','%FW_THIN','%FW_ULTRABOLD','%FW_ULTRALIGHT','%GDTR_MAX','%GDTR_MIN','%GLU_AUTO_LOAD_MATRIX',
+            '%GLU_BEGIN','%GLU_CCW','%GLU_CULLING','%GLU_CW','%GLU_DISPLAY_MODE','%GLU_DOMAIN_DISTANCE','%GLU_EDGE_FLAG','%GLU_END',
+            '%GLU_ERROR','%GLU_EXTENSIONS','%GLU_EXTERIOR','%GLU_FALSE','%GLU_FILL','%GLU_FLAT','%GLU_INCOMPATIBLE_GL_VERSION','%GLU_INSIDE',
+            '%GLU_INTERIOR','%GLU_INVALID_ENUM','%GLU_INVALID_VALUE','%GLU_LINE','%GLU_MAP1_TRIM_2','%GLU_MAP1_TRIM_3','%GLU_NONE','%GLU_NURBS_ERROR1',
+            '%GLU_NURBS_ERROR10','%GLU_NURBS_ERROR11','%GLU_NURBS_ERROR12','%GLU_NURBS_ERROR13','%GLU_NURBS_ERROR14','%GLU_NURBS_ERROR15','%GLU_NURBS_ERROR16','%GLU_NURBS_ERROR17',
+            '%GLU_NURBS_ERROR18','%GLU_NURBS_ERROR19','%GLU_NURBS_ERROR2','%GLU_NURBS_ERROR20','%GLU_NURBS_ERROR21','%GLU_NURBS_ERROR22','%GLU_NURBS_ERROR23','%GLU_NURBS_ERROR24',
+            '%GLU_NURBS_ERROR25','%GLU_NURBS_ERROR26','%GLU_NURBS_ERROR27','%GLU_NURBS_ERROR28','%GLU_NURBS_ERROR29','%GLU_NURBS_ERROR3','%GLU_NURBS_ERROR30','%GLU_NURBS_ERROR31',
+            '%GLU_NURBS_ERROR32','%GLU_NURBS_ERROR33','%GLU_NURBS_ERROR34','%GLU_NURBS_ERROR35','%GLU_NURBS_ERROR36','%GLU_NURBS_ERROR37','%GLU_NURBS_ERROR4','%GLU_NURBS_ERROR5',
+            '%GLU_NURBS_ERROR6','%GLU_NURBS_ERROR7','%GLU_NURBS_ERROR8','%GLU_NURBS_ERROR9','%GLU_OUTLINE_PATCH','%GLU_OUTLINE_POLYGON','%GLU_OUTSIDE','%GLU_OUT_OF_MEMORY',
+            '%GLU_PARAMETRIC_ERROR','%GLU_PARAMETRIC_TOLERANCE','%GLU_PATH_LENGTH','%GLU_POINT','%GLU_SAMPLING_METHOD','%GLU_SAMPLING_TOLERANCE','%GLU_SILHOUETTE','%GLU_SMOOTH',
+            '%GLU_TESS_BEGIN','%GLU_TESS_BEGIN_DATA','%GLU_TESS_BOUNDARY_ONLY','%GLU_TESS_COMBINE','%GLU_TESS_COMBINE_DATA','%GLU_TESS_COORD_TOO_LARGE','%GLU_TESS_EDGE_FLAG','%GLU_TESS_EDGE_FLAG_DATA',
+            '%GLU_TESS_END','%GLU_TESS_END_DATA','%GLU_TESS_ERROR','%GLU_TESS_ERROR1','%GLU_TESS_ERROR2','%GLU_TESS_ERROR3','%GLU_TESS_ERROR4','%GLU_TESS_ERROR5',
+            '%GLU_TESS_ERROR6','%GLU_TESS_ERROR7','%GLU_TESS_ERROR8','%GLU_TESS_ERROR_DATA','%GLU_TESS_MISSING_BEGIN_CONTOUR','%GLU_TESS_MISSING_BEGIN_POLYGON','%GLU_TESS_MISSING_END_CONTOUR','%GLU_TESS_MISSING_END_POLYGON',
+            '%GLU_TESS_NEED_COMBINE_CALLBACK','%GLU_TESS_TOLERANCE','%GLU_TESS_VERTEX','%GLU_TESS_VERTEX_DATA','%GLU_TESS_WINDING_ABS_GEQ_TWO','%GLU_TESS_WINDING_NEGATIVE','%GLU_TESS_WINDING_NONZERO','%GLU_TESS_WINDING_ODD',
+            '%GLU_TESS_WINDING_POSITIVE','%GLU_TESS_WINDING_RULE','%GLU_TRUE','%GLU_UNKNOWN','%GLU_U_STEP','%GLU_VERSION','%GLU_VERSION_1_1','%GLU_VERSION_1_2',
+            '%GLU_VERTEX','%GLU_V_STEP','%GL_2D','%GL_2_BYTES','%GL_3D','%GL_3D_COLOR','%GL_3D_COLOR_TEXTURE','%GL_3_BYTES',
+            '%GL_4D_COLOR_TEXTURE','%GL_4_BYTES','%GL_ABGR_EXT','%GL_ACCUM','%GL_ACCUM_ALPHA_BITS','%GL_ACCUM_BLUE_BITS','%GL_ACCUM_BUFFER_BIT','%GL_ACCUM_CLEAR_VALUE',
+            '%GL_ACCUM_GREEN_BITS','%GL_ACCUM_RED_BITS','%GL_ADD','%GL_ALL_ATTRIB_BITS','%GL_ALPHA','%GL_ALPHA12','%GL_ALPHA16','%GL_ALPHA4',
+            '%GL_ALPHA8','%GL_ALPHA_BIAS','%GL_ALPHA_BITS','%GL_ALPHA_SCALE','%GL_ALPHA_TEST','%GL_ALPHA_TEST_FUNC','%GL_ALPHA_TEST_REF','%GL_ALWAYS',
+            '%GL_AMBIENT','%GL_AMBIENT_AND_DIFFUSE','%GL_AND','%GL_AND_INVERTED','%GL_AND_REVERSE','%GL_ARRAY_ELEMENT_LOCK_COUNT_EXT','%GL_ARRAY_ELEMENT_LOCK_FIRST_EXT','%GL_ATTRIB_STACK_DEPTH',
+            '%GL_AUTO_NORMAL','%GL_AUX0','%GL_AUX1','%GL_AUX2','%GL_AUX3','%GL_AUX_BUFFERS','%GL_BACK','%GL_BACK_LEFT',
+            '%GL_BACK_RIGHT','%GL_BGRA_EXT','%GL_BGR_EXT','%GL_BITMAP','%GL_BITMAP_TOKEN','%GL_BLEND','%GL_BLEND_COLOR_EXT','%GL_BLEND_DST',
+            '%GL_BLEND_EQUATION_EXT','%GL_BLEND_SRC','%GL_BLUE','%GL_BLUE_BIAS','%GL_BLUE_BITS','%GL_BLUE_SCALE','%GL_BYTE','%GL_C3F_V3F',
+            '%GL_C4F_N3F_V3F','%GL_C4UB_V2F','%GL_C4UB_V3F','%GL_CCW','%GL_CLAMP','%GL_CLEAR','%GL_CLIENT_ALL_ATTRIB_BITS','%GL_CLIENT_ATTRIB_STACK_DEPTH',
+            '%GL_CLIENT_PIXEL_STORE_BIT','%GL_CLIENT_VERTEX_ARRAY_BIT','%GL_CLIP_PLANE0','%GL_CLIP_PLANE1','%GL_CLIP_PLANE2','%GL_CLIP_PLANE3','%GL_CLIP_PLANE4','%GL_CLIP_PLANE5',
+            '%GL_CLIP_VOLUME_CLIPPING_HINT_EXT','%GL_COEFF','%GL_COLOR','%GL_COLOR_ARRAY','%GL_COLOR_ARRAY_COUNT_EXT','%GL_COLOR_ARRAY_EXT','%GL_COLOR_ARRAY_POINTER','%GL_COLOR_ARRAY_POINTER_EXT',
+            '%GL_COLOR_ARRAY_SIZE','%GL_COLOR_ARRAY_SIZE_EXT','%GL_COLOR_ARRAY_STRIDE','%GL_COLOR_ARRAY_STRIDE_EXT','%GL_COLOR_ARRAY_TYPE','%GL_COLOR_ARRAY_TYPE_EXT','%GL_COLOR_BUFFER_BIT','%GL_COLOR_CLEAR_VALUE',
+            '%GL_COLOR_INDEX','%GL_COLOR_INDEX12_EXT','%GL_COLOR_INDEX16_EXT','%GL_COLOR_INDEX1_EXT','%GL_COLOR_INDEX2_EXT','%GL_COLOR_INDEX4_EXT','%GL_COLOR_INDEX8_EXT','%GL_COLOR_INDEXES',
+            '%GL_COLOR_LOGIC_OP','%GL_COLOR_MATERIAL','%GL_COLOR_MATERIAL_FACE','%GL_COLOR_MATERIAL_PARAMETER','%GL_COLOR_SUM_EXT','%GL_COLOR_TABLE_ALPHA_SIZE_EXT','%GL_COLOR_TABLE_BIAS_EXT','%GL_COLOR_TABLE_BLUE_SIZE_EXT',
+            '%GL_COLOR_TABLE_EXT','%GL_COLOR_TABLE_FORMAT_EXT','%GL_COLOR_TABLE_GREEN_SIZE_EXT','%GL_COLOR_TABLE_INTENSITY_SIZE_EXT','%GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','%GL_COLOR_TABLE_RED_SIZE_EXT','%GL_COLOR_TABLE_SCALE_EXT','%GL_COLOR_TABLE_WIDTH_EXT',
+            '%GL_COLOR_WRITEMASK','%GL_COMPILE','%GL_COMPILE_AND_EXECUTE','%GL_CONSTANT_ALPHA_EXT','%GL_CONSTANT_ATTENUATION','%GL_CONSTANT_COLOR_EXT','%GL_CONVOLUTION_1D_EXT','%GL_CONVOLUTION_2D_EXT',
+            '%GL_CONVOLUTION_BORDER_MODE_EXT','%GL_CONVOLUTION_FILTER_BIAS_EXT','%GL_CONVOLUTION_FILTER_SCALE_EXT','%GL_CONVOLUTION_FORMAT_EXT','%GL_CONVOLUTION_HEIGHT_EXT','%GL_CONVOLUTION_WIDTH_EXT','%GL_COPY','%GL_COPY_INVERTED',
+            '%GL_COPY_PIXEL_TOKEN','%GL_CULL_FACE','%GL_CULL_FACE_MODE','%GL_CULL_VERTEX_EXT','%GL_CULL_VERTEX_EYE_POSITION_EXT','%GL_CULL_VERTEX_OBJECT_POSITION_EXT','%GL_CURRENT_BIT','%GL_CURRENT_COLOR',
+            '%GL_CURRENT_INDEX','%GL_CURRENT_NORMAL','%GL_CURRENT_RASTER_COLOR','%GL_CURRENT_RASTER_DISTANCE','%GL_CURRENT_RASTER_INDEX','%GL_CURRENT_RASTER_POSITION','%GL_CURRENT_RASTER_POSITION_VALID','%GL_CURRENT_RASTER_TEXTURE_COORDS',
+            '%GL_CURRENT_SECONDARY_COLOR_EXT','%GL_CURRENT_TEXTURE_COORDS','%GL_CW','%GL_DECAL','%GL_DECR','%GL_DEPTH','%GL_DEPTH_BIAS','%GL_DEPTH_BITS',
+            '%GL_DEPTH_BUFFER_BIT','%GL_DEPTH_CLEAR_VALUE','%GL_DEPTH_COMPONENT','%GL_DEPTH_FUNC','%GL_DEPTH_RANGE','%GL_DEPTH_SCALE','%GL_DEPTH_TEST','%GL_DEPTH_WRITEMASK',
+            '%GL_DIFFUSE','%GL_DITHER','%GL_DOMAIN','%GL_DONT_CARE','%GL_DOUBLE','%GL_DOUBLEBUFFER','%GL_DOUBLE_EXT','%GL_DRAW_BUFFER',
+            '%GL_DRAW_PIXEL_TOKEN','%GL_DST_ALPHA','%GL_DST_COLOR','%GL_EDGE_FLAG','%GL_EDGE_FLAG_ARRAY','%GL_EDGE_FLAG_ARRAY_COUNT_EXT','%GL_EDGE_FLAG_ARRAY_EXT','%GL_EDGE_FLAG_ARRAY_POINTER',
+            '%GL_EDGE_FLAG_ARRAY_POINTER_EXT','%GL_EDGE_FLAG_ARRAY_STRIDE','%GL_EDGE_FLAG_ARRAY_STRIDE_EXT','%GL_EMISSION','%GL_ENABLE_BIT','%GL_EQUAL','%GL_EQUIV','%GL_EVAL_BIT',
+            '%GL_EXP','%GL_EXP2','%GL_EXTENSIONS','%GL_EXT_ABGR','%GL_EXT_BGRA','%GL_EXT_BLEND_COLOR','%GL_EXT_BLEND_MINMAX','%GL_EXT_BLEND_SUBTRACT',
+            '%GL_EXT_CLIP_VOLUME_HINT','%GL_EXT_COLOR_TABLE','%GL_EXT_COMPILED_VERTEX_ARRAY','%GL_EXT_CONVOLUTION','%GL_EXT_CULL_VERTEX','%GL_EXT_HISTOGRAM','%GL_EXT_PACKED_PIXELS','%GL_EXT_PALETTED_TEXTURE',
+            '%GL_EXT_POLYGON_OFFSET','%GL_EXT_SECONDARY_COLOR','%GL_EXT_SEPARATE_SPECULAR_COLOR','%GL_EXT_VERTEX_ARRAY','%GL_EYE_LINEAR','%GL_EYE_PLANE','%GL_FALSE','%GL_FASTEST',
+            '%GL_FEEDBACK','%GL_FEEDBACK_BUFFER_POINTER','%GL_FEEDBACK_BUFFER_SIZE','%GL_FEEDBACK_BUFFER_TYPE','%GL_FILL','%GL_FLAT','%GL_FLOAT','%GL_FOG',
+            '%GL_FOG_BIT','%GL_FOG_COLOR','%GL_FOG_DENSITY','%GL_FOG_END','%GL_FOG_HINT','%GL_FOG_INDEX','%GL_FOG_MODE','%GL_FOG_START',
+            '%GL_FRONT','%GL_FRONT_AND_BACK','%GL_FRONT_FACE','%GL_FRONT_LEFT','%GL_FRONT_RIGHT','%GL_FUNC_ADD_EXT','%GL_FUNC_REVERSE_SUBTRACT_EXT','%GL_FUNC_SUBTRACT_EXT',
+            '%GL_GEQUAL','%GL_GREATER','%GL_GREEN','%GL_GREEN_BIAS','%GL_GREEN_BITS','%GL_GREEN_SCALE','%GL_HINT_BIT','%GL_HISTOGRAM_ALPHA_SIZE_EXT',
+            '%GL_HISTOGRAM_BLUE_SIZE_EXT','%GL_HISTOGRAM_EXT','%GL_HISTOGRAM_FORMAT_EXT','%GL_HISTOGRAM_GREEN_SIZE_EXT','%GL_HISTOGRAM_LUMINANCE_SIZE_EXT','%GL_HISTOGRAM_RED_SIZE_EXT','%GL_HISTOGRAM_SINK_EXT','%GL_HISTOGRAM_WIDTH_EXT',
+            '%GL_INCR','%GL_INDEX_ARRAY','%GL_INDEX_ARRAY_COUNT_EXT','%GL_INDEX_ARRAY_EXT','%GL_INDEX_ARRAY_POINTER','%GL_INDEX_ARRAY_POINTER_EXT','%GL_INDEX_ARRAY_STRIDE','%GL_INDEX_ARRAY_STRIDE_EXT',
+            '%GL_INDEX_ARRAY_TYPE','%GL_INDEX_ARRAY_TYPE_EXT','%GL_INDEX_BITS','%GL_INDEX_CLEAR_VALUE','%GL_INDEX_LOGIC_OP','%GL_INDEX_MODE','%GL_INDEX_OFFSET','%GL_INDEX_SHIFT',
+            '%GL_INDEX_WRITEMASK','%GL_INT','%GL_INTENSITY','%GL_INTENSITY12','%GL_INTENSITY16','%GL_INTENSITY4','%GL_INTENSITY8','%GL_INVALID_ENUM',
+            '%GL_INVALID_OPERATION','%GL_INVALID_VALUE','%GL_INVERT','%GL_KEEP','%GL_LEFT','%GL_LEQUAL','%GL_LESS','%GL_LIGHT0',
+            '%GL_LIGHT1','%GL_LIGHT2','%GL_LIGHT3','%GL_LIGHT4','%GL_LIGHT5','%GL_LIGHT6','%GL_LIGHT7','%GL_LIGHTING',
+            '%GL_LIGHTING_BIT','%GL_LIGHT_MODEL_AMBIENT','%GL_LIGHT_MODEL_COLOR_CONTROL_EXT','%GL_LIGHT_MODEL_LOCAL_VIEWER','%GL_LIGHT_MODEL_TWO_SIDE','%GL_LINE','%GL_LINEAR','%GL_LINEAR_ATTENUATION',
+            '%GL_LINEAR_MIPMAP_LINEAR','%GL_LINEAR_MIPMAP_NEAREST','%GL_LINES','%GL_LINE_BIT','%GL_LINE_LOOP','%GL_LINE_RESET_TOKEN','%GL_LINE_SMOOTH','%GL_LINE_SMOOTH_HINT',
+            '%GL_LINE_STIPPLE','%GL_LINE_STIPPLE_PATTERN','%GL_LINE_STIPPLE_REPEAT','%GL_LINE_STRIP','%GL_LINE_TOKEN','%GL_LINE_WIDTH','%GL_LINE_WIDTH_GRANULARITY','%GL_LINE_WIDTH_RANGE',
+            '%GL_LIST_BASE','%GL_LIST_BIT','%GL_LIST_INDEX','%GL_LIST_MODE','%GL_LOAD','%GL_LOGIC_OP','%GL_LOGIC_OP_MODE','%GL_LUMINANCE',
+            '%GL_LUMINANCE12','%GL_LUMINANCE12_ALPHA12','%GL_LUMINANCE12_ALPHA4','%GL_LUMINANCE16','%GL_LUMINANCE16_ALPHA16','%GL_LUMINANCE4','%GL_LUMINANCE4_ALPHA4','%GL_LUMINANCE6_ALPHA2',
+            '%GL_LUMINANCE8','%GL_LUMINANCE8_ALPHA8','%GL_LUMINANCE_ALPHA','%GL_MAP1_COLOR_4','%GL_MAP1_GRID_DOMAIN','%GL_MAP1_GRID_SEGMENTS','%GL_MAP1_INDEX','%GL_MAP1_NORMAL',
+            '%GL_MAP1_TEXTURE_COORD_1','%GL_MAP1_TEXTURE_COORD_2','%GL_MAP1_TEXTURE_COORD_3','%GL_MAP1_TEXTURE_COORD_4','%GL_MAP1_VERTEX_3','%GL_MAP1_VERTEX_4','%GL_MAP2_COLOR_4','%GL_MAP2_GRID_DOMAIN',
+            '%GL_MAP2_GRID_SEGMENTS','%GL_MAP2_INDEX','%GL_MAP2_NORMAL','%GL_MAP2_TEXTURE_COORD_1','%GL_MAP2_TEXTURE_COORD_2','%GL_MAP2_TEXTURE_COORD_3','%GL_MAP2_TEXTURE_COORD_4','%GL_MAP2_VERTEX_3',
+            '%GL_MAP2_VERTEX_4','%GL_MAP_COLOR','%GL_MAP_STENCIL','%GL_MATRIX_MODE','%GL_MAX_ATTRIB_STACK_DEPTH','%GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','%GL_MAX_CLIP_PLANES','%GL_MAX_CONVOLUTION_HEIGHT_EXT',
+            '%GL_MAX_CONVOLUTION_WIDTH_EXT','%GL_MAX_EVAL_ORDER','%GL_MAX_EXT','%GL_MAX_LIGHTS','%GL_MAX_LIST_NESTING','%GL_MAX_MODELVIEW_STACK_DEPTH','%GL_MAX_NAME_STACK_DEPTH','%GL_MAX_PIXEL_MAP_TABLE',
+            '%GL_MAX_PROJECTION_STACK_DEPTH','%GL_MAX_TEXTURE_SIZE','%GL_MAX_TEXTURE_STACK_DEPTH','%GL_MAX_VIEWPORT_DIMS','%GL_MINMAX_EXT','%GL_MINMAX_FORMAT_EXT','%GL_MINMAX_SINK_EXT','%GL_MIN_EXT',
+            '%GL_MODELVIEW','%GL_MODELVIEW_MATRIX','%GL_MODELVIEW_STACK_DEPTH','%GL_MODULATE','%GL_MULT','%GL_N3F_V3F','%GL_NAME_STACK_DEPTH','%GL_NAND',
+            '%GL_NEAREST','%GL_NEAREST_MIPMAP_LINEAR','%GL_NEAREST_MIPMAP_NEAREST','%GL_NEVER','%GL_NICEST','%GL_NONE','%GL_NOOP','%GL_NOR',
+            '%GL_NORMALIZE','%GL_NORMAL_ARRAY','%GL_NORMAL_ARRAY_COUNT_EXT','%GL_NORMAL_ARRAY_EXT','%GL_NORMAL_ARRAY_POINTER','%GL_NORMAL_ARRAY_POINTER_EXT','%GL_NORMAL_ARRAY_STRIDE','%GL_NORMAL_ARRAY_STRIDE_EXT',
+            '%GL_NORMAL_ARRAY_TYPE','%GL_NORMAL_ARRAY_TYPE_EXT','%GL_NOTEQUAL','%GL_NO_ERROR','%GL_OBJECT_LINEAR','%GL_OBJECT_PLANE','%GL_ONE','%GL_ONE_MINUS_CONSTANT_ALPHA_EXT',
+            '%GL_ONE_MINUS_CONSTANT_COLOR_EXT','%GL_ONE_MINUS_DST_ALPHA','%GL_ONE_MINUS_DST_COLOR','%GL_ONE_MINUS_SRC_ALPHA','%GL_ONE_MINUS_SRC_COLOR','%GL_OR','%GL_ORDER','%GL_OR_INVERTED',
+            '%GL_OR_REVERSE','%GL_OUT_OF_MEMORY','%GL_PACK_ALIGNMENT','%GL_PACK_LSB_FIRST','%GL_PACK_ROW_LENGTH','%GL_PACK_SKIP_PIXELS','%GL_PACK_SKIP_ROWS','%GL_PACK_SWAP_BYTES',
+            '%GL_PASS_THROUGH_TOKEN','%GL_PERSPECTIVE_CORRECTION_HINT','%GL_PIXEL_MAP_A_TO_A','%GL_PIXEL_MAP_A_TO_A_SIZE','%GL_PIXEL_MAP_B_TO_B','%GL_PIXEL_MAP_B_TO_B_SIZE','%GL_PIXEL_MAP_G_TO_G','%GL_PIXEL_MAP_G_TO_G_SIZE',
+            '%GL_PIXEL_MAP_I_TO_A','%GL_PIXEL_MAP_I_TO_A_SIZE','%GL_PIXEL_MAP_I_TO_B','%GL_PIXEL_MAP_I_TO_B_SIZE','%GL_PIXEL_MAP_I_TO_G','%GL_PIXEL_MAP_I_TO_G_SIZE','%GL_PIXEL_MAP_I_TO_I','%GL_PIXEL_MAP_I_TO_I_SIZE',
+            '%GL_PIXEL_MAP_I_TO_R','%GL_PIXEL_MAP_I_TO_R_SIZE','%GL_PIXEL_MAP_R_TO_R','%GL_PIXEL_MAP_R_TO_R_SIZE','%GL_PIXEL_MAP_S_TO_S','%GL_PIXEL_MAP_S_TO_S_SIZE','%GL_PIXEL_MODE_BIT','%GL_POINT',
+            '%GL_POINTS','%GL_POINT_BIT','%GL_POINT_SIZE','%GL_POINT_SIZE_GRANULARITY','%GL_POINT_SIZE_RANGE','%GL_POINT_SMOOTH','%GL_POINT_SMOOTH_HINT','%GL_POINT_TOKEN',
+            '%GL_POLYGON','%GL_POLYGON_BIT','%GL_POLYGON_MODE','%GL_POLYGON_OFFSET_BIAS_EXT','%GL_POLYGON_OFFSET_EXT','%GL_POLYGON_OFFSET_FACTOR','%GL_POLYGON_OFFSET_FACTOR_EXT','%GL_POLYGON_OFFSET_FILL',
+            '%GL_POLYGON_OFFSET_LINE','%GL_POLYGON_OFFSET_POINT','%GL_POLYGON_OFFSET_UNITS','%GL_POLYGON_SMOOTH','%GL_POLYGON_SMOOTH_HINT','%GL_POLYGON_STIPPLE','%GL_POLYGON_STIPPLE_BIT','%GL_POLYGON_TOKEN',
+            '%GL_POSITION','%GL_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_ALPHA_BIAS_EXT','%GL_POST_CONVOLUTION_ALPHA_SCALE_EXT','%GL_POST_CONVOLUTION_BLUE_BIAS_EXT','%GL_POST_CONVOLUTION_BLUE_SCALE_EXT','%GL_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_GREEN_BIAS_EXT',
+            '%GL_POST_CONVOLUTION_GREEN_SCALE_EXT','%GL_POST_CONVOLUTION_RED_BIAS_EXT','%GL_POST_CONVOLUTION_RED_SCALE_EXT','%GL_PROJECTION','%GL_PROJECTION_MATRIX','%GL_PROJECTION_STACK_DEPTH','%GL_PROXY_COLOR_TABLE_EXT','%GL_PROXY_HISTOGRAM_EXT',
+            '%GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_PROXY_TEXTURE_1D','%GL_PROXY_TEXTURE_2D','%GL_Q','%GL_QUADRATIC_ATTENUATION','%GL_QUADS','%GL_QUAD_STRIP',
+            '%GL_R','%GL_R3_G3_B2','%GL_READ_BUFFER','%GL_RED','%GL_REDUCE_EXT','%GL_RED_BIAS','%GL_RED_BITS','%GL_RED_SCALE',
+            '%GL_RENDER','%GL_RENDERER','%GL_RENDER_MODE','%GL_REPEAT','%GL_REPLACE','%GL_RETURN','%GL_RGB','%GL_RGB10',
+            '%GL_RGB10_A2','%GL_RGB12','%GL_RGB16','%GL_RGB4','%GL_RGB5','%GL_RGB5_A1','%GL_RGB8','%GL_RGBA',
+            '%GL_RGBA12','%GL_RGBA16','%GL_RGBA2','%GL_RGBA4','%GL_RGBA8','%GL_RGBA_MODE','%GL_RIGHT','%GL_S',
+            '%GL_SCISSOR_BIT','%GL_SCISSOR_BOX','%GL_SCISSOR_TEST','%GL_SECONDARY_COLOR_ARRAY_EXT','%GL_SECONDARY_COLOR_ARRAY_POINTER_EXT','%GL_SECONDARY_COLOR_ARRAY_SIZE_EXT','%GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT','%GL_SECONDARY_COLOR_ARRAY_TYPE_EXT',
+            '%GL_SELECT','%GL_SELECTION_BUFFER_POINTER','%GL_SELECTION_BUFFER_SIZE','%GL_SEPARABLE_2D_EXT','%GL_SEPARATE_SPECULAR_COLOR_EXT','%GL_SET','%GL_SHADE_MODEL','%GL_SHININESS',
+            '%GL_SHORT','%GL_SINGLE_COLOR_EXT','%GL_SMOOTH','%GL_SPECULAR','%GL_SPHERE_MAP','%GL_SPOT_CUTOFF','%GL_SPOT_DIRECTION','%GL_SPOT_EXPONENT',
+            '%GL_SRC_ALPHA','%GL_SRC_ALPHA_SATURATE','%GL_SRC_COLOR','%GL_STACK_OVERFLOW','%GL_STACK_UNDERFLOW','%GL_STENCIL','%GL_STENCIL_BITS','%GL_STENCIL_BUFFER_BIT',
+            '%GL_STENCIL_CLEAR_VALUE','%GL_STENCIL_FAIL','%GL_STENCIL_FUNC','%GL_STENCIL_INDEX','%GL_STENCIL_PASS_DEPTH_FAIL','%GL_STENCIL_PASS_DEPTH_PASS','%GL_STENCIL_REF','%GL_STENCIL_TEST',
+            '%GL_STENCIL_VALUE_MASK','%GL_STENCIL_WRITEMASK','%GL_STEREO','%GL_SUBPIXEL_BITS','%GL_T','%GL_T2F_C3F_V3F','%GL_T2F_C4F_N3F_V3F','%GL_T2F_C4UB_V3F',
+            '%GL_T2F_N3F_V3F','%GL_T2F_V3F','%GL_T4F_C4F_N3F_V4F','%GL_T4F_V4F','%GL_TABLE_TOO_LARGE_EXT','%GL_TEXTURE','%GL_TEXTURE_1D','%GL_TEXTURE_2D',
+            '%GL_TEXTURE_ALPHA_SIZE','%GL_TEXTURE_BINDING_1D','%GL_TEXTURE_BINDING_2D','%GL_TEXTURE_BIT','%GL_TEXTURE_BLUE_SIZE','%GL_TEXTURE_BORDER','%GL_TEXTURE_BORDER_COLOR','%GL_TEXTURE_COMPONENTS',
+            '%GL_TEXTURE_COORD_ARRAY','%GL_TEXTURE_COORD_ARRAY_COUNT_EXT','%GL_TEXTURE_COORD_ARRAY_EXT','%GL_TEXTURE_COORD_ARRAY_POINTER','%GL_TEXTURE_COORD_ARRAY_POINTER_EXT','%GL_TEXTURE_COORD_ARRAY_SIZE','%GL_TEXTURE_COORD_ARRAY_SIZE_EXT','%GL_TEXTURE_COORD_ARRAY_STRIDE',
+            '%GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','%GL_TEXTURE_COORD_ARRAY_TYPE','%GL_TEXTURE_COORD_ARRAY_TYPE_EXT','%GL_TEXTURE_ENV','%GL_TEXTURE_ENV_COLOR','%GL_TEXTURE_ENV_MODE','%GL_TEXTURE_GEN_MODE','%GL_TEXTURE_GEN_Q',
+            '%GL_TEXTURE_GEN_R','%GL_TEXTURE_GEN_S','%GL_TEXTURE_GEN_T','%GL_TEXTURE_GREEN_SIZE','%GL_TEXTURE_HEIGHT','%GL_TEXTURE_INTENSITY_SIZE','%GL_TEXTURE_INTERNAL_FORMAT','%GL_TEXTURE_LUMINANCE_SIZE',
+            '%GL_TEXTURE_MAG_FILTER','%GL_TEXTURE_MATRIX','%GL_TEXTURE_MIN_FILTER','%GL_TEXTURE_PRIORITY','%GL_TEXTURE_RED_SIZE','%GL_TEXTURE_RESIDENT','%GL_TEXTURE_STACK_DEPTH','%GL_TEXTURE_WIDTH',
+            '%GL_TEXTURE_WRAP_S','%GL_TEXTURE_WRAP_T','%GL_TRANSFORM_BIT','%GL_TRIANGLES','%GL_TRIANGLE_FAN','%GL_TRIANGLE_STRIP','%GL_TRUE','%GL_UNPACK_ALIGNMENT',
+            '%GL_UNPACK_LSB_FIRST','%GL_UNPACK_ROW_LENGTH','%GL_UNPACK_SKIP_PIXELS','%GL_UNPACK_SKIP_ROWS','%GL_UNPACK_SWAP_BYTES','%GL_UNSIGNED_BYTE','%GL_UNSIGNED_BYTE_3_3_2_EXT','%GL_UNSIGNED_INT',
+            '%GL_UNSIGNED_INT_10_10_10_2_EXT','%GL_UNSIGNED_INT_8_8_8_8_EXT','%GL_UNSIGNED_SHORT','%GL_UNSIGNED_SHORT_4_4_4_4_EXT','%GL_UNSIGNED_SHORT_5_5_5_1_EXT','%GL_V2F','%GL_V3F','%GL_VENDOR',
+            '%GL_VERSION','%GL_VERSION_1_1','%GL_VERTEX_ARRAY','%GL_VERTEX_ARRAY_COUNT_EXT','%GL_VERTEX_ARRAY_EXT','%GL_VERTEX_ARRAY_POINTER','%GL_VERTEX_ARRAY_POINTER_EXT','%GL_VERTEX_ARRAY_SIZE',
+            '%GL_VERTEX_ARRAY_SIZE_EXT','%GL_VERTEX_ARRAY_STRIDE','%GL_VERTEX_ARRAY_STRIDE_EXT','%GL_VERTEX_ARRAY_TYPE','%GL_VERTEX_ARRAY_TYPE_EXT','%GL_VIEWPORT','%GL_VIEWPORT_BIT','%GL_WIN_SWAP_HINT',
+            '%GL_XOR','%GL_ZERO','%GL_ZOOM_X','%GL_ZOOM_Y','%GRAY','%GREEN','%GWLP_HINSTANCE','%GWLP_HWNDPARENT',
+            '%GWLP_ID','%GWLP_USERDATA','%GWLP_WNDPROC','%GWL_EXSTYLE','%GWL_HINSTANCE','%GWL_HWNDPARENT','%GWL_ID','%GWL_STYLE',
+            '%GWL_USERDATA','%GWL_WNDPROC','%HDM_FIRST','%HTCAPTION','%HWND_BOTTOM','%HWND_DESKTOP','%HWND_MESSAGE','%HWND_NOTOPMOST',
+            '%HWND_TOP','%HWND_TOPMOST','%ICRYPTO_XOR_DECREASE','%ICRYPTO_XOR_INCREASE','%ICRYPTO_XOR_NORMAL','%IDABORT','%IDCANCEL','%IDCONTINUE',
+            '%IDIGNORE','%IDNO','%IDOK','%IDRETRY','%IDTIMEOUT','%IDTRYAGAIN','%IDYES','%INTERNET_CONNECTION_CONFIGURED',
+            '%INTERNET_CONNECTION_LAN','%INTERNET_CONNECTION_MODEM','%INTERNET_CONNECTION_MODEM_BUSY','%INTERNET_CONNECTION_OFFLINE','%INTERNET_CONNECTION_PROXY','%INTERNET_RAS_INSTALLED','%LBN_DBLCLK','%LBN_KILLFOCUS',
+            '%LBN_SELCANCEL','%LBN_SELCHANGE','%LBN_SETFOCUS','%LBS_DISABLENOSCROLL','%LBS_EXTENDEDSEL','%LBS_MULTICOLUMN','%LBS_MULTIPLESEL','%LBS_NOINTEGRALHEIGHT',
+            '%LBS_NOSEL','%LBS_NOTIFY','%LBS_SORT','%LBS_STANDARD','%LBS_USETABSTOPS','%LB_ADDFILE','%LB_ADDSTRING','%LB_DELETESTRING',
+            '%LB_DIR','%LB_FINDSTRING','%LB_FINDSTRINGEXACT','%LB_GETANCHORINDEX','%LB_GETCARETINDEX','%LB_GETCOUNT','%LB_GETCURSEL','%LB_GETHORIZONTALEXTENT',
+            '%LB_GETITEMDATA','%LB_GETITEMHEIGHT','%LB_GETITEMRECT','%LB_GETLISTBOXINFO','%LB_GETLOCALE','%LB_GETSEL','%LB_GETSELCOUNT','%LB_GETSELITEMS',
+            '%LB_GETTEXT','%LB_GETTEXTLEN','%LB_GETTOPINDEX','%LB_INITSTORAGE','%LB_INSERTSTRING','%LB_ITEMFROMPOINT','%LB_MULTIPLEADDSTRING','%LB_RESETCONTENT',
+            '%LB_SELECTSTRING','%LB_SELITEMRANGE','%LB_SELITEMRANGEEX','%LB_SETANCHORINDEX','%LB_SETCARETINDEX','%LB_SETCOLUMNWIDTH','%LB_SETCOUNT','%LB_SETCURSEL',
+            '%LB_SETHORIZONTALEXTENT','%LB_SETITEMDATA','%LB_SETITEMHEIGHT','%LB_SETLOCALE','%LB_SETSEL','%LB_SETTABSTOPS','%LB_SETTOPINDEX','%LF_FACESIZE',
+            '%LTGRAY','%LVM_FIRST','%LWA_ALPHA','%LWA_COLORKEY','%MAGENTA','%MAXBYTE','%MAXCHAR','%MAXDWORD',
+            '%MAXSHORT','%MAXWORD','%MAX_PATH','%MB_ABORTRETRYIGNORE','%MB_APPLMODAL','%MB_CANCELTRYCONTINUE','%MB_DEFBUTTON1','%MB_DEFBUTTON2',
+            '%MB_DEFBUTTON3','%MB_HELP','%MB_ICONASTERISK','%MB_ICONERROR','%MB_ICONEXCLAMATION','%MB_ICONHAND','%MB_ICONINFORMATION','%MB_ICONQUESTION',
+            '%MB_ICONSTOP','%MB_ICONWARNING','%MB_OK','%MB_OKCANCEL','%MB_RETRYCANCEL','%MB_SIMPLE','%MB_SYSTEMMODAL','%MB_TOPMOST',
+            '%MB_YESNO','%MB_YESNOCANCEL','%MF_CHECKED','%MF_DISABLED','%MF_ENABLED','%MF_GRAYED','%MF_SEPARATOR','%MF_UNCHECKED',
+            '%MINCHAR','%MINLONG','%MINSHORT','%NULL','%ODBC352_INC','%ODBCVER','%ODBC_ADD_DSN','%ODBC_ADD_SYS_DSN',
+            '%ODBC_BOTH_DSN','%ODBC_CONFIG_DRIVER','%ODBC_CONFIG_DRIVER_MAX','%ODBC_CONFIG_DSN','%ODBC_CONFIG_SYS_DSN','%ODBC_DRIVER_VERSION','%ODBC_ERROR_COMPONENT_NOT_FOUND','%ODBC_ERROR_CREATE_DSN_FAILED',
+            '%ODBC_ERROR_GENERAL_ERR','%ODBC_ERROR_INVALID_BUFF_LEN','%ODBC_ERROR_INVALID_DSN','%ODBC_ERROR_INVALID_HWND','%ODBC_ERROR_INVALID_INF','%ODBC_ERROR_INVALID_KEYWORD_VALUE','%ODBC_ERROR_INVALID_LOG_FILE','%ODBC_ERROR_INVALID_NAME',
+            '%ODBC_ERROR_INVALID_PARAM_SEQUENCE','%ODBC_ERROR_INVALID_PATH','%ODBC_ERROR_INVALID_REQUEST_TYPE','%ODBC_ERROR_INVALID_STR','%ODBC_ERROR_LOAD_LIB_FAILED','%ODBC_ERROR_OUTPUT_STRING_TRUNCATED','%ODBC_ERROR_OUT_OF_MEM','%ODBC_ERROR_REMOVE_DSN_FAILED',
+            '%ODBC_ERROR_REQUEST_FAILED','%ODBC_ERROR_USAGE_UPDATE_FAILED','%ODBC_ERROR_USER_CANCELED','%ODBC_ERROR_WRITING_SYSINFO_FAILED','%ODBC_INSTALL_COMPLETE','%ODBC_INSTALL_DRIVER','%ODBC_INSTALL_INQUIRY','%ODBC_REMOVE_DEFAULT_DSN',
+            '%ODBC_REMOVE_DRIVER','%ODBC_REMOVE_DSN','%ODBC_REMOVE_SYS_DSN','%ODBC_SYSTEM_DSN','%ODBC_USER_DSN','%OFN_ALLOWMULTISELECT','%OFN_CREATEPROMPT','%OFN_ENABLEHOOK',
+            '%OFN_ENABLEINCLUDENOTIFY','%OFN_ENABLESIZING','%OFN_ENABLETEMPLATE','%OFN_ENABLETEMPLATEHANDLE','%OFN_EXPLORER','%OFN_EXTENSIONDIFFERENT','%OFN_FILEMUSTEXIST','%OFN_HIDEREADONLY',
+            '%OFN_LONGNAMES','%OFN_NOCHANGEDIR','%OFN_NODEREFERENCELINKS','%OFN_NOLONGNAMES','%OFN_NONETWORKBUTTON','%OFN_NOREADONLYRETURN','%OFN_NOTESTFILECREATE','%OFN_NOVALIDATE',
+            '%OFN_OVERWRITEPROMPT','%OFN_PATHMUSTEXIST','%OFN_READONLY','%OFN_SHAREAWARE','%OFN_SHOWHELP','%OS_ERROR_CALLFUNCTION','%OS_ERROR_EMPTYSTRING','%OS_ERROR_LOADLIBRARY',
+            '%OS_ERROR_SUCCESS','%OS_ERROR_WRONGPARAMETER','%OS_SHELL_ASYNC','%OS_SHELL_SYNC','%OS_WINDOWS_2K','%OS_WINDOWS_95','%OS_WINDOWS_95_OSR2','%OS_WINDOWS_98',
+            '%OS_WINDOWS_98_SE','%OS_WINDOWS_ME','%OS_WINDOWS_NT','%OS_WINDOWS_SERVER_2003','%OS_WINDOWS_SERVER_LONGHORN','%OS_WINDOWS_SERVER_LONGHORN_DC','%OS_WINDOWS_VISTA','%OS_WINDOWS_XP',
+            '%OS_WNDSTYLE_HIDE','%OS_WNDSTYLE_MAXIMIZED','%OS_WNDSTYLE_MINIMIZED','%OS_WNDSTYLE_MINIMIZEDNOFOCUS','%OS_WNDSTYLE_NORMAL','%OS_WNDSTYLE_NORMALNOFOCUS','%PATH_EXT','%PATH_FILE',
+            '%PATH_FILEEXT','%PATH_ROOT','%PATH_ROOTPATH','%PATH_ROOTPATHPROG','%PATH_ROOTPATHPROGEXT','%PBM_DELTAPOS','%PBM_GETPOS','%PBM_GETRANGE',
+            '%PBM_SETBARCOLOR','%PBM_SETBKCOLOR','%PBM_SETPOS','%PBM_SETRANGE','%PBM_SETRANGE32','%PBM_SETSTEP','%PBM_STEPIT','%PBS_SMOOTH',
+            '%PBS_VERTICAL','%PC_DISABLEWAKEEVENT_OFF','%PC_DISABLEWAKEEVENT_ON','%PC_EB_NOCONFIRMATION','%PC_EB_NOPROGRESSUI','%PC_EB_NORMAL','%PC_EB_NOSOUND','%PC_FORCECRITICAL_OFF',
+            '%PC_FORCECRITICAL_ON','%PC_HIBERNATE_OFF','%PC_HIBERNATE_ON','%PC_RD_FORCE','%PC_RD_FORCEIFHUNG','%PC_RD_LOGOFF','%PC_RD_POWEROFF','%PC_RD_REBOOT',
+            '%PC_RD_SHUTDOWN','%PC_SD_DONOT_FORCE','%PC_SD_DONOT_REBOOT','%PC_SD_FORCE','%PC_SD_REBOOT','%PFA_CENTER','%PFA_LEFT','%PFA_RIGHT',
+            '%PF_3DNOW_INSTRUCTIONS_AVAILABLE','%PF_CHANNELS_ENABLED','%PF_COMPARE64_EXCHANGE128','%PF_COMPARE_EXCHANGE128','%PF_COMPARE_EXCHANGE_DOUBLE','%PF_FLOATING_POINT_EMULATED','%PF_FLOATING_POINT_PRECISION_ERRATA','%PF_MMX_INSTRUCTIONS_AVAILABLE',
+            '%PF_NX_ENABLED','%PF_PAE_ENABLED','%PF_RDTSC_INSTRUCTION_AVAILABLE','%PF_SSE3_INSTRUCTIONS_AVAILABLE','%PF_XMMI64_INSTRUCTIONS_AVAILABLE','%PF_XMMI_INSTRUCTIONS_AVAILABLE','%PGM_FIRST','%RED',
+            '%RTF_UBB','%SAPI_SVSFDEFAULT','%SAPI_SVSFISFILENAME','%SAPI_SVSFISNOTXML','%SAPI_SVSFISXML','%SAPI_SVSFLAGSASYNC','%SAPI_SVSFNLPMASK','%SAPI_SVSFNLPSPEAKPUNC',
+            '%SAPI_SVSFPERSISTXML','%SAPI_SVSFPURGEBEFORESPEAK','%SAPI_SVSFUNUSEDFLAGS','%SAPI_SVSFVOICEMASK','%SBS_SIZEGRIP','%SB_BOTTOM','%SB_ENDSCROLL','%SB_LEFT',
+            '%SB_LINEDOWN','%SB_LINELEFT','%SB_LINERIGHT','%SB_LINEUP','%SB_PAGEDOWN','%SB_PAGELEFT','%SB_PAGERIGHT','%SB_PAGEUP',
+            '%SB_RIGHT','%SB_SETPARTS','%SB_SETTEXT','%SB_THUMBPOSITION','%SB_THUMBTRACK','%SB_TOP','%SCF_ALL','%SCF_ASSOCIATEFONT',
+            '%SCF_DEFAULT','%SCF_NOKBUPDATE','%SCF_SELECTION','%SCF_USEUIRULES','%SCF_WORD','%SC_CLOSE','%SC_CONTEXTHELP','%SC_HOTKEY',
+            '%SC_HSCROLL','%SC_KEYMENU','%SC_MAXIMIZE','%SC_MINIMIZE','%SC_MONITORPOWER','%SC_MOUSEMENU','%SC_MOVE','%SC_NEXTWINDOW',
+            '%SC_PREVWINDOW','%SC_RESTORE','%SC_SCREENSAVE','%SC_SIZE','%SC_TASKLIST','%SC_VSCROLL','%SERVICE_ACTIVE','%SERVICE_AUTO_START',
+            '%SERVICE_BOOT_START','%SERVICE_CONTINUE_PENDING','%SERVICE_DEMAND_START','%SERVICE_DISABLED','%SERVICE_DRIVER','%SERVICE_INACTIVE','%SERVICE_INFO_DISPLAY_NAME','%SERVICE_INFO_NAME',
+            '%SERVICE_PAUSED','%SERVICE_PAUSE_PENDING','%SERVICE_RUNNING','%SERVICE_START_PENDING','%SERVICE_STATE_ALL','%SERVICE_STOPPED','%SERVICE_STOP_PENDING','%SERVICE_SYSTEM_START',
+            '%SERVICE_TYPE_ALL','%SERVICE_WIN32','%SES_ALLOWBEEPS','%SES_BEEPONMAXTEXT','%SES_BIDI','%SES_EMULATE10','%SES_EMULATESYSEDIT','%SES_EXTENDBACKCOLOR',
+            '%SES_LOWERCASE','%SES_MAPCPS','%SES_NOIME','%SES_NOINPUTSEQUENCECHK','%SES_SCROLLONKILLFOCUS','%SES_UPPERCASE','%SES_USEAIMM','%SES_USECRLF',
+            '%SES_XLTCRCRLFTOCR','%SF_RTF','%SF_TEXT','%SMTP_SET_ATTACH_CONTENT_TYPE','%SMTP_SET_CONTENT_TYPE_PREFIX','%SQL_AA_FALSE','%SQL_AA_TRUE','%SQL_ACCESSIBLE_PROCEDURES',
+            '%SQL_ACCESSIBLE_TABLES','%SQL_ACCESS_MODE','%SQL_ACTIVE_CONNECTIONS','%SQL_ACTIVE_ENVIRONMENTS','%SQL_ACTIVE_STATEMENTS','%SQL_ADD','%SQL_AD_ADD_CONSTRAINT_DEFERRABLE','%SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED',
+            '%SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE','%SQL_AD_ADD_DOMAIN_CONSTRAINT','%SQL_AD_ADD_DOMAIN_DEFAULT','%SQL_AD_CONSTRAINT_NAME_DEFINITION','%SQL_AD_DROP_DOMAIN_CONSTRAINT','%SQL_AD_DROP_DOMAIN_DEFAULT','%SQL_AF_ALL',
+            '%SQL_AF_AVG','%SQL_AF_COUNT','%SQL_AF_DISTINCT','%SQL_AF_MAX','%SQL_AF_MIN','%SQL_AF_SUM','%SQL_AGGREGATE_FUNCTIONS','%SQL_ALL_EXCEPT_LIKE',
+            '%SQL_ALL_TYPES','%SQL_ALTER_DOMAIN','%SQL_ALTER_TABLE','%SQL_AM_CONNECTION','%SQL_AM_NONE','%SQL_AM_STATEMENT','%SQL_API_ALL_FUNCTIONS','%SQL_API_LOADBYORDINAL',
+            '%SQL_API_ODBC3_ALL_FUNCTIONS','%SQL_API_ODBC3_ALL_FUNCTIONS_SIZE','%SQL_API_SQLALLOCCONNECT','%SQL_API_SQLALLOCENV','%SQL_API_SQLALLOCHANDLE','%SQL_API_SQLALLOCHANDLESTD','%SQL_API_SQLALLOCSTMT','%SQL_API_SQLBINDCOL',
+            '%SQL_API_SQLBINDPARAM','%SQL_API_SQLBINDPARAMETER','%SQL_API_SQLBROWSECONNECT','%SQL_API_SQLBULKOPERATIONS','%SQL_API_SQLCANCEL','%SQL_API_SQLCLOSECURSOR','%SQL_API_SQLCOLATTRIBUTE','%SQL_API_SQLCOLATTRIBUTES',
+            '%SQL_API_SQLCOLUMNPRIVILEGES','%SQL_API_SQLCOLUMNS','%SQL_API_SQLCONNECT','%SQL_API_SQLCOPYDESC','%SQL_API_SQLDATASOURCES','%SQL_API_SQLDESCRIBECOL','%SQL_API_SQLDESCRIBEPARAM','%SQL_API_SQLDISCONNECT',
+            '%SQL_API_SQLDRIVERCONNECT','%SQL_API_SQLDRIVERS','%SQL_API_SQLENDTRAN','%SQL_API_SQLERROR','%SQL_API_SQLEXECDIRECT','%SQL_API_SQLEXECUTE','%SQL_API_SQLEXTENDEDFETCH','%SQL_API_SQLFETCH',
+            '%SQL_API_SQLFETCHSCROLL','%SQL_API_SQLFOREIGNKEYS','%SQL_API_SQLFREECONNECT','%SQL_API_SQLFREEENV','%SQL_API_SQLFREEHANDLE','%SQL_API_SQLFREESTMT','%SQL_API_SQLGETCONNECTATTR','%SQL_API_SQLGETCONNECTOPTION',
+            '%SQL_API_SQLGETCURSORNAME','%SQL_API_SQLGETDATA','%SQL_API_SQLGETDESCFIELD','%SQL_API_SQLGETDESCREC','%SQL_API_SQLGETDIAGFIELD','%SQL_API_SQLGETDIAGREC','%SQL_API_SQLGETENVATTR','%SQL_API_SQLGETFUNCTIONS',
+            '%SQL_API_SQLGETINFO','%SQL_API_SQLGETSTMTATTR','%SQL_API_SQLGETSTMTOPTION','%SQL_API_SQLGETTYPEINFO','%SQL_API_SQLMORERESULTS','%SQL_API_SQLNATIVESQL','%SQL_API_SQLNUMPARAMS','%SQL_API_SQLNUMRESULTCOLS',
+            '%SQL_API_SQLPARAMDATA','%SQL_API_SQLPARAMOPTIONS','%SQL_API_SQLPREPARE','%SQL_API_SQLPRIMARYKEYS','%SQL_API_SQLPROCEDURECOLUMNS','%SQL_API_SQLPROCEDURES','%SQL_API_SQLPUTDATA','%SQL_API_SQLROWCOUNT',
+            '%SQL_API_SQLSETCONNECTATTR','%SQL_API_SQLSETCONNECTOPTION','%SQL_API_SQLSETCURSORNAME','%SQL_API_SQLSETDESCFIELD','%SQL_API_SQLSETDESCREC','%SQL_API_SQLSETENVATTR','%SQL_API_SQLSETPARAM','%SQL_API_SQLSETPOS',
+            '%SQL_API_SQLSETSCROLLOPTIONS','%SQL_API_SQLSETSTMTATTR','%SQL_API_SQLSETSTMTOPTION','%SQL_API_SQLSPECIALCOLUMNS','%SQL_API_SQLSTATISTICS','%SQL_API_SQLTABLEPRIVILEGES','%SQL_API_SQLTABLES','%SQL_API_SQLTRANSACT',
+            '%SQL_ARD_TYPE','%SQL_ASYNC_ENABLE','%SQL_ASYNC_ENABLE_DEFAULT','%SQL_ASYNC_ENABLE_OFF','%SQL_ASYNC_ENABLE_ON','%SQL_ASYNC_MODE','%SQL_ATTR_ACCESS_MODE','%SQL_ATTR_ANSI_APP',
+            '%SQL_ATTR_APP_PARAM_DESC','%SQL_ATTR_APP_ROW_DESC','%SQL_ATTR_ASYNC_ENABLE','%SQL_ATTR_AUTOCOMMIT','%SQL_ATTR_AUTO_IPD','%SQL_ATTR_CONCURRENCY','%SQL_ATTR_CONNECTION_DEAD','%SQL_ATTR_CONNECTION_POOLING',
+            '%SQL_ATTR_CONNECTION_TIMEOUT','%SQL_ATTR_CP_MATCH','%SQL_ATTR_CURRENT_CATALOG','%SQL_ATTR_CURSOR_SCROLLABLE','%SQL_ATTR_CURSOR_SENSITIVITY','%SQL_ATTR_CURSOR_TYPE','%SQL_ATTR_DISCONNECT_BEHAVIOR','%SQL_ATTR_ENABLE_AUTO_IPD',
+            '%SQL_ATTR_ENLIST_IN_DTC','%SQL_ATTR_ENLIST_IN_XA','%SQL_ATTR_FETCH_BOOKMARK_PTR','%SQL_ATTR_IMP_PARAM_DESC','%SQL_ATTR_IMP_ROW_DESC','%SQL_ATTR_KEYSET_SIZE','%SQL_ATTR_LOGIN_TIMEOUT','%SQL_ATTR_MAX_LENGTH',
+            '%SQL_ATTR_MAX_ROWS','%SQL_ATTR_METADATA_ID','%SQL_ATTR_NOSCAN','%SQL_ATTR_ODBC_CURSORS','%SQL_ATTR_ODBC_VERSION','%SQL_ATTR_OUTPUT_NTS','%SQL_ATTR_PACKET_SIZE','%SQL_ATTR_PARAMSET_SIZE',
+            '%SQL_ATTR_PARAMS_PROCESSED_PTR','%SQL_ATTR_PARAM_BIND_OFFSET_PTR','%SQL_ATTR_PARAM_BIND_TYPE','%SQL_ATTR_PARAM_OPERATION_PTR','%SQL_ATTR_PARAM_STATUS_PTR','%SQL_ATTR_QUERY_TIMEOUT','%SQL_ATTR_QUIET_MODE','%SQL_ATTR_READONLY',
+            '%SQL_ATTR_READWRITE_UNKNOWN','%SQL_ATTR_RETRIEVE_DATA','%SQL_ATTR_ROWS_FETCHED_PTR','%SQL_ATTR_ROW_ARRAY_SIZE','%SQL_ATTR_ROW_BIND_OFFSET_PTR','%SQL_ATTR_ROW_BIND_TYPE','%SQL_ATTR_ROW_NUMBER','%SQL_ATTR_ROW_OPERATION_PTR',
+            '%SQL_ATTR_ROW_STATUS_PTR','%SQL_ATTR_SIMULATE_CURSOR','%SQL_ATTR_TRACE','%SQL_ATTR_TRACEFILE','%SQL_ATTR_TRANSLATE_LIB','%SQL_ATTR_TRANSLATE_OPTION','%SQL_ATTR_TXN_ISOLATION','%SQL_ATTR_USE_BOOKMARKS',
+            '%SQL_ATTR_WRITE','%SQL_AT_ADD_COLUMN','%SQL_AT_ADD_COLUMN_COLLATION','%SQL_AT_ADD_COLUMN_DEFAULT','%SQL_AT_ADD_COLUMN_SINGLE','%SQL_AT_ADD_CONSTRAINT','%SQL_AT_ADD_TABLE_CONSTRAINT','%SQL_AT_CONSTRAINT_DEFERRABLE',
+            '%SQL_AT_CONSTRAINT_INITIALLY_DEFERRED','%SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AT_CONSTRAINT_NAME_DEFINITION','%SQL_AT_CONSTRAINT_NON_DEFERRABLE','%SQL_AT_DROP_COLUMN','%SQL_AT_DROP_COLUMN_CASCADE','%SQL_AT_DROP_COLUMN_DEFAULT','%SQL_AT_DROP_COLUMN_RESTRICT',
+            '%SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE','%SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT','%SQL_AT_SET_COLUMN_DEFAULT','%SQL_AUTOCOMMIT','%SQL_AUTOCOMMIT_DEFAULT','%SQL_AUTOCOMMIT_OFF','%SQL_AUTOCOMMIT_ON','%SQL_BATCH_ROW_COUNT',
+            '%SQL_BATCH_SUPPORT','%SQL_BEST_ROWID','%SQL_BIGINT','%SQL_BINARY','%SQL_BIND_BY_COLUMN','%SQL_BIND_TYPE','%SQL_BIND_TYPE_DEFAULT','%SQL_BIT',
+            '%SQL_BOOKMARK_PERSISTENCE','%SQL_BP_CLOSE','%SQL_BP_DELETE','%SQL_BP_DROP','%SQL_BP_OTHER_HSTMT','%SQL_BP_SCROLL','%SQL_BP_TRANSACTION','%SQL_BP_UPDATE',
+            '%SQL_BRC_EXPLICIT','%SQL_BRC_PROCEDURES','%SQL_BRC_ROLLED_UP','%SQL_BS_ROW_COUNT_EXPLICIT','%SQL_BS_ROW_COUNT_PROC','%SQL_BS_SELECT_EXPLICIT','%SQL_BS_SELECT_PROC','%SQL_CA1_ABSOLUTE',
+            '%SQL_CA1_BOOKMARK','%SQL_CA1_BULK_ADD','%SQL_CA1_BULK_DELETE_BY_BOOKMARK','%SQL_CA1_BULK_FETCH_BY_BOOKMARK','%SQL_CA1_BULK_UPDATE_BY_BOOKMARK','%SQL_CA1_LOCK_EXCLUSIVE','%SQL_CA1_LOCK_NO_CHANGE','%SQL_CA1_LOCK_UNLOCK',
+            '%SQL_CA1_NEXT','%SQL_CA1_POSITIONED_DELETE','%SQL_CA1_POSITIONED_UPDATE','%SQL_CA1_POS_DELETE','%SQL_CA1_POS_POSITION','%SQL_CA1_POS_REFRESH','%SQL_CA1_POS_UPDATE','%SQL_CA1_RELATIVE',
+            '%SQL_CA1_SELECT_FOR_UPDATE','%SQL_CA2_CRC_APPROXIMATE','%SQL_CA2_CRC_EXACT','%SQL_CA2_LOCK_CONCURRENCY','%SQL_CA2_MAX_ROWS_AFFECTS_ALL','%SQL_CA2_MAX_ROWS_CATALOG','%SQL_CA2_MAX_ROWS_DELETE','%SQL_CA2_MAX_ROWS_INSERT',
+            '%SQL_CA2_MAX_ROWS_SELECT','%SQL_CA2_MAX_ROWS_UPDATE','%SQL_CA2_OPT_ROWVER_CONCURRENCY','%SQL_CA2_OPT_VALUES_CONCURRENCY','%SQL_CA2_READ_ONLY_CONCURRENCY','%SQL_CA2_SENSITIVITY_ADDITIONS','%SQL_CA2_SENSITIVITY_DELETIONS','%SQL_CA2_SENSITIVITY_UPDATES',
+            '%SQL_CA2_SIMULATE_NON_UNIQUE','%SQL_CA2_SIMULATE_TRY_UNIQUE','%SQL_CA2_SIMULATE_UNIQUE','%SQL_CASCADE','%SQL_CATALOG_LOCATION','%SQL_CATALOG_NAME','%SQL_CATALOG_NAME_SEPARATOR','%SQL_CATALOG_TERM',
+            '%SQL_CATALOG_USAGE','%SQL_CA_CONSTRAINT_DEFERRABLE','%SQL_CA_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CA_CONSTRAINT_NON_DEFERRABLE','%SQL_CA_CREATE_ASSERTION','%SQL_CB_CLOSE','%SQL_CB_DELETE',
+            '%SQL_CB_NON_NULL','%SQL_CB_NULL','%SQL_CB_PRESERVE','%SQL_CCOL_CREATE_COLLATION','%SQL_CCS_COLLATE_CLAUSE','%SQL_CCS_CREATE_CHARACTER_SET','%SQL_CCS_LIMITED_COLLATION','%SQL_CC_CLOSE',
+            '%SQL_CC_DELETE','%SQL_CC_PRESERVE','%SQL_CDO_COLLATION','%SQL_CDO_CONSTRAINT','%SQL_CDO_CONSTRAINT_DEFERRABLE','%SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CDO_CONSTRAINT_NAME_DEFINITION',
+            '%SQL_CDO_CONSTRAINT_NON_DEFERRABLE','%SQL_CDO_CREATE_DOMAIN','%SQL_CDO_DEFAULT','%SQL_CD_FALSE','%SQL_CD_TRUE','%SQL_CHAR','%SQL_CLOSE','%SQL_CL_END',
+            '%SQL_CL_START','%SQL_CN_ANY','%SQL_CN_DIFFERENT','%SQL_CN_NONE','%SQL_CODE_DATE','%SQL_CODE_DAY','%SQL_CODE_DAY_TO_HOUR','%SQL_CODE_DAY_TO_MINUTE',
+            '%SQL_CODE_DAY_TO_SECOND','%SQL_CODE_HOUR','%SQL_CODE_HOUR_TO_MINUTE','%SQL_CODE_HOUR_TO_SECOND','%SQL_CODE_MINUTE','%SQL_CODE_MINUTE_TO_SECOND','%SQL_CODE_MONTH','%SQL_CODE_SECOND',
+            '%SQL_CODE_TIME','%SQL_CODE_TIMESTAMP','%SQL_CODE_YEAR','%SQL_CODE_YEAR_TO_MONTH','%SQL_COLATT_OPT_MAX','%SQL_COLATT_OPT_MIN','%SQL_COLLATION_SEQ','%SQL_COLUMN_ALIAS',
+            '%SQL_COLUMN_AUTO_INCREMENT','%SQL_COLUMN_CASE_SENSITIVE','%SQL_COLUMN_COUNT','%SQL_COLUMN_DISPLAY_SIZE','%SQL_COLUMN_IGNORE','%SQL_COLUMN_LABEL','%SQL_COLUMN_LENGTH','%SQL_COLUMN_MONEY',
+            '%SQL_COLUMN_NAME','%SQL_COLUMN_NULLABLE','%SQL_COLUMN_NUMBER_UNKNOWN','%SQL_COLUMN_OWNER_NAME','%SQL_COLUMN_PRECISION','%SQL_COLUMN_QUALIFIER_NAME','%SQL_COLUMN_SCALE','%SQL_COLUMN_SEARCHABLE',
+            '%SQL_COLUMN_TABLE_NAME','%SQL_COLUMN_TYPE','%SQL_COLUMN_TYPE_NAME','%SQL_COLUMN_UNSIGNED','%SQL_COLUMN_UPDATABLE','%SQL_COL_PRED_BASIC','%SQL_COL_PRED_CHAR','%SQL_COMMIT',
+            '%SQL_CONCAT_NULL_BEHAVIOR','%SQL_CONCURRENCY','%SQL_CONCUR_DEFAULT','%SQL_CONCUR_LOCK','%SQL_CONCUR_READ_ONLY','%SQL_CONCUR_ROWVER','%SQL_CONCUR_TIMESTAMP','%SQL_CONCUR_VALUES',
+            '%SQL_CONVERT_BIGINT','%SQL_CONVERT_BINARY','%SQL_CONVERT_BIT','%SQL_CONVERT_CHAR','%SQL_CONVERT_DATE','%SQL_CONVERT_DECIMAL','%SQL_CONVERT_DOUBLE','%SQL_CONVERT_FLOAT',
+            '%SQL_CONVERT_FUNCTIONS','%SQL_CONVERT_GUID','%SQL_CONVERT_INTEGER','%SQL_CONVERT_INTERVAL_DAY_TIME','%SQL_CONVERT_INTERVAL_YEAR_MONTH','%SQL_CONVERT_LONGVARBINARY','%SQL_CONVERT_LONGVARCHAR','%SQL_CONVERT_NUMERIC',
+            '%SQL_CONVERT_REAL','%SQL_CONVERT_SMALLINT','%SQL_CONVERT_TIME','%SQL_CONVERT_TIMESTAMP','%SQL_CONVERT_TINYINT','%SQL_CONVERT_VARBINARY','%SQL_CONVERT_VARCHAR','%SQL_CONVERT_WCHAR',
+            '%SQL_CONVERT_WLONGVARCHAR','%SQL_CONVERT_WVARCHAR','%SQL_CORRELATION_NAME','%SQL_CP_DEFAULT','%SQL_CP_MATCH_DEFAULT','%SQL_CP_OFF','%SQL_CP_ONE_PER_DRIVER','%SQL_CP_ONE_PER_HENV',
+            '%SQL_CP_RELAXED_MATCH','%SQL_CP_STRICT_MATCH','%SQL_CREATE_ASSERTION','%SQL_CREATE_CHARACTER_SET','%SQL_CREATE_COLLATION','%SQL_CREATE_DOMAIN','%SQL_CREATE_SCHEMA','%SQL_CREATE_TABLE',
+            '%SQL_CREATE_TRANSLATION','%SQL_CREATE_VIEW','%SQL_CR_CLOSE','%SQL_CR_DELETE','%SQL_CR_PRESERVE','%SQL_CS_AUTHORIZATION','%SQL_CS_CREATE_SCHEMA','%SQL_CS_DEFAULT_CHARACTER_SET',
+            '%SQL_CTR_CREATE_TRANSLATION','%SQL_CT_COLUMN_COLLATION','%SQL_CT_COLUMN_CONSTRAINT','%SQL_CT_COLUMN_DEFAULT','%SQL_CT_COMMIT_DELETE','%SQL_CT_COMMIT_PRESERVE','%SQL_CT_CONSTRAINT_DEFERRABLE','%SQL_CT_CONSTRAINT_INITIALLY_DEFERRED',
+            '%SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CT_CONSTRAINT_NAME_DEFINITION','%SQL_CT_CONSTRAINT_NON_DEFERRABLE','%SQL_CT_CREATE_TABLE','%SQL_CT_GLOBAL_TEMPORARY','%SQL_CT_LOCAL_TEMPORARY','%SQL_CT_TABLE_CONSTRAINT','%SQL_CURRENT_QUALIFIER',
+            '%SQL_CURSOR_COMMIT_BEHAVIOR','%SQL_CURSOR_DYNAMIC','%SQL_CURSOR_FORWARD_ONLY','%SQL_CURSOR_KEYSET_DRIVEN','%SQL_CURSOR_ROLLBACK_BEHAVIOR','%SQL_CURSOR_SENSITIVITY','%SQL_CURSOR_STATIC','%SQL_CURSOR_TYPE',
+            '%SQL_CURSOR_TYPE_DEFAULT','%SQL_CUR_DEFAULT','%SQL_CUR_USE_DRIVER','%SQL_CUR_USE_IF_NEEDED','%SQL_CUR_USE_ODBC','%SQL_CU_DML_STATEMENTS','%SQL_CU_INDEX_DEFINITION','%SQL_CU_PRIVILEGE_DEFINITION',
+            '%SQL_CU_PROCEDURE_INVOCATION','%SQL_CU_TABLE_DEFINITION','%SQL_CVT_BIGINT','%SQL_CVT_BINARY','%SQL_CVT_BIT','%SQL_CVT_CHAR','%SQL_CVT_DATE','%SQL_CVT_DECIMAL',
+            '%SQL_CVT_DOUBLE','%SQL_CVT_FLOAT','%SQL_CVT_GUID','%SQL_CVT_INTEGER','%SQL_CVT_INTERVAL_DAY_TIME','%SQL_CVT_INTERVAL_YEAR_MONTH','%SQL_CVT_LONGVARBINARY','%SQL_CVT_LONGVARCHAR',
+            '%SQL_CVT_NUMERIC','%SQL_CVT_REAL','%SQL_CVT_SMALLINT','%SQL_CVT_TIME','%SQL_CVT_TIMESTAMP','%SQL_CVT_TINYINT','%SQL_CVT_VARBINARY','%SQL_CVT_VARCHAR',
+            '%SQL_CVT_WCHAR','%SQL_CVT_WLONGVARCHAR','%SQL_CVT_WVARCHAR','%SQL_CV_CASCADED','%SQL_CV_CHECK_OPTION','%SQL_CV_CREATE_VIEW','%SQL_CV_LOCAL','%SQL_C_BINARY',
+            '%SQL_C_BIT','%SQL_C_BOOKMARK','%SQL_C_CHAR','%SQL_C_DATE','%SQL_C_DEFAULT','%SQL_C_DOUBLE','%SQL_C_FLOAT','%SQL_C_GUID',
+            '%SQL_C_INTERVAL_DAY','%SQL_C_INTERVAL_DAY_TO_HOUR','%SQL_C_INTERVAL_DAY_TO_MINUTE','%SQL_C_INTERVAL_DAY_TO_SECOND','%SQL_C_INTERVAL_HOUR','%SQL_C_INTERVAL_HOUR_TO_MINUTE','%SQL_C_INTERVAL_HOUR_TO_SECOND','%SQL_C_INTERVAL_MINUTE',
+            '%SQL_C_INTERVAL_MINUTE_TO_SECOND','%SQL_C_INTERVAL_MONTH','%SQL_C_INTERVAL_SECOND','%SQL_C_INTERVAL_YEAR','%SQL_C_INTERVAL_YEAR_TO_MONTH','%SQL_C_LONG','%SQL_C_NUMERIC','%SQL_C_SBIGINT',
+            '%SQL_C_SHORT','%SQL_C_SLONG','%SQL_C_SSHORT','%SQL_C_STINYINT','%SQL_C_TIME','%SQL_C_TIMESTAMP','%SQL_C_TINYINT','%SQL_C_TYPE_DATE',
+            '%SQL_C_TYPE_TIME','%SQL_C_TYPE_TIMESTAMP','%SQL_C_UBIGINT','%SQL_C_ULONG','%SQL_C_USHORT','%SQL_C_UTINYINT','%SQL_C_VARBOOKMARK','%SQL_DATABASE_NAME',
+            '%SQL_DATA_AT_EXEC','%SQL_DATA_SOURCE_NAME','%SQL_DATA_SOURCE_READ_ONLY','%SQL_DATE','%SQL_DATETIME','%SQL_DATETIME_LITERALS','%SQL_DATE_LEN','%SQL_DAY',
+            '%SQL_DAY_TO_HOUR','%SQL_DAY_TO_MINUTE','%SQL_DAY_TO_SECOND','%SQL_DA_DROP_ASSERTION','%SQL_DBMS_NAME','%SQL_DBMS_VER','%SQL_DB_DEFAULT','%SQL_DB_DISCONNECT',
+            '%SQL_DB_RETURN_TO_POOL','%SQL_DCS_DROP_CHARACTER_SET','%SQL_DC_DROP_COLLATION','%SQL_DDL_INDEX','%SQL_DD_CASCADE','%SQL_DD_DROP_DOMAIN','%SQL_DD_RESTRICT','%SQL_DECIMAL',
+            '%SQL_DEFAULT','%SQL_DEFAULT_PARAM','%SQL_DEFAULT_TXN_ISOLATION','%SQL_DELETE','%SQL_DELETE_BY_BOOKMARK','%SQL_DESCRIBE_PARAMETER','%SQL_DESC_ALLOC_AUTO','%SQL_DESC_ALLOC_TYPE',
+            '%SQL_DESC_ALLOC_USER','%SQL_DESC_ARRAY_SIZE','%SQL_DESC_ARRAY_STATUS_PTR','%SQL_DESC_AUTO_UNIQUE_VALUE','%SQL_DESC_BASE_COLUMN_NAME','%SQL_DESC_BASE_TABLE_NAME','%SQL_DESC_BIND_OFFSET_PTR','%SQL_DESC_BIND_TYPE',
+            '%SQL_DESC_CASE_SENSITIVE','%SQL_DESC_CATALOG_NAME','%SQL_DESC_CONCISE_TYPE','%SQL_DESC_COUNT','%SQL_DESC_DATA_PTR','%SQL_DESC_DATETIME_INTERVAL_CODE','%SQL_DESC_DATETIME_INTERVAL_PRECISION','%SQL_DESC_DISPLAY_SIZE',
+            '%SQL_DESC_FIXED_PREC_SCALE','%SQL_DESC_INDICATOR_PTR','%SQL_DESC_LABEL','%SQL_DESC_LENGTH','%SQL_DESC_LITERAL_PREFIX','%SQL_DESC_LITERAL_SUFFIX','%SQL_DESC_LOCAL_TYPE_NAME','%SQL_DESC_MAXIMUM_SCALE',
+            '%SQL_DESC_MINIMUM_SCALE','%SQL_DESC_NAME','%SQL_DESC_NULLABLE','%SQL_DESC_NUM_PREC_RADIX','%SQL_DESC_OCTET_LENGTH','%SQL_DESC_OCTET_LENGTH_PTR','%SQL_DESC_PARAMETER_TYPE','%SQL_DESC_PRECISION',
+            '%SQL_DESC_ROWS_PROCESSED_PTR','%SQL_DESC_SCALE','%SQL_DESC_SCHEMA_NAME','%SQL_DESC_SEARCHABLE','%SQL_DESC_TABLE_NAME','%SQL_DESC_TYPE','%SQL_DESC_TYPE_NAME','%SQL_DESC_UNNAMED',
+            '%SQL_DESC_UNSIGNED','%SQL_DESC_UPDATABLE','%SQL_DIAG_ALTER_TABLE','%SQL_DIAG_CALL','%SQL_DIAG_CLASS_ORIGIN','%SQL_DIAG_COLUMN_NUMBER','%SQL_DIAG_CONNECTION_NAME','%SQL_DIAG_CREATE_INDEX',
+            '%SQL_DIAG_CREATE_TABLE','%SQL_DIAG_CREATE_VIEW','%SQL_DIAG_CURSOR_ROW_COUNT','%SQL_DIAG_DELETE_WHERE','%SQL_DIAG_DROP_INDEX','%SQL_DIAG_DROP_TABLE','%SQL_DIAG_DROP_VIEW','%SQL_DIAG_DYNAMIC_DELETE_CURSOR',
+            '%SQL_DIAG_DYNAMIC_FUNCTION','%SQL_DIAG_DYNAMIC_FUNCTION_CODE','%SQL_DIAG_DYNAMIC_UPDATE_CURSOR','%SQL_DIAG_GRANT','%SQL_DIAG_INSERT','%SQL_DIAG_MESSAGE_TEXT','%SQL_DIAG_NATIVE','%SQL_DIAG_NUMBER',
+            '%SQL_DIAG_RETURNCODE','%SQL_DIAG_REVOKE','%SQL_DIAG_ROW_COUNT','%SQL_DIAG_ROW_NUMBER','%SQL_DIAG_SELECT_CURSOR','%SQL_DIAG_SERVER_NAME','%SQL_DIAG_SQLSTATE','%SQL_DIAG_SUBCLASS_ORIGIN',
+            '%SQL_DIAG_UNKNOWN_STATEMENT','%SQL_DIAG_UPDATE_WHERE','%SQL_DI_CREATE_INDEX','%SQL_DI_DROP_INDEX','%SQL_DL_SQL92_DATE','%SQL_DL_SQL92_INTERVAL_DAY','%SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR','%SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE',
+            '%SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND','%SQL_DL_SQL92_INTERVAL_HOUR','%SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE','%SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MINUTE','%SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MONTH','%SQL_DL_SQL92_INTERVAL_SECOND',
+            '%SQL_DL_SQL92_INTERVAL_YEAR','%SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH','%SQL_DL_SQL92_TIME','%SQL_DL_SQL92_TIMESTAMP','%SQL_DM_VER','%SQL_DOUBLE','%SQL_DRIVER_COMPLETE','%SQL_DRIVER_COMPLETE_REQUIRED',
+            '%SQL_DRIVER_HDBC','%SQL_DRIVER_HDESC','%SQL_DRIVER_HENV','%SQL_DRIVER_HLIB','%SQL_DRIVER_HSTMT','%SQL_DRIVER_NAME','%SQL_DRIVER_NOPROMPT','%SQL_DRIVER_ODBC_VER',
+            '%SQL_DRIVER_PROMPT','%SQL_DRIVER_VER','%SQL_DROP','%SQL_DROP_ASSERTION','%SQL_DROP_CHARACTER_SET','%SQL_DROP_COLLATION','%SQL_DROP_DOMAIN','%SQL_DROP_SCHEMA',
+            '%SQL_DROP_TABLE','%SQL_DROP_TRANSLATION','%SQL_DROP_VIEW','%SQL_DS_CASCADE','%SQL_DS_DROP_SCHEMA','%SQL_DS_RESTRICT','%SQL_DTC_DONE','%SQL_DTC_ENLIST_EXPENSIVE',
+            '%SQL_DTC_TRANSITION_COST','%SQL_DTC_UNENLIST_EXPENSIVE','%SQL_DTR_DROP_TRANSLATION','%SQL_DT_CASCADE','%SQL_DT_DROP_TABLE','%SQL_DT_RESTRICT','%SQL_DV_CASCADE','%SQL_DV_DROP_VIEW',
+            '%SQL_DV_RESTRICT','%SQL_DYNAMIC_CURSOR_ATTRIBUTES1','%SQL_DYNAMIC_CURSOR_ATTRIBUTES2','%SQL_ENSURE','%SQL_ENTIRE_ROWSET','%SQL_ERROR','%SQL_EXPRESSIONS_IN_ORDERBY','%SQL_FALSE',
+            '%SQL_FD_FETCH_ABSOLUTE','%SQL_FD_FETCH_BOOKMARK','%SQL_FD_FETCH_FIRST','%SQL_FD_FETCH_LAST','%SQL_FD_FETCH_NEXT','%SQL_FD_FETCH_PREV','%SQL_FD_FETCH_PRIOR','%SQL_FD_FETCH_RELATIVE',
+            '%SQL_FETCH_ABSOLUTE','%SQL_FETCH_BOOKMARK','%SQL_FETCH_BY_BOOKMARK','%SQL_FETCH_DIRECTION','%SQL_FETCH_FIRST','%SQL_FETCH_FIRST_SYSTEM','%SQL_FETCH_FIRST_USER','%SQL_FETCH_LAST',
+            '%SQL_FETCH_NEXT','%SQL_FETCH_PREV','%SQL_FETCH_PRIOR','%SQL_FETCH_RELATIVE','%SQL_FILE_CATALOG','%SQL_FILE_NOT_SUPPORTED','%SQL_FILE_QUALIFIER','%SQL_FILE_TABLE',
+            '%SQL_FILE_USAGE','%SQL_FLOAT','%SQL_FN_CVT_CAST','%SQL_FN_CVT_CONVERT','%SQL_FN_NUM_ABS','%SQL_FN_NUM_ACOS','%SQL_FN_NUM_ASIN','%SQL_FN_NUM_ATAN',
+            '%SQL_FN_NUM_ATAN2','%SQL_FN_NUM_CEILING','%SQL_FN_NUM_COS','%SQL_FN_NUM_COT','%SQL_FN_NUM_DEGREES','%SQL_FN_NUM_EXP','%SQL_FN_NUM_FLOOR','%SQL_FN_NUM_LOG',
+            '%SQL_FN_NUM_LOG10','%SQL_FN_NUM_MOD','%SQL_FN_NUM_PI','%SQL_FN_NUM_POWER','%SQL_FN_NUM_RADIANS','%SQL_FN_NUM_RAND','%SQL_FN_NUM_ROUND','%SQL_FN_NUM_SIGN',
+            '%SQL_FN_NUM_SIN','%SQL_FN_NUM_SQRT','%SQL_FN_NUM_TAN','%SQL_FN_NUM_TRUNCATE','%SQL_FN_STR_ASCII','%SQL_FN_STR_BIT_LENGTH','%SQL_FN_STR_CHAR','%SQL_FN_STR_CHARACTER_LENGTH',
+            '%SQL_FN_STR_CHAR_LENGTH','%SQL_FN_STR_CONCAT','%SQL_FN_STR_DIFFERENCE','%SQL_FN_STR_INSERT','%SQL_FN_STR_LCASE','%SQL_FN_STR_LEFT','%SQL_FN_STR_LENGTH','%SQL_FN_STR_LOCATE',
+            '%SQL_FN_STR_LOCATE_2','%SQL_FN_STR_LTRIM','%SQL_FN_STR_OCTET_LENGTH','%SQL_FN_STR_POSITION','%SQL_FN_STR_REPEAT','%SQL_FN_STR_REPLACE','%SQL_FN_STR_RIGHT','%SQL_FN_STR_RTRIM',
+            '%SQL_FN_STR_SOUNDEX','%SQL_FN_STR_SPACE','%SQL_FN_STR_SUBSTRING','%SQL_FN_STR_UCASE','%SQL_FN_SYS_DBNAME','%SQL_FN_SYS_IFNULL','%SQL_FN_SYS_USERNAME','%SQL_FN_TD_CURDATE',
+            '%SQL_FN_TD_CURRENT_DATE','%SQL_FN_TD_CURRENT_TIME','%SQL_FN_TD_CURRENT_TIMESTAMP','%SQL_FN_TD_CURTIME','%SQL_FN_TD_DAYNAME','%SQL_FN_TD_DAYOFMONTH','%SQL_FN_TD_DAYOFWEEK','%SQL_FN_TD_DAYOFYEAR',
+            '%SQL_FN_TD_EXTRACT','%SQL_FN_TD_HOUR','%SQL_FN_TD_MINUTE','%SQL_FN_TD_MONTH','%SQL_FN_TD_MONTHNAME','%SQL_FN_TD_NOW','%SQL_FN_TD_QUARTER','%SQL_FN_TD_SECOND',
+            '%SQL_FN_TD_TIMESTAMPADD','%SQL_FN_TD_TIMESTAMPDIFF','%SQL_FN_TD_WEEK','%SQL_FN_TD_YEAR','%SQL_FN_TSI_DAY','%SQL_FN_TSI_FRAC_SECOND','%SQL_FN_TSI_HOUR','%SQL_FN_TSI_MINUTE',
+            '%SQL_FN_TSI_MONTH','%SQL_FN_TSI_QUARTER','%SQL_FN_TSI_SECOND','%SQL_FN_TSI_WEEK','%SQL_FN_TSI_YEAR','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2','%SQL_GB_COLLATE',
+            '%SQL_GB_GROUP_BY_CONTAINS_SELECT','%SQL_GB_GROUP_BY_EQUALS_SELECT','%SQL_GB_NOT_SUPPORTED','%SQL_GB_NO_RELATION','%SQL_GD_ANY_COLUMN','%SQL_GD_ANY_ORDER','%SQL_GD_BLOCK','%SQL_GD_BOUND',
+            '%SQL_GETDATA_EXTENSIONS','%SQL_GET_BOOKMARK','%SQL_GROUP_BY','%SQL_GUID','%SQL_HANDLE_DBC','%SQL_HANDLE_DESC','%SQL_HANDLE_ENV','%SQL_HANDLE_SENV',
+            '%SQL_HANDLE_STMT','%SQL_HOUR','%SQL_HOUR_TO_MINUTE','%SQL_HOUR_TO_SECOND','%SQL_IC_LOWER','%SQL_IC_MIXED','%SQL_IC_SENSITIVE','%SQL_IC_UPPER',
+            '%SQL_IDENTIFIER_CASE','%SQL_IDENTIFIER_QUOTE_CHAR','%SQL_IGNORE','%SQL_IK_ALL','%SQL_IK_ASC','%SQL_IK_DESC','%SQL_IK_NONE','%SQL_INDEX_ALL',
+            '%SQL_INDEX_CLUSTERED','%SQL_INDEX_HASHED','%SQL_INDEX_KEYWORDS','%SQL_INDEX_OTHER','%SQL_INDEX_UNIQUE','%SQL_INFO_FIRST','%SQL_INFO_SCHEMA_VIEWS','%SQL_INITIALLY_DEFERRED',
+            '%SQL_INITIALLY_IMMEDIATE','%SQL_INSENSITIVE','%SQL_INSERT_STATEMENT','%SQL_INTEGER','%SQL_INTEGRITY','%SQL_INTERVAL','%SQL_INTERVAL_DAY','%SQL_INTERVAL_DAY_TO_HOUR',
+            '%SQL_INTERVAL_DAY_TO_MINUTE','%SQL_INTERVAL_DAY_TO_SECOND','%SQL_INTERVAL_HOUR','%SQL_INTERVAL_HOUR_TO_MINUTE','%SQL_INTERVAL_HOUR_TO_SECOND','%SQL_INTERVAL_MINUTE','%SQL_INTERVAL_MINUTE_TO_SECOND','%SQL_INTERVAL_MONTH',
+            '%SQL_INTERVAL_SECOND','%SQL_INTERVAL_YEAR','%SQL_INTERVAL_YEAR_TO_MONTH','%SQL_INVALID_HANDLE','%SQL_ISV_ASSERTIONS','%SQL_ISV_CHARACTER_SETS','%SQL_ISV_CHECK_CONSTRAINTS','%SQL_ISV_COLLATIONS',
+            '%SQL_ISV_COLUMNS','%SQL_ISV_COLUMN_DOMAIN_USAGE','%SQL_ISV_COLUMN_PRIVILEGES','%SQL_ISV_CONSTRAINT_COLUMN_USAGE','%SQL_ISV_CONSTRAINT_TABLE_USAGE','%SQL_ISV_DOMAINS','%SQL_ISV_DOMAIN_CONSTRAINTS','%SQL_ISV_KEY_COLUMN_USAGE',
+            '%SQL_ISV_REFERENTIAL_CONSTRAINTS','%SQL_ISV_SCHEMATA','%SQL_ISV_SQL_LANGUAGES','%SQL_ISV_TABLES','%SQL_ISV_TABLE_CONSTRAINTS','%SQL_ISV_TABLE_PRIVILEGES','%SQL_ISV_TRANSLATIONS','%SQL_ISV_USAGE_PRIVILEGES',
+            '%SQL_ISV_VIEWS','%SQL_ISV_VIEW_COLUMN_USAGE','%SQL_ISV_VIEW_TABLE_USAGE','%SQL_IS_DAY','%SQL_IS_DAY_TO_HOUR','%SQL_IS_DAY_TO_MINUTE','%SQL_IS_DAY_TO_SECOND','%SQL_IS_HOUR',
+            '%SQL_IS_HOUR_TO_MINUTE','%SQL_IS_HOUR_TO_SECOND','%SQL_IS_INSERT_LITERALS','%SQL_IS_INSERT_SEARCHED','%SQL_IS_INTEGER','%SQL_IS_MINUTE','%SQL_IS_MINUTE_TO_SECOND','%SQL_IS_MONTH',
+            '%SQL_IS_POINTER','%SQL_IS_SECOND','%SQL_IS_SELECT_INTO','%SQL_IS_SMALLINT','%SQL_IS_UINTEGER','%SQL_IS_USMALLINT','%SQL_IS_YEAR','%SQL_IS_YEAR_TO_MONTH',
+            '%SQL_KEYSET_CURSOR_ATTRIBUTES1','%SQL_KEYSET_CURSOR_ATTRIBUTES2','%SQL_KEYSET_SIZE','%SQL_KEYSET_SIZE_DEFAULT','%SQL_KEYWORDS','%SQL_LCK_EXCLUSIVE','%SQL_LCK_NO_CHANGE','%SQL_LCK_UNLOCK',
+            '%SQL_LEN_BINARY_ATTR_OFFSET','%SQL_LEN_DATA_AT_EXEC_OFFSET','%SQL_LIKE_ESCAPE_CLAUSE','%SQL_LIKE_ONLY','%SQL_LOCK_EXCLUSIVE','%SQL_LOCK_NO_CHANGE','%SQL_LOCK_TYPES','%SQL_LOCK_UNLOCK',
+            '%SQL_LOGIN_TIMEOUT','%SQL_LOGIN_TIMEOUT_DEFAULT','%SQL_LONGVARBINARY','%SQL_LONGVARCHAR','%SQL_MAXIMUM_CATALOG_NAME_LENGTH','%SQL_MAXIMUM_COLUMNS_IN_GROUP_BY','%SQL_MAXIMUM_COLUMNS_IN_INDEX','%SQL_MAXIMUM_COLUMNS_IN_ORDER_BY',
+            '%SQL_MAXIMUM_COLUMNS_IN_SELECT','%SQL_MAXIMUM_COLUMN_NAME_LENGTH','%SQL_MAXIMUM_CONCURRENT_ACTIVITIES','%SQL_MAXIMUM_CURSOR_NAME_LENGTH','%SQL_MAXIMUM_DRIVER_CONNECTIONS','%SQL_MAXIMUM_IDENTIFIER_LENGTH','%SQL_MAXIMUM_INDEX_SIZE','%SQL_MAXIMUM_ROW_SIZE',
+            '%SQL_MAXIMUM_SCHEMA_NAME_LENGTH','%SQL_MAXIMUM_STATEMENT_LENGTH','%SQL_MAXIMUM_TABLES_IN_SELECT','%SQL_MAXIMUM_USER_NAME_LENGTH','%SQL_MAX_ASYNC_CONCURRENT_STATEMENTS','%SQL_MAX_BINARY_LITERAL_LEN','%SQL_MAX_CATALOG_NAME_LEN','%SQL_MAX_CHAR_LITERAL_LEN',
+            '%SQL_MAX_COLUMNS_IN_GROUP_BY','%SQL_MAX_COLUMNS_IN_INDEX','%SQL_MAX_COLUMNS_IN_ORDER_BY','%SQL_MAX_COLUMNS_IN_SELECT','%SQL_MAX_COLUMNS_IN_TABLE','%SQL_MAX_COLUMN_NAME_LEN','%SQL_MAX_CONCURRENT_ACTIVITIES','%SQL_MAX_CURSOR_NAME_LEN',
+            '%SQL_MAX_DRIVER_CONNECTIONS','%SQL_MAX_DSN_LENGTH','%SQL_MAX_IDENTIFIER_LEN','%SQL_MAX_INDEX_SIZE','%SQL_MAX_LENGTH','%SQL_MAX_LENGTH_DEFAULT','%SQL_MAX_MESSAGE_LENGTH','%SQL_MAX_NUMERIC_LEN',
+            '%SQL_MAX_OPTION_STRING_LENGTH','%SQL_MAX_OWNER_NAME_LEN','%SQL_MAX_PROCEDURE_NAME_LEN','%SQL_MAX_QUALIFIER_NAME_LEN','%SQL_MAX_ROWS','%SQL_MAX_ROWS_DEFAULT','%SQL_MAX_ROW_SIZE','%SQL_MAX_ROW_SIZE_INCLUDES_LONG',
+            '%SQL_MAX_SCHEMA_NAME_LEN','%SQL_MAX_STATEMENT_LEN','%SQL_MAX_TABLES_IN_SELECT','%SQL_MAX_TABLE_NAME_LEN','%SQL_MAX_USER_NAME_LEN','%SQL_MINUTE','%SQL_MINUTE_TO_SECOND','%SQL_MODE_DEFAULT',
+            '%SQL_MODE_READ_ONLY','%SQL_MODE_READ_WRITE','%SQL_MONTH','%SQL_MULTIPLE_ACTIVE_TXN','%SQL_MULT_RESULT_SETS','%SQL_NAMED','%SQL_NC_END','%SQL_NC_HIGH',
+            '%SQL_NC_LOW','%SQL_NC_START','%SQL_NEED_DATA','%SQL_NEED_LONG_DATA_LEN','%SQL_NNC_NON_NULL','%SQL_NNC_NULL','%SQL_NONSCROLLABLE','%SQL_NON_NULLABLE_COLUMNS',
+            '%SQL_NOSCAN','%SQL_NOSCAN_DEFAULT','%SQL_NOSCAN_OFF','%SQL_NOSCAN_ON','%SQL_NOT_DEFERRABLE','%SQL_NO_ACTION','%SQL_NO_COLUMN_NUMBER','%SQL_NO_DATA',
+            '%SQL_NO_DATA_FOUND','%SQL_NO_NULLS','%SQL_NO_ROW_NUMBER','%SQL_NO_TOTAL','%SQL_NTS','%SQL_NTSL','%SQL_NULLABLE','%SQL_NULLABLE_UNKNOWN',
+            '%SQL_NULL_COLLATION','%SQL_NULL_DATA','%SQL_NULL_HANDLE','%SQL_NULL_HDBC','%SQL_NULL_HDESC','%SQL_NULL_HENV','%SQL_NULL_HSTMT','%SQL_NUMERIC',
+            '%SQL_NUMERIC_FUNCTIONS','%SQL_OAC_LEVEL1','%SQL_OAC_LEVEL2','%SQL_OAC_NONE','%SQL_ODBC_API_CONFORMANCE','%SQL_ODBC_CURSORS','%SQL_ODBC_INTERFACE_CONFORMANCE','%SQL_ODBC_SAG_CLI_CONFORMANCE',
+            '%SQL_ODBC_SQL_CONFORMANCE','%SQL_ODBC_SQL_OPT_IEF','%SQL_ODBC_VER','%SQL_OIC_CORE','%SQL_OIC_LEVEL1','%SQL_OIC_LEVEL2','%SQL_OJ_ALL_COMPARISON_OPS','%SQL_OJ_CAPABILITIES',
+            '%SQL_OJ_FULL','%SQL_OJ_INNER','%SQL_OJ_LEFT','%SQL_OJ_NESTED','%SQL_OJ_NOT_ORDERED','%SQL_OJ_RIGHT','%SQL_OPT_TRACE','%SQL_OPT_TRACEFILE',
+            '%SQL_OPT_TRACE_DEFAULT','%SQL_OPT_TRACE_OFF','%SQL_OPT_TRACE_ON','%SQL_ORDER_BY_COLUMNS_IN_SELECT','%SQL_OSCC_COMPLIANT','%SQL_OSCC_NOT_COMPLIANT','%SQL_OSC_CORE','%SQL_OSC_EXTENDED',
+            '%SQL_OSC_MINIMUM','%SQL_OUTER_JOINS','%SQL_OUTER_JOIN_CAPABILITIES','%SQL_OU_DML_STATEMENTS','%SQL_OU_INDEX_DEFINITION','%SQL_OU_PRIVILEGE_DEFINITION','%SQL_OU_PROCEDURE_INVOCATION','%SQL_OU_TABLE_DEFINITION',
+            '%SQL_OV_ODBC2','%SQL_OV_ODBC3','%SQL_OWNER_TERM','%SQL_OWNER_USAGE','%SQL_PACKET_SIZE','%SQL_PARAM_ARRAY_ROW_COUNTS','%SQL_PARAM_ARRAY_SELECTS','%SQL_PARAM_BIND_BY_COLUMN',
+            '%SQL_PARAM_BIND_TYPE_DEFAULT','%SQL_PARAM_DIAG_UNAVAILABLE','%SQL_PARAM_ERROR','%SQL_PARAM_IGNORE','%SQL_PARAM_INPUT','%SQL_PARAM_INPUT_OUTPUT','%SQL_PARAM_OUTPUT','%SQL_PARAM_PROCEED',
+            '%SQL_PARAM_SUCCESS','%SQL_PARAM_SUCCESS_WITH_INFO','%SQL_PARAM_TYPE_DEFAULT','%SQL_PARAM_TYPE_UNKNOWN','%SQL_PARAM_UNUSED','%SQL_PARC_BATCH','%SQL_PARC_NO_BATCH','%SQL_PAS_BATCH',
+            '%SQL_PAS_NO_BATCH','%SQL_PAS_NO_SELECT','%SQL_PC_NON_PSEUDO','%SQL_PC_NOT_PSEUDO','%SQL_PC_PSEUDO','%SQL_PC_UNKNOWN','%SQL_POSITION','%SQL_POSITIONED_STATEMENTS',
+            '%SQL_POS_ADD','%SQL_POS_DELETE','%SQL_POS_OPERATIONS','%SQL_POS_POSITION','%SQL_POS_REFRESH','%SQL_POS_UPDATE','%SQL_PRED_BASIC','%SQL_PRED_CHAR',
+            '%SQL_PRED_NONE','%SQL_PRED_SEARCHABLE','%SQL_PROCEDURES','%SQL_PROCEDURE_TERM','%SQL_PS_POSITIONED_DELETE','%SQL_PS_POSITIONED_UPDATE','%SQL_PS_SELECT_FOR_UPDATE','%SQL_PT_FUNCTION',
+            '%SQL_PT_PROCEDURE','%SQL_PT_UNKNOWN','%SQL_QL_END','%SQL_QL_START','%SQL_QUALIFIER_LOCATION','%SQL_QUALIFIER_NAME_SEPARATOR','%SQL_QUALIFIER_TERM','%SQL_QUALIFIER_USAGE',
+            '%SQL_QUERY_TIMEOUT','%SQL_QUERY_TIMEOUT_DEFAULT','%SQL_QUICK','%SQL_QUIET_MODE','%SQL_QUOTED_IDENTIFIER_CASE','%SQL_QU_DML_STATEMENTS','%SQL_QU_INDEX_DEFINITION','%SQL_QU_PRIVILEGE_DEFINITION',
+            '%SQL_QU_PROCEDURE_INVOCATION','%SQL_QU_TABLE_DEFINITION','%SQL_RD_DEFAULT','%SQL_RD_OFF','%SQL_RD_ON','%SQL_REAL','%SQL_REFRESH','%SQL_RESET_PARAMS',
+            '%SQL_RESTRICT','%SQL_RESULT_COL','%SQL_RETRIEVE_DATA','%SQL_RETURN_VALUE','%SQL_ROLLBACK','%SQL_ROWSET_SIZE','%SQL_ROWSET_SIZE_DEFAULT','%SQL_ROWVER',
+            '%SQL_ROW_ADDED','%SQL_ROW_DELETED','%SQL_ROW_ERROR','%SQL_ROW_IDENTIFIER','%SQL_ROW_IGNORE','%SQL_ROW_NOROW','%SQL_ROW_NUMBER','%SQL_ROW_NUMBER_UNKNOWN',
+            '%SQL_ROW_PROCEED','%SQL_ROW_SUCCESS','%SQL_ROW_SUCCESS_WITH_INFO','%SQL_ROW_UPDATED','%SQL_ROW_UPDATES','%SQL_SCCO_LOCK','%SQL_SCCO_OPT_ROWVER','%SQL_SCCO_OPT_TIMESTAMP',
+            '%SQL_SCCO_OPT_VALUES','%SQL_SCCO_READ_ONLY','%SQL_SCC_ISO92_CLI','%SQL_SCC_XOPEN_CLI_VERSION1','%SQL_SCHEMA_TERM','%SQL_SCHEMA_USAGE','%SQL_SCOPE_CURROW','%SQL_SCOPE_SESSION',
+            '%SQL_SCOPE_TRANSACTION','%SQL_SCROLLABLE','%SQL_SCROLL_CONCURRENCY','%SQL_SCROLL_DYNAMIC','%SQL_SCROLL_FORWARD_ONLY','%SQL_SCROLL_KEYSET_DRIVEN','%SQL_SCROLL_OPTIONS','%SQL_SCROLL_STATIC',
+            '%SQL_SC_FIPS127_2_TRANSITIONAL','%SQL_SC_NON_UNIQUE','%SQL_SC_SQL92_ENTRY','%SQL_SC_SQL92_FULL','%SQL_SC_SQL92_INTERMEDIATE','%SQL_SC_TRY_UNIQUE','%SQL_SC_UNIQUE','%SQL_SDF_CURRENT_DATE',
+            '%SQL_SDF_CURRENT_TIME','%SQL_SDF_CURRENT_TIMESTAMP','%SQL_SEARCHABLE','%SQL_SEARCH_PATTERN_ESCAPE','%SQL_SECOND','%SQL_SENSITIVE','%SQL_SERVER_NAME','%SQL_SETPARAM_VALUE_MAX',
+            '%SQL_SETPOS_MAX_LOCK_VALUE','%SQL_SETPOS_MAX_OPTION_VALUE','%SQL_SET_DEFAULT','%SQL_SET_NULL','%SQL_SFKD_CASCADE','%SQL_SFKD_NO_ACTION','%SQL_SFKD_SET_DEFAULT','%SQL_SFKD_SET_NULL',
+            '%SQL_SFKU_CASCADE','%SQL_SFKU_NO_ACTION','%SQL_SFKU_SET_DEFAULT','%SQL_SFKU_SET_NULL','%SQL_SG_DELETE_TABLE','%SQL_SG_INSERT_COLUMN','%SQL_SG_INSERT_TABLE','%SQL_SG_REFERENCES_COLUMN',
+            '%SQL_SG_REFERENCES_TABLE','%SQL_SG_SELECT_TABLE','%SQL_SG_UPDATE_COLUMN','%SQL_SG_UPDATE_TABLE','%SQL_SG_USAGE_ON_CHARACTER_SET','%SQL_SG_USAGE_ON_COLLATION','%SQL_SG_USAGE_ON_DOMAIN','%SQL_SG_USAGE_ON_TRANSLATION',
+            '%SQL_SG_WITH_GRANT_OPTION','%SQL_SIGNED_OFFSET','%SQL_SIMULATE_CURSOR','%SQL_SMALLINT','%SQL_SNVF_BIT_LENGTH','%SQL_SNVF_CHARACTER_LENGTH','%SQL_SNVF_CHAR_LENGTH','%SQL_SNVF_EXTRACT',
+            '%SQL_SNVF_OCTET_LENGTH','%SQL_SNVF_POSITION','%SQL_SO_DYNAMIC','%SQL_SO_FORWARD_ONLY','%SQL_SO_KEYSET_DRIVEN','%SQL_SO_MIXED','%SQL_SO_STATIC','%SQL_SPECIAL_CHARACTERS',
+            '%SQL_SPEC_MAJOR','%SQL_SPEC_MINOR','%SQL_SP_BETWEEN','%SQL_SP_COMPARISON','%SQL_SP_EXISTS','%SQL_SP_IN','%SQL_SP_ISNOTNULL','%SQL_SP_ISNULL',
+            '%SQL_SP_LIKE','%SQL_SP_MATCH_FULL','%SQL_SP_MATCH_PARTIAL','%SQL_SP_MATCH_UNIQUE_FULL','%SQL_SP_MATCH_UNIQUE_PARTIAL','%SQL_SP_OVERLAPS','%SQL_SP_QUANTIFIED_COMPARISON','%SQL_SP_UNIQUE',
+            '%SQL_SQL92_DATETIME_FUNCTIONS','%SQL_SQL92_FOREIGN_KEY_DELETE_RULE','%SQL_SQL92_FOREIGN_KEY_UPDATE_RULE','%SQL_SQL92_GRANT','%SQL_SQL92_NUMERIC_VALUE_FUNCTIONS','%SQL_SQL92_PREDICATES','%SQL_SQL92_RELATIONAL_JOIN_OPERATORS','%SQL_SQL92_REVOKE',
+            '%SQL_SQL92_ROW_VALUE_CONSTRUCTOR','%SQL_SQL92_STRING_FUNCTIONS','%SQL_SQL92_VALUE_EXPRESSIONS','%SQL_SQLSTATE_SIZE','%SQL_SQL_CONFORMANCE','%SQL_SQ_COMPARISON','%SQL_SQ_CORRELATED_SUBQUERIES','%SQL_SQ_EXISTS',
+            '%SQL_SQ_IN','%SQL_SQ_QUANTIFIED','%SQL_SRJO_CORRESPONDING_CLAUSE','%SQL_SRJO_CROSS_JOIN','%SQL_SRJO_EXCEPT_JOIN','%SQL_SRJO_FULL_OUTER_JOIN','%SQL_SRJO_INNER_JOIN','%SQL_SRJO_INTERSECT_JOIN',
+            '%SQL_SRJO_LEFT_OUTER_JOIN','%SQL_SRJO_NATURAL_JOIN','%SQL_SRJO_RIGHT_OUTER_JOIN','%SQL_SRJO_UNION_JOIN','%SQL_SRVC_DEFAULT','%SQL_SRVC_NULL','%SQL_SRVC_ROW_SUBQUERY','%SQL_SRVC_VALUE_EXPRESSION',
+            '%SQL_SR_CASCADE','%SQL_SR_DELETE_TABLE','%SQL_SR_GRANT_OPTION_FOR','%SQL_SR_INSERT_COLUMN','%SQL_SR_INSERT_TABLE','%SQL_SR_REFERENCES_COLUMN','%SQL_SR_REFERENCES_TABLE','%SQL_SR_RESTRICT',
+            '%SQL_SR_SELECT_TABLE','%SQL_SR_UPDATE_COLUMN','%SQL_SR_UPDATE_TABLE','%SQL_SR_USAGE_ON_CHARACTER_SET','%SQL_SR_USAGE_ON_COLLATION','%SQL_SR_USAGE_ON_DOMAIN','%SQL_SR_USAGE_ON_TRANSLATION','%SQL_SSF_CONVERT',
+            '%SQL_SSF_LOWER','%SQL_SSF_SUBSTRING','%SQL_SSF_TRANSLATE','%SQL_SSF_TRIM_BOTH','%SQL_SSF_TRIM_LEADING','%SQL_SSF_TRIM_TRAILING','%SQL_SSF_UPPER','%SQL_SS_ADDITIONS',
+            '%SQL_SS_DELETIONS','%SQL_SS_UPDATES','%SQL_STANDARD_CLI_CONFORMANCE','%SQL_STATIC_CURSOR_ATTRIBUTES1','%SQL_STATIC_CURSOR_ATTRIBUTES2','%SQL_STATIC_SENSITIVITY','%SQL_STILL_EXECUTING','%SQL_STRING_FUNCTIONS',
+            '%SQL_SUBQUERIES','%SQL_SUCCESS','%SQL_SUCCESS_WITH_INFO','%SQL_SU_DML_STATEMENTS','%SQL_SU_INDEX_DEFINITION','%SQL_SU_PRIVILEGE_DEFINITION','%SQL_SU_PROCEDURE_INVOCATION','%SQL_SU_TABLE_DEFINITION',
+            '%SQL_SVE_CASE','%SQL_SVE_CAST','%SQL_SVE_COALESCE','%SQL_SVE_NULLIF','%SQL_SYSTEM_FUNCTIONS','%SQL_TABLE_STAT','%SQL_TABLE_TERM','%SQL_TC_ALL',
+            '%SQL_TC_DDL_COMMIT','%SQL_TC_DDL_IGNORE','%SQL_TC_DML','%SQL_TC_NONE','%SQL_TIME','%SQL_TIMEDATE_ADD_INTERVALS','%SQL_TIMEDATE_DIFF_INTERVALS','%SQL_TIMEDATE_FUNCTIONS',
+            '%SQL_TIMESTAMP','%SQL_TIMESTAMP_LEN','%SQL_TIME_LEN','%SQL_TINYINT','%SQL_TRANSACTION_CAPABLE','%SQL_TRANSACTION_ISOLATION_OPTION','%SQL_TRANSACTION_READ_COMMITTED','%SQL_TRANSACTION_READ_UNCOMMITTED',
+            '%SQL_TRANSACTION_REPEATABLE_READ','%SQL_TRANSACTION_SERIALIZABLE','%SQL_TRANSLATE_DLL','%SQL_TRANSLATE_OPTION','%SQL_TRUE','%SQL_TXN_CAPABLE','%SQL_TXN_ISOLATION','%SQL_TXN_ISOLATION_OPTION',
+            '%SQL_TXN_READ_COMMITTED','%SQL_TXN_READ_UNCOMMITTED','%SQL_TXN_REPEATABLE_READ','%SQL_TXN_SERIALIZABLE','%SQL_TYPE_DATE','%SQL_TYPE_NULL','%SQL_TYPE_TIME','%SQL_TYPE_TIMESTAMP',
+            '%SQL_UB_DEFAULT','%SQL_UB_FIXED','%SQL_UB_OFF','%SQL_UB_ON','%SQL_UB_VARIABLE','%SQL_UNBIND','%SQL_UNICODE','%SQL_UNICODE_CHAR',
+            '%SQL_UNICODE_LONGVARCHAR','%SQL_UNICODE_VARCHAR','%SQL_UNION','%SQL_UNION_STATEMENT','%SQL_UNKNOWN_TYPE','%SQL_UNNAMED','%SQL_UNSEARCHABLE','%SQL_UNSIGNED_OFFSET',
+            '%SQL_UNSPECIFIED','%SQL_UPDATE','%SQL_UPDATE_BY_BOOKMARK','%SQL_USER_NAME','%SQL_USE_BOOKMARKS','%SQL_US_UNION','%SQL_US_UNION_ALL','%SQL_U_UNION',
+            '%SQL_U_UNION_ALL','%SQL_VARBINARY','%SQL_VARCHAR','%SQL_XOPEN_CLI_YEAR','%SQL_YEAR','%SQL_YEAR_TO_MONTH','%SRCCOPY','%SS_BITMAP',
+            '%SS_BLACKFRAME','%SS_BLACKRECT','%SS_CENTER','%SS_CENTERIMAGE','%SS_ENDELLIPSIS','%SS_ETCHEDFRAME','%SS_ETCHEDHORZ','%SS_ETCHEDVERT',
+            '%SS_GRAYFRAME','%SS_GRAYRECT','%SS_LEFT','%SS_NOPREFIX','%SS_NOTIFY','%SS_NOWORDWRAP','%SS_PATHELLIPSIS','%SS_RIGHT',
+            '%SS_RIGHTJUST','%SS_SIMPLE','%SS_SUNKEN','%SS_WHITEFRAME','%SS_WHITERECT','%SS_WORDELLIPSIS','%STAT_FILL_FROM_MEMORY','%STAT_FILL_NATURAL',
+            '%STAT_FILL_NATURAL_ERASTONE','%STAT_FILL_NATURAL_EVEN','%STAT_FILL_NATURAL_FIBONACCI','%STAT_FILL_NATURAL_ODD','%STAT_FILL_WITH_NUMBER','%STAT_MINMAX_INDEX','%STAT_MINMAX_VALUE','%STAT_TYPE_BYTE',
+            '%STAT_TYPE_CURRENCY','%STAT_TYPE_DOUBLE','%STAT_TYPE_DWORD','%STAT_TYPE_EXT','%STAT_TYPE_INTEGER','%STAT_TYPE_LONG','%STAT_TYPE_QUAD','%STAT_TYPE_SINGLE',
+            '%STAT_TYPE_WORD','%SWP_ASYNCWINDOWPOS','%SWP_DEFERERASE','%SWP_DRAWFRAME','%SWP_FRAMECHANGED','%SWP_HIDEWINDOW','%SWP_NOACTIVATE','%SWP_NOCOPYBITS',
+            '%SWP_NOMOVE','%SWP_NOOWNERZORDER','%SWP_NOREDRAW','%SWP_NOREPOSITION','%SWP_NOSENDCHANGING','%SWP_NOSIZE','%SWP_NOZORDER','%SWP_SHOWWINDOW',
+            '%SW_FORCEMINIMIZE','%SW_HIDE','%SW_MAXIMIZE','%SW_MINIMIZE','%SW_NORMAL','%SW_RESTORE','%SW_SHOW','%SW_SHOWDEFAULT',
+            '%SW_SHOWMAXIMIZED','%SW_SHOWMINIMIZED','%SW_SHOWMINNOACTIVE','%SW_SHOWNA','%SW_SHOWNOACTIVATE','%SW_SHOWNORMAL','%TBASS_3DALG_DEFAULT','%TBASS_3DALG_FULL',
+            '%TBASS_3DALG_LIGHT','%TBASS_3DALG_OFF','%TBASS_3DMODE_NORMAL','%TBASS_3DMODE_OFF','%TBASS_3DMODE_RELATIVE','%TBASS_ACTIVE_PAUSED','%TBASS_ACTIVE_PLAYING','%TBASS_ACTIVE_STALLED',
+            '%TBASS_ACTIVE_STOPPED','%TBASS_CONFIG_3DALGORITHM','%TBASS_CONFIG_BUFFER','%TBASS_CONFIG_CURVE_PAN','%TBASS_CONFIG_CURVE_VOL','%TBASS_CONFIG_FLOATDSP','%TBASS_CONFIG_GVOL_MUSIC','%TBASS_CONFIG_GVOL_SAMPLE',
+            '%TBASS_CONFIG_GVOL_STREAM','%TBASS_CONFIG_MAXVOL','%TBASS_CONFIG_MP3_CODEC','%TBASS_CONFIG_NET_AGENT','%TBASS_CONFIG_NET_BUFFER','%TBASS_CONFIG_NET_PASSIVE','%TBASS_CONFIG_NET_PREBUF','%TBASS_CONFIG_NET_PROXY',
+            '%TBASS_CONFIG_NET_TIMEOUT','%TBASS_CONFIG_PAUSE_NOPLAY','%TBASS_CONFIG_UPDATEPERIOD','%TBASS_CTYPE_MUSIC_IT','%TBASS_CTYPE_MUSIC_MO3','%TBASS_CTYPE_MUSIC_MOD','%TBASS_CTYPE_MUSIC_MTM','%TBASS_CTYPE_MUSIC_S3M',
+            '%TBASS_CTYPE_MUSIC_XM','%TBASS_CTYPE_RECORD','%TBASS_CTYPE_SAMPLE','%TBASS_CTYPE_STREAM','%TBASS_CTYPE_STREAM_AIFF','%TBASS_CTYPE_STREAM_MP1','%TBASS_CTYPE_STREAM_MP2','%TBASS_CTYPE_STREAM_MP3',
+            '%TBASS_CTYPE_STREAM_OGG','%TBASS_CTYPE_STREAM_WAV','%TBASS_CTYPE_STREAM_WAV_FLOAT','%TBASS_CTYPE_STREAM_WAV_PCM','%TBASS_DATA_AVAILABLE','%TBASS_DATA_FFT1024','%TBASS_DATA_FFT2048','%TBASS_DATA_FFT4096',
+            '%TBASS_DATA_FFT512','%TBASS_DATA_FFT_INDIVIDUAL','%TBASS_DATA_FFT_NOWINDOW','%TBASS_DATA_FLOAT','%TBASS_DEVICE_3D','%TBASS_DEVICE_8BITS','%TBASS_DEVICE_LATENCY','%TBASS_DEVICE_MONO',
+            '%TBASS_DEVICE_NOSPEAKER','%TBASS_DEVICE_SPEAKERS','%TBASS_EAX_ENVIRONMENT_ALLEY','%TBASS_EAX_ENVIRONMENT_ARENA','%TBASS_EAX_ENVIRONMENT_AUDITORIUM','%TBASS_EAX_ENVIRONMENT_BATHROOM','%TBASS_EAX_ENVIRONMENT_CARPETEDHALLWAY','%TBASS_EAX_ENVIRONMENT_CAVE',
+            '%TBASS_EAX_ENVIRONMENT_CITY','%TBASS_EAX_ENVIRONMENT_CONCERTHALL','%TBASS_EAX_ENVIRONMENT_COUNT','%TBASS_EAX_ENVIRONMENT_DIZZY','%TBASS_EAX_ENVIRONMENT_DRUGGED','%TBASS_EAX_ENVIRONMENT_FOREST','%TBASS_EAX_ENVIRONMENT_GENERIC','%TBASS_EAX_ENVIRONMENT_HALLWAY',
+            '%TBASS_EAX_ENVIRONMENT_HANGAR','%TBASS_EAX_ENVIRONMENT_LIVINGROOM','%TBASS_EAX_ENVIRONMENT_MOUNTAINS','%TBASS_EAX_ENVIRONMENT_PADDEDCELL','%TBASS_EAX_ENVIRONMENT_PARKINGLOT','%TBASS_EAX_ENVIRONMENT_PLAIN','%TBASS_EAX_ENVIRONMENT_PSYCHOTIC','%TBASS_EAX_ENVIRONMENT_QUARRY',
+            '%TBASS_EAX_ENVIRONMENT_ROOM','%TBASS_EAX_ENVIRONMENT_SEWERPIPE','%TBASS_EAX_ENVIRONMENT_STONECORRIDOR','%TBASS_EAX_ENVIRONMENT_STONEROOM','%TBASS_EAX_ENVIRONMENT_UNDERWATER','%TBASS_ERROR_ALREADY','%TBASS_ERROR_BUFLOST','%TBASS_ERROR_CODEC',
+            '%TBASS_ERROR_CREATE','%TBASS_ERROR_DECODE','%TBASS_ERROR_DEVICE','%TBASS_ERROR_DRIVER','%TBASS_ERROR_DX','%TBASS_ERROR_EMPTY','%TBASS_ERROR_FILEFORM','%TBASS_ERROR_FILEOPEN',
+            '%TBASS_ERROR_FORMAT','%TBASS_ERROR_FREQ','%TBASS_ERROR_HANDLE','%TBASS_ERROR_ILLPARAM','%TBASS_ERROR_ILLTYPE','%TBASS_ERROR_INIT','%TBASS_ERROR_MEM','%TBASS_ERROR_NO3D',
+            '%TBASS_ERROR_NOCHAN','%TBASS_ERROR_NOEAX','%TBASS_ERROR_NOFX','%TBASS_ERROR_NOHW','%TBASS_ERROR_NONET','%TBASS_ERROR_NOPAUSE','%TBASS_ERROR_NOPLAY','%TBASS_ERROR_NOTAVAIL',
+            '%TBASS_ERROR_NOTFILE','%TBASS_ERROR_PLAYING','%TBASS_ERROR_POSITION','%TBASS_ERROR_SPEAKER','%TBASS_ERROR_START','%TBASS_ERROR_TIMEOUT','%TBASS_ERROR_UNKNOWN','%TBASS_ERROR_VERSION',
+            '%TBASS_FALSE','%TBASS_FILEPOS_CURRENT','%TBASS_FILEPOS_DECODE','%TBASS_FILEPOS_DOWNLOAD','%TBASS_FILEPOS_END','%TBASS_FILEPOS_START','%TBASS_FILE_CLOSE','%TBASS_FILE_LEN',
+            '%TBASS_FILE_READ','%TBASS_FILE_SEEK','%TBASS_FX_CHORUS','%TBASS_FX_COMPRESSOR','%TBASS_FX_DISTORTION','%TBASS_FX_ECHO','%TBASS_FX_FLANGER','%TBASS_FX_GARGLE',
+            '%TBASS_FX_I3DL2REVERB','%TBASS_FX_PARAMEQ','%TBASS_FX_PHASE_180','%TBASS_FX_PHASE_90','%TBASS_FX_PHASE_NEG_180','%TBASS_FX_PHASE_NEG_90','%TBASS_FX_PHASE_ZERO','%TBASS_FX_REVERB',
+            '%TBASS_INPUT_LEVEL','%TBASS_INPUT_OFF','%TBASS_INPUT_ON','%TBASS_INPUT_TYPE_ANALOG','%TBASS_INPUT_TYPE_AUX','%TBASS_INPUT_TYPE_CD','%TBASS_INPUT_TYPE_DIGITAL','%TBASS_INPUT_TYPE_LINE',
+            '%TBASS_INPUT_TYPE_MASK','%TBASS_INPUT_TYPE_MIC','%TBASS_INPUT_TYPE_PHONE','%TBASS_INPUT_TYPE_SPEAKER','%TBASS_INPUT_TYPE_SYNTH','%TBASS_INPUT_TYPE_UNDEF','%TBASS_INPUT_TYPE_WAVE','%TBASS_MP3_SETPOS',
+            '%TBASS_MUSIC_3D','%TBASS_MUSIC_ATTRIB_AMPLIFY','%TBASS_MUSIC_ATTRIB_BPM','%TBASS_MUSIC_ATTRIB_PANSEP','%TBASS_MUSIC_ATTRIB_PSCALER','%TBASS_MUSIC_ATTRIB_SPEED','%TBASS_MUSIC_ATTRIB_VOL_CHAN','%TBASS_MUSIC_ATTRIB_VOL_GLOBAL',
+            '%TBASS_MUSIC_ATTRIB_VOL_INST','%TBASS_MUSIC_AUTOFREE','%TBASS_MUSIC_CALCLEN','%TBASS_MUSIC_DECODE','%TBASS_MUSIC_FLOAT','%TBASS_MUSIC_FT2MOD','%TBASS_MUSIC_FX','%TBASS_MUSIC_LOOP',
+            '%TBASS_MUSIC_MONO','%TBASS_MUSIC_NONINTER','%TBASS_MUSIC_NOSAMPLE','%TBASS_MUSIC_POSRESET','%TBASS_MUSIC_POSRESETEX','%TBASS_MUSIC_PRESCAN','%TBASS_MUSIC_PT1MOD','%TBASS_MUSIC_RAMP',
+            '%TBASS_MUSIC_RAMPS','%TBASS_MUSIC_STOPBACK','%TBASS_MUSIC_SURROUND','%TBASS_MUSIC_SURROUND2','%TBASS_OBJECT_DS','%TBASS_OBJECT_DS3DL','%TBASS_OK','%TBASS_RECORD_PAUSE',
+            '%TBASS_SAMPLE_3D','%TBASS_SAMPLE_8BITS','%TBASS_SAMPLE_FLOAT','%TBASS_SAMPLE_FX','%TBASS_SAMPLE_LOOP','%TBASS_SAMPLE_MONO','%TBASS_SAMPLE_MUTEMAX','%TBASS_SAMPLE_OVER_DIST',
+            '%TBASS_SAMPLE_OVER_POS','%TBASS_SAMPLE_OVER_VOL','%TBASS_SAMPLE_SOFTWARE','%TBASS_SAMPLE_VAM','%TBASS_SLIDE_FREQ','%TBASS_SLIDE_PAN','%TBASS_SLIDE_VOL','%TBASS_SPEAKER_CENLFE',
+            '%TBASS_SPEAKER_CENTER','%TBASS_SPEAKER_FRONT','%TBASS_SPEAKER_FRONTLEFT','%TBASS_SPEAKER_FRONTRIGHT','%TBASS_SPEAKER_LEFT','%TBASS_SPEAKER_LFE','%TBASS_SPEAKER_REAR','%TBASS_SPEAKER_REAR2',
+            '%TBASS_SPEAKER_REAR2LEFT','%TBASS_SPEAKER_REAR2RIGHT','%TBASS_SPEAKER_REARLEFT','%TBASS_SPEAKER_REARRIGHT','%TBASS_SPEAKER_RIGHT','%TBASS_STREAMPROC_END','%TBASS_STREAM_AUTOFREE','%TBASS_STREAM_BLOCK',
+            '%TBASS_STREAM_DECODE','%TBASS_STREAM_PRESCAN','%TBASS_STREAM_RESTRATE','%TBASS_STREAM_STATUS','%TBASS_SYNC_DOWNLOAD','%TBASS_SYNC_END','%TBASS_SYNC_FREE','%TBASS_SYNC_MESSAGE',
+            '%TBASS_SYNC_META','%TBASS_SYNC_MIXTIME','%TBASS_SYNC_MUSICFX','%TBASS_SYNC_MUSICINST','%TBASS_SYNC_MUSICPOS','%TBASS_SYNC_ONETIME','%TBASS_SYNC_POS','%TBASS_SYNC_SLIDE',
+            '%TBASS_SYNC_STALL','%TBASS_TAG_HTTP','%TBASS_TAG_ICY','%TBASS_TAG_ID3','%TBASS_TAG_ID3V2','%TBASS_TAG_META','%TBASS_TAG_MUSIC_INST','%TBASS_TAG_MUSIC_MESSAGE',
+            '%TBASS_TAG_MUSIC_NAME','%TBASS_TAG_MUSIC_SAMPLE','%TBASS_TAG_OGG','%TBASS_TAG_RIFF_INFO','%TBASS_TAG_VENDOR','%TBASS_TRUE','%TBASS_UNICODE','%TBASS_VAM_HARDWARE',
+            '%TBASS_VAM_SOFTWARE','%TBASS_VAM_TERM_DIST','%TBASS_VAM_TERM_PRIO','%TBASS_VAM_TERM_TIME','%TBASS_VERSION','%TBCD_CHANNEL','%TBCD_THUMB','%TBCD_TICS',
+            '%TBGL_ALIGN_CENTER','%TBGL_ALIGN_CENTER_CENTER','%TBGL_ALIGN_CENTER_DOWN','%TBGL_ALIGN_CENTER_UP','%TBGL_ALIGN_LEFT','%TBGL_ALIGN_LEFT_CENTER','%TBGL_ALIGN_LEFT_DOWN','%TBGL_ALIGN_LEFT_UP',
+            '%TBGL_ALIGN_RIGHT','%TBGL_ALIGN_RIGHT_CENTER','%TBGL_ALIGN_RIGHT_DOWN','%TBGL_ALIGN_RIGHT_UP','%TBGL_ALWAYS','%TBGL_EQUAL','%TBGL_ERROR_FILE','%TBGL_ERROR_MSGBOX',
+            '%TBGL_ERROR_NONE','%TBGL_GEQUAL','%TBGL_GREATER','%TBGL_LEQUAL','%TBGL_LESS','%TBGL_LIGHT_AMBIENT','%TBGL_LIGHT_CONSTANT_ATTENUATION','%TBGL_LIGHT_DIFFUSE',
+            '%TBGL_LIGHT_LINEAR_ATTENUATION','%TBGL_LIGHT_POSITION','%TBGL_LIGHT_QUADRATIC_ATTENUATION','%TBGL_LIGHT_SPECULAR','%TBGL_LIGHT_SPOT_CUTOFF','%TBGL_LIGHT_SPOT_DIRECTION','%TBGL_LIGHT_SPOT_EXPONENT','%TBGL_M15B',
+            '%TBGL_M15G','%TBGL_M15LAYER','%TBGL_M15PSTOP','%TBGL_M15R','%TBGL_M15TEXN','%TBGL_M15TEXX','%TBGL_M15TEXY','%TBGL_M15X',
+            '%TBGL_M15Y','%TBGL_M15Z','%TBGL_NEVER','%TBGL_NORMAL_NONE','%TBGL_NORMAL_PRECISE','%TBGL_NORMAL_SMOOTH','%TBGL_NOTEQUAL','%TBGL_OBJ_CUBE',
+            '%TBGL_OBJ_CUBE3','%TBGL_OBJ_CYLINDER','%TBGL_OBJ_SPHERE','%TBGL_PINFO_RGB','%TBGL_PINFO_XYZ','%TBGL_TEX_LINEAR','%TBGL_TEX_MIPMAP','%TBGL_TEX_NEAREST',
+            '%TBM_CLEARSEL','%TBM_CLEARTICS','%TBM_GETBUDDY','%TBM_GETCHANNELRECT','%TBM_GETLINESIZE','%TBM_GETNUMTICS','%TBM_GETPAGESIZE','%TBM_GETPOS',
+            '%TBM_GETPTICS','%TBM_GETRANGEMAX','%TBM_GETRANGEMIN','%TBM_GETSELEND','%TBM_GETSELSTART','%TBM_GETTHUMBLENGTH','%TBM_GETTHUMBRECT','%TBM_GETTIC',
+            '%TBM_GETTICPOS','%TBM_GETTOOLTIPS','%TBM_GETUNICODEFORMAT','%TBM_SETBUDDY','%TBM_SETLINESIZE','%TBM_SETPAGESIZE','%TBM_SETPOS','%TBM_SETRANGE',
+            '%TBM_SETRANGEMAX','%TBM_SETRANGEMIN','%TBM_SETSEL','%TBM_SETSELEND','%TBM_SETSELSTART','%TBM_SETTHUMBLENGTH','%TBM_SETTIC','%TBM_SETTICFREQ',
+            '%TBM_SETTIPSIDE','%TBM_SETTOOLTIPS','%TBM_SETUNICODEFORMAT','%TBS_AUTOTICKS','%TBS_BOTH','%TBS_BOTTOM','%TBS_DOWNISLEFT','%TBS_ENABLESELRANGE',
+            '%TBS_FIXEDLENGTH','%TBS_HORZ','%TBS_LEFT','%TBS_NOTHUMB','%TBS_NOTICKS','%TBS_REVERSED','%TBS_RIGHT','%TBS_TOOLTIPS',
+            '%TBS_TOP','%TBS_VERT','%TBTS_BOTTOM','%TBTS_LEFT','%TBTS_RIGHT','%TBTS_TOP','%TB_%VT_BSTR','%TB_%VT_CY',
+            '%TB_%VT_DATE','%TB_%VT_EMPTY','%TB_%VT_I2','%TB_%VT_I4','%TB_%VT_NULL','%TB_%VT_R4','%TB_%VT_R8','%TB_BOTTOM',
+            '%TB_CLASS_E_NOAGGREGATION','%TB_CO_E_CLASSSTRING','%TB_DISPATCH_METHOD','%TB_DISPATCH_PROPERTYGET','%TB_DISPATCH_PROPERTYPUT','%TB_DISPATCH_PROPERTYPUTREF','%TB_ENDTRACK','%TB_E_INVALIDARG',
+            '%TB_E_NOINTERFACE','%TB_E_OUTOFMEMORY','%TB_IMGCTX_ACTUALSIZE','%TB_IMGCTX_AUTOSIZE','%TB_IMGCTX_FITTOHEIGHT','%TB_IMGCTX_FITTOWIDTH','%TB_IMGCTX_STRETCH','%TB_LINEDOWN',
+            '%TB_LINEUP','%TB_MK_E_CONNECTMANUALLY','%TB_MK_E_EXCEEDEDDEADLINE','%TB_MK_E_INTERMEDIATEINTERFACENOTSUPPORTED','%TB_MK_E_NOOBJECT','%TB_MK_E_SYNTAX','%TB_PAGEDOWN','%TB_PAGEUP',
+            '%TB_REGDB_E_CLASSNOTREG','%TB_REGDB_E_WRITEREGDB','%TB_SIZEOF_TBVARIANT','%TB_S_FALSE','%TB_S_OK','%TB_THUMBPOSITION','%TB_THUMBTRACK','%TB_TOP',
+            '%TCM_FIRST','%TCM_GETCURSEL','%TCN_FOCUSCHANGE','%TCN_GETOBJECT','%TCN_SELCHANGE','%TCN_SELCHANGING','%TCS_BOTTOM','%TCS_BUTTONS',
+            '%TCS_EX_FLATSEPARATORS','%TCS_EX_REGISTERDROP','%TCS_FIXEDWIDTH','%TCS_FLATBUTTONS','%TCS_FOCUSNEVER','%TCS_FOCUSONBUTTONDOWN','%TCS_FORCEICONLEFT','%TCS_FORCELABELLEFT',
+            '%TCS_HOTTRACK','%TCS_MULTILINE','%TCS_MULTISELECT','%TCS_OWNERDRAWFIXED','%TCS_RAGGEDRIGHT','%TCS_RIGHT','%TCS_RIGHTJUSTIFY','%TCS_SCROLLOPPOSITE',
+            '%TCS_SINGLELINE','%TCS_TABS','%TCS_TOOLTIPS','%TCS_VERTICAL','%TM_PLAINTEXT','%TM_RICHTEXT','%TOKENIZER_DEFAULT_ALPHA','%TOKENIZER_DEFAULT_DELIM',
+            '%TOKENIZER_DEFAULT_DQUOTE','%TOKENIZER_DEFAULT_NEWLINE','%TOKENIZER_DEFAULT_NUMERIC','%TOKENIZER_DEFAULT_SPACE','%TOKENIZER_DELIMITER','%TOKENIZER_EOL','%TOKENIZER_ERROR','%TOKENIZER_FINISHED',
+            '%TOKENIZER_NUMBER','%TOKENIZER_QUOTE','%TOKENIZER_STRING','%TOKENIZER_UNDEFTOK','%TRUE','%TV_FIRST','%UDM_GETACCEL','%UDM_GETBASE',
+            '%UDM_GETBUDDY','%UDM_GETPOS','%UDM_GETPOS32','%UDM_GETRANGE','%UDM_GETRANGE32','%UDM_GETUNICODEFORMAT','%UDM_SETACCEL','%UDM_SETBASE',
+            '%UDM_SETBUDDY','%UDM_SETPOS','%UDM_SETPOS32','%UDM_SETRANGE','%UDM_SETRANGE32','%UDM_SETUNICODEFORMAT','%UDS_ALIGNLEFT','%UDS_ALIGNRIGHT',
+            '%UDS_ARROWKEYS','%UDS_AUTOBUDDY','%UDS_HORZ','%UDS_HOTTRACK','%UDS_NOTHOUSANDS','%UDS_SETBUDDYINT','%UDS_WRAP','%UD_MAXVAL',
+            '%UD_MINVAL','%VK_0','%VK_1','%VK_2','%VK_3','%VK_4','%VK_5','%VK_6',
+            '%VK_7','%VK_8','%VK_9','%VK_A','%VK_ACCEPT','%VK_ADD','%VK_APPS','%VK_B',
+            '%VK_BACK','%VK_C','%VK_CANCEL','%VK_CAPITAL','%VK_CLEAR','%VK_CONTROL','%VK_CONVERT','%VK_D',
+            '%VK_DECIMAL','%VK_DELETE','%VK_DIVIDE','%VK_DOWN','%VK_E','%VK_END','%VK_ESCAPE','%VK_EXECUTE',
+            '%VK_F','%VK_F1','%VK_F10','%VK_F11','%VK_F12','%VK_F13','%VK_F14','%VK_F15',
+            '%VK_F16','%VK_F17','%VK_F18','%VK_F19','%VK_F2','%VK_F20','%VK_F21','%VK_F22',
+            '%VK_F23','%VK_F24','%VK_F3','%VK_F4','%VK_F5','%VK_F6','%VK_F7','%VK_F8',
+            '%VK_F9','%VK_FINAL','%VK_G','%VK_H','%VK_HANGEUL','%VK_HANGUL','%VK_HANJA','%VK_HELP',
+            '%VK_HOME','%VK_I','%VK_INSERT','%VK_J','%VK_JUNJA','%VK_K','%VK_KANA','%VK_KANJI',
+            '%VK_L','%VK_LBUTTON','%VK_LEFT','%VK_LINEFEED','%VK_LWIN','%VK_M','%VK_MBUTTON','%VK_MENU',
+            '%VK_MODECHANGE','%VK_MULTIPLY','%VK_N','%VK_NEXT','%VK_NONCONVERT','%VK_NUMLOCK','%VK_NUMPAD0','%VK_NUMPAD1',
+            '%VK_NUMPAD2','%VK_NUMPAD3','%VK_NUMPAD4','%VK_NUMPAD5','%VK_NUMPAD6','%VK_NUMPAD7','%VK_NUMPAD8','%VK_NUMPAD9',
+            '%VK_O','%VK_P','%VK_PAUSE','%VK_PGDN','%VK_PGUP','%VK_PRINT','%VK_PRIOR','%VK_Q',
+            '%VK_R','%VK_RBUTTON','%VK_RETURN','%VK_RIGHT','%VK_RWIN','%VK_S','%VK_SCROLL','%VK_SELECT',
+            '%VK_SEPARATOR','%VK_SHIFT','%VK_SLEEP','%VK_SNAPSHOT','%VK_SPACE','%VK_SUBTRACT','%VK_T','%VK_TAB',
+            '%VK_U','%VK_UP','%VK_V','%VK_W','%VK_X','%VK_XBUTTON1','%VK_XBUTTON2','%VK_Y',
+            '%VK_Z','%VT_ARRAY','%VT_BLOB','%VT_BLOB_OBJECT','%VT_BOOL','%VT_BSTR','%VT_BYREF','%VT_CARRAY',
+            '%VT_CF','%VT_CLSID','%VT_CY','%VT_DATE','%VT_DISPATCH','%VT_EMPTY','%VT_ERROR','%VT_FILETIME',
+            '%VT_HRESULT','%VT_I1','%VT_I2','%VT_I4','%VT_I8','%VT_INT','%VT_LPSTR','%VT_LPWSTR',
+            '%VT_NULL','%VT_PTR','%VT_R4','%VT_R8','%VT_RECORD','%VT_RESERVED','%VT_SAFEARRAY','%VT_STORAGE',
+            '%VT_STORED_OBJECT','%VT_STREAM','%VT_STREAMED_OBJECT','%VT_UI1','%VT_UI2','%VT_UI4','%VT_UI8','%VT_UINT',
+            '%VT_UNKNOWN','%VT_USERDEFINED','%VT_VARIANT','%VT_VECTOR','%VT_VOID','%WAVE_FORMAT_1M08','%WAVE_FORMAT_1M16','%WAVE_FORMAT_1S08',
+            '%WAVE_FORMAT_1S16','%WAVE_FORMAT_2M08','%WAVE_FORMAT_2M16','%WAVE_FORMAT_2S08','%WAVE_FORMAT_2S16','%WAVE_FORMAT_4M08','%WAVE_FORMAT_4M16','%WAVE_FORMAT_4S08',
+            '%WAVE_FORMAT_4S16','%WBF_CUSTOM','%WBF_LEVEL1','%WBF_LEVEL2','%WBF_OVERFLOW','%WBF_WORDBREAK','%WBF_WORDWRAP','%WHITE',
+            '%WIN_FINDTITLECONTAIN','%WIN_FINDTITLEEND','%WIN_FINDTITLEEQUAL','%WIN_FINDTITLESTART','%WM_ACTIVATE','%WM_ACTIVATEAPP','%WM_CAPTURECHANGED','%WM_CHAR',
+            '%WM_CLOSE','%WM_COMMAND','%WM_DESTROY','%WM_DROPFILES','%WM_ERASEBKGND','%WM_GETTEXTLENGTH','%WM_HOTKEY','%WM_HSCROLL',
+            '%WM_IDLE','%WM_INITDIALOG','%WM_KEYDOWN','%WM_KEYUP','%WM_KILLFOCUS','%WM_LBUTTONDBLCLK','%WM_LBUTTONDOWN','%WM_LBUTTONUP',
+            '%WM_MBUTTONDBLCLK','%WM_MBUTTONDOWN','%WM_MBUTTONUP','%WM_MOUSEFIRST','%WM_MOUSEMOVE','%WM_MOUSEWHEEL','%WM_MOVE','%WM_MOVING',
+            '%WM_NCLBUTTONDOWN','%WM_NCRBUTTONDOWN','%WM_NEXTDLGCTL','%WM_NOTIFY','%WM_PAINT','%WM_QUIT','%WM_RBUTTONDBLCLK','%WM_RBUTTONDOWN',
+            '%WM_RBUTTONUP','%WM_SETFOCUS','%WM_SETFONT','%WM_SETTEXT','%WM_SIZE','%WM_SIZING','%WM_SYSCOMMAND','%WM_TIMER',
+            '%WM_USER','%WM_VSCROLL','%WS_BORDER','%WS_CAPTION','%WS_CHILD','%WS_CLIPCHILDREN','%WS_CLIPSIBLINGS','%WS_DISABLED',
+            '%WS_DLGFRAME','%WS_EX_ACCEPTFILES','%WS_EX_APPWINDOW','%WS_EX_CLIENTEDGE','%WS_EX_CONTEXTHELP','%WS_EX_CONTROLPARENT','%WS_EX_LAYERED','%WS_EX_LEFT',
+            '%WS_EX_LEFTSCROLLBAR','%WS_EX_LTRREADING','%WS_EX_MDICHILD','%WS_EX_NOPARENTNOTIFY','%WS_EX_OVERLAPPEDWINDOW','%WS_EX_PALETTEWINDOW','%WS_EX_RIGHT','%WS_EX_RIGHTSCROLLBAR',
+            '%WS_EX_RTLREADING','%WS_EX_STATICEDGE','%WS_EX_TOOLWINDOW','%WS_EX_TOPMOST','%WS_EX_TRANSPARENT','%WS_EX_WINDOWEDGE','%WS_GROUP','%WS_HSCROLL',
+            '%WS_ICONIC','%WS_MAXIMIZE','%WS_MAXIMIZEBOX','%WS_MINIMIZE','%WS_MINIMIZEBOX','%WS_OVERLAPPEDWINDOW','%WS_POPUP','%WS_POPUPWINDOW',
+            '%WS_SYSMENU','%WS_TABSTOP','%WS_THICKFRAME','%WS_VISIBLE','%WS_VSCROLL','%YELLOW','%ZERO','CRLF',
+            'FALSE','M_E','M_PI','NULL','TAB','TRUE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #993333; font-style: italic; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #333333;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #333333;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '_'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/tsql.php b/vendor/easybook/geshi/geshi/tsql.php
new file mode 100755
index 000000000..b4bf6bdad
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/tsql.php
@@ -0,0 +1,375 @@
+<?php
+/*************************************************************************************
+ * tsql.php
+ * --------
+ * Author: Duncan Lock (dunc@dflock.co.uk)
+ * Copyright: (c) 2006 Duncan Lock (http://dflock.co.uk/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/11/22
+ *
+ * T-SQL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/01/23 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/01/23)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'T-SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Datatypes
+            'bigint', 'tinyint', 'money',
+            'smallmoney', 'datetime', 'smalldatetime',
+            'text', 'nvarchar', 'ntext', 'varbinary', 'image',
+            'sql_variant', 'uniqueidentifier',
+
+            // Keywords
+            'ABSOLUTE', 'ACTION', 'ADD', 'ADMIN', 'AFTER', 'AGGREGATE', 'ALIAS', 'ALLOCATE', 'ALTER', 'ARE', 'ARRAY', 'AS',
+            'ASC', 'ASSERTION', 'AT', 'AUTHORIZATION', 'BACKUP', 'BEFORE', 'BEGIN', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'BOTH', 'BREADTH',
+            'BREAK', 'BROWSE', 'BULK', 'BY', 'CALL', 'CASCADE', 'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATCH', 'CHAR', 'CHARACTER', 'CHECK', 'CHECKPOINT',
+            'CLASS', 'CLOB', 'CLOSE', 'CLUSTERED', 'COALESCE', 'COLLATE', 'COLLATION', 'COLUMN', 'COMMIT', 'COMPLETION', 'COMPUTE', 'CONNECT',
+            'CONNECTION', 'CONSTRAINT', 'CONSTRAINTS', 'CONSTRUCTOR', 'CONTAINS', 'CONTAINSTABLE', 'CONTINUE', 'CONVERT', 'CORRESPONDING', 'CREATE',
+            'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH', 'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
+            'CURSOR', 'CYCLE', 'DATA', 'DATABASE', 'DATE', 'DAY', 'DBCC', 'DEALLOCATE', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', 'DEFERRABLE',
+            'DEFERRED', 'DELETE', 'DENY', 'DEPTH', 'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR', 'DETERMINISTIC',
+            'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISK', 'DISTINCT', 'DISTRIBUTED', 'DOMAIN', 'DOUBLE', 'DROP', 'DUMMY', 'DUMP', 'DYNAMIC',
+            'EACH', 'ELSE', 'END', 'END-EXEC', 'EQUALS', 'ERRLVL', 'ESCAPE', 'EVERY', 'EXCEPT', 'EXCEPTION', 'EXEC', 'EXECUTE', 'EXIT',
+            'EXTERNAL', 'FALSE', 'FETCH', 'FILE', 'FILLFACTOR', 'FIRST', 'FLOAT', 'FOR', 'FOREIGN', 'FOUND', 'FREE', 'FREETEXT', 'FREETEXTTABLE',
+            'FROM', 'FULL', 'FUNCTION', 'GENERAL', 'GET', 'GLOBAL', 'GOTO', 'GRANT', 'GROUP', 'GROUPING', 'HAVING', 'HOLDLOCK', 'HOST', 'HOUR',
+            'IDENTITY', 'IDENTITY_INSERT', 'IDENTITYCOL', 'IF', 'IGNORE', 'IMMEDIATE', 'INDEX', 'INDICATOR', 'INITIALIZE', 'INITIALLY',
+            'INNER', 'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ISOLATION', 'ITERATE', 'KEY',
+            'KILL', 'LANGUAGE', 'LARGE', 'LAST', 'LATERAL', 'LEADING', 'LEFT', 'LESS', 'LEVEL', 'LIMIT', 'LINENO', 'LOAD', 'LOCAL',
+            'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATOR', 'MAP', 'MATCH', 'MINUTE', 'MODIFIES', 'MODIFY', 'MODULE', 'MONTH', 'NAMES', 'NATIONAL',
+            'NATURAL', 'NCHAR', 'NCLOB', 'NEW', 'NEXT', 'NO', 'NOCHECK', 'NONCLUSTERED', 'NONE', 'NULLIF', 'NUMERIC', 'OBJECT', 'OF',
+            'OFF', 'OFFSETS', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPENDATASOURCE', 'OPENQUERY', 'OPENROWSET', 'OPENXML', 'OPERATION', 'OPTION',
+            'ORDER', 'ORDINALITY', 'OUT', 'OUTPUT', 'OVER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARTIAL', 'PATH', 'PERCENT', 'PLAN',
+            'POSTFIX', 'PRECISION', 'PREFIX', 'PREORDER', 'PREPARE', 'PRESERVE', 'PRIMARY', 'PRINT', 'PRIOR', 'PRIVILEGES', 'PROC', 'PROCEDURE',
+            'PUBLIC', 'RAISERROR', 'READ', 'READS', 'READTEXT', 'REAL', 'RECONFIGURE', 'RECURSIVE', 'REF', 'REFERENCES', 'REFERENCING', 'RELATIVE',
+            'REPLICATION', 'RESTORE', 'RESTRICT', 'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE', 'ROW',
+            'ROWGUIDCOL', 'ROWS', 'RULE', 'SAVE', 'SAVEPOINT', 'SCHEMA', 'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECTION', 'SELECT',
+            'SEQUENCE', 'SESSION', 'SESSION_USER', 'SET', 'SETS', 'SETUSER', 'SHUTDOWN', 'SIZE', 'SMALLINT', 'SPACE', 'SPECIFIC',
+            'SPECIFICTYPE', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STRUCTURE',
+            'SYSTEM_USER', 'TABLE', 'TEMPORARY', 'TERMINATE', 'TEXTSIZE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR', 'TIMEZONE_MINUTE',
+            'TO', 'TOP', 'TRAILING', 'TRAN', 'TRANSACTION', 'TRANSLATION', 'TREAT', 'TRIGGER', 'TRUE', 'TRUNCATE', 'TRY', 'TSEQUAL', 'UNDER', 'UNION',
+            'UNIQUE', 'UNKNOWN', 'UNNEST', 'UPDATE', 'UPDATETEXT', 'USAGE', 'USE', 'USER', 'USING', 'VALUE', 'VALUES', 'VARCHAR', 'VARIABLE',
+            'VARYING', 'VIEW', 'WAITFOR', 'WHEN', 'WHENEVER', 'WHERE', 'WHILE', 'WITH', 'WITHOUT', 'WORK', 'WRITE', 'WRITETEXT', 'YEAR', 'ZONE',
+            'UNCOMMITTED', 'NOCOUNT',
+            ),
+        2 => array(
+            /*
+                Built-in functions
+                Highlighted in pink.
+            */
+
+            //Configuration Functions
+            '@@DATEFIRST','@@OPTIONS','@@DBTS','@@REMSERVER','@@LANGID','@@SERVERNAME',
+            '@@LANGUAGE','@@SERVICENAME','@@LOCK_TIMEOUT','@@SPID','@@MAX_CONNECTIONS',
+            '@@TEXTSIZE','@@MAX_PRECISION','@@VERSION','@@NESTLEVEL',
+
+            //Cursor Functions
+            '@@CURSOR_ROWS','@@FETCH_STATUS',
+
+            //Date and Time Functions
+            'DATEADD','DATEDIFF','DATENAME','DATEPART','GETDATE','GETUTCDATE',
+
+            //Mathematical Functions
+            'ABS','DEGREES','RAND','ACOS','EXP','ROUND','ASIN','FLOOR','SIGN',
+            'ATAN','LOG','SIN','ATN2','LOG10','SQUARE','CEILING','PI','SQRT','COS',
+            'POWER','TAN','COT','RADIANS',
+
+            //Meta Data Functions
+            'COL_LENGTH','COL_NAME','FULLTEXTCATALOGPROPERTY',
+            'COLUMNPROPERTY','FULLTEXTSERVICEPROPERTY','DATABASEPROPERTY','INDEX_COL',
+            'DATABASEPROPERTYEX','INDEXKEY_PROPERTY','DB_ID','INDEXPROPERTY','DB_NAME',
+            'OBJECT_ID','FILE_ID','OBJECT_NAME','FILE_NAME','OBJECTPROPERTY','FILEGROUP_ID',
+            '@@PROCID','FILEGROUP_NAME','SQL_VARIANT_PROPERTY','FILEGROUPPROPERTY',
+            'TYPEPROPERTY','FILEPROPERTY',
+
+            //Security Functions
+            'IS_SRVROLEMEMBER','SUSER_SID','SUSER_SNAME','USER_ID',
+            'HAS_DBACCESS','IS_MEMBER',
+
+            //String Functions
+            'ASCII','SOUNDEX','PATINDEX','CHARINDEX','REPLACE','STR',
+            'DIFFERENCE','QUOTENAME','STUFF','REPLICATE','SUBSTRING','LEN',
+            'REVERSE','UNICODE','LOWER','UPPER','LTRIM','RTRIM',
+
+            //System Functions
+            'APP_NAME','COLLATIONPROPERTY','@@ERROR','FORMATMESSAGE',
+            'GETANSINULL','HOST_ID','HOST_NAME','IDENT_CURRENT','IDENT_INCR',
+            'IDENT_SEED','@@IDENTITY','ISDATE','ISNUMERIC','PARSENAME','PERMISSIONS',
+            '@@ROWCOUNT','ROWCOUNT_BIG','SCOPE_IDENTITY','SERVERPROPERTY','SESSIONPROPERTY',
+            'STATS_DATE','@@TRANCOUNT','USER_NAME',
+
+            //System Statistical Functions
+            '@@CONNECTIONS','@@PACK_RECEIVED','@@CPU_BUSY','@@PACK_SENT',
+            '@@TIMETICKS','@@IDLE','@@TOTAL_ERRORS','@@IO_BUSY',
+            '@@TOTAL_READ','@@PACKET_ERRORS','@@TOTAL_WRITE',
+
+            //Text and Image Functions
+            'TEXTPTR','TEXTVALID',
+
+            //Aggregate functions
+            'AVG', 'MAX', 'BINARY_CHECKSUM', 'MIN', 'CHECKSUM', 'SUM', 'CHECKSUM_AGG',
+            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'VARP'
+            ),
+        3 => array(
+            /*
+                System stored procedures
+                Higlighted dark brown
+            */
+
+            //Active Directory Procedures
+            'sp_ActiveDirectory_Obj', 'sp_ActiveDirectory_SCP',
+
+            //Catalog Procedures
+            'sp_column_privileges', 'sp_special_columns', 'sp_columns', 'sp_sproc_columns',
+            'sp_databases', 'sp_statistics', 'sp_fkeys', 'sp_stored_procedures', 'sp_pkeys',
+            'sp_table_privileges', 'sp_server_info', 'sp_tables',
+
+            //Cursor Procedures
+            'sp_cursor_list', 'sp_describe_cursor_columns', 'sp_describe_cursor', 'sp_describe_cursor_tables',
+
+            //Database Maintenance Plan Procedures
+            'sp_add_maintenance_plan', 'sp_delete_maintenance_plan_db', 'sp_add_maintenance_plan_db',
+            'sp_delete_maintenance_plan_job', 'sp_add_maintenance_plan_job', 'sp_help_maintenance_plan',
+            'sp_delete_maintenance_plan',
+
+            //Distributed Queries Procedures
+            'sp_addlinkedserver', 'sp_indexes', 'sp_addlinkedsrvlogin', 'sp_linkedservers', 'sp_catalogs',
+            'sp_primarykeys', 'sp_column_privileges_ex', 'sp_columns_ex',
+            'sp_table_privileges_ex', 'sp_tables_ex', 'sp_foreignkeys',
+
+            //Full-Text Search Procedures
+            'sp_fulltext_catalog', 'sp_help_fulltext_catalogs_cursor', 'sp_fulltext_column',
+            'sp_help_fulltext_columns', 'sp_fulltext_database', 'sp_help_fulltext_columns_cursor',
+            'sp_fulltext_service', 'sp_help_fulltext_tables', 'sp_fulltext_table',
+            'sp_help_fulltext_tables_cursor', 'sp_help_fulltext_catalogs',
+
+            //Log Shipping Procedures
+            'sp_add_log_shipping_database', 'sp_delete_log_shipping_database', 'sp_add_log_shipping_plan',
+            'sp_delete_log_shipping_plan', 'sp_add_log_shipping_plan_database',
+            'sp_delete_log_shipping_plan_database', 'sp_add_log_shipping_primary',
+            'sp_delete_log_shipping_primary', 'sp_add_log_shipping_secondary',
+            'sp_delete_log_shipping_secondary', 'sp_can_tlog_be_applied', 'sp_get_log_shipping_monitor_info',
+            'sp_change_monitor_role', 'sp_remove_log_shipping_monitor', 'sp_change_primary_role',
+            'sp_resolve_logins', 'sp_change_secondary_role', 'sp_update_log_shipping_monitor_info',
+            'sp_create_log_shipping_monitor_account', 'sp_update_log_shipping_plan',
+            'sp_define_log_shipping_monitor', 'sp_update_log_shipping_plan_database',
+
+            //OLE Automation Extended Stored Procedures
+            'sp_OACreate', 'sp_OAMethod', 'sp_OADestroy', 'sp_OASetProperty', 'sp_OAGetErrorInfo',
+            'sp_OAStop', 'sp_OAGetProperty',
+
+            //Replication Procedures
+            'sp_add_agent_parameter', 'sp_enableagentoffload', 'sp_add_agent_profile',
+            'sp_enumcustomresolvers', 'sp_addarticle', 'sp_enumdsn', 'sp_adddistpublisher',
+            'sp_enumfullsubscribers', 'sp_adddistributiondb', 'sp_expired_subscription_cleanup',
+            'sp_adddistributor', 'sp_generatefilters', 'sp_addmergealternatepublisher',
+            'sp_getagentoffloadinfo', 'sp_addmergearticle', 'sp_getmergedeletetype', 'sp_addmergefilter',
+            'sp_get_distributor', 'sp_addmergepublication', 'sp_getqueuedrows', 'sp_addmergepullsubscription',
+            'sp_getsubscriptiondtspackagename', 'sp_addmergepullsubscription_agent', 'sp_grant_publication_access',
+            'sp_addmergesubscription', 'sp_help_agent_default', 'sp_addpublication', 'sp_help_agent_parameter',
+            'sp_addpublication_snapshot', 'sp_help_agent_profile', 'sp_addpublisher70', 'sp_helparticle',
+            'sp_addpullsubscription', 'sp_helparticlecolumns', 'sp_addpullsubscription_agent', 'sp_helparticledts',
+            'sp_addscriptexec', 'sp_helpdistpublisher', 'sp_addsubscriber', 'sp_helpdistributiondb',
+            'sp_addsubscriber_schedule', 'sp_helpdistributor', 'sp_addsubscription', 'sp_helpmergealternatepublisher',
+            'sp_addsynctriggers', 'sp_helpmergearticle', 'sp_addtabletocontents', 'sp_helpmergearticlecolumn',
+            'sp_adjustpublisheridentityrange', 'sp_helpmergearticleconflicts', 'sp_article_validation',
+            'sp_helpmergeconflictrows', 'sp_articlecolumn', 'sp_helpmergedeleteconflictrows', 'sp_articlefilter',
+            'sp_helpmergefilter', 'sp_articlesynctranprocs', 'sp_helpmergepublication', 'sp_articleview',
+            'sp_helpmergepullsubscription', 'sp_attachsubscription', 'sp_helpmergesubscription', 'sp_browsesnapshotfolder',
+            'sp_helppublication', 'sp_browsemergesnapshotfolder', 'sp_help_publication_access', 'sp_browsereplcmds',
+            'sp_helppullsubscription', 'sp_change_agent_parameter', 'sp_helpreplfailovermode', 'sp_change_agent_profile',
+            'sp_helpreplicationdboption', 'sp_changearticle', 'sp_helpreplicationoption', 'sp_changedistpublisher',
+            'sp_helpsubscriberinfo', 'sp_changedistributiondb', 'sp_helpsubscription', 'sp_changedistributor_password',
+            'sp_ivindexhasnullcols', 'sp_changedistributor_property', 'sp_helpsubscription_properties', 'sp_changemergearticle',
+            'sp_link_publication', 'sp_changemergefilter', 'sp_marksubscriptionvalidation', 'sp_changemergepublication',
+            'sp_mergearticlecolumn', 'sp_changemergepullsubscription', 'sp_mergecleanupmetadata', 'sp_changemergesubscription',
+            'sp_mergedummyupdate', 'sp_changepublication', 'sp_mergesubscription_cleanup', 'sp_changesubscriber',
+            'sp_publication_validation', 'sp_changesubscriber_schedule', 'sp_refreshsubscriptions', 'sp_changesubscriptiondtsinfo',
+            'sp_reinitmergepullsubscription', 'sp_changesubstatus', 'sp_reinitmergesubscription', 'sp_change_subscription_properties',
+            'sp_reinitpullsubscription', 'sp_check_for_sync_trigger', 'sp_reinitsubscription', 'sp_copymergesnapshot',
+            'sp_removedbreplication', 'sp_copysnapshot', 'sp_repladdcolumn', 'sp_copysubscription', 'sp_replcmds',
+            'sp_deletemergeconflictrow', 'sp_replcounters', 'sp_disableagentoffload', 'sp_repldone', 'sp_drop_agent_parameter',
+            'sp_repldropcolumn', 'sp_drop_agent_profile', 'sp_replflush', 'sp_droparticle', 'sp_replicationdboption',
+            'sp_dropanonymouseagent', 'sp_replication_agent_checkup', 'sp_dropdistpublisher', 'sp_replqueuemonitor',
+            'sp_dropdistributiondb', 'sp_replsetoriginator', 'sp_dropmergealternatepublisher', 'sp_replshowcmds',
+            'sp_dropdistributor', 'sp_repltrans', 'sp_dropmergearticle', 'sp_restoredbreplication', 'sp_dropmergefilter',
+            'sp_revoke_publication_access', 'sp_scriptsubconflicttable', 'sp_dropmergepublication', 'sp_script_synctran_commands',
+            'sp_dropmergepullsubscription', 'sp_setreplfailovermode', 'sp_showrowreplicainfo', 'sp_dropmergesubscription',
+            'sp_subscription_cleanup', 'sp_droppublication', 'sp_table_validation', 'sp_droppullsubscription',
+            'sp_update_agent_profile', 'sp_dropsubscriber', 'sp_validatemergepublication', 'sp_dropsubscription',
+            'sp_validatemergesubscription', 'sp_dsninfo', 'sp_vupgrade_replication', 'sp_dumpparamcmd',
+
+            //Security Procedures
+            'sp_addalias', 'sp_droprolemember', 'sp_addapprole', 'sp_dropserver', 'sp_addgroup', 'sp_dropsrvrolemember',
+            'sp_dropuser', 'sp_addlogin', 'sp_grantdbaccess', 'sp_addremotelogin',
+            'sp_grantlogin', 'sp_addrole', 'sp_helpdbfixedrole', 'sp_addrolemember', 'sp_helpgroup',
+            'sp_addserver', 'sp_helplinkedsrvlogin', 'sp_addsrvrolemember', 'sp_helplogins', 'sp_adduser',
+            'sp_helpntgroup', 'sp_approlepassword', 'sp_helpremotelogin', 'sp_changedbowner', 'sp_helprole',
+            'sp_changegroup', 'sp_helprolemember', 'sp_changeobjectowner', 'sp_helprotect', 'sp_change_users_login',
+            'sp_helpsrvrole', 'sp_dbfixedrolepermission', 'sp_helpsrvrolemember', 'sp_defaultdb', 'sp_helpuser',
+            'sp_defaultlanguage', 'sp_MShasdbaccess', 'sp_denylogin', 'sp_password', 'sp_dropalias', 'sp_remoteoption',
+            'sp_dropapprole', 'sp_revokedbaccess', 'sp_dropgroup', 'sp_revokelogin', 'sp_droplinkedsrvlogin',
+            'sp_setapprole', 'sp_droplogin', 'sp_srvrolepermission', 'sp_dropremotelogin', 'sp_validatelogins', 'sp_droprole',
+
+            //SQL Mail Procedures
+            'sp_processmail', 'xp_sendmail', 'xp_deletemail', 'xp_startmail', 'xp_findnextmsg', 'xp_stopmail', 'xp_readmail',
+
+            //SQL Profiler Procedures
+            'sp_trace_create', 'sp_trace_setfilter', 'sp_trace_generateevent', 'sp_trace_setstatus', 'sp_trace_setevent',
+
+            //SQL Server Agent Procedures
+            'sp_add_alert', 'sp_help_jobhistory', 'sp_add_category', 'sp_help_jobschedule', 'sp_add_job',
+            'sp_help_jobserver', 'sp_add_jobschedule', 'sp_help_jobstep', 'sp_add_jobserver', 'sp_help_notification',
+            'sp_add_jobstep', 'sp_help_operator', 'sp_add_notification', 'sp_help_targetserver',
+            'sp_add_operator', 'sp_help_targetservergroup', 'sp_add_targetservergroup', 'sp_helptask',
+            'sp_add_targetsvrgrp_member', 'sp_manage_jobs_by_login', 'sp_addtask', 'sp_msx_defect',
+            'sp_apply_job_to_targets', 'sp_msx_enlist', 'sp_delete_alert', 'sp_post_msx_operation',
+            'sp_delete_category', 'sp_purgehistory', 'sp_delete_job', 'sp_purge_jobhistory', 'sp_delete_jobschedule',
+            'sp_reassigntask', 'sp_delete_jobserver', 'sp_remove_job_from_targets', 'sp_delete_jobstep',
+            'sp_resync_targetserver', 'sp_delete_notification', 'sp_start_job', 'sp_delete_operator',
+            'sp_stop_job', 'sp_delete_targetserver', 'sp_update_alert', 'sp_delete_targetservergroup',
+            'sp_update_category', 'sp_delete_targetsvrgrp_member', 'sp_update_job', 'sp_droptask',
+            'sp_update_jobschedule', 'sp_help_alert', 'sp_update_jobstep', 'sp_help_category',
+            'sp_update_notification', 'sp_help_downloadlist', 'sp_update_operator', 'sp_helphistory',
+            'sp_update_targetservergroup', 'sp_help_job', 'sp_updatetask', 'xp_sqlagent_proxy_account',
+
+            //System Procedures
+            'sp_add_data_file_recover_suspect_db', 'sp_helpconstraint', 'sp_addextendedproc',
+            'sp_helpdb', 'sp_addextendedproperty', 'sp_helpdevice', 'sp_add_log_file_recover_suspect_db',
+            'sp_helpextendedproc', 'sp_addmessage', 'sp_helpfile', 'sp_addtype', 'sp_helpfilegroup',
+            'sp_addumpdevice', 'sp_helpindex', 'sp_altermessage', 'sp_helplanguage', 'sp_autostats',
+            'sp_helpserver', 'sp_attach_db', 'sp_helpsort', 'sp_attach_single_file_db', 'sp_helpstats',
+            'sp_bindefault', 'sp_helptext', 'sp_bindrule', 'sp_helptrigger', 'sp_bindsession',
+            'sp_indexoption', 'sp_certify_removable', 'sp_invalidate_textptr', 'sp_configure',
+            'sp_lock', 'sp_create_removable', 'sp_monitor', 'sp_createstats', 'sp_procoption',
+            'sp_cycle_errorlog', 'sp_recompile', 'sp_datatype_info', 'sp_refreshview', 'sp_dbcmptlevel',
+            'sp_releaseapplock', 'sp_dboption', 'sp_rename', 'sp_dbremove', 'sp_renamedb',
+            'sp_delete_backuphistory', 'sp_resetstatus', 'sp_depends', 'sp_serveroption', 'sp_detach_db',
+            'sp_setnetname', 'sp_dropdevice', 'sp_settriggerorder', 'sp_dropextendedproc', 'sp_spaceused',
+            'sp_dropextendedproperty', 'sp_tableoption', 'sp_dropmessage', 'sp_unbindefault', 'sp_droptype',
+            'sp_unbindrule', 'sp_executesql', 'sp_updateextendedproperty', 'sp_getapplock', 'sp_updatestats',
+            'sp_getbindtoken', 'sp_validname', 'sp_help', 'sp_who',
+
+            //Web Assistant Procedures
+            'sp_dropwebtask', 'sp_makewebtask', 'sp_enumcodepages', 'sp_runwebtask',
+
+            //XML Procedures
+            'sp_xml_preparedocument', 'sp_xml_removedocument',
+
+            //General Extended Procedures
+            'xp_cmdshellxp_logininfo', 'xp_enumgroups', 'xp_msver', 'xp_findnextmsgxp_revokelogin',
+            'xp_grantlogin', 'xp_sprintf', 'xp_logevent', 'xp_sqlmaint', 'xp_loginconfig', 'xp_sscanf',
+
+            //API System Stored Procedures
+            'sp_cursor', 'sp_cursorclose', 'sp_cursorexecute', 'sp_cursorfetch', 'sp_cursoropen',
+            'sp_cursoroption', 'sp_cursorprepare', 'sp_cursorunprepare', 'sp_execute', 'sp_prepare', 'sp_unprepare',
+
+            //Misc
+            'sp_createorphan', 'sp_droporphans', 'sp_reset_connection', 'sp_sdidebug'
+            ),
+        4 => array(
+            //Function/sp's higlighted brown.
+            'fn_helpcollations', 'fn_listextendedproperty ', 'fn_servershareddrives',
+            'fn_trace_geteventinfo', 'fn_trace_getfilterinfo', 'fn_trace_getinfo',
+            'fn_trace_gettable', 'fn_virtualfilestats','fn_listextendedproperty',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '!', '!=', '%', '&', '&&', '(', ')', '*', '+', '-', '/', '<', '<<', '<=',
+        '<=>', '<>', '=', '>', '>=', '>>', '^', 'ALL', 'AND', 'ANY', 'BETWEEN', 'CROSS',
+        'EXISTS', 'IN', 'JOIN', 'LIKE', 'NOT', 'NULL', 'OR', 'OUTER', 'SOME', '|', '||', '~'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #FF00FF;',
+            3 => 'color: #AF0000;',
+            4 => 'color: #AF0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080;',
+            'MULTI' => 'color: #008080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #808080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/twig.php b/vendor/easybook/geshi/geshi/twig.php
new file mode 100644
index 000000000..cc790532c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/twig.php
@@ -0,0 +1,190 @@
+<?php
+/*************************************************************************************
+ * twig.php
+ * ----------
+ * Author: Keyvan Akbary (keyvan@kiwwito.com)
+ * Copyright: (c) 2011 Keyvan Akbary (http://www.kiwwito.com/)
+ * Release Version: 1.0.0
+ * Date Started: 2011/12/05
+ *
+ * Twig template language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/09/28 (1.9.0 by José Andrés Puertas y Javier Eguiluz)
+ *   - Added new tags, filters and functions
+ *   - Added regexps for variables, objects and properties
+ *   - Lots of other minor tweaks (delimites, comments, ...)
+ * 
+ * 2011/12/05 (1.0.0 by Keyvan Akbary)
+ *   -  Initial Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Twig',
+    'COMMENT_SINGLE' => array('{#' => '#}'),
+    'COMMENT_MULTI' => array('{#' => '#}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //TWIG
+        //Tags
+        1 => array(
+            'autoescape', 'endautoescape', 'block', 'endblock', 'do', 'embed', 'endembed',
+            'extends', 'filter', 'endfilter', 'for', 'endfor', 'from', 'if', 'else', 'elseif', 'endif',
+            'import', 'include', 'macro', 'endmacro', 'raw', 'endraw', 'sandbox', 'set', 'endset',
+            'spaceless', 'endspaceless', 'use', 'verbatim', 'endverbatim',
+            'trans', 'endtrans', 'transchoice', 'endtranschoice'
+        ),
+        //Filters
+        2 => array(
+            'abs', 'batch', 'capitalize', 'convert_encoding', 'date', 'date_modify', 'default',
+            'escape', 'first', 'format', 'join', 'json_encode', 'keys', 'last', 'length', 'lower',
+            'merge', 'nl2br', 'number_format', 'raw', 'replace', 'reverse', 'slice', 'sort', 'split',
+            'striptags', 'title', 'trans', 'trim', 'upper', 'url_encode'
+        ),
+        //Functions
+        3 => array(
+            'attribute', 'block', 'constant', 'cycle', 'date', 'dump', 'include',
+            'parent', 'random', 'range', 'source', 'template_from_string'
+        ),
+        //Tests
+        4 => array(
+            'constant', 'defined', 'divisibleby', 'empty', 'even', 'iterable', 'null',
+            'odd', 'sameas'
+        ),
+        //Operators
+        5 => array(
+            'in', 'is', 'and', 'b-and', 'or', 'b-or', 'b-xor', 'not', 'into',
+            'starts with', 'ends with', 'matches'
+        ),
+        6 => array(
+            '{{', '}}', '{%', '%}'
+        ),
+    ),
+    'SYMBOLS' => array(
+        '+', '-', '/', '/', '*', '**', //Math operators
+        '==', '!=', '<', '>', '>=', '<=', '===', //Logic operators
+        '..', '|', '~', '[', ']', '.', '?', ':', '(', ')', //Other
+        '=' //HTML (attributes)
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        //Twig
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => false
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;', //Tags
+            2 => 'color: #008000;', //Filters
+            3 => 'color: #0600FF;', //Functions
+            4 => 'color: #804040;', //Tests
+            5 => 'color: #008000;', //Operators
+            6 => 'color: #008000;'  // {{ and {%
+        ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #008080; font-style: italic;'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #D36900;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+        ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #D36900;'
+        ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009000;'
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #00aaff;',
+            1 => 'color: #00aaff;'
+        )
+    ),
+    'URLS' => array(
+        1 => 'http://twig.sensiolabs.org/doc/tags/{FNAMEL}.html',
+        2 => 'http://twig.sensiolabs.org/doc/filters/{FNAMEL}.html',
+        3 => 'http://twig.sensiolabs.org/doc/functions/{FNAMEL}.html',
+        4 => 'http://twig.sensiolabs.org/doc/tests/{FNAMEL}.html',
+        5 => '',
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([[:space:]])([a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => "\.([a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '.\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '{{' => '}}',
+            '{%' => '%}'         
+        ),
+        1 => array(
+            '{#' => '#}',          
+        )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true
+    ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/typoscript.php b/vendor/easybook/geshi/geshi/typoscript.php
new file mode 100755
index 000000000..25671d728
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/typoscript.php
@@ -0,0 +1,298 @@
+<?php
+/*************************************************************************************
+ * typoscript.php
+ * --------
+ * Author: Jan-Philipp Halle (typo3@jphalle.de)
+ * Copyright: (c) 2005 Jan-Philipp Halle (http://www.jphalle.de/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/07/29
+ *
+ * TypoScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ * - Michiel Roos <geshi@typofree.org> Complete rewrite
+ * 2005/07/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * <things-to-do>
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'TypoScript',
+    'COMMENT_SINGLE' => array(1  => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => '/(?<!(#|\'|"))(?:#(?!(?:[a-fA-F0-9]{6}|[a-fA-F0-9]{3}))[^\n#]+|#{2}[^\n#]+|#{7,999}[^\n]+)/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        // Conditions: http://documentation.typo3.org/documentation/tsref/conditions/
+        1 => array(
+            'browser', 'compatVersion', 'dayofmonth', 'dayofweek', 'device',
+            'globalString', 'globalVars', 'hostname', 'hour',
+            'ip', 'language', 'loginUser', 'loginuser', 'minute',
+            'month', 'PIDinRootline', 'PIDupinRootline',
+            'system', 'treelevel', 'useragent', 'userFunc',
+            'usergroup', 'version'
+            ),
+
+        // Functions: http://documentation.typo3.org/documentation/tsref/functions/
+        2 => array(
+            'addParams', 'encapsLines', 'filelink', 'HTMLparser',
+            'HTMLparser_tags', 'if', 'imageLinkWrap',
+            'imgResource', 'makelinks', 'numRows', 'parseFunc',
+            'select', 'split', 'stdWrap', 'tableStyle', 'tags',
+            'textStyle', 'typolink'
+            ),
+
+        // Toplevel objects: http://documentation.typo3.org/documentation/tsref/tlo-objects/
+        3 => array(
+            'CARRAY', 'CONFIG', 'CONSTANTS', 'FE_DATA', 'FE_TABLE', 'FRAME',
+            'FRAMESET', 'META', 'PAGE', 'plugin'
+            ),
+
+        // Content Objects (cObject) : http://documentation.typo3.org/documentation/tsref/cobjects/
+        4 => array(
+            'CASE', 'CLEARGIF', 'COA', 'COA_INT', 'COBJ_ARRAY', 'COLUMNS',
+            'CONTENT', 'CTABLE', 'EDITPANEL', 'FILE', 'FORM',
+            'HMENU', 'HRULER', 'HTML', 'IMAGE', 'IMGTEXT',
+            'IMG_RESOURCE', 'LOAD_REGISTER', 'MULTIMEDIA',
+            'OTABLE', 'PHP_SCRIPT', 'PHP_SCRIPT_EXT',
+            'PHP_SCRIPT_INT', 'RECORDS', 'RESTORE_REGISTER',
+            'SEARCHRESULT', 'TEMPLATE', 'TEXT', 'USER',
+            'USER_INT'
+            ),
+
+        // GIFBUILDER toplevel link: http://documentation.typo3.org/documentation/tsref/gifbuilder/
+        5 => array(
+            'GIFBUILDER',
+            ),
+
+        // GIFBUILDER: http://documentation.typo3.org/documentation/tsref/gifbuilder/
+        // skipped fields: IMAGE, TEXT
+        // NOTE! the IMAGE and TEXT field already are linked in group 4, they
+        // cannot be linked twice . . . . unfortunately
+        6 => array(
+            'ADJUST', 'BOX', 'CROP', 'EFFECT', 'EMBOSS',
+            'IMGMAP', 'OUTLINE', 'SCALE', 'SHADOW',
+            'WORKAREA'
+            ),
+
+        // MENU Objects: http://documentation.typo3.org/documentation/tsref/menu/
+        7 => array(
+            'GMENU', 'GMENU_FOLDOUT', 'GMENU_LAYERS', 'IMGMENU',
+            'IMGMENUITEM', 'JSMENU', 'JSMENUITEM', 'TMENU',
+            'TMENUITEM', 'TMENU_LAYERS'
+            ),
+
+        // MENU common properties: http://documentation.typo3.org/documentation/tsref/menu/common-properties/
+        8 => array(
+            'alternativeSortingField', 'begin', 'debugItemConf',
+            'imgNameNotRandom', 'imgNamePrefix',
+            'itemArrayProcFunc', 'JSWindow', 'maxItems',
+            'minItems', 'overrideId', 'sectionIndex',
+            'showAccessRestrictedPages', 'submenuObjSuffixes'
+            ),
+
+        // MENU item states: http://documentation.typo3.org/documentation/tsref/menu/item-states/
+        9 => array(
+            'ACT', 'ACTIFSUB', 'ACTIFSUBRO', 'ACTRO', 'CUR', 'CURIFSUB',
+            'CURIFSUBRO', 'CURRO', 'IFSUB', 'IFSUBRO', 'NO',
+            'SPC', 'USERDEF1', 'USERDEF1RO', 'USERDEF2',
+            'USERDEF2RO', 'USR', 'USRRO'
+            ),
+        ),
+
+    // Does not include '-' because of stuff like htmlTag_langKey = en-GB and
+    // lib.nav-sub
+    'SYMBOLS' => array(
+        0 => array(
+            '|',
+            '+', '*', '/', '%',
+            '!', '&&', '^',
+            '<', '>', '=',
+            '?', ':',
+            '.'
+            ),
+        1 => array(
+            '(', ')', '{', '}', '[', ']'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ed7d14;',
+            2 => 'font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;',
+            4 => 'color: #990000; font-weight: bold;',
+            5 => 'color: #990000; font-weight: bold;',
+            6 => 'color: #990000; font-weight: bold;',
+            7 => 'color: #990000; font-weight: bold;',
+            8 => 'font-weight: bold;',
+            9 => 'color: #990000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #aaa; font-style: italic;',
+            2 => 'color: #aaa; font-style: italic;',
+            'MULTI' => 'color: #aaa; font-style: italic;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ac14aa;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000e0; font-weight: bold;',
+            2 => 'color: #0000e0; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933; font-weight: bold;',
+                // Set this to the same value as brackets above
+            1 => 'color: #009900; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #009900;',
+            1 => 'color: #009900; font-weight: bold;',
+            2 => 'color: #3366CC;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #ed7d14;',
+            5 => 'color: #000066; font-weight: bold;',
+            6 => 'color: #009900;',
+            7 => 'color: #3366CC;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://documentation.typo3.org/documentation/tsref/conditions/{FNAME}/',
+        2 => 'http://documentation.typo3.org/documentation/tsref/functions/{FNAME}/',
+        3 => 'http://documentation.typo3.org/documentation/tsref/tlo-objects/{FNAME}/',
+        4 => 'http://documentation.typo3.org/documentation/tsref/cobjects/{FNAME}/',
+        5 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/',
+        6 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/{FNAME}/',
+        7 => 'http://documentation.typo3.org/documentation/tsref/menu/{FNAME}/',
+        8 => 'http://documentation.typo3.org/documentation/tsref/menu/common-properties/',
+        9 => 'http://documentation.typo3.org/documentation/tsref/menu/item-states/'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+            // xhtml tag
+        2 => array(
+            GESHI_SEARCH => '(&lt;)([a-zA-Z\\/][^\\/\\|]*?)(&gt;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+
+            // Constant
+        0 => array(
+            GESHI_SEARCH => '(\{)(\$[a-zA-Z_\.]+[a-zA-Z0-9_\.]*)(\})',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+
+            // Constant dollar sign
+        1 => array(
+            GESHI_SEARCH => '(\$)([a-zA-Z_\.]+[a-zA-Z0-9_\.]*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+
+            // extension keys / tables: (static|user|ttx|tx|tt|fe)_something[_something]
+        3 => array(
+            GESHI_SEARCH => '(plugin\.|[^\.]\b)((?:static|user|ttx|tx|tt|fe)(?:_[0-9A-Za-z_]+?)\b)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // conditions and controls
+        4 => array(
+            GESHI_SEARCH => '(\[)(globalVar|global|end)\b',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // lowlevel setup and constant objects
+        5 => array(
+            GESHI_SEARCH => '([^\.\$-\{]\b)(cObj|field|config|content|file|frameset|includeLibs|lib|page|plugin|register|resources|sitemap|sitetitle|styles|temp|tt_content|tt_news|types|xmlnews)\b',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // markers
+        6 => array(
+            GESHI_SEARCH => '(###[^#]+###)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+
+            // hex color codes
+        7 => array(
+            GESHI_SEARCH => '(#[a-fA-F0-9]{6}\b|#[a-fA-F0-9]{3}\b)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+);
diff --git a/vendor/easybook/geshi/geshi/unicon.php b/vendor/easybook/geshi/geshi/unicon.php
new file mode 100755
index 000000000..6fe62d0fb
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/unicon.php
@@ -0,0 +1,210 @@
+<?php
+/*************************************************************************************
+ * unicon.php
+ * --------
+ * Author: Matt Oates (mattoates@gmail.com)
+ * Copyright: (c) 2010 Matt Oates (http://mattoates.co.uk)
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/04/20
+ *
+ * Unicon the Unified Extended Dialect of Icon language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2010/04/24 (0.0.0.2)
+ *  -  Validated with Geshi langcheck.php FAILED due to preprocessor keywords looking like symbols
+ *  -  Hard wrapped to improve readability
+ * 2010/04/20 (0.0.0.1)
+ *  -  First Release
+ *
+ * TODO (updated 2010/04/20)
+ * -------------------------
+ * - Do the &amp; need replacing with &?
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Unicon (Unified Extended Dialect of Icon)',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'class', 'continue', 'create', 'default', 'do',
+            'else', 'end', 'every', 'fail', 'for', 'if', 'import', 'initial', 'initially',
+            'invocable', 'link', 'method', 'next', 'not', 'of', 'package', 'procedure', 'record',
+            'repeat', 'return', 'switch', 'suspend', 'then', 'to', 'until', 'while'
+            ),
+        2 => array(
+            'global', 'local', 'static'
+            ),
+        3 => array(
+            'allocated', 'ascii', 'clock', 'collections',
+            'column', 'cset', 'current', 'date', 'dateline', 'digits',
+            'dump', 'e', 'error', 'errornumber', 'errortext',
+            'errorvalue', 'errout', 'eventcode', 'eventsource', 'eventvalue',
+            'fail', 'features', 'file', 'host', 'input', 'lcase',
+            'letters', 'level', 'line', 'main', 'now', 'null',
+            'output', 'phi', 'pi', 'pos', 'progname', 'random',
+            'regions', 'source', 'storage', 'subject', 'syserr', 'time',
+            'trace', 'ucase', 'version', 'col', 'control', 'interval',
+            'ldrag', 'lpress', 'lrelease', 'mdrag', 'meta', 'mpress',
+            'mrelease', 'rdrag', 'resize', 'row', 'rpress', 'rrelease',
+            'shift', 'window', 'x', 'y'
+            ),
+        4 => array(
+            'abs', 'acos', 'any', 'args', 'asin', 'atan', 'bal', 'center', 'char',
+            'chmod', 'close', 'cofail', 'collect', 'copy', 'cos', 'cset', 'ctime', 'dbcolumns',
+            'dbdriver', 'dbkeys', 'dblimits', 'dbproduction', 'dbtables', 'delay', 'delete', 'detab',
+            'display', 'dtor', 'entab', 'errorclear', 'event', 'eventmask', 'EvGet', 'exit', 'exp',
+            'fetch', 'fieldnames', 'find', 'flock', 'flush', 'function', 'get', 'getch', 'getche',
+            'getenv', 'gettimeofday', 'globalnames', 'gtime', 'iand', 'icom', 'image', 'insert',
+            'integer', 'ior', 'ishift', 'ixor', 'key', 'left', 'list', 'load', 'loadfunc',
+            'localnames', 'log', 'many', 'map', 'match', 'member', 'mkdir', 'move', 'name', 'numeric',
+            'open', 'opmask', 'ord', 'paramnames', 'parent', 'pipe', 'pop', 'pos', 'proc', 'pull',
+            'push', 'put', 'read', 'reads', 'real', 'receive', 'remove', 'rename', 'repl', 'reverse',
+            'right', 'rmdir', 'rtod', 'runerr', 'seek', 'select', 'send', 'seq', 'serial', 'set',
+            'setenv', 'sort', 'sortf', 'sql', 'sqrt', 'stat', 'staticnames', 'stop', 'string', 'system', 'tab',
+            'table', 'tan', 'trap', 'trim', 'truncate', 'type', 'upto', 'utime', 'variable', 'where',
+            'write', 'writes'
+            ),
+        5 => array(
+            'Active', 'Alert', 'Bg', 'Clip', 'Clone', 'Color', 'ColorValue',
+            'CopyArea', 'Couple', 'DrawArc', 'DrawCircle', 'DrawCurve', 'DrawCylinder', 'DrawDisk',
+            'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon', 'DrawRectangle', 'DrawSegment',
+            'DrawSphere', 'DrawString', 'DrawTorus', 'EraseArea', 'Event', 'Fg', 'FillArc',
+            'FillCircle', 'FillPolygon', 'FillRectangle', 'Font', 'FreeColor', 'GotoRC', 'GotoXY',
+            'IdentifyMatrix', 'Lower', 'MatrixMode', 'NewColor', 'PaletteChars', 'PaletteColor',
+            'PaletteKey', 'Pattern', 'Pending', 'Pixel', 'PopMatrix', 'PushMatrix', 'PushRotate',
+            'PushScale', 'PushTranslate', 'QueryPointer', 'Raise', 'ReadImage', 'Refresh', 'Rotate',
+            'Scale', 'Texcoord', 'TextWidth', 'Texture', 'Translate', 'Uncouple', 'WAttrib',
+            'WDefault', 'WFlush', 'WindowContents', 'WriteImage', 'WSync'
+            ),
+        6 => array(
+            'define', 'include', 'ifdef', 'ifndef', 'else', 'endif', 'error',
+            'line', 'undef'
+            ),
+        7 => array(
+            '_V9', '_AMIGA', '_ACORN', '_CMS', '_MACINTOSH', '_MSDOS_386',
+            '_MS_WINDOWS_NT', '_MSDOS', '_MVS', '_OS2', '_POR', 'T', '_UNIX', '_POSIX', '_DBM',
+            '_VMS', '_ASCII', '_EBCDIC', '_CO_EXPRESSIONS', '_CONSOLE_WINDOW', '_DYNAMIC_LOADING',
+            '_EVENT_MONITOR', '_EXTERNAL_FUNCTIONS', '_KEYBOARD_FUNCTIONS', '_LARGE_INTEGERS',
+            '_MULTITASKING', '_PIPES', '_RECORD_IO', '_SYSTEM_FUNCTION', '_MESSAGING', '_GRAPHICS',
+            '_X_WINDOW_SYSTEM', '_MS_WINDOWS', '_WIN32', '_PRESENTATION_MGR', '_ARM_FUNCTIONS',
+            '_DOS_FUNCTIONS'
+            ),
+        8 => array(
+            'line')
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '\\', '%', '=', '<', '>', '!', '^',
+            '&', '|', '?', ':', ';', ',', '.', '~', '@'
+            ),
+        2 => array(
+            '$(', '$)', '$<', '$>'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;',
+            4 => 'color: #b1b100;',
+            5 => 'color: #b1b100;',
+            6 => 'color: #b1b100;',
+            7 => 'color: #b1b100;',
+            8 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=&amp;)'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9_\"\'])",
+                'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\"\'])"
+                ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=\$)'
+                ),
+            8 => array(
+                'DISALLOWED_BEFORE' => '(?<=#)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/upc.php b/vendor/easybook/geshi/geshi/upc.php
new file mode 100755
index 000000000..e05303228
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/upc.php
@@ -0,0 +1,270 @@
+<?php
+/*************************************************************************************
+ * upc.php
+ * -----
+ * Author: Viraj Sinha (viraj@indent.com)
+ * Contributors:
+ *  - Nigel McNie (nigel@geshi.org)
+ *  - Jack Lloyd (lloyd@randombit.net)
+ *  - Michael Mol (mikemol@gmail.com)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * UPC language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2011/06/14 (1.0.8.11)
+ *   -  This file is a revision of c.php with UPC keywords added
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'UPC',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto',
+
+            'upc_forall', 'upc_barrier', 'upc_notify', 'upc_wait', 'upc_fence'
+            ),
+        2 => array(
+            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
+            ),
+        3 => array(
+            // assert.h
+            'assert',
+
+            //complex.h
+            'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan',
+            'catanh', 'ccos', 'ccosh', 'cexp', 'cimag', 'cis', 'clog', 'conj',
+            'cpow', 'cproj', 'creal', 'csin', 'csinh', 'csqrt', 'ctan', 'ctanh',
+
+            //ctype.h
+            'digittoint', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl',
+            'isdigit', 'isgraph', 'islower', 'isprint', 'ispunct', 'isspace',
+            'isupper', 'isxdigit', 'toascii', 'tolower', 'toupper',
+
+            //inttypes.h
+            'imaxabs', 'imaxdiv', 'strtoimax', 'strtoumax', 'wcstoimax',
+            'wcstoumax',
+
+            //locale.h
+            'localeconv', 'setlocale',
+
+            //math.h
+            'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
+            'fabs', 'floor', 'frexp', 'ldexp', 'log', 'log10', 'modf', 'pow',
+            'sin', 'sinh', 'sqrt', 'tan', 'tanh',
+
+            //setjmp.h
+            'longjmp', 'setjmp',
+
+            //signal.h
+            'raise',
+
+            //stdarg.h
+            'va_arg', 'va_copy', 'va_end', 'va_start',
+
+            //stddef.h
+            'offsetof',
+
+            //stdio.h
+            'clearerr', 'fclose', 'fdopen', 'feof', 'ferror', 'fflush', 'fgetc',
+            'fgetpos', 'fgets', 'fopen', 'fprintf', 'fputc', 'fputchar',
+            'fputs', 'fread', 'freopen', 'fscanf', 'fseek', 'fsetpos', 'ftell',
+            'fwrite', 'getc', 'getch', 'getchar', 'gets', 'perror', 'printf',
+            'putc', 'putchar', 'puts', 'remove', 'rename', 'rewind', 'scanf',
+            'setbuf', 'setvbuf', 'snprintf', 'sprintf', 'sscanf', 'tmpfile',
+            'tmpnam', 'ungetc', 'vfprintf', 'vfscanf', 'vprintf', 'vscanf',
+            'vsprintf', 'vsscanf',
+
+            //stdlib.h
+            'abort', 'abs', 'atexit', 'atof', 'atoi', 'atol', 'bsearch',
+            'calloc', 'div', 'exit', 'free', 'getenv', 'itoa', 'labs', 'ldiv',
+            'ltoa', 'malloc', 'qsort', 'rand', 'realloc', 'srand', 'strtod',
+            'strtol', 'strtoul', 'system',
+
+            //string.h
+            'memchr', 'memcmp', 'memcpy', 'memmove', 'memset', 'strcat',
+            'strchr', 'strcmp', 'strcoll', 'strcpy', 'strcspn', 'strerror',
+            'strlen', 'strncat', 'strncmp', 'strncpy', 'strpbrk', 'strrchr',
+            'strspn', 'strstr', 'strtok', 'strxfrm',
+
+            //time.h
+            'asctime', 'clock', 'ctime', 'difftime', 'gmtime', 'localtime',
+            'mktime', 'strftime', 'time',
+
+            //wchar.h
+            'btowc', 'fgetwc', 'fgetws', 'fputwc', 'fputws', 'fwide',
+            'fwprintf', 'fwscanf', 'getwc', 'getwchar', 'mbrlen', 'mbrtowc',
+            'mbsinit', 'mbsrtowcs', 'putwc', 'putwchar', 'swprintf', 'swscanf',
+            'ungetwc', 'vfwprintf', 'vswprintf', 'vwprintf', 'wcrtomb',
+            'wcscat', 'wcschr', 'wcscmp', 'wcscoll', 'wcscpy', 'wcscspn',
+            'wcsftime', 'wcslen', 'wcsncat', 'wcsncmp', 'wcsncpy', 'wcspbrk',
+            'wcsrchr', 'wcsrtombs', 'wcsspn', 'wcsstr', 'wcstod', 'wcstok',
+            'wcstol', 'wcstoul', 'wcsxfrm', 'wctob', 'wmemchr', 'wmemcmp',
+            'wmemcpy', 'wmemmove', 'wmemset', 'wprintf', 'wscanf',
+
+            //wctype.h
+            'iswalnum', 'iswalpha', 'iswcntrl', 'iswctype', 'iswdigit',
+            'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace',
+            'iswupper', 'iswxdigit', 'towctrans', 'towlower', 'towupper',
+            'wctrans', 'wctype'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
+            'size_t', 'off_t',
+
+            'upc_lock_t', 'shared', 'strict', 'relaxed', 'upc_blocksizeof',
+            'upc_localsizeof', 'upc_elemsizeof'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>',
+        '!', '^', '&', '|',
+        '?', ':',
+        ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/urbi.php b/vendor/easybook/geshi/geshi/urbi.php
new file mode 100755
index 000000000..c73e44404
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/urbi.php
@@ -0,0 +1,198 @@
+<?php
+/*************************************************************************************
+ * urbi.php
+ * -------
+ * Author: Alexandre Morgand (morgand.alexandre@gmail.com)
+ * Copyright: (c) 2011 Morgand (http://gostai.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2011/09/10
+ *
+ * Urbi language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Urbi',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        // Urbi warning.
+        3 => "#\[[0-9a-f]{8}:warning\].*#",
+        // Urbi message from echo.
+        4 => '#\[[0-9a-f]{8}\] \*\*\*.*#',
+        // Urbi error message.
+        6 => '#\[[0-9a-f]{8}:error\].*#',
+        // Urbi system message.
+        5 => '#\[00.*\].*#',
+        // Nested comment. Max depth 4.
+        7 => '#\/\*(.|\n)*\/\*(.|\n)*\*\/(.|\n)*\*\/#',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(
+        0 => '"',
+        1 => '\'',
+        ),
+    // For Urbi, disable escape char is better.
+    'ESCAPE_CHAR' => '\\',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\\'\"?\n]#",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#",
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // Condition keywords.
+        1 => array(
+            'at', 'at;', 'at|', 'at&', 'at,', 'break', 'call', 'case', 'catch', 'continue',
+            'do', 'else', 'every', 'every&', 'every,', 'every;', 'every|', 'for', 'for&',
+            'for,', 'for;', 'foreach', 'for|', 'freezeif', 'goto', 'if', 'in', 'loop',
+            'loop&', 'loop,', 'loop;', 'loop|', 'or_eq', 'stopif', 'switch', 'try',
+            'waituntil', 'when', 'whenever', 'while', 'while&', 'while,', 'while;',
+            'while|', 'throw', 'onleave', 'watch', 'return', 'and_eq', 'default', 'finally',
+            'timeout', 'xor_eq'
+            ),
+        // Type.
+        2 => array(
+            'virtual', 'using', 'namespace', 'inline', 'protected', 'private', 'public',
+            'typename', 'typeid', 'class', 'const_cast', 'dynamic_cast', 'friend',
+            'template', 'enum', 'static_cast', 'reinterpret_cast', 'mutable', 'explicit'
+            ),
+        // Standard function.
+        3 => array(
+            'this', 'sizeof', 'delete', 'assert', 'isdef', 'compl', 'detach',
+            'disown', '__HERE__', 'asm'
+            ),
+        // Type.
+        4 => array(
+            'char', 'const', 'double', 'int', 'long', 'typedef', 'union',
+            'unsigned', 'var', 'short', 'wchar_t', 'volatile', 'signed', 'bool',
+            'float', 'struct', 'auto', 'register', 'static', 'extern', 'function',
+            'export', 'external', 'internal', 'closure', 'BIN'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '{', '}', '[', ']'),
+        1 => array('<', '>','=', '!=', '==', '==='),
+        2 => array('+', '-', '*', '/', '%', 'bitand', 'bitor', 'xor'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            3 => 'color: #d46b0f;',
+            4 => 'color: #20b537;',
+            5 => 'color: #73776f;',
+            6 => 'color: #a71616;',
+            7 => 'color: #666666;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #ff0000;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #007788;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #0000f8;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040; font-weight: bold;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000dd',
+            1 => 'color: #0000dd;',
+            2 => 'color: #0000dd;',
+            3 => 'color: #0000dd;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::',
+        // FIXME: add -> splitter.
+        ),
+    'REGEXPS' => array(
+        0 => '0x[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])*',
+        1 => '[0-9]([0-9_]*[0-9])*(e|E)(-|\+)?[0-9]([0-9_]*[0-9])*',
+        2 => '[0-9]([0-9_]*[0-9])*(min|s|ms|h|d)',
+        3 => '[0-9]+_([0-9_])*[0-9]',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+);
diff --git a/vendor/easybook/geshi/geshi/uscript.php b/vendor/easybook/geshi/geshi/uscript.php
new file mode 100755
index 000000000..03b1d48a6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/uscript.php
@@ -0,0 +1,297 @@
+<?php
+/*************************************************************************************
+ * uscript.php
+ * ---------------------------------
+ * Author: pospi (pospi@spadgos.com)
+ * Copyright: (c) 2007 pospi (http://pospi.spadgos.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/05/21
+ *
+ * UnrealScript language file for GeSHi.
+ *
+ * Comments:
+ * * Main purpose at this time is for Unreal Engine 2 / 2.5
+ * * Mostly taken from UltraEdit unrealScript wordfile.
+ *
+ * CHANGES
+ * -------
+ * 2007/05/21 (1.0.8.10)
+ *  -  First Release
+ *
+ * TODO (updated 2007/05/21)
+ * -------------------------
+ * * Update to feature any UE3 classes / keywords when UT3 comes out
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Unreal Script',
+    'COMMENT_SINGLE' => array(
+            1 => '//',
+            2 => '#'
+            ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(        //declaration keywords
+            'simulated', 'state', 'class', 'function', 'event', 'var', 'local',
+            'ignores', 'globalconfig', 'config', 'abstract', 'nativereplication', 'native',
+            'auto', 'coerce', 'const', 'default',
+            'defaultproperties',
+            'enum', 'extends', 'expands', 'final', 'guid', 'latent', 'localized',
+            'new', 'noexport', 'operator', 'preoperator', 'optional', 'out',
+            'private', 'public', 'protected', 'reliable', 'replication',
+            'singular', 'static', 'struct', 'transient', 'unreliable',
+            'hidedropdown', 'cacheexempt', 'exec', 'delegate', 'import', 'placeable', 'exportstructs'
+            ),
+        2 => array(        //control flow keywords
+            'for', 'while', 'do', 'if', 'else', 'switch', 'case', 'return', 'break', 'continue',
+            'begin', 'loop', 'assert',
+            'foreach', 'AllActors', 'DynamicActors', 'ChildActors', 'BasedActors', 'TouchingActors',
+            'TraceActors', 'RadiusActors', 'VisibleActors', 'CollidingActors', 'VisibleCollidingActors'
+            ),
+        3 => array(        //global (object) functions
+            'log', 'warn', 'rot', 'vect', 'Rand', 'Min', 'Max', 'Clamp', 'Abs', 'Sin', 'ASin',
+            'Cos', 'ACos', 'Tan', 'ATan', 'Exp', 'Loge', 'Sqrt', 'Square', 'FRand', 'FMin', 'FMax', 'FClamp',
+            'Lerp', 'Smerp', 'Ceil', 'Round', 'VSize', 'Normal', 'Invert', 'VRand', 'MirrorVectorByNormal',
+            'GetAxes', 'GetUnAxes', 'RotRand', 'OrthoRotation', 'Normalize', 'ClockwiseFrom',
+            'Len', 'InStr', 'Mid', 'Left', 'Right', 'Caps', 'Chr', 'Asc', 'Locs',
+            'Divide', 'Split', 'StrCmp', 'Repl', 'Eval',
+            'InterpCurveEval', 'InterpCurveGetOutputRange', 'InterpCurveGetInputDomain',
+            'QuatProduct', 'QuatInvert', 'QuatRotateVector', 'QuatFindBetween', 'QuatFromAxisAndAngle',
+            'QuatFromRotator', 'QuatToRotator', 'QuatSlerp',
+            'Localize', 'GotoState', 'IsInState', 'GetStateName',
+            'ClassIsChildOf', 'IsA', 'Enable', 'Disable',
+            'GetPropertyText', 'SetPropertyText', 'GetEnum', 'DynamicLoadObject', 'FindObject',
+            'SaveConfig', 'ClearConfig', 'StaticSaveConfig', 'ResetConfig', 'StaticClearConfig',
+            'GetPerObjectNames', 'RandRange', 'StopWatch', 'IsOnConsole', 'IsSoaking',
+            'PlatformIsMacOS', 'PlatformIsUnix', 'PlatformIsWindows', 'PlatformIs64Bit',
+            'BeginState', 'EndState', 'Created', 'AllObjects', 'GetReferencers', 'GetItemName',
+            'ReplaceText', 'EatStr'
+            ),
+        4 => array(        //common almost-global (actor) functions
+            'ClientMessage', 'ConsoleCommand', 'CopyObjectToClipboard', 'TextToSpeech',
+            'Error', 'Sleep', 'SetCollision', 'SetCollisionSize', 'SetDrawScale', 'SetDrawScale3D',
+            'SetStaticMesh', 'SetDrawType', 'Move', 'SetLocation', 'SetRotation',
+            'SetRelativeLocation', 'SetRelativeRotation', 'MoveSmooth', 'AutonomousPhysics',
+            'SetBase', 'SetOwner', 'IsJoinedTo', 'GetMeshName', 'PlayAnim', 'LoopAnim', 'TweenAnim',
+            'IsAnimating', 'FinishAnim', 'HasAnim', 'StopAnimating', 'FreezeFrameAt', 'SetAnimFrame',
+            'IsTweening', 'AnimStopLooping', 'AnimEnd', 'LinkSkelAnim', 'LinkMesh', 'BoneRefresh',
+            'GetBoneCoords', 'GetBoneRotation', 'GetRootLocation', 'GetRootRotation', 'AttachToBone',
+            'DetachFromBone', 'SetBoneScale', 'UpdateURL', 'GetURLOption', 'SetPhysics', 'KAddImpulse',
+            'KImpact', 'KApplyForce', 'Clock', 'UnClock', 'Destroyed', 'GainedChild', 'LostChild',
+            'Tick', 'PostNetReceive', 'ClientTrigger', 'Trigger', 'UnTrigger', 'BeginEvent', 'EndEvent',
+            'Timer', 'HitWall', 'Falling', 'Landed', 'ZoneChange', 'PhysicsVolumeChange', 'Touch',
+            'PostTouch', 'UnTouch', 'Bump', 'BaseChange', 'Attach', 'Detach', 'SpecialHandling',
+            'EncroachingOn', 'EncroachedBy', 'RanInto', 'FinishedInterpolation', 'EndedRotation',
+            'UsedBy', 'FellOutOfWorld', 'KilledBy', 'TakeDamage', 'HealDamage', 'Trace', 'FastTrace',
+            'TraceThisActor', 'spawn', 'Destroy', 'TornOff', 'SetTimer', 'PlaySound', 'PlayOwnedSound',
+            'GetSoundDuration', 'MakeNoise', 'BeginPlay', 'GetAllInt', 'RenderOverlays', 'RenderTexture',
+            'PreBeginPlay', 'PostBeginPlay', 'PostNetBeginPlay', 'HurtRadius', 'Reset', 'Crash'
+            ),
+        5 => array(        //data types
+            'none', 'null',
+            'float', 'int', 'bool', 'byte', 'char', 'double', 'iterator', 'name', 'string',    //primitive
+            'plane', 'rotator', 'vector', 'spline',    'coords', 'Quat', 'Range', 'RangeVector', //structs
+            'Scale', 'Color', 'Box', 'IntBox', 'FloatBox', 'BoundingVolume', 'Matrix', 'InterpCurvePoint',
+            'InterpCurve', 'CompressedPosition', 'TMultiMap', 'PointRegion',
+            'KRigidBodyState', 'KSimParams', 'AnimRep', 'FireProperties',
+            'lodmesh', 'skeletalmesh', 'mesh', 'StaticMesh', 'MeshInstance',    //3d resources
+            'sound',    //sound resources
+            'material', 'texture', 'combiner', 'modifier', 'ColorModifier', 'FinalBlend',    //2d resources
+            'MaterialSequence', 'MaterialSwitch', 'OpacityModifier', 'TexModifier', 'TexEnvMap',
+            'TexCoordSource', 'TexMatrix', 'TexOscillator', 'TexPanner', 'TexRotator', 'TexScaler',
+            'RenderedMaterial', 'BitmapMaterial', 'ScriptedTexture', 'ShadowBitmapMaterial', 'Cubemap',
+            'FractalTexture', 'FireTexture', 'IceTexture', 'WaterTexture', 'FluidTexture', 'WaveTexture',
+            'WetTexture', 'ConstantMaterial', 'ConstantColor', 'FadeColor', 'ParticleMaterial',
+            'ProjectorMaterial', 'Shader', 'TerrainMaterial', 'VertexColor'
+            ),
+        6 => array(        //misc keywords
+            'false', 'true', 'self', 'super', 'MaxInt', 'Pi'
+            ),
+        7 => array(        //common actor enums & variables
+            'DT_None', 'DT_Sprite', 'DT_Mesh', 'DT_Brush', 'DT_RopeSprite',
+            'DT_VerticalSprite', 'DT_TerraForm', 'DT_SpriteAnimOnce', 'DT_StaticMesh', 'DT_DrawType',
+            'DT_Particle', 'DT_AntiPortal', 'DT_FluidSurface',
+            'PHYS_None', 'PHYS_Walking', 'PHYS_Falling', 'PHYS_Swimming', 'PHYS_Flying',
+            'PHYS_Rotating', 'PHYS_Projectile', 'PHYS_Interpolating', 'PHYS_MovingBrush', 'PHYS_Spider',
+            'PHYS_Trailer', 'PHYS_Ladder', 'PHYS_RootMotion', 'PHYS_Karma', 'PHYS_KarmaRagDoll',
+            'PHYS_Hovering', 'PHYS_CinMotion',
+            'ROLE_None', 'ROLE_DumbProxy', 'ROLE_SimulatedProxy',
+            'ROLE_AutonomousProxy', 'ROLE_Authority',
+            'STY_None', 'STY_Normal', 'STY_Masked', 'STY_Translucent', 'STY_Modulated', 'STY_Alpha',
+            'STY_Additive', 'STY_Subtractive', 'STY_Particle', 'STY_AlphaZ',
+            'OCCLUSION_None', 'OCCLUSION_BSP', 'OCCLUSION_Default', 'OCCLUSION_StaticMeshes',
+            'SLOT_None', 'SLOT_Misc', 'SLOT_Pain', 'SLOT_Interact', 'SLOT_Ambient', 'SLOT_Talk',
+            'SLOT_Interface', 'MTRAN_None', 'MTRAN_Instant', 'MTRAN_Segue', 'MTRAN_Fade',
+            'MTRAN_FastFade', 'MTRAN_SlowFade',
+
+            'DrawType', 'Physics', 'Owner', 'Base', 'Level', 'Game', 'Instigator', 'RemoteRole', 'Role',
+            'LifeSpan', 'Tag', 'Event', 'Location', 'Rotation', 'Velocity', 'Acceleration',
+            'RelativeLocation', 'RelativeRotation', 'DrawScale', 'DrawScale3D', 'Skins', 'Style',
+            'SoundVolume', 'SoundPitch', 'SoundRadius', 'TransientSoundVolume', 'TransientSoundRadius',
+            'CollisionRadius', 'CollisionHeight', 'Mass', 'Buoyancy', 'RotationRate', 'DesiredRotation'
+            ),
+        8 => array(        //common non-actor uscript classes
+            'Object',
+            'CacheManager', 'CameraEffect', 'Canvas', 'CheatManager', 'Commandlet', 'DecoText', 'GUI',
+            'InteractionMaster', 'Interactions', 'Interaction', 'KarmaParamsCollision', 'KarmaParamsRBFull',
+            'KarmaParamsSkel', 'KarmaParams', 'LevelSummary', 'Locale', 'Manifest', 'MaterialFactory',
+            'MeshObject', 'ObjectPool', 'Pallete',
+            'ParticleEmitter', 'MeshEmitter', 'BeamEmitter', 'SpriteEmitter', 'SparkEmitter', 'TrailEmitter',
+            'Player', 'PlayerInput', 'PlayInfo', 'ReachSpec', 'Resource', 'LatentScriptedAction', 'ScriptedAction',
+            'speciesType', 'StreamBase', 'Stream', 'EditorEngine', 'Engine', 'Time', 'WeaponFire',
+            'WebApplication', 'WebRequest', 'WebResponse', 'WebSkin', 'xPawnGibGroup', 'xPawnSoundGroup',
+            'xUtil'
+            ),
+        9 => array(        //common actor-based uscript classes
+            'Actor',
+            'Controller', 'AIController', 'ScriptedController', 'Bot', 'xBot',
+            'PlayerController', 'UnrealPlayer', 'xPlayer',
+            'DamageType', 'WeaponDamageType', 'Effects', 'Emitter', 'NetworkEmitter',
+            'Gib', 'HUD', 'HudBase', 'Info', 'FluidSurfaceInfo', 'Combo',
+            'GameInfo', 'UnrealMPGameInfo', 'DeathMatch', 'TeamGame', 'CTFGame',
+            'xCTFGame', 'xBombingRun', 'xDoubleDom', 'xTeamGame',
+            'ASGameInfo', 'Invasion', 'ONSOnslaughtGame', 'xDeathmatch',
+            'Mutator', 'Inventory', 'Ammunition', 'KeyInventory', 'Powerups', 'Armor', 'Weapon',
+            'InventoryAttachment', 'WeaponAttachment',
+            'KActor', 'KConstraint', 'KBSJoint', 'KCarWheelJoint', 'KConeLimit', 'KHinge', 'KTire',
+            'KVehicleFactory', 'Keypoint', 'AIScript', 'ScriptedSequence', 'ScriptedTrigger',
+            'AmbientSound', 'Light', 'SpotLight', 'SunLight', 'TriggerLight',
+            'MeshEffect', 'NavigationPoint', 'GameObjective', 'DestroyableObjective',
+            'PathNode', 'FlyingPathNode', 'RoadPathNode', 'InventorySpot', 'PlayerStart',
+            'Pawn', 'Vehicle', 'UnrealPawn', 'xPawn', 'Monster', 'ASVehicle', 'KVehicle', 'KCar',
+            'ONSWeaponPawn', 'SVehicle', 'ONSVehicle', 'ONSChopperCraft', 'ONSHoverCraft',
+            'ONSPlaneCraft', 'ONSTreadCraft', 'ONSWheeledCraft',
+            'Pickup', 'Ammo', 'UTAmmoPickup', 'ArmorPickup', 'KeyPickup', 'TournamentPickup',
+            'Projectile', 'Projector', 'DynamicProjector', 'ShadowProjector', 'xScorch',
+            'xEmitter', 'xPickupBase', 'xProcMesh', 'xWeatherEffect', 'PhysicsVolume', 'Volume'
+            ),
+        10 => array(    //symbol-like operators
+            'dot','cross'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+','-','=','/','*','-','%','>','<','&','^','!','|','`','(',')','[',']','{','}',
+        '<<','>>','$','@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #0066AA;',
+            4 => 'color: #0088FF;',
+            5 => 'color: #E000E0;',
+            6 => 'color: #900000;',
+            7 => 'color: #888800;',
+            8 => 'color: #AA6600;',
+            9 => 'color: #FF8800;',
+            10 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #000000; font-weight: bold;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #999999;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #669966;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #E000E0;',
+            1 => 'color: #E000E0;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => 'http://wiki.beyondunreal.com/wiki?search={FNAME}',
+        9 => 'http://wiki.beyondunreal.com/wiki?search={FNAME}',
+        10 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(            //handle template-style variable definitions
+        0 => array(
+            GESHI_SEARCH => '(class\s*)<(\s*(\w+)\s*)>',
+            GESHI_REPLACE => "\${1}",
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => "< \${3} >"
+            ),
+        1 => array(
+            GESHI_SEARCH => '(array\s*)<(\s*(\w+)\s*)>',
+            GESHI_REPLACE => "\${1}",
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => "< \${3} >"
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            10 => array(
+                'DISALLOWED_BEFORE' => '(?<!<)(?=DOT>)'
+                )
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/vala.php b/vendor/easybook/geshi/geshi/vala.php
new file mode 100755
index 000000000..28f153427
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/vala.php
@@ -0,0 +1,149 @@
+<?php
+/*************************************************************************************
+ * vala.php
+ * ----------
+ * Author: Nicolas Joseph (nicolas.joseph@valaide.org)
+ * Copyright: (c) 2009 Nicolas Joseph
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/04/29
+ *
+ * Vala language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Vala',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Using and Namespace directives (basic support)
+        //Please note that the alias syntax for using is not supported
+        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('"""'),
+    'HARDESCAPE' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'as', 'abstract', 'base', 'break', 'case', 'catch', 'const',
+            'construct', 'continue', 'default', 'delete', 'dynamic', 'do',
+            'else', 'ensures', 'extern', 'false', 'finally', 'for', 'foreach',
+            'get', 'if', 'in', 'inline', 'internal', 'lock', 'namespace',
+            'null', 'out', 'override', 'private', 'protected', 'public', 'ref',
+            'requires', 'return', 'set', 'static', 'switch', 'this', 'throw',
+            'throws', 'true', 'try', 'using', 'value', 'var', 'virtual',
+            'volatile', 'void', 'yield', 'yields', 'while'
+            ),
+        2 => array(
+            '#elif', '#endif', '#else', '#if'
+            ),
+        3 => array(
+            'is', 'new', 'owned', 'sizeof', 'typeof', 'unchecked', 'unowned', 'weak'
+            ),
+        4 => array(
+            'bool', 'char', 'class', 'delegate', 'double', 'enum',
+            'errordomain', 'float', 'int', 'int8', 'int16', 'int32', 'int64',
+            'interface', 'long', 'short', 'signal', 'size_t', 'ssize_t',
+            'string', 'struct', 'uchar', 'uint', 'uint8', 'uint16', 'uint32',
+            'ulong', 'unichar', 'ushort'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
+        '(', ')', '{', '}', '[', ']', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #FF8000; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            3 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;',
+            'HARD' => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;',
+            'HARD' => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/vb.php b/vendor/easybook/geshi/geshi/vb.php
new file mode 100755
index 000000000..528e7cd45
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/vb.php
@@ -0,0 +1,157 @@
+<?php
+/*************************************************************************************
+ * vb.php
+ * ------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org),
+ *                     Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/08/30
+ *
+ * Visual Basic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/27 (1.0.8.1)
+ *  -  changed keyword list for better Visual Studio compliance
+ * 2008/08/26 (1.0.8.1)
+ *  -  Fixed multiline comments
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/08/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Visual Basic',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // Comments (either single or multiline with _
+        1 => '/\'.*(?<! _)\n/sU',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Binary', 'Boolean', 'Byte', 'Currency', 'Date', 'Decimal', 'Double',
+            'String', 'Enum', 'Integer', 'Long', 'Object', 'Single', 'Variant'
+            ),
+        2 => array(
+            'CreateObject', 'GetObject', 'New', 'Option', 'Function',
+            'Call', 'Private', 'Public', 'Sub', 'Explicit', 'Compare', 'Exit'
+            ),
+        3 => array(
+            'And', 'Case', 'Do', 'Each', 'Else', 'ElseIf', 'For',
+            'Goto', 'If', 'Is', 'Loop', 'Next', 'Not', 'Or', 'Select', 'Step',
+            'Then', 'To', 'Until', 'While', 'With', 'Xor', 'WithEvents',
+            'DoEvents', 'Close', 'Like', 'In', 'End'
+            ),
+        4 => array(
+            'As', 'Dim', 'Get', 'Set', 'ReDim', 'Error',
+            'Resume', 'Declare', 'Let', 'ByRef', 'ByVal',
+            'Optional', 'Property', 'Control', 'UBound', 'Mod',
+            'GoSub', 'Implements', 'Input', 'LBound', 'Static', 'Stop',
+            'Type', 'TypeOf', 'On', 'Open', 'Output', 'ParamArray',
+            'Preserve', 'Print', 'RaiseEvent', 'Random', 'Line'
+            ),
+        5 => array(
+            'Nothing', 'False', 'True', 'Null', 'Empty'
+            ),
+        6 => array(
+            'ErrorHandler','ExitProc', 'PublishReport'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #F660AB; font-weight: bold;',
+            2 => 'color: #E56717; font-weight: bold;',
+            3 => 'color: #8D38C9; font-weight: bold;',
+            4 => 'color: #151B8D; font-weight: bold;',
+            5 => 'color: #00C2FF; font-weight: bold;',
+            6 => 'color: #3EA99F; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/vbnet.php b/vendor/easybook/geshi/geshi/vbnet.php
new file mode 100755
index 000000000..758df9893
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/vbnet.php
@@ -0,0 +1,182 @@
+<?php
+/*************************************************************************************
+ * vbnet.php
+ * ---------
+ * Author: Alan Juden (alan@judenware.org)
+ * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/06/04
+ *
+ * VB.NET language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.0)
+ *  -  Initial release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'vb.net',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //Keywords
+        1 => array(
+            'AddHandler', 'AddressOf', 'Alias', 'And', 'AndAlso', 'As', 'ByRef', 'ByVal',
+            'Call', 'Case', 'Catch', 'Char', 'Class', 'Const', 'Continue',
+            'Declare', 'Default',
+            'Delegate', 'Dim', 'DirectCast', 'Do', 'Each', 'Else', 'ElseIf', 'End', 'EndIf',
+            'Enum', 'Erase', 'Error', 'Event', 'Exit', 'False', 'Finally', 'For', 'Friend', 'Function',
+            'Get', 'GetType', 'GetXMLNamespace', 'Global', 'GoSub', 'GoTo', 'Handles', 'If', 'Implements',
+            'Imports', 'In', 'Inherits', 'Interface', 'Is', 'IsNot', 'Let', 'Lib', 'Like', 'Loop', 'Me',
+            'Mod', 'Module', 'Module Statement', 'MustInherit', 'MustOverride', 'MyBase', 'MyClass', 'Namespace',
+            'Narrowing', 'New', 'Next', 'Not', 'Nothing', 'NotInheritable', 'NotOverridable', 'Of', 'On',
+            'Operator', 'Option', 'Optional', 'Or', 'OrElse', 'Out', 'Overloads', 'Overridable', 'Overrides',
+            'ParamArray', 'Partial', 'Private', 'Property', 'Protected', 'Public', 'RaiseEvent', 'ReadOnly', 'ReDim',
+            'REM', 'RemoveHandler', 'Resume', 'Return', 'Select','Set', 'Shadows', 'Shared', 'Static', 'Step',
+            'Stop', 'Structure', 'Sub', 'SyncLock', 'Then', 'Throw', 'To', 'True', 'Try', 'TryCast', 'TypeOf',
+            'Using', 'Wend', 'When', 'While', 'Widening', 'With', 'WithEvents', 'WriteOnly', 'Xor'
+            ),
+        //Data Types
+        2 => array(
+            'Boolean', 'Byte', 'Date', 'Decimal', 'Double', 'Integer', 'Long', 'Object',
+            'SByte', 'Short', 'Single', 'String', 'UInteger', 'ULong', 'UShort'
+            ),
+        //Compiler Directives
+        3 => array(
+            '#Const', '#Else', '#ElseIf', '#End', '#If'
+            ),
+        //Constants
+        4 => array(
+            'CBool', 'CByte', 'CChar', 'CChr', 'CDate', 'CDbl', 'CDec','CInt', 'CLng', 'CLng8', 'CObj', 'CSByte', 'CShort',
+            'CSng', 'CStr', 'CType', 'CUInt', 'CULng', 'CUShort'
+            ),
+        //Linq
+        5 => array(
+            'By','From','Group','Where'
+            ),
+        //Built-in functions
+        7 => array(
+            'ABS', 'ARRAY', 'ASC', 'ASCB', 'ASCW', 'CALLBYNAME', 'CHOOSE', 'CHR', 'CHR$', 'CHRB', 'CHRB$', 'CHRW',
+            'CLOSE', 'COMMAND', 'COMMAND$', 'CONVERSION',
+            'COS', 'CREATEOBJECT', 'CURDIR', 'CVDATE', 'DATEADD',
+            'DATEDIFF', 'DATEPART', 'DATESERIAL', 'DATEVALUE', 'DAY', 'DDB', 'DIR', 'DIR$',
+            'EOF', 'ERROR$', 'EXP', 'FILEATTR', 'FILECOPY', 'FILEDATATIME', 'FILELEN', 'FILTER',
+            'FIX', 'FORMAT', 'FORMAT$', 'FORMATCURRENCY', 'FORMATDATETIME', 'FORMATNUMBER',
+            'FORMATPERCENT', 'FREEFILE', 'FV', 'GETALLSETTINGS', 'GETATTRGETOBJECT', 'GETSETTING',
+            'HEX', 'HEX$', 'HOUR', 'IIF', 'IMESTATUS', 'INPUT$', 'INPUTB', 'INPUTB$', 'INPUTBOX',
+            'INSTR', 'INSTRB', 'INSTRREV', 'INT', 'IPMT', 'IRR', 'ISARRAY', 'ISDATE', 'ISEMPTY',
+            'ISERROR', 'ISNULL', 'ISNUMERIC', 'ISOBJECT', 'JOIN', 'LBOUND', 'LCASE', 'LCASE$',
+            'LEFT', 'LEFT$', 'LEFTB', 'LEFTB$', 'LENB', 'LINEINPUT', 'LOC', 'LOF', 'LOG', 'LTRIM',
+            'LTRIM$', 'MID$', 'MIDB', 'MIDB$', 'MINUTE', 'MIRR', 'MKDIR', 'MONTH', 'MONTHNAME',
+            'MSGBOX', 'NOW', 'NPER', 'NPV', 'OCT', 'OCT$', 'PARTITION', 'PMT', 'PPMT', 'PV',
+            'RATE', 'REPLACE', 'RIGHT', 'RIGHT$', 'RIGHTB', 'RIGHTB$', 'RMDIR', 'RND', 'RTRIM',
+            'RTRIM$', 'SECOND', 'SIN', 'SLN', 'SPACE', 'SPACE$', 'SPC', 'SPLIT', 'SQRT', 'STR', 'STR$',
+            'STRCOMP', 'STRCONV', 'STRING$', 'STRREVERSE', 'SYD', 'TAB', 'TAN', 'TIMEOFDAY',
+            'TIMER', 'TIMESERIAL', 'TIMEVALUE', 'TODAY', 'TRIM', 'TRIM$', 'TYPENAME', 'UBOUND',
+            'UCASE', 'UCASE$', 'VAL', 'WEEKDAY', 'WEEKDAYNAME', 'YEAR'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!',
+        '(', ')', '{', '}', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',  //Keywords
+            2 => 'color: #6a5acd;',                     //primitive Data Types
+            3 => 'color: #6a5acd; font-weight: bold;',  //preprocessor-commands
+            4 => 'color: #cd6a5a;',                     //Constants
+            5 => 'color: #cd6a5a; font-weight: bold;',  //LinQ
+            7 => 'color: #000066;',                     //Built-in functions
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a52a2a; back-color: #fffacd;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #a52a2a; back-color: #fffacd;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?q={FNAMEU}+site:msdn.microsoft.com',
+        4 => '',
+        5 => '',
+        7 => 'http://www.google.com/search?q={FNAMEU}+site:msdn.microsoft.com'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 =>'.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            7 => array(
+                'DISALLOWED_AFTER' => '(?!\w)(?=\s*\()'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/vbscript.php b/vendor/easybook/geshi/geshi/vbscript.php
new file mode 100644
index 000000000..6db3bbd3f
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/vbscript.php
@@ -0,0 +1,153 @@
+<?php
+/*************************************************************************************
+ * vbscript.php
+ * ------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org),
+ *                     Nigel McNie (http://qbnz.com/highlighter),
+ *                     Rory Prendergast (http://www.tanium.com)
+ * Release Version: 1.0.8.12
+ * Date Started: 2012/08/20
+ *
+ * VBScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/08/20 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'VBScript',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // Comments (either single or multiline with _
+        1 => '/\'.*(?<! _)\n/sU',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Empty', 'Nothing', 'Null', 'vbArray', 'vbBoolean', 'vbByte',
+            'vbCr', 'vbCrLf', 'vbCurrency', 'vbDate', 'vbDouble', 'vbEmpty',
+            'vbError', 'vbFirstFourDays', 'vbFirstFullWeek', 'vbFirstJan1',
+            'vbFormFeed', 'vbFriday', 'vbInteger', 'vbLf', 'vbLong', 'vbMonday',
+            'vbNewLine', 'vbNull', 'vbNullChar', 'vbNullString', 'vbObject',
+            'vbSaturday', 'vbSingle', 'vbString', 'vbSunday', 'vbTab',
+            'vbThursday', 'vbTuesday', 'vbUseSystem', 'vbUseSystemDayOfWeek',
+            'vbVariant', 'vbWednesday', 'FALSE', 'TRUE'
+            ),
+        2 => array(
+            'bs', 'Array', 'Asc', 'Atn', 'CBool', 'CByte', 'CDate', 'CDbl', 'Chr',
+            'CInt', 'CLng', 'Cos', 'CreateObject', 'CSng', 'CStr', 'Date', 'DateAdd',
+            'DateDiff', 'DatePart', 'DateSerial', 'DateValue', 'Day', 'Eval', 'Exp',
+            'Filter', 'Fix', 'FormatDateTime', 'FormatNumber', 'FormatPercent',
+            'GetObject', 'Hex', 'Hour', 'InputBox', 'InStr', 'InstrRev', 'Int',
+            'IsArray', 'IsDate', 'IsEmpty', 'IsNull', 'IsNumeric', 'IsObject', 'Join',
+            'LBound', 'LCase', 'Left', 'Len', 'Log', 'LTrim', 'Mid', 'Minute', 'Month',
+            'MonthName', 'MsgBox', 'Now', 'Oct', 'Replace', 'RGB', 'Right', 'Rnd',
+            'Round', 'RTrim', 'ScriptEngine', 'ScriptEngineBuildVersion',
+            'ScriptEngineMajorVersion', 'ScriptEngineMinorVersion', 'Second',
+            'Sgn', 'Sin', 'Space', 'Split', 'Sqr', 'StrComp', 'String', 'StrReverse',
+            'Tan', 'Time', 'TimeSerial', 'TimeValue', 'Trim', 'TypeName', 'UBound',
+            'UCase', 'VarType', 'Weekday', 'WeekdayName', 'Year'
+            ),
+        3 => array(
+            'Call', 'Case', 'Const', 'Dim', 'Do', 'Each', 'Else', 'End', 'Erase',
+            'Execute', 'Exit', 'For', 'Function', 'Gosub', 'Goto', 'If', 'Loop',
+            'Next', 'On Error', 'Option Explicit', 'Private', 'Public',
+            'Randomize', 'ReDim', 'Rem', 'Resume', 'Select', 'Set', 'Sub', 'Then',
+            'Wend', 'While', 'With', 'In', 'To', 'Step'
+            ),
+        4 => array(
+            'And', 'Eqv', 'Imp', 'Is', 'Mod', 'Not', 'Or', 'Xor'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '-', '&', '*', '/', '\\', '^', '+', '<', '<=', '<>', '=', '>', '>='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #F660AB; font-weight: bold;',
+            2 => 'color: #E56717; font-weight: bold;',
+            3 => 'color: #8D38C9; font-weight: bold;',
+            4 => 'color: #151B8D; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/vedit.php b/vendor/easybook/geshi/geshi/vedit.php
new file mode 100755
index 000000000..19b2bdb21
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/vedit.php
@@ -0,0 +1,103 @@
+<?php
+/*************************************************************************************
+ * vedit.php
+ * --------
+ * Author: Pauli Lindgren (pauli0212@yahoo.com)
+ * Copyright: (c) 2009 Pauli Lindgren (http://koti.mbnet.fi/pkl/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/12/16
+ *
+ * Vedit macro language language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/12/16 (1.0.8.11)
+ *  -  First Release
+ *
+ * TODO (updated 2009/12/16)
+ * -------------------------
+ * - Add keyword groups 2, 3 and 4.
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Vedit macro language',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'breakout', 'break_out', 'continue', 'do', 'else', 'for',
+            'goto', 'if', 'repeat', 'return', 'while'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%',
+            '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/verilog.php b/vendor/easybook/geshi/geshi/verilog.php
new file mode 100755
index 000000000..d6ec08615
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/verilog.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * verilog.php
+ * -----------
+ * Author: Günter Dannoritzer <dannoritzer@web.de>
+ * Copyright: (C) 2008 Günter Dannoritzer
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/05/28
+ *
+ * Verilog language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/29
+ *   -  added regular expression to find numbers of the form 4'b001xz
+ *   -  added regular expression to find values for `timescale command
+ *   -  extended macro keywords
+ *
+ * TODO (updated 2008/05/29)
+ * -------------------------
+ *
+ * 2013/01/08
+ *   -  extended keywords to include system keywords
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Verilog',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // keywords
+        1 => array(
+            'accept_on','alias',
+            'always','always_comb','always_ff','always_latch','and','assert',
+            'assign','assume','automatic','before','begin','bind','bins','binsof',
+            'bit','break','buf','bufif0','bufif1','byte','case','casex','casez',
+            'cell','chandle','checker','class','clocking','cmos','config','const',
+            'constraint','context','continue','cover','covergroup','coverpoint','cross',
+            'deassign','default','defparam','design','disable','dist','do','edge','else',
+            'end','endcase','endchecker','endclass','endclocking','endconfig',
+            'endfunction','endgenerate','endgroup','endinterface','endmodule',
+            'endpackage','endprimitive','endprogram','endproperty','endspecify',
+            'endsequence','endtable','endtask','enum','event','eventually','expect',
+            'export','extends','extern','final','first_match','for','force','foreach',
+            'forever','fork','forkjoin','function','generate','genvar','global',
+            'highz0','highz1','if','iff','ifnone','ignore_bins','illegal_bins',
+            'implies','import','incdir','include','initial','inout','input','inside',
+            'instance','int','integer','interface','intersect','join','join_any',
+            'join_none','large','let','liblist','library','local','localparam',
+            'logic','longint','macromodule','matches','medium','modport','module','nand',
+            'negedge','new','nexttime','nmos','nor','noshowcancelled','not','notif0',
+            'notif1','null','or','output','package','packed','parameter','pmos','posedge',
+            'primitive','priority','program','property','protected','pull0','pull1',
+            'pulldown','pullup','pulsestyle_ondetect','pulsestyle_onevent','pure',
+            'rand','randc','randcase','randsequence','rcmos','real','realtime','ref',
+            'reg','reject_on','release','repeat','restrict','return','rnmos','rpmos',
+            'rtran','rtranif0','rtranif1','s_always','s_eventually','s_nexttime',
+            's_until','s_until_with','scalared','sequence','shortint','shortreal',
+            'showcancelled','signed','small','solve','specify','specparam','static',
+            'string','strong','strong0','strong1','struct','super','supply0','supply1',
+            'sync_accept_on','sync_reject_on','table','tagged','task','this','throughout',
+            'time','timeprecision','timeunit','tran','tranif0','tranif1','tri','tri0',
+            'tri1','triand','trior','trireg','type','typedef','union','unique','unique0',
+            'unsigned','until','until_with','untyped','use','uwire','var','vectored',
+            'virtual','void','wait','wait_order','wand','weak','weak0','weak1','while',
+            'wildcard','wire','with','within','wor','xnor','xor'
+            ),
+        // system tasks
+        2 => array(
+            '$display', '$monitor',
+            '$dumpall', '$dumpfile', '$dumpflush', '$dumplimit', '$dumpoff',
+            '$dumpon', '$dumpvars',
+            '$fclose', '$fdisplay', '$fopen',
+            '$finish', '$fmonitor', '$fstrobe', '$fwrite',
+            '$fgetc', '$ungetc', '$fgets', '$fscanf', '$fread', '$ftell',
+            '$fseek', '$frewind', '$ferror', '$fflush', '$feof',
+            '$random',
+            '$readmemb', '$readmemh', '$readmemx',
+            '$signed', '$stime', '$stop',
+            '$strobe', '$time', '$unsigned', '$write'
+            ),
+        // macros
+        3 => array(
+            '`default-net', '`define',
+            '`celldefine', '`default_nettype', '`else', '`elsif', '`endcelldefine',
+            '`endif', '`ifdef', '`ifndef', '`include', '`line', '`nounconnected_drive',
+            '`resetall', '`timescale', '`unconnected_drive', '`undef'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%',
+        '^', '&', '|', '~',
+        '?', ':',
+        '#', '<<', '<<<',
+        '>', '<', '>=', '<=',
+        '@', ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #A52A2A; font-weight: bold;',
+            2 => 'color: #9932CC;',
+            3 => 'color: #008800;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00008B; font-style: italic;',
+            'MULTI' => 'color: #00008B; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #9F79EE'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #9F79EE;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0055;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #5D478B;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0055;',
+            1 => 'color: #ff0055;',
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        // numbers
+        0 => "\d'[bdh][0-9_a-fA-FxXzZ]+",
+        // time -> 1, 10, or 100; s, ms, us, ns, ps, of fs
+        1 => "1[0]{0,2}[munpf]?s"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        1 => ''
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/vhdl.php b/vendor/easybook/geshi/geshi/vhdl.php
new file mode 100755
index 000000000..cc8158fcf
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/vhdl.php
@@ -0,0 +1,181 @@
+<?php
+/*************************************************************************************
+ * vhdl.php
+ * --------
+ * Author: Alexander 'E-Razor' Krause (admin@erazor-zone.de)
+ * Contributors:
+ *  - Kevin Thibedeau (kevinpt@yahoo.com)
+ * Copyright: (c) 2005 Alexander Krause
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/06/15
+ *
+ * VHDL (VHSICADL, very high speed integrated circuit HDL) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/4/30 (1.0.8.10)
+ *  -  Reworked to support new features of VHDL-2008.
+ *  -    Changes include: multi-line comments, all new keywords, PSL keywords and metacomments,
+ *  -    based literals, attribute highlighting, preprocessor macros (from PSL), and other small
+ *  -    improvements.
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *  -  Optimized regexp group 0 somewhat
+ * 2006/06/15 (1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'VHDL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        // PSL adds C-preprocessor support
+        1 => '/(?<=\s)#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        // PSL metacomments (single-line only for now)
+        2 => '/--\s*@?psl(?:.)*?;$/m',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            'access','after','alias','all','attribute','architecture','array','begin',
+            'block','body','buffer','bus','case','case?','component','configuration','constant','context',
+            'disconnect','downto','else','elsif','end','entity','exit','file','for','force',
+            'function','generate','generic','group','guarded','if','impure','in',
+            'inertial','inout','is','label','library','linkage','literal','loop',
+            'map','new','next','null','of','on','open','others','out','package',
+            'port','postponed','procedure','process','protected','pure','range','record','register',
+            'reject','release','report','return','select','severity','shared','signal','subtype',
+            'then','to','transport','type','unaffected','units','until','use','variable',
+            'wait','when','while','with'
+            ),
+        /*types and standard libs*/
+        2 => array(
+            'bit','bit_vector','character','boolean','integer','real','time','delay_length','string',
+            'severity_level','positive','natural','signed','unsigned','line','text',
+            'std_logic','std_logic_vector','std_ulogic','std_ulogic_vector',
+            'sfixed','ufixed','float','float32','float64','float128',
+            'work','ieee','std_logic_1164','math_real','math_complex','textio',
+            'numeric_std','numeric_std_signed','numeric_std_unsigned','numeric_bit'
+            ),
+        /*operators*/
+        3 => array(
+            'abs','and','mod','nor','not','or','rem','rol','ror','sla','sll','sra','srl','xnor','xor'
+            ),
+        /*psl*/
+        4 => array(
+            'assert','assume','assume_guarantee','clock','const','countones','cover','default',
+            'endpoint','fairness','fell','forall','inf','inherit','isunknown','onehot','onehot0','property',
+            'prev','restrict','restrict_guarantee','rose','sequence','stable','strong','union','vmode','vprop','vunit'
+            ),
+        /*psl operators*/
+        5 => array(
+            'abort','always','before','before!','before!_','before_','eventually!','never',
+            'next!','next_a','next_a!','next_e','next_e!','next_event','next_event!','next_event_a','next_event_a!',
+            'next_event_e','next_event_e!','until!','until!_','until_','within'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        ';',':',
+        '<','>','=','+','-','*','/','&','|','?'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000066;',
+            4 => 'color: #000080; font-weight: bold;',
+            5 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0000;',
+            //1 => 'color: #ff0000;',
+            2 => 'color: #ee82ee;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Based literals, scientific notation, and time units
+        0 => '(\b\d+#[[:xdigit:]_]+#)|'.
+            '(\b[\d_]+(\.[\d_]+)?[eE][+\-]?[\d_]+)|'.
+            '(\b(hr|min|sec|ms|us|ns|ps|fs)\b)',
+        //Character literals
+        /* GeSHi won't match this pattern for some reason and QUOTEMARKS
+         * can't be used because it interferes with attribute parsing */
+        /*1 => "\b'.'\b",*/
+        //Attributes
+        2 => "'\w+(?!')"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/vim.php b/vendor/easybook/geshi/geshi/vim.php
new file mode 100755
index 000000000..e2e363477
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/vim.php
@@ -0,0 +1,418 @@
+<?php
+/*************************************************************************************
+ * vim.php
+ * ----------------
+ * Author: Swaroop C H (swaroop@swaroopch.com)
+ * Contributors:
+ *  - Laurent Peuch (psycojoker@gmail.com)
+ * Copyright: (c) 2008 Swaroop C H (http://www.swaroopch.com)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/10/19
+ *
+ * Vim scripting language file for GeSHi.
+ *
+ * Reference: http://qbnz.com/highlighter/geshi-doc.html#language-files
+ * All keywords scraped from `:help expression-commands`.
+ * All method names scraped from `:help function-list`.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/19 (1.0.8.2)
+ * - Started.
+ * 2009/07/05
+ * - Fill out list of zillion commands (maybe somes still miss).
+ * - fix a part of the regex, now works for comment that have white space before the "
+ *
+ * TODO (updated 2009/07/05)
+ * -------------------------
+ * - Make this damn string with "" work correctly. I've just remove it for my wiki.
+ * - Make the comment regex able to find comment after some code.
+ *   (i.e: let rocks " unworking comment)
+ * - Make <F1> <F2> ... <Esc> <CR> ... works event if they aren't surround by space.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Vim Script',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/\s*\"[^\"]*?$/m",
+        //Regular expressions (Ported from perl.php)
+//        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'au', 'augroup', 'autocmd', 'brea', 'break', 'bufadd',
+            'bufcreate', 'bufdelete', 'bufenter', 'buffilepost',
+            'buffilepre', 'bufleave', 'bufnew', 'bufnewfile',
+            'bufread', 'bufreadcmd', 'bufreadpost', 'bufreadpre',
+            'bufunload', 'bufwinenter', 'bufwinleave', 'bufwipeout',
+            'bufwrite', 'bufwritecmd', 'bufwritepost', 'bufwritepre',
+            'call', 'cat', 'catc', 'catch', 'cmd-event', 'cmdwinenter',
+            'cmdwinleave', 'colorscheme', 'con', 'confirm', 'cont', 'conti',
+            'contin', 'continu', 'continue', 'cursorhold', 'cursorholdi',
+            'cursormoved', 'cursormovedi', 'ec', 'echo', 'echoe',
+            'echoer', 'echoerr', 'echoh', 'echohl', 'echom', 'echoms',
+            'echomsg', 'echon', 'el', 'els', 'else', 'elsei', 'elseif',
+            'en', 'encodingchanged', 'end', 'endfo', 'endfor', 'endi',
+            'endif', 'endt', 'endtr', 'endtry', 'endw', 'endwh', 'endwhi',
+            'endwhil', 'endwhile', 'exe', 'exec', 'execu', 'execut',
+            'execute', 'fileappendcmd', 'fileappendpost', 'fileappendpre',
+            'filechangedro', 'filechangedshell', 'filechangedshellpost',
+            'filereadcmd', 'filereadpost', 'filereadpre',
+            'filetype', 'filewritecmd', 'filewritepost', 'filewritepre',
+            'filterreadpost', 'filterreadpre', 'filterwritepost',
+            'filterwritepre', 'fina', 'final', 'finall', 'finally',
+            'finish', 'focusgained', 'focuslost', 'for', 'fun', 'func',
+            'funct', 'functi', 'functio', 'function', 'funcundefined',
+            'guienter', 'guifailed', 'hi', 'highlight', 'if', 'in',
+            'insertchange', 'insertenter', 'insertleave', 'let', 'lockv',
+            'lockva', 'lockvar', 'map', 'match', 'menupopup', 'nnoremap',
+            'quickfixcmdpost', 'quickfixcmdpre', 'remotereply', 'retu',
+            'retur', 'return', 'sessionloadpost', 'set', 'setlocal',
+            'shellcmdpost', 'shellfilterpost', 'sourcecmd', 'sourcepre',
+            'spellfilemissing', 'stdinreadpost', 'stdinreadpre',
+            'swapexists', 'syntax', 'tabenter', 'tableave', 'termchanged',
+            'termresponse', 'th', 'thr', 'thro', 'throw', 'tr', 'try', 'unl',
+            'unle', 'unlet', 'unlo', 'unloc', 'unlock', 'unlockv',
+            'unlockva', 'unlockvar', 'user', 'usergettingbored',
+            'vimenter', 'vimleave', 'vimleavepre', 'vimresized', 'wh',
+            'whi', 'whil', 'while', 'winenter', 'winleave'
+            ),
+        2 => array(
+            '&lt;CR&gt;', '&lt;Esc&gt;', '&lt;F1&gt;', '&lt;F10&gt;',
+            '&lt;F11&gt;', '&lt;F12&gt;', '&lt;F2&gt;', '&lt;F3&gt;',
+            '&lt;F4&gt;', '&lt;F5&gt;', '&lt;F6&gt;', '&lt;F7&gt;',
+            '&lt;F8&gt;', '&lt;F9&gt;', '&lt;cr&gt;', '&lt;silent&gt;',
+            '-nargs', 'acd', 'ai', 'akm', 'al', 'aleph',
+            'allowrevins', 'altkeymap', 'ambiwidth', 'ambw',
+            'anti', 'antialias', 'ar', 'arab', 'arabic',
+            'arabicshape', 'ari', 'arshape', 'autochdir',
+            'autoindent', 'autoread', 'autowrite', 'autowriteall',
+            'aw', 'awa', 'background', 'backspace', 'backup',
+            'backupcopy', 'backupdir', 'backupext',
+            'backupskip', 'balloondelay', 'ballooneval', 'balloonexpr',
+            'bdir', 'bdlay', 'beval', 'bex', 'bexpr', 'bg',
+            'bh', 'bin', 'binary', 'biosk', 'bioskey',
+            'bk', 'bkc', 'bl', 'bomb', 'breakat', 'brk',
+            'bs', 'bsdir', 'bsk', 'bt', 'bufhidden',
+            'buftype', 'casemap', 'cb',
+            'ccv', 'cd', 'cdpath', 'cedit', 'cf', 'cfu', 'ch',
+            'charconvert', 'ci', 'cin', 'cink',
+            'cinkeys', 'cino', 'cinoptions', 'cinw', 'cinwords',
+            'clipboard', 'cmdheight', 'cmdwinheight',
+            'cmp', 'cms', 'co', 'columns', 'com',
+            'comc', 'comcl', 'comcle', 'comclea', 'comclear', 'comm',
+            'comma', 'comman', 'command', 'comments', 'commentstring',
+            'compatible', 'completefunc', 'completeopt',
+            'consk', 'conskey', 'copyindent',
+            'cot', 'cp', 'cpo', 'cpoptions', 'cpt',
+            'cscopepathcomp', 'cscopeprg', 'cscopequickfix', 'cscopetag',
+            'cscopetagorder', 'cscopeverbose',
+            'cspc', 'csprg', 'csqf', 'cst', 'csto', 'csverb', 'cuc',
+            'cul', 'cursorcolumn', 'cursorline', 'cwh', 'debug',
+            'deco', 'def', 'define', 'delc', 'delco', 'delcom',
+            'delcombine', 'delcomm', 'delcomman', 'delcommand', 'dex',
+            'dg', 'dict', 'dictionary', 'diff', 'diffexpr',
+            'diffopt', 'digraph', 'dip', 'dir', 'directory', 'display',
+            'dlcomma', 'dy', 'ea', 'ead', 'eadirection',
+            'eb', 'ed', 'edcompatible', 'ef', 'efm',
+            'ei', 'ek', 'enc', 'encoding', 'endfun', 'endofline',
+            'eol', 'ep', 'equalalways', 'equalprg', 'errorbells',
+            'errorfile', 'errorformat', 'esckeys', 'et',
+            'eventignore', 'ex', 'expandtab', 'exrc', 'fcl',
+            'fcs', 'fdc', 'fde', 'fdi', 'fdl', 'fdls', 'fdm',
+            'fdn', 'fdo', 'fdt', 'fen', 'fenc', 'fencs', 'fex',
+            'ff', 'ffs', 'fileencoding', 'fileencodings', 'fileformat',
+            'fileformats', /*'filetype',*/ 'fillchars', 'fk',
+            'fkmap', 'flp', 'fml', 'fmr', 'fo', 'foldclose',
+            'foldcolumn', 'foldenable', 'foldexpr', 'foldignore',
+            'foldlevelstart', 'foldmarker', 'foldmethod', 'foldminlines',
+            'foldnestmax', 'foldopen', 'formatexpr', 'formatlistpat',
+            'formatoptions', 'formatprg', 'fp', 'fs', 'fsync', 'ft',
+            'gcr', 'gd', 'gdefault', 'gfm', 'gfn', 'gfs', 'gfw',
+            'ghr', 'go', 'gp', 'grepformat', 'grepprg', 'gtl',
+            'gtt', 'guicursor', 'guifont', 'guifontset',
+            'guifontwide', 'guiheadroom', 'guioptions', 'guipty',
+            'guitablabel', 'guitabtooltip', 'helpfile',
+            'helpheight', 'helplang', 'hf', 'hh', 'hid', 'hidden',
+            'history', 'hk', 'hkmap', 'hkmapp', 'hkp', 'hl',
+            'hlg', 'hls', 'hlsearch', 'ic', 'icon', 'iconstring',
+            'ignorecase', 'im', 'imactivatekey', 'imak', 'imc',
+            'imcmdline', 'imd', 'imdisable', 'imi', 'iminsert', 'ims',
+            'imsearch', 'inc', 'include', 'includeexpr',
+            'incsearch', 'inde', 'indentexpr', 'indentkeys',
+            'indk', 'inex', 'inf', 'infercase', 'insertmode', 'is', 'isf',
+            'isfname', 'isi', 'isident', 'isk', 'iskeyword',
+            'isp', 'isprint', 'joinspaces', 'js', 'key',
+            'keymap', 'keymodel', 'keywordprg', 'km', 'kmp', 'kp',
+            'langmap', 'langmenu', 'laststatus', 'lazyredraw', 'lbr',
+            'lcs', 'linebreak', 'lines', 'linespace', 'lisp',
+            'lispwords', 'list', 'listchars', 'lm', 'lmap',
+            'loadplugins', 'lpl', 'ls', 'lsp', 'lw', 'lz', 'ma',
+            'macatsui', 'magic', 'makeef', 'makeprg', 'mat',
+            'matchpairs', 'matchtime', 'maxcombine', 'maxfuncdepth',
+            'maxmapdepth', 'maxmem', 'maxmempattern',
+            'maxmemtot', 'mco', 'mef', 'menuitems', 'mfd', 'mh',
+            'mis', 'mkspellmem', 'ml', 'mls', 'mm', 'mmd', 'mmp',
+            'mmt', 'mod', 'modeline', 'modelines', 'modifiable',
+            'modified', 'more', 'mouse', 'mousef', 'mousefocus',
+            'mousehide', 'mousem', 'mousemodel', 'mouses',
+            'mouseshape', 'mouset', 'mousetime', 'mp', 'mps', 'msm',
+            'mzq', 'mzquantum', 'nf', 'noacd', 'noai', 'noakm',
+            'noallowrevins', 'noaltkeymap', 'noanti', 'noantialias',
+            'noar', 'noarab', 'noarabic', 'noarabicshape', 'noari',
+            'noarshape', 'noautochdir', 'noautoindent', 'noautoread',
+            'noautowrite', 'noautowriteall', 'noaw', 'noawa', 'nobackup',
+            'noballooneval', 'nobeval', 'nobin', 'nobinary', 'nobiosk',
+            'nobioskey', 'nobk', 'nobl', 'nobomb', 'nobuflisted', 'nocf',
+            'noci', 'nocin', 'nocindent', 'nocompatible', 'noconfirm',
+            'noconsk', 'noconskey', 'nocopyindent', 'nocp', 'nocscopetag',
+            'nocscopeverbose', 'nocst', 'nocsverb', 'nocuc', 'nocul',
+            'nocursorcolumn', 'nocursorline', 'nodeco', 'nodelcombine',
+            'nodg', 'nodiff', 'nodigraph', 'nodisable', 'noea', 'noeb',
+            'noed', 'noedcompatible', 'noek', 'noendofline', 'noeol',
+            'noequalalways', 'noerrorbells', 'noesckeys', 'noet',
+            'noex', 'noexpandtab', 'noexrc', 'nofen', 'nofk', 'nofkmap',
+            'nofoldenable', 'nogd', 'nogdefault', 'noguipty', 'nohid',
+            'nohidden', 'nohk', 'nohkmap', 'nohkmapp', 'nohkp', 'nohls',
+            'nohlsearch', 'noic', 'noicon', 'noignorecase', 'noim',
+            'noimc', 'noimcmdline', 'noimd', 'noincsearch', 'noinf',
+            'noinfercase', 'noinsertmode', 'nois', 'nojoinspaces',
+            'nojs', 'nolazyredraw', 'nolbr', 'nolinebreak', 'nolisp',
+            'nolist', 'noloadplugins', 'nolpl', 'nolz', 'noma',
+            'nomacatsui', 'nomagic', 'nomh', 'noml', 'nomod',
+            'nomodeline', 'nomodifiable', 'nomodified', 'nomore',
+            'nomousef', 'nomousefocus', 'nomousehide', 'nonu',
+            'nonumber', 'noodev', 'noopendevice', 'nopaste', 'nopi',
+            'nopreserveindent', 'nopreviewwindow', 'noprompt', 'nopvw',
+            'noreadonly', 'noremap', 'norestorescreen', 'norevins',
+            'nori', 'norightleft', 'norightleftcmd', 'norl', 'norlc',
+            'noro', 'nors', 'noru', 'noruler', 'nosb', 'nosc', 'noscb',
+            'noscrollbind', 'noscs', 'nosecure', 'nosft', 'noshellslash',
+            'noshelltemp', 'noshiftround', 'noshortname', 'noshowcmd',
+            'noshowfulltag', 'noshowmatch', 'noshowmode', 'nosi', 'nosm',
+            'nosmartcase', 'nosmartindent', 'nosmarttab', 'nosmd',
+            'nosn', 'nosol', 'nospell', 'nosplitbelow', 'nosplitright',
+            'nospr', 'nosr', 'nossl', 'nosta', 'nostartofline',
+            'nostmp', 'noswapfile', 'noswf', 'nota', 'notagbsearch',
+            'notagrelative', 'notagstack', 'notbi', 'notbidi', 'notbs',
+            'notermbidi', 'noterse', 'notextauto', 'notextmode',
+            'notf', 'notgst', 'notildeop', 'notimeout', 'notitle',
+            'noto', 'notop', 'notr', 'nottimeout', 'nottybuiltin',
+            'nottyfast', 'notx', 'novb', 'novisualbell', 'nowa',
+            'nowarn', 'nowb', 'noweirdinvert', 'nowfh', 'nowfw',
+            'nowildmenu', 'nowinfixheight', 'nowinfixwidth', 'nowiv',
+            'nowmnu', 'nowrap', 'nowrapscan', 'nowrite', 'nowriteany',
+            'nowritebackup', 'nows', 'nrformats', 'nu', 'number',
+            'numberwidth', 'nuw', 'odev', 'oft', 'ofu',
+            'omnifunc', 'opendevice', 'operatorfunc', 'opfunc',
+            'osfiletype', 'pa', 'para', 'paragraphs',
+            'paste', 'pastetoggle', 'patchexpr',
+            'patchmode', 'path', 'pdev', 'penc', 'pex', 'pexpr',
+            'pfn', 'ph', 'pheader', 'pi', 'pm', 'pmbcs',
+            'pmbfn', 'popt', 'preserveindent', 'previewheight',
+            'previewwindow', 'printdevice', 'printencoding', 'printexpr',
+            'printfont', 'printheader', 'printmbcharset',
+            'printmbfont', 'printoptions', 'prompt', 'pt', 'pumheight',
+            'pvh', 'pvw', 'qe', 'quoteescape', 'rdt',
+            'readonly', 'redrawtime', 'remap', 'report',
+            'restorescreen', 'revins', 'ri', 'rightleft', 'rightleftcmd',
+            'rl', 'rlc', 'ro', 'rs', 'rtp', 'ru',
+            'ruf', 'ruler', 'rulerformat', 'runtimepath', 'sb', 'sbo',
+            'sbr', 'sc', 'scb', 'scr', 'scroll', 'scrollbind',
+            'scrolljump', 'scrolloff', 'scrollopt',
+            'scs', 'sect', 'sections', 'secure', 'sel',
+            'selection', 'selectmode', 'sessionoptions', 'sft',
+            'sh', 'shcf', 'shell', 'shellcmdflag', 'shellpipe',
+            'shellquote', 'shellredir', 'shellslash',
+            'shelltemp', 'shelltype', 'shellxquote', 'shiftround',
+            'shiftwidth', 'shm', 'shortmess', 'shortname',
+            'showbreak', 'showcmd', 'showfulltag', 'showmatch',
+            'showmode', 'showtabline', 'shq', 'si', 'sidescroll',
+            'sidescrolloff', 'siso', 'sj', 'slm', 'sm', 'smartcase',
+            'smartindent', 'smarttab', 'smc', 'smd', 'sn',
+            'so', 'softtabstop', 'sol', 'sp', 'spc', 'spell',
+            'spellcapcheck', 'spellfile', 'spelllang',
+            'spf', 'spl', 'splitbelow', 'splitright', 'spr',
+            'sps', 'sr', 'srr', 'ss', 'ssl', 'ssop', 'st', 'sta',
+            'stal', 'startofline', 'statusline', 'stl', 'stmp',
+            'sts', 'su', 'sua', 'suffixes', 'suffixesadd', 'sw',
+            'swapfile', 'swapsync', 'swb', 'swf', 'switchbuf',
+            'sws', 'sxq', 'syn', 'synmaxcol', 'ta',
+            'tabline', 'tabpagemax', 'tabstop', 'tag',
+            'tagbsearch', 'taglength', 'tagrelative', 'tags', 'tagstack',
+            'tal', 'tb', 'tbi', 'tbidi', 'tbis', 'tbs',
+            'tenc', 'term', 'termbidi', 'termencoding', 'terse',
+            'textauto', 'textmode', 'textwidth', 'tf', 'tgst',
+            'thesaurus', 'tildeop', 'timeout', 'timeoutlen',
+            'title', 'titlelen', 'titleold', 'titlestring',
+            'tl', 'tm', 'to', 'toolbar', 'toolbariconsize', 'top',
+            'tpm', 'ts', 'tsl', 'tsr', 'ttimeout',
+            'ttimeoutlen', 'ttm', 'tty', 'ttybuiltin', 'ttyfast', 'ttym',
+            'ttymouse', 'ttyscroll', 'ttytype', 'tw', 'tx', 'uc',
+            'ul', 'undolevels', 'updatecount', 'updatetime', 'ut',
+            'vb', 'vbs', 'vdir', 've', 'verbose', 'verbosefile',
+            'vfile', 'vi', 'viewdir', 'viewoptions', 'viminfo',
+            'virtualedit', 'visualbell', 'vop', 'wa', 'wak',
+            'warn', 'wb', 'wc', 'wcm', 'wd', 'weirdinvert', 'wfh',
+            'wfw', /*'wh',*/ 'whichwrap', 'wi', 'wig', 'wildchar',
+            'wildcharm', 'wildignore', 'wildmenu',
+            'wildmode', 'wildoptions', 'wim', 'winaltkeys', 'window',
+            'winfixheight', 'winfixwidth', 'winheight',
+            'winminheight', 'winminwidth', 'winwidth', 'wiv',
+            'wiw', 'wm', 'wmh', 'wmnu', 'wmw', 'wop', 'wrap',
+            'wrapmargin', 'wrapscan', 'write', 'writeany',
+            'writebackup', 'writedelay', 'ws', 'ww'
+            ),
+        3 => array(
+            'BufAdd', 'BufCreate', 'BufDelete', 'BufEnter', 'BufFilePost',
+            'BufFilePre', 'BufHidden', 'BufLeave', 'BufNew', 'BufNewFile',
+            'BufRead', 'BufReadCmd', 'BufReadPost', 'BufReadPre',
+            'BufUnload', 'BufWinEnter', 'BufWinLeave', 'BufWipeout',
+            'BufWrite', 'BufWriteCmd', 'BufWritePost', 'BufWritePre',
+            'Cmd-event', 'CmdwinEnter', 'CmdwinLeave', 'ColorScheme',
+            'CursorHold', 'CursorHoldI', 'CursorMoved', 'CursorMovedI',
+            'EncodingChanged', 'FileAppendCmd', 'FileAppendPost',
+            'FileAppendPre', 'FileChangedRO', 'FileChangedShell',
+            'FileChangedShellPost', 'FileEncoding', 'FileReadCmd',
+            'FileReadPost', 'FileReadPre', 'FileType',
+            'FileWriteCmd', 'FileWritePost', 'FileWritePre',
+            'FilterReadPost', 'FilterReadPre', 'FilterWritePost',
+            'FilterWritePre', 'FocusGained', 'FocusLost', 'FuncUndefined',
+            'GUIEnter', 'GUIFailed', 'InsertChange', 'InsertEnter',
+            'InsertLeave', 'MenuPopup', 'QuickFixCmdPost',
+            'QuickFixCmdPre', 'RemoteReply', 'SessionLoadPost',
+            'ShellCmdPost', 'ShellFilterPost', 'SourceCmd',
+            'SourcePre', 'SpellFileMissing', 'StdinReadPost',
+            'StdinReadPre', 'SwapExists', 'Syntax', 'TabEnter',
+            'TabLeave', 'TermChanged', 'TermResponse', 'User',
+            'UserGettingBored', 'VimEnter', 'VimLeave', 'VimLeavePre',
+            'VimResized', 'WinEnter', 'WinLeave', 'abs', 'add', 'append',
+            'argc', 'argidx', 'argv', 'atan', 'browse', 'browsedir',
+            'bufexists', 'buflisted', 'bufloaded', 'bufname', 'bufnr',
+            'bufwinnr', 'byte2line', 'byteidx', 'ceil', 'changenr',
+            'char2nr', 'cindent', 'clearmatches', 'col', 'complete',
+            'complete_add', 'complete_check', 'copy',
+            'cos', 'count', 'cscope_connection', 'cursor', 'deepcopy',
+            'delete', 'did_filetype', 'diff_filler', 'diff_hlID',
+            'empty', 'escape', 'eval', 'eventhandler', 'executable',
+            'exists', 'expand', 'extend', 'feedkeys', 'filereadable',
+            'filewritable', 'filter', 'finddir', 'findfile', 'float2nr',
+            'floor', 'fnameescape', 'fnamemodify', 'foldclosed',
+            'foldclosedend', 'foldlevel', 'foldtext', 'foldtextresult',
+            'foreground', 'garbagecollect', 'get', 'getbufline',
+            'getbufvar', 'getchar', 'getcharmod', 'getcmdline',
+            'getcmdpos', 'getcmdtype', 'getcwd', 'getfontname',
+            'getfperm', 'getfsize', 'getftime', 'getftype', 'getline',
+            'getloclist', 'getmatches', 'getpid', 'getpos', 'getqflist',
+            'getreg', 'getregtype', 'gettabwinvar', 'getwinposx',
+            'getwinposy', 'getwinvar', 'glob', 'globpath', 'has',
+            'has_key', 'haslocaldir', 'hasmapto', 'histadd', 'histdel',
+            'histget', 'histnr', 'hlID', 'hlexists', 'hostname', 'iconv',
+            'indent', 'index', 'input', 'inputdialog', 'inputlist',
+            'inputrestore', 'inputsave', 'inputsecret', 'insert',
+            'isdirectory', 'islocked', 'items', 'join', 'keys', 'len',
+            'libcall', 'libcallnr', 'line', 'line2byte', 'lispindent',
+            'localtime', 'log10', 'maparg', 'mapcheck', 'matchadd',
+            'matcharg', 'matchdelete', 'matchend', 'matchlist',
+            'matchstr', 'max', 'min', 'mkdir', 'mode', 'nextnonblank',
+            'nr2char', 'off', 'on', 'pathshorten', 'plugin', 'pow',
+            'prevnonblank', 'printf', 'pumvisible', 'range', 'readfile',
+            'reltime', 'reltimestr', 'remote_expr', 'remote_foreground',
+            'remote_peek', 'remote_read', 'remote_send', 'remove',
+            'rename', 'repeat', 'resolve', 'reverse', 'round', 'search',
+            'searchdecl', 'searchpair', 'searchpairpos', 'searchpos',
+            'server2client', 'serverlist', 'setbufvar', 'setcmdpos',
+            'setline', 'setloclist', 'setmatches', 'setpos', 'setqflist',
+            'setreg', 'settabwinvar', 'setwinvar', 'shellescape',
+            'simplify', 'sin', 'sort', 'soundfold', 'spellbadword',
+            'spellsuggest', 'split', 'sqrt', 'str2float', 'str2nr',
+            'strftime', 'stridx', 'string', 'strlen', 'strpart',
+            'strridx', 'strtrans', 'submatch', 'substitute',
+            'synID', 'synIDattr', 'synIDtrans', 'synstack', 'system',
+            'tabpagebuflist', 'tabpagenr', 'tabpagewinnr', 'tagfiles',
+            'taglist', 'tempname', 'tolower', 'toupper', 'trunc',
+            'type', 'values', 'virtcol', 'visualmode', 'winbufnr',
+            'wincol', 'winline', 'winnr', 'winrestcmd',
+            'winrestview', 'winsaveview', 'writefile'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>',
+        '^', '-', '+', '~', '?', ':', '$', '@', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+//            2 => 'color: #009966; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'KEYWORDS' => array(
+            1 => 'color: #804040;',
+            2 => 'color: #668080;',
+            3 => 'color: #25BB4D;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #C5A22D;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false, //Save some time as OO identifiers aren't used
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
diff --git a/vendor/easybook/geshi/geshi/visualfoxpro.php b/vendor/easybook/geshi/geshi/visualfoxpro.php
new file mode 100755
index 000000000..123a3db41
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/visualfoxpro.php
@@ -0,0 +1,456 @@
+<?php
+/*************************************************************************************
+ * visualfoxpro.php
+ * ----------------
+ * Author: Roberto Armellin (r.armellin@tin.it)
+ * Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/09/17
+ *
+ * Visual FoxPro language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Removed tab as a symbol char
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/10/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Visual Fox Pro',
+    'COMMENT_SINGLE' => array(1 => "//", 2 => "\n*"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'Case', 'Else', '#Else', 'Then',
+            'Endcase', 'Enddefine', 'Enddo', 'Endfor', 'Endfunc', 'Endif', 'Endprintjob',
+            'Endproc', 'Endscan', 'Endtext', 'Endwith', '#Endif',
+            '#Elif','#Define','#If','#Include',
+            '#Itsexpression','#Readclauses','#Region','#Section','#Undef','#Wname',
+            'Define','Do',
+            'For','Function','Hidden',
+            'If','Local','Lparameter','Lparameters','Next','Otherwise',
+            'Parameters','Printjob','Procedure','Protected','Public','Scan',
+            'Text','While','With','Abs','Accept','Access','Aclass','Acopy',
+            'Acos','Adatabases','Adbobjects','Addbs','Addrelationtoenv','Addtabletoenv',
+            'Adel','Adir','Aelement','Aerror','Afields','Afont',
+            'Agetclass','Agetfileversion','Ains','Ainstance','Alen','Align',
+            'Alines','Alltrim','Alter','Amembers','Amouseobj','Anetresources',
+            'Ansitooem','Append','Aprinters','Ascan','Aselobj','Asin',
+            'Asort','Assert','Asserts','Assist','Asubscript','Asynchronous',
+            'At_c','Atan','Atc','Atcc','Atcline','Atline',
+            'Atn2','Aused','Autoform','Autoreport','Avcxclasses','Average',
+            'BarCount','BarPrompt','BatchMode','BatchUpdateCount','Begin','BellSound',
+            'BinToC','Bitand','Bitclear','Bitlshift','Bitnot',
+            'Bitor','Bitrshift','Bitset','Bittest','Bitxor','Bof',
+            'Browse','BrowseRefresh','Buffering','BuilderLock','COMArray','COMReturnError',
+            'CToBin','Calculate','Call','Capslock','Cd','Cdow',
+            'Ceiling','Central','Change','Char','Chdir','Chr',
+            'Chrsaw','Chrtran','Chrtranc','Close','Cmonth','Cntbar',
+            'Cntpad','Col','Comclassinfo','CommandTargetQuery','Compile','Completed',
+            'Compobj','Compute','Concat','ConnectBusy','ConnectHandle','ConnectName',
+            'ConnectString','ConnectTimeOut','ContainerReleaseType','Continue','Copy','Cos',
+            'Cot','Count','Coverage','Cpconvert','Cpcurrent','Cpdbf',
+            'Cpnotrans','Create','CreateBinary','Createobject','Createobjectex','Createoffline',
+            'CrsBuffering','CrsFetchMemo','CrsFetchSize','CrsMaxRows','CrsMethodUsed','CrsNumBatch',
+            'CrsShareConnection','CrsUseMemoSize','CrsWhereClause','Ctod','Ctot',
+            'Curdate','Curdir','CurrLeft','CurrSymbol','CursorGetProp','CursorSetProp',
+            'Curtime','Curval','DBGetProp','DBSetProp','DB_BufLockRow','DB_BufLockTable',
+            'DB_BufOff','DB_BufOptRow','DB_BufOptTable','DB_Complette','DB_DeleteInsert','DB_KeyAndModified',
+            'DB_KeyAndTimestamp','DB_KeyAndUpdatable','DB_LocalSQL','DB_NoPrompt','DB_Prompt','DB_RemoteSQL',
+            'DB_TransAuto','DB_TransManual','DB_TransNone','DB_Update','Datetime','Day',
+            'Dayname','Dayofmonth','Dayofweek','Dayofyear','Dbalias','Dbused',
+            'Ddeaborttrans','Ddeadvise','Ddeenabled','Ddeexecute','Ddeinitiate','Ddelasterror',
+            'Ddepoke','Dderequest','Ddesetoption','Ddesetservice','Ddesettopic','Ddeterminate',
+            'Debugout','Declare','DefOLELCid','DefaultValue','Defaultext','Degrees',
+            'DeleteTrigger','Desc','Description','Difference','Dimension','Dir',
+            'Directory','Diskspace','DispLogin','DispWarnings','Display','Dll',
+            'Dmy','DoDefault','DoEvents','Doc','Dow',
+            'Drivetype','Drop','Dropoffline','Dtoc','Dtor','Dtos',
+            'Dtot','DynamicInputMask','Each','Edit','Eject','Elif',
+            'End','Eof','Erase','Evaluate','Event','Eventtracking',
+            'Exclude','Exclusive','Exit','Exp','Export','External',
+            'FDate','FTime','Fchsize','Fclose','Fcount','Fcreate',
+            'Feof','Ferror','FetchMemo','FetchSize','Fflush','Fgets',
+            'Filer','Filetostr','Find','Fklabel','Fkmax','Fldlist',
+            'Flock','Floor','Flush','Fontmetric','Fopen','Forceext',
+            'Forcepath','FormSetClass','FormSetLib','FormsClass','FormsLib','Found',
+            'FoxPro','Foxcode','Foxdoc','Foxgen','Foxgraph','Foxview',
+            'Fputs','Fread','French','Fseek','Fsize','Fv',
+            'Fwrite','Gather','German','GetPem','Getbar','Getcolor',
+            'Getcp','Getdir','Getenv','Getexpr','Getfile','Getfldstate',
+            'Getfont','Gethost','Getnextmodified','Getobject','Getpad','Getpict',
+            'Getprinter','Go','Gomonth','Goto','Graph','GridHorz',
+            'GridShow','GridShowPos','GridSnap','GridVert','Help','HelpOn',
+            'HelpTo','HighLightRow','Home','Hour','IMEStatus','IdleTimeOut',
+            'Idxcollate','Ifdef','Ifndef','Iif','Import','Include',
+            'Indbc','Index','Indexseek','Inkey','Inlist','Input',
+            'Insert','InsertTrigger','Insmode','IsBlank','IsFLocked','IsLeadByte',
+            'IsMouse','IsNull','IsRLocked','Isalpha','Iscolor','Isdigit',
+            'IsExclusive','Ishosted','IsLower','IsReadOnly',
+            'IsUpper','Italian','Japan','Join','Justdrive','Justext',
+            'Justfname','Justpath','Juststem','KeyField','KeyFieldList','Keyboard'
+            ),
+        2 => array('Keymatch','LastProject','Lastkey','Lcase','Leftc','Len',
+            'Lenc','Length','Likec','Lineno','LoadPicture',
+            'Locate','Locfile','Log','Log10','Logout','Lookup',
+            'Loop','Lower','Ltrim','Lupdate','Mail','MaxRecords',
+            'Mcol','Md','Mdown','Mdx','Mdy','Memlines',
+            'Menu','Messagebox','Minute','Mkdir','Mline','Modify',
+            'Month','Monthname','Mouse','Mrkbar','Mrkpad','Mrow',
+            'Mtdll','Mton','Mwindow','Native','Ndx','Network',
+            'NoFilter','Nodefault','Normalize','Note','Now','Ntom',
+            'NullString','Numlock','Nvl','ODBChdbc','ODBChstmt','OLEDropTextInsertion',
+            'OLELCid','Objnum','Objref','Objtoclient','Objvar','Occurs',
+            'Oemtoansi','Oldval','OlePublic','Olereturnerror','On','Open',
+            'Oracle','Order','Os','Outer','PCount','Pack',
+            'PacketSize','Padc','Padl','Padr','Payment','Pcol',
+            'PemStatus','Pi','Pivot','Play','Pop','Popup',
+            'Power','PrimaryKey','Printstatus','Private','Prmbar','Prmpad',
+            'ProjectClick','Proper','Prow','Prtinfo','Push','Putfile',
+            'Pv','Qpr','Quater','QueryTimeOut','Quit','Radians',
+            'Rand','Rat','Ratc','Ratline','Rd','Rdlevel',
+            'Read','Readkey','Recall','Reccount','RecentlyUsedFiles','Recno',
+            'Recsize','Regional','Reindex','RelatedChild','RelatedTable','RelatedTag',
+            'Remove','Rename','Repeat','Replace','Replicate','Report',
+            'ResHeight','ResWidth','ResourceOn','ResourceTo','Resources','Restore',
+            'Resume','Retry','Return','Revertoffline','Rgbscheme','Rightc',
+            'Rlock','Rmdir','Rollback','Round','Rtod','Rtrim',
+            'RuleExpression','RuleText','Run','Runscript','Rview','SQLAsynchronous',
+            'SQLBatchMode','SQLCancel','SQLColumns','SQLConnect','SQLConnectTimeOut','SQLDisconnect',
+            'SQLDispLogin','SQLDispWarnings','SQLExec','SQLGetProp','SQLIdleTimeOut','SQLMoreResults',
+            'SQLPrepare','SQLQueryTimeOut','SQLSetProp','SQLTables','SQLTransactions','SQLWaitTime',
+            'Save','SavePicture','ScaleUnits','Scatter','Scols',
+            'Scroll','Sec','Second','Seek','Select','SendUpdates',
+            'Set','SetDefault','Setfldstate','Setup','ShareConnection','ShowOLEControls',
+            'ShowOLEInsertable','ShowVCXs','Sign','Sin','Size','SizeBox',
+            'Skpbar','Skppad','Sort','Soundex','SourceName','Sqlcommit',
+            'Sqll','Sqlrollback','Sqlstringconnect','Sqrt','Srows','StatusBar',
+            'Store','Str','Strconv','Strtofile','Strtran','Stuff',
+            'Stuffc','Substr','Substrc','Substring','Sum','Suspend',
+            'Sys','Sysmetric','TabOrdering','Table','TableRefresh','Tablerevert',
+            'Tableupdate','TagCount','TagNo','Tan','Target','This',
+            'Thisform','Thisformset','Timestamp','Timestampdiff','Total','Transactions',
+            'Transform','Trim','Truncate','Ttoc','Ttod','Txnlevel',
+            'Txtwidth','Type','Ucase','Undefine','Unlock','Unpack',
+            'Updatable','UpdatableFieldList','Update','UpdateName','UpdateNameList','UpdateTrigger',
+            'UpdateType','Updated','Upper','Upsizing','Usa','Use',
+            'UseMemoSize','Used','Val','Validate','Varread','Vartype',
+            'Version','VersionLanguage','Wait','WaitTime','Wborder','Wchild',
+            'Wcols','Week','Wexist','Wfont','WhereType','Windcmd',
+            'Windhelp','Windmemo','Windmenu','Windmodify','Windquery','Windscreen',
+            'Windsnip','Windstproc','WizardPrompt','Wlast','Wlcol','Wlrow',
+            'Wmaximum','Wminimum','Wontop','Woutput','Wparent','Wread',
+            'Wrows','Wtitle','Wvisible','Year','Zap','_Alignment',
+            '_Asciicols','_Asciirows','_Assist','_Beautify','_Box','_Browser',
+            '_Builder','_Calcmem','_Calcvalue','_Cliptext','_Converter','_Coverage',
+            '_Curobj','_Dblclick','_Diarydate','_Dos','_Foxdoc','_Foxgraph',
+            '_Gallery','_Gengraph','_Genhtml','_Genmenu','_Genpd','_Genscrn',
+            '_Genxtab','_Getexpr','_Include','_Indent','_Lmargin','_Mac',
+            '_Mbr_appnd','_Mbr_cpart','_Mbr_delet','_Mbr_font','_Mbr_goto','_Mbr_grid',
+            '_Mbr_link','_Mbr_mode','_Mbr_mvfld','_Mbr_mvprt','_Mbr_seek','_Mbr_sp100',
+            '_Mbr_sp200','_Mbr_szfld','_Mbrowse','_Mda_appnd','_Mda_avg','_Mda_brow',
+            '_Mda_calc','_Mda_copy','_Mda_count','_Mda_label','_Mda_pack','_Mda_reprt',
+            '_Mda_rindx','_Mda_setup','_Mda_sort','_Mda_sp100','_Mda_sp200','_Mda_sp300',
+            '_Mda_sum','_Mda_total','_Mdata','_Mdiary','_Med_clear','_Med_copy',
+            '_Med_cut','_Med_cvtst','_Med_find','_Med_finda','_Med_goto','_Med_insob',
+            '_Med_link','_Med_obj','_Med_paste','_Med_pref','_Med_pstlk','_Med_redo',
+            '_Med_repl','_Med_repla','_Med_slcta','_Med_sp100','_Med_sp200','_Med_sp300',
+            '_Med_sp400','_Med_sp500','_Med_undo','_Medit','_Mfi_clall','_Mfi_close',
+            '_Mfi_export','_Mfi_import','_Mfi_new','_Mfi_open','_Mfi_pgset','_Mfi_prevu',
+            '_Mfi_print','_Mfi_quit','_Mfi_revrt','_Mfi_savas','_Mfi_save','_Mfi_send',
+            '_Mfi_setup','_Mfi_sp100','_Mfi_sp200','_Mfi_sp300','_Mfi_sp400','_Mfile',
+            '_Mfiler','_Mfirst','_Mlabel','_Mlast','_Mline','_Mmacro',
+            '_Mmbldr','_Mpr_beaut','_Mpr_cancl','_Mpr_compl','_Mpr_do','_Mpr_docum',
+            '_Mpr_formwz','_Mpr_gener','_Mpr_graph','_Mpr_resum','_Mpr_sp100','_Mpr_sp200',
+            '_Mpr_sp300','_Mpr_suspend','_Mprog','_Mproj','_Mrc_appnd','_Mrc_chnge',
+            '_Mrc_cont','_Mrc_delet','_Mrc_goto','_Mrc_locat','_Mrc_recal','_Mrc_repl',
+            '_Mrc_seek','_Mrc_sp100','_Mrc_sp200','_Mrecord','_Mreport','_Mrqbe',
+            '_Mscreen','_Msm_data','_Msm_edit','_Msm_file','_Msm_format','_Msm_prog',
+            '_Msm_recrd','_Msm_systm','_Msm_text','_Msm_tools','_Msm_view','_Msm_windo',
+            '_Mst_about','_Mst_ascii','_Mst_calcu','_Mst_captr','_Mst_dbase','_Mst_diary',
+            '_Mst_filer','_Mst_help','_Mst_hphow','_Mst_hpsch','_Mst_macro','_Mst_office',
+            '_Mst_puzzl','_Mst_sp100','_Mst_sp200','_Mst_sp300','_Mst_specl','_Msysmenu',
+            '_Msystem','_Mtable','_Mtb_appnd','_Mtb_cpart','_Mtb_delet','_Mtb_delrc',
+            '_Mtb_goto','_Mtb_link','_Mtb_mvfld','_Mtb_mvprt','_Mtb_props','_Mtb_recal',
+            '_Mtb_sp100','_Mtb_sp200','_Mtb_sp300','_Mtb_sp400','_Mtb_szfld','_Mwi_arran',
+            '_Mwi_clear','_Mwi_cmd','_Mwi_color','_Mwi_debug','_Mwi_hide','_Mwi_hidea',
+            '_Mwi_min','_Mwi_move','_Mwi_rotat','_Mwi_showa','_Mwi_size','_Mwi_sp100',
+            '_Mwi_sp200','_Mwi_toolb','_Mwi_trace','_Mwi_view','_Mwi_zoom','_Mwindow',
+            '_Mwizards','_Mwz_all','_Mwz_form','_Mwz_foxdoc','_Mwz_import','_Mwz_label',
+            '_Mwz_mail','_Mwz_pivot','_Mwz_query','_Mwz_reprt','_Mwz_setup','_Mwz_table',
+            '_Mwz_upsizing','_Netware','_Oracle','_Padvance','_Pageno','_Pbpage',
+            '_Pcolno','_Pcopies','_Pdparms','_Pdriver','_Pdsetup','_Pecode',
+            '_Peject','_Pepage','_Pform','_Plength','_Plineno','_Ploffset',
+            '_Ppitch','_Pquality','_Pretext','_Pscode','_Pspacing','_Pwait',
+            '_Rmargin','_Runactivedoc','_Samples','_Screen','_Shell','_Spellchk',
+            '_Sqlserver','_Startup','_Tabs','_Tally','_Text','_Throttle',
+            '_Transport','_Triggerlevel','_Unix','_WebDevOnly','_WebMenu','_WebMsftHomePage',
+            '_WebVFPHomePage','_WebVfpOnlineSupport','_Windows','_Wizard','_Wrap','_scctext',
+            '_vfp','Additive','After','Again','Aindent','Alignright',
+            'All','Alt','Alternate','And','Ansi','Any',
+            'Aplabout','App','Array','As','Asc','Ascending',
+            'Ascii','At','Attributes','Automatic','Autosave','Avg',
+            'Bar','Before','Bell','Between','Bitmap','Blank',
+            'Blink','Blocksize','Border','Bottom','Brstatus','Bucket',
+            'Buffers','By','Candidate','Carry','Cascade','Catalog',
+            'Cdx','Center','Century','Cga','Character','Check',
+            'Classlib','Clock','Cnt','Codepage','Collate','Color',
+            'Com1','Com2','Command','Compact','Compatible','Compress',
+            'Confirm','Connection','Connections','Connstring','Console','Copies',
+            'Cpcompile','Cpdialog','Csv','Currency','Cycle','Databases',
+            'Datasource','Date','Db4','Dbc','Dbf','Dbmemo3',
+            'Debug','Decimals','Defaultsource','Deletetables','Delimited','Delimiters',
+            'Descending','Design','Development','Device','Dif','Disabled',
+            'Distinct','Dlls','Dohistory','Dos','Dosmem','Double',
+            'Driver','Duplex','Echo','Editwork','Ega25','Ega43',
+            'Ems','Ems64','Encrypt','Encryption','Environment','Escape',
+            'Events','Exact','Except','Exe','Exists','Expression',
+            'Extended','F','Fdow','Fetch','Field','Fields',
+            'File','Files','Fill','Fixed','Float','Foldconst',
+            'Font','Footer','Force','Foreign','Fox2x','Foxplus',
+            'Free','Freeze','From','Fullpath','Fw2','Fweek',
+            'Get','Gets','Global','Group','Grow','Halfheight',
+            'Having','Heading','Headings','Helpfilter','History','Hmemory',
+            'Hours','Id','In','Indexes','Information','Instruct',
+            'Int','Integer','Intensity','Intersect','Into','Is',
+            'Isometric','Key','Keycolumns','Keycomp','Keyset','Last',
+            'Ledit','Level','Library','Like','Linked','Lock',
+            'Logerrors','Long','Lpartition','Mac','Macdesktop','Machelp',
+            'Mackey','Macros','Mark','Master','Max','Maxmem',
+            'Mdi','Memlimit','Memory','Memos','Memowidth','Memvar',
+            'Menus','Messages','Middle','Min','Minimize','Minus',
+            'Mod','Modal','Module','Mono43','Movers','Multilocks',
+            'Mvarsiz','Mvcount','N','Near','Negotiate','Noalias',
+            'Noappend','Noclear','Noclose','Noconsole','Nocptrans','Nodata',
+            'Nodebug','Nodelete','Nodup','Noedit','Noeject','Noenvironment',
+            'Nofloat','Nofollow','Nogrow','Noinit','Nolgrid','Nolink',
+            'Nolock','Nomargin','Nomdi','Nomenu','Nominimize','Nomodify'
+            ),
+        3 => array('Nomouse','None','Nooptimize','Nooverwrite','Noprojecthook','Noprompt',
+            'Noread','Norefresh','Norequery','Norgrid','Norm','Normal',
+            'Nosave','Noshadow','Noshow','Nospace','Not','Notab',
+            'Notify','Noupdate','Novalidate','Noverify','Nowait','Nowindow',
+            'Nowrap','Nozoom','Npv','Null','Number','Objects',
+            'Odometer','Of','Off','Oleobjects','Only','Optimize',
+            'Or','Orientation','Output','Outshow','Overlay','Overwrite',
+            'Pad','Palette','Paperlength','Papersize','Paperwidth','Password',
+            'Path','Pattern','Pause','Pdox','Pdsetup','Pen',
+            'Pfs','Pixels','Plain','Popups','Precision','Preference',
+            'Preview','Primary','Printer','Printquality','Procedures','Production',
+            'Program','Progwork','Project','Prompt','Query','Random',
+            'Range','Readborder','Readerror','Record','Recover','Redit',
+            'Reference','References','Relative','Remote','Reprocess','Resource',
+            'Rest','Restrict','Rgb','Right','Row','Rowset',
+            'Rpd','Runtime','Safety','Same','Sample','Say',
+            'Scale','Scheme','Scoreboard','Screen','Sdf','Seconds',
+            'Selection','Shadows','Shared','Sheet','Shell','Shift',
+            'Shutdown','Single','Some','Sortwork','Space','Sql',
+            'Standalone','Status','Std','Step','Sticky','String',
+            'Structure','Subclass','Summary','Sylk','Sysformats','Sysmenus',
+            'System','T','Tab','Tables','Talk','Tedit',
+            'Textmerge','Time','Timeout','Titles','Tmpfiles','To',
+            'Topic','Transaction','Trap','Trbetween','Trigger','Ttoption',
+            'Typeahead','Udfparms','Union','Unique','Userid','Users',
+            'Values','Var','Verb','Vga25','Vga50','Views',
+            'Volume','Where','Windows','Wk1','Wk3','Wks',
+            'Workarea','Wp','Wr1','Wrap','Wrk','Xcmdfile',
+            'Xl5','Xl8','Xls','Y','Yresolution','Zoom',
+            'Activate','ActivateCell','Add','AddColumn','AddItem','AddListItem',
+            'AddObject','AddProperty','AddToSCC','AfterBuild','AfterCloseTables','AfterDock',
+            'AfterRowColChange','BeforeBuild','BeforeDock','BeforeOpenTables','BeforeRowColChange','Box',
+            'Build','CheckIn','CheckOut','Circle','Clear','ClearData',
+            'Cleanup','Click','CloneObject','CloseEditor','CloseTables','Cls',
+            'CommandTargetExec','CommandTargetQueryStas','ContainerRelease','DataToClip','DblClick','Deactivate',
+            'Delete','DeleteColumn','Deleted','Destroy','DoCmd','Dock',
+            'DoScroll','DoVerb','DownClick','Drag','DragDrop','DragOver',
+            'DropDown','Draw','EnterFocus','Error','ErrorMessage','Eval',
+            'ExitFocus','FormatChange','GetData','GetFormat','GetLatestVersion','GoBack',
+            'GotFocus','GoForward','GridHitTest','Hide','HideDoc','IndexToItemId',
+            'Init','InteractiveChange','Item','ItemIdToIndex','KeyPress','Line',
+            'Load','LostFocus','Message','MiddleClick','MouseDown','MouseMove',
+            'MouseUp','MouseWheel','Move','Moved','NavigateTo','Newobject',
+            'OLECompleteDrag','OLEDrag','OLEDragDrop','OLEDragOver','OLEGiveFeedback','OLESetData',
+            'OLEStartDrag','OpenEditor','OpenTables','Paint','Point','Print',
+            'ProgrammaticChange','PSet','QueryAddFile','QueryModifyFile','QueryRemoveFile','QueryRunFile',
+            'QueryUnload','RangeHigh','RangeLow','ReadActivate','ReadExpression','ReadDeactivate',
+            'ReadMethod','ReadShow','ReadValid','ReadWhen','Refresh','Release',
+            'RemoveFromSCC','RemoveItem','RemoveListItem','RemoveObject','Requery','RequestData',
+            'Reset','ResetToDefault','Resize','RightClick','SaveAs','SaveAsClass',
+            'Scrolled','SetAll','SetData','SetFocus','SetFormat','SetMain',
+            'SetVar','SetViewPort','ShowDoc','ShowWhatsThis','TextHeight','TextWidth',
+            'Timer','UIEnable','UnDock','UndoCheckOut','Unload','UpClick',
+            'Valid','WhatsThisMode','When','WriteExpression','WriteMethod','ZOrder',
+            'ATGetColors','ATListColors','Accelerate','ActiveColumn','ActiveControl','ActiveForm',
+            'ActiveObjectId','ActivePage','ActiveProject','ActiveRow','AddLineFeeds','Alias',
+            'Alignment','AllowAddNew','AllowHeaderSizing','AllowResize','AllowRowSizing','AllowTabs',
+            'AlwaysOnTop','Application','AutoActivate','AutoCenter','AutoCloseTables','AutoIncrement',
+            'AutoOpenTables','AutoRelease','AutoSize','AutoVerbMenu','AutoYield','AvailNum',
+            'BackColor','BackStyle','BaseClass','BorderColor','BorderStyle','BorderWidth',
+            'Bound','BoundColumn','BoundTo','BrowseAlignment','BrowseCellMarg','BrowseDestWidth',
+            'BufferMode','BufferModeOverride','BuildDateTime','ButtonCount','ButtonIndex','Buttons',
+            'CLSID','CanAccelerate','CanGetFocus','CanLoseFocus','Cancel','Caption',
+            'ChildAlias','ChildOrder','Class','ClassLibrary','ClipControls','ClipRect',
+            'Closable','ColorScheme','ColorSource','ColumnCount','ColumnHeaders','ColumnLines',
+            'ColumnOrder','ColumnWidths','Columns','Comment','ContinuousScroll','ControlBox',
+            'ControlCount','ControlIndex','ControlSource','Controls','CurrentControl','CurrentX',
+            'CurrentY','CursorSource','Curvature','DataSession','DataSessionId','DataSourceObj',
+            'DataType','Database','DateFormat','DateMark','DefButton','DefButtonOrig',
+            'DefHeight','DefLeft','DefTop','DefWidth','Default','DefaultFilePath',
+            'DefineWindows','DeleteMark','Desktop','Dirty','DisabledBackColor','DisabledByEOF',
+            'DisabledForeColor','DisabledItemBackColor','DisabledItemForeColor','DisabledPicture','DispPageHeight','DispPageWidth',
+            'DisplayCount','DisplayValue','DoCreate','DockPosition','Docked','DocumentFile',
+            'DownPicture','DragIcon','DragMode','DragState','DrawMode','DrawStyle',
+            'DrawWidth','DynamicAlignment','DynamicBackColor','DynamicCurrentControl','DynamicFontBold','DynamicFontItalic',
+            'DynamicFontName','DynamicFontOutline','DynamicFontShadow','DynamicFontSize','DynamicFontStrikethru','DynamicFontUnderline',
+            'DynamicForeColor','EditFlags','Enabled','EnabledByReadLock','Encrypted','EnvLevel',
+            'ErasePage','FileClass','FileClassLibrary','FillColor','FillStyle','Filter',
+            'FirstElement','FontBold','FontItalic','FontName','FontOutline','FontShadow',
+            'FontSize','FontStrikethru','FontUnderline','ForceFocus','ForeColor','FormCount',
+            'FormIndex','FormPageCount','FormPageIndex','Format','Forms','FoxFont',
+            'FullName','GoFirst','GoLast','GridLineColor','GridLineWidth','GridLines'
+            ),
+        4 => array('HPROJ','HWnd','HalfHeightCaption','HasClip','HeaderGap','HeaderHeight',
+            'Height','HelpContextID','HideSelection','Highlight','HomeDir','HostName',
+            'HotKey','HscrollSmallChange','IMEMode','Icon','IgnoreInsert','InResize',
+            'Increment','IncrementalSearch','InitialSelectedAlias','InputMask','Instancing','IntegralHeight',
+            'Interval','ItemBackColor','ItemData','ItemForeColor','ItemIDData','ItemTips',
+            'JustReadLocked','KeyPreview','KeyboardHighValue','KeyboardLowValue','LastModified','Left',
+            'LeftColumn','LineSlant','LinkMaster','List','ListCount','ListIndex',
+            'ListItem','ListItemId','LockDataSource','LockScreen','MDIForm','MainClass',
+            'MainFile','Margin','MaxButton','MaxHeight','MaxLeft','MaxLength',
+            'MaxTop','MaxWidth','MemoWindow','MinButton','MinHeight','MinWidth',
+            'MouseIcon','MousePointer','Movable','MoverBars','MultiSelect','Name',
+            'NapTime','NewIndex','NewItemId','NoDataOnLoad','NoDefine','NotifyContainer',
+            'NullDisplay','NumberOfElements','OLEDragMode','OLEDragPicture','OLEDropEffects','OLEDropHasData',
+            'OLEDropMode','OLERequestPendingTimeOut','OLEServerBusyRaiseError','OLEServerBusyTimeOut','OLETypeAllowed','OleClass',
+            'OleClassId','OleControlContainer','OleIDispInValue','OleIDispOutValue','OleIDispatchIncoming','OleIDispatchOutgoing',
+            'OnResize','OneToMany','OpenViews','OpenWindow','PageCount','PageHeight',
+            'PageOrder','PageWidth','Pages','Panel','PanelLink','Parent',
+            'ParentAlias','ParentClass','Partition','PasswordChar','Picture','ProcessID',
+            'ProgID','ProjectHookClass','ProjectHookLibrary','Projects','ReadColors','ReadCycle',
+            'ReadFiller','ReadLock','ReadMouse','ReadOnly','ReadSave','ReadSize',
+            'ReadTimeout','RecordMark','RecordSource','RecordSourceType','Rect','RelationalExpr',
+            'RelativeColumn','RelativeRow','ReleaseErase','ReleaseType','ReleaseWindows','Resizable',
+            'RightToLeft','RowHeight','RowSource','RowSourceType','SCCProvider','SCCStatus',
+            'SDIForm','ScaleMode','ScrollBars','SelLength','SelStart','SelText',
+            'SelectOnEntry','Selected','SelectedBackColor','SelectedForeColor','SelectedID','SelectedItemBackColor',
+            'SelectedItemForeColor','SelfEdit','ServerClass','ServerClassLibrary','ServerHelpFile','ServerName',
+            'ServerProject','ShowTips','ShowWindow','Sizable','Size<height>','Size<maxlength>',
+            'Size<width>','Skip','SkipForm','Sorted','SourceType','Sparse',
+            'SpecialEffect','SpinnerHighValue','SpinnerLowValue','SplitBar','StartMode','StatusBarText',
+            'Stretch','StrictDateEntry','Style','SystemRefCount','TabIndex','TabStop',
+            'TabStretch','TabStyle','Tabhit','Tabs','Tag','TerminateRead',
+            'ThreadID','TitleBar','ToolTipText','Top','TopIndex','TopItemId',
+            'TypeLibCLSID','TypeLibDesc','TypeLibName','UnlockDataSource','Value','ValueDirty',
+            'VersionComments','VersionCompany','VersionCopyright','VersionDescription','VersionNumber','VersionProduct',
+            'VersionTrademarks','View','ViewPortHeight','ViewPortLeft','ViewPortTop','ViewPortWidth',
+            'Visible','VscrollSmallChange','WasActive','WasOpen','WhatsThisButton','WhatsThisHelp',
+            'WhatsThisHelpID','Width','WindowList','WindowNTIList','WindowState','WindowType',
+            'WordWrap','ZOrderSet','ActiveDoc','Checkbox','Column','ComboBox',
+            'CommandButton','CommandGroup','Container','Control','Cursor','Custom',
+            'DataEnvironment','EditBox','Empty','FontClass','Form','Formset',
+            'General','Grid','Header','HyperLink','Image','Label',
+            'ListBox','Memo','OleBaseControl','OleBoundControl','OleClassIDispOut','OleControl',
+            'OptionButton','OptionGroup','Page','PageFrame','ProjectHook','RectClass',
+            'Relation','Session','Shape','Spinner','TextBox' ,'Toolbar'
+            ),
+        ),
+    'SYMBOLS' => array(
+        "!", "@", "$", "%",
+        "(", ")", "{", "}", "[", "]",
+        "-", "+", "*", "/",
+        "=", "<", ">",
+        ":", ";", ",", ".", "&",
+        "?", "??", "???"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: blue;',
+            2 => 'color: blue;',
+            3 => 'color: blue;',
+            4 => 'color: blue;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: green; font-style: italic;',
+            2 => 'color: green; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: blue;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: blue;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/visualprolog.php b/vendor/easybook/geshi/geshi/visualprolog.php
new file mode 100755
index 000000000..26c438d21
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/visualprolog.php
@@ -0,0 +1,127 @@
+<?php
+/*************************************************************************************
+ * visualprolog.php
+ * ----------
+ * Author: Thomas Linder Puls (puls@pdc.dk)
+ * Copyright: (c) 2008 Thomas Linder Puls (puls@pdc.dk)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/11/20
+ *
+ * Visual Prolog language file for GeSHi.
+ *
+ * CHANGES
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Visual Prolog',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'clauses','constants','constructors','delegate','domains','facts',
+            'goal','guards','inherits','monitor','namespace','open',
+            'predicates','properties','resolve','supports'
+            ),
+        2 => array(
+            'align','and','anyflow','as','bitsize','catch','determ','digits',
+            'div','do','else','elseif','erroneous','externally','failure',
+            'finally','from','language','mod','multi','nondeterm','or',
+            'procedure','quot','rem','single','then','to'
+            ),
+        3 => array(
+            '#bininclude','#else','#elseif','#endif','#error','#export',
+            '#externally','#if','#import','#include','#message','#options',
+            '#orrequires','#requires','#then','#warning'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '>', '<', '^', '!', ':', '(', ')', '{', '}', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #808000;',
+            2 => 'color: #333399;',
+            3 => 'color: #800080;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #AA77BD',
+            'MULTI' => 'color: #AA77BD'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00B7B7;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #808000;',
+            2 => 'color: #333399;',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => ':',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => "(?<![a-zA-Z0-9_])(?!(?:PIPE|SEMI)>)[A-Z_]\w*(?!\w)",
+        1 => "\\b(end\\s+)?(implement|class|interface)\\b",
+        2 => "\\b(end\\s+)?(foreach|if|try)\\b",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/whitespace.php b/vendor/easybook/geshi/geshi/whitespace.php
new file mode 100755
index 000000000..eec0be3f6
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/whitespace.php
@@ -0,0 +1,119 @@
+<?php
+/*************************************************************************************
+ * whitespace.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2009/10/31
+ *
+ * Whitespace language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'Whitespace',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        3 => "/[^\n\x20\x09]+/s"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            3 => 'color: #666666; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            2 => 'background-color: #FF9999;',
+            3 => 'background-color: #9999FF;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        2 => array(
+            GESHI_SEARCH => "(?<!\\A)\x20",
+            GESHI_REPLACE => "&#32;",
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        3 => array(
+            GESHI_SEARCH => "\x09",
+            GESHI_REPLACE => "&#9;",
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'KEYWORDS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+//            'REGEXPS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/whois.php b/vendor/easybook/geshi/geshi/whois.php
new file mode 100755
index 000000000..a89e4731d
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/whois.php
@@ -0,0 +1,181 @@
+<?php
+/*************************************************************************************
+ * whois.php
+ * --------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/09/14
+ *
+ * Whois response (RPSL format) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/09/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Whois (RPSL format)',
+    'COMMENT_SINGLE' => array(1 => '% ', 2 => '%ERROR:'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Description
+        3 => '/(?:(?<=^remarks:)|(?<=^descr:))(.|\n\s)*$/mi',
+
+        //Contact Details
+        4 => '/(?<=^address:)(.|\n\s)*$/mi',
+        5 => '/\+\d+(?:(?:\s\(\d+(\s\d+)*\))?(?:\s\d+)+|-\d+-\d+)/',
+        6 => '/\b(?!-|\.)[\w\-\.]+(?!-|\.)@((?!-)[\w\-]+\.)+\w+\b/',
+
+        //IP, Networks and AS information\links
+        7 => '/\b(?<!\.|\-)(?:[\da-f:]+(?!\.)|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?:\/1?\d\d?)?(?<!\.|\-)\b/',
+        8 => '/\bAS\d+\b/'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array( //Object Types
+            'as-block','as-set','aut-num','domain','filter-set','inet-rtr',
+            'inet6num','inetnum','irt','key-cert','limerick','mntner',
+            'organisation','peering-set','person','poem','role','route-set',
+            'route','route6','rtr-set'
+            ),
+        2 => array( //Field Types
+            'abuse-mailbox','address','admin-c','aggr-bndry','aggr-mtd','alias',
+            'as-block','as-name','as-set','aut-num','auth','author','certif',
+            'changed','components','country','default','descr','dom-net',
+            'domain','ds-rdata','e-mail','encryption','export','export-comps',
+            'fax-no','filter','filter-set','fingerpr','form','holes','ifaddr',
+            'import','inet-rtr','inet6num','inetnum','inject','interface','irt',
+            'irt-nfy','key-cert','limerick','local-as','mbrs-by-ref',
+            'member-of','members','method','mnt-by','mnt-domains','mnt-irt',
+            'mnt-lower','mnt-nfy','mnt-ref','mnt-routes','mntner','mp-default',
+            'mp-export','mp-filter','mp-import','mp-members','mp-peer',
+            'mp-peering','netname','nic-hdl','notify','nserver','org',
+            'org-name','org-type','organisation','origin','owner','peer',
+            'peering','peering-set','person','phone','poem','ref-nfy','refer',
+            'referral-by','remarks','rev-srv','role','route','route-set',
+            'route6','rtr-set','signature','source','status','sub-dom','tech-c',
+            'text','upd-to','zone-c'
+            ),
+        3 => array( //RPSL reserved
+            'accept','action','and','announce','any','as-any','at','atomic',
+            'except','from','inbound','into','networks','not','or','outbound',
+            'peeras','refine','rs-any','to'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #000080; font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #404080;',
+            4 => 'color: #408040;',
+            5 => 'color: #408040;',
+            6 => 'color: #408040;',
+            7 => 'color: #804040;',
+            8 => 'color: #804040;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => '',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000080;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.irr.net/docs/rpsl.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A |\A \n(?m:^)|\n\n(?m:^))'
+                ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?m:^)'
+                )
+            ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'ESCAPE_CHAR' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER,
+            'METHODS' => GESHI_NEVER,
+            'SCRIPT' => GESHI_NEVER
+            )
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/winbatch.php b/vendor/easybook/geshi/geshi/winbatch.php
new file mode 100755
index 000000000..3599a027c
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/winbatch.php
@@ -0,0 +1,369 @@
+<?php
+/*************************************************************************************
+ * winbatch.php
+ * ------------
+ * Author: Craig Storey (storey.craig@gmail.com)
+ * Copyright: (c) 2004 Craig Storey (craig.xcottawa.ca)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/05/19
+ *
+ * WinBatch language file for GeSHi.
+ *
+ * WinBatch is a Windows scripting language - www.winbatch.com.
+ * The keywords were pulled from the winbatch/system/WIL.clr file for v2005G.
+ * Not all extender functions are added, but a very large set of the most common.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/05/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * - Right now any ':Subroutine' is treated as a comment. This highlights the
+ *   Subroutine's name, but it's not a perfect fix. I should use a RegEx in
+ *   GeSHI_Search&Replace features..
+ * - Update the list of extender functions.
+ * - Use a regular expression to comment UDFs that start with 'udf_'.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Winbatch',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => ':'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'While', 'To', 'Then', 'Switch', 'Select', 'Return', 'Next', 'IntControl', 'Include', 'In', 'If',
+            'Goto', 'GoSub', 'ForEach', 'For', 'Exit', 'Execute', 'ErrorMode', 'EndWhile', 'EndSwitch', '#EndSubRoutine',
+            'EndSelect', 'EndIf', '#EEndFunction', 'EndFor', 'End', 'Else', 'DropWild', 'Drop', '#DefineSubRoutine',
+            '#DefineFunction', 'Debug', 'Continue', 'Case', 'CallExt', 'Call', 'By', 'BreakPoint', 'Break'
+            ),
+        2 => array(
+            'ZOOMED', 'YES', 'WORD4', 'WORD2', 'WORD1', 'WHOLESECTION', 'WAIT', 'UNSORTED', 'UNCHECK', 'TRUE', 'TILE',
+            'TAB', 'STRING', 'STACK', 'SPC2NET', 'SORTED', 'SOK', 'SNET2PC', 'SINGLE', 'SHIFT', 'SERVER', 'SERRWINSOCK',
+            'SERRVOICE', 'SERRSOCKET', 'SERRSERVICE', 'SERRSELECT', 'SERRPARAM', 'SERROUTOFMEM', 'SERRNOTFOUND', 'SERRNOCONN',
+            'SERRNOANSWER', 'SERRMUSTWAIT', 'SERRIPADDR', 'SERRHOSTNAME', 'SERRFAILURE', 'SERRBUSY', 'SCROLLLOCK', 'SCANCEL',
+            'SAVE', 'SALREADY', 'ROWS', 'REGUSERS', 'REGROOT', 'REGMACHINE', 'REGCURRENT', 'REGCLASSES', 'RDBLCLICK', 'RCLICK',
+            'RBUTTON', 'RAD2DEG', 'QSUCCESSINFO', 'QSUCCESS', 'QSTILLEX', 'QROLLBACK', 'QNULL', 'QNODATA', 'QNEXT', 'QNEEDDATA',
+            'QFIRST', 'QCOMMIT', 'QBADHANDLE', 'PRINTER', 'PLANCKJOULES', 'PLANCKERGS', 'PI', 'PARSEONLY', 'PARSEC', 'P3ERRREPLY',
+            'OPEN', 'ON', 'OFF', 'NUMLOCK', 'NOWAIT', 'NOTIFY', 'NORMAL', 'NORESIZE', 'NONE', 'NO', 'NCSAFORMAT', 'MULTIPLE',
+            'MSFORMAT', 'MPLAYRDBLCK', 'MPLAYRCLK', 'MPLAYRBUTTON', 'MPLAYMDBLCK', 'MPLAYMCLK', 'MPLAYMBUTTON', 'MPLAYLDBLCK',
+            'MPLAYLCLK', 'MPLAYLBUTTON', 'MINOR', 'MDBLCLICK', 'MCLICK', 'MBYESNO', 'MBUTTON', 'MBOKCANCEL', 'MAJOR', 'MAGFIELD',
+            'LOCALGROUP', 'LIGHTMTPS', 'LIGHTMPS', 'LF', 'LDBLCLICK', 'LCLICK', 'LBUTTON', 'LAFFDBERROR', 'ICON', 'HTTPS', 'HTTP',
+            'HNOHEADER', 'HMETHODPOST', 'HMETHODGET', 'HIDDEN', 'HHEADERONLY', 'HHEADER', 'GRAVITATION', 'GOPHER', 'GOLDENRATIO',
+            'GMTSEC', 'GLOBALGROUP', 'GFTSEC', 'GETPROCID', 'GETEXITCODE', 'FWDSCAN', 'FTPPASSIVE', 'FTP', 'FLOAT8', 'FARADAY',
+            'FALSE', 'EXTENDED', 'EULERS', 'ENABLE', 'ELECTRIC', 'DRIVE', 'DISABLE', 'DESCENDING', 'DEG2RAD', 'DEFAULT', 'CTRL',
+            'CRLF', 'CR', 'COMMONFORMAT', 'COLUMNS', 'CHECK', 'CAPSLOCK', 'CANCEL', 'BOLTZMANN', 'BACKSCAN', 'AVOGADRO', 'ATTR_X',
+            'ATTR_T', 'ATTR_SY', 'ATTR_SH', 'ATTR_RO', 'ATTR_RI', 'ATTR_P', 'ATTR_IC', 'ATTR_H', 'ATTR_DM', 'ATTR_DI', 'ATTR_DC',
+            'ATTR_CI', 'ATTR_A', 'ASCENDING', 'ARRANGE', 'AMC', 'ACC_WRITE', 'ACC_READ_NT', 'ACC_READ_95', 'ACC_READ', 'ACC_PRINT_NT',
+            'ACC_PMANG_NT', 'ACC_PFULL_NT', 'ACC_LIST', 'ACC_FULL_NT', 'ACC_FULL_95', 'ACC_DELETE', 'ACC_CREATE', 'ACC_CONTROL',
+            'ACC_CHNG_NT', 'ACC_ATTRIB', 'ABOVEICONS'
+            ),
+        3 => array(
+            'Yields', 'Yield', 'WinZoom', 'WinWaitExist', 'WinWaitClose', 'WinWaitChild', 'WinVersion', 'WinTitle', 'WinSysInfo',
+            'WinState', 'WinShow', 'WinResources', 'WinPositionChild', 'WinPosition', 'WinPlaceSet', 'WinPlaceGet', 'WinPlaceChild',
+            'WinPlace', 'WinParmSet', 'WinParmGet', 'WinName', 'WinMetrics', 'WinItemProcId', 'WinItemNameId', 'WinItemizeEx',
+            'WinItemize', 'WinItemChild', 'WinIsDos', 'WinIdGet', 'WinIconize', 'WinHide', 'WinHelp', 'WinGetactive', 'WinExistchild',
+            'WinExist', 'WinExename', 'WinConfig', 'WinClosenot', 'WinClose', 'WinArrange', 'WinActivechild', 'WinActivchild',
+            'WinActivate', 'WebVerifyCard', 'WebSetTimeout', 'WebParamSize', 'WebParamNames', 'WebParamFile', 'WebParamData',
+            'WebParamBuf', 'WebOutFile', 'WebOutBinary', 'WebOut', 'WebDumpError', 'WebDatData', 'WebCounter', 'WebConSize', 'WebConData',
+            'WebConBuf', 'WebCmdData', 'WebBaseConv', 'Wallpaper', 'WaitForKeyEX', 'WaitForKey', 'VersionDLL', 'Version', 'VarType',
+            'TimeYmdHms', 'TimeWait', 'TimeSubtract', 'TimeJulToYmd', 'TimeJulianDay', 'TimeDiffSecs', 'TimeDiffDays', 'TimeDiff', 'TimeDelay',
+            'TimeDate', 'TimeAdd', 'TextSelect', 'TextBoxSort', 'TextBox', 'Terminate', 'Tanh', 'Tan', 'SysParamInfo', 'SvcWaitForCmd',
+            'SvcSetState', 'SvcSetAccept', 'StrUpper', 'StrTrim', 'StrSubWild', 'StrSub', 'StrScan', 'StrReplace', 'StrLower', 'StrLenWild',
+            'StrLen', 'StrIndexWild', 'StrIndexNC', 'StrIndex', 'StriCmp', 'StrFixLeft', 'StrFixCharsL', 'StrFixChars', 'StrFix', 'StrFill',
+            'StrCnt', 'StrCmp', 'StrClean', 'StrCharCount', 'StrCat', 'StrByteCount', 'Sqrt', 'SoundVolume', 'Sounds', 'Snapshot', 'Sinh', 'Sin',
+            'ShortCutMake', 'ShortCutInfo', 'ShortCutExtra', 'ShortCutEdit', 'ShortCutDir', 'ShellExecute', 'SendMenusToEx', 'SendMenusTo',
+            'SendKeysTo', 'SendKeysChild', 'SendKey', 'RunZoomWait', 'RunZoom', 'RunWithLogon', 'RunWait', 'RunShell', 'RunIconWait',
+            'RunIcon', 'RunHideWait', 'RunHide', 'RunExit', 'RunEnviron', 'Run', 'RtStatus', 'Reload', 'RegUnloadHive', 'RegSetValue',
+            'RegSetQword', 'RegSetMulSz', 'RegSetExpSz', 'RegSetEx', 'RegSetDword', 'RegSetBin', 'RegQueryValue', 'RegQueryStr',
+            'RegQueryQword', 'RegQueryMulSz', 'RegQueryKeys', 'RegQueryKeyLastWriteTime', 'RegQueryKey', 'RegQueryItem', 'RegQueryExpSz',
+            'RegQueryEx', 'RegQueryDword', 'RegQueryBin', 'RegOpenKeyEx', 'RegOpenKey', 'RegOpenFlags', 'RegLoadHive', 'RegExistValue',
+            'RegExistKey', 'RegEntryType', 'RegDelValue', 'RegDeleteKey', 'RegCreateKey', 'RegConnect', 'RegCloseKey', 'RegApp', 'Random',
+            'PtrPersistent', 'PtrGlobalDefine', 'PtrGlobal', 'Print', 'PlayWaveform', 'PlayMidi', 'PlayMedia', 'PipeServerWrite', 'PipeServerRead',
+            'PipeServerCreate', 'PipeServerClose', 'PipeInfo', 'PipeClientSendRecvData', 'PipeClientOpen', 'PipeClientClose', 'Pause',
+            'ParseData', 'ObjectTypeGet', 'ObjectType', 'ObjectOpen', 'ObjectGet', 'ObjectEventRemove', 'ObjectEventAdd',
+            'ObjectCreate', 'ObjectConstToArray', 'ObjectConstantsGet', 'ObjectCollectionOpen', 'ObjectCollectionNext',
+            'ObjectCollectionClose', 'ObjectClose', 'ObjectAccess', 'Num2Char', 'NetInfo', 'MsgTextGet', 'MousePlay', 'MouseMove', 'MouseInfo',
+            'MouseDrag', 'MouseCoords', 'MouseClickBtn', 'MouseClick', 'mod', 'Min', 'Message', 'Max', 'Loge', 'LogDisk', 'Log10', 'LastError',
+            'KeyToggleSet', 'KeyToggleGet', 'ItemSortNc', 'ItemSort', 'ItemSelect', 'ItemReplace', 'ItemRemove', 'ItemLocate', 'ItemInsert',
+            'ItemExtractCSV', 'ItemExtract', 'ItemCountCSV', 'ItemCount', 'IsNumber', 'IsLicensed', 'IsKeyDown', 'IsInt', 'IsFloat', 'IsDefined',
+            'Int', 'InstallFile', 'IniWritePvt', 'IniWrite', 'IniReadPvt', 'IniRead', 'IniItemizePvt', 'IniItemize', 'IniDeletePvt', 'IniDelete',
+            'IgnoreInput', 'IconReplace', 'IconInfo', 'IconExtract', 'IconArrange', 'GetTickCount', 'GetObject', 'GetExactTime', 'Floor',
+            'FindWindow', 'FileYmdHms', 'FileWrite', 'FileVerInfo', 'FileTimeTouch', 'FileTimeSetEx', 'FileTimeSet', 'FileTimeGetEx',
+            'FileTimeGet', 'FileTimeCode', 'FileSizeEx', 'FileSize', 'FileRoot', 'FileRename', 'FileRead', 'FilePutW', 'FilePut', 'FilePath',
+            'FileOpen', 'FileNameShort', 'FileNameLong', 'FileNameEval2', 'FileNameEval1', 'FileMoveAttr', 'FileMove', 'FileMapName',
+            'FileLocate', 'FileItemPath', 'FileItemize', 'FileInfoToArray', 'FileGetW', 'FileGet', 'FileFullname', 'FileExtension', 'FileExist',
+            'FileDelete', 'FileCreateTemp', 'FileCopyAttr', 'FileCopy', 'FileCompare', 'FileClose', 'FileBaseName', 'FileAttrSetEx',
+            'FileAttrSet', 'FileAttrGetEx', 'FileAttrGet', 'FileAppend', 'Fabs', 'ExtractAttachedFile', 'Exp', 'ExeTypeInfo', 'Exclusive',
+            'EnvItemize', 'EnvironSet', 'Environment', 'EndSession', 'DosVersion', 'DllLoad', 'DllLastError', 'DllHwnd', 'DllHinst',
+            'DllFree', 'DllCallCDecl', 'DllCall', 'Display', 'DiskVolinfo', 'DiskSize', 'DiskScan', 'DiskInfo', 'DiskFree', 'DiskExist',
+            'DirWindows', 'DirSize', 'DirScript', 'DirRename', 'DirRemove', 'DirMake', 'DirItemize', 'DirInfoToArray', 'DirHome', 'DirGet',
+            'DirExist', 'DirChange', 'DirAttrSetEx', 'DirAttrSet', 'DirAttrGetEx', 'DirAttrGet', 'DialogProcOptions', 'DialogObject',
+            'DialogControlState', 'DialogControlSet', 'DialogControlGet', 'DialogBox', 'Dialog', 'Delay', 'Decimals', 'DebugTrace',
+            'DebugData', 'DDETimeout', 'DDETerminate', 'DDERequest', 'DDEPoke', 'DDEInitiate', 'DDEExecute', 'DateTime', 'CurrFilepath',
+            'CurrentPath', 'CurrentFile', 'CreateObject', 'Cosh', 'Cos', 'ClipPut', 'ClipHasFormat', 'ClipGetEx', 'ClipGet', 'ClipAppend',
+            'ChrUnicodeToString', 'ChrUnicodeToHex', 'ChrStringToUnicode', 'ChrSetCodepage', 'ChrHexToUnicode', 'ChrGetCodepage',
+            'Char2Num', 'Ceiling', 'ButtonNames', 'BoxUpdates', 'BoxTitle', 'BoxTextFont', 'BoxTextColor', 'BoxText', 'BoxShut', 'BoxPen',
+            'BoxOpen', 'BoxNew', 'BoxMapmode', 'BoxesUp', 'BoxDrawText', 'BoxDrawRect', 'BoxDrawLine', 'BoxDrawCircle', 'BoxDestroy',
+            'BoxDataTag', 'BoxDataClear', 'BoxColor', 'BoxCaption', 'BoxButtonWait', 'BoxButtonStat', 'BoxButtonKill', 'BoxButtonDraw',
+            'BoxBitMap', 'BinaryXor', 'BinaryXlate', 'BinaryWriteEx', 'BinaryWrite', 'BinaryTagRepl', 'BinaryTagLen', 'BinaryTagInit',
+            'BinaryTagIndex', 'BinaryTagFind', 'BinaryTagExtr', 'BinaryStrCnt', 'BinarySort', 'BinaryReplace', 'BinaryReadEx',
+            'BinaryRead', 'BinaryPokeStrW', 'BinaryPokeStr', 'BinaryPokeHex', 'BinaryPokeFlt', 'BinaryPoke4', 'BinaryPoke2', 'BinaryPoke',
+            'BinaryPeekStrW', 'BinaryPeekStr', 'BinaryPeekHex', 'BinaryPeekFlt', 'BinaryPeek4', 'BinaryPeek2', 'BinaryPeek', 'BinaryOr',
+            'BinaryOleType', 'BinaryIndexNc', 'BinaryIndexEx', 'BinaryIndexBin', 'BinaryIndex', 'BinaryIncrFlt', 'BinaryIncr4',
+            'BinaryIncr2', 'BinaryIncr', 'BinaryHashRec', 'BinaryFree', 'BinaryEodSet', 'BinaryEodGet', 'BinaryCopy', 'BinaryConvert',
+            'BinaryCompare', 'BinaryClipPut', 'BinaryClipGet', 'BinaryChecksum', 'BinaryBufInfo', 'BinaryAnd', 'BinaryAllocArray',
+            'BinaryAlloc', 'Beep', 'Average', 'Atan', 'AskYesNo', 'AskTextbox', 'AskPassword', 'AskLine', 'AskItemlist', 'AskFont',
+            'AskFiletext', 'AskFilename', 'AskDirectory', 'AskColor', 'Asin', 'ArrInitialize', 'ArrInfo', 'ArrDimension',
+            'Arrayize', 'ArrayFilePutCSV', 'ArrayFilePut', 'ArrayFileGetCSV', 'ArrayFileGet', 'AppWaitClose', 'AppExist', 'AddExtender',
+            'Acos', 'Abs', 'About'
+            ),
+        4 => array(
+            'zZipFiles', 'zVersionInfo', 'zVersion', 'zUnZipFiles', 'zSetPortBit', 'zRPortShift', 'zPortOut', 'zPortIn', 'zNotPortBit',
+            'zLPortShift', 'zGetPortBit', 'zClrPortBit', 'xVerifyCCard', 'xSendMessage', 'xMessageBox', 'xMemCompact', 'xHex', 'xGetElapsed',
+            'xGetChildHwnd', 'xExtenderInfo', 'xEnumStreams', 'xEjectMedia', 'xDriveReady', 'xDiskLabelGet', 'xCursorSet', 'xBaseConvert',
+            'wxPing', 'wxParmSet', 'wxParmGet', 'wxMsgSetHdr', 'wxMsgGetHdr', 'wxMsgGetBody', 'wxHost2Addr', 'wxGetLastErr', 'wxGetInfo',
+            'wxGetErrDesc', 'wxAddr2Host', 'wtsWaitSystemEvent', 'wtsVersion', 'wtsTerminateProcess', 'wtsShutdownSystem', 'wtsSendMessage',
+            'wtsQuerySessionInfo', 'wtsProcIdToSessId', 'wtsLogoffSession', 'wtsLastErrMsg', 'wtsIsTSEnabled', 'wtsIsCitrixEnabled',
+            'wtsGetActiveConsoleSessId', 'wtsEnumSessions', 'wtsEnumProcesses', 'wtsDisconnectSession', 'wnWrkGroups', 'wnVersion', 'wntWtsUserSet',
+            'wntWtsUserGet', 'wntVersion', 'wntUserSidChk', 'wntUserSetDat', 'wntUserRename', 'wntUserProps', 'wntUserList', 'wntUserInfo',
+            'wntUserGetDat', 'wntUserFiles', 'wntUserExist', 'wntUserDel', 'wntUserAddDat', 'wntUserAdd', 'wntSvcStatus', 'wntSvcStart',
+            'wntSvcList', 'wntSvcDelete', 'wntSvcCreate', 'wntSvcControl', 'wntSvcCfgSet', 'wntSvcCfgGet', 'wntShutdown', 'wntShareUsers',
+            'wntShareSet', 'wntShareList', 'wntShareInfo', 'wntShareDel', 'wntShareAdd', 'wntServiceInf', 'wntServiceAt', 'wntServerType',
+            'wntServerList', 'wntServerInfo', 'wntSecurityGet', 'wntRunAsUser', 'wntResources2', 'wntResources', 'wntRemoteTime', 'wntRasUserSet',
+            'wntRasUserGet', 'wntProfileInfo', 'wntProfileDel', 'wntPrivUsers', 'wntPrivList', 'wntPrivGet', 'wntPrivDel', 'wntPrivAdd',
+            'wntOwnerSet', 'wntOwnerGet', 'wntMemberSet', 'wntMemberLst2', 'wntMemberList', 'wntMemberGrps', 'wntMemberGet', 'wntMemberDel',
+            'wntLsaPolSet', 'wntLsaPolGet', 'wntListGroups', 'wntLastErrMsg', 'wntGroupRen', 'wntGroupInfo', 'wntGroupEdit', 'wntGroupDel',
+            'wntGroupAdd', 'wntGetUser', 'wntGetDrive', 'wntGetDc', 'wntGetCon', 'wntFileUsers', 'wntFilesOpen', 'wntFileClose', 'wntEventWrite',
+            'wntEventLog', 'wntDomainSync', 'wntDirDialog', 'wntDfsList', 'wntDfsGetInfo', 'wntCurrUsers', 'wntChgPswd', 'wntCancelCon',
+            'wntAuditMod', 'wntAuditList', 'wntAuditGet', 'wntAuditDel', 'wntAuditAdd2', 'wntAuditAdd', 'wntAddPrinter', 'wntAddDrive',
+            'wntAcctPolSet', 'wntAcctPolGet', 'wntAcctList', 'wntAcctInfo', 'wntAccessMod', 'wntAccessList', 'wntAccessGet', 'wntAccessDel',
+            'wntaccessadd2', 'wntAccessAdd', 'wnShares', 'wnSharePath', 'wnShareName', 'wnShareCnt', 'wnServers', 'wnRestore', 'wnNetNames',
+            'wnGetUser', 'wnGetCon', 'wnGetCaps', 'wnDlgShare', 'wnDlgNoShare', 'wnDlgDiscon', 'wnDlgCon4', 'wnDlgCon3', 'wnDlgCon2', 'wnDlgCon',
+            'wnDlgBrowse', 'wnDialog', 'wnCmptrInfo', 'wnCancelCon', 'wnAddCon', 'WaitSRQ', 'w9xVersion', 'w9xUserSetDat', 'w9xUserRename',
+            'w9xUserprops', 'w9xUserList', 'w9xUserinfo', 'w9xUserGetDat', 'w9xUserExist', 'w9xUserDel', 'w9xUserAddDat', 'w9xUserAdd', 'w9xShareSet',
+            'w9xShareInfo', 'w9xShareDel', 'w9xShareAdd', 'w9xServiceAt', 'w9xServerList', 'w9xRemoteTime', 'w9xOwnerGet', 'w9xMemberSet',
+            'w9xMemberList', 'w9xMemberGrps', 'w9xMemberGet', 'w9xMemberDel', 'w9xListGroups', 'w9xGroupInfo', 'w9xGroupDel', 'w9xGroupAdd',
+            'w9xGetDC', 'w9xFileUsers', 'w9xAccessList', 'w9xAccessGet', 'w9xAccessDel', 'w9xAccessAdd', 'w95Version', 'w95ShareUsers',
+            'w95ShareSet', 'w95ShareList', 'w95ShareInfo', 'w95ShareDel', 'w95ShareAdd', 'w95ServiceInf', 'w95ServiceAt', 'w95ServerType',
+            'w95ServerInfo', 'w95Resources', 'w95GetUser', 'w95GetDrive', 'w95GetCon', 'w95FileUsers', 'w95FileClose', 'w95DirDialog',
+            'w95CancelCon', 'w95AddPrinter', 'w95AddDrive', 'w95AccessDel', 'w95AccessAdd', 'w3Version', 'w3PrtBrowse', 'w3NetGetUser',
+            'w3NetDialog', 'w3GetCon', 'w3GetCaps', 'w3DirBrowse', 'w3CancelCon', 'w3AddCon', 'urlGetScheme', 'urlEncode', 'urlDecode',
+            'tVersion', 'tSetPriority', 'TriggerList', 'Trigger', 'tRemoteConn', 'tOpenProc', 'tListProc', 'tListMod', 'tKillProc', 'tGetProcInfo',
+            'tGetPriority', 'tGetModInfo', 'tGetLastError', 'tGetData', 'TestSys', 'TestSRQ', 'tCountProc', 'tCompatible', 'tCloseProc',
+            'tBrowseCntrs', 'sSendString', 'sSendNum', 'sSendLine', 'sSendBinary', 'sRecvNum', 'sRecvLine', 'sRecvBinary', 'SrchVersion',
+            'SrchNext', 'SrchInit', 'SrchFree', 'sOpen', 'sOK2Send', 'sOK2Recv', 'smtpSendText', 'smtpSendFile', 'sListen', 'SetRWLS',
+            'SendSetup', 'SendLLO', 'SendList', 'SendIFC', 'SendDataBytes', 'SendCmds', 'Send', 'sConnect', 'sClose', 'SByteOrder32',
+            'sByteOrder16', 'sAccept', 'rRegVersion', 'rRegSearch', 'ResetSys', 'ReceiveSetup', 'Receive', 'ReadStsByte', 'RcvRespMsg',
+            'RasVersion', 'RasTypeSize', 'RasRename', 'RasNumCons', 'RasNameValid', 'RasListActCon', 'RasItemize', 'RasHangUp', 'RasGetLastErr',
+            'RasGetConStat', 'RasEntrySet', 'RasEntryInfo', 'RasEntryExist', 'RasEntryDel', 'RasEntryAdd', 'RasDialInfo', 'RasDial',
+            'RasCopy', 'RasConStatus', 'qVersionInfo', 'qTransact', 'qTables', 'qSpecial', 'qSetConnOpt', 'qNumRsltCol', 'qNativeSql', 'qLastCode',
+            'qGetData', 'qFreeStmt', 'qFreeEnv', 'qFreeConnect', 'qFetch', 'qExecDirect', 'qError', 'qDriverList', 'qDriverCon', 'qDisconnect',
+            'qDataSources', 'qConnect', 'qConfigError', 'qConfigData', 'qColumns', 'qBindCol', 'qAllocStmt', 'qAllocEnv', 'qAllocConnect',
+            'pWaitFor', 'pVersionInfo', 'pTimeout', 'pSetPublish', 'pSetPrtInfo', 'pSetPrtAttrib', 'pSetDefPrtEx', 'pSetDefPrt', 'pSendFile',
+            'pRecvFile', 'pPutString', 'pPutLine', 'pPutChar', 'pPutByte', 'pPutBinary', 'PPollUnconfig', 'PPollConfig', 'PPoll', 'pPeekChar',
+            'pPeekByte', 'pPaperSizes', 'pPaperBins', 'pModemSReg', 'pModemParams', 'pModemInit', 'pModemHangUp', 'pModemDial', 'pModemControl',
+            'pModemConnect', 'pModemCommand', 'pModemAnsRing', 'pModemAnsCall', 'pMediaTypes', 'pGetString', 'pGetPublish', 'pGetPrtList',
+            'pGetPrtInfo', 'pGetPrtAttrib', 'pGetLine', 'pGetLastError', 'pGetErrorMsg', 'pGetErrorCode', 'pGetDefPrtInf', 'pGetChar',
+            'pGetByte', 'pGetBinary', 'pDelPrtConn', 'pDelPrinter', 'pComOpen', 'pComModify', 'pComInfo', 'pComControl', 'pComClose',
+            'pCheckSum', 'pCheckBinary', 'pCaptureOn', 'pCaptureOff', 'pCaptureLog', 'PassControl', 'pAddPrtConn', 'pAddPrinter', 'p3RecvText',
+            'p3RecvFile', 'p3Peek', 'p3Open', 'p3GetReply', 'p3Delete', 'p3Count', 'p3Close', 'nwWhoAmI', 'nwVfyPassword', 'nwVersion',
+            'nwSrvShutdown', 'nwSrvNLMMgr', 'nwSrvGenGUID', 'nwSrvExecNCF', 'nwSetVolLimit', 'nwSetSrvParam', 'nwSetSrvInfo', 'nwSetPrimServ',
+            'nwSetPassword', 'nwSetOptions', 'nwSetFileInfo', 'nwSetDirLimit', 'nwSetDirInfo', 'nwSetContext', 'nwSetBcastMode', 'nwServerList',
+            'nwSendBcastMsg', 'nwSearchObjects', 'nwSearchFilter', 'nwRenameObject', 'nwRemoveObject', 'nwReceiveBcastMsg', 'nwNameConvert',
+            'nwMutateObject', 'nwMoveObject', 'nwModifyObject', 'nwMapDelete', 'nwMap', 'nwLogout', 'nwLogin', 'nwListUserGroups',
+            'nwListObjects', 'nwListGroupMembers', 'nwLastErrMsg', 'nwIsUserInGroup', 'nwGetVolLimit', 'nwGetSrvStats', 'nwGetSrvParam',
+            'nwGetSrvInfo', 'nwGetSrvCfg', 'nwGetOptions', 'nwGetObjValue', 'nwGetObjInfo', 'nwGetNLMInfo', 'nwGetMapped', 'nwGetFileInfo',
+            'nwGetDirLimit', 'nwGetDirInfo', 'nwGetContext', 'nwGetConnInfo', 'nwGetCapture', 'nwGetBcastMode', 'nwGetAttrInfo',
+            'nwDriveStatus', 'nwDrivePath', 'nwDetachFromServer', 'nwDelUserFromGroup', 'nwDelConnNum', 'nwCompareObject', 'nwClientInfo',
+            'nwChgPassword', 'nwAttachToServer', 'nwAddUserToGroup', 'nwAddObject', 'netVersion', 'netResources', 'netGetUser', 'netGetCon',
+            'netDirDialog', 'netCancelCon', 'netAddPrinter', 'netAddDrive', 'n4Version', 'n4UserGroups', 'n4UserGroupEx', 'n4SetPrimServ',
+            'n4SetOptions', 'n4SetContextG', 'n4SetContext', 'n4ServerList', 'n4ServerInfo', 'n4ObjSearch', 'n4ObjRename', 'n4ObjOptions',
+            'n4ObjMove', 'n4ObjGetVal', 'n4ObjectProps', 'n4ObjectList', 'n4ObjectInfo', 'n4ObjDelete', 'n4NameConvert', 'n4MsgsEndAll',
+            'n4MsgsEnd', 'n4MemberSet', 'n4MemberGet', 'n4MemberDel', 'n4MapRoot', 'n4MapDir', 'n4MapDelete', 'n4Map', 'n4LogoutTree',
+            'n4Logout', 'n4Login', 'n4GetUserName', 'n4GetUserId', 'n4GetUser', 'n4GetNetAddr', 'n4GetMapped', 'n4GetContext',
+            'n4GetConnNum', 'n4FileUsers', 'n4FileTimeGet', 'n4FileAttrSet', 'n4FileAttrGet', 'n4DriveStatus', 'n4DrivePath', 'n4DirTimeGet',
+            'n4DirAttrSet', 'n4DirAttrGet', 'n4Detach', 'n4ChgPassword', 'n4CapturePrt', 'n4CaptureGet', 'n4CaptureEnd', 'n4Attach',
+            'n3Version', 'n3UserGroups', 'n3ServerList', 'n3ServerInfo', 'n3MsgsEndAll', 'n3MsgsEnd', 'n3MemberSet', 'n3MemberGet',
+            'n3MemberDel', 'n3Maproot', 'n3Mapdir', 'n3Mapdelete', 'n3Map', 'n3Logout', 'n3GetUserId', 'n3GetUser', 'n3GetNetAddr',
+            'n3GetMapped', 'n3GetConnNum', 'n3FileTimeGet', 'n3FileAttrSet', 'n3FileAttrGet', 'n3DriveStatus', 'n3DrivePath',
+            'n3DirTimeGet', 'n3DirAttrSet', 'n3DirAttrGet', 'n3Detach', 'n3ChgPassword', 'n3CapturePrt', 'n3CaptureGet',
+            'n3CaptureEnd', 'n3Attach', 'mVersion', 'mSyncMail', 'mSendMailEx', 'mSendMail', 'mrecvmail', 'mReadNextMsg', 'mLogOn',
+            'mLogOff', 'mFindNext', 'mError', 'mCompatible', 'kVerInfo', 'kStatusInfo', 'kSendText', 'kSendFile', 'kManageImap4',
+            'kInit', 'kGetMail', 'kExtra', 'kDest', 'kDeletePop3', 'iWriteDataBuf', 'iWriteData', 'iVersion', 'IUrlOpen', 'iUrlEncode',
+            'iUrlDecode', 'iReadDataBuf', 'iReadData', 'ipVersion', 'ipPing', 'iPing', 'ipHost2Addr', 'ipGetLastErr', 'ipGetAddress',
+            'iParseURL', 'ipAddr2Host', 'iOptionSet', 'iOptionGet', 'ImgWave', 'ImgVersion', 'ImgUnsharpMask', 'ImgThreshold', 'ImgSwirl',
+            'ImgSpread', 'ImgSolarize', 'ImgShear', 'ImgSharpen', 'ImgShade', 'ImgScale', 'ImgSample', 'ImgRotate', 'ImgResize',
+            'ImgReduceNoise', 'ImgRaise', 'ImgOilPaint', 'ImgNormalize', 'ImgNegate', 'ImgMotionBlur', 'ImgModulate', 'ImgMinify',
+            'ImgMedianFilter', 'ImgMagnify', 'ImgLevel', 'ImgIsValid', 'ImgIsPalette', 'ImgIsMono', 'ImgIsGray', 'ImgInfo', 'ImgImplode',
+            'ImgGetImageType', 'ImgGetColorCount', 'ImgGaussianBlur', 'ImgGamma', 'ImgFrame', 'ImgFlop', 'ImgFlip', 'ImgEqualize',
+            'ImgEnhance', 'ImgEmboss', 'ImgCrop', 'ImgConvert', 'ImgContrast', 'ImgCompare', 'ImgColorize', 'ImgChop', 'ImgCharcoal',
+            'ImgBorder', 'ImgBlur', 'ImgAddNoise', 'iLocFindNext', 'iLocFindInit', 'iHttpOpen', 'iHttpInit', 'iHttpHeaders', 'iHttpAccept',
+            'iHostConnect', 'iHost2Addr', 'iGetResponse', 'iGetLastError', 'iGetIEVer', 'iGetConStatEx', 'iGetConState', 'iFtpRename',
+            'iFtpPut', 'iFtpOpen', 'iFtpGet', 'iFtpFindNext', 'iFtpFindInit', 'iFtpDirRemove', 'iFtpDirMake', 'iFtpDirGet', 'iFtpDirChange',
+            'iFtpDialog', 'iFtpDelete', 'iFtpCmd', 'iErrorDialog', 'iDialItemize', 'iDialHangUp', 'iDial', 'iCookieSet', 'iCookieGet',
+            'iContentURL', 'iContentFile', 'iContentData', 'iClose', 'ibWrtf', 'ibWrt', 'ibWait', 'ibVersion', 'ibUnlock', 'ibTrg',
+            'ibTmo', 'ibStop', 'ibStatus', 'ibSta', 'ibSre', 'ibSic', 'ibSad', 'ibRsv', 'ibRsp', 'ibRsc', 'ibRpp', 'ibRdf', 'ibRd',
+            'ibPpc', 'ibPoke', 'ibPct', 'ibPad', 'ibOnl', 'ibMakeAddr', 'ibLock', 'ibLoc', 'ibLn', 'ibLines', 'ibIst', 'ibInit',
+            'ibGts', 'ibGetSad', 'ibGetPad', 'ibFind', 'ibEvent', 'ibErr', 'ibEot', 'ibEos', 'iBegin', 'ibDma', 'ibDev', 'ibConfig',
+            'ibCntl', 'ibCnt', 'ibCmda', 'ibCmd', 'ibClr', 'ibCac', 'ibBna', 'ibAsk', 'iAddr2Host', 'huge_Thousands', 'huge_Subtract',
+            'huge_SetOptions', 'huge_Multiply', 'huge_GetLastError', 'huge_ExtenderInfo', 'huge_Divide', 'huge_Decimal', 'huge_Add',
+            'httpStripHTML', 'httpRecvTextF', 'httpRecvText', 'httpRecvQuery', 'httpRecvQryF', 'httpRecvFile', 'httpGetServer',
+            'httpGetQuery', 'httpGetPath', 'httpGetFile', 'httpGetDir', 'httpGetAnchor', 'httpFullPath', 'httpFirewall', 'httpAuth',
+            'ftpRename', 'ftpQuote', 'ftpPut', 'ftpOpen', 'ftpList', 'ftpGet', 'ftpFirewall', 'ftpDelete', 'ftpClose', 'ftpChDir',
+            'FindRQS', 'FindLstn', 'EnvSetVar', 'EnvPathDel', 'EnvPathChk', 'EnvPathAdd', 'EnvListVars', 'EnvGetVar', 'EnvGetInfo',
+            'EnableRemote', 'EnableLocal', 'ehllapiWait', 'ehllapiVersion', 'ehllapiUninit', 'ehllapiStopKeyIntercept', 'ehllapiStopHostNotify',
+            'ehllapiStopCloseIntercept', 'ehllapiStartKeyIntercept', 'ehllapiStartHostNotify', 'ehllapiStartCloseIntercept',
+            'ehllapiSetWindowStatus', 'ehllapiSetSessionParams', 'ehllapiSetPSWindowName', 'ehllapiSetCursorLoc', 'ehllapiSendKey',
+            'ehllapiSendFile', 'ehllapiSearchPS', 'ehllapiSearchField', 'ehllapiRunProfile', 'ehllapiResetSystem', 'ehllapiReserve',
+            'ehllapiRelease', 'ehllapiReceiveFile', 'ehllapiQuerySystem', 'ehllapiQueryPSStatus', 'ehllapiQueryHostNotify',
+            'ehllapiQueryFieldAttr', 'ehllapiQueryCursorLoc', 'ehllapiQueryCloseIntercept', 'ehllapiPostInterceptStatus',
+            'ehllapiPause', 'ehllapiLastErrMsg', 'ehllapiInit', 'ehllapiGetWindowStatus', 'ehllapiGetPSHWND', 'ehllapiGetKey',
+            'ehllapiFindFieldPos', 'ehllapiFindFieldLen', 'ehllapiDisconnectPS', 'ehllapiCvtRCToPos', 'ehllapiCvtPosToRC',
+            'ehllapiCopyTextToPS', 'ehllapiCopyTextToField', 'ehllapiCopyTextFromPS', 'ehllapiCopyTextFromField', 'ehllapiCopyOIA',
+            'ehllapiConnectPS', 'dunItemize', 'dunDisconnect', 'dunConnectEx', 'dunConnect', 'dsTestParam', 'dsSIDtoHexStr', 'dsSetSecProp',
+            'dsSetProperty', 'dsSetPassword', 'dsSetObj', 'dsSetCredentX', 'dsSetCredent', 'dsRemFromGrp', 'dsRelSecObj', 'dsMoveObj',
+            'dsIsObject', 'dsIsMemberGrp', 'dsIsContainer', 'dsGetUsersGrps', 'dsGetSecProp', 'dsGetPropName', 'dsGetProperty',
+            'dsGetPrntPath', 'dsGetPrimGrp', 'dsGetMemGrp', 'dsGetInfo', 'dsGetClass', 'dsGetChldPath', 'dsFindPath', 'dsDeleteObj',
+            'dsCreatSecObj', 'dsCreateObj', 'dsCopySecObj', 'dsAddToGrp', 'dsAclRemAce', 'dsAclOrderAce', 'dsAclGetAces', 'dsAclAddAce',
+            'DevClearList', 'DevClear', 'dbTest', 'dbSwapColumns', 'dbSort', 'dbSetRecordField', 'dbSetOptions', 'dbSetErrorReporting',
+            'dbSetEntireRecord', 'dbSetDelimiter', 'dbSave', 'dbOpen', 'dbNameColumn', 'dbMakeNewItem', 'dbInsertColumn', 'dbGetVersion',
+            'dbGetSaveStatus', 'dbGetRecordField', 'dbGetRecordCount', 'dbGetNextItem', 'dbGetLastError', 'dbGetEntireRecord',
+            'dbGetColumnType', 'dbGetColumnNumber', 'dbGetColumnName', 'dbGetColumnCount', 'dbFindRecord', 'dbExist', 'dbEasterEgg',
+            'dbDeleteRecord', 'dbDeleteColumn', 'dbDebug', 'dbCookDatabases', 'dbClose', 'dbCloneRecord', 'dbBindCol', 'cWndState',
+            'cWndinfo', 'cWndGetWndSpecName', 'cWndGetWndSpec', 'cWndexist', 'cWndByWndSpecName', 'cWndByWndSpec', 'cWndbyseq',
+            'cWndbyname', 'cWndbyid', 'cWndbyclass', 'cWinIDConvert', 'cVersionInfo', 'cVendorId', 'cSetWndText', 'cSetUpDownPos',
+            'cSetTvItem', 'cSetTrackPos', 'cSetTabItem', 'cSetLvItem', 'cSetLbItemEx', 'cSetLbItem', 'cSetIpAddr', 'cSetFocus',
+            'cSetEditText', 'cSetDtpDate', 'cSetCbItem', 'cSetCalDate', 'cSendMessage', 'cRadioButton', 'cPostMessage', 'cPostButton',
+            'cMemStat', 'cGetWndCursor', 'cGetUpDownPos', 'cGetUpDownMin', 'cGetUpDownMax', 'cGetTVItem', 'cGetTrackPos', 'cGetTrackMin',
+            'cGetTrackMax', 'cGetTbText', 'cGetSbText', 'cGetLvText', 'cGetLvSelText', 'cGetLvFocText', 'cGetLvDdtText', 'cGetLvColText',
+            'cGetLbText', 'cGetLbSelText', 'cGetLbCount', 'cGetIpAddr', 'cGetInfo', 'cGetHrText', 'cGetFocus', 'cGetEditText', 'cGetDtpDate',
+            'cGetControlImageCRC', 'cGetCBText', 'cGetCbCount', 'cGetCalDate', 'cFindByName', 'cFindByClass', 'cEnablestate', 'cDblClickItem',
+            'cCpuSupt', 'cCpuSpeed', 'cCpuIdExt', 'cCpuId', 'cCpuFeat', 'cCpuBenchmark', 'cCloneCheck', 'cClickToolbar', 'cClickButton',
+            'cClearTvItem', 'cClearLvItem', 'cClearLbAll', 'cCheckbox', 'aVersion', 'aStatusbar', 'aShellFolder', 'aMsgTimeout', 'AllSPoll',
+            'aGetLastError', 'aFileRename', 'aFileMove', 'aFileDelete', 'aFileCopy'
+            ),
+        5 => array(
+            'wWordRight', 'wWordLeft', 'wWinTile', 'wWinRestore', 'wWinNext', 'wWinMinimize', 'wWinMaximize', 'wWinCloseAll', 'wWinClose',
+            'wWinCascade', 'wWinArricons', 'wViewOutput', 'wViewOptions', 'wViewHtml', 'wUpperCase', 'wUpline', 'wUndo', 'wTopOfFile', 'wToggleIns',
+            'wTab', 'wStatusMsg', 'wStartSel', 'wSpellcheck', 'wSetProject', 'wSetPrefs', 'wSetColblk', 'wSetBookmark', 'wSelWordRight',
+            'wSelWordLeft', 'wSelUp', 'wSelTop', 'wSelRight', 'wSelPgUp', 'wSelPgDn', 'wSelLeft', 'wSelInfo', 'wSelHome', 'wSelEnd', 'wSelectAll',
+            'wSelDown', 'wSelBottom', 'wRunRebuild', 'wRunMake', 'wRunExecute', 'wRunDebug', 'wRunConfig', 'wRunCompile', 'wRunCommand', 'wRight',
+            'wRepeat', 'wRedo', 'wRecord', 'wProperties', 'wPrintDirect', 'wPrinSetup', 'wPrevError', 'wPaste', 'wPageUp', 'wPageDown', 'wNextError',
+            'wNewLine', 'wLowerCase', 'wLineCount', 'wLeft', 'wInvertCase', 'wInsString', 'wInsLine', 'wHome', 'wHelpKeyword', 'wHelpKeybrd',
+            'wHelpIndex', 'wHelpHelp', 'wHelpCmds', 'wHelpAbout', 'wGotoLine', 'wGotoCol', 'wGetWrap', 'wGetWord', 'wGetUndo', 'wGetSelstate',
+            'wGetRedo', 'wGetOutput', 'wGetModified', 'wGetLineNo', 'wGetIns', 'wGetFilename', 'wGetColNo', 'wGetChar', 'wFtpOpen', 'wFindNext',
+            'wFindInFiles', 'wFind', 'wFileSaveAs', 'wFileSave', 'wFileRevert', 'wFilePrint', 'wFilePgSetup', 'wFileOpen', 'wFileNew', 'wFileMerge',
+            'wFileList', 'wFileExit', 'wEndSel', 'wEndOfFile', 'wEnd', 'wEdWrap', 'wEdWordRight', 'wEdWordLeft', 'wEdUpLine', 'wEdUndo', 'wEdTopOfFile',
+            'wEdToggleIns', 'wEdTab', 'wEdStartSel', 'wEdSetColBlk', 'wEdSelectAll', 'wEdRight', 'wEdRedo', 'wEdPaste', 'wEdPageUp', 'wEdPageDown',
+            'wEdNewLine', 'wEdLeft', 'wEdInsString', 'wEdHome', 'wEdGoToLine', 'wEdGoToCol', 'wEdGetWord', 'wEdEndSel', 'wEdEndOfFile', 'wEdEnd',
+            'wEdDownLine', 'wEdDelete', 'wEdCutLine', 'wEdCut', 'wEdCopyLine', 'wEdCopy', 'wEdClearSel', 'wEdBackTab', 'wEdBackspace', 'wDownLine',
+            'wDelete', 'wDelButton', 'wCutMarked', 'wCutLine', 'wCutAppend', 'wCut', 'wCopyMarked', 'wCopyLine', 'wCopyAppend', 'wCopy', 'wCompile',
+            'wClearSel', 'wChange', 'wCallMacro', 'wBackTab', 'wBackspace', 'wAutoIndent', 'wAddButton', 'edWindowTile', 'edWindowRestore',
+            'edWindowNext', 'edWindowMinimize', 'edWindowMaximize', 'edWindowCloseall', 'edWindowClose', 'edWindowCascade', 'edWindowArrangeIcons',
+            'edStatusMsg', 'edSearchViewOutput', 'edSearchRepeat', 'edSearchPrevError', 'edSearchNextError', 'edSearchFind', 'edSearchChange',
+            'edRunRebuild', 'edRunMake', 'edRunExecute', 'edRunDebug', 'edRunConfigure', 'edRunCompile', 'edRunCommand', 'edRecord', 'edHelpProcedures',
+            'edHelpKeyword', 'edHelpKeyboard', 'edHelpIndex', 'edHelpHelp', 'edHelpCommands', 'edHelpAbout', 'edGetWordWrapState', 'edGetWindowName',
+            'edGetUndoState', 'edGetSelectionState', 'edGetRedoState', 'edGetModifiedStatus', 'edGetLineNumber', 'edGetInsertState', 'edGetColumnNumber',
+            'edGetChar', 'edFileSetPreferences', 'edFileSaveAs', 'edFileSave', 'edFilePrinterSetup', 'edFilePrint', 'edFilePageSetup', 'edFileOpen',
+            'edFileNew', 'edFileMerge', 'edFileList', 'edFileExit', 'edEditWrap', 'edEditWordRight', 'edEditWordLeft', 'edEditUpLine', 'edEditUndo',
+            'edEditToggleIns', 'edEditTab', 'edEditStartSelection', 'edEditSetColumnBlock', 'edEditSetBookmark', 'edEditSelectAll', 'edEditRight',
+            'edEditRedo', 'edEditPaste', 'edEditPageUp', 'edEditPageDown', 'edEditLeft', 'edEditInsertString', 'edEditGoToLine', 'edEditGoToColumn',
+            'edEditGoToBookmark', 'edEditGetCurrentWord', 'edEditEndSelection', 'edEditEndOfLine', 'edEditEndOfFile', 'edEditDownline', 'edEditDelete',
+            'edEditCutline', 'edEditCut', 'edEditCopyline', 'edEditCopy', 'edEditClearSelection', 'edEditBeginningOfLine', 'edEditBeginningOfFile',
+            'edEditBackTab', 'edEditBackspace', 'edDeleteButton', 'edAddButton'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '+', '-', '~', '$', '^', '?', '@', '%', '#', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800080;',
+            2 => 'color: #0080FF; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #FF00FF;',
+            5 => 'color: #008000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #FF1010; font-weight: bold;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(//Variable names
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/xbasic.php b/vendor/easybook/geshi/geshi/xbasic.php
new file mode 100755
index 000000000..2edede364
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/xbasic.php
@@ -0,0 +1,143 @@
+<?php
+/*************************************************************************************
+ * xbasic.php
+ * ----------
+ * Author: Jos� Gabriel Moya Yang�ela (josemoya@gmail.com)
+ * Copyright: (c) 2005 Jos� Gabriel Moya Yang�ela (http://aprenderadesaprender.6te.net)
+ * Release Version: 1.0.8.11
+ * Date Started: 2005/11/23
+ *
+ * XBasic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *  - Removed duplicate keywords
+ *  - Tabs converted in spaces.
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'XBasic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'WHILE', 'UNTIL', 'TRUE', 'TO', 'THEN', 'SUB', 'STOP', 'STEP',
+            'SELECT', 'RETURN', 'PROGRAM', 'NEXT', 'LOOP', 'IFZ',
+            'IFT', 'IFF', 'IF', 'GOTO', 'GOSUB', 'FOR', 'FALSE', 'EXIT',
+            'ENDIF', 'END', 'ELSE', 'DO', 'CASE', 'ALL'
+            ),
+        2 => array(
+            'XMAKE', 'XLONGAT', 'XLONG', 'WRITE', 'VOID', 'VERSION$', 'VERSION',
+            'USHORTAT', 'USHORT', 'UNION', 'ULONGAT', 'ULONG', 'UCASE$',
+            'UBYTEAT', 'UBYTE', 'UBOUND', 'TYPE','TRIM$', 'TAB', 'SWAP',
+            'SUBADDRESS', 'SUBADDR', 'STUFF$', 'STRING', 'STRING$', 'STR$',
+            'STATIC', 'SSHORTAT', 'SSHORT', 'SPACE$', 'SMAKE', 'SLONGAT', 'SLONG',
+            'SIZE', 'SINGLEAT', 'SINGLE', 'SIGNED$', 'SIGN', 'SHELL', 'SHARED',
+            'SGN', 'SFUNCTION', 'SET', 'SEEK', 'SCOMPLEX', 'SBYTEAT', 'SBYTE',
+            'RTRIM$', 'ROTATER', 'ROTATEL', 'RJUST$', 'RINSTRI', 'RINSTR',
+            'RINCHRI', 'RINCHR', 'RIGHT$', 'REDIM', 'READ', 'RCLIP$', 'QUIT',
+            'PROGRAM$', 'PRINT', 'POF', 'OPEN', 'OCTO$', 'OCT$', 'NULL$', 'MIN',
+            'MID$', 'MAX', 'MAKE', 'LTRIM$', 'LOF', 'LJUST$', 'LIBRARY', 'LEN',
+            'LEFT$', 'LCLIP$', 'LCASE$', 'INTERNAL', 'INT', 'INSTRI', 'INSTR',
+            'INLINE$', 'INFILE$', 'INCHRI', 'INCHR', 'INC', 'IMPORT', 'HIGH1',
+            'HIGH0', 'HEXX$', 'HEX$', 'GOADDRESS', 'GOADDR', 'GMAKE', 'GLOW',
+            'GIANTAT', 'GIANT', 'GHIGH', 'FUNCTION', 'FUNCADDRESS', 'FUNCADDR',
+            'FORMAT$', 'FIX', 'EXTU', 'EXTS', 'EXTERNAL', 'ERROR', 'ERROR$',
+            'EOF', 'DOUBLEAT', 'DOUBLE', 'DMAKE', 'DLOW', 'DIM', 'DHIGH',
+            'DECLARE', 'DEC', 'DCOMPLEX', 'CSTRING$', 'CSIZE', 'CSIZE$', 'CLR',
+            'CLOSE', 'CLEAR', 'CJUST$', 'CHR$', 'CFUNCTION', 'BITFIELD', 'BINB$',
+            'BIN$', 'AUTOX', 'AUTOS', 'AUTO', 'ATTACH', 'ASC', 'ABS'
+            ),
+        3 => array(
+            'XOR', 'OR', 'NOT', 'MOD', 'AND'
+            ),
+        4 => array(
+            'TANH', 'TAN', 'SQRT', 'SINH', 'SIN', 'SECH', 'SEC', 'POWER',
+            'LOG10', 'LOG', 'EXP10', 'EXP', 'CSCH', 'CSC', 'COTH', 'COT', 'COSH',
+            'COS', 'ATANH', 'ATAN', 'ASINH', 'ASIN', 'ASECH', 'ASEC', 'ACSCH',
+            'ACSC', 'ACOSH', 'ACOS'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
+        '=','+','-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00a1a1;font-weight: bold',
+            2 => 'color: #000066;font-weight: bold',
+            3 => 'color: #00a166;font-weight: bold',
+            4 => 'color: #0066a1;font-weight: bold'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.xbasic.org',
+        4 => 'http://www.xbasic.org'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/xml.php b/vendor/easybook/geshi/geshi/xml.php
new file mode 100755
index 000000000..88d17901e
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/xml.php
@@ -0,0 +1,155 @@
+<?php
+/*************************************************************************************
+ * xml.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2004/09/01
+ *
+ * XML language file for GeSHi. Based on the idea/file by Christian Weiske
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/12/28 (1.0.2)
+ *   -  Removed escape character for strings
+ * 2004/11/27 (1.0.1)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Check regexps work and correctly highlight XML stuff and nothing else
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'XML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #339933;',
+            3 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(//attribute names
+            GESHI_SEARCH => '([a-z_:][\w\-\.:]*)(=)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+        1 => array(//Initial header line
+            GESHI_SEARCH => '(&lt;[\/?|(\?xml)]?[a-z_:][\w\-\.:]*(\??&gt;)?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(//Tag end markers
+            GESHI_SEARCH => '(([\/|\?])?&gt;)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -1 => array(
+            '<!--' => '-->'
+            ),
+        0 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            '<![CDATA[' => ']]>'
+            ),
+        3 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'TAB_WIDTH' => 2,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
diff --git a/vendor/easybook/geshi/geshi/xojo.php b/vendor/easybook/geshi/geshi/xojo.php
new file mode 100644
index 000000000..58fcab103
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/xojo.php
@@ -0,0 +1,166 @@
+<?php
+/*************************************************************************************
+ * xojo.php
+ * --------
+ * Author: Dr Garry Pettet (contact@garrypettet.com)
+ * Copyright: (c) 2014 Dr Garry Pettet (http://garrypettet.com)
+ * Release Version: 1.0.0
+ * Date Started: 2014/10/19
+ *
+ * Xojo language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2014/10/19 (1.0.8.12)
+ *  -  First Release
+ *
+ * TODO (updated 2014/10/19)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Xojo',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '//', 3 => 'rem'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+	'NUMBERS' => array(
+	        1 => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE, // integers
+	        2 => GESHI_NUMBER_FLT_NONSCI // floating point numbers
+	        ),    
+    'KEYWORDS' => array(
+        //Keywords
+        1 => array(
+	        'AddHandler', 'AddressOf', 'Aggregates', 'And', 'Array', 'As', 'Assigns', 'Attributes', 
+	        'Break', 'ByRef', 'ByVal', 'Call', 'Case', 'Catch', 'Class', 'Const', 'Continue',
+	        'CType', 'Declare', 'Delegate', 'Dim', 'Do', 'DownTo', 'Each', 'Else', 'Elseif', 'End', 
+	        'Enum', 'Event', 'Exception', 'Exit', 'Extends', 'False', 'Finally', 'For', 
+	        'Function', 'Global', 'GoTo', 'Handles', 'If', 'Implements', 'In', 'Inherits', 
+	        'Inline68K', 'Interface', 'Is', 'IsA', 'Lib', 'Loop', 'Me', 'Mod', 'Module', 
+	        'Namespace', 'New', 'Next', 'Nil', 'Not', 'Object', 'Of', 'Optional', 'Or', 
+	        'ParamArray', 'Private', 'Property', 'Protected', 'Public', 'Raise', 
+	        'RaiseEvent', 'Rect', 'Redim', 'RemoveHandler', 'Return', 'Select', 'Self', 'Shared', 
+	        'Soft', 'Static', 'Step', 'Sub', 'Super', 'Then', 'To', 'True', 'Try',
+	        'Until', 'Using', 'Wend', 'While', 'With', 'WeakAddressOf', 'Xor'
+            ),
+        //Data Types
+        2 => array(
+            'Boolean', 'CFStringRef', 'CString', 'Currency', 'Double', 'Int8', 'Int16', 'Int32',
+            'Int64', 'Integer', 'OSType', 'PString', 'Ptr', 'Short', 'Single', 'String', 
+            'Structure', 'UInt8', 'UInt16', 'UInt32', 'UInt64', 'UShort', 'WindowPtr', 
+            'WString', 'XMLNodeType'
+            ),
+        //Compiler Directives
+        3 => array(
+            '#Bad', '#Else', '#Endif', '#If', '#Pragma', '#Tag'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '=', '/', '>', '<', '^', '(', ')', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',  // keywords
+            2 => 'color: #0000FF;',  // primitive data types
+            3 => 'color: #0000FF;',  // compiler commands
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #7F0000;',
+            'MULTI' => 'color: #7F0000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #6500FE;'
+            ),
+        'NUMBERS' => array(
+            1 => 'color: #326598;', // integers
+            2 => 'color: #006532;', // floating point numbers
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+	        1 => 'color: #326598;', // &h hex numbers
+	        2 => 'color: #326598;', // &b hex numbers
+	        3 => 'color: #326598;', // &o hex numbers
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://docs.xojo.com/index.php/{FNAMEU}',
+        2 => 'http://docs.xojo.com/index.php/{FNAMEU}',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 =>'.'
+        ),
+    'REGEXPS' => array(
+		1 => array( // &h numbers
+		    // search for &h, then any number of letters a-f or numbers 0-9
+		    GESHI_SEARCH => '(&amp;h[0-9a-fA-F]*\b)',
+		    GESHI_REPLACE => '\\1',
+		    GESHI_MODIFIERS => '',
+		    GESHI_BEFORE => '',
+		    GESHI_AFTER => ''
+		    ),
+		2 => array( // &b numbers
+		    // search for &b, then any number of 0-1 digits
+		    GESHI_SEARCH => '(&amp;b[0-1]*\b)',
+		    GESHI_REPLACE => '\\1',
+		    GESHI_MODIFIERS => '',
+		    GESHI_BEFORE => '',
+		    GESHI_AFTER => ''
+		    ),
+		3 => array( // &o octal numbers
+		    // search for &o, then any number of 0-7 digits
+		    GESHI_SEARCH => '(&amp;o[0-7]*\b)',
+		    GESHI_REPLACE => '\\1',
+		    GESHI_MODIFIERS => '',
+		    GESHI_BEFORE => '',
+		    GESHI_AFTER => ''
+		    )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/xorg_conf.php b/vendor/easybook/geshi/geshi/xorg_conf.php
new file mode 100755
index 000000000..41e4496ee
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/xorg_conf.php
@@ -0,0 +1,122 @@
+<?php
+/*************************************************************************************
+ * xorg_conf.php
+ * ----------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/06/18
+ *
+ * xorg.conf language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/18 (1.0.8)
+ *  -  Initial import
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Xorg configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // sections
+        1 => array(
+            'Section', 'EndSection', 'SubSection', 'EndSubSection'
+            ),
+        2 => array(
+            // see http://www.x.org/archive/X11R6.9.0/doc/html/xorg.conf.5.html
+            'BiosBase', 'Black', 'Boardname', 'BusID', 'ChipID', 'ChipRev',
+            'Chipset', 'ClockChip', 'Clocks', 'DacSpeed',
+            'DefaultDepth', 'DefaultFbBpp', 'Depth', 'Device',
+            'DisplaySize', 'Driver', 'FbBpp', 'Gamma',
+            'HorizSync', 'IOBase', 'Identifier', 'InputDevice',
+            'Load', 'MemBase', 'Mode', 'Modeline', 'Modelname',
+            'Modes', 'Monitor', 'Option', 'Ramdac', 'RgbPath',
+            'Screen', 'TextClockFreq', 'UseModes', 'VendorName',
+            'VertRefresh', 'VideoAdaptor', 'VideoRam',
+            'ViewPort', 'Virtual', 'Visual', 'Weight', 'White'
+            ),
+        3 => array(
+            // some sub-keywords
+            // screen position
+            'Above', 'Absolute', 'Below', 'LeftOf', 'Relative', 'RightOf',
+            // modes
+            'DotClock', 'Flags', 'HSkew', 'HTimings', 'VScan', 'VTimings'
+            ),
+        ),
+    'REGEXPS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #990000;',
+            3 => 'color: #550000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
diff --git a/vendor/easybook/geshi/geshi/xpp.php b/vendor/easybook/geshi/geshi/xpp.php
new file mode 100755
index 000000000..52db2727b
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/xpp.php
@@ -0,0 +1,434 @@
+<?php
+/*************************************************************************************
+ * xpp.php
+ * -------
+ * Author: Simon Butcher (simon@butcher.name)
+ * Copyright: (c) 2007 Simon Butcher (http://simon.butcher.name/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/02/27
+ *
+ * Axapta/Dynamics Ax X++ language file for GeSHi.
+ * For details, see <http://msdn.microsoft.com/en-us/library/aa867122.aspx>
+ *
+ * CHANGES
+ * -------
+ * 2007/02/28 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/02/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'X++',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // Primitive types
+            'void',
+            'str',
+            'real',
+            'int64',
+            'int',
+            'date',
+            'container',
+            'boolean',
+            'anytype'
+            ),
+        2 => array( // Keywords
+            'window',
+            'while',
+            'try',
+            'true',
+            'throw',
+            'switch',
+            'super',
+            'static',
+            'server',
+            'right',
+            'return',
+            'retry',
+            'public',
+            'protected',
+            'private',
+            'print',
+            'pause',
+            'null',
+            'new',
+            'mod',
+            'left',
+            'interface',
+            'implements',
+            'if',
+            'for',
+            'final',
+            'false',
+            'extends',
+            'else',
+            'edit',
+            'do',
+            'div',
+            'display',
+            'default',
+            'continue',
+            'client',
+            'class',
+            'changeCompany',
+            'case',
+            'breakpoint',
+            'break',
+            'at',
+            'abstract'
+            ),
+        3 => array( // Functions within the Axapta kernel
+            'year',
+            'wkofyr',
+            'webwebpartstr',
+            'webstaticfilestr',
+            'websitetempstr',
+            'websitedefstr',
+            'webreportstr',
+            'webpagedefstr',
+            'weboutputcontentitemstr',
+            'webmenustr',
+            'webletitemstr',
+            'webformstr',
+            'webdisplaycontentitemstr',
+            'webactionitemstr',
+            'varstr',
+            'utilmoyr',
+            'uint2str',
+            'typeof',
+            'typeid',
+            'trunc',
+            'today',
+            'timenow',
+            'time2str',
+            'term',
+            'tanh',
+            'tan',
+            'tablestr',
+            'tablestaticmethodstr',
+            'tablepname',
+            'tablenum',
+            'tablename2id',
+            'tablemethodstr',
+            'tableid2pname',
+            'tableid2name',
+            'tablefieldgroupstr',
+            'tablecollectionstr',
+            'systemdateset',
+            'systemdateget',
+            'syd',
+            'substr',
+            'strupr',
+            'strscan',
+            'strrtrim',
+            'strrep',
+            'strrem',
+            'strprompt',
+            'strpoke',
+            'strnfind',
+            'strlwr',
+            'strltrim',
+            'strline',
+            'strlen',
+            'strkeep',
+            'strins',
+            'strfmt',
+            'strfind',
+            'strdel',
+            'strcolseq',
+            'strcmp',
+            'stralpha',
+            'str2time',
+            'str2num',
+            'str2int64',
+            'str2int',
+            'str2guid',
+            'str2enum',
+            'str2date',
+            'staticmethodstr',
+            'sln',
+            'sleep',
+            'sinh',
+            'sin',
+            'setprefix',
+            'sessionid',
+            'securitykeystr',
+            'securitykeynum',
+            'runbuf',
+            'runas',
+            'round',
+            'resourcestr',
+            'reportstr',
+            'refprintall',
+            'rate',
+            'querystr',
+            'pv',
+            'pt',
+            'prmisdefault',
+            'primoyr',
+            'prevyr',
+            'prevqtr',
+            'prevmth',
+            'power',
+            'pmt',
+            'num2str',
+            'num2date',
+            'num2char',
+            'nextyr',
+            'nextqtr',
+            'nextmth',
+            'newguid',
+            'mthofyr',
+            'mthname',
+            'mkdate',
+            'minint',
+            'min',
+            'methodstr',
+            'menustr',
+            'menuitemoutputstr',
+            'menuitemdisplaystr',
+            'menuitemactionstr',
+            'maxint',
+            'maxdate',
+            'max',
+            'match',
+            'logn',
+            'log10',
+            'literalstr',
+            'licensecodestr',
+            'licensecodenum',
+            'intvnorm',
+            'intvno',
+            'intvname',
+            'intvmax',
+            'int64str',
+            'indexstr',
+            'indexnum',
+            'indexname2id',
+            'indexid2name',
+            'idg',
+            'identifierstr',
+            'helpfilestr',
+            'helpdevstr',
+            'helpapplstr',
+            'guid2str',
+            'getprefix',
+            'getCurrentUTCTime',
+            'fv',
+            'funcname',
+            'frac',
+            'formstr',
+            'fieldstr',
+            'fieldpname',
+            'fieldnum',
+            'fieldname2id',
+            'fieldid2pname',
+            'fieldid2name',
+            'extendedTypeStr',
+            'extendedTypeNum',
+            'exp10',
+            'exp',
+            'evalbuf',
+            'enumstr',
+            'enumnum',
+            'enumcnt',
+            'enum2str',
+            'endmth',
+            'dimof',
+            'dg',
+            'decround',
+            'ddb',
+            'dayofyr',
+            'dayofwk',
+            'dayofmth',
+            'dayname',
+            'date2str',
+            'date2num',
+            'curuserid',
+            'curext',
+            'cterm',
+            'cosh',
+            'cos',
+            'corrflagset',
+            'corrflagget',
+            'convertUTCTimeToLocalTime',
+            'convertUTCDateToLocalDate',
+            'conpoke',
+            'conpeek',
+            'connull',
+            'conlen',
+            'conins',
+            'confind',
+            'configurationkeystr',
+            'configurationkeynum',
+            'condel',
+            'classstr',
+            'classnum',
+            'classidget',
+            'char2num',
+            'beep',
+            'atan',
+            'asin',
+            'ascii2ansi',
+            'any2str',
+            'any2real',
+            'any2int64',
+            'any2int',
+            'any2guid',
+            'any2enum',
+            'any2date',
+            'ansi2ascii',
+            'acos',
+            'abs'
+            ),
+        4 => array( // X++ SQL stuff
+            'where',
+            'update_recordset',
+            'ttsCommit',
+            'ttsBegin',
+            'ttsAbort',
+            'sum',
+            'setting',
+            'select',
+            'reverse',
+            'pessimisticLock',
+            'outer',
+            'order by',
+            'optimisticLock',
+            'notExists',
+            'noFetch',
+            'next',
+            'minof',
+            'maxof',
+            'like',
+            'join',
+            'insert_recordset',
+            'index hint',
+            'index',
+            'group by',
+            'from',
+            'forUpdate',
+            'forceSelectOrder',
+            'forcePlaceholders',
+            'forceNestedLoop',
+            'forceLiterals',
+            'flush',
+            'firstOnly',
+            'firstFast',
+            'exists',
+            'desc',
+            'delete_from',
+            'count',
+            'avg',
+            'asc'
+            )
+        ),
+    'SYMBOLS' => array( // X++ symbols
+        '!',
+        '&',
+        '(',
+        ')',
+        '*',
+        '^',
+        '|',
+        '~',
+        '+',
+        ',',
+        '-',
+        '/',
+        ':',
+        '<',
+        '=',
+        '>',
+        '?',
+        '[',
+        ']',
+        '{',
+        '}'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #007f00;',
+            'MULTI' => 'color: #007f00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;',
+            2 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00007f;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
diff --git a/vendor/easybook/geshi/geshi/yaml.php b/vendor/easybook/geshi/geshi/yaml.php
new file mode 100755
index 000000000..a2974eb57
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/yaml.php
@@ -0,0 +1,150 @@
+<?php
+/*************************************************************************************
+ * yaml.php
+ * --------
+ * Author: Josh Ventura (JoshV10@gmail.com)
+ * Copyright: (c) 2010 Josh Ventura
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/12/14
+ *
+ * YAML language file for GeSHi.
+ *
+ * YAML gets hairy sometimes. If anything needs fixed, drop me an email and
+ *      I'll probably spit up on it. This is, in general, not a long format.
+ *
+ * CHANGES
+ * ---------
+ * 2010/12/14
+ *  - Started project in rage over GML support but not YAML support. WTFH?
+ * 2010/12/15
+ *  - Submitted to Ben.
+ *
+ * TODO (not updated since release)
+ * ----------------------------------
+ *  -  Field testing and necessary corrections: this grammar file is usable, but not
+ *     completely accurate. There are, in fact, multiple cases in which it will mess
+ *     up, and some of it may need moved around. It is the most temperamental parser
+ *     I have ever associated my name with. Points of interest follow:
+ *   *  Improvised support for | and >: since PHP offers no variable-width lookbehind,
+ *      these blocks will still be highlighted even when commented out. As it happens,
+ *      any line ending with | or > could result in the unintentional highlighting of
+ *      all remaining lines in the file, just because I couldn't check for this regex
+ *      as a lookbehind:  '/:(\s+)(!!(\w+)(\s+))?/'
+ *      If there is a workaround for that, it needs implemented.
+ *   *  I may be missing some operators. I deliberately omitted inline array notation
+ *      as, in general, it's ugly and tends to conflict with plain-text. Ensuring all
+ *      highlighted list delimiters are not plain text would be as simple as checking
+ *      that they follow a colon directly. Alas, without variable-length lookbehinds,
+ *      if there is a way to do so in GeSHi I am unaware of it.
+ *   *  I kind of whored the comment regexp array. It seemed like a safe bet, so it's
+ *      where I crammed everything. Some of it may need moved elsewhere for neatness.
+ *   *  The !!typename highlight needs not to interfere with ": |" and ": >": Pairing
+ *      key: !!type | value is perfectly legal, but again due to lookbehind issues, I
+ *      can't add a case for that. Also, it is likely that multiple spaces can be put
+ *      between the colon and pipe symbol, which would also break it.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'YAML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    //Keys
+    'COMMENT_REGEXP' => array( // ENTRY ZERO  SHOULD CHECK FOR (\n(\s*)([^#%]+?):(\s+)(!!(\w+)(\s+))?) AS A LOOKBEHIND, BUT IT CAN'T.
+        0 => '/(?<=\s[\|>]\n)(\s+)(.*)((?=[\n$])(([\n^](\1(.*)|(?=[\n$])))*)|$)/', // Pipe blocks and > blocks.
+        1 => '/#(.*)/', // Blue # comments
+        2 => '/%(.*)/', // Red % comments
+        3 => '/(^|\n)([^#%^\n]+?)(?=: )/',  // Key-value names
+        4 => '/(^|\n)([^#%^\n]+?)(?=:\n)/',// Key-group names
+        5 => '/(?<=^---)(\s*)!(\S+)/',    // Comments after ---
+        6 => '/(?<=: )(\s*)\&(\S+)/',    // References
+        7 => '/(?<=: )(\s*)\*(\S+)/',   // Dereferences
+        8 => '/!!(\w+)/',              // Types
+        //9 => '/(?<=\n)(\s*)-(?!-)/',       // List items: This needs to search within comments 3 and 4, but I don't know how.
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'all','any','none', "yes", "no"
+            ),
+        ),
+    'SYMBOLS' => array(
+        1 => array('---', '...'),
+        2 => array(': ', ">\n", "|\n", '<<:', ":\n") // It'd be nice if I could specify that the colon must
+        //                                              follow comment 3 or 4 to be considered, and the > and |
+        //                                              must follow such a colon.
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #303050;background-color: #F5F5F5',
+            1 => 'color: blue;',
+            2 => 'font-weight: bold; color: red;',
+            3 => 'color: green;',
+            4 => 'color: #007F45;',
+            5 => 'color: #7f7fFF;',
+            6 => 'color: #FF7000;',
+            7 => 'color: #FF45C0;',
+            8 => 'font-weight: bold; color: #005F5F;',
+            //9 => 'font-weight: bold; color: #000000;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #CF00CF;'
+            ),
+        'NUMBERS' => array(
+            // 0 => 'color: #33f;' // Don't highlight numbers, really...
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: cyan;',
+            2 => 'font-weight: bold; color: brown;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array( ),
+    'REGEXPS' => array( ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array( ),
+    'HIGHLIGHT_STRICT_BLOCK' => array( )
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/z80.php b/vendor/easybook/geshi/geshi/z80.php
new file mode 100755
index 000000000..47326bb21
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/z80.php
@@ -0,0 +1,144 @@
+<?php
+/*************************************************************************************
+ * z80.php
+ * -------
+ * Author: Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2007-2008 Benny Baumann (http://www.omorphia.de/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/02/06
+ *
+ * ZiLOG Z80 Assembler language file for GeSHi.
+ * Syntax definition as commonly used with table assembler TASM32
+ * This file will contain some undocumented opcodes.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2007/06/03 (1.0.1)
+ *   -  Fixed two typos in the language file
+ * 2007/02/06 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2007/02/06)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ZiLOG Z80 Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'adc','add','and','bit','call','ccf','cp','cpd','cpdr','cpir','cpi',
+            'cpl','daa','dec','di','djnz','ei','ex','exx','halt','im','in',
+            'in0','inc','ind','indr','inir','ini','jp','jr','ld','ldd','lddr',
+            'ldir','ldi','mlt','neg','nop','or','otdm','otdmr','otdr','otim',
+            'otimr','otir','out','out0','outd','outi','pop','push','res','ret',
+            'reti','retn','rl','rla','rlc','rlca','rld','rr','rra','rrc','rrca',
+            'rrd','rst','sbc','scf','set','sla','sl1','sll','slp','sra','srl',
+            'sub','tst','tstio','xor'
+            ),
+        /*registers*/
+        2 => array(
+            'a','b','c','d','e','h','l',
+            'af','bc','de','hl','ix','iy','sp',
+            'af\'','ixh','ixl','iyh','iyl'
+            ),
+        /*Directive*/
+        3 => array(
+            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
+            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')', '?', '+', '-', '*', '/', '%', '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight:bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #dd22dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #22bbff;',
+            1 => 'color: #22bbff;',
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '\%[01]{1,64}|[01]{1,64}[bB]?(?![^<]*>)',
+        //Labels
+        2 => '^[_a-zA-Z][_a-zA-Z0-9]?\:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
\ No newline at end of file
diff --git a/vendor/easybook/geshi/geshi/zxbasic.php b/vendor/easybook/geshi/geshi/zxbasic.php
new file mode 100755
index 000000000..b1de472b5
--- /dev/null
+++ b/vendor/easybook/geshi/geshi/zxbasic.php
@@ -0,0 +1,150 @@
+<?php
+/*************************************************************************************
+ * zxbasic.php
+ * -------------
+ * Author: Jose Rodriguez (a.k.a. Boriel)
+ * Based on Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org) Freebasic template
+ * Release Version: 1.0.8.11
+ * Date Started: 2010/06/19
+ *
+ * ZXBasic language file for GeSHi.
+ *
+ * More details at http://www.zxbasic.net/
+ *
+ * CHANGES
+ * -------
+ * 2010/06/19 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/02/06)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ZXBasic',
+    'COMMENT_SINGLE' => array(
+        1 => "'",
+        2 => '#',
+        3 => 'REM'
+        ),
+    'COMMENT_MULTI' => array("/'" => "'/"),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER, //GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ASM", "BEEP", "BOLD", "BORDER", "BRIGHT", "ByRef", "ByVal", "CAST",
+            "CIRCLE", "CLS", "CONST", "CONTINUE", "DECLARE", "DIM", "DO",
+            "DRAW", "ELSE", "ELSEIF", "END", "EXIT", "FastCall", "FLASH", "FOR",
+            "FUNCTION", "GOTO", "GOSUB", "GO", "IF", "INK", "INVERSE", "ITALIC",
+            "LET", "LOAD", "LOOP", "NEXT", "OVER", "PAPER", "PAUSE", "PI",
+            "PLOT", "POKE", "PRINT", "RANDOMIZE", "REM", "RETURN", "SAVE",
+            "StdCall", "Sub", "THEN", "TO", "UNTIL", "VERIFY", "WEND", "WHILE",
+            ),
+
+        // types
+        2 => array(
+            'byte', 'ubyte', 'integer', 'uinteger', 'long', 'ulong', 'fixed',
+            'float', 'string'
+            ),
+
+        // Functions
+        3 => array(
+            "ABS", "ACS", "ASN", "ATN", "CHR", "CODE", "COS", "CSRLIN", "EXP",
+            "HEX", "HEX16", "INKEY", "INT", "LEN", "LN", "PEEK", "POS", "RND",
+            "SCREEN$", "SGN", "SIN", "SQR", "STR", "TAN", "VAL",
+            ),
+
+        // Operators and modifiers
+        4 => array(
+            "AT", "AS", "AND", "MOD", "NOT", "OR", "SHL", "SHR", "STEP", "XOR"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;', // Commands
+            2 => 'color: #800080; font-weight: bold;', // Types
+            3 => 'color: #006000; font-weight: bold;', // Functions
+            4 => 'color: #801010; font-weight: bold;'  // Operators and Modifiers
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #339933;',
+            3 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            //0 => 'color: #66cc66;'
+            0 => 'color: #007676;'
+            ),
+        'STRINGS' => array(
+            //0 => 'color: #ff0000;'
+            0 => 'color: #A00000; font-style: italic;'
+            ),
+        'NUMBERS' => array(
+            //0 => 'color: #cc66cc;'
+            0 => 'color: #b05103;'// font-weight: bold;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 853f15576b2e90a6aef68fe4d7b9ce486e1dbe4f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 15 May 2015 16:38:04 +0200
Subject: some more ignores

---
 .gitattributes | 2 ++
 .gitignore     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 1012087d4..6beb1fb7a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,8 @@
 .gitignore export-ignore
 .editorconfig export-ignore
 .travis.yml export-ignore
+composer.json export-ignore
+composer.lock export-ignore
 _test export-ignore
 _cs export-ignore
 lib/plugins/testing export-ignore
diff --git a/.gitignore b/.gitignore
index d28991d9c..a8962d0bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,9 @@
 lib/images/*/local/*
 
 # composer default ignores
+composer.phar
+vendor/bin/*
+vendor/*/*/bin/*
 vendor/*/*/tests/*
 vendor/*/*/test/*
 vendor/*/*/doc/*
-- 
cgit v1.2.3


From c2fbf98617ceed35a8d735fbc917627e001f225b Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 17:00:23 +0200
Subject: Show a relevant page title for other actions

See Issue #1149
- Show 'admin' or the admin plugin name for admin functions
- Show action name for user & site actions, e.g. login, sitemape
- Show page name + action for page actions, e.g. changes, backlinks
- Show a utf8 pen glyph when editing
- Otherwise show the page name (as previously)
---
 inc/template.php | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 3859065bc..fd8bff11a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1035,6 +1035,8 @@ function tpl_pageinfo($ret = false) {
  * @return bool|string
  */
 function tpl_pagetitle($id = null, $ret = false) {
+    global $ACT, $INPUT, $lang;
+
     if(is_null($id)) {
         global $ID;
         $id = $ID;
@@ -1042,14 +1044,67 @@ function tpl_pagetitle($id = null, $ret = false) {
 
     $name = $id;
     if(useHeading('navigation')) {
-        $title = p_get_first_heading($id);
-        if($title) $name = $title;
+        $first_heading = p_get_first_heading($id);
+        if($first_heading) $name = $first_heading;
+    }
+
+    // default page title is the page name, modify with the current action
+    switch ($ACT) {
+        // admin functions
+        case 'admin' :
+            $page_title = $lang['btn_admin'];
+            // try to get the plugin name
+            // retrieve admin plugin name from $_REQUEST['page']
+            if (($page = $INPUT->str('page', '', true)) != '') {
+                $pluginlist = plugin_list('admin');
+                if (in_array($page, $pluginlist)) {
+                    // attempt to load the plugin
+
+                    if (($plugin = plugin_load('admin',$page)) !== null){
+                        $plugin_title = $plugin->getMenuText();
+                        $page_title = $plugin_title ? $plugin_title : $page;
+                    }
+                }
+            }
+            break;
+
+        // user functions
+        case 'login' :
+        case 'profile' :
+        case 'register' :
+        case 'resendpwd' :
+            $page_title = $lang['btn_'.$ACT];
+            break;
+
+         // wiki functions
+        case 'search' :
+        case 'index' :
+            $page_title = $lang['btn_'.$ACT];
+            break;
+
+        // page functions
+        case 'edit' :
+            $page_title = "✎ ".$name;
+            break;
+
+        case 'revisions' :
+            $page_title = $name . ' - ' . $lang['btn_revs'];
+            break;
+
+        case 'backlink' :
+        case 'recent' :
+        case 'subscribe' :
+            $page_title = $name . ' - ' . $lang['btn_'.$ACT];
+            break;
+
+        default : // SHOW and anything else not included
+            $page_title = $name;
     }
 
     if($ret) {
-        return hsc($name);
+        return hsc($page_title);
     } else {
-        print hsc($name);
+        print hsc($page_title);
         return true;
     }
 }
-- 
cgit v1.2.3


From 11aaacbee50790c2d5a2c10e97307da213d6320d Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 17:05:23 +0200
Subject: Revert "Show a relevant page title for other actions"

This reverts commit c2fbf98617ceed35a8d735fbc917627e001f225b.
---
 inc/template.php | 63 ++++----------------------------------------------------
 1 file changed, 4 insertions(+), 59 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index fd8bff11a..3859065bc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1035,8 +1035,6 @@ function tpl_pageinfo($ret = false) {
  * @return bool|string
  */
 function tpl_pagetitle($id = null, $ret = false) {
-    global $ACT, $INPUT, $lang;
-
     if(is_null($id)) {
         global $ID;
         $id = $ID;
@@ -1044,67 +1042,14 @@ function tpl_pagetitle($id = null, $ret = false) {
 
     $name = $id;
     if(useHeading('navigation')) {
-        $first_heading = p_get_first_heading($id);
-        if($first_heading) $name = $first_heading;
-    }
-
-    // default page title is the page name, modify with the current action
-    switch ($ACT) {
-        // admin functions
-        case 'admin' :
-            $page_title = $lang['btn_admin'];
-            // try to get the plugin name
-            // retrieve admin plugin name from $_REQUEST['page']
-            if (($page = $INPUT->str('page', '', true)) != '') {
-                $pluginlist = plugin_list('admin');
-                if (in_array($page, $pluginlist)) {
-                    // attempt to load the plugin
-
-                    if (($plugin = plugin_load('admin',$page)) !== null){
-                        $plugin_title = $plugin->getMenuText();
-                        $page_title = $plugin_title ? $plugin_title : $page;
-                    }
-                }
-            }
-            break;
-
-        // user functions
-        case 'login' :
-        case 'profile' :
-        case 'register' :
-        case 'resendpwd' :
-            $page_title = $lang['btn_'.$ACT];
-            break;
-
-         // wiki functions
-        case 'search' :
-        case 'index' :
-            $page_title = $lang['btn_'.$ACT];
-            break;
-
-        // page functions
-        case 'edit' :
-            $page_title = "✎ ".$name;
-            break;
-
-        case 'revisions' :
-            $page_title = $name . ' - ' . $lang['btn_revs'];
-            break;
-
-        case 'backlink' :
-        case 'recent' :
-        case 'subscribe' :
-            $page_title = $name . ' - ' . $lang['btn_'.$ACT];
-            break;
-
-        default : // SHOW and anything else not included
-            $page_title = $name;
+        $title = p_get_first_heading($id);
+        if($title) $name = $title;
     }
 
     if($ret) {
-        return hsc($page_title);
+        return hsc($name);
     } else {
-        print hsc($page_title);
+        print hsc($name);
         return true;
     }
 }
-- 
cgit v1.2.3


From fffeeafeb2530d99ec4baaec915722482dc92e84 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 17:11:22 +0200
Subject:     Show a relevant page title for other actions

    See Issue #1149
    - Show 'admin' or the admin plugin name for admin functions
    - Show action name for user & site actions, e.g. login, sitemape
    - Show page name + action for page actions, e.g. changes, backlinks
    - Show a utf8 pen glyph when editing
    - Otherwise show the page name (as previously)
---
 inc/template.php | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 3859065bc..fd8bff11a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1035,6 +1035,8 @@ function tpl_pageinfo($ret = false) {
  * @return bool|string
  */
 function tpl_pagetitle($id = null, $ret = false) {
+    global $ACT, $INPUT, $lang;
+
     if(is_null($id)) {
         global $ID;
         $id = $ID;
@@ -1042,14 +1044,67 @@ function tpl_pagetitle($id = null, $ret = false) {
 
     $name = $id;
     if(useHeading('navigation')) {
-        $title = p_get_first_heading($id);
-        if($title) $name = $title;
+        $first_heading = p_get_first_heading($id);
+        if($first_heading) $name = $first_heading;
+    }
+
+    // default page title is the page name, modify with the current action
+    switch ($ACT) {
+        // admin functions
+        case 'admin' :
+            $page_title = $lang['btn_admin'];
+            // try to get the plugin name
+            // retrieve admin plugin name from $_REQUEST['page']
+            if (($page = $INPUT->str('page', '', true)) != '') {
+                $pluginlist = plugin_list('admin');
+                if (in_array($page, $pluginlist)) {
+                    // attempt to load the plugin
+
+                    if (($plugin = plugin_load('admin',$page)) !== null){
+                        $plugin_title = $plugin->getMenuText();
+                        $page_title = $plugin_title ? $plugin_title : $page;
+                    }
+                }
+            }
+            break;
+
+        // user functions
+        case 'login' :
+        case 'profile' :
+        case 'register' :
+        case 'resendpwd' :
+            $page_title = $lang['btn_'.$ACT];
+            break;
+
+         // wiki functions
+        case 'search' :
+        case 'index' :
+            $page_title = $lang['btn_'.$ACT];
+            break;
+
+        // page functions
+        case 'edit' :
+            $page_title = "✎ ".$name;
+            break;
+
+        case 'revisions' :
+            $page_title = $name . ' - ' . $lang['btn_revs'];
+            break;
+
+        case 'backlink' :
+        case 'recent' :
+        case 'subscribe' :
+            $page_title = $name . ' - ' . $lang['btn_'.$ACT];
+            break;
+
+        default : // SHOW and anything else not included
+            $page_title = $name;
     }
 
     if($ret) {
-        return hsc($name);
+        return hsc($page_title);
     } else {
-        print hsc($name);
+        print hsc($page_title);
         return true;
     }
 }
-- 
cgit v1.2.3


From 26e22ab837dcabe137a0912fcd2f96d0c35f48c8 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 19:03:34 +0200
Subject: Changes for PHP 7 Compatibility - replace PHP4 style class
 constructor function names (based on   class name) with php 5 __construct()
 Also remove some '&' reference operators used with objects And add some
 object type hints

---
 _test/tests/inc/parser/lexer.test.php        |  4 +--
 inc/IXR_Library.php                          | 20 ++++++------
 inc/events.php                               |  4 +--
 inc/form.php                                 |  2 +-
 inc/parser/handler.php                       | 48 ++++++++++++++++------------
 inc/parser/lexer.php                         |  6 ++--
 inc/parser/parser.php                        | 20 ++++++------
 lib/plugins/config/settings/config.class.php |  4 +--
 lib/plugins/config/settings/extra.class.php  |  2 +-
 lib/plugins/popularity/action.php            |  2 +-
 lib/plugins/popularity/admin.php             |  2 +-
 lib/plugins/popularity/helper.php            |  2 +-
 lib/plugins/usermanager/admin.php            |  2 +-
 13 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/_test/tests/inc/parser/lexer.test.php b/_test/tests/inc/parser/lexer.test.php
index d0965a13e..c50665928 100644
--- a/_test/tests/inc/parser/lexer.test.php
+++ b/_test/tests/inc/parser/lexer.test.php
@@ -146,7 +146,7 @@ class TestOfLexerStateStack extends DokuWikiTest {
 }
 
 class TestParser {
-    function TestParser() {
+    function __construct() {
     }
     function accept() {
     }
@@ -364,7 +364,7 @@ class TestOfLexerHandlers extends DokuWikiTest {
 
 class TestParserByteIndex {
 
-    function TestParserByteIndex() {}
+    function __construct() {}
 
     function ignore() {}
 
diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 839298680..301a8d9e1 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -52,7 +52,7 @@ class IXR_Value {
      * @param mixed $data
      * @param bool $type
      */
-    function IXR_Value($data, $type = false) {
+    function __construct($data, $type = false) {
         $this->data = $data;
         if(!$type) {
             $type = $this->calculateType();
@@ -201,7 +201,7 @@ class IXR_Message {
     /**
      * @param string $message
      */
-    function IXR_Message($message) {
+    function __construct($message) {
         $this->message =& $message;
     }
 
@@ -388,7 +388,7 @@ class IXR_Server {
      * @param bool $data
      * @param bool $wait
      */
-    function IXR_Server($callbacks = false, $data = false, $wait = false) {
+    function __construct($callbacks = false, $data = false, $wait = false) {
         $this->setCapabilities();
         if($callbacks) {
             $this->callbacks = $callbacks;
@@ -621,7 +621,7 @@ class IXR_Request {
      * @param string $method
      * @param array $args
      */
-    function IXR_Request($method, $args) {
+    function __construct($method, $args) {
         $this->method = $method;
         $this->args = $args;
         $this->xml = <<<EOD
@@ -684,7 +684,7 @@ class IXR_Client extends DokuHTTPClient {
      * @param int $port
      * @param int $timeout
      */
-    function IXR_Client($server, $path = false, $port = 80, $timeout = 15) {
+    function __construct($server, $path = false, $port = 80, $timeout = 15) {
         parent::__construct();
         if(!$path) {
             // Assume we have been given a URL instead
@@ -779,7 +779,7 @@ class IXR_Error {
      * @param int $code
      * @param string $message
      */
-    function IXR_Error($code, $message) {
+    function __construct($code, $message) {
         $this->code = $code;
         $this->message = htmlspecialchars($message);
     }
@@ -829,7 +829,7 @@ class IXR_Date {
     /**
      * @param int|string $time
      */
-    function IXR_Date($time) {
+    function __construct($time) {
         // $time can be a PHP timestamp or an ISO one
         if(is_numeric($time)) {
             $this->parseTimestamp($time);
@@ -899,7 +899,7 @@ class IXR_Base64 {
     /**
      * @param string $data
      */
-    function IXR_Base64($data) {
+    function __construct($data) {
         $this->data = $data;
     }
 
@@ -923,7 +923,7 @@ class IXR_IntrospectionServer extends IXR_Server {
     /** @var string[] */
     var $help;
 
-    function IXR_IntrospectionServer() {
+    function __construct() {
         $this->setCallbacks();
         $this->setCapabilities();
         $this->capabilities['introspection'] = array(
@@ -1106,7 +1106,7 @@ class IXR_ClientMulticall extends IXR_Client {
      * @param string|bool $path
      * @param int $port
      */
-    function IXR_ClientMulticall($server, $path = false, $port = 80) {
+    function __construct($server, $path = false, $port = 80) {
         parent::IXR_Client($server, $path, $port);
         //$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
     }
diff --git a/inc/events.php b/inc/events.php
index 256fb561e..35d55d0e3 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -31,7 +31,7 @@ class Doku_Event {
      * @param string $name
      * @param mixed $data
      */
-    function Doku_Event($name, &$data) {
+    function __construct($name, &$data) {
 
         $this->name = $name;
         $this->data =& $data;
@@ -153,7 +153,7 @@ class Doku_Event_Handler {
      * constructor, loads all action plugins and calls their register() method giving them
      * an opportunity to register any hooks they require
      */
-    function Doku_Event_Handler() {
+    function __construct() {
 
         // load action plugins
         /** @var DokuWiki_Action_Plugin $plugin */
diff --git a/inc/form.php b/inc/form.php
index 00eea9b3a..748983281 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -55,7 +55,7 @@ class Doku_Form {
      *
      * @author  Tom N Harris <tnharris@whoopdedo.org>
      */
-    function Doku_Form($params, $action=false, $method=false, $enctype=false) {
+    function __construct($params, $action=false, $method=false, $enctype=false) {
         if(!is_array($params)) {
             $this->params = array('id' => $params);
             if ($action !== false) $this->params['action'] = $action;
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index b8e2de82a..815ac39c5 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -17,7 +17,7 @@ class Doku_Handler {
 
     var $rewriteBlocks = true;
 
-    function Doku_Handler() {
+    function __construct() {
         $this->CallWriter = new Doku_Handler_CallWriter($this);
     }
 
@@ -295,7 +295,7 @@ class Doku_Handler {
         switch ( $state ) {
             case DOKU_LEXER_ENTER:
                 $ReWriter = new Doku_Handler_Preformatted($this->CallWriter);
-                $this->CallWriter = & $ReWriter;
+                $this->CallWriter = $ReWriter;
                 $this->_addCall('preformatted_start',array(), $pos);
             break;
             case DOKU_LEXER_EXIT:
@@ -715,15 +715,21 @@ function Doku_Handler_Parse_Media($match) {
 }
 
 //------------------------------------------------------------------------
-class Doku_Handler_CallWriter {
+interface Doku_Handler_CallWriter_Interface {
+    public function writeCall($call);
+    public function writeCalls($calls);
+    public function finalise();
+}
+
+class Doku_Handler_CallWriter implements Doku_Handler_CallWriter_Interface {
 
     var $Handler;
 
     /**
      * @param Doku_Handler $Handler
      */
-    function Doku_Handler_CallWriter(& $Handler) {
-        $this->Handler = & $Handler;
+    function __construct(Doku_Handler $Handler) {
+        $this->Handler = $Handler;
     }
 
     function writeCall($call) {
@@ -748,7 +754,7 @@ class Doku_Handler_CallWriter {
  *
  * @author    Chris Smith <chris@jalakai.co.uk>
  */
-class Doku_Handler_Nest {
+class Doku_Handler_Nest implements Doku_Handler_CallWriter_Interface {
 
     var $CallWriter;
     var $calls = array();
@@ -762,8 +768,8 @@ class Doku_Handler_Nest {
      * @param  string     $close          closing instruction name, this is required to properly terminate the
      *                                    syntax mode if the document ends without a closing pattern
      */
-    function Doku_Handler_Nest(& $CallWriter, $close="nest_close") {
-        $this->CallWriter = & $CallWriter;
+    function __construct(Doku_Handler_CallWriter_Interface $CallWriter, $close="nest_close") {
+        $this->CallWriter = $CallWriter;
 
         $this->closingInstruction = $close;
     }
@@ -808,7 +814,7 @@ class Doku_Handler_Nest {
     }
 }
 
-class Doku_Handler_List {
+class Doku_Handler_List implements Doku_Handler_CallWriter_Interface {
 
     var $CallWriter;
 
@@ -818,8 +824,8 @@ class Doku_Handler_List {
 
     const NODE = 1;
 
-    function Doku_Handler_List(& $CallWriter) {
-        $this->CallWriter = & $CallWriter;
+    function __construct(Doku_Handler_CallWriter_Interface $CallWriter) {
+        $this->CallWriter = $CallWriter;
     }
 
     function writeCall($call) {
@@ -1018,7 +1024,7 @@ class Doku_Handler_List {
 }
 
 //------------------------------------------------------------------------
-class Doku_Handler_Preformatted {
+class Doku_Handler_Preformatted implements Doku_Handler_CallWriter_Interface {
 
     var $CallWriter;
 
@@ -1028,8 +1034,8 @@ class Doku_Handler_Preformatted {
 
 
 
-    function Doku_Handler_Preformatted(& $CallWriter) {
-        $this->CallWriter = & $CallWriter;
+    function __construct(Doku_Handler_CallWriter_Interface $CallWriter) {
+        $this->CallWriter = $CallWriter;
     }
 
     function writeCall($call) {
@@ -1078,7 +1084,7 @@ class Doku_Handler_Preformatted {
 }
 
 //------------------------------------------------------------------------
-class Doku_Handler_Quote {
+class Doku_Handler_Quote implements Doku_Handler_CallWriter_Interface {
 
     var $CallWriter;
 
@@ -1086,8 +1092,8 @@ class Doku_Handler_Quote {
 
     var $quoteCalls = array();
 
-    function Doku_Handler_Quote(& $CallWriter) {
-        $this->CallWriter = & $CallWriter;
+    function __construct(Doku_Handler_CallWriter_Interface $CallWriter) {
+        $this->CallWriter = $CallWriter;
     }
 
     function writeCall($call) {
@@ -1170,7 +1176,7 @@ class Doku_Handler_Quote {
 }
 
 //------------------------------------------------------------------------
-class Doku_Handler_Table {
+class Doku_Handler_Table implements Doku_Handler_CallWriter_Interface {
 
     var $CallWriter;
 
@@ -1185,8 +1191,8 @@ class Doku_Handler_Table {
     var $currentRow = array('tableheader' => 0, 'tablecell' => 0);
     var $countTableHeadRows = 0;
 
-    function Doku_Handler_Table(& $CallWriter) {
-        $this->CallWriter = & $CallWriter;
+    function __construct(Doku_Handler_CallWriter_Interface $CallWriter) {
+        $this->CallWriter = $CallWriter;
     }
 
     function writeCall($call) {
@@ -1551,7 +1557,7 @@ class Doku_Handler_Block {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function Doku_Handler_Block(){
+    function __construct(){
         global $DOKU_PLUGINS;
         //check if syntax plugins were loaded
         if(empty($DOKU_PLUGINS['syntax'])) return;
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index b46a5f505..5afcc520a 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -46,7 +46,7 @@ class Doku_LexerParallelRegex {
      *                         for insensitive.
      * @access public
      */
-    function Doku_LexerParallelRegex($case) {
+    function __construct($case) {
         $this->_case = $case;
         $this->_patterns = array();
         $this->_labels = array();
@@ -232,7 +232,7 @@ class Doku_LexerStateStack {
      * @param string $start        Starting state name.
      * @access public
      */
-    function Doku_LexerStateStack($start) {
+    function __construct($start) {
         $this->_stack = array($start);
     }
 
@@ -296,7 +296,7 @@ class Doku_Lexer {
      * @param boolean $case            True for case sensitive.
      * @access public
      */
-    function Doku_Lexer(&$parser, $start = "accept", $case = false) {
+    function __construct(&$parser, $start = "accept", $case = false) {
         $this->_case = $case;
         /** @var Doku_LexerParallelRegex[] _regexes */
         $this->_regexes = array();
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 5f86cf5c4..65510071e 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -226,7 +226,7 @@ class Doku_Parser_Mode_Plugin extends DokuWiki_Plugin implements Doku_Parser_Mod
 //-------------------------------------------------------------------
 class Doku_Parser_Mode_base extends Doku_Parser_Mode {
 
-    function Doku_Parser_Mode_base() {
+    function __construct() {
         global $PARSER_MODES;
 
         $this->allowedModes = array_merge (
@@ -248,7 +248,7 @@ class Doku_Parser_Mode_base extends Doku_Parser_Mode {
 //-------------------------------------------------------------------
 class Doku_Parser_Mode_footnote extends Doku_Parser_Mode {
 
-    function Doku_Parser_Mode_footnote() {
+    function __construct() {
         global $PARSER_MODES;
 
         $this->allowedModes = array_merge (
@@ -416,7 +416,7 @@ class Doku_Parser_Mode_formatting extends Doku_Parser_Mode {
     /**
      * @param string $type
      */
-    function Doku_Parser_Mode_formatting($type) {
+    function __construct($type) {
         global $PARSER_MODES;
 
         if ( !array_key_exists($type, $this->formatting) ) {
@@ -470,7 +470,7 @@ class Doku_Parser_Mode_formatting extends Doku_Parser_Mode {
 //-------------------------------------------------------------------
 class Doku_Parser_Mode_listblock extends Doku_Parser_Mode {
 
-    function Doku_Parser_Mode_listblock() {
+    function __construct() {
         global $PARSER_MODES;
 
         $this->allowedModes = array_merge (
@@ -504,7 +504,7 @@ class Doku_Parser_Mode_listblock extends Doku_Parser_Mode {
 //-------------------------------------------------------------------
 class Doku_Parser_Mode_table extends Doku_Parser_Mode {
 
-    function Doku_Parser_Mode_table() {
+    function __construct() {
         global $PARSER_MODES;
 
         $this->allowedModes = array_merge (
@@ -648,7 +648,7 @@ class Doku_Parser_Mode_file extends Doku_Parser_Mode {
 //-------------------------------------------------------------------
 class Doku_Parser_Mode_quote extends Doku_Parser_Mode {
 
-    function Doku_Parser_Mode_quote() {
+    function __construct() {
         global $PARSER_MODES;
 
         $this->allowedModes = array_merge (
@@ -682,7 +682,7 @@ class Doku_Parser_Mode_acronym extends Doku_Parser_Mode {
     var $acronyms = array();
     var $pattern = '';
 
-    function Doku_Parser_Mode_acronym($acronyms) {
+    function __construct($acronyms) {
         usort($acronyms,array($this,'_compare'));
         $this->acronyms = $acronyms;
     }
@@ -729,7 +729,7 @@ class Doku_Parser_Mode_smiley extends Doku_Parser_Mode {
     var $smileys = array();
     var $pattern = '';
 
-    function Doku_Parser_Mode_smiley($smileys) {
+    function __construct($smileys) {
         $this->smileys = $smileys;
     }
 
@@ -762,7 +762,7 @@ class Doku_Parser_Mode_wordblock extends Doku_Parser_Mode {
     var $badwords = array();
     var $pattern = '';
 
-    function Doku_Parser_Mode_wordblock($badwords) {
+    function __construct($badwords) {
         $this->badwords = $badwords;
     }
 
@@ -797,7 +797,7 @@ class Doku_Parser_Mode_entity extends Doku_Parser_Mode {
     var $entities = array();
     var $pattern = '';
 
-    function Doku_Parser_Mode_entity($entities) {
+    function __construct($entities) {
         $this->entities = $entities;
     }
 
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 316cc2c59..f2d43bff6 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -37,7 +37,7 @@ if (!class_exists('configuration')) {
          *
          * @param string $datafile path to config metadata file
          */
-        public function configuration($datafile) {
+        public function __construct($datafile) {
             global $conf, $config_cascade;
 
             if (!file_exists($datafile)) {
@@ -434,7 +434,7 @@ if (!class_exists('setting')) {
          * @param string $key
          * @param array|null $params array with metadata of setting
          */
-        public function setting($key, $params=null) {
+        public function __construct($key, $params=null) {
             $this->_key = $key;
 
             if (is_array($params)) {
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index fd3a90e28..c6a3f9dae 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -20,7 +20,7 @@ if (!class_exists('setting_sepchar')) {
             for ($i=0;$i<strlen($str);$i++) $this->_choices[] = $str{$i};
 
             // call foundation class constructor
-            $this->setting($key,$param);
+            parent::__construct($key,$param);
         }
     }
 }
diff --git a/lib/plugins/popularity/action.php b/lib/plugins/popularity/action.php
index 9e2e78d11..d5ec0f5c5 100644
--- a/lib/plugins/popularity/action.php
+++ b/lib/plugins/popularity/action.php
@@ -15,7 +15,7 @@ class action_plugin_popularity extends Dokuwiki_Action_Plugin {
      */
     var $helper;
 
-    function action_plugin_popularity(){
+    function __construct(){
         $this->helper = $this->loadHelper('popularity', false);
     }
 
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index ab569b8b4..a2c3c6c8b 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -20,7 +20,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
     var $helper;
     var $sentStatus = null;
 
-    function admin_plugin_popularity(){
+    function __construct(){
         $this->helper = $this->loadHelper('popularity', false);
     }
 
diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 8673fb5af..e99f6a60c 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -30,7 +30,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
     var $popularityLastSubmitFile;
 
 
-    function helper_plugin_popularity(){
+    function __construct(){
         global $conf;
         $this->autosubmitFile = $conf['cachedir'].'/autosubmit.txt';
         $this->autosubmitErrorFile = $conf['cachedir'].'/autosubmitError.txt';
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 9cb9b0c40..0d92e5cc1 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -36,7 +36,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     /**
      * Constructor
      */
-    public function admin_plugin_usermanager(){
+    public function __construct(){
         /** @var DokuWiki_Auth_Plugin $auth */
         global $auth;
 
-- 
cgit v1.2.3


From 5c3b310dea6f5a4712e4b9bc1f3d6d198c057ee0 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 19:32:40 +0200
Subject: more class constructors to __construct()

---
 inc/JSON.php     | 2 +-
 inc/JpegMeta.php | 2 +-
 inc/cache.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/JSON.php b/inc/JSON.php
index 7f89005ff..e01488e14 100644
--- a/inc/JSON.php
+++ b/inc/JSON.php
@@ -119,7 +119,7 @@ class JSON {
      *                               JSON_LOOSE_TYPE - loose typing
      *                                                 "{...}" syntax creates associative arrays in decode.
      */
-    function JSON($use=JSON_STRICT_TYPE) {
+    function __construct($use=JSON_STRICT_TYPE) {
         $this->use = $use;
     }
 
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index cd082cbba..1fa4f25ce 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -54,7 +54,7 @@ class JpegMeta {
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
      */
-    function JpegMeta($fileName) {
+    function __construct($fileName) {
 
         $this->_fileName = $fileName;
 
diff --git a/inc/cache.php b/inc/cache.php
index 68f64eaa2..1776d94cd 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -26,7 +26,7 @@ class cache {
      * @param string $key primary identifier
      * @param string $ext file extension
      */
-    public function cache($key,$ext) {
+    public function __construct($key,$ext) {
         $this->key = $key;
         $this->ext = $ext;
         $this->cache = getCacheName($key,$ext);
-- 
cgit v1.2.3


From 45e8987e1f40331011f6c91dab7bff6cb34631ce Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 19:33:44 +0200
Subject: more object type hints and removal of '&' operator before objects

---
 inc/parser/lexer.php  |  4 ++--
 inc/parser/parser.php | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 5afcc520a..17aa6c170 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -296,11 +296,11 @@ class Doku_Lexer {
      * @param boolean $case            True for case sensitive.
      * @access public
      */
-    function __construct(&$parser, $start = "accept", $case = false) {
+    function __construct($parser, $start = "accept", $case = false) {
         $this->_case = $case;
         /** @var Doku_LexerParallelRegex[] _regexes */
         $this->_regexes = array();
-        $this->_parser = &$parser;
+        $this->_parser = $parser;
         $this->_mode = new Doku_LexerStateStack($start);
         $this->_mode_handlers = array();
     }
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 65510071e..7814e94f6 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -64,24 +64,24 @@ class Doku_Parser {
     /**
      * @param Doku_Parser_Mode_base $BaseMode
      */
-    function addBaseMode(& $BaseMode) {
-        $this->modes['base'] =& $BaseMode;
+    function addBaseMode($BaseMode) {
+        $this->modes['base'] = $BaseMode;
         if ( !$this->Lexer ) {
             $this->Lexer = new Doku_Lexer($this->Handler,'base', true);
         }
-        $this->modes['base']->Lexer =& $this->Lexer;
+        $this->modes['base']->Lexer = $this->Lexer;
     }
 
     /**
      * PHP preserves order of associative elements
      * Mode sequence is important
      */
-    function addMode($name, & $Mode) {
+    function addMode($name, Doku_Parser_Mode_Interface $Mode) {
         if ( !isset($this->modes['base']) ) {
             $this->addBaseMode(new Doku_Parser_Mode_base());
         }
-        $Mode->Lexer = & $this->Lexer;
-        $this->modes[$name] =& $Mode;
+        $Mode->Lexer = $this->Lexer;
+        $this->modes[$name] = $Mode;
     }
 
     function connectModes() {
-- 
cgit v1.2.3


From e56e288689415ba069beb129a3ed9dccc404c0a3 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 19:33:59 +0200
Subject: PHP7 Compat updates on the phpseclib

This is a quick fix in advance of the library being updated to
the latest & PHP7 compatible version.
---
 inc/phpseclib/Crypt_AES.php      | 4 ++--
 inc/phpseclib/Crypt_Base.php     | 2 +-
 inc/phpseclib/Crypt_Hash.php     | 2 +-
 inc/phpseclib/Crypt_Rijndael.php | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/phpseclib/Crypt_AES.php b/inc/phpseclib/Crypt_AES.php
index 81fa2feab..f2df78351 100644
--- a/inc/phpseclib/Crypt_AES.php
+++ b/inc/phpseclib/Crypt_AES.php
@@ -164,9 +164,9 @@ class Crypt_AES extends Crypt_Rijndael {
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_AES($mode = CRYPT_AES_MODE_CBC)
+    function __construct($mode = CRYPT_AES_MODE_CBC)
     {
-        parent::Crypt_Rijndael($mode);
+        parent::__construct($mode);
     }
 
     /**
diff --git a/inc/phpseclib/Crypt_Base.php b/inc/phpseclib/Crypt_Base.php
index 7c650ca72..4fb9990c7 100644
--- a/inc/phpseclib/Crypt_Base.php
+++ b/inc/phpseclib/Crypt_Base.php
@@ -445,7 +445,7 @@ class Crypt_Base {
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_Base($mode = CRYPT_MODE_CBC)
+    function __construct($mode = CRYPT_MODE_CBC)
     {
         $const_crypt_mode = 'CRYPT_' . $this->const_namespace . '_MODE';
 
diff --git a/inc/phpseclib/Crypt_Hash.php b/inc/phpseclib/Crypt_Hash.php
index 840fcd508..61825d3c3 100644
--- a/inc/phpseclib/Crypt_Hash.php
+++ b/inc/phpseclib/Crypt_Hash.php
@@ -143,7 +143,7 @@ class Crypt_Hash {
      * @return Crypt_Hash
      * @access public
      */
-    function Crypt_Hash($hash = 'sha1')
+    function __construct($hash = 'sha1')
     {
         if ( !defined('CRYPT_HASH_MODE') ) {
             switch (true) {
diff --git a/inc/phpseclib/Crypt_Rijndael.php b/inc/phpseclib/Crypt_Rijndael.php
index c63e0ff7e..33f42da17 100644
--- a/inc/phpseclib/Crypt_Rijndael.php
+++ b/inc/phpseclib/Crypt_Rijndael.php
@@ -699,9 +699,9 @@ class Crypt_Rijndael extends Crypt_Base {
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC)
+    function __construct($mode = CRYPT_RIJNDAEL_MODE_CBC)
     {
-        parent::Crypt_Base($mode);
+        parent::__construct($mode);
     }
 
     /**
-- 
cgit v1.2.3


From 1cb97a10e626bb48eb809e12d0fadea1e1cea7da Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 19:41:15 +0200
Subject: update parent constructor calls to use __construct()

---
 inc/cache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/cache.php b/inc/cache.php
index 1776d94cd..35d9cfd43 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -193,7 +193,7 @@ class cache_parser extends cache {
         $this->file = $file;
         $this->mode = $mode;
 
-        parent::cache($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.'.$mode);
+        parent::__construct($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.'.$mode);
     }
 
     /**
@@ -309,7 +309,7 @@ class cache_instructions extends cache_parser {
      * @param string $file source file for cache
      */
     public function cache_instructions($id, $file) {
-        parent::cache_parser($id, $file, 'i');
+        parent::__construct($id, $file, 'i');
     }
 
     /**
-- 
cgit v1.2.3


From 2863d10380f6ac5a00868d7125b535a7dc38cb08 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 15 May 2015 19:59:24 +0200
Subject: another class_name to __construct

---
 inc/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/cache.php b/inc/cache.php
index 35d9cfd43..6b05a2b54 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -188,7 +188,7 @@ class cache_parser extends cache {
      * @param string $file source file for cache
      * @param string $mode input mode
      */
-    public function cache_parser($id, $file, $mode) {
+    public function __construct($id, $file, $mode) {
         if ($id) $this->page = $id;
         $this->file = $file;
         $this->mode = $mode;
-- 
cgit v1.2.3


From 79eec18f7ad9126ba147cd13eb2a8d6ee41bf140 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 16 May 2015 00:12:29 +0200
Subject: yet another class constructor

---
 inc/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/cache.php b/inc/cache.php
index 6b05a2b54..9375dc86b 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -308,7 +308,7 @@ class cache_instructions extends cache_parser {
      * @param string $id page id
      * @param string $file source file for cache
      */
-    public function cache_instructions($id, $file) {
+    public function __construct($id, $file) {
         parent::__construct($id, $file, 'i');
     }
 
-- 
cgit v1.2.3


From 689215716f1a8fc21318a4e032a96a3a592317e7 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 16 May 2015 10:51:32 +0200
Subject: replace deprecated getRevisions call

---
 inc/html.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/inc/html.php b/inc/html.php
index 4bf784502..2564c3bd6 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -776,10 +776,16 @@ function html_recent($first=0, $show_changes='both'){
         $href = '';
 
         if (!empty($recent['media'])) {
-            $diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && file_exists(mediaFN($recent['id'])));
+            $changelog = new MediaChangeLog($recent['id']);
+            $revs = $changelog->getRevisions(0, 1);
+            $diff = (count($revs) && file_exists(mediaFN($recent['id'])));
             if ($diff) {
-                $href = media_managerURL(array('tab_details' => 'history',
-                    'mediado' => 'diff', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
+                $href = media_managerURL(array(
+                                             'tab_details' => 'history',
+                                             'mediado' => 'diff',
+                                             'image' => $recent['id'],
+                                             'ns' => getNS($recent['id'])
+                                         ), '&');
             }
         } else {
             $href = wl($recent['id'],"do=diff", false, '&');
-- 
cgit v1.2.3


From 313d3e75d6e76a2d4336143256b8d0b8777e2849 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 16 May 2015 11:00:57 +0200
Subject: add package phpunit & travis config files to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a8962d0bc..acb26dd90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,8 @@ lib/images/*/local/*
 # composer default ignores
 composer.phar
 vendor/bin/*
+vendor/*/*/phpunit.xml
+vendor/*/*/.travis.yml
 vendor/*/*/bin/*
 vendor/*/*/tests/*
 vendor/*/*/test/*
-- 
cgit v1.2.3


From bff1a21bd9a53ef56d9603457bbb3b6178564791 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 16 May 2015 11:49:27 +0200
Subject: removed one of the ignored lines

---
 vendor/splitbrain/php-archive/.travis.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 vendor/splitbrain/php-archive/.travis.yml

diff --git a/vendor/splitbrain/php-archive/.travis.yml b/vendor/splitbrain/php-archive/.travis.yml
deleted file mode 100644
index 21124ce5d..000000000
--- a/vendor/splitbrain/php-archive/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --prefer-source --no-interaction --dev
-
-script: phpunit
\ No newline at end of file
-- 
cgit v1.2.3


From 8381d1c12c09df8fe72bac997487210bf08b8e5f Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 16 May 2015 12:49:55 +0200
Subject: update to __construct

---
 inc/cliopts.php           |  4 ++--
 inc/feedcreator.class.php | 52 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/inc/cliopts.php b/inc/cliopts.php
index 7d71c7dc9..d7d06119a 100644
--- a/inc/cliopts.php
+++ b/inc/cliopts.php
@@ -447,7 +447,7 @@ class Doku_Cli_Opts_Error {
     var $code;
     var $msg;
 
-    function Doku_Cli_Opts_Error($code, $msg) {
+    function __construct($code, $msg) {
         $this->code = $code;
         $this->msg = $msg;
     }
@@ -468,7 +468,7 @@ class Doku_Cli_Opts_Container {
     var $options = array();
     var $args = array();
 
-    function Doku_Cli_Opts_Container($options) {
+    function __construct($options) {
         foreach ( $options[0] as $option ) {
             if ( false !== ( strpos($option[0], '--') ) ) {
                 $opt_name = substr($option[0], 2);
diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php
index b90da5724..dd6da4465 100644
--- a/inc/feedcreator.class.php
+++ b/inc/feedcreator.class.php
@@ -129,6 +129,9 @@ class FeedItem extends HtmlDescribable {
     // var $source;
 }
 
+/**
+ * Class EnclosureItem
+ */
 class EnclosureItem extends HtmlDescribable {
     /*
     *
@@ -226,7 +229,7 @@ class FeedHtmlField {
      * Creates a new instance of FeedHtmlField.
      * @param string $parFieldContent: if given, sets the rawFieldContent property
      */
-    function FeedHtmlField($parFieldContent) {
+    function __construct($parFieldContent) {
         if ($parFieldContent) {
             $this->rawFieldContent = $parFieldContent;
         }
@@ -604,6 +607,8 @@ class FeedCreator extends HtmlDescribable {
     /**
      * @since 1.4
      * @access private
+     *
+     * @param string $filename
      */
     function _redirect($filename) {
         // attention, heavily-commented-out-area
@@ -697,7 +702,7 @@ class FeedDate {
      * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
      * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
      */
-    function FeedDate($dateString="") {
+    function __construct($dateString="") {
         if ($dateString=="") $dateString = date("r");
 
         if (is_numeric($dateString)) {
@@ -878,7 +883,10 @@ class RSSCreator091 extends FeedCreator {
      */
     var $RSSVersion;
 
-    function RSSCreator091() {
+    /**
+     * Constructor
+     */
+    function __construct() {
         $this->_setRSSVersion("0.91");
         $this->contentType = "application/rss+xml";
     }
@@ -886,6 +894,8 @@ class RSSCreator091 extends FeedCreator {
     /**
      * Sets this RSS feed's version number.
      * @access private
+     *
+     * @param $version
      */
     function _setRSSVersion($version) {
         $this->RSSVersion = $version;
@@ -1034,7 +1044,10 @@ class RSSCreator091 extends FeedCreator {
  */
 class RSSCreator20 extends RSSCreator091 {
 
-    function RSSCreator20() {
+    /**
+     * Constructor
+     */
+    function __construct() {
         parent::_setRSSVersion("2.0");
     }
 
@@ -1051,7 +1064,10 @@ class RSSCreator20 extends RSSCreator091 {
  */
 class PIECreator01 extends FeedCreator {
 
-    function PIECreator01() {
+    /**
+     * Constructor
+     */
+    function __construct() {
         $this->encoding = "utf-8";
     }
 
@@ -1113,7 +1129,10 @@ class PIECreator01 extends FeedCreator {
  */
 class AtomCreator10 extends FeedCreator {
 
-    function AtomCreator10() {
+    /**
+     * Constructor
+     */
+    function __construct() {
         $this->contentType = "application/atom+xml";
         $this->encoding = "utf-8";
     }
@@ -1200,7 +1219,10 @@ class AtomCreator10 extends FeedCreator {
  */
 class AtomCreator03 extends FeedCreator {
 
-    function AtomCreator03() {
+    /**
+     * Constructor
+     */
+    function __construct() {
         $this->contentType = "application/atom+xml";
         $this->encoding = "utf-8";
     }
@@ -1272,12 +1294,19 @@ class AtomCreator03 extends FeedCreator {
  * @author Kai Blankenhorn <kaib@bitfolge.de>
  */
 class MBOXCreator extends FeedCreator {
-
-    function MBOXCreator() {
+    /**
+     * Constructor
+     */
+    function __construct() {
         $this->contentType = "text/plain";
         $this->encoding = "utf-8";
     }
 
+    /**
+     * @param string $input
+     * @param int $line_max
+     * @return string
+     */
     function qp_enc($input = "", $line_max = 76) {
         $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
         $lines = preg_split("/(?:\r\n|\r|\n)/", $input);
@@ -1363,7 +1392,10 @@ class MBOXCreator extends FeedCreator {
  */
 class OPMLCreator extends FeedCreator {
 
-    function OPMLCreator() {
+    /**
+     * Constructor
+     */
+    function __construct() {
         $this->encoding = "utf-8";
     }
 
-- 
cgit v1.2.3


From 4a0a77adb7e7e218beb1e58d7b0ef3ae17f4a612 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 16 May 2015 12:50:37 +0200
Subject: var declaration, static declaration

---
 inc/feedcreator.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php
index dd6da4465..fe444b39b 100644
--- a/inc/feedcreator.class.php
+++ b/inc/feedcreator.class.php
@@ -485,6 +485,8 @@ class FeedCreator extends HtmlDescribable {
     var $additionalElements = Array();
 
 
+    var $_timeout;
+
     /**
      * Adds an FeedItem to the feed.
      *
@@ -508,7 +510,7 @@ class FeedCreator extends HtmlDescribable {
      * @param int     $length the maximum length the string should be truncated to
      * @return string    the truncated string
      */
-    function iTrunc($string, $length) {
+    static function iTrunc($string, $length) {
         if (strlen($string)<=$length) {
             return $string;
         }
-- 
cgit v1.2.3


From 144055c8fa7b544201172cc89abf15f8c443e6e9 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 16 May 2015 15:12:06 +0200
Subject: PHPDocs

---
 lib/plugins/action.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/action.php b/lib/plugins/action.php
index 4b5eef60a..23d94a509 100644
--- a/lib/plugins/action.php
+++ b/lib/plugins/action.php
@@ -16,6 +16,8 @@ class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
 
     /**
      * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller
      */
     public function register(Doku_Event_Handler $controller) {
         trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
-- 
cgit v1.2.3


From c248bda1dcbef2068071904057b8410aa1eb0200 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 16 May 2015 17:40:33 +0200
Subject: fix missing language code parameter for admin plugin titles add unit
 test coverage

---
 _test/tests/inc/template_include_page.test.php | 77 +++++++++++++++++---------
 inc/template.php                               |  4 +-
 2 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/_test/tests/inc/template_include_page.test.php b/_test/tests/inc/template_include_page.test.php
index 47d4d46f1..580221979 100644
--- a/_test/tests/inc/template_include_page.test.php
+++ b/_test/tests/inc/template_include_page.test.php
@@ -1,40 +1,67 @@
 <?php
 
-class template_include_page_test extends DokuWikiTest {
-    function testNoSidebar() {
-        global $ID;
+class template_pagetitle_test extends DokuWikiTest {
 
-        $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_include_page('sidebar', false, true);
-        $this->assertEquals('', $sidebar);
+    function test_localID() {
+        global $ID,$ACT;
+
+
+        $id = 'foo:bar';
+
+        $ACT = 'show';
+        $this->assertEquals('foo:bar', tpl_pagetitle($id, true));
     }
 
-    function testExistingSidebars() {
-        global $ID;
+    function test_globalID() {
+        global $ID,$ACT;
+
 
-        saveWikiText('sidebar', 'topsidebar-test', '');
+        $ID = 'foo:bar';
 
-        $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_include_page('sidebar', false, true);
-        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
+        $ACT = 'show';
+        $this->assertEquals('foo:bar', tpl_pagetitle(null, true));
+    }
+
+    function test_adminTitle() {
+        global $ID,$ACT;
 
-        $ID = 'foo';
-        $sidebar = tpl_include_page('sidebar', false, true);
-        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
+        $ID = 'foo:bar';
+
+        $ACT = 'admin';
+        $this->assertEquals('Admin', tpl_pagetitle(null, true));
+    }
 
-        saveWikiText('foo:bar:sidebar', 'bottomsidebar-test', '');
+    function test_adminPluginTitle() {
+        global $ID,$ACT,$INPUT,$conf;
 
-        $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_include_page('sidebar', false, true);
-        $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
+        if (!plugin_load('admin','config')) {
+            $this->markTestSkipped('Plugin Config not found, unable to test admin plugin titles');
+            return;
+        }
 
-        $ID = 'foo:bar:test';
-        $sidebar = tpl_include_page('sidebar', false, true);
-        $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
+        $ID = 'foo:bar';
+        $ACT = 'admin';
+        $conf['lang'] = 'en';
+        $INPUT->set('page','config');
 
-        $ID = 'foo';
-        $sidebar = tpl_include_page('sidebar', false, true);
-        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
+        $this->assertEquals('Configuration Settings', tpl_pagetitle(null, true));
     }
 
+    function test_nonPageFunctionTitle() {
+        global $ID,$ACT;
+
+        $ID = 'foo:bar';
+
+        $ACT = 'index';
+        $this->assertEquals('Sitemap', tpl_pagetitle(null, true));
+    }
+
+    function test_pageFunctionTitle() {
+        global $ID,$ACT;
+
+        $ID = 'foo:bar';
+
+        $ACT = 'revisions';
+        $this->assertEquals('foo:bar - Old revisions', tpl_pagetitle(null, true));
+    }
 }
diff --git a/inc/template.php b/inc/template.php
index fd8bff11a..39d06e895 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1035,7 +1035,7 @@ function tpl_pageinfo($ret = false) {
  * @return bool|string
  */
 function tpl_pagetitle($id = null, $ret = false) {
-    global $ACT, $INPUT, $lang;
+    global $ACT, $INPUT, $conf, $lang;
 
     if(is_null($id)) {
         global $ID;
@@ -1061,7 +1061,7 @@ function tpl_pagetitle($id = null, $ret = false) {
                     // attempt to load the plugin
 
                     if (($plugin = plugin_load('admin',$page)) !== null){
-                        $plugin_title = $plugin->getMenuText();
+                        $plugin_title = $plugin->getMenuText($conf['lang']);
                         $page_title = $plugin_title ? $plugin_title : $page;
                     }
                 }
-- 
cgit v1.2.3


From 4d6524b8916955bf5fa9086042917244751dc03d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 16 May 2015 16:29:20 +0200
Subject: allow preview style replacements

---
 lib/exe/css.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 701cebaed..dc4d7d75c 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -37,7 +37,7 @@ function css_out(){
     if(!$tpl) $tpl = $conf['template'];
 
     // load style.ini
-    $styleini = css_styleini($tpl);
+    $styleini = css_styleini($tpl, $INPUT->bool('preview'));
     
     // find mediatypes
     if ($INPUT->str('s') == 'feed') {
@@ -49,7 +49,7 @@ function css_out(){
     }
 
     // The generated script depends on some dynamic options
-    $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl.$type,'.css');
+    $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$INPUT->int('preview').DOKU_BASE.$tpl.$type,'.css');
 
     // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
     if (isset($config_cascade['userstyle']['default'])) {
@@ -63,6 +63,7 @@ function css_out(){
     $cache_files[] = $tplinc.'style.local.ini'; // @deprecated
     $cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
     $cache_files[] = __FILE__;
+    if($INPUT->bool('preview')) $cache_files[] = $conf['cachedir'].'/preview.ini';
 
     // Array of needed files and their web locations, the latter ones
     // are needed to fix relative paths in the stylesheets
@@ -262,9 +263,12 @@ function css_applystyle($css, $replacements) {
  * @author Andreas Gohr <andi@splitbrain.org>
  *
  * @param string $tpl the used template
+ * @param bool   $preview load preview replacements
  * @return array with keys 'stylesheets' and 'replacements'
  */
-function css_styleini($tpl) {
+function css_styleini($tpl, $preview=false) {
+    global $conf;
+
     $stylesheets = array(); // mode, file => base
     $replacements = array(); // placeholder => value
 
@@ -321,6 +325,19 @@ function css_styleini($tpl) {
         }
     }
 
+    // allow replacement overwrites in preview mode
+    if($preview) {
+        $webbase = DOKU_BASE;
+        $ini     = $conf['cachedir'].'/preview.ini';
+        if(file_exists($ini)) {
+            $data = parse_ini_file($ini, true);
+            // replacements
+            if(is_array($data['replacements'])) {
+                $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'], $webbase));
+            }
+        }
+    }
+
     return array(
         'stylesheets' => $stylesheets,
         'replacements' => $replacements
-- 
cgit v1.2.3


From 6ea007c9f8c6830ea4f21ad880e91279e2f4bf10 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 16 May 2015 18:40:21 +0200
Subject: a first very basic implementation of the preview mechanism

---
 .gitignore                                |  1 +
 lib/plugins/styler/.travis.yml            | 13 +++++
 lib/plugins/styler/README                 | 27 ++++++++++
 lib/plugins/styler/_test/general.test.php | 33 ++++++++++++
 lib/plugins/styler/action.php             | 84 +++++++++++++++++++++++++++++++
 lib/plugins/styler/admin.php              | 74 +++++++++++++++++++++++++++
 lib/plugins/styler/lang/en/lang.php       | 16 ++++++
 lib/plugins/styler/plugin.info.txt        |  7 +++
 lib/plugins/styler/script.js              | 40 +++++++++++++++
 9 files changed, 295 insertions(+)
 create mode 100644 lib/plugins/styler/.travis.yml
 create mode 100644 lib/plugins/styler/README
 create mode 100644 lib/plugins/styler/_test/general.test.php
 create mode 100644 lib/plugins/styler/action.php
 create mode 100644 lib/plugins/styler/admin.php
 create mode 100644 lib/plugins/styler/lang/en/lang.php
 create mode 100644 lib/plugins/styler/plugin.info.txt
 create mode 100644 lib/plugins/styler/script.js

diff --git a/.gitignore b/.gitignore
index acb26dd90..cf1a37300 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@
 !/lib/plugins/popularity
 !/lib/plugins/revert
 !/lib/plugins/safefnrecode
+!/lib/plugins/styler
 !/lib/plugins/testing
 !/lib/plugins/usermanager
 !/lib/plugins/action.php
diff --git a/lib/plugins/styler/.travis.yml b/lib/plugins/styler/.travis.yml
new file mode 100644
index 000000000..d80c0691f
--- /dev/null
+++ b/lib/plugins/styler/.travis.yml
@@ -0,0 +1,13 @@
+# Config file for travis-ci.org
+
+language: php
+php:
+  - "5.5"
+  - "5.4"
+  - "5.3"
+env:
+  - DOKUWIKI=master
+  - DOKUWIKI=stable
+before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
+install: sh travis.sh
+script: cd _test && phpunit --stderr --group plugin_styler
\ No newline at end of file
diff --git a/lib/plugins/styler/README b/lib/plugins/styler/README
new file mode 100644
index 000000000..37a966352
--- /dev/null
+++ b/lib/plugins/styler/README
@@ -0,0 +1,27 @@
+styler Plugin for DokuWiki
+
+Allows to edit style.ini replacements
+
+All documentation for this plugin can be found at
+https://www.dokuwiki.org/plugin:styler
+
+If you install this plugin manually, make sure it is installed in
+lib/plugins/styler/ - if the folder is called different it
+will not work!
+
+Please refer to http://www.dokuwiki.org/plugins for additional info
+on how to install plugins in DokuWiki.
+
+----
+Copyright (C) Andreas Gohr <andi@splitbrain.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+See the COPYING file in your DokuWiki folder for details
diff --git a/lib/plugins/styler/_test/general.test.php b/lib/plugins/styler/_test/general.test.php
new file mode 100644
index 000000000..8b0712a20
--- /dev/null
+++ b/lib/plugins/styler/_test/general.test.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * General tests for the styler plugin
+ *
+ * @group plugin_styler
+ * @group plugins
+ */
+class general_plugin_styler_test extends DokuWikiTest {
+
+    /**
+     * Simple test to make sure the plugin.info.txt is in correct format
+     */
+    public function test_plugininfo() {
+        $file = __DIR__.'/../plugin.info.txt';
+        $this->assertFileExists($file);
+
+        $info = confToHash($file);
+
+        $this->assertArrayHasKey('base', $info);
+        $this->assertArrayHasKey('author', $info);
+        $this->assertArrayHasKey('email', $info);
+        $this->assertArrayHasKey('date', $info);
+        $this->assertArrayHasKey('name', $info);
+        $this->assertArrayHasKey('desc', $info);
+        $this->assertArrayHasKey('url', $info);
+
+        $this->assertEquals('styler', $info['base']);
+        $this->assertRegExp('/^https?:\/\//', $info['url']);
+        $this->assertTrue(mail_isvalid($info['email']));
+        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+        $this->assertTrue(false !== strtotime($info['date']));
+    }
+}
diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
new file mode 100644
index 000000000..648190a2a
--- /dev/null
+++ b/lib/plugins/styler/action.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * DokuWiki Plugin styler (Action Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+class action_plugin_styler extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller DokuWiki's event controller object
+     * @return void
+     */
+    public function register(Doku_Event_Handler $controller) {
+
+       $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
+       $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
+
+    }
+
+    /**
+     * [Custom event handler which performs action]
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
+     *                           handler was registered]
+     * @return void
+     */
+    public function handle_action(Doku_Event &$event, $param) {
+        $event->data = act_clean($event->data);
+        if($event->data === 'styler_plugin_preview') {
+            msg('handle') ;
+            $event->data = 'show';
+            $this->preview();
+        } elseif ($event->data === 'styler_plugin_save') {
+            $event->data = 'show';
+        }
+    }
+
+    protected function preview(){
+        global $conf;
+        $ini     = $conf['cachedir'].'/preview.ini';
+        io_saveFile($ini, $this->makeini());
+    }
+
+    protected function makeini() {
+        global $INPUT;
+
+        $ini = "[replacements]\n";
+        foreach($INPUT->arr('tpl') as $key => $val) {
+            $ini .= $key .' = "'.addslashes($val).'"'."\n";
+        }
+
+        return $ini;
+    }
+
+    /**
+     * [Custom event handler which performs action]
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
+     *                           handler was registered]
+     * @return void
+     */
+
+    public function handle_ajax(Doku_Event &$event, $param) {
+        if($event->data != 'plugin_styler') return;
+        $event->preventDefault();
+        $event->stopPropagation();
+
+        /** @var admin_plugin_styler $hlp */
+        $hlp = plugin_load('admin', 'styler');
+        $hlp->html();
+    }
+
+}
+
+// vim:ts=4:sw=4:et:
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
new file mode 100644
index 000000000..8ecbd22a0
--- /dev/null
+++ b/lib/plugins/styler/admin.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * DokuWiki Plugin styler (Admin Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+class admin_plugin_styler extends DokuWiki_Admin_Plugin {
+
+    /**
+     * @return int sort number in admin menu
+     */
+    public function getMenuSort() {
+        return 1000;
+    }
+
+    /**
+     * @return bool true if only access for superuser, false is for superusers and moderators
+     */
+    public function forAdminOnly() {
+        return true;
+    }
+
+    /**
+     * Should carry out any processing required by the plugin.
+     */
+    public function handle() {
+        set_doku_pref('styler_plugin', 1);
+    }
+
+    /**
+     * Render HTML output, e.g. helpful text and a form
+     */
+    public function html() {
+        global $conf;
+        $tpl = $conf['template'];
+        define('SIMPLE_TEST',1); // hack, ideally certain functions should be moved out of css.php
+        require_once(DOKU_INC.'lib/exe/css.php');
+        $styleini = css_styleini($conf['template'], true);
+        $replacements = $styleini['replacements'];
+
+        ptln('<h1>'.$this->getLang('menu').'</h1>');
+
+        if (empty($replacements)) {
+            echo '<p class="error">Sorry, this template does not support this functionality.</p>';
+        } else {
+            echo '<p>Intro blah... for the currently active template ("'.$tpl.'")... not all variables preview...</p>';
+
+            echo '<form class="styler" id="plugin__styler" method="post">';
+            echo '<h2>Template variables</h2>';
+            echo '<table>';
+            foreach($replacements as $key => $value){
+                echo '<tr>';
+                echo '<td>'.$key.'</td>';
+                echo '<td><input name="tpl['.hsc($key).']" value="'.hsc($value).'" />';
+                echo '</tr>';
+            }
+            echo '</table>';
+            echo '<input type="submit" name="do[styler_plugin_preview]" value="preview">';
+            echo '</form>';
+        }
+
+
+
+    }
+
+
+}
+
+// vim:ts=4:sw=4:et:
\ No newline at end of file
diff --git a/lib/plugins/styler/lang/en/lang.php b/lib/plugins/styler/lang/en/lang.php
new file mode 100644
index 000000000..dfb472f11
--- /dev/null
+++ b/lib/plugins/styler/lang/en/lang.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * English language file for styler plugin
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+
+// menu entry for admin plugins
+// $lang['menu'] = 'Your menu entry';
+
+// custom language strings for the plugin
+// $lang['fixme'] = 'FIXME';
+
+
+
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/styler/plugin.info.txt b/lib/plugins/styler/plugin.info.txt
new file mode 100644
index 000000000..51f2f72f6
--- /dev/null
+++ b/lib/plugins/styler/plugin.info.txt
@@ -0,0 +1,7 @@
+base   styler
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2015-05-16
+name   styler plugin
+desc   Allows to edit style.ini replacements
+url    https://www.dokuwiki.org/plugin:styler
diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
new file mode 100644
index 000000000..d09a8b8da
--- /dev/null
+++ b/lib/plugins/styler/script.js
@@ -0,0 +1,40 @@
+jQuery(function () {
+
+
+    if (DokuCookie.getValue('styler_plugin') == 1) {
+
+
+
+        // load dialog
+        var $dialog = jQuery(document.createElement('div'));
+        jQuery('body').append($dialog);
+        $dialog.load(
+                DOKU_BASE + '/lib/exe/ajax.php',
+            {
+                'call': 'plugin_styler'
+            },
+            function () {
+                // load the preview template
+                var now = new Date().getTime();
+                var $style = jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
+                $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
+
+                // open the dialog
+                $dialog.dialog({
+                    'title':    'Template Variables',
+                    'width':    500,
+                    'top':      50,
+                    'position': { 'my': 'left top', 'at': 'left top', 'of': window },
+                    // bring everything back to normal
+                    'close':    function (event, ui) {
+                        // disable the styler plugin again
+                        DokuCookie.setValue('styler_plugin', 0);
+                        // reload
+                        document.location.reload()
+                    }
+                });
+            }
+        );
+
+    }
+});
\ No newline at end of file
-- 
cgit v1.2.3


From a61966c55d9d0ac4b800d65cfc6ee1aea44899b5 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 16 May 2015 19:07:23 +0200
Subject: Provide a function to return admin plugin for the page request.

This was previously carried out in three separate places. Refactor
that code to use the new function.

Update tpl_pageTitle test to use a manager level admin plugin.
---
 _test/tests/inc/template_include_page.test.php |  8 +++----
 inc/actions.php                                | 17 +++-----------
 inc/pluginutils.php                            | 31 ++++++++++++++++++++++++++
 inc/template.php                               | 30 ++++++-------------------
 4 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/_test/tests/inc/template_include_page.test.php b/_test/tests/inc/template_include_page.test.php
index 580221979..7dd13ba23 100644
--- a/_test/tests/inc/template_include_page.test.php
+++ b/_test/tests/inc/template_include_page.test.php
@@ -34,17 +34,17 @@ class template_pagetitle_test extends DokuWikiTest {
     function test_adminPluginTitle() {
         global $ID,$ACT,$INPUT,$conf;
 
-        if (!plugin_load('admin','config')) {
-            $this->markTestSkipped('Plugin Config not found, unable to test admin plugin titles');
+        if (!plugin_load('admin','revert')) {
+            $this->markTestSkipped('Revert plugin not found, unable to test admin plugin titles');
             return;
         }
 
         $ID = 'foo:bar';
         $ACT = 'admin';
         $conf['lang'] = 'en';
-        $INPUT->set('page','config');
+        $INPUT->set('page','revert');
 
-        $this->assertEquals('Configuration Settings', tpl_pagetitle(null, true));
+        $this->assertEquals('Revert Manager', tpl_pagetitle(null, true));
     }
 
     function test_nonPageFunctionTitle() {
diff --git a/inc/actions.php b/inc/actions.php
index 709c19ddd..b0753b22e 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -162,20 +162,9 @@ function act_dispatch(){
         if($ACT == 'admin'){
             // retrieve admin plugin name from $_REQUEST['page']
             if (($page = $INPUT->str('page', '', true)) != '') {
-                $pluginlist = plugin_list('admin');
-                if (in_array($page, $pluginlist)) {
-                    // attempt to load the plugin
-
-                    if (($plugin = plugin_load('admin',$page)) !== null){
-                        /** @var DokuWiki_Admin_Plugin $plugin */
-                        if($plugin->forAdminOnly() && !$INFO['isadmin']){
-                            // a manager tried to load a plugin that's for admins only
-                            $INPUT->remove('page');
-                            msg('For admins only',-1);
-                        }else{
-                            $plugin->handle();
-                        }
-                    }
+                /** @var $plugin DokuWiki_Admin_Plugin */
+                if ($plugin = plugin_getRequestAdminPlugin()){
+                    $plugin->handle();
                 }
             }
         }
diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 4d591869d..60f79869f 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -103,3 +103,34 @@ function plugin_getcascade() {
     global $plugin_controller;
     return $plugin_controller->getCascade();
 }
+
+
+/**
+ * Return the currently operating admin plugin or null
+ * if not on an admin plugin page
+ *
+ * @return Doku_Plugin_Admin
+ */
+function plugin_getRequestAdminPlugin(){
+    static $admin_plugin = false;
+    global $ACT,$INPUT,$INFO;
+
+    if ($admin_plugin === false) {
+        if (($ACT == 'admin') && ($page = $INPUT->str('page', '', true)) != '') {
+            $pluginlist = plugin_list('admin');
+            if (in_array($page, $pluginlist)) {
+                // attempt to load the plugin
+                /** @var $admin_plugin DokuWiki_Admin_Plugin */
+                $admin_plugin = plugin_load('admin', $page);
+                // verify
+                if ($admin_plugin && $admin_plugin->forAdminOnly() && !$INFO['isadmin']) {
+                    $admin_plugin = null;
+                    $INPUT->remove('page');
+                    msg('For admins only',-1);
+                }
+            }
+        }
+    }
+
+    return $admin_plugin;
+}
diff --git a/inc/template.php b/inc/template.php
index 39d06e895..95dc52deb 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -218,18 +218,9 @@ function tpl_toc($return = false) {
             $toc = array();
         }
     } elseif($ACT == 'admin') {
-        // try to load admin plugin TOC FIXME: duplicates code from tpl_admin
-        $plugin = null;
-        $class  = $INPUT->str('page');
-        if(!empty($class)) {
-            $pluginlist = plugin_list('admin');
-            if(in_array($class, $pluginlist)) {
-                // attempt to load the plugin
-                /** @var $plugin DokuWiki_Admin_Plugin */
-                $plugin = plugin_load('admin', $class);
-            }
-        }
-        if( ($plugin !== null) && (!$plugin->forAdminOnly() || $INFO['isadmin']) ) {
+        // try to load admin plugin TOC
+        /** @var $plugin DokuWiki_Admin_Plugin */
+        if ($plugin = plugin_getRequestAdminPlugin()) {
             $toc = $plugin->getTOC();
             $TOC = $toc; // avoid later rebuild
         }
@@ -1054,17 +1045,10 @@ function tpl_pagetitle($id = null, $ret = false) {
         case 'admin' :
             $page_title = $lang['btn_admin'];
             // try to get the plugin name
-            // retrieve admin plugin name from $_REQUEST['page']
-            if (($page = $INPUT->str('page', '', true)) != '') {
-                $pluginlist = plugin_list('admin');
-                if (in_array($page, $pluginlist)) {
-                    // attempt to load the plugin
-
-                    if (($plugin = plugin_load('admin',$page)) !== null){
-                        $plugin_title = $plugin->getMenuText($conf['lang']);
-                        $page_title = $plugin_title ? $plugin_title : $page;
-                    }
-                }
+            /** @var $plugin DokuWiki_Admin_Plugin */
+            if ($plugin = plugin_getRequestAdminPlugin()){
+                $plugin_title = $plugin->getMenuText($conf['lang']);
+                $page_title = $plugin_title ? $plugin_title : $plugin->getPluginName();
             }
             break;
 
-- 
cgit v1.2.3


From 1f3b9c4577b0d0fa91c26b01caab84ab3f20e1e4 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 16 May 2015 19:25:26 +0200
Subject: php7 compatibility: change revert plugin constructor to __construct

---
 lib/plugins/revert/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index 88d8cd93d..b61615d00 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -16,7 +16,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
     /**
      * Constructor
      */
-    function admin_plugin_revert(){
+    function __construct(){
         $this->setupLocale();
     }
 
-- 
cgit v1.2.3


From 0f5e7090beb4c8b8e99aa87454c89b53ed11cc66 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 16 May 2015 19:27:43 +0200
Subject: we have working save and revert buttons

---
 lib/plugins/styler/action.php | 73 ++++++++++++++++++++++++++++++++++++++-----
 lib/plugins/styler/admin.php  |  3 ++
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
index 648190a2a..e2385e739 100644
--- a/lib/plugins/styler/action.php
+++ b/lib/plugins/styler/action.php
@@ -19,8 +19,8 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
      */
     public function register(Doku_Event_Handler $controller) {
 
-       $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
-       $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
+        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
+        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
 
     }
 
@@ -35,31 +35,90 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
     public function handle_action(Doku_Event &$event, $param) {
         $event->data = act_clean($event->data);
         if($event->data === 'styler_plugin_preview') {
-            msg('handle') ;
             $event->data = 'show';
             $this->preview();
-        } elseif ($event->data === 'styler_plugin_save') {
+        } elseif($event->data === 'styler_plugin_reset') {
             $event->data = 'show';
+            $this->reset();
+        } elseif($event->data === 'styler_plugin_revert') {
+            $event->data = 'show';
+            $this->revert();
+        } elseif($event->data === 'styler_plugin_save') {
+            $event->data = 'show';
+            $this->save();
         }
     }
 
-    protected function preview(){
+    /**
+     * saves the preview.ini
+     */
+    protected function preview() {
         global $conf;
-        $ini     = $conf['cachedir'].'/preview.ini';
+        $ini = $conf['cachedir'].'/preview.ini';
         io_saveFile($ini, $this->makeini());
     }
 
+    /**
+     * deletes the preview.ini
+     */
+    protected function reset() {
+        global $conf;
+        $ini = $conf['cachedir'].'/preview.ini';
+        io_saveFile($ini, '');
+    }
+
+    /**
+     * deletes the local style.ini replacements
+     */
+    protected function revert() {
+        $this->replaceini('');
+        $this->reset();
+    }
+
+    /**
+     * save the local style.ini replacements
+     */
+    protected function save() {
+        $this->replaceini($this->makeini());
+        $this->reset();
+    }
+
+    /**
+     * create the replacement part of a style.ini from submitted data
+     *
+     * @return string
+     */
     protected function makeini() {
         global $INPUT;
 
         $ini = "[replacements]\n";
         foreach($INPUT->arr('tpl') as $key => $val) {
-            $ini .= $key .' = "'.addslashes($val).'"'."\n";
+            $ini .= $key.' = "'.addslashes($val).'"'."\n";
         }
 
         return $ini;
     }
 
+    /**
+     * replaces the replacement parts in the local ini
+     *
+     * @param string $new the new ini contents
+     */
+    protected function replaceini($new) {
+        global $conf;
+        $ini = DOKU_CONF."tpl/".$conf['template']."/style.ini";
+        if(file_exists($ini)) {
+            $old = io_readFile($ini);
+            $old = preg_replace('/\[replacements\]\n.*?(\n\[.*]|$)/s', '\\1', $old);
+            $old = trim($old);
+        } else {
+            $old = '';
+        }
+
+        io_makeFileDir($ini);
+        io_saveFile($ini, "$old\n\n$new");
+    }
+
     /**
      * [Custom event handler which performs action]
      *
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index 8ecbd22a0..323bf61ec 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -61,6 +61,9 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
             }
             echo '</table>';
             echo '<input type="submit" name="do[styler_plugin_preview]" value="preview">';
+            echo '<input type="submit" name="do[styler_plugin_reset]" value="reset current">'; #FIXME only if preview.ini exists
+            echo '<input type="submit" name="do[styler_plugin_revert]" value="revert to original">'; #FIXME only if local.ini exists
+            echo '<input type="submit" name="do[styler_plugin_save]" value="save">';
             echo '</form>';
         }
 
-- 
cgit v1.2.3


From fb7685fb53589ebe099201297c0e8dbf20d89c59 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 16 May 2015 19:52:26 +0200
Subject: more improvements

---
 lib/plugins/styler/action.php | 50 ++++++++++++++++++++++++++-----------------
 lib/plugins/styler/admin.php  | 16 ++++++++------
 lib/plugins/styler/script.js  | 11 +++++-----
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
index e2385e739..88e2d0912 100644
--- a/lib/plugins/styler/action.php
+++ b/lib/plugins/styler/action.php
@@ -9,6 +9,14 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
+/**
+ * Class action_plugin_styler
+ *
+ * This handles all the save actions and loading the interface
+ *
+ * All this usually would be done within an admin plugin, but we want to have this available outside
+ * the admin interface using our floating dialog.
+ */
 class action_plugin_styler extends DokuWiki_Action_Plugin {
 
     /**
@@ -18,10 +26,8 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
      * @return void
      */
     public function register(Doku_Event_Handler $controller) {
-
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
         $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
-
     }
 
     /**
@@ -33,6 +39,8 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
      * @return void
      */
     public function handle_action(Doku_Event &$event, $param) {
+        if(!auth_isadmin()) return;
+
         $event->data = act_clean($event->data);
         if($event->data === 'styler_plugin_preview') {
             $event->data = 'show';
@@ -49,6 +57,26 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
         }
     }
 
+    /**
+     * [Custom event handler which performs action]
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
+     *                           handler was registered]
+     * @return void
+     */
+
+    public function handle_ajax(Doku_Event &$event, $param) {
+        if(!auth_isadmin()) return;
+        if($event->data != 'plugin_styler') return;
+        $event->preventDefault();
+        $event->stopPropagation();
+
+        /** @var admin_plugin_styler $hlp */
+        $hlp = plugin_load('admin', 'styler');
+        $hlp->form();
+    }
+
     /**
      * saves the preview.ini
      */
@@ -119,24 +147,6 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
         io_saveFile($ini, "$old\n\n$new");
     }
 
-    /**
-     * [Custom event handler which performs action]
-     *
-     * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
-     *                           handler was registered]
-     * @return void
-     */
-
-    public function handle_ajax(Doku_Event &$event, $param) {
-        if($event->data != 'plugin_styler') return;
-        $event->preventDefault();
-        $event->stopPropagation();
-
-        /** @var admin_plugin_styler $hlp */
-        $hlp = plugin_load('admin', 'styler');
-        $hlp->html();
-    }
 
 }
 
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index 323bf61ec..4be2153ab 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -29,13 +29,21 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
      * Should carry out any processing required by the plugin.
      */
     public function handle() {
-        set_doku_pref('styler_plugin', 1);
     }
 
     /**
      * Render HTML output, e.g. helpful text and a form
      */
     public function html() {
+        echo '<div id="plugin__styler">';
+        $this->form();
+        echo '</div>';
+    }
+
+    /**
+     * Create the actual editing form
+     */
+    public function form() {
         global $conf;
         $tpl = $conf['template'];
         define('SIMPLE_TEST',1); // hack, ideally certain functions should be moved out of css.php
@@ -50,7 +58,7 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
         } else {
             echo '<p>Intro blah... for the currently active template ("'.$tpl.'")... not all variables preview...</p>';
 
-            echo '<form class="styler" id="plugin__styler" method="post">';
+            echo '<form class="styler" method="post">';
             echo '<h2>Template variables</h2>';
             echo '<table>';
             foreach($replacements as $key => $value){
@@ -66,12 +74,8 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
             echo '<input type="submit" name="do[styler_plugin_save]" value="save">';
             echo '</form>';
         }
-
-
-
     }
 
-
 }
 
 // vim:ts=4:sw=4:et:
\ No newline at end of file
diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
index d09a8b8da..b3cadfd5e 100644
--- a/lib/plugins/styler/script.js
+++ b/lib/plugins/styler/script.js
@@ -1,10 +1,12 @@
 jQuery(function () {
+    // user openend the admin page, set cookie and redirect
+    if(jQuery('#plugin__styler').length) {
+        DokuCookie.setValue('styler_plugin', 1);
+        document.location.href = DOKU_BASE;
+    }
 
-
+    // The Styler Dialog is currently enabled, display it here and apply the preview styles
     if (DokuCookie.getValue('styler_plugin') == 1) {
-
-
-
         // load dialog
         var $dialog = jQuery(document.createElement('div'));
         jQuery('body').append($dialog);
@@ -35,6 +37,5 @@ jQuery(function () {
                 });
             }
         );
-
     }
 });
\ No newline at end of file
-- 
cgit v1.2.3


From c175e043e167877c54c7823870ab7a75141b062e Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 16 May 2015 19:57:56 +0200
Subject: __construct

---
 lib/plugins/config/settings/extra.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index c6a3f9dae..2445577d1 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -15,7 +15,7 @@ if (!class_exists('setting_sepchar')) {
          * @param string $key
          * @param array|null $param array with metadata of setting
          */
-        function setting_sepchar($key,$param=null) {
+        function __construct($key,$param=null) {
             $str = '_-.';
             for ($i=0;$i<strlen($str);$i++) $this->_choices[] = $str{$i};
 
-- 
cgit v1.2.3


From aae321f2598674fe5c509cdd2a07327249358938 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 08:15:32 +0200
Subject: make styler plugin work without javascript as well (partly done)

---
 lib/plugins/styler/action.php |  94 ++++---------------------------------
 lib/plugins/styler/admin.php  | 106 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 103 insertions(+), 97 deletions(-)

diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
index 88e2d0912..b7dd27cc4 100644
--- a/lib/plugins/styler/action.php
+++ b/lib/plugins/styler/action.php
@@ -28,6 +28,8 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
     public function register(Doku_Event_Handler $controller) {
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
         $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
+
+        // FIXME load preview style when on admin page
     }
 
     /**
@@ -40,21 +42,12 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
      */
     public function handle_action(Doku_Event &$event, $param) {
         if(!auth_isadmin()) return;
+        if($event->data != 'styler_plugin') return;
+        $event->data = 'show';
 
-        $event->data = act_clean($event->data);
-        if($event->data === 'styler_plugin_preview') {
-            $event->data = 'show';
-            $this->preview();
-        } elseif($event->data === 'styler_plugin_reset') {
-            $event->data = 'show';
-            $this->reset();
-        } elseif($event->data === 'styler_plugin_revert') {
-            $event->data = 'show';
-            $this->revert();
-        } elseif($event->data === 'styler_plugin_save') {
-            $event->data = 'show';
-            $this->save();
-        }
+        /** @var admin_plugin_styler $hlp */
+        $hlp = plugin_load('admin', 'styler');
+        $hlp->handle();
     }
 
     /**
@@ -74,80 +67,9 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
 
         /** @var admin_plugin_styler $hlp */
         $hlp = plugin_load('admin', 'styler');
-        $hlp->form();
+        $hlp->form(true);
     }
 
-    /**
-     * saves the preview.ini
-     */
-    protected function preview() {
-        global $conf;
-        $ini = $conf['cachedir'].'/preview.ini';
-        io_saveFile($ini, $this->makeini());
-    }
-
-    /**
-     * deletes the preview.ini
-     */
-    protected function reset() {
-        global $conf;
-        $ini = $conf['cachedir'].'/preview.ini';
-        io_saveFile($ini, '');
-    }
-
-    /**
-     * deletes the local style.ini replacements
-     */
-    protected function revert() {
-        $this->replaceini('');
-        $this->reset();
-    }
-
-    /**
-     * save the local style.ini replacements
-     */
-    protected function save() {
-        $this->replaceini($this->makeini());
-        $this->reset();
-    }
-
-    /**
-     * create the replacement part of a style.ini from submitted data
-     *
-     * @return string
-     */
-    protected function makeini() {
-        global $INPUT;
-
-        $ini = "[replacements]\n";
-        foreach($INPUT->arr('tpl') as $key => $val) {
-            $ini .= $key.' = "'.addslashes($val).'"'."\n";
-        }
-
-        return $ini;
-    }
-
-    /**
-     * replaces the replacement parts in the local ini
-     *
-     * @param string $new the new ini contents
-     */
-    protected function replaceini($new) {
-        global $conf;
-        $ini = DOKU_CONF."tpl/".$conf['template']."/style.ini";
-        if(file_exists($ini)) {
-            $old = io_readFile($ini);
-            $old = preg_replace('/\[replacements\]\n.*?(\n\[.*]|$)/s', '\\1', $old);
-            $old = trim($old);
-        } else {
-            $old = '';
-        }
-
-        io_makeFileDir($ini);
-        io_saveFile($ini, "$old\n\n$new");
-    }
-
-
 }
 
 // vim:ts=4:sw=4:et:
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index 4be2153ab..dfc72373c 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -29,6 +29,11 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
      * Should carry out any processing required by the plugin.
      */
     public function handle() {
+        global $INPUT;
+        $run = $INPUT->extract('run')->str('run');
+        if(!$run) return;
+        $run = "run_$run";
+        $this->$run();
     }
 
     /**
@@ -36,46 +41,125 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
      */
     public function html() {
         echo '<div id="plugin__styler">';
-        $this->form();
+        $this->form(false);
         echo '</div>';
     }
 
     /**
      * Create the actual editing form
      */
-    public function form() {
+    public function form($isajax) {
         global $conf;
+        global $ID;
         $tpl = $conf['template'];
-        define('SIMPLE_TEST',1); // hack, ideally certain functions should be moved out of css.php
+        define('SIMPLE_TEST', 1); // hack, ideally certain functions should be moved out of css.php
         require_once(DOKU_INC.'lib/exe/css.php');
-        $styleini = css_styleini($conf['template'], true);
+        $styleini     = css_styleini($conf['template'], true);
         $replacements = $styleini['replacements'];
 
+        if($isajax) {
+            $target = wl($ID, array('do' => 'styler_plugin'));
+        } else {
+            $target = wl($ID, array('do' => 'admin', 'page' => 'styler'));
+        }
+
         ptln('<h1>'.$this->getLang('menu').'</h1>');
 
-        if (empty($replacements)) {
+        if(empty($replacements)) {
             echo '<p class="error">Sorry, this template does not support this functionality.</p>';
         } else {
             echo '<p>Intro blah... for the currently active template ("'.$tpl.'")... not all variables preview...</p>';
 
-            echo '<form class="styler" method="post">';
+            echo '<form class="styler" method="post" action="'.$target.'">';
             echo '<h2>Template variables</h2>';
             echo '<table>';
-            foreach($replacements as $key => $value){
+            foreach($replacements as $key => $value) {
                 echo '<tr>';
                 echo '<td>'.$key.'</td>';
                 echo '<td><input name="tpl['.hsc($key).']" value="'.hsc($value).'" />';
                 echo '</tr>';
             }
             echo '</table>';
-            echo '<input type="submit" name="do[styler_plugin_preview]" value="preview">';
-            echo '<input type="submit" name="do[styler_plugin_reset]" value="reset current">'; #FIXME only if preview.ini exists
-            echo '<input type="submit" name="do[styler_plugin_revert]" value="revert to original">'; #FIXME only if local.ini exists
-            echo '<input type="submit" name="do[styler_plugin_save]" value="save">';
+            echo '<input type="submit" name="run[preview]" value="preview">';
+            echo '<input type="submit" name="run[reset]" value="reset current">'; #FIXME only if preview.ini exists
+            echo '<input type="submit" name="run[revert]" value="revert to original">'; #FIXME only if local.ini exists
+            echo '<input type="submit" name="run[save]" value="save">';
             echo '</form>';
         }
     }
 
+    /**
+     * saves the preview.ini
+     */
+    protected function run_preview() {
+        global $conf;
+        $ini = $conf['cachedir'].'/preview.ini';
+        io_saveFile($ini, $this->makeini());
+    }
+
+    /**
+     * deletes the preview.ini
+     */
+    protected function run_reset() {
+        global $conf;
+        $ini = $conf['cachedir'].'/preview.ini';
+        io_saveFile($ini, '');
+    }
+
+    /**
+     * deletes the local style.ini replacements
+     */
+    protected function run_revert() {
+        $this->replaceini('');
+        $this->run_reset();
+    }
+
+    /**
+     * save the local style.ini replacements
+     */
+    protected function run_save() {
+        $this->replaceini($this->makeini());
+        $this->run_reset();
+    }
+
+    /**
+     * create the replacement part of a style.ini from submitted data
+     *
+     * @return string
+     */
+    protected function makeini() {
+        global $INPUT;
+
+        $ini = "[replacements]\n";
+        $ini .= ";These overwrites have been generated from the Template Styler Admin interface\n";
+        $ini .= ";Any values in this section will be overwritten by that tool again\n";
+        foreach($INPUT->arr('tpl') as $key => $val) {
+            $ini .= $key.' = "'.addslashes($val).'"'."\n";
+        }
+
+        return $ini;
+    }
+
+    /**
+     * replaces the replacement parts in the local ini
+     *
+     * @param string $new the new ini contents
+     */
+    protected function replaceini($new) {
+        global $conf;
+        $ini = DOKU_CONF."tpl/".$conf['template']."/style.ini";
+        if(file_exists($ini)) {
+            $old = io_readFile($ini);
+            $old = preg_replace('/\[replacements\]\n.*?(\n\[.*]|$)/s', '\\1', $old);
+            $old = trim($old);
+        } else {
+            $old = '';
+        }
+
+        io_makeFileDir($ini);
+        io_saveFile($ini, "$old\n\n$new");
+    }
+
 }
 
 // vim:ts=4:sw=4:et:
\ No newline at end of file
-- 
cgit v1.2.3


From 831864db51ec2c0cd8b86aaee1f1c160df91087d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 10:53:22 +0200
Subject: make styler work without JS as well

---
 lib/plugins/styler/action.php | 37 +++++++++++++++++++++++++++++++------
 lib/plugins/styler/admin.php  |  2 +-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
index b7dd27cc4..b63cf3ec1 100644
--- a/lib/plugins/styler/action.php
+++ b/lib/plugins/styler/action.php
@@ -20,7 +20,7 @@ if(!defined('DOKU_INC')) die();
 class action_plugin_styler extends DokuWiki_Action_Plugin {
 
     /**
-     * Registers a callback function for a given event
+     * Registers a callback functions
      *
      * @param Doku_Event_Handler $controller DokuWiki's event controller object
      * @return void
@@ -28,12 +28,37 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
     public function register(Doku_Event_Handler $controller) {
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
         $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
+        $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_header');
+    }
+
+    /**
+     * Adds the preview parameter to the stylesheet loading in non-js mode
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
+     *                           handler was registered]
+     * @return void
+     */
+    public function handle_header(Doku_Event &$event, $param) {
+        global $ACT;
+        global $INPUT;
+        if($ACT != 'admin' || $INPUT->str('page') != 'styler') return;
+        if(!auth_isadmin()) return;
 
-        // FIXME load preview style when on admin page
+        // set preview
+        $len = count($event->data['link']);
+        for($i = 0; $i < $len; $i++) {
+            if(
+                $event->data['link'][$i]['rel'] == 'stylesheet' &&
+                strpos($event->data['link'][$i]['href'], 'lib/exe/css.php') !== false
+            ) {
+                $event->data['link'][$i]['href'] .= '&preview=1&tseed='.time();
+            }
+        }
     }
 
     /**
-     * [Custom event handler which performs action]
+     * Updates the style.ini settings by passing it on to handle() of the admin component
      *
      * @param Doku_Event $event  event object by reference
      * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
@@ -41,8 +66,8 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
      * @return void
      */
     public function handle_action(Doku_Event &$event, $param) {
-        if(!auth_isadmin()) return;
         if($event->data != 'styler_plugin') return;
+        if(!auth_isadmin()) return;
         $event->data = 'show';
 
         /** @var admin_plugin_styler $hlp */
@@ -51,7 +76,7 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
     }
 
     /**
-     * [Custom event handler which performs action]
+     * Create the style form in the floating Dialog
      *
      * @param Doku_Event $event  event object by reference
      * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
@@ -60,8 +85,8 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
      */
 
     public function handle_ajax(Doku_Event &$event, $param) {
-        if(!auth_isadmin()) return;
         if($event->data != 'plugin_styler') return;
+        if(!auth_isadmin()) return;
         $event->preventDefault();
         $event->stopPropagation();
 
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index dfc72373c..bb9426e12 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -26,7 +26,7 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * Should carry out any processing required by the plugin.
+     * handle the different actions (also called from ajax)
      */
     public function handle() {
         global $INPUT;
-- 
cgit v1.2.3


From 82f9aff6a65b1acaeec6cfde9a2848cb9cb92e03 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 11:16:17 +0200
Subject: started to localize the styler plugin

---
 lib/plugins/styler/admin.php         | 37 +++++++++++++++++++++++++++---------
 lib/plugins/styler/lang/en/intro.txt |  2 ++
 lib/plugins/styler/lang/en/lang.php  |  9 +++++++--
 lib/plugins/styler/script.js         |  2 +-
 4 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 lib/plugins/styler/lang/en/intro.txt

diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index bb9426e12..bfc6cd32b 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -25,6 +25,15 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
         return true;
     }
 
+    /**
+     * @param string $language
+     * @return string
+     */
+    public function getMenuText($language) {
+        $js = $this->getLang('js');
+        return $js['menu'];
+    }
+
     /**
      * handle the different actions (also called from ajax)
      */
@@ -41,6 +50,7 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
      */
     public function html() {
         echo '<div id="plugin__styler">';
+        ptln('<h1>'.$this->getMenuText('').'</h1>');
         $this->form(false);
         echo '</div>';
     }
@@ -63,15 +73,13 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
             $target = wl($ID, array('do' => 'admin', 'page' => 'styler'));
         }
 
-        ptln('<h1>'.$this->getLang('menu').'</h1>');
-
         if(empty($replacements)) {
-            echo '<p class="error">Sorry, this template does not support this functionality.</p>';
+            echo '<p class="error">'.$this->getLang('error').'</p>';
         } else {
-            echo '<p>Intro blah... for the currently active template ("'.$tpl.'")... not all variables preview...</p>';
+            echo $this->locale_xhtml('intro');
 
             echo '<form class="styler" method="post" action="'.$target.'">';
-            echo '<h2>Template variables</h2>';
+
             echo '<table>';
             foreach($replacements as $key => $value) {
                 echo '<tr>';
@@ -80,11 +88,22 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
                 echo '</tr>';
             }
             echo '</table>';
-            echo '<input type="submit" name="run[preview]" value="preview">';
-            echo '<input type="submit" name="run[reset]" value="reset current">'; #FIXME only if preview.ini exists
-            echo '<input type="submit" name="run[revert]" value="revert to original">'; #FIXME only if local.ini exists
-            echo '<input type="submit" name="run[save]" value="save">';
+
+            echo '<p class="center">';
+            echo '<input type="submit" name="run[preview]" value="'.$this->getLang('btn_preview').'">';
+            echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'">'; #FIXME only if preview.ini exists
+            echo '</p>';
+
+            echo '<p class="center">';
+            echo '<input type="submit" name="run[save]" value="'.$this->getLang('btn_save').'">';
+            echo '</p>';
+
+            echo '<p class="center">';
+            echo '<input type="submit" name="run[revert]" value="'.$this->getLang('btn_revert').'">'; #FIXME only if local.ini exists
+            echo '</p>';
+
             echo '</form>';
+
         }
     }
 
diff --git a/lib/plugins/styler/lang/en/intro.txt b/lib/plugins/styler/lang/en/intro.txt
new file mode 100644
index 000000000..bb9e3ff33
--- /dev/null
+++ b/lib/plugins/styler/lang/en/intro.txt
@@ -0,0 +1,2 @@
+This tool allows you to change certain style settings of your currently selected template
+all changes are stored in a local configuration file and are upgrade safe.
\ No newline at end of file
diff --git a/lib/plugins/styler/lang/en/lang.php b/lib/plugins/styler/lang/en/lang.php
index dfb472f11..2dd7921b0 100644
--- a/lib/plugins/styler/lang/en/lang.php
+++ b/lib/plugins/styler/lang/en/lang.php
@@ -6,10 +6,15 @@
  */
 
 // menu entry for admin plugins
-// $lang['menu'] = 'Your menu entry';
+$lang['js']['menu'] = 'Template Style Settings';
 
 // custom language strings for the plugin
-// $lang['fixme'] = 'FIXME';
+$lang['error'] = 'Sorry, this template does not support this functionality.';
+
+$lang['btn_preview'] = 'Preview your changes';
+$lang['btn_save']    = 'Save your changes';
+$lang['btn_reset']   = 'Reset your current changes';
+$lang['btn_revert']  = 'Revert all styles back to the template\'s default';
 
 
 
diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
index b3cadfd5e..d472c4fe7 100644
--- a/lib/plugins/styler/script.js
+++ b/lib/plugins/styler/script.js
@@ -23,7 +23,7 @@ jQuery(function () {
 
                 // open the dialog
                 $dialog.dialog({
-                    'title':    'Template Variables',
+                    'title':    LANG.plugins.styler.menu,
                     'width':    500,
                     'top':      50,
                     'position': { 'my': 'left top', 'at': 'left top', 'of': window },
-- 
cgit v1.2.3


From 45ae4bb83834a513e709b960747f964dba90392b Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 17 May 2015 12:56:51 +0200
Subject: Add filtering to remove blank entries from key/value config retrieval
 This applies to: - acronyms - entities - interwiki - mime - smileys

---
 inc/confutils.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/inc/confutils.php b/inc/confutils.php
index 8643a056c..3e69b20be 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -49,6 +49,7 @@ function getMimeTypes() {
     static $mime = null;
     if ( !$mime ) {
         $mime = retrieveConfig('mime','confToHash');
+        $mime = array_filter($mime);
     }
     return $mime;
 }
@@ -62,6 +63,7 @@ function getAcronyms() {
     static $acronyms = null;
     if ( !$acronyms ) {
         $acronyms = retrieveConfig('acronyms','confToHash');
+        $acronyms = array_filter($acronyms);
     }
     return $acronyms;
 }
@@ -75,6 +77,7 @@ function getSmileys() {
     static $smileys = null;
     if ( !$smileys ) {
         $smileys = retrieveConfig('smileys','confToHash');
+        $smileys = array_filter($smileys);
     }
     return $smileys;
 }
@@ -88,6 +91,7 @@ function getEntities() {
     static $entities = null;
     if ( !$entities ) {
         $entities = retrieveConfig('entities','confToHash');
+        $entities = array_filter($entities);
     }
     return $entities;
 }
@@ -101,9 +105,11 @@ function getInterwiki() {
     static $wikis = null;
     if ( !$wikis ) {
         $wikis = retrieveConfig('interwiki','confToHash',array(true));
+        $wikis = array_filter($wikis);
+
+        //add sepecial case 'this'
+        $wikis['this'] = DOKU_URL.'{NAME}';
     }
-    //add sepecial case 'this'
-    $wikis['this'] = DOKU_URL.'{NAME}';
     return $wikis;
 }
 
-- 
cgit v1.2.3


From 4c353447a306680af86c38db3ef592e29a0cbe60 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 17 May 2015 13:02:07 +0200
Subject: Support negating of config values include earlier in the cascade To
 negate a config value, prefix the value with an '!'.

E.g. to disable recognition of the gopher scheme
!gopher

This applies to:
- scheme
- stopwords
---
 inc/confutils.php | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/inc/confutils.php b/inc/confutils.php
index 3e69b20be..7d7c043fa 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -120,7 +120,7 @@ function getInterwiki() {
 function getWordblocks() {
     static $wordblocks = null;
     if ( !$wordblocks ) {
-        $wordblocks = retrieveConfig('wordblock','file');
+        $wordblocks = retrieveConfig('wordblock','file',null,'array_merge_with_removal');
     }
     return $wordblocks;
 }
@@ -133,11 +133,11 @@ function getWordblocks() {
 function getSchemes() {
     static $schemes = null;
     if ( !$schemes ) {
-        $schemes = retrieveConfig('scheme','file');
+        $schemes = retrieveConfig('scheme','file',null,'array_merge_with_removal');
+        $schemes = array_map('trim', $schemes);
+        $schemes = preg_replace('/^#.*/', '', $schemes);
+        $schemes = array_filter($schemes);
     }
-    $schemes = array_map('trim', $schemes);
-    $schemes = preg_replace('/^#.*/', '', $schemes);
-    $schemes = array_filter($schemes);
     return $schemes;
 }
 
@@ -202,7 +202,7 @@ function confToHash($file,$lower=false) {
  * @param  array    $params   optional additional params to pass to the callback
  * @return array    configuration values
  */
-function retrieveConfig($type,$fn,$params=null) {
+function retrieveConfig($type,$fn,$params=null,$combine='array_merge') {
     global $config_cascade;
 
     if(!is_array($params)) $params = array();
@@ -214,7 +214,7 @@ function retrieveConfig($type,$fn,$params=null) {
         foreach ($config_cascade[$type][$config_group] as $file) {
             if (file_exists($file)) {
                 $config = call_user_func_array($fn,array_merge(array($file),$params));
-                $combined = array_merge($combined, $config);
+                $combined = $combine($combined, $config);
             }
         }
     }
@@ -353,4 +353,27 @@ function conf_decodeString($str) {
                      return $str;
     }
 }
+
+/**
+ * array combination function to remove negated values (prefixed by !)
+ *
+ * @param  array $current
+ * @param  array $new
+ *
+ * @return array the combined array, numeric keys reset
+ */
+function array_merge_with_removal($current, $new) {
+    foreach ($new as $val) {
+        if (substr($val,0,1) == '!') {
+            $idx = array_search(substr($val,1),$current);
+            if ($idx !== false) {
+                unset($current[$idx]);
+            }
+        } else {
+            $current[] = $val;
+        }
+    }
+
+    return array_slice($current,0);
+}
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From b9e2f0546e334add4084195d07568a352bee5091 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 17 May 2015 13:27:56 +0200
Subject: update test groups for the extension manager test

---
 lib/plugins/extension/_test/extension.test.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/extension/_test/extension.test.php b/lib/plugins/extension/_test/extension.test.php
index 453b95e79..d4f13201d 100644
--- a/lib/plugins/extension/_test/extension.test.php
+++ b/lib/plugins/extension/_test/extension.test.php
@@ -14,7 +14,9 @@ class mock_helper_plugin_extension_extension extends helper_plugin_extension_ext
 
 /**
  * @group plugin_extension
+ * @group admin_plugins
  * @group plugins
+ * @group bundled_plugins
  */
 class helper_plugin_extension_extension_test extends DokuWikiTest {
 
-- 
cgit v1.2.3


From e422a60a9672c993b6872e856b9172dbd8135b56 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 15:37:50 +0200
Subject: added color picker support

I'm not too hapy with it
---
 lib/plugins/styler/admin.php |   28 +-
 lib/plugins/styler/iris.js   | 1488 ++++++++++++++++++++++++++++++++++++++++++
 lib/plugins/styler/script.js |   13 +-
 3 files changed, 1525 insertions(+), 4 deletions(-)
 create mode 100644 lib/plugins/styler/iris.js

diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index bfc6cd32b..8d44ac6f5 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -84,7 +84,7 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
             foreach($replacements as $key => $value) {
                 echo '<tr>';
                 echo '<td>'.$key.'</td>';
-                echo '<td><input name="tpl['.hsc($key).']" value="'.hsc($value).'" />';
+                echo '<td><input name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
                 echo '</tr>';
             }
             echo '</table>';
@@ -107,6 +107,32 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
         }
     }
 
+    /**
+     * set the color class attribute
+     */
+    protected function colorClass($key) {
+        static $colors = array(
+            'text',
+            'background',
+            'text_alt',
+            'background_alt',
+            'text_neu',
+            'background_neu',
+            'border',
+            'highlight',
+            'background_site',
+            'link',
+            'existing',
+            'missing',
+        );
+
+        if(preg_match('/colou?r/', $key) || in_array(trim($key,'_'), $colors)) {
+            return 'class="color"';
+        } else {
+            return '';
+        }
+    }
+
     /**
      * saves the preview.ini
      */
diff --git a/lib/plugins/styler/iris.js b/lib/plugins/styler/iris.js
new file mode 100644
index 000000000..4eda5022e
--- /dev/null
+++ b/lib/plugins/styler/iris.js
@@ -0,0 +1,1488 @@
+/*! Iris Color Picker - v1.0.7 - 2014-11-28
+* https://github.com/Automattic/Iris
+* Copyright (c) 2014 Matt Wiebe; Licensed GPLv2 */
+(function( $, undef ){
+	var _html, nonGradientIE, gradientType, vendorPrefixes, _css, Iris, UA, isIE, IEVersion;
+
+	_html = '<div class="iris-picker"><div class="iris-picker-inner"><div class="iris-square"><a class="iris-square-value" href="#"><span class="iris-square-handle ui-slider-handle"></span></a><div class="iris-square-inner iris-square-horiz"></div><div class="iris-square-inner iris-square-vert"></div></div><div class="iris-slider iris-strip"><div class="iris-slider-offset"></div></div></div></div>';
+	_css = '.iris-picker{display:block;position:relative}.iris-picker,.iris-picker *{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input+.iris-picker{margin-top:4px}.iris-error{background-color:#ffafaf}.iris-border{border-radius:3px;border:1px solid #aaa;width:200px;background-color:#fff}.iris-picker-inner{position:absolute;top:0;right:0;left:0;bottom:0}.iris-border .iris-picker-inner{top:10px;right:10px;left:10px;bottom:10px}.iris-picker .iris-square-inner{position:absolute;left:0;right:0;top:0;bottom:0}.iris-picker .iris-square,.iris-picker .iris-slider,.iris-picker .iris-square-inner,.iris-picker .iris-palette{border-radius:3px;box-shadow:inset 0 0 5px rgba(0,0,0,.4);height:100%;width:12.5%;float:left;margin-right:5%}.iris-picker .iris-square{width:76%;margin-right:10%;position:relative}.iris-picker .iris-square-inner{width:auto;margin:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-square-inner,.iris-ie-9 .iris-palette{box-shadow:none;border-radius:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-palette{outline:1px solid rgba(0,0,0,.1)}.iris-ie-lt9 .iris-square,.iris-ie-lt9 .iris-slider,.iris-ie-lt9 .iris-square-inner,.iris-ie-lt9 .iris-palette{outline:1px solid #aaa}.iris-ie-lt9 .iris-square .ui-slider-handle{outline:1px solid #aaa;background-color:#fff;-ms-filter:"alpha(Opacity=30)"}.iris-ie-lt9 .iris-square .iris-square-handle{background:0;border:3px solid #fff;-ms-filter:"alpha(Opacity=50)"}.iris-picker .iris-strip{margin-right:0;position:relative}.iris-picker .iris-strip .ui-slider-handle{position:absolute;background:0;margin:0;right:-3px;left:-3px;border:4px solid #aaa;border-width:4px 3px;width:auto;height:6px;border-radius:4px;box-shadow:0 1px 2px rgba(0,0,0,.2);opacity:.9;z-index:5;cursor:ns-resize}.iris-strip .ui-slider-handle:before{content:" ";position:absolute;left:-2px;right:-2px;top:-3px;bottom:-3px;border:2px solid #fff;border-radius:3px}.iris-picker .iris-slider-offset{position:absolute;top:11px;left:0;right:0;bottom:-3px;width:auto;height:auto;background:transparent;border:0;border-radius:0}.iris-picker .iris-square-handle{background:transparent;border:5px solid #aaa;border-radius:50%;border-color:rgba(128,128,128,.5);box-shadow:none;width:12px;height:12px;position:absolute;left:-10px;top:-10px;cursor:move;opacity:1;z-index:10}.iris-picker .ui-state-focus .iris-square-handle{opacity:.8}.iris-picker .iris-square-handle:hover{border-color:#999}.iris-picker .iris-square-value:focus .iris-square-handle{box-shadow:0 0 2px rgba(0,0,0,.75);opacity:.8}.iris-picker .iris-square-handle:hover::after{border-color:#fff}.iris-picker .iris-square-handle::after{position:absolute;bottom:-4px;right:-4px;left:-4px;top:-4px;border:3px solid #f9f9f9;border-color:rgba(255,255,255,.8);border-radius:50%;content:" "}.iris-picker .iris-square-value{width:8px;height:8px;position:absolute}.iris-ie-lt9 .iris-square-value,.iris-mozilla .iris-square-value{width:1px;height:1px}.iris-palette-container{position:absolute;bottom:0;left:0;margin:0;padding:0}.iris-border .iris-palette-container{left:10px;bottom:10px}.iris-picker .iris-palette{margin:0;cursor:pointer}.iris-square-handle,.ui-slider-handle{border:0;outline:0}';
+
+	// Even IE9 dosen't support gradients. Elaborate sigh.
+	UA = navigator.userAgent.toLowerCase();
+	isIE = navigator.appName === 'Microsoft Internet Explorer';
+	IEVersion = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[\.0-9]{0,})/ )[1] ) : 0;
+	nonGradientIE = ( isIE && IEVersion < 10 );
+	gradientType = false;
+
+	// we don't bother with an unprefixed version, as it has a different syntax
+	vendorPrefixes = [ '-moz-', '-webkit-', '-o-', '-ms-' ];
+
+	// Bail for IE <= 7
+	if ( nonGradientIE && IEVersion <= 7 ) {
+		$.fn.iris = $.noop;
+		$.support.iris = false;
+		return;
+	}
+
+	$.support.iris = true;
+
+	function testGradientType() {
+		var el, base,
+			bgImageString = 'backgroundImage';
+
+		if ( nonGradientIE ) {
+			gradientType = 'filter';
+		}
+		else {
+			el = $( '<div id="iris-gradtest" />' );
+			base = 'linear-gradient(top,#fff,#000)';
+			$.each( vendorPrefixes, function( i, val ){
+				el.css( bgImageString, val + base );
+				if ( el.css( bgImageString ).match( 'gradient' ) ) {
+					gradientType = i;
+					return false;
+				}
+			});
+			// check for legacy webkit gradient syntax
+			if ( gradientType === false ) {
+				el.css( 'background', '-webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#000))' );
+				if ( el.css( bgImageString ).match( 'gradient' ) ) {
+					gradientType = 'webkit';
+				}
+			}
+			el.remove();
+		}
+
+	}
+
+	/**
+	* Only for CSS3 gradients. oldIE will use a separate function.
+	*
+	* Accepts as many color stops as necessary from 2nd arg on, or 2nd
+	* arg can be an array of color stops
+	*
+	* @param  {string} origin Gradient origin - top or left, defaults to left.
+	* @return {string}        Appropriate CSS3 gradient string for use in
+	*/
+	function createGradient( origin, stops ) {
+		origin = ( origin === 'top' ) ? 'top' : 'left';
+		stops = $.isArray( stops ) ? stops : Array.prototype.slice.call( arguments, 1 );
+		if ( gradientType === 'webkit' ) {
+			return legacyWebkitGradient( origin, stops );
+		} else {
+			return vendorPrefixes[ gradientType ] + 'linear-gradient(' + origin + ', ' + stops.join(', ') + ')';
+		}
+	}
+
+	/**
+	* Stupid gradients for a stupid browser.
+	*/
+	function stupidIEGradient( origin, stops ) {
+		var type, self, lastIndex, filter, startPosProp, endPosProp, dimensionProp, template, html;
+
+		origin = ( origin === 'top' ) ? 'top' : 'left';
+		stops = $.isArray( stops ) ? stops : Array.prototype.slice.call( arguments, 1 );
+		// 8 hex: AARRGGBB
+		// GradientType: 0 vertical, 1 horizontal
+		type = ( origin === 'top' ) ? 0 : 1;
+		self = $( this );
+		lastIndex = stops.length - 1;
+		filter = 'filter';
+		startPosProp = ( type === 1 ) ? 'left' : 'top';
+		endPosProp = ( type === 1 ) ? 'right' : 'bottom';
+		dimensionProp = ( type === 1 ) ? 'height' : 'width';
+		template = '<div class="iris-ie-gradient-shim" style="position:absolute;' + dimensionProp + ':100%;' + startPosProp + ':%start%;' + endPosProp + ':%end%;' + filter + ':%filter%;" data-color:"%color%"></div>';
+		html = '';
+		// need a positioning context
+		if ( self.css('position') === 'static' ) {
+			self.css( {position: 'relative' } );
+		}
+
+		stops = fillColorStops( stops );
+		$.each(stops, function( i, startColor ) {
+			var endColor, endStop, filterVal;
+
+			// we want two at a time. if we're on the last pair, bail.
+			if ( i === lastIndex ) {
+				return false;
+			}
+
+			endColor = stops[ i + 1 ];
+			//if our pairs are at the same color stop, moving along.
+			if ( startColor.stop === endColor.stop ) {
+				return;
+			}
+
+			endStop = 100 - parseFloat( endColor.stop ) + '%';
+			startColor.octoHex = new Color( startColor.color ).toIEOctoHex();
+			endColor.octoHex = new Color( endColor.color ).toIEOctoHex();
+
+			filterVal = 'progid:DXImageTransform.Microsoft.Gradient(GradientType=' + type + ', StartColorStr=\'' + startColor.octoHex + '\', EndColorStr=\'' + endColor.octoHex + '\')';
+			html += template.replace( '%start%', startColor.stop ).replace( '%end%', endStop ).replace( '%filter%', filterVal );
+		});
+		self.find( '.iris-ie-gradient-shim' ).remove();
+		$( html ).prependTo( self );
+	}
+
+	function legacyWebkitGradient( origin, colorList ) {
+		var stops = [];
+		origin = ( origin === 'top' ) ? '0% 0%,0% 100%,' : '0% 100%,100% 100%,';
+		colorList = fillColorStops( colorList );
+		$.each( colorList, function( i, val ){
+			stops.push( 'color-stop(' + ( parseFloat( val.stop ) / 100 ) + ', ' + val.color + ')' );
+		});
+		return '-webkit-gradient(linear,' + origin + stops.join(',') + ')';
+	}
+
+	function fillColorStops( colorList ) {
+		var colors = [],
+			percs = [],
+			newColorList = [],
+			lastIndex = colorList.length - 1;
+
+		$.each( colorList, function( index, val ) {
+			var color = val,
+				perc = false,
+				match = val.match( /1?[0-9]{1,2}%$/ );
+
+			if ( match ) {
+				color = val.replace( /\s?1?[0-9]{1,2}%$/, '' );
+				perc = match.shift();
+			}
+			colors.push( color );
+			percs.push( perc );
+		});
+
+		// back fill first and last
+		if ( percs[0] === false ) {
+			percs[0] = '0%';
+		}
+
+		if ( percs[lastIndex] === false ) {
+			percs[lastIndex] = '100%';
+		}
+
+		percs = backFillColorStops( percs );
+
+		$.each( percs, function( i ){
+			newColorList[i] = { color: colors[i], stop: percs[i] };
+		});
+		return newColorList;
+	}
+
+	function backFillColorStops( stops ) {
+		var first = 0,
+			last = stops.length - 1,
+			i = 0,
+			foundFirst = false,
+			incr,
+			steps,
+			step,
+			firstVal;
+
+		if ( stops.length <= 2 || $.inArray( false, stops ) < 0 ) {
+			return stops;
+		}
+		while ( i < stops.length - 1 ) {
+			if ( ! foundFirst && stops[i] === false ) {
+				first = i - 1;
+				foundFirst = true;
+			} else if ( foundFirst && stops[i] !== false ) {
+				last = i;
+				i = stops.length;
+			}
+			i++;
+		}
+		steps = last - first;
+		firstVal = parseInt( stops[first].replace('%'), 10 );
+		incr = ( parseFloat( stops[last].replace('%') ) - firstVal ) / steps;
+		i = first + 1;
+		step = 1;
+		while ( i < last ) {
+			stops[i] = ( firstVal + ( step * incr ) ) + '%';
+			step++;
+			i++;
+		}
+		return backFillColorStops( stops );
+	}
+
+	$.fn.gradient = function() {
+		var args = arguments;
+		return this.each( function() {
+			// this'll be oldishIE
+			if ( nonGradientIE ) {
+				stupidIEGradient.apply( this, args );
+			} else {
+				// new hotness
+				$( this ).css( 'backgroundImage', createGradient.apply( this, args ) );
+			}
+		});
+	};
+
+	$.fn.raninbowGradient = function( origin, args ) {
+		var opts, template, i, steps;
+
+		origin = origin || 'top';
+		opts = $.extend( {}, { s: 100, l: 50 }, args );
+		template = 'hsl(%h%,' + opts.s + '%,' + opts.l + '%)';
+		i = 0;
+		steps = [];
+		while ( i <= 360 ) {
+			steps.push( template.replace('%h%', i) );
+			i += 30;
+		}
+		return this.each(function() {
+			$(this).gradient( origin, steps );
+		});
+	};
+
+	// the colorpicker widget def.
+	Iris = {
+		options: {
+			color: false,
+			mode: 'hsl',
+			controls: {
+				horiz: 's', // horizontal defaults to saturation
+				vert: 'l', // vertical defaults to lightness
+				strip: 'h' // right strip defaults to hue
+			},
+			hide: true, // hide the color picker by default
+			border: true, // draw a border around the collection of UI elements
+			target: false, // a DOM element / jQuery selector that the element will be appended within. Only used when called on an input.
+			width: 200, // the width of the collection of UI elements
+			palettes: false // show a palette of basic colors beneath the square.
+		},
+		_color: '',
+		_palettes: [ '#000', '#fff', '#d33', '#d93', '#ee2', '#81d742', '#1e73be', '#8224e3' ],
+		_inited: false,
+		_defaultHSLControls: {
+			horiz: 's',
+			vert: 'l',
+			strip: 'h'
+		},
+		_defaultHSVControls: {
+			horiz: 'h',
+			vert: 'v',
+			strip: 's'
+		},
+		_scale: {
+			h: 360,
+			s: 100,
+			l: 100,
+			v: 100
+		},
+		_create: function() {
+			var self = this,
+				el = self.element,
+				color = self.options.color || el.val();
+
+			if ( gradientType === false ) {
+				testGradientType();
+			}
+
+			if ( el.is( 'input' ) ) {
+				if ( self.options.target ) {
+					self.picker = $( _html ).appendTo( self.options.target );
+				} else {
+					self.picker = $( _html ).insertAfter( el );
+				}
+
+				self._addInputListeners( el );
+			} else {
+				el.append( _html );
+				self.picker = el.find( '.iris-picker' );
+			}
+
+			// Browsers / Versions
+			// Feature detection doesn't work for these, and $.browser is deprecated
+			if ( isIE ) {
+				if ( IEVersion === 9 ) {
+					self.picker.addClass( 'iris-ie-9' );
+				} else if ( IEVersion <= 8 ) {
+					self.picker.addClass( 'iris-ie-lt9' );
+				}
+			} else if ( UA.indexOf('compatible') < 0 && UA.indexOf('khtml') < 0 && UA.match( /mozilla/ ) ) {
+				self.picker.addClass( 'iris-mozilla' );
+			}
+
+			if ( self.options.palettes ) {
+				self._addPalettes();
+			}
+
+			self._color = new Color( color ).setHSpace( self.options.mode );
+			self.options.color = self._color.toString();
+
+			// prep 'em for re-use
+			self.controls = {
+				square:      self.picker.find( '.iris-square' ),
+				squareDrag:  self.picker.find( '.iris-square-value' ),
+				horiz:       self.picker.find( '.iris-square-horiz' ),
+				vert:        self.picker.find( '.iris-square-vert' ),
+				strip:       self.picker.find( '.iris-strip' ),
+				stripSlider: self.picker.find( '.iris-strip .iris-slider-offset' )
+			};
+
+			// small sanity check - if we chose hsv, change default controls away from hsl
+			if ( self.options.mode === 'hsv' && self._has('l', self.options.controls) ) {
+				self.options.controls = self._defaultHSVControls;
+			} else if ( self.options.mode === 'hsl' && self._has('v', self.options.controls) ) {
+				self.options.controls = self._defaultHSLControls;
+			}
+
+			// store it. HSL gets squirrely
+			self.hue = self._color.h();
+
+			if ( self.options.hide ) {
+				self.picker.hide();
+			}
+
+			if ( self.options.border ) {
+				self.picker.addClass( 'iris-border' );
+			}
+
+			self._initControls();
+			self.active = 'external';
+			self._dimensions();
+			self._change();
+		},
+		_has: function(needle, haystack) {
+			var ret = false;
+			$.each(haystack, function(i,v){
+				if ( needle === v ) {
+					ret = true;
+					// exit the loop
+					return false;
+				}
+			});
+			return ret;
+		},
+		_addPalettes: function () {
+			var container = $( '<div class="iris-palette-container" />' ),
+				palette = $( '<a class="iris-palette" tabindex="0" />' ),
+				colors = $.isArray( this.options.palettes ) ? this.options.palettes : this._palettes;
+
+			// do we have an existing container? Empty and reuse it.
+			if ( this.picker.find( '.iris-palette-container' ).length ) {
+				container = this.picker.find( '.iris-palette-container' ).detach().html( '' );
+			}
+
+			$.each(colors, function(index, val) {
+				palette.clone().data( 'color', val )
+					.css( 'backgroundColor', val ).appendTo( container )
+					.height( 10 ).width( 10 );
+			});
+
+			this.picker.append(container);
+		},
+		_paint: function() {
+			var self = this;
+			self._paintDimension( 'top', 'strip' );
+			self._paintDimension( 'top', 'vert' );
+			self._paintDimension( 'left', 'horiz' );
+		},
+		_paintDimension: function( origin, control ) {
+			var self = this,
+				c = self._color,
+				mode = self.options.mode,
+				color = self._getHSpaceColor(),
+				target = self.controls[ control ],
+				controlOpts = self.options.controls,
+				stops;
+
+			// don't paint the active control
+			if ( control === self.active || ( self.active === 'square' && control !== 'strip' ) ) {
+				return;
+			}
+
+			switch ( controlOpts[ control ] ) {
+				case 'h':
+					if ( mode === 'hsv' ) {
+						color = c.clone();
+						switch ( control ) {
+							case 'horiz':
+								color[controlOpts.vert](100);
+								break;
+							case 'vert':
+								color[controlOpts.horiz](100);
+								break;
+							case 'strip':
+								color.setHSpace('hsl');
+								break;
+						}
+						stops = color.toHsl();
+					} else {
+						if ( control === 'strip' ) {
+							stops = { s: color.s, l: color.l };
+						} else {
+							stops = { s: 100, l: color.l };
+						}
+					}
+
+					target.raninbowGradient( origin, stops );
+					break;
+				case 's':
+					if ( mode === 'hsv' ) {
+						if ( control === 'vert' ) {
+							stops = [ c.clone().a(0).s(0).toCSS('rgba'), c.clone().a(1).s(0).toCSS('rgba') ];
+						} else if ( control === 'strip' ) {
+							stops = [ c.clone().s(100).toCSS('hsl'), c.clone().s(0).toCSS('hsl') ];
+						} else if ( control === 'horiz' ) {
+							stops = [ '#fff', 'hsl(' + color.h + ',100%,50%)' ];
+						}
+					} else { // implicit mode === 'hsl'
+						if ( control === 'vert' && self.options.controls.horiz === 'h' ) {
+							stops = ['hsla(0, 0%, ' + color.l + '%, 0)', 'hsla(0, 0%, ' + color.l + '%, 1)'];
+						} else {
+							stops = ['hsl('+ color.h +',0%,50%)', 'hsl(' + color.h + ',100%,50%)'];
+						}
+					}
+
+
+					target.gradient( origin, stops );
+					break;
+				case 'l':
+					if ( control === 'strip' ) {
+						stops = ['hsl(' + color.h + ',100%,100%)', 'hsl(' + color.h + ', ' + color.s + '%,50%)', 'hsl('+ color.h +',100%,0%)'];
+					} else {
+						stops = ['#fff', 'rgba(255,255,255,0) 50%', 'rgba(0,0,0,0) 50%', 'rgba(0,0,0,1)'];
+					}
+					target.gradient( origin, stops );
+					break;
+				case 'v':
+						if ( control === 'strip' ) {
+							stops = [ c.clone().v(100).toCSS(), c.clone().v(0).toCSS() ];
+						} else {
+							stops = ['rgba(0,0,0,0)', '#000'];
+						}
+						target.gradient( origin, stops );
+					break;
+				default:
+					break;
+			}
+		},
+
+		_getHSpaceColor: function() {
+			return ( this.options.mode === 'hsv' ) ? this._color.toHsv() : this._color.toHsl();
+		},
+
+		_dimensions: function( reset ) {
+			// whatever size
+			var self = this,
+				opts = self.options,
+				controls = self.controls,
+				square = controls.square,
+				strip = self.picker.find( '.iris-strip' ),
+				squareWidth = '77.5%',
+				stripWidth = '12%',
+				totalPadding = 20,
+				innerWidth = opts.border ? opts.width - totalPadding : opts.width,
+				controlsHeight,
+				paletteCount = $.isArray( opts.palettes ) ? opts.palettes.length : self._palettes.length,
+				paletteMargin, paletteWidth, paletteContainerWidth;
+
+			if ( reset ) {
+				square.css( 'width', '' );
+				strip.css( 'width', '' );
+				self.picker.css( {width: '', height: ''} );
+			}
+
+			squareWidth = innerWidth * ( parseFloat( squareWidth ) / 100 );
+			stripWidth = innerWidth * ( parseFloat( stripWidth ) / 100 );
+			controlsHeight = opts.border ? squareWidth + totalPadding : squareWidth;
+
+			square.width( squareWidth ).height( squareWidth );
+			strip.height( squareWidth ).width( stripWidth );
+			self.picker.css( { width: opts.width, height: controlsHeight } );
+
+			if ( ! opts.palettes ) {
+				return self.picker.css( 'paddingBottom', '' );
+			}
+
+			// single margin at 2%
+			paletteMargin = squareWidth * 2 / 100;
+			paletteContainerWidth = squareWidth - ( ( paletteCount - 1 ) * paletteMargin );
+			paletteWidth = paletteContainerWidth / paletteCount;
+			self.picker.find('.iris-palette').each( function( i ) {
+				var margin = i === 0 ? 0 : paletteMargin;
+				$( this ).css({
+					width: paletteWidth,
+					height: paletteWidth,
+					marginLeft: margin
+				});
+			});
+			self.picker.css( 'paddingBottom', paletteWidth + paletteMargin );
+			strip.height( paletteWidth + paletteMargin + squareWidth );
+		},
+
+		_addInputListeners: function( input ) {
+			var self = this,
+				debounceTimeout = 100,
+				callback = function( event ){
+					var color = new Color( input.val() ),
+						val = input.val().replace( /^#/, '' );
+
+					input.removeClass( 'iris-error' );
+					// we gave a bad color
+					if ( color.error ) {
+						// don't error on an empty input - we want those allowed
+						if ( val !== '' ) {
+							input.addClass( 'iris-error' );
+						}
+					} else {
+						if ( color.toString() !== self._color.toString() ) {
+							// let's not do this on keyup for hex shortcodes
+							if ( ! ( event.type === 'keyup' && val.match( /^[0-9a-fA-F]{3}$/ ) ) ) {
+								self._setOption( 'color', color.toString() );
+							}
+						}
+					}
+				};
+
+			input.on( 'change', callback ).on( 'keyup', self._debounce( callback, debounceTimeout ) );
+
+			// If we initialized hidden, show on first focus. The rest is up to you.
+			if ( self.options.hide ) {
+				input.one( 'focus', function() {
+					self.show();
+				});
+			}
+		},
+
+		_initControls: function() {
+			var self = this,
+				controls = self.controls,
+				square = controls.square,
+				controlOpts = self.options.controls,
+				stripScale = self._scale[controlOpts.strip];
+
+			controls.stripSlider.slider({
+				orientation: 'vertical',
+				max: stripScale,
+				slide: function( event, ui ) {
+					self.active = 'strip';
+					// "reverse" for hue.
+					if ( controlOpts.strip === 'h' ) {
+						ui.value = stripScale - ui.value;
+					}
+
+					self._color[controlOpts.strip]( ui.value );
+					self._change.apply( self, arguments );
+				}
+			});
+
+			controls.squareDrag.draggable({
+				containment: controls.square.find( '.iris-square-inner' ),
+				zIndex: 1000,
+				cursor: 'move',
+				drag: function( event, ui ) {
+					self._squareDrag( event, ui );
+				},
+				start: function() {
+					square.addClass( 'iris-dragging' );
+					$(this).addClass( 'ui-state-focus' );
+				},
+				stop: function() {
+					square.removeClass( 'iris-dragging' );
+					$(this).removeClass( 'ui-state-focus' );
+				}
+			}).on( 'mousedown mouseup', function( event ) {
+				var focusClass = 'ui-state-focus';
+				event.preventDefault();
+				if (event.type === 'mousedown' ) {
+					self.picker.find( '.' + focusClass ).removeClass( focusClass ).blur();
+					$(this).addClass( focusClass ).focus();
+				} else {
+					$(this).removeClass( focusClass );
+				}
+			}).on( 'keydown', function( event ) {
+				var container = controls.square,
+					draggable = controls.squareDrag,
+					position = draggable.position(),
+					distance = self.options.width / 100; // Distance in pixels the draggable should be moved: 1 "stop"
+
+				// make alt key go "10"
+				if ( event.altKey ) {
+					distance *= 10;
+				}
+
+				// Reposition if one of the directional keys is pressed
+				switch ( event.keyCode ) {
+					case 37: position.left -= distance; break; // Left
+					case 38: position.top  -= distance; break; // Up
+					case 39: position.left += distance; break; // Right
+					case 40: position.top  += distance; break; // Down
+					default: return true; // Exit and bubble
+				}
+
+				// Keep draggable within container
+				position.left = Math.max( 0, Math.min( position.left, container.width() ) );
+				position.top =  Math.max( 0, Math.min( position.top, container.height() ) );
+
+				draggable.css(position);
+				self._squareDrag( event, { position: position });
+				event.preventDefault();
+			});
+
+			// allow clicking on the square to move there and keep dragging
+			square.mousedown( function( event ) {
+				var squareOffset, pos;
+				// only left click
+				if ( event.which !== 1 ) {
+					return;
+				}
+
+				// prevent bubbling from the handle: no infinite loops
+				if ( ! $( event.target ).is( 'div' ) ) {
+					return;
+				}
+
+				squareOffset = self.controls.square.offset();
+				pos = {
+						top: event.pageY - squareOffset.top,
+						left: event.pageX - squareOffset.left
+				};
+				event.preventDefault();
+				self._squareDrag( event, { position: pos } );
+				event.target = self.controls.squareDrag.get(0);
+				self.controls.squareDrag.css( pos ).trigger( event );
+			});
+
+			// palettes
+			if ( self.options.palettes ) {
+				self._paletteListeners();
+			}
+		},
+
+		_paletteListeners: function() {
+			var self = this;
+			self.picker.find('.iris-palette-container').on('click.palette', '.iris-palette', function() {
+				self._color.fromCSS( $(this).data('color') );
+				self.active = 'external';
+				self._change();
+			}).on( 'keydown.palette', '.iris-palette', function( event ) {
+				if ( ! ( event.keyCode === 13 || event.keyCode === 32 ) ) {
+					return true;
+				}
+				event.stopPropagation();
+				$( this ).click();
+			});
+		},
+
+		_squareDrag: function( event, ui ) {
+			var self = this,
+				controlOpts = self.options.controls,
+				dimensions = self._squareDimensions(),
+				vertVal = Math.round( ( dimensions.h - ui.position.top ) / dimensions.h * self._scale[controlOpts.vert] ),
+				horizVal = self._scale[controlOpts.horiz] - Math.round( ( dimensions.w - ui.position.left ) / dimensions.w * self._scale[controlOpts.horiz] );
+
+			self._color[controlOpts.horiz]( horizVal )[controlOpts.vert]( vertVal );
+
+			self.active = 'square';
+			self._change.apply( self, arguments );
+		},
+
+		_setOption: function( key, value ) {
+			var self = this,
+				oldValue = self.options[key],
+				doDimensions = false,
+				hexLessColor,
+				newColor,
+				method;
+
+			// ensure the new value is set. We can reset to oldValue if some check wasn't met.
+			self.options[key] = value;
+
+			switch(key) {
+				case 'color':
+					// cast to string in case we have a number
+					value = '' + value;
+					hexLessColor = value.replace( /^#/, '' );
+					newColor = new Color( value ).setHSpace( self.options.mode );
+					if ( newColor.error ) {
+						self.options[key] = oldValue;
+					} else {
+						self._color = newColor;
+						self.options.color = self.options[key] = self._color.toString();
+						self.active = 'external';
+						self._change();
+					}
+					break;
+				case 'palettes':
+					doDimensions = true;
+
+					if ( value ) {
+						self._addPalettes();
+					} else {
+						self.picker.find('.iris-palette-container').remove();
+					}
+
+					// do we need to add events?
+					if ( ! oldValue ) {
+						self._paletteListeners();
+					}
+					break;
+				case 'width':
+					doDimensions = true;
+					break;
+				case 'border':
+					doDimensions = true;
+					method = value ? 'addClass' : 'removeClass';
+					self.picker[method]('iris-border');
+					break;
+				case 'mode':
+				case 'controls':
+					// if nothing's changed, let's bail, since this causes re-rendering the whole widget
+					if ( oldValue === value ) {
+						return;
+					}
+
+					// we're using these poorly named variables because they're already scoped.
+					// method is the element that Iris was called on. oldValue will be the options
+					method = self.element;
+					oldValue = self.options;
+					oldValue.hide = ! self.picker.is( ':visible' );
+					self.destroy();
+					self.picker.remove();
+					return $(self.element).iris(oldValue);
+			}
+
+			// Do we need to recalc dimensions?
+			if ( doDimensions ) {
+				self._dimensions(true);
+			}
+		},
+
+		_squareDimensions: function( forceRefresh ) {
+			var square = this.controls.square,
+				dimensions,
+				control;
+
+			if ( forceRefresh !== undef && square.data('dimensions') ) {
+				return square.data('dimensions');
+			}
+
+			control = this.controls.squareDrag;
+			dimensions = {
+				w: square.width(),
+				h: square.height()
+			};
+			square.data( 'dimensions', dimensions );
+			return dimensions;
+		},
+
+		_isNonHueControl: function( active, type ) {
+			if ( active === 'square' && this.options.controls.strip === 'h' ) {
+				return true;
+			} else if ( type === 'external' || ( type === 'h' && active === 'strip' ) ) {
+				return false;
+			}
+
+			return true;
+		},
+
+		_change: function() {
+			var self = this,
+				controls = self.controls,
+				color = self._getHSpaceColor(),
+				actions = [ 'square', 'strip' ],
+				controlOpts = self.options.controls,
+				type = controlOpts[self.active] || 'external',
+				oldHue = self.hue;
+
+			if ( self.active === 'strip' ) {
+				// take no action on any of the square sliders if we adjusted the strip
+				actions = [];
+			} else if ( self.active !== 'external' ) {
+				// for non-strip, non-external, strip should never change
+				actions.pop(); // conveniently the last item
+			}
+
+			$.each( actions, function(index, item) {
+				var value, dimensions, cssObj;
+				if ( item !== self.active ) {
+					switch ( item ) {
+						case 'strip':
+							// reverse for hue
+							value = ( controlOpts.strip === 'h' ) ? self._scale[controlOpts.strip] - color[controlOpts.strip] : color[controlOpts.strip];
+							controls.stripSlider.slider( 'value', value );
+							break;
+						case 'square':
+							dimensions = self._squareDimensions();
+							cssObj = {
+								left: color[controlOpts.horiz] / self._scale[controlOpts.horiz] * dimensions.w,
+								top: dimensions.h - ( color[controlOpts.vert] / self._scale[controlOpts.vert] * dimensions.h )
+							};
+
+							self.controls.squareDrag.css( cssObj );
+							break;
+					}
+				}
+			});
+
+			// Ensure that we don't change hue if we triggered a hue reset
+			if ( color.h !== oldHue && self._isNonHueControl( self.active, type ) ) {
+				self._color.h(oldHue);
+			}
+
+			// store hue for repeating above check next time
+			self.hue = self._color.h();
+
+			self.options.color = self._color.toString();
+
+			// only run after the first time
+			if ( self._inited ) {
+				self._trigger( 'change', { type: self.active }, { color: self._color } );
+			}
+
+			if ( self.element.is( ':input' ) && ! self._color.error ) {
+				self.element.removeClass( 'iris-error' );
+				if ( self.element.val() !== self._color.toString() ) {
+					self.element.val( self._color.toString() );
+				}
+			}
+
+			self._paint();
+			self._inited = true;
+			self.active = false;
+		},
+		// taken from underscore.js _.debounce method
+		_debounce: function( func, wait, immediate ) {
+			var timeout, result;
+			return function() {
+				var context = this,
+					args = arguments,
+					later,
+					callNow;
+
+				later = function() {
+					timeout = null;
+					if ( ! immediate) {
+						result = func.apply( context, args );
+					}
+				};
+
+				callNow = immediate && !timeout;
+				clearTimeout( timeout );
+				timeout = setTimeout( later, wait );
+				if ( callNow ) {
+					result = func.apply( context, args );
+				}
+				return result;
+			};
+		},
+		show: function() {
+			this.picker.show();
+		},
+		hide: function() {
+			this.picker.hide();
+		},
+		toggle: function() {
+			this.picker.toggle();
+		},
+		color: function(newColor) {
+			if ( newColor === true ) {
+				return this._color.clone();
+			} else if ( newColor === undef ) {
+				return this._color.toString();
+			}
+			this.option('color', newColor);
+		}
+	};
+	// initialize the widget
+	$.widget( 'a8c.iris', Iris );
+	// add CSS
+	$( '<style id="iris-css">' + _css + '</style>' ).appendTo( 'head' );
+
+}( jQuery ));
+/*! Color.js - v0.9.11 - 2013-08-09
+* https://github.com/Automattic/Color.js
+* Copyright (c) 2013 Matt Wiebe; Licensed GPLv2 */
+(function(global, undef) {
+
+	var Color = function( color, type ) {
+		if ( ! ( this instanceof Color ) )
+			return new Color( color, type );
+
+		return this._init( color, type );
+	};
+
+	Color.fn = Color.prototype = {
+		_color: 0,
+		_alpha: 1,
+		error: false,
+		// for preserving hue/sat in fromHsl().toHsl() flows
+		_hsl: { h: 0, s: 0, l: 0 },
+		// for preserving hue/sat in fromHsv().toHsv() flows
+		_hsv: { h: 0, s: 0, v: 0 },
+		// for setting hsl or hsv space - needed for .h() & .s() functions to function properly
+		_hSpace: 'hsl',
+		_init: function( color ) {
+			var func = 'noop';
+			switch ( typeof color ) {
+					case 'object':
+						// alpha?
+						if ( color.a !== undef )
+							this.a( color.a );
+						func = ( color.r !== undef ) ? 'fromRgb' :
+							( color.l !== undef ) ? 'fromHsl' :
+							( color.v !== undef ) ? 'fromHsv' : func;
+						return this[func]( color );
+					case 'string':
+						return this.fromCSS( color );
+					case 'number':
+						return this.fromInt( parseInt( color, 10 ) );
+			}
+			return this;
+		},
+
+		_error: function() {
+			this.error = true;
+			return this;
+		},
+
+		clone: function() {
+			var newColor = new Color( this.toInt() ),
+				copy = ['_alpha', '_hSpace', '_hsl', '_hsv', 'error'];
+			for ( var i = copy.length - 1; i >= 0; i-- ) {
+				newColor[ copy[i] ] = this[ copy[i] ];
+			}
+			return newColor;
+		},
+
+		setHSpace: function( space ) {
+			this._hSpace = ( space === 'hsv' ) ? space : 'hsl';
+			return this;
+		},
+
+		noop: function() {
+			return this;
+		},
+
+		fromCSS: function( color ) {
+			var list,
+				leadingRE = /^(rgb|hs(l|v))a?\(/;
+			this.error = false;
+
+			// whitespace and semicolon trim
+			color = color.replace(/^\s+/, '').replace(/\s+$/, '').replace(/;$/, '');
+
+			if ( color.match(leadingRE) && color.match(/\)$/) ) {
+				list = color.replace(/(\s|%)/g, '').replace(leadingRE, '').replace(/,?\);?$/, '').split(',');
+
+				if ( list.length < 3 )
+					return this._error();
+
+				if ( list.length === 4 ) {
+					this.a( parseFloat( list.pop() ) );
+					// error state has been set to true in .a() if we passed NaN
+					if ( this.error )
+						return this;
+				}
+
+				for (var i = list.length - 1; i >= 0; i--) {
+					list[i] = parseInt(list[i], 10);
+					if ( isNaN( list[i] ) )
+						return this._error();
+				}
+
+				if ( color.match(/^rgb/) ) {
+					return this.fromRgb( {
+						r: list[0],
+						g: list[1],
+						b: list[2]
+					} );
+				} else if ( color.match(/^hsv/) ) {
+					return this.fromHsv( {
+						h: list[0],
+						s: list[1],
+						v: list[2]
+					} );
+				} else {
+					return this.fromHsl( {
+						h: list[0],
+						s: list[1],
+						l: list[2]
+					} );
+				}
+			} else {
+				// must be hex amirite?
+				return this.fromHex( color );
+			}
+		},
+
+		fromRgb: function( rgb, preserve ) {
+			if ( typeof rgb !== 'object' || rgb.r === undef || rgb.g === undef || rgb.b === undef )
+				return this._error();
+
+			this.error = false;
+			return this.fromInt( parseInt( ( rgb.r << 16 ) + ( rgb.g << 8 ) + rgb.b, 10 ), preserve );
+		},
+
+		fromHex: function( color ) {
+			color = color.replace(/^#/, '').replace(/^0x/, '');
+			if ( color.length === 3 ) {
+				color = color[0] + color[0] + color[1] + color[1] + color[2] + color[2];
+			}
+
+			// rough error checking - this is where things go squirrely the most
+			this.error = ! /^[0-9A-F]{6}$/i.test( color );
+			return this.fromInt( parseInt( color, 16 ) );
+		},
+
+		fromHsl: function( hsl ) {
+			var r, g, b, q, p, h, s, l;
+
+			if ( typeof hsl !== 'object' || hsl.h === undef || hsl.s === undef || hsl.l === undef )
+				return this._error();
+
+			this._hsl = hsl; // store it
+			this._hSpace = 'hsl'; // implicit
+			h = hsl.h / 360; s = hsl.s / 100; l = hsl.l / 100;
+			if ( s === 0 ) {
+				r = g = b = l; // achromatic
+			}
+			else {
+				q = l < 0.5 ? l * ( 1 + s ) : l + s - l * s;
+				p = 2 * l - q;
+				r = this.hue2rgb( p, q, h + 1/3 );
+				g = this.hue2rgb( p, q, h );
+				b = this.hue2rgb( p, q, h - 1/3 );
+			}
+			return this.fromRgb( {
+				r: r * 255,
+				g: g * 255,
+				b: b * 255
+			}, true ); // true preserves hue/sat
+		},
+
+		fromHsv: function( hsv ) {
+			var h, s, v, r, g, b, i, f, p, q, t;
+			if ( typeof hsv !== 'object' || hsv.h === undef || hsv.s === undef || hsv.v === undef )
+				return this._error();
+
+			this._hsv = hsv; // store it
+			this._hSpace = 'hsv'; // implicit
+
+			h = hsv.h / 360; s = hsv.s / 100; v = hsv.v / 100;
+			i = Math.floor( h * 6 );
+			f = h * 6 - i;
+			p = v * ( 1 - s );
+			q = v * ( 1 - f * s );
+			t = v * ( 1 - ( 1 - f ) * s );
+
+			switch( i % 6 ) {
+				case 0:
+					r = v; g = t; b = p;
+					break;
+				case 1:
+					r = q; g = v; b = p;
+					break;
+				case 2:
+					r = p; g = v; b = t;
+					break;
+				case 3:
+					r = p; g = q; b = v;
+					break;
+				case 4:
+					r = t; g = p; b = v;
+					break;
+				case 5:
+					r = v; g = p; b = q;
+					break;
+			}
+
+			return this.fromRgb( {
+				r: r * 255,
+				g: g * 255,
+				b: b * 255
+			}, true ); // true preserves hue/sat
+
+		},
+		// everything comes down to fromInt
+		fromInt: function( color, preserve ) {
+			this._color = parseInt( color, 10 );
+
+			if ( isNaN( this._color ) )
+				this._color = 0;
+
+			// let's coerce things
+			if ( this._color > 16777215 )
+				this._color = 16777215;
+			else if ( this._color < 0 )
+				this._color = 0;
+
+			// let's not do weird things
+			if ( preserve === undef ) {
+				this._hsv.h = this._hsv.s = this._hsl.h = this._hsl.s = 0;
+			}
+			// EVENT GOES HERE
+			return this;
+		},
+
+		hue2rgb: function( p, q, t ) {
+			if ( t < 0 ) {
+				t += 1;
+			}
+			if ( t > 1 ) {
+				t -= 1;
+			}
+			if ( t < 1/6 ) {
+				return p + ( q - p ) * 6 * t;
+			}
+			if ( t < 1/2 ) {
+				return q;
+			}
+			if ( t < 2/3 ) {
+				return p + ( q - p ) * ( 2/3 - t ) * 6;
+			}
+			return p;
+		},
+
+		toString: function() {
+			var hex = parseInt( this._color, 10 ).toString( 16 );
+			if ( this.error )
+				return '';
+			// maybe left pad it
+			if ( hex.length < 6 ) {
+				for (var i = 6 - hex.length - 1; i >= 0; i--) {
+					hex = '0' + hex;
+				}
+			}
+			return '#' + hex;
+		},
+
+		toCSS: function( type, alpha ) {
+			type = type || 'hex';
+			alpha = parseFloat( alpha || this._alpha );
+			switch ( type ) {
+				case 'rgb':
+				case 'rgba':
+					var rgb = this.toRgb();
+					if ( alpha < 1 ) {
+						return "rgba( " + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + alpha + " )";
+					}
+					else {
+						return "rgb( " + rgb.r + ", " + rgb.g + ", " + rgb.b + " )";
+					}
+					break;
+				case 'hsl':
+				case 'hsla':
+					var hsl = this.toHsl();
+					if ( alpha < 1 ) {
+						return "hsla( " + hsl.h + ", " + hsl.s + "%, " + hsl.l + "%, " + alpha + " )";
+					}
+					else {
+						return "hsl( " + hsl.h + ", " + hsl.s + "%, " + hsl.l + "% )";
+					}
+					break;
+				default:
+					return this.toString();
+			}
+		},
+
+		toRgb: function() {
+			return {
+				r: 255 & ( this._color >> 16 ),
+				g: 255 & ( this._color >> 8 ),
+				b: 255 & ( this._color )
+			};
+		},
+
+		toHsl: function() {
+			var rgb = this.toRgb();
+			var r = rgb.r / 255, g = rgb.g / 255, b = rgb.b / 255;
+			var max = Math.max( r, g, b ), min = Math.min( r, g, b );
+			var h, s, l = ( max + min ) / 2;
+
+			if ( max === min ) {
+				h = s = 0; // achromatic
+			} else {
+				var d = max - min;
+				s = l > 0.5 ? d / ( 2 - max - min ) : d / ( max + min );
+				switch ( max ) {
+					case r: h = ( g - b ) / d + ( g < b ? 6 : 0 );
+						break;
+					case g: h = ( b - r ) / d + 2;
+						break;
+					case b: h = ( r - g ) / d + 4;
+						break;
+				}
+				h /= 6;
+			}
+
+			// maintain hue & sat if we've been manipulating things in the HSL space.
+			h = Math.round( h * 360 );
+			if ( h === 0 && this._hsl.h !== h ) {
+				h = this._hsl.h;
+			}
+			s = Math.round( s * 100 );
+			if ( s === 0 && this._hsl.s ) {
+				s = this._hsl.s;
+			}
+
+			return {
+				h: h,
+				s: s,
+				l: Math.round( l * 100 )
+			};
+
+		},
+
+		toHsv: function() {
+			var rgb = this.toRgb();
+			var r = rgb.r / 255, g = rgb.g / 255, b = rgb.b / 255;
+			var max = Math.max( r, g, b ), min = Math.min( r, g, b );
+			var h, s, v = max;
+			var d = max - min;
+			s = max === 0 ? 0 : d / max;
+
+			if ( max === min ) {
+				h = s = 0; // achromatic
+			} else {
+				switch( max ){
+					case r:
+						h = ( g - b ) / d + ( g < b ? 6 : 0 );
+						break;
+					case g:
+						h = ( b - r ) / d + 2;
+						break;
+					case b:
+						h = ( r - g ) / d + 4;
+						break;
+				}
+				h /= 6;
+			}
+
+			// maintain hue & sat if we've been manipulating things in the HSV space.
+			h = Math.round( h * 360 );
+			if ( h === 0 && this._hsv.h !== h ) {
+				h = this._hsv.h;
+			}
+			s = Math.round( s * 100 );
+			if ( s === 0 && this._hsv.s ) {
+				s = this._hsv.s;
+			}
+
+			return {
+				h: h,
+				s: s,
+				v: Math.round( v * 100 )
+			};
+		},
+
+		toInt: function() {
+			return this._color;
+		},
+
+		toIEOctoHex: function() {
+			// AARRBBGG
+			var hex = this.toString();
+			var AA = parseInt( 255 * this._alpha, 10 ).toString(16);
+			if ( AA.length === 1 ) {
+				AA = '0' + AA;
+			}
+			return '#' + AA + hex.replace(/^#/, '' );
+		},
+
+		toLuminosity: function() {
+			var rgb = this.toRgb();
+			return 0.2126 * Math.pow( rgb.r / 255, 2.2 ) + 0.7152 * Math.pow( rgb.g / 255, 2.2 ) + 0.0722 * Math.pow( rgb.b / 255, 2.2);
+		},
+
+		getDistanceLuminosityFrom: function( color ) {
+			if ( ! ( color instanceof Color ) ) {
+				throw 'getDistanceLuminosityFrom requires a Color object';
+			}
+			var lum1 = this.toLuminosity();
+			var lum2 = color.toLuminosity();
+			if ( lum1 > lum2 ) {
+				return ( lum1 + 0.05 ) / ( lum2 + 0.05 );
+			}
+			else {
+				return ( lum2 + 0.05 ) / ( lum1 + 0.05 );
+			}
+		},
+
+		getMaxContrastColor: function() {
+			var lum = this.toLuminosity();
+			var hex = ( lum >= 0.5 ) ? '000000' : 'ffffff';
+			return new Color( hex );
+		},
+
+		getReadableContrastingColor: function( bgColor, minContrast ) {
+			if ( ! bgColor instanceof Color ) {
+				return this;
+			}
+
+			// you shouldn't use less than 5, but you might want to.
+			var targetContrast = ( minContrast === undef ) ? 5 : minContrast;
+			// working things
+			var contrast = bgColor.getDistanceLuminosityFrom( this );
+			var maxContrastColor = bgColor.getMaxContrastColor();
+			var maxContrast = maxContrastColor.getDistanceLuminosityFrom( bgColor );
+
+			// if current max contrast is less than the target contrast, we had wishful thinking.
+			// still, go max
+			if ( maxContrast <= targetContrast ) {
+				return maxContrastColor;
+			}
+			// or, we might already have sufficient contrast
+			else if ( contrast >= targetContrast ) {
+				return this;
+			}
+
+			var incr = ( 0 === maxContrastColor.toInt() ) ? -1 : 1;
+			while ( contrast < targetContrast ) {
+				this.l( incr, true ); // 2nd arg turns this into an incrementer
+				contrast = this.getDistanceLuminosityFrom( bgColor );
+				// infininite loop prevention: you never know.
+				if ( this._color === 0 || this._color === 16777215 ) {
+					break;
+				}
+			}
+
+			return this;
+
+		},
+
+		a: function( val ) {
+			if ( val === undef )
+				return this._alpha;
+
+			var a = parseFloat( val );
+
+			if ( isNaN( a ) )
+				return this._error();
+
+			this._alpha = a;
+			return this;
+		},
+
+		// TRANSFORMS
+
+		darken: function( amount ) {
+			amount = amount || 5;
+			return this.l( - amount, true );
+		},
+
+		lighten: function( amount ) {
+			amount = amount || 5;
+			return this.l( amount, true );
+		},
+
+		saturate: function( amount ) {
+			amount = amount || 15;
+			return this.s( amount, true );
+		},
+
+		desaturate: function( amount ) {
+			amount = amount || 15;
+			return this.s( - amount, true );
+		},
+
+		toGrayscale: function() {
+			return this.setHSpace('hsl').s( 0 );
+		},
+
+		getComplement: function() {
+			return this.h( 180, true );
+		},
+
+		getSplitComplement: function( step ) {
+			step = step || 1;
+			var incr = 180 + ( step * 30 );
+			return this.h( incr, true );
+		},
+
+		getAnalog: function( step ) {
+			step = step || 1;
+			var incr = step * 30;
+			return this.h( incr, true );
+		},
+
+		getTetrad: function( step ) {
+			step = step || 1;
+			var incr = step * 60;
+			return this.h( incr, true );
+		},
+
+		getTriad: function( step ) {
+			step = step || 1;
+			var incr = step * 120;
+			return this.h( incr, true );
+		},
+
+		_partial: function( key ) {
+			var prop = shortProps[key];
+			return function( val, incr ) {
+				var color = this._spaceFunc('to', prop.space);
+
+				// GETTER
+				if ( val === undef )
+					return color[key];
+
+				// INCREMENT
+				if ( incr === true )
+					val = color[key] + val;
+
+				// MOD & RANGE
+				if ( prop.mod )
+					val = val % prop.mod;
+				if ( prop.range )
+					val = ( val < prop.range[0] ) ? prop.range[0] : ( val > prop.range[1] ) ? prop.range[1] : val;
+
+				// NEW VALUE
+				color[key] = val;
+
+				return this._spaceFunc('from', prop.space, color);
+			};
+		},
+
+		_spaceFunc: function( dir, s, val ) {
+			var space = s || this._hSpace,
+				funcName = dir + space.charAt(0).toUpperCase() + space.substr(1);
+			return this[funcName](val);
+		}
+	};
+
+	var shortProps = {
+		h: {
+			mod: 360
+		},
+		s: {
+			range: [0,100]
+		},
+		l: {
+			space: 'hsl',
+			range: [0,100]
+		},
+		v: {
+			space: 'hsv',
+			range: [0,100]
+		},
+		r: {
+			space: 'rgb',
+			range: [0,255]
+		},
+		g: {
+			space: 'rgb',
+			range: [0,255]
+		},
+		b: {
+			space: 'rgb',
+			range: [0,255]
+		}
+	};
+
+	for ( var key in shortProps ) {
+		if ( shortProps.hasOwnProperty( key ) )
+			Color.fn[key] = Color.fn._partial(key);
+	}
+
+	// play nicely with Node + browser
+	if ( typeof exports === 'object' )
+		module.exports = Color;
+	else
+		global.Color = Color;
+
+}(this));
diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
index d472c4fe7..b71e46802 100644
--- a/lib/plugins/styler/script.js
+++ b/lib/plugins/styler/script.js
@@ -1,6 +1,8 @@
+/* DOKUWIKI:include_once iris.js */
+
 jQuery(function () {
     // user openend the admin page, set cookie and redirect
-    if(jQuery('#plugin__styler').length) {
+    if (jQuery('#plugin__styler').length) {
         DokuCookie.setValue('styler_plugin', 1);
         document.location.href = DOKU_BASE;
     }
@@ -22,11 +24,12 @@ jQuery(function () {
                 $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
 
                 // open the dialog
-                $dialog.dialog({
+                var $dlg = $dialog.dialog({
                     'title':    LANG.plugins.styler.menu,
                     'width':    500,
                     'top':      50,
-                    'position': { 'my': 'left top', 'at': 'left top', 'of': window },
+                    'maxHeight': 500,
+                    'position': { 'my': 'left bottom', 'at': 'left bottom', 'of': window },
                     // bring everything back to normal
                     'close':    function (event, ui) {
                         // disable the styler plugin again
@@ -35,6 +38,10 @@ jQuery(function () {
                         document.location.reload()
                     }
                 });
+
+                jQuery('.styler .color').iris({
+                });
+
             }
         );
     }
-- 
cgit v1.2.3


From 9fb9909916c8ce7fbca17d536942c0166afe487c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 17:58:50 +0200
Subject: added more localization

---
 lib/plugins/styler/admin.php         |  8 +++++++-
 lib/plugins/styler/lang/en/intro.txt |  4 ++--
 lib/plugins/styler/lang/en/lang.php  | 11 +++++++++++
 lib/tpl/dokuwiki/lang/en/lang.php    | 12 ++++++++++++
 lib/tpl/dokuwiki/lang/en/style.txt   |  4 ++++
 lib/tpl/dokuwiki/pagefooter.html     |  4 ++++
 6 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 lib/tpl/dokuwiki/lang/en/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/en/style.txt
 create mode 100644 lib/tpl/dokuwiki/pagefooter.html

diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index 8d44ac6f5..4269a0ee7 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -82,8 +82,12 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
 
             echo '<table>';
             foreach($replacements as $key => $value) {
+                $name = tpl_getLang($key);
+                if(empty($name)) $name = $this->getLang($key);
+                if(empty($name)) $name = $key;
+
                 echo '<tr>';
-                echo '<td>'.$key.'</td>';
+                echo '<td>'.$name.'</td>';
                 echo '<td><input name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
                 echo '</tr>';
             }
@@ -104,6 +108,8 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
 
             echo '</form>';
 
+            echo tpl_locale_xhtml('style');
+
         }
     }
 
diff --git a/lib/plugins/styler/lang/en/intro.txt b/lib/plugins/styler/lang/en/intro.txt
index bb9e3ff33..4ea55172f 100644
--- a/lib/plugins/styler/lang/en/intro.txt
+++ b/lib/plugins/styler/lang/en/intro.txt
@@ -1,2 +1,2 @@
-This tool allows you to change certain style settings of your currently selected template
-all changes are stored in a local configuration file and are upgrade safe.
\ No newline at end of file
+This tool allows you to change certain style settings of your currently selected template.
+All changes are stored in a local configuration file and are upgrade safe.
\ No newline at end of file
diff --git a/lib/plugins/styler/lang/en/lang.php b/lib/plugins/styler/lang/en/lang.php
index 2dd7921b0..1bf8efa2c 100644
--- a/lib/plugins/styler/lang/en/lang.php
+++ b/lib/plugins/styler/lang/en/lang.php
@@ -16,6 +16,17 @@ $lang['btn_save']    = 'Save your changes';
 $lang['btn_reset']   = 'Reset your current changes';
 $lang['btn_revert']  = 'Revert all styles back to the template\'s default';
 
+// default guaranteed placeholders
+$lang['__text__']           = 'Main text color';
+$lang['__background__']     = 'Main text background color';
+$lang['__text_alt__']       = 'Alternative text color';
+$lang['__background_alt__'] = 'Alternative text background color';
+$lang['__text_neu__']       = 'Neutral text color';
+$lang['__background_neu__'] = 'Neutral text background color';
+$lang['__border__']         = 'Border color';
+$lang['__highlight__']      = 'Highlight color (for search results mainly)';
+
+
 
 
 //Setup VIM: ex: et ts=4 :
diff --git a/lib/tpl/dokuwiki/lang/en/lang.php b/lib/tpl/dokuwiki/lang/en/lang.php
new file mode 100644
index 000000000..82a720e21
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/en/lang.php
@@ -0,0 +1,12 @@
+<?php
+
+// style.ini values
+
+$lang['__background_site__'] = 'Color for the very background (behind the content box)';
+$lang['__link__']     = 'The general link color';
+$lang['__existing__'] = 'The color for links to existing pages';
+$lang['__missing__']  = 'The color for links to non-existing pages';
+$lang['__site_width__']    = 'The width of the full site (can also be a percentage)';
+$lang['__sidebar_width__'] = 'The width of the sitebar if any (can also be a percentage)';
+$lang['__tablet_width__']  = 'Below screensizes of this width, the site switches to tablet mode';
+$lang['__phone_width__']   = 'Below screensizes of this width, the site switches to phone mode';
diff --git a/lib/tpl/dokuwiki/lang/en/style.txt b/lib/tpl/dokuwiki/lang/en/style.txt
new file mode 100644
index 000000000..f6bb4fc6f
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/en/style.txt
@@ -0,0 +1,4 @@
+If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' in the ''wiki'' namespace and it
+will be automaticaly be used. You can also upload a ''favicon.ico'' there. If you use a closed
+wiki it is recommended to make the ''wiki'' namespace world readable in the ACL settings or
+your logo is not shown to not logged in users.
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/pagefooter.html b/lib/tpl/dokuwiki/pagefooter.html
new file mode 100644
index 000000000..a361c4d69
--- /dev/null
+++ b/lib/tpl/dokuwiki/pagefooter.html
@@ -0,0 +1,4 @@
+<?php
+
+$plg = plugin_load('action', 'feedback');
+if($plg) $plg->tpl();
-- 
cgit v1.2.3


From b1a864fe66dcf7f538e4d304cc01ea9ec736b786 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 19:45:15 +0200
Subject: fix keeping the current page

---
 lib/plugins/styler/action.php | 3 +++
 lib/plugins/styler/admin.php  | 1 -
 lib/plugins/styler/script.js  | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
index b63cf3ec1..35e2f8f3c 100644
--- a/lib/plugins/styler/action.php
+++ b/lib/plugins/styler/action.php
@@ -90,6 +90,9 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
         $event->preventDefault();
         $event->stopPropagation();
 
+        global $ID;
+        $ID = getID();
+
         /** @var admin_plugin_styler $hlp */
         $hlp = plugin_load('admin', 'styler');
         $hlp->form(true);
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index 4269a0ee7..432b22279 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -61,7 +61,6 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
     public function form($isajax) {
         global $conf;
         global $ID;
-        $tpl = $conf['template'];
         define('SIMPLE_TEST', 1); // hack, ideally certain functions should be moved out of css.php
         require_once(DOKU_INC.'lib/exe/css.php');
         $styleini     = css_styleini($conf['template'], true);
diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
index b71e46802..1c53987a4 100644
--- a/lib/plugins/styler/script.js
+++ b/lib/plugins/styler/script.js
@@ -4,7 +4,7 @@ jQuery(function () {
     // user openend the admin page, set cookie and redirect
     if (jQuery('#plugin__styler').length) {
         DokuCookie.setValue('styler_plugin', 1);
-        document.location.href = DOKU_BASE;
+        document.location.href = document.location.href.replace(/do=admin/, '');
     }
 
     // The Styler Dialog is currently enabled, display it here and apply the preview styles
@@ -15,7 +15,8 @@ jQuery(function () {
         $dialog.load(
                 DOKU_BASE + '/lib/exe/ajax.php',
             {
-                'call': 'plugin_styler'
+                'call': 'plugin_styler',
+                'id': JSINFO.id
             },
             function () {
                 // load the preview template
-- 
cgit v1.2.3


From a93f9a7aab0ddcc00415f5b4e0c6876751a4d4c1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 19:48:18 +0200
Subject: allow resizing the dialog

---
 lib/plugins/styler/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
index 1c53987a4..79df8a88b 100644
--- a/lib/plugins/styler/script.js
+++ b/lib/plugins/styler/script.js
@@ -16,7 +16,7 @@ jQuery(function () {
                 DOKU_BASE + '/lib/exe/ajax.php',
             {
                 'call': 'plugin_styler',
-                'id': JSINFO.id
+                'id':   JSINFO.id
             },
             function () {
                 // load the preview template
@@ -28,8 +28,8 @@ jQuery(function () {
                 var $dlg = $dialog.dialog({
                     'title':    LANG.plugins.styler.menu,
                     'width':    500,
+                    'height':   500,
                     'top':      50,
-                    'maxHeight': 500,
                     'position': { 'my': 'left bottom', 'at': 'left bottom', 'of': window },
                     // bring everything back to normal
                     'close':    function (event, ui) {
-- 
cgit v1.2.3


From d071b66c820e5b1ecc60efc27a15e113c88832af Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 May 2015 20:40:33 +0200
Subject: autopreview in styler plugin

---
 lib/plugins/styler/action.php |   7 ++-
 lib/plugins/styler/admin.php  |   8 +--
 lib/plugins/styler/script.js  | 119 ++++++++++++++++++++++++++++--------------
 3 files changed, 91 insertions(+), 43 deletions(-)

diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
index 35e2f8f3c..1cc712a15 100644
--- a/lib/plugins/styler/action.php
+++ b/lib/plugins/styler/action.php
@@ -91,11 +91,16 @@ class action_plugin_styler extends DokuWiki_Action_Plugin {
         $event->stopPropagation();
 
         global $ID;
+        global $INPUT;
         $ID = getID();
 
         /** @var admin_plugin_styler $hlp */
         $hlp = plugin_load('admin', 'styler');
-        $hlp->form(true);
+        if($INPUT->str('run') == 'preview') {
+            $hlp->run_preview();
+        } else {
+            $hlp->form(true);
+        }
     }
 
 }
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
index 432b22279..a66dfbb11 100644
--- a/lib/plugins/styler/admin.php
+++ b/lib/plugins/styler/admin.php
@@ -87,13 +87,13 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
 
                 echo '<tr>';
                 echo '<td>'.$name.'</td>';
-                echo '<td><input name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
+                echo '<td><input type="text" name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
                 echo '</tr>';
             }
             echo '</table>';
 
             echo '<p class="center">';
-            echo '<input type="submit" name="run[preview]" value="'.$this->getLang('btn_preview').'">';
+            echo '<input type="submit" name="run[preview]" class="btn_preview" value="'.$this->getLang('btn_preview').'">';
             echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'">'; #FIXME only if preview.ini exists
             echo '</p>';
 
@@ -139,9 +139,9 @@ class admin_plugin_styler extends DokuWiki_Admin_Plugin {
     }
 
     /**
-     * saves the preview.ini
+     * saves the preview.ini (alos called from ajax directly)
      */
-    protected function run_preview() {
+    public function run_preview() {
         global $conf;
         $ini = $conf['cachedir'].'/preview.ini';
         io_saveFile($ini, $this->makeini());
diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
index 79df8a88b..a4fb601c8 100644
--- a/lib/plugins/styler/script.js
+++ b/lib/plugins/styler/script.js
@@ -7,43 +7,86 @@ jQuery(function () {
         document.location.href = document.location.href.replace(/do=admin/, '');
     }
 
-    // The Styler Dialog is currently enabled, display it here and apply the preview styles
-    if (DokuCookie.getValue('styler_plugin') == 1) {
-        // load dialog
-        var $dialog = jQuery(document.createElement('div'));
-        jQuery('body').append($dialog);
-        $dialog.load(
-                DOKU_BASE + '/lib/exe/ajax.php',
-            {
-                'call': 'plugin_styler',
-                'id':   JSINFO.id
-            },
-            function () {
-                // load the preview template
-                var now = new Date().getTime();
-                var $style = jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
-                $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
-
-                // open the dialog
-                var $dlg = $dialog.dialog({
-                    'title':    LANG.plugins.styler.menu,
-                    'width':    500,
-                    'height':   500,
-                    'top':      50,
-                    'position': { 'my': 'left bottom', 'at': 'left bottom', 'of': window },
-                    // bring everything back to normal
-                    'close':    function (event, ui) {
-                        // disable the styler plugin again
-                        DokuCookie.setValue('styler_plugin', 0);
-                        // reload
-                        document.location.reload()
-                    }
-                });
-
-                jQuery('.styler .color').iris({
-                });
-
-            }
-        );
+    // continue only if the Styler Dialog is currently enabled
+    if (DokuCookie.getValue('styler_plugin') != 1) return;
+
+    var styler_timeout = null;
+
+    // create dialog element
+    var $dialog = jQuery(document.createElement('div'));
+    jQuery('body').append($dialog);
+
+
+    /**
+     * updates the current CSS with a new preview one
+     */
+    function styler_updateCSS() {
+        var now = new Date().getTime();
+        var $style = jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
+        $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
+    }
+
+    /**
+     * save current values and reload preview (debounced)
+     */
+    function styler_saveAndUpdate() {
+        if (styler_timeout) window.clearTimeout(styler_timeout);
+        styler_timeout = window.setTimeout(function () {
+            styler_timeout = null;
+
+            var params = $dialog.find('input[type=text]').serializeArray();
+            params[params.length] = { name: 'call', value: 'plugin_styler'};
+            params[params.length] = {name: 'run', value: 'preview'};
+
+            jQuery.post(
+                    DOKU_BASE + '/lib/exe/ajax.php',
+                params,
+                styler_updateCSS
+            );
+        }, 500);
     }
+
+    // load the dialog content and apply listeners
+    $dialog.load(
+            DOKU_BASE + '/lib/exe/ajax.php',
+        {
+            'call': 'plugin_styler',
+            'run':  'html',
+            'id':   JSINFO.id
+        },
+        function () {
+            // load the preview template
+            styler_updateCSS();
+
+            // open the dialog
+            $dialog.dialog({
+                'title':    LANG.plugins.styler.menu,
+                'width':    500,
+                'height':   500,
+                'top':      50,
+                'position': { 'my': 'left bottom', 'at': 'left bottom', 'of': window },
+                // bring everything back to normal
+                'close':    function (event, ui) {
+                    // disable the styler plugin again
+                    DokuCookie.setValue('styler_plugin', 0);
+                    // reload
+                    document.location.reload()
+                }
+            });
+
+            // we don't need the manual preview in JS mode
+            $dialog.find('.btn_preview').hide();
+
+            // add the color picker  FIXME add saveAndUpdate to correct event
+            $dialog.find('.color').iris({ });
+
+            // listen to keyup events
+            $dialog.find('input[type=text]').keyup(function () {
+                console.log('change');
+                styler_saveAndUpdate();
+            });
+
+        }
+    );
+
 });
\ No newline at end of file
-- 
cgit v1.2.3


From a2237e348f84c81fd0f16da7aa55d1caeaf62a6b Mon Sep 17 00:00:00 2001
From: Noel Tilliot <noeltilliot@byom.de>
Date: Mon, 18 May 2015 17:21:45 +0200
Subject: translation update

---
 inc/lang/de/lang.php                   | 2 +-
 lib/plugins/authmysql/lang/de/lang.php | 8 ++++++++
 lib/plugins/extension/lang/de/lang.php | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/authmysql/lang/de/lang.php

diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 7dd95eddd..f435a31bf 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -350,10 +350,10 @@ $lang['media_perm_read']       = 'Sie besitzen nicht die notwendigen Berechtigun
 $lang['media_perm_upload']     = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
 $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
+$lang['media_acl_warning']     = 'Diese Liste ist möglicherweise nicht vollständig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.';
 $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnisse';
 $lang['plainhtml']             = 'HTML Klartext';
 $lang['wikimarkup']            = 'Wiki Markup';
 $lang['page_nonexist_rev']     = 'DIe Seite exitiert nicht unter %s. Sie wurde aber unter <a herf="%s">%s</a>';
 $lang['unable_to_parse_date']  = 'Parameter "%s" kann nicht geparsed werden.';
-$lang['media_acl_warning']     = 'Diese Liste ist möglicherweise nicht vollständig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.';
diff --git a/lib/plugins/authmysql/lang/de/lang.php b/lib/plugins/authmysql/lang/de/lang.php
new file mode 100644
index 000000000..6160f60ea
--- /dev/null
+++ b/lib/plugins/authmysql/lang/de/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Noel Tilliot <noeltilliot@byom.de>
+ */
+$lang['usernotexists']         = 'Sorry, dieser Nutzer existiert nicht.';
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index ce5495e24..ef3197513 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -8,6 +8,7 @@
  * @author Simon <st103267@stud.uni-stuttgart.de>
  * @author Hoisl <hoisl@gmx.at>
  * @author Dominik Mahr <drache.mahr@gmx.de>
+ * @author Noel Tilliot <noeltilliot@byom.de>
  */
 $lang['menu']                  = 'Erweiterungen verwalten';
 $lang['tab_plugins']           = 'Installierte Plugins';
@@ -29,6 +30,9 @@ $lang['btn_disable']           = 'Deaktivieren';
 $lang['btn_install']           = 'Installieren';
 $lang['btn_reinstall']         = 'Neu installieren';
 $lang['js']['reallydel']       = 'Wollen Sie diese Erweiterung wirklich löschen?';
+$lang['js']['display_viewoptions'] = 'Optionen anzeigen';
+$lang['js']['display_enabled'] = 'aktiviert';
+$lang['js']['display_disabled'] = 'deaktiviert';
 $lang['search_for']            = 'Erweiterung suchen:';
 $lang['search']                = 'Suchen';
 $lang['extensionby']           = '<strong>%s</strong> von %s';
-- 
cgit v1.2.3


From f266a91942e3eb7558afe54062c5e6a7bbcdf9ee Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 18 May 2015 20:31:04 +0100
Subject: Ensure filtering only removes empty string values (not other values
 which PHP evaluates to false)

---
 inc/confutils.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/confutils.php b/inc/confutils.php
index 7d7c043fa..e3805d74e 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -63,7 +63,7 @@ function getAcronyms() {
     static $acronyms = null;
     if ( !$acronyms ) {
         $acronyms = retrieveConfig('acronyms','confToHash');
-        $acronyms = array_filter($acronyms);
+        $acronyms = array_filter($acronyms, 'strlen');
     }
     return $acronyms;
 }
@@ -77,7 +77,7 @@ function getSmileys() {
     static $smileys = null;
     if ( !$smileys ) {
         $smileys = retrieveConfig('smileys','confToHash');
-        $smileys = array_filter($smileys);
+        $smileys = array_filter($smileys, 'strlen');
     }
     return $smileys;
 }
@@ -91,7 +91,7 @@ function getEntities() {
     static $entities = null;
     if ( !$entities ) {
         $entities = retrieveConfig('entities','confToHash');
-        $entities = array_filter($entities);
+        $entities = array_filter($entities, 'strlen');
     }
     return $entities;
 }
@@ -105,7 +105,7 @@ function getInterwiki() {
     static $wikis = null;
     if ( !$wikis ) {
         $wikis = retrieveConfig('interwiki','confToHash',array(true));
-        $wikis = array_filter($wikis);
+        $wikis = array_filter($wikis, 'strlen');
 
         //add sepecial case 'this'
         $wikis['this'] = DOKU_URL.'{NAME}';
-- 
cgit v1.2.3


From 3a7669bd1068f34022db08228baeefae2b27d05b Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 18 May 2015 20:32:49 +0100
Subject: Ensure single value negation is not affected by white space
 differences

---
 inc/confutils.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/confutils.php b/inc/confutils.php
index e3805d74e..c587bed4d 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -365,12 +365,12 @@ function conf_decodeString($str) {
 function array_merge_with_removal($current, $new) {
     foreach ($new as $val) {
         if (substr($val,0,1) == '!') {
-            $idx = array_search(substr($val,1),$current);
+            $idx = array_search(trim(substr($val,1)),$current);
             if ($idx !== false) {
                 unset($current[$idx]);
             }
         } else {
-            $current[] = $val;
+            $current[] = trim($val);
         }
     }
 
-- 
cgit v1.2.3


From 10b38f10e6ce99d01c6ca30bcd9992699d6ee049 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 18 May 2015 20:34:47 +0100
Subject: Define the negation character in a constant

---
 inc/confutils.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/inc/confutils.php b/inc/confutils.php
index c587bed4d..4035d6dd4 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -6,6 +6,12 @@
  * @author     Harry Fuecks <hfuecks@gmail.com>
  */
 
+/*
+ * line prefix used to negate single value config items
+ * (scheme.conf & stopwords.conf), e.g.
+ * !gopher
+ */
+const DOKU_CONF_NEGATION = '!';
 
 /**
  * Returns the (known) extension and mimetype of a given filename
@@ -364,7 +370,7 @@ function conf_decodeString($str) {
  */
 function array_merge_with_removal($current, $new) {
     foreach ($new as $val) {
-        if (substr($val,0,1) == '!') {
+        if (substr($val,0,1) == DOKU_CONF_NEGATION) {
             $idx = array_search(trim(substr($val,1)),$current);
             if ($idx !== false) {
                 unset($current[$idx]);
-- 
cgit v1.2.3


From d242ec8cf4d02610bd45b1f52dec36549d3c7e43 Mon Sep 17 00:00:00 2001
From: Tomas Darius Davainis <tomasdd@gmail.com>
Date: Fri, 22 May 2015 07:06:06 +0200
Subject: translation update

---
 inc/lang/lt/lang.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index 80ffb8a10..a9eb05260 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Linas Valiukas <shirshegsm@gmail.com>
  * @author Edmondas Girkantas <eg@zemaitija.net>
  * @author Arūnas Vaitekūnas <aras@fan.lt>
@@ -160,7 +160,6 @@ $lang['qb_media']              = 'Paveikslėliai ir kitos bylos';
 $lang['qb_sig']                = 'Įterpti parašą';
 $lang['qb_smileys']            = 'Šypsenėlės';
 $lang['qb_chars']              = 'Specialūs simboliai';
-$lang['js']['del_confirm']           = 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?';
 $lang['metaedit']              = 'Redaguoti metaduomenis';
 $lang['metasaveerr']           = 'Nepavyko išsaugoti metaduomenų';
 $lang['metasaveok']            = 'Metaduomenys išsaugoti';
-- 
cgit v1.2.3


From bdca103af13cf846a195328c69264d3ec632056b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 22 May 2015 14:39:25 +0200
Subject: avoid accessing nonexistant array key. fixes #1165

---
 inc/html.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/inc/html.php b/inc/html.php
index 2564c3bd6..2f10e3c08 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1409,7 +1409,13 @@ function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) {
 
     // last timestamp is not in changelog, retrieve timestamp from metadata
     // note: when page is removed, the metadata timestamp is zero
-    $r_rev = $r_rev ? $r_rev : $INFO['meta']['last_change']['date'];
+    if(!$r_rev) {
+        if(isset($INFO['meta']['last_change']['date'])) {
+            $r_rev = $INFO['meta']['last_change']['date'];
+        } else {
+            $r_rev = 0;
+        }
+    }
 
     //retrieve revisions with additional info
     list($l_revs, $r_revs) = $pagelog->getRevisionsAround($l_rev, $r_rev);
-- 
cgit v1.2.3


From 123bc813fd93ab5d8dab3cc4a66a09e613a10aa2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 23 May 2015 15:29:33 +0200
Subject: renamed plugin from styler to styling

styler was already taken
---
 lib/plugins/styler/.travis.yml             |   13 -
 lib/plugins/styler/README                  |   27 -
 lib/plugins/styler/_test/general.test.php  |   33 -
 lib/plugins/styler/action.php              |  108 --
 lib/plugins/styler/admin.php               |  215 ----
 lib/plugins/styler/iris.js                 | 1488 ----------------------------
 lib/plugins/styler/lang/en/intro.txt       |    2 -
 lib/plugins/styler/lang/en/lang.php        |   32 -
 lib/plugins/styler/plugin.info.txt         |    7 -
 lib/plugins/styler/script.js               |   92 --
 lib/plugins/styling/.travis.yml            |   13 +
 lib/plugins/styling/README                 |   27 +
 lib/plugins/styling/_test/general.test.php |   33 +
 lib/plugins/styling/action.php             |  108 ++
 lib/plugins/styling/admin.php              |  215 ++++
 lib/plugins/styling/iris.js                | 1488 ++++++++++++++++++++++++++++
 lib/plugins/styling/lang/en/intro.txt      |    2 +
 lib/plugins/styling/lang/en/lang.php       |   32 +
 lib/plugins/styling/plugin.info.txt        |    7 +
 lib/plugins/styling/script.js              |   92 ++
 20 files changed, 2017 insertions(+), 2017 deletions(-)
 delete mode 100644 lib/plugins/styler/.travis.yml
 delete mode 100644 lib/plugins/styler/README
 delete mode 100644 lib/plugins/styler/_test/general.test.php
 delete mode 100644 lib/plugins/styler/action.php
 delete mode 100644 lib/plugins/styler/admin.php
 delete mode 100644 lib/plugins/styler/iris.js
 delete mode 100644 lib/plugins/styler/lang/en/intro.txt
 delete mode 100644 lib/plugins/styler/lang/en/lang.php
 delete mode 100644 lib/plugins/styler/plugin.info.txt
 delete mode 100644 lib/plugins/styler/script.js
 create mode 100644 lib/plugins/styling/.travis.yml
 create mode 100644 lib/plugins/styling/README
 create mode 100644 lib/plugins/styling/_test/general.test.php
 create mode 100644 lib/plugins/styling/action.php
 create mode 100644 lib/plugins/styling/admin.php
 create mode 100644 lib/plugins/styling/iris.js
 create mode 100644 lib/plugins/styling/lang/en/intro.txt
 create mode 100644 lib/plugins/styling/lang/en/lang.php
 create mode 100644 lib/plugins/styling/plugin.info.txt
 create mode 100644 lib/plugins/styling/script.js

diff --git a/lib/plugins/styler/.travis.yml b/lib/plugins/styler/.travis.yml
deleted file mode 100644
index d80c0691f..000000000
--- a/lib/plugins/styler/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Config file for travis-ci.org
-
-language: php
-php:
-  - "5.5"
-  - "5.4"
-  - "5.3"
-env:
-  - DOKUWIKI=master
-  - DOKUWIKI=stable
-before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
-install: sh travis.sh
-script: cd _test && phpunit --stderr --group plugin_styler
\ No newline at end of file
diff --git a/lib/plugins/styler/README b/lib/plugins/styler/README
deleted file mode 100644
index 37a966352..000000000
--- a/lib/plugins/styler/README
+++ /dev/null
@@ -1,27 +0,0 @@
-styler Plugin for DokuWiki
-
-Allows to edit style.ini replacements
-
-All documentation for this plugin can be found at
-https://www.dokuwiki.org/plugin:styler
-
-If you install this plugin manually, make sure it is installed in
-lib/plugins/styler/ - if the folder is called different it
-will not work!
-
-Please refer to http://www.dokuwiki.org/plugins for additional info
-on how to install plugins in DokuWiki.
-
-----
-Copyright (C) Andreas Gohr <andi@splitbrain.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-See the COPYING file in your DokuWiki folder for details
diff --git a/lib/plugins/styler/_test/general.test.php b/lib/plugins/styler/_test/general.test.php
deleted file mode 100644
index 8b0712a20..000000000
--- a/lib/plugins/styler/_test/general.test.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * General tests for the styler plugin
- *
- * @group plugin_styler
- * @group plugins
- */
-class general_plugin_styler_test extends DokuWikiTest {
-
-    /**
-     * Simple test to make sure the plugin.info.txt is in correct format
-     */
-    public function test_plugininfo() {
-        $file = __DIR__.'/../plugin.info.txt';
-        $this->assertFileExists($file);
-
-        $info = confToHash($file);
-
-        $this->assertArrayHasKey('base', $info);
-        $this->assertArrayHasKey('author', $info);
-        $this->assertArrayHasKey('email', $info);
-        $this->assertArrayHasKey('date', $info);
-        $this->assertArrayHasKey('name', $info);
-        $this->assertArrayHasKey('desc', $info);
-        $this->assertArrayHasKey('url', $info);
-
-        $this->assertEquals('styler', $info['base']);
-        $this->assertRegExp('/^https?:\/\//', $info['url']);
-        $this->assertTrue(mail_isvalid($info['email']));
-        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
-        $this->assertTrue(false !== strtotime($info['date']));
-    }
-}
diff --git a/lib/plugins/styler/action.php b/lib/plugins/styler/action.php
deleted file mode 100644
index 1cc712a15..000000000
--- a/lib/plugins/styler/action.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * DokuWiki Plugin styler (Action Component)
- *
- * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
- * @author  Andreas Gohr <andi@splitbrain.org>
- */
-
-// must be run within Dokuwiki
-if(!defined('DOKU_INC')) die();
-
-/**
- * Class action_plugin_styler
- *
- * This handles all the save actions and loading the interface
- *
- * All this usually would be done within an admin plugin, but we want to have this available outside
- * the admin interface using our floating dialog.
- */
-class action_plugin_styler extends DokuWiki_Action_Plugin {
-
-    /**
-     * Registers a callback functions
-     *
-     * @param Doku_Event_Handler $controller DokuWiki's event controller object
-     * @return void
-     */
-    public function register(Doku_Event_Handler $controller) {
-        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
-        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
-        $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_header');
-    }
-
-    /**
-     * Adds the preview parameter to the stylesheet loading in non-js mode
-     *
-     * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
-     *                           handler was registered]
-     * @return void
-     */
-    public function handle_header(Doku_Event &$event, $param) {
-        global $ACT;
-        global $INPUT;
-        if($ACT != 'admin' || $INPUT->str('page') != 'styler') return;
-        if(!auth_isadmin()) return;
-
-        // set preview
-        $len = count($event->data['link']);
-        for($i = 0; $i < $len; $i++) {
-            if(
-                $event->data['link'][$i]['rel'] == 'stylesheet' &&
-                strpos($event->data['link'][$i]['href'], 'lib/exe/css.php') !== false
-            ) {
-                $event->data['link'][$i]['href'] .= '&preview=1&tseed='.time();
-            }
-        }
-    }
-
-    /**
-     * Updates the style.ini settings by passing it on to handle() of the admin component
-     *
-     * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
-     *                           handler was registered]
-     * @return void
-     */
-    public function handle_action(Doku_Event &$event, $param) {
-        if($event->data != 'styler_plugin') return;
-        if(!auth_isadmin()) return;
-        $event->data = 'show';
-
-        /** @var admin_plugin_styler $hlp */
-        $hlp = plugin_load('admin', 'styler');
-        $hlp->handle();
-    }
-
-    /**
-     * Create the style form in the floating Dialog
-     *
-     * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
-     *                           handler was registered]
-     * @return void
-     */
-
-    public function handle_ajax(Doku_Event &$event, $param) {
-        if($event->data != 'plugin_styler') return;
-        if(!auth_isadmin()) return;
-        $event->preventDefault();
-        $event->stopPropagation();
-
-        global $ID;
-        global $INPUT;
-        $ID = getID();
-
-        /** @var admin_plugin_styler $hlp */
-        $hlp = plugin_load('admin', 'styler');
-        if($INPUT->str('run') == 'preview') {
-            $hlp->run_preview();
-        } else {
-            $hlp->form(true);
-        }
-    }
-
-}
-
-// vim:ts=4:sw=4:et:
diff --git a/lib/plugins/styler/admin.php b/lib/plugins/styler/admin.php
deleted file mode 100644
index a66dfbb11..000000000
--- a/lib/plugins/styler/admin.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * DokuWiki Plugin styler (Admin Component)
- *
- * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
- * @author  Andreas Gohr <andi@splitbrain.org>
- */
-
-// must be run within Dokuwiki
-if(!defined('DOKU_INC')) die();
-
-class admin_plugin_styler extends DokuWiki_Admin_Plugin {
-
-    /**
-     * @return int sort number in admin menu
-     */
-    public function getMenuSort() {
-        return 1000;
-    }
-
-    /**
-     * @return bool true if only access for superuser, false is for superusers and moderators
-     */
-    public function forAdminOnly() {
-        return true;
-    }
-
-    /**
-     * @param string $language
-     * @return string
-     */
-    public function getMenuText($language) {
-        $js = $this->getLang('js');
-        return $js['menu'];
-    }
-
-    /**
-     * handle the different actions (also called from ajax)
-     */
-    public function handle() {
-        global $INPUT;
-        $run = $INPUT->extract('run')->str('run');
-        if(!$run) return;
-        $run = "run_$run";
-        $this->$run();
-    }
-
-    /**
-     * Render HTML output, e.g. helpful text and a form
-     */
-    public function html() {
-        echo '<div id="plugin__styler">';
-        ptln('<h1>'.$this->getMenuText('').'</h1>');
-        $this->form(false);
-        echo '</div>';
-    }
-
-    /**
-     * Create the actual editing form
-     */
-    public function form($isajax) {
-        global $conf;
-        global $ID;
-        define('SIMPLE_TEST', 1); // hack, ideally certain functions should be moved out of css.php
-        require_once(DOKU_INC.'lib/exe/css.php');
-        $styleini     = css_styleini($conf['template'], true);
-        $replacements = $styleini['replacements'];
-
-        if($isajax) {
-            $target = wl($ID, array('do' => 'styler_plugin'));
-        } else {
-            $target = wl($ID, array('do' => 'admin', 'page' => 'styler'));
-        }
-
-        if(empty($replacements)) {
-            echo '<p class="error">'.$this->getLang('error').'</p>';
-        } else {
-            echo $this->locale_xhtml('intro');
-
-            echo '<form class="styler" method="post" action="'.$target.'">';
-
-            echo '<table>';
-            foreach($replacements as $key => $value) {
-                $name = tpl_getLang($key);
-                if(empty($name)) $name = $this->getLang($key);
-                if(empty($name)) $name = $key;
-
-                echo '<tr>';
-                echo '<td>'.$name.'</td>';
-                echo '<td><input type="text" name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
-                echo '</tr>';
-            }
-            echo '</table>';
-
-            echo '<p class="center">';
-            echo '<input type="submit" name="run[preview]" class="btn_preview" value="'.$this->getLang('btn_preview').'">';
-            echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'">'; #FIXME only if preview.ini exists
-            echo '</p>';
-
-            echo '<p class="center">';
-            echo '<input type="submit" name="run[save]" value="'.$this->getLang('btn_save').'">';
-            echo '</p>';
-
-            echo '<p class="center">';
-            echo '<input type="submit" name="run[revert]" value="'.$this->getLang('btn_revert').'">'; #FIXME only if local.ini exists
-            echo '</p>';
-
-            echo '</form>';
-
-            echo tpl_locale_xhtml('style');
-
-        }
-    }
-
-    /**
-     * set the color class attribute
-     */
-    protected function colorClass($key) {
-        static $colors = array(
-            'text',
-            'background',
-            'text_alt',
-            'background_alt',
-            'text_neu',
-            'background_neu',
-            'border',
-            'highlight',
-            'background_site',
-            'link',
-            'existing',
-            'missing',
-        );
-
-        if(preg_match('/colou?r/', $key) || in_array(trim($key,'_'), $colors)) {
-            return 'class="color"';
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * saves the preview.ini (alos called from ajax directly)
-     */
-    public function run_preview() {
-        global $conf;
-        $ini = $conf['cachedir'].'/preview.ini';
-        io_saveFile($ini, $this->makeini());
-    }
-
-    /**
-     * deletes the preview.ini
-     */
-    protected function run_reset() {
-        global $conf;
-        $ini = $conf['cachedir'].'/preview.ini';
-        io_saveFile($ini, '');
-    }
-
-    /**
-     * deletes the local style.ini replacements
-     */
-    protected function run_revert() {
-        $this->replaceini('');
-        $this->run_reset();
-    }
-
-    /**
-     * save the local style.ini replacements
-     */
-    protected function run_save() {
-        $this->replaceini($this->makeini());
-        $this->run_reset();
-    }
-
-    /**
-     * create the replacement part of a style.ini from submitted data
-     *
-     * @return string
-     */
-    protected function makeini() {
-        global $INPUT;
-
-        $ini = "[replacements]\n";
-        $ini .= ";These overwrites have been generated from the Template Styler Admin interface\n";
-        $ini .= ";Any values in this section will be overwritten by that tool again\n";
-        foreach($INPUT->arr('tpl') as $key => $val) {
-            $ini .= $key.' = "'.addslashes($val).'"'."\n";
-        }
-
-        return $ini;
-    }
-
-    /**
-     * replaces the replacement parts in the local ini
-     *
-     * @param string $new the new ini contents
-     */
-    protected function replaceini($new) {
-        global $conf;
-        $ini = DOKU_CONF."tpl/".$conf['template']."/style.ini";
-        if(file_exists($ini)) {
-            $old = io_readFile($ini);
-            $old = preg_replace('/\[replacements\]\n.*?(\n\[.*]|$)/s', '\\1', $old);
-            $old = trim($old);
-        } else {
-            $old = '';
-        }
-
-        io_makeFileDir($ini);
-        io_saveFile($ini, "$old\n\n$new");
-    }
-
-}
-
-// vim:ts=4:sw=4:et:
\ No newline at end of file
diff --git a/lib/plugins/styler/iris.js b/lib/plugins/styler/iris.js
deleted file mode 100644
index 4eda5022e..000000000
--- a/lib/plugins/styler/iris.js
+++ /dev/null
@@ -1,1488 +0,0 @@
-/*! Iris Color Picker - v1.0.7 - 2014-11-28
-* https://github.com/Automattic/Iris
-* Copyright (c) 2014 Matt Wiebe; Licensed GPLv2 */
-(function( $, undef ){
-	var _html, nonGradientIE, gradientType, vendorPrefixes, _css, Iris, UA, isIE, IEVersion;
-
-	_html = '<div class="iris-picker"><div class="iris-picker-inner"><div class="iris-square"><a class="iris-square-value" href="#"><span class="iris-square-handle ui-slider-handle"></span></a><div class="iris-square-inner iris-square-horiz"></div><div class="iris-square-inner iris-square-vert"></div></div><div class="iris-slider iris-strip"><div class="iris-slider-offset"></div></div></div></div>';
-	_css = '.iris-picker{display:block;position:relative}.iris-picker,.iris-picker *{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input+.iris-picker{margin-top:4px}.iris-error{background-color:#ffafaf}.iris-border{border-radius:3px;border:1px solid #aaa;width:200px;background-color:#fff}.iris-picker-inner{position:absolute;top:0;right:0;left:0;bottom:0}.iris-border .iris-picker-inner{top:10px;right:10px;left:10px;bottom:10px}.iris-picker .iris-square-inner{position:absolute;left:0;right:0;top:0;bottom:0}.iris-picker .iris-square,.iris-picker .iris-slider,.iris-picker .iris-square-inner,.iris-picker .iris-palette{border-radius:3px;box-shadow:inset 0 0 5px rgba(0,0,0,.4);height:100%;width:12.5%;float:left;margin-right:5%}.iris-picker .iris-square{width:76%;margin-right:10%;position:relative}.iris-picker .iris-square-inner{width:auto;margin:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-square-inner,.iris-ie-9 .iris-palette{box-shadow:none;border-radius:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-palette{outline:1px solid rgba(0,0,0,.1)}.iris-ie-lt9 .iris-square,.iris-ie-lt9 .iris-slider,.iris-ie-lt9 .iris-square-inner,.iris-ie-lt9 .iris-palette{outline:1px solid #aaa}.iris-ie-lt9 .iris-square .ui-slider-handle{outline:1px solid #aaa;background-color:#fff;-ms-filter:"alpha(Opacity=30)"}.iris-ie-lt9 .iris-square .iris-square-handle{background:0;border:3px solid #fff;-ms-filter:"alpha(Opacity=50)"}.iris-picker .iris-strip{margin-right:0;position:relative}.iris-picker .iris-strip .ui-slider-handle{position:absolute;background:0;margin:0;right:-3px;left:-3px;border:4px solid #aaa;border-width:4px 3px;width:auto;height:6px;border-radius:4px;box-shadow:0 1px 2px rgba(0,0,0,.2);opacity:.9;z-index:5;cursor:ns-resize}.iris-strip .ui-slider-handle:before{content:" ";position:absolute;left:-2px;right:-2px;top:-3px;bottom:-3px;border:2px solid #fff;border-radius:3px}.iris-picker .iris-slider-offset{position:absolute;top:11px;left:0;right:0;bottom:-3px;width:auto;height:auto;background:transparent;border:0;border-radius:0}.iris-picker .iris-square-handle{background:transparent;border:5px solid #aaa;border-radius:50%;border-color:rgba(128,128,128,.5);box-shadow:none;width:12px;height:12px;position:absolute;left:-10px;top:-10px;cursor:move;opacity:1;z-index:10}.iris-picker .ui-state-focus .iris-square-handle{opacity:.8}.iris-picker .iris-square-handle:hover{border-color:#999}.iris-picker .iris-square-value:focus .iris-square-handle{box-shadow:0 0 2px rgba(0,0,0,.75);opacity:.8}.iris-picker .iris-square-handle:hover::after{border-color:#fff}.iris-picker .iris-square-handle::after{position:absolute;bottom:-4px;right:-4px;left:-4px;top:-4px;border:3px solid #f9f9f9;border-color:rgba(255,255,255,.8);border-radius:50%;content:" "}.iris-picker .iris-square-value{width:8px;height:8px;position:absolute}.iris-ie-lt9 .iris-square-value,.iris-mozilla .iris-square-value{width:1px;height:1px}.iris-palette-container{position:absolute;bottom:0;left:0;margin:0;padding:0}.iris-border .iris-palette-container{left:10px;bottom:10px}.iris-picker .iris-palette{margin:0;cursor:pointer}.iris-square-handle,.ui-slider-handle{border:0;outline:0}';
-
-	// Even IE9 dosen't support gradients. Elaborate sigh.
-	UA = navigator.userAgent.toLowerCase();
-	isIE = navigator.appName === 'Microsoft Internet Explorer';
-	IEVersion = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[\.0-9]{0,})/ )[1] ) : 0;
-	nonGradientIE = ( isIE && IEVersion < 10 );
-	gradientType = false;
-
-	// we don't bother with an unprefixed version, as it has a different syntax
-	vendorPrefixes = [ '-moz-', '-webkit-', '-o-', '-ms-' ];
-
-	// Bail for IE <= 7
-	if ( nonGradientIE && IEVersion <= 7 ) {
-		$.fn.iris = $.noop;
-		$.support.iris = false;
-		return;
-	}
-
-	$.support.iris = true;
-
-	function testGradientType() {
-		var el, base,
-			bgImageString = 'backgroundImage';
-
-		if ( nonGradientIE ) {
-			gradientType = 'filter';
-		}
-		else {
-			el = $( '<div id="iris-gradtest" />' );
-			base = 'linear-gradient(top,#fff,#000)';
-			$.each( vendorPrefixes, function( i, val ){
-				el.css( bgImageString, val + base );
-				if ( el.css( bgImageString ).match( 'gradient' ) ) {
-					gradientType = i;
-					return false;
-				}
-			});
-			// check for legacy webkit gradient syntax
-			if ( gradientType === false ) {
-				el.css( 'background', '-webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#000))' );
-				if ( el.css( bgImageString ).match( 'gradient' ) ) {
-					gradientType = 'webkit';
-				}
-			}
-			el.remove();
-		}
-
-	}
-
-	/**
-	* Only for CSS3 gradients. oldIE will use a separate function.
-	*
-	* Accepts as many color stops as necessary from 2nd arg on, or 2nd
-	* arg can be an array of color stops
-	*
-	* @param  {string} origin Gradient origin - top or left, defaults to left.
-	* @return {string}        Appropriate CSS3 gradient string for use in
-	*/
-	function createGradient( origin, stops ) {
-		origin = ( origin === 'top' ) ? 'top' : 'left';
-		stops = $.isArray( stops ) ? stops : Array.prototype.slice.call( arguments, 1 );
-		if ( gradientType === 'webkit' ) {
-			return legacyWebkitGradient( origin, stops );
-		} else {
-			return vendorPrefixes[ gradientType ] + 'linear-gradient(' + origin + ', ' + stops.join(', ') + ')';
-		}
-	}
-
-	/**
-	* Stupid gradients for a stupid browser.
-	*/
-	function stupidIEGradient( origin, stops ) {
-		var type, self, lastIndex, filter, startPosProp, endPosProp, dimensionProp, template, html;
-
-		origin = ( origin === 'top' ) ? 'top' : 'left';
-		stops = $.isArray( stops ) ? stops : Array.prototype.slice.call( arguments, 1 );
-		// 8 hex: AARRGGBB
-		// GradientType: 0 vertical, 1 horizontal
-		type = ( origin === 'top' ) ? 0 : 1;
-		self = $( this );
-		lastIndex = stops.length - 1;
-		filter = 'filter';
-		startPosProp = ( type === 1 ) ? 'left' : 'top';
-		endPosProp = ( type === 1 ) ? 'right' : 'bottom';
-		dimensionProp = ( type === 1 ) ? 'height' : 'width';
-		template = '<div class="iris-ie-gradient-shim" style="position:absolute;' + dimensionProp + ':100%;' + startPosProp + ':%start%;' + endPosProp + ':%end%;' + filter + ':%filter%;" data-color:"%color%"></div>';
-		html = '';
-		// need a positioning context
-		if ( self.css('position') === 'static' ) {
-			self.css( {position: 'relative' } );
-		}
-
-		stops = fillColorStops( stops );
-		$.each(stops, function( i, startColor ) {
-			var endColor, endStop, filterVal;
-
-			// we want two at a time. if we're on the last pair, bail.
-			if ( i === lastIndex ) {
-				return false;
-			}
-
-			endColor = stops[ i + 1 ];
-			//if our pairs are at the same color stop, moving along.
-			if ( startColor.stop === endColor.stop ) {
-				return;
-			}
-
-			endStop = 100 - parseFloat( endColor.stop ) + '%';
-			startColor.octoHex = new Color( startColor.color ).toIEOctoHex();
-			endColor.octoHex = new Color( endColor.color ).toIEOctoHex();
-
-			filterVal = 'progid:DXImageTransform.Microsoft.Gradient(GradientType=' + type + ', StartColorStr=\'' + startColor.octoHex + '\', EndColorStr=\'' + endColor.octoHex + '\')';
-			html += template.replace( '%start%', startColor.stop ).replace( '%end%', endStop ).replace( '%filter%', filterVal );
-		});
-		self.find( '.iris-ie-gradient-shim' ).remove();
-		$( html ).prependTo( self );
-	}
-
-	function legacyWebkitGradient( origin, colorList ) {
-		var stops = [];
-		origin = ( origin === 'top' ) ? '0% 0%,0% 100%,' : '0% 100%,100% 100%,';
-		colorList = fillColorStops( colorList );
-		$.each( colorList, function( i, val ){
-			stops.push( 'color-stop(' + ( parseFloat( val.stop ) / 100 ) + ', ' + val.color + ')' );
-		});
-		return '-webkit-gradient(linear,' + origin + stops.join(',') + ')';
-	}
-
-	function fillColorStops( colorList ) {
-		var colors = [],
-			percs = [],
-			newColorList = [],
-			lastIndex = colorList.length - 1;
-
-		$.each( colorList, function( index, val ) {
-			var color = val,
-				perc = false,
-				match = val.match( /1?[0-9]{1,2}%$/ );
-
-			if ( match ) {
-				color = val.replace( /\s?1?[0-9]{1,2}%$/, '' );
-				perc = match.shift();
-			}
-			colors.push( color );
-			percs.push( perc );
-		});
-
-		// back fill first and last
-		if ( percs[0] === false ) {
-			percs[0] = '0%';
-		}
-
-		if ( percs[lastIndex] === false ) {
-			percs[lastIndex] = '100%';
-		}
-
-		percs = backFillColorStops( percs );
-
-		$.each( percs, function( i ){
-			newColorList[i] = { color: colors[i], stop: percs[i] };
-		});
-		return newColorList;
-	}
-
-	function backFillColorStops( stops ) {
-		var first = 0,
-			last = stops.length - 1,
-			i = 0,
-			foundFirst = false,
-			incr,
-			steps,
-			step,
-			firstVal;
-
-		if ( stops.length <= 2 || $.inArray( false, stops ) < 0 ) {
-			return stops;
-		}
-		while ( i < stops.length - 1 ) {
-			if ( ! foundFirst && stops[i] === false ) {
-				first = i - 1;
-				foundFirst = true;
-			} else if ( foundFirst && stops[i] !== false ) {
-				last = i;
-				i = stops.length;
-			}
-			i++;
-		}
-		steps = last - first;
-		firstVal = parseInt( stops[first].replace('%'), 10 );
-		incr = ( parseFloat( stops[last].replace('%') ) - firstVal ) / steps;
-		i = first + 1;
-		step = 1;
-		while ( i < last ) {
-			stops[i] = ( firstVal + ( step * incr ) ) + '%';
-			step++;
-			i++;
-		}
-		return backFillColorStops( stops );
-	}
-
-	$.fn.gradient = function() {
-		var args = arguments;
-		return this.each( function() {
-			// this'll be oldishIE
-			if ( nonGradientIE ) {
-				stupidIEGradient.apply( this, args );
-			} else {
-				// new hotness
-				$( this ).css( 'backgroundImage', createGradient.apply( this, args ) );
-			}
-		});
-	};
-
-	$.fn.raninbowGradient = function( origin, args ) {
-		var opts, template, i, steps;
-
-		origin = origin || 'top';
-		opts = $.extend( {}, { s: 100, l: 50 }, args );
-		template = 'hsl(%h%,' + opts.s + '%,' + opts.l + '%)';
-		i = 0;
-		steps = [];
-		while ( i <= 360 ) {
-			steps.push( template.replace('%h%', i) );
-			i += 30;
-		}
-		return this.each(function() {
-			$(this).gradient( origin, steps );
-		});
-	};
-
-	// the colorpicker widget def.
-	Iris = {
-		options: {
-			color: false,
-			mode: 'hsl',
-			controls: {
-				horiz: 's', // horizontal defaults to saturation
-				vert: 'l', // vertical defaults to lightness
-				strip: 'h' // right strip defaults to hue
-			},
-			hide: true, // hide the color picker by default
-			border: true, // draw a border around the collection of UI elements
-			target: false, // a DOM element / jQuery selector that the element will be appended within. Only used when called on an input.
-			width: 200, // the width of the collection of UI elements
-			palettes: false // show a palette of basic colors beneath the square.
-		},
-		_color: '',
-		_palettes: [ '#000', '#fff', '#d33', '#d93', '#ee2', '#81d742', '#1e73be', '#8224e3' ],
-		_inited: false,
-		_defaultHSLControls: {
-			horiz: 's',
-			vert: 'l',
-			strip: 'h'
-		},
-		_defaultHSVControls: {
-			horiz: 'h',
-			vert: 'v',
-			strip: 's'
-		},
-		_scale: {
-			h: 360,
-			s: 100,
-			l: 100,
-			v: 100
-		},
-		_create: function() {
-			var self = this,
-				el = self.element,
-				color = self.options.color || el.val();
-
-			if ( gradientType === false ) {
-				testGradientType();
-			}
-
-			if ( el.is( 'input' ) ) {
-				if ( self.options.target ) {
-					self.picker = $( _html ).appendTo( self.options.target );
-				} else {
-					self.picker = $( _html ).insertAfter( el );
-				}
-
-				self._addInputListeners( el );
-			} else {
-				el.append( _html );
-				self.picker = el.find( '.iris-picker' );
-			}
-
-			// Browsers / Versions
-			// Feature detection doesn't work for these, and $.browser is deprecated
-			if ( isIE ) {
-				if ( IEVersion === 9 ) {
-					self.picker.addClass( 'iris-ie-9' );
-				} else if ( IEVersion <= 8 ) {
-					self.picker.addClass( 'iris-ie-lt9' );
-				}
-			} else if ( UA.indexOf('compatible') < 0 && UA.indexOf('khtml') < 0 && UA.match( /mozilla/ ) ) {
-				self.picker.addClass( 'iris-mozilla' );
-			}
-
-			if ( self.options.palettes ) {
-				self._addPalettes();
-			}
-
-			self._color = new Color( color ).setHSpace( self.options.mode );
-			self.options.color = self._color.toString();
-
-			// prep 'em for re-use
-			self.controls = {
-				square:      self.picker.find( '.iris-square' ),
-				squareDrag:  self.picker.find( '.iris-square-value' ),
-				horiz:       self.picker.find( '.iris-square-horiz' ),
-				vert:        self.picker.find( '.iris-square-vert' ),
-				strip:       self.picker.find( '.iris-strip' ),
-				stripSlider: self.picker.find( '.iris-strip .iris-slider-offset' )
-			};
-
-			// small sanity check - if we chose hsv, change default controls away from hsl
-			if ( self.options.mode === 'hsv' && self._has('l', self.options.controls) ) {
-				self.options.controls = self._defaultHSVControls;
-			} else if ( self.options.mode === 'hsl' && self._has('v', self.options.controls) ) {
-				self.options.controls = self._defaultHSLControls;
-			}
-
-			// store it. HSL gets squirrely
-			self.hue = self._color.h();
-
-			if ( self.options.hide ) {
-				self.picker.hide();
-			}
-
-			if ( self.options.border ) {
-				self.picker.addClass( 'iris-border' );
-			}
-
-			self._initControls();
-			self.active = 'external';
-			self._dimensions();
-			self._change();
-		},
-		_has: function(needle, haystack) {
-			var ret = false;
-			$.each(haystack, function(i,v){
-				if ( needle === v ) {
-					ret = true;
-					// exit the loop
-					return false;
-				}
-			});
-			return ret;
-		},
-		_addPalettes: function () {
-			var container = $( '<div class="iris-palette-container" />' ),
-				palette = $( '<a class="iris-palette" tabindex="0" />' ),
-				colors = $.isArray( this.options.palettes ) ? this.options.palettes : this._palettes;
-
-			// do we have an existing container? Empty and reuse it.
-			if ( this.picker.find( '.iris-palette-container' ).length ) {
-				container = this.picker.find( '.iris-palette-container' ).detach().html( '' );
-			}
-
-			$.each(colors, function(index, val) {
-				palette.clone().data( 'color', val )
-					.css( 'backgroundColor', val ).appendTo( container )
-					.height( 10 ).width( 10 );
-			});
-
-			this.picker.append(container);
-		},
-		_paint: function() {
-			var self = this;
-			self._paintDimension( 'top', 'strip' );
-			self._paintDimension( 'top', 'vert' );
-			self._paintDimension( 'left', 'horiz' );
-		},
-		_paintDimension: function( origin, control ) {
-			var self = this,
-				c = self._color,
-				mode = self.options.mode,
-				color = self._getHSpaceColor(),
-				target = self.controls[ control ],
-				controlOpts = self.options.controls,
-				stops;
-
-			// don't paint the active control
-			if ( control === self.active || ( self.active === 'square' && control !== 'strip' ) ) {
-				return;
-			}
-
-			switch ( controlOpts[ control ] ) {
-				case 'h':
-					if ( mode === 'hsv' ) {
-						color = c.clone();
-						switch ( control ) {
-							case 'horiz':
-								color[controlOpts.vert](100);
-								break;
-							case 'vert':
-								color[controlOpts.horiz](100);
-								break;
-							case 'strip':
-								color.setHSpace('hsl');
-								break;
-						}
-						stops = color.toHsl();
-					} else {
-						if ( control === 'strip' ) {
-							stops = { s: color.s, l: color.l };
-						} else {
-							stops = { s: 100, l: color.l };
-						}
-					}
-
-					target.raninbowGradient( origin, stops );
-					break;
-				case 's':
-					if ( mode === 'hsv' ) {
-						if ( control === 'vert' ) {
-							stops = [ c.clone().a(0).s(0).toCSS('rgba'), c.clone().a(1).s(0).toCSS('rgba') ];
-						} else if ( control === 'strip' ) {
-							stops = [ c.clone().s(100).toCSS('hsl'), c.clone().s(0).toCSS('hsl') ];
-						} else if ( control === 'horiz' ) {
-							stops = [ '#fff', 'hsl(' + color.h + ',100%,50%)' ];
-						}
-					} else { // implicit mode === 'hsl'
-						if ( control === 'vert' && self.options.controls.horiz === 'h' ) {
-							stops = ['hsla(0, 0%, ' + color.l + '%, 0)', 'hsla(0, 0%, ' + color.l + '%, 1)'];
-						} else {
-							stops = ['hsl('+ color.h +',0%,50%)', 'hsl(' + color.h + ',100%,50%)'];
-						}
-					}
-
-
-					target.gradient( origin, stops );
-					break;
-				case 'l':
-					if ( control === 'strip' ) {
-						stops = ['hsl(' + color.h + ',100%,100%)', 'hsl(' + color.h + ', ' + color.s + '%,50%)', 'hsl('+ color.h +',100%,0%)'];
-					} else {
-						stops = ['#fff', 'rgba(255,255,255,0) 50%', 'rgba(0,0,0,0) 50%', 'rgba(0,0,0,1)'];
-					}
-					target.gradient( origin, stops );
-					break;
-				case 'v':
-						if ( control === 'strip' ) {
-							stops = [ c.clone().v(100).toCSS(), c.clone().v(0).toCSS() ];
-						} else {
-							stops = ['rgba(0,0,0,0)', '#000'];
-						}
-						target.gradient( origin, stops );
-					break;
-				default:
-					break;
-			}
-		},
-
-		_getHSpaceColor: function() {
-			return ( this.options.mode === 'hsv' ) ? this._color.toHsv() : this._color.toHsl();
-		},
-
-		_dimensions: function( reset ) {
-			// whatever size
-			var self = this,
-				opts = self.options,
-				controls = self.controls,
-				square = controls.square,
-				strip = self.picker.find( '.iris-strip' ),
-				squareWidth = '77.5%',
-				stripWidth = '12%',
-				totalPadding = 20,
-				innerWidth = opts.border ? opts.width - totalPadding : opts.width,
-				controlsHeight,
-				paletteCount = $.isArray( opts.palettes ) ? opts.palettes.length : self._palettes.length,
-				paletteMargin, paletteWidth, paletteContainerWidth;
-
-			if ( reset ) {
-				square.css( 'width', '' );
-				strip.css( 'width', '' );
-				self.picker.css( {width: '', height: ''} );
-			}
-
-			squareWidth = innerWidth * ( parseFloat( squareWidth ) / 100 );
-			stripWidth = innerWidth * ( parseFloat( stripWidth ) / 100 );
-			controlsHeight = opts.border ? squareWidth + totalPadding : squareWidth;
-
-			square.width( squareWidth ).height( squareWidth );
-			strip.height( squareWidth ).width( stripWidth );
-			self.picker.css( { width: opts.width, height: controlsHeight } );
-
-			if ( ! opts.palettes ) {
-				return self.picker.css( 'paddingBottom', '' );
-			}
-
-			// single margin at 2%
-			paletteMargin = squareWidth * 2 / 100;
-			paletteContainerWidth = squareWidth - ( ( paletteCount - 1 ) * paletteMargin );
-			paletteWidth = paletteContainerWidth / paletteCount;
-			self.picker.find('.iris-palette').each( function( i ) {
-				var margin = i === 0 ? 0 : paletteMargin;
-				$( this ).css({
-					width: paletteWidth,
-					height: paletteWidth,
-					marginLeft: margin
-				});
-			});
-			self.picker.css( 'paddingBottom', paletteWidth + paletteMargin );
-			strip.height( paletteWidth + paletteMargin + squareWidth );
-		},
-
-		_addInputListeners: function( input ) {
-			var self = this,
-				debounceTimeout = 100,
-				callback = function( event ){
-					var color = new Color( input.val() ),
-						val = input.val().replace( /^#/, '' );
-
-					input.removeClass( 'iris-error' );
-					// we gave a bad color
-					if ( color.error ) {
-						// don't error on an empty input - we want those allowed
-						if ( val !== '' ) {
-							input.addClass( 'iris-error' );
-						}
-					} else {
-						if ( color.toString() !== self._color.toString() ) {
-							// let's not do this on keyup for hex shortcodes
-							if ( ! ( event.type === 'keyup' && val.match( /^[0-9a-fA-F]{3}$/ ) ) ) {
-								self._setOption( 'color', color.toString() );
-							}
-						}
-					}
-				};
-
-			input.on( 'change', callback ).on( 'keyup', self._debounce( callback, debounceTimeout ) );
-
-			// If we initialized hidden, show on first focus. The rest is up to you.
-			if ( self.options.hide ) {
-				input.one( 'focus', function() {
-					self.show();
-				});
-			}
-		},
-
-		_initControls: function() {
-			var self = this,
-				controls = self.controls,
-				square = controls.square,
-				controlOpts = self.options.controls,
-				stripScale = self._scale[controlOpts.strip];
-
-			controls.stripSlider.slider({
-				orientation: 'vertical',
-				max: stripScale,
-				slide: function( event, ui ) {
-					self.active = 'strip';
-					// "reverse" for hue.
-					if ( controlOpts.strip === 'h' ) {
-						ui.value = stripScale - ui.value;
-					}
-
-					self._color[controlOpts.strip]( ui.value );
-					self._change.apply( self, arguments );
-				}
-			});
-
-			controls.squareDrag.draggable({
-				containment: controls.square.find( '.iris-square-inner' ),
-				zIndex: 1000,
-				cursor: 'move',
-				drag: function( event, ui ) {
-					self._squareDrag( event, ui );
-				},
-				start: function() {
-					square.addClass( 'iris-dragging' );
-					$(this).addClass( 'ui-state-focus' );
-				},
-				stop: function() {
-					square.removeClass( 'iris-dragging' );
-					$(this).removeClass( 'ui-state-focus' );
-				}
-			}).on( 'mousedown mouseup', function( event ) {
-				var focusClass = 'ui-state-focus';
-				event.preventDefault();
-				if (event.type === 'mousedown' ) {
-					self.picker.find( '.' + focusClass ).removeClass( focusClass ).blur();
-					$(this).addClass( focusClass ).focus();
-				} else {
-					$(this).removeClass( focusClass );
-				}
-			}).on( 'keydown', function( event ) {
-				var container = controls.square,
-					draggable = controls.squareDrag,
-					position = draggable.position(),
-					distance = self.options.width / 100; // Distance in pixels the draggable should be moved: 1 "stop"
-
-				// make alt key go "10"
-				if ( event.altKey ) {
-					distance *= 10;
-				}
-
-				// Reposition if one of the directional keys is pressed
-				switch ( event.keyCode ) {
-					case 37: position.left -= distance; break; // Left
-					case 38: position.top  -= distance; break; // Up
-					case 39: position.left += distance; break; // Right
-					case 40: position.top  += distance; break; // Down
-					default: return true; // Exit and bubble
-				}
-
-				// Keep draggable within container
-				position.left = Math.max( 0, Math.min( position.left, container.width() ) );
-				position.top =  Math.max( 0, Math.min( position.top, container.height() ) );
-
-				draggable.css(position);
-				self._squareDrag( event, { position: position });
-				event.preventDefault();
-			});
-
-			// allow clicking on the square to move there and keep dragging
-			square.mousedown( function( event ) {
-				var squareOffset, pos;
-				// only left click
-				if ( event.which !== 1 ) {
-					return;
-				}
-
-				// prevent bubbling from the handle: no infinite loops
-				if ( ! $( event.target ).is( 'div' ) ) {
-					return;
-				}
-
-				squareOffset = self.controls.square.offset();
-				pos = {
-						top: event.pageY - squareOffset.top,
-						left: event.pageX - squareOffset.left
-				};
-				event.preventDefault();
-				self._squareDrag( event, { position: pos } );
-				event.target = self.controls.squareDrag.get(0);
-				self.controls.squareDrag.css( pos ).trigger( event );
-			});
-
-			// palettes
-			if ( self.options.palettes ) {
-				self._paletteListeners();
-			}
-		},
-
-		_paletteListeners: function() {
-			var self = this;
-			self.picker.find('.iris-palette-container').on('click.palette', '.iris-palette', function() {
-				self._color.fromCSS( $(this).data('color') );
-				self.active = 'external';
-				self._change();
-			}).on( 'keydown.palette', '.iris-palette', function( event ) {
-				if ( ! ( event.keyCode === 13 || event.keyCode === 32 ) ) {
-					return true;
-				}
-				event.stopPropagation();
-				$( this ).click();
-			});
-		},
-
-		_squareDrag: function( event, ui ) {
-			var self = this,
-				controlOpts = self.options.controls,
-				dimensions = self._squareDimensions(),
-				vertVal = Math.round( ( dimensions.h - ui.position.top ) / dimensions.h * self._scale[controlOpts.vert] ),
-				horizVal = self._scale[controlOpts.horiz] - Math.round( ( dimensions.w - ui.position.left ) / dimensions.w * self._scale[controlOpts.horiz] );
-
-			self._color[controlOpts.horiz]( horizVal )[controlOpts.vert]( vertVal );
-
-			self.active = 'square';
-			self._change.apply( self, arguments );
-		},
-
-		_setOption: function( key, value ) {
-			var self = this,
-				oldValue = self.options[key],
-				doDimensions = false,
-				hexLessColor,
-				newColor,
-				method;
-
-			// ensure the new value is set. We can reset to oldValue if some check wasn't met.
-			self.options[key] = value;
-
-			switch(key) {
-				case 'color':
-					// cast to string in case we have a number
-					value = '' + value;
-					hexLessColor = value.replace( /^#/, '' );
-					newColor = new Color( value ).setHSpace( self.options.mode );
-					if ( newColor.error ) {
-						self.options[key] = oldValue;
-					} else {
-						self._color = newColor;
-						self.options.color = self.options[key] = self._color.toString();
-						self.active = 'external';
-						self._change();
-					}
-					break;
-				case 'palettes':
-					doDimensions = true;
-
-					if ( value ) {
-						self._addPalettes();
-					} else {
-						self.picker.find('.iris-palette-container').remove();
-					}
-
-					// do we need to add events?
-					if ( ! oldValue ) {
-						self._paletteListeners();
-					}
-					break;
-				case 'width':
-					doDimensions = true;
-					break;
-				case 'border':
-					doDimensions = true;
-					method = value ? 'addClass' : 'removeClass';
-					self.picker[method]('iris-border');
-					break;
-				case 'mode':
-				case 'controls':
-					// if nothing's changed, let's bail, since this causes re-rendering the whole widget
-					if ( oldValue === value ) {
-						return;
-					}
-
-					// we're using these poorly named variables because they're already scoped.
-					// method is the element that Iris was called on. oldValue will be the options
-					method = self.element;
-					oldValue = self.options;
-					oldValue.hide = ! self.picker.is( ':visible' );
-					self.destroy();
-					self.picker.remove();
-					return $(self.element).iris(oldValue);
-			}
-
-			// Do we need to recalc dimensions?
-			if ( doDimensions ) {
-				self._dimensions(true);
-			}
-		},
-
-		_squareDimensions: function( forceRefresh ) {
-			var square = this.controls.square,
-				dimensions,
-				control;
-
-			if ( forceRefresh !== undef && square.data('dimensions') ) {
-				return square.data('dimensions');
-			}
-
-			control = this.controls.squareDrag;
-			dimensions = {
-				w: square.width(),
-				h: square.height()
-			};
-			square.data( 'dimensions', dimensions );
-			return dimensions;
-		},
-
-		_isNonHueControl: function( active, type ) {
-			if ( active === 'square' && this.options.controls.strip === 'h' ) {
-				return true;
-			} else if ( type === 'external' || ( type === 'h' && active === 'strip' ) ) {
-				return false;
-			}
-
-			return true;
-		},
-
-		_change: function() {
-			var self = this,
-				controls = self.controls,
-				color = self._getHSpaceColor(),
-				actions = [ 'square', 'strip' ],
-				controlOpts = self.options.controls,
-				type = controlOpts[self.active] || 'external',
-				oldHue = self.hue;
-
-			if ( self.active === 'strip' ) {
-				// take no action on any of the square sliders if we adjusted the strip
-				actions = [];
-			} else if ( self.active !== 'external' ) {
-				// for non-strip, non-external, strip should never change
-				actions.pop(); // conveniently the last item
-			}
-
-			$.each( actions, function(index, item) {
-				var value, dimensions, cssObj;
-				if ( item !== self.active ) {
-					switch ( item ) {
-						case 'strip':
-							// reverse for hue
-							value = ( controlOpts.strip === 'h' ) ? self._scale[controlOpts.strip] - color[controlOpts.strip] : color[controlOpts.strip];
-							controls.stripSlider.slider( 'value', value );
-							break;
-						case 'square':
-							dimensions = self._squareDimensions();
-							cssObj = {
-								left: color[controlOpts.horiz] / self._scale[controlOpts.horiz] * dimensions.w,
-								top: dimensions.h - ( color[controlOpts.vert] / self._scale[controlOpts.vert] * dimensions.h )
-							};
-
-							self.controls.squareDrag.css( cssObj );
-							break;
-					}
-				}
-			});
-
-			// Ensure that we don't change hue if we triggered a hue reset
-			if ( color.h !== oldHue && self._isNonHueControl( self.active, type ) ) {
-				self._color.h(oldHue);
-			}
-
-			// store hue for repeating above check next time
-			self.hue = self._color.h();
-
-			self.options.color = self._color.toString();
-
-			// only run after the first time
-			if ( self._inited ) {
-				self._trigger( 'change', { type: self.active }, { color: self._color } );
-			}
-
-			if ( self.element.is( ':input' ) && ! self._color.error ) {
-				self.element.removeClass( 'iris-error' );
-				if ( self.element.val() !== self._color.toString() ) {
-					self.element.val( self._color.toString() );
-				}
-			}
-
-			self._paint();
-			self._inited = true;
-			self.active = false;
-		},
-		// taken from underscore.js _.debounce method
-		_debounce: function( func, wait, immediate ) {
-			var timeout, result;
-			return function() {
-				var context = this,
-					args = arguments,
-					later,
-					callNow;
-
-				later = function() {
-					timeout = null;
-					if ( ! immediate) {
-						result = func.apply( context, args );
-					}
-				};
-
-				callNow = immediate && !timeout;
-				clearTimeout( timeout );
-				timeout = setTimeout( later, wait );
-				if ( callNow ) {
-					result = func.apply( context, args );
-				}
-				return result;
-			};
-		},
-		show: function() {
-			this.picker.show();
-		},
-		hide: function() {
-			this.picker.hide();
-		},
-		toggle: function() {
-			this.picker.toggle();
-		},
-		color: function(newColor) {
-			if ( newColor === true ) {
-				return this._color.clone();
-			} else if ( newColor === undef ) {
-				return this._color.toString();
-			}
-			this.option('color', newColor);
-		}
-	};
-	// initialize the widget
-	$.widget( 'a8c.iris', Iris );
-	// add CSS
-	$( '<style id="iris-css">' + _css + '</style>' ).appendTo( 'head' );
-
-}( jQuery ));
-/*! Color.js - v0.9.11 - 2013-08-09
-* https://github.com/Automattic/Color.js
-* Copyright (c) 2013 Matt Wiebe; Licensed GPLv2 */
-(function(global, undef) {
-
-	var Color = function( color, type ) {
-		if ( ! ( this instanceof Color ) )
-			return new Color( color, type );
-
-		return this._init( color, type );
-	};
-
-	Color.fn = Color.prototype = {
-		_color: 0,
-		_alpha: 1,
-		error: false,
-		// for preserving hue/sat in fromHsl().toHsl() flows
-		_hsl: { h: 0, s: 0, l: 0 },
-		// for preserving hue/sat in fromHsv().toHsv() flows
-		_hsv: { h: 0, s: 0, v: 0 },
-		// for setting hsl or hsv space - needed for .h() & .s() functions to function properly
-		_hSpace: 'hsl',
-		_init: function( color ) {
-			var func = 'noop';
-			switch ( typeof color ) {
-					case 'object':
-						// alpha?
-						if ( color.a !== undef )
-							this.a( color.a );
-						func = ( color.r !== undef ) ? 'fromRgb' :
-							( color.l !== undef ) ? 'fromHsl' :
-							( color.v !== undef ) ? 'fromHsv' : func;
-						return this[func]( color );
-					case 'string':
-						return this.fromCSS( color );
-					case 'number':
-						return this.fromInt( parseInt( color, 10 ) );
-			}
-			return this;
-		},
-
-		_error: function() {
-			this.error = true;
-			return this;
-		},
-
-		clone: function() {
-			var newColor = new Color( this.toInt() ),
-				copy = ['_alpha', '_hSpace', '_hsl', '_hsv', 'error'];
-			for ( var i = copy.length - 1; i >= 0; i-- ) {
-				newColor[ copy[i] ] = this[ copy[i] ];
-			}
-			return newColor;
-		},
-
-		setHSpace: function( space ) {
-			this._hSpace = ( space === 'hsv' ) ? space : 'hsl';
-			return this;
-		},
-
-		noop: function() {
-			return this;
-		},
-
-		fromCSS: function( color ) {
-			var list,
-				leadingRE = /^(rgb|hs(l|v))a?\(/;
-			this.error = false;
-
-			// whitespace and semicolon trim
-			color = color.replace(/^\s+/, '').replace(/\s+$/, '').replace(/;$/, '');
-
-			if ( color.match(leadingRE) && color.match(/\)$/) ) {
-				list = color.replace(/(\s|%)/g, '').replace(leadingRE, '').replace(/,?\);?$/, '').split(',');
-
-				if ( list.length < 3 )
-					return this._error();
-
-				if ( list.length === 4 ) {
-					this.a( parseFloat( list.pop() ) );
-					// error state has been set to true in .a() if we passed NaN
-					if ( this.error )
-						return this;
-				}
-
-				for (var i = list.length - 1; i >= 0; i--) {
-					list[i] = parseInt(list[i], 10);
-					if ( isNaN( list[i] ) )
-						return this._error();
-				}
-
-				if ( color.match(/^rgb/) ) {
-					return this.fromRgb( {
-						r: list[0],
-						g: list[1],
-						b: list[2]
-					} );
-				} else if ( color.match(/^hsv/) ) {
-					return this.fromHsv( {
-						h: list[0],
-						s: list[1],
-						v: list[2]
-					} );
-				} else {
-					return this.fromHsl( {
-						h: list[0],
-						s: list[1],
-						l: list[2]
-					} );
-				}
-			} else {
-				// must be hex amirite?
-				return this.fromHex( color );
-			}
-		},
-
-		fromRgb: function( rgb, preserve ) {
-			if ( typeof rgb !== 'object' || rgb.r === undef || rgb.g === undef || rgb.b === undef )
-				return this._error();
-
-			this.error = false;
-			return this.fromInt( parseInt( ( rgb.r << 16 ) + ( rgb.g << 8 ) + rgb.b, 10 ), preserve );
-		},
-
-		fromHex: function( color ) {
-			color = color.replace(/^#/, '').replace(/^0x/, '');
-			if ( color.length === 3 ) {
-				color = color[0] + color[0] + color[1] + color[1] + color[2] + color[2];
-			}
-
-			// rough error checking - this is where things go squirrely the most
-			this.error = ! /^[0-9A-F]{6}$/i.test( color );
-			return this.fromInt( parseInt( color, 16 ) );
-		},
-
-		fromHsl: function( hsl ) {
-			var r, g, b, q, p, h, s, l;
-
-			if ( typeof hsl !== 'object' || hsl.h === undef || hsl.s === undef || hsl.l === undef )
-				return this._error();
-
-			this._hsl = hsl; // store it
-			this._hSpace = 'hsl'; // implicit
-			h = hsl.h / 360; s = hsl.s / 100; l = hsl.l / 100;
-			if ( s === 0 ) {
-				r = g = b = l; // achromatic
-			}
-			else {
-				q = l < 0.5 ? l * ( 1 + s ) : l + s - l * s;
-				p = 2 * l - q;
-				r = this.hue2rgb( p, q, h + 1/3 );
-				g = this.hue2rgb( p, q, h );
-				b = this.hue2rgb( p, q, h - 1/3 );
-			}
-			return this.fromRgb( {
-				r: r * 255,
-				g: g * 255,
-				b: b * 255
-			}, true ); // true preserves hue/sat
-		},
-
-		fromHsv: function( hsv ) {
-			var h, s, v, r, g, b, i, f, p, q, t;
-			if ( typeof hsv !== 'object' || hsv.h === undef || hsv.s === undef || hsv.v === undef )
-				return this._error();
-
-			this._hsv = hsv; // store it
-			this._hSpace = 'hsv'; // implicit
-
-			h = hsv.h / 360; s = hsv.s / 100; v = hsv.v / 100;
-			i = Math.floor( h * 6 );
-			f = h * 6 - i;
-			p = v * ( 1 - s );
-			q = v * ( 1 - f * s );
-			t = v * ( 1 - ( 1 - f ) * s );
-
-			switch( i % 6 ) {
-				case 0:
-					r = v; g = t; b = p;
-					break;
-				case 1:
-					r = q; g = v; b = p;
-					break;
-				case 2:
-					r = p; g = v; b = t;
-					break;
-				case 3:
-					r = p; g = q; b = v;
-					break;
-				case 4:
-					r = t; g = p; b = v;
-					break;
-				case 5:
-					r = v; g = p; b = q;
-					break;
-			}
-
-			return this.fromRgb( {
-				r: r * 255,
-				g: g * 255,
-				b: b * 255
-			}, true ); // true preserves hue/sat
-
-		},
-		// everything comes down to fromInt
-		fromInt: function( color, preserve ) {
-			this._color = parseInt( color, 10 );
-
-			if ( isNaN( this._color ) )
-				this._color = 0;
-
-			// let's coerce things
-			if ( this._color > 16777215 )
-				this._color = 16777215;
-			else if ( this._color < 0 )
-				this._color = 0;
-
-			// let's not do weird things
-			if ( preserve === undef ) {
-				this._hsv.h = this._hsv.s = this._hsl.h = this._hsl.s = 0;
-			}
-			// EVENT GOES HERE
-			return this;
-		},
-
-		hue2rgb: function( p, q, t ) {
-			if ( t < 0 ) {
-				t += 1;
-			}
-			if ( t > 1 ) {
-				t -= 1;
-			}
-			if ( t < 1/6 ) {
-				return p + ( q - p ) * 6 * t;
-			}
-			if ( t < 1/2 ) {
-				return q;
-			}
-			if ( t < 2/3 ) {
-				return p + ( q - p ) * ( 2/3 - t ) * 6;
-			}
-			return p;
-		},
-
-		toString: function() {
-			var hex = parseInt( this._color, 10 ).toString( 16 );
-			if ( this.error )
-				return '';
-			// maybe left pad it
-			if ( hex.length < 6 ) {
-				for (var i = 6 - hex.length - 1; i >= 0; i--) {
-					hex = '0' + hex;
-				}
-			}
-			return '#' + hex;
-		},
-
-		toCSS: function( type, alpha ) {
-			type = type || 'hex';
-			alpha = parseFloat( alpha || this._alpha );
-			switch ( type ) {
-				case 'rgb':
-				case 'rgba':
-					var rgb = this.toRgb();
-					if ( alpha < 1 ) {
-						return "rgba( " + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + alpha + " )";
-					}
-					else {
-						return "rgb( " + rgb.r + ", " + rgb.g + ", " + rgb.b + " )";
-					}
-					break;
-				case 'hsl':
-				case 'hsla':
-					var hsl = this.toHsl();
-					if ( alpha < 1 ) {
-						return "hsla( " + hsl.h + ", " + hsl.s + "%, " + hsl.l + "%, " + alpha + " )";
-					}
-					else {
-						return "hsl( " + hsl.h + ", " + hsl.s + "%, " + hsl.l + "% )";
-					}
-					break;
-				default:
-					return this.toString();
-			}
-		},
-
-		toRgb: function() {
-			return {
-				r: 255 & ( this._color >> 16 ),
-				g: 255 & ( this._color >> 8 ),
-				b: 255 & ( this._color )
-			};
-		},
-
-		toHsl: function() {
-			var rgb = this.toRgb();
-			var r = rgb.r / 255, g = rgb.g / 255, b = rgb.b / 255;
-			var max = Math.max( r, g, b ), min = Math.min( r, g, b );
-			var h, s, l = ( max + min ) / 2;
-
-			if ( max === min ) {
-				h = s = 0; // achromatic
-			} else {
-				var d = max - min;
-				s = l > 0.5 ? d / ( 2 - max - min ) : d / ( max + min );
-				switch ( max ) {
-					case r: h = ( g - b ) / d + ( g < b ? 6 : 0 );
-						break;
-					case g: h = ( b - r ) / d + 2;
-						break;
-					case b: h = ( r - g ) / d + 4;
-						break;
-				}
-				h /= 6;
-			}
-
-			// maintain hue & sat if we've been manipulating things in the HSL space.
-			h = Math.round( h * 360 );
-			if ( h === 0 && this._hsl.h !== h ) {
-				h = this._hsl.h;
-			}
-			s = Math.round( s * 100 );
-			if ( s === 0 && this._hsl.s ) {
-				s = this._hsl.s;
-			}
-
-			return {
-				h: h,
-				s: s,
-				l: Math.round( l * 100 )
-			};
-
-		},
-
-		toHsv: function() {
-			var rgb = this.toRgb();
-			var r = rgb.r / 255, g = rgb.g / 255, b = rgb.b / 255;
-			var max = Math.max( r, g, b ), min = Math.min( r, g, b );
-			var h, s, v = max;
-			var d = max - min;
-			s = max === 0 ? 0 : d / max;
-
-			if ( max === min ) {
-				h = s = 0; // achromatic
-			} else {
-				switch( max ){
-					case r:
-						h = ( g - b ) / d + ( g < b ? 6 : 0 );
-						break;
-					case g:
-						h = ( b - r ) / d + 2;
-						break;
-					case b:
-						h = ( r - g ) / d + 4;
-						break;
-				}
-				h /= 6;
-			}
-
-			// maintain hue & sat if we've been manipulating things in the HSV space.
-			h = Math.round( h * 360 );
-			if ( h === 0 && this._hsv.h !== h ) {
-				h = this._hsv.h;
-			}
-			s = Math.round( s * 100 );
-			if ( s === 0 && this._hsv.s ) {
-				s = this._hsv.s;
-			}
-
-			return {
-				h: h,
-				s: s,
-				v: Math.round( v * 100 )
-			};
-		},
-
-		toInt: function() {
-			return this._color;
-		},
-
-		toIEOctoHex: function() {
-			// AARRBBGG
-			var hex = this.toString();
-			var AA = parseInt( 255 * this._alpha, 10 ).toString(16);
-			if ( AA.length === 1 ) {
-				AA = '0' + AA;
-			}
-			return '#' + AA + hex.replace(/^#/, '' );
-		},
-
-		toLuminosity: function() {
-			var rgb = this.toRgb();
-			return 0.2126 * Math.pow( rgb.r / 255, 2.2 ) + 0.7152 * Math.pow( rgb.g / 255, 2.2 ) + 0.0722 * Math.pow( rgb.b / 255, 2.2);
-		},
-
-		getDistanceLuminosityFrom: function( color ) {
-			if ( ! ( color instanceof Color ) ) {
-				throw 'getDistanceLuminosityFrom requires a Color object';
-			}
-			var lum1 = this.toLuminosity();
-			var lum2 = color.toLuminosity();
-			if ( lum1 > lum2 ) {
-				return ( lum1 + 0.05 ) / ( lum2 + 0.05 );
-			}
-			else {
-				return ( lum2 + 0.05 ) / ( lum1 + 0.05 );
-			}
-		},
-
-		getMaxContrastColor: function() {
-			var lum = this.toLuminosity();
-			var hex = ( lum >= 0.5 ) ? '000000' : 'ffffff';
-			return new Color( hex );
-		},
-
-		getReadableContrastingColor: function( bgColor, minContrast ) {
-			if ( ! bgColor instanceof Color ) {
-				return this;
-			}
-
-			// you shouldn't use less than 5, but you might want to.
-			var targetContrast = ( minContrast === undef ) ? 5 : minContrast;
-			// working things
-			var contrast = bgColor.getDistanceLuminosityFrom( this );
-			var maxContrastColor = bgColor.getMaxContrastColor();
-			var maxContrast = maxContrastColor.getDistanceLuminosityFrom( bgColor );
-
-			// if current max contrast is less than the target contrast, we had wishful thinking.
-			// still, go max
-			if ( maxContrast <= targetContrast ) {
-				return maxContrastColor;
-			}
-			// or, we might already have sufficient contrast
-			else if ( contrast >= targetContrast ) {
-				return this;
-			}
-
-			var incr = ( 0 === maxContrastColor.toInt() ) ? -1 : 1;
-			while ( contrast < targetContrast ) {
-				this.l( incr, true ); // 2nd arg turns this into an incrementer
-				contrast = this.getDistanceLuminosityFrom( bgColor );
-				// infininite loop prevention: you never know.
-				if ( this._color === 0 || this._color === 16777215 ) {
-					break;
-				}
-			}
-
-			return this;
-
-		},
-
-		a: function( val ) {
-			if ( val === undef )
-				return this._alpha;
-
-			var a = parseFloat( val );
-
-			if ( isNaN( a ) )
-				return this._error();
-
-			this._alpha = a;
-			return this;
-		},
-
-		// TRANSFORMS
-
-		darken: function( amount ) {
-			amount = amount || 5;
-			return this.l( - amount, true );
-		},
-
-		lighten: function( amount ) {
-			amount = amount || 5;
-			return this.l( amount, true );
-		},
-
-		saturate: function( amount ) {
-			amount = amount || 15;
-			return this.s( amount, true );
-		},
-
-		desaturate: function( amount ) {
-			amount = amount || 15;
-			return this.s( - amount, true );
-		},
-
-		toGrayscale: function() {
-			return this.setHSpace('hsl').s( 0 );
-		},
-
-		getComplement: function() {
-			return this.h( 180, true );
-		},
-
-		getSplitComplement: function( step ) {
-			step = step || 1;
-			var incr = 180 + ( step * 30 );
-			return this.h( incr, true );
-		},
-
-		getAnalog: function( step ) {
-			step = step || 1;
-			var incr = step * 30;
-			return this.h( incr, true );
-		},
-
-		getTetrad: function( step ) {
-			step = step || 1;
-			var incr = step * 60;
-			return this.h( incr, true );
-		},
-
-		getTriad: function( step ) {
-			step = step || 1;
-			var incr = step * 120;
-			return this.h( incr, true );
-		},
-
-		_partial: function( key ) {
-			var prop = shortProps[key];
-			return function( val, incr ) {
-				var color = this._spaceFunc('to', prop.space);
-
-				// GETTER
-				if ( val === undef )
-					return color[key];
-
-				// INCREMENT
-				if ( incr === true )
-					val = color[key] + val;
-
-				// MOD & RANGE
-				if ( prop.mod )
-					val = val % prop.mod;
-				if ( prop.range )
-					val = ( val < prop.range[0] ) ? prop.range[0] : ( val > prop.range[1] ) ? prop.range[1] : val;
-
-				// NEW VALUE
-				color[key] = val;
-
-				return this._spaceFunc('from', prop.space, color);
-			};
-		},
-
-		_spaceFunc: function( dir, s, val ) {
-			var space = s || this._hSpace,
-				funcName = dir + space.charAt(0).toUpperCase() + space.substr(1);
-			return this[funcName](val);
-		}
-	};
-
-	var shortProps = {
-		h: {
-			mod: 360
-		},
-		s: {
-			range: [0,100]
-		},
-		l: {
-			space: 'hsl',
-			range: [0,100]
-		},
-		v: {
-			space: 'hsv',
-			range: [0,100]
-		},
-		r: {
-			space: 'rgb',
-			range: [0,255]
-		},
-		g: {
-			space: 'rgb',
-			range: [0,255]
-		},
-		b: {
-			space: 'rgb',
-			range: [0,255]
-		}
-	};
-
-	for ( var key in shortProps ) {
-		if ( shortProps.hasOwnProperty( key ) )
-			Color.fn[key] = Color.fn._partial(key);
-	}
-
-	// play nicely with Node + browser
-	if ( typeof exports === 'object' )
-		module.exports = Color;
-	else
-		global.Color = Color;
-
-}(this));
diff --git a/lib/plugins/styler/lang/en/intro.txt b/lib/plugins/styler/lang/en/intro.txt
deleted file mode 100644
index 4ea55172f..000000000
--- a/lib/plugins/styler/lang/en/intro.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This tool allows you to change certain style settings of your currently selected template.
-All changes are stored in a local configuration file and are upgrade safe.
\ No newline at end of file
diff --git a/lib/plugins/styler/lang/en/lang.php b/lib/plugins/styler/lang/en/lang.php
deleted file mode 100644
index 1bf8efa2c..000000000
--- a/lib/plugins/styler/lang/en/lang.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * English language file for styler plugin
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-
-// menu entry for admin plugins
-$lang['js']['menu'] = 'Template Style Settings';
-
-// custom language strings for the plugin
-$lang['error'] = 'Sorry, this template does not support this functionality.';
-
-$lang['btn_preview'] = 'Preview your changes';
-$lang['btn_save']    = 'Save your changes';
-$lang['btn_reset']   = 'Reset your current changes';
-$lang['btn_revert']  = 'Revert all styles back to the template\'s default';
-
-// default guaranteed placeholders
-$lang['__text__']           = 'Main text color';
-$lang['__background__']     = 'Main text background color';
-$lang['__text_alt__']       = 'Alternative text color';
-$lang['__background_alt__'] = 'Alternative text background color';
-$lang['__text_neu__']       = 'Neutral text color';
-$lang['__background_neu__'] = 'Neutral text background color';
-$lang['__border__']         = 'Border color';
-$lang['__highlight__']      = 'Highlight color (for search results mainly)';
-
-
-
-
-//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/styler/plugin.info.txt b/lib/plugins/styler/plugin.info.txt
deleted file mode 100644
index 51f2f72f6..000000000
--- a/lib/plugins/styler/plugin.info.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-base   styler
-author Andreas Gohr
-email  andi@splitbrain.org
-date   2015-05-16
-name   styler plugin
-desc   Allows to edit style.ini replacements
-url    https://www.dokuwiki.org/plugin:styler
diff --git a/lib/plugins/styler/script.js b/lib/plugins/styler/script.js
deleted file mode 100644
index a4fb601c8..000000000
--- a/lib/plugins/styler/script.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* DOKUWIKI:include_once iris.js */
-
-jQuery(function () {
-    // user openend the admin page, set cookie and redirect
-    if (jQuery('#plugin__styler').length) {
-        DokuCookie.setValue('styler_plugin', 1);
-        document.location.href = document.location.href.replace(/do=admin/, '');
-    }
-
-    // continue only if the Styler Dialog is currently enabled
-    if (DokuCookie.getValue('styler_plugin') != 1) return;
-
-    var styler_timeout = null;
-
-    // create dialog element
-    var $dialog = jQuery(document.createElement('div'));
-    jQuery('body').append($dialog);
-
-
-    /**
-     * updates the current CSS with a new preview one
-     */
-    function styler_updateCSS() {
-        var now = new Date().getTime();
-        var $style = jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
-        $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
-    }
-
-    /**
-     * save current values and reload preview (debounced)
-     */
-    function styler_saveAndUpdate() {
-        if (styler_timeout) window.clearTimeout(styler_timeout);
-        styler_timeout = window.setTimeout(function () {
-            styler_timeout = null;
-
-            var params = $dialog.find('input[type=text]').serializeArray();
-            params[params.length] = { name: 'call', value: 'plugin_styler'};
-            params[params.length] = {name: 'run', value: 'preview'};
-
-            jQuery.post(
-                    DOKU_BASE + '/lib/exe/ajax.php',
-                params,
-                styler_updateCSS
-            );
-        }, 500);
-    }
-
-    // load the dialog content and apply listeners
-    $dialog.load(
-            DOKU_BASE + '/lib/exe/ajax.php',
-        {
-            'call': 'plugin_styler',
-            'run':  'html',
-            'id':   JSINFO.id
-        },
-        function () {
-            // load the preview template
-            styler_updateCSS();
-
-            // open the dialog
-            $dialog.dialog({
-                'title':    LANG.plugins.styler.menu,
-                'width':    500,
-                'height':   500,
-                'top':      50,
-                'position': { 'my': 'left bottom', 'at': 'left bottom', 'of': window },
-                // bring everything back to normal
-                'close':    function (event, ui) {
-                    // disable the styler plugin again
-                    DokuCookie.setValue('styler_plugin', 0);
-                    // reload
-                    document.location.reload()
-                }
-            });
-
-            // we don't need the manual preview in JS mode
-            $dialog.find('.btn_preview').hide();
-
-            // add the color picker  FIXME add saveAndUpdate to correct event
-            $dialog.find('.color').iris({ });
-
-            // listen to keyup events
-            $dialog.find('input[type=text]').keyup(function () {
-                console.log('change');
-                styler_saveAndUpdate();
-            });
-
-        }
-    );
-
-});
\ No newline at end of file
diff --git a/lib/plugins/styling/.travis.yml b/lib/plugins/styling/.travis.yml
new file mode 100644
index 000000000..75ee0b152
--- /dev/null
+++ b/lib/plugins/styling/.travis.yml
@@ -0,0 +1,13 @@
+# Config file for travis-ci.org
+
+language: php
+php:
+  - "5.5"
+  - "5.4"
+  - "5.3"
+env:
+  - DOKUWIKI=master
+  - DOKUWIKI=stable
+before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
+install: sh travis.sh
+script: cd _test && phpunit --stderr --group plugin_styling
diff --git a/lib/plugins/styling/README b/lib/plugins/styling/README
new file mode 100644
index 000000000..a1a5e890c
--- /dev/null
+++ b/lib/plugins/styling/README
@@ -0,0 +1,27 @@
+styling Plugin for DokuWiki
+
+Allows to edit style.ini replacements
+
+All documentation for this plugin can be found at
+https://www.dokuwiki.org/plugin:styling
+
+If you install this plugin manually, make sure it is installed in
+lib/plugins/styling/ - if the folder is called different it
+will not work!
+
+Please refer to http://www.dokuwiki.org/plugins for additional info
+on how to install plugins in DokuWiki.
+
+----
+Copyright (C) Andreas Gohr <andi@splitbrain.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+See the COPYING file in your DokuWiki folder for details
diff --git a/lib/plugins/styling/_test/general.test.php b/lib/plugins/styling/_test/general.test.php
new file mode 100644
index 000000000..1337f6f75
--- /dev/null
+++ b/lib/plugins/styling/_test/general.test.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * General tests for the styling plugin
+ *
+ * @group plugin_styling
+ * @group plugins
+ */
+class general_plugin_styling_test extends DokuWikiTest {
+
+    /**
+     * Simple test to make sure the plugin.info.txt is in correct format
+     */
+    public function test_plugininfo() {
+        $file = __DIR__.'/../plugin.info.txt';
+        $this->assertFileExists($file);
+
+        $info = confToHash($file);
+
+        $this->assertArrayHasKey('base', $info);
+        $this->assertArrayHasKey('author', $info);
+        $this->assertArrayHasKey('email', $info);
+        $this->assertArrayHasKey('date', $info);
+        $this->assertArrayHasKey('name', $info);
+        $this->assertArrayHasKey('desc', $info);
+        $this->assertArrayHasKey('url', $info);
+
+        $this->assertEquals('styling', $info['base']);
+        $this->assertRegExp('/^https?:\/\//', $info['url']);
+        $this->assertTrue(mail_isvalid($info['email']));
+        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+        $this->assertTrue(false !== strtotime($info['date']));
+    }
+}
diff --git a/lib/plugins/styling/action.php b/lib/plugins/styling/action.php
new file mode 100644
index 000000000..622c634d6
--- /dev/null
+++ b/lib/plugins/styling/action.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * DokuWiki Plugin styling (Action Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class action_plugin_styling
+ *
+ * This handles all the save actions and loading the interface
+ *
+ * All this usually would be done within an admin plugin, but we want to have this available outside
+ * the admin interface using our floating dialog.
+ */
+class action_plugin_styling extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback functions
+     *
+     * @param Doku_Event_Handler $controller DokuWiki's event controller object
+     * @return void
+     */
+    public function register(Doku_Event_Handler $controller) {
+        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
+        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
+        $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_header');
+    }
+
+    /**
+     * Adds the preview parameter to the stylesheet loading in non-js mode
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
+     *                           handler was registered]
+     * @return void
+     */
+    public function handle_header(Doku_Event &$event, $param) {
+        global $ACT;
+        global $INPUT;
+        if($ACT != 'admin' || $INPUT->str('page') != 'styling') return;
+        if(!auth_isadmin()) return;
+
+        // set preview
+        $len = count($event->data['link']);
+        for($i = 0; $i < $len; $i++) {
+            if(
+                $event->data['link'][$i]['rel'] == 'stylesheet' &&
+                strpos($event->data['link'][$i]['href'], 'lib/exe/css.php') !== false
+            ) {
+                $event->data['link'][$i]['href'] .= '&preview=1&tseed='.time();
+            }
+        }
+    }
+
+    /**
+     * Updates the style.ini settings by passing it on to handle() of the admin component
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
+     *                           handler was registered]
+     * @return void
+     */
+    public function handle_action(Doku_Event &$event, $param) {
+        if($event->data != 'styling_plugin') return;
+        if(!auth_isadmin()) return;
+        $event->data = 'show';
+
+        /** @var admin_plugin_styling $hlp */
+        $hlp = plugin_load('admin', 'styling');
+        $hlp->handle();
+    }
+
+    /**
+     * Create the style form in the floating Dialog
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
+     *                           handler was registered]
+     * @return void
+     */
+
+    public function handle_ajax(Doku_Event &$event, $param) {
+        if($event->data != 'plugin_styling') return;
+        if(!auth_isadmin()) return;
+        $event->preventDefault();
+        $event->stopPropagation();
+
+        global $ID;
+        global $INPUT;
+        $ID = getID();
+
+        /** @var admin_plugin_styling $hlp */
+        $hlp = plugin_load('admin', 'styling');
+        if($INPUT->str('run') == 'preview') {
+            $hlp->run_preview();
+        } else {
+            $hlp->form(true);
+        }
+    }
+
+}
+
+// vim:ts=4:sw=4:et:
diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
new file mode 100644
index 000000000..85d87dd71
--- /dev/null
+++ b/lib/plugins/styling/admin.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * DokuWiki Plugin styling (Admin Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+class admin_plugin_styling extends DokuWiki_Admin_Plugin {
+
+    /**
+     * @return int sort number in admin menu
+     */
+    public function getMenuSort() {
+        return 1000;
+    }
+
+    /**
+     * @return bool true if only access for superuser, false is for superusers and moderators
+     */
+    public function forAdminOnly() {
+        return true;
+    }
+
+    /**
+     * @param string $language
+     * @return string
+     */
+    public function getMenuText($language) {
+        $js = $this->getLang('js');
+        return $js['menu'];
+    }
+
+    /**
+     * handle the different actions (also called from ajax)
+     */
+    public function handle() {
+        global $INPUT;
+        $run = $INPUT->extract('run')->str('run');
+        if(!$run) return;
+        $run = "run_$run";
+        $this->$run();
+    }
+
+    /**
+     * Render HTML output, e.g. helpful text and a form
+     */
+    public function html() {
+        echo '<div id="plugin__styling">';
+        ptln('<h1>'.$this->getMenuText('').'</h1>');
+        $this->form(false);
+        echo '</div>';
+    }
+
+    /**
+     * Create the actual editing form
+     */
+    public function form($isajax) {
+        global $conf;
+        global $ID;
+        define('SIMPLE_TEST', 1); // hack, ideally certain functions should be moved out of css.php
+        require_once(DOKU_INC.'lib/exe/css.php');
+        $styleini     = css_styleini($conf['template'], true);
+        $replacements = $styleini['replacements'];
+
+        if($isajax) {
+            $target = wl($ID, array('do' => 'styling_plugin'));
+        } else {
+            $target = wl($ID, array('do' => 'admin', 'page' => 'styling'));
+        }
+
+        if(empty($replacements)) {
+            echo '<p class="error">'.$this->getLang('error').'</p>';
+        } else {
+            echo $this->locale_xhtml('intro');
+
+            echo '<form class="styling" method="post" action="'.$target.'">';
+
+            echo '<table>';
+            foreach($replacements as $key => $value) {
+                $name = tpl_getLang($key);
+                if(empty($name)) $name = $this->getLang($key);
+                if(empty($name)) $name = $key;
+
+                echo '<tr>';
+                echo '<td>'.$name.'</td>';
+                echo '<td><input type="text" name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
+                echo '</tr>';
+            }
+            echo '</table>';
+
+            echo '<p class="center">';
+            echo '<input type="submit" name="run[preview]" class="btn_preview" value="'.$this->getLang('btn_preview').'">';
+            echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'">'; #FIXME only if preview.ini exists
+            echo '</p>';
+
+            echo '<p class="center">';
+            echo '<input type="submit" name="run[save]" value="'.$this->getLang('btn_save').'">';
+            echo '</p>';
+
+            echo '<p class="center">';
+            echo '<input type="submit" name="run[revert]" value="'.$this->getLang('btn_revert').'">'; #FIXME only if local.ini exists
+            echo '</p>';
+
+            echo '</form>';
+
+            echo tpl_locale_xhtml('style');
+
+        }
+    }
+
+    /**
+     * set the color class attribute
+     */
+    protected function colorClass($key) {
+        static $colors = array(
+            'text',
+            'background',
+            'text_alt',
+            'background_alt',
+            'text_neu',
+            'background_neu',
+            'border',
+            'highlight',
+            'background_site',
+            'link',
+            'existing',
+            'missing',
+        );
+
+        if(preg_match('/colou?r/', $key) || in_array(trim($key,'_'), $colors)) {
+            return 'class="color"';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * saves the preview.ini (alos called from ajax directly)
+     */
+    public function run_preview() {
+        global $conf;
+        $ini = $conf['cachedir'].'/preview.ini';
+        io_saveFile($ini, $this->makeini());
+    }
+
+    /**
+     * deletes the preview.ini
+     */
+    protected function run_reset() {
+        global $conf;
+        $ini = $conf['cachedir'].'/preview.ini';
+        io_saveFile($ini, '');
+    }
+
+    /**
+     * deletes the local style.ini replacements
+     */
+    protected function run_revert() {
+        $this->replaceini('');
+        $this->run_reset();
+    }
+
+    /**
+     * save the local style.ini replacements
+     */
+    protected function run_save() {
+        $this->replaceini($this->makeini());
+        $this->run_reset();
+    }
+
+    /**
+     * create the replacement part of a style.ini from submitted data
+     *
+     * @return string
+     */
+    protected function makeini() {
+        global $INPUT;
+
+        $ini = "[replacements]\n";
+        $ini .= ";These overwrites have been generated from the Template styling Admin interface\n";
+        $ini .= ";Any values in this section will be overwritten by that tool again\n";
+        foreach($INPUT->arr('tpl') as $key => $val) {
+            $ini .= $key.' = "'.addslashes($val).'"'."\n";
+        }
+
+        return $ini;
+    }
+
+    /**
+     * replaces the replacement parts in the local ini
+     *
+     * @param string $new the new ini contents
+     */
+    protected function replaceini($new) {
+        global $conf;
+        $ini = DOKU_CONF."tpl/".$conf['template']."/style.ini";
+        if(file_exists($ini)) {
+            $old = io_readFile($ini);
+            $old = preg_replace('/\[replacements\]\n.*?(\n\[.*]|$)/s', '\\1', $old);
+            $old = trim($old);
+        } else {
+            $old = '';
+        }
+
+        io_makeFileDir($ini);
+        io_saveFile($ini, "$old\n\n$new");
+    }
+
+}
+
+// vim:ts=4:sw=4:et:
diff --git a/lib/plugins/styling/iris.js b/lib/plugins/styling/iris.js
new file mode 100644
index 000000000..4eda5022e
--- /dev/null
+++ b/lib/plugins/styling/iris.js
@@ -0,0 +1,1488 @@
+/*! Iris Color Picker - v1.0.7 - 2014-11-28
+* https://github.com/Automattic/Iris
+* Copyright (c) 2014 Matt Wiebe; Licensed GPLv2 */
+(function( $, undef ){
+	var _html, nonGradientIE, gradientType, vendorPrefixes, _css, Iris, UA, isIE, IEVersion;
+
+	_html = '<div class="iris-picker"><div class="iris-picker-inner"><div class="iris-square"><a class="iris-square-value" href="#"><span class="iris-square-handle ui-slider-handle"></span></a><div class="iris-square-inner iris-square-horiz"></div><div class="iris-square-inner iris-square-vert"></div></div><div class="iris-slider iris-strip"><div class="iris-slider-offset"></div></div></div></div>';
+	_css = '.iris-picker{display:block;position:relative}.iris-picker,.iris-picker *{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input+.iris-picker{margin-top:4px}.iris-error{background-color:#ffafaf}.iris-border{border-radius:3px;border:1px solid #aaa;width:200px;background-color:#fff}.iris-picker-inner{position:absolute;top:0;right:0;left:0;bottom:0}.iris-border .iris-picker-inner{top:10px;right:10px;left:10px;bottom:10px}.iris-picker .iris-square-inner{position:absolute;left:0;right:0;top:0;bottom:0}.iris-picker .iris-square,.iris-picker .iris-slider,.iris-picker .iris-square-inner,.iris-picker .iris-palette{border-radius:3px;box-shadow:inset 0 0 5px rgba(0,0,0,.4);height:100%;width:12.5%;float:left;margin-right:5%}.iris-picker .iris-square{width:76%;margin-right:10%;position:relative}.iris-picker .iris-square-inner{width:auto;margin:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-square-inner,.iris-ie-9 .iris-palette{box-shadow:none;border-radius:0}.iris-ie-9 .iris-square,.iris-ie-9 .iris-slider,.iris-ie-9 .iris-palette{outline:1px solid rgba(0,0,0,.1)}.iris-ie-lt9 .iris-square,.iris-ie-lt9 .iris-slider,.iris-ie-lt9 .iris-square-inner,.iris-ie-lt9 .iris-palette{outline:1px solid #aaa}.iris-ie-lt9 .iris-square .ui-slider-handle{outline:1px solid #aaa;background-color:#fff;-ms-filter:"alpha(Opacity=30)"}.iris-ie-lt9 .iris-square .iris-square-handle{background:0;border:3px solid #fff;-ms-filter:"alpha(Opacity=50)"}.iris-picker .iris-strip{margin-right:0;position:relative}.iris-picker .iris-strip .ui-slider-handle{position:absolute;background:0;margin:0;right:-3px;left:-3px;border:4px solid #aaa;border-width:4px 3px;width:auto;height:6px;border-radius:4px;box-shadow:0 1px 2px rgba(0,0,0,.2);opacity:.9;z-index:5;cursor:ns-resize}.iris-strip .ui-slider-handle:before{content:" ";position:absolute;left:-2px;right:-2px;top:-3px;bottom:-3px;border:2px solid #fff;border-radius:3px}.iris-picker .iris-slider-offset{position:absolute;top:11px;left:0;right:0;bottom:-3px;width:auto;height:auto;background:transparent;border:0;border-radius:0}.iris-picker .iris-square-handle{background:transparent;border:5px solid #aaa;border-radius:50%;border-color:rgba(128,128,128,.5);box-shadow:none;width:12px;height:12px;position:absolute;left:-10px;top:-10px;cursor:move;opacity:1;z-index:10}.iris-picker .ui-state-focus .iris-square-handle{opacity:.8}.iris-picker .iris-square-handle:hover{border-color:#999}.iris-picker .iris-square-value:focus .iris-square-handle{box-shadow:0 0 2px rgba(0,0,0,.75);opacity:.8}.iris-picker .iris-square-handle:hover::after{border-color:#fff}.iris-picker .iris-square-handle::after{position:absolute;bottom:-4px;right:-4px;left:-4px;top:-4px;border:3px solid #f9f9f9;border-color:rgba(255,255,255,.8);border-radius:50%;content:" "}.iris-picker .iris-square-value{width:8px;height:8px;position:absolute}.iris-ie-lt9 .iris-square-value,.iris-mozilla .iris-square-value{width:1px;height:1px}.iris-palette-container{position:absolute;bottom:0;left:0;margin:0;padding:0}.iris-border .iris-palette-container{left:10px;bottom:10px}.iris-picker .iris-palette{margin:0;cursor:pointer}.iris-square-handle,.ui-slider-handle{border:0;outline:0}';
+
+	// Even IE9 dosen't support gradients. Elaborate sigh.
+	UA = navigator.userAgent.toLowerCase();
+	isIE = navigator.appName === 'Microsoft Internet Explorer';
+	IEVersion = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[\.0-9]{0,})/ )[1] ) : 0;
+	nonGradientIE = ( isIE && IEVersion < 10 );
+	gradientType = false;
+
+	// we don't bother with an unprefixed version, as it has a different syntax
+	vendorPrefixes = [ '-moz-', '-webkit-', '-o-', '-ms-' ];
+
+	// Bail for IE <= 7
+	if ( nonGradientIE && IEVersion <= 7 ) {
+		$.fn.iris = $.noop;
+		$.support.iris = false;
+		return;
+	}
+
+	$.support.iris = true;
+
+	function testGradientType() {
+		var el, base,
+			bgImageString = 'backgroundImage';
+
+		if ( nonGradientIE ) {
+			gradientType = 'filter';
+		}
+		else {
+			el = $( '<div id="iris-gradtest" />' );
+			base = 'linear-gradient(top,#fff,#000)';
+			$.each( vendorPrefixes, function( i, val ){
+				el.css( bgImageString, val + base );
+				if ( el.css( bgImageString ).match( 'gradient' ) ) {
+					gradientType = i;
+					return false;
+				}
+			});
+			// check for legacy webkit gradient syntax
+			if ( gradientType === false ) {
+				el.css( 'background', '-webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#000))' );
+				if ( el.css( bgImageString ).match( 'gradient' ) ) {
+					gradientType = 'webkit';
+				}
+			}
+			el.remove();
+		}
+
+	}
+
+	/**
+	* Only for CSS3 gradients. oldIE will use a separate function.
+	*
+	* Accepts as many color stops as necessary from 2nd arg on, or 2nd
+	* arg can be an array of color stops
+	*
+	* @param  {string} origin Gradient origin - top or left, defaults to left.
+	* @return {string}        Appropriate CSS3 gradient string for use in
+	*/
+	function createGradient( origin, stops ) {
+		origin = ( origin === 'top' ) ? 'top' : 'left';
+		stops = $.isArray( stops ) ? stops : Array.prototype.slice.call( arguments, 1 );
+		if ( gradientType === 'webkit' ) {
+			return legacyWebkitGradient( origin, stops );
+		} else {
+			return vendorPrefixes[ gradientType ] + 'linear-gradient(' + origin + ', ' + stops.join(', ') + ')';
+		}
+	}
+
+	/**
+	* Stupid gradients for a stupid browser.
+	*/
+	function stupidIEGradient( origin, stops ) {
+		var type, self, lastIndex, filter, startPosProp, endPosProp, dimensionProp, template, html;
+
+		origin = ( origin === 'top' ) ? 'top' : 'left';
+		stops = $.isArray( stops ) ? stops : Array.prototype.slice.call( arguments, 1 );
+		// 8 hex: AARRGGBB
+		// GradientType: 0 vertical, 1 horizontal
+		type = ( origin === 'top' ) ? 0 : 1;
+		self = $( this );
+		lastIndex = stops.length - 1;
+		filter = 'filter';
+		startPosProp = ( type === 1 ) ? 'left' : 'top';
+		endPosProp = ( type === 1 ) ? 'right' : 'bottom';
+		dimensionProp = ( type === 1 ) ? 'height' : 'width';
+		template = '<div class="iris-ie-gradient-shim" style="position:absolute;' + dimensionProp + ':100%;' + startPosProp + ':%start%;' + endPosProp + ':%end%;' + filter + ':%filter%;" data-color:"%color%"></div>';
+		html = '';
+		// need a positioning context
+		if ( self.css('position') === 'static' ) {
+			self.css( {position: 'relative' } );
+		}
+
+		stops = fillColorStops( stops );
+		$.each(stops, function( i, startColor ) {
+			var endColor, endStop, filterVal;
+
+			// we want two at a time. if we're on the last pair, bail.
+			if ( i === lastIndex ) {
+				return false;
+			}
+
+			endColor = stops[ i + 1 ];
+			//if our pairs are at the same color stop, moving along.
+			if ( startColor.stop === endColor.stop ) {
+				return;
+			}
+
+			endStop = 100 - parseFloat( endColor.stop ) + '%';
+			startColor.octoHex = new Color( startColor.color ).toIEOctoHex();
+			endColor.octoHex = new Color( endColor.color ).toIEOctoHex();
+
+			filterVal = 'progid:DXImageTransform.Microsoft.Gradient(GradientType=' + type + ', StartColorStr=\'' + startColor.octoHex + '\', EndColorStr=\'' + endColor.octoHex + '\')';
+			html += template.replace( '%start%', startColor.stop ).replace( '%end%', endStop ).replace( '%filter%', filterVal );
+		});
+		self.find( '.iris-ie-gradient-shim' ).remove();
+		$( html ).prependTo( self );
+	}
+
+	function legacyWebkitGradient( origin, colorList ) {
+		var stops = [];
+		origin = ( origin === 'top' ) ? '0% 0%,0% 100%,' : '0% 100%,100% 100%,';
+		colorList = fillColorStops( colorList );
+		$.each( colorList, function( i, val ){
+			stops.push( 'color-stop(' + ( parseFloat( val.stop ) / 100 ) + ', ' + val.color + ')' );
+		});
+		return '-webkit-gradient(linear,' + origin + stops.join(',') + ')';
+	}
+
+	function fillColorStops( colorList ) {
+		var colors = [],
+			percs = [],
+			newColorList = [],
+			lastIndex = colorList.length - 1;
+
+		$.each( colorList, function( index, val ) {
+			var color = val,
+				perc = false,
+				match = val.match( /1?[0-9]{1,2}%$/ );
+
+			if ( match ) {
+				color = val.replace( /\s?1?[0-9]{1,2}%$/, '' );
+				perc = match.shift();
+			}
+			colors.push( color );
+			percs.push( perc );
+		});
+
+		// back fill first and last
+		if ( percs[0] === false ) {
+			percs[0] = '0%';
+		}
+
+		if ( percs[lastIndex] === false ) {
+			percs[lastIndex] = '100%';
+		}
+
+		percs = backFillColorStops( percs );
+
+		$.each( percs, function( i ){
+			newColorList[i] = { color: colors[i], stop: percs[i] };
+		});
+		return newColorList;
+	}
+
+	function backFillColorStops( stops ) {
+		var first = 0,
+			last = stops.length - 1,
+			i = 0,
+			foundFirst = false,
+			incr,
+			steps,
+			step,
+			firstVal;
+
+		if ( stops.length <= 2 || $.inArray( false, stops ) < 0 ) {
+			return stops;
+		}
+		while ( i < stops.length - 1 ) {
+			if ( ! foundFirst && stops[i] === false ) {
+				first = i - 1;
+				foundFirst = true;
+			} else if ( foundFirst && stops[i] !== false ) {
+				last = i;
+				i = stops.length;
+			}
+			i++;
+		}
+		steps = last - first;
+		firstVal = parseInt( stops[first].replace('%'), 10 );
+		incr = ( parseFloat( stops[last].replace('%') ) - firstVal ) / steps;
+		i = first + 1;
+		step = 1;
+		while ( i < last ) {
+			stops[i] = ( firstVal + ( step * incr ) ) + '%';
+			step++;
+			i++;
+		}
+		return backFillColorStops( stops );
+	}
+
+	$.fn.gradient = function() {
+		var args = arguments;
+		return this.each( function() {
+			// this'll be oldishIE
+			if ( nonGradientIE ) {
+				stupidIEGradient.apply( this, args );
+			} else {
+				// new hotness
+				$( this ).css( 'backgroundImage', createGradient.apply( this, args ) );
+			}
+		});
+	};
+
+	$.fn.raninbowGradient = function( origin, args ) {
+		var opts, template, i, steps;
+
+		origin = origin || 'top';
+		opts = $.extend( {}, { s: 100, l: 50 }, args );
+		template = 'hsl(%h%,' + opts.s + '%,' + opts.l + '%)';
+		i = 0;
+		steps = [];
+		while ( i <= 360 ) {
+			steps.push( template.replace('%h%', i) );
+			i += 30;
+		}
+		return this.each(function() {
+			$(this).gradient( origin, steps );
+		});
+	};
+
+	// the colorpicker widget def.
+	Iris = {
+		options: {
+			color: false,
+			mode: 'hsl',
+			controls: {
+				horiz: 's', // horizontal defaults to saturation
+				vert: 'l', // vertical defaults to lightness
+				strip: 'h' // right strip defaults to hue
+			},
+			hide: true, // hide the color picker by default
+			border: true, // draw a border around the collection of UI elements
+			target: false, // a DOM element / jQuery selector that the element will be appended within. Only used when called on an input.
+			width: 200, // the width of the collection of UI elements
+			palettes: false // show a palette of basic colors beneath the square.
+		},
+		_color: '',
+		_palettes: [ '#000', '#fff', '#d33', '#d93', '#ee2', '#81d742', '#1e73be', '#8224e3' ],
+		_inited: false,
+		_defaultHSLControls: {
+			horiz: 's',
+			vert: 'l',
+			strip: 'h'
+		},
+		_defaultHSVControls: {
+			horiz: 'h',
+			vert: 'v',
+			strip: 's'
+		},
+		_scale: {
+			h: 360,
+			s: 100,
+			l: 100,
+			v: 100
+		},
+		_create: function() {
+			var self = this,
+				el = self.element,
+				color = self.options.color || el.val();
+
+			if ( gradientType === false ) {
+				testGradientType();
+			}
+
+			if ( el.is( 'input' ) ) {
+				if ( self.options.target ) {
+					self.picker = $( _html ).appendTo( self.options.target );
+				} else {
+					self.picker = $( _html ).insertAfter( el );
+				}
+
+				self._addInputListeners( el );
+			} else {
+				el.append( _html );
+				self.picker = el.find( '.iris-picker' );
+			}
+
+			// Browsers / Versions
+			// Feature detection doesn't work for these, and $.browser is deprecated
+			if ( isIE ) {
+				if ( IEVersion === 9 ) {
+					self.picker.addClass( 'iris-ie-9' );
+				} else if ( IEVersion <= 8 ) {
+					self.picker.addClass( 'iris-ie-lt9' );
+				}
+			} else if ( UA.indexOf('compatible') < 0 && UA.indexOf('khtml') < 0 && UA.match( /mozilla/ ) ) {
+				self.picker.addClass( 'iris-mozilla' );
+			}
+
+			if ( self.options.palettes ) {
+				self._addPalettes();
+			}
+
+			self._color = new Color( color ).setHSpace( self.options.mode );
+			self.options.color = self._color.toString();
+
+			// prep 'em for re-use
+			self.controls = {
+				square:      self.picker.find( '.iris-square' ),
+				squareDrag:  self.picker.find( '.iris-square-value' ),
+				horiz:       self.picker.find( '.iris-square-horiz' ),
+				vert:        self.picker.find( '.iris-square-vert' ),
+				strip:       self.picker.find( '.iris-strip' ),
+				stripSlider: self.picker.find( '.iris-strip .iris-slider-offset' )
+			};
+
+			// small sanity check - if we chose hsv, change default controls away from hsl
+			if ( self.options.mode === 'hsv' && self._has('l', self.options.controls) ) {
+				self.options.controls = self._defaultHSVControls;
+			} else if ( self.options.mode === 'hsl' && self._has('v', self.options.controls) ) {
+				self.options.controls = self._defaultHSLControls;
+			}
+
+			// store it. HSL gets squirrely
+			self.hue = self._color.h();
+
+			if ( self.options.hide ) {
+				self.picker.hide();
+			}
+
+			if ( self.options.border ) {
+				self.picker.addClass( 'iris-border' );
+			}
+
+			self._initControls();
+			self.active = 'external';
+			self._dimensions();
+			self._change();
+		},
+		_has: function(needle, haystack) {
+			var ret = false;
+			$.each(haystack, function(i,v){
+				if ( needle === v ) {
+					ret = true;
+					// exit the loop
+					return false;
+				}
+			});
+			return ret;
+		},
+		_addPalettes: function () {
+			var container = $( '<div class="iris-palette-container" />' ),
+				palette = $( '<a class="iris-palette" tabindex="0" />' ),
+				colors = $.isArray( this.options.palettes ) ? this.options.palettes : this._palettes;
+
+			// do we have an existing container? Empty and reuse it.
+			if ( this.picker.find( '.iris-palette-container' ).length ) {
+				container = this.picker.find( '.iris-palette-container' ).detach().html( '' );
+			}
+
+			$.each(colors, function(index, val) {
+				palette.clone().data( 'color', val )
+					.css( 'backgroundColor', val ).appendTo( container )
+					.height( 10 ).width( 10 );
+			});
+
+			this.picker.append(container);
+		},
+		_paint: function() {
+			var self = this;
+			self._paintDimension( 'top', 'strip' );
+			self._paintDimension( 'top', 'vert' );
+			self._paintDimension( 'left', 'horiz' );
+		},
+		_paintDimension: function( origin, control ) {
+			var self = this,
+				c = self._color,
+				mode = self.options.mode,
+				color = self._getHSpaceColor(),
+				target = self.controls[ control ],
+				controlOpts = self.options.controls,
+				stops;
+
+			// don't paint the active control
+			if ( control === self.active || ( self.active === 'square' && control !== 'strip' ) ) {
+				return;
+			}
+
+			switch ( controlOpts[ control ] ) {
+				case 'h':
+					if ( mode === 'hsv' ) {
+						color = c.clone();
+						switch ( control ) {
+							case 'horiz':
+								color[controlOpts.vert](100);
+								break;
+							case 'vert':
+								color[controlOpts.horiz](100);
+								break;
+							case 'strip':
+								color.setHSpace('hsl');
+								break;
+						}
+						stops = color.toHsl();
+					} else {
+						if ( control === 'strip' ) {
+							stops = { s: color.s, l: color.l };
+						} else {
+							stops = { s: 100, l: color.l };
+						}
+					}
+
+					target.raninbowGradient( origin, stops );
+					break;
+				case 's':
+					if ( mode === 'hsv' ) {
+						if ( control === 'vert' ) {
+							stops = [ c.clone().a(0).s(0).toCSS('rgba'), c.clone().a(1).s(0).toCSS('rgba') ];
+						} else if ( control === 'strip' ) {
+							stops = [ c.clone().s(100).toCSS('hsl'), c.clone().s(0).toCSS('hsl') ];
+						} else if ( control === 'horiz' ) {
+							stops = [ '#fff', 'hsl(' + color.h + ',100%,50%)' ];
+						}
+					} else { // implicit mode === 'hsl'
+						if ( control === 'vert' && self.options.controls.horiz === 'h' ) {
+							stops = ['hsla(0, 0%, ' + color.l + '%, 0)', 'hsla(0, 0%, ' + color.l + '%, 1)'];
+						} else {
+							stops = ['hsl('+ color.h +',0%,50%)', 'hsl(' + color.h + ',100%,50%)'];
+						}
+					}
+
+
+					target.gradient( origin, stops );
+					break;
+				case 'l':
+					if ( control === 'strip' ) {
+						stops = ['hsl(' + color.h + ',100%,100%)', 'hsl(' + color.h + ', ' + color.s + '%,50%)', 'hsl('+ color.h +',100%,0%)'];
+					} else {
+						stops = ['#fff', 'rgba(255,255,255,0) 50%', 'rgba(0,0,0,0) 50%', 'rgba(0,0,0,1)'];
+					}
+					target.gradient( origin, stops );
+					break;
+				case 'v':
+						if ( control === 'strip' ) {
+							stops = [ c.clone().v(100).toCSS(), c.clone().v(0).toCSS() ];
+						} else {
+							stops = ['rgba(0,0,0,0)', '#000'];
+						}
+						target.gradient( origin, stops );
+					break;
+				default:
+					break;
+			}
+		},
+
+		_getHSpaceColor: function() {
+			return ( this.options.mode === 'hsv' ) ? this._color.toHsv() : this._color.toHsl();
+		},
+
+		_dimensions: function( reset ) {
+			// whatever size
+			var self = this,
+				opts = self.options,
+				controls = self.controls,
+				square = controls.square,
+				strip = self.picker.find( '.iris-strip' ),
+				squareWidth = '77.5%',
+				stripWidth = '12%',
+				totalPadding = 20,
+				innerWidth = opts.border ? opts.width - totalPadding : opts.width,
+				controlsHeight,
+				paletteCount = $.isArray( opts.palettes ) ? opts.palettes.length : self._palettes.length,
+				paletteMargin, paletteWidth, paletteContainerWidth;
+
+			if ( reset ) {
+				square.css( 'width', '' );
+				strip.css( 'width', '' );
+				self.picker.css( {width: '', height: ''} );
+			}
+
+			squareWidth = innerWidth * ( parseFloat( squareWidth ) / 100 );
+			stripWidth = innerWidth * ( parseFloat( stripWidth ) / 100 );
+			controlsHeight = opts.border ? squareWidth + totalPadding : squareWidth;
+
+			square.width( squareWidth ).height( squareWidth );
+			strip.height( squareWidth ).width( stripWidth );
+			self.picker.css( { width: opts.width, height: controlsHeight } );
+
+			if ( ! opts.palettes ) {
+				return self.picker.css( 'paddingBottom', '' );
+			}
+
+			// single margin at 2%
+			paletteMargin = squareWidth * 2 / 100;
+			paletteContainerWidth = squareWidth - ( ( paletteCount - 1 ) * paletteMargin );
+			paletteWidth = paletteContainerWidth / paletteCount;
+			self.picker.find('.iris-palette').each( function( i ) {
+				var margin = i === 0 ? 0 : paletteMargin;
+				$( this ).css({
+					width: paletteWidth,
+					height: paletteWidth,
+					marginLeft: margin
+				});
+			});
+			self.picker.css( 'paddingBottom', paletteWidth + paletteMargin );
+			strip.height( paletteWidth + paletteMargin + squareWidth );
+		},
+
+		_addInputListeners: function( input ) {
+			var self = this,
+				debounceTimeout = 100,
+				callback = function( event ){
+					var color = new Color( input.val() ),
+						val = input.val().replace( /^#/, '' );
+
+					input.removeClass( 'iris-error' );
+					// we gave a bad color
+					if ( color.error ) {
+						// don't error on an empty input - we want those allowed
+						if ( val !== '' ) {
+							input.addClass( 'iris-error' );
+						}
+					} else {
+						if ( color.toString() !== self._color.toString() ) {
+							// let's not do this on keyup for hex shortcodes
+							if ( ! ( event.type === 'keyup' && val.match( /^[0-9a-fA-F]{3}$/ ) ) ) {
+								self._setOption( 'color', color.toString() );
+							}
+						}
+					}
+				};
+
+			input.on( 'change', callback ).on( 'keyup', self._debounce( callback, debounceTimeout ) );
+
+			// If we initialized hidden, show on first focus. The rest is up to you.
+			if ( self.options.hide ) {
+				input.one( 'focus', function() {
+					self.show();
+				});
+			}
+		},
+
+		_initControls: function() {
+			var self = this,
+				controls = self.controls,
+				square = controls.square,
+				controlOpts = self.options.controls,
+				stripScale = self._scale[controlOpts.strip];
+
+			controls.stripSlider.slider({
+				orientation: 'vertical',
+				max: stripScale,
+				slide: function( event, ui ) {
+					self.active = 'strip';
+					// "reverse" for hue.
+					if ( controlOpts.strip === 'h' ) {
+						ui.value = stripScale - ui.value;
+					}
+
+					self._color[controlOpts.strip]( ui.value );
+					self._change.apply( self, arguments );
+				}
+			});
+
+			controls.squareDrag.draggable({
+				containment: controls.square.find( '.iris-square-inner' ),
+				zIndex: 1000,
+				cursor: 'move',
+				drag: function( event, ui ) {
+					self._squareDrag( event, ui );
+				},
+				start: function() {
+					square.addClass( 'iris-dragging' );
+					$(this).addClass( 'ui-state-focus' );
+				},
+				stop: function() {
+					square.removeClass( 'iris-dragging' );
+					$(this).removeClass( 'ui-state-focus' );
+				}
+			}).on( 'mousedown mouseup', function( event ) {
+				var focusClass = 'ui-state-focus';
+				event.preventDefault();
+				if (event.type === 'mousedown' ) {
+					self.picker.find( '.' + focusClass ).removeClass( focusClass ).blur();
+					$(this).addClass( focusClass ).focus();
+				} else {
+					$(this).removeClass( focusClass );
+				}
+			}).on( 'keydown', function( event ) {
+				var container = controls.square,
+					draggable = controls.squareDrag,
+					position = draggable.position(),
+					distance = self.options.width / 100; // Distance in pixels the draggable should be moved: 1 "stop"
+
+				// make alt key go "10"
+				if ( event.altKey ) {
+					distance *= 10;
+				}
+
+				// Reposition if one of the directional keys is pressed
+				switch ( event.keyCode ) {
+					case 37: position.left -= distance; break; // Left
+					case 38: position.top  -= distance; break; // Up
+					case 39: position.left += distance; break; // Right
+					case 40: position.top  += distance; break; // Down
+					default: return true; // Exit and bubble
+				}
+
+				// Keep draggable within container
+				position.left = Math.max( 0, Math.min( position.left, container.width() ) );
+				position.top =  Math.max( 0, Math.min( position.top, container.height() ) );
+
+				draggable.css(position);
+				self._squareDrag( event, { position: position });
+				event.preventDefault();
+			});
+
+			// allow clicking on the square to move there and keep dragging
+			square.mousedown( function( event ) {
+				var squareOffset, pos;
+				// only left click
+				if ( event.which !== 1 ) {
+					return;
+				}
+
+				// prevent bubbling from the handle: no infinite loops
+				if ( ! $( event.target ).is( 'div' ) ) {
+					return;
+				}
+
+				squareOffset = self.controls.square.offset();
+				pos = {
+						top: event.pageY - squareOffset.top,
+						left: event.pageX - squareOffset.left
+				};
+				event.preventDefault();
+				self._squareDrag( event, { position: pos } );
+				event.target = self.controls.squareDrag.get(0);
+				self.controls.squareDrag.css( pos ).trigger( event );
+			});
+
+			// palettes
+			if ( self.options.palettes ) {
+				self._paletteListeners();
+			}
+		},
+
+		_paletteListeners: function() {
+			var self = this;
+			self.picker.find('.iris-palette-container').on('click.palette', '.iris-palette', function() {
+				self._color.fromCSS( $(this).data('color') );
+				self.active = 'external';
+				self._change();
+			}).on( 'keydown.palette', '.iris-palette', function( event ) {
+				if ( ! ( event.keyCode === 13 || event.keyCode === 32 ) ) {
+					return true;
+				}
+				event.stopPropagation();
+				$( this ).click();
+			});
+		},
+
+		_squareDrag: function( event, ui ) {
+			var self = this,
+				controlOpts = self.options.controls,
+				dimensions = self._squareDimensions(),
+				vertVal = Math.round( ( dimensions.h - ui.position.top ) / dimensions.h * self._scale[controlOpts.vert] ),
+				horizVal = self._scale[controlOpts.horiz] - Math.round( ( dimensions.w - ui.position.left ) / dimensions.w * self._scale[controlOpts.horiz] );
+
+			self._color[controlOpts.horiz]( horizVal )[controlOpts.vert]( vertVal );
+
+			self.active = 'square';
+			self._change.apply( self, arguments );
+		},
+
+		_setOption: function( key, value ) {
+			var self = this,
+				oldValue = self.options[key],
+				doDimensions = false,
+				hexLessColor,
+				newColor,
+				method;
+
+			// ensure the new value is set. We can reset to oldValue if some check wasn't met.
+			self.options[key] = value;
+
+			switch(key) {
+				case 'color':
+					// cast to string in case we have a number
+					value = '' + value;
+					hexLessColor = value.replace( /^#/, '' );
+					newColor = new Color( value ).setHSpace( self.options.mode );
+					if ( newColor.error ) {
+						self.options[key] = oldValue;
+					} else {
+						self._color = newColor;
+						self.options.color = self.options[key] = self._color.toString();
+						self.active = 'external';
+						self._change();
+					}
+					break;
+				case 'palettes':
+					doDimensions = true;
+
+					if ( value ) {
+						self._addPalettes();
+					} else {
+						self.picker.find('.iris-palette-container').remove();
+					}
+
+					// do we need to add events?
+					if ( ! oldValue ) {
+						self._paletteListeners();
+					}
+					break;
+				case 'width':
+					doDimensions = true;
+					break;
+				case 'border':
+					doDimensions = true;
+					method = value ? 'addClass' : 'removeClass';
+					self.picker[method]('iris-border');
+					break;
+				case 'mode':
+				case 'controls':
+					// if nothing's changed, let's bail, since this causes re-rendering the whole widget
+					if ( oldValue === value ) {
+						return;
+					}
+
+					// we're using these poorly named variables because they're already scoped.
+					// method is the element that Iris was called on. oldValue will be the options
+					method = self.element;
+					oldValue = self.options;
+					oldValue.hide = ! self.picker.is( ':visible' );
+					self.destroy();
+					self.picker.remove();
+					return $(self.element).iris(oldValue);
+			}
+
+			// Do we need to recalc dimensions?
+			if ( doDimensions ) {
+				self._dimensions(true);
+			}
+		},
+
+		_squareDimensions: function( forceRefresh ) {
+			var square = this.controls.square,
+				dimensions,
+				control;
+
+			if ( forceRefresh !== undef && square.data('dimensions') ) {
+				return square.data('dimensions');
+			}
+
+			control = this.controls.squareDrag;
+			dimensions = {
+				w: square.width(),
+				h: square.height()
+			};
+			square.data( 'dimensions', dimensions );
+			return dimensions;
+		},
+
+		_isNonHueControl: function( active, type ) {
+			if ( active === 'square' && this.options.controls.strip === 'h' ) {
+				return true;
+			} else if ( type === 'external' || ( type === 'h' && active === 'strip' ) ) {
+				return false;
+			}
+
+			return true;
+		},
+
+		_change: function() {
+			var self = this,
+				controls = self.controls,
+				color = self._getHSpaceColor(),
+				actions = [ 'square', 'strip' ],
+				controlOpts = self.options.controls,
+				type = controlOpts[self.active] || 'external',
+				oldHue = self.hue;
+
+			if ( self.active === 'strip' ) {
+				// take no action on any of the square sliders if we adjusted the strip
+				actions = [];
+			} else if ( self.active !== 'external' ) {
+				// for non-strip, non-external, strip should never change
+				actions.pop(); // conveniently the last item
+			}
+
+			$.each( actions, function(index, item) {
+				var value, dimensions, cssObj;
+				if ( item !== self.active ) {
+					switch ( item ) {
+						case 'strip':
+							// reverse for hue
+							value = ( controlOpts.strip === 'h' ) ? self._scale[controlOpts.strip] - color[controlOpts.strip] : color[controlOpts.strip];
+							controls.stripSlider.slider( 'value', value );
+							break;
+						case 'square':
+							dimensions = self._squareDimensions();
+							cssObj = {
+								left: color[controlOpts.horiz] / self._scale[controlOpts.horiz] * dimensions.w,
+								top: dimensions.h - ( color[controlOpts.vert] / self._scale[controlOpts.vert] * dimensions.h )
+							};
+
+							self.controls.squareDrag.css( cssObj );
+							break;
+					}
+				}
+			});
+
+			// Ensure that we don't change hue if we triggered a hue reset
+			if ( color.h !== oldHue && self._isNonHueControl( self.active, type ) ) {
+				self._color.h(oldHue);
+			}
+
+			// store hue for repeating above check next time
+			self.hue = self._color.h();
+
+			self.options.color = self._color.toString();
+
+			// only run after the first time
+			if ( self._inited ) {
+				self._trigger( 'change', { type: self.active }, { color: self._color } );
+			}
+
+			if ( self.element.is( ':input' ) && ! self._color.error ) {
+				self.element.removeClass( 'iris-error' );
+				if ( self.element.val() !== self._color.toString() ) {
+					self.element.val( self._color.toString() );
+				}
+			}
+
+			self._paint();
+			self._inited = true;
+			self.active = false;
+		},
+		// taken from underscore.js _.debounce method
+		_debounce: function( func, wait, immediate ) {
+			var timeout, result;
+			return function() {
+				var context = this,
+					args = arguments,
+					later,
+					callNow;
+
+				later = function() {
+					timeout = null;
+					if ( ! immediate) {
+						result = func.apply( context, args );
+					}
+				};
+
+				callNow = immediate && !timeout;
+				clearTimeout( timeout );
+				timeout = setTimeout( later, wait );
+				if ( callNow ) {
+					result = func.apply( context, args );
+				}
+				return result;
+			};
+		},
+		show: function() {
+			this.picker.show();
+		},
+		hide: function() {
+			this.picker.hide();
+		},
+		toggle: function() {
+			this.picker.toggle();
+		},
+		color: function(newColor) {
+			if ( newColor === true ) {
+				return this._color.clone();
+			} else if ( newColor === undef ) {
+				return this._color.toString();
+			}
+			this.option('color', newColor);
+		}
+	};
+	// initialize the widget
+	$.widget( 'a8c.iris', Iris );
+	// add CSS
+	$( '<style id="iris-css">' + _css + '</style>' ).appendTo( 'head' );
+
+}( jQuery ));
+/*! Color.js - v0.9.11 - 2013-08-09
+* https://github.com/Automattic/Color.js
+* Copyright (c) 2013 Matt Wiebe; Licensed GPLv2 */
+(function(global, undef) {
+
+	var Color = function( color, type ) {
+		if ( ! ( this instanceof Color ) )
+			return new Color( color, type );
+
+		return this._init( color, type );
+	};
+
+	Color.fn = Color.prototype = {
+		_color: 0,
+		_alpha: 1,
+		error: false,
+		// for preserving hue/sat in fromHsl().toHsl() flows
+		_hsl: { h: 0, s: 0, l: 0 },
+		// for preserving hue/sat in fromHsv().toHsv() flows
+		_hsv: { h: 0, s: 0, v: 0 },
+		// for setting hsl or hsv space - needed for .h() & .s() functions to function properly
+		_hSpace: 'hsl',
+		_init: function( color ) {
+			var func = 'noop';
+			switch ( typeof color ) {
+					case 'object':
+						// alpha?
+						if ( color.a !== undef )
+							this.a( color.a );
+						func = ( color.r !== undef ) ? 'fromRgb' :
+							( color.l !== undef ) ? 'fromHsl' :
+							( color.v !== undef ) ? 'fromHsv' : func;
+						return this[func]( color );
+					case 'string':
+						return this.fromCSS( color );
+					case 'number':
+						return this.fromInt( parseInt( color, 10 ) );
+			}
+			return this;
+		},
+
+		_error: function() {
+			this.error = true;
+			return this;
+		},
+
+		clone: function() {
+			var newColor = new Color( this.toInt() ),
+				copy = ['_alpha', '_hSpace', '_hsl', '_hsv', 'error'];
+			for ( var i = copy.length - 1; i >= 0; i-- ) {
+				newColor[ copy[i] ] = this[ copy[i] ];
+			}
+			return newColor;
+		},
+
+		setHSpace: function( space ) {
+			this._hSpace = ( space === 'hsv' ) ? space : 'hsl';
+			return this;
+		},
+
+		noop: function() {
+			return this;
+		},
+
+		fromCSS: function( color ) {
+			var list,
+				leadingRE = /^(rgb|hs(l|v))a?\(/;
+			this.error = false;
+
+			// whitespace and semicolon trim
+			color = color.replace(/^\s+/, '').replace(/\s+$/, '').replace(/;$/, '');
+
+			if ( color.match(leadingRE) && color.match(/\)$/) ) {
+				list = color.replace(/(\s|%)/g, '').replace(leadingRE, '').replace(/,?\);?$/, '').split(',');
+
+				if ( list.length < 3 )
+					return this._error();
+
+				if ( list.length === 4 ) {
+					this.a( parseFloat( list.pop() ) );
+					// error state has been set to true in .a() if we passed NaN
+					if ( this.error )
+						return this;
+				}
+
+				for (var i = list.length - 1; i >= 0; i--) {
+					list[i] = parseInt(list[i], 10);
+					if ( isNaN( list[i] ) )
+						return this._error();
+				}
+
+				if ( color.match(/^rgb/) ) {
+					return this.fromRgb( {
+						r: list[0],
+						g: list[1],
+						b: list[2]
+					} );
+				} else if ( color.match(/^hsv/) ) {
+					return this.fromHsv( {
+						h: list[0],
+						s: list[1],
+						v: list[2]
+					} );
+				} else {
+					return this.fromHsl( {
+						h: list[0],
+						s: list[1],
+						l: list[2]
+					} );
+				}
+			} else {
+				// must be hex amirite?
+				return this.fromHex( color );
+			}
+		},
+
+		fromRgb: function( rgb, preserve ) {
+			if ( typeof rgb !== 'object' || rgb.r === undef || rgb.g === undef || rgb.b === undef )
+				return this._error();
+
+			this.error = false;
+			return this.fromInt( parseInt( ( rgb.r << 16 ) + ( rgb.g << 8 ) + rgb.b, 10 ), preserve );
+		},
+
+		fromHex: function( color ) {
+			color = color.replace(/^#/, '').replace(/^0x/, '');
+			if ( color.length === 3 ) {
+				color = color[0] + color[0] + color[1] + color[1] + color[2] + color[2];
+			}
+
+			// rough error checking - this is where things go squirrely the most
+			this.error = ! /^[0-9A-F]{6}$/i.test( color );
+			return this.fromInt( parseInt( color, 16 ) );
+		},
+
+		fromHsl: function( hsl ) {
+			var r, g, b, q, p, h, s, l;
+
+			if ( typeof hsl !== 'object' || hsl.h === undef || hsl.s === undef || hsl.l === undef )
+				return this._error();
+
+			this._hsl = hsl; // store it
+			this._hSpace = 'hsl'; // implicit
+			h = hsl.h / 360; s = hsl.s / 100; l = hsl.l / 100;
+			if ( s === 0 ) {
+				r = g = b = l; // achromatic
+			}
+			else {
+				q = l < 0.5 ? l * ( 1 + s ) : l + s - l * s;
+				p = 2 * l - q;
+				r = this.hue2rgb( p, q, h + 1/3 );
+				g = this.hue2rgb( p, q, h );
+				b = this.hue2rgb( p, q, h - 1/3 );
+			}
+			return this.fromRgb( {
+				r: r * 255,
+				g: g * 255,
+				b: b * 255
+			}, true ); // true preserves hue/sat
+		},
+
+		fromHsv: function( hsv ) {
+			var h, s, v, r, g, b, i, f, p, q, t;
+			if ( typeof hsv !== 'object' || hsv.h === undef || hsv.s === undef || hsv.v === undef )
+				return this._error();
+
+			this._hsv = hsv; // store it
+			this._hSpace = 'hsv'; // implicit
+
+			h = hsv.h / 360; s = hsv.s / 100; v = hsv.v / 100;
+			i = Math.floor( h * 6 );
+			f = h * 6 - i;
+			p = v * ( 1 - s );
+			q = v * ( 1 - f * s );
+			t = v * ( 1 - ( 1 - f ) * s );
+
+			switch( i % 6 ) {
+				case 0:
+					r = v; g = t; b = p;
+					break;
+				case 1:
+					r = q; g = v; b = p;
+					break;
+				case 2:
+					r = p; g = v; b = t;
+					break;
+				case 3:
+					r = p; g = q; b = v;
+					break;
+				case 4:
+					r = t; g = p; b = v;
+					break;
+				case 5:
+					r = v; g = p; b = q;
+					break;
+			}
+
+			return this.fromRgb( {
+				r: r * 255,
+				g: g * 255,
+				b: b * 255
+			}, true ); // true preserves hue/sat
+
+		},
+		// everything comes down to fromInt
+		fromInt: function( color, preserve ) {
+			this._color = parseInt( color, 10 );
+
+			if ( isNaN( this._color ) )
+				this._color = 0;
+
+			// let's coerce things
+			if ( this._color > 16777215 )
+				this._color = 16777215;
+			else if ( this._color < 0 )
+				this._color = 0;
+
+			// let's not do weird things
+			if ( preserve === undef ) {
+				this._hsv.h = this._hsv.s = this._hsl.h = this._hsl.s = 0;
+			}
+			// EVENT GOES HERE
+			return this;
+		},
+
+		hue2rgb: function( p, q, t ) {
+			if ( t < 0 ) {
+				t += 1;
+			}
+			if ( t > 1 ) {
+				t -= 1;
+			}
+			if ( t < 1/6 ) {
+				return p + ( q - p ) * 6 * t;
+			}
+			if ( t < 1/2 ) {
+				return q;
+			}
+			if ( t < 2/3 ) {
+				return p + ( q - p ) * ( 2/3 - t ) * 6;
+			}
+			return p;
+		},
+
+		toString: function() {
+			var hex = parseInt( this._color, 10 ).toString( 16 );
+			if ( this.error )
+				return '';
+			// maybe left pad it
+			if ( hex.length < 6 ) {
+				for (var i = 6 - hex.length - 1; i >= 0; i--) {
+					hex = '0' + hex;
+				}
+			}
+			return '#' + hex;
+		},
+
+		toCSS: function( type, alpha ) {
+			type = type || 'hex';
+			alpha = parseFloat( alpha || this._alpha );
+			switch ( type ) {
+				case 'rgb':
+				case 'rgba':
+					var rgb = this.toRgb();
+					if ( alpha < 1 ) {
+						return "rgba( " + rgb.r + ", " + rgb.g + ", " + rgb.b + ", " + alpha + " )";
+					}
+					else {
+						return "rgb( " + rgb.r + ", " + rgb.g + ", " + rgb.b + " )";
+					}
+					break;
+				case 'hsl':
+				case 'hsla':
+					var hsl = this.toHsl();
+					if ( alpha < 1 ) {
+						return "hsla( " + hsl.h + ", " + hsl.s + "%, " + hsl.l + "%, " + alpha + " )";
+					}
+					else {
+						return "hsl( " + hsl.h + ", " + hsl.s + "%, " + hsl.l + "% )";
+					}
+					break;
+				default:
+					return this.toString();
+			}
+		},
+
+		toRgb: function() {
+			return {
+				r: 255 & ( this._color >> 16 ),
+				g: 255 & ( this._color >> 8 ),
+				b: 255 & ( this._color )
+			};
+		},
+
+		toHsl: function() {
+			var rgb = this.toRgb();
+			var r = rgb.r / 255, g = rgb.g / 255, b = rgb.b / 255;
+			var max = Math.max( r, g, b ), min = Math.min( r, g, b );
+			var h, s, l = ( max + min ) / 2;
+
+			if ( max === min ) {
+				h = s = 0; // achromatic
+			} else {
+				var d = max - min;
+				s = l > 0.5 ? d / ( 2 - max - min ) : d / ( max + min );
+				switch ( max ) {
+					case r: h = ( g - b ) / d + ( g < b ? 6 : 0 );
+						break;
+					case g: h = ( b - r ) / d + 2;
+						break;
+					case b: h = ( r - g ) / d + 4;
+						break;
+				}
+				h /= 6;
+			}
+
+			// maintain hue & sat if we've been manipulating things in the HSL space.
+			h = Math.round( h * 360 );
+			if ( h === 0 && this._hsl.h !== h ) {
+				h = this._hsl.h;
+			}
+			s = Math.round( s * 100 );
+			if ( s === 0 && this._hsl.s ) {
+				s = this._hsl.s;
+			}
+
+			return {
+				h: h,
+				s: s,
+				l: Math.round( l * 100 )
+			};
+
+		},
+
+		toHsv: function() {
+			var rgb = this.toRgb();
+			var r = rgb.r / 255, g = rgb.g / 255, b = rgb.b / 255;
+			var max = Math.max( r, g, b ), min = Math.min( r, g, b );
+			var h, s, v = max;
+			var d = max - min;
+			s = max === 0 ? 0 : d / max;
+
+			if ( max === min ) {
+				h = s = 0; // achromatic
+			} else {
+				switch( max ){
+					case r:
+						h = ( g - b ) / d + ( g < b ? 6 : 0 );
+						break;
+					case g:
+						h = ( b - r ) / d + 2;
+						break;
+					case b:
+						h = ( r - g ) / d + 4;
+						break;
+				}
+				h /= 6;
+			}
+
+			// maintain hue & sat if we've been manipulating things in the HSV space.
+			h = Math.round( h * 360 );
+			if ( h === 0 && this._hsv.h !== h ) {
+				h = this._hsv.h;
+			}
+			s = Math.round( s * 100 );
+			if ( s === 0 && this._hsv.s ) {
+				s = this._hsv.s;
+			}
+
+			return {
+				h: h,
+				s: s,
+				v: Math.round( v * 100 )
+			};
+		},
+
+		toInt: function() {
+			return this._color;
+		},
+
+		toIEOctoHex: function() {
+			// AARRBBGG
+			var hex = this.toString();
+			var AA = parseInt( 255 * this._alpha, 10 ).toString(16);
+			if ( AA.length === 1 ) {
+				AA = '0' + AA;
+			}
+			return '#' + AA + hex.replace(/^#/, '' );
+		},
+
+		toLuminosity: function() {
+			var rgb = this.toRgb();
+			return 0.2126 * Math.pow( rgb.r / 255, 2.2 ) + 0.7152 * Math.pow( rgb.g / 255, 2.2 ) + 0.0722 * Math.pow( rgb.b / 255, 2.2);
+		},
+
+		getDistanceLuminosityFrom: function( color ) {
+			if ( ! ( color instanceof Color ) ) {
+				throw 'getDistanceLuminosityFrom requires a Color object';
+			}
+			var lum1 = this.toLuminosity();
+			var lum2 = color.toLuminosity();
+			if ( lum1 > lum2 ) {
+				return ( lum1 + 0.05 ) / ( lum2 + 0.05 );
+			}
+			else {
+				return ( lum2 + 0.05 ) / ( lum1 + 0.05 );
+			}
+		},
+
+		getMaxContrastColor: function() {
+			var lum = this.toLuminosity();
+			var hex = ( lum >= 0.5 ) ? '000000' : 'ffffff';
+			return new Color( hex );
+		},
+
+		getReadableContrastingColor: function( bgColor, minContrast ) {
+			if ( ! bgColor instanceof Color ) {
+				return this;
+			}
+
+			// you shouldn't use less than 5, but you might want to.
+			var targetContrast = ( minContrast === undef ) ? 5 : minContrast;
+			// working things
+			var contrast = bgColor.getDistanceLuminosityFrom( this );
+			var maxContrastColor = bgColor.getMaxContrastColor();
+			var maxContrast = maxContrastColor.getDistanceLuminosityFrom( bgColor );
+
+			// if current max contrast is less than the target contrast, we had wishful thinking.
+			// still, go max
+			if ( maxContrast <= targetContrast ) {
+				return maxContrastColor;
+			}
+			// or, we might already have sufficient contrast
+			else if ( contrast >= targetContrast ) {
+				return this;
+			}
+
+			var incr = ( 0 === maxContrastColor.toInt() ) ? -1 : 1;
+			while ( contrast < targetContrast ) {
+				this.l( incr, true ); // 2nd arg turns this into an incrementer
+				contrast = this.getDistanceLuminosityFrom( bgColor );
+				// infininite loop prevention: you never know.
+				if ( this._color === 0 || this._color === 16777215 ) {
+					break;
+				}
+			}
+
+			return this;
+
+		},
+
+		a: function( val ) {
+			if ( val === undef )
+				return this._alpha;
+
+			var a = parseFloat( val );
+
+			if ( isNaN( a ) )
+				return this._error();
+
+			this._alpha = a;
+			return this;
+		},
+
+		// TRANSFORMS
+
+		darken: function( amount ) {
+			amount = amount || 5;
+			return this.l( - amount, true );
+		},
+
+		lighten: function( amount ) {
+			amount = amount || 5;
+			return this.l( amount, true );
+		},
+
+		saturate: function( amount ) {
+			amount = amount || 15;
+			return this.s( amount, true );
+		},
+
+		desaturate: function( amount ) {
+			amount = amount || 15;
+			return this.s( - amount, true );
+		},
+
+		toGrayscale: function() {
+			return this.setHSpace('hsl').s( 0 );
+		},
+
+		getComplement: function() {
+			return this.h( 180, true );
+		},
+
+		getSplitComplement: function( step ) {
+			step = step || 1;
+			var incr = 180 + ( step * 30 );
+			return this.h( incr, true );
+		},
+
+		getAnalog: function( step ) {
+			step = step || 1;
+			var incr = step * 30;
+			return this.h( incr, true );
+		},
+
+		getTetrad: function( step ) {
+			step = step || 1;
+			var incr = step * 60;
+			return this.h( incr, true );
+		},
+
+		getTriad: function( step ) {
+			step = step || 1;
+			var incr = step * 120;
+			return this.h( incr, true );
+		},
+
+		_partial: function( key ) {
+			var prop = shortProps[key];
+			return function( val, incr ) {
+				var color = this._spaceFunc('to', prop.space);
+
+				// GETTER
+				if ( val === undef )
+					return color[key];
+
+				// INCREMENT
+				if ( incr === true )
+					val = color[key] + val;
+
+				// MOD & RANGE
+				if ( prop.mod )
+					val = val % prop.mod;
+				if ( prop.range )
+					val = ( val < prop.range[0] ) ? prop.range[0] : ( val > prop.range[1] ) ? prop.range[1] : val;
+
+				// NEW VALUE
+				color[key] = val;
+
+				return this._spaceFunc('from', prop.space, color);
+			};
+		},
+
+		_spaceFunc: function( dir, s, val ) {
+			var space = s || this._hSpace,
+				funcName = dir + space.charAt(0).toUpperCase() + space.substr(1);
+			return this[funcName](val);
+		}
+	};
+
+	var shortProps = {
+		h: {
+			mod: 360
+		},
+		s: {
+			range: [0,100]
+		},
+		l: {
+			space: 'hsl',
+			range: [0,100]
+		},
+		v: {
+			space: 'hsv',
+			range: [0,100]
+		},
+		r: {
+			space: 'rgb',
+			range: [0,255]
+		},
+		g: {
+			space: 'rgb',
+			range: [0,255]
+		},
+		b: {
+			space: 'rgb',
+			range: [0,255]
+		}
+	};
+
+	for ( var key in shortProps ) {
+		if ( shortProps.hasOwnProperty( key ) )
+			Color.fn[key] = Color.fn._partial(key);
+	}
+
+	// play nicely with Node + browser
+	if ( typeof exports === 'object' )
+		module.exports = Color;
+	else
+		global.Color = Color;
+
+}(this));
diff --git a/lib/plugins/styling/lang/en/intro.txt b/lib/plugins/styling/lang/en/intro.txt
new file mode 100644
index 000000000..4ea55172f
--- /dev/null
+++ b/lib/plugins/styling/lang/en/intro.txt
@@ -0,0 +1,2 @@
+This tool allows you to change certain style settings of your currently selected template.
+All changes are stored in a local configuration file and are upgrade safe.
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
new file mode 100644
index 000000000..a68464f15
--- /dev/null
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * English language file for styling plugin
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+
+// menu entry for admin plugins
+$lang['js']['menu'] = 'Template Style Settings';
+
+// custom language strings for the plugin
+$lang['error'] = 'Sorry, this template does not support this functionality.';
+
+$lang['btn_preview'] = 'Preview your changes';
+$lang['btn_save']    = 'Save your changes';
+$lang['btn_reset']   = 'Reset your current changes';
+$lang['btn_revert']  = 'Revert all styles back to the template\'s default';
+
+// default guaranteed placeholders
+$lang['__text__']           = 'Main text color';
+$lang['__background__']     = 'Main text background color';
+$lang['__text_alt__']       = 'Alternative text color';
+$lang['__background_alt__'] = 'Alternative text background color';
+$lang['__text_neu__']       = 'Neutral text color';
+$lang['__background_neu__'] = 'Neutral text background color';
+$lang['__border__']         = 'Border color';
+$lang['__highlight__']      = 'Highlight color (for search results mainly)';
+
+
+
+
+//Setup VIM: ex: et ts=4 :
diff --git a/lib/plugins/styling/plugin.info.txt b/lib/plugins/styling/plugin.info.txt
new file mode 100644
index 000000000..cdf01ee6f
--- /dev/null
+++ b/lib/plugins/styling/plugin.info.txt
@@ -0,0 +1,7 @@
+base   styling
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2015-05-16
+name   styling plugin
+desc   Allows to edit style.ini replacements
+url    https://www.dokuwiki.org/plugin:styling
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
new file mode 100644
index 000000000..76cd1a847
--- /dev/null
+++ b/lib/plugins/styling/script.js
@@ -0,0 +1,92 @@
+/* DOKUWIKI:include_once iris.js */
+
+jQuery(function () {
+    // user openend the admin page, set cookie and redirect
+    if (jQuery('#plugin__styling').length) {
+        DokuCookie.setValue('styling_plugin', 1);
+        document.location.href = document.location.href.replace(/do=admin/, '');
+    }
+
+    // continue only if the styling Dialog is currently enabled
+    if (DokuCookie.getValue('styling_plugin') != 1) return;
+
+    var styling_timeout = null;
+
+    // create dialog element
+    var $dialog = jQuery(document.createElement('div'));
+    jQuery('body').append($dialog);
+
+
+    /**
+     * updates the current CSS with a new preview one
+     */
+    function styling_updateCSS() {
+        var now = new Date().getTime();
+        var $style = jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
+        $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
+    }
+
+    /**
+     * save current values and reload preview (debounced)
+     */
+    function styling_saveAndUpdate() {
+        if (styling_timeout) window.clearTimeout(styling_timeout);
+        styling_timeout = window.setTimeout(function () {
+            styling_timeout = null;
+
+            var params = $dialog.find('input[type=text]').serializeArray();
+            params[params.length] = { name: 'call', value: 'plugin_styling'};
+            params[params.length] = {name: 'run', value: 'preview'};
+
+            jQuery.post(
+                    DOKU_BASE + '/lib/exe/ajax.php',
+                params,
+                styling_updateCSS
+            );
+        }, 500);
+    }
+
+    // load the dialog content and apply listeners
+    $dialog.load(
+            DOKU_BASE + '/lib/exe/ajax.php',
+        {
+            'call': 'plugin_styling',
+            'run':  'html',
+            'id':   JSINFO.id
+        },
+        function () {
+            // load the preview template
+            styling_updateCSS();
+
+            // open the dialog
+            $dialog.dialog({
+                'title':    LANG.plugins.styling.menu,
+                'width':    500,
+                'height':   500,
+                'top':      50,
+                'position': { 'my': 'left bottom', 'at': 'left bottom', 'of': window },
+                // bring everything back to normal
+                'close':    function (event, ui) {
+                    // disable the styling plugin again
+                    DokuCookie.setValue('styling_plugin', 0);
+                    // reload
+                    document.location.reload()
+                }
+            });
+
+            // we don't need the manual preview in JS mode
+            $dialog.find('.btn_preview').hide();
+
+            // add the color picker  FIXME add saveAndUpdate to correct event
+            $dialog.find('.color').iris({ });
+
+            // listen to keyup events
+            $dialog.find('input[type=text]').keyup(function () {
+                console.log('change');
+                styling_saveAndUpdate();
+            });
+
+        }
+    );
+
+});
-- 
cgit v1.2.3


From 4f2e8bf8642a993a0a5edf32a3172eaf77645a25 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 23 May 2015 15:31:16 +0200
Subject: fixed ajax endpoint for styling plugin

---
 lib/plugins/styling/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 76cd1a847..f2b4b9ebb 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -39,7 +39,7 @@ jQuery(function () {
             params[params.length] = {name: 'run', value: 'preview'};
 
             jQuery.post(
-                    DOKU_BASE + '/lib/exe/ajax.php',
+                    DOKU_BASE + 'lib/exe/ajax.php',
                 params,
                 styling_updateCSS
             );
@@ -48,7 +48,7 @@ jQuery(function () {
 
     // load the dialog content and apply listeners
     $dialog.load(
-            DOKU_BASE + '/lib/exe/ajax.php',
+            DOKU_BASE + 'lib/exe/ajax.php',
         {
             'call': 'plugin_styling',
             'run':  'html',
-- 
cgit v1.2.3


From 49f111354ae7007893e877ceaeaed0dd3367e8f2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 23 May 2015 15:32:35 +0200
Subject: avoid double ampersand in url

---
 lib/plugins/styling/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index f2b4b9ebb..caedc7a1c 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -4,7 +4,7 @@ jQuery(function () {
     // user openend the admin page, set cookie and redirect
     if (jQuery('#plugin__styling').length) {
         DokuCookie.setValue('styling_plugin', 1);
-        document.location.href = document.location.href.replace(/do=admin/, '');
+        document.location.href = document.location.href.replace(/&?do=admin/, '');
     }
 
     // continue only if the styling Dialog is currently enabled
-- 
cgit v1.2.3


From e4632ba4cca90438b3d47594f217a9ed18b980be Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Sat, 23 May 2015 15:37:05 +0000
Subject: Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 lib/plugins/styling/admin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
index 85d87dd71..ab8e5a5f4 100644
--- a/lib/plugins/styling/admin.php
+++ b/lib/plugins/styling/admin.php
@@ -57,6 +57,7 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
 
     /**
      * Create the actual editing form
+     * @param boolean $isajax
      */
     public function form($isajax) {
         global $conf;
-- 
cgit v1.2.3


From 23a5593c5cae9f85a8821c0207d9e8ad2b6f3b15 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 25 May 2015 00:54:20 +0100
Subject: improved copy for styler plugin

---
 lib/plugins/styling/lang/en/lang.php | 6 +++---
 lib/tpl/dokuwiki/lang/en/lang.php    | 4 ++--
 lib/tpl/dokuwiki/lang/en/style.txt   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
index a68464f15..e50c6b912 100644
--- a/lib/plugins/styling/lang/en/lang.php
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -18,11 +18,11 @@ $lang['btn_revert']  = 'Revert all styles back to the template\'s default';
 
 // default guaranteed placeholders
 $lang['__text__']           = 'Main text color';
-$lang['__background__']     = 'Main text background color';
+$lang['__background__']     = 'Main background color';
 $lang['__text_alt__']       = 'Alternative text color';
-$lang['__background_alt__'] = 'Alternative text background color';
+$lang['__background_alt__'] = 'Alternative background color';
 $lang['__text_neu__']       = 'Neutral text color';
-$lang['__background_neu__'] = 'Neutral text background color';
+$lang['__background_neu__'] = 'Neutral background color';
 $lang['__border__']         = 'Border color';
 $lang['__highlight__']      = 'Highlight color (for search results mainly)';
 
diff --git a/lib/tpl/dokuwiki/lang/en/lang.php b/lib/tpl/dokuwiki/lang/en/lang.php
index 82a720e21..b7b3e7fa1 100644
--- a/lib/tpl/dokuwiki/lang/en/lang.php
+++ b/lib/tpl/dokuwiki/lang/en/lang.php
@@ -6,7 +6,7 @@ $lang['__background_site__'] = 'Color for the very background (behind the conten
 $lang['__link__']     = 'The general link color';
 $lang['__existing__'] = 'The color for links to existing pages';
 $lang['__missing__']  = 'The color for links to non-existing pages';
-$lang['__site_width__']    = 'The width of the full site (can also be a percentage)';
-$lang['__sidebar_width__'] = 'The width of the sitebar if any (can also be a percentage)';
+$lang['__site_width__']    = 'The width of the full site (can be any length unit: %, px, em, ...)';
+$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
 $lang['__tablet_width__']  = 'Below screensizes of this width, the site switches to tablet mode';
 $lang['__phone_width__']   = 'Below screensizes of this width, the site switches to phone mode';
diff --git a/lib/tpl/dokuwiki/lang/en/style.txt b/lib/tpl/dokuwiki/lang/en/style.txt
index f6bb4fc6f..7bf3e1a82 100644
--- a/lib/tpl/dokuwiki/lang/en/style.txt
+++ b/lib/tpl/dokuwiki/lang/en/style.txt
@@ -1,4 +1,4 @@
-If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' in the ''wiki'' namespace and it
-will be automaticaly be used. You can also upload a ''favicon.ico'' there. If you use a closed
-wiki it is recommended to make the ''wiki'' namespace world readable in the ACL settings or
-your logo is not shown to not logged in users.
\ No newline at end of file
+If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' into the ''wiki'' or the root namespace and it
+will be automatically used. You can also upload a ''favicon.ico'' there. If you use a closed
+wiki it is recommended to make the ''wiki'' (or root) namespace world readable in the ACL settings or
+your logo is not shown to not logged in users.
-- 
cgit v1.2.3


From 8b3eb08dfe10f165913eb8823bc517a3c2ca1d59 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 25 May 2015 09:57:02 +0200
Subject: adjusted gitignore for adjusted plugin name

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index cf1a37300..dd5c9cf18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,7 @@
 !/lib/plugins/popularity
 !/lib/plugins/revert
 !/lib/plugins/safefnrecode
-!/lib/plugins/styler
+!/lib/plugins/styling
 !/lib/plugins/testing
 !/lib/plugins/usermanager
 !/lib/plugins/action.php
-- 
cgit v1.2.3


From 418cb6171fc2d6d04a505e28c123b22c384db8c5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 25 May 2015 09:58:54 +0200
Subject: removed unused class

---
 lib/plugins/styling/admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
index ab8e5a5f4..3c2ab577c 100644
--- a/lib/plugins/styling/admin.php
+++ b/lib/plugins/styling/admin.php
@@ -93,16 +93,16 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
             }
             echo '</table>';
 
-            echo '<p class="center">';
+            echo '<p>';
             echo '<input type="submit" name="run[preview]" class="btn_preview" value="'.$this->getLang('btn_preview').'">';
             echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'">'; #FIXME only if preview.ini exists
             echo '</p>';
 
-            echo '<p class="center">';
+            echo '<p>';
             echo '<input type="submit" name="run[save]" value="'.$this->getLang('btn_save').'">';
             echo '</p>';
 
-            echo '<p class="center">';
+            echo '<p>';
             echo '<input type="submit" name="run[revert]" value="'.$this->getLang('btn_revert').'">'; #FIXME only if local.ini exists
             echo '</p>';
 
-- 
cgit v1.2.3


From f969573b0f1e999e5252c3671da9a8b6ac0bbd38 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 25 May 2015 10:00:10 +0200
Subject: removed debuggin output

---
 lib/plugins/styling/script.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index caedc7a1c..7c8ffae91 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -82,7 +82,6 @@ jQuery(function () {
 
             // listen to keyup events
             $dialog.find('input[type=text]').keyup(function () {
-                console.log('change');
                 styling_saveAndUpdate();
             });
 
-- 
cgit v1.2.3


From 5114259bf530b89afbb21bd693b1da3f96016b7f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 25 May 2015 10:00:47 +0200
Subject: removed accidental checkin

---
 lib/tpl/dokuwiki/pagefooter.html | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 lib/tpl/dokuwiki/pagefooter.html

diff --git a/lib/tpl/dokuwiki/pagefooter.html b/lib/tpl/dokuwiki/pagefooter.html
deleted file mode 100644
index a361c4d69..000000000
--- a/lib/tpl/dokuwiki/pagefooter.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$plg = plugin_load('action', 'feedback');
-if($plg) $plg->tpl();
-- 
cgit v1.2.3


From 18f4ec973d8b711f6687adb71ce03e77e5ab1f41 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 25 May 2015 10:41:49 +0200
Subject: fixed isBundled() check when remote info is unavailable

---
 lib/plugins/extension/helper/extension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index d089245b5..719249fbe 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -105,7 +105,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
      */
     public function isBundled() {
         if (!empty($this->remoteInfo['bundled'])) return $this->remoteInfo['bundled'];
-        return in_array($this->base,
+        return in_array($this->id,
                         array(
                             'authad', 'authldap', 'authmysql', 'authpgsql', 'authplain', 'acl', 'info', 'extension',
                             'revert', 'popularity', 'config', 'safefnrecode', 'testing', 'template:dokuwiki'
-- 
cgit v1.2.3


From 5875e534bcbccf90fe3767fc77d8ea2a76aad9bd Mon Sep 17 00:00:00 2001
From: Guillaume Turri <guillaume.turri@gmail.com>
Date: Fri, 15 May 2015 15:49:11 +0200
Subject: Plugins can send usage data

They just need to register to the PLUGIN_USAGE_DATA event, and then to add
either a simple string, or an array of key / value. For example:

    function register(Doku_Event_Handler $controller) {
      $controller->register_hook('PLUGIN_USAGE_DATA', 'AFTER', $this, 'usage_data');
    }

    function usage_data(&$event){
      $event->data['my_plugin_name'] = 'my usage data';

      //or: $event->data['my_plugin_name'] = array ('k1' => 'v1', 'k2' => 'v2');
    }
---
 lib/plugins/popularity/helper.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 8673fb5af..55264010f 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -253,9 +253,26 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
         $data['php_exectime'] = $phptime;
         $data['php_extension'] = get_loaded_extensions();
 
+        // plugin usage data
+        $this->_add_plugin_usage_data($data);
+
         return $data;
     }
 
+    protected function _add_plugin_usage_data(&$data){
+        $pluginsData = array();
+        trigger_event('PLUGIN_POPULARITY_DATA_SETUP', $pluginsData);
+        foreach($pluginsData as $plugin => $d){
+           if ( is_array($d) ) {
+               foreach($d as $key => $value){
+                   $data['plugin_' . $plugin . '_' . $key] = $value;
+               }
+           } else {
+               $data['plugin_' . $plugin] = $d;
+           }
+        }
+    }
+
     /**
      * Callback to search and count the content of directories in DokuWiki
      *
-- 
cgit v1.2.3


From edc61c3ad8e143dbc6aaf62829b2241e6393606e Mon Sep 17 00:00:00 2001
From: Ikuo Obataya <i.obataya@gmail.com>
Date: Thu, 28 May 2015 03:36:03 +0200
Subject: translation update

---
 inc/lang/ja/lang.php                      | 3 +++
 lib/plugins/authad/lang/ja/lang.php       | 3 +++
 lib/plugins/authldap/lang/ja/settings.php | 1 +
 lib/plugins/extension/lang/ja/lang.php    | 4 ++++
 4 files changed, 11 insertions(+)

diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 67a69c3de..290bb175b 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -77,6 +77,7 @@ $lang['regmissing']            = '全ての項目を入力してください。'
 $lang['reguexists']            = 'このユーザー名は既に存在しています。';
 $lang['regsuccess']            = '新しいユーザーが作成されました。パスワードは登録したメールアドレス宛てに送付されます。';
 $lang['regsuccess2']           = '新しいユーザーが作成されました。';
+$lang['regfail']               = 'ユーザーを作成できませんでした。';
 $lang['regmailfail']           = 'パスワードのメール送信に失敗しました。お手数ですが管理者まで連絡をお願いします。';
 $lang['regbadmail']            = 'メールアドレスが有効ではありません。';
 $lang['regbadpass']            = '確認用のパスワードが正しくありません。';
@@ -91,6 +92,7 @@ $lang['profdeleteuser']        = 'アカウントの削除';
 $lang['profdeleted']           = 'このwikiからあなたのユーザーアカウントは削除済です。';
 $lang['profconfdelete']        = 'このwikiから自分のアカウント抹消を希望します。<br/> この操作は取消すことができません。';
 $lang['profconfdeletemissing'] = '確認のチェックボックスがチェックされていません。';
+$lang['proffail']              = 'ユーザー情報は更新されませんでした。';
 $lang['pwdforget']             = 'パスワードをお忘れですか？パスワード再発行';
 $lang['resendna']              = 'パスワードの再発行は出来ません。';
 $lang['resendpwd']             = '新しいパスワードをセット';
@@ -336,6 +338,7 @@ $lang['media_perm_read']       = 'ファイルを閲覧する権限がありま
 $lang['media_perm_upload']     = 'ファイルをアップロードする権限がありません。';
 $lang['media_update']          = '新しいバージョンをアップロード';
 $lang['media_restore']         = 'このバージョンを復元';
+$lang['media_acl_warning']     = 'ACL制限や非表示ページは表示されないので、このリストは完全でない場合があります。';
 $lang['currentns']             = '現在の名前空間';
 $lang['searchresult']          = '検索結果';
 $lang['plainhtml']             = 'プレーンHTML';
diff --git a/lib/plugins/authad/lang/ja/lang.php b/lib/plugins/authad/lang/ja/lang.php
index 91c4f046a..e82ca3791 100644
--- a/lib/plugins/authad/lang/ja/lang.php
+++ b/lib/plugins/authad/lang/ja/lang.php
@@ -5,6 +5,9 @@
  * 
  * @author PzF_X <jp_minecraft@yahoo.co.jp>
  * @author Osaka <mr.osaka@gmail.com>
+ * @author Ikuo Obataya <i.obataya@gmail.com>
  */
 $lang['domain']                = 'ログオン時のドメイン';
 $lang['authpwdexpire']         = 'あなたのパスワードは、あと%d日で有効期限が切れます。パスワードを変更してください。';
+$lang['passchangefail']        = 'パスワードを変更できませんでした。パスワードのルールに合わなかったのかもしれません。';
+$lang['connectfail']           = 'Active Directoryサーバーに接続できませんでした。';
diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php
index 6cff0ea67..717b5a6d9 100644
--- a/lib/plugins/authldap/lang/ja/settings.php
+++ b/lib/plugins/authldap/lang/ja/settings.php
@@ -7,6 +7,7 @@
  * @author Hideaki SAWADA <sawadakun@live.jp>
  * @author Hideaki SAWADA <chuno@live.jp>
  * @author PzF_X <jp_minecraft@yahoo.co.jp>
+ * @author Ikuo Obataya <i.obataya@gmail.com>
  */
 $lang['server']                = 'LDAPサーバー。ホスト名（<code>localhost</code>）又は完全修飾URL（<code>ldap://server.tld:389</code>）';
 $lang['port']                  = '上記が完全修飾URLでない場合、LDAPサーバーポート';
diff --git a/lib/plugins/extension/lang/ja/lang.php b/lib/plugins/extension/lang/ja/lang.php
index ce6ed2b97..42334c767 100644
--- a/lib/plugins/extension/lang/ja/lang.php
+++ b/lib/plugins/extension/lang/ja/lang.php
@@ -6,6 +6,7 @@
  * @author Hideaki SAWADA <chuno@live.jp>
  * @author PzF_X <jp_minecraft@yahoo.co.jp>
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
+ * @author Ikuo Obataya <i.obataya@gmail.com>
  */
 $lang['menu']                  = '拡張機能管理';
 $lang['tab_plugins']           = 'インストール済プラグイン';
@@ -27,6 +28,9 @@ $lang['btn_disable']           = '無効化';
 $lang['btn_install']           = 'インストール';
 $lang['btn_reinstall']         = '再インストール';
 $lang['js']['reallydel']       = 'この拡張機能を本当にアンインストールしますか？';
+$lang['js']['display_enabled'] = '有効';
+$lang['js']['display_disabled'] = '無効';
+$lang['js']['display_updatable'] = '更新可能';
 $lang['search_for']            = '拡張機能の検索：';
 $lang['search']                = '検索';
 $lang['extensionby']           = '<strong>%s</strong> 作者： %s';
-- 
cgit v1.2.3


From 4286c64e98499b93056c09498c10709f8909befd Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Thu, 28 May 2015 12:18:36 +0100
Subject: update confToHash() inline documentation for new  parameter

---
 inc/confutils.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/confutils.php b/inc/confutils.php
index 4035d6dd4..8b61a8d5b 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -206,6 +206,11 @@ function confToHash($file,$lower=false) {
  * @param  string   $type     the configuration settings to be read, must correspond to a key/array in $config_cascade
  * @param  callback $fn       the function used to process the configuration file into an array
  * @param  array    $params   optional additional params to pass to the callback
+ * @param  callback $combine  the function used to combine arrays of values read from different configuration files;
+ *                            the function takes two parameters,
+ *                               $combined - the already read & merged configuration values
+ *                               $new - array of config values from the config cascade file being currently processed
+ *                            and returns an array of the merged configuration values.
  * @return array    configuration values
  */
 function retrieveConfig($type,$fn,$params=null,$combine='array_merge') {
-- 
cgit v1.2.3


From 9a734b7aaba1445e06c1ccb95e59f54e01688d45 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Thu, 28 May 2015 16:37:32 +0100
Subject: Refactor code to make it simpler. The changes should also: - fix
 unlikely edge case when replacement line is the same as the   old line (would
 have resulted in timeout) - reduce memory footprint - avoid applying string
 search beyond maxlines replacement limit

---
 _test/tests/inc/io_replaceinfile.test.php | 28 +++++++++++++++++++++++--
 inc/io.php                                | 35 +++++++++++++------------------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/_test/tests/inc/io_replaceinfile.test.php b/_test/tests/inc/io_replaceinfile.test.php
index 98f21868f..c2dbc0dd4 100644
--- a/_test/tests/inc/io_replaceinfile.test.php
+++ b/_test/tests/inc/io_replaceinfile.test.php
@@ -2,6 +2,8 @@
 
 class io_replaceinfile_test extends DokuWikiTest {
 
+    protected $contents = "The\012Delete\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012";
+
     /*
      * dependency for tests needing zlib extension to pass
      */
@@ -21,8 +23,8 @@ class io_replaceinfile_test extends DokuWikiTest {
     }
 
     function _write($file){
-        $contents = "The\012Delete\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012";
-        io_saveFile($file, $contents);
+
+        io_saveFile($file, $this->contents);
         // Replace one, no regex
         $this->assertTrue(io_replaceInFile($file, "Delete\012", "Delete00\012", false, 1));
         $this->assertEquals("The\012Delete00\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012", io_readFile($file));
@@ -41,6 +43,7 @@ class io_replaceinfile_test extends DokuWikiTest {
         $this->_write(TMP_DIR.'/test.txt');
     }
 
+
     /**
      * @depends test_ext_zlib
      */
@@ -55,4 +58,25 @@ class io_replaceinfile_test extends DokuWikiTest {
         $this->_write(TMP_DIR.'/test.txt.bz2');
     }
 
+    /**
+     *
+     */
+    function test_edgecase1()
+    {
+        $file = TMP_DIR . '/test.txt';
+        // Replace all, no regex, backreference like construct in replacement line
+        io_saveFile($file, $this->contents);
+        $this->assertTrue(io_replaceInFile($file, "Delete\012", "Delete\\00\012", false, -1));
+        $this->assertEquals("The\012Delete\\00\012Delete\\00\012Delete01\012Delete02\012Delete\\00\012DeleteX\012Test\012", io_readFile($file), "Edge case: backreference like construct in replacement line");
+    }
+    /**
+     * @small
+     */
+    function test_edgecase2() {
+        $file = TMP_DIR.'/test.txt';
+        // Replace all, no regex, replacement line == search line
+        io_saveFile($file, $this->contents);
+        $this->assertTrue(io_replaceInFile($file, "Delete\012", "Delete\012", false, -1));
+        $this->assertEquals("The\012Delete\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012", io_readFile($file), "Edge case: new line the same as old line");
+    }
 }
diff --git a/inc/io.php b/inc/io.php
index dbb42114b..51ca2ea14 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -311,28 +311,23 @@ function io_replaceInFile($file, $oldline, $newline, $regex=false, $maxlines=0)
         $lines = file($file);
     }
 
-    // remove all matching lines
-    if ($regex) {
-        if($maxlines > 0) {
-            $matches = preg_grep($oldline, $lines);
-            $count = 0;
-            foreach($matches as $ix=>$m) {
-                $lines[$ix] = preg_replace($oldline, $newline, $m);
-                if(++$count >= $maxlines) break;
-            }
-        } else {
-            $lines = ($maxlines == 0) ? preg_grep($oldline, $lines, PREG_GREP_INVERT)
-                                      : preg_replace($oldline, $newline, $lines, $maxlines);
-        }
-    } else {
+    // make non-regexes into regexes
+    $pattern = $regex ? $oldline : '/'.preg_quote($oldline,'/').'/';
+    $replace = $regex ? $newline : addcslashes($newline, '\$');
+
+    // remove matching lines
+    if ($maxlines > 0) {
         $count = 0;
-        $replaceline = $maxlines == 0 ? '' : $newline;
-        $pos = array_search($oldline,$lines); //return null or false if not found
-        while(is_int($pos)){
-            $lines[$pos] = $replaceline;
-            if($maxlines > 0 && ++$count >= $maxlines) break;
-            $pos = array_search($oldline,$lines);
+        $matched = 0;
+        while (($count < $maxlines) && (list($i,$line) = each($lines))) {
+            // $matched will be set to 0|1 depending on whether pattern is matched and line replaced
+            $lines[$i] = preg_replace($pattern, $replace, $line, -1, $matched);
+            if ($matched) $count++;
         }
+    } else {
+        $lines = ($maxlines == 0) ?
+            preg_grep($pattern, $lines, PREG_GREP_INVERT) :
+            preg_replace($pattern, $replace, $lines);
     }
 
     if($maxlines == 0 && ((string)$newline) !== '') {
-- 
cgit v1.2.3


From 2b2b4cfeaa8d7ae4ba8315b27379063862a067cf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 29 May 2015 12:20:35 +0200
Subject: Upgrade to jQuery 1.11.3 and jQueryUI 1.11.4 closes #1175

---
 inc/lang/ar/jquery.ui.datepicker.js                |   13 +-
 inc/lang/el/jquery.ui.datepicker.js                |    2 +-
 inc/lang/fa/jquery.ui.datepicker.js                |   24 +-
 inc/lang/fr/jquery.ui.datepicker.js                |    2 +-
 inc/lang/ka/jquery.ui.datepicker.js                |   35 +
 inc/lang/ta/jquery.ui.datepicker.js                |   37 +
 .../jquery-ui-theme/images/animated-overlay.gif    |  Bin 1738 -> 0 bytes
 .../images/ui-bg_flat_0_aaaaaa_40x100.png          |  Bin 78 -> 251 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png         |  Bin 74 -> 247 bytes
 .../images/ui-bg_glass_55_fbf9ee_1x400.png         |  Bin 184 -> 374 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png         |  Bin 73 -> 246 bytes
 .../images/ui-bg_glass_75_dadada_1x400.png         |  Bin 126 -> 301 bytes
 .../images/ui-bg_glass_75_e6e6e6_1x400.png         |  Bin 121 -> 301 bytes
 .../images/ui-bg_glass_95_fef1ec_1x400.png         |  Bin 186 -> 371 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png       |  Bin 122 -> 319 bytes
 .../images/ui-icons_222222_256x240.png             |  Bin 3778 -> 7006 bytes
 .../images/ui-icons_2e83ff_256x240.png             |  Bin 3778 -> 4599 bytes
 .../images/ui-icons_454545_256x240.png             |  Bin 3778 -> 7071 bytes
 .../images/ui-icons_888888_256x240.png             |  Bin 3778 -> 7092 bytes
 .../images/ui-icons_cd0a0a_256x240.png             |  Bin 3778 -> 4599 bytes
 lib/scripts/jquery/jquery-ui-theme/smoothness.css  |   24 +-
 lib/scripts/jquery/jquery-ui.js                    | 1823 ++++++++++++--------
 lib/scripts/jquery/jquery-ui.min.js                |   20 +-
 lib/scripts/jquery/jquery.js                       |  195 ++-
 lib/scripts/jquery/jquery.min.js                   |    9 +-
 lib/scripts/jquery/update.sh                       |   10 +-
 26 files changed, 1391 insertions(+), 803 deletions(-)
 create mode 100644 inc/lang/ka/jquery.ui.datepicker.js
 create mode 100644 inc/lang/ta/jquery.ui.datepicker.js
 delete mode 100644 lib/scripts/jquery/jquery-ui-theme/images/animated-overlay.gif

diff --git a/inc/lang/ar/jquery.ui.datepicker.js b/inc/lang/ar/jquery.ui.datepicker.js
index c93fed48d..c9ee84a54 100644
--- a/inc/lang/ar/jquery.ui.datepicker.js
+++ b/inc/lang/ar/jquery.ui.datepicker.js
@@ -1,6 +1,7 @@
 /* Arabic Translation for jQuery UI date picker plugin. */
-/* Khaled Alhourani -- me@khaledalhourani.com */
-/* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
+/* Used in most of Arab countries, primarily in Bahrain, Kuwait, Oman, Qatar, Saudi Arabia and the United Arab Emirates, Egypt, Sudan and Yemen. */
+/* Written by Mohammed Alshehri -- m@dralshehri.com */
+
 (function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
@@ -18,15 +19,15 @@ datepicker.regional['ar'] = {
 	prevText: '&#x3C;السابق',
 	nextText: 'التالي&#x3E;',
 	currentText: 'اليوم',
-	monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'مايو', 'حزيران',
-	'تموز', 'آب', 'أيلول',	'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
+	monthNames: ['يناير', 'فبراير', 'مارس', 'أبريل', 'مايو', 'يونيو',
+	'يوليو', 'أغسطس', 'سبتمبر', 'أكتوبر', 'نوفمبر', 'ديسمبر'],
 	monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
 	dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
-	dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+	dayNamesShort: ['أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة', 'سبت'],
 	dayNamesMin: ['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'],
 	weekHeader: 'أسبوع',
 	dateFormat: 'dd/mm/yy',
-	firstDay: 6,
+	firstDay: 0,
 		isRTL: true,
 	showMonthAfterYear: false,
 	yearSuffix: ''};
diff --git a/inc/lang/el/jquery.ui.datepicker.js b/inc/lang/el/jquery.ui.datepicker.js
index a852a77d7..362e248f8 100644
--- a/inc/lang/el/jquery.ui.datepicker.js
+++ b/inc/lang/el/jquery.ui.datepicker.js
@@ -16,7 +16,7 @@ datepicker.regional['el'] = {
 	closeText: 'Κλείσιμο',
 	prevText: 'Προηγούμενος',
 	nextText: 'Επόμενος',
-	currentText: 'Τρέχων Μήνας',
+	currentText: 'Σήμερα',
 	monthNames: ['Ιανουάριος','Φεβρουάριος','Μάρτιος','Απρίλιος','Μάιος','Ιούνιος',
 	'Ιούλιος','Αύγουστος','Σεπτέμβριος','Οκτώβριος','Νοέμβριος','Δεκέμβριος'],
 	monthNamesShort: ['Ιαν','Φεβ','Μαρ','Απρ','Μαι','Ιουν',
diff --git a/inc/lang/fa/jquery.ui.datepicker.js b/inc/lang/fa/jquery.ui.datepicker.js
index 8ffd66411..71f8a2852 100644
--- a/inc/lang/fa/jquery.ui.datepicker.js
+++ b/inc/lang/fa/jquery.ui.datepicker.js
@@ -19,18 +19,18 @@ datepicker.regional['fa'] = {
 	nextText: 'بعدی&#x3E;',
 	currentText: 'امروز',
 	monthNames: [
-		'فروردين',
-		'ارديبهشت',
-		'خرداد',
-		'تير',
-		'مرداد',
-		'شهريور',
-		'مهر',
-		'آبان',
-		'آذر',
-		'دی',
-		'بهمن',
-		'اسفند'
+		'ژانویه',
+		'فوریه',
+		'مارس',
+		'آوریل',
+		'مه',
+		'ژوئن',
+		'ژوئیه',
+		'اوت',
+		'سپتامبر',
+		'اکتبر',
+		'نوامبر',
+		'دسامبر'
 	],
 	monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
 	dayNames: [
diff --git a/inc/lang/fr/jquery.ui.datepicker.js b/inc/lang/fr/jquery.ui.datepicker.js
index 2f5ff3cbe..6b6e0b35f 100644
--- a/inc/lang/fr/jquery.ui.datepicker.js
+++ b/inc/lang/fr/jquery.ui.datepicker.js
@@ -21,7 +21,7 @@ datepicker.regional['fr'] = {
 	currentText: 'Aujourd\'hui',
 	monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
 		'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
-	monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
+	monthNamesShort: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin',
 		'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
 	dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
 	dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
diff --git a/inc/lang/ka/jquery.ui.datepicker.js b/inc/lang/ka/jquery.ui.datepicker.js
new file mode 100644
index 000000000..69103542b
--- /dev/null
+++ b/inc/lang/ka/jquery.ui.datepicker.js
@@ -0,0 +1,35 @@
+/* Georgian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Lado Lomidze (lado.lomidze@gmail.com). */
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define([ "../datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+}(function( datepicker ) {
+
+datepicker.regional['ka'] = {
+	closeText: 'დახურვა',
+	prevText: '&#x3c; წინა',
+	nextText: 'შემდეგი &#x3e;',
+	currentText: 'დღეს',
+	monthNames: ['იანვარი','თებერვალი','მარტი','აპრილი','მაისი','ივნისი', 'ივლისი','აგვისტო','სექტემბერი','ოქტომბერი','ნოემბერი','დეკემბერი'],
+	monthNamesShort: ['იან','თებ','მარ','აპრ','მაი','ივნ', 'ივლ','აგვ','სექ','ოქტ','ნოე','დეკ'],
+	dayNames: ['კვირა','ორშაბათი','სამშაბათი','ოთხშაბათი','ხუთშაბათი','პარასკევი','შაბათი'],
+	dayNamesShort: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
+	dayNamesMin: ['კვ','ორშ','სამ','ოთხ','ხუთ','პარ','შაბ'],
+	weekHeader: 'კვირა',
+	dateFormat: 'dd-mm-yy',
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['ka']);
+
+return datepicker.regional['ka'];
+
+}));
diff --git a/inc/lang/ta/jquery.ui.datepicker.js b/inc/lang/ta/jquery.ui.datepicker.js
new file mode 100644
index 000000000..113a20849
--- /dev/null
+++ b/inc/lang/ta/jquery.ui.datepicker.js
@@ -0,0 +1,37 @@
+/* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by S A Sureshkumar (saskumar@live.com). */
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define([ "../datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+}(function( datepicker ) {
+
+datepicker.regional['ta'] = {
+	closeText: 'மூடு',
+	prevText: 'முன்னையது',
+	nextText: 'அடுத்தது',
+	currentText: 'இன்று',
+	monthNames: ['தை','மாசி','பங்குனி','சித்திரை','வைகாசி','ஆனி',
+	'ஆடி','ஆவணி','புரட்டாசி','ஐப்பசி','கார்த்திகை','மார்கழி'],
+	monthNamesShort: ['தை','மாசி','பங்','சித்','வைகா','ஆனி',
+	'ஆடி','ஆவ','புர','ஐப்','கார்','மார்'],
+	dayNames: ['ஞாயிற்றுக்கிழமை','திங்கட்கிழமை','செவ்வாய்க்கிழமை','புதன்கிழமை','வியாழக்கிழமை','வெள்ளிக்கிழமை','சனிக்கிழமை'],
+	dayNamesShort: ['ஞாயிறு','திங்கள்','செவ்வாய்','புதன்','வியாழன்','வெள்ளி','சனி'],
+	dayNamesMin: ['ஞா','தி','செ','பு','வி','வெ','ச'],
+	weekHeader: 'Не',
+	dateFormat: 'dd/mm/yy',
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['ta']);
+
+return datepicker.regional['ta'];
+
+}));
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/animated-overlay.gif b/lib/scripts/jquery/jquery-ui-theme/images/animated-overlay.gif
deleted file mode 100644
index d441f75eb..000000000
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/animated-overlay.gif and /dev/null differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
index f5c2d583d..03b1d7216 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png
index e36540bbf..882c78c4f 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
index 8225e3e18..e17b8809c 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png
index 3e56dbdca..de3b7cc4d 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png
index d5265f4dd..74ff8a2f5 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
index 1d509f45a..08cf4c38a 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png
index 38349845c..e7b6f8322 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index a374f7501..fea66d4dd 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png
index a13f9b4dd..e556b9a90 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_222222_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png
index 945c3d704..54f652fec 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png
index 60ec1c692..1a2b52e89 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_454545_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png
index 48de3ed6b..88c31424b 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_888888_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png
index b987966e0..8da7fb082 100644
Binary files a/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png and b/lib/scripts/jquery/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/lib/scripts/jquery/jquery-ui-theme/smoothness.css b/lib/scripts/jquery/jquery-ui-theme/smoothness.css
index 93a79cad2..2fa859a43 100644
--- a/lib/scripts/jquery/jquery-ui-theme/smoothness.css
+++ b/lib/scripts/jquery/jquery-ui-theme/smoothness.css
@@ -1,8 +1,8 @@
-/*! jQuery UI - v1.11.0 - 2014-06-26
+/*! jQuery UI - v1.11.4 - 2015-03-11
 * http://jqueryui.com
 * Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
 * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
 
 /* Layout helpers
 ----------------------------------*/
@@ -48,7 +48,7 @@
 	left: 0;
 	position: absolute;
 	opacity: 0;
-	filter:Alpha(Opacity=0);
+	filter:Alpha(Opacity=0); /* support: IE8 */
 }
 
 .ui-front {
@@ -274,7 +274,7 @@ button.ui-button::-moz-focus-inner {
 }
 .ui-datepicker select.ui-datepicker-month,
 .ui-datepicker select.ui-datepicker-year {
-	width: 49%;
+	width: 45%;
 }
 .ui-datepicker table {
 	width: 100%;
@@ -514,9 +514,9 @@ button.ui-button::-moz-focus-inner {
 	height: 100%;
 }
 .ui-progressbar .ui-progressbar-overlay {
-	background: url("images/animated-overlay.gif");
+	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
 	height: 100%;
-	filter: alpha(opacity=25);
+	filter: alpha(opacity=25); /* support: IE8 */
 	opacity: 0.25;
 }
 .ui-progressbar-indeterminate .ui-progressbar-value {
@@ -672,7 +672,7 @@ button.ui-button::-moz-focus-inner {
 	background-position: 0 0;
 }
 
-/* For IE8 - See #6727 */
+/* support: IE8 - See #6727 */
 .ui-slider.ui-state-disabled .ui-slider-handle,
 .ui-slider.ui-state-disabled .ui-slider-range {
 	filter: inherit;
@@ -954,18 +954,18 @@ body .ui-tooltip {
 .ui-widget-content .ui-priority-secondary,
 .ui-widget-header .ui-priority-secondary {
 	opacity: .7;
-	filter:Alpha(Opacity=70);
+	filter:Alpha(Opacity=70); /* support: IE8 */
 	font-weight: normal;
 }
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled,
 .ui-widget-header .ui-state-disabled {
 	opacity: .35;
-	filter:Alpha(Opacity=35);
+	filter:Alpha(Opacity=35); /* support: IE8 */
 	background-image: none;
 }
 .ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
 }
 
 /* Icons
@@ -1213,13 +1213,13 @@ body .ui-tooltip {
 .ui-widget-overlay {
 	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
 	opacity: .3;
-	filter: Alpha(Opacity=30);
+	filter: Alpha(Opacity=30); /* support: IE8 */
 }
 .ui-widget-shadow {
 	margin: -8px 0 0 -8px;
 	padding: 8px;
 	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
 	opacity: .3;
-	filter: Alpha(Opacity=30);
+	filter: Alpha(Opacity=30); /* support: IE8 */
 	border-radius: 8px;
 }
diff --git a/lib/scripts/jquery/jquery-ui.js b/lib/scripts/jquery/jquery-ui.js
index 670e39a8f..31ee9cd81 100644
--- a/lib/scripts/jquery/jquery-ui.js
+++ b/lib/scripts/jquery/jquery-ui.js
@@ -1,7 +1,7 @@
-/*! jQuery UI - v1.11.0 - 2014-06-26
+/*! jQuery UI - v1.11.4 - 2015-03-11
 * http://jqueryui.com
 * Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
 
 (function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
@@ -15,10 +15,10 @@
 	}
 }(function( $ ) {
 /*!
- * jQuery UI Core 1.11.0
+ * jQuery UI Core 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -30,7 +30,7 @@
 $.ui = $.ui || {};
 
 $.extend( $.ui, {
-	version: "1.11.0",
+	version: "1.11.4",
 
 	keyCode: {
 		BACKSPACE: 8,
@@ -54,15 +54,16 @@ $.extend( $.ui, {
 
 // plugins
 $.fn.extend({
-	scrollParent: function() {
+	scrollParent: function( includeHidden ) {
 		var position = this.css( "position" ),
 			excludeStaticParent = position === "absolute",
+			overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
 			scrollParent = this.parents().filter( function() {
 				var parent = $( this );
 				if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
 					return false;
 				}
-				return (/(auto|scroll)/).test( parent.css( "overflow" ) + parent.css( "overflow-y" ) + parent.css( "overflow-x" ) );
+				return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) + parent.css( "overflow-x" ) );
 			}).eq( 0 );
 
 		return position === "fixed" || !scrollParent.length ? $( this[ 0 ].ownerDocument || document ) : scrollParent;
@@ -99,10 +100,10 @@ function focusable( element, isTabIndexNotNaN ) {
 		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
 			return false;
 		}
-		img = $( "img[usemap=#" + mapName + "]" )[0];
+		img = $( "img[usemap='#" + mapName + "']" )[ 0 ];
 		return !!img && visible( img );
 	}
-	return ( /input|select|textarea|button|object/.test( nodeName ) ?
+	return ( /^(input|select|textarea|button|object)$/.test( nodeName ) ?
 		!element.disabled :
 		"a" === nodeName ?
 			element.href || isTabIndexNotNaN :
@@ -308,10 +309,10 @@ $.ui.plugin = {
 
 
 /*!
- * jQuery UI Widget 1.11.0
+ * jQuery UI Widget 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -324,11 +325,18 @@ var widget_uuid = 0,
 
 $.cleanData = (function( orig ) {
 	return function( elems ) {
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+		var events, elem, i;
+		for ( i = 0; (elem = elems[i]) != null; i++ ) {
 			try {
-				$( elem ).triggerHandler( "remove" );
+
+				// Only trigger remove when necessary to save time
+				events = $._data( elem, "events" );
+				if ( events && events.remove ) {
+					$( elem ).triggerHandler( "remove" );
+				}
+
 			// http://bugs.jquery.com/ticket/8235
-			} catch( e ) {}
+			} catch ( e ) {}
 		}
 		orig( elems );
 	};
@@ -482,11 +490,6 @@ $.widget.bridge = function( name, object ) {
 			args = widget_slice.call( arguments, 1 ),
 			returnValue = this;
 
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.widget.extend.apply( null, [ options ].concat(args) ) :
-			options;
-
 		if ( isMethodCall ) {
 			this.each(function() {
 				var methodValue,
@@ -511,6 +514,12 @@ $.widget.bridge = function( name, object ) {
 				}
 			});
 		} else {
+
+			// Allow multiple hashes to be passed on init
+			if ( args.length ) {
+				options = $.widget.extend.apply( null, [ options ].concat(args) );
+			}
+
 			this.each(function() {
 				var instance = $.data( this, fullName );
 				if ( instance ) {
@@ -546,10 +555,6 @@ $.Widget.prototype = {
 		this.element = $( element );
 		this.uuid = widget_uuid++;
 		this.eventNamespace = "." + this.widgetName + this.uuid;
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
 
 		this.bindings = $();
 		this.hoverable = $();
@@ -572,6 +577,11 @@ $.Widget.prototype = {
 			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
 		}
 
+		this.options = $.widget.extend( {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
 		this._create();
 		this._trigger( "create", null, this._getCreateEventData() );
 		this._init();
@@ -734,8 +744,14 @@ $.Widget.prototype = {
 	},
 
 	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
+			this.eventNamespace;
 		element.unbind( eventName ).undelegate( eventName );
+
+		// Clear the stack to avoid memory leaks (#10056)
+		this.bindings = $( this.bindings.not( element ).get() );
+		this.focusable = $( this.focusable.not( element ).get() );
+		this.hoverable = $( this.hoverable.not( element ).get() );
 	},
 
 	_delay: function( handler, delay ) {
@@ -841,10 +857,10 @@ var widget = $.widget;
 
 
 /*!
- * jQuery UI Mouse 1.11.0
+ * jQuery UI Mouse 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -858,7 +874,7 @@ $( document ).mouseup( function() {
 });
 
 var mouse = $.widget("ui.mouse", {
-	version: "1.11.0",
+	version: "1.11.4",
 	options: {
 		cancel: "input,textarea,button,select,option",
 		distance: 1,
@@ -899,6 +915,8 @@ var mouse = $.widget("ui.mouse", {
 			return;
 		}
 
+		this._mouseMoved = false;
+
 		// we may have missed mouseup (out of window)
 		(this._mouseStarted && this._mouseUp(event));
 
@@ -952,13 +970,23 @@ var mouse = $.widget("ui.mouse", {
 	},
 
 	_mouseMove: function(event) {
-		// IE mouseup check - mouseup happened when mouse was out of window
-		if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
-			return this._mouseUp(event);
+		// Only check for mouseups outside the document if you've moved inside the document
+		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
+		// fire a mousemove event if content is placed under the cursor. See #7778
+		// Support: IE <9
+		if ( this._mouseMoved ) {
+			// IE mouseup check - mouseup happened when mouse was out of window
+			if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
+				return this._mouseUp(event);
+
+			// Iframe mouseup check - mouseup occurred in another document
+			} else if ( !event.which ) {
+				return this._mouseUp( event );
+			}
+		}
 
-		// Iframe mouseup check - mouseup occurred in another document
-		} else if ( !event.which ) {
-			return this._mouseUp( event );
+		if ( event.which || event.button ) {
+			this._mouseMoved = true;
 		}
 
 		if (this._mouseStarted) {
@@ -1015,10 +1043,10 @@ var mouse = $.widget("ui.mouse", {
 
 
 /*!
- * jQuery UI Position 1.11.0
+ * jQuery UI Position 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -1129,8 +1157,11 @@ $.position = {
 			offset: withinElement.offset() || { left: 0, top: 0 },
 			scrollLeft: withinElement.scrollLeft(),
 			scrollTop: withinElement.scrollTop(),
-			width: isWindow ? withinElement.width() : withinElement.outerWidth(),
-			height: isWindow ? withinElement.height() : withinElement.outerHeight()
+
+			// support: jQuery 1.6.x
+			// jQuery 1.6 doesn't support .outerWidth/Height() on documents or windows
+			width: isWindow || isDocument ? withinElement.width() : withinElement.outerWidth(),
+			height: isWindow || isDocument ? withinElement.height() : withinElement.outerHeight()
 		};
 	}
 };
@@ -1451,12 +1482,12 @@ $.ui.position = {
 				newOverBottom;
 			if ( overTop < 0 ) {
 				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
-				if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
+				if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
 					position.top += myOffset + atOffset + offset;
 				}
 			} else if ( overBottom > 0 ) {
 				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
-				if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
+				if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
 					position.top += myOffset + atOffset + offset;
 				}
 			}
@@ -1519,10 +1550,10 @@ var position = $.ui.position;
 
 
 /*!
- * jQuery UI Accordion 1.11.0
+ * jQuery UI Accordion 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -1531,7 +1562,7 @@ var position = $.ui.position;
 
 
 var accordion = $.widget( "ui.accordion", {
-	version: "1.11.0",
+	version: "1.11.4",
 	options: {
 		active: 0,
 		animate: {},
@@ -1765,13 +1796,22 @@ var accordion = $.widget( "ui.accordion", {
 	},
 
 	_processPanels: function() {
+		var prevHeaders = this.headers,
+			prevPanels = this.panels;
+
 		this.headers = this.element.find( this.options.header )
 			.addClass( "ui-accordion-header ui-state-default ui-corner-all" );
 
-		this.headers.next()
+		this.panels = this.headers.next()
 			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
 			.filter( ":not(.ui-accordion-content-active)" )
 			.hide();
+
+		// Avoid memory leaks (#10056)
+		if ( prevPanels ) {
+			this._off( prevHeaders.not( this.headers ) );
+			this._off( prevPanels.not( this.panels ) );
+		}
 	},
 
 	_refresh: function() {
@@ -1980,7 +2020,10 @@ var accordion = $.widget( "ui.accordion", {
 		toHide.attr({
 			"aria-hidden": "true"
 		});
-		toHide.prev().attr( "aria-selected", "false" );
+		toHide.prev().attr({
+			"aria-selected": "false",
+			"aria-expanded": "false"
+		});
 		// if we're switching panels, remove the old header from the tab order
 		// if we're opening from collapsed state, remove the previous header from the tab order
 		// if we're collapsing, then keep the collapsing header in the tab order
@@ -1991,7 +2034,7 @@ var accordion = $.widget( "ui.accordion", {
 			});
 		} else if ( toShow.length ) {
 			this.headers.filter(function() {
-				return $( this ).attr( "tabIndex" ) === 0;
+				return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0;
 			})
 			.attr( "tabIndex", -1 );
 		}
@@ -2001,8 +2044,8 @@ var accordion = $.widget( "ui.accordion", {
 			.prev()
 				.attr({
 					"aria-selected": "true",
-					tabIndex: 0,
-					"aria-expanded": "true"
+					"aria-expanded": "true",
+					tabIndex: 0
 				});
 	},
 
@@ -2010,6 +2053,7 @@ var accordion = $.widget( "ui.accordion", {
 		var total, easing, duration,
 			that = this,
 			adjust = 0,
+			boxSizing = toShow.css( "box-sizing" ),
 			down = toShow.length &&
 				( !toHide.length || ( toShow.index() < toHide.index() ) ),
 			animate = this.options.animate || {},
@@ -2052,7 +2096,9 @@ var accordion = $.widget( "ui.accordion", {
 				step: function( now, fx ) {
 					fx.now = Math.round( now );
 					if ( fx.prop !== "height" ) {
-						adjust += fx.now;
+						if ( boxSizing === "content-box" ) {
+							adjust += fx.now;
+						}
 					} else if ( that.options.heightStyle !== "content" ) {
 						fx.now = Math.round( total - toHide.outerHeight() - adjust );
 						adjust = 0;
@@ -2080,10 +2126,10 @@ var accordion = $.widget( "ui.accordion", {
 
 
 /*!
- * jQuery UI Menu 1.11.0
+ * jQuery UI Menu 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -2092,7 +2138,7 @@ var accordion = $.widget( "ui.accordion", {
 
 
 var menu = $.widget( "ui.menu", {
-	version: "1.11.0",
+	version: "1.11.4",
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
@@ -2167,6 +2213,12 @@ var menu = $.widget( "ui.menu", {
 				}
 			},
 			"mouseenter .ui-menu-item": function( event ) {
+				// Ignore mouse events while typeahead is active, see #10458.
+				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
+				// is over an item in the menu
+				if ( this.previousFilter ) {
+					return;
+				}
 				var target = $( event.currentTarget );
 				// Remove ui-state-active class from siblings of the newly focused menu item
 				// to avoid a jump caused by adjacent elements both having a class with a border
@@ -2246,13 +2298,9 @@ var menu = $.widget( "ui.menu", {
 	},
 
 	_keydown: function( event ) {
-		var match, prev, character, skip, regex,
+		var match, prev, character, skip,
 			preventDefault = true;
 
-		function escape( value ) {
-			return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-		}
-
 		switch ( event.keyCode ) {
 		case $.ui.keyCode.PAGE_UP:
 			this.previousPage( event );
@@ -2301,10 +2349,7 @@ var menu = $.widget( "ui.menu", {
 				character = prev + character;
 			}
 
-			regex = new RegExp( "^" + escape( character ), "i" );
-			match = this.activeMenu.find( this.options.items ).filter(function() {
-				return regex.test( $( this ).text() );
-			});
+			match = this._filterMenuItems( character );
 			match = skip && match.index( this.active.next() ) !== -1 ?
 				this.active.nextAll( ".ui-menu-item" ) :
 				match;
@@ -2313,22 +2358,15 @@ var menu = $.widget( "ui.menu", {
 			// to move down the menu to the first item that starts with that character
 			if ( !match.length ) {
 				character = String.fromCharCode( event.keyCode );
-				regex = new RegExp( "^" + escape( character ), "i" );
-				match = this.activeMenu.find( this.options.items ).filter(function() {
-					return regex.test( $( this ).text() );
-				});
+				match = this._filterMenuItems( character );
 			}
 
 			if ( match.length ) {
 				this.focus( event, match );
-				if ( match.length > 1 ) {
-					this.previousFilter = character;
-					this.filterTimer = this._delay(function() {
-						delete this.previousFilter;
-					}, 1000 );
-				} else {
+				this.previousFilter = character;
+				this.filterTimer = this._delay(function() {
 					delete this.previousFilter;
-				}
+				}, 1000 );
 			} else {
 				delete this.previousFilter;
 			}
@@ -2700,15 +2738,29 @@ var menu = $.widget( "ui.menu", {
 			this.collapseAll( event, true );
 		}
 		this._trigger( "select", event, ui );
+	},
+
+	_filterMenuItems: function(character) {
+		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
+			regex = new RegExp( "^" + escapedCharacter, "i" );
+
+		return this.activeMenu
+			.find( this.options.items )
+
+			// Only match on items, not dividers or other content (#10571)
+			.filter( ".ui-menu-item" )
+			.filter(function() {
+				return regex.test( $.trim( $( this ).text() ) );
+			});
 	}
 });
 
 
 /*!
- * jQuery UI Autocomplete 1.11.0
+ * jQuery UI Autocomplete 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -2717,7 +2769,7 @@ var menu = $.widget( "ui.menu", {
 
 
 $.widget( "ui.autocomplete", {
-	version: "1.11.0",
+	version: "1.11.4",
 	defaultElement: "<input>",
 	options: {
 		appendTo: null,
@@ -2820,7 +2872,9 @@ $.widget( "ui.autocomplete", {
 					break;
 				case keyCode.ESCAPE:
 					if ( this.menu.element.is( ":visible" ) ) {
-						this._value( this.term );
+						if ( !this.isMultiLine ) {
+							this._value( this.term );
+						}
 						this.close( event );
 						// Different browsers have different default behavior for escape
 						// Single press can mean undo or clear
@@ -2956,7 +3010,7 @@ $.widget( "ui.autocomplete", {
 
 				// Announce the value in the liveRegion
 				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && jQuery.trim( label ).length ) {
+				if ( label && $.trim( label ).length ) {
 					this.liveRegion.children().hide();
 					$( "<div>" ).text( label ).appendTo( this.liveRegion );
 				}
@@ -3315,10 +3369,10 @@ var autocomplete = $.ui.autocomplete;
 
 
 /*!
- * jQuery UI Button 1.11.0
+ * jQuery UI Button 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -3354,7 +3408,7 @@ var lastActive,
 	};
 
 $.widget( "ui.button", {
-	version: "1.11.0",
+	version: "1.11.4",
 	defaultElement: "<button>",
 	options: {
 		disabled: null,
@@ -3650,7 +3704,7 @@ $.widget( "ui.button", {
 });
 
 $.widget( "ui.buttonset", {
-	version: "1.11.0",
+	version: "1.11.4",
 	options: {
 		items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
 	},
@@ -3712,10 +3766,10 @@ var button = $.ui.button;
 
 
 /*!
- * jQuery UI Datepicker 1.11.0
+ * jQuery UI Datepicker 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -3723,7 +3777,7 @@ var button = $.ui.button;
  */
 
 
-$.extend($.ui, { datepicker: { version: "1.11.0" } });
+$.extend($.ui, { datepicker: { version: "1.11.4" } });
 
 var datepicker_instActive;
 
@@ -4089,6 +4143,10 @@ $.extend(Datepicker.prototype, {
 		} else if (nodeName === "div" || nodeName === "span") {
 			$target.removeClass(this.markerClassName).empty();
 		}
+
+		if ( datepicker_instActive === inst ) {
+			datepicker_instActive = null;
+		}
 	},
 
 	/* Enable the date picker to a jQuery selection.
@@ -4499,12 +4557,16 @@ $.extend(Datepicker.prototype, {
 		datepicker_instActive = inst; // for delegate hover events
 		inst.dpDiv.empty().append(this._generateHTML(inst));
 		this._attachHandlers(inst);
-		inst.dpDiv.find("." + this._dayOverClass + " a");
 
 		var origyearshtml,
 			numMonths = this._getNumberOfMonths(inst),
 			cols = numMonths[1],
-			width = 17;
+			width = 17,
+			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
+
+		if ( activeCell.length > 0 ) {
+			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
+		}
 
 		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
 		if (cols > 1) {
@@ -4838,7 +4900,8 @@ $.extend(Datepicker.prototype, {
 				var isDoubled = lookAhead(match),
 					size = (match === "@" ? 14 : (match === "!" ? 20 :
 					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
-					digits = new RegExp("^\\d{1," + size + "}"),
+					minSize = (match === "y" ? size : 1),
+					digits = new RegExp("^\\d{" + minSize + "," + size + "}"),
 					num = value.substring(iValue).match(digits);
 				if (!num) {
 					throw "Missing number at position " + iValue;
@@ -5699,18 +5762,20 @@ function datepicker_bindHover(dpDiv) {
 				$(this).removeClass("ui-datepicker-next-hover");
 			}
 		})
-		.delegate(selector, "mouseover", function(){
-			if (!$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? dpDiv.parent()[0] : datepicker_instActive.input[0])) {
-				$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-				$(this).addClass("ui-state-hover");
-				if (this.className.indexOf("ui-datepicker-prev") !== -1) {
-					$(this).addClass("ui-datepicker-prev-hover");
-				}
-				if (this.className.indexOf("ui-datepicker-next") !== -1) {
-					$(this).addClass("ui-datepicker-next-hover");
-				}
-			}
-		});
+		.delegate( selector, "mouseover", datepicker_handleMouseover );
+}
+
+function datepicker_handleMouseover() {
+	if (!$.datepicker._isDisabledDatepicker( datepicker_instActive.inline? datepicker_instActive.dpDiv.parent()[0] : datepicker_instActive.input[0])) {
+		$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+		$(this).addClass("ui-state-hover");
+		if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+			$(this).addClass("ui-datepicker-prev-hover");
+		}
+		if (this.className.indexOf("ui-datepicker-next") !== -1) {
+			$(this).addClass("ui-datepicker-next-hover");
+		}
+	}
 }
 
 /* jQuery extend now ignores nulls! */
@@ -5766,16 +5831,16 @@ $.fn.datepicker = function(options){
 $.datepicker = new Datepicker(); // singleton instance
 $.datepicker.initialized = false;
 $.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.11.0";
+$.datepicker.version = "1.11.4";
 
 var datepicker = $.datepicker;
 
 
 /*!
- * jQuery UI Draggable 1.11.0
+ * jQuery UI Draggable 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -5784,7 +5849,7 @@ var datepicker = $.datepicker;
 
 
 $.widget("ui.draggable", $.ui.mouse, {
-	version: "1.11.0",
+	version: "1.11.4",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -5819,8 +5884,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 	_create: function() {
 
-		if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
-			this.element[0].style.position = "relative";
+		if ( this.options.helper === "original" ) {
+			this._setPositionRelative();
 		}
 		if (this.options.addClasses){
 			this.element.addClass("ui-draggable");
@@ -5836,6 +5901,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 	_setOption: function( key, value ) {
 		this._super( key, value );
 		if ( key === "handle" ) {
+			this._removeHandleClassName();
 			this._setHandleClassName();
 		}
 	},
@@ -5851,20 +5917,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 
 	_mouseCapture: function(event) {
+		var o = this.options;
 
-		var document = this.document[ 0 ],
-			o = this.options;
-
-		// support: IE9
-		// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-		try {
-			// Support: IE9+
-			// If the <body> is blurred, IE will switch windows, see #9520
-			if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== "body" ) {
-				// Blur any element that currently has focus, see #4261
-				$( document.activeElement ).blur();
-			}
-		} catch ( error ) {}
+		this._blurActiveElement( event );
 
 		// among others, prevent a drag on a resizable-handle
 		if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
@@ -5877,20 +5932,54 @@ $.widget("ui.draggable", $.ui.mouse, {
 			return false;
 		}
 
-		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
-			$("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
-			.css({
-				width: this.offsetWidth + "px", height: this.offsetHeight + "px",
-				position: "absolute", opacity: "0.001", zIndex: 1000
-			})
-			.css($(this).offset())
-			.appendTo("body");
-		});
+		this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix );
 
 		return true;
 
 	},
 
+	_blockFrames: function( selector ) {
+		this.iframeBlocks = this.document.find( selector ).map(function() {
+			var iframe = $( this );
+
+			return $( "<div>" )
+				.css( "position", "absolute" )
+				.appendTo( iframe.parent() )
+				.outerWidth( iframe.outerWidth() )
+				.outerHeight( iframe.outerHeight() )
+				.offset( iframe.offset() )[ 0 ];
+		});
+	},
+
+	_unblockFrames: function() {
+		if ( this.iframeBlocks ) {
+			this.iframeBlocks.remove();
+			delete this.iframeBlocks;
+		}
+	},
+
+	_blurActiveElement: function( event ) {
+		var document = this.document[ 0 ];
+
+		// Only need to blur if the event occurred on the draggable itself, see #10527
+		if ( !this.handleElement.is( event.target ) ) {
+			return;
+		}
+
+		// support: IE9
+		// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+		try {
+
+			// Support: IE9, IE10
+			// If the <body> is blurred, IE will switch windows, see #9520
+			if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== "body" ) {
+
+				// Blur any element that currently has focus, see #4261
+				$( document.activeElement ).blur();
+			}
+		} catch ( error ) {}
+	},
+
 	_mouseStart: function(event) {
 
 		var o = this.options;
@@ -5918,28 +6007,15 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 		//Store the helper's css position
 		this.cssPosition = this.helper.css( "position" );
-		this.scrollParent = this.helper.scrollParent();
+		this.scrollParent = this.helper.scrollParent( true );
 		this.offsetParent = this.helper.offsetParent();
-		this.offsetParentCssPosition = this.offsetParent.css( "position" );
+		this.hasFixedAncestor = this.helper.parents().filter(function() {
+				return $( this ).css( "position" ) === "fixed";
+			}).length > 0;
 
 		//The element's absolute position on the page minus margins
-		this.offset = this.positionAbs = this.element.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		//Reset scroll cache
-		this.offset.scroll = false;
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
+		this.positionAbs = this.element.offset();
+		this._refreshOffsets( event );
 
 		//Generate the original position
 		this.originalPosition = this.position = this._generatePosition( event, false );
@@ -5966,6 +6042,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 			$.ui.ddmanager.prepareOffsets(this, event);
 		}
 
+		// Reset helper's right/bottom css if they're set and set explicit width/height instead
+		// as this prevents resizing of elements with right/bottom set (see #7772)
+		this._normalizeRightBottom();
+
 		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
 
 		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
@@ -5976,9 +6056,24 @@ $.widget("ui.draggable", $.ui.mouse, {
 		return true;
 	},
 
+	_refreshOffsets: function( event ) {
+		this.offset = {
+			top: this.positionAbs.top - this.margins.top,
+			left: this.positionAbs.left - this.margins.left,
+			scroll: false,
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset()
+		};
+
+		this.offset.click = {
+			left: event.pageX - this.offset.left,
+			top: event.pageY - this.offset.top
+		};
+	},
+
 	_mouseDrag: function(event, noPropagation) {
 		// reset any necessary cached properties (see #5009)
-		if ( this.offsetParentCssPosition === "fixed" ) {
+		if ( this.hasFixedAncestor ) {
 			this.offset.parent = this._getParentOffset();
 		}
 
@@ -6036,19 +6131,19 @@ $.widget("ui.draggable", $.ui.mouse, {
 		return false;
 	},
 
-	_mouseUp: function(event) {
-		//Remove frame helpers
-		$("div.ui-draggable-iframeFix").each(function() {
-			this.parentNode.removeChild(this);
-		});
+	_mouseUp: function( event ) {
+		this._unblockFrames();
 
 		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
 		if ( $.ui.ddmanager ) {
 			$.ui.ddmanager.dragStop(this, event);
 		}
 
-		// The interaction is over; whether or not the click resulted in a drag, focus the element
-		this.element.focus();
+		// Only need to focus if the event occurred on the draggable itself, see #10527
+		if ( this.handleElement.is( event.target ) ) {
+			// The interaction is over; whether or not the click resulted in a drag, focus the element
+			this.element.focus();
+		}
 
 		return $.ui.mouse.prototype._mouseUp.call(this, event);
 	},
@@ -6072,25 +6167,36 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 
 	_setHandleClassName: function() {
-		this._removeHandleClassName();
-		$( this.options.handle || this.element ).addClass( "ui-draggable-handle" );
+		this.handleElement = this.options.handle ?
+			this.element.find( this.options.handle ) : this.element;
+		this.handleElement.addClass( "ui-draggable-handle" );
 	},
 
 	_removeHandleClassName: function() {
-		this.element.find( ".ui-draggable-handle" )
-			.addBack()
-			.removeClass( "ui-draggable-handle" );
+		this.handleElement.removeClass( "ui-draggable-handle" );
 	},
 
 	_createHelper: function(event) {
 
 		var o = this.options,
-			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[ 0 ], [ event ])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
+			helperIsFunction = $.isFunction( o.helper ),
+			helper = helperIsFunction ?
+				$( o.helper.apply( this.element[ 0 ], [ event ] ) ) :
+				( o.helper === "clone" ?
+					this.element.clone().removeAttr( "id" ) :
+					this.element );
 
 		if (!helper.parents("body").length) {
 			helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
 		}
 
+		// http://bugs.jqueryui.com/ticket/9446
+		// a helper function can return the original element
+		// which wouldn't have been set to relative in _create
+		if ( helperIsFunction && helper[ 0 ] === this.element[ 0 ] ) {
+			this._setPositionRelative();
+		}
+
 		if (helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
 			helper.css("position", "absolute");
 		}
@@ -6099,6 +6205,12 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 	},
 
+	_setPositionRelative: function() {
+		if ( !( /^(?:r|a|f)/ ).test( this.element.css( "position" ) ) ) {
+			this.element[ 0 ].style.position = "relative";
+		}
+	},
+
 	_adjustOffsetFromHelper: function(obj) {
 		if (typeof obj === "string") {
 			obj = obj.split(" ");
@@ -6144,8 +6256,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 
 		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"), 10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"), 10) || 0)
 		};
 
 	},
@@ -6167,10 +6279,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 	_cacheMargins: function() {
 		this.margins = {
-			left: (parseInt(this.element.css("marginLeft"),10) || 0),
-			top: (parseInt(this.element.css("marginTop"),10) || 0),
-			right: (parseInt(this.element.css("marginRight"),10) || 0),
-			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
+			left: (parseInt(this.element.css("marginLeft"), 10) || 0),
+			top: (parseInt(this.element.css("marginTop"), 10) || 0),
+			right: (parseInt(this.element.css("marginRight"), 10) || 0),
+			bottom: (parseInt(this.element.css("marginBottom"), 10) || 0)
 		};
 	},
 
@@ -6183,11 +6295,11 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 	_setContainment: function() {
 
-		var over, c, ce,
+		var isUserScrollable, c, ce,
 			o = this.options,
 			document = this.document[ 0 ];
 
-		this.relative_container = null;
+		this.relativeContainer = null;
 
 		if ( !o.containment ) {
 			this.containment = null;
@@ -6230,15 +6342,25 @@ $.widget("ui.draggable", $.ui.mouse, {
 			return;
 		}
 
-		over = c.css( "overflow" ) !== "hidden";
+		isUserScrollable = /(scroll|auto)/.test( c.css( "overflow" ) );
 
 		this.containment = [
 			( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
 			( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ),
-			( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) - this.helperProportions.width - this.margins.left - this.margins.right,
-			( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) - this.helperProportions.height - this.margins.top  - this.margins.bottom
+			( isUserScrollable ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
+				( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) -
+				( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) -
+				this.helperProportions.width -
+				this.margins.left -
+				this.margins.right,
+			( isUserScrollable ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
+				( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) -
+				( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) -
+				this.helperProportions.height -
+				this.margins.top -
+				this.margins.bottom
 		];
-		this.relative_container = c;
+		this.relativeContainer = c;
 	},
 
 	_convertPositionTo: function(d, pos) {
@@ -6291,8 +6413,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 		// If we are not dragging yet, we won't check for options
 		if ( constrainPosition ) {
 			if ( this.containment ) {
-				if ( this.relative_container ){
-					co = this.relative_container.offset();
+				if ( this.relativeContainer ){
+					co = this.relativeContainer.offset();
 					containment = [
 						this.containment[ 0 ] + co.left,
 						this.containment[ 1 ] + co.top,
@@ -6366,16 +6488,29 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 	},
 
+	_normalizeRightBottom: function() {
+		if ( this.options.axis !== "y" && this.helper.css( "right" ) !== "auto" ) {
+			this.helper.width( this.helper.width() );
+			this.helper.css( "right", "auto" );
+		}
+		if ( this.options.axis !== "x" && this.helper.css( "bottom" ) !== "auto" ) {
+			this.helper.height( this.helper.height() );
+			this.helper.css( "bottom", "auto" );
+		}
+	},
+
 	// From now on bulk stuff - mainly helpers
 
-	_trigger: function(type, event, ui) {
+	_trigger: function( type, event, ui ) {
 		ui = ui || this._uiHash();
 		$.ui.plugin.call( this, type, [ event, ui, this ], true );
-		//The absolute position has to be recalculated after plugins
-		if (type === "drag") {
-			this.positionAbs = this._convertPositionTo("absolute");
+
+		// Absolute position and offset (see #6884 ) have to be recalculated after plugins
+		if ( /^(drag|start|stop)/.test( type ) ) {
+			this.positionAbs = this._convertPositionTo( "absolute" );
+			ui.offset = this.positionAbs;
 		}
-		return $.Widget.prototype._trigger.call(this, type, event, ui);
+		return $.Widget.prototype._trigger.call( this, type, event, ui );
 	},
 
 	plugins: {},
@@ -6391,160 +6526,201 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 });
 
-$.ui.plugin.add("draggable", "connectToSortable", {
-	start: function( event, ui, inst ) {
+$.ui.plugin.add( "draggable", "connectToSortable", {
+	start: function( event, ui, draggable ) {
+		var uiSortable = $.extend( {}, ui, {
+			item: draggable.element
+		});
 
-		var o = inst.options,
-			uiSortable = $.extend({}, ui, { item: inst.element });
-		inst.sortables = [];
-		$(o.connectToSortable).each(function() {
+		draggable.sortables = [];
+		$( draggable.options.connectToSortable ).each(function() {
 			var sortable = $( this ).sortable( "instance" );
-			if (sortable && !sortable.options.disabled) {
-				inst.sortables.push({
-					instance: sortable,
-					shouldRevert: sortable.options.revert
-				});
-				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
+
+			if ( sortable && !sortable.options.disabled ) {
+				draggable.sortables.push( sortable );
+
+				// refreshPositions is called at drag start to refresh the containerCache
+				// which is used in drag. This ensures it's initialized and synchronized
+				// with any changes that might have happened on the page since initialization.
+				sortable.refreshPositions();
 				sortable._trigger("activate", event, uiSortable);
 			}
 		});
-
 	},
-	stop: function( event, ui, inst ) {
-
-		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+	stop: function( event, ui, draggable ) {
 		var uiSortable = $.extend( {}, ui, {
-			item: inst.element
+			item: draggable.element
 		});
 
-		$.each(inst.sortables, function() {
-			if (this.instance.isOver) {
+		draggable.cancelHelperRemoval = false;
 
-				this.instance.isOver = 0;
+		$.each( draggable.sortables, function() {
+			var sortable = this;
 
-				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
-				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
-
-				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
-				if (this.shouldRevert) {
-					this.instance.options.revert = this.shouldRevert;
-				}
+			if ( sortable.isOver ) {
+				sortable.isOver = 0;
 
-				//Trigger the stop of the sortable
-				this.instance._mouseStop(event);
+				// Allow this sortable to handle removing the helper
+				draggable.cancelHelperRemoval = true;
+				sortable.cancelHelperRemoval = false;
 
-				this.instance.options.helper = this.instance.options._helper;
+				// Use _storedCSS To restore properties in the sortable,
+				// as this also handles revert (#9675) since the draggable
+				// may have modified them in unexpected ways (#8809)
+				sortable._storedCSS = {
+					position: sortable.placeholder.css( "position" ),
+					top: sortable.placeholder.css( "top" ),
+					left: sortable.placeholder.css( "left" )
+				};
 
-				//If the helper has been the original item, restore properties in the sortable
-				if (inst.options.helper === "original") {
-					this.instance.currentItem.css({ top: "auto", left: "auto" });
-				}
+				sortable._mouseStop(event);
 
+				// Once drag has ended, the sortable should return to using
+				// its original helper, not the shared helper from draggable
+				sortable.options.helper = sortable.options._helper;
 			} else {
-				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
-				this.instance._trigger("deactivate", event, uiSortable);
-			}
+				// Prevent this Sortable from removing the helper.
+				// However, don't set the draggable to remove the helper
+				// either as another connected Sortable may yet handle the removal.
+				sortable.cancelHelperRemoval = true;
 
+				sortable._trigger( "deactivate", event, uiSortable );
+			}
 		});
-
 	},
-	drag: function( event, ui, inst ) {
-
-		var that = this;
-
-		$.each(inst.sortables, function() {
-
+	drag: function( event, ui, draggable ) {
+		$.each( draggable.sortables, function() {
 			var innermostIntersecting = false,
-				thisSortable = this;
+				sortable = this;
 
-			//Copy over some variables to allow calling the sortable's native _intersectsWith
-			this.instance.positionAbs = inst.positionAbs;
-			this.instance.helperProportions = inst.helperProportions;
-			this.instance.offset.click = inst.offset.click;
+			// Copy over variables that sortable's _intersectsWith uses
+			sortable.positionAbs = draggable.positionAbs;
+			sortable.helperProportions = draggable.helperProportions;
+			sortable.offset.click = draggable.offset.click;
 
-			if (this.instance._intersectsWith(this.instance.containerCache)) {
+			if ( sortable._intersectsWith( sortable.containerCache ) ) {
 				innermostIntersecting = true;
-				$.each(inst.sortables, function() {
-					this.instance.positionAbs = inst.positionAbs;
-					this.instance.helperProportions = inst.helperProportions;
-					this.instance.offset.click = inst.offset.click;
-					if (this !== thisSortable &&
-						this.instance._intersectsWith(this.instance.containerCache) &&
-						$.contains(thisSortable.instance.element[0], this.instance.element[0])
-					) {
+
+				$.each( draggable.sortables, function() {
+					// Copy over variables that sortable's _intersectsWith uses
+					this.positionAbs = draggable.positionAbs;
+					this.helperProportions = draggable.helperProportions;
+					this.offset.click = draggable.offset.click;
+
+					if ( this !== sortable &&
+							this._intersectsWith( this.containerCache ) &&
+							$.contains( sortable.element[ 0 ], this.element[ 0 ] ) ) {
 						innermostIntersecting = false;
 					}
+
 					return innermostIntersecting;
 				});
 			}
 
-			if (innermostIntersecting) {
-				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
-				if (!this.instance.isOver) {
+			if ( innermostIntersecting ) {
+				// If it intersects, we use a little isOver variable and set it once,
+				// so that the move-in stuff gets fired only once.
+				if ( !sortable.isOver ) {
+					sortable.isOver = 1;
 
-					this.instance.isOver = 1;
-					//Now we fake the start of dragging for the sortable instance,
-					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
-					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
-					this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
-					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
-					this.instance.options.helper = function() { return ui.helper[0]; };
+					// Store draggable's parent in case we need to reappend to it later.
+					draggable._parent = ui.helper.parent();
 
-					event.target = this.instance.currentItem[0];
-					this.instance._mouseCapture(event, true);
-					this.instance._mouseStart(event, true, true);
+					sortable.currentItem = ui.helper
+						.appendTo( sortable.element )
+						.data( "ui-sortable-item", true );
 
-					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
-					this.instance.offset.click.top = inst.offset.click.top;
-					this.instance.offset.click.left = inst.offset.click.left;
-					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
-					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+					// Store helper option to later restore it
+					sortable.options._helper = sortable.options.helper;
 
-					inst._trigger("toSortable", event);
-					inst.dropped = this.instance.element; //draggable revert needs that
-					//hack so receive/update callbacks work (mostly)
-					inst.currentItem = inst.element;
-					this.instance.fromOutside = inst;
+					sortable.options.helper = function() {
+						return ui.helper[ 0 ];
+					};
 
-				}
+					// Fire the start events of the sortable with our passed browser event,
+					// and our own helper (so it doesn't create a new one)
+					event.target = sortable.currentItem[ 0 ];
+					sortable._mouseCapture( event, true );
+					sortable._mouseStart( event, true, true );
+
+					// Because the browser event is way off the new appended portlet,
+					// modify necessary variables to reflect the changes
+					sortable.offset.click.top = draggable.offset.click.top;
+					sortable.offset.click.left = draggable.offset.click.left;
+					sortable.offset.parent.left -= draggable.offset.parent.left -
+						sortable.offset.parent.left;
+					sortable.offset.parent.top -= draggable.offset.parent.top -
+						sortable.offset.parent.top;
+
+					draggable._trigger( "toSortable", event );
+
+					// Inform draggable that the helper is in a valid drop zone,
+					// used solely in the revert option to handle "valid/invalid".
+					draggable.dropped = sortable.element;
+
+					// Need to refreshPositions of all sortables in the case that
+					// adding to one sortable changes the location of the other sortables (#9675)
+					$.each( draggable.sortables, function() {
+						this.refreshPositions();
+					});
 
-				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
-				if (this.instance.currentItem) {
-					this.instance._mouseDrag(event);
+					// hack so receive/update callbacks work (mostly)
+					draggable.currentItem = draggable.element;
+					sortable.fromOutside = draggable;
 				}
 
+				if ( sortable.currentItem ) {
+					sortable._mouseDrag( event );
+					// Copy the sortable's position because the draggable's can potentially reflect
+					// a relative position, while sortable is always absolute, which the dragged
+					// element has now become. (#8809)
+					ui.position = sortable.position;
+				}
 			} else {
+				// If it doesn't intersect with the sortable, and it intersected before,
+				// we fake the drag stop of the sortable, but make sure it doesn't remove
+				// the helper by using cancelHelperRemoval.
+				if ( sortable.isOver ) {
 
-				//If it doesn't intersect with the sortable, and it intersected before,
-				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
-				if (this.instance.isOver) {
-
-					this.instance.isOver = 0;
-					this.instance.cancelHelperRemoval = true;
+					sortable.isOver = 0;
+					sortable.cancelHelperRemoval = true;
 
-					//Prevent reverting on this forced stop
-					this.instance.options.revert = false;
+					// Calling sortable's mouseStop would trigger a revert,
+					// so revert must be temporarily false until after mouseStop is called.
+					sortable.options._revert = sortable.options.revert;
+					sortable.options.revert = false;
 
-					// The out event needs to be triggered independently
-					this.instance._trigger("out", event, this.instance._uiHash(this.instance));
+					sortable._trigger( "out", event, sortable._uiHash( sortable ) );
+					sortable._mouseStop( event, true );
 
-					this.instance._mouseStop(event, true);
-					this.instance.options.helper = this.instance.options._helper;
+					// restore sortable behaviors that were modfied
+					// when the draggable entered the sortable area (#9481)
+					sortable.options.revert = sortable.options._revert;
+					sortable.options.helper = sortable.options._helper;
 
-					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
-					this.instance.currentItem.remove();
-					if (this.instance.placeholder) {
-						this.instance.placeholder.remove();
+					if ( sortable.placeholder ) {
+						sortable.placeholder.remove();
 					}
 
-					inst._trigger("fromSortable", event);
-					inst.dropped = false; //draggable revert needs that
-				}
+					// Restore and recalculate the draggable's offset considering the sortable
+					// may have modified them in unexpected ways. (#8809, #10669)
+					ui.helper.appendTo( draggable._parent );
+					draggable._refreshOffsets( event );
+					ui.position = draggable._generatePosition( event, true );
 
-			}
+					draggable._trigger( "fromSortable", event );
 
-		});
+					// Inform draggable that the helper is no longer in a valid drop zone
+					draggable.dropped = false;
 
+					// Need to refreshPositions of all sortables just in case removing
+					// from one sortable changes the location of other sortables (#9675)
+					$.each( draggable.sortables, function() {
+						this.refreshPositions();
+					});
+				}
+			}
+		});
 	}
 });
 
@@ -6585,30 +6761,35 @@ $.ui.plugin.add("draggable", "opacity", {
 
 $.ui.plugin.add("draggable", "scroll", {
 	start: function( event, ui, i ) {
-		if ( i.scrollParent[ 0 ] !== i.document[ 0 ] && i.scrollParent[ 0 ].tagName !== "HTML" ) {
-			i.overflowOffset = i.scrollParent.offset();
+		if ( !i.scrollParentNotHidden ) {
+			i.scrollParentNotHidden = i.helper.scrollParent( false );
+		}
+
+		if ( i.scrollParentNotHidden[ 0 ] !== i.document[ 0 ] && i.scrollParentNotHidden[ 0 ].tagName !== "HTML" ) {
+			i.overflowOffset = i.scrollParentNotHidden.offset();
 		}
 	},
 	drag: function( event, ui, i  ) {
 
 		var o = i.options,
 			scrolled = false,
+			scrollParent = i.scrollParentNotHidden[ 0 ],
 			document = i.document[ 0 ];
 
-		if ( i.scrollParent[ 0 ] !== document && i.scrollParent[ 0 ].tagName !== "HTML" ) {
-			if (!o.axis || o.axis !== "x") {
-				if ((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
-					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
-				} else if (event.pageY - i.overflowOffset.top < o.scrollSensitivity) {
-					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+		if ( scrollParent !== document && scrollParent.tagName !== "HTML" ) {
+			if ( !o.axis || o.axis !== "x" ) {
+				if ( ( i.overflowOffset.top + scrollParent.offsetHeight ) - event.pageY < o.scrollSensitivity ) {
+					scrollParent.scrollTop = scrolled = scrollParent.scrollTop + o.scrollSpeed;
+				} else if ( event.pageY - i.overflowOffset.top < o.scrollSensitivity ) {
+					scrollParent.scrollTop = scrolled = scrollParent.scrollTop - o.scrollSpeed;
 				}
 			}
 
-			if (!o.axis || o.axis !== "y") {
-				if ((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
-					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
-				} else if (event.pageX - i.overflowOffset.left < o.scrollSensitivity) {
-					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+			if ( !o.axis || o.axis !== "y" ) {
+				if ( ( i.overflowOffset.left + scrollParent.offsetWidth ) - event.pageX < o.scrollSensitivity ) {
+					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft + o.scrollSpeed;
+				} else if ( event.pageX - i.overflowOffset.left < o.scrollSensitivity ) {
+					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft - o.scrollSpeed;
 				}
 			}
 
@@ -6669,9 +6850,9 @@ $.ui.plugin.add("draggable", "snap", {
 
 		for (i = inst.snapElements.length - 1; i >= 0; i--){
 
-			l = inst.snapElements[i].left;
+			l = inst.snapElements[i].left - inst.margins.left;
 			r = l + inst.snapElements[i].width;
-			t = inst.snapElements[i].top;
+			t = inst.snapElements[i].top - inst.margins.top;
 			b = t + inst.snapElements[i].height;
 
 			if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
@@ -6688,16 +6869,16 @@ $.ui.plugin.add("draggable", "snap", {
 				ls = Math.abs(l - x2) <= d;
 				rs = Math.abs(r - x1) <= d;
 				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+					ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top;
 				}
 				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+					ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top;
 				}
 				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
 				}
 				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left;
 				}
 			}
 
@@ -6709,16 +6890,16 @@ $.ui.plugin.add("draggable", "snap", {
 				ls = Math.abs(l - x1) <= d;
 				rs = Math.abs(r - x2) <= d;
 				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+					ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top;
 				}
 				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+					ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top;
 				}
 				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left;
 				}
 				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
 				}
 			}
 
@@ -6736,8 +6917,8 @@ $.ui.plugin.add("draggable", "stack", {
 	start: function( event, ui, instance ) {
 		var min,
 			o = instance.options,
-			group = $.makeArray($(o.stack)).sort(function(a,b) {
-				return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+			group = $.makeArray($(o.stack)).sort(function(a, b) {
+				return (parseInt($(a).css("zIndex"), 10) || 0) - (parseInt($(b).css("zIndex"), 10) || 0);
 			});
 
 		if (!group.length) { return; }
@@ -6773,10 +6954,10 @@ var draggable = $.ui.draggable;
 
 
 /*!
- * jQuery UI Resizable 1.11.0
+ * jQuery UI Resizable 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -6785,7 +6966,7 @@ var draggable = $.ui.draggable;
 
 
 $.widget("ui.resizable", $.ui.mouse, {
-	version: "1.11.0",
+	version: "1.11.4",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -6817,7 +6998,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 	},
 
 	_isNumber: function( value ) {
-		return !isNaN( parseInt( value , 10 ) );
+		return !isNaN( parseInt( value, 10 ) );
 	},
 
 	_hasScroll: function( el, a ) {
@@ -6858,7 +7039,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 		});
 
 		// Wrap the element if it cannot hold child nodes
-		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+		if (this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)) {
 
 			this.element.wrap(
 				$("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
@@ -6876,14 +7057,28 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 			this.elementIsWrapper = true;
 
-			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
-			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+			this.element.css({
+				marginLeft: this.originalElement.css("marginLeft"),
+				marginTop: this.originalElement.css("marginTop"),
+				marginRight: this.originalElement.css("marginRight"),
+				marginBottom: this.originalElement.css("marginBottom")
+			});
+			this.originalElement.css({
+				marginLeft: 0,
+				marginTop: 0,
+				marginRight: 0,
+				marginBottom: 0
+			});
 			// support: Safari
 			// Prevent Safari textarea resize
 			this.originalResizeStyle = this.originalElement.css("resize");
 			this.originalElement.css("resize", "none");
 
-			this._proportionallyResizeElements.push(this.originalElement.css({ position: "static", zoom: 1, display: "block" }));
+			this._proportionallyResizeElements.push( this.originalElement.css({
+				position: "static",
+				zoom: 1,
+				display: "block"
+			}) );
 
 			// support: IE9
 			// avoid IE jump (hard set the margin)
@@ -6892,8 +7087,21 @@ $.widget("ui.resizable", $.ui.mouse, {
 			this._proportionallyResize();
 		}
 
-		this.handles = o.handles || (!$(".ui-resizable-handle", this.element).length ? "e,s,se" : { n: ".ui-resizable-n", e: ".ui-resizable-e", s: ".ui-resizable-s", w: ".ui-resizable-w", se: ".ui-resizable-se", sw: ".ui-resizable-sw", ne: ".ui-resizable-ne", nw: ".ui-resizable-nw" });
-		if(this.handles.constructor === String) {
+		this.handles = o.handles ||
+			( !$(".ui-resizable-handle", this.element).length ?
+				"e,s,se" : {
+					n: ".ui-resizable-n",
+					e: ".ui-resizable-e",
+					s: ".ui-resizable-s",
+					w: ".ui-resizable-w",
+					se: ".ui-resizable-se",
+					sw: ".ui-resizable-sw",
+					ne: ".ui-resizable-ne",
+					nw: ".ui-resizable-nw"
+				} );
+
+		this._handles = $();
+		if ( this.handles.constructor === String ) {
 
 			if ( this.handles === "all") {
 				this.handles = "n,e,s,w,se,sw,ne,nw";
@@ -6902,10 +7110,10 @@ $.widget("ui.resizable", $.ui.mouse, {
 			n = this.handles.split(",");
 			this.handles = {};
 
-			for(i = 0; i < n.length; i++) {
+			for (i = 0; i < n.length; i++) {
 
 				handle = $.trim(n[i]);
-				hname = "ui-resizable-"+handle;
+				hname = "ui-resizable-" + handle;
 				axis = $("<div class='ui-resizable-handle " + hname + "'></div>");
 
 				axis.css({ zIndex: o.zIndex });
@@ -6915,7 +7123,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 					axis.addClass("ui-icon ui-icon-gripsmall-diagonal-se");
 				}
 
-				this.handles[handle] = ".ui-resizable-"+handle;
+				this.handles[handle] = ".ui-resizable-" + handle;
 				this.element.append(axis);
 			}
 
@@ -6927,13 +7135,16 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 			target = target || this.element;
 
-			for(i in this.handles) {
+			for (i in this.handles) {
 
-				if(this.handles[i].constructor === String) {
+				if (this.handles[i].constructor === String) {
 					this.handles[i] = this.element.children( this.handles[ i ] ).first().show();
+				} else if ( this.handles[ i ].jquery || this.handles[ i ].nodeType ) {
+					this.handles[ i ] = $( this.handles[ i ] );
+					this._on( this.handles[ i ], { "mousedown": that._mouseDown });
 				}
 
-				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)) {
 
 					axis = $(this.handles[i], this.element);
 
@@ -6947,21 +7158,17 @@ $.widget("ui.resizable", $.ui.mouse, {
 					target.css(padPos, padWrapper);
 
 					this._proportionallyResize();
-
 				}
 
-				// TODO: What's that good for? There's not anything to be executed left
-				if(!$(this.handles[i]).length) {
-					continue;
-				}
+				this._handles = this._handles.add( this.handles[ i ] );
 			}
 		};
 
 		// TODO: make renderAxis a prototype function
 		this._renderAxis(this.element);
 
-		this._handles = $(".ui-resizable-handle", this.element)
-			.disableSelection();
+		this._handles = this._handles.add( this.element.find( ".ui-resizable-handle" ) );
+		this._handles.disableSelection();
 
 		this._handles.mouseover(function() {
 			if (!that.resizing) {
@@ -6983,7 +7190,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 					$(this).removeClass("ui-resizable-autohide");
 					that._handles.show();
 				})
-				.mouseleave(function(){
+				.mouseleave(function() {
 					if (o.disabled) {
 						return;
 					}
@@ -6995,7 +7202,6 @@ $.widget("ui.resizable", $.ui.mouse, {
 		}
 
 		this._mouseInit();
-
 	},
 
 	_destroy: function() {
@@ -7004,8 +7210,13 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		var wrapper,
 			_destroy = function(exp) {
-				$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
-					.removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove();
+				$(exp)
+					.removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+					.removeData("resizable")
+					.removeData("ui-resizable")
+					.unbind(".resizable")
+					.find(".ui-resizable-handle")
+						.remove();
 			};
 
 		// TODO: Unwrap at same DOM position
@@ -7062,13 +7273,34 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		this.offset = this.helper.offset();
 		this.position = { left: curleft, top: curtop };
-		this.size = this._helper ? { width: this.helper.width(), height: this.helper.height() } : { width: el.width(), height: el.height() };
-		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+
+		this.size = this._helper ? {
+				width: this.helper.width(),
+				height: this.helper.height()
+			} : {
+				width: el.width(),
+				height: el.height()
+			};
+
+		this.originalSize = this._helper ? {
+				width: el.outerWidth(),
+				height: el.outerHeight()
+			} : {
+				width: el.width(),
+				height: el.height()
+			};
+
+		this.sizeDiff = {
+			width: el.outerWidth() - el.width(),
+			height: el.outerHeight() - el.height()
+		};
+
 		this.originalPosition = { left: curleft, top: curtop };
-		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
 		this.originalMousePosition = { left: event.pageX, top: event.pageY };
 
-		this.aspectRatio = (typeof o.aspectRatio === "number") ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+		this.aspectRatio = (typeof o.aspectRatio === "number") ?
+			o.aspectRatio :
+			((this.originalSize.width / this.originalSize.height) || 1);
 
 		cursor = $(".ui-resizable-" + this.axis).css("cursor");
 		$("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
@@ -7080,28 +7312,20 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	_mouseDrag: function(event) {
 
-		var data,
-			el = this.helper, props = {},
+		var data, props,
 			smp = this.originalMousePosition,
 			a = this.axis,
-			dx = (event.pageX-smp.left)||0,
-			dy = (event.pageY-smp.top)||0,
+			dx = (event.pageX - smp.left) || 0,
+			dy = (event.pageY - smp.top) || 0,
 			trigger = this._change[a];
 
-		this.prevPosition = {
-			top: this.position.top,
-			left: this.position.left
-		};
-		this.prevSize = {
-			width: this.size.width,
-			height: this.size.height
-		};
+		this._updatePrevProperties();
 
 		if (!trigger) {
 			return false;
 		}
 
-		data = trigger.apply(this, [event, dx, dy]);
+		data = trigger.apply(this, [ event, dx, dy ]);
 
 		this._updateVirtualBoundaries(event.shiftKey);
 		if (this._aspectRatio || event.shiftKey) {
@@ -7114,26 +7338,16 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		this._propagate("resize", event);
 
-		if ( this.position.top !== this.prevPosition.top ) {
-			props.top = this.position.top + "px";
-		}
-		if ( this.position.left !== this.prevPosition.left ) {
-			props.left = this.position.left + "px";
-		}
-		if ( this.size.width !== this.prevSize.width ) {
-			props.width = this.size.width + "px";
-		}
-		if ( this.size.height !== this.prevSize.height ) {
-			props.height = this.size.height + "px";
-		}
-		el.css( props );
+		props = this._applyChanges();
 
 		if ( !this._helper && this._proportionallyResizeElements.length ) {
 			this._proportionallyResize();
 		}
 
 		if ( !$.isEmptyObject( props ) ) {
+			this._updatePrevProperties();
 			this._trigger( "resize", event, this.ui() );
+			this._applyChanges();
 		}
 
 		return false;
@@ -7145,16 +7359,21 @@ $.widget("ui.resizable", $.ui.mouse, {
 		var pr, ista, soffseth, soffsetw, s, left, top,
 			o = this.options, that = this;
 
-		if(this._helper) {
+		if (this._helper) {
 
 			pr = this._proportionallyResizeElements;
 			ista = pr.length && (/textarea/i).test(pr[0].nodeName);
-			soffseth = ista && this._hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height;
+			soffseth = ista && this._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height;
 			soffsetw = ista ? 0 : that.sizeDiff.width;
 
-			s = { width: (that.helper.width()  - soffsetw), height: (that.helper.height() - soffseth) };
-			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null;
-			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+			s = {
+				width: (that.helper.width()  - soffsetw),
+				height: (that.helper.height() - soffseth)
+			};
+			left = (parseInt(that.element.css("left"), 10) +
+				(that.position.left - that.originalPosition.left)) || null;
+			top = (parseInt(that.element.css("top"), 10) +
+				(that.position.top - that.originalPosition.top)) || null;
 
 			if (!o.animate) {
 				this.element.css($.extend(s, { top: top, left: left }));
@@ -7182,6 +7401,38 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 	},
 
+	_updatePrevProperties: function() {
+		this.prevPosition = {
+			top: this.position.top,
+			left: this.position.left
+		};
+		this.prevSize = {
+			width: this.size.width,
+			height: this.size.height
+		};
+	},
+
+	_applyChanges: function() {
+		var props = {};
+
+		if ( this.position.top !== this.prevPosition.top ) {
+			props.top = this.position.top + "px";
+		}
+		if ( this.position.left !== this.prevPosition.left ) {
+			props.left = this.position.left + "px";
+		}
+		if ( this.size.width !== this.prevSize.width ) {
+			props.width = this.size.width + "px";
+		}
+		if ( this.size.height !== this.prevSize.height ) {
+			props.height = this.size.height + "px";
+		}
+
+		this.helper.css( props );
+
+		return props;
+	},
+
 	_updateVirtualBoundaries: function(forceAspectRatio) {
 		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
 			o = this.options;
@@ -7193,22 +7444,22 @@ $.widget("ui.resizable", $.ui.mouse, {
 			maxHeight: this._isNumber(o.maxHeight) ? o.maxHeight : Infinity
 		};
 
-		if(this._aspectRatio || forceAspectRatio) {
+		if (this._aspectRatio || forceAspectRatio) {
 			pMinWidth = b.minHeight * this.aspectRatio;
 			pMinHeight = b.minWidth / this.aspectRatio;
 			pMaxWidth = b.maxHeight * this.aspectRatio;
 			pMaxHeight = b.maxWidth / this.aspectRatio;
 
-			if(pMinWidth > b.minWidth) {
+			if (pMinWidth > b.minWidth) {
 				b.minWidth = pMinWidth;
 			}
-			if(pMinHeight > b.minHeight) {
+			if (pMinHeight > b.minHeight) {
 				b.minHeight = pMinHeight;
 			}
-			if(pMaxWidth < b.maxWidth) {
+			if (pMaxWidth < b.maxWidth) {
 				b.maxWidth = pMaxWidth;
 			}
-			if(pMaxHeight < b.maxHeight) {
+			if (pMaxHeight < b.maxHeight) {
 				b.maxHeight = pMaxHeight;
 			}
 		}
@@ -7259,8 +7510,10 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		var o = this._vBoundaries,
 			a = this.axis,
-			ismaxw = this._isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = this._isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
-			isminw = this._isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = this._isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
+			ismaxw = this._isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width),
+			ismaxh = this._isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+			isminw = this._isNumber(data.width) && o.minWidth && (o.minWidth > data.width),
+			isminh = this._isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
 			dw = this.originalPosition.left + this.originalSize.width,
 			dh = this.position.top + this.size.height,
 			cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
@@ -7300,32 +7553,56 @@ $.widget("ui.resizable", $.ui.mouse, {
 		return data;
 	},
 
+	_getPaddingPlusBorderDimensions: function( element ) {
+		var i = 0,
+			widths = [],
+			borders = [
+				element.css( "borderTopWidth" ),
+				element.css( "borderRightWidth" ),
+				element.css( "borderBottomWidth" ),
+				element.css( "borderLeftWidth" )
+			],
+			paddings = [
+				element.css( "paddingTop" ),
+				element.css( "paddingRight" ),
+				element.css( "paddingBottom" ),
+				element.css( "paddingLeft" )
+			];
+
+		for ( ; i < 4; i++ ) {
+			widths[ i ] = ( parseInt( borders[ i ], 10 ) || 0 );
+			widths[ i ] += ( parseInt( paddings[ i ], 10 ) || 0 );
+		}
+
+		return {
+			height: widths[ 0 ] + widths[ 2 ],
+			width: widths[ 1 ] + widths[ 3 ]
+		};
+	},
+
 	_proportionallyResize: function() {
 
 		if (!this._proportionallyResizeElements.length) {
 			return;
 		}
 
-		var i, j, borders, paddings, prel,
+		var prel,
+			i = 0,
 			element = this.helper || this.element;
 
-		for ( i=0; i < this._proportionallyResizeElements.length; i++) {
+		for ( ; i < this._proportionallyResizeElements.length; i++) {
 
 			prel = this._proportionallyResizeElements[i];
 
-			if (!this.borderDif) {
-				this.borderDif = [];
-				borders = [prel.css("borderTopWidth"), prel.css("borderRightWidth"), prel.css("borderBottomWidth"), prel.css("borderLeftWidth")];
-				paddings = [prel.css("paddingTop"), prel.css("paddingRight"), prel.css("paddingBottom"), prel.css("paddingLeft")];
-
-				for ( j = 0; j < borders.length; j++ ) {
-					this.borderDif[ j ] = ( parseInt( borders[ j ], 10 ) || 0 ) + ( parseInt( paddings[ j ], 10 ) || 0 );
-				}
+			// TODO: Seems like a bug to cache this.outerDimensions
+			// considering that we are in a loop.
+			if (!this.outerDimensions) {
+				this.outerDimensions = this._getPaddingPlusBorderDimensions( prel );
 			}
 
 			prel.css({
-				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
-				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+				height: (element.height() - this.outerDimensions.height) || 0,
+				width: (element.width() - this.outerDimensions.width) || 0
 			});
 
 		}
@@ -7337,7 +7614,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 		var el = this.element, o = this.options;
 		this.elementOffset = el.offset();
 
-		if(this._helper) {
+		if (this._helper) {
 
 			this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
 
@@ -7345,8 +7622,8 @@ $.widget("ui.resizable", $.ui.mouse, {
 				width: this.element.outerWidth() - 1,
 				height: this.element.outerHeight() - 1,
 				position: "absolute",
-				left: this.elementOffset.left +"px",
-				top: this.elementOffset.top +"px",
+				left: this.elementOffset.left + "px",
+				top: this.elementOffset.top + "px",
 				zIndex: ++o.zIndex //TODO: Don't modify option
 			});
 
@@ -7376,21 +7653,25 @@ $.widget("ui.resizable", $.ui.mouse, {
 			return { height: this.originalSize.height + dy };
 		},
 		se: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+			return $.extend(this._change.s.apply(this, arguments),
+				this._change.e.apply(this, [ event, dx, dy ]));
 		},
 		sw: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+			return $.extend(this._change.s.apply(this, arguments),
+				this._change.w.apply(this, [ event, dx, dy ]));
 		},
 		ne: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+			return $.extend(this._change.n.apply(this, arguments),
+				this._change.e.apply(this, [ event, dx, dy ]));
 		},
 		nw: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+			return $.extend(this._change.n.apply(this, arguments),
+				this._change.w.apply(this, [ event, dx, dy ]));
 		}
 	},
 
 	_propagate: function(n, event) {
-		$.ui.plugin.call(this, n, [event, this.ui()]);
+		$.ui.plugin.call(this, n, [ event, this.ui() ]);
 		(n !== "resize" && this._trigger(n, event, this.ui()));
 	},
 
@@ -7404,9 +7685,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 			position: this.position,
 			size: this.size,
 			originalSize: this.originalSize,
-			originalPosition: this.originalPosition,
-			prevSize: this.prevSize,
-			prevPosition: this.prevPosition
+			originalPosition: this.originalPosition
 		};
 	}
 
@@ -7423,11 +7702,13 @@ $.ui.plugin.add("resizable", "animate", {
 			o = that.options,
 			pr = that._proportionallyResizeElements,
 			ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-			soffseth = ista && that._hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height,
+			soffseth = ista && that._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height,
 			soffsetw = ista ? 0 : that.sizeDiff.width,
 			style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
-			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null,
-			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+			left = (parseInt(that.element.css("left"), 10) +
+				(that.position.left - that.originalPosition.left)) || null,
+			top = (parseInt(that.element.css("top"), 10) +
+				(that.position.top - that.originalPosition.top)) || null;
 
 		that.element.animate(
 			$.extend(style, top && left ? { top: top, left: left } : {}), {
@@ -7520,7 +7801,7 @@ $.ui.plugin.add( "resizable", "containment", {
 		}
 	},
 
-	resize: function( event, ui ) {
+	resize: function( event ) {
 		var woset, hoset, isParent, isOffsetRelative,
 			that = $( this ).resizable( "instance" ),
 			o = that.options,
@@ -7539,7 +7820,11 @@ $.ui.plugin.add( "resizable", "containment", {
 		}
 
 		if ( cp.left < ( that._helper ? co.left : 0 ) ) {
-			that.size.width = that.size.width + ( that._helper ? ( that.position.left - co.left ) : ( that.position.left - cop.left ) );
+			that.size.width = that.size.width +
+				( that._helper ?
+					( that.position.left - co.left ) :
+					( that.position.left - cop.left ) );
+
 			if ( pRatio ) {
 				that.size.height = that.size.width / that.aspectRatio;
 				continueResize = false;
@@ -7548,7 +7833,11 @@ $.ui.plugin.add( "resizable", "containment", {
 		}
 
 		if ( cp.top < ( that._helper ? co.top : 0 ) ) {
-			that.size.height = that.size.height + ( that._helper ? ( that.position.top - co.top ) : that.position.top );
+			that.size.height = that.size.height +
+				( that._helper ?
+					( that.position.top - co.top ) :
+					that.position.top );
+
 			if ( pRatio ) {
 				that.size.width = that.size.height * that.aspectRatio;
 				continueResize = false;
@@ -7556,19 +7845,27 @@ $.ui.plugin.add( "resizable", "containment", {
 			that.position.top = that._helper ? co.top : 0;
 		}
 
-		that.offset.left = that.parentData.left + that.position.left;
-		that.offset.top = that.parentData.top + that.position.top;
-
-		woset = Math.abs( ( that._helper ? that.offset.left - cop.left : ( that.offset.left - co.left ) ) + that.sizeDiff.width );
-		hoset = Math.abs( ( that._helper ? that.offset.top - cop.top : ( that.offset.top - co.top ) ) + that.sizeDiff.height );
-
 		isParent = that.containerElement.get( 0 ) === that.element.parent().get( 0 );
 		isOffsetRelative = /relative|absolute/.test( that.containerElement.css( "position" ) );
 
 		if ( isParent && isOffsetRelative ) {
-			woset -= Math.abs( that.parentData.left );
+			that.offset.left = that.parentData.left + that.position.left;
+			that.offset.top = that.parentData.top + that.position.top;
+		} else {
+			that.offset.left = that.element.offset().left;
+			that.offset.top = that.element.offset().top;
 		}
 
+		woset = Math.abs( that.sizeDiff.width +
+			(that._helper ?
+				that.offset.left - cop.left :
+				(that.offset.left - co.left)) );
+
+		hoset = Math.abs( that.sizeDiff.height +
+			(that._helper ?
+				that.offset.top - cop.top :
+				(that.offset.top - co.top)) );
+
 		if ( woset + that.size.width >= that.parentData.width ) {
 			that.size.width = that.parentData.width - woset;
 			if ( pRatio ) {
@@ -7585,15 +7882,15 @@ $.ui.plugin.add( "resizable", "containment", {
 			}
 		}
 
-		if ( !continueResize ){
-			that.position.left = ui.prevPosition.left;
-			that.position.top = ui.prevPosition.top;
-			that.size.width = ui.prevSize.width;
-			that.size.height = ui.prevSize.height;
+		if ( !continueResize ) {
+			that.position.left = that.prevPosition.left;
+			that.position.top = that.prevPosition.top;
+			that.size.width = that.prevSize.width;
+			that.size.height = that.prevSize.height;
 		}
 	},
 
-	stop: function(){
+	stop: function() {
 		var that = $( this ).resizable( "instance" ),
 			o = that.options,
 			co = that.containerOffset,
@@ -7624,61 +7921,49 @@ $.ui.plugin.add( "resizable", "containment", {
 
 $.ui.plugin.add("resizable", "alsoResize", {
 
-	start: function () {
+	start: function() {
 		var that = $(this).resizable( "instance" ),
-			o = that.options,
-			_store = function (exp) {
-				$(exp).each(function() {
-					var el = $(this);
-					el.data("ui-resizable-alsoresize", {
-						width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
-						left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
-					});
-				});
-			};
+			o = that.options;
 
-		if (typeof(o.alsoResize) === "object" && !o.alsoResize.parentNode) {
-			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
-			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
-		}else{
-			_store(o.alsoResize);
-		}
+		$(o.alsoResize).each(function() {
+			var el = $(this);
+			el.data("ui-resizable-alsoresize", {
+				width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+				left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
+			});
+		});
 	},
 
-	resize: function (event, ui) {
+	resize: function(event, ui) {
 		var that = $(this).resizable( "instance" ),
 			o = that.options,
 			os = that.originalSize,
 			op = that.originalPosition,
 			delta = {
-				height: (that.size.height - os.height) || 0, width: (that.size.width - os.width) || 0,
-				top: (that.position.top - op.top) || 0, left: (that.position.left - op.left) || 0
-			},
-
-			_alsoResize = function (exp, c) {
-				$(exp).each(function() {
-					var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
-						css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ["width", "height"] : ["width", "height", "top", "left"];
+				height: (that.size.height - os.height) || 0,
+				width: (that.size.width - os.width) || 0,
+				top: (that.position.top - op.top) || 0,
+				left: (that.position.left - op.left) || 0
+			};
 
-					$.each(css, function (i, prop) {
-						var sum = (start[prop]||0) + (delta[prop]||0);
-						if (sum && sum >= 0) {
-							style[prop] = sum || null;
-						}
-					});
+			$(o.alsoResize).each(function() {
+				var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
+					css = el.parents(ui.originalElement[0]).length ?
+							[ "width", "height" ] :
+							[ "width", "height", "top", "left" ];
 
-					el.css(style);
+				$.each(css, function(i, prop) {
+					var sum = (start[prop] || 0) + (delta[prop] || 0);
+					if (sum && sum >= 0) {
+						style[prop] = sum || null;
+					}
 				});
-			};
 
-		if (typeof(o.alsoResize) === "object" && !o.alsoResize.nodeType) {
-			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
-		}else{
-			_alsoResize(o.alsoResize);
-		}
+				el.css(style);
+			});
 	},
 
-	stop: function () {
+	stop: function() {
 		$(this).removeData("resizable-alsoresize");
 	}
 });
@@ -7691,7 +7976,16 @@ $.ui.plugin.add("resizable", "ghost", {
 
 		that.ghost = that.originalElement.clone();
 		that.ghost
-			.css({ opacity: 0.25, display: "block", position: "relative", height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.css({
+				opacity: 0.25,
+				display: "block",
+				position: "relative",
+				height: cs.height,
+				width: cs.width,
+				margin: 0,
+				left: 0,
+				top: 0
+			})
 			.addClass("ui-resizable-ghost")
 			.addClass(typeof o.ghost === "string" ? o.ghost : "");
 
@@ -7699,10 +7993,14 @@ $.ui.plugin.add("resizable", "ghost", {
 
 	},
 
-	resize: function(){
+	resize: function() {
 		var that = $(this).resizable( "instance" );
 		if (that.ghost) {
-			that.ghost.css({ position: "relative", height: that.size.height, width: that.size.width });
+			that.ghost.css({
+				position: "relative",
+				height: that.size.height,
+				width: that.size.width
+			});
 		}
 	},
 
@@ -7718,15 +8016,16 @@ $.ui.plugin.add("resizable", "ghost", {
 $.ui.plugin.add("resizable", "grid", {
 
 	resize: function() {
-		var that = $(this).resizable( "instance" ),
+		var outerDimensions,
+			that = $(this).resizable( "instance" ),
 			o = that.options,
 			cs = that.size,
 			os = that.originalSize,
 			op = that.originalPosition,
 			a = that.axis,
-			grid = typeof o.grid === "number" ? [o.grid, o.grid] : o.grid,
-			gridX = (grid[0]||1),
-			gridY = (grid[1]||1),
+			grid = typeof o.grid === "number" ? [ o.grid, o.grid ] : o.grid,
+			gridX = (grid[0] || 1),
+			gridY = (grid[1] || 1),
 			ox = Math.round((cs.width - os.width) / gridX) * gridX,
 			oy = Math.round((cs.height - os.height) / gridY) * gridY,
 			newWidth = os.width + ox,
@@ -7739,16 +8038,16 @@ $.ui.plugin.add("resizable", "grid", {
 		o.grid = grid;
 
 		if (isMinWidth) {
-			newWidth = newWidth + gridX;
+			newWidth += gridX;
 		}
 		if (isMinHeight) {
-			newHeight = newHeight + gridY;
+			newHeight += gridY;
 		}
 		if (isMaxWidth) {
-			newWidth = newWidth - gridX;
+			newWidth -= gridX;
 		}
 		if (isMaxHeight) {
-			newHeight = newHeight - gridY;
+			newHeight -= gridY;
 		}
 
 		if (/^(se|s|e)$/.test(a)) {
@@ -7763,19 +8062,25 @@ $.ui.plugin.add("resizable", "grid", {
 			that.size.height = newHeight;
 			that.position.left = op.left - ox;
 		} else {
+			if ( newHeight - gridY <= 0 || newWidth - gridX <= 0) {
+				outerDimensions = that._getPaddingPlusBorderDimensions( this );
+			}
+
 			if ( newHeight - gridY > 0 ) {
 				that.size.height = newHeight;
 				that.position.top = op.top - oy;
 			} else {
-				that.size.height = gridY;
-				that.position.top = op.top + os.height - gridY;
+				newHeight = gridY - outerDimensions.height;
+				that.size.height = newHeight;
+				that.position.top = op.top + os.height - newHeight;
 			}
 			if ( newWidth - gridX > 0 ) {
 				that.size.width = newWidth;
 				that.position.left = op.left - ox;
 			} else {
-				that.size.width = gridX;
-				that.position.left = op.left + os.width - gridX;
+				newWidth = gridX - outerDimensions.width;
+				that.size.width = newWidth;
+				that.position.left = op.left + os.width - newWidth;
 			}
 		}
 	}
@@ -7786,10 +8091,10 @@ var resizable = $.ui.resizable;
 
 
 /*!
- * jQuery UI Dialog 1.11.0
+ * jQuery UI Dialog 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -7798,7 +8103,7 @@ var resizable = $.ui.resizable;
 
 
 var dialog = $.widget( "ui.dialog", {
-	version: "1.11.0",
+	version: "1.11.4",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
@@ -7918,6 +8223,7 @@ var dialog = $.widget( "ui.dialog", {
 		var next,
 			originalPosition = this.originalPosition;
 
+		this._untrackInstance();
 		this._destroyOverlay();
 
 		this.element
@@ -7996,10 +8302,10 @@ var dialog = $.widget( "ui.dialog", {
 
 	_moveToTop: function( event, silent ) {
 		var moved = false,
-			zIndicies = this.uiDialog.siblings( ".ui-front:visible" ).map(function() {
+			zIndices = this.uiDialog.siblings( ".ui-front:visible" ).map(function() {
 				return +$( this ).css( "z-index" );
 			}).get(),
-			zIndexMax = Math.max.apply( null, zIndicies );
+			zIndexMax = Math.max.apply( null, zIndices );
 
 		if ( zIndexMax >= +this.uiDialog.css( "z-index" ) ) {
 			this.uiDialog.css( "z-index", zIndexMax + 1 );
@@ -8028,11 +8334,24 @@ var dialog = $.widget( "ui.dialog", {
 		this._position();
 		this._createOverlay();
 		this._moveToTop( null, true );
+
+		// Ensure the overlay is moved to the top with the dialog, but only when
+		// opening. The overlay shouldn't move after the dialog is open so that
+		// modeless dialogs opened after the modal dialog stack properly.
+		if ( this.overlay ) {
+			this.overlay.css( "z-index", this.uiDialog.css( "z-index" ) - 1 );
+		}
+
 		this._show( this.uiDialog, this.options.show, function() {
 			that._focusTabbable();
 			that._trigger( "focus" );
 		});
 
+		// Track the dialog immediately upon openening in case a focus event
+		// somehow occurs outside of the dialog before an element inside the
+		// dialog is focused (#10152)
+		this._makeFocusTarget();
+
 		this._trigger( "open" );
 	},
 
@@ -8344,14 +8663,18 @@ var dialog = $.widget( "ui.dialog", {
 
 	_trackFocus: function() {
 		this._on( this.widget(), {
-			"focusin": function( event ) {
-				this._untrackInstance();
-				this._trackingInstances().unshift( this );
+			focusin: function( event ) {
+				this._makeFocusTarget();
 				this._focusedElement = $( event.target );
 			}
 		});
 	},
 
+	_makeFocusTarget: function() {
+		this._untrackInstance();
+		this._trackingInstances().unshift( this );
+	},
+
 	_untrackInstance: function() {
 		var instances = this._trackingInstances(),
 			exists = $.inArray( this, instances );
@@ -8625,10 +8948,10 @@ var dialog = $.widget( "ui.dialog", {
 
 
 /*!
- * jQuery UI Droppable 1.11.0
+ * jQuery UI Droppable 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -8637,7 +8960,7 @@ var dialog = $.widget( "ui.dialog", {
 
 
 $.widget( "ui.droppable", {
-	version: "1.11.0",
+	version: "1.11.4",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: "*",
@@ -8801,7 +9124,7 @@ $.widget( "ui.droppable", {
 				!inst.options.disabled &&
 				inst.options.scope === draggable.options.scope &&
 				inst.accept.call( inst.element[ 0 ], ( draggable.currentItem || draggable.element ) ) &&
-				$.ui.intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance )
+				$.ui.intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance, event )
 			) { childrenIntersection = true; return false; }
 		});
 		if ( childrenIntersection ) {
@@ -8839,15 +9162,14 @@ $.ui.intersect = (function() {
 		return ( x >= reference ) && ( x < ( reference + size ) );
 	}
 
-	return function( draggable, droppable, toleranceMode ) {
+	return function( draggable, droppable, toleranceMode, event ) {
 
 		if ( !droppable.offset ) {
 			return false;
 		}
 
-		var draggableLeft, draggableTop,
-			x1 = ( draggable.positionAbs || draggable.position.absolute ).left,
-			y1 = ( draggable.positionAbs || draggable.position.absolute ).top,
+		var x1 = ( draggable.positionAbs || draggable.position.absolute ).left + draggable.margins.left,
+			y1 = ( draggable.positionAbs || draggable.position.absolute ).top + draggable.margins.top,
 			x2 = x1 + draggable.helperProportions.width,
 			y2 = y1 + draggable.helperProportions.height,
 			l = droppable.offset.left,
@@ -8864,9 +9186,7 @@ $.ui.intersect = (function() {
 				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
 				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
 		case "pointer":
-			draggableLeft = ( ( draggable.positionAbs || draggable.position.absolute ).left + ( draggable.clickOffset || draggable.offset.click ).left );
-			draggableTop = ( ( draggable.positionAbs || draggable.position.absolute ).top + ( draggable.clickOffset || draggable.offset.click ).top );
-			return isOverAxis( draggableTop, t, droppable.proportions().height ) && isOverAxis( draggableLeft, l, droppable.proportions().width );
+			return isOverAxis( event.pageY, t, droppable.proportions().height ) && isOverAxis( event.pageX, l, droppable.proportions().width );
 		case "touch":
 			return (
 				( y1 >= t && y1 <= b ) || // Top edge touching
@@ -8936,7 +9256,7 @@ $.ui.ddmanager = {
 			if ( !this.options ) {
 				return;
 			}
-			if ( !this.options.disabled && this.visible && $.ui.intersect( draggable, this, this.options.tolerance ) ) {
+			if ( !this.options.disabled && this.visible && $.ui.intersect( draggable, this, this.options.tolerance, event ) ) {
 				dropped = this._drop.call( this, event ) || dropped;
 			}
 
@@ -8973,7 +9293,7 @@ $.ui.ddmanager = {
 			}
 
 			var parentInstance, scope, parent,
-				intersects = $.ui.intersect( draggable, this, this.options.tolerance ),
+				intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ),
 				c = !intersects && this.isover ? "isout" : ( intersects && !this.isover ? "isover" : null );
 			if ( !c ) {
 				return;
@@ -9025,10 +9345,10 @@ var droppable = $.ui.droppable;
 
 
 /*!
- * jQuery UI Effects 1.11.0
+ * jQuery UI Effects 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -9036,7 +9356,11 @@ var droppable = $.ui.droppable;
  */
 
 
-var dataSpace = "ui-effects-";
+var dataSpace = "ui-effects-",
+
+	// Create a local jQuery because jQuery Color relies on it and the
+	// global may not exist with AMD and a custom build (#10199)
+	jQuery = $;
 
 $.effects = {
 	effect: {}
@@ -9645,7 +9969,7 @@ color.hook = function( hook ) {
 				}
 				try {
 					elem.style[ hook ] = value;
-				} catch( e ) {
+				} catch ( e ) {
 					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
 				}
 			}
@@ -9916,7 +10240,7 @@ $.fn.extend({
 (function() {
 
 $.extend( $.effects, {
-	version: "1.11.0",
+	version: "1.11.4",
 
 	// Saves a set of properties in a data storage
 	save: function( element, set ) {
@@ -10010,7 +10334,7 @@ $.extend( $.effects, {
 		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
 		try {
 			active.id;
-		} catch( e ) {
+		} catch ( e ) {
 			active = document.body;
 		}
 
@@ -10312,10 +10636,10 @@ var effect = $.effects;
 
 
 /*!
- * jQuery UI Effects Blind 1.11.0
+ * jQuery UI Effects Blind 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10389,10 +10713,10 @@ var effectBlind = $.effects.effect.blind = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Bounce 1.11.0
+ * jQuery UI Effects Bounce 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10499,10 +10823,10 @@ var effectBounce = $.effects.effect.bounce = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Clip 1.11.0
+ * jQuery UI Effects Clip 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10563,10 +10887,10 @@ var effectClip = $.effects.effect.clip = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Drop 1.11.0
+ * jQuery UI Effects Drop 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10593,7 +10917,7 @@ var effectDrop = $.effects.effect.drop = function( o, done ) {
 	el.show();
 	$.effects.createWrapper( el );
 
-	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
+	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
 
 	if ( show ) {
 		el
@@ -10625,10 +10949,10 @@ var effectDrop = $.effects.effect.drop = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Explode 1.11.0
+ * jQuery UI Effects Explode 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10719,10 +11043,10 @@ var effectExplode = $.effects.effect.explode = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Fade 1.11.0
+ * jQuery UI Effects Fade 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10746,10 +11070,10 @@ var effectFade = $.effects.effect.fade = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Fold 1.11.0
+ * jQuery UI Effects Fold 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10819,10 +11143,10 @@ var effectFold = $.effects.effect.fold = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Highlight 1.11.0
+ * jQuery UI Effects Highlight 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -10866,10 +11190,10 @@ var effectHighlight = $.effects.effect.highlight = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Size 1.11.0
+ * jQuery UI Effects Size 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11086,10 +11410,10 @@ var effectSize = $.effects.effect.size = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Scale 1.11.0
+ * jQuery UI Effects Scale 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11161,10 +11485,10 @@ var effectScale = $.effects.effect.scale = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Puff 1.11.0
+ * jQuery UI Effects Puff 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11207,10 +11531,10 @@ var effectPuff = $.effects.effect.puff = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Pulsate 1.11.0
+ * jQuery UI Effects Pulsate 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11267,10 +11591,10 @@ var effectPulsate = $.effects.effect.pulsate = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Shake 1.11.0
+ * jQuery UI Effects Shake 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11338,10 +11662,10 @@ var effectShake = $.effects.effect.shake = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Slide 1.11.0
+ * jQuery UI Effects Slide 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11399,10 +11723,10 @@ var effectSlide = $.effects.effect.slide = function( o, done ) {
 
 
 /*!
- * jQuery UI Effects Transfer 1.11.0
+ * jQuery UI Effects Transfer 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11443,10 +11767,10 @@ var effectTransfer = $.effects.effect.transfer = function( o, done ) {
 
 
 /*!
- * jQuery UI Progressbar 1.11.0
+ * jQuery UI Progressbar 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11455,7 +11779,7 @@ var effectTransfer = $.effects.effect.transfer = function( o, done ) {
 
 
 var progressbar = $.widget( "ui.progressbar", {
-	version: "1.11.0",
+	version: "1.11.4",
 	options: {
 		max: 100,
 		value: 0,
@@ -11588,10 +11912,10 @@ var progressbar = $.widget( "ui.progressbar", {
 
 
 /*!
- * jQuery UI Selectable 1.11.0
+ * jQuery UI Selectable 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11600,7 +11924,7 @@ var progressbar = $.widget( "ui.progressbar", {
 
 
 var selectable = $.widget("ui.selectable", $.ui.mouse, {
-	version: "1.11.0",
+	version: "1.11.4",
 	options: {
 		appendTo: "body",
 		autoRefresh: true,
@@ -11860,10 +12184,10 @@ var selectable = $.widget("ui.selectable", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Selectmenu 1.11.0
+ * jQuery UI Selectmenu 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -11872,7 +12196,7 @@ var selectable = $.widget("ui.selectable", $.ui.mouse, {
 
 
 var selectmenu = $.widget( "ui.selectmenu", {
-	version: "1.11.0",
+	version: "1.11.4",
 	defaultElement: "<select>",
 	options: {
 		appendTo: null,
@@ -11912,8 +12236,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
 	},
 
 	_drawButton: function() {
-		var that = this,
-			tabindex = this.element.attr( "tabindex" );
+		var that = this;
 
 		// Associate existing label with the new button
 		this.label = $( "label[for='" + this.ids.element + "']" ).attr( "for", this.ids.button );
@@ -11930,7 +12253,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
 		// Create button
 		this.button = $( "<span>", {
 			"class": "ui-selectmenu-button ui-widget ui-state-default ui-corner-all",
-			tabindex: tabindex || this.options.disabled ? -1 : 0,
+			tabindex: this.options.disabled ? -1 : 0,
 			id: this.ids.button,
 			role: "combobox",
 			"aria-expanded": "false",
@@ -11951,7 +12274,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
 			.appendTo( this.button );
 
 		this._setText( this.buttonText, this.element.find( "option:selected" ).text() );
-		this._setOption( "width", this.options.width );
+		this._resizeButton();
 
 		this._on( this.button, this._buttonEvents );
 		this.button.one( "focusin", function() {
@@ -11989,6 +12312,12 @@ var selectmenu = $.widget( "ui.selectmenu", {
 				role: "listbox",
 				select: function( event, ui ) {
 					event.preventDefault();
+
+					// support: IE8
+					// If the item was selected via a click, the text selection
+					// will be destroyed in IE
+					that._setSelection();
+
 					that._select( ui.item.data( "ui-selectmenu-item" ), event );
 				},
 				focus: function( event, ui ) {
@@ -12031,7 +12360,9 @@ var selectmenu = $.widget( "ui.selectmenu", {
 	refresh: function() {
 		this._refreshMenu();
 		this._setText( this.buttonText, this._getSelectedItem().text() );
-		this._setOption( "width", this.options.width );
+		if ( !this.options.width ) {
+			this._resizeButton();
+		}
 	},
 
 	_refreshMenu: function() {
@@ -12097,6 +12428,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
 		this.isOpen = false;
 		this._toggleAttr();
 
+		this.range = null;
 		this._off( this.document );
 
 		this._trigger( "close", event );
@@ -12185,6 +12517,29 @@ var selectmenu = $.widget( "ui.selectmenu", {
 		this[ this.isOpen ? "close" : "open" ]( event );
 	},
 
+	_setSelection: function() {
+		var selection;
+
+		if ( !this.range ) {
+			return;
+		}
+
+		if ( window.getSelection ) {
+			selection = window.getSelection();
+			selection.removeAllRanges();
+			selection.addRange( this.range );
+
+		// support: IE8
+		} else {
+			this.range.select();
+		}
+
+		// support: IE
+		// Setting the text selection kills the button focus in IE, but
+		// restoring the focus doesn't kill the selection.
+		this.button.focus();
+	},
+
 	_documentClick: {
 		mousedown: function( event ) {
 			if ( !this.isOpen ) {
@@ -12198,7 +12553,28 @@ var selectmenu = $.widget( "ui.selectmenu", {
 	},
 
 	_buttonEvents: {
-		click: "_toggle",
+
+		// Prevent text selection from being reset when interacting with the selectmenu (#10144)
+		mousedown: function() {
+			var selection;
+
+			if ( window.getSelection ) {
+				selection = window.getSelection();
+				if ( selection.rangeCount ) {
+					this.range = selection.getRangeAt( 0 );
+				}
+
+			// support: IE8
+			} else {
+				this.range = document.selection.createRange();
+			}
+		},
+
+		click: function( event ) {
+			this._setSelection();
+			this._toggle( event );
+		},
+
 		keydown: function( event ) {
 			var preventDefault = true;
 			switch ( event.keyCode ) {
@@ -12320,10 +12696,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
 		}
 
 		if ( key === "width" ) {
-			if ( !value ) {
-				value = this.element.outerWidth();
-			}
-			this.button.outerWidth( value );
+			this._resizeButton();
 		}
 	},
 
@@ -12356,6 +12729,17 @@ var selectmenu = $.widget( "ui.selectmenu", {
 		this.menu.attr( "aria-hidden", !this.isOpen );
 	},
 
+	_resizeButton: function() {
+		var width = this.options.width;
+
+		if ( !width ) {
+			width = this.element.show().outerWidth();
+			this.element.hide();
+		}
+
+		this.button.outerWidth( width );
+	},
+
 	_resizeMenu: function() {
 		this.menu.outerWidth( Math.max(
 			this.button.outerWidth(),
@@ -12379,7 +12763,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
 			data.push({
 				element: option,
 				index: index,
-				value: option.attr( "value" ),
+				value: option.val(),
 				label: option.text(),
 				optgroup: optgroup.attr( "label" ) || "",
 				disabled: optgroup.prop( "disabled" ) || option.prop( "disabled" )
@@ -12399,10 +12783,10 @@ var selectmenu = $.widget( "ui.selectmenu", {
 
 
 /*!
- * jQuery UI Slider 1.11.0
+ * jQuery UI Slider 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -12411,7 +12795,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
 
 
 var slider = $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.11.0",
+	version: "1.11.4",
 	widgetEventPrefix: "slide",
 
 	options: {
@@ -12443,6 +12827,7 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
 		this._handleIndex = null;
 		this._detectOrientation();
 		this._mouseInit();
+		this._calculateNewMax();
 
 		this.element
 			.addClass( "ui-slider" +
@@ -12839,6 +13224,9 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
 					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
 					.addClass( "ui-slider-" + this.orientation );
 				this._refreshValue();
+
+				// Reset positioning from previous orientation
+				this.handles.css( value === "horizontal" ? "bottom" : "left", "" );
 				break;
 			case "value":
 				this._animateOff = true;
@@ -12854,9 +13242,11 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
 				}
 				this._animateOff = false;
 				break;
+			case "step":
 			case "min":
 			case "max":
 				this._animateOff = true;
+				this._calculateNewMax();
 				this._refreshValue();
 				this._animateOff = false;
 				break;
@@ -12894,7 +13284,7 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
 			// .slice() creates a copy of the array
 			// this copy gets trimmed by min and max and then returned
 			vals = this.options.values.slice();
-			for ( i = 0; i < vals.length; i+= 1) {
+			for ( i = 0; i < vals.length; i += 1) {
 				vals[ i ] = this._trimAlignValue( vals[ i ] );
 			}
 
@@ -12925,12 +13315,35 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
 		return parseFloat( alignValue.toFixed(5) );
 	},
 
+	_calculateNewMax: function() {
+		var max = this.options.max,
+			min = this._valueMin(),
+			step = this.options.step,
+			aboveMin = Math.floor( ( +( max - min ).toFixed( this._precision() ) ) / step ) * step;
+		max = aboveMin + min;
+		this.max = parseFloat( max.toFixed( this._precision() ) );
+	},
+
+	_precision: function() {
+		var precision = this._precisionOf( this.options.step );
+		if ( this.options.min !== null ) {
+			precision = Math.max( precision, this._precisionOf( this.options.min ) );
+		}
+		return precision;
+	},
+
+	_precisionOf: function( num ) {
+		var str = num.toString(),
+			decimal = str.indexOf( "." );
+		return decimal === -1 ? 0 : str.length - decimal - 1;
+	},
+
 	_valueMin: function() {
 		return this.options.min;
 	},
 
 	_valueMax: function() {
-		return this.options.max;
+		return this.max;
 	},
 
 	_refreshValue: function() {
@@ -13072,10 +13485,10 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Sortable 1.11.0
+ * jQuery UI Sortable 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -13084,7 +13497,7 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
 
 
 var sortable = $.widget("ui.sortable", $.ui.mouse, {
-	version: "1.11.0",
+	version: "1.11.4",
 	widgetEventPrefix: "sort",
 	ready: false,
 	options: {
@@ -13135,17 +13548,12 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 	},
 
 	_create: function() {
-
-		var o = this.options;
 		this.containerCache = {};
 		this.element.addClass("ui-sortable");
 
 		//Get the items
 		this.refresh();
 
-		//Let's determine if the items are being displayed horizontally
-		this.floating = this.items.length ? o.axis === "x" || this._isFloating(this.items[0].item) : false;
-
 		//Let's determine the parent's offset
 		this.offset = this.element.offset();
 
@@ -13334,7 +13742,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 		}
 
 		//Prepare scrolling
-		if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+		if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
 			this.overflowOffset = this.scrollParent.offset();
 		}
 
@@ -13386,7 +13794,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
 		//Do scrolling
 		if(this.options.scroll) {
-			if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+			if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
 
 				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
 					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
@@ -13402,16 +13810,16 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
 			} else {
 
-				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				} else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+				if(event.pageY - this.document.scrollTop() < o.scrollSensitivity) {
+					scrolled = this.document.scrollTop(this.document.scrollTop() - o.scrollSpeed);
+				} else if(this.window.height() - (event.pageY - this.document.scrollTop()) < o.scrollSensitivity) {
+					scrolled = this.document.scrollTop(this.document.scrollTop() + o.scrollSpeed);
 				}
 
-				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				} else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+				if(event.pageX - this.document.scrollLeft() < o.scrollSensitivity) {
+					scrolled = this.document.scrollLeft(this.document.scrollLeft() - o.scrollSpeed);
+				} else if(this.window.width() - (event.pageX - this.document.scrollLeft()) < o.scrollSensitivity) {
+					scrolled = this.document.scrollLeft(this.document.scrollLeft() + o.scrollSpeed);
 				}
 
 			}
@@ -13510,10 +13918,10 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 				animation = {};
 
 			if ( !axis || axis === "x" ) {
-				animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft);
+				animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollLeft);
 			}
 			if ( !axis || axis === "y" ) {
-				animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop);
+				animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollTop);
 			}
 			this.reverting = true;
 			$(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
@@ -13706,7 +14114,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
 		if(connectWith && connected) {
 			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i]);
+				cur = $(connectWith[i], this.document[0]);
 				for ( j = cur.length - 1; j >= 0; j--){
 					inst = $.data(cur[j], this.widgetFullName);
 					if(inst && inst !== this && !inst.options.disabled) {
@@ -13756,7 +14164,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
 		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
 			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i]);
+				cur = $(connectWith[i], this.document[0]);
 				for (j = cur.length - 1; j >= 0; j--){
 					inst = $.data(cur[j], this.widgetFullName);
 					if(inst && inst !== this && !inst.options.disabled) {
@@ -13789,6 +14197,11 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
 	refreshPositions: function(fast) {
 
+		// Determine whether items are being displayed horizontally
+		this.floating = this.items.length ?
+			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
+			false;
+
 		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
 		if(this.offsetParent && this.helper) {
 			this.offset.parent = this._getParentOffset();
@@ -13846,12 +14259,13 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 							.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
 							.removeClass("ui-sortable-helper");
 
-					if ( nodeName === "tr" ) {
-						that.currentItem.children().each(function() {
-							$( "<td>&#160;</td>", that.document[0] )
-								.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
-								.appendTo( element );
-						});
+					if ( nodeName === "tbody" ) {
+						that._createTrPlaceholder(
+							that.currentItem.find( "tr" ).eq( 0 ),
+							$( "<tr>", that.document[ 0 ] ).appendTo( element )
+						);
+					} else if ( nodeName === "tr" ) {
+						that._createTrPlaceholder( that.currentItem, element );
 					} else if ( nodeName === "img" ) {
 						element.attr( "src", that.currentItem.attr( "src" ) );
 					}
@@ -13888,6 +14302,16 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
 	},
 
+	_createTrPlaceholder: function( sourceTr, targetTr ) {
+		var that = this;
+
+		sourceTr.children().each(function() {
+			$( "<td>&#160;</td>", that.document[ 0 ] )
+				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
+				.appendTo( targetTr );
+		});
+	},
+
 	_contactContainers: function(event) {
 		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom, floating, axis,
 			innermostContainer = null,
@@ -13969,6 +14393,10 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 			}
 
 			if(this.currentContainer === this.containers[innermostIndex]) {
+				if ( !this.currentContainer.containerCache.over ) {
+					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
+					this.currentContainer.containerCache.over = 1;
+				}
 				return;
 			}
 
@@ -14044,14 +14472,14 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
 		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
 		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+		if(this.cssPosition === "absolute" && this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) {
 			po.left += this.scrollParent.scrollLeft();
 			po.top += this.scrollParent.scrollTop();
 		}
 
 		// This needs to be actually done for all browsers, since pageX/pageY includes this information
 		// with an ugly IE fix
-		if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+		if( this.offsetParent[0] === this.document[0].body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
 			po = { top: 0, left: 0 };
 		}
 
@@ -14101,8 +14529,8 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 			this.containment = [
 				0 - this.offset.relative.left - this.offset.parent.left,
 				0 - this.offset.relative.top - this.offset.parent.top,
-				$(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
-				($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+				o.containment === "document" ? this.document.width() : this.window.width() - this.helperProportions.width - this.margins.left,
+				(o.containment === "document" ? this.document.width() : this.window.height() || this.document[0].body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
 			];
 		}
 
@@ -14127,7 +14555,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 			pos = this.position;
 		}
 		var mod = d === "absolute" ? 1 : -1,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
 			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
 
 		return {
@@ -14153,13 +14581,13 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 			o = this.options,
 			pageX = event.pageX,
 			pageY = event.pageY,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
 
 		// This is another very weird special case that only happens for relative elements:
 		// 1. If the css position is relative
 		// 2. and the scroll parent is the document or similar to the offset parent
 		// we have to refresh the relative offset during the scroll so there are no jumps
-		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) {
+		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== this.document[0] && this.scrollParent[0] !== this.offsetParent[0])) {
 			this.offset.relative = this._getRelativeOffset();
 		}
 
@@ -14307,18 +14735,6 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 		}
 
 		this.dragging = false;
-		if(this.cancelHelperRemoval) {
-			if(!noPropagation) {
-				this._trigger("beforeStop", event, this._uiHash());
-				for (i=0; i < delayedTriggers.length; i++) {
-					delayedTriggers[i].call(this, event);
-				} //Trigger all delayed events
-				this._trigger("stop", event, this._uiHash());
-			}
-
-			this.fromOutside = false;
-			return false;
-		}
 
 		if(!noPropagation) {
 			this._trigger("beforeStop", event, this._uiHash());
@@ -14327,10 +14743,12 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
 		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
 
-		if(this.helper[0] !== this.currentItem[0]) {
-			this.helper.remove();
+		if ( !this.cancelHelperRemoval ) {
+			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+				this.helper.remove();
+			}
+			this.helper = null;
 		}
-		this.helper = null;
 
 		if(!noPropagation) {
 			for (i=0; i < delayedTriggers.length; i++) {
@@ -14340,7 +14758,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 		}
 
 		this.fromOutside = false;
-		return true;
+		return !this.cancelHelperRemoval;
 
 	},
 
@@ -14367,10 +14785,10 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Spinner 1.11.0
+ * jQuery UI Spinner 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -14390,7 +14808,7 @@ function spinner_modifier( fn ) {
 }
 
 var spinner = $.widget( "ui.spinner", {
-	version: "1.11.0",
+	version: "1.11.4",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
@@ -14866,10 +15284,10 @@ var spinner = $.widget( "ui.spinner", {
 
 
 /*!
- * jQuery UI Tabs 1.11.0
+ * jQuery UI Tabs 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -14878,7 +15296,7 @@ var spinner = $.widget( "ui.spinner", {
 
 
 var tabs = $.widget( "ui.tabs", {
-	version: "1.11.0",
+	version: "1.11.4",
 	delay: 300,
 	options: {
 		active: null,
@@ -14928,24 +15346,7 @@ var tabs = $.widget( "ui.tabs", {
 
 		this.element
 			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
-			.toggleClass( "ui-tabs-collapsible", options.collapsible )
-			// Prevent users from focusing disabled tabs via click
-			.delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) {
-				if ( $( this ).is( ".ui-state-disabled" ) ) {
-					event.preventDefault();
-				}
-			})
-			// support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
-			});
+			.toggleClass( "ui-tabs-collapsible", options.collapsible );
 
 		this._processTabs();
 		options.active = this._initialActive();
@@ -15071,8 +15472,9 @@ var tabs = $.widget( "ui.tabs", {
 		clearTimeout( this.activating );
 		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
 
-		// Navigating with control key will prevent automatic activation
-		if ( !event.ctrlKey ) {
+		// Navigating with control/command key will prevent automatic activation
+		if ( !event.ctrlKey && !event.metaKey ) {
+
 			// Update aria-selected immediately so that AT think the tab is already selected.
 			// Otherwise AT may confuse the user by stating that they need to activate the tab,
 			// but the tab will already be activated by the time the announcement finishes.
@@ -15242,11 +15644,33 @@ var tabs = $.widget( "ui.tabs", {
 	},
 
 	_processTabs: function() {
-		var that = this;
+		var that = this,
+			prevTabs = this.tabs,
+			prevAnchors = this.anchors,
+			prevPanels = this.panels;
 
 		this.tablist = this._getList()
 			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.attr( "role", "tablist" );
+			.attr( "role", "tablist" )
+
+			// Prevent users from focusing disabled tabs via click
+			.delegate( "> li", "mousedown" + this.eventNamespace, function( event ) {
+				if ( $( this ).is( ".ui-state-disabled" ) ) {
+					event.preventDefault();
+				}
+			})
+
+			// support: IE <9
+			// Preventing the default action in mousedown doesn't prevent IE
+			// from focusing the element, so if the anchor gets focused, blur.
+			// We don't have to worry about focusing the previously focused
+			// element since clicking on a non-focusable element should focus
+			// the body anyway.
+			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
+				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
+					this.blur();
+				}
+			});
 
 		this.tabs = this.tablist.find( "> li:has(a[href])" )
 			.addClass( "ui-state-default ui-corner-top" )
@@ -15307,6 +15731,13 @@ var tabs = $.widget( "ui.tabs", {
 		this.panels
 			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
 			.attr( "role", "tabpanel" );
+
+		// Avoid memory leaks (#10056)
+		if ( prevTabs ) {
+			this._off( prevTabs.not( this.tabs ) );
+			this._off( prevAnchors.not( this.anchors ) );
+			this._off( prevPanels.not( this.panels ) );
+		}
 	},
 
 	// allow overriding how to find the list for rare usage scenarios (#7715)
@@ -15564,6 +15995,8 @@ var tabs = $.widget( "ui.tabs", {
 			.removeAttr( "tabIndex" )
 			.removeUniqueId();
 
+		this.tablist.unbind( this.eventNamespace );
+
 		this.tabs.add( this.panels ).each(function() {
 			if ( $.data( this, "ui-tabs-destroy" ) ) {
 				$( this ).remove();
@@ -15655,6 +16088,18 @@ var tabs = $.widget( "ui.tabs", {
 			eventData = {
 				tab: tab,
 				panel: panel
+			},
+			complete = function( jqXHR, status ) {
+				if ( status === "abort" ) {
+					that.panels.stop( false, true );
+				}
+
+				tab.removeClass( "ui-tabs-loading" );
+				panel.removeAttr( "aria-busy" );
+
+				if ( jqXHR === that.xhr ) {
+					delete that.xhr;
+				}
 			};
 
 		// not remote
@@ -15672,28 +16117,21 @@ var tabs = $.widget( "ui.tabs", {
 			panel.attr( "aria-busy", "true" );
 
 			this.xhr
-				.success(function( response ) {
+				.done(function( response, status, jqXHR ) {
 					// support: jQuery <1.8
 					// http://bugs.jquery.com/ticket/11778
 					setTimeout(function() {
 						panel.html( response );
 						that._trigger( "load", event, eventData );
+
+						complete( jqXHR, status );
 					}, 1 );
 				})
-				.complete(function( jqXHR, status ) {
+				.fail(function( jqXHR, status ) {
 					// support: jQuery <1.8
 					// http://bugs.jquery.com/ticket/11778
 					setTimeout(function() {
-						if ( status === "abort" ) {
-							that.panels.stop( false, true );
-						}
-
-						tab.removeClass( "ui-tabs-loading" );
-						panel.removeAttr( "aria-busy" );
-
-						if ( jqXHR === that.xhr ) {
-							delete that.xhr;
-						}
+						complete( jqXHR, status );
 					}, 1 );
 				});
 		}
@@ -15718,10 +16156,10 @@ var tabs = $.widget( "ui.tabs", {
 
 
 /*!
- * jQuery UI Tooltip 1.11.0
+ * jQuery UI Tooltip 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -15730,7 +16168,7 @@ var tabs = $.widget( "ui.tabs", {
 
 
 var tooltip = $.widget( "ui.tooltip", {
-	version: "1.11.0",
+	version: "1.11.4",
 	options: {
 		content: function() {
 			// support: IE<9, Opera in jQuery <1.7
@@ -15790,6 +16228,7 @@ var tooltip = $.widget( "ui.tooltip", {
 
 		// IDs of generated tooltips, needed for destroy
 		this.tooltips = {};
+
 		// IDs of parent tooltips where we removed the title attribute
 		this.parents = {};
 
@@ -15821,8 +16260,8 @@ var tooltip = $.widget( "ui.tooltip", {
 		this._super( key, value );
 
 		if ( key === "content" ) {
-			$.each( this.tooltips, function( id, element ) {
-				that._updateContent( element );
+			$.each( this.tooltips, function( id, tooltipData ) {
+				that._updateContent( tooltipData.element );
 			});
 		}
 	},
@@ -15831,9 +16270,9 @@ var tooltip = $.widget( "ui.tooltip", {
 		var that = this;
 
 		// close open tooltips
-		$.each( this.tooltips, function( id, element ) {
+		$.each( this.tooltips, function( id, tooltipData ) {
 			var event = $.Event( "blur" );
-			event.target = event.currentTarget = element[0];
+			event.target = event.currentTarget = tooltipData.element[ 0 ];
 			that.close( event, true );
 		});
 
@@ -15897,6 +16336,7 @@ var tooltip = $.widget( "ui.tooltip", {
 			});
 		}
 
+		this._registerCloseHandlers( event, target );
 		this._updateContent( target, event );
 	},
 
@@ -15911,13 +16351,16 @@ var tooltip = $.widget( "ui.tooltip", {
 		}
 
 		content = contentOption.call( target[0], function( response ) {
-			// ignore async response if tooltip was closed already
-			if ( !target.data( "ui-tooltip-open" ) ) {
-				return;
-			}
+
 			// IE may instantly serve a cached response for ajax requests
 			// delay this call to _open so the other call to _open runs first
 			that._delay(function() {
+
+				// Ignore async response if tooltip was closed already
+				if ( !target.data( "ui-tooltip-open" ) ) {
+					return;
+				}
+
 				// jQuery creates a special event for focusin when it doesn't
 				// exist natively. To improve performance, the native event
 				// object is reused and the type is changed. Therefore, we can't
@@ -15935,7 +16378,7 @@ var tooltip = $.widget( "ui.tooltip", {
 	},
 
 	_open: function( event, target, content ) {
-		var tooltip, events, delayedShow, a11yContent,
+		var tooltipData, tooltip, delayedShow, a11yContent,
 			positionOption = $.extend( {}, this.options.position );
 
 		if ( !content ) {
@@ -15944,9 +16387,9 @@ var tooltip = $.widget( "ui.tooltip", {
 
 		// Content can be updated multiple times. If the tooltip already
 		// exists, then just update the content and bail.
-		tooltip = this._find( target );
-		if ( tooltip.length ) {
-			tooltip.find( ".ui-tooltip-content" ).html( content );
+		tooltipData = this._find( target );
+		if ( tooltipData ) {
+			tooltipData.tooltip.find( ".ui-tooltip-content" ).html( content );
 			return;
 		}
 
@@ -15965,7 +16408,8 @@ var tooltip = $.widget( "ui.tooltip", {
 			}
 		}
 
-		tooltip = this._tooltip( target );
+		tooltipData = this._tooltip( target );
+		tooltip = tooltipData.tooltip;
 		this._addDescribedBy( target, tooltip.attr( "id" ) );
 		tooltip.find( ".ui-tooltip-content" ).html( content );
 
@@ -16016,8 +16460,10 @@ var tooltip = $.widget( "ui.tooltip", {
 		}
 
 		this._trigger( "open", event, { tooltip: tooltip } );
+	},
 
-		events = {
+	_registerCloseHandlers: function( event, target ) {
+		var events = {
 			keyup: function( event ) {
 				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
 					var fakeEvent = $.Event(event);
@@ -16031,7 +16477,7 @@ var tooltip = $.widget( "ui.tooltip", {
 		// tooltips will handle this in destroy.
 		if ( target[ 0 ] !== this.element[ 0 ] ) {
 			events.remove = function() {
-				this._removeTooltip( tooltip );
+				this._removeTooltip( this._find( target ).tooltip );
 			};
 		}
 
@@ -16045,13 +16491,27 @@ var tooltip = $.widget( "ui.tooltip", {
 	},
 
 	close: function( event ) {
-		var that = this,
+		var tooltip,
+			that = this,
 			target = $( event ? event.currentTarget : this.element ),
-			tooltip = this._find( target );
+			tooltipData = this._find( target );
+
+		// The tooltip may already be closed
+		if ( !tooltipData ) {
+
+			// We set ui-tooltip-open immediately upon open (in open()), but only set the
+			// additional data once there's actually content to show (in _open()). So even if the
+			// tooltip doesn't have full data, we always remove ui-tooltip-open in case we're in
+			// the period between open() and _open().
+			target.removeData( "ui-tooltip-open" );
+			return;
+		}
+
+		tooltip = tooltipData.tooltip;
 
 		// disabling closes the tooltip, so we need to track when we're closing
 		// to avoid an infinite loop in case the tooltip becomes disabled on close
-		if ( this.closing ) {
+		if ( tooltipData.closing ) {
 			return;
 		}
 
@@ -16066,6 +16526,7 @@ var tooltip = $.widget( "ui.tooltip", {
 
 		this._removeDescribedBy( target );
 
+		tooltipData.hiding = true;
 		tooltip.stop( true );
 		this._hide( tooltip, this.options.hide, function() {
 			that._removeTooltip( $( this ) );
@@ -16087,9 +16548,11 @@ var tooltip = $.widget( "ui.tooltip", {
 			});
 		}
 
-		this.closing = true;
+		tooltipData.closing = true;
 		this._trigger( "close", event, { tooltip: tooltip } );
-		this.closing = false;
+		if ( !tooltipData.hiding ) {
+			tooltipData.closing = false;
+		}
 	},
 
 	_tooltip: function( element ) {
@@ -16104,13 +16567,16 @@ var tooltip = $.widget( "ui.tooltip", {
 			.appendTo( tooltip );
 
 		tooltip.appendTo( this.document[0].body );
-		this.tooltips[ id ] = element;
-		return tooltip;
+
+		return this.tooltips[ id ] = {
+			element: element,
+			tooltip: tooltip
+		};
 	},
 
 	_find: function( target ) {
 		var id = target.data( "ui-tooltip-id" );
-		return id ? $( "#" + id ) : $();
+		return id ? this.tooltips[ id ] : null;
 	},
 
 	_removeTooltip: function( tooltip ) {
@@ -16122,10 +16588,11 @@ var tooltip = $.widget( "ui.tooltip", {
 		var that = this;
 
 		// close open tooltips
-		$.each( this.tooltips, function( id, element ) {
+		$.each( this.tooltips, function( id, tooltipData ) {
 			// Delegate to close method to handle common cleanup
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = element[0];
+			var event = $.Event( "blur" ),
+				element = tooltipData.element;
+			event.target = event.currentTarget = element[ 0 ];
 			that.close( event, true );
 
 			// Remove immediately; destroying an open tooltip doesn't use the
diff --git a/lib/scripts/jquery/jquery-ui.min.js b/lib/scripts/jquery/jquery-ui.min.js
index b2fdf864a..5824d1292 100644
--- a/lib/scripts/jquery/jquery-ui.min.js
+++ b/lib/scripts/jquery/jquery-ui.min.js
@@ -1,13 +1,13 @@
-/*! jQuery UI - v1.11.0 - 2014-06-26
+/*! jQuery UI - v1.11.4 - 2015-03-11
 * http://jqueryui.com
 * Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
 
-(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap=#"+a+"]")[0],!!o&&i(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",function(){e.datepicker._isDisabledDatepicker(g.inline?t.parent()[0]:g.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))})}function o(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function r(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.0",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(){var t=this.css("position"),i="absolute"===t,s=this.parents().filter(function(){var t=e(this);return i&&"static"===t.css("position")?!1:/(auto|scroll)/.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==t&&s.length?s:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var h=0,l=Array.prototype.slice;e.cleanData=function(t){return function(i){for(var s,n=0;null!=(s=i[n]);n++)try{e(s).triggerHandler("remove")}catch(a){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=l.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=l.call(arguments,1),r=this;return n=!a&&o.length?e.widget.extend.apply(null,[n].concat(o)):n,a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))}),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(e,t){t=(t||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(t).undelegate(t)},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var u=!1;e(document).mouseup(function(){u=!1}),e.widget("ui.mouse",{version:"1.11.0",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!u){this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),u=!0,!0)):!0}},_mouseMove:function(t){return e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button?this._mouseUp(t):t.which?this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted):this._mouseUp(t)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),u=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.width<t.element[0].scrollWidth,a="scroll"===s||"auto"===s&&t.height<t.element[0].scrollHeight;return{width:a?e.position.scrollbarWidth():0,height:n?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var i=e(t||window),s=e.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s?i.width():i.outerWidth(),height:s?i.height():i.outerHeight()}}},e.fn.position=function(n){if(!n||!n.of)return f.apply(this,arguments);n=e.extend({},n);var p,m,g,v,y,b,_=e(n.of),x=e.position.getWithinInfo(n.within),w=e.position.getScrollInfo(x),k=(n.collision||"flip").split(" "),T={};return b=s(_),_[0].preventDefault&&(n.at="left top"),m=b.width,g=b.height,v=b.offset,y=e.extend({},v),e.each(["my","at"],function(){var e,t,i=(n[this]||"").split(" ");1===i.length&&(i=l.test(i[0])?i.concat(["center"]):u.test(i[0])?["center"].concat(i):["center","center"]),i[0]=l.test(i[0])?i[0]:"center",i[1]=u.test(i[1])?i[1]:"center",e=d.exec(i[0]),t=d.exec(i[1]),T[this]=[e?e[0]:0,t?t[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===n.at[0]?y.left+=m:"center"===n.at[0]&&(y.left+=m/2),"bottom"===n.at[1]?y.top+=g:"center"===n.at[1]&&(y.top+=g/2),p=t(T.at,m,g),y.left+=p[0],y.top+=p[1],this.each(function(){var s,l,u=e(this),d=u.outerWidth(),c=u.outerHeight(),f=i(this,"marginLeft"),b=i(this,"marginTop"),D=d+f+i(this,"marginRight")+w.width,S=c+b+i(this,"marginBottom")+w.height,M=e.extend({},y),N=t(T.my,u.outerWidth(),u.outerHeight());"right"===n.my[0]?M.left-=d:"center"===n.my[0]&&(M.left-=d/2),"bottom"===n.my[1]?M.top-=c:"center"===n.my[1]&&(M.top-=c/2),M.left+=N[0],M.top+=N[1],a||(M.left=h(M.left),M.top=h(M.top)),s={marginLeft:f,marginTop:b},e.each(["left","top"],function(t,i){e.ui.position[k[t]]&&e.ui.position[k[t]][i](M,{targetWidth:m,targetHeight:g,elemWidth:d,elemHeight:c,collisionPosition:s,collisionWidth:D,collisionHeight:S,offset:[p[0]+N[0],p[1]+N[1]],my:n.my,at:n.at,within:x,elem:u})}),n.using&&(l=function(e){var t=v.left-M.left,i=t+m-d,s=v.top-M.top,a=s+g-c,h={target:{element:_,left:v.left,top:v.top,width:m,height:g},element:{element:u,left:M.left,top:M.top,width:d,height:c},horizontal:0>i?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,e.top+p+f+m>u&&(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,e.top+p+f+m>d&&(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.accordion",{version:"1.11.0",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true",tabIndex:0,"aria-expanded":"true"})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.length&&(!t.length||e.index()<t.index()),l=this.options.animate||{},u=h&&l.down||l,d=function(){o._toggleComplete(i)};return"number"==typeof u&&(a=u),"string"==typeof u&&(n=u),n=n||u.easing||l.easing,a=a||u.duration||l.duration,t.length?e.length?(s=e.show().outerHeight(),t.animate(this.hideProps,{duration:a,easing:n,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(this.showProps,{duration:a,easing:n,complete:d,step:function(e,i){i.now=Math.round(e),"height"!==i.prop?r+=i.now:"content"!==o.options.heightStyle&&(i.now=Math.round(s-t.outerHeight()-r),r=0)}}),void 0):t.animate(this.hideProps,a,n,d):e.animate(this.showProps,a,n,d)},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.widget("ui.menu",{version:"1.11.0",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){var i=e(t.currentTarget);i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1
-}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){function i(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var s,n,a,o,r,h=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:h=!1,n=this.previousFilter||"",a=String.fromCharCode(t.keyCode),o=!1,clearTimeout(this.filterTimer),a===n?o=!0:a=n+a,r=RegExp("^"+i(a),"i"),s=this.activeMenu.find(this.options.items).filter(function(){return r.test(e(this).text())}),s=o&&-1!==s.index(this.active.next())?this.active.nextAll(".ui-menu-item"):s,s.length||(a=String.fromCharCode(t.keyCode),r=RegExp("^"+i(a),"i"),s=this.activeMenu.find(this.options.items).filter(function(){return r.test(e(this).text())})),s.length?(this.focus(t,s),s.length>1?(this.previousFilter=a,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}h&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,i)}}),e.widget("ui.autocomplete",{version:"1.11.0",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&jQuery.trim(s).length&&(this.liveRegion.children().hide(),e("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):void 0},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("<div>").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var d,c="ui-button ui-widget ui-state-default ui-corner-all",p="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",f=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},m=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.0",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,f),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,i=this.options,s="checkbox"===this.type||"radio"===this.type,n=s?"":"ui-state-active";null===i.label&&(i.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(c).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){i.disabled||this===d&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){i.disabled||e(this).removeClass(n)}).bind("click"+this.eventNamespace,function(e){i.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),s&&this.element.bind("change"+this.eventNamespace,function(){t.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return i.disabled?!1:void 0}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(i.disabled)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var s=t.element[0];m(s).not(s).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return i.disabled?!1:(e(this).addClass("ui-state-active"),d=this,t.document.one("mouseup",function(){d=null}),void 0)}).bind("mouseup"+this.eventNamespace,function(){return i.disabled?!1:(e(this).removeClass("ui-state-active"),void 0)}).bind("keydown"+this.eventNamespace,function(t){return i.disabled?!1:((t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active"),void 0)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",i.disabled),this._resetButton()},_determineButtonType:function(){var e,t,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(c+" ui-state-active "+p).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){return this._super(e,t),"disabled"===e?(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),t&&("checkbox"===this.type||"radio"===this.type?this.buttonElement.removeClass("ui-state-focus"):this.buttonElement.removeClass("ui-state-focus ui-state-active")),void 0):(this._resetButton(),void 0)},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),"radio"===this.type?m(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),void 0;var t=this.buttonElement.removeClass(p),i=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,a=[];s.primary||s.secondary?(this.options.text&&a.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(a.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(i)))):a.push("ui-button-text-only"),t.addClass(a.join(" "))}}),e.widget("ui.buttonset",{version:"1.11.0",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){"disabled"===e&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t="rtl"===this.element.css("direction"),i=this.element.find(this.options.items),s=i.filter(":ui-button");i.not(":ui-button").button(),s.button("refresh"),this.buttons=i.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}}),e.ui.button,e.extend(e.ui,{datepicker:{version:"1.11.0"}});var g;e.extend(n.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return o(this._defaults,e||{}),this},_attachDatepicker:function(t,i){var s,n,a;s=t.nodeName.toLowerCase(),n="div"===s||"span"===s,t.id||(this.uuid+=1,t.id="dp"+this.uuid),a=this._newInst(e(t),n),a.settings=e.extend({},i||{}),"input"===s?this._connectDatepicker(t,a):n&&this._inlineDatepicker(t,a)},_newInst:function(t,i){var s=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?a(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,i){var s=e(t);i.append=e([]),i.trigger=e([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),e.data(t,"datepicker",i),i.settings.disabled&&this._disableDatepicker(t))},_attachments:function(t,i){var s,n,a,o=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),o&&(i.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[r?"before":"after"](i.append)),t.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&t.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),a=this._get(i,"buttonImage"),i.trigger=e(this._get(i,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:a,alt:n,title:n}):e("<button type='button'></button>").addClass(this._triggerClass).html(a?e("<img/>").attr({src:a,alt:n,title:n}):n)),t[r?"before":"after"](i.trigger),i.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1}))},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,i,s,n,a=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){for(i=0,s=0,n=0;e.length>n;n++)e[n].length>i&&(i=e[n].length,s=n);return s},a.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),a.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-a.getDay())),e.input.attr("size",this._formatDate(e,a).length)}},_inlineDatepicker:function(t,i){var s=e(t);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),e.data(t,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(t),i.dpDiv.css("display","block"))},_dialogDatepicker:function(t,i,s,n,a){var r,h,l,u,d,c=this._dialogInst;return c||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),c=this._dialogInst=this._newInst(this._dialogInput,!1),c.settings={},e.data(this._dialogInput[0],"datepicker",c)),o(c.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(c,i):i,this._dialogInput.val(i),this._pos=a?a.length?a:[a.pageX,a.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+u,l/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),c.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],"datepicker",c),this},_destroyDatepicker:function(t){var i,s=e(t),n=e.data(t,"datepicker");s.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),e.removeData(t,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty())},_enableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!1,a.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}))},_disableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!0,a.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t)},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;this._disabledInputs.length>t;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,i,s){var n,a,r,h,l=this._getInst(t);return 2===arguments.length&&"string"==typeof i?"defaults"===i?e.extend({},e.datepicker._defaults):l?"all"===i?e.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),a=this._getDateDatepicker(t,!0),r=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),o(l.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,r)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(e(t),l),this._autoSize(l),this._setDate(l,a),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(e,t,i){this._optionDatepicker(e,t,i)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var i=this._getInst(e);i&&(this._setDate(i,t),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(e,t){var i=this._getInst(e);return i&&!i.inline&&this._setDateFromField(i,t),i?this._getDate(i):null},_doKeyDown:function(t){var i,s,n,a=e.datepicker._getInst(t.target),o=!0,r=a.dpDiv.is(".ui-datepicker-rtl");if(a._keyEvent=!0,e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return n=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",a.dpDiv),n[0]&&e.datepicker._selectDay(t.target,a.selectedMonth,a.selectedYear,n[0]),i=e.datepicker._get(a,"onSelect"),i?(s=e.datepicker._formatDate(a),i.apply(a.input?a.input[0]:null,[s,a])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else 36===t.keyCode&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var i,s,n=e.datepicker._getInst(t.target);return e.datepicker._get(n,"constrainInput")?(i=e.datepicker._possibleChars(e.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(t){var i,s=e.datepicker._getInst(t.target);if(s.input.val()!==s.lastVal)try{i=e.datepicker.parseDate(e.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,e.datepicker._getFormatConfig(s)),i&&(e.datepicker._setDateFromField(s),e.datepicker._updateAlternate(s),e.datepicker._updateDatepicker(s))
-}catch(n){}return!0},_showDatepicker:function(t){if(t=t.target||t,"input"!==t.nodeName.toLowerCase()&&(t=e("input",t.parentNode)[0]),!e.datepicker._isDisabledDatepicker(t)&&e.datepicker._lastInput!==t){var i,n,a,r,h,l,u;i=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==i&&(e.datepicker._curInst.dpDiv.stop(!0,!0),i&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),n=e.datepicker._get(i,"beforeShow"),a=n?n.apply(t,[t,i]):{},a!==!1&&(o(i.settings,a),i.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(i),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),r=!1,e(t).parents().each(function(){return r|="fixed"===e(this).css("position"),!r}),h={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(i),h=e.datepicker._checkOffset(i,h,r),i.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":r?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),i.inline||(l=e.datepicker._get(i,"showAnim"),u=e.datepicker._get(i,"duration"),i.dpDiv.css("z-index",s(e(t))+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[l]?i.dpDiv.show(l,e.datepicker._get(i,"showOptions"),u):i.dpDiv[l||"show"](l?u:null),e.datepicker._shouldFocusInput(i)&&i.input.focus(),e.datepicker._curInst=i))}},_updateDatepicker:function(t){this.maxRows=4,g=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t),t.dpDiv.find("."+this._dayOverClass+" a");var i,s=this._getNumberOfMonths(t),n=s[1],a=17;t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&t.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),t.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&e.datepicker._shouldFocusInput(t)&&t.input.focus(),t.yearshtml&&(i=t.yearshtml,setTimeout(function(){i===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),i=t.yearshtml=null},0))},_shouldFocusInput:function(e){return e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&!e.input.is(":focus")},_checkOffset:function(t,i,s){var n=t.dpDiv.outerWidth(),a=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,r=t.input?t.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:e(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:e(document).scrollTop());return i.left-=this._get(t,"isRTL")?n-o:0,i.left-=s&&i.left===t.input.offset().left?e(document).scrollLeft():0,i.top-=s&&i.top===t.input.offset().top+r?e(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+a>l&&l>a?Math.abs(a+r):0),i},_findPos:function(t){for(var i,s=this._getInst(t),n=this._get(s,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||e.expr.filters.hidden(t));)t=t[n?"previousSibling":"nextSibling"];return i=e(t).offset(),[i.left,i.top]},_hideDatepicker:function(t){var i,s,n,a,o=this._curInst;!o||t&&o!==e.data(t,"datepicker")||this._datepickerShowing&&(i=this._get(o,"showAnim"),s=this._get(o,"duration"),n=function(){e.datepicker._tidyDialog(o)},e.effects&&(e.effects.effect[i]||e.effects[i])?o.dpDiv.hide(i,e.datepicker._get(o,"showOptions"),s,n):o.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,a=this._get(o,"onClose"),a&&a.apply(o.input?o.input[0]:null,[o.input?o.input.val():"",o]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(e.datepicker._curInst){var i=e(t.target),s=e.datepicker._getInst(i[0]);(i[0].id!==e.datepicker._mainDivId&&0===i.parents("#"+e.datepicker._mainDivId).length&&!i.hasClass(e.datepicker.markerClassName)&&!i.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||i.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==s)&&e.datepicker._hideDatepicker()}},_adjustDate:function(t,i,s){var n=e(t),a=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(a,i+("M"===s?this._get(a,"showCurrentAtPos"):0),s),this._updateDatepicker(a))},_gotoToday:function(t){var i,s=e(t),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(t,i,s){var n=e(t),a=this._getInst(n[0]);a["selected"+("M"===s?"Month":"Year")]=a["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(a),this._adjustDate(n)},_selectDay:function(t,i,s,n){var a,o=e(t);e(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0])||(a=this._getInst(o[0]),a.selectedDay=a.currentDay=e("a",n).html(),a.selectedMonth=a.currentMonth=i,a.selectedYear=a.currentYear=s,this._selectDate(t,this._formatDate(a,a.currentDay,a.currentMonth,a.currentYear)))},_clearDate:function(t){var i=e(t);this._selectDate(i,"")},_selectDate:function(t,i){var s,n=e(t),a=this._getInst(n[0]);i=null!=i?i:this._formatDate(a),a.input&&a.input.val(i),this._updateAlternate(a),s=this._get(a,"onSelect"),s?s.apply(a.input?a.input[0]:null,[i,a]):a.input&&a.input.trigger("change"),a.inline?this._updateDatepicker(a):(this._hideDatepicker(),this._lastInput=a.input[0],"object"!=typeof a.input[0]&&a.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var i,s,n,a=this._get(t,"altField");a&&(i=this._get(t,"altFormat")||this._get(t,"dateFormat"),s=this._getDate(t),n=this.formatDate(i,s,this._getFormatConfig(t)),e(a).each(function(){e(this).val(n)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&6>t,""]},iso8601Week:function(e){var t,i=new Date(e.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),t=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((t-i)/864e5)/7)+1},parseDate:function(t,i,s){if(null==t||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,a,o,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),d=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,c=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,m=-1,g=-1,v=-1,y=-1,b=!1,_=function(e){var i=t.length>n+1&&t.charAt(n+1)===e;return i&&n++,i},x=function(e){var t=_(e),s="@"===e?14:"!"===e?20:"y"===e&&t?4:"o"===e?3:2,n=RegExp("^\\d{1,"+s+"}"),a=i.substring(h).match(n);if(!a)throw"Missing number at position "+h;return h+=a[0].length,parseInt(a[0],10)},w=function(t,s,n){var a=-1,o=e.map(_(t)?n:s,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});if(e.each(o,function(e,t){var s=t[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(a=t[0],h+=s.length,!1):void 0}),-1!==a)return a+1;throw"Unknown name at position "+h},k=function(){if(i.charAt(h)!==t.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;t.length>n;n++)if(b)"'"!==t.charAt(n)||_("'")?k():b=!1;else switch(t.charAt(n)){case"d":v=x("d");break;case"D":w("D",d,c);break;case"o":y=x("o");break;case"m":g=x("m");break;case"M":g=w("M",p,f);break;case"y":m=x("y");break;case"@":r=new Date(x("@")),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"!":r=new Date((x("!")-this._ticksTo1970)/1e4),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"'":_("'")?k():b=!0;break;default:k()}if(i.length>h&&(o=i.substr(h),!/^\s+/.test(o)))throw"Extra/unparsed characters found in date: "+o;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),y>-1)for(g=1,v=y;;){if(a=this._getDaysInMonth(m,g-1),a>=v)break;g++,v-=a}if(r=this._daylightSavingAdjust(new Date(m,g-1,v)),r.getFullYear()!==m||r.getMonth()+1!==g||r.getDate()!==v)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(e,t,i){if(!t)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,a=(i?i.dayNames:null)||this._defaults.dayNames,o=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(t){var i=e.length>s+1&&e.charAt(s+1)===t;return i&&s++,i},l=function(e,t,i){var s=""+t;if(h(e))for(;i>s.length;)s="0"+s;return s},u=function(e,t,i,s){return h(e)?s[t]:i[t]},d="",c=!1;if(t)for(s=0;e.length>s;s++)if(c)"'"!==e.charAt(s)||h("'")?d+=e.charAt(s):c=!1;else switch(e.charAt(s)){case"d":d+=l("d",t.getDate(),2);break;case"D":d+=u("D",t.getDay(),n,a);break;case"o":d+=l("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":d+=l("m",t.getMonth()+1,2);break;case"M":d+=u("M",t.getMonth(),o,r);break;case"y":d+=h("y")?t.getFullYear():(10>t.getYear()%100?"0":"")+t.getYear()%100;break;case"@":d+=t.getTime();break;case"!":d+=1e4*t.getTime()+this._ticksTo1970;break;case"'":h("'")?d+="'":c=!0;break;default:d+=e.charAt(s)}return d},_possibleChars:function(e){var t,i="",s=!1,n=function(i){var s=e.length>t+1&&e.charAt(t+1)===i;return s&&t++,s};for(t=0;e.length>t;t++)if(s)"'"!==e.charAt(t)||n("'")?i+=e.charAt(t):s=!1;else switch(e.charAt(t)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=e.charAt(t)}return i},_get:function(e,t){return void 0!==e.settings[t]?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()!==e.lastVal){var i=this._get(e,"dateFormat"),s=e.lastVal=e.input?e.input.val():null,n=this._getDefaultDate(e),a=n,o=this._getFormatConfig(e);try{a=this.parseDate(i,s,o)||n}catch(r){s=t?"":s}e.selectedDay=a.getDate(),e.drawMonth=e.selectedMonth=a.getMonth(),e.drawYear=e.selectedYear=a.getFullYear(),e.currentDay=s?a.getDate():0,e.currentMonth=s?a.getMonth():0,e.currentYear=s?a.getFullYear():0,this._adjustInstDate(e)}},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,i,s){var n=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},a=function(i){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),i,e.datepicker._getFormatConfig(t))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,a=n.getFullYear(),o=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":o+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o));break;case"y":case"Y":a+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o))}l=h.exec(i)}return new Date(a,o,r)},o=null==i||""===i?s:"string"==typeof i?a(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return o=o&&"Invalid Date"==""+o?s:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,i){var s=!t,n=e.selectedMonth,a=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),n===e.selectedMonth&&a===e.selectedYear||i||this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(s?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&""===e.input.val()?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var i=this._get(t,"stepMonths"),s="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){e.datepicker._adjustDate(s,-i,"M")},next:function(){e.datepicker._adjustDate(s,+i,"M")},hide:function(){e.datepicker._hideDatepicker()},today:function(){e.datepicker._gotoToday(s)},selectDay:function(){return e.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return e.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return e.datepicker._selectMonthYear(s,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,i,s,n,a,o,r,h,l,u,d,c,p,f,m,g,v,y,b,_,x,w,k,T,D,S,M,N,C,A,I,P,z,H,F,E,j,O,W,L=new Date,R=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(e,"isRTL"),B=this._get(e,"showButtonPanel"),J=this._get(e,"hideIfNoPrevNext"),q=this._get(e,"navigationAsDateFormat"),K=this._getNumberOfMonths(e),V=this._get(e,"showCurrentAtPos"),U=this._get(e,"stepMonths"),Q=1!==K[0]||1!==K[1],G=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),X=this._getMinMaxDate(e,"min"),$=this._getMinMaxDate(e,"max"),Z=e.drawMonth-V,et=e.drawYear;if(0>Z&&(Z+=12,et--),$)for(t=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-K[0]*K[1]+1,$.getDate())),t=X&&X>t?X:t;this._daylightSavingAdjust(new Date(et,Z,1))>t;)Z--,0>Z&&(Z=11,et--);for(e.drawMonth=Z,e.drawYear=et,i=this._get(e,"prevText"),i=q?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z-U,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":J?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(e,"nextText"),n=q?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z+U,1)),this._getFormatConfig(e)):n,a=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":J?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",o=this._get(e,"currentText"),r=this._get(e,"gotoCurrent")&&e.currentDay?G:R,o=q?this.formatDate(o,r,this._getFormatConfig(e)):o,h=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(e,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(Y?"":h)+"</div>":"",u=parseInt(this._get(e,"firstDay"),10),u=isNaN(u)?0:u,d=this._get(e,"showWeek"),c=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),f=this._get(e,"monthNames"),m=this._get(e,"monthNamesShort"),g=this._get(e,"beforeShowDay"),v=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),_="",w=0;K[0]>w;w++){for(k="",this.maxRows=4,T=0;K[1]>T;T++){if(D=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),S=" ui-corner-all",M="",Q){if(M+="<div class='ui-datepicker-group",K[1]>1)switch(T){case 0:M+=" ui-datepicker-group-first",S=" ui-corner-"+(Y?"right":"left");break;case K[1]-1:M+=" ui-datepicker-group-last",S=" ui-corner-"+(Y?"left":"right");break;default:M+=" ui-datepicker-group-middle",S=""}M+="'>"}for(M+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+S+"'>"+(/all|left/.test(S)&&0===w?Y?a:s:"")+(/all|right/.test(S)&&0===w?Y?s:a:"")+this._generateMonthYearHeader(e,Z,et,X,$,w>0||T>0,f,m)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",N=d?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"",x=0;7>x;x++)C=(x+u)%7,N+="<th scope='col'"+((x+u+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+c[C]+"'>"+p[C]+"</span></th>";for(M+=N+"</tr></thead><tbody>",A=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,A)),I=(this._getFirstDayOfMonth(et,Z)-u+7)%7,P=Math.ceil((I+A)/7),z=Q?this.maxRows>P?this.maxRows:P:P,this.maxRows=z,H=this._daylightSavingAdjust(new Date(et,Z,1-I)),F=0;z>F;F++){for(M+="<tr>",E=d?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(H)+"</td>":"",x=0;7>x;x++)j=g?g.apply(e.input?e.input[0]:null,[H]):[!0,""],O=H.getMonth()!==Z,W=O&&!y||!j[0]||X&&X>H||$&&H>$,E+="<td class='"+((x+u+6)%7>=5?" ui-datepicker-week-end":"")+(O?" ui-datepicker-other-month":"")+(H.getTime()===D.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===H.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(W?" "+this._unselectableClass+" ui-state-disabled":"")+(O&&!v?"":" "+j[1]+(H.getTime()===G.getTime()?" "+this._currentClass:"")+(H.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+(O&&!v||!j[2]?"":" title='"+j[2].replace(/'/g,"&#39;")+"'")+(W?"":" data-handler='selectDay' data-event='click' data-month='"+H.getMonth()+"' data-year='"+H.getFullYear()+"'")+">"+(O&&!v?"&#xa0;":W?"<span class='ui-state-default'>"+H.getDate()+"</span>":"<a class='ui-state-default"+(H.getTime()===R.getTime()?" ui-state-highlight":"")+(H.getTime()===G.getTime()?" ui-state-active":"")+(O?" ui-priority-secondary":"")+"' href='#'>"+H.getDate()+"</a>")+"</td>",H.setDate(H.getDate()+1),H=this._daylightSavingAdjust(H);M+=E+"</tr>"}Z++,Z>11&&(Z=0,et++),M+="</tbody></table>"+(Q?"</div>"+(K[0]>0&&T===K[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=M}_+=k}return _+=l,e._keyEvent=!1,_},_generateMonthYearHeader:function(e,t,i,s,n,a,o,r){var h,l,u,d,c,p,f,m,g=this._get(e,"changeMonth"),v=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",_="";if(a||!g)_+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,_+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",u=0;12>u;u++)(!h||u>=s.getMonth())&&(!l||n.getMonth()>=u)&&(_+="<option value='"+u+"'"+(u===t?" selected='selected'":"")+">"+r[u]+"</option>");_+="</select>"}if(y||(b+=_+(!a&&g&&v?"":"&#xa0;")),!e.yearshtml)if(e.yearshtml="",a||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(d=this._get(e,"yearRange").split(":"),c=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?i+parseInt(e.substring(1),10):e.match(/[+\-].*/)?c+parseInt(e,10):parseInt(e,10);return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=n?Math.min(m,n.getFullYear()):m,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";m>=f;f++)e.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!a&&g&&v?"":"&#xa0;")+_),b+="</div>"},_adjustInstDate:function(e,t,i){var s=e.drawYear+("Y"===i?t:0),n=e.drawMonth+("M"===i?t:0),a=Math.min(e.selectedDay,this._getDaysInMonth(s,n))+("D"===i?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(s,n,a)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(e)},_restrictMinMax:function(e,t){var i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),n=i&&i>t?i:t;return s&&n>s?s:n},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return new Date(e,t,1).getDay()},_canAdjustMonth:function(e,t,i,s){var n=this._getNumberOfMonths(e),a=this._daylightSavingAdjust(new Date(i,s+(0>t?t:n[0]*n[1]),1));return 0>t&&a.setDate(this._getDaysInMonth(a.getFullYear(),a.getMonth())),this._isInRange(e,a)},_isInRange:function(e,t){var i,s,n=this._getMinMaxDate(e,"min"),a=this._getMinMaxDate(e,"max"),o=null,r=null,h=this._get(e,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),o=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(o+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||t.getTime()>=n.getTime())&&(!a||t.getTime()<=a.getTime())&&(!o||t.getFullYear()>=o)&&(!r||r>=t.getFullYear())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t="string"!=typeof t?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,i,s){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var n=t?"object"==typeof t?t:this._daylightSavingAdjust(new Date(s,i,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),n,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),0===e("#"+e.datepicker._mainDivId).length&&e("body").append(e.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof t||"isDisabled"!==t&&"getDate"!==t&&"widget"!==t?"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof t?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(i)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i))},e.datepicker=new n,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.0",e.datepicker,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.0",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"!==this.options.helper||/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.document[0],s=this.options;try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(n){}return this.helper||s.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(e(s.iframeFix===!0?"iframe":s.iframeFix).each(function(){e("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(e(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offsetParent=this.helper.offsetParent(),this.offsetParentCssPosition=this.offsetParent.css("position"),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.offset.scroll=!1,e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_mouseDrag:function(t,i){if("fixed"===this.offsetParentCssPosition&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return e("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this._removeHandleClassName(),e(this.options.handle||this.element).addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.element.find(".ui-draggable-handle").addBack().removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return s.parents("body").length||s.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s[0]===this.element[0]||/(fixed|absolute)/.test(s.css("position"))||s.css("position","absolute"),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relative_container=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t="hidden"!==i.css("overflow"),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}
-},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relative_container?(s=this.relative_container.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),"drag"===t&&(this.positionAbs=this._convertPositionTo("absolute")),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=s.options,a=e.extend({},i,{item:s.element});s.sortables=[],e(n.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push({instance:i,shouldRevert:i.options.revert}),i.refreshPositions(),i._trigger("activate",t,a))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});e.each(s.sortables,function(){this.instance.isOver?(this.instance.isOver=0,s.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=this.shouldRevert),this.instance._mouseStop(t),this.instance.options.helper=this.instance.options._helper,"original"===s.options.helper&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",t,n))})},drag:function(t,i,s){var n=this;e.each(s.sortables,function(){var a=!1,o=this;this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(a=!0,e.each(s.sortables,function(){return this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this!==o&&this.instance._intersectsWith(this.instance.containerCache)&&e.contains(o.instance.element[0],this.instance.element[0])&&(a=!1),a})),a?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=e(n).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return i.helper[0]},t.target=this.instance.currentItem[0],this.instance._mouseCapture(t,!0),this.instance._mouseStart(t,!0,!0),this.instance.offset.click.top=s.offset.click.top,this.instance.offset.click.left=s.offset.click.left,this.instance.offset.parent.left-=s.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=s.offset.parent.top-this.instance.offset.parent.top,s._trigger("toSortable",t),s.dropped=this.instance.element,s.currentItem=s.element,this.instance.fromOutside=s),this.instance.currentItem&&this.instance._mouseDrag(t)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",t,this.instance._uiHash(this.instance)),this.instance._mouseStop(t,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),s._trigger("fromSortable",t),s.dropped=!1)})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParent[0]!==i.document[0]&&"HTML"!==i.scrollParent[0].tagName&&(i.overflowOffset=i.scrollParent.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.document[0];s.scrollParent[0]!==o&&"HTML"!==s.scrollParent[0].tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+s.scrollParent[0].offsetHeight-t.pageY<n.scrollSensitivity?s.scrollParent[0].scrollTop=a=s.scrollParent[0].scrollTop+n.scrollSpeed:t.pageY-s.overflowOffset.top<n.scrollSensitivity&&(s.scrollParent[0].scrollTop=a=s.scrollParent[0].scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+s.scrollParent[0].offsetWidth-t.pageX<n.scrollSensitivity?s.scrollParent[0].scrollLeft=a=s.scrollParent[0].scrollLeft+n.scrollSpeed:t.pageX-s.overflowOffset.left<n.scrollSensitivity&&(s.scrollParent[0].scrollLeft=a=s.scrollParent[0].scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(t.pageY-e(o).scrollTop()<n.scrollSensitivity?a=e(o).scrollTop(e(o).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(o).scrollTop())<n.scrollSensitivity&&(a=e(o).scrollTop(e(o).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(t.pageX-e(o).scrollLeft()<n.scrollSensitivity?a=e(o).scrollLeft(e(o).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(o).scrollLeft())<n.scrollSensitivity&&(a=e(o).scrollLeft(e(o).scrollLeft()+n.scrollSpeed)))),a!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(s,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,i,s){var n=s.options;s.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var t=e(this),i=t.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:i.top,left:i.left})})},drag:function(t,i,s){var n,a,o,r,h,l,u,d,c,p,f=s.options,m=f.snapTolerance,g=i.offset.left,v=g+s.helperProportions.width,y=i.offset.top,b=y+s.helperProportions.height;for(c=s.snapElements.length-1;c>=0;c--)h=s.snapElements[c].left,l=h+s.snapElements[c].width,u=s.snapElements[c].top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>b||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-b),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top-s.margins.top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top-s.margins.top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left-s.margins.left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left-s.margins.left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-b),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top-s.margins.top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top-s.margins.top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left-s.margins.left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left-s.margins.left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.0",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("<div class='ui-resizable-handle "+a+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=this.element.children(this.handles[i]).first().show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),e(this.handles[i]).length},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.originalPosition={left:i,top:s},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s=this.helper,n={},a=this.originalMousePosition,o=this.axis,r=t.pageX-a.left||0,h=t.pageY-a.top||0,l=this._change[o];return this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height},l?(i=l.apply(this,[t,r,h]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),this.position.top!==this.prevPosition.top&&(n.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(n.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(n.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(n)||this._trigger("resize",t,this.ui()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidth<e.width,n=this._isNumber(e.height)&&t.maxHeight&&t.maxHeight<e.height,a=this._isNumber(e.width)&&t.minWidth&&t.minWidth>e.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var e,t,i,s,n,a=this.helper||this.element;for(e=0;this._proportionallyResizeElements.length>e;e++){if(n=this._proportionallyResizeElements[e],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],t=0;i.length>t;t++)this.borderDif[t]=(parseInt(i[t],10)||0)+(parseInt(s[t],10)||0);n.css({height:a.height()-this.borderDif[0]-this.borderDif[2]||0,width:a.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition,prevSize:this.prevSize,prevPosition:this.prevPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t,i){var s,n,a,o,r=e(this).resizable("instance"),h=r.options,l=r.containerOffset,u=r.position,d=r._aspectRatio||t.shiftKey,c={top:0,left:0},p=r.containerElement,f=!0;p[0]!==document&&/static/.test(p.css("position"))&&(c=l),u.left<(r._helper?l.left:0)&&(r.size.width=r.size.width+(r._helper?r.position.left-l.left:r.position.left-c.left),d&&(r.size.height=r.size.width/r.aspectRatio,f=!1),r.position.left=h.helper?l.left:0),u.top<(r._helper?l.top:0)&&(r.size.height=r.size.height+(r._helper?r.position.top-l.top:r.position.top),d&&(r.size.width=r.size.height*r.aspectRatio,f=!1),r.position.top=r._helper?l.top:0),r.offset.left=r.parentData.left+r.position.left,r.offset.top=r.parentData.top+r.position.top,s=Math.abs((r._helper?r.offset.left-c.left:r.offset.left-l.left)+r.sizeDiff.width),n=Math.abs((r._helper?r.offset.top-c.top:r.offset.top-l.top)+r.sizeDiff.height),a=r.containerElement.get(0)===r.element.parent().get(0),o=/relative|absolute/.test(r.containerElement.css("position")),a&&o&&(s-=Math.abs(r.parentData.left)),s+r.size.width>=r.parentData.width&&(r.size.width=r.parentData.width-s,d&&(r.size.height=r.size.width/r.aspectRatio,f=!1)),n+r.size.height>=r.parentData.height&&(r.size.height=r.parentData.height-n,d&&(r.size.width=r.size.height*r.aspectRatio,f=!1)),f||(r.position.left=i.prevPosition.left,r.position.top=i.prevPosition.top,r.size.width=i.prevSize.width,r.size.height=i.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=function(t){e(t).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):e.each(i.alsoResize,function(e){s(e)})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0},h=function(t,s){e(t).each(function(){var t=e(this),n=e(this).data("ui-resizable-alsoresize"),a={},o=s&&s.length?s:t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var i=(n[t]||0)+(r[t]||0);i&&i>=0&&(a[t]=i||null)}),t.css(a)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):e.each(n.alsoResize,function(e,t){h(e,t)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size,n=t.originalSize,a=t.originalPosition,o=t.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,u=Math.round((s.width-n.width)/h)*h,d=Math.round((s.height-n.height)/l)*l,c=n.width+u,p=n.height+d,f=i.maxWidth&&c>i.maxWidth,m=i.maxHeight&&p>i.maxHeight,g=i.minWidth&&i.minWidth>c,v=i.minHeight&&i.minHeight>p;i.grid=r,g&&(c+=h),v&&(p+=l),f&&(c-=h),m&&(p-=l),/^(se|s|e)$/.test(o)?(t.size.width=c,t.size.height=p):/^(ne)$/.test(o)?(t.size.width=c,t.size.height=p,t.position.top=a.top-d):/^(sw)$/.test(o)?(t.size.width=c,t.size.height=p,t.position.left=a.left-u):(p-l>0?(t.size.height=p,t.position.top=a.top-d):(t.size.height=l,t.position.top=a.top+n.height-l),c-h>0?(t.size.width=c,t.position.left=a.left-u):(t.size.width=h,t.position.left=a.left+n.width-h))}}),e.ui.resizable,e.widget("ui.dialog",{version:"1.11.0",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var i=e(this).css(t).offset().top;0>i&&e(this).css("top",t.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",t)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&e(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",t)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),a=Math.max.apply(null,n);return a>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",a+1),s=!0),s&&!i&&this._trigger("focus",t),s},open:function(){var t=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._trigger("open"),void 0)},_focusTabbable:function(){var e=this._focusedElement;e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function i(){var t=this.document[0].activeElement,i=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);i||this._focusTabbable()}t.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE)return t.preventDefault(),this.close(t),void 0;if(t.keyCode===e.ui.keyCode.TAB&&!t.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");t.target!==n[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==s[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){n.focus()}),t.preventDefault()):(this._delay(function(){s.focus()}),t.preventDefault())}},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()
-}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),e.isEmptyObject(i)||e.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),void 0):(e.each(i,function(i,s){var n,a;s=e.isFunction(s)?{click:s,text:i}:s,s=e.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(t.element[0],arguments)},a={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,e("<button></button>",s).button(a).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function t(e){return{position:e.position,offset:e.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){e(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,t(n))},drag:function(e,s){i._trigger("drag",e,t(s))},stop:function(n,a){var o=a.offset.left-i.document.scrollLeft(),r=a.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(r>=0?"+":"")+r,of:i.window},e(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,t(a))}})},_makeResizable:function(){function t(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var i=this,s=this.options,n=s.resizable,a=this.uiDialog.css("position"),o="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:o,start:function(s,n){e(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,t(n))},resize:function(e,s){i._trigger("resize",e,t(s))},stop:function(n,a){var o=i.uiDialog.offset(),r=o.left-i.document.scrollLeft(),h=o.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},e(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,t(a))}}).css("position",a)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._untrackInstance(),this._trackingInstances().unshift(this),this._focusedElement=e(t.target)}})},_untrackInstance:function(){var t=this._trackingInstances(),i=e.inArray(this,t);-1!==i&&t.splice(i,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return"auto"===e.height?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};e.each(t,function(e,t){i._setOption(e,t),e in i.sizeRelatedOptions&&(s=!0),e in i.resizableRelatedOptions&&(n[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,t){var i,s,n=this.uiDialog;"dialogClass"===e&&n.removeClass(this.options.dialogClass).addClass(t),"disabled"!==e&&(this._super(e,t),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:""+t}),"draggable"===e&&(i=n.is(":data(ui-draggable)"),i&&!t&&n.draggable("destroy"),!i&&t&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(s=n.is(":data(ui-resizable)"),s&&!t&&n.resizable("destroy"),s&&"string"==typeof t&&n.resizable("option","handles",t),s||t===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var e,t,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),e=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),t=Math.max(0,s.minHeight-e),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-e):"none","auto"===s.height?this.element.css({minHeight:t,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){t||this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),e.widget("ui.droppable",{version:"1.11.0",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var t=e(this).droppable("instance");return t.options.greedy&&!t.options.disabled&&t.options.scope===s.options.scope&&t.accept.call(t.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(t,{offset:t.element.offset()}),t.options.tolerance)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s){if(!i.offset)return!1;var n,a,o=(t.positionAbs||t.position.absolute).left,r=(t.positionAbs||t.position.absolute).top,h=o+t.helperProportions.width,l=r+t.helperProportions.height,u=i.offset.left,d=i.offset.top,c=u+i.proportions().width,p=d+i.proportions().height;switch(s){case"fit":return o>=u&&c>=h&&r>=d&&p>=l;case"intersect":return o+t.helperProportions.width/2>u&&c>h-t.helperProportions.width/2&&r+t.helperProportions.height/2>d&&p>l-t.helperProportions.height/2;case"pointer":return n=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,a=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,e(a,d,i.proportions().height)&&e(n,u,i.proportions().width);case"touch":return(r>=d&&p>=r||l>=d&&p>=l||d>r&&l>p)&&(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable;var v="ui-effects-";e.effects={effect:{}},function(e,t){function i(e,t,i){var s=d[t.type]||{};return null==e?i||!t.def?null:t.def:(e=s.floor?~~e:parseFloat(e),isNaN(e)?t.def:s.mod?(e+s.mod)%s.mod:0>e?0:e>s.max?s.max:e)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(e,a){var o,r=a.re.exec(i),h=r&&a.parse(r),l=a.space||"rgba";return h?(o=s[l](h),s[u[l].cache]=o[u[l].cache],n=s._rgba=o._rgba,!1):t}),n.length?("0,0,0,0"===n.join()&&e.extend(n,a.transparent),s):a[i]}function n(e,t,i){return i=(i+1)%1,1>6*i?e+6*(t-e)*i:1>2*i?t:2>3*i?e+6*(t-e)*(2/3-i):e}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[2.55*e[1],2.55*e[2],2.55*e[3],e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],l=e.Color=function(t,i,s,n){return new e.Color.fn.parse(t,i,s,n)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},d={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},c=l.support={},p=e("<p>")[0],f=e.each;p.style.cssText="background-color:rgba(1,1,1,.5)",c.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),l.fn=e.extend(l.prototype,{parse:function(n,o,r,h){if(n===t)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=e(n).css(o),o=t);var d=this,c=e.type(n),p=this._rgba=[];return o!==t&&(n=[n,o,r,h],c="array"),"string"===c?this.parse(s(n)||a._default):"array"===c?(f(u.rgba.props,function(e,t){p[t.idx]=i(n[t.idx],t)}),this):"object"===c?(n instanceof l?f(u,function(e,t){n[t.cache]&&(d[t.cache]=n[t.cache].slice())}):f(u,function(t,s){var a=s.cache;f(s.props,function(e,t){if(!d[a]&&s.to){if("alpha"===e||null==n[e])return;d[a]=s.to(d._rgba)}d[a][t.idx]=i(n[e],t,!0)}),d[a]&&0>e.inArray(null,d[a].slice(0,3))&&(d[a][3]=1,s.from&&(d._rgba=s.from(d[a])))}),this):t},is:function(e){var i=l(e),s=!0,n=this;return f(u,function(e,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(e,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:t})),s}),s},_space:function(){var e=[],t=this;return f(u,function(i,s){t[s.cache]&&e.push(i)}),e.pop()},transition:function(e,t){var s=l(e),n=s._space(),a=u[n],o=0===this.alpha()?l("transparent"):this,r=o[a.cache]||a.to(o._rgba),h=r.slice();return s=s[a.cache],f(a.props,function(e,n){var a=n.idx,o=r[a],l=s[a],u=d[n.type]||{};null!==l&&(null===o?h[a]=l:(u.mod&&(l-o>u.mod/2?o+=u.mod:o-l>u.mod/2&&(o-=u.mod)),h[a]=i((l-o)*t+o,n)))}),this[n](h)},blend:function(t){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(t)._rgba;return l(e.map(i,function(e,t){return(1-s)*n[t]+s*e}))},toRgbaString:function(){var t="rgba(",i=e.map(this._rgba,function(e,t){return null==e?t>2?1:0:e});return 1===i[3]&&(i.pop(),t="rgb("),t+i.join()+")"},toHslaString:function(){var t="hsla(",i=e.map(this.hsla(),function(e,t){return null==e&&(e=t>2?1:0),t&&3>t&&(e=Math.round(100*e)+"%"),e});return 1===i[3]&&(i.pop(),t="hsl("),t+i.join()+")"},toHexString:function(t){var i=this._rgba.slice(),s=i.pop();return t&&i.push(~~(255*s)),"#"+e.map(i,function(e){return e=(e||0).toString(16),1===e.length?"0"+e:e}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,u.hsla.to=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t,i,s=e[0]/255,n=e[1]/255,a=e[2]/255,o=e[3],r=Math.max(s,n,a),h=Math.min(s,n,a),l=r-h,u=r+h,d=.5*u;return t=h===r?0:s===r?60*(n-a)/l+360:n===r?60*(a-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=d?l/u:l/(2-u),[Math.round(t)%360,i,d,null==o?1:o]},u.hsla.from=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t=e[0]/360,i=e[1],s=e[2],a=e[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,t+1/3)),Math.round(255*n(r,o,t)),Math.round(255*n(r,o,t-1/3)),a]},f(u,function(s,n){var a=n.props,o=n.cache,h=n.to,u=n.from;l.fn[s]=function(s){if(h&&!this[o]&&(this[o]=h(this._rgba)),s===t)return this[o].slice();var n,r=e.type(s),d="array"===r||"object"===r?s:arguments,c=this[o].slice();return f(a,function(e,t){var s=d["object"===r?e:t.idx];null==s&&(s=c[t.idx]),c[t.idx]=i(s,t)}),u?(n=l(u(c)),n[o]=c,n):l(c)},f(a,function(t,i){l.fn[t]||(l.fn[t]=function(n){var a,o=e.type(n),h="alpha"===t?this._hsla?"hsla":"rgba":s,l=this[h](),u=l[i.idx];return"undefined"===o?u:("function"===o&&(n=n.call(this,u),o=e.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=u+parseFloat(a[2])*("+"===a[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(t){var i=t.split(" ");f(i,function(t,i){e.cssHooks[i]={set:function(t,n){var a,o,r="";if("transparent"!==n&&("string"!==e.type(n)||(a=s(n)))){if(n=l(a||n),!c.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?t.parentNode:t;(""===r||"transparent"===r)&&o&&o.style;)try{r=e.css(o,"backgroundColor"),o=o.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{t.style[i]=n}catch(h){}}},e.fx.step[i]=function(t){t.colorInit||(t.start=l(t.elem,i),t.end=l(t.end),t.colorInit=!0),e.cssHooks[i].set(t.elem,t.start.transition(t.end,t.pos))}})},l.hook(o),e.cssHooks.borderColor={expand:function(e){var t={};return f(["Top","Right","Bottom","Left"],function(i,s){t["border"+s+"Color"]=e}),t}},a=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function t(t){var i,s,n=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[e.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function i(t,i){var s,a,o={};for(s in i)a=i[s],t[s]!==a&&(n[s]||(e.fx.step[s]||!isNaN(parseFloat(a)))&&(o[s]=a));return o}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,i){e.fx.step[i]=function(e){("none"!==e.end&&!e.setAttr||1===e.pos&&!e.setAttr)&&(jQuery.style(e.elem,i,e.end),e.setAttr=!0)}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(n,a,o,r){var h=e.speed(a,o,r);return this.queue(function(){var a,o=e(this),r=o.attr("class")||"",l=h.children?o.find("*").addBack():o;l=l.map(function(){var i=e(this);return{el:i,start:t(this)}}),a=function(){e.each(s,function(e,t){n[t]&&o[t+"Class"](n[t])})},a(),l=l.map(function(){return this.end=t(this.el[0]),this.diff=i(this.start,this.end),this}),o.attr("class",r),l=l.map(function(){var t=this,i=e.Deferred(),s=e.extend({},h,{queue:!1,complete:function(){i.resolve(t)}});return this.el.animate(this.diff,s),i.promise()}),e.when.apply(e,l.get()).done(function(){a(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),h.complete.call(o[0])})})},e.fn.extend({addClass:function(t){return function(i,s,n,a){return s?e.effects.animateClass.call(this,{add:i},s,n,a):t.apply(this,arguments)}}(e.fn.addClass),removeClass:function(t){return function(i,s,n,a){return arguments.length>1?e.effects.animateClass.call(this,{remove:i},s,n,a):t.apply(this,arguments)}}(e.fn.removeClass),toggleClass:function(t){return function(i,s,n,a,o){return"boolean"==typeof s||void 0===s?n?e.effects.animateClass.call(this,s?{add:i}:{remove:i},n,a,o):t.apply(this,arguments):e.effects.animateClass.call(this,{toggle:i},s,n,a)}}(e.fn.toggleClass),switchClass:function(t,i,s,n,a){return e.effects.animateClass.call(this,{add:i,remove:t},s,n,a)}})}(),function(){function t(t,i,s,n){return e.isPlainObject(t)&&(i=t,t=t.effect),t={effect:t},null==i&&(i={}),e.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||e.fx.speeds[i])&&(n=s,s=i,i={}),e.isFunction(s)&&(n=s,s=null),i&&e.extend(t,i),s=s||i.duration,t.duration=e.fx.off?0:"number"==typeof s?s:s in e.fx.speeds?e.fx.speeds[s]:e.fx.speeds._default,t.complete=n||i.complete,t}function i(t){return!t||"number"==typeof t||e.fx.speeds[t]?!0:"string"!=typeof t||e.effects.effect[t]?e.isFunction(t)?!0:"object"!=typeof t||t.effect?!1:!0:!0}e.extend(e.effects,{version:"1.11.0",save:function(e,t){for(var i=0;t.length>i;i++)null!==t[i]&&e.data(v+t[i],e[0].style[t[i]])},restore:function(e,t){var i,s;for(s=0;t.length>s;s++)null!==t[s]&&(i=e.data(v+t[s]),void 0===i&&(i=""),e.css(t[s],i))},setMode:function(e,t){return"toggle"===t&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var i,s;switch(e[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=e[0]/t.height}switch(e[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=e[1]/t.width}return{x:s,y:i}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var i={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},s=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:t.width(),height:t.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return t.wrap(s),(t[0]===a||e.contains(t[0],a))&&e(a).focus(),s=t.parent(),"static"===t.css("position")?(s.css({position:"relative"}),t.css({position:"relative"})):(e.extend(i,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,s){i[s]=t.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(n),s.css(i).show()},removeWrapper:function(t){var i=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===i||e.contains(t[0],i))&&e(i).focus()),t},setTransition:function(t,i,s,n){return n=n||{},e.each(i,function(e,i){var a=t.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),e.fn.extend({effect:function(){function i(t){function i(){e.isFunction(a)&&a.call(n[0]),e.isFunction(t)&&t()}var n=e(this),a=s.complete,r=s.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),i()):o.call(n[0],s,i)}var s=t.apply(this,arguments),n=s.mode,a=s.queue,o=e.effects.effect[s.effect];return e.fx.off||!o?n?this[n](s.duration,s.complete):this.each(function(){s.complete&&s.complete.call(this)}):a===!1?this.each(i):this.queue(a||"fx",i)},show:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(e.fn.show),hide:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(e.fn.hide),toggle:function(e){return function(s){if(i(s)||"boolean"==typeof s)return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(e.fn.toggle),cssUnit:function(t){var i=this.css(t),s=[];return e.each(["em","px","%","pt"],function(e,t){i.indexOf(t)>0&&(s=[parseFloat(i),t])}),s}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,i){t[i]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return 0===e||1===e?e:-Math.pow(2,8*(e-1))*Math.sin((80*(e-1)-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){for(var t,i=4;((t=Math.pow(2,--i))-1)/11>e;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*t-2)/22-e,2)}}),e.each(t,function(t,i){e.easing["easeIn"+t]=i,e.easing["easeOut"+t]=function(e){return 1-i(1-e)},e.easing["easeInOut"+t]=function(e){return.5>e?i(2*e)/2:1-i(-2*e+2)/2}})}(),e.effects,e.effects.effect.blind=function(t,i){var s,n,a,o=e(this),r=/up|down|vertical/,h=/up|left|vertical|horizontal/,l=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(o,t.mode||"hide"),d=t.direction||"up",c=r.test(d),p=c?"height":"width",f=c?"top":"left",m=h.test(d),g={},v="show"===u;o.parent().is(".ui-effects-wrapper")?e.effects.save(o.parent(),l):e.effects.save(o,l),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n=s[p](),a=parseFloat(s.css(f))||0,g[p]=v?n:0,m||(o.css(c?"bottom":"right",0).css(c?"top":"left","auto").css({position:"absolute"}),g[f]=v?a:n+a),v&&(s.css(p,0),m||s.css(f,a+n)),s.animate(g,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){"hide"===u&&o.hide(),e.effects.restore(o,l),e.effects.removeWrapper(o),i()}})},e.effects.effect.bounce=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"effect"),l="hide"===h,u="show"===h,d=t.direction||"up",c=t.distance,p=t.times||5,f=2*p+(u||l?1:0),m=t.duration/f,g=t.easing,v="up"===d||"down"===d?"top":"left",y="up"===d||"left"===d,b=o.queue(),_=b.length;for((u||l)&&r.push("opacity"),e.effects.save(o,r),o.show(),e.effects.createWrapper(o),c||(c=o["top"===v?"outerHeight":"outerWidth"]()/3),u&&(a={opacity:1},a[v]=0,o.css("opacity",0).css(v,y?2*-c:2*c).animate(a,m,g)),l&&(c/=Math.pow(2,p-1)),a={},a[v]=0,s=0;p>s;s++)n={},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g).animate(a,m,g),c=l?2*c:c/2;l&&(n={opacity:0},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g)),o.queue(function(){l&&o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}),_>1&&b.splice.apply(b,[1,0].concat(b.splice(_,f+1))),o.dequeue()},e.effects.effect.clip=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"hide"),l="show"===h,u=t.direction||"vertical",d="vertical"===u,c=d?"height":"width",p=d?"top":"left",f={};e.effects.save(o,r),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n="IMG"===o[0].tagName?s:o,a=n[c](),l&&(n.css(c,0),n.css(p,a/2)),f[c]=l?a:0,f[p]=l?0:a/2,n.animate(f,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){l||o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}})},e.effects.effect.drop=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","opacity","height","width"],o=e.effects.setMode(n,t.mode||"hide"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h?"pos":"neg",d={opacity:r?1:0};e.effects.save(n,a),n.show(),e.effects.createWrapper(n),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===u?-s:s),d[l]=(r?"pos"===u?"+=":"-=":"pos"===u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.explode=function(t,i){function s(){b.push(this),b.length===d*c&&n()}function n(){p.css({visibility:"visible"}),e(b).remove(),m||p.hide(),i()}var a,o,r,h,l,u,d=t.pieces?Math.round(Math.sqrt(t.pieces)):3,c=d,p=e(this),f=e.effects.setMode(p,t.mode||"hide"),m="show"===f,g=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/c),y=Math.ceil(p.outerHeight()/d),b=[];for(a=0;d>a;a++)for(h=g.top+a*y,u=a-(d-1)/2,o=0;c>o;o++)r=g.left+o*v,l=o-(c-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-o*v,top:-a*y}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:y,left:r+(m?l*v:0),top:h+(m?u*y:0),opacity:m?0:1}).animate({left:r+(m?0:l*v),top:h+(m?0:u*y),opacity:m?1:0},t.duration||500,t.easing,s)},e.effects.effect.fade=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:t.duration,easing:t.easing,complete:i})},e.effects.effect.fold=function(t,i){var s,n,a=e(this),o=["position","top","bottom","left","right","height","width"],r=e.effects.setMode(a,t.mode||"hide"),h="show"===r,l="hide"===r,u=t.size||15,d=/([0-9]+)%/.exec(u),c=!!t.horizFirst,p=h!==c,f=p?["width","height"]:["height","width"],m=t.duration/2,g={},v={};e.effects.save(a,o),a.show(),s=e.effects.createWrapper(a).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],d&&(u=parseInt(d[1],10)/100*n[l?0:1]),h&&s.css(c?{height:0,width:u}:{height:u,width:0}),g[f[0]]=h?n[0]:u,v[f[1]]=h?n[1]:0,s.animate(g,m,t.easing).animate(v,m,t.easing,function(){l&&a.hide(),e.effects.restore(a,o),e.effects.removeWrapper(a),i()})},e.effects.effect.highlight=function(t,i){var s=e(this),n=["backgroundImage","backgroundColor","opacity"],a=e.effects.setMode(s,t.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),e.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===a&&s.hide(),e.effects.restore(s,n),i()}})},e.effects.effect.size=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],u=["fontSize"],d=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],c=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),f=t.restore||"effect"!==p,m=t.scale||"both",g=t.origin||["middle","center"],v=o.css("position"),y=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&o.show(),s={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},"toggle"===t.mode&&"show"===p?(o.from=t.to||b,o.to=t.from||s):(o.from=t.from||("show"===p?b:s),o.to=t.to||("hide"===p?b:s)),a={from:{y:o.from.height/s.height,x:o.from.width/s.width},to:{y:o.to.height/s.height,x:o.to.width/s.width}},("box"===m||"both"===m)&&(a.from.y!==a.to.y&&(y=y.concat(d),o.from=e.effects.setTransition(o,d,a.from.y,o.from),o.to=e.effects.setTransition(o,d,a.to.y,o.to)),a.from.x!==a.to.x&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,a.from.x,o.from),o.to=e.effects.setTransition(o,c,a.to.x,o.to))),("content"===m||"both"===m)&&a.from.y!==a.to.y&&(y=y.concat(u).concat(l),o.from=e.effects.setTransition(o,u,a.from.y,o.from),o.to=e.effects.setTransition(o,u,a.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),g&&(n=e.effects.getBaseline(g,s),o.from.top=(s.outerHeight-o.outerHeight())*n.y,o.from.left=(s.outerWidth-o.outerWidth())*n.x,o.to.top=(s.outerHeight-o.to.outerHeight)*n.y,o.to.left=(s.outerWidth-o.to.outerWidth)*n.x),o.css(o.from),("content"===m||"both"===m)&&(d=d.concat(["marginTop","marginBottom"]).concat(u),c=c.concat(["marginLeft","marginRight"]),l=r.concat(d).concat(c),o.find("*[width]").each(function(){var i=e(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};
-f&&e.effects.save(i,l),i.from={height:s.height*a.from.y,width:s.width*a.from.x,outerHeight:s.outerHeight*a.from.y,outerWidth:s.outerWidth*a.from.x},i.to={height:s.height*a.to.y,width:s.width*a.to.x,outerHeight:s.height*a.to.y,outerWidth:s.width*a.to.x},a.from.y!==a.to.y&&(i.from=e.effects.setTransition(i,d,a.from.y,i.from),i.to=e.effects.setTransition(i,d,a.to.y,i.to)),a.from.x!==a.to.x&&(i.from=e.effects.setTransition(i,c,a.from.x,i.from),i.to=e.effects.setTransition(i,c,a.to.x,i.to)),i.css(i.from),i.animate(i.to,t.duration,t.easing,function(){f&&e.effects.restore(i,l)})})),o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){0===o.to.opacity&&o.css("opacity",o.from.opacity),"hide"===p&&o.hide(),e.effects.restore(o,y),f||("static"===v?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,i){var s=parseInt(i,10),n=e?o.to.left:o.to.top;return"auto"===i?n+"px":s+n+"px"})})),e.effects.removeWrapper(o),i()}})},e.effects.effect.scale=function(t,i){var s=e(this),n=e.extend(!0,{},t),a=e.effects.setMode(s,t.mode||"effect"),o=parseInt(t.percent,10)||(0===parseInt(t.percent,10)?0:"hide"===a?0:100),r=t.direction||"both",h=t.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},u={y:"horizontal"!==r?o/100:1,x:"vertical"!==r?o/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==a&&(n.origin=h||["middle","center"],n.restore=!0),n.from=t.from||("show"===a?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*u.y,width:l.width*u.x,outerHeight:l.outerHeight*u.y,outerWidth:l.outerWidth*u.x},n.fade&&("show"===a&&(n.from.opacity=0,n.to.opacity=1),"hide"===a&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},e.effects.effect.puff=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"hide"),a="hide"===n,o=parseInt(t.percent,10)||150,r=o/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:a?o:100,from:a?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(t)},e.effects.effect.pulsate=function(t,i){var s,n=e(this),a=e.effects.setMode(n,t.mode||"show"),o="show"===a,r="hide"===a,h=o||"hide"===a,l=2*(t.times||5)+(h?1:0),u=t.duration/l,d=0,c=n.queue(),p=c.length;for((o||!n.is(":visible"))&&(n.css("opacity",0).show(),d=1),s=1;l>s;s++)n.animate({opacity:d},u,t.easing),d=1-d;n.animate({opacity:d},u,t.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&c.splice.apply(c,[1,0].concat(c.splice(p,l+1))),n.dequeue()},e.effects.effect.shake=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","height","width"],o=e.effects.setMode(n,t.mode||"effect"),r=t.direction||"left",h=t.distance||20,l=t.times||3,u=2*l+1,d=Math.round(t.duration/u),c="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},m={},g={},v=n.queue(),y=v.length;for(e.effects.save(n,a),n.show(),e.effects.createWrapper(n),f[c]=(p?"-=":"+=")+h,m[c]=(p?"+=":"-=")+2*h,g[c]=(p?"-=":"+=")+2*h,n.animate(f,d,t.easing),s=1;l>s;s++)n.animate(m,d,t.easing).animate(g,d,t.easing);n.animate(m,d,t.easing).animate(f,d/2,t.easing).queue(function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}),y>1&&v.splice.apply(v,[1,0].concat(v.splice(y,u+1))),n.dequeue()},e.effects.effect.slide=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","width","height"],o=e.effects.setMode(n,t.mode||"show"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h,d={};e.effects.save(n,a),n.show(),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,u?isNaN(s)?"-"+s:-s:s),d[l]=(r?u?"+=":"-=":u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.transfer=function(t,i){var s=e(this),n=e(t.to),a="fixed"===n.css("position"),o=e("body"),r=a?o.scrollTop():0,h=a?o.scrollLeft():0,l=n.offset(),u={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},d=s.offset(),c=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:d.top-r,left:d.left-h,height:s.innerHeight(),width:s.innerWidth(),position:a?"fixed":"absolute"}).animate(u,t.duration,t.easing,function(){c.remove(),i()})},e.widget("ui.progressbar",{version:"1.11.0",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return void 0===e?this.options.value:(this.options.value=this._constrainedValue(e),this._refreshValue(),void 0)},_constrainedValue:function(e){return void 0===e&&(e=this.options.value),this.indeterminate=e===!1,"number"!=typeof e&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){"max"===e&&(t=Math.max(this.min,t)),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),e.widget("ui.selectable",e.ui.mouse,{version:"1.11.0",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.selectmenu",{version:"1.11.0",defaultElement:"<select>",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var t=this,i=this.element.attr("tabindex");this.label=e("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(e){this.button.focus(),e.preventDefault()}}),this.element.hide(),this.button=e("<span>",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:i||this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),e("<span>",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=e("<span>",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._setOption("width",this.options.width),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){t.menuItems||t._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var t=this;this.menu=e("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=e("<div>",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(e,i){e.preventDefault(),t._select(i.item.data("ui-selectmenu-item"),e)},focus:function(e,i){var s=i.item.data("ui-selectmenu-item");null!=t.focusIndex&&s.index!==t.focusIndex&&(t._trigger("focus",e,{item:s}),t.isOpen||t._select(s,e)),t.focusIndex=s.index,t.button.attr("aria-activedescendant",t.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this._setOption("width",this.options.width)},_refreshMenu:function(){this.menu.empty();var e,t=this.element.find("option");t.length&&(this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),e=this._getSelectedItem(),this.menuInstance.focus(null,e),this._setAria(e.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(e){this.options.disabled||(this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",e))},_position:function(){this.menuWrap.position(e.extend({of:this.button},this.options.position))},close:function(e){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this._off(this.document),this._trigger("close",e))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(t,i){var s=this,n="";e.each(i,function(i,a){a.optgroup!==n&&(e("<li>",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(a.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:a.optgroup}).appendTo(t),n=a.optgroup),s._renderItemData(t,a)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-selectmenu-item",t)},_renderItem:function(t,i){var s=e("<li>");return i.disabled&&s.addClass("ui-state-disabled"),this._setText(s,i.label),s.appendTo(t)},_setText:function(e,t){t?e.text(t):e.html("&#160;")},_move:function(e,t){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex):(i=this.menuItems.eq(this.element[0].selectedIndex),n+=":not(.ui-state-disabled)"),s="first"===e||"last"===e?i["first"===e?"prevAll":"nextAll"](n).eq(-1):i[e+"All"](n).eq(0),s.length&&this.menuInstance.focus(t,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(e){this[this.isOpen?"close":"open"](e)},_documentClick:{mousedown:function(t){this.isOpen&&(e(t.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(t))}},_buttonEvents:{click:"_toggle",keydown:function(t){var i=!0;switch(t.keyCode){case e.ui.keyCode.TAB:case e.ui.keyCode.ESCAPE:this.close(t),i=!1;break;case e.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case e.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case e.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case e.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case e.ui.keyCode.LEFT:this._move("prev",t);break;case e.ui.keyCode.RIGHT:this._move("next",t);break;case e.ui.keyCode.HOME:case e.ui.keyCode.PAGE_UP:this._move("first",t);break;case e.ui.keyCode.END:case e.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),i=!1}i&&t.preventDefault()}},_selectFocusedItem:function(e){var t=this.menuItems.eq(this.focusIndex);t.hasClass("ui-state-disabled")||this._select(t.data("ui-selectmenu-item"),e)},_select:function(e,t){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=e.index,this._setText(this.buttonText,e.label),this._setAria(e),this._trigger("select",t,{item:e}),e.index!==i&&this._trigger("change",t,{item:e}),this.close(t)},_setAria:function(e){var t=this.menuItems.eq(e.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(e,t){"icons"===e&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(t.button),this._super(e,t),"appendTo"===e&&this.menuWrap.appendTo(this._appendTo()),"disabled"===e&&(this.menuInstance.option("disabled",t),this.button.toggleClass("ui-state-disabled",t).attr("aria-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),"width"===e&&(t||(t=this.element.outerWidth()),this.button.outerWidth(t))},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(t){var i=[];t.each(function(t,s){var n=e(s),a=n.parent("optgroup");i.push({element:n,index:t,value:n.attr("value"),label:n.text(),optgroup:a.attr("label")||"",disabled:a.prop("disabled")||n.prop("disabled")})}),this.items=i},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}}),e.widget("ui.slider",e.ui.mouse,{version:"1.11.0",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),a="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",o=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),t=n.length;i>t;t++)o.push(a);this.handles=n.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)})},_createRange:function(){var t=this.options,i="";t.range?(t.range===!0&&(t.values?t.values.length&&2!==t.values.length?t.values=[t.values[0],t.values[0]]:e.isArray(t.values)&&(t.values=t.values.slice(0)):t.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=e("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===t.range||"max"===t.range?" ui-slider-range-"+t.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var i,s,n,a,o,r,h,l,u=this,d=this.options;return d.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:t.pageX,y:t.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var i=Math.abs(s-u.values(t));(n>i||n===i&&(t===u._lastChangedValue||u.values(t)===d.min))&&(n=i,a=e(this),o=t)}),r=this._start(t,o),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,a.addClass("ui-state-active").focus(),h=a.offset(),l=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:t.pageX-h.left-a.width()/2,top:t.pageY-h.top-a.height()/2-(parseInt(a.css("borderTopWidth"),10)||0)-(parseInt(a.css("borderBottomWidth"),10)||0)+(parseInt(a.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},i=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,i),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,i,s,n,a;return"horizontal"===this.orientation?(t=this.elementSize.width,i=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,i=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/t,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),a=this._valueMin()+s*n,this._trimAlignValue(a)},_start:function(e,t){var i={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("start",e,i)},_slide:function(e,t,i){var s,n,a;this.options.values&&this.options.values.length?(s=this.values(t?0:1),2===this.options.values.length&&this.options.range===!0&&(0===t&&i>s||1===t&&s>i)&&(i=s),i!==this.values(t)&&(n=this.values(),n[t]=i,a=this._trigger("slide",e,{handle:this.handles[t],value:i,values:n}),s=this.values(t?0:1),a!==!1&&this.values(t,i))):i!==this.value()&&(a=this._trigger("slide",e,{handle:this.handles[t],value:i}),a!==!1&&this.value(i))},_stop:function(e,t){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("stop",e,i)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,i)}},value:function(e){return arguments.length?(this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(t,i){var s,n,a;if(arguments.length>1)return this.options.values[t]=this._trimAlignValue(i),this._refreshValue(),this._change(null,t),void 0;if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();for(s=this.options.values,n=arguments[0],a=0;s.length>a;a+=1)s[a]=this._trimAlignValue(n[a]),this._change(null,a);this._refreshValue()},_setOption:function(t,i){var s,n=0;switch("range"===t&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),e.isArray(this.options.values)&&(n=this.options.values.length),"disabled"===t&&this.element.toggleClass("ui-state-disabled",!!i),this._super(t,i),t){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e)},_values:function(e){var t,i,s;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(e){if(this._valueMin()>=e)return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,i=(e-this._valueMin())%t,s=e-i;return 2*Math.abs(i)>=t&&(s+=i>0?t:-t),parseFloat(s.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var t,i,s,n,a,o=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,u={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),u["horizontal"===h.orientation?"left":"bottom"]=i+"%",e(this).stop(1,1)[l?"animate":"css"](u,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-t+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-t+"%"},{queue:!1,duration:r.animate}))),t=i}):(s=this.value(),n=this._valueMin(),a=this._valueMax(),i=a!==n?100*((s-n)/(a-n)):0,u["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](u,r.animate),"min"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===o&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===o&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(t){var i,s,n,a,o=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(t.preventDefault(),!this._keySliding&&(this._keySliding=!0,e(t.target).addClass("ui-state-active"),i=this._start(t,o),i===!1))return}switch(a=this.options.step,s=n=this.options.values&&this.options.values.length?this.values(o):this.value(),t.keyCode){case e.ui.keyCode.HOME:n=this._valueMin();break;case e.ui.keyCode.END:n=this._valueMax();break;case e.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+a);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-a)}this._slide(t,o,n)},keyup:function(t){var i=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,i),this._change(t,i),e(t.target).removeClass("ui-state-active"))}}}),e.widget("ui.sortable",e.ui.mouse,{version:"1.11.0",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(e,t,i){return e>=t&&t+i>e},_isFloating:function(e){return/left|right/.test(e.css("float"))||/inline|table-cell/.test(e.css("display"))},_create:function(){var e=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===e.axis||this._isFloating(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),e.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(t),e(t.target).parents().each(function(){return e.data(this,a.widgetName+"-item")===a?(s=e(this),!1):void 0}),e.data(t.target,a.widgetName+"-item")===a&&(s=e(t.target)),s?!this.options.handle||i||(e(this.options.handle,s).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(t,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=e("<style>*{ cursor: "+o.cursor+" !important; }</style>").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",t,this._uiHash(this));
-return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-e(document).scrollTop()<o.scrollSensitivity?r=e(document).scrollTop(e(document).scrollTop()-o.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<o.scrollSensitivity&&(r=e(document).scrollTop(e(document).scrollTop()+o.scrollSpeed)),t.pageX-e(document).scrollLeft()<o.scrollSensitivity?r=e(document).scrollLeft(e(document).scrollLeft()-o.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<o.scrollSensitivity&&(r=e(document).scrollLeft(e(document).scrollLeft()+o.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!e.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!e.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,i){if(t){if(e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,e(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(t)})}else this._clear(t,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},e(i).each(function(){var i=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);i&&s.push((t.key||i[1]+"[]")+"="+(t.key&&t.expression?i[1]:i[2]))}),!s.length&&t.key&&s.push(t.key+"="),s.join("&")},toArray:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},i.each(function(){s.push(e(t.item||this).attr(t.attribute||"id")||"")}),s},_intersectsWith:function(e){var t=this.positionAbs.left,i=t+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=e.left,o=a+e.width,r=e.top,h=r+e.height,l=this.offset.click.top,u=this.offset.click.left,d="x"===this.options.axis||s+l>r&&h>s+l,c="y"===this.options.axis||t+u>a&&o>t+u,p=d&&c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?p:t+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(e){var t="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),s=t&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(e){var t=this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&t||"up"===s&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return 0!==e&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return 0!==e&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&t)for(s=l.length-1;s>=0;s--)for(a=e(l[s]),n=a.length-1;n>=0;n--)o=e.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([e.isFunction(o.options.items)?o.options.items.call(o.element):e(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return e(r)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var i=0;t.length>i;i++)if(t[i]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,d=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],c=this._connectWith();if(c&&this.ready)for(i=c.length-1;i>=0;i--)for(n=e(c[i]),s=n.length-1;s>=0;s--)a=e.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(d.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a));for(i=d.length-1;i>=0;i--)for(o=d[i][1],r=d[i][0],s=0,l=r.length;l>s;s++)h=e(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(t){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?e(this.options.toleranceElement,s.item):s.item,t||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var i,s=t.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=t.currentItem[0].nodeName.toLowerCase(),n=e("<"+s+">",t.document[0]).addClass(i||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?t.currentItem.children().each(function(){e("<td>&#160;</td>",t.document[0]).attr("colspan",e(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",t.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(e,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10)))}}),t.placeholder=e(s.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),s.placeholder.update(t,t.placeholder)},_contactContainers:function(t){var i,s,n,a,o,r,h,l,u,d,c=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!e.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(c&&e.contains(this.containers[i].element[0],c.element[0]))continue;c=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0);if(c)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=c.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",d=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)e.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,t[d]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(t[d]-h)&&(n=Math.abs(t[d]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return;a?this._rearrange(t,a,null,!0):this._rearrange(t,null,this.containers[p].element,!0),this._trigger("change",t,this._uiHash()),this.containers[p]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||e("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,e("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(e("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(t=e(n.containment)[0],i=e(n.containment).offset(),s="hidden"!==e(t).css("overflow"),this.containment=[i.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(t){var i,s,n=this.options,a=t.pageX,o=t.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(a=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(a=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(e,t,i,s){i?i[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(e,t){function i(e,t,i){return function(s){i._trigger(e,s,t._uiHash(t))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!t&&n.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||t||n.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(t||(n.push(function(e){this._trigger("remove",e,this._uiHash())}),n.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)t||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!t){for(this._trigger("beforeStop",e,this._uiHash()),s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!1}if(t||this._trigger("beforeStop",e,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!t){for(s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var i=t||this;return{helper:i.helper,placeholder:i.placeholder||e([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:t?t.element:null}}}),e.widget("ui.spinner",{version:"1.11.0",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},i=this.element;return e.each(["min","max","step"],function(e,s){var n=i.attr(s);void 0!==n&&n.length&&(t[s]=n)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e),void 0)},mousewheel:function(e,t){if(t){if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()}},"mousedown .ui-spinner-button":function(t){function i(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(t)!==!1&&this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){return e(t.currentTarget).hasClass("ui-state-active")?this._start(t)===!1?!1:(this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*e.height())&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var i=this.options,s=e.ui.keyCode;switch(t.keyCode){case s.UP:return this._repeat(null,1,t),!0;case s.DOWN:return this._repeat(null,-1,t),!0;case s.PAGE_UP:return this._repeat(null,i.page,t),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return this.spinning||this._trigger("start",e)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(e,t,i){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,i)},e),this._spin(t*this.options.step,i)},_spin:function(e,t){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+e*this._increment(this.counter)),this.spinning&&this._trigger("spin",t,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(t){var i=this.options.incremental;return i?e.isFunction(i)?i(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_adjustValue:function(e){var t,i,s=this.options;return t=null!==s.min?s.min:0,i=e-t,i=Math.round(i/s.step)*s.step,e=t+i,e=parseFloat(e.toFixed(this._precision())),null!==s.max&&e>s.max?s.max:null!==s.min&&s.min>e?s.min:e},_stop:function(e){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e))},_setOption:function(e,t){if("culture"===e||"numberFormat"===e){var i=this._parse(this.element.val());return this.options[e]=t,this.element.val(this._format(i)),void 0}("max"===e||"min"===e||"step"===e)&&"string"==typeof t&&(t=this._parse(t)),"icons"===e&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),"disabled"===e&&(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable"))},_setOptions:r(function(e){this._super(e)}),_parse:function(e){return"string"==typeof e&&""!==e&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),""===e||isNaN(e)?null:e},_format:function(e){return""===e?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var e=this.value();return null===e?!1:e===this._adjustValue(e)},_value:function(e,t){var i;""!==e&&(i=this._parse(e),null!==i&&(t||(i=this._adjustValue(i)),e=this._format(i))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:r(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:r(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:r(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){return arguments.length?(r(this._value).call(this,e),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),e.widget("ui.tabs",{version:"1.11.0",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var e=/#.*$/;return function(t){var i,s;t=t.cloneNode(!1),i=t.href.replace(e,""),s=location.href.replace(e,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return t.hash.length>1&&i===s}}(),_create:function(){var t=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),i.active=this._initialActive(),e.isArray(i.disabled)&&(i.disabled=e.unique(i.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):e(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var t=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===t&&(s&&this.tabs.each(function(i,n){return e(n).attr("aria-controls")===s?(t=i,!1):void 0}),null===t&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===t||-1===t)&&(t=this.tabs.length?0:!1)),t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),-1===t&&(t=i?!1:0)),!i&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var i=e(this.document[0].activeElement).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:s++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:n=!1,s--;break;case e.ui.keyCode.END:s=this.anchors.length-1;break;case e.ui.keyCode.HOME:s=0;break;case e.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case e.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}t.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),t.ctrlKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){return t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,i){function s(){return t>n&&(t=0),0>t&&(t=n),t}for(var n=this.tabs.length-1;-1!==e.inArray(s(),this.options.disabled);)t=i?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):"disabled"===e?(this._setupDisabled(t),void 0):(this._super(e,t),"collapsible"===e&&(this.element.toggleClass("ui-tabs-collapsible",t),t||this.options.active!==!1||this._activate(0)),"event"===e&&this._setupEvents(t),"heightStyle"===e&&this._setupHeightStyle(t),void 0)},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,i=this.tablist.children(":has(a[href])");t.disabled=e.map(i.filter(".ui-state-disabled"),function(e){return i.index(e)}),this._processTabs(),t.active!==!1&&this.anchors.length?this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=e()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]
-}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(i,s){var n,a,o,r=e(s).uniqueId().attr("id"),h=e(s).closest("li"),l=h.attr("aria-controls");t._isLocal(s)?(n=s.hash,o=n.substring(1),a=t.element.find(t._sanitizeSelector(n))):(o=h.attr("aria-controls")||e({}).uniqueId()[0].id,n="#"+o,a=t.element.find(n),a.length||(a=t._createPanel(o),a.insertAfter(t.panels[i-1]||t.tablist)),a.attr("aria-live","polite")),a.length&&(t.panels=t.panels.add(a)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":o,"aria-labelledby":r}),a.attr("aria-labelledby",r)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var i,s=0;i=this.tabs[s];s++)t===!0||-1!==e.inArray(s,t)?e(i).addClass("ui-state-disabled").attr("aria-disabled","true"):e(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var i={};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,s=this.element.parent();"fill"===t?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),s=t.css("position");"absolute"!==s&&"fixed"!==s&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,i-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,e(this).height("").height())}).height(i))},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n.closest("li"),o=a[0]===s[0],r=o&&i.collapsible,h=r?e():this._getPanelForTab(a),l=s.length?this._getPanelForTab(s):e(),u={oldTab:s,oldPanel:l,newTab:r?e():a,newPanel:h};t.preventDefault(),a.hasClass("ui-state-disabled")||a.hasClass("ui-tabs-loading")||this.running||o&&!i.collapsible||this._trigger("beforeActivate",t,u)===!1||(i.active=r?!1:this.tabs.index(a),this.active=o?e():a,this.xhr&&this.xhr.abort(),l.length||h.length||e.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(a),t),this._toggle(t,u))},_toggle:function(t,i){function s(){a.running=!1,a._trigger("activate",t,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),o.length&&a.options.show?a._show(o,a.options.show,s):(o.show(),s())}var a=this,o=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),o.length&&r.length?i.oldTab.attr("tabIndex",-1):o.length&&this.tabs.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),o.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var i,s=this._findActive(t);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),i=t.data("ui-tabs-aria-controls");i?t.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(t){var i=this.options.disabled;i!==!1&&(void 0===t?i=!1:(t=this._getIndex(t),i=e.isArray(i)?e.map(i,function(e){return e!==t?e:null}):e.map(this.tabs,function(e,i){return i!==t?i:null})),this._setupDisabled(i))},disable:function(t){var i=this.options.disabled;if(i!==!0){if(void 0===t)i=!0;else{if(t=this._getIndex(t),-1!==e.inArray(t,i))return;i=e.isArray(i)?e.merge([t],i).sort():[t]}this._setupDisabled(i)}},load:function(t,i){t=this._getIndex(t);var s=this,n=this.tabs.eq(t),a=n.find(".ui-tabs-anchor"),o=this._getPanelForTab(n),r={tab:n,panel:o};this._isLocal(a[0])||(this.xhr=e.ajax(this._ajaxSettings(a,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(n.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.success(function(e){setTimeout(function(){o.html(e),s._trigger("load",i,r)},1)}).complete(function(e,t){setTimeout(function(){"abort"===t&&s.panels.stop(!1,!0),n.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===s.xhr&&delete s.xhr},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href"),beforeSend:function(t,a){return n._trigger("beforeLoad",i,e.extend({jqXHR:t,ajaxSettings:a},s))}}},_getPanelForTab:function(t){var i=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),e.widget("ui.tooltip",{version:"1.11.0",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,i){var s=(t.attr("aria-describedby")||"").split(/\s+/);s.push(i),t.data("ui-tooltip-id",i).attr("aria-describedby",e.trim(s.join(" ")))},_removeDescribedBy:function(t){var i=t.data("ui-tooltip-id"),s=(t.attr("aria-describedby")||"").split(/\s+/),n=e.inArray(i,s);-1!==n&&s.splice(n,1),t.removeData("ui-tooltip-id"),s=e.trim(s.join(" ")),s?t.attr("aria-describedby",s):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,i){var s=this;return"disabled"===t?(this[i?"_disable":"_enable"](),this.options[t]=i,void 0):(this._super(t,i),"content"===t&&e.each(this.tooltips,function(e,t){s._updateContent(t)}),void 0)},_disable:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s[0],t.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var i=this,s=e(t?t.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&s.parents().each(function(){var t,s=e(this);s.data("ui-tooltip-open")&&(t=e.Event("blur"),t.target=t.currentTarget=this,i.close(t,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,t))},_updateContent:function(e,t){var i,s=this.options.content,n=this,a=t?t.type:null;return"string"==typeof s?this._open(t,e,s):(i=s.call(e[0],function(i){e.data("ui-tooltip-open")&&n._delay(function(){t&&(t.type=a),this._open(t,e,i)})}),i&&this._open(t,e,i),void 0)},_open:function(t,i,s){function n(e){l.of=e,a.is(":hidden")||a.position(l)}var a,o,r,h,l=e.extend({},this.options.position);if(s){if(a=this._find(i),a.length)return a.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(t&&"mouseover"===t.type?i.attr("title",""):i.removeAttr("title")),a=this._tooltip(i),this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),s.clone?(h=s.clone(),h.removeAttr("id").find("[id]").removeAttr("id")):h=s,e("<div>").html(h).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:n}),n(t)):a.position(e.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},e.fx.interval)),this._trigger("open",t,{tooltip:a}),o={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var s=e.Event(t);s.currentTarget=i[0],this.close(s,!0)}}},i[0]!==this.element[0]&&(o.remove=function(){this._removeTooltip(a)}),t&&"mouseover"!==t.type||(o.mouseleave="close"),t&&"focusin"!==t.type||(o.focusout="close"),this._on(!0,i,o)}},close:function(t){var i=this,s=e(t?t.currentTarget:this.element),n=this._find(s);this.closing||(clearInterval(this.delayedShow),s.data("ui-tooltip-title")&&!s.attr("title")&&s.attr("title",s.data("ui-tooltip-title")),this._removeDescribedBy(s),n.stop(!0),this._hide(n,this.options.hide,function(){i._removeTooltip(e(this))}),s.removeData("ui-tooltip-open"),this._off(s,"mouseleave focusout keyup"),s[0]!==this.element[0]&&this._off(s,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&e.each(this.parents,function(t,s){e(s.element).attr("title",s.title),delete i.parents[t]}),this.closing=!0,this._trigger("close",t,{tooltip:n}),this.closing=!1)},_tooltip:function(t){var i=e("<div>").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),s=i.uniqueId().attr("id");return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[s]=t,i},_find:function(t){var i=t.data("ui-tooltip-id");return i?e("#"+i):e()},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s[0],t.close(n,!0),e("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title")||s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}})});
\ No newline at end of file
+(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):(o.length&&(n=e.widget.extend.apply(null,[n].concat(o))),this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))})),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.width<t.element[0].scrollWidth,a="scroll"===s||"auto"===s&&t.height<t.element[0].scrollHeight;return{width:a?e.position.scrollbarWidth():0,height:n?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var i=e(t||window),s=e.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s||n?i.width():i.outerWidth(),height:s||n?i.height():i.outerHeight()}}},e.fn.position=function(n){if(!n||!n.of)return f.apply(this,arguments);n=e.extend({},n);var p,m,g,v,y,b,_=e(n.of),x=e.position.getWithinInfo(n.within),w=e.position.getScrollInfo(x),k=(n.collision||"flip").split(" "),T={};return b=s(_),_[0].preventDefault&&(n.at="left top"),m=b.width,g=b.height,v=b.offset,y=e.extend({},v),e.each(["my","at"],function(){var e,t,i=(n[this]||"").split(" ");1===i.length&&(i=l.test(i[0])?i.concat(["center"]):u.test(i[0])?["center"].concat(i):["center","center"]),i[0]=l.test(i[0])?i[0]:"center",i[1]=u.test(i[1])?i[1]:"center",e=d.exec(i[0]),t=d.exec(i[1]),T[this]=[e?e[0]:0,t?t[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===n.at[0]?y.left+=m:"center"===n.at[0]&&(y.left+=m/2),"bottom"===n.at[1]?y.top+=g:"center"===n.at[1]&&(y.top+=g/2),p=t(T.at,m,g),y.left+=p[0],y.top+=p[1],this.each(function(){var s,l,u=e(this),d=u.outerWidth(),c=u.outerHeight(),f=i(this,"marginLeft"),b=i(this,"marginTop"),D=d+f+i(this,"marginRight")+w.width,S=c+b+i(this,"marginBottom")+w.height,M=e.extend({},y),C=t(T.my,u.outerWidth(),u.outerHeight());"right"===n.my[0]?M.left-=d:"center"===n.my[0]&&(M.left-=d/2),"bottom"===n.my[1]?M.top-=c:"center"===n.my[1]&&(M.top-=c/2),M.left+=C[0],M.top+=C[1],a||(M.left=h(M.left),M.top=h(M.top)),s={marginLeft:f,marginTop:b},e.each(["left","top"],function(t,i){e.ui.position[k[t]]&&e.ui.position[k[t]][i](M,{targetWidth:m,targetHeight:g,elemWidth:d,elemHeight:c,collisionPosition:s,collisionWidth:D,collisionHeight:S,offset:[p[0]+C[0],p[1]+C[1]],my:n.my,at:n.at,within:x,elem:u})}),n.using&&(l=function(e){var t=v.left-M.left,i=t+m-d,s=v.top-M.top,a=s+g-c,h={target:{element:_,left:v.left,top:v.top,width:m,height:g},element:{element:u,left:M.left,top:M.top,width:d,height:c},horizontal:0>i?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.accordion",{version:"1.11.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels)))},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(e(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.css("box-sizing"),l=e.length&&(!t.length||e.index()<t.index()),u=this.options.animate||{},d=l&&u.down||u,c=function(){o._toggleComplete(i)};return"number"==typeof d&&(a=d),"string"==typeof d&&(n=d),n=n||d.easing||u.easing,a=a||d.duration||u.duration,t.length?e.length?(s=e.show().outerHeight(),t.animate(this.hideProps,{duration:a,easing:n,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(this.showProps,{duration:a,easing:n,complete:c,step:function(e,i){i.now=Math.round(e),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==o.options.heightStyle&&(i.now=Math.round(s-t.outerHeight()-r),r=0)}}),void 0):t.animate(this.hideProps,a,n,c):e.animate(this.showProps,a,n,c)},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.widget("ui.menu",{version:"1.11.4",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);
+i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,i)},_filterMenuItems:function(t){var i=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(e.trim(e(this).text()))})}}),e.widget("ui.autocomplete",{version:"1.11.4",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):void 0},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("<div>").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var c,p="ui-button ui-widget ui-state-default ui-corner-all",f="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",m=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},g=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.4",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,m),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,i=this.options,s="checkbox"===this.type||"radio"===this.type,n=s?"":"ui-state-active";null===i.label&&(i.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(p).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){i.disabled||this===c&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){i.disabled||e(this).removeClass(n)}).bind("click"+this.eventNamespace,function(e){i.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),s&&this.element.bind("change"+this.eventNamespace,function(){t.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return i.disabled?!1:void 0}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(i.disabled)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var s=t.element[0];g(s).not(s).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return i.disabled?!1:(e(this).addClass("ui-state-active"),c=this,t.document.one("mouseup",function(){c=null}),void 0)}).bind("mouseup"+this.eventNamespace,function(){return i.disabled?!1:(e(this).removeClass("ui-state-active"),void 0)}).bind("keydown"+this.eventNamespace,function(t){return i.disabled?!1:((t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active"),void 0)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",i.disabled),this._resetButton()},_determineButtonType:function(){var e,t,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(p+" ui-state-active "+f).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){return this._super(e,t),"disabled"===e?(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),t&&("checkbox"===this.type||"radio"===this.type?this.buttonElement.removeClass("ui-state-focus"):this.buttonElement.removeClass("ui-state-focus ui-state-active")),void 0):(this._resetButton(),void 0)},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),"radio"===this.type?g(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),void 0;var t=this.buttonElement.removeClass(f),i=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,a=[];s.primary||s.secondary?(this.options.text&&a.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(a.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(i)))):a.push("ui-button-text-only"),t.addClass(a.join(" "))}}),e.widget("ui.buttonset",{version:"1.11.4",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){"disabled"===e&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t="rtl"===this.element.css("direction"),i=this.element.find(this.options.items),s=i.filter(":ui-button");i.not(":ui-button").button(),s.button("refresh"),this.buttons=i.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}}),e.ui.button,e.extend(e.ui,{datepicker:{version:"1.11.4"}});var v;e.extend(n.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return r(this._defaults,e||{}),this},_attachDatepicker:function(t,i){var s,n,a;s=t.nodeName.toLowerCase(),n="div"===s||"span"===s,t.id||(this.uuid+=1,t.id="dp"+this.uuid),a=this._newInst(e(t),n),a.settings=e.extend({},i||{}),"input"===s?this._connectDatepicker(t,a):n&&this._inlineDatepicker(t,a)},_newInst:function(t,i){var s=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?a(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,i){var s=e(t);i.append=e([]),i.trigger=e([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),e.data(t,"datepicker",i),i.settings.disabled&&this._disableDatepicker(t))},_attachments:function(t,i){var s,n,a,o=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),o&&(i.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[r?"before":"after"](i.append)),t.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&t.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),a=this._get(i,"buttonImage"),i.trigger=e(this._get(i,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:a,alt:n,title:n}):e("<button type='button'></button>").addClass(this._triggerClass).html(a?e("<img/>").attr({src:a,alt:n,title:n}):n)),t[r?"before":"after"](i.trigger),i.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1}))},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,i,s,n,a=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){for(i=0,s=0,n=0;e.length>n;n++)e[n].length>i&&(i=e[n].length,s=n);return s},a.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),a.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-a.getDay())),e.input.attr("size",this._formatDate(e,a).length)}},_inlineDatepicker:function(t,i){var s=e(t);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),e.data(t,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(t),i.dpDiv.css("display","block"))},_dialogDatepicker:function(t,i,s,n,a){var o,h,l,u,d,c=this._dialogInst;return c||(this.uuid+=1,o="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+o+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),c=this._dialogInst=this._newInst(this._dialogInput,!1),c.settings={},e.data(this._dialogInput[0],"datepicker",c)),r(c.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(c,i):i,this._dialogInput.val(i),this._pos=a?a.length?a:[a.pageX,a.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+u,l/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),c.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],"datepicker",c),this},_destroyDatepicker:function(t){var i,s=e(t),n=e.data(t,"datepicker");s.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),e.removeData(t,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),v===n&&(v=null))},_enableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!1,a.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}))},_disableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!0,a.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t)},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;this._disabledInputs.length>t;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,i,s){var n,a,o,h,l=this._getInst(t);return 2===arguments.length&&"string"==typeof i?"defaults"===i?e.extend({},e.datepicker._defaults):l?"all"===i?e.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),a=this._getDateDatepicker(t,!0),o=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),r(l.settings,n),null!==o&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,o)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(e(t),l),this._autoSize(l),this._setDate(l,a),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(e,t,i){this._optionDatepicker(e,t,i)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var i=this._getInst(e);i&&(this._setDate(i,t),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(e,t){var i=this._getInst(e);return i&&!i.inline&&this._setDateFromField(i,t),i?this._getDate(i):null},_doKeyDown:function(t){var i,s,n,a=e.datepicker._getInst(t.target),o=!0,r=a.dpDiv.is(".ui-datepicker-rtl");if(a._keyEvent=!0,e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return n=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",a.dpDiv),n[0]&&e.datepicker._selectDay(t.target,a.selectedMonth,a.selectedYear,n[0]),i=e.datepicker._get(a,"onSelect"),i?(s=e.datepicker._formatDate(a),i.apply(a.input?a.input[0]:null,[s,a])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else 36===t.keyCode&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var i,s,n=e.datepicker._getInst(t.target);
+return e.datepicker._get(n,"constrainInput")?(i=e.datepicker._possibleChars(e.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(t){var i,s=e.datepicker._getInst(t.target);if(s.input.val()!==s.lastVal)try{i=e.datepicker.parseDate(e.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,e.datepicker._getFormatConfig(s)),i&&(e.datepicker._setDateFromField(s),e.datepicker._updateAlternate(s),e.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(t){if(t=t.target||t,"input"!==t.nodeName.toLowerCase()&&(t=e("input",t.parentNode)[0]),!e.datepicker._isDisabledDatepicker(t)&&e.datepicker._lastInput!==t){var i,n,a,o,h,l,u;i=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==i&&(e.datepicker._curInst.dpDiv.stop(!0,!0),i&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),n=e.datepicker._get(i,"beforeShow"),a=n?n.apply(t,[t,i]):{},a!==!1&&(r(i.settings,a),i.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(i),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),o=!1,e(t).parents().each(function(){return o|="fixed"===e(this).css("position"),!o}),h={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(i),h=e.datepicker._checkOffset(i,h,o),i.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":o?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),i.inline||(l=e.datepicker._get(i,"showAnim"),u=e.datepicker._get(i,"duration"),i.dpDiv.css("z-index",s(e(t))+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[l]?i.dpDiv.show(l,e.datepicker._get(i,"showOptions"),u):i.dpDiv[l||"show"](l?u:null),e.datepicker._shouldFocusInput(i)&&i.input.focus(),e.datepicker._curInst=i))}},_updateDatepicker:function(t){this.maxRows=4,v=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t);var i,s=this._getNumberOfMonths(t),n=s[1],a=17,r=t.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&t.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),t.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&e.datepicker._shouldFocusInput(t)&&t.input.focus(),t.yearshtml&&(i=t.yearshtml,setTimeout(function(){i===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),i=t.yearshtml=null},0))},_shouldFocusInput:function(e){return e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&!e.input.is(":focus")},_checkOffset:function(t,i,s){var n=t.dpDiv.outerWidth(),a=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,r=t.input?t.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:e(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:e(document).scrollTop());return i.left-=this._get(t,"isRTL")?n-o:0,i.left-=s&&i.left===t.input.offset().left?e(document).scrollLeft():0,i.top-=s&&i.top===t.input.offset().top+r?e(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+a>l&&l>a?Math.abs(a+r):0),i},_findPos:function(t){for(var i,s=this._getInst(t),n=this._get(s,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||e.expr.filters.hidden(t));)t=t[n?"previousSibling":"nextSibling"];return i=e(t).offset(),[i.left,i.top]},_hideDatepicker:function(t){var i,s,n,a,o=this._curInst;!o||t&&o!==e.data(t,"datepicker")||this._datepickerShowing&&(i=this._get(o,"showAnim"),s=this._get(o,"duration"),n=function(){e.datepicker._tidyDialog(o)},e.effects&&(e.effects.effect[i]||e.effects[i])?o.dpDiv.hide(i,e.datepicker._get(o,"showOptions"),s,n):o.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,a=this._get(o,"onClose"),a&&a.apply(o.input?o.input[0]:null,[o.input?o.input.val():"",o]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(e.datepicker._curInst){var i=e(t.target),s=e.datepicker._getInst(i[0]);(i[0].id!==e.datepicker._mainDivId&&0===i.parents("#"+e.datepicker._mainDivId).length&&!i.hasClass(e.datepicker.markerClassName)&&!i.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||i.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==s)&&e.datepicker._hideDatepicker()}},_adjustDate:function(t,i,s){var n=e(t),a=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(a,i+("M"===s?this._get(a,"showCurrentAtPos"):0),s),this._updateDatepicker(a))},_gotoToday:function(t){var i,s=e(t),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(t,i,s){var n=e(t),a=this._getInst(n[0]);a["selected"+("M"===s?"Month":"Year")]=a["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(a),this._adjustDate(n)},_selectDay:function(t,i,s,n){var a,o=e(t);e(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0])||(a=this._getInst(o[0]),a.selectedDay=a.currentDay=e("a",n).html(),a.selectedMonth=a.currentMonth=i,a.selectedYear=a.currentYear=s,this._selectDate(t,this._formatDate(a,a.currentDay,a.currentMonth,a.currentYear)))},_clearDate:function(t){var i=e(t);this._selectDate(i,"")},_selectDate:function(t,i){var s,n=e(t),a=this._getInst(n[0]);i=null!=i?i:this._formatDate(a),a.input&&a.input.val(i),this._updateAlternate(a),s=this._get(a,"onSelect"),s?s.apply(a.input?a.input[0]:null,[i,a]):a.input&&a.input.trigger("change"),a.inline?this._updateDatepicker(a):(this._hideDatepicker(),this._lastInput=a.input[0],"object"!=typeof a.input[0]&&a.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var i,s,n,a=this._get(t,"altField");a&&(i=this._get(t,"altFormat")||this._get(t,"dateFormat"),s=this._getDate(t),n=this.formatDate(i,s,this._getFormatConfig(t)),e(a).each(function(){e(this).val(n)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&6>t,""]},iso8601Week:function(e){var t,i=new Date(e.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),t=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((t-i)/864e5)/7)+1},parseDate:function(t,i,s){if(null==t||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,a,o,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),d=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,c=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,m=-1,g=-1,v=-1,y=-1,b=!1,_=function(e){var i=t.length>n+1&&t.charAt(n+1)===e;return i&&n++,i},x=function(e){var t=_(e),s="@"===e?14:"!"===e?20:"y"===e&&t?4:"o"===e?3:2,n="y"===e?s:1,a=RegExp("^\\d{"+n+","+s+"}"),o=i.substring(h).match(a);if(!o)throw"Missing number at position "+h;return h+=o[0].length,parseInt(o[0],10)},w=function(t,s,n){var a=-1,o=e.map(_(t)?n:s,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});if(e.each(o,function(e,t){var s=t[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(a=t[0],h+=s.length,!1):void 0}),-1!==a)return a+1;throw"Unknown name at position "+h},k=function(){if(i.charAt(h)!==t.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;t.length>n;n++)if(b)"'"!==t.charAt(n)||_("'")?k():b=!1;else switch(t.charAt(n)){case"d":v=x("d");break;case"D":w("D",d,c);break;case"o":y=x("o");break;case"m":g=x("m");break;case"M":g=w("M",p,f);break;case"y":m=x("y");break;case"@":r=new Date(x("@")),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"!":r=new Date((x("!")-this._ticksTo1970)/1e4),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"'":_("'")?k():b=!0;break;default:k()}if(i.length>h&&(o=i.substr(h),!/^\s+/.test(o)))throw"Extra/unparsed characters found in date: "+o;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),y>-1)for(g=1,v=y;;){if(a=this._getDaysInMonth(m,g-1),a>=v)break;g++,v-=a}if(r=this._daylightSavingAdjust(new Date(m,g-1,v)),r.getFullYear()!==m||r.getMonth()+1!==g||r.getDate()!==v)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(e,t,i){if(!t)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,a=(i?i.dayNames:null)||this._defaults.dayNames,o=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(t){var i=e.length>s+1&&e.charAt(s+1)===t;return i&&s++,i},l=function(e,t,i){var s=""+t;if(h(e))for(;i>s.length;)s="0"+s;return s},u=function(e,t,i,s){return h(e)?s[t]:i[t]},d="",c=!1;if(t)for(s=0;e.length>s;s++)if(c)"'"!==e.charAt(s)||h("'")?d+=e.charAt(s):c=!1;else switch(e.charAt(s)){case"d":d+=l("d",t.getDate(),2);break;case"D":d+=u("D",t.getDay(),n,a);break;case"o":d+=l("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":d+=l("m",t.getMonth()+1,2);break;case"M":d+=u("M",t.getMonth(),o,r);break;case"y":d+=h("y")?t.getFullYear():(10>t.getYear()%100?"0":"")+t.getYear()%100;break;case"@":d+=t.getTime();break;case"!":d+=1e4*t.getTime()+this._ticksTo1970;break;case"'":h("'")?d+="'":c=!0;break;default:d+=e.charAt(s)}return d},_possibleChars:function(e){var t,i="",s=!1,n=function(i){var s=e.length>t+1&&e.charAt(t+1)===i;return s&&t++,s};for(t=0;e.length>t;t++)if(s)"'"!==e.charAt(t)||n("'")?i+=e.charAt(t):s=!1;else switch(e.charAt(t)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=e.charAt(t)}return i},_get:function(e,t){return void 0!==e.settings[t]?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()!==e.lastVal){var i=this._get(e,"dateFormat"),s=e.lastVal=e.input?e.input.val():null,n=this._getDefaultDate(e),a=n,o=this._getFormatConfig(e);try{a=this.parseDate(i,s,o)||n}catch(r){s=t?"":s}e.selectedDay=a.getDate(),e.drawMonth=e.selectedMonth=a.getMonth(),e.drawYear=e.selectedYear=a.getFullYear(),e.currentDay=s?a.getDate():0,e.currentMonth=s?a.getMonth():0,e.currentYear=s?a.getFullYear():0,this._adjustInstDate(e)}},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,i,s){var n=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},a=function(i){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),i,e.datepicker._getFormatConfig(t))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,a=n.getFullYear(),o=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":o+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o));break;case"y":case"Y":a+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o))}l=h.exec(i)}return new Date(a,o,r)},o=null==i||""===i?s:"string"==typeof i?a(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return o=o&&"Invalid Date"==""+o?s:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,i){var s=!t,n=e.selectedMonth,a=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),n===e.selectedMonth&&a===e.selectedYear||i||this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(s?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&""===e.input.val()?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var i=this._get(t,"stepMonths"),s="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){e.datepicker._adjustDate(s,-i,"M")},next:function(){e.datepicker._adjustDate(s,+i,"M")},hide:function(){e.datepicker._hideDatepicker()},today:function(){e.datepicker._gotoToday(s)},selectDay:function(){return e.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return e.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return e.datepicker._selectMonthYear(s,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,i,s,n,a,o,r,h,l,u,d,c,p,f,m,g,v,y,b,_,x,w,k,T,D,S,M,C,N,A,P,I,H,z,F,E,O,j,W,L=new Date,R=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(e,"isRTL"),B=this._get(e,"showButtonPanel"),J=this._get(e,"hideIfNoPrevNext"),q=this._get(e,"navigationAsDateFormat"),K=this._getNumberOfMonths(e),V=this._get(e,"showCurrentAtPos"),U=this._get(e,"stepMonths"),Q=1!==K[0]||1!==K[1],G=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),X=this._getMinMaxDate(e,"min"),$=this._getMinMaxDate(e,"max"),Z=e.drawMonth-V,et=e.drawYear;if(0>Z&&(Z+=12,et--),$)for(t=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-K[0]*K[1]+1,$.getDate())),t=X&&X>t?X:t;this._daylightSavingAdjust(new Date(et,Z,1))>t;)Z--,0>Z&&(Z=11,et--);for(e.drawMonth=Z,e.drawYear=et,i=this._get(e,"prevText"),i=q?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z-U,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":J?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(e,"nextText"),n=q?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z+U,1)),this._getFormatConfig(e)):n,a=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":J?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",o=this._get(e,"currentText"),r=this._get(e,"gotoCurrent")&&e.currentDay?G:R,o=q?this.formatDate(o,r,this._getFormatConfig(e)):o,h=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(e,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(Y?"":h)+"</div>":"",u=parseInt(this._get(e,"firstDay"),10),u=isNaN(u)?0:u,d=this._get(e,"showWeek"),c=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),f=this._get(e,"monthNames"),m=this._get(e,"monthNamesShort"),g=this._get(e,"beforeShowDay"),v=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),_="",w=0;K[0]>w;w++){for(k="",this.maxRows=4,T=0;K[1]>T;T++){if(D=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),S=" ui-corner-all",M="",Q){if(M+="<div class='ui-datepicker-group",K[1]>1)switch(T){case 0:M+=" ui-datepicker-group-first",S=" ui-corner-"+(Y?"right":"left");break;case K[1]-1:M+=" ui-datepicker-group-last",S=" ui-corner-"+(Y?"left":"right");break;default:M+=" ui-datepicker-group-middle",S=""}M+="'>"}for(M+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+S+"'>"+(/all|left/.test(S)&&0===w?Y?a:s:"")+(/all|right/.test(S)&&0===w?Y?s:a:"")+this._generateMonthYearHeader(e,Z,et,X,$,w>0||T>0,f,m)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",C=d?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"",x=0;7>x;x++)N=(x+u)%7,C+="<th scope='col'"+((x+u+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+c[N]+"'>"+p[N]+"</span></th>";for(M+=C+"</tr></thead><tbody>",A=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,A)),P=(this._getFirstDayOfMonth(et,Z)-u+7)%7,I=Math.ceil((P+A)/7),H=Q?this.maxRows>I?this.maxRows:I:I,this.maxRows=H,z=this._daylightSavingAdjust(new Date(et,Z,1-P)),F=0;H>F;F++){for(M+="<tr>",E=d?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(z)+"</td>":"",x=0;7>x;x++)O=g?g.apply(e.input?e.input[0]:null,[z]):[!0,""],j=z.getMonth()!==Z,W=j&&!y||!O[0]||X&&X>z||$&&z>$,E+="<td class='"+((x+u+6)%7>=5?" ui-datepicker-week-end":"")+(j?" ui-datepicker-other-month":"")+(z.getTime()===D.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===z.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(W?" "+this._unselectableClass+" ui-state-disabled":"")+(j&&!v?"":" "+O[1]+(z.getTime()===G.getTime()?" "+this._currentClass:"")+(z.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+(j&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(W?"":" data-handler='selectDay' data-event='click' data-month='"+z.getMonth()+"' data-year='"+z.getFullYear()+"'")+">"+(j&&!v?"&#xa0;":W?"<span class='ui-state-default'>"+z.getDate()+"</span>":"<a class='ui-state-default"+(z.getTime()===R.getTime()?" ui-state-highlight":"")+(z.getTime()===G.getTime()?" ui-state-active":"")+(j?" ui-priority-secondary":"")+"' href='#'>"+z.getDate()+"</a>")+"</td>",z.setDate(z.getDate()+1),z=this._daylightSavingAdjust(z);M+=E+"</tr>"}Z++,Z>11&&(Z=0,et++),M+="</tbody></table>"+(Q?"</div>"+(K[0]>0&&T===K[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=M}_+=k}return _+=l,e._keyEvent=!1,_},_generateMonthYearHeader:function(e,t,i,s,n,a,o,r){var h,l,u,d,c,p,f,m,g=this._get(e,"changeMonth"),v=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",_="";if(a||!g)_+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,_+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",u=0;12>u;u++)(!h||u>=s.getMonth())&&(!l||n.getMonth()>=u)&&(_+="<option value='"+u+"'"+(u===t?" selected='selected'":"")+">"+r[u]+"</option>");_+="</select>"}if(y||(b+=_+(!a&&g&&v?"":"&#xa0;")),!e.yearshtml)if(e.yearshtml="",a||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(d=this._get(e,"yearRange").split(":"),c=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?i+parseInt(e.substring(1),10):e.match(/[+\-].*/)?c+parseInt(e,10):parseInt(e,10);return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=n?Math.min(m,n.getFullYear()):m,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";m>=f;f++)e.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!a&&g&&v?"":"&#xa0;")+_),b+="</div>"},_adjustInstDate:function(e,t,i){var s=e.drawYear+("Y"===i?t:0),n=e.drawMonth+("M"===i?t:0),a=Math.min(e.selectedDay,this._getDaysInMonth(s,n))+("D"===i?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(s,n,a)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(e)},_restrictMinMax:function(e,t){var i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),n=i&&i>t?i:t;return s&&n>s?s:n},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return new Date(e,t,1).getDay()},_canAdjustMonth:function(e,t,i,s){var n=this._getNumberOfMonths(e),a=this._daylightSavingAdjust(new Date(i,s+(0>t?t:n[0]*n[1]),1));return 0>t&&a.setDate(this._getDaysInMonth(a.getFullYear(),a.getMonth())),this._isInRange(e,a)},_isInRange:function(e,t){var i,s,n=this._getMinMaxDate(e,"min"),a=this._getMinMaxDate(e,"max"),o=null,r=null,h=this._get(e,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),o=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(o+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||t.getTime()>=n.getTime())&&(!a||t.getTime()<=a.getTime())&&(!o||t.getFullYear()>=o)&&(!r||r>=t.getFullYear())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t="string"!=typeof t?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,i,s){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var n=t?"object"==typeof t?t:this._daylightSavingAdjust(new Date(s,i,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),n,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),0===e("#"+e.datepicker._mainDivId).length&&e("body").append(e.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof t||"isDisabled"!==t&&"getDate"!==t&&"widget"!==t?"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof t?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(i)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i))},e.datepicker=new n,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.4",e.datepicker,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.options;return this._blurActiveElement(t),this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("<div>").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var i=this.document[0];if(this.handleElement.is(t.target))try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(s){}},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===e(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper),n=s?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)
+},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=e.extend({},i,{item:s.element});s.sortables=[],e(s.options.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",t,n))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,e.each(s.sortables,function(){var e=this;e.isOver?(e.isOver=0,s.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,n))})},drag:function(t,i,s){e.each(s.sortables,function(){var n=!1,a=this;a.positionAbs=s.positionAbs,a.helperProportions=s.helperProportions,a.offset.click=s.offset.click,a._intersectsWith(a.containerCache)&&(n=!0,e.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==a&&this._intersectsWith(this.containerCache)&&e.contains(a.element[0],this.element[0])&&(n=!1),n})),n?(a.isOver||(a.isOver=1,s._parent=i.helper.parent(),a.currentItem=i.helper.appendTo(a.element).data("ui-sortable-item",!0),a.options._helper=a.options.helper,a.options.helper=function(){return i.helper[0]},t.target=a.currentItem[0],a._mouseCapture(t,!0),a._mouseStart(t,!0,!0),a.offset.click.top=s.offset.click.top,a.offset.click.left=s.offset.click.left,a.offset.parent.left-=s.offset.parent.left-a.offset.parent.left,a.offset.parent.top-=s.offset.parent.top-a.offset.parent.top,s._trigger("toSortable",t),s.dropped=a.element,e.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,a.fromOutside=s),a.currentItem&&(a._mouseDrag(t),i.position=a.position)):a.isOver&&(a.isOver=0,a.cancelHelperRemoval=!0,a.options._revert=a.options.revert,a.options.revert=!1,a._trigger("out",t,a._uiHash(a)),a._mouseStop(t,!0),a.options.revert=a.options._revert,a.options.helper=a.options._helper,a.placeholder&&a.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(t),i.position=s._generatePosition(t,!0),s._trigger("fromSortable",t),s.dropped=!1,e.each(s.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.scrollParentNotHidden[0],r=s.document[0];o!==r&&"HTML"!==o.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+o.offsetHeight-t.pageY<n.scrollSensitivity?o.scrollTop=a=o.scrollTop+n.scrollSpeed:t.pageY-s.overflowOffset.top<n.scrollSensitivity&&(o.scrollTop=a=o.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+o.offsetWidth-t.pageX<n.scrollSensitivity?o.scrollLeft=a=o.scrollLeft+n.scrollSpeed:t.pageX-s.overflowOffset.left<n.scrollSensitivity&&(o.scrollLeft=a=o.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(t.pageY-e(r).scrollTop()<n.scrollSensitivity?a=e(r).scrollTop(e(r).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(r).scrollTop())<n.scrollSensitivity&&(a=e(r).scrollTop(e(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(t.pageX-e(r).scrollLeft()<n.scrollSensitivity?a=e(r).scrollLeft(e(r).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(r).scrollLeft())<n.scrollSensitivity&&(a=e(r).scrollLeft(e(r).scrollLeft()+n.scrollSpeed)))),a!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(s,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,i,s){var n=s.options;s.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var t=e(this),i=t.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:i.top,left:i.left})})},drag:function(t,i,s){var n,a,o,r,h,l,u,d,c,p,f=s.options,m=f.snapTolerance,g=i.offset.left,v=g+s.helperProportions.width,y=i.offset.top,b=y+s.helperProportions.height;for(c=s.snapElements.length-1;c>=0;c--)h=s.snapElements[c].left-s.margins.left,l=h+s.snapElements[c].width,u=s.snapElements[c].top-s.margins.top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>b||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-b),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-b),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=e(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("<div class='ui-resizable-handle "+a+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=e(this.handles[i]),this._on(this.handles[i],{mousedown:o._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s,n=this.originalMousePosition,a=this.axis,o=t.pageX-n.left||0,r=t.pageY-n.top||0,h=this._change[a];return this._updatePrevProperties(),h?(i=h.apply(this,[t,o,r]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidth<e.width,n=this._isNumber(e.height)&&t.maxHeight&&t.maxHeight<e.height,a=this._isNumber(e.width)&&t.minWidth&&t.minWidth>e.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_getPaddingPlusBorderDimensions:function(e){for(var t=0,i=[],s=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],n=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];4>t;t++)i[t]=parseInt(s[t],10)||0,i[t]+=parseInt(n[t],10)||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e,t=0,i=this.helper||this.element;this._proportionallyResizeElements.length>t;t++)e=this._proportionallyResizeElements[t],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(e)),e.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t){var i,s,n,a,o=e(this).resizable("instance"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,d={top:0,left:0},c=o.containerElement,p=!0;c[0]!==document&&/static/.test(c.css("position"))&&(d=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-d.left),u&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?h.top:0),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),i=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-d.left:o.offset.left-h.left)),s=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-d.top:o.offset.top-h.top)),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options;e(i.alsoResize).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0};e(n.alsoResize).each(function(){var t=e(this),s=e(this).data("ui-resizable-alsoresize"),n={},a=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(a,function(e,t){var i=(s[t]||0)+(r[t]||0);i&&i>=0&&(n[t]=i||null)}),t.css(n)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,i=e(this).resizable("instance"),s=i.options,n=i.size,a=i.originalSize,o=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,u=h[1]||1,d=Math.round((n.width-a.width)/l)*l,c=Math.round((n.height-a.height)/u)*u,p=a.width+d,f=a.height+c,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,v=s.minWidth&&s.minWidth>p,y=s.minHeight&&s.minHeight>f;s.grid=h,v&&(p+=l),y&&(f+=u),m&&(p-=l),g&&(f-=u),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=o.top-c):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=o.left-d):((0>=f-u||0>=p-l)&&(t=i._getPaddingPlusBorderDimensions(this)),f-u>0?(i.size.height=f,i.position.top=o.top-c):(f=u-t.height,i.size.height=f,i.position.top=o.top+a.height-f),p-l>0?(i.size.width=p,i.position.left=o.left-d):(p=l-t.width,i.size.width=p,i.position.left=o.left+a.width-p))}}),e.ui.resizable,e.widget("ui.dialog",{version:"1.11.4",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var i=e(this).css(t).offset().top;0>i&&e(this).css("top",t.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",t)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&e(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",t)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),a=Math.max.apply(null,n);return a>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",a+1),s=!0),s&&!i&&this._trigger("focus",t),s},open:function(){var t=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var e=this._focusedElement;e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function i(){var t=this.document[0].activeElement,i=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);i||this._focusTabbable()}t.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE)return t.preventDefault(),this.close(t),void 0;
+if(t.keyCode===e.ui.keyCode.TAB&&!t.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");t.target!==n[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==s[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){n.focus()}),t.preventDefault()):(this._delay(function(){s.focus()}),t.preventDefault())}},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),e.isEmptyObject(i)||e.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),void 0):(e.each(i,function(i,s){var n,a;s=e.isFunction(s)?{click:s,text:i}:s,s=e.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(t.element[0],arguments)},a={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,e("<button></button>",s).button(a).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function t(e){return{position:e.position,offset:e.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){e(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,t(n))},drag:function(e,s){i._trigger("drag",e,t(s))},stop:function(n,a){var o=a.offset.left-i.document.scrollLeft(),r=a.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(r>=0?"+":"")+r,of:i.window},e(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,t(a))}})},_makeResizable:function(){function t(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var i=this,s=this.options,n=s.resizable,a=this.uiDialog.css("position"),o="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:o,start:function(s,n){e(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,t(n))},resize:function(e,s){i._trigger("resize",e,t(s))},stop:function(n,a){var o=i.uiDialog.offset(),r=o.left-i.document.scrollLeft(),h=o.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},e(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,t(a))}}).css("position",a)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=e(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),i=e.inArray(this,t);-1!==i&&t.splice(i,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return"auto"===e.height?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};e.each(t,function(e,t){i._setOption(e,t),e in i.sizeRelatedOptions&&(s=!0),e in i.resizableRelatedOptions&&(n[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,t){var i,s,n=this.uiDialog;"dialogClass"===e&&n.removeClass(this.options.dialogClass).addClass(t),"disabled"!==e&&(this._super(e,t),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:""+t}),"draggable"===e&&(i=n.is(":data(ui-draggable)"),i&&!t&&n.draggable("destroy"),!i&&t&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(s=n.is(":data(ui-resizable)"),s&&!t&&n.resizable("destroy"),s&&"string"==typeof t&&n.resizable("option","handles",t),s||t===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var e,t,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),e=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),t=Math.max(0,s.minHeight-e),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-e):"none","auto"===s.height?this.element.css({minHeight:t,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){t||this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),e.widget("ui.droppable",{version:"1.11.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=e(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(i,{offset:i.element.offset()}),i.options.tolerance,t)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s,n){if(!i.offset)return!1;var a=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,r=a+t.helperProportions.width,h=o+t.helperProportions.height,l=i.offset.left,u=i.offset.top,d=l+i.proportions().width,c=u+i.proportions().height;switch(s){case"fit":return a>=l&&d>=r&&o>=u&&c>=h;case"intersect":return a+t.helperProportions.width/2>l&&d>r-t.helperProportions.width/2&&o+t.helperProportions.height/2>u&&c>h-t.helperProportions.height/2;case"pointer":return e(n.pageY,u,i.proportions().height)&&e(n.pageX,l,i.proportions().width);case"touch":return(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c)&&(a>=l&&d>=a||r>=l&&d>=r||l>a&&r>d);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance,i),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable;var y="ui-effects-",b=e;e.effects={effect:{}},function(e,t){function i(e,t,i){var s=d[t.type]||{};return null==e?i||!t.def?null:t.def:(e=s.floor?~~e:parseFloat(e),isNaN(e)?t.def:s.mod?(e+s.mod)%s.mod:0>e?0:e>s.max?s.max:e)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(e,a){var o,r=a.re.exec(i),h=r&&a.parse(r),l=a.space||"rgba";return h?(o=s[l](h),s[u[l].cache]=o[u[l].cache],n=s._rgba=o._rgba,!1):t}),n.length?("0,0,0,0"===n.join()&&e.extend(n,a.transparent),s):a[i]}function n(e,t,i){return i=(i+1)%1,1>6*i?e+6*(t-e)*i:1>2*i?t:2>3*i?e+6*(t-e)*(2/3-i):e}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[2.55*e[1],2.55*e[2],2.55*e[3],e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],l=e.Color=function(t,i,s,n){return new e.Color.fn.parse(t,i,s,n)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},d={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},c=l.support={},p=e("<p>")[0],f=e.each;p.style.cssText="background-color:rgba(1,1,1,.5)",c.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),l.fn=e.extend(l.prototype,{parse:function(n,o,r,h){if(n===t)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=e(n).css(o),o=t);var d=this,c=e.type(n),p=this._rgba=[];return o!==t&&(n=[n,o,r,h],c="array"),"string"===c?this.parse(s(n)||a._default):"array"===c?(f(u.rgba.props,function(e,t){p[t.idx]=i(n[t.idx],t)}),this):"object"===c?(n instanceof l?f(u,function(e,t){n[t.cache]&&(d[t.cache]=n[t.cache].slice())}):f(u,function(t,s){var a=s.cache;f(s.props,function(e,t){if(!d[a]&&s.to){if("alpha"===e||null==n[e])return;d[a]=s.to(d._rgba)}d[a][t.idx]=i(n[e],t,!0)}),d[a]&&0>e.inArray(null,d[a].slice(0,3))&&(d[a][3]=1,s.from&&(d._rgba=s.from(d[a])))}),this):t},is:function(e){var i=l(e),s=!0,n=this;return f(u,function(e,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(e,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:t})),s}),s},_space:function(){var e=[],t=this;return f(u,function(i,s){t[s.cache]&&e.push(i)}),e.pop()},transition:function(e,t){var s=l(e),n=s._space(),a=u[n],o=0===this.alpha()?l("transparent"):this,r=o[a.cache]||a.to(o._rgba),h=r.slice();return s=s[a.cache],f(a.props,function(e,n){var a=n.idx,o=r[a],l=s[a],u=d[n.type]||{};null!==l&&(null===o?h[a]=l:(u.mod&&(l-o>u.mod/2?o+=u.mod:o-l>u.mod/2&&(o-=u.mod)),h[a]=i((l-o)*t+o,n)))}),this[n](h)},blend:function(t){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(t)._rgba;return l(e.map(i,function(e,t){return(1-s)*n[t]+s*e}))},toRgbaString:function(){var t="rgba(",i=e.map(this._rgba,function(e,t){return null==e?t>2?1:0:e});return 1===i[3]&&(i.pop(),t="rgb("),t+i.join()+")"},toHslaString:function(){var t="hsla(",i=e.map(this.hsla(),function(e,t){return null==e&&(e=t>2?1:0),t&&3>t&&(e=Math.round(100*e)+"%"),e});return 1===i[3]&&(i.pop(),t="hsl("),t+i.join()+")"},toHexString:function(t){var i=this._rgba.slice(),s=i.pop();return t&&i.push(~~(255*s)),"#"+e.map(i,function(e){return e=(e||0).toString(16),1===e.length?"0"+e:e}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,u.hsla.to=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t,i,s=e[0]/255,n=e[1]/255,a=e[2]/255,o=e[3],r=Math.max(s,n,a),h=Math.min(s,n,a),l=r-h,u=r+h,d=.5*u;return t=h===r?0:s===r?60*(n-a)/l+360:n===r?60*(a-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=d?l/u:l/(2-u),[Math.round(t)%360,i,d,null==o?1:o]},u.hsla.from=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t=e[0]/360,i=e[1],s=e[2],a=e[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,t+1/3)),Math.round(255*n(r,o,t)),Math.round(255*n(r,o,t-1/3)),a]},f(u,function(s,n){var a=n.props,o=n.cache,h=n.to,u=n.from;l.fn[s]=function(s){if(h&&!this[o]&&(this[o]=h(this._rgba)),s===t)return this[o].slice();var n,r=e.type(s),d="array"===r||"object"===r?s:arguments,c=this[o].slice();return f(a,function(e,t){var s=d["object"===r?e:t.idx];null==s&&(s=c[t.idx]),c[t.idx]=i(s,t)}),u?(n=l(u(c)),n[o]=c,n):l(c)},f(a,function(t,i){l.fn[t]||(l.fn[t]=function(n){var a,o=e.type(n),h="alpha"===t?this._hsla?"hsla":"rgba":s,l=this[h](),u=l[i.idx];return"undefined"===o?u:("function"===o&&(n=n.call(this,u),o=e.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=u+parseFloat(a[2])*("+"===a[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(t){var i=t.split(" ");f(i,function(t,i){e.cssHooks[i]={set:function(t,n){var a,o,r="";if("transparent"!==n&&("string"!==e.type(n)||(a=s(n)))){if(n=l(a||n),!c.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?t.parentNode:t;(""===r||"transparent"===r)&&o&&o.style;)try{r=e.css(o,"backgroundColor"),o=o.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{t.style[i]=n}catch(h){}}},e.fx.step[i]=function(t){t.colorInit||(t.start=l(t.elem,i),t.end=l(t.end),t.colorInit=!0),e.cssHooks[i].set(t.elem,t.start.transition(t.end,t.pos))}})},l.hook(o),e.cssHooks.borderColor={expand:function(e){var t={};return f(["Top","Right","Bottom","Left"],function(i,s){t["border"+s+"Color"]=e}),t}},a=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(b),function(){function t(t){var i,s,n=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[e.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function i(t,i){var s,a,o={};for(s in i)a=i[s],t[s]!==a&&(n[s]||(e.fx.step[s]||!isNaN(parseFloat(a)))&&(o[s]=a));return o}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,i){e.fx.step[i]=function(e){("none"!==e.end&&!e.setAttr||1===e.pos&&!e.setAttr)&&(b.style(e.elem,i,e.end),e.setAttr=!0)}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(n,a,o,r){var h=e.speed(a,o,r);return this.queue(function(){var a,o=e(this),r=o.attr("class")||"",l=h.children?o.find("*").addBack():o;l=l.map(function(){var i=e(this);return{el:i,start:t(this)}}),a=function(){e.each(s,function(e,t){n[t]&&o[t+"Class"](n[t])})},a(),l=l.map(function(){return this.end=t(this.el[0]),this.diff=i(this.start,this.end),this}),o.attr("class",r),l=l.map(function(){var t=this,i=e.Deferred(),s=e.extend({},h,{queue:!1,complete:function(){i.resolve(t)}});return this.el.animate(this.diff,s),i.promise()}),e.when.apply(e,l.get()).done(function(){a(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),h.complete.call(o[0])})})},e.fn.extend({addClass:function(t){return function(i,s,n,a){return s?e.effects.animateClass.call(this,{add:i},s,n,a):t.apply(this,arguments)}}(e.fn.addClass),removeClass:function(t){return function(i,s,n,a){return arguments.length>1?e.effects.animateClass.call(this,{remove:i},s,n,a):t.apply(this,arguments)}}(e.fn.removeClass),toggleClass:function(t){return function(i,s,n,a,o){return"boolean"==typeof s||void 0===s?n?e.effects.animateClass.call(this,s?{add:i}:{remove:i},n,a,o):t.apply(this,arguments):e.effects.animateClass.call(this,{toggle:i},s,n,a)}}(e.fn.toggleClass),switchClass:function(t,i,s,n,a){return e.effects.animateClass.call(this,{add:i,remove:t},s,n,a)}})}(),function(){function t(t,i,s,n){return e.isPlainObject(t)&&(i=t,t=t.effect),t={effect:t},null==i&&(i={}),e.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||e.fx.speeds[i])&&(n=s,s=i,i={}),e.isFunction(s)&&(n=s,s=null),i&&e.extend(t,i),s=s||i.duration,t.duration=e.fx.off?0:"number"==typeof s?s:s in e.fx.speeds?e.fx.speeds[s]:e.fx.speeds._default,t.complete=n||i.complete,t}function i(t){return!t||"number"==typeof t||e.fx.speeds[t]?!0:"string"!=typeof t||e.effects.effect[t]?e.isFunction(t)?!0:"object"!=typeof t||t.effect?!1:!0:!0}e.extend(e.effects,{version:"1.11.4",save:function(e,t){for(var i=0;t.length>i;i++)null!==t[i]&&e.data(y+t[i],e[0].style[t[i]])},restore:function(e,t){var i,s;for(s=0;t.length>s;s++)null!==t[s]&&(i=e.data(y+t[s]),void 0===i&&(i=""),e.css(t[s],i))},setMode:function(e,t){return"toggle"===t&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var i,s;switch(e[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=e[0]/t.height}switch(e[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=e[1]/t.width}return{x:s,y:i}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var i={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},s=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:t.width(),height:t.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return t.wrap(s),(t[0]===a||e.contains(t[0],a))&&e(a).focus(),s=t.parent(),"static"===t.css("position")?(s.css({position:"relative"}),t.css({position:"relative"})):(e.extend(i,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,s){i[s]=t.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(n),s.css(i).show()},removeWrapper:function(t){var i=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===i||e.contains(t[0],i))&&e(i).focus()),t},setTransition:function(t,i,s,n){return n=n||{},e.each(i,function(e,i){var a=t.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),e.fn.extend({effect:function(){function i(t){function i(){e.isFunction(a)&&a.call(n[0]),e.isFunction(t)&&t()}var n=e(this),a=s.complete,r=s.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),i()):o.call(n[0],s,i)}var s=t.apply(this,arguments),n=s.mode,a=s.queue,o=e.effects.effect[s.effect];return e.fx.off||!o?n?this[n](s.duration,s.complete):this.each(function(){s.complete&&s.complete.call(this)}):a===!1?this.each(i):this.queue(a||"fx",i)},show:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(e.fn.show),hide:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(e.fn.hide),toggle:function(e){return function(s){if(i(s)||"boolean"==typeof s)return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(e.fn.toggle),cssUnit:function(t){var i=this.css(t),s=[];return e.each(["em","px","%","pt"],function(e,t){i.indexOf(t)>0&&(s=[parseFloat(i),t])}),s}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,i){t[i]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return 0===e||1===e?e:-Math.pow(2,8*(e-1))*Math.sin((80*(e-1)-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){for(var t,i=4;((t=Math.pow(2,--i))-1)/11>e;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*t-2)/22-e,2)}}),e.each(t,function(t,i){e.easing["easeIn"+t]=i,e.easing["easeOut"+t]=function(e){return 1-i(1-e)},e.easing["easeInOut"+t]=function(e){return.5>e?i(2*e)/2:1-i(-2*e+2)/2}})}(),e.effects,e.effects.effect.blind=function(t,i){var s,n,a,o=e(this),r=/up|down|vertical/,h=/up|left|vertical|horizontal/,l=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(o,t.mode||"hide"),d=t.direction||"up",c=r.test(d),p=c?"height":"width",f=c?"top":"left",m=h.test(d),g={},v="show"===u;o.parent().is(".ui-effects-wrapper")?e.effects.save(o.parent(),l):e.effects.save(o,l),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n=s[p](),a=parseFloat(s.css(f))||0,g[p]=v?n:0,m||(o.css(c?"bottom":"right",0).css(c?"top":"left","auto").css({position:"absolute"}),g[f]=v?a:n+a),v&&(s.css(p,0),m||s.css(f,a+n)),s.animate(g,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){"hide"===u&&o.hide(),e.effects.restore(o,l),e.effects.removeWrapper(o),i()}})},e.effects.effect.bounce=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"effect"),l="hide"===h,u="show"===h,d=t.direction||"up",c=t.distance,p=t.times||5,f=2*p+(u||l?1:0),m=t.duration/f,g=t.easing,v="up"===d||"down"===d?"top":"left",y="up"===d||"left"===d,b=o.queue(),_=b.length;for((u||l)&&r.push("opacity"),e.effects.save(o,r),o.show(),e.effects.createWrapper(o),c||(c=o["top"===v?"outerHeight":"outerWidth"]()/3),u&&(a={opacity:1},a[v]=0,o.css("opacity",0).css(v,y?2*-c:2*c).animate(a,m,g)),l&&(c/=Math.pow(2,p-1)),a={},a[v]=0,s=0;p>s;s++)n={},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g).animate(a,m,g),c=l?2*c:c/2;l&&(n={opacity:0},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g)),o.queue(function(){l&&o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}),_>1&&b.splice.apply(b,[1,0].concat(b.splice(_,f+1))),o.dequeue()},e.effects.effect.clip=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"hide"),l="show"===h,u=t.direction||"vertical",d="vertical"===u,c=d?"height":"width",p=d?"top":"left",f={};e.effects.save(o,r),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n="IMG"===o[0].tagName?s:o,a=n[c](),l&&(n.css(c,0),n.css(p,a/2)),f[c]=l?a:0,f[p]=l?0:a/2,n.animate(f,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){l||o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}})},e.effects.effect.drop=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","opacity","height","width"],o=e.effects.setMode(n,t.mode||"hide"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h?"pos":"neg",d={opacity:r?1:0};e.effects.save(n,a),n.show(),e.effects.createWrapper(n),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===u?-s:s),d[l]=(r?"pos"===u?"+=":"-=":"pos"===u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.explode=function(t,i){function s(){b.push(this),b.length===d*c&&n()}function n(){p.css({visibility:"visible"}),e(b).remove(),m||p.hide(),i()}var a,o,r,h,l,u,d=t.pieces?Math.round(Math.sqrt(t.pieces)):3,c=d,p=e(this),f=e.effects.setMode(p,t.mode||"hide"),m="show"===f,g=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/c),y=Math.ceil(p.outerHeight()/d),b=[];for(a=0;d>a;a++)for(h=g.top+a*y,u=a-(d-1)/2,o=0;c>o;o++)r=g.left+o*v,l=o-(c-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-o*v,top:-a*y}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:y,left:r+(m?l*v:0),top:h+(m?u*y:0),opacity:m?0:1}).animate({left:r+(m?0:l*v),top:h+(m?0:u*y),opacity:m?1:0},t.duration||500,t.easing,s)},e.effects.effect.fade=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:t.duration,easing:t.easing,complete:i})},e.effects.effect.fold=function(t,i){var s,n,a=e(this),o=["position","top","bottom","left","right","height","width"],r=e.effects.setMode(a,t.mode||"hide"),h="show"===r,l="hide"===r,u=t.size||15,d=/([0-9]+)%/.exec(u),c=!!t.horizFirst,p=h!==c,f=p?["width","height"]:["height","width"],m=t.duration/2,g={},v={};e.effects.save(a,o),a.show(),s=e.effects.createWrapper(a).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],d&&(u=parseInt(d[1],10)/100*n[l?0:1]),h&&s.css(c?{height:0,width:u}:{height:u,width:0}),g[f[0]]=h?n[0]:u,v[f[1]]=h?n[1]:0,s.animate(g,m,t.easing).animate(v,m,t.easing,function(){l&&a.hide(),e.effects.restore(a,o),e.effects.removeWrapper(a),i()})},e.effects.effect.highlight=function(t,i){var s=e(this),n=["backgroundImage","backgroundColor","opacity"],a=e.effects.setMode(s,t.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),e.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===a&&s.hide(),e.effects.restore(s,n),i()}})},e.effects.effect.size=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],u=["fontSize"],d=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],c=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),f=t.restore||"effect"!==p,m=t.scale||"both",g=t.origin||["middle","center"],v=o.css("position"),y=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&o.show(),s={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},"toggle"===t.mode&&"show"===p?(o.from=t.to||b,o.to=t.from||s):(o.from=t.from||("show"===p?b:s),o.to=t.to||("hide"===p?b:s)),a={from:{y:o.from.height/s.height,x:o.from.width/s.width},to:{y:o.to.height/s.height,x:o.to.width/s.width}},("box"===m||"both"===m)&&(a.from.y!==a.to.y&&(y=y.concat(d),o.from=e.effects.setTransition(o,d,a.from.y,o.from),o.to=e.effects.setTransition(o,d,a.to.y,o.to)),a.from.x!==a.to.x&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,a.from.x,o.from),o.to=e.effects.setTransition(o,c,a.to.x,o.to))),("content"===m||"both"===m)&&a.from.y!==a.to.y&&(y=y.concat(u).concat(l),o.from=e.effects.setTransition(o,u,a.from.y,o.from),o.to=e.effects.setTransition(o,u,a.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),g&&(n=e.effects.getBaseline(g,s),o.from.top=(s.outerHeight-o.outerHeight())*n.y,o.from.left=(s.outerWidth-o.outerWidth())*n.x,o.to.top=(s.outerHeight-o.to.outerHeight)*n.y,o.to.left=(s.outerWidth-o.to.outerWidth)*n.x),o.css(o.from),("content"===m||"both"===m)&&(d=d.concat(["marginTop","marginBottom"]).concat(u),c=c.concat(["marginLeft","marginRight"]),l=r.concat(d).concat(c),o.find("*[width]").each(function(){var i=e(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};
+f&&e.effects.save(i,l),i.from={height:s.height*a.from.y,width:s.width*a.from.x,outerHeight:s.outerHeight*a.from.y,outerWidth:s.outerWidth*a.from.x},i.to={height:s.height*a.to.y,width:s.width*a.to.x,outerHeight:s.height*a.to.y,outerWidth:s.width*a.to.x},a.from.y!==a.to.y&&(i.from=e.effects.setTransition(i,d,a.from.y,i.from),i.to=e.effects.setTransition(i,d,a.to.y,i.to)),a.from.x!==a.to.x&&(i.from=e.effects.setTransition(i,c,a.from.x,i.from),i.to=e.effects.setTransition(i,c,a.to.x,i.to)),i.css(i.from),i.animate(i.to,t.duration,t.easing,function(){f&&e.effects.restore(i,l)})})),o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){0===o.to.opacity&&o.css("opacity",o.from.opacity),"hide"===p&&o.hide(),e.effects.restore(o,y),f||("static"===v?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,i){var s=parseInt(i,10),n=e?o.to.left:o.to.top;return"auto"===i?n+"px":s+n+"px"})})),e.effects.removeWrapper(o),i()}})},e.effects.effect.scale=function(t,i){var s=e(this),n=e.extend(!0,{},t),a=e.effects.setMode(s,t.mode||"effect"),o=parseInt(t.percent,10)||(0===parseInt(t.percent,10)?0:"hide"===a?0:100),r=t.direction||"both",h=t.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},u={y:"horizontal"!==r?o/100:1,x:"vertical"!==r?o/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==a&&(n.origin=h||["middle","center"],n.restore=!0),n.from=t.from||("show"===a?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*u.y,width:l.width*u.x,outerHeight:l.outerHeight*u.y,outerWidth:l.outerWidth*u.x},n.fade&&("show"===a&&(n.from.opacity=0,n.to.opacity=1),"hide"===a&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},e.effects.effect.puff=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"hide"),a="hide"===n,o=parseInt(t.percent,10)||150,r=o/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:a?o:100,from:a?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(t)},e.effects.effect.pulsate=function(t,i){var s,n=e(this),a=e.effects.setMode(n,t.mode||"show"),o="show"===a,r="hide"===a,h=o||"hide"===a,l=2*(t.times||5)+(h?1:0),u=t.duration/l,d=0,c=n.queue(),p=c.length;for((o||!n.is(":visible"))&&(n.css("opacity",0).show(),d=1),s=1;l>s;s++)n.animate({opacity:d},u,t.easing),d=1-d;n.animate({opacity:d},u,t.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&c.splice.apply(c,[1,0].concat(c.splice(p,l+1))),n.dequeue()},e.effects.effect.shake=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","height","width"],o=e.effects.setMode(n,t.mode||"effect"),r=t.direction||"left",h=t.distance||20,l=t.times||3,u=2*l+1,d=Math.round(t.duration/u),c="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},m={},g={},v=n.queue(),y=v.length;for(e.effects.save(n,a),n.show(),e.effects.createWrapper(n),f[c]=(p?"-=":"+=")+h,m[c]=(p?"+=":"-=")+2*h,g[c]=(p?"-=":"+=")+2*h,n.animate(f,d,t.easing),s=1;l>s;s++)n.animate(m,d,t.easing).animate(g,d,t.easing);n.animate(m,d,t.easing).animate(f,d/2,t.easing).queue(function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}),y>1&&v.splice.apply(v,[1,0].concat(v.splice(y,u+1))),n.dequeue()},e.effects.effect.slide=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","width","height"],o=e.effects.setMode(n,t.mode||"show"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h,d={};e.effects.save(n,a),n.show(),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,u?isNaN(s)?"-"+s:-s:s),d[l]=(r?u?"+=":"-=":u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.transfer=function(t,i){var s=e(this),n=e(t.to),a="fixed"===n.css("position"),o=e("body"),r=a?o.scrollTop():0,h=a?o.scrollLeft():0,l=n.offset(),u={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},d=s.offset(),c=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:d.top-r,left:d.left-h,height:s.innerHeight(),width:s.innerWidth(),position:a?"fixed":"absolute"}).animate(u,t.duration,t.easing,function(){c.remove(),i()})},e.widget("ui.progressbar",{version:"1.11.4",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return void 0===e?this.options.value:(this.options.value=this._constrainedValue(e),this._refreshValue(),void 0)},_constrainedValue:function(e){return void 0===e&&(e=this.options.value),this.indeterminate=e===!1,"number"!=typeof e&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){"max"===e&&(t=Math.max(this.min,t)),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),e.widget("ui.selectable",e.ui.mouse,{version:"1.11.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.selectmenu",{version:"1.11.4",defaultElement:"<select>",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var t=this;this.label=e("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(e){this.button.focus(),e.preventDefault()}}),this.element.hide(),this.button=e("<span>",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),e("<span>",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=e("<span>",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){t.menuItems||t._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var t=this;this.menu=e("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=e("<div>",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(e,i){e.preventDefault(),t._setSelection(),t._select(i.item.data("ui-selectmenu-item"),e)},focus:function(e,i){var s=i.item.data("ui-selectmenu-item");null!=t.focusIndex&&s.index!==t.focusIndex&&(t._trigger("focus",e,{item:s}),t.isOpen||t._select(s,e)),t.focusIndex=s.index,t.button.attr("aria-activedescendant",t.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this.options.width||this._resizeButton()},_refreshMenu:function(){this.menu.empty();var e,t=this.element.find("option");t.length&&(this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),e=this._getSelectedItem(),this.menuInstance.focus(null,e),this._setAria(e.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(e){this.options.disabled||(this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",e))},_position:function(){this.menuWrap.position(e.extend({of:this.button},this.options.position))},close:function(e){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",e))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(t,i){var s=this,n="";e.each(i,function(i,a){a.optgroup!==n&&(e("<li>",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(a.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:a.optgroup}).appendTo(t),n=a.optgroup),s._renderItemData(t,a)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-selectmenu-item",t)},_renderItem:function(t,i){var s=e("<li>");return i.disabled&&s.addClass("ui-state-disabled"),this._setText(s,i.label),s.appendTo(t)},_setText:function(e,t){t?e.text(t):e.html("&#160;")},_move:function(e,t){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex):(i=this.menuItems.eq(this.element[0].selectedIndex),n+=":not(.ui-state-disabled)"),s="first"===e||"last"===e?i["first"===e?"prevAll":"nextAll"](n).eq(-1):i[e+"All"](n).eq(0),s.length&&this.menuInstance.focus(t,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(e){this[this.isOpen?"close":"open"](e)},_setSelection:function(){var e;this.range&&(window.getSelection?(e=window.getSelection(),e.removeAllRanges(),e.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(t){this.isOpen&&(e(t.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(t))}},_buttonEvents:{mousedown:function(){var e;window.getSelection?(e=window.getSelection(),e.rangeCount&&(this.range=e.getRangeAt(0))):this.range=document.selection.createRange()},click:function(e){this._setSelection(),this._toggle(e)},keydown:function(t){var i=!0;switch(t.keyCode){case e.ui.keyCode.TAB:case e.ui.keyCode.ESCAPE:this.close(t),i=!1;break;case e.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case e.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case e.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case e.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case e.ui.keyCode.LEFT:this._move("prev",t);break;case e.ui.keyCode.RIGHT:this._move("next",t);break;case e.ui.keyCode.HOME:case e.ui.keyCode.PAGE_UP:this._move("first",t);break;case e.ui.keyCode.END:case e.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),i=!1}i&&t.preventDefault()}},_selectFocusedItem:function(e){var t=this.menuItems.eq(this.focusIndex);t.hasClass("ui-state-disabled")||this._select(t.data("ui-selectmenu-item"),e)},_select:function(e,t){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=e.index,this._setText(this.buttonText,e.label),this._setAria(e),this._trigger("select",t,{item:e}),e.index!==i&&this._trigger("change",t,{item:e}),this.close(t)},_setAria:function(e){var t=this.menuItems.eq(e.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(e,t){"icons"===e&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(t.button),this._super(e,t),"appendTo"===e&&this.menuWrap.appendTo(this._appendTo()),"disabled"===e&&(this.menuInstance.option("disabled",t),this.button.toggleClass("ui-state-disabled",t).attr("aria-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),"width"===e&&this._resizeButton()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var e=this.options.width;e||(e=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(e)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(t){var i=[];t.each(function(t,s){var n=e(s),a=n.parent("optgroup");i.push({element:n,index:t,value:n.val(),label:n.text(),optgroup:a.attr("label")||"",disabled:a.prop("disabled")||n.prop("disabled")})}),this.items=i},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}}),e.widget("ui.slider",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),a="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",o=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),t=n.length;i>t;t++)o.push(a);this.handles=n.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)})},_createRange:function(){var t=this.options,i="";t.range?(t.range===!0&&(t.values?t.values.length&&2!==t.values.length?t.values=[t.values[0],t.values[0]]:e.isArray(t.values)&&(t.values=t.values.slice(0)):t.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=e("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===t.range||"max"===t.range?" ui-slider-range-"+t.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var i,s,n,a,o,r,h,l,u=this,d=this.options;return d.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:t.pageX,y:t.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var i=Math.abs(s-u.values(t));(n>i||n===i&&(t===u._lastChangedValue||u.values(t)===d.min))&&(n=i,a=e(this),o=t)}),r=this._start(t,o),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,a.addClass("ui-state-active").focus(),h=a.offset(),l=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:t.pageX-h.left-a.width()/2,top:t.pageY-h.top-a.height()/2-(parseInt(a.css("borderTopWidth"),10)||0)-(parseInt(a.css("borderBottomWidth"),10)||0)+(parseInt(a.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},i=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,i),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,i,s,n,a;return"horizontal"===this.orientation?(t=this.elementSize.width,i=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,i=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/t,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),a=this._valueMin()+s*n,this._trimAlignValue(a)},_start:function(e,t){var i={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("start",e,i)},_slide:function(e,t,i){var s,n,a;this.options.values&&this.options.values.length?(s=this.values(t?0:1),2===this.options.values.length&&this.options.range===!0&&(0===t&&i>s||1===t&&s>i)&&(i=s),i!==this.values(t)&&(n=this.values(),n[t]=i,a=this._trigger("slide",e,{handle:this.handles[t],value:i,values:n}),s=this.values(t?0:1),a!==!1&&this.values(t,i))):i!==this.value()&&(a=this._trigger("slide",e,{handle:this.handles[t],value:i}),a!==!1&&this.value(i))},_stop:function(e,t){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("stop",e,i)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,i)}},value:function(e){return arguments.length?(this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(t,i){var s,n,a;if(arguments.length>1)return this.options.values[t]=this._trimAlignValue(i),this._refreshValue(),this._change(null,t),void 0;if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();for(s=this.options.values,n=arguments[0],a=0;s.length>a;a+=1)s[a]=this._trimAlignValue(n[a]),this._change(null,a);this._refreshValue()},_setOption:function(t,i){var s,n=0;switch("range"===t&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),e.isArray(this.options.values)&&(n=this.options.values.length),"disabled"===t&&this.element.toggleClass("ui-state-disabled",!!i),this._super(t,i),t){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue(),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e)},_values:function(e){var t,i,s;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(e){if(this._valueMin()>=e)return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,i=(e-this._valueMin())%t,s=e-i;return 2*Math.abs(i)>=t&&(s+=i>0?t:-t),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var e=this.options.max,t=this._valueMin(),i=this.options.step,s=Math.floor(+(e-t).toFixed(this._precision())/i)*i;e=s+t,this.max=parseFloat(e.toFixed(this._precision()))},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshValue:function(){var t,i,s,n,a,o=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,u={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),u["horizontal"===h.orientation?"left":"bottom"]=i+"%",e(this).stop(1,1)[l?"animate":"css"](u,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-t+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-t+"%"},{queue:!1,duration:r.animate}))),t=i}):(s=this.value(),n=this._valueMin(),a=this._valueMax(),i=a!==n?100*((s-n)/(a-n)):0,u["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](u,r.animate),"min"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===o&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===o&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(t){var i,s,n,a,o=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(t.preventDefault(),!this._keySliding&&(this._keySliding=!0,e(t.target).addClass("ui-state-active"),i=this._start(t,o),i===!1))return}switch(a=this.options.step,s=n=this.options.values&&this.options.values.length?this.values(o):this.value(),t.keyCode){case e.ui.keyCode.HOME:n=this._valueMin();break;case e.ui.keyCode.END:n=this._valueMax();break;case e.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+a);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-a)}this._slide(t,o,n)},keyup:function(t){var i=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,i),this._change(t,i),e(t.target).removeClass("ui-state-active"))}}}),e.widget("ui.sortable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(e,t,i){return e>=t&&t+i>e},_isFloating:function(e){return/left|right/.test(e.css("float"))||/inline|table-cell/.test(e.css("display"))},_create:function(){this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),e.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(t),e(t.target).parents().each(function(){return e.data(this,a.widgetName+"-item")===a?(s=e(this),!1):void 0}),e.data(t.target,a.widgetName+"-item")===a&&(s=e(t.target)),s?!this.options.handle||i||(e(this.options.handle,s).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(t,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=e("<style>*{ cursor: "+o.cursor+" !important; }</style>").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",t,this._uiHash(this));
+return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-this.document.scrollTop()<o.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-o.scrollSpeed):this.window.height()-(t.pageY-this.document.scrollTop())<o.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+o.scrollSpeed)),t.pageX-this.document.scrollLeft()<o.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-o.scrollSpeed):this.window.width()-(t.pageX-this.document.scrollLeft())<o.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+o.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!e.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!e.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,i){if(t){if(e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,e(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(t)})}else this._clear(t,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},e(i).each(function(){var i=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);i&&s.push((t.key||i[1]+"[]")+"="+(t.key&&t.expression?i[1]:i[2]))}),!s.length&&t.key&&s.push(t.key+"="),s.join("&")},toArray:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},i.each(function(){s.push(e(t.item||this).attr(t.attribute||"id")||"")}),s},_intersectsWith:function(e){var t=this.positionAbs.left,i=t+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=e.left,o=a+e.width,r=e.top,h=r+e.height,l=this.offset.click.top,u=this.offset.click.left,d="x"===this.options.axis||s+l>r&&h>s+l,c="y"===this.options.axis||t+u>a&&o>t+u,p=d&&c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?p:t+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(e){var t="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),s=t&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(e){var t=this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&t||"up"===s&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return 0!==e&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return 0!==e&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&t)for(s=l.length-1;s>=0;s--)for(a=e(l[s],this.document[0]),n=a.length-1;n>=0;n--)o=e.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([e.isFunction(o.options.items)?o.options.items.call(o.element):e(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return e(r)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var i=0;t.length>i;i++)if(t[i]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,d=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],c=this._connectWith();if(c&&this.ready)for(i=c.length-1;i>=0;i--)for(n=e(c[i],this.document[0]),s=n.length-1;s>=0;s--)a=e.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(d.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a));for(i=d.length-1;i>=0;i--)for(o=d[i][1],r=d[i][0],s=0,l=r.length;l>s;s++)h=e(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(t){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?e(this.options.toleranceElement,s.item):s.item,t||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var i,s=t.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=t.currentItem[0].nodeName.toLowerCase(),n=e("<"+s+">",t.document[0]).addClass(i||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tbody"===s?t._createTrPlaceholder(t.currentItem.find("tr").eq(0),e("<tr>",t.document[0]).appendTo(n)):"tr"===s?t._createTrPlaceholder(t.currentItem,n):"img"===s&&n.attr("src",t.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(e,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10)))}}),t.placeholder=e(s.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),s.placeholder.update(t,t.placeholder)},_createTrPlaceholder:function(t,i){var s=this;t.children().each(function(){e("<td>&#160;</td>",s.document[0]).attr("colspan",e(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(t){var i,s,n,a,o,r,h,l,u,d,c=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!e.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(c&&e.contains(this.containers[i].element[0],c.element[0]))continue;c=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0);if(c)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=c.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",d=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)e.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,t[d]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(t[d]-h)&&(n=Math.abs(t[d]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;a?this._rearrange(t,a,null,!0):this._rearrange(t,null,this.containers[p].element,!0),this._trigger("change",t,this._uiHash()),this.containers[p]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||e("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.width():this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(t=e(n.containment)[0],i=e(n.containment).offset(),s="hidden"!==e(t).css("overflow"),this.containment=[i.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(t){var i,s,n=this.options,a=t.pageX,o=t.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(a=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(a=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(e,t,i,s){i?i[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(e,t){function i(e,t,i){return function(s){i._trigger(e,s,t._uiHash(t))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!t&&n.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||t||n.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(t||(n.push(function(e){this._trigger("remove",e,this._uiHash())}),n.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)t||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,t||this._trigger("beforeStop",e,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!t){for(s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var i=t||this;return{helper:i.helper,placeholder:i.placeholder||e([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:t?t.element:null}}}),e.widget("ui.spinner",{version:"1.11.4",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},i=this.element;return e.each(["min","max","step"],function(e,s){var n=i.attr(s);void 0!==n&&n.length&&(t[s]=n)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e),void 0)},mousewheel:function(e,t){if(t){if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()}},"mousedown .ui-spinner-button":function(t){function i(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(t)!==!1&&this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){return e(t.currentTarget).hasClass("ui-state-active")?this._start(t)===!1?!1:(this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*e.height())&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var i=this.options,s=e.ui.keyCode;switch(t.keyCode){case s.UP:return this._repeat(null,1,t),!0;case s.DOWN:return this._repeat(null,-1,t),!0;case s.PAGE_UP:return this._repeat(null,i.page,t),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return this.spinning||this._trigger("start",e)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(e,t,i){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,i)},e),this._spin(t*this.options.step,i)},_spin:function(e,t){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+e*this._increment(this.counter)),this.spinning&&this._trigger("spin",t,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(t){var i=this.options.incremental;return i?e.isFunction(i)?i(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_adjustValue:function(e){var t,i,s=this.options;return t=null!==s.min?s.min:0,i=e-t,i=Math.round(i/s.step)*s.step,e=t+i,e=parseFloat(e.toFixed(this._precision())),null!==s.max&&e>s.max?s.max:null!==s.min&&s.min>e?s.min:e},_stop:function(e){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e))},_setOption:function(e,t){if("culture"===e||"numberFormat"===e){var i=this._parse(this.element.val());return this.options[e]=t,this.element.val(this._format(i)),void 0}("max"===e||"min"===e||"step"===e)&&"string"==typeof t&&(t=this._parse(t)),"icons"===e&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),"disabled"===e&&(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable"))},_setOptions:h(function(e){this._super(e)}),_parse:function(e){return"string"==typeof e&&""!==e&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),""===e||isNaN(e)?null:e},_format:function(e){return""===e?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var e=this.value();return null===e?!1:e===this._adjustValue(e)},_value:function(e,t){var i;""!==e&&(i=this._parse(e),null!==i&&(t||(i=this._adjustValue(i)),e=this._format(i))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:h(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:h(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:h(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:h(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){return arguments.length?(h(this._value).call(this,e),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),e.widget("ui.tabs",{version:"1.11.4",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var e=/#.*$/;return function(t){var i,s;t=t.cloneNode(!1),i=t.href.replace(e,""),s=location.href.replace(e,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return t.hash.length>1&&i===s}}(),_create:function(){var t=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible),this._processTabs(),i.active=this._initialActive(),e.isArray(i.disabled)&&(i.disabled=e.unique(i.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):e(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var t=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===t&&(s&&this.tabs.each(function(i,n){return e(n).attr("aria-controls")===s?(t=i,!1):void 0}),null===t&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===t||-1===t)&&(t=this.tabs.length?0:!1)),t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),-1===t&&(t=i?!1:0)),!i&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var i=e(this.document[0].activeElement).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:s++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:n=!1,s--;break;case e.ui.keyCode.END:s=this.anchors.length-1;break;case e.ui.keyCode.HOME:s=0;break;case e.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case e.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}t.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),t.ctrlKey||t.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){return t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,i){function s(){return t>n&&(t=0),0>t&&(t=n),t}for(var n=this.tabs.length-1;-1!==e.inArray(s(),this.options.disabled);)t=i?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):"disabled"===e?(this._setupDisabled(t),void 0):(this._super(e,t),"collapsible"===e&&(this.element.toggleClass("ui-tabs-collapsible",t),t||this.options.active!==!1||this._activate(0)),"event"===e&&this._setupEvents(t),"heightStyle"===e&&this._setupHeightStyle(t),void 0)},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,i=this.tablist.children(":has(a[href])");t.disabled=e.map(i.filter(".ui-state-disabled"),function(e){return i.index(e)}),this._processTabs(),t.active!==!1&&this.anchors.length?this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=e()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this,i=this.tabs,s=this.anchors,n=this.panels;
+this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist").delegate("> li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(i,s){var n,a,o,r=e(s).uniqueId().attr("id"),h=e(s).closest("li"),l=h.attr("aria-controls");t._isLocal(s)?(n=s.hash,o=n.substring(1),a=t.element.find(t._sanitizeSelector(n))):(o=h.attr("aria-controls")||e({}).uniqueId()[0].id,n="#"+o,a=t.element.find(n),a.length||(a=t._createPanel(o),a.insertAfter(t.panels[i-1]||t.tablist)),a.attr("aria-live","polite")),a.length&&(t.panels=t.panels.add(a)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":o,"aria-labelledby":r}),a.attr("aria-labelledby",r)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var i,s=0;i=this.tabs[s];s++)t===!0||-1!==e.inArray(s,t)?e(i).addClass("ui-state-disabled").attr("aria-disabled","true"):e(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var i={};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,s=this.element.parent();"fill"===t?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),s=t.css("position");"absolute"!==s&&"fixed"!==s&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,i-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,e(this).height("").height())}).height(i))},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n.closest("li"),o=a[0]===s[0],r=o&&i.collapsible,h=r?e():this._getPanelForTab(a),l=s.length?this._getPanelForTab(s):e(),u={oldTab:s,oldPanel:l,newTab:r?e():a,newPanel:h};t.preventDefault(),a.hasClass("ui-state-disabled")||a.hasClass("ui-tabs-loading")||this.running||o&&!i.collapsible||this._trigger("beforeActivate",t,u)===!1||(i.active=r?!1:this.tabs.index(a),this.active=o?e():a,this.xhr&&this.xhr.abort(),l.length||h.length||e.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(a),t),this._toggle(t,u))},_toggle:function(t,i){function s(){a.running=!1,a._trigger("activate",t,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),o.length&&a.options.show?a._show(o,a.options.show,s):(o.show(),s())}var a=this,o=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),o.length&&r.length?i.oldTab.attr("tabIndex",-1):o.length&&this.tabs.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),o.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var i,s=this._findActive(t);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),i=t.data("ui-tabs-aria-controls");i?t.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(t){var i=this.options.disabled;i!==!1&&(void 0===t?i=!1:(t=this._getIndex(t),i=e.isArray(i)?e.map(i,function(e){return e!==t?e:null}):e.map(this.tabs,function(e,i){return i!==t?i:null})),this._setupDisabled(i))},disable:function(t){var i=this.options.disabled;if(i!==!0){if(void 0===t)i=!0;else{if(t=this._getIndex(t),-1!==e.inArray(t,i))return;i=e.isArray(i)?e.merge([t],i).sort():[t]}this._setupDisabled(i)}},load:function(t,i){t=this._getIndex(t);var s=this,n=this.tabs.eq(t),a=n.find(".ui-tabs-anchor"),o=this._getPanelForTab(n),r={tab:n,panel:o},h=function(e,t){"abort"===t&&s.panels.stop(!1,!0),n.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===s.xhr&&delete s.xhr};this._isLocal(a[0])||(this.xhr=e.ajax(this._ajaxSettings(a,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(n.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.done(function(e,t,n){setTimeout(function(){o.html(e),s._trigger("load",i,r),h(n,t)},1)}).fail(function(e,t){setTimeout(function(){h(e,t)},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href"),beforeSend:function(t,a){return n._trigger("beforeLoad",i,e.extend({jqXHR:t,ajaxSettings:a},s))}}},_getPanelForTab:function(t){var i=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),e.widget("ui.tooltip",{version:"1.11.4",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,i){var s=(t.attr("aria-describedby")||"").split(/\s+/);s.push(i),t.data("ui-tooltip-id",i).attr("aria-describedby",e.trim(s.join(" ")))},_removeDescribedBy:function(t){var i=t.data("ui-tooltip-id"),s=(t.attr("aria-describedby")||"").split(/\s+/),n=e.inArray(i,s);-1!==n&&s.splice(n,1),t.removeData("ui-tooltip-id"),s=e.trim(s.join(" ")),s?t.attr("aria-describedby",s):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,i){var s=this;return"disabled"===t?(this[i?"_disable":"_enable"](),this.options[t]=i,void 0):(this._super(t,i),"content"===t&&e.each(this.tooltips,function(e,t){s._updateContent(t.element)}),void 0)},_disable:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s.element[0],t.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var i=this,s=e(t?t.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&s.parents().each(function(){var t,s=e(this);s.data("ui-tooltip-open")&&(t=e.Event("blur"),t.target=t.currentTarget=this,i.close(t,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(t,s),this._updateContent(s,t))},_updateContent:function(e,t){var i,s=this.options.content,n=this,a=t?t.type:null;return"string"==typeof s?this._open(t,e,s):(i=s.call(e[0],function(i){n._delay(function(){e.data("ui-tooltip-open")&&(t&&(t.type=a),this._open(t,e,i))})}),i&&this._open(t,e,i),void 0)},_open:function(t,i,s){function n(e){l.of=e,o.is(":hidden")||o.position(l)}var a,o,r,h,l=e.extend({},this.options.position);if(s){if(a=this._find(i))return a.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(t&&"mouseover"===t.type?i.attr("title",""):i.removeAttr("title")),a=this._tooltip(i),o=a.tooltip,this._addDescribedBy(i,o.attr("id")),o.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),s.clone?(h=s.clone(),h.removeAttr("id").find("[id]").removeAttr("id")):h=s,e("<div>").html(h).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:n}),n(t)):o.position(e.extend({of:i},this.options.position)),o.hide(),this._show(o,this.options.show),this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){o.is(":visible")&&(n(l.of),clearInterval(r))},e.fx.interval)),this._trigger("open",t,{tooltip:o})}},_registerCloseHandlers:function(t,i){var s={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var s=e.Event(t);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),t&&"mouseover"!==t.type||(s.mouseleave="close"),t&&"focusin"!==t.type||(s.focusout="close"),this._on(!0,i,s)},close:function(t){var i,s=this,n=e(t?t.currentTarget:this.element),a=this._find(n);return a?(i=a.tooltip,a.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),a.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(e(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&e.each(this.parents,function(t,i){e(i.element).attr("title",i.title),delete s.parents[t]}),a.closing=!0,this._trigger("close",t,{tooltip:i}),a.hiding||(a.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(t){var i=e("<div>").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),s=i.uniqueId().attr("id");return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[s]={element:t,tooltip:i}},_find:function(e){var t=e.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur"),a=s.element;n.target=n.currentTarget=a[0],t.close(n,!0),e("#"+i).remove(),a.data("ui-tooltip-title")&&(a.attr("title")||a.attr("title",a.data("ui-tooltip-title")),a.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}})});
\ No newline at end of file
diff --git a/lib/scripts/jquery/jquery.js b/lib/scripts/jquery/jquery.js
index d4b67f7e6..6feb11086 100644
--- a/lib/scripts/jquery/jquery.js
+++ b/lib/scripts/jquery/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.11.1
+ * jQuery JavaScript Library v1.11.3
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2014-05-01T17:42Z
+ * Date: 2015-04-28T16:19Z
  */
 
 (function( global, factory ) {
@@ -64,7 +64,7 @@ var support = {};
 
 
 var
-	version = "1.11.1",
+	version = "1.11.3",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -269,7 +269,8 @@ jQuery.extend({
 		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
 		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
 		// subtraction forces infinities to NaN
-		return !jQuery.isArray( obj ) && obj - parseFloat( obj ) >= 0;
+		// adding 1 corrects loss of precision from parseFloat (#15100)
+		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
 	},
 
 	isEmptyObject: function( obj ) {
@@ -568,7 +569,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
 });
 
 function isArraylike( obj ) {
-	var length = obj.length,
+
+	// 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 ) ) {
@@ -584,14 +590,14 @@ function isArraylike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v1.10.19
+ * Sizzle CSS Selector Engine v2.2.0-pre
  * http://sizzlejs.com/
  *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2014-04-18
+ * Date: 2014-12-16
  */
 (function( window ) {
 
@@ -618,7 +624,7 @@ var i,
 	contains,
 
 	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
+	expando = "sizzle" + 1 * new Date(),
 	preferredDoc = window.document,
 	dirruns = 0,
 	done = 0,
@@ -633,7 +639,6 @@ var i,
 	},
 
 	// General-purpose constants
-	strundefined = typeof undefined,
 	MAX_NEGATIVE = 1 << 31,
 
 	// Instance methods
@@ -643,12 +648,13 @@ var i,
 	push_native = arr.push,
 	push = arr.push,
 	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
+	// 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 = this.length;
+			len = list.length;
 		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
+			if ( list[i] === elem ) {
 				return i;
 			}
 		}
@@ -688,6 +694,7 @@ var i,
 		")\\)|)",
 
 	// 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 + "*" ),
@@ -739,6 +746,14 @@ var i,
 				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 )
@@ -781,19 +796,18 @@ function Sizzle( selector, context, results, seed ) {
 
 	context = context || document;
 	results = results || [];
+	nodeType = context.nodeType;
 
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
 
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
+		return results;
 	}
 
-	if ( documentIsHTML && !seed ) {
+	if ( !seed && documentIsHTML ) {
 
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
+		// 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 ) {
@@ -825,7 +839,7 @@ function Sizzle( selector, context, results, seed ) {
 				return results;
 
 			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
+			} else if ( (m = match[3]) && support.getElementsByClassName ) {
 				push.apply( results, context.getElementsByClassName( m ) );
 				return results;
 			}
@@ -835,7 +849,7 @@ function Sizzle( selector, context, results, seed ) {
 		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
 			nid = old = expando;
 			newContext = context;
-			newSelector = nodeType === 9 && selector;
+			newSelector = nodeType !== 1 && selector;
 
 			// qSA works strangely on Element-rooted queries
 			// We can work around this by specifying an extra ID on the root
@@ -1022,7 +1036,7 @@ function createPositionalPseudo( fn ) {
  * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
  */
 function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== strundefined && context;
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
 }
 
 // Expose support vars for convenience
@@ -1046,9 +1060,8 @@ isXML = Sizzle.isXML = function( elem ) {
  * @returns {Object} Returns the current document
  */
 setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare,
-		doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
+	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 ) {
@@ -1058,9 +1071,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Set our document
 	document = doc;
 	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
+	parent = doc.defaultView;
 
 	// Support: IE>8
 	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
@@ -1069,21 +1080,22 @@ setDocument = Sizzle.setDocument = function( node ) {
 	if ( parent && parent !== parent.top ) {
 		// IE11 does not have attachEvent, so all must suffer
 		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", function() {
-				setDocument();
-			}, false );
+			parent.addEventListener( "unload", unloadHandler, false );
 		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", function() {
-				setDocument();
-			});
+			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)
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
 	support.attributes = assert(function( div ) {
 		div.className = "i";
 		return !div.getAttribute("className");
@@ -1098,17 +1110,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 		return !div.getElementsByTagName("*").length;
 	});
 
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
 
 	// Support: IE<10
 	// Check if getElementById returns elements by name
@@ -1122,7 +1125,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// ID find and filter
 	if ( support.getById ) {
 		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
+			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
@@ -1143,7 +1146,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		Expr.filter["ID"] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
 				return node && node.value === attrId;
 			};
 		};
@@ -1152,14 +1155,20 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Tag
 	Expr.find["TAG"] = support.getElementsByTagName ?
 		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
+			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
@@ -1177,7 +1186,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Class
 	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
+		if ( documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
 	};
@@ -1206,13 +1215,15 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// setting a boolean content attribute,
 			// since its presence should be enough
 			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select msallowclip=''><option selected=''></option></select>";
+			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("[msallowclip^='']").length ) {
+			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
 				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
 			}
 
@@ -1222,12 +1233,24 @@ setDocument = Sizzle.setDocument = function( node ) {
 				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 ) {
@@ -1344,7 +1367,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 			// Maintain original order
 			return sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
 				0;
 		}
 
@@ -1371,7 +1394,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 				aup ? -1 :
 				bup ? 1 :
 				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
 				0;
 
 		// If the nodes are siblings, we can do a quick check
@@ -1434,7 +1457,7 @@ Sizzle.matchesSelector = function( elem, expr ) {
 					elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
-		} catch(e) {}
+		} catch (e) {}
 	}
 
 	return Sizzle( expr, document, null, [ elem ] ).length > 0;
@@ -1653,7 +1676,7 @@ Expr = Sizzle.selectors = {
 			return pattern ||
 				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
 				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
 				});
 		},
 
@@ -1675,7 +1698,7 @@ Expr = Sizzle.selectors = {
 					operator === "^=" ? check && result.indexOf( check ) === 0 :
 					operator === "*=" ? check && result.indexOf( check ) > -1 :
 					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
 					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
 					false;
 			};
@@ -1795,7 +1818,7 @@ Expr = Sizzle.selectors = {
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
+							idx = indexOf( seed, matched[i] );
 							seed[ idx ] = !( matches[ idx ] = matched[i] );
 						}
 					}) :
@@ -1834,6 +1857,8 @@ Expr = Sizzle.selectors = {
 				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();
 				};
 		}),
@@ -1845,6 +1870,7 @@ Expr = Sizzle.selectors = {
 		}),
 
 		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
 			return function( elem ) {
 				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
 			};
@@ -2266,7 +2292,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				i = matcherOut.length;
 				while ( i-- ) {
 					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
 
 						seed[temp] = !(results[temp] = elem);
 					}
@@ -2301,13 +2327,16 @@ function matcherFromTokens( tokens ) {
 			return elem === checkContext;
 		}, implicitRelative, true ),
 		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
+			return indexOf( checkContext, elem ) > -1;
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+			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++ ) {
@@ -2557,7 +2586,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 // Sort stability
 support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
 
-// Support: Chrome<14
+// Support: Chrome 14-35+
 // Always assume duplicates if they aren't passed to the comparison function
 support.detectDuplicates = !!hasDuplicate;
 
@@ -6115,7 +6144,14 @@ var getStyles, curCSS,
 
 if ( window.getComputedStyle ) {
 	getStyles = function( elem ) {
-		return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+		// 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 );
 	};
 
 	curCSS = function( elem, name, computed ) {
@@ -6363,6 +6399,8 @@ function addGetHookIf( conditionFn, hookFn ) {
 
 			reliableMarginRightVal =
 				!parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight );
+
+			div.removeChild( contents );
 		}
 
 		// Support: IE8
@@ -9070,7 +9108,8 @@ jQuery.extend({
 		}
 
 		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
+		// 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 ) {
@@ -9329,13 +9368,6 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 	};
 });
 
-// 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._evalUrl = function( url ) {
 	return jQuery.ajax({
@@ -9561,8 +9593,9 @@ var xhrId = 0,
 
 // Support: IE<10
 // Open requests must be manually aborted on unload (#5280)
-if ( window.ActiveXObject ) {
-	jQuery( window ).on( "unload", function() {
+// See https://support.microsoft.com/kb/2856746 for more info
+if ( window.attachEvent ) {
+	window.attachEvent( "onunload", function() {
 		for ( var key in xhrCallbacks ) {
 			xhrCallbacks[ key ]( undefined, true );
 		}
@@ -9996,6 +10029,16 @@ jQuery.fn.load = function( url, params, callback ) {
 
 
 
+// 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;
diff --git a/lib/scripts/jquery/jquery.min.js b/lib/scripts/jquery/jquery.min.js
index ab28a2472..0f60b7bd0 100644
--- a/lib/scripts/jquery/jquery.min.js
+++ b/lib/scripts/jquery/jquery.min.js
@@ -1,4 +1,5 @@
-/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;
-if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},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(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-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",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)}m.Tween=Zb,Zb.prototype={constructor:Zb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")
-},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.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(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,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"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zc()||$c()}:Zc;var Wc=0,Xc={},Yc=m.ajaxSettings.xhr();a.ActiveXObject&&m(a).on("unload",function(){for(var a in Xc)Xc[a](void 0,!0)}),k.cors=!!Yc&&"withCredentials"in Yc,Yc=k.ajax=!!Yc,Yc&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xc[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zc(){try{return new a.XMLHttpRequest}catch(b){}}function $c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _c=[],ad=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_c.pop()||m.expando+"_"+vc++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ad.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ad.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ad,"$1"+e):b.jsonp!==!1&&(b.url+=(wc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_c.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bd=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bd)return bd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
+/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},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(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ca()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ca()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?aa:ba):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=aa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=aa,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=aa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=ba;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=ba),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function da(a){var b=ea.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var ea="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fa=/ jQuery\d+="(?:null|\d+)"/g,ga=new RegExp("<(?:"+ea+")[\\s/>]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/<tbody/i,la=/<|&#?\w+;/,ma=/<(?:script|style|link)/i,na=/checked\s*(?:[^=]|=\s*.checked.)/i,oa=/^$|\/(?:java|ecma)script/i,pa=/^true\/(.*)/,qa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ra={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?"<table>"!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ca[0].contentWindow||Ca[0].contentDocument).document,b.write(),b.close(),c=Ea(a,b),Ca.detach()),Da[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Ga=/^margin/,Ha=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ia,Ja,Ka=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ia=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Ha.test(g)&&Ga.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ia=function(a){return a.currentStyle},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ha.test(g)&&!Ka.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function La(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-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",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Ma=/alpha\([^)]*\)/i,Na=/opacity\s*=\s*([^)]*)/,Oa=/^(none|table(?!-c[ea]).+)/,Pa=new RegExp("^("+S+")(.*)$","i"),Qa=new RegExp("^([+-])=("+S+")","i"),Ra={position:"absolute",visibility:"hidden",display:"block"},Sa={letterSpacing:"0",fontWeight:"400"},Ta=["Webkit","O","Moz","ms"];function Ua(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ta.length;while(e--)if(b=Ta[e]+c,b in a)return b;return d}function Va(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fa(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wa(a,b,c){var d=Pa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Ya(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ia(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Ja(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ha.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xa(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ja(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ua(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qa.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ua(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Ja(a,b,d)),"normal"===f&&b in Sa&&(f=Sa[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Oa.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Ra,function(){return Ya(a,b,d)}):Ya(a,b,d):void 0},set:function(a,c,d){var e=d&&Ia(a);return Wa(a,c,d?Xa(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Na.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Ma,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Ma.test(f)?f.replace(Ma,e):f+" "+e)}}),m.cssHooks.marginRight=La(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Ja,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Ga.test(a)||(m.cssHooks[a+b].set=Wa)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ia(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Va(this,!0)},hide:function(){return Va(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Za(a,b,c,d,e){
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Za.propHooks._default.set(this),this}},Za.prototype.init.prototype=Za.prototype,Za.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Za.propHooks.scrollTop=Za.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Za.prototype.init,m.fx.step={};var $a,_a,ab=/^(?:toggle|show|hide)$/,bb=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cb=/queueHooks$/,db=[ib],eb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bb.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bb.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fb(){return setTimeout(function(){$a=void 0}),$a=m.now()}function gb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hb(a,b,c){for(var d,e=(eb[b]||[]).concat(eb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fa(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fa(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ab.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fa(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hb(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=db.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$a||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$a||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);g>f;f++)if(d=db[f].call(j,a,k,j.opts))return d;return m.map(k,hb,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kb,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],eb[c]=eb[c]||[],eb[c].unshift(b)},prefilter:function(a,b){b?db.unshift(a):db.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kb(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),m.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($a=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$a=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_a||(_a=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_a),_a=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lb=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lb,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mb,nb,ob=m.expr.attrHandle,pb=/^(?:checked|selected)$/i,qb=k.getSetAttribute,rb=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nb:mb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rb&&qb||!pb.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qb?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nb={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rb&&qb||!pb.test(c)?a.setAttribute(!qb&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ob[b]||m.find.attr;ob[b]=rb&&qb||!pb.test(b)?function(a,b,d){var e,f;return d||(f=ob[b],ob[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,ob[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rb&&qb||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mb&&mb.set(a,b,c)}}),qb||(mb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},ob.id=ob.name=ob.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mb.set},m.attrHooks.contenteditable={set:function(a,b,c){mb.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sb=/^(?:input|select|textarea|button|object)$/i,tb=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sb.test(a.nodeName)||tb.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var ub=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ub," ").indexOf(b)>=0)return!0;return!1}}),m.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(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vb=m.now(),wb=/\?/,xb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yb,zb,Ab=/#.*$/,Bb=/([?&])_=[^&]*/,Cb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Db=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Eb=/^(?:GET|HEAD)$/,Fb=/^\/\//,Gb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hb={},Ib={},Jb="*/".concat("*");try{zb=location.href}catch(Kb){zb=y.createElement("a"),zb.href="",zb=zb.href}yb=Gb.exec(zb.toLowerCase())||[];function Lb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mb(a,b,c,d){var e={},f=a===Ib;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nb(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Ob(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zb,type:"GET",isLocal:Db.test(yb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jb,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"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nb(Nb(a,m.ajaxSettings),b):Nb(m.ajaxSettings,a)},ajaxPrefilter:Lb(Hb),ajaxTransport:Lb(Ib),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cb.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zb)+"").replace(Ab,"").replace(Fb,yb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gb.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yb[1]&&c[2]===yb[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yb[3]||("http:"===yb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mb(Hb,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Eb.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wb.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bb.test(e)?e.replace(Bb,"$1_="+vb++):e+(wb.test(e)?"&":"?")+"_="+vb++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jb+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mb(Ib,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Ob(k,v,c)),u=Pb(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qb=/%20/g,Rb=/\[\]$/,Sb=/\r?\n/g,Tb=/^(?:submit|button|image|reset|file)$/i,Ub=/^(?:input|select|textarea|keygen)/i;function Vb(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rb.test(a)?d(a,e):Vb(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vb(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vb(c,a[c],b,e);return d.join("&").replace(Qb,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Ub.test(this.nodeName)&&!Tb.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sb,"\r\n")}}):{name:b.name,value:c.replace(Sb,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zb()||$b()}:Zb;var Wb=0,Xb={},Yb=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xb)Xb[a](void 0,!0)}),k.cors=!!Yb&&"withCredentials"in Yb,Yb=k.ajax=!!Yb,Yb&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xb[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xb[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zb(){try{return new a.XMLHttpRequest}catch(b){}}function $b(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _b=[],ac=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_b.pop()||m.expando+"_"+vb++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ac.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ac.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ac,"$1"+e):b.jsonp!==!1&&(b.url+=(wb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_b.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bc=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bc)return bc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/lib/scripts/jquery/update.sh b/lib/scripts/jquery/update.sh
index 741fcff1c..ed9dcab7b 100755
--- a/lib/scripts/jquery/update.sh
+++ b/lib/scripts/jquery/update.sh
@@ -9,13 +9,17 @@
 # @link   http://code.jquery.com/
 
 # Adjust version for jQuery-UI here - there's no good latest link
-JQUI_VERSION='1.11.0'
+JQUI_VERSION='1.11.4'
 JQUI_HOST="https://code.jquery.com/ui/$JQUI_VERSION"
 JQUI_GIT="https://raw.githubusercontent.com/jquery/jquery-ui/$JQUI_VERSION/ui"
 
+# Adjust version for jQueryhere - latest updates slowly
+JQ_VERSION='1.11.3'
+
+
 # load jQuery
-wget -nv http://code.jquery.com/jquery-latest.min.js      -O jquery.min.js
-wget -nv http://code.jquery.com/jquery-latest.js          -O jquery.js
+wget -nv http://code.jquery.com/jquery-${JQ_VERSION}.min.js      -O jquery.min.js
+wget -nv http://code.jquery.com/jquery-${JQ_VERSION}.js          -O jquery.js
 
 # load jQuery-UI
 wget -nv "$JQUI_HOST/jquery-ui.min.js" -O jquery-ui.min.js
-- 
cgit v1.2.3


From 3dfe7d64760baa568018c1d6d311c26d1a2da098 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 29 May 2015 16:52:05 +0100
Subject: add anchors when constructing pattern from a non-regex oldline

---
 _test/tests/inc/io_replaceinfile.test.php | 13 +++++++++++++
 inc/io.php                                |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/_test/tests/inc/io_replaceinfile.test.php b/_test/tests/inc/io_replaceinfile.test.php
index c2dbc0dd4..de7301fa1 100644
--- a/_test/tests/inc/io_replaceinfile.test.php
+++ b/_test/tests/inc/io_replaceinfile.test.php
@@ -79,4 +79,17 @@ class io_replaceinfile_test extends DokuWikiTest {
         $this->assertTrue(io_replaceInFile($file, "Delete\012", "Delete\012", false, -1));
         $this->assertEquals("The\012Delete\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012", io_readFile($file), "Edge case: new line the same as old line");
     }
+
+    /**
+     *
+     */
+    function test_edgecase3()
+    {
+        $file = TMP_DIR . '/test.txt';
+        $contents = "The\012Delete\01201Delete\01202Delete\012Test\012";
+        // Replace all, no regex, oldline exactly matches one line; matches part of other lines - only the exact match should be replaced
+        io_saveFile($file, $contents);
+        $this->assertTrue(io_replaceInFile($file, "Delete\012", "Replace\012", false, -1));
+        $this->assertEquals("The\012Replace\01201Delete\01202Delete\012Test\012", io_readFile($file), "Edge case: old line is a match for parts of other lines");
+    }
 }
diff --git a/inc/io.php b/inc/io.php
index 51ca2ea14..c559feb17 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -312,7 +312,7 @@ function io_replaceInFile($file, $oldline, $newline, $regex=false, $maxlines=0)
     }
 
     // make non-regexes into regexes
-    $pattern = $regex ? $oldline : '/'.preg_quote($oldline,'/').'/';
+    $pattern = $regex ? $oldline : '/^'.preg_quote($oldline,'/').'$/';
     $replace = $regex ? $newline : addcslashes($newline, '\$');
 
     // remove matching lines
-- 
cgit v1.2.3


From e12c5ac781d560502d478775502df70cd80472de Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 29 May 2015 16:55:23 +0100
Subject: Minor Refactoring - put test comments in more appropriate spot - move
 appending replacement line alongside its search/delete code

---
 _test/tests/inc/io_replaceinfile.test.php | 12 +++++++-----
 inc/io.php                                | 14 +++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/_test/tests/inc/io_replaceinfile.test.php b/_test/tests/inc/io_replaceinfile.test.php
index de7301fa1..597138a20 100644
--- a/_test/tests/inc/io_replaceinfile.test.php
+++ b/_test/tests/inc/io_replaceinfile.test.php
@@ -59,35 +59,37 @@ class io_replaceinfile_test extends DokuWikiTest {
     }
 
     /**
-     *
+     * Test for a non-regex replacement where $newline contains a backreference like construct - it shouldn't affect the replacement
      */
     function test_edgecase1()
     {
         $file = TMP_DIR . '/test.txt';
-        // Replace all, no regex, backreference like construct in replacement line
+
         io_saveFile($file, $this->contents);
         $this->assertTrue(io_replaceInFile($file, "Delete\012", "Delete\\00\012", false, -1));
         $this->assertEquals("The\012Delete\\00\012Delete\\00\012Delete01\012Delete02\012Delete\\00\012DeleteX\012Test\012", io_readFile($file), "Edge case: backreference like construct in replacement line");
     }
     /**
+     * Test with replace all where replacement line == search line - must not timeout
+     *
      * @small
      */
     function test_edgecase2() {
         $file = TMP_DIR.'/test.txt';
-        // Replace all, no regex, replacement line == search line
+
         io_saveFile($file, $this->contents);
         $this->assertTrue(io_replaceInFile($file, "Delete\012", "Delete\012", false, -1));
         $this->assertEquals("The\012Delete\012Delete\012Delete01\012Delete02\012Delete\012DeleteX\012Test\012", io_readFile($file), "Edge case: new line the same as old line");
     }
 
     /**
-     *
+     *    Test where $oldline exactly matches one line and also matches part of other lines - only the exact match should be replaced
      */
     function test_edgecase3()
     {
         $file = TMP_DIR . '/test.txt';
         $contents = "The\012Delete\01201Delete\01202Delete\012Test\012";
-        // Replace all, no regex, oldline exactly matches one line; matches part of other lines - only the exact match should be replaced
+
         io_saveFile($file, $contents);
         $this->assertTrue(io_replaceInFile($file, "Delete\012", "Replace\012", false, -1));
         $this->assertEquals("The\012Replace\01201Delete\01202Delete\012Test\012", io_readFile($file), "Edge case: old line is a match for parts of other lines");
diff --git a/inc/io.php b/inc/io.php
index c559feb17..4c7fb094f 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -324,14 +324,14 @@ function io_replaceInFile($file, $oldline, $newline, $regex=false, $maxlines=0)
             $lines[$i] = preg_replace($pattern, $replace, $line, -1, $matched);
             if ($matched) $count++;
         }
-    } else {
-        $lines = ($maxlines == 0) ?
-            preg_grep($pattern, $lines, PREG_GREP_INVERT) :
-            preg_replace($pattern, $replace, $lines);
-    }
+    } else if ($maxlines == 0) {
+        $lines = preg_grep($pattern, $lines, PREG_GREP_INVERT);
 
-    if($maxlines == 0 && ((string)$newline) !== '') {
-        $lines[] = $newline;
+        if ((string)$newline !== ''){
+            $lines[] = $newline;
+        }
+    } else {
+        $lines = preg_replace($pattern, $replace, $lines);
     }
 
     if(count($lines)){
-- 
cgit v1.2.3


From dc4a4eb00d67d7d28fae137437900220920577d4 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Fri, 29 May 2015 15:38:43 -0400
Subject: Abort io_replaceInLine when the search parameter is empty

---
 _test/tests/inc/io_replaceinfile.test.php | 11 +++++++++++
 inc/io.php                                |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/_test/tests/inc/io_replaceinfile.test.php b/_test/tests/inc/io_replaceinfile.test.php
index 597138a20..452ed7401 100644
--- a/_test/tests/inc/io_replaceinfile.test.php
+++ b/_test/tests/inc/io_replaceinfile.test.php
@@ -94,4 +94,15 @@ class io_replaceinfile_test extends DokuWikiTest {
         $this->assertTrue(io_replaceInFile($file, "Delete\012", "Replace\012", false, -1));
         $this->assertEquals("The\012Replace\01201Delete\01202Delete\012Test\012", io_readFile($file), "Edge case: old line is a match for parts of other lines");
     }
+
+    /**
+     * Test passing an invalid parameter.
+     *
+     * @expectedException PHPUnit_Framework_Error_Warning
+     */
+    function test_badparam()
+    {
+        /* The empty $oldline parameter should be caught before the file doesn't exist test. */
+        $this->assertFalse(io_replaceInFile(TMP_DIR.'/not_existing_file.txt', '', '', false, 0));
+    }
 }
diff --git a/inc/io.php b/inc/io.php
index 4c7fb094f..6d3c20047 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -298,6 +298,11 @@ function io_saveFile($file, $content, $append=false) {
  * @return bool true on success
  */
 function io_replaceInFile($file, $oldline, $newline, $regex=false, $maxlines=0) {
+    if ((string)$oldline === '') {
+        trigger_error('$oldline parameter cannot be empty in io_replaceInFile()', E_USER_WARNING);
+        return false;
+    }
+
     if (!file_exists($file)) return true;
 
     io_lock($file);
-- 
cgit v1.2.3


From d93ba631117932f06b44535a9d6256cc8e9c4b90 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Fri, 29 May 2015 15:46:19 -0400
Subject: Rephrase description of io_replaceInFiles to be clarify use of regex

---
 inc/io.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/inc/io.php b/inc/io.php
index 6d3c20047..9be648824 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -276,12 +276,14 @@ function io_saveFile($file, $content, $append=false) {
 /**
  * Replace one or more occurrences of a line in a file.
  *
- * The default, when $maxlines is 0 is to delete all matches then append a single line.
- * If $maxlines is -1, then every $oldline will be replaced with $newline, and $regex is true
- * then preg captures are used. If $maxlines is greater than 0 then the first $maxlines
- * matches are replaced with $newline.
+ * The default, when $maxlines is 0 is to delete all matching lines then append a single line.
+ * A regex that matches any part of the line will remove the entire line in this mode.
+ * Captures in $newline are not available.
  *
- * Be sure to include the trailing newline in $oldline
+ * Otherwise each line is matched and replaced individually, up to the first $maxlines lines
+ * or all lines if $maxlines is -1. If $regex is true then captures can be used in $newline.
+ *
+ * Be sure to include the trailing newline in $oldline when replacing entire lines.
  *
  * Uses gzip if extension is .gz
  * and bz2 if extension is .bz2
-- 
cgit v1.2.3


From 9725524bfea8db551f8627c74317d2d35bc8fd60 Mon Sep 17 00:00:00 2001
From: Pavel <pavelholovko@yandex.ru>
Date: Sun, 31 May 2015 10:20:51 +0200
Subject: translation update

---
 inc/lang/uk/lang.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index 173b844fc..52edaafda 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -11,6 +11,7 @@
  * @author Kate Arzamastseva pshns@ukr.net
  * @author Egor Smkv <egorsmkv@gmail.com>
  * @author Max Lyashuk <m_lyashuk@ukr.net>
+ * @author Pavel <pavelholovko@yandex.ru>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -55,6 +56,7 @@ $lang['btn_apply']             = 'Застосувати';
 $lang['btn_media']             = 'Керування медіа-файлами';
 $lang['btn_deleteuser']        = 'Видалити мій аккаунт';
 $lang['btn_img_backto']        = 'Повернутися до %s';
+$lang['btn_mediaManager']      = 'Показати в медіа менеджері';
 $lang['loggedinas']            = 'Ви:';
 $lang['user']                  = 'Користувач';
 $lang['pass']                  = 'Пароль';
@@ -75,6 +77,7 @@ $lang['regmissing']            = 'Необхідно заповнити всі 
 $lang['reguexists']            = 'Користувач з таким іменем вже існує.';
 $lang['regsuccess']            = 'Користувача створено. Пароль відправлено на e-mail.';
 $lang['regsuccess2']           = 'Користувача створено.';
+$lang['regfail']               = 'Користувач не створений';
 $lang['regmailfail']           = 'При відправленні пароля сталась помилка. Зв’яжіться з адміністратором!';
 $lang['regbadmail']            = 'Схоже, що адреса e-mail невірна - якщо ви вважаєте, що це помилка, зв’яжіться з адміністратором';
 $lang['regbadpass']            = 'Надані паролі не співпадають, спробуйте ще раз.';
@@ -298,3 +301,10 @@ $lang['hours']                 = '%d годин тому';
 $lang['minutes']               = '%d хвилин тому';
 $lang['seconds']               = '%d секунд тому';
 $lang['wordblock']             = 'Ваші зміни не збережено, тому що вони розпізнані як такі, що містять заблокований текст(спам).';
+$lang['media_searchtab']       = 'Пошук';
+$lang['media_file']            = 'Файл';
+$lang['media_viewtab']         = 'Огляд';
+$lang['media_edittab']         = 'Редагувати';
+$lang['media_historytab']      = 'Історія';
+$lang['media_sort_name']       = 'Ім’я';
+$lang['media_sort_date']       = 'Дата';
-- 
cgit v1.2.3


From 9b886e96727c001a7e749f0fc3509eaaeb1bc39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lker=20R=2E=20Kapa=C3=A7?= <irifat@gmail.com>
Date: Thu, 4 Jun 2015 10:41:00 +0200
Subject: translation update

---
 inc/lang/tr/lang.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index ff7a73eea..6b4315c7c 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -73,11 +73,12 @@ $lang['badpassconfirm']        = 'Üzgünüz, parolanız yanlış';
 $lang['minoredit']             = 'Küçük Değişiklikler';
 $lang['draftdate']             = 'Taslak şu saatte otomatik kaydedildi:';
 $lang['nosecedit']             = 'Sayfa yakın zamanda değiştirilmiştir, bölüm bilgisi eski kalmıştır. Bunun için bölüm yerine tüm sayfa yüklenmiştir.';
-$lang['searchcreatepage']      = "Aradığınız şeyi bulamadıysanız, ''Sayfayı değiştir'' tuşuna tıklayarak girdiğiniz sorgu adıyla yeni bir sayfa oluşturabilirsiniz .";
+$lang['searchcreatepage']      = 'Aradığınız şeyi bulamadıysanız, \'\'Sayfayı değiştir\'\' tuşuna tıklayarak girdiğiniz sorgu adıyla yeni bir sayfa oluşturabilirsiniz .';
 $lang['regmissing']            = 'Üzgünüz, tüm alanları doldurmalısınız.';
 $lang['reguexists']            = 'Üzgünüz, bu isime sahip bir kullanıcı zaten mevcut.';
 $lang['regsuccess']            = 'Kullanıcı oluşturuldu ve şifre e-posta adresine gönderildi.';
 $lang['regsuccess2']           = 'Kullanıcı oluşturuldu.';
+$lang['regfail']               = 'Kullanıcı oluşturulamadı.';
 $lang['regmailfail']           = 'Şifrenizi e-posta ile gönderirken bir hata oluşmuş gibi görünüyor. Lütfen yönetici ile temasa geçiniz!';
 $lang['regbadmail']            = 'Verilen e-posta adresi geçersiz gibi görünüyor - bunun bir hata olduğunu düşünüyorsanız yönetici ile temasa geçiniz.';
 $lang['regbadpass']            = 'Girilen parolalar aynı değil. Lütfen tekrar deneyiniz.';
@@ -92,6 +93,7 @@ $lang['profdeleteuser']        = 'Hesabı Sil';
 $lang['profdeleted']           = 'Bu wiki\'den hesabınız silindi';
 $lang['profconfdelete']        = 'Bu wiki\'den hesabımı silmek istiyorum. <br/>Bu işlem geri alınamaz';
 $lang['profconfdeletemissing'] = 'Onay kutusu işaretlenmedi';
+$lang['proffail']              = 'Kullanıcı bilgileri güncellenmedi.';
 $lang['pwdforget']             = 'Parolanızı mı unuttunuz? Yeni bir parola alın';
 $lang['resendna']              = 'Bu wiki parolayı tekrar göndermeyi desteklememektedir.';
 $lang['resendpwd']             = 'İçin yeni şifre belirle';
@@ -184,6 +186,7 @@ $lang['diff']                  = 'Kullanılan sürüm ile farkları göster';
 $lang['diff2']                 = 'Seçili sürümler arasındaki farkı göster';
 $lang['difflink']              = 'Karşılaştırma görünümüne bağlantı';
 $lang['diff_type']             = 'farklı görünüş';
+$lang['diff_inline']           = 'Satır içi';
 $lang['diff_side']             = 'Yan yana';
 $lang['diffprevrev']           = 'Önceki sürüm';
 $lang['diffnextrev']           = 'Sonraki sürüm';
@@ -257,6 +260,14 @@ $lang['img_camera']            = 'Fotoğraf Makinası:';
 $lang['img_keywords']          = 'Anahtar Sözcükler:';
 $lang['img_width']             = 'Genişlik:';
 $lang['img_height']            = 'Yükseklik:';
+$lang['subscr_subscribe_success'] = '%s,  %s için abonelik listesine eklendi.';
+$lang['subscr_subscribe_error'] = '%s, %s için abonelik listesine eklenirken hata ile karşılaşıldı.';
+$lang['subscr_subscribe_noaddress'] = 'Oturum bilginiz ile ilişkilendirilmiş bir adres olmadığı için abonelik listesine dahil olamazsınız.';
+$lang['subscr_unsubscribe_success'] = '%s,  %s için abonelik listesinden çıkarıldı.';
+$lang['subscr_unsubscribe_error'] = '%s, %s için abonelik listesinden çıkarılırken hata ile karşılaşıldı.';
+$lang['subscr_already_subscribed'] = '%s zaten %s listesine abone.';
+$lang['subscr_not_subscribed'] = '%s, %s listesine abone değil.';
+$lang['subscr_m_not_subscribed'] = 'Bu sayfa veya isim alanına (namespace) abone değilsiniz.  ';
 $lang['subscr_m_new_header']   = 'Üyelik ekle';
 $lang['subscr_m_current_header'] = 'Üyeliğini onayla';
 $lang['subscr_m_unsubscribe']  = 'Üyelik iptali';
@@ -273,6 +284,7 @@ $lang['i_problems']            = 'Kurulum sihirbazı aşağıda gösterilen soru
 $lang['i_modified']            = 'Güzenlik sebebiyle bu script sadece yeni ve değiştirilmemiş bir Dokuwiki kurulumunda çalışır. Ya indirdiğiniz paketi yeniden açmalı ya da <a href="http://dokuwiki.org/install"> adresindeki Dokuwiki kurulum kılavuzu</a>na bakmalısınız.';
 $lang['i_funcna']              = '<code>%s</code> PHP fonksiyonu bulunmamaktadır. Barındırma(Hosting) hizmetinde bu özellik kapatılmış olabilir.';
 $lang['i_phpver']              = '<code>%s</code> PHP sürümü, gereken <code>%s</code>  sürümünden daha düşük. PHP kurulumunu yükseltmeniz gerekmektedir.';
+$lang['i_mbfuncoverload']      = 'DokuWiki\'nin çalışması için php.ini dosyasında mbstring.func_overload seçeneği kapalı (değeri 0) olarak ayarlanmalıdır.';
 $lang['i_permfail']            = '<code>%s</code> Dokuwiki tarafından yazılabilir değil. İzin ayarlarını bu klasör için düzeltmeniz gerekmektedir!';
 $lang['i_confexists']          = '<code>%s</code> zaten var';
 $lang['i_writeerr']            = '<code>%s</code> oluşturulamadı. Dosya/Klasör izin ayarlarını gözden geçirip dosyayı elle oluşturmalısınız.';
-- 
cgit v1.2.3


From 6a7af1ccf98fac8f5dd1097f5d4978df562a5d02 Mon Sep 17 00:00:00 2001
From: Hendrik Diel <diel.hendrik@gmail.com>
Date: Sun, 7 Jun 2015 10:46:45 +0200
Subject: translation update

---
 inc/lang/de/lang.php                   | 3 +++
 lib/plugins/authmysql/lang/de/lang.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index f435a31bf..d74f66149 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -28,6 +28,7 @@
  * @author Hoisl <hoisl@gmx.at>
  * @author Marcel Eickhoff <eickhoff.marcel@gmail.com>
  * @author Pascal Schröder <Pascal1802@gmail.com>
+ * @author Hendrik Diel <diel.hendrik@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -93,6 +94,7 @@ $lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden.';
 $lang['reguexists']            = 'Der Benutzername existiert leider schon.';
 $lang['regsuccess']            = 'Der neue Benutzer wurde angelegt und das Passwort per E-Mail versandt.';
 $lang['regsuccess2']           = 'Der neue Benutzer wurde angelegt.';
+$lang['regfail']               = 'Der Benutzer konnte nicht angelegt werden.';
 $lang['regmailfail']           = 'Offenbar ist ein Fehler beim Versenden der Passwort-E-Mail aufgetreten. Bitte wenden Sie sich an den Wiki-Admin.';
 $lang['regbadmail']            = 'Die angegebene E-Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wenden Sie sich bitte an den Wiki-Admin.';
 $lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuchen Sie es noch einmal.';
@@ -107,6 +109,7 @@ $lang['profdeleteuser']        = 'Benutzerprofil löschen';
 $lang['profdeleted']           = 'Ihr Benutzerprofil wurde im Wiki gelöscht.';
 $lang['profconfdelete']        = 'Ich möchte mein Benutzerprofil löschen.<br/> Diese Aktion ist nicht umkehrbar.';
 $lang['profconfdeletemissing'] = 'Bestätigungs-Checkbox wurde nicht angehakt.';
+$lang['proffail']              = 'Das Benutzerkonto konnte nicht aktualisiert werden.';
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
 $lang['resendpwd']             = 'Neues Passwort setzen für';
diff --git a/lib/plugins/authmysql/lang/de/lang.php b/lib/plugins/authmysql/lang/de/lang.php
index 6160f60ea..819b98458 100644
--- a/lib/plugins/authmysql/lang/de/lang.php
+++ b/lib/plugins/authmysql/lang/de/lang.php
@@ -4,5 +4,8 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Noel Tilliot <noeltilliot@byom.de>
+ * @author Hendrik Diel <diel.hendrik@gmail.com>
  */
+$lang['userexists']            = 'Entschuldigung, aber dieser Benutzername ist bereits vergeben.';
 $lang['usernotexists']         = 'Sorry, dieser Nutzer existiert nicht.';
+$lang['writefail']             = 'Die Benutzerdaten konnten nicht geändert werden. Bitte wenden Sie sich an den Wiki-Admin.';
-- 
cgit v1.2.3


From e596bf92c4429edfcae42012e2a3507be9e9bbe9 Mon Sep 17 00:00:00 2001
From: hyeonsoft <hyeonsoft@live.co.kr>
Date: Thu, 11 Jun 2015 12:01:03 +0200
Subject: translation update

---
 inc/lang/ko/lang.php                   |  3 +++
 lib/plugins/authmysql/lang/ko/lang.php | 11 +++++++++++
 lib/plugins/extension/lang/ko/lang.php |  4 ++++
 3 files changed, 18 insertions(+)
 create mode 100644 lib/plugins/authmysql/lang/ko/lang.php

diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index c9b72197b..b46abf5d1 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -13,6 +13,7 @@
  * @author Gerrit Uitslag <klapinklapin@gmail.com>
  * @author Garam <rowain8@gmail.com>
  * @author Young gon Cha <garmede@gmail.com>
+ * @author hyeonsoft <hyeonsoft@live.co.kr>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -78,6 +79,7 @@ $lang['regmissing']            = '죄송하지만 모든 필드를 채워야 합
 $lang['reguexists']            = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.';
 $lang['regsuccess']            = '사용자를 만들었으며 비밀번호는 이메일로 보냈습니다.';
 $lang['regsuccess2']           = '사용자를 만들었습니다.';
+$lang['regfail']               = '사용자 계정이 만들어지지 않았습니다.';
 $lang['regmailfail']           = '비밀번호를 이메일로 보내는 동안 오류가 발생했습니다. 관리자에게 문의해주세요!';
 $lang['regbadmail']            = '주어진 이메일 주소가 잘못되었습니다 - 오류라고 생각하면 관리자에게 문의해주세요';
 $lang['regbadpass']            = '두 주어진 비밀번호가 같지 않습니다. 다시 입력하세요.';
@@ -92,6 +94,7 @@ $lang['profdeleteuser']        = '계정 삭제';
 $lang['profdeleted']           = '당신의 사용자 계정이 이 위키에서 삭제되었습니다';
 $lang['profconfdelete']        = '이 위키에서 내 계정을 제거하고 싶습니다. <br/> 이 행동은 되돌릴 수 없습니다.';
 $lang['profconfdeletemissing'] = '선택하지 않은 확인 상자를 확인';
+$lang['proffail']              = '사용자 설정이 업데이트되지 않았습니다.';
 $lang['pwdforget']             = '비밀번호를 잊으셨나요? 비밀번호를 재설정하세요';
 $lang['resendna']              = '이 위키는 비밀번호 재설정을 지원하지 않습니다.';
 $lang['resendpwd']             = '다음으로 새 비밀번호 보내기';
diff --git a/lib/plugins/authmysql/lang/ko/lang.php b/lib/plugins/authmysql/lang/ko/lang.php
new file mode 100644
index 000000000..a2ad278c1
--- /dev/null
+++ b/lib/plugins/authmysql/lang/ko/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author hyeonsoft <hyeonsoft@live.co.kr>
+ */
+$lang['connectfail']           = '데이터베이스에 연결하는 데 실패했습니다.';
+$lang['userexists']            = '이 계정으로 이미 로그인 된 사용자가 있습니다.';
+$lang['usernotexists']         = '이 계정은 존재하지 않습니다.';
+$lang['writefail']             = '사용자 데이터를 수정할 수 없습니다. 관리자에게 문의하십시오.';
diff --git a/lib/plugins/extension/lang/ko/lang.php b/lib/plugins/extension/lang/ko/lang.php
index 5dc5d8269..3de28c0c8 100644
--- a/lib/plugins/extension/lang/ko/lang.php
+++ b/lib/plugins/extension/lang/ko/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Young gon Cha <garmede@gmail.com>
  * @author Myeongjin <aranet100@gmail.com>
+ * @author hyeonsoft <hyeonsoft@live.co.kr>
  */
 $lang['menu']                  = '확장 기능 관리자';
 $lang['tab_plugins']           = '설치된 플러그인';
@@ -26,6 +27,9 @@ $lang['btn_disable']           = '비활성화';
 $lang['btn_install']           = '설치';
 $lang['btn_reinstall']         = '다시 설치';
 $lang['js']['reallydel']       = '정말 이 확장 기능을 제거하겠습니까?';
+$lang['js']['display_viewoptions'] = '보기 옵션:';
+$lang['js']['display_enabled'] = '켜짐';
+$lang['js']['display_disabled'] = '꺼짐';
 $lang['search_for']            = '확장 기능 검색:';
 $lang['search']                = '검색';
 $lang['extensionby']           = '<strong>%s</strong> (저자 %s)';
-- 
cgit v1.2.3


From 98e550d66d125f8f445387a1b7f66446fb684421 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 13 Jun 2015 14:20:39 +0900
Subject: change two spaces to a space

In line 5 and 6, Message have two spaces, so I change them to a space.
---
 lib/plugins/usermanager/lang/en/import.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/usermanager/lang/en/import.txt b/lib/plugins/usermanager/lang/en/import.txt
index 360a0689b..3a1cf999e 100644
--- a/lib/plugins/usermanager/lang/en/import.txt
+++ b/lib/plugins/usermanager/lang/en/import.txt
@@ -2,8 +2,8 @@
 
 Requires a CSV file of users with at least four columns.
 The columns must contain, in order: user-id, full name, email address and groups.
-The CSV fields should be separated by commas (,) and strings delimited by quotation marks (%%""%%).  Backslash (\) can be used for escaping.
-For an example of a suitable file, try the "Export Users" function above.  
+The CSV fields should be separated by commas (,) and strings delimited by quotation marks (%%""%%). Backslash (\) can be used for escaping.
+For an example of a suitable file, try the "Export Users" function above.
 Duplicate user-ids will be ignored.
 
 A password will be generated and emailed to each successfully imported user.
-- 
cgit v1.2.3


From 11fcf0d8b9dbb221912cd2c4a487a31f0afb0395 Mon Sep 17 00:00:00 2001
From: Maurizio <mcannavo@katamail.com>
Date: Sun, 14 Jun 2015 19:46:30 +0200
Subject: translation update

---
 inc/lang/it/lang.php                            |  1 +
 lib/plugins/authmysql/lang/it/settings.php      |  2 ++
 lib/plugins/authpgsql/lang/it/settings.php      |  3 +++
 lib/plugins/extension/lang/it/intro_install.txt |  1 +
 lib/plugins/extension/lang/it/intro_plugins.txt |  1 +
 lib/plugins/extension/lang/it/lang.php          | 27 +++++++++++++++++++++++++
 6 files changed, 35 insertions(+)
 create mode 100644 lib/plugins/extension/lang/it/intro_install.txt
 create mode 100644 lib/plugins/extension/lang/it/intro_plugins.txt

diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index a7da52935..b84c4d7d8 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -21,6 +21,7 @@
  * @author Francesco <francesco.cavalli@hotmail.com>
  * @author Fabio <fabioslurp@yahoo.it>
  * @author Torpedo <dgtorpedo@gmail.com>
+ * @author Maurizio <mcannavo@katamail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/authmysql/lang/it/settings.php b/lib/plugins/authmysql/lang/it/settings.php
index 10c0de96f..9dc1a0157 100644
--- a/lib/plugins/authmysql/lang/it/settings.php
+++ b/lib/plugins/authmysql/lang/it/settings.php
@@ -6,6 +6,7 @@
  * @author Claudio Lanconelli <lancos@libero.it>
  * @author Mirko <malisan.mirko@gmail.com>
  * @author Francesco <francesco.cavalli@hotmail.com>
+ * @author Maurizio <mcannavo@katamail.com>
  */
 $lang['server']                = 'Il tuo server MySQL';
 $lang['user']                  = 'User name di MySQL';
@@ -17,6 +18,7 @@ $lang['checkPass']             = 'Istruzione SQL per il controllo password';
 $lang['getUserInfo']           = 'Istruzione SQL per recuperare le informazioni utente';
 $lang['getUsers']              = 'Istruzione SQL per listare tutti gli utenti';
 $lang['FilterLogin']           = 'Istruzione SQL per per filtrare gli utenti in funzione del "login name"';
+$lang['FilterGroup']           = 'Clausola SQL per filtrare gli utenti in base all\'appartenenza al gruppo';
 $lang['SortOrder']             = 'Istruzione SQL per ordinare gli utenti';
 $lang['addUser']               = 'Istruzione SQL per aggiungere un nuovo utente';
 $lang['addGroup']              = 'Istruzione SQL per aggiungere un nuovo gruppo';
diff --git a/lib/plugins/authpgsql/lang/it/settings.php b/lib/plugins/authpgsql/lang/it/settings.php
index e8a40dcb2..bc326b34f 100644
--- a/lib/plugins/authpgsql/lang/it/settings.php
+++ b/lib/plugins/authpgsql/lang/it/settings.php
@@ -5,9 +5,12 @@
  * 
  * @author Francesco <francesco.cavalli@hotmail.com>
  * @author Torpedo <dgtorpedo@gmail.com>
+ * @author Maurizio <mcannavo@katamail.com>
  */
 $lang['server']                = 'Il tuo server PostgreSQL ';
 $lang['port']                  = 'La porta del tuo server PostgreSQL ';
 $lang['user']                  = 'Lo username PostgreSQL';
+$lang['password']              = 'Password dell\'utente summenzionato';
 $lang['database']              = 'Database da usare';
+$lang['debug']                 = 'Visualizza informazioni addizionali di debug';
 $lang['getUsers']              = 'Dichiarazione SQL per elencare tutti gli utenti';
diff --git a/lib/plugins/extension/lang/it/intro_install.txt b/lib/plugins/extension/lang/it/intro_install.txt
new file mode 100644
index 000000000..5106500ba
--- /dev/null
+++ b/lib/plugins/extension/lang/it/intro_install.txt
@@ -0,0 +1 @@
+Qui potete installare manualmente plugin e template, sia caricandoli in upload sia fornendo una URL per scaricarli direttamente.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/it/intro_plugins.txt b/lib/plugins/extension/lang/it/intro_plugins.txt
new file mode 100644
index 000000000..cd7825fb2
--- /dev/null
+++ b/lib/plugins/extension/lang/it/intro_plugins.txt
@@ -0,0 +1 @@
+Questi sono i plugin attualmente installati nel vostro DokuWiki. Qui potete abilitarli o disabilitarli o addirittura disinstallarli completamente. Qui sono mostrati anche gli aggiornamenti dei plugin, assicurativi di leggere la relativa documentazione prima di aggiornarli.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/it/lang.php b/lib/plugins/extension/lang/it/lang.php
index 1aa658e0f..80ed0ddcf 100644
--- a/lib/plugins/extension/lang/it/lang.php
+++ b/lib/plugins/extension/lang/it/lang.php
@@ -6,7 +6,18 @@
  * @author Francesco <francesco.cavalli@hotmail.com>
  * @author Fabio <fabioslurp@yahoo.it>
  * @author Torpedo <dgtorpedo@gmail.com>
+ * @author Maurizio <mcannavo@katamail.com>
  */
+$lang['menu']                  = 'Manager delle Extension';
+$lang['tab_plugins']           = 'Plugin Installati';
+$lang['tab_templates']         = 'Template Installati';
+$lang['tab_search']            = 'Ricerca e Installazione';
+$lang['tab_install']           = 'Installazione Manuale';
+$lang['notimplemented']        = 'Questa funzionalità non è ancora stata implementata';
+$lang['notinstalled']          = 'Questa extension non è installata';
+$lang['alreadyenabled']        = 'Questa extension è già stata abilitata';
+$lang['alreadydisabled']       = 'Questa extension à già stata disabilitata';
+$lang['pluginlistsaveerror']   = 'Si è verificato un errore durante il salvataggio dell\'elenco dei plugin';
 $lang['unknownauthor']         = 'Autore sconosciuto';
 $lang['unknownversion']        = 'Revisione sconosciuta';
 $lang['btn_info']              = 'Mostra maggiori informazioni';
@@ -17,7 +28,14 @@ $lang['btn_disable']           = 'Disabilita';
 $lang['btn_install']           = 'Installa';
 $lang['btn_reinstall']         = 'Reinstalla';
 $lang['js']['reallydel']       = 'Sicuro di disinstallare questa estensione?';
+$lang['js']['display_viewoptions'] = 'Opzioni di Visualizzazione:';
+$lang['js']['display_enabled'] = 'abilitato';
+$lang['js']['display_disabled'] = 'disabilitato';
+$lang['js']['display_updatable'] = 'aggiornabile';
+$lang['search_for']            = 'Extension di Ricerca:';
 $lang['search']                = 'Cerca';
+$lang['screenshot']            = 'Screenshot di %s';
+$lang['popularity']            = 'Popolarità: %s%%';
 $lang['homepage_link']         = 'Documenti';
 $lang['bugs_features']         = 'Bug';
 $lang['tags']                  = 'Tag:';
@@ -46,9 +64,13 @@ $lang['status_disabled']       = 'disabilitato';
 $lang['status_unmodifiable']   = 'inmodificabile';
 $lang['status_plugin']         = 'plugin';
 $lang['status_template']       = 'modello';
+$lang['status_bundled']        = 'accoppiato';
 $lang['msg_enabled']           = 'Plugin %s abilitato';
 $lang['msg_disabled']          = 'Plugin %s disabilitato';
 $lang['msg_delete_success']    = 'Estensione %s disinstallata';
+$lang['msg_delete_failed']     = 'Disinstallazione dell\'Extension %s fallita';
+$lang['msg_template_install_success'] = 'Il template %s è stato installato correttamente';
+$lang['msg_template_update_success'] = 'Il Template %s è stato aggiornato correttamente';
 $lang['msg_plugin_install_success'] = 'Plugin %s installato con successo';
 $lang['msg_plugin_update_success'] = 'Plugin %s aggiornato con successo';
 $lang['msg_upload_failed']     = 'Caricamento del file fallito';
@@ -58,7 +80,12 @@ $lang['wrong_folder']          = '<strong>Plugin non installato correttamente:</
 $lang['error_badurl']          = 'URLs deve iniziare con http o https';
 $lang['error_dircreate']       = 'Impossibile creare una cartella temporanea per ricevere il download';
 $lang['error_download']        = 'Impossibile scaricare il file: %s';
+$lang['error_decompress']      = 'Impossibile decomprimere il file scaricato. Ciò può dipendere da errori in fase di download, nel qual caso dovreste ripetere l\'operazione; oppure il formato di compressione è sconosciuto, e in questo caso dovrete scaricare e installare manualmente.';
+$lang['error_findfolder']      = 'Impossibile identificare la directory dell\'extension, dovrete scaricare e installare manualmente';
 $lang['noperms']               = 'La directory Extension non è scrivibile';
 $lang['notplperms']            = 'Il modello di cartella non è scrivibile';
 $lang['nopluginperms']         = 'La cartella plugin non è scrivibile';
+$lang['git']                   = 'Questa extension è stata installata da git, potreste non volerla aggiornare qui.';
 $lang['install_url']           = 'Installa da URL:';
+$lang['install_upload']        = 'Caricamento Extension:';
+$lang['repo_error']            = 'Il repository dei plugin non può essere raggiunto. Assicuratevi che il vostro server sia abilitato a contattare l\'indirizzo www.dokuwiki.org e controllate le impostazioni del vostro proxy.';
-- 
cgit v1.2.3


From 0c43e7198c135083b88bdad3dd7876a8ff8a2870 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 15 Jun 2015 21:13:39 +0200
Subject: Replace old constructor call by __construct() in
 dokuwiki_xmlrpc_server

---
 lib/exe/xmlrpc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index 61a68281f..6a0163106 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -20,7 +20,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server {
         $this->remote = new RemoteAPI();
         $this->remote->setDateTransformation(array($this, 'toDate'));
         $this->remote->setFileTransformation(array($this, 'toFile'));
-        $this->IXR_Server();
+        parent::__construct();
     }
 
     /**
-- 
cgit v1.2.3


From 53a0b3d1d10308129a557367e22069517b33ec97 Mon Sep 17 00:00:00 2001
From: Nolf <m.kopachovets@gmail.com>
Date: Thu, 18 Jun 2015 11:11:10 +0200
Subject: translation update

---
 inc/lang/ru/lang.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 7ca9fb8b3..3a1fb2c56 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -30,6 +30,7 @@
  * @author Type-kun <workwork-1@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
  * @author Alex P <alexander@lanos.co.uk>
+ * @author Nolf <m.kopachovets@gmail.com>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
@@ -95,6 +96,7 @@ $lang['regmissing']            = 'Извините, вам следует зап
 $lang['reguexists']            = 'Извините, пользователь с таким логином уже существует.';
 $lang['regsuccess']            = 'Пользователь создан; пароль выслан на адрес электронной почты.';
 $lang['regsuccess2']           = 'Пользователь создан.';
+$lang['regfail']               = 'Пользователь не может быть создан.';
 $lang['regmailfail']           = 'Похоже есть проблема с отправкой пароля по почте. Пожалуйста, сообщите об этом администратору.';
 $lang['regbadmail']            = 'Данный вами адрес электронной почты выглядит неправильным. Если вы считаете это ошибкой, сообщите администратору.';
 $lang['regbadpass']            = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.';
@@ -109,6 +111,7 @@ $lang['profdeleteuser']        = 'Удалить аккаунт';
 $lang['profdeleted']           = 'Ваш аккаунт был удален из этой вики';
 $lang['profconfdelete']        = 'Я хочу удалить свой аккаунт из этой вики. <br /> Это действие необратимо.';
 $lang['profconfdeletemissing'] = 'Флажок подтверждения не установлен';
+$lang['proffail']              = 'Профиль пользователя не был обновлен.';
 $lang['pwdforget']             = 'Забыли пароль? Получите новый';
 $lang['resendna']              = 'Данная вики не поддерживает повторную отправку пароля.';
 $lang['resendpwd']             = 'Установить новый пароль для';
@@ -356,6 +359,7 @@ $lang['media_perm_read']       = 'Извините, у вас недостато
 $lang['media_perm_upload']     = 'Извините, у вас недостаточно прав для загрузки файлов.';
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
+$lang['media_acl_warning']     = 'Этот список может быть неполным из-за ACL ограничений и скрытых страниц.';
 $lang['currentns']             = 'Текущее пространство имён';
 $lang['searchresult']          = 'Результаты поиска';
 $lang['plainhtml']             = 'Простой HTML';
-- 
cgit v1.2.3


From 4bad992bd96f3715e50bb0fa39020badd708da8b Mon Sep 17 00:00:00 2001
From: Sri Saravana <saravanamuthaly@gmail.com>
Date: Fri, 26 Jun 2015 03:30:12 +0200
Subject: translation update

---
 inc/lang/ta/admin.txt        |  3 +++
 inc/lang/ta/adminplugins.txt |  1 +
 inc/lang/ta/backlinks.txt    |  3 +++
 inc/lang/ta/conflict.txt     |  3 +++
 inc/lang/ta/diff.txt         |  3 +++
 inc/lang/ta/draft.txt        |  1 +
 inc/lang/ta/edit.txt         |  1 +
 inc/lang/ta/lang.php         | 18 ++++++++++++++++++
 8 files changed, 33 insertions(+)
 create mode 100644 inc/lang/ta/admin.txt
 create mode 100644 inc/lang/ta/adminplugins.txt
 create mode 100644 inc/lang/ta/backlinks.txt
 create mode 100644 inc/lang/ta/conflict.txt
 create mode 100644 inc/lang/ta/diff.txt
 create mode 100644 inc/lang/ta/draft.txt
 create mode 100644 inc/lang/ta/edit.txt

diff --git a/inc/lang/ta/admin.txt b/inc/lang/ta/admin.txt
new file mode 100644
index 000000000..2538b4569
--- /dev/null
+++ b/inc/lang/ta/admin.txt
@@ -0,0 +1,3 @@
+====== நிர்வாகம் ======
+
+கீழே டோகுவிக்கியின் நிர்வாகம் தொடர்பான முறைமைகளைப் பார்க்கலாம்.
\ No newline at end of file
diff --git a/inc/lang/ta/adminplugins.txt b/inc/lang/ta/adminplugins.txt
new file mode 100644
index 000000000..54a363a8a
--- /dev/null
+++ b/inc/lang/ta/adminplugins.txt
@@ -0,0 +1 @@
+===== மேலதிக சொருகிகள் =====
\ No newline at end of file
diff --git a/inc/lang/ta/backlinks.txt b/inc/lang/ta/backlinks.txt
new file mode 100644
index 000000000..d8e618fc0
--- /dev/null
+++ b/inc/lang/ta/backlinks.txt
@@ -0,0 +1,3 @@
+====== பின்னிணைப்புக்கள் ======
+
+குறித்த பக்கத்திற்கான இணைப்பைக் கொண்டிருக்கும் அனைத்துப் பக்கங்களும்
\ No newline at end of file
diff --git a/inc/lang/ta/conflict.txt b/inc/lang/ta/conflict.txt
new file mode 100644
index 000000000..301c2f07a
--- /dev/null
+++ b/inc/lang/ta/conflict.txt
@@ -0,0 +1,3 @@
+====== புதிய பதிப்பு உண்டு ======
+
+நீங்கள் திருத்திய பக்கத்திற்கு புதிய பதிப்பு உருவாகியுள்ளது. நீங்கள் குறித்த பக்கத்தை திருத்தும் போது, இன்னுமொரு பயனர் அதே பக்கத்தைத் திருத்தினால் இப்படி ஏற்பட வாய்ப்புண்டு.
\ No newline at end of file
diff --git a/inc/lang/ta/diff.txt b/inc/lang/ta/diff.txt
new file mode 100644
index 000000000..bbc287676
--- /dev/null
+++ b/inc/lang/ta/diff.txt
@@ -0,0 +1,3 @@
+====== வேறுபாடுகள் ======
+
+குறித்த பக்கத்திற்கான இருவேறுபட்ட மாறுதல்களைக்  காட்டுகின்றது.
\ No newline at end of file
diff --git a/inc/lang/ta/draft.txt b/inc/lang/ta/draft.txt
new file mode 100644
index 000000000..2bb89219d
--- /dev/null
+++ b/inc/lang/ta/draft.txt
@@ -0,0 +1 @@
+====== பூரணமாகத கோப்பு ======
\ No newline at end of file
diff --git a/inc/lang/ta/edit.txt b/inc/lang/ta/edit.txt
new file mode 100644
index 000000000..e2d61d781
--- /dev/null
+++ b/inc/lang/ta/edit.txt
@@ -0,0 +1 @@
+பக்கத்தைத் திருத்தி முடிந்தவுடன், "செமி" என்ற பட்டனை அழுத்தவும். விக்கியின் வாக்கிய அமைப்புக்களைப் அறிந்துகொள்ள [[wiki:syntax]] ஐ பார்க்கவும். நீங்கள் விக்கியில் எழுதிப் பயிற்சிபெற [playground:playground|விளையாட்டுத்தாடலை]] பயன்படுத்தவும்.
\ No newline at end of file
diff --git a/inc/lang/ta/lang.php b/inc/lang/ta/lang.php
index a5b89527a..41c4a94c3 100644
--- a/inc/lang/ta/lang.php
+++ b/inc/lang/ta/lang.php
@@ -4,21 +4,39 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Naveen Venugopal <naveen.venugopal.anu@gmail.com>
+ * @author Sri Saravana <saravanamuthaly@gmail.com>
  */
+$lang['doublequoteopening']    = '"';
+$lang['doublequoteclosing']    = '"';
+$lang['singlequoteopening']    = '\'';
+$lang['singlequoteclosing']    = '\'';
+$lang['apostrophe']            = '\'';
 $lang['btn_edit']              = 'இந்த பக்கத்தை திருத்து ';
+$lang['btn_source']            = 'பக்க மூலத்தைக் காட்டு';
 $lang['btn_show']              = 'பக்கத்தை காண்பி ';
 $lang['btn_create']            = 'இந்த பக்கத்தை உருவாக்கு ';
 $lang['btn_search']            = 'தேடு';
 $lang['btn_save']              = 'சேமி ';
+$lang['btn_preview']           = 'முன்னோட்டம்';
+$lang['btn_top']               = 'மேலே செல்';
 $lang['btn_revs']              = 'பழைய  திருத்தங்கள்';
 $lang['btn_recent']            = 'சமீபத்திய மாற்றங்கள்';
 $lang['btn_upload']            = 'பதிவேற்று';
 $lang['btn_cancel']            = 'ரத்து';
 $lang['btn_index']             = 'தள வரைபடம்';
+$lang['btn_secedit']           = 'தொகு';
+$lang['btn_login']             = 'புகுபதிகை';
+$lang['btn_logout']            = 'விடுபதிகை';
 $lang['btn_admin']             = 'நிர்வாகம்';
 $lang['btn_update']            = 'மேம்படுத்து ';
 $lang['btn_delete']            = 'நீக்கு';
+$lang['btn_back']              = 'பின்';
+$lang['btn_backlink']          = 'பின்னிணைப்புக்கள்';
+$lang['btn_subscribe']         = 'சந்தா நிர்வகிப்பு';
+$lang['btn_profile']           = 'பயனர் கணக்கு மாற்றம்';
+$lang['btn_reset']             = 'மீட்டமை';
 $lang['btn_resendpwd']         = 'புதிய அடையாளச்சொல்லை நியமி';
+$lang['btn_draft']             = 'திருத்த வரைவு';
 $lang['btn_apply']             = 'உபயோகி';
 $lang['user']                  = 'பயனர்பெயர்';
 $lang['pass']                  = 'அடையாளச்சொல்';
-- 
cgit v1.2.3


From 86c97e91e4aa9ed17ed75df279181e4b61353c7c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 26 Jun 2015 12:22:43 +0200
Subject: fixes various probelms mentioned in #1163

however I think I will convert the dialog to a real popup instead.
---
 lib/plugins/styling/lang/en/lang.php |  1 +
 lib/plugins/styling/script.js        | 79 ++++++++++++++----------------------
 lib/plugins/styling/style.less       |  8 ++++
 3 files changed, 40 insertions(+), 48 deletions(-)
 create mode 100644 lib/plugins/styling/style.less

diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
index e50c6b912..d100d4324 100644
--- a/lib/plugins/styling/lang/en/lang.php
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -7,6 +7,7 @@
 
 // menu entry for admin plugins
 $lang['js']['menu'] = 'Template Style Settings';
+$lang['js']['popup'] = 'Open as Popup';
 
 // custom language strings for the plugin
 $lang['error'] = 'Sorry, this template does not support this functionality.';
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 7c8ffae91..6dc4c84ed 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -1,10 +1,17 @@
 /* DOKUWIKI:include_once iris.js */
 
 jQuery(function () {
-    // user openend the admin page, set cookie and redirect
-    if (jQuery('#plugin__styling').length) {
-        DokuCookie.setValue('styling_plugin', 1);
-        document.location.href = document.location.href.replace(/&?do=admin/, '');
+    // add popup option to admin page
+    var $styling_plugin = jQuery('#plugin__styling');
+    if ($styling_plugin.length) {
+        var $hl = $styling_plugin.find('h1').first();
+        var $btn = jQuery('<button class="btn">' + LANG.plugins.styling.popup + '</button>');
+        $hl.append($btn);
+
+        $btn.click(function (e) {
+            DokuCookie.setValue('styling_plugin', 1);
+            document.location.href = document.location.href.replace(/&?do=admin/, '');
+        });
     }
 
     // continue only if the styling Dialog is currently enabled
@@ -16,7 +23,6 @@ jQuery(function () {
     var $dialog = jQuery(document.createElement('div'));
     jQuery('body').append($dialog);
 
-
     /**
      * updates the current CSS with a new preview one
      */
@@ -26,29 +32,28 @@ jQuery(function () {
         $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
     }
 
-    /**
-     * save current values and reload preview (debounced)
-     */
-    function styling_saveAndUpdate() {
-        if (styling_timeout) window.clearTimeout(styling_timeout);
-        styling_timeout = window.setTimeout(function () {
-            styling_timeout = null;
+    // prepare the dialog
+    $dialog.dialog({
+        'autoOpen':      false,
+        'title':         LANG.plugins.styling.menu,
+        'width':         500,
+        'height':        500,
+        'position':      {'my': 'left bottom', 'at': 'left bottom-40', 'of': window},
+        'closeOnEscape': true,
+
+        // bring everything back to normal on close
+        'close': function (event, ui) {
+            // disable the styling plugin again
+            DokuCookie.setValue('styling_plugin', 0);
+            // reload
+            document.location.reload()
+        }
+    });
 
-            var params = $dialog.find('input[type=text]').serializeArray();
-            params[params.length] = { name: 'call', value: 'plugin_styling'};
-            params[params.length] = {name: 'run', value: 'preview'};
-
-            jQuery.post(
-                    DOKU_BASE + 'lib/exe/ajax.php',
-                params,
-                styling_updateCSS
-            );
-        }, 500);
-    }
 
     // load the dialog content and apply listeners
     $dialog.load(
-            DOKU_BASE + 'lib/exe/ajax.php',
+        DOKU_BASE + 'lib/exe/ajax.php',
         {
             'call': 'plugin_styling',
             'run':  'html',
@@ -59,32 +64,10 @@ jQuery(function () {
             styling_updateCSS();
 
             // open the dialog
-            $dialog.dialog({
-                'title':    LANG.plugins.styling.menu,
-                'width':    500,
-                'height':   500,
-                'top':      50,
-                'position': { 'my': 'left bottom', 'at': 'left bottom', 'of': window },
-                // bring everything back to normal
-                'close':    function (event, ui) {
-                    // disable the styling plugin again
-                    DokuCookie.setValue('styling_plugin', 0);
-                    // reload
-                    document.location.reload()
-                }
-            });
-
-            // we don't need the manual preview in JS mode
-            $dialog.find('.btn_preview').hide();
+            $dialog.dialog('open');
 
             // add the color picker  FIXME add saveAndUpdate to correct event
-            $dialog.find('.color').iris({ });
-
-            // listen to keyup events
-            $dialog.find('input[type=text]').keyup(function () {
-                styling_saveAndUpdate();
-            });
-
+            $dialog.find('.color').iris({});
         }
     );
 
diff --git a/lib/plugins/styling/style.less b/lib/plugins/styling/style.less
new file mode 100644
index 000000000..8920cb183
--- /dev/null
+++ b/lib/plugins/styling/style.less
@@ -0,0 +1,8 @@
+#plugin__styling {
+
+    h1 button {
+        font-size: 12px;
+        line-height: 16px;
+        margin-left: 1em;
+    }
+}
-- 
cgit v1.2.3


From 6667cd8743e57a4492cfbcbe1066ea48d444f7a2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 26 Jun 2015 12:57:58 +0200
Subject: changed the whole thing to a real popup

---
 lib/plugins/styling/admin.php        | 27 ++++++-------
 lib/plugins/styling/lang/en/lang.php |  4 +-
 lib/plugins/styling/popup.php        | 28 ++++++++++++++
 lib/plugins/styling/script.js        | 73 +++++++-----------------------------
 4 files changed, 56 insertions(+), 76 deletions(-)
 create mode 100644 lib/plugins/styling/popup.php

diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
index 3c2ab577c..627efbd15 100644
--- a/lib/plugins/styling/admin.php
+++ b/lib/plugins/styling/admin.php
@@ -11,6 +11,8 @@ if(!defined('DOKU_INC')) die();
 
 class admin_plugin_styling extends DokuWiki_Admin_Plugin {
 
+    public $ispopup = false;
+
     /**
      * @return int sort number in admin menu
      */
@@ -25,15 +27,6 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
         return true;
     }
 
-    /**
-     * @param string $language
-     * @return string
-     */
-    public function getMenuText($language) {
-        $js = $this->getLang('js');
-        return $js['menu'];
-    }
-
     /**
      * handle the different actions (also called from ajax)
      */
@@ -49,17 +42,19 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
      * Render HTML output, e.g. helpful text and a form
      */
     public function html() {
-        echo '<div id="plugin__styling">';
-        ptln('<h1>'.$this->getMenuText('').'</h1>');
-        $this->form(false);
+        $class = 'nopopup';
+        if($this->ispopup) $class = 'ispopup';
+
+        echo '<div id="plugin__styling" class="'.$class.'">';
+        ptln('<h1>'.$this->getLang('menu').'</h1>');
+        $this->form();
         echo '</div>';
     }
 
     /**
      * Create the actual editing form
-     * @param boolean $isajax
      */
-    public function form($isajax) {
+    public function form() {
         global $conf;
         global $ID;
         define('SIMPLE_TEST', 1); // hack, ideally certain functions should be moved out of css.php
@@ -67,8 +62,8 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
         $styleini     = css_styleini($conf['template'], true);
         $replacements = $styleini['replacements'];
 
-        if($isajax) {
-            $target = wl($ID, array('do' => 'styling_plugin'));
+        if($this->ispopup) {
+            $target = DOKU_BASE.'lib/plugins/styling/popup.php';
         } else {
             $target = wl($ID, array('do' => 'admin', 'page' => 'styling'));
         }
diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
index d100d4324..85ac0ec29 100644
--- a/lib/plugins/styling/lang/en/lang.php
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -6,7 +6,9 @@
  */
 
 // menu entry for admin plugins
-$lang['js']['menu'] = 'Template Style Settings';
+$lang['menu'] = 'Template Style Settings';
+
+
 $lang['js']['popup'] = 'Open as Popup';
 
 // custom language strings for the plugin
diff --git a/lib/plugins/styling/popup.php b/lib/plugins/styling/popup.php
new file mode 100644
index 000000000..eea4f3bfd
--- /dev/null
+++ b/lib/plugins/styling/popup.php
@@ -0,0 +1,28 @@
+<?php
+if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__) . '/../../../');
+require_once(DOKU_INC . 'inc/init.php');
+//close session
+session_write_close();
+header('Content-Type: text/html; charset=utf-8');
+
+/** @var admin_plugin_styling $plugin */
+$plugin = plugin_load('admin', 'styling');
+if(!auth_isadmin()) die('only admins allowed');
+$plugin->ispopup = true;
+
+// handle posts
+$plugin->handle();
+
+// output plugin in a very minimal template:
+?>
+<html>
+<head>
+    <title><?php echo $plugin->getLang('menu') ?></title>
+    <?php tpl_metaheaders(false) ?>
+</head>
+<body>
+    <div class="dokuwiki page">
+        <?php $plugin->html() ?>
+    </div>
+</body>
+</html>
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 6dc4c84ed..8b4563986 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -1,74 +1,29 @@
 /* DOKUWIKI:include_once iris.js */
 
 jQuery(function () {
-    // add popup option to admin page
+
     var $styling_plugin = jQuery('#plugin__styling');
-    if ($styling_plugin.length) {
+    if(!$styling_plugin.length) return;
+
+
+    if (!$styling_plugin.hasClass('ispopup')) {
         var $hl = $styling_plugin.find('h1').first();
         var $btn = jQuery('<button class="btn">' + LANG.plugins.styling.popup + '</button>');
         $hl.append($btn);
 
         $btn.click(function (e) {
-            DokuCookie.setValue('styling_plugin', 1);
-            document.location.href = document.location.href.replace(/&?do=admin/, '');
+            var windowFeatures = "menubar=no,location=no,resizable=yes,scrollbars=yes,status=false,width=500,height=500";
+            window.open(DOKU_BASE + 'lib/plugins/styling/popup.php', 'styling', windowFeatures)
         });
+        return;
     }
 
-    // continue only if the styling Dialog is currently enabled
-    if (DokuCookie.getValue('styling_plugin') != 1) return;
-
-    var styling_timeout = null;
-
-    // create dialog element
-    var $dialog = jQuery(document.createElement('div'));
-    jQuery('body').append($dialog);
-
-    /**
-     * updates the current CSS with a new preview one
-     */
-    function styling_updateCSS() {
-        var now = new Date().getTime();
-        var $style = jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
-        $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
-    }
-
-    // prepare the dialog
-    $dialog.dialog({
-        'autoOpen':      false,
-        'title':         LANG.plugins.styling.menu,
-        'width':         500,
-        'height':        500,
-        'position':      {'my': 'left bottom', 'at': 'left bottom-40', 'of': window},
-        'closeOnEscape': true,
-
-        // bring everything back to normal on close
-        'close': function (event, ui) {
-            // disable the styling plugin again
-            DokuCookie.setValue('styling_plugin', 0);
-            // reload
-            document.location.reload()
-        }
-    });
-
-
-    // load the dialog content and apply listeners
-    $dialog.load(
-        DOKU_BASE + 'lib/exe/ajax.php',
-        {
-            'call': 'plugin_styling',
-            'run':  'html',
-            'id':   JSINFO.id
-        },
-        function () {
-            // load the preview template
-            styling_updateCSS();
-
-            // open the dialog
-            $dialog.dialog('open');
+    // add the color picker
+    $styling_plugin.find('.color').iris({});
 
-            // add the color picker  FIXME add saveAndUpdate to correct event
-            $dialog.find('.color').iris({});
-        }
-    );
+    // load preview in main window
+    var now = new Date().getTime();
+    var $style = window.opener.jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
+    $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
 
 });
-- 
cgit v1.2.3


From 3e2beab52631135f77d0ad5b6ed297458bfff2f2 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 26 Jun 2015 13:31:46 +0200
Subject: added a simple loading screen for the JavaScript preview

---
 lib/plugins/styling/lang/en/lang.php |  2 +-
 lib/plugins/styling/script.js        | 25 ++++++++++++++++++++++++-
 lib/plugins/styling/style.less       |  4 ++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
index 85ac0ec29..a076065cb 100644
--- a/lib/plugins/styling/lang/en/lang.php
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -8,7 +8,7 @@
 // menu entry for admin plugins
 $lang['menu'] = 'Template Style Settings';
 
-
+$lang['js']['loader'] = 'Preview is loading...<br>if this does not goes away, your values may be faulty';
 $lang['js']['popup'] = 'Open as Popup';
 
 // custom language strings for the plugin
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 8b4563986..f732c0524 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -3,7 +3,7 @@
 jQuery(function () {
 
     var $styling_plugin = jQuery('#plugin__styling');
-    if(!$styling_plugin.length) return;
+    if (!$styling_plugin.length) return;
 
 
     if (!$styling_plugin.hasClass('ispopup')) {
@@ -21,9 +21,32 @@ jQuery(function () {
     // add the color picker
     $styling_plugin.find('.color').iris({});
 
+    // append the loader screen
+    $loader = window.opener.jQuery('#plugin__styling_loader');
+    if (!$loader.length) {
+        $loader = jQuery('<div id="plugin__styling_loader">' + LANG.plugins.styling.loader + '</div>');
+        $loader.css({
+            'position':         'absolute',
+            'width':            '100%',
+            'height':           '100%',
+            'top':              0,
+            'left':             0,
+            'z-index':          5000,
+            'background-color': '#fff',
+            'opacity':          '0.7',
+            'color':            '#000',
+            'font-size':        '40px',
+            'text-align':       'center',
+            'line-height':      '90px'
+        });
+        window.opener.jQuery('body').append($loader);
+    }
+
     // load preview in main window
     var now = new Date().getTime();
     var $style = window.opener.jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
+    $style.attr('href', '');
     $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
 
+
 });
diff --git a/lib/plugins/styling/style.less b/lib/plugins/styling/style.less
index 8920cb183..3cb563fdb 100644
--- a/lib/plugins/styling/style.less
+++ b/lib/plugins/styling/style.less
@@ -6,3 +6,7 @@
         margin-left: 1em;
     }
 }
+
+#plugin__styling_loader {
+    display: none;
+}
-- 
cgit v1.2.3


From bcea9d64ebf4b0cc2c80209b7669e3e7e954c4c8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 26 Jun 2015 13:35:15 +0200
Subject: removed no longer needed ajax action components

---
 lib/plugins/styling/action.php | 48 ------------------------------------------
 lib/plugins/styling/script.js  |  8 ++-----
 2 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/lib/plugins/styling/action.php b/lib/plugins/styling/action.php
index 622c634d6..896e14bef 100644
--- a/lib/plugins/styling/action.php
+++ b/lib/plugins/styling/action.php
@@ -26,8 +26,6 @@ class action_plugin_styling extends DokuWiki_Action_Plugin {
      * @return void
      */
     public function register(Doku_Event_Handler $controller) {
-        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax');
-        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action');
         $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_header');
     }
 
@@ -57,52 +55,6 @@ class action_plugin_styling extends DokuWiki_Action_Plugin {
         }
     }
 
-    /**
-     * Updates the style.ini settings by passing it on to handle() of the admin component
-     *
-     * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
-     *                           handler was registered]
-     * @return void
-     */
-    public function handle_action(Doku_Event &$event, $param) {
-        if($event->data != 'styling_plugin') return;
-        if(!auth_isadmin()) return;
-        $event->data = 'show';
-
-        /** @var admin_plugin_styling $hlp */
-        $hlp = plugin_load('admin', 'styling');
-        $hlp->handle();
-    }
-
-    /**
-     * Create the style form in the floating Dialog
-     *
-     * @param Doku_Event $event  event object by reference
-     * @param mixed      $param  [the parameters passed as fifth argument to register_hook() when this
-     *                           handler was registered]
-     * @return void
-     */
-
-    public function handle_ajax(Doku_Event &$event, $param) {
-        if($event->data != 'plugin_styling') return;
-        if(!auth_isadmin()) return;
-        $event->preventDefault();
-        $event->stopPropagation();
-
-        global $ID;
-        global $INPUT;
-        $ID = getID();
-
-        /** @var admin_plugin_styling $hlp */
-        $hlp = plugin_load('admin', 'styling');
-        if($INPUT->str('run') == 'preview') {
-            $hlp->run_preview();
-        } else {
-            $hlp->form(true);
-        }
-    }
-
 }
 
 // vim:ts=4:sw=4:et:
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index f732c0524..409148471 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -5,6 +5,8 @@ jQuery(function () {
     var $styling_plugin = jQuery('#plugin__styling');
     if (!$styling_plugin.length) return;
 
+    // add the color picker
+    $styling_plugin.find('.color').iris({});
 
     if (!$styling_plugin.hasClass('ispopup')) {
         var $hl = $styling_plugin.find('h1').first();
@@ -18,9 +20,6 @@ jQuery(function () {
         return;
     }
 
-    // add the color picker
-    $styling_plugin.find('.color').iris({});
-
     // append the loader screen
     $loader = window.opener.jQuery('#plugin__styling_loader');
     if (!$loader.length) {
@@ -45,8 +44,5 @@ jQuery(function () {
     // load preview in main window
     var now = new Date().getTime();
     var $style = window.opener.jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
-    $style.attr('href', '');
     $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
-
-
 });
-- 
cgit v1.2.3


From c2f2dedb56cd3872aa50d58de0cb3083b36b7872 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 26 Jun 2015 14:04:20 +0200
Subject: reset page back to normal on closing dialog

---
 lib/plugins/styling/script.js | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 409148471..6fc2b9043 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -2,12 +2,15 @@
 
 jQuery(function () {
 
+    var doreload = 1;
+
     var $styling_plugin = jQuery('#plugin__styling');
     if (!$styling_plugin.length) return;
 
     // add the color picker
     $styling_plugin.find('.color').iris({});
 
+    // add button on main page
     if (!$styling_plugin.hasClass('ispopup')) {
         var $hl = $styling_plugin.find('h1').first();
         var $btn = jQuery('<button class="btn">' + LANG.plugins.styling.popup + '</button>');
@@ -20,6 +23,23 @@ jQuery(function () {
         return;
     }
 
+    // reload the main page on close
+    window.onunload = function(e) {
+        if(doreload) {
+            window.opener.document.location.reload();
+        }
+        return null;
+    };
+
+    // don't reload on our own buttons
+    jQuery('input[type=submit]').click(function(e){
+        doreload = false;
+    });
+
+    // remove style
+    var $style = window.opener.jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
+    $style.attr('href', '');
+
     // append the loader screen
     $loader = window.opener.jQuery('#plugin__styling_loader');
     if (!$loader.length) {
@@ -41,8 +61,11 @@ jQuery(function () {
         window.opener.jQuery('body').append($loader);
     }
 
-    // load preview in main window
-    var now = new Date().getTime();
-    var $style = window.opener.jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
-    $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
+    // load preview in main window (timeout works around chrome updating CSS weirdness)
+    window.setTimeout(function() {
+        var now = new Date().getTime();
+        $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
+    }, 500);
+
+
 });
-- 
cgit v1.2.3


From f4b12de73d07db2a5a0549309329486d7a9e0fdf Mon Sep 17 00:00:00 2001
From: Takumo <9206984@mail.ru>
Date: Mon, 29 Jun 2015 12:46:05 +0200
Subject: translation update

---
 inc/lang/ru/lang.php                   |  1 +
 lib/plugins/authad/lang/ru/lang.php    |  3 +++
 lib/plugins/authldap/lang/ru/lang.php  |  9 +++++++++
 lib/plugins/authmysql/lang/ru/lang.php | 11 +++++++++++
 lib/plugins/extension/lang/ru/lang.php |  5 +++++
 5 files changed, 29 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/ru/lang.php
 create mode 100644 lib/plugins/authmysql/lang/ru/lang.php

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 3a1fb2c56..7aa7c5b09 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -31,6 +31,7 @@
  * @author Vitaly Filatenko <kot@hacktest.net>
  * @author Alex P <alexander@lanos.co.uk>
  * @author Nolf <m.kopachovets@gmail.com>
+ * @author Takumo <9206984@mail.ru>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/authad/lang/ru/lang.php b/lib/plugins/authad/lang/ru/lang.php
index 6a3f6e995..fe56be2bf 100644
--- a/lib/plugins/authad/lang/ru/lang.php
+++ b/lib/plugins/authad/lang/ru/lang.php
@@ -4,6 +4,9 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
+ * @author Takumo <9206984@mail.ru>
  */
 $lang['domain']                = 'Домен';
 $lang['authpwdexpire']         = 'Действие вашего пароля истекает через %d дней. Вы должны изменить его как можно скорее';
+$lang['passchangefail']        = 'Не удалось изменить пароль. Возможно, он не соответствует требованиям к паролю.';
+$lang['connectfail']           = 'Невозможно соединиться с сервером AD.';
diff --git a/lib/plugins/authldap/lang/ru/lang.php b/lib/plugins/authldap/lang/ru/lang.php
new file mode 100644
index 000000000..c05ed3b15
--- /dev/null
+++ b/lib/plugins/authldap/lang/ru/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Takumo <9206984@mail.ru>
+ */
+$lang['connectfail']           = 'Ошибка соединения LDAP с %s';
+$lang['domainfail']            = 'Не найдено имя пользователя LDAP (dn)';
diff --git a/lib/plugins/authmysql/lang/ru/lang.php b/lib/plugins/authmysql/lang/ru/lang.php
new file mode 100644
index 000000000..75b5613f5
--- /dev/null
+++ b/lib/plugins/authmysql/lang/ru/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Takumo <9206984@mail.ru>
+ */
+$lang['connectfail']           = 'Ошибка соединения с базой данных.';
+$lang['userexists']            = 'Извините, пользователь с таким логином уже существует.';
+$lang['usernotexists']         = 'Извините, такой пользователь не существует.';
+$lang['writefail']             = 'Невозможно изменить данные пользователя. Сообщите об этом администратору Вики.';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index 4b2542420..c7ef52b42 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -8,6 +8,7 @@
  * @author Type-kun <workwork-1@yandex.ru>
  * @author Vitaly Filatenko <kot@hacktest.net>
  * @author Alex P <alexander@lanos.co.uk>
+ * @author Takumo <9206984@mail.ru>
  */
 $lang['menu']                  = 'Управление дополнениями';
 $lang['tab_plugins']           = 'Установленные плагины';
@@ -29,6 +30,10 @@ $lang['btn_disable']           = 'Отключить';
 $lang['btn_install']           = 'Установить';
 $lang['btn_reinstall']         = 'Переустановить';
 $lang['js']['reallydel']       = 'Действительно удалить это дополнение?';
+$lang['js']['display_viewoptions'] = 'Показать как:';
+$lang['js']['display_enabled'] = 'включено';
+$lang['js']['display_disabled'] = 'отключено';
+$lang['js']['display_updatable'] = 'обновление';
 $lang['search_for']            = 'Поиск дополнения:';
 $lang['search']                = 'Найти';
 $lang['extensionby']           = '<strong>%s</strong> — %s';
-- 
cgit v1.2.3


From 0f7eafd90ce5e944b2de67b3dccd8933fd60851c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jun 2015 20:42:56 +0200
Subject: geshi update via composer

---
 composer.lock                          | 12 ++++++------
 vendor/composer/ClassLoader.php        |  8 ++++----
 vendor/composer/installed.json         | 12 ++++++------
 vendor/easybook/geshi/geshi/cpp-qt.php |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8b6424244..5cfa22a72 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,23 +1,23 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
     "hash": "23ee0dd06136e2301c930e75055300d5",
     "packages": [
         {
             "name": "easybook/geshi",
-            "version": "v1.0.8.14",
+            "version": "v1.0.8.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/easybook/geshi.git",
-                "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8"
+                "reference": "54387de80bc7ee50397ffae39234626a48d2d45f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/easybook/geshi/zipball/af589a67bf308791bb13e54bddd9aa3544b7dff8",
-                "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8",
+                "url": "https://api.github.com/repos/easybook/geshi/zipball/54387de80bc7ee50397ffae39234626a48d2d45f",
+                "reference": "54387de80bc7ee50397ffae39234626a48d2d45f",
                 "shasum": ""
             },
             "require": {
@@ -50,7 +50,7 @@
                 "highlighter",
                 "syntax"
             ],
-            "time": "2015-04-15 13:21:45"
+            "time": "2015-06-18 14:56:28"
         },
         {
             "name": "splitbrain/php-archive",
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 5e1469e83..4e05d3b15 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -351,7 +351,7 @@ class ClassLoader
             foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -361,7 +361,7 @@ class ClassLoader
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -380,7 +380,7 @@ class ClassLoader
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -390,7 +390,7 @@ class ClassLoader
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
             }
         }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a9eb3f9ee..347a31713 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -50,23 +50,23 @@
     },
     {
         "name": "easybook/geshi",
-        "version": "v1.0.8.14",
-        "version_normalized": "1.0.8.14",
+        "version": "v1.0.8.15",
+        "version_normalized": "1.0.8.15",
         "source": {
             "type": "git",
             "url": "https://github.com/easybook/geshi.git",
-            "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8"
+            "reference": "54387de80bc7ee50397ffae39234626a48d2d45f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/easybook/geshi/zipball/af589a67bf308791bb13e54bddd9aa3544b7dff8",
-            "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8",
+            "url": "https://api.github.com/repos/easybook/geshi/zipball/54387de80bc7ee50397ffae39234626a48d2d45f",
+            "reference": "54387de80bc7ee50397ffae39234626a48d2d45f",
             "shasum": ""
         },
         "require": {
             "php": ">4.3.0"
         },
-        "time": "2015-04-15 13:21:45",
+        "time": "2015-06-18 14:56:28",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/vendor/easybook/geshi/geshi/cpp-qt.php b/vendor/easybook/geshi/geshi/cpp-qt.php
index 5a23f5854..44f2d215f 100755
--- a/vendor/easybook/geshi/geshi/cpp-qt.php
+++ b/vendor/easybook/geshi/geshi/cpp-qt.php
@@ -540,7 +540,7 @@ $language_data = array (
         2 => '',
         3 => '',
         4 => '',
-        5 => 'http://doc.trolltech.com/latest/{FNAMEL}.html'
+        5 => 'http://doc.qt.io/qt-5/{FNAMEL}.html'
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
-- 
cgit v1.2.3


From 2b6c681901bfed9efc7d09dca27aee308d48341d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jun 2015 21:17:23 +0200
Subject: updated archive library via composer

---
 composer.lock                             |  10 +-
 vendor/composer/installed.json            |  98 +++++++-------
 vendor/splitbrain/php-archive/README.md   |  23 ++--
 vendor/splitbrain/php-archive/src/Zip.php | 217 +++++++++++++++++++++---------
 4 files changed, 224 insertions(+), 124 deletions(-)

diff --git a/composer.lock b/composer.lock
index 5cfa22a72..32ea37109 100644
--- a/composer.lock
+++ b/composer.lock
@@ -54,16 +54,16 @@
         },
         {
             "name": "splitbrain/php-archive",
-            "version": "1.0.0",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/splitbrain/php-archive.git",
-                "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549"
+                "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
-                "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
+                "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/89b4cba038e8cf01af3a8180572f19b8e4afaa31",
+                "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31",
                 "shasum": ""
             },
             "require": {
@@ -97,7 +97,7 @@
                 "unzip",
                 "zip"
             ],
-            "time": "2015-02-25 20:15:02"
+            "time": "2015-06-30 19:12:21"
         }
     ],
     "packages-dev": [],
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 347a31713..28e3fb6e2 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,53 +1,4 @@
 [
-    {
-        "name": "splitbrain/php-archive",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/splitbrain/php-archive.git",
-            "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
-            "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.5.*"
-        },
-        "time": "2015-02-25 20:15:02",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "splitbrain\\PHPArchive\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Andreas Gohr",
-                "email": "andi@splitbrain.org"
-            }
-        ],
-        "description": "Pure-PHP implementation to read and write TAR and ZIP archives",
-        "keywords": [
-            "archive",
-            "extract",
-            "tar",
-            "unpack",
-            "unzip",
-            "zip"
-        ]
-    },
     {
         "name": "easybook/geshi",
         "version": "v1.0.8.15",
@@ -95,5 +46,54 @@
             "highlighter",
             "syntax"
         ]
+    },
+    {
+        "name": "splitbrain/php-archive",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/splitbrain/php-archive.git",
+            "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/89b4cba038e8cf01af3a8180572f19b8e4afaa31",
+            "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "4.5.*"
+        },
+        "time": "2015-06-30 19:12:21",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "splitbrain\\PHPArchive\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Andreas Gohr",
+                "email": "andi@splitbrain.org"
+            }
+        ],
+        "description": "Pure-PHP implementation to read and write TAR and ZIP archives",
+        "keywords": [
+            "archive",
+            "extract",
+            "tar",
+            "unpack",
+            "unzip",
+            "zip"
+        ]
     }
 ]
diff --git a/vendor/splitbrain/php-archive/README.md b/vendor/splitbrain/php-archive/README.md
index 4fb673259..6c5780a7a 100644
--- a/vendor/splitbrain/php-archive/README.md
+++ b/vendor/splitbrain/php-archive/README.md
@@ -18,24 +18,29 @@ Use composer:
 Usage
 -----
 
-The usage for the Zip and Tar classes are basically the same. Here are some examples for working with TARs to get
-you started. Check the source code comments for more info
+The usage for the Zip and Tar classes are basically the same. Here are some
+examples for working with TARs to get you started. Check the source code
+comments for more info
 
 ```php
+require_once 'vendor/autoload.php';
 use splitbrain\PHPArchive\Tar;
 
-// To list the contents of an existing TAR archive, open() it and use contents() on it:
+// To list the contents of an existing TAR archive, open() it and use
+// contents() on it:
 $tar = new Tar();
 $tar->open('myfile.tgz');
 $toc = $tar->contents();
 print_r($toc); // array of FileInfo objects
 
-// To extract the contents of an existing TAR archive, open() it and use extract() on it:
+// To extract the contents of an existing TAR archive, open() it and use
+// extract() on it:
 $tar = new Tar();
 $tar->open('myfile.tgz');
 $tar->extract('/tmp');
 
-// To create a new TAR archive directly on the filesystem (low memory requirements), create() it,
+// To create a new TAR archive directly on the filesystem (low memory
+// requirements), create() it:
 $tar = new Tar();
 $tar->create('myfile.tgz');
 $tar->addFile(...);
@@ -43,8 +48,8 @@ $tar->addData(...);
 ...
 $tar->close();
 
-// To create a TAR archive directly in memory, create() it, add*() files and then either save()
-// or getData() it:
+// To create a TAR archive directly in memory, create() it, add*()
+// files and then either save() or getArchive() it:
 $tar = new Tar();
 $tar->create();
 $tar->addFile(...);
@@ -54,8 +59,8 @@ $tar->save('myfile.tgz'); // compresses and saves it
 echo $tar->getArchive(Archive::COMPRESS_GZIP); // compresses and returns it
 ```
 
-Differences between Tar and Zip: Tars are compressed as a whole while Zips compress each file individually. Therefore
-you can call ```setCompression``` before each ```addFile()``` and ```addData()``` functions.
+Differences between Tar and Zip: Tars are compressed as a whole, while Zips compress each file individually. Therefore
+you can call ```setCompression``` before each ```addFile()``` and ```addData()``` function call.
 
 The FileInfo class can be used to specify additional info like ownership or permissions when adding a file to
 an archive. 
\ No newline at end of file
diff --git a/vendor/splitbrain/php-archive/src/Zip.php b/vendor/splitbrain/php-archive/src/Zip.php
index c2ff36575..324eb4f59 100644
--- a/vendor/splitbrain/php-archive/src/Zip.php
+++ b/vendor/splitbrain/php-archive/src/Zip.php
@@ -7,6 +7,8 @@ namespace splitbrain\PHPArchive;
  *
  * Creates or extracts Zip archives
  *
+ * for specs see http://www.pkware.com/appnote
+ *
  * @author  Andreas Gohr <andi@splitbrain.org>
  * @package splitbrain\PHPArchive
  * @license MIT
@@ -308,45 +310,45 @@ class Zip extends Archive
             throw new ArchiveIOException('Archive has been closed, files can no longer be added');
         }
 
-        // prepare the various header infos
-        $dtime    = dechex($this->makeDosTime($fileinfo->getMtime()));
-        $hexdtime = pack(
-            'H*',
-            $dtime[6].$dtime[7].
-            $dtime[4].$dtime[5].
-            $dtime[2].$dtime[3].
-            $dtime[0].$dtime[1]
-        );
+        // prepare info and compress data
         $size     = strlen($data);
         $crc      = crc32($data);
         if ($this->complevel) {
-            $fmagic = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00";
-            $cmagic = "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00";
-            $data   = gzcompress($data, $this->complevel);
-            $data   = substr($data, 2, -4); // strip compression headers
-        } else {
-            $fmagic = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00";
-            $cmagic = "\x50\x4b\x01\x02\x14\x00\x0a\x00\x00\x00\x00\x00";
+            $data = gzcompress($data, $this->complevel);
+            $data = substr($data, 2, -4); // strip compression headers
         }
         $csize  = strlen($data);
         $offset = $this->dataOffset();
         $name   = $fileinfo->getPath();
+        $time   = $fileinfo->getMtime();
+
+        // write local file header
+        $this->writebytes($this->makeLocalFileHeader(
+            $time,
+            $crc,
+            $size,
+            $csize,
+            $name,
+            (bool) $this->complevel
+        ));
+
+        // we store no encryption header
 
         // write data
-        $this->writebytes($fmagic);
-        $this->writebytes($hexdtime);
-        $this->writebytes(pack('V', $crc).pack('V', $csize).pack('V', $size)); //pre header
-        $this->writebytes(pack('v', strlen($name)).pack('v', 0).$name.$data); //file data
-        $this->writebytes(pack('V', $crc).pack('V', $csize).pack('V', $size)); //post header
+        $this->writebytes($data);
+
+        // we store no data descriptor
 
         // add info to central file directory
-        $cdrec = $cmagic;
-        $cdrec .= $hexdtime.pack('V', $crc).pack('V', $csize).pack('V', $size);
-        $cdrec .= pack('v', strlen($name)).pack('v', 0).pack('v', 0);
-        $cdrec .= pack('v', 0).pack('v', 0).pack('V', 32);
-        $cdrec .= pack('V', $offset);
-        $cdrec .= $name;
-        $this->ctrl_dir[] = $cdrec;
+        $this->ctrl_dir[] = $this->makeCentralFileRecord(
+            $offset,
+            $time,
+            $crc,
+            $size,
+            $csize,
+            $name,
+            (bool) $this->complevel
+        );
     }
 
     /**
@@ -361,14 +363,24 @@ class Zip extends Archive
             return;
         } // we did this already
 
-        // write footer
         if ($this->writeaccess) {
-            $offset  = $this->dataOffset();
+            // write central directory
+            $offset = $this->dataOffset();
             $ctrldir = join('', $this->ctrl_dir);
             $this->writebytes($ctrldir);
-            $this->writebytes("\x50\x4b\x05\x06\x00\x00\x00\x00"); // EOF CTRL DIR
-            $this->writebytes(pack('v', count($this->ctrl_dir)).pack('v', count($this->ctrl_dir)));
-            $this->writebytes(pack('V', strlen($ctrldir)).pack('V', strlen($offset))."\x00\x00");
+
+            // write end of central directory record
+            $this->writebytes("\x50\x4b\x05\x06"); // end of central dir signature
+            $this->writebytes(pack('v', 0)); // number of this disk
+            $this->writebytes(pack('v', 0)); // number of the disk with the start of the central directory
+            $this->writebytes(pack('v',
+                count($this->ctrl_dir))); // total number of entries in the central directory on this disk
+            $this->writebytes(pack('v', count($this->ctrl_dir))); // total number of entries in the central directory
+            $this->writebytes(pack('V', strlen($ctrldir))); // size of the central directory
+            $this->writebytes(pack('V',
+                $offset)); // offset of start of central directory with respect to the starting disk number
+            $this->writebytes(pack('v', 0)); // .ZIP file comment length
+
             $this->ctrl_dir = array();
         }
 
@@ -492,18 +504,7 @@ class Zip extends Archive
             $header['comment'] = '';
         }
 
-        if ($header['mdate'] && $header['mtime']) {
-            $hour            = ($header['mtime'] & 0xF800) >> 11;
-            $minute          = ($header['mtime'] & 0x07E0) >> 5;
-            $seconde         = ($header['mtime'] & 0x001F) * 2;
-            $year            = (($header['mdate'] & 0xFE00) >> 9) + 1980;
-            $month           = ($header['mdate'] & 0x01E0) >> 5;
-            $day             = $header['mdate'] & 0x001F;
-            $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year);
-        } else {
-            $header['mtime'] = time();
-        }
-
+        $header['mtime']           = $this->makeUnixTime($header['mdate'], $header['mtime']);
         $header['stored_filename'] = $header['filename'];
         $header['status']          = 'ok';
         if (substr($header['filename'], -1) == '/') {
@@ -518,12 +519,12 @@ class Zip extends Archive
      * Reads the local file header
      *
      * This header precedes each individual file inside the zip file. Assumes the current file pointer is pointing at
-     * the right position already. Enhances this given central header with the data found at the local header.
+     * the right position already. Enhances the given central header with the data found at the local header.
      *
      * @param array $header the central file header read previously (see above)
      * @return array
      */
-    function readFileHeader($header)
+    protected function readFileHeader($header)
     {
         $binary_data = fread($this->fh, 30);
         $data        = unpack(
@@ -549,20 +550,7 @@ class Zip extends Archive
             }
         }
         $header['flag']  = $data['flag'];
-        $header['mdate'] = $data['mdate'];
-        $header['mtime'] = $data['mtime'];
-
-        if ($header['mdate'] && $header['mtime']) {
-            $hour            = ($header['mtime'] & 0xF800) >> 11;
-            $minute          = ($header['mtime'] & 0x07E0) >> 5;
-            $seconde         = ($header['mtime'] & 0x001F) * 2;
-            $year            = (($header['mdate'] & 0xFE00) >> 9) + 1980;
-            $month           = ($header['mdate'] & 0x01E0) >> 5;
-            $day             = $header['mdate'] & 0x001F;
-            $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year);
-        } else {
-            $header['mtime'] = time();
-        }
+        $header['mtime'] = $this->makeUnixTime($data['mdate'], $data['mtime']);
 
         $header['stored_filename'] = $header['filename'];
         $header['status']          = "ok";
@@ -651,4 +639,111 @@ class Zip extends Archive
         ($timearray['seconds'] >> 1);
     }
 
+    /**
+     * Create a UNIX timestamp from a DOS timestamp
+     *
+     * @param $mdate
+     * @param $mtime
+     * @return int
+     */
+    protected function makeUnixTime($mdate = null, $mtime = null)
+    {
+        if ($mdate && $mtime) {
+            $year = (($mdate & 0xFE00) >> 9) + 1980;
+            $month = ($mdate & 0x01E0) >> 5;
+            $day = $mdate & 0x001F;
+
+            $hour = ($mtime & 0xF800) >> 11;
+            $minute = ($mtime & 0x07E0) >> 5;
+            $seconde = ($mtime & 0x001F) << 1;
+
+            $mtime = mktime($hour, $minute, $seconde, $month, $day, $year);
+        } else {
+            $mtime = time();
+        }
+
+        return $mtime;
+    }
+
+    /**
+     * Returns a local file header for the given data
+     *
+     * @param int $offset location of the local header
+     * @param int $ts unix timestamp
+     * @param int $crc CRC32 checksum of the uncompressed data
+     * @param int $len length of the uncompressed data
+     * @param int $clen length of the compressed data
+     * @param string $name file name
+     * @param boolean|null $comp if compression is used, if null it's determined from $len != $clen
+     * @return string
+     */
+    protected function makeCentralFileRecord($offset, $ts, $crc, $len, $clen, $name, $comp = null)
+    {
+        if(is_null($comp)) $comp = $len != $clen;
+        $comp = $comp ? 8 : 0;
+        $dtime = dechex($this->makeDosTime($ts));
+
+        $header = "\x50\x4b\x01\x02"; // central file header signature
+        $header .= pack('v', 14); // version made by - VFAT
+        $header .= pack('v', 20); // version needed to extract - 2.0
+        $header .= pack('v', 0); // general purpose flag - no flags set
+        $header .= pack('v', $comp); // compression method - deflate|none
+        $header .= pack(
+            'H*',
+            $dtime[6] . $dtime[7] .
+            $dtime[4] . $dtime[5] .
+            $dtime[2] . $dtime[3] .
+            $dtime[0] . $dtime[1]
+        ); //  last mod file time and date
+        $header .= pack('V', $crc); // crc-32
+        $header .= pack('V', $clen); // compressed size
+        $header .= pack('V', $len); // uncompressed size
+        $header .= pack('v', strlen($name)); // file name length
+        $header .= pack('v', 0); // extra field length
+        $header .= pack('v', 0); // file comment length
+        $header .= pack('v', 0); // disk number start
+        $header .= pack('v', 0); // internal file attributes
+        $header .= pack('V', 0); // external file attributes  @todo was 0x32!?
+        $header .= pack('V', $offset); // relative offset of local header
+        $header .= $name; // file name
+
+        return $header;
+    }
+
+    /**
+     * Returns a local file header for the given data
+     *
+     * @param int $ts unix timestamp
+     * @param int $crc CRC32 checksum of the uncompressed data
+     * @param int $len length of the uncompressed data
+     * @param int $clen length of the compressed data
+     * @param string $name file name
+     * @param boolean|null $comp if compression is used, if null it's determined from $len != $clen
+     * @return string
+     */
+    protected function makeLocalFileHeader($ts, $crc, $len, $clen, $name, $comp = null)
+    {
+        if(is_null($comp)) $comp = $len != $clen;
+        $comp = $comp ? 8 : 0;
+        $dtime = dechex($this->makeDosTime($ts));
+
+        $header = "\x50\x4b\x03\x04"; //  local file header signature
+        $header .= pack('v', 20); // version needed to extract - 2.0
+        $header .= pack('v', 0); // general purpose flag - no flags set
+        $header .= pack('v', $comp); // compression method - deflate|none
+        $header .= pack(
+            'H*',
+            $dtime[6] . $dtime[7] .
+            $dtime[4] . $dtime[5] .
+            $dtime[2] . $dtime[3] .
+            $dtime[0] . $dtime[1]
+        ); //  last mod file time and date
+        $header .= pack('V', $crc); // crc-32
+        $header .= pack('V', $clen); // compressed size
+        $header .= pack('V', $len); // uncompressed size
+        $header .= pack('v', strlen($name)); // file name length
+        $header .= pack('v', 0); // extra field length
+        $header .= $name;
+        return $header;
+    }
 }
-- 
cgit v1.2.3


From 67b479b256ae7436b507860d32ee7e0b29b1657a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 30 Jun 2015 22:41:51 +0200
Subject: PHPDocs for remote and action

---
 lib/plugins/acl/remote.php |  2 +-
 lib/plugins/action.php     |  2 ++
 lib/plugins/remote.php     | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index 42449428f..031686f95 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -8,7 +8,7 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
     /**
      * Returns details about the remote plugin methods
      *
-     * @return array
+     * @return array Information about all provided methods. {@see RemoteAPI}
      */
     public function _getMethods() {
         return array(
diff --git a/lib/plugins/action.php b/lib/plugins/action.php
index 4b5eef60a..23d94a509 100644
--- a/lib/plugins/action.php
+++ b/lib/plugins/action.php
@@ -16,6 +16,8 @@ class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
 
     /**
      * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller
      */
     public function register(Doku_Event_Handler $controller) {
         trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
diff --git a/lib/plugins/remote.php b/lib/plugins/remote.php
index a51f701fb..47f954ee6 100644
--- a/lib/plugins/remote.php
+++ b/lib/plugins/remote.php
@@ -1,19 +1,30 @@
 <?php
 
+/**
+ * Class DokuWiki_Remote_Plugin
+ */
 abstract class DokuWiki_Remote_Plugin extends DokuWiki_Plugin {
 
     private  $api;
 
+    /**
+     * Constructor
+     */
     public function __construct() {
         $this->api = new RemoteAPI();
     }
 
     /**
+     * Get all available methods with remote access.
+     *
      * @abstract
-     * @return array Information to all provided methods. {@see RemoteAPI}.
+     * @return array Information about all provided methods. {@see RemoteAPI}.
      */
     public abstract function _getMethods();
 
+    /**
+     * @return RemoteAPI
+     */
     protected function getApi() {
         return $this->api;
     }
-- 
cgit v1.2.3


From 848e5d3474b85be02ae6b28429211e4386e3b956 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 30 Jun 2015 23:00:03 +0200
Subject: spaces were not stored due to automatically tools

---
 data/pages/wiki/syntax.txt | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 7b453efa2..d56e5a24c 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -261,17 +261,19 @@ There are three exceptions which do not come from that pattern file: multiplicat
 
 Some times you want to mark some text to show it's a reply or comment. You can use the following syntax:
 
-  I think we should do it
-  
-  > No we shouldn't
-  
-  >> Well, I say we should
-  
-  > Really?
-  
-  >> Yes!
-  
-  >>> Then lets do it!
+<code>
+I think we should do it
+
+> No we shouldn't
+
+>> Well, I say we should
+
+> Really?
+
+>> Yes!
+
+>>> Then lets do it!
+</code>
 
 I think we should do it
 
-- 
cgit v1.2.3


From aff13b5a791d8a0b0812d4c013e85b42df37863a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 30 Jun 2015 23:00:39 +0200
Subject: emphasis syntax has similar syntax, prevent conflicts

---
 data/pages/wiki/syntax.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index d56e5a24c..8e10b1906 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -319,7 +319,7 @@ As you can see, it's the cell separator before a cell which decides about the fo
   ^ Heading 4    | no colspan this time |                    |
   ^ Heading 5    | Row 2 Col 2          | Row 2 Col 3        |
 
-You can have rowspans (vertically connected cells) by adding '':::'' into the cells below the one to which they should connect.
+You can have rowspans (vertically connected cells) by adding ''%%:::%%'' into the cells below the one to which they should connect.
 
 ^ Heading 1      ^ Heading 2                  ^ Heading 3          ^
 | Row 1 Col 1    | this cell spans vertically | Row 1 Col 3        |
-- 
cgit v1.2.3


From 7de86af9758e71d251fad91063035a459d83d2eb Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 30 Jun 2015 23:07:10 +0200
Subject: phpdocs, reformatting

---
 inc/changelog.php   | 13 +++++++++----
 inc/pageutils.php   | 26 +++++++++++++++-----------
 inc/parserutils.php | 19 +++++++++++++------
 3 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/inc/changelog.php b/inc/changelog.php
index d1ef7973e..f4731021c 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -849,18 +849,17 @@ abstract class ChangeLog {
     public function isCurrentRevision($rev) {
         return $rev == @filemtime($this->getFilename());
     }
-    
+
     /**
-    * Return an existing revision for a specific date which is 
+    * Return an existing revision for a specific date which is
     * the current one or younger or equal then the date
     *
-    * @param string $id 
     * @param number $date_at timestamp
     * @return string revision ('' for current)
     */
     function getLastRevisionAt($date_at){
         //requested date_at(timestamp) younger or equal then modified_time($this->id) => load current
-        if($date_at >= @filemtime($this->getFilename())) { 
+        if($date_at >= @filemtime($this->getFilename())) {
             return '';
         } else if ($rev = $this->getRelativeRevision($date_at+1, -1)) { //+1 to get also the requested date revision
             return $rev;
@@ -1049,6 +1048,12 @@ class MediaChangelog extends ChangeLog {
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
  * @author Kate Arzamastseva <pshns@ukr.net>
+ *
+ * @param string $id
+ * @param int    $rev
+ * @param int    $chunk_size
+ * @param bool   $media
+ * @return array|bool
  */
 function getRevisionInfo($id, $rev, $chunk_size = 8192, $media = false) {
     dbg_deprecated('class PageChangeLog or class MediaChangelog');
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 375712661..a5bf039d5 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -243,7 +243,6 @@ function sectionID($title,&$check) {
     return $title;
 }
 
-
 /**
  * Wiki page existence check
  *
@@ -251,9 +250,10 @@ function sectionID($title,&$check) {
  *
  * @author Chris Smith <chris@jalakai.co.uk>
  *
- * @param string     $id     page id
- * @param string|int $rev    empty or revision timestamp
- * @param bool       $clean  flag indicating that $id should be cleaned (see wikiFN as well)
+ * @param string $id page id
+ * @param string|int $rev empty or revision timestamp
+ * @param bool $clean flag indicating that $id should be cleaned (see wikiFN as well)
+ * @param bool $date_at
  * @return bool exists?
  */
 function page_exists($id,$rev='',$clean=true, $date_at=false) {
@@ -489,9 +489,11 @@ function resolve_id($ns,$id,$clean=true){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  *
- * @param string  $ns     namespace which is context of id
- * @param string &$page   (reference) relative media id, updated to resolved id
- * @param bool   &$exists (reference) updated with existance of media
+ * @param string $ns namespace which is context of id
+ * @param string &$page (reference) relative media id, updated to resolved id
+ * @param bool &$exists (reference) updated with existance of media
+ * @param int|string $rev
+ * @param bool $date_at
  */
 function resolve_mediaid($ns,&$page,&$exists,$rev='',$date_at=false){
     $page   = resolve_id($ns,$page);
@@ -502,7 +504,7 @@ function resolve_mediaid($ns,&$page,&$exists,$rev='',$date_at=false){
             $rev = $medialog_rev;
         }
     }
-    
+
     $file   = mediaFN($page,$rev);
     $exists = file_exists($file);
 }
@@ -512,9 +514,11 @@ function resolve_mediaid($ns,&$page,&$exists,$rev='',$date_at=false){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  *
- * @param string  $ns     namespace which is context of id
- * @param string &$page   (reference) relative page id, updated to resolved id
- * @param bool   &$exists (reference) updated with existance of media
+ * @param string $ns namespace which is context of id
+ * @param string &$page (reference) relative page id, updated to resolved id
+ * @param bool &$exists (reference) updated with existance of media
+ * @param string $rev
+ * @param bool $date_at
  */
 function resolve_pageid($ns,&$page,&$exists,$rev='',$date_at=false ){
     global $conf;
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 8650f974f..5b96d39fe 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -121,15 +121,21 @@ function p_cached_output($file, $format='xhtml', $id='') {
     $cache = new cache_renderer($id, $file, $format);
     if ($cache->useCache()) {
         $parsed = $cache->retrieveCache(false);
-        if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- cachefile {$cache->cache} used -->\n";
+        if($conf['allowdebug'] && $format=='xhtml') {
+            $parsed .= "\n<!-- cachefile {$cache->cache} used -->\n";
+        }
     } else {
         $parsed = p_render($format, p_cached_instructions($file,false,$id), $info);
 
         if ($info['cache'] && $cache->storeCache($parsed)) {              // storeCache() attempts to save cachefile
-            if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- no cachefile used, but created {$cache->cache} -->\n";
+            if($conf['allowdebug'] && $format=='xhtml') {
+                $parsed .= "\n<!-- no cachefile used, but created {$cache->cache} -->\n";
+            }
         }else{
             $cache->removeCache();                     //try to delete cachefile
-            if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- no cachefile used, caching forbidden -->\n";
+            if($conf['allowdebug'] && $format=='xhtml') {
+                $parsed .= "\n<!-- no cachefile used, caching forbidden -->\n";
+            }
         }
     }
 
@@ -616,8 +622,9 @@ function p_sort_modes($a, $b){
  * @author Andreas Gohr <andi@splitbrain.org>
  *
  * @param string $mode
- * @param array|null|false  $instructions
- * @param array  $info returns render info like enabled toc and cache
+ * @param array|null|false $instructions
+ * @param array $info returns render info like enabled toc and cache
+ * @param string $date_at
  * @return null|string rendered output
  */
 function p_render($mode,$instructions,&$info,$date_at=''){
@@ -632,7 +639,7 @@ function p_render($mode,$instructions,&$info,$date_at=''){
     if($date_at) {
         $Renderer->date_at = $date_at;
     }
-    
+
     $Renderer->smileys = getSmileys();
     $Renderer->entities = getEntities();
     $Renderer->acronyms = getAcronyms();
-- 
cgit v1.2.3


From 19cd38771326eea15b458a160845dfa200c5f9e6 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 30 Jun 2015 23:17:27 +0200
Subject: Add description of ?linkonly below the embedded media list at syntax
 page

---
 data/pages/wiki/syntax.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 8e10b1906..613c04ace 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -170,6 +170,12 @@ DokuWiki can embed the following media formats directly.
 
 If you specify a filename that is not a supported media format, then it will be displayed as a link instead.
 
+By adding ''?linkonly'' you provide a link to the media without displaying it inline
+
+  {{wiki:dokuwiki-128.png?linkonly}}
+
+{{wiki:dokuwiki-128.png?linkonly}} This is just a link to the image.
+
 ==== Fallback Formats ====
 
 Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility.
-- 
cgit v1.2.3


From 4d1366e45cecd27c337b0a8d606cfcde58f9ac8c Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 30 Jun 2015 23:55:08 +0200
Subject: Use a DateTime object in the IXR_Date

---
 _test/tests/inc/ixr_library_date.test.php |  6 ++++
 inc/IXR_Library.php                       | 56 ++++++++++++++-----------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/_test/tests/inc/ixr_library_date.test.php b/_test/tests/inc/ixr_library_date.test.php
index f38486925..fd5711212 100644
--- a/_test/tests/inc/ixr_library_date.test.php
+++ b/_test/tests/inc/ixr_library_date.test.php
@@ -16,12 +16,18 @@ class ixr_library_date_test extends DokuWikiTest {
             array('2010-08-17T09:23:14Z', 1282036994),
             array('20100817T09:23:14Z',   1282036994),
 
+            // with timezone
+            array('2010-08-17 09:23:14+0000',  1282036994),
+            array('2010-08-17 09:23:14+00:00',  1282036994),
+            array('2010-08-17 09:23:14+03:00',  1282036994),
+
             // no seconds
             array('2010-08-17T09:23',     1282036980),
             array('20100817T09:23',       1282036980),
 
             // no time
             array('2010-08-17',           1282003200),
+            array(1282036980,             1282036980),
             //array('20100817',             1282003200), #this will NOT be parsed, but is assumed to be timestamp
         );
 
diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 301a8d9e1..4bd57aa26 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -818,18 +818,14 @@ EOD;
  * @since 1.5
  */
 class IXR_Date {
-    var $year;
-    var $month;
-    var $day;
-    var $hour;
-    var $minute;
-    var $second;
-    var $timezone;
+
+    /** @var DateTime */
+    protected $date;
 
     /**
      * @param int|string $time
      */
-    function __construct($time) {
+    public function __construct($time) {
         // $time can be a PHP timestamp or an ISO one
         if(is_numeric($time)) {
             $this->parseTimestamp($time);
@@ -839,51 +835,48 @@ class IXR_Date {
     }
 
     /**
+     * Parse unix timestamp
+     *
      * @param int $timestamp
      */
-    function parseTimestamp($timestamp) {
-        $this->year = gmdate('Y', $timestamp);
-        $this->month = gmdate('m', $timestamp);
-        $this->day = gmdate('d', $timestamp);
-        $this->hour = gmdate('H', $timestamp);
-        $this->minute = gmdate('i', $timestamp);
-        $this->second = gmdate('s', $timestamp);
-        $this->timezone = '';
+    protected function parseTimestamp($timestamp) {
+        $this->date = new DateTime('@' . $timestamp);
     }
 
     /**
+     * Parses less or more complete iso dates and much more, if no timezone given assumes UTC
+     *
      * @param string $iso
      */
-    function parseIso($iso) {
-        if(preg_match('/^(\d\d\d\d)-?(\d\d)-?(\d\d)([T ](\d\d):(\d\d)(:(\d\d))?)?/', $iso, $match)) {
-            $this->year = (int) $match[1];
-            $this->month = (int) $match[2];
-            $this->day = (int) $match[3];
-            $this->hour = (int) $match[5];
-            $this->minute = (int) $match[6];
-            $this->second = (int) $match[8];
-        }
+    protected function parseIso($iso) {
+        $this->date = new DateTime($iso, new DateTimeZone("UTC"));
     }
 
     /**
+     * Returns date in ISO 8601 format
+     *
      * @return string
      */
-    function getIso() {
-        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second . $this->timezone;
+    public function getIso() {
+        return $this->date->format(DateTime::ISO8601);
     }
 
     /**
+     * Returns date in valid xml
+     *
      * @return string
      */
-    function getXml() {
+    public function getXml() {
         return '<dateTime.iso8601>' . $this->getIso() . '</dateTime.iso8601>';
     }
 
     /**
+     * Returns Unix timestamp
+     *
      * @return int
      */
     function getTimestamp() {
-        return gmmktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+        return $this->date->getTimestamp();
     }
 }
 
@@ -923,6 +916,9 @@ class IXR_IntrospectionServer extends IXR_Server {
     /** @var string[] */
     var $help;
 
+    /**
+     * Constructor
+     */
     function __construct() {
         $this->setCallbacks();
         $this->setCapabilities();
@@ -1107,7 +1103,7 @@ class IXR_ClientMulticall extends IXR_Client {
      * @param int $port
      */
     function __construct($server, $path = false, $port = 80) {
-        parent::IXR_Client($server, $path, $port);
+        parent::__construct($server, $path, $port);
         //$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
     }
 
-- 
cgit v1.2.3


From 47ab76cc8e7efb398f80a778639267a3e33c3f7d Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 30 Jun 2015 23:55:22 +0200
Subject: undefined var

---
 inc/IXR_Library.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 4bd57aa26..5ae1402b9 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -297,6 +297,7 @@ class IXR_Message {
      * @param $tag
      */
     function tag_close($parser, $tag) {
+        $value = null;
         $valueFlag = false;
         switch($tag) {
             case 'int':
-- 
cgit v1.2.3


From ec3b241dc4541d05f30c9ee696bc5117fbe88007 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 1 Jul 2015 00:04:34 +0200
Subject: improve IXR_Date unittests

---
 _test/tests/inc/ixr_library_date.test.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/_test/tests/inc/ixr_library_date.test.php b/_test/tests/inc/ixr_library_date.test.php
index fd5711212..0c81e6741 100644
--- a/_test/tests/inc/ixr_library_date.test.php
+++ b/_test/tests/inc/ixr_library_date.test.php
@@ -2,6 +2,9 @@
 
 require_once DOKU_INC.'inc/IXR_Library.php';
 
+/**
+ * Class ixr_library_date_test
+ */
 class ixr_library_date_test extends DokuWikiTest {
 
 
@@ -19,7 +22,7 @@ class ixr_library_date_test extends DokuWikiTest {
             // with timezone
             array('2010-08-17 09:23:14+0000',  1282036994),
             array('2010-08-17 09:23:14+00:00',  1282036994),
-            array('2010-08-17 09:23:14+03:00',  1282036994),
+            array('2010-08-17 12:23:14+03:00',  1282036994),
 
             // no seconds
             array('2010-08-17T09:23',     1282036980),
@@ -28,12 +31,12 @@ class ixr_library_date_test extends DokuWikiTest {
             // no time
             array('2010-08-17',           1282003200),
             array(1282036980,             1282036980),
-            //array('20100817',             1282003200), #this will NOT be parsed, but is assumed to be timestamp
+//            array('20100817',             1282003200), #this will NOT be parsed, but is assumed to be timestamp
         );
 
         foreach($tests as $test){
             $dt = new IXR_Date($test[0]);
-            $this->assertEquals($dt->getTimeStamp(),$test[1]);
+            $this->assertEquals($test[1], $dt->getTimeStamp());
         }
     }
 
-- 
cgit v1.2.3


From f30ba39860122e7c5061989c09786dd2febe29eb Mon Sep 17 00:00:00 2001
From: rnck <dokuwiki@rnck.de>
Date: Thu, 2 Jul 2015 15:55:57 +0200
Subject: translation update

---
 inc/lang/de-informal/lang.php                | 20 ++++++++++++++++----
 lib/plugins/authad/lang/de-informal/lang.php |  3 +++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 6545621d7..42fb9a265 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -22,6 +22,7 @@
  * @author Frank Loizzi <contact@software.bacal.de>
  * @author Volker Bödker <volker@boedker.de>
  * @author Janosch <janosch@moinzen.de>
+ * @author rnck <dokuwiki@rnck.de>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -65,6 +66,8 @@ $lang['btn_register']          = 'Registrieren';
 $lang['btn_apply']             = 'Übernehmen';
 $lang['btn_media']             = 'Medien-Manager';
 $lang['btn_deleteuser']        = 'Benutzerprofil löschen';
+$lang['btn_img_backto']        = 'Zurück zu %s';
+$lang['btn_mediaManager']      = 'Im Medien-Manager anzeigen';
 $lang['loggedinas']            = 'Angemeldet als:';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
@@ -80,11 +83,12 @@ $lang['badpassconfirm']        = 'Das Passwort war falsch.';
 $lang['minoredit']             = 'Kleine Änderung';
 $lang['draftdate']             = 'Entwurf gespeichert am';
 $lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, da das Sektionsinfo veraltet ist. Die ganze Seite wird stattdessen geladen.';
-$lang['searchcreatepage']      = "Falls der gesuchte Begriff nicht gefunden wurde, kannst du direkt eine neue Seite für den Suchbegriff anlegen, indem du auf den Knopf **''[Seite anlegen]''** drückst.";
+$lang['searchcreatepage']      = 'Falls der gesuchte Begriff nicht gefunden wurde, kannst du direkt eine neue Seite für den Suchbegriff anlegen, indem du auf den Knopf **\'\'[Seite anlegen]\'\'** drückst.';
 $lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden';
 $lang['reguexists']            = 'Der Benutzername existiert leider schon.';
 $lang['regsuccess']            = 'Der neue Benutzer wurde angelegt und das Passwort per E-Mail versandt.';
 $lang['regsuccess2']           = 'Der neue Benutzer wurde angelegt.';
+$lang['regfail']               = 'Der Benutzer konnte nicht erstellt werden.';
 $lang['regmailfail']           = 'Offenbar ist ein Fehler beim Versenden der Passwortmail aufgetreten. Bitte wende dich an den Wiki-Admin.';
 $lang['regbadmail']            = 'Die angegebene Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wende dich bitte an den Wiki-Admin.';
 $lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuche es noch einmal.';
@@ -99,6 +103,7 @@ $lang['profdeleteuser']        = 'Benutzerprofil löschen';
 $lang['profdeleted']           = 'Dein Benutzerprofil wurde im Wiki gelöscht.';
 $lang['profconfdelete']        = 'Ich möchte mein Benutzerprofil löschen.<br/> Diese Aktion ist nicht umkehrbar.';
 $lang['profconfdeletemissing'] = 'Bestätigungs-Checkbox wurde nicht angehakt.';
+$lang['proffail']              = 'Das Benutzerprofil wurde nicht aktualisiert.';
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
 $lang['resendpwd']             = 'Neues Passwort setzen für';
@@ -194,6 +199,11 @@ $lang['difflink']              = 'Link zu der Vergleichsansicht';
 $lang['diff_type']             = 'Unterschiede anzeigen:';
 $lang['diff_inline']           = 'Inline';
 $lang['diff_side']             = 'Side by Side';
+$lang['diffprevrev']           = 'Vorherige Überarbeitung';
+$lang['diffnextrev']           = 'Nächste Überarbeitung';
+$lang['difflastrev']           = 'Letzte Überarbeitung';
+$lang['diffbothprevrev']       = 'Beide Seiten, vorherige Überarbeitung';
+$lang['diffbothnextrev']       = 'Beide Seiten, nächste Überarbeitung';
 $lang['line']                  = 'Zeile';
 $lang['breadcrumb']            = 'Zuletzt angesehen:';
 $lang['youarehere']            = 'Du befindest dich hier:';
@@ -249,7 +259,6 @@ $lang['upperns']               = 'Gehe zum übergeordneten Namensraum';
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
-$lang['btn_img_backto']            = 'Zurück zu %s';
 $lang['img_title']             = 'Titel:';
 $lang['img_caption']           = 'Bildunterschrift:';
 $lang['img_date']              = 'Datum:';
@@ -262,7 +271,6 @@ $lang['img_camera']            = 'Kamera:';
 $lang['img_keywords']          = 'Schlagwörter:';
 $lang['img_width']             = 'Breite:';
 $lang['img_height']            = 'Höhe:';
-$lang['btn_mediaManager']           = 'Im Medien-Manager anzeigen';
 $lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementliste von %s hinzugefügt';
 $lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementliste von %s';
 $lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden';
@@ -289,6 +297,7 @@ $lang['i_problems']            = 'Das Installationsprogramm hat unten aufgeführ
 $lang['i_modified']            = 'Aus Sicherheitsgründen arbeitet dieses Skript nur mit einer neuen bzw. nicht modifizierten DokuWiki-Installation. Du solltest entweder alle Dateien noch einmal frisch installieren oder die <a href="http://dokuwiki.org/install">Dokuwiki-Installationsanleitung</a> konsultieren.';
 $lang['i_funcna']              = 'Die PHP-Funktion <code>%s</code> ist nicht verfügbar. Unter Umständen wurde sie von deinem Hoster deaktiviert?';
 $lang['i_phpver']              = 'Deine PHP-Version <code>%s</code> ist niedriger als die benötigte Version <code>%s</code>. Bitte aktualisiere deine PHP-Installation.';
+$lang['i_mbfuncoverload']      = 'mbstring.func_overload muss in php.in deaktiviert werden um DokuWiki auszuführen.';
 $lang['i_permfail']            = '<code>%s</code> ist nicht durch DokuWiki beschreibbar. Du musst die Berechtigungen dieses Ordners ändern!';
 $lang['i_confexists']          = '<code>%s</code> existiert bereits';
 $lang['i_writeerr']            = '<code>%s</code> konnte nicht erzeugt werden. Du solltest die Verzeichnis-/Datei-Rechte überprüfen und die Datei manuell anlegen.';
@@ -338,6 +347,9 @@ $lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigunge
 $lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
 $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
+$lang['media_acl_warning']     = 'Diese Liste ist möglicherweise nicht vollständig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.';
 $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnis';
-$lang['media_acl_warning']     = 'Diese Liste ist möglicherweise nicht vollständig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.';
+$lang['plainhtml']             = 'Reines HTML';
+$lang['wikimarkup']            = 'Wiki Markup';
+$lang['page_nonexist_rev']     = 'Seite existierte nicht an der Stelle %s. Sie wurde an folgende Stelle erstellt: <a href="%s">%s</a>.';
diff --git a/lib/plugins/authad/lang/de-informal/lang.php b/lib/plugins/authad/lang/de-informal/lang.php
index e9361d5fe..973c992d2 100644
--- a/lib/plugins/authad/lang/de-informal/lang.php
+++ b/lib/plugins/authad/lang/de-informal/lang.php
@@ -4,5 +4,8 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Andreas Gohr <gohr@cosmocode.de>
+ * @author rnck <dokuwiki@rnck.de>
  */
 $lang['authpwdexpire']         = 'Dein Passwort läuft in %d Tag(en) ab. Du solltest es es frühzeitig ändern.';
+$lang['passchangefail']        = 'Das Passwort konnte nicht geändert werden. Eventuell wurde die Passwort-Richtlinie nicht eingehalten.';
+$lang['connectfail']           = 'Verbindung zum Active Directory Server fehlgeschlagen.';
-- 
cgit v1.2.3


From 2ee76f4a8d89135027e4a492d2d000b04252e0eb Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Jul 2015 13:19:40 +0100
Subject: fixed installed extensions in extension manager not displaying
 without JS

---
 lib/plugins/extension/script.js  |  9 +++++----
 lib/plugins/extension/style.less | 25 ++++++++++++++-----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index bc1bf8b12..7d78d2a03 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -114,16 +114,17 @@ jQuery(function(){
         Create section for enabling/disabling viewing options
      */
     if ( $extmgr.find('.plugins, .templates').hasClass('active') ) {
+        var $extlist = jQuery('#extension__list');
+        $extlist.addClass('hasDisplayOptions');
         var $displayOpts = jQuery('<p>', { id: 'extension__viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
 
         $displayOpts.append(LANG.plugins.extension.display_viewoptions);
-    
+
         var displayOptionsHandler = function(){
-            jQuery('#extension__list').toggleClass( this.name );
+            $extlist.toggleClass( this.name );
         };
-    
+
         jQuery(['enabled', 'disabled', 'updatable']).each(function(index, chkName){
-        
             var $label = jQuery( '<label></label>' ).appendTo($displayOpts);
             jQuery( '<input />', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click();
             jQuery( '<span/>' ).append(LANG.plugins.extension['display_'+chkName]).appendTo($label);
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 38b2d65d0..f35878009 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -281,18 +281,21 @@
  * Enabled/Disabled overrides
  */
 #extension__list {
-    
-    .enabled, .disabled,
-    .updatable {
-        display: none;
-    }
-    
-    &.enabled .enabled,
-    &.disabled .disabled,
-    &.updatable .updatable {
-        display: block;
+
+    &.hasDisplayOptions {
+        .enabled,
+        .disabled,
+        .updatable {
+            display: none;
+        }
+
+        &.enabled .enabled,
+        &.disabled .disabled,
+        &.updatable .updatable {
+            display: block;
+        }
     }
-    
+
     .enabled div.screenshot span {
         background: transparent url(images/enabled.png) no-repeat 2px 2px;
     }
-- 
cgit v1.2.3


From 1539b4dd6b40c7af97092763889cab5ee76c1187 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Jul 2015 13:20:26 +0100
Subject: fixed small spacing/alignment issues in display options of extension
 manager

---
 lib/plugins/extension/script.js  | 2 +-
 lib/plugins/extension/style.less | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index 7d78d2a03..c74c44ad1 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -127,7 +127,7 @@ jQuery(function(){
         jQuery(['enabled', 'disabled', 'updatable']).each(function(index, chkName){
             var $label = jQuery( '<label></label>' ).appendTo($displayOpts);
             jQuery( '<input />', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click();
-            jQuery( '<span/>' ).append(LANG.plugins.extension['display_'+chkName]).appendTo($label);
+            jQuery( '<span/>' ).append(' '+LANG.plugins.extension['display_'+chkName]).appendTo($label);
         });
     }
 });
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index f35878009..86e540b0f 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -379,4 +379,5 @@
 
 #extension__viewoptions label {
     margin-left: 1em;
+    vertical-align: baseline;
 }
-- 
cgit v1.2.3


From 9f4b197e717f979e2a6a5130ca0dff814d026be5 Mon Sep 17 00:00:00 2001
From: Rainbow Spike <Dr-Yukon@users.noreply.github.com>
Date: Tue, 7 Jul 2015 19:09:20 +1000
Subject: Update lang.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Выравнивание и разбиение по образцу en/lang.php, унификация "директорий" и "папок", "расширений" и "дополнений"
---
 lib/plugins/extension/lang/ru/lang.php | 186 ++++++++++++++++++---------------
 1 file changed, 99 insertions(+), 87 deletions(-)

diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index c7ef52b42..a16f0ca95 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -10,91 +10,103 @@
  * @author Alex P <alexander@lanos.co.uk>
  * @author Takumo <9206984@mail.ru>
  */
-$lang['menu']                  = 'Управление дополнениями';
-$lang['tab_plugins']           = 'Установленные плагины';
-$lang['tab_templates']         = 'Установленные шаблоны';
-$lang['tab_search']            = 'Поиск и установка';
-$lang['tab_install']           = 'Ручная установка';
-$lang['notimplemented']        = 'Эта возможность ещё не реализована';
-$lang['notinstalled']          = 'Это дополнение не установлено';
-$lang['alreadyenabled']        = 'Это расширение уже включено';
-$lang['alreadydisabled']       = 'Это расширение уже выключено';
-$lang['pluginlistsaveerror']   = 'Ошибка при сохранении списка плагинов';
-$lang['unknownauthor']         = 'Автор неизвестен';
-$lang['unknownversion']        = 'Версия неизвестна';
-$lang['btn_info']              = 'Отобразить доп. информацию';
-$lang['btn_update']            = 'Обновить';
-$lang['btn_uninstall']         = 'Удалить';
-$lang['btn_enable']            = 'Включить';
-$lang['btn_disable']           = 'Отключить';
-$lang['btn_install']           = 'Установить';
-$lang['btn_reinstall']         = 'Переустановить';
-$lang['js']['reallydel']       = 'Действительно удалить это дополнение?';
-$lang['js']['display_viewoptions'] = 'Показать как:';
-$lang['js']['display_enabled'] = 'включено';
-$lang['js']['display_disabled'] = 'отключено';
-$lang['js']['display_updatable'] = 'обновление';
-$lang['search_for']            = 'Поиск дополнения:';
-$lang['search']                = 'Найти';
-$lang['extensionby']           = '<strong>%s</strong> — %s';
-$lang['screenshot']            = 'Скриншот: %s';
-$lang['popularity']            = 'Популярность: %s%%';
-$lang['homepage_link']         = 'Описание';
-$lang['bugs_features']         = 'Баг-трекер';
-$lang['tags']                  = 'Метки:';
-$lang['author_hint']           = 'Найти дополнения автора';
-$lang['installed']             = 'Установлено:';
-$lang['downloadurl']           = 'Скачать:';
-$lang['repository']            = 'Репозиторий:';
-$lang['unknown']               = '<em>неизвестно</em>';
-$lang['installed_version']     = 'Уст. версия:';
-$lang['install_date']          = 'Посл. обновление:';
-$lang['available_version']     = 'Доступная версия:';
-$lang['compatible']            = 'Совместим с';
-$lang['depends']               = 'Зависит от';
-$lang['similar']               = 'Похож на';
-$lang['conflicts']             = 'Конфликтует с';
-$lang['donate']                = 'Нравится?';
-$lang['donate_action']         = 'Купить автору кофе!';
-$lang['repo_retry']            = 'Повторить';
-$lang['provides']              = 'Предоставляет:';
-$lang['status']                = 'Статус:';
-$lang['status_installed']      = 'установлено';
-$lang['status_not_installed']  = 'не установлено';
-$lang['status_protected']      = 'защищено';
-$lang['status_enabled']        = 'включён';
-$lang['status_disabled']       = 'отключено';
-$lang['status_unmodifiable']   = 'неизменяемо';
-$lang['status_plugin']         = 'плагин';
-$lang['status_template']       = 'шаблон';
-$lang['status_bundled']        = 'в комплекте';
-$lang['msg_enabled']           = 'Плагин %s включён';
-$lang['msg_disabled']          = 'Плагин %s отключён';
-$lang['msg_delete_success']    = 'Дополнение %s удалено';
-$lang['msg_delete_failed']     = 'Не удалось удалить расширение %s';
+$lang['menu']                         = 'Управление дополнениями';
+
+$lang['tab_plugins']                  = 'Установленные плагины';
+$lang['tab_templates']                = 'Установленные шаблоны';
+$lang['tab_search']                   = 'Поиск и установка';
+$lang['tab_install']                  = 'Ручная установка';
+
+$lang['notimplemented']               = 'Эта возможность ещё не реализована';
+$lang['notinstalled']                 = 'Это дополнение не установлено';
+$lang['alreadyenabled']               = 'Это дополнение уже включено';
+$lang['alreadydisabled']              = 'Это дополнение уже отключено';
+$lang['pluginlistsaveerror']          = 'Ошибка при сохранении списка плагинов';
+$lang['unknownauthor']                = 'Автор неизвестен';
+$lang['unknownversion']               = 'Версия неизвестна';
+
+$lang['btn_info']                     = 'Отобразить доп. информацию';
+$lang['btn_update']                   = 'Обновить';
+$lang['btn_uninstall']                = 'Удалить';
+$lang['btn_enable']                   = 'Включить';
+$lang['btn_disable']                  = 'Отключить';
+$lang['btn_install']                  = 'Установить';
+$lang['btn_reinstall']                = 'Переустановить';
+
+$lang['js']['reallydel']              = 'Действительно удалить это дополнение?';
+$lang['js']['display_viewoptions']    = 'Показать как:';
+$lang['js']['display_enabled']        = 'включено';
+$lang['js']['display_disabled']       = 'отключено';
+$lang['js']['display_updatable']      = 'обновление';
+
+$lang['search_for']                   = 'Поиск дополнения:';
+$lang['search']                       = 'Найти';
+
+$lang['extensionby']                  = '<strong>%s</strong> — %s';
+$lang['screenshot']                   = 'Скриншот: %s';
+$lang['popularity']                   = 'Популярность: %s%%';
+$lang['homepage_link']                = 'Описание';
+$lang['bugs_features']                = 'Баг-трекер';
+$lang['tags']                         = 'Метки:';
+$lang['author_hint']                  = 'Найти дополнения этого автора';
+$lang['installed']                    = 'Установлено:';
+$lang['downloadurl']                  = 'Скачать:';
+$lang['repository']                   = 'Репозиторий:';
+$lang['unknown']                      = '<em>неизвестно</em>';
+$lang['installed_version']            = 'Уст. версия:';
+$lang['install_date']                 = 'Посл. обновление:';
+$lang['available_version']            = 'Доступная версия:';
+$lang['compatible']                   = 'Совместим с:';
+$lang['depends']                      = 'Зависит от:';
+$lang['similar']                      = 'Похож на:';
+$lang['conflicts']                    = 'Конфликтует с:';
+$lang['donate']                       = 'Нравится?';
+$lang['donate_action']                = 'Купить автору кофе!';
+$lang['repo_retry']                   = 'Повторить';
+$lang['provides']                     = 'Предоставляет:';
+$lang['status']                       = 'Состояние:';
+$lang['status_installed']             = 'установлено';
+$lang['status_not_installed']         = 'не установлено';
+$lang['status_protected']             = 'защищено';
+$lang['status_enabled']               = 'включено';
+$lang['status_disabled']              = 'отключено';
+$lang['status_unmodifiable']          = 'неизменяемо';
+$lang['status_plugin']                = 'плагин';
+$lang['status_template']              = 'шаблон';
+$lang['status_bundled']               = 'в комплекте';
+
+$lang['msg_enabled']                  = 'Плагин %s включён';
+$lang['msg_disabled']                 = 'Плагин %s отключён';
+$lang['msg_delete_success']           = 'Дополнение удалено';
+$lang['msg_delete_failed']            = 'Не удалось удалить дополнение %s';
 $lang['msg_template_install_success'] = 'Шаблон %s успешно установлен';
-$lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён';
-$lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен';
-$lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён';
-$lang['msg_upload_failed']     = 'Не удалось загрузить файл';
-$lang['missing_dependency']    = '<strong>Отсутствует или отключена зависимость:</strong> %s';
-$lang['security_issue']        = '<strong>Проблема безопасности:</strong> %s';
-$lang['security_warning']      = '<strong>Предупреждение безопасности:</strong> %s';
-$lang['update_available']      = '<strong>Обновление:</strong> доступна новая версия %s.';
-$lang['wrong_folder']          = '<strong>Плагин установлен неправильно:</strong> переименуйте папку плагина из %s в %s.';
-$lang['url_change']            = '<strong>Ссылка изменилась:</strong> ссылка для загрузки изменилась с прошлого раза. Проверьте новую ссылку прежде, чем обновлять расширение.<br />Новая: %s<br />Старая: %s';
-$lang['error_badurl']          = 'Ссылки должны начинаться с http или https';
-$lang['error_dircreate']       = 'Не удалось создать временную директорию для загрузки';
-$lang['error_download']        = 'Не удалось загрузить файл: %s';
-$lang['error_decompress']      = 'Не удалось распаковать загруженный файл. Возможно, файл был повреждён при загрузке — тогда нужно попробовать ещё раз. Либо неизвестен формат архива — тогда загрузку и установку надо произвести вручную.';
-$lang['error_findfolder']      = 'Не удалось определить директорию для расширения, загрузку и установку надо произвести вручную.';
-$lang['error_copy']            = 'Возникла ошибка копирования файлов в директорию <em>%s</em>: возможно, диск переполнен, или неверно выставлены права доступа. Это могло привести к неполной установке плагина и нарушить работу вашей вики.';
-$lang['noperms']               = 'Папка для расширений недоступна для записи';
-$lang['notplperms']            = 'Папка для шаблонов недоступна для записи';
-$lang['nopluginperms']         = 'Папка плагинов недоступна для записи';
-$lang['git']                   = 'Это расширение было установлено через git. Вы не можете обновить его тут.';
-$lang['auth']                  = 'Этот auth плагин не включен в конфигурации, подумайте о его отключении';
-$lang['install_url']           = 'Установить с адреса URL';
-$lang['install_upload']        = 'Скачать расширение';
-$lang['repo_error']            = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернетом.';
-$lang['nossl']                 = 'Ваша PHP конфигурация не имеет SSL поддержки. Это поломает скачивание для многих DokuWiki плагинов и расширений.';
+$lang['msg_template_update_success']  = 'Шаблон %s успешно обновлён';
+$lang['msg_plugin_install_success']   = 'Плагин %s успешно установлен';
+$lang['msg_plugin_update_success']    = 'Плагин %s успешно обновлён';
+$lang['msg_upload_failed']            = 'Не удалось загрузить файл';
+
+$lang['missing_dependency']           = '<strong>Отсутствует или отключена зависимость:</strong> %s';
+$lang['security_issue']               = '<strong>Проблема безопасности:</strong> %s';
+$lang['security_warning']             = '<strong>Предупреждение безопасности:</strong> %s';
+$lang['update_available']             = '<strong>Обновление:</strong> доступна новая версия %s';
+$lang['wrong_folder']                 = '<strong>Плагин установлен неправильно:</strong> переименуйте директорию плагина из %s в %s';
+$lang['url_change']                   = '<strong>Ссылка изменилась:</strong> ссылка для загрузки изменилась с прошлого раза. Проверьте новую ссылку прежде, чем обновлять дополнение.<br />Новая: %s<br />Старая: %s';
+
+$lang['error_badurl']                 = 'Ссылка должна начинаться с http или https';
+$lang['error_dircreate']              = 'Не удалось создать временную директорию для загрузки';
+$lang['error_download']               = 'Не удалось загрузить файл: %s';
+$lang['error_decompress']             = 'Не удалось распаковать загруженный файл. Возможно, файл был повреждён при загрузке — тогда нужно попробовать ещё раз. Либо неизвестен формат архива — тогда загрузку и установку надо произвести вручную';
+$lang['error_findfolder']             = 'Не удалось определить директорию для дополнения, загрузку и установку надо произвести вручную.';
+$lang['error_copy']                   = 'Возникла ошибка копирования файлов в директорию <em>%s</em>: возможно, диск переполнен, или неверно выставлены права доступа. Это могло привести к неполной установке плагина и нарушить работу вашей вики.';
+
+$lang['noperms']                      = 'Директория для дополнений не доступна для записи';
+$lang['notplperms']                   = 'Директория для шаблонов не доступна для записи';
+$lang['nopluginperms']                = 'Директория для плагинов не доступна для записи';
+$lang['git']                          = 'Это дополнение было установлено через git. Вы не можете обновить его тут.';
+$lang['auth']                         = 'Этот auth плагин не включен в конфигурации, подумайте о его отключении';
+
+$lang['install_url']                  = 'Установить с адреса:';
+$lang['install_upload']               = 'Скачать дополнение:';
+
+$lang['repo_error']                   = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org и также проверьте настройки соединения прокси.';
+$lang['nossl']                        = 'Ваша PHP конфигурация не имеет SSL поддержки. Это поломает скачивание для многих DokuWiki плагинов и дополнений.';
-- 
cgit v1.2.3


From d634152e42ef1c75d899f021132ce0c2632257ac Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 7 Jul 2015 12:39:55 +0100
Subject: improved various minor frontend issues in styling plugin

* improved spacing of popup
* made primary buttons clearer
* xhtml and validity fixes
* improved some lang strings
* moved 'open as popup' after intro
* fixed page reload after clicking 'open as popup' button
---
 lib/plugins/styling/admin.php        | 16 ++++++++--------
 lib/plugins/styling/lang/en/lang.php | 10 +++++-----
 lib/plugins/styling/popup.php        | 14 ++++++++------
 lib/plugins/styling/script.js        | 14 ++++++++------
 lib/plugins/styling/style.less       |  7 ++-----
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
index 627efbd15..f241e3fed 100644
--- a/lib/plugins/styling/admin.php
+++ b/lib/plugins/styling/admin.php
@@ -43,7 +43,7 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
      */
     public function html() {
         $class = 'nopopup';
-        if($this->ispopup) $class = 'ispopup';
+        if($this->ispopup) $class = 'ispopup page';
 
         echo '<div id="plugin__styling" class="'.$class.'">';
         ptln('<h1>'.$this->getLang('menu').'</h1>');
@@ -75,7 +75,7 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
 
             echo '<form class="styling" method="post" action="'.$target.'">';
 
-            echo '<table>';
+            echo '<table><tbody>';
             foreach($replacements as $key => $value) {
                 $name = tpl_getLang($key);
                 if(empty($name)) $name = $this->getLang($key);
@@ -83,22 +83,22 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
 
                 echo '<tr>';
                 echo '<td>'.$name.'</td>';
-                echo '<td><input type="text" name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' />';
+                echo '<td><input type="text" name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' /></td>';
                 echo '</tr>';
             }
-            echo '</table>';
+            echo '</tbody></table>';
 
             echo '<p>';
-            echo '<input type="submit" name="run[preview]" class="btn_preview" value="'.$this->getLang('btn_preview').'">';
-            echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'">'; #FIXME only if preview.ini exists
+            echo '<input type="submit" name="run[preview]" class="btn_preview primary" value="'.$this->getLang('btn_preview').'" /> ';
+            echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'" />'; #FIXME only if preview.ini exists
             echo '</p>';
 
             echo '<p>';
-            echo '<input type="submit" name="run[save]" value="'.$this->getLang('btn_save').'">';
+            echo '<input type="submit" name="run[save]" class="primary" value="'.$this->getLang('btn_save').'" />';
             echo '</p>';
 
             echo '<p>';
-            echo '<input type="submit" name="run[revert]" value="'.$this->getLang('btn_revert').'">'; #FIXME only if local.ini exists
+            echo '<input type="submit" name="run[revert]" value="'.$this->getLang('btn_revert').'" />'; #FIXME only if local.ini exists
             echo '</p>';
 
             echo '</form>';
diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
index a076065cb..010743956 100644
--- a/lib/plugins/styling/lang/en/lang.php
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -8,15 +8,15 @@
 // menu entry for admin plugins
 $lang['menu'] = 'Template Style Settings';
 
-$lang['js']['loader'] = 'Preview is loading...<br>if this does not goes away, your values may be faulty';
-$lang['js']['popup'] = 'Open as Popup';
+$lang['js']['loader'] = 'Preview is loading...<br />if this does not goes away, your values may be faulty';
+$lang['js']['popup'] = 'Open as a popup';
 
 // custom language strings for the plugin
 $lang['error'] = 'Sorry, this template does not support this functionality.';
 
-$lang['btn_preview'] = 'Preview your changes';
-$lang['btn_save']    = 'Save your changes';
-$lang['btn_reset']   = 'Reset your current changes';
+$lang['btn_preview'] = 'Preview changes';
+$lang['btn_save']    = 'Save changes';
+$lang['btn_reset']   = 'Reset current changes';
 $lang['btn_revert']  = 'Revert all styles back to the template\'s default';
 
 // default guaranteed placeholders
diff --git a/lib/plugins/styling/popup.php b/lib/plugins/styling/popup.php
index eea4f3bfd..964b19e29 100644
--- a/lib/plugins/styling/popup.php
+++ b/lib/plugins/styling/popup.php
@@ -4,6 +4,7 @@ require_once(DOKU_INC . 'inc/init.php');
 //close session
 session_write_close();
 header('Content-Type: text/html; charset=utf-8');
+header('X-UA-Compatible: IE=edge,chrome=1');
 
 /** @var admin_plugin_styling $plugin */
 $plugin = plugin_load('admin', 'styling');
@@ -14,15 +15,16 @@ $plugin->ispopup = true;
 $plugin->handle();
 
 // output plugin in a very minimal template:
-?>
-<html>
+?><!DOCTYPE html>
+<html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
 <head>
+    <meta charset="utf-8" />
     <title><?php echo $plugin->getLang('menu') ?></title>
     <?php tpl_metaheaders(false) ?>
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <?php echo tpl_favicon(array('favicon')) ?>
 </head>
-<body>
-    <div class="dokuwiki page">
-        <?php $plugin->html() ?>
-    </div>
+<body class="dokuwiki">
+    <?php $plugin->html() ?>
 </body>
 </html>
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 6fc2b9043..84b251eab 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -12,14 +12,15 @@ jQuery(function () {
 
     // add button on main page
     if (!$styling_plugin.hasClass('ispopup')) {
-        var $hl = $styling_plugin.find('h1').first();
-        var $btn = jQuery('<button class="btn">' + LANG.plugins.styling.popup + '</button>');
-        $hl.append($btn);
+        var $form = $styling_plugin.find('form.styling').first();
+        var $btn = jQuery('<button>' + LANG.plugins.styling.popup + '</button>');
+        $form.prepend($btn);
 
         $btn.click(function (e) {
             var windowFeatures = "menubar=no,location=no,resizable=yes,scrollbars=yes,status=false,width=500,height=500";
             window.open(DOKU_BASE + 'lib/plugins/styling/popup.php', 'styling', windowFeatures)
-        });
+            e.preventDefault();
+        }).wrap('<p></p>');
         return;
     }
 
@@ -54,9 +55,10 @@ jQuery(function () {
             'background-color': '#fff',
             'opacity':          '0.7',
             'color':            '#000',
-            'font-size':        '40px',
+            'font-size':        '2.5em',
             'text-align':       'center',
-            'line-height':      '90px'
+            'line-height':      1.5,
+            'padding-top':       '2em'
         });
         window.opener.jQuery('body').append($loader);
     }
diff --git a/lib/plugins/styling/style.less b/lib/plugins/styling/style.less
index 3cb563fdb..120768289 100644
--- a/lib/plugins/styling/style.less
+++ b/lib/plugins/styling/style.less
@@ -1,9 +1,6 @@
 #plugin__styling {
-
-    h1 button {
-        font-size: 12px;
-        line-height: 16px;
-        margin-left: 1em;
+    input.primary {
+        font-weight: bold;
     }
 }
 
-- 
cgit v1.2.3


From 147d8f481419c685b5408b7b793fd32a8923f35e Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 7 Jul 2015 13:04:52 +0100
Subject: added labels to form entries

---
 lib/plugins/styling/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
index f241e3fed..c6c04bb52 100644
--- a/lib/plugins/styling/admin.php
+++ b/lib/plugins/styling/admin.php
@@ -82,8 +82,8 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
                 if(empty($name)) $name = $key;
 
                 echo '<tr>';
-                echo '<td>'.$name.'</td>';
-                echo '<td><input type="text" name="tpl['.hsc($key).']" value="'.hsc($value).'" '.$this->colorClass($key).' /></td>';
+                echo '<td><label for="tpl__'.hsc($key).'">'.$name.'</label></td>';
+                echo '<td><input type="text" name="tpl['.hsc($key).']" id="tpl__'.hsc($key).'" value="'.hsc($value).'" '.$this->colorClass($key).' /></td>';
                 echo '</tr>';
             }
             echo '</tbody></table>';
-- 
cgit v1.2.3


From d750427ebf95dc91ec90b5c812180739317cd094 Mon Sep 17 00:00:00 2001
From: Errol <errol@hotmail.com>
Date: Wed, 8 Jul 2015 11:56:08 +0200
Subject: translation update

---
 inc/lang/zh/lang.php                      |  4 ++++
 lib/plugins/authad/lang/zh/lang.php       |  3 +++
 lib/plugins/authldap/lang/zh/lang.php     |  9 +++++++++
 lib/plugins/authldap/lang/zh/settings.php |  2 ++
 lib/plugins/authmysql/lang/zh/lang.php    | 11 +++++++++++
 lib/plugins/extension/lang/zh/lang.php    |  5 +++++
 6 files changed, 34 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/zh/lang.php
 create mode 100644 lib/plugins/authmysql/lang/zh/lang.php

diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 8f3a7bbf4..d179ad634 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -24,6 +24,7 @@
  * @author xiqingongzi <Xiqingongzi@Gmail.com>
  * @author qinghao <qingxianhao@gmail.com>
  * @author Yuwei Sun <yuwei@hrz.tu-chemnitz.de>
+ * @author Errol <errol@hotmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -89,6 +90,7 @@ $lang['regmissing']            = '对不起，您必须填写所有的字段。'
 $lang['reguexists']            = '对不起，该用户名已经存在。';
 $lang['regsuccess']            = '新用户已建立，密码将通过电子邮件发送给您。';
 $lang['regsuccess2']           = '新用户已建立';
+$lang['regfail']               = '用户不能被创建。';
 $lang['regmailfail']           = '发送密码邮件时产生错误。请联系管理员！';
 $lang['regbadmail']            = '您输入的邮件地址有问题——如果您认为这是系统错误，请联系管理员。';
 $lang['regbadpass']            = '您输入的密码与系统产生的不符，请重试。';
@@ -103,6 +105,7 @@ $lang['profdeleteuser']        = '删除账号';
 $lang['profdeleted']           = '你的用户已经从这个 wiki 中删除';
 $lang['profconfdelete']        = '我希望删除我的账户。<br/>这项操作无法撤销。';
 $lang['profconfdeletemissing'] = '确认框未勾选';
+$lang['proffail']              = '用户设置没有更新。';
 $lang['pwdforget']             = '忘记密码？立即获取新密码';
 $lang['resendna']              = '本维基不支持二次发送密码。';
 $lang['resendpwd']             = '设置新密码用于';
@@ -352,6 +355,7 @@ $lang['media_perm_read']       = '抱歉，您没有足够权限读取这些文
 $lang['media_perm_upload']     = '抱歉，您没有足够权限来上传文件。';
 $lang['media_update']          = '上传新版本';
 $lang['media_restore']         = '恢复这个版本';
+$lang['media_acl_warning']     = '此列表可能不完全是由ACL限制和隐藏的页面。';
 $lang['currentns']             = '当前命名空间';
 $lang['searchresult']          = '搜索结果';
 $lang['plainhtml']             = '纯HTML';
diff --git a/lib/plugins/authad/lang/zh/lang.php b/lib/plugins/authad/lang/zh/lang.php
index 4f3794999..df1a7a7f7 100644
--- a/lib/plugins/authad/lang/zh/lang.php
+++ b/lib/plugins/authad/lang/zh/lang.php
@@ -4,6 +4,9 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author lainme <lainme993@gmail.com>
+ * @author Errol <errol@hotmail.com>
  */
 $lang['domain']                = '登录域';
 $lang['authpwdexpire']         = '您的密码将在 %d 天内过期，请尽快更改';
+$lang['passchangefail']        = '密码更改失败。是不是密码规则不符合？';
+$lang['connectfail']           = '无法连接到Active Directory服务器。';
diff --git a/lib/plugins/authldap/lang/zh/lang.php b/lib/plugins/authldap/lang/zh/lang.php
new file mode 100644
index 000000000..ef727497e
--- /dev/null
+++ b/lib/plugins/authldap/lang/zh/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Errol <errol@hotmail.com>
+ */
+$lang['connectfail']           = 'LDAP 无法连接: %s';
+$lang['domainfail']            = 'LDAP 无法找到你的用户 dn';
diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index d4ea5c615..4f4a0a8b8 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author lainme <lainme993@gmail.com>
  * @author oott123 <ip.192.168.1.1@qq.com>
+ * @author Errol <errol@hotmail.com>
  */
 $lang['server']                = '您的 LDAP 服务器。填写主机名 (<code>localhost</code>) 或者完整的 URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'LDAP 服务器端口 (如果上面没有给出完整的 URL)';
@@ -21,6 +22,7 @@ $lang['bindpw']                = '上述用户的密码';
 $lang['userscope']             = '限制用户搜索的范围';
 $lang['groupscope']            = '限制组搜索的范围';
 $lang['groupkey']              = '根据任何用户属性得来的组成员(而不是标准的 AD 组)，例如根据部门或者电话号码得到的组。';
+$lang['modPass']               = ' LDAP密码可以由dokuwiki修改吗？';
 $lang['debug']                 = '有错误时显示额外的调试信息';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
diff --git a/lib/plugins/authmysql/lang/zh/lang.php b/lib/plugins/authmysql/lang/zh/lang.php
new file mode 100644
index 000000000..044fe6d60
--- /dev/null
+++ b/lib/plugins/authmysql/lang/zh/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Errol <errol@hotmail.com>
+ */
+$lang['connectfail']           = '连接数据库失败';
+$lang['userexists']            = '抱歉，用户名已被使用。';
+$lang['usernotexists']         = '抱歉，用户不存在。';
+$lang['writefail']             = '无法修改用户数据。请通知管理员';
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
index 5ab3d77ba..62d54c160 100644
--- a/lib/plugins/extension/lang/zh/lang.php
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -7,6 +7,7 @@
  * @author xiqingongzi <Xiqingongzi@Gmail.com>
  * @author qinghao <qingxianhao@gmail.com>
  * @author lainme <lainme993@gmail.com>
+ * @author Errol <errol@hotmail.com>
  */
 $lang['menu']                  = '扩展管理器';
 $lang['tab_plugins']           = '安装插件';
@@ -28,6 +29,10 @@ $lang['btn_disable']           = '关闭';
 $lang['btn_install']           = '安装';
 $lang['btn_reinstall']         = '重新安装';
 $lang['js']['reallydel']       = '确定卸载这个扩展么？';
+$lang['js']['display_viewoptions'] = '查看选项:';
+$lang['js']['display_enabled'] = '启用';
+$lang['js']['display_disabled'] = '禁用';
+$lang['js']['display_updatable'] = '可更新';
 $lang['search_for']            = '搜索扩展';
 $lang['search']                = '搜索';
 $lang['extensionby']           = '<strong>%s</strong> by %s';
-- 
cgit v1.2.3


From 10da589230c0fe57b58ed23095fadd8d1951f1fe Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 11 Jul 2015 09:51:04 +0200
Subject: translation update

---
 inc/lang/ko/edit.txt                     |  2 +-
 inc/lang/ko/lang.php                     | 17 +++++++++--------
 lib/plugins/authad/lang/ko/lang.php      |  2 ++
 lib/plugins/authldap/lang/ko/lang.php    |  9 +++++++++
 lib/plugins/authmysql/lang/ko/lang.php   |  7 ++++---
 lib/plugins/extension/lang/ko/lang.php   |  5 +++--
 lib/plugins/popularity/lang/ko/intro.txt |  2 +-
 7 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/ko/lang.php

diff --git a/inc/lang/ko/edit.txt b/inc/lang/ko/edit.txt
index 8da90266c..70b24ac7b 100644
--- a/inc/lang/ko/edit.txt
+++ b/inc/lang/ko/edit.txt
@@ -1 +1 @@
-문서를 편집하고 ''저장''을 누르세요. 위키 구문은 [[wiki:syntax]]를 참고하세요. 문서를 **더 좋게 만들 자신이 있을 때**에만 편집하세요. 연습을 하고 싶다면 먼저 [[playground:playground|연습장]]에 가서 연습하세요.
\ No newline at end of file
+문서를 편집하고 ''저장''을 누르세요. 위키 구문은 [[wiki:syntax]]를 참조하세요. 문서를 **더 좋게 만들 자신이 있을 때**에만 편집하세요. 연습을 하고 싶다면 먼저 [[playground:playground|연습장]]에 가서 연습하세요.
\ No newline at end of file
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index b46abf5d1..48ebfb1d6 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -77,9 +77,9 @@ $lang['nosecedit']             = '한 동안 문서가 바뀌었으며, 문단 
 $lang['searchcreatepage']      = '만약 원하는 문서를 찾지 못했다면, \'\'문서 만들기\'\'나 \'\'문서 편집\'\'을 사용해 검색어와 같은 이름의 문서를 만들거나 편집할 수 있습니다.';
 $lang['regmissing']            = '죄송하지만 모든 필드를 채워야 합니다.';
 $lang['reguexists']            = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.';
-$lang['regsuccess']            = '사용자를 만들었으며 비밀번호는 이메일로 보냈습니다.';
-$lang['regsuccess2']           = '사용자를 만들었습니다.';
-$lang['regfail']               = '사용자 계정이 만들어지지 않았습니다.';
+$lang['regsuccess']            = '사용자 계정을 만들었으며 비밀번호는 이메일로 보냈습니다.';
+$lang['regsuccess2']           = '사용자 계정을 만들었습니다.';
+$lang['regfail']               = '사용자 계정을 만들 수 없었습니다.';
 $lang['regmailfail']           = '비밀번호를 이메일로 보내는 동안 오류가 발생했습니다. 관리자에게 문의해주세요!';
 $lang['regbadmail']            = '주어진 이메일 주소가 잘못되었습니다 - 오류라고 생각하면 관리자에게 문의해주세요';
 $lang['regbadpass']            = '두 주어진 비밀번호가 같지 않습니다. 다시 입력하세요.';
@@ -89,12 +89,12 @@ $lang['profna']                = '이 위키는 프로필 수정을 할 수 없
 $lang['profnochange']          = '바뀐 내용이 없습니다.';
 $lang['profnoempty']           = '빈 이름이나 이메일 주소는 허용하지 않습니다.';
 $lang['profchanged']           = '프로필이 성공적으로 바뀌었습니다.';
-$lang['profnodelete']          = '이 위키는 사용자 삭제를 지원하지 않습니다';
+$lang['profnodelete']          = '이 위키는 사용자 계정 삭제를 지원하지 않습니다';
 $lang['profdeleteuser']        = '계정 삭제';
 $lang['profdeleted']           = '당신의 사용자 계정이 이 위키에서 삭제되었습니다';
 $lang['profconfdelete']        = '이 위키에서 내 계정을 제거하고 싶습니다. <br/> 이 행동은 되돌릴 수 없습니다.';
 $lang['profconfdeletemissing'] = '선택하지 않은 확인 상자를 확인';
-$lang['proffail']              = '사용자 설정이 업데이트되지 않았습니다.';
+$lang['proffail']              = '사용자 프로필이 업데이트되지 않았습니다.';
 $lang['pwdforget']             = '비밀번호를 잊으셨나요? 비밀번호를 재설정하세요';
 $lang['resendna']              = '이 위키는 비밀번호 재설정을 지원하지 않습니다.';
 $lang['resendpwd']             = '다음으로 새 비밀번호 보내기';
@@ -171,14 +171,14 @@ $lang['mediainuse']            = '"%s" 파일을 삭제할 수 없습니다 - 
 $lang['namespaces']            = '이름공간';
 $lang['mediafiles']            = '사용할 수 있는 파일 목록';
 $lang['accessdenied']          = '이 문서를 볼 권한이 없습니다.';
-$lang['mediausage']            = '이 파일을 참고하려면 다음 문법을 사용하세요:';
+$lang['mediausage']            = '이 파일을 참조하려면 다음 문법을 사용하세요:';
 $lang['mediaview']             = '원본 파일 보기';
 $lang['mediaroot']             = '루트';
 $lang['mediaupload']           = '파일을 현재 이름공간으로 올립니다. 하위 이름공간으로 만들려면 선택한 파일 이름 앞에 쌍점(:)으로 구분되는 이름을 붙이면 됩니다. 파일을 드래그 앤 드롭해 선택할 수 있습니다.';
 $lang['mediaextchange']        = '파일 확장자가 .%s에서 .%s(으)로 바뀌었습니다!';
 $lang['reference']             = '다음을 참조';
 $lang['ref_inuse']             = '다음 문서에서 아직 사용 중이므로 파일을 삭제할 수 없습니다:';
-$lang['ref_hidden']            = '문서의 일부 참고는 읽을 수 있는 권한이 없습니다';
+$lang['ref_hidden']            = '문서의 일부 참조는 읽을 수 있는 권한이 없습니다';
 $lang['hits']                  = '조회 수';
 $lang['quickhits']             = '일치하는 문서 이름';
 $lang['toc']                   = '목차';
@@ -286,7 +286,7 @@ $lang['i_enableacl']           = 'ACL 활성화 (권장)';
 $lang['i_superuser']           = '슈퍼 사용자';
 $lang['i_problems']            = '설치 관리자가 아래에 나와 있는 몇 가지 문제를 찾았습니다. 문제를 해결하지 전까지 설치를 계속할 수 없습니다.';
 $lang['i_modified']            = '보안 상의 이유로 이 스크립트는 수정되지 않은 새 도쿠위키 설치에서만 동작됩니다.
-다운로드한 압축 패키지를 다시 설치하거나 <a href="http://dokuwiki.org/ko:install">도쿠위키 설치 과정</a>을 참고해서 설치하세요.';
+다운로드한 압축 패키지를 다시 설치하거나 <a href="http://dokuwiki.org/ko:install">도쿠위키 설치 과정</a>을 참조해서 설치하세요.';
 $lang['i_funcna']              = '<code>%s</code> PHP 함수를 사용할 수 없습니다. 호스트 제공자가 어떤 이유에서인지 막아 놓았을지 모릅니다.';
 $lang['i_phpver']              = 'PHP <code>%s</code> 버전은 필요한 <code>%s</code> 버전보다 오래되었습니다. PHP를 업그레이드할 필요가 있습니다.';
 $lang['i_mbfuncoverload']      = '도쿠위키를 실행하려면 mbstring.func_overload를 php.ini에서 비활성화해야 합니다.';
@@ -341,6 +341,7 @@ $lang['media_perm_read']       = '죄송하지만 파일을 읽을 권한이 없
 $lang['media_perm_upload']     = '죄송하지만 파일을 올릴 권한이 없습니다.';
 $lang['media_update']          = '새 판 올리기';
 $lang['media_restore']         = '이 판으로 되돌리기';
+$lang['media_acl_warning']     = '이 목록은 ACL로 제한되어 있고 숨겨진 문서이기 때문에 완전하지 않을 수 있습니다.';
 $lang['currentns']             = '현재 이름공간';
 $lang['searchresult']          = '검색 결과';
 $lang['plainhtml']             = '일반 HTML';
diff --git a/lib/plugins/authad/lang/ko/lang.php b/lib/plugins/authad/lang/ko/lang.php
index c119fabc5..7e9b22f40 100644
--- a/lib/plugins/authad/lang/ko/lang.php
+++ b/lib/plugins/authad/lang/ko/lang.php
@@ -7,3 +7,5 @@
  */
 $lang['domain']                = '로그온 도메인';
 $lang['authpwdexpire']         = '비밀번호를 바꾼지 %d일이 지났으며, 비밀번호를 곧 바꿔야 합니다.';
+$lang['passchangefail']        = '비밀번호를 바꾸는 데 실패했습니다. 비밀번호 정책을 따르지 않았나요?';
+$lang['connectfail']           = 'Active Directory 서버에 연결하는 데 실패했습니다.';
diff --git a/lib/plugins/authldap/lang/ko/lang.php b/lib/plugins/authldap/lang/ko/lang.php
new file mode 100644
index 000000000..3c6722a81
--- /dev/null
+++ b/lib/plugins/authldap/lang/ko/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Myeongjin <aranet100@gmail.com>
+ */
+$lang['connectfail']           = 'LDAP가 연결할 수 없습니다: %s';
+$lang['domainfail']            = 'LDAP가 사용자 DN을 찾을 수 없습니다';
diff --git a/lib/plugins/authmysql/lang/ko/lang.php b/lib/plugins/authmysql/lang/ko/lang.php
index a2ad278c1..d07d58388 100644
--- a/lib/plugins/authmysql/lang/ko/lang.php
+++ b/lib/plugins/authmysql/lang/ko/lang.php
@@ -4,8 +4,9 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author hyeonsoft <hyeonsoft@live.co.kr>
+ * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['connectfail']           = '데이터베이스에 연결하는 데 실패했습니다.';
-$lang['userexists']            = '이 계정으로 이미 로그인 된 사용자가 있습니다.';
-$lang['usernotexists']         = '이 계정은 존재하지 않습니다.';
-$lang['writefail']             = '사용자 데이터를 수정할 수 없습니다. 관리자에게 문의하십시오.';
+$lang['userexists']            = '죄송하지만 이 계정으로 이미 로그인한 사용자가 있습니다.';
+$lang['usernotexists']         = '죄송하지만 해당 사용자가 존재하지 않습니다.';
+$lang['writefail']             = '사용자 데이터를 수정할 수 없습니다. 위키 관리자에게 문의하시기 바랍니다';
diff --git a/lib/plugins/extension/lang/ko/lang.php b/lib/plugins/extension/lang/ko/lang.php
index 3de28c0c8..31b230b53 100644
--- a/lib/plugins/extension/lang/ko/lang.php
+++ b/lib/plugins/extension/lang/ko/lang.php
@@ -28,8 +28,9 @@ $lang['btn_install']           = '설치';
 $lang['btn_reinstall']         = '다시 설치';
 $lang['js']['reallydel']       = '정말 이 확장 기능을 제거하겠습니까?';
 $lang['js']['display_viewoptions'] = '보기 옵션:';
-$lang['js']['display_enabled'] = '켜짐';
-$lang['js']['display_disabled'] = '꺼짐';
+$lang['js']['display_enabled'] = '활성화됨';
+$lang['js']['display_disabled'] = '비활성화됨';
+$lang['js']['display_updatable'] = '업데이트할 수 있음';
 $lang['search_for']            = '확장 기능 검색:';
 $lang['search']                = '검색';
 $lang['extensionby']           = '<strong>%s</strong> (저자 %s)';
diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index bc9bb9dd0..edc0f8733 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,6 +1,6 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지 도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지 도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참조가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
-- 
cgit v1.2.3


From d2293a6b3bad9d6d5b80632c327eda8d1390366e Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 11 Jul 2015 18:25:55 +0900
Subject: adjust newline

---
 lib/plugins/config/lang/ar/intro.txt          | 2 +-
 lib/plugins/config/lang/ca-valencia/intro.txt | 2 +-
 lib/plugins/config/lang/cs/intro.txt          | 1 -
 lib/plugins/config/lang/da/intro.txt          | 1 -
 lib/plugins/config/lang/de-informal/intro.txt | 2 +-
 lib/plugins/config/lang/de/intro.txt          | 3 ---
 lib/plugins/config/lang/en/intro.txt          | 2 --
 lib/plugins/config/lang/fa/intro.txt          | 2 +-
 lib/plugins/config/lang/fi/intro.txt          | 2 +-
 lib/plugins/config/lang/fr/intro.txt          | 2 --
 lib/plugins/config/lang/he/intro.txt          | 2 --
 lib/plugins/config/lang/ia/intro.txt          | 2 +-
 lib/plugins/config/lang/it/intro.txt          | 2 --
 lib/plugins/config/lang/ja/intro.txt          | 2 --
 lib/plugins/config/lang/ko/intro.txt          | 1 -
 lib/plugins/config/lang/la/intro.txt          | 2 +-
 lib/plugins/config/lang/mr/intro.txt          | 2 +-
 lib/plugins/config/lang/nl/intro.txt          | 2 --
 lib/plugins/config/lang/pl/intro.txt          | 2 --
 lib/plugins/config/lang/pt-br/intro.txt       | 2 +-
 lib/plugins/config/lang/pt/intro.txt          | 2 +-
 lib/plugins/config/lang/ru/intro.txt          | 2 --
 lib/plugins/config/lang/sk/intro.txt          | 2 +-
 lib/plugins/config/lang/sq/intro.txt          | 2 +-
 lib/plugins/config/lang/sv/intro.txt          | 2 --
 lib/plugins/config/lang/tr/intro.txt          | 2 +-
 lib/plugins/config/lang/zh-tw/intro.txt       | 2 +-
 lib/plugins/config/lang/zh/intro.txt          | 2 --
 28 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/lib/plugins/config/lang/ar/intro.txt b/lib/plugins/config/lang/ar/intro.txt
index d447ec315..15905189f 100644
--- a/lib/plugins/config/lang/ar/intro.txt
+++ b/lib/plugins/config/lang/ar/intro.txt
@@ -4,4 +4,4 @@
 
 الاعدادات الظاهرة بخلفية حمراء فاتحة اعدادات محمية ولا يمكن تغييرها بهذه الاضافة. الاعدادات الظاهرة بخلفية زرقاء هي القيم الافتراضية والاعدادات الظاهرة بخلفية بيضاء خصصت لهذا التثبيت محليا. الاعدادات الزرقاء والبيضاء يمكن تغييرها.
 
-تأكد من ضغط زر **SAVE** قبل ترك الصفحة وإلا ستضيع تعديلاتك.
\ No newline at end of file
+تأكد من ضغط زر **SAVE** قبل ترك الصفحة وإلا ستضيع تعديلاتك.
diff --git a/lib/plugins/config/lang/ca-valencia/intro.txt b/lib/plugins/config/lang/ca-valencia/intro.txt
index 40729e5fe..6dd461db3 100644
--- a/lib/plugins/config/lang/ca-valencia/intro.txt
+++ b/lib/plugins/config/lang/ca-valencia/intro.txt
@@ -7,4 +7,4 @@ Per a més informació al voltant d'este plúgin vaja a [[doku>config]].
 Els ajusts mostrats en un fondo roig claret estan protegits i no els pot
 modificar en este plúgin. Els ajusts mostrats en un fondo blau tenen els valors predeterminats i els ajusts mostrats en un fondo blanc han segut modificats localment per ad esta instalació. Abdós ajusts, blaus i blancs, es poden modificar.
 
-Recorde pulsar el botó **GUARDAR** ans d'anar-se'n d'esta pàgina o perdrà els canvis que haja fet.
\ No newline at end of file
+Recorde pulsar el botó **GUARDAR** ans d'anar-se'n d'esta pàgina o perdrà els canvis que haja fet.
diff --git a/lib/plugins/config/lang/cs/intro.txt b/lib/plugins/config/lang/cs/intro.txt
index 63381b84e..f98a62a6e 100644
--- a/lib/plugins/config/lang/cs/intro.txt
+++ b/lib/plugins/config/lang/cs/intro.txt
@@ -5,4 +5,3 @@ Tuto stránku můžete používat ke správě nastavení vaší instalace DokuWi
 Položky se světle červeným pozadím jsou chráněné a nelze je upravovat tímto pluginem.  Položky s modrým pozadím jsou výchozí hodnoty a položky s bílým pozadím byly nastaveny lokálně v této konkrétní instalaci. Modré i bílé položky je možné upravovat.
 
 Než opustíte tuto stránku, nezapomeňte stisknout tlačítko **Uložit**, jinak budou změny ztraceny.
-
diff --git a/lib/plugins/config/lang/da/intro.txt b/lib/plugins/config/lang/da/intro.txt
index f20961b98..14cd3d601 100644
--- a/lib/plugins/config/lang/da/intro.txt
+++ b/lib/plugins/config/lang/da/intro.txt
@@ -5,4 +5,3 @@ Brug denne side til at kontrollere indstillingerne for din Dokuwiki-opsætning.
 Indstillinger vist med lys rød baggrund er beskyttede og kan ikke ændres med denne udvidelse. Indstillinger vist med blå baggrund er standardindstillinger og indstillinger vist med hvid baggrund er blevet sat lokalt denne konkrete opsætning.  Både blå og hvide indstillinger kan ændres.
 
 Husk at trykke på **Gem**-knappen før du forlader siden, for at du ikke mister dine ændringer.
-
diff --git a/lib/plugins/config/lang/de-informal/intro.txt b/lib/plugins/config/lang/de-informal/intro.txt
index df9845ebc..ce4625cff 100644
--- a/lib/plugins/config/lang/de-informal/intro.txt
+++ b/lib/plugins/config/lang/de-informal/intro.txt
@@ -4,4 +4,4 @@ Benutze diese Seite zur Kontrolle der Einstellungen deiner DokuWiki-Installation
 
 Einstellungen die mit einem hellroten Hintergrund angezeigt werden, können mit dieser Erweiterung nicht verändert werden. Einstellungen mit einem blauen Hintergrund sind Standardwerte und Einstellungen mit einem weißen Hintergrund wurden lokal gesetzt für diese Installation. Sowohl blaue als auch weiße Einstellungen können angepasst werden.
 
-Denke dran **Speichern** zu drücken bevor du die Seite verlässt, andernfalls werden deine Änderungen nicht übernommen.
\ No newline at end of file
+Denke dran **Speichern** zu drücken bevor du die Seite verlässt, andernfalls werden deine Änderungen nicht übernommen.
diff --git a/lib/plugins/config/lang/de/intro.txt b/lib/plugins/config/lang/de/intro.txt
index b79b5f871..e743379ff 100644
--- a/lib/plugins/config/lang/de/intro.txt
+++ b/lib/plugins/config/lang/de/intro.txt
@@ -5,6 +5,3 @@ Dieses Plugin hilft Ihnen bei der Konfiguration von DokuWiki. Hilfe zu den einze
 Einstellungen mit einem hellroten Hintergrund sind gesichert und können nicht mit diesem Plugin verändert werden, Einstellungen mit hellblauem Hintergrund sind Voreinstellungen, weiß hinterlegte Felder zeigen lokal veränderte Werte an. Sowohl die blauen als auch die weißen Felder können verändert werden.
 
 Bitte vergessen Sie nicht **Speichern** zu drücken bevor Sie die Seite verlassen, andernfalls gehen Ihre Änderungen verloren.
-
-
-
diff --git a/lib/plugins/config/lang/en/intro.txt b/lib/plugins/config/lang/en/intro.txt
index 7cf46cee3..01089871c 100644
--- a/lib/plugins/config/lang/en/intro.txt
+++ b/lib/plugins/config/lang/en/intro.txt
@@ -5,5 +5,3 @@ Use this page to control the settings of your DokuWiki installation.  For help o
 Settings shown with a light red background are protected and can not be altered with this plugin. Settings shown with a blue background are the default values and settings shown with a white background have been set locally for this particular installation.  Both blue and white settings can be altered.
 
 Remember to press the **Save** button before leaving this page otherwise your changes will be lost.
-
-
diff --git a/lib/plugins/config/lang/fa/intro.txt b/lib/plugins/config/lang/fa/intro.txt
index f5b6ba235..31bbaea98 100644
--- a/lib/plugins/config/lang/fa/intro.txt
+++ b/lib/plugins/config/lang/fa/intro.txt
@@ -5,4 +5,4 @@
 
 تنظیماتی که با پیش‌زمینه‌ی قرمز مشخص شده‌اند، غیرقابل تغییر می‌باشند. تنظیماتی که به پیش‌زمینه‌ی آبی مشخص شده‌اند نیز حامل مقادیر پیش‌فرض می‌باشند و تنظیماتی که پیش‌زمینه‌ی سفید دارند به طور محلی برای این سیستم تنظیم شده‌اند. تمامی مقادیر آبی و سفید قابلیت تغییر دارند.
 
-به یاد داشته باشید که قبل از ترک صفحه، دکمه‌ی **ذخیره** را بفشارید، در غیر این صورت تنظیمات شما از بین خواهد رفت.
\ No newline at end of file
+به یاد داشته باشید که قبل از ترک صفحه، دکمه‌ی **ذخیره** را بفشارید، در غیر این صورت تنظیمات شما از بین خواهد رفت.
diff --git a/lib/plugins/config/lang/fi/intro.txt b/lib/plugins/config/lang/fi/intro.txt
index f6eedb50c..2765a18af 100644
--- a/lib/plugins/config/lang/fi/intro.txt
+++ b/lib/plugins/config/lang/fi/intro.txt
@@ -4,4 +4,4 @@ Käytä tätä sivua hallitaksesi DokuWikisi asetuksia. Apua yksittäisiin asetu
 
 Asetukset, jotka näkyvät vaaleanpunaisella taustalla ovat suojattuja, eikä niitä voi muutta tämän liitännäisen avulla. Asetukset, jotka näkyvät sinisellä taustalla ovat oletusasetuksia. Asetukset valkoisella taustalla ovat asetettu paikallisesti tätä asennusta varten. Sekä sinisiä että valkoisia asetuksia voi muokata.
 
-Muista painaa **TALLENNA**-nappia ennen kuin poistut sivulta. Muuten muutoksesi häviävät.
\ No newline at end of file
+Muista painaa **TALLENNA**-nappia ennen kuin poistut sivulta. Muuten muutoksesi häviävät.
diff --git a/lib/plugins/config/lang/fr/intro.txt b/lib/plugins/config/lang/fr/intro.txt
index 3d71f6184..afc5805d8 100644
--- a/lib/plugins/config/lang/fr/intro.txt
+++ b/lib/plugins/config/lang/fr/intro.txt
@@ -5,5 +5,3 @@ Utilisez cette page pour contrôler les paramètres de votre installation de Dok
 Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec cette extension. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs spécifiquement définies pour votre installation sont affichées sur un fond blanc. Seuls les paramètres sur fond bleu ou blanc peuvent être modifiés.
 
 N'oubliez pas d'utiliser le bouton **ENREGISTRER** avant de quitter cette page, sinon vos modifications ne seront pas prises en compte !
-
-
diff --git a/lib/plugins/config/lang/he/intro.txt b/lib/plugins/config/lang/he/intro.txt
index 010c69018..d61a93861 100644
--- a/lib/plugins/config/lang/he/intro.txt
+++ b/lib/plugins/config/lang/he/intro.txt
@@ -5,5 +5,3 @@
 הגדרות עם רקע אדום-בהיר מוגנות ואין אפשרות לשנותן עם תוסף זה. הגדרות עם רקע כחול הן בעלות ערך ברירת המחדל והגדרות עם רקע לבן הוגדרו באופן מקומי עבור התקנה זו. ההגדרות בעלות הרקעים הכחול והלבן הן ברות שינוי.
 
 יש לזכור ללחוץ על כפתור ה**שמירה** טרם עזיבת דף זה פן יאבדו השינויים.
-
-
diff --git a/lib/plugins/config/lang/ia/intro.txt b/lib/plugins/config/lang/ia/intro.txt
index 37b970c4f..eb2e10591 100644
--- a/lib/plugins/config/lang/ia/intro.txt
+++ b/lib/plugins/config/lang/ia/intro.txt
@@ -4,4 +4,4 @@ Usa iste pagina pro controlar le configurationes de tu installation de DokuWiki.
 
 Le configurationes monstrate super un fundo rubie clar es protegite e non pote esser alterate con iste plug-in. Le configurationes monstrate super un fundo blau es le valores predefinite e le configurationes monstrate super un fundo blanc ha essite definite localmente pro iste particular installation. Le configurationes blau e blanc pote esser alterate.
 
-Rememora de premer le button **SALVEGUARDAR** ante de quitar iste pagina, alteremente tu modificationes essera perdite.
\ No newline at end of file
+Rememora de premer le button **SALVEGUARDAR** ante de quitar iste pagina, alteremente tu modificationes essera perdite.
diff --git a/lib/plugins/config/lang/it/intro.txt b/lib/plugins/config/lang/it/intro.txt
index 617e8c7b5..02984baa7 100644
--- a/lib/plugins/config/lang/it/intro.txt
+++ b/lib/plugins/config/lang/it/intro.txt
@@ -5,5 +5,3 @@ Usa questa pagina per gestire la configurazione della tua installazione DokuWiki
 Le impostazioni con lo sfondo rosso chiaro sono protette e non possono essere modificate con questo plugin. Le impostazioni con lo sfondo blu contengono i valori predefiniti, e le impostazioni con lo sfondo bianco sono relative solo a questa particolare installazione. Sia le impostazioni su sfondo blu che quelle su sfondo bianco possono essere modificate.
 
 Ricordati di premere il pulsante **SALVA** prima di lasciare questa pagina altrimenti le modifiche andranno perse.
-
-
diff --git a/lib/plugins/config/lang/ja/intro.txt b/lib/plugins/config/lang/ja/intro.txt
index 0c45471c6..6a1f956cb 100644
--- a/lib/plugins/config/lang/ja/intro.txt
+++ b/lib/plugins/config/lang/ja/intro.txt
@@ -5,5 +5,3 @@
 背景が薄い赤になっている場合、その設定は変更することが出来ません。 背景が青の値はデフォルト、背景が白の値は現在の設定となっており、 どちらの値も変更が可能です。
 
 設定の変更後は必ず **保存** ボタンを押して変更を確定してください。 ボタンを押さなかった場合、変更は破棄されます。
-
-
diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt
index 979bbcb14..42240e3d7 100644
--- a/lib/plugins/config/lang/ko/intro.txt
+++ b/lib/plugins/config/lang/ko/intro.txt
@@ -5,4 +5,3 @@
 밝은 빨간색 배경으로 보이는 설정은 이 플러그인에서 바꿀 수 없도록 보호되어 있습니다. 파란색 배경으로 보이는 설정은 기본값이며 하얀색 배경으로 보이는 설정은 특수한 설치를 위해 로컬로 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
 
 이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀜이 사라지는 것에 주의하세요.
-
diff --git a/lib/plugins/config/lang/la/intro.txt b/lib/plugins/config/lang/la/intro.txt
index 573d34ac1..51d8c3d71 100644
--- a/lib/plugins/config/lang/la/intro.txt
+++ b/lib/plugins/config/lang/la/intro.txt
@@ -4,4 +4,4 @@ In hac pagina administratoris optiones mutare et inspicere potes. Auxilia in pag
 
 Optiones ostensae rubro colore tutae et non nunc mutabiles sunt. Optiones ostensae caeruleo colore praecipuae sunt et optiones ostensae in area alba singulares huic uici sunt. Et caerulae et albae optiones mutabiles sunt.
 
-Memento premere **SERVA** ante quam nouam paginam eas: si hoc non facias, mutata amissa sunt.
\ No newline at end of file
+Memento premere **SERVA** ante quam nouam paginam eas: si hoc non facias, mutata amissa sunt.
diff --git a/lib/plugins/config/lang/mr/intro.txt b/lib/plugins/config/lang/mr/intro.txt
index 12ada73a1..e068295e5 100644
--- a/lib/plugins/config/lang/mr/intro.txt
+++ b/lib/plugins/config/lang/mr/intro.txt
@@ -7,4 +7,4 @@
 निळ्या पार्श्वभूमीमधे दाखवलेले सेटिंग आपोआप सेट होणार्या किमती आहेत आणि पांढर्या पार्श्वभूमीमधे 
 दाखवलेले सेटिंग या इन्स्टॉलेशनसाठी ख़ास सेट केलेले आहेत. निळे आणि पांढरे दोन्ही सेटिंग बदलता येतील.
 
-ह्या पानावरून बाहर जाण्याआधी "Save" चे बटन क्लिक करायला विसरू नका नाहीतर सर्व बदल नाहीसे होतील.
\ No newline at end of file
+ह्या पानावरून बाहर जाण्याआधी "Save" चे बटन क्लिक करायला विसरू नका नाहीतर सर्व बदल नाहीसे होतील.
diff --git a/lib/plugins/config/lang/nl/intro.txt b/lib/plugins/config/lang/nl/intro.txt
index 3814b70bd..4d72b695d 100644
--- a/lib/plugins/config/lang/nl/intro.txt
+++ b/lib/plugins/config/lang/nl/intro.txt
@@ -5,5 +5,3 @@ Gebruik deze pagina om de instellingen van je DokuWiki te bekijken en/of te wijz
 Instellingen met een rode achtergond kunnen niet worden gewijzigd met deze plugin. Instellingen met een blauwe achtergrond hebben de default waarde, en instellingen met een witte achtergrond zijn lokaal gewijzigd voor deze specifieke installatie. Zowel blauwe als witte instellingen kunnen worden gewijzigd.
 
 Vergeet niet op **Opslaan** te drukken alvorens de pagina te verlaten, anders gaan je wijzigingen verloren.
-
-
diff --git a/lib/plugins/config/lang/pl/intro.txt b/lib/plugins/config/lang/pl/intro.txt
index 72c0e1c13..9d85c7a7c 100644
--- a/lib/plugins/config/lang/pl/intro.txt
+++ b/lib/plugins/config/lang/pl/intro.txt
@@ -5,5 +5,3 @@ Na tej stronie można zmienić ustawienia tej instalacji DokuWiki. W celu uzyska
 Ustawienia w kolorze jasnoczerwonym są chronione i nie mogą być zmienioną z użyciem tej wtyczki. Ustawienia w kolorze niebieskim mają domyślne wartości. Ustawienia w kolorze białym są specyficzne dla tej instalacji. Ustawienia w kolorach niebieskim i białym mogą być zmienione.
 
 W celu zapisania nowej konfiguracji naciśnij **zapisz** przed opuszczeniem tej strony.
-
-
diff --git a/lib/plugins/config/lang/pt-br/intro.txt b/lib/plugins/config/lang/pt-br/intro.txt
index 850ba25cb..db31de4cf 100644
--- a/lib/plugins/config/lang/pt-br/intro.txt
+++ b/lib/plugins/config/lang/pt-br/intro.txt
@@ -4,4 +4,4 @@ Use essa página para controlar as configurações da instalação do seu DokuWi
 
 Definições que apresentem um fundo vermelho claro são protegidas e não podem ser alteradas com esse plug-in. As definições com um fundo azul são o padrão e as com um fundo branco foram configuradas localmente para essa instalação em particular. Tanto as definições em azul quanto as em branco podem ser alteradas.
 
-Lembre-se de pressionar o botão **Salvar** antes de sair dessa página, caso contrário, suas configurações serão perdidas.
\ No newline at end of file
+Lembre-se de pressionar o botão **Salvar** antes de sair dessa página, caso contrário, suas configurações serão perdidas.
diff --git a/lib/plugins/config/lang/pt/intro.txt b/lib/plugins/config/lang/pt/intro.txt
index 2010dadaf..06a68c475 100644
--- a/lib/plugins/config/lang/pt/intro.txt
+++ b/lib/plugins/config/lang/pt/intro.txt
@@ -4,4 +4,4 @@ Use esta página para controlar as definições da instalação do seu DokuWiki.
 
 Definições que apresentem um fundo vermelho claro são protegidas e não podem ser alteradas com este plugin. Definições com um fundo azul são padrão e definições com um fundo branco foram configuradas localmente para essa instalação em particular. Tanto as definições em azul como em branco podem ser alteradas.
 
-Lembre-se de pressionar o botão **Guardar** antes de sair desta página, caso contrário, as suas definições serão perdidas.
\ No newline at end of file
+Lembre-se de pressionar o botão **Guardar** antes de sair desta página, caso contrário, as suas definições serão perdidas.
diff --git a/lib/plugins/config/lang/ru/intro.txt b/lib/plugins/config/lang/ru/intro.txt
index a629d9332..f30d4c791 100644
--- a/lib/plugins/config/lang/ru/intro.txt
+++ b/lib/plugins/config/lang/ru/intro.txt
@@ -5,5 +5,3 @@
 Настройки, отображаемые на светло-красном фоне, защищены от изменений и не могут быть отредактированы с помощью этого плагина.  Голубым фоном отмечены настройки со значениями по умолчанию, а белым фоном — настройки, которые были локально изменены для этой конкретной «ДокуВики». Как голубые, так и белые настройки доступны для изменения.
 
 Не забудьте нажать кнопку «**Сохранить**» перед тем, как покинуть эту страницу, иначе все ваши изменения будут потеряны.
-
-
diff --git a/lib/plugins/config/lang/sk/intro.txt b/lib/plugins/config/lang/sk/intro.txt
index 5de62a315..a3d15bf93 100644
--- a/lib/plugins/config/lang/sk/intro.txt
+++ b/lib/plugins/config/lang/sk/intro.txt
@@ -4,4 +4,4 @@ Túto stránku môžete používať na zmenu nastavení Vašej DokuWiki inštal
 
 Nastavenia zobrazené na červenom pozadí sú neprístupné a nemôžu byť týmto pluginom zmenené. Nastavenia s modrým pozadím obsahujú prednastavené hodnoty a nastavenia s bielym pozadím boli nastavené lokálne pre túto konkrétnu inštaláciu. Nastavenia s modrým a bielym pozadím môžu byť zmenené.
 
-Nezabudnite stlačiť tlačidlo **Uložiť** pred opustením stránky, inak budú vaše zmeny stratené.
\ No newline at end of file
+Nezabudnite stlačiť tlačidlo **Uložiť** pred opustením stránky, inak budú vaše zmeny stratené.
diff --git a/lib/plugins/config/lang/sq/intro.txt b/lib/plugins/config/lang/sq/intro.txt
index 687b497c9..d2bab0fd5 100644
--- a/lib/plugins/config/lang/sq/intro.txt
+++ b/lib/plugins/config/lang/sq/intro.txt
@@ -4,4 +4,4 @@ Përdoreni këtë faqe për të kontrolluar kuadrot e instalimit të DokuWiki-t
 
 Kuadrot e treguara me një backgroudn me një ngjyrë të kuqe të lehtë janë të mbrojtura dhe nuk mund të ndryshohen me këtë plugin. Kuadrot e treguara me një background blu janë vlerat default dhe kuadrot e treguara me një background të bardhë janë vendosur lokalisht për këtë instalim të caktuar. Si kuadrot blu, ashtu edhe ato të bardhë mund të ndryshohen.
 
-Kujtohuni të shtypni butonin **Ruaj** para se të dilni nga kjo faqe ose ndryshimet tuaja do të humbasin.
\ No newline at end of file
+Kujtohuni të shtypni butonin **Ruaj** para se të dilni nga kjo faqe ose ndryshimet tuaja do të humbasin.
diff --git a/lib/plugins/config/lang/sv/intro.txt b/lib/plugins/config/lang/sv/intro.txt
index 8887d4a7b..fd77634c2 100644
--- a/lib/plugins/config/lang/sv/intro.txt
+++ b/lib/plugins/config/lang/sv/intro.txt
@@ -5,5 +5,3 @@ Använd den här sidan för att göra inställningar i din Dokuwiki. För hjälp
 Inställningar med en rosa bakgrund är skyddade och kan inte ändras med den här insticksmodulen. Inställningar med en blå bakgrund är standardvärden, och inställningar som visas med en vit bakgrund har ändrats i den här installationen. Både blåa och vita inställningar kan ändras.
 
 Kom i håg att trycka på knappen **Spara** innan du lämnar den här sidan, annars kommer ändringarna att gå förlorade.
-
-
diff --git a/lib/plugins/config/lang/tr/intro.txt b/lib/plugins/config/lang/tr/intro.txt
index 4a9654222..2602fb3ed 100644
--- a/lib/plugins/config/lang/tr/intro.txt
+++ b/lib/plugins/config/lang/tr/intro.txt
@@ -4,4 +4,4 @@ Bu sayfayı DokuWiki kurulumunun ayarlarını değiştirmek için kullanabilirsi
 
 Açık kırmızı renkle gösterilenler bu eklenti ile değiştirilemez. Mavi ile gösterilenler varsayılan değerlerdir. Beyaz altyazı ile gösterilenler is bu kuruluma özel değiştirilmiş ayarlardır. Mavi ve beyaz ayarlar değiştirilebilir.
 
-Değişiklik yapmanız durumunda **Kaydet** tuşuna basmayı unutmayınız. Aksi takdirde sayfayı kapattığınızda tüm ayarlar silinecektir.
\ No newline at end of file
+Değişiklik yapmanız durumunda **Kaydet** tuşuna basmayı unutmayınız. Aksi takdirde sayfayı kapattığınızda tüm ayarlar silinecektir.
diff --git a/lib/plugins/config/lang/zh-tw/intro.txt b/lib/plugins/config/lang/zh-tw/intro.txt
index 228c12e0a..e131ec342 100644
--- a/lib/plugins/config/lang/zh-tw/intro.txt
+++ b/lib/plugins/config/lang/zh-tw/intro.txt
@@ -4,4 +4,4 @@
 
 淡紅色背景的項目是受到保護的，不能通過這管理器更改。藍色背景的項目是系統的預設值，白色背景的項目是您更改過的。藍色和白色的設定項目都可以更改。
 
-離開本頁之前，不要忘記點擊最下面的 **儲存** 按鈕，否則您的修改不會生效。
\ No newline at end of file
+離開本頁之前，不要忘記點擊最下面的 **儲存** 按鈕，否則您的修改不會生效。
diff --git a/lib/plugins/config/lang/zh/intro.txt b/lib/plugins/config/lang/zh/intro.txt
index a7db4eda0..30cb65004 100644
--- a/lib/plugins/config/lang/zh/intro.txt
+++ b/lib/plugins/config/lang/zh/intro.txt
@@ -5,5 +5,3 @@
 淡红色背景的项目被保护，不能通过这个管理器更改。 蓝色背景的项目是系统的默认值，白色背景的项目是您作出更改的项目。蓝色和白色的设置项目都可以更改。
 
 离开本页之前不要忘记点击最后的 **保存** 按钮，否则您做的修改不会生效。
-
-
-- 
cgit v1.2.3


From 771519d083ca31621d631a8d8393ad776341cd58 Mon Sep 17 00:00:00 2001
From: Mauricio Segura <maose38@yahoo.es>
Date: Sun, 12 Jul 2015 12:01:00 +0200
Subject: translation update

---
 inc/lang/es/lang.php                   | 4 ++++
 lib/plugins/authad/lang/es/lang.php    | 3 +++
 lib/plugins/authldap/lang/es/lang.php  | 8 ++++++++
 lib/plugins/extension/lang/es/lang.php | 5 +++++
 4 files changed, 20 insertions(+)
 create mode 100644 lib/plugins/authldap/lang/es/lang.php

diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index e10a29a0f..65978f558 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -39,6 +39,7 @@
  * @author pokesakura <pokesakura@gmail.com>
  * @author Álvaro Iradier <airadier@gmail.com>
  * @author Alejandro Nunez <nunez.alejandro@gmail.com>
+ * @author Mauricio Segura <maose38@yahoo.es>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -104,6 +105,7 @@ $lang['regmissing']            = 'Lo siento, tienes que completar todos los camp
 $lang['reguexists']            = 'Lo siento, ya existe un usuario con este nombre.';
 $lang['regsuccess']            = 'El usuario ha sido creado y la contraseña se ha enviado por correo.';
 $lang['regsuccess2']           = 'El usuario ha sido creado.';
+$lang['regfail']               = 'No se pudo crear el usuario.';
 $lang['regmailfail']           = 'Parece que ha habido un error al enviar el correo con la contraseña. ¡Por favor, contacta al administrador!';
 $lang['regbadmail']            = 'La dirección de correo no parece válida. Si piensas que esto es un error, contacta al administrador';
 $lang['regbadpass']            = 'Las dos contraseñas no son iguales, por favor inténtalo de nuevo.';
@@ -118,6 +120,7 @@ $lang['profdeleteuser']        = 'Eliminar Cuenta';
 $lang['profdeleted']           = 'Tu cuenta de usuario ha sido eliminada de este wiki';
 $lang['profconfdelete']        = 'Deseo eliminar mi cuenta de este wiki. <br /> Esta acción es irreversible.';
 $lang['profconfdeletemissing'] = 'Casilla de verificación no activada.';
+$lang['proffail']              = 'No se ha actualizado el perfil del usuario.';
 $lang['pwdforget']             = '¿Has olvidado tu contraseña? Consigue una nueva';
 $lang['resendna']              = 'Este wiki no brinda la posibilidad de reenvío de contraseña.';
 $lang['resendpwd']             = 'Establecer nueva contraseña para';
@@ -363,6 +366,7 @@ $lang['media_perm_read']       = 'Disculpa, no tienes los permisos necesarios pa
 $lang['media_perm_upload']     = 'Disculpa, no tienes los permisos necesarios para cargar ficheros.';
 $lang['media_update']          = 'Actualizar nueva versión';
 $lang['media_restore']         = 'Restaurar esta versión';
+$lang['media_acl_warning']     = 'Puede que esta lista no esté completa debido a restricciones de la ACL y a las páginas ocultas.';
 $lang['currentns']             = 'Espacio de nombres actual';
 $lang['searchresult']          = 'Resultado de la búsqueda';
 $lang['plainhtml']             = 'HTML sencillo';
diff --git a/lib/plugins/authad/lang/es/lang.php b/lib/plugins/authad/lang/es/lang.php
index ffbff49a1..0ad262c21 100644
--- a/lib/plugins/authad/lang/es/lang.php
+++ b/lib/plugins/authad/lang/es/lang.php
@@ -5,6 +5,9 @@
  * 
  * @author Juan De La Cruz <juann.dlc@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mauricio Segura <maose38@yahoo.es>
  */
 $lang['domain']                = 'Dominio de inicio';
 $lang['authpwdexpire']         = 'Su contraseña caducara en %d días, debería cambiarla lo antes posible';
+$lang['passchangefail']        = 'Error al cambiar la contraseña. ¿Tal vez no se cumplió la directiva de contraseñas?';
+$lang['connectfail']           = 'Error al conectar con el servidor de Active Directory.';
diff --git a/lib/plugins/authldap/lang/es/lang.php b/lib/plugins/authldap/lang/es/lang.php
new file mode 100644
index 000000000..e68a42603
--- /dev/null
+++ b/lib/plugins/authldap/lang/es/lang.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mauricio Segura <maose38@yahoo.es>
+ */
+$lang['connectfail']           = 'LDAP no se puede conectar: %5';
diff --git a/lib/plugins/extension/lang/es/lang.php b/lib/plugins/extension/lang/es/lang.php
index a835cb630..b99f3b294 100644
--- a/lib/plugins/extension/lang/es/lang.php
+++ b/lib/plugins/extension/lang/es/lang.php
@@ -7,6 +7,7 @@
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author Jonathan Hernández <me@jhalicea.com>
  * @author Álvaro Iradier <airadier@gmail.com>
+ * @author Mauricio Segura <maose38@yahoo.es>
  */
 $lang['menu']                  = 'Administrador de Extensiones ';
 $lang['tab_plugins']           = 'Plugins instalados';
@@ -28,6 +29,10 @@ $lang['btn_disable']           = 'Desactivar';
 $lang['btn_install']           = 'Instalar';
 $lang['btn_reinstall']         = 'Reinstalar';
 $lang['js']['reallydel']       = '¿Realmente quiere desinstalar esta extensión?';
+$lang['js']['display_viewoptions'] = 'Ver opciones:';
+$lang['js']['display_enabled'] = 'habilitado';
+$lang['js']['display_disabled'] = 'deshabilitado';
+$lang['js']['display_updatable'] = 'actualizable';
 $lang['search_for']            = 'Extensión de búsqueda :';
 $lang['search']                = 'Buscar';
 $lang['extensionby']           = '<strong>%s</strong> por %s';
-- 
cgit v1.2.3


From ae614416a5d7f5cab6c5b82a0c45f587d7fa9c01 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 12 Jul 2015 19:05:43 +0100
Subject: changed all input type=submit buttons to button type=submit button
 for better stylability

---
 _test/tests/inc/form_form.test.php         |  4 ++--
 inc/form.php                               |  6 ++++--
 inc/html.php                               | 18 +++++++++++-------
 inc/template.php                           |  4 ++--
 install.php                                |  6 +++---
 lib/plugins/acl/admin.php                  | 10 +++++-----
 lib/plugins/acl/script.js                  |  2 +-
 lib/plugins/config/admin.php               |  4 ++--
 lib/plugins/extension/helper/list.php      |  2 +-
 lib/plugins/extension/script.js            |  4 ++--
 lib/plugins/extension/style.less           |  4 ++--
 lib/plugins/popularity/admin.php           |  2 +-
 lib/plugins/revert/admin.php               |  8 ++++----
 lib/plugins/usermanager/admin.php          | 22 +++++++++++-----------
 lib/plugins/usermanager/style.css          |  2 +-
 lib/scripts/behaviour.js                   |  6 +++---
 lib/scripts/editor.js                      |  2 +-
 lib/scripts/fileuploaderextended.js        |  4 ++--
 lib/scripts/hotkeys.js                     |  6 +++---
 lib/scripts/media.js                       |  4 ++--
 lib/tpl/dokuwiki/css/_edit.css             |  4 ++--
 lib/tpl/dokuwiki/css/_forms.css            |  3 +--
 lib/tpl/dokuwiki/css/_media_fullscreen.css |  2 +-
 lib/tpl/dokuwiki/css/_media_popup.css      |  2 +-
 lib/tpl/dokuwiki/css/_modal.css            |  2 +-
 lib/tpl/dokuwiki/css/design.less           |  8 ++++----
 lib/tpl/dokuwiki/css/mobile.less           |  4 ++--
 27 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/_test/tests/inc/form_form.test.php b/_test/tests/inc/form_form.test.php
index 02242a807..7f168b895 100644
--- a/_test/tests/inc/form_form.test.php
+++ b/_test/tests/inc/form_form.test.php
@@ -30,9 +30,9 @@ class form_test extends DokuWikiTest {
     $realoutput .= '<input type="checkbox" id="check__id" name="r" value="1" /> ';
     $realoutput .= '<span>Check</span></label>';
     $realoutput .= "\n";
-    $realoutput .= '<input name="do[save]" type="submit" value="Save" class="button" accesskey="s" title="Save [S]" />';
+    $realoutput .= '<button name="do[save]" type="submit" accesskey="s" title="Save [S]">Save</button>';
     $realoutput .= "\n";
-    $realoutput .= '<input name="do[cancel]" type="submit" value="Cancel" class="button" />';
+    $realoutput .= '<button name="do[cancel]" type="submit">Cancel</button>';
     $realoutput .= "\n";
     $realoutput .= "</fieldset>\n</div></form>\n";
     return $realoutput;
diff --git a/inc/form.php b/inc/form.php
index 748983281..91a171555 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -400,7 +400,7 @@ function form_makeWikiText($text, $attrs=array()) {
 function form_makeButton($type, $act, $value='', $attrs=array()) {
     if ($value == '') $value = $act;
     $elem = array('_elem'=>'button', 'type'=>$type, '_action'=>$act,
-                        'value'=>$value, 'class'=>'button');
+                        'value'=>$value);
     if (!empty($attrs['accesskey']) && empty($attrs['title'])) {
         $attrs['title'] = $value . ' ['.strtoupper($attrs['accesskey']).']';
     }
@@ -761,7 +761,9 @@ function form_wikitext($attrs) {
  */
 function form_button($attrs) {
     $p = (!empty($attrs['_action'])) ? 'name="do['.$attrs['_action'].']" ' : '';
-    return '<input '.$p.buildAttributes($attrs,true).' />';
+    $value = $attrs['value'];
+    unset($attrs['value']);
+    return '<button '.$p.buildAttributes($attrs,true).'>'.$value.'</button>';
 }
 
 /**
diff --git a/inc/html.php b/inc/html.php
index 2f10e3c08..1ccc056de 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -183,7 +183,7 @@ function html_topbtn(){
  * @param bool|string    $label  label text, false: lookup btn_$name in localization
  * @return string
  */
-function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false){
+function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label=false){
     global $conf;
     global $lang;
 
@@ -221,13 +221,15 @@ function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false
         $tip = htmlspecialchars($label);
     }
 
-    $ret .= '<input type="submit" value="'.hsc($label).'" class="button" ';
+    $ret .= '<button type="submit" ';
     if($akey){
         $tip .= ' ['.strtoupper($akey).']';
         $ret .= 'accesskey="'.$akey.'" ';
     }
     $ret .= 'title="'.$tip.'" ';
     $ret .= '/>';
+    $ret .= hsc($label);
+    $ret .= '</button>';
     $ret .= '</div></form>';
 
     return $ret;
@@ -856,26 +858,28 @@ function html_recent($first=0, $show_changes='both'){
         $first -= $conf['recent'];
         if ($first < 0) $first = 0;
         $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-prev')));
-        $form->addElement(form_makeTag('input', array(
+        $form->addElement(form_makeOpenTag('button', array(
                     'type'  => 'submit',
                     'name'  => 'first['.$first.']',
-                    'value' => $lang['btn_newer'],
                     'accesskey' => 'n',
                     'title' => $lang['btn_newer'].' [N]',
                     'class' => 'button show'
                     )));
+        $form->addElement($lang['btn_newer']);
+        $form->addElement(form_makeCloseTag('button'));
         $form->addElement(form_makeCloseTag('div'));
     }
     if ($hasNext) {
         $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-next')));
-        $form->addElement(form_makeTag('input', array(
+        $form->addElement(form_makeOpenTag('button', array(
                         'type'  => 'submit',
                         'name'  => 'first['.$last.']',
-                        'value' => $lang['btn_older'],
                         'accesskey' => 'p',
                         'title' => $lang['btn_older'].' [P]',
                         'class' => 'button show'
                         )));
+        $form->addElement($lang['btn_older']);
+        $form->addElement(form_makeCloseTag('button'));
         $form->addElement(form_makeCloseTag('div'));
     }
     $form->addElement(form_makeCloseTag('div'));
@@ -1005,7 +1009,7 @@ function html_li_default($item){
  * @param callable $func  callback to print an list item
  * @param callable $lifunc callback to the opening li tag
  * @param bool     $forcewrapper Trigger building a wrapper ul if the first level is
-                                 0 (we have a root object) or 1 (just the root content)
+ *                               0 (we have a root object) or 1 (just the root content)
  * @return string html of an unordered list
  */
 function html_buildlist($data,$class,$func,$lifunc='html_li_default',$forcewrapper=false){
diff --git a/inc/template.php b/inc/template.php
index 95dc52deb..86f41d0ad 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -834,7 +834,7 @@ function tpl_searchform($ajax = true, $autocomplete = true) {
     print 'placeholder="'.$lang['btn_search'].'" ';
     if(!$autocomplete) print 'autocomplete="off" ';
     print 'id="qsearch__in" accesskey="f" name="id" class="edit" title="[F]" />';
-    print '<input type="submit" value="'.$lang['btn_search'].'" class="button" title="'.$lang['btn_search'].'" />';
+    print '<button type="submit" title="'.$lang['btn_search'].'">'.$lang['btn_search'].'</button>';
     if($ajax) print '<div id="qsearch__out" class="ajax_qsearch JSpopup"></div>';
     print '</div></form>';
     return true;
@@ -1667,7 +1667,7 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     echo '</optgroup>';
 
     echo '</select>';
-    echo '<input type="submit" value="'.$button.'" />';
+    echo '<button type="submit">'.$button.'</button>';
     echo '</div>';
     echo '</form>';
 }
diff --git a/install.php b/install.php
index 1a2d03dff..4de8093d6 100644
--- a/install.php
+++ b/install.php
@@ -243,7 +243,7 @@ function print_form($d){
 
     </fieldset>
     <fieldset id="process">
-        <input class="button" type="submit" name="submit" value="<?php echo $lang['btn_save']?>" />
+        <button type="submit" name="submit"><?php echo $lang['btn_save']?></button>
     </fieldset>
     </form>
     <?php
@@ -256,7 +256,7 @@ function print_retry() {
     <form action="" method="get">
       <fieldset>
         <input type="hidden" name="l" value="<?php echo $LC ?>" />
-        <input class="button" type="submit" value="<?php echo $lang['i_retry'];?>" />
+        <button type="submit"><?php echo $lang['i_retry'];?></button>
       </fieldset>
     </form>
     <?php
@@ -619,7 +619,7 @@ function langsel(){
         echo '<option value="'.$l.'" '.$sel.'>'.$l.'</option>';
     }
     echo '</select> ';
-    echo '<input type="submit" value="'.$lang['btn_update'].'" />';
+    echo '<button type="submit">'.$lang['btn_update'].'</button>';
     echo '</form>';
 }
 
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 814bbfe9c..374205769 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -332,7 +332,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo $this->getLang('acl_perms').' ';
         $inl =  $this->_html_select();
         echo '<input type="text" name="acl_w" class="edit" value="'.(($inl)?'':hsc(ltrim($this->who,'@'))).'" />'.NL;
-        echo '<input type="submit" value="'.$this->getLang('btn_select').'" class="button" />'.NL;
+        echo '<button type="submit">'.$this->getLang('btn_select').'</button>'.NL;
         echo '</div>'.NL;
 
         echo '<div id="acl__info">';
@@ -391,10 +391,10 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo $this->_html_checkboxes($current,empty($this->ns),'acl');
 
         if(is_null($current)){
-            echo '<input type="submit" name="cmd[save]" class="button" value="'.$lang['btn_save'].'" />'.NL;
+            echo '<button type="submit" name="cmd[save]">'.$lang['btn_save'].'</button>'.NL;
         }else{
-            echo '<input type="submit" name="cmd[save]" class="button" value="'.$lang['btn_update'].'" />'.NL;
-            echo '<input type="submit" name="cmd[del]" class="button" value="'.$lang['btn_delete'].'" />'.NL;
+            echo '<button type="submit" name="cmd[save]">'.$lang['btn_update'].'</button>'.NL;
+            echo '<button type="submit" name="cmd[del]">'.$lang['btn_delete'].'</button>'.NL;
         }
 
         echo '</fieldset>';
@@ -641,7 +641,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
         echo '<tr>';
         echo '<th class="action" colspan="4">';
-        echo '<input type="submit" value="'.$lang['btn_update'].'" name="cmd[update]" class="button" />';
+        echo '<button type="submit" name="cmd[update]">'.$lang['btn_update'].'</button>';
         echo '</th>';
         echo '</tr>';
         echo '</table>';
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index 58598b1e0..86badffdd 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -16,7 +16,7 @@ var dw_acl = {
         }
 
         jQuery('#acl__user select').change(dw_acl.userselhandler);
-        jQuery('#acl__user input[type=submit]').click(dw_acl.loadinfo);
+        jQuery('#acl__user button').click(dw_acl.loadinfo);
 
         $tree = jQuery('#acl__tree');
         $tree.dw_tree({toggle_selector: 'img',
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 2ef570b68..ec8ee0b84 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -212,8 +212,8 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
 
         if (!$this->_config->locked) {
             ptln('  <input type="hidden" name="save"   value="1" />');
-            ptln('  <input type="submit" name="submit" class="button" value="'.$lang['btn_save'].'" accesskey="s" />');
-            ptln('  <input type="reset" class="button" value="'.$lang['btn_reset'].'" />');
+            ptln('  <button type="submit" name="submit" accesskey="s">'.$lang['btn_save'].'</button>');
+            ptln('  <button type="reset">'.$lang['btn_reset'].'</button>');
         }
 
         ptln('</p>');
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 11aea1d0e..bf099d308 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -535,7 +535,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $classes = 'button '.$action;
         $name    = 'fn['.$action.']['.hsc($extension->getID()).']';
 
-        return '<input class="'.$classes.'" name="'.$name.'" type="submit" value="'.$this->getLang('btn_'.$action).'" '.$title.' />';
+        return '<button class="'.$classes.'" name="'.$name.'" type="submit" '.$title.'>'.$this->getLang('btn_'.$action).'</button> ';
     }
 
     /**
diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index c74c44ad1..0c43de6ae 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -5,7 +5,7 @@ jQuery(function(){
     /**
      * Confirm uninstalling
      */
-    $extmgr.find('input.uninstall').click(function(e){
+    $extmgr.find('button.uninstall').click(function(e){
         if(!window.confirm(LANG.plugins.extension.reallydel)){
             e.preventDefault();
             return false;
@@ -46,7 +46,7 @@ jQuery(function(){
     /**
      * Enable/Disable extension via AJAX
      */
-    $extmgr.find('input.disable, input.enable').click(function (e) {
+    $extmgr.find('button.disable, button.enable').click(function (e) {
         e.preventDefault();
         var $btn = jQuery(this);
 
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 86e540b0f..c400d649a 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -80,8 +80,8 @@
         overflow: hidden;
     }
 
-    input.button {
-        margin: 0 .3em .3em 0;
+    button {
+        margin-bottom: .3em;
     }
 }
 
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index a2c3c6c8b..0cf174e0d 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -144,7 +144,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
                 .'<input type="hidden" name="do" value="admin" />'
                 .'<input type="hidden" name="page" value="popularity" />';
         }
-        $form .= '<input type="submit" class="button" value="'.$this->getLang('submit').'"/>'
+        $form .= '<button type="submit">'.$this->getLang('submit').'</button>'
             .'</fieldset>'
             .'</form>';
         return $form;
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index b61615d00..1a0300585 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -64,9 +64,9 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
         global $lang, $INPUT;
         echo '<form action="" method="post"><div class="no">';
         echo '<label>'.$this->getLang('filter').': </label>';
-        echo '<input type="text" name="filter" class="edit" value="'.hsc($INPUT->str('filter')).'" />';
-        echo ' <input type="submit" class="button" value="'.$lang['btn_search'].'" />';
-        echo ' <span>'.$this->getLang('note1').'</span>';
+        echo '<input type="text" name="filter" class="edit" value="'.hsc($INPUT->str('filter')).'" /> ';
+        echo '<button type="submit">'.$lang['btn_search'].'</button> ';
+        echo '<span>'.$this->getLang('note1').'</span>';
         echo '</div></form><br /><br />';
     }
 
@@ -173,7 +173,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
         echo '</ul>';
 
         echo '<p>';
-        echo '<input type="submit" class="button" value="'.$this->getLang('revert').'" /> ';
+        echo '<button type="submit">'.$this->getLang('revert').'</button> ';
         printf($this->getLang('note2'),hsc($filter));
         echo '</p>';
 
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 0d92e5cc1..86823ee2f 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -241,18 +241,18 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("    <tbody>");
         ptln("      <tr><td colspan=\"5\" class=\"centeralign\">");
         ptln("        <span class=\"medialeft\">");
-        ptln("          <input type=\"submit\" name=\"fn[delete]\" ".$delete_disable." class=\"button\" value=\"".$this->lang['delete_selected']."\" id=\"usrmgr__del\" />");
-        ptln("        </span>");
+        ptln("          <button type=\"submit\" name=\"fn[delete]\" id=\"usrmgr__del\" ".$delete_disable.">".$this->lang['delete_selected']."</button>");
+        ptln("        ");
         ptln("        <span class=\"mediaright\">");
-        ptln("          <input type=\"submit\" name=\"fn[start]\" ".$page_buttons['start']." class=\"button\" value=\"".$this->lang['start']."\" />");
-        ptln("          <input type=\"submit\" name=\"fn[prev]\" ".$page_buttons['prev']." class=\"button\" value=\"".$this->lang['prev']."\" />");
-        ptln("          <input type=\"submit\" name=\"fn[next]\" ".$page_buttons['next']." class=\"button\" value=\"".$this->lang['next']."\" />");
-        ptln("          <input type=\"submit\" name=\"fn[last]\" ".$page_buttons['last']." class=\"button\" value=\"".$this->lang['last']."\" />");
+        ptln("          <button type=\"submit\" name=\"fn[start]\" ".$page_buttons['start'].">".$this->lang['start']."</button>");
+        ptln("          <button type=\"submit\" name=\"fn[prev]\" ".$page_buttons['prev'].">".$this->lang['prev']."</button>");
+        ptln("          <button type=\"submit\" name=\"fn[next]\" ".$page_buttons['next'].">".$this->lang['next']."</button>");
+        ptln("          <button type=\"submit\" name=\"fn[last]\" ".$page_buttons['last'].">".$this->lang['last']."</button>");
         ptln("        </span>");
         if (!empty($this->_filter)) {
-            ptln("    <input type=\"submit\" name=\"fn[search][clear]\" class=\"button\" value=\"".$this->lang['clear']."\" />");
+            ptln("    <button type=\"submit\" name=\"fn[search][clear]\">".$this->lang['clear']."</button>");
         }
-        ptln("        <input type=\"submit\" name=\"fn[export]\" class=\"button\" value=\"".$export_label."\" />");
+        ptln("        <button type=\"submit\" name=\"fn[export]\">".$export_label."</button>");
         ptln("        <input type=\"hidden\" name=\"do\"    value=\"admin\" />");
         ptln("        <input type=\"hidden\" name=\"page\"  value=\"usermanager\" />");
 
@@ -360,7 +360,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         $this->_htmlFilterSettings($indent+10);
 
-        ptln("          <input type=\"submit\" name=\"fn[".$cmd."]\" class=\"button\" value=\"".$this->lang[$cmd]."\" />",$indent);
+        ptln("          <button type=\"submit\" name=\"fn[".$cmd."]\">".$this->lang[$cmd]."</button>",$indent);
         ptln("        </td>",$indent);
         ptln("      </tr>",$indent);
         ptln("    </tbody>",$indent);
@@ -369,7 +369,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if ($notes) {
             ptln("    <ul class=\"notes\">");
             foreach ($notes as $note) {
-                ptln("      <li><span class=\"li\">".$note."</span></li>",$indent);
+                ptln("      <li><span class=\"li\">".$note."</li>",$indent);
             }
             ptln("    </ul>");
         }
@@ -456,7 +456,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln('  <form action="'.wl($ID).'" method="post" enctype="multipart/form-data">',$indent);
         formSecurityToken();
         ptln('    <label>'.$this->lang['import_userlistcsv'].'<input type="file" name="import" /></label>',$indent);
-        ptln('    <input type="submit" name="fn[import]" value="'.$this->lang['import'].'" />',$indent);
+        ptln('    <button type="submit" name="fn[import]">'.$this->lang['import'].'</button>',$indent);
         ptln('    <input type="hidden" name="do"    value="admin" />',$indent);
         ptln('    <input type="hidden" name="page"  value="usermanager" />',$indent);
 
diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css
index d119b195a..9028fed5e 100644
--- a/lib/plugins/usermanager/style.css
+++ b/lib/plugins/usermanager/style.css
@@ -17,7 +17,7 @@
   padding-left: 0;
   padding-right: 1.4em;
 }
-#user__manager input.button[disabled] {
+#user__manager button[disabled] {
   color: #ccc!important;
   border-color: #ccc!important;
 }
diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index fb61f6e48..97955dad9 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -107,7 +107,7 @@ var dw_behaviour = {
     quickSelect: function(){
         jQuery('select.quickselect')
             .change(function(e){ e.target.form.submit(); })
-            .closest('form').find('input[type=submit]').not('.show').hide();
+            .closest('form').find(':button').not('.show').hide();
     },
 
     /**
@@ -171,10 +171,10 @@ var dw_behaviour = {
 
         if($checked.length < 2){
             $all.attr('disabled',false);
-            jQuery('#page__revisions input[type=submit]').attr('disabled',true);
+            jQuery('#page__revisions button').attr('disabled',true);
         }else{
             $all.attr('disabled',true);
-            jQuery('#page__revisions input[type=submit]').attr('disabled',false);
+            jQuery('#page__revisions button').attr('disabled',false);
             for(var i=0; i<$checked.length; i++){
                 $checked[i].disabled = false;
                 if(i>1){
diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js
index f4143f0bc..fac084489 100644
--- a/lib/scripts/editor.js
+++ b/lib/scripts/editor.js
@@ -146,7 +146,7 @@ var dw_editor = {
 
         if((e.keyCode == 13 || e.keyCode == 10) && e.ctrlKey) { // Ctrl-Enter (With Chrome workaround)
             // Submit current edit
-            jQuery('input#edbtn__save').click();
+            jQuery('#edbtn__save').click();
             e.preventDefault(); // prevent enter key
             return false;
         }else if(e.keyCode == 13){ // Enter
diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index f5786c387..d6a82397d 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -82,7 +82,7 @@ qq.FileUploaderExtended = function(o){
             '<div class="qq-upload-button">' + LANG.media_select + '</div>' +
             '<ul class="qq-upload-list"></ul>' +
             '<div class="qq-action-container">' +
-            '  <input class="qq-upload-action button" type="submit" value="' + LANG.media_upload_btn + '" id="mediamanager__upload_button">' +
+            '  <button class="qq-upload-action" type="submit" id="mediamanager__upload_button">' + LANG.media_upload_btn + '</button>' +
             '  <label class="qq-overwrite-check"><input type="checkbox" value="1" name="ow" class="dw__ow"> <span>' + LANG.media_overwrt + '</span></label>' +
             '</div>' +
             '</div>',
@@ -189,7 +189,7 @@ qq.extend(qq.FileUploaderExtended.prototype, {
             var button = '<form method="post" action="' + action + '" id="mediamanager__done_form"><div>';
             button += '<input type="hidden" value="' + result.ns + '" name="ns">';
             button += '<input type="hidden" value="1" name="recent">';
-            button += '<input class="button" type="submit" value="' + LANG.media_done_btn + '"></div></form>';
+            button += '<button type="submit">' + LANG.media_done_btn + '</button></div></form>';
             jQuery('#mediamanager__uploader').append(button);
         }
     }
diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js
index bff28530d..76a277aea 100644
--- a/lib/scripts/hotkeys.js
+++ b/lib/scripts/hotkeys.js
@@ -26,7 +26,7 @@ function Hotkeys() {
      * Initialization
      *
      * This function looks up all the accesskeys used in the current page
-     * (at anchor elements and input elements [type="submit"]) and registers
+     * (at anchor elements and button elements [type="submit"]) and registers
      * appropriate shortcuts.
      *
      * Secondly, initialization registers listeners on document to catch all
@@ -59,10 +59,10 @@ function Hotkeys() {
         });
 
         /**
-         * Lookup all input [type="submit"] with accesskey and register event -
+         * Lookup all button [type="submit"] with accesskey and register event -
          * perform "click" on a button.
          */
-        var inputs = document.getElementsByTagName("input");
+        var inputs = document.getElementsByTagName("button");
         t.each(inputs, function(i) {
             if (i.type == "submit" && i.accessKey != "") {
                 t.addShortcut(t.modifier + '+' + i.accessKey, function() {
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 8ca21ecab..2995addfd 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -119,7 +119,7 @@ var dw_mediamanager = {
         $both = $listType.add($sortBy);
 
         // Remove the submit button
-        $options.find('input[type=submit]').parent().hide();
+        $options.find('button[type=submit]').parent().hide();
 
         // Prepare HTML for jQuery UI buttonset
         $both.find('label').each(function () {
@@ -435,7 +435,7 @@ var dw_mediamanager = {
                 dw_mediamanager.$resizables().resizable('destroy');
 
                 if (update_list) {
-                    dw_mediamanager.list.call(jQuery('#mediamanager__page form.options input[type="submit"]')[0]);
+                    dw_mediamanager.list.call(jQuery('#mediamanager__page form.options button[type="submit"]')[0]);
                 }
 
                 $content.html(data);
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index f40aaa891..d6dcb93ab 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -88,7 +88,7 @@ div.picker button.toolbutton {
     margin-right: 0;
     margin-left: 1em;
 }
-.dokuwiki .editBar .editButtons input {
+.dokuwiki .editBar .editButtons button {
 }
 
 /* summary input and minor changes checkbox */
@@ -130,7 +130,7 @@ div.picker button.toolbutton {
 [dir=rtl] .dokuwiki .secedit {
     float: left;
 }
-.dokuwiki .secedit input.button {
+.dokuwiki .secedit button {
     font-size: 75%;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 522f9ed4d..bf70fa24b 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -62,8 +62,7 @@
 }
 
 
-.dokuwiki input.button,
-.dokuwiki button.button {
+.dokuwiki button {
     vertical-align: middle;
 }
 /**
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 31b71897b..71308ec85 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -394,7 +394,7 @@
     width: 50%;
 }
 
-#mediamanager__page form.meta input.button {
+#mediamanager__page form.meta button {
     width: auto;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css
index 20d669c14..af536489c 100644
--- a/lib/tpl/dokuwiki/css/_media_popup.css
+++ b/lib/tpl/dokuwiki/css/_media_popup.css
@@ -204,7 +204,7 @@ html.popup {
 }
 #dw__mediasearch input.edit {
 }
-#dw__mediasearch input.button {
+#dw__mediasearch button {
 }
 
 
diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css
index a46dff30e..37f64830f 100644
--- a/lib/tpl/dokuwiki/css/_modal.css
+++ b/lib/tpl/dokuwiki/css/_modal.css
@@ -88,7 +88,7 @@
     cursor: default;
 }
 
-#media__popup_content .button {
+#media__popup_content button {
     margin-right: 1px;
     cursor: pointer;
 }
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 548ba7228..ed643fb25 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -207,12 +207,12 @@ form.search {
     position: relative;
     margin-bottom: 0.5em;
 
-    input.edit {
+    input {
         width: 18em;
         padding: .35em 22px .35em .1em;
     }
 
-    input.button {
+    button {
         background: transparent url(images/search.png) no-repeat 0 0;
         border-width: 0;
         width: 19px;
@@ -225,11 +225,11 @@ form.search {
 }
 
 [dir=rtl] form.search {
-    input.edit {
+    input {
         padding: .35em .1em .35em 22px;
     }
 
-    input.button {
+    button {
         background-position: 5px 0;
         margin-left: 0;
         margin-right: -20px;
diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index e5e13e221..a52c723ca 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -237,7 +237,7 @@ body {
     margin: 0 0 .2em .2em;
 }
 
-#dokuwiki__sitetools form.search input.edit {
+#dokuwiki__sitetools form.search input {
     width: 100% !important;
 }
 .dokuwiki form.search div.ajax_qsearch {
@@ -261,7 +261,7 @@ body {
 }
 
 /* force same height on search input and tools select */
-#dokuwiki__sitetools form.search input.edit,
+#dokuwiki__sitetools form.search input,
 #dokuwiki__header .mobileTools select {
     height: 2.1em;
     line-height: 2.1em;
-- 
cgit v1.2.3


From 768d185262d4b53b1717808417c33fdd1ab64797 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 12 Jul 2015 19:44:14 +0100
Subject: refactored tpl_actiondropdown() to avoid duplication

---
 inc/template.php | 55 ++++++++++++++-----------------------------------------
 1 file changed, 14 insertions(+), 41 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index 86f41d0ad..c7dea6b46 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1613,6 +1613,12 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     /** @var Input $INPUT */
     global $INPUT;
 
+    $action_structure = array(
+        'page_tools' => array('edit', 'revert', 'revisions', 'backlink', 'subscribe'),
+        'site_tools' => array('recent', 'media', 'index'),
+        'user_tools' => array('login', 'register', 'profile', 'admin'),
+    );
+
     echo '<form action="'.script().'" method="get" accept-charset="utf-8">';
     echo '<div class="no">';
     echo '<input type="hidden" name="id" value="'.$ID.'" />';
@@ -1624,47 +1630,14 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     echo '<select name="do" class="edit quickselect" title="'.$lang['tools'].'">';
     echo '<option value="">'.$empty.'</option>';
 
-    echo '<optgroup label="'.$lang['page_tools'].'">';
-    $act = tpl_get_action('edit');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('revert');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('revisions');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('backlink');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('subscribe');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-    echo '</optgroup>';
-
-    echo '<optgroup label="'.$lang['site_tools'].'">';
-    $act = tpl_get_action('recent');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('media');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('index');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-    echo '</optgroup>';
-
-    echo '<optgroup label="'.$lang['user_tools'].'">';
-    $act = tpl_get_action('login');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('register');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('profile');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-
-    $act = tpl_get_action('admin');
-    if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
-    echo '</optgroup>';
+    foreach($action_structure as $tools => $actions) {
+        echo '<optgroup label="'.$lang[$tools].'">';
+        foreach($actions as $action) {
+            $act = tpl_get_action($action);
+            if($act) echo '<option value="'.$act['params']['do'].'">'.$lang['btn_'.$act['type']].'</option>';
+        }
+        echo '</optgroup>';
+    }
 
     echo '</select>';
     echo '<button type="submit">'.$button.'</button>';
-- 
cgit v1.2.3


From ea993669dce58ff6060821c2c83312cf5c05356d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 12 Jul 2015 20:05:36 +0100
Subject: fixed lots of missing format strings in language files

---
 inc/lang/he/lang.php                      |  8 ++++----
 inc/lang/id/lang.php                      |  4 ++--
 inc/lang/ka/lang.php                      | 20 ++++++++++----------
 inc/lang/nl/lang.php                      |  4 ++--
 inc/lang/no/lang.php                      |  4 ++--
 inc/lang/pt/lang.php                      |  4 ++--
 lib/plugins/authad/lang/et/lang.php       |  4 ++--
 lib/plugins/authad/lang/he/lang.php       |  4 ++--
 lib/plugins/extension/lang/cs/lang.php    |  4 ++--
 lib/plugins/extension/lang/de/lang.php    |  4 ++--
 lib/plugins/extension/lang/eo/lang.php    |  4 ++--
 lib/plugins/extension/lang/es/lang.php    |  4 ++--
 lib/plugins/extension/lang/hu/lang.php    |  4 ++--
 lib/plugins/extension/lang/lv/lang.php    |  4 ++--
 lib/plugins/extension/lang/pl/lang.php    |  4 ++--
 lib/plugins/extension/lang/pt-br/lang.php |  6 +++---
 lib/plugins/extension/lang/ru/lang.php    |  4 ++--
 lib/plugins/extension/lang/zh/lang.php    |  2 +-
 18 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 37ea704da..1859d3c3e 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author גיא שפר <guysoft@ort.org.il>
  * @author Denis Simakov <akinoame1@gmail.com>
  * @author Dotan Kamber <kamberd@yahoo.com>
@@ -110,7 +110,7 @@ $lang['searchmedia_in']        = 'חיפוש תחת %s';
 $lang['txt_upload']            = 'בחירת קובץ להעלות:';
 $lang['txt_filename']          = 'העלאה בשם (נתון לבחירה):';
 $lang['txt_overwrt']           = 'שכתוב על קובץ קיים';
-$lang['maxuploadsize']         = 'העלה מקסימום. s% לכל קובץ.';
+$lang['maxuploadsize']         = 'העלה מקסימום. %s לכל קובץ.';
 $lang['lockedby']              = 'נעול על ידי:';
 $lang['lockexpire']            = 'הנעילה פגה:';
 $lang['js']['willexpire']      = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.';
@@ -329,8 +329,8 @@ $lang['media_list_rows']       = 'שורות';
 $lang['media_sort_name']       = 'שם';
 $lang['media_sort_date']       = 'תאריך';
 $lang['media_namespaces']      = 'בחר מרחב שמות';
-$lang['media_files']           = 'קבצים ב s%';
-$lang['media_upload']          = 'להעלות s%';
+$lang['media_files']           = 'קבצים ב %s';
+$lang['media_upload']          = 'להעלות %s';
 $lang['media_search']          = 'חיפוש ב%s';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s ב %s';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index 514c63871..aecab741a 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author mubaidillah <mubaidillah@gmail.com>
  * @author Irwan Butar Butar <irwansah.putra@gmail.com>
  * @author Yustinus Waruwu <juswaruwu@gmail.com>
@@ -157,7 +157,7 @@ $lang['uploadexist']           = 'File telah ada. Tidak mengerjakan apa-apa.';
 $lang['uploadbadcontent']      = 'Isi file yang diupload tidak cocok dengan ekstensi file %s.';
 $lang['uploadspam']            = 'File yang diupload diblok oleh spam blacklist.';
 $lang['uploadxss']             = 'File yang diupload diblok karena kemungkinan isi yang berbahaya.';
-$lang['uploadsize']            = 'File yang diupload terlalu besar. (max.%)';
+$lang['uploadsize']            = 'File yang diupload terlalu besar. (max. %s)';
 $lang['deletesucc']            = 'File "%s" telah dihapus.';
 $lang['deletefail']            = '"%s" tidak dapat dihapus - cek hak aksesnya.';
 $lang['mediainuse']            = 'File "%s" belum dihapus - file ini sedang digunakan.';
diff --git a/inc/lang/ka/lang.php b/inc/lang/ka/lang.php
index 0b2d60e4e..047509c4e 100644
--- a/inc/lang/ka/lang.php
+++ b/inc/lang/ka/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Luka Lejava <luka.lejava@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
@@ -47,7 +47,7 @@ $lang['btn_register']          = 'რეგისტრაცია';
 $lang['btn_apply']             = 'ცადე';
 $lang['btn_media']             = 'მედია ფაილების მართვა';
 $lang['btn_deleteuser']        = 'ჩემი ექაუნთის წაშლა';
-$lang['btn_img_backto']        = 'უკან %';
+$lang['btn_img_backto']        = 'უკან %s';
 $lang['btn_mediaManager']      = 'მედია ფაილების მმართველში გახსნა';
 $lang['loggedinas']            = 'შესული ხართ როგორც:';
 $lang['user']                  = 'ლოგინი';
@@ -93,11 +93,11 @@ $lang['resendpwdsuccess']      = 'ახალი პაროლი გამ
 $lang['license']               = 'ვიკი ლიცენზირებულია: ';
 $lang['licenseok']             = 'ამ გვერდის რედაქტირებით თვენ ეთანხმებით ლიცენზიას:';
 $lang['searchmedia']           = 'საძებო სახელი:';
-$lang['searchmedia_in']        = 'ძებნა %-ში';
+$lang['searchmedia_in']        = 'ძებნა %s-ში';
 $lang['txt_upload']            = 'აირჩიეთ ასატვირთი ფაილი:';
 $lang['txt_filename']          = 'ატვირთვა როგორც (არჩევითი):';
 $lang['txt_overwrt']           = 'გადაწერა ზემოდან';
-$lang['maxuploadsize']         = 'მაქსიმალური ზომა %';
+$lang['maxuploadsize']         = 'მაქსიმალური ზომა %s';
 $lang['lockedby']              = 'დაბლოკილია:';
 $lang['lockexpire']            = 'განიბლოკება:';
 $lang['js']['willexpire']      = 'გვერდი განიბლოკება 1 წუთში';
@@ -149,13 +149,13 @@ $lang['uploadsucc']            = 'ატვირთვა დასრულე
 $lang['uploadfail']            = 'შეფერხება ატვირთვისას';
 $lang['uploadwrong']           = 'ატვირთვა შეუძლებელია';
 $lang['uploadexist']           = 'ფაილი უკვე არსებობს';
-$lang['uploadbadcontent']      = 'ატვირთული ფაილები არ ემთხვევა ';
+$lang['uploadbadcontent']      = 'ატვირთული ფაილები არ ემთხვევა %s';
 $lang['uploadspam']            = 'ატვირთვა დაბლოკილია სპამბლოკერის მიერ';
 $lang['uploadxss']             = 'ატვირთვა დაბლოკილია';
-$lang['uploadsize']            = 'ასატვირთი ფაილი ზედმეტად დიდია';
-$lang['deletesucc']            = '% ფაილები წაიშალა';
-$lang['deletefail']            = '% ვერ მოიძებნა';
-$lang['mediainuse']            = 'ფაილის % ვერ წაიშალა, რადგან გამოყენებაშია';
+$lang['uploadsize']            = 'ასატვირთი ფაილი ზედმეტად დიდია %s';
+$lang['deletesucc']            = '%s ფაილები წაიშალა';
+$lang['deletefail']            = '%s ვერ მოიძებნა';
+$lang['mediainuse']            = 'ფაილის %s ვერ წაიშალა, რადგან გამოყენებაშია';
 $lang['namespaces']            = 'Namespaces';
 $lang['mediafiles']            = 'არსებული ფაილები';
 $lang['accessdenied']          = 'თქვენ არ შეგიძლიათ გვერდის ნახვა';
@@ -189,7 +189,7 @@ $lang['youarehere']            = 'თვენ ხართ აქ:';
 $lang['lastmod']               = 'ბოლოს მოდიფიცირებული:';
 $lang['deleted']               = 'წაშლილია';
 $lang['created']               = 'შექმნილია';
-$lang['restored']              = 'ძველი ვერსია აღდგენილია %';
+$lang['restored']              = 'ძველი ვერსია აღდგენილია (%s)';
 $lang['external_edit']         = 'რედაქტირება';
 $lang['summary']               = 'Edit summary';
 $lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">საჭიროა Adobe Flash Plugin</a>';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index e7d82af19..496144a27 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author François Kooman <fkooman.tuxed.net>
  * @author Jack van Klaren <dokuwiki@afentoe.xs4all.nl>
  * @author Riny Heijdendael <riny@heijdendael.nl>
@@ -355,4 +355,4 @@ $lang['searchresult']          = 'Zoekresultaat';
 $lang['plainhtml']             = 'Alleen HTML';
 $lang['wikimarkup']            = 'Wiki Opmaak';
 $lang['page_nonexist_rev']     = 'Pagina bestaat niet bij %s. Het is vervolgens aangemaakt bij <a href="%s">%s</a>.';
-$lang['unable_to_parse_date']  = 'Begrijp het niet bij parameter "% s".';
+$lang['unable_to_parse_date']  = 'Begrijp het niet bij parameter "%s".';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index fddbf1419..51854f80d 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Reidar Mosvold <Reidar.Mosvold@hit.no>
  * @author Jorge Barrera Grandon <jorge@digitalwolves.org>
  * @author Rune Rasmussen [http://www.syntaxerror.no/]
@@ -347,7 +347,7 @@ $lang['media_search']          = 'Søk i navnerommet <strong>%s</strong>.';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s på %s';
 $lang['media_edit']            = 'Rediger %s';
-$lang['media_history']         = '%vis historikk';
+$lang['media_history']         = '%s vis historikk';
 $lang['media_meta_edited']     = 'metadata er endra';
 $lang['media_perm_read']       = 'Beklager, du har ikke tilgang til å lese filer.';
 $lang['media_perm_upload']     = 'Beklager, du har ikke tilgang til å laste opp filer.';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 7c6395b4b..1603e7cec 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
@@ -340,5 +340,5 @@ $lang['currentns']             = 'Namespace actual';
 $lang['searchresult']          = 'Resultado da pesquisa';
 $lang['plainhtml']             = 'HTML simples';
 $lang['wikimarkup']            = 'Markup de Wiki';
-$lang['page_nonexist_rev']     = 'Página não existia no %s. Posteriormente, foi criado em <a href="%s">% s </a>.';
+$lang['page_nonexist_rev']     = 'Página não existia no %s. Posteriormente, foi criado em <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Não é possível analisar o parâmetro "%s".';
diff --git a/lib/plugins/authad/lang/et/lang.php b/lib/plugins/authad/lang/et/lang.php
index 6dda19360..94fe9ed8e 100644
--- a/lib/plugins/authad/lang/et/lang.php
+++ b/lib/plugins/authad/lang/et/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Janar Leas <janar.leas@eesti.ee>
  */
-$lang['authpwdexpire']         = 'Sinu salasõna aegub %päeva pärast, võiksid seda peatselt muuta.';
+$lang['authpwdexpire']         = 'Sinu salasõna aegub %d päeva pärast, võiksid seda peatselt muuta.';
diff --git a/lib/plugins/authad/lang/he/lang.php b/lib/plugins/authad/lang/he/lang.php
index 616d1ab4b..ac8fbcb5c 100644
--- a/lib/plugins/authad/lang/he/lang.php
+++ b/lib/plugins/authad/lang/he/lang.php
@@ -2,9 +2,9 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author tomer <tomercarolldergicz@gmail.com>
  * @author Menashe Tomer <menashesite@gmail.com>
  */
-$lang['authpwdexpire']         = 'הסיסמה שלך תפוג ב% d ימים, אתה צריך לשנות את זה בקרוב.';
+$lang['authpwdexpire']         = 'הסיסמה שלך תפוג ב %d ימים, אתה צריך לשנות את זה בקרוב.';
 $lang['passchangefail']        = 'שגיאה בשינוי סיסמה. האם הסיסמה תואמת למדיניות המערכת?';
diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php
index dc38afd52..d48c517cf 100644
--- a/lib/plugins/extension/lang/cs/lang.php
+++ b/lib/plugins/extension/lang/cs/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Viktor Zavadil <vzavadil@newps.cz>
  * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
@@ -62,7 +62,7 @@ $lang['status_template']       = 'šablona';
 $lang['status_bundled']        = 'svázaný';
 $lang['msg_enabled']           = 'Zásuvný modul %s povolen';
 $lang['msg_disabled']          = 'Zásuvný modul %s zakázán';
-$lang['msg_delete_success']    = 'Rozšíření odinstalováno';
+$lang['msg_delete_success']    = 'Rozšíření %s odinstalováno';
 $lang['msg_delete_failed']     = 'Odinstalování rozšíření %s selhalo';
 $lang['msg_template_install_success'] = 'Šablona %s úspěšně nainstalována';
 $lang['msg_template_update_success'] = 'Šablona %s úspěšně aktualizována';
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index ef3197513..55a317309 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author H. Richard <wanderer379@t-online.de>
  * @author Joerg <scooter22@gmx.de>
  * @author Simon <st103267@stud.uni-stuttgart.de>
@@ -69,7 +69,7 @@ $lang['status_template']       = 'Template';
 $lang['status_bundled']        = 'gebündelt';
 $lang['msg_enabled']           = 'Plugin %s ist aktiviert';
 $lang['msg_disabled']          = 'Erweiterung %s ist deaktiviert';
-$lang['msg_delete_success']    = 'Erweiterung wurde entfernt';
+$lang['msg_delete_success']    = 'Erweiterung %s wurde entfernt';
 $lang['msg_template_install_success'] = 'Das Template %s wurde erfolgreich installiert';
 $lang['msg_template_update_success'] = 'Das Update des Templates %s war erfolgreich ';
 $lang['msg_plugin_install_success'] = 'Das Plugin %s wurde erfolgreich installiert';
diff --git a/lib/plugins/extension/lang/eo/lang.php b/lib/plugins/extension/lang/eo/lang.php
index 6ce840be8..e0488cb46 100644
--- a/lib/plugins/extension/lang/eo/lang.php
+++ b/lib/plugins/extension/lang/eo/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Robert Bogenschneider <bogi@uea.org>
  */
 $lang['menu']                  = 'Aldonaĵa administrado';
@@ -61,7 +61,7 @@ $lang['status_template']       = 'ŝablono';
 $lang['status_bundled']        = 'kunliverita';
 $lang['msg_enabled']           = 'Kromaĵo %s ebligita';
 $lang['msg_disabled']          = 'Kromaĵo %s malebligita';
-$lang['msg_delete_success']    = 'Aldonaĵo malinstaliĝis';
+$lang['msg_delete_success']    = 'Aldonaĵo %s malinstaliĝis';
 $lang['msg_template_install_success'] = 'Ŝablono %s sukcese instaliĝis';
 $lang['msg_template_update_success'] = 'Ŝablono %s sukcese aktualiĝis';
 $lang['msg_plugin_install_success'] = 'Kromaĵo %s sukcese instaliĝis';
diff --git a/lib/plugins/extension/lang/es/lang.php b/lib/plugins/extension/lang/es/lang.php
index b99f3b294..9e3d24318 100644
--- a/lib/plugins/extension/lang/es/lang.php
+++ b/lib/plugins/extension/lang/es/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author Jonathan Hernández <me@jhalicea.com>
@@ -69,7 +69,7 @@ $lang['status_template']       = 'plantilla';
 $lang['status_bundled']        = 'agrupado';
 $lang['msg_enabled']           = 'Plugin %s activado';
 $lang['msg_disabled']          = 'Plugin %s desactivado';
-$lang['msg_delete_success']    = 'Extensión desinstalada';
+$lang['msg_delete_success']    = 'Extensión %s desinstalada';
 $lang['msg_delete_failed']     = 'La desinstalación de la extensión %s ha fallado';
 $lang['msg_template_install_success'] = 'Plantilla %s instalada con éxito';
 $lang['msg_template_update_success'] = 'Plantilla %s actualizada con éxito';
diff --git a/lib/plugins/extension/lang/hu/lang.php b/lib/plugins/extension/lang/hu/lang.php
index a27b5a307..28194ad9d 100644
--- a/lib/plugins/extension/lang/hu/lang.php
+++ b/lib/plugins/extension/lang/hu/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['menu']                  = 'Bővítménykezelő';
@@ -61,7 +61,7 @@ $lang['status_template']       = 'sablon';
 $lang['status_bundled']        = 'beépített';
 $lang['msg_enabled']           = 'A(z) %s modul engedélyezve';
 $lang['msg_disabled']          = 'A(z) %s modul letiltva';
-$lang['msg_delete_success']    = 'A bővítmény törölve';
+$lang['msg_delete_success']    = 'A bővítmény %s törölve';
 $lang['msg_template_install_success'] = 'A(z) %s sablon sikeresen telepítve';
 $lang['msg_template_update_success'] = 'A(z) %s sablon sikeresen frissítve';
 $lang['msg_plugin_install_success'] = 'A(z) %s modul sikeresen telepítve';
diff --git a/lib/plugins/extension/lang/lv/lang.php b/lib/plugins/extension/lang/lv/lang.php
index e7e9bdfd9..b3e5ce0d2 100644
--- a/lib/plugins/extension/lang/lv/lang.php
+++ b/lib/plugins/extension/lang/lv/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Aivars Miška <allefm@gmail.com>
  */
-$lang['msg_delete_success']    = 'Papildinājums atinstalēts';
+$lang['msg_delete_success']    = 'Papildinājums %s atinstalēts';
diff --git a/lib/plugins/extension/lang/pl/lang.php b/lib/plugins/extension/lang/pl/lang.php
index 4fdca79c9..ab9a818b6 100644
--- a/lib/plugins/extension/lang/pl/lang.php
+++ b/lib/plugins/extension/lang/pl/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Mati <mackosa@wp.pl>
  */
 $lang['menu']                  = 'Menedżer rozszerzeń';
@@ -36,4 +36,4 @@ $lang['status_not_installed']  = 'nie zainstalowano';
 $lang['status_enabled']        = 'uruchomione';
 $lang['status_disabled']       = 'wyłączone';
 $lang['status_plugin']         = 'dodatek';
-$lang['msg_delete_success']    = 'Rozszerzenie odinstalowane';
+$lang['msg_delete_success']    = 'Rozszerzenie %s odinstalowane';
diff --git a/lib/plugins/extension/lang/pt-br/lang.php b/lib/plugins/extension/lang/pt-br/lang.php
index 47286389f..f7b7a0d2b 100644
--- a/lib/plugins/extension/lang/pt-br/lang.php
+++ b/lib/plugins/extension/lang/pt-br/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Hudson FAS <hudsonfas@gmail.com>
  */
@@ -62,8 +62,8 @@ $lang['status_template']       = 'modelo';
 $lang['status_bundled']        = 'agrupado';
 $lang['msg_enabled']           = 'Extensão %s habilitada';
 $lang['msg_disabled']          = 'Extensão %s desabilitada';
-$lang['msg_delete_success']    = 'Extensão desinstalada';
-$lang['msg_delete_failed']     = 'Falha na desinstala&ccedil;&atilde;o da extens&atilde;o';
+$lang['msg_delete_success']    = 'Extensão %s desinstalada';
+$lang['msg_delete_failed']     = 'Falha na desinstala&ccedil;&atilde;o da extens&atilde;o %s';
 $lang['msg_template_install_success'] = 'Modelo %s instalado com sucesso';
 $lang['msg_template_update_success'] = 'Modelo %s atualizado com sucesso';
 $lang['msg_plugin_install_success'] = 'Extensão %s instalada com sucesso';
diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php
index a16f0ca95..71d949606 100644
--- a/lib/plugins/extension/lang/ru/lang.php
+++ b/lib/plugins/extension/lang/ru/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
  * @author Igor Degraf <igordegraf@gmail.com>
  * @author Type-kun <workwork-1@yandex.ru>
@@ -77,7 +77,7 @@ $lang['status_bundled']               = 'в комплекте';
 
 $lang['msg_enabled']                  = 'Плагин %s включён';
 $lang['msg_disabled']                 = 'Плагин %s отключён';
-$lang['msg_delete_success']           = 'Дополнение удалено';
+$lang['msg_delete_success']           = 'Дополнение %s удалено';
 $lang['msg_delete_failed']            = 'Не удалось удалить дополнение %s';
 $lang['msg_template_install_success'] = 'Шаблон %s успешно установлен';
 $lang['msg_template_update_success']  = 'Шаблон %s успешно обновлён';
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
index 62d54c160..f07bee0ac 100644
--- a/lib/plugins/extension/lang/zh/lang.php
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Cupen <Cupenoruler@foxmail.com>
  * @author xiqingongzi <Xiqingongzi@Gmail.com>
  * @author qinghao <qingxianhao@gmail.com>
-- 
cgit v1.2.3


From 25957e773bfab367ebe639f75e6413f30b60dfff Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 12 Jul 2015 21:10:05 +0100
Subject: removed English translation strings from non-English translation
 files

---
 inc/lang/ar/lang.php      |  6 +--
 inc/lang/bn/lang.php      |  3 +-
 inc/lang/id/lang.php      | 15 --------
 inc/lang/ka/lang.php      | 66 ---------------------------------
 inc/lang/km/lang.php      |  3 --
 inc/lang/ku/admin.txt     |  4 --
 inc/lang/ku/denied.txt    |  4 --
 inc/lang/ku/editrev.txt   |  2 -
 inc/lang/ku/lang.php      | 93 -----------------------------------------------
 inc/lang/ku/locked.txt    |  3 --
 inc/lang/ku/login.txt     |  4 --
 inc/lang/ku/mailtext.txt  | 17 ---------
 inc/lang/ku/norev.txt     |  4 --
 inc/lang/ku/password.txt  | 10 -----
 inc/lang/ku/read.txt      |  2 -
 inc/lang/ku/register.txt  |  4 --
 inc/lang/ku/revisions.txt |  4 --
 inc/lang/ku/showrev.txt   |  2 -
 inc/lang/ku/stopwords.txt | 29 ---------------
 19 files changed, 3 insertions(+), 272 deletions(-)
 delete mode 100644 inc/lang/ku/admin.txt
 delete mode 100644 inc/lang/ku/denied.txt
 delete mode 100644 inc/lang/ku/editrev.txt
 delete mode 100644 inc/lang/ku/locked.txt
 delete mode 100644 inc/lang/ku/login.txt
 delete mode 100644 inc/lang/ku/mailtext.txt
 delete mode 100644 inc/lang/ku/norev.txt
 delete mode 100644 inc/lang/ku/password.txt
 delete mode 100644 inc/lang/ku/read.txt
 delete mode 100644 inc/lang/ku/register.txt
 delete mode 100644 inc/lang/ku/revisions.txt
 delete mode 100644 inc/lang/ku/showrev.txt
 delete mode 100644 inc/lang/ku/stopwords.txt

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 2d21fc8f0..a3c56c969 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Mostafa Hussein <mostafa@gmail.com>
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
@@ -87,7 +87,7 @@ $lang['profchanged']           = 'حُدث الملف الشخصي للمستخ
 $lang['profnodelete']          = 'هذه الموسوعه لا ندعم حذف الأشخاص';
 $lang['profdeleteuser']        = 'احذف حساب';
 $lang['profdeleted']           = 'حسابك الخاص تم حذفه من هذه الموسوعة';
-$lang['profconfdelete']        = 'أنا أرغب في حذف حسابي من هذه الموسوعة.<br/> 
+$lang['profconfdelete']        = 'أنا أرغب في حذف حسابي من هذه الموسوعة.<br/>
 هذا الحدث غير ممكن.';
 $lang['profconfdeletemissing'] = 'لم تقم بوضع علامة في مربع التأكيد';
 $lang['pwdforget']             = 'أنسيت كلمة السر؟ احصل على واحدة جديدة';
@@ -142,8 +142,6 @@ $lang['js']['del_confirm']     = 'هل حقاً تريد حذف البنود ا
 $lang['js']['restore_confirm'] = 'أمتأكد من استرجاع هذه النسخة؟';
 $lang['js']['media_diff']      = 'عرض الفروق:';
 $lang['js']['media_diff_both'] = 'جنبا إلى جنب';
-$lang['js']['media_diff_opacity'] = 'Shine-through';
-$lang['js']['media_diff_portions'] = 'Swipe';
 $lang['js']['media_select']    = 'اختر ملفا...';
 $lang['js']['media_upload_btn'] = 'ارفع';
 $lang['js']['media_done_btn']  = 'تم';
diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php
index 8443228e3..db7baa0f2 100644
--- a/inc/lang/bn/lang.php
+++ b/inc/lang/bn/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Foysol <ragebot1125@gmail.com>
  * @author ninetailz <ninetailz1125@gmail.com>
  * @author Khan M. B. Asad <muhammad2017@gmail.com>
@@ -20,7 +20,6 @@ $lang['btn_source']            = 'দেখান পাতা উৎস';
 $lang['btn_show']              = 'দেখান পৃষ্ঠা';
 $lang['btn_create']            = 'এই পৃষ্ঠা তৈরি করুন';
 $lang['btn_search']            = 'অনুসন্ধান';
-$lang['btn_save']              = 'Save';
 $lang['btn_preview']           = 'পূর্বরূপ';
 $lang['btn_top']               = 'উপরে ফিরে যান ';
 $lang['btn_newer']             = '<< আরো সাম্প্রতিক';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index aecab741a..3fc1506e4 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -23,7 +23,6 @@ $lang['btn_show']              = 'Tampilkan halaman';
 $lang['btn_create']            = 'Buat halaman baru';
 $lang['btn_search']            = 'Cari';
 $lang['btn_save']              = 'Simpan';
-$lang['btn_preview']           = 'Preview';
 $lang['btn_top']               = 'kembali ke atas';
 $lang['btn_newer']             = '<< lebih lanjut';
 $lang['btn_older']             = 'sebelumnya >>';
@@ -32,7 +31,6 @@ $lang['btn_recent']            = 'Perubahan terbaru';
 $lang['btn_upload']            = 'Upload';
 $lang['btn_cancel']            = 'Batal';
 $lang['btn_index']             = 'Indeks';
-$lang['btn_secedit']           = 'Edit';
 $lang['btn_login']             = 'Login';
 $lang['btn_logout']            = 'Keluar';
 $lang['btn_admin']             = 'Admin';
@@ -42,9 +40,7 @@ $lang['btn_back']              = 'Kembali';
 $lang['btn_backlink']          = 'Backlinks';
 $lang['btn_subscribe']         = 'Ikuti Perubahan';
 $lang['btn_profile']           = 'Ubah Profil';
-$lang['btn_reset']             = 'Reset';
 $lang['btn_resendpwd']         = 'Atur password baru';
-$lang['btn_draft']             = 'Edit draft';
 $lang['btn_recover']           = 'Cadangkan draf';
 $lang['btn_draftdel']          = 'Hapus draft';
 $lang['btn_revert']            = 'Kembalikan';
@@ -172,7 +168,6 @@ $lang['mediaextchange']        = 'Ektensi file berubah dari .%s ke .%s';
 $lang['reference']             = 'Referensi untuk';
 $lang['ref_inuse']             = 'File tidak dapat dihapus karena sedang digunakan oleh halaman:';
 $lang['ref_hidden']            = 'Beberapa referensi ada didalam halaman yang tidak diijinkan untuk Anda baca.';
-$lang['hits']                  = 'Hits';
 $lang['quickhits']             = 'Matching pagenames';
 $lang['toc']                   = 'Daftar isi';
 $lang['current']               = 'sekarang';
@@ -195,7 +190,6 @@ $lang['deleted']               = 'terhapus';
 $lang['created']               = 'dibuat';
 $lang['restored']              = 'revisi lama ditampilkan kembali (%s)';
 $lang['external_edit']         = 'Perubahan eksternal';
-$lang['summary']               = 'Edit summary';
 $lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> diperlukan untuk menampilkan konten ini.';
 $lang['download']              = 'Unduh Cuplikan';
 $lang['tools']                 = 'Alat';
@@ -218,26 +212,17 @@ $lang['qb_italic']             = 'Miring';
 $lang['qb_underl']             = 'Garis Bawah';
 $lang['qb_code']               = 'Kode';
 $lang['qb_strike']             = 'Text Tercoret';
-$lang['qb_h1']                 = 'Level 1 Headline';
-$lang['qb_h2']                 = 'Level 2 Headline';
-$lang['qb_h3']                 = 'Level 3 Headline';
-$lang['qb_h4']                 = 'Level 4 Headline';
-$lang['qb_h5']                 = 'Level 5 Headline';
 $lang['qb_hs']                 = 'Pilih Judul';
 $lang['qb_hplus']              = 'Judul Lebih Atas';
 $lang['qb_hminus']             = 'Judul Lebih Bawah';
 $lang['qb_hequal']             = 'Tingkat Judul yang Sama';
-$lang['qb_link']               = 'Link Internal';
-$lang['qb_extlink']            = 'Link External';
 $lang['qb_hr']                 = 'Garis Horisontal';
 $lang['qb_ol']                 = 'Item Berurutan';
 $lang['qb_ul']                 = 'Item Tidak Berurutan';
 $lang['qb_media']              = 'Tambahkan gambar atau file lain';
 $lang['qb_sig']                = 'Sisipkan tanda tangan';
-$lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Karakter Khusus';
 $lang['upperns']               = 'lompat ke namespace induk';
-$lang['metaedit']              = 'Edit Metadata';
 $lang['metasaveerr']           = 'Gagal menulis metadata';
 $lang['metasaveok']            = 'Metadata tersimpan';
 $lang['img_title']             = 'Judul:';
diff --git a/inc/lang/ka/lang.php b/inc/lang/ka/lang.php
index 047509c4e..72594efe3 100644
--- a/inc/lang/ka/lang.php
+++ b/inc/lang/ka/lang.php
@@ -35,7 +35,6 @@ $lang['btn_update']            = 'განახლება';
 $lang['btn_delete']            = 'წაშლა';
 $lang['btn_back']              = 'უკან';
 $lang['btn_backlink']          = 'გადმომისამართებული ბმულები';
-$lang['btn_subscribe']         = 'Manage Subscriptions';
 $lang['btn_profile']           = 'პროფილის განახლება';
 $lang['btn_reset']             = 'წაშლა';
 $lang['btn_resendpwd']         = 'ახალი პაროლის დაყენება';
@@ -107,7 +106,6 @@ $lang['js']['keepopen']        = 'დატოვეთ ღია';
 $lang['js']['hidedetails']     = 'დეტალების დამალვა';
 $lang['js']['mediatitle']      = 'ინსტრუმენტები';
 $lang['js']['mediadisplay']    = 'ბმულის ტიპი';
-$lang['js']['mediaalign']      = 'Alignment';
 $lang['js']['mediasize']       = 'სურათის ზომა';
 $lang['js']['mediatarget']     = 'მიზნის ბმული';
 $lang['js']['mediaclose']      = 'დახურვა';
@@ -125,7 +123,6 @@ $lang['js']['medianolink']     = 'არ დალინკოთ სურა
 $lang['js']['medialeft']       = 'მარცხვნივ განათავსეთ სურათი';
 $lang['js']['mediaright']      = 'მარჯვნივ განათავსეთ სურათი';
 $lang['js']['mediacenter']     = 'შუაში განათავსეთ სურათი';
-$lang['js']['medianoalign']    = 'Use no align.';
 $lang['js']['nosmblinks']      = 'ეს ფუქნცია მუშაობს მხოლოდ  Internet Explorer-ზე';
 $lang['js']['linkwiz']         = 'ბმული';
 $lang['js']['linkto']          = 'ბმული';
@@ -133,9 +130,6 @@ $lang['js']['del_confirm']     = 'დარწმუნებული ხარ
 $lang['js']['restore_confirm'] = 'დარწმუნებული ხართ რომ აღდგენა გინდათ?';
 $lang['js']['media_diff']      = 'განსხვავებების ჩვენება';
 $lang['js']['media_diff_both'] = 'გვერდიგვერდ';
-$lang['js']['media_diff_opacity'] = 'Shine-through';
-$lang['js']['media_diff_portions'] = 'Swipe
-';
 $lang['js']['media_select']    = 'არჩეული ფაილები';
 $lang['js']['media_upload_btn'] = 'ატვირთვა';
 $lang['js']['media_done_btn']  = 'მზადაა';
@@ -156,42 +150,29 @@ $lang['uploadsize']            = 'ასატვირთი ფაილი 
 $lang['deletesucc']            = '%s ფაილები წაიშალა';
 $lang['deletefail']            = '%s ვერ მოიძებნა';
 $lang['mediainuse']            = 'ფაილის %s ვერ წაიშალა, რადგან გამოყენებაშია';
-$lang['namespaces']            = 'Namespaces';
 $lang['mediafiles']            = 'არსებული ფაილები';
 $lang['accessdenied']          = 'თქვენ არ შეგიძლიათ გვერდის ნახვა';
-$lang['mediausage']            = 'Use the following syntax to reference this file:';
 $lang['mediaview']             = 'ორიგინალი ფაილის ჩვენება';
 $lang['mediaroot']             = 'root';
-$lang['mediaupload']           = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your filename separated by colons after you selected the files. Files can also be selected by drag and drop.';
-$lang['mediaextchange']        = 'Filextension changed from .%s to .%s!';
-$lang['reference']             = 'References for';
 $lang['ref_inuse']             = 'ფაილი წაშლა შეუძლებელია, გამოიყენება აქ:';
 $lang['ref_hidden']            = 'ზოგიერთი ბლოკის წაკითხვის უფლება არ გაქვთ';
-$lang['hits']                  = 'Hits';
 $lang['quickhits']             = 'მსგავსი სახელები';
-$lang['toc']                   = 'Table of Contents';
 $lang['current']               = 'ახლანდელი';
 $lang['yours']                 = 'თვენი ვერსია';
 $lang['diff']                  = 'ვერსიების განსხვავება';
 $lang['diff2']                 = 'განსხვავებები';
-$lang['difflink']              = 'Link to this comparison view';
 $lang['diff_type']             = 'განსხვავებების ჩვენება';
-$lang['diff_inline']           = 'Inline';
 $lang['diff_side']             = 'გვერდიგვერდ';
 $lang['diffprevrev']           = 'წინა ვერსია';
 $lang['diffnextrev']           = 'შემდეგი ვერსია';
 $lang['difflastrev']           = 'ბოლო ვერსია';
-$lang['diffbothprevrev']       = 'Both sides previous revision';
-$lang['diffbothnextrev']       = 'Both sides next revision';
 $lang['line']                  = 'ზოლი';
-$lang['breadcrumb']            = 'Trace:';
 $lang['youarehere']            = 'თვენ ხართ აქ:';
 $lang['lastmod']               = 'ბოლოს მოდიფიცირებული:';
 $lang['deleted']               = 'წაშლილია';
 $lang['created']               = 'შექმნილია';
 $lang['restored']              = 'ძველი ვერსია აღდგენილია (%s)';
 $lang['external_edit']         = 'რედაქტირება';
-$lang['summary']               = 'Edit summary';
 $lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">საჭიროა Adobe Flash Plugin</a>';
 $lang['download']              = 'Snippet-ის გადმოწერა';
 $lang['tools']                 = 'ინსტრუმენტები';
@@ -209,11 +190,6 @@ $lang['changes_type']          = 'ცვლილებები';
 $lang['pages_changes']         = 'გვერდები';
 $lang['media_changes']         = 'მედია ფაილები';
 $lang['both_changes']          = 'გვერდები და მედია ფაილები';
-$lang['qb_bold']               = 'Bold Text';
-$lang['qb_italic']             = 'Italic Text';
-$lang['qb_underl']             = 'Underlined Text';
-$lang['qb_code']               = 'Monospaced Text';
-$lang['qb_strike']             = 'Strike-through Text';
 $lang['qb_h1']                 = 'Level 1 სათაური';
 $lang['qb_h2']                 = 'Level 2 სათაური';
 $lang['qb_h3']                 = 'Level 3 სათაური';
@@ -224,64 +200,28 @@ $lang['qb_hs']                 = 'სათაურის არჩევა';
 $lang['qb_hplus']              = 'Higher სათაური';
 $lang['qb_hminus']             = 'Lower სათაური';
 $lang['qb_hequal']             = 'Same Level სათაური';
-$lang['qb_link']               = 'Internal Link';
-$lang['qb_extlink']            = 'External Link';
-$lang['qb_hr']                 = 'Horizontal Rule';
 $lang['qb_ol']                 = 'შეკვეთილი ბოლო მასალა';
-$lang['qb_ul']                 = 'Unordered List Item';
 $lang['qb_media']              = 'ნახატების და სხვა ფაიელბის დამატება';
 $lang['qb_sig']                = 'ხელმოწერა';
 $lang['qb_smileys']            = 'სმაილები';
-$lang['qb_chars']              = 'Special Chars';
-$lang['upperns']               = 'jump to parent namespace';
-$lang['metaedit']              = 'Edit Metadata';
-$lang['metasaveerr']           = 'Writing metadata failed';
-$lang['metasaveok']            = 'Metadata saved';
 $lang['img_title']             = 'სათაური:';
-$lang['img_caption']           = 'Caption:';
 $lang['img_date']              = 'თარიღი:';
 $lang['img_fname']             = 'ფაილის სახელი:';
 $lang['img_fsize']             = 'ზომა:';
 $lang['img_artist']            = 'ფოტოგრაფი:';
-$lang['img_copyr']             = 'Copyright:';
 $lang['img_format']            = 'ფორმატი:';
 $lang['img_camera']            = 'კამერა:';
-$lang['img_keywords']          = 'Keywords:';
 $lang['img_width']             = 'სიგანე:';
 $lang['img_height']            = 'სიმაღლე:';
-$lang['subscr_subscribe_success'] = 'Added %s to subscription list for %s';
-$lang['subscr_subscribe_error'] = 'Error adding %s to subscription list for %s';
-$lang['subscr_subscribe_noaddress'] = 'There is no address associated with your login, you cannot be added to the subscription list';
-$lang['subscr_unsubscribe_success'] = 'Removed %s from subscription list for %s';
-$lang['subscr_unsubscribe_error'] = 'Error removing %s from subscription list for %s';
-$lang['subscr_already_subscribed'] = '%s is already subscribed to %s';
-$lang['subscr_not_subscribed'] = '%s is not subscribed to %s';
-$lang['subscr_m_not_subscribed'] = 'You are currently not subscribed to the current page or namespace.';
-$lang['subscr_m_new_header']   = 'Add subscription';
-$lang['subscr_m_current_header'] = 'Current subscriptions';
-$lang['subscr_m_unsubscribe']  = 'Unsubscribe';
-$lang['subscr_m_subscribe']    = 'Subscribe';
 $lang['subscr_m_receive']      = 'მიღება';
 $lang['subscr_style_every']    = 'ფოსტა ყოველ ცვლილებაზე';
 $lang['subscr_style_digest']   = 'ფოსტა ყოველი გვერდის შეცვლაზე ';
 $lang['subscr_style_list']     = 'ფოსტა ყოველი გვერდის შეცვლაზე ';
-$lang['authtempfail']          = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
 $lang['i_chooselang']          = 'ენსი არჩევა';
 $lang['i_installer']           = 'DokuWiki დამყენებელი';
 $lang['i_wikiname']            = 'Wiki სახელი';
-$lang['i_enableacl']           = 'Enable ACL (recommended)';
 $lang['i_superuser']           = 'ადმინი';
 $lang['i_problems']            = 'შეასწორეთ შეცდომები';
-$lang['i_modified']            = 'For security reasons this script will only work with a new and unmodified Dokuwiki installation. You should either re-extract the files from the downloaded package or consult the complete <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
-$lang['i_funcna']              = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?';
-$lang['i_phpver']              = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
-$lang['i_permfail']            = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!';
-$lang['i_confexists']          = '<code>%s</code> already exists';
-$lang['i_writeerr']            = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.';
-$lang['i_badhash']             = 'unrecognised or modified dokuwiki.php (hash=<code>%s</code>)';
-$lang['i_badval']              = '<code>%s</code> - illegal or empty value';
-$lang['i_failure']             = 'Some errors occurred while writing the configuration files. You may need to fix them manually before you can use <a href="doku.php?id=wiki:welcome">your new DokuWiki</a>.';
-$lang['i_policy']              = 'Initial ACL policy';
 $lang['i_pol0']                = 'ღია ვიკი (წაკითხვა, დაწერა და ატვირთვა შეუძლია ნებისმიერს)';
 $lang['i_pol1']                = 'თავისუფალი ვიკი (წაკითხვა შეუძლია ყველას, დაწერა და ატვირთვა - რეგისტრირებულს)';
 $lang['i_pol2']                = 'დახურული ვიკი (წაკითხვა, დაწერა და ატვირთვა შეუძლიათ მხოლოდ რეგისტრირებულებს)';
@@ -291,7 +231,6 @@ $lang['i_license']             = 'აირჩიეთ ლიცენზია
 $lang['i_license_none']        = 'არ აჩვენოთ ლიცენზიის ინფორმაცია';
 $lang['i_pop_field']           = 'დაგვეხმარეთ DokuWiki-ს აგუმჯობესებაში';
 $lang['i_pop_label']           = 'თვეში ერთელ ინფორმაციის DokuWiki-ის ადმინისტრაციისთვის გაგზავნა';
-$lang['recent_global']         = 'You\'re currently watching the changes inside the <b>%s</b> namespace. You can also <a href="%s">view the recent changes of the whole wiki</a>.';
 $lang['years']                 = '%d წლის უკან';
 $lang['months']                = '%d თვის უკან';
 $lang['weeks']                 = '%d კვირის უკან';
@@ -306,17 +245,12 @@ $lang['media_file']            = 'ფაილი';
 $lang['media_viewtab']         = 'ჩვენება';
 $lang['media_edittab']         = 'რედაქტირება';
 $lang['media_historytab']      = 'ისტორია';
-$lang['media_list_thumbs']     = 'Thumbnails';
-$lang['media_list_rows']       = 'Rows';
 $lang['media_sort_name']       = 'სახელი';
 $lang['media_sort_date']       = 'თარიღი';
-$lang['media_namespaces']      = 'Choose namespace';
 $lang['media_files']           = 'ფაილები %s';
 $lang['media_upload']          = 'ატვირთვა %s';
 $lang['media_search']          = 'ძებნა %s';
 $lang['media_view']            = '%s';
-$lang['media_viewold']         = '%s at %s';
 $lang['media_edit']            = 'რედაქტირება %s';
 $lang['media_history']         = 'ისტორია %s';
-$lang['media_meta_edited']     = 'metadata edited';
 $lang['media_perm_read']       = 'თვენ არ გაქვთ უფლება წაიკითხოთ ეს მასალა';
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 87ac30936..4c2d7f688 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -185,12 +185,9 @@ $lang['i_enableacl']  = 'បើកប្រើ (អនុសាស)';
 $lang['i_superuser']  = 'អ្នកកំពូល';
 $lang['i_problems']   = 'កម្មវិធី​ដំឡើងបានប៉ះឧបសគ្គ។ អ្នកមិនអាចបន្តទៅទៀត ដល់អ្នកជួសជុលវា។';
 $lang['i_modified']   = '';
-$lang['i_funcna']     = '<code>%s</code> ';
 $lang['i_permfail']   = '<code>%s</code> មិនអាចសាស';
 $lang['i_confexists'] = '<code>%s</code> មានហាយ';
 $lang['i_writeerr']   = 'មិនអាចបណ្កើ<code>%s</code>។ អ្នកត្រវការពិនិត្យអធិក្រឹតិរបស់ថតនឹងឯកសារ។';
-$lang['i_badhash']    = '(hash=<code>%s</code>)';
-$lang['i_badval']     = '<code>%s</code>&mdash;';
 $lang['i_success']    = '';
 $lang['i_failure']    = 'ពលសាសារ';
 $lang['i_policy']     = 'បញ្ជីអនុញ្ញតផ្ដើម';
diff --git a/inc/lang/ku/admin.txt b/inc/lang/ku/admin.txt
deleted file mode 100644
index cfd21b217..000000000
--- a/inc/lang/ku/admin.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Administration ======
-
-Below you can find a list of administrative tasks available in DokuWiki.
-
diff --git a/inc/lang/ku/denied.txt b/inc/lang/ku/denied.txt
deleted file mode 100644
index 34cb8456a..000000000
--- a/inc/lang/ku/denied.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Permission Denied ======
-
-Sorry, you don't have enough rights to continue.
-
diff --git a/inc/lang/ku/editrev.txt b/inc/lang/ku/editrev.txt
deleted file mode 100644
index e6995713b..000000000
--- a/inc/lang/ku/editrev.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-**You've loaded an old revision of the document!** If you save it, you will create a new version with this data.
-----
\ No newline at end of file
diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php
index 7e21b5ba7..460b5e8a3 100644
--- a/inc/lang/ku/lang.php
+++ b/inc/lang/ku/lang.php
@@ -31,109 +31,16 @@ $lang['btn_update'] = 'Rojanekirin';
 $lang['btn_delete'] = 'Jê bibe';
 $lang['btn_back']   = 'Paş';
 $lang['btn_backlink']    = 'Girêdanên paş';
-$lang['btn_subscribe']   = 'Subscribe Changes';
-$lang['btn_register'] = 'Register';
 
-$lang['loggedinas'] = 'Logged in as:';
-$lang['user']       = 'Username';
-$lang['pass']       = 'Password';
-$lang['passchk']    = 'once again';
-$lang['remember']   = 'Remember me';
-$lang['fullname']   = 'Full name';
-$lang['email']      = 'E-Mail';
-$lang['badlogin']   = 'Sorry, username or password was wrong.';
-
-$lang['regmissing'] = 'Sorry, you must fill in all fields.';
-$lang['reguexists'] = 'Sorry, a user with this login already exists.';
-$lang['regsuccess'] = 'The user has been created and the password was sent by email.';
-$lang['regsuccess2']= 'The user has been created.';
-$lang['regmailfail']= 'Looks like there was an error on sending the password mail. Please contact the admin!';
-$lang['regbadmail'] = 'The given email address looks invalid - if you think this is an error, contact the admin';
-$lang['regbadpass'] = 'The two given passwords are not identically, please try again.';
-$lang['regpwmail']  = 'Your DokuWiki password';
-$lang['reghere']    = 'You don\'t have an account yet? Just get one';
-
-$lang['txt_upload']   = 'Select file to upload';
-$lang['txt_filename'] = 'Enter wikiname (optional)';
-$lang['txt_overwrt']  = 'Overwrite existing file';
-$lang['lockedby']     = 'Currently locked by';
-$lang['lockexpire']   = 'Lock expires at';
-$lang['js']['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
-
-$lang['js']['notsavedyet'] = 'Unsaved changes will be lost.\nReally continue?';
-
-$lang['rssfailed']   = 'An error occured while fetching this feed: ';
 $lang['nothingfound']= 'Tiştek nehat dîtin.';
-
-$lang['mediaselect'] = 'Mediafile Selection';
-$lang['uploadsucc']  = 'Upload successful';
-$lang['uploadfail']  = 'Upload failed. Maybe wrong permissions?';
-$lang['uploadwrong'] = 'Upload denied. This file extension is forbidden!';
-$lang['uploadexist'] = 'File already exists. Nothing done.';
-$lang['deletesucc']  = 'The file "%s" has been deleted.';
-$lang['deletefail']  = '"%s" couldn\'t be deleted - check permissions.';
-$lang['mediainuse']  = 'The file "%s" hasn\'t been deleted - it is still in use.';
-$lang['namespaces']  = 'Namespace';
-$lang['mediafiles']  = 'Available files in';
-
 $lang['reference']   = 'Referansa';
-$lang['ref_inuse']   = 'The file can\'t be deleted, because it\'s still used by the following pages:';
-$lang['ref_hidden']  = 'Some references  are on pages you don\'t have permission to read';
-
-$lang['hits']       = 'Hits';
-$lang['quickhits']  = 'Matching pagenames';
 $lang['toc']        = 'Tabloya Navêrokê';
-$lang['current']    = 'current';
-$lang['yours']      = 'Your Version';
-$lang['diff']       = 'show differences to current version';
 $lang['line']       = 'Rêz';
 $lang['breadcrumb'] = 'Şop:';
 $lang['lastmod']    = 'Guherandina dawî:';
-$lang['by']         = 'by';
 $lang['deleted']    = 'hat jê birin';
 $lang['created']    = 'hat afirandin';
-$lang['restored']   = 'old revision restored (%s)';
 $lang['summary']    = 'Kurteya guhartinê';
-
-$lang['mail_newpage'] = 'page added:';
-$lang['mail_changed'] = 'page changed:';
-
-$lang['js']['nosmblinks'] = 'Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.';
-
-$lang['qb_bold']    = 'Bold Text';
-$lang['qb_italic']  = 'Italic Text';
-$lang['qb_underl']  = 'Underlined Text';
-$lang['qb_code']    = 'Code Text';
-$lang['qb_strike']  = 'Strike-through Text';
-$lang['qb_h1']      = 'Level 1 Headline';
-$lang['qb_h2']      = 'Level 2 Headline';
-$lang['qb_h3']      = 'Level 3 Headline';
-$lang['qb_h4']      = 'Level 4 Headline';
-$lang['qb_h5']      = 'Level 5 Headline';
-$lang['qb_link']    = 'Internal Link';
-$lang['qb_extlink'] = 'External Link';
-$lang['qb_hr']      = 'Horizontal Rule';
-$lang['qb_ol']      = 'Ordered List Item';
-$lang['qb_ul']      = 'Unordered List Item';
-$lang['qb_media']   = 'Add Images and other files';
-$lang['qb_sig']     = 'Insert Signature';
-
-$lang['js']['del_confirm']= 'Delete this entry?';
-
-$lang['metaedit']    = 'Edit Metadata';
-$lang['metasaveerr'] = 'Writing metadata failed';
-$lang['metasaveok']  = 'Metadata saved';
-$lang['btn_img_backto']  = 'Back to %s';
-$lang['img_title']   = 'Title:';
-$lang['img_caption'] = 'Caption:';
-$lang['img_date']    = 'Date:';
-$lang['img_fname']   = 'Filename:';
-$lang['img_fsize']   = 'Size:';
-$lang['img_artist']  = 'Photographer:';
-$lang['img_copyr']   = 'Copyright:';
-$lang['img_format']  = 'Format:';
-$lang['img_camera']  = 'Camera:';
-$lang['img_keywords']= 'Keywords:';
 $lang['searchcreatepage']      = "Heke tiştek nehatibe dîtin, tu dikarî dest bi nivîsandina rûpelekê nû bikî. Ji bo vê, ''Vê rûpelê biguherîne'' bitikîne.";
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/ku/locked.txt b/inc/lang/ku/locked.txt
deleted file mode 100644
index af6347a96..000000000
--- a/inc/lang/ku/locked.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-====== Page locked ======
-
-This page is currently locked for editing by another user. You have to wait until this user finishes editing or the lock expires.
diff --git a/inc/lang/ku/login.txt b/inc/lang/ku/login.txt
deleted file mode 100644
index 2004ea198..000000000
--- a/inc/lang/ku/login.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Login ======
-
-You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.
-
diff --git a/inc/lang/ku/mailtext.txt b/inc/lang/ku/mailtext.txt
deleted file mode 100644
index 44a3f6553..000000000
--- a/inc/lang/ku/mailtext.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-A page in your DokuWiki was added or changed. Here are the details:
-
-Date        : @DATE@
-Browser     : @BROWSER@
-IP-Address  : @IPADDRESS@
-Hostname    : @HOSTNAME@
-Old Revision: @OLDPAGE@
-New Revision: @NEWPAGE@
-Edit Summary: @SUMMARY@
-User        : @USER@
-
-@DIFF@
-
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/ku/norev.txt b/inc/lang/ku/norev.txt
deleted file mode 100644
index 0b21bf3f0..000000000
--- a/inc/lang/ku/norev.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== No such revision ======
-
-The specified revision doesn't exist. Use the ''Old revisions'' button for a list of old revisions of this document.
-
diff --git a/inc/lang/ku/password.txt b/inc/lang/ku/password.txt
deleted file mode 100644
index 6d5cbe678..000000000
--- a/inc/lang/ku/password.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Hi @FULLNAME@!
-
-Here is your userdata for @TITLE@ at @DOKUWIKIURL@
-
-Login    : @LOGIN@
-Password : @PASSWORD@
-
--- 
-This mail was generated by DokuWiki at
-@DOKUWIKIURL@
diff --git a/inc/lang/ku/read.txt b/inc/lang/ku/read.txt
deleted file mode 100644
index 9f56d81ad..000000000
--- a/inc/lang/ku/read.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
-
diff --git a/inc/lang/ku/register.txt b/inc/lang/ku/register.txt
deleted file mode 100644
index b65683bc2..000000000
--- a/inc/lang/ku/register.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Register as new user ======
-
-Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - your new password will be sent to it. The login name should be a valid [[doku>pagename|pagename]].
-
diff --git a/inc/lang/ku/revisions.txt b/inc/lang/ku/revisions.txt
deleted file mode 100644
index dd5f35b8e..000000000
--- a/inc/lang/ku/revisions.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-====== Old Revisions ======
-
-These are the older revisons of the current document. To revert to an old revision, select it from below, click ''Edit this page'' and save it.
-
diff --git a/inc/lang/ku/showrev.txt b/inc/lang/ku/showrev.txt
deleted file mode 100644
index 3608de36b..000000000
--- a/inc/lang/ku/showrev.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-**This is an old revision of the document!**
-----
diff --git a/inc/lang/ku/stopwords.txt b/inc/lang/ku/stopwords.txt
deleted file mode 100644
index bc6eb48ae..000000000
--- a/inc/lang/ku/stopwords.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# This is a list of words the indexer ignores, one word per line
-# When you edit this file be sure to use UNIX line endings (single newline)
-# No need to include words shorter than 3 chars - these are ignored anyway
-# This list is based upon the ones found at http://www.ranks.nl/stopwords/
-about
-are
-and
-you
-your
-them
-their
-com
-for
-from
-into
-how
-that
-the
-this
-was
-what
-when
-where
-who
-will
-with
-und
-the
-www
-- 
cgit v1.2.3


From 969c52e5724a4a380ac11df87059f5bc39631da0 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 12 Jul 2015 21:49:21 +0100
Subject: fixed occurrences of html named entities in translation files to be
 xhtml-compatible

---
 inc/lang/fr/lang.php                              |  4 ++--
 inc/lang/he/lang.php                              |  2 +-
 inc/lang/he/mailtext.txt                          |  4 ++--
 inc/lang/he/registermail.txt                      |  4 ++--
 inc/lang/km/lang.php                              |  6 +++---
 lib/plugins/authldap/lang/zh-tw/settings.php      |  6 +++---
 lib/plugins/authldap/lang/zh/settings.php         |  6 +++---
 lib/plugins/authmysql/lang/ja/settings.php        |  4 ++--
 lib/plugins/authpgsql/lang/ja/settings.php        |  4 ++--
 lib/plugins/config/lang/eo/lang.php               |  2 +-
 lib/plugins/config/lang/zh-tw/lang.php            |  2 +-
 lib/plugins/extension/lang/pt-br/lang.php         | 26 +++++++++++------------
 lib/plugins/extension/lang/pt/intro_templates.txt |  2 +-
 13 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 74b1edd19..f3077bf88 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Sébastien Bauer <sebastien.bauer@advalvas.be>
  * @author Antoine Fixary <antoine.fixary@freesbee.fr>
  * @author cumulus <pta-n56@myamail.com>
@@ -197,7 +197,7 @@ $lang['accessdenied']          = 'Vous n\'êtes pas autorisé à voir cette page
 $lang['mediausage']            = 'Utilisez la syntaxe suivante pour faire référence à ce fichier :';
 $lang['mediaview']             = 'Afficher le fichier original';
 $lang['mediaroot']             = 'racine';
-$lang['mediaupload']           = 'Envoyez un fichier dans la catégorie actuelle. Pour créer des sous-catégories, préfixez en le nom du fichier séparées par un double-point, après avoir choisis le(s) fichier(s). Le(s) fichier(s) peuvent également être envoyé(s) par glisser-déposer (drag & drop)';
+$lang['mediaupload']           = 'Envoyez un fichier dans la catégorie actuelle. Pour créer des sous-catégories, préfixez en le nom du fichier séparées par un double-point, après avoir choisis le(s) fichier(s). Le(s) fichier(s) peuvent également être envoyé(s) par glisser-déposer (drag &amp; drop)';
 $lang['mediaextchange']        = 'Extension du fichier modifiée de .%s en .%s !';
 $lang['reference']             = 'Références pour';
 $lang['ref_inuse']             = 'Le fichier ne peut être effacé car il est toujours utilisé par les pages suivantes :';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 1859d3c3e..a24ccace9 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -289,7 +289,7 @@ $lang['i_problems']            = 'תכנית ההתקנה זיהתה מספר ב
 $lang['i_modified']            = 'משיקולי אבטחה סקריפט זה יעבוד אך ורק עם התקנת DokuWiki חדשה שלא עברה כל שינוי.
                          עליך לחלץ שנית את הקבצים מהחבילה שהורדה או להיעזר בדף
                          <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
-$lang['i_funcna']              = 'פונקציית ה-PHP&rlm; <code>%s</code> אינה זמינה. יתכן כי מארח האתר חסם אותה מסיבה כלשהי?';
+$lang['i_funcna']              = 'פונקציית ה-PHP&#8207; <code>%s</code> אינה זמינה. יתכן כי מארח האתר חסם אותה מסיבה כלשהי?';
 $lang['i_phpver']              = 'גרסת PHP שלך <code>%s</code> נמוכה מ <code>%s</code> הצורך. אתה צריך לשדרג PHP שלך להתקין.';
 $lang['i_mbfuncoverload']      = 'יש לבטל את mbstring.func_overload בphp.ini בכדי להריץ את DokuWiki';
 $lang['i_permfail']            = '<code>%s</code> אינה ניתנת לכתיבה על ידי DokuWiki. עליך לשנות הרשאות תיקייה זו!';
diff --git a/inc/lang/he/mailtext.txt b/inc/lang/he/mailtext.txt
index 222ee1b6d..5ef4ec7e2 100644
--- a/inc/lang/he/mailtext.txt
+++ b/inc/lang/he/mailtext.txt
@@ -2,7 +2,7 @@
 
 תאריך        : @DATE@
 דפדפן     : @BROWSER@
-כתובת ה־IP&rlm;  : @IPADDRESS@
+כתובת ה־IP&#8207;  : @IPADDRESS@
 שם המארח    : @HOSTNAME@
 המהדורה הישנה: @OLDPAGE@
 המהדורה החדשה: @NEWPAGE@
@@ -11,7 +11,7 @@
 
 @DIFF@
 
--- 
+--
 
 דף זה נוצר ע״י ה־DokuWiki הזמין בכתובת
 @DOKUWIKIURL@
diff --git a/inc/lang/he/registermail.txt b/inc/lang/he/registermail.txt
index 3edca3fa0..d478d1c20 100644
--- a/inc/lang/he/registermail.txt
+++ b/inc/lang/he/registermail.txt
@@ -6,9 +6,9 @@
 
 תאריך      : @DATE@
 דפדפן      : @BROWSER@
-כתובת IP&rlm;  : @IPADDRESS@
+כתובת IP&#8207;  : @IPADDRESS@
 שם המארח   : @HOSTNAME@
 
--- 
+--
 הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת
 @DOKUWIKIURL@
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 4c2d7f688..52e0e6a3d 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -61,7 +61,7 @@ $lang['reguexists'] = 'សុំអាទោស​ នាមប្រើនេ
 $lang['regsuccess'] = 'អ្នកប្រើបានបង្កើតហើយ និងពាក្សសម្ងាតក៏បានផ្ញើទៀត។';
 $lang['regsuccess2']= 'អ្នកប្រើបានបង្កើតហើយ។';
 $lang['regmailfail']= 'មើលទៅដុចជាមានកំហុសក្នុង....សុំទាកទងអ្នកក្របក្រង';
-$lang['regbadmail'] = 'អ៊ីមេលអ្នកសាសេមិនត្រូវបញ្ជរ&mdash;បើអ្នកកិតថានេះជាកំហុសបដិបត្តិ សុំទាកទងអ្នកក្របគ្រោង។';
+$lang['regbadmail'] = 'អ៊ីមេលអ្នកសាសេមិនត្រូវបញ្ជរ—បើអ្នកកិតថានេះជាកំហុសបដិបត្តិ សុំទាកទងអ្នកក្របគ្រោង។';
 $lang['regbadpass'] = 'គូពាក្សសម្ងាតមិនដូចគ្នាទេ សមសាកទៀត។';
 $lang['regpwmail']  = 'ពាក្សសម្ងាតអ្នក';
 $lang['reghere']    = 'អ្នកឥតមានបញ្ជីនាមបម្រើទេ?  សុំចល់ចុះឈ្មោះធ្វើគណនីសម្របប្រើប្រស';
@@ -99,8 +99,8 @@ $lang['uploadbadcontent'] = 'ធាតុចំរុញឡើងមិនត្
 $lang['uploadspam']  = 'ចំរុញឡើង បង្ខាំង ដៅយ  ';
 $lang['uploadxss']   = 'ចំរុញឡើង បង្ខាំង  ';
 $lang['deletesucc']  = 'ឯកសារ «%s» បានលុបហើយ។';
-$lang['deletefail']  = '«%s» មិនអាចលុបទេ&mdashមើល';
-$lang['mediainuse']  = 'ឯកសារ «%s» ឥតទានលុបទេ&mdashមានគេកំភងទេជាប់ប្រើ។';
+$lang['deletefail']  = '«%s» មិនអាចលុបទេ—មើល';
+$lang['mediainuse']  = 'ឯកសារ «%s» ឥតទានលុបទេ—មានគេកំភងទេជាប់ប្រើ។';
 $lang['namespaces']  = 'នាមដ្ឋាន';
 $lang['mediafiles']  = 'ឯកសារទំនេនៅក្នុង';
 
diff --git a/lib/plugins/authldap/lang/zh-tw/settings.php b/lib/plugins/authldap/lang/zh-tw/settings.php
index e3d85cb87..dcbbace8c 100644
--- a/lib/plugins/authldap/lang/zh-tw/settings.php
+++ b/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -2,15 +2,15 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 LDAP 伺服器。填寫主機名稱 (<code>localhost</code>) 或完整的 URL (<code>ldap://server.tld:389</code>)';
 $lang['port']                  = 'LDAP 伺服器端口 (若上方沒填寫完整的 URL)';
 $lang['usertree']              = '到哪裏尋找使用者帳號？如： <code>ou=People, dc=server, dc=tld</code>';
 $lang['grouptree']             = '到哪裏尋找使用者群組？如： <code>ou=Group, dc=server, dc=tld</code>';
-$lang['userfilter']            = '用於搜索使用者賬號的 LDAP 篩選器。如： <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
-$lang['groupfilter']           = '用於搜索群組的 LDAP 篩選器。例如 <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['userfilter']            = '用於搜索使用者賬號的 LDAP 篩選器。如： <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = '用於搜索群組的 LDAP 篩選器。例如 <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = '使用的通訊協定版本。您可能要設置為 <code>3</code>';
 $lang['starttls']              = '使用 TLS 連接嗎？';
 $lang['referrals']             = '是否允許引用 (referrals)？';
diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index 4f4a0a8b8..11cba4f55 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author lainme <lainme993@gmail.com>
  * @author oott123 <ip.192.168.1.1@qq.com>
  * @author Errol <errol@hotmail.com>
@@ -11,8 +11,8 @@ $lang['server']                = '您的 LDAP 服务器。填写主机名 (<code
 $lang['port']                  = 'LDAP 服务器端口 (如果上面没有给出完整的 URL)';
 $lang['usertree']              = '何处查找用户账户。例如 <code>ou=People, dc=server, dc=tld</code>';
 $lang['grouptree']             = '何处查找用户组。例如 <code>ou=Group, dc=server, dc=tld</code>';
-$lang['userfilter']            = '用于搜索用户账户的 LDAP 筛选器。例如 <code>(&(uid=%{user})(objectClass=posixAccount))</code>';
-$lang['groupfilter']           = '用于搜索组的 LDAP 筛选器。例如 <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
+$lang['userfilter']            = '用于搜索用户账户的 LDAP 筛选器。例如 <code>(&amp;(uid=%{user})(objectClass=posixAccount))</code>';
+$lang['groupfilter']           = '用于搜索组的 LDAP 筛选器。例如 <code>(&amp;(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>';
 $lang['version']               = '使用的协议版本。您或许需要设置为 <code>3</code>';
 $lang['starttls']              = '使用 TLS 连接？';
 $lang['referrals']             = '是否允许引用 (referrals)？';
diff --git a/lib/plugins/authmysql/lang/ja/settings.php b/lib/plugins/authmysql/lang/ja/settings.php
index e5d5689df..cc0146b15 100644
--- a/lib/plugins/authmysql/lang/ja/settings.php
+++ b/lib/plugins/authmysql/lang/ja/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  */
 $lang['server']                = 'MySQL のホスト名';
@@ -11,7 +11,7 @@ $lang['password']              = 'MySQL 接続用ユーザーのパスワード'
 $lang['database']              = '使用するデータベース名';
 $lang['charset']               = 'データベースの文字コード';
 $lang['debug']                 = 'デバック情報を表示する';
-$lang['forwardClearPass']      = '以下で定義する SQL ステートメントにおいて, パスワード変数 &#x25;{pass} を平文とする(DokiWiki側で暗号化しない)';
+$lang['forwardClearPass']      = '以下で定義する SQL ステートメントにおいて, パスワード変数 を平文とする(DokiWiki側で暗号化しない)';
 $lang['TablesToLock']          = '書き込み時にロックするテーブル（コンマ区切りで列挙）';
 $lang['checkPass']             = 'パスワードの照合に用いる SQL ステートメント';
 $lang['getUserInfo']           = 'ユーザー情報の取得に用いる SQL ステートメント';
diff --git a/lib/plugins/authpgsql/lang/ja/settings.php b/lib/plugins/authpgsql/lang/ja/settings.php
index d7a5f6cf2..001008c9f 100644
--- a/lib/plugins/authpgsql/lang/ja/settings.php
+++ b/lib/plugins/authpgsql/lang/ja/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  */
 $lang['server']                = 'PostgreSQL のサーバー名';
@@ -11,7 +11,7 @@ $lang['user']                  = 'PostgreSQL 接続用ユーザー名';
 $lang['password']              = 'PostgreSQL 接続用ユーザーのパスワード';
 $lang['database']              = '使用するデータベース名';
 $lang['debug']                 = 'デバック情報を表示する';
-$lang['forwardClearPass']      = '以下で定義する SQL ステートメントにおいて, パスワード変数 &#x25;{pass} を平文とする(DokiWiki側で暗号化しない)';
+$lang['forwardClearPass']      = '以下で定義する SQL ステートメントにおいて, パスワード変数 を平文とする(DokiWiki側で暗号化しない)';
 $lang['checkPass']             = 'パスワードの照合に用いる SQL ステートメント';
 $lang['getUserInfo']           = 'ユーザー情報の取得に用いる SQL ステートメント';
 $lang['getGroups']             = 'ユーザーが所属する全てのグループの取得に用いる SQL ステートメント';
diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php
index 440d771dc..566da0d2d 100644
--- a/lib/plugins/config/lang/eo/lang.php
+++ b/lib/plugins/config/lang/eo/lang.php
@@ -137,7 +137,7 @@ $lang['compress']              = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn
 $lang['cssdatauri']            = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj enmetiĝu rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aŭ pli frua!
 <code>400</code> ĝis <code>600</code> bitokoj estas bona grandeco. Indiku <code>0</code> por malebligi enmeton.';
 $lang['send404']               = 'Sendi la mesaĝon "HTTP 404/Paĝo ne trovita" por ne ekzistantaj paĝoj';
-$lang['broken_iua']            = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu <a href="http://bugs.splitbrain.org/?do=details&task_id=852&">Cimon 852</a> por pli da informoj.';
+$lang['broken_iua']            = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Cimon 852</a> por pli da informoj.';
 $lang['xsendfile']             = 'Ĉu uzi la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo subtenu tion.';
 $lang['renderer_xhtml']        = 'Prezentilo por la ĉefa vikia rezulto (xhtml)';
 $lang['renderer__core']        = '%s (DokuWiki-a kerno)';
diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php
index cc2c28c31..c586a0d51 100644
--- a/lib/plugins/config/lang/zh-tw/lang.php
+++ b/lib/plugins/config/lang/zh-tw/lang.php
@@ -137,7 +137,7 @@ $lang['gzip_output']           = '對 xhtml 使用 gzip 內容編碼';
 $lang['compress']              = '壓縮 CSS 與 JavaScript 的輸出';
 $lang['cssdatauri']            = '假如 CSS 中所引用的圖片小於該數字大小(bytes)，圖片將被直接嵌入 CSS 中，以減少 HTTP Request 的發送。 IE 7 及以下的版本並不支援此功能。推薦把此數值設定成 <code>400</code> 至 <code>600</code> bytes 之間。若輸入 <code>0</code> 則停用此功能。';
 $lang['send404']               = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"';
-$lang['broken_iua']            = 'ignore_user_abort 功能失效了？這有可能導致搜索索引不可用。IIS+PHP/CGI 已損壞。請參閱 <a href=\"http://bugs.splitbrain.org/?do=details&task_id=852\">Bug 852</a> 獲取更多訊息。';
+$lang['broken_iua']            = 'ignore_user_abort 功能失效了？這有可能導致搜索索引不可用。IIS+PHP/CGI 已損壞。請參閱 <a href=\"http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> 獲取更多訊息。';
 $lang['xsendfile']             = '使用 X-Sendfile 頭讓網頁伺服器發送狀態文件？您的網頁伺服器需要支持該功能。';
 $lang['renderer_xhtml']        = '主要 wiki 輸出 (xhtml) 的渲染器';
 $lang['renderer__core']        = '%s (dokuwiki 核心)';
diff --git a/lib/plugins/extension/lang/pt-br/lang.php b/lib/plugins/extension/lang/pt-br/lang.php
index f7b7a0d2b..823900acf 100644
--- a/lib/plugins/extension/lang/pt-br/lang.php
+++ b/lib/plugins/extension/lang/pt-br/lang.php
@@ -63,7 +63,7 @@ $lang['status_bundled']        = 'agrupado';
 $lang['msg_enabled']           = 'Extensão %s habilitada';
 $lang['msg_disabled']          = 'Extensão %s desabilitada';
 $lang['msg_delete_success']    = 'Extensão %s desinstalada';
-$lang['msg_delete_failed']     = 'Falha na desinstala&ccedil;&atilde;o da extens&atilde;o %s';
+$lang['msg_delete_failed']     = 'Falha na desinstalação da extensão %s';
 $lang['msg_template_install_success'] = 'Modelo %s instalado com sucesso';
 $lang['msg_template_update_success'] = 'Modelo %s atualizado com sucesso';
 $lang['msg_plugin_install_success'] = 'Extensão %s instalada com sucesso';
@@ -75,18 +75,18 @@ $lang['security_warning']      = '<strong>Aviso sobre segurança:</strong> %s';
 $lang['update_available']      = '<strong>Atualização:</strong> Nova versão %s está disponível.';
 $lang['wrong_folder']          = '<strong>Extensão instalada incorretamente:</strong> Renomeie o diretório de extensões "%s" para "%s".';
 $lang['url_change']            = '<strong>URL mudou:</strong> A URL para baixar mudou desde a última baixada. Verifique se a nova URL é válida antes de atualizar a extensão.<br />Novo: %s<br />Velho: %s';
-$lang['error_badurl']          = 'O URL deve come&ccedil;ar com http ou https';
-$lang['error_dircreate']       = 'Imposs&iacute;vel criar pasta tempor&aacute;ria para receber o download';
-$lang['error_download']        = 'Imposs&aacute;vel baixar o arquivo: %s';
-$lang['error_decompress']      = 'Imposs&aacute;vel descompimir o arquivo baixado. Isso pode ser resultado de um download ruim que neste caso pode ser tentado novamente; ou o formato da compress&atilde;o pode ser desconhecido, neste caso baixe e instale manualmente.';
-$lang['error_findfolder']      = 'Imposs&iacute;l identificar a extens&atilde;o do diret&oacute;rio, voc&ecirc; deve baixar e instalar manualmente.';
-$lang['error_copy']            = 'Houve um erro de c&oacute;pia de arquivo durante a tentativa de instalar os arquivos para o diret&oacute;rio <em>%s</ em> : o disco pode estar cheio ou as permiss&otilde;es de acesso ao arquivo podem estar incorreta. Isso pode ter resultado em um plugin parcialmente instalado e deixar a sua instala&ccedil;&atilde;o wiki inst&aacute;vel';
-$lang['noperms']               = 'Diret&oacute;rio de extens&atilde;o n&atilde;o &eacute; grav&aacute;vel';
-$lang['notplperms']            = 'Diret&oacute;rio de modelo (Template) n&atilde;o &eacute; grav&aacute;vel';
-$lang['nopluginperms']         = 'Diret&oacute;rio de plugin n&atilde;o &eacute; grav&aacute;vel';
-$lang['git']                   = 'A extens&atilde;o foi instalada via git, voc&ecirc; talvez n&atilde;o queira atualiz&aacute;-lo aqui.';
-$lang['auth']                  = 'O plugin auth n&atilde;o est&aacute; ativado na configura&ccedil;&atilde;o, considere desativ&aacute-lo.';
+$lang['error_badurl']          = 'O URL deve começar com http ou https';
+$lang['error_dircreate']       = 'Impossível criar pasta temporária para receber o download';
+$lang['error_download']        = 'Impossável baixar o arquivo: %s';
+$lang['error_decompress']      = 'Impossável descompimir o arquivo baixado. Isso pode ser resultado de um download ruim que neste caso pode ser tentado novamente; ou o formato da compressão pode ser desconhecido, neste caso baixe e instale manualmente.';
+$lang['error_findfolder']      = 'Impossíl identificar a extensão do diretório, você deve baixar e instalar manualmente.';
+$lang['error_copy']            = 'Houve um erro de cópia de arquivo durante a tentativa de instalar os arquivos para o diretório <em>%s</em> : o disco pode estar cheio ou as permissões de acesso ao arquivo podem estar incorreta. Isso pode ter resultado em um plugin parcialmente instalado e deixar a sua instalação wiki instável';
+$lang['noperms']               = 'Diretório de extensão não é gravável';
+$lang['notplperms']            = 'Diretório de modelo (Template) não é gravável';
+$lang['nopluginperms']         = 'Diretório de plugin não é gravável';
+$lang['git']                   = 'A extensão foi instalada via git, você talvez não queira atualizá-lo aqui.';
+$lang['auth']                  = 'O plugin auth não está ativado na configuração, considere desativá-lo.';
 $lang['install_url']           = 'Instale a partir do URL:';
-$lang['install_upload']        = 'Publicar Extens&atilde;o:';
+$lang['install_upload']        = 'Publicar Extensão:';
 $lang['repo_error']            = 'O repositório de plugin não pode ser contactado. Certifique-se de que o servidor pode acessar www.dokuwiki.org e confira suas configurações de proxy.';
 $lang['nossl']                 = 'Sua instalação PHP parece que não suporta SSL. Algumas extensões DokuWiki não serão baixadas.';
diff --git a/lib/plugins/extension/lang/pt/intro_templates.txt b/lib/plugins/extension/lang/pt/intro_templates.txt
index ecdf99f17..02bc33643 100644
--- a/lib/plugins/extension/lang/pt/intro_templates.txt
+++ b/lib/plugins/extension/lang/pt/intro_templates.txt
@@ -1 +1 @@
-Estes são os modelos atualmente instalados em seu DokuWiki. Você pode selecionar o modelo a ser usado no [[Do = admin & page = configuração |? Configuration Manager]].
\ No newline at end of file
+Estes são os modelos atualmente instalados em seu DokuWiki. Você pode selecionar o modelo a ser usado no [[?do=admin&page=config|Configuration Manager]].
-- 
cgit v1.2.3


From 8aceb983f4d8ab414fda0598287fb876703d1de8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 12 Jul 2015 23:47:02 +0100
Subject: fixed some wrong quotation marks in language files

---
 inc/lang/bg/lang.php |  6 +++---
 inc/lang/bn/lang.php | 12 ++++++------
 inc/lang/eo/lang.php |  4 ++--
 inc/lang/et/lang.php |  2 +-
 inc/lang/fi/lang.php |  4 ++--
 inc/lang/fo/lang.php | 10 +++++-----
 inc/lang/hr/lang.php |  4 ++--
 inc/lang/id/lang.php |  8 ++++----
 inc/lang/kk/lang.php |  4 ++--
 inc/lang/la/lang.php |  8 ++++----
 inc/lang/mk/lang.php |  4 +++-
 inc/lang/no/lang.php |  2 +-
 inc/lang/pl/lang.php |  4 ++--
 inc/lang/ro/lang.php |  4 ++--
 inc/lang/ru/lang.php |  4 ++--
 inc/lang/sq/lang.php |  8 ++++----
 inc/lang/ta/lang.php |  6 +++---
 inc/lang/th/lang.php |  4 ++--
 inc/lang/uk/lang.php |  3 +--
 19 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 9176cee56..697f39ad3 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
  * @author Viktor Usunov <usun0v@mail.bg>
  * @author Kiril <neohidra@gmail.com>
@@ -10,8 +10,8 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '"';
-$lang['doublequoteclosing']    = '"';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '’';
diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php
index db7baa0f2..512b94132 100644
--- a/inc/lang/bn/lang.php
+++ b/inc/lang/bn/lang.php
@@ -9,12 +9,12 @@
  * @author Ninetailz <ninetailz1125@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
-$lang['direction']             = 'itr';
-$lang['doublequoteopening']    = '"';
-$lang['doublequoteclosing']    = '"';
-$lang['singlequoteopening']    = '\'';
-$lang['singlequoteclosing']    = '\'';
-$lang['apostrophe']            = '\'';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'এই পৃষ্ঠা সম্পাদনা করুন';
 $lang['btn_source']            = 'দেখান পাতা উৎস';
 $lang['btn_show']              = 'দেখান পৃষ্ঠা';
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 24df39dc7..3e0b91059 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Antono Vasiljev <esperanto.minsk ĈE tut.by>
  * @author Felipe Castro <fefcas@yahoo.com.br>
  * @author Felipe Castro <fefcas@uol.com.br>
@@ -17,7 +17,7 @@ $lang['doublequoteopening']    = '“';
 $lang['doublequoteclosing']    = '”';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '\'';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Redakti la paĝon';
 $lang['btn_source']            = 'Montri fontan tekston';
 $lang['btn_show']              = 'Montri paĝon';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 2372482c3..dbff49dfc 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Oliver S6ro <seem.iges@mail.ee>
  * @author Aari Juhanson <aari@vmg.vil.ee>
  * @author Kaiko Kaur <kaiko@kultuur.edu.ee>
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 0f70efa5c..de2ca13da 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Petteri <petteri@gmail.com>
  * @author Matti Pöllä <mpo@iki.fi>
  * @author Otto Vainio <otto@valjakko.net>
@@ -17,7 +17,7 @@ $lang['doublequoteopening']    = '”';
 $lang['doublequoteclosing']    = '”';
 $lang['singlequoteopening']    = '’';
 $lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '\'';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Muokkaa tätä sivua';
 $lang['btn_source']            = 'Näytä sivun lähdekoodi';
 $lang['btn_show']              = 'Näytä sivu';
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index f3f462272..d1d7096c9 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -8,11 +8,11 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = 'Vanligt gásareygað byrjan';
-$lang['doublequoteclosing']    = 'Vanligt gásareygað endi';
-$lang['singlequoteopening']    = 'Einstakt gásareygað byrjan';
-$lang['singlequoteclosing']    = 'Einstakt gásareygað endi';
-$lang['apostrophe']            = 'Apostroff';
+$lang['doublequoteopening']    = '&quot;';
+$lang['doublequoteclosing']    = '&quot;';
+$lang['singlequoteopening']    = '\'';
+$lang['singlequoteclosing']    = '\'';
+$lang['apostrophe']            = '\'';
 $lang['btn_edit']              = 'Rætta hetta skjal';
 $lang['btn_source']            = 'Vís keldu';
 $lang['btn_show']              = 'Vís skjal';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index 39eaa18c0..40e0c59c3 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Tomo Krajina <aaa@puzz.info>
  * @author Branko Rihtman <theney@gmail.com>
  * @author Dražen Odobašić <dodobasic@gmail.com>
@@ -15,7 +15,7 @@ $lang['doublequoteopening']    = '“';
 $lang['doublequoteclosing']    = '”';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '\'';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Izmijeni stranicu';
 $lang['btn_source']            = 'Prikaži kod stranice';
 $lang['btn_show']              = 'Prikaži dokument';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index 3fc1506e4..4321e2cc9 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -12,10 +12,10 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '"';
-$lang['doublequoteclosing']    = '"';
-$lang['singlequoteopening']    = '\'';
-$lang['singlequoteclosing']    = '\'';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '\'';
 $lang['btn_edit']              = 'Edit halaman ini';
 $lang['btn_source']            = 'Lihat sumber halaman';
diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php
index 5536d48d3..cb224d9a0 100644
--- a/inc/lang/kk/lang.php
+++ b/inc/lang/kk/lang.php
@@ -6,8 +6,8 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '"';
-$lang['doublequoteclosing']    = '"';
+$lang['doublequoteopening']    = '&quot;';
+$lang['doublequoteclosing']    = '&quot;';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '\'';
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index 35f8308d0..d6b828525 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -12,11 +12,11 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '"';
-$lang['doublequoteclosing']    = '"';
+$lang['doublequoteopening']    = '&quot;';
+$lang['doublequoteclosing']    = '&quot;';
 $lang['singlequoteopening']    = '`';
-$lang['singlequoteclosing']    = '\'';
-$lang['apostrophe']            = '´';
+$lang['singlequoteclosing']    = '´';
+$lang['apostrophe']            = '\'';
 $lang['btn_edit']              = 'Recensere hanc paginam';
 $lang['btn_source']            = 'Fontem uidere';
 $lang['btn_show']              = 'Ostendere paginam';
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
index 5621fe9c0..034d98b38 100644
--- a/inc/lang/mk/lang.php
+++ b/inc/lang/mk/lang.php
@@ -14,7 +14,9 @@ $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['doublequoteopening']    = '„';
 $lang['doublequoteclosing']    = '“';
-$lang['apostrophe']            = '\'';
+$lang['singlequoteopening']    = '’';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Уреди ја страницата';
 $lang['btn_source']            = 'Прикажи ја изворната страница';
 $lang['btn_show']              = 'Прикажи страница';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 51854f80d..9388a0a70 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -30,7 +30,7 @@ $lang['doublequoteopening']    = '«';
 $lang['doublequoteclosing']    = '»';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '\'';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Rediger denne siden';
 $lang['btn_source']            = 'Vis kildekode';
 $lang['btn_show']              = 'Vis siden';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 5c9acfa17..ae307b4fd 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Grzegorz Żur <grzegorz.zur@gmail.com>
  * @author Mariusz Kujawski <marinespl@gmail.com>
  * @author Maciej Kurczewski <pipijajko@gmail.com>
@@ -25,7 +25,7 @@ $lang['doublequoteopening']    = '„';
 $lang['doublequoteclosing']    = '”';
 $lang['singlequoteopening']    = '‚';
 $lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '\'';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Edytuj stronę';
 $lang['btn_source']            = 'Pokaż źródło strony';
 $lang['btn_show']              = 'Pokaż stronę';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 5953fccda..5dab68c69 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Tiberiu Micu <tibimicu@gmx.net>
  * @author Sergiu Baltariu <s_baltariu@yahoo.com>
  * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
@@ -17,7 +17,7 @@ $lang['doublequoteopening']    = '„';
 $lang['doublequoteclosing']    = '“';
 $lang['singlequoteopening']    = '‚';
 $lang['singlequoteclosing']    = '‘';
-$lang['apostrophe']            = '\'';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Editează această pagină';
 $lang['btn_source']            = 'Arată sursa paginii';
 $lang['btn_show']              = 'Arată pagina';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 7aa7c5b09..40d3ffefe 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Yuri Pimenov <up@ftpsearch.lv>
  * @author Igor Tarasov <tigr@mail15.com>
  * @author Denis Simakov <akinoame1@gmail.com>
@@ -33,7 +33,7 @@
  * @author Nolf <m.kopachovets@gmail.com>
  * @author Takumo <9206984@mail.ru>
  */
-$lang['encoding']              = ' utf-8';
+$lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['doublequoteopening']    = '«';
 $lang['doublequoteclosing']    = '»';
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 3d2146394..331819a66 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -12,10 +12,10 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '"';
-$lang['doublequoteclosing']    = '"';
-$lang['singlequoteopening']    = '\'';
-$lang['singlequoteclosing']    = '\'';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '\'';
 $lang['btn_edit']              = 'Redaktoni këtë faqe';
 $lang['btn_source']            = 'Trego kodin burim të faqes';
diff --git a/inc/lang/ta/lang.php b/inc/lang/ta/lang.php
index 41c4a94c3..422613ec7 100644
--- a/inc/lang/ta/lang.php
+++ b/inc/lang/ta/lang.php
@@ -2,12 +2,12 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Naveen Venugopal <naveen.venugopal.anu@gmail.com>
  * @author Sri Saravana <saravanamuthaly@gmail.com>
  */
-$lang['doublequoteopening']    = '"';
-$lang['doublequoteclosing']    = '"';
+$lang['doublequoteopening']    = '&quot;';
+$lang['doublequoteclosing']    = '&quot;';
 $lang['singlequoteopening']    = '\'';
 $lang['singlequoteclosing']    = '\'';
 $lang['apostrophe']            = '\'';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index e40b69454..59332f70b 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Komgrit Niyomrath <n.komgrit@gmail.com>
  * @author Arthit Suriyawongkul <arthit@gmail.com>
  * @author Kittithat Arnontavilas <mrtomyum@gmail.com>
@@ -11,7 +11,7 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '“	';
+$lang['doublequoteopening']    = '“';
 $lang['doublequoteclosing']    = '”';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index 52edaafda..74a717bfe 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Oleksiy Voronin <ovoronin@gmail.com>
  * @author serg_stetsuk@ukr.net
  * @author Oleksandr Kunytsia <okunia@gmail.com>
@@ -189,7 +189,6 @@ $lang['line']                  = 'Рядок';
 $lang['breadcrumb']            = 'Відвідано:';
 $lang['youarehere']            = 'Ви тут:';
 $lang['lastmod']               = 'В останнє змінено:';
-$lang['by']                    = ' ';
 $lang['deleted']               = 'знищено';
 $lang['created']               = 'створено';
 $lang['restored']              = 'відновлено стару ревізію (%s)';
-- 
cgit v1.2.3


From 70519db93fdd6d635397c1354a33f2b1071e2d13 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 13 Jul 2015 00:26:03 +0100
Subject: fixed a few links and html errors in language files

---
 inc/lang/ar/lang.php                    | 4 ++--
 inc/lang/bn/lang.php                    | 2 +-
 inc/lang/ca/lang.php                    | 6 +++---
 inc/lang/de/lang.php                    | 4 ++--
 inc/lang/el/lang.php                    | 6 +++---
 inc/lang/fr/lang.php                    | 2 +-
 inc/lang/gl/lang.php                    | 4 ++--
 inc/lang/tr/lang.php                    | 6 +++---
 inc/lang/zh-tw/lang.php                 | 6 +++---
 lib/plugins/authad/lang/pt/settings.php | 4 ++--
 lib/plugins/extension/lang/pt/lang.php  | 4 ++--
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index a3c56c969..fb89bb0c7 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -297,8 +297,8 @@ $lang['i_badhash']             = 'الملف dokuwiki.php غير مصنف أو 
 (hash=<code>%s</code>)';
 $lang['i_badval']              = 'القيمة <code>%s</code> غير شرعية أو فارغة';
 $lang['i_success']             = 'الإعدادات تمت بنجاح، يرجى حذف الملف install.php الآن.
-ثم تابع إلى <a href="doku.php"> دوكو ويكي الجديدة</a>';
-$lang['i_failure']             = 'بعض الأخطاء حدثت أثنا كتابة ملفات الإعدادات، عليك تعديلها يدوياً قبل أن تستطيع استخدام <a href="doku.php"> دوكو ويكي الجديدة</a>';
+ثم تابع إلى <a href="doku.php?id=wiki:welcome"> دوكو ويكي الجديدة</a>';
+$lang['i_failure']             = 'بعض الأخطاء حدثت أثنا كتابة ملفات الإعدادات، عليك تعديلها يدوياً قبل أن تستطيع استخدام <a href="doku.php?id=wiki:welcome"> دوكو ويكي الجديدة</a>';
 $lang['i_policy']              = 'تصريح ACL مبدئي';
 $lang['i_pol0']                = 'ويكي مفتوحة؛ أي القراءة والكتابة والتحميل مسموحة للجميع';
 $lang['i_pol1']                = 'ويكي عامة؛ أي القراءة للجميع ولكن الكتابة والتحميل للمشتركين المسجلين فقط';
diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php
index 512b94132..5cb66a853 100644
--- a/inc/lang/bn/lang.php
+++ b/inc/lang/bn/lang.php
@@ -195,7 +195,7 @@ $lang['created']               = 'তৈরি করা';
 $lang['restored']              = 'পুরানো সংস্করণের পুনঃস্থাপন (%s)';
 $lang['external_edit']         = 'বাহ্যিক সম্পাদনা';
 $lang['summary']               = 'সম্পাদনা সারাংশ';
-$lang['noflash']               = 'এ href="http://www.adobe.com/products/flashplayer/"> অ্যাডোবি ফ্ল্যাশ প্লাগইন </ a> এই সামগ্রী প্রদর্শন করার জন্য প্রয়োজন হয়.';
+$lang['noflash']               = 'এ href="http://www.adobe.com/products/flashplayer/"> অ্যাডোবি ফ্ল্যাশ প্লাগইন </a> এই সামগ্রী প্রদর্শন করার জন্য প্রয়োজন হয়.';
 $lang['download']              = 'ডাউনলোড স্নিপেট ';
 $lang['tools']                 = 'সরঞ্জামসমূহ';
 $lang['user_tools']            = 'ব্যবহারকারীর সরঞ্জামসমূহ';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 220600dec..bb21f5c3c 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Carles Bellver <carles.bellver@cent.uji.es>
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author daniel@6temes.cat
@@ -271,8 +271,8 @@ $lang['i_confexists']          = '<code>%s</code> ja existeix';
 $lang['i_writeerr']            = 'No es pot crear <code>%s</code>. Comproveu els permisos del directori i/o del fitxer i creeu el fitxer manualment.';
 $lang['i_badhash']             = 'dokuwiki.php no reconegut o modificat (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - valor il·legal o buit';
-$lang['i_success']             = 'La configuració s\'ha acabat amb èxit. Ara podeu suprimir el fitxer install.php. Aneu al vostre nou <a href="doku.php">DokuWiki</a>.';
-$lang['i_failure']             = 'S\'han produït alguns errors en escriure els fitxers de configuració. Potser caldrà que els arregleu manualment abans d\'utilitzar el vostre nou <a href="doku.php">DokuWiki</a>.';
+$lang['i_success']             = 'La configuració s\'ha acabat amb èxit. Ara podeu suprimir el fitxer install.php. Aneu al <a href="doku.php?id=wiki:welcome">vostre nou DokuWiki</a>.';
+$lang['i_failure']             = 'S\'han produït alguns errors en escriure els fitxers de configuració. Potser caldrà que els arregleu manualment abans d\'utilitzar el <a href="doku.php?id=wiki:welcome">vostre nou DokuWiki</a>.';
 $lang['i_policy']              = 'Política ACL inicial';
 $lang['i_pol0']                = 'Wiki obert (tothom pot llegir, escriure i penjar fitxers)';
 $lang['i_pol1']                = 'Wiki públic (tothom pot llegir, els usuaris registrats poden escriure i penjar fitxers)';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index d74f66149..b4ead79f2 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Christof <gagi@fin.de>
  * @author Anika Henke <anika@selfthinker.org>
@@ -358,5 +358,5 @@ $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnisse';
 $lang['plainhtml']             = 'HTML Klartext';
 $lang['wikimarkup']            = 'Wiki Markup';
-$lang['page_nonexist_rev']     = 'DIe Seite exitiert nicht unter %s. Sie wurde aber unter <a herf="%s">%s</a>';
+$lang['page_nonexist_rev']     = 'Die Seite exitiert nicht unter %s. Sie wurde aber unter <a href="%s">%s</a>';
 $lang['unable_to_parse_date']  = 'Parameter "%s" kann nicht geparsed werden.';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 21a854b30..0e62dd37b 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Thanos Massias <tm@thriasio.gr>
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
  * @author Konstantinos Koryllos <koryllos@gmail.com>
@@ -284,8 +284,8 @@ $lang['i_confexists']          = '<code>%s</code> υπάρχει ήδη';
 $lang['i_writeerr']            = 'Δεν είναι δυνατή η δημιουργία του <code>%s</code>. Πρέπει να διορθώσετε τα δικαιώματα πρόσβασης αυτού του φακέλου/αρχείου και να δημιουργήσετε το αρχείο χειροκίνητα!';
 $lang['i_badhash']             = 'Μη αναγνωρίσιμο ή τροποποιημένο αρχείο dokuwiki.php (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - λάθος ή ανύπαρκτη τιμή';
-$lang['i_success']             = 'Η εγκατάσταση ολοκληρώθηκε επιτυχώς. Μπορείτε πλέον να διαγράψετε το αρχείο install.php. Συνεχίστε στο <a href="doku.php">νέο σας DokuWiki</a>.';
-$lang['i_failure']             = 'Εμφανίστηκαν κάποια προβλήματα στη διαδικασία ανανέωσης των αρχείων ρυθμίσεων. Πιθανόν να χρειάζεται να τα τροποποιήσετε χειροκίνητα ώστε να μπορείτε να χρησιμοποιήσετε το <a href="doku.php">νέο σας DokuWiki</a>.';
+$lang['i_success']             = 'Η εγκατάσταση ολοκληρώθηκε επιτυχώς. Μπορείτε πλέον να διαγράψετε το αρχείο install.php. Συνεχίστε στο <a href="doku.php?id=wiki:welcome">νέο σας DokuWiki</a>.';
+$lang['i_failure']             = 'Εμφανίστηκαν κάποια προβλήματα στη διαδικασία ανανέωσης των αρχείων ρυθμίσεων. Πιθανόν να χρειάζεται να τα τροποποιήσετε χειροκίνητα ώστε να μπορείτε να χρησιμοποιήσετε το <a href="doku.php?id=wiki:welcome">νέο σας DokuWiki</a>.';
 $lang['i_policy']              = 'Αρχική πολιτική Λίστας Δικαιωμάτων Πρόσβασης - ACL';
 $lang['i_pol0']                = 'Ανοιχτό Wiki (όλοι μπορούν να διαβάσουν ή να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
 $lang['i_pol1']                = 'Δημόσιο Wiki (όλοι μπορούν να διαβάσουν σελίδες αλλά μόνο οι εγγεγραμμένοι χρήστες μπορούν να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index f3077bf88..4a25aab43 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -318,7 +318,7 @@ $lang['i_writeerr']            = 'Impossible de créer <code>%s</code>. Vous dev
 $lang['i_badhash']             = 'dokuwiki.php non reconnu ou modifié (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - valeur interdite ou vide';
 $lang['i_success']             = 'L\'installation s\'est terminée avec succès. Vous pouvez maintenant supprimer le fichier « install.php ». Continuer avec <a href="doku.php?id=wiki:welcome">votre nouveau DokuWiki</a>.';
-$lang['i_failure']             = 'Des erreurs sont survenues lors de l\'écriture des fichiers de configuration. Il vous faudra les corriger manuellement avant de pouvoir utiliser <a href="doku.php">votre nouveau DokuWiki</a>.';
+$lang['i_failure']             = 'Des erreurs sont survenues lors de l\'écriture des fichiers de configuration. Il vous faudra les corriger manuellement avant de pouvoir utiliser <a href="doku.php?id=wiki:welcome">votre nouveau DokuWiki</a>.';
 $lang['i_policy']              = 'Politique de contrôle d\'accès initiale';
 $lang['i_pol0']                = 'Wiki ouvert (lecture, écriture, envoi de fichiers pour tout le monde)';
 $lang['i_pol1']                = 'Wiki public (lecture pour tout le monde, écriture et envoi de fichiers pour les utilisateurs enregistrés)';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 9cc460b58..9e3d4f2b2 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -274,9 +274,9 @@ $lang['i_writeerr']            = 'Non se puido crear <code>%s</code>. Terás de
 $lang['i_badhash']             = 'dokuwiki.php irrecoñecíbel ou modificado (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - ilegal ou valor baleiro';
 $lang['i_success']             = 'A configuración rematou correctamente. Agora podes eliminar o arquivo install.php. Continúa deica o
-                        <a href="doku.php">teu novo DokuWiki</a>.';
+                        <a href="doku.php?id=wiki:welcome">teu novo DokuWiki</a>.';
 $lang['i_failure']             = 'Houbo algúns erros ao tentar escribir os arquivos de configuración. Pode que precises solucionalos de xeito manual antes
-                         de poderes empregar <a href="doku.php">o teu novo DokuWiki</a>.';
+                         de poderes empregar <a href="doku.php?id=wiki:welcome">o teu novo DokuWiki</a>.';
 $lang['i_policy']              = 'Regras iniciais da ACL';
 $lang['i_pol0']                = 'Wiki Aberto (lectura, escritura, subida de arquivos para todas as persoas)';
 $lang['i_pol1']                = 'Wiki Público (lectura para todas as persoas, escritura e subida de arquivos para usuarios rexistrados)';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 6b4315c7c..2242b1792 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Selim Farsakoğlu <farsakogluselim@yahoo.de>
  * @author Aydın Coşkuner <aydinweb@gmail.com>
  * @author Cihan Kahveci <kahvecicihan@gmail.com>
@@ -290,8 +290,8 @@ $lang['i_confexists']          = '<code>%s</code> zaten var';
 $lang['i_writeerr']            = '<code>%s</code> oluşturulamadı. Dosya/Klasör izin ayarlarını gözden geçirip dosyayı elle oluşturmalısınız.';
 $lang['i_badhash']             = 'dokuwiki.php tanınamadı ya da değiştirilmiş (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - Yanlış veya boş değer';
-$lang['i_success']             = 'Kurulum başarıyla tamamlandı. Şimdi install.php dosyasını silebilirsiniz. <a href="doku.php">Yeni DokuWikiniz</a>i kullanabilirsiniz.';
-$lang['i_failure']             = 'Ayar dosyalarını yazarken bazı hatalar oluştu. <a href="doku.php">Yeni DokuWikiniz</a>i kullanmadan önce bu hatalarınızı elle düzeltmeniz gerekebilir.';
+$lang['i_success']             = 'Kurulum başarıyla tamamlandı. Şimdi install.php dosyasını silebilirsiniz. <a href="doku.php?id=wiki:welcome">Yeni DokuWikiniz</a>i kullanabilirsiniz.';
+$lang['i_failure']             = 'Ayar dosyalarını yazarken bazı hatalar oluştu. <a href="doku.php?id=wiki:welcome">Yeni DokuWikiniz</a>i kullanmadan önce bu hatalarınızı elle düzeltmeniz gerekebilir.';
 $lang['i_policy']              = 'İlk ACL ayarı';
 $lang['i_pol0']                = 'Tamamen Açık Wiki (herkes okuyabilir, yazabilir ve dosya yükleyebilir)';
 $lang['i_pol1']                = 'Açık Wiki (herkes okuyabilir, ancak  sadece üye olanlar yazabilir ve dosya yükleyebilir)';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index bfe38b920..b69456ee7 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author chinsan <chinsan@mail2000.com.tw>
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
@@ -296,8 +296,8 @@ $lang['i_writeerr']            = '無法建立 <code>%s</code>。您必須檢查
 $lang['i_badhash']             = '無法辨識或已遭修改的 dokuwiki.php (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> —— 非法或空白的值';
 $lang['i_success']             = '設定已完成。您現在可以刪除 install.php 檔案。繼續到
-<a href="doku.php">您的新 DokuWiki</a>.';
-$lang['i_failure']             = '寫入設定檔時發生了一些錯誤。您必須在使用<a href="doku.php">您的新 Dokuwiki</a> 之前手動修正它們。';
+<a href="doku.php?id=wiki:welcome">您的新 DokuWiki</a>.';
+$lang['i_failure']             = '寫入設定檔時發生了一些錯誤。您必須在使用<a href="doku.php?id=wiki:welcome">您的新 Dokuwiki</a> 之前手動修正它們。';
 $lang['i_policy']              = '初步的 ACL 政策';
 $lang['i_pol0']                = '開放的 wiki (任何人可讀取、寫入、上傳)';
 $lang['i_pol1']                = '公開的 wiki (任何人可讀取，註冊使用者可寫入與上傳)';
diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php
index 6256eb597..c5756890d 100644
--- a/lib/plugins/authad/lang/pt/settings.php
+++ b/lib/plugins/authad/lang/pt/settings.php
@@ -2,14 +2,14 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author André Neves <drakferion@gmail.com>
  * @author Murilo <muriloricci@hotmail.com>
  * @author Paulo Silva <paulotsilva@yahoo.com>
  * @author Guido Salatino <guidorafael23@gmail.com>
  */
 $lang['account_suffix']        = 'O sufixo da sua conta. Por exemplo, <code>@my.domain.org</code>';
-$lang['base_dn']               = 'Sua base DN. Eg. <code> DC=meu, DC=dominio, DC=org </ code>';
+$lang['base_dn']               = 'Sua base DN. Eg. <code> DC=meu, DC=dominio, DC=org </code>';
 $lang['domain_controllers']    = 'Uma lista separada por vírgulas de Controladores de Domínio (AD DC). Ex.: <code>srv1.domain.org,srv2.domain.org</code>';
 $lang['admin_username']        = 'Um utilizador com privilégios na Active Directory que tenha acesso aos dados de todos os outros utilizadores. Opcional, mas necessário para certas ações como enviar emails de subscrição.';
 $lang['admin_password']        = 'A senha para o utilizador acima.';
diff --git a/lib/plugins/extension/lang/pt/lang.php b/lib/plugins/extension/lang/pt/lang.php
index c9ca8d976..e8c8a7d55 100644
--- a/lib/plugins/extension/lang/pt/lang.php
+++ b/lib/plugins/extension/lang/pt/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Guido Salatino <guidorafael23@gmail.com>
  * @author Romulo Pereira <romuloccomp@gmail.com>
  */
@@ -41,7 +41,7 @@ $lang['downloadurl']           = 'Baixar URL:
 ';
 $lang['repository']            = 'Repositório:
 ';
-$lang['unknown']               = '<em> desconhecido </ em>
+$lang['unknown']               = '<em> desconhecido </em>
 ';
 $lang['installed_version']     = 'Versão instalada:';
 $lang['install_date']          = 'Sua última atualização:';
-- 
cgit v1.2.3


From cf6939cdfbd42d9ba56562c606587915b84a20c6 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 13 Jul 2015 23:36:24 +0200
Subject: Better suggestion for changing warning for nosmblink in browsers

Improves syntax page due to feedback at #1233
---
 data/pages/wiki/syntax.txt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 613c04ace..750f7e4f5 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -83,9 +83,14 @@ Windows shares like [[\\server\share|this]] are recognized, too. Please note tha
 Notes:
 
   * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
-  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/userscript.js'':
-
-  LANG.nosmblinks = '';
+  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): <code php conf/lang/en/lang.php>
+<?php
+/**
+ * Customization of the english language file
+ * Copy only the strings that needs to be modified
+ */
+$lang['js']['nosmblinks'] = '';
+</code>
 
 ==== Image Links ====
 
-- 
cgit v1.2.3


From d1427af7333593a01c5f917583f9dd03757dabd1 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 13 Jul 2015 23:42:58 +0200
Subject: no syntax highlighting, it attracts too much readers attention

---
 data/pages/wiki/syntax.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 750f7e4f5..bdfda9c46 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -83,7 +83,7 @@ Windows shares like [[\\server\share|this]] are recognized, too. Please note tha
 Notes:
 
   * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
-  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): <code php conf/lang/en/lang.php>
+  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): <code - conf/lang/en/lang.php>
 <?php
 /**
  * Customization of the english language file
-- 
cgit v1.2.3


From 8cce24b8aea630d7791ca2b67ad6dc4bf89c19a9 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Wed, 15 Jul 2015 14:56:08 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/ja/lang.php      |  9 +++++++++
 lib/plugins/authldap/lang/ja/settings.php  |  5 +++++
 lib/plugins/authmysql/lang/ja/lang.php     | 11 +++++++++++
 lib/plugins/authmysql/lang/ja/settings.php |  2 +-
 lib/plugins/authpgsql/lang/ja/settings.php |  2 +-
 lib/plugins/extension/lang/ja/lang.php     |  1 +
 6 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/ja/lang.php
 create mode 100644 lib/plugins/authmysql/lang/ja/lang.php

diff --git a/lib/plugins/authldap/lang/ja/lang.php b/lib/plugins/authldap/lang/ja/lang.php
new file mode 100644
index 000000000..aeeb6c75e
--- /dev/null
+++ b/lib/plugins/authldap/lang/ja/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hideaki SAWADA <chuno@live.jp>
+ */
+$lang['connectfail']           = 'LDAP に接続できません： %s';
+$lang['domainfail']            = 'LDAP で user dn を発見できません。';
diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php
index 717b5a6d9..99a70de79 100644
--- a/lib/plugins/authldap/lang/ja/settings.php
+++ b/lib/plugins/authldap/lang/ja/settings.php
@@ -23,10 +23,15 @@ $lang['binddn']                = '匿名バインドでは不十分な場合、
 $lang['bindpw']                = '上記ユーザーのパスワード';
 $lang['userscope']             = 'ユーザー検索の範囲を限定させる';
 $lang['groupscope']            = 'グループ検索の範囲を限定させる';
+$lang['userkey']               = 'ユーザー名を示す属性。userfilter と一致している必要があります。';
 $lang['groupkey']              = 'ユーザー属性をグループのメンバーシップから設定します(代わりに標準のADグループ)。
 例えば、部署や電話番号などです。';
+$lang['modPass']               = 'DokuWiki から LDAP パスワードの変更が可能？';
 $lang['debug']                 = 'エラーに関して追加のデバッグ情報を表示する。';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'デフォルトを使用する';
+$lang['referrals_o_0']         = 'referral に従わない';
+$lang['referrals_o_1']         = 'referral に従う';
diff --git a/lib/plugins/authmysql/lang/ja/lang.php b/lib/plugins/authmysql/lang/ja/lang.php
new file mode 100644
index 000000000..a2348f2f3
--- /dev/null
+++ b/lib/plugins/authmysql/lang/ja/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hideaki SAWADA <chuno@live.jp>
+ */
+$lang['connectfail']           = 'データベースへの接続に失敗しました。';
+$lang['userexists']            = 'このログイン名のユーザーが既に存在しています。';
+$lang['usernotexists']         = 'そのユーザーは存在しません。';
+$lang['writefail']             = 'ユーザーデータを変更できません。Wiki の管理者に連絡してください。';
diff --git a/lib/plugins/authmysql/lang/ja/settings.php b/lib/plugins/authmysql/lang/ja/settings.php
index cc0146b15..6bc3f9a14 100644
--- a/lib/plugins/authmysql/lang/ja/settings.php
+++ b/lib/plugins/authmysql/lang/ja/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  */
 $lang['server']                = 'MySQL のホスト名';
diff --git a/lib/plugins/authpgsql/lang/ja/settings.php b/lib/plugins/authpgsql/lang/ja/settings.php
index 001008c9f..c4a82a179 100644
--- a/lib/plugins/authpgsql/lang/ja/settings.php
+++ b/lib/plugins/authpgsql/lang/ja/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
  */
 $lang['server']                = 'PostgreSQL のサーバー名';
diff --git a/lib/plugins/extension/lang/ja/lang.php b/lib/plugins/extension/lang/ja/lang.php
index 42334c767..689a9877e 100644
--- a/lib/plugins/extension/lang/ja/lang.php
+++ b/lib/plugins/extension/lang/ja/lang.php
@@ -28,6 +28,7 @@ $lang['btn_disable']           = '無効化';
 $lang['btn_install']           = 'インストール';
 $lang['btn_reinstall']         = '再インストール';
 $lang['js']['reallydel']       = 'この拡張機能を本当にアンインストールしますか？';
+$lang['js']['display_viewoptions'] = '表示オプション： ';
 $lang['js']['display_enabled'] = '有効';
 $lang['js']['display_disabled'] = '無効';
 $lang['js']['display_updatable'] = '更新可能';
-- 
cgit v1.2.3


From 70eb84aa3a9aff0dcd8bc888e98f34f9e24f4af2 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Wed, 15 Jul 2015 16:16:31 +0200
Subject: translation update

---
 inc/lang/ja/index.txt                    |  2 +-
 lib/plugins/acl/lang/ja/help.txt         | 15 ++++++---------
 lib/plugins/popularity/lang/ja/intro.txt |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/inc/lang/ja/index.txt b/inc/lang/ja/index.txt
index b0447899d..b3dbb95f3 100644
--- a/inc/lang/ja/index.txt
+++ b/inc/lang/ja/index.txt
@@ -1,4 +1,4 @@
 ====== サイトマップ ======
 
-[[doku>namespaces|名前空間]] に基づく、全ての文書の索引です。
+[[doku>ja:namespaces|名前空間]] に基づく、全ての文書の索引です。
 
diff --git a/lib/plugins/acl/lang/ja/help.txt b/lib/plugins/acl/lang/ja/help.txt
index f7867f8e2..a1f03a3af 100644
--- a/lib/plugins/acl/lang/ja/help.txt
+++ b/lib/plugins/acl/lang/ja/help.txt
@@ -1,11 +1,8 @@
-=== クイックヘルプ： ===
+=== 操作案内 ===
 
-このページでは、Wiki内の名前空間とページに対する権限を追加・削除することができます。
+このページでは、Wiki 内の名前空間とページに対する権限を追加・削除することができます。
+  * 左側のボックスには存在する名前空間とページが表示されています。
+  * 上部のフォームを使って、選択したユーザーもしくはグループの権限を閲覧・変更することができます。
+  * 下部の一覧は、現在設定されているアクセス制御のルールを表示します。この一覧を使って、複数のルールを素早く変更・削除することが可能です。
 
-左側のボックスには存在する名前空間とページが表示されています。
-
-上記のフォームを使って、選択したユーザーもしくはグループの権限を閲覧・変更することができます。
-
-以下のテープルには、現在設定されているアクセスコントロールのルールが表示されています。このテーブルを使って、複数のルールを素早く変更・削除することが可能です。
-
-DokuWikiのアクセスコントロールについては、[[doku>acl|official documentation on ACL]] をお読み下さい。
\ No newline at end of file
+DokuWiki のアクセス制御については、[[doku>ja:acl|アクセス制御リスト (ACL)の公式解説]]をお読み下さい。
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/ja/intro.txt b/lib/plugins/popularity/lang/ja/intro.txt
index 09886f418..db9a34284 100644
--- a/lib/plugins/popularity/lang/ja/intro.txt
+++ b/lib/plugins/popularity/lang/ja/intro.txt
@@ -1,6 +1,6 @@
 ====== 利用状況調査 ======
 
-このツールは、ご利用中のwikiの情報を収集し、それをDokuWikiの開発者へ匿名で送信するものです。開発者はこのツールにより、DokuWikiが実際にどの様に利用されているかを理解し、そして実際の利用状況に基づいて今後の開発方針の決定することができます。
+この[[doku>ja:popularity|ツール]]は、ご利用中のwikiの情報を収集し、それをDokuWikiの開発者へ匿名で送信するものです。開発者はこのツールにより、DokuWikiが実際にどの様に利用されているかを理解し、そして実際の利用状況に基づいて今後の開発方針の決定することができます。
 
 お使いのwikiの規模が大きくなってきたときは、このステップを定期的に繰り返すことを推奨しています。また、送信されたデータは匿名のIDで識別されます。
 
-- 
cgit v1.2.3


From 122f2d46c0d01af7762ed909f7905e5e807b2d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20B=C3=B6hler?= <dev@aboehler.at>
Date: Wed, 15 Jul 2015 18:21:13 +0200
Subject: Add a 'returnonly' option to all xhtml link types

---
 inc/parser/xhtml.php | 87 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 60 insertions(+), 27 deletions(-)

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index d1bf91a02..c544d9e32 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -761,27 +761,40 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     /**
      * Render a CamelCase link
      *
-     * @param string $link The link name
+     * @param string $link       The link name
+     * @param bool   $returnonly whether to return html or write to doc attribute
      * @see http://en.wikipedia.org/wiki/CamelCase
      */
-    function camelcaselink($link) {
-        $this->internallink($link, $link);
+    function camelcaselink($link, $returnonly = false) {
+        if($returnonly) {
+          return $this->internallink($link, $link, null, true);
+        } else {
+          $this->internallink($link, $link);
+        }
     }
 
     /**
      * Render a page local link
      *
-     * @param string $hash hash link identifier
-     * @param string $name name for the link
+     * @param string $hash       hash link identifier
+     * @param string $name       name for the link
+     * @param bool   $returnonly whether to return html or write to doc attribute
      */
-    function locallink($hash, $name = null) {
+    function locallink($hash, $name = null, $returnonly = false) {
         global $ID;
         $name  = $this->_getLinkTitle($name, $hash, $isImage);
         $hash  = $this->_headerToLink($hash);
         $title = $ID.' ↵';
-        $this->doc .= '<a href="#'.$hash.'" title="'.$title.'" class="wikilink1">';
-        $this->doc .= $name;
-        $this->doc .= '</a>';
+
+        $doc = '<a href="#'.$hash.'" title="'.$title.'" class="wikilink1">';
+        $doc .= $name;
+        $doc .= '</a>';
+
+        if($returnonly) {
+          return $doc;
+        } else {
+          $this->doc .= $doc;
+        }
     }
 
     /**
@@ -884,10 +897,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     /**
      * Render an external link
      *
-     * @param string       $url  full URL with scheme
-     * @param string|array $name name for the link, array for media file
+     * @param string       $url        full URL with scheme
+     * @param string|array $name       name for the link, array for media file
+     * @param bool         $returnonly whether to return html or write to doc attribute
      */
-    function externallink($url, $name = null) {
+    function externallink($url, $name = null, $returnonly = false) {
         global $conf;
 
         $name = $this->_getLinkTitle($name, $url, $isImage);
@@ -926,7 +940,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         if($conf['relnofollow']) $link['more'] .= ' rel="nofollow"';
 
         //output formatted
-        $this->doc .= $this->_formatLink($link);
+        if($returnonly) {
+            return $this->_formatLink($link);
+        } else {
+            $this->doc .= $this->_formatLink($link);
+        }
     }
 
     /**
@@ -934,12 +952,13 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      *
      * You may want to use $this->_resolveInterWiki() here
      *
-     * @param string       $match     original link - probably not much use
-     * @param string|array $name      name for the link, array for media file
-     * @param string       $wikiName  indentifier (shortcut) for the remote wiki
-     * @param string       $wikiUri   the fragment parsed from the original link
+     * @param string       $match      original link - probably not much use
+     * @param string|array $name       name for the link, array for media file
+     * @param string       $wikiName   indentifier (shortcut) for the remote wiki
+     * @param string       $wikiUri    the fragment parsed from the original link
+     * @param bool         $returnonly whether to return html or write to doc attribute
      */
-    function interwikilink($match, $name = null, $wikiName, $wikiUri) {
+    function interwikilink($match, $name = null, $wikiName, $wikiUri, $returnonly = false) {
         global $conf;
 
         $link           = array();
@@ -977,16 +996,21 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['title'] = htmlspecialchars($link['url']);
 
         //output formatted
-        $this->doc .= $this->_formatLink($link);
+        if($returnonly) {
+            return $this->_formatLink($link);
+        } else {
+            $this->doc .= $this->_formatLink($link);
+        }
     }
 
     /**
      * Link to windows share
      *
-     * @param string       $url  the link
-     * @param string|array $name name for the link, array for media file
+     * @param string       $url        the link
+     * @param string|array $name       name for the link, array for media file
+     * @param bool         $returnonly whether to return html or write to doc attribute
      */
-    function windowssharelink($url, $name = null) {
+    function windowssharelink($url, $name = null, $returnonly = false) {
         global $conf;
 
         //simple setup
@@ -1010,7 +1034,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['url']   = $url;
 
         //output formatted
-        $this->doc .= $this->_formatLink($link);
+        if($returnonly) {
+            return $this->_formatLink($link);
+        } else {
+            $this->doc .= $this->_formatLink($link);
+        }
     }
 
     /**
@@ -1018,10 +1046,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      *
      * Honors $conf['mailguard'] setting
      *
-     * @param string       $address Email-Address
-     * @param string|array $name    name for the link, array for media file
+     * @param string       $address    Email-Address
+     * @param string|array $name       name for the link, array for media file
+     * @param bool         $returnonly whether to return html or write to doc attribute
      */
-    function emaillink($address, $name = null) {
+    function emaillink($address, $name = null, $returnonly = false) {
         global $conf;
         //simple setup
         $link           = array();
@@ -1053,7 +1082,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['title'] = $title;
 
         //output formatted
-        $this->doc .= $this->_formatLink($link);
+        if($returnonly) {
+            return $this->_formatLink($link);
+        } else {
+            $this->doc .= $this->_formatLink($link);
+        }
     }
 
     /**
-- 
cgit v1.2.3


From 0c24c9242169cfbb3e5dd68f8b094624a2c971f3 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 15 Jul 2015 20:49:07 +0200
Subject: remove pragma:no-cache header. closes #1201

The pragma header is only defined for requests not for responses. The
Cache-Control header should be used in responses.
---
 inc/fetch.functions.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index c99fbf20a..b8e75eaec 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /**
  * Functions used by lib/exe/fetch.php
  * (not included by other parts of dokuwiki)
@@ -47,18 +47,15 @@ function sendFile($file, $mime, $dl, $cache, $public = false, $orig = null) {
             // cache publically
             header('Expires: '.gmdate("D, d M Y H:i:s", $expires).' GMT');
             header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.$maxage);
-            header('Pragma: public');
         } else {
             // cache in browser
             header('Expires: '.gmdate("D, d M Y H:i:s", $expires).' GMT');
             header('Cache-Control: private, no-transform, max-age='.$maxage);
-            header('Pragma: no-cache');
         }
     } else {
         // no cache at all
         header('Expires: Thu, 01 Jan 1970 00:00:00 GMT');
         header('Cache-Control: no-cache, no-transform');
-        header('Pragma: no-cache');
     }
 
     //send important headers first, script stops here if '304 Not Modified' response
-- 
cgit v1.2.3


From 82246f10eb9ae3debeadf5913232105aa2694cec Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 15 Jul 2015 21:44:22 +0200
Subject: improve aria attribute handling. closes #1142

adds aria handling to makeToggle and allows to supress it in dw_toggle
---
 lib/scripts/behaviour.js  | 26 +++++++++++++++-----------
 lib/scripts/page.js       | 13 ++++++++++---
 lib/tpl/dokuwiki/main.php |  4 ++--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index 97955dad9..b05949a90 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -1,37 +1,41 @@
 /**
  * Hides elements with a slide animation
  *
- * @param fn optional callback to run after hiding
+ * @param {function} fn optional callback to run after hiding
+ * @param {bool} noaria supress aria-expanded state setting
  * @author Adrian Lang <mail@adrianlang.de>
  */
-jQuery.fn.dw_hide = function(fn) {
-    this.attr('aria-expanded', 'false');
+jQuery.fn.dw_hide = function(fn, noaria) {
+    if(!noaria) this.attr('aria-expanded', 'false');
     return this.slideUp('fast', fn);
 };
 
 /**
  * Unhides elements with a slide animation
  *
- * @param fn optional callback to run after hiding
+ * @param {function} fn optional callback to run after hiding
+ * @param {bool} noaria supress aria-expanded state setting
  * @author Adrian Lang <mail@adrianlang.de>
  */
-jQuery.fn.dw_show = function(fn) {
-    this.attr('aria-expanded', 'true');
+jQuery.fn.dw_show = function(fn, noaria) {
+    if(!noaria) this.attr('aria-expanded', 'true');
     return this.slideDown('fast', fn);
 };
 
 /**
  * Toggles visibility of an element using a slide element
  *
- * @param bool the current state of the element (optional)
+ * @param {bool} state the current state of the element (optional)
+ * @param {function} fn callback after the state has been toggled
+ * @param {bool} noaria supress aria-expanded state setting
  */
-jQuery.fn.dw_toggle = function(bool, fn) {
+jQuery.fn.dw_toggle = function(state, fn, noaria) {
     return this.each(function() {
         var $this = jQuery(this);
-        if (typeof bool === 'undefined') {
-            bool = $this.is(':hidden');
+        if (typeof state === 'undefined') {
+            state = $this.is(':hidden');
         }
-        $this[bool ? "dw_show" : "dw_hide" ](fn);
+        $this[state ? "dw_show" : "dw_hide" ](fn, noaria);
     });
 };
 
diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index 7b4958d82..a179ae2a8 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -109,8 +109,14 @@ dw_page = {
      * as well. A state indicator is inserted into the handle and can be styled
      * by CSS.
      *
-     * @param selector handle What should be clicked to toggle
-     * @param selector content This element will be toggled
+     * To properly reserve space for the expanded element, the sliding animation is
+     * done on the children of the content. To make that look good and to make sure aria
+     * attributes are assigned correctly, it's recommended to make sure that the content
+     * element contains a single child element only.
+     *
+     * @param {selector} handle What should be clicked to toggle
+     * @param {selector} content This element will be toggled
+     * @param {int} state initial state (-1 = open, 1 = closed)
      */
     makeToggle: function(handle, content, state){
         var $handle, $content, $clicky, $child, setClicky;
@@ -160,8 +166,9 @@ dw_page = {
             // Start animation and assure that $toc is hidden/visible
             $child.dw_toggle(hidden, function () {
                 $content.toggle(hidden);
+                $content.attr('aria-expanded', hidden);
                 $content.css('min-height',''); // remove min-height again
-            });
+            }, true);
         };
 
         // the state indicator
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 165230e8a..eea1df71a 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -38,12 +38,12 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                 <!-- ********** ASIDE ********** -->
                 <div id="dokuwiki__aside"><div class="pad aside include group">
                     <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
-                    <div class="content">
+                    <div class="content"><div class="group">
                         <?php tpl_flush() ?>
                         <?php tpl_includeFile('sidebarheader.html') ?>
                         <?php tpl_include_page($conf['sidebar'], true, true) ?>
                         <?php tpl_includeFile('sidebarfooter.html') ?>
-                    </div>
+                    </div></div>
                 </div></div><!-- /aside -->
             <?php endif; ?>
 
-- 
cgit v1.2.3


From 282d636f25b71ecb3c37012033d25fd10ba9c83e Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Thu, 16 Jul 2015 02:29:53 -0400
Subject: Change interwiki links to HTTPS

---
 conf/interwiki.conf | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 4857e27f3..3bfc2ac73 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -8,28 +8,29 @@
 # To prevent losing your added InterWiki shortcuts after an upgrade,
 # you should add new ones to interwiki.local.conf
 
-wp        http://en.wikipedia.org/wiki/{NAME}
-wpfr      http://fr.wikipedia.org/wiki/{NAME}
-wpde      http://de.wikipedia.org/wiki/{NAME}
-wpes      http://es.wikipedia.org/wiki/{NAME}
-wppl      http://pl.wikipedia.org/wiki/{NAME}
-wpjp      http://ja.wikipedia.org/wiki/{NAME}
-wpmeta    http://meta.wikipedia.org/wiki/{NAME}
-doku      http://www.dokuwiki.org/
-dokubug   http://bugs.dokuwiki.org/index.php?do=details&amp;task_id=
-rfc       http://tools.ietf.org/html/rfc
+wp        https://en.wikipedia.org/wiki/{NAME}
+wpfr      https://fr.wikipedia.org/wiki/{NAME}
+wpde      https://de.wikipedia.org/wiki/{NAME}
+wpes      https://es.wikipedia.org/wiki/{NAME}
+wppl      https://pl.wikipedia.org/wiki/{NAME}
+wpjp      https://ja.wikipedia.org/wiki/{NAME}
+wpmeta    https://meta.wikipedia.org/wiki/{NAME}
+doku      https://www.dokuwiki.org/
+dokubug   https://bugs.dokuwiki.org/index.php?do=details&amp;task_id=
+dokugit   https://github.com/splitbrain/dokuwiki/issues/
+rfc       https://tools.ietf.org/html/rfc
 man       http://man.cx/
 amazon    http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/
-amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
-amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/
+amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
+amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/
 paypal    https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=
-phpfn     http://www.php.net/{NAME}
+phpfn     https://www.php.net/{NAME}
 coral     http://{HOST}.{PORT}.nyud.net:8090{PATH}?{QUERY}
 freecache http://freecache.org/{NAME}
 sb        http://www.splitbrain.org/go/
 skype     skype:{NAME}
-google.de http://www.google.de/search?q=
-go        http://www.google.com/search?q={URL}&amp;btnI=lucky
+google.de https://www.google.de/search?q=
+go        https://www.google.com/search?q={URL}&amp;btnI=lucky
 user      :user:{NAME}
 
 # To support VoIP/SIP/TEL links
-- 
cgit v1.2.3


From ccee93d9d1aa20ccc91f9277983d7fa2ee34f7f9 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Thu, 16 Jul 2015 02:50:41 -0400
Subject: Unit test for interwiki URL encoding bug

---
 .../inc/parser/renderer_resolveinterwiki.test.php    | 20 ++++++++++----------
 conf/interwiki.conf                                  |  2 +-
 inc/parser/renderer.php                              |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
index dd1ed1d3f..9cc3443eb 100644
--- a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
+++ b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
@@ -17,18 +17,18 @@ class Test_resolveInterwiki extends DokuWikiTest {
 
         $tests = array(
             // shortcut, reference and expected
-            array('wp', 'foo @+%/#txt', 'http://en.wikipedia.org/wiki/foo @+%/#txt'),
-            array('amazon', 'foo @+%/#txt', 'http://www.amazon.com/exec/obidos/ASIN/foo%20%40%2B%25%2F/splitbrain-20/#txt'),
-            array('doku', 'foo @+%/#txt', 'http://www.dokuwiki.org/foo%20%40%2B%25%2F#txt'),
-            array('coral', 'http://example.com:83/path/naar/?query=foo%20%40%2B%25%2F', 'http://example.com.83.nyud.net:8090/path/naar/?query=foo%20%40%2B%25%2F'),
+            array('wp', 'foo [\\]^`{|}~@+#%?/#txt', 'https://en.wikipedia.org/wiki/foo %7E%5B%5C%5D%5E%60%7B%7C%7D%7E@+%23%25%3F/#txt'),
+            array('amazon', 'foo [\\]^`{|}~@+#%?/#txt', 'https://www.amazon.com/exec/obidos/ASIN/foo%20%7E%5B%5C%5D%5E%60%7B%7C%7D%7E%40%2B%23%25%3F%2F/splitbrain-20/#txt'),
+            array('doku', 'foo [\\]^`{|}~@+#%?/#txt', 'https://www.dokuwiki.org/foo%20%7E%5B%5C%5D%5E%60%7B%7C%7D%7E%40%2B%23%25%3F%2F#txt'),
+            array('coral', 'http://example.com:83/path/naar/?query=foo%20%40%2B%25%3F%2F', 'http://example.com.83.nyud.net:8090/path/naar/?query=foo%20%40%2B%25%3F%2F'),
             array('scheme', 'ftp://foo @+%/#txt', 'ftp://example.com#txt'),
             //relative url
-            array('withslash', 'foo @+%/#txt', '/testfoo%20%40%2B%25%2F#txt'),
-            array('skype',  'foo @+%/#txt', 'skype:foo @+%/#txt'),
+            array('withslash', 'foo [\\]^`{|}~@+#%?/#txt', '/testfoo%20%7E%5B%5C%5D%5E%60%7B%7C%7D%7E%40%2B%23%25%3F%2F#txt'),
+            array('skype',  'foo [\\]^`{|}~@+#%?/#txt', 'skype:foo %7E%5B%5C%5D%5E%60%7B%7C%7D%7E@+%23%25?/#txt'),
             //dokuwiki id's
-            array('onlytext', 'foo @+%#txt', DOKU_BASE.'doku.php?id=onlytextfoo#txt'),
-            array('user', 'foo @+%#txt', DOKU_BASE.'doku.php?id=user:foo#txt'),
-            array('withquery', 'foo @+%#txt', DOKU_BASE.'doku.php?id=anyns:foo&amp;do=edit#txt')
+            array('onlytext', 'foo [\\]^`{|}~@+#%?/#txt', DOKU_BASE.'doku.php?id=onlytextfoo#txt'),
+            array('user', 'foo [\\]^`{|}~@+#%?/#txt', DOKU_BASE.'doku.php?id=user:foo#txt'),
+            array('withquery', 'foo [\\]^`{|}~@+#%?/#txt', DOKU_BASE.'doku.php?id=anyns:foo&amp;do=edit#txt')
         );
 
         foreach($tests as $test) {
@@ -45,7 +45,7 @@ class Test_resolveInterwiki extends DokuWikiTest {
         $shortcut = 'nonexisting';
         $reference = 'foo @+%/';
         $url = $Renderer->_resolveInterWiki($shortcut, $reference);
-        $expected = 'http://www.google.com/search?q=foo%20%40%2B%25%2F&amp;btnI=lucky';
+        $expected = 'https://www.google.com/search?q=foo%20%40%2B%25%2F&amp;btnI=lucky';
 
         $this->assertEquals($expected, $url);
     }
diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 3bfc2ac73..18de535f0 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -20,7 +20,7 @@ dokubug   https://bugs.dokuwiki.org/index.php?do=details&amp;task_id=
 dokugit   https://github.com/splitbrain/dokuwiki/issues/
 rfc       https://tools.ietf.org/html/rfc
 man       http://man.cx/
-amazon    http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/
+amazon    https://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/
 amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
 amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/
 paypal    https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 35bdd0e3f..d5cc68367 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -806,7 +806,7 @@ class Doku_Renderer extends DokuWiki_Plugin {
             $url = $this->interwiki[$shortcut];
         } else {
             // Default to Google I'm feeling lucky
-            $url      = 'http://www.google.com/search?q={URL}&amp;btnI=lucky';
+            $url      = 'https://www.google.com/search?q={URL}&amp;btnI=lucky';
             $shortcut = 'go';
         }
 
-- 
cgit v1.2.3


From 17e17ae257649aef67c693d01e8992ece86eabd2 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Thu, 16 Jul 2015 12:35:56 -0400
Subject: Encode unsafe characters in interwiki links. closes #1220

---
 .../tests/inc/parser/renderer_resolveinterwiki.test.php  | 16 ++++++++--------
 inc/parser/renderer.php                                  | 12 ++++++++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
index 9cc3443eb..8379bc065 100644
--- a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
+++ b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
@@ -17,18 +17,18 @@ class Test_resolveInterwiki extends DokuWikiTest {
 
         $tests = array(
             // shortcut, reference and expected
-            array('wp', 'foo [\\]^`{|}~@+#%?/#txt', 'https://en.wikipedia.org/wiki/foo %7E%5B%5C%5D%5E%60%7B%7C%7D%7E@+%23%25%3F/#txt'),
-            array('amazon', 'foo [\\]^`{|}~@+#%?/#txt', 'https://www.amazon.com/exec/obidos/ASIN/foo%20%7E%5B%5C%5D%5E%60%7B%7C%7D%7E%40%2B%23%25%3F%2F/splitbrain-20/#txt'),
-            array('doku', 'foo [\\]^`{|}~@+#%?/#txt', 'https://www.dokuwiki.org/foo%20%7E%5B%5C%5D%5E%60%7B%7C%7D%7E%40%2B%23%25%3F%2F#txt'),
+            array('wp', 'foo [\\]^`{|}~@+#%?/#txt', 'https://en.wikipedia.org/wiki/foo %5B%5C%5D%5E%60%7B%7C%7D~@+%23%25?/#txt'),
+            array('amazon', 'foo [\\]^`{|}~@+#%?/#txt', 'https://www.amazon.com/exec/obidos/ASIN/foo%20%5B%5C%5D%5E%60%7B%7C%7D~%40%2B%23%25%3F%2F/splitbrain-20/#txt'),
+            array('doku', 'foo [\\]^`{|}~@+#%?/#txt', 'https://www.dokuwiki.org/foo%20%5B%5C%5D%5E%60%7B%7C%7D~%40%2B%23%25%3F%2F#txt'),
             array('coral', 'http://example.com:83/path/naar/?query=foo%20%40%2B%25%3F%2F', 'http://example.com.83.nyud.net:8090/path/naar/?query=foo%20%40%2B%25%3F%2F'),
             array('scheme', 'ftp://foo @+%/#txt', 'ftp://example.com#txt'),
             //relative url
-            array('withslash', 'foo [\\]^`{|}~@+#%?/#txt', '/testfoo%20%7E%5B%5C%5D%5E%60%7B%7C%7D%7E%40%2B%23%25%3F%2F#txt'),
-            array('skype',  'foo [\\]^`{|}~@+#%?/#txt', 'skype:foo %7E%5B%5C%5D%5E%60%7B%7C%7D%7E@+%23%25?/#txt'),
+            array('withslash', 'foo [\\]^`{|}~@+#%?/#txt', '/testfoo%20%5B%5C%5D%5E%60%7B%7C%7D~%40%2B%23%25%3F%2F#txt'),
+            array('skype',  'foo [\\]^`{|}~@+#%?/#txt', 'skype:foo %5B%5C%5D%5E%60%7B%7C%7D~@+%23%25?/#txt'),
             //dokuwiki id's
-            array('onlytext', 'foo [\\]^`{|}~@+#%?/#txt', DOKU_BASE.'doku.php?id=onlytextfoo#txt'),
-            array('user', 'foo [\\]^`{|}~@+#%?/#txt', DOKU_BASE.'doku.php?id=user:foo#txt'),
-            array('withquery', 'foo [\\]^`{|}~@+#%?/#txt', DOKU_BASE.'doku.php?id=anyns:foo&amp;do=edit#txt')
+            array('onlytext', 'foo [\\]^`{|}~@+#%/#txt', DOKU_BASE.'doku.php?id=onlytextfoo#txt'),
+            array('user', 'foo [\\]^`{|}~@+#%/#txt', DOKU_BASE.'doku.php?id=user:foo#txt'),
+            array('withquery', 'foo [\\]^`{|}~@+#%/#txt', DOKU_BASE.'doku.php?id=anyns:foo&amp;do=edit#txt')
         );
 
         foreach($tests as $test) {
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index d5cc68367..d7a3faef8 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -811,13 +811,21 @@ class Doku_Renderer extends DokuWiki_Plugin {
         }
 
         //split into hash and url part
-        @list($reference, $hash) = explode('#', $reference, 2);
+        $hash = strrchr($reference, '#');
+        if($hash) {
+            $reference = substr($reference, 0, -strlen($hash));
+            $hash = substr($hash, 1);
+        }
 
         //replace placeholder
         if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#', $url)) {
             //use placeholders
             $url    = str_replace('{URL}', rawurlencode($reference), $url);
-            $url    = str_replace('{NAME}', $reference, $url);
+            //wiki names will be cleaned next, otherwise urlencode unsafe chars
+            $url    = str_replace('{NAME}', ($url{0} === ':') ? $reference :
+                                  preg_replace_callback('/[[\\\\\]^`{|}#%]/', function($match) {
+                                    return rawurlencode($match[0]);
+                                  }, $reference), $url);
             $parsed = parse_url($reference);
             if(!$parsed['port']) $parsed['port'] = 80;
             $url = str_replace('{SCHEME}', $parsed['scheme'], $url);
-- 
cgit v1.2.3


From 1afa9ba84a2a44f66944dfc754dd8b8662c987fb Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 16 Jul 2015 22:14:13 +0200
Subject: remove deleted files on update of extension

Resolves #1192

`/lib/plugins/<plugin>/deleted.files`
which list files that can be removed e.g.
```
# This is a list of files that were present in previous plugin releases
# but were removed later. An up to date plugin should not have any of
# the files installed
action.php
folder/file.txt
```
---
 lib/plugins/extension/helper/extension.php | 41 +++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 719249fbe..7d723490e 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -578,6 +578,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         try {
             $installed = $this->installArchive("$tmp/upload.archive", true, $basename);
             $this->updateManagerData('', $installed);
+            $this->removeDeletedfiles($installed);
             // purge cache
             $this->purgeCache();
         }catch (Exception $e){
@@ -598,6 +599,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             $path      = $this->download($url);
             $installed = $this->installArchive($path, true);
             $this->updateManagerData($url, $installed);
+            $this->removeDeletedfiles($installed);
 
             // purge cache
             $this->purgeCache();
@@ -623,6 +625,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         if (!isset($installed[$this->getID()])) {
             throw new Exception('Error, the requested extension hasn\'t been installed or updated');
         }
+        $this->removeDeletedfiles($installed);
         $this->setExtension($this->getID());
         $this->purgeCache();
         return $installed;
@@ -918,7 +921,9 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
             if($this->dircopy($item['tmp'], $target)) {
                 // return info
                 $id = $item['base'];
-                if($item['type'] == 'template') $id = 'template:'.$id;
+                if($item['type'] == 'template') {
+                    $id = 'template:'.$id;
+                }
                 $installed_extensions[$id] = array(
                     'base' => $item['base'],
                     'type' => $item['type'],
@@ -1117,6 +1122,40 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
 
         return true;
     }
+
+    /**
+     * Delete outdated files from updated plugins
+     *
+     * @param array $installed
+     */
+    private function removeDeletedfiles($installed) {
+        foreach($installed as $id => $extension) {
+            // only on update
+            if($extension['action'] == 'install') continue;
+
+            // get definition file
+            if($extension['type'] == 'template') {
+                $extensiondir = DOKU_TPLLIB;
+            }else{
+                $extensiondir = DOKU_PLUGIN;
+            }
+            $extensiondir = $extensiondir . $extension['base'] .'/';
+            $definitionfile = $extensiondir . 'deleted.files';
+            if(!file_exists($definitionfile)) continue;
+
+            // delete the old files
+            $list = file($definitionfile);
+
+            foreach($list as $line) {
+                $line = trim(preg_replace('/#.*$/', '', $line));
+                if(!$line) continue;
+                $file = $extensiondir . $line;
+                if(!file_exists($file)) continue;
+
+                io_rmdir($file, true);
+            }
+        }
+    }
 }
 
 // vim:ts=4:sw=4:et:
-- 
cgit v1.2.3


From 75c8c6faaeefed18f12a4ce652c4161567219910 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 18 Jul 2015 12:23:26 +0200
Subject: readded cookie to styling plugin

---
 lib/plugins/styling/script.js | 95 +++++++++++++++++++++++++++----------------
 1 file changed, 59 insertions(+), 36 deletions(-)

diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 84b251eab..f2d550b21 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -2,10 +2,58 @@
 
 jQuery(function () {
 
-    var doreload = 1;
+    /**
+     * Function to reload the preview styles in the main window
+     *
+     * @param {window} target the main window
+     */
+    function applyPreview(target) {
+        // remove style
+        var $style = target.jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
+        $style.attr('href', '');
+
+        // append the loader screen
+        $loader = target.jQuery('#plugin__styling_loader');
+        if (!$loader.length) {
+            $loader = jQuery('<div id="plugin__styling_loader">' + LANG.plugins.styling.loader + '</div>');
+            $loader.css({
+                'position':         'absolute',
+                'width':            '100%',
+                'height':           '100%',
+                'top':              0,
+                'left':             0,
+                'z-index':          5000,
+                'background-color': '#fff',
+                'opacity':          '0.7',
+                'color':            '#000',
+                'font-size':        '2.5em',
+                'text-align':       'center',
+                'line-height':      1.5,
+                'padding-top':      '2em'
+            });
+            target.jQuery('body').append($loader);
+        }
+
+        // load preview in main window (timeout works around chrome updating CSS weirdness)
+        target.setTimeout(function () {
+            var now = new Date().getTime();
+            $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
+        }, 500);
+    }
 
+    var doreload = 1;
     var $styling_plugin = jQuery('#plugin__styling');
-    if (!$styling_plugin.length) return;
+
+    // if we are not on the plugin page (either main or popup)
+    if (!$styling_plugin.length) {
+        // handle the preview cookie
+        if(DokuCookie.getValue('styling_plugin') == 1) {
+            applyPreview(window);
+        }
+        return; // nothing more to do here
+    }
+
+    /* ---- from here on we're in the popup or admin page ---- */
 
     // add the color picker
     $styling_plugin.find('.color').iris({});
@@ -18,15 +66,18 @@ jQuery(function () {
 
         $btn.click(function (e) {
             var windowFeatures = "menubar=no,location=no,resizable=yes,scrollbars=yes,status=false,width=500,height=500";
-            window.open(DOKU_BASE + 'lib/plugins/styling/popup.php', 'styling', windowFeatures)
+            window.open(DOKU_BASE + 'lib/plugins/styling/popup.php', 'styling_popup', windowFeatures);
             e.preventDefault();
         }).wrap('<p></p>');
-        return;
+        return; // we exit here if this is not the popup
     }
 
+    /* ---- from here on we're in the popup only ---- */
+
     // reload the main page on close
     window.onunload = function(e) {
         if(doreload) {
+            window.opener.DokuCookie.setValue('styling_plugin', 0);
             window.opener.document.location.reload();
         }
         return null;
@@ -37,37 +88,9 @@ jQuery(function () {
         doreload = false;
     });
 
-    // remove style
-    var $style = window.opener.jQuery('link[rel=stylesheet][href*="lib/exe/css.php"]');
-    $style.attr('href', '');
-
-    // append the loader screen
-    $loader = window.opener.jQuery('#plugin__styling_loader');
-    if (!$loader.length) {
-        $loader = jQuery('<div id="plugin__styling_loader">' + LANG.plugins.styling.loader + '</div>');
-        $loader.css({
-            'position':         'absolute',
-            'width':            '100%',
-            'height':           '100%',
-            'top':              0,
-            'left':             0,
-            'z-index':          5000,
-            'background-color': '#fff',
-            'opacity':          '0.7',
-            'color':            '#000',
-            'font-size':        '2.5em',
-            'text-align':       'center',
-            'line-height':      1.5,
-            'padding-top':       '2em'
-        });
-        window.opener.jQuery('body').append($loader);
-    }
-
-    // load preview in main window (timeout works around chrome updating CSS weirdness)
-    window.setTimeout(function() {
-        var now = new Date().getTime();
-        $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
-    }, 500);
-
+    // on first load apply preview
+    applyPreview(window.opener);
 
+    // enable the preview cookie
+    window.opener.DokuCookie.setValue('styling_plugin', 1);
 });
-- 
cgit v1.2.3


From 8d4151ded3d683f2ef8524b9bb48460a767e334f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 18 Jul 2015 12:46:50 +0200
Subject: added styler into default plugin section

The icon does not match the others because the NuvolaX icon theme seems
to have vanished from the Internet. Ideally all those admin icons could
use a replacement. But that should be a different PR I guess.
---
 inc/html.php                    |   7 +++++++
 lib/images/admin/README         |   2 ++
 lib/images/admin/styling.png    | Bin 0 -> 970 bytes
 lib/tpl/dokuwiki/css/_admin.css |   3 +++
 4 files changed, 12 insertions(+)
 create mode 100644 lib/images/admin/styling.png

diff --git a/inc/html.php b/inc/html.php
index 2f10e3c08..36083a57e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -2076,6 +2076,13 @@ function html_admin(){
                     $menu['config']['prompt'].'</a></div></li>');
         }
         unset($menu['config']);
+
+        if($menu['styling']){
+            ptln('  <li class="admin_styling"><div class="li">'.
+                '<a href="'.wl($ID, array('do' => 'admin','page' => 'styling')).'">'.
+                $menu['styling']['prompt'].'</a></div></li>');
+        }
+        unset($menu['styling']);
     }
     ptln('</ul>');
 
diff --git a/lib/images/admin/README b/lib/images/admin/README
index 90bab9578..53e7d839a 100644
--- a/lib/images/admin/README
+++ b/lib/images/admin/README
@@ -1,2 +1,4 @@
 These icons were taken from the nuvoX KDE icon theme and are GPL licensed
 See http://www.kde-look.org/content/show.php/nuvoX?content=38467
+
+styling.png from https://openclipart.org/detail/25595/brush Public Domain
diff --git a/lib/images/admin/styling.png b/lib/images/admin/styling.png
new file mode 100644
index 000000000..859c8c9ef
Binary files /dev/null and b/lib/images/admin/styling.png differ
diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css
index a9518d0ed..bdde006e0 100644
--- a/lib/tpl/dokuwiki/css/_admin.css
+++ b/lib/tpl/dokuwiki/css/_admin.css
@@ -39,6 +39,9 @@
 .dokuwiki ul.admin_tasks li.admin_config {
     background-image: url(../../images/admin/config.png);
 }
+.dokuwiki ul.admin_tasks li.admin_styling {
+    background-image: url(../../images/admin/styling.png);
+}
 .dokuwiki ul.admin_tasks li.admin_revert {
     background-image: url(../../images/admin/revert.png);
 }
-- 
cgit v1.2.3


From b28801bc7f36b024f1051c1e7afd9be8a4c5171e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 18 Jul 2015 12:51:25 +0200
Subject: added plugin to list of bundled extensions

---
 lib/plugins/extension/helper/extension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 719249fbe..c23840805 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -108,7 +108,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
         return in_array($this->id,
                         array(
                             'authad', 'authldap', 'authmysql', 'authpgsql', 'authplain', 'acl', 'info', 'extension',
-                            'revert', 'popularity', 'config', 'safefnrecode', 'testing', 'template:dokuwiki'
+                            'revert', 'popularity', 'config', 'safefnrecode', 'styling', 'testing', 'template:dokuwiki'
                         )
         );
     }
-- 
cgit v1.2.3


From 37ff2261e7a45a16a844d538a64b1fee54d2eb05 Mon Sep 17 00:00:00 2001
From: Sascha Klopp <klopp@rrzn.uni-hannover.de>
Date: Fri, 12 Jun 2015 12:30:57 +0200
Subject: correctly handle usergroups array

---
 inc/auth.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/inc/auth.php b/inc/auth.php
index 60b8c7c78..e04a6ca1a 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -739,28 +739,23 @@ function auth_aclcheck_cb($data) {
         $user   = utf8_strtolower($user);
         $groups = array_map('utf8_strtolower', $groups);
     }
-    $user   = $auth->cleanUser($user);
+    $user   = auth_nameencode($auth->cleanUser($user));
     $groups = array_map(array($auth, 'cleanGroup'), (array) $groups);
-    $user   = auth_nameencode($user);
 
     //prepend groups with @ and nameencode
-    $cnt = count($groups);
-    for($i = 0; $i < $cnt; $i++) {
-        $groups[$i] = '@'.auth_nameencode($groups[$i]);
+    foreach($groups as &$group) {
+        $group = '@'.auth_nameencode($group);
     }
 
     $ns   = getNS($id);
     $perm = -1;
 
-    if($user || count($groups)) {
-        //add ALL group
-        $groups[] = '@ALL';
-        //add User
-        if($user) $groups[] = $user;
-    } else {
-        $groups[] = '@ALL';
-    }
-
+    //add ALL group
+    $groups[] = '@ALL';
+    
+    //add User
+    if($user) $groups[] = $user;
+    
     //check exact match first
     $matches = preg_grep('/^'.preg_quote($id, '/').'[ \t]+([^ \t]+)[ \t]+/', $AUTH_ACL);
     if(count($matches)) {
-- 
cgit v1.2.3


From 39f70cbdcb1c625e9fe9346132d24ec08862fca1 Mon Sep 17 00:00:00 2001
From: iamchenxin <iamchenxin@gmail.com>
Date: Fri, 29 May 2015 15:32:12 +0800
Subject: add a Exception in hasAccess()

---
 inc/remote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/remote.php b/inc/remote.php
index 861353a19..3e032049d 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -234,7 +234,7 @@ class RemoteAPI {
         global $INPUT;
 
         if (!$conf['remote']) {
-            return false;
+            throw new RemoteAccessDeniedException('server error. RPC server not enabled.',-32604); //should not be here,just throw
         }
         if(!$conf['useacl']) {
             return true;
-- 
cgit v1.2.3


From b86bc28af9b961266a2caeeb86c8f6f125adc412 Mon Sep 17 00:00:00 2001
From: iamchenxin <iamchenxin@gmail.com>
Date: Mon, 1 Jun 2015 20:02:52 +0800
Subject: remote.test

---
 _test/tests/inc/remote.test.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/_test/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php
index d0d4eb7ce..037b1dc0b 100644
--- a/_test/tests/inc/remote.test.php
+++ b/_test/tests/inc/remote.test.php
@@ -160,10 +160,16 @@ class remote_test extends DokuWikiTest {
         $this->assertTrue($this->remote->hasAccess());
     }
 
+    /**
+     * @expectedException RemoteAccessDeniedException
+     */
     function test_hasAccessFail() {
         global $conf;
         $conf['remote'] = 0;
-        $this->assertFalse($this->remote->hasAccess());
+        // the hasAccess() should throw a Exception to keep the same semantics with xmlrpc.php.
+        // because the user(xmlrpc) check remote before .--> (!$conf['remote']) die('XML-RPC server not enabled.');
+        // so it must be a Exception when get here.
+        $this->remote->hasAccess();
     }
 
     function test_hasAccessFailAcl() {
-- 
cgit v1.2.3


From 4c19c0bad21142b05872bf71c4a9599aeb7e15cc Mon Sep 17 00:00:00 2001
From: Philip Knack <p.knack@stollfuss.de>
Date: Mon, 20 Jul 2015 10:21:22 +0200
Subject: translation update

---
 inc/lang/de/lang.php                      | 2 +-
 lib/plugins/authad/lang/de/lang.php       | 3 +++
 lib/plugins/authldap/lang/de/lang.php     | 9 +++++++++
 lib/plugins/authldap/lang/de/settings.php | 2 ++
 lib/plugins/authmysql/lang/de/lang.php    | 2 ++
 lib/plugins/extension/lang/de/lang.php    | 5 ++++-
 6 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/de/lang.php

diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index b4ead79f2..c452042b6 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Christof <gagi@fin.de>
  * @author Anika Henke <anika@selfthinker.org>
diff --git a/lib/plugins/authad/lang/de/lang.php b/lib/plugins/authad/lang/de/lang.php
index 11f52a414..93a65667e 100644
--- a/lib/plugins/authad/lang/de/lang.php
+++ b/lib/plugins/authad/lang/de/lang.php
@@ -4,6 +4,9 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Andreas Gohr <gohr@cosmocode.de>
+ * @author Philip Knack <p.knack@stollfuss.de>
  */
 $lang['domain']                = 'Anmelde-Domäne';
 $lang['authpwdexpire']         = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es frühzeitig ändern.';
+$lang['passchangefail']        = 'Kennwortänderung fehlgeschlagen. Entspricht das Kennwort der Richtlinie?';
+$lang['connectfail']           = 'Verbindung zum Active Directory Server fehlgeschlagen.';
diff --git a/lib/plugins/authldap/lang/de/lang.php b/lib/plugins/authldap/lang/de/lang.php
new file mode 100644
index 000000000..74197f918
--- /dev/null
+++ b/lib/plugins/authldap/lang/de/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Philip Knack <p.knack@stollfuss.de>
+ */
+$lang['connectfail']           = 'LDAP-Verbindung scheitert: %s';
+$lang['domainfail']            = 'LDAP kann nicht dein Benutzer finden dn';
diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index 933189c40..df1974867 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -5,6 +5,7 @@
  * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author christian studer <cstuder@existenz.ch>
+ * @author Philip Knack <p.knack@stollfuss.de>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
 $lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
@@ -28,3 +29,4 @@ $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
+$lang['referrals_o_-1']        = 'Standard verwenden';
diff --git a/lib/plugins/authmysql/lang/de/lang.php b/lib/plugins/authmysql/lang/de/lang.php
index 819b98458..c5c3c657a 100644
--- a/lib/plugins/authmysql/lang/de/lang.php
+++ b/lib/plugins/authmysql/lang/de/lang.php
@@ -5,7 +5,9 @@
  * 
  * @author Noel Tilliot <noeltilliot@byom.de>
  * @author Hendrik Diel <diel.hendrik@gmail.com>
+ * @author Philip Knack <p.knack@stollfuss.de>
  */
+$lang['connectfail']           = 'Verbindung zur Datenbank fehlgeschlagen.';
 $lang['userexists']            = 'Entschuldigung, aber dieser Benutzername ist bereits vergeben.';
 $lang['usernotexists']         = 'Sorry, dieser Nutzer existiert nicht.';
 $lang['writefail']             = 'Die Benutzerdaten konnten nicht geändert werden. Bitte wenden Sie sich an den Wiki-Admin.';
diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index 55a317309..53fbf25d5 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -2,13 +2,14 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author H. Richard <wanderer379@t-online.de>
  * @author Joerg <scooter22@gmx.de>
  * @author Simon <st103267@stud.uni-stuttgart.de>
  * @author Hoisl <hoisl@gmx.at>
  * @author Dominik Mahr <drache.mahr@gmx.de>
  * @author Noel Tilliot <noeltilliot@byom.de>
+ * @author Philip Knack <p.knack@stollfuss.de>
  */
 $lang['menu']                  = 'Erweiterungen verwalten';
 $lang['tab_plugins']           = 'Installierte Plugins';
@@ -33,6 +34,7 @@ $lang['js']['reallydel']       = 'Wollen Sie diese Erweiterung wirklich löschen
 $lang['js']['display_viewoptions'] = 'Optionen anzeigen';
 $lang['js']['display_enabled'] = 'aktiviert';
 $lang['js']['display_disabled'] = 'deaktiviert';
+$lang['js']['display_updatable'] = 'aktualisierbar';
 $lang['search_for']            = 'Erweiterung suchen:';
 $lang['search']                = 'Suchen';
 $lang['extensionby']           = '<strong>%s</strong> von %s';
@@ -70,6 +72,7 @@ $lang['status_bundled']        = 'gebündelt';
 $lang['msg_enabled']           = 'Plugin %s ist aktiviert';
 $lang['msg_disabled']          = 'Erweiterung %s ist deaktiviert';
 $lang['msg_delete_success']    = 'Erweiterung %s wurde entfernt';
+$lang['msg_delete_failed']     = 'Deinstallation der Erweiterung %s fehlgeschlagen';
 $lang['msg_template_install_success'] = 'Das Template %s wurde erfolgreich installiert';
 $lang['msg_template_update_success'] = 'Das Update des Templates %s war erfolgreich ';
 $lang['msg_plugin_install_success'] = 'Das Plugin %s wurde erfolgreich installiert';
-- 
cgit v1.2.3


From 519c232c1701947a305d8bec09812c77d8e2aad4 Mon Sep 17 00:00:00 2001
From: Philip Knack <p.knack@stollfuss.de>
Date: Wed, 22 Jul 2015 15:01:38 +0200
Subject: translation update

---
 lib/plugins/extension/lang/de/lang.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/extension/lang/de/lang.php b/lib/plugins/extension/lang/de/lang.php
index 53fbf25d5..a47c9360f 100644
--- a/lib/plugins/extension/lang/de/lang.php
+++ b/lib/plugins/extension/lang/de/lang.php
@@ -94,6 +94,8 @@ $lang['noperms']               = 'Das Erweiterungs-Verzeichnis ist schreibgesch
 $lang['notplperms']            = 'Das Template-Verzeichnis ist schreibgeschützt';
 $lang['nopluginperms']         = 'Das Plugin-Verzeichnis ist schreibgeschützt';
 $lang['git']                   = 'Diese Erweiterung wurde über git installiert und sollte daher nicht hier aktualisiert werden.';
+$lang['auth']                  = 'Dieses Auth Plugin ist in der Konfiguration nicht aktiviert, Sie sollten es deaktivieren.';
 $lang['install_url']           = 'Von Webadresse (URL) installieren';
 $lang['install_upload']        = 'Erweiterung hochladen:';
 $lang['repo_error']            = 'Es konnte keine Verbindung zum Plugin-Verzeichnis hergestellt werden. Stellen sie sicher das der Server Verbindung mit www.dokuwiki.org aufnehmen darf und überprüfen sie ihre Proxy Einstellungen.';
+$lang['nossl']                 = 'Ihr PHP scheint SSL nicht zu unterstützen. Das Herunterladen vieler DokuWiki Erweiterungen wird scheitern.';
-- 
cgit v1.2.3


From 0cfb5a3076f8591bdbe10f9915199b3b3863dec8 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Wed, 22 Jul 2015 22:04:09 -0400
Subject: Remove non-functioning interwiki links

---
 _test/tests/inc/parser/renderer_resolveinterwiki.test.php | 2 ++
 conf/interwiki.conf                                       | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
index 8379bc065..772001b99 100644
--- a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
+++ b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
@@ -14,6 +14,8 @@ class Test_resolveInterwiki extends DokuWikiTest {
         $Renderer->interwiki['withslash'] = '/test';
         $Renderer->interwiki['onlytext'] = ':onlytext{NAME}'; //with {URL} double urlencoded
         $Renderer->interwiki['withquery'] = ':anyns:{NAME}?do=edit';
+        //this was the only link with host/port/path/query. Keep it here for regression
+        $Renderer->interwiki['coral'] = 'http://{HOST}.{PORT}.nyud.net:8090{PATH}?{QUERY}';
 
         $tests = array(
             // shortcut, reference and expected
diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 18de535f0..9305c038a 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -16,8 +16,6 @@ wppl      https://pl.wikipedia.org/wiki/{NAME}
 wpjp      https://ja.wikipedia.org/wiki/{NAME}
 wpmeta    https://meta.wikipedia.org/wiki/{NAME}
 doku      https://www.dokuwiki.org/
-dokubug   https://bugs.dokuwiki.org/index.php?do=details&amp;task_id=
-dokugit   https://github.com/splitbrain/dokuwiki/issues/
 rfc       https://tools.ietf.org/html/rfc
 man       http://man.cx/
 amazon    https://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/
@@ -25,8 +23,6 @@ amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
 amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/
 paypal    https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=
 phpfn     https://www.php.net/{NAME}
-coral     http://{HOST}.{PORT}.nyud.net:8090{PATH}?{QUERY}
-freecache http://freecache.org/{NAME}
 sb        http://www.splitbrain.org/go/
 skype     skype:{NAME}
 google.de https://www.google.de/search?q=
-- 
cgit v1.2.3


From b43568ad387384d9ae09bf4d7c0835ecbdc6b5b1 Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Wed, 22 Jul 2015 22:28:09 -0400
Subject: Document all options in the interwiki config

---
 conf/interwiki.conf | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 9305c038a..3ddcfd810 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -1,8 +1,16 @@
-# Each URL may contain one of the placeholders {URL} or {NAME}
+# Each URL may contain one of these placeholders
 # {URL}  is replaced by the URL encoded representation of the wikiname
 #        this is the right thing to do in most cases
 # {NAME} this is replaced by the wikiname as given in the document
-#        no further encoding is done
+#        only mandatory encoded is done, urlencoding if the link
+#        is an external URL, or encoding as a wikiname if it is an
+#        internal link (begins with a colon)
+# {SCHEME}
+# {HOST}
+# {PORT}
+# {PATH}
+# {QUERY} these placeholders will be replaced with the appropriate part
+#         of the link when parsed as a URL
 # If no placeholder is defined the urlencoded name is appended to the URL
 
 # To prevent losing your added InterWiki shortcuts after an upgrade,
-- 
cgit v1.2.3


From ac1654273a44452a833628e254ee3e172386a55e Mon Sep 17 00:00:00 2001
From: Patrick Brown <ptbrown@whoopdedo.org>
Date: Thu, 23 Jul 2015 13:04:45 -0400
Subject: Remove splitbrain.org interwiki link

---
 conf/interwiki.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 3ddcfd810..4dc3c80ee 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -31,7 +31,6 @@ amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
 amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/
 paypal    https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=
 phpfn     https://www.php.net/{NAME}
-sb        http://www.splitbrain.org/go/
 skype     skype:{NAME}
 google.de https://www.google.de/search?q=
 go        https://www.google.com/search?q={URL}&amp;btnI=lucky
-- 
cgit v1.2.3


From 1dd04f9774f268918c142128043ff8696ea41b42 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jul 2015 09:46:42 +0200
Subject: fixed styling preview in IE

IE doesn't like it when you create a DOM element in one window and
try to insert it in another window.
---
 lib/plugins/styling/script.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index f2d550b21..2f4285269 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -5,7 +5,7 @@ jQuery(function () {
     /**
      * Function to reload the preview styles in the main window
      *
-     * @param {window} target the main window
+     * @param {Window} target the main window
      */
     function applyPreview(target) {
         // remove style
@@ -13,9 +13,9 @@ jQuery(function () {
         $style.attr('href', '');
 
         // append the loader screen
-        $loader = target.jQuery('#plugin__styling_loader');
+        var $loader = target.jQuery('#plugin__styling_loader');
         if (!$loader.length) {
-            $loader = jQuery('<div id="plugin__styling_loader">' + LANG.plugins.styling.loader + '</div>');
+            $loader = target.jQuery('<div id="plugin__styling_loader">' + LANG.plugins.styling.loader + '</div>');
             $loader.css({
                 'position':         'absolute',
                 'width':            '100%',
@@ -68,6 +68,7 @@ jQuery(function () {
             var windowFeatures = "menubar=no,location=no,resizable=yes,scrollbars=yes,status=false,width=500,height=500";
             window.open(DOKU_BASE + 'lib/plugins/styling/popup.php', 'styling_popup', windowFeatures);
             e.preventDefault();
+            e.stopPropagation();
         }).wrap('<p></p>');
         return; // we exit here if this is not the popup
     }
-- 
cgit v1.2.3


From 84e76a7e9cfdd3dd7beb341445af056cdd642606 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jul 2015 09:53:17 +0200
Subject: make personal style ini to cause cache reloads

---
 inc/template.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/template.php b/inc/template.php
index 95dc52deb..7a25e12c8 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -297,6 +297,7 @@ function tpl_metaheaders($alt = true) {
     // prepare seed for js and css
     $tseed   = $updateVersion;
     $depends = getConfigFiles('main');
+    $depends[] = DOKU_CONF."tpl/".$conf['template']."/style.ini";
     foreach($depends as $f) $tseed .= @filemtime($f);
     $tseed   = md5($tseed);
 
-- 
cgit v1.2.3


From 20a2375a6cfe911180fca2c58673b4554528a372 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jul 2015 12:23:37 +0200
Subject: Revert "Additionally allow more media types" #982

This reverts commit de4634ec87b1a277c1686990d993dafc43db05ed.
---
 lib/exe/css.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 701cebaed..e0bc68312 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -32,25 +32,24 @@ function css_out(){
     global $config_cascade;
     global $INPUT;
 
-    // decide from where to get the template
-    $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
-    if(!$tpl) $tpl = $conf['template'];
-
-    // load style.ini
-    $styleini = css_styleini($tpl);
-    
-    // find mediatypes
     if ($INPUT->str('s') == 'feed') {
         $mediatypes = array('feed');
         $type = 'feed';
     } else {
-        $mediatypes = array_unique(array_merge(array('screen', 'all', 'print'), array_keys($styleini['stylesheets'])));
+        $mediatypes = array('screen', 'all', 'print');
         $type = '';
     }
 
+    // decide from where to get the template
+    $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
+    if(!$tpl) $tpl = $conf['template'];
+
     // The generated script depends on some dynamic options
     $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl.$type,'.css');
 
+    // load styl.ini
+    $styleini = css_styleini($tpl);
+
     // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
     if (isset($config_cascade['userstyle']['default'])) {
         $config_cascade['userstyle']['screen'] = array($config_cascade['userstyle']['default']);
-- 
cgit v1.2.3


From 4a690352a4dc4dff668c4189c41d982f838bc8b9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jul 2015 13:40:07 +0200
Subject: fixed #1249 by upgrading php-archive to 1.0.4

---
 composer.lock                             | 10 +++++-----
 vendor/composer/installed.json            | 12 ++++++------
 vendor/splitbrain/php-archive/src/Zip.php |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/composer.lock b/composer.lock
index 32ea37109..9aa165902 100644
--- a/composer.lock
+++ b/composer.lock
@@ -54,16 +54,16 @@
         },
         {
             "name": "splitbrain/php-archive",
-            "version": "1.0.2",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/splitbrain/php-archive.git",
-                "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31"
+                "reference": "6572e78ef9d064eeb5c74d4ffe61b473a4996b68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/89b4cba038e8cf01af3a8180572f19b8e4afaa31",
-                "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31",
+                "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/6572e78ef9d064eeb5c74d4ffe61b473a4996b68",
+                "reference": "6572e78ef9d064eeb5c74d4ffe61b473a4996b68",
                 "shasum": ""
             },
             "require": {
@@ -97,7 +97,7 @@
                 "unzip",
                 "zip"
             ],
-            "time": "2015-06-30 19:12:21"
+            "time": "2015-07-24 11:36:49"
         }
     ],
     "packages-dev": [],
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 28e3fb6e2..9b20b8a09 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -49,17 +49,17 @@
     },
     {
         "name": "splitbrain/php-archive",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
+        "version": "1.0.4",
+        "version_normalized": "1.0.4.0",
         "source": {
             "type": "git",
             "url": "https://github.com/splitbrain/php-archive.git",
-            "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31"
+            "reference": "6572e78ef9d064eeb5c74d4ffe61b473a4996b68"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/89b4cba038e8cf01af3a8180572f19b8e4afaa31",
-            "reference": "89b4cba038e8cf01af3a8180572f19b8e4afaa31",
+            "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/6572e78ef9d064eeb5c74d4ffe61b473a4996b68",
+            "reference": "6572e78ef9d064eeb5c74d4ffe61b473a4996b68",
             "shasum": ""
         },
         "require": {
@@ -68,7 +68,7 @@
         "require-dev": {
             "phpunit/phpunit": "4.5.*"
         },
-        "time": "2015-06-30 19:12:21",
+        "time": "2015-07-24 11:36:49",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/vendor/splitbrain/php-archive/src/Zip.php b/vendor/splitbrain/php-archive/src/Zip.php
index 324eb4f59..1bc1ac1b7 100644
--- a/vendor/splitbrain/php-archive/src/Zip.php
+++ b/vendor/splitbrain/php-archive/src/Zip.php
@@ -223,6 +223,7 @@ class Zip extends Archive
                 }
                 fclose($fp);
                 gzclose($gzp);
+                unlink($extractto); // remove temporary gz file
             }
 
             touch($output, $fileinfo->getMtime());
-- 
cgit v1.2.3


From 2ad45addfac44b12c095303cf7abe488576b0802 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jul 2015 15:18:19 +0200
Subject: avoid errors on trying to read corrupt gzip files

---
 inc/io.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/io.php b/inc/io.php
index 9be648824..704c5b1a6 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -107,13 +107,15 @@ function io_readFile($file,$clean=true){
     $ret = '';
     if(file_exists($file)){
         if(substr($file,-3) == '.gz'){
-            $ret = join('',gzfile($file));
+            $ret = gzfile($file);
+            if(is_array($ret)) $ret = join('', $ret);
         }else if(substr($file,-4) == '.bz2'){
             $ret = bzfile($file);
         }else{
             $ret = file_get_contents($file);
         }
     }
+    if($ret === null) return false;
     if($ret !== false && $clean){
         return cleanText($ret);
     }else{
-- 
cgit v1.2.3


From 32c7ba22db35fd22aed87fb31984069873cefc4f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jul 2015 15:18:42 +0200
Subject: skip sha512 tests when it's not available

This makes the entire testsuite run through on HHVM 3.8.0 on phpunit
beta-2015-06-18 :-)

Note: this does not mean that DokuWiki is fully compatible with HHVM,
but it's a good step!
---
 _test/tests/inc/auth_password.test.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/_test/tests/inc/auth_password.test.php b/_test/tests/inc/auth_password.test.php
index 07b9f5bb2..5067e2ca1 100644
--- a/_test/tests/inc/auth_password.test.php
+++ b/_test/tests/inc/auth_password.test.php
@@ -16,9 +16,16 @@ class auth_password_test extends DokuWikiTest {
         'kmd5'  => 'a579299436d7969791189acadd86fcb716',
         'djangomd5'  => 'md5$abcde$d0fdddeda8cd92725d2b54148ac09158',
         'djangosha1' => 'sha1$abcde$c8e65a7f0acc9158843048a53dcc5a6bc4d17678',
-        'sha512' => '$6$abcdefgh12345678$J9.zOcgx0lotwZdcz0uulA3IVQMinZvFZVjA5vapRLVAAqtay23XD4xeeUxQ3B4JvDWYFBIxVWW1tOYlHX13k1'
+
     );
 
+    function __construct() {
+        if(defined('CRYPT_SHA512') && CRYPT_SHA512 == 1) {
+            // Check SHA512 only if available in this PHP
+            $this->passes['sha512'] = '$6$abcdefgh12345678$J9.zOcgx0lotwZdcz0uulA3IVQMinZvFZVjA5vapRLVAAqtay23XD4xeeUxQ3B4JvDWYFBIxVWW1tOYlHX13k1';
+        }
+    }
+
 
     function test_cryptPassword(){
         foreach($this->passes as $method => $hash){
-- 
cgit v1.2.3


From ae725da53659cc2733e9315cc4d3214cea561205 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jul 2015 15:24:00 +0200
Subject: use new container infrastructure on Travis

See http://docs.travis-ci.com/user/migrating-from-legacy
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index edca80e0b..61e47522d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: php
+sudo: false
 php:
   - "5.6"
   - "5.5"
-- 
cgit v1.2.3


From 345e401d3852cc9c7382a5f2aa888233b9fe0d10 Mon Sep 17 00:00:00 2001
From: trebmuh <trebmuh@users.noreply.github.com>
Date: Sat, 25 Jul 2015 01:16:25 +0200
Subject: Update lang.php

Please someone who know the code, double check this one.
It does look that translation for 2 options were missing.
---
 lib/plugins/config/lang/fr/lang.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index e92144b22..75dc4f177 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -94,7 +94,9 @@ $lang['disableactions']        = 'Actions à désactiver dans DokuWiki';
 $lang['disableactions_check']  = 'Vérifier';
 $lang['disableactions_subscription'] = 'Abonnement aux pages';
 $lang['disableactions_wikicode'] = 'Afficher le texte source';
+$lang['disableactions_profile_delete'] = 'Supprimer votre propre compte';
 $lang['disableactions_other']  = 'Autres actions (séparées par des virgules)';
+$lang['disableactions_rss']    = 'Syndication XML (RSS)';
 $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)';
 $lang['securecookie']          = 'Les cookies définis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Désactivez cette option lorsque seule la connexion à votre wiki est sécurisée avec SSL et que la navigation sur le wiki est effectuée de manière non sécurisée.';
 $lang['remote']                = 'Active l\'API système distante. Ceci permet à d\'autres applications d\'accéder au wiki via XML-RPC ou d\'autres mécanismes.';
-- 
cgit v1.2.3


From 99d6dd40cd3ecabd484c6a53970e7f65bfae487f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 25 Jul 2015 22:04:59 +0100
Subject: updated .editorconfig

---
 .editorconfig | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 9088a1657..d88e75a28 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +1,19 @@
 ; http://editorconfig.org/
 
+root = true
+
 [*]
 indent_style = space
 indent_size = 4
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[inc/{geshi,phpseclib}/**]
+[{vendor,inc/phpseclib}/**]
 ; Use editor default (possible autodetection).
 indent_style =
 indent_size =
-trim_trailing_whitespace = false
-insert_final_newline = false
+end_of_line =
+trim_trailing_whitespace =
+insert_final_newline =
-- 
cgit v1.2.3


From 17a19868b701d17ba03918eb7f8a2eacc603a84f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 25 Jul 2015 22:32:15 +0100
Subject: remove IE7 support

---
 lib/plugins/acl/style.css           |  4 ----
 lib/tpl/dokuwiki/css/_links.css     |  1 -
 lib/tpl/dokuwiki/css/basic.less     |  6 ------
 lib/tpl/dokuwiki/css/content.less   |  3 +--
 lib/tpl/dokuwiki/css/design.less    | 10 ----------
 lib/tpl/dokuwiki/css/pagetools.less | 19 -------------------
 lib/tpl/dokuwiki/detail.php         |  4 ++--
 lib/tpl/dokuwiki/main.php           |  4 ++--
 lib/tpl/dokuwiki/mediamanager.php   |  4 ++--
 9 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index a53a03450..4233cd30b 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -81,7 +81,6 @@
 [dir=rtl] #acl_manager .aclgroup {
     background: transparent url(pix/group.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
-    display: inline-block; /* needed for IE7 */
 }
 
 #acl_manager .acluser {
@@ -91,7 +90,6 @@
 [dir=rtl] #acl_manager .acluser {
     background: transparent url(pix/user.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
-    display: inline-block; /* needed for IE7 */
 }
 
 #acl_manager .aclpage {
@@ -101,7 +99,6 @@
 [dir=rtl] #acl_manager .aclpage {
     background: transparent url(pix/page.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
-    display: inline-block; /* needed for IE7 */
 }
 
 #acl_manager .aclns {
@@ -111,7 +108,6 @@
 [dir=rtl] #acl_manager .aclns {
     background: transparent url(pix/ns.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
-    display: inline-block; /* needed for IE7 */
 }
 
 #acl_manager label.disabled {
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index 7e5fb02cd..695f4b825 100644
--- a/lib/tpl/dokuwiki/css/_links.css
+++ b/lib/tpl/dokuwiki/css/_links.css
@@ -66,5 +66,4 @@
 [dir=rtl] .dokuwiki a.mediafile {
     background-position: right center;
     padding: 0 18px 0 0;
-    display: inline-block; /* needed for IE7 */
 }
diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
index ac9f6803a..d10cac670 100644
--- a/lib/tpl/dokuwiki/css/basic.less
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -228,7 +228,6 @@ video,
 audio {
     max-width: 100%;
 }
-#IE7 img,
 #IE8 img,
 button img {
     max-width: none;
@@ -414,11 +413,6 @@ button,
     padding: .1em .5em;
     cursor: pointer;
 }
-#IE7 input.button,
-#IE7 button {
-    line-height: 1.4;
-    overflow: visible;
-}
 
 input[type=submit]:hover,
 input[type=submit]:active,
diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index a2e343a33..23db33cfb 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -140,7 +140,6 @@
     dd {
         margin: 0;
         clear: left;
-        min-height: 1px; /* for IE7 */
     }
 
     pre {
@@ -391,4 +390,4 @@
         margin-left: 0;
         margin-right: 9.5em;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index ed643fb25..e314bb5b3 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -117,10 +117,6 @@
     padding-right: 20px;
 }
 
-[dir=rtl] #IE7 #dokuwiki__usertools a.action {
-    display: inline-block;
-}
-
 #dokuwiki__header .mobileTools {
     display: none; /* hide mobile tools dropdown to only show in mobile view */
 }
@@ -237,11 +233,6 @@ form.search {
     }
 }
 
-#IE7 form.search {
-    min-height: 1px;
-    z-index: 21;
-}
-
 /*____________ breadcrumbs ____________*/
 
 .dokuwiki div.breadcrumbs {
@@ -273,7 +264,6 @@ form.search {
     }
 }
 
-#IE7 .dokuwiki div.breadcrumbs div,
 #IE8 .dokuwiki div.breadcrumbs div {
     border-bottom: 1px solid @ini_border;
 }
diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index 77d2670a6..f441a1363 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -133,25 +133,6 @@
     padding: 5px 5px 5px 40px;
 }
 
-/* IE7 fixes, doesn't work without images */
-
-#IE7 #dokuwiki__pagetools ul li a {
-    background-image: url(images/pagetools-sprite.png?v=2);
-}
-
-#IE7 #dokuwiki__pagetools:hover ul li a span,
-#IE7 #dokuwiki__pagetools ul li a:focus span,
-#IE7 #dokuwiki__pagetools ul li a:active span {
-    clip: auto;
-    display: inline;
-    position: static;
-}
-
-#IE7 #dokuwiki__pagetools ul li a span {
-    clip: rect(0 0 0 0);
-    position: absolute;
-}
-
 #dokuwiki__pagetools ul li a:hover,
 #dokuwiki__pagetools ul li a:active,
 #dokuwiki__pagetools ul li a:focus {
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 6755bdce5..4d798e3af 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -27,7 +27,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 </head>
 
 <body>
-    <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
+    <!--[if lte IE 8 ]><div id="IE8"><![endif]-->
     <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?>">
 
         <?php include('tpl_header.php') ?>
@@ -120,6 +120,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');
         <?php include('tpl_footer.php') ?>
     </div></div><!-- /site -->
 
-    <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
+    <!--[if lte IE 8 ]></div><![endif]-->
 </body>
 </html>
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index eea1df71a..9fea1b133 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -26,7 +26,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 </head>
 
 <body>
-    <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
+    <!--[if lte IE 8 ]><div id="IE8"><![endif]-->
     <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
         echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
 
@@ -106,6 +106,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
     <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?>
-    <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
+    <!--[if lte IE 8 ]></div><![endif]-->
 </body>
 </html>
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php
index dadf2b10f..b31271766 100644
--- a/lib/tpl/dokuwiki/mediamanager.php
+++ b/lib/tpl/dokuwiki/mediamanager.php
@@ -25,7 +25,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 </head>
 
 <body>
-    <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
+    <!--[if lte IE 8 ]><div id="IE8"><![endif]-->
     <div id="media__manager" class="dokuwiki">
         <?php html_msgarea() ?>
         <div id="mediamgr__aside"><div class="pad">
@@ -41,6 +41,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');
             <?php tpl_mediaContent() ?>
         </div></div>
     </div>
-    <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
+    <!--[if lte IE 8 ]></div><![endif]-->
 </body>
 </html>
-- 
cgit v1.2.3


From cf2c8e759bf06596f9492d090f4dd8dbb76a178c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 25 Jul 2015 22:58:51 +0100
Subject: changed input submits to buttons, fixed small RTL issue

---
 lib/plugins/styling/admin.php        | 10 +++++-----
 lib/plugins/styling/lang/en/lang.php |  2 +-
 lib/plugins/styling/script.js        |  2 +-
 lib/plugins/styling/style.less       |  6 +++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/styling/admin.php b/lib/plugins/styling/admin.php
index c6c04bb52..c747c3130 100644
--- a/lib/plugins/styling/admin.php
+++ b/lib/plugins/styling/admin.php
@@ -83,22 +83,22 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
 
                 echo '<tr>';
                 echo '<td><label for="tpl__'.hsc($key).'">'.$name.'</label></td>';
-                echo '<td><input type="text" name="tpl['.hsc($key).']" id="tpl__'.hsc($key).'" value="'.hsc($value).'" '.$this->colorClass($key).' /></td>';
+                echo '<td><input type="text" name="tpl['.hsc($key).']" id="tpl__'.hsc($key).'" value="'.hsc($value).'" '.$this->colorClass($key).' dir="ltr" /></td>';
                 echo '</tr>';
             }
             echo '</tbody></table>';
 
             echo '<p>';
-            echo '<input type="submit" name="run[preview]" class="btn_preview primary" value="'.$this->getLang('btn_preview').'" /> ';
-            echo '<input type="submit" name="run[reset]" value="'.$this->getLang('btn_reset').'" />'; #FIXME only if preview.ini exists
+            echo '<button type="submit" name="run[preview]" class="btn_preview primary">'.$this->getLang('btn_preview').'</button> ';
+            echo '<button type="submit" name="run[reset]">'.$this->getLang('btn_reset').'</button>'; #FIXME only if preview.ini exists
             echo '</p>';
 
             echo '<p>';
-            echo '<input type="submit" name="run[save]" class="primary" value="'.$this->getLang('btn_save').'" />';
+            echo '<button type="submit" name="run[save]" class="primary">'.$this->getLang('btn_save').'</button>';
             echo '</p>';
 
             echo '<p>';
-            echo '<input type="submit" name="run[revert]" value="'.$this->getLang('btn_revert').'" />'; #FIXME only if local.ini exists
+            echo '<button type="submit" name="run[revert]">'.$this->getLang('btn_revert').'</button>'; #FIXME only if local.ini exists
             echo '</p>';
 
             echo '</form>';
diff --git a/lib/plugins/styling/lang/en/lang.php b/lib/plugins/styling/lang/en/lang.php
index 010743956..e0011eb83 100644
--- a/lib/plugins/styling/lang/en/lang.php
+++ b/lib/plugins/styling/lang/en/lang.php
@@ -17,7 +17,7 @@ $lang['error'] = 'Sorry, this template does not support this functionality.';
 $lang['btn_preview'] = 'Preview changes';
 $lang['btn_save']    = 'Save changes';
 $lang['btn_reset']   = 'Reset current changes';
-$lang['btn_revert']  = 'Revert all styles back to the template\'s default';
+$lang['btn_revert']  = 'Revert styles back to template\'s default';
 
 // default guaranteed placeholders
 $lang['__text__']           = 'Main text color';
diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index 2f4285269..aa343fd71 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -85,7 +85,7 @@ jQuery(function () {
     };
 
     // don't reload on our own buttons
-    jQuery('input[type=submit]').click(function(e){
+    jQuery(':button').click(function(e){
         doreload = false;
     });
 
diff --git a/lib/plugins/styling/style.less b/lib/plugins/styling/style.less
index 120768289..be0e16a5b 100644
--- a/lib/plugins/styling/style.less
+++ b/lib/plugins/styling/style.less
@@ -1,7 +1,11 @@
 #plugin__styling {
-    input.primary {
+    button.primary {
         font-weight: bold;
     }
+
+    [dir=rtl] & table input {
+        text-align: right;
+    }
 }
 
 #plugin__styling_loader {
-- 
cgit v1.2.3


From ec2b4bab83a5eb6ddcdb41853d311b99b71c6f86 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 26 Jul 2015 11:43:02 +0200
Subject: fix problem with IE11

hopefully doesn't break in the other browsers
---
 lib/plugins/styling/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/styling/script.js b/lib/plugins/styling/script.js
index aa343fd71..074c8dc40 100644
--- a/lib/plugins/styling/script.js
+++ b/lib/plugins/styling/script.js
@@ -35,7 +35,7 @@ jQuery(function () {
         }
 
         // load preview in main window (timeout works around chrome updating CSS weirdness)
-        target.setTimeout(function () {
+        setTimeout(function () {
             var now = new Date().getTime();
             $style.attr('href', DOKU_BASE + 'lib/exe/css.php?preview=1&tseed=' + now);
         }, 500);
-- 
cgit v1.2.3


From 2e206e75efe39d8e8d038606d2f4998d7a5e440a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 26 Jul 2015 16:29:31 +0100
Subject: updated dates in various info.txt files

---
 lib/plugins/acl/plugin.info.txt         | 2 +-
 lib/plugins/authad/plugin.info.txt      | 2 +-
 lib/plugins/authldap/plugin.info.txt    | 2 +-
 lib/plugins/authmysql/plugin.info.txt   | 2 +-
 lib/plugins/authpgsql/plugin.info.txt   | 2 +-
 lib/plugins/authplain/plugin.info.txt   | 2 +-
 lib/plugins/config/plugin.info.txt      | 2 +-
 lib/plugins/extension/plugin.info.txt   | 2 +-
 lib/plugins/info/plugin.info.txt        | 2 +-
 lib/plugins/popularity/plugin.info.txt  | 2 +-
 lib/plugins/revert/plugin.info.txt      | 2 +-
 lib/plugins/styling/plugin.info.txt     | 2 +-
 lib/plugins/usermanager/plugin.info.txt | 2 +-
 lib/tpl/dokuwiki/template.info.txt      | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt
index cb8fe7e8e..1b2c82cb3 100644
--- a/lib/plugins/acl/plugin.info.txt
+++ b/lib/plugins/acl/plugin.info.txt
@@ -1,7 +1,7 @@
 base   acl
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-06-04
+date   2015-07-25
 name   ACL Manager
 desc   Manage Page Access Control Lists
 url    http://dokuwiki.org/plugin:acl
diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt
index dc0629189..57e1387e9 100644
--- a/lib/plugins/authad/plugin.info.txt
+++ b/lib/plugins/authad/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authad
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-04-03
+date   2015-07-13
 name   Active Directory Auth Plugin
 desc   Provides user authentication against a Microsoft Active Directory
 url    http://www.dokuwiki.org/plugin:authad
diff --git a/lib/plugins/authldap/plugin.info.txt b/lib/plugins/authldap/plugin.info.txt
index 964fbb994..e0c6144c3 100644
--- a/lib/plugins/authldap/plugin.info.txt
+++ b/lib/plugins/authldap/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authldap
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-05-18
+date   2015-07-13
 name   LDAP Auth Plugin
 desc   Provides user authentication against an LDAP server
 url    http://www.dokuwiki.org/plugin:authldap
diff --git a/lib/plugins/authmysql/plugin.info.txt b/lib/plugins/authmysql/plugin.info.txt
index fa00fccf4..1658d7aac 100644
--- a/lib/plugins/authmysql/plugin.info.txt
+++ b/lib/plugins/authmysql/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authmysql
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-02-15
+date   2015-07-13
 name   MYSQL Auth Plugin
 desc   Provides user authentication against a MySQL database
 url    http://www.dokuwiki.org/plugin:authmysql
diff --git a/lib/plugins/authpgsql/plugin.info.txt b/lib/plugins/authpgsql/plugin.info.txt
index 59b7d89a9..1d53ca0b1 100644
--- a/lib/plugins/authpgsql/plugin.info.txt
+++ b/lib/plugins/authpgsql/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authpgsql
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-02-15
+date   2015-07-13
 name   PostgreSQL Auth Plugin
 desc   Provides user authentication against a PostgreSQL database
 url    http://www.dokuwiki.org/plugin:authpgsql
diff --git a/lib/plugins/authplain/plugin.info.txt b/lib/plugins/authplain/plugin.info.txt
index 2659ac7ad..c09dbcb34 100644
--- a/lib/plugins/authplain/plugin.info.txt
+++ b/lib/plugins/authplain/plugin.info.txt
@@ -1,7 +1,7 @@
 base   authplain
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2014-07-01
+date   2015-07-18
 name   Plain Auth Plugin
 desc   Provides user authentication against DokuWiki's local password storage
 url    http://www.dokuwiki.org/plugin:authplain
diff --git a/lib/plugins/config/plugin.info.txt b/lib/plugins/config/plugin.info.txt
index 9472346b9..ddd72657d 100644
--- a/lib/plugins/config/plugin.info.txt
+++ b/lib/plugins/config/plugin.info.txt
@@ -1,7 +1,7 @@
 base   config
 author Christopher Smith
 email  chris@jalakai.co.uk
-date   2014-03-18
+date   2015-07-18
 name   Configuration Manager
 desc   Manage Dokuwiki's Configuration Settings
 url    http://dokuwiki.org/plugin:config
diff --git a/lib/plugins/extension/plugin.info.txt b/lib/plugins/extension/plugin.info.txt
index ee9830628..7ee84dcc0 100644
--- a/lib/plugins/extension/plugin.info.txt
+++ b/lib/plugins/extension/plugin.info.txt
@@ -1,7 +1,7 @@
 base   extension
 author Michael Hamann
 email  michael@content-space.de
-date   2014-06-15
+date   2015-07-26
 name   Extension Manager
 desc   Allows managing and installing plugins and templates
 url    https://www.dokuwiki.org/plugin:extension
diff --git a/lib/plugins/info/plugin.info.txt b/lib/plugins/info/plugin.info.txt
index 7773a419d..3f05391f7 100644
--- a/lib/plugins/info/plugin.info.txt
+++ b/lib/plugins/info/plugin.info.txt
@@ -1,7 +1,7 @@
 base info
 author Andreas Gohr
 email andi@splitbrain.org
-date 2014-03-05
+date 2014-10-01
 name Info Plugin
 desc Displays information about various DokuWiki internals
 url http://dokuwiki.org/plugin:info
diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt
index eadfffaa0..8ffc136a1 100644
--- a/lib/plugins/popularity/plugin.info.txt
+++ b/lib/plugins/popularity/plugin.info.txt
@@ -1,7 +1,7 @@
 base    popularity
 author  Andreas Gohr
 email   andi@splitbrain.org
-date    2013-10-14
+date    2015-07-15
 name    Popularity Feedback Plugin
 desc    Send anonymous data about your wiki to the DokuWiki developers
 url     http://www.dokuwiki.org/plugin:popularity
diff --git a/lib/plugins/revert/plugin.info.txt b/lib/plugins/revert/plugin.info.txt
index 8d107dc32..bba939d37 100644
--- a/lib/plugins/revert/plugin.info.txt
+++ b/lib/plugins/revert/plugin.info.txt
@@ -1,7 +1,7 @@
 base   revert
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2013-11-21
+date   2015-07-15
 name   Revert Manager
 desc   Allows you to mass revert recent edits to remove Spam or vandalism
 url    http://dokuwiki.org/plugin:revert
diff --git a/lib/plugins/styling/plugin.info.txt b/lib/plugins/styling/plugin.info.txt
index cdf01ee6f..9f002e282 100644
--- a/lib/plugins/styling/plugin.info.txt
+++ b/lib/plugins/styling/plugin.info.txt
@@ -1,7 +1,7 @@
 base   styling
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2015-05-16
+date   2015-07-26
 name   styling plugin
 desc   Allows to edit style.ini replacements
 url    https://www.dokuwiki.org/plugin:styling
diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt
index ae4f9b9cc..607eca75f 100644
--- a/lib/plugins/usermanager/plugin.info.txt
+++ b/lib/plugins/usermanager/plugin.info.txt
@@ -1,7 +1,7 @@
 base   usermanager
 author Chris Smith
 email  chris@jalakai.co.uk
-date   2014-03-05
+date   2015-07-15
 name   User Manager
 desc   Manage DokuWiki user accounts
 url    http://dokuwiki.org/plugin:usermanager
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index 804d595ae..73ad93927 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
 base     dokuwiki
 author   Anika Henke
 email    anika@selfthinker.org
-date     2014-06-04
+date     2015-07-26
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki
-- 
cgit v1.2.3


From b4150bdc2c461def4ea3a0e9a3ed38bbcf631084 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 26 Jul 2015 16:34:28 +0100
Subject: fixed wrong format string in authldap translation

---
 lib/plugins/authldap/lang/es/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/authldap/lang/es/lang.php b/lib/plugins/authldap/lang/es/lang.php
index e68a42603..64ea7b964 100644
--- a/lib/plugins/authldap/lang/es/lang.php
+++ b/lib/plugins/authldap/lang/es/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Mauricio Segura <maose38@yahoo.es>
  */
-$lang['connectfail']           = 'LDAP no se puede conectar: %5';
+$lang['connectfail']           = 'LDAP no se puede conectar: %s';
-- 
cgit v1.2.3


From 68a234e7114a81dae4fc2712d94f836e55f381ae Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 26 Jul 2015 17:02:36 +0100
Subject: removed unused interwiki icons (obsolete since #1247)

---
 lib/images/interwiki/coral.gif   | Bin 85 -> 0 bytes
 lib/images/interwiki/dokubug.gif | Bin 194 -> 0 bytes
 lib/images/interwiki/sb.gif      | Bin 195 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 lib/images/interwiki/coral.gif
 delete mode 100644 lib/images/interwiki/dokubug.gif
 delete mode 100644 lib/images/interwiki/sb.gif

diff --git a/lib/images/interwiki/coral.gif b/lib/images/interwiki/coral.gif
deleted file mode 100644
index 0f9f67587..000000000
Binary files a/lib/images/interwiki/coral.gif and /dev/null differ
diff --git a/lib/images/interwiki/dokubug.gif b/lib/images/interwiki/dokubug.gif
deleted file mode 100644
index 08c1ca1f1..000000000
Binary files a/lib/images/interwiki/dokubug.gif and /dev/null differ
diff --git a/lib/images/interwiki/sb.gif b/lib/images/interwiki/sb.gif
deleted file mode 100644
index 710e4945b..000000000
Binary files a/lib/images/interwiki/sb.gif and /dev/null differ
-- 
cgit v1.2.3


From fcf2eb0eee7dc56b5ef5ef429b54a504ca229f41 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 26 Jul 2015 17:03:51 +0100
Subject: fixed missing bug icon in extension manager (since #1247)

---
 lib/plugins/extension/helper/list.php |   2 +-
 lib/plugins/extension/images/bug.gif  | Bin 0 -> 194 bytes
 lib/plugins/extension/style.less      |   5 +++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/extension/images/bug.gif

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index bf099d308..6ca72f7ce 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -266,7 +266,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $return  = '<div class="linkbar">';
         $return .= $this->make_homepagelink($extension);
         if ($extension->getBugtrackerURL()) {
-            $return .= ' <a href="'.hsc($extension->getBugtrackerURL()).'" title="'.hsc($extension->getBugtrackerURL()).'" class ="interwiki iw_dokubug">'.$this->getLang('bugs_features').'</a> ';
+            $return .= ' <a href="'.hsc($extension->getBugtrackerURL()).'" title="'.hsc($extension->getBugtrackerURL()).'" class ="bugs">'.$this->getLang('bugs_features').'</a> ';
         }
         if ($extension->getTags()){
             $first = true;
diff --git a/lib/plugins/extension/images/bug.gif b/lib/plugins/extension/images/bug.gif
new file mode 100644
index 000000000..08c1ca1f1
Binary files /dev/null and b/lib/plugins/extension/images/bug.gif differ
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index c400d649a..38e632055 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -171,6 +171,11 @@
             padding-left: 18px;
             background: transparent url(images/tag.png) no-repeat 0 0;
         }
+
+        a.bugs {
+            padding-left: 18px;
+            background: transparent url(images/bug.gif) no-repeat 0 0;
+        }
     }
 
     // more info button
-- 
cgit v1.2.3


From bc8a3531ce749ec8e8c126fb04d84a30a091dd73 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Wed, 29 Jul 2015 08:31:11 +0200
Subject: translation update

---
 lib/plugins/authplain/lang/ja/lang.php |  8 ++++++--
 lib/plugins/config/lang/ja/lang.php    |  7 +++++--
 lib/plugins/styling/lang/ja/intro.txt  |  2 ++
 lib/plugins/styling/lang/ja/lang.php   | 23 +++++++++++++++++++++++
 lib/tpl/dokuwiki/lang/ja/lang.php      | 14 ++++++++++++++
 lib/tpl/dokuwiki/lang/ja/style.txt     |  5 +++++
 6 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 lib/plugins/styling/lang/ja/intro.txt
 create mode 100644 lib/plugins/styling/lang/ja/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/ja/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/ja/style.txt

diff --git a/lib/plugins/authplain/lang/ja/lang.php b/lib/plugins/authplain/lang/ja/lang.php
index aad08a8bd..6aa0be79c 100644
--- a/lib/plugins/authplain/lang/ja/lang.php
+++ b/lib/plugins/authplain/lang/ja/lang.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Hideaki SAWADA <chuno@live.jp>
  */
-$lang['userexists']     = 'このユーザー名は既に存在しています。';
+$lang['userexists']            = 'このユーザー名は既に存在しています。';
+$lang['usernotexists']         = 'このユーザーは未登録です。';
+$lang['writefail']             = 'ユーザーデータを変更できません。管理者に問い合わせてください。';
diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index e8cf8227b..41ad1c8d9 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * japanese language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Yuji Takenaka <webmaster@davilin.com>
  * @author Christopher Smith <chris@jalakai.co.uk>
  * @author Ikuo Obataya <i.obataya@gmail.com>
@@ -10,6 +10,7 @@
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
  * @author Taisuke Shimamoto <dentostar@gmail.com>
  * @author Satoshi Sahara <sahara.satoshi@gmail.com>
+ * @author Hideaki SAWADA <chuno@live.jp>
  */
 $lang['menu']                  = 'サイト設定';
 $lang['error']                 = '不正な値が存在するため、設定は更新されませんでした。入力値を確認してから、再度更新してください。
@@ -85,7 +86,9 @@ $lang['disableactions']        = 'DokuWiki の動作を無効にする';
 $lang['disableactions_check']  = 'チェック';
 $lang['disableactions_subscription'] = '登録 / 解除';
 $lang['disableactions_wikicode'] = 'ソース閲覧 / 生データ出力';
+$lang['disableactions_profile_delete'] = 'このアカウントを削除します。';
 $lang['disableactions_other']  = 'その他の動作（カンマ区切り）';
+$lang['disableactions_rss']    = 'XML 配信（RSS）';
 $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）';
 $lang['securecookie']          = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。';
 $lang['remote']                = 'リモートAPIを有効化します。有効化するとXML-RPCまたは他の手段でwikiにアプリケーションがアクセスすることを許可します。';
diff --git a/lib/plugins/styling/lang/ja/intro.txt b/lib/plugins/styling/lang/ja/intro.txt
new file mode 100644
index 000000000..1feb4e033
--- /dev/null
+++ b/lib/plugins/styling/lang/ja/intro.txt
@@ -0,0 +1,2 @@
+この画面上で、選択中のテンプレート固有のスタイル設定を変更できます。
+変更内容はすべてローカルの設定ファイル内に保存され、テンプレートを更新しても初期化されません。
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/ja/lang.php b/lib/plugins/styling/lang/ja/lang.php
new file mode 100644
index 000000000..da18829b2
--- /dev/null
+++ b/lib/plugins/styling/lang/ja/lang.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hideaki SAWADA <chuno@live.jp>
+ */
+$lang['menu']                  = 'テンプレートのスタイル設定';
+$lang['js']['loader']          = 'プレビューを読込み中です・・・<br/>この表示が消えない場合、変更した設定値に問題があるかもしれません。';
+$lang['js']['popup']           = 'ポップアップとして表示';
+$lang['error']                 = 'このテンプレートは、この機能に対応していません。';
+$lang['btn_preview']           = '変更内容のプレビュー';
+$lang['btn_save']              = '変更内容の保存';
+$lang['btn_reset']             = '変更内容の初期化';
+$lang['btn_revert']            = 'テンプレートのデフォルト値に戻す';
+$lang['__text__']              = 'メイン文字色';
+$lang['__background__']        = 'メイン背景色';
+$lang['__text_alt__']          = '代替文字色';
+$lang['__background_alt__']    = '代替背景色';
+$lang['__text_neu__']          = '無彩色の文字色';
+$lang['__background_neu__']    = '無彩色の背景色';
+$lang['__border__']            = '枠線の色';
+$lang['__highlight__']         = '強調色（主に検索結果用）';
diff --git a/lib/tpl/dokuwiki/lang/ja/lang.php b/lib/tpl/dokuwiki/lang/ja/lang.php
new file mode 100644
index 000000000..98de60320
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/ja/lang.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hideaki SAWADA <chuno@live.jp>
+ */
+$lang['__link__']              = '通常のリンク色';
+$lang['__existing__']          = '既存ページへのリンク色';
+$lang['__missing__']           = '存在しないページへのリンク色';
+$lang['__site_width__']        = 'サイトの全体幅（任意の長さの単位を使用可能： % px em 他）';
+$lang['__sidebar_width__']     = 'サイドバーがある場合、サイドバーの幅（任意の長さの単位を使用可能： % px em 他）';
+$lang['__tablet_width__']      = 'タブレットモードにサイトを切替える、画面幅';
+$lang['__phone_width__']       = '携帯電話モードにサイトを切替える、画面幅';
diff --git a/lib/tpl/dokuwiki/lang/ja/style.txt b/lib/tpl/dokuwiki/lang/ja/style.txt
new file mode 100644
index 000000000..ab032e7ec
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/ja/style.txt
@@ -0,0 +1,5 @@
+ロゴを変更したい場合、メディア管理を利用して「wiki」またはルート名前空間に「logo.png」をアップロードして下さい。
+自動的にその画像を使用します。
+同じ場所に「favicon.ico」をアップロードして使用することもできます。
+アクセス制限のある wiki を使用している場合、アクセスコントロール管理で「wiki」またはルート名前空間を全員読取可に設定して下さい。
+そうでないとログインしていないユーザーにロゴが表示されません。
\ No newline at end of file
-- 
cgit v1.2.3


From 43fe93f060609a616bc348cd2cf2e88ba3ab909e Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Wed, 29 Jul 2015 13:16:12 +0200
Subject: translation update

---
 lib/plugins/config/lang/ja/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index 41ad1c8d9..21e2ca112 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -86,7 +86,7 @@ $lang['disableactions']        = 'DokuWiki の動作を無効にする';
 $lang['disableactions_check']  = 'チェック';
 $lang['disableactions_subscription'] = '登録 / 解除';
 $lang['disableactions_wikicode'] = 'ソース閲覧 / 生データ出力';
-$lang['disableactions_profile_delete'] = 'このアカウントを削除します。';
+$lang['disableactions_profile_delete'] = '自分のアカウントの抹消';
 $lang['disableactions_other']  = 'その他の動作（カンマ区切り）';
 $lang['disableactions_rss']    = 'XML 配信（RSS）';
 $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）';
-- 
cgit v1.2.3


From 00735b39660960c65922e77368290898d1fcaaff Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Wed, 29 Jul 2015 13:31:11 +0200
Subject: translation update

---
 lib/tpl/dokuwiki/lang/ja/lang.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tpl/dokuwiki/lang/ja/lang.php b/lib/tpl/dokuwiki/lang/ja/lang.php
index 98de60320..1800e2aaa 100644
--- a/lib/tpl/dokuwiki/lang/ja/lang.php
+++ b/lib/tpl/dokuwiki/lang/ja/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Hideaki SAWADA <chuno@live.jp>
  */
+$lang['__background_site__']   = 'サイト全体の背景色（content box の背後）';
 $lang['__link__']              = '通常のリンク色';
 $lang['__existing__']          = '既存ページへのリンク色';
 $lang['__missing__']           = '存在しないページへのリンク色';
-- 
cgit v1.2.3


From a0d2e3e98fe4e16dc1fa3ddaa4622a3373eb75ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carbain=20Fr=C3=A9d=C3=A9ric?= <fcarbain@yahoo.fr>
Date: Wed, 29 Jul 2015 17:01:36 +0200
Subject: translation update

---
 inc/lang/fr/lang.php                   | 2 +-
 lib/plugins/authplain/lang/fr/lang.php | 7 +++++--
 lib/plugins/config/lang/fr/lang.php    | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 4a25aab43..8663c035f 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Sébastien Bauer <sebastien.bauer@advalvas.be>
  * @author Antoine Fixary <antoine.fixary@freesbee.fr>
  * @author cumulus <pta-n56@myamail.com>
diff --git a/lib/plugins/authplain/lang/fr/lang.php b/lib/plugins/authplain/lang/fr/lang.php
index 9316836e4..9df04bba6 100644
--- a/lib/plugins/authplain/lang/fr/lang.php
+++ b/lib/plugins/authplain/lang/fr/lang.php
@@ -1,6 +1,9 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Carbain Frédéric <fcarbain@yahoo.fr>
  */
-$lang['userexists']     = 'Désolé, ce nom d\'utilisateur est déjà pris.';
+$lang['userexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris.';
+$lang['usernotexists']         = 'Désolé, cet utilisateur n\'existe pas.';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 75dc4f177..7a53d573c 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * french language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Guy Brand <gb@unistra.fr>
  * @author Delassaux Julien <julien@delassaux.fr>
  * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
@@ -21,6 +21,7 @@
  * @author Olivier DUVAL <zorky00@gmail.com>
  * @author Anael Mobilia <contrib@anael.eu>
  * @author Bruno Veilleux <bruno.vey@gmail.com>
+ * @author Carbain Frédéric <fcarbain@yahoo.fr>
  */
 $lang['menu']                  = 'Paramètres de configuration';
 $lang['error']                 = 'Paramètres non modifiés en raison d\'une valeur invalide, vérifiez vos réglages puis réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.';
-- 
cgit v1.2.3


From ceaabc3e35e64f7d37f68b82086f3cc5034fca8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carbain=20Fr=C3=A9d=C3=A9ric?= <fcarbain@yahoo.fr>
Date: Wed, 29 Jul 2015 17:06:37 +0200
Subject: translation update

---
 inc/lang/fr/lang.php                   |  2 +-
 lib/plugins/authplain/lang/fr/lang.php |  7 +++++--
 lib/plugins/config/lang/fr/lang.php    |  5 +++--
 lib/plugins/extension/lang/fr/lang.php |  3 +++
 lib/plugins/styling/lang/fr/intro.txt  |  2 ++
 lib/plugins/styling/lang/fr/lang.php   | 18 ++++++++++++++++++
 6 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 lib/plugins/styling/lang/fr/intro.txt
 create mode 100644 lib/plugins/styling/lang/fr/lang.php

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 4a25aab43..8663c035f 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Sébastien Bauer <sebastien.bauer@advalvas.be>
  * @author Antoine Fixary <antoine.fixary@freesbee.fr>
  * @author cumulus <pta-n56@myamail.com>
diff --git a/lib/plugins/authplain/lang/fr/lang.php b/lib/plugins/authplain/lang/fr/lang.php
index 9316836e4..9df04bba6 100644
--- a/lib/plugins/authplain/lang/fr/lang.php
+++ b/lib/plugins/authplain/lang/fr/lang.php
@@ -1,6 +1,9 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Carbain Frédéric <fcarbain@yahoo.fr>
  */
-$lang['userexists']     = 'Désolé, ce nom d\'utilisateur est déjà pris.';
+$lang['userexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris.';
+$lang['usernotexists']         = 'Désolé, cet utilisateur n\'existe pas.';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 75dc4f177..7a53d573c 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * french language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Guy Brand <gb@unistra.fr>
  * @author Delassaux Julien <julien@delassaux.fr>
  * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
@@ -21,6 +21,7 @@
  * @author Olivier DUVAL <zorky00@gmail.com>
  * @author Anael Mobilia <contrib@anael.eu>
  * @author Bruno Veilleux <bruno.vey@gmail.com>
+ * @author Carbain Frédéric <fcarbain@yahoo.fr>
  */
 $lang['menu']                  = 'Paramètres de configuration';
 $lang['error']                 = 'Paramètres non modifiés en raison d\'une valeur invalide, vérifiez vos réglages puis réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.';
diff --git a/lib/plugins/extension/lang/fr/lang.php b/lib/plugins/extension/lang/fr/lang.php
index 1a5e469f8..2d990d519 100644
--- a/lib/plugins/extension/lang/fr/lang.php
+++ b/lib/plugins/extension/lang/fr/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
  * @author Yves Grandvalet <Yves.Grandvalet@laposte.net>
+ * @author Carbain Frédéric <fcarbain@yahoo.fr>
  */
 $lang['menu']                  = 'Gestionnaire d\'extensions';
 $lang['tab_plugins']           = 'Greffons installés';
@@ -26,6 +27,8 @@ $lang['btn_disable']           = 'Désactiver';
 $lang['btn_install']           = 'Installer';
 $lang['btn_reinstall']         = 'Réinstaller';
 $lang['js']['reallydel']       = 'Vraiment désinstaller cette extension';
+$lang['js']['display_viewoptions'] = 'Voir les options:';
+$lang['js']['display_updatable'] = 'Mise à jour possible';
 $lang['search_for']            = 'Rechercher l\'extension :';
 $lang['search']                = 'Chercher';
 $lang['extensionby']           = '<strong>%s</strong> de %s';
diff --git a/lib/plugins/styling/lang/fr/intro.txt b/lib/plugins/styling/lang/fr/intro.txt
new file mode 100644
index 000000000..14a615c8d
--- /dev/null
+++ b/lib/plugins/styling/lang/fr/intro.txt
@@ -0,0 +1,2 @@
+Cet outil vous permet de changer les paramètres de certains style de votre thème actuel.
+Tous les changement sont enregistrés dans un fichier de configuration local qui sera inchangé en cas de mise à jour.
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/fr/lang.php b/lib/plugins/styling/lang/fr/lang.php
new file mode 100644
index 000000000..e25839c82
--- /dev/null
+++ b/lib/plugins/styling/lang/fr/lang.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Carbain Frédéric <fcarbain@yahoo.fr>
+ */
+$lang['js']['popup']           = 'Ouvrir dans une nouvelle fenêtre';
+$lang['error']                 = 'Désolé, ce thème ne supporte pas cette fonctionnalité.';
+$lang['btn_preview']           = 'Aperçu des changements';
+$lang['btn_save']              = 'sauvegarder les changements.';
+$lang['__text__']              = 'Couleur de texte principale';
+$lang['__background__']        = 'Couleur de fond principale';
+$lang['__text_alt__']          = 'Couleur de texte alternative';
+$lang['__background_alt__']    = 'Couleur de fond alternative';
+$lang['__text_neu__']          = 'Couleur de texte neutre';
+$lang['__background_neu__']    = 'Couleur de fond neutre';
+$lang['__border__']            = 'Couleur des contours';
-- 
cgit v1.2.3


From 3e564747a558f7a27703373b9b2e7e966eaa35b2 Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Wed, 29 Jul 2015 18:01:40 +0200
Subject: translation update

---
 lib/plugins/config/lang/ja/lang.php        | 1 +
 lib/plugins/usermanager/lang/ja/import.txt | 2 +-
 lib/plugins/usermanager/lang/ja/lang.php   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index 21e2ca112..587b2b4ee 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -193,6 +193,7 @@ $lang['xsendfile_o_2']         = '標準 X-Sendfile ヘッダー';
 $lang['xsendfile_o_3']         = 'Nginx X-Accel-Redirect ヘッダー';
 $lang['showuseras_o_loginname'] = 'ログイン名';
 $lang['showuseras_o_username'] = 'ユーザーのフルネーム';
+$lang['showuseras_o_username_link'] = 'user という InterWiki リンクになったユーザーのフルネーム';
 $lang['showuseras_o_email']    = 'ユーザーのメールアドレス（メールガード設定による難読化）';
 $lang['showuseras_o_email_link'] = 'ユーザーのメールアドレスをリンクにする';
 $lang['useheading_o_0']        = '使用しない';
diff --git a/lib/plugins/usermanager/lang/ja/import.txt b/lib/plugins/usermanager/lang/ja/import.txt
index 6af87c263..4987df0e3 100644
--- a/lib/plugins/usermanager/lang/ja/import.txt
+++ b/lib/plugins/usermanager/lang/ja/import.txt
@@ -1,7 +1,7 @@
 ===== 一括ユーザーインポート =====
 
 少なくとも４列のユーザーCSVファイルが必要です。
-列の順序：ユーザーID、氏名、電子メールアドレス、グループ。
+列の順序： ユーザーID、フルネーム、電子メールアドレス、グループ。
 CSVフィールドはカンマ（,）区切り、文字列は引用符（%%""%%）区切りです。
 エスケープにバックスラッシュ（\）を使用できます。
 適切なファイル例は、上記の"エクスポートユーザー"機能で試して下さい。 
diff --git a/lib/plugins/usermanager/lang/ja/lang.php b/lib/plugins/usermanager/lang/ja/lang.php
index 23109f2a2..c7952d8f0 100644
--- a/lib/plugins/usermanager/lang/ja/lang.php
+++ b/lib/plugins/usermanager/lang/ja/lang.php
@@ -19,7 +19,7 @@ $lang['nosupport']             = '（ユーザー管理はサポートされて
 $lang['badauth']               = '認証のメカニズムが無効です';
 $lang['user_id']               = 'ユーザー';
 $lang['user_pass']             = 'パスワード';
-$lang['user_name']             = '氏名';
+$lang['user_name']             = 'フルネーム';
 $lang['user_mail']             = 'メールアドレス';
 $lang['user_groups']           = 'グループ';
 $lang['field']                 = '項目';
@@ -65,7 +65,7 @@ $lang['import_success_count']  = 'ユーザーインポート：ユーザーが%
 $lang['import_failure_count']  = 'ユーザーインポート：%d件が失敗しました。失敗は次のとおりです。';
 $lang['import_error_fields']   = '列の不足（４列必要）が%d件ありました。';
 $lang['import_error_baduserid'] = '欠落したユーザーID';
-$lang['import_error_badname']  = '不正な氏名';
+$lang['import_error_badname']  = '不正なフルネーム';
 $lang['import_error_badmail']  = '不正な電子メールアドレス';
 $lang['import_error_upload']   = 'インポートが失敗しました。CSVファイルをアップロードできなかったか、ファイルが空です。';
 $lang['import_error_readfail'] = 'インポートが失敗しました。アップロードされたファイルが読込できません。';
-- 
cgit v1.2.3


From dbfd2a2c7bb8cab263b1e64c75a85ea93d6e0b60 Mon Sep 17 00:00:00 2001
From: Kiril <neohidra@gmail.com>
Date: Wed, 29 Jul 2015 18:31:07 +0200
Subject: translation update

---
 inc/lang/bg/lang.php                   |  12 +-
 lib/plugins/authmysql/lang/bg/lang.php |  10 +
 lib/plugins/authplain/lang/bg/lang.php |   7 +-
 lib/plugins/config/lang/bg/lang.php    | 408 ++++++++++++++-------------------
 lib/plugins/extension/lang/bg/lang.php |  26 +++
 lib/plugins/styling/lang/bg/lang.php   |  17 ++
 6 files changed, 239 insertions(+), 241 deletions(-)
 create mode 100644 lib/plugins/authmysql/lang/bg/lang.php
 create mode 100644 lib/plugins/extension/lang/bg/lang.php
 create mode 100644 lib/plugins/styling/lang/bg/lang.php

diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 697f39ad3..daeaf9bd6 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
  * @author Viktor Usunov <usun0v@mail.bg>
  * @author Kiril <neohidra@gmail.com>
@@ -50,6 +50,8 @@ $lang['btn_register']          = 'Регистриране';
 $lang['btn_apply']             = 'Прилагане';
 $lang['btn_media']             = 'Диспечер на файлове';
 $lang['btn_deleteuser']        = 'Изтриване на профила';
+$lang['btn_img_backto']        = 'Назад към %s';
+$lang['btn_mediaManager']      = 'Преглед в диспечера на файлове';
 $lang['loggedinas']            = 'Вписани сте като:';
 $lang['user']                  = 'Потребител';
 $lang['pass']                  = 'Парола';
@@ -70,6 +72,7 @@ $lang['regmissing']            = 'Моля, попълнете всички по
 $lang['reguexists']            = 'Вече съществува потребител с избраното име.';
 $lang['regsuccess']            = 'Потребителят е създаден, а паролата е пратена по електронната поща.';
 $lang['regsuccess2']           = 'Потребителят е създаден.';
+$lang['regfail']               = 'Потребителят не може да бъде създаден.';
 $lang['regmailfail']           = 'Изглежда, че има проблем с пращането на писмото с паролата. Моля, свържете се с администратора!';
 $lang['regbadmail']            = 'Въведеният адрес изглежда невалиден - ако мислите, че това е грешка, свържете се с администратора.';
 $lang['regbadpass']            = 'Двете въведени пароли не съвпадат, моля опитайте отново.';
@@ -84,6 +87,7 @@ $lang['profdeleteuser']        = 'Изтриване на профила';
 $lang['profdeleted']           = 'Вашият профил е премахнат от това wiki ';
 $lang['profconfdelete']        = 'Искам да изтрия профила си от това wiki. <br/>  Веднъж изтрит, профилът не може да бъде възстановен!';
 $lang['profconfdeletemissing'] = 'Не сте поставили отметка в кутията потвърждение';
+$lang['proffail']              = 'Потребителският профил не може да бъде актуализиран.';
 $lang['pwdforget']             = 'Забравили сте паролата си? Получете нова';
 $lang['resendna']              = 'Wiki-то не поддържа повторно пращане на паролата.';
 $lang['resendpwd']             = 'Задаване на нова парола за';
@@ -179,6 +183,9 @@ $lang['difflink']              = 'Препратка към сравнениет
 $lang['diff_type']             = 'Преглед на разликите:';
 $lang['diff_inline']           = 'Вграден';
 $lang['diff_side']             = 'Един до друг';
+$lang['diffprevrev']           = 'Предходна версия';
+$lang['diffnextrev']           = 'Следваща версия';
+$lang['difflastrev']           = 'Последна версия';
 $lang['line']                  = 'Ред';
 $lang['breadcrumb']            = 'Следа:';
 $lang['youarehere']            = 'Намирате се в:';
@@ -234,7 +241,6 @@ $lang['upperns']               = 'към майчиното именно про
 $lang['metaedit']              = 'Редактиране на метаданни';
 $lang['metasaveerr']           = 'Записването на метаданните се провали';
 $lang['metasaveok']            = 'Метаданните са запазени успешно';
-$lang['btn_img_backto']        = 'Назад към %s';
 $lang['img_title']             = 'Заглавие:';
 $lang['img_caption']           = 'Надпис:';
 $lang['img_date']              = 'Дата:';
@@ -247,7 +253,6 @@ $lang['img_camera']            = 'Фотоапарат:';
 $lang['img_keywords']          = 'Ключови думи:';
 $lang['img_width']             = 'Ширина:';
 $lang['img_height']            = 'Височина:';
-$lang['btn_mediaManager']      = 'Преглед в диспечера на файлове';
 $lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s';
 $lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s';
 $lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (имейл) с профила ви.';
@@ -275,6 +280,7 @@ $lang['i_modified']            = 'Поради мерки за сигурнос
 								  Трябва да разархивирате отново файловете от сваления архив или да се посъветвате с <a href="http://dokuwiki.org/install">Инструкциите за инсталиране на Dokuwiki</a>.';
 $lang['i_funcna']              = 'PHP функцията <code>%s</code> не е достъпна. Може би е забранена от доставчика на хостинг.';
 $lang['i_phpver']              = 'Инсталираната версия <code>%s</code> на PHP е по-стара от необходимата <code>%s</code>. Актуализирайте PHP инсталацията.';
+$lang['i_mbfuncoverload']      = 'Необходимо е да изключите mbstring.func_overload в php.ini за да може DokuWiki да стартира.';
 $lang['i_permfail']            = '<code>%s</code> не е достъпна за писане от DokuWiki. Трябва да промените правата за достъп до директорията!';
 $lang['i_confexists']          = '<code>%s</code> вече съществува';
 $lang['i_writeerr']            = '<code>%s</code> не можа да бъде създаден. Трябва да проверите правата за достъп до директорията/файла и да създадете файла ръчно.';
diff --git a/lib/plugins/authmysql/lang/bg/lang.php b/lib/plugins/authmysql/lang/bg/lang.php
new file mode 100644
index 000000000..d5837c726
--- /dev/null
+++ b/lib/plugins/authmysql/lang/bg/lang.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Kiril <neohidra@gmail.com>
+ */
+$lang['connectfail']           = 'Свързването с базата данни се провали.';
+$lang['userexists']            = 'За съжаление вече съществува потребител с това име.';
+$lang['usernotexists']         = 'За съжаление не съществува такъв потребител.';
diff --git a/lib/plugins/authplain/lang/bg/lang.php b/lib/plugins/authplain/lang/bg/lang.php
index 5b8e6bc37..62e62dc13 100644
--- a/lib/plugins/authplain/lang/bg/lang.php
+++ b/lib/plugins/authplain/lang/bg/lang.php
@@ -1,6 +1,9 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Kiril <neohidra@gmail.com>
  */
-$lang['userexists']     = 'Вече съществува потребител с избраното име.';
+$lang['userexists']            = 'Вече съществува потребител с избраното име.';
+$lang['usernotexists']         = 'За съжаление потребителят не съществува.';
diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php
index 64ddb1eae..0426df060 100644
--- a/lib/plugins/config/lang/bg/lang.php
+++ b/lib/plugins/config/lang/bg/lang.php
@@ -1,259 +1,195 @@
 <?php
+
 /**
- * bulgarian language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
  * @author Viktor Usunov <usun0v@mail.bg>
  * @author Kiril <neohidra@gmail.com>
  */
-
-// for admin plugins, the menu prompt to be displayed in the admin menu
-// if set here, the plugin doesn't need to override the getMenuText() method
-$lang['menu']       = 'Настройки';
-
-$lang['error']      = 'Обновяването на настройките не е възможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново.
+$lang['menu']                  = 'Настройки';
+$lang['error']                 = 'Обновяването на настройките не е възможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново.
                        <br />Неверните стойности ще бъдат обградени с червена рамка.';
-$lang['updated']    = 'Обновяването на настройките е успешно.';
-$lang['nochoice']   = '(няма друг възможен избор)';
-$lang['locked']     = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br />
+$lang['updated']               = 'Обновяването на настройките е успешно.';
+$lang['nochoice']              = '(няма друг възможен избор)';
+$lang['locked']                = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br />
                        дали името на локалния файл с настройки и правата са верни.';
-
-$lang['danger']     = 'Внимание: промяна на опцията може да направи Wiki-то и менюто за настройване недостъпни.';
-$lang['warning']    = 'Предупреждение: промяна на опцията може предизвика нежелани последици.';
-$lang['security']   = 'Предупреждение: промяна на опцията може да представлява риск за сигурността.';
-
-/* --- Config Setting Headers --- */
-$lang['_configuration_manager'] = 'Диспечер на настройките'; //same as heading in intro.txt
-$lang['_header_dokuwiki'] = 'Настройки на DokuWiki';
-$lang['_header_plugin']  = 'Настройки на приставки';
-$lang['_header_template'] = 'Настройки на шаблона';
-$lang['_header_undefined'] = 'Неопределени настройки';
-
-/* --- Config Setting Groups --- */
-$lang['_basic'] = 'Основни настройки';
-$lang['_display'] = 'Настройки за изобразяване';
-$lang['_authentication'] = 'Настройки за удостоверяване';
-$lang['_anti_spam'] = 'Настройки за борба със SPAM-ма';
-$lang['_editing'] = 'Настройки за редактиране';
-$lang['_links'] = 'Настройки на препратките';
-$lang['_media'] = 'Настройки на медията';
-$lang['_notifications'] = 'Настройки за известяване';
-$lang['_syndication']   = 'Настройки на RSS емисиите';
-$lang['_advanced'] = 'Допълнителни настройки';
-$lang['_network'] = 'Мрежови настройки';
-
-/* --- Undefined Setting Messages --- */
+$lang['danger']                = 'Внимание: промяна на опцията може да направи Wiki-то и менюто за настройване недостъпни.';
+$lang['warning']               = 'Предупреждение: промяна на опцията може предизвика нежелани последици.';
+$lang['security']              = 'Предупреждение: промяна на опцията може да представлява риск за сигурността.';
+$lang['_configuration_manager'] = 'Диспечер на настройките';
+$lang['_header_dokuwiki']      = 'Настройки на DokuWiki';
+$lang['_header_plugin']        = 'Настройки на приставки';
+$lang['_header_template']      = 'Настройки на шаблона';
+$lang['_header_undefined']     = 'Неопределени настройки';
+$lang['_basic']                = 'Основни настройки';
+$lang['_display']              = 'Настройки за изобразяване';
+$lang['_authentication']       = 'Настройки за удостоверяване';
+$lang['_anti_spam']            = 'Настройки за борба със SPAM-ма';
+$lang['_editing']              = 'Настройки за редактиране';
+$lang['_links']                = 'Настройки на препратките';
+$lang['_media']                = 'Настройки на медията';
+$lang['_notifications']        = 'Настройки за известяване';
+$lang['_syndication']          = 'Настройки на RSS емисиите';
+$lang['_advanced']             = 'Допълнителни настройки';
+$lang['_network']              = 'Мрежови настройки';
 $lang['_msg_setting_undefined'] = 'Няма метаданни за настройките.';
 $lang['_msg_setting_no_class'] = 'Няма клас настройки.';
 $lang['_msg_setting_no_default'] = 'Няма стандартна стойност.';
-
-/* -------------------- Config Options --------------------------- */
-
-/* Basic Settings */
-$lang['title']      = 'Заглавие за Wiki-то, тоест името';
-$lang['start']      = 'Име на началната страница';
-$lang['lang']       = 'Език на интерфейса';
-$lang['template']   = 'Шаблон (определя вида на страниците)';
-$lang['tagline']    = 'Подзаглавие - изобразява се под името на Wiki-то (ако се поддържа от шаблона)';
-$lang['sidebar']    = 'Име на страницата за страничната лента (ако се поддържа от шаблона). Оставите ли полето празно лентата ще бъде изключена';
-$lang['license']    = 'Под какъв лиценз да бъде публикувано съдържанието?';
-$lang['savedir']    = 'Директория за записване на данните';
-$lang['basedir']    = 'Главна директория (напр. <code>/dokuwiki/</code>). Оставете празно, за да бъде засечена автоматично.';
-$lang['baseurl']    = 'URL адрес (напр. <code>http://www.yourserver.com</code>). Оставете празно, за да бъде засечен автоматично.';
-$lang['cookiedir']  = 'Път за бисквитките. Оставите ли полето празно ще се ползва горния URL адрес.';
-$lang['dmode']      = 'Режим (права) за създаване на директории';
-$lang['fmode']      = 'Режим (права) за създаване на файлове';
-$lang['allowdebug'] = 'Включване на режи debug - <b>изключете, ако не е нужен!</b>';
-
-/* Display Settings */
-$lang['recent']      = 'Скорошни промени - брой елементи на страница';
-$lang['recent_days'] = 'Колко от скорошните промени да се пазят (дни)';
-$lang['breadcrumbs'] = 'Брой на следите. За изключване на функцията задайте 0.';
-$lang['youarehere']  = 'Йерархични следи (в този случай можете да изключите горната опция)';
-$lang['fullpath']    = 'Показване на пълния път до страниците в долния колонтитул.';
-$lang['typography']  = 'Замяна на последователност от символи с типографски еквивалент';
-$lang['dformat']     = 'Формат на датата (виж. <a href="http://www.php.net/strftime">strftime</a> функцията на PHP)';
-$lang['signature']   = 'Подпис - какво да внася бутона "Вмъкване на подпис" от редактора';
-$lang['showuseras']  = 'Какво да се показва за потребителя, който последно е променил дадена страницата';
-$lang['toptoclevel'] = 'Главно ниво (заглавие) за съдържанието';
-$lang['tocminheads'] = 'Минимален брой заглавия, определящ дали да бъде създадено съдържание';
-$lang['maxtoclevel'] = 'Максимален брой нива (заглавия) за включване в съдържанието';
-$lang['maxseclevel'] = 'Максимален брой нива предоставяни за самостоятелно редактиране';
-$lang['camelcase']   = 'Ползване на CamelCase за линкове';
-$lang['deaccent']    = 'Почистване имената на страниците (на файловете)';
-$lang['useheading']  = 'Ползване на първото заглавие за име на страница';
-$lang['sneaky_index'] = 'Стандартно DokuWiki ще показва всички именни пространства в индекса. Опцията скрива тези, за които потребителят няма права за четене. Това може да доведе и до скриване на иначе достъпни подименни пространства. С определени настройки на списъците за контрол на достъпа (ACL) може да направи индекса неизползваем. ';
-$lang['hidepages']   = 'Скриване на страниците съвпадащи с този регулярен израз(regular expressions)';
-
-/* Authentication Settings */
-$lang['useacl']      = 'Ползване на списъци за достъп';
-$lang['autopasswd']  = 'Автоматично генериране на пароли, на нови потребители и пращане по пощата';
-$lang['authtype']    = 'Метод за удостоверяване';
-$lang['passcrypt']   = 'Метод за криптиране на паролите';
-$lang['defaultgroup']= 'Стандартна група';
-$lang['superuser']   = 'Супер потребител -  група, потребител или списък със стойности разделени чрез запетая (user1,@group1,user2) с пълен достъп до всички страници и функции без значение от настройките на списъците за достъп (ACL)';
-$lang['manager']     = 'Управител - група, потребител или списък със стойности разделени чрез запетая (user1,@group1,user2) с достъп до определени управленски функции ';
-$lang['profileconfirm'] = 'Потвърждаване на промени в профила с парола';
-$lang['rememberme'] = 'Ползване на постоянни бисквитки за вписване (за функцията "Запомни ме")';
-$lang['disableactions'] = 'Изключване функции на DokuWiki';
-$lang['disableactions_check'] = 'Проверка';
+$lang['title']                 = 'Заглавие за Wiki-то, тоест името';
+$lang['start']                 = 'Име на началната страница';
+$lang['lang']                  = 'Език на интерфейса';
+$lang['template']              = 'Шаблон (определя вида на страниците)';
+$lang['tagline']               = 'Подзаглавие - изобразява се под името на Wiki-то (ако се поддържа от шаблона)';
+$lang['sidebar']               = 'Име на страницата за страничната лента (ако се поддържа от шаблона). Оставите ли полето празно лентата ще бъде изключена';
+$lang['license']               = 'Под какъв лиценз да бъде публикувано съдържанието?';
+$lang['savedir']               = 'Директория за записване на данните';
+$lang['basedir']               = 'Главна директория (напр. <code>/dokuwiki/</code>). Оставете празно, за да бъде засечена автоматично.';
+$lang['baseurl']               = 'URL адрес (напр. <code>http://www.yourserver.com</code>). Оставете празно, за да бъде засечен автоматично.';
+$lang['cookiedir']             = 'Път за бисквитките. Оставите ли полето празно ще се ползва горния URL адрес.';
+$lang['dmode']                 = 'Режим (права) за създаване на директории';
+$lang['fmode']                 = 'Режим (права) за създаване на файлове';
+$lang['allowdebug']            = 'Включване на режи debug - <b>изключете, ако не е нужен!</b>';
+$lang['recent']                = 'Скорошни промени - брой елементи на страница';
+$lang['recent_days']           = 'Колко от скорошните промени да се пазят (дни)';
+$lang['breadcrumbs']           = 'Брой на следите. За изключване на функцията задайте 0.';
+$lang['youarehere']            = 'Йерархични следи (в този случай можете да изключите горната опция)';
+$lang['fullpath']              = 'Показване на пълния път до страниците в долния колонтитул.';
+$lang['typography']            = 'Замяна на последователност от символи с типографски еквивалент';
+$lang['dformat']               = 'Формат на датата (виж. <a href="http://www.php.net/strftime">strftime</a> функцията на PHP)';
+$lang['signature']             = 'Подпис - какво да внася бутона "Вмъкване на подпис" от редактора';
+$lang['showuseras']            = 'Какво да се показва за потребителя, който последно е променил дадена страницата';
+$lang['toptoclevel']           = 'Главно ниво (заглавие) за съдържанието';
+$lang['tocminheads']           = 'Минимален брой заглавия, определящ дали да бъде създадено съдържание';
+$lang['maxtoclevel']           = 'Максимален брой нива (заглавия) за включване в съдържанието';
+$lang['maxseclevel']           = 'Максимален брой нива предоставяни за самостоятелно редактиране';
+$lang['camelcase']             = 'Ползване на CamelCase за линкове';
+$lang['deaccent']              = 'Почистване имената на страниците (на файловете)';
+$lang['useheading']            = 'Ползване на първото заглавие за име на страница';
+$lang['sneaky_index']          = 'Стандартно DokuWiki ще показва всички именни пространства в индекса. Опцията скрива тези, за които потребителят няма права за четене. Това може да доведе и до скриване на иначе достъпни подименни пространства. С определени настройки на списъците за контрол на достъпа (ACL) може да направи индекса неизползваем. ';
+$lang['hidepages']             = 'Скриване на страниците съвпадащи с този регулярен израз(regular expressions)';
+$lang['useacl']                = 'Ползване на списъци за достъп';
+$lang['autopasswd']            = 'Автоматично генериране на пароли, на нови потребители и пращане по пощата';
+$lang['authtype']              = 'Метод за удостоверяване';
+$lang['passcrypt']             = 'Метод за криптиране на паролите';
+$lang['defaultgroup']          = 'Стандартна група';
+$lang['superuser']             = 'Супер потребител -  група, потребител или списък със стойности разделени чрез запетая (user1,@group1,user2) с пълен достъп до всички страници и функции без значение от настройките на списъците за достъп (ACL)';
+$lang['manager']               = 'Управител - група, потребител или списък със стойности разделени чрез запетая (user1,@group1,user2) с достъп до определени управленски функции ';
+$lang['profileconfirm']        = 'Потвърждаване на промени в профила с парола';
+$lang['rememberme']            = 'Ползване на постоянни бисквитки за вписване (за функцията "Запомни ме")';
+$lang['disableactions']        = 'Изключване функции на DokuWiki';
+$lang['disableactions_check']  = 'Проверка';
 $lang['disableactions_subscription'] = 'Абониране/Отписване';
 $lang['disableactions_wikicode'] = 'Преглед на кода/Експортиране на оригинална версия';
-$lang['disableactions_other'] = 'Други действия (разделени със запетая)';
+$lang['disableactions_other']  = 'Други действия (разделени със запетая)';
 $lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)';
-$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL.';
-$lang['remote']      = 'Включване на системата за отдалечен API достъп. Това ще позволи на приложения да се свързват с DokuWiki чрез XML-RPC или друг механизъм.';
-$lang['remoteuser']  = 'Ограничаване на отдалечения API достъп - активиране само за следните групи и потребители (отделени със запетая). Ако оставите полето празно всеки ще има достъп достъп.';
-
-/* Anti-Spam Settings */
-$lang['usewordblock']    = 'Блокиране на SPAM въз основа на на списък от думи';
-$lang['relnofollow']     = 'Ползване на rel="nofollow" за външни препратки';
-$lang['indexdelay']      = 'Забавяне преди индексиране (сек)';
-$lang['mailguard']       = 'Промяна на адресите на ел. поща (във форма непозволяваща пращането на SPAM)';
-$lang['iexssprotect']    = 'Проверяване на качените файлове за вероятен зловреден JavaScript и HTML код';
-
-/* Editing Settings */
-$lang['usedraft']   = 'Автоматично запазване на чернова по време на редактиране';
-$lang['htmlok']     = 'Разрешаване вграждането на HTML код';
-$lang['phpok']      = 'Разрешаване вграждането на PHP код';
-$lang['locktime']   = 'Макс. период за съхраняване на заключените файлове (сек)';
-$lang['cachetime']  = 'Макс. период за съхраняване на кеша (сек)';
-
-/* Link settings */
-$lang['target____wiki']      = 'Прозорец за вътрешни препратки';
-$lang['target____interwiki'] = 'Прозорец за препратки към други Wiki сайтове';
-$lang['target____extern']    = 'Прозорец за външни препратки';
-$lang['target____media']     = 'Прозорец за медийни препратки';
-$lang['target____windows']   = 'Прозорец за препратки към Windows';
-
-/* Media Settings */
-$lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?';
-$lang['refcheck']    = 'Проверка за препратка към медия, преди да бъде изтрита';
-$lang['gdlib']       = 'Версия на GD Lib';
-$lang['im_convert']  = 'Път до инструмента за трансформация на ImageMagick';
-$lang['jpg_quality'] = 'Качество на JPG компресията (0-100)';
-$lang['fetchsize']   = 'Максимален размер (байтове), който fetch.php може да сваля';
-
-/* Notification Settings */
-$lang['subscribers'] = 'Включване на поддръжката за абониране към страници';
-$lang['subscribe_time'] = 'Време след което абонаментните списъци и обобщения се изпращат (сек); Трябва да е по-малко от времето определено в recent_days.';
-$lang['notify']      = 'Пращане на съобщения за промени по страниците на следната eл. поща';
-$lang['registernotify'] = 'Пращане на информация за нови потребители на следната ел. поща';
-$lang['mailfrom']    = 'Ел. поща, която да се ползва за автоматично изпращане на ел. писма';
-$lang['mailprefix']  = 'Представка за темите (поле subject) на автоматично изпращаните ел. писма';
-$lang['htmlmail']    = 'Изпращане на по-добре изглеждащи, но по-големи по-размер HTML ел. писма. Изключете ако желаете писмата да се изпращат като чист текст.';
-
-/* Syndication Settings */
-$lang['sitemap']     = 'Генериране на Google sitemap (дни)';
-$lang['rss_type']    = 'Тип на XML емисията';
-$lang['rss_linkto']  = 'XML емисията препраща към';
-$lang['rss_content'] = 'Какво да показват елементите на XML емисията?';
-$lang['rss_update']  = 'Интервал на актуализиране на XML емисията (сек)';
-$lang['rss_show_summary'] = 'Показване на обобщение в заглавието на XML емисията';
-$lang['rss_media']   = 'Кой тип промени да се включват в XML мисията?';
-
-/* Advanced Options */
-$lang['updatecheck'] = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.';
-$lang['userewrite']  = 'Ползване на nice URL адреси';
-$lang['useslash']    = 'Ползване на наклонена черта за разделител на именните пространства в URL';
-$lang['sepchar']     = 'Разделител между думите в имената на страници';
-$lang['canonical']   = 'Ползване на напълно уеднаквени URL адреси (абсолютни адреси - http://server/path)';
-$lang['fnencode']    = 'Метод за кодиране на не-ASCII именуваните файлове.';
-$lang['autoplural']  = 'Проверяване за множествено число в препратките';
-$lang['compression'] = 'Метод за компресия на attic файлове';
-$lang['gzip_output'] = 'Кодиране на съдържанието с gzip за xhtml';
-$lang['compress']    = 'Компактен CSS и javascript изглед';
-$lang['cssdatauri']  = 'Максимален размер, в байтове, до който изображенията посочени в .CSS файл ще бъдат вграждани в стила (stylesheet), за да се намали броя на HTTP заявките. Техниката не работи за версиите на IE преди 8! Препоръчителни стойности: <code>400</code> до <code>600</code> байта. Въведете <code>0</code> за изключване.';
-$lang['send404']     = 'Пращане на "HTTP 404/Page Not Found" за несъществуващи страници';
-$lang['broken_iua']  = 'Отметнете, ако ignore_user_abort функцията не работи. Може да попречи на търсенето в страниците. Знае се, че комбинацията IIS+PHP/CGI е лоша. Вижте  <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Грешка 852</a> за повече информация.';
-$lang['xsendfile']   = 'Ползване на Х-Sendfile header, за да може уебсървъра да дава статични файлове? Вашият уеб сървър трябва да го поддържа.';
-$lang['renderer_xhtml']   = 'Представяне на основните изходни данни (xhtml) от Wiki-то с';
-$lang['renderer__core']   = '%s (ядрото на DokuWiki)';
-$lang['renderer__plugin'] = '%s (приставка)';
-
-/* Network Options */
-$lang['dnslookups'] = 'DokuWiki ще търси имената на хостовете, на отдалечени IP адреси, от които потребители редактират страници. НЕ е желателно да ползвате опцията ако имате бавен или неработещ DNS сървър.';
-
-/* Proxy Options */
-$lang['proxy____host']   = 'Име на прокси сървър';
-$lang['proxy____port']   = 'Порт за проксито';
-$lang['proxy____user']   = 'Потребител за проксито';
-$lang['proxy____pass']   = 'Парола за проксито';
-$lang['proxy____ssl']    = 'Ползване на SSL при свързване с проксито';
-$lang['proxy____except'] = 'Регулярен израз определящ за кои URL адреси да не се ползва прокси сървър.';
-
-/* Safemode Hack */
-$lang['safemodehack']    = 'Ползване на хака safemode';
-$lang['ftp____host']     = 'FTP сървър за хака safemode';
-$lang['ftp____port']     = 'FTP порт за хака safemode';
-$lang['ftp____user']     = 'FTP потребител за хака safemode';
-$lang['ftp____pass']     = 'FTP парола за хака safemode';
-$lang['ftp____root']     = 'FTP главна директория за хака safemode';
-
-/* License Options */
-$lang['license_o_']      = 'Нищо не е избрано';
-
-/* typography options */
-$lang['typography_o_0']  = 'без';
-$lang['typography_o_1']  = 'с изключение на единични кавички';
-$lang['typography_o_2']  = 'включително единични кавички (не винаги работи)';
-
-/* userewrite options */
-$lang['userewrite_o_0']  = 'без';
-$lang['userewrite_o_1']  = 'файлът .htaccess';
-$lang['userewrite_o_2']  = 'вътрешно от DokuWiki ';
-
-/* deaccent options */
-$lang['deaccent_o_0']    = 'изключено';
-$lang['deaccent_o_1']    = 'премахване на акценти';
-$lang['deaccent_o_2']    = 'транслитерация';
-
-/* gdlib options */
-$lang['gdlib_o_0']       = 'GD Lib не е достъпна';
-$lang['gdlib_o_1']       = 'Версия 1.x';
-$lang['gdlib_o_2']       = 'Автоматично разпознаване';
-
-/* rss_type options */
-$lang['rss_type_o_rss']   = 'RSS версия 0.91';
-$lang['rss_type_o_rss1']  = 'RSS версия 1.0';
-$lang['rss_type_o_rss2']  = 'RSS версия 2.0';
-$lang['rss_type_o_atom']  = 'Atom версия 0.3';
-$lang['rss_type_o_atom1'] = 'Atom версия 1.0';
-
-/* rss_content options */
+$lang['securecookie']          = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL.';
+$lang['remote']                = 'Включване на системата за отдалечен API достъп. Това ще позволи на приложения да се свързват с DokuWiki чрез XML-RPC или друг механизъм.';
+$lang['remoteuser']            = 'Ограничаване на отдалечения API достъп - активиране само за следните групи и потребители (отделени със запетая). Ако оставите полето празно всеки ще има достъп достъп.';
+$lang['usewordblock']          = 'Блокиране на SPAM въз основа на на списък от думи';
+$lang['relnofollow']           = 'Ползване на rel="nofollow" за външни препратки';
+$lang['indexdelay']            = 'Забавяне преди индексиране (сек)';
+$lang['mailguard']             = 'Промяна на адресите на ел. поща (във форма непозволяваща пращането на SPAM)';
+$lang['iexssprotect']          = 'Проверяване на качените файлове за вероятен зловреден JavaScript и HTML код';
+$lang['usedraft']              = 'Автоматично запазване на чернова по време на редактиране';
+$lang['htmlok']                = 'Разрешаване вграждането на HTML код';
+$lang['phpok']                 = 'Разрешаване вграждането на PHP код';
+$lang['locktime']              = 'Макс. период за съхраняване на заключените файлове (сек)';
+$lang['cachetime']             = 'Макс. период за съхраняване на кеша (сек)';
+$lang['target____wiki']        = 'Прозорец за вътрешни препратки';
+$lang['target____interwiki']   = 'Прозорец за препратки към други Wiki сайтове';
+$lang['target____extern']      = 'Прозорец за външни препратки';
+$lang['target____media']       = 'Прозорец за медийни препратки';
+$lang['target____windows']     = 'Прозорец за препратки към Windows';
+$lang['mediarevisions']        = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?';
+$lang['refcheck']              = 'Проверка за препратка към медия, преди да бъде изтрита';
+$lang['gdlib']                 = 'Версия на GD Lib';
+$lang['im_convert']            = 'Път до инструмента за трансформация на ImageMagick';
+$lang['jpg_quality']           = 'Качество на JPG компресията (0-100)';
+$lang['fetchsize']             = 'Максимален размер (байтове), който fetch.php може да сваля';
+$lang['subscribers']           = 'Включване на поддръжката за абониране към страници';
+$lang['subscribe_time']        = 'Време след което абонаментните списъци и обобщения се изпращат (сек); Трябва да е по-малко от времето определено в recent_days.';
+$lang['notify']                = 'Пращане на съобщения за промени по страниците на следната eл. поща';
+$lang['registernotify']        = 'Пращане на информация за нови потребители на следната ел. поща';
+$lang['mailfrom']              = 'Ел. поща, която да се ползва за автоматично изпращане на ел. писма';
+$lang['mailprefix']            = 'Представка за темите (поле subject) на автоматично изпращаните ел. писма';
+$lang['htmlmail']              = 'Изпращане на по-добре изглеждащи, но по-големи по-размер HTML ел. писма. Изключете ако желаете писмата да се изпращат като чист текст.';
+$lang['sitemap']               = 'Генериране на Google sitemap (дни)';
+$lang['rss_type']              = 'Тип на XML емисията';
+$lang['rss_linkto']            = 'XML емисията препраща към';
+$lang['rss_content']           = 'Какво да показват елементите на XML емисията?';
+$lang['rss_update']            = 'Интервал на актуализиране на XML емисията (сек)';
+$lang['rss_show_summary']      = 'Показване на обобщение в заглавието на XML емисията';
+$lang['rss_media']             = 'Кой тип промени да се включват в XML мисията?';
+$lang['updatecheck']           = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.';
+$lang['userewrite']            = 'Ползване на nice URL адреси';
+$lang['useslash']              = 'Ползване на наклонена черта за разделител на именните пространства в URL';
+$lang['sepchar']               = 'Разделител между думите в имената на страници';
+$lang['canonical']             = 'Ползване на напълно уеднаквени URL адреси (абсолютни адреси - http://server/path)';
+$lang['fnencode']              = 'Метод за кодиране на не-ASCII именуваните файлове.';
+$lang['autoplural']            = 'Проверяване за множествено число в препратките';
+$lang['compression']           = 'Метод за компресия на attic файлове';
+$lang['gzip_output']           = 'Кодиране на съдържанието с gzip за xhtml';
+$lang['compress']              = 'Компактен CSS и javascript изглед';
+$lang['cssdatauri']            = 'Максимален размер, в байтове, до който изображенията посочени в .CSS файл ще бъдат вграждани в стила (stylesheet), за да се намали броя на HTTP заявките. Техниката не работи за версиите на IE преди 8! Препоръчителни стойности: <code>400</code> до <code>600</code> байта. Въведете <code>0</code> за изключване.';
+$lang['send404']               = 'Пращане на "HTTP 404/Page Not Found" за несъществуващи страници';
+$lang['broken_iua']            = 'Отметнете, ако ignore_user_abort функцията не работи. Може да попречи на търсенето в страниците. Знае се, че комбинацията IIS+PHP/CGI е лоша. Вижте  <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Грешка 852</a> за повече информация.';
+$lang['xsendfile']             = 'Ползване на Х-Sendfile header, за да може уебсървъра да дава статични файлове? Вашият уеб сървър трябва да го поддържа.';
+$lang['renderer_xhtml']        = 'Представяне на основните изходни данни (xhtml) от Wiki-то с';
+$lang['renderer__core']        = '%s (ядрото на DokuWiki)';
+$lang['renderer__plugin']      = '%s (приставка)';
+$lang['dnslookups']            = 'DokuWiki ще търси имената на хостовете, на отдалечени IP адреси, от които потребители редактират страници. НЕ е желателно да ползвате опцията ако имате бавен или неработещ DNS сървър.';
+$lang['proxy____host']         = 'Име на прокси сървър';
+$lang['proxy____port']         = 'Порт за проксито';
+$lang['proxy____user']         = 'Потребител за проксито';
+$lang['proxy____pass']         = 'Парола за проксито';
+$lang['proxy____ssl']          = 'Ползване на SSL при свързване с проксито';
+$lang['proxy____except']       = 'Регулярен израз определящ за кои URL адреси да не се ползва прокси сървър.';
+$lang['safemodehack']          = 'Ползване на хака safemode';
+$lang['ftp____host']           = 'FTP сървър за хака safemode';
+$lang['ftp____port']           = 'FTP порт за хака safemode';
+$lang['ftp____user']           = 'FTP потребител за хака safemode';
+$lang['ftp____pass']           = 'FTP парола за хака safemode';
+$lang['ftp____root']           = 'FTP главна директория за хака safemode';
+$lang['license_o_']            = 'Нищо не е избрано';
+$lang['typography_o_0']        = 'без';
+$lang['typography_o_1']        = 'с изключение на единични кавички';
+$lang['typography_o_2']        = 'включително единични кавички (не винаги работи)';
+$lang['userewrite_o_0']        = 'без';
+$lang['userewrite_o_1']        = 'файлът .htaccess';
+$lang['userewrite_o_2']        = 'вътрешно от DokuWiki ';
+$lang['deaccent_o_0']          = 'изключено';
+$lang['deaccent_o_1']          = 'премахване на акценти';
+$lang['deaccent_o_2']          = 'транслитерация';
+$lang['gdlib_o_0']             = 'GD Lib не е достъпна';
+$lang['gdlib_o_1']             = 'Версия 1.x';
+$lang['gdlib_o_2']             = 'Автоматично разпознаване';
+$lang['rss_type_o_rss']        = 'RSS версия 0.91';
+$lang['rss_type_o_rss1']       = 'RSS версия 1.0';
+$lang['rss_type_o_rss2']       = 'RSS версия 2.0';
+$lang['rss_type_o_atom']       = 'Atom версия 0.3';
+$lang['rss_type_o_atom1']      = 'Atom версия 1.0';
 $lang['rss_content_o_abstract'] = 'Извлечение';
-$lang['rss_content_o_diff']     = 'Обединени разлики';
+$lang['rss_content_o_diff']    = 'Обединени разлики';
 $lang['rss_content_o_htmldiff'] = 'Таблица с разликите в HTML формат';
-$lang['rss_content_o_html']     = 'Цялото съдържание на HTML страницата';
-
-/* rss_linkto options */
+$lang['rss_content_o_html']    = 'Цялото съдържание на HTML страницата';
 $lang['rss_linkto_o_diff']     = 'изглед на разликите';
 $lang['rss_linkto_o_page']     = 'променената страница';
 $lang['rss_linkto_o_rev']      = 'списък на версиите';
 $lang['rss_linkto_o_current']  = 'текущата страница';
-
-/* compression options */
-$lang['compression_o_0']   = 'без';
-$lang['compression_o_gz']  = 'gzip';
-$lang['compression_o_bz2'] = 'bz2';
-
-/* xsendfile header */
-$lang['xsendfile_o_0'] = 'без';
-$lang['xsendfile_o_1'] = 'Специфичен lighttpd header (преди версия 1.5)';
-$lang['xsendfile_o_2'] = 'Стандартен X-Sendfile header';
-$lang['xsendfile_o_3'] = 'Специфичен Nginx X-Accel-Redirect header за пренасочване';
-
-/* Display user info */
-$lang['showuseras_o_loginname']  = 'Име за вписване';
-$lang['showuseras_o_username']   = 'Пълно потребителско име';
-$lang['showuseras_o_email']      = 'Ел, поща (променени според настройките на mailguard)';
+$lang['compression_o_0']       = 'без';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'без';
+$lang['xsendfile_o_1']         = 'Специфичен lighttpd header (преди версия 1.5)';
+$lang['xsendfile_o_2']         = 'Стандартен X-Sendfile header';
+$lang['xsendfile_o_3']         = 'Специфичен Nginx X-Accel-Redirect header за пренасочване';
+$lang['showuseras_o_loginname'] = 'Име за вписване';
+$lang['showuseras_o_username'] = 'Пълно потребителско име';
+$lang['showuseras_o_email']    = 'Ел, поща (променени според настройките на mailguard)';
 $lang['showuseras_o_email_link'] = 'Ел. поща под формата на връзка тип mailto:';
-
-/* useheading options */
-$lang['useheading_o_0']  = 'Никога';
+$lang['useheading_o_0']        = 'Никога';
 $lang['useheading_o_navigation'] = 'Само за навигация';
-$lang['useheading_o_content'] = 'Само за съдържанието на Wiki-то';
-$lang['useheading_o_1'] = 'Винаги';
-
-$lang['readdircache'] = 'Максимален период за съхраняване кеша на readdir (сек)';
+$lang['useheading_o_content']  = 'Само за съдържанието на Wiki-то';
+$lang['useheading_o_1']        = 'Винаги';
+$lang['readdircache']          = 'Максимален период за съхраняване кеша на readdir (сек)';
diff --git a/lib/plugins/extension/lang/bg/lang.php b/lib/plugins/extension/lang/bg/lang.php
new file mode 100644
index 000000000..430516dd1
--- /dev/null
+++ b/lib/plugins/extension/lang/bg/lang.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Kiril <neohidra@gmail.com>
+ */
+$lang['tab_search']            = 'Търсене и инсталиране';
+$lang['tab_install']           = 'Ръчно инсталиране';
+$lang['notimplemented']        = 'Функционалността все още не реализирана';
+$lang['unknownauthor']         = 'Неизвестен автор';
+$lang['unknownversion']        = 'Неизвестна версия';
+$lang['btn_info']              = 'Повече информация';
+$lang['btn_update']            = 'Актуализиране';
+$lang['btn_uninstall']         = 'Деинсталиране';
+$lang['btn_install']           = 'Инсталиране';
+$lang['btn_reinstall']         = 'Преинсталиране';
+$lang['popularity']            = 'Популярност: %s%%';
+$lang['repository']            = 'Хранилище:';
+$lang['installed_version']     = 'Инсталирана версия:';
+$lang['available_version']     = 'Налична версия:';
+$lang['compatible']            = 'Съвместимост с:';
+$lang['provides']              = 'Осигурява:';
+$lang['error_badurl']          = 'URL адресите трябва да започват с http или https';
+$lang['error_download']        = 'Невъзможност за сваляне на файл: %s';
+$lang['install_url']           = 'Инсталиране от URL:';
diff --git a/lib/plugins/styling/lang/bg/lang.php b/lib/plugins/styling/lang/bg/lang.php
new file mode 100644
index 000000000..5e457380c
--- /dev/null
+++ b/lib/plugins/styling/lang/bg/lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Kiril <neohidra@gmail.com>
+ */
+$lang['btn_preview']           = 'Преглед на промените';
+$lang['btn_save']              = 'Запис на промените';
+$lang['btn_reset']             = 'Анулиране на промените';
+$lang['__text__']              = 'Цвят на основния текст';
+$lang['__background__']        = 'Цвят на основния фон';
+$lang['__text_alt__']          = 'Алтернативен цвят за текста';
+$lang['__background_alt__']    = 'Алтернативен цвят за фона';
+$lang['__text_neu__']          = 'Неутрален цвят за текста';
+$lang['__background_neu__']    = 'Неутрален цвят за фона';
+$lang['__border__']            = 'Цвят на рамката';
-- 
cgit v1.2.3


From a5a157e21b77c7076e7efb400dfb11fda13104bc Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Wed, 29 Jul 2015 21:56:38 +0200
Subject: translation update

---
 inc/lang/ja/index.txt                |  2 +-
 inc/lang/ja/register.txt             |  2 +-
 lib/plugins/config/lang/ja/intro.txt | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/inc/lang/ja/index.txt b/inc/lang/ja/index.txt
index b3dbb95f3..eb168d146 100644
--- a/inc/lang/ja/index.txt
+++ b/inc/lang/ja/index.txt
@@ -1,4 +1,4 @@
 ====== サイトマップ ======
 
-[[doku>ja:namespaces|名前空間]] に基づく、全ての文書の索引です。
+全ての閲覧可能ページを[[doku>ja:namespaces|名前空間]]順に並べたサイトマップです。
 
diff --git a/inc/lang/ja/register.txt b/inc/lang/ja/register.txt
index b242d1e88..0cd278699 100644
--- a/inc/lang/ja/register.txt
+++ b/inc/lang/ja/register.txt
@@ -1,4 +1,4 @@
 ====== 新規ユーザー登録 ======
 
-このWikiのユーザー登録を行うためには、以下の情報を全て入力して下さい。 もし以下の項目にパスワードが存在しない場合、パスワードはメールにて送信されますので、 必ず**有効な**メールアドレスを入力してください。 また、ログイン名は [[doku>pagename|pagename]] に準拠していなければなりません。
+このWikiのユーザー登録を行うためには、以下の情報を全て入力して下さい。 もし以下の項目にパスワードが存在しない場合、パスワードはメールにて送信されますので、 必ず**有効なメールアドレス**を入力してください。 また、ログイン名は[[doku>ja:pagename|ページ名]]に準拠していなければなりません。
 
diff --git a/lib/plugins/config/lang/ja/intro.txt b/lib/plugins/config/lang/ja/intro.txt
index 6a1f956cb..4d98dd3ed 100644
--- a/lib/plugins/config/lang/ja/intro.txt
+++ b/lib/plugins/config/lang/ja/intro.txt
@@ -1,7 +1,11 @@
 ====== 設定管理 ======
 
-この画面で、Dokuwikiの設定を管理することが出来ます。 個々の設定に関しては [[doku>config]] を参照してください。 このプラグインに関する詳細な情報は [[doku>plugin:config]] を参照してください。
+この画面で、Dokuwikiの設定を管理することが出来ます。
+個々の設定に関しては[[doku>ja:config|DokuWiki の設定]]を参照してください。
+このプラグインに関する詳細な情報は[[doku>ja:plugin:config|設定管理プラグイン]]を参照してください。
 
-背景が薄い赤になっている場合、その設定は変更することが出来ません。 背景が青の値はデフォルト、背景が白の値は現在の設定となっており、 どちらの値も変更が可能です。
+背景が薄い赤の場合、その設定は変更することが出来ません。
+背景が青の場合はデフォルト設定、背景が白の場合はサイト固有の設定になっており、どちら設定も変更が可能です。
 
-設定の変更後は必ず **保存** ボタンを押して変更を確定してください。 ボタンを押さなかった場合、変更は破棄されます。
+設定の変更後は必ず **保存** ボタンを押して変更を確定してください。
+ボタンを押さなかった場合、変更は破棄されます。
-- 
cgit v1.2.3


From a4fb25f78eda9f7ef1442a800ed0956a9a4e4101 Mon Sep 17 00:00:00 2001
From: hung nguyen <bancuamoinguoi999@gmail.com>
Date: Thu, 30 Jul 2015 03:05:29 +0200
Subject: translation update

---
 inc/lang/vi/lang.php                   | 6 +++---
 lib/plugins/authplain/lang/vi/lang.php | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 944a9e5d6..f135da9e9 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -45,6 +45,8 @@ $lang['btn_revert']            = 'Phục hồi';
 $lang['btn_register']          = 'Đăng ký';
 $lang['btn_apply']             = 'Chấp nhận';
 $lang['btn_media']             = 'Quản lý tệp tin';
+$lang['btn_img_backto']        = 'Quay lại %s';
+$lang['btn_mediaManager']      = 'Xem trong trình quản lý tệp media';
 $lang['loggedinas']            = 'Username đang dùng:';
 $lang['user']                  = 'Username';
 $lang['pass']                  = 'Mật khẩu';
@@ -59,7 +61,7 @@ $lang['badlogin']              = 'Username hoặc password không đúng.';
 $lang['minoredit']             = 'Minor Changes';
 $lang['draftdate']             = 'Bản nháp được tự động lưu lúc';
 $lang['nosecedit']             = 'Các trang web đã được thay đổi trong khi chờ đợi, phần thông tin quá hạn đã được thay thế bằng trang đầy đủ.';
-$lang['searchcreatepage']      = "Nếu bạn không thấy được những gì bạn đang tìm, bạn có thể tạo một trang mới bằng cách bấm vào nút ''Biên soạn trang này'', khi đó bạn sẽ có 1 trang mới với tên trang chính là tuwfw khóa bạn đã tìm kiếm.";
+$lang['searchcreatepage']      = 'Nếu bạn không thấy được những gì bạn đang tìm, bạn có thể tạo một trang mới bằng cách bấm vào nút \'\'Biên soạn trang này\'\', khi đó bạn sẽ có 1 trang mới với tên trang chính là tuwfw khóa bạn đã tìm kiếm.';
 $lang['regmissing']            = 'Bạn cần điền vào tất cả các trường';
 $lang['reguexists']            = 'Bạn khác đã dùng username này rồi.';
 $lang['regsuccess']            = 'Đã tạo username, và đã gởi password.';
@@ -192,7 +194,6 @@ $lang['qb_sig']                = 'Đặt chữ ký';
 $lang['metaedit']              = 'Sửa Metadata';
 $lang['metasaveerr']           = 'Thất bại khi viết metadata';
 $lang['metasaveok']            = 'Metadata đã được lưu';
-$lang['btn_img_backto']            = 'Quay lại %s';
 $lang['img_title']             = 'Tiêu đề:';
 $lang['img_caption']           = 'Ghi chú:';
 $lang['img_date']              = 'Ngày:';
@@ -205,7 +206,6 @@ $lang['img_camera']            = 'Camera:';
 $lang['img_keywords']          = 'Từ khóa:';
 $lang['img_width']             = 'Rộng:';
 $lang['img_height']            = 'Cao:';
-$lang['btn_mediaManager']           = 'Xem trong trình quản lý tệp media';
 $lang['i_chooselang']          = 'Chọn ngôn ngữ';
 $lang['i_retry']               = 'Thử lại';
 $lang['years']                 = 'cách đây %d năm';
diff --git a/lib/plugins/authplain/lang/vi/lang.php b/lib/plugins/authplain/lang/vi/lang.php
index 7ecb0a27c..f384949b7 100644
--- a/lib/plugins/authplain/lang/vi/lang.php
+++ b/lib/plugins/authplain/lang/vi/lang.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  */
-$lang['userexists']     = 'Bạn khác đã dùng username này rồi.';
+$lang['userexists']            = 'Bạn khác đã dùng username này rồi.';
-- 
cgit v1.2.3


From 919911b2413fcaaf52e457fce20b44c0d5869730 Mon Sep 17 00:00:00 2001
From: Hugo Smet <hugo.smet@scarlet.be>
Date: Thu, 30 Jul 2015 10:11:08 +0200
Subject: translation update

---
 inc/lang/nl/lang.php                   |  6 +++++-
 lib/plugins/authad/lang/nl/lang.php    |  3 +++
 lib/plugins/authldap/lang/nl/lang.php  |  9 +++++++++
 lib/plugins/authmysql/lang/nl/lang.php | 11 +++++++++++
 lib/plugins/authplain/lang/nl/lang.php |  8 ++++++--
 lib/plugins/config/lang/nl/lang.php    |  7 +++++--
 6 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/nl/lang.php
 create mode 100644 lib/plugins/authmysql/lang/nl/lang.php

diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 496144a27..dd390d219 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author François Kooman <fkooman.tuxed.net>
  * @author Jack van Klaren <dokuwiki@afentoe.xs4all.nl>
  * @author Riny Heijdendael <riny@heijdendael.nl>
@@ -26,6 +26,7 @@
  * @author Johan Vervloet <johan.vervloet@gmail.com>
  * @author Mijndert <mijndert@mijndertstuij.nl>
  * @author Johan Wijnker <johan@wijnker.eu>
+ * @author Hugo Smet <hugo.smet@scarlet.be>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -91,6 +92,7 @@ $lang['regmissing']            = 'Vul alle velden in';
 $lang['reguexists']            = 'Er bestaat al een gebruiker met deze loginnaam.';
 $lang['regsuccess']            = 'De gebruiker is aangemaakt. Het wachtwoord is per e-mail verzonden.';
 $lang['regsuccess2']           = 'De gebruiker is aangemaakt.';
+$lang['regfail']               = 'Gebruiker kon niet aangemaakt worden.';
 $lang['regmailfail']           = 'Het lijkt erop dat het sturen van de wachtwoordmail mislukt is. Neem contact op met de beheerder!';
 $lang['regbadmail']            = 'Het opgegeven e-mailadres lijkt ongeldig - als je denkt dat dit niet klopt neem dan contact op met de beheerder.';
 $lang['regbadpass']            = 'De twee ingevoerde wachtwoorden zijn niet identiek. Probeer het nog eens.';
@@ -105,6 +107,7 @@ $lang['profdeleteuser']        = 'Verwijder gebruiker';
 $lang['profdeleted']           = 'Uw gebruikersaccount is verwijderd van deze wiki';
 $lang['profconfdelete']        = 'Ik wil mijn gebruikersaccount verwijderen van deze wiki. <br/> Deze actie kan niet ongedaan gemaakt worden.';
 $lang['profconfdeletemissing'] = 'Bevestigingsvinkje niet gezet';
+$lang['proffail']              = 'Gebruikersprofiel werd niet bijgewerkt.';
 $lang['pwdforget']             = 'Je wachtwoord vergeten? Vraag een nieuw wachtwoord aan';
 $lang['resendna']              = 'Deze wiki ondersteunt het verzenden van wachtwoorden niet';
 $lang['resendpwd']             = 'Nieuw wachtwoord bepalen voor';
@@ -350,6 +353,7 @@ $lang['media_perm_read']       = 'Sorry, u heeft niet voldoende rechten om besta
 $lang['media_perm_upload']     = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.';
 $lang['media_update']          = 'Upload nieuwe versie';
 $lang['media_restore']         = 'Deze versie terugzetten';
+$lang['media_acl_warning']     = 'De lijst is mogelijk niet compleet door ACL beperkingen en verborgen pagina\'s.';
 $lang['currentns']             = 'Huidige namespace';
 $lang['searchresult']          = 'Zoekresultaat';
 $lang['plainhtml']             = 'Alleen HTML';
diff --git a/lib/plugins/authad/lang/nl/lang.php b/lib/plugins/authad/lang/nl/lang.php
index bd241a0a9..341a4036e 100644
--- a/lib/plugins/authad/lang/nl/lang.php
+++ b/lib/plugins/authad/lang/nl/lang.php
@@ -5,6 +5,9 @@
  * 
  * @author Rene <wllywlnt@yahoo.com>
  * @author Dion Nicolaas <dion@nicolaas.net>
+ * @author Hugo Smet <hugo.smet@scarlet.be>
  */
 $lang['domain']                = 'Inlog Domein';
 $lang['authpwdexpire']         = 'Je wachtwoord verloopt in %d dagen, je moet het binnenkort veranderen';
+$lang['passchangefail']        = 'Wijziging van het paswoord is mislukt. Wellicht beantwoord het paswoord niet aan de voorwaarden. ';
+$lang['connectfail']           = 'Connectie met Active Directory server mislukt.';
diff --git a/lib/plugins/authldap/lang/nl/lang.php b/lib/plugins/authldap/lang/nl/lang.php
new file mode 100644
index 000000000..7cbec9baa
--- /dev/null
+++ b/lib/plugins/authldap/lang/nl/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hugo Smet <hugo.smet@scarlet.be>
+ */
+$lang['connectfail']           = 'LDAP kan niet connecteren: %s';
+$lang['domainfail']            = 'LDAP kan je gebruikers dn niet vinden';
diff --git a/lib/plugins/authmysql/lang/nl/lang.php b/lib/plugins/authmysql/lang/nl/lang.php
new file mode 100644
index 000000000..9a8cf3114
--- /dev/null
+++ b/lib/plugins/authmysql/lang/nl/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Hugo Smet <hugo.smet@scarlet.be>
+ */
+$lang['connectfail']           = 'Connectie met de database mislukt.';
+$lang['userexists']            = 'Sorry, een gebruiker met deze login bestaat reeds.';
+$lang['usernotexists']         = 'Sorry, deze gebruiker bestaat niet.';
+$lang['writefail']             = 'Onmogelijk om de gebruikers data te wijzigen. Gelieve de Wiki-Admin te informeren.';
diff --git a/lib/plugins/authplain/lang/nl/lang.php b/lib/plugins/authplain/lang/nl/lang.php
index 1a5397234..56ba2ab90 100644
--- a/lib/plugins/authplain/lang/nl/lang.php
+++ b/lib/plugins/authplain/lang/nl/lang.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Hugo Smet <hugo.smet@scarlet.be>
  */
-$lang['userexists']     = 'Er bestaat al een gebruiker met deze loginnaam.';
+$lang['userexists']            = 'Er bestaat al een gebruiker met deze loginnaam.';
+$lang['usernotexists']         = 'Sorry, deze gebruiker bestaat niet.';
+$lang['writefail']             = 'Onmogelijk om de gebruikers data te wijzigen. Gelieve de Wiki-Admin te informeren.';
diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index 14c8f9b1e..3761ce839 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * dutch language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Pieter van der Meulen <pieter@vdmeulen.net>
  * @author Wouter Schoot <wouter@schoot.org>
  * @author John de Graaff <john@de-graaff.net>
@@ -16,6 +16,7 @@
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
  * @author Gerrit <klapinklapin@gmail.com>
+ * @author Hugo Smet <hugo.smet@scarlet.be>
  */
 $lang['menu']                  = 'Configuratie-instellingen';
 $lang['error']                 = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.<br />Je kunt de incorrecte waarde(s) herkennen aan de rode rand.';
@@ -89,6 +90,7 @@ $lang['disableactions']        = 'Aangevinkte DokuWiki-akties uitschakelen';
 $lang['disableactions_check']  = 'Controleer';
 $lang['disableactions_subscription'] = 'Inschrijven/opzeggen';
 $lang['disableactions_wikicode'] = 'Bron bekijken/exporteer rauw';
+$lang['disableactions_profile_delete'] = 'Schrap eigen account';
 $lang['disableactions_other']  = 'Andere akties (gescheiden door komma\'s)';
 $lang['auth_security_timeout'] = 'Authenticatiebeveiligings-timeout (seconden)';
 $lang['securecookie']          = 'Moeten cookies die via HTTPS gezet zijn alleen via HTTPS verzonden worden door de browser? Zet deze optie uit als alleen het inloggen op de wiki beveiligd is, maar het gebruik verder niet.';
@@ -194,6 +196,7 @@ $lang['xsendfile_o_2']         = 'Standaard X-Sendfile header';
 $lang['xsendfile_o_3']         = 'Merkgebonden Nginx X-Accel-Redirect header';
 $lang['showuseras_o_loginname'] = 'Loginnaam';
 $lang['showuseras_o_username'] = 'Volledige naam';
+$lang['showuseras_o_username_link'] = 'Gebruikers volledige naam als interwiki gebruikers link';
 $lang['showuseras_o_email']    = 'E-mailadres (onherkenbaar gemaakt volgens mailguard-instelling)';
 $lang['showuseras_o_email_link'] = 'E-mailadres als mailto: link';
 $lang['useheading_o_0']        = 'Nooit';
-- 
cgit v1.2.3


From 6d47ad6be813e87dc731b9eb0348508dd9cab941 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 30 Jul 2015 13:45:23 +0200
Subject: Revert "Translation update (vi)"

---
 inc/lang/vi/lang.php                   | 6 +++---
 lib/plugins/authplain/lang/vi/lang.php | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index f135da9e9..944a9e5d6 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -45,8 +45,6 @@ $lang['btn_revert']            = 'Phục hồi';
 $lang['btn_register']          = 'Đăng ký';
 $lang['btn_apply']             = 'Chấp nhận';
 $lang['btn_media']             = 'Quản lý tệp tin';
-$lang['btn_img_backto']        = 'Quay lại %s';
-$lang['btn_mediaManager']      = 'Xem trong trình quản lý tệp media';
 $lang['loggedinas']            = 'Username đang dùng:';
 $lang['user']                  = 'Username';
 $lang['pass']                  = 'Mật khẩu';
@@ -61,7 +59,7 @@ $lang['badlogin']              = 'Username hoặc password không đúng.';
 $lang['minoredit']             = 'Minor Changes';
 $lang['draftdate']             = 'Bản nháp được tự động lưu lúc';
 $lang['nosecedit']             = 'Các trang web đã được thay đổi trong khi chờ đợi, phần thông tin quá hạn đã được thay thế bằng trang đầy đủ.';
-$lang['searchcreatepage']      = 'Nếu bạn không thấy được những gì bạn đang tìm, bạn có thể tạo một trang mới bằng cách bấm vào nút \'\'Biên soạn trang này\'\', khi đó bạn sẽ có 1 trang mới với tên trang chính là tuwfw khóa bạn đã tìm kiếm.';
+$lang['searchcreatepage']      = "Nếu bạn không thấy được những gì bạn đang tìm, bạn có thể tạo một trang mới bằng cách bấm vào nút ''Biên soạn trang này'', khi đó bạn sẽ có 1 trang mới với tên trang chính là tuwfw khóa bạn đã tìm kiếm.";
 $lang['regmissing']            = 'Bạn cần điền vào tất cả các trường';
 $lang['reguexists']            = 'Bạn khác đã dùng username này rồi.';
 $lang['regsuccess']            = 'Đã tạo username, và đã gởi password.';
@@ -194,6 +192,7 @@ $lang['qb_sig']                = 'Đặt chữ ký';
 $lang['metaedit']              = 'Sửa Metadata';
 $lang['metasaveerr']           = 'Thất bại khi viết metadata';
 $lang['metasaveok']            = 'Metadata đã được lưu';
+$lang['btn_img_backto']            = 'Quay lại %s';
 $lang['img_title']             = 'Tiêu đề:';
 $lang['img_caption']           = 'Ghi chú:';
 $lang['img_date']              = 'Ngày:';
@@ -206,6 +205,7 @@ $lang['img_camera']            = 'Camera:';
 $lang['img_keywords']          = 'Từ khóa:';
 $lang['img_width']             = 'Rộng:';
 $lang['img_height']            = 'Cao:';
+$lang['btn_mediaManager']           = 'Xem trong trình quản lý tệp media';
 $lang['i_chooselang']          = 'Chọn ngôn ngữ';
 $lang['i_retry']               = 'Thử lại';
 $lang['years']                 = 'cách đây %d năm';
diff --git a/lib/plugins/authplain/lang/vi/lang.php b/lib/plugins/authplain/lang/vi/lang.php
index f384949b7..7ecb0a27c 100644
--- a/lib/plugins/authplain/lang/vi/lang.php
+++ b/lib/plugins/authplain/lang/vi/lang.php
@@ -1,7 +1,6 @@
 <?php
-
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  */
-$lang['userexists']            = 'Bạn khác đã dùng username này rồi.';
+$lang['userexists']     = 'Bạn khác đã dùng username này rồi.';
-- 
cgit v1.2.3


From 8ab6e08b627efa216ca668750b34e45faf88cf25 Mon Sep 17 00:00:00 2001
From: Paulo Carmino <contato@paulocarmino.com>
Date: Thu, 30 Jul 2015 14:51:33 +0200
Subject: translation update

---
 inc/lang/pt/lang.php                      |   5 +-
 lib/plugins/authad/lang/pt/lang.php       |   3 +
 lib/plugins/authad/lang/pt/settings.php   |   2 +-
 lib/plugins/authldap/lang/pt/lang.php     |   9 +++
 lib/plugins/authldap/lang/pt/settings.php |   2 +
 lib/plugins/authmysql/lang/pt/lang.php    |  10 +++
 lib/plugins/authplain/lang/pt/lang.php    |   7 ++-
 lib/plugins/config/lang/pt/lang.php       | 100 ++++++++++++++++--------------
 lib/plugins/extension/lang/pt/lang.php    |   4 +-
 lib/plugins/usermanager/lang/pt/lang.php  |   1 +
 10 files changed, 90 insertions(+), 53 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/pt/lang.php
 create mode 100644 lib/plugins/authmysql/lang/pt/lang.php

diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 1603e7cec..c45d52295 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
@@ -13,6 +13,7 @@
  * @author Paulo Silva <paulotsilva@yahoo.com>
  * @author Guido Salatino <guidorafael23@gmail.com>
  * @author Romulo Pereira <romuloccomp@gmail.com>
+ * @author Paulo Carmino <contato@paulocarmino.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -78,6 +79,7 @@ $lang['regmissing']            = 'Por favor, preencha todos os campos.';
 $lang['reguexists']            = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
 $lang['regsuccess']            = 'O utilizador foi criado e a senha foi enviada para o endereço de correio electrónico usado na inscrição.';
 $lang['regsuccess2']           = 'O utilizador foi criado.';
+$lang['regfail']               = 'O usuário não pode ser criado.';
 $lang['regmailfail']           = 'Houve um erro no envio da senha por e-mail. Por favor, contacte o administrador!';
 $lang['regbadmail']            = 'O endereço de correio electrónico é inválido. Se o endereço está correcto, e isto é um erro, por favor, contacte o administrador!';
 $lang['regbadpass']            = 'As duas senhas não são idênticas, por favor tente de novo.';
@@ -92,6 +94,7 @@ $lang['profdeleteuser']        = 'Apagar Conta';
 $lang['profdeleted']           = 'A sua conta de utilizador foi removida desta wiki';
 $lang['profconfdelete']        = 'Quero remover a minha conta desta wiki. <br/> Esta acção não pode ser anulada.';
 $lang['profconfdeletemissing'] = 'A caixa de confirmação não foi marcada';
+$lang['proffail']              = 'O perfil do usuário não foi atualizado.';
 $lang['pwdforget']             = 'Esqueceu a sua senha? Pedir nova senha';
 $lang['resendna']              = 'Este wiki não suporta reenvio de senhas.';
 $lang['resendpwd']             = 'Definir nova senha para';
diff --git a/lib/plugins/authad/lang/pt/lang.php b/lib/plugins/authad/lang/pt/lang.php
index 919534231..450e3a137 100644
--- a/lib/plugins/authad/lang/pt/lang.php
+++ b/lib/plugins/authad/lang/pt/lang.php
@@ -5,6 +5,9 @@
  * 
  * @author Paulo Silva <paulotsilva@yahoo.com>
  * @author André Neves <drakferion@gmail.com>
+ * @author Paulo Carmino <contato@paulocarmino.com>
  */
 $lang['domain']                = 'Domínio de Início de Sessão';
 $lang['authpwdexpire']         = 'A sua senha expirará dentro de %d dias, deve mudá-la em breve.';
+$lang['passchangefail']        = 'Falha ao alterar a senha. Tente prosseguir com uma senha mais segura.';
+$lang['connectfail']           = 'Falha ao conectar com o servidor Active Directory.';
diff --git a/lib/plugins/authad/lang/pt/settings.php b/lib/plugins/authad/lang/pt/settings.php
index c5756890d..dc6741b2a 100644
--- a/lib/plugins/authad/lang/pt/settings.php
+++ b/lib/plugins/authad/lang/pt/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author André Neves <drakferion@gmail.com>
  * @author Murilo <muriloricci@hotmail.com>
  * @author Paulo Silva <paulotsilva@yahoo.com>
diff --git a/lib/plugins/authldap/lang/pt/lang.php b/lib/plugins/authldap/lang/pt/lang.php
new file mode 100644
index 000000000..cd782f4b4
--- /dev/null
+++ b/lib/plugins/authldap/lang/pt/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Paulo Carmino <contato@paulocarmino.com>
+ */
+$lang['connectfail']           = 'Não foi possível conectar o LDAP: %s';
+$lang['domainfail']            = 'O LDAP não encontrou seu usuário';
diff --git a/lib/plugins/authldap/lang/pt/settings.php b/lib/plugins/authldap/lang/pt/settings.php
index d9d1b7f11..4d4ed2d85 100644
--- a/lib/plugins/authldap/lang/pt/settings.php
+++ b/lib/plugins/authldap/lang/pt/settings.php
@@ -6,6 +6,7 @@
  * @author André Neves <drakferion@gmail.com>
  * @author Guido Salatino <guidorafael23@gmail.com>
  * @author Romulo Pereira <romuloccomp@gmail.com>
+ * @author Paulo Carmino <contato@paulocarmino.com>
  */
 $lang['server']                = 'O seu servidor de LDAP. Ou hostname (<code>localhost</code>) ou URL qualificado completo (<code>ldap://servidor.tld:389</code>)';
 $lang['port']                  = 'Porta de servidor de LDAP se o URL completo não foi fornecido acima';
@@ -22,6 +23,7 @@ $lang['bindpw']                = 'Senha do utilizador acima';
 $lang['userscope']             = 'Escopo de pesquisa Limite para pesquisa de usuário';
 $lang['groupscope']            = 'Escopo de pesquisa Limite para pesquisa de grupo';
 $lang['groupkey']              = 'A participação no grupo a partir de qualquer atributo de usuário (em vez de AD padrão de grupos) exemplo: grupo de departamento ou número de telefone';
+$lang['modPass']               = 'Sua senha LDAP pode ser alterada via dokuwiki?';
 $lang['debug']                 = 'Mostrar informação adicional de debug aquando de erros';
 $lang['deref_o_0']             = 'LDAP_DEREF_NUNCA';
 $lang['deref_o_1']             = 'LDAP_DEREF_PESQUISANDO';
diff --git a/lib/plugins/authmysql/lang/pt/lang.php b/lib/plugins/authmysql/lang/pt/lang.php
new file mode 100644
index 000000000..754a552f8
--- /dev/null
+++ b/lib/plugins/authmysql/lang/pt/lang.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Paulo Carmino <contato@paulocarmino.com>
+ */
+$lang['connectfail']           = 'Falha ao conectar com o banco de dados.';
+$lang['userexists']            = 'Desculpe, esse login já está sendo usado.';
+$lang['usernotexists']         = 'Desculpe, esse login não existe.';
diff --git a/lib/plugins/authplain/lang/pt/lang.php b/lib/plugins/authplain/lang/pt/lang.php
index c49649d4e..26d4180c5 100644
--- a/lib/plugins/authplain/lang/pt/lang.php
+++ b/lib/plugins/authplain/lang/pt/lang.php
@@ -1,6 +1,9 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Paulo Carmino <contato@paulocarmino.com>
  */
-$lang['userexists']     = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
+$lang['userexists']            = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
+$lang['usernotexists']         = 'Desculpe, esse login não existe.';
diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php
index 7a9111c62..c95349265 100644
--- a/lib/plugins/config/lang/pt/lang.php
+++ b/lib/plugins/config/lang/pt/lang.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
- * Portugueselanguage file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Fil <fil@meteopt.com>
  * @author André Neves <drakferion@gmail.com>
  * @author José Campos zecarlosdecampos@gmail.com
+ * @author Paulo Carmino <contato@paulocarmino.com>
  */
 $lang['menu']                  = 'Configuração';
 $lang['error']                 = 'Parâmetros de Configuração não actualizados devido a valores inválidos. Por favor, reveja as modificações que pretende efectuar antes de re-submetê-las.<br /> Os valores incorrectos serão mostrados dentro de uma "moldura" vermelha.';
@@ -29,30 +31,32 @@ $lang['_anti_spam']            = 'Configuração Anti-Spam';
 $lang['_editing']              = 'Configuração de Edição';
 $lang['_links']                = 'Configuração de Ligações';
 $lang['_media']                = 'Configuração de Media';
+$lang['_notifications']        = 'Notificação';
 $lang['_advanced']             = 'Configurações Avançadas';
 $lang['_network']              = 'Configuração de Rede';
 $lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.';
 $lang['_msg_setting_no_class'] = 'Nenhuma classe definida.';
 $lang['_msg_setting_no_default'] = 'Sem valor por omissão.';
-$lang['fmode']                 = 'Modo de criação de ficheiros.';
-$lang['dmode']                 = 'Modo de criação de pastas.';
-$lang['lang']                  = 'Idioma';
-$lang['basedir']               = 'Pasta Base';
-$lang['baseurl']               = 'URL Base';
-$lang['savedir']               = 'Pasta para guardar dados';
-$lang['start']                 = 'Nome da Página Inicial';
 $lang['title']                 = 'Título deste Wiki';
+$lang['start']                 = 'Nome da Página Inicial';
+$lang['lang']                  = 'Idioma';
 $lang['template']              = 'Template';
 $lang['license']               = 'Sob que licença o seu conteúdo deverá ser disponibilizado?';
-$lang['fullpath']              = 'Revelar caminho completo no rodapé';
+$lang['savedir']               = 'Pasta para guardar dados';
+$lang['basedir']               = 'Pasta Base';
+$lang['baseurl']               = 'URL Base';
+$lang['dmode']                 = 'Modo de criação de pastas.';
+$lang['fmode']                 = 'Modo de criação de ficheiros.';
+$lang['allowdebug']            = 'Permitir depuração <b>desabilite se não for necessário!</b>';
 $lang['recent']                = 'Alterações recentes';
+$lang['recent_days']           = 'Quantas mudanças recentes devem ser mantidas? (dias)';
 $lang['breadcrumbs']           = 'Número máximo de breadcrumbs';
 $lang['youarehere']            = 'Breadcrumbs hierárquicas';
+$lang['fullpath']              = 'Revelar caminho completo no rodapé';
 $lang['typography']            = 'Executar substituições tipográficas';
-$lang['htmlok']                = 'Permitir embeber HTML';
-$lang['phpok']                 = 'Permitir embeber PHP';
 $lang['dformat']               = 'Formato de Data (ver função PHP\'s <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Assinatura';
+$lang['showuseras']            = 'O que exibir quando mostrar o utilizador que editou a página pela última vez';
 $lang['toptoclevel']           = 'Nível de topo para a tabela de conteúdo';
 $lang['tocminheads']           = 'Quantidade mínima de cabeçalhos para a construção da tabela de conteúdos.';
 $lang['maxtoclevel']           = 'Máximo nível para a tabela de conteúdo';
@@ -60,14 +64,8 @@ $lang['maxseclevel']           = 'Máximo nível para editar secção';
 $lang['camelcase']             = 'Usar CamelCase';
 $lang['deaccent']              = 'Nomes das páginas sem acentos';
 $lang['useheading']            = 'Usar o primeiro cabeçalho para o nome da página';
-$lang['refcheck']              = 'Verificação de referência da media';
-$lang['allowdebug']            = 'Permitir depuração <b>desabilite se não for necessário!</b>';
-$lang['usewordblock']          = 'Bloquear spam baseado em lista de palavras (wordlist)';
-$lang['indexdelay']            = 'Tempo de espera antes da indexação (seg)';
-$lang['relnofollow']           = 'Usar rel="nofollow" em links externos';
-$lang['mailguard']             = 'Obscurecer endereços de email';
-$lang['iexssprotect']          = 'Verificar os arquivos enviados contra possíveis códigos maliciosos em HTML ou JavaScript';
-$lang['showuseras']            = 'O que exibir quando mostrar o utilizador que editou a página pela última vez';
+$lang['sneaky_index']          = 'Por norma, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles em que o utilizador não tenha permissão de leitura. Isto pode resultar na omissão de sub-ramos acessíveis, que poderá tornar o índice inútil para certas configurações de ACL.';
+$lang['hidepages']             = 'Esconder páginas correspondentes (expressões regulares)';
 $lang['useacl']                = 'Usar ACL - Listas de Controlo de Acessos';
 $lang['autopasswd']            = 'Auto-gerar senhas';
 $lang['authtype']              = 'Método de autenticação';
@@ -76,58 +74,64 @@ $lang['defaultgroup']          = 'Grupo por omissão';
 $lang['superuser']             = 'Superutilizador - um grupo, utilizador ou uma lista separada por vírgulas usuário1,@grupo1,usuário2 que tem acesso completo a todas as páginas e funções, independente das definições da ACL';
 $lang['manager']               = 'Gestor - um grupo, utilizador ou uma lista separada por vírgulas usuário1,@grupo1,usuário2 que tem acesso a certas funções de gestão';
 $lang['profileconfirm']        = 'Confirmar mudanças no perfil com a senha';
+$lang['rememberme']            = 'Permitir cookies de autenticação permanentes (Memorizar?)';
 $lang['disableactions']        = 'Desactivar acções DokuWiki';
 $lang['disableactions_check']  = 'Checar';
 $lang['disableactions_subscription'] = 'Subscrever/Não Subscrver';
 $lang['disableactions_wikicode'] = 'Ver fonte/Exportar em bruto';
+$lang['disableactions_profile_delete'] = 'Deletar Sua Conta.';
 $lang['disableactions_other']  = 'Outras acções (separadas por vírgula)';
-$lang['sneaky_index']          = 'Por norma, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles em que o utilizador não tenha permissão de leitura. Isto pode resultar na omissão de sub-ramos acessíveis, que poderá tornar o índice inútil para certas configurações de ACL.';
 $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)';
 $lang['securecookie']          = 'Os cookies definidos via HTTPS deverão ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação de maneira insegura.';
+$lang['usewordblock']          = 'Bloquear spam baseado em lista de palavras (wordlist)';
+$lang['relnofollow']           = 'Usar rel="nofollow" em links externos';
+$lang['indexdelay']            = 'Tempo de espera antes da indexação (seg)';
+$lang['mailguard']             = 'Obscurecer endereços de email';
+$lang['iexssprotect']          = 'Verificar os arquivos enviados contra possíveis códigos maliciosos em HTML ou JavaScript';
+$lang['usedraft']              = 'Guardar o rascunho automaticamente durante a edição';
+$lang['htmlok']                = 'Permitir embeber HTML';
+$lang['phpok']                 = 'Permitir embeber PHP';
+$lang['locktime']              = 'Idade máxima para locks (seg.)';
+$lang['cachetime']             = 'Idade máxima para cache (seg.)';
+$lang['target____wiki']        = 'Parâmetro "target" para links internos';
+$lang['target____interwiki']   = 'Parâmetro "target" para links entre wikis';
+$lang['target____extern']      = 'Parâmetro "target" para links externos';
+$lang['target____media']       = 'Parâmetro "target" para links de media';
+$lang['target____windows']     = 'Parâmetro "target" para links do Windows';
+$lang['refcheck']              = 'Verificação de referência da media';
+$lang['gdlib']                 = 'Versão GD Lib';
+$lang['im_convert']            = 'Caminho para a ferramenta "convert" do ImageMagick';
+$lang['jpg_quality']           = 'Compressão/Qualidade JPG (0-100)';
+$lang['fetchsize']             = 'Tamanho máximo (bytes) que o fetch.php pode transferir do exterior';
+$lang['subscribers']           = 'Habilitar o suporte a subscrição de páginas ';
+$lang['subscribe_time']        = 'Tempo após o qual as listas de subscrição e "digests" são enviados (seg.); Isto deve ser inferior ao tempo especificado em recent_days.';
+$lang['notify']                = 'Enviar notificações de mudanças para este endereço de email';
+$lang['registernotify']        = 'Enviar informações de utilizadores registados para este endereço de email';
+$lang['mailfrom']              = 'Endereço de email a ser utilizado para mensagens automáticas';
+$lang['mailprefix']            = 'Prefixo de email a ser utilizado para mensagens automáticas';
+$lang['sitemap']               = 'Gerar Sitemap Google (dias)';
+$lang['rss_type']              = 'Tipo de feed XML';
+$lang['rss_linkto']            = 'Links de feed XML ara';
+$lang['rss_content']           = 'O que deve ser exibido nos itens do alimentador XML?';
+$lang['rss_update']            = 'Intervalo de actualização do alimentador XML (seg)';
+$lang['rss_show_summary']      = 'Resumo de exibição do alimentador XML no título';
 $lang['updatecheck']           = 'Verificar por actualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efectuar esta verificação.';
 $lang['userewrite']            = 'Usar URLs SEO';
 $lang['useslash']              = 'Usar a barra como separador de espaços de nomes nas URLs';
-$lang['usedraft']              = 'Guardar o rascunho automaticamente durante a edição';
 $lang['sepchar']               = 'Separador de palavras no nome da página';
 $lang['canonical']             = 'Usar URLs absolutas (http://servidor/caminho)';
 $lang['fnencode']              = 'Método de codificar nomes de ficheiro não-ASCII.';
 $lang['autoplural']            = 'Verificar formas plurais nos links';
 $lang['compression']           = 'Método de compressão para histórico';
-$lang['cachetime']             = 'Idade máxima para cache (seg.)';
-$lang['locktime']              = 'Idade máxima para locks (seg.)';
-$lang['fetchsize']             = 'Tamanho máximo (bytes) que o fetch.php pode transferir do exterior';
-$lang['notify']                = 'Enviar notificações de mudanças para este endereço de email';
-$lang['registernotify']        = 'Enviar informações de utilizadores registados para este endereço de email';
-$lang['mailfrom']              = 'Endereço de email a ser utilizado para mensagens automáticas';
-$lang['mailprefix']            = 'Prefixo de email a ser utilizado para mensagens automáticas';
 $lang['gzip_output']           = 'Usar "Content-Encoding" do gzip para o código xhtml';
-$lang['gdlib']                 = 'Versão GD Lib';
-$lang['im_convert']            = 'Caminho para a ferramenta "convert" do ImageMagick';
-$lang['jpg_quality']           = 'Compressão/Qualidade JPG (0-100)';
-$lang['subscribers']           = 'Habilitar o suporte a subscrição de páginas ';
-$lang['subscribe_time']        = 'Tempo após o qual as listas de subscrição e "digests" são enviados (seg.); Isto deve ser inferior ao tempo especificado em recent_days.';
 $lang['compress']              = 'Compactar as saídas de CSS e JavaScript';
 $lang['cssdatauri']            = 'Tamanho em bytes até ao qual as imagens referenciadas em ficheiros CSS devem ser embutidas diretamente no CSS para reduzir a carga de pedidos HTTP extra. Esta técnica não funciona em IE 7 e abaixo! <code>400</code> a <code>600</code> bytes é um bom valor. Escolher <code>0</code> para desativar.';
-$lang['hidepages']             = 'Esconder páginas correspondentes (expressões regulares)';
 $lang['send404']               = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes';
-$lang['sitemap']               = 'Gerar Sitemap Google (dias)';
 $lang['broken_iua']            = 'A função "ignore_user_abort" não está a funcionar no seu sistema? Isso pode causar um índice de busca defeituoso. Sistemas com IIS+PHP/CGI são conhecidos por possuírem este problema. Veja o <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">bug 852</a> para mais informações.';
 $lang['xsendfile']             = 'Usar o cabeçalho "X-Sendfile" para permitir o servidor de internet encaminhar ficheiros estáticos? O seu servidor de internet precisa ter suporte a isso.';
 $lang['renderer_xhtml']        = 'Renderizador a ser utilizado para a saída principal do wiki (xhtml)';
 $lang['renderer__core']        = '%s (núcleo dokuwiki)';
 $lang['renderer__plugin']      = '%s (plugin)';
-$lang['rememberme']            = 'Permitir cookies de autenticação permanentes (Memorizar?)';
-$lang['rss_type']              = 'Tipo de feed XML';
-$lang['rss_linkto']            = 'Links de feed XML ara';
-$lang['rss_content']           = 'O que deve ser exibido nos itens do alimentador XML?';
-$lang['rss_update']            = 'Intervalo de actualização do alimentador XML (seg)';
-$lang['recent_days']           = 'Quantas mudanças recentes devem ser mantidas? (dias)';
-$lang['rss_show_summary']      = 'Resumo de exibição do alimentador XML no título';
-$lang['target____wiki']        = 'Parâmetro "target" para links internos';
-$lang['target____interwiki']   = 'Parâmetro "target" para links entre wikis';
-$lang['target____extern']      = 'Parâmetro "target" para links externos';
-$lang['target____media']       = 'Parâmetro "target" para links de media';
-$lang['target____windows']     = 'Parâmetro "target" para links do Windows';
 $lang['proxy____host']         = 'Nome do servidor proxy';
 $lang['proxy____port']         = 'Porta de Proxy';
 $lang['proxy____user']         = 'Nome de utilizador Proxy';
diff --git a/lib/plugins/extension/lang/pt/lang.php b/lib/plugins/extension/lang/pt/lang.php
index e8c8a7d55..1a36b4ede 100644
--- a/lib/plugins/extension/lang/pt/lang.php
+++ b/lib/plugins/extension/lang/pt/lang.php
@@ -2,9 +2,10 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Guido Salatino <guidorafael23@gmail.com>
  * @author Romulo Pereira <romuloccomp@gmail.com>
+ * @author Paulo Carmino <contato@paulocarmino.com>
  */
 $lang['menu']                  = 'Gerenciador de Extensões';
 $lang['tab_plugins']           = 'Plugins Instalados';
@@ -26,6 +27,7 @@ $lang['btn_disable']           = 'Desabilitar';
 $lang['btn_install']           = 'Instalar';
 $lang['btn_reinstall']         = 'Reinstalar';
 $lang['js']['reallydel']       = 'Confirma a desinstalação desta extensão?';
+$lang['js']['display_viewoptions'] = 'Ver Opções:';
 $lang['search_for']            = 'Pesquisar Extensão:';
 $lang['search']                = 'Pesquisar';
 $lang['extensionby']           = '<strong>%s</strong> by %s';
diff --git a/lib/plugins/usermanager/lang/pt/lang.php b/lib/plugins/usermanager/lang/pt/lang.php
index ee6eaf4f5..a0b70d2d9 100644
--- a/lib/plugins/usermanager/lang/pt/lang.php
+++ b/lib/plugins/usermanager/lang/pt/lang.php
@@ -10,6 +10,7 @@
  * @author José Campos zecarlosdecampos@gmail.com
  * @author Guido Salatino <guidorafael23@gmail.com>
  * @author Romulo Pereira <romuloccomp@gmail.com>
+ * @author Paulo Carmino <contato@paulocarmino.com>
  */
 $lang['menu']                  = 'Gestor de Perfis';
 $lang['noauth']                = '(autenticação indisponível)';
-- 
cgit v1.2.3


From 7e9637146fa03b75eb1e5fc1e7d34d9c3d10ba4e Mon Sep 17 00:00:00 2001
From: "controlonline.net" <controlonline.net@gmail.com>
Date: Thu, 30 Jul 2015 15:45:54 +0200
Subject: translation update

---
 inc/lang/ca/lang.php                   | 25 ++++++++++++++++++++++++-
 lib/plugins/authplain/lang/ca/lang.php |  5 +++--
 lib/plugins/config/lang/ca/lang.php    |  6 ++++--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index bb21f5c3c..d27ce56f9 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -2,11 +2,12 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Carles Bellver <carles.bellver@cent.uji.es>
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author daniel@6temes.cat
  * @author Eduard Díaz <edudiaz@scopia.es>
+ * @author controlonline.net <controlonline.net@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,7 +49,10 @@ $lang['btn_draftdel']          = 'Suprimeix esborrany';
 $lang['btn_revert']            = 'Restaura';
 $lang['btn_register']          = 'Registra\'m';
 $lang['btn_apply']             = 'Aplica';
+$lang['btn_media']             = 'Mànager Multimèdia';
+$lang['btn_deleteuser']        = 'Esborrar compte';
 $lang['btn_img_backto']        = 'Torna a %s';
+$lang['btn_mediaManager']      = 'Veure a multimèdia mànager ';
 $lang['loggedinas']            = 'Heu entrat com:';
 $lang['user']                  = 'Nom d\'usuari';
 $lang['pass']                  = 'Contrasenya';
@@ -60,6 +64,7 @@ $lang['fullname']              = 'Nom complet';
 $lang['email']                 = 'Correu electrònic';
 $lang['profile']               = 'Perfil d\'usuari';
 $lang['badlogin']              = 'Nom d\'usuari o contrasenya incorrectes.';
+$lang['badpassconfirm']        = 'Contrasenya incorrecta';
 $lang['minoredit']             = 'Canvis menors';
 $lang['draftdate']             = 'L\'esborrany s\'ha desat automàticament';
 $lang['nosecedit']             = 'Mentrestant la pàgina ha estat modificada. La informació de seccions estava obsoleta i ha calgut carregar la pàgina sencera.';
@@ -68,6 +73,7 @@ $lang['regmissing']            = 'Heu d\'omplir tots els camps.';
 $lang['reguexists']            = 'Ja existeix un altre usuari amb aquest nom.';
 $lang['regsuccess']            = 'S\'ha creat l\'usuari. La contrasenya s\'ha enviat per correu.';
 $lang['regsuccess2']           = 'S\'ha creat l\'usuari.';
+$lang['regfail']               = 'L\'usuari no pot ser creat';
 $lang['regmailfail']           = 'Sembla que un error ha impedit enviar la contrasenya per correu. Contacteu amb l\'administrador.';
 $lang['regbadmail']            = 'L\'adreça de correu que heu donat no sembla vàlida. Si creieu que això és un error, contacu amb l\'administrador.';
 $lang['regbadpass']            = 'Les dues contrasenyes no són iguals. Torneu a intentar-ho.';
@@ -77,6 +83,12 @@ $lang['profna']                = 'Aquest wiki no permet modificar el perfil';
 $lang['profnochange']          = 'No heu introduït cap canvi.';
 $lang['profnoempty']           = 'No es pot deixar en blanc el nom o l\'adreça de correu.';
 $lang['profchanged']           = 'El perfil d\'usuari s\'ha actualitzat correctament.';
+$lang['profnodelete']          = 'Aquesta wiki no permet esborrar usuaris';
+$lang['profdeleteuser']        = 'Esborrar compte';
+$lang['profdeleted']           = 'El vostre compte ha sigut esborrat d\'aquest compte';
+$lang['profconfdelete']        = 'Vull esmorrar el meu compte d\'aquesta wiki. </br> Aquesta acció no pot desfer-se.';
+$lang['profconfdeletemissing'] = 'Confirmació no acceptada';
+$lang['proffail']              = 'Perfil d\'usuari no actialitzat';
 $lang['pwdforget']             = 'Heu oblidat la contrasenya? Podeu obtenir-ne una de nova.';
 $lang['resendna']              = 'Aquest wiki no permet tornar a enviar la contrasenya.';
 $lang['resendpwd']             = 'Estableix una nova contrasenya per';
@@ -174,6 +186,9 @@ $lang['difflink']              = 'Enllaç a la visualització de la comparació'
 $lang['diff_type']             = 'Veieu les diferències:';
 $lang['diff_inline']           = 'En línia';
 $lang['diff_side']             = 'Un al costat de l\'altre';
+$lang['diffprevrev']           = 'Revisió prèvia';
+$lang['diffnextrev']           = 'Següent revisió';
+$lang['difflastrev']           = 'Ultima revisió';
 $lang['line']                  = 'Línia';
 $lang['breadcrumb']            = 'Camí:';
 $lang['youarehere']            = 'Sou aquí:';
@@ -194,6 +209,7 @@ $lang['skip_to_content']       = 'salta al contingut';
 $lang['sidebar']               = 'Barra lateral';
 $lang['mail_newpage']          = 'pàgina afegida:';
 $lang['mail_changed']          = 'pàgina modificada:';
+$lang['mail_subscribe_list']   = 'pagines canviades a l0espai de noms:';
 $lang['mail_new_user']         = 'nou usuari:';
 $lang['mail_upload']           = 'fitxer penjat:';
 $lang['changes_type']          = 'Veure els canvis de';
@@ -277,8 +293,12 @@ $lang['i_policy']              = 'Política ACL inicial';
 $lang['i_pol0']                = 'Wiki obert (tothom pot llegir, escriure i penjar fitxers)';
 $lang['i_pol1']                = 'Wiki públic (tothom pot llegir, els usuaris registrats poden escriure i penjar fitxers)';
 $lang['i_pol2']                = 'Wiki tancat (només els usuaris registrats poden llegir, escriure i penjar fitxers)';
+$lang['i_allowreg']            = 'Permet d\'autoinscripció d\'usuaris';
 $lang['i_retry']               = 'Reintenta';
 $lang['i_license']             = 'Escolliu el tipus de llicència que voleu fer servir per al vostre contingut:';
+$lang['i_license_none']        = 'No mostrar cap informació sobre llicencies';
+$lang['i_pop_field']           = 'Si us plau, ajuda\'ns a millorar la DokuWiki';
+$lang['i_pop_label']           = 'Una vegada al mes, enviar anònimament dades als programadors de la DokuWiki';
 $lang['recent_global']         = 'Esteu veient els canvis recents de l\'espai <strong>%s</strong>. També podeu veure els <a href="%s">canvis recents de tot el wiki</a>.';
 $lang['years']                 = 'fa %d anys';
 $lang['months']                = 'fa %d mesos';
@@ -311,3 +331,6 @@ $lang['media_perm_read']       = 'No teniu permisos suficients per a llegir arxi
 $lang['media_perm_upload']     = 'No teniu permisos suficients per a pujar arxius';
 $lang['media_update']          = 'Puja la nova versió';
 $lang['media_restore']         = 'Restaura aquesta versió';
+$lang['currentns']             = 'Espai de noms actual';
+$lang['searchresult']          = 'Resultats cerca';
+$lang['plainhtml']             = 'HTML pla';
diff --git a/lib/plugins/authplain/lang/ca/lang.php b/lib/plugins/authplain/lang/ca/lang.php
index 5a675639d..8cbada1b9 100644
--- a/lib/plugins/authplain/lang/ca/lang.php
+++ b/lib/plugins/authplain/lang/ca/lang.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  */
-$lang['userexists']     = 'Ja existeix un altre usuari amb aquest nom.';
+$lang['userexists']            = 'Ja existeix un altre usuari amb aquest nom.';
diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php
index a53a859a0..404d3ea70 100644
--- a/lib/plugins/config/lang/ca/lang.php
+++ b/lib/plugins/config/lang/ca/lang.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
- * Catalan language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Carles Bellver <carles.bellver@gmail.com>
  * @author carles.bellver@gmail.com
  * @author carles.bellver@cent.uji.es
  * @author Carles Bellver <carles.bellver@cent.uji.es>
  * @author daniel@6temes.cat
+ * @author controlonline.net <controlonline.net@gmail.com>
  */
 $lang['menu']                  = 'Paràmetres de configuració';
 $lang['error']                 = 'Els paràmetres no s\'han pogut actualitzar per causa d\'un valor incorrecte Reviseu els canvis i torneu a enviar-los.<br />Els valors incorrectes es ressaltaran amb un marc vermell.';
-- 
cgit v1.2.3


From 6c40559b16012d64a0e3453c2c21f03572e78930 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Thu, 30 Jul 2015 15:47:11 +0200
Subject: translation update

---
 inc/lang/ko/denied.txt                   |   3 +-
 inc/lang/ko/lang.php                     |  18 +--
 inc/lang/ko/searchpage.txt               |   2 +-
 inc/lang/ko/updateprofile.txt            |   2 +-
 lib/plugins/authplain/lang/ko/lang.php   |   8 +-
 lib/plugins/config/lang/ko/intro.txt     |   6 +-
 lib/plugins/config/lang/ko/lang.php      | 234 ++++++++++++++++---------------
 lib/plugins/revert/lang/ko/lang.php      |   4 +-
 lib/plugins/styling/lang/ko/intro.txt    |   2 +
 lib/plugins/styling/lang/ko/lang.php     |  23 +++
 lib/plugins/usermanager/lang/ko/lang.php |   2 +-
 lib/tpl/dokuwiki/lang/ko/lang.php        |  15 ++
 lib/tpl/dokuwiki/lang/ko/style.txt       |   4 +
 13 files changed, 187 insertions(+), 136 deletions(-)
 create mode 100644 lib/plugins/styling/lang/ko/intro.txt
 create mode 100644 lib/plugins/styling/lang/ko/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/ko/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/ko/style.txt

diff --git a/inc/lang/ko/denied.txt b/inc/lang/ko/denied.txt
index a4b94be65..bf82fbd31 100644
--- a/inc/lang/ko/denied.txt
+++ b/inc/lang/ko/denied.txt
@@ -1,4 +1,3 @@
 ====== 권한 거절 ======
 
-죄송하지만 계속할 수 있는 권한이 없습니다.
-
+죄송하지만 계속할 수 있는 권한이 없습니다.
\ No newline at end of file
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 48ebfb1d6..beec62aa9 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -30,8 +30,8 @@ $lang['btn_search']            = '검색';
 $lang['btn_save']              = '저장';
 $lang['btn_preview']           = '미리 보기';
 $lang['btn_top']               = '맨 위로';
-$lang['btn_newer']             = '<< 최근';
-$lang['btn_older']             = '이전 >>';
+$lang['btn_newer']             = '<< 최근 바뀜 더 보기';
+$lang['btn_older']             = '최근 바뀜 덜 보기 >>';
 $lang['btn_revs']              = '이전 판';
 $lang['btn_recent']            = '최근 바뀜';
 $lang['btn_upload']            = '올리기';
@@ -46,7 +46,7 @@ $lang['btn_delete']            = '삭제';
 $lang['btn_back']              = '뒤로';
 $lang['btn_backlink']          = '백링크';
 $lang['btn_subscribe']         = '구독 관리';
-$lang['btn_profile']           = '프로필 바꾸기';
+$lang['btn_profile']           = '프로필 업데이트';
 $lang['btn_reset']             = '재설정';
 $lang['btn_resendpwd']         = '새 비밀번호 설정';
 $lang['btn_draft']             = '초안 편집';
@@ -110,7 +110,7 @@ $lang['searchmedia_in']        = '%s에서 검색';
 $lang['txt_upload']            = '올릴 파일 선택:';
 $lang['txt_filename']          = '올릴 파일 이름 (선택 사항):';
 $lang['txt_overwrt']           = '기존 파일에 덮어쓰기';
-$lang['maxuploadsize']         = '최대 올리기 용량. 파일당 %s입니다.';
+$lang['maxuploadsize']         = '최대 올리기 용량. 파일당 %s.';
 $lang['lockedby']              = '현재 잠겨진 사용자:';
 $lang['lockexpire']            = '잠금 해제 시간:';
 $lang['js']['willexpire']      = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리 보기를 눌러 잠금 시간을 다시 설정하세요.';
@@ -205,7 +205,7 @@ $lang['created']               = '만듦';
 $lang['restored']              = '이전 판으로 되돌림 (%s)';
 $lang['external_edit']         = '바깥 편집';
 $lang['summary']               = '편집 요약';
-$lang['noflash']               = '이 내용을 표시하기 위해서 <a href="http://www.adobe.com/products/flashplayer/">Adobe 플래시 플러그인</a>이 필요합니다.';
+$lang['noflash']               = '이 내용을 표시하기 위해서 <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash 플러그인</a>이 필요합니다.';
 $lang['download']              = '조각 다운로드';
 $lang['tools']                 = '도구';
 $lang['user_tools']            = '사용자 도구';
@@ -286,7 +286,7 @@ $lang['i_enableacl']           = 'ACL 활성화 (권장)';
 $lang['i_superuser']           = '슈퍼 사용자';
 $lang['i_problems']            = '설치 관리자가 아래에 나와 있는 몇 가지 문제를 찾았습니다. 문제를 해결하지 전까지 설치를 계속할 수 없습니다.';
 $lang['i_modified']            = '보안 상의 이유로 이 스크립트는 수정되지 않은 새 도쿠위키 설치에서만 동작됩니다.
-다운로드한 압축 패키지를 다시 설치하거나 <a href="http://dokuwiki.org/ko:install">도쿠위키 설치 과정</a>을 참조해서 설치하세요.';
+                                  다운로드한 압축 패키지를 다시 설치하거나 <a href="http://dokuwiki.org/ko:install">도쿠위키 설치 과정</a>을 참조해서 설치하세요.';
 $lang['i_funcna']              = '<code>%s</code> PHP 함수를 사용할 수 없습니다. 호스트 제공자가 어떤 이유에서인지 막아 놓았을지 모릅니다.';
 $lang['i_phpver']              = 'PHP <code>%s</code> 버전은 필요한 <code>%s</code> 버전보다 오래되었습니다. PHP를 업그레이드할 필요가 있습니다.';
 $lang['i_mbfuncoverload']      = '도쿠위키를 실행하려면 mbstring.func_overload를 php.ini에서 비활성화해야 합니다.';
@@ -296,9 +296,9 @@ $lang['i_writeerr']            = '<code>%s</code>(을)를 만들 수 없습니
 $lang['i_badhash']             = 'dokuwiki.php를 인식할 수 없거나 원본 파일이 아닙니다 (해시=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - 잘못되었거나 빈 값입니다';
 $lang['i_success']             = '환경 설정이 성공적으로 끝났습니다. 지금 install.php를 지워도 상관없습니다.
-<a href="doku.php?id=wiki:welcome">새 도쿠위키</a>로 들어가세요.';
+                                 <a href="doku.php?id=wiki:welcome">새 도쿠위키</a>로 들어가세요.';
 $lang['i_failure']             = '환경 설정 파일에 쓰는 도중에 오류가 발생했습니다.
-<a href="doku.php?id=wiki:welcome">새 도쿠위키</a>를 사용하기 전에 수동으로 문제를 해결해야 합니다.';
+                                  <a href="doku.php?id=wiki:welcome">새 도쿠위키</a>를 사용하기 전에 수동으로 문제를 해결해야 합니다.';
 $lang['i_policy']              = '초기 ACL 정책';
 $lang['i_pol0']                = '열린 위키 (누구나 읽기, 쓰기, 올리기가 가능합니다)';
 $lang['i_pol1']                = '공개 위키 (누구나 읽을 수 있지만, 등록된 사용자만 쓰기와 올리기가 가능합니다)';
@@ -333,7 +333,7 @@ $lang['media_files']           = '%s에 있는 파일';
 $lang['media_upload']          = '%s에 올리기';
 $lang['media_search']          = '%s에서 검색';
 $lang['media_view']            = '%s';
-$lang['media_viewold']         = '%s (%s에 있음)';
+$lang['media_viewold']         = '%2$s에 있는 %1$s';
 $lang['media_edit']            = '%s 편집';
 $lang['media_history']         = '%s의 역사';
 $lang['media_meta_edited']     = '메타데이터 편집됨';
diff --git a/inc/lang/ko/searchpage.txt b/inc/lang/ko/searchpage.txt
index 6aa1c89af..bb834277f 100644
--- a/inc/lang/ko/searchpage.txt
+++ b/inc/lang/ko/searchpage.txt
@@ -2,4 +2,4 @@
 
 아래에서 검색 결과를 찾을 수 있습니다. @CREATEPAGEINFO@
 
-===== 결과 =====
+===== 결과 =====
\ No newline at end of file
diff --git a/inc/lang/ko/updateprofile.txt b/inc/lang/ko/updateprofile.txt
index 055272e9d..0ddea30b0 100644
--- a/inc/lang/ko/updateprofile.txt
+++ b/inc/lang/ko/updateprofile.txt
@@ -1,3 +1,3 @@
-====== 계정 프로필 바꾸기 ======
+====== 계정 프로필 업데이트 ======
 
 바꾸고 싶은 항목을 입력하세요. 사용자 이름은 바꿀 수 없습니다.
\ No newline at end of file
diff --git a/lib/plugins/authplain/lang/ko/lang.php b/lib/plugins/authplain/lang/ko/lang.php
index de5a7c02f..50669822e 100644
--- a/lib/plugins/authplain/lang/ko/lang.php
+++ b/lib/plugins/authplain/lang/ko/lang.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Myeongjin <aranet100@gmail.com>
  */
-$lang['userexists']     = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.';
+$lang['userexists']            = '죄송하지만 같은 이름을 사용하는 사용자가 있습니다.';
+$lang['usernotexists']         = '죄송하지만 해당 사용자가 존재하지 않습니다.';
+$lang['writefail']             = '사용자 데이터를 수정할 수 없습니다. 위키 관리자에게 문의하시기 바랍니다';
diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt
index 42240e3d7..b05264a64 100644
--- a/lib/plugins/config/lang/ko/intro.txt
+++ b/lib/plugins/config/lang/ko/intro.txt
@@ -1,7 +1,7 @@
 ====== 환경 설정 관리자 ======
 
-도쿠위키를 설치할 때 설정을 바꾸려면 이 페이지를 사용하세요. 개별 설정에 대한 도움말은 [[doku>ko:config]]를 참고하세요. 이 플러그인에 대한 자세한 내용은 [[doku>ko:plugin:config]]를 참고하세요.
+설치된 도쿠위키의 설정을 제어하려면 이 페이지를 사용하세요. 개별 설정에 대한 도움말은 [[doku>ko:config]]를 참조하세요. 이 플러그인에 대한 자세한 내용은 [[doku>ko:plugin:config]]를 참조하세요.
 
-밝은 빨간색 배경으로 보이는 설정은 이 플러그인에서 바꿀 수 없도록 보호되어 있습니다. 파란색 배경으로 보이는 설정은 기본값이며 하얀색 배경으로 보이는 설정은 특수한 설치를 위해 로컬로 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
+밝은 빨간색 배경으로 보이는 설정은 이 플러그인으로 바꿀 수 없도록 보호되어 있습니다. 파란색 배경으로 보이는 설정은 기본값이며 하얀색 배경으로 보이는 설정은 특정 설치에 대해 로컬로 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
 
-이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀜이 사라지는 것에 주의하세요.
+이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀜이 사라지는 것에 주의하세요.
\ No newline at end of file
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 0cdaca90d..85326241b 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
- * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
@@ -11,163 +11,164 @@
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['menu']                  = '환경 설정';
-$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 바뀜을 검토하고 확인을 누르세요.
-<br />잘못된 값은 빨간 선으로 둘러싸여 있습니다.';
+$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다, 바뀜을 검토하고 다시 제출하세요.
+                       <br />잘못된 값은 빨간 선으로 둘러싸여 보여집니다.';
 $lang['updated']               = '설정이 성공적으로 바뀌었습니다.';
-$lang['nochoice']              = '(다른 선택이 불가능합니다)';
-$lang['locked']                = '환경 설정 파일을 바꿀 수 없습니다. 의도한 행동이 아니라면,<br />
-파일 이름과 권한이 맞는지 확인하세요.';
-$lang['danger']                = '위험: 이 옵션을 잘못 바꾸면 환경 설정 메뉴를 사용할 수 없을 수도 있습니다.';
-$lang['warning']               = '경고: 이 옵션을 잘못 바꾸면 잘못 동작할 수 있습니다.';
-$lang['security']              = '보안 경고: 이 옵션은 보안에 위험이 있을 수 있습니다.';
+$lang['nochoice']              = '(다른 선택은 할 수 없습니다)';
+$lang['locked']                = '설정 파일을 바꿀 수 없습니다, 의도하지 않았다면, <br />
+                       로컬 설정 파일 이름과 권한이 맞는지 확인하세요.';
+$lang['danger']                = '위험: 이 옵션을 바꾸면 위키와 환경 설정 메뉴에 접근할 수 없을 수도 있습니다.';
+$lang['warning']               = '경고: 이 옵션을 바꾸면 의도하지 않는 동작을 일으킬 수 있습니다.';
+$lang['security']              = '보안 경고: 이 옵션을 바꾸면 보안 위험이 있을 수 있습니다.';
 $lang['_configuration_manager'] = '환경 설정 관리자';
-$lang['_header_dokuwiki']      = '도쿠위키 설정';
-$lang['_header_plugin']        = '플러그인 설정';
-$lang['_header_template']      = '템플릿 설정';
+$lang['_header_dokuwiki']      = '도쿠위키';
+$lang['_header_plugin']        = '플러그인';
+$lang['_header_template']      = '템플릿';
 $lang['_header_undefined']     = '정의되지 않은 설정';
-$lang['_basic']                = '기본 설정';
-$lang['_display']              = '화면 표시 설정';
-$lang['_authentication']       = '인증 설정';
-$lang['_anti_spam']            = '스팸 방지 설정';
-$lang['_editing']              = '편집 설정';
-$lang['_links']                = '링크 설정';
-$lang['_media']                = '미디어 설정';
-$lang['_notifications']        = '알림 설정';
-$lang['_syndication']          = '신디케이션 설정';
-$lang['_advanced']             = '고급 설정';
-$lang['_network']              = '네트워크 설정';
-$lang['_msg_setting_undefined'] = '설정된 메타데이터가 없습니다.';
-$lang['_msg_setting_no_class'] = '설정된 클래스가 없습니다.';
+$lang['_basic']                = '기본';
+$lang['_display']              = '보이기';
+$lang['_authentication']       = '인증';
+$lang['_anti_spam']            = '스팸 방지';
+$lang['_editing']              = '편집';
+$lang['_links']                = '링크';
+$lang['_media']                = '미디어';
+$lang['_notifications']        = '알림';
+$lang['_syndication']          = '신디케이션 (RSS)';
+$lang['_advanced']             = '고급';
+$lang['_network']              = '네트워크';
+$lang['_msg_setting_undefined'] = '설정에 메타데이터가 없습니다.';
+$lang['_msg_setting_no_class'] = '설정에 클래스가 없습니다.';
 $lang['_msg_setting_no_default'] = '기본값이 없습니다.';
 $lang['title']                 = '위키 제목 (위키 이름)';
-$lang['start']                 = '각 이름공간에서 사용할 시작 문서 이름';
+$lang['start']                 = '각 이름공간에 시작점으로 사용할 문서 이름';
 $lang['lang']                  = '인터페이스 언어';
 $lang['template']              = '템플릿 (위키 디자인)';
-$lang['tagline']               = '태그 라인 (템플릿이 지원할 때에 한함)';
-$lang['sidebar']               = '사이드바 문서 이름 (템플릿이 지원할 때에 한함), 비워두면 사이드바를 비활성화';
-$lang['license']               = '내용에 어떤 라이선스를 적용하겠습니까?';
-$lang['savedir']               = '데이터 저장 디렉터리';
-$lang['basedir']               = '서버 경로 (예를 들어 <code>/dokuwiki/</code>). 자동 감지를 하려면 비우세요.';
-$lang['baseurl']               = '서버 URL (예를 들어 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비우세요.';
-$lang['cookiedir']             = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.';
+$lang['tagline']               = '태그라인 (템플릿이 지원할 경우)';
+$lang['sidebar']               = '사이드바 문서 이름 (템플릿이 지원할 경우), 필드를 비우면 사이드바를 비활성화';
+$lang['license']               = '내용을 배포할 때 어떤 라이선스에 따라야 합니까?';
+$lang['savedir']               = '데이터를 저장할 디렉터리';
+$lang['basedir']               = '서버 경로 (예 <code>/dokuwiki/</code>). 자동 감지를 하려면 비워 두세요.';
+$lang['baseurl']               = '서버 URL (예 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비워 두세요.';
+$lang['cookiedir']             = '쿠키 경로. 기본 URL 위치로 지정하려면 비워 두세요.';
 $lang['dmode']                 = '디렉터리 만들기 모드';
 $lang['fmode']                 = '파일 만들기 모드';
-$lang['allowdebug']            = '디버그 허용 <b>필요하지 않으면 비활성화하세요!</b>';
-$lang['recent']                = '최근 바뀐 문서당 항목 수';
-$lang['recent_days']           = '최근 바뀐 문서 기준 시간 (일)';
-$lang['breadcrumbs']           = '위치 "추적" 수. 0으로 설정하면 비활성화합니다.';
-$lang['youarehere']            = '계층형 위치 추적 (다음 위의 옵션을 비활성화하게 됩니다)';
-$lang['fullpath']              = '문서 하단에 전체 경로 보여주기';
-$lang['typography']            = '기호 대체';
-$lang['dformat']               = '날짜 형식 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능 참고)';
+$lang['allowdebug']            = '디버그 허용. <b>필요하지 않으면 비활성화하세요!</b>';
+$lang['recent']                = '최근 바뀜에서 문서당 항목 수';
+$lang['recent_days']           = '최근 바뀜을 유지할 기한 (일)';
+$lang['breadcrumbs']           = '이동 경로 "추적" 수. 비활성화하려면 0으로 설정하세요.';
+$lang['youarehere']            = '계층적 이동 경로 사용 (다음에 위 옵션을 비활성화하기를 원할 겁니다)';
+$lang['fullpath']              = '바닥글에 문서의 전체 경로 밝히기';
+$lang['typography']            = '타이포그래피 대체';
+$lang['dformat']               = '날짜 형식 (PHP의 <a href="http://www.php.net/strftime">strftime</a> 함수 참고)';
 $lang['signature']             = '편집기에서 서명 버튼을 누를 때 넣을 내용';
-$lang['showuseras']            = '마지막에 문서를 편집한 사용자를 보여줄지 여부';
-$lang['toptoclevel']           = '목차 최상위 항목';
-$lang['tocminheads']           = '목차 표시 여부를 결정할 최소한의 문단 제목 항목의 수';
-$lang['maxtoclevel']           = '목차 최대 단계';
-$lang['maxseclevel']           = '문단 최대 편집 단계';
+$lang['showuseras']            = '문서를 마지막으로 편집한 사용자를 보여줄지 여부';
+$lang['toptoclevel']           = '목차의 최상위 단계';
+$lang['tocminheads']           = '목차를 넣을 여부를 결정할 최소 문단 수';
+$lang['maxtoclevel']           = '목차의 최대 단계';
+$lang['maxseclevel']           = '문단의 최대 편집 단계';
 $lang['camelcase']             = '링크에 CamelCase 사용';
 $lang['deaccent']              = '문서 이름을 지우는 방법';
-$lang['useheading']            = '문서 이름으로 첫 문단 제목 사용';
-$lang['sneaky_index']          = '기본적으로 도쿠위키는 색인 목록에 모든 이름공간을 보여줍니다.
-이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 이름공간은 보여주지 않습니다. 접근 가능한 하위 이름공간을 보이지 않게 설정하면 자동으로 설정됩니다. 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.';
-$lang['hidepages']             = '검색, 사이트맵과 기타 자동 색인에서 정규 표현식과 일치하는 문서 숨기기';
+$lang['useheading']            = '문서 이름을 첫 문단 제목으로 사용';
+$lang['sneaky_index']          = '기본적으로, 도쿠위키는 사이트맵에 모든 이름공간을 보여줍니다. 이 옵션을 활성화하면 사용자가 읽기 권한이 없는 이름공간을 숨기게 됩니다. 특정 ACL 설정으로 색인을 사용할 수 없게 할 수 있는 접근할 수 있는 하위 이름공간을 숨기면 설정됩니다.';
+$lang['hidepages']             = '검색, 사이트맵 및 다른 자동 색인에서 이 정규 표현식과 일치하는 문서 숨기기';
 $lang['useacl']                = '접근 제어 목록 (ACL) 사용';
-$lang['autopasswd']            = '자동으로 만들어진 비밀번호';
-$lang['authtype']              = '인증 백-엔드';
+$lang['autopasswd']            = '자동 생성 비밀번호';
+$lang['authtype']              = '인증 백엔드';
 $lang['passcrypt']             = '비밀번호 암호화 방법';
-$lang['defaultgroup']          = '기본 그룹, 모든 새 사용자는 이 그룹에 속합니다';
-$lang['superuser']             = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
-$lang['manager']               = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
-$lang['profileconfirm']        = '개인 정보를 바꿀 때 비밀번호 다시 확인';
-$lang['rememberme']            = '항상 로그인 정보 저장 허용 (기억하기)';
-$lang['disableactions']        = '도쿠위키 활동 비활성화';
+$lang['defaultgroup']          = '기본 그룹, 모든 새 사용자는 이 그룹에 속하게 됩니다';
+$lang['superuser']             = '슈퍼유저 - ACL 설정과 상관없이 모든 문서와 기능에 완전히 접근할 수 있는 그룹, 사용자 또는 쉼표로 구분된 목록 사용자1,@그룹1,사용자2';
+$lang['manager']               = '관리자 - 특정 관리 기능에 접근할 수 있는 그룹, 사용자 또는 쉼표로 구분된 목록 사용자1,@그룹1,사용자2';
+$lang['profileconfirm']        = '프로필을 바꿀 때 비밀번호로 확인';
+$lang['rememberme']            = '영구적으로 로그인 쿠키 허용 (기억하기)';
+$lang['disableactions']        = '도쿠위키 동작 비활성화';
 $lang['disableactions_check']  = '검사';
-$lang['disableactions_subscription'] = '구독 신청/구독 취소';
+$lang['disableactions_subscription'] = '구독/구독 취소';
 $lang['disableactions_wikicode'] = '원본 보기/원본 내보내기';
-$lang['disableactions_other']  = '다른 활동 (쉼표로 구분)';
-$lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)';
-$lang['securecookie']          = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.';
-$lang['remote']                = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메커니즘을 통해 다른 어플리케이션으로 접근 가능합니다.';
-$lang['remoteuser']            = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.';
-$lang['usewordblock']          = '금지 단어를 사용해 스팸 막기';
+$lang['disableactions_profile_delete'] = '자신의 계정 삭제';
+$lang['disableactions_other']  = '다른 동작 (쉼표로 구분)';
+$lang['disableactions_rss']    = 'XML 신디케이션 (RSS)';
+$lang['auth_security_timeout'] = '인증 보안 시간 초과 (초)';
+$lang['securecookie']          = 'HTTPS를 통해 설정된 쿠키는 HTTPS를 통해서만 보내져야 합니까? 위키 로그인에만 SSL로 보호하고 위키를 둘러보는 것에는 보호하지 않게 하려면 이 옵션을 비활성화하세요.';
+$lang['remote']                = '원격 API 시스템 활성화. 다른 어플리케이션이 XML-RPC 또는 다른 메커니즘을 통해 위키에 접근할 수 있습니다.';
+$lang['remoteuser']            = '여기에 입력한 쉼표로 구분된 그룹 또는 사용자에게 원격 API 접근을 제한합니다. 모두에게 접근 권한을 주려면 비워 두세요.';
+$lang['usewordblock']          = '낱말 목록을 바탕으로 스팸 막기';
 $lang['relnofollow']           = '바깥 링크에 rel="nofollow" 사용';
-$lang['indexdelay']            = '색인 연기 시간 (초)';
+$lang['indexdelay']            = '색인 전 지연 시간 (초)';
 $lang['mailguard']             = '이메일 주소를 알아볼 수 없게 하기';
 $lang['iexssprotect']          = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사';
-$lang['usedraft']              = '편집하는 동안 자동으로 문서 초안 저장';
-$lang['htmlok']                = 'HTML 내장 허용';
-$lang['phpok']                 = 'PHP 내장 허용';
-$lang['locktime']              = '최대 파일 잠금 시간(초)';
-$lang['cachetime']             = '최대 캐시 생존 시간 (초)';
+$lang['usedraft']              = '편집하는 동안 자동으로 초안 저장';
+$lang['htmlok']                = 'HTML 포함 허용';
+$lang['phpok']                 = 'PHP 포함 허용';
+$lang['locktime']              = '파일 잠그기에 대한 최대 시간 (초)';
+$lang['cachetime']             = '캐시에 대한 최대 시간 (초)';
 $lang['target____wiki']        = '안쪽 링크에 대한 타겟 창';
 $lang['target____interwiki']   = '인터위키 링크에 대한 타겟 창';
 $lang['target____extern']      = '바깥 링크에 대한 타겟 창';
 $lang['target____media']       = '미디어 링크에 대한 타겟 창';
-$lang['target____windows']     = '창 링크에 대한 타겟 창';
-$lang['mediarevisions']        = '미디어 판 관리를 사용하겠습니까?';
-$lang['refcheck']              = '미디어 파일을 삭제하기 전에 사용하고 있는지 검사';
+$lang['target____windows']     = 'Windows 링크에 대한 타겟 창';
+$lang['mediarevisions']        = '미디어 판을 활성화하겠습니까?';
+$lang['refcheck']              = '미디어 파일을 삭제하기 전에 아직 사용하고 있는지 검사';
 $lang['gdlib']                 = 'GD 라이브러리 버전';
-$lang['im_convert']            = 'ImageMagick 변환 도구 위치';
+$lang['im_convert']            = 'ImageMagick의 변환 도구의 경로';
 $lang['jpg_quality']           = 'JPG 압축 품질 (0-100)';
-$lang['fetchsize']             = 'fetch.php가 바깥에서 다운로드할 수도 있는 최대 크기 (바이트)';
-$lang['subscribers']           = '사용자가 이메일로 문서 바뀜에 구독하도록 허용';
-$lang['subscribe_time']        = '구독 목록과 요약이 보내질 경과 시간 (초); recent_days에서 설정된 시간보다 작아야 합니다.';
+$lang['fetchsize']             = 'fetch.php가 바깥 URL에서 다운로드할 수 있는 최대 크기 (바이트), 예를 들어 바깥 그림을 캐시하고 크기 조절할 때.';
+$lang['subscribers']           = '사용자가 이메일로 문서 바뀜을 구독하는 것을 허용';
+$lang['subscribe_time']        = '구독 목록과 요약이 보내질 경과 시간 (초); recent_days에 지정된 시간보다 작아야 합니다.';
 $lang['notify']                = '항상 이 이메일 주소로 바뀜 알림을 보냄';
-$lang['registernotify']        = '항상 새 사용자한테 이 이메일 주소로 정보를 보냄';
-$lang['mailfrom']              = '자동으로 보내지는 메일 발신자';
-$lang['mailprefix']            = '자동으로 보내지는 메일의 제목 말머리 내용. 비웠을 경우 위키 제목 사용';
-$lang['htmlmail']              = '용량은 조금 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 보냅니다. 텍스트만의 메일을 보내려면 비활성화하세요.';
-$lang['sitemap']               = '구글 사이트맵 생성 날짜 빈도. 0일 경우 비활성화합니다';
-$lang['rss_type']              = 'XML 피드 타입';
+$lang['registernotify']        = '항상 이 이메일 주소로 새로 등록한 사용자의 정보를 보냄';
+$lang['mailfrom']              = '자동으로 보내는 메일에 사용할 보내는 사람 이메일 주소';
+$lang['mailprefix']            = '자동으로 보내는 메일에 사용할 이메일 제목 접두어. 위키 제목을 사용하려면 비워 두세요';
+$lang['htmlmail']              = '보기에는 더 좋지만 크키가 조금 더 큰 HTML 태그가 포함된 이메일을 보내기. 일반 텍스트만으로 된 메일을 보내려면 비활성화하세요.';
+$lang['sitemap']               = 'Google 사이트맵 생성 날짜 빈도 (일). 비활성화하려면 0';
+$lang['rss_type']              = 'XML 피드 형식';
 $lang['rss_linkto']            = 'XML 피드 링크 정보';
-$lang['rss_content']           = 'XML 피드 항목에 표시되는 내용은 무엇입니까?';
-$lang['rss_update']            = 'XML 피드 업데이트 주기 (초)';
-$lang['rss_show_summary']      = 'XML 피드 제목에서 요약 보여주기';
-$lang['rss_media']             = '어떤 규격으로 XML 피드를 받아보시겠습니까?';
-$lang['updatecheck']           = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 도쿠위키를 update.dokuwiki.org에 연결해야 합니다.';
+$lang['rss_content']           = 'XML 피드 항목에 보여주는 내용은 무엇입니까?';
+$lang['rss_update']            = 'XML 피드 업데이트 간격 (초)';
+$lang['rss_show_summary']      = 'XML 피드의 제목에서 요악 보여주기';
+$lang['rss_media']             = '어떤 규격으로 XML 피드에 바뀜을 나열해야 합니까?';
+$lang['updatecheck']           = '데이트와 보안 경고를 검사할까요? 도쿠위키는 이 기능을 위해 update.dokuwiki.org에 연결이 필요합니다.';
 $lang['userewrite']            = '멋진 URL 사용';
-$lang['useslash']              = 'URL에서 이름 구분자로 슬래시 문자 사용';
-$lang['sepchar']               = '문서 이름 단어 구분자';
+$lang['useslash']              = 'URL에서 이름공간 구분자로 슬래시 사용';
+$lang['sepchar']               = '문서 이름 낱말 구분자';
 $lang['canonical']             = '완전한 canonical URL 사용';
-$lang['fnencode']              = 'ASCII가 아닌 파일 이름을 인코딩 하는 방법.';
-$lang['autoplural']            = '링크 연결시 복수 양식 검사';
-$lang['compression']           = '첨부 파일 압축 방법 선택';
-$lang['gzip_output']           = 'xhml 내용 gzip 압축 사용';
-$lang['compress']              = '최적화된 CSS, 자바스크립트 출력';
+$lang['fnencode']              = 'ASCII가 아닌 파일 이름을 인코딩하는 방법.';
+$lang['autoplural']            = '링크에서 복수형 검사';
+$lang['compression']           = '첨부 파일의 압축 방법';
+$lang['gzip_output']           = 'xhtml에 대해 gzip 내용 인코딩 사용';
+$lang['compress']              = 'CSS 및 자바스크립트를 압축하여 출력';
 $lang['cssdatauri']            = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code>에서 <code>600</code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.';
-$lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP 404/페이지를 찾을 수 없습니다" 응답';
+$lang['send404']               = '존재하지 않는 문서에 "HTTP 404/페이지를 찾을 수 없습니다" 보내기';
 $lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 검색 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">버그 852</a>를 참고하시기 바랍니다.';
 $lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
-$lang['renderer_xhtml']        = '주 (xhtml) 위키 출력 처리기';
-$lang['renderer__core']        = '%s (도쿠위키 내부)';
+$lang['renderer_xhtml']        = '주요 (xhtml) 위키 출력에 사용할 렌더러';
+$lang['renderer__core']        = '%s (도쿠위키 코어)';
 $lang['renderer__plugin']      = '%s (플러그인)';
 $lang['dnslookups']            = '이 옵션을 활성화하면 도쿠위키가 문서를 편집하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화하세요';
 $lang['proxy____host']         = '프록시 서버 이름';
-$lang['proxy____port']         = '프록시 서버 포트';
+$lang['proxy____port']         = '프록시 포트';
 $lang['proxy____user']         = '프록시 사용자 이름';
 $lang['proxy____pass']         = '프록시 비밀번호';
-$lang['proxy____ssl']          = '프록시 연결시 SSL 사용';
+$lang['proxy____ssl']          = '프록시로 연결하는 데 SSL 사용';
 $lang['proxy____except']       = '프록시 설정이 무시될 URL주소의 정규 표현식';
-$lang['safemodehack']          = 'safemode hack기능 사용';
+$lang['safemodehack']          = 'safemode hack 활성화';
 $lang['ftp____host']           = 'safemode hack의 FTP 서버';
 $lang['ftp____port']           = 'safemode hack의 FTP 포트';
 $lang['ftp____user']           = 'safemode hack의 FTP 사용자 이름';
 $lang['ftp____pass']           = 'safemode hack의 FTP 비밀번호';
 $lang['ftp____root']           = 'safemode hack의 FTP 루트 디렉터리';
 $lang['license_o_']            = '선택하지 않음';
-$lang['typography_o_0']        = '사용 안함';
+$lang['typography_o_0']        = '없음';
 $lang['typography_o_1']        = '이중 인용부호("")만 지원';
 $lang['typography_o_2']        = '모든 가능한 인용 부호 (동작 안될 수도 있음)';
-$lang['userewrite_o_0']        = '사용 안함';
+$lang['userewrite_o_0']        = '없음';
 $lang['userewrite_o_1']        = '.htaccess';
-$lang['userewrite_o_2']        = '도쿠위키 내부 기능';
+$lang['userewrite_o_2']        = '도쿠위키 내부';
 $lang['deaccent_o_0']          = '끄기';
 $lang['deaccent_o_1']          = '악센트 제거';
-$lang['deaccent_o_2']          = '라틴문자화';
-$lang['gdlib_o_0']             = 'GD 라이브러리 사용 불가';
+$lang['deaccent_o_2']          = '로마자화';
+$lang['gdlib_o_0']             = 'GD 라이브러리를 사용할 수 없음';
 $lang['gdlib_o_1']             = '버전 1.x';
-$lang['gdlib_o_2']             = '자동 인식';
+$lang['gdlib_o_2']             = '자동 감지';
 $lang['rss_type_o_rss']        = 'RSS 0.91';
 $lang['rss_type_o_rss1']       = 'RSS 1.0';
 $lang['rss_type_o_rss2']       = 'RSS 2.0';
@@ -179,20 +180,21 @@ $lang['rss_content_o_htmldiff'] = 'HTML 차이 목록 형식';
 $lang['rss_content_o_html']    = '최대 HTML 페이지 내용';
 $lang['rss_linkto_o_diff']     = '차이 보기';
 $lang['rss_linkto_o_page']     = '바뀐 문서 보기';
-$lang['rss_linkto_o_rev']      = '바뀐 목록 보기';
-$lang['rss_linkto_o_current']  = '현재 문서 보기';
+$lang['rss_linkto_o_rev']      = '판의 목록';
+$lang['rss_linkto_o_current']  = '현재 문서';
 $lang['compression_o_0']       = '없음';
 $lang['compression_o_gz']      = 'gzip';
 $lang['compression_o_bz2']     = 'bz2';
-$lang['xsendfile_o_0']         = '사용 불가';
+$lang['xsendfile_o_0']         = '사용하지 않음';
 $lang['xsendfile_o_1']         = '비공개 lighttpd 헤더 (1.5 이전 버전)';
 $lang['xsendfile_o_2']         = '표준 X-Sendfile 헤더';
 $lang['xsendfile_o_3']         = '비공개 Nginx X-Accel-Redirect 헤더';
 $lang['showuseras_o_loginname'] = '로그인 이름';
-$lang['showuseras_o_username'] = '사용자의 전체 이름';
+$lang['showuseras_o_username'] = '사용자의 실명';
+$lang['showuseras_o_username_link'] = '인터위키 사용자 링크로 된 사용자의 실명';
 $lang['showuseras_o_email']    = '사용자의 이메일 주소 (메일 주소 설정에 따라 안보일 수 있음)';
-$lang['showuseras_o_email_link'] = 'mailto: link로 표현될 사용자 이메일 주소';
-$lang['useheading_o_0']        = '아니오';
+$lang['showuseras_o_email_link'] = 'mailto: 링크로 된 사용자의 이메일 주소';
+$lang['useheading_o_0']        = '전혀 없음';
 $lang['useheading_o_navigation'] = '둘러보기에만';
 $lang['useheading_o_content']  = '위키 내용에만';
 $lang['useheading_o_1']        = '항상';
diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php
index df4b271b1..f99b0ab23 100644
--- a/lib/plugins/revert/lang/ko/lang.php
+++ b/lib/plugins/revert/lang/ko/lang.php
@@ -15,7 +15,9 @@ $lang['filter']                = '스팸 문서 검색';
 $lang['revert']                = '선택한 문서 되돌리기';
 $lang['reverted']              = '%s 판을 %s 판으로 되돌림';
 $lang['removed']               = '%s 제거됨';
-$lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 되돌리시기 바랍니다.';
+$lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에
+                     스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서
+                     되돌리시기 바랍니다.';
 $lang['revstop']               = '되돌리기 작업이 성공적으로 끝났습니다.';
 $lang['note1']                 = '참고: 대소문자를 구별해 찾습니다';
 $lang['note2']                 = '참고: 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최신 판으로 되돌립니다.';
diff --git a/lib/plugins/styling/lang/ko/intro.txt b/lib/plugins/styling/lang/ko/intro.txt
new file mode 100644
index 000000000..c460801b1
--- /dev/null
+++ b/lib/plugins/styling/lang/ko/intro.txt
@@ -0,0 +1,2 @@
+이 도구는 현재 선택한 템플릿의 특정 스타일 설정을 바꿀 수 있습니다.
+모든 바뀜은 로컬 환경 설정 파일에 저장되며 안전하게 업그레이드됩니다.
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/ko/lang.php b/lib/plugins/styling/lang/ko/lang.php
new file mode 100644
index 000000000..96da76d48
--- /dev/null
+++ b/lib/plugins/styling/lang/ko/lang.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Myeongjin <aranet100@gmail.com>
+ */
+$lang['menu']                  = '템플릿 스타일 설정';
+$lang['js']['loader']          = '미리 보기를 불러오는 중...<br />만약 이것이 사라지지 않는다면, 당신은 실망하겠죠';
+$lang['js']['popup']           = '팝업으로 열기';
+$lang['error']                 = '죄송하지만 이 템플릿은 이 기능으로 지원하지 않습니다.';
+$lang['btn_preview']           = '바뀜 미리 보기';
+$lang['btn_save']              = '바뀜 저장';
+$lang['btn_reset']             = '현재 바뀜 재설정';
+$lang['btn_revert']            = '틀의 기본값으로 스타일을 되돌리기';
+$lang['__text__']              = '주요 텍스트 색';
+$lang['__background__']        = '주요 배경 색';
+$lang['__text_alt__']          = '대체 텍스트 색';
+$lang['__background_alt__']    = '대체 배경 색';
+$lang['__text_neu__']          = '중립 텍스트 색';
+$lang['__background_neu__']    = '중립 배경 색';
+$lang['__border__']            = '윤곽선 색';
+$lang['__highlight__']         = '(주로 검색 결과를 위한) 강조 색';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index bc76470e8..e8f846ce6 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -43,7 +43,7 @@ $lang['nonefound']             = '찾은 사용자가 없습니다. 전체 사
 $lang['delete_ok']             = '사용자 %d명이 삭제되었습니다';
 $lang['delete_fail']           = '사용자 %d명을 삭제하는 데 실패했습니다.';
 $lang['update_ok']             = '사용자 정보를 성공적으로 바꾸었습니다';
-$lang['update_fail']           = '사용자 정보를 바꾸는 데 실패했습니다';
+$lang['update_fail']           = '사용자 정보를 업데이트하는 데 실패했습니다';
 $lang['update_exists']         = '사용자 이름을 바꾸는 데 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다)';
 $lang['start']                 = '시작';
 $lang['prev']                  = '이전';
diff --git a/lib/tpl/dokuwiki/lang/ko/lang.php b/lib/tpl/dokuwiki/lang/ko/lang.php
new file mode 100644
index 000000000..efcb44a7f
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/ko/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Myeongjin <aranet100@gmail.com>
+ */
+$lang['__background_site__']   = '(내용 상자 뒤의) 매우 배경 색';
+$lang['__link__']              = '일반 링크 색';
+$lang['__existing__']          = '문서가 존재하는 링크의 색';
+$lang['__missing__']           = '문서가 존재하지 않는 링크의 색';
+$lang['__site_width__']        = '전체 사이트의 너비 (아무 길이 단위나 될 수 있음: %, px, em, ...)';
+$lang['__sidebar_width__']     = '사이드바가 있다면, 그것의 너비 (아무 길이 단위나 될 수 있음: %, px, em, ...)';
+$lang['__tablet_width__']      = '사이트를 태블릿 모드로 전환할 화면 너비';
+$lang['__phone_width__']       = '사이트를 폰 모드로 전환할 화면 너비';
diff --git a/lib/tpl/dokuwiki/lang/ko/style.txt b/lib/tpl/dokuwiki/lang/ko/style.txt
new file mode 100644
index 000000000..306f40edb
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/ko/style.txt
@@ -0,0 +1,4 @@
+로고를 조정하려면, 간단히 미디어 관리자를 사용하여 ''wiki''나 루트 이름공간 안에 ''logo.png''를 올리면
+자동으로 사용됩니다. 또한 여기에 ''favicon.ico''를 올릴 수 있습니다. 만약 닫힌 위키를 사용한다면
+ACL 설정에서 ''wiki'' (또는 루트) 이름공간을 전역으로 읽을 수 있도록 설정하거나 로고를 사용자가
+로그인하지 않으면 보여주지 않도록 설정하는 것을 권장합니다.
\ No newline at end of file
-- 
cgit v1.2.3


From eba74aed310c86e7714ef36a4e31c20476b7f5e6 Mon Sep 17 00:00:00 2001
From: Nicolas Friedli <nicolas@theologique.ch>
Date: Thu, 30 Jul 2015 17:21:11 +0200
Subject: translation update

---
 lib/plugins/authplain/lang/fr/lang.php |  2 ++
 lib/plugins/config/lang/fr/lang.php    |  2 ++
 lib/plugins/extension/lang/fr/lang.php |  3 +++
 lib/plugins/styling/lang/fr/lang.php   |  6 ++++++
 lib/tpl/dokuwiki/lang/fr/lang.php      | 15 +++++++++++++++
 lib/tpl/dokuwiki/lang/fr/style.txt     |  1 +
 6 files changed, 29 insertions(+)
 create mode 100644 lib/tpl/dokuwiki/lang/fr/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/fr/style.txt

diff --git a/lib/plugins/authplain/lang/fr/lang.php b/lib/plugins/authplain/lang/fr/lang.php
index 9df04bba6..362e03bff 100644
--- a/lib/plugins/authplain/lang/fr/lang.php
+++ b/lib/plugins/authplain/lang/fr/lang.php
@@ -4,6 +4,8 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Carbain Frédéric <fcarbain@yahoo.fr>
+ * @author Nicolas Friedli <nicolas@theologique.ch>
  */
 $lang['userexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris.';
 $lang['usernotexists']         = 'Désolé, cet utilisateur n\'existe pas.';
+$lang['writefail']             = 'Impossible de modifier les données utilisateur. Merci d\'en informer l\'administrateur du wiki.';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 7a53d573c..8a51c2b34 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -22,6 +22,7 @@
  * @author Anael Mobilia <contrib@anael.eu>
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  * @author Carbain Frédéric <fcarbain@yahoo.fr>
+ * @author Nicolas Friedli <nicolas@theologique.ch>
  */
 $lang['menu']                  = 'Paramètres de configuration';
 $lang['error']                 = 'Paramètres non modifiés en raison d\'une valeur invalide, vérifiez vos réglages puis réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.';
@@ -203,6 +204,7 @@ $lang['xsendfile_o_2']         = 'Entête standard X-Sendfile';
 $lang['xsendfile_o_3']         = 'En-tête propriétaire Nginx X-Accel-Redirect';
 $lang['showuseras_o_loginname'] = 'Identifiant de l\'utilisateur';
 $lang['showuseras_o_username'] = 'Nom de l\'utilisateur';
+$lang['showuseras_o_username_link'] = 'Nom complet de l\'utilisateur en tant que lien interwiki';
 $lang['showuseras_o_email']    = 'Courriel de l\'utilisateur (brouillé suivant les paramètres de brouillage sélectionnés)';
 $lang['showuseras_o_email_link'] = 'Courriel de l\'utilisateur en tant que lien mailto:';
 $lang['useheading_o_0']        = 'Jamais';
diff --git a/lib/plugins/extension/lang/fr/lang.php b/lib/plugins/extension/lang/fr/lang.php
index 2d990d519..4cb6f0d25 100644
--- a/lib/plugins/extension/lang/fr/lang.php
+++ b/lib/plugins/extension/lang/fr/lang.php
@@ -6,6 +6,7 @@
  * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
  * @author Yves Grandvalet <Yves.Grandvalet@laposte.net>
  * @author Carbain Frédéric <fcarbain@yahoo.fr>
+ * @author Nicolas Friedli <nicolas@theologique.ch>
  */
 $lang['menu']                  = 'Gestionnaire d\'extensions';
 $lang['tab_plugins']           = 'Greffons installés';
@@ -28,6 +29,8 @@ $lang['btn_install']           = 'Installer';
 $lang['btn_reinstall']         = 'Réinstaller';
 $lang['js']['reallydel']       = 'Vraiment désinstaller cette extension';
 $lang['js']['display_viewoptions'] = 'Voir les options:';
+$lang['js']['display_enabled'] = 'activé';
+$lang['js']['display_disabled'] = 'désactivé';
 $lang['js']['display_updatable'] = 'Mise à jour possible';
 $lang['search_for']            = 'Rechercher l\'extension :';
 $lang['search']                = 'Chercher';
diff --git a/lib/plugins/styling/lang/fr/lang.php b/lib/plugins/styling/lang/fr/lang.php
index e25839c82..92b8c3d74 100644
--- a/lib/plugins/styling/lang/fr/lang.php
+++ b/lib/plugins/styling/lang/fr/lang.php
@@ -4,11 +4,16 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Carbain Frédéric <fcarbain@yahoo.fr>
+ * @author Nicolas Friedli <nicolas@theologique.ch>
  */
+$lang['menu']                  = 'Paramètres de style du thème (template)';
+$lang['js']['loader']          = 'La prévisualisation est en chargement... <br />Si rien ne se passe, les données sont peut-être erronées';
 $lang['js']['popup']           = 'Ouvrir dans une nouvelle fenêtre';
 $lang['error']                 = 'Désolé, ce thème ne supporte pas cette fonctionnalité.';
 $lang['btn_preview']           = 'Aperçu des changements';
 $lang['btn_save']              = 'sauvegarder les changements.';
+$lang['btn_reset']             = 'Remettre les changements courants à zéro';
+$lang['btn_revert']            = 'Remettre les styles du thème aux valeurs par défaut';
 $lang['__text__']              = 'Couleur de texte principale';
 $lang['__background__']        = 'Couleur de fond principale';
 $lang['__text_alt__']          = 'Couleur de texte alternative';
@@ -16,3 +21,4 @@ $lang['__background_alt__']    = 'Couleur de fond alternative';
 $lang['__text_neu__']          = 'Couleur de texte neutre';
 $lang['__background_neu__']    = 'Couleur de fond neutre';
 $lang['__border__']            = 'Couleur des contours';
+$lang['__highlight__']         = 'Couleur de surbrillance (utilisée pincipalement pour les résultats de recherche)';
diff --git a/lib/tpl/dokuwiki/lang/fr/lang.php b/lib/tpl/dokuwiki/lang/fr/lang.php
new file mode 100644
index 000000000..ae74ca83e
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/fr/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Nicolas Friedli <nicolas@theologique.ch>
+ */
+$lang['__background_site__']   = 'Couleur du fond (derrière la boîte de contenu)';
+$lang['__link__']              = 'Couleur générale des liens';
+$lang['__existing__']          = 'Couleur des liens pour les pages existantes';
+$lang['__missing__']           = 'Couleur des liens pour les pages inexistantes';
+$lang['__site_width__']        = 'Largeur du site complet (dans une unité de longueur valide: %, px, em,...)';
+$lang['__sidebar_width__']     = 'Largeur de la barre latérale, si existante (dans une unité de longueur valide: %, px, em,...)';
+$lang['__tablet_width__']      = 'En dessous de cette largeur, le site passe en mode tablette.';
+$lang['__phone_width__']       = 'En dessous de cette largeur, le site passe en mode smartphone.';
diff --git a/lib/tpl/dokuwiki/lang/fr/style.txt b/lib/tpl/dokuwiki/lang/fr/style.txt
new file mode 100644
index 000000000..876f116c9
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/fr/style.txt
@@ -0,0 +1 @@
+Si vous souhaitez modifier le logo, utilisez simplement le gestionnaire de médias et envoyez un fichier nommé "logo.png" dans l'espace de nom "wiki" ou à la racine. Il sera automatiquement utilisé. Il en est de même pour le "favicon.ico". Si vous utilisez un wiki fermé, il est recommandé de régler les ACL de la racine ou de l'espace de nom "wiki" pour rendre ces images visibles aux utilisateurs non connectés.
\ No newline at end of file
-- 
cgit v1.2.3


From 3d928be941032419c36c1fef4e7a408c4fc2cfc3 Mon Sep 17 00:00:00 2001
From: "Mark C. Prins" <mprins@users.sf.net>
Date: Thu, 30 Jul 2015 19:11:37 +0200
Subject: translation update

---
 inc/lang/nl/lang.php                   |  1 +
 lib/plugins/extension/lang/nl/lang.php |  3 +++
 lib/plugins/styling/lang/nl/lang.php   | 17 +++++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 lib/plugins/styling/lang/nl/lang.php

diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index dd390d219..4c6694e49 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -27,6 +27,7 @@
  * @author Mijndert <mijndert@mijndertstuij.nl>
  * @author Johan Wijnker <johan@wijnker.eu>
  * @author Hugo Smet <hugo.smet@scarlet.be>
+ * @author Mark C. Prins <mprins@users.sf.net>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
index 3fed9f4a3..71aec75f3 100644
--- a/lib/plugins/extension/lang/nl/lang.php
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -8,6 +8,7 @@
  * @author Johan Vervloet <johan.vervloet@gmail.com>
  * @author Mijndert <mijndert@mijndertstuij.nl>
  * @author Johan Wijnker <johan@wijnker.eu>
+ * @author Mark C. Prins <mprins@users.sf.net>
  */
 $lang['menu']                  = 'Uitbreidingen';
 $lang['tab_plugins']           = 'Geïnstalleerde Plugins';
@@ -29,6 +30,8 @@ $lang['btn_disable']           = 'Schakel uit';
 $lang['btn_install']           = 'Installeer';
 $lang['btn_reinstall']         = 'Her-installeer';
 $lang['js']['reallydel']       = 'Wilt u deze uitbreiding deinstalleren?';
+$lang['js']['display_enabled'] = 'ingeschakeld';
+$lang['js']['display_disabled'] = 'uitgeschakeld';
 $lang['search_for']            = 'Zoek Uitbreiding:';
 $lang['search']                = 'Zoek';
 $lang['extensionby']           = '<strong>%s</strong> by %s';
diff --git a/lib/plugins/styling/lang/nl/lang.php b/lib/plugins/styling/lang/nl/lang.php
new file mode 100644
index 000000000..c712f75ff
--- /dev/null
+++ b/lib/plugins/styling/lang/nl/lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mark C. Prins <mprins@users.sf.net>
+ */
+$lang['btn_preview']           = 'Bekijk aanpassingen';
+$lang['btn_save']              = 'Sla aanpassingen op';
+$lang['btn_reset']             = 'Huidige aanpassingen verwerpen';
+$lang['btn_revert']            = 'Stijlen terugzetten naar de template default';
+$lang['__text__']              = 'Hoofd tekstkleur';
+$lang['__background__']        = 'Hoofd achtergrondkleur';
+$lang['__text_alt__']          = 'Alternatieve tekstkleur';
+$lang['__background_alt__']    = 'Alternatieve achtergrondkleur';
+$lang['__text_neu__']          = 'Neutrale tekstkleur';
+$lang['__background_neu__']    = 'Neutrale achtergrondkleur';
-- 
cgit v1.2.3


From 7b68a313ff0e92802cd196d03c5ebed2728f2691 Mon Sep 17 00:00:00 2001
From: Mete Cuma <mcumax@gmail.com>
Date: Thu, 30 Jul 2015 22:30:56 +0200
Subject: translation update

---
 inc/lang/tr/lang.php                   | 4 +++-
 lib/plugins/authmysql/lang/tr/lang.php | 9 +++++++++
 lib/plugins/authplain/lang/tr/lang.php | 5 +++--
 lib/plugins/config/lang/tr/lang.php    | 6 ++++--
 lib/plugins/extension/lang/tr/lang.php | 3 ++-
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 lib/plugins/authmysql/lang/tr/lang.php

diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 2242b1792..12d7f7490 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Selim Farsakoğlu <farsakogluselim@yahoo.de>
  * @author Aydın Coşkuner <aydinweb@gmail.com>
  * @author Cihan Kahveci <kahvecicihan@gmail.com>
@@ -13,6 +13,7 @@
  * @author huseyin can <huseyincan73@gmail.com>
  * @author ilker rifat kapaç <irifat@gmail.com>
  * @author İlker R. Kapaç <irifat@gmail.com>
+ * @author Mete Cuma <mcumax@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -274,6 +275,7 @@ $lang['subscr_m_unsubscribe']  = 'Üyelik iptali';
 $lang['subscr_m_subscribe']    = 'Kayıt ol';
 $lang['subscr_m_receive']      = 'Al';
 $lang['subscr_style_every']    = 'her değişiklikte e-posta gönder';
+$lang['subscr_style_list']     = 'Son e-postadan bu yana değiştirilen sayfaların listesi (her %.2f gün)';
 $lang['authtempfail']          = 'Kullanıcı doğrulama geçici olarak yapılamıyor. Eğer bu durum devam ederse lütfen Wiki yöneticine haber veriniz.';
 $lang['i_chooselang']          = 'Dili seçiniz';
 $lang['i_installer']           = 'Dokuwiki Kurulum Sihirbazı';
diff --git a/lib/plugins/authmysql/lang/tr/lang.php b/lib/plugins/authmysql/lang/tr/lang.php
new file mode 100644
index 000000000..b5c7b2fe1
--- /dev/null
+++ b/lib/plugins/authmysql/lang/tr/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Mete Cuma <mcumax@gmail.com>
+ */
+$lang['connectfail']           = 'Veritabanına bağlantı kurulamadı.';
+$lang['usernotexists']         = 'Üzgünüz, kullanıcı mevcut değil.';
diff --git a/lib/plugins/authplain/lang/tr/lang.php b/lib/plugins/authplain/lang/tr/lang.php
index d7064e8bf..6111085c2 100644
--- a/lib/plugins/authplain/lang/tr/lang.php
+++ b/lib/plugins/authplain/lang/tr/lang.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  */
-$lang['userexists']     = 'Üzgünüz, bu isime sahip bir kullanıcı zaten mevcut.';
+$lang['userexists']            = 'Üzgünüz, bu isime sahip bir kullanıcı zaten mevcut.';
diff --git a/lib/plugins/config/lang/tr/lang.php b/lib/plugins/config/lang/tr/lang.php
index cb610f4ff..344f22de1 100644
--- a/lib/plugins/config/lang/tr/lang.php
+++ b/lib/plugins/config/lang/tr/lang.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
- * Turkish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Aydın Coşkuner <aydinweb@gmail.com>
  * @author Cihan Kahveci <kahvecicihan@gmail.com>
  * @author Yavuz Selim <yavuzselim@gmail.com>
  * @author Caleb Maclennan <caleb@alerque.com>
  * @author farukerdemoncel@gmail.com
+ * @author Mete Cuma <mcumax@gmail.com>
  */
 $lang['menu']                  = 'Site Ayarları';
 $lang['error']                 = 'Ayarlar yanlış bir değer girildiği için güncellenemedi. Lütfen değişikliklerinizi gözden geçirin ve tekrar gönderin.
diff --git a/lib/plugins/extension/lang/tr/lang.php b/lib/plugins/extension/lang/tr/lang.php
index dfabfa715..c90b7b1c5 100644
--- a/lib/plugins/extension/lang/tr/lang.php
+++ b/lib/plugins/extension/lang/tr/lang.php
@@ -4,6 +4,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author İlker R. Kapaç <irifat@gmail.com>
+ * @author Mete Cuma <mcumax@gmail.com>
  */
 $lang['menu']                  = 'Genişletme Yöneticisi';
 $lang['tab_plugins']           = 'Kurulmuş Eklentiler';
@@ -44,7 +45,7 @@ $lang['available_version']     = 'Müsait sürüm:';
 $lang['compatible']            = 'Şununla uyumlu:';
 $lang['depends']               = 'Şuna bağımlı';
 $lang['similar']               = 'Şununla benzer';
-$lang['conflicts']             = 'Şununla çelişir';
+$lang['conflicts']             = 'Şununla çelişir:';
 $lang['donate']                = 'Beğendiniz mi?';
 $lang['donate_action']         = 'Yazara bir kahve ısmarlayın!';
 $lang['repo_retry']            = 'Yeniden dene';
-- 
cgit v1.2.3


From 49cef4fdcf4c8c1eba59bc3a00aff004599f4a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20B=C3=B6hler?= <dev@aboehler.at>
Date: Fri, 31 Jul 2015 08:24:51 +0200
Subject: Add 'returnonly' option even if no valid url is given

---
 inc/parser/xhtml.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index c544d9e32..c92892a35 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -914,7 +914,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         // is there still an URL?
         if(!$url) {
-            $this->doc .= $name;
+            if($returnonly) {
+                return $name;
+            } else {
+                $this->doc .= $name;
+            }
             return;
         }
 
-- 
cgit v1.2.3


From 767d16693c9df38a2f496d4ca2ba8559db5eba5d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 31 Jul 2015 10:00:09 +0200
Subject: removed deprecated JavaScript

---
 lib/exe/js.php               |   4 +-
 lib/scripts/compatibility.js | 395 -------------------------------------------
 lib/scripts/drag.js          |  87 ----------
 lib/scripts/tw-sack.js       | 140 ---------------
 4 files changed, 1 insertion(+), 625 deletions(-)
 delete mode 100644 lib/scripts/drag.js
 delete mode 100644 lib/scripts/tw-sack.js

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 2df2d0ba6..16d22daf2 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -56,11 +56,9 @@ function js_out(){
                 DOKU_INC.'lib/scripts/delay.js',
                 DOKU_INC.'lib/scripts/cookie.js',
                 DOKU_INC.'lib/scripts/script.js',
-                DOKU_INC.'lib/scripts/tw-sack.js',
                 DOKU_INC.'lib/scripts/qsearch.js',
                 DOKU_INC.'lib/scripts/tree.js',
                 DOKU_INC.'lib/scripts/index.js',
-                DOKU_INC.'lib/scripts/drag.js',
                 DOKU_INC.'lib/scripts/textselection.js',
                 DOKU_INC.'lib/scripts/toolbar.js',
                 DOKU_INC.'lib/scripts/edit.js',
@@ -68,7 +66,7 @@ function js_out(){
                 DOKU_INC.'lib/scripts/locktimer.js',
                 DOKU_INC.'lib/scripts/linkwiz.js',
                 DOKU_INC.'lib/scripts/media.js',
-# deprecated                DOKU_INC.'lib/scripts/compatibility.js',
+                DOKU_INC.'lib/scripts/compatibility.js',
 # disabled for FS#1958                DOKU_INC.'lib/scripts/hotkeys.js',
                 DOKU_INC.'lib/scripts/behaviour.js',
                 DOKU_INC.'lib/scripts/page.js',
diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js
index fc020cce8..154aeadf7 100644
--- a/lib/scripts/compatibility.js
+++ b/lib/scripts/compatibility.js
@@ -40,398 +40,3 @@ function DEPRECATED_WRAP(func, context) {
         return func.apply(context || this, arguments);
     };
 }
-
-/**
- * Handy shortcut to document.getElementById
- *
- * This function was taken from the prototype library
- *
- * @link http://prototype.conio.net/
- */
-function $() {
-    DEPRECATED('Please use the jQuery() function instead.');
-
-    var elements = new Array();
-
-    for (var i = 0; i < arguments.length; i++) {
-        var element = arguments[i];
-        if (typeof element == 'string')
-            element = document.getElementById(element);
-
-        if (arguments.length == 1)
-            return element;
-
-        elements.push(element);
-    }
-
-    return elements;
-}
-
-
-
-
-var index = {
-    throbber_delay: dw_index.throbber_delay,
-    toggle: DEPRECATED_WRAP(dw_index.toggle, dw_index),
-    treeattach: DEPRECATED_WRAP(dw_index.treeattach, dw_index)
-};
-
-var ajax_quicksearch = {
-    init: function() {
-        DEPRECATED('Use jQuery().dw_qsearch() instead');
-        jQuery('#qsearch__in').dw_qsearch({
-            output: '#qsearch__out'
-        });
-    },
-    clear_results: function() {
-        DEPRECATED('ajax_quicksearch.clear_results is removed');
-    },
-    onCompletion: function() {
-        DEPRECATED('ajax_quicksearch.onCompletion is removed');
-    }
-};
-var dw_qsearch = {
-    init: function(input, output) {
-        DEPRECATED('Use jQuery().dw_qsearch() instead');
-        jQuery(input).dw_qsearch({
-            output: output
-        });
-    },
-    clear_results: function() {
-        DEPRECATED('dw_qsearch.clear_results is removed');
-    },
-    onCompletion: function() {
-        DEPRECATED('dw_qsearch.onCompletion is removed');
-    }
-};
-
-var linkwiz = {
-    init: DEPRECATED_WRAP(dw_linkwiz.init, dw_linkwiz),
-    onEntry: DEPRECATED_WRAP(dw_linkwiz.onEntry, dw_linkwiz),
-    getResult: DEPRECATED_WRAP(dw_linkwiz.getResult, dw_linkwiz),
-    select: DEPRECATED_WRAP(dw_linkwiz.select, dw_linkwiz),
-    deselect: DEPRECATED_WRAP(dw_linkwiz.deselect, dw_linkwiz),
-    onResultClick: DEPRECATED_WRAP(dw_linkwiz.onResultClick, dw_linkwiz),
-    resultClick: DEPRECATED_WRAP(dw_linkwiz.resultClick, dw_linkwiz),
-    insertLink: DEPRECATED_WRAP(dw_linkwiz.insertLink, dw_linkwiz),
-    autocomplete: DEPRECATED_WRAP(dw_linkwiz.autocomplete, dw_linkwiz),
-    autocomplete_exec: DEPRECATED_WRAP(dw_linkwiz.autocomplete_exec, dw_linkwiz),
-    show: DEPRECATED_WRAP(dw_linkwiz.show, dw_linkwiz),
-    hide: DEPRECATED_WRAP(dw_linkwiz.hide, dw_linkwiz),
-    toggle: DEPRECATED_WRAP(dw_linkwiz.toggle, dw_linkwiz)
-};
-
-var locktimer = {
-    init: DEPRECATED_WRAP(dw_locktimer.init, dw_locktimer),
-    reset: DEPRECATED_WRAP(dw_locktimer.reset, dw_locktimer),
-    warning: DEPRECATED_WRAP(dw_locktimer.warning, dw_locktimer),
-    clear: DEPRECATED_WRAP(dw_locktimer.clear, dw_locktimer),
-    refresh: DEPRECATED_WRAP(dw_locktimer.refresh, dw_locktimer),
-    refreshed: DEPRECATED_WRAP(dw_locktimer.refreshed, dw_locktimer)
-};
-
-var media_manager = {
-    // treeattach, selectorattach, confirmattach are munched together into
-    // dw_mediamanager.init
-    attachoptions: DEPRECATED_WRAP(dw_mediamanager.attachoptions, dw_mediamanager),
-    togglekeepopen: function (event, cb) {
-        DEPRECATED('Use dw_mediamanager.toggleOption instead');
-        return dw_mediamanager.toggleOption.call(cb, 'keepopen');
-    },
-    togglehide: function (event, cb) {
-        DEPRECATED('Use dw_mediamanager.toggleOption instead');
-        return dw_mediamanager.toggleOption.call(cb, 'hide');
-    },
-    updatehide: DEPRECATED_WRAP(dw_mediamanager.updatehide, dw_mediamanager),
-    select: function (event, link) {
-        DEPRECATED('Use dw_mediamanager.select instead');
-        return dw_mediamanager.select.call(link, event);
-    },
-    initpopup: DEPRECATED_WRAP(dw_mediamanager.initpopup, dw_mediamanager),
-    insert: DEPRECATED_WRAP(dw_mediamanager.insert, dw_mediamanager),
-    list: function (event, link) {
-        DEPRECATED('Use dw_mediamanager.list instead');
-        return dw_mediamanager.list.call(link, event);
-    },
-    // toggle is handled by dw_tree
-    suggest: DEPRECATED_WRAP(dw_mediamanager.suggest, dw_mediamanager),
-    initFlashUpload: DEPRECATED_WRAP(dw_mediamanager.initFlashUpload, dw_mediamanager),
-    closePopup: function () {
-        DEPRECATED();
-        dw_mediamanager.$popup.dialog('close');
-    },
-    setalign: function (event, cb) {
-        DEPRECATED('Use dw_mediamanager.setOpt instead');
-        return dw_mediamanager.setOpt.call(this, 'align', event);
-    },
-    setlink: function (event, cb) {
-        DEPRECATED('Use dw_mediamanager.setOpt instead');
-        return dw_mediamanager.setOpt.call(this, 'link', event);
-    },
-    setsize: function (event, cb) {
-        DEPRECATED('Use dw_mediamanager.setOpt instead');
-        return dw_mediamanager.setOpt.call(this, 'size', event);
-    },
-    outSet: function (id) {
-        DEPRECATED();
-        return jQuery(id).removeClass('selected');
-    },
-    inSet: function (id) {
-        DEPRECATED();
-        return jQuery(id).addClass('selected');
-    }
-};
-
-initSizeCtl = DEPRECATED_WRAP(dw_editor.initSizeCtl);
-sizeCtl = DEPRECATED_WRAP(dw_editor.sizeCtl);
-toggleWrap = DEPRECATED_WRAP(dw_editor.toggleWrap);
-setWrap = DEPRECATED_WRAP(dw_editor.setWrap);
-
-function findPosX(object){
-    DEPRECATED('Use jQuery.offset() instead');
-    return jQuery(object).offset().left;
-}
-
-function findPosY(object){
-    DEPRECATED('Use jQuery.offset() instead');
-    return jQuery(object).offset().top;
-}
-
-function getElementsByClass(searchClass,node,tag){
-    DEPRECATED('Use jQuery() instead');
-    if(node == null) node = document;
-    if(typeof tag === 'undefined') tag = '';
-    return jQuery(node).find(tag+'.'+searchClass).toArray();
-}
-
-function prependChild(parent,element) {
-    DEPRECATED('Use jQuery.prepend() instead');
-    jQuery(parent).prepend(element);
-}
-
-function addEvent(element, type, handler) {
-    DEPRECATED('Use jQuery.bind() instead. Note that jQuery’s behaviour' +
-               ' when a handler returns false differs from addEvent’s');
-    jQuery(element).bind(type,{},function (e) {
-        // returning false in an addEvent event handler did not prevent
-        // bubbling but just canceled handlers on this node and prevented
-        // default behavior, so wrap the handler call and mimic that behavior.
-        //
-        // Refer to jQuery.event.handle().
-        var ret = handler.apply(this, Array.prototype.slice.call(arguments, 0));
-        if (typeof ret !== 'undefined') {
-            if ( ret !== false ) {
-                return ret;
-            }
-            // What jQuery does.
-            e.result = ret;
-            e.preventDefault();
-            // Not what jQuery does. This would be: event.stopPropagation();
-            // Hack it so that immediate propagation (other event handlers on
-            // this element) appears stopped without stopping the actual
-            // propagation (bubbling)
-            e.isImmediatePropagationStopped = function () { return true; };
-        }
-    });
-}
-
-function removeEvent(element, type, handler) {
-    DEPRECATED('Use jQuery.unbind() instead.');
-    jQuery(element).unbind(type,handler);
-}
-
-function addInitEvent(func) {
-    DEPRECATED('Use jQuery(<function>) instead');
-    jQuery(func);
-}
-
-
-function jsEscape(text){
-    DEPRECATED('Insert text through jQuery.text() instead of escaping on your own');
-    var re=new RegExp("\\\\","g");
-    text=text.replace(re,"\\\\");
-    re=new RegExp("'","g");
-    text=text.replace(re,"\\'");
-    re=new RegExp('"',"g");
-    text=text.replace(re,'&quot;');
-    re=new RegExp("\\\\\\\\n","g");
-    text=text.replace(re,"\\n");
-    return text;
-}
-
-/**
- * Simple function to check if a global var is defined
- *
- * @author Kae Verens
- * @link http://verens.com/archives/2005/07/25/isset-for-javascript/#comment-2835
- */
-function isset(varname){
-    DEPRECATED("Use `typeof var !== 'undefined'` instead");
-    return(typeof(window[varname])!='undefined');
-}
-
-/**
- * Checks if property is undefined
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isUndefined (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `typeof var === 'undefined'` instead");
-    return (typeof prop == 'undefined');
-}
-
-/**
- * Checks if property is function
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isFunction (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `typeof var === 'function'` instead");
-    return (typeof prop == 'function');
-}
-/**
- * Checks if property is string
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isString (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `typeof var === 'string'` instead");
-    return (typeof prop == 'string');
-}
-
-/**
- * Checks if property is number
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isNumber (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `typeof var === 'number'` instead");
-    return (typeof prop == 'number');
-}
-
-/**
- * Checks if property is the calculable number
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isNumeric (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `typeof var === 'number' && !isNaN(var) && isFinite(var)` instead");
-    return isNumber(prop)&&!isNaN(prop)&&isFinite(prop);
-}
-
-/**
- * Checks if property is array
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isArray (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `var instanceof Array` instead");
-    return (prop instanceof Array);
-}
-
-/**
- *  Checks if property is regexp
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isRegExp (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `var instanceof RegExp` instead");
-    return (prop instanceof RegExp);
-}
-
-/**
- * Checks if property is a boolean value
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isBoolean (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `typeof var === 'boolean'` instead");
-    return ('boolean' == typeof prop);
-}
-
-/**
- * Checks if property is a scalar value (value that could be used as the hash key)
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isScalar (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED("Use `typeof var === 'string' || (typeof var === 'number' &&" +
-               " !isNaN(var) && isFinite(var))` instead");
-    return isNumeric(prop)||isString(prop);
-}
-
-/**
- * Checks if property is empty
- *
- * @param {Object} prop value to check
- * @return {Boolean} true if matched
- * @scope public
- * @author Ilya Lebedev <ilya@lebedev.net>
- */
-function isEmpty (prop /* :Object */) /* :Boolean */ {
-    DEPRECATED();
-    var i;
-    if (isBoolean(prop)) {
-        return false;
-    } else if (isRegExp(prop) && new RegExp("").toString() == prop.toString()) {
-        return true;
-    } else if (isString(prop) || isNumber(prop)) {
-        return !prop;
-    } else if (Boolean(prop) && false != prop) {
-        for (i in prop) {
-            if(prop.hasOwnProperty(i)) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-/**
- * Get the computed style of a node.
- *
- * @link https://acidmartin.wordpress.com/2008/08/26/style-get-any-css-property-value-of-an-object/
- * @link http://svn.dojotoolkit.org/src/dojo/trunk/_base/html.js
- */
-function gcs(node){
-    DEPRECATED('Use jQuery(node).style() instead');
-    if(node.currentStyle){
-        return node.currentStyle;
-    }else{
-        return node.ownerDocument.defaultView.getComputedStyle(node, null);
-    }
-}
-
-/**
- * Until 2011-05-25 "Rincewind", a code intended to fix some Safari issue
- * always declared the global _timer. plugin:sortablejs relies on _timer
- * being declared.
- */
-var _timer;
diff --git a/lib/scripts/drag.js b/lib/scripts/drag.js
deleted file mode 100644
index dd252d95d..000000000
--- a/lib/scripts/drag.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Makes a DOM object draggable
- *
- * If you just want to move objects around, use drag.attach. For full
- * customization, drag can be used as a javascript prototype, it is
- * inheritance-aware.
- *
- * @deprecated
- * @link http://nofunc.org/Drag_Drop/
- */
-var drag = {
-    obj: null,
-    handle: null,
-    oX: 0,  // object X position
-    oY: 0,  // object Y position
-    eX: 0,  // event X delta
-    eY: 0,  // event Y delta
-
-    /**
-     * Attaches the needed handlers to the given object
-     *
-     * This can be called for multiple objects, the right one is later
-     * determined from the event itself. The handle is optional
-     *
-     * @param DOMObject obj    The object that should be draggable
-     * @param DOMObject handle A handle on which the obj can be dragged
-     */
-    attach: function (obj,handle) {
-        DEPRECATED('Use jQuery.draggable() instead.');
-        if(handle){
-            handle.dragobject = obj;
-        }else{
-            handle = obj;
-        }
-        var _this = this;
-        addEvent($(handle),'mousedown',function (e) {return _this.start(e); });
-    },
-
-    /**
-     * Starts the dragging operation
-     */
-    start: function (e){
-        this.handle = e.target;
-        if(this.handle.dragobject){
-            this.obj = this.handle.dragobject;
-        }else{
-            this.obj = this.handle;
-        }
-
-        this.handle.className += ' ondrag';
-        this.obj.className    += ' ondrag';
-
-        this.oX = parseInt(this.obj.style.left);
-        this.oY = parseInt(this.obj.style.top);
-        this.eX = e.pageX;
-        this.eY = e.pageY;
-
-        var _this = this;
-        this.mousehandlers = [function (e) {return _this.drag(e);}, function (e) {return _this.stop(e);}];
-        addEvent(document,'mousemove', this.mousehandlers[0]);
-        addEvent(document,'mouseup', this.mousehandlers[1]);
-
-        return false;
-    },
-
-    /**
-     * Ends the dragging operation
-     */
-    stop: function(){
-        this.handle.className = this.handle.className.replace(/ ?ondrag/,'');
-        this.obj.className    = this.obj.className.replace(/ ?ondrag/,'');
-        removeEvent(document,'mousemove', this.mousehandlers[0]);
-        removeEvent(document,'mouseup', this.mousehandlers[1]);
-        this.obj = null;
-        this.handle = null;
-    },
-
-    /**
-     * Moves the object during the dragging operation
-     */
-    drag: function(e) {
-        if(this.obj) {
-            this.obj.style.top  = (e.pageY+this.oY-this.eY+'px');
-            this.obj.style.left = (e.pageX+this.oX-this.eX+'px');
-        }
-    }
-};
diff --git a/lib/scripts/tw-sack.js b/lib/scripts/tw-sack.js
deleted file mode 100644
index b0e570151..000000000
--- a/lib/scripts/tw-sack.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Simple AJAX Code-Kit (SACK) */
-/* ©2005 Gregory Wild-Smith */
-/* www.twilightuniverse.com */
-/* Software licenced under a modified X11 licence, see documentation or authors website for more details */
-/* @deprecated */
-
-function sack(file){
-  this.AjaxFailedAlert = "Your browser does not support the enhanced functionality of this website, and therefore you will have an experience that differs from the intended one.\n";
-  this.requestFile = file;
-  this.method = "POST";
-  this.URLString = "";
-  this.encodeURIString = true;
-  this.execute = false;
-  this.asynchronous = true;
-
-  this.onLoading = function() { };
-  this.onLoaded = function() { };
-  this.onInteractive = function() { };
-  this.onCompletion = function() { };
-  this.afterCompletion = function() { };
-
-  this.createAJAX = function() {
-    try {
-      this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-    } catch (e) {
-      try {
-        this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-      } catch (err) {
-        this.xmlhttp = null;
-      }
-    }
-    if(!this.xmlhttp && typeof XMLHttpRequest != "undefined"){
-      this.xmlhttp = new XMLHttpRequest();
-    }
-    if (!this.xmlhttp){
-      this.failed = true;
-    }
-  };
-
-  this.setVar = function(name, value){
-    if (this.URLString.length < 3){
-      this.URLString = name + "=" + value;
-    } else {
-      this.URLString += "&" + name + "=" + value;
-    }
-  };
-
-  this.encVar = function(name, value){
-    var varString = encodeURIComponent(name) + "=" + encodeURIComponent(value);
-  return varString;
-  };
-
-  this.encodeURLString = function(string){
-    varArray = string.split('&');
-    for (i = 0; i < varArray.length; i++){
-      urlVars = varArray[i].split('=');
-      if (urlVars[0].indexOf('amp;') != -1){
-        urlVars[0] = urlVars[0].substring(4);
-      }
-      varArray[i] = this.encVar(urlVars[0],urlVars[1]);
-    }
-  return varArray.join('&');
-  };
-
-  this.runResponse = function(){
-    eval(this.response);
-  };
-
-  this.runAJAX = function(urlstring){
-    DEPRECATED('Please use jQuery.post() or any other of jQuery\'s AJAX methods.');
-
-    this.responseStatus = new Array(2);
-    if(this.failed && this.AjaxFailedAlert){
-      alert(this.AjaxFailedAlert);
-    } else {
-      if (urlstring){
-        if (this.URLString.length){
-          this.URLString = this.URLString + "&" + urlstring;
-        } else {
-          this.URLString = urlstring;
-        }
-      }
-      if (this.encodeURIString){
-        var timeval = new Date().getTime();
-        this.URLString = this.encodeURLString(this.URLString);
-        this.setVar("rndval", timeval);
-      }
-      if (this.element) { this.elementObj = document.getElementById(this.element); }
-      if (this.xmlhttp) {
-        var self = this;
-        if (this.method == "GET") {
-          var totalurlstring = this.requestFile + "?" + this.URLString;
-          this.xmlhttp.open(this.method, totalurlstring, this.asynchronous);
-        } else {
-          this.xmlhttp.open(this.method, this.requestFile, this.asynchronous);
-        }
-        if (this.method == "POST"){
-          try {
-             this.xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8');
-          } catch (e) {}
-        }
-
-        this.xmlhttp.onreadystatechange = function() {
-          switch (self.xmlhttp.readyState){
-            case 1:
-              self.onLoading();
-            break;
-            case 2:
-              self.onLoaded();
-            break;
-            case 3:
-              self.onInteractive();
-            break;
-            case 4:
-              self.response = self.xmlhttp.responseText;
-              self.responseXML = self.xmlhttp.responseXML;
-              self.responseStatus[0] = self.xmlhttp.status;
-              self.responseStatus[1] = self.xmlhttp.statusText;
-              self.onCompletion();
-              if(self.execute){ self.runResponse(); }
-              if (self.elementObj) {
-                var elemNodeName = self.elementObj.nodeName;
-                elemNodeName.toLowerCase();
-                if (elemNodeName == "input" || elemNodeName == "select" || elemNodeName == "option" || elemNodeName == "textarea"){
-                  self.elementObj.value = self.response;
-                } else {
-                  self.elementObj.innerHTML = self.response;
-                }
-              }
-              self.afterCompletion();
-              self.URLString = "";
-            break;
-          }
-        };
-        this.xmlhttp.send(this.URLString);
-      }
-    }
-  };
-this.createAJAX();
-}
-- 
cgit v1.2.3


From 656e58456ff0e79ba9cdcbffc1e23c89d43c123c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 31 Jul 2015 10:35:23 +0100
Subject: removed deprecated support for style.local.ini

use conf/tpl/<template-folder-name>/style.ini instead
---
 lib/exe/css.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 3b8a524bc..925b78a76 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -59,7 +59,6 @@ function css_out(){
     $tplinc = tpl_incdir($tpl);
     $cache_files = getConfigFiles('main');
     $cache_files[] = $tplinc.'style.ini';
-    $cache_files[] = $tplinc.'style.local.ini'; // @deprecated
     $cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
     $cache_files[] = __FILE__;
     if($INPUT->bool('preview')) $cache_files[] = $conf['cachedir'].'/preview.ini';
@@ -289,23 +288,6 @@ function css_styleini($tpl, $preview=false) {
         }
     }
 
-    // load template's style.local.ini
-    // @deprecated 2013-08-03
-    $ini = $incbase.'style.local.ini';
-    if(file_exists($ini)){
-        $data = parse_ini_file($ini, true);
-
-        // stylesheets
-        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
-            $stylesheets[$mode][$incbase.$file] = $webbase;
-        }
-
-        // replacements
-        if(is_array($data['replacements'])){
-            $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
-        }
-    }
-
     // load configs's style.ini
     $webbase = DOKU_BASE;
     $ini = DOKU_CONF."tpl/$tpl/style.ini";
-- 
cgit v1.2.3


From 3b5e1a0ea28a4d5252a8b013997d8a3837dd5e28 Mon Sep 17 00:00:00 2001
From: hugo smet <hugo.smet@scarlet.be>
Date: Fri, 31 Jul 2015 13:01:27 +0200
Subject: translation update

---
 inc/lang/nl/lang.php                   |  1 +
 lib/plugins/config/lang/nl/lang.php    |  2 ++
 lib/plugins/extension/lang/nl/lang.php |  3 +++
 lib/plugins/styling/lang/nl/intro.txt  |  2 ++
 lib/plugins/styling/lang/nl/lang.php   |  7 +++++++
 lib/tpl/dokuwiki/lang/nl/lang.php      | 15 +++++++++++++++
 lib/tpl/dokuwiki/lang/nl/style.txt     |  1 +
 7 files changed, 31 insertions(+)
 create mode 100644 lib/plugins/styling/lang/nl/intro.txt
 create mode 100644 lib/tpl/dokuwiki/lang/nl/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/nl/style.txt

diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 4c6694e49..a2f2a64ce 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -28,6 +28,7 @@
  * @author Johan Wijnker <johan@wijnker.eu>
  * @author Hugo Smet <hugo.smet@scarlet.be>
  * @author Mark C. Prins <mprins@users.sf.net>
+ * @author hugo smet <hugo.smet@scarlet.be>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index 3761ce839..c157b64a0 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -17,6 +17,7 @@
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
  * @author Gerrit <klapinklapin@gmail.com>
  * @author Hugo Smet <hugo.smet@scarlet.be>
+ * @author hugo smet <hugo.smet@scarlet.be>
  */
 $lang['menu']                  = 'Configuratie-instellingen';
 $lang['error']                 = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.<br />Je kunt de incorrecte waarde(s) herkennen aan de rode rand.';
@@ -92,6 +93,7 @@ $lang['disableactions_subscription'] = 'Inschrijven/opzeggen';
 $lang['disableactions_wikicode'] = 'Bron bekijken/exporteer rauw';
 $lang['disableactions_profile_delete'] = 'Schrap eigen account';
 $lang['disableactions_other']  = 'Andere akties (gescheiden door komma\'s)';
+$lang['disableactions_rss']    = 'XML Syndication (RSS)';
 $lang['auth_security_timeout'] = 'Authenticatiebeveiligings-timeout (seconden)';
 $lang['securecookie']          = 'Moeten cookies die via HTTPS gezet zijn alleen via HTTPS verzonden worden door de browser? Zet deze optie uit als alleen het inloggen op de wiki beveiligd is, maar het gebruik verder niet.';
 $lang['remote']                = 'Activeer het remote API-systeem. Hiermee kunnen andere applicaties de wiki benaderen via XML-RPC of andere mechanismen.';
diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
index 71aec75f3..b2bb46bae 100644
--- a/lib/plugins/extension/lang/nl/lang.php
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -9,6 +9,7 @@
  * @author Mijndert <mijndert@mijndertstuij.nl>
  * @author Johan Wijnker <johan@wijnker.eu>
  * @author Mark C. Prins <mprins@users.sf.net>
+ * @author hugo smet <hugo.smet@scarlet.be>
  */
 $lang['menu']                  = 'Uitbreidingen';
 $lang['tab_plugins']           = 'Geïnstalleerde Plugins';
@@ -30,8 +31,10 @@ $lang['btn_disable']           = 'Schakel uit';
 $lang['btn_install']           = 'Installeer';
 $lang['btn_reinstall']         = 'Her-installeer';
 $lang['js']['reallydel']       = 'Wilt u deze uitbreiding deinstalleren?';
+$lang['js']['display_viewoptions'] = 'Weergave opties:';
 $lang['js']['display_enabled'] = 'ingeschakeld';
 $lang['js']['display_disabled'] = 'uitgeschakeld';
+$lang['js']['display_updatable'] = 'aanpasbaar';
 $lang['search_for']            = 'Zoek Uitbreiding:';
 $lang['search']                = 'Zoek';
 $lang['extensionby']           = '<strong>%s</strong> by %s';
diff --git a/lib/plugins/styling/lang/nl/intro.txt b/lib/plugins/styling/lang/nl/intro.txt
new file mode 100644
index 000000000..280ab3eed
--- /dev/null
+++ b/lib/plugins/styling/lang/nl/intro.txt
@@ -0,0 +1,2 @@
+Deze tool laat u toe om bepaalde stijl instellingen van uw huidig geselecteerd sjabloon aan te passen.
+Alle aanpassingen worden in een lokaal configuratie bestand bewaard en zijn upgrade veilig.
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/nl/lang.php b/lib/plugins/styling/lang/nl/lang.php
index c712f75ff..c5bbe77d3 100644
--- a/lib/plugins/styling/lang/nl/lang.php
+++ b/lib/plugins/styling/lang/nl/lang.php
@@ -4,7 +4,12 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Mark C. Prins <mprins@users.sf.net>
+ * @author hugo smet <hugo.smet@scarlet.be>
  */
+$lang['menu']                  = 'Sjabloon stijl instellingen';
+$lang['js']['loader']          = 'Voorbeeldweergave is aan het laden...<br />als dit niet verdwijnt zijn uw instellingen mogelijks foutief.';
+$lang['js']['popup']           = 'Open als popup';
+$lang['error']                 = 'Sorry, dit sjabloon ondersteunt deze functionaliteit niet.';
 $lang['btn_preview']           = 'Bekijk aanpassingen';
 $lang['btn_save']              = 'Sla aanpassingen op';
 $lang['btn_reset']             = 'Huidige aanpassingen verwerpen';
@@ -15,3 +20,5 @@ $lang['__text_alt__']          = 'Alternatieve tekstkleur';
 $lang['__background_alt__']    = 'Alternatieve achtergrondkleur';
 $lang['__text_neu__']          = 'Neutrale tekstkleur';
 $lang['__background_neu__']    = 'Neutrale achtergrondkleur';
+$lang['__border__']            = 'Kader kleur';
+$lang['__highlight__']         = 'Accentkleur (hoofdzakelijk voor zoekresultaten)';
diff --git a/lib/tpl/dokuwiki/lang/nl/lang.php b/lib/tpl/dokuwiki/lang/nl/lang.php
new file mode 100644
index 000000000..474ecb744
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/nl/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author hugo smet <hugo.smet@scarlet.be>
+ */
+$lang['__background_site__']   = 'Kleur voor de echter ondergrond (achter de inhoud kader)';
+$lang['__link__']              = 'Kleur voor algemene link';
+$lang['__existing__']          = 'Kleur voor link naar bestaande pagina\'s.';
+$lang['__missing__']           = 'Kleur voor link naar onbestaande pagina\'s';
+$lang['__site_width__']        = 'Breedte van de max site (in gelijk welke eenheid: %, px, em,...)';
+$lang['__sidebar_width__']     = 'Breedte van de zijbalk,  indien aanwezig  (in gelijk welke eenheid: %, px, em,...)';
+$lang['__tablet_width__']      = 'Beneden de breedte van deze schermafmetingen schakelt de site over naar tablet modus.';
+$lang['__phone_width__']       = 'Beneden de breedte van deze schermafmetingen schakelt de site over naar telefoon modus.';
diff --git a/lib/tpl/dokuwiki/lang/nl/style.txt b/lib/tpl/dokuwiki/lang/nl/style.txt
new file mode 100644
index 000000000..5dbc61568
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/nl/style.txt
@@ -0,0 +1 @@
+Wil je de logo aanpassen, gebruik dan de Media Manager en een "logo.png" in "wiki" of root naamruimte opladen, waarna het automatisch gebruikt wordt. Je kan ook een "favicon.ico" hiervoor gebruiken. Indien je een gesloten wiki gebruikt is het aangeraden om de "wiki" (of root) naamruimte leesbaar te maken voor iedereen in de ACL instellingen of je logo wordt niet getoond aan niet ingelogde gebruikers.
\ No newline at end of file
-- 
cgit v1.2.3


From 0b55591d7a88c7a2447c650dd998caf8103c8344 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 31 Jul 2015 13:00:01 +0200
Subject: deprecation of Archive libs

---
 inc/Tar.class.php    |  1 +
 inc/TarLib.class.php | 89 ----------------------------------------------------
 inc/ZipLib.class.php |  1 +
 inc/load.php         |  1 -
 4 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 inc/TarLib.class.php

diff --git a/inc/Tar.class.php b/inc/Tar.class.php
index 0dc7dace2..57c280d79 100644
--- a/inc/Tar.class.php
+++ b/inc/Tar.class.php
@@ -43,6 +43,7 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Bouchon <tarlib@bouchon.org> (Maxg)
  * @license GPL 2
+ * @deprecated 2015-05-15 - use splitbrain\PHPArchive\Tar instead
  */
 class Tar {
 
diff --git a/inc/TarLib.class.php b/inc/TarLib.class.php
deleted file mode 100644
index dd319a79a..000000000
--- a/inc/TarLib.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * This is a compatibility wrapper around the new Tar class
- *
- * Use of this library is strongly discouraged. Only basic extraction is wrapped,
- * everything else will fail.
- *
- * @deprecated 2012-11-06
- */
-class TarLib {
-
-    const   COMPRESS_GZIP      = 1;
-    const   COMPRESS_BZIP      = 2;
-    const   COMPRESS_AUTO      = 3;
-    const   COMPRESS_NONE      = 0;
-    const   TARLIB_VERSION     = '1.2';
-    const   FULL_ARCHIVE       = -1;
-    const   ARCHIVE_DYNAMIC    = 0;
-    const   ARCHIVE_RENAMECOMP = 5;
-    const   COMPRESS_DETECT    = -1;
-
-    private $file = '';
-    private $tar;
-
-    public $_result = true;
-
-    function __construct($file, $comptype = TarLib::COMPRESS_AUTO, $complevel = 9) {
-        dbg_deprecated('class Tar');
-
-        if(!$file) $this->error('__construct', '$file');
-
-        $this->file = $file;
-        switch($comptype) {
-            case TarLib::COMPRESS_AUTO:
-            case TarLib::COMPRESS_DETECT:
-                $comptype = Tar::COMPRESS_AUTO;
-                break;
-            case TarLib::COMPRESS_GZIP:
-                $comptype = Tar::COMPRESS_GZIP;
-                break;
-            case TarLib::COMPRESS_BZIP:
-                $comptype = Tar::COMPRESS_BZIP;
-                break;
-            default:
-                $comptype = Tar::COMPRESS_NONE;
-        }
-
-        $this->complevel = $complevel;
-
-        try {
-            $this->tar = new Tar();
-            $this->tar->open($file, $comptype);
-        } catch(Exception $e) {
-            $this->_result = false;
-        }
-    }
-
-    function Extract($p_what = TarLib::FULL_ARCHIVE, $p_to = '.', $p_remdir = '', $p_mode = 0755) {
-        if($p_what != TarLib::FULL_ARCHIVE) {
-            $this->error('Extract', 'Ep_what');
-            return 0;
-        }
-
-        try {
-            $this->tar->extract($p_to, $p_remdir);
-        } catch(Exception $e) {
-            return 0;
-        }
-        return 1;
-    }
-
-    function error($func, $param = '') {
-        $error = 'TarLib is deprecated and should no longer be used.';
-
-        if($param) {
-            $error .= "In this compatibility wrapper, the function '$func' does not accept your value for".
-                "the parameter '$param' anymore.";
-        } else {
-            $error .= "The function '$func' no longer exists in this compatibility wrapper.";
-        }
-
-        msg($error, -1);
-    }
-
-    function __call($name, $arguments) {
-        $this->error($name);
-    }
-}
\ No newline at end of file
diff --git a/inc/ZipLib.class.php b/inc/ZipLib.class.php
index 5b524c4ab..1358ca45e 100644
--- a/inc/ZipLib.class.php
+++ b/inc/ZipLib.class.php
@@ -6,6 +6,7 @@
  * @link       http://forum.maxg.info
  *
  * Modified for Dokuwiki
+ * @deprecated 2015-05-15 - use splitbrain\PHPArchive\Zip instead
  * @author    Christopher Smith <chris@jalakai.co.uk>
  */
 class ZipLib {
diff --git a/inc/load.php b/inc/load.php
index daf856188..b78a9ee38 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -71,7 +71,6 @@ function load_autoload($name){
         'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
         'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
         'Tar'                   => DOKU_INC.'inc/Tar.class.php',
-        'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
         'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
         'DokuWikiFeedCreator'   => DOKU_INC.'inc/feedcreator.class.php',
         'Doku_Parser_Mode'      => DOKU_INC.'inc/parser/parser.php',
-- 
cgit v1.2.3


From 34d1de72006386b5ac410123c9a9bd2deaa17677 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 31 Jul 2015 13:17:39 +0200
Subject: removed more deprecated code

---
 inc/subscription.php                         | 16 ----------------
 lib/plugins/config/settings/config.class.php | 23 -----------------------
 2 files changed, 39 deletions(-)

diff --git a/inc/subscription.php b/inc/subscription.php
index 8b6dcb27e..74bec656d 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -691,19 +691,3 @@ class Subscription {
         $data['addresslist'] = trim($addresslist.','.implode(',', $result), ',');
     }
 }
-
-/**
- * Compatibility wrapper around Subscription:notifyaddresses
- *
- * for plugins emitting COMMON_NOTIFY_ADDRESSLIST themselves and relying on on this to
- * be the default handler
- *
- * @param array $data event data for
- *
- * @deprecated 2012-12-07
- */
-function subscription_addresslist(&$data) {
-    dbg_deprecated('class Subscription');
-    $sub = new Subscription();
-    $sub->notifyaddresses($data);
-}
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index f2d43bff6..9d0ad2c4e 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -887,29 +887,6 @@ if (!class_exists('setting_email')) {
     }
 }
 
-/**
- * @deprecated 2013-02-16
- */
-if (!class_exists('setting_richemail')) {
-    /**
-     * Class setting_richemail
-     */
-    class setting_richemail extends setting_email {
-        /**
-         * update changed setting with user provided value $input
-         * - if changed value fails error check, save it
-         *
-         * @param  mixed   $input   the new value
-         * @return boolean          true if changed, false otherwise (also on error)
-         */
-        function update($input) {
-            $this->_placeholders = true;
-            return parent::update($input);
-        }
-    }
-}
-
-
 if (!class_exists('setting_numeric')) {
     /**
      * Class setting_numeric
-- 
cgit v1.2.3


From 3333cbc9dae2edb61051985a8b969412d8e425ff Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 31 Jul 2015 13:19:55 +0200
Subject: locktimer: removed deprecrated stuff and some cleanup

---
 lib/scripts/locktimer.js | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/lib/scripts/locktimer.js b/lib/scripts/locktimer.js
index 96f963c08..f83b6334e 100644
--- a/lib/scripts/locktimer.js
+++ b/lib/scripts/locktimer.js
@@ -12,24 +12,13 @@ var dw_locktimer = {
     /**
      * Initialize the lock timer
      *
-     * @param int    timeout Length of timeout in seconds
-     * @param string msg     Deprecated; The expiry message
-     * @param bool   draft   Whether to save drafts
-     * @param string edid    Optional; ID of an edit object which has to be present
+     * @param {int}    timeout Length of timeout in seconds
+     * @param {bool}   draft   Whether to save drafts
+     * @param {string} edid    Optional; ID of an edit object which has to be present
      */
-    init: function(timeout,msg,draft,edid){
+    init: function(timeout,draft,edid){
         var $edit;
 
-        switch (arguments.length) {
-        case 4:
-            DEPRECATED('Setting the locktimer expiry message is deprecated');
-            dw_locktimer.msg = msg;
-            break;
-        case 3:
-            edid = draft;
-        case 2:
-            draft = msg;
-        }
         edid = edid || 'wiki__text';
 
         $edit = jQuery('#' + edid);
@@ -42,7 +31,7 @@ var dw_locktimer = {
         dw_locktimer.draft    = draft;
         dw_locktimer.lasttime = new Date();
 
-        dw_locktimer.pageid   = jQuery('#dw__editform input[name=id]').val();
+        dw_locktimer.pageid   = jQuery('#dw__editform').find('input[name=id]').val();
         if(!dw_locktimer.pageid) {
             return;
         }
@@ -94,7 +83,7 @@ var dw_locktimer = {
         }
 
         // POST everything necessary for draft saving
-        if(dw_locktimer.draft && jQuery('#dw__editform textarea[name=wikitext]').length > 0){
+        if(dw_locktimer.draft && jQuery('#dw__editform').find('textarea[name=wikitext]').length > 0){
             params += jQuery('#dw__editform').find('input[name=prefix], ' +
                                                    'textarea[name=wikitext], ' +
                                                    'input[name=suffix], ' +
-- 
cgit v1.2.3


From 2c5a71999aee45dfc8ac55943c96b12614dc6179 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 31 Jul 2015 13:35:58 +0200
Subject: Update intro.txt

---
 lib/plugins/styling/lang/nl/intro.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/styling/lang/nl/intro.txt b/lib/plugins/styling/lang/nl/intro.txt
index 280ab3eed..727593848 100644
--- a/lib/plugins/styling/lang/nl/intro.txt
+++ b/lib/plugins/styling/lang/nl/intro.txt
@@ -1,2 +1,2 @@
-Deze tool laat u toe om bepaalde stijl instellingen van uw huidig geselecteerd sjabloon aan te passen.
-Alle aanpassingen worden in een lokaal configuratie bestand bewaard en zijn upgrade veilig.
\ No newline at end of file
+Deze tool laat u een aantal stijlinstellingen van uw huidig geselecteerde template aanpassen.
+Alle aanpassingen worden in een lokaal configuratiebestand bewaard en zijn upgrade veilig.
-- 
cgit v1.2.3


From 352564b7bd4247412139ce3cf33f8adac6cce7b3 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 31 Jul 2015 13:45:19 +0200
Subject: Update lang.php

---
 lib/plugins/styling/lang/nl/lang.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/plugins/styling/lang/nl/lang.php b/lib/plugins/styling/lang/nl/lang.php
index c5bbe77d3..dd258051e 100644
--- a/lib/plugins/styling/lang/nl/lang.php
+++ b/lib/plugins/styling/lang/nl/lang.php
@@ -6,14 +6,14 @@
  * @author Mark C. Prins <mprins@users.sf.net>
  * @author hugo smet <hugo.smet@scarlet.be>
  */
-$lang['menu']                  = 'Sjabloon stijl instellingen';
-$lang['js']['loader']          = 'Voorbeeldweergave is aan het laden...<br />als dit niet verdwijnt zijn uw instellingen mogelijks foutief.';
+$lang['menu']                  = 'Template stijl-instellingen';
+$lang['js']['loader']          = 'Voorbeeldweergave is aan het laden...<br />als dit niet verdwijnt zijn uw instellingen mogelijk foutief.';
 $lang['js']['popup']           = 'Open als popup';
-$lang['error']                 = 'Sorry, dit sjabloon ondersteunt deze functionaliteit niet.';
+$lang['error']                 = 'Sorry, deze template ondersteunt deze functionaliteit niet.';
 $lang['btn_preview']           = 'Bekijk aanpassingen';
 $lang['btn_save']              = 'Sla aanpassingen op';
 $lang['btn_reset']             = 'Huidige aanpassingen verwerpen';
-$lang['btn_revert']            = 'Stijlen terugzetten naar de template default';
+$lang['btn_revert']            = 'Stijlen terugzetten naar de standaard waardes van de template';
 $lang['__text__']              = 'Hoofd tekstkleur';
 $lang['__background__']        = 'Hoofd achtergrondkleur';
 $lang['__text_alt__']          = 'Alternatieve tekstkleur';
@@ -21,4 +21,4 @@ $lang['__background_alt__']    = 'Alternatieve achtergrondkleur';
 $lang['__text_neu__']          = 'Neutrale tekstkleur';
 $lang['__background_neu__']    = 'Neutrale achtergrondkleur';
 $lang['__border__']            = 'Kader kleur';
-$lang['__highlight__']         = 'Accentkleur (hoofdzakelijk voor zoekresultaten)';
+$lang['__highlight__']         = 'Markeringskleur (hoofdzakelijk voor zoekresultaten)';
-- 
cgit v1.2.3


From 5c044c07690bcddc31bf834bb7e326798cddf389 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 31 Jul 2015 13:48:09 +0200
Subject: Update lang.php

---
 lib/plugins/extension/lang/nl/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php
index b2bb46bae..ead2d9e8f 100644
--- a/lib/plugins/extension/lang/nl/lang.php
+++ b/lib/plugins/extension/lang/nl/lang.php
@@ -34,7 +34,7 @@ $lang['js']['reallydel']       = 'Wilt u deze uitbreiding deinstalleren?';
 $lang['js']['display_viewoptions'] = 'Weergave opties:';
 $lang['js']['display_enabled'] = 'ingeschakeld';
 $lang['js']['display_disabled'] = 'uitgeschakeld';
-$lang['js']['display_updatable'] = 'aanpasbaar';
+$lang['js']['display_updatable'] = 'update beschikbaar';
 $lang['search_for']            = 'Zoek Uitbreiding:';
 $lang['search']                = 'Zoek';
 $lang['extensionby']           = '<strong>%s</strong> by %s';
-- 
cgit v1.2.3


From 8a5ec0ae4ee1f6ad3e79b558700879e514542602 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 31 Jul 2015 13:54:27 +0200
Subject: Update style.txt

---
 lib/tpl/dokuwiki/lang/nl/style.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tpl/dokuwiki/lang/nl/style.txt b/lib/tpl/dokuwiki/lang/nl/style.txt
index 5dbc61568..55de5c7c0 100644
--- a/lib/tpl/dokuwiki/lang/nl/style.txt
+++ b/lib/tpl/dokuwiki/lang/nl/style.txt
@@ -1 +1 @@
-Wil je de logo aanpassen, gebruik dan de Media Manager en een "logo.png" in "wiki" of root naamruimte opladen, waarna het automatisch gebruikt wordt. Je kan ook een "favicon.ico" hiervoor gebruiken. Indien je een gesloten wiki gebruikt is het aangeraden om de "wiki" (of root) naamruimte leesbaar te maken voor iedereen in de ACL instellingen of je logo wordt niet getoond aan niet ingelogde gebruikers.
\ No newline at end of file
+Wil je het logo aanpassen, gebruik dan de Media Manager om een "logo.png" in "wiki" of root naamruimte te uploaden. Dit logo zal dan automatisch gebruikt worden. Je kunt zo ook een "favicon.ico" uploaden. Indien je een gesloten wiki gebruikt is het aan te raden om de "wiki" (of root) naamruimte leesbaar te maken voor iedereen via de ACL instellingen, want anders wordt je logo niet getoond aan niet-ingelogde gebruikers.
-- 
cgit v1.2.3


From 62017a67fa8f78ee4d06aa2015ebd8c744299bd5 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 31 Jul 2015 13:55:53 +0200
Subject: Update lang.php

---
 lib/tpl/dokuwiki/lang/nl/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tpl/dokuwiki/lang/nl/lang.php b/lib/tpl/dokuwiki/lang/nl/lang.php
index 474ecb744..cb84fd82a 100644
--- a/lib/tpl/dokuwiki/lang/nl/lang.php
+++ b/lib/tpl/dokuwiki/lang/nl/lang.php
@@ -5,7 +5,7 @@
  * 
  * @author hugo smet <hugo.smet@scarlet.be>
  */
-$lang['__background_site__']   = 'Kleur voor de echter ondergrond (achter de inhoud kader)';
+$lang['__background_site__']   = 'Kleur voor de onderste ondergrond (achter de inhoud kader)';
 $lang['__link__']              = 'Kleur voor algemene link';
 $lang['__existing__']          = 'Kleur voor link naar bestaande pagina\'s.';
 $lang['__missing__']           = 'Kleur voor link naar onbestaande pagina\'s';
-- 
cgit v1.2.3


From 66ff014ab579963895d7c103592a980c35b5845f Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Fri, 31 Jul 2015 14:01:54 +0200
Subject: Update lang.php

---
 lib/plugins/config/lang/nl/lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index c157b64a0..a9791b787 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -30,7 +30,7 @@ $lang['security']              = 'Beveiligingswaarschuwing: Het wijzigen van dez
 $lang['_configuration_manager'] = 'Configuratiemanager';
 $lang['_header_dokuwiki']      = 'DokuWiki-instellingen';
 $lang['_header_plugin']        = 'Plugin-instellingen';
-$lang['_header_template']      = 'Sjabloon-instellingen';
+$lang['_header_template']      = 'Template-instellingen';
 $lang['_header_undefined']     = 'Ongedefinieerde instellingen';
 $lang['_basic']                = 'Basisinstellingen';
 $lang['_display']              = 'Beeldinstellingen';
@@ -49,9 +49,9 @@ $lang['_msg_setting_no_default'] = 'Geen standaard waarde.';
 $lang['title']                 = 'Titel van de wiki';
 $lang['start']                 = 'Naam startpagina';
 $lang['lang']                  = 'Taal';
-$lang['template']              = 'Sjabloon ofwel het design van de wiki.';
-$lang['tagline']               = 'Ondertitel (als het sjabloon dat ondersteunt)';
-$lang['sidebar']               = 'Zijbalk-paginanaam (als het sjabloon dat ondersteunt), leeg veld betekent geen zijbalk';
+$lang['template']              = 'Template ofwel het design van de wiki.';
+$lang['tagline']               = 'Ondertitel (als het template dat ondersteunt)';
+$lang['sidebar']               = 'Zijbalk-paginanaam (als het template dat ondersteunt), leeg veld betekent geen zijbalk';
 $lang['license']               = 'Onder welke licentie zou je tekst moeten worden gepubliceerd?';
 $lang['savedir']               = 'Directory om data op te slaan';
 $lang['basedir']               = 'Basisdirectory';
-- 
cgit v1.2.3


From 7b4365a732a993fcabe66b9ff4b4c85afb5ae367 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 1 Aug 2015 02:20:13 +0200
Subject: TPL_ACTION_UNKNOWN event for building action/button links

---
 inc/template.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index f918d1a04..5508233ae 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -647,6 +647,8 @@ function tpl_get_action($type) {
     $params      = array('do' => $type);
     $nofollow    = true;
     $replacement = '';
+
+    $unknown = false;
     switch($type) {
         case 'edit':
             // most complicated type - we need to decide on current action
@@ -771,9 +773,23 @@ function tpl_get_action($type) {
             //$type = 'media';
             break;
         default:
-            return '[unknown %s type]';
+            //unknown type
+            $unknown = true;
     }
-    return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow', 'replacement');
+
+    $data = compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow', 'replacement');
+
+    $evt = new Doku_Event('TPL_ACTION_UNKNOWN', $data);
+    if($evt->advise_before()) {
+        //handle unknown types
+        if($unknown) {
+            $data = '[unknown %s type]'.$type;
+        }
+    }
+    $evt->advise_after();
+    unset($evt);
+
+    return $data;
 }
 
 /**
-- 
cgit v1.2.3


From 84dd2b1a576208ba24c01a2df14bdbed57a8ece8 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 1 Aug 2015 02:23:07 +0200
Subject: TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY

re-add PR #470 again.
---
 inc/template.php                | 22 ++++++++++++++++++++++
 lib/tpl/dokuwiki/tpl_header.php | 18 +++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/inc/template.php b/inc/template.php
index f918d1a04..70d93669d 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1982,5 +1982,27 @@ function tpl_classes() {
     return join(' ', $classes);
 }
 
+/**
+ * Create event for tools menues
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @param string $toolsname name of menu
+ * @param array $items
+ * @param string $view e.g. 'main', 'detail', ...
+ */
+function tpl_toolsevent($toolsname, $items, $view = 'main') {
+    $data = array(
+        'view' => $view,
+        'items' => $items
+    );
+
+    $hook = 'TEMPLATE_' . strtoupper($toolsname) . '_DISPLAY';
+    $evt = new Doku_Event($hook, $data);
+    if($evt->advise_before()) {
+        foreach($evt->data['items'] as $k => $html) echo $html;
+    }
+    $evt->advise_after();
+}
+
 //Setup VIM: ex: et ts=4 :
 
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index ee51cbd01..ab56f1ef8 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -46,10 +46,12 @@ if (!defined('DOKU_INC')) die();
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '</li>';
                         }
-                        tpl_action('admin', true, 'li');
-                        tpl_action('profile', true, 'li');
-                        tpl_action('register', true, 'li');
-                        tpl_action('login', true, 'li');
+                        tpl_toolsevent('usertools', array(
+                            tpl_action('admin', true, 'li', true),
+                            tpl_action('profile', true, 'li', true),
+                            tpl_action('register', true, 'li', true),
+                            tpl_action('login', true, 'li', true)
+                        ));
                     ?>
                 </ul>
             </div>
@@ -64,9 +66,11 @@ if (!defined('DOKU_INC')) die();
             </div>
             <ul>
                 <?php
-                    tpl_action('recent', true, 'li');
-                    tpl_action('media', true, 'li');
-                    tpl_action('index', true, 'li');
+                    tpl_toolsevent('sitetools', array(
+                        tpl_action('recent', true, 'li', true),
+                        tpl_action('media', true, 'li', true),
+                        tpl_action('bds', true, 'li', true)
+                    ));
                 ?>
             </ul>
         </div>
-- 
cgit v1.2.3


From 38d2ca460b25ec1ea86d513fa5eed27c362904d5 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 1 Aug 2015 02:30:52 +0200
Subject: remove debug var

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/template.php b/inc/template.php
index 5508233ae..c5b2d566a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -783,7 +783,7 @@ function tpl_get_action($type) {
     if($evt->advise_before()) {
         //handle unknown types
         if($unknown) {
-            $data = '[unknown %s type]'.$type;
+            $data = '[unknown %s type]';
         }
     }
     $evt->advise_after();
-- 
cgit v1.2.3


From 09ff5cd824189dcdf50c4bfd0c5f4a6cd9f50d34 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 1 Aug 2015 10:46:39 +0200
Subject: translation update

---
 inc/lang/ko/backlinks.txt                |  2 +-
 inc/lang/ko/draft.txt                    |  2 +-
 inc/lang/ko/lang.php                     | 10 +++++-----
 lib/plugins/acl/lang/ko/lang.php         |  8 ++++----
 lib/plugins/config/lang/ko/lang.php      | 28 ++++++++++++++--------------
 lib/plugins/usermanager/lang/ko/lang.php |  2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/inc/lang/ko/backlinks.txt b/inc/lang/ko/backlinks.txt
index 6a6ad48a4..457974d86 100644
--- a/inc/lang/ko/backlinks.txt
+++ b/inc/lang/ko/backlinks.txt
@@ -1,3 +1,3 @@
-====== 백링크 ======
+====== 역링크 ======
 
 현재 문서를 가리키는 링크가 있는 문서 목록입니다.
\ No newline at end of file
diff --git a/inc/lang/ko/draft.txt b/inc/lang/ko/draft.txt
index 7e700f725..bb6dc8c00 100644
--- a/inc/lang/ko/draft.txt
+++ b/inc/lang/ko/draft.txt
@@ -2,4 +2,4 @@
 
 이 문서의 마지막 편집 세션은 올바르게 끝나지 않았습니다. 도쿠위키는 작업 도중 자동으로 저장된 초안을 사용해 편집을 계속 할 수 있습니다. 마지막 세션 동안 저장된 초안을 아래에서 볼 수 있습니다.
 
-비정상적으로 끝난 편집 세션을 **되돌릴**지 여부를 결정하고, 자동으로 저장되었던 초안을 **삭제**하거나 편집 과정을 **취소**하세요.
\ No newline at end of file
+비정상적으로 끝난 편집 세션을 **복구**할지 여부를 결정하고, 자동으로 저장되었던 초안을 **삭제**하거나 편집 과정을 **취소**하세요.
\ No newline at end of file
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index beec62aa9..5ee0df829 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -30,8 +30,8 @@ $lang['btn_search']            = '검색';
 $lang['btn_save']              = '저장';
 $lang['btn_preview']           = '미리 보기';
 $lang['btn_top']               = '맨 위로';
-$lang['btn_newer']             = '<< 최근 바뀜 더 보기';
-$lang['btn_older']             = '최근 바뀜 덜 보기 >>';
+$lang['btn_newer']             = '<< 더 최근';
+$lang['btn_older']             = '덜 최근 >>';
 $lang['btn_revs']              = '이전 판';
 $lang['btn_recent']            = '최근 바뀜';
 $lang['btn_upload']            = '올리기';
@@ -41,16 +41,16 @@ $lang['btn_secedit']           = '편집';
 $lang['btn_login']             = '로그인';
 $lang['btn_logout']            = '로그아웃';
 $lang['btn_admin']             = '관리';
-$lang['btn_update']            = '바꾸기';
+$lang['btn_update']            = '업데이트';
 $lang['btn_delete']            = '삭제';
 $lang['btn_back']              = '뒤로';
-$lang['btn_backlink']          = '백링크';
+$lang['btn_backlink']          = '역링크';
 $lang['btn_subscribe']         = '구독 관리';
 $lang['btn_profile']           = '프로필 업데이트';
 $lang['btn_reset']             = '재설정';
 $lang['btn_resendpwd']         = '새 비밀번호 설정';
 $lang['btn_draft']             = '초안 편집';
-$lang['btn_recover']           = '초안 되돌리기';
+$lang['btn_recover']           = '초안 복구';
 $lang['btn_draftdel']          = '초안 삭제';
 $lang['btn_revert']            = '되돌리기';
 $lang['btn_register']          = '등록';
diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 35563ff6c..40b6ff351 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -21,10 +21,10 @@ $lang['acl_perms']             = '권한';
 $lang['page']                  = '문서';
 $lang['namespace']             = '이름공간';
 $lang['btn_select']            = '선택';
-$lang['p_user_id']             = '<b class="acluser">%s</b> 사용자는 현재 <b class="aclpage">%s</b>: <i>%s</i> 문서 접근이 가능합니다.';
-$lang['p_user_ns']             = '<b class="acluser">%s</b> 사용자는 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간 접근이 가능합니다.';
-$lang['p_group_id']            = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclpage">%s</b>: <i>%s</i> 문서 접근이 가능합니다.';
-$lang['p_group_ns']            = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간 접근이 가능합니다.';
+$lang['p_user_id']             = '<b class="acluser">%s</b> 사용자는 현재 <b class="aclpage">%s</b>: <i>%s</i> 문서에 접근이 가능합니다.';
+$lang['p_user_ns']             = '<b class="acluser">%s</b> 사용자는 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간에 접근이 가능합니다.';
+$lang['p_group_id']            = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclpage">%s</b>: <i>%s</i> 문서에 접근이 가능합니다.';
+$lang['p_group_ns']            = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간에 접근이 가능합니다.';
 $lang['p_choose_id']           = '<b class="aclpage">%s</b> 문서 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하세요.';
 $lang['p_choose_ns']           = '<b class="aclns">%s</b> 이름공간 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하세요.';
 $lang['p_inherited']           = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹이나 상위 이름공간으로부터 가져왔습니다.';
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 85326241b..420946f84 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -136,20 +136,20 @@ $lang['autoplural']            = '링크에서 복수형 검사';
 $lang['compression']           = '첨부 파일의 압축 방법';
 $lang['gzip_output']           = 'xhtml에 대해 gzip 내용 인코딩 사용';
 $lang['compress']              = 'CSS 및 자바스크립트를 압축하여 출력';
-$lang['cssdatauri']            = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code>에서 <code>600</code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.';
+$lang['cssdatauri']            = 'CSS 파일에서 그림이 참조되는 최대 바이트 크기를 스타일시트에 규정해야 HTTP 요청 헤더 오버헤드 크기를 줄일 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code>에서 <code>600</code> 바이트 정도면 좋은 효율을 가져옵니다. 비활성화하려면 <code>0</code>으로 설정하세요.';
 $lang['send404']               = '존재하지 않는 문서에 "HTTP 404/페이지를 찾을 수 없습니다" 보내기';
-$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 검색 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">버그 852</a>를 참고하시기 바랍니다.';
-$lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
+$lang['broken_iua']            = '시스템에서 ignore_user_abort 함수에 문제가 있습니까? 문제가 있다면 검색 색인이 동작하지 않는 원인이 됩니다. 이 함수가 IIS+PHP/CGI에서 문제가 있는 것으로 알려져 있습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">버그 852</a>를 참조하시기 바랍니다.';
+$lang['xsendfile']             = '웹 서버가 정적 파일을 제공할 수 있도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
 $lang['renderer_xhtml']        = '주요 (xhtml) 위키 출력에 사용할 렌더러';
 $lang['renderer__core']        = '%s (도쿠위키 코어)';
 $lang['renderer__plugin']      = '%s (플러그인)';
-$lang['dnslookups']            = '이 옵션을 활성화하면 도쿠위키가 문서를 편집하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화하세요';
+$lang['dnslookups']            = '도쿠위키가 문서를 편집하는 사용자의 원격 IP 주소에 대한 호스트 이름을 조회합니다. 서버가 느리거나 DNS 서버를 작동하지 않거나 이 기능을 원하지 않으면, 이 옵션을 비활성화하세요';
 $lang['proxy____host']         = '프록시 서버 이름';
 $lang['proxy____port']         = '프록시 포트';
 $lang['proxy____user']         = '프록시 사용자 이름';
 $lang['proxy____pass']         = '프록시 비밀번호';
 $lang['proxy____ssl']          = '프록시로 연결하는 데 SSL 사용';
-$lang['proxy____except']       = '프록시 설정이 무시될 URL주소의 정규 표현식';
+$lang['proxy____except']       = '프록시가 건너뛰어야 할 일치하는 URL의 정규 표현식.';
 $lang['safemodehack']          = 'safemode hack 활성화';
 $lang['ftp____host']           = 'safemode hack의 FTP 서버';
 $lang['ftp____port']           = 'safemode hack의 FTP 포트';
@@ -158,8 +158,8 @@ $lang['ftp____pass']           = 'safemode hack의 FTP 비밀번호';
 $lang['ftp____root']           = 'safemode hack의 FTP 루트 디렉터리';
 $lang['license_o_']            = '선택하지 않음';
 $lang['typography_o_0']        = '없음';
-$lang['typography_o_1']        = '이중 인용부호("")만 지원';
-$lang['typography_o_2']        = '모든 가능한 인용 부호 (동작 안될 수도 있음)';
+$lang['typography_o_1']        = '작은따옴표를 제외';
+$lang['typography_o_2']        = '작은따옴표를 포함 (항상 동작하지 않을 수도 있음)';
 $lang['userewrite_o_0']        = '없음';
 $lang['userewrite_o_1']        = '.htaccess';
 $lang['userewrite_o_2']        = '도쿠위키 내부';
@@ -175,20 +175,20 @@ $lang['rss_type_o_rss2']       = 'RSS 2.0';
 $lang['rss_type_o_atom']       = 'Atom 0.3';
 $lang['rss_type_o_atom1']      = 'Atom 1.0';
 $lang['rss_content_o_abstract'] = '개요';
-$lang['rss_content_o_diff']    = '통합 차이 목록';
-$lang['rss_content_o_htmldiff'] = 'HTML 차이 목록 형식';
-$lang['rss_content_o_html']    = '최대 HTML 페이지 내용';
+$lang['rss_content_o_diff']    = '통합 차이';
+$lang['rss_content_o_htmldiff'] = 'HTML 형식의 차이 표';
+$lang['rss_content_o_html']    = '전체 HTML 페이지 내용';
 $lang['rss_linkto_o_diff']     = '차이 보기';
-$lang['rss_linkto_o_page']     = '바뀐 문서 보기';
+$lang['rss_linkto_o_page']     = '개정된 문서';
 $lang['rss_linkto_o_rev']      = '판의 목록';
 $lang['rss_linkto_o_current']  = '현재 문서';
 $lang['compression_o_0']       = '없음';
 $lang['compression_o_gz']      = 'gzip';
 $lang['compression_o_bz2']     = 'bz2';
 $lang['xsendfile_o_0']         = '사용하지 않음';
-$lang['xsendfile_o_1']         = '비공개 lighttpd 헤더 (1.5 이전 버전)';
+$lang['xsendfile_o_1']         = '사유 lighttpd 헤더 (릴리스 1.5 이전)';
 $lang['xsendfile_o_2']         = '표준 X-Sendfile 헤더';
-$lang['xsendfile_o_3']         = '비공개 Nginx X-Accel-Redirect 헤더';
+$lang['xsendfile_o_3']         = '사유 Nginx X-Accel-Redirect 헤더';
 $lang['showuseras_o_loginname'] = '로그인 이름';
 $lang['showuseras_o_username'] = '사용자의 실명';
 $lang['showuseras_o_username_link'] = '인터위키 사용자 링크로 된 사용자의 실명';
@@ -198,4 +198,4 @@ $lang['useheading_o_0']        = '전혀 없음';
 $lang['useheading_o_navigation'] = '둘러보기에만';
 $lang['useheading_o_content']  = '위키 내용에만';
 $lang['useheading_o_1']        = '항상';
-$lang['readdircache']          = 'readdir 캐시를 위한 최대 시간 (초)';
+$lang['readdircache']          = 'readdir 캐시의 최대 시간 (초)';
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index e8f846ce6..ec55d5586 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -53,7 +53,7 @@ $lang['edit_usermissing']      = '선택된 사용자를 찾을 수 없습니다
 $lang['user_notify']           = '사용자에게 알림';
 $lang['note_notify']           = '사용자에게 새로운 비밀번호를 준 경우에만 알림 이메일이 보내집니다.';
 $lang['note_group']            = '새로운 사용자는 어떤 그룹도 설정하지 않은 경우에 기본 그룹(%s)에 추가됩니다.';
-$lang['note_pass']             = '사용자 알림이 지정되어 있을 때 필드에 아무 값도 입력하지 않으면 비밀번호가 자동으로 만들어집니다.';
+$lang['note_pass']             = '사용자 알림이 지정되어 있을 때 필드에 아무 값도 입력하지 않으면 비밀번호가 자동으로 생성됩니다.';
 $lang['add_ok']                = '사용자를 성공적으로 추가했습니다';
 $lang['add_fail']              = '사용자 추가를 실패했습니다';
 $lang['notify_ok']             = '알림 이메일을 성공적으로 보냈습니다';
-- 
cgit v1.2.3


From a37d43dc292beee8ecfd46494e7e0e9dbcd107c7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 1 Aug 2015 16:55:12 +0100
Subject: minor CSS adjustment in fullscreen media manager

This is an odd one. I had made this change already in 0607bfee and
(and dokufreaks/template-default@c7cf76d5 was part of that) for the default
template and in selfthinker/dokuwiki_template_starter@cc172e9f for the
starter template.
The new 'dokuwiki' template was based on the starter template but before
this change, so this never made it into the new default template.
---
 lib/tpl/dokuwiki/css/_media_fullscreen.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 71308ec85..92a9d0730 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -407,19 +407,19 @@
 
 /* file revisions form */
 
-#mediamanager__page #page__revisions ul {
+#mediamanager__page form.changes ul {
     margin-left: 10px;
     padding: 0;
     list-style-type: none;
 }
 
-#mediamanager__page #page__revisions ul li div.li div {
+#mediamanager__page form.changes ul li div.li div {
     font-size: 90%;
     color: @ini_text_neu;
     padding-left: 18px;
 }
 
-#mediamanager__page #page__revisions ul li div.li input {
+#mediamanager__page form.changes ul li div.li input {
     position: relative;
     top: 1px;
 }
-- 
cgit v1.2.3


From 80b13baa48275cef1ca6c6d3c715d21afd1138e7 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sun, 2 Aug 2015 00:16:05 +0200
Subject: typo

---
 inc/Form/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/Form/Form.php b/inc/Form/Form.php
index 2c893fbbc..625557fa1 100644
--- a/inc/Form/Form.php
+++ b/inc/Form/Form.php
@@ -316,7 +316,7 @@ class Form extends Element {
             $type = $this->elements[$pos]->getType();
             if($type == 'fieldsetopen') {
                 if($isopen) {
-                    //close previous feldset
+                    //close previous fieldset
                     $this->addFieldsetClose($pos);
                     $lastclose = $pos + 1;
                     $pos++;
-- 
cgit v1.2.3


From 3c8e094acdcf6d556f022bc224b81ef17e449281 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sun, 2 Aug 2015 00:46:52 +0200
Subject: improve PHPDocs

---
 inc/Form/ValueElement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/Form/ValueElement.php b/inc/Form/ValueElement.php
index 753704c70..9dc2fd0df 100644
--- a/inc/Form/ValueElement.php
+++ b/inc/Form/ValueElement.php
@@ -20,7 +20,7 @@ abstract class ValueElement extends Element {
 
     /**
      * @param string $type
-     * @param array $value
+     * @param array|string $value
      * @param array $attributes
      */
     public function __construct($type, $value, $attributes = array()) {
-- 
cgit v1.2.3


From a0b2c361babca045110eafa28de304202fde69b7 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sun, 2 Aug 2015 11:47:00 +0900
Subject: translation update for media_viewold
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

edit translation of the user 青子守歌
---
 inc/lang/ja/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 290bb175b..38df66d1f 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -330,7 +330,7 @@ $lang['media_files']           = '%s 内のファイル';
 $lang['media_upload']          = '%s にアップロード';
 $lang['media_search']          = '%s 内で検索';
 $lang['media_view']            = '%s';
-$lang['media_viewold']         = '%s at %s';
+$lang['media_viewold']         = '%2$s に %1$s';
 $lang['media_edit']            = '%s を編集';
 $lang['media_history']         = '%s の履歴';
 $lang['media_meta_edited']     = 'メタデータが編集されました';
-- 
cgit v1.2.3


From 84672e9cfa0f74c35c70c75d3b230e48ecd62212 Mon Sep 17 00:00:00 2001
From: Kiril <neohidra@gmail.com>
Date: Sun, 2 Aug 2015 15:11:02 +0200
Subject: translation update

---
 inc/lang/bg/lang.php                     |  2 +-
 lib/plugins/extension/lang/bg/lang.php   | 47 ++++++++++++++++++++++++++++++++
 lib/plugins/usermanager/lang/bg/lang.php |  9 ++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index daeaf9bd6..f12b66a62 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -286,7 +286,7 @@ $lang['i_confexists']          = '<code>%s</code> вече съществува'
 $lang['i_writeerr']            = '<code>%s</code> не можа да бъде създаден. Трябва да проверите правата за достъп до директорията/файла и да създадете файла ръчно.';
 $lang['i_badhash']             = 'Файлът dokuwiki.php не може да бъде разпознат или е променен (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - непозволена или празна стойност';
-$lang['i_success']             = 'Настройването приключи успешно. Вече можете да изтриете файла install.php. Продължете към <a href="doku.php?id=wiki:welcome">Вашето ново DokuWiki</a>.';
+$lang['i_success']             = 'Настройването приключи успешно. Вече можете да изтриете файла install.php. Продължете към <a href="doku.php?id=wiki:welcome">Вашето новата инсталация на DokuWiki</a>.';
 $lang['i_failure']             = 'Възникнаха грешки при записването на файловете с настройки. Вероятно ще се наложи да ги поправите ръчно,
                                   за да можете да ползвате <a href="doku.php?id=wiki:welcome">Вашето ново DokuWiki</a>.';
 $lang['i_policy']              = 'Първоначална политика за достъп';
diff --git a/lib/plugins/extension/lang/bg/lang.php b/lib/plugins/extension/lang/bg/lang.php
index 430516dd1..b14442c55 100644
--- a/lib/plugins/extension/lang/bg/lang.php
+++ b/lib/plugins/extension/lang/bg/lang.php
@@ -5,22 +5,69 @@
  * 
  * @author Kiril <neohidra@gmail.com>
  */
+$lang['menu']                  = 'Диспечер на приставки';
+$lang['tab_plugins']           = 'Инсталирани приставки';
+$lang['tab_templates']         = 'Инсталирани шаблони';
 $lang['tab_search']            = 'Търсене и инсталиране';
 $lang['tab_install']           = 'Ръчно инсталиране';
 $lang['notimplemented']        = 'Функционалността все още не реализирана';
+$lang['notinstalled']          = 'Приставката не е инсталирана';
+$lang['alreadyenabled']        = 'Приставката е включена';
+$lang['alreadydisabled']       = 'Приставката е изключена';
+$lang['pluginlistsaveerror']   = 'Възникна грешка при записването на списъка с приставки';
 $lang['unknownauthor']         = 'Неизвестен автор';
 $lang['unknownversion']        = 'Неизвестна версия';
 $lang['btn_info']              = 'Повече информация';
 $lang['btn_update']            = 'Актуализиране';
 $lang['btn_uninstall']         = 'Деинсталиране';
+$lang['btn_enable']            = 'Включване';
+$lang['btn_disable']           = 'Изключване';
 $lang['btn_install']           = 'Инсталиране';
 $lang['btn_reinstall']         = 'Преинсталиране';
+$lang['js']['reallydel']       = 'Наистина ли желаете приставката да бъде деинсталирана?';
+$lang['js']['display_viewoptions'] = 'Филтриране:';
+$lang['js']['display_enabled'] = 'включени';
+$lang['js']['display_disabled'] = 'изключени';
+$lang['js']['display_updatable'] = 'с налични актуализации';
+$lang['search_for']            = 'Търсене за приставки:';
+$lang['search']                = 'Търсене';
+$lang['extensionby']           = '<strong>%s</strong> от %s';
 $lang['popularity']            = 'Популярност: %s%%';
+$lang['homepage_link']         = 'Документи';
+$lang['tags']                  = 'Етикети:';
+$lang['author_hint']           = 'Търсене за други приставки от този автор';
+$lang['downloadurl']           = 'Сваляне от URL:';
 $lang['repository']            = 'Хранилище:';
 $lang['installed_version']     = 'Инсталирана версия:';
+$lang['install_date']          = 'Последна актуализирана на:';
 $lang['available_version']     = 'Налична версия:';
 $lang['compatible']            = 'Съвместимост с:';
+$lang['depends']               = 'Изисква:';
+$lang['similar']               = 'Наподобява:';
+$lang['conflicts']             = 'В кофликт с:';
+$lang['repo_retry']            = 'Повторен опит';
 $lang['provides']              = 'Осигурява:';
+$lang['status']                = 'Състояние:';
+$lang['status_installed']      = 'инсталирана';
+$lang['status_not_installed']  = 'неинсталирана';
+$lang['status_protected']      = 'защитена';
+$lang['status_enabled']        = 'включена';
+$lang['status_disabled']       = 'изключена';
+$lang['status_plugin']         = 'приставка';
+$lang['status_template']       = 'шаблон';
+$lang['msg_enabled']           = 'Приставката "%s" е включена';
+$lang['msg_disabled']          = 'Приставката "%s" е изключена';
+$lang['msg_delete_success']    = 'Приставката "%s" е деинсталирана';
+$lang['msg_delete_failed']     = 'Деинсталирането на приставката "%s" се провали ';
+$lang['msg_template_install_success'] = 'Шаблонът "%s" е инсталиран успешно';
+$lang['msg_template_update_success'] = 'Шаблонът "%s" е актуализиран успешно';
+$lang['msg_plugin_install_success'] = 'Приставката "%s" е инсталирана успешно';
+$lang['msg_plugin_update_success'] = 'Приставката "%s" е актуализирана успешно';
+$lang['msg_upload_failed']     = 'Качването на файлът се провали';
+$lang['missing_dependency']    = '<strong>Изискван компонент липсва или е изключен:</strong> %s';
+$lang['update_available']      = '<strong>Актуализация:</strong> Налична е нова версия - %s';
+$lang['wrong_folder']          = '<strong>Некоректно инсталирана приставка:</strong> Преименувайте директорията "%s" на "%s".';
 $lang['error_badurl']          = 'URL адресите трябва да започват с http или https';
+$lang['error_dircreate']       = 'Създаването на временна поапка за получаване на файла не е възможно';
 $lang['error_download']        = 'Невъзможност за сваляне на файл: %s';
 $lang['install_url']           = 'Инсталиране от URL:';
diff --git a/lib/plugins/usermanager/lang/bg/lang.php b/lib/plugins/usermanager/lang/bg/lang.php
index aadf76512..f98cc8c40 100644
--- a/lib/plugins/usermanager/lang/bg/lang.php
+++ b/lib/plugins/usermanager/lang/bg/lang.php
@@ -28,6 +28,10 @@ $lang['search']                = 'Търсене';
 $lang['search_prompt']         = 'Търси';
 $lang['clear']                 = 'Обновяване на търсенето';
 $lang['filter']                = 'Филтър';
+$lang['export_all']            = 'Износ на всички потребители (CSV)';
+$lang['import']                = 'Импорт на нови потребители';
+$lang['line']                  = 'Ред №';
+$lang['error']                 = 'Съобщение за грешка';
 $lang['summary']               = 'Показване на потребители %1$d-%2$d от %3$d намерени. Общо %4$d потребителя.';
 $lang['nonefound']             = 'Не са намерени потребители. Общо %d потребителя.';
 $lang['delete_ok']             = '%d изтрити потребителя';
@@ -48,3 +52,8 @@ $lang['add_ok']                = 'Добавянето на потребител
 $lang['add_fail']              = 'Добавянето на потребителя се провали';
 $lang['notify_ok']             = 'Изпратено е осведомителен имейл';
 $lang['notify_fail']           = 'Изпращането на осведомителен имейл не е възможно';
+$lang['import_error_badname']  = 'Грешно потребителско име';
+$lang['import_error_badmail']  = 'Грешен имейл адрес';
+$lang['import_error_upload']   = 'Внасянето се провали. CSV файлът не може да бъде качен или е празен.';
+$lang['import_error_readfail'] = 'Внасянето се провали. Каченият файл не може да бъде прочетен.';
+$lang['import_error_create']   = 'Потребителят не може да бъде съдаден';
-- 
cgit v1.2.3


From ac2f65aa15d785269723f1166fb17e223f93913d Mon Sep 17 00:00:00 2001
From: Sierra Bravo <sierra1bravo@gmail.com>
Date: Mon, 3 Aug 2015 06:50:08 +0200
Subject: translation update

---
 inc/lang/ml/admin.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 inc/lang/ml/admin.txt

diff --git a/inc/lang/ml/admin.txt b/inc/lang/ml/admin.txt
new file mode 100644
index 000000000..0f9c81486
--- /dev/null
+++ b/inc/lang/ml/admin.txt
@@ -0,0 +1,3 @@
+====== പൊതു സെറ്റിംഗ്സ്  ======
+
+താഴെ കാണുന്ന പട്ടിക ഡോക്കുവിക്കിയിൽ  ഉള്ള പൊതു സെറ്റിംഗ്സ് ആണ് . 
\ No newline at end of file
-- 
cgit v1.2.3


From 3131073da5a9b9c69c5b2b4509e985e9e27afe99 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 3 Aug 2015 13:42:10 +0200
Subject: rename to TPL_ACTION_GET

This event handles both known core types and unknown types as default
---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/template.php b/inc/template.php
index c5b2d566a..4433c508a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -779,7 +779,7 @@ function tpl_get_action($type) {
 
     $data = compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow', 'replacement');
 
-    $evt = new Doku_Event('TPL_ACTION_UNKNOWN', $data);
+    $evt = new Doku_Event('TPL_ACTION_GET', $data);
     if($evt->advise_before()) {
         //handle unknown types
         if($unknown) {
-- 
cgit v1.2.3


From b7f03851df576dfca3de8757d9b8a7a84e86c1a0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 3 Aug 2015 19:13:08 +0200
Subject: make sure pagetool sprite uilder is only run from command line

---
 lib/tpl/dokuwiki/images/pagetools-build.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/tpl/dokuwiki/images/pagetools-build.php b/lib/tpl/dokuwiki/images/pagetools-build.php
index 3cf35b2ea..eaceeb257 100644
--- a/lib/tpl/dokuwiki/images/pagetools-build.php
+++ b/lib/tpl/dokuwiki/images/pagetools-build.php
@@ -15,6 +15,8 @@
 $GAMMA = 0.8;
 $OPTIPNG = '/usr/bin/optipng';
 
+if('cli' != php_sapi_name()) die('please run from commandline');
+
 // load input images
 $input = glob('pagetools/*.png');
 sort($input);
-- 
cgit v1.2.3


From e27196a5a9f2248882de6e4b99e0239706a55770 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 3 Aug 2015 22:49:03 +0200
Subject: remove debug remainders

---
 lib/tpl/dokuwiki/tpl_header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index ab56f1ef8..5b092c564 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -69,7 +69,7 @@ if (!defined('DOKU_INC')) die();
                     tpl_toolsevent('sitetools', array(
                         tpl_action('recent', true, 'li', true),
                         tpl_action('media', true, 'li', true),
-                        tpl_action('bds', true, 'li', true)
+                        tpl_action('index', true, 'li', true)
                     ));
                 ?>
             </ul>
-- 
cgit v1.2.3


From 122175ef72dbdbb1f8068bb5aff64abb374b81e6 Mon Sep 17 00:00:00 2001
From: Floriang <antispam@floriang.eu>
Date: Tue, 4 Aug 2015 15:31:37 +0200
Subject: translation update

---
 inc/lang/fr/lang.php                | 27 ++++++++++++++-------------
 inc/lang/fr/subscr_digest.txt       |  2 +-
 inc/lang/fr/subscr_form.txt         |  2 +-
 inc/lang/fr/subscr_list.txt         |  2 +-
 inc/lang/fr/subscr_single.txt       |  2 +-
 lib/plugins/config/lang/fr/lang.php |  1 +
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 8663c035f..c737862fc 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -37,6 +37,7 @@
  * @author YoBoY <yoboy@ubuntu-fr.org>
  * @author james <j.mccann@celcat.com>
  * @author Pietroni <pietroni@informatique.univ-paris-diderot.fr>
+ * @author Floriang <antispam@floriang.eu>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -68,7 +69,7 @@ $lang['btn_update']            = 'Mettre à jour';
 $lang['btn_delete']            = 'Effacer';
 $lang['btn_back']              = 'Retour';
 $lang['btn_backlink']          = 'Liens de retour';
-$lang['btn_subscribe']         = 'Gérer souscriptions';
+$lang['btn_subscribe']         = 'Gérer les abonnements';
 $lang['btn_profile']           = 'Mettre à jour le profil';
 $lang['btn_reset']             = 'Réinitialiser';
 $lang['btn_resendpwd']         = 'Définir un nouveau mot de passe';
@@ -285,18 +286,18 @@ $lang['img_camera']            = 'Appareil photo:';
 $lang['img_keywords']          = 'Mots-clés:';
 $lang['img_width']             = 'Largeur:';
 $lang['img_height']            = 'Hauteur:';
-$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s';
-$lang['subscr_subscribe_error'] = 'Erreur à l\'ajout de %s à la liste de souscription de %s';
-$lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription';
-$lang['subscr_unsubscribe_success'] = '%s a été supprimé de la liste de souscription de %s';
-$lang['subscr_unsubscribe_error'] = 'Erreur au retrait de %s de la liste de souscription de %s';
-$lang['subscr_already_subscribed'] = '%s est déjà souscrit à %s';
-$lang['subscr_not_subscribed'] = '%s n\'est pas souscrit à %s';
-$lang['subscr_m_not_subscribed'] = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou à la catégorie';
-$lang['subscr_m_new_header']   = 'Ajouter une souscription';
-$lang['subscr_m_current_header'] = 'Souscriptions actives';
-$lang['subscr_m_unsubscribe']  = 'Annuler la souscription';
-$lang['subscr_m_subscribe']    = 'Souscrire';
+$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste des abonnés de %s';
+$lang['subscr_subscribe_error'] = 'Erreur à l\'ajout de %s à la liste des abonnés de %s';
+$lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste des abonnés.';
+$lang['subscr_unsubscribe_success'] = '%s a été supprimé de la liste des abonnés de %s';
+$lang['subscr_unsubscribe_error'] = 'Erreur au retrait de %s de la liste des abonnés de %s';
+$lang['subscr_already_subscribed'] = '%s est déjà abonné à %s';
+$lang['subscr_not_subscribed'] = '%s n\'est pas abonné à %s';
+$lang['subscr_m_not_subscribed'] = 'Vous n\'êtes pour l\'instant pas abonné à la page actuelle ou à la catégorie';
+$lang['subscr_m_new_header']   = 'Ajouter un abonnement';
+$lang['subscr_m_current_header'] = 'Abonnements actifs';
+$lang['subscr_m_unsubscribe']  = 'Annuler l\'abonnement';
+$lang['subscr_m_subscribe']    = 'S\'abonner';
 $lang['subscr_m_receive']      = 'Recevoir';
 $lang['subscr_style_every']    = 'Recevoir un courriel à chaque modification';
 $lang['subscr_style_digest']   = 'Courriel, tous les %.2f jours, résumant les modifications de chaque page';
diff --git a/inc/lang/fr/subscr_digest.txt b/inc/lang/fr/subscr_digest.txt
index 7ec75ca76..8c21e5787 100644
--- a/inc/lang/fr/subscr_digest.txt
+++ b/inc/lang/fr/subscr_digest.txt
@@ -14,6 +14,6 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
 @SUBSCRIBE@
 et désabonnez-vous de la page ou de la catégorie.
 
---
+-- 
 Ce courriel a été généré par DokuWiki depuis
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fr/subscr_form.txt b/inc/lang/fr/subscr_form.txt
index d68c05e6a..f14832e07 100644
--- a/inc/lang/fr/subscr_form.txt
+++ b/inc/lang/fr/subscr_form.txt
@@ -1,3 +1,3 @@
 ====== Gestion des souscriptions ======
 
-Cette page vous permet de gérer vos souscriptions pour suivre les modifications sur la page et sur la catégorie courante.
\ No newline at end of file
+Cette page vous permet de gérer vos abonnements pour suivre les modifications sur la page et sur la catégorie courante.
\ No newline at end of file
diff --git a/inc/lang/fr/subscr_list.txt b/inc/lang/fr/subscr_list.txt
index d8c6b68e4..38d76d8cc 100644
--- a/inc/lang/fr/subscr_list.txt
+++ b/inc/lang/fr/subscr_list.txt
@@ -11,6 +11,6 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
 @SUBSCRIBE@
 et désabonnez-vous de la page ou de la catégorie.
 
---
+-- 
 Ce courriel a été généré par Dokuwiki :
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/fr/subscr_single.txt b/inc/lang/fr/subscr_single.txt
index 236d45e8f..13f2998d3 100644
--- a/inc/lang/fr/subscr_single.txt
+++ b/inc/lang/fr/subscr_single.txt
@@ -17,6 +17,6 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
 @SUBSCRIBE@
 et désabonnez-vous de la page ou de la catégorie.
 
---
+-- 
 Ce courriel a été généré par Dokuwiki depuis
 @DOKUWIKIURL@
\ No newline at end of file
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 8a51c2b34..69e58f731 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -23,6 +23,7 @@
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  * @author Carbain Frédéric <fcarbain@yahoo.fr>
  * @author Nicolas Friedli <nicolas@theologique.ch>
+ * @author Floriang <antispam@floriang.eu>
  */
 $lang['menu']                  = 'Paramètres de configuration';
 $lang['error']                 = 'Paramètres non modifiés en raison d\'une valeur invalide, vérifiez vos réglages puis réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.';
-- 
cgit v1.2.3


From 32ba0f96c03b95b9edd0e633b77507db3e290182 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Wed, 5 Aug 2015 14:01:17 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/zh/settings.php |  3 ++-
 lib/plugins/authplain/lang/zh/lang.php    |  8 ++++++--
 lib/plugins/config/lang/zh/lang.php       |  7 +++++--
 lib/plugins/extension/lang/zh/lang.php    |  2 +-
 lib/plugins/styling/lang/zh/intro.txt     |  1 +
 lib/plugins/styling/lang/zh/lang.php      | 23 +++++++++++++++++++++++
 lib/tpl/dokuwiki/lang/zh/lang.php         | 15 +++++++++++++++
 lib/tpl/dokuwiki/lang/zh/style.txt        |  1 +
 8 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 lib/plugins/styling/lang/zh/intro.txt
 create mode 100644 lib/plugins/styling/lang/zh/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/zh/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/zh/style.txt

diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index 11cba4f55..7bb63975f 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author lainme <lainme993@gmail.com>
  * @author oott123 <ip.192.168.1.1@qq.com>
  * @author Errol <errol@hotmail.com>
@@ -21,6 +21,7 @@ $lang['binddn']                = '一个可选的绑定用户的 DN (如果匿
 $lang['bindpw']                = '上述用户的密码';
 $lang['userscope']             = '限制用户搜索的范围';
 $lang['groupscope']            = '限制组搜索的范围';
+$lang['userkey']               = '表示用户名的属性；必须和用户过滤器保持一致。';
 $lang['groupkey']              = '根据任何用户属性得来的组成员(而不是标准的 AD 组)，例如根据部门或者电话号码得到的组。';
 $lang['modPass']               = ' LDAP密码可以由dokuwiki修改吗？';
 $lang['debug']                 = '有错误时显示额外的调试信息';
diff --git a/lib/plugins/authplain/lang/zh/lang.php b/lib/plugins/authplain/lang/zh/lang.php
index 03542fe72..3dcebd28d 100644
--- a/lib/plugins/authplain/lang/zh/lang.php
+++ b/lib/plugins/authplain/lang/zh/lang.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author lainme <lainme993@gmail.com>
  */
-$lang['userexists']     = '对不起，该用户名已经存在。';
+$lang['userexists']            = '对不起，该用户名已经存在。';
+$lang['usernotexists']         = '抱歉，该用户不存在';
+$lang['writefail']             = '无法修改用户数据。请联系维基管理员';
diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index 364ad3fe6..5de24692e 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/lang/zh/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Chinese(Simplified) language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
@@ -90,7 +90,9 @@ $lang['disableactions']        = '停用 DokuWiki 功能';
 $lang['disableactions_check']  = '检查';
 $lang['disableactions_subscription'] = '订阅/退订';
 $lang['disableactions_wikicode'] = '查看源文件/导出源文件';
+$lang['disableactions_profile_delete'] = '删除自己的账户';
 $lang['disableactions_other']  = '其他功能（用英文逗号分隔）';
+$lang['disableactions_rss']    = 'XML 同步 (RSS)';
 $lang['auth_security_timeout'] = '认证安全超时（秒）';
 $lang['securecookie']          = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗？请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。';
 $lang['remote']                = '激活远程 API 系统。这允许其他程序通过 XML-RPC 或其他机制来访问维基。';
@@ -196,6 +198,7 @@ $lang['xsendfile_o_2']         = '标准 X-Sendfile 头';
 $lang['xsendfile_o_3']         = '专有 Nginx X-Accel-Redirect 头';
 $lang['showuseras_o_loginname'] = '登录名';
 $lang['showuseras_o_username'] = '用户全名';
+$lang['showuseras_o_username_link'] = '使用用户全名作为维基内的用户链接';
 $lang['showuseras_o_email']    = '用户的电子邮箱（按邮箱保护设置加扰）';
 $lang['showuseras_o_email_link'] = '以mailto：形式显示用户的电子邮箱';
 $lang['useheading_o_0']        = '从不';
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
index f07bee0ac..62d54c160 100644
--- a/lib/plugins/extension/lang/zh/lang.php
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Cupen <Cupenoruler@foxmail.com>
  * @author xiqingongzi <Xiqingongzi@Gmail.com>
  * @author qinghao <qingxianhao@gmail.com>
diff --git a/lib/plugins/styling/lang/zh/intro.txt b/lib/plugins/styling/lang/zh/intro.txt
new file mode 100644
index 000000000..709171247
--- /dev/null
+++ b/lib/plugins/styling/lang/zh/intro.txt
@@ -0,0 +1 @@
+这个工具可以让您对当前选中的模板的某些样式设置进行改变。所有改动会保存在一个本地配置文件中，不会被升级所影响。
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/zh/lang.php b/lib/plugins/styling/lang/zh/lang.php
new file mode 100644
index 000000000..805d070df
--- /dev/null
+++ b/lib/plugins/styling/lang/zh/lang.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author lainme <lainme993@gmail.com>
+ */
+$lang['menu']                  = '模板样式设置';
+$lang['js']['loader']          = '正在载入预览...<br />如果本句一直没有消失，您的设置可能有错';
+$lang['js']['popup']           = '作为弹出窗口打开';
+$lang['error']                 = '抱歉，这个模板不支持这项功能。';
+$lang['btn_preview']           = '预览改动';
+$lang['btn_save']              = '保存改动';
+$lang['btn_reset']             = '重置当前改动';
+$lang['btn_revert']            = '回退样式到模板的默认值';
+$lang['__text__']              = '主要的字体颜色';
+$lang['__background__']        = '主要的背景颜色';
+$lang['__text_alt__']          = '备选字体的颜色';
+$lang['__background_alt__']    = '备选背景的颜色';
+$lang['__text_neu__']          = '中性字体的颜色';
+$lang['__background_neu__']    = '中性背景的颜色';
+$lang['__border__']            = '边框颜色';
+$lang['__highlight__']         = '高亮颜色 (主要用于搜索结果)';
diff --git a/lib/tpl/dokuwiki/lang/zh/lang.php b/lib/tpl/dokuwiki/lang/zh/lang.php
new file mode 100644
index 000000000..768114757
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/zh/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author lainme <lainme993@gmail.com>
+ */
+$lang['__background_site__']   = '特别背景的颜色 (内容框后面)';
+$lang['__link__']              = '一般链接的颜色';
+$lang['__existing__']          = '指向存在的页面的链接颜色';
+$lang['__missing__']           = '指向不存在的页面的链接颜色';
+$lang['__site_width__']        = '全站的宽度 (可以是任何长度单位：%，px，em，...)';
+$lang['__sidebar_width__']     = '侧边栏的宽度 (如有，可以是任何长度单位：%，px，em，...)';
+$lang['__tablet_width__']      = '当屏幕尺寸小于这个宽度，站点切换到平板模式';
+$lang['__phone_width__']       = '当屏幕尺寸小于这个宽度，站点切换到手机模式';
diff --git a/lib/tpl/dokuwiki/lang/zh/style.txt b/lib/tpl/dokuwiki/lang/zh/style.txt
new file mode 100644
index 000000000..3f6921201
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/zh/style.txt
@@ -0,0 +1 @@
+如果您想调整logo，只需使用媒体管理器将“logo.png”上传到“wiki”或者根命名空间下。您也可以同样上传一个“favicon.ico”。如果您采用的是封闭维基，建议在ACL设置中将“wiki” (或者根) 命名空间设置为全局可读，否则未登录用户无法看到您的logo。
\ No newline at end of file
-- 
cgit v1.2.3


From dde14d5d482920ad26d3bb76876fd3842b85f687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederico=20Gon=C3=A7alves=20Guimar=C3=A3es?=
 <frederico@teia.bio.br>
Date: Wed, 5 Aug 2015 22:31:11 +0200
Subject: translation update

---
 inc/lang/pt-br/lang.php                   |  3 +++
 lib/plugins/authad/lang/pt-br/lang.php    |  2 ++
 lib/plugins/authldap/lang/pt-br/lang.php  |  9 +++++++++
 lib/plugins/authmysql/lang/pt-br/lang.php | 11 +++++++++++
 lib/plugins/authplain/lang/pt-br/lang.php |  8 ++++++--
 lib/plugins/config/lang/pt-br/lang.php    |  8 ++++++--
 lib/plugins/extension/lang/pt-br/lang.php |  7 ++++++-
 lib/plugins/styling/lang/pt-br/intro.txt  |  2 ++
 lib/plugins/styling/lang/pt-br/lang.php   | 23 +++++++++++++++++++++++
 lib/tpl/dokuwiki/lang/pt-br/lang.php      | 15 +++++++++++++++
 lib/tpl/dokuwiki/lang/pt-br/style.txt     |  1 +
 11 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 lib/plugins/authldap/lang/pt-br/lang.php
 create mode 100644 lib/plugins/authmysql/lang/pt-br/lang.php
 create mode 100644 lib/plugins/styling/lang/pt-br/intro.txt
 create mode 100644 lib/plugins/styling/lang/pt-br/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/pt-br/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/pt-br/style.txt

diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 6c224483c..67b4651f2 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -90,6 +90,7 @@ $lang['regmissing']            = 'Desculpe, mas você precisa preencher todos os
 $lang['reguexists']            = 'Desculpe, mas já existe um usuário com esse nome.';
 $lang['regsuccess']            = 'O usuário foi criado e a senha enviada para seu e-mail.';
 $lang['regsuccess2']           = 'O usuário foi criado.';
+$lang['regfail']               = 'Não foi possível criar esse usuário.';
 $lang['regmailfail']           = 'Aparentemente ocorreu um erro no envio da senha. Por favor, entre em contato com o administrador!';
 $lang['regbadmail']            = 'O endereço de e-mail fornecido é, aparentemente, inválido - se você acha que isso é um erro, entre em contato com o administrador';
 $lang['regbadpass']            = 'As senhas digitadas não são idênticas. Por favor, tente novamente.';
@@ -104,6 +105,7 @@ $lang['profdeleteuser']        = 'Excluir a conta';
 $lang['profdeleted']           = 'Sua conta de usuário foi excluída desse wiki';
 $lang['profconfdelete']        = 'Eu desejo remover minha conta dessa wiki. <br/> Essa ação não pode ser desfeita.';
 $lang['profconfdeletemissing'] = 'Caixa de confirmação não marcada';
+$lang['proffail']              = 'O perfil do usuário não foi atualizado.';
 $lang['pwdforget']             = 'Esqueceu sua senha? Solicite outra';
 $lang['resendna']              = 'Esse wiki não tem suporte para o reenvio de senhas.';
 $lang['resendpwd']             = 'Definir a nova senha para';
@@ -350,6 +352,7 @@ $lang['media_perm_read']       = 'Desculpe, mas você não tem privilégios sufi
 $lang['media_perm_upload']     = 'Desculpe, mas você não tem privilégios suficientes para enviar arquivos.';
 $lang['media_update']          = 'Enviar uma nova versão';
 $lang['media_restore']         = 'Restaurar esta versão';
+$lang['media_acl_warning']     = 'Essa lista pode não estar completa devido a restrições de ACL e páginas ocultas.';
 $lang['currentns']             = 'Domínio atual';
 $lang['searchresult']          = 'Resultado da Busca';
 $lang['plainhtml']             = 'HTML simples';
diff --git a/lib/plugins/authad/lang/pt-br/lang.php b/lib/plugins/authad/lang/pt-br/lang.php
index 9dc731b05..16fc39638 100644
--- a/lib/plugins/authad/lang/pt-br/lang.php
+++ b/lib/plugins/authad/lang/pt-br/lang.php
@@ -8,3 +8,5 @@
  */
 $lang['domain']                = 'Domínio de "Logon"';
 $lang['authpwdexpire']         = 'Sua senha vai expirar em %d dias. Você deve mudá-la assim que for possível.';
+$lang['passchangefail']        = 'Não foi possível alterar a senha. Pode ser algum conflito com a política de senhas.';
+$lang['connectfail']           = 'Não foi possível conectar ao servidor Active Directory.';
diff --git a/lib/plugins/authldap/lang/pt-br/lang.php b/lib/plugins/authldap/lang/pt-br/lang.php
new file mode 100644
index 000000000..20f5ec33b
--- /dev/null
+++ b/lib/plugins/authldap/lang/pt-br/lang.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
+ */
+$lang['connectfail']           = 'Não foi possível conectar ao LDAP: %s';
+$lang['domainfail']            = 'Não foi possível encontrar o seu user dn no LDAP';
diff --git a/lib/plugins/authmysql/lang/pt-br/lang.php b/lib/plugins/authmysql/lang/pt-br/lang.php
new file mode 100644
index 000000000..6b1a4c3ad
--- /dev/null
+++ b/lib/plugins/authmysql/lang/pt-br/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
+ */
+$lang['connectfail']           = 'Não foi possível conectar ao banco de dados.';
+$lang['userexists']            = 'Desculpe, mas já existe esse nome de usuário.';
+$lang['usernotexists']         = 'Desculpe, mas esse usuário não existe.';
+$lang['writefail']             = 'Não foi possível modificar os dados do usuário. Por favor, informe ao administrador do Wiki.';
diff --git a/lib/plugins/authplain/lang/pt-br/lang.php b/lib/plugins/authplain/lang/pt-br/lang.php
index 3a9b67218..654ec2b80 100644
--- a/lib/plugins/authplain/lang/pt-br/lang.php
+++ b/lib/plugins/authplain/lang/pt-br/lang.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  */
-$lang['userexists']     = 'Desculpe, mas já existe um usuário com esse nome.';
+$lang['userexists']            = 'Desculpe, mas já existe um usuário com esse nome.';
+$lang['usernotexists']         = 'Desculpe, mas esse usuário não existe.';
+$lang['writefail']             = 'Não foi possível modificar os dados do usuário. Por favor, informe ao administrador do Wiki.';
diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index 795ee81c0..625dc6a25 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Lucien Raven <lucienraven@yahoo.com.br>
@@ -92,7 +93,9 @@ $lang['disableactions']        = 'Desabilitar as ações do DokuWiki';
 $lang['disableactions_check']  = 'Verificação';
 $lang['disableactions_subscription'] = 'Monitoramento';
 $lang['disableactions_wikicode'] = 'Ver a fonte/Exportar sem processamento';
+$lang['disableactions_profile_delete'] = 'Excluir a própria conta';
 $lang['disableactions_other']  = 'Outras ações (separadas por vírgula)';
+$lang['disableactions_rss']    = 'Sindicância XML (RSS)';
 $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)';
 $lang['securecookie']          = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.';
 $lang['remote']                = 'Habilitar o sistema de API remota. Isso permite que outras aplicações acessem o wiki via XML-RPC ou outros mecanismos.';
@@ -197,6 +200,7 @@ $lang['xsendfile_o_2']         = 'cabeçalho "X-Sendfile" padrão';
 $lang['xsendfile_o_3']         = 'cabeçalho proprietário "Nginx X-Accel-Redirect"';
 $lang['showuseras_o_loginname'] = 'nome de usuário';
 $lang['showuseras_o_username'] = 'nome completo do usuário';
+$lang['showuseras_o_username_link'] = 'Nome completo do usuário como um link de usuário interwiki';
 $lang['showuseras_o_email']    = 'endereço de e-mail do usuário (obscurecido segundo a definição anterior)';
 $lang['showuseras_o_email_link'] = 'endereço de e-mail de usuário como um link "mailto:"';
 $lang['useheading_o_0']        = 'nunca';
diff --git a/lib/plugins/extension/lang/pt-br/lang.php b/lib/plugins/extension/lang/pt-br/lang.php
index 823900acf..73012f369 100644
--- a/lib/plugins/extension/lang/pt-br/lang.php
+++ b/lib/plugins/extension/lang/pt-br/lang.php
@@ -2,9 +2,10 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Hudson FAS <hudsonfas@gmail.com>
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  */
 $lang['menu']                  = 'Gerenciador de extensões';
 $lang['tab_plugins']           = 'Extensões instaladas';
@@ -26,6 +27,10 @@ $lang['btn_disable']           = 'Desabilitar';
 $lang['btn_install']           = 'Instalar';
 $lang['btn_reinstall']         = 'Re-instalar';
 $lang['js']['reallydel']       = 'Quer mesmo desinstalar esta extensão?';
+$lang['js']['display_viewoptions'] = 'Opções de visualização:';
+$lang['js']['display_enabled'] = 'habilitado';
+$lang['js']['display_disabled'] = 'desabilitado';
+$lang['js']['display_updatable'] = 'atualizável';
 $lang['search_for']            = 'Procurar extensão:';
 $lang['search']                = 'Procurar';
 $lang['extensionby']           = '<strong>%s</strong> de %s';
diff --git a/lib/plugins/styling/lang/pt-br/intro.txt b/lib/plugins/styling/lang/pt-br/intro.txt
new file mode 100644
index 000000000..3d0f47fd6
--- /dev/null
+++ b/lib/plugins/styling/lang/pt-br/intro.txt
@@ -0,0 +1,2 @@
+Essa ferramente permite a alteração de certas configurações do estilo do seu modelo atual.
+Todas as modificações são armazenadas em um arquivo de configuração local e estão protegidas contra atualizações.
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/pt-br/lang.php b/lib/plugins/styling/lang/pt-br/lang.php
new file mode 100644
index 000000000..b7ac1fcd8
--- /dev/null
+++ b/lib/plugins/styling/lang/pt-br/lang.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
+ */
+$lang['menu']                  = 'Configurações de estilo do modelo';
+$lang['js']['loader']          = 'A visualização está carregando...<br />Caso essa mensagem não desapareça, pode ter algum problema com os seus valores.';
+$lang['js']['popup']           = 'Abrir como um popup';
+$lang['error']                 = 'Desculpe, mas esse modelo não suporta essa funcionalidade.';
+$lang['btn_preview']           = 'Ver alterações';
+$lang['btn_save']              = 'Salvar alterações';
+$lang['btn_reset']             = 'Eliminar as alterações atuais';
+$lang['btn_revert']            = 'Reverter o estilo para os padrões do modelo';
+$lang['__text__']              = 'Cor principal do texto';
+$lang['__background__']        = 'Cor principal do fundo';
+$lang['__text_alt__']          = 'Cor alternativa do texto';
+$lang['__background_alt__']    = 'Cor alternativa do fundo';
+$lang['__text_neu__']          = 'Cor neutra do texto';
+$lang['__background_neu__']    = 'Cor neutra do fundo';
+$lang['__border__']            = 'Cor da borda';
+$lang['__highlight__']         = 'Cor do destaque (primariamente em resultados da pesquisa)';
diff --git a/lib/tpl/dokuwiki/lang/pt-br/lang.php b/lib/tpl/dokuwiki/lang/pt-br/lang.php
new file mode 100644
index 000000000..039265274
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/pt-br/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
+ */
+$lang['__background_site__']   = 'Cor para o fundo da tela (atrás da caixa de conteúdo)';
+$lang['__link__']              = 'Cor dos links gerais';
+$lang['__existing__']          = 'Cor dos links para páginas existentes';
+$lang['__missing__']           = 'Cor dos links para páginas não existentes';
+$lang['__site_width__']        = 'Largura do site inteiro (pode ser qualquer unidade: %, px, em, ...)';
+$lang['__sidebar_width__']     = 'Largura da barra lateral, caso exista (pode ser qualquer unidade: %, px, em, ...)';
+$lang['__tablet_width__']      = 'Em larguras abaixo dessa medida, o site mudará para o modo tablet';
+$lang['__phone_width__']       = 'Em larguras abaixo dessa medida, o site mudará para o modo telefone';
diff --git a/lib/tpl/dokuwiki/lang/pt-br/style.txt b/lib/tpl/dokuwiki/lang/pt-br/style.txt
new file mode 100644
index 000000000..52475d8cf
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/pt-br/style.txt
@@ -0,0 +1 @@
+Caso queira ajustar a logo, use o Gerenciador de Mídias para enviar um "logo.png" para o espaço de nomes "wiki" ou para a raiz e ele será automaticamente usado. Você também pode enviar um "favicon.ico". Caso o seu wiki seja fechado, é recomendável que o espaço de nomes "wiki" (ou a raiz) tenha permissão de leitura nas configurações de ACL, caso contrário a sua logo não será exibida para usuários não autenticados.
\ No newline at end of file
-- 
cgit v1.2.3


From 937959a1cc835709ee811f78c86d1fc28f07b74e Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 6 Aug 2015 10:51:11 +0200
Subject: translation update

---
 lib/plugins/authldap/lang/de/settings.php |   3 +
 lib/plugins/authplain/lang/de/lang.php    |   8 ++-
 lib/plugins/config/lang/de/lang.php       | 107 +++++++++++++++---------------
 lib/plugins/styling/lang/de/intro.txt     |   2 +
 lib/plugins/styling/lang/de/lang.php      |  23 +++++++
 lib/tpl/dokuwiki/lang/de/lang.php         |  15 +++++
 lib/tpl/dokuwiki/lang/de/style.txt        |   1 +
 7 files changed, 105 insertions(+), 54 deletions(-)
 create mode 100644 lib/plugins/styling/lang/de/intro.txt
 create mode 100644 lib/plugins/styling/lang/de/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/de/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/de/style.txt

diff --git a/lib/plugins/authldap/lang/de/settings.php b/lib/plugins/authldap/lang/de/settings.php
index df1974867..e986d0f80 100644
--- a/lib/plugins/authldap/lang/de/settings.php
+++ b/lib/plugins/authldap/lang/de/settings.php
@@ -6,6 +6,7 @@
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author christian studer <cstuder@existenz.ch>
  * @author Philip Knack <p.knack@stollfuss.de>
+ * @author Anika Henke <anika@selfthinker.org>
  */
 $lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (<code>localhost</code>) oder als FQDN (<code>ldap://server.tld:389</code>).';
 $lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
@@ -30,3 +31,5 @@ $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
 $lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
 $lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
 $lang['referrals_o_-1']        = 'Standard verwenden';
+$lang['referrals_o_0']         = 'Nicht Referrals folgen';
+$lang['referrals_o_1']         = 'Referrals folgen';
diff --git a/lib/plugins/authplain/lang/de/lang.php b/lib/plugins/authplain/lang/de/lang.php
index f1d484947..b0cff0068 100644
--- a/lib/plugins/authplain/lang/de/lang.php
+++ b/lib/plugins/authplain/lang/de/lang.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Anika Henke <anika@selfthinker.org>
  */
-$lang['userexists']     = 'Der Benutzername existiert leider schon.';
+$lang['userexists']            = 'Der Benutzername existiert leider schon.';
+$lang['usernotexists']         = 'Dieser Benutzer existiert nicht.';
+$lang['writefail']             = 'Kann Benutzerdaten nicht ändern. Bitte informieren Sie den Wiki-Administratoren';
diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php
index d398ebf84..f3ddefd9b 100644
--- a/lib/plugins/config/lang/de/lang.php
+++ b/lib/plugins/config/lang/de/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
  * @author Leo Moll <leo@yeasoft.com>
@@ -18,6 +18,7 @@
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Mateng Schimmerlos <mateng@firemail.de>
+ * @author Anika Henke <anika@selfthinker.org>
  */
 $lang['menu']                  = 'Konfiguration';
 $lang['error']                 = 'Die Einstellungen wurden wegen einer fehlerhaften Eingabe nicht gespeichert.<br /> Bitte überprüfen sie die rot umrandeten Eingaben und speichern Sie erneut.';
@@ -46,28 +47,29 @@ $lang['_network']              = 'Netzwerk';
 $lang['_msg_setting_undefined'] = 'Keine Konfigurationsmetadaten.';
 $lang['_msg_setting_no_class'] = 'Keine Konfigurationsklasse.';
 $lang['_msg_setting_no_default'] = 'Kein Standardwert.';
-$lang['fmode']                 = 'Berechtigungen für neue Dateien';
-$lang['dmode']                 = 'Berechtigungen für neue Verzeichnisse';
-$lang['lang']                  = 'Sprache';
-$lang['basedir']               = 'Installationsverzeichnis';
-$lang['baseurl']               = 'Installationspfad (URL)';
-$lang['savedir']               = 'Speicherverzeichnis';
-$lang['cookiedir']             = 'Cookiepfad. Frei lassen, um den gleichen Pfad wie "baseurl" zu benutzen.';
-$lang['start']                 = 'Startseitenname';
 $lang['title']                 = 'Titel des Wikis';
+$lang['start']                 = 'Startseitenname';
+$lang['lang']                  = 'Sprache';
 $lang['template']              = 'Designvorlage (Template)';
 $lang['tagline']               = 'Tag-Linie (nur, wenn vom Template unterstützt)';
 $lang['sidebar']               = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt), ein leeres Feld deaktiviert die Sidebar';
 $lang['license']               = 'Unter welcher Lizenz sollen Ihre Inhalte veröffentlicht werden?';
-$lang['fullpath']              = 'Den kompletten Dateipfad im Footer anzeigen';
+$lang['savedir']               = 'Speicherverzeichnis';
+$lang['basedir']               = 'Installationsverzeichnis';
+$lang['baseurl']               = 'Installationspfad (URL)';
+$lang['cookiedir']             = 'Cookiepfad. Frei lassen, um den gleichen Pfad wie "baseurl" zu benutzen.';
+$lang['dmode']                 = 'Berechtigungen für neue Verzeichnisse';
+$lang['fmode']                 = 'Berechtigungen für neue Dateien';
+$lang['allowdebug']            = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>';
 $lang['recent']                = 'Anzahl der Einträge in der Änderungsliste';
+$lang['recent_days']           = 'Wie viele letzte Änderungen sollen einsehbar bleiben? (Tage)';
 $lang['breadcrumbs']           = 'Anzahl der Einträge im "Krümelpfad"';
 $lang['youarehere']            = 'Hierarchische Pfadnavigation verwenden';
+$lang['fullpath']              = 'Den kompletten Dateipfad im Footer anzeigen';
 $lang['typography']            = 'Typographische Ersetzungen';
-$lang['htmlok']                = 'HTML erlauben';
-$lang['phpok']                 = 'PHP erlauben';
 $lang['dformat']               = 'Datumsformat (Siehe PHP <a href="http://www.php.net/strftime">strftime</a> Funktion)';
 $lang['signature']             = 'Signatur';
+$lang['showuseras']            = 'Was angezeigt werden soll, wenn der Benutzer, der zuletzt eine Seite bearbeitet hat, angezeigt wird';
 $lang['toptoclevel']           = 'Inhaltsverzeichnis bei dieser Überschriftengröße beginnen';
 $lang['tocminheads']           = 'Mindestanzahl der Überschriften die entscheidet, ob ein Inhaltsverzeichnis erscheinen soll';
 $lang['maxtoclevel']           = 'Maximale Überschriftengröße für Inhaltsverzeichnis';
@@ -75,15 +77,8 @@ $lang['maxseclevel']           = 'Abschnitte bis zu dieser Stufe einzeln editier
 $lang['camelcase']             = 'CamelCase-Verlinkungen verwenden';
 $lang['deaccent']              = 'Seitennamen bereinigen';
 $lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
-$lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
-$lang['allowdebug']            = 'Debug-Ausgaben erlauben <b>Abschalten wenn nicht benötigt!</b>';
-$lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
-$lang['usewordblock']          = 'Spam-Blocking benutzen';
-$lang['indexdelay']            = 'Zeit bevor Suchmaschinenindexierung erlaubt ist';
-$lang['relnofollow']           = 'rel="nofollow" verwenden';
-$lang['mailguard']             = 'E-Mail-Adressen schützen';
-$lang['iexssprotect']          = 'Hochgeladene Dateien auf bösartigen JavaScript- und HTML-Code untersuchen';
-$lang['showuseras']            = 'Was angezeigt werden soll, wenn der Benutzer, der zuletzt eine Seite bearbeitet hat, angezeigt wird';
+$lang['sneaky_index']          = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.';
+$lang['hidepages']             = 'Seiten verstecken (Regulärer Ausdruck)';
 $lang['useacl']                = 'Zugangskontrolle verwenden';
 $lang['autopasswd']            = 'Passwort automatisch generieren';
 $lang['authtype']              = 'Authentifizierungsmechanismus';
@@ -92,63 +87,70 @@ $lang['defaultgroup']          = 'Standardgruppe';
 $lang['superuser']             = 'Administrator - Eine Gruppe oder Benutzer mit vollem Zugriff auf alle Seiten und Administrationswerkzeuge.';
 $lang['manager']               = 'Manager - Eine Gruppe oder Benutzer mit Zugriff auf einige Administrationswerkzeuge.';
 $lang['profileconfirm']        = 'Profiländerung nur nach Passwortbestätigung';
+$lang['rememberme']            = 'Permanente Login-Cookies erlauben (Auf diesem Computer eingeloggt bleiben)';
 $lang['disableactions']        = 'DokuWiki-Aktionen deaktivieren';
 $lang['disableactions_check']  = 'Check';
 $lang['disableactions_subscription'] = 'Seiten-Abonnements';
 $lang['disableactions_wikicode'] = 'Quelltext betrachten/exportieren';
 $lang['disableactions_profile_delete'] = 'Eigenes Benutzerprofil löschen';
 $lang['disableactions_other']  = 'Andere Aktionen (durch Komma getrennt)';
-$lang['sneaky_index']          = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.';
+$lang['disableactions_rss']    = 'XML-Syndikation (RSS)';
 $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)';
 $lang['securecookie']          = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktivieren Sie diese Option, wenn nur der Login Ihres Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.';
 $lang['remote']                = 'Aktiviert den externen API-Zugang. Diese Option erlaubt es externen Anwendungen von außen auf die XML-RPC-Schnittstelle oder anderweitigen Schnittstellen zu zugreifen.';
 $lang['remoteuser']            = 'Zugriff auf die externen Schnittstellen durch kommaseparierte Angabe von Benutzern oder Gruppen einschränken. Ein leeres Feld erlaubt Zugriff für jeden.';
-$lang['updatecheck']           = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.';
-$lang['userewrite']            = 'URL rewriting';
-$lang['useslash']              = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden';
+$lang['usewordblock']          = 'Spam-Blocking benutzen';
+$lang['relnofollow']           = 'rel="nofollow" verwenden';
+$lang['indexdelay']            = 'Zeit bevor Suchmaschinenindexierung erlaubt ist';
+$lang['mailguard']             = 'E-Mail-Adressen schützen';
+$lang['iexssprotect']          = 'Hochgeladene Dateien auf bösartigen JavaScript- und HTML-Code untersuchen';
 $lang['usedraft']              = 'Während des Bearbeitens automatisch Zwischenentwürfe speichern';
-$lang['sepchar']               = 'Worttrenner für Seitennamen in URLs';
-$lang['canonical']             = 'Immer Links mit vollständigen URLs erzeugen';
-$lang['fnencode']              = 'Methode um nicht-ASCII Dateinamen zu kodieren.';
-$lang['autoplural']            = 'Bei Links automatisch nach vorhandenen Pluralformen suchen';
-$lang['compression']           = 'Komprimierungsmethode für alte Seitenrevisionen';
-$lang['cachetime']             = 'Maximale Cachespeicherung (Sekunden)';
+$lang['htmlok']                = 'HTML erlauben';
+$lang['phpok']                 = 'PHP erlauben';
 $lang['locktime']              = 'Maximales Alter für Seitensperren (Sekunden)';
+$lang['cachetime']             = 'Maximale Cachespeicherung (Sekunden)';
+$lang['target____wiki']        = 'Zielfenster für interne Links (target Attribut)';
+$lang['target____interwiki']   = 'Zielfenster für InterWiki-Links (target Attribut)';
+$lang['target____extern']      = 'Zielfenster für Externe Links (target Attribut)';
+$lang['target____media']       = 'Zielfenster für (Bild-)Dateien (target Attribut)';
+$lang['target____windows']     = 'Zielfenster für Windows Freigaben (target Attribut)';
+$lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
+$lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
+$lang['gdlib']                 = 'GD Lib Version';
+$lang['im_convert']            = 'Pfad zum ImageMagicks-Konvertierwerkzeug';
+$lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
 $lang['fetchsize']             = 'Maximale Größe (in Bytes), die fetch.php von extern herunterladen darf';
+$lang['subscribers']           = 'E-Mail-Abos zulassen';
+$lang['subscribe_time']        = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.';
 $lang['notify']                = 'Änderungsmitteilungen an diese E-Mail-Adresse versenden';
 $lang['registernotify']        = 'Information über neu registrierte Benutzer an diese E-Mail-Adresse senden';
 $lang['mailfrom']              = 'Absender-E-Mail-Adresse für automatische Mails';
 $lang['mailprefix']            = 'Präfix für E-Mail-Betreff beim automatischen Versand von Benachrichtigungen';
 $lang['htmlmail']              = 'Versendet optisch angenehmere, aber größere E-Mails im HTML-Format (multipart). Deaktivieren, um Text-Mails zu versenden.';
+$lang['sitemap']               = 'Google Sitemap erzeugen (Tage)';
+$lang['rss_type']              = 'XML-Feed-Format';
+$lang['rss_linkto']            = 'XML-Feed verlinken auf';
+$lang['rss_content']           = 'Welche Inhalte sollen im XML-Feed dargestellt werden?';
+$lang['rss_update']            = 'XML-Feed Aktualisierungsintervall (Sekunden)';
+$lang['rss_show_summary']      = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen';
+$lang['rss_media']             = 'Welche Änderungen sollen im XML-Feed angezeigt werden?';
+$lang['updatecheck']           = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.';
+$lang['userewrite']            = 'URL rewriting';
+$lang['useslash']              = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden';
+$lang['sepchar']               = 'Worttrenner für Seitennamen in URLs';
+$lang['canonical']             = 'Immer Links mit vollständigen URLs erzeugen';
+$lang['fnencode']              = 'Methode um nicht-ASCII Dateinamen zu kodieren.';
+$lang['autoplural']            = 'Bei Links automatisch nach vorhandenen Pluralformen suchen';
+$lang['compression']           = 'Komprimierungsmethode für alte Seitenrevisionen';
 $lang['gzip_output']           = 'Seiten mit gzip komprimiert ausliefern';
-$lang['gdlib']                 = 'GD Lib Version';
-$lang['im_convert']            = 'Pfad zum ImageMagicks-Konvertierwerkzeug';
-$lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
-$lang['subscribers']           = 'E-Mail-Abos zulassen';
-$lang['subscribe_time']        = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.';
 $lang['compress']              = 'JavaScript und Stylesheets komprimieren';
 $lang['cssdatauri']            = 'Größe in Bytes, bis zu der Bilder in CSS-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter!  Empfohlene Einstellung: <code>400</code> to <code>600</code> Bytes. Setzen Sie die Einstellung auf <code>0</code> um die Funktion zu deaktivieren.';
-$lang['hidepages']             = 'Seiten verstecken (Regulärer Ausdruck)';
 $lang['send404']               = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten';
-$lang['sitemap']               = 'Google Sitemap erzeugen (Tage)';
 $lang['broken_iua']            = 'Falls die Funktion ignore_user_abort auf Ihrem System nicht funktioniert, könnte der Such-Index nicht funktionieren. IIS+PHP/CGI ist bekannt dafür. Siehe auch <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a>.';
 $lang['xsendfile']             = 'Den X-Sendfile-Header nutzen, um Dateien direkt vom Webserver ausliefern zu lassen? Ihr Webserver muss dies unterstützen!';
 $lang['renderer_xhtml']        = 'Standard-Renderer für die normale (XHTML) Wiki-Ausgabe.';
 $lang['renderer__core']        = '%s (DokuWiki Kern)';
 $lang['renderer__plugin']      = '%s (Plugin)';
-$lang['rememberme']            = 'Permanente Login-Cookies erlauben (Auf diesem Computer eingeloggt bleiben)';
-$lang['rss_type']              = 'XML-Feed-Format';
-$lang['rss_linkto']            = 'XML-Feed verlinken auf';
-$lang['rss_content']           = 'Welche Inhalte sollen im XML-Feed dargestellt werden?';
-$lang['rss_update']            = 'XML-Feed Aktualisierungsintervall (Sekunden)';
-$lang['recent_days']           = 'Wie viele letzte Änderungen sollen einsehbar bleiben? (Tage)';
-$lang['rss_show_summary']      = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen';
-$lang['rss_media']             = 'Welche Änderungen sollen im XML-Feed angezeigt werden?';
-$lang['target____wiki']        = 'Zielfenster für interne Links (target Attribut)';
-$lang['target____interwiki']   = 'Zielfenster für InterWiki-Links (target Attribut)';
-$lang['target____extern']      = 'Zielfenster für Externe Links (target Attribut)';
-$lang['target____media']       = 'Zielfenster für (Bild-)Dateien (target Attribut)';
-$lang['target____windows']     = 'Zielfenster für Windows Freigaben (target Attribut)';
 $lang['dnslookups']            = 'DokuWiki löst die IP-Adressen von Benutzern zu deren Hostnamen auf. Wenn du einen langsamen, unbrauchbaren DNS-Server verwendest oder die Funktion nicht benötigst, dann sollte diese Option deaktiviert sein.';
 $lang['proxy____host']         = 'Proxy-Server';
 $lang['proxy____port']         = 'Proxy-Port';
@@ -197,6 +199,7 @@ $lang['xsendfile_o_2']         = 'Standard X-Sendfile-Header';
 $lang['xsendfile_o_3']         = 'Proprietärer Nginx X-Accel-Redirect-Header';
 $lang['showuseras_o_loginname'] = 'Login-Name';
 $lang['showuseras_o_username'] = 'Vollständiger Name des Benutzers';
+$lang['showuseras_o_username_link'] = 'Kompletter Name des Benutzers als Interwiki-Link';
 $lang['showuseras_o_email']    = 'E-Mail-Adresse des Benutzers (je nach Mailguard-Einstellung verschleiert)';
 $lang['showuseras_o_email_link'] = 'E-Mail-Adresse des Benutzers als mailto:-Link';
 $lang['useheading_o_0']        = 'Nie';
diff --git a/lib/plugins/styling/lang/de/intro.txt b/lib/plugins/styling/lang/de/intro.txt
new file mode 100644
index 000000000..aa9577355
--- /dev/null
+++ b/lib/plugins/styling/lang/de/intro.txt
@@ -0,0 +1,2 @@
+Dieses Plugin ermöglicht es, bestimmte Designeinstellungen des ausgewählten Templates zu ändern.
+Alle Änderungen werden in einer lokalen Konfigurationsdatei gespeichert und sind upgrade-sicher.
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/de/lang.php b/lib/plugins/styling/lang/de/lang.php
new file mode 100644
index 000000000..8a46f818e
--- /dev/null
+++ b/lib/plugins/styling/lang/de/lang.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+$lang['menu']                  = 'Einstellungen fürs Template-Design';
+$lang['js']['loader']          = 'Vorschau lädt...<br />Falls diese Nachricht nicht verschwindet, könnten Ihre Werte fehlerhaft sein';
+$lang['js']['popup']           = 'Öffne als Popup';
+$lang['error']                 = 'Dieses Template unterstützt diese Funktion nicht.';
+$lang['btn_preview']           = 'Vorschau der Änderungen anzeigen';
+$lang['btn_save']              = 'Änderungen speichern';
+$lang['btn_reset']             = 'Jetzige Änderungen rückgängig machen';
+$lang['btn_revert']            = 'Auf Templates Voreinstellungen zurückfallen';
+$lang['__text__']              = 'Haupttextfarbe';
+$lang['__background__']        = 'Haupthintergrundfarbe';
+$lang['__text_alt__']          = 'Alternative Textfarbe';
+$lang['__background_alt__']    = 'Alternative Hintergrundfarbe';
+$lang['__text_neu__']          = 'Neutrale Textfarbe';
+$lang['__background_neu__']    = 'Neutrale Hintergrundfarbe';
+$lang['__border__']            = 'Rahmenfarbe';
+$lang['__highlight__']         = 'Hervorhebungsfarbe (hauptsächlich für Suchergebnisse)';
diff --git a/lib/tpl/dokuwiki/lang/de/lang.php b/lib/tpl/dokuwiki/lang/de/lang.php
new file mode 100644
index 000000000..a17c945d9
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/de/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+$lang['__background_site__']   = 'Farbe für den Seitenhintergrund (hinter dem Inhaltsbereich)';
+$lang['__link__']              = 'Allgemeine Linkfarbe';
+$lang['__existing__']          = 'Farbe für Links zu existierenden Seiten';
+$lang['__missing__']           = 'Farbe für Links zu nicht-existierenden Seiten';
+$lang['__site_width__']        = 'Breite der ganzen Seite (kann eine beliebige Längeneinheit sein: %, px, em, ...)';
+$lang['__sidebar_width__']     = 'Breite der Seitenleiste, falls vorhanden (kann eine beliebige Längeneinheit sein: %, px, em, ...)';
+$lang['__tablet_width__']      = 'Unter dieser Fensterbreite wechselt die Seite in den Tabletmodus';
+$lang['__phone_width__']       = 'Unter dieser Fensterbreite wechselt die Seite in den Handymodus';
diff --git a/lib/tpl/dokuwiki/lang/de/style.txt b/lib/tpl/dokuwiki/lang/de/style.txt
new file mode 100644
index 000000000..1fd2f332b
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/de/style.txt
@@ -0,0 +1 @@
+Wenn Sie das Logo anpassen wollen, benutzen Sie einfach den Medien-Manager, um ein ''logo.png'' in den ''wiki''- oder Wurzel-Namensraum hochzuladen. Es wird dann automatisch als Logo verwendet. Sie können dort auch ein 'favicon.ico'' hochladen. Falls Sie ein geschlossenes Wiki haben, ist es empfehlenswert, den ''wiki''- (oder Wurzel-)Namensraum für alle Nutzer in den ACL-Einstellungen zu öffnen. Ansonsten wird das Logo nur für eingeloggte Nutzer angezeigt.
\ No newline at end of file
-- 
cgit v1.2.3


From 5435cf9e106ef04804ac90ffcb2ed3d88e0229fb Mon Sep 17 00:00:00 2001
From: Domingo Redal <docxml@gmail.com>
Date: Fri, 7 Aug 2015 18:41:44 +0200
Subject: translation update

---
 inc/lang/es/lang.php                            |  1 +
 lib/plugins/authldap/lang/es/lang.php           |  2 +-
 lib/plugins/authmysql/lang/es/lang.php          | 11 +++++++++++
 lib/plugins/authmysql/lang/es/settings.php      |  2 ++
 lib/plugins/authpgsql/lang/es/settings.php      |  3 +++
 lib/plugins/authplain/lang/es/lang.php          |  8 ++++++--
 lib/plugins/config/lang/es/lang.php             |  8 ++++++--
 lib/plugins/extension/lang/es/intro_plugins.txt |  1 +
 lib/plugins/extension/lang/es/intro_search.txt  |  1 +
 lib/plugins/extension/lang/es/lang.php          |  8 +++++++-
 lib/plugins/styling/lang/es/intro.txt           |  2 ++
 lib/plugins/styling/lang/es/lang.php            | 23 +++++++++++++++++++++++
 lib/plugins/usermanager/lang/es/import.txt      |  9 +++++++++
 lib/plugins/usermanager/lang/es/lang.php        |  7 +++++++
 lib/tpl/dokuwiki/lang/es/lang.php               | 15 +++++++++++++++
 lib/tpl/dokuwiki/lang/es/style.txt              |  1 +
 16 files changed, 96 insertions(+), 6 deletions(-)
 create mode 100644 lib/plugins/authmysql/lang/es/lang.php
 create mode 100644 lib/plugins/extension/lang/es/intro_plugins.txt
 create mode 100644 lib/plugins/extension/lang/es/intro_search.txt
 create mode 100644 lib/plugins/styling/lang/es/intro.txt
 create mode 100644 lib/plugins/styling/lang/es/lang.php
 create mode 100644 lib/plugins/usermanager/lang/es/import.txt
 create mode 100644 lib/tpl/dokuwiki/lang/es/lang.php
 create mode 100644 lib/tpl/dokuwiki/lang/es/style.txt

diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 65978f558..26304902a 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -40,6 +40,7 @@
  * @author Álvaro Iradier <airadier@gmail.com>
  * @author Alejandro Nunez <nunez.alejandro@gmail.com>
  * @author Mauricio Segura <maose38@yahoo.es>
+ * @author Domingo Redal <docxml@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/lib/plugins/authldap/lang/es/lang.php b/lib/plugins/authldap/lang/es/lang.php
index 64ea7b964..20de155c1 100644
--- a/lib/plugins/authldap/lang/es/lang.php
+++ b/lib/plugins/authldap/lang/es/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Mauricio Segura <maose38@yahoo.es>
  */
 $lang['connectfail']           = 'LDAP no se puede conectar: %s';
diff --git a/lib/plugins/authmysql/lang/es/lang.php b/lib/plugins/authmysql/lang/es/lang.php
new file mode 100644
index 000000000..e25b801c3
--- /dev/null
+++ b/lib/plugins/authmysql/lang/es/lang.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Domingo Redal <docxml@gmail.com>
+ */
+$lang['connectfail']           = 'Error al conectar con la base de datos.';
+$lang['userexists']            = 'Lo sentimos, ya existe un usuario con ese inicio de sesión.';
+$lang['usernotexists']         = 'Lo sentimos, no existe ese usuario.';
+$lang['writefail']             = 'No es posible modificar los datos del usuario. Por favor, informa al Administrador del Wiki';
diff --git a/lib/plugins/authmysql/lang/es/settings.php b/lib/plugins/authmysql/lang/es/settings.php
index cda3c23f8..8b5c79995 100644
--- a/lib/plugins/authmysql/lang/es/settings.php
+++ b/lib/plugins/authmysql/lang/es/settings.php
@@ -7,6 +7,7 @@
  * @author Eloy <ej.perezgomez@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author Alejandro Nunez <nunez.alejandro@gmail.com>
+ * @author Domingo Redal <docxml@gmail.com>
  */
 $lang['server']                = 'Tu servidor MySQL';
 $lang['user']                  = 'Nombre de usuario MySQL';
@@ -37,6 +38,7 @@ $lang['UpdateLogin']           = 'Cláusula de actualización para actualizar el
 $lang['UpdatePass']            = 'Cláusula de actualización para actualizar la contraseña del usuario';
 $lang['UpdateEmail']           = 'Cláusula de actualización para actualizar la dirección de correo del usuario';
 $lang['UpdateName']            = 'Cláusula de actualización para actualizar el nomblre completo del usuario';
+$lang['UpdateTarget']          = 'Cláusula limite para identificar al usuario cuando se actualiza';
 $lang['delUserGroup']          = 'Sentencia SQL para eliminar un usuario de un grupo dado';
 $lang['getGroupID']            = 'Sentencia SQL para obtener la clave principal de un grupo dado';
 $lang['debug_o_0']             = 'ninguno';
diff --git a/lib/plugins/authpgsql/lang/es/settings.php b/lib/plugins/authpgsql/lang/es/settings.php
index abfb00d38..0ca264bc2 100644
--- a/lib/plugins/authpgsql/lang/es/settings.php
+++ b/lib/plugins/authpgsql/lang/es/settings.php
@@ -6,6 +6,7 @@
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author pokesakura <pokesakura@gmail.com>
+ * @author Domingo Redal <docxml@gmail.com>
  */
 $lang['server']                = 'Su servidor PostgreSQL';
 $lang['port']                  = 'Puerto de su servidor PostgreSQL';
@@ -35,4 +36,6 @@ $lang['UpdateLogin']           = 'Sentencia de actualizacion para el login del u
 $lang['UpdatePass']            = 'Sentencia de actualizacion para el password del usuario';
 $lang['UpdateEmail']           = 'Sentencia de actualizacion del correo electrónico del usuario';
 $lang['UpdateName']            = 'Sentencia de actualizacion del nombre completo del usuario';
+$lang['UpdateTarget']          = 'Cláusula limite para identificar al usuario cuando se actualiza';
+$lang['delUserGroup']          = 'Sentencia SQL para eliminar un usuario de un grupo determinado';
 $lang['getGroupID']            = 'Sentencia SQL para obtener la clave principal de un grupo dado';
diff --git a/lib/plugins/authplain/lang/es/lang.php b/lib/plugins/authplain/lang/es/lang.php
index 8f03e79cb..8ef567a16 100644
--- a/lib/plugins/authplain/lang/es/lang.php
+++ b/lib/plugins/authplain/lang/es/lang.php
@@ -1,6 +1,10 @@
 <?php
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
+ * @author Domingo Redal <docxml@gmail.com>
  */
-$lang['userexists']     = 'Lo siento, ya existe un usuario con este nombre.';
+$lang['userexists']            = 'Lo siento, ya existe un usuario con este nombre.';
+$lang['usernotexists']         = 'Lo sentimos, no existe ese usuario.';
+$lang['writefail']             = 'No es posible modificar los datos del usuario. Por favor, informa al Administrador del Wiki';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index 847b326a8..74946bde8 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * spanish language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Miguel Pagano <miguel.pagano@gmail.com>
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
@@ -24,6 +24,7 @@
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  * @author Mercè López mercelz@gmail.com
+ * @author Domingo Redal <docxml@gmail.com>
  */
 $lang['menu']                  = 'Parámetros de configuración';
 $lang['error']                 = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario. <br /> Los valores incorrectos se mostrarán con un marco rojo alrededor.';
@@ -97,7 +98,9 @@ $lang['disableactions']        = 'Deshabilitar acciones DokuWiki';
 $lang['disableactions_check']  = 'Controlar';
 $lang['disableactions_subscription'] = 'Suscribirse/Cancelar suscripción';
 $lang['disableactions_wikicode'] = 'Ver la fuente/Exportar en formato raw';
+$lang['disableactions_profile_delete'] = 'Borrar tu propia cuenta';
 $lang['disableactions_other']  = 'Otras acciones (separadas por coma)';
+$lang['disableactions_rss']    = 'Sindicación XML (RSS)';
 $lang['auth_security_timeout'] = 'Tiempo de Autenticación (en segundos), por motivos de seguridad';
 $lang['securecookie']          = 'Las cookies establecidas por HTTPS, ¿el naveagdor solo puede enviarlas por HTTPS? Inhabilite esta opción cuando solo se asegure con SSL la entrada, pero no la navegación de su wiki.';
 $lang['remote']                = 'Activar el sistema API remoto. Esto permite a otras aplicaciones acceder al wiki a traves de XML-RPC u otros mecanismos.';
@@ -202,6 +205,7 @@ $lang['xsendfile_o_2']         = 'Encabezado X-Sendfile estándar';
 $lang['xsendfile_o_3']         = 'Encabezado propietario Nginx X-Accel-Redirect';
 $lang['showuseras_o_loginname'] = 'Nombre de entrada';
 $lang['showuseras_o_username'] = 'Nombre completo del usuario';
+$lang['showuseras_o_username_link'] = 'Nombre completo del usuario como enlace de usuario interwiki';
 $lang['showuseras_o_email']    = 'Dirección de correo electrónico del usuario (ofuscada según la configuración de "mailguard")';
 $lang['showuseras_o_email_link'] = 'Dirección de correo de usuario como enlace de envío de correo';
 $lang['useheading_o_0']        = 'Nunca';
diff --git a/lib/plugins/extension/lang/es/intro_plugins.txt b/lib/plugins/extension/lang/es/intro_plugins.txt
new file mode 100644
index 000000000..4805021f9
--- /dev/null
+++ b/lib/plugins/extension/lang/es/intro_plugins.txt
@@ -0,0 +1 @@
+Estos son los plugins actualmente instalados en su DokuWiki. Puede activar, desactivar o incluso desinstalar completamente desde aquí. Actualizaciones de los Plugin se muestran también aquí, asegúrese de leer la documentación del plugin antes de actualizar.
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/es/intro_search.txt b/lib/plugins/extension/lang/es/intro_search.txt
new file mode 100644
index 000000000..f59bb33df
--- /dev/null
+++ b/lib/plugins/extension/lang/es/intro_search.txt
@@ -0,0 +1 @@
+Esta pestaña te da acceso a todos los plugins de 3as partes disponibles y plantillas para DokuWiki. Tenga en cuenta que la instalación de código de terceras partes puede plantear un **riesgo de seguridad**, es posible que desee leer primero sobre [[doku>security#plugin_security|plugin security]].
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/es/lang.php b/lib/plugins/extension/lang/es/lang.php
index 9e3d24318..28cdf86ca 100644
--- a/lib/plugins/extension/lang/es/lang.php
+++ b/lib/plugins/extension/lang/es/lang.php
@@ -2,12 +2,13 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author Jonathan Hernández <me@jhalicea.com>
  * @author Álvaro Iradier <airadier@gmail.com>
  * @author Mauricio Segura <maose38@yahoo.es>
+ * @author Domingo Redal <docxml@gmail.com>
  */
 $lang['menu']                  = 'Administrador de Extensiones ';
 $lang['tab_plugins']           = 'Plugins instalados';
@@ -86,9 +87,14 @@ $lang['error_badurl']          = 'URLs deberían empezar con http o https';
 $lang['error_dircreate']       = 'No es posible de crear un directorio temporero para poder recibir el download';
 $lang['error_download']        = 'No es posible descargar el documento: %s';
 $lang['error_decompress']      = 'No se pudo descomprimir el fichero descargado. Puede ser a causa de una descarga incorrecta, en cuyo caso puedes intentarlo de nuevo; o puede que el formato de compresión sea desconocido, en cuyo caso necesitarás descargar e instalar manualmente.';
+$lang['error_findfolder']      = 'No se ha podido identificar el directorio de la extensión, es necesario descargar e instalar manualmente';
+$lang['error_copy']            = 'Hubo un error durante la copia de archivos al intentar instalar los archivos del directorio <em>%s</em>: el disco puede estar lleno o los permisos de acceso a los archivos pueden ser incorrectos. Esto puede haber dado lugar a un plugin instalado parcialmente y dejar su instalación wiki inestable';
 $lang['noperms']               = 'El directorio de extensiones no tiene permiso de escritura.';
 $lang['notplperms']            = 'El directorio de plantillas no tiene permiso de escritura.';
+$lang['nopluginperms']         = 'No se puede escribir en el directorio de plugins';
 $lang['git']                   = 'Esta extensión fue instalada a través de git, quizás usted no quiera actualizarla aquí mismo.';
+$lang['auth']                  = 'Este plugin de autenticación no está habilitada en la configuración, considere la posibilidad de desactivarlo.';
 $lang['install_url']           = 'Instalar desde URL:';
 $lang['install_upload']        = 'Subir Extensión:';
 $lang['repo_error']            = 'El repositorio de plugins no puede ser contactado. Asegúrese que su servidor pueda contactar www.dokuwiki.org y verificar la configuración de su proxy.';
+$lang['nossl']                 = 'Tu PHP parece no tener soporte SSL. Las descargas no funcionaran para muchas extensiones de DokuWiki.';
diff --git a/lib/plugins/styling/lang/es/intro.txt b/lib/plugins/styling/lang/es/intro.txt
new file mode 100644
index 000000000..8a556002e
--- /dev/null
+++ b/lib/plugins/styling/lang/es/intro.txt
@@ -0,0 +1,2 @@
+Esta herramienta le permite cambiar algunos ajustes de estilo de la plantilla seleccionada.
+Todos los cambios se guardan en un archivo de configuración local y son una actualización segura.
\ No newline at end of file
diff --git a/lib/plugins/styling/lang/es/lang.php b/lib/plugins/styling/lang/es/lang.php
new file mode 100644
index 000000000..ad300dc12
--- /dev/null
+++ b/lib/plugins/styling/lang/es/lang.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Domingo Redal <docxml@gmail.com>
+ */
+$lang['menu']                  = 'Ajustes de plantilla';
+$lang['js']['loader']          = 'La vista previa se está cargando ... <br /> si esto no se ve, sus valores pueden ser defectuosos';
+$lang['js']['popup']           = 'Abrir como una ventana emergente';
+$lang['error']                 = 'Lo sentimos, esta plantilla no admite esta funcionalidad.';
+$lang['btn_preview']           = 'Vista previa de los cambios';
+$lang['btn_save']              = 'Guardar cambios';
+$lang['btn_reset']             = 'Reiniciar los cambios actuales';
+$lang['btn_revert']            = 'Revertir estilos volviendo a los valores por defecto de la plantilla';
+$lang['__text__']              = 'Color del texto principal';
+$lang['__background__']        = 'Color de fondo del texto principal';
+$lang['__text_alt__']          = 'Color del texto alternativo';
+$lang['__background_alt__']    = 'Color de fondo del texto alternativo';
+$lang['__text_neu__']          = 'Color del texto neutro';
+$lang['__background_neu__']    = 'Color de fondo del texto neutro';
+$lang['__border__']            = 'Color del borde';
+$lang['__highlight__']         = 'Color resaltado (para los resultados de búsqueda, principalmente)';
diff --git a/lib/plugins/usermanager/lang/es/import.txt b/lib/plugins/usermanager/lang/es/import.txt
new file mode 100644
index 000000000..2482096d5
--- /dev/null
+++ b/lib/plugins/usermanager/lang/es/import.txt
@@ -0,0 +1,9 @@
+===== Importación y carga de usuarios  =====
+
+Se requiere un archivo CSV de usuarios con al menos cuatro columnas.
+Las columnas deben contener, en este orden: Identificador de usuario, nombre completo, dirección de correo electrónico y grupos.
+Los campos CSV deben estar separados por comas (,) y las cadenas delimitadas por comillas dobles (%%""%%). Barra inversa (\\) se puede utilizar para escapar caracteres.
+Para un ejemplo de un archivo adecuado, probar la función "Exportar usuarios" de arriba.
+Valores de identificador de usuario duplicados serán ignorados.
+
+Una contraseña será generada y enviada por correo electrónico a cada usuario importado correctamente.
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index a557eacdd..284d50f34 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -27,6 +27,7 @@
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Antonio Castilla <antoniocastilla@trazoide.com>
  * @author Jonathan Hernández <me@jhalicea.com>
+ * @author Domingo Redal <docxml@gmail.com>
  */
 $lang['menu']                  = 'Administración de usuarios';
 $lang['noauth']                = '(la autenticación de usuarios no está disponible)';
@@ -75,6 +76,12 @@ $lang['add_fail']              = 'Falló la creación del usuario';
 $lang['notify_ok']             = 'Se envió la notificación por correo electrónico';
 $lang['notify_fail']           = 'No se pudo enviar la notificación por correo electrónico';
 $lang['import_userlistcsv']    = 'Lista de usuarios (CSV): ';
+$lang['import_header']         = 'Importaciones Más Recientes - Fallos';
+$lang['import_success_count']  = 'Importación de usuarios: %d usuarios encontrados, %d importados correctamente.';
+$lang['import_failure_count']  = 'Importación de usuarios: %d fallaron. Los fallos se enumeran a continuación.';
+$lang['import_error_fields']   = 'Campos insuficientes, encontrados %d, se requieren 4.';
+$lang['import_error_baduserid'] = 'Identificador de usuario no encontrado';
+$lang['import_error_badname']  = 'Nombre erróneo';
 $lang['import_error_badmail']  = 'Dirección de correo electrónico incorrecta';
 $lang['import_error_upload']   = 'Error al importar. El archivo csv no se pudo cargar o está vacío.';
 $lang['import_error_readfail'] = 'Error al importar. No se puede leer el archivo subido.';
diff --git a/lib/tpl/dokuwiki/lang/es/lang.php b/lib/tpl/dokuwiki/lang/es/lang.php
new file mode 100644
index 000000000..b63d0dc7d
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/es/lang.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Domingo Redal <docxml@gmail.com>
+ */
+$lang['__background_site__']   = 'Color para el fondo (detrás de la caja de contenido)';
+$lang['__link__']              = 'El color de los enlaces en general';
+$lang['__existing__']          = 'El color de los enlaces a páginas existentes';
+$lang['__missing__']           = 'El color de los enlaces a páginas no existentes';
+$lang['__site_width__']        = 'El ancho de la página completa (puede ser cualquier unidad de longitud: %, px, em, ...)';
+$lang['__sidebar_width__']     = 'El ancho de la barra lateral (puede ser cualquier unidad de longitud: %, px, em, ...)';
+$lang['__tablet_width__']      = 'Para tamaños de pantalla por debajo de esta anchura, el sitio cambia al modo tableta';
+$lang['__phone_width__']       = 'Para tamaños de pantalla por debajo de esta anchura, el sitio cambia al modo teléfono';
diff --git a/lib/tpl/dokuwiki/lang/es/style.txt b/lib/tpl/dokuwiki/lang/es/style.txt
new file mode 100644
index 000000000..60ce308ff
--- /dev/null
+++ b/lib/tpl/dokuwiki/lang/es/style.txt
@@ -0,0 +1 @@
+Si desea ajustar el logotipo, sólo tiene que utilizar el Administrador de Medios para cargar un ''logo.png'' dentro de "wiki'' o en el espacio de nombres de la raíz y se utilizará automáticamente. También puede cargar un ''favicon.ico'' allí. Si utiliza un wiki cerrado se recomienda hacer el ''wiki'' (o raíz) espacio de nombres legible por todo el mundo en la configuración de ACL o su logotipo no se mostrará para que los usuarios no registrados.
\ No newline at end of file
-- 
cgit v1.2.3


From a060d9973e7c1d5051f2cc426937881826e4972e Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Mon, 10 Aug 2015 10:01:56 +0200
Subject: Release preparation

---
 data/deleted.files | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 install.php        |   1 +
 2 files changed, 247 insertions(+)

diff --git a/data/deleted.files b/data/deleted.files
index cac352c9d..68fad3cda 100644
--- a/data/deleted.files
+++ b/data/deleted.files
@@ -2,6 +2,252 @@
 # but were removed later. An up to date DokuWiki should not have any of
 # the files installed
 
+# removed in 2015-08-10
+inc/TarLib.class.php
+inc/geshi.php
+inc/geshi/4cs.php
+inc/geshi/6502acme.php
+inc/geshi/6502kickass.php
+inc/geshi/6502tasm.php
+inc/geshi/68000devpac.php
+inc/geshi/abap.php
+inc/geshi/actionscript-french.php
+inc/geshi/actionscript.php
+inc/geshi/actionscript3.php
+inc/geshi/ada.php
+inc/geshi/algol68.php
+inc/geshi/apache.php
+inc/geshi/applescript.php
+inc/geshi/apt_sources.php
+inc/geshi/arm.php
+inc/geshi/asm.php
+inc/geshi/asp.php
+inc/geshi/asymptote.php
+inc/geshi/autoconf.php
+inc/geshi/autohotkey.php
+inc/geshi/autoit.php
+inc/geshi/avisynth.php
+inc/geshi/awk.php
+inc/geshi/bascomavr.php
+inc/geshi/bash.php
+inc/geshi/basic4gl.php
+inc/geshi/bf.php
+inc/geshi/bibtex.php
+inc/geshi/blitzbasic.php
+inc/geshi/bnf.php
+inc/geshi/boo.php
+inc/geshi/c.php
+inc/geshi/c_loadrunner.php
+inc/geshi/c_mac.php
+inc/geshi/caddcl.php
+inc/geshi/cadlisp.php
+inc/geshi/cfdg.php
+inc/geshi/cfm.php
+inc/geshi/chaiscript.php
+inc/geshi/cil.php
+inc/geshi/clojure.php
+inc/geshi/cmake.php
+inc/geshi/cobol.php
+inc/geshi/coffeescript.php
+inc/geshi/cpp-qt.php
+inc/geshi/cpp.php
+inc/geshi/csharp.php
+inc/geshi/css.php
+inc/geshi/cuesheet.php
+inc/geshi/d.php
+inc/geshi/dcl.php
+inc/geshi/dcpu16.php
+inc/geshi/dcs.php
+inc/geshi/delphi.php
+inc/geshi/diff.php
+inc/geshi/div.php
+inc/geshi/dos.php
+inc/geshi/dot.php
+inc/geshi/e.php
+inc/geshi/ecmascript.php
+inc/geshi/eiffel.php
+inc/geshi/email.php
+inc/geshi/epc.php
+inc/geshi/erlang.php
+inc/geshi/euphoria.php
+inc/geshi/f1.php
+inc/geshi/falcon.php
+inc/geshi/fo.php
+inc/geshi/fortran.php
+inc/geshi/freebasic.php
+inc/geshi/freeswitch.php
+inc/geshi/fsharp.php
+inc/geshi/gambas.php
+inc/geshi/gdb.php
+inc/geshi/genero.php
+inc/geshi/genie.php
+inc/geshi/gettext.php
+inc/geshi/glsl.php
+inc/geshi/gml.php
+inc/geshi/gnuplot.php
+inc/geshi/go.php
+inc/geshi/groovy.php
+inc/geshi/gwbasic.php
+inc/geshi/haskell.php
+inc/geshi/haxe.php
+inc/geshi/hicest.php
+inc/geshi/hq9plus.php
+inc/geshi/html4strict.php
+inc/geshi/html5.php
+inc/geshi/icon.php
+inc/geshi/idl.php
+inc/geshi/ini.php
+inc/geshi/inno.php
+inc/geshi/intercal.php
+inc/geshi/io.php
+inc/geshi/j.php
+inc/geshi/java.php
+inc/geshi/java5.php
+inc/geshi/javascript.php
+inc/geshi/jquery.php
+inc/geshi/kixtart.php
+inc/geshi/klonec.php
+inc/geshi/klonecpp.php
+inc/geshi/latex.php
+inc/geshi/lb.php
+inc/geshi/ldif.php
+inc/geshi/lisp.php
+inc/geshi/llvm.php
+inc/geshi/locobasic.php
+inc/geshi/logtalk.php
+inc/geshi/lolcode.php
+inc/geshi/lotusformulas.php
+inc/geshi/lotusscript.php
+inc/geshi/lscript.php
+inc/geshi/lsl2.php
+inc/geshi/lua.php
+inc/geshi/m68k.php
+inc/geshi/magiksf.php
+inc/geshi/make.php
+inc/geshi/mapbasic.php
+inc/geshi/matlab.php
+inc/geshi/mirc.php
+inc/geshi/mmix.php
+inc/geshi/modula2.php
+inc/geshi/modula3.php
+inc/geshi/mpasm.php
+inc/geshi/mxml.php
+inc/geshi/mysql.php
+inc/geshi/nagios.php
+inc/geshi/netrexx.php
+inc/geshi/newlisp.php
+inc/geshi/nsis.php
+inc/geshi/oberon2.php
+inc/geshi/objc.php
+inc/geshi/objeck.php
+inc/geshi/ocaml-brief.php
+inc/geshi/ocaml.php
+inc/geshi/octave.php
+inc/geshi/oobas.php
+inc/geshi/oorexx.php
+inc/geshi/oracle11.php
+inc/geshi/oracle8.php
+inc/geshi/oxygene.php
+inc/geshi/oz.php
+inc/geshi/parasail.php
+inc/geshi/parigp.php
+inc/geshi/pascal.php
+inc/geshi/pcre.php
+inc/geshi/per.php
+inc/geshi/perl.php
+inc/geshi/perl6.php
+inc/geshi/pf.php
+inc/geshi/php-brief.php
+inc/geshi/php.php
+inc/geshi/pic16.php
+inc/geshi/pike.php
+inc/geshi/pixelbender.php
+inc/geshi/pli.php
+inc/geshi/plsql.php
+inc/geshi/postgresql.php
+inc/geshi/povray.php
+inc/geshi/powerbuilder.php
+inc/geshi/powershell.php
+inc/geshi/proftpd.php
+inc/geshi/progress.php
+inc/geshi/prolog.php
+inc/geshi/properties.php
+inc/geshi/providex.php
+inc/geshi/purebasic.php
+inc/geshi/pycon.php
+inc/geshi/pys60.php
+inc/geshi/python.php
+inc/geshi/q.php
+inc/geshi/qbasic.php
+inc/geshi/rails.php
+inc/geshi/rebol.php
+inc/geshi/reg.php
+inc/geshi/rexx.php
+inc/geshi/robots.php
+inc/geshi/rpmspec.php
+inc/geshi/rsplus.php
+inc/geshi/ruby.php
+inc/geshi/sas.php
+inc/geshi/scala.php
+inc/geshi/scheme.php
+inc/geshi/scilab.php
+inc/geshi/sdlbasic.php
+inc/geshi/smalltalk.php
+inc/geshi/smarty.php
+inc/geshi/spark.php
+inc/geshi/sparql.php
+inc/geshi/sql.php
+inc/geshi/stonescript.php
+inc/geshi/systemverilog.php
+inc/geshi/tcl.php
+inc/geshi/teraterm.php
+inc/geshi/text.php
+inc/geshi/thinbasic.php
+inc/geshi/tsql.php
+inc/geshi/typoscript.php
+inc/geshi/unicon.php
+inc/geshi/upc.php
+inc/geshi/urbi.php
+inc/geshi/uscript.php
+inc/geshi/vala.php
+inc/geshi/vb.php
+inc/geshi/vbnet.php
+inc/geshi/vedit.php
+inc/geshi/verilog.php
+inc/geshi/vhdl.php
+inc/geshi/vim.php
+inc/geshi/visualfoxpro.php
+inc/geshi/visualprolog.php
+inc/geshi/whitespace.php
+inc/geshi/whois.php
+inc/geshi/winbatch.php
+inc/geshi/xbasic.php
+inc/geshi/xml.php
+inc/geshi/xorg_conf.php
+inc/geshi/xpp.php
+inc/geshi/yaml.php
+inc/geshi/z80.php
+inc/geshi/zxbasic.php
+inc/lang/ku/admin.txt
+inc/lang/ku/denied.txt
+inc/lang/ku/editrev.txt
+inc/lang/ku/locked.txt
+inc/lang/ku/login.txt
+inc/lang/ku/mailtext.txt
+inc/lang/ku/norev.txt
+inc/lang/ku/password.txt
+inc/lang/ku/read.txt
+inc/lang/ku/register.txt
+inc/lang/ku/revisions.txt
+inc/lang/ku/showrev.txt
+inc/lang/ku/stopwords.txt
+lib/images/interwiki/coral.gif
+lib/images/interwiki/dokubug.gif
+lib/images/interwiki/sb.gif
+lib/scripts/drag.js
+lib/scripts/jquery/jquery-ui-theme/images/animated-overlay.gif
+lib/scripts/tw-sack.js
+
 # removed in 2014-05-05
 lib/images/fileicons/audio.png
 lib/plugins/acl/lang/hi/lang.php
diff --git a/install.php b/install.php
index 4de8093d6..6002ec88c 100644
--- a/install.php
+++ b/install.php
@@ -58,6 +58,7 @@ $dokuwiki_hash = array(
     '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
     '2013-12-08'   => '263c76af309fbf083867c18a34ff5214',
     '2014-05-05'   => '263c76af309fbf083867c18a34ff5214',
+    '2015-08-10'   => '263c76af309fbf083867c18a34ff5214'
 );
 
 
-- 
cgit v1.2.3